From cc4906042c7f17f27d3f45090c95edd29645c88e Mon Sep 17 00:00:00 2001 From: Kong Wai Weng Date: Mon, 6 Dec 2021 17:13:15 +0800 Subject: [PATCH 0001/2403] Added Maker Nano RP2040. --- .../boards/cytron_maker_nano_rp2040/board.c | 40 ++++++++++++++ .../cytron_maker_nano_rp2040/mpconfigboard.h | 12 ++++ .../cytron_maker_nano_rp2040/mpconfigboard.mk | 15 +++++ .../pico-sdk-configboard.h | 4 ++ .../boards/cytron_maker_nano_rp2040/pins.c | 55 +++++++++++++++++++ 5 files changed, 126 insertions(+) create mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c create mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c new file mode 100644 index 0000000000..b583e7bf11 --- /dev/null +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2021 Wai Weng for Cytron Technologies + * + * 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) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h new file mode 100644 index 0000000000..2d182e78c9 --- /dev/null +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h @@ -0,0 +1,12 @@ +#define MICROPY_HW_BOARD_NAME "Cytron Maker Nano RP2040" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO1) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO0) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO1) +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk new file mode 100644 index 0000000000..fc5f8ead36 --- /dev/null +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk @@ -0,0 +1,15 @@ +USB_VID = 0x2E8A +USB_PID = 0x100f +USB_PRODUCT = "Maker Nano RP2040" +USB_MANUFACTURER = "Cytron" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 + +# Include these Python libraries in firmware. +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h new file mode 100644 index 0000000000..a41131dd22 --- /dev/null +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h @@ -0,0 +1,4 @@ +// Put board-specific pico-sdk definitions here. This file must exist. + +// Allow extra time for xosc to start. +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c new file mode 100644 index 0000000000..30fe8d64a9 --- /dev/null +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c @@ -0,0 +1,55 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 78cf13d201f3f8e915412a7b657e6c2af7852cbd Mon Sep 17 00:00:00 2001 From: Kong Wai Weng Date: Mon, 6 Dec 2021 17:21:25 +0800 Subject: [PATCH 0002/2403] Revert "Added Maker Nano RP2040." This reverts commit cc4906042c7f17f27d3f45090c95edd29645c88e. --- .../boards/cytron_maker_nano_rp2040/board.c | 40 -------------- .../cytron_maker_nano_rp2040/mpconfigboard.h | 12 ---- .../cytron_maker_nano_rp2040/mpconfigboard.mk | 15 ----- .../pico-sdk-configboard.h | 4 -- .../boards/cytron_maker_nano_rp2040/pins.c | 55 ------------------- 5 files changed, 126 deletions(-) delete mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c delete mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h delete mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk delete mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h delete mode 100644 ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c deleted file mode 100644 index b583e7bf11..0000000000 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2021 Wai Weng for Cytron Technologies - * - * 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) { -} - -void board_deinit(void) { -} diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h deleted file mode 100644 index 2d182e78c9..0000000000 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.h +++ /dev/null @@ -1,12 +0,0 @@ -#define MICROPY_HW_BOARD_NAME "Cytron Maker Nano RP2040" -#define MICROPY_HW_MCU_NAME "rp2040" - -#define DEFAULT_I2C_BUS_SCL (&pin_GPIO1) -#define DEFAULT_I2C_BUS_SDA (&pin_GPIO0) - -#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18) -#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19) -#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16) - -#define DEFAULT_UART_BUS_RX (&pin_GPIO1) -#define DEFAULT_UART_BUS_TX (&pin_GPIO0) diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk deleted file mode 100644 index fc5f8ead36..0000000000 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/mpconfigboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -USB_VID = 0x2E8A -USB_PID = 0x100f -USB_PRODUCT = "Maker Nano RP2040" -USB_MANUFACTURER = "Cytron" - -CHIP_VARIANT = RP2040 -CHIP_FAMILY = rp2 - -EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" - -CIRCUITPY__EVE = 1 - -# Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h deleted file mode 100644 index a41131dd22..0000000000 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pico-sdk-configboard.h +++ /dev/null @@ -1,4 +0,0 @@ -// Put board-specific pico-sdk definitions here. This file must exist. - -// Allow extra time for xosc to start. -#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c deleted file mode 100644 index 30fe8d64a9..0000000000 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "shared-bindings/board/__init__.h" - -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { - CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - - { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, - { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, - - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, - - { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, - { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, - - { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO11) }, - { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO11) }, - { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, - - { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, - { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, - { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, - { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, - { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, - { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, - { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, - - { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, - - { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO22) }, - { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, - - { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, - { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, - { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, - - { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, - - { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, - - { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, - { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, - { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, -}; -MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From db5f99c63ebee26a32e66f345ae0502f1004aa61 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 4 Jan 2022 14:15:20 -0600 Subject: [PATCH 0003/2403] Add a function to get low level register access The port is free to return NULL for any/all of these, and the caller has to check. This will be used in the floppy code, because aside from getting the registers, it looks like all is independent of MCU. --- .../common-hal/digitalio/DigitalInOut.c | 27 +++++++++++++++++++ .../common-hal/digitalio/DigitalInOut.c | 25 +++++++++++++++++ shared-bindings/digitalio/DigitalInOut.h | 11 ++++++++ 3 files changed, 63 insertions(+) diff --git a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c index 40637bef4b..dee927ce88 100644 --- a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c +++ b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c @@ -187,3 +187,30 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull( } } } + +bool common_hal_digitalio_has_reg_op(digitalinout_reg_op_t op) { + return true; +} + +volatile uint32_t *common_hal_digitalio_digitalinout_get_reg(digitalio_digitalinout_obj_t *self, digitalinout_reg_op_t op, uint32_t *mask) { + const uint8_t pin = self->pin->number; + int port = GPIO_PORT(pin); + + *mask = 1u << GPIO_PIN(pin); + + + switch (op) { + case DIGITALINOUT_REG_READ: + return (volatile uint32_t *)&PORT->Group[port].IN.reg; + case DIGITALINOUT_REG_WRITE: + return &PORT->Group[port].OUT.reg; + case DIGITALINOUT_REG_SET: + return &PORT->Group[port].OUTSET.reg; + case DIGITALINOUT_REG_RESET: + return &PORT->Group[port].OUTCLR.reg; + case DIGITALINOUT_REG_TOGGLE: + return &PORT->Group[port].OUTTGL.reg; + default: + return NULL; + } +} diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c index 22a61afa3f..a8a5a6b4d9 100644 --- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c +++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c @@ -164,3 +164,28 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull( } return PULL_NONE; } + +bool common_hal_digitalio_has_reg_op(digitalinout_reg_op_t op) { + return true; +} + +volatile uint32_t *common_hal_digitalio_digitalinout_get_reg(digitalio_digitalinout_obj_t *self, digitalinout_reg_op_t op, uint32_t *mask) { + const uint8_t pin = self->pin->number; + + *mask = 1u << pin; + + switch (op) { + case DIGITALINOUT_REG_READ: + return (volatile uint32_t *)&sio_hw->gpio_in; + case DIGITALINOUT_REG_WRITE: + return &sio_hw->gpio_out; + case DIGITALINOUT_REG_SET: + return &sio_hw->gpio_set; + case DIGITALINOUT_REG_RESET: + return &sio_hw->gpio_clr; + case DIGITALINOUT_REG_TOGGLE: + return &sio_hw->gpio_togl; + default: + return NULL; + } +} diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h index ebc94fa1a6..b6edbc63aa 100644 --- a/shared-bindings/digitalio/DigitalInOut.h +++ b/shared-bindings/digitalio/DigitalInOut.h @@ -41,6 +41,14 @@ typedef enum { DIGITALINOUT_INPUT_ONLY } digitalinout_result_t; +typedef enum { + DIGITALINOUT_REG_READ, + DIGITALINOUT_REG_WRITE, + DIGITALINOUT_REG_SET, + DIGITALINOUT_REG_RESET, + DIGITALINOUT_REG_TOGGLE, +} digitalinout_reg_op_t; + digitalinout_result_t common_hal_digitalio_digitalinout_construct(digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin); void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self); bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *self); @@ -56,4 +64,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalino void common_hal_digitalio_digitalinout_never_reset(digitalio_digitalinout_obj_t *self); digitalio_digitalinout_obj_t *assert_digitalinout(mp_obj_t obj); +volatile uint32_t *common_hal_digitalio_digitalinout_get_reg(digitalio_digitalinout_obj_t *self, digitalinout_reg_op_t op, uint32_t *mask); +bool common_hal_digitalio_has_reg_op(digitalinout_reg_op_t op); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H From d816a4f19de435a59070948aa2e860cbb31e0f39 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 4 Jan 2022 17:26:25 -0600 Subject: [PATCH 0004/2403] Add floppyio Initially enabled for samd51, this enables reading raw flux data as well as DOS/MFM formatted media. This is only the low-level code for reading & decoding flux pulses from a floppy drive. high level details will live in a Python library. adafruit-circuitpython-floppy will take care of details like stepping from track to track, etc. --- .gitmodules | 3 + lib/adafruit_floppy | 1 + .../atmel-samd/common-hal/floppyio/__init__.h | 30 ++++ ports/atmel-samd/mpconfigport.mk | 2 + py/circuitpy_defns.mk | 4 + py/circuitpy_mpconfig.mk | 3 + shared-bindings/floppyio/__init__.c | 128 ++++++++++++++++++ shared-bindings/floppyio/__init__.h | 32 +++++ shared-module/floppyio/__init__.c | 108 +++++++++++++++ 9 files changed, 311 insertions(+) create mode 160000 lib/adafruit_floppy create mode 100644 ports/atmel-samd/common-hal/floppyio/__init__.h create mode 100644 shared-bindings/floppyio/__init__.c create mode 100644 shared-bindings/floppyio/__init__.h create mode 100644 shared-module/floppyio/__init__.c diff --git a/.gitmodules b/.gitmodules index 9376daebdc..c6c6512813 100644 --- a/.gitmodules +++ b/.gitmodules @@ -199,3 +199,6 @@ url = https://github.com/raspberrypi/rpi-firmware.git branch = master shallow = true +[submodule "lib/adafruit_floppy"] + path = lib/adafruit_floppy + url = https://github.com/adafruit/Adafruit_Floppy diff --git a/lib/adafruit_floppy b/lib/adafruit_floppy new file mode 160000 index 0000000000..d5d34127db --- /dev/null +++ b/lib/adafruit_floppy @@ -0,0 +1 @@ +Subproject commit d5d34127db8167b7a6aca8045d27f6b9e3930c6d diff --git a/ports/atmel-samd/common-hal/floppyio/__init__.h b/ports/atmel-samd/common-hal/floppyio/__init__.h new file mode 100644 index 0000000000..693babb2ef --- /dev/null +++ b/ports/atmel-samd/common-hal/floppyio/__init__.h @@ -0,0 +1,30 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Jeff Epler for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +// empirical-ish from Arduino @ 120MHz +#define FLOPPYIO_SAMPLERATE (14666667) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 9d238834fe..51024b7b67 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -87,6 +87,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_ALARM ?= 1 CIRCUITPY_PS2IO ?= 1 CIRCUITPY_SAMD ?= 1 +CIRCUITPY_FLOPPYIO ?= 1 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) CIRCUITPY_WATCHDOG ?= 1 @@ -107,6 +108,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_ALARM ?= 1 CIRCUITPY_PS2IO ?= 1 CIRCUITPY_SAMD ?= 1 +CIRCUITPY_FLOPPYIO ?= 1 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 48a37be499..06399673a2 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -164,6 +164,9 @@ endif ifeq ($(CIRCUITPY_VECTORIO),1) SRC_PATTERNS += vectorio/% endif +ifeq ($(CIRCUITPY_FLOPPYIO),1) +SRC_PATTERNS += floppyio/% +endif ifeq ($(CIRCUITPY_FRAMEBUFFERIO),1) SRC_PATTERNS += framebufferio/% endif @@ -526,6 +529,7 @@ SRC_SHARED_MODULE_ALL = \ displayio/TileGrid.c \ displayio/area.c \ displayio/__init__.c \ + floppyio/__init__.c \ fontio/BuiltinFont.c \ fontio/__init__.c \ framebufferio/FramebufferDisplay.c \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 14852580e5..d0d33949ab 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -219,6 +219,9 @@ CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF) CIRCUITPY__EVE ?= 0 CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE) +CIRCUITPY_FLOPPYIO ?= 0 +CFLAGS += -DCIRCUITPY_FLOPPYIO=$(CIRCUITPY_FLOPPYIO) + CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO) diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c new file mode 100644 index 0000000000..c2d1fbb21f --- /dev/null +++ b/shared-bindings/floppyio/__init__.c @@ -0,0 +1,128 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Jeff Epler for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "shared-bindings/floppyio/__init__.h" +#include "shared-bindings/digitalio/DigitalInOut.h" +#include "common-hal/floppyio/__init__.h" + +#include + +#include "py/binary.h" +#include "py/enum.h" +#include "py/obj.h" +#include "py/runtime.h" + +//| def flux_readinto(buffer: WriteableBuffer, data: DigitalInOut, index: DigitalInOut) -> int: +//| """Read flux transition information into the buffer. +//| +//| The function returns when the buffer has filled, or when the index input +//| indicates that one full revolution of data has been recorded. Due to +//| technical limitations, this process may not be interruptible by +//| KeyboardInterrupt. +//| +//| :param buffer: Read data into this buffer. Each element represents the time between successive zero-to-one transitions. +//| :param data: Pin on which the flux data appears +//| :param index: Pin on which the index pulse appears +//| :return: The actual number of bytes of read +//| """ +//| ... +//| +STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_buffer, ARG_data, ARG_index }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_index, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + }; + 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_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE); + digitalio_digitalinout_obj_t *data = assert_digitalinout(args[ARG_data].u_obj); + digitalio_digitalinout_obj_t *index = assert_digitalinout(args[ARG_index].u_obj); + + return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_flux_readinto(bufinfo.buf, bufinfo.len, data, index)); +} +MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto); + +//| def mfm_readinto(buffer: WriteableBuffer, data: DigitalInOut, index: DigitalInOut) -> int: +//| """Read mfm blocks into the buffer. +//| +//| The track is assumed to consist of 512-byte sectors. +//| +//| The function returns when all sectors have been successfully read, or +//| a number of index pulses have occurred. Due to technical limitations, this +//| process may not be interruptible by KeyboardInterrupt. +//| +//| :param buffer: Read data into this buffer. Must be a multiple of 512. +//| :param data: Pin on which the mfm data appears +//| :param index: Pin on which the index pulse appears +//| :return: The actual number of sectors read +//| """ +//| ... +//| +STATIC mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_buffer, ARG_data, ARG_index }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_index, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + }; + 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_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE); + digitalio_digitalinout_obj_t *data = assert_digitalinout(args[ARG_data].u_obj); + digitalio_digitalinout_obj_t *index = assert_digitalinout(args[ARG_index].u_obj); + + if (bufinfo.len % 512 != 0) { + mp_raise_ValueError(translate("Buffer must be a multiple of 512 bytes")); + } + size_t n_sectors = bufinfo.len / 512; + return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_mfm_readinto(bufinfo.buf, n_sectors, data, index)); +} +MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_mfm_readinto_obj, 0, floppyio_mfm_readinto); + +//| samplerate: int +//| """The approximate sample rate in Hz used by flux_readinto.""" +//| + +STATIC const mp_rom_map_elem_t floppyio_module_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_floppyio) }, + { MP_ROM_QSTR(MP_QSTR_flux_readinto), MP_ROM_PTR(&floppyio_flux_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_mfm_readinto), MP_ROM_PTR(&floppyio_mfm_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_samplerate), MP_ROM_INT(FLOPPYIO_SAMPLERATE) }, +}; +STATIC MP_DEFINE_CONST_DICT(floppyio_module_globals, floppyio_module_globals_table); + +const mp_obj_module_t floppyio_module = { + .base = {&mp_type_module }, + .globals = (mp_obj_dict_t *)&floppyio_module_globals, +}; + +MP_REGISTER_MODULE(MP_QSTR_floppyio, floppyio_module, CIRCUITPY_FLOPPYIO); diff --git a/shared-bindings/floppyio/__init__.h b/shared-bindings/floppyio/__init__.h new file mode 100644 index 0000000000..322bbe7d43 --- /dev/null +++ b/shared-bindings/floppyio/__init__.h @@ -0,0 +1,32 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Jeff Epler for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include "common-hal/digitalio/DigitalInOut.h" + +int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index); +int common_hal_floppyio_mfm_readinto(void *buf, size_t n_sector, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index); diff --git a/shared-module/floppyio/__init__.c b/shared-module/floppyio/__init__.c new file mode 100644 index 0000000000..c68b4d9ad2 --- /dev/null +++ b/shared-module/floppyio/__init__.c @@ -0,0 +1,108 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Jeff Epler for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "hal_gpio.h" + +#include "py/runtime.h" + +#include "shared-bindings/time/__init__.h" +#include "shared-bindings/floppyio/__init__.h" +#include "common-hal/floppyio/__init__.h" +#include "shared-bindings/digitalio/DigitalInOut.h" + +#define T2_5 (FLOPPYIO_SAMPLERATE * 5 / 2 / 1000000) +#define T3_5 (FLOPPYIO_SAMPLERATE * 7 / 2 / 1000000) + +#define MFM_IO_MMIO (1) +#include "lib/adafruit_floppy/mfm_impl.h" + +__attribute__((optimize("O3"))) +int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index) { + uint32_t index_mask; + volatile uint32_t *index_port = common_hal_digitalio_digitalinout_get_reg(index, DIGITALINOUT_REG_READ, &index_mask); + + uint32_t data_mask; + volatile uint32_t *data_port = common_hal_digitalio_digitalinout_get_reg(data, DIGITALINOUT_REG_READ, &data_mask); + +#undef READ_INDEX +#undef READ_DATA +#define READ_INDEX() (!!(*index_port & index_mask)) +#define READ_DATA() (!!(*data_port & data_mask)) + + memset(buf, 0, len); + + uint8_t *pulses = buf, *pulses_ptr = pulses, *pulses_end = pulses + len; + + common_hal_mcu_disable_interrupts(); + + // wait for index pulse low + while (READ_INDEX()) { /* NOTHING */ + } + + + // if data line is low, wait till it rises + while (!READ_DATA()) { /* NOTHING */ + } + + // and then till it drops down + while (READ_DATA()) { /* NOTHING */ + } + + uint32_t index_state = 0; + while (pulses_ptr < pulses_end) { + index_state = (index_state << 1) | READ_INDEX(); + if ((index_state & 3) == 2) { // a zero-to-one transition + break; + } + + unsigned pulse_count = 3; + while (!READ_DATA()) { + pulse_count++; + } + + while (READ_DATA()) { + pulse_count++; + } + + *pulses_ptr++ = MIN(255, pulse_count); + } + common_hal_mcu_enable_interrupts(); + + return pulses_ptr - pulses; +} + +int common_hal_floppyio_mfm_readinto(void *buf, size_t n_sectors, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index) { + mfm_io_t io; + io.index_port = common_hal_digitalio_digitalinout_get_reg(index, DIGITALINOUT_REG_READ, &io.index_mask); + io.data_port = common_hal_digitalio_digitalinout_get_reg(data, DIGITALINOUT_REG_READ, &io.data_mask); + + common_hal_mcu_disable_interrupts(); + uint8_t validity[n_sectors]; + int result = read_track(io, n_sectors, buf, validity); + common_hal_mcu_enable_interrupts(); + + return result; +} From a08c5c09509765b31f23382a754229b0e7c46d1a Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 13 Jan 2022 19:33:10 -0600 Subject: [PATCH 0005/2403] fix types --- shared-bindings/floppyio/__init__.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c index c2d1fbb21f..3ef58b2f66 100644 --- a/shared-bindings/floppyio/__init__.c +++ b/shared-bindings/floppyio/__init__.c @@ -35,7 +35,7 @@ #include "py/obj.h" #include "py/runtime.h" -//| def flux_readinto(buffer: WriteableBuffer, data: DigitalInOut, index: DigitalInOut) -> int: +//| def flux_readinto(buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut) -> int: //| """Read flux transition information into the buffer. //| //| The function returns when the buffer has filled, or when the index input @@ -69,7 +69,7 @@ STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, } MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto); -//| def mfm_readinto(buffer: WriteableBuffer, data: DigitalInOut, index: DigitalInOut) -> int: +//| def mfm_readinto(buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut) -> int: //| """Read mfm blocks into the buffer. //| //| The track is assumed to consist of 512-byte sectors. From 88abbb0029ef7c77d0bc85364c54ea57170ffc67 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 13 Jan 2022 20:40:30 -0600 Subject: [PATCH 0006/2403] submodules required must be listed explicitly --- tools/ci_fetch_deps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index 60557c3952..cecf37e08b 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -18,6 +18,7 @@ port_deps = { "extmod/ulab/", "lib/mp3/", "lib/protomatter/", + "lib/adafruit_floppy/", "lib/quirc/", "lib/tinyusb/", "data/nvm.toml/", From 6c53b06a3c45d79ed1ad487fcf3342b20e1328d8 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 14 Jan 2022 14:11:12 -0600 Subject: [PATCH 0007/2403] Update adafruit floppy submodule --- lib/adafruit_floppy | 2 +- shared-module/floppyio/__init__.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/adafruit_floppy b/lib/adafruit_floppy index d5d34127db..a00e78b871 160000 --- a/lib/adafruit_floppy +++ b/lib/adafruit_floppy @@ -1 +1 @@ -Subproject commit d5d34127db8167b7a6aca8045d27f6b9e3930c6d +Subproject commit a00e78b871abd40563c6de1b35a4d61a575fd1df diff --git a/shared-module/floppyio/__init__.c b/shared-module/floppyio/__init__.c index c68b4d9ad2..a9cae48c19 100644 --- a/shared-module/floppyio/__init__.c +++ b/shared-module/floppyio/__init__.c @@ -37,7 +37,7 @@ #define T3_5 (FLOPPYIO_SAMPLERATE * 7 / 2 / 1000000) #define MFM_IO_MMIO (1) -#include "lib/adafruit_floppy/mfm_impl.h" +#include "lib/adafruit_floppy/src/mfm_impl.h" __attribute__((optimize("O3"))) int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index) { From e32f0c1513d6586608df8312e5e79c8b348ad5bd Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 17 Jan 2022 11:13:45 -0600 Subject: [PATCH 0008/2403] update submodule --- lib/adafruit_floppy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/adafruit_floppy b/lib/adafruit_floppy index a00e78b871..94e3802157 160000 --- a/lib/adafruit_floppy +++ b/lib/adafruit_floppy @@ -1 +1 @@ -Subproject commit a00e78b871abd40563c6de1b35a4d61a575fd1df +Subproject commit 94e38021574e3e2c25bd1b8af01ad404e31f5409 From 8e895e1986dc13753a6ac3229e3b4ca727634aca Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 17 Jan 2022 16:30:28 -0600 Subject: [PATCH 0009/2403] Add floppyio for rp2040 Tested on RP2040 Feather with a 3.5" Prodigy diskette, the whole surface reads 100% across 3+ trials. --- lib/adafruit_floppy | 2 +- .../common-hal/floppyio/__init__.h | 37 +++++++++++++++++++ ports/raspberrypi/mpconfigport.mk | 1 + shared-module/floppyio/__init__.c | 6 ++- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 ports/raspberrypi/common-hal/floppyio/__init__.h diff --git a/lib/adafruit_floppy b/lib/adafruit_floppy index 94e3802157..e36a6127b9 160000 --- a/lib/adafruit_floppy +++ b/lib/adafruit_floppy @@ -1 +1 @@ -Subproject commit 94e38021574e3e2c25bd1b8af01ad404e31f5409 +Subproject commit e36a6127b957ab2f602e031ba3583de9c571582e diff --git a/ports/raspberrypi/common-hal/floppyio/__init__.h b/ports/raspberrypi/common-hal/floppyio/__init__.h new file mode 100644 index 0000000000..7dbf8a7af7 --- /dev/null +++ b/ports/raspberrypi/common-hal/floppyio/__init__.h @@ -0,0 +1,37 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Jeff Epler for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +// empirical-ish from RP2040 @ 125MHz for floppy_flux_readinto +#define FLOPPYIO_SAMPLERATE (24000000) +// empirical-ish from RP2040 @ 125MHz for floppy_mfm_readinto +// my guess is these are slower because the more complex routine falls out of cache, but it's just +// speculation because the loops are very similar. When looking at raw bins with a modified +// version of adafruit_floppy, it can be seen that there are _two_ peaks for T2 and T3, rather +// than a single one, around 36 (mostly) and 43 (rarer), compared to a single peak around 48. +#define T2_5 (54) +#define T3_5 (75) diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk index 1dfb345f5d..80938c47b0 100644 --- a/ports/raspberrypi/mpconfigport.mk +++ b/ports/raspberrypi/mpconfigport.mk @@ -5,6 +5,7 @@ CIRCUITPY_ALARM ?= 1 CIRCUITPY_RP2PIO ?= 1 CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO) +CIRCUITPY_FLOPPYIO ?= 1 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_DISPLAYIO) CIRCUITPY_FULL_BUILD ?= 1 CIRCUITPY_AUDIOMP3 ?= 1 diff --git a/shared-module/floppyio/__init__.c b/shared-module/floppyio/__init__.c index a9cae48c19..6700c48078 100644 --- a/shared-module/floppyio/__init__.c +++ b/shared-module/floppyio/__init__.c @@ -24,8 +24,6 @@ * THE SOFTWARE. */ -#include "hal_gpio.h" - #include "py/runtime.h" #include "shared-bindings/time/__init__.h" @@ -33,8 +31,12 @@ #include "common-hal/floppyio/__init__.h" #include "shared-bindings/digitalio/DigitalInOut.h" +#ifndef T2_5 #define T2_5 (FLOPPYIO_SAMPLERATE * 5 / 2 / 1000000) +#endif +#ifndef T3_5 #define T3_5 (FLOPPYIO_SAMPLERATE * 7 / 2 / 1000000) +#endif #define MFM_IO_MMIO (1) #include "lib/adafruit_floppy/src/mfm_impl.h" From bf57f3606a437a3a41aa0943ecf7b7b427010092 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 1 Feb 2022 10:19:17 -0600 Subject: [PATCH 0010/2403] rp2pio: Add pull up/down support for the "jmp pin" This is needed so that the floppy flux reader can enable the pull up on the index pin while using it as a pio jmp pin. Also fixes a doc bug where the `jmp_pin` was omitted in one spot in the docs. --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 9 +++++++-- ports/raspberrypi/bindings/rp2pio/StateMachine.h | 3 ++- ports/raspberrypi/common-hal/audiobusio/I2SOut.c | 2 +- ports/raspberrypi/common-hal/audiobusio/PDMIn.c | 2 +- .../common-hal/imagecapture/ParallelImageCapture.c | 2 +- .../common-hal/paralleldisplay/ParallelBus.c | 2 +- .../common-hal/rotaryio/IncrementalEncoder.c | 2 +- ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 13 ++++++++++++- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 3dcc6e927b..90af6ebce0 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -79,6 +79,8 @@ //| initial_sideset_pin_state: int = 0, //| initial_sideset_pin_direction: int = 0x1f, //| sideset_enable: bool = False, +//| jmp_pin: Optional[microcontroller.Pin] = None, +//| jmp_pin_pull: Optional[digitalio.Pull] = None, //| exclusive_pin_use: bool = True, //| auto_pull: bool = False, //| pull_threshold: int = 32, @@ -113,6 +115,7 @@ //| :param int initial_sideset_pin_direction: the initial output direction for sideset pins starting at first_sideset_pin //| :param bool sideset_enable: True when the top sideset bit is to enable. This should be used with the ".side_set # opt" directive //| :param ~microcontroller.Pin jmp_pin: the pin which determines the branch taken by JMP PIN instructions +//| :param ~digitalio.Pull jmp_pin_pull: The pull value for the jmp pin, default is no pull. //| :param bool exclusive_pin_use: When True, do not share any pins with other state machines. Pins are never shared with other peripherals //| :param bool auto_pull: When True, automatically load data from the tx FIFO into the //| output shift register (OSR) when an OUT instruction shifts more than pull_threshold bits @@ -150,7 +153,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n ARG_first_set_pin, ARG_set_pin_count, ARG_initial_set_pin_state, ARG_initial_set_pin_direction, ARG_first_sideset_pin, ARG_sideset_pin_count, ARG_initial_sideset_pin_state, ARG_initial_sideset_pin_direction, ARG_sideset_enable, - ARG_jmp_pin, + ARG_jmp_pin, ARG_jmp_pin_pull, ARG_exclusive_pin_use, ARG_auto_pull, ARG_pull_threshold, ARG_out_shift_right, ARG_wait_for_txstall, @@ -184,6 +187,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n { MP_QSTR_sideset_enable, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, { MP_QSTR_jmp_pin, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, + { MP_QSTR_jmp_pin_pull, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, { MP_QSTR_exclusive_pin_use, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} }, { MP_QSTR_auto_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, @@ -230,6 +234,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n } const mcu_pin_obj_t *jmp_pin = validate_obj_is_pin_or_none(args[ARG_jmp_pin].u_obj); + digitalio_pull_t jmp_pin_pull = validate_pull(args[ARG_jmp_pin_pull].u_rom_obj, MP_QSTR_jmp_pull); mp_int_t pull_threshold = args[ARG_pull_threshold].u_int; mp_int_t push_threshold = args[ARG_push_threshold].u_int; @@ -263,7 +268,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n first_set_pin, args[ARG_set_pin_count].u_int, args[ARG_initial_set_pin_state].u_int, args[ARG_initial_set_pin_direction].u_int, first_sideset_pin, args[ARG_sideset_pin_count].u_int, args[ARG_initial_sideset_pin_state].u_int, args[ARG_initial_sideset_pin_direction].u_int, args[ARG_sideset_enable].u_bool, - jmp_pin, + jmp_pin, jmp_pin_pull, 0, args[ARG_exclusive_pin_use].u_bool, args[ARG_auto_pull].u_bool, pull_threshold, args[ARG_out_shift_right].u_bool, diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index 3f3b8cf7d8..e2770cd46d 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -29,6 +29,7 @@ #include "py/obj.h" +#include "shared-bindings/digitalio/Pull.h" #include "common-hal/microcontroller/Pin.h" #include "common-hal/rp2pio/StateMachine.h" @@ -45,7 +46,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, const mcu_pin_obj_t *first_set_pin, uint8_t set_pin_count, uint32_t initial_set_pin_state, uint32_t initial_set_pin_direction, const mcu_pin_obj_t *first_sideset_pin, uint8_t sideset_pin_count, uint32_t initial_sideset_pin_state, uint32_t initial_sideset_pin_direction, bool sideset_enable, - const mcu_pin_obj_t *jmp_pin, + const mcu_pin_obj_t *jmp_pin, digitalio_pull_t jmp_pin_pull, uint32_t wait_gpio_mask, bool exclusive_pin_use, bool auto_pull, uint8_t pull_threshold, bool out_shift_right, diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c index 4296014e50..d5699742e4 100644 --- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c +++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c @@ -127,7 +127,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, 0, 0, // in pulls NULL, 0, 0, 0x1f, // set pins bit_clock, 2, 0, 0x1f, // sideset pins - NULL, // jump pin + NULL, PULL_NONE, // jump pin 0, // wait gpio pins true, // exclusive pin use false, 32, false, // shift out left to start with MSB diff --git a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c index 859e82eb11..4579dedcf5 100644 --- a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c +++ b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c @@ -71,7 +71,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, 0, 0, // in pulls NULL, 0, 0, 0x1f, // set pins clock_pin, 1, 0, 0x1f, // sideset pins - NULL, // jump pin + NULL, PULL_NONE, // jump pin 0, // wait gpio pins true, // exclusive pin use false, 32, false, // out settings diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c index 45a3766897..8890e3f526 100644 --- a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c @@ -112,7 +112,7 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle NULL, 0, 0, 0, // sideset pins #endif false, // No sideset enable - NULL, // jump pin + NULL, PULL_NONE, // jump pin (1 << vertical_sync->number) | (1 << horizontal_reference->number) | (1 << data_clock->number), // wait gpio pins true, // exclusive pin use false, 32, false, // out settings diff --git a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c index 2e0ae4def2..12f8d79a74 100644 --- a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +++ b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c @@ -100,7 +100,7 @@ void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbu NULL, 0, 0, 0, // first set pin write, 1, 0, 1, // first sideset pin false, // No sideset enable - NULL, // jump pin + NULL, PULL_NONE, // jump pin 0, // wait gpio pins true, // exclusive pin usage true, 8, true, // TX, auto pull every 8 bits. shift left to output msb first diff --git a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c index 1f15b010f7..faf63c2812 100644 --- a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c @@ -86,7 +86,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode NULL, 0, 0, 0x1f, // set pins NULL, 0, 0, 0x1f, // sideset pins false, // No sideset enable - NULL, // jump pin + NULL, PULL_NONE, // jump pin 0, // wait gpio pins true, // exclusive pin use false, 32, false, // out settings diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index ac5a41652a..5de35e51c0 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -27,6 +27,7 @@ #include "bindings/rp2pio/StateMachine.h" #include "common-hal/microcontroller/__init__.h" +#include "shared-bindings/digitalio/Pull.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" @@ -342,7 +343,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, const mcu_pin_obj_t *first_set_pin, uint8_t set_pin_count, uint32_t initial_set_pin_state, uint32_t initial_set_pin_direction, const mcu_pin_obj_t *first_sideset_pin, uint8_t sideset_pin_count, uint32_t initial_sideset_pin_state, uint32_t initial_sideset_pin_direction, bool sideset_enable, - const mcu_pin_obj_t *jmp_pin, + const mcu_pin_obj_t *jmp_pin, digitalio_pull_t jmp_pull, uint32_t wait_gpio_mask, bool exclusive_pin_use, bool auto_pull, uint8_t pull_threshold, bool out_shift_right, @@ -489,6 +490,16 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, // Deal with pull up/downs uint32_t pull_up = mask_and_rotate(first_in_pin, in_pin_count, pull_pin_up); uint32_t pull_down = mask_and_rotate(first_in_pin, in_pin_count, pull_pin_down); + + if (jmp_pin) { + uint32_t jmp_mask = mask_and_rotate(jmp_pin, 1, 0x1f); + if (jmp_pull == PULL_UP) { + pull_up |= jmp_mask; + } + if (jmp_pull == PULL_DOWN) { + pull_up |= jmp_mask; + } + } if (initial_pin_direction & (pull_up | pull_down)) { mp_raise_ValueError(translate("pull masks conflict with direction masks")); } From f2c31c8d82598a193e5527dd215fc826b346ab41 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 2 Feb 2022 10:14:19 -0600 Subject: [PATCH 0011/2403] add adafruit_floppy, put in correct position --- tools/ci_fetch_deps.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index cecf37e08b..70c7e22650 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -16,9 +16,9 @@ print(target, ref) port_deps = { "atmel-samd": [ "extmod/ulab/", + "lib/adafruit_floppy/", "lib/mp3/", "lib/protomatter/", - "lib/adafruit_floppy/", "lib/quirc/", "lib/tinyusb/", "data/nvm.toml/", @@ -31,6 +31,7 @@ port_deps = { "nrf": ["extmod/ulab/", "lib/mp3/", "lib/protomatter/", "lib/tinyusb/", "data/nvm.toml/"], "raspberrypi": [ "extmod/ulab/", + "lib/adafruit_floppy/", "lib/mp3/", "lib/protomatter/", "lib/quirc/", From 1be8ae75d4f8e422da80088388332b2be7af5aa2 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 2 Feb 2022 17:07:02 -0600 Subject: [PATCH 0012/2403] skip floppyio if not full build --- ports/atmel-samd/mpconfigport.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 51024b7b67..a82dc8554b 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -87,7 +87,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_ALARM ?= 1 CIRCUITPY_PS2IO ?= 1 CIRCUITPY_SAMD ?= 1 -CIRCUITPY_FLOPPYIO ?= 1 +CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) CIRCUITPY_WATCHDOG ?= 1 From 224069551a0d63987b3374d5e87fdae4ac9f8fac Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 2 Feb 2022 21:36:58 -0600 Subject: [PATCH 0013/2403] disable onewireio on seeduino xiao (samd21) I don't understand how this stopped fitting, as none of the added code is used in this build. --- ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk index 1334c8312c..d11bd0cc28 100644 --- a/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk +++ b/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk @@ -9,3 +9,4 @@ CHIP_FAMILY = samd21 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = NONE CIRCUITPY_FULL_BUILD = 0 +CIRCUITPY_ONEWIRE = 0 From 31febc336bdfd8cd31cddd4f1a1efa99848090ee Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 2 Feb 2022 21:37:47 -0600 Subject: [PATCH 0014/2403] fix sam e51 comment & floppy building --- ports/atmel-samd/mpconfigport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index a82dc8554b..c4d2133c9a 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -100,7 +100,7 @@ endif # samd51 ifeq ($(CHIP_FAMILY),same51) -# No native touchio on SAMD51. +# No native touchio on SAME51. CIRCUITPY_TOUCHIO_USE_NATIVE = 0 # The ?='s allow overriding in mpconfigboard.mk. @@ -108,7 +108,7 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_ALARM ?= 1 CIRCUITPY_PS2IO ?= 1 CIRCUITPY_SAMD ?= 1 -CIRCUITPY_FLOPPYIO ?= 1 +CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) From a6585c7cb7534c8f0f53095b02c43fd41e4d3a42 Mon Sep 17 00:00:00 2001 From: anecdata <16617689+anecdata@users.noreply.github.com> Date: Tue, 8 Feb 2022 23:25:07 -0600 Subject: [PATCH 0015/2403] Espressif ESP32-S3 DevKitC-1-N32R8 --- .../espressif_esp32s3_devkitc_1_n32r8/board.c | 48 ++++++++++++++++++ .../mpconfigboard.h | 41 ++++++++++++++++ .../mpconfigboard.mk | 17 +++++++ .../espressif_esp32s3_devkitc_1_n32r8/pins.c | 49 +++++++++++++++++++ .../sdkconfig | 34 +++++++++++++ .../esp-idf-config/partitions-32MB.csv | 10 ++++ .../esp-idf-config/sdkconfig-32MB.defaults | 19 +++++++ 7 files changed, 218 insertions(+) create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/board.c create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig create mode 100644 ports/espressif/esp-idf-config/partitions-32MB.csv create mode 100644 ports/espressif/esp-idf-config/sdkconfig-32MB.defaults diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/board.c new file mode 100644 index 0000000000..ff9418ec86 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/board.c @@ -0,0 +1,48 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +void board_init(void) { + // Debug UART + #ifdef DEBUG + common_hal_never_reset_pin(&pin_GPIO43); + common_hal_never_reset_pin(&pin_GPIO44); + #endif +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h new file mode 100644 index 0000000000..454203f41f --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h @@ -0,0 +1,41 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N32R8" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO48) + +#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO44) +#define DEFAULT_UART_BUS_TX (&pin_GPIO43) + +#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n") + +#define AUTORESET_DELAY_MS 500 diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk new file mode 100644 index 0000000000..1b1ab8742e --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk @@ -0,0 +1,17 @@ +USB_VID = 0x303A +USB_PID = 0x7003 +USB_PRODUCT = "ESP32-S3-DevKitC-1-N32R8" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s3 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=32MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c new file mode 100644 index 0000000000..919deca8b4 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c @@ -0,0 +1,49 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, + { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) }, + { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig new file mode 100644 index 0000000000..f508f4a67c --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig @@ -0,0 +1,34 @@ +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +# +# SPI RAM config +# +# CONFIG_SPIRAM_MODE_QUAD is not set +CONFIG_SPIRAM_MODE_OCT=y +# CONFIG_SPIRAM_TYPE_AUTO is not set +CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config + +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +# +# PSRAM Clock and CS IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM Clock and CS IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +CONFIG_SPIRAM_USE_MEMMAP=y +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP diff --git a/ports/espressif/esp-idf-config/partitions-32MB.csv b/ports/espressif/esp-idf-config/partitions-32MB.csv new file mode 100644 index 0000000000..34772c8034 --- /dev/null +++ b/ports/espressif/esp-idf-config/partitions-32MB.csv @@ -0,0 +1,10 @@ +# ESP-IDF Partition Table +# Name, Type, SubType, Offset, Size, Flags +# bootloader.bin,, 0x1000, 32K +# partition table,, 0x8000, 4K +nvs, data, nvs, 0x9000, 20K, +otadata, data, ota, 0xe000, 8K, +ota_0, 0, ota_0, 0x10000, 2048K, +ota_1, 0, ota_1, 0x210000, 2048K, +uf2, app, factory,0x410000, 256K, +user_fs, data, fat, 0x450000, 28362K, diff --git a/ports/espressif/esp-idf-config/sdkconfig-32MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-32MB.defaults new file mode 100644 index 0000000000..bbdd32afb8 --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-32MB.defaults @@ -0,0 +1,19 @@ +# +# Serial flasher config +# +# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set +CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y +CONFIG_ESPTOOLPY_FLASHSIZE="32MB" +CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# end of Serial flasher config + +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-32MB.csv" +# +# Partition Table +# +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-32MB.csv" +# end of Partition Table From a58bf235d8d90ca4ec185c296b2b95f5b11507ea Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 13 Feb 2022 16:38:53 -0600 Subject: [PATCH 0016/2403] raspberry: StateMachine: Add support for wrap=, wrap_target= --- .../bindings/rp2pio/StateMachine.c | 22 ++++++++++++-- .../bindings/rp2pio/StateMachine.h | 3 +- .../common-hal/audiobusio/I2SOut.c | 3 +- .../raspberrypi/common-hal/audiobusio/PDMIn.c | 5 ++-- .../imagecapture/ParallelImageCapture.c | 4 +-- .../common-hal/neopixel_write/__init__.c | 3 +- .../common-hal/paralleldisplay/ParallelBus.c | 5 ++-- .../raspberrypi/common-hal/pulseio/PulseIn.c | 3 +- .../common-hal/rotaryio/IncrementalEncoder.c | 4 ++- .../common-hal/rp2pio/StateMachine.c | 29 ++++++++++++------- .../common-hal/rp2pio/StateMachine.h | 4 +-- 11 files changed, 58 insertions(+), 27 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index fb13821e35..557b15617d 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -87,7 +87,10 @@ //| auto_push: bool = False, //| push_threshold: int = 32, //| in_shift_right: bool = True, -//| user_interruptible: bool = True) -> None: +//| user_interruptible: bool = True, +//| wrap_target: int = 0, +//| wrap: int = -1, +//| ) -> None: //| //| """Construct a StateMachine object on the given pins with the given program. //| @@ -136,6 +139,10 @@ //| that causes an infinite loop, you will be able to interrupt the loop. //| However, if you are writing to a device that can get into a bad state if a read or write //| is interrupted, you may want to set this to False after your program has been vetted. +//| :param int wrap_target The target instruction number of automatic wrap. Defaults to the first instruction of the program. +//| :param int wrap The instruction after which to wrap to the ``wrap`` +//| instruction. As a special case, -1 (the default) indicates the +//| last instruction of the program. //| """ //| ... //| @@ -155,7 +162,9 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n ARG_auto_pull, ARG_pull_threshold, ARG_out_shift_right, ARG_wait_for_txstall, ARG_auto_push, ARG_push_threshold, ARG_in_shift_right, - ARG_user_interruptible,}; + ARG_user_interruptible, + ARG_wrap_target, + ARG_wrap,}; static const mp_arg_t allowed_args[] = { { MP_QSTR_program, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_frequency, MP_ARG_REQUIRED | MP_ARG_INT }, @@ -194,6 +203,9 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n { MP_QSTR_push_threshold, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} }, { MP_QSTR_in_shift_right, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} }, { MP_QSTR_user_interruptible, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} }, + + { MP_QSTR_wrap_target, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, + { MP_QSTR_wrap, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -254,6 +266,9 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n mp_raise_ValueError(translate("Init program size invalid")); } + int wrap = args[ARG_wrap].u_int; + int wrap_target = args[ARG_wrap_target].u_int; + common_hal_rp2pio_statemachine_construct(self, bufinfo.buf, bufinfo.len / 2, args[ARG_frequency].u_int, @@ -269,7 +284,8 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n args[ARG_auto_pull].u_bool, pull_threshold, args[ARG_out_shift_right].u_bool, args[ARG_wait_for_txstall].u_bool, args[ARG_auto_push].u_bool, push_threshold, args[ARG_in_shift_right].u_bool, - args[ARG_user_interruptible].u_bool); + args[ARG_user_interruptible].u_bool, + wrap_target, wrap); return MP_OBJ_FROM_PTR(self); } diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index 3f3b8cf7d8..eb3f4addc5 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -51,7 +51,8 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, bool auto_pull, uint8_t pull_threshold, bool out_shift_right, bool wait_for_txstall, bool auto_push, uint8_t push_threshold, bool in_shift_right, - bool user_interruptible); + bool user_interruptible, + int wrap_taget, int wrap); void common_hal_rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self); bool common_hal_rp2pio_statemachine_deinited(rp2pio_statemachine_obj_t *self); diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c index 8432e47a52..a7cce01640 100644 --- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c +++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c @@ -134,7 +134,8 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, false, 32, false, // shift out left to start with MSB false, // Wait for txstall false, 32, false, // in settings - false); // Not user-interruptible. + false, // Not user-interruptible. + 0, -1); // wrap settings self->playing = false; audio_dma_init(&self->dma); diff --git a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c index 4b5694706f..de1b8a4b5e 100644 --- a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c +++ b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c @@ -63,7 +63,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, // Use the state machine to manage pins. common_hal_rp2pio_statemachine_construct(&self->state_machine, - pdmin, sizeof(pdmin) / sizeof(pdmin[0]), + pdmin, MP_ARRAY_SIZE(pdmin), sample_rate * 32 * 2, // Frequency based on sample rate NULL, 0, NULL, 1, 0, 0xffffffff, // out pin @@ -78,7 +78,8 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, false, 32, false, // out settings false, // Wait for txstall false, 32, true, // in settings - false); // Not user-interruptible. + false, // Not user-interruptible. + 0, -1); // wrap settings uint32_t actual_frequency = common_hal_rp2pio_statemachine_get_frequency(&self->state_machine); if (actual_frequency < MIN_MIC_CLOCK) { diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c index 45a3766897..045441aedd 100644 --- a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c @@ -118,13 +118,13 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle false, 32, false, // out settings false, // wait for txstall true, 32, true, // in settings - false); // Not user-interruptible. + false, // Not user-interruptible. + 2, 5); // wrap settings PIO pio = self->state_machine.pio; uint8_t pio_index = pio_get_index(pio); uint sm = self->state_machine.state_machine; - rp2pio_statemachine_set_wrap(&self->state_machine, 2, 5); } void common_hal_imagecapture_parallelimagecapture_deinit(imagecapture_parallelimagecapture_obj_t *self) { diff --git a/ports/raspberrypi/common-hal/neopixel_write/__init__.c b/ports/raspberrypi/common-hal/neopixel_write/__init__.c index 09388af481..1acfed055c 100644 --- a/ports/raspberrypi/common-hal/neopixel_write/__init__.c +++ b/ports/raspberrypi/common-hal/neopixel_write/__init__.c @@ -78,7 +78,8 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, false, 32, true, // RX setting we don't use false, // claim pins false, // Not user-interruptible. - false); // No sideset enable + false, // No sideset enable + 0, -1); // wrap if (!ok) { // Do nothing. Maybe bitbang? return; diff --git a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c index 2e0ae4def2..4243eddab3 100644 --- a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +++ b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c @@ -92,7 +92,7 @@ void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbu } common_hal_rp2pio_statemachine_construct(&self->state_machine, - parallel_program, sizeof(parallel_program) / sizeof(parallel_program[0]), + parallel_program, MP_ARRAY_SIZE(parallel_program), frequency * 2, // frequency multiplied by 2 as 2 PIO instructions NULL, 0, // init data0, 8, 0, 255, // first out pin, # out pins @@ -106,7 +106,8 @@ void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbu true, 8, true, // TX, auto pull every 8 bits. shift left to output msb first false, // wait for TX stall false, 32, true, // RX setting we don't use - false); // Not user-interruptible. + false, // Not user-interruptible. + 0, -1); // wrap settings common_hal_rp2pio_statemachine_never_reset(&self->state_machine); } diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index e507cd16e8..83edde25ad 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -74,7 +74,8 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, true, 32, true, // RX auto-push every 32 bits false, // claim pins false, // Not user-interruptible. - false); // No sideset enable + false, // No sideset enable + 0, -1); // wrap settings if (!ok) { mp_raise_RuntimeError(translate("All state machines in use")); diff --git a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c index 1f15b010f7..97749c8f14 100644 --- a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c @@ -92,7 +92,9 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode false, 32, false, // out settings false, // Wait for txstall false, 32, false, // in settings - false); // Not user-interruptible. + false, // Not user-interruptible. + 0, MP_ARRAY_SIZE(encoder) - 1 // wrap settings + ); // We're guaranteed by the init code that some output will be available promptly uint8_t quiescent_state; diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index ac5a41652a..cd1d383008 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -165,7 +165,8 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, bool auto_push, uint8_t push_threshold, bool in_shift_right, bool claim_pins, bool user_interruptible, - bool sideset_enable + bool sideset_enable, + int wrap_target, int wrap ) { // Create a program id that isn't the pointer so we can store it without storing the original object. uint32_t program_id = ~((uint32_t)program); @@ -289,7 +290,18 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, if (jmp_pin != NULL) { sm_config_set_jmp_pin(&c, jmp_pin->number); } - sm_config_set_wrap(&c, program_offset, program_offset + program_len - 1); + + mp_arg_validate_int_range(wrap, -1, program_len - 1, MP_QSTR_wrap); + if (wrap == -1) { + wrap = program_len - 1; + } + + mp_arg_validate_int_range(wrap_target, 0, program_len - 1, MP_QSTR_wrap_target); + + wrap += program_offset; + wrap_target += program_offset; + + sm_config_set_wrap(&c, wrap_target, wrap); sm_config_set_in_shift(&c, in_shift_right, auto_push, push_threshold); sm_config_set_out_shift(&c, out_shift_right, auto_pull, pull_threshold); @@ -348,7 +360,8 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, bool auto_pull, uint8_t pull_threshold, bool out_shift_right, bool wait_for_txstall, bool auto_push, uint8_t push_threshold, bool in_shift_right, - bool user_interruptible) { + bool user_interruptible, + int wrap_target, int wrap) { // First, check that all pins are free OR already in use by any PIO if exclusive_pin_use is false. uint32_t pins_we_use = wait_gpio_mask; @@ -510,7 +523,8 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, auto_push, push_threshold, in_shift_right, true /* claim pins */, user_interruptible, - sideset_enable); + sideset_enable, + wrap_target, wrap); if (!ok) { mp_raise_RuntimeError(translate("All state machines in use")); } @@ -834,10 +848,3 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { uint8_t sm = self->state_machine; return _current_program_offset[pio_index][sm]; } - -void rp2pio_statemachine_set_wrap(rp2pio_statemachine_obj_t *self, uint wrap_target, uint wrap) { - uint8_t sm = self->state_machine; - uint8_t offset = rp2pio_statemachine_program_offset(self); - - pio_sm_set_wrap(self->pio, sm, offset + wrap_target, offset + wrap); -} diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h index 125e0fa68b..0e8e7a3806 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h @@ -76,10 +76,10 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, bool auto_push, uint8_t push_threshold, bool in_shift_right, bool claim_pins, bool interruptible, - bool sideset_enable); + bool sideset_enable, + int wrap_target, int wrap); uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self); -void rp2pio_statemachine_set_wrap(rp2pio_statemachine_obj_t *self, uint wrap_target, uint wrap); void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins); From 729fcf749ea3981349b949746e38365e156fdf79 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 15 Feb 2022 16:03:52 -0600 Subject: [PATCH 0017/2403] Fix doc markup --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 557b15617d..98213be265 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -139,8 +139,8 @@ //| that causes an infinite loop, you will be able to interrupt the loop. //| However, if you are writing to a device that can get into a bad state if a read or write //| is interrupted, you may want to set this to False after your program has been vetted. -//| :param int wrap_target The target instruction number of automatic wrap. Defaults to the first instruction of the program. -//| :param int wrap The instruction after which to wrap to the ``wrap`` +//| :param int wrap_target: The target instruction number of automatic wrap. Defaults to the first instruction of the program. +//| :param int wrap: The instruction after which to wrap to the ``wrap`` //| instruction. As a special case, -1 (the default) indicates the //| last instruction of the program. //| """ From ba229f1007b82e614c62e106ba32cb628c45e378 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sat, 19 Feb 2022 10:41:42 -0600 Subject: [PATCH 0018/2403] Initial commit of uzlib module --- lib/uzlib/uzlib.h | 2 + py/circuitpy_defns.mk | 16 +++++ py/circuitpy_mpconfig.mk | 4 ++ shared-bindings/uzlib/DecompIO.c | 86 ++++++++++++++++++++++++++ shared-bindings/uzlib/DecompIO.h | 37 +++++++++++ shared-bindings/uzlib/__init__.c | 72 ++++++++++++++++++++++ shared-bindings/uzlib/__init__.h | 32 ++++++++++ shared-module/uzlib/DecompIO.c | 101 +++++++++++++++++++++++++++++++ shared-module/uzlib/DecompIO.h | 44 ++++++++++++++ shared-module/uzlib/__init__.c | 100 ++++++++++++++++++++++++++++++ 10 files changed, 494 insertions(+) create mode 100644 shared-bindings/uzlib/DecompIO.c create mode 100644 shared-bindings/uzlib/DecompIO.h create mode 100644 shared-bindings/uzlib/__init__.c create mode 100644 shared-bindings/uzlib/__init__.h create mode 100644 shared-module/uzlib/DecompIO.c create mode 100644 shared-module/uzlib/DecompIO.h create mode 100644 shared-module/uzlib/__init__.c diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h index 3a4a1ad160..7d8949543e 100644 --- a/lib/uzlib/uzlib.h +++ b/lib/uzlib/uzlib.h @@ -83,6 +83,8 @@ typedef struct { } TINF_TREE; struct uzlib_uncomp { + /* Point to the CircuitPython object that owns this decompression stream */ + void *self; /* Pointer to the next byte in the input buffer */ const unsigned char *source; /* Pointer to the next byte past the input buffer (source_limit = source + len) */ diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 15828f6616..044dc143c7 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -321,6 +321,9 @@ endif ifeq ($(CIRCUITPY_USTACK),1) SRC_PATTERNS += ustack/% endif +ifeq ($(CIRCUITPY_UZLIB),1) +SRC_PATTERNS += uzlib/% +endif ifeq ($(CIRCUITPY_VIDEOCORE),1) SRC_PATTERNS += videocore/% endif @@ -578,6 +581,8 @@ SRC_SHARED_MODULE_ALL = \ traceback/__init__.c \ uheap/__init__.c \ ustack/__init__.c \ + uzlib/__init__.c \ + uzlib/DecompIO.c \ vectorio/Circle.c \ vectorio/Polygon.c \ vectorio/Rectangle.c \ @@ -634,6 +639,17 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes endif +ifeq ($(CIRCUITPY_UZLIB),1) +SRC_MOD += $(addprefix lib/uzlib/, \ + tinflate.c \ + tinfzlib.c \ + tinfgzip.c \ + adler32.c \ + crc32.c \ +) +$(BUILD)/lib/uzlib/tinflate.o: CFLAGS += -Wno-missing-braces -Wno-missing-prototypes +endif + # All possible sources are listed here, and are filtered by SRC_PATTERNS. SRC_SHARED_MODULE_INTERNAL = \ $(filter $(SRC_PATTERNS), \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 14852580e5..b4b6b8ddd7 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -446,6 +446,10 @@ CFLAGS += -DUSB_NUM_ENDPOINT_PAIRS=$(USB_NUM_ENDPOINT_PAIRS) CIRCUITPY_USTACK ?= 0 CFLAGS += -DCIRCUITPY_USTACK=$(CIRCUITPY_USTACK) +# for decompressing utlities +CIRCUITPY_UZLIB ?= 1 +CFLAGS += -DCIRCUITPY_UZLIB=$(CIRCUITPY_UZLIB) + # ulab numerics library CIRCUITPY_ULAB ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_ULAB=$(CIRCUITPY_ULAB) diff --git a/shared-bindings/uzlib/DecompIO.c b/shared-bindings/uzlib/DecompIO.c new file mode 100644 index 0000000000..5151113385 --- /dev/null +++ b/shared-bindings/uzlib/DecompIO.c @@ -0,0 +1,86 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include "py/obj.h" +#include "py/stream.h" +#include "py/runtime.h" +#include "shared-bindings/uzlib/DecompIO.h" +#include "shared-module/uzlib/DecompIO.h" + +STATIC mp_obj_t uzlib_decompio_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, 2, false); + mp_get_stream_raise(args[0], MP_STREAM_OP_READ); + + mp_obj_decompio_t *self = m_new_obj(mp_obj_decompio_t); + self->base.type = type; + memset(&self->decomp, 0, sizeof(self->decomp)); + + mp_int_t dict_opt = 0; + if (n_args > 1) { + dict_opt = mp_obj_get_int(args[1]); + } + + common_hal_uzlib_decompio_construct(self, args[0], dict_opt); + + return MP_OBJ_FROM_PTR(self); +} + +STATIC mp_uint_t uzlib_decompio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { + mp_obj_decompio_t *self = MP_OBJ_TO_PTR(self_in); + if (self->eof) { + return 0; + } + + return common_hal_uzlib_decompio_read(self, buf, size, errcode); +} + +STATIC const mp_rom_map_elem_t decompio_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, + { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, +}; + +STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table); + +STATIC const mp_stream_p_t decompio_stream_p = { + MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream) + .read = uzlib_decompio_read, + .write = NULL, + .ioctl = NULL, + .is_text = false, +}; + +const mp_obj_type_t decompio_type = { + { &mp_type_type }, + .flags = MP_TYPE_FLAG_EXTENDED, + .name = MP_QSTR_DecompIO, + .make_new = uzlib_decompio_make_new, + .locals_dict = (void *)&decompio_locals_dict, + MP_TYPE_EXTENDED_FIELDS( + .protocol = &decompio_stream_p, + ), +}; diff --git a/shared-bindings/uzlib/DecompIO.h b/shared-bindings/uzlib/DecompIO.h new file mode 100644 index 0000000000..65f0c9d9ae --- /dev/null +++ b/shared-bindings/uzlib/DecompIO.h @@ -0,0 +1,37 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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_UZLIB_DECOMPIO_H +#define MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB_DECOMPIO_H + +#include "shared-module/uzlib/DecompIO.h" + +extern const mp_obj_type_t decompio_type; + +extern void common_hal_uzlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt); +extern mp_uint_t common_hal_uzlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB_DECOMPIO_H diff --git a/shared-bindings/uzlib/__init__.c b/shared-bindings/uzlib/__init__.c new file mode 100644 index 0000000000..c8fad450fb --- /dev/null +++ b/shared-bindings/uzlib/__init__.c @@ -0,0 +1,72 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include +#include + +#include "py/obj.h" +#include "py/runtime.h" +#include "py/stream.h" +#include "py/mperrno.h" +#include "py/builtin.h" +#include "py/objtuple.h" +#include "py/binary.h" +#include "py/parsenum.h" + +#include "shared-bindings/uzlib/DecompIO.h" + +#include "supervisor/shared/translate.h" + +#include "shared-bindings/uzlib/__init__.h" +#include "shared-bindings/uzlib/DecompIO.h" + +STATIC mp_obj_t uzlib_decompress(size_t n_args, const mp_obj_t *args) { + // TODO: Check number of args + + bool is_zlib = true; + if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) { + is_zlib = false; + } + + return common_hal_uzlib_decompress(args[0], is_zlib); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uzlib_decompress_obj, 1, 3, uzlib_decompress); + +STATIC const mp_rom_map_elem_t uzlib_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uzlib) }, + { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&uzlib_decompress_obj) }, + { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) }, +}; + +STATIC MP_DEFINE_CONST_DICT(uzlib_globals, uzlib_globals_table); + +const mp_obj_module_t uzlib_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&uzlib_globals, +}; + +MP_REGISTER_MODULE(MP_QSTR_uzlib, uzlib_module, CIRCUITPY_UZLIB); diff --git a/shared-bindings/uzlib/__init__.h b/shared-bindings/uzlib/__init__.h new file mode 100644 index 0000000000..b365317a94 --- /dev/null +++ b/shared-bindings/uzlib/__init__.h @@ -0,0 +1,32 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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_UZLIB___INIT___H +#define MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB___INIT___H + +mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB___INIT___H diff --git a/shared-module/uzlib/DecompIO.c b/shared-module/uzlib/DecompIO.c new file mode 100644 index 0000000000..7df944f4e8 --- /dev/null +++ b/shared-module/uzlib/DecompIO.c @@ -0,0 +1,101 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include +#include + +#include "py/obj.h" +#include "py/runtime.h" +#include "py/stream.h" +#include "py/mperrno.h" +#include "py/builtin.h" +#include "py/objtuple.h" +#include "py/binary.h" +#include "py/parsenum.h" + +#include "shared-bindings/uzlib/__init__.h" +#include "shared-bindings/uzlib/DecompIO.h" +#include "shared-module/uzlib/DecompIO.h" + +STATIC int read_src_stream(TINF_DATA *data) { + mp_obj_decompio_t *self = (mp_obj_decompio_t *)data->self; + + const mp_stream_p_t *stream = mp_get_stream_raise(self->src_stream, MP_STREAM_OP_READ); + int err; + byte c; + mp_uint_t out_sz = stream->read(self->src_stream, &c, 1, &err); + + if (out_sz == MP_STREAM_ERROR) { + mp_raise_OSError(err); + } + if (out_sz == 0) { + mp_raise_type(&mp_type_EOFError); + } + return c; +} + +void common_hal_uzlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt) { + self->decomp.self = self; + self->decomp.readSource = read_src_stream; + self->src_stream = src_stream; + self->eof = false; + + int dict_sz; + + if (dict_opt >= 16) { + int st = uzlib_gzip_parse_header(&self->decomp); + if (st != TINF_OK) { + goto header_error; + } + dict_sz = 1 << (dict_opt - 16); + } else if (dict_opt >= 0) { + dict_opt = uzlib_zlib_parse_header(&self->decomp); + if (dict_opt < 0) { + header_error: + mp_raise_ValueError(MP_ERROR_TEXT("compression header")); + } + dict_sz = 1 << dict_opt; + } else { + dict_sz = 1 << -dict_opt; + } + + uzlib_uncompress_init(&self->decomp, m_new(byte, dict_sz), dict_sz); +} + +mp_uint_t common_hal_uzlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode) { + self->decomp.dest = buf; + self->decomp.dest_limit = (unsigned char *)buf + size; + int st = uzlib_uncompress_chksum(&self->decomp); + if (st == TINF_DONE) { + self->eof = true; + } + if (st < 0) { + *errcode = MP_EINVAL; + return MP_STREAM_ERROR; + } + return self->decomp.dest - (byte *)buf; +} diff --git a/shared-module/uzlib/DecompIO.h b/shared-module/uzlib/DecompIO.h new file mode 100644 index 0000000000..9ca583dbb8 --- /dev/null +++ b/shared-module/uzlib/DecompIO.h @@ -0,0 +1,44 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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_UZLIB_DECOMPIO_H +#define SHARED_MODULE_UZLIB_DECOMPIO_H + +#include +#include + +#include "py/obj.h" +#define UZLIB_CONF_PARANOID_CHECKS (1) +#include "lib/uzlib/tinf.h" + +typedef struct _mp_obj_decompio_t { + mp_obj_base_t base; + mp_obj_t src_stream; + TINF_DATA decomp; + bool eof; +} mp_obj_decompio_t; + +#endif /* SHARED_MODULE_UZLIB_DECOMPIO_H */ diff --git a/shared-module/uzlib/__init__.c b/shared-module/uzlib/__init__.c new file mode 100644 index 0000000000..3fe75c69b1 --- /dev/null +++ b/shared-module/uzlib/__init__.c @@ -0,0 +1,100 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include +#include + +#include "py/obj.h" +#include "py/runtime.h" +#include "py/stream.h" +#include "py/mperrno.h" +#include "py/builtin.h" +#include "py/objtuple.h" +#include "py/binary.h" +#include "py/parsenum.h" + +#include "shared-bindings/uzlib/__init__.h" + +#define UZLIB_CONF_PARANOID_CHECKS (1) +#include "lib/uzlib/tinf.h" + +#if 0 // print debugging info +#define DEBUG_printf DEBUG_printf +#else // don't print debugging info +#define DEBUG_printf(...) (void)0 +#endif + +mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib) { + mp_buffer_info_t bufinfo; + mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ); + + TINF_DATA *decomp = m_new_obj(TINF_DATA); + memset(decomp, 0, sizeof(*decomp)); + DEBUG_printf("sizeof(TINF_DATA)=" UINT_FMT "\n", sizeof(*decomp)); + uzlib_uncompress_init(decomp, NULL, 0); + mp_uint_t dest_buf_size = (bufinfo.len + 15) & ~15; + byte *dest_buf = m_new(byte, dest_buf_size); + + decomp->dest = dest_buf; + decomp->dest_limit = dest_buf + dest_buf_size; + DEBUG_printf("uzlib: Initial out buffer: " UINT_FMT " bytes\n", decomp->destSize); + decomp->source = bufinfo.buf; + decomp->source_limit = (unsigned char *)bufinfo.buf + bufinfo.len; + int st; + + if (is_zlib) { + st = uzlib_zlib_parse_header(decomp); + if (st < 0) { + goto error; + } + } + + while (1) { + st = uzlib_uncompress_chksum(decomp); + if (st < 0) { + goto error; + } + if (st == TINF_DONE) { + break; + } + size_t offset = decomp->dest - dest_buf; + dest_buf = m_renew(byte, dest_buf, dest_buf_size, dest_buf_size + 256); + dest_buf_size += 256; + decomp->dest = dest_buf + offset; + decomp->dest_limit = dest_buf + offset + 256; + } + + mp_uint_t final_sz = decomp->dest - dest_buf; + DEBUG_printf("uzlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz); + dest_buf = (byte *)m_renew(byte, dest_buf, dest_buf_size, final_sz); + mp_obj_t res = mp_obj_new_bytearray_by_ref(final_sz, dest_buf); + m_del_obj(TINF_DATA, decomp); + return res; + +error: + mp_raise_type_arg(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)); +} From 664e02535b1661e687afecd7886382126d4c8ede Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 20 Feb 2022 15:32:44 -0600 Subject: [PATCH 0019/2403] Renaming and documentation --- locale/circuitpython.pot | 2 +- py/circuitpy_defns.mk | 10 +- py/circuitpy_mpconfig.mk | 4 +- shared-bindings/uzlib/DecompIO.c | 86 -------------- shared-bindings/uzlib/__init__.c | 72 ----------- shared-bindings/zlib/DecompIO.c | 132 +++++++++++++++++++++ shared-bindings/{uzlib => zlib}/DecompIO.h | 12 +- shared-bindings/zlib/__init__.c | 89 ++++++++++++++ shared-bindings/{uzlib => zlib}/__init__.h | 8 +- shared-module/{uzlib => zlib}/DecompIO.c | 10 +- shared-module/{uzlib => zlib}/DecompIO.h | 6 +- shared-module/{uzlib => zlib}/__init__.c | 8 +- 12 files changed, 251 insertions(+), 188 deletions(-) delete mode 100644 shared-bindings/uzlib/DecompIO.c delete mode 100644 shared-bindings/uzlib/__init__.c create mode 100644 shared-bindings/zlib/DecompIO.c rename shared-bindings/{uzlib => zlib}/DecompIO.h (73%) create mode 100644 shared-bindings/zlib/__init__.c rename shared-bindings/{uzlib => zlib}/__init__.h (83%) rename shared-module/{uzlib => zlib}/DecompIO.c (89%) rename shared-module/{uzlib => zlib}/DecompIO.h (92%) rename shared-module/{uzlib => zlib}/__init__.c (90%) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 336dd49daf..776c0291b3 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -3016,7 +3016,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 044dc143c7..07a8d2fd86 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -321,8 +321,8 @@ endif ifeq ($(CIRCUITPY_USTACK),1) SRC_PATTERNS += ustack/% endif -ifeq ($(CIRCUITPY_UZLIB),1) -SRC_PATTERNS += uzlib/% +ifeq ($(CIRCUITPY_ZLIB),1) +SRC_PATTERNS += zlib/% endif ifeq ($(CIRCUITPY_VIDEOCORE),1) SRC_PATTERNS += videocore/% @@ -581,8 +581,8 @@ SRC_SHARED_MODULE_ALL = \ traceback/__init__.c \ uheap/__init__.c \ ustack/__init__.c \ - uzlib/__init__.c \ - uzlib/DecompIO.c \ + zlib/__init__.c \ + zlib/DecompIO.c \ vectorio/Circle.c \ vectorio/Polygon.c \ vectorio/Rectangle.c \ @@ -639,7 +639,7 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes endif -ifeq ($(CIRCUITPY_UZLIB),1) +ifeq ($(CIRCUITPY_ZLIB),1) SRC_MOD += $(addprefix lib/uzlib/, \ tinflate.c \ tinfzlib.c \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index b4b6b8ddd7..bd4e8fe3c7 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -447,8 +447,8 @@ CIRCUITPY_USTACK ?= 0 CFLAGS += -DCIRCUITPY_USTACK=$(CIRCUITPY_USTACK) # for decompressing utlities -CIRCUITPY_UZLIB ?= 1 -CFLAGS += -DCIRCUITPY_UZLIB=$(CIRCUITPY_UZLIB) +CIRCUITPY_ZLIB ?= 1 +CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB) # ulab numerics library CIRCUITPY_ULAB ?= $(CIRCUITPY_FULL_BUILD) diff --git a/shared-bindings/uzlib/DecompIO.c b/shared-bindings/uzlib/DecompIO.c deleted file mode 100644 index 5151113385..0000000000 --- a/shared-bindings/uzlib/DecompIO.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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 -#include "py/obj.h" -#include "py/stream.h" -#include "py/runtime.h" -#include "shared-bindings/uzlib/DecompIO.h" -#include "shared-module/uzlib/DecompIO.h" - -STATIC mp_obj_t uzlib_decompio_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, 2, false); - mp_get_stream_raise(args[0], MP_STREAM_OP_READ); - - mp_obj_decompio_t *self = m_new_obj(mp_obj_decompio_t); - self->base.type = type; - memset(&self->decomp, 0, sizeof(self->decomp)); - - mp_int_t dict_opt = 0; - if (n_args > 1) { - dict_opt = mp_obj_get_int(args[1]); - } - - common_hal_uzlib_decompio_construct(self, args[0], dict_opt); - - return MP_OBJ_FROM_PTR(self); -} - -STATIC mp_uint_t uzlib_decompio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { - mp_obj_decompio_t *self = MP_OBJ_TO_PTR(self_in); - if (self->eof) { - return 0; - } - - return common_hal_uzlib_decompio_read(self, buf, size, errcode); -} - -STATIC const mp_rom_map_elem_t decompio_locals_dict_table[] = { - { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, - { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, - { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, -}; - -STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table); - -STATIC const mp_stream_p_t decompio_stream_p = { - MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream) - .read = uzlib_decompio_read, - .write = NULL, - .ioctl = NULL, - .is_text = false, -}; - -const mp_obj_type_t decompio_type = { - { &mp_type_type }, - .flags = MP_TYPE_FLAG_EXTENDED, - .name = MP_QSTR_DecompIO, - .make_new = uzlib_decompio_make_new, - .locals_dict = (void *)&decompio_locals_dict, - MP_TYPE_EXTENDED_FIELDS( - .protocol = &decompio_stream_p, - ), -}; diff --git a/shared-bindings/uzlib/__init__.c b/shared-bindings/uzlib/__init__.c deleted file mode 100644 index c8fad450fb..0000000000 --- a/shared-bindings/uzlib/__init__.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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 -#include -#include - -#include "py/obj.h" -#include "py/runtime.h" -#include "py/stream.h" -#include "py/mperrno.h" -#include "py/builtin.h" -#include "py/objtuple.h" -#include "py/binary.h" -#include "py/parsenum.h" - -#include "shared-bindings/uzlib/DecompIO.h" - -#include "supervisor/shared/translate.h" - -#include "shared-bindings/uzlib/__init__.h" -#include "shared-bindings/uzlib/DecompIO.h" - -STATIC mp_obj_t uzlib_decompress(size_t n_args, const mp_obj_t *args) { - // TODO: Check number of args - - bool is_zlib = true; - if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) { - is_zlib = false; - } - - return common_hal_uzlib_decompress(args[0], is_zlib); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uzlib_decompress_obj, 1, 3, uzlib_decompress); - -STATIC const mp_rom_map_elem_t uzlib_globals_table[] = { - { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uzlib) }, - { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&uzlib_decompress_obj) }, - { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) }, -}; - -STATIC MP_DEFINE_CONST_DICT(uzlib_globals, uzlib_globals_table); - -const mp_obj_module_t uzlib_module = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&uzlib_globals, -}; - -MP_REGISTER_MODULE(MP_QSTR_uzlib, uzlib_module, CIRCUITPY_UZLIB); diff --git a/shared-bindings/zlib/DecompIO.c b/shared-bindings/zlib/DecompIO.c new file mode 100644 index 0000000000..7416bcd9da --- /dev/null +++ b/shared-bindings/zlib/DecompIO.c @@ -0,0 +1,132 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include "py/obj.h" +#include "py/stream.h" +#include "py/runtime.h" +#include "shared-bindings/zlib/DecompIO.h" +#include "shared-module/zlib/DecompIO.h" + +//| class DecompIO: +//| """A stream wrapper which allows transparent decompression of compressed data in +//| another stream. This allows to process compressed streams with data larger +//| than available heap size. +//| +//| *wbits* is DEFLATE dictionary window size used during compression (8-15, the +//| dictionary size is power of 2 of that value). Additionally, if value is positive, +//| *data* is assumed to be zlib stream (with zlib header). Otherwise, if it's +//| negative, it's assumed to be raw DEFLATE stream. *wbits* values 24..31 (16 + 8..15) +//| mean that input stream has gzip header.""" +//| +//| def __init__(self, stream: IO[AnyStr], wbits: Optional[int] = 0) -> None: +//| """Creates a DecompIO object to decompress stream data. +//| """ +//| ... +//| + +// These are standard stream methods. Code is in py/stream.c. +// +//| def read(self, nbytes: Optional[int] = None) -> Optional[bytes]: +//| """Read characters. If ``nbytes`` is specified then read at most that many +//| bytes. Otherwise, read everything that arrives until the connection +//| times out. Providing the number of bytes expected is highly recommended +//| because it will be faster. +//| +//| :return: Data read +//| :rtype: bytes or None""" +//| ... +//| +//| def readinto(self, buf: WriteableBuffer, nbytes: Optional[int] = None) -> Optional[bytes]: +//| """Read bytes into the ``buf``. If ``nbytes`` is specified then read at most +//| that many bytes. Otherwise, read at most ``len(buf)`` bytes. +//| +//| :return: number of bytes read and stored into ``buf`` +//| :rtype: bytes or None""" +//| ... +//| +//| def readline(self, nbytes: Optional[int] = None) -> Optional[bytes]: +//| """Read and return one line from the stream. The line terminator is always b'\n'. +//| If ``nbytes`` is specified then read at most that many bytes. +//| +//| :return: Data read +//| :rtype: bytes or None""" +//| ... +//| + +STATIC mp_obj_t zlib_decompio_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, 2, false); + mp_get_stream_raise(args[0], MP_STREAM_OP_READ); + + mp_obj_decompio_t *self = m_new_obj(mp_obj_decompio_t); + self->base.type = type; + memset(&self->decomp, 0, sizeof(self->decomp)); + + mp_int_t dict_opt = 0; + if (n_args > 1) { + dict_opt = mp_obj_get_int(args[1]); + } + + common_hal_zlib_decompio_construct(self, args[0], dict_opt); + + return MP_OBJ_FROM_PTR(self); +} + +STATIC mp_uint_t zlib_decompio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { + mp_obj_decompio_t *self = MP_OBJ_TO_PTR(self_in); + if (self->eof) { + return 0; + } + + return common_hal_zlib_decompio_read(self, buf, size, errcode); +} + +STATIC const mp_rom_map_elem_t decompio_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, + { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, +}; + +STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table); + +STATIC const mp_stream_p_t decompio_stream_p = { + MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream) + .read = zlib_decompio_read, + .write = NULL, + .ioctl = NULL, + .is_text = false, +}; + +const mp_obj_type_t decompio_type = { + { &mp_type_type }, + .flags = MP_TYPE_FLAG_EXTENDED, + .name = MP_QSTR_DecompIO, + .make_new = zlib_decompio_make_new, + .locals_dict = (void *)&decompio_locals_dict, + MP_TYPE_EXTENDED_FIELDS( + .protocol = &decompio_stream_p, + ), +}; diff --git a/shared-bindings/uzlib/DecompIO.h b/shared-bindings/zlib/DecompIO.h similarity index 73% rename from shared-bindings/uzlib/DecompIO.h rename to shared-bindings/zlib/DecompIO.h index 65f0c9d9ae..65a90cbfb8 100644 --- a/shared-bindings/uzlib/DecompIO.h +++ b/shared-bindings/zlib/DecompIO.h @@ -24,14 +24,14 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB_DECOMPIO_H -#define MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB_DECOMPIO_H +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB_DECOMPIO_H +#define MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB_DECOMPIO_H -#include "shared-module/uzlib/DecompIO.h" +#include "shared-module/zlib/DecompIO.h" extern const mp_obj_type_t decompio_type; -extern void common_hal_uzlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt); -extern mp_uint_t common_hal_uzlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode); +extern void common_hal_zlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt); +extern mp_uint_t common_hal_zlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode); -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB_DECOMPIO_H +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB_DECOMPIO_H diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c new file mode 100644 index 0000000000..4e85ad2c89 --- /dev/null +++ b/shared-bindings/zlib/__init__.c @@ -0,0 +1,89 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Mark Komus + * + * 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 +#include +#include + +#include "py/obj.h" +#include "py/runtime.h" +#include "py/stream.h" +#include "py/mperrno.h" +#include "py/builtin.h" +#include "py/objtuple.h" +#include "py/binary.h" +#include "py/parsenum.h" + +#include "shared-bindings/zlib/DecompIO.h" +#include "shared-bindings/zlib/__init__.h" + +#include "supervisor/shared/translate.h" + +//| """zlib decompression functionality +//| +//| The `zlib` module allows limited functionality similar to the CPython zlib library. +//| This module allows to decompress binary data compressed with DEFLATE algorithm +//| (commonly used in zlib library and gzip archiver). Compression is not yet implemented.""" +//| + +//| def zlib_decompress(data: bytes, wbits: Optional[int] = 0, bufsize: Optional[int] = 0) -> bytes: +//| """Return decompressed *data* as bytes. *wbits* is DEFLATE dictionary window +//| size used during compression (8-15, the dictionary size is power of 2 of +//| that value). Additionally, if value is positive, *data* is assumed to be +//| zlib stream (with zlib header). Otherwise, if it's negative, it's assumed +//| to be raw DEFLATE stream. *bufsize* parameter is for compatibility with +//| CPython and is ignored. +//| +//| :param ~bytes data: data to be decompressed +//| :param ~int wbits: DEFLATE dictionary window size used during compression +//| :param ~int bufsize: ignored for compatibility with CPython only +//| """ +//| ... +//| +STATIC mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) { + bool is_zlib = true; + if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) { + is_zlib = false; + } + + return common_hal_zlib_decompress(args[0], is_zlib); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zlib_decompress_obj, 1, 3, zlib_decompress); + +STATIC const mp_rom_map_elem_t zlib_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) }, + { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&zlib_decompress_obj) }, + { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) }, +}; + +STATIC MP_DEFINE_CONST_DICT(zlib_globals, zlib_globals_table); + +const mp_obj_module_t zlib_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&zlib_globals, +}; + +MP_REGISTER_MODULE(MP_QSTR_zlib, zlib_module, CIRCUITPY_ZLIB); diff --git a/shared-bindings/uzlib/__init__.h b/shared-bindings/zlib/__init__.h similarity index 83% rename from shared-bindings/uzlib/__init__.h rename to shared-bindings/zlib/__init__.h index b365317a94..232d08e294 100644 --- a/shared-bindings/uzlib/__init__.h +++ b/shared-bindings/zlib/__init__.h @@ -24,9 +24,9 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB___INIT___H -#define MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB___INIT___H +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB___INIT___H +#define MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB___INIT___H -mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib); +mp_obj_t common_hal_zlib_decompress(mp_obj_t data, bool is_zlib); -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_UZLIB___INIT___H +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB___INIT___H diff --git a/shared-module/uzlib/DecompIO.c b/shared-module/zlib/DecompIO.c similarity index 89% rename from shared-module/uzlib/DecompIO.c rename to shared-module/zlib/DecompIO.c index 7df944f4e8..b182304f19 100644 --- a/shared-module/uzlib/DecompIO.c +++ b/shared-module/zlib/DecompIO.c @@ -37,9 +37,9 @@ #include "py/binary.h" #include "py/parsenum.h" -#include "shared-bindings/uzlib/__init__.h" -#include "shared-bindings/uzlib/DecompIO.h" -#include "shared-module/uzlib/DecompIO.h" +#include "shared-bindings/zlib/__init__.h" +#include "shared-bindings/zlib/DecompIO.h" +#include "shared-module/zlib/DecompIO.h" STATIC int read_src_stream(TINF_DATA *data) { mp_obj_decompio_t *self = (mp_obj_decompio_t *)data->self; @@ -58,7 +58,7 @@ STATIC int read_src_stream(TINF_DATA *data) { return c; } -void common_hal_uzlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt) { +void common_hal_zlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt) { self->decomp.self = self; self->decomp.readSource = read_src_stream; self->src_stream = src_stream; @@ -86,7 +86,7 @@ void common_hal_uzlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_s uzlib_uncompress_init(&self->decomp, m_new(byte, dict_sz), dict_sz); } -mp_uint_t common_hal_uzlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode) { +mp_uint_t common_hal_zlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode) { self->decomp.dest = buf; self->decomp.dest_limit = (unsigned char *)buf + size; int st = uzlib_uncompress_chksum(&self->decomp); diff --git a/shared-module/uzlib/DecompIO.h b/shared-module/zlib/DecompIO.h similarity index 92% rename from shared-module/uzlib/DecompIO.h rename to shared-module/zlib/DecompIO.h index 9ca583dbb8..51e64cc1c0 100644 --- a/shared-module/uzlib/DecompIO.h +++ b/shared-module/zlib/DecompIO.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef SHARED_MODULE_UZLIB_DECOMPIO_H -#define SHARED_MODULE_UZLIB_DECOMPIO_H +#ifndef SHARED_MODULE_ZLIB_DECOMPIO_H +#define SHARED_MODULE_ZLIB_DECOMPIO_H #include #include @@ -41,4 +41,4 @@ typedef struct _mp_obj_decompio_t { bool eof; } mp_obj_decompio_t; -#endif /* SHARED_MODULE_UZLIB_DECOMPIO_H */ +#endif /* SHARED_MODULE_ZLIB_DECOMPIO_H */ diff --git a/shared-module/uzlib/__init__.c b/shared-module/zlib/__init__.c similarity index 90% rename from shared-module/uzlib/__init__.c rename to shared-module/zlib/__init__.c index 3fe75c69b1..a057e6e2f7 100644 --- a/shared-module/uzlib/__init__.c +++ b/shared-module/zlib/__init__.c @@ -37,7 +37,7 @@ #include "py/binary.h" #include "py/parsenum.h" -#include "shared-bindings/uzlib/__init__.h" +#include "shared-bindings/zlib/__init__.h" #define UZLIB_CONF_PARANOID_CHECKS (1) #include "lib/uzlib/tinf.h" @@ -48,7 +48,7 @@ #define DEBUG_printf(...) (void)0 #endif -mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib) { +mp_obj_t common_hal_zlib_decompress(mp_obj_t data, bool is_zlib) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ); @@ -61,7 +61,7 @@ mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib) { decomp->dest = dest_buf; decomp->dest_limit = dest_buf + dest_buf_size; - DEBUG_printf("uzlib: Initial out buffer: " UINT_FMT " bytes\n", decomp->destSize); + DEBUG_printf("zlib: Initial out buffer: " UINT_FMT " bytes\n", decomp->destSize); decomp->source = bufinfo.buf; decomp->source_limit = (unsigned char *)bufinfo.buf + bufinfo.len; int st; @@ -89,7 +89,7 @@ mp_obj_t common_hal_uzlib_decompress(mp_obj_t data, bool is_zlib) { } mp_uint_t final_sz = decomp->dest - dest_buf; - DEBUG_printf("uzlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz); + DEBUG_printf("zlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz); dest_buf = (byte *)m_renew(byte, dest_buf, dest_buf_size, final_sz); mp_obj_t res = mp_obj_new_bytearray_by_ref(final_sz, dest_buf); m_del_obj(TINF_DATA, decomp); From 6f537e50c32367de05e5a4206ece979a7ece2691 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 20 Feb 2022 16:03:25 -0600 Subject: [PATCH 0020/2403] Disable in M0 builds --- 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 82cc69728a..c6ad73c6a0 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -46,6 +46,7 @@ CIRCUITPY_SYNTHIO ?= 0 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1 CIRCUITPY_ULAB = 0 CIRCUITPY_VECTORIO = 0 +CIRCUITPY_ZLIB = 0 # TODO: In CircuitPython 8.0, turn this back on, after `busio.OneWire` is removed. # We'd like a smoother transition, but we can't afford the space to have both From 57d916c2491505f6db2accd4ccd5c462ef0e2c85 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 20 Feb 2022 16:26:20 -0600 Subject: [PATCH 0021/2403] Doc fix --- shared-bindings/zlib/DecompIO.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/zlib/DecompIO.c b/shared-bindings/zlib/DecompIO.c index 7416bcd9da..78b01b5698 100644 --- a/shared-bindings/zlib/DecompIO.c +++ b/shared-bindings/zlib/DecompIO.c @@ -42,7 +42,7 @@ //| negative, it's assumed to be raw DEFLATE stream. *wbits* values 24..31 (16 + 8..15) //| mean that input stream has gzip header.""" //| -//| def __init__(self, stream: IO[AnyStr], wbits: Optional[int] = 0) -> None: +//| def __init__(self, stream: typing.IO, wbits: Optional[int] = 0) -> None: //| """Creates a DecompIO object to decompress stream data. //| """ //| ... From e7d99bda0cccfe561f4b710a9eb7235be0818551 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Mon, 21 Feb 2022 00:14:24 -0600 Subject: [PATCH 0022/2403] More doc fixes --- docs/library/zlib.rst | 2 ++ shared-bindings/zlib/DecompIO.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/library/zlib.rst b/docs/library/zlib.rst index 8f69f4b7c8..514b787bc4 100644 --- a/docs/library/zlib.rst +++ b/docs/library/zlib.rst @@ -5,6 +5,7 @@ .. module:: zlib :synopsis: zlib decompression + :noindex: |see_cpython_module| :mod:`cpython:zlib`. @@ -26,6 +27,7 @@ Functions CPython and is ignored. .. class:: DecompIO(stream, wbits=0, /) + :noindex: Create a ``stream`` wrapper which allows transparent decompression of compressed data in another *stream*. This allows to process compressed diff --git a/shared-bindings/zlib/DecompIO.c b/shared-bindings/zlib/DecompIO.c index 78b01b5698..a2c788fabe 100644 --- a/shared-bindings/zlib/DecompIO.c +++ b/shared-bindings/zlib/DecompIO.c @@ -69,7 +69,7 @@ //| ... //| //| def readline(self, nbytes: Optional[int] = None) -> Optional[bytes]: -//| """Read and return one line from the stream. The line terminator is always b'\n'. +//| """Read and return one line from the stream. The line terminator is always b'\\n'. //| If ``nbytes`` is specified then read at most that many bytes. //| //| :return: Data read From edee8e3409a8a1ceeabafa39b95bcf3add5a3d4e Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Mon, 21 Feb 2022 00:47:05 -0600 Subject: [PATCH 0023/2403] disable on some boards --- ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 1 + ports/nrf/boards/bluemicro833/mpconfigboard.mk | 1 + ports/nrf/boards/pca10100/mpconfigboard.mk | 1 + ports/nrf/boards/simmel/mpconfigboard.mk | 1 + ports/stm/boards/thunderpack_v12/mpconfigboard.mk | 1 + 5 files changed, 5 insertions(+) diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk index 81e1cd00cd..efefc3e4e7 100644 --- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk @@ -20,3 +20,4 @@ CIRCUITPY_SHARPDISPLAY=0 CIRCUITPY_SDCARDIO=0 CIRCUITPY_BLEIO_HCI=0 CIRCUITPY_BLEIO=0 +CIRCUITPY_ZLIB=0 diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk index b7594f0d89..1e72d8d7f7 100644 --- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk +++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk @@ -40,6 +40,7 @@ CIRCUITPY_TOUCHIO = 0 CIRCUITPY_ULAB = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_VECTORIO = 0 +CIRCUITPY_ZLIB = 0 MICROPY_PY_ASYNC_AWAIT = 0 diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk index 59f2b217c3..95a2dd4d98 100644 --- a/ports/nrf/boards/pca10100/mpconfigboard.mk +++ b/ports/nrf/boards/pca10100/mpconfigboard.mk @@ -32,6 +32,7 @@ CIRCUITPY_SYNTHIO = 0 CIRCUITPY_ULAB = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_VECTORIO = 0 +CIRCUITPY_ZLIB = 0 MICROPY_PY_ASYNC_AWAIT = 0 diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index 67f5dfbd6d..bdafadceb7 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -42,6 +42,7 @@ CIRCUITPY_ULAB = 0 CIRCUITPY_USB_CDC = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_WATCHDOG = 1 +CIRCUITPY_ZLIB = 0 # Enable micropython.native #CIRCUITPY_ENABLE_MPY_NATIVE = 1 diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk index 16a0c60f2a..526415ca30 100644 --- a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk +++ b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk @@ -14,6 +14,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C CIRCUITPY_NVM = 1 CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_ZLIB = 0 MCU_SERIES = F4 MCU_VARIANT = STM32F411xE From ce4a0806b3d7ea63ec13fe60738211edf193d337 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Mon, 21 Feb 2022 10:24:13 -0600 Subject: [PATCH 0024/2403] Added test coverage --- .../unix/variants/coverage/mpconfigvariant.mk | 9 ++- tests/circuitpython/zlib_decompio.py | 33 ++++++++++ tests/circuitpython/zlib_decompio.py.exp | 12 ++++ tests/circuitpython/zlib_decompio_gz.py | 60 +++++++++++++++++++ tests/circuitpython/zlib_decompio_gz.py.exp | 13 ++++ tests/circuitpython/zlib_decompress.py | 60 +++++++++++++++++++ tests/unix/extra_coverage.py.exp | 2 +- 7 files changed, 186 insertions(+), 3 deletions(-) create mode 100644 tests/circuitpython/zlib_decompio.py create mode 100644 tests/circuitpython/zlib_decompio.py.exp create mode 100644 tests/circuitpython/zlib_decompio_gz.py create mode 100644 tests/circuitpython/zlib_decompio_gz.py.exp create mode 100644 tests/circuitpython/zlib_decompress.py diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index 7e8aabef5b..681cc16e19 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -38,6 +38,8 @@ SRC_BITMAP := \ shared-bindings/rainbowio/__init__.c \ shared-bindings/traceback/__init__.c \ shared-bindings/util.c \ + shared-bindings/zlib/__init__.c \ + shared-bindings/zlib/DecompIO.c \ shared-module/aesio/aes.c \ shared-module/aesio/__init__.c \ shared-module/bitmaptools/__init__.c \ @@ -46,7 +48,9 @@ SRC_BITMAP := \ shared-module/displayio/ColorConverter.c \ shared-module/displayio/ColorConverter.c \ shared-module/rainbowio/__init__.c \ - shared-module/traceback/__init__.c + shared-module/traceback/__init__.c \ + shared-module/zlib/__init__.c \ + shared-module/zlib/DecompIO.c $(info $(SRC_BITMAP)) SRC_C += $(SRC_BITMAP) @@ -57,7 +61,8 @@ CFLAGS += \ -DCIRCUITPY_DISPLAYIO_UNIX=1 \ -DCIRCUITPY_GIFIO=1 \ -DCIRCUITPY_RAINBOWIO=1 \ - -DCIRCUITPY_TRACEBACK=1 + -DCIRCUITPY_TRACEBACK=1 \ + -DCIRCUITPY_ZLIB=1 SRC_C += coverage.c SRC_CXX += coveragecpp.cpp diff --git a/tests/circuitpython/zlib_decompio.py b/tests/circuitpython/zlib_decompio.py new file mode 100644 index 0000000000..0ded0b6966 --- /dev/null +++ b/tests/circuitpython/zlib_decompio.py @@ -0,0 +1,33 @@ +try: + import zlib + import uio as io +except ImportError: + print("SKIP") + raise SystemExit + + +# Raw DEFLATE bitstream +buf = io.BytesIO(b"\xcbH\xcd\xc9\xc9\x07\x00") +inp = zlib.DecompIO(buf, -8) +print(buf.seek(0, 1)) +print(inp.read(1)) +print(buf.seek(0, 1)) +print(inp.read(2)) +print(inp.read()) +print(buf.seek(0, 1)) +print(inp.read(1)) +print(inp.read()) +print(buf.seek(0, 1)) + + +# zlib bitstream +inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1")) +print(inp.read(10)) +print(inp.read()) + +# zlib bitstream, wrong checksum +inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc0")) +try: + print(inp.read()) +except OSError as e: + print(repr(e)) diff --git a/tests/circuitpython/zlib_decompio.py.exp b/tests/circuitpython/zlib_decompio.py.exp new file mode 100644 index 0000000000..3f5f360fa3 --- /dev/null +++ b/tests/circuitpython/zlib_decompio.py.exp @@ -0,0 +1,12 @@ +0 +b'h' +2 +b'el' +b'lo' +7 +b'' +b'' +7 +b'0000000000' +b'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' +OSError(22,) diff --git a/tests/circuitpython/zlib_decompio_gz.py b/tests/circuitpython/zlib_decompio_gz.py new file mode 100644 index 0000000000..e752d50a84 --- /dev/null +++ b/tests/circuitpython/zlib_decompio_gz.py @@ -0,0 +1,60 @@ +try: + import zlib + import uio as io +except ImportError: + print("SKIP") + raise SystemExit + + +# gzip bitstream +buf = io.BytesIO( + b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" +) +inp = zlib.DecompIO(buf, 16 + 8) +print(buf.seek(0, 1)) +print(inp.read(1)) +print(buf.seek(0, 1)) +print(inp.read(2)) +print(inp.read()) +print(buf.seek(0, 1)) +print(inp.read(1)) +print(inp.read()) +print(buf.seek(0, 1)) + +# Check FHCRC field +buf = io.BytesIO( + b"\x1f\x8b\x08\x02\x99\x0c\xe5W\x00\x03\x00\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" +) +inp = zlib.DecompIO(buf, 16 + 8) +print(inp.read()) + +# Check FEXTRA field +buf = io.BytesIO( + b"\x1f\x8b\x08\x04\x99\x0c\xe5W\x00\x03\x01\x00X\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" +) +inp = zlib.DecompIO(buf, 16 + 8) +print(inp.read()) + +# broken header +buf = io.BytesIO( + b"\x1f\x8c\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" +) +try: + inp = zlib.DecompIO(buf, 16 + 8) +except ValueError: + print("ValueError") + +# broken crc32 +buf = io.BytesIO( + b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa7\x106\x05\x00\x00\x00" +) +inp = zlib.DecompIO(buf, 16 + 8) +try: + inp.read(6) +except OSError as e: + print(repr(e)) + +# broken uncompressed size - not checked so far +# buf = io.BytesIO(b'\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x06\x00\x00\x00') +# inp = zlib.DecompIO(buf, 16 + 8) +# inp.read(6) diff --git a/tests/circuitpython/zlib_decompio_gz.py.exp b/tests/circuitpython/zlib_decompio_gz.py.exp new file mode 100644 index 0000000000..20a30c82a3 --- /dev/null +++ b/tests/circuitpython/zlib_decompio_gz.py.exp @@ -0,0 +1,13 @@ +16 +b'h' +18 +b'el' +b'lo' +31 +b'' +b'' +31 +b'hello' +b'hello' +ValueError +OSError(22,) diff --git a/tests/circuitpython/zlib_decompress.py b/tests/circuitpython/zlib_decompress.py new file mode 100644 index 0000000000..05ea5868ee --- /dev/null +++ b/tests/circuitpython/zlib_decompress.py @@ -0,0 +1,60 @@ +try: + import zlib +except ImportError: + try: + import zlib as zlib + except ImportError: + print("SKIP") + raise SystemExit + +PATTERNS = [ + # Packed results produced by CPy's zlib.compress() + (b"0", b"x\x9c3\x00\x00\x001\x001"), + (b"a", b"x\x9cK\x04\x00\x00b\x00b"), + (b"0" * 100, b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1"), + ( + bytes(range(64)), + b"x\x9cc`dbfaec\xe7\xe0\xe4\xe2\xe6\xe1\xe5\xe3\x17\x10\x14\x12\x16\x11\x15\x13\x97\x90\x94\x92\x96\x91\x95\x93WPTRVQUS\xd7\xd0\xd4\xd2\xd6\xd1\xd5\xd370426153\xb7\xb0\xb4\xb2\xb6\xb1\xb5\xb3\x07\x00\xaa\xe0\x07\xe1", + ), + (b"hello", b"x\x01\x01\x05\x00\xfa\xffhello\x06,\x02\x15"), # compression level 0 + # adaptive/dynamic huffman tree + ( + b"13371813150|13764518736|12345678901", + b"x\x9c\x05\xc1\x81\x01\x000\x04\x04\xb1\x95\\\x1f\xcfn\x86o\x82d\x06Qq\xc8\x9d\xc5X}I}\x00\x951D>I}\x00\x951D>I}\x00\x951D>I}\x00\x951D", + b"x\x9c\x05\xc11\x01\x00\x00\x00\x010\x95\x14py\x84\x12C_\x9bR\x8cV\x8a\xd1J1Z)F\x1fw`\x089", + ), +] + +for unpacked, packed in PATTERNS: + assert zlib.decompress(packed) == unpacked + print(unpacked) + + +# Raw DEFLATE bitstream +v = b"\xcbH\xcd\xc9\xc9\x07\x00" +exp = b"hello" +out = zlib.decompress(v, -15) +assert out == exp +print(exp) +# Even when you ask CPython zlib.compress to produce Raw DEFLATE stream, +# it returns it with adler2 and oriignal size appended, as if it was a +# zlib stream. Make sure there're no random issues decompressing such. +v = b"\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" +out = zlib.decompress(v, -15) +assert out == exp + +# this should error +try: + zlib.decompress(b"abc") +except Exception: + print("Exception") + +# invalid block type +try: + zlib.decompress(b"\x07", -15) # final-block, block-type=3 (invalid) +except Exception as er: + print("Exception") diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp index 4cce80a412..ea440166ca 100644 --- a/tests/unix/extra_coverage.py.exp +++ b/tests/unix/extra_coverage.py.exp @@ -39,7 +39,7 @@ sys termios traceback ubinascii uctypes uerrno uheapq uio ujson ulab uos urandom ure uselect ustruct utime -utimeq uzlib +utimeq uzlib zlib ime utime utimeq From c919e9c2cc9767f0936e571e97fe9751c55cf692 Mon Sep 17 00:00:00 2001 From: BigTuna94 Date: Mon, 14 Mar 2022 21:02:14 -0400 Subject: [PATCH 0025/2403] fix duplicate reference names for DSN export --- .../boards/zrichard_rp2.65-f/board.c | 45 +++++++++++++++++++ .../boards/zrichard_rp2.65-f/mpconfigboard.h | 4 ++ .../boards/zrichard_rp2.65-f/mpconfigboard.mk | 13 ++++++ .../zrichard_rp2.65-f/pico-sdk-configboard.h | 4 ++ .../boards/zrichard_rp2.65-f/pins.c | 32 +++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/board.c create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c new file mode 100644 index 0000000000..635e767a8f --- /dev/null +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c @@ -0,0 +1,45 @@ +/* + * 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 "supervisor/board.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" +#include "supervisor/shared/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + // turn off any left over LED + board_reset_user_neopixels(&pin_GPIO25, 62); +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h new file mode 100644 index 0000000000..5acfceba9d --- /dev/null +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h @@ -0,0 +1,4 @@ +#define MICROPY_HW_BOARD_NAME "RP2.65-F" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO25) diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk new file mode 100644 index 0000000000..79970a1a1b --- /dev/null +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk @@ -0,0 +1,13 @@ +# ZR 6F +USB_VID = 0x5a52 +USB_PID = 0x3646 + +USB_PRODUCT = "RP2.65-F" +USB_MANUFACTURER = "ZRichard" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ,W25Q128JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h b/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h new file mode 100644 index 0000000000..a41131dd22 --- /dev/null +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h @@ -0,0 +1,4 @@ +// Put board-specific pico-sdk definitions here. This file must exist. + +// Allow extra time for xosc to start. +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c new file mode 100644 index 0000000000..02c69c014f --- /dev/null +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c @@ -0,0 +1,32 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_ROW0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_COL0), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_ROW1), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_ROW2), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_ROW3), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_COL3), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_ROW4), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_COL4), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_ROW5), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_COL5), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_ROW6), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_COL6), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_ROW7), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_COL7), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_ROW8), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_ROW9), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_RV1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_RV2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_RV3), MP_ROM_PTR(&pin_GPIO29) }, + +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 5e09ed611ec1050599a650d17922980a0af624ae Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Tue, 22 Mar 2022 21:36:54 +0100 Subject: [PATCH 0026/2403] Added Challenger 840 board. --- ports/nrf/boards/challenger_840/board.c | 41 +++++++++++++++ .../nrf/boards/challenger_840/mpconfigboard.h | 31 +++++++++++ .../boards/challenger_840/mpconfigboard.mk | 9 ++++ ports/nrf/boards/challenger_840/pins.c | 52 +++++++++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 ports/nrf/boards/challenger_840/board.c create mode 100644 ports/nrf/boards/challenger_840/mpconfigboard.h create mode 100644 ports/nrf/boards/challenger_840/mpconfigboard.mk create mode 100644 ports/nrf/boards/challenger_840/pins.c diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nrf/boards/challenger_840/board.c new file mode 100644 index 0000000000..b4070e72dc --- /dev/null +++ b/ports/nrf/boards/challenger_840/board.c @@ -0,0 +1,41 @@ +/* + * 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) { + +} + +void board_deinit(void) { +} diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.h b/ports/nrf/boards/challenger_840/mpconfigboard.h new file mode 100644 index 0000000000..e68fbc76fb --- /dev/null +++ b/ports/nrf/boards/challenger_840/mpconfigboard.h @@ -0,0 +1,31 @@ +#include "nrfx/hal/nrf_gpio.h" + +#define MICROPY_HW_BOARD_NAME "iLabs Challenger 840" +#define MICROPY_HW_MCU_NAME "nRF52840" + +#define MICROPY_HW_LED_STATUS (&pin_P0_12) + +#if SPI_FLASH_FILESYSTEM +#define SPI_FLASH_MOSI_PIN (&pin_P0_16) +#define SPI_FLASH_MISO_PIN (&pin_P0_11) +#define SPI_FLASH_SCK_PIN (&pin_P0_14) +#define SPI_FLASH_CS_PIN (&pin_P0_08) +#endif + +#define CIRCUITPY_AUTORELOAD_DELAY_MS 500 + +#define CIRCUITPY_INTERNAL_NVM_SIZE (4096) + +#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) + +#define BOARD_HAS_CRYSTAL 1 + +#define DEFAULT_I2C_BUS_SCL (&pin_P1_12) +#define DEFAULT_I2C_BUS_SDA (&pin_P1_11) + +#define DEFAULT_SPI_BUS_SCK (&pin_P0_13) +#define DEFAULT_SPI_BUS_MOSI (&pin_P0_15) +#define DEFAULT_SPI_BUS_MISO (&pin_P0_17) + +#define DEFAULT_UART_BUS_RX (&pin_P0_21) +#define DEFAULT_UART_BUS_TX (&pin_P0_23) diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nrf/boards/challenger_840/mpconfigboard.mk new file mode 100644 index 0000000000..a72bd34857 --- /dev/null +++ b/ports/nrf/boards/challenger_840/mpconfigboard.mk @@ -0,0 +1,9 @@ +USB_VID = 0x1209 +USB_PID = 0x7382 +USB_PRODUCT = "iLabs Challenger 840" +USB_MANUFACTURER = "Invector Labs AB" + +MCU_CHIP = nrf52840 + +SPI_FLASH_FILESYSTEM = 1 +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nrf/boards/challenger_840/pins.c new file mode 100644 index 0000000000..ff39576850 --- /dev/null +++ b/ports/nrf/boards/challenger_840/pins.c @@ -0,0 +1,52 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_28) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_29) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_02) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_03) }, + + { MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_31) }, + + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_30) }, + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_30) }, + + { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P0_19) }, + + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_23) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_23) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_21) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_21) }, + + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_10) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P1_14) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P1_13) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P1_15) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_27) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_07) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P0_06) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P1_08) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_12) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_11) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_13) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_15) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_17) }, + + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P0_26) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_P0_26) }, + { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P0_12) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, +}; + +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 7901850bb8cb568b0d352a6e27419677499bf8e3 Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 23 Mar 2022 17:14:28 +0100 Subject: [PATCH 0027/2403] Update ports/nrf/boards/challenger_840/pins.c Co-authored-by: Dan Halbert --- ports/nrf/boards/challenger_840/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nrf/boards/challenger_840/pins.c index ff39576850..4333bb6521 100644 --- a/ports/nrf/boards/challenger_840/pins.c +++ b/ports/nrf/boards/challenger_840/pins.c @@ -17,8 +17,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P0_19) }, - { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_23) }, { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_23) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_23) }, { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_21) }, { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_21) }, From d26297ae9878bfd96c9244abb3d8c51d679479a6 Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 23 Mar 2022 17:14:40 +0100 Subject: [PATCH 0028/2403] Update ports/nrf/boards/challenger_840/pins.c Co-authored-by: Dan Halbert --- ports/nrf/boards/challenger_840/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nrf/boards/challenger_840/pins.c index 4333bb6521..c7be84dc31 100644 --- a/ports/nrf/boards/challenger_840/pins.c +++ b/ports/nrf/boards/challenger_840/pins.c @@ -20,8 +20,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_23) }, { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_23) }, - { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_21) }, { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_21) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_21) }, { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_10) }, { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P1_14) }, From c7b28eb2ef3286f1d9744ad63ae9e41c4214e6c1 Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 23 Mar 2022 17:14:49 +0100 Subject: [PATCH 0029/2403] Update ports/nrf/boards/challenger_840/pins.c Co-authored-by: Dan Halbert --- ports/nrf/boards/challenger_840/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nrf/boards/challenger_840/pins.c index c7be84dc31..26d780fffe 100644 --- a/ports/nrf/boards/challenger_840/pins.c +++ b/ports/nrf/boards/challenger_840/pins.c @@ -40,8 +40,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_15) }, { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_17) }, - { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P0_26) }, { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_P0_26) }, + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P0_26) }, { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P0_12) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, From e13d32b832588786986124cf0892bc211c4a501c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 21 Mar 2022 17:44:22 -0700 Subject: [PATCH 0030/2403] Add ESP32-S3-USB-OTG board This board has both types of USB connectors, a display and buttons to select items on the display. It also has a micro-B connector for the UART output. --- .../espressif_esp32s3_usb_otg_n8/board.c | 141 ++++++++++++++++++ .../mpconfigboard.h | 35 +++++ .../mpconfigboard.mk | 17 +++ .../espressif_esp32s3_usb_otg_n8/pins.c | 48 ++++++ .../espressif_esp32s3_usb_otg_n8/sdkconfig | 6 + 5 files changed, 247 insertions(+) create mode 100644 ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c create mode 100644 ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.h create mode 100644 ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk create mode 100644 ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c create mode 100644 ports/espressif/boards/espressif_esp32s3_usb_otg_n8/sdkconfig diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c new file mode 100644 index 0000000000..edb8e6a994 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c @@ -0,0 +1,141 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.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" + +#define DELAY 0x80 + +// Init sequence from: +// https://github.com/espressif/esp-dev-kits/blob/26ad8c9070b717da9fa06ce480099b7826761c2a/esp32-s3-usb-otg/components/display_screen/controller_driver/st7789/st7789.c#L75 + +// display init sequence according to LilyGO example app +uint8_t display_init_sequence[] = { + // sw reset + 0x01, 0 | DELAY, 150, + // normal display mode on + 0x13, 0, + // display and color format settings + // 0x36, 1, 0x68, + // 0xB6, 2, 0x0A, 0x82, + 0x3A, 1 | DELAY, 0x05, 10, + // ST7789V frame rate setting + 0xB2, 5, 0x0C, 0x0C, 0x00, 0x33, 0x33, + // voltages: VGH / VGL + 0xB7, 1, 0x35, + // ST7789V power setting + 0xBB, 1, 0x19, + 0xC0, 1, 0x2C, + 0xC2, 1, 0x01, + 0xC3, 1, 0x12, + 0xC4, 1, 0x20, + 0xC6, 1, 0x0F, + 0xD0, 2, 0xA4, 0xA1, + // ST7789V gamma setting + 0xE0, 14, 0xD0, 0x04, 0x0D, 0x11, 0x13, 0x2B, 0x3F, 0x54, 0x4C, 0x18, 0x0D, 0x0B, 0x1F, 0x23, + 0xE1, 14, 0xD0, 0x04, 0x0C, 0x11, 0x13, 0x2C, 0x3F, 0x44, 0x51, 0x2F, 0x1F, 0x1F, 0x20, 0x23, + 0x21, 0, + // sleep out + 0x11, 0 | DELAY, 255, + // display on + 0x29, 0 | DELAY, 255, +}; + +void board_init(void) { + busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus; + common_hal_busio_spi_construct(spi, &pin_GPIO6, &pin_GPIO7, NULL, false); + 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_GPIO4, // TFT_DC Command or data + &pin_GPIO5, // TFT_CS Chip select + &pin_GPIO8, // 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, + 240, // Width + 240, // Height + 0, // column start + 0, // row start + 0, // 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 + display_init_sequence, + sizeof(display_init_sequence), + &pin_GPIO9, // 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 espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Override the USB_SEL, LED_GREEN, LED_YELLOW and BOOST_EN pins. + if (pin_number == 18 || pin_number == 15 || pin_number == 16 || pin_number == 13) { + gpio_reset_pin(pin_number); + gpio_pullup_dis(pin_number); + gpio_pulldown_en(pin_number); + return true; + } + return false; +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.h new file mode 100644 index 0000000000..abf17f9395 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.h @@ -0,0 +1,35 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "ESP32-S3-USB-OTG-N8" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO15) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO44) +#define DEFAULT_UART_BUS_TX (&pin_GPIO43) diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk new file mode 100644 index 0000000000..e9eab16f91 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk @@ -0,0 +1,17 @@ +USB_VID = 0x303A +USB_PID = 0x700B +USB_PRODUCT = "ESP32-S3-USB-OTG-N8" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s3 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=8MB diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c new file mode 100644 index 0000000000..6f02c1123f --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c @@ -0,0 +1,48 @@ +#include "shared-bindings/board/__init__.h" + +// Pin names from: +// https://espressif-docs.readthedocs-hosted.com/projects/espressif-esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/user_guide.html#pin-layout + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_USB_SEL), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_LED_GREEN), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LED_YELLOW), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON_OK), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON_UP), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON_DW), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON_DOWN), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON_MENU), MP_ROM_PTR(&pin_GPIO14) }, + + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_LCD_EN), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_LCD_SCLK), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_LCD_SDA), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_LCD_BL), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_SD_D0), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_SD_D1), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_SD_D2), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_SD_D3), MP_ROM_PTR(&pin_GPIO34) }, + + { MP_ROM_QSTR(MP_QSTR_HOST_VOL), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_BAT_VOL), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_LIMIT_EN), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_OVER_CURRENT), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_DEV_VBUS_EN), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_BOOST_EN), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/sdkconfig new file mode 100644 index 0000000000..a0a61d8392 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP From 380a7087d403dbd944518bdc870bc66ca9cec032 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 23 Mar 2022 14:53:46 -0700 Subject: [PATCH 0031/2403] Fix 3-wire SPI on ESP Simplifying the checks fixed it. Fixes #6141 --- ports/espressif/common-hal/busio/SPI.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c index 0b4b0d7f1a..4eff1be54c 100644 --- a/ports/espressif/common-hal/busio/SPI.c +++ b/ports/espressif/common-hal/busio/SPI.c @@ -205,11 +205,10 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, if (len == 0) { return true; } - // Other than the read special case, stop transfers that don't have a pin/array match - if (!self->MOSI && (data_out != data_in)) { + if (self->MOSI == NULL && data_out != NULL) { mp_raise_ValueError(translate("No MOSI Pin")); } - if (!self->MISO && data_in) { + if (self->MISO == NULL && data_in != NULL) { mp_raise_ValueError(translate("No MISO Pin")); } From f9d7f46d679a315f6756919a02b2defe021af6d6 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Wed, 23 Mar 2022 17:02:58 -0500 Subject: [PATCH 0032/2403] Removing DecompIO --- py/circuitpy_defns.mk | 1 - shared-bindings/zlib/DecompIO.c | 132 -------------------------------- shared-bindings/zlib/DecompIO.h | 37 --------- shared-bindings/zlib/__init__.c | 2 - shared-module/zlib/DecompIO.c | 101 ------------------------ shared-module/zlib/DecompIO.h | 44 ----------- 6 files changed, 317 deletions(-) delete mode 100644 shared-bindings/zlib/DecompIO.c delete mode 100644 shared-bindings/zlib/DecompIO.h delete mode 100644 shared-module/zlib/DecompIO.c delete mode 100644 shared-module/zlib/DecompIO.h diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 07a8d2fd86..3c9fe0f155 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -582,7 +582,6 @@ SRC_SHARED_MODULE_ALL = \ uheap/__init__.c \ ustack/__init__.c \ zlib/__init__.c \ - zlib/DecompIO.c \ vectorio/Circle.c \ vectorio/Polygon.c \ vectorio/Rectangle.c \ diff --git a/shared-bindings/zlib/DecompIO.c b/shared-bindings/zlib/DecompIO.c deleted file mode 100644 index a2c788fabe..0000000000 --- a/shared-bindings/zlib/DecompIO.c +++ /dev/null @@ -1,132 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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 -#include "py/obj.h" -#include "py/stream.h" -#include "py/runtime.h" -#include "shared-bindings/zlib/DecompIO.h" -#include "shared-module/zlib/DecompIO.h" - -//| class DecompIO: -//| """A stream wrapper which allows transparent decompression of compressed data in -//| another stream. This allows to process compressed streams with data larger -//| than available heap size. -//| -//| *wbits* is DEFLATE dictionary window size used during compression (8-15, the -//| dictionary size is power of 2 of that value). Additionally, if value is positive, -//| *data* is assumed to be zlib stream (with zlib header). Otherwise, if it's -//| negative, it's assumed to be raw DEFLATE stream. *wbits* values 24..31 (16 + 8..15) -//| mean that input stream has gzip header.""" -//| -//| def __init__(self, stream: typing.IO, wbits: Optional[int] = 0) -> None: -//| """Creates a DecompIO object to decompress stream data. -//| """ -//| ... -//| - -// These are standard stream methods. Code is in py/stream.c. -// -//| def read(self, nbytes: Optional[int] = None) -> Optional[bytes]: -//| """Read characters. If ``nbytes`` is specified then read at most that many -//| bytes. Otherwise, read everything that arrives until the connection -//| times out. Providing the number of bytes expected is highly recommended -//| because it will be faster. -//| -//| :return: Data read -//| :rtype: bytes or None""" -//| ... -//| -//| def readinto(self, buf: WriteableBuffer, nbytes: Optional[int] = None) -> Optional[bytes]: -//| """Read bytes into the ``buf``. If ``nbytes`` is specified then read at most -//| that many bytes. Otherwise, read at most ``len(buf)`` bytes. -//| -//| :return: number of bytes read and stored into ``buf`` -//| :rtype: bytes or None""" -//| ... -//| -//| def readline(self, nbytes: Optional[int] = None) -> Optional[bytes]: -//| """Read and return one line from the stream. The line terminator is always b'\\n'. -//| If ``nbytes`` is specified then read at most that many bytes. -//| -//| :return: Data read -//| :rtype: bytes or None""" -//| ... -//| - -STATIC mp_obj_t zlib_decompio_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, 2, false); - mp_get_stream_raise(args[0], MP_STREAM_OP_READ); - - mp_obj_decompio_t *self = m_new_obj(mp_obj_decompio_t); - self->base.type = type; - memset(&self->decomp, 0, sizeof(self->decomp)); - - mp_int_t dict_opt = 0; - if (n_args > 1) { - dict_opt = mp_obj_get_int(args[1]); - } - - common_hal_zlib_decompio_construct(self, args[0], dict_opt); - - return MP_OBJ_FROM_PTR(self); -} - -STATIC mp_uint_t zlib_decompio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { - mp_obj_decompio_t *self = MP_OBJ_TO_PTR(self_in); - if (self->eof) { - return 0; - } - - return common_hal_zlib_decompio_read(self, buf, size, errcode); -} - -STATIC const mp_rom_map_elem_t decompio_locals_dict_table[] = { - { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, - { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, - { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, -}; - -STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table); - -STATIC const mp_stream_p_t decompio_stream_p = { - MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream) - .read = zlib_decompio_read, - .write = NULL, - .ioctl = NULL, - .is_text = false, -}; - -const mp_obj_type_t decompio_type = { - { &mp_type_type }, - .flags = MP_TYPE_FLAG_EXTENDED, - .name = MP_QSTR_DecompIO, - .make_new = zlib_decompio_make_new, - .locals_dict = (void *)&decompio_locals_dict, - MP_TYPE_EXTENDED_FIELDS( - .protocol = &decompio_stream_p, - ), -}; diff --git a/shared-bindings/zlib/DecompIO.h b/shared-bindings/zlib/DecompIO.h deleted file mode 100644 index 65a90cbfb8..0000000000 --- a/shared-bindings/zlib/DecompIO.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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_ZLIB_DECOMPIO_H -#define MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB_DECOMPIO_H - -#include "shared-module/zlib/DecompIO.h" - -extern const mp_obj_type_t decompio_type; - -extern void common_hal_zlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt); -extern mp_uint_t common_hal_zlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode); - -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_ZLIB_DECOMPIO_H diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c index 4e85ad2c89..b75ef5e28f 100644 --- a/shared-bindings/zlib/__init__.c +++ b/shared-bindings/zlib/__init__.c @@ -37,7 +37,6 @@ #include "py/binary.h" #include "py/parsenum.h" -#include "shared-bindings/zlib/DecompIO.h" #include "shared-bindings/zlib/__init__.h" #include "supervisor/shared/translate.h" @@ -76,7 +75,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zlib_decompress_obj, 1, 3, zlib_decom STATIC const mp_rom_map_elem_t zlib_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) }, { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&zlib_decompress_obj) }, - { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) }, }; STATIC MP_DEFINE_CONST_DICT(zlib_globals, zlib_globals_table); diff --git a/shared-module/zlib/DecompIO.c b/shared-module/zlib/DecompIO.c deleted file mode 100644 index b182304f19..0000000000 --- a/shared-module/zlib/DecompIO.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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 -#include -#include - -#include "py/obj.h" -#include "py/runtime.h" -#include "py/stream.h" -#include "py/mperrno.h" -#include "py/builtin.h" -#include "py/objtuple.h" -#include "py/binary.h" -#include "py/parsenum.h" - -#include "shared-bindings/zlib/__init__.h" -#include "shared-bindings/zlib/DecompIO.h" -#include "shared-module/zlib/DecompIO.h" - -STATIC int read_src_stream(TINF_DATA *data) { - mp_obj_decompio_t *self = (mp_obj_decompio_t *)data->self; - - const mp_stream_p_t *stream = mp_get_stream_raise(self->src_stream, MP_STREAM_OP_READ); - int err; - byte c; - mp_uint_t out_sz = stream->read(self->src_stream, &c, 1, &err); - - if (out_sz == MP_STREAM_ERROR) { - mp_raise_OSError(err); - } - if (out_sz == 0) { - mp_raise_type(&mp_type_EOFError); - } - return c; -} - -void common_hal_zlib_decompio_construct(mp_obj_decompio_t *self, mp_obj_t src_stream, mp_int_t dict_opt) { - self->decomp.self = self; - self->decomp.readSource = read_src_stream; - self->src_stream = src_stream; - self->eof = false; - - int dict_sz; - - if (dict_opt >= 16) { - int st = uzlib_gzip_parse_header(&self->decomp); - if (st != TINF_OK) { - goto header_error; - } - dict_sz = 1 << (dict_opt - 16); - } else if (dict_opt >= 0) { - dict_opt = uzlib_zlib_parse_header(&self->decomp); - if (dict_opt < 0) { - header_error: - mp_raise_ValueError(MP_ERROR_TEXT("compression header")); - } - dict_sz = 1 << dict_opt; - } else { - dict_sz = 1 << -dict_opt; - } - - uzlib_uncompress_init(&self->decomp, m_new(byte, dict_sz), dict_sz); -} - -mp_uint_t common_hal_zlib_decompio_read(mp_obj_decompio_t *self, void *buf, mp_uint_t size, int *errcode) { - self->decomp.dest = buf; - self->decomp.dest_limit = (unsigned char *)buf + size; - int st = uzlib_uncompress_chksum(&self->decomp); - if (st == TINF_DONE) { - self->eof = true; - } - if (st < 0) { - *errcode = MP_EINVAL; - return MP_STREAM_ERROR; - } - return self->decomp.dest - (byte *)buf; -} diff --git a/shared-module/zlib/DecompIO.h b/shared-module/zlib/DecompIO.h deleted file mode 100644 index 51e64cc1c0..0000000000 --- a/shared-module/zlib/DecompIO.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2022 Mark Komus - * - * 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_ZLIB_DECOMPIO_H -#define SHARED_MODULE_ZLIB_DECOMPIO_H - -#include -#include - -#include "py/obj.h" -#define UZLIB_CONF_PARANOID_CHECKS (1) -#include "lib/uzlib/tinf.h" - -typedef struct _mp_obj_decompio_t { - mp_obj_base_t base; - mp_obj_t src_stream; - TINF_DATA decomp; - bool eof; -} mp_obj_decompio_t; - -#endif /* SHARED_MODULE_ZLIB_DECOMPIO_H */ From 7d7e66f60fb23d6bb3b9fe5449dbf006cb2876c4 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Wed, 23 Mar 2022 17:37:56 -0500 Subject: [PATCH 0033/2403] Fix no scaled framebuffer display --- shared-module/is31fl3741/FrameBuffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/shared-module/is31fl3741/FrameBuffer.c b/shared-module/is31fl3741/FrameBuffer.c index ebe630cacd..400f6f843d 100644 --- a/shared-module/is31fl3741/FrameBuffer.c +++ b/shared-module/is31fl3741/FrameBuffer.c @@ -184,16 +184,16 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel } if ((dirty_row_flags >> (y % 8)) & 0x1) { - uint32_t color = 0; - if (self->auto_gamma) { - color = IS31GammaTable[((*buffer) >> 16 & 0xFF)] + - IS31GammaTable[((*buffer) >> 8 & 0xFF)] + - IS31GammaTable[((*buffer) & 0xFF)]; - } else { - color = *buffer; - } - for (int x = 0; x < self->width; x++) { + uint32_t color = 0; + if (self->auto_gamma) { + color = (IS31GammaTable[((*buffer) >> 16 & 0xFF)] << 16) + + (IS31GammaTable[((*buffer) >> 8 & 0xFF)] << 8) + + IS31GammaTable[((*buffer) & 0xFF)]; + } else { + color = *buffer; + } + common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping); buffer++; } From 8642dc4aa758538b96fa13f27d4fbd98863a0f7a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 23 Mar 2022 17:17:48 -0700 Subject: [PATCH 0034/2403] Fix MDNS crash on S2 Fixes #6186 --- ports/espressif/common-hal/mdns/Server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c index 2f260bbde0..9da67a9145 100644 --- a/ports/espressif/common-hal/mdns/Server.c +++ b/ports/espressif/common-hal/mdns/Server.c @@ -117,6 +117,11 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic next = next->next; } mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_results, NULL)); + // The empty tuple object is shared and stored in flash so return early if + // we got it. Without this we'll crash when trying to set len below. + if (num_results == 0) { + return MP_OBJ_FROM_PTR(tuple); + } next = results; // Don't error if we're out of memory. Instead, truncate the tuple. uint8_t added = 0; From a07ac72cc585fcf5c3805c82834e1f55edab2ca3 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 24 Mar 2022 09:42:11 -0500 Subject: [PATCH 0035/2403] Improve the USB vid:pid duplicate checker To me, it made more sense to track which boards go together in a cluster; when reviewing a request to actually use a duplicate vid/pid, you want to know what board(s) it is aliasing. I also revamped the detection of non-USB boards so that a board .mk file that couldn't be parsed by the code here would raise a problem instead of just being skipped for the purposes of checking. There were some lines with comments on the end, and some variation in capitalization of the IDs. These are all normalized and a (sometimes unfriendly!) error printed when it's incorrect. Before this, here were some ways to trick the duplicate vid/pid checker: ``` USB_PID = 0XABCD USB_PID = 0xAbCd USB_PID = 0xABCD # harmless comment? ``` None of these things were ever done on purpose. --- .../sparkfun_samd51_micromod/mpconfigboard.mk | 3 +- .../mpconfigboard.mk | 3 +- .../boards/particle_xenon/mpconfigboard.mk | 3 +- tools/ci_check_duplicate_usb_vid_pid.py | 127 ++++++++---------- 4 files changed, 61 insertions(+), 75 deletions(-) diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk index 3ae3d8f5a9..026a1978c3 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk @@ -1,6 +1,7 @@ LD_FILE = boards/samd51x20-bootloader-external-flash.ld USB_VID = 0x1b4f -USB_PID = 0x0020 # Used by uf2 bootloader +# Used by uf2 bootloader +USB_PID = 0x0020 USB_PRODUCT = "SparkFun MicroMod SAMD51 Processor" USB_MANUFACTURER = "SparkFun Electronics" diff --git a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/mpconfigboard.mk index e33035d949..4b66bc7420 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/mpconfigboard.mk @@ -1,6 +1,7 @@ LD_FILE = boards/samd51x20-bootloader-external-flash.ld USB_VID = 0x1b4f -USB_PID = 0x0016 # Used by uf2 bootloader +# Used by uf2 bootloader +USB_PID = 0x0016 USB_PRODUCT = "SparkFun SAMD51 Thing+" USB_MANUFACTURER = "SparkFun Electronics" diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nrf/boards/particle_xenon/mpconfigboard.mk index 0722c4ac65..f6b801c9eb 100644 --- a/ports/nrf/boards/particle_xenon/mpconfigboard.mk +++ b/ports/nrf/boards/particle_xenon/mpconfigboard.mk @@ -1,5 +1,6 @@ USB_VID = 0x2b04 -USB_PID = 0xc00e # argon is 0xc00c +# argon is 0xc00c +USB_PID = 0xc00e USB_PRODUCT = "Xenon" USB_MANUFACTURER = "Particle" diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py index 51eac31f03..6becd5bd7e 100644 --- a/tools/ci_check_duplicate_usb_vid_pid.py +++ b/tools/ci_check_duplicate_usb_vid_pid.py @@ -24,57 +24,40 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +from collections import defaultdict import argparse import pathlib import re import sys -DEFAULT_IGNORELIST = [ - "circuitplayground_express", - "circuitplayground_express_crickit", - "circuitplayground_express_displayio", - "pycubed", - "pycubed_mram", - "pycubed_v05", - "pycubed_mram_v05", - "pygamer", - "pygamer_advance", - "trinket_m0", - "trinket_m0_haxpress", - "sparkfun_qwiic_micro_with_flash", - "sparkfun_qwiic_micro_no_flash", - "feather_m0_express", - "feather_m0_supersized", - "cp32-m4", - "metro_m4_express", - "unexpectedmaker_feathers2", - "unexpectedmaker_feathers2_prerelease", - "espressif_kaluga_1", - "espressif_kaluga_1.3", - "espressif_esp32s2_devkitc_1_n4r2", - "espressif_esp32s3_devkitc_1_n8", - "espressif_esp32s3_devkitc_1_n8r2", - "espressif_esp32s3_devkitc_1_n8r8", - "espressif_saola_1_wrover", - "jpconstantineau_pykey18", - "jpconstantineau_pykey44", - "jpconstantineau_pykey60", - "jpconstantineau_pykey87", -] +DEFAULT_CLUSTERLIST = { + "0x04D8:0xEC44": ["pycubed", "pycubed_mram", "pycubed_mram_v05", "pycubed_v05"], + "0x1B4F:0x8D24": ["sparkfun_qwiic_micro_no_flash", "sparkfun_qwiic_micro_with_flash"], + "0x1D50:0x6153": [ + "jpconstantineau_pykey18", + "jpconstantineau_pykey44", + "jpconstantineau_pykey60", + "jpconstantineau_pykey87", + ], + "0x239A:0x8019": [ + "circuitplayground_express", + "circuitplayground_express_crickit", + "circuitplayground_express_displayio", + ], + "0x239A:0x801F": ["trinket_m0_haxpress", "trinket_m0"], + "0x239A:0x8021": ["metro_m4_express", "cp32-m4"], + "0x239A:0x8023": ["feather_m0_express", "feather_m0_supersized"], + "0x239A:0x80A6": ["espressif_esp32s2_devkitc_1_n4r2", "espressif_saola_1_wrover"], + "0x239A:0x80AC": ["unexpectedmaker_feathers2", "unexpectedmaker_feathers2_prerelease"], + "0x239A:0x80C8": ["espressif_kaluga_1", "espressif_kaluga_1.3"], + "0x303A:0x7003": [ + "espressif_esp32s3_devkitc_1_n8", + "espressif_esp32s3_devkitc_1_n8r2", + "espressif_esp32s3_devkitc_1_n8r8", + ], +} cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker") -cli_parser.add_argument( - "--ignorelist", - dest="ignorelist", - nargs="?", - action="store", - default=DEFAULT_IGNORELIST, - help=( - "Board names to ignore duplicate VID/PID combinations. Pass an empty " - "string to disable all duplicate ignoring. Defaults are: " - f"{', '.join(DEFAULT_IGNORELIST)}" - ), -) def configboard_files(): @@ -87,48 +70,49 @@ def configboard_files(): return working_dir.glob("ports/**/boards/**/mpconfigboard.mk") -def check_vid_pid(files, ignorelist): +def check_vid_pid(files, clusterlist): """Compiles a list of USB VID & PID values for all boards, and checks for duplicates. Exits with ``sys.exit()`` (non-zero exit code) if duplicates are found, and lists the duplicates. """ - duplicates_found = False - - usb_ids = {} - - vid_pattern = re.compile(r"^USB_VID\s*\=\s*(.*)", flags=re.M) - pid_pattern = re.compile(r"^USB_PID\s*\=\s*(.*)", flags=re.M) + vid_pattern = re.compile(r"^USB_VID\s*=\s*(.*)", flags=re.M) + pid_pattern = re.compile(r"^USB_PID\s*=\s*(.*)", flags=re.M) + usb_pattern = re.compile(r"^CIRCUITPY_USB\s*=\s*0$|^IDF_TARGET = esp32c3$", flags=re.M) + usb_ids = defaultdict(set) for board_config in files: src_text = board_config.read_text() usb_vid = vid_pattern.search(src_text) usb_pid = pid_pattern.search(src_text) - + non_usb = usb_pattern.search(src_text) board_name = board_config.parts[-2] - board_ignorelisted = False - if board_name in ignorelist: - board_ignorelisted = True - board_name += " (ignorelisted)" - if usb_vid and usb_pid: - id_group = f"{usb_vid.group(1)}:{usb_pid.group(1)}" - if id_group not in usb_ids: - usb_ids[id_group] = {"boards": [board_name], "duplicate": False} + id_group = f"0x{int(usb_vid.group(1), 16):04X}:0x{int(usb_pid.group(1), 16):04X}" + elif non_usb: + continue + else: + raise SystemExit(f"Could not parse {board_config}") + + usb_ids[id_group].add(board_name) + + duplicates = [] + for key, boards in usb_ids.items(): + if len(boards) == 1: + continue + + # It is a cluster + cluster = set(clusterlist.get(key, [])) + if cluster != boards: + if key == "": + duplicates.append(f"- Non-USB:\n" f" Boards: {', '.join(sorted(boards))}") else: - usb_ids[id_group]["boards"].append(board_name) - if not board_ignorelisted: - usb_ids[id_group]["duplicate"] = True - duplicates_found = True - - if duplicates_found: - duplicates = "" - for key, value in usb_ids.items(): - if value["duplicate"]: - duplicates += f"- VID/PID: {key}\n" f" Boards: {', '.join(value['boards'])}\n" + duplicates.append(f"- VID/PID: {key}\n" f" Boards: {', '.join(sorted(boards))}") + if duplicates: + duplicates = "\n".join(duplicates) duplicate_message = ( f"Duplicate VID/PID usage found!\n{duplicates}\n" f"If you are open source maker, then you can request a PID from http://pid.codes\n" @@ -143,7 +127,6 @@ if __name__ == "__main__": arguments = cli_parser.parse_args() print("Running USB VID/PID Duplicate Checker...") - print(f"Ignoring the following boards: {', '.join(arguments.ignorelist)}", end="\n\n") board_files = configboard_files() - check_vid_pid(board_files, arguments.ignorelist) + check_vid_pid(board_files, DEFAULT_CLUSTERLIST) From b36ef7afb6d63b3d0a1c8a51c5b7f03f98986389 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Mar 2022 15:09:18 +0000 Subject: [PATCH 0036/2403] Translated using Weblate (German) Currently translated at 100.0% (1053 of 1053 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/ --- locale/de_DE.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/locale/de_DE.po b/locale/de_DE.po index cefd24e805..0b2269c461 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-03-18 00:02+0000\n" +"PO-Revision-Date: 2022-03-24 15:57+0000\n" "Last-Translator: Fabian Affolter \n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -28,6 +28,8 @@ msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"Code wurde durch automatisches Neuladen gestoppt. Wird bald neu geladen.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -2460,7 +2462,7 @@ msgstr "Konnte Farbpalettendaten nicht lesen" #: ports/espressif/common-hal/mdns/Server.c msgid "Unable to start mDNS query" -msgstr "" +msgstr "mDNS-Abfrage kann nicht gestartet werden" #: shared-bindings/nvm/ByteArray.c msgid "Unable to write to nvm." @@ -3717,11 +3719,11 @@ msgstr "Loopback + Silent Mode wird vom Peripheriegerät nicht unterstützt" #: ports/espressif/common-hal/mdns/Server.c msgid "mDNS already initialized" -msgstr "" +msgstr "mDNS bereits initialisiert" #: ports/espressif/common-hal/mdns/Server.c msgid "mDNS only works with built-in WiFi" -msgstr "" +msgstr "mDNS funktioniert nur mit integriertem WiFi" #: py/parse.c msgid "malformed f-string" From 9c81ea86e95f7e55d2a535a48539c531b047f8cd Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Thu, 24 Mar 2022 16:07:04 +0000 Subject: [PATCH 0037/2403] Added board definition for upcoming Pimoroni servo driver. --- .../boards/pimoroni_servo2040/board.c | 40 +++++++++++ .../boards/pimoroni_servo2040/mpconfigboard.h | 8 +++ .../pimoroni_servo2040/mpconfigboard.mk | 11 +++ .../pimoroni_servo2040/pico-sdk-configboard.h | 1 + .../boards/pimoroni_servo2040/pins.c | 67 +++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 ports/raspberrypi/boards/pimoroni_servo2040/board.c create mode 100644 ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/pimoroni_servo2040/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/pimoroni_servo2040/pins.c diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/board.c b/ports/raspberrypi/boards/pimoroni_servo2040/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_servo2040/board.c @@ -0,0 +1,40 @@ +/* + * 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 "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.h new file mode 100644 index 0000000000..412efc461a --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.h @@ -0,0 +1,8 @@ +#define MICROPY_HW_BOARD_NAME "Pimoroni Servo 2040" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO18) +#define MICROPY_HW_NEOPIXEL_COUNT (6) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO21) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO20) diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.mk new file mode 100644 index 0000000000..9648a0b067 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_servo2040/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x2E8A +USB_PID = 0x101A +USB_PRODUCT = "Servo 2040" +USB_MANUFACTURER = "Pimoroni" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_servo2040/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c new file mode 100644 index 0000000000..2022902da0 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c @@ -0,0 +1,67 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_SERVO_1), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_2), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_3), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_4), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_5), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_6), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_7), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_8), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_9), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_10), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_11), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_12), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_13), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_14), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_15), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_16), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_17), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_SERVO_18), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_LED_DAT), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(6) }, + + { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_USER_SW), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_0), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_1), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_2), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_SHARED_ADC), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_SENSOR_1_ADDR), MP_ROM_INT(0b000) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_2_ADDR), MP_ROM_INT(0b001) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_3_ADDR), MP_ROM_INT(0b010) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_4_ADDR), MP_ROM_INT(0b011) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_5_ADDR), MP_ROM_INT(0b100) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_6_ADDR), MP_ROM_INT(0b101) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_SENSE_ADDR), MP_ROM_INT(0b110) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_ADDR), MP_ROM_INT(0b111) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 8e98be2704ccd58b135631d40e136501fbdb4757 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Thu, 24 Mar 2022 18:32:39 +0000 Subject: [PATCH 0038/2403] Added additional constants --- ports/raspberrypi/boards/pimoroni_servo2040/pins.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c index 2022902da0..893c969863 100644 --- a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c @@ -21,6 +21,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SERVO_16), MP_ROM_PTR(&pin_GPIO15) }, { MP_ROM_QSTR(MP_QSTR_SERVO_17), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_SERVO_18), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_NUM_SERVOS), MP_ROM_INT(18) }, { MP_ROM_QSTR(MP_QSTR_LED_DAT), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(6) }, @@ -60,6 +61,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SENSOR_6_ADDR), MP_ROM_INT(0b101) }, { MP_ROM_QSTR(MP_QSTR_VOLTAGE_SENSE_ADDR), MP_ROM_INT(0b110) }, { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_ADDR), MP_ROM_INT(0b111) }, + { MP_ROM_QSTR(MP_QSTR_NUM_SENSORS), MP_ROM_INT(6) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, From bcec1e44f08a12b906bef550b2b628654ab3bd86 Mon Sep 17 00:00:00 2001 From: jerryneedell Date: Thu, 24 Mar 2022 15:05:02 -0400 Subject: [PATCH 0039/2403] add status LED to nrf pca10059 dongdle --- ports/nrf/boards/pca10059/mpconfigboard.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/pca10059/mpconfigboard.h index 18aa66f16b..20bed466b5 100644 --- a/ports/nrf/boards/pca10059/mpconfigboard.h +++ b/ports/nrf/boards/pca10059/mpconfigboard.h @@ -28,3 +28,7 @@ #define MICROPY_HW_MCU_NAME "nRF52840" #define MICROPY_HW_LED_STATUS (&pin_P0_06) +#define CIRCUITPY_RGB_STATUS_INVERTED_PWM +#define CIRCUITPY_RGB_STATUS_R (&pin_P0_08) +#define CIRCUITPY_RGB_STATUS_G (&pin_P1_09) +#define CIRCUITPY_RGB_STATUS_B (&pin_P0_12) From 7ad6fa8df573cbfcd965635f393ce5876a86b7ed Mon Sep 17 00:00:00 2001 From: Eric Rong Date: Thu, 24 Mar 2022 16:46:13 -0700 Subject: [PATCH 0040/2403] enable SPIRAM support on muselab nanoESP32S2 board --- .../muselab_nanoesp32_s2_wrover/sdkconfig | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig index 5b9c86dcc3..9b513fcf5a 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig @@ -1,4 +1,25 @@ -# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +CONFIG_ESP32S2_SPIRAM_SUPPORT=y + +# +# SPI RAM config +# +CONFIG_SPIRAM_TYPE_ESPPSRAM16=y +CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config + +# +# PSRAM clock and cs IO for ESP32S2 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM clock and cs IO for ESP32S2 + +CONFIG_SPIRAM_SPEED_40M=y +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +CONFIG_SPIRAM_USE_MEMMAP=y +CONFIG_SPIRAM_MEMTEST=y + # # LWIP # From 686012426d0c066aa0b8562612808e973d0fa645 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sat, 19 Mar 2022 12:40:01 +1100 Subject: [PATCH 0041/2403] Espressif: Fix interrupts in UART workflow --- ports/espressif/common-hal/busio/UART.c | 50 ++++++++++++++++++++++++- ports/espressif/common-hal/busio/UART.h | 3 ++ supervisor/shared/status_leds.h | 4 +- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 5aac1635af..0c44107e60 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -30,16 +30,47 @@ #include "components/driver/include/driver/uart.h" #include "mpconfigport.h" +#include "shared/readline/readline.h" #include "shared/runtime/interrupt_char.h" #include "py/gc.h" #include "py/mperrno.h" #include "py/runtime.h" #include "py/stream.h" +#include "supervisor/port.h" #include "supervisor/shared/translate.h" #include "supervisor/shared/tick.h" uint8_t never_reset_uart_mask = 0; +static void uart_event_task(void *param) { + busio_uart_obj_t *self = param; + uart_event_t event; + while (true) { + if (xQueueReceive(self->event_queue, &event, portMAX_DELAY)) { + switch (event.type) { + case UART_PATTERN_DET: + // When the debug uart receives CTRL+C, wake the main task and schedule a keyboard interrupt + if (self->is_debug) { + port_wake_main_task(); + if (mp_interrupt_char == CHAR_CTRL_C) { + uart_flush(self->uart_num); + mp_sched_keyboard_interrupt(); + } + } + break; + case UART_DATA: + // When the debug uart receives any key, wake the main task + if (self->is_debug) { + port_wake_main_task(); + } + break; + default: + break; + } + } + } +} + void uart_reset(void) { for (uart_port_t num = 0; num < UART_NUM_MAX; num++) { // Ignore the UART used by the IDF. @@ -125,10 +156,26 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, uint8_t rx_threshold = UART_FIFO_LEN - 8; // Install the driver before we change the settings. - if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 0, NULL, 0) != ESP_OK || + if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK || uart_set_mode(self->uart_num, mode) != ESP_OK) { mp_raise_ValueError(translate("Could not initialize UART")); } + // On the debug uart, enable pattern detection to look for CTRL+C + #ifdef CIRCUITPY_DEBUG_UART_RX + if (rx == CIRCUITPY_DEBUG_UART_RX) { + self->is_debug = true; + uart_enable_pattern_det_baud_intr(self->uart_num, CHAR_CTRL_C, 1, 1, 0, 0); + } + #endif + // Start a task to listen for uart events + xTaskCreatePinnedToCore( + uart_event_task, + "uart_event_task", + configMINIMAL_STACK_SIZE, + self, + CONFIG_PTHREAD_TASK_PRIO_DEFAULT, + &self->event_task, + xPortGetCoreID()); uart_set_hw_flow_ctrl(self->uart_num, flow_control, rx_threshold); // Set baud rate @@ -230,6 +277,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) { if (common_hal_busio_uart_deinited(self)) { return; } + vTaskDelete(self->event_task); uart_driver_delete(self->uart_num); common_hal_reset_pin(self->rx_pin); diff --git a/ports/espressif/common-hal/busio/UART.h b/ports/espressif/common-hal/busio/UART.h index 1e0ed3dd99..ca5b3f925b 100644 --- a/ports/espressif/common-hal/busio/UART.h +++ b/ports/espressif/common-hal/busio/UART.h @@ -42,6 +42,9 @@ typedef struct { uint8_t character_bits; bool rx_error; uint32_t timeout_ms; + bool is_debug; + QueueHandle_t event_queue; + TaskHandle_t event_task; } busio_uart_obj_t; void uart_reset(void); diff --git a/supervisor/shared/status_leds.h b/supervisor/shared/status_leds.h index 3d2fa978a8..99aa0277d6 100644 --- a/supervisor/shared/status_leds.h +++ b/supervisor/shared/status_leds.h @@ -44,8 +44,8 @@ // To work with a NeoPixel, one must have MICROPY_HW_NEOPIXEL defined and // neopixel_write implemented. -#define CIRCUITPY_PWM_RGB_LED defined(CIRCUITPY_RGB_STATUS_R) || defined(CIRCUITPY_RGB_STATUS_G) || defined(CIRCUITPY_RGB_STATUS_B) -#define CIRCUITPY_STATUS_LED (CIRCUITPY_DIGITALIO && defined(MICROPY_HW_LED_STATUS)) || defined(MICROPY_HW_NEOPIXEL) || (defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)) || CIRCUITPY_PWM_RGB_LED +#define CIRCUITPY_PWM_RGB_LED (defined(CIRCUITPY_RGB_STATUS_R) || defined(CIRCUITPY_RGB_STATUS_G) || defined(CIRCUITPY_RGB_STATUS_B)) +#define CIRCUITPY_STATUS_LED ((CIRCUITPY_DIGITALIO && defined(MICROPY_HW_LED_STATUS)) || defined(MICROPY_HW_NEOPIXEL) || (defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)) || CIRCUITPY_PWM_RGB_LED) void status_led_init(void); void status_led_deinit(void); From 372306411adf223b61961b639a0d79e2d1d19494 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 25 Mar 2022 11:17:15 -0500 Subject: [PATCH 0042/2403] samd: Don't rely on RTC interrupt I instrumented RTC_Handler and determined that on SAMD51 it was possible for the interrupt to be delivered well before the actual overflow of the RTC COUNT register (e.g., a value as small as 0xffff_fffd could be seen at the time of overflow) Rather than depending on the overflow interrupt coming in at the same time as COUNT overflows (exactly), rely only on observed values of COUNT in _get_count, overflowing when it wraps around from a high value to a low one. With this change, PLUS a second change so that it is possible to warp the RTC counter close to an overflow and test in 20ms instead of 3 days, there was no problem detected over 20000+ overflows. Before, a substantial fraction (much greater than 10%) of overflows failed. Fixes #5985 Change to common-hal/rtc/RTC.c for time warping (plus make rtc_old_count non-static): ```patch void common_hal_rtc_set_calibration(int calibration) { + + common_hal_mcu_disable_interrupts(); + + RTC->MODE0.COUNT.reg = 0xffffff00; + rtc_old_count = 0; + do { + while ((RTC->MODE0.SYNCBUSY.reg & (RTC_MODE0_SYNCBUSY_COUNTSYNC | RTC_MODE0_SYNCBUSY_COUNT)) != 0) { } + } + while(RTC->MODE0.COUNT.reg < 0xffffff00); + common_hal_mcu_enable_interrupts(); + + mp_printf(&mp_plat_print, "Warping RTC in calibration setter count=%08x rtc_old_count=%08x\n", RTC->MODE0.COUNT.reg, rtc_old_count); ``` Test program: ```python import time from rtc import RTC i = 0 while True: RTC().calibration = 1 # Warps to ~16ms before overflow, with patch to RTC code t0 = time.monotonic_ns() et = t0 + 20_000_000 # 20ms while (t1 := time.monotonic_ns()) < et: pass i += 1 print(f"{i:6d}: duration {t1-t0}") if t1-t0 > 200_000_000: break print() ``` --- ports/atmel-samd/supervisor/port.c | 50 ++++++++++++------------------ 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c index cccef8be53..704d17c68d 100644 --- a/ports/atmel-samd/supervisor/port.c +++ b/ports/atmel-samd/supervisor/port.c @@ -247,7 +247,6 @@ static void rtc_init(void) { RTC_MODE0_CTRLA_COUNTSYNC; #endif - RTC->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_OVF; // Set all peripheral interrupt priorities to the lowest priority by default. for (uint16_t i = 0; i < PERIPH_COUNT_IRQn; i++) { @@ -501,45 +500,34 @@ uint32_t port_get_saved_word(void) { // TODO: Move this to an RTC backup register so we can preserve it when only the BACKUP power domain // is enabled. static volatile uint64_t overflowed_ticks = 0; +static uint32_t rtc_old_count; static uint32_t _get_count(uint64_t *overflow_count) { - while (1) { - // Disable interrupts so we can grab the count and the overflow atomically. - common_hal_mcu_disable_interrupts(); - - #ifdef SAM_D5X_E5X - while ((RTC->MODE0.SYNCBUSY.reg & (RTC_MODE0_SYNCBUSY_COUNTSYNC | RTC_MODE0_SYNCBUSY_COUNT)) != 0) { - } - #endif - // SAMD21 does continuous sync so we don't need to wait here. - - uint32_t count = RTC->MODE0.COUNT.reg; - if (overflow_count != NULL) { - *overflow_count = overflowed_ticks; - } - - bool overflow_pending = RTC->MODE0.INTFLAG.bit.OVF; - - common_hal_mcu_enable_interrupts(); - - if (!overflow_pending) { - return count; - } - - // Try again if overflow hasn't been processed yet. + #ifdef SAM_D5X_E5X + while ((RTC->MODE0.SYNCBUSY.reg & (RTC_MODE0_SYNCBUSY_COUNTSYNC | RTC_MODE0_SYNCBUSY_COUNT)) != 0) { } + #endif + // SAMD21 does continuous sync so we don't need to wait here. + + uint32_t count = RTC->MODE0.COUNT.reg; + if (count < rtc_old_count) { + // Our RTC is 32 bits and we're clocking it at 16.384khz which is 16 (2 ** 4) subticks per + // tick. + overflowed_ticks += (1L << (32 - 4)); + } + rtc_old_count = count; + + if (overflow_count != NULL) { + *overflow_count = overflowed_ticks; + } + + return count; } volatile bool _woken_up; void RTC_Handler(void) { uint32_t intflag = RTC->MODE0.INTFLAG.reg; - if (intflag & RTC_MODE0_INTFLAG_OVF) { - RTC->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_OVF; - // Our RTC is 32 bits and we're clocking it at 16.384khz which is 16 (2 ** 4) subticks per - // tick. - overflowed_ticks += (1L << (32 - 4)); - } #ifdef SAM_D5X_E5X if (intflag & RTC_MODE0_INTFLAG_PER2) { RTC->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_PER2; From f96cd7361dbfa557f862a39862eac35d0dd18e45 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Fri, 25 Mar 2022 22:30:20 +1100 Subject: [PATCH 0043/2403] Fix esp32s2 build --- ports/espressif/common-hal/busio/UART.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/espressif/common-hal/busio/UART.h b/ports/espressif/common-hal/busio/UART.h index ca5b3f925b..cd2dcc4d57 100644 --- a/ports/espressif/common-hal/busio/UART.h +++ b/ports/espressif/common-hal/busio/UART.h @@ -32,6 +32,10 @@ #include "components/hal/include/hal/uart_types.h" #include "py/obj.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "freertos/queue.h" + typedef struct { mp_obj_base_t base; const mcu_pin_obj_t *rx_pin; From 0d3f45bef8d2ff1e4e870f74ec60d8a357b348c1 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 27 Mar 2022 16:18:56 -0500 Subject: [PATCH 0044/2403] Remove move DecompIO files --- .../unix/variants/coverage/mpconfigvariant.mk | 2 - tests/circuitpython/zlib_decompio.py | 33 ---------- tests/circuitpython/zlib_decompio.py.exp | 12 ---- tests/circuitpython/zlib_decompio_gz.py | 60 ------------------- tests/circuitpython/zlib_decompio_gz.py.exp | 13 ---- 5 files changed, 120 deletions(-) delete mode 100644 tests/circuitpython/zlib_decompio.py delete mode 100644 tests/circuitpython/zlib_decompio.py.exp delete mode 100644 tests/circuitpython/zlib_decompio_gz.py delete mode 100644 tests/circuitpython/zlib_decompio_gz.py.exp diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index 681cc16e19..0f6cb11169 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -39,7 +39,6 @@ SRC_BITMAP := \ shared-bindings/traceback/__init__.c \ shared-bindings/util.c \ shared-bindings/zlib/__init__.c \ - shared-bindings/zlib/DecompIO.c \ shared-module/aesio/aes.c \ shared-module/aesio/__init__.c \ shared-module/bitmaptools/__init__.c \ @@ -50,7 +49,6 @@ SRC_BITMAP := \ shared-module/rainbowio/__init__.c \ shared-module/traceback/__init__.c \ shared-module/zlib/__init__.c \ - shared-module/zlib/DecompIO.c $(info $(SRC_BITMAP)) SRC_C += $(SRC_BITMAP) diff --git a/tests/circuitpython/zlib_decompio.py b/tests/circuitpython/zlib_decompio.py deleted file mode 100644 index 0ded0b6966..0000000000 --- a/tests/circuitpython/zlib_decompio.py +++ /dev/null @@ -1,33 +0,0 @@ -try: - import zlib - import uio as io -except ImportError: - print("SKIP") - raise SystemExit - - -# Raw DEFLATE bitstream -buf = io.BytesIO(b"\xcbH\xcd\xc9\xc9\x07\x00") -inp = zlib.DecompIO(buf, -8) -print(buf.seek(0, 1)) -print(inp.read(1)) -print(buf.seek(0, 1)) -print(inp.read(2)) -print(inp.read()) -print(buf.seek(0, 1)) -print(inp.read(1)) -print(inp.read()) -print(buf.seek(0, 1)) - - -# zlib bitstream -inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1")) -print(inp.read(10)) -print(inp.read()) - -# zlib bitstream, wrong checksum -inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc0")) -try: - print(inp.read()) -except OSError as e: - print(repr(e)) diff --git a/tests/circuitpython/zlib_decompio.py.exp b/tests/circuitpython/zlib_decompio.py.exp deleted file mode 100644 index 3f5f360fa3..0000000000 --- a/tests/circuitpython/zlib_decompio.py.exp +++ /dev/null @@ -1,12 +0,0 @@ -0 -b'h' -2 -b'el' -b'lo' -7 -b'' -b'' -7 -b'0000000000' -b'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' -OSError(22,) diff --git a/tests/circuitpython/zlib_decompio_gz.py b/tests/circuitpython/zlib_decompio_gz.py deleted file mode 100644 index e752d50a84..0000000000 --- a/tests/circuitpython/zlib_decompio_gz.py +++ /dev/null @@ -1,60 +0,0 @@ -try: - import zlib - import uio as io -except ImportError: - print("SKIP") - raise SystemExit - - -# gzip bitstream -buf = io.BytesIO( - b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" -) -inp = zlib.DecompIO(buf, 16 + 8) -print(buf.seek(0, 1)) -print(inp.read(1)) -print(buf.seek(0, 1)) -print(inp.read(2)) -print(inp.read()) -print(buf.seek(0, 1)) -print(inp.read(1)) -print(inp.read()) -print(buf.seek(0, 1)) - -# Check FHCRC field -buf = io.BytesIO( - b"\x1f\x8b\x08\x02\x99\x0c\xe5W\x00\x03\x00\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" -) -inp = zlib.DecompIO(buf, 16 + 8) -print(inp.read()) - -# Check FEXTRA field -buf = io.BytesIO( - b"\x1f\x8b\x08\x04\x99\x0c\xe5W\x00\x03\x01\x00X\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" -) -inp = zlib.DecompIO(buf, 16 + 8) -print(inp.read()) - -# broken header -buf = io.BytesIO( - b"\x1f\x8c\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00" -) -try: - inp = zlib.DecompIO(buf, 16 + 8) -except ValueError: - print("ValueError") - -# broken crc32 -buf = io.BytesIO( - b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa7\x106\x05\x00\x00\x00" -) -inp = zlib.DecompIO(buf, 16 + 8) -try: - inp.read(6) -except OSError as e: - print(repr(e)) - -# broken uncompressed size - not checked so far -# buf = io.BytesIO(b'\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x06\x00\x00\x00') -# inp = zlib.DecompIO(buf, 16 + 8) -# inp.read(6) diff --git a/tests/circuitpython/zlib_decompio_gz.py.exp b/tests/circuitpython/zlib_decompio_gz.py.exp deleted file mode 100644 index 20a30c82a3..0000000000 --- a/tests/circuitpython/zlib_decompio_gz.py.exp +++ /dev/null @@ -1,13 +0,0 @@ -16 -b'h' -18 -b'el' -b'lo' -31 -b'' -b'' -31 -b'hello' -b'hello' -ValueError -OSError(22,) From 6d025a239e1c6d6ff786655c48e6927d923bb4f1 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 28 Mar 2022 08:55:04 +0100 Subject: [PATCH 0045/2403] Add espressif rotaryio divisor support. --- .../common-hal/rotaryio/IncrementalEncoder.c | 53 ++++++++++++++++--- .../common-hal/rotaryio/IncrementalEncoder.h | 1 + ports/espressif/peripherals/pcnt.c | 13 ++++- ports/espressif/peripherals/pcnt.h | 1 + shared-bindings/rotaryio/IncrementalEncoder.c | 2 +- 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c index 676e99289d..db50e8db93 100644 --- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c @@ -29,7 +29,6 @@ #include "common-hal/microcontroller/Pin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self, const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) { @@ -37,7 +36,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode claim_pin(pin_b); // Prepare configuration for the PCNT unit - const pcnt_config_t pcnt_config = { + pcnt_config_t pcnt_config = { // Set PCNT input signal and control GPIOs .pulse_gpio_num = pin_a->number, .ctrl_gpio_num = pin_b->number, @@ -51,11 +50,46 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode }; // Initialize PCNT unit - const int8_t unit = peripherals_pcnt_init(pcnt_config); + const int8_t unit = peripherals_pcnt_get_unit(pcnt_config); if (unit == -1) { mp_raise_RuntimeError(translate("All PCNT units in use")); } + pcnt_unit_config(&pcnt_config); + + if ((self->divisor == 2) || (self->divisor == 1)) { + // Setup channel 1 for divisor=2 or divisor=1 + pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal + pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control + pcnt_config.channel = PCNT_CHANNEL_1; + // What to do on the positive / negative edge of pulse input? + pcnt_config.pos_mode = PCNT_COUNT_DEC; // Count up on the positive edge + pcnt_config.neg_mode = PCNT_COUNT_INC; // Keep the counter value on the negative edge + // What to do when control input is low or high? + pcnt_config.lctrl_mode = PCNT_MODE_KEEP; // Keep the primary counter mode if low + pcnt_config.hctrl_mode = PCNT_MODE_REVERSE; // Reverse counting direction if high + } else { + // Ensure channel 1 is disabled for divisor=4 + pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal + pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control + pcnt_config.channel = PCNT_CHANNEL_1; + // What to do on the positive / negative edge of pulse input? + pcnt_config.pos_mode = PCNT_COUNT_DIS; // Disabled + pcnt_config.neg_mode = PCNT_COUNT_DIS; // Disabled + // What to do when control input is low or high? + pcnt_config.lctrl_mode = PCNT_MODE_DISABLE; // Disabled + pcnt_config.hctrl_mode = PCNT_MODE_DISABLE; // Disabled + } + + pcnt_unit_config(&pcnt_config); + + // Initialize PCNT's counter + pcnt_counter_pause(pcnt_config.unit); + pcnt_counter_clear(pcnt_config.unit); + + // Everything is set up, now go to counting + pcnt_counter_resume(pcnt_config.unit); + self->pin_a = pin_a->number; self->pin_b = pin_b->number; self->unit = (pcnt_unit_t)unit; @@ -77,7 +111,12 @@ void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_o mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementalencoder_obj_t *self) { int16_t count; pcnt_get_counter_value(self->unit, &count); - return (count / 2) + self->position; + + if ((self->divisor == 4) || (self->divisor == 2)) { + return (count / 2) + self->position; + } else { + return (count) + self->position; + } } void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalencoder_obj_t *self, @@ -87,11 +126,9 @@ void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalenc } mp_int_t common_hal_rotaryio_incrementalencoder_get_divisor(rotaryio_incrementalencoder_obj_t *self) { - return 4; + return self->divisor; } void common_hal_rotaryio_incrementalencoder_set_divisor(rotaryio_incrementalencoder_obj_t *self, mp_int_t divisor) { - if (divisor != 4) { - mp_raise_ValueError(translate("divisor must be 4")); - } + self->divisor = divisor; } diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.h b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.h index 4982c39103..c43cd62bf6 100644 --- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.h +++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.h @@ -35,6 +35,7 @@ typedef struct { uint8_t pin_a, pin_b; mp_int_t position; pcnt_unit_t unit; + int8_t divisor; // Number of quadrature edges required per count } rotaryio_incrementalencoder_obj_t; #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H diff --git a/ports/espressif/peripherals/pcnt.c b/ports/espressif/peripherals/pcnt.c index e4578a2791..d1b85fbb13 100644 --- a/ports/espressif/peripherals/pcnt.c +++ b/ports/espressif/peripherals/pcnt.c @@ -37,7 +37,7 @@ void peripherals_pcnt_reset(void) { } } -int peripherals_pcnt_init(pcnt_config_t pcnt_config) { +int peripherals_pcnt_get_unit(pcnt_config_t pcnt_config) { // Look for available pcnt unit for (uint8_t i = 0; i <= 3; i++) { if (pcnt_unit_state[i] == PCNT_UNIT_INACTIVE) { @@ -49,6 +49,17 @@ int peripherals_pcnt_init(pcnt_config_t pcnt_config) { } } + return pcnt_config.unit; +} + +int peripherals_pcnt_init(pcnt_config_t pcnt_config) { + // Look for available pcnt unit + + const int8_t unit = peripherals_pcnt_get_unit(pcnt_config); + if (unit == -1) { + return -1; + } + // Initialize PCNT unit pcnt_unit_config(&pcnt_config); diff --git a/ports/espressif/peripherals/pcnt.h b/ports/espressif/peripherals/pcnt.h index b2bae7b371..c73c41a232 100644 --- a/ports/espressif/peripherals/pcnt.h +++ b/ports/espressif/peripherals/pcnt.h @@ -31,6 +31,7 @@ #include "soc/pcnt_struct.h" extern int peripherals_pcnt_init(pcnt_config_t pcnt_config); +extern int peripherals_pcnt_get_unit(pcnt_config_t pcnt_config); extern void peripherals_pcnt_deinit(pcnt_unit_t *unit); extern void peripherals_pcnt_reset(void); diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c index ef218ba024..12202a2649 100644 --- a/shared-bindings/rotaryio/IncrementalEncoder.c +++ b/shared-bindings/rotaryio/IncrementalEncoder.c @@ -77,9 +77,9 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, rotaryio_incrementalencoder_obj_t *self = m_new_obj(rotaryio_incrementalencoder_obj_t); self->base.type = &rotaryio_incrementalencoder_type; + common_hal_rotaryio_incrementalencoder_set_divisor(self, args[ARG_divisor].u_int); common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b); - common_hal_rotaryio_incrementalencoder_set_divisor(self, args[ARG_divisor].u_int); return MP_OBJ_FROM_PTR(self); } From b44a2a0c8eee53480ce59ee2dd98b823b20f643e Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Mon, 28 Mar 2022 14:07:08 +0100 Subject: [PATCH 0046/2403] Updated pin name to match schematic --- ports/raspberrypi/boards/pimoroni_servo2040/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c index 893c969863..5471283cf9 100644 --- a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c @@ -23,7 +23,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SERVO_18), MP_ROM_PTR(&pin_GPIO17) }, { MP_ROM_QSTR(MP_QSTR_NUM_SERVOS), MP_ROM_INT(18) }, - { MP_ROM_QSTR(MP_QSTR_LED_DAT), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_LED_DATA), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(6) }, { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_GPIO19) }, From c2fb44b36c1b8efce18465272dcff15b0ec65308 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Mon, 28 Mar 2022 15:56:02 +0100 Subject: [PATCH 0047/2403] Set enable pin to high during boot --- .../boards/pimoroni_badger2040/badger-shared.h | 8 ++++++++ ports/raspberrypi/boards/pimoroni_badger2040/board.c | 12 ++++++++++++ ports/raspberrypi/boards/pimoroni_badger2040/pins.c | 6 ++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h new file mode 100644 index 0000000000..efefc50c50 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h @@ -0,0 +1,8 @@ +#ifndef PIMORONI_BADGER2040_SHARED +#define PIMORONI_BADGER2040_SHARED + +#include "shared-bindings/digitalio/DigitalInOut.h" + +digitalio_digitalinout_obj_t enable_pin_obj; + +#endif // PIMORONI_BADGER2040_SHARED \ No newline at end of file diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c index 6daf4c52b2..569d51478a 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c @@ -32,6 +32,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-module/displayio/__init__.h" #include "supervisor/shared/board.h" +#include "badger-shared.h" #define DELAY 0x80 @@ -258,10 +259,20 @@ const uint8_t display_stop_sequence[] = { }; void board_init(void) { + // Drive the EN_3V3 pin high so the board stays awake on battery power + enable_pin_obj.base.type = &digitalio_digitalinout_type; + common_hal_digitalio_digitalinout_construct(&enable_pin_obj, &pin_GPIO10); + common_hal_digitalio_digitalinout_switch_to_output(&enable_pin_obj, true, DRIVE_MODE_PUSH_PULL); + + // Never reset + common_hal_digitalio_digitalinout_never_reset(&enable_pin_obj); + + // Set up the SPI object used to control the display busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus; common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false); common_hal_busio_spi_never_reset(spi); + // Set up the DisplayIO pin object displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus; bus->base.type = &displayio_fourwire_type; common_hal_displayio_fourwire_construct(bus, @@ -273,6 +284,7 @@ void board_init(void) { 0, // Polarity 0); // Phase + // Set up the DisplayIO epaper object displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display; display->base.type = &displayio_epaperdisplay_type; common_hal_displayio_epaperdisplay_construct( diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c index ea90853202..678d46e166 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c @@ -1,6 +1,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" +#include "badger-shared.h" STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS @@ -15,7 +16,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_3V3_EN), MP_ROM_PTR(&pin_GPIO10) }, + //{ MP_ROM_QSTR(MP_QSTR_EN_3V3), MP_ROM_PTR(&pin_GPIO10) }, { MP_ROM_QSTR(MP_QSTR_SW_DOWN), MP_ROM_PTR(&pin_GPIO11) }, { MP_ROM_QSTR(MP_QSTR_SW_A), MP_ROM_PTR(&pin_GPIO12) }, @@ -36,7 +37,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO25) }, { MP_ROM_QSTR(MP_QSTR_INKY_BUSY), MP_ROM_PTR(&pin_GPIO26) }, { MP_ROM_QSTR(MP_QSTR_VREF_POWER), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_1V2_REF), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_REF_1V2), MP_ROM_PTR(&pin_GPIO28) }, { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO29) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, @@ -44,5 +45,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].epaper_display)}, + { MP_ROM_QSTR(MP_QSTR_ENABLE), MP_ROM_PTR(&enable_pin_obj)}, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From f07cfdd80cb2ce193fac9579d0038a35ed21d589 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Mon, 28 Mar 2022 18:34:39 +0100 Subject: [PATCH 0048/2403] Linting fixes --- ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h | 2 +- ports/raspberrypi/boards/pimoroni_badger2040/pins.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h index efefc50c50..13d7fc9ed6 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h +++ b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h @@ -5,4 +5,4 @@ digitalio_digitalinout_obj_t enable_pin_obj; -#endif // PIMORONI_BADGER2040_SHARED \ No newline at end of file +#endif // PIMORONI_BADGER2040_SHARED diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c index 678d46e166..b6ed111abd 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c @@ -16,7 +16,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) }, - //{ MP_ROM_QSTR(MP_QSTR_EN_3V3), MP_ROM_PTR(&pin_GPIO10) }, + // { MP_ROM_QSTR(MP_QSTR_EN_3V3), MP_ROM_PTR(&pin_GPIO10) }, { MP_ROM_QSTR(MP_QSTR_SW_DOWN), MP_ROM_PTR(&pin_GPIO11) }, { MP_ROM_QSTR(MP_QSTR_SW_A), MP_ROM_PTR(&pin_GPIO12) }, From 682b5cac2fb3b610b168adf60cd4a3f4d867edf1 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 28 Mar 2022 19:45:42 -0400 Subject: [PATCH 0049/2403] Pin typer and click to have compatible versions --- requirements-dev.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9c574567f7..67835dad3d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,10 +4,12 @@ huffman # For nvm.toml cascadetoml jinja2 -typer +# Undo this pin when click and typer are again compatible. +typer==0.4.0 sh -click +# Undo this pin when click and typer are again compatible. +click==8.0.4 cpp-coveralls requests requests-cache From 9a88c85657d7831ed06a7db02e88e2d8abbc6437 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 28 Mar 2022 19:36:28 -0500 Subject: [PATCH 0050/2403] also pin typer for windows builds --- .github/workflows/ports_windows.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml index 777497485d..9d97ffbf6a 100644 --- a/.github/workflows/ports_windows.yml +++ b/.github/workflows/ports_windows.yml @@ -5,12 +5,14 @@ on: pull_request: paths: - '.github/workflows/*.yml' - - 'tools/**' - - 'py/**' - 'extmod/**' - 'lib/**' + - 'mpy-cross/**' - 'ports/unix/**' - 'ports/windows/**' + - 'py/**' + - 'requirements*.txt' + - 'tools/**' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -64,7 +66,8 @@ jobs: pip install wheel # requirements_dev.txt doesn't install on windows. (with msys2 python) # instead, pick a subset for what we want to do - pip install cascadetoml jinja2 typer intelhex + # Undo the pin of typer & click when undoing it in requirements-dev.txt + pip install cascadetoml jinja2 typer==0.4.0 click==8.0.4 intelhex # check that installed packages work....? which python; python --version; python -c "import cascadetoml" which python3; python3 --version; python3 -c "import cascadetoml" From d5868b42ffa21659da4d8d3439497cb730d7aa9b Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 28 Mar 2022 19:45:42 -0400 Subject: [PATCH 0052/2403] Pin typer and click to have compatible versions --- requirements-dev.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index eb21bc208b..c3b011685b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,10 +4,12 @@ huffman # For nvm.toml cascadetoml jinja2 -typer +# Undo this pin when click and typer are again compatible. +typer==0.4.0 sh -click +# Undo this pin when click and typer are again compatible. +click==8.0.4 cpp-coveralls requests requests-cache From 29eed5c21f9908e9cae86b2725c371b5c3b87f56 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 28 Mar 2022 19:36:28 -0500 Subject: [PATCH 0053/2403] also pin typer for windows builds --- .github/workflows/ports_windows.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml index 777497485d..9d97ffbf6a 100644 --- a/.github/workflows/ports_windows.yml +++ b/.github/workflows/ports_windows.yml @@ -5,12 +5,14 @@ on: pull_request: paths: - '.github/workflows/*.yml' - - 'tools/**' - - 'py/**' - 'extmod/**' - 'lib/**' + - 'mpy-cross/**' - 'ports/unix/**' - 'ports/windows/**' + - 'py/**' + - 'requirements*.txt' + - 'tools/**' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -64,7 +66,8 @@ jobs: pip install wheel # requirements_dev.txt doesn't install on windows. (with msys2 python) # instead, pick a subset for what we want to do - pip install cascadetoml jinja2 typer intelhex + # Undo the pin of typer & click when undoing it in requirements-dev.txt + pip install cascadetoml jinja2 typer==0.4.0 click==8.0.4 intelhex # check that installed packages work....? which python; python --version; python -c "import cascadetoml" which python3; python3 --version; python3 -c "import cascadetoml" From 2563c509f71c50767f6dfd9b73d5798a8a040409 Mon Sep 17 00:00:00 2001 From: lady ada Date: Tue, 1 Mar 2022 18:15:37 -0500 Subject: [PATCH 0054/2403] fix automatic i2c enablement with rev C --- .../espressif/boards/adafruit_feather_esp32s2/board.c | 10 +++++++++- ports/espressif/boards/adafruit_feather_esp32s2/pins.c | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/board.c b/ports/espressif/boards/adafruit_feather_esp32s2/board.c index 1be9000b3a..f9e88c097e 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2/board.c @@ -41,8 +41,16 @@ bool board_requests_safe_mode(void) { void reset_board(void) { // Turn on I2C power by default. + + // set pin to input to find 'rest state' + gpio_set_direction(7, GPIO_MODE_DEF_INPUT); + // wait 1 millis for pull to activate + mp_hal_delay_ms(1); + // read rest state (off) + bool restlevel = gpio_get_level(7); gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT); - gpio_set_level(7, false); + // flip it! + gpio_set_level(7, !restlevel); } void board_deinit(void) { diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c index c9f0e870ed..6cad56eb19 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c @@ -17,6 +17,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_I2C_POWER_INVERTED), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) }, From b032d42a71fa46eddcd6fa52ccc82aa7851e9e3c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 1 Mar 2022 19:56:23 -0500 Subject: [PATCH 0055/2403] Update ports/espressif/boards/adafruit_feather_esp32s2/pins.c --- ports/espressif/boards/adafruit_feather_esp32s2/pins.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c index 6cad56eb19..cf4c915e7f 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c @@ -16,7 +16,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_I2C_POWER_INVERTED), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, From dd933c7d0638d9d42cdeea886e4a7274fbe1f943 Mon Sep 17 00:00:00 2001 From: BigTuna94 Date: Wed, 30 Mar 2022 09:17:26 -0400 Subject: [PATCH 0056/2403] add NeoPixel lib to firmware --- ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk index 79970a1a1b..65fc82f7ff 100644 --- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk @@ -11,3 +11,6 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ,W25Q128JVxQ" CIRCUITPY__EVE = 1 + + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel From 336abdfbc75c7b72d17784bba2dd466a3520b7c0 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Wed, 30 Mar 2022 17:44:36 +0100 Subject: [PATCH 0057/2403] Switch variable to extern --- ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h | 2 +- ports/raspberrypi/boards/pimoroni_badger2040/board.c | 2 ++ ports/raspberrypi/boards/pimoroni_badger2040/pins.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h index 13d7fc9ed6..c832616e7d 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h +++ b/ports/raspberrypi/boards/pimoroni_badger2040/badger-shared.h @@ -3,6 +3,6 @@ #include "shared-bindings/digitalio/DigitalInOut.h" -digitalio_digitalinout_obj_t enable_pin_obj; +extern digitalio_digitalinout_obj_t enable_pin_obj; #endif // PIMORONI_BADGER2040_SHARED diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c index 569d51478a..666bb5f62f 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c @@ -34,6 +34,8 @@ #include "supervisor/shared/board.h" #include "badger-shared.h" +digitalio_digitalinout_obj_t enable_pin_obj; + #define DELAY 0x80 enum reg { diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c index b6ed111abd..9cfc951d33 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c @@ -45,6 +45,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].epaper_display)}, - { MP_ROM_QSTR(MP_QSTR_ENABLE), MP_ROM_PTR(&enable_pin_obj)}, + { MP_ROM_QSTR(MP_QSTR_ENABLE_DIO), MP_ROM_PTR(&enable_pin_obj)}, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 319ca8560cfa62d1f28edef085bcfbd4d20e8d85 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 31 Mar 2022 20:00:34 +0100 Subject: [PATCH 0058/2403] Always configure the second PCNT channel. --- locale/circuitpython.pot | 4 -- .../common-hal/rotaryio/IncrementalEncoder.c | 38 +++++-------------- shared-bindings/rotaryio/IncrementalEncoder.c | 2 +- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 0ce564f1f7..1df2209bba 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -3126,10 +3126,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c index db50e8db93..788050b6be 100644 --- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c @@ -57,29 +57,15 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode pcnt_unit_config(&pcnt_config); - if ((self->divisor == 2) || (self->divisor == 1)) { - // Setup channel 1 for divisor=2 or divisor=1 - pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal - pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control - pcnt_config.channel = PCNT_CHANNEL_1; - // What to do on the positive / negative edge of pulse input? - pcnt_config.pos_mode = PCNT_COUNT_DEC; // Count up on the positive edge - pcnt_config.neg_mode = PCNT_COUNT_INC; // Keep the counter value on the negative edge - // What to do when control input is low or high? - pcnt_config.lctrl_mode = PCNT_MODE_KEEP; // Keep the primary counter mode if low - pcnt_config.hctrl_mode = PCNT_MODE_REVERSE; // Reverse counting direction if high - } else { - // Ensure channel 1 is disabled for divisor=4 - pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal - pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control - pcnt_config.channel = PCNT_CHANNEL_1; - // What to do on the positive / negative edge of pulse input? - pcnt_config.pos_mode = PCNT_COUNT_DIS; // Disabled - pcnt_config.neg_mode = PCNT_COUNT_DIS; // Disabled - // What to do when control input is low or high? - pcnt_config.lctrl_mode = PCNT_MODE_DISABLE; // Disabled - pcnt_config.hctrl_mode = PCNT_MODE_DISABLE; // Disabled - } + pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal + pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control + pcnt_config.channel = PCNT_CHANNEL_1; + // What to do on the positive / negative edge of pulse input? + pcnt_config.pos_mode = PCNT_COUNT_DEC; // Count up on the positive edge + pcnt_config.neg_mode = PCNT_COUNT_INC; // Keep the counter value on the negative edge + // What to do when control input is low or high? + pcnt_config.lctrl_mode = PCNT_MODE_KEEP; // Keep the primary counter mode if low + pcnt_config.hctrl_mode = PCNT_MODE_REVERSE; // Reverse counting direction if high pcnt_unit_config(&pcnt_config); @@ -112,11 +98,7 @@ mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementa int16_t count; pcnt_get_counter_value(self->unit, &count); - if ((self->divisor == 4) || (self->divisor == 2)) { - return (count / 2) + self->position; - } else { - return (count) + self->position; - } + return (count / self->divisor) + self->position; } void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalencoder_obj_t *self, diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c index 12202a2649..7793e12837 100644 --- a/shared-bindings/rotaryio/IncrementalEncoder.c +++ b/shared-bindings/rotaryio/IncrementalEncoder.c @@ -77,8 +77,8 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, rotaryio_incrementalencoder_obj_t *self = m_new_obj(rotaryio_incrementalencoder_obj_t); self->base.type = &rotaryio_incrementalencoder_type; - common_hal_rotaryio_incrementalencoder_set_divisor(self, args[ARG_divisor].u_int); common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b); + common_hal_rotaryio_incrementalencoder_set_divisor(self, args[ARG_divisor].u_int); return MP_OBJ_FROM_PTR(self); } From 390a473dda497387eead6d6d1243d53b895ceb74 Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Fri, 1 Apr 2022 15:08:43 -0700 Subject: [PATCH 0059/2403] add board.DISPLAY since display already set up by CirPy --- ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c index 6f02c1123f..8bbb8a3992 100644 --- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c @@ -1,5 +1,7 @@ #include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + // Pin names from: // https://espressif-docs.readthedocs-hosted.com/projects/espressif-esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/user_guide.html#pin-layout @@ -44,5 +46,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, { 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_module_globals_table); From d20ae5ab24da2d45cb635e34599ca05afe420d90 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 1 Apr 2022 20:51:11 -0400 Subject: [PATCH 0060/2403] revert pins of click and typer --- .github/workflows/ports_windows.yml | 3 +-- requirements-dev.txt | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml index 9d97ffbf6a..bc5f837745 100644 --- a/.github/workflows/ports_windows.yml +++ b/.github/workflows/ports_windows.yml @@ -66,8 +66,7 @@ jobs: pip install wheel # requirements_dev.txt doesn't install on windows. (with msys2 python) # instead, pick a subset for what we want to do - # Undo the pin of typer & click when undoing it in requirements-dev.txt - pip install cascadetoml jinja2 typer==0.4.0 click==8.0.4 intelhex + pip install cascadetoml jinja2 typer click intelhex # check that installed packages work....? which python; python --version; python -c "import cascadetoml" which python3; python3 --version; python3 -c "import cascadetoml" diff --git a/requirements-dev.txt b/requirements-dev.txt index 67835dad3d..9c574567f7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,12 +4,10 @@ huffman # For nvm.toml cascadetoml jinja2 -# Undo this pin when click and typer are again compatible. -typer==0.4.0 +typer sh -# Undo this pin when click and typer are again compatible. -click==8.0.4 +click cpp-coveralls requests requests-cache From d9bf79d82635d29537cdc16147ed3f312e7b4338 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Sat, 2 Apr 2022 12:39:16 +0200 Subject: [PATCH 0061/2403] Fixed internal flash filesystem stub build issue Internal filesystem stubs is used when both INTERNAL_FLASH_FILESYSTEM, DISABLE_FILESYSTEM are set. --- supervisor/stub/filesystem.c | 5 +++++ supervisor/stub/internal_flash.c | 21 ++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/supervisor/stub/filesystem.c b/supervisor/stub/filesystem.c index 650f4d8346..77e9701065 100644 --- a/supervisor/stub/filesystem.c +++ b/supervisor/stub/filesystem.c @@ -31,6 +31,11 @@ void filesystem_background(void) { return; } +void filesystem_tick(void) +{ + return; +} + bool filesystem_init(bool create_allowed, bool force_create) { (void)create_allowed; (void)force_create; diff --git a/supervisor/stub/internal_flash.c b/supervisor/stub/internal_flash.c index 23e843c923..1501f4aeb6 100644 --- a/supervisor/stub/internal_flash.c +++ b/supervisor/stub/internal_flash.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "supervisor/internal_flash.h" +#include "supervisor/flash.h" #include #include @@ -46,21 +46,24 @@ uint32_t supervisor_flash_get_block_count(void) { return 0; } -void port_internal_flash_flush(void) { - return; -} - mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) { return 0; // success } -bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) { - return true; -} - mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) { return 0; // success } +#if (0) +void supervisor_flash_init_vfs(struct _fs_user_mount_t *vfs) +{ + return; +} +#endif + +void port_internal_flash_flush(void) { + return; +} + void supervisor_flash_release_cache(void) { } From 8162a5de4bcdc2989487196c61777f81e3303a02 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Sat, 2 Apr 2022 12:47:43 +0200 Subject: [PATCH 0062/2403] Fixed code style formatting according to pre-commit rules. --- supervisor/stub/filesystem.c | 3 +-- supervisor/stub/internal_flash.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/supervisor/stub/filesystem.c b/supervisor/stub/filesystem.c index 77e9701065..920a7571f2 100644 --- a/supervisor/stub/filesystem.c +++ b/supervisor/stub/filesystem.c @@ -31,8 +31,7 @@ void filesystem_background(void) { return; } -void filesystem_tick(void) -{ +void filesystem_tick(void) { return; } diff --git a/supervisor/stub/internal_flash.c b/supervisor/stub/internal_flash.c index 1501f4aeb6..149c363c8b 100644 --- a/supervisor/stub/internal_flash.c +++ b/supervisor/stub/internal_flash.c @@ -55,8 +55,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num, } #if (0) -void supervisor_flash_init_vfs(struct _fs_user_mount_t *vfs) -{ +void supervisor_flash_init_vfs(struct _fs_user_mount_t *vfs) { return; } #endif From 161c992fa0944bc9fb3f1ff738959ab7e8302e16 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sat, 2 Apr 2022 09:19:30 -0500 Subject: [PATCH 0063/2403] Improve help text --- shared-bindings/zlib/__init__.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c index b75ef5e28f..65bec244e3 100644 --- a/shared-bindings/zlib/__init__.c +++ b/shared-bindings/zlib/__init__.c @@ -53,12 +53,20 @@ //| size used during compression (8-15, the dictionary size is power of 2 of //| that value). Additionally, if value is positive, *data* is assumed to be //| zlib stream (with zlib header). Otherwise, if it's negative, it's assumed -//| to be raw DEFLATE stream. *bufsize* parameter is for compatibility with -//| CPython and is ignored. +//| to be raw DEFLATE stream. //| -//| :param ~bytes data: data to be decompressed -//| :param ~int wbits: DEFLATE dictionary window size used during compression -//| :param ~int bufsize: ignored for compatibility with CPython only +//| The wbits parameter controls the size of the history buffer (or “window size”), and what header +//| and trailer format is expected. +//| +//| Common wbits values: +//| +//| * To decompress deflate format, use wbits = -15 +//| * To decompress zlib format, use wbits = 15 +//| * To decompress gzip format, use wbits = 31 +//| +//| :param bytes data: data to be decompressed +//| :param int wbits: DEFLATE dictionary window size used during compression. See above. +//| :param int bufsize: ignored for compatibility with CPython only //| """ //| ... //| From 7b586e077c61c14212ceac3ac106e733a873ff01 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sat, 2 Apr 2022 12:22:14 -0500 Subject: [PATCH 0064/2403] Removed from small boards --- ports/stm/boards/meowbit_v121/mpconfigboard.mk | 1 + ports/stm/boards/thunderpack_v11/mpconfigboard.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk index 15ae33c4c8..77b046ada7 100644 --- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk +++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk @@ -26,5 +26,6 @@ CIRCUITPY_BLEIO_HCI = 0 CIRCUITPY_GIFIO = 0 CIRCUITPY_ULAB = 0 CIRCUITPY_STAGE = 1 +CIRCUITPY_ZLIB = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/meowbit diff --git a/ports/stm/boards/thunderpack_v11/mpconfigboard.mk b/ports/stm/boards/thunderpack_v11/mpconfigboard.mk index 5b5c098e16..0aa8ce6746 100644 --- a/ports/stm/boards/thunderpack_v11/mpconfigboard.mk +++ b/ports/stm/boards/thunderpack_v11/mpconfigboard.mk @@ -21,3 +21,4 @@ CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_BLEIO_HCI = 0 CIRCUITPY_VECTORIO = 0 CIRCUITPY_ULAB = 0 +CIRCUITPY_ZLIB = 0 From 9d67e62f4d7cb754fbb17bedc90f24a2919502fe Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 3 Apr 2022 11:47:19 -0500 Subject: [PATCH 0065/2403] Removed from small board --- ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk index 7a060a168b..a3f9306c7d 100644 --- a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk +++ b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk @@ -13,3 +13,4 @@ EXTERNAL_FLASH_DEVICES = AT25DF081A CIRCUITPY_AUDIOIO = 0 CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_ZLIB = 0 From 683ece76db5d952a46631f3b953872f9a9c749c6 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 4 Apr 2022 09:16:27 -0500 Subject: [PATCH 0066/2403] MP3Decoder: Accurately inform when no more data Some audio implementations, notably samd, really don't like it when you return 0 samples of data. This was the case when reaching the end of an MP3 file. Now, we read forward in an MP3 file to the next sync word during "get_buffer", so that we can accurately return GET_BUFFER_DONE when the NEXT call WOULD HAVE resulted in 0 samples. Tested with @gamblor21's "laugh.mp3" file on a Trellis M4 Express. --- shared-module/audiomp3/MP3Decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index 2d45313814..d0aecc18bd 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -364,7 +364,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t * } self->samples_decoded += *buffer_length / sizeof(int16_t); - return GET_BUFFER_MORE_DATA; + return mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE; } void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output, From a43cfdd2747a94c815f585fa88769b6fdfdcbd1e Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 31 Mar 2022 10:57:34 +1100 Subject: [PATCH 0067/2403] py/vm: Prevent array bound warning when using -MP_OBJ_ITER_BUF_NSLOTS. This warning can happen on clang 13.0.1 building mpy-cross: ../py/vm.c:748:25: error: array index -3 refers past the last possible element for an array in 64-bit address space containing 64-bit (8-byte) elements (max possible 2305843009213693952 elements) [-Werror,-Warray-bounds] sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL; ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Using pointer access instead of array access works around this warning. Fixes issue #8467. Signed-off-by: Damien George --- py/vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/py/vm.c b/py/vm.c index 9ad67bb2e0..efda4f9aa3 100644 --- a/py/vm.c +++ b/py/vm.c @@ -821,8 +821,8 @@ unwind_jump:; obj = mp_getiter(obj, iter_buf); if (obj != MP_OBJ_FROM_PTR(iter_buf)) { // Iterator didn't use the stack so indicate that with MP_OBJ_NULL. - sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL; - sp[-MP_OBJ_ITER_BUF_NSLOTS + 2] = obj; + *(sp - MP_OBJ_ITER_BUF_NSLOTS + 1) = MP_OBJ_NULL; + *(sp - MP_OBJ_ITER_BUF_NSLOTS + 2) = obj; } DISPATCH(); } @@ -833,8 +833,8 @@ unwind_jump:; DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward code_state->sp = sp; mp_obj_t obj; - if (sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] == MP_OBJ_NULL) { - obj = sp[-MP_OBJ_ITER_BUF_NSLOTS + 2]; + if (*(sp - MP_OBJ_ITER_BUF_NSLOTS + 1) == MP_OBJ_NULL) { + obj = *(sp - MP_OBJ_ITER_BUF_NSLOTS + 2); } else { obj = MP_OBJ_FROM_PTR(&sp[-MP_OBJ_ITER_BUF_NSLOTS + 1]); } From fa4b4fa639a9fe315be8dd0534958d9274347cdb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 4 Apr 2022 10:07:14 -0500 Subject: [PATCH 0068/2403] nrf: Correctly mark PWM unused during reset --- ports/nrf/common-hal/pwmio/PWMOut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nrf/common-hal/pwmio/PWMOut.c index 76c8c4e6d4..27c0b79b5a 100644 --- a/ports/nrf/common-hal/pwmio/PWMOut.c +++ b/ports/nrf/common-hal/pwmio/PWMOut.c @@ -108,6 +108,7 @@ STATIC void reset_single_pwmout(uint8_t i) { for (int ch = 0; ch < CHANNELS_PER_PWM; ch++) { pwm_seq[i][ch] = (1 << 15); // polarity = 0 + pwm->PSEL.OUT[ch] = 0xFFFFFFFF; // disconnnect from I/O } } From f7fd1683961359f43c6b689d975248797383f0f6 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Mon, 4 Apr 2022 21:47:05 +0200 Subject: [PATCH 0069/2403] Incorporated feedback from PR. --- supervisor/stub/internal_flash.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/supervisor/stub/internal_flash.c b/supervisor/stub/internal_flash.c index 149c363c8b..3bb71493fd 100644 --- a/supervisor/stub/internal_flash.c +++ b/supervisor/stub/internal_flash.c @@ -55,14 +55,20 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num, } #if (0) +// See definition in supervisor/flash.c void supervisor_flash_init_vfs(struct _fs_user_mount_t *vfs) { return; } + +// See definition in supervisor/flash.c +void supervisor_flash_flush(void) { + return; +} #endif +void supervisor_flash_release_cache(void) { +} + void port_internal_flash_flush(void) { return; } - -void supervisor_flash_release_cache(void) { -} From b29b7bfe32224b37637f02702dba818292b69884 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 4 Apr 2022 20:34:49 -0400 Subject: [PATCH 0070/2403] Free ringbuf buffer by relying on gc, not gc_free() --- py/ringbuf.c | 7 ++----- py/ringbuf.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/py/ringbuf.c b/py/ringbuf.c index 72e164946a..fe47b50068 100644 --- a/py/ringbuf.c +++ b/py/ringbuf.c @@ -28,7 +28,6 @@ #include "ringbuf.h" bool ringbuf_init(ringbuf_t *r, uint8_t *buf, size_t capacity) { - r->heap = false; r->buf = buf; r->size = capacity; r->iget = r->iput = 0; @@ -40,7 +39,6 @@ bool ringbuf_init(ringbuf_t *r, uint8_t *buf, size_t capacity) { // size of the buffer is one greater than that, due to how the buffer // handles empty and full statuses. bool ringbuf_alloc(ringbuf_t *r, size_t capacity, bool long_lived) { - r->heap = true; r->buf = gc_alloc(capacity + 1, false, long_lived); r->size = capacity + 1; r->iget = r->iput = 0; @@ -48,9 +46,8 @@ bool ringbuf_alloc(ringbuf_t *r, size_t capacity, bool long_lived) { } void ringbuf_free(ringbuf_t *r) { - if (r->heap) { - gc_free(r->buf); - } + // Free buf by letting gc take care of it. If the VM has finished already, + // this will be safe. r->buf = (uint8_t *)NULL; r->size = 0; ringbuf_clear(r); diff --git a/py/ringbuf.h b/py/ringbuf.h index 8f7e7b1760..d868eff1e4 100644 --- a/py/ringbuf.h +++ b/py/ringbuf.h @@ -37,7 +37,6 @@ typedef struct _ringbuf_t { uint32_t size; uint32_t iget; uint32_t iput; - bool heap; } ringbuf_t; // Note that the capacity of the buffer is N-1! From 4b0f80f08122cf62ae7028610a6550b089d24028 Mon Sep 17 00:00:00 2001 From: Reece Robinson Date: Tue, 5 Apr 2022 13:54:07 +1200 Subject: [PATCH 0071/2403] Enable support for extended HID usage page and usage. Related to Support HID Usage Pages and Usages >255 #5529 --- mpy-cross/mpy-cross.mk | 2 ++ shared-bindings/usb_hid/Device.c | 8 ++++---- shared-bindings/usb_hid/Device.h | 6 +++--- shared-module/usb_hid/Device.c | 6 +++--- shared-module/usb_hid/Device.h | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 642fe9b5aa..c7bd91ad19 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -29,6 +29,8 @@ INC += -I$(BUILD) # compiler settings CWARN = -Wall -Werror CWARN += -Wpointer-arith -Wuninitialized +# Disable errors for array-bounds warnings on "sp[-MP_OBJ_ITER_BUF_NSLOTS + 2]" access +CWARN += -Wno-array-bounds CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 286623b0c3..50f67e90cb 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -103,12 +103,12 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args 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; - mp_arg_validate_int_range(usage_page_arg, 1, 255, MP_QSTR_usage_page); - const uint8_t usage_page = usage_page_arg; + mp_arg_validate_int_range(usage_page_arg, 1, 0xFFFF, MP_QSTR_usage_page); + const uint16_t usage_page = usage_page_arg; const mp_int_t usage_arg = args[ARG_usage].u_int; - mp_arg_validate_int_range(usage_arg, 1, 255, MP_QSTR_usage_page); - const uint8_t usage = usage_arg; + mp_arg_validate_int_range(usage_arg, 1, 0xFFFF, MP_QSTR_usage_page); + const uint16_t usage = usage_arg; mp_obj_t report_ids = args[ARG_report_ids].u_obj; mp_obj_t in_report_lengths = args[ARG_in_report_lengths].u_obj; diff --git a/shared-bindings/usb_hid/Device.h b/shared-bindings/usb_hid/Device.h index a5e94c4d52..dde66e2700 100644 --- a/shared-bindings/usb_hid/Device.h +++ b/shared-bindings/usb_hid/Device.h @@ -33,11 +33,11 @@ extern const mp_obj_type_t usb_hid_device_type; -void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t report_descriptor, uint8_t usage_page, uint8_t usage, size_t report_ids_count,uint8_t *report_ids, uint8_t *in_report_lengths, uint8_t *out_report_lengths); +void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t report_descriptor, uint16_t usage_page, uint16_t usage, size_t report_ids_count,uint8_t *report_ids, uint8_t *in_report_lengths, uint8_t *out_report_lengths); void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t *report, uint8_t len, uint8_t report_id); mp_obj_t common_hal_usb_hid_device_get_last_received_report(usb_hid_device_obj_t *self, uint8_t report_id); -uint8_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self); -uint8_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self); +uint16_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self); +uint16_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self); uint8_t common_hal_usb_hid_device_validate_report_id(usb_hid_device_obj_t *self, mp_int_t report_id); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c index de34d60d0a..8a0c429f84 100644 --- a/shared-module/usb_hid/Device.c +++ b/shared-module/usb_hid/Device.c @@ -186,7 +186,7 @@ uint8_t common_hal_usb_hid_device_validate_report_id(usb_hid_device_obj_t *self, return (uint8_t)report_id_arg; } -void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t report_descriptor, uint8_t usage_page, uint8_t usage, size_t num_report_ids, uint8_t *report_ids, uint8_t *in_report_lengths, uint8_t *out_report_lengths) { +void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t report_descriptor, uint16_t usage_page, uint16_t usage, size_t num_report_ids, uint8_t *report_ids, uint8_t *in_report_lengths, uint8_t *out_report_lengths) { if (num_report_ids > CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR) { mp_raise_ValueError_varg(translate("More than %d report ids not supported"), CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR); @@ -211,11 +211,11 @@ void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t re memcpy(self->out_report_lengths, out_report_lengths, num_report_ids); } -uint8_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self) { +uint16_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self) { return self->usage_page; } -uint8_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self) { +uint16_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self) { return self->usage; } diff --git a/shared-module/usb_hid/Device.h b/shared-module/usb_hid/Device.h index 5a09d19526..f265712be4 100644 --- a/shared-module/usb_hid/Device.h +++ b/shared-module/usb_hid/Device.h @@ -42,8 +42,8 @@ typedef struct { uint8_t report_ids[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR]; uint8_t in_report_lengths[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR]; uint8_t out_report_lengths[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR]; - uint8_t usage_page; - uint8_t usage; + uint16_t usage_page; + uint16_t usage; uint8_t num_report_ids; } usb_hid_device_obj_t; From 70add5277505cbd388729ba2ae8a055ebd21f717 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 4 Apr 2022 22:11:58 -0400 Subject: [PATCH 0072/2403] advance espressif CI cache key --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b95926871..6df3935555 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,7 +400,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210923 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From 0da10d802ced72486cd0b5098564133c955499cf Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 4 Apr 2022 22:36:58 -0400 Subject: [PATCH 0073/2403] advance espressif CI cache id --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b95926871..6df3935555 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,7 +400,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210923 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From 4cccc1a0364e9599729fd77f8df0766b4a581952 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 4 Apr 2022 23:39:00 -0400 Subject: [PATCH 0074/2403] handle clearing both RXIC and RTIC interrupts --- ports/raspberrypi/common-hal/busio/UART.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c index 0e25c57297..9fd5ad3168 100644 --- a/ports/raspberrypi/common-hal/busio/UART.c +++ b/ports/raspberrypi/common-hal/busio/UART.c @@ -85,7 +85,7 @@ static void shared_callback(busio_uart_obj_t *self) { _copy_into_ringbuf(&self->ringbuf, self->uart); // We always clear the interrupt so it doesn't continue to fire because we // may not have read everything available. - uart_get_hw(self->uart)->icr = UART_UARTICR_RXIC_BITS; + uart_get_hw(self->uart)->icr = UART_UARTICR_RXIC_BITS | UART_UARTICR_RTIC_BITS; } static void uart0_callback(void) { From 259e56062f30fccbeae525cfe26a835def353bd9 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 5 Apr 2022 09:10:25 -0400 Subject: [PATCH 0075/2403] Update mpy-cross/mpy-cross.mk --- mpy-cross/mpy-cross.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index c7bd91ad19..642fe9b5aa 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -29,8 +29,6 @@ INC += -I$(BUILD) # compiler settings CWARN = -Wall -Werror CWARN += -Wpointer-arith -Wuninitialized -# Disable errors for array-bounds warnings on "sp[-MP_OBJ_ITER_BUF_NSLOTS + 2]" access -CWARN += -Wno-array-bounds CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables From c3539f0948f5c7e7a8a75378f1923cd4b08e8eee Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 5 Apr 2022 09:12:02 -0400 Subject: [PATCH 0076/2403] bump espressif CI cache id --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90ebde9062..6f260117ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,7 +400,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210923 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From d24f3b812d518301f2d4fc5593ca938fc8d15e9c Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 5 Apr 2022 09:07:35 -0500 Subject: [PATCH 0077/2403] Document TileGrid limitation to tile values 0..255 Closes #6149 --- shared-bindings/displayio/TileGrid.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 4cecd0f0f1..2b2526cd84 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -53,6 +53,8 @@ //| convert the value and its location to a display native pixel color. This may be a simple color //| palette lookup, a gradient, a pattern or a color transformer. //| +//| To save RAM usage, tile values are only allowed in the range from 0 to 255 inclusive (single byte values). +//| //| tile_width and tile_height match the height of the bitmap by default. //| //| :param Bitmap,OnDiskBitmap,Shape bitmap: The bitmap storing one or more tiles. From c89af99f5942d3583f6c70d0be921519b9fd5e97 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 5 Apr 2022 09:17:55 -0500 Subject: [PATCH 0078/2403] Advise about ways to improve mp3 playback Closes: #6133 --- shared-bindings/audiomp3/MP3Decoder.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index 4761feacd8..a59d316072 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -44,6 +44,20 @@ //| :param typing.BinaryIO file: Already opened mp3 file //| :param ~circuitpython_typing.WriteableBuffer buffer: Optional pre-allocated buffer, that will be split in half and used for double-buffering of the data. If not provided, two buffers are allocated internally. The specific buffer size required depends on the mp3 file. //| +//| Playback of mp3 audio is CPU intensive, and the +//| exact limit depends on many factors such as the particular +//| microcontroller, SD card or flash performance, and other +//| code in use such as displayio. If playback is garbled, +//| skips, or plays as static, first try using a "simpler" mp3: +//| +//| * Use constant bit rate (CBR) not VBR or ABR (variable or average bit rate) when encoding your mp3 file +//| * Use a lower sample rate (e.g., 11.025kHz instead of 48kHz) +//| * Use a lower bit rate (e.g., 32kbit/s instead of 256kbit/s) +//| +//| Reduce activity taking place at the same time as +//| mp3 playback. For instance, only update small portions of a +//| displayio screen if audio is playing. Disable auto-refresh +//| and explicitly call refresh. //| //| Playing a mp3 file from flash:: //| From b993313ac16b02e83b17e3434f1b5d36bdd92296 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Apr 2022 11:30:12 -0500 Subject: [PATCH 0079/2403] Don't reset GPIO4 (used for voltage monitoring) --- ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c index 18dd280cea..3eee2f119b 100644 --- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c +++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c @@ -188,6 +188,10 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) { gpio_config(&cfg); return true; } + // Pin 4 is used for voltage monitoring, so don't reset + if (pin_number == 4) { + return true; + } return false; } From 203dad11bfc771bb9803dd452d62991147b4cd5b Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 5 Apr 2022 09:48:29 -0500 Subject: [PATCH 0080/2403] keypad: scan immediately on construct, .reset() --- shared-module/keypad/KeyMatrix.c | 11 ++++++++--- shared-module/keypad/Keys.c | 10 ++++++++-- shared-module/keypad/ShiftRegisterKeys.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c index 49b87fc882..aa5e6378db 100644 --- a/shared-module/keypad/KeyMatrix.c +++ b/shared-module/keypad/KeyMatrix.c @@ -37,6 +37,8 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" +static void keypad_keymatrix_scan_now(keypad_keymatrix_obj_t *self, uint64_t now); + 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; } @@ -74,10 +76,10 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint 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); + keypad_keymatrix_scan_now(self, port_get_raw_ticks(NULL)); } void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) { @@ -132,10 +134,9 @@ mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) { 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); + keypad_keymatrix_scan_now(self, port_get_raw_ticks(NULL)); } void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) { @@ -145,6 +146,10 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) { return; } + keypad_keymatrix_scan_now(self, now); +} + +static void keypad_keymatrix_scan_now(keypad_keymatrix_obj_t *self, uint64_t now) { self->last_scan_ticks = now; mp_obj_t timestamp = supervisor_ticks_ms(); diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c index ce402e4dce..01ba275cc0 100644 --- a/shared-module/keypad/Keys.c +++ b/shared-module/keypad/Keys.c @@ -36,6 +36,8 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" +static void keypad_keys_scan_now(keypad_keys_obj_t *self, uint64_t now); + void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const 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]; @@ -64,6 +66,7 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin // Add self to the list of active keypad scanners. keypad_register_scanner((keypad_scanner_obj_t *)self); + keypad_keys_scan_now(self, port_get_raw_ticks(NULL)); } void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) { @@ -96,10 +99,9 @@ mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) { 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); + keypad_keys_scan_now(self, port_get_raw_ticks(NULL)); } void keypad_keys_scan(keypad_keys_obj_t *self) { @@ -109,6 +111,10 @@ void keypad_keys_scan(keypad_keys_obj_t *self) { return; } + keypad_keys_scan_now(self, now); +} + +static void keypad_keys_scan_now(keypad_keys_obj_t *self, uint64_t now) { self->last_scan_ticks = now; const size_t key_count = common_hal_keypad_keys_get_key_count(self); diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c index d185c6fca4..da9e09d7d8 100644 --- a/shared-module/keypad/ShiftRegisterKeys.c +++ b/shared-module/keypad/ShiftRegisterKeys.c @@ -36,6 +36,8 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" +static void keypad_shiftregisterkeys_scan_now(keypad_shiftregisterkeys_obj_t *self, uint64_t now); + void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, const mcu_pin_obj_t *data_pin, const 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); @@ -63,7 +65,6 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_ 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); keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t); events->base.type = &keypad_eventqueue_type; @@ -72,6 +73,7 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_ // Add self to the list of active keypad scanners. keypad_register_scanner((keypad_scanner_obj_t *)self); + keypad_shiftregisterkeys_scan_now(self, port_get_raw_ticks(NULL)); } void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self) { @@ -108,10 +110,9 @@ mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys 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); + keypad_shiftregisterkeys_scan_now(self, port_get_raw_ticks(NULL)); } void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) { @@ -121,6 +122,10 @@ void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) { return; } + keypad_shiftregisterkeys_scan_now(self, now); +} + +static void keypad_shiftregisterkeys_scan_now(keypad_shiftregisterkeys_obj_t *self, uint64_t now) { self->last_scan_ticks = now; mp_obj_t timestamp = supervisor_ticks_ms(); From d7c86c0e3e1df7964af9f999c3a6d9d374ba4998 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 5 Apr 2022 11:08:44 -0500 Subject: [PATCH 0081/2403] refactor keypad to share more code This saves 444 bytes on the pygamer build (both commits taken together) testing performed: * pygamer (samd51) with ShiftRegisterKeys * macropad (rp2040) with Keys * UM feather s2 (esp32-s2) with KeyMatrix Result: * all ports still worked nicely * keys held down at start always registered (>2 trials all boards, >100 trials esp32-s2) * keys held down are immediately registered after reset() (>100 trials esp32-s2) * double .reset() is OK, accessing .events throws (only tested esp32-s2) --- locale/circuitpython.pot | 59 +---------------- shared-bindings/keypad/KeyMatrix.c | 47 ++------------ shared-bindings/keypad/KeyMatrix.h | 5 -- shared-bindings/keypad/Keys.c | 49 ++------------ shared-bindings/keypad/Keys.h | 5 -- shared-bindings/keypad/ShiftRegisterKeys.c | 49 ++------------ shared-bindings/keypad/ShiftRegisterKeys.h | 5 -- shared-bindings/keypad/__init__.c | 47 ++++++++++++++ shared-bindings/keypad/__init__.h | 13 ++-- shared-module/keypad/EventQueue.h | 2 +- shared-module/keypad/KeyMatrix.c | 60 +++++------------- shared-module/keypad/KeyMatrix.h | 9 +-- shared-module/keypad/Keys.c | 63 +++++------------- shared-module/keypad/Keys.h | 9 +-- shared-module/keypad/ShiftRegisterKeys.c | 64 ++++++------------- shared-module/keypad/ShiftRegisterKeys.h | 9 +-- shared-module/keypad/__init__.c | 74 +++++++++++++++++++--- shared-module/keypad/__init__.h | 23 ++++++- 18 files changed, 212 insertions(+), 380 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 0ce564f1f7..83d96811cf 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -4067,63 +4067,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c index 486fa0b9b5..87836ac174 100644 --- a/shared-bindings/keypad/KeyMatrix.c +++ b/shared-bindings/keypad/KeyMatrix.c @@ -28,6 +28,7 @@ #include "py/binary.h" #include "py/objproperty.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/microcontroller/Pin.h" @@ -138,7 +139,7 @@ STATIC mp_obj_t keypad_keymatrix___exit__(size_t n_args, const mp_obj_t *args) { 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)) { + if (common_hal_keypad_deinited(self)) { raise_deinited_error(); } } @@ -150,33 +151,11 @@ 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; -} -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) //| """ //| -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); - -const mp_obj_property_t keypad_keymatrix_key_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_keymatrix_get_key_count_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; //| def key_number_to_row_column(self, row: int, column: int) -> Tuple[int]: //| """Return the row and column for the given key number. @@ -194,7 +173,7 @@ STATIC mp_obj_t keypad_keymatrix_key_number_to_row_column(mp_obj_t self_in, mp_o 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), + 0, (mp_int_t)common_hal_keypad_generic_get_key_count(self), MP_QSTR_key_number); mp_uint_t row; @@ -234,29 +213,15 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_ //| """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); - 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); - -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_events), MP_ROM_PTR(&keypad_keymatrix_events_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_events), MP_ROM_PTR(&keypad_generic_events_obj) }, + { MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) }, + { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_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) }, }; diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h index 29a94fbf66..bdf77dd32a 100644 --- a/shared-bindings/keypad/KeyMatrix.h +++ b/shared-bindings/keypad/KeyMatrix.h @@ -35,16 +35,11 @@ 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, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const 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); 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); -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); -void common_hal_keypad_keymatrix_reset(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 2da55bccba..6ac705eba6 100644 --- a/shared-bindings/keypad/Keys.c +++ b/shared-bindings/keypad/Keys.c @@ -28,6 +28,7 @@ #include "py/binary.h" #include "py/objproperty.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/microcontroller/Pin.h" @@ -129,11 +130,6 @@ STATIC mp_obj_t keypad_keys___exit__(size_t n_args, const mp_obj_t *args) { } 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 reset(self) -> None: //| """Reset the internal state of the scanner to assume that all keys are now released. @@ -142,61 +138,24 @@ 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; -} -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) //| """ //| -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); - -const mp_obj_property_t keypad_keys_key_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_keys_get_key_count_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; //| 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); - 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); - -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_key_count), MP_ROM_PTR(&keypad_keys_key_count_obj) }, - { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_keys_reset_obj) }, + { MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) }, + { MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) }, + { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_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 89da18189a..eb833b97d6 100644 --- a/shared-bindings/keypad/Keys.h +++ b/shared-bindings/keypad/Keys.h @@ -35,10 +35,5 @@ 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, const 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); - -mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self); -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); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c index 0032a45438..14ab87436b 100644 --- a/shared-bindings/keypad/ShiftRegisterKeys.c +++ b/shared-bindings/keypad/ShiftRegisterKeys.c @@ -28,6 +28,7 @@ #include "py/binary.h" #include "py/objproperty.h" #include "py/runtime.h" +#include "shared-bindings/keypad/__init__.h" #include "shared-bindings/keypad/Event.h" #include "shared-bindings/keypad/ShiftRegisterKeys.h" #include "shared-bindings/microcontroller/Pin.h" @@ -133,12 +134,6 @@ STATIC mp_obj_t keypad_shiftregisterkeys___exit__(size_t n_args, const mp_obj_t } 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(); - } -} - //| 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 @@ -146,61 +141,25 @@ 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; -} -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) //| """ //| -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); - -const mp_obj_property_t keypad_shiftregisterkeys_key_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_key_count_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; //| 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); - 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); - -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_key_count), MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) }, - { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_shiftregisterkeys_reset_obj) }, + { MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) }, + { MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) }, + { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_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 62ab14d340..bc91c78ab0 100644 --- a/shared-bindings/keypad/ShiftRegisterKeys.h +++ b/shared-bindings/keypad/ShiftRegisterKeys.h @@ -35,10 +35,5 @@ extern const mp_obj_type_t keypad_shiftregisterkeys_type; void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, const mcu_pin_obj_t *data_pin, const 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); -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); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c index 4450e892ca..97db750af7 100644 --- a/shared-bindings/keypad/__init__.c +++ b/shared-bindings/keypad/__init__.c @@ -32,6 +32,53 @@ #include "shared-bindings/keypad/KeyMatrix.h" #include "shared-bindings/keypad/Keys.h" #include "shared-bindings/keypad/ShiftRegisterKeys.h" +#include "shared-bindings/util.h" + +STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) { + if (common_hal_keypad_deinited(self)) { + raise_deinited_error(); + } +} + +STATIC mp_obj_t keypad_generic_reset(mp_obj_t self_in) { + keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); + check_for_deinit(self); + + common_hal_keypad_generic_reset(self); + return MP_ROM_NONE; +} +MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_reset_obj, keypad_generic_reset); + +STATIC mp_obj_t keypad_generic_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_generic_get_key_count(self)); +} +MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_get_key_count_obj, keypad_generic_get_key_count); + +const mp_obj_property_t keypad_generic_key_count_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&keypad_generic_get_key_count_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; + +STATIC mp_obj_t keypad_generic_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_generic_get_events(self); +} +MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_get_events_obj, keypad_generic_get_events); + +const mp_obj_property_t keypad_generic_events_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&keypad_generic_get_events_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; + //| """Support for scanning keys and key matrices //| diff --git a/shared-bindings/keypad/__init__.h b/shared-bindings/keypad/__init__.h index 5e484dc5ed..eb3b16aa4b 100644 --- a/shared-bindings/keypad/__init__.h +++ b/shared-bindings/keypad/__init__.h @@ -28,14 +28,17 @@ #define SHARED_BINDINGS_KEYPAD_H #include "py/obj.h" -#include "py/objtuple.h" +#include "py/objproperty.h" #include "shared-module/keypad/__init__.h" -extern mp_obj_tuple_t common_hal_keypad_devices; +bool common_hal_keypad_deinited(void *self); +void common_hal_keypad_generic_reset(void *self); +size_t common_hal_keypad_generic_get_key_count(void *self); +mp_obj_t common_hal_keypad_generic_get_events(void *self); -void keypad_set_devices(mp_obj_t devices); +MP_DECLARE_CONST_FUN_OBJ_1(keypad_generic_reset_obj); -bool common_hal_keypad_disable(void); -bool common_hal_keypad_enable(const mp_obj_t devices_seq); +extern const mp_obj_property_t keypad_generic_events_obj; +extern const mp_obj_property_t keypad_generic_key_count_obj; #endif // SHARED_BINDINGS_KEYPAD_H diff --git a/shared-module/keypad/EventQueue.h b/shared-module/keypad/EventQueue.h index f686d45960..b523b16cac 100644 --- a/shared-module/keypad/EventQueue.h +++ b/shared-module/keypad/EventQueue.h @@ -30,7 +30,7 @@ #include "py/obj.h" #include "py/ringbuf.h" -typedef struct { +typedef struct _keypad_eventqueue_obj_t { mp_obj_base_t base; ringbuf_t encoded_events; bool overflowed; diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c index aa5e6378db..b2520521cc 100644 --- a/shared-module/keypad/KeyMatrix.c +++ b/shared-module/keypad/KeyMatrix.c @@ -37,7 +37,13 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" -static void keypad_keymatrix_scan_now(keypad_keymatrix_obj_t *self, uint64_t now); +static void keymatrix_scan_now(void *self_in, mp_obj_t timestamp); +static size_t keymatrix_get_key_count(void *self_in); + +static keypad_scanner_funcs_t keymatrix_funcs = { + .scan_now = keymatrix_scan_now, + .get_key_count = keymatrix_get_key_count, +}; 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; @@ -69,21 +75,13 @@ 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_column_pins, false, false); self->columns_to_anodes = columns_to_anodes; + self->funcs = &keymatrix_funcs; - 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; - - self->interval_ticks = (mp_uint_t)(interval * 1024); // interval * 1000 * (1024/1000) - - // Add self to the list of active keypad scanners. - keypad_register_scanner((keypad_scanner_obj_t *)self); - keypad_keymatrix_scan_now(self, port_get_raw_ticks(NULL)); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); } void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) { - if (common_hal_keypad_keymatrix_deinited(self)) { + if (common_hal_keypad_deinited(self)) { return; } @@ -99,14 +97,7 @@ void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) { common_hal_digitalio_digitalinout_deinit(self->column_digitalinouts->items[column]); } 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_key_count(keypad_keymatrix_obj_t *self) { - return common_hal_keypad_keymatrix_get_row_count(self) * common_hal_keypad_keymatrix_get_column_count(self); + common_hal_keypad_deinit_core(self); } size_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self) { @@ -127,32 +118,13 @@ void common_hal_keypad_keymatrix_key_number_to_row_column(keypad_keymatrix_obj_t *column = key_number % num_columns; } -mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) { - return MP_OBJ_FROM_PTR(self->events); +static size_t keymatrix_get_key_count(void *self_in) { + keypad_keymatrix_obj_t *self = self_in; + return common_hal_keypad_keymatrix_get_column_count(self) * common_hal_keypad_keymatrix_get_row_count(self); } -void common_hal_keypad_keymatrix_reset(keypad_keymatrix_obj_t *self) { - 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); - keypad_keymatrix_scan_now(self, port_get_raw_ticks(NULL)); -} - -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) { - // Too soon. Wait longer to debounce. - return; - } - - keypad_keymatrix_scan_now(self, now); -} - -static void keypad_keymatrix_scan_now(keypad_keymatrix_obj_t *self, uint64_t now) { - self->last_scan_ticks = now; - - mp_obj_t timestamp = supervisor_ticks_ms(); +static void keymatrix_scan_now(void *self_in, mp_obj_t timestamp) { + keypad_keymatrix_obj_t *self = self_in; // On entry, all pins are set to inputs with a pull-up or pull-down, // depending on the diode orientation. diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h index bd7e2d23e2..8049fcbb90 100644 --- a/shared-module/keypad/KeyMatrix.h +++ b/shared-module/keypad/KeyMatrix.h @@ -35,16 +35,9 @@ #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; + KEYPAD_SCANNER_COMMON_FIELDS; mp_obj_tuple_t *row_digitalinouts; mp_obj_tuple_t *column_digitalinouts; - mp_uint_t interval_ticks; - uint64_t last_scan_ticks; - bool *previously_pressed; - bool *currently_pressed; - keypad_eventqueue_obj_t *events; bool columns_to_anodes; } keypad_keymatrix_obj_t; diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c index 01ba275cc0..d74a3ab859 100644 --- a/shared-module/keypad/Keys.c +++ b/shared-module/keypad/Keys.c @@ -36,7 +36,13 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" -static void keypad_keys_scan_now(keypad_keys_obj_t *self, uint64_t now); +static void keypad_keys_scan_now(void *self_in, mp_obj_t timestamp); +static size_t keys_get_key_count(void *self_in); + +static keypad_scanner_funcs_t keys_funcs = { + .scan_now = keypad_keys_scan_now, + .get_key_count = keys_get_key_count, +}; void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const 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]; @@ -55,71 +61,36 @@ 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->funcs = &keys_funcs; - self->interval_ticks = (mp_uint_t)(interval * 1024); // interval * 1000 * (1024/1000) - self->last_scan_ticks = port_get_raw_ticks(NULL); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); - 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); - keypad_keys_scan_now(self, port_get_raw_ticks(NULL)); } void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) { - if (common_hal_keypad_keys_deinited(self)) { + if (common_hal_keypad_deinited(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_get_key_count(self); key++) { + for (size_t key = 0; key < keys_get_key_count(self); key++) { common_hal_digitalio_digitalinout_deinit(self->digitalinouts->items[key]); } self->digitalinouts = MP_ROM_NONE; + common_hal_keypad_deinit_core(self); } -bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) { - return self->digitalinouts == MP_ROM_NONE; -} - -size_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self) { +size_t keys_get_key_count(void *self_in) { + keypad_keys_obj_t *self = self_in; return self->digitalinouts->len; } -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); - - memset(self->previously_pressed, false, key_count); - memset(self->currently_pressed, false, key_count); - keypad_keys_scan_now(self, port_get_raw_ticks(NULL)); -} - -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) { - // Too soon. Wait longer to debounce. - return; - } - - keypad_keys_scan_now(self, now); -} - -static void keypad_keys_scan_now(keypad_keys_obj_t *self, uint64_t now) { - self->last_scan_ticks = now; - - const size_t key_count = common_hal_keypad_keys_get_key_count(self); - - mp_obj_t timestamp = supervisor_ticks_ms(); +static void keypad_keys_scan_now(void *self_in, mp_obj_t timestamp) { + keypad_keys_obj_t *self = self_in; + size_t key_count = keys_get_key_count(self); for (mp_uint_t key_number = 0; key_number < key_count; key_number++) { // Remember the previous up/down state. diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h index 3edae32439..6bd7d7ac31 100644 --- a/shared-module/keypad/Keys.h +++ b/shared-module/keypad/Keys.h @@ -35,15 +35,8 @@ #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; + KEYPAD_SCANNER_COMMON_FIELDS; mp_obj_tuple_t *digitalinouts; - mp_uint_t interval_ticks; - uint64_t last_scan_ticks; - bool *previously_pressed; - bool *currently_pressed; - keypad_eventqueue_obj_t *events; bool value_when_pressed; } keypad_keys_obj_t; diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c index da9e09d7d8..b2b10c65a2 100644 --- a/shared-module/keypad/ShiftRegisterKeys.c +++ b/shared-module/keypad/ShiftRegisterKeys.c @@ -36,7 +36,13 @@ #include "supervisor/port.h" #include "supervisor/shared/tick.h" -static void keypad_shiftregisterkeys_scan_now(keypad_shiftregisterkeys_obj_t *self, uint64_t now); +static void shiftregisterkeys_scan_now(void *self, mp_obj_t timestamp); +static size_t shiftregisterkeys_get_key_count(void *self); + +static keypad_scanner_funcs_t shiftregisterkeys_funcs = { + .scan_now = shiftregisterkeys_scan_now, + .get_key_count = shiftregisterkeys_get_key_count, +}; void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, const mcu_pin_obj_t *data_pin, const 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) { @@ -54,30 +60,21 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_ 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->value_to_latch = value_to_latch; - 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->key_count = key_count; + self->funcs = &shiftregisterkeys_funcs; - self->interval_ticks = (mp_uint_t)(interval * 1024); // interval * 1000 * (1024/1000) - - 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); - keypad_shiftregisterkeys_scan_now(self, port_get_raw_ticks(NULL)); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); } void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self) { - if (common_hal_keypad_shiftregisterkeys_deinited(self)) { + if (common_hal_keypad_deinited(self)) { return; } @@ -93,47 +90,22 @@ void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t * common_hal_digitalio_digitalinout_deinit(self->latch); self->latch = MP_ROM_NONE; + + common_hal_keypad_deinit_core(self); } -bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self) { - return self->clock == MP_ROM_NONE; -} - -size_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self) { +size_t shiftregisterkeys_get_key_count(void *self_in) { + keypad_shiftregisterkeys_obj_t *self = self_in; return self->key_count; } -mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self) { - 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); - - memset(self->previously_pressed, false, key_count); - memset(self->currently_pressed, false, key_count); - keypad_shiftregisterkeys_scan_now(self, port_get_raw_ticks(NULL)); -} - -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) { - // Too soon. Wait longer to debounce. - return; - } - - keypad_shiftregisterkeys_scan_now(self, now); -} - -static void keypad_shiftregisterkeys_scan_now(keypad_shiftregisterkeys_obj_t *self, uint64_t now) { - self->last_scan_ticks = now; - - mp_obj_t timestamp = supervisor_ticks_ms(); +static void shiftregisterkeys_scan_now(void *self_in, mp_obj_t timestamp) { + keypad_shiftregisterkeys_obj_t *self = self_in; // Latch (freeze) the current state of the input pins. common_hal_digitalio_digitalinout_set_value(self->latch, self->value_to_latch); - const size_t key_count = common_hal_keypad_shiftregisterkeys_get_key_count(self); + const size_t key_count = 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. diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h index b04c622679..84c66ef627 100644 --- a/shared-module/keypad/ShiftRegisterKeys.h +++ b/shared-module/keypad/ShiftRegisterKeys.h @@ -35,18 +35,11 @@ #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; + KEYPAD_SCANNER_COMMON_FIELDS; digitalio_digitalinout_obj_t *clock; digitalio_digitalinout_obj_t *data; digitalio_digitalinout_obj_t *latch; size_t key_count; - mp_uint_t interval_ticks; - uint64_t last_scan_ticks; - bool *previously_pressed; - bool *currently_pressed; - keypad_eventqueue_obj_t *events; bool value_when_pressed; bool value_to_latch; } keypad_shiftregisterkeys_obj_t; diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c index e239c56b61..d2f5521a25 100644 --- a/shared-module/keypad/__init__.c +++ b/shared-module/keypad/__init__.c @@ -24,13 +24,20 @@ * THE SOFTWARE. */ +#include +#include "shared-bindings/keypad/__init__.h" +#include "shared-bindings/keypad/EventQueue.h" #include "shared-bindings/keypad/Keys.h" #include "shared-bindings/keypad/KeyMatrix.h" #include "shared-bindings/keypad/ShiftRegisterKeys.h" +#include "shared-bindings/supervisor/__init__.h" +#include "supervisor/port.h" #include "supervisor/shared/lock.h" #include "supervisor/shared/tick.h" supervisor_lock_t keypad_scanners_linked_list_lock; +static void keypad_scan_now(keypad_scanner_obj_t *self, uint64_t now); +static void keypad_scan_maybe(keypad_scanner_obj_t *self, uint64_t now); void keypad_tick(void) { // Fast path. Return immediately there are no scanners. @@ -40,16 +47,10 @@ void keypad_tick(void) { // Skip scanning if someone else has the lock. Don't wait for the lock. if (supervisor_try_lock(&keypad_scanners_linked_list_lock)) { + uint64_t now = port_get_raw_ticks(NULL); 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); - } else if (mp_obj_is_type(scanner, &keypad_shiftregisterkeys_type)) { - keypad_shiftregisterkeys_scan((keypad_shiftregisterkeys_obj_t *)scanner); - } - + keypad_scan_maybe(scanner, now); scanner = ((keypad_scanner_obj_t *)scanner)->next; } supervisor_release_lock(&keypad_scanners_linked_list_lock); @@ -97,3 +98,60 @@ void keypad_deregister_scanner(keypad_scanner_obj_t *scanner) { } supervisor_release_lock(&keypad_scanners_linked_list_lock); } + +void keypad_construct_common(keypad_scanner_obj_t *self, mp_float_t interval, size_t max_events) { + size_t key_count = common_hal_keypad_generic_get_key_count(self); + 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->interval_ticks = (mp_uint_t)(interval * 1024); // interval * 1000 * (1024/1000) + + 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(self); + keypad_scan_now(self, port_get_raw_ticks(NULL)); +} + +static void keypad_scan_now(keypad_scanner_obj_t *self, uint64_t now) { + self->next_scan_ticks = now + self->interval_ticks; + self->funcs->scan_now(self, supervisor_ticks_ms()); +} + +static void keypad_scan_maybe(keypad_scanner_obj_t *self, uint64_t now) { + if (now < self->next_scan_ticks) { + return; + } + keypad_scan_now(self, now); +} + +void common_hal_keypad_generic_reset(void *self_in) { + keypad_scanner_obj_t *self = self_in; + size_t key_count = common_hal_keypad_generic_get_key_count(self); + memset(self->previously_pressed, false, key_count); + memset(self->currently_pressed, false, key_count); + keypad_scan_now(self, port_get_raw_ticks(NULL)); +} + +void common_hal_keypad_deinit_core(void *self_in) { + keypad_scanner_obj_t *self = self_in; + self->events = NULL; +} + +bool common_hal_keypad_deinited(void *self_in) { + keypad_scanner_obj_t *self = self_in; + return !self->events; +} + +size_t common_hal_keypad_generic_get_key_count(void *self_in) { + keypad_scanner_obj_t *self = self_in; + return self->funcs->get_key_count(self); +} + +mp_obj_t common_hal_keypad_generic_get_events(void *self_in) { + keypad_scanner_obj_t *self = self_in; + return self->events; +} diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h index c5b8fe3a0a..cc792ff791 100644 --- a/shared-module/keypad/__init__.h +++ b/shared-module/keypad/__init__.h @@ -30,12 +30,26 @@ #include "py/obj.h" #include "supervisor/shared/lock.h" -// All scanners must have a next field immediately following base. +typedef struct _keypad_scanner_funcs_t { + void (*scan_now)(void *self_in, mp_obj_t timestamp); + size_t (*get_key_count)(void *self_in); +} keypad_scanner_funcs_t; + +// All scanners must begin with these common fields. // This is an ad hoc "superclass" struct for scanners, though they do // not actually have a superclass relationship. +#define KEYPAD_SCANNER_COMMON_FIELDS \ + mp_obj_base_t base; \ + struct _keypad_scanner_obj_t *next; \ + keypad_scanner_funcs_t *funcs; \ + uint64_t next_scan_ticks; \ + bool *previously_pressed; \ + bool *currently_pressed; \ + struct _keypad_eventqueue_obj_t *events; \ + mp_uint_t interval_ticks + typedef struct _keypad_scanner_obj_t { - mp_obj_base_t base; - struct _keypad_scanner_obj_t *next; + KEYPAD_SCANNER_COMMON_FIELDS; } keypad_scanner_obj_t; extern supervisor_lock_t keypad_scanners_linked_list_lock; @@ -45,6 +59,9 @@ void keypad_reset(void); void keypad_register_scanner(keypad_scanner_obj_t *scanner); void keypad_deregister_scanner(keypad_scanner_obj_t *scanner); +void keypad_construct_common(keypad_scanner_obj_t *scanner, mp_float_t interval, size_t max_events); +size_t common_hal_keypad_generic_get_key_count(void *scanner); +void common_hal_keypad_deinit_core(void *scanner); #endif // SHARED_MODULE_KEYPAD_H From 76efdfd9a65549340dee0d47c88f7d983a46b980 Mon Sep 17 00:00:00 2001 From: ViktorWiz Date: Wed, 6 Apr 2022 14:52:28 +0900 Subject: [PATCH 0082/2403] initial commit for w5100s-evb-pico --- .../boards/wiznet_w5100s_evb_pico/board.c | 40 ++++++++++++++ .../wiznet_w5100s_evb_pico/mpconfigboard.h | 2 + .../wiznet_w5100s_evb_pico/mpconfigboard.mk | 11 ++++ .../pico-sdk-configboard.h | 1 + .../boards/wiznet_w5100s_evb_pico/pins.c | 54 +++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c create mode 100644 ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c @@ -0,0 +1,40 @@ +/* + * 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 "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h new file mode 100644 index 0000000000..111b292c8e --- /dev/null +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "W5100S-EVB-Pico" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk new file mode 100644 index 0000000000..f1fca6c215 --- /dev/null +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x239A +USB_PID = 0x80F4 +USB_PRODUCT = "W5100S-EVB-Pico" +USB_MANUFACTURER = "WIZnet" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pico-sdk-configboard.h b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c new file mode 100644 index 0000000000..87ff27fa46 --- /dev/null +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c @@ -0,0 +1,54 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 286e26edf09154c22c5407675bfbb2992e095df9 Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 6 Apr 2022 11:08:22 +0200 Subject: [PATCH 0083/2403] Added support for 4MB flash. --- ports/nrf/boards/challenger_840/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nrf/boards/challenger_840/mpconfigboard.mk index a72bd34857..61af9ac029 100644 --- a/ports/nrf/boards/challenger_840/mpconfigboard.mk +++ b/ports/nrf/boards/challenger_840/mpconfigboard.mk @@ -6,4 +6,4 @@ USB_MANUFACTURER = "Invector Labs AB" MCU_CHIP = nrf52840 SPI_FLASH_FILESYSTEM = 1 -EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV" From b7acdee2265c16695b3f09bdd378659ba07af866 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 6 Apr 2022 13:18:40 +0000 Subject: [PATCH 0084/2403] Translated using Weblate (Russian) Currently translated at 37.7% (398 of 1053 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ru/ --- locale/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/ru.po b/locale/ru.po index cc26975101..19c282ce87 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-02-14 18:08+0000\n" -"Last-Translator: Clay \n" +"PO-Revision-Date: 2022-04-06 13:37+0000\n" +"Last-Translator: Jeff Epler \n" "Language-Team: none\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.11-dev\n" +"X-Generator: Weblate 4.12-dev\n" #: main.c msgid "" @@ -212,7 +212,7 @@ msgstr "Объект '%q' не является вызываемым" #: py/runtime.c msgid "'%q' object is not iterable" -msgstr "Объект '%q'не является итерируемым" +msgstr "Объект '%q' не является итерируемым" #: py/emitinlinethumb.c py/emitinlinextensa.c #, c-format From 0c97ac041b1bb5e7a7df4db4c1a50b349ec59551 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Wed, 6 Apr 2022 15:37:52 +0200 Subject: [PATCH 0085/2403] 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 | 59 ++-------------------------------------- locale/cs.po | 59 ++-------------------------------------- locale/de_DE.po | 59 ++-------------------------------------- locale/el.po | 59 ++-------------------------------------- locale/en_GB.po | 59 ++-------------------------------------- locale/es.po | 59 ++-------------------------------------- locale/fil.po | 59 ++-------------------------------------- locale/fr.po | 59 ++-------------------------------------- locale/hi.po | 59 ++-------------------------------------- locale/it_IT.po | 59 ++-------------------------------------- locale/ja.po | 59 ++-------------------------------------- locale/ko.po | 59 ++-------------------------------------- locale/nl.po | 59 ++-------------------------------------- locale/pl.po | 59 ++-------------------------------------- locale/pt_BR.po | 59 ++-------------------------------------- locale/ru.po | 59 ++-------------------------------------- locale/sv.po | 59 ++-------------------------------------- locale/tr.po | 59 ++-------------------------------------- locale/zh_Latn_pinyin.po | 59 ++-------------------------------------- 19 files changed, 38 insertions(+), 1083 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 448a289a24..d6fcba07fb 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -4103,63 +4103,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index b9fa742cc1..96e507a9a1 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -4076,63 +4076,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 0b2269c461..b7d80e4d39 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -4160,63 +4160,8 @@ msgstr "pow() drittes Argument darf nicht 0 sein" msgid "pow() with 3 arguments requires integers" msgstr "pow() mit 3 Argumenten erfordert Integer" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "Drücken der Boot-Taste beim Start.\n" diff --git a/locale/el.po b/locale/el.po index 7d43824e4e..793547be79 100644 --- a/locale/el.po +++ b/locale/el.po @@ -4067,63 +4067,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index cd600837c1..1175ac7c9b 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -4102,63 +4102,8 @@ msgstr "pow() 3rd argument cannot be 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() with 3 arguments requires integers" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "pressing boot button at start up.\n" diff --git a/locale/es.po b/locale/es.po index 995919bc8a..4ad541a5c0 100644 --- a/locale/es.po +++ b/locale/es.po @@ -4148,63 +4148,8 @@ msgstr "el 3er argumento de pow() no puede ser 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() con 3 argumentos requiere enteros" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "presionando botón de arranque al inicio.\n" diff --git a/locale/fil.po b/locale/fil.po index 193bc0c88e..3f5f65d5e6 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -4108,63 +4108,8 @@ msgstr "pow() 3rd argument ay hindi maaring 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() na may 3 argumento kailangan ng integers" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 05ec1209de..fb957730b7 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -4179,63 +4179,8 @@ msgstr "le 3e argument de pow() ne peut être 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() avec 3 arguments nécessite des entiers" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "bouton boot appuyé lors du démarrage.\n" diff --git a/locale/hi.po b/locale/hi.po index 12671ffb38..e182fb733c 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -4067,63 +4067,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 29415e59f9..9449d514c8 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -4128,63 +4128,8 @@ msgstr "il terzo argomento di pow() non può essere 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() con 3 argomenti richiede interi" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index 20f41e546d..ef0ff78707 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -4089,63 +4089,8 @@ msgstr "pow()の3つ目の引数は0にできません" msgid "pow() with 3 arguments requires integers" msgstr "pow()の第3引数には整数が必要" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 9ebbf36eb1..a132a0536a 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -4071,63 +4071,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 098bb276ba..c86ecf5158 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -4108,63 +4108,8 @@ msgstr "derde argument van pow() mag geen 0 zijn" msgid "pow() with 3 arguments requires integers" msgstr "pow() met 3 argumenten vereist integers" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "druk bootknop in bij opstarten.\n" diff --git a/locale/pl.po b/locale/pl.po index 054e175527..a8024b17e2 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -4080,63 +4080,8 @@ msgstr "trzeci argument pow() nie może być 0" msgid "pow() with 3 arguments requires integers" msgstr "trzyargumentowe pow() wymaga liczb całkowitych" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index ea3ffae29f..cc18c0b3e0 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -4171,63 +4171,8 @@ msgstr "O terceiro argumento pow() não pode ser 0" msgid "pow() with 3 arguments requires integers" msgstr "o pow() com 3 argumentos requer números inteiros" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "pressionando o botão de boot na inicialização.\n" diff --git a/locale/ru.po b/locale/ru.po index 19c282ce87..353dac4aa8 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -4116,63 +4116,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index 9a2925f6f6..19476d94be 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -4128,63 +4128,8 @@ msgstr "pow() 3: e argument kan inte vara 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() med 3 argument kräver heltal" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "trycka på startknappen vid start.\n" diff --git a/locale/tr.po b/locale/tr.po index 6966ee8ae9..ec84406e68 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -4083,63 +4083,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 0ad1a11f80..a574528889 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -4136,63 +4136,8 @@ msgstr "pow() 3 cān shǔ bùnéng wéi 0" msgid "pow() with 3 arguments requires integers" msgstr "pow() yǒu 3 cānshù xūyào zhěngshù" -#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h -#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h -#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h -#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h -#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/espressif/boards/artisense_rd00/mpconfigboard.h -#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h -#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h -#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/espressif/boards/hexky_s2/mpconfigboard.h -#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h -#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h -#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h -#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h -#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h -#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h +#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h +#: supervisor/shared/safe_mode.c msgid "pressing boot button at start up.\n" msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n" From 99dc4029dcadc5a4dc88930223cdba4951863eb8 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 6 Apr 2022 11:33:56 -0400 Subject: [PATCH 0086/2403] Espressif: disable pull-up on AnalogIn creation --- ports/espressif/common-hal/analogio/AnalogIn.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c index ba85d42735..adb8b15065 100644 --- a/ports/espressif/common-hal/analogio/AnalogIn.c +++ b/ports/espressif/common-hal/analogio/AnalogIn.c @@ -55,6 +55,10 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, } common_hal_mcu_pin_claim(pin); self->pin = pin; + // Pull-ups are enabled by default for power-saving reasons on quiescent pins. + // Turn off the pull-up as soon as we know the pin will be used for analog reads, + // since it may take a while for the voltage to stabilize if the input is high-impedance. + gpio_pullup_dis(pin->number); } bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t *self) { From 4a2b68000e83e332666d5424371db20a7446aeef Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Wed, 6 Apr 2022 18:06:54 +0200 Subject: [PATCH 0087/2403] 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 | 2 +- locale/cs.po | 2 +- locale/de_DE.po | 2 +- locale/el.po | 2 +- locale/en_GB.po | 2 +- locale/es.po | 2 +- locale/fil.po | 2 +- locale/fr.po | 2 +- locale/hi.po | 2 +- locale/it_IT.po | 2 +- locale/ja.po | 2 +- locale/ko.po | 2 +- locale/nl.po | 2 +- locale/pl.po | 2 +- locale/pt_BR.po | 2 +- locale/ru.po | 2 +- locale/sv.po | 2 +- locale/tr.po | 2 +- locale/zh_Latn_pinyin.po | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index d6fcba07fb..e6fd03c807 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -3054,7 +3054,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "kompresi header" diff --git a/locale/cs.po b/locale/cs.po index 96e507a9a1..eff642e9d3 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -3028,7 +3028,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index b7d80e4d39..9548e7d792 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -3097,7 +3097,7 @@ msgstr "Komplexe Division durch null" msgid "complex values not supported" msgstr "Komplexe Zahlen nicht unterstützt" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "kompression header" diff --git a/locale/el.po b/locale/el.po index 793547be79..952e0c505e 100644 --- a/locale/el.po +++ b/locale/el.po @@ -3019,7 +3019,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 1175ac7c9b..0a15c0d5ae 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -3053,7 +3053,7 @@ msgstr "complex division by zero" msgid "complex values not supported" msgstr "complex values not supported" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "compression header" diff --git a/locale/es.po b/locale/es.po index 4ad541a5c0..56193b521c 100644 --- a/locale/es.po +++ b/locale/es.po @@ -3091,7 +3091,7 @@ msgstr "división compleja por cero" msgid "complex values not supported" msgstr "valores complejos no soportados" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "encabezado de compresión" diff --git a/locale/fil.po b/locale/fil.po index 3f5f65d5e6..41ed0ca6a6 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -3048,7 +3048,7 @@ msgstr "kumplikadong dibisyon sa pamamagitan ng zero" msgid "complex values not supported" msgstr "kumplikadong values hindi sinusuportahan" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "compression header" diff --git a/locale/fr.po b/locale/fr.po index fb957730b7..43fdfddf34 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -3117,7 +3117,7 @@ msgstr "division complexe par zéro" msgid "complex values not supported" msgstr "valeurs complexes non supportées" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "entête de compression" diff --git a/locale/hi.po b/locale/hi.po index e182fb733c..69bd716ef5 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -3019,7 +3019,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 9449d514c8..1ff5e6a76b 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -3064,7 +3064,7 @@ msgstr "complex divisione per zero" msgid "complex values not supported" msgstr "valori complessi non supportai" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "compressione dell'header" diff --git a/locale/ja.po b/locale/ja.po index ef0ff78707..472e616b6d 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -3036,7 +3036,7 @@ msgstr "複素数ゼロ除算" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "圧縮ヘッダー" diff --git a/locale/ko.po b/locale/ko.po index a132a0536a..d0c5b38243 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -3023,7 +3023,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index c86ecf5158..7304d09917 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -3053,7 +3053,7 @@ msgstr "complexe deling door 0" msgid "complex values not supported" msgstr "complexe waardes niet ondersteund" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "compressie header" diff --git a/locale/pl.po b/locale/pl.po index a8024b17e2..c351948799 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -3030,7 +3030,7 @@ msgstr "zespolone dzielenie przez zero" msgid "complex values not supported" msgstr "wartości zespolone nieobsługiwane" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "nagłówek kompresji" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index cc18c0b3e0..791e123a53 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -3109,7 +3109,7 @@ msgstr "divisão complexa por zero" msgid "complex values not supported" msgstr "os valores complexos não compatíveis" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "compressão do cabeçalho" diff --git a/locale/ru.po b/locale/ru.po index 353dac4aa8..b5433c167a 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -3068,7 +3068,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index 19476d94be..31aa3850cf 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -3073,7 +3073,7 @@ msgstr "komplex division med noll" msgid "complex values not supported" msgstr "komplexa värden stöds inte" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "komprimeringsheader" diff --git a/locale/tr.po b/locale/tr.po index ec84406e68..368b078b4c 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -3035,7 +3035,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index a574528889..7de9e163a4 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -3085,7 +3085,7 @@ msgstr "fùzá de fēngé wèi 0" msgid "complex values not supported" msgstr "bù zhīchí fùzá de zhí" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "yāsuō tóu bù" From f297e872d6f27064803abd793f4c0eedc50c3f4b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 6 Apr 2022 18:13:59 +0100 Subject: [PATCH 0088/2403] Account for divisor when overriding position. --- ports/espressif/common-hal/rotaryio/IncrementalEncoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c index 788050b6be..15e7fc4b8f 100644 --- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c @@ -98,12 +98,12 @@ mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementa int16_t count; pcnt_get_counter_value(self->unit, &count); - return (count / self->divisor) + self->position; + return (count + self->position) / self->divisor; } void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalencoder_obj_t *self, mp_int_t new_position) { - self->position = new_position; + self->position = new_position * self->divisor; pcnt_counter_clear(self->unit); } From a69738c59263985cf4d8aa1ee048dfc9edfde881 Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 6 Apr 2022 14:19:38 -0700 Subject: [PATCH 0089/2403] Start setting up a Teensy MicroMod port --- ports/mimxrt10xx/boards/teensyMM/board.c | 64 ++++++ ports/mimxrt10xx/boards/teensyMM/board.ld | 1 + .../mimxrt10xx/boards/teensyMM/flash_config.c | 170 +++++++++++++++ .../boards/teensyMM/mpconfigboard.h | 21 ++ .../boards/teensyMM/mpconfigboard.mk | 10 + ports/mimxrt10xx/boards/teensyMM/pins.c | 204 ++++++++++++++++++ 6 files changed, 470 insertions(+) create mode 100644 ports/mimxrt10xx/boards/teensyMM/board.c create mode 100644 ports/mimxrt10xx/boards/teensyMM/board.ld create mode 100644 ports/mimxrt10xx/boards/teensyMM/flash_config.c create mode 100644 ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h create mode 100644 ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk create mode 100644 ports/mimxrt10xx/boards/teensyMM/pins.c diff --git a/ports/mimxrt10xx/boards/teensyMM/board.c b/ports/mimxrt10xx/boards/teensyMM/board.c new file mode 100644 index 0000000000..1a1dc7e5ec --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/board.c @@ -0,0 +1,64 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 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 "supervisor/board.h" +#include "boards/flash_config.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +void board_init(void) { + // FLEX flash + common_hal_never_reset_pin(&pin_GPIO_SD_B1_06); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_07); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_08); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_09); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_10); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_11); + + // FLEX flash 2 + common_hal_never_reset_pin(&pin_GPIO_AD_B0_04); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_06); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_07); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_08); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_09); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_10); + common_hal_never_reset_pin(&pin_GPIO_EMC_01); + common_hal_never_reset_pin(&pin_GPIO_B0_13); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_11); + // Data strobe needs protection despite being grounded + common_hal_never_reset_pin(&pin_GPIO_SD_B1_05); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/mimxrt10xx/boards/teensyMM/board.ld b/ports/mimxrt10xx/boards/teensyMM/board.ld new file mode 100644 index 0000000000..8f19810a35 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/board.ld @@ -0,0 +1 @@ +_ld_reserved_flash_size = 4K; diff --git a/ports/mimxrt10xx/boards/teensyMM/flash_config.c b/ports/mimxrt10xx/boards/teensyMM/flash_config.c new file mode 100644 index 0000000000..09886dece6 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/flash_config.c @@ -0,0 +1,170 @@ +/* + * Copyright 2017 NXP + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "boards/flash_config.h" + +#include "fsl_flexspi_nor_boot.h" + + +__attribute__((section(".boot_hdr.ivt"))) +/************************************* + * IVT Data + *************************************/ +const ivt image_vector_table = { + IVT_HEADER, /* IVT Header */ + IMAGE_ENTRY_ADDRESS, /* Image Entry Function */ + IVT_RSVD, /* Reserved = 0 */ + (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ + (uint32_t)BOOT_DATA_ADDRESS, /* Address where BOOT Data Structure is stored */ + (uint32_t)&image_vector_table, /* Pointer to IVT Self (absolute address */ + (uint32_t)CSF_ADDRESS, /* Address where CSF file is stored */ + IVT_RSVD /* Reserved = 0 */ +}; + +__attribute__((section(".boot_hdr.boot_data"))) +/************************************* + * Boot Data + *************************************/ +const BOOT_DATA_T boot_data = { + FLASH_BASE, /* boot start location */ + FLASH_SIZE, /* size */ + PLUGIN_FLAG, /* Plugin flag*/ + 0xFFFFFFFF /* empty - extra data word */ +}; + +// Config for W25Q64JV with QSPI routed. +__attribute__((section(".boot_hdr.conf"))) +const flexspi_nor_config_t qspiflash_config = { + .pageSize = 256u, + .sectorSize = 4u * 1024u, + .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz, + .blockSize = 0x00010000, + .isUniformBlockSize = false, + .memConfig = + { + .tag = FLEXSPI_CFG_BLK_TAG, + .version = FLEXSPI_CFG_BLK_VERSION, + .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad, + .csHoldTime = 3u, + .csSetupTime = 3u, + + .busyOffset = 0u, // Status bit 0 indicates busy. + .busyBitPolarity = 0u, // Busy when the bit is 1. + + .deviceModeCfgEnable = 1u, + .deviceModeType = kDeviceConfigCmdType_QuadEnable, + .deviceModeSeq = { + .seqId = 4u, + .seqNum = 1u, + }, + .deviceModeArg = 0x02, + .deviceType = kFlexSpiDeviceType_SerialNOR, + .sflashPadType = kSerialFlash_4Pads, + .serialClkFreq = kFlexSpiSerialClk_60MHz, + .sflashA1Size = FLASH_SIZE, + .lookupTable = + { + // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1) + // The high 16 bits is command 1 and the low are command 0. + // Within a command, the top 6 bits are the opcode, the next two are the number + // of pads and then last byte is the operand. The operand's meaning changes + // per opcode. + + // Indices with ROM should always have the same function because the ROM + // bootloader uses it. + + // 0: ROM: Read LUTs + // Quad version + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB /* the command to send */, + RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */), + FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */, + READ_SDR, FLEXSPI_4PAD, 0x04), + // Single fast read version, good for debugging. + // FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x0B /* the command to send */, + // RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */, + // READ_SDR, FLEXSPI_1PAD, 0x04), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 1: ROM: Read status + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05 /* the command to send */, + READ_SDR, FLEXSPI_1PAD, 0x01), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 2: Empty + EMPTY_SEQUENCE, + + // 3: ROM: Write Enable + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */, + STOP, FLEXSPI_1PAD, 0x00), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 4: Config: Write Status + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x31 /* the command to send */, + WRITE_SDR, FLEXSPI_1PAD, 0x01), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 5: ROM: Erase Sector + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 6: Empty + EMPTY_SEQUENCE, + + // 7: Empty + EMPTY_SEQUENCE, + + // 8: Block Erase + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xD8 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 9: ROM: Page program + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + + FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */, + STOP, FLEXSPI_1PAD, 0), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 10: Empty + EMPTY_SEQUENCE, + + // 11: ROM: Chip erase + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */, + STOP, FLEXSPI_1PAD, 0), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 12: Empty + EMPTY_SEQUENCE, + + // 13: ROM: Read SFDP + EMPTY_SEQUENCE, + + // 14: ROM: Restore no cmd + EMPTY_SEQUENCE, + + // 15: ROM: Dummy + EMPTY_SEQUENCE + }, + }, +}; diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h new file mode 100644 index 0000000000..ac9fa5ae14 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h @@ -0,0 +1,21 @@ +#define MICROPY_HW_BOARD_NAME "Teensy MM" +#define MICROPY_HW_MCU_NAME "IMXRT1062DVL6A" + +// If you change this, then make sure to update the linker scripts as well to +// make sure you don't overwrite code +#define CIRCUITPY_INTERNAL_NVM_SIZE 0 + +#define BOARD_FLASH_SIZE (16 * 1024 * 1024) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_AD_B1_00) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_AD_B1_01) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO_B0_03) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO_B0_02) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO_B0_01) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03) +#define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02) + +#define CIRCUITPY_USB_DEVICE_INSTANCE 0 +#define CIRCUITPY_USB_HOST_INSTANCE 1 diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk new file mode 100644 index 0000000000..9f214a22a2 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk @@ -0,0 +1,10 @@ +USB_VID = 0x239A +USB_PID = 0x80AE +USB_PRODUCT = "Teensy 4.1" +USB_MANUFACTURER = "PJRC" + +CHIP_VARIANT = MIMXRT1062DVJ6A +CHIP_FAMILY = MIMXRT1062 +FLASH = W25Q64JV +CIRCUITPY__EVE = 1 +CIRCUITPY_USB_HOST = 1 diff --git a/ports/mimxrt10xx/boards/teensyMM/pins.c b/ports/mimxrt10xx/boards/teensyMM/pins.c new file mode 100644 index 0000000000..1b48485087 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/pins.c @@ -0,0 +1,204 @@ +#include "shared-bindings/board/__init__.h" + +#include "supervisor/board.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // Micromod pins mapped to logical Teensy pins + {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_UART_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_UART_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D0), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D1), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX4), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_OUT), MP_ROM_PTR(&pin_GPIO_B1_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX4), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_IN), MP_ROM_PTR(&pin_GPIO_B1_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G7), MP_ROM_PTR(&pin_GPIO_B0_11)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO_B0_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_COPI), MP_ROM_PTR(&pin_GPIO_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_CIPO), MP_ROM_PTR(&pin_GPIO_B0_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX5), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_LRCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX5), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BATT_VIN3), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX6), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX6), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G8), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G11), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_INT), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO_B0_12)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO_EMC_07)}, + + // SD Card slot + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + + // new + + {MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G0), MP_ROM_PTR(&pin_GPIO_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS0), MP_ROM_PTR(&pin_GPIO_B0_04)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G1), MP_ROM_PTR(&pin_GPIO_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS1), MP_ROM_PTR(&pin_GPIO_B0_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO_B0_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G2), MP_ROM_PTR(&pin_GPIO_B0_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS2), MP_ROM_PTR(&pin_GPIO_B0_06)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO_B0_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G3), MP_ROM_PTR(&pin_GPIO_B0_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS3), MP_ROM_PTR(&pin_GPIO_B0_07)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO_B0_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G4), MP_ROM_PTR(&pin_GPIO_B0_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS4), MP_ROM_PTR(&pin_GPIO_B0_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO_B0_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G5), MP_ROM_PTR(&pin_GPIO_B0_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS5), MP_ROM_PTR(&pin_GPIO_B0_09)}, + + // USB Host + {MP_ROM_QSTR(MP_QSTR_USB_HOST_POWER), MP_ROM_PTR(&pin_GPIO_EMC_40)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG2_DP)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG2_DN)}, + + {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From ef9f9c8bf0fe3feb5a8f8d72a91c6943697001b2 Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 6 Apr 2022 15:22:24 -0700 Subject: [PATCH 0090/2403] Update PID/VID and Flash --- ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk index 9f214a22a2..1aa9220e00 100644 --- a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk @@ -1,10 +1,10 @@ -USB_VID = 0x239A -USB_PID = 0x80AE -USB_PRODUCT = "Teensy 4.1" +USB_VID = 0x1B4F +USB_PID = 0x002E +USB_PRODUCT = "Teensy MicroMod" USB_MANUFACTURER = "PJRC" CHIP_VARIANT = MIMXRT1062DVJ6A CHIP_FAMILY = MIMXRT1062 -FLASH = W25Q64JV +FLASH = W25Q128JV CIRCUITPY__EVE = 1 CIRCUITPY_USB_HOST = 1 From 219ef5e407742bedf1326929a5cd70a86516a65b Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 6 Apr 2022 15:58:27 -0700 Subject: [PATCH 0091/2403] disable on mimxrt10xx (Teensy40 41) Serial port Hooks As mentioned in issue #6241 the commit to setup port hooks is now causing all input/output that are to go to the Mu window to also go to the LpUart that is defined the port serial.c and in this case it goes to lpuart4, which on Teensy 4, 4.1 is used on Arduino Serial2. With this new code this port no longer works properly. This is one way to solve it, in that there is a #if defined() that if not set, all of the code in this file is ignored and the higher level supervisor stub versions of these functions will be used, which don't interfere with Serial2 and my test sketch works again. Note: the PR for Switch to Port Serial Hooks, also changed code in other ports. I have not tried to see how. There are other more global fixes for this, in which maybe a higer level #if that disables the code within the top level supervisor. Or could be software controlled Again this may not be the final solution, but at least it gets Serial2 up and running agin. --- ports/mimxrt10xx/supervisor/serial.c | 58 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/mimxrt10xx/supervisor/serial.c b/ports/mimxrt10xx/supervisor/serial.c index b3c37b077d..9d4971e089 100644 --- a/ports/mimxrt10xx/supervisor/serial.c +++ b/ports/mimxrt10xx/supervisor/serial.c @@ -26,65 +26,65 @@ * THE SOFTWARE. */ +#include "supervisor/serial.h" #include "py/mphal.h" #include -#include "supervisor/serial.h" #include "fsl_clock.h" #include "fsl_lpuart.h" // TODO: Switch this to using DEBUG_UART. - +#if defined(USE_DEBUG_PORT_CODE) // static LPUART_Type *uart_instance = LPUART1; // evk static LPUART_Type *uart_instance = LPUART4; // feather 1011 // static LPUART_Type *uart_instance = LPUART2; // feather 1062 static uint32_t UartSrcFreq(void) { - uint32_t freq; + 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 */ - /* PLL3 div6 80M */ - if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { - freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); - } else { - freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); - } + /* To make it simple, we assume default PLL and divider settings, and the only + variable from application is use PLL3 source or OSC source */ + /* PLL3 div6 80M */ + if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { + freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / + (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); + } else { + freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); + } - return freq; + return freq; } void port_serial_init(void) { - lpuart_config_t config; + lpuart_config_t config; - LPUART_GetDefaultConfig(&config); - config.baudRate_Bps = 115200; - config.enableTx = true; - config.enableRx = true; + LPUART_GetDefaultConfig(&config); + config.baudRate_Bps = 115200; + config.enableTx = true; + config.enableRx = true; - LPUART_Init(uart_instance, &config, UartSrcFreq()); + LPUART_Init(uart_instance, &config, UartSrcFreq()); } -bool port_serial_connected(void) { - return true; -} +bool port_serial_connected(void) { return true; } char port_serial_read(void) { - uint8_t data; + uint8_t data; - LPUART_ReadBlocking(uart_instance, &data, sizeof(data)); + LPUART_ReadBlocking(uart_instance, &data, sizeof(data)); - return data; + return data; } bool port_serial_bytes_available(void) { - return LPUART_GetStatusFlags(uart_instance) & kLPUART_RxDataRegFullFlag; + return LPUART_GetStatusFlags(uart_instance) & kLPUART_RxDataRegFullFlag; } void port_serial_write_substring(const char *text, uint32_t len) { - if (len == 0) { - return; - } + if (len == 0) { + return; + } - LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len); + LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len); } +#endif // USE_DEBUG_PORT_CODE From a74ec22aa4b6c723c14bd7d523f4b81fea5fda66 Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 6 Apr 2022 14:19:38 -0700 Subject: [PATCH 0092/2403] Start setting up a Teensy MicroMod port I have done a first pass through the files this also includes a new VID/PID from sparkfun --- ports/mimxrt10xx/boards/teensyMM/board.c | 64 ++++++ ports/mimxrt10xx/boards/teensyMM/board.ld | 1 + .../mimxrt10xx/boards/teensyMM/flash_config.c | 170 +++++++++++++++ .../boards/teensyMM/mpconfigboard.h | 21 ++ .../boards/teensyMM/mpconfigboard.mk | 10 + ports/mimxrt10xx/boards/teensyMM/pins.c | 204 ++++++++++++++++++ 6 files changed, 470 insertions(+) create mode 100644 ports/mimxrt10xx/boards/teensyMM/board.c create mode 100644 ports/mimxrt10xx/boards/teensyMM/board.ld create mode 100644 ports/mimxrt10xx/boards/teensyMM/flash_config.c create mode 100644 ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h create mode 100644 ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk create mode 100644 ports/mimxrt10xx/boards/teensyMM/pins.c diff --git a/ports/mimxrt10xx/boards/teensyMM/board.c b/ports/mimxrt10xx/boards/teensyMM/board.c new file mode 100644 index 0000000000..1a1dc7e5ec --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/board.c @@ -0,0 +1,64 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 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 "supervisor/board.h" +#include "boards/flash_config.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +void board_init(void) { + // FLEX flash + common_hal_never_reset_pin(&pin_GPIO_SD_B1_06); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_07); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_08); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_09); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_10); + common_hal_never_reset_pin(&pin_GPIO_SD_B1_11); + + // FLEX flash 2 + common_hal_never_reset_pin(&pin_GPIO_AD_B0_04); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_06); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_07); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_08); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_09); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_10); + common_hal_never_reset_pin(&pin_GPIO_EMC_01); + common_hal_never_reset_pin(&pin_GPIO_B0_13); + common_hal_never_reset_pin(&pin_GPIO_AD_B0_11); + // Data strobe needs protection despite being grounded + common_hal_never_reset_pin(&pin_GPIO_SD_B1_05); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/mimxrt10xx/boards/teensyMM/board.ld b/ports/mimxrt10xx/boards/teensyMM/board.ld new file mode 100644 index 0000000000..8f19810a35 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/board.ld @@ -0,0 +1 @@ +_ld_reserved_flash_size = 4K; diff --git a/ports/mimxrt10xx/boards/teensyMM/flash_config.c b/ports/mimxrt10xx/boards/teensyMM/flash_config.c new file mode 100644 index 0000000000..09886dece6 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/flash_config.c @@ -0,0 +1,170 @@ +/* + * Copyright 2017 NXP + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "boards/flash_config.h" + +#include "fsl_flexspi_nor_boot.h" + + +__attribute__((section(".boot_hdr.ivt"))) +/************************************* + * IVT Data + *************************************/ +const ivt image_vector_table = { + IVT_HEADER, /* IVT Header */ + IMAGE_ENTRY_ADDRESS, /* Image Entry Function */ + IVT_RSVD, /* Reserved = 0 */ + (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ + (uint32_t)BOOT_DATA_ADDRESS, /* Address where BOOT Data Structure is stored */ + (uint32_t)&image_vector_table, /* Pointer to IVT Self (absolute address */ + (uint32_t)CSF_ADDRESS, /* Address where CSF file is stored */ + IVT_RSVD /* Reserved = 0 */ +}; + +__attribute__((section(".boot_hdr.boot_data"))) +/************************************* + * Boot Data + *************************************/ +const BOOT_DATA_T boot_data = { + FLASH_BASE, /* boot start location */ + FLASH_SIZE, /* size */ + PLUGIN_FLAG, /* Plugin flag*/ + 0xFFFFFFFF /* empty - extra data word */ +}; + +// Config for W25Q64JV with QSPI routed. +__attribute__((section(".boot_hdr.conf"))) +const flexspi_nor_config_t qspiflash_config = { + .pageSize = 256u, + .sectorSize = 4u * 1024u, + .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz, + .blockSize = 0x00010000, + .isUniformBlockSize = false, + .memConfig = + { + .tag = FLEXSPI_CFG_BLK_TAG, + .version = FLEXSPI_CFG_BLK_VERSION, + .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad, + .csHoldTime = 3u, + .csSetupTime = 3u, + + .busyOffset = 0u, // Status bit 0 indicates busy. + .busyBitPolarity = 0u, // Busy when the bit is 1. + + .deviceModeCfgEnable = 1u, + .deviceModeType = kDeviceConfigCmdType_QuadEnable, + .deviceModeSeq = { + .seqId = 4u, + .seqNum = 1u, + }, + .deviceModeArg = 0x02, + .deviceType = kFlexSpiDeviceType_SerialNOR, + .sflashPadType = kSerialFlash_4Pads, + .serialClkFreq = kFlexSpiSerialClk_60MHz, + .sflashA1Size = FLASH_SIZE, + .lookupTable = + { + // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1) + // The high 16 bits is command 1 and the low are command 0. + // Within a command, the top 6 bits are the opcode, the next two are the number + // of pads and then last byte is the operand. The operand's meaning changes + // per opcode. + + // Indices with ROM should always have the same function because the ROM + // bootloader uses it. + + // 0: ROM: Read LUTs + // Quad version + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB /* the command to send */, + RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */), + FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */, + READ_SDR, FLEXSPI_4PAD, 0x04), + // Single fast read version, good for debugging. + // FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x0B /* the command to send */, + // RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */, + // READ_SDR, FLEXSPI_1PAD, 0x04), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 1: ROM: Read status + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05 /* the command to send */, + READ_SDR, FLEXSPI_1PAD, 0x01), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 2: Empty + EMPTY_SEQUENCE, + + // 3: ROM: Write Enable + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */, + STOP, FLEXSPI_1PAD, 0x00), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 4: Config: Write Status + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x31 /* the command to send */, + WRITE_SDR, FLEXSPI_1PAD, 0x01), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 5: ROM: Erase Sector + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 6: Empty + EMPTY_SEQUENCE, + + // 7: Empty + EMPTY_SEQUENCE, + + // 8: Block Erase + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xD8 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 9: ROM: Page program + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02 /* the command to send */, + RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */), + + FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */, + STOP, FLEXSPI_1PAD, 0), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 10: Empty + EMPTY_SEQUENCE, + + // 11: ROM: Chip erase + SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */, + STOP, FLEXSPI_1PAD, 0), + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS, + TWO_EMPTY_STEPS), + + // 12: Empty + EMPTY_SEQUENCE, + + // 13: ROM: Read SFDP + EMPTY_SEQUENCE, + + // 14: ROM: Restore no cmd + EMPTY_SEQUENCE, + + // 15: ROM: Dummy + EMPTY_SEQUENCE + }, + }, +}; diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h new file mode 100644 index 0000000000..ac9fa5ae14 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h @@ -0,0 +1,21 @@ +#define MICROPY_HW_BOARD_NAME "Teensy MM" +#define MICROPY_HW_MCU_NAME "IMXRT1062DVL6A" + +// If you change this, then make sure to update the linker scripts as well to +// make sure you don't overwrite code +#define CIRCUITPY_INTERNAL_NVM_SIZE 0 + +#define BOARD_FLASH_SIZE (16 * 1024 * 1024) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_AD_B1_00) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_AD_B1_01) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO_B0_03) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO_B0_02) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO_B0_01) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03) +#define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02) + +#define CIRCUITPY_USB_DEVICE_INSTANCE 0 +#define CIRCUITPY_USB_HOST_INSTANCE 1 diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk new file mode 100644 index 0000000000..1aa9220e00 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk @@ -0,0 +1,10 @@ +USB_VID = 0x1B4F +USB_PID = 0x002E +USB_PRODUCT = "Teensy MicroMod" +USB_MANUFACTURER = "PJRC" + +CHIP_VARIANT = MIMXRT1062DVJ6A +CHIP_FAMILY = MIMXRT1062 +FLASH = W25Q128JV +CIRCUITPY__EVE = 1 +CIRCUITPY_USB_HOST = 1 diff --git a/ports/mimxrt10xx/boards/teensyMM/pins.c b/ports/mimxrt10xx/boards/teensyMM/pins.c new file mode 100644 index 0000000000..1b48485087 --- /dev/null +++ b/ports/mimxrt10xx/boards/teensyMM/pins.c @@ -0,0 +1,204 @@ +#include "shared-bindings/board/__init__.h" + +#include "supervisor/board.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // Micromod pins mapped to logical Teensy pins + {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_UART_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_UART_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D0), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D1), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX4), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_OUT), MP_ROM_PTR(&pin_GPIO_B1_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX4), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_IN), MP_ROM_PTR(&pin_GPIO_B1_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G7), MP_ROM_PTR(&pin_GPIO_B0_11)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO_B0_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_COPI), MP_ROM_PTR(&pin_GPIO_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_CIPO), MP_ROM_PTR(&pin_GPIO_B0_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX5), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_LRCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX5), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BATT_VIN3), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX6), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX6), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G8), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G11), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_INT), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO_B0_12)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO_EMC_07)}, + + // SD Card slot + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + + // new + + {MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G0), MP_ROM_PTR(&pin_GPIO_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS0), MP_ROM_PTR(&pin_GPIO_B0_04)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G1), MP_ROM_PTR(&pin_GPIO_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS1), MP_ROM_PTR(&pin_GPIO_B0_05)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO_B0_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G2), MP_ROM_PTR(&pin_GPIO_B0_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS2), MP_ROM_PTR(&pin_GPIO_B0_06)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO_B0_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G3), MP_ROM_PTR(&pin_GPIO_B0_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS3), MP_ROM_PTR(&pin_GPIO_B0_07)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO_B0_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G4), MP_ROM_PTR(&pin_GPIO_B0_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS4), MP_ROM_PTR(&pin_GPIO_B0_08)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO_B0_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_G5), MP_ROM_PTR(&pin_GPIO_B0_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_BUS5), MP_ROM_PTR(&pin_GPIO_B0_09)}, + + // USB Host + {MP_ROM_QSTR(MP_QSTR_USB_HOST_POWER), MP_ROM_PTR(&pin_GPIO_EMC_40)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG2_DP)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG2_DN)}, + + {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 9ec589ef0f9347f062c001745217db83361ec985 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Thu, 7 Apr 2022 03:35:12 +0200 Subject: [PATCH 0093/2403] 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 | 7 +++---- locale/el.po | 4 ---- locale/en_GB.po | 4 ---- locale/es.po | 4 ---- locale/fil.po | 4 ---- locale/fr.po | 7 +++---- 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 | 7 +++---- locale/ru.po | 4 ---- locale/sv.po | 7 +++---- locale/tr.po | 4 ---- locale/zh_Latn_pinyin.po | 7 +++---- 19 files changed, 15 insertions(+), 76 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index e6fd03c807..875c6c46a1 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -3161,10 +3161,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index eff642e9d3..69227eefe9 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -3135,10 +3135,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 9548e7d792..25bef643bd 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -3206,10 +3206,6 @@ msgstr "durch Null dividieren" msgid "division by zero" msgstr "Division durch Null" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "Teiler muss 4 sein" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "dtype muss Float oder komplex sein" @@ -4720,6 +4716,9 @@ msgstr "zi muss eine Gleitkommazahl sein" msgid "zi must be of shape (n_section, 2)" msgstr "zi muss die Form (n_section, 2) haben" +#~ msgid "divisor must be 4" +#~ msgstr "Teiler muss 4 sein" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/el.po b/locale/el.po index 952e0c505e..bad0723a70 100644 --- a/locale/el.po +++ b/locale/el.po @@ -3126,10 +3126,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 0a15c0d5ae..cc1801abba 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -3161,10 +3161,6 @@ msgstr "divide by zero" msgid "division by zero" msgstr "division by zero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/es.po b/locale/es.po index 56193b521c..c8dc2b9845 100644 --- a/locale/es.po +++ b/locale/es.po @@ -3200,10 +3200,6 @@ msgstr "divide por cero" msgid "division by zero" msgstr "división por cero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/fil.po b/locale/fil.po index 41ed0ca6a6..79dd7c1bdc 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -3159,10 +3159,6 @@ msgstr "" msgid "division by zero" msgstr "dibisyon ng zero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 43fdfddf34..7f41ca2ced 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -3227,10 +3227,6 @@ msgstr "division par zéro" msgid "division by zero" msgstr "division par zéro" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "le diviseur doit être 4" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" @@ -4737,6 +4733,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 "divisor must be 4" +#~ msgstr "le diviseur doit être 4" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/hi.po b/locale/hi.po index 69bd716ef5..59aa535b3f 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -3126,10 +3126,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 1ff5e6a76b..ee8522f360 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -3174,10 +3174,6 @@ msgstr "" msgid "division by zero" msgstr "divisione per zero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index 472e616b6d..5c483cfcd5 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -3145,10 +3145,6 @@ msgstr "" msgid "division by zero" msgstr "ゼロ除算 (division by zero)" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index d0c5b38243..3fc04dcdc8 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -3130,10 +3130,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 7304d09917..5c584c1cf6 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -3162,10 +3162,6 @@ msgstr "" msgid "division by zero" msgstr "deling door nul" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/pl.po b/locale/pl.po index c351948799..d8c98ba4e6 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -3138,10 +3138,6 @@ msgstr "" msgid "division by zero" msgstr "dzielenie przez zero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 791e123a53..adfdb1ce4c 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -3219,10 +3219,6 @@ msgstr "divido por zero" msgid "division by zero" msgstr "divisão por zero" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "o divisor deve ser 4" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "dtype deve ser flutuante ou complexo" @@ -4728,6 +4724,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 "divisor must be 4" +#~ msgstr "o divisor deve ser 4" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/ru.po b/locale/ru.po index b5433c167a..3d78a492c1 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -3175,10 +3175,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index 31aa3850cf..4f8d39879b 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -3183,10 +3183,6 @@ msgstr "division med noll" msgid "division by zero" msgstr "division med noll" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "divisor måste vara 4" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "dtype måste vara float eller complex" @@ -4685,6 +4681,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 "divisor must be 4" +#~ msgstr "divisor måste vara 4" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/tr.po b/locale/tr.po index 368b078b4c..91f0253cb4 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -3142,10 +3142,6 @@ msgstr "" msgid "division by zero" msgstr "" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 7de9e163a4..e8bf961f6b 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -3194,10 +3194,6 @@ msgstr "chú yǐ líng" msgid "division by zero" msgstr "bèi líng chú" -#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c -msgid "divisor must be 4" -msgstr "èr chóng zòu bì xū shì 4" - #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" msgstr "dtype bì xū shì fú diǎn xíng huò fù shù" @@ -4696,6 +4692,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 "divisor must be 4" +#~ msgstr "èr chóng zòu bì xū shì 4" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" From 769b182da4fb726c132a7ccc66ff0328b3be4c11 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Thu, 7 Apr 2022 07:24:55 +0100 Subject: [PATCH 0094/2403] Added definition for upcoming Pimoroni motor board --- .../boards/pimoroni_motor2040/board.c | 40 ++++++++++ .../boards/pimoroni_motor2040/mpconfigboard.h | 11 +++ .../pimoroni_motor2040/mpconfigboard.mk | 11 +++ .../pimoroni_motor2040/pico-sdk-configboard.h | 1 + .../boards/pimoroni_motor2040/pins.c | 74 +++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 ports/raspberrypi/boards/pimoroni_motor2040/board.c create mode 100644 ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/pimoroni_motor2040/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/pimoroni_motor2040/pins.c diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/board.c b/ports/raspberrypi/boards/pimoroni_motor2040/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_motor2040/board.c @@ -0,0 +1,40 @@ +/* + * 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 "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.h new file mode 100644 index 0000000000..b53e54ba90 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.h @@ -0,0 +1,11 @@ +#define MICROPY_HW_BOARD_NAME "Pimoroni Motor 2040" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO18) +#define MICROPY_HW_NEOPIXEL_COUNT (1) + +#define DEFAULT_UART_BUS_TX (&pin_GPIO16) +#define DEFAULT_UART_BUS_RX (&pin_GPIO17) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO21) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO20) diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.mk new file mode 100644 index 0000000000..0b73fa1123 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_motor2040/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x2E8A +USB_PID = 0x1019 +USB_PRODUCT = "Motor 2040" +USB_MANUFACTURER = "Pimoroni" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_motor2040/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_motor2040/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c new file mode 100644 index 0000000000..a590dcd24a --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c @@ -0,0 +1,74 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_MOTOR_1P), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_1N), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_2P), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_2N), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_3P), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_3N), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_4P), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_4N), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_NUM_MOTORS), MP_ROM_INT(4) }, + + { MP_ROM_QSTR(MP_QSTR_ENCODER_1A), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_1B), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_2A), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_2B), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_3A), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_3B), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_4A), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_4B), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_NUM_ENCODERS), MP_ROM_INT(4) }, + + { MP_ROM_QSTR(MP_QSTR_TX_TRIG), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_RX_ECHO), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_LED_DATA), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(1) }, + + { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_USER_SW), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_0), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_1), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_ADC_ADDR_2), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_SHARED_ADC), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_1_ADDR), MP_ROM_INT(0b000) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_2_ADDR), MP_ROM_INT(0b001) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_3_ADDR), MP_ROM_INT(0b010) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_4_ADDR), MP_ROM_INT(0b011) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_SENSE_ADDR), MP_ROM_INT(0b100) }, + { MP_ROM_QSTR(MP_QSTR_FAULT_SENSE_ADDR), MP_ROM_INT(0b101) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_1_ADDR), MP_ROM_INT(0b110) }, + { MP_ROM_QSTR(MP_QSTR_SENSOR_2_ADDR), MP_ROM_INT(0b111) }, + { MP_ROM_QSTR(MP_QSTR_NUM_SENSORS), MP_ROM_INT(2) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 766bf8f671911c74712407e50c5a2351e229781d Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 7 Apr 2022 10:57:37 -0500 Subject: [PATCH 0095/2403] disable floppyio on kicksat-sprite --- ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk index dd6b811f5b..11abb8a727 100644 --- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk +++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk @@ -18,6 +18,7 @@ CIRCUITPY_AUDIOMIXER = 0 CIRCUITPY_AUDIOMP3 = 0 CIRCUITPY_BLEIO_HCI = 0 CIRCUITPY_DISPLAYIO = 0 +CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_GETPASS = 0 CIRCUITPY_KEYPAD = 0 From 2cb422fb192384dfe3df82e778fd2d58eed98139 Mon Sep 17 00:00:00 2001 From: KurtE Date: Thu, 7 Apr 2022 12:09:56 -0700 Subject: [PATCH 0096/2403] Create W25Q128JV.ld Add flash file needed for Teensy MicroMod, --- ports/mimxrt10xx/linking/flash/W25Q128JV.ld | 1 + 1 file changed, 1 insertion(+) create mode 100644 ports/mimxrt10xx/linking/flash/W25Q128JV.ld diff --git a/ports/mimxrt10xx/linking/flash/W25Q128JV.ld b/ports/mimxrt10xx/linking/flash/W25Q128JV.ld new file mode 100644 index 0000000000..4c055f4ba4 --- /dev/null +++ b/ports/mimxrt10xx/linking/flash/W25Q128JV.ld @@ -0,0 +1 @@ +_ld_flash_size = 16M; \ No newline at end of file From 03e0acde943f9c943e6e598ebd4fa0bce5723a40 Mon Sep 17 00:00:00 2001 From: KurtE Date: Thu, 7 Apr 2022 14:11:22 -0700 Subject: [PATCH 0097/2403] Trying to cleanup the pre build messages --- ports/mimxrt10xx/boards/teensyMM/pins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mimxrt10xx/boards/teensyMM/pins.c b/ports/mimxrt10xx/boards/teensyMM/pins.c index 1b48485087..157ca00560 100644 --- a/ports/mimxrt10xx/boards/teensyMM/pins.c +++ b/ports/mimxrt10xx/boards/teensyMM/pins.c @@ -6,6 +6,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Micromod pins mapped to logical Teensy pins + // Plus pins mapping some of the names on micromod breakout boards {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, From 93e9e3ad9035fdd1086ad0b3b9881712c179a1e6 Mon Sep 17 00:00:00 2001 From: KurtE Date: Thu, 7 Apr 2022 15:52:01 -0700 Subject: [PATCH 0098/2403] Fix end of line --- ports/mimxrt10xx/linking/flash/W25Q128JV.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mimxrt10xx/linking/flash/W25Q128JV.ld b/ports/mimxrt10xx/linking/flash/W25Q128JV.ld index 4c055f4ba4..205d9dd839 100644 --- a/ports/mimxrt10xx/linking/flash/W25Q128JV.ld +++ b/ports/mimxrt10xx/linking/flash/W25Q128JV.ld @@ -1 +1 @@ -_ld_flash_size = 16M; \ No newline at end of file +_ld_flash_size = 16M; From 2a3eb49da74c4f50b47d52e5ba26a29f8be0bee8 Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 8 Apr 2022 07:41:51 -0700 Subject: [PATCH 0099/2403] Update the pins.c I fixed a couple issues in the pin name definitions. The pin names are sort of Teensy centric in that the priority is given to the pin names you would use in Arduino like D0, D1, ... But also added names for the MicroMod names in particular the names on the front of the ATP carrier board Also updated manufacturer to be both PJRC and Sparkfun --- .../boards/teensyMM/mpconfigboard.mk | 2 +- ports/mimxrt10xx/boards/teensyMM/pins.c | 115 +++++++++--------- 2 files changed, 60 insertions(+), 57 deletions(-) diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk index 1aa9220e00..2eefba15f0 100644 --- a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk @@ -1,7 +1,7 @@ USB_VID = 0x1B4F USB_PID = 0x002E USB_PRODUCT = "Teensy MicroMod" -USB_MANUFACTURER = "PJRC" +USB_MANUFACTURER = "PJRC/Sparkfun" CHIP_VARIANT = MIMXRT1062DVJ6A CHIP_FAMILY = MIMXRT1062 diff --git a/ports/mimxrt10xx/boards/teensyMM/pins.c b/ports/mimxrt10xx/boards/teensyMM/pins.c index 157ca00560..a81414aed2 100644 --- a/ports/mimxrt10xx/boards/teensyMM/pins.c +++ b/ports/mimxrt10xx/boards/teensyMM/pins.c @@ -10,53 +10,35 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_UART_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_UART_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO_EMC_04)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO_EMC_05)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D0), MP_ROM_PTR(&pin_GPIO_EMC_06)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D1), MP_ROM_PTR(&pin_GPIO_EMC_08)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G6), MP_ROM_PTR(&pin_GPIO_B0_10)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX4), MP_ROM_PTR(&pin_GPIO_B1_01)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_OUT), MP_ROM_PTR(&pin_GPIO_B1_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_TX4), MP_ROM_PTR(&pin_GPIO_B1_00)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_IN), MP_ROM_PTR(&pin_GPIO_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G7), MP_ROM_PTR(&pin_GPIO_B0_11)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO_B0_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_COPI), MP_ROM_PTR(&pin_GPIO_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_CIPO), MP_ROM_PTR(&pin_GPIO_B0_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, @@ -78,118 +60,88 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, {MP_OBJ_NEW_QSTR(MP_QSTR_TX5), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_LRCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX5), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_BATT_VIN3), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_AUD_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, {MP_OBJ_NEW_QSTR(MP_QSTR_TX6), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX6), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G8), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, {MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G11), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32)}, {MP_OBJ_NEW_QSTR(MP_QSTR_RX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_I2C_INT), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_31)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_GPIO_EMC_37)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_GPIO_EMC_36)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO_B0_12)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO_EMC_07)}, // SD Card slot - {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, - // new + // new pins (not on T4 or T4.1) {MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO_B0_04)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G0), MP_ROM_PTR(&pin_GPIO_B0_04)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS0), MP_ROM_PTR(&pin_GPIO_B0_04)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO_B0_05)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G1), MP_ROM_PTR(&pin_GPIO_B0_05)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS1), MP_ROM_PTR(&pin_GPIO_B0_05)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO_B0_06)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G2), MP_ROM_PTR(&pin_GPIO_B0_06)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS2), MP_ROM_PTR(&pin_GPIO_B0_06)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO_B0_07)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G3), MP_ROM_PTR(&pin_GPIO_B0_07)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS3), MP_ROM_PTR(&pin_GPIO_B0_07)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO_B0_08)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G4), MP_ROM_PTR(&pin_GPIO_B0_08)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS4), MP_ROM_PTR(&pin_GPIO_B0_08)}, {MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO_B0_09)}, - {MP_OBJ_NEW_QSTR(MP_QSTR_G5), MP_ROM_PTR(&pin_GPIO_B0_09)}, {MP_OBJ_NEW_QSTR(MP_QSTR_BUS5), MP_ROM_PTR(&pin_GPIO_B0_09)}, // USB Host @@ -201,5 +153,56 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { {MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)}, {MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj)}, + // Micromod Names on different carrier boards + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, // D0 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, // D1 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_PWM1), MP_ROM_PTR(&pin_GPIO_EMC_04)}, // D2 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_PWM0), MP_ROM_PTR(&pin_GPIO_EMC_05)}, // D3 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D0), MP_ROM_PTR(&pin_GPIO_EMC_06)}, // D4 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_D1), MP_ROM_PTR(&pin_GPIO_EMC_08)}, // D5 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G6), MP_ROM_PTR(&pin_GPIO_B0_10)}, // D6 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_I2S_SDO), MP_ROM_PTR(&pin_GPIO_B1_01)}, // D7 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_I2S_SDI), MP_ROM_PTR(&pin_GPIO_B1_00)}, // D8 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G7), MP_ROM_PTR(&pin_GPIO_B0_11)}, // D9 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CS), MP_ROM_PTR(&pin_GPIO_B0_00)}, // D10 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_COPI), MP_ROM_PTR(&pin_GPIO_B0_02)}, // D11 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CIPO), MP_ROM_PTR(&pin_GPIO_B0_01)}, // D12 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, // D13 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, // D14 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, // D15 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_RX2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, // D16 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_TX2), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, // D17 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, // D18 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, // D19 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_I2S_FS), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, // D20 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_I2S_CLK), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, // D21 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_BATT_VIN3), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, // D22 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, // D23 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, // D24 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, // D25 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G8), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, // D26 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G11), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, // D27 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_33V_EN), MP_ROM_PTR(&pin_GPIO_EMC_32)}, // D28 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_I2C_INT), MP_ROM_PTR(&pin_GPIO_EMC_31)}, // D29 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CAN_RX), MP_ROM_PTR(&pin_GPIO_EMC_37)}, // D30 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CAN_TX), MP_ROM_PTR(&pin_GPIO_EMC_36)}, // D31 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G9), MP_ROM_PTR(&pin_GPIO_B0_12)}, // D32 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G10), MP_ROM_PTR(&pin_GPIO_EMC_07)}, // D33 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, // D34 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, // 35 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CIPO1), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, // 35 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_SCK1), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, // D36 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_COPI1), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, // D37 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_CS1), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, // D38 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, // D38 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G0), MP_ROM_PTR(&pin_GPIO_B0_04)}, // D40 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G1), MP_ROM_PTR(&pin_GPIO_B0_05)}, // D41 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G2), MP_ROM_PTR(&pin_GPIO_B0_06)}, // D42 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G3), MP_ROM_PTR(&pin_GPIO_B0_07)}, // D43 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G4), MP_ROM_PTR(&pin_GPIO_B0_08)}, // D44 + {MP_OBJ_NEW_QSTR(MP_QSTR_MM_G5), MP_ROM_PTR(&pin_GPIO_B0_09)}, // D45 + }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From ea3dfa444ac7bf7b687065e609988c96dc376bae Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:39:47 -0400 Subject: [PATCH 0100/2403] msys at least breaks elsewhere now --- py/makeversionhdr.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index da6f7c9f59..84bba402d9 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -22,13 +22,14 @@ def get_version_info_from_git(): [tools_describe], stderr=subprocess.STDOUT, universal_newlines=True, + shell=True ).strip() except subprocess.CalledProcessError as er: if er.returncode == 128: # git exit code of 128 means no repository found return None git_tag = "" - except OSError: + except OSError as e: return None try: git_hash = subprocess.check_output( From 1f3dadcbb9a135c4d4348cc85da8af140ac79d43 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:43:15 -0400 Subject: [PATCH 0101/2403] ok other waythen --- py/makeversionhdr.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 84bba402d9..e4ddf9fa1e 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -19,10 +19,7 @@ def get_version_info_from_git(): # Note: git describe doesn't work if no tag is available try: git_tag = subprocess.check_output( - [tools_describe], - stderr=subprocess.STDOUT, - universal_newlines=True, - shell=True + [tools_describe], stderr=subprocess.STDOUT, universal_newlines=True, shell=True ).strip() except subprocess.CalledProcessError as er: if er.returncode == 128: From d3a989f27479bf148eae17221254c0557d090fb6 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:55:49 -0400 Subject: [PATCH 0102/2403] not sure why this changed...but it changed in mingw64? --- mpy-cross/mpy-cross.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 642fe9b5aa..a975f8253b 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -8,7 +8,7 @@ include ../py/mkenv.mk ifeq ($(OS),Windows_NT) # Detect a MINGW32 build, and change the name of the final executable. -PROG ?= mpy-cross.exe +PROG ?= mpy-cross else PROG ?= mpy-cross endif From f7b3247deb4196f809f3d8f9a7cdaf214074bb0f Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 17:44:28 -0400 Subject: [PATCH 0103/2403] fix paths with ('s or spaces --- ports/espressif/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 96360d06bd..214b9251e7 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) # IDF build commands -IDF_PATH = $(realpath ./esp-idf) +IDF_PATH = "$(realpath ./esp-idf)" # create the directory $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ From 7ff0036a2674461784f1ce63d76b529744ebe1a6 Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 8 Apr 2022 15:59:27 -0700 Subject: [PATCH 0104/2403] Fix the pre-check stuff --- ports/mimxrt10xx/supervisor/serial.c | 55 +++++++++++++++------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/ports/mimxrt10xx/supervisor/serial.c b/ports/mimxrt10xx/supervisor/serial.c index 9d4971e089..4223ab4f5b 100644 --- a/ports/mimxrt10xx/supervisor/serial.c +++ b/ports/mimxrt10xx/supervisor/serial.c @@ -34,57 +34,60 @@ #include "fsl_lpuart.h" // TODO: Switch this to using DEBUG_UART. +// Need official way to turn off the port serial code when it is not needed #if defined(USE_DEBUG_PORT_CODE) // static LPUART_Type *uart_instance = LPUART1; // evk static LPUART_Type *uart_instance = LPUART4; // feather 1011 // static LPUART_Type *uart_instance = LPUART2; // feather 1062 static uint32_t UartSrcFreq(void) { - uint32_t freq; + 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 */ - /* PLL3 div6 80M */ - if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { - freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / - (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); - } else { - freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); - } + /* To make it simple, we assume default PLL and divider settings, and the only + variable from application is use PLL3 source or OSC source */ + /* PLL3 div6 80M */ + if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { + freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / + (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); + } else { + freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U); + } - return freq; + return freq; } void port_serial_init(void) { - lpuart_config_t config; + lpuart_config_t config; - LPUART_GetDefaultConfig(&config); - config.baudRate_Bps = 115200; - config.enableTx = true; - config.enableRx = true; + LPUART_GetDefaultConfig(&config); + config.baudRate_Bps = 115200; + config.enableTx = true; + config.enableRx = true; - LPUART_Init(uart_instance, &config, UartSrcFreq()); + LPUART_Init(uart_instance, &config, UartSrcFreq()); } -bool port_serial_connected(void) { return true; } +bool port_serial_connected(void) { + return true; +} char port_serial_read(void) { - uint8_t data; + uint8_t data; - LPUART_ReadBlocking(uart_instance, &data, sizeof(data)); + LPUART_ReadBlocking(uart_instance, &data, sizeof(data)); - return data; + return data; } bool port_serial_bytes_available(void) { - return LPUART_GetStatusFlags(uart_instance) & kLPUART_RxDataRegFullFlag; + return LPUART_GetStatusFlags(uart_instance) & kLPUART_RxDataRegFullFlag; } void port_serial_write_substring(const char *text, uint32_t len) { - if (len == 0) { - return; - } + if (len == 0) { + return; + } - LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len); + LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len); } #endif // USE_DEBUG_PORT_CODE From 3c70aa8845707cca98112d70f36c18f42ced8ceb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 08:49:26 -0500 Subject: [PATCH 0105/2403] Revert "fix paths with ('s or spaces" This reverts commit f7b3247deb4196f809f3d8f9a7cdaf214074bb0f. --- ports/espressif/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 214b9251e7..96360d06bd 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) # IDF build commands -IDF_PATH = "$(realpath ./esp-idf)" +IDF_PATH = $(realpath ./esp-idf) # create the directory $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ From b5ab73b111ab790c7c7382317a881c0c9cbb1bd7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 09:55:10 -0500 Subject: [PATCH 0106/2403] whole conditional block no longer needed --- mpy-cross/mpy-cross.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index a975f8253b..825566efec 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -6,12 +6,7 @@ include ../py/mkenv.mk # define main target -ifeq ($(OS),Windows_NT) -# Detect a MINGW32 build, and change the name of the final executable. PROG ?= mpy-cross -else -PROG ?= mpy-cross -endif # qstr definitions (must come before including py.mk) QSTR_DEFS = qstrdefsport.h From 666a5ff04cf5c0ee1bedf768830beb9f45dcdfaf Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 9 Apr 2022 10:09:46 -0500 Subject: [PATCH 0107/2403] trying to make vectorio shape hidable --- shared-module/displayio/Group.c | 58 +++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index b9179f0a00..28d3d89735 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -358,35 +358,45 @@ void displayio_group_construct(displayio_group_t *self, mp_obj_list_t *members, bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorspace_t *colorspace, const displayio_area_t *area, uint32_t *mask, uint32_t *buffer) { // Track if any of the layers finishes filling in the given area. We can ignore any remaining // layers at that point. - for (int32_t i = self->members->len - 1; i >= 0; i--) { - mp_obj_t layer; - #if CIRCUITPY_VECTORIO - const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, self->members->items[i]); - if (draw_protocol != NULL) { - layer = draw_protocol->draw_get_protocol_self(self->members->items[i]); - if (draw_protocol->draw_protocol_impl->draw_fill_area(layer, colorspace, area, mask, buffer)) { - return true; + //mp_printf(&mp_plat_print, "inside fill area \n"); + //mp_printf(&mp_plat_print, "%d \n", self->hidden); + //mp_printf(&mp_plat_print, "\n"); + + //mp_printf(&mp_plat_print, "inside fill area \n"); + if (self->hidden == false){ + //mp_printf(&mp_plat_print, "not hidden\n"); + for (int32_t i = self->members->len - 1; i >= 0; i--) { + mp_obj_t layer; + #if CIRCUITPY_VECTORIO + const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, self->members->items[i]); + if (draw_protocol != NULL) { + layer = draw_protocol->draw_get_protocol_self(self->members->items[i]); + if (draw_protocol->draw_protocol_impl->draw_fill_area(layer, colorspace, area, mask, buffer)) { + return true; + } + continue; } - continue; - } - #endif - layer = mp_obj_cast_to_native_base( - self->members->items[i], &displayio_tilegrid_type); - if (layer != MP_OBJ_NULL) { - if (displayio_tilegrid_fill_area(layer, colorspace, area, mask, buffer)) { - return true; + #endif + layer = mp_obj_cast_to_native_base( + self->members->items[i], &displayio_tilegrid_type); + if (layer != MP_OBJ_NULL) { + if (displayio_tilegrid_fill_area(layer, colorspace, area, mask, buffer)) { + return true; + } + continue; } - continue; - } - layer = mp_obj_cast_to_native_base( - self->members->items[i], &displayio_group_type); - if (layer != MP_OBJ_NULL) { - if (displayio_group_fill_area(layer, colorspace, area, mask, buffer)) { - return true; + layer = mp_obj_cast_to_native_base( + self->members->items[i], &displayio_group_type); + if (layer != MP_OBJ_NULL) { + if (displayio_group_fill_area(layer, colorspace, area, mask, buffer)) { + return true; + } + continue; } - continue; } } + + return false; } From a9713b773f9d832dce918a3107aa7a5deee39715 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sat, 9 Apr 2022 11:34:04 -0400 Subject: [PATCH 0108/2403] try reducing freq --- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index 74187899ef..d4debd6287 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -81,7 +81,7 @@ void board_init(void) { &pin_GPIO39, // DC &pin_GPIO7, // CS &pin_GPIO40, // RST - 40000000, // baudrate + 10000000, // baudrate 0, // polarity 0 // phase ); From e5a613ba136e3cee198ac22d916c659d51daa395 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sat, 9 Apr 2022 11:39:09 -0400 Subject: [PATCH 0109/2403] Revert "try reducing freq" This reverts commit a9713b773f9d832dce918a3107aa7a5deee39715. --- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index d4debd6287..74187899ef 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -81,7 +81,7 @@ void board_init(void) { &pin_GPIO39, // DC &pin_GPIO7, // CS &pin_GPIO40, // RST - 10000000, // baudrate + 40000000, // baudrate 0, // polarity 0 // phase ); From 16b81c855d0ad3e62e553a28e26a687e016d1787 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 9 Apr 2022 11:26:36 -0500 Subject: [PATCH 0110/2403] adding bitmap property to TileGrid --- locale/circuitpython.pot | 5 ++++ shared-bindings/displayio/TileGrid.c | 34 +++++++++++++++++++++++++++- shared-bindings/displayio/TileGrid.h | 3 +++ shared-module/displayio/TileGrid.c | 9 ++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index d7e14eabe5..3eb9b8d80b 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2717,6 +2717,11 @@ msgstr "" msgid "binary op %q not implemented" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "" +"bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap" +msgstr "" + #: shared-bindings/bitmaptools/__init__.c msgid "bitmap sizes must match" msgstr "" diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 2b2526cd84..255f989d3b 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -379,6 +379,37 @@ const mp_obj_property_t displayio_tilegrid_pixel_shader_obj = { MP_ROM_NONE}, }; +//| bitmap: Union[Bitmap,OnDiskBitmap,Shape] +//| """The bitmap of the tilegrid.""" +//| +STATIC mp_obj_t displayio_tilegrid_obj_get_bitmap(mp_obj_t self_in) { + displayio_tilegrid_t *self = native_tilegrid(self_in); + return common_hal_displayio_tilegrid_get_bitmap(self); +} +MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_bitmap_obj, displayio_tilegrid_obj_get_bitmap); + +STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) { + displayio_tilegrid_t *self = native_tilegrid(self_in); + if (!mp_obj_is_type(bitmap, &displayio_bitmap_type) && + !mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type) && + !mp_obj_is_type(bitmap, &displayio_shape_type)) { + + mp_raise_TypeError(translate("bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap")); + } + + common_hal_displayio_tilegrid_set_bitmap(self, bitmap); + + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_bitmap_obj, displayio_tilegrid_obj_set_bitmap); + +const mp_obj_property_t displayio_tilegrid_bitmap_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&displayio_tilegrid_get_bitmap_obj, + (mp_obj_t)&displayio_tilegrid_set_bitmap_obj, + MP_ROM_NONE}, +}; + //| def __getitem__(self, index: Union[Tuple[int, int], int]) -> int: //| """Returns the tile index at the given index. The index can either be an x,y tuple or an int equal //| to ``y * width + x``. @@ -454,7 +485,8 @@ STATIC const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_flip_x), MP_ROM_PTR(&displayio_tilegrid_flip_x_obj) }, { MP_ROM_QSTR(MP_QSTR_flip_y), MP_ROM_PTR(&displayio_tilegrid_flip_y_obj) }, { MP_ROM_QSTR(MP_QSTR_transpose_xy), MP_ROM_PTR(&displayio_tilegrid_transpose_xy_obj) }, - { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_tilegrid_pixel_shader_obj) }, + { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_tilegrid_pixel_shader_obj) }, + { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_tilegrid_bitmap_obj) }, }; STATIC MP_DEFINE_CONST_DICT(displayio_tilegrid_locals_dict, displayio_tilegrid_locals_dict_table); diff --git a/shared-bindings/displayio/TileGrid.h b/shared-bindings/displayio/TileGrid.h index 2cf0be501c..2c7941222f 100644 --- a/shared-bindings/displayio/TileGrid.h +++ b/shared-bindings/displayio/TileGrid.h @@ -45,6 +45,9 @@ void common_hal_displayio_tilegrid_set_y(displayio_tilegrid_t *self, mp_int_t y) mp_obj_t common_hal_displayio_tilegrid_get_pixel_shader(displayio_tilegrid_t *self); void common_hal_displayio_tilegrid_set_pixel_shader(displayio_tilegrid_t *self, mp_obj_t pixel_shader); +mp_obj_t common_hal_displayio_tilegrid_get_bitmap(displayio_tilegrid_t *self); +void common_hal_displayio_tilegrid_set_bitmap(displayio_tilegrid_t *self, mp_obj_t bitmap); + bool common_hal_displayio_tilegrid_get_flip_x(displayio_tilegrid_t *self); void common_hal_displayio_tilegrid_set_flip_x(displayio_tilegrid_t *self, bool flip_x); diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index fd0547c426..5c968c30e1 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -221,6 +221,15 @@ void common_hal_displayio_tilegrid_set_pixel_shader(displayio_tilegrid_t *self, self->full_change = true; } +mp_obj_t common_hal_displayio_tilegrid_get_bitmap(displayio_tilegrid_t *self) { + return self->bitmap; +} + +void common_hal_displayio_tilegrid_set_bitmap(displayio_tilegrid_t *self, mp_obj_t bitmap) { + self->bitmap = bitmap; + self->full_change = true; +} + uint16_t common_hal_displayio_tilegrid_get_width(displayio_tilegrid_t *self) { return self->width_in_tiles; } From 7ad5fa511eae6b3755114767fe314124ad3b2eef Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 9 Apr 2022 16:24:06 -0500 Subject: [PATCH 0111/2403] disable displayio for some boards --- ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk | 2 ++ .../atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk index 1a8cddfda7..4581079870 100644 --- a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk +++ b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD" LONGINT_IMPL = MPZ + +CIRCUITPY_DISPLAYIO = 0 diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index 4e7d799985..9cffe233a7 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ + +CIRCUITPY_DISPLAYIO = 0 diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index 70ece9b9fc..f86e0b1e80 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32FV" LONGINT_IMPL = MPZ + +CIRCUITPY_DISPLAYIO = 0 diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk index 1088ca1e8d..fd307b7b39 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" LONGINT_IMPL = MPZ + +CIRCUITPY_DISPLAYIO = 0 From c3cfbc12596f5a916323e36d9a514e2716dafe53 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 9 Apr 2022 22:03:16 -0400 Subject: [PATCH 0112/2403] Force pin 21 high; patch; need to diagnose further --- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index 74187899ef..46f1fbd31c 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -71,6 +71,12 @@ uint8_t display_init_sequence[] = { void board_init(void) { + // THIS SHOULD BE HANDLED BY espressif_board_reset_pin_number(), but it is not working. + // TEMPORARY FIX UNTIL IT'S DIAGNOSED. + common_hal_never_reset_pin(&pin_GPIO21); + gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(21, true); + busio_spi_obj_t *spi = common_hal_board_create_spi(0); displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus; bus->base.type = &displayio_fourwire_type; From ecf2f1c80c3df5c28b110dffa5203212041998b4 Mon Sep 17 00:00:00 2001 From: KurtE Date: Sun, 10 Apr 2022 05:39:43 -0700 Subject: [PATCH 0113/2403] Add to board object other Serial and I2c pin names While testing out this and the new MicroMod Teensy port, @mjs513 and myself found it desirable to have logical pin names for the different Serial UART objects. It is a lot easier and clearer to use and maintain to do something like: uart4 = busio.UART(board.TX4, board.RX4) than have to go look up the pin numbers for each board. --- ports/mimxrt10xx/boards/teensy40/pins.c | 172 ++++++++++-------- ports/mimxrt10xx/boards/teensy41/pins.c | 222 +++++++++++++----------- 2 files changed, 219 insertions(+), 175 deletions(-) diff --git a/ports/mimxrt10xx/boards/teensy40/pins.c b/ports/mimxrt10xx/boards/teensy40/pins.c index 2188c6c0e2..263603dcf3 100644 --- a/ports/mimxrt10xx/boards/teensy40/pins.c +++ b/ports/mimxrt10xx/boards/teensy40/pins.c @@ -6,111 +6,133 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // With USB on left. Bottom edge. - { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01)}, // Top edge - { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, // Back side - { MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_SD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_SD_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_SD_B0_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_SD_B0_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_SD_B0_04) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_04) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_SD_B0_05) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_05) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, - { 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_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)}, + + // other i2c ports defined + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + + // Serial Pins + {MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX4), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX4), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX5), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX5), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX6), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX6), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX8), MP_ROM_PTR(&pin_GPIO_B1_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX8), MP_ROM_PTR(&pin_GPIO_B1_12)}, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/mimxrt10xx/boards/teensy41/pins.c b/ports/mimxrt10xx/boards/teensy41/pins.c index 46604a933d..716772e27c 100644 --- a/ports/mimxrt10xx/boards/teensy41/pins.c +++ b/ports/mimxrt10xx/boards/teensy41/pins.c @@ -6,149 +6,171 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // With USB on left. Bottom edge. - { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_GPIO_AD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_GPIO_AD_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_B0_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B0_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_B0_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_B0_01)}, // Bottom Edge extended for 4.1 - { MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO_AD_B1_14)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO_AD_B1_15)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_GPIO_EMC_37)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_GPIO_EMC_36)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO_B0_12)}, // Top edge - { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA0), MP_ROM_PTR(&pin_GPIO_AD_B1_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL0), MP_ROM_PTR(&pin_GPIO_AD_B1_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO_AD_B1_08)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO_AD_B1_09)}, // Top edge extended for Teensy 4.1 - { MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_B1_13) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_B1_12) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_B1_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_B1_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_AD_B1_12) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_AD_B1_13) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO_AD_B1_04) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO_AD_B1_05) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO_EMC_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO_B1_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO_B1_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO_AD_B1_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO_AD_B1_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO_AD_B1_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO_AD_B1_05)}, // SD Card slot - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO_SD_B0_03) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT1), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO_SD_B0_03)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO_SD_B0_02) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT0), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO_SD_B0_02)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO_SD_B0_01) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO_SD_B0_01)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO_SD_B0_00) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO_SD_B0_00)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO_SD_B0_05) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT3), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO_SD_B0_05)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_D47), MP_ROM_PTR(&pin_GPIO_SD_B0_04) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_DAT2), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_D47), MP_ROM_PTR(&pin_GPIO_SD_B0_04)}, // Flash expansion spot and PSRAM expansion spot on a shared QSPI BUS - { MP_OBJ_NEW_QSTR(MP_QSTR_D48), MP_ROM_PTR(&pin_GPIO_EMC_24) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_PSRAM_CS), MP_ROM_PTR(&pin_GPIO_EMC_24) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D48), MP_ROM_PTR(&pin_GPIO_EMC_24)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_PSRAM_CS), MP_ROM_PTR(&pin_GPIO_EMC_24)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D49), MP_ROM_PTR(&pin_GPIO_EMC_27) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO1), MP_ROM_PTR(&pin_GPIO_EMC_27) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D49), MP_ROM_PTR(&pin_GPIO_EMC_27)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO1), MP_ROM_PTR(&pin_GPIO_EMC_27)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D50), MP_ROM_PTR(&pin_GPIO_EMC_28) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO2), MP_ROM_PTR(&pin_GPIO_EMC_28) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D50), MP_ROM_PTR(&pin_GPIO_EMC_28)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO2), MP_ROM_PTR(&pin_GPIO_EMC_28)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D51), MP_ROM_PTR(&pin_GPIO_EMC_22) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS), MP_ROM_PTR(&pin_GPIO_EMC_22) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D51), MP_ROM_PTR(&pin_GPIO_EMC_22)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS), MP_ROM_PTR(&pin_GPIO_EMC_22)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D52), MP_ROM_PTR(&pin_GPIO_EMC_26) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO0), MP_ROM_PTR(&pin_GPIO_EMC_26) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D52), MP_ROM_PTR(&pin_GPIO_EMC_26)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO0), MP_ROM_PTR(&pin_GPIO_EMC_26)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D53), MP_ROM_PTR(&pin_GPIO_EMC_25) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_CLK), MP_ROM_PTR(&pin_GPIO_EMC_25) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D53), MP_ROM_PTR(&pin_GPIO_EMC_25)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_CLK), MP_ROM_PTR(&pin_GPIO_EMC_25)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_D54), MP_ROM_PTR(&pin_GPIO_EMC_29) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO3), MP_ROM_PTR(&pin_GPIO_EMC_29) }, + {MP_OBJ_NEW_QSTR(MP_QSTR_D54), MP_ROM_PTR(&pin_GPIO_EMC_29)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_QSPI_IO3), MP_ROM_PTR(&pin_GPIO_EMC_29)}, // USB Host - { MP_ROM_QSTR(MP_QSTR_USB_HOST_POWER), MP_ROM_PTR(&pin_GPIO_EMC_40) }, - { MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG2_DP) }, - { MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG2_DN) }, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_POWER), MP_ROM_PTR(&pin_GPIO_EMC_40)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG2_DP)}, + {MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG2_DN)}, - { 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_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)}, + + // other i2c ports defined + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + + // Serial Pins + {MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO_B1_01)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO_B1_00)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_GPIO_AD_B1_03)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_GPIO_AD_B1_02)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX4), MP_ROM_PTR(&pin_GPIO_AD_B1_07)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX4), MP_ROM_PTR(&pin_GPIO_AD_B1_06)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX5), MP_ROM_PTR(&pin_GPIO_AD_B1_11)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX5), MP_ROM_PTR(&pin_GPIO_AD_B1_10)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX6), MP_ROM_PTR(&pin_GPIO_AD_B0_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX6), MP_ROM_PTR(&pin_GPIO_AD_B0_12)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX7), MP_ROM_PTR(&pin_GPIO_EMC_32)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX7), MP_ROM_PTR(&pin_GPIO_EMC_31)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_RX8), MP_ROM_PTR(&pin_GPIO_B1_13)}, + {MP_OBJ_NEW_QSTR(MP_QSTR_TX8), MP_ROM_PTR(&pin_GPIO_B1_12)}, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 948040f1f0bd941047a19269f30ecc863e4a2bea Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 10 Apr 2022 10:00:37 -0500 Subject: [PATCH 0114/2403] disable onewire instead of displayio on boards without room --- ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk | 2 +- ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk | 2 +- .../atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk | 2 +- ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk index 4581079870..f0857ce6d2 100644 --- a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk +++ b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk @@ -10,4 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD" LONGINT_IMPL = MPZ -CIRCUITPY_DISPLAYIO = 0 +CIRCUITPY_ONEWIREIO = 0 diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index 9cffe233a7..1914c85990 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -10,4 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ -CIRCUITPY_DISPLAYIO = 0 +CIRCUITPY_ONEWIREIO = 0 diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index f86e0b1e80..7b97822bda 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -10,4 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32FV" LONGINT_IMPL = MPZ -CIRCUITPY_DISPLAYIO = 0 +CIRCUITPY_ONEWIREIO = 0 diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk index fd307b7b39..d65be3f800 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk @@ -10,4 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_DISPLAYIO = 0 +CIRCUITPY_ONEWIREIO = 0 From cea55cde9f0335c1fe57c698e5d2a6d781f6353a Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 10 Apr 2022 11:13:42 -0500 Subject: [PATCH 0115/2403] enforce bitmap and tile_size in set_bitmap --- shared-bindings/displayio/TileGrid.c | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 255f989d3b..46b09a6a53 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -137,12 +137,52 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_ return MP_OBJ_FROM_PTR(self); } + // Helper to ensure we have the native super class instead of a subclass. static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { mp_obj_t native_tilegrid = mp_obj_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type); mp_obj_assert_native_inited(native_tilegrid); return MP_OBJ_TO_PTR(native_tilegrid); } + +static void enforce_bitmap_size(mp_obj_t self_in, mp_obj_t bitmap) { + displayio_tilegrid_t *self = native_tilegrid(self_in); + uint16_t bitmap_width; + uint16_t bitmap_height; + mp_obj_t native = mp_obj_cast_to_native_base(bitmap, &displayio_shape_type); + if (native != MP_OBJ_NULL) { + displayio_shape_t *bmp = MP_OBJ_TO_PTR(native); + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else if (mp_obj_is_type(bitmap, &displayio_bitmap_type)) { + displayio_bitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); + native = bitmap; + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else if (mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type)) { + displayio_ondiskbitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); + native = bitmap; + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else { + mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_bitmap); + } + uint16_t tile_width = self->tile_width; + if (tile_width == 0) { + tile_width = bitmap_width; + } + uint16_t tile_height = self->tile_height; + if (tile_height == 0) { + tile_height = bitmap_height; + } + if (bitmap_width % tile_width != 0) { + mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); + } + if (bitmap_height % tile_height != 0) { + mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); + } +} + //| hidden: bool //| """True when the TileGrid is hidden. This may be False even when a part of a hidden Group.""" //| @@ -397,6 +437,14 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bit mp_raise_TypeError(translate("bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap")); } + /*if (bitmap->width % self->tile_width != 0) { + mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); + } + if (bitmap->height % self->tile_height != 0) { + mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); + }*/ + enforce_bitmap_size(self_in, bitmap); + common_hal_displayio_tilegrid_set_bitmap(self, bitmap); return mp_const_none; From 01cff3c4f8e7f43b84eba74213549a1f3be17f4a Mon Sep 17 00:00:00 2001 From: BigTuna94 Date: Sun, 10 Apr 2022 14:10:07 -0400 Subject: [PATCH 0116/2403] add MIDI to frozen libs --- ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk index 65fc82f7ff..6614b75fe3 100644 --- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk @@ -14,3 +14,4 @@ CIRCUITPY__EVE = 1 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_MIDI From f95a68a37c1c969df8eb2d30e69bf9d09eca014d Mon Sep 17 00:00:00 2001 From: KurtE Date: Sun, 10 Apr 2022 16:56:51 -0700 Subject: [PATCH 0117/2403] Rename the board name Renamed the board both name of directory within boards, but also the name reported board name: board_id -- sparkfun_teensy_micromod Adafruit CircuitPython 7.3.0-beta.0-10-g2a3eb49da-dirty on 2022-04-10; SparkFun Teensy MicroMod Processor with IMXRT1062DVL6A --- .../boards/{teensyMM => sparkfun_teensy_micromod}/board.c | 0 .../boards/{teensyMM => sparkfun_teensy_micromod}/board.ld | 0 .../{teensyMM => sparkfun_teensy_micromod}/flash_config.c | 0 .../{teensyMM => sparkfun_teensy_micromod}/mpconfigboard.h | 2 +- .../{teensyMM => sparkfun_teensy_micromod}/mpconfigboard.mk | 0 .../boards/{teensyMM => sparkfun_teensy_micromod}/pins.c | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/board.c (100%) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/board.ld (100%) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/flash_config.c (100%) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/mpconfigboard.h (90%) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/mpconfigboard.mk (100%) rename ports/mimxrt10xx/boards/{teensyMM => sparkfun_teensy_micromod}/pins.c (100%) diff --git a/ports/mimxrt10xx/boards/teensyMM/board.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c similarity index 100% rename from ports/mimxrt10xx/boards/teensyMM/board.c rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c diff --git a/ports/mimxrt10xx/boards/teensyMM/board.ld b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.ld similarity index 100% rename from ports/mimxrt10xx/boards/teensyMM/board.ld rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.ld diff --git a/ports/mimxrt10xx/boards/teensyMM/flash_config.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c similarity index 100% rename from ports/mimxrt10xx/boards/teensyMM/flash_config.c rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h similarity index 90% rename from ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h index ac9fa5ae14..e768578b03 100644 --- a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Teensy MM" +#define MICROPY_HW_BOARD_NAME "SparkFun Teensy MicroMod Processor" #define MICROPY_HW_MCU_NAME "IMXRT1062DVL6A" // If you change this, then make sure to update the linker scripts as well to diff --git a/ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk similarity index 100% rename from ports/mimxrt10xx/boards/teensyMM/mpconfigboard.mk rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk diff --git a/ports/mimxrt10xx/boards/teensyMM/pins.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c similarity index 100% rename from ports/mimxrt10xx/boards/teensyMM/pins.c rename to ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c From 71a7ec6f76aecdf92b11770cc4ca2214dc873597 Mon Sep 17 00:00:00 2001 From: Xu Hao Date: Tue, 12 Apr 2022 16:10:02 +0800 Subject: [PATCH 0118/2403] Add ELECFREAKS Pico:ed board. --- .../boards/elecfreaks_picoed/board.c | 40 +++++++++++++ .../boards/elecfreaks_picoed/mpconfigboard.h | 2 + .../boards/elecfreaks_picoed/mpconfigboard.mk | 11 ++++ .../elecfreaks_picoed/pico-sdk-configboard.h | 1 + .../boards/elecfreaks_picoed/pins.c | 56 +++++++++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 ports/raspberrypi/boards/elecfreaks_picoed/board.c create mode 100644 ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/elecfreaks_picoed/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/elecfreaks_picoed/pins.c diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/board.c b/ports/raspberrypi/boards/elecfreaks_picoed/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/elecfreaks_picoed/board.c @@ -0,0 +1,40 @@ +/* + * 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 "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h new file mode 100644 index 0000000000..0a73b3d73b --- /dev/null +++ b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "ELECFREAKS PICO:ED" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk new file mode 100644 index 0000000000..e7da543143 --- /dev/null +++ b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x239A +USB_PID = 0x80F6 +USB_PRODUCT = "Pico:ed" +USB_MANUFACTURER = "ELECFREAKS" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/pico-sdk-configboard.h b/ports/raspberrypi/boards/elecfreaks_picoed/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/elecfreaks_picoed/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/pins.c b/ports/raspberrypi/boards/elecfreaks_picoed/pins.c new file mode 100644 index 0000000000..4542b58672 --- /dev/null +++ b/ports/raspberrypi/boards/elecfreaks_picoed/pins.c @@ -0,0 +1,56 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BUZZER_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_I2C0_SDA), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_I2C0_SCL), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_BUZZER_GP3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_P4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_P5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_P6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_P7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_P8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_P9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_P10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_P11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_P12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_P13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_P14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_P15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_P16), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_P20), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_P19), MP_ROM_PTR(&pin_GPIO19) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_P0_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_P0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_P1_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_P1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_P2_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_P2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_P3_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_P3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 8cce2e640681fbc9d2e6e9ac9d32e030ca870551 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Tue, 12 Apr 2022 15:20:28 +0100 Subject: [PATCH 0119/2403] Updated motor pin names --- .../boards/pimoroni_motor2040/pins.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c index a590dcd24a..6f3f7cd50c 100644 --- a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c @@ -3,24 +3,24 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - { MP_ROM_QSTR(MP_QSTR_MOTOR_1P), MP_ROM_PTR(&pin_GPIO4) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_1N), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_2P), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_2N), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_3P), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_3N), MP_ROM_PTR(&pin_GPIO9) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_4P), MP_ROM_PTR(&pin_GPIO10) }, - { MP_ROM_QSTR(MP_QSTR_MOTOR_4N), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_A_P), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_A_N), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_B_P), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_B_N), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_C_P), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_C_N), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_D_P), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_MOTOR_D_N), MP_ROM_PTR(&pin_GPIO11) }, { MP_ROM_QSTR(MP_QSTR_NUM_MOTORS), MP_ROM_INT(4) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_1A), MP_ROM_PTR(&pin_GPIO0) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_1B), MP_ROM_PTR(&pin_GPIO1) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_2A), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_2B), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_3A), MP_ROM_PTR(&pin_GPIO12) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_3B), MP_ROM_PTR(&pin_GPIO13) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_4A), MP_ROM_PTR(&pin_GPIO14) }, - { MP_ROM_QSTR(MP_QSTR_ENCODER_4B), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_A_A), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_A_B), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_B_A), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_B_B), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_C_A), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_C_B), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_D_A), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_ENCODER_D_B), MP_ROM_PTR(&pin_GPIO15) }, { MP_ROM_QSTR(MP_QSTR_NUM_ENCODERS), MP_ROM_INT(4) }, { MP_ROM_QSTR(MP_QSTR_TX_TRIG), MP_ROM_PTR(&pin_GPIO16) }, @@ -56,10 +56,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SHARED_ADC), MP_ROM_PTR(&pin_GPIO29) }, - { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_1_ADDR), MP_ROM_INT(0b000) }, - { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_2_ADDR), MP_ROM_INT(0b001) }, - { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_3_ADDR), MP_ROM_INT(0b010) }, - { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_4_ADDR), MP_ROM_INT(0b011) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_A_ADDR), MP_ROM_INT(0b000) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_B_ADDR), MP_ROM_INT(0b001) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_C_ADDR), MP_ROM_INT(0b010) }, + { MP_ROM_QSTR(MP_QSTR_CURRENT_SENSE_D_ADDR), MP_ROM_INT(0b011) }, { MP_ROM_QSTR(MP_QSTR_VOLTAGE_SENSE_ADDR), MP_ROM_INT(0b100) }, { MP_ROM_QSTR(MP_QSTR_FAULT_SENSE_ADDR), MP_ROM_INT(0b101) }, { MP_ROM_QSTR(MP_QSTR_SENSOR_1_ADDR), MP_ROM_INT(0b110) }, From 60e330fb0ddcb24fccf505e6ffb4645587fa0dbd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Apr 2022 09:47:55 -0400 Subject: [PATCH 0120/2403] Added Settable Clock for MIMXRT BOARDS --- .../sparkfun_teensy_micromod/mpconfigboard.h | 2 + .../boards/teensy40/mpconfigboard.h | 2 + .../boards/teensy41/mpconfigboard.h | 2 + .../common-hal/microcontroller/Processor.c | 11 +- .../common-hal/microcontroller/Processor.h | 2 + .../mimxrt10xx/MIMXRT1062/clocks.c | 245 ++++++++++++++++++ .../peripherals/mimxrt10xx/clocks.h | 1 + shared-bindings/microcontroller/Processor.c | 35 ++- shared-bindings/microcontroller/Processor.h | 3 +- 9 files changed, 300 insertions(+), 3 deletions(-) diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h index e768578b03..93de3bc81d 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h @@ -19,3 +19,5 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 + +#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file diff --git a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h index 718d9b9673..ca00f880f5 100644 --- a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h @@ -16,3 +16,5 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03) #define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02) + +#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file diff --git a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h index 4ba34692c6..ef35d2d026 100644 --- a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h @@ -19,3 +19,5 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 + +#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c index 697d97ca43..4df9a1f702 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c @@ -25,6 +25,8 @@ * THE SOFTWARE. */ +//https://raw.githubusercontent.com/adafruit/circuitpython/main/ports/mimxrt10xx/common-hal/microcontroller/Processor.c + #include #include "common-hal/microcontroller/Processor.h" @@ -50,6 +52,13 @@ float common_hal_mcu_processor_get_temperature(void) { return temp; } +uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, + uint32_t frequency) { + SystemCoreClock = setarmclock(frequency); + return SystemCoreClock; +} + + float common_hal_mcu_processor_get_voltage(void) { return NAN; } @@ -75,4 +84,4 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) { return RESET_REASON_UNKNOWN; -} +} \ No newline at end of file diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h index 43b0ec878c..46f34ea566 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h @@ -31,10 +31,12 @@ #define COMMON_HAL_MCU_PROCESSOR_UID_LENGTH 16 #include "py/obj.h" +#include "clocks.h" typedef struct { mp_obj_base_t base; // Stores no state currently. + uint32_t frequency; } mcu_processor_obj_t; #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c index 46d1eccb20..cae074e774 100644 --- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c +++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c @@ -34,6 +34,7 @@ #include "fsl_clock.h" #include "fsl_iomuxc.h" +#include "fsl_device_registers.h" #include "clocks.h" @@ -335,3 +336,247 @@ void clocks_init(void) { CLOCK_EnableClock(kCLOCK_Iomuxc); } + +/* clockspeed.c + * http://www.pjrc.com/teensy/ + * Copyright (c) 2017 PJRC.COM, LLC + * + * 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 setarmclock is a port from Teensyduino for the Teensy 4.x written by Paul Stroffgren, +// A brief explanation of F_CPU_ACTUAL vs F_CPU +// https://forum.pjrc.com/threads/57236?p=212642&viewfull=1#post212642 +volatile uint32_t F_CPU_ACTUAL = 396000000; +volatile uint32_t F_BUS_ACTUAL = 132000000; + +// Define these to increase the voltage when attempting overclocking +// The frequency step is how quickly to increase voltage per frequency +// The datasheet says 1600 is the absolute maximum voltage. The hardware +// can actually create up to 1575. But 1300 is the recommended limit. +// (earlier versions of the datasheet said 1300 was the absolute max) +#define OVERCLOCK_STEPSIZE 28000000 +#define OVERCLOCK_MAX_VOLT 1575 + +#define DCDC_REG3 0x40080012 +#define DCDC_REG0 0x40080000 +#define DCDC_REG0_STS_DC_OK_L ((uint32_t)(1<<31)) +#define CCM_ANALOG_PLL_USB1_ENABLE_L ((uint32_t)(1<<13)) +#define CCM_ANALOG_PLL_USB1_POWER_L ((uint32_t)(1<<12)) +#define CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L ((uint32_t)(1<<6)) +#define CCM_ANALOG_PLL_USB1_LOCK_L ((uint32_t)(1<<31)) +#define CCM_CCGR6_DCDC(n) ((uint32_t)(((n) & 0x03) << 6)) +#define CCM_ANALOG_PLL_ARM_LOCK_L ((uint32_t)(1<<31)) +#define CCM_ANALOG_PLL_ARM_BYPASS_L ((uint32_t)(1<<16)) +#define CCM_ANALOG_PLL_ARM_ENABLE_L ((uint32_t)(1<<13)) +#define CCM_ANALOG_PLL_ARM_POWERDOWN_L ((uint32_t)(1<<12)) +#define CCM_CDHIPR_ARM_PODF_BUSY_L ((uint32_t)(1<<16)) +#define CCM_CDHIPR_AHB_PODF_BUSY_L ((uint32_t)(1<<1)) +#define CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L ((uint32_t)(1<<5)) +#define CCM_CBCDR_PERIPH_CLK_SEL_L ((uint32_t)(1<<25)) +#define CCM_CCGR_OFF 0 +#define CCM_CCGR_ON_RUNONLY 1 +#define CCM_CCGR_ON 3 + +/* Teensyduino Core Library - clockspeed.c + * http://www.pjrc.com/teensy/ + * Copyright (c) 2017 PJRC.COM, LLC. + * + * 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: + * + * 1. The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * 2. If the Software is incorporated into a build system that allows + * selection among a list of target devices, then similar target + * devices manufactured by PJRC.COM must be included in the list of + * target devices and selectable in the same manner. + * + * 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. + */ + +//uint32_t set_arm_clock(uint32_t frequency); + +// stuff needing wait handshake: +// CCM_CACRR ARM_PODF +// CCM_CBCDR PERIPH_CLK_SEL +// CCM_CBCMR PERIPH2_CLK_SEL +// CCM_CBCDR AHB_PODF +// CCM_CBCDR SEMC_PODF + +uint32_t setarmclock(uint32_t frequency) +{ + uint32_t cbcdr = CCM->CBCDR; // pg 1021 + uint32_t cbcmr = CCM->CBCMR; // pg 1023 + uint32_t dcdc = DCDC->REG3; + + // compute required voltage + uint32_t voltage = 1150; // default = 1.15V + if (frequency > 528000000) { + voltage = 1250; // 1.25V +#if defined(OVERCLOCK_STEPSIZE) && defined(OVERCLOCK_MAX_VOLT) + if (frequency > 600000000) { + voltage += ((frequency - 600000000) / OVERCLOCK_STEPSIZE) * 25; + if (voltage > OVERCLOCK_MAX_VOLT) voltage = OVERCLOCK_MAX_VOLT; + } +#endif + } else if (frequency <= 24000000) { + voltage = 950; // 0.95 + } + + // if voltage needs to increase, do it before switch clock speed + CCM->CCGR6 |= CCM_CCGR6_DCDC(CCM_CCGR_ON); + if ((dcdc & ((uint32_t)(0x1F << 0))) < ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { + //printf("Increasing voltage to %u mV\n", voltage); + dcdc &= ~((uint32_t)(0x1F << 0)); + dcdc |= ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0); + DCDC->REG3 = dcdc; + while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) ; // wait voltage settling + } + + if (!(cbcdr & CCM_CBCDR_PERIPH_CLK_SEL_L)) { + //printf("need to switch to alternate clock during reconfigure of ARM PLL\n"); + const uint32_t need1s = CCM_ANALOG_PLL_USB1_ENABLE_L | CCM_ANALOG_PLL_USB1_POWER_L | + CCM_ANALOG_PLL_USB1_LOCK_L | CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L; + uint32_t sel, div; + if ((CCM_ANALOG->PLL_USB1 & need1s) == need1s) { + //printf("USB PLL is running, so we can use 120 MHz\n"); + sel = 0; + div = 3; // divide down to 120 MHz, so IPG is ok even if IPG_PODF=0 + } else { + //printf("USB PLL is off, use 24 MHz crystal\n"); + sel = 1; + div = 0; + } + if ((cbcdr & ((uint32_t)(0x07 << 27))) != CCM_CBCDR_PERIPH_CLK2_PODF(div)) { + // PERIPH_CLK2 divider needs to be changed + cbcdr &= ~((uint32_t)(0x07 << 27)); + cbcdr |= CCM_CBCDR_PERIPH_CLK2_PODF(div); + CCM->CBCDR = cbcdr; + } + if ((cbcmr & ((uint32_t)(0x03 << 12))) != CCM_CBCMR_PERIPH_CLK2_SEL(sel)) { + // PERIPH_CLK2 source select needs to be changed + cbcmr &= ~((uint32_t)(0x03 << 12)); + cbcmr |= CCM_CBCMR_PERIPH_CLK2_SEL(sel); + CCM->CBCMR = cbcmr; + while (CCM->CDHIPR & ((uint32_t)(1<<3))) ; // wait + } + // switch over to PERIPH_CLK2 + cbcdr |= ((uint32_t)(1<<25)); + CCM->CBCDR = cbcdr; + while (CCM->CDHIPR & ((uint32_t)(1<<5))) ; // wait + } else { + //printf("already running from PERIPH_CLK2, safe to mess with ARM PLL\n"); + } + + // TODO: check if PLL2 running, can 352, 396 or 528 can work? (no need for ARM PLL) + + // DIV_SELECT: 54-108 = official range 648 to 1296 in 12 MHz steps + uint32_t div_arm = 1; + uint32_t div_ahb = 1; + while (frequency * div_arm * div_ahb < 648000000) { + if (div_arm < 8) { + div_arm = div_arm + 1; + } else { + if (div_ahb < 5) { + div_ahb = div_ahb + 1; + div_arm = 1; + } else { + break; + } + } + } + uint32_t mult = (frequency * div_arm * div_ahb + 6000000) / 12000000; + if (mult > 108) mult = 108; + if (mult < 54) mult = 54; + //printf("Freq: 12 MHz * %u / %u / %u\n", mult, div_arm, div_ahb); + frequency = mult * 12000000 / div_arm / div_ahb; + + //printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); + const uint32_t arm_pll_mask = CCM_ANALOG_PLL_ARM_LOCK_L | CCM_ANALOG_PLL_ARM_BYPASS_L | + CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_POWERDOWN_L | + CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK; + if ((CCM_ANALOG->PLL_ARM & arm_pll_mask) != (CCM_ANALOG_PLL_ARM_LOCK_L + | CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult))) { + //printf("ARM PLL needs reconfigure\n"); + CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_POWERDOWN_L; + // TODO: delay needed? + CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_ENABLE_L + | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult); + while (!(CCM_ANALOG->PLL_ARM & CCM_ANALOG_PLL_ARM_LOCK_L)) ; // wait for lock + //printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); + } else { + //printf("ARM PLL already running at required frequency\n"); + } + + if ((CCM->CACRR & ((uint32_t)(0x07 << 0))) != (div_arm - 1)) { + CCM->CACRR = CCM_CACRR_ARM_PODF(div_arm - 1); + while (CCM->CDHIPR & CCM_CDHIPR_ARM_PODF_BUSY_L) ; // wait + } + + if ((cbcdr & ((uint32_t)(0x07 << 10))) != CCM_CBCDR_AHB_PODF(div_ahb - 1)) { + cbcdr &= ~((uint32_t)(0x07 << 10)); + cbcdr |= CCM_CBCDR_AHB_PODF(div_ahb - 1); + CCM->CBCDR = cbcdr; + while (CCM->CDHIPR & CCM_CDHIPR_AHB_PODF_BUSY_L); // wait + } + + uint32_t div_ipg = (frequency + 149999999) / 150000000; + if (div_ipg > 4) div_ipg = 4; + if ((cbcdr & ((uint32_t)(0x03 << 8))) != (CCM_CBCDR_IPG_PODF(div_ipg - 1))) { + cbcdr &= ~((uint32_t)(0x03 << 8)); + cbcdr |= CCM_CBCDR_IPG_PODF(div_ipg - 1); + // TODO: how to safely change IPG_PODF ?? + CCM->CBCDR = cbcdr; + } + + //cbcdr &= ~CCM_CBCDR_PERIPH_CLK_SEL; + //CCM_CBCDR = cbcdr; // why does this not work at 24 MHz? + CCM->CBCDR &= ~((uint32_t)(1<<25)); + while (CCM->CDHIPR & CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L) ; // wait + + F_CPU_ACTUAL = frequency; + F_BUS_ACTUAL = frequency / div_ipg; + //scale_cpu_cycles_to_microseconds = 0xFFFFFFFFu / (uint32_t)(frequency / 1000000u); + + //printf("New Frequency: ARM=%u, IPG=%u\n", frequency, frequency / div_ipg); + + // if voltage needs to decrease, do it after switch clock speed + if ((dcdc & ((uint32_t)(0x1F << 0))) > ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { + //printf("Decreasing voltage to %u mV\n", voltage); + dcdc &= ~((uint32_t)(0x1F << 0)); + dcdc |= ((uint32_t)(0x1F << 0)); + DCDC->REG3 = dcdc; + while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) ; // wait voltage settling + } + + return frequency; +} \ No newline at end of file diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h index ccbba2edd4..6551fcd043 100644 --- a/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h +++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h @@ -27,3 +27,4 @@ extern uint32_t SystemCoreClock; void clocks_init(void); +uint32_t setarmclock(uint32_t frequency); \ No newline at end of file diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index dfcafcd324..6015a45935 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -30,9 +30,20 @@ #include #include -#include "py/objproperty.h" +//#include "py/objproperty.h" +//#include "py/runtime.h" + +#include "shared-bindings/util.h" + +#include "shared/runtime/buffer_helper.h" +#include "shared/runtime/context_manager_helpers.h" +#include "py/mperrno.h" +#include "py/objtype.h" +#include "py/objproperty.h" #include "py/runtime.h" +#include "supervisor/shared/translate.h" + //| class Processor: //| """Microcontroller CPU information and control @@ -61,6 +72,27 @@ //| frequency: int //| """The CPU operating frequency in Hertz. (read-only)""" //| + +STATIC mp_obj_t mcu_processor_set_sys_clock(mp_obj_t self_in, mp_obj_t freq) { + mcu_processor_obj_t *self = MP_OBJ_TO_PTR(self_in); + #if defined(HAS_SETTABLE_CLOCK) + uint32_t value_of_freq = MP_OBJ_SMALL_INT_VALUE(freq); + common_hal_mcu_processor_set_sys_clock(self, value_of_freq); + #else + mp_raise_msg(&mp_type_NotImplementedError,translate("Settable Clock Not Implemented for Your Board")); + #endif + return mp_const_none; +} + +MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_sys_clock_obj, mcu_processor_set_sys_clock); + +const mp_obj_property_t mcu_processor_freq_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&mcu_processor_set_sys_clock_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; + STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { return mp_obj_new_int_from_uint(common_hal_mcu_processor_get_frequency()); } @@ -157,6 +189,7 @@ STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_temperature), MP_ROM_PTR(&mcu_processor_temperature_obj) }, { MP_ROM_QSTR(MP_QSTR_uid), MP_ROM_PTR(&mcu_processor_uid_obj) }, { MP_ROM_QSTR(MP_QSTR_voltage), MP_ROM_PTR(&mcu_processor_voltage_obj) }, + { MP_ROM_QSTR(MP_QSTR_setfrequency), MP_ROM_PTR(&mcu_processor_set_sys_clock_obj) }, }; STATIC MP_DEFINE_CONST_DICT(mcu_processor_locals_dict, mcu_processor_locals_dict_table); diff --git a/shared-bindings/microcontroller/Processor.h b/shared-bindings/microcontroller/Processor.h index 98d4790876..86b6ce4624 100644 --- a/shared-bindings/microcontroller/Processor.h +++ b/shared-bindings/microcontroller/Processor.h @@ -38,6 +38,7 @@ uint32_t common_hal_mcu_processor_get_frequency(void); mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void); float common_hal_mcu_processor_get_temperature(void); void common_hal_mcu_processor_get_uid(uint8_t raw_id[]); -float common_hal_mcu_processor_get_voltage(void); +float common_hal_mcu_processor_get_voltage(void); +uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, uint32_t frequency); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PROCESSOR_H From 716497c132efcff55c064ae088746e53f98c14ff Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Apr 2022 12:04:28 -0400 Subject: [PATCH 0121/2403] corrected pre-commit errors --- locale/circuitpython.pot | 6 +- .../sparkfun_teensy_micromod/mpconfigboard.h | 2 +- .../boards/teensy40/mpconfigboard.h | 2 +- .../boards/teensy41/mpconfigboard.h | 2 +- .../common-hal/microcontroller/Processor.c | 6 +- .../common-hal/microcontroller/Processor.h | 2 +- .../mimxrt10xx/MIMXRT1062/clocks.c | 335 ++++++++++-------- .../peripherals/mimxrt10xx/clocks.h | 2 +- shared-bindings/microcontroller/Processor.c | 20 +- shared-bindings/microcontroller/Processor.h | 2 +- 10 files changed, 203 insertions(+), 176 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index d7e14eabe5..6c5cc6737e 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2149,6 +2149,10 @@ msgstr "" msgid "Set pin count must be between 1 and 5" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "Settable Clock Not Implemented for Your Board" +msgstr "" + #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Side set pin count must be between 1 and 5" msgstr "" @@ -3019,7 +3023,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h index 93de3bc81d..816b148e5f 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h @@ -20,4 +20,4 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 -#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file +#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h index ca00f880f5..c7fa1f2650 100644 --- a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h @@ -17,4 +17,4 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03) #define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02) -#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file +#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h index ef35d2d026..63c3e8e032 100644 --- a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h @@ -20,4 +20,4 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 -#define HAS_SETTABLE_CLOCK 1 \ No newline at end of file +#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c index 4df9a1f702..eee5559e09 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -//https://raw.githubusercontent.com/adafruit/circuitpython/main/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +// https://raw.githubusercontent.com/adafruit/circuitpython/main/ports/mimxrt10xx/common-hal/microcontroller/Processor.c #include @@ -54,7 +54,7 @@ float common_hal_mcu_processor_get_temperature(void) { uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, uint32_t frequency) { - SystemCoreClock = setarmclock(frequency); + SystemCoreClock = setarmclock(frequency); return SystemCoreClock; } @@ -84,4 +84,4 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) { return RESET_REASON_UNKNOWN; -} \ No newline at end of file +} diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h index 46f34ea566..2e18aacfde 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h @@ -36,7 +36,7 @@ typedef struct { mp_obj_base_t base; // Stores no state currently. - uint32_t frequency; + uint32_t frequency; } mcu_processor_obj_t; #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c index cae074e774..72d8990071 100644 --- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c +++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c @@ -359,7 +359,7 @@ void clocks_init(void) { * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -//Note setarmclock is a port from Teensyduino for the Teensy 4.x written by Paul Stroffgren, +// Note setarmclock is a port from Teensyduino for the Teensy 4.x written by Paul Stroffgren, // A brief explanation of F_CPU_ACTUAL vs F_CPU // https://forum.pjrc.com/threads/57236?p=212642&viewfull=1#post212642 volatile uint32_t F_CPU_ACTUAL = 396000000; @@ -373,25 +373,25 @@ volatile uint32_t F_BUS_ACTUAL = 132000000; #define OVERCLOCK_STEPSIZE 28000000 #define OVERCLOCK_MAX_VOLT 1575 -#define DCDC_REG3 0x40080012 -#define DCDC_REG0 0x40080000 -#define DCDC_REG0_STS_DC_OK_L ((uint32_t)(1<<31)) -#define CCM_ANALOG_PLL_USB1_ENABLE_L ((uint32_t)(1<<13)) -#define CCM_ANALOG_PLL_USB1_POWER_L ((uint32_t)(1<<12)) -#define CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L ((uint32_t)(1<<6)) -#define CCM_ANALOG_PLL_USB1_LOCK_L ((uint32_t)(1<<31)) -#define CCM_CCGR6_DCDC(n) ((uint32_t)(((n) & 0x03) << 6)) -#define CCM_ANALOG_PLL_ARM_LOCK_L ((uint32_t)(1<<31)) -#define CCM_ANALOG_PLL_ARM_BYPASS_L ((uint32_t)(1<<16)) -#define CCM_ANALOG_PLL_ARM_ENABLE_L ((uint32_t)(1<<13)) -#define CCM_ANALOG_PLL_ARM_POWERDOWN_L ((uint32_t)(1<<12)) -#define CCM_CDHIPR_ARM_PODF_BUSY_L ((uint32_t)(1<<16)) -#define CCM_CDHIPR_AHB_PODF_BUSY_L ((uint32_t)(1<<1)) -#define CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L ((uint32_t)(1<<5)) -#define CCM_CBCDR_PERIPH_CLK_SEL_L ((uint32_t)(1<<25)) -#define CCM_CCGR_OFF 0 -#define CCM_CCGR_ON_RUNONLY 1 -#define CCM_CCGR_ON 3 +#define DCDC_REG3 0x40080012 +#define DCDC_REG0 0x40080000 +#define DCDC_REG0_STS_DC_OK_L ((uint32_t)(1 << 31)) +#define CCM_ANALOG_PLL_USB1_ENABLE_L ((uint32_t)(1 << 13)) +#define CCM_ANALOG_PLL_USB1_POWER_L ((uint32_t)(1 << 12)) +#define CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L ((uint32_t)(1 << 6)) +#define CCM_ANALOG_PLL_USB1_LOCK_L ((uint32_t)(1 << 31)) +#define CCM_CCGR6_DCDC(n) ((uint32_t)(((n) & 0x03) << 6)) +#define CCM_ANALOG_PLL_ARM_LOCK_L ((uint32_t)(1 << 31)) +#define CCM_ANALOG_PLL_ARM_BYPASS_L ((uint32_t)(1 << 16)) +#define CCM_ANALOG_PLL_ARM_ENABLE_L ((uint32_t)(1 << 13)) +#define CCM_ANALOG_PLL_ARM_POWERDOWN_L ((uint32_t)(1 << 12)) +#define CCM_CDHIPR_ARM_PODF_BUSY_L ((uint32_t)(1 << 16)) +#define CCM_CDHIPR_AHB_PODF_BUSY_L ((uint32_t)(1 << 1)) +#define CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L ((uint32_t)(1 << 5)) +#define CCM_CBCDR_PERIPH_CLK_SEL_L ((uint32_t)(1 << 25)) +#define CCM_CCGR_OFF 0 +#define CCM_CCGR_ON_RUNONLY 1 +#define CCM_CCGR_ON 3 /* Teensyduino Core Library - clockspeed.c * http://www.pjrc.com/teensy/ @@ -423,7 +423,7 @@ volatile uint32_t F_BUS_ACTUAL = 132000000; * SOFTWARE. */ -//uint32_t set_arm_clock(uint32_t frequency); +// uint32_t set_arm_clock(uint32_t frequency); // stuff needing wait handshake: // CCM_CACRR ARM_PODF @@ -432,151 +432,174 @@ volatile uint32_t F_BUS_ACTUAL = 132000000; // CCM_CBCDR AHB_PODF // CCM_CBCDR SEMC_PODF -uint32_t setarmclock(uint32_t frequency) -{ - uint32_t cbcdr = CCM->CBCDR; // pg 1021 - uint32_t cbcmr = CCM->CBCMR; // pg 1023 - uint32_t dcdc = DCDC->REG3; +uint32_t setarmclock(uint32_t frequency) { + uint32_t cbcdr = CCM->CBCDR; // pg 1021 + uint32_t cbcmr = CCM->CBCMR; // pg 1023 + uint32_t dcdc = DCDC->REG3; - // compute required voltage - uint32_t voltage = 1150; // default = 1.15V - if (frequency > 528000000) { - voltage = 1250; // 1.25V -#if defined(OVERCLOCK_STEPSIZE) && defined(OVERCLOCK_MAX_VOLT) - if (frequency > 600000000) { - voltage += ((frequency - 600000000) / OVERCLOCK_STEPSIZE) * 25; - if (voltage > OVERCLOCK_MAX_VOLT) voltage = OVERCLOCK_MAX_VOLT; - } -#endif - } else if (frequency <= 24000000) { - voltage = 950; // 0.95 - } + // compute required voltage + uint32_t voltage = 1150; // default = 1.15V + if (frequency > 528000000) { + voltage = 1250; // 1.25V + #if defined(OVERCLOCK_STEPSIZE) && defined(OVERCLOCK_MAX_VOLT) + if (frequency > 600000000) { + voltage += ((frequency - 600000000) / OVERCLOCK_STEPSIZE) * 25; + if (voltage > OVERCLOCK_MAX_VOLT) { + voltage = OVERCLOCK_MAX_VOLT; + } + } + #endif + } else if (frequency <= 24000000) { + voltage = 950; // 0.95 + } - // if voltage needs to increase, do it before switch clock speed - CCM->CCGR6 |= CCM_CCGR6_DCDC(CCM_CCGR_ON); - if ((dcdc & ((uint32_t)(0x1F << 0))) < ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { - //printf("Increasing voltage to %u mV\n", voltage); - dcdc &= ~((uint32_t)(0x1F << 0)); - dcdc |= ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0); - DCDC->REG3 = dcdc; - while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) ; // wait voltage settling - } + // if voltage needs to increase, do it before switch clock speed + CCM->CCGR6 |= CCM_CCGR6_DCDC(CCM_CCGR_ON); + if ((dcdc & ((uint32_t)(0x1F << 0))) < ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { + // printf("Increasing voltage to %u mV\n", voltage); + dcdc &= ~((uint32_t)(0x1F << 0)); + dcdc |= ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0); + DCDC->REG3 = dcdc; + while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) { + ; // wait voltage settling + } + } - if (!(cbcdr & CCM_CBCDR_PERIPH_CLK_SEL_L)) { - //printf("need to switch to alternate clock during reconfigure of ARM PLL\n"); - const uint32_t need1s = CCM_ANALOG_PLL_USB1_ENABLE_L | CCM_ANALOG_PLL_USB1_POWER_L | - CCM_ANALOG_PLL_USB1_LOCK_L | CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L; - uint32_t sel, div; - if ((CCM_ANALOG->PLL_USB1 & need1s) == need1s) { - //printf("USB PLL is running, so we can use 120 MHz\n"); - sel = 0; - div = 3; // divide down to 120 MHz, so IPG is ok even if IPG_PODF=0 - } else { - //printf("USB PLL is off, use 24 MHz crystal\n"); - sel = 1; - div = 0; - } - if ((cbcdr & ((uint32_t)(0x07 << 27))) != CCM_CBCDR_PERIPH_CLK2_PODF(div)) { - // PERIPH_CLK2 divider needs to be changed - cbcdr &= ~((uint32_t)(0x07 << 27)); - cbcdr |= CCM_CBCDR_PERIPH_CLK2_PODF(div); - CCM->CBCDR = cbcdr; - } - if ((cbcmr & ((uint32_t)(0x03 << 12))) != CCM_CBCMR_PERIPH_CLK2_SEL(sel)) { - // PERIPH_CLK2 source select needs to be changed - cbcmr &= ~((uint32_t)(0x03 << 12)); - cbcmr |= CCM_CBCMR_PERIPH_CLK2_SEL(sel); - CCM->CBCMR = cbcmr; - while (CCM->CDHIPR & ((uint32_t)(1<<3))) ; // wait - } - // switch over to PERIPH_CLK2 - cbcdr |= ((uint32_t)(1<<25)); - CCM->CBCDR = cbcdr; - while (CCM->CDHIPR & ((uint32_t)(1<<5))) ; // wait - } else { - //printf("already running from PERIPH_CLK2, safe to mess with ARM PLL\n"); - } + if (!(cbcdr & CCM_CBCDR_PERIPH_CLK_SEL_L)) { + // printf("need to switch to alternate clock during reconfigure of ARM PLL\n"); + const uint32_t need1s = CCM_ANALOG_PLL_USB1_ENABLE_L | CCM_ANALOG_PLL_USB1_POWER_L | + CCM_ANALOG_PLL_USB1_LOCK_L | CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L; + uint32_t sel, div; + if ((CCM_ANALOG->PLL_USB1 & need1s) == need1s) { + // printf("USB PLL is running, so we can use 120 MHz\n"); + sel = 0; + div = 3; // divide down to 120 MHz, so IPG is ok even if IPG_PODF=0 + } else { + // printf("USB PLL is off, use 24 MHz crystal\n"); + sel = 1; + div = 0; + } + if ((cbcdr & ((uint32_t)(0x07 << 27))) != CCM_CBCDR_PERIPH_CLK2_PODF(div)) { + // PERIPH_CLK2 divider needs to be changed + cbcdr &= ~((uint32_t)(0x07 << 27)); + cbcdr |= CCM_CBCDR_PERIPH_CLK2_PODF(div); + CCM->CBCDR = cbcdr; + } + if ((cbcmr & ((uint32_t)(0x03 << 12))) != CCM_CBCMR_PERIPH_CLK2_SEL(sel)) { + // PERIPH_CLK2 source select needs to be changed + cbcmr &= ~((uint32_t)(0x03 << 12)); + cbcmr |= CCM_CBCMR_PERIPH_CLK2_SEL(sel); + CCM->CBCMR = cbcmr; + while (CCM->CDHIPR & ((uint32_t)(1 << 3))) { + ; // wait + } + } + // switch over to PERIPH_CLK2 + cbcdr |= ((uint32_t)(1 << 25)); + CCM->CBCDR = cbcdr; + while (CCM->CDHIPR & ((uint32_t)(1 << 5))) { + ; // wait + } + } else { + // printf("already running from PERIPH_CLK2, safe to mess with ARM PLL\n"); + } - // TODO: check if PLL2 running, can 352, 396 or 528 can work? (no need for ARM PLL) + // TODO: check if PLL2 running, can 352, 396 or 528 can work? (no need for ARM PLL) - // DIV_SELECT: 54-108 = official range 648 to 1296 in 12 MHz steps - uint32_t div_arm = 1; - uint32_t div_ahb = 1; - while (frequency * div_arm * div_ahb < 648000000) { - if (div_arm < 8) { - div_arm = div_arm + 1; - } else { - if (div_ahb < 5) { - div_ahb = div_ahb + 1; - div_arm = 1; - } else { - break; - } - } - } - uint32_t mult = (frequency * div_arm * div_ahb + 6000000) / 12000000; - if (mult > 108) mult = 108; - if (mult < 54) mult = 54; - //printf("Freq: 12 MHz * %u / %u / %u\n", mult, div_arm, div_ahb); - frequency = mult * 12000000 / div_arm / div_ahb; + // DIV_SELECT: 54-108 = official range 648 to 1296 in 12 MHz steps + uint32_t div_arm = 1; + uint32_t div_ahb = 1; + while (frequency * div_arm * div_ahb < 648000000) { + if (div_arm < 8) { + div_arm = div_arm + 1; + } else { + if (div_ahb < 5) { + div_ahb = div_ahb + 1; + div_arm = 1; + } else { + break; + } + } + } + uint32_t mult = (frequency * div_arm * div_ahb + 6000000) / 12000000; + if (mult > 108) { + mult = 108; + } + if (mult < 54) { + mult = 54; + } + // printf("Freq: 12 MHz * %u / %u / %u\n", mult, div_arm, div_ahb); + frequency = mult * 12000000 / div_arm / div_ahb; - //printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); - const uint32_t arm_pll_mask = CCM_ANALOG_PLL_ARM_LOCK_L | CCM_ANALOG_PLL_ARM_BYPASS_L | - CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_POWERDOWN_L | - CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK; - if ((CCM_ANALOG->PLL_ARM & arm_pll_mask) != (CCM_ANALOG_PLL_ARM_LOCK_L - | CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult))) { - //printf("ARM PLL needs reconfigure\n"); - CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_POWERDOWN_L; - // TODO: delay needed? - CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_ENABLE_L - | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult); - while (!(CCM_ANALOG->PLL_ARM & CCM_ANALOG_PLL_ARM_LOCK_L)) ; // wait for lock - //printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); - } else { - //printf("ARM PLL already running at required frequency\n"); - } + // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); + const uint32_t arm_pll_mask = CCM_ANALOG_PLL_ARM_LOCK_L | CCM_ANALOG_PLL_ARM_BYPASS_L | + CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_POWERDOWN_L | + CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK; + if ((CCM_ANALOG->PLL_ARM & arm_pll_mask) != (CCM_ANALOG_PLL_ARM_LOCK_L + | CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult))) { + // printf("ARM PLL needs reconfigure\n"); + CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_POWERDOWN_L; + // TODO: delay needed? + CCM_ANALOG->PLL_ARM = CCM_ANALOG_PLL_ARM_ENABLE_L + | CCM_ANALOG_PLL_ARM_DIV_SELECT(mult); + while (!(CCM_ANALOG->PLL_ARM & CCM_ANALOG_PLL_ARM_LOCK_L)) { + ; // wait for lock + } + // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); + } else { + // printf("ARM PLL already running at required frequency\n"); + } - if ((CCM->CACRR & ((uint32_t)(0x07 << 0))) != (div_arm - 1)) { - CCM->CACRR = CCM_CACRR_ARM_PODF(div_arm - 1); - while (CCM->CDHIPR & CCM_CDHIPR_ARM_PODF_BUSY_L) ; // wait - } + if ((CCM->CACRR & ((uint32_t)(0x07 << 0))) != (div_arm - 1)) { + CCM->CACRR = CCM_CACRR_ARM_PODF(div_arm - 1); + while (CCM->CDHIPR & CCM_CDHIPR_ARM_PODF_BUSY_L) { + ; // wait + } + } - if ((cbcdr & ((uint32_t)(0x07 << 10))) != CCM_CBCDR_AHB_PODF(div_ahb - 1)) { - cbcdr &= ~((uint32_t)(0x07 << 10)); - cbcdr |= CCM_CBCDR_AHB_PODF(div_ahb - 1); - CCM->CBCDR = cbcdr; - while (CCM->CDHIPR & CCM_CDHIPR_AHB_PODF_BUSY_L); // wait - } + if ((cbcdr & ((uint32_t)(0x07 << 10))) != CCM_CBCDR_AHB_PODF(div_ahb - 1)) { + cbcdr &= ~((uint32_t)(0x07 << 10)); + cbcdr |= CCM_CBCDR_AHB_PODF(div_ahb - 1); + CCM->CBCDR = cbcdr; + while (CCM->CDHIPR & CCM_CDHIPR_AHB_PODF_BUSY_L) { + ; // wait + } + } - uint32_t div_ipg = (frequency + 149999999) / 150000000; - if (div_ipg > 4) div_ipg = 4; - if ((cbcdr & ((uint32_t)(0x03 << 8))) != (CCM_CBCDR_IPG_PODF(div_ipg - 1))) { - cbcdr &= ~((uint32_t)(0x03 << 8)); - cbcdr |= CCM_CBCDR_IPG_PODF(div_ipg - 1); - // TODO: how to safely change IPG_PODF ?? - CCM->CBCDR = cbcdr; - } + uint32_t div_ipg = (frequency + 149999999) / 150000000; + if (div_ipg > 4) { + div_ipg = 4; + } + if ((cbcdr & ((uint32_t)(0x03 << 8))) != (CCM_CBCDR_IPG_PODF(div_ipg - 1))) { + cbcdr &= ~((uint32_t)(0x03 << 8)); + cbcdr |= CCM_CBCDR_IPG_PODF(div_ipg - 1); + // TODO: how to safely change IPG_PODF ?? + CCM->CBCDR = cbcdr; + } - //cbcdr &= ~CCM_CBCDR_PERIPH_CLK_SEL; - //CCM_CBCDR = cbcdr; // why does this not work at 24 MHz? - CCM->CBCDR &= ~((uint32_t)(1<<25)); - while (CCM->CDHIPR & CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L) ; // wait + // cbcdr &= ~CCM_CBCDR_PERIPH_CLK_SEL; + // CCM_CBCDR = cbcdr; // why does this not work at 24 MHz? + CCM->CBCDR &= ~((uint32_t)(1 << 25)); + while (CCM->CDHIPR & CCM_CDHIPR_PERIPH_CLK_SEL_BUSY_L) { + ; // wait - F_CPU_ACTUAL = frequency; - F_BUS_ACTUAL = frequency / div_ipg; - //scale_cpu_cycles_to_microseconds = 0xFFFFFFFFu / (uint32_t)(frequency / 1000000u); + } + F_CPU_ACTUAL = frequency; + F_BUS_ACTUAL = frequency / div_ipg; + // scale_cpu_cycles_to_microseconds = 0xFFFFFFFFu / (uint32_t)(frequency / 1000000u); - //printf("New Frequency: ARM=%u, IPG=%u\n", frequency, frequency / div_ipg); + // printf("New Frequency: ARM=%u, IPG=%u\n", frequency, frequency / div_ipg); - // if voltage needs to decrease, do it after switch clock speed - if ((dcdc & ((uint32_t)(0x1F << 0))) > ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { - //printf("Decreasing voltage to %u mV\n", voltage); - dcdc &= ~((uint32_t)(0x1F << 0)); - dcdc |= ((uint32_t)(0x1F << 0)); - DCDC->REG3 = dcdc; - while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) ; // wait voltage settling - } - - return frequency; -} \ No newline at end of file + // if voltage needs to decrease, do it after switch clock speed + if ((dcdc & ((uint32_t)(0x1F << 0))) > ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { + // printf("Decreasing voltage to %u mV\n", voltage); + dcdc &= ~((uint32_t)(0x1F << 0)); + dcdc |= ((uint32_t)(0x1F << 0)); + DCDC->REG3 = dcdc; + while (!(DCDC->REG0 & DCDC_REG0_STS_DC_OK_L)) { + ; // wait voltage settling + } + } + + return frequency; +} diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h index 6551fcd043..54f0e37b8f 100644 --- a/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h +++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/clocks.h @@ -27,4 +27,4 @@ extern uint32_t SystemCoreClock; void clocks_init(void); -uint32_t setarmclock(uint32_t frequency); \ No newline at end of file +uint32_t setarmclock(uint32_t frequency); diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index 6015a45935..11708d64f9 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -30,9 +30,9 @@ #include #include -//#include "py/objproperty.h" +// #include "py/objproperty.h" -//#include "py/runtime.h" +// #include "py/runtime.h" #include "shared-bindings/util.h" @@ -75,12 +75,12 @@ STATIC mp_obj_t mcu_processor_set_sys_clock(mp_obj_t self_in, mp_obj_t freq) { mcu_processor_obj_t *self = MP_OBJ_TO_PTR(self_in); - #if defined(HAS_SETTABLE_CLOCK) - uint32_t value_of_freq = MP_OBJ_SMALL_INT_VALUE(freq); - common_hal_mcu_processor_set_sys_clock(self, value_of_freq); - #else - mp_raise_msg(&mp_type_NotImplementedError,translate("Settable Clock Not Implemented for Your Board")); - #endif + #if defined(HAS_SETTABLE_CLOCK) + uint32_t value_of_freq = MP_OBJ_SMALL_INT_VALUE(freq); + common_hal_mcu_processor_set_sys_clock(self, value_of_freq); + #else + mp_raise_msg(&mp_type_NotImplementedError,translate("Settable Clock Not Implemented for Your Board")); + #endif return mp_const_none; } @@ -89,7 +89,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_sys_clock_obj, mcu_processor_set_sys const mp_obj_property_t mcu_processor_freq_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&mcu_processor_set_sys_clock_obj, - MP_ROM_NONE, + MP_ROM_NONE, MP_ROM_NONE}, }; @@ -189,7 +189,7 @@ STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_temperature), MP_ROM_PTR(&mcu_processor_temperature_obj) }, { MP_ROM_QSTR(MP_QSTR_uid), MP_ROM_PTR(&mcu_processor_uid_obj) }, { MP_ROM_QSTR(MP_QSTR_voltage), MP_ROM_PTR(&mcu_processor_voltage_obj) }, - { MP_ROM_QSTR(MP_QSTR_setfrequency), MP_ROM_PTR(&mcu_processor_set_sys_clock_obj) }, + { MP_ROM_QSTR(MP_QSTR_setfrequency), MP_ROM_PTR(&mcu_processor_set_sys_clock_obj) }, }; STATIC MP_DEFINE_CONST_DICT(mcu_processor_locals_dict, mcu_processor_locals_dict_table); diff --git a/shared-bindings/microcontroller/Processor.h b/shared-bindings/microcontroller/Processor.h index 86b6ce4624..07b1759c06 100644 --- a/shared-bindings/microcontroller/Processor.h +++ b/shared-bindings/microcontroller/Processor.h @@ -38,7 +38,7 @@ uint32_t common_hal_mcu_processor_get_frequency(void); mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void); float common_hal_mcu_processor_get_temperature(void); void common_hal_mcu_processor_get_uid(uint8_t raw_id[]); -float common_hal_mcu_processor_get_voltage(void); +float common_hal_mcu_processor_get_voltage(void); uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, uint32_t frequency); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PROCESSOR_H From 7a30176b4982865358d9d240afabec4cf8414b8f Mon Sep 17 00:00:00 2001 From: mjs513 Date: Wed, 13 Apr 2022 13:44:22 -0400 Subject: [PATCH 0122/2403] Fix Build Errors for Other Boards --- shared-bindings/microcontroller/Processor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index 11708d64f9..c89ecfb790 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -73,8 +73,7 @@ //| """The CPU operating frequency in Hertz. (read-only)""" //| -STATIC mp_obj_t mcu_processor_set_sys_clock(mp_obj_t self_in, mp_obj_t freq) { - mcu_processor_obj_t *self = MP_OBJ_TO_PTR(self_in); +STATIC mp_obj_t mcu_processor_set_sys_clock(mp_obj_t self, mp_obj_t freq) { #if defined(HAS_SETTABLE_CLOCK) uint32_t value_of_freq = MP_OBJ_SMALL_INT_VALUE(freq); common_hal_mcu_processor_set_sys_clock(self, value_of_freq); From b30d2e0889fb39d2e20b46b187d6fa24f84be60c Mon Sep 17 00:00:00 2001 From: ViktorWiz <54257433+ViktorWiz@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:35:23 +0900 Subject: [PATCH 0123/2403] update w5100s-evb-pico mpconfigboard.h --- .../boards/wiznet_w5100s_evb_pico/mpconfigboard.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h index 111b292c8e..6265e9dd58 100644 --- a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h @@ -1,2 +1,9 @@ #define MICROPY_HW_BOARD_NAME "W5100S-EVB-Pico" #define MICROPY_HW_MCU_NAME "rp2040" + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO1) +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) \ No newline at end of file From 9c1b44a03050fb61641ee082868e74d2ee2cdf2b Mon Sep 17 00:00:00 2001 From: Xu Hao Date: Thu, 14 Apr 2022 17:42:04 +0800 Subject: [PATCH 0124/2403] Modify USB VID and PID of the Pico:ed --- ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk index e7da543143..42200ac8c7 100644 --- a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk +++ b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk @@ -1,5 +1,5 @@ -USB_VID = 0x239A -USB_PID = 0x80F6 +USB_VID = 0x2E8A +USB_PID = 0x1026 USB_PRODUCT = "Pico:ed" USB_MANUFACTURER = "ELECFREAKS" From fd41c1ac5b4b6f53a2f5f3bf02afb8cad4bb68cc Mon Sep 17 00:00:00 2001 From: mjs513 Date: Thu, 14 Apr 2022 06:45:16 -0400 Subject: [PATCH 0125/2403] Update based on PR Comments --- locale/circuitpython.pot | 4 ++++ .../sparkfun_teensy_micromod/mpconfigboard.h | 2 -- .../sparkfun_teensy_micromod/mpconfigboard.mk | 1 + .../boards/teensy40/mpconfigboard.h | 2 -- .../boards/teensy40/mpconfigboard.mk | 1 + .../boards/teensy41/mpconfigboard.h | 2 -- .../boards/teensy41/mpconfigboard.mk | 1 + .../common-hal/microcontroller/Processor.c | 9 ++++++--- .../common-hal/microcontroller/Processor.h | 1 - .../mimxrt10xx/MIMXRT1062/clocks.c | 15 +-------------- py/circuitpy_mpconfig.mk | 3 +++ shared-bindings/microcontroller/Processor.c | 19 ++++++------------- shared-bindings/microcontroller/Processor.h | 2 +- 13 files changed, 24 insertions(+), 38 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 6c5cc6737e..d0bb7a4067 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1107,6 +1107,10 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "Frequency Out of Range Must be between 24Mhz and 1.008Ghz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h index 816b148e5f..e768578b03 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h @@ -19,5 +19,3 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 - -#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk index 2eefba15f0..3705bc6fb6 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk @@ -8,3 +8,4 @@ CHIP_FAMILY = MIMXRT1062 FLASH = W25Q128JV CIRCUITPY__EVE = 1 CIRCUITPY_USB_HOST = 1 +CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1 diff --git a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h index c7fa1f2650..718d9b9673 100644 --- a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.h @@ -16,5 +16,3 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03) #define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02) - -#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.mk index 3a73245403..9cb1e636b6 100644 --- a/ports/mimxrt10xx/boards/teensy40/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/teensy40/mpconfigboard.mk @@ -7,3 +7,4 @@ CHIP_VARIANT = MIMXRT1062DVJ6A CHIP_FAMILY = MIMXRT1062 FLASH = W25Q16JV CIRCUITPY__EVE = 1 +CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1 diff --git a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h index 63c3e8e032..4ba34692c6 100644 --- a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.h @@ -19,5 +19,3 @@ #define CIRCUITPY_USB_DEVICE_INSTANCE 0 #define CIRCUITPY_USB_HOST_INSTANCE 1 - -#define HAS_SETTABLE_CLOCK 1 diff --git a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.mk b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.mk index 9f214a22a2..7d16b797c5 100644 --- a/ports/mimxrt10xx/boards/teensy41/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/teensy41/mpconfigboard.mk @@ -8,3 +8,4 @@ CHIP_FAMILY = MIMXRT1062 FLASH = W25Q64JV CIRCUITPY__EVE = 1 CIRCUITPY_USB_HOST = 1 +CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1 diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c index eee5559e09..ac76c88330 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c @@ -25,10 +25,10 @@ * THE SOFTWARE. */ -// https://raw.githubusercontent.com/adafruit/circuitpython/main/ports/mimxrt10xx/common-hal/microcontroller/Processor.c - #include +#include "py/runtime.h" + #include "common-hal/microcontroller/Processor.h" #include "shared-bindings/microcontroller/Processor.h" #include "shared-bindings/microcontroller/ResetReason.h" @@ -52,8 +52,11 @@ float common_hal_mcu_processor_get_temperature(void) { return temp; } -uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, +uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency) { + if (frequency < 24000000 || frequency > 1008000000) { + mp_raise_ValueError(translate("Frequency Out of Range Must be between 24Mhz and 1.008Ghz")); + } SystemCoreClock = setarmclock(frequency); return SystemCoreClock; } diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h index 2e18aacfde..2f7ff88697 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.h +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.h @@ -35,7 +35,6 @@ typedef struct { mp_obj_base_t base; - // Stores no state currently. uint32_t frequency; } mcu_processor_obj_t; diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c index 72d8990071..0eb879053b 100644 --- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c +++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c @@ -456,7 +456,6 @@ uint32_t setarmclock(uint32_t frequency) { // if voltage needs to increase, do it before switch clock speed CCM->CCGR6 |= CCM_CCGR6_DCDC(CCM_CCGR_ON); if ((dcdc & ((uint32_t)(0x1F << 0))) < ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { - // printf("Increasing voltage to %u mV\n", voltage); dcdc &= ~((uint32_t)(0x1F << 0)); dcdc |= ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0); DCDC->REG3 = dcdc; @@ -466,16 +465,13 @@ uint32_t setarmclock(uint32_t frequency) { } if (!(cbcdr & CCM_CBCDR_PERIPH_CLK_SEL_L)) { - // printf("need to switch to alternate clock during reconfigure of ARM PLL\n"); const uint32_t need1s = CCM_ANALOG_PLL_USB1_ENABLE_L | CCM_ANALOG_PLL_USB1_POWER_L | CCM_ANALOG_PLL_USB1_LOCK_L | CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L; uint32_t sel, div; if ((CCM_ANALOG->PLL_USB1 & need1s) == need1s) { - // printf("USB PLL is running, so we can use 120 MHz\n"); sel = 0; div = 3; // divide down to 120 MHz, so IPG is ok even if IPG_PODF=0 } else { - // printf("USB PLL is off, use 24 MHz crystal\n"); sel = 1; div = 0; } @@ -500,8 +496,6 @@ uint32_t setarmclock(uint32_t frequency) { while (CCM->CDHIPR & ((uint32_t)(1 << 5))) { ; // wait } - } else { - // printf("already running from PERIPH_CLK2, safe to mess with ARM PLL\n"); } // TODO: check if PLL2 running, can 352, 396 or 528 can work? (no need for ARM PLL) @@ -528,10 +522,9 @@ uint32_t setarmclock(uint32_t frequency) { if (mult < 54) { mult = 54; } - // printf("Freq: 12 MHz * %u / %u / %u\n", mult, div_arm, div_ahb); + frequency = mult * 12000000 / div_arm / div_ahb; - // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); const uint32_t arm_pll_mask = CCM_ANALOG_PLL_ARM_LOCK_L | CCM_ANALOG_PLL_ARM_BYPASS_L | CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_POWERDOWN_L | CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK; @@ -545,9 +538,6 @@ uint32_t setarmclock(uint32_t frequency) { while (!(CCM_ANALOG->PLL_ARM & CCM_ANALOG_PLL_ARM_LOCK_L)) { ; // wait for lock } - // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM); - } else { - // printf("ARM PLL already running at required frequency\n"); } if ((CCM->CACRR & ((uint32_t)(0x07 << 0))) != (div_arm - 1)) { @@ -588,11 +578,8 @@ uint32_t setarmclock(uint32_t frequency) { F_BUS_ACTUAL = frequency / div_ipg; // scale_cpu_cycles_to_microseconds = 0xFFFFFFFFu / (uint32_t)(frequency / 1000000u); - // printf("New Frequency: ARM=%u, IPG=%u\n", frequency, frequency / div_ipg); - // if voltage needs to decrease, do it after switch clock speed if ((dcdc & ((uint32_t)(0x1F << 0))) > ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) { - // printf("Decreasing voltage to %u mV\n", voltage); dcdc &= ~((uint32_t)(0x1F << 0)); dcdc |= ((uint32_t)(0x1F << 0)); DCDC->REG3 = dcdc; diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 081048181e..cc228956bc 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -347,6 +347,9 @@ CFLAGS += -DCIRCUITPY_SDIOIO=$(CIRCUITPY_SDIOIO) CIRCUITPY_SERIAL_BLE ?= 0 CFLAGS += -DCIRCUITPY_SERIAL_BLE=$(CIRCUITPY_SERIAL_BLE) +CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY?= 0 +CFLAGS += -DCIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY=$(CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY) + CIRCUITPY_SHARPDISPLAY ?= $(CIRCUITPY_FRAMEBUFFERIO) CFLAGS += -DCIRCUITPY_SHARPDISPLAY=$(CIRCUITPY_SHARPDISPLAY) diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index c89ecfb790..df9d5a9df9 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -73,24 +73,18 @@ //| """The CPU operating frequency in Hertz. (read-only)""" //| -STATIC mp_obj_t mcu_processor_set_sys_clock(mp_obj_t self, mp_obj_t freq) { - #if defined(HAS_SETTABLE_CLOCK) - uint32_t value_of_freq = MP_OBJ_SMALL_INT_VALUE(freq); - common_hal_mcu_processor_set_sys_clock(self, value_of_freq); +STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) { + #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY + uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency); + common_hal_mcu_processor_set_frequency(self, value_of_freq); #else mp_raise_msg(&mp_type_NotImplementedError,translate("Settable Clock Not Implemented for Your Board")); #endif return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_sys_clock_obj, mcu_processor_set_sys_clock); +MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_frequency_obj, mcu_processor_set_frequency); -const mp_obj_property_t mcu_processor_freq_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_set_sys_clock_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { return mp_obj_new_int_from_uint(common_hal_mcu_processor_get_frequency()); @@ -101,7 +95,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_frequency_obj, mcu_processor_get_fre const mp_obj_property_t mcu_processor_frequency_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&mcu_processor_get_frequency_obj, // getter - MP_ROM_NONE, // no setter + (mp_obj_t)&mcu_processor_set_frequency_obj, // setter MP_ROM_NONE, // no deleter }, }; @@ -188,7 +182,6 @@ STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_temperature), MP_ROM_PTR(&mcu_processor_temperature_obj) }, { MP_ROM_QSTR(MP_QSTR_uid), MP_ROM_PTR(&mcu_processor_uid_obj) }, { MP_ROM_QSTR(MP_QSTR_voltage), MP_ROM_PTR(&mcu_processor_voltage_obj) }, - { MP_ROM_QSTR(MP_QSTR_setfrequency), MP_ROM_PTR(&mcu_processor_set_sys_clock_obj) }, }; STATIC MP_DEFINE_CONST_DICT(mcu_processor_locals_dict, mcu_processor_locals_dict_table); diff --git a/shared-bindings/microcontroller/Processor.h b/shared-bindings/microcontroller/Processor.h index 07b1759c06..9a2f22b245 100644 --- a/shared-bindings/microcontroller/Processor.h +++ b/shared-bindings/microcontroller/Processor.h @@ -39,6 +39,6 @@ mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void); float common_hal_mcu_processor_get_temperature(void); void common_hal_mcu_processor_get_uid(uint8_t raw_id[]); float common_hal_mcu_processor_get_voltage(void); -uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self, uint32_t frequency); +uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PROCESSOR_H From 3c111ba338f82fff557742c38ba9932c6764318b Mon Sep 17 00:00:00 2001 From: Neradoc Date: Fri, 8 Apr 2022 00:28:59 +0200 Subject: [PATCH 0126/2403] fix the keypad doc --- shared-bindings/keypad/Event.c | 4 ++-- shared-bindings/keypad/EventQueue.c | 2 +- shared-bindings/keypad/KeyMatrix.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c index fda44d3521..591a330bba 100644 --- a/shared-bindings/keypad/Event.c +++ b/shared-bindings/keypad/Event.c @@ -36,7 +36,7 @@ //| def __init__(self, key_number: int=0, pressed: bool=True, timestamp:Optional[int]=None) -> None: //| """Create a key transition event, which reports a key-pressed or key-released transition. //| -//| :param int key_number: the key number +//| :param int key_number: The key number. //| :param bool pressed: ``True`` if the key was pressed; ``False`` if it was released. //| :param int timestamp: The time in milliseconds that the keypress occurred in the `supervisor.ticks_ms` time system. If specified as None, the current value of `supervisor.ticks_ms` is used. //| """ @@ -120,7 +120,7 @@ const mp_obj_property_t keypad_event_released_obj = { }; //| timestamp: int -//| """The timestamp""" +//| """The timestamp.""" //| STATIC mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c index 2cb449551b..41dc292ba6 100644 --- a/shared-bindings/keypad/EventQueue.c +++ b/shared-bindings/keypad/EventQueue.c @@ -45,7 +45,7 @@ //| 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` +//| :return: The next queued key transition `Event`. //| :rtype: Optional[Event] //| """ //| ... diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c index 87836ac174..9e65471a2b 100644 --- a/shared-bindings/keypad/KeyMatrix.c +++ b/shared-bindings/keypad/KeyMatrix.c @@ -157,7 +157,7 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) { //| """ //| -//| def key_number_to_row_column(self, row: int, column: int) -> Tuple[int]: +//| def key_number_to_row_column(self, key_number: 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)``. From 0b6c451fdf8eb59fecb4f6f51c24371b6a684ef5 Mon Sep 17 00:00:00 2001 From: mjs513 Date: Sat, 16 Apr 2022 11:01:50 -0400 Subject: [PATCH 0127/2403] Add Overclocking Warnings to Processor.c --- ports/mimxrt10xx/common-hal/microcontroller/Processor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c index ac76c88330..96f1185b3b 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c @@ -57,6 +57,15 @@ uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, if (frequency < 24000000 || frequency > 1008000000) { mp_raise_ValueError(translate("Frequency Out of Range Must be between 24Mhz and 1.008Ghz")); } + if (frequency <= 600000000) { + mp_printf(&mp_plat_print, "System Clock is set to %d hz\n", frequency); + } + if (frequency > 600000000) { + mp_printf(&mp_plat_print, "System Clock is set to %d hz and is Overclocked\n", frequency); + } + if (frequency > 816000000) { + mp_printf(&mp_plat_print, "System Clock is set to %d hz and is Overclocked, Cooling Required!\n", frequency); + } SystemCoreClock = setarmclock(frequency); return SystemCoreClock; } From 02a0939d2e53d242fd0d5ac1dd4e337428f41ba8 Mon Sep 17 00:00:00 2001 From: KurtE Date: Sat, 16 Apr 2022 09:00:45 -0700 Subject: [PATCH 0128/2403] Fix PWM Support for the MIMXRT boards There were two main issues with the PWM support. The first is they would fail to work properly if the board goes into low power mode, when you do things like: time.sleep(0.25) Can make partially work with this by turning on the proper flags in each of the FlexPWMTimer Timers/sub-timers, but this did not appear to work if for example you have both A and B channels enabled. Second main problem is that the code did not work with the X channel of each timer/sub-timer. It looks like someone had earlier started support for this, But was not sufficient. Needed to bypass the SDK code and get it closer to the PJRC code. That is we set the PWM_CTRL_FULL_MASK, which then uses base->SM[submodule].VAL1 to control when the timer is reset, so it sets up your cycle/frequency. But then this implies that X channel which uses 0, 1 has to be handled specially. So for the different channels: A - Uses VAL2 to turn on (0) and VAL3=duty to turn off B - Uses VAL4 to turn on (0) and VAL5 to turn off X - As mentioned above VAL1 turns off, but its set to the timing for freqency. so VAL0 turns on, so we set it to VAL1 - duty --- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 117 +++++++++++++++++++-- ports/mimxrt10xx/supervisor/port.c | 11 ++ 2 files changed, 117 insertions(+), 11 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index 8eb3251bf3..3575349bfa 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -38,6 +38,10 @@ #include "supervisor/shared/translate.h" #include "periph.h" +// Debug print support set to none zero to enable debug printing +#define ENABLE_DEBUG_PRINTING 0 + + static void config_periph_pin(const mcu_pwm_obj_t *periph) { IOMUXC_SetPinMux( periph->pin->mux_reg, periph->mux_mode, @@ -83,6 +87,32 @@ static int calculate_pulse_count(uint32_t frequency, uint8_t *prescaler) { return 0; } +// ========================================================== +// Debug code +// ========================================================== +#if ENABLE_DEBUG_PRINTING +#define DBGPrintf mp_printf +extern void debug_print_flexpwm_registers(PWM_Type *base); + +void debug_print_flexpwm_registers(PWM_Type *base) { + mp_printf(&mp_plat_print, + "\t\tPWM OUTEN:%x MASK:%x SWCOUT:%x DTSRCSEL:%x MCTRL:%x MCTRL2:%x FCTRL:%x FSTS:%x FFILT:%x FTST:%x FCTRL2:%x\n", + base->OUTEN, base->MASK, base->SWCOUT, base->DTSRCSEL, base->MCTRL, base->MCTRL2, base->FCTRL, + base->FSTS, base->FFILT, base->FTST, base->FCTRL2); + for (uint8_t i = 0; i < 4; i++) { + mp_printf(&mp_plat_print, + "\t\t(%u) INIT:%x CTRL2:%x CTRL:%x VAL0:%x VAL1:%x VAL2:%x VAL3:%x VAL4:%x VAL5:%x OCTRL:%x DTCNT0:%x DTCNT1:%x\n", i, + base->SM[i].INIT, base->SM[i].CTRL2, base->SM[i].CTRL, base->SM[i].VAL0, base->SM[i].VAL1, base->SM[i].VAL2, + base->SM[i].VAL3, base->SM[i].VAL4, base->SM[i].VAL5, base->SM[i].OCTRL, base->SM[i].DTCNT0, base->SM[i].DTCNT1); + } + +} +#else +#define DBGPrintf(p,...) +inline void debug_print_flexpwm_registers(PWM_Type *base) { +} +#endif + pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, const mcu_pin_obj_t *pin, uint16_t duty, @@ -93,6 +123,9 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, const uint32_t pwm_count = sizeof(mcu_pwm_list) / sizeof(mcu_pwm_obj_t); + DBGPrintf(&mp_plat_print, ">>> common_hal_pwmio_pwmout_construct called: pin: %p %u freq:%u duty:%u var:%u\n", + self->pin->gpio, self->pin->number, frequency, duty, variable_frequency); + for (uint32_t i = 0; i < pwm_count; ++i) { if (mcu_pwm_list[i].pin != pin) { continue; @@ -107,6 +140,8 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, return PWMOUT_INVALID_PIN; } + DBGPrintf(&mp_plat_print, "\tFound in PWM List\n"); + config_periph_pin(self->pwm); pwm_config_t pwmConfig; @@ -138,33 +173,81 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, pwmConfig.prescale = self->prescaler; + DBGPrintf(&mp_plat_print, "\tCall PWM_Init\n"); if (PWM_Init(self->pwm->pwm, self->pwm->submodule, &pwmConfig) == kStatus_Fail) { return PWMOUT_INVALID_PIN; } + // Disable all fault inputs + self->pwm->pwm->SM[self->pwm->submodule].DISMAP[0] = 0; + self->pwm->pwm->SM[self->pwm->submodule].DISMAP[1] = 0; + + DBGPrintf(&mp_plat_print, "\tCall PWM_SetupPwm %p %x %u\n", self->pwm->pwm, self->pwm->submodule); + #if 0 + // Not calling the PWM_SetupPwm as it was setup to only work for PWM output on chan A and B but not X + // I have done some experimenting, probably could try others, but again they do not work with X. + // Most of the code checks to see if A if not, then it assume B. pwm_signal_param_t pwmSignal = { .pwmChannel = self->pwm->channel, .level = kPWM_HighTrue, .dutyCyclePercent = 0, // avoid an initial transient .deadtimeValue = 0, // allow 100% duty cycle }; - - // Disable all fault inputs - self->pwm->pwm->SM[self->pwm->submodule].DISMAP[0] = 0; - self->pwm->pwm->SM[self->pwm->submodule].DISMAP[1] = 0; - status_t status = PWM_SetupPwm(self->pwm->pwm, self->pwm->submodule, &pwmSignal, 1, kPWM_EdgeAligned, frequency, PWM_SRC_CLK_FREQ); if (status != kStatus_Success) { return PWMOUT_INITIALIZATION_ERROR; } + #else + // ======================================================================================================== + // Instead I set it up to work similar to what the Teensy 4.x code does. + // + // That is we set the PWM_CTRL_FULL_MASK, which then uses base->SM[submodule].VAL1 to control + // when the timer is reset, so it sets up your cycle/frequency. But then this implies that X channel + // which uses 0, 1 has to be handled specially. So for the different channels: + // A - Uses VAL2 to turn on (0) and VAL3=duty to turn off + // B - Uses VAL4 to turn on (0) and VAL5 to turn off + // X - As mentioned above VAL1 turns off, but its set to the timing for freqency. so + // VAL0 turns on, so we set it to VAL1 - duty + // + PWM_Type *base = self->pwm->pwm; + uint8_t submodule = self->pwm->submodule; + + uint32_t mask = 1 << submodule; + uint32_t olddiv = base->SM[submodule].VAL1 + 1; + if (self->pulse_count != olddiv) { + base->MCTRL |= PWM_MCTRL_CLDOK(mask); + base->SM[submodule].CTRL = PWM_CTRL_PRSC_MASK | PWM_CTRL_PRSC(self->prescaler); + base->SM[submodule].VAL1 = self->pulse_count - 1; + base->SM[submodule].CTRL2 = PWM_CTRL2_INDEP_MASK | PWM_CTRL2_WAITEN_MASK | PWM_CTRL2_DBGEN_MASK; + + if (olddiv == 1) { + base->SM[submodule].CTRL = PWM_CTRL_FULL_MASK; + base->SM[submodule].VAL0 = 0; + base->SM[submodule].VAL2 = 0; + base->SM[submodule].VAL3 = 0; + base->SM[submodule].VAL4 = 0; + base->SM[submodule].VAL5 = 0; + } else { + base->SM[submodule].VAL0 = (base->SM[submodule].VAL0 * self->pulse_count) / olddiv; + base->SM[submodule].VAL3 = (base->SM[submodule].VAL3 * self->pulse_count) / olddiv; + base->SM[submodule].VAL5 = (base->SM[submodule].VAL5 * self->pulse_count) / olddiv; + } + base->MCTRL |= PWM_MCTRL_LDOK(mask); + } + debug_print_flexpwm_registers(self->pwm->pwm); + + #endif + PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, true); PWM_StartTimer(self->pwm->pwm, 1 << self->pwm->submodule); + DBGPrintf(&mp_plat_print, "\tCall common_hal_pwmio_pwmout_set_duty_cycle\n"); common_hal_pwmio_pwmout_set_duty_cycle(self, duty); + DBGPrintf(&mp_plat_print, "\tReturn OK\n"); return PWMOUT_OK; } @@ -185,7 +268,16 @@ void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uint16_t d // we do not use PWM_UpdatePwmDutycycle because ... // * it works in integer percents // * it can't set the "X" duty cycle + // As mentioned in the setting up of the frequency code + // A - Uses VAL2 to turn on (0) and VAL3=duty to turn off + // B - Uses VAL4 to turn on (0) and VAL5 to turn off + // X - As mentioned above VAL1 turns off, but its set to the timing for freqency. so + // VAL0 turns on, so we set it to VAL1 - duty + + DBGPrintf(&mp_plat_print, "common_hal_pwmio_pwmout_set_duty_cycle %u\n", duty); self->duty_cycle = duty; + PWM_Type *base = self->pwm->pwm; + uint8_t mask = 1 << self->pwm->submodule; if (duty == 65535) { self->duty_scaled = self->pulse_count + 1; } else { @@ -193,18 +285,21 @@ void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uint16_t d } switch (self->pwm->channel) { case kPWM_PwmX: - self->pwm->pwm->SM[self->pwm->submodule].VAL0 = 0; - self->pwm->pwm->SM[self->pwm->submodule].VAL1 = self->duty_scaled; + base->SM[self->pwm->submodule].VAL0 = self->pulse_count - self->duty_scaled; + base->OUTEN |= PWM_OUTEN_PWMX_EN(mask); break; case kPWM_PwmA: - self->pwm->pwm->SM[self->pwm->submodule].VAL2 = 0; - self->pwm->pwm->SM[self->pwm->submodule].VAL3 = self->duty_scaled; + base->SM[self->pwm->submodule].VAL3 = self->duty_scaled; + base->OUTEN |= PWM_OUTEN_PWMA_EN(mask); break; case kPWM_PwmB: - self->pwm->pwm->SM[self->pwm->submodule].VAL4 = 0; - self->pwm->pwm->SM[self->pwm->submodule].VAL5 = self->duty_scaled; + base->SM[self->pwm->submodule].VAL5 = self->duty_scaled; + base->OUTEN |= PWM_OUTEN_PWMB_EN(mask); } PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, true); + + debug_print_flexpwm_registers(self->pwm->pwm); + } uint16_t common_hal_pwmio_pwmout_get_duty_cycle(pwmio_pwmout_obj_t *self) { diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c index fe10b73116..4552201f3c 100644 --- a/ports/mimxrt10xx/supervisor/port.c +++ b/ports/mimxrt10xx/supervisor/port.c @@ -398,6 +398,13 @@ void port_interrupt_after_ticks(uint32_t ticks) { void port_idle_until_interrupt(void) { // App note here: https://www.nxp.com/docs/en/application-note/AN12085.pdf + // Currently I have disabled the setting into wait mode as this impacts lots of differnt + // subsystems and it is unclear if you can or should set it generically without having + // a better understanding of user intent. For example by default it will kill PWM + // when in this mode, unless PWM_CTRL2_WAITEN_MASK is set, and even with this set + // it may not work properly if the same timer/subtimer is trying to PWM on multiple channels. + // Maybe at later date, revisit after we have a better understanding on things like which + // timers it impacts and how each subsystem is configured. // Clear the FPU interrupt because it can prevent us from sleeping. if (__get_FPSCR() & ~(0x9f)) { @@ -410,11 +417,15 @@ void port_idle_until_interrupt(void) { NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn); // Don't down clock on debug builds because it prevents the DAP from // reading memory + #if 0 #if CIRCUITPY_DEBUG == 0 CLOCK_SetMode(kCLOCK_ModeWait); #endif __WFI(); CLOCK_SetMode(kCLOCK_ModeRun); + #else + __WFI(); + #endif } common_hal_mcu_enable_interrupts(); } From 208bfb33aa96f3b27c525000625b02f0cb351a1d Mon Sep 17 00:00:00 2001 From: mjs513 Date: Sun, 17 Apr 2022 15:04:16 -0400 Subject: [PATCH 0129/2403] Deleted Warnings Chanaged ValueError Method --- locale/circuitpython.pot | 3 ++- .../common-hal/microcontroller/Processor.c | 15 ++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index d0bb7a4067..eabace6931 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1108,7 +1108,8 @@ msgid "Framebuffer requires %d bytes" msgstr "" #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c -msgid "Frequency Out of Range Must be between 24Mhz and 1.008Ghz" +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" #: shared-bindings/pwmio/PWMOut.c diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c index 96f1185b3b..17ced78910 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c @@ -54,17 +54,10 @@ float common_hal_mcu_processor_get_temperature(void) { uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency) { - if (frequency < 24000000 || frequency > 1008000000) { - mp_raise_ValueError(translate("Frequency Out of Range Must be between 24Mhz and 1.008Ghz")); - } - if (frequency <= 600000000) { - mp_printf(&mp_plat_print, "System Clock is set to %d hz\n", frequency); - } - if (frequency > 600000000) { - mp_printf(&mp_plat_print, "System Clock is set to %d hz and is Overclocked\n", frequency); - } - if (frequency > 816000000) { - mp_printf(&mp_plat_print, "System Clock is set to %d hz and is Overclocked, Cooling Required!\n", frequency); + uint32_t freq = frequency / 1000000; + if (freq != 24 && freq != 150 && freq != 396 && freq != 450 && freq != 528 && freq != 600 && + freq != 720 && freq != 816 && freq != 912 && freq != 960 && freq != 1008) { + mp_raise_ValueError(translate("Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz")); } SystemCoreClock = setarmclock(frequency); return SystemCoreClock; From 92f2c6e53e334037c62359ce3cf677e2555bb44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Siyabend=20=C3=9Cr=C3=BCn?= Date: Mon, 18 Apr 2022 07:04:39 +0300 Subject: [PATCH 0130/2403] New Turkish translations --- locale/tr.po | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/locale/tr.po b/locale/tr.po index 91f0253cb4..f90b408411 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -30,6 +30,8 @@ msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"Program otomatik yeniden yükleme tarafından durduruldu. Birazdan tekrar yüklenecek.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -595,12 +597,12 @@ msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "Brightness must be 0-1.0" -msgstr "" +msgstr "Parlaklık 0-1.0 aralığında olmalı" #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" -msgstr "" +msgstr "Parlaklık ayarlanabilir değil" #: shared-bindings/_bleio/UUID.c #, c-format @@ -614,27 +616,27 @@ msgstr "" #: shared-module/usb_hid/Device.c #, c-format msgid "Buffer incorrect size. Should be %d bytes." -msgstr "" +msgstr "Geçersiz arabellek boyutu. %d kadar olmalı" #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." -msgstr "" +msgstr "Arabellek bayt dizisi değil" #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is too small" -msgstr "" +msgstr "Arabellek çok küçük" #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" -msgstr "" +msgstr "Mevcut arabellek boyutu %d çok büyük. En fazla %d kadar olmalı" #: ports/atmel-samd/common-hal/sdioio/SDCard.c #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c msgid "Buffer length must be a multiple of 512" -msgstr "" +msgstr "Arabellek boyutu 512'nin katı olmalı" #: ports/stm/common-hal/sdioio/SDCard.c msgid "Buffer must be a multiple of 512 bytes" @@ -642,7 +644,7 @@ msgstr "" #: shared-bindings/bitbangio/I2C.c msgid "Buffer must be at least length 1" -msgstr "" +msgstr "Arabellek boyutu en az 1 olmalı" #: shared-bindings/_bleio/PacketBuffer.c #, c-format @@ -651,7 +653,7 @@ msgstr "" #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c msgid "Buffers must be same size" -msgstr "" +msgstr "Arabellek boyutları aynı olmalı" #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c @@ -659,7 +661,7 @@ msgstr "" #: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" -msgstr "" +msgstr "Veriyolu pini %d kullanımda" #: shared-bindings/_bleio/UUID.c msgid "Byte buffer must be 16 bytes." @@ -667,15 +669,15 @@ msgstr "" #: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c msgid "Bytes must be between 0 and 255." -msgstr "" +msgstr "Baytlar 0-255 aralığında olmalı" #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" -msgstr "" +msgstr "CBC blokları 16 baytın katları şeklinde olmalı" #: supervisor/shared/safe_mode.c msgid "CIRCUITPY drive could not be found or created." -msgstr "" +msgstr "CIRCUITPY sürücüsü bulunamadı veya oluşturulamadı" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "CRC or checksum was invalid" @@ -705,17 +707,17 @@ 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" -msgstr "" +msgstr "USB aygıtları şu an değiştirilemez" #: shared-bindings/_bleio/Adapter.c msgid "Cannot create a new Adapter; use _bleio.adapter;" -msgstr "" +msgstr "Yeni Adapter oluşturulamaz, _bleio.adapter; kullanın" #: shared-bindings/displayio/Bitmap.c #: shared-bindings/memorymonitor/AllocationSize.c #: shared-bindings/pulseio/PulseIn.c msgid "Cannot delete values" -msgstr "" +msgstr "Değerler silinemez" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c From f502703e5237dfd9b14fd30eb06e3f99b3c2d825 Mon Sep 17 00:00:00 2001 From: George White Date: Sun, 17 Apr 2022 17:14:39 +0000 Subject: [PATCH 0131/2403] Add hook to do some flash setup before filesystem init --- main.c | 6 ++++++ py/circuitpy_mpconfig.mk | 3 +++ supervisor/board.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/main.c b/main.c index ba6950e34c..4cdc39bf21 100644 --- a/main.c +++ b/main.c @@ -836,6 +836,12 @@ int __attribute__((used)) main(void) { // Start the debug serial serial_early_init(); + #if CIRCUITPY_EXTERNAL_FLASH_SETUP + // Set up anything that might need to get done before we try to use SPI flash + // This is needed for some boards where flash relies on GPIO setup to work + external_flash_setup(); + #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/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 081048181e..80625a2cae 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -49,6 +49,9 @@ CFLAGS += -DMICROPY_PY_USELECT=$(MICROPY_PY_USELECT) MICROPY_PY_USELECT_SELECT ?= $(MICROPY_PY_USELECT) CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT) +# enable pre-flash GPIO setup +CIRCUITPY_EXTERNAL_FLASH_SETUP ?= 0 +CFLAGS += -DCIRCUITPY_EXTERNAL_FLASH_SETUP=$(CIRCUITPY_EXTERNAL_FLASH_SETUP) CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO) diff --git a/supervisor/board.h b/supervisor/board.h index 605c16f5dc..d9aee837f7 100644 --- a/supervisor/board.h +++ b/supervisor/board.h @@ -47,5 +47,9 @@ void reset_board(void); // disabling USB, BLE or flash) because CircuitPython may continue to run. void board_deinit(void); +// Configure anything that needs to get set up before the external flash +// is init'ed. For example, if GPIO needs to be configured to enable the +// flash chip, as is the case on some boards. +void external_flash_setup(void); #endif // MICROPY_INCLUDED_SUPERVISOR_BOARD_H From 0ba93b20e5e823d256f0a3fa8ff910c9cd9ec2ac Mon Sep 17 00:00:00 2001 From: George White Date: Sun, 17 Apr 2022 17:18:45 +0000 Subject: [PATCH 0132/2403] Setup flash pins on Sparkfun SAMD51 Micromod --- .../boards/sparkfun_samd51_micromod/board.c | 23 +++++++++++++++++++ .../sparkfun_samd51_micromod/mpconfigboard.h | 4 ++++ .../sparkfun_samd51_micromod/mpconfigboard.mk | 1 + 3 files changed, 28 insertions(+) diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c index 289d68af29..5960bff666 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c @@ -26,6 +26,9 @@ #include "supervisor/board.h" #include "mpconfigboard.h" +#include "common-hal/microcontroller/Pin.h" +#include "hal/include/hal_gpio.h" +#include "py/mphal.h" void board_init(void) { } @@ -39,3 +42,23 @@ void reset_board(void) { void board_deinit(void) { } + +void external_flash_setup(void) { + // Do not reset the external flash write-protect and hold pins high + never_reset_pin_number(PIN_PB22); + never_reset_pin_number(PIN_PB23); + + // note: using output instead of input+pullups because the pullups are a little weak + // Set the WP pin high + gpio_set_pin_function(PIN_PB22, GPIO_PIN_FUNCTION_OFF); + gpio_set_pin_direction(PIN_PB22, GPIO_DIRECTION_OUT); + gpio_set_pin_level(PIN_PB22, true); + + // Set the HOLD pin high + gpio_set_pin_function(PIN_PB23, GPIO_PIN_FUNCTION_OFF); + gpio_set_pin_direction(PIN_PB23, GPIO_DIRECTION_OUT); + gpio_set_pin_level(PIN_PB23, true); + + // Add some delay to give the pins time to get set + // mp_hal_delay_ms(3000); +} diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.h b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.h index 3c4ef44b88..15fbcc45de 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.h +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.h @@ -27,3 +27,7 @@ // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 + +// The external flash chip has WP (write-protect) and hold pins we should ignore +#define IGNORE_PIN_PB22 +#define IGNORE_PIN_PB23 diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk index 026a1978c3..6903219184 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk @@ -13,3 +13,4 @@ EXTERNAL_FLASH_DEVICES = W25Q128JVxM LONGINT_IMPL = MPZ CIRCUITPY_PS2IO = 1 +CIRCUITPY_EXTERNAL_FLASH_SETUP = 1 From 32fc084b39d990d73b73f893c79d6c7d54ae730a Mon Sep 17 00:00:00 2001 From: George White Date: Mon, 18 Apr 2022 03:18:25 +0000 Subject: [PATCH 0133/2403] Removed compiler flag in favor of MP_WEAK implementation --- main.c | 5 +++-- .../boards/sparkfun_samd51_micromod/mpconfigboard.mk | 1 - py/circuitpy_mpconfig.mk | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 4cdc39bf21..0521170545 100644 --- a/main.c +++ b/main.c @@ -836,11 +836,9 @@ int __attribute__((used)) main(void) { // Start the debug serial serial_early_init(); - #if CIRCUITPY_EXTERNAL_FLASH_SETUP // Set up anything that might need to get done before we try to use SPI flash // This is needed for some boards where flash relies on GPIO setup to work external_flash_setup(); - #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 @@ -984,3 +982,6 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c __fatal_error("Assertion failed"); } #endif + +void MP_WEAK external_flash_setup(void) { +} diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk index 6903219184..026a1978c3 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk @@ -13,4 +13,3 @@ EXTERNAL_FLASH_DEVICES = W25Q128JVxM LONGINT_IMPL = MPZ CIRCUITPY_PS2IO = 1 -CIRCUITPY_EXTERNAL_FLASH_SETUP = 1 diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 80625a2cae..535bd2f698 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -49,10 +49,6 @@ CFLAGS += -DMICROPY_PY_USELECT=$(MICROPY_PY_USELECT) MICROPY_PY_USELECT_SELECT ?= $(MICROPY_PY_USELECT) CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT) -# enable pre-flash GPIO setup -CIRCUITPY_EXTERNAL_FLASH_SETUP ?= 0 -CFLAGS += -DCIRCUITPY_EXTERNAL_FLASH_SETUP=$(CIRCUITPY_EXTERNAL_FLASH_SETUP) - CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO) From 3b5171c4ffe9225bb1ac675987639f441b87e87d Mon Sep 17 00:00:00 2001 From: George White Date: Mon, 18 Apr 2022 14:09:36 +0000 Subject: [PATCH 0134/2403] Move hook implementation to supervisor --- main.c | 4 +--- ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c | 5 +---- supervisor/board.h | 5 ----- supervisor/shared/external_flash/external_flash.c | 3 +++ supervisor/shared/external_flash/external_flash.h | 5 +++++ 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/main.c b/main.c index 0521170545..810348b6c9 100644 --- a/main.c +++ b/main.c @@ -62,6 +62,7 @@ #include "supervisor/shared/workflow.h" #include "supervisor/usb.h" #include "supervisor/workflow.h" +#include "supervisor/shared/external_flash/external_flash.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Processor.h" @@ -982,6 +983,3 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c __fatal_error("Assertion failed"); } #endif - -void MP_WEAK external_flash_setup(void) { -} diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c index 5960bff666..9e862b3c01 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c @@ -28,7 +28,7 @@ #include "mpconfigboard.h" #include "common-hal/microcontroller/Pin.h" #include "hal/include/hal_gpio.h" -#include "py/mphal.h" +#include "supervisor/shared/external_flash/external_flash.h" void board_init(void) { } @@ -58,7 +58,4 @@ void external_flash_setup(void) { gpio_set_pin_function(PIN_PB23, GPIO_PIN_FUNCTION_OFF); gpio_set_pin_direction(PIN_PB23, GPIO_DIRECTION_OUT); gpio_set_pin_level(PIN_PB23, true); - - // Add some delay to give the pins time to get set - // mp_hal_delay_ms(3000); } diff --git a/supervisor/board.h b/supervisor/board.h index d9aee837f7..e3f0af79a3 100644 --- a/supervisor/board.h +++ b/supervisor/board.h @@ -47,9 +47,4 @@ void reset_board(void); // disabling USB, BLE or flash) because CircuitPython may continue to run. void board_deinit(void); -// Configure anything that needs to get set up before the external flash -// is init'ed. For example, if GPIO needs to be configured to enable the -// flash chip, as is the case on some boards. -void external_flash_setup(void); - #endif // MICROPY_INCLUDED_SUPERVISOR_BOARD_H diff --git a/supervisor/shared/external_flash/external_flash.c b/supervisor/shared/external_flash/external_flash.c index 33d618276c..7da45fdc99 100644 --- a/supervisor/shared/external_flash/external_flash.c +++ b/supervisor/shared/external_flash/external_flash.c @@ -588,3 +588,6 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num, } return 0; // success } + +void MP_WEAK external_flash_setup(void) { +} diff --git a/supervisor/shared/external_flash/external_flash.h b/supervisor/shared/external_flash/external_flash.h index db5c677eb0..7966b64674 100644 --- a/supervisor/shared/external_flash/external_flash.h +++ b/supervisor/shared/external_flash/external_flash.h @@ -47,4 +47,9 @@ void supervisor_external_flash_flush(void); +// Configure anything that needs to get set up before the external flash +// is init'ed. For example, if GPIO needs to be configured to enable the +// flash chip, as is the case on some boards. +void external_flash_setup(void); + #endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_EXTERNAL_FLASH_EXTERNAL_FLASH_H From a068b6ba27414dd0eb9149be8342a26ad033c70a Mon Sep 17 00:00:00 2001 From: George White Date: Mon, 18 Apr 2022 14:59:30 +0000 Subject: [PATCH 0135/2403] guard external flash setup hook --- main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.c b/main.c index 810348b6c9..a3cc01d165 100644 --- a/main.c +++ b/main.c @@ -837,9 +837,11 @@ int __attribute__((used)) main(void) { // Start the debug serial serial_early_init(); + #if !INTERNAL_FLASH_FILESYSTEM // Set up anything that might need to get done before we try to use SPI flash // This is needed for some boards where flash relies on GPIO setup to work external_flash_setup(); + #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 From 65f085709c5a0ff45238588d2782774f5581d41e Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 18 Apr 2022 10:25:49 -0500 Subject: [PATCH 0136/2403] back to not using function --- shared-bindings/displayio/TileGrid.c | 68 +++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 46b09a6a53..8e47a344db 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -145,6 +145,7 @@ static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { return MP_OBJ_TO_PTR(native_tilegrid); } +/* static void enforce_bitmap_size(mp_obj_t self_in, mp_obj_t bitmap) { displayio_tilegrid_t *self = native_tilegrid(self_in); uint16_t bitmap_width; @@ -182,6 +183,7 @@ static void enforce_bitmap_size(mp_obj_t self_in, mp_obj_t bitmap) { mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); } } +*/ //| hidden: bool //| """True when the TileGrid is hidden. This may be False even when a part of a hidden Group.""" @@ -443,7 +445,71 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bit if (bitmap->height % self->tile_height != 0) { mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); }*/ - enforce_bitmap_size(self_in, bitmap); + // enforce_bitmap_size(self_in, bitmap); + + uint16_t bitmap_width; + uint16_t bitmap_height; + mp_obj_t native = mp_obj_cast_to_native_base(bitmap, &displayio_shape_type); + if (native != MP_OBJ_NULL) { + displayio_shape_t *bmp = MP_OBJ_TO_PTR(native); + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else if (mp_obj_is_type(bitmap, &displayio_bitmap_type)) { + displayio_bitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); + native = bitmap; + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else if (mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type)) { + displayio_ondiskbitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); + native = bitmap; + bitmap_width = bmp->width; + bitmap_height = bmp->height; + } else { + mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_bitmap); + } + + uint16_t tile_width = self->tile_width; + uint16_t tile_height = self->tile_height; + mp_obj_t old_native = mp_obj_cast_to_native_base(self->bitmap, &displayio_shape_type); + if (old_native != MP_OBJ_NULL) { + displayio_shape_t *old_bmp = MP_OBJ_TO_PTR(old_native); + if (tile_width == old_bmp->width) { + self->tile_width = bitmap_width; + } + if (tile_height == old_bmp->width) { + self->tile_height = bitmap_height; + } + + } else if (mp_obj_is_type(self->bitmap, &displayio_bitmap_type)) { + displayio_bitmap_t *old_bmp = MP_OBJ_TO_PTR(self->bitmap); + old_native = self->bitmap; + if (tile_width == old_bmp->width) { + self->tile_width = bitmap_width; + } + if (tile_height == old_bmp->width) { + self->tile_height = bitmap_height; + } + + } else if (mp_obj_is_type(self->bitmap, &displayio_ondiskbitmap_type)) { + displayio_ondiskbitmap_t *old_bmp = MP_OBJ_TO_PTR(self->bitmap); + old_native = self->bitmap; + if (tile_width == old_bmp->width) { + self->tile_width = bitmap_width; + } + if (tile_height == old_bmp->width) { + self->tile_height = bitmap_height; + } + } + + + + if (bitmap_width % tile_width != 0) { + mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); + } + if (bitmap_height % tile_height != 0) { + mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); + } + common_hal_displayio_tilegrid_set_bitmap(self, bitmap); From d94f6b8f07f7bd6bbfbfd131e77b1f3e39dc47ef Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 18 Apr 2022 12:07:07 -0500 Subject: [PATCH 0137/2403] update frozen requests --- frozen/Adafruit_CircuitPython_Requests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index 270565665a..2e6b3f9fee 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit 270565665ada26fe8d7a99a3cb5941b452444471 +Subproject commit 2e6b3f9feeacc678402454f7d3416b04a9a93e17 From eab4867e613d0a2b0227a7292127e4f974506d12 Mon Sep 17 00:00:00 2001 From: KurtE Date: Mon, 18 Apr 2022 15:46:36 -0700 Subject: [PATCH 0138/2403] Remove dead replaced code As requested, I removed the dead code that was replaced --- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index 3575349bfa..28e36c3f35 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -101,9 +101,10 @@ void debug_print_flexpwm_registers(PWM_Type *base) { base->FSTS, base->FFILT, base->FTST, base->FCTRL2); for (uint8_t i = 0; i < 4; i++) { mp_printf(&mp_plat_print, - "\t\t(%u) INIT:%x CTRL2:%x CTRL:%x VAL0:%x VAL1:%x VAL2:%x VAL3:%x VAL4:%x VAL5:%x OCTRL:%x DTCNT0:%x DTCNT1:%x\n", i, + "\t\t(%u) INIT:%x CTRL2:%x CTRL:%x VAL0:%x VAL1:%x VAL2:%x VAL3:%x VAL4:%x VAL5:%x OCTRL:%x DTCNT0:%x DTCNT1:%x DISMAP: %x %x\n", i, base->SM[i].INIT, base->SM[i].CTRL2, base->SM[i].CTRL, base->SM[i].VAL0, base->SM[i].VAL1, base->SM[i].VAL2, - base->SM[i].VAL3, base->SM[i].VAL4, base->SM[i].VAL5, base->SM[i].OCTRL, base->SM[i].DTCNT0, base->SM[i].DTCNT1); + base->SM[i].VAL3, base->SM[i].VAL4, base->SM[i].VAL5, base->SM[i].OCTRL, base->SM[i].DTCNT0, base->SM[i].DTCNT1, + base->SM[i].DISMAP[0], base->SM[i].DISMAP[1]); } } @@ -183,23 +184,11 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, self->pwm->pwm->SM[self->pwm->submodule].DISMAP[1] = 0; DBGPrintf(&mp_plat_print, "\tCall PWM_SetupPwm %p %x %u\n", self->pwm->pwm, self->pwm->submodule); - #if 0 + // ======================================================================================================== // Not calling the PWM_SetupPwm as it was setup to only work for PWM output on chan A and B but not X // I have done some experimenting, probably could try others, but again they do not work with X. // Most of the code checks to see if A if not, then it assume B. - pwm_signal_param_t pwmSignal = { - .pwmChannel = self->pwm->channel, - .level = kPWM_HighTrue, - .dutyCyclePercent = 0, // avoid an initial transient - .deadtimeValue = 0, // allow 100% duty cycle - }; - status_t status = PWM_SetupPwm(self->pwm->pwm, self->pwm->submodule, &pwmSignal, 1, kPWM_EdgeAligned, frequency, PWM_SRC_CLK_FREQ); - - if (status != kStatus_Success) { - return PWMOUT_INITIALIZATION_ERROR; - } - #else - // ======================================================================================================== + // // Instead I set it up to work similar to what the Teensy 4.x code does. // // That is we set the PWM_CTRL_FULL_MASK, which then uses base->SM[submodule].VAL1 to control @@ -237,8 +226,6 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, } debug_print_flexpwm_registers(self->pwm->pwm); - #endif - PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, true); PWM_StartTimer(self->pwm->pwm, 1 << self->pwm->submodule); From 9fdd8043650ad97fdd286719ba06cc392846f093 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 18 Apr 2022 20:31:47 -0500 Subject: [PATCH 0139/2403] enforce new bitmap same size as previous --- locale/circuitpython.pot | 6 ++- shared-bindings/displayio/TileGrid.c | 59 +++++++--------------------- 2 files changed, 19 insertions(+), 46 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 3eb9b8d80b..5a8248d509 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1599,6 +1599,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" @@ -3024,7 +3028,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 8e47a344db..32a8796a5a 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -439,78 +439,47 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bit mp_raise_TypeError(translate("bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap")); } - /*if (bitmap->width % self->tile_width != 0) { - mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); - } - if (bitmap->height % self->tile_height != 0) { - mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); - }*/ - // enforce_bitmap_size(self_in, bitmap); - - uint16_t bitmap_width; - uint16_t bitmap_height; + uint16_t new_bitmap_width; + uint16_t new_bitmap_height; mp_obj_t native = mp_obj_cast_to_native_base(bitmap, &displayio_shape_type); if (native != MP_OBJ_NULL) { displayio_shape_t *bmp = MP_OBJ_TO_PTR(native); - bitmap_width = bmp->width; - bitmap_height = bmp->height; + new_bitmap_width = bmp->width; + new_bitmap_height = bmp->height; } else if (mp_obj_is_type(bitmap, &displayio_bitmap_type)) { displayio_bitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); native = bitmap; - bitmap_width = bmp->width; - bitmap_height = bmp->height; + new_bitmap_width = bmp->width; + new_bitmap_height = bmp->height; } else if (mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type)) { displayio_ondiskbitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); native = bitmap; - bitmap_width = bmp->width; - bitmap_height = bmp->height; + new_bitmap_width = bmp->width; + new_bitmap_height = bmp->height; } else { mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_bitmap); } - uint16_t tile_width = self->tile_width; - uint16_t tile_height = self->tile_height; mp_obj_t old_native = mp_obj_cast_to_native_base(self->bitmap, &displayio_shape_type); if (old_native != MP_OBJ_NULL) { displayio_shape_t *old_bmp = MP_OBJ_TO_PTR(old_native); - if (tile_width == old_bmp->width) { - self->tile_width = bitmap_width; + if (old_bmp->width != new_bitmap_width || old_bmp->height != new_bitmap_height) { + mp_raise_ValueError(translate("New bitmap must be same size as old bitmap")); } - if (tile_height == old_bmp->width) { - self->tile_height = bitmap_height; - } - } else if (mp_obj_is_type(self->bitmap, &displayio_bitmap_type)) { displayio_bitmap_t *old_bmp = MP_OBJ_TO_PTR(self->bitmap); old_native = self->bitmap; - if (tile_width == old_bmp->width) { - self->tile_width = bitmap_width; + if (old_bmp->width != new_bitmap_width || old_bmp->height != new_bitmap_height) { + mp_raise_ValueError(translate("New bitmap must be same size as old bitmap")); } - if (tile_height == old_bmp->width) { - self->tile_height = bitmap_height; - } - } else if (mp_obj_is_type(self->bitmap, &displayio_ondiskbitmap_type)) { displayio_ondiskbitmap_t *old_bmp = MP_OBJ_TO_PTR(self->bitmap); old_native = self->bitmap; - if (tile_width == old_bmp->width) { - self->tile_width = bitmap_width; - } - if (tile_height == old_bmp->width) { - self->tile_height = bitmap_height; + if (old_bmp->width != new_bitmap_width || old_bmp->height != new_bitmap_height) { + mp_raise_ValueError(translate("New bitmap must be same size as old bitmap")); } } - - - if (bitmap_width % tile_width != 0) { - mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); - } - if (bitmap_height % tile_height != 0) { - mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); - } - - common_hal_displayio_tilegrid_set_bitmap(self, bitmap); return mp_const_none; From 459f896dd44bb4b6c52e21806b962957e3374814 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 18 Apr 2022 20:36:41 -0500 Subject: [PATCH 0140/2403] remove refactored function --- shared-bindings/displayio/TileGrid.c | 40 ---------------------------- 1 file changed, 40 deletions(-) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 32a8796a5a..de98dd4076 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -145,46 +145,6 @@ static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { return MP_OBJ_TO_PTR(native_tilegrid); } -/* -static void enforce_bitmap_size(mp_obj_t self_in, mp_obj_t bitmap) { - displayio_tilegrid_t *self = native_tilegrid(self_in); - uint16_t bitmap_width; - uint16_t bitmap_height; - mp_obj_t native = mp_obj_cast_to_native_base(bitmap, &displayio_shape_type); - if (native != MP_OBJ_NULL) { - displayio_shape_t *bmp = MP_OBJ_TO_PTR(native); - bitmap_width = bmp->width; - bitmap_height = bmp->height; - } else if (mp_obj_is_type(bitmap, &displayio_bitmap_type)) { - displayio_bitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); - native = bitmap; - bitmap_width = bmp->width; - bitmap_height = bmp->height; - } else if (mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type)) { - displayio_ondiskbitmap_t *bmp = MP_OBJ_TO_PTR(bitmap); - native = bitmap; - bitmap_width = bmp->width; - bitmap_height = bmp->height; - } else { - mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_bitmap); - } - uint16_t tile_width = self->tile_width; - if (tile_width == 0) { - tile_width = bitmap_width; - } - uint16_t tile_height = self->tile_height; - if (tile_height == 0) { - tile_height = bitmap_height; - } - if (bitmap_width % tile_width != 0) { - mp_raise_ValueError(translate("Tile width must exactly divide bitmap width")); - } - if (bitmap_height % tile_height != 0) { - mp_raise_ValueError(translate("Tile height must exactly divide bitmap height")); - } -} -*/ - //| hidden: bool //| """True when the TileGrid is hidden. This may be False even when a part of a hidden Group.""" //| From 17bba7b17dc23628d7f5903bc10df29d68c86024 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Tue, 19 Apr 2022 06:49:11 +0200 Subject: [PATCH 0141/2403] remove Adafruit_CircuitPython_BusDevice from frozen modules, it's built in now --- .../adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk | 1 - .../boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk | 1 - ports/nrf/boards/TG-Watch/mpconfigboard.mk | 1 - .../raspberrypi/boards/solderparty_rp2040_stamp/mpconfigboard.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk index 01657b7ffd..e1a9793289 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk @@ -20,5 +20,4 @@ CIRCUITPY_MODULE=wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk index 1156b1b915..657855cad8 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk @@ -19,5 +19,4 @@ CIRCUITPY_ESP_FLASH_SIZE=8MB FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register diff --git a/ports/nrf/boards/TG-Watch/mpconfigboard.mk b/ports/nrf/boards/TG-Watch/mpconfigboard.mk index 8a191c1534..212ab7edc2 100644 --- a/ports/nrf/boards/TG-Watch/mpconfigboard.mk +++ b/ports/nrf/boards/TG-Watch/mpconfigboard.mk @@ -8,7 +8,6 @@ MCU_CHIP = nrf52840 QSPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q128JVxQ" -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ST7789 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes diff --git a/ports/raspberrypi/boards/solderparty_rp2040_stamp/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_rp2040_stamp/mpconfigboard.mk index e2b4118761..1954b12415 100644 --- a/ports/raspberrypi/boards/solderparty_rp2040_stamp/mpconfigboard.mk +++ b/ports/raspberrypi/boards/solderparty_rp2040_stamp/mpconfigboard.mk @@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C" CIRCUITPY__EVE = 1 FROZEN_MPY_DIRS += $(TOP)/ports/raspberrypi/boards/solderparty_rp2040_stamp -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register From 6e3fe07943344ded30a8942d11bd65a3ffbb311b Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 19 Apr 2022 09:07:35 -0500 Subject: [PATCH 0142/2403] remove redundant type check. remove blank line. revert locale change --- locale/circuitpython.pot | 7 +------ shared-bindings/displayio/TileGrid.c | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 5a8248d509..6ebab8094f 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2721,11 +2721,6 @@ msgstr "" msgid "binary op %q not implemented" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "" -"bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "bitmap sizes must match" msgstr "" @@ -3028,7 +3023,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c +#: extmod/moduzlib.c shared-module/zlib/DecompIO.c msgid "compression header" msgstr "" diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index de98dd4076..4628939e27 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -137,7 +137,6 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_ return MP_OBJ_FROM_PTR(self); } - // Helper to ensure we have the native super class instead of a subclass. static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { mp_obj_t native_tilegrid = mp_obj_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type); @@ -392,12 +391,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_bitmap_obj, displayio_tilegrid_ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) { displayio_tilegrid_t *self = native_tilegrid(self_in); - if (!mp_obj_is_type(bitmap, &displayio_bitmap_type) && - !mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type) && - !mp_obj_is_type(bitmap, &displayio_shape_type)) { - - mp_raise_TypeError(translate("bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap")); - } uint16_t new_bitmap_width; uint16_t new_bitmap_height; From e73c5c768bff365b8a659a0184694ec6f9e7c98c Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 11:23:39 -0400 Subject: [PATCH 0143/2403] Update documentation for end param in SPI.readinto() --- shared-bindings/busio/SPI.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index df364fcbb9..92fff7e571 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -299,7 +299,9 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_obj, 1, busio_spi_write); //| //| :param WriteableBuffer buffer: read bytes into this buffer //| :param int start: beginning of buffer slice -//| :param int end: end of buffer slice; if not specified, use ``len(buffer)`` +//| :param int end: end of buffer slice; if not specified, it will be the equivalent value +//| of ``len(buffer)`` and for any value provided it will take the value of +//| ``min(end, len(buffer))`` //| :param int write_value: value to write while reading //| """ //| ... From 2e2e3ad612ca35ed9103a7671443ab0511e18ae4 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 11:46:39 -0400 Subject: [PATCH 0144/2403] Add documentation for math.log() --- shared-bindings/math/__init__.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index d41097ad8e..f25c261ef5 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -157,6 +157,11 @@ STATIC NORETURN void math_error(void) { //| """Return ``x * (2**exp)``.""" //| ... //| +//| def log(x: float, base: float = math.e) -> float: +//| """Return the logarithm of x to the given base. If base is not specified, +//| returns the natural logarithm (base e) of x"" +//| ... +//| //| def modf(x: float) -> Tuple[float, float]: //| """Return a tuple of two floats, being the fractional and integral parts of //| ``x``. Both return values have the same sign as ``x``.""" From 33f5598acc2eb84e549c1168fad1c042c5cb61a1 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 19 Apr 2022 11:35:43 -0500 Subject: [PATCH 0145/2403] Stub 'continuous write' functionality --- .../bindings/rp2pio/StateMachine.c | 77 +++++++++++++++++++ .../bindings/rp2pio/StateMachine.h | 2 + .../common-hal/rp2pio/StateMachine.c | 8 ++ 3 files changed, 87 insertions(+) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 98213be265..8c735479f5 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -426,7 +426,82 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write); +//| def continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None: +//| """Write the data contained in ``buffer`` to the state machine repeatedly until stopped. If the buffer is empty or None, an existing continuous_write is canceled. +//| +//| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements +//| will perform 8 bit writes to the PIO FIFO. The RP2040's memory bus will duplicate the value into +//| the other byte positions. So, pulling more data in the PIO assembly will read the duplicated values. +//| +//| To perform 16 or 32 bits writes into the FIFO use an `array.array` with a type code of the desired +//| size. +//| +//| To atomically change from one buffer to another, simply call +//| `StateMachine.continuous_write` again with a different buffer. +//| The call will only return once outputting the new buffer has started. +//| +//| If the buffer is modified while it is being written out, the updated +//| values will be used. However, because of interactions between CPU +//| writes, DMA and the PIO FIFO are complex, it is difficult to predict +//| the result of modifying multiple values. Instead, alternate between +//| a pair of buffers. +//| +//| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer +//| :param int start: Start of the slice of ``buffer`` to write out: ``buffer[start:end]`` +//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" +//| ... +//| +STATIC mp_obj_t rp2pio_statemachine_start_continuous_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_buffer, ARG_start, ARG_end }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, + { MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, + }; + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); + check_for_deinit(self); + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + mp_buffer_info_t bufinfo = {}; + if (args[ARG_buffer].u_obj != mp_const_none) { + mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ); + } + int32_t start = args[ARG_start].u_int; + size_t length = bufinfo.len; + normalize_buffer_bounds(&start, args[ARG_end].u_int, &length); + bool ok = true; + if (length == 0) { + ok = common_hal_rp2pio_statemachine_end_continuous_write(self); + } else { + uint8_t *original_pointer = bufinfo.buf; + int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL); + if (stride_in_bytes > 4) { + mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); + } + + ok = common_hal_rp2pio_statemachine_start_continuous_write(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); + } + if (!ok) { + mp_raise_OSError(MP_EIO); + } + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_start_continuous_write_obj, 2, rp2pio_statemachine_start_continuous_write); + +//| def end_continuous_write(self) -> None: +//| """Stop a continuous write, if one is in progress.""" +//| +STATIC mp_obj_t rp2pio_statemachine_obj_end_continuous_write(mp_obj_t self_in) { + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); + bool ok = common_hal_rp2pio_statemachine_end_continuous_write(self); + if (!ok) { + mp_raise_OSError(MP_EIO); + } + return mp_const_none; +} + +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_end_continuous_write_obj, rp2pio_statemachine_obj_end_continuous_write); //| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None) -> None: //| """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer //| includes any data added to the fifo even if it was added before this was called. @@ -646,6 +721,8 @@ STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&rp2pio_statemachine_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&rp2pio_statemachine_write_obj) }, { MP_ROM_QSTR(MP_QSTR_write_readinto), MP_ROM_PTR(&rp2pio_statemachine_write_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_start_continuous_write), MP_ROM_PTR(&rp2pio_statemachine_start_continuous_write_obj) }, + { MP_ROM_QSTR(MP_QSTR_end_continuous_write), MP_ROM_PTR(&rp2pio_statemachine_end_continuous_write_obj) }, { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&rp2pio_statemachine_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_rxstall), MP_ROM_PTR(&rp2pio_statemachine_rxstall_obj) }, diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index eb3f4addc5..e43ee0f94e 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -65,6 +65,8 @@ void common_hal_rp2pio_statemachine_run(rp2pio_statemachine_obj_t *self, const u // Writes out the given data. bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self); bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes); bool common_hal_rp2pio_statemachine_write_readinto(rp2pio_statemachine_obj_t *self, const uint8_t *data_out, size_t out_len, uint8_t out_stride_in_bytes, diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index cd1d383008..78118d20f1 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -848,3 +848,11 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { uint8_t sm = self->state_machine; return _current_program_offset[pio_index][sm]; } + +bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { + return false; +} + +bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self) { + return false; +} From af59f4938af194ef7739010282431d6a5da7970d Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 19 Apr 2022 12:57:22 -0400 Subject: [PATCH 0146/2403] Missing double-quote --- shared-bindings/math/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index f25c261ef5..c6ecbad2b6 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -159,7 +159,7 @@ STATIC NORETURN void math_error(void) { //| //| def log(x: float, base: float = math.e) -> float: //| """Return the logarithm of x to the given base. If base is not specified, -//| returns the natural logarithm (base e) of x"" +//| returns the natural logarithm (base e) of x""" //| ... //| //| def modf(x: float) -> Tuple[float, float]: From 63c18ce748c7e1efaffe43a1fb38ca19981b457b Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 12:57:42 -0400 Subject: [PATCH 0147/2403] Change signature of math.log() to use value for base --- shared-bindings/math/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index f25c261ef5..f0698164a7 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -157,7 +157,7 @@ STATIC NORETURN void math_error(void) { //| """Return ``x * (2**exp)``.""" //| ... //| -//| def log(x: float, base: float = math.e) -> float: +//| def log(x: float, base: float = 2.71828) -> float: //| """Return the logarithm of x to the given base. If base is not specified, //| returns the natural logarithm (base e) of x"" //| ... From 59ccbc6316d94c63772ba69ceec99d49937f777e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Siyabend=20=C3=9Cr=C3=BCn?= Date: Mon, 18 Apr 2022 16:47:05 +0000 Subject: [PATCH 0148/2403] Translated using Weblate (Turkish) Currently translated at 12.6% (133 of 1052 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/tr/ --- locale/tr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/locale/tr.po b/locale/tr.po index f90b408411..a7d6c46b76 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-01-16 13:56+0000\n" -"Last-Translator: Gökhan Koçmarlı \n" +"PO-Revision-Date: 2022-04-19 17:07+0000\n" +"Last-Translator: Siyabend Ürün \n" "Language-Team: none\n" "Language: tr\n" "MIME-Version: 1.0\n" "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.10.1\n" +"X-Generator: Weblate 4.12-dev\n" #: main.c msgid "" @@ -515,7 +515,7 @@ msgstr "Dizi değerleri tekil bytelar olmalıdır." #: shared-bindings/microcontroller/Pin.c msgid "At most %d %q may be specified (not %d)" -msgstr "" +msgstr "En az %d %q belirtilmeli (%d değil)" #: shared-module/memorymonitor/AllocationAlarm.c #, c-format @@ -570,23 +570,24 @@ msgstr "" #: shared-bindings/rgbmatrix/RGBMatrix.c #, c-format msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" +msgstr "Bit derinliği 1-6 aralığında olmalı, %d değil" #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." -msgstr "" +msgstr "Bit derinliği 8'in katı olacak şekilde olmalı." #: shared-bindings/bitmaptools/__init__.c +#, fuzzy msgid "Bitmap size and bits per value must match" -msgstr "" +msgstr "Bitmap boyutu ve bit başına değer uyuşmalı" #: supervisor/shared/safe_mode.c msgid "Boot device must be first device (interface #0)." -msgstr "" +msgstr "Önyükleme cihazı ilk cihaz olmalı (arayüz #0)." #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "Both RX and TX required for flow control" -msgstr "" +msgstr "Hem RX hem de TX akış kontrolü için gerekli" #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c msgid "Both pins must support hardware interrupts" From 36e7b49ddd15fa18ac1a24cb8c9d050a2d0d5aad Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 19 Apr 2022 13:26:10 -0400 Subject: [PATCH 0149/2403] update all frozen libraries --- frozen/Adafruit_CircuitPython_APDS9960 | 2 +- frozen/Adafruit_CircuitPython_BLE | 2 +- frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +- frozen/Adafruit_CircuitPython_BusDevice | 2 +- frozen/Adafruit_CircuitPython_CircuitPlayground | 2 +- frozen/Adafruit_CircuitPython_Display_Shapes | 2 +- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_DotStar | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_FocalTouch | 2 +- frozen/Adafruit_CircuitPython_IRRemote | 2 +- frozen/Adafruit_CircuitPython_LC709203F | 2 +- frozen/Adafruit_CircuitPython_LSM6DS | 2 +- frozen/Adafruit_CircuitPython_MIDI | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_PortalBase | 2 +- frozen/Adafruit_CircuitPython_SD | 2 +- frozen/Adafruit_CircuitPython_ST7789 | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960 index baab505fd4..9bd4882092 160000 --- a/frozen/Adafruit_CircuitPython_APDS9960 +++ b/frozen/Adafruit_CircuitPython_APDS9960 @@ -1 +1 @@ -Subproject commit baab505fd4dcc54d8e9d45e6463c68bdc6d100eb +Subproject commit 9bd48820928afad549832fe9b4ae497b224007f0 diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index beec030657..de7cacfbb4 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit beec03065712cd62f79e839d5cf8f7c9847fc3b1 +Subproject commit de7cacfbb4bddf74f5188f23b56f075c884f98c4 diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center index 859a7d403e..258bb62c58 160000 --- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center +++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center @@ -1 +1 @@ -Subproject commit 859a7d403e4e79ec1c8915c81ba581dbaab8a4ac +Subproject commit 258bb62c58e545c38749b8a66f5872035b2384cb diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index a8abc3aa8d..b96f0d2794 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit a8abc3aa8dece6c4d0152b001dfca7d2c279f899 +Subproject commit b96f0d279481446017ca1cc1ff4abf1f5a10346f diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index b04042addd..f82d3ef195 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit b04042addd47c2645e139032b02a3b9ddeeb3425 +Subproject commit f82d3ef195256aa71d274a34ea25f760d7e651d1 diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes index 708bb0c82c..2fad6f2f98 160000 --- a/frozen/Adafruit_CircuitPython_Display_Shapes +++ b/frozen/Adafruit_CircuitPython_Display_Shapes @@ -1 +1 @@ -Subproject commit 708bb0c82c7b075bd6912c97231aea880b1a1cb8 +Subproject commit 2fad6f2f98c0df135e2306d32af18bb2796b852c diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index 0bd04a2355..de3276cc08 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit 0bd04a235556979bd13a373821a6602445fe132b +Subproject commit de3276cc08ba13901d1f69060ff7501c1699bc4d diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index eb6124fdff..a90579e1e1 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit eb6124fdff59b98d7d49dd86072df99c0e97167b +Subproject commit a90579e1e1e1c973e6ba8f6cf8e914d77fc8f0f2 diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index 13775b0584..ddd26eb4ab 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit 13775b058422085762874fde8e587f2e9f066855 +Subproject commit ddd26eb4abcd3c10ae5dd33b1345d10d58707995 diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch index bccbe3da75..a77f0f9c2e 160000 --- a/frozen/Adafruit_CircuitPython_FocalTouch +++ b/frozen/Adafruit_CircuitPython_FocalTouch @@ -1 +1 @@ -Subproject commit bccbe3da75f42b540b3faebb9d5a2d1ccf5e7147 +Subproject commit a77f0f9c2e8f64568bbb68254d0134fbc7b5a8af diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote index 9771c9369c..1e478b1530 160000 --- a/frozen/Adafruit_CircuitPython_IRRemote +++ b/frozen/Adafruit_CircuitPython_IRRemote @@ -1 +1 @@ -Subproject commit 9771c9369c7e251f514eb26abcfcea1e891e6f27 +Subproject commit 1e478b1530b3be81bd84f13620d0a23502d377f1 diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F index 29816fbe98..a9cf0cde77 160000 --- a/frozen/Adafruit_CircuitPython_LC709203F +++ b/frozen/Adafruit_CircuitPython_LC709203F @@ -1 +1 @@ -Subproject commit 29816fbe98c012ea0a1b5cae7f07aeae7ebf8b52 +Subproject commit a9cf0cde77c185c6bbc79a3b6d77dd024a9683d2 diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index 75e9ec62e4..2dfd61a0d5 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit 75e9ec62e4fe47a7212a69fb84aa1cfa7848e2b3 +Subproject commit 2dfd61a0d5ffc8048e72d24e5ecdac9a74bb2bc3 diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI index 6641509ef4..3d871907f0 160000 --- a/frozen/Adafruit_CircuitPython_MIDI +++ b/frozen/Adafruit_CircuitPython_MIDI @@ -1 +1 @@ -Subproject commit 6641509ef43b672a82addf41f02b6466d6c67f01 +Subproject commit 3d871907f0187c627277382f184209f5520703a6 diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index a115fc30df..36d4a31010 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit a115fc30df1c230c09c8a533ca77f3a4afd9f6c3 +Subproject commit 36d4a31010461e47f265553ebd764c69d38a254c diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase index 77ba8eedf8..2bc1b86ef2 160000 --- a/frozen/Adafruit_CircuitPython_PortalBase +++ b/frozen/Adafruit_CircuitPython_PortalBase @@ -1 +1 @@ -Subproject commit 77ba8eedf89b96c85a6194e5da2061c9d5c20242 +Subproject commit 2bc1b86ef2e709f31aea65469964b777f1da6d5b diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index 9dd51fecfc..22cb706e5f 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit 9dd51fecfcbb15cb2a00eeadbd66b36ce0c09ee2 +Subproject commit 22cb706e5f718988d5442246120defd21c5937c9 diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 index 79c70a4928..5fdd62ab69 160000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ b/frozen/Adafruit_CircuitPython_ST7789 @@ -1 +1 @@ -Subproject commit 79c70a49285be8b6548de3f5ca20aa5ac1fafa22 +Subproject commit 5fdd62ab69fda70407644acc6f9b45681da9ef68 diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index c89c868916..3aaf72165b 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit c89c8689161e5b35bfe4fa8355615696e03f0648 +Subproject commit 3aaf72165bc6ba10bf5219716c8654651649f87b From 211d42f58d9f1585a7291ad0058b1cc346bc63ec Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 13:27:46 -0400 Subject: [PATCH 0150/2403] Change value of base in math.log to e --- shared-bindings/math/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index 2d76341b25..4146112d20 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -157,7 +157,7 @@ STATIC NORETURN void math_error(void) { //| """Return ``x * (2**exp)``.""" //| ... //| -//| def log(x: float, base: float = 2.71828) -> float: +//| def log(x: float, base: float = e) -> float: //| """Return the logarithm of x to the given base. If base is not specified, //| returns the natural logarithm (base e) of x""" //| ... From 9274e6a681937cdbead3e12f6969bc2656c97ad5 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 14:13:38 -0400 Subject: [PATCH 0151/2403] Fix signature of random.randrange() to show multiple signatures in stub --- shared-bindings/random/__init__.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index d6aecbf322..f90d9a6e90 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -75,8 +75,13 @@ STATIC mp_obj_t random_getrandbits(mp_obj_t num_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits); -//| def randrange(stop: Tuple[int, int, int]) -> int: -//| """Returns a randomly selected integer from ``range(start, stop, step)``.""" +//| @overload +//| def randrange(stop: int) -> int: ... +//| @overload +//| def randrange(start: int, stop: int) -> int: ... +//| @overload +//| def randrange(start: int, stop: int, step: int): +//| """Returns a randomly selected integer from ``range(start[, stop[, step]])``.""" //| ... //| STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) { From 3a5973084f6c972eac30171d6471b4d72b374670 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 19 Apr 2022 16:14:01 -0400 Subject: [PATCH 0152/2403] Add return type for 3-argument random.randrange() --- shared-bindings/random/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index f90d9a6e90..838e1e72ca 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -80,7 +80,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits); //| @overload //| def randrange(start: int, stop: int) -> int: ... //| @overload -//| def randrange(start: int, stop: int, step: int): +//| def randrange(start: int, stop: int, step: int) -> int: //| """Returns a randomly selected integer from ``range(start[, stop[, step]])``.""" //| ... //| From 33d6d556754b40cceeb7d4bc92cfbacddeca5a9e Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 19 Apr 2022 15:14:50 -0500 Subject: [PATCH 0153/2403] the basics work the sequence has to be a minimum length, 8 entries, but this problem is not detected. I don't THINK this is an insurmountable problem. --- ports/raspberrypi/audio_dma.c | 16 ++- .../bindings/rp2pio/StateMachine.c | 2 +- .../bindings/rp2pio/StateMachine.h | 2 +- .../common-hal/rp2pio/StateMachine.c | 116 +++++++++++++++++- .../common-hal/rp2pio/StateMachine.h | 10 ++ ports/raspberrypi/mpconfigport.h | 1 + 6 files changed, 139 insertions(+), 8 deletions(-) diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c index b7e5a0db44..4bb89601ff 100644 --- a/ports/raspberrypi/audio_dma.c +++ b/ports/raspberrypi/audio_dma.c @@ -29,6 +29,7 @@ #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/audiocore/WaveFile.h" #include "shared-bindings/microcontroller/__init__.h" +#include "bindings/rp2pio/StateMachine.h" #include "supervisor/background_callback.h" #include "py/mpstate.h" @@ -324,7 +325,9 @@ void audio_dma_stop(audio_dma_t *dma) { channel_mask |= 1 << dma->channel[1]; } dma_hw->inte0 &= ~channel_mask; - irq_set_mask_enabled(1 << DMA_IRQ_0, false); + if (!dma_hw->inte0) { + irq_set_mask_enabled(1 << DMA_IRQ_0, false); + } // Run any remaining audio tasks because we remove ourselves from // playing_audio. @@ -442,13 +445,20 @@ STATIC void dma_callback_fun(void *arg) { void isr_dma_0(void) { for (size_t i = 0; i < NUM_DMA_CHANNELS; i++) { uint32_t mask = 1 << i; - if ((dma_hw->intr & mask) != 0 && MP_STATE_PORT(playing_audio)[i] != NULL) { + if ((dma_hw->intr & mask) == 0) { + continue; + } + if (MP_STATE_PORT(playing_audio)[i] != NULL) { audio_dma_t *dma = MP_STATE_PORT(playing_audio)[i]; // Record all channels whose DMA has completed; they need loading. dma->channels_to_load_mask |= mask; background_callback_add(&dma->callback, dma_callback_fun, (void *)dma); - dma_hw->ints0 = mask; } + if (MP_STATE_PORT(continuous_pio)[i] != NULL) { + rp2pio_statemachine_obj_t *pio = MP_STATE_PORT(continuous_pio)[i]; + rp2pio_statemachine_dma_complete(pio, i); + } + dma_hw->ints0 = mask; } } diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 8c735479f5..c3b0d52642 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -480,7 +480,7 @@ STATIC mp_obj_t rp2pio_statemachine_start_continuous_write(size_t n_args, const mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); } - ok = common_hal_rp2pio_statemachine_start_continuous_write(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); + ok = common_hal_rp2pio_statemachine_start_continuous_write(self, args[ARG_buffer].u_obj, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); } if (!ok) { mp_raise_OSError(MP_EIO); diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index e43ee0f94e..2c8e78a3d2 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -65,7 +65,7 @@ void common_hal_rp2pio_statemachine_run(rp2pio_statemachine_obj_t *self, const u // Writes out the given data. bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); -bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes); bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self); bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes); bool common_hal_rp2pio_statemachine_write_readinto(rp2pio_statemachine_obj_t *self, diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 78118d20f1..1c4cbcf96e 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -42,6 +42,8 @@ #include "py/objproperty.h" #include "py/runtime.h" +#define NO_DMA_CHANNEL (-1) + // Count how many state machines are using each pin. STATIC uint8_t _pin_reference_count[TOTAL_GPIO_COUNT]; STATIC uint32_t _current_program_id[NUM_PIOS][NUM_PIO_STATE_MACHINES]; @@ -330,6 +332,9 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, sm_config_set_fifo_join(&c, join); self->sm_config = c; + // no DMA allocated + self->dma_channel[0] = self->dma_channel[1] = NO_DMA_CHANNEL; + pio_sm_init(self->pio, self->state_machine, program_offset, &c); common_hal_rp2pio_statemachine_run(self, init, init_len); @@ -581,6 +586,7 @@ void common_hal_rp2pio_statemachine_set_frequency(rp2pio_statemachine_obj_t *sel void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins) { common_hal_rp2pio_statemachine_stop(self); + (void)common_hal_rp2pio_statemachine_end_continuous_write(self); uint8_t sm = self->state_machine; uint8_t pio_index = pio_get_index(self->pio); @@ -849,10 +855,114 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { return _current_program_offset[pio_index][sm]; } -bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { - return false; +#define HERE(fmt, ...) (mp_printf(&mp_plat_print, "%s: %d: " fmt "\n", __FILE__, __LINE__,##__VA_ARGS__)) + +bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { + if (self->dma_channel[0] != NO_DMA_CHANNEL && stride_in_bytes == self->continuous_stride_in_bytes) { + HERE("updating channel pending=%d\n", self->pending_set_data); + while (self->pending_set_data) { + RUN_BACKGROUND_TASKS; + if (self->user_interruptible && mp_hal_is_interrupted()) { + (void)common_hal_rp2pio_statemachine_end_continuous_write(self); + return false; + } + } + + common_hal_mcu_disable_interrupts(); + self->next_buffer = data; + self->next_size = len / stride_in_bytes; + self->pending_set_data = true; + common_hal_mcu_enable_interrupts(); + + // need to keep a reference alive to the buffer, lest the GC collect it while its lone remaining pointer is in the DMA peripheral register + self->buf_objs[++self->buf_obj_idx % 2] = buf_obj; + return true; + } + + common_hal_rp2pio_statemachine_end_continuous_write(self); + + for (int i = 0; i < 2; i++) { + HERE("allocating channel %d", i); + if (self->dma_channel[i] == -1) { + self->dma_channel[i] = dma_claim_unused_channel(false); + HERE("got channel %d", self->dma_channel[i]); + MP_STATE_PORT(continuous_pio)[self->dma_channel[i]] = self; + } + if (self->dma_channel[i] == -1) { + HERE("allocating channel %d failed", i); + (void)common_hal_rp2pio_statemachine_end_continuous_write(self); + return false; + } + } + + volatile uint8_t *tx_destination = (volatile uint8_t *)&self->pio->txf[self->state_machine]; + + self->tx_dreq = pio_get_dreq(self->pio, self->state_machine, true); + + dma_channel_config c; + + self->pending_set_data = false; + self->continuous_stride_in_bytes = stride_in_bytes; + self->buf_objs[0] = buf_obj; + self->buf_objs[1] = NULL; + + self->next_buffer = data; + self->next_size = len / stride_in_bytes; + + c = dma_channel_get_default_config(self->dma_channel[0]); + channel_config_set_transfer_data_size(&c, _stride_to_dma_size(stride_in_bytes)); + channel_config_set_dreq(&c, self->tx_dreq); + channel_config_set_read_increment(&c, true); + channel_config_set_write_increment(&c, false); + // channel_config_set_chain_to(&c, self->dma_channel[1]); + dma_channel_configure(self->dma_channel[0], &c, + tx_destination, + data, + len / stride_in_bytes, + false); + + #if 0 + channel_config_set_chain_to(&c, self->dma_channel[0]); + dma_channel_configure(self->dma_channel[1], &c, + tx_destination, + data, + len / stride_in_bytes, + false); + #endif + + dma_hw->inte0 |= (1 << self->dma_channel[0]) | (1 << self->dma_channel[1]); + irq_set_mask_enabled(1 << DMA_IRQ_0, true); + + HERE("OK let's go"); + dma_start_channel_mask(1u << self->dma_channel[0]); + return true; +} + +void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel) { + HERE("dma complete[%d] pending set data=%d busy=%d,%d %d@%p", channel, self->pending_set_data, dma_channel_is_busy(self->dma_channel[0]), dma_channel_is_busy(self->dma_channel[1]), + self->next_size, self->next_buffer); + + dma_channel_set_read_addr(channel, self->next_buffer, false); + dma_channel_set_trans_count(channel, self->next_size, true); + + self->pending_set_data = false; } bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self) { - return false; + for (int i = 0; i < 2; i++) { + if (self->dma_channel[i] == NO_DMA_CHANNEL) { + continue; + } + int channel = self->dma_channel[i]; + uint32_t channel_mask = 1u << channel; + dma_hw->inte0 &= ~channel_mask; + if (!dma_hw->inte0) { + irq_set_mask_enabled(1 << DMA_IRQ_0, false); + } + MP_STATE_PORT(continuous_pio)[channel] = NULL; + dma_channel_abort(channel); + dma_channel_unclaim(channel); + self->dma_channel[i] = NO_DMA_CHANNEL; + } + return true; } diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h index 0e8e7a3806..776fa0ce89 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h @@ -54,6 +54,15 @@ typedef struct { bool in_shift_right; bool user_interruptible; uint8_t offset; + + // dma-related items + uint8_t buf_obj_idx; + const uint8_t *next_buffer; + size_t next_size; + int dma_channel[2]; + mp_obj_t buf_objs[2]; + int continuous_stride_in_bytes; + volatile int pending_set_data; } rp2pio_statemachine_obj_t; void reset_rp2pio_statemachine(void); @@ -82,6 +91,7 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self); void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins); +void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel); extern const mp_obj_type_t rp2pio_statemachine_type; diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h index 0259ffd023..f4835bf2e9 100644 --- a/ports/raspberrypi/mpconfigport.h +++ b/ports/raspberrypi/mpconfigport.h @@ -46,6 +46,7 @@ #define MICROPY_PORT_ROOT_POINTERS \ mp_obj_t counting[NUM_PWM_SLICES]; \ mp_obj_t playing_audio[NUM_DMA_CHANNELS]; \ + mp_obj_t continuous_pio[NUM_DMA_CHANNELS]; \ CIRCUITPY_COMMON_ROOT_POINTERS; #endif // __INCLUDED_MPCONFIGPORT_H From 49769cfea408aa212d7310acefa8c91f1a2eaa92 Mon Sep 17 00:00:00 2001 From: KurtE Date: Tue, 19 Apr 2022 14:02:16 -0700 Subject: [PATCH 0154/2403] Convert to use debug rx/tx pins to trigger adding this code As per review request --- ports/mimxrt10xx/supervisor/serial.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/mimxrt10xx/supervisor/serial.c b/ports/mimxrt10xx/supervisor/serial.c index 4223ab4f5b..63f468beaf 100644 --- a/ports/mimxrt10xx/supervisor/serial.c +++ b/ports/mimxrt10xx/supervisor/serial.c @@ -34,12 +34,11 @@ #include "fsl_lpuart.h" // TODO: Switch this to using DEBUG_UART. -// Need official way to turn off the port serial code when it is not needed -#if defined(USE_DEBUG_PORT_CODE) +// If the board defined a debug uart tx or rx pin then we enable this code +#if defined(CIRCUITPY_DEBUG_UART_TX) || defined(CIRCUITPY_DEBUG_UART_RX) // static LPUART_Type *uart_instance = LPUART1; // evk static LPUART_Type *uart_instance = LPUART4; // feather 1011 // static LPUART_Type *uart_instance = LPUART2; // feather 1062 - static uint32_t UartSrcFreq(void) { uint32_t freq; From b128f180cac750ccf180328684edf50151dfe0d3 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 19 Apr 2022 16:33:51 -0500 Subject: [PATCH 0155/2403] switch to single single dma channel, fix some bugs --- .../bindings/rp2pio/StateMachine.c | 6 ++ .../common-hal/rp2pio/StateMachine.c | 97 ++++++++++--------- .../common-hal/rp2pio/StateMachine.h | 1 - 3 files changed, 56 insertions(+), 48 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index c3b0d52642..6032d3c554 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -482,6 +482,9 @@ STATIC mp_obj_t rp2pio_statemachine_start_continuous_write(size_t n_args, const ok = common_hal_rp2pio_statemachine_start_continuous_write(self, args[ARG_buffer].u_obj, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); } + if (mp_hal_is_interrupted()) { + return mp_const_none; + } if (!ok) { mp_raise_OSError(MP_EIO); } @@ -495,6 +498,9 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_start_continuous_write_obj, 2, rp STATIC mp_obj_t rp2pio_statemachine_obj_end_continuous_write(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); bool ok = common_hal_rp2pio_statemachine_end_continuous_write(self); + if (mp_hal_is_interrupted()) { + return mp_const_none; + } if (!ok) { mp_raise_OSError(MP_EIO); } diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 1c4cbcf96e..85ce22e577 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -53,6 +53,12 @@ STATIC bool _never_reset[NUM_PIOS][NUM_PIO_STATE_MACHINES]; STATIC uint32_t _current_pins[NUM_PIOS]; STATIC uint32_t _current_sm_pins[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +STATIC int8_t _sm_dma_plus_one[NUM_PIOS][NUM_PIO_STATE_MACHINES]; + +#define SM_DMA_ALLOCATED(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] != 0) +#define SM_DMA_GET_CHANNEL(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] - 1) +#define SM_DMA_CLEAR_CHANNEL(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] = 0) +#define SM_DMA_SET_CHANNEL(pio_isntance, sm, channel) (_sm_dma_plus_one[(pio_index)][(sm)] = (channel) + 1) STATIC PIO pio_instances[2] = {pio0, pio1}; typedef void (*interrupt_handler_type)(void *); @@ -72,8 +78,24 @@ static void rp2pio_statemachine_set_pull(uint32_t pull_pin_up, uint32_t pull_pin } } +STATIC void rp2pio_statemachine_clear_dma(int pio_index, int sm) { + if (SM_DMA_ALLOCATED(pio_index, sm)) { + int channel = SM_DMA_GET_CHANNEL(pio_index, sm); + uint32_t channel_mask = 1u << channel; + dma_hw->inte0 &= ~channel_mask; + if (!dma_hw->inte0) { + irq_set_mask_enabled(1 << DMA_IRQ_0, false); + } + MP_STATE_PORT(continuous_pio)[channel] = NULL; + dma_channel_abort(channel); + dma_channel_unclaim(channel); + } + SM_DMA_CLEAR_CHANNEL(pio_index, sm); +} + STATIC void _reset_statemachine(PIO pio, uint8_t sm, bool leave_pins) { uint8_t pio_index = pio_get_index(pio); + rp2pio_statemachine_clear_dma(pio_index, sm); uint32_t program_id = _current_program_id[pio_index][sm]; if (program_id == 0) { return; @@ -333,7 +355,7 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self, self->sm_config = c; // no DMA allocated - self->dma_channel[0] = self->dma_channel[1] = NO_DMA_CHANNEL; + SM_DMA_CLEAR_CHANNEL(pio_index, state_machine); pio_sm_init(self->pio, self->state_machine, program_offset, &c); common_hal_rp2pio_statemachine_run(self, init, init_len); @@ -858,7 +880,10 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { #define HERE(fmt, ...) (mp_printf(&mp_plat_print, "%s: %d: " fmt "\n", __FILE__, __LINE__,##__VA_ARGS__)) bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { - if (self->dma_channel[0] != NO_DMA_CHANNEL && stride_in_bytes == self->continuous_stride_in_bytes) { + uint8_t pio_index = pio_get_index(self->pio); + uint8_t sm = self->state_machine; + + if (SM_DMA_ALLOCATED(pio_index, sm) && stride_in_bytes == self->continuous_stride_in_bytes) { HERE("updating channel pending=%d\n", self->pending_set_data); while (self->pending_set_data) { RUN_BACKGROUND_TASKS; @@ -881,19 +906,15 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o common_hal_rp2pio_statemachine_end_continuous_write(self); - for (int i = 0; i < 2; i++) { - HERE("allocating channel %d", i); - if (self->dma_channel[i] == -1) { - self->dma_channel[i] = dma_claim_unused_channel(false); - HERE("got channel %d", self->dma_channel[i]); - MP_STATE_PORT(continuous_pio)[self->dma_channel[i]] = self; - } - if (self->dma_channel[i] == -1) { - HERE("allocating channel %d failed", i); - (void)common_hal_rp2pio_statemachine_end_continuous_write(self); - return false; - } + HERE("allocating dma channel"); + int channel = dma_claim_unused_channel(false); + if (channel == -1) { + HERE("allocating DMA channel failed"); + return false; } + HERE("got channel %d", channel); + + SM_DMA_SET_CHANNEL(pio_index, sm, channel); volatile uint8_t *tx_destination = (volatile uint8_t *)&self->pio->txf[self->state_machine]; @@ -909,37 +930,31 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o self->next_buffer = data; self->next_size = len / stride_in_bytes; - c = dma_channel_get_default_config(self->dma_channel[0]); + c = dma_channel_get_default_config(channel); channel_config_set_transfer_data_size(&c, _stride_to_dma_size(stride_in_bytes)); channel_config_set_dreq(&c, self->tx_dreq); channel_config_set_read_increment(&c, true); channel_config_set_write_increment(&c, false); - // channel_config_set_chain_to(&c, self->dma_channel[1]); - dma_channel_configure(self->dma_channel[0], &c, + dma_channel_configure(channel, &c, tx_destination, data, len / stride_in_bytes, false); - - #if 0 - channel_config_set_chain_to(&c, self->dma_channel[0]); - dma_channel_configure(self->dma_channel[1], &c, - tx_destination, - data, - len / stride_in_bytes, - false); - #endif - - dma_hw->inte0 |= (1 << self->dma_channel[0]) | (1 << self->dma_channel[1]); - irq_set_mask_enabled(1 << DMA_IRQ_0, true); - HERE("OK let's go"); - dma_start_channel_mask(1u << self->dma_channel[0]); + + common_hal_mcu_disable_interrupts(); + MP_STATE_PORT(continuous_pio)[channel] = self; + dma_hw->inte0 |= 1u << channel; + irq_set_mask_enabled(1 << DMA_IRQ_0, true); + dma_start_channel_mask(1u << channel); + common_hal_mcu_enable_interrupts(); + + HERE("mark"); return true; } void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel) { - HERE("dma complete[%d] pending set data=%d busy=%d,%d %d@%p", channel, self->pending_set_data, dma_channel_is_busy(self->dma_channel[0]), dma_channel_is_busy(self->dma_channel[1]), + HERE("dma complete[%d] pending set data=%d %sbusy %d@%p", channel, self->pending_set_data, dma_channel_is_busy(channel) ? "not " : "", self->next_size, self->next_buffer); dma_channel_set_read_addr(channel, self->next_buffer, false); @@ -949,20 +964,8 @@ void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int chann } bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self) { - for (int i = 0; i < 2; i++) { - if (self->dma_channel[i] == NO_DMA_CHANNEL) { - continue; - } - int channel = self->dma_channel[i]; - uint32_t channel_mask = 1u << channel; - dma_hw->inte0 &= ~channel_mask; - if (!dma_hw->inte0) { - irq_set_mask_enabled(1 << DMA_IRQ_0, false); - } - MP_STATE_PORT(continuous_pio)[channel] = NULL; - dma_channel_abort(channel); - dma_channel_unclaim(channel); - self->dma_channel[i] = NO_DMA_CHANNEL; - } + uint8_t pio_index = pio_get_index(self->pio); + uint8_t sm = self->state_machine; + rp2pio_statemachine_clear_dma(pio_index, sm); return true; } diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h index 776fa0ce89..5a0deb5ed0 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h @@ -59,7 +59,6 @@ typedef struct { uint8_t buf_obj_idx; const uint8_t *next_buffer; size_t next_size; - int dma_channel[2]; mp_obj_t buf_objs[2]; int continuous_stride_in_bytes; volatile int pending_set_data; From ebc426d9e6447df377e62ff58dac3b15aa42dbd2 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 19 Apr 2022 16:39:04 -0500 Subject: [PATCH 0156/2403] Remove debug prints, improve docs --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 9 +++++---- ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 11 ----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 6032d3c554..464985782a 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -426,7 +426,7 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write); -//| def continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None: +//| def start_continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None: //| """Write the data contained in ``buffer`` to the state machine repeatedly until stopped. If the buffer is empty or None, an existing continuous_write is canceled. //| //| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements @@ -434,11 +434,12 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| the other byte positions. So, pulling more data in the PIO assembly will read the duplicated values. //| //| To perform 16 or 32 bits writes into the FIFO use an `array.array` with a type code of the desired -//| size. +//| size, or use `memoryview.cast` to change the interpretation of an existing buffer. //| //| To atomically change from one buffer to another, simply call -//| `StateMachine.continuous_write` again with a different buffer. -//| The call will only return once outputting the new buffer has started. +//| `StateMachine.continuous_write` again with a different buffer with the same element size. +//| The call will only return once DMA has started putting the previous +//| buffer's data into the PIO FIFO. //| //| If the buffer is modified while it is being written out, the updated //| values will be used. However, because of interactions between CPU diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 85ce22e577..7e35b33bd7 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -877,14 +877,11 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { return _current_program_offset[pio_index][sm]; } -#define HERE(fmt, ...) (mp_printf(&mp_plat_print, "%s: %d: " fmt "\n", __FILE__, __LINE__,##__VA_ARGS__)) - bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { uint8_t pio_index = pio_get_index(self->pio); uint8_t sm = self->state_machine; if (SM_DMA_ALLOCATED(pio_index, sm) && stride_in_bytes == self->continuous_stride_in_bytes) { - HERE("updating channel pending=%d\n", self->pending_set_data); while (self->pending_set_data) { RUN_BACKGROUND_TASKS; if (self->user_interruptible && mp_hal_is_interrupted()) { @@ -906,13 +903,10 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o common_hal_rp2pio_statemachine_end_continuous_write(self); - HERE("allocating dma channel"); int channel = dma_claim_unused_channel(false); if (channel == -1) { - HERE("allocating DMA channel failed"); return false; } - HERE("got channel %d", channel); SM_DMA_SET_CHANNEL(pio_index, sm, channel); @@ -940,7 +934,6 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o data, len / stride_in_bytes, false); - HERE("OK let's go"); common_hal_mcu_disable_interrupts(); MP_STATE_PORT(continuous_pio)[channel] = self; @@ -949,14 +942,10 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o dma_start_channel_mask(1u << channel); common_hal_mcu_enable_interrupts(); - HERE("mark"); return true; } void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel) { - HERE("dma complete[%d] pending set data=%d %sbusy %d@%p", channel, self->pending_set_data, dma_channel_is_busy(channel) ? "not " : "", - self->next_size, self->next_buffer); - dma_channel_set_read_addr(channel, self->next_buffer, false); dma_channel_set_trans_count(channel, self->next_size, true); From 144eb5dfd4f6e83a88776d6548a5cd5917dee04d Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 19 Apr 2022 16:42:27 -0500 Subject: [PATCH 0157/2403] fix lost DMA IRQ --- ports/raspberrypi/audio_dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c index 4bb89601ff..01efde6a9a 100644 --- a/ports/raspberrypi/audio_dma.c +++ b/ports/raspberrypi/audio_dma.c @@ -448,6 +448,11 @@ void isr_dma_0(void) { if ((dma_hw->intr & mask) == 0) { continue; } + // acknowledge interrupt early. Doing so late means that you could lose an + // interrupt if the buffer is very small and the DMA operation + // completed by the time callback_add() / dma_complete() returned. This + // affected PIO continuous write more than audio. + dma_hw->ints0 = mask; if (MP_STATE_PORT(playing_audio)[i] != NULL) { audio_dma_t *dma = MP_STATE_PORT(playing_audio)[i]; // Record all channels whose DMA has completed; they need loading. @@ -458,7 +463,6 @@ void isr_dma_0(void) { rp2pio_statemachine_obj_t *pio = MP_STATE_PORT(continuous_pio)[i]; rp2pio_statemachine_dma_complete(pio, i); } - dma_hw->ints0 = mask; } } From aeff1cddaaa768144b65cb04a5d2517419d50188 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 19 Apr 2022 22:32:08 -0400 Subject: [PATCH 0159/2403] Add docs/templates to templates in conf.py --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 7818d78917..df468d3d0e 100644 --- a/conf.py +++ b/conf.py @@ -83,7 +83,7 @@ extensions = [ ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['templates'] +templates_path = ['templates', "docs/templates"] # The suffix of source filenames. source_suffix = { From 2e9e29bf1b1758a171e36aac10e8e978778cc906 Mon Sep 17 00:00:00 2001 From: mjs513 Date: Wed, 20 Apr 2022 04:10:16 -0400 Subject: [PATCH 0160/2403] Delete Left Over Comments --- locale/circuitpython.pot | 8 ++++---- shared-bindings/microcontroller/Processor.c | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index eabace6931..da413022ba 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2154,10 +2154,6 @@ msgstr "" msgid "Set pin count must be between 1 and 5" msgstr "" -#: shared-bindings/microcontroller/Processor.c -msgid "Settable Clock Not Implemented for Your Board" -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Side set pin count must be between 1 and 5" msgstr "" @@ -3282,6 +3278,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index df9d5a9df9..423480435e 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -30,10 +30,6 @@ #include #include -// #include "py/objproperty.h" - -// #include "py/runtime.h" - #include "shared-bindings/util.h" #include "shared/runtime/buffer_helper.h" @@ -78,7 +74,7 @@ STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) { uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency); common_hal_mcu_processor_set_frequency(self, value_of_freq); #else - mp_raise_msg(&mp_type_NotImplementedError,translate("Settable Clock Not Implemented for Your Board")); + mp_raise_msg(&mp_type_NotImplementedError,translate("frequency is read-only for this board")); #endif return mp_const_none; } From e4944fc98dbd2722ca2712af38893b4aa1345515 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Wed, 20 Apr 2022 14:31:52 +0200 Subject: [PATCH 0161/2403] 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 | 11 ++++++++++- locale/cs.po | 11 ++++++++++- locale/de_DE.po | 11 ++++++++++- locale/el.po | 11 ++++++++++- locale/en_GB.po | 11 ++++++++++- locale/es.po | 11 ++++++++++- locale/fil.po | 11 ++++++++++- locale/fr.po | 11 ++++++++++- locale/hi.po | 11 ++++++++++- locale/it_IT.po | 11 ++++++++++- locale/ja.po | 11 ++++++++++- locale/ko.po | 11 ++++++++++- locale/nl.po | 11 ++++++++++- locale/pl.po | 11 ++++++++++- locale/pt_BR.po | 11 ++++++++++- locale/ru.po | 11 ++++++++++- locale/sv.po | 11 ++++++++++- locale/tr.po | 14 ++++++++++++-- locale/zh_Latn_pinyin.po | 11 ++++++++++- 19 files changed, 192 insertions(+), 20 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 875c6c46a1..2a230e14e4 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1124,6 +1124,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "Frekuensi harus cocok dengan PWMOut yang ada menggunakan timer ini" @@ -3054,7 +3059,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "kompresi header" @@ -3308,6 +3313,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 69227eefe9..7c2ac387d4 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1114,6 +1114,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3028,7 +3033,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3282,6 +3287,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 25bef643bd..7547691254 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1125,6 +1125,11 @@ msgstr "Format nicht unterstützt" msgid "Framebuffer requires %d bytes" msgstr "Framepuffer benötigt %d bytes" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3097,7 +3102,7 @@ msgstr "Komplexe Division durch null" msgid "complex values not supported" msgstr "Komplexe Zahlen nicht unterstützt" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "kompression header" @@ -3353,6 +3358,10 @@ msgstr "Die Schriftart (font) muss 2048 Byte lang sein" msgid "format requires a dict" msgstr "Format erfordert ein Wörterbuch (dict)" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "voll" diff --git a/locale/el.po b/locale/el.po index bad0723a70..6f0c064921 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1107,6 +1107,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3019,7 +3024,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3273,6 +3278,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index cc1801abba..590a62eab0 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1118,6 +1118,11 @@ msgstr "Format not supported" msgid "Framebuffer requires %d bytes" msgstr "Framebuffer requires %d bytes" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "Frequency must match existing PWMOut using this timer" @@ -3053,7 +3058,7 @@ msgstr "complex division by zero" msgid "complex values not supported" msgstr "complex values not supported" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "compression header" @@ -3308,6 +3313,10 @@ msgstr "font must be 2048 bytes long" msgid "format requires a dict" msgstr "format requires a dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "full" diff --git a/locale/es.po b/locale/es.po index c8dc2b9845..54c5450c9d 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1128,6 +1128,11 @@ msgstr "Sin capacidades para el formato" msgid "Framebuffer requires %d bytes" msgstr "Framebuffer requiere %d bytes" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3091,7 +3096,7 @@ msgstr "división compleja por cero" msgid "complex values not supported" msgstr "valores complejos no soportados" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "encabezado de compresión" @@ -3347,6 +3352,10 @@ msgstr "font debe ser 2048 bytes de largo" msgid "format requires a dict" msgstr "format requiere un dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "lleno" diff --git a/locale/fil.po b/locale/fil.po index 79dd7c1bdc..76483d726b 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1120,6 +1120,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3048,7 +3053,7 @@ msgstr "kumplikadong dibisyon sa pamamagitan ng zero" msgid "complex values not supported" msgstr "kumplikadong values hindi sinusuportahan" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "compression header" @@ -3307,6 +3312,10 @@ msgstr "font ay dapat 2048 bytes ang haba" msgid "format requires a dict" msgstr "kailangan ng format ng dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "puno" diff --git a/locale/fr.po b/locale/fr.po index 7f41ca2ced..86a6c33ea7 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1138,6 +1138,11 @@ msgstr "Format non supporté" msgid "Framebuffer requires %d bytes" msgstr "FrameBuffer nécessite %d octets" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3117,7 +3122,7 @@ msgstr "division complexe par zéro" msgid "complex values not supported" msgstr "valeurs complexes non supportées" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "entête de compression" @@ -3374,6 +3379,10 @@ msgstr "la police doit être longue de 2048 octets" msgid "format requires a dict" msgstr "le format nécessite un dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "plein" diff --git a/locale/hi.po b/locale/hi.po index 59aa535b3f..631a9ccb5f 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1107,6 +1107,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3019,7 +3024,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3273,6 +3278,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index ee8522f360..bbd745060d 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1125,6 +1125,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3064,7 +3069,7 @@ msgstr "complex divisione per zero" msgid "complex values not supported" msgstr "valori complessi non supportai" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "compressione dell'header" @@ -3322,6 +3327,10 @@ msgstr "il font deve essere lungo 2048 byte" msgid "format requires a dict" msgstr "la formattazione richiede un dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "pieno" diff --git a/locale/ja.po b/locale/ja.po index 5c483cfcd5..b2fa07d980 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1116,6 +1116,11 @@ msgstr "非対応の形式" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "このタイマーを使う既存のPWMOutと周波数を一致させる必要があります" @@ -3036,7 +3041,7 @@ msgstr "複素数ゼロ除算" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "圧縮ヘッダー" @@ -3292,6 +3297,10 @@ msgstr "fontは2048バイト長でなければなりません" msgid "format requires a dict" msgstr "formatにはdictが必要" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 3fc04dcdc8..e522e69235 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1110,6 +1110,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3023,7 +3028,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3277,6 +3282,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "완전한(full)" diff --git a/locale/nl.po b/locale/nl.po index 5c584c1cf6..8594e0534f 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1116,6 +1116,11 @@ msgstr "Formaat wordt niet ondersteund" msgid "Framebuffer requires %d bytes" msgstr "Framebuffer benodigd %d bytes" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3053,7 +3058,7 @@ msgstr "complexe deling door 0" msgid "complex values not supported" msgstr "complexe waardes niet ondersteund" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "compressie header" @@ -3309,6 +3314,10 @@ msgstr "lettertype moet 2048 bytes lang zijn" msgid "format requires a dict" msgstr "format vereist een dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "vol" diff --git a/locale/pl.po b/locale/pl.po index d8c98ba4e6..1f69744808 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1116,6 +1116,11 @@ msgstr "Nie wspierany format" msgid "Framebuffer requires %d bytes" msgstr "Bufor ramki wymaga %d bajtów" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3030,7 +3035,7 @@ msgstr "zespolone dzielenie przez zero" msgid "complex values not supported" msgstr "wartości zespolone nieobsługiwane" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "nagłówek kompresji" @@ -3285,6 +3290,10 @@ msgstr "font musi mieć 2048 bajtów długości" msgid "format requires a dict" msgstr "format wymaga słownika" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "pełny" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index adfdb1ce4c..2b403f27ca 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1135,6 +1135,11 @@ msgstr "O formato não é suportado" msgid "Framebuffer requires %d bytes" msgstr "O Framebuffer requer %d bytes" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3109,7 +3114,7 @@ msgstr "divisão complexa por zero" msgid "complex values not supported" msgstr "os valores complexos não compatíveis" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "compressão do cabeçalho" @@ -3366,6 +3371,10 @@ msgstr "a fonte deve ter 2048 bytes de comprimento" msgid "format requires a dict" msgstr "formato requer um dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "cheio" diff --git a/locale/ru.po b/locale/ru.po index 3d78a492c1..0cded6267a 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1134,6 +1134,11 @@ msgstr "Формат не поддерживается" msgid "Framebuffer requires %d bytes" msgstr "Фреймбуфер требует %d байт" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3068,7 +3073,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3322,6 +3327,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index 4f8d39879b..319bc0d3b6 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1122,6 +1122,11 @@ msgstr "Formatet stöds inte" msgid "Framebuffer requires %d bytes" msgstr "Framebuffer kräver %d byte" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "Frekvensen måste matcha befintlig PWMOut med denna timer" @@ -3073,7 +3078,7 @@ msgstr "komplex division med noll" msgid "complex values not supported" msgstr "komplexa värden stöds inte" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "komprimeringsheader" @@ -3330,6 +3335,10 @@ msgstr "typsnitt måste vara 2048 bytes långt" msgid "format requires a dict" msgstr "formatet kräver en dict" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "full" diff --git a/locale/tr.po b/locale/tr.po index a7d6c46b76..890ac7f60a 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -31,7 +31,8 @@ msgid "" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" "\n" -"Program otomatik yeniden yükleme tarafından durduruldu. Birazdan tekrar yüklenecek.\n" +"Program otomatik yeniden yükleme tarafından durduruldu. Birazdan tekrar " +"yüklenecek.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -1123,6 +1124,11 @@ msgstr "" msgid "Framebuffer requires %d bytes" msgstr "" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "" @@ -3038,7 +3044,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" @@ -3292,6 +3298,10 @@ msgstr "" msgid "format requires a dict" msgstr "" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index e8bf961f6b..4836ab293e 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -1131,6 +1131,11 @@ msgstr "Bù zhīyuán géshì" msgid "Framebuffer requires %d bytes" msgstr "zhēn huǎn chōng qū xū yào %d zì jié" +#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c +msgid "" +"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" +msgstr "" + #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" msgstr "Pínlǜ bìxū yǔ shǐyòng cǐ jìshí qì de xiàn yǒu PWMOut xiāng pǐpèi" @@ -3085,7 +3090,7 @@ msgstr "fùzá de fēngé wèi 0" msgid "complex values not supported" msgstr "bù zhīchí fùzá de zhí" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "yāsuō tóu bù" @@ -3341,6 +3346,10 @@ msgstr "zìtǐ bìxū wèi 2048 zì jié" msgid "format requires a dict" msgstr "géshì yāoqiú yīgè yǔjù" +#: shared-bindings/microcontroller/Processor.c +msgid "frequency is read-only for this board" +msgstr "" + #: py/objdeque.c msgid "full" msgstr "chōngfèn" From 457aba79f4a7b6d94602f4b7ecd9ee04d387dec7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 20 Apr 2022 08:09:38 -0500 Subject: [PATCH 0162/2403] fix doc build --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 464985782a..d74ba51daf 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -437,7 +437,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| size, or use `memoryview.cast` to change the interpretation of an existing buffer. //| //| To atomically change from one buffer to another, simply call -//| `StateMachine.continuous_write` again with a different buffer with the same element size. +//| `StateMachine.start_continuous_write` again with a different buffer with the same element size. //| The call will only return once DMA has started putting the previous //| buffer's data into the PIO FIFO. //| From e007e9a003d3f5dbb66eaf578c1b0d90f11aee4c Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Wed, 20 Apr 2022 12:44:16 +0000 Subject: [PATCH 0163/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1054 of 1054 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 319bc0d3b6..ebe0eb0496 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: 2022-03-23 08:58+0000\n" +"PO-Revision-Date: 2022-04-21 13:12+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -1126,19 +1126,21 @@ msgstr "Framebuffer kräver %d byte" msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"Frekvens måste vara en av 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 " +"eller 1008 Mhz" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" -msgstr "Frekvensen måste matcha befintlig PWMOut med denna timer" +msgstr "Frekvensen måste matcha befintlig PWMOut med den här timern" #: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c #: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c msgid "Function requires lock" -msgstr "Funktion kräver lås" +msgstr "Funktionen kräver lås" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" -msgstr "Generiskt fel" +msgstr "Allmänt fel" #: shared-bindings/displayio/Display.c #: shared-bindings/displayio/EPaperDisplay.c @@ -3337,7 +3339,7 @@ msgstr "formatet kräver en dict" #: shared-bindings/microcontroller/Processor.c msgid "frequency is read-only for this board" -msgstr "" +msgstr "frekvens är skrivskyddad för detta kort" #: py/objdeque.c msgid "full" From 76d54ca8add7b72e3feaf547f78e6e659d00c52b Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 21 Apr 2022 12:58:46 -0400 Subject: [PATCH 0164/2403] shrink sparkfun_redboard_turbo --- .../atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index 70ece9b9fc..7b97822bda 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32FV" LONGINT_IMPL = MPZ + +CIRCUITPY_ONEWIREIO = 0 From 289aaae95456b02f71670582458fb127510c9532 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 21 Apr 2022 17:05:44 -0500 Subject: [PATCH 0165/2403] Fix for issue #4452 - time.sleep on STM --- ports/stm/peripherals/rtc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c index 13cda1aac8..9b0eb399c2 100644 --- a/ports/stm/peripherals/rtc.c +++ b/ports/stm/peripherals/rtc.c @@ -86,7 +86,7 @@ uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) { uint32_t time = (uint32_t)(RTC->TR & RTC_TR_RESERVED_MASK); uint32_t date = (uint32_t)(RTC->DR & RTC_DR_RESERVED_MASK); uint32_t ssr = (uint32_t)(RTC->SSR); - while (ssr != first_ssr) { + if (ssr != first_ssr) { first_ssr = ssr; time = (uint32_t)(RTC->TR & RTC_TR_RESERVED_MASK); date = (uint32_t)(RTC->DR & RTC_DR_RESERVED_MASK); @@ -184,13 +184,16 @@ void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks) { alarm.AlarmTime.SubSeconds = rtc_clock_frequency - 1 - ((raw_ticks % TICK_DIVISOR) * 32); + if (alarm.AlarmTime.SubSeconds > rtc_clock_frequency) { + alarm.AlarmTime.SubSeconds = alarm.AlarmTime.SubSeconds + + rtc_clock_frequency; + } alarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE; alarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_SET; // Masking here means that the bits are ignored so we set none of them. alarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDMASK_NONE; alarm.AlarmDateWeekDaySel = RTC_ALARMDATEWEEKDAYSEL_DATE; alarm.Alarm = (alarm_idx == PERIPHERALS_ALARM_A) ? RTC_ALARM_A : RTC_ALARM_B; - HAL_RTC_SetAlarm_IT(&hrtc, &alarm, RTC_FORMAT_BIN); HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn); alarmed_already[alarm_idx] = false; From 28296f98f85c85aaad7747780a27e45124aa2b45 Mon Sep 17 00:00:00 2001 From: ViktorWiz <54257433+ViktorWiz@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:59:28 +0900 Subject: [PATCH 0166/2403] update pid --- .../boards/wiznet_w5100s_evb_pico/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk index f1fca6c215..c7b6f312fc 100644 --- a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.mk @@ -1,5 +1,5 @@ -USB_VID = 0x239A -USB_PID = 0x80F4 +USB_VID = 0x2E8A +USB_PID = 0x1027 USB_PRODUCT = "W5100S-EVB-Pico" USB_MANUFACTURER = "WIZnet" From e8541e866cf83ba0280e489232f4c6cff2b11462 Mon Sep 17 00:00:00 2001 From: ViktorWiz <54257433+ViktorWiz@users.noreply.github.com> Date: Fri, 22 Apr 2022 15:02:50 +0900 Subject: [PATCH 0167/2403] fix end of file issue --- ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h index 6265e9dd58..1dae266fc8 100644 --- a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/mpconfigboard.h @@ -6,4 +6,4 @@ #define DEFAULT_SPI_BUS_MISO (&pin_GPIO16) #define DEFAULT_UART_BUS_RX (&pin_GPIO1) -#define DEFAULT_UART_BUS_TX (&pin_GPIO0) \ No newline at end of file +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) From 53b7caf13cb24dbe4029e29e6af65cbefa6f1ba7 Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 09:15:01 -0700 Subject: [PATCH 0168/2403] Update ports/mimxrt10xx/common-hal/pwmio/PWMOut.c Co-authored-by: Dan Halbert --- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index 28e36c3f35..bac2d70e02 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -258,7 +258,7 @@ void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uint16_t d // As mentioned in the setting up of the frequency code // A - Uses VAL2 to turn on (0) and VAL3=duty to turn off // B - Uses VAL4 to turn on (0) and VAL5 to turn off - // X - As mentioned above VAL1 turns off, but its set to the timing for freqency. so + // X - As mentioned above VAL1 turns off, but it's set to the timing for frequency. so // VAL0 turns on, so we set it to VAL1 - duty DBGPrintf(&mp_plat_print, "common_hal_pwmio_pwmout_set_duty_cycle %u\n", duty); From 79dd2a6cd59ef0f002174bb2955c79ace9806cca Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 09:15:29 -0700 Subject: [PATCH 0169/2403] Update ports/mimxrt10xx/common-hal/pwmio/PWMOut.c Fix Comment spelling Co-authored-by: Dan Halbert --- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index bac2d70e02..c3eafa7d54 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -196,7 +196,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, // which uses 0, 1 has to be handled specially. So for the different channels: // A - Uses VAL2 to turn on (0) and VAL3=duty to turn off // B - Uses VAL4 to turn on (0) and VAL5 to turn off - // X - As mentioned above VAL1 turns off, but its set to the timing for freqency. so + // X - As mentioned above VAL1 turns off, but it's set to the timing for frequency. so // VAL0 turns on, so we set it to VAL1 - duty // PWM_Type *base = self->pwm->pwm; From f102c15bb431c684ed67b909b543446c91c34e7e Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 09:15:40 -0700 Subject: [PATCH 0170/2403] Update ports/mimxrt10xx/common-hal/pwmio/PWMOut.c Co-authored-by: Dan Halbert --- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index c3eafa7d54..a42bbef7d7 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -38,7 +38,7 @@ #include "supervisor/shared/translate.h" #include "periph.h" -// Debug print support set to none zero to enable debug printing +// Debug print support set to zero to enable debug printing #define ENABLE_DEBUG_PRINTING 0 From 1312e5c759fc9e0ef4a5dc63a7a8c02d62aa664a Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 09:16:27 -0700 Subject: [PATCH 0171/2403] Update ports/mimxrt10xx/supervisor/port.c Co-authored-by: Dan Halbert --- ports/mimxrt10xx/supervisor/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c index 4552201f3c..5570bb6390 100644 --- a/ports/mimxrt10xx/supervisor/port.c +++ b/ports/mimxrt10xx/supervisor/port.c @@ -398,7 +398,7 @@ void port_interrupt_after_ticks(uint32_t ticks) { void port_idle_until_interrupt(void) { // App note here: https://www.nxp.com/docs/en/application-note/AN12085.pdf - // Currently I have disabled the setting into wait mode as this impacts lots of differnt + // Currently I have disabled the setting into wait mode as this impacts lots of different // subsystems and it is unclear if you can or should set it generically without having // a better understanding of user intent. For example by default it will kill PWM // when in this mode, unless PWM_CTRL2_WAITEN_MASK is set, and even with this set From 3c343cf1b81167291865334907402e976a996a60 Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 11:47:30 -0700 Subject: [PATCH 0172/2403] Update ports/mimxrt10xx/supervisor/port.c Co-authored-by: Dan Halbert --- ports/mimxrt10xx/supervisor/port.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c index 5570bb6390..da3e02f02e 100644 --- a/ports/mimxrt10xx/supervisor/port.c +++ b/ports/mimxrt10xx/supervisor/port.c @@ -415,15 +415,6 @@ void port_idle_until_interrupt(void) { common_hal_mcu_disable_interrupts(); if (!background_callback_pending()) { NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn); - // Don't down clock on debug builds because it prevents the DAP from - // reading memory - #if 0 - #if CIRCUITPY_DEBUG == 0 - CLOCK_SetMode(kCLOCK_ModeWait); - #endif - __WFI(); - CLOCK_SetMode(kCLOCK_ModeRun); - #else __WFI(); #endif } From 8d9dc1fb93a1b77a7f643581ec085813646caa65 Mon Sep 17 00:00:00 2001 From: KurtE Date: Fri, 22 Apr 2022 11:47:40 -0700 Subject: [PATCH 0173/2403] Update ports/mimxrt10xx/supervisor/port.c Co-authored-by: Dan Halbert --- ports/mimxrt10xx/supervisor/port.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c index da3e02f02e..38ecfd5c18 100644 --- a/ports/mimxrt10xx/supervisor/port.c +++ b/ports/mimxrt10xx/supervisor/port.c @@ -416,7 +416,6 @@ void port_idle_until_interrupt(void) { if (!background_callback_pending()) { NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn); __WFI(); - #endif } common_hal_mcu_enable_interrupts(); } From 1841af90e221d8003faf160108ea9fbcd73eb5dc Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 22 Apr 2022 13:59:42 -0500 Subject: [PATCH 0174/2403] Don't erroneously set EOF flag if there was room to read 0 bytes --- shared-module/audiomp3/MP3Decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index d0aecc18bd..a676e3f5aa 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -53,7 +53,7 @@ */ STATIC bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self) { // If we didn't previously reach the end of file, we can try reading now - if (!self->eof) { + if (!self->eof && self->inbuf_offset != 0) { // Move the unconsumed portion of the buffer to the start uint8_t *end_of_buffer = self->inbuf + self->inbuf_length; From df5f7bc765d09e98676d5e225b5f11594755ed01 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 22 Apr 2022 14:10:38 -0500 Subject: [PATCH 0175/2403] MP3Decoder: better handle indicating end of mp3 audio data to caller The old formulation * wouldn't work if there were ID3 tags at the end * would choose whether to background-refill the inbuf based on a check before skipping to the next sync word, which could be incorrect. I think it was aspect "B" that ended up triggering the erroneous EOF problem fixed in the prior commit. This would depend on specific data sizes and offsets occuring in the file such that a read would be scheduled but then the buffer would be filled and left 100% full by find_sync_word(). It's just lucky(?) that a particular person produced such a file, and/or many files produced by Audacity have those characteristics. --- shared-module/audiomp3/MP3Decoder.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index a676e3f5aa..bbc7e1c79e 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -356,6 +356,11 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t * return GET_BUFFER_DONE; } + self->samples_decoded += *buffer_length / sizeof(int16_t); + + mp3file_skip_id3v2(self); + int result = mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE; + if (self->inbuf_offset >= 512) { background_callback_add( &self->inbuf_fill_cb, @@ -363,8 +368,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t * self); } - self->samples_decoded += *buffer_length / sizeof(int16_t); - return mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE; + return result; } void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output, From 989fb828d464d63cad2baae7cbe1397819d18358 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 23 Apr 2022 13:09:36 -0500 Subject: [PATCH 0176/2403] Revamp background writing Now a 'once' and a 'loop' buffer can be specified. 'once' is useful for things like writing a neopixel strip in the background, if you can guarantee the buffer contents are stable until the write is complete. 'loop' is useful for periodic things, like pwm & servos. both together are useful for some special cases of pwm/servo, where a transitional waveform needs to be played for one repetition and then a new waveform needs to be played after that. The API is renamed to reflect that it's a more generic 'background' operation. --- locale/circuitpython.pot | 7 +- ports/raspberrypi/audio_dma.c | 4 +- .../bindings/rp2pio/StateMachine.c | 139 ++++++++++++------ .../bindings/rp2pio/StateMachine.h | 6 +- .../common-hal/rp2pio/StateMachine.c | 87 +++++++---- .../common-hal/rp2pio/StateMachine.h | 15 +- ports/raspberrypi/mpconfigport.h | 2 +- 7 files changed, 179 insertions(+), 81 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index d7e14eabe5..48e4e2ab7b 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1530,6 +1530,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -3019,7 +3024,7 @@ msgstr "" msgid "complex values not supported" msgstr "" -#: extmod/moduzlib.c shared-module/zlib/DecompIO.c +#: extmod/moduzlib.c msgid "compression header" msgstr "" diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c index 01efde6a9a..7fef1a52e0 100644 --- a/ports/raspberrypi/audio_dma.c +++ b/ports/raspberrypi/audio_dma.c @@ -459,8 +459,8 @@ void isr_dma_0(void) { dma->channels_to_load_mask |= mask; background_callback_add(&dma->callback, dma_callback_fun, (void *)dma); } - if (MP_STATE_PORT(continuous_pio)[i] != NULL) { - rp2pio_statemachine_obj_t *pio = MP_STATE_PORT(continuous_pio)[i]; + if (MP_STATE_PORT(background_pio)[i] != NULL) { + rp2pio_statemachine_obj_t *pio = MP_STATE_PORT(background_pio)[i]; rp2pio_statemachine_dma_complete(pio, i); } } diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index d74ba51daf..560cdaecc7 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -426,63 +426,79 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write); -//| def start_continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None: -//| """Write the data contained in ``buffer`` to the state machine repeatedly until stopped. If the buffer is empty or None, an existing continuous_write is canceled. +//| def background_write(self, once: Optional[ReadableBuffer]=None, *, loop=Optional[ReadableBuffer]=None) -> None: +//| """Write data to the TX fifo in the background, with optional looping. +//| +//| First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have. +//| This means that any ``once`` or ``loop`` buffer will be written at least once. +//| Then the ``once`` and/or ``loop`` buffers are queued. and the function returns. +//| The ``once`` buffer (if specified) will be written just once. +//| Finally, the ``loop`` buffer (if specified) will continue being looped indefinitely. //| //| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements //| will perform 8 bit writes to the PIO FIFO. The RP2040's memory bus will duplicate the value into //| the other byte positions. So, pulling more data in the PIO assembly will read the duplicated values. //| //| To perform 16 or 32 bits writes into the FIFO use an `array.array` with a type code of the desired -//| size, or use `memoryview.cast` to change the interpretation of an existing buffer. +//| size, or use `memoryview.cast` to change the interpretation of an +//| existing buffer. To send just part of a larger buffer, slice a `memoryview` +//| of it. //| -//| To atomically change from one buffer to another, simply call -//| `StateMachine.start_continuous_write` again with a different buffer with the same element size. -//| The call will only return once DMA has started putting the previous -//| buffer's data into the PIO FIFO. -//| -//| If the buffer is modified while it is being written out, the updated +//| If a buffer is modified while it is being written out, the updated //| values will be used. However, because of interactions between CPU //| writes, DMA and the PIO FIFO are complex, it is difficult to predict //| the result of modifying multiple values. Instead, alternate between //| a pair of buffers. //| -//| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer -//| :param int start: Start of the slice of ``buffer`` to write out: ``buffer[start:end]`` -//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" +//| Having both a ``once`` and a ``loop`` parameter is to support a special case in PWM generation +//| where a change in duty cycle requires a special transitional buffer to be used exactly once. Most +//| use cases will probably only use one of ``once`` or ``loop``. +//| +//| :param ~Optional[circuitpython_typing.ReadableBuffer] once: Data to be written once +//| :param ~Optional[circuitpython_typing.ReadableBuffer] loop: Data to be written repeatedly +//| """ //| ... //| -STATIC mp_obj_t rp2pio_statemachine_start_continuous_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer, ARG_start, ARG_end }; + +STATIC void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_bytes) { + if (obj != mp_const_none) { + info->obj = obj; + mp_get_buffer_raise(obj, &info->info, MP_BUFFER_READ); + size_t stride = mp_binary_get_size('@', info->info.typecode, NULL); + if (stride > 4) { + mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); + } + if (*stride_in_bytes && stride != *stride_in_bytes) { + mp_raise_ValueError(translate("Mismatched data size")); + } + *stride_in_bytes = stride; + } else { + memset(info, 0, sizeof(*info)); + } +} + +STATIC mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_once, ARG_loop }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, - { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, - { MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, + { MP_QSTR_once, MP_ARG_OBJ, {.u_obj = mp_const_none} }, + { MP_QSTR_loop, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, }; rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_buffer_info_t bufinfo = {}; - if (args[ARG_buffer].u_obj != mp_const_none) { - mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ); + sm_buf_info once_info; + sm_buf_info loop_info; + size_t stride_in_bytes = 0; + fill_buf_info(&once_info, args[ARG_once].u_obj, &stride_in_bytes); + fill_buf_info(&loop_info, args[ARG_loop].u_obj, &stride_in_bytes); + if (!stride_in_bytes) { + return mp_const_none; } - int32_t start = args[ARG_start].u_int; - size_t length = bufinfo.len; - normalize_buffer_bounds(&start, args[ARG_end].u_int, &length); - bool ok = true; - if (length == 0) { - ok = common_hal_rp2pio_statemachine_end_continuous_write(self); - } else { - uint8_t *original_pointer = bufinfo.buf; - int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL); - if (stride_in_bytes > 4) { - mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); - } - ok = common_hal_rp2pio_statemachine_start_continuous_write(self, args[ARG_buffer].u_obj, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); - } + bool ok = common_hal_rp2pio_statemachine_background_write(self, &once_info, &loop_info, stride_in_bytes); + if (mp_hal_is_interrupted()) { return mp_const_none; } @@ -491,14 +507,14 @@ STATIC mp_obj_t rp2pio_statemachine_start_continuous_write(size_t n_args, const } return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_start_continuous_write_obj, 2, rp2pio_statemachine_start_continuous_write); +MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_background_write_obj, 1, rp2pio_statemachine_background_write); -//| def end_continuous_write(self) -> None: -//| """Stop a continuous write, if one is in progress.""" +//| def stop_background_write(self) -> None: +//| """Immediately stop a background write, if one is in progress. Items already in the TX FIFO are not affected.""" //| -STATIC mp_obj_t rp2pio_statemachine_obj_end_continuous_write(mp_obj_t self_in) { +STATIC mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); - bool ok = common_hal_rp2pio_statemachine_end_continuous_write(self); + bool ok = common_hal_rp2pio_statemachine_stop_background_write(self); if (mp_hal_is_interrupted()) { return mp_const_none; } @@ -507,8 +523,45 @@ STATIC mp_obj_t rp2pio_statemachine_obj_end_continuous_write(mp_obj_t self_in) { } return mp_const_none; } +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_background_write_obj, rp2pio_statemachine_obj_stop_background_write); + +//| @property +//| def writing(self) -> bool: +//| """Returns True if a background write is in progress""" +//| +STATIC mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) { + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); + return mp_obj_new_bool(common_hal_rp2pio_statemachine_get_writing(self)); +} +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_writing_obj, rp2pio_statemachine_obj_get_writing); + +const mp_obj_property_t rp2pio_statemachine_writing_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&rp2pio_statemachine_get_writing_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; + + +//| @property +//| def pending(self) -> int: +//| """Returns the number of pending buffers for background writing. +//| +//| If the number is 0, then a `StateMachine.background_write` call will not block.""" +//| +STATIC mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) { + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); + return mp_obj_new_int(common_hal_rp2pio_statemachine_get_pending(self)); +} +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_pending_obj, rp2pio_statemachine_obj_get_pending); + +const mp_obj_property_t rp2pio_statemachine_pending_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&rp2pio_statemachine_get_pending_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; -MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_end_continuous_write_obj, rp2pio_statemachine_obj_end_continuous_write); //| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None) -> None: //| """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer //| includes any data added to the fifo even if it was added before this was called. @@ -728,8 +781,10 @@ STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&rp2pio_statemachine_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&rp2pio_statemachine_write_obj) }, { MP_ROM_QSTR(MP_QSTR_write_readinto), MP_ROM_PTR(&rp2pio_statemachine_write_readinto_obj) }, - { MP_ROM_QSTR(MP_QSTR_start_continuous_write), MP_ROM_PTR(&rp2pio_statemachine_start_continuous_write_obj) }, - { MP_ROM_QSTR(MP_QSTR_end_continuous_write), MP_ROM_PTR(&rp2pio_statemachine_end_continuous_write_obj) }, + { MP_ROM_QSTR(MP_QSTR_background_write), MP_ROM_PTR(&rp2pio_statemachine_background_write_obj) }, + { MP_ROM_QSTR(MP_QSTR_stop_background_write), MP_ROM_PTR(&rp2pio_statemachine_stop_background_write_obj) }, + { MP_ROM_QSTR(MP_QSTR_writing), MP_ROM_PTR(&rp2pio_statemachine_writing_obj) }, + { MP_ROM_QSTR(MP_QSTR_pending), MP_ROM_PTR(&rp2pio_statemachine_pending_obj) }, { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&rp2pio_statemachine_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_rxstall), MP_ROM_PTR(&rp2pio_statemachine_rxstall_obj) }, diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index 2c8e78a3d2..a77574a57a 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -65,8 +65,10 @@ void common_hal_rp2pio_statemachine_run(rp2pio_statemachine_obj_t *self, const u // Writes out the given data. bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); -bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes); -bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self); +bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once_obj, const sm_buf_info *loop_obj, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_stop_background_write(rp2pio_statemachine_obj_t *self); +mp_int_t common_hal_rp2pio_statemachine_get_pending(rp2pio_statemachine_obj_t *self); +bool common_hal_rp2pio_statemachine_get_writing(rp2pio_statemachine_obj_t *self); bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes); bool common_hal_rp2pio_statemachine_write_readinto(rp2pio_statemachine_obj_t *self, const uint8_t *data_out, size_t out_len, uint8_t out_stride_in_bytes, diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 7e35b33bd7..cfc9442028 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -24,6 +24,8 @@ * THE SOFTWARE. */ +#include + #include "bindings/rp2pio/StateMachine.h" #include "common-hal/microcontroller/__init__.h" @@ -86,7 +88,7 @@ STATIC void rp2pio_statemachine_clear_dma(int pio_index, int sm) { if (!dma_hw->inte0) { irq_set_mask_enabled(1 << DMA_IRQ_0, false); } - MP_STATE_PORT(continuous_pio)[channel] = NULL; + MP_STATE_PORT(background_pio)[channel] = NULL; dma_channel_abort(channel); dma_channel_unclaim(channel); } @@ -608,7 +610,7 @@ void common_hal_rp2pio_statemachine_set_frequency(rp2pio_statemachine_obj_t *sel void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins) { common_hal_rp2pio_statemachine_stop(self); - (void)common_hal_rp2pio_statemachine_end_continuous_write(self); + (void)common_hal_rp2pio_statemachine_stop_background_write(self); uint8_t sm = self->state_machine; uint8_t pio_index = pio_get_index(self->pio); @@ -877,32 +879,43 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { return _current_program_offset[pio_index][sm]; } -bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { +bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once, const sm_buf_info *loop, uint8_t stride_in_bytes) { uint8_t pio_index = pio_get_index(self->pio); uint8_t sm = self->state_machine; - if (SM_DMA_ALLOCATED(pio_index, sm) && stride_in_bytes == self->continuous_stride_in_bytes) { - while (self->pending_set_data) { + int pending_buffers = (once->info.buf != NULL) + (loop->info.buf != NULL); + if (!once->info.buf) { + once = loop; + } + + + if (SM_DMA_ALLOCATED(pio_index, sm)) { + if (stride_in_bytes != self->background_stride_in_bytes) { + mp_raise_ValueError(translate("Mismatched data size")); + } + + while (self->pending_buffers) { RUN_BACKGROUND_TASKS; if (self->user_interruptible && mp_hal_is_interrupted()) { - (void)common_hal_rp2pio_statemachine_end_continuous_write(self); return false; } } common_hal_mcu_disable_interrupts(); - self->next_buffer = data; - self->next_size = len / stride_in_bytes; - self->pending_set_data = true; + self->once = *once; + self->loop = *loop; + self->pending_buffers = pending_buffers; + + if (self->dma_completed) { + rp2pio_statemachine_dma_complete(self, SM_DMA_GET_CHANNEL(pio_index, sm)); + self->dma_completed = false; + } + common_hal_mcu_enable_interrupts(); - // need to keep a reference alive to the buffer, lest the GC collect it while its lone remaining pointer is in the DMA peripheral register - self->buf_objs[++self->buf_obj_idx % 2] = buf_obj; return true; } - common_hal_rp2pio_statemachine_end_continuous_write(self); - int channel = dma_claim_unused_channel(false); if (channel == -1) { return false; @@ -916,13 +929,12 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o dma_channel_config c; - self->pending_set_data = false; - self->continuous_stride_in_bytes = stride_in_bytes; - self->buf_objs[0] = buf_obj; - self->buf_objs[1] = NULL; - - self->next_buffer = data; - self->next_size = len / stride_in_bytes; + self->current = *once; + self->once = *loop; + self->loop = *loop; + self->pending_buffers = pending_buffers; + self->dma_completed = false; + self->background_stride_in_bytes = stride_in_bytes; c = dma_channel_get_default_config(channel); channel_config_set_transfer_data_size(&c, _stride_to_dma_size(stride_in_bytes)); @@ -931,12 +943,12 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o channel_config_set_write_increment(&c, false); dma_channel_configure(channel, &c, tx_destination, - data, - len / stride_in_bytes, + once->info.buf, + once->info.len / stride_in_bytes, false); common_hal_mcu_disable_interrupts(); - MP_STATE_PORT(continuous_pio)[channel] = self; + MP_STATE_PORT(background_pio)[channel] = self; dma_hw->inte0 |= 1u << channel; irq_set_mask_enabled(1 << DMA_IRQ_0, true); dma_start_channel_mask(1u << channel); @@ -946,15 +958,36 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o } void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel) { - dma_channel_set_read_addr(channel, self->next_buffer, false); - dma_channel_set_trans_count(channel, self->next_size, true); + self->current = self->once; + self->once = self->loop; - self->pending_set_data = false; + if (self->current.info.buf) { + if (self->pending_buffers > 0) { + self->pending_buffers--; + } + dma_channel_set_read_addr(channel, self->current.info.buf, false); + dma_channel_set_trans_count(channel, self->current.info.len / self->background_stride_in_bytes, true); + } else { + self->dma_completed = true; + self->pending_buffers = 0; // should be a no-op + } } -bool common_hal_rp2pio_statemachine_end_continuous_write(rp2pio_statemachine_obj_t *self) { +bool common_hal_rp2pio_statemachine_stop_background_write(rp2pio_statemachine_obj_t *self) { uint8_t pio_index = pio_get_index(self->pio); uint8_t sm = self->state_machine; rp2pio_statemachine_clear_dma(pio_index, sm); + memset(&self->current, 0, sizeof(self->current)); + memset(&self->once, 0, sizeof(self->once)); + memset(&self->loop, 0, sizeof(self->loop)); + self->pending_buffers = 0; return true; } + +bool common_hal_rp2pio_statemachine_get_writing(rp2pio_statemachine_obj_t *self) { + return !self->dma_completed; +} + +int common_hal_rp2pio_statemachine_get_pending(rp2pio_statemachine_obj_t *self) { + return self->pending_buffers; +} diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h index 5a0deb5ed0..470f0ed8b1 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h @@ -32,6 +32,11 @@ #include "common-hal/microcontroller/Pin.h" #include "src/rp2_common/hardware_pio/include/hardware/pio.h" +typedef struct sm_buf_info { + mp_obj_t obj; + mp_buffer_info_t info; +} sm_buf_info; + typedef struct { mp_obj_base_t base; uint32_t pins; // Bitmask of what pins this state machine uses. @@ -56,12 +61,10 @@ typedef struct { uint8_t offset; // dma-related items - uint8_t buf_obj_idx; - const uint8_t *next_buffer; - size_t next_size; - mp_obj_t buf_objs[2]; - int continuous_stride_in_bytes; - volatile int pending_set_data; + volatile int pending_buffers; + sm_buf_info current, once, loop; + int background_stride_in_bytes; + bool dma_completed; } rp2pio_statemachine_obj_t; void reset_rp2pio_statemachine(void); diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h index f4835bf2e9..fd09d8a9ac 100644 --- a/ports/raspberrypi/mpconfigport.h +++ b/ports/raspberrypi/mpconfigport.h @@ -46,7 +46,7 @@ #define MICROPY_PORT_ROOT_POINTERS \ mp_obj_t counting[NUM_PWM_SLICES]; \ mp_obj_t playing_audio[NUM_DMA_CHANNELS]; \ - mp_obj_t continuous_pio[NUM_DMA_CHANNELS]; \ + mp_obj_t background_pio[NUM_DMA_CHANNELS]; \ CIRCUITPY_COMMON_ROOT_POINTERS; #endif // __INCLUDED_MPCONFIGPORT_H From 1a89a2d366f69fb101d3ead530ec613c5c673bec Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 23 Apr 2022 13:25:59 -0500 Subject: [PATCH 0177/2403] fix doc build --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 560cdaecc7..722b1f7c7f 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -426,7 +426,7 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write); -//| def background_write(self, once: Optional[ReadableBuffer]=None, *, loop=Optional[ReadableBuffer]=None) -> None: +//| def background_write(self, once: Optional[ReadableBuffer]=None, *, loop: Optional[ReadableBuffer]=None) -> None: //| """Write data to the TX fifo in the background, with optional looping. //| //| First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have. From 02a0cbb15522eae2336e071e74e200e31f609251 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Fri, 22 Apr 2022 20:51:55 +0000 Subject: [PATCH 0178/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1054 of 1054 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 2b403f27ca..3c392e9495 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: 2022-03-21 22:57+0000\n" +"PO-Revision-Date: 2022-04-23 21:13+0000\n" "Last-Translator: Wellington Terumi Uemura \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.12-dev\n" +"X-Generator: Weblate 4.12.1-dev\n" #: main.c msgid "" @@ -1139,6 +1139,8 @@ msgstr "O Framebuffer requer %d bytes" msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"A frequência deve ser 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 ou " +"1008 Mhz" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" @@ -3373,7 +3375,7 @@ msgstr "formato requer um dict" #: shared-bindings/microcontroller/Processor.c msgid "frequency is read-only for this board" -msgstr "" +msgstr "nesta placa, a frequência é de apenas leitura" #: py/objdeque.c msgid "full" From 5d1fe5f2ad03ef136ebaceefa4180b1e893daffe Mon Sep 17 00:00:00 2001 From: hexthat Date: Thu, 21 Apr 2022 21:18:54 +0000 Subject: [PATCH 0179/2403] Translated using Weblate (Chinese (Pinyin)) Currently translated at 99.2% (1046 of 1054 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/ --- locale/zh_Latn_pinyin.po | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 4836ab293e..3e66db9e93 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: 2022-02-13 00:57+0000\n" +"PO-Revision-Date: 2022-04-23 21:13+0000\n" "Last-Translator: hexthat \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.11-dev\n" +"X-Generator: Weblate 4.12.1-dev\n" #: main.c msgid "" @@ -30,6 +30,9 @@ msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"dài mǎ yīn zì dòng chóng xīn jiā zǎi ér tíng zhǐ. jí jiāng chóng xīn jiā zǎi." +"\n" #: supervisor/shared/safe_mode.c msgid "" @@ -356,9 +359,8 @@ msgid "0.0 to a complex power" msgstr "0.0 de fùshù cì mì" #: py/modbuiltins.c -#, fuzzy msgid "3-arg pow() not supported" -msgstr "bù zhīchí 3-arg pow()" +msgstr "bù zhī chí 3-arg pow()" #: shared-module/msgpack/__init__.c msgid "64 bit types" @@ -1135,6 +1137,7 @@ msgstr "zhēn huǎn chōng qū xū yào %d zì jié" msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"pín lǜ bì xū wéi 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 huò 1008 Mhz" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" @@ -2467,7 +2470,7 @@ msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù" #: ports/espressif/common-hal/mdns/Server.c msgid "Unable to start mDNS query" -msgstr "" +msgstr "wú fǎ qǐ dòng mDNS chá xún" #: shared-bindings/nvm/ByteArray.c msgid "Unable to write to nvm." @@ -2489,12 +2492,12 @@ msgstr "Wèi chǔlǐ de ESP TLS cuòwù %d %d %x %d" #: ports/espressif/common-hal/_bleio/__init__.c #, c-format msgid "Unknown BLE error at %s:%d: %d" -msgstr "" +msgstr "%s:%d: %d chù chū xiàn wèi zhī BLE cuò wù" #: ports/espressif/common-hal/_bleio/__init__.c #, c-format msgid "Unknown BLE error: %d" -msgstr "" +msgstr "wèi zhī de BLE cuò wù: %d" #: shared-bindings/wifi/Radio.c #, c-format @@ -2958,7 +2961,7 @@ msgstr "wúfǎ yòng '%q' ' suǒyǐn jiāzài" #: py/builtinimport.c msgid "can't perform relative import" -msgstr "" +msgstr "wú fǎ zhí xíng xiāng duì dǎo rù" #: py/objgenerator.c msgid "can't send non-None value to a just-started generator" @@ -3348,7 +3351,7 @@ msgstr "géshì yāoqiú yīgè yǔjù" #: shared-bindings/microcontroller/Processor.c msgid "frequency is read-only for this board" -msgstr "" +msgstr "cǐ zhǔ bǎn de pín lǜ wéi zhǐ dú" #: py/objdeque.c msgid "full" @@ -3705,11 +3708,11 @@ msgstr "Wài shè bù zhī chí huán huí + jìng yīn mó shì" #: ports/espressif/common-hal/mdns/Server.c msgid "mDNS already initialized" -msgstr "" +msgstr "mDNS yǐ chū shǐ huà" #: ports/espressif/common-hal/mdns/Server.c msgid "mDNS only works with built-in WiFi" -msgstr "" +msgstr "mDNS jǐn shì yòng yú nèi zhì wú xiàn wǎng luò" #: py/parse.c msgid "malformed f-string" @@ -3729,7 +3732,7 @@ msgstr "jǔzhèn bùshì zhèngdìng de" #: ports/espressif/common-hal/wifi/Radio.c msgid "max_connections must be between 0 and 10" -msgstr "" +msgstr "max_connections bì xū jiè yú 0 hé 10 zhī jiān" #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c @@ -4110,7 +4113,7 @@ msgstr "pixel_shader bìxū shì displayio.Palette huò displayio.ColorConverter #: extmod/vfs_posix_file.c msgid "poll on file not available on win32" -msgstr "" +msgstr "zài win32 shàng bù tí gōng wén jiàn tóu piào" #: shared-module/vectorio/Polygon.c msgid "polygon can only be registered in one parent" From 2955112b5c99294de5677904e37187c793bdb2f1 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Mon, 25 Apr 2022 15:09:37 +0200 Subject: [PATCH 0180/2403] 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/ru.po | 4 ++++ locale/sv.po | 4 ++++ locale/tr.po | 4 ++++ locale/zh_Latn_pinyin.po | 8 ++++++-- 19 files changed, 78 insertions(+), 2 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 2a230e14e4..8f7306cfc7 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1623,6 +1623,10 @@ msgstr "" msgid "Name too long" msgstr "Nama terlalu panjang" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 7c2ac387d4..36eb171edd 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1611,6 +1611,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 7547691254..8aedf8bc90 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1631,6 +1631,10 @@ msgstr "NVS-Fehler" msgid "Name too long" msgstr "Name zu lang" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "Kein Speicher mehr für Nible vorhanden" diff --git a/locale/el.po b/locale/el.po index 6f0c064921..a1fe258d10 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1604,6 +1604,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 590a62eab0..b9a9eff0b2 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1617,6 +1617,10 @@ msgstr "NVS Error" msgid "Name too long" msgstr "Name too long" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/es.po b/locale/es.po index 54c5450c9d..7eb803b9d8 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1639,6 +1639,10 @@ msgstr "Error NVS" msgid "Name too long" msgstr "Nombre muy largo" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/fil.po b/locale/fil.po index 76483d726b..75fcdc6175 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1619,6 +1619,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 86a6c33ea7..05ea6ff9a6 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1650,6 +1650,10 @@ msgstr "Erreur NVS" msgid "Name too long" msgstr "Nom trop long" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/hi.po b/locale/hi.po index 631a9ccb5f..94f35ec87a 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1604,6 +1604,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index bbd745060d..77fa35a560 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1628,6 +1628,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index b2fa07d980..dfd1ab19df 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1615,6 +1615,10 @@ msgstr "" msgid "Name too long" msgstr "名前が長すぎます" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index e522e69235..8733dacc98 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1607,6 +1607,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 8594e0534f..ce8697f7e9 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1616,6 +1616,10 @@ msgstr "NVS-fout" msgid "Name too long" msgstr "Naam te lang" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/pl.po b/locale/pl.po index 1f69744808..310ad332f8 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1615,6 +1615,10 @@ msgstr "" msgid "Name too long" msgstr "Za długa nazwa" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 3c392e9495..b613c36f0b 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1643,6 +1643,10 @@ msgstr "Erro NVS" msgid "Name too long" msgstr "Nome muito longo" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "Ágil fora da memória" diff --git a/locale/ru.po b/locale/ru.po index 0cded6267a..d2abba80c8 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1641,6 +1641,10 @@ msgstr "Ошибка NVS" msgid "Name too long" msgstr "Имя слишком длинное" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index ebe0eb0496..052ef33473 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1626,6 +1626,10 @@ msgstr "NVS-fel" msgid "Name too long" msgstr "Name är för långt" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "Nimble har inget minne kvar" diff --git a/locale/tr.po b/locale/tr.po index 890ac7f60a..efd413b017 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1621,6 +1621,10 @@ msgstr "" msgid "Name too long" msgstr "" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 3e66db9e93..412e34e813 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -31,8 +31,8 @@ msgid "" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" "\n" -"dài mǎ yīn zì dòng chóng xīn jiā zǎi ér tíng zhǐ. jí jiāng chóng xīn jiā zǎi." -"\n" +"dài mǎ yīn zì dòng chóng xīn jiā zǎi ér tíng zhǐ. jí jiāng chóng xīn jiā " +"zǎi.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -1639,6 +1639,10 @@ msgstr "NVS cuò wù" msgid "Name too long" msgstr "Míngchēng tài zhǎng" +#: shared-bindings/displayio/TileGrid.c +msgid "New bitmap must be same size as old bitmap" +msgstr "" + #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" msgstr "líng huó de bǎi tuō jì yì" From 4eeaf41edc770605224103fd42fb319f6e61ebf8 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 13 Apr 2022 14:23:26 -0400 Subject: [PATCH 0181/2403] test and adjust NeoPixel timings on multiple products --- .../common-hal/neopixel_write/__init__.c | 27 +++++++++----- .../common-hal/neopixel_write/__init__.c | 10 +++--- .../nrf/common-hal/neopixel_write/__init__.c | 11 +++--- .../common-hal/neopixel_write/__init__.c | 24 ++++++------- .../stm/common-hal/neopixel_write/__init__.c | 4 +-- shared-bindings/neopixel_write/__init__.c | 36 +++++++++++++++++++ 6 files changed, 81 insertions(+), 31 deletions(-) diff --git a/ports/atmel-samd/common-hal/neopixel_write/__init__.c b/ports/atmel-samd/common-hal/neopixel_write/__init__.c index 182b8eee14..824bc5e3ed 100644 --- a/ports/atmel-samd/common-hal/neopixel_write/__init__.c +++ b/ports/atmel-samd/common-hal/neopixel_write/__init__.c @@ -46,6 +46,9 @@ __attribute__((naked,noinline,aligned(16))) static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMask, const uint8_t *ptr, int numBytes); +// The SAMD21 timing loop durations below are approximate, +// because the other instructions take significant time. + static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMask, const uint8_t *ptr, int numBytes) { asm volatile (" push {r4, r5, r6, lr};" @@ -54,25 +57,28 @@ static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMa " ldrb r5, [r2, #0];" // r5 := *ptr " add r2, #1;" // ptr++ " movs r4, #128;" // r4-mask, 0x80 + "loopBit:" " str r1, [r0, #4];" // set #ifdef SAMD21 - " movs r6, #3; d2: sub r6, #1; bne d2;" // delay 3 + " movs r6, #2; d2: sub r6, #1; bne d2;" // 248 ns high (entire T0H or start T1H) #endif #ifdef SAM_D5X_E5X - " movs r6, #16; d2: subs r6, #1; bne d2;" // delay 3 + " movs r6, #11; d2: subs r6, #1; bne d2;" // 300 ns high (entire T0H or start T1H) #endif " tst r4, r5;" // mask&r5 " bne skipclr;" " str r1, [r0, #0];" // clr + "skipclr:" #ifdef SAMD21 - " movs r6, #6; d0: sub r6, #1; bne d0;" // delay 6 + " movs r6, #7; d0: sub r6, #1; bne d0;" // 772 ns low or high (start T0L or end T1H) #endif #ifdef SAM_D5X_E5X - " movs r6, #16; d0: subs r6, #1; bne d0;" // delay 6 + " movs r6, #15; d0: subs r6, #1; bne d0;" // 388 ns low or high (start T0L or end T1H) #endif " str r1, [r0, #0];" // clr (possibly again, doesn't matter) + #ifdef SAMD21 " asr r4, r4, #1;" // mask >>= 1 #endif @@ -82,15 +88,20 @@ static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMa " beq nextbyte;" " uxtb r4, r4;" #ifdef SAMD21 - " movs r6, #2; d1: sub r6, #1; bne d1;" // delay 2 + " movs r6, #5; d1: sub r6, #1; bne d1;" // 496 ns (end TOL or entire T1L) #endif #ifdef SAM_D5X_E5X - " movs r6, #15; d1: subs r6, #1; bne d1;" // delay 2 + " movs r6, #20; d1: subs r6, #1; bne d1;" // 548 ns (end TOL or entire T1L) #endif " b loopBit;" + "nextbyte:" - #ifdef SAM_D5X_E5X - " movs r6, #12; d3: subs r6, #1; bne d3;" // delay 2 + #ifdef SAMD21 + " movs r6, #1; d3: sub r6, #1; bne d3;" // 60 ns (end TOL or entire T1L) + // other instructions add more delay + #endif + #ifdef SAM_D5X_E5X + " movs r6, #18; d3: subs r6, #1; bne d3;" // extra for 936 ns total (byte end T0L or entire T1L) #endif " cmp r2, r3;" " bcs neopixel_stop;" diff --git a/ports/espressif/common-hal/neopixel_write/__init__.c b/ports/espressif/common-hal/neopixel_write/__init__.c index b140eff4f9..148b47aeb0 100644 --- a/ports/espressif/common-hal/neopixel_write/__init__.c +++ b/ports/espressif/common-hal/neopixel_write/__init__.c @@ -47,11 +47,11 @@ #include "components/driver/include/driver/rmt.h" #include "peripherals/rmt.h" -// 416 ns is 1/3 of the 1250ns period of a 800khz signal. -#define WS2812_T0H_NS (416) -#define WS2812_T0L_NS (416 * 2) -#define WS2812_T1H_NS (416 * 2) -#define WS2812_T1L_NS (416) +// Use closer to WS2812-style timings instead of WS2812B, to accommodate more varieties. +#define WS2812_T0H_NS (316) +#define WS2812_T0L_NS (316 * 3) +#define WS2812_T1H_NS (700) +#define WS2812_T1L_NS (564) static uint32_t ws2812_t0h_ticks = 0; static uint32_t ws2812_t1h_ticks = 0; diff --git a/ports/nrf/common-hal/neopixel_write/__init__.c b/ports/nrf/common-hal/neopixel_write/__init__.c index 6f012fa35b..ce8ee8c7cf 100644 --- a/ports/nrf/common-hal/neopixel_write/__init__.c +++ b/ports/nrf/common-hal/neopixel_write/__init__.c @@ -53,13 +53,16 @@ // The PWM starts the duty cycle in LOW. To start with HIGH we // need to set the 15th bit on each register. +// *** CircuitPython: Use WS2812 for all, works with https://adafru.it/5225 and everything else +// *** + // WS2812 (rev A) timing is 0.35 and 0.7us -// #define MAGIC_T0H 5UL | (0x8000) // 0.3125us -// #define MAGIC_T1H 12UL | (0x8000) // 0.75us +#define MAGIC_T0H 5UL | (0x8000) // 0.3125us +#define MAGIC_T1H 12UL | (0x8000) // 0.75us // WS2812B (rev B) timing is 0.4 and 0.8 us -#define MAGIC_T0H 6UL | (0x8000) // 0.375us -#define MAGIC_T1H 13UL | (0x8000) // 0.8125us +// #define MAGIC_T0H 6UL | (0x8000) // 0.375us +// #define MAGIC_T1H 13UL | (0x8000) // 0.8125us #define CTOPVAL 20UL // 1.25us // ---------- END Constants for the EasyDMA implementation ------------- diff --git a/ports/raspberrypi/common-hal/neopixel_write/__init__.c b/ports/raspberrypi/common-hal/neopixel_write/__init__.c index 1acfed055c..034c5de002 100644 --- a/ports/raspberrypi/common-hal/neopixel_write/__init__.c +++ b/ports/raspberrypi/common-hal/neopixel_write/__init__.c @@ -35,23 +35,23 @@ uint64_t next_start_raw_ticks = 0; -// NeoPixels are 800khz bit streams. Zeroes are 1/3 duty cycle (~416ns) and ones -// are 2/3 duty cycle (~833ns). Each of the instructions below take 1/3 duty +// NeoPixels are 800khz bit streams. We are choosing zeros as <312ns hi, 936 lo> and ones +// and ones as <700 ns hi, 556 ns lo>. // cycle. The first two instructions always run while only one of the two final // instructions run per bit. We start with the low period because it can be -// longer than 1/3 period while waiting for more data. +// longer while waiting for more data. const uint16_t neopixel_program[] = { // bitloop: -// out x 1 side 0 [1]; Side-set still takes place before instruction stalls - 0x6121, -// jmp !x do_zero side 1 [1]; Branch on the bit we shifted out after 1/3 duty delay. Positive pulse - 0x1123, +// out x 1 side 0 [6]; Drive low. Side-set still takes place before instruction stalls. + 0x6621, +// jmp !x do_zero side 1 [3]; Branch on the bit we shifted out previous delay. Drive high. + 0x1323, // do_one: -// jmp bitloop side 1 [1]; Continue driving high, for a long pulse - 0x1100, +// jmp bitloop side 1 [4]; Continue driving high, for a one (long pulse) + 0x1400, // do_zero: -// nop side 0 [1]; Or drive low, for a short pulse - 0xa142 +// nop side 0 [4]; Or drive low, for a zero (short pulse) + 0xa442 }; void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, uint8_t *pixels, uint32_t num_bytes) { @@ -63,7 +63,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, uint32_t pins_we_use = 1 << digitalinout->pin->number; bool ok = rp2pio_statemachine_construct(&state_machine, neopixel_program, sizeof(neopixel_program) / sizeof(neopixel_program[0]), - 800000 * 6, // 800 khz * 6 cycles per bit + 12800000, // MHz, to get about appropriate sub-bit times in PIO program. NULL, 0, // init program NULL, 1, // out NULL, 1, // in diff --git a/ports/stm/common-hal/neopixel_write/__init__.c b/ports/stm/common-hal/neopixel_write/__init__.c index f5dabe7f99..99529793fa 100644 --- a/ports/stm/common-hal/neopixel_write/__init__.c +++ b/ports/stm/common-hal/neopixel_write/__init__.c @@ -38,8 +38,8 @@ uint64_t next_start_raw_ticks = 0; // sysclock divisors #define MAGIC_800_INT 900000 // ~1.11 us -> 1.2 field -#define MAGIC_800_T0H 2800000 // ~0.36 us -> 0.44 field -#define MAGIC_800_T1H 1350000 // ~0.74 us -> 0.84 field +#define MAGIC_800_T0H 3500000 // 300ns actual; 880 low +#define MAGIC_800_T1H 1350000 // 768ns actual; 412 low #pragma GCC push_options #pragma GCC optimize ("Os") diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index a95020ad46..bcdedf62a7 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -32,6 +32,42 @@ #include "shared-bindings/util.h" #include "supervisor/shared/translate.h" +// RGB LED timing information: + +// From the WS2811 datasheet: high speed mode +// - T0H 0 code,high voltage time 0.25 us +-150ns +// - T1H 1 code,high voltage time 0.6 us +-150ns +// - T0L 0 code,low voltage time 1.0 us +-150ns +// - T1L 1 code,low voltage time 0.65 us +-150ns +// - RES low voltage time Above 50us + +// From the SK6812 datasheet: +// - T0H 0 code, high level time 0.3us +-0.15us +// - T1H 1 code, high level time 0.6us +-0.15us +// - T0L 0 code, low level time 0.9us +-0.15us +// - T1L 1 code, low level time 0.6us +-0.15us +// - Trst Reset code，low level time 80us + +// From the WS2812 datasheet: +// - T0H 0 code, high voltage time 0.35us +-150ns +// - T1H 1 code, high voltage time 0.7us +-150ns +// - T0L 0 code, low voltage time 0.8us +-150ns +// - T1L 1 code, low voltage time 0.6us +-150ns +// - RES low voltage time Above 50us + +// From the WS28212B datasheet: +// - T0H 0 code, high voltage time 0.4us +-150ns +// - T1H 1 code, high voltage time 0.8us +-150ns +// - T0L 0 code, low voltage time 0.85us +-150ns +// - T1L 1 code, low voltage time 0.45us +-150ns +// - RES low voltage time Above 50us + +// The timings used in various ports do not always follow the guidelines above. +// In general, a zero bit is about 300ns high, 900ns low. +// A one bit is about 700ns high, 500ns low. +// But the ports vary based on implementation considerations; the proof is in the testing. +// https://adafru.it/5225 is more sensitive to timing and should be included in testing. + STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { if (common_hal_digitalio_digitalinout_deinited(self)) { raise_deinited_error(); From 910662e833d28cd4ff092cdbc91db5c72757aac7 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Tue, 26 Apr 2022 12:56:31 +0100 Subject: [PATCH 0182/2403] Finalised motor 2040 pins --- ports/raspberrypi/boards/pimoroni_motor2040/pins.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c index 6f3f7cd50c..caafe16ad1 100644 --- a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c @@ -23,9 +23,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ENCODER_D_B), MP_ROM_PTR(&pin_GPIO15) }, { MP_ROM_QSTR(MP_QSTR_NUM_ENCODERS), MP_ROM_INT(4) }, - { MP_ROM_QSTR(MP_QSTR_TX_TRIG), MP_ROM_PTR(&pin_GPIO16) }, - { MP_ROM_QSTR(MP_QSTR_RX_ECHO), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_TRIG), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_ECHO), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_LED_DATA), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(1) }, From c28c028f90c292000226b1ca3d1f9b875d48d5e1 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Mon, 25 Apr 2022 23:35:45 +0000 Subject: [PATCH 0183/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1055 of 1055 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 b613c36f0b..033cbff9b1 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: 2022-04-23 21:13+0000\n" +"PO-Revision-Date: 2022-04-26 13:00+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -1645,7 +1645,7 @@ msgstr "Nome muito longo" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" -msgstr "" +msgstr "O novo bitmap deve ter o mesmo tamanho que o bitmap antigo" #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" From 339a3608a5be479c0dfa7cc75bc5a6c0ea0e0ca3 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Mon, 25 Apr 2022 13:28:50 +0000 Subject: [PATCH 0184/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1055 of 1055 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 052ef33473..e72540e4b4 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: 2022-04-21 13:12+0000\n" +"PO-Revision-Date: 2022-04-26 13:00+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \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.12-dev\n" +"X-Generator: Weblate 4.12.1-dev\n" #: main.c msgid "" @@ -1628,7 +1628,7 @@ msgstr "Name är för långt" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" -msgstr "" +msgstr "Ny bitmapp måste ha samma storlek som tidigare bitmapp" #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" From ab73741b406bcf5644cdb04d5539a57ea6ccd3d5 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Tue, 26 Apr 2022 16:09:16 +0200 Subject: [PATCH 0185/2403] 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 | 5 +++++ 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 | 5 +++++ locale/ru.po | 5 +++++ locale/sv.po | 5 +++++ locale/tr.po | 5 +++++ locale/zh_Latn_pinyin.po | 5 +++++ 19 files changed, 95 insertions(+) diff --git a/locale/ID.po b/locale/ID.po index 8f7306cfc7..259558f5c6 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1554,6 +1554,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Penundaan mulai mikrofon harus dalam kisaran 0,0 hingga 1,0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Tidak menemukan Pin MISO atau MOSI" diff --git a/locale/cs.po b/locale/cs.po index 36eb171edd..9a1b640b2c 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1542,6 +1542,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 8aedf8bc90..cef3b0462c 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1562,6 +1562,11 @@ msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" "Die Startverzögerung des Mikrofons muss im Bereich von 0,0 bis 1,0 liegen" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Fehlender MISO- oder MOSI-Pin" diff --git a/locale/el.po b/locale/el.po index a1fe258d10..7e49827d6b 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1535,6 +1535,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index b9a9eff0b2..76b9098a8c 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1548,6 +1548,11 @@ msgstr "Messages limited to 8 bytes" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Microphone startup delay must be in range 0.0 to 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Missing MISO or MOSI pin" diff --git a/locale/es.po b/locale/es.po index 7eb803b9d8..130d1c9ab0 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1566,6 +1566,11 @@ msgstr "Mensajes limitados a 8 bytes" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Micrófono demora de inicio debe estar en el rango 0.0 a 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Falta el pin MISO o MOSI" diff --git a/locale/fil.po b/locale/fil.po index 75fcdc6175..0d5aab815a 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1550,6 +1550,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Ang delay ng startup ng mikropono ay dapat na nasa 0.0 hanggang 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 05ea6ff9a6..b2114b82e2 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1579,6 +1579,11 @@ msgstr "Messages limités à 8 octets" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Le délais au démarrage du micro doit être entre 0.0 et 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Broche MISO ou MOSI manquante" diff --git a/locale/hi.po b/locale/hi.po index 94f35ec87a..0e209da6ff 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1535,6 +1535,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 77fa35a560..4f94abb6ea 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1559,6 +1559,11 @@ msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" "Il ritardo di avvio del microfono deve essere nell'intervallo tra 0.0 e 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index dfd1ab19df..cf5adc15e8 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1546,6 +1546,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "マイクのスタートアップディレイは 0.0 から 1.0 の間でなければなりません" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISOまたはMOSIピンがありません" diff --git a/locale/ko.po b/locale/ko.po index 8733dacc98..8e307851fc 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1538,6 +1538,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index ce8697f7e9..0e7310a58c 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1547,6 +1547,11 @@ msgstr "Berichten zijn beperkt tot 8 bytes" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Microfoon opstart vertraging moet in bereik van 0.0 tot 1.0 zijn" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Ontbrekende MISO of MOSI Pin" diff --git a/locale/pl.po b/locale/pl.po index 310ad332f8..4591aaac3c 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1546,6 +1546,11 @@ msgstr "Wiadomości ograniczone do 8 bajtów" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Opóźnienie włączenia mikrofonu musi być w zakresie od 0.0 do 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Brak pinu MISO lub MOSI" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 033cbff9b1..644abdd21d 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1574,6 +1574,11 @@ msgstr "As mensagens estão limitadas a 8 bytes" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "O atraso na inicialização do microfone deve estar entre 0,0 e 1,0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "O pino MISO ou MOSI está ausente" diff --git a/locale/ru.po b/locale/ru.po index d2abba80c8..f8725b0f8c 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1571,6 +1571,11 @@ msgstr "Сообщения ограничены 8 байтами" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Задержка включения микрофона должна быть в диапазоне от 0.0 до 1.0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Отсутствует пин MISO или MOSI" diff --git a/locale/sv.po b/locale/sv.po index e72540e4b4..e7b93a48df 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1557,6 +1557,11 @@ msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" "Startfördröjningen för mikrofonen måste vara i intervallet 0,0 till 1,0" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISO- eller MOSI-pinne saknas" diff --git a/locale/tr.po b/locale/tr.po index efd413b017..dcfc518ce3 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1552,6 +1552,11 @@ msgstr "" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 412e34e813..c989a89851 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -1569,6 +1569,11 @@ msgstr "Yóujiàn xiànzhì wèi 8 gè zì jié" msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Màikèfēng qǐdòng yánchí bìxū zài 0.0 Dào 1.0 De fànwéi nèi" +#: ports/raspberrypi/bindings/rp2pio/StateMachine.c +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched data size" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Quēshǎo MISO huò MOSI yǐn jiǎo" From 7c337ca3ac78159b152c95b58eec9047e1e04143 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Apr 2022 10:33:37 -0400 Subject: [PATCH 0186/2403] huffman is a submodule and does not need to be in requirements-dev.txt --- requirements-dev.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 67835dad3d..0b2e08163a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,3 @@ -# For string compression -huffman - # For nvm.toml cascadetoml jinja2 From 6e6679b039a37d0facfce2199f40f19299f3d103 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Tue, 26 Apr 2022 15:10:00 +0000 Subject: [PATCH 0187/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1056 of 1056 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 e7b93a48df..16ef753ee3 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: 2022-04-26 13:00+0000\n" +"PO-Revision-Date: 2022-04-26 15:40+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -1560,7 +1560,7 @@ msgstr "" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched data size" -msgstr "" +msgstr "Datastorlek matchar inte" #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" From 6b25ccf1a447a250c2cbb287ea2c15688b07169f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Apr 2022 14:26:42 -0400 Subject: [PATCH 0188/2403] remove stray space --- ports/atmel-samd/common-hal/neopixel_write/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/common-hal/neopixel_write/__init__.c b/ports/atmel-samd/common-hal/neopixel_write/__init__.c index 824bc5e3ed..ac9a804333 100644 --- a/ports/atmel-samd/common-hal/neopixel_write/__init__.c +++ b/ports/atmel-samd/common-hal/neopixel_write/__init__.c @@ -100,7 +100,7 @@ static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMa " movs r6, #1; d3: sub r6, #1; bne d3;" // 60 ns (end TOL or entire T1L) // other instructions add more delay #endif - #ifdef SAM_D5X_E5X + #ifdef SAM_D5X_E5X " movs r6, #18; d3: subs r6, #1; bne d3;" // extra for 936 ns total (byte end T0L or entire T1L) #endif " cmp r2, r3;" From e85ea4f4bb89a6e1237558bd7856e3a07db16775 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Apr 2022 14:43:48 -0400 Subject: [PATCH 0189/2403] update frozen libraries --- frozen/Adafruit_CircuitPython_BLE | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_PortalBase | 2 +- frozen/Adafruit_CircuitPython_SD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index de7cacfbb4..13c529288e 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit de7cacfbb4bddf74f5188f23b56f075c884f98c4 +Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76 diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index fd478fda7a..207953aac0 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit fd478fda7adbd254282b8cad5000f06a96760c91 +Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase index 2bc1b86ef2..bcfaae874f 160000 --- a/frozen/Adafruit_CircuitPython_PortalBase +++ b/frozen/Adafruit_CircuitPython_PortalBase @@ -1 +1 @@ -Subproject commit 2bc1b86ef2e709f31aea65469964b777f1da6d5b +Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944 diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index 22cb706e5f..da02c76d4c 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit 22cb706e5f718988d5442246120defd21c5937c9 +Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35 From 7a77aae4bedead991e7608dc60fb86998e855bfb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Apr 2022 16:52:43 -0400 Subject: [PATCH 0190/2403] shrink feather_m0_supersized --- ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk index 811336885b..9636c195dc 100644 --- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL064L" LONGINT_IMPL = MPZ + +CIRCUITPY_ONEWIREIO = 0 From b7541088f40f1a82da051c17fbfb1dbbebf13400 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Apr 2022 17:51:47 -0400 Subject: [PATCH 0191/2403] shrink circuitplayground_express_crickit --- .../boards/circuitplayground_express_crickit/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index fb65d7cd0a..4d749d2134 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -15,6 +15,7 @@ LONGINT_IMPL = NONE CIRCUITPY_BUSDEVICE = 1 CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_KEYPAD = 0 +CIRCUITPY_ONEWIREIO = 0 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground From dd5288127c1e206ae7b9384eb3b17b8928f99dbf Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Tue, 26 Apr 2022 17:22:24 +0000 Subject: [PATCH 0192/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1056 of 1056 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 644abdd21d..1d3333e55f 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: 2022-04-26 13:00+0000\n" +"PO-Revision-Date: 2022-04-27 18:11+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -1577,7 +1577,7 @@ msgstr "O atraso na inicialização do microfone deve estar entre 0,0 e 1,0" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched data size" -msgstr "" +msgstr "O tamanho dos dados é incompatível" #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" From 73f6b486766233a4f2631cf1c5bbd7b0a1782433 Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 27 Apr 2022 11:26:08 -0700 Subject: [PATCH 0193/2403] [mimxrt (teensy) Allow Any GPIO pin for RS485 pin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The existing code was setup that allowed you to specify an RTS pin to be used as an RS485 direction pin, however there are no RTS pins that are exposed on any of the Teensy 4.x boards. Instead Arduino code base allowed you to specify any GPIO pin to work instead. So I added the code in to facilitate this. In addition the alternative code to wrap your own GPIO pin set high and low around call(s) to uart.write() will not currently work, unless maybe you fudge it and add your own delays as the write will return after the last byte was pushed onto the UART’s hardware FIFO queue and as such if you then immediately set the IO pin low, it will corrupt your output stream. The code I added detects that you are setup to use the RS485 pin and before it returns will wait for the UART’s Transfer complete status flag to be set. --- ports/mimxrt10xx/common-hal/busio/UART.c | 86 +++++++++++++++++++++--- ports/mimxrt10xx/common-hal/busio/UART.h | 3 + 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 77a2f97974..71de53f07f 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -39,6 +39,17 @@ #include "periph.h" #include "fsl_lpuart.h" +#include "fsl_gpio.h" +// ========================================================== +// Debug code +// ========================================================== +#define ENABLE_DEBUG_PRINTING 0 +#if ENABLE_DEBUG_PRINTING +#define DBGPrintf mp_printf +#else +#define DBGPrintf(p,...) +#endif + // arrays use 0 based numbering: UART1 is stored at index 0 #define MAX_UART 8 @@ -90,6 +101,7 @@ void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) { common_hal_never_reset_pin(self->rx); common_hal_never_reset_pin(self->rts); common_hal_never_reset_pin(self->cts); + common_hal_never_reset_pin(self->rs485_dir); } void common_hal_busio_uart_construct(busio_uart_obj_t *self, @@ -108,9 +120,12 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_raise_ValueError(translate("Invalid word/bit length")); } + DBGPrintf(&mp_plat_print, "uart_construct: tx:%p rx:%p rts:%p cts:%p rs485:%p\n", tx, rx, rts, cts, rs485_dir); + // We are transmitting one direction if one pin is NULL and the other isn't. bool is_onedirection = (rx == NULL) != (tx == NULL); bool uart_taken = false; + bool use_rts_for_rs485 = false; const uint32_t rx_count = MP_ARRAY_SIZE(mcu_uart_rx_list); const uint32_t tx_count = MP_ARRAY_SIZE(mcu_uart_tx_list); @@ -187,11 +202,14 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // Filter for sane settings for RS485 if (rs485_dir != NULL) { + DBGPrintf(&mp_plat_print, "\t(485 pin): gpio:%p #:%x Mux: %x %x cfg:%x reset:%x %x\n", + rs485_dir->gpio, rs485_dir->number, rs485_dir->mux_idx, rs485_dir->mux_reg, rs485_dir->cfg_reg, + rs485_dir->mux_reset, rs485_dir->pad_reset); if ((rts != NULL) || (cts != NULL)) { mp_raise_ValueError(translate("Cannot specify RTS or CTS in RS485 mode")); } - // For IMXRT the RTS pin is used for RS485 direction - rts = rs485_dir; + // For IMXRT the RTS pin is used for RS485 direction ???? - Can be will try + // it if this is an rts pin. } else { if (rs485_invert) { mp_raise_ValueError(translate("RS485 inversion specified when not in RS485 mode")); @@ -202,16 +220,22 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, const uint32_t rts_count = MP_ARRAY_SIZE(mcu_uart_rts_list); const uint32_t cts_count = MP_ARRAY_SIZE(mcu_uart_cts_list); - if (rts != NULL) { + if ((rts != NULL) || (rs485_dir != NULL)) { for (uint32_t i = 0; i < rts_count; ++i) { if (mcu_uart_rts_list[i].bank_idx == rx_config->bank_idx) { if (mcu_uart_rts_list[i].pin == rts) { rts_config = &mcu_uart_rts_list[i]; break; + } else if (mcu_uart_rts_list[i].pin == rs485_dir) { + rts_config = &mcu_uart_rts_list[i]; + use_rts_for_rs485 = true; + rts = rs485_dir; + rs485_dir = NULL; + break; } } } - if (rts_config == NULL) { + if ((rts != NULL) && (rts_config == NULL)) { mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RTS); } } @@ -225,7 +249,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } } } - if (cts == NULL) { + if (cts_config == NULL) { mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_CTS); } } @@ -257,7 +281,32 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, config_periph_pin(cts_config); self->cts = cts; } + if (rs485_dir) { + DBGPrintf(&mp_plat_print, "\tInit rs485 pin\n"); + // lets configure this pin as standard GPIO output pin. + claim_pin(rs485_dir); + #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U + IOMUXC_SetPinMux(rs485_dir->mux_reg, IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5, 0, 0, 0, 0); + DBGPrintf(&mp_plat_print, "\tAfter IOMUXC_SetPinMux\n"); + IOMUXC_SetPinConfig(0, 0, 0, 0, rs485_dir->cfg_reg, + IOMUXC_SW_PAD_CTL_PAD_HYS(1) + | IOMUXC_SW_PAD_CTL_PAD_PUS(0) + | IOMUXC_SW_PAD_CTL_PAD_PUE(0) + | IOMUXC_SW_PAD_CTL_PAD_PKE(1) + | IOMUXC_SW_PAD_CTL_PAD_ODE(0) + | IOMUXC_SW_PAD_CTL_PAD_SPEED(2) + | IOMUXC_SW_PAD_CTL_PAD_DSE(1) + | IOMUXC_SW_PAD_CTL_PAD_SRE(0)); + DBGPrintf(&mp_plat_print, "\tAfter IOMUXC_SetPinConfig\n"); + + const gpio_pin_config_t config = { kGPIO_DigitalOutput, rs485_invert, kGPIO_NoIntmode }; + GPIO_PinInit(rs485_dir->gpio, rs485_dir->number, &config); + DBGPrintf(&mp_plat_print, "\tAfter GPIO_PinInit\n"); + self->rs485_dir = rs485_dir; + self->rs485_invert = rs485_invert; + + } lpuart_config_t config = { 0 }; LPUART_GetDefaultConfig(&config); @@ -279,7 +328,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // Before we init, setup RS485 direction pin // ..unfortunately this isn't done by the driver library uint32_t modir = (self->uart->MODIR) & ~(LPUART_MODIR_TXRTSPOL_MASK | LPUART_MODIR_TXRTSE_MASK); - if (rs485_dir != NULL) { + if (use_rts_for_rs485) { modir |= LPUART_MODIR_TXRTSE_MASK; if (rs485_invert) { modir |= LPUART_MODIR_TXRTSPOL_MASK; @@ -311,6 +360,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, claim_pin(self->rx); } + DBGPrintf(&mp_plat_print, "\t<< Init completed >>\n"); } bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) { @@ -330,9 +380,16 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) { common_hal_reset_pin(self->rx); common_hal_reset_pin(self->tx); + common_hal_reset_pin(self->cts); + common_hal_reset_pin(self->rts); + common_hal_reset_pin(self->rs485_dir); self->rx = NULL; self->tx = NULL; + self->cts = NULL; + self->rts = NULL; + self->rs485_dir = NULL; + } // Read characters. @@ -393,8 +450,21 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, if (self->tx == NULL) { mp_raise_ValueError(translate("No TX pin")); } - - LPUART_WriteBlocking(self->uart, data, len); + if (self->rs485_dir && len) { + GPIO_PinWrite(self->rs485_dir->gpio, self->rs485_dir->number, !self->rs485_invert); + LPUART_WriteBlocking(self->uart, data, len); + // Probably need to verify we have completed output. + uint32_t dont_hang_count = 0xffff; + while (dont_hang_count--) { + if (LPUART_GetStatusFlags(self->uart) & kLPUART_TransmissionCompleteFlag) { + break; // hardware says it completed. + } + } + GPIO_PinWrite(self->rs485_dir->gpio, self->rs485_dir->number, self->rs485_invert); + } else { + // could combine with above but would go through two ifs + LPUART_WriteBlocking(self->uart, data, len); + } return len; } diff --git a/ports/mimxrt10xx/common-hal/busio/UART.h b/ports/mimxrt10xx/common-hal/busio/UART.h index fb3fd3245a..bc8374aabb 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.h +++ b/ports/mimxrt10xx/common-hal/busio/UART.h @@ -50,6 +50,9 @@ typedef struct { const mcu_pin_obj_t *tx; const mcu_pin_obj_t *cts; const mcu_pin_obj_t *rts; + const mcu_pin_obj_t *rs485_dir; + bool rs485_invert; + } busio_uart_obj_t; void uart_reset(void); From b25d810af90f2e8982971fd7ab1aac0c23ed9070 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 27 Apr 2022 20:03:28 -0400 Subject: [PATCH 0194/2403] Preserve ticks for displays across VMs --- ports/atmel-samd/supervisor/port.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c index 704d17c68d..885d23c726 100644 --- a/ports/atmel-samd/supervisor/port.c +++ b/ports/atmel-samd/supervisor/port.c @@ -131,7 +131,11 @@ static volatile bool sleep_ok = true; #ifdef SAMD21 -uint8_t _tick_event_channel; +static uint8_t _tick_event_channel = EVSYS_SYNCH_NUM; + +static bool tick_enabled(void) { + return _tick_event_channel != EVSYS_SYNCH_NUM; +} // Sleeping requires a register write that can stall interrupt handling. Turning // off sleeps allows for more accurate interrupt timing. (Python still thinks @@ -431,8 +435,15 @@ void reset_port(void) { pew_reset(); #endif - reset_event_system(); - reset_ticks(); + #ifdef SAMD21 + if (!tick_enabled()) + // SAMD21 ticks depend on the event system, so don't disturb the event system if we need ticks, + // such as for a display that lives across VM instantiations. + #endif + { + reset_event_system(); + reset_ticks(); + } reset_all_pins(); @@ -613,8 +624,8 @@ void port_enable_tick(void) { RTC->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_PER2; #endif #ifdef SAMD21 - // SAMD21 ticks won't survive reset_port(). This *should* be ok since it'll - // be triggered by ticks and no Python will be running. + // reset_port() preserves the event system if ticks were still enabled after a VM finished, + // such as for an on-board display. Normally the event system would be reset between VM instantiations. if (_tick_event_channel >= EVSYS_SYNCH_NUM) { turn_on_event_system(); _tick_event_channel = find_sync_event_channel(); From e63a327107823946e731bb9649ed946bcbb63fd9 Mon Sep 17 00:00:00 2001 From: Michael Wisslead Date: Thu, 28 Apr 2022 02:22:33 +0000 Subject: [PATCH 0195/2403] Bound PulseIn start indexes to maxlen. --- ports/atmel-samd/common-hal/pulseio/PulseIn.c | 2 +- ports/cxd56/common-hal/pulseio/PulseIn.c | 2 +- ports/espressif/common-hal/pulseio/PulseIn.c | 18 +++++++++--------- ports/nrf/common-hal/pulseio/PulseIn.c | 2 +- ports/stm/common-hal/pulseio/PulseIn.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c index 507db7e437..0927faa00a 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseIn.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseIn.c @@ -132,7 +132,7 @@ void pulsein_interrupt_handler(uint8_t channel) { if (self->len < self->maxlen) { self->len++; } else { - self->start++; + self->start = (self->start + 1) % self->maxlen; } } self->last_overflow = current_overflow; diff --git a/ports/cxd56/common-hal/pulseio/PulseIn.c b/ports/cxd56/common-hal/pulseio/PulseIn.c index 0d2fbbfd96..264f11a714 100644 --- a/ports/cxd56/common-hal/pulseio/PulseIn.c +++ b/ports/cxd56/common-hal/pulseio/PulseIn.c @@ -75,7 +75,7 @@ static int pulsein_interrupt_handler(int irq, FAR void *context, FAR void *arg) if (self->len < self->maxlen) { self->len++; } else { - self->start++; + self->start = (self->start + 1) % self->maxlen; } } self->last_us = current_us; diff --git a/ports/espressif/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c index 1b29032354..95d69b6a2f 100644 --- a/ports/espressif/common-hal/pulseio/PulseIn.c +++ b/ports/espressif/common-hal/pulseio/PulseIn.c @@ -42,19 +42,19 @@ STATIC void update_internal_buffer(pulseio_pulsein_obj_t *self) { for (size_t i = 0; i < length; i++) { uint16_t pos = (self->start + self->len) % self->maxlen; self->buffer[pos] = items[i].duration0 * 3; - // Check if second item exists before incrementing - if (items[i].duration1) { - self->buffer[pos + 1] = items[i].duration1 * 3; - if (self->len < (self->maxlen - 1)) { - self->len += 2; - } else { - self->start += 2; - } + if (self->len < self->maxlen) { + self->len++; } else { + self->start = (self->start + 1) % self->maxlen; + } + // Check if second item exists + if (items[i].duration1) { + pos = (self->start + self->len) % self->maxlen; + self->buffer[pos] = items[i].duration1 * 3; if (self->len < self->maxlen) { self->len++; } else { - self->start++; + self->start = (self->start + 1) % self->maxlen; } } } diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nrf/common-hal/pulseio/PulseIn.c index 84545f5293..4ab5d609f2 100644 --- a/ports/nrf/common-hal/pulseio/PulseIn.c +++ b/ports/nrf/common-hal/pulseio/PulseIn.c @@ -103,7 +103,7 @@ static void _pulsein_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action if (self->len < self->maxlen) { self->len++; } else { - self->start++; + self->start = (self->start + 1) % self->maxlen; } } diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c index 70e1851939..b8fbd9a36b 100644 --- a/ports/stm/common-hal/pulseio/PulseIn.c +++ b/ports/stm/common-hal/pulseio/PulseIn.c @@ -89,7 +89,7 @@ STATIC void pulsein_exti_event_handler(uint8_t num) { if (self->len < self->maxlen) { self->len++; } else { - self->start++; + self->start = (self->start + 1) % self->maxlen; } } From 9a23923b2d793e6db1cac8778be810604506599e Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 29 Apr 2022 11:41:22 -0600 Subject: [PATCH 0196/2403] Add documentation for watchdog.WatchDogTimeout --- shared-bindings/watchdog/__init__.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/shared-bindings/watchdog/__init__.c b/shared-bindings/watchdog/__init__.c index ced56a781b..a0e357e2ac 100644 --- a/shared-bindings/watchdog/__init__.c +++ b/shared-bindings/watchdog/__init__.c @@ -49,7 +49,33 @@ //| w.timeout=2.5 # Set a timeout of 2.5 seconds //| w.mode = WatchDogMode.RAISE //| w.feed()""" + +//| class WatchDogTimeout(Exception): +//| """Exception raised when the watchdog timer is set to +//| ``WatchDogMode.RAISE`` and expires. //| +//| Example:: +//| +//| import microcontroller +//| import watchdog +//| import time +//| +//| wdt = microcontroller.watchdog +//| wdt.timeout = 5 +//| +//| while True: +//| wdt.mode = watchdog.WatchDogMode.RAISE +//| print("Starting loop -- should exit after five seconds") +//| try: +//| while True: +//| time.sleep(10) # Also works with pass +//| except watchdog.WatchDogTimeout as e: +//| print("Watchdog expired") +//| except Exception as e: +//| print("Other exception") +//| +//| print("Exited loop") +//| """ const mp_obj_type_t mp_type_WatchDogTimeout = { { &mp_type_type }, From 3d145af5872c7c37927048f35359cf6e3ebf01ea Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Sat, 30 Apr 2022 15:11:00 -0600 Subject: [PATCH 0197/2403] Add note about memory usage for MP3Decoder --- shared-bindings/audiomp3/MP3Decoder.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index a59d316072..b6539a84b2 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -35,7 +35,14 @@ #include "supervisor/shared/translate.h" //| class MP3Decoder: -//| """Load a mp3 file for audio playback""" +//| """Load a mp3 file for audio playback +//| +//| .. note:: +//| +//| ``MP3Decoder`` uses a lot of contiguous memory, so care should be given to +//| optimizing memory usage. More information can be found here: +//| https://learn.adafruit.com/Memory-saving-tips-for-CircuitPython/reducing-memory-fragmentation +//| """ //| //| def __init__(self, file: typing.BinaryIO, buffer: WriteableBuffer) -> None: //| From 92aeabfe3ac17fb73d657296ca4512f5dcf51140 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Sat, 30 Apr 2022 15:18:05 -0600 Subject: [PATCH 0198/2403] Update note in MP3Decoder --- shared-bindings/audiomp3/MP3Decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index b6539a84b2..06d9eabbcc 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -40,7 +40,7 @@ //| .. note:: //| //| ``MP3Decoder`` uses a lot of contiguous memory, so care should be given to -//| optimizing memory usage. More information can be found here: +//| optimizing memory usage. More information and recommendations can be found here: //| https://learn.adafruit.com/Memory-saving-tips-for-CircuitPython/reducing-memory-fragmentation //| """ //| From 1fad3815137b4ae337955a0ab9e2b1c55d0ddf6a Mon Sep 17 00:00:00 2001 From: KurtE Date: Sat, 30 Apr 2022 14:31:08 -0700 Subject: [PATCH 0199/2403] [RP2040] Allow any GPIO pin for RS485 direction pin As I mentioned in issue #6310 while investigating that the Teensy port did not support RS485_dir pin on normal GPIO pins, I found that it was not implemented either as well on some other ports. So was curious to implement it for RP2040 using same approach as I did for the MIMXRT in the Pull Request #6328 That is I setup the specified pin as a normal GPIO pin in output mode and then when you do a write operation it sets the GPIO pin logically high, and when the write completes I set it logically low. Note: knowing when I can set it low can be tricky, as you need to make sure the full output has completed otherwise the data will be corrupted. I am using: uart_tx_wait_blocking(self->uart); Which looks like it is supposed to wait until the busy status is no longer set, which the Reference manual mentioned, but this is leaving the line logically set longer than I would like. however I have tried running it with my hacked up version of the Python Robotis DynamixelSDK and was able to talk to some AX servos. I did have to change the library slightly for the RP2040, as the library was erroring out when you did something like uart.read(5) and it timed out without receiving anything. The RP2040 returned None whereas I think the Teensy returned an empty set, which is what it looks like the PySerial original code expects. Not sure if anyone is interested in this, but thought i would put it out as PR and see. --- ports/raspberrypi/common-hal/busio/UART.c | 39 ++++++++++++++++++++--- ports/raspberrypi/common-hal/busio/UART.h | 2 ++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c index 9fd5ad3168..97af41d495 100644 --- a/ports/raspberrypi/common-hal/busio/UART.c +++ b/ports/raspberrypi/common-hal/busio/UART.c @@ -112,10 +112,6 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_raise_ValueError(translate("Invalid buffer size")); } - if ((rs485_dir != NULL) || (rs485_invert)) { - mp_raise_NotImplementedError(translate("RS485 Not yet supported on this device")); - } - uint8_t uart_id = ((((tx != NULL) ? tx->number : rx->number) + 4) / 8) % NUM_UARTS; if (uart_status[uart_id] != STATUS_FREE) { @@ -126,6 +122,29 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->rx_pin = pin_init(uart_id, rx, 1); self->cts_pin = pin_init(uart_id, cts, 2); self->rts_pin = pin_init(uart_id, rts, 3); + + if (rs485_dir != NULL) { + uint8_t pin = rs485_dir->number; + self->rs485_dir_pin = pin; + self->rs485_invert = rs485_invert; + + gpio_init(pin); + + claim_pin(rs485_dir); + + gpio_disable_pulls(pin); + + // Turn on "strong" pin driving (more current available). + hw_write_masked(&padsbank0_hw->io[pin], + PADS_BANK0_GPIO0_DRIVE_VALUE_12MA << PADS_BANK0_GPIO0_DRIVE_LSB, + PADS_BANK0_GPIO0_DRIVE_BITS); + + gpio_put(self->rs485_dir_pin, rs485_invert); + gpio_set_dir(self->rs485_dir_pin, GPIO_OUT); + } else { + self->rs485_dir_pin = NO_PIN; + } + uart_status[uart_id] = STATUS_BUSY; @@ -179,10 +198,12 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) { reset_pin_number(self->rx_pin); reset_pin_number(self->cts_pin); reset_pin_number(self->rts_pin); + reset_pin_number(self->rs485_dir_pin); self->tx_pin = NO_PIN; self->rx_pin = NO_PIN; self->cts_pin = NO_PIN; self->rts_pin = NO_PIN; + self->rs485_dir_pin = NO_PIN; } // Write characters. @@ -191,6 +212,11 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, mp_raise_ValueError(translate("No TX pin")); } + if (self->rs485_dir_pin != NO_PIN) { + uart_tx_wait_blocking(self->uart); + gpio_put(self->rs485_dir_pin, !self->rs485_invert); + } + size_t left_to_write = len; while (left_to_write > 0) { while (uart_is_writable(self->uart) && left_to_write > 0) { @@ -201,7 +227,10 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, } RUN_BACKGROUND_TASKS; } - + if (self->rs485_dir_pin != NO_PIN) { + uart_tx_wait_blocking(self->uart); + gpio_put(self->rs485_dir_pin, self->rs485_invert); + } return len; } diff --git a/ports/raspberrypi/common-hal/busio/UART.h b/ports/raspberrypi/common-hal/busio/UART.h index f6978fd1d2..db416b7062 100644 --- a/ports/raspberrypi/common-hal/busio/UART.h +++ b/ports/raspberrypi/common-hal/busio/UART.h @@ -37,6 +37,8 @@ typedef struct { uint8_t tx_pin; uint8_t rx_pin; uint8_t cts_pin; + uint8_t rs485_dir_pin; + bool rs485_invert; uint8_t rts_pin; uint8_t uart_id; uint8_t uart_irq_id; From 5d4e964de022c6651c6743d0cbc87bd6ba2900c0 Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Mon, 2 May 2022 13:04:05 -0700 Subject: [PATCH 0200/2403] fix qtpy_esp32s3_nopsram neopixel pins --- ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c index c0386232a8..0a7bcdb165 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c @@ -45,8 +45,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO36) }, { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, - { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO37) }, - { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO39) }, { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO40) }, { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) }, From 7e622c3ff7bf1236f05ad01beecaf2d42f3ecfdb Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Mon, 2 May 2022 13:23:55 -0700 Subject: [PATCH 0201/2403] mpconfigboard.h also needs neopixel tweak --- .../boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h index 24aa81fb79..388041b115 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h @@ -29,8 +29,8 @@ #define MICROPY_HW_BOARD_NAME "Adafruit QT Py ESP32-S3 no psram" #define MICROPY_HW_MCU_NAME "ESP32S3" -#define MICROPY_HW_NEOPIXEL (&pin_GPIO38) -#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO37) +#define MICROPY_HW_NEOPIXEL (&pin_GPIO39) +#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO38) #define CIRCUITPY_BOARD_I2C (2) #define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO6, .sda = &pin_GPIO7}, \ From a23ede8bc450632d6160707b3def344b03e25993 Mon Sep 17 00:00:00 2001 From: Zach Richard Date: Mon, 2 May 2022 19:49:30 -0400 Subject: [PATCH 0202/2403] update USB VID/PID codes to match pidcodes request --- ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk index 6614b75fe3..4cba650ec4 100644 --- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk @@ -1,6 +1,6 @@ -# ZR 6F -USB_VID = 0x5a52 -USB_PID = 0x3646 +# pid.codes ZR +USB_VID = 0x1209 +USB_PID = 0x5a52 USB_PRODUCT = "RP2.65-F" USB_MANUFACTURER = "ZRichard" From dddf541ede3ade17eef1f7b833d71344f943edf6 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 1 May 2022 09:32:25 -0600 Subject: [PATCH 0203/2403] Fix some property declarations that were slightly different --- extmod/vfs_fat.c | 2 +- shared-bindings/canio/CAN.c | 25 +++++++------------------ shared-bindings/canio/Listener.c | 3 +-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c index ce71d74b88..208cf101f9 100644 --- a/extmod/vfs_fat.c +++ b/extmod/vfs_fat.c @@ -440,7 +440,7 @@ STATIC const mp_obj_property_t fat_vfs_label_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&fat_vfs_getlabel_obj, (mp_obj_t)&fat_vfs_setlabel_obj, - (mp_obj_t)MP_ROM_NONE}, + MP_ROM_NONE}, }; #endif diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c index ec9c2b8a68..39ce7ecba5 100644 --- a/shared-bindings/canio/CAN.c +++ b/shared-bindings/canio/CAN.c @@ -116,7 +116,7 @@ STATIC const mp_obj_property_t canio_can_auto_restart_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&canio_can_auto_restart_get_obj, (mp_obj_t)&canio_can_auto_restart_set_obj, - (mp_obj_t)mp_const_none}, + MP_ROM_NONE}, }; @@ -133,8 +133,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_baudrate_get_obj, canio_can_baudrate_get); STATIC const mp_obj_property_t canio_can_baudrate_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&canio_can_baudrate_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + MP_ROM_NONE, MP_ROM_NONE}, }; //| transmit_error_count: int @@ -149,9 +148,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_transmit_error_count_get_obj, canio_can_tran STATIC const mp_obj_property_t canio_can_transmit_error_count_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_transmit_error_count_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + .proxy = {(mp_obj_t)&canio_can_transmit_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE}, }; //| receive_error_count: int @@ -166,9 +163,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_receive_error_count_get_obj, canio_can_recei STATIC const mp_obj_property_t canio_can_receive_error_count_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_receive_error_count_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + .proxy = {(mp_obj_t)&canio_can_receive_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE}, }; //| state: BusState @@ -183,9 +178,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_state_get_obj, canio_can_state_get); STATIC const mp_obj_property_t canio_can_state_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_state_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + .proxy = {(mp_obj_t)&canio_can_state_get_obj, MP_ROM_NONE, MP_ROM_NONE}, }; @@ -285,9 +278,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_loopback_get_obj, canio_can_loopback_get); STATIC const mp_obj_property_t canio_can_loopback_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_loopback_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + .proxy = {(mp_obj_t)&canio_can_loopback_get_obj, MP_ROM_NONE, MP_ROM_NONE}, }; @@ -324,9 +315,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_silent_get_obj, canio_can_silent_get); STATIC const mp_obj_property_t canio_can_silent_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_silent_get_obj, - (mp_obj_t)mp_const_none, - (mp_obj_t)mp_const_none}, + .proxy = {(mp_obj_t)&canio_can_silent_get_obj, MP_ROM_NONE, MP_ROM_NONE}, }; diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c index 6f4e53282f..7ba1e85df1 100644 --- a/shared-bindings/canio/Listener.c +++ b/shared-bindings/canio/Listener.c @@ -153,8 +153,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_ STATIC const mp_obj_property_t canio_listener_timeout_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&canio_listener_timeout_get_obj, - (mp_obj_t)&canio_listener_timeout_set_obj, - (mp_obj_t)mp_const_none}, + (mp_obj_t)&canio_listener_timeout_set_obj, MP_ROM_NONE}, }; From 31da335cac030b3438ed1b16bd2aab32e96dc464 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 1 May 2022 09:16:53 -0600 Subject: [PATCH 0204/2403] Introduce, use MP_PROPERTY_GETTER, _GETSET Later, these can be changed in cunning ways to save flash storage. --- ports/atmel-samd/bindings/samd/Clock.c | 33 ++---- .../broadcom/bindings/videocore/Framebuffer.c | 16 +-- .../bindings/rp2pio/StateMachine.c | 25 ++--- py/objproperty.h | 6 ++ shared-bindings/_bleio/Adapter.c | 51 +++------ shared-bindings/_bleio/Address.c | 16 +-- shared-bindings/_bleio/Characteristic.c | 49 +++------ shared-bindings/_bleio/CharacteristicBuffer.c | 8 +- shared-bindings/_bleio/Connection.c | 33 ++---- shared-bindings/_bleio/Descriptor.c | 25 ++--- shared-bindings/_bleio/PacketBuffer.c | 16 +-- shared-bindings/_bleio/ScanEntry.c | 40 ++----- shared-bindings/_bleio/Service.c | 32 ++---- shared-bindings/_bleio/UUID.c | 24 ++--- shared-bindings/adafruit_pixelbuf/PixelBuf.c | 34 ++---- shared-bindings/aesio/aes.c | 8 +- shared-bindings/alarm/pin/PinAlarm.c | 16 +-- shared-bindings/alarm/time/TimeAlarm.c | 8 +- shared-bindings/alarm/touch/TouchAlarm.c | 8 +- shared-bindings/analogio/AnalogIn.c | 16 +-- shared-bindings/analogio/AnalogOut.c | 9 +- shared-bindings/audiobusio/I2SOut.c | 16 +-- shared-bindings/audiobusio/PDMIn.c | 8 +- shared-bindings/audiocore/RawSample.c | 9 +- shared-bindings/audiocore/WaveFile.c | 25 ++--- shared-bindings/audioio/AudioOut.c | 16 +-- shared-bindings/audiomixer/Mixer.c | 24 ++--- shared-bindings/audiomixer/MixerVoice.c | 17 +-- shared-bindings/audiomp3/MP3Decoder.c | 50 +++------ shared-bindings/audiopwmio/PWMAudioOut.c | 16 +-- shared-bindings/busio/SPI.c | 8 +- shared-bindings/busio/UART.c | 26 ++--- shared-bindings/canio/CAN.c | 46 +++----- shared-bindings/canio/Listener.c | 8 +- shared-bindings/canio/Match.c | 24 ++--- shared-bindings/canio/Message.c | 27 ++--- .../canio/RemoteTransmissionRequest.c | 27 ++--- shared-bindings/countio/Counter.c | 9 +- shared-bindings/digitalio/DigitalInOut.c | 36 +++---- shared-bindings/displayio/Bitmap.c | 16 +-- shared-bindings/displayio/ColorConverter.c | 9 +- shared-bindings/displayio/Display.c | 68 ++++-------- shared-bindings/displayio/EPaperDisplay.c | 49 +++------ shared-bindings/displayio/Group.c | 36 +++---- shared-bindings/displayio/OnDiskBitmap.c | 18 +--- shared-bindings/displayio/TileGrid.c | 100 ++++++------------ shared-bindings/fontio/BuiltinFont.c | 8 +- .../framebufferio/FramebufferDisplay.c | 60 ++++------- shared-bindings/frequencyio/FrequencyIn.c | 17 +-- shared-bindings/gnss/GNSS.c | 40 ++----- shared-bindings/ipaddress/IPv4Address.c | 16 +-- shared-bindings/is31fl3741/FrameBuffer.c | 25 ++--- shared-bindings/keypad/Event.c | 32 ++---- shared-bindings/keypad/EventQueue.c | 8 +- shared-bindings/mdns/RemoteService.c | 40 ++----- shared-bindings/mdns/Server.c | 18 ++-- .../memorymonitor/AllocationSize.c | 8 +- shared-bindings/microcontroller/Processor.c | 46 ++------ shared-bindings/msgpack/ExtType.c | 18 ++-- shared-bindings/pulseio/PulseIn.c | 16 +-- shared-bindings/pwmio/PWMOut.c | 18 ++-- shared-bindings/qrio/QRDecoder.c | 18 ++-- shared-bindings/rgbmatrix/RGBMatrix.c | 25 ++--- shared-bindings/rotaryio/IncrementalEncoder.c | 18 ++-- shared-bindings/rtc/RTC.c | 18 ++-- shared-bindings/sdioio/SDCard.c | 16 +-- shared-bindings/ssl/SSLContext.c | 9 +- shared-bindings/supervisor/Runtime.c | 32 ++---- shared-bindings/synthio/MidiTrack.c | 8 +- shared-bindings/touchio/TouchIn.c | 25 ++--- shared-bindings/usb/core/Device.c | 40 ++----- shared-bindings/usb_cdc/Serial.c | 42 +++----- shared-bindings/usb_hid/Device.c | 24 ++--- shared-bindings/vectorio/Circle.c | 18 ++-- shared-bindings/vectorio/Polygon.c | 18 ++-- shared-bindings/vectorio/VectorShape.c | 36 +++---- shared-bindings/watchdog/WatchDogTimer.c | 18 ++-- shared-bindings/wifi/Monitor.c | 17 +-- shared-bindings/wifi/Network.c | 48 +++------ shared-bindings/wifi/Radio.c | 100 +++++------------- 80 files changed, 589 insertions(+), 1472 deletions(-) diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c index 01fb29f47a..be3894fa46 100644 --- a/ports/atmel-samd/bindings/samd/Clock.c +++ b/ports/atmel-samd/bindings/samd/Clock.c @@ -53,12 +53,8 @@ STATIC mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_enabled_obj, samd_clock_get_enabled); -const mp_obj_property_t samd_clock_enabled_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&samd_clock_get_enabled_obj, - MP_ROM_NONE, - MP_ROM_NONE,}, -}; +const mp_obj_property_getter_t samd_clock_enabled_obj = MP_PROPERTY_GETTER(samd_clock_enabled_obj, + (mp_obj_t)&samd_clock_get_enabled_obj); //| parent: Union[Clock, None] //| """Clock parent. (read-only)""" @@ -82,12 +78,8 @@ STATIC mp_obj_t samd_clock_get_parent(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_parent_obj, samd_clock_get_parent); -const mp_obj_property_t samd_clock_parent_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&samd_clock_get_parent_obj, - MP_ROM_NONE, - MP_ROM_NONE,}, -}; +const mp_obj_property_getter_t samd_clock_parent_obj = MP_PROPERTY_GETTER(samd_clock_parent_obj, + (mp_obj_t)&samd_clock_get_parent_obj); //| frequency: int //| """Clock frequency in Herz. (read-only)""" @@ -99,12 +91,8 @@ STATIC mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_frequency_obj, samd_clock_get_frequency); -const mp_obj_property_t samd_clock_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&samd_clock_get_frequency_obj, - MP_ROM_NONE, - MP_ROM_NONE,}, -}; +const mp_obj_property_getter_t samd_clock_frequency_obj = MP_PROPERTY_GETTER(samd_clock_frequency_obj, + (mp_obj_t)&samd_clock_get_frequency_obj); //| calibration: int //| """Clock calibration. Not all clocks can be calibrated.""" @@ -130,12 +118,9 @@ STATIC mp_obj_t samd_clock_set_calibration(mp_obj_t self_in, mp_obj_t calibratio MP_DEFINE_CONST_FUN_OBJ_2(samd_clock_set_calibration_obj, samd_clock_set_calibration); -const mp_obj_property_t samd_clock_calibration_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&samd_clock_get_calibration_obj, - (mp_obj_t)&samd_clock_set_calibration_obj, - MP_ROM_NONE,}, -}; +const mp_obj_property_getset_t samd_clock_calibration_obj = MP_PROPERTY_GETSET(samd_clock_calibration_obj, + (mp_obj_t)&samd_clock_get_calibration_obj, + (mp_obj_t)&samd_clock_set_calibration_obj); STATIC const mp_rom_map_elem_t samd_clock_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_enabled), MP_ROM_PTR(&samd_clock_enabled_obj) }, diff --git a/ports/broadcom/bindings/videocore/Framebuffer.c b/ports/broadcom/bindings/videocore/Framebuffer.c index 46a2ac13b0..02c239bdf3 100644 --- a/ports/broadcom/bindings/videocore/Framebuffer.c +++ b/ports/broadcom/bindings/videocore/Framebuffer.c @@ -96,12 +96,8 @@ STATIC mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_videocore_framebuffer_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_width_obj, videocore_framebuffer_get_width); -const mp_obj_property_t videocore_framebuffer_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&videocore_framebuffer_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t videocore_framebuffer_width_obj = MP_PROPERTY_GETTER(videocore_framebuffer_width_obj, + (mp_obj_t)&videocore_framebuffer_get_width_obj); //| height: int //| """The height of the display, in pixels""" @@ -113,12 +109,8 @@ STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_height_obj, videocore_framebuffer_get_height); -const mp_obj_property_t videocore_framebuffer_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&videocore_framebuffer_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t videocore_framebuffer_height_obj = MP_PROPERTY_GETTER(videocore_framebuffer_height_obj, + (mp_obj_t)&videocore_framebuffer_get_height_obj); STATIC const mp_rom_map_elem_t videocore_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&videocore_framebuffer_deinit_obj) }, diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 28668355b1..b5f719a062 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -729,12 +729,9 @@ STATIC mp_obj_t rp2pio_statemachine_obj_set_frequency(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_set_frequency_obj, rp2pio_statemachine_obj_set_frequency); -const mp_obj_property_t rp2pio_statemachine_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rp2pio_statemachine_get_frequency_obj, - (mp_obj_t)&rp2pio_statemachine_set_frequency_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rp2pio_statemachine_frequency_obj = MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj, + (mp_obj_t)&rp2pio_statemachine_get_frequency_obj, + (mp_obj_t)&rp2pio_statemachine_set_frequency_obj); //| rxstall: bool //| """True when the state machine has stalled due to a full RX FIFO since the last @@ -748,12 +745,8 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_rxstall_obj, rp2pio_statemachine_obj_get_rxstall); -const mp_obj_property_t rp2pio_statemachine_rxstall_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rp2pio_statemachine_get_rxstall_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t rp2pio_statemachine_rxstall_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj, + (mp_obj_t)&rp2pio_statemachine_get_rxstall_obj); //| in_waiting: int //| """The number of words available to readinto""" @@ -766,12 +759,8 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_in_waiting_obj, rp2pio_statemachine_obj_get_in_waiting); -const mp_obj_property_t rp2pio_statemachine_in_waiting_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t rp2pio_statemachine_in_waiting_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_in_waiting_obj, + (mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj); STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rp2pio_statemachine_deinit_obj) }, diff --git a/py/objproperty.h b/py/objproperty.h index f3ade89d92..267554bde2 100644 --- a/py/objproperty.h +++ b/py/objproperty.h @@ -35,6 +35,12 @@ typedef struct _mp_obj_property_t { mp_obj_t proxy[3]; // getter, setter, deleter } mp_obj_property_t; +typedef struct _mp_obj_property_t mp_obj_property_getter_t; +typedef struct _mp_obj_property_t mp_obj_property_getset_t; + +#define MP_PROPERTY_GETTER(P, G) {.base.type = &mp_type_property, .proxy = {G, MP_ROM_NONE, MP_ROM_NONE}} +#define MP_PROPERTY_GETSET(P, G, S) {.base.type = &mp_type_property, .proxy = {G, S, MP_ROM_NONE}} + #endif // MICROPY_PY_BUILTINS_PROPERTY #endif // MICROPY_INCLUDED_PY_OBJPROPERTY_H diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c index baff277b69..a71b655d3d 100644 --- a/shared-bindings/_bleio/Adapter.c +++ b/shared-bindings/_bleio/Adapter.c @@ -128,12 +128,9 @@ static mp_obj_t bleio_adapter_set_enabled(mp_obj_t self, mp_obj_t value) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_enabled_obj, bleio_adapter_set_enabled); -const mp_obj_property_t bleio_adapter_enabled_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_enabled_obj, - (mp_obj_t)&bleio_adapter_set_enabled_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_adapter_enabled_obj = MP_PROPERTY_GETSET(bleio_adapter_enabled_obj, + (mp_obj_t)&bleio_adapter_get_enabled_obj, + (mp_obj_t)&bleio_adapter_set_enabled_obj); //| address: Address //| """MAC address of the BLE adapter.""" @@ -152,12 +149,9 @@ STATIC mp_obj_t bleio_adapter_set_address(mp_obj_t self, mp_obj_t new_address) { } MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_address_obj, bleio_adapter_set_address); -const mp_obj_property_t bleio_adapter_address_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_address_obj, - (mp_obj_t)&bleio_adapter_set_address_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_adapter_address_obj = MP_PROPERTY_GETSET(bleio_adapter_address_obj, + (mp_obj_t)&bleio_adapter_get_address_obj, + (mp_obj_t)&bleio_adapter_set_address_obj); //| name: str //| """name of the BLE adapter used once connected. @@ -176,12 +170,9 @@ STATIC mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) { } MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_name_obj, bleio_adapter_set_name); -const mp_obj_property_t bleio_adapter_name_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_name_obj, - (mp_obj_t)&bleio_adapter_set_name_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_adapter_name_obj = MP_PROPERTY_GETSET(bleio_adapter_name_obj, + (mp_obj_t)&bleio_adapter_get_name_obj, + (mp_obj_t)&bleio_adapter_set_name_obj); //| def start_advertising(self, data: ReadableBuffer, *, //| scan_response: Optional[ReadableBuffer] = None, connectable: bool = True, @@ -380,12 +371,8 @@ STATIC mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_advertising_obj, bleio_adapter_get_advertising); -const mp_obj_property_t bleio_adapter_advertising_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_advertising_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_adapter_advertising_obj = MP_PROPERTY_GETTER(bleio_adapter_advertising_obj, + (mp_obj_t)&bleio_adapter_get_advertising_obj); //| connected: bool //| """True when the adapter is connected to another device regardless of who initiated the @@ -397,12 +384,8 @@ STATIC mp_obj_t bleio_adapter_get_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connected_obj, bleio_adapter_get_connected); -const mp_obj_property_t bleio_adapter_connected_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_connected_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_adapter_connected_obj = MP_PROPERTY_GETTER(bleio_adapter_connected_obj, + (mp_obj_t)&bleio_adapter_get_connected_obj); //| connections: Tuple[Connection] //| """Tuple of active connections including those initiated through @@ -413,12 +396,8 @@ STATIC mp_obj_t bleio_adapter_get_connections(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connections_obj, bleio_adapter_get_connections); -const mp_obj_property_t bleio_adapter_connections_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_adapter_get_connections_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_adapter_connections_obj = MP_PROPERTY_GETTER(bleio_adapter_connections_obj, + (mp_obj_t)&bleio_adapter_get_connections_obj); //| def connect(self, address: Address, *, timeout: float) -> Connection: //| """Attempts a connection to the device with the given address. diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c index 97322bbb79..77dd9ce8d2 100644 --- a/shared-bindings/_bleio/Address.c +++ b/shared-bindings/_bleio/Address.c @@ -101,12 +101,8 @@ STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_address_bytes_obj, bleio_address_get_address_bytes); -const mp_obj_property_t bleio_address_address_bytes_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_address_get_address_bytes_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_address_address_bytes_obj = MP_PROPERTY_GETTER(bleio_address_address_bytes_obj, + (mp_obj_t)&bleio_address_get_address_bytes_obj); //| type: int //| """The address type (read-only). @@ -121,12 +117,8 @@ STATIC mp_obj_t bleio_address_get_type(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_type_obj, bleio_address_get_type); -const mp_obj_property_t bleio_address_type_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_address_get_type_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_address_type_obj = MP_PROPERTY_GETTER(bleio_address_type_obj, + (mp_obj_t)&bleio_address_get_type_obj); //| def __eq__(self, other: object) -> bool: //| """Two Address objects are equal if their addresses and address types are equal.""" diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c index f4c77405d1..afd9621c86 100644 --- a/shared-bindings/_bleio/Characteristic.c +++ b/shared-bindings/_bleio/Characteristic.c @@ -167,12 +167,8 @@ STATIC mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_properties_obj, bleio_characteristic_get_properties); -const mp_obj_property_t bleio_characteristic_properties_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_properties_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_characteristic_properties_obj = MP_PROPERTY_GETTER(bleio_characteristic_properties_obj, + (mp_obj_t)&bleio_characteristic_get_properties_obj); //| uuid: Optional[UUID] //| """The UUID of this characteristic. (read-only) @@ -187,12 +183,8 @@ STATIC mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_uuid_obj, bleio_characteristic_get_uuid); -const mp_obj_property_t bleio_characteristic_uuid_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_uuid_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_characteristic_uuid_obj = MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj, + (mp_obj_t)&bleio_characteristic_get_uuid_obj); //| value: bytearray //| """The value of this characteristic.""" @@ -218,12 +210,9 @@ STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_ } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_characteristic_set_value_obj, bleio_characteristic_set_value); -const mp_obj_property_t bleio_characteristic_value_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_value_obj, - (mp_obj_t)&bleio_characteristic_set_value_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_characteristic_value_obj = MP_PROPERTY_GETSET(bleio_characteristic_value_obj, + (mp_obj_t)&bleio_characteristic_get_value_obj, + (mp_obj_t)&bleio_characteristic_set_value_obj); //| max_length: int //| """The max length of this characteristic.""" @@ -235,12 +224,8 @@ STATIC mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_max_length_obj, bleio_characteristic_get_max_length); -const mp_obj_property_t bleio_characteristic_max_length_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_max_length_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_characteristic_max_length_obj = MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj, + (mp_obj_t)&bleio_characteristic_get_max_length_obj); //| descriptors: Descriptor //| """A tuple of :py:class:`Descriptor` objects related to this characteristic. (read-only)""" @@ -253,12 +238,8 @@ STATIC mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_descriptors_obj, bleio_characteristic_get_descriptors); -const mp_obj_property_t bleio_characteristic_descriptors_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_descriptors_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_characteristic_descriptors_obj = MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj, + (mp_obj_t)&bleio_characteristic_get_descriptors_obj); //| service: Service //| """The Service this Characteristic is a part of.""" @@ -270,12 +251,8 @@ STATIC mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_service_obj, bleio_characteristic_get_service); -const mp_obj_property_t bleio_characteristic_service_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_characteristic_get_service_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_characteristic_service_obj = MP_PROPERTY_GETTER(bleio_characteristic_service_obj, + (mp_obj_t)&bleio_characteristic_get_service_obj); //| def set_cccd(self, *, notify: bool = False, indicate: bool = False) -> None: //| """Set the remote characteristic's CCCD to enable or disable notification and indication. diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c index 81562028e7..ee3d8fe16d 100644 --- a/shared-bindings/_bleio/CharacteristicBuffer.c +++ b/shared-bindings/_bleio/CharacteristicBuffer.c @@ -173,12 +173,8 @@ STATIC mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) } MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_get_in_waiting_obj, bleio_characteristic_buffer_obj_get_in_waiting); -const mp_obj_property_t bleio_characteristic_buffer_in_waiting_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_characteristic_buffer_get_in_waiting_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_characteristic_buffer_in_waiting_obj = MP_PROPERTY_GETTER(bleio_characteristic_buffer_in_waiting_obj, + (mp_obj_t)&bleio_characteristic_buffer_get_in_waiting_obj); //| def reset_input_buffer(self) -> None: //| """Discard any unread characters in the input buffer.""" diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c index a7c50a0d07..1c9acd826e 100644 --- a/shared-bindings/_bleio/Connection.c +++ b/shared-bindings/_bleio/Connection.c @@ -161,12 +161,8 @@ STATIC mp_obj_t bleio_connection_get_connected(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connected_obj, bleio_connection_get_connected); -const mp_obj_property_t bleio_connection_connected_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_connection_get_connected_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_connection_connected_obj = MP_PROPERTY_GETTER(bleio_connection_connected_obj, + (mp_obj_t)&bleio_connection_get_connected_obj); //| paired: bool @@ -179,12 +175,8 @@ STATIC mp_obj_t bleio_connection_get_paired(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_paired_obj, bleio_connection_get_paired); -const mp_obj_property_t bleio_connection_paired_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_connection_get_paired_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_connection_paired_obj = MP_PROPERTY_GETTER(bleio_connection_paired_obj, + (mp_obj_t)&bleio_connection_get_paired_obj); //| connection_interval: float @@ -235,19 +227,12 @@ STATIC mp_obj_t bleio_connection_set_connection_interval(mp_obj_t self_in, mp_ob } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_connection_set_connection_interval_obj, bleio_connection_set_connection_interval); -const mp_obj_property_t bleio_connection_connection_interval_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_connection_get_connection_interval_obj, - (mp_obj_t)&bleio_connection_set_connection_interval_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_connection_connection_interval_obj = MP_PROPERTY_GETSET(bleio_connection_connection_interval_obj, + (mp_obj_t)&bleio_connection_get_connection_interval_obj, + (mp_obj_t)&bleio_connection_set_connection_interval_obj); -const mp_obj_property_t bleio_connection_max_packet_length_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_connection_get_max_packet_length_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_connection_max_packet_length_obj = MP_PROPERTY_GETTER(bleio_connection_max_packet_length_obj, + (mp_obj_t)&bleio_connection_get_max_packet_length_obj); STATIC const mp_rom_map_elem_t bleio_connection_locals_dict_table[] = { // Methods diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c index d4dd9372f3..175bb82c41 100644 --- a/shared-bindings/_bleio/Descriptor.c +++ b/shared-bindings/_bleio/Descriptor.c @@ -144,12 +144,8 @@ STATIC mp_obj_t bleio_descriptor_get_uuid(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_uuid_obj, bleio_descriptor_get_uuid); -const mp_obj_property_t bleio_descriptor_uuid_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_descriptor_get_uuid_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_descriptor_uuid_obj = MP_PROPERTY_GETTER(bleio_descriptor_uuid_obj, + (mp_obj_t)&bleio_descriptor_get_uuid_obj); //| characteristic: Characteristic //| """The Characteristic this Descriptor is a part of.""" @@ -161,12 +157,8 @@ STATIC mp_obj_t bleio_descriptor_get_characteristic(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_characteristic_obj, bleio_descriptor_get_characteristic); -const mp_obj_property_t bleio_descriptor_characteristic_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_descriptor_get_characteristic_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_descriptor_characteristic_obj = MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj, + (mp_obj_t)&bleio_descriptor_get_characteristic_obj); //| value: bytearray //| """The value of this descriptor.""" @@ -192,12 +184,9 @@ STATIC mp_obj_t bleio_descriptor_set_value(mp_obj_t self_in, mp_obj_t value_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_descriptor_set_value_obj, bleio_descriptor_set_value); -const mp_obj_property_t bleio_descriptor_value_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_descriptor_get_value_obj, - (mp_obj_t)&bleio_descriptor_set_value_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t bleio_descriptor_value_obj = MP_PROPERTY_GETSET(bleio_descriptor_value_obj, + (mp_obj_t)&bleio_descriptor_get_value_obj, + (mp_obj_t)&bleio_descriptor_set_value_obj); STATIC const mp_rom_map_elem_t bleio_descriptor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_add_to_characteristic), MP_ROM_PTR(&bleio_descriptor_add_to_characteristic_obj) }, diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c index aa6c860a60..f827aefc6d 100644 --- a/shared-bindings/_bleio/PacketBuffer.c +++ b/shared-bindings/_bleio/PacketBuffer.c @@ -197,12 +197,8 @@ STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length); -const mp_obj_property_t bleio_packet_buffer_incoming_packet_length_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_packet_buffer_incoming_packet_length_obj = MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj, + (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj); //| outgoing_packet_length: int //| """Maximum length in bytes of a packet we are writing.""" @@ -218,12 +214,8 @@ STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_outgoing_packet_length_obj, bleio_packet_buffer_get_outgoing_packet_length); -const mp_obj_property_t bleio_packet_buffer_outgoing_packet_length_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_packet_buffer_get_outgoing_packet_length_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_packet_buffer_outgoing_packet_length_obj = MP_PROPERTY_GETTER(bleio_packet_buffer_outgoing_packet_length_obj, + (mp_obj_t)&bleio_packet_buffer_get_outgoing_packet_length_obj); STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bleio_packet_buffer_deinit_obj) }, diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c index 5a0f6eb1be..02cdca7ee3 100644 --- a/shared-bindings/_bleio/ScanEntry.c +++ b/shared-bindings/_bleio/ScanEntry.c @@ -83,12 +83,8 @@ STATIC mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_address_obj, bleio_scanentry_get_address); -const mp_obj_property_t bleio_scanentry_address_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_scanentry_get_address_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_scanentry_address_obj = MP_PROPERTY_GETTER(bleio_scanentry_address_obj, + (mp_obj_t)&bleio_scanentry_get_address_obj); //| advertisement_bytes: bytes //| """All the advertisement data present in the packet, returned as a ``bytes`` object. (read-only)""" @@ -99,12 +95,8 @@ STATIC mp_obj_t scanentry_get_advertisement_bytes(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_advertisement_bytes_obj, scanentry_get_advertisement_bytes); -const mp_obj_property_t bleio_scanentry_advertisement_bytes_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_scanentry_get_advertisement_bytes_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_scanentry_advertisement_bytes_obj = MP_PROPERTY_GETTER(bleio_scanentry_advertisement_bytes_obj, + (mp_obj_t)&bleio_scanentry_get_advertisement_bytes_obj); //| rssi: int //| """The signal strength of the device at the time of the scan, in integer dBm. (read-only)""" @@ -115,12 +107,8 @@ STATIC mp_obj_t scanentry_get_rssi(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_rssi_obj, scanentry_get_rssi); -const mp_obj_property_t bleio_scanentry_rssi_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_scanentry_get_rssi_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_scanentry_rssi_obj = MP_PROPERTY_GETTER(bleio_scanentry_rssi_obj, + (mp_obj_t)&bleio_scanentry_get_rssi_obj); //| connectable: bool //| """True if the device can be connected to. (read-only)""" @@ -131,12 +119,8 @@ STATIC mp_obj_t scanentry_get_connectable(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_connectable_obj, scanentry_get_connectable); -const mp_obj_property_t bleio_scanentry_connectable_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_scanentry_get_connectable_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_scanentry_connectable_obj = MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj, + (mp_obj_t)&bleio_scanentry_get_connectable_obj); //| scan_response: bool //| """True if the entry was a scan response. (read-only)""" @@ -147,12 +131,8 @@ STATIC mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_scan_response_obj, scanentry_get_scan_response); -const mp_obj_property_t bleio_scanentry_scan_response_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_scanentry_get_scan_response_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_scanentry_scan_response_obj = MP_PROPERTY_GETTER(bleio_scanentry_scan_response_obj, + (mp_obj_t)&bleio_scanentry_get_scan_response_obj); STATIC const mp_rom_map_elem_t bleio_scanentry_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&bleio_scanentry_address_obj) }, diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c index ff1d8c9e21..98e1b8fdfd 100644 --- a/shared-bindings/_bleio/Service.c +++ b/shared-bindings/_bleio/Service.c @@ -80,12 +80,8 @@ STATIC mp_obj_t bleio_service_get_characteristics(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_characteristics_obj, bleio_service_get_characteristics); -const mp_obj_property_t bleio_service_characteristics_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_service_get_characteristics_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_service_characteristics_obj = MP_PROPERTY_GETTER(bleio_service_characteristics_obj, + (mp_obj_t)&bleio_service_get_characteristics_obj); //| remote: bool //| """True if this is a service provided by a remote device. (read-only)""" @@ -97,12 +93,8 @@ STATIC mp_obj_t bleio_service_get_remote(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_remote_obj, bleio_service_get_remote); -const mp_obj_property_t bleio_service_remote_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_service_get_remote_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_service_remote_obj = MP_PROPERTY_GETTER(bleio_service_remote_obj, + (mp_obj_t)&bleio_service_get_remote_obj); //| secondary: bool //| """True if this is a secondary service. (read-only)""" @@ -114,12 +106,8 @@ STATIC mp_obj_t bleio_service_get_secondary(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_secondary_obj, bleio_service_get_secondary); -const mp_obj_property_t bleio_service_secondary_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_service_get_secondary_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_service_secondary_obj = MP_PROPERTY_GETTER(bleio_service_secondary_obj, + (mp_obj_t)&bleio_service_get_secondary_obj); //| uuid: Optional[UUID] //| """The UUID of this service. (read-only) @@ -134,12 +122,8 @@ STATIC mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_uuid_obj, bleio_service_get_uuid); -const mp_obj_property_t bleio_service_uuid_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&bleio_service_get_uuid_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t bleio_service_uuid_obj = MP_PROPERTY_GETTER(bleio_service_uuid_obj, + (mp_obj_t)&bleio_service_get_uuid_obj); STATIC const mp_rom_map_elem_t bleio_service_locals_dict_table[] = { diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c index 4e3154eb03..e4bb6cc969 100644 --- a/shared-bindings/_bleio/UUID.c +++ b/shared-bindings/_bleio/UUID.c @@ -132,12 +132,8 @@ STATIC mp_obj_t bleio_uuid_get_uuid16(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_uuid16_obj, bleio_uuid_get_uuid16); -const mp_obj_property_t bleio_uuid_uuid16_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_uuid_get_uuid16_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_uuid_uuid16_obj = MP_PROPERTY_GETTER(bleio_uuid_uuid16_obj, + (mp_obj_t)&bleio_uuid_get_uuid16_obj); //| uuid128: bytes //| """The 128-bit value of the UUID @@ -158,12 +154,8 @@ STATIC mp_obj_t bleio_uuid_get_uuid128(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_uuid128_obj, bleio_uuid_get_uuid128); -const mp_obj_property_t bleio_uuid_uuid128_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_uuid_get_uuid128_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_uuid_uuid128_obj = MP_PROPERTY_GETTER(bleio_uuid_uuid128_obj, + (mp_obj_t)&bleio_uuid_get_uuid128_obj); //| size: int //| """128 if this UUID represents a 128-bit vendor-specific UUID. 16 if this UUID represents a @@ -178,12 +170,8 @@ STATIC mp_obj_t bleio_uuid_get_size(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_size_obj, bleio_uuid_get_size); -const mp_obj_property_t bleio_uuid_size_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&bleio_uuid_get_size_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t bleio_uuid_size_obj = MP_PROPERTY_GETTER(bleio_uuid_size_obj, + (mp_obj_t)&bleio_uuid_get_size_obj); //| def pack_into(self, buffer: WriteableBuffer, offset: int = 0) -> None: diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c index 7be059fa6b..094cbcf49c 100644 --- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c +++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c @@ -161,12 +161,8 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_bpp_obj, pixelbuf_pixelbuf_obj_get_bpp); -const mp_obj_property_t pixelbuf_pixelbuf_bpp_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_bpp_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t pixelbuf_pixelbuf_bpp_obj = MP_PROPERTY_GETTER(pixelbuf_pixelbuf_bpp_obj, + (mp_obj_t)&pixelbuf_pixelbuf_get_bpp_obj); //| brightness: float @@ -193,12 +189,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_brightness_obj, pixelbuf_pixelbuf_obj_set_brightness); -const mp_obj_property_t pixelbuf_pixelbuf_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_brightness_obj, - (mp_obj_t)&pixelbuf_pixelbuf_set_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t pixelbuf_pixelbuf_brightness_obj = MP_PROPERTY_GETSET(pixelbuf_pixelbuf_brightness_obj, + (mp_obj_t)&pixelbuf_pixelbuf_get_brightness_obj, + (mp_obj_t)&pixelbuf_pixelbuf_set_brightness_obj); //| auto_write: bool //| """Whether to automatically write the pixels after each update.""" @@ -215,12 +208,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_auto_write(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_auto_write_obj, pixelbuf_pixelbuf_obj_set_auto_write); -const mp_obj_property_t pixelbuf_pixelbuf_auto_write_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_auto_write_obj, - (mp_obj_t)&pixelbuf_pixelbuf_set_auto_write_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t pixelbuf_pixelbuf_auto_write_obj = MP_PROPERTY_GETSET(pixelbuf_pixelbuf_auto_write_obj, + (mp_obj_t)&pixelbuf_pixelbuf_get_auto_write_obj, + (mp_obj_t)&pixelbuf_pixelbuf_set_auto_write_obj); //| byteorder: str //| """byteorder string for the buffer (read-only)""" @@ -230,12 +220,8 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_str, pixelbuf_pixelbuf_obj_get_byteorder); -const mp_obj_property_t pixelbuf_pixelbuf_byteorder_str = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_str, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t pixelbuf_pixelbuf_byteorder_str = MP_PROPERTY_GETTER(pixelbuf_pixelbuf_byteorder_str, + (mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_str); STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) { switch (op) { diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c index 4acadc5ab6..bb8ac3376e 100644 --- a/shared-bindings/aesio/aes.c +++ b/shared-bindings/aesio/aes.c @@ -246,11 +246,9 @@ STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t aesio_obj, mp_obj_t mode_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(aesio_aes_set_mode_obj, aesio_aes_set_mode); -const mp_obj_property_t aesio_aes_mode_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&aesio_aes_get_mode_obj, - (mp_obj_t)&aesio_aes_set_mode_obj, MP_ROM_NONE}, -}; +const mp_obj_property_getset_t aesio_aes_mode_obj = MP_PROPERTY_GETSET(aesio_aes_mode_obj, + (mp_obj_t)&aesio_aes_get_mode_obj, + (mp_obj_t)&aesio_aes_set_mode_obj); STATIC const mp_rom_map_elem_t aesio_locals_dict_table[] = { // Methods diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c index 50bdfa00de..aa2168e665 100644 --- a/shared-bindings/alarm/pin/PinAlarm.c +++ b/shared-bindings/alarm/pin/PinAlarm.c @@ -97,12 +97,8 @@ STATIC mp_obj_t alarm_pin_pinalarm_obj_get_pin(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_pin_pinalarm_get_pin_obj, alarm_pin_pinalarm_obj_get_pin); -const mp_obj_property_t alarm_pin_pinalarm_pin_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&alarm_pin_pinalarm_get_pin_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t alarm_pin_pinalarm_pin_obj = MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj, + (mp_obj_t)&alarm_pin_pinalarm_get_pin_obj); //| value: bool //| """The value on which to trigger.""" @@ -113,12 +109,8 @@ STATIC mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_pin_pinalarm_get_value_obj, alarm_pin_pinalarm_obj_get_value); -const mp_obj_property_t alarm_pin_pinalarm_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&alarm_pin_pinalarm_get_value_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t alarm_pin_pinalarm_value_obj = MP_PROPERTY_GETTER(alarm_pin_pinalarm_value_obj, + (mp_obj_t)&alarm_pin_pinalarm_get_value_obj); STATIC const mp_rom_map_elem_t alarm_pin_pinalarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pin), MP_ROM_PTR(&alarm_pin_pinalarm_pin_obj) }, diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c index bd7502e891..7de42262ac 100644 --- a/shared-bindings/alarm/time/TimeAlarm.c +++ b/shared-bindings/alarm/time/TimeAlarm.c @@ -123,12 +123,8 @@ STATIC mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_timealarm_get_monotonic_time_obj, alarm_time_timealarm_obj_get_monotonic_time); -const mp_obj_property_t alarm_time_timealarm_monotonic_time_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&alarm_time_timealarm_get_monotonic_time_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t alarm_time_timealarm_monotonic_time_obj = MP_PROPERTY_GETTER(alarm_time_timealarm_monotonic_time_obj, + (mp_obj_t)&alarm_time_timealarm_get_monotonic_time_obj); STATIC const mp_rom_map_elem_t alarm_time_timealarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_monotonic_time), MP_ROM_PTR(&alarm_time_timealarm_monotonic_time_obj) }, diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c index 60b3f97c18..f41be59bb7 100644 --- a/shared-bindings/alarm/touch/TouchAlarm.c +++ b/shared-bindings/alarm/touch/TouchAlarm.c @@ -71,12 +71,8 @@ STATIC mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_touch_touchalarm_get_pin_obj, alarm_touch_touchalarm_obj_get_pin); -const mp_obj_property_t alarm_touch_touchalarm_pin_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&alarm_touch_touchalarm_get_pin_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t alarm_touch_touchalarm_pin_obj = MP_PROPERTY_GETTER(alarm_touch_touchalarm_pin_obj, + (mp_obj_t)&alarm_touch_touchalarm_get_pin_obj); STATIC const mp_rom_map_elem_t alarm_touch_touchalarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pin), MP_ROM_PTR(&alarm_touch_touchalarm_pin_obj) }, diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index 636c2500bf..d6bbfdb392 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -117,12 +117,8 @@ STATIC mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_value_obj, analogio_analogin_obj_get_value); -const mp_obj_property_t analogio_analogin_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&analogio_analogin_get_value_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t analogio_analogin_value_obj = MP_PROPERTY_GETTER(analogio_analogin_value_obj, + (mp_obj_t)&analogio_analogin_get_value_obj); //| reference_voltage: float //| """The maximum voltage measurable (also known as the reference voltage) as a @@ -143,12 +139,8 @@ STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_reference_voltage_obj, analogio_analogin_obj_get_reference_voltage); -const mp_obj_property_t analogio_analogin_reference_voltage_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&analogio_analogin_get_reference_voltage_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t analogio_analogin_reference_voltage_obj = MP_PROPERTY_GETTER(analogio_analogin_reference_voltage_obj, + (mp_obj_t)&analogio_analogin_get_reference_voltage_obj); STATIC const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&analogio_analogin_deinit_obj) }, diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index aad298ba07..132dae85ca 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -117,12 +117,9 @@ STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t valu } MP_DEFINE_CONST_FUN_OBJ_2(analogio_analogout_set_value_obj, analogio_analogout_obj_set_value); -const mp_obj_property_t analogio_analogout_value_obj = { - .base.type = &mp_type_property, - .proxy = {MP_ROM_NONE, - (mp_obj_t)&analogio_analogout_set_value_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t analogio_analogout_value_obj = MP_PROPERTY_GETSET(analogio_analogout_value_obj, + MP_ROM_NONE, + (mp_obj_t)&analogio_analogout_set_value_obj); STATIC const mp_rom_map_elem_t analogio_analogout_locals_dict_table[] = { // instance methods diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c index 6254f7cde2..afa24861b3 100644 --- a/shared-bindings/audiobusio/I2SOut.c +++ b/shared-bindings/audiobusio/I2SOut.c @@ -203,12 +203,8 @@ STATIC mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_playing_obj, audiobusio_i2sout_obj_get_playing); -const mp_obj_property_t audiobusio_i2sout_playing_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiobusio_i2sout_get_playing_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiobusio_i2sout_playing_obj = MP_PROPERTY_GETTER(audiobusio_i2sout_playing_obj, + (mp_obj_t)&audiobusio_i2sout_get_playing_obj); //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" @@ -252,12 +248,8 @@ STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_paused_obj, audiobusio_i2sout_obj_get_paused); -const mp_obj_property_t audiobusio_i2sout_paused_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiobusio_i2sout_get_paused_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiobusio_i2sout_paused_obj = MP_PROPERTY_GETTER(audiobusio_i2sout_paused_obj, + (mp_obj_t)&audiobusio_i2sout_get_paused_obj); #endif // CIRCUITPY_AUDIOBUSIO_I2SOUT STATIC const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = { diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c index 201b6abcec..0954def2c0 100644 --- a/shared-bindings/audiobusio/PDMIn.c +++ b/shared-bindings/audiobusio/PDMIn.c @@ -226,12 +226,8 @@ STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_get_sample_rate_obj, audiobusio_pdmin_obj_get_sample_rate); -const mp_obj_property_t audiobusio_pdmin_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiobusio_pdmin_get_sample_rate_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiobusio_pdmin_sample_rate_obj = MP_PROPERTY_GETTER(audiobusio_pdmin_sample_rate_obj, + (mp_obj_t)&audiobusio_pdmin_get_sample_rate_obj); STATIC const mp_rom_map_elem_t audiobusio_pdmin_locals_dict_table[] = { // Methods diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c index 05c5b14b5e..41798c3cf5 100644 --- a/shared-bindings/audiocore/RawSample.c +++ b/shared-bindings/audiocore/RawSample.c @@ -153,12 +153,9 @@ STATIC mp_obj_t audioio_rawsample_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audioio_rawsample_set_sample_rate_obj, audioio_rawsample_obj_set_sample_rate); -const mp_obj_property_t audioio_rawsample_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_rawsample_get_sample_rate_obj, - (mp_obj_t)&audioio_rawsample_set_sample_rate_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t audioio_rawsample_sample_rate_obj = MP_PROPERTY_GETSET(audioio_rawsample_sample_rate_obj, + (mp_obj_t)&audioio_rawsample_get_sample_rate_obj, + (mp_obj_t)&audioio_rawsample_set_sample_rate_obj); STATIC const mp_rom_map_elem_t audioio_rawsample_locals_dict_table[] = { // Methods diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c index 1a8b5cae11..0a5115ad1c 100644 --- a/shared-bindings/audiocore/WaveFile.c +++ b/shared-bindings/audiocore/WaveFile.c @@ -148,12 +148,9 @@ STATIC mp_obj_t audioio_wavefile_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audioio_wavefile_set_sample_rate_obj, audioio_wavefile_obj_set_sample_rate); -const mp_obj_property_t audioio_wavefile_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_wavefile_get_sample_rate_obj, - (mp_obj_t)&audioio_wavefile_set_sample_rate_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t audioio_wavefile_sample_rate_obj = MP_PROPERTY_GETSET(audioio_wavefile_sample_rate_obj, + (mp_obj_t)&audioio_wavefile_get_sample_rate_obj, + (mp_obj_t)&audioio_wavefile_set_sample_rate_obj); //| bits_per_sample: int //| """Bits per sample. (read only)""" @@ -165,12 +162,8 @@ STATIC mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_bits_per_sample_obj, audioio_wavefile_obj_get_bits_per_sample); -const mp_obj_property_t audioio_wavefile_bits_per_sample_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_wavefile_get_bits_per_sample_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audioio_wavefile_bits_per_sample_obj = MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj, + (mp_obj_t)&audioio_wavefile_get_bits_per_sample_obj); //| channel_count: int //| """Number of audio channels. (read only)""" //| @@ -181,12 +174,8 @@ STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_channel_count_obj, audioio_wavefile_obj_get_channel_count); -const mp_obj_property_t audioio_wavefile_channel_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_wavefile_get_channel_count_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audioio_wavefile_channel_count_obj = MP_PROPERTY_GETTER(audioio_wavefile_channel_count_obj, + (mp_obj_t)&audioio_wavefile_get_channel_count_obj); STATIC const mp_rom_map_elem_t audioio_wavefile_locals_dict_table[] = { diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c index 2fd4c0c452..b2fde315f5 100644 --- a/shared-bindings/audioio/AudioOut.c +++ b/shared-bindings/audioio/AudioOut.c @@ -197,12 +197,8 @@ STATIC mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_playing_obj, audioio_audioout_obj_get_playing); -const mp_obj_property_t audioio_audioout_playing_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_audioout_get_playing_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audioio_audioout_playing_obj = MP_PROPERTY_GETTER(audioio_audioout_playing_obj, + (mp_obj_t)&audioio_audioout_get_playing_obj); //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" @@ -246,12 +242,8 @@ STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_paused_obj, audioio_audioout_obj_get_paused); -const mp_obj_property_t audioio_audioout_paused_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audioio_audioout_get_paused_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audioio_audioout_paused_obj = MP_PROPERTY_GETTER(audioio_audioout_paused_obj, + (mp_obj_t)&audioio_audioout_get_paused_obj); STATIC const mp_rom_map_elem_t audioio_audioout_locals_dict_table[] = { // Methods diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c index 3248e649c9..45a457f461 100644 --- a/shared-bindings/audiomixer/Mixer.c +++ b/shared-bindings/audiomixer/Mixer.c @@ -166,12 +166,8 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_playing_obj, audiomixer_mixer_obj_get_playing); -const mp_obj_property_t audiomixer_mixer_playing_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomixer_mixer_get_playing_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomixer_mixer_playing_obj = MP_PROPERTY_GETTER(audiomixer_mixer_playing_obj, + (mp_obj_t)&audiomixer_mixer_get_playing_obj); //| sample_rate: int //| """32 bit value that dictates how quickly samples are played in Hertz (cycles per second).""" @@ -183,12 +179,8 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_sample_rate_obj, audiomixer_mixer_obj_get_sample_rate); -const mp_obj_property_t audiomixer_mixer_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomixer_mixer_get_sample_rate_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomixer_mixer_sample_rate_obj = MP_PROPERTY_GETTER(audiomixer_mixer_sample_rate_obj, + (mp_obj_t)&audiomixer_mixer_get_sample_rate_obj); //| voice: Tuple[MixerVoice, ...] //| """A tuple of the mixer's `audiomixer.MixerVoice` object(s). @@ -204,12 +196,8 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_voice(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_voice_obj, audiomixer_mixer_obj_get_voice); -const mp_obj_property_t audiomixer_mixer_voice_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomixer_mixer_get_voice_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomixer_mixer_voice_obj = MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj, + (mp_obj_t)&audiomixer_mixer_get_voice_obj); //| def play(self, sample: circuitpython_typing.AudioSample, *, voice: int = 0, loop: bool = False) -> None: //| """Plays the sample once when loop=False and continuously when loop=True. diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c index 82b6972864..48adb3794d 100644 --- a/shared-bindings/audiomixer/MixerVoice.c +++ b/shared-bindings/audiomixer/MixerVoice.c @@ -130,12 +130,9 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_set_level_obj, 1, audiomixer_mixervoice_obj_set_level); -const mp_obj_property_t audiomixer_mixervoice_level_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomixer_mixervoice_get_level_obj, - (mp_obj_t)&audiomixer_mixervoice_set_level_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t audiomixer_mixervoice_level_obj = MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj, + (mp_obj_t)&audiomixer_mixervoice_get_level_obj, + (mp_obj_t)&audiomixer_mixervoice_set_level_obj); //| playing: bool //| """True when this voice is being output. (read-only)""" @@ -149,12 +146,8 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_playing_obj, audiomixer_mixervoice_obj_get_playing); -const mp_obj_property_t audiomixer_mixervoice_playing_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomixer_mixervoice_get_playing_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomixer_mixervoice_playing_obj = MP_PROPERTY_GETTER(audiomixer_mixervoice_playing_obj, + (mp_obj_t)&audiomixer_mixervoice_get_playing_obj); STATIC const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = { // Methods diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index 06d9eabbcc..ed66440666 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -166,12 +166,9 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) { } MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file); -const mp_obj_property_t audiomp3_mp3file_file_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_file_obj, - (mp_obj_t)&audiomp3_mp3file_set_file_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t audiomp3_mp3file_file_obj = MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj, + (mp_obj_t)&audiomp3_mp3file_get_file_obj, + (mp_obj_t)&audiomp3_mp3file_set_file_obj); @@ -195,12 +192,9 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_sample_rate_obj, audiomp3_mp3file_obj_set_sample_rate); -const mp_obj_property_t audiomp3_mp3file_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_sample_rate_obj, - (mp_obj_t)&audiomp3_mp3file_set_sample_rate_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t audiomp3_mp3file_sample_rate_obj = MP_PROPERTY_GETSET(audiomp3_mp3file_sample_rate_obj, + (mp_obj_t)&audiomp3_mp3file_get_sample_rate_obj, + (mp_obj_t)&audiomp3_mp3file_set_sample_rate_obj); //| bits_per_sample: int //| """Bits per sample. (read only)""" @@ -212,12 +206,8 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_bits_per_sample(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_bits_per_sample_obj, audiomp3_mp3file_obj_get_bits_per_sample); -const mp_obj_property_t audiomp3_mp3file_bits_per_sample_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_bits_per_sample_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomp3_mp3file_bits_per_sample_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_bits_per_sample_obj, + (mp_obj_t)&audiomp3_mp3file_get_bits_per_sample_obj); //| channel_count: int //| """Number of audio channels. (read only)""" @@ -229,12 +219,8 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_channel_count(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_channel_count_obj, audiomp3_mp3file_obj_get_channel_count); -const mp_obj_property_t audiomp3_mp3file_channel_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_channel_count_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomp3_mp3file_channel_count_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_channel_count_obj, + (mp_obj_t)&audiomp3_mp3file_get_channel_count_obj); //| rms_level: float //| """The RMS audio level of a recently played moment of audio. (read only)""" @@ -246,12 +232,8 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_rms_level_obj, audiomp3_mp3file_obj_get_rms_level); -const mp_obj_property_t audiomp3_mp3file_rms_level_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_rms_level_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomp3_mp3file_rms_level_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj, + (mp_obj_t)&audiomp3_mp3file_get_rms_level_obj); //| samples_decoded: int //| """The number of audio samples decoded from the current file. (read only)""" @@ -263,12 +245,8 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_samples_decoded_obj, audiomp3_mp3file_obj_get_samples_decoded); -const mp_obj_property_t audiomp3_mp3file_samples_decoded_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiomp3_mp3file_get_samples_decoded_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiomp3_mp3file_samples_decoded_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj, + (mp_obj_t)&audiomp3_mp3file_get_samples_decoded_obj); STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = { // Methods diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c index 85332d0fac..b8cdcbadda 100644 --- a/shared-bindings/audiopwmio/PWMAudioOut.c +++ b/shared-bindings/audiopwmio/PWMAudioOut.c @@ -198,12 +198,8 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_get_playing_obj, audiopwmio_pwmaudioout_obj_get_playing); -const mp_obj_property_t audiopwmio_pwmaudioout_playing_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiopwmio_pwmaudioout_get_playing_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiopwmio_pwmaudioout_playing_obj = MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_playing_obj, + (mp_obj_t)&audiopwmio_pwmaudioout_get_playing_obj); //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" @@ -247,12 +243,8 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_get_paused_obj, audiopwmio_pwmaudioout_obj_get_paused); -const mp_obj_property_t audiopwmio_pwmaudioout_paused_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&audiopwmio_pwmaudioout_get_paused_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t audiopwmio_pwmaudioout_paused_obj = MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_paused_obj, + (mp_obj_t)&audiopwmio_pwmaudioout_get_paused_obj); STATIC const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = { // Methods diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index 92fff7e571..404c120371 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -425,12 +425,8 @@ STATIC mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_get_frequency_obj, busio_spi_obj_get_frequency); -const mp_obj_property_t busio_spi_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&busio_spi_get_frequency_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t busio_spi_frequency_obj = MP_PROPERTY_GETTER(busio_spi_frequency_obj, + (mp_obj_t)&busio_spi_get_frequency_obj); #endif // CIRCUITPY_BUSIO_SPI diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 1819748992..2e7a412456 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -303,12 +303,9 @@ STATIC mp_obj_t busio_uart_obj_set_baudrate(mp_obj_t self_in, mp_obj_t baudrate) MP_DEFINE_CONST_FUN_OBJ_2(busio_uart_set_baudrate_obj, busio_uart_obj_set_baudrate); -const mp_obj_property_t busio_uart_baudrate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&busio_uart_get_baudrate_obj, - (mp_obj_t)&busio_uart_set_baudrate_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t busio_uart_baudrate_obj = MP_PROPERTY_GETSET(busio_uart_baudrate_obj, + (mp_obj_t)&busio_uart_get_baudrate_obj, + (mp_obj_t)&busio_uart_set_baudrate_obj); //| in_waiting: int //| """The number of bytes in the input buffer, available to be read""" @@ -320,12 +317,8 @@ STATIC mp_obj_t busio_uart_obj_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_get_in_waiting_obj, busio_uart_obj_get_in_waiting); -const mp_obj_property_t busio_uart_in_waiting_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&busio_uart_get_in_waiting_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t busio_uart_in_waiting_obj = MP_PROPERTY_GETTER(busio_uart_in_waiting_obj, + (mp_obj_t)&busio_uart_get_in_waiting_obj); //| timeout: float //| """The current timeout, in seconds (float).""" @@ -348,12 +341,9 @@ STATIC mp_obj_t busio_uart_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout) { MP_DEFINE_CONST_FUN_OBJ_2(busio_uart_set_timeout_obj, busio_uart_obj_set_timeout); -const mp_obj_property_t busio_uart_timeout_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&busio_uart_get_timeout_obj, - (mp_obj_t)&busio_uart_set_timeout_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t busio_uart_timeout_obj = MP_PROPERTY_GETSET(busio_uart_timeout_obj, + (mp_obj_t)&busio_uart_get_timeout_obj, + (mp_obj_t)&busio_uart_set_timeout_obj); //| def reset_input_buffer(self) -> None: //| """Discard any unread characters in the input buffer.""" diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c index 39ce7ecba5..54439b6e44 100644 --- a/shared-bindings/canio/CAN.c +++ b/shared-bindings/canio/CAN.c @@ -112,12 +112,9 @@ STATIC mp_obj_t canio_can_auto_restart_set(mp_obj_t self_in, mp_obj_t flag_in) { } MP_DEFINE_CONST_FUN_OBJ_2(canio_can_auto_restart_set_obj, canio_can_auto_restart_set); -STATIC const mp_obj_property_t canio_can_auto_restart_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_auto_restart_get_obj, - (mp_obj_t)&canio_can_auto_restart_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_can_auto_restart_obj = MP_PROPERTY_GETSET(canio_can_auto_restart_obj, + (mp_obj_t)&canio_can_auto_restart_get_obj, + (mp_obj_t)&canio_can_auto_restart_set_obj); //| baudrate: int @@ -130,11 +127,8 @@ STATIC mp_obj_t canio_can_baudrate_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_baudrate_get_obj, canio_can_baudrate_get); -STATIC const mp_obj_property_t canio_can_baudrate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_baudrate_get_obj, - MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_baudrate_obj = MP_PROPERTY_GETTER(canio_can_baudrate_obj, + (mp_obj_t)&canio_can_baudrate_get_obj); //| transmit_error_count: int //| """The number of transmit errors (read-only). Increased for a detected transmission error, decreased for successful transmission. Limited to the range from 0 to 255 inclusive. Also called TEC.""" @@ -146,10 +140,8 @@ STATIC mp_obj_t canio_can_transmit_error_count_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_transmit_error_count_get_obj, canio_can_transmit_error_count_get); -STATIC const mp_obj_property_t canio_can_transmit_error_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_transmit_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_transmit_error_count_obj = MP_PROPERTY_GETTER(canio_can_transmit_error_count_obj, + (mp_obj_t)&canio_can_transmit_error_count_get_obj); //| receive_error_count: int //| """The number of receive errors (read-only). Increased for a detected reception error, decreased for successful reception. Limited to the range from 0 to 255 inclusive. Also called REC.""" @@ -161,10 +153,8 @@ STATIC mp_obj_t canio_can_receive_error_count_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_receive_error_count_get_obj, canio_can_receive_error_count_get); -STATIC const mp_obj_property_t canio_can_receive_error_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_receive_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_receive_error_count_obj = MP_PROPERTY_GETTER(canio_can_receive_error_count_obj, + (mp_obj_t)&canio_can_receive_error_count_get_obj); //| state: BusState //| """The current state of the bus. (read-only)""" @@ -176,10 +166,8 @@ STATIC mp_obj_t canio_can_state_get(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(canio_can_state_get_obj, canio_can_state_get); -STATIC const mp_obj_property_t canio_can_state_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_state_get_obj, MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_state_obj = MP_PROPERTY_GETTER(canio_can_state_obj, + (mp_obj_t)&canio_can_state_get_obj); //| def restart(self) -> None: @@ -276,10 +264,8 @@ STATIC mp_obj_t canio_can_loopback_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_loopback_get_obj, canio_can_loopback_get); -STATIC const mp_obj_property_t canio_can_loopback_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_loopback_get_obj, MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_loopback_obj = MP_PROPERTY_GETTER(canio_can_loopback_obj, + (mp_obj_t)&canio_can_loopback_get_obj); //| def send(self, message: Union[RemoteTransmissionRequest, Message]) -> None: @@ -313,10 +299,8 @@ STATIC mp_obj_t canio_can_silent_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_silent_get_obj, canio_can_silent_get); -STATIC const mp_obj_property_t canio_can_silent_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_can_silent_get_obj, MP_ROM_NONE, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getter_t canio_can_silent_obj = MP_PROPERTY_GETTER(canio_can_silent_obj, + (mp_obj_t)&canio_can_silent_get_obj); //| def deinit(self) -> None: diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c index 7ba1e85df1..fe8812fd4b 100644 --- a/shared-bindings/canio/Listener.c +++ b/shared-bindings/canio/Listener.c @@ -150,11 +150,9 @@ STATIC mp_obj_t canio_listener_timeout_set(mp_obj_t self_in, mp_obj_t timeout_in } STATIC MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_timeout_set); -STATIC const mp_obj_property_t canio_listener_timeout_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_listener_timeout_get_obj, - (mp_obj_t)&canio_listener_timeout_set_obj, MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_listener_timeout_obj = MP_PROPERTY_GETSET(canio_listener_timeout_obj, + (mp_obj_t)&canio_listener_timeout_get_obj, + (mp_obj_t)&canio_listener_timeout_set_obj); diff --git a/shared-bindings/canio/Match.c b/shared-bindings/canio/Match.c index e8379d3eda..8e063536c2 100644 --- a/shared-bindings/canio/Match.c +++ b/shared-bindings/canio/Match.c @@ -82,12 +82,8 @@ STATIC mp_obj_t canio_match_id_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_id_get_obj, canio_match_id_get); -const mp_obj_property_t canio_match_id_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_match_id_get_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t canio_match_id_obj = MP_PROPERTY_GETTER(canio_match_id_obj, + (mp_obj_t)&canio_match_id_get_obj); //| //| mask: int @@ -100,12 +96,8 @@ STATIC mp_obj_t canio_match_mask_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_mask_get_obj, canio_match_mask_get); -const mp_obj_property_t canio_match_mask_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_match_mask_get_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t canio_match_mask_obj = MP_PROPERTY_GETTER(canio_match_mask_obj, + (mp_obj_t)&canio_match_mask_get_obj); //| extended: bool //| """True to match extended ids, False to match standard ides""" @@ -117,12 +109,8 @@ STATIC mp_obj_t canio_match_extended_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_extended_get_obj, canio_match_extended_get); -const mp_obj_property_t canio_match_extended_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_match_extended_get_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t canio_match_extended_obj = MP_PROPERTY_GETTER(canio_match_extended_obj, + (mp_obj_t)&canio_match_extended_get_obj); STATIC const mp_rom_map_elem_t canio_match_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_match_id_obj) }, diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c index 8ed1352dcc..ca393a6f02 100644 --- a/shared-bindings/canio/Message.c +++ b/shared-bindings/canio/Message.c @@ -83,12 +83,9 @@ STATIC mp_obj_t canio_message_id_set(const mp_obj_t self_in, const mp_obj_t id) } MP_DEFINE_CONST_FUN_OBJ_2(canio_message_id_set_obj, canio_message_id_set); -STATIC const mp_obj_property_t canio_message_id_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_message_id_get_obj, - (mp_obj_t)&canio_message_id_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_message_id_obj = MP_PROPERTY_GETSET(canio_message_id_obj, + (mp_obj_t)&canio_message_id_get_obj, + (mp_obj_t)&canio_message_id_set_obj); //| data: bytes //| """The content of the message""" @@ -112,12 +109,9 @@ STATIC mp_obj_t canio_message_data_set(const mp_obj_t self_in, const mp_obj_t da MP_DEFINE_CONST_FUN_OBJ_2(canio_message_data_set_obj, canio_message_data_set); -STATIC const mp_obj_property_t canio_message_data_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_message_data_get_obj, - (mp_obj_t)&canio_message_data_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_message_data_obj = MP_PROPERTY_GETSET(canio_message_data_obj, + (mp_obj_t)&canio_message_data_get_obj, + (mp_obj_t)&canio_message_data_set_obj); //| extended: bool @@ -137,12 +131,9 @@ STATIC mp_obj_t canio_message_extended_set(const mp_obj_t self_in, const mp_obj_ MP_DEFINE_CONST_FUN_OBJ_2(canio_message_extended_set_obj, canio_message_extended_set); -STATIC const mp_obj_property_t canio_message_extended_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_message_extended_get_obj, - (mp_obj_t)&canio_message_extended_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_message_extended_obj = MP_PROPERTY_GETSET(canio_message_extended_obj, + (mp_obj_t)&canio_message_extended_get_obj, + (mp_obj_t)&canio_message_extended_set_obj); STATIC const mp_rom_map_elem_t canio_message_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_message_id_obj) }, diff --git a/shared-bindings/canio/RemoteTransmissionRequest.c b/shared-bindings/canio/RemoteTransmissionRequest.c index 3267cf914d..8979873336 100644 --- a/shared-bindings/canio/RemoteTransmissionRequest.c +++ b/shared-bindings/canio/RemoteTransmissionRequest.c @@ -82,12 +82,9 @@ STATIC mp_obj_t canio_remote_transmission_request_id_set(const mp_obj_t self_in, } MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_id_set_obj, canio_remote_transmission_request_id_set); -STATIC const mp_obj_property_t canio_remote_transmission_request_id_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_remote_transmission_request_id_get_obj, - (mp_obj_t)&canio_remote_transmission_request_id_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_remote_transmission_request_id_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_id_obj, + (mp_obj_t)&canio_remote_transmission_request_id_get_obj, + (mp_obj_t)&canio_remote_transmission_request_id_set_obj); //| extended: bool //| """True if the message's id is an extended id""" @@ -106,12 +103,9 @@ STATIC mp_obj_t canio_remote_transmission_request_extended_set(const mp_obj_t se MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_extended_set_obj, canio_remote_transmission_request_extended_set); -STATIC const mp_obj_property_t canio_remote_transmission_request_extended_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_remote_transmission_request_extended_get_obj, - (mp_obj_t)&canio_remote_transmission_request_extended_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_remote_transmission_request_extended_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj, + (mp_obj_t)&canio_remote_transmission_request_extended_get_obj, + (mp_obj_t)&canio_remote_transmission_request_extended_set_obj); //| length: int //| """The length of the requested message.""" @@ -134,12 +128,9 @@ STATIC mp_obj_t canio_remote_transmission_request_length_set(const mp_obj_t self MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_length_set_obj, canio_remote_transmission_request_length_set); -STATIC const mp_obj_property_t canio_remote_transmission_request_length_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&canio_remote_transmission_request_length_get_obj, - (mp_obj_t)&canio_remote_transmission_request_length_set_obj, - MP_ROM_NONE}, -}; +STATIC const mp_obj_property_getset_t canio_remote_transmission_request_length_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_length_obj, + (mp_obj_t)&canio_remote_transmission_request_length_get_obj, + (mp_obj_t)&canio_remote_transmission_request_length_set_obj); STATIC const mp_rom_map_elem_t canio_remote_transmission_request_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_remote_transmission_request_id_obj) }, diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c index f165eda202..bee3873552 100644 --- a/shared-bindings/countio/Counter.c +++ b/shared-bindings/countio/Counter.c @@ -114,12 +114,9 @@ STATIC mp_obj_t countio_counter_obj_set_count(mp_obj_t self_in, mp_obj_t new_cou } MP_DEFINE_CONST_FUN_OBJ_2(countio_counter_set_count_obj, countio_counter_obj_set_count); -const mp_obj_property_t countio_counter_count_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&countio_counter_get_count_obj, - (mp_obj_t)&countio_counter_set_count_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t countio_counter_count_obj = MP_PROPERTY_GETSET(countio_counter_count_obj, + (mp_obj_t)&countio_counter_get_count_obj, + (mp_obj_t)&countio_counter_set_count_obj); //| def reset(self) -> None: //| """Resets the count back to 0.""" diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index af7defd911..09a0c8a7b4 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -213,12 +213,9 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_direction_obj, digitalio_digitalinout_obj_set_direction); -const mp_obj_property_t digitalio_digitalio_direction_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&digitalio_digitalinout_get_direction_obj, - (mp_obj_t)&digitalio_digitalinout_set_direction_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t digitalio_digitalio_direction_obj = MP_PROPERTY_GETSET(digitalio_digitalio_direction_obj, + (mp_obj_t)&digitalio_digitalinout_get_direction_obj, + (mp_obj_t)&digitalio_digitalinout_set_direction_obj); //| value: bool //| """The digital logic level of the pin.""" @@ -243,12 +240,9 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_value_obj, digitalio_digitalinout_obj_set_value); -const mp_obj_property_t digitalio_digitalinout_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&digitalio_digitalinout_get_value_obj, - (mp_obj_t)&digitalio_digitalinout_set_value_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t digitalio_digitalinout_value_obj = MP_PROPERTY_GETSET(digitalio_digitalinout_value_obj, + (mp_obj_t)&digitalio_digitalinout_get_value_obj, + (mp_obj_t)&digitalio_digitalinout_set_value_obj); //| drive_mode: DriveMode //| """The pin drive mode. One of: @@ -287,12 +281,9 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_drive_mode_obj, digitalio_digitalinout_obj_set_drive_mode); -const mp_obj_property_t digitalio_digitalio_drive_mode_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&digitalio_digitalinout_get_drive_mode_obj, - (mp_obj_t)&digitalio_digitalinout_set_drive_mode_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t digitalio_digitalio_drive_mode_obj = MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj, + (mp_obj_t)&digitalio_digitalinout_get_drive_mode_obj, + (mp_obj_t)&digitalio_digitalinout_set_drive_mode_obj); //| pull: Optional[Pull] //| """The pin pull direction. One of: @@ -333,12 +324,9 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t p } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_pull_obj, digitalio_digitalinout_obj_set_pull); -const mp_obj_property_t digitalio_digitalio_pull_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&digitalio_digitalinout_get_pull_obj, - (mp_obj_t)&digitalio_digitalinout_set_pull_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t digitalio_digitalio_pull_obj = MP_PROPERTY_GETSET(digitalio_digitalio_pull_obj, + (mp_obj_t)&digitalio_digitalinout_get_pull_obj, + (mp_obj_t)&digitalio_digitalinout_set_pull_obj); STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = { // instance methods diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index f8f47d34f4..fdcf9e4ede 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -97,12 +97,8 @@ STATIC mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_get_width_obj, displayio_bitmap_obj_get_width); -const mp_obj_property_t displayio_bitmap_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_bitmap_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_bitmap_width_obj = MP_PROPERTY_GETTER(displayio_bitmap_width_obj, + (mp_obj_t)&displayio_bitmap_get_width_obj); //| height: int //| """Height of the bitmap. (read only)""" @@ -115,12 +111,8 @@ STATIC mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_get_height_obj, displayio_bitmap_obj_get_height); -const mp_obj_property_t displayio_bitmap_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_bitmap_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_bitmap_height_obj = MP_PROPERTY_GETTER(displayio_bitmap_height_obj, + (mp_obj_t)&displayio_bitmap_get_height_obj); //| def __getitem__(self, index: Union[Tuple[int, int], int]) -> int: //| """Returns the value at the given index. The index can either be an x,y tuple or an int equal diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c index f2ca006ced..710d8b3191 100644 --- a/shared-bindings/displayio/ColorConverter.c +++ b/shared-bindings/displayio/ColorConverter.c @@ -103,12 +103,9 @@ STATIC mp_obj_t displayio_colorconverter_obj_set_dither(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_set_dither_obj, displayio_colorconverter_obj_set_dither); -const mp_obj_property_t displayio_colorconverter_dither_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_colorconverter_get_dither_obj, - (mp_obj_t)&displayio_colorconverter_set_dither_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_colorconverter_dither_obj = MP_PROPERTY_GETSET(displayio_colorconverter_dither_obj, + (mp_obj_t)&displayio_colorconverter_get_dither_obj, + (mp_obj_t)&displayio_colorconverter_set_dither_obj); //| def make_transparent(self, color: int) -> None: //| """Set the transparent color or index for the ColorConverter. This will diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index f7b3305439..79141d7bbd 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -297,12 +297,9 @@ STATIC mp_obj_t displayio_display_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_refresh_obj, displayio_display_obj_set_auto_refresh); -const mp_obj_property_t displayio_display_auto_refresh_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_auto_refresh_obj, - (mp_obj_t)&displayio_display_set_auto_refresh_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_display_auto_refresh_obj = MP_PROPERTY_GETSET(displayio_display_auto_refresh_obj, + (mp_obj_t)&displayio_display_get_auto_refresh_obj, + (mp_obj_t)&displayio_display_set_auto_refresh_obj); //| brightness: float //| """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When @@ -334,12 +331,9 @@ STATIC mp_obj_t displayio_display_obj_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_brightness_obj, displayio_display_obj_set_brightness); -const mp_obj_property_t displayio_display_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_brightness_obj, - (mp_obj_t)&displayio_display_set_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_display_brightness_obj = MP_PROPERTY_GETSET(displayio_display_brightness_obj, + (mp_obj_t)&displayio_display_get_brightness_obj, + (mp_obj_t)&displayio_display_set_brightness_obj); //| auto_brightness: bool //| """True when the display brightness is adjusted automatically, based on an ambient @@ -362,12 +356,9 @@ STATIC mp_obj_t displayio_display_obj_set_auto_brightness(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_brightness_obj, displayio_display_obj_set_auto_brightness); -const mp_obj_property_t displayio_display_auto_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_auto_brightness_obj, - (mp_obj_t)&displayio_display_set_auto_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_display_auto_brightness_obj = MP_PROPERTY_GETSET(displayio_display_auto_brightness_obj, + (mp_obj_t)&displayio_display_get_auto_brightness_obj, + (mp_obj_t)&displayio_display_set_auto_brightness_obj); @@ -381,12 +372,8 @@ STATIC mp_obj_t displayio_display_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_width_obj, displayio_display_obj_get_width); -const mp_obj_property_t displayio_display_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_display_width_obj = MP_PROPERTY_GETTER(displayio_display_width_obj, + (mp_obj_t)&displayio_display_get_width_obj); //| height: int //| """Gets the height of the board""" @@ -397,12 +384,8 @@ STATIC mp_obj_t displayio_display_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_height_obj, displayio_display_obj_get_height); -const mp_obj_property_t displayio_display_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_display_height_obj = MP_PROPERTY_GETTER(displayio_display_height_obj, + (mp_obj_t)&displayio_display_get_height_obj); //| rotation: int //| """The rotation of the display as an int in degrees.""" @@ -420,12 +403,9 @@ STATIC mp_obj_t displayio_display_obj_set_rotation(mp_obj_t self_in, mp_obj_t va MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_rotation_obj, displayio_display_obj_set_rotation); -const mp_obj_property_t displayio_display_rotation_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_rotation_obj, - (mp_obj_t)&displayio_display_set_rotation_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_display_rotation_obj = MP_PROPERTY_GETSET(displayio_display_rotation_obj, + (mp_obj_t)&displayio_display_get_rotation_obj, + (mp_obj_t)&displayio_display_set_rotation_obj); //| bus: _DisplayBus //| """The bus being used by the display""" @@ -437,12 +417,8 @@ STATIC mp_obj_t displayio_display_obj_get_bus(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_bus_obj, displayio_display_obj_get_bus); -const mp_obj_property_t displayio_display_bus_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_bus_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_display_bus_obj = MP_PROPERTY_GETTER(displayio_display_bus_obj, + (mp_obj_t)&displayio_display_get_bus_obj); //| root_group: Group //| """The root group on the display.""" @@ -454,12 +430,8 @@ STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_root_group_obj, displayio_display_obj_get_root_group); -const mp_obj_property_t displayio_display_root_group_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_root_group_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_display_root_group_obj = MP_PROPERTY_GETTER(displayio_display_root_group_obj, + (mp_obj_t)&displayio_display_get_root_group_obj); //| def fill_row(self, y: int, buffer: WriteableBuffer) -> WriteableBuffer: diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c index aa14594d97..215a0c7270 100644 --- a/shared-bindings/displayio/EPaperDisplay.c +++ b/shared-bindings/displayio/EPaperDisplay.c @@ -268,12 +268,8 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_time_to_refresh_obj, displayio_epaperdisplay_obj_get_time_to_refresh); -const mp_obj_property_t displayio_epaperdisplay_time_to_refresh_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_time_to_refresh_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_epaperdisplay_time_to_refresh_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_time_to_refresh_obj, + (mp_obj_t)&displayio_epaperdisplay_get_time_to_refresh_obj); //| busy: bool //| """True when the display is refreshing. This uses the ``busy_pin`` when available or the @@ -285,12 +281,8 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_busy(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_busy_obj, displayio_epaperdisplay_obj_get_busy); -const mp_obj_property_t displayio_epaperdisplay_busy_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_busy_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_epaperdisplay_busy_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_busy_obj, + (mp_obj_t)&displayio_epaperdisplay_get_busy_obj); //| width: int //| """Gets the width of the display in pixels""" @@ -301,12 +293,8 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_width_obj, displayio_epaperdisplay_obj_get_width); -const mp_obj_property_t displayio_epaperdisplay_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_epaperdisplay_width_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_width_obj, + (mp_obj_t)&displayio_epaperdisplay_get_width_obj); //| height: int //| """Gets the height of the display in pixels""" @@ -317,12 +305,8 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_height_obj, displayio_epaperdisplay_obj_get_height); -const mp_obj_property_t displayio_epaperdisplay_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_epaperdisplay_height_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_height_obj, + (mp_obj_t)&displayio_epaperdisplay_get_height_obj); //| rotation: int //| """The rotation of the display as an int in degrees.""" @@ -340,12 +324,9 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_set_rotation(mp_obj_t self_in, mp_ob MP_DEFINE_CONST_FUN_OBJ_2(displayio_epaperdisplay_set_rotation_obj, displayio_epaperdisplay_obj_set_rotation); -const mp_obj_property_t displayio_epaperdisplay_rotation_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_rotation_obj, - (mp_obj_t)&displayio_epaperdisplay_set_rotation_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_epaperdisplay_rotation_obj = MP_PROPERTY_GETSET(displayio_epaperdisplay_rotation_obj, + (mp_obj_t)&displayio_epaperdisplay_get_rotation_obj, + (mp_obj_t)&displayio_epaperdisplay_set_rotation_obj); //| bus: _DisplayBus //| """The bus being used by the display""" @@ -356,12 +337,8 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_bus(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_bus_obj, displayio_epaperdisplay_obj_get_bus); -const mp_obj_property_t displayio_epaperdisplay_bus_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_epaperdisplay_get_bus_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_epaperdisplay_bus_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj, + (mp_obj_t)&displayio_epaperdisplay_get_bus_obj); STATIC const mp_rom_map_elem_t displayio_epaperdisplay_locals_dict_table[] = { diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c index 33329e5ece..359cc1da30 100644 --- a/shared-bindings/displayio/Group.c +++ b/shared-bindings/displayio/Group.c @@ -97,12 +97,9 @@ STATIC mp_obj_t displayio_group_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_hidden_obj, displayio_group_obj_set_hidden); -const mp_obj_property_t displayio_group_hidden_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_group_get_hidden_obj, - (mp_obj_t)&displayio_group_set_hidden_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_group_hidden_obj = MP_PROPERTY_GETSET(displayio_group_hidden_obj, + (mp_obj_t)&displayio_group_get_hidden_obj, + (mp_obj_t)&displayio_group_set_hidden_obj); //| scale: int //| """Scales each pixel within the Group in both directions. For example, when scale=2 each pixel @@ -126,12 +123,9 @@ STATIC mp_obj_t displayio_group_obj_set_scale(mp_obj_t self_in, mp_obj_t scale_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_scale_obj, displayio_group_obj_set_scale); -const mp_obj_property_t displayio_group_scale_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_group_get_scale_obj, - (mp_obj_t)&displayio_group_set_scale_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_group_scale_obj = MP_PROPERTY_GETSET(displayio_group_scale_obj, + (mp_obj_t)&displayio_group_get_scale_obj, + (mp_obj_t)&displayio_group_set_scale_obj); //| x: int //| """X position of the Group in the parent.""" @@ -151,12 +145,9 @@ STATIC mp_obj_t displayio_group_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_x_obj, displayio_group_obj_set_x); -const mp_obj_property_t displayio_group_x_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_group_get_x_obj, - (mp_obj_t)&displayio_group_set_x_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_group_x_obj = MP_PROPERTY_GETSET(displayio_group_x_obj, + (mp_obj_t)&displayio_group_get_x_obj, + (mp_obj_t)&displayio_group_set_x_obj); //| y: int //| """Y position of the Group in the parent.""" @@ -176,12 +167,9 @@ STATIC mp_obj_t displayio_group_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_y_obj, displayio_group_obj_set_y); -const mp_obj_property_t displayio_group_y_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_group_get_y_obj, - (mp_obj_t)&displayio_group_set_y_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_group_y_obj = MP_PROPERTY_GETSET(displayio_group_y_obj, + (mp_obj_t)&displayio_group_get_y_obj, + (mp_obj_t)&displayio_group_set_y_obj); //| def append(self, layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> None: //| """Append a layer to the group. It will be drawn above other layers.""" diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c index 0564b48fe8..0c17d0328b 100644 --- a/shared-bindings/displayio/OnDiskBitmap.c +++ b/shared-bindings/displayio/OnDiskBitmap.c @@ -109,13 +109,8 @@ STATIC mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_width_obj, displayio_ondiskbitmap_obj_get_width); -const mp_obj_property_t displayio_ondiskbitmap_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_ondiskbitmap_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, - -}; +const mp_obj_property_getter_t displayio_ondiskbitmap_width_obj = MP_PROPERTY_GETTER(displayio_ondiskbitmap_width_obj, + (mp_obj_t)&displayio_ondiskbitmap_get_width_obj); //| height: int //| """Height of the bitmap. (read only)""" @@ -128,13 +123,8 @@ STATIC mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_height_obj, displayio_ondiskbitmap_obj_get_height); -const mp_obj_property_t displayio_ondiskbitmap_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_ondiskbitmap_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, - -}; +const mp_obj_property_getter_t displayio_ondiskbitmap_height_obj = MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj, + (mp_obj_t)&displayio_ondiskbitmap_get_height_obj); //| pixel_shader: Union[ColorConverter, Palette] //| """The image's pixel_shader. The type depends on the underlying diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 4628939e27..44e24be52d 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -161,12 +161,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_hidden(mp_obj_t self_in, mp_obj_t hid } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_hidden_obj, displayio_tilegrid_obj_set_hidden); -const mp_obj_property_t displayio_tilegrid_hidden_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_hidden_obj, - (mp_obj_t)&displayio_tilegrid_set_hidden_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_hidden_obj = MP_PROPERTY_GETSET(displayio_tilegrid_hidden_obj, + (mp_obj_t)&displayio_tilegrid_get_hidden_obj, + (mp_obj_t)&displayio_tilegrid_set_hidden_obj); //| x: int //| """X position of the left edge in the parent.""" @@ -186,12 +183,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_x_obj, displayio_tilegrid_obj_set_x); -const mp_obj_property_t displayio_tilegrid_x_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_x_obj, - (mp_obj_t)&displayio_tilegrid_set_x_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_x_obj = MP_PROPERTY_GETSET(displayio_tilegrid_x_obj, + (mp_obj_t)&displayio_tilegrid_get_x_obj, + (mp_obj_t)&displayio_tilegrid_set_x_obj); //| y: int //| """Y position of the top edge in the parent.""" @@ -211,12 +205,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_y_obj, displayio_tilegrid_obj_set_y); -const mp_obj_property_t displayio_tilegrid_y_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_y_obj, - (mp_obj_t)&displayio_tilegrid_set_y_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_y_obj = MP_PROPERTY_GETSET(displayio_tilegrid_y_obj, + (mp_obj_t)&displayio_tilegrid_get_y_obj, + (mp_obj_t)&displayio_tilegrid_set_y_obj); //| width: int //| """Width of the tilegrid in tiles.""" @@ -227,11 +218,8 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_width_obj, displayio_tilegrid_obj_get_width); -const mp_obj_property_t displayio_tilegrid_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_width_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_tilegrid_width_obj = MP_PROPERTY_GETTER(displayio_tilegrid_width_obj, + (mp_obj_t)&displayio_tilegrid_get_width_obj); //| height: int //| """Height of the tilegrid in tiles.""" @@ -242,11 +230,8 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_height_obj, displayio_tilegrid_obj_get_height); -const mp_obj_property_t displayio_tilegrid_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_height_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_tilegrid_height_obj = MP_PROPERTY_GETTER(displayio_tilegrid_height_obj, + (mp_obj_t)&displayio_tilegrid_get_height_obj); //| tile_width: int //| """Width of a single tile in pixels.""" @@ -257,11 +242,8 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_tile_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_tile_width_obj, displayio_tilegrid_obj_get_tile_width); -const mp_obj_property_t displayio_tilegrid_tile_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_tile_width_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_tilegrid_tile_width_obj = MP_PROPERTY_GETTER(displayio_tilegrid_tile_width_obj, + (mp_obj_t)&displayio_tilegrid_get_tile_width_obj); //| tile_height: int //| """Height of a single tile in pixels.""" @@ -272,11 +254,8 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_tile_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_tile_height_obj, displayio_tilegrid_obj_get_tile_height); -const mp_obj_property_t displayio_tilegrid_tile_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_tile_height_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t displayio_tilegrid_tile_height_obj = MP_PROPERTY_GETTER(displayio_tilegrid_tile_height_obj, + (mp_obj_t)&displayio_tilegrid_get_tile_height_obj); //| flip_x: bool //| """If true, the left edge rendered will be the right edge of the right-most tile.""" @@ -295,12 +274,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_flip_x(mp_obj_t self_in, mp_obj_t fli } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_flip_x_obj, displayio_tilegrid_obj_set_flip_x); -const mp_obj_property_t displayio_tilegrid_flip_x_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_flip_x_obj, - (mp_obj_t)&displayio_tilegrid_set_flip_x_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_flip_x_obj = MP_PROPERTY_GETSET(displayio_tilegrid_flip_x_obj, + (mp_obj_t)&displayio_tilegrid_get_flip_x_obj, + (mp_obj_t)&displayio_tilegrid_set_flip_x_obj); //| flip_y: bool //| """If true, the top edge rendered will be the bottom edge of the bottom-most tile.""" @@ -319,12 +295,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_flip_y(mp_obj_t self_in, mp_obj_t fli } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_flip_y_obj, displayio_tilegrid_obj_set_flip_y); -const mp_obj_property_t displayio_tilegrid_flip_y_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_flip_y_obj, - (mp_obj_t)&displayio_tilegrid_set_flip_y_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_flip_y_obj = MP_PROPERTY_GETSET(displayio_tilegrid_flip_y_obj, + (mp_obj_t)&displayio_tilegrid_get_flip_y_obj, + (mp_obj_t)&displayio_tilegrid_set_flip_y_obj); //| transpose_xy: bool @@ -345,12 +318,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_transpose_xy(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_transpose_xy_obj, displayio_tilegrid_obj_set_transpose_xy); -const mp_obj_property_t displayio_tilegrid_transpose_xy_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_transpose_xy_obj, - (mp_obj_t)&displayio_tilegrid_set_transpose_xy_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_transpose_xy_obj = MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, + (mp_obj_t)&displayio_tilegrid_get_transpose_xy_obj, + (mp_obj_t)&displayio_tilegrid_set_transpose_xy_obj); //| pixel_shader: Union[ColorConverter, Palette] //| """The pixel shader of the tilegrid.""" @@ -373,12 +343,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_pixel_shader_obj, displayio_tilegrid_obj_set_pixel_shader); -const mp_obj_property_t displayio_tilegrid_pixel_shader_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_pixel_shader_obj, - (mp_obj_t)&displayio_tilegrid_set_pixel_shader_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_pixel_shader_obj = MP_PROPERTY_GETSET(displayio_tilegrid_pixel_shader_obj, + (mp_obj_t)&displayio_tilegrid_get_pixel_shader_obj, + (mp_obj_t)&displayio_tilegrid_set_pixel_shader_obj); //| bitmap: Union[Bitmap,OnDiskBitmap,Shape] //| """The bitmap of the tilegrid.""" @@ -439,12 +406,9 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bit } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_bitmap_obj, displayio_tilegrid_obj_set_bitmap); -const mp_obj_property_t displayio_tilegrid_bitmap_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_tilegrid_get_bitmap_obj, - (mp_obj_t)&displayio_tilegrid_set_bitmap_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t displayio_tilegrid_bitmap_obj = MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj, + (mp_obj_t)&displayio_tilegrid_get_bitmap_obj, + (mp_obj_t)&displayio_tilegrid_set_bitmap_obj); //| def __getitem__(self, index: Union[Tuple[int, int], int]) -> int: //| """Returns the tile index at the given index. The index can either be an x,y tuple or an int equal diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c index fcbde4e80d..307ac908e2 100644 --- a/shared-bindings/fontio/BuiltinFont.c +++ b/shared-bindings/fontio/BuiltinFont.c @@ -76,12 +76,8 @@ STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bitmap_obj, fontio_builtinfont_obj_get_bitmap); -const mp_obj_property_t fontio_builtinfont_bitmap_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&fontio_builtinfont_get_bitmap_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t fontio_builtinfont_bitmap_obj = MP_PROPERTY_GETTER(fontio_builtinfont_bitmap_obj, + (mp_obj_t)&fontio_builtinfont_get_bitmap_obj); //| def get_bounding_box(self) -> Tuple[int, int]: //| """Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height.""" diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c index acc50d7561..9fab93799e 100644 --- a/shared-bindings/framebufferio/FramebufferDisplay.c +++ b/shared-bindings/framebufferio/FramebufferDisplay.c @@ -168,12 +168,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_refresh(mp_obj_t s } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_refresh_obj, framebufferio_framebufferdisplay_obj_set_auto_refresh); -const mp_obj_property_t framebufferio_framebufferdisplay_auto_refresh_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_auto_refresh_obj, - (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_refresh_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t framebufferio_framebufferdisplay_auto_refresh_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_auto_refresh_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_refresh_obj); //| brightness: float //| """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When @@ -205,12 +202,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t sel } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_brightness_obj, framebufferio_framebufferdisplay_obj_set_brightness); -const mp_obj_property_t framebufferio_framebufferdisplay_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_brightness_obj, - (mp_obj_t)&framebufferio_framebufferdisplay_set_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t framebufferio_framebufferdisplay_brightness_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_brightness_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_set_brightness_obj); //| auto_brightness: bool //| """True when the display brightness is adjusted automatically, based on an ambient @@ -236,12 +230,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_brightness(mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_brightness_obj, framebufferio_framebufferdisplay_obj_set_auto_brightness); -const mp_obj_property_t framebufferio_framebufferdisplay_auto_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_auto_brightness_obj, - (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t framebufferio_framebufferdisplay_auto_brightness_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_brightness_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_auto_brightness_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_brightness_obj); //| width: int //| """Gets the width of the framebuffer""" @@ -252,12 +243,8 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_width_obj, framebufferio_framebufferdisplay_obj_get_width); -const mp_obj_property_t framebufferio_framebufferdisplay_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t framebufferio_framebufferdisplay_width_obj = MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_width_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_width_obj); //| height: int //| """Gets the height of the framebuffer""" @@ -268,12 +255,8 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_height_obj, framebufferio_framebufferdisplay_obj_get_height); -const mp_obj_property_t framebufferio_framebufferdisplay_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t framebufferio_framebufferdisplay_height_obj = MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_height_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_height_obj); //| rotation: int //| """The rotation of the display as an int in degrees.""" @@ -291,12 +274,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_rotation(mp_obj_t self_ MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_rotation_obj, framebufferio_framebufferdisplay_obj_set_rotation); -const mp_obj_property_t framebufferio_framebufferdisplay_rotation_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_rotation_obj, - (mp_obj_t)&framebufferio_framebufferdisplay_set_rotation_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t framebufferio_framebufferdisplay_rotation_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_rotation_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_rotation_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_set_rotation_obj); //| framebuffer: circuitpython_typing.FrameBuffer //| """The framebuffer being used by the display""" @@ -308,12 +288,8 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_framebuffer_obj, framebufferio_framebufferdisplay_obj_get_framebuffer); -const mp_obj_property_t framebufferio_framebufferframebuffer_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_framebuffer_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t framebufferio_framebufferframebuffer_obj = MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj, + (mp_obj_t)&framebufferio_framebufferdisplay_get_framebuffer_obj); //| def fill_row(self, y: int, buffer: WriteableBuffer) -> WriteableBuffer: diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c index a59d7a7302..32809cb48f 100644 --- a/shared-bindings/frequencyio/FrequencyIn.c +++ b/shared-bindings/frequencyio/FrequencyIn.c @@ -193,12 +193,9 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_set_capture_period(mp_obj_t self_in, } MP_DEFINE_CONST_FUN_OBJ_2(frequencyio_frequency_set_capture_period_obj, frequencyio_frequencyin_obj_set_capture_period); -const mp_obj_property_t frequencyio_frequencyin_capture_period_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&frequencyio_frequency_get_capture_period_obj, - (mp_obj_t)&frequencyio_frequency_set_capture_period_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t frequencyio_frequencyin_capture_period_obj = MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj, + (mp_obj_t)&frequencyio_frequency_get_capture_period_obj, + (mp_obj_t)&frequencyio_frequency_set_capture_period_obj); //| def __get__(self, index: int) -> int: //| """Returns the value of the last frequency captured.""" @@ -213,12 +210,8 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_get_value_obj, frequencyio_frequencyin_obj_get_value); -const mp_obj_property_t frequencyio_frequencyin_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&frequencyio_frequencyin_get_value_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t frequencyio_frequencyin_value_obj = MP_PROPERTY_GETTER(frequencyio_frequencyin_value_obj, + (mp_obj_t)&frequencyio_frequencyin_get_value_obj); STATIC const mp_rom_map_elem_t frequencyio_frequencyin_locals_dict_table[] = { // Methods diff --git a/shared-bindings/gnss/GNSS.c b/shared-bindings/gnss/GNSS.c index e304f0a0a2..a01e14bca3 100644 --- a/shared-bindings/gnss/GNSS.c +++ b/shared-bindings/gnss/GNSS.c @@ -108,12 +108,8 @@ STATIC mp_obj_t gnss_obj_get_latitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_latitude_obj, gnss_obj_get_latitude); -const mp_obj_property_t gnss_latitude_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&gnss_get_latitude_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t gnss_latitude_obj = MP_PROPERTY_GETTER(gnss_latitude_obj, + (mp_obj_t)&gnss_get_latitude_obj); //| longitude: float //| """Longitude of current position in degrees (float).""" @@ -125,12 +121,8 @@ STATIC mp_obj_t gnss_obj_get_longitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_longitude_obj, gnss_obj_get_longitude); -const mp_obj_property_t gnss_longitude_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&gnss_get_longitude_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t gnss_longitude_obj = MP_PROPERTY_GETTER(gnss_longitude_obj, + (mp_obj_t)&gnss_get_longitude_obj); //| altitude: float //| """Altitude of current position in meters (float).""" @@ -142,12 +134,8 @@ STATIC mp_obj_t gnss_obj_get_altitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_altitude_obj, gnss_obj_get_altitude); -const mp_obj_property_t gnss_altitude_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&gnss_get_altitude_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t gnss_altitude_obj = MP_PROPERTY_GETTER(gnss_altitude_obj, + (mp_obj_t)&gnss_get_altitude_obj); //| timestamp: time.struct_time //| """Time when the position data was updated.""" @@ -161,12 +149,8 @@ STATIC mp_obj_t gnss_obj_get_timestamp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_timestamp_obj, gnss_obj_get_timestamp); -const mp_obj_property_t gnss_timestamp_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&gnss_get_timestamp_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t gnss_timestamp_obj = MP_PROPERTY_GETTER(gnss_timestamp_obj, + (mp_obj_t)&gnss_get_timestamp_obj); //| fix: PositionFix //| """Fix mode.""" @@ -178,12 +162,8 @@ STATIC mp_obj_t gnss_obj_get_fix(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_fix_obj, gnss_obj_get_fix); -const mp_obj_property_t gnss_fix_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&gnss_get_fix_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t gnss_fix_obj = MP_PROPERTY_GETTER(gnss_fix_obj, + (mp_obj_t)&gnss_get_fix_obj); STATIC const mp_rom_map_elem_t gnss_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gnss_deinit_obj) }, diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c index f62e373937..5cc600e839 100644 --- a/shared-bindings/ipaddress/IPv4Address.c +++ b/shared-bindings/ipaddress/IPv4Address.c @@ -96,12 +96,8 @@ STATIC mp_obj_t ipaddress_ipv4address_get_packed(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(ipaddress_ipv4address_get_packed_obj, ipaddress_ipv4address_get_packed); -const mp_obj_property_t ipaddress_ipv4address_packed_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&ipaddress_ipv4address_get_packed_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t ipaddress_ipv4address_packed_obj = MP_PROPERTY_GETTER(ipaddress_ipv4address_packed_obj, + (mp_obj_t)&ipaddress_ipv4address_get_packed_obj); //| version: int //| """4 for IPv4, 6 for IPv6""" @@ -120,12 +116,8 @@ STATIC mp_obj_t ipaddress_ipv4address_get_version(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(ipaddress_ipv4address_get_version_obj, ipaddress_ipv4address_get_version); -const mp_obj_property_t ipaddress_ipv4address_version_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&ipaddress_ipv4address_get_version_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t ipaddress_ipv4address_version_obj = MP_PROPERTY_GETTER(ipaddress_ipv4address_version_obj, + (mp_obj_t)&ipaddress_ipv4address_get_version_obj); //| def __eq__(self, other: object) -> bool: //| """Two Address objects are equal if their addresses and address types are equal.""" diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c index 597024500d..146958dc24 100644 --- a/shared-bindings/is31fl3741/FrameBuffer.c +++ b/shared-bindings/is31fl3741/FrameBuffer.c @@ -166,12 +166,9 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(is31fl3741_FrameBuffer_set_brightness_obj, is31fl3741_FrameBuffer_set_brightness); -const mp_obj_property_t is31fl3741_FrameBuffer_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&is31fl3741_FrameBuffer_get_brightness_obj, - (mp_obj_t)&is31fl3741_FrameBuffer_set_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t is31fl3741_FrameBuffer_brightness_obj = MP_PROPERTY_GETSET(is31fl3741_FrameBuffer_brightness_obj, + (mp_obj_t)&is31fl3741_FrameBuffer_get_brightness_obj, + (mp_obj_t)&is31fl3741_FrameBuffer_set_brightness_obj); //| def refresh(self) -> None: //| """Transmits the color data in the buffer to the pixels so that @@ -195,12 +192,8 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_FrameBuffer_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_FrameBuffer_get_width_obj, is31fl3741_FrameBuffer_get_width); -const mp_obj_property_t is31fl3741_FrameBuffer_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&is31fl3741_FrameBuffer_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t is31fl3741_FrameBuffer_width_obj = MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_width_obj, + (mp_obj_t)&is31fl3741_FrameBuffer_get_width_obj); //| height: int //| """The height of the display, in pixels""" @@ -211,12 +204,8 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_get_height(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_FrameBuffer_get_height(self)); } MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_FrameBuffer_get_height_obj, is31fl3741_FrameBuffer_get_height); -const mp_obj_property_t is31fl3741_FrameBuffer_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&is31fl3741_FrameBuffer_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t is31fl3741_FrameBuffer_height_obj = MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_height_obj, + (mp_obj_t)&is31fl3741_FrameBuffer_get_height_obj); STATIC const mp_rom_map_elem_t is31fl3741_FrameBuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&is31fl3741_FrameBuffer_deinit_obj) }, diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c index 591a330bba..ac12da4d09 100644 --- a/shared-bindings/keypad/Event.c +++ b/shared-bindings/keypad/Event.c @@ -76,12 +76,8 @@ STATIC mp_obj_t keypad_event_get_key_number(mp_obj_t self_in) { } 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_number_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_event_get_key_number_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t keypad_event_key_number_obj = MP_PROPERTY_GETTER(keypad_event_key_number_obj, + (mp_obj_t)&keypad_event_get_key_number_obj); //| pressed: bool //| """``True`` if the event represents a key down (pressed) transition. @@ -94,12 +90,8 @@ STATIC mp_obj_t keypad_event_get_pressed(mp_obj_t self_in) { } 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, - .proxy = {(mp_obj_t)&keypad_event_get_pressed_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t keypad_event_pressed_obj = MP_PROPERTY_GETTER(keypad_event_pressed_obj, + (mp_obj_t)&keypad_event_get_pressed_obj); //| released: bool //| """``True`` if the event represents a key up (released) transition. @@ -112,12 +104,8 @@ STATIC mp_obj_t keypad_event_get_released(mp_obj_t self_in) { } 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, - .proxy = {(mp_obj_t)&keypad_event_get_released_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t keypad_event_released_obj = MP_PROPERTY_GETTER(keypad_event_released_obj, + (mp_obj_t)&keypad_event_get_released_obj); //| timestamp: int //| """The timestamp.""" @@ -128,12 +116,8 @@ STATIC mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_timestamp_obj, keypad_event_get_timestamp); -const mp_obj_property_t keypad_event_timestamp_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_event_get_timestamp_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t keypad_event_timestamp_obj = MP_PROPERTY_GETTER(keypad_event_timestamp_obj, + (mp_obj_t)&keypad_event_get_timestamp_obj); //| def __eq__(self, other: object) -> bool: diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c index 41dc292ba6..64a673e846 100644 --- a/shared-bindings/keypad/EventQueue.c +++ b/shared-bindings/keypad/EventQueue.c @@ -129,12 +129,8 @@ 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); -const mp_obj_property_t keypad_eventqueue_overflowed_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&keypad_eventqueue_get_overflowed_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t keypad_eventqueue_overflowed_obj = MP_PROPERTY_GETTER(keypad_eventqueue_overflowed_obj, + (mp_obj_t)&keypad_eventqueue_get_overflowed_obj); 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) }, diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c index ecded5561f..133144f993 100644 --- a/shared-bindings/mdns/RemoteService.c +++ b/shared-bindings/mdns/RemoteService.c @@ -52,12 +52,8 @@ STATIC mp_obj_t mdns_remoteservice_get_hostname(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_hostname_obj, mdns_remoteservice_get_hostname); -const mp_obj_property_t mdns_remoteservice_hostname_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_remoteservice_get_hostname_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t mdns_remoteservice_hostname_obj = MP_PROPERTY_GETTER(mdns_remoteservice_hostname_obj, + (mp_obj_t)&mdns_remoteservice_get_hostname_obj); //| instance_name: str //| """The human readable instance name for the service. (read-only)""" @@ -69,12 +65,8 @@ STATIC mp_obj_t remoteservice_get_instance_name(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_instance_name_obj, remoteservice_get_instance_name); -const mp_obj_property_t mdns_remoteservice_instance_name_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_remoteservice_get_instance_name_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t mdns_remoteservice_instance_name_obj = MP_PROPERTY_GETTER(mdns_remoteservice_instance_name_obj, + (mp_obj_t)&mdns_remoteservice_get_instance_name_obj); //| service_type: str //| """The service type string such as ``_http``. (read-only)""" @@ -86,12 +78,8 @@ STATIC mp_obj_t remoteservice_get_service_type(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_service_type_obj, remoteservice_get_service_type); -const mp_obj_property_t mdns_remoteservice_service_type_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_remoteservice_get_service_type_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t mdns_remoteservice_service_type_obj = MP_PROPERTY_GETTER(mdns_remoteservice_service_type_obj, + (mp_obj_t)&mdns_remoteservice_get_service_type_obj); //| protocol: str //| """The protocol string such as ``_tcp``. (read-only)""" @@ -103,12 +91,8 @@ STATIC mp_obj_t remoteservice_get_protocol(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_protocol_obj, remoteservice_get_protocol); -const mp_obj_property_t mdns_remoteservice_protocol_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_remoteservice_get_protocol_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t mdns_remoteservice_protocol_obj = MP_PROPERTY_GETTER(mdns_remoteservice_protocol_obj, + (mp_obj_t)&mdns_remoteservice_get_protocol_obj); //| port: int //| """Port number used for the service. (read-only)""" @@ -119,12 +103,8 @@ STATIC mp_obj_t remoteservice_get_port(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_port_obj, remoteservice_get_port); -const mp_obj_property_t mdns_remoteservice_port_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_remoteservice_get_port_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t mdns_remoteservice_port_obj = MP_PROPERTY_GETTER(mdns_remoteservice_port_obj, + (mp_obj_t)&mdns_remoteservice_get_port_obj); //| def __del__(self) -> None: //| """Deletes the RemoteService object.""" diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c index 132d218aeb..a196a9174a 100644 --- a/shared-bindings/mdns/Server.c +++ b/shared-bindings/mdns/Server.c @@ -99,12 +99,9 @@ static mp_obj_t mdns_server_set_hostname(mp_obj_t self, mp_obj_t hostname) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_hostname_obj, mdns_server_set_hostname); -const mp_obj_property_t mdns_server_hostname_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_server_get_hostname_obj, - (mp_obj_t)&mdns_server_set_hostname_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t mdns_server_hostname_obj = MP_PROPERTY_GETSET(mdns_server_hostname_obj, + (mp_obj_t)&mdns_server_get_hostname_obj, + (mp_obj_t)&mdns_server_set_hostname_obj); //| instance_name: str //| """Human readable name to describe the device.""" @@ -123,12 +120,9 @@ STATIC mp_obj_t mdns_server_set_instance_name(mp_obj_t self, mp_obj_t new_instan } MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_instance_name_obj, mdns_server_set_instance_name); -const mp_obj_property_t mdns_server_instance_name_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&mdns_server_get_instance_name_obj, - (mp_obj_t)&mdns_server_set_instance_name_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t mdns_server_instance_name_obj = MP_PROPERTY_GETSET(mdns_server_instance_name_obj, + (mp_obj_t)&mdns_server_get_instance_name_obj, + (mp_obj_t)&mdns_server_set_instance_name_obj); //| def find(self, service_type: str, protocol: str, *, timeout: float = 1) -> Tuple[RemoteService]: diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c index 5679b30c3f..0a72a1d440 100644 --- a/shared-bindings/memorymonitor/AllocationSize.c +++ b/shared-bindings/memorymonitor/AllocationSize.c @@ -105,12 +105,8 @@ STATIC mp_obj_t memorymonitor_allocationsize_obj_get_bytes_per_block(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationsize_get_bytes_per_block_obj, memorymonitor_allocationsize_obj_get_bytes_per_block); -const mp_obj_property_t memorymonitor_allocationsize_bytes_per_block_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&memorymonitor_allocationsize_get_bytes_per_block_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t memorymonitor_allocationsize_bytes_per_block_obj = MP_PROPERTY_GETTER(memorymonitor_allocationsize_bytes_per_block_obj, + (mp_obj_t)&memorymonitor_allocationsize_get_bytes_per_block_obj); //| def __len__(self) -> int: //| """Returns the number of allocation buckets. diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index 423480435e..cbdbd7ebcb 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -88,13 +88,9 @@ STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_frequency_obj, mcu_processor_get_frequency); -const mp_obj_property_t mcu_processor_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_get_frequency_obj, // getter - (mp_obj_t)&mcu_processor_set_frequency_obj, // setter - MP_ROM_NONE, // no deleter - }, -}; +const mp_obj_property_getset_t mcu_processor_frequency_obj = MP_PROPERTY_GETSET(mcu_processor_frequency_obj, + (mp_obj_t)&mcu_processor_get_frequency_obj, + (mp_obj_t)&mcu_processor_set_frequency_obj); //| reset_reason: microcontroller.ResetReason //| """The reason the microcontroller started up from reset state.""" @@ -105,13 +101,8 @@ STATIC mp_obj_t mcu_processor_get_reset_reason(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_reset_reason_obj, mcu_processor_get_reset_reason); -const mp_obj_property_t mcu_processor_reset_reason_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_get_reset_reason_obj, // getter - MP_ROM_NONE, // no setter - MP_ROM_NONE, // no deleter - }, -}; +const mp_obj_property_getter_t mcu_processor_reset_reason_obj = MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj, + (mp_obj_t)&mcu_processor_get_reset_reason_obj); //| temperature: Optional[float] //| """The on-chip temperature, in Celsius, as a float. (read-only) @@ -125,13 +116,8 @@ STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_temperature_obj, mcu_processor_get_temperature); -const mp_obj_property_t mcu_processor_temperature_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_get_temperature_obj, // getter - MP_ROM_NONE, // no setter - MP_ROM_NONE, // no deleter - }, -}; +const mp_obj_property_getter_t mcu_processor_temperature_obj = MP_PROPERTY_GETTER(mcu_processor_temperature_obj, + (mp_obj_t)&mcu_processor_get_temperature_obj); //| uid: bytearray //| """The unique id (aka serial number) of the chip as a `bytearray`. (read-only)""" @@ -144,13 +130,8 @@ STATIC mp_obj_t mcu_processor_get_uid(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_uid_obj, mcu_processor_get_uid); -const mp_obj_property_t mcu_processor_uid_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_get_uid_obj, // getter - MP_ROM_NONE, // no setter - MP_ROM_NONE, // no deleter - }, -}; +const mp_obj_property_getter_t mcu_processor_uid_obj = MP_PROPERTY_GETTER(mcu_processor_uid_obj, + (mp_obj_t)&mcu_processor_get_uid_obj); //| voltage: Optional[float] //| """The input voltage to the microcontroller, as a float. (read-only) @@ -164,13 +145,8 @@ STATIC mp_obj_t mcu_processor_get_voltage(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_voltage_obj, mcu_processor_get_voltage); -const mp_obj_property_t mcu_processor_voltage_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mcu_processor_get_voltage_obj, // getter - MP_ROM_NONE, // no setter - MP_ROM_NONE, // no deleter - }, -}; +const mp_obj_property_getter_t mcu_processor_voltage_obj = MP_PROPERTY_GETTER(mcu_processor_voltage_obj, + (mp_obj_t)&mcu_processor_get_voltage_obj); STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&mcu_processor_frequency_obj) }, diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c index 892dd91696..822bf64977 100644 --- a/shared-bindings/msgpack/ExtType.c +++ b/shared-bindings/msgpack/ExtType.c @@ -80,12 +80,9 @@ STATIC mp_obj_t mod_msgpack_exttype_set_code(mp_obj_t self_in, mp_obj_t code_in) } MP_DEFINE_CONST_FUN_OBJ_2(mod_msgpack_exttype_set_code_obj, mod_msgpack_exttype_set_code); -const mp_obj_property_t mod_msgpack_exttype_code_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mod_msgpack_exttype_get_code_obj, - (mp_obj_t)&mod_msgpack_exttype_set_code_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t mod_msgpack_exttype_code_obj = MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj, + (mp_obj_t)&mod_msgpack_exttype_get_code_obj, + (mp_obj_t)&mod_msgpack_exttype_set_code_obj); //| data: bytes //| """Data.""" @@ -104,12 +101,9 @@ STATIC mp_obj_t mod_msgpack_exttype_set_data(mp_obj_t self_in, mp_obj_t data_in) } MP_DEFINE_CONST_FUN_OBJ_2(mod_msgpack_exttype_set_data_obj, mod_msgpack_exttype_set_data); -const mp_obj_property_t mod_msgpack_exttype_data_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&mod_msgpack_exttype_get_data_obj, - (mp_obj_t)&mod_msgpack_exttype_set_data_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t mod_msgpack_exttype_data_obj = MP_PROPERTY_GETSET(mod_msgpack_exttype_data_obj, + (mp_obj_t)&mod_msgpack_exttype_get_data_obj, + (mp_obj_t)&mod_msgpack_exttype_set_data_obj); STATIC mp_rom_map_elem_t mod_msgpack_exttype_locals_dict_table[] = { // Properties diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c index 13721c8106..8f325034c9 100644 --- a/shared-bindings/pulseio/PulseIn.c +++ b/shared-bindings/pulseio/PulseIn.c @@ -208,12 +208,8 @@ STATIC mp_obj_t pulseio_pulsein_obj_get_maxlen(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_get_maxlen_obj, pulseio_pulsein_obj_get_maxlen); -const mp_obj_property_t pulseio_pulsein_maxlen_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pulseio_pulsein_get_maxlen_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t pulseio_pulsein_maxlen_obj = MP_PROPERTY_GETTER(pulseio_pulsein_maxlen_obj, + (mp_obj_t)&pulseio_pulsein_get_maxlen_obj); //| paused: bool //| """True when pulse capture is paused as a result of :py:func:`pause` or an error during capture @@ -227,12 +223,8 @@ STATIC mp_obj_t pulseio_pulsein_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_get_paused_obj, pulseio_pulsein_obj_get_paused); -const mp_obj_property_t pulseio_pulsein_paused_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pulseio_pulsein_get_paused_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t pulseio_pulsein_paused_obj = MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj, + (mp_obj_t)&pulseio_pulsein_get_paused_obj); //| def __bool__(self) -> bool: ... //| diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c index 1c0110653b..42207f8974 100644 --- a/shared-bindings/pwmio/PWMOut.c +++ b/shared-bindings/pwmio/PWMOut.c @@ -220,12 +220,9 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t duty_ } MP_DEFINE_CONST_FUN_OBJ_2(pwmio_pwmout_set_duty_cycle_obj, pwmio_pwmout_obj_set_duty_cycle); -const mp_obj_property_t pwmio_pwmout_duty_cycle_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pwmio_pwmout_get_duty_cycle_obj, - (mp_obj_t)&pwmio_pwmout_set_duty_cycle_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t pwmio_pwmout_duty_cycle_obj = MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj, + (mp_obj_t)&pwmio_pwmout_get_duty_cycle_obj, + (mp_obj_t)&pwmio_pwmout_set_duty_cycle_obj); //| frequency: int //| """32 bit value that dictates the PWM frequency in Hertz (cycles per @@ -261,12 +258,9 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t freque } MP_DEFINE_CONST_FUN_OBJ_2(pwmio_pwmout_set_frequency_obj, pwmio_pwmout_obj_set_frequency); -const mp_obj_property_t pwmio_pwmout_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&pwmio_pwmout_get_frequency_obj, - (mp_obj_t)&pwmio_pwmout_set_frequency_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t pwmio_pwmout_frequency_obj = MP_PROPERTY_GETSET(pwmio_pwmout_frequency_obj, + (mp_obj_t)&pwmio_pwmout_get_frequency_obj, + (mp_obj_t)&pwmio_pwmout_set_frequency_obj); STATIC const mp_rom_map_elem_t pwmio_pwmout_locals_dict_table[] = { // Methods diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c index c8382de42e..f7d3578b95 100644 --- a/shared-bindings/qrio/QRDecoder.c +++ b/shared-bindings/qrio/QRDecoder.c @@ -107,12 +107,9 @@ STATIC mp_obj_t qrio_qrdecoder_set_width(mp_obj_t self_in, mp_obj_t width_in) { } MP_DEFINE_CONST_FUN_OBJ_2(qrio_qrdecoder_set_width_obj, qrio_qrdecoder_set_width); -const mp_obj_property_t qrio_qrdecoder_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&qrio_qrdecoder_get_width_obj, - (mp_obj_t)&qrio_qrdecoder_set_width_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t qrio_qrdecoder_width_obj = MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj, + (mp_obj_t)&qrio_qrdecoder_get_width_obj, + (mp_obj_t)&qrio_qrdecoder_set_width_obj); //| height: int //| """The height of image the decoder expects""" @@ -131,12 +128,9 @@ STATIC mp_obj_t qrio_qrdecoder_set_height(mp_obj_t self_in, mp_obj_t height_in) } MP_DEFINE_CONST_FUN_OBJ_2(qrio_qrdecoder_set_height_obj, qrio_qrdecoder_set_height); -const mp_obj_property_t qrio_qrdecoder_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&qrio_qrdecoder_get_height_obj, - (mp_obj_t)&qrio_qrdecoder_set_height_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t qrio_qrdecoder_height_obj = MP_PROPERTY_GETSET(qrio_qrdecoder_height_obj, + (mp_obj_t)&qrio_qrdecoder_get_height_obj, + (mp_obj_t)&qrio_qrdecoder_set_height_obj); STATIC const mp_rom_map_elem_t qrio_qrdecoder_locals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_QRDecoder) }, diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c index 70d6328ab0..c48b550a06 100644 --- a/shared-bindings/rgbmatrix/RGBMatrix.c +++ b/shared-bindings/rgbmatrix/RGBMatrix.c @@ -310,12 +310,9 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_set_brightness(mp_obj_t self_in, mp_obj_t va } MP_DEFINE_CONST_FUN_OBJ_2(rgbmatrix_rgbmatrix_set_brightness_obj, rgbmatrix_rgbmatrix_set_brightness); -const mp_obj_property_t rgbmatrix_rgbmatrix_brightness_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rgbmatrix_rgbmatrix_get_brightness_obj, - (mp_obj_t)&rgbmatrix_rgbmatrix_set_brightness_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rgbmatrix_rgbmatrix_brightness_obj = MP_PROPERTY_GETSET(rgbmatrix_rgbmatrix_brightness_obj, + (mp_obj_t)&rgbmatrix_rgbmatrix_get_brightness_obj, + (mp_obj_t)&rgbmatrix_rgbmatrix_set_brightness_obj); //| def refresh(self) -> None: //| """Transmits the color data in the buffer to the pixels so that @@ -339,12 +336,8 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_rgbmatrix_rgbmatrix_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_width_obj, rgbmatrix_rgbmatrix_get_width); -const mp_obj_property_t rgbmatrix_rgbmatrix_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rgbmatrix_rgbmatrix_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t rgbmatrix_rgbmatrix_width_obj = MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj, + (mp_obj_t)&rgbmatrix_rgbmatrix_get_width_obj); //| height: int //| """The height of the display, in pixels""" @@ -356,12 +349,8 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_height_obj, rgbmatrix_rgbmatrix_get_height); -const mp_obj_property_t rgbmatrix_rgbmatrix_height_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rgbmatrix_rgbmatrix_get_height_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t rgbmatrix_rgbmatrix_height_obj = MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_height_obj, + (mp_obj_t)&rgbmatrix_rgbmatrix_get_height_obj); STATIC const mp_rom_map_elem_t rgbmatrix_rgbmatrix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rgbmatrix_rgbmatrix_deinit_obj) }, diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c index 7793e12837..b80751fce3 100644 --- a/shared-bindings/rotaryio/IncrementalEncoder.c +++ b/shared-bindings/rotaryio/IncrementalEncoder.c @@ -141,12 +141,9 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_divisor(mp_obj_t self_in, mp } MP_DEFINE_CONST_FUN_OBJ_2(rotaryio_incrementalencoder_set_divisor_obj, rotaryio_incrementalencoder_obj_set_divisor); -const mp_obj_property_t rotaryio_incrementalencoder_divisor_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rotaryio_incrementalencoder_get_divisor_obj, - (mp_obj_t)&rotaryio_incrementalencoder_set_divisor_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rotaryio_incrementalencoder_divisor_obj = MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj, + (mp_obj_t)&rotaryio_incrementalencoder_get_divisor_obj, + (mp_obj_t)&rotaryio_incrementalencoder_set_divisor_obj); //| position: int //| """The current position in terms of pulses. The number of pulses per rotation is defined by the @@ -169,12 +166,9 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_position(mp_obj_t self_in, m } MP_DEFINE_CONST_FUN_OBJ_2(rotaryio_incrementalencoder_set_position_obj, rotaryio_incrementalencoder_obj_set_position); -const mp_obj_property_t rotaryio_incrementalencoder_position_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rotaryio_incrementalencoder_get_position_obj, - (mp_obj_t)&rotaryio_incrementalencoder_set_position_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rotaryio_incrementalencoder_position_obj = MP_PROPERTY_GETSET(rotaryio_incrementalencoder_position_obj, + (mp_obj_t)&rotaryio_incrementalencoder_get_position_obj, + (mp_obj_t)&rotaryio_incrementalencoder_set_position_obj); STATIC const mp_rom_map_elem_t rotaryio_incrementalencoder_locals_dict_table[] = { // Methods diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index f52871c7da..381477f5e8 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -87,12 +87,9 @@ STATIC mp_obj_t rtc_rtc_obj_set_datetime(mp_obj_t self_in, mp_obj_t datetime) { } MP_DEFINE_CONST_FUN_OBJ_2(rtc_rtc_set_datetime_obj, rtc_rtc_obj_set_datetime); -const mp_obj_property_t rtc_rtc_datetime_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rtc_rtc_get_datetime_obj, - (mp_obj_t)&rtc_rtc_set_datetime_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rtc_rtc_datetime_obj = MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, + (mp_obj_t)&rtc_rtc_get_datetime_obj, + (mp_obj_t)&rtc_rtc_set_datetime_obj); //| calibration: int //| """The RTC calibration value as an `int`. @@ -118,12 +115,9 @@ STATIC mp_obj_t rtc_rtc_obj_set_calibration(mp_obj_t self_in, mp_obj_t calibrati } MP_DEFINE_CONST_FUN_OBJ_2(rtc_rtc_set_calibration_obj, rtc_rtc_obj_set_calibration); -const mp_obj_property_t rtc_rtc_calibration_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&rtc_rtc_get_calibration_obj, - (mp_obj_t)&rtc_rtc_set_calibration_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t rtc_rtc_calibration_obj = MP_PROPERTY_GETSET(rtc_rtc_calibration_obj, + (mp_obj_t)&rtc_rtc_get_calibration_obj, + (mp_obj_t)&rtc_rtc_set_calibration_obj); STATIC const mp_rom_map_elem_t rtc_rtc_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&rtc_rtc_datetime_obj) }, diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index c4b23ea594..a3d4988a00 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -218,12 +218,8 @@ STATIC mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_frequency_obj, sdioio_sdcard_obj_get_frequency); -const mp_obj_property_t sdioio_sdcard_frequency_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&sdioio_sdcard_get_frequency_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t sdioio_sdcard_frequency_obj = MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj, + (mp_obj_t)&sdioio_sdcard_get_frequency_obj); //| @property //| def width(self) -> int: @@ -237,12 +233,8 @@ STATIC mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_width_obj, sdioio_sdcard_obj_get_width); -const mp_obj_property_t sdioio_sdcard_width_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&sdioio_sdcard_get_width_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t sdioio_sdcard_width_obj = MP_PROPERTY_GETTER(sdioio_sdcard_width_obj, + (mp_obj_t)&sdioio_sdcard_get_width_obj); //| def deinit(self) -> None: //| """Disable permanently. diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c index 2b38768f6a..797452c4b9 100644 --- a/shared-bindings/ssl/SSLContext.c +++ b/shared-bindings/ssl/SSLContext.c @@ -105,12 +105,9 @@ STATIC mp_obj_t ssl_sslcontext_set_check_hostname(mp_obj_t self_in, mp_obj_t val } STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslcontext_set_check_hostname_obj, ssl_sslcontext_set_check_hostname); -const mp_obj_property_t ssl_sslcontext_check_hostname_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&ssl_sslcontext_get_check_hostname_obj, - (mp_obj_t)&ssl_sslcontext_set_check_hostname_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t ssl_sslcontext_check_hostname_obj = MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj, + (mp_obj_t)&ssl_sslcontext_get_check_hostname_obj, + (mp_obj_t)&ssl_sslcontext_set_check_hostname_obj); //| def wrap_socket(self, sock: socketpool.Socket, *, server_side: bool = False, server_hostname: Optional[str] = None) -> ssl.SSLSocket: //| """Wraps the socket into a socket-compatible class that handles SSL negotiation. diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c index 08d68ec93f..61de120f2d 100644 --- a/shared-bindings/supervisor/Runtime.c +++ b/shared-bindings/supervisor/Runtime.c @@ -69,12 +69,8 @@ STATIC mp_obj_t supervisor_runtime_get_usb_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_usb_connected_obj, supervisor_runtime_get_usb_connected); -const mp_obj_property_t supervisor_runtime_usb_connected_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&supervisor_runtime_get_usb_connected_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t supervisor_runtime_usb_connected_obj = MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj, + (mp_obj_t)&supervisor_runtime_get_usb_connected_obj); //| serial_connected: bool //| """Returns the USB serial communication status (read-only).""" @@ -84,12 +80,8 @@ STATIC mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_connected_obj, supervisor_runtime_get_serial_connected); -const mp_obj_property_t supervisor_runtime_serial_connected_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&supervisor_runtime_get_serial_connected_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t supervisor_runtime_serial_connected_obj = MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj, + (mp_obj_t)&supervisor_runtime_get_serial_connected_obj); //| serial_bytes_available: int //| """Returns the whether any bytes are available to read @@ -101,12 +93,8 @@ STATIC mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_bytes_available_obj, supervisor_runtime_get_serial_bytes_available); -const mp_obj_property_t supervisor_runtime_serial_bytes_available_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&supervisor_runtime_get_serial_bytes_available_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t supervisor_runtime_serial_bytes_available_obj = MP_PROPERTY_GETTER(supervisor_runtime_serial_bytes_available_obj, + (mp_obj_t)&supervisor_runtime_get_serial_bytes_available_obj); supervisor_run_reason_t supervisor_get_run_reason(void) { return _run_reason; @@ -124,12 +112,8 @@ STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_run_reason_obj, supervisor_runtime_get_run_reason); -const mp_obj_property_t supervisor_runtime_run_reason_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&supervisor_runtime_get_run_reason_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t supervisor_runtime_run_reason_obj = MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj, + (mp_obj_t)&supervisor_runtime_get_run_reason_obj); STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_usb_connected), MP_ROM_PTR(&supervisor_runtime_usb_connected_obj) }, diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c index 1fb3fdbec1..8c42358340 100644 --- a/shared-bindings/synthio/MidiTrack.c +++ b/shared-bindings/synthio/MidiTrack.c @@ -132,12 +132,8 @@ STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_sample_rate_obj, synthio_miditrack_obj_get_sample_rate); -const mp_obj_property_t synthio_miditrack_sample_rate_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&synthio_miditrack_get_sample_rate_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t synthio_miditrack_sample_rate_obj = MP_PROPERTY_GETTER(synthio_miditrack_sample_rate_obj, + (mp_obj_t)&synthio_miditrack_get_sample_rate_obj); STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = { // Methods diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c index 537ae29776..bd80285779 100644 --- a/shared-bindings/touchio/TouchIn.c +++ b/shared-bindings/touchio/TouchIn.c @@ -120,12 +120,8 @@ STATIC mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_value_obj, touchio_touchin_obj_get_value); -const mp_obj_property_t touchio_touchin_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&touchio_touchin_get_value_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t touchio_touchin_value_obj = MP_PROPERTY_GETTER(touchio_touchin_value_obj, + (mp_obj_t)&touchio_touchin_get_value_obj); //| raw_value: int @@ -139,12 +135,8 @@ STATIC mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_raw_value_obj, touchio_touchin_obj_get_raw_value); -const mp_obj_property_t touchio_touchin_raw_value_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&touchio_touchin_get_raw_value_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t touchio_touchin_raw_value_obj = MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj, + (mp_obj_t)&touchio_touchin_get_raw_value_obj); //| threshold: Optional[int] @@ -183,12 +175,9 @@ STATIC mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t thr MP_DEFINE_CONST_FUN_OBJ_2(touchio_touchin_set_threshold_obj, touchio_touchin_obj_set_threshold); -const mp_obj_property_t touchio_touchin_threshold_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&touchio_touchin_get_threshold_obj, - (mp_obj_t)&touchio_touchin_set_threshold_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t touchio_touchin_threshold_obj = MP_PROPERTY_GETSET(touchio_touchin_threshold_obj, + (mp_obj_t)&touchio_touchin_get_threshold_obj, + (mp_obj_t)&touchio_touchin_set_threshold_obj); STATIC const mp_rom_map_elem_t touchio_touchin_locals_dict_table[] = { diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c index 6828a6b6f7..f6da33adc7 100644 --- a/shared-bindings/usb/core/Device.c +++ b/shared-bindings/usb/core/Device.c @@ -79,12 +79,8 @@ STATIC mp_obj_t usb_core_device_obj_get_idVendor(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_idVendor_obj, usb_core_device_obj_get_idVendor); -const mp_obj_property_t usb_core_device_idVendor_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_core_device_get_idVendor_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_core_device_idVendor_obj = MP_PROPERTY_GETTER(usb_core_device_idVendor_obj, + (mp_obj_t)&usb_core_device_get_idVendor_obj); //| idProduct: int //| """The USB product ID of the device""" @@ -95,12 +91,8 @@ STATIC mp_obj_t usb_core_device_obj_get_idProduct(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_idProduct_obj, usb_core_device_obj_get_idProduct); -const mp_obj_property_t usb_core_device_idProduct_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_core_device_get_idProduct_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_core_device_idProduct_obj = MP_PROPERTY_GETTER(usb_core_device_idProduct_obj, + (mp_obj_t)&usb_core_device_get_idProduct_obj); //| serial_number: str //| """The USB device's serial number string.""" @@ -111,12 +103,8 @@ STATIC mp_obj_t usb_core_device_obj_get_serial_number(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_serial_number_obj, usb_core_device_obj_get_serial_number); -const mp_obj_property_t usb_core_device_serial_number_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_core_device_get_serial_number_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_core_device_serial_number_obj = MP_PROPERTY_GETTER(usb_core_device_serial_number_obj, + (mp_obj_t)&usb_core_device_get_serial_number_obj); //| product: str //| """The USB device's product string.""" @@ -127,12 +115,8 @@ STATIC mp_obj_t usb_core_device_obj_get_product(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_product_obj, usb_core_device_obj_get_product); -const mp_obj_property_t usb_core_device_product_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_core_device_get_product_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_core_device_product_obj = MP_PROPERTY_GETTER(usb_core_device_product_obj, + (mp_obj_t)&usb_core_device_get_product_obj); //| manufacturer: str //| """The USB device's manufacturer string.""" @@ -143,12 +127,8 @@ STATIC mp_obj_t usb_core_device_obj_get_manufacturer(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_manufacturer_obj, usb_core_device_obj_get_manufacturer); -const mp_obj_property_t usb_core_device_manufacturer_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_core_device_get_manufacturer_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_core_device_manufacturer_obj = MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj, + (mp_obj_t)&usb_core_device_get_manufacturer_obj); //| def write(self, endpoint: int, data: ReadableBuffer, timeout = None) -> int: //| """Write data to a specific endpoint on the device. diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c index 95ecb98ccd..610802d2f1 100644 --- a/shared-bindings/usb_cdc/Serial.c +++ b/shared-bindings/usb_cdc/Serial.c @@ -157,12 +157,8 @@ STATIC mp_obj_t usb_cdc_serial_get_connected(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_connected_obj, usb_cdc_serial_get_connected); -const mp_obj_property_t usb_cdc_serial_connected_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_cdc_serial_get_connected_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_cdc_serial_connected_obj = MP_PROPERTY_GETTER(usb_cdc_serial_connected_obj, + (mp_obj_t)&usb_cdc_serial_get_connected_obj); //| in_waiting: int //| """Returns the number of bytes waiting to be read on the USB serial input. (read-only)""" @@ -173,12 +169,8 @@ STATIC mp_obj_t usb_cdc_serial_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_in_waiting_obj, usb_cdc_serial_get_in_waiting); -const mp_obj_property_t usb_cdc_serial_in_waiting_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_cdc_serial_get_in_waiting_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_cdc_serial_in_waiting_obj = MP_PROPERTY_GETTER(usb_cdc_serial_in_waiting_obj, + (mp_obj_t)&usb_cdc_serial_get_in_waiting_obj); //| out_waiting: int //| """Returns the number of bytes waiting to be written on the USB serial output. (read-only)""" @@ -189,12 +181,8 @@ STATIC mp_obj_t usb_cdc_serial_get_out_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_out_waiting_obj, usb_cdc_serial_get_out_waiting); -const mp_obj_property_t usb_cdc_serial_out_waiting_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_cdc_serial_get_out_waiting_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_cdc_serial_out_waiting_obj = MP_PROPERTY_GETTER(usb_cdc_serial_out_waiting_obj, + (mp_obj_t)&usb_cdc_serial_get_out_waiting_obj); //| def reset_input_buffer(self) -> None: //| """Clears any unread bytes.""" @@ -237,12 +225,9 @@ STATIC mp_obj_t usb_cdc_serial_set_timeout(mp_obj_t self_in, mp_obj_t timeout_in } MP_DEFINE_CONST_FUN_OBJ_2(usb_cdc_serial_set_timeout_obj, usb_cdc_serial_set_timeout); -const mp_obj_property_t usb_cdc_serial_timeout_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_cdc_serial_get_timeout_obj, - (mp_obj_t)&usb_cdc_serial_set_timeout_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t usb_cdc_serial_timeout_obj = MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj, + (mp_obj_t)&usb_cdc_serial_get_timeout_obj, + (mp_obj_t)&usb_cdc_serial_set_timeout_obj); //| write_timeout: Optional[float] //| """The initial value of `write_timeout` is ``None``. If ``None``, wait indefinitely to finish @@ -264,12 +249,9 @@ STATIC mp_obj_t usb_cdc_serial_set_write_timeout(mp_obj_t self_in, mp_obj_t writ } MP_DEFINE_CONST_FUN_OBJ_2(usb_cdc_serial_set_write_timeout_obj, usb_cdc_serial_set_write_timeout); -const mp_obj_property_t usb_cdc_serial_write_timeout_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_cdc_serial_get_write_timeout_obj, - (mp_obj_t)&usb_cdc_serial_set_write_timeout_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t usb_cdc_serial_write_timeout_obj = MP_PROPERTY_GETSET(usb_cdc_serial_write_timeout_obj, + (mp_obj_t)&usb_cdc_serial_get_write_timeout_obj, + (mp_obj_t)&usb_cdc_serial_set_write_timeout_obj); STATIC const mp_rom_map_elem_t usb_cdc_serial_locals_dict_table[] = { diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 50f67e90cb..2e6527dada 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -236,12 +236,8 @@ STATIC mp_obj_t usb_hid_device_obj_get_last_received_report_property(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_last_received_report_property_obj, usb_hid_device_obj_get_last_received_report_property); -const mp_obj_property_t usb_hid_device_last_received_report_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_hid_device_get_last_received_report_property_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_hid_device_last_received_report_obj = MP_PROPERTY_GETTER(usb_hid_device_last_received_report_obj, + (mp_obj_t)&usb_hid_device_get_last_received_report_property_obj); //| usage_page: int //| """The device usage page identifier, which designates a category of device. (read-only)""" @@ -252,12 +248,8 @@ STATIC mp_obj_t usb_hid_device_obj_get_usage_page(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_usage_page_obj, usb_hid_device_obj_get_usage_page); -const mp_obj_property_t usb_hid_device_usage_page_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_hid_device_get_usage_page_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_hid_device_usage_page_obj = MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj, + (mp_obj_t)&usb_hid_device_get_usage_page_obj); //| usage: int //| """The device usage identifier, which designates a specific kind of device. (read-only) @@ -272,12 +264,8 @@ STATIC mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_usage_obj, usb_hid_device_obj_get_usage); -const mp_obj_property_t usb_hid_device_usage_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&usb_hid_device_get_usage_obj, - MP_ROM_NONE, - MP_ROM_NONE}, -}; +const mp_obj_property_getter_t usb_hid_device_usage_obj = MP_PROPERTY_GETTER(usb_hid_device_usage_obj, + (mp_obj_t)&usb_hid_device_get_usage_obj); STATIC const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_send_report), MP_ROM_PTR(&usb_hid_device_send_report_obj) }, diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c index 289bab031c..f29f0de45d 100644 --- a/shared-bindings/vectorio/Circle.c +++ b/shared-bindings/vectorio/Circle.c @@ -76,12 +76,9 @@ STATIC mp_obj_t vectorio_circle_obj_set_radius(mp_obj_t self_in, mp_obj_t radius } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_circle_set_radius_obj, vectorio_circle_obj_set_radius); -const mp_obj_property_t vectorio_circle_radius_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_circle_get_radius_obj, - (mp_obj_t)&vectorio_circle_set_radius_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_circle_radius_obj = MP_PROPERTY_GETSET(vectorio_circle_radius_obj, + (mp_obj_t)&vectorio_circle_get_radius_obj, + (mp_obj_t)&vectorio_circle_set_radius_obj); //| color_index : int //| """The color_index of the circle as 0 based index of the palette.""" @@ -99,12 +96,9 @@ STATIC mp_obj_t vectorio_circle_obj_set_color_index(mp_obj_t self_in, mp_obj_t c } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_circle_set_color_index_obj, vectorio_circle_obj_set_color_index); -const mp_obj_property_t vectorio_circle_color_index_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_circle_get_color_index_obj, - (mp_obj_t)&vectorio_circle_set_color_index_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_circle_color_index_obj = MP_PROPERTY_GETSET(vectorio_circle_color_index_obj, + (mp_obj_t)&vectorio_circle_get_color_index_obj, + (mp_obj_t)&vectorio_circle_set_color_index_obj); // Documentation for properties inherited from VectorShape. diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c index ea33baad55..3814656fff 100644 --- a/shared-bindings/vectorio/Polygon.c +++ b/shared-bindings/vectorio/Polygon.c @@ -82,12 +82,9 @@ STATIC mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t point } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_points_obj, vectorio_polygon_obj_set_points); -const mp_obj_property_t vectorio_polygon_points_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_polygon_get_points_obj, - (mp_obj_t)&vectorio_polygon_set_points_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_polygon_points_obj = MP_PROPERTY_GETSET(vectorio_polygon_points_obj, + (mp_obj_t)&vectorio_polygon_get_points_obj, + (mp_obj_t)&vectorio_polygon_set_points_obj); //| color_index : int //| """The color_index of the polygon as 0 based index of the palette.""" @@ -105,12 +102,9 @@ STATIC mp_obj_t vectorio_polygon_obj_set_color_index(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_color_index_obj, vectorio_polygon_obj_set_color_index); -const mp_obj_property_t vectorio_polygon_color_index_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_polygon_get_color_index_obj, - (mp_obj_t)&vectorio_polygon_set_color_index_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_polygon_color_index_obj = MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj, + (mp_obj_t)&vectorio_polygon_get_color_index_obj, + (mp_obj_t)&vectorio_polygon_set_color_index_obj); // Documentation for properties inherited from VectorShape. diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c index 3293466cc4..952314e344 100644 --- a/shared-bindings/vectorio/VectorShape.c +++ b/shared-bindings/vectorio/VectorShape.c @@ -120,12 +120,9 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_x(mp_obj_t wrapper_shape, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_x_obj, vectorio_vector_shape_obj_set_x); -const mp_obj_property_t vectorio_vector_shape_x_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_vector_shape_get_x_obj, - (mp_obj_t)&vectorio_vector_shape_set_x_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_vector_shape_x_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_x_obj, + (mp_obj_t)&vectorio_vector_shape_get_x_obj, + (mp_obj_t)&vectorio_vector_shape_set_x_obj); // y: int @@ -151,12 +148,9 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_y(mp_obj_t wrapper_shape, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_y_obj, vectorio_vector_shape_obj_set_y); -const mp_obj_property_t vectorio_vector_shape_y_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_vector_shape_get_y_obj, - (mp_obj_t)&vectorio_vector_shape_set_y_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_vector_shape_y_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_y_obj, + (mp_obj_t)&vectorio_vector_shape_get_y_obj, + (mp_obj_t)&vectorio_vector_shape_set_y_obj); // location: Tuple[int, int] @@ -181,12 +175,9 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_location(mp_obj_t wrapper_shape, m } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_location_obj, vectorio_vector_shape_obj_set_location); -const mp_obj_property_t vectorio_vector_shape_location_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_vector_shape_get_location_obj, - (mp_obj_t)&vectorio_vector_shape_set_location_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_vector_shape_location_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_location_obj, + (mp_obj_t)&vectorio_vector_shape_get_location_obj, + (mp_obj_t)&vectorio_vector_shape_set_location_obj); // pixel_shader: Union[ColorConverter, Palette] @@ -216,12 +207,9 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_pixel_shader(mp_obj_t wrapper_shap } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_pixel_shader_obj, vectorio_vector_shape_obj_set_pixel_shader); -const mp_obj_property_t vectorio_vector_shape_pixel_shader_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&vectorio_vector_shape_get_pixel_shader_obj, - (mp_obj_t)&vectorio_vector_shape_set_pixel_shader_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t vectorio_vector_shape_pixel_shader_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_pixel_shader_obj, + (mp_obj_t)&vectorio_vector_shape_get_pixel_shader_obj, + (mp_obj_t)&vectorio_vector_shape_set_pixel_shader_obj); STATIC const mp_rom_map_elem_t vectorio_vector_shape_locals_dict_table[] = { diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c index 13ab99f50e..1246fb80b1 100644 --- a/shared-bindings/watchdog/WatchDogTimer.c +++ b/shared-bindings/watchdog/WatchDogTimer.c @@ -107,12 +107,9 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_timeout_obj, watchdog_watchdogtimer_obj_set_timeout); -const mp_obj_property_t watchdog_watchdogtimer_timeout_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_timeout_obj, - (mp_obj_t)&watchdog_watchdogtimer_set_timeout_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t watchdog_watchdogtimer_timeout_obj = MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj, + (mp_obj_t)&watchdog_watchdogtimer_get_timeout_obj, + (mp_obj_t)&watchdog_watchdogtimer_set_timeout_obj); //| mode: WatchDogMode //| """The current operating mode of the WatchDogTimer `watchdog.WatchDogMode`. @@ -158,12 +155,9 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t m } MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_mode_obj, watchdog_watchdogtimer_obj_set_mode); -const mp_obj_property_t watchdog_watchdogtimer_mode_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_mode_obj, - (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t watchdog_watchdogtimer_mode_obj = MP_PROPERTY_GETSET(watchdog_watchdogtimer_mode_obj, + (mp_obj_t)&watchdog_watchdogtimer_get_mode_obj, + (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj); STATIC const mp_rom_map_elem_t watchdog_watchdogtimer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&watchdog_watchdogtimer_feed_obj) }, diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c index 4e5235ea88..a6a4c7d68b 100644 --- a/shared-bindings/wifi/Monitor.c +++ b/shared-bindings/wifi/Monitor.c @@ -92,12 +92,9 @@ STATIC mp_obj_t wifi_monitor_obj_set_channel(mp_obj_t self_in, mp_obj_t channel) } MP_DEFINE_CONST_FUN_OBJ_2(wifi_monitor_set_channel_obj, wifi_monitor_obj_set_channel); -const mp_obj_property_t wifi_monitor_channel_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_monitor_get_channel_obj, - (mp_obj_t)&wifi_monitor_set_channel_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t wifi_monitor_channel_obj = MP_PROPERTY_GETSET(wifi_monitor_channel_obj, + (mp_obj_t)&wifi_monitor_get_channel_obj, + (mp_obj_t)&wifi_monitor_set_channel_obj); //| queue: int //| """The queue size for buffering the packet.""" @@ -107,12 +104,8 @@ STATIC mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_queue_obj, wifi_monitor_obj_get_queue); -const mp_obj_property_t wifi_monitor_queue_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_monitor_get_queue_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_monitor_queue_obj = MP_PROPERTY_GETTER(wifi_monitor_queue_obj, + (mp_obj_t)&wifi_monitor_get_queue_obj); //| def deinit(self) -> None: //| """De-initialize `wifi.Monitor` singleton.""" diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c index 11053e629e..1cc12f03cb 100644 --- a/shared-bindings/wifi/Network.c +++ b/shared-bindings/wifi/Network.c @@ -50,12 +50,8 @@ STATIC mp_obj_t wifi_network_get_ssid(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_ssid_obj, wifi_network_get_ssid); -const mp_obj_property_t wifi_network_ssid_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_ssid_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_ssid_obj = MP_PROPERTY_GETTER(wifi_network_ssid_obj, + (mp_obj_t)&wifi_network_get_ssid_obj); //| bssid: bytes @@ -67,12 +63,8 @@ STATIC mp_obj_t wifi_network_get_bssid(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_bssid_obj, wifi_network_get_bssid); -const mp_obj_property_t wifi_network_bssid_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_bssid_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_bssid_obj = MP_PROPERTY_GETTER(wifi_network_bssid_obj, + (mp_obj_t)&wifi_network_get_bssid_obj); //| rssi: int @@ -84,12 +76,8 @@ STATIC mp_obj_t wifi_network_get_rssi(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_rssi_obj, wifi_network_get_rssi); -const mp_obj_property_t wifi_network_rssi_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_rssi_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_rssi_obj = MP_PROPERTY_GETTER(wifi_network_rssi_obj, + (mp_obj_t)&wifi_network_get_rssi_obj); //| channel: int @@ -101,12 +89,8 @@ STATIC mp_obj_t wifi_network_get_channel(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_channel_obj, wifi_network_get_channel); -const mp_obj_property_t wifi_network_channel_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_channel_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_channel_obj = MP_PROPERTY_GETTER(wifi_network_channel_obj, + (mp_obj_t)&wifi_network_get_channel_obj); //| country: str //| """String id of the country code""" @@ -117,12 +101,8 @@ STATIC mp_obj_t wifi_network_get_country(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_country_obj, wifi_network_get_country); -const mp_obj_property_t wifi_network_country_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_country_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_country_obj = MP_PROPERTY_GETTER(wifi_network_country_obj, + (mp_obj_t)&wifi_network_get_country_obj); //| authmode: str //| """String id of the authmode""" @@ -133,12 +113,8 @@ STATIC mp_obj_t wifi_network_get_authmode(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_authmode_obj, wifi_network_get_authmode); -const mp_obj_property_t wifi_network_authmode_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_network_get_authmode_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_network_authmode_obj = MP_PROPERTY_GETTER(wifi_network_authmode_obj, + (mp_obj_t)&wifi_network_get_authmode_obj); STATIC const mp_rom_map_elem_t wifi_network_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ssid), MP_ROM_PTR(&wifi_network_ssid_obj) }, diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 119ab66c97..a09a759a74 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -69,12 +69,9 @@ static mp_obj_t wifi_radio_set_enabled(mp_obj_t self, mp_obj_t value) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_enabled_obj, wifi_radio_set_enabled); -const mp_obj_property_t wifi_radio_enabled_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_enabled_obj, - (mp_obj_t)&wifi_radio_set_enabled_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t wifi_radio_enabled_obj = MP_PROPERTY_GETSET(wifi_radio_enabled_obj, + (mp_obj_t)&wifi_radio_get_enabled_obj, + (mp_obj_t)&wifi_radio_set_enabled_obj); //| hostname: Union[str | ReadableBuffer] //| """Hostname for wifi interface. When the hostname is altered after interface started/connected @@ -110,12 +107,9 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_hostname_obj, wifi_radio_set_hostname); -const mp_obj_property_t wifi_radio_hostname_obj = { - .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&wifi_radio_get_hostname_obj, - (mp_obj_t)&wifi_radio_set_hostname_obj, - MP_ROM_NONE}, -}; +const mp_obj_property_getset_t wifi_radio_hostname_obj = MP_PROPERTY_GETSET(wifi_radio_hostname_obj, + (mp_obj_t)&wifi_radio_get_hostname_obj, + (mp_obj_t)&wifi_radio_set_hostname_obj); //| mac_address: ReadableBuffer //| """MAC address for the station. When the address is altered after interface is connected @@ -142,12 +136,9 @@ STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_addres } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_obj, wifi_radio_set_mac_address); -const mp_obj_property_t wifi_radio_mac_address_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_mac_address_obj, - (mp_obj_t)&wifi_radio_set_mac_address_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t wifi_radio_mac_address_obj = MP_PROPERTY_GETSET(wifi_radio_mac_address_obj, + (mp_obj_t)&wifi_radio_get_mac_address_obj, + (mp_obj_t)&wifi_radio_set_mac_address_obj); //| mac_address_ap: ReadableBuffer //| """MAC address for the AP. When the address is altered after interface is started @@ -174,12 +165,9 @@ STATIC mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_add } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_ap_obj, wifi_radio_set_mac_address_ap); -const mp_obj_property_t wifi_radio_mac_address_ap_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_mac_address_ap_obj, - (mp_obj_t)&wifi_radio_set_mac_address_ap_obj, - MP_ROM_NONE }, -}; +const mp_obj_property_getset_t wifi_radio_mac_address_ap_obj = MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj, + (mp_obj_t)&wifi_radio_get_mac_address_ap_obj, + (mp_obj_t)&wifi_radio_set_mac_address_ap_obj); //| def start_scanning_networks(self, *, start_channel: int = 1, stop_channel: int = 11) -> Iterable[Network]: //| """Scans for available wifi networks over the given channel range. Make sure the channels are allowed in your country.""" @@ -393,12 +381,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_obj, wifi_radio_get_ipv4_gateway); -const mp_obj_property_t wifi_radio_ipv4_gateway_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_gateway_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_gateway_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj, + (mp_obj_t)&wifi_radio_get_ipv4_gateway_obj); //| ipv4_gateway_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point gateway, when enabled. None otherwise.""" @@ -409,12 +393,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_ap_obj, wifi_radio_get_ipv4_gateway_ap); -const mp_obj_property_t wifi_radio_ipv4_gateway_ap_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_gateway_ap_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_gateway_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj, + (mp_obj_t)&wifi_radio_get_ipv4_gateway_ap_obj); //| ipv4_subnet: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station subnet when connected to an access point. None otherwise.""" @@ -425,12 +405,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_obj, wifi_radio_get_ipv4_subnet); -const mp_obj_property_t wifi_radio_ipv4_subnet_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_subnet_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_subnet_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj, + (mp_obj_t)&wifi_radio_get_ipv4_subnet_obj); //| ipv4_subnet_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point subnet, when enabled. None otherwise.""" @@ -441,12 +417,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4_subnet_ap); -const mp_obj_property_t wifi_radio_ipv4_subnet_ap_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_subnet_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, + (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj); //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station when connected to an access point. None otherwise.""" @@ -457,12 +429,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_address(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, wifi_radio_get_ipv4_address); -const mp_obj_property_t wifi_radio_ipv4_address_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_address_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_address_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj, + (mp_obj_t)&wifi_radio_get_ipv4_address_obj); //| ipv4_address_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point, when enabled. None otherwise.""" @@ -473,12 +441,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_ap_obj, wifi_radio_get_ipv4_address_ap); -const mp_obj_property_t wifi_radio_ipv4_address_ap_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_address_ap_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_address_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj, + (mp_obj_t)&wifi_radio_get_ipv4_address_ap_obj); //| ipv4_dns: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the DNS server in use when connected to an access point. None otherwise.""" @@ -489,12 +453,8 @@ STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns); -const mp_obj_property_t wifi_radio_ipv4_dns_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_dns_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ipv4_dns_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_dns_obj, + (mp_obj_t)&wifi_radio_get_ipv4_dns_obj); //| ap_info: Optional[Network] //| """Network object containing BSSID, SSID, authmode, channel, country and RSSI when connected to an access point. None otherwise.""" @@ -505,12 +465,8 @@ STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); -const mp_obj_property_t wifi_radio_ap_info_obj = { - .base.type = &mp_type_property, - .proxy = { (mp_obj_t)&wifi_radio_get_ap_info_obj, - MP_ROM_NONE, - MP_ROM_NONE }, -}; +const mp_obj_property_getter_t wifi_radio_ap_info_obj = MP_PROPERTY_GETTER(wifi_radio_ap_info_obj, + (mp_obj_t)&wifi_radio_get_ap_info_obj); //| def ping(self, ip: ipaddress.IPv4Address, *, timeout: Optional[float] = 0.5) -> Optional[float]: //| """Ping an IP to test connectivity. Returns echo time in seconds. From 5b9f0681adaf9051865b792f8c4d3668f74a13d5 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 1 May 2022 09:35:43 -0600 Subject: [PATCH 0205/2403] Get some getter props defined through another macro --- py/obj.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/py/obj.h b/py/obj.h index b31320f7e0..1a81ce4a2b 100644 --- a/py/obj.h +++ b/py/obj.h @@ -356,11 +356,7 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t; #define MP_DEFINE_CONST_PROP_GET(obj_name, fun_name) \ const mp_obj_fun_builtin_fixed_t fun_name##_obj = {{&mp_type_fun_builtin_1}, .fun._1 = fun_name}; \ - const mp_obj_property_t obj_name = { \ - .base.type = &mp_type_property, \ - .proxy = {(mp_obj_t)&fun_name##_obj, \ - MP_ROM_NONE, \ - MP_ROM_NONE}, } + const mp_obj_property_getter obj_name = MP_PROPERTY_GETTER(obj_name, (mp_obj_t)&fun_name##_obj); // These macros are used to define constant or mutable map/dict objects // You can put "static" in front of the definition to make it local From 78cf0a90af4a76c225184c9d27ac479c39313fae Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 1 May 2022 10:24:05 -0600 Subject: [PATCH 0206/2403] Make MP_PROPERTY_GETTER / _GETSET fully declare the property This will enable setting data attributes, namely, the section of the symbol. --- ports/atmel-samd/bindings/samd/Clock.c | 8 +++---- .../broadcom/bindings/videocore/Framebuffer.c | 4 ++-- .../bindings/rp2pio/StateMachine.c | 6 ++--- py/obj.h | 4 ++-- py/objproperty.h | 4 ++-- shared-bindings/_bleio/Adapter.c | 12 +++++----- shared-bindings/_bleio/Address.c | 4 ++-- shared-bindings/_bleio/Characteristic.c | 12 +++++----- shared-bindings/_bleio/CharacteristicBuffer.c | 2 +- shared-bindings/_bleio/Connection.c | 8 +++---- shared-bindings/_bleio/Descriptor.c | 6 ++--- shared-bindings/_bleio/PacketBuffer.c | 4 ++-- shared-bindings/_bleio/ScanEntry.c | 10 ++++---- shared-bindings/_bleio/Service.c | 8 +++---- shared-bindings/_bleio/UUID.c | 6 ++--- shared-bindings/adafruit_pixelbuf/PixelBuf.c | 8 +++---- shared-bindings/aesio/aes.c | 2 +- shared-bindings/alarm/pin/PinAlarm.c | 4 ++-- shared-bindings/alarm/time/TimeAlarm.c | 2 +- shared-bindings/alarm/touch/TouchAlarm.c | 2 +- shared-bindings/analogio/AnalogIn.c | 4 ++-- shared-bindings/analogio/AnalogOut.c | 2 +- shared-bindings/audiobusio/I2SOut.c | 4 ++-- shared-bindings/audiobusio/PDMIn.c | 2 +- shared-bindings/audiocore/RawSample.c | 2 +- shared-bindings/audiocore/WaveFile.c | 6 ++--- shared-bindings/audioio/AudioOut.c | 4 ++-- shared-bindings/audiomixer/Mixer.c | 6 ++--- shared-bindings/audiomixer/MixerVoice.c | 4 ++-- shared-bindings/audiomp3/MP3Decoder.c | 12 +++++----- shared-bindings/audiopwmio/PWMAudioOut.c | 4 ++-- shared-bindings/busio/SPI.c | 2 +- shared-bindings/busio/UART.c | 6 ++--- shared-bindings/canio/CAN.c | 14 +++++------ shared-bindings/canio/Listener.c | 2 +- shared-bindings/canio/Match.c | 6 ++--- shared-bindings/canio/Message.c | 6 ++--- .../canio/RemoteTransmissionRequest.c | 6 ++--- shared-bindings/countio/Counter.c | 2 +- shared-bindings/digitalio/DigitalInOut.c | 8 +++---- shared-bindings/displayio/Bitmap.c | 4 ++-- shared-bindings/displayio/ColorConverter.c | 2 +- shared-bindings/displayio/Display.c | 16 ++++++------- shared-bindings/displayio/EPaperDisplay.c | 12 +++++----- shared-bindings/displayio/Group.c | 8 +++---- shared-bindings/displayio/OnDiskBitmap.c | 4 ++-- shared-bindings/displayio/TileGrid.c | 24 +++++++++---------- shared-bindings/fontio/BuiltinFont.c | 2 +- .../framebufferio/FramebufferDisplay.c | 14 +++++------ shared-bindings/frequencyio/FrequencyIn.c | 4 ++-- shared-bindings/gnss/GNSS.c | 10 ++++---- shared-bindings/ipaddress/IPv4Address.c | 4 ++-- shared-bindings/is31fl3741/FrameBuffer.c | 6 ++--- shared-bindings/keypad/Event.c | 8 +++---- shared-bindings/keypad/EventQueue.c | 2 +- shared-bindings/mdns/RemoteService.c | 10 ++++---- shared-bindings/mdns/Server.c | 4 ++-- .../memorymonitor/AllocationSize.c | 2 +- shared-bindings/microcontroller/Processor.c | 10 ++++---- shared-bindings/msgpack/ExtType.c | 4 ++-- shared-bindings/pulseio/PulseIn.c | 4 ++-- shared-bindings/pwmio/PWMOut.c | 4 ++-- shared-bindings/qrio/QRDecoder.c | 4 ++-- shared-bindings/rgbmatrix/RGBMatrix.c | 6 ++--- shared-bindings/rotaryio/IncrementalEncoder.c | 4 ++-- shared-bindings/rtc/RTC.c | 4 ++-- shared-bindings/sdioio/SDCard.c | 4 ++-- shared-bindings/ssl/SSLContext.c | 2 +- shared-bindings/supervisor/Runtime.c | 8 +++---- shared-bindings/synthio/MidiTrack.c | 2 +- shared-bindings/touchio/TouchIn.c | 6 ++--- shared-bindings/usb/core/Device.c | 10 ++++---- shared-bindings/usb_cdc/Serial.c | 10 ++++---- shared-bindings/usb_hid/Device.c | 6 ++--- shared-bindings/vectorio/Circle.c | 4 ++-- shared-bindings/vectorio/Polygon.c | 4 ++-- shared-bindings/vectorio/VectorShape.c | 8 +++---- shared-bindings/vectorio/VectorShape.h | 8 +++---- shared-bindings/watchdog/WatchDogTimer.c | 4 ++-- shared-bindings/wifi/Monitor.c | 4 ++-- shared-bindings/wifi/Network.c | 12 +++++----- shared-bindings/wifi/Radio.c | 24 +++++++++---------- 82 files changed, 255 insertions(+), 255 deletions(-) diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c index be3894fa46..7c405d464d 100644 --- a/ports/atmel-samd/bindings/samd/Clock.c +++ b/ports/atmel-samd/bindings/samd/Clock.c @@ -53,7 +53,7 @@ STATIC mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_enabled_obj, samd_clock_get_enabled); -const mp_obj_property_getter_t samd_clock_enabled_obj = MP_PROPERTY_GETTER(samd_clock_enabled_obj, +MP_PROPERTY_GETTER(samd_clock_enabled_obj, (mp_obj_t)&samd_clock_get_enabled_obj); //| parent: Union[Clock, None] @@ -78,7 +78,7 @@ STATIC mp_obj_t samd_clock_get_parent(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_parent_obj, samd_clock_get_parent); -const mp_obj_property_getter_t samd_clock_parent_obj = MP_PROPERTY_GETTER(samd_clock_parent_obj, +MP_PROPERTY_GETTER(samd_clock_parent_obj, (mp_obj_t)&samd_clock_get_parent_obj); //| frequency: int @@ -91,7 +91,7 @@ STATIC mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_frequency_obj, samd_clock_get_frequency); -const mp_obj_property_getter_t samd_clock_frequency_obj = MP_PROPERTY_GETTER(samd_clock_frequency_obj, +MP_PROPERTY_GETTER(samd_clock_frequency_obj, (mp_obj_t)&samd_clock_get_frequency_obj); //| calibration: int @@ -118,7 +118,7 @@ STATIC mp_obj_t samd_clock_set_calibration(mp_obj_t self_in, mp_obj_t calibratio MP_DEFINE_CONST_FUN_OBJ_2(samd_clock_set_calibration_obj, samd_clock_set_calibration); -const mp_obj_property_getset_t samd_clock_calibration_obj = MP_PROPERTY_GETSET(samd_clock_calibration_obj, +MP_PROPERTY_GETSET(samd_clock_calibration_obj, (mp_obj_t)&samd_clock_get_calibration_obj, (mp_obj_t)&samd_clock_set_calibration_obj); diff --git a/ports/broadcom/bindings/videocore/Framebuffer.c b/ports/broadcom/bindings/videocore/Framebuffer.c index 02c239bdf3..4be55ee291 100644 --- a/ports/broadcom/bindings/videocore/Framebuffer.c +++ b/ports/broadcom/bindings/videocore/Framebuffer.c @@ -96,7 +96,7 @@ STATIC mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_videocore_framebuffer_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_width_obj, videocore_framebuffer_get_width); -const mp_obj_property_getter_t videocore_framebuffer_width_obj = MP_PROPERTY_GETTER(videocore_framebuffer_width_obj, +MP_PROPERTY_GETTER(videocore_framebuffer_width_obj, (mp_obj_t)&videocore_framebuffer_get_width_obj); //| height: int @@ -109,7 +109,7 @@ STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_height_obj, videocore_framebuffer_get_height); -const mp_obj_property_getter_t videocore_framebuffer_height_obj = MP_PROPERTY_GETTER(videocore_framebuffer_height_obj, +MP_PROPERTY_GETTER(videocore_framebuffer_height_obj, (mp_obj_t)&videocore_framebuffer_get_height_obj); STATIC const mp_rom_map_elem_t videocore_framebuffer_locals_dict_table[] = { diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index b5f719a062..ec5a6648d1 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -729,7 +729,7 @@ STATIC mp_obj_t rp2pio_statemachine_obj_set_frequency(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_set_frequency_obj, rp2pio_statemachine_obj_set_frequency); -const mp_obj_property_getset_t rp2pio_statemachine_frequency_obj = MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj, +MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj, (mp_obj_t)&rp2pio_statemachine_get_frequency_obj, (mp_obj_t)&rp2pio_statemachine_set_frequency_obj); @@ -745,7 +745,7 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_rxstall_obj, rp2pio_statemachine_obj_get_rxstall); -const mp_obj_property_getter_t rp2pio_statemachine_rxstall_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj, +MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj, (mp_obj_t)&rp2pio_statemachine_get_rxstall_obj); //| in_waiting: int @@ -759,7 +759,7 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_in_waiting_obj, rp2pio_statemachine_obj_get_in_waiting); -const mp_obj_property_getter_t rp2pio_statemachine_in_waiting_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_in_waiting_obj, +MP_PROPERTY_GETTER(rp2pio_statemachine_in_waiting_obj, (mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj); STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { diff --git a/py/obj.h b/py/obj.h index 1a81ce4a2b..5f8f71ba0b 100644 --- a/py/obj.h +++ b/py/obj.h @@ -356,7 +356,7 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t; #define MP_DEFINE_CONST_PROP_GET(obj_name, fun_name) \ const mp_obj_fun_builtin_fixed_t fun_name##_obj = {{&mp_type_fun_builtin_1}, .fun._1 = fun_name}; \ - const mp_obj_property_getter obj_name = MP_PROPERTY_GETTER(obj_name, (mp_obj_t)&fun_name##_obj); + MP_PROPERTY_GETTER(obj_name, (mp_obj_t)&fun_name##_obj); // These macros are used to define constant or mutable map/dict objects // You can put "static" in front of the definition to make it local @@ -1107,7 +1107,7 @@ typedef struct _mp_rom_obj_static_class_method_t { } mp_rom_obj_static_class_method_t; // property -const mp_obj_t *mp_obj_property_get(mp_obj_t self_in); +const mp_obj_t *mp_obj_property_get(mp_obj_t self_in, size_t *n_proxy); // sequence helpers diff --git a/py/objproperty.h b/py/objproperty.h index 267554bde2..2b9e848eb1 100644 --- a/py/objproperty.h +++ b/py/objproperty.h @@ -38,8 +38,8 @@ typedef struct _mp_obj_property_t { typedef struct _mp_obj_property_t mp_obj_property_getter_t; typedef struct _mp_obj_property_t mp_obj_property_getset_t; -#define MP_PROPERTY_GETTER(P, G) {.base.type = &mp_type_property, .proxy = {G, MP_ROM_NONE, MP_ROM_NONE}} -#define MP_PROPERTY_GETSET(P, G, S) {.base.type = &mp_type_property, .proxy = {G, S, MP_ROM_NONE}} +#define MP_PROPERTY_GETTER(P, G) const mp_obj_property_t P = {.base.type = &mp_type_property, .proxy = {G, MP_ROM_NONE, MP_ROM_NONE}} +#define MP_PROPERTY_GETSET(P, G, S) const mp_obj_property_t P = {.base.type = &mp_type_property, .proxy = {G, S, MP_ROM_NONE}} #endif // MICROPY_PY_BUILTINS_PROPERTY diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c index a71b655d3d..ce1080934e 100644 --- a/shared-bindings/_bleio/Adapter.c +++ b/shared-bindings/_bleio/Adapter.c @@ -128,7 +128,7 @@ static mp_obj_t bleio_adapter_set_enabled(mp_obj_t self, mp_obj_t value) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_enabled_obj, bleio_adapter_set_enabled); -const mp_obj_property_getset_t bleio_adapter_enabled_obj = MP_PROPERTY_GETSET(bleio_adapter_enabled_obj, +MP_PROPERTY_GETSET(bleio_adapter_enabled_obj, (mp_obj_t)&bleio_adapter_get_enabled_obj, (mp_obj_t)&bleio_adapter_set_enabled_obj); @@ -149,7 +149,7 @@ STATIC mp_obj_t bleio_adapter_set_address(mp_obj_t self, mp_obj_t new_address) { } MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_address_obj, bleio_adapter_set_address); -const mp_obj_property_getset_t bleio_adapter_address_obj = MP_PROPERTY_GETSET(bleio_adapter_address_obj, +MP_PROPERTY_GETSET(bleio_adapter_address_obj, (mp_obj_t)&bleio_adapter_get_address_obj, (mp_obj_t)&bleio_adapter_set_address_obj); @@ -170,7 +170,7 @@ STATIC mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) { } MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_name_obj, bleio_adapter_set_name); -const mp_obj_property_getset_t bleio_adapter_name_obj = MP_PROPERTY_GETSET(bleio_adapter_name_obj, +MP_PROPERTY_GETSET(bleio_adapter_name_obj, (mp_obj_t)&bleio_adapter_get_name_obj, (mp_obj_t)&bleio_adapter_set_name_obj); @@ -371,7 +371,7 @@ STATIC mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_advertising_obj, bleio_adapter_get_advertising); -const mp_obj_property_getter_t bleio_adapter_advertising_obj = MP_PROPERTY_GETTER(bleio_adapter_advertising_obj, +MP_PROPERTY_GETTER(bleio_adapter_advertising_obj, (mp_obj_t)&bleio_adapter_get_advertising_obj); //| connected: bool @@ -384,7 +384,7 @@ STATIC mp_obj_t bleio_adapter_get_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connected_obj, bleio_adapter_get_connected); -const mp_obj_property_getter_t bleio_adapter_connected_obj = MP_PROPERTY_GETTER(bleio_adapter_connected_obj, +MP_PROPERTY_GETTER(bleio_adapter_connected_obj, (mp_obj_t)&bleio_adapter_get_connected_obj); //| connections: Tuple[Connection] @@ -396,7 +396,7 @@ STATIC mp_obj_t bleio_adapter_get_connections(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connections_obj, bleio_adapter_get_connections); -const mp_obj_property_getter_t bleio_adapter_connections_obj = MP_PROPERTY_GETTER(bleio_adapter_connections_obj, +MP_PROPERTY_GETTER(bleio_adapter_connections_obj, (mp_obj_t)&bleio_adapter_get_connections_obj); //| def connect(self, address: Address, *, timeout: float) -> Connection: diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c index 77dd9ce8d2..9673642a5b 100644 --- a/shared-bindings/_bleio/Address.c +++ b/shared-bindings/_bleio/Address.c @@ -101,7 +101,7 @@ STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_address_bytes_obj, bleio_address_get_address_bytes); -const mp_obj_property_getter_t bleio_address_address_bytes_obj = MP_PROPERTY_GETTER(bleio_address_address_bytes_obj, +MP_PROPERTY_GETTER(bleio_address_address_bytes_obj, (mp_obj_t)&bleio_address_get_address_bytes_obj); //| type: int @@ -117,7 +117,7 @@ STATIC mp_obj_t bleio_address_get_type(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_type_obj, bleio_address_get_type); -const mp_obj_property_getter_t bleio_address_type_obj = MP_PROPERTY_GETTER(bleio_address_type_obj, +MP_PROPERTY_GETTER(bleio_address_type_obj, (mp_obj_t)&bleio_address_get_type_obj); //| def __eq__(self, other: object) -> bool: diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c index afd9621c86..4ff37f0623 100644 --- a/shared-bindings/_bleio/Characteristic.c +++ b/shared-bindings/_bleio/Characteristic.c @@ -167,7 +167,7 @@ STATIC mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_properties_obj, bleio_characteristic_get_properties); -const mp_obj_property_getter_t bleio_characteristic_properties_obj = MP_PROPERTY_GETTER(bleio_characteristic_properties_obj, +MP_PROPERTY_GETTER(bleio_characteristic_properties_obj, (mp_obj_t)&bleio_characteristic_get_properties_obj); //| uuid: Optional[UUID] @@ -183,7 +183,7 @@ STATIC mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_uuid_obj, bleio_characteristic_get_uuid); -const mp_obj_property_getter_t bleio_characteristic_uuid_obj = MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj, +MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj, (mp_obj_t)&bleio_characteristic_get_uuid_obj); //| value: bytearray @@ -210,7 +210,7 @@ STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_ } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_characteristic_set_value_obj, bleio_characteristic_set_value); -const mp_obj_property_getset_t bleio_characteristic_value_obj = MP_PROPERTY_GETSET(bleio_characteristic_value_obj, +MP_PROPERTY_GETSET(bleio_characteristic_value_obj, (mp_obj_t)&bleio_characteristic_get_value_obj, (mp_obj_t)&bleio_characteristic_set_value_obj); @@ -224,7 +224,7 @@ STATIC mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_max_length_obj, bleio_characteristic_get_max_length); -const mp_obj_property_getter_t bleio_characteristic_max_length_obj = MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj, +MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj, (mp_obj_t)&bleio_characteristic_get_max_length_obj); //| descriptors: Descriptor @@ -238,7 +238,7 @@ STATIC mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_descriptors_obj, bleio_characteristic_get_descriptors); -const mp_obj_property_getter_t bleio_characteristic_descriptors_obj = MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj, +MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj, (mp_obj_t)&bleio_characteristic_get_descriptors_obj); //| service: Service @@ -251,7 +251,7 @@ STATIC mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_service_obj, bleio_characteristic_get_service); -const mp_obj_property_getter_t bleio_characteristic_service_obj = MP_PROPERTY_GETTER(bleio_characteristic_service_obj, +MP_PROPERTY_GETTER(bleio_characteristic_service_obj, (mp_obj_t)&bleio_characteristic_get_service_obj); //| def set_cccd(self, *, notify: bool = False, indicate: bool = False) -> None: diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c index ee3d8fe16d..78ff07fa77 100644 --- a/shared-bindings/_bleio/CharacteristicBuffer.c +++ b/shared-bindings/_bleio/CharacteristicBuffer.c @@ -173,7 +173,7 @@ STATIC mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) } MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_get_in_waiting_obj, bleio_characteristic_buffer_obj_get_in_waiting); -const mp_obj_property_getter_t bleio_characteristic_buffer_in_waiting_obj = MP_PROPERTY_GETTER(bleio_characteristic_buffer_in_waiting_obj, +MP_PROPERTY_GETTER(bleio_characteristic_buffer_in_waiting_obj, (mp_obj_t)&bleio_characteristic_buffer_get_in_waiting_obj); //| def reset_input_buffer(self) -> None: diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c index 1c9acd826e..7a85ccddc2 100644 --- a/shared-bindings/_bleio/Connection.c +++ b/shared-bindings/_bleio/Connection.c @@ -161,7 +161,7 @@ STATIC mp_obj_t bleio_connection_get_connected(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connected_obj, bleio_connection_get_connected); -const mp_obj_property_getter_t bleio_connection_connected_obj = MP_PROPERTY_GETTER(bleio_connection_connected_obj, +MP_PROPERTY_GETTER(bleio_connection_connected_obj, (mp_obj_t)&bleio_connection_get_connected_obj); @@ -175,7 +175,7 @@ STATIC mp_obj_t bleio_connection_get_paired(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_paired_obj, bleio_connection_get_paired); -const mp_obj_property_getter_t bleio_connection_paired_obj = MP_PROPERTY_GETTER(bleio_connection_paired_obj, +MP_PROPERTY_GETTER(bleio_connection_paired_obj, (mp_obj_t)&bleio_connection_get_paired_obj); @@ -227,11 +227,11 @@ STATIC mp_obj_t bleio_connection_set_connection_interval(mp_obj_t self_in, mp_ob } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_connection_set_connection_interval_obj, bleio_connection_set_connection_interval); -const mp_obj_property_getset_t bleio_connection_connection_interval_obj = MP_PROPERTY_GETSET(bleio_connection_connection_interval_obj, +MP_PROPERTY_GETSET(bleio_connection_connection_interval_obj, (mp_obj_t)&bleio_connection_get_connection_interval_obj, (mp_obj_t)&bleio_connection_set_connection_interval_obj); -const mp_obj_property_getter_t bleio_connection_max_packet_length_obj = MP_PROPERTY_GETTER(bleio_connection_max_packet_length_obj, +MP_PROPERTY_GETTER(bleio_connection_max_packet_length_obj, (mp_obj_t)&bleio_connection_get_max_packet_length_obj); STATIC const mp_rom_map_elem_t bleio_connection_locals_dict_table[] = { diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c index 175bb82c41..f2ef6b433d 100644 --- a/shared-bindings/_bleio/Descriptor.c +++ b/shared-bindings/_bleio/Descriptor.c @@ -144,7 +144,7 @@ STATIC mp_obj_t bleio_descriptor_get_uuid(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_uuid_obj, bleio_descriptor_get_uuid); -const mp_obj_property_getter_t bleio_descriptor_uuid_obj = MP_PROPERTY_GETTER(bleio_descriptor_uuid_obj, +MP_PROPERTY_GETTER(bleio_descriptor_uuid_obj, (mp_obj_t)&bleio_descriptor_get_uuid_obj); //| characteristic: Characteristic @@ -157,7 +157,7 @@ STATIC mp_obj_t bleio_descriptor_get_characteristic(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_characteristic_obj, bleio_descriptor_get_characteristic); -const mp_obj_property_getter_t bleio_descriptor_characteristic_obj = MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj, +MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj, (mp_obj_t)&bleio_descriptor_get_characteristic_obj); //| value: bytearray @@ -184,7 +184,7 @@ STATIC mp_obj_t bleio_descriptor_set_value(mp_obj_t self_in, mp_obj_t value_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_descriptor_set_value_obj, bleio_descriptor_set_value); -const mp_obj_property_getset_t bleio_descriptor_value_obj = MP_PROPERTY_GETSET(bleio_descriptor_value_obj, +MP_PROPERTY_GETSET(bleio_descriptor_value_obj, (mp_obj_t)&bleio_descriptor_get_value_obj, (mp_obj_t)&bleio_descriptor_set_value_obj); diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c index f827aefc6d..9e64661fd3 100644 --- a/shared-bindings/_bleio/PacketBuffer.c +++ b/shared-bindings/_bleio/PacketBuffer.c @@ -197,7 +197,7 @@ STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length); -const mp_obj_property_getter_t bleio_packet_buffer_incoming_packet_length_obj = MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj, +MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj, (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj); //| outgoing_packet_length: int @@ -214,7 +214,7 @@ STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_outgoing_packet_length_obj, bleio_packet_buffer_get_outgoing_packet_length); -const mp_obj_property_getter_t bleio_packet_buffer_outgoing_packet_length_obj = MP_PROPERTY_GETTER(bleio_packet_buffer_outgoing_packet_length_obj, +MP_PROPERTY_GETTER(bleio_packet_buffer_outgoing_packet_length_obj, (mp_obj_t)&bleio_packet_buffer_get_outgoing_packet_length_obj); STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = { diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c index 02cdca7ee3..d9434f39cf 100644 --- a/shared-bindings/_bleio/ScanEntry.c +++ b/shared-bindings/_bleio/ScanEntry.c @@ -83,7 +83,7 @@ STATIC mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_address_obj, bleio_scanentry_get_address); -const mp_obj_property_getter_t bleio_scanentry_address_obj = MP_PROPERTY_GETTER(bleio_scanentry_address_obj, +MP_PROPERTY_GETTER(bleio_scanentry_address_obj, (mp_obj_t)&bleio_scanentry_get_address_obj); //| advertisement_bytes: bytes @@ -95,7 +95,7 @@ STATIC mp_obj_t scanentry_get_advertisement_bytes(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_advertisement_bytes_obj, scanentry_get_advertisement_bytes); -const mp_obj_property_getter_t bleio_scanentry_advertisement_bytes_obj = MP_PROPERTY_GETTER(bleio_scanentry_advertisement_bytes_obj, +MP_PROPERTY_GETTER(bleio_scanentry_advertisement_bytes_obj, (mp_obj_t)&bleio_scanentry_get_advertisement_bytes_obj); //| rssi: int @@ -107,7 +107,7 @@ STATIC mp_obj_t scanentry_get_rssi(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_rssi_obj, scanentry_get_rssi); -const mp_obj_property_getter_t bleio_scanentry_rssi_obj = MP_PROPERTY_GETTER(bleio_scanentry_rssi_obj, +MP_PROPERTY_GETTER(bleio_scanentry_rssi_obj, (mp_obj_t)&bleio_scanentry_get_rssi_obj); //| connectable: bool @@ -119,7 +119,7 @@ STATIC mp_obj_t scanentry_get_connectable(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_connectable_obj, scanentry_get_connectable); -const mp_obj_property_getter_t bleio_scanentry_connectable_obj = MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj, +MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj, (mp_obj_t)&bleio_scanentry_get_connectable_obj); //| scan_response: bool @@ -131,7 +131,7 @@ STATIC mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_scan_response_obj, scanentry_get_scan_response); -const mp_obj_property_getter_t bleio_scanentry_scan_response_obj = MP_PROPERTY_GETTER(bleio_scanentry_scan_response_obj, +MP_PROPERTY_GETTER(bleio_scanentry_scan_response_obj, (mp_obj_t)&bleio_scanentry_get_scan_response_obj); STATIC const mp_rom_map_elem_t bleio_scanentry_locals_dict_table[] = { diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c index 98e1b8fdfd..ddbdecdf79 100644 --- a/shared-bindings/_bleio/Service.c +++ b/shared-bindings/_bleio/Service.c @@ -80,7 +80,7 @@ STATIC mp_obj_t bleio_service_get_characteristics(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_characteristics_obj, bleio_service_get_characteristics); -const mp_obj_property_getter_t bleio_service_characteristics_obj = MP_PROPERTY_GETTER(bleio_service_characteristics_obj, +MP_PROPERTY_GETTER(bleio_service_characteristics_obj, (mp_obj_t)&bleio_service_get_characteristics_obj); //| remote: bool @@ -93,7 +93,7 @@ STATIC mp_obj_t bleio_service_get_remote(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_remote_obj, bleio_service_get_remote); -const mp_obj_property_getter_t bleio_service_remote_obj = MP_PROPERTY_GETTER(bleio_service_remote_obj, +MP_PROPERTY_GETTER(bleio_service_remote_obj, (mp_obj_t)&bleio_service_get_remote_obj); //| secondary: bool @@ -106,7 +106,7 @@ STATIC mp_obj_t bleio_service_get_secondary(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_secondary_obj, bleio_service_get_secondary); -const mp_obj_property_getter_t bleio_service_secondary_obj = MP_PROPERTY_GETTER(bleio_service_secondary_obj, +MP_PROPERTY_GETTER(bleio_service_secondary_obj, (mp_obj_t)&bleio_service_get_secondary_obj); //| uuid: Optional[UUID] @@ -122,7 +122,7 @@ STATIC mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_uuid_obj, bleio_service_get_uuid); -const mp_obj_property_getter_t bleio_service_uuid_obj = MP_PROPERTY_GETTER(bleio_service_uuid_obj, +MP_PROPERTY_GETTER(bleio_service_uuid_obj, (mp_obj_t)&bleio_service_get_uuid_obj); diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c index e4bb6cc969..599a89a581 100644 --- a/shared-bindings/_bleio/UUID.c +++ b/shared-bindings/_bleio/UUID.c @@ -132,7 +132,7 @@ STATIC mp_obj_t bleio_uuid_get_uuid16(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_uuid16_obj, bleio_uuid_get_uuid16); -const mp_obj_property_getter_t bleio_uuid_uuid16_obj = MP_PROPERTY_GETTER(bleio_uuid_uuid16_obj, +MP_PROPERTY_GETTER(bleio_uuid_uuid16_obj, (mp_obj_t)&bleio_uuid_get_uuid16_obj); //| uuid128: bytes @@ -154,7 +154,7 @@ STATIC mp_obj_t bleio_uuid_get_uuid128(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_uuid128_obj, bleio_uuid_get_uuid128); -const mp_obj_property_getter_t bleio_uuid_uuid128_obj = MP_PROPERTY_GETTER(bleio_uuid_uuid128_obj, +MP_PROPERTY_GETTER(bleio_uuid_uuid128_obj, (mp_obj_t)&bleio_uuid_get_uuid128_obj); //| size: int @@ -170,7 +170,7 @@ STATIC mp_obj_t bleio_uuid_get_size(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(bleio_uuid_get_size_obj, bleio_uuid_get_size); -const mp_obj_property_getter_t bleio_uuid_size_obj = MP_PROPERTY_GETTER(bleio_uuid_size_obj, +MP_PROPERTY_GETTER(bleio_uuid_size_obj, (mp_obj_t)&bleio_uuid_get_size_obj); diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c index 094cbcf49c..d9436ea45a 100644 --- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c +++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c @@ -161,7 +161,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_bpp_obj, pixelbuf_pixelbuf_obj_get_bpp); -const mp_obj_property_getter_t pixelbuf_pixelbuf_bpp_obj = MP_PROPERTY_GETTER(pixelbuf_pixelbuf_bpp_obj, +MP_PROPERTY_GETTER(pixelbuf_pixelbuf_bpp_obj, (mp_obj_t)&pixelbuf_pixelbuf_get_bpp_obj); @@ -189,7 +189,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_brightness_obj, pixelbuf_pixelbuf_obj_set_brightness); -const mp_obj_property_getset_t pixelbuf_pixelbuf_brightness_obj = MP_PROPERTY_GETSET(pixelbuf_pixelbuf_brightness_obj, +MP_PROPERTY_GETSET(pixelbuf_pixelbuf_brightness_obj, (mp_obj_t)&pixelbuf_pixelbuf_get_brightness_obj, (mp_obj_t)&pixelbuf_pixelbuf_set_brightness_obj); @@ -208,7 +208,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_auto_write(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_auto_write_obj, pixelbuf_pixelbuf_obj_set_auto_write); -const mp_obj_property_getset_t pixelbuf_pixelbuf_auto_write_obj = MP_PROPERTY_GETSET(pixelbuf_pixelbuf_auto_write_obj, +MP_PROPERTY_GETSET(pixelbuf_pixelbuf_auto_write_obj, (mp_obj_t)&pixelbuf_pixelbuf_get_auto_write_obj, (mp_obj_t)&pixelbuf_pixelbuf_set_auto_write_obj); @@ -220,7 +220,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_str, pixelbuf_pixelbuf_obj_get_byteorder); -const mp_obj_property_getter_t pixelbuf_pixelbuf_byteorder_str = MP_PROPERTY_GETTER(pixelbuf_pixelbuf_byteorder_str, +MP_PROPERTY_GETTER(pixelbuf_pixelbuf_byteorder_str, (mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_str); STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) { diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c index bb8ac3376e..bb72b10e7e 100644 --- a/shared-bindings/aesio/aes.c +++ b/shared-bindings/aesio/aes.c @@ -246,7 +246,7 @@ STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t aesio_obj, mp_obj_t mode_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(aesio_aes_set_mode_obj, aesio_aes_set_mode); -const mp_obj_property_getset_t aesio_aes_mode_obj = MP_PROPERTY_GETSET(aesio_aes_mode_obj, +MP_PROPERTY_GETSET(aesio_aes_mode_obj, (mp_obj_t)&aesio_aes_get_mode_obj, (mp_obj_t)&aesio_aes_set_mode_obj); diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c index aa2168e665..ff34716786 100644 --- a/shared-bindings/alarm/pin/PinAlarm.c +++ b/shared-bindings/alarm/pin/PinAlarm.c @@ -97,7 +97,7 @@ STATIC mp_obj_t alarm_pin_pinalarm_obj_get_pin(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_pin_pinalarm_get_pin_obj, alarm_pin_pinalarm_obj_get_pin); -const mp_obj_property_getter_t alarm_pin_pinalarm_pin_obj = MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj, +MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj, (mp_obj_t)&alarm_pin_pinalarm_get_pin_obj); //| value: bool @@ -109,7 +109,7 @@ STATIC mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_pin_pinalarm_get_value_obj, alarm_pin_pinalarm_obj_get_value); -const mp_obj_property_getter_t alarm_pin_pinalarm_value_obj = MP_PROPERTY_GETTER(alarm_pin_pinalarm_value_obj, +MP_PROPERTY_GETTER(alarm_pin_pinalarm_value_obj, (mp_obj_t)&alarm_pin_pinalarm_get_value_obj); STATIC const mp_rom_map_elem_t alarm_pin_pinalarm_locals_dict_table[] = { diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c index 7de42262ac..ab0274afa9 100644 --- a/shared-bindings/alarm/time/TimeAlarm.c +++ b/shared-bindings/alarm/time/TimeAlarm.c @@ -123,7 +123,7 @@ STATIC mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_timealarm_get_monotonic_time_obj, alarm_time_timealarm_obj_get_monotonic_time); -const mp_obj_property_getter_t alarm_time_timealarm_monotonic_time_obj = MP_PROPERTY_GETTER(alarm_time_timealarm_monotonic_time_obj, +MP_PROPERTY_GETTER(alarm_time_timealarm_monotonic_time_obj, (mp_obj_t)&alarm_time_timealarm_get_monotonic_time_obj); STATIC const mp_rom_map_elem_t alarm_time_timealarm_locals_dict_table[] = { diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c index f41be59bb7..ce5074f7c0 100644 --- a/shared-bindings/alarm/touch/TouchAlarm.c +++ b/shared-bindings/alarm/touch/TouchAlarm.c @@ -71,7 +71,7 @@ STATIC mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(alarm_touch_touchalarm_get_pin_obj, alarm_touch_touchalarm_obj_get_pin); -const mp_obj_property_getter_t alarm_touch_touchalarm_pin_obj = MP_PROPERTY_GETTER(alarm_touch_touchalarm_pin_obj, +MP_PROPERTY_GETTER(alarm_touch_touchalarm_pin_obj, (mp_obj_t)&alarm_touch_touchalarm_get_pin_obj); STATIC const mp_rom_map_elem_t alarm_touch_touchalarm_locals_dict_table[] = { diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index d6bbfdb392..f2c888f727 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -117,7 +117,7 @@ STATIC mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_value_obj, analogio_analogin_obj_get_value); -const mp_obj_property_getter_t analogio_analogin_value_obj = MP_PROPERTY_GETTER(analogio_analogin_value_obj, +MP_PROPERTY_GETTER(analogio_analogin_value_obj, (mp_obj_t)&analogio_analogin_get_value_obj); //| reference_voltage: float @@ -139,7 +139,7 @@ STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_reference_voltage_obj, analogio_analogin_obj_get_reference_voltage); -const mp_obj_property_getter_t analogio_analogin_reference_voltage_obj = MP_PROPERTY_GETTER(analogio_analogin_reference_voltage_obj, +MP_PROPERTY_GETTER(analogio_analogin_reference_voltage_obj, (mp_obj_t)&analogio_analogin_get_reference_voltage_obj); STATIC const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = { diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index 132dae85ca..31173f8890 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -117,7 +117,7 @@ STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t valu } MP_DEFINE_CONST_FUN_OBJ_2(analogio_analogout_set_value_obj, analogio_analogout_obj_set_value); -const mp_obj_property_getset_t analogio_analogout_value_obj = MP_PROPERTY_GETSET(analogio_analogout_value_obj, +MP_PROPERTY_GETSET(analogio_analogout_value_obj, MP_ROM_NONE, (mp_obj_t)&analogio_analogout_set_value_obj); diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c index afa24861b3..93c316d374 100644 --- a/shared-bindings/audiobusio/I2SOut.c +++ b/shared-bindings/audiobusio/I2SOut.c @@ -203,7 +203,7 @@ STATIC mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_playing_obj, audiobusio_i2sout_obj_get_playing); -const mp_obj_property_getter_t audiobusio_i2sout_playing_obj = MP_PROPERTY_GETTER(audiobusio_i2sout_playing_obj, +MP_PROPERTY_GETTER(audiobusio_i2sout_playing_obj, (mp_obj_t)&audiobusio_i2sout_get_playing_obj); //| def pause(self) -> None: @@ -248,7 +248,7 @@ STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_paused_obj, audiobusio_i2sout_obj_get_paused); -const mp_obj_property_getter_t audiobusio_i2sout_paused_obj = MP_PROPERTY_GETTER(audiobusio_i2sout_paused_obj, +MP_PROPERTY_GETTER(audiobusio_i2sout_paused_obj, (mp_obj_t)&audiobusio_i2sout_get_paused_obj); #endif // CIRCUITPY_AUDIOBUSIO_I2SOUT diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c index 0954def2c0..aa810f2930 100644 --- a/shared-bindings/audiobusio/PDMIn.c +++ b/shared-bindings/audiobusio/PDMIn.c @@ -226,7 +226,7 @@ STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_get_sample_rate_obj, audiobusio_pdmin_obj_get_sample_rate); -const mp_obj_property_getter_t audiobusio_pdmin_sample_rate_obj = MP_PROPERTY_GETTER(audiobusio_pdmin_sample_rate_obj, +MP_PROPERTY_GETTER(audiobusio_pdmin_sample_rate_obj, (mp_obj_t)&audiobusio_pdmin_get_sample_rate_obj); STATIC const mp_rom_map_elem_t audiobusio_pdmin_locals_dict_table[] = { diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c index 41798c3cf5..82c02450ba 100644 --- a/shared-bindings/audiocore/RawSample.c +++ b/shared-bindings/audiocore/RawSample.c @@ -153,7 +153,7 @@ STATIC mp_obj_t audioio_rawsample_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audioio_rawsample_set_sample_rate_obj, audioio_rawsample_obj_set_sample_rate); -const mp_obj_property_getset_t audioio_rawsample_sample_rate_obj = MP_PROPERTY_GETSET(audioio_rawsample_sample_rate_obj, +MP_PROPERTY_GETSET(audioio_rawsample_sample_rate_obj, (mp_obj_t)&audioio_rawsample_get_sample_rate_obj, (mp_obj_t)&audioio_rawsample_set_sample_rate_obj); diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c index 0a5115ad1c..285bd7cbbe 100644 --- a/shared-bindings/audiocore/WaveFile.c +++ b/shared-bindings/audiocore/WaveFile.c @@ -148,7 +148,7 @@ STATIC mp_obj_t audioio_wavefile_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audioio_wavefile_set_sample_rate_obj, audioio_wavefile_obj_set_sample_rate); -const mp_obj_property_getset_t audioio_wavefile_sample_rate_obj = MP_PROPERTY_GETSET(audioio_wavefile_sample_rate_obj, +MP_PROPERTY_GETSET(audioio_wavefile_sample_rate_obj, (mp_obj_t)&audioio_wavefile_get_sample_rate_obj, (mp_obj_t)&audioio_wavefile_set_sample_rate_obj); @@ -162,7 +162,7 @@ STATIC mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_bits_per_sample_obj, audioio_wavefile_obj_get_bits_per_sample); -const mp_obj_property_getter_t audioio_wavefile_bits_per_sample_obj = MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj, +MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj, (mp_obj_t)&audioio_wavefile_get_bits_per_sample_obj); //| channel_count: int //| """Number of audio channels. (read only)""" @@ -174,7 +174,7 @@ STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_channel_count_obj, audioio_wavefile_obj_get_channel_count); -const mp_obj_property_getter_t audioio_wavefile_channel_count_obj = MP_PROPERTY_GETTER(audioio_wavefile_channel_count_obj, +MP_PROPERTY_GETTER(audioio_wavefile_channel_count_obj, (mp_obj_t)&audioio_wavefile_get_channel_count_obj); diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c index b2fde315f5..0b4ed7b975 100644 --- a/shared-bindings/audioio/AudioOut.c +++ b/shared-bindings/audioio/AudioOut.c @@ -197,7 +197,7 @@ STATIC mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_playing_obj, audioio_audioout_obj_get_playing); -const mp_obj_property_getter_t audioio_audioout_playing_obj = MP_PROPERTY_GETTER(audioio_audioout_playing_obj, +MP_PROPERTY_GETTER(audioio_audioout_playing_obj, (mp_obj_t)&audioio_audioout_get_playing_obj); //| def pause(self) -> None: @@ -242,7 +242,7 @@ STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_paused_obj, audioio_audioout_obj_get_paused); -const mp_obj_property_getter_t audioio_audioout_paused_obj = MP_PROPERTY_GETTER(audioio_audioout_paused_obj, +MP_PROPERTY_GETTER(audioio_audioout_paused_obj, (mp_obj_t)&audioio_audioout_get_paused_obj); STATIC const mp_rom_map_elem_t audioio_audioout_locals_dict_table[] = { diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c index 45a457f461..a165435ff0 100644 --- a/shared-bindings/audiomixer/Mixer.c +++ b/shared-bindings/audiomixer/Mixer.c @@ -166,7 +166,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_playing_obj, audiomixer_mixer_obj_get_playing); -const mp_obj_property_getter_t audiomixer_mixer_playing_obj = MP_PROPERTY_GETTER(audiomixer_mixer_playing_obj, +MP_PROPERTY_GETTER(audiomixer_mixer_playing_obj, (mp_obj_t)&audiomixer_mixer_get_playing_obj); //| sample_rate: int @@ -179,7 +179,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_sample_rate_obj, audiomixer_mixer_obj_get_sample_rate); -const mp_obj_property_getter_t audiomixer_mixer_sample_rate_obj = MP_PROPERTY_GETTER(audiomixer_mixer_sample_rate_obj, +MP_PROPERTY_GETTER(audiomixer_mixer_sample_rate_obj, (mp_obj_t)&audiomixer_mixer_get_sample_rate_obj); //| voice: Tuple[MixerVoice, ...] @@ -196,7 +196,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_get_voice(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_voice_obj, audiomixer_mixer_obj_get_voice); -const mp_obj_property_getter_t audiomixer_mixer_voice_obj = MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj, +MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj, (mp_obj_t)&audiomixer_mixer_get_voice_obj); //| def play(self, sample: circuitpython_typing.AudioSample, *, voice: int = 0, loop: bool = False) -> None: diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c index 48adb3794d..f02b9521af 100644 --- a/shared-bindings/audiomixer/MixerVoice.c +++ b/shared-bindings/audiomixer/MixerVoice.c @@ -130,7 +130,7 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_set_level_obj, 1, audiomixer_mixervoice_obj_set_level); -const mp_obj_property_getset_t audiomixer_mixervoice_level_obj = MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj, +MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj, (mp_obj_t)&audiomixer_mixervoice_get_level_obj, (mp_obj_t)&audiomixer_mixervoice_set_level_obj); @@ -146,7 +146,7 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_playing_obj, audiomixer_mixervoice_obj_get_playing); -const mp_obj_property_getter_t audiomixer_mixervoice_playing_obj = MP_PROPERTY_GETTER(audiomixer_mixervoice_playing_obj, +MP_PROPERTY_GETTER(audiomixer_mixervoice_playing_obj, (mp_obj_t)&audiomixer_mixervoice_get_playing_obj); STATIC const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = { diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index ed66440666..16efa361b8 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -166,7 +166,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) { } MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file); -const mp_obj_property_getset_t audiomp3_mp3file_file_obj = MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj, +MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj, (mp_obj_t)&audiomp3_mp3file_get_file_obj, (mp_obj_t)&audiomp3_mp3file_set_file_obj); @@ -192,7 +192,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_sample_rate_obj, audiomp3_mp3file_obj_set_sample_rate); -const mp_obj_property_getset_t audiomp3_mp3file_sample_rate_obj = MP_PROPERTY_GETSET(audiomp3_mp3file_sample_rate_obj, +MP_PROPERTY_GETSET(audiomp3_mp3file_sample_rate_obj, (mp_obj_t)&audiomp3_mp3file_get_sample_rate_obj, (mp_obj_t)&audiomp3_mp3file_set_sample_rate_obj); @@ -206,7 +206,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_bits_per_sample(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_bits_per_sample_obj, audiomp3_mp3file_obj_get_bits_per_sample); -const mp_obj_property_getter_t audiomp3_mp3file_bits_per_sample_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_bits_per_sample_obj, +MP_PROPERTY_GETTER(audiomp3_mp3file_bits_per_sample_obj, (mp_obj_t)&audiomp3_mp3file_get_bits_per_sample_obj); //| channel_count: int @@ -219,7 +219,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_channel_count(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_channel_count_obj, audiomp3_mp3file_obj_get_channel_count); -const mp_obj_property_getter_t audiomp3_mp3file_channel_count_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_channel_count_obj, +MP_PROPERTY_GETTER(audiomp3_mp3file_channel_count_obj, (mp_obj_t)&audiomp3_mp3file_get_channel_count_obj); //| rms_level: float @@ -232,7 +232,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_rms_level_obj, audiomp3_mp3file_obj_get_rms_level); -const mp_obj_property_getter_t audiomp3_mp3file_rms_level_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj, +MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj, (mp_obj_t)&audiomp3_mp3file_get_rms_level_obj); //| samples_decoded: int @@ -245,7 +245,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_samples_decoded_obj, audiomp3_mp3file_obj_get_samples_decoded); -const mp_obj_property_getter_t audiomp3_mp3file_samples_decoded_obj = MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj, +MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj, (mp_obj_t)&audiomp3_mp3file_get_samples_decoded_obj); STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = { diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c index b8cdcbadda..8118eb47f2 100644 --- a/shared-bindings/audiopwmio/PWMAudioOut.c +++ b/shared-bindings/audiopwmio/PWMAudioOut.c @@ -198,7 +198,7 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_playing(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_get_playing_obj, audiopwmio_pwmaudioout_obj_get_playing); -const mp_obj_property_getter_t audiopwmio_pwmaudioout_playing_obj = MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_playing_obj, +MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_playing_obj, (mp_obj_t)&audiopwmio_pwmaudioout_get_playing_obj); //| def pause(self) -> None: @@ -243,7 +243,7 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_get_paused_obj, audiopwmio_pwmaudioout_obj_get_paused); -const mp_obj_property_getter_t audiopwmio_pwmaudioout_paused_obj = MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_paused_obj, +MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_paused_obj, (mp_obj_t)&audiopwmio_pwmaudioout_get_paused_obj); STATIC const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = { diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index 404c120371..0a6c32f20b 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -425,7 +425,7 @@ STATIC mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_get_frequency_obj, busio_spi_obj_get_frequency); -const mp_obj_property_getter_t busio_spi_frequency_obj = MP_PROPERTY_GETTER(busio_spi_frequency_obj, +MP_PROPERTY_GETTER(busio_spi_frequency_obj, (mp_obj_t)&busio_spi_get_frequency_obj); #endif // CIRCUITPY_BUSIO_SPI diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 2e7a412456..30e4d33151 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -303,7 +303,7 @@ STATIC mp_obj_t busio_uart_obj_set_baudrate(mp_obj_t self_in, mp_obj_t baudrate) MP_DEFINE_CONST_FUN_OBJ_2(busio_uart_set_baudrate_obj, busio_uart_obj_set_baudrate); -const mp_obj_property_getset_t busio_uart_baudrate_obj = MP_PROPERTY_GETSET(busio_uart_baudrate_obj, +MP_PROPERTY_GETSET(busio_uart_baudrate_obj, (mp_obj_t)&busio_uart_get_baudrate_obj, (mp_obj_t)&busio_uart_set_baudrate_obj); @@ -317,7 +317,7 @@ STATIC mp_obj_t busio_uart_obj_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_get_in_waiting_obj, busio_uart_obj_get_in_waiting); -const mp_obj_property_getter_t busio_uart_in_waiting_obj = MP_PROPERTY_GETTER(busio_uart_in_waiting_obj, +MP_PROPERTY_GETTER(busio_uart_in_waiting_obj, (mp_obj_t)&busio_uart_get_in_waiting_obj); //| timeout: float @@ -341,7 +341,7 @@ STATIC mp_obj_t busio_uart_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout) { MP_DEFINE_CONST_FUN_OBJ_2(busio_uart_set_timeout_obj, busio_uart_obj_set_timeout); -const mp_obj_property_getset_t busio_uart_timeout_obj = MP_PROPERTY_GETSET(busio_uart_timeout_obj, +MP_PROPERTY_GETSET(busio_uart_timeout_obj, (mp_obj_t)&busio_uart_get_timeout_obj, (mp_obj_t)&busio_uart_set_timeout_obj); diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c index 54439b6e44..e8aec7f0a1 100644 --- a/shared-bindings/canio/CAN.c +++ b/shared-bindings/canio/CAN.c @@ -112,7 +112,7 @@ STATIC mp_obj_t canio_can_auto_restart_set(mp_obj_t self_in, mp_obj_t flag_in) { } MP_DEFINE_CONST_FUN_OBJ_2(canio_can_auto_restart_set_obj, canio_can_auto_restart_set); -STATIC const mp_obj_property_getset_t canio_can_auto_restart_obj = MP_PROPERTY_GETSET(canio_can_auto_restart_obj, +MP_PROPERTY_GETSET(canio_can_auto_restart_obj, (mp_obj_t)&canio_can_auto_restart_get_obj, (mp_obj_t)&canio_can_auto_restart_set_obj); @@ -127,7 +127,7 @@ STATIC mp_obj_t canio_can_baudrate_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_baudrate_get_obj, canio_can_baudrate_get); -STATIC const mp_obj_property_getter_t canio_can_baudrate_obj = MP_PROPERTY_GETTER(canio_can_baudrate_obj, +MP_PROPERTY_GETTER(canio_can_baudrate_obj, (mp_obj_t)&canio_can_baudrate_get_obj); //| transmit_error_count: int @@ -140,7 +140,7 @@ STATIC mp_obj_t canio_can_transmit_error_count_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_transmit_error_count_get_obj, canio_can_transmit_error_count_get); -STATIC const mp_obj_property_getter_t canio_can_transmit_error_count_obj = MP_PROPERTY_GETTER(canio_can_transmit_error_count_obj, +MP_PROPERTY_GETTER(canio_can_transmit_error_count_obj, (mp_obj_t)&canio_can_transmit_error_count_get_obj); //| receive_error_count: int @@ -153,7 +153,7 @@ STATIC mp_obj_t canio_can_receive_error_count_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_receive_error_count_get_obj, canio_can_receive_error_count_get); -STATIC const mp_obj_property_getter_t canio_can_receive_error_count_obj = MP_PROPERTY_GETTER(canio_can_receive_error_count_obj, +MP_PROPERTY_GETTER(canio_can_receive_error_count_obj, (mp_obj_t)&canio_can_receive_error_count_get_obj); //| state: BusState @@ -166,7 +166,7 @@ STATIC mp_obj_t canio_can_state_get(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(canio_can_state_get_obj, canio_can_state_get); -STATIC const mp_obj_property_getter_t canio_can_state_obj = MP_PROPERTY_GETTER(canio_can_state_obj, +MP_PROPERTY_GETTER(canio_can_state_obj, (mp_obj_t)&canio_can_state_get_obj); @@ -264,7 +264,7 @@ STATIC mp_obj_t canio_can_loopback_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_loopback_get_obj, canio_can_loopback_get); -STATIC const mp_obj_property_getter_t canio_can_loopback_obj = MP_PROPERTY_GETTER(canio_can_loopback_obj, +MP_PROPERTY_GETTER(canio_can_loopback_obj, (mp_obj_t)&canio_can_loopback_get_obj); @@ -299,7 +299,7 @@ STATIC mp_obj_t canio_can_silent_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_silent_get_obj, canio_can_silent_get); -STATIC const mp_obj_property_getter_t canio_can_silent_obj = MP_PROPERTY_GETTER(canio_can_silent_obj, +MP_PROPERTY_GETTER(canio_can_silent_obj, (mp_obj_t)&canio_can_silent_get_obj); diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c index fe8812fd4b..e59801d4e4 100644 --- a/shared-bindings/canio/Listener.c +++ b/shared-bindings/canio/Listener.c @@ -150,7 +150,7 @@ STATIC mp_obj_t canio_listener_timeout_set(mp_obj_t self_in, mp_obj_t timeout_in } STATIC MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_timeout_set); -STATIC const mp_obj_property_getset_t canio_listener_timeout_obj = MP_PROPERTY_GETSET(canio_listener_timeout_obj, +MP_PROPERTY_GETSET(canio_listener_timeout_obj, (mp_obj_t)&canio_listener_timeout_get_obj, (mp_obj_t)&canio_listener_timeout_set_obj); diff --git a/shared-bindings/canio/Match.c b/shared-bindings/canio/Match.c index 8e063536c2..52262b0a6c 100644 --- a/shared-bindings/canio/Match.c +++ b/shared-bindings/canio/Match.c @@ -82,7 +82,7 @@ STATIC mp_obj_t canio_match_id_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_id_get_obj, canio_match_id_get); -const mp_obj_property_getter_t canio_match_id_obj = MP_PROPERTY_GETTER(canio_match_id_obj, +MP_PROPERTY_GETTER(canio_match_id_obj, (mp_obj_t)&canio_match_id_get_obj); //| @@ -96,7 +96,7 @@ STATIC mp_obj_t canio_match_mask_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_mask_get_obj, canio_match_mask_get); -const mp_obj_property_getter_t canio_match_mask_obj = MP_PROPERTY_GETTER(canio_match_mask_obj, +MP_PROPERTY_GETTER(canio_match_mask_obj, (mp_obj_t)&canio_match_mask_get_obj); //| extended: bool @@ -109,7 +109,7 @@ STATIC mp_obj_t canio_match_extended_get(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(canio_match_extended_get_obj, canio_match_extended_get); -const mp_obj_property_getter_t canio_match_extended_obj = MP_PROPERTY_GETTER(canio_match_extended_obj, +MP_PROPERTY_GETTER(canio_match_extended_obj, (mp_obj_t)&canio_match_extended_get_obj); STATIC const mp_rom_map_elem_t canio_match_locals_dict_table[] = { diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c index ca393a6f02..64d4094b3f 100644 --- a/shared-bindings/canio/Message.c +++ b/shared-bindings/canio/Message.c @@ -83,7 +83,7 @@ STATIC mp_obj_t canio_message_id_set(const mp_obj_t self_in, const mp_obj_t id) } MP_DEFINE_CONST_FUN_OBJ_2(canio_message_id_set_obj, canio_message_id_set); -STATIC const mp_obj_property_getset_t canio_message_id_obj = MP_PROPERTY_GETSET(canio_message_id_obj, +MP_PROPERTY_GETSET(canio_message_id_obj, (mp_obj_t)&canio_message_id_get_obj, (mp_obj_t)&canio_message_id_set_obj); @@ -109,7 +109,7 @@ STATIC mp_obj_t canio_message_data_set(const mp_obj_t self_in, const mp_obj_t da MP_DEFINE_CONST_FUN_OBJ_2(canio_message_data_set_obj, canio_message_data_set); -STATIC const mp_obj_property_getset_t canio_message_data_obj = MP_PROPERTY_GETSET(canio_message_data_obj, +MP_PROPERTY_GETSET(canio_message_data_obj, (mp_obj_t)&canio_message_data_get_obj, (mp_obj_t)&canio_message_data_set_obj); @@ -131,7 +131,7 @@ STATIC mp_obj_t canio_message_extended_set(const mp_obj_t self_in, const mp_obj_ MP_DEFINE_CONST_FUN_OBJ_2(canio_message_extended_set_obj, canio_message_extended_set); -STATIC const mp_obj_property_getset_t canio_message_extended_obj = MP_PROPERTY_GETSET(canio_message_extended_obj, +MP_PROPERTY_GETSET(canio_message_extended_obj, (mp_obj_t)&canio_message_extended_get_obj, (mp_obj_t)&canio_message_extended_set_obj); diff --git a/shared-bindings/canio/RemoteTransmissionRequest.c b/shared-bindings/canio/RemoteTransmissionRequest.c index 8979873336..58ac3aa2de 100644 --- a/shared-bindings/canio/RemoteTransmissionRequest.c +++ b/shared-bindings/canio/RemoteTransmissionRequest.c @@ -82,7 +82,7 @@ STATIC mp_obj_t canio_remote_transmission_request_id_set(const mp_obj_t self_in, } MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_id_set_obj, canio_remote_transmission_request_id_set); -STATIC const mp_obj_property_getset_t canio_remote_transmission_request_id_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_id_obj, +MP_PROPERTY_GETSET(canio_remote_transmission_request_id_obj, (mp_obj_t)&canio_remote_transmission_request_id_get_obj, (mp_obj_t)&canio_remote_transmission_request_id_set_obj); @@ -103,7 +103,7 @@ STATIC mp_obj_t canio_remote_transmission_request_extended_set(const mp_obj_t se MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_extended_set_obj, canio_remote_transmission_request_extended_set); -STATIC const mp_obj_property_getset_t canio_remote_transmission_request_extended_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj, +MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj, (mp_obj_t)&canio_remote_transmission_request_extended_get_obj, (mp_obj_t)&canio_remote_transmission_request_extended_set_obj); @@ -128,7 +128,7 @@ STATIC mp_obj_t canio_remote_transmission_request_length_set(const mp_obj_t self MP_DEFINE_CONST_FUN_OBJ_2(canio_remote_transmission_request_length_set_obj, canio_remote_transmission_request_length_set); -STATIC const mp_obj_property_getset_t canio_remote_transmission_request_length_obj = MP_PROPERTY_GETSET(canio_remote_transmission_request_length_obj, +MP_PROPERTY_GETSET(canio_remote_transmission_request_length_obj, (mp_obj_t)&canio_remote_transmission_request_length_get_obj, (mp_obj_t)&canio_remote_transmission_request_length_set_obj); diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c index bee3873552..19141245e1 100644 --- a/shared-bindings/countio/Counter.c +++ b/shared-bindings/countio/Counter.c @@ -114,7 +114,7 @@ STATIC mp_obj_t countio_counter_obj_set_count(mp_obj_t self_in, mp_obj_t new_cou } MP_DEFINE_CONST_FUN_OBJ_2(countio_counter_set_count_obj, countio_counter_obj_set_count); -const mp_obj_property_getset_t countio_counter_count_obj = MP_PROPERTY_GETSET(countio_counter_count_obj, +MP_PROPERTY_GETSET(countio_counter_count_obj, (mp_obj_t)&countio_counter_get_count_obj, (mp_obj_t)&countio_counter_set_count_obj); diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index 09a0c8a7b4..37093add8f 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -213,7 +213,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_direction_obj, digitalio_digitalinout_obj_set_direction); -const mp_obj_property_getset_t digitalio_digitalio_direction_obj = MP_PROPERTY_GETSET(digitalio_digitalio_direction_obj, +MP_PROPERTY_GETSET(digitalio_digitalio_direction_obj, (mp_obj_t)&digitalio_digitalinout_get_direction_obj, (mp_obj_t)&digitalio_digitalinout_set_direction_obj); @@ -240,7 +240,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_value_obj, digitalio_digitalinout_obj_set_value); -const mp_obj_property_getset_t digitalio_digitalinout_value_obj = MP_PROPERTY_GETSET(digitalio_digitalinout_value_obj, +MP_PROPERTY_GETSET(digitalio_digitalinout_value_obj, (mp_obj_t)&digitalio_digitalinout_get_value_obj, (mp_obj_t)&digitalio_digitalinout_set_value_obj); @@ -281,7 +281,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_drive_mode_obj, digitalio_digitalinout_obj_set_drive_mode); -const mp_obj_property_getset_t digitalio_digitalio_drive_mode_obj = MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj, +MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj, (mp_obj_t)&digitalio_digitalinout_get_drive_mode_obj, (mp_obj_t)&digitalio_digitalinout_set_drive_mode_obj); @@ -324,7 +324,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t p } MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_pull_obj, digitalio_digitalinout_obj_set_pull); -const mp_obj_property_getset_t digitalio_digitalio_pull_obj = MP_PROPERTY_GETSET(digitalio_digitalio_pull_obj, +MP_PROPERTY_GETSET(digitalio_digitalio_pull_obj, (mp_obj_t)&digitalio_digitalinout_get_pull_obj, (mp_obj_t)&digitalio_digitalinout_set_pull_obj); diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index fdcf9e4ede..3af152ffdc 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -97,7 +97,7 @@ STATIC mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_get_width_obj, displayio_bitmap_obj_get_width); -const mp_obj_property_getter_t displayio_bitmap_width_obj = MP_PROPERTY_GETTER(displayio_bitmap_width_obj, +MP_PROPERTY_GETTER(displayio_bitmap_width_obj, (mp_obj_t)&displayio_bitmap_get_width_obj); //| height: int @@ -111,7 +111,7 @@ STATIC mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_get_height_obj, displayio_bitmap_obj_get_height); -const mp_obj_property_getter_t displayio_bitmap_height_obj = MP_PROPERTY_GETTER(displayio_bitmap_height_obj, +MP_PROPERTY_GETTER(displayio_bitmap_height_obj, (mp_obj_t)&displayio_bitmap_get_height_obj); //| def __getitem__(self, index: Union[Tuple[int, int], int]) -> int: diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c index 710d8b3191..18b88664c0 100644 --- a/shared-bindings/displayio/ColorConverter.c +++ b/shared-bindings/displayio/ColorConverter.c @@ -103,7 +103,7 @@ STATIC mp_obj_t displayio_colorconverter_obj_set_dither(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_set_dither_obj, displayio_colorconverter_obj_set_dither); -const mp_obj_property_getset_t displayio_colorconverter_dither_obj = MP_PROPERTY_GETSET(displayio_colorconverter_dither_obj, +MP_PROPERTY_GETSET(displayio_colorconverter_dither_obj, (mp_obj_t)&displayio_colorconverter_get_dither_obj, (mp_obj_t)&displayio_colorconverter_set_dither_obj); diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index 79141d7bbd..253887f1de 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -297,7 +297,7 @@ STATIC mp_obj_t displayio_display_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_refresh_obj, displayio_display_obj_set_auto_refresh); -const mp_obj_property_getset_t displayio_display_auto_refresh_obj = MP_PROPERTY_GETSET(displayio_display_auto_refresh_obj, +MP_PROPERTY_GETSET(displayio_display_auto_refresh_obj, (mp_obj_t)&displayio_display_get_auto_refresh_obj, (mp_obj_t)&displayio_display_set_auto_refresh_obj); @@ -331,7 +331,7 @@ STATIC mp_obj_t displayio_display_obj_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_brightness_obj, displayio_display_obj_set_brightness); -const mp_obj_property_getset_t displayio_display_brightness_obj = MP_PROPERTY_GETSET(displayio_display_brightness_obj, +MP_PROPERTY_GETSET(displayio_display_brightness_obj, (mp_obj_t)&displayio_display_get_brightness_obj, (mp_obj_t)&displayio_display_set_brightness_obj); @@ -356,7 +356,7 @@ STATIC mp_obj_t displayio_display_obj_set_auto_brightness(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_brightness_obj, displayio_display_obj_set_auto_brightness); -const mp_obj_property_getset_t displayio_display_auto_brightness_obj = MP_PROPERTY_GETSET(displayio_display_auto_brightness_obj, +MP_PROPERTY_GETSET(displayio_display_auto_brightness_obj, (mp_obj_t)&displayio_display_get_auto_brightness_obj, (mp_obj_t)&displayio_display_set_auto_brightness_obj); @@ -372,7 +372,7 @@ STATIC mp_obj_t displayio_display_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_width_obj, displayio_display_obj_get_width); -const mp_obj_property_getter_t displayio_display_width_obj = MP_PROPERTY_GETTER(displayio_display_width_obj, +MP_PROPERTY_GETTER(displayio_display_width_obj, (mp_obj_t)&displayio_display_get_width_obj); //| height: int @@ -384,7 +384,7 @@ STATIC mp_obj_t displayio_display_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_height_obj, displayio_display_obj_get_height); -const mp_obj_property_getter_t displayio_display_height_obj = MP_PROPERTY_GETTER(displayio_display_height_obj, +MP_PROPERTY_GETTER(displayio_display_height_obj, (mp_obj_t)&displayio_display_get_height_obj); //| rotation: int @@ -403,7 +403,7 @@ STATIC mp_obj_t displayio_display_obj_set_rotation(mp_obj_t self_in, mp_obj_t va MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_rotation_obj, displayio_display_obj_set_rotation); -const mp_obj_property_getset_t displayio_display_rotation_obj = MP_PROPERTY_GETSET(displayio_display_rotation_obj, +MP_PROPERTY_GETSET(displayio_display_rotation_obj, (mp_obj_t)&displayio_display_get_rotation_obj, (mp_obj_t)&displayio_display_set_rotation_obj); @@ -417,7 +417,7 @@ STATIC mp_obj_t displayio_display_obj_get_bus(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_bus_obj, displayio_display_obj_get_bus); -const mp_obj_property_getter_t displayio_display_bus_obj = MP_PROPERTY_GETTER(displayio_display_bus_obj, +MP_PROPERTY_GETTER(displayio_display_bus_obj, (mp_obj_t)&displayio_display_get_bus_obj); //| root_group: Group @@ -430,7 +430,7 @@ STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_root_group_obj, displayio_display_obj_get_root_group); -const mp_obj_property_getter_t displayio_display_root_group_obj = MP_PROPERTY_GETTER(displayio_display_root_group_obj, +MP_PROPERTY_GETTER(displayio_display_root_group_obj, (mp_obj_t)&displayio_display_get_root_group_obj); diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c index 215a0c7270..94d2978cef 100644 --- a/shared-bindings/displayio/EPaperDisplay.c +++ b/shared-bindings/displayio/EPaperDisplay.c @@ -268,7 +268,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_time_to_refresh_obj, displayio_epaperdisplay_obj_get_time_to_refresh); -const mp_obj_property_getter_t displayio_epaperdisplay_time_to_refresh_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_time_to_refresh_obj, +MP_PROPERTY_GETTER(displayio_epaperdisplay_time_to_refresh_obj, (mp_obj_t)&displayio_epaperdisplay_get_time_to_refresh_obj); //| busy: bool @@ -281,7 +281,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_busy(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_busy_obj, displayio_epaperdisplay_obj_get_busy); -const mp_obj_property_getter_t displayio_epaperdisplay_busy_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_busy_obj, +MP_PROPERTY_GETTER(displayio_epaperdisplay_busy_obj, (mp_obj_t)&displayio_epaperdisplay_get_busy_obj); //| width: int @@ -293,7 +293,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_width_obj, displayio_epaperdisplay_obj_get_width); -const mp_obj_property_getter_t displayio_epaperdisplay_width_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_width_obj, +MP_PROPERTY_GETTER(displayio_epaperdisplay_width_obj, (mp_obj_t)&displayio_epaperdisplay_get_width_obj); //| height: int @@ -305,7 +305,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_height_obj, displayio_epaperdisplay_obj_get_height); -const mp_obj_property_getter_t displayio_epaperdisplay_height_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_height_obj, +MP_PROPERTY_GETTER(displayio_epaperdisplay_height_obj, (mp_obj_t)&displayio_epaperdisplay_get_height_obj); //| rotation: int @@ -324,7 +324,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_set_rotation(mp_obj_t self_in, mp_ob MP_DEFINE_CONST_FUN_OBJ_2(displayio_epaperdisplay_set_rotation_obj, displayio_epaperdisplay_obj_set_rotation); -const mp_obj_property_getset_t displayio_epaperdisplay_rotation_obj = MP_PROPERTY_GETSET(displayio_epaperdisplay_rotation_obj, +MP_PROPERTY_GETSET(displayio_epaperdisplay_rotation_obj, (mp_obj_t)&displayio_epaperdisplay_get_rotation_obj, (mp_obj_t)&displayio_epaperdisplay_set_rotation_obj); @@ -337,7 +337,7 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_get_bus(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_bus_obj, displayio_epaperdisplay_obj_get_bus); -const mp_obj_property_getter_t displayio_epaperdisplay_bus_obj = MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj, +MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj, (mp_obj_t)&displayio_epaperdisplay_get_bus_obj); diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c index 359cc1da30..188331f99d 100644 --- a/shared-bindings/displayio/Group.c +++ b/shared-bindings/displayio/Group.c @@ -97,7 +97,7 @@ STATIC mp_obj_t displayio_group_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_hidden_obj, displayio_group_obj_set_hidden); -const mp_obj_property_getset_t displayio_group_hidden_obj = MP_PROPERTY_GETSET(displayio_group_hidden_obj, +MP_PROPERTY_GETSET(displayio_group_hidden_obj, (mp_obj_t)&displayio_group_get_hidden_obj, (mp_obj_t)&displayio_group_set_hidden_obj); @@ -123,7 +123,7 @@ STATIC mp_obj_t displayio_group_obj_set_scale(mp_obj_t self_in, mp_obj_t scale_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_scale_obj, displayio_group_obj_set_scale); -const mp_obj_property_getset_t displayio_group_scale_obj = MP_PROPERTY_GETSET(displayio_group_scale_obj, +MP_PROPERTY_GETSET(displayio_group_scale_obj, (mp_obj_t)&displayio_group_get_scale_obj, (mp_obj_t)&displayio_group_set_scale_obj); @@ -145,7 +145,7 @@ STATIC mp_obj_t displayio_group_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_x_obj, displayio_group_obj_set_x); -const mp_obj_property_getset_t displayio_group_x_obj = MP_PROPERTY_GETSET(displayio_group_x_obj, +MP_PROPERTY_GETSET(displayio_group_x_obj, (mp_obj_t)&displayio_group_get_x_obj, (mp_obj_t)&displayio_group_set_x_obj); @@ -167,7 +167,7 @@ STATIC mp_obj_t displayio_group_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_set_y_obj, displayio_group_obj_set_y); -const mp_obj_property_getset_t displayio_group_y_obj = MP_PROPERTY_GETSET(displayio_group_y_obj, +MP_PROPERTY_GETSET(displayio_group_y_obj, (mp_obj_t)&displayio_group_get_y_obj, (mp_obj_t)&displayio_group_set_y_obj); diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c index 0c17d0328b..aa749bf7f7 100644 --- a/shared-bindings/displayio/OnDiskBitmap.c +++ b/shared-bindings/displayio/OnDiskBitmap.c @@ -109,7 +109,7 @@ STATIC mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_width_obj, displayio_ondiskbitmap_obj_get_width); -const mp_obj_property_getter_t displayio_ondiskbitmap_width_obj = MP_PROPERTY_GETTER(displayio_ondiskbitmap_width_obj, +MP_PROPERTY_GETTER(displayio_ondiskbitmap_width_obj, (mp_obj_t)&displayio_ondiskbitmap_get_width_obj); //| height: int @@ -123,7 +123,7 @@ STATIC mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_height_obj, displayio_ondiskbitmap_obj_get_height); -const mp_obj_property_getter_t displayio_ondiskbitmap_height_obj = MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj, +MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj, (mp_obj_t)&displayio_ondiskbitmap_get_height_obj); //| pixel_shader: Union[ColorConverter, Palette] diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 44e24be52d..113721bcc6 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -161,7 +161,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_hidden(mp_obj_t self_in, mp_obj_t hid } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_hidden_obj, displayio_tilegrid_obj_set_hidden); -const mp_obj_property_getset_t displayio_tilegrid_hidden_obj = MP_PROPERTY_GETSET(displayio_tilegrid_hidden_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_hidden_obj, (mp_obj_t)&displayio_tilegrid_get_hidden_obj, (mp_obj_t)&displayio_tilegrid_set_hidden_obj); @@ -183,7 +183,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_x_obj, displayio_tilegrid_obj_set_x); -const mp_obj_property_getset_t displayio_tilegrid_x_obj = MP_PROPERTY_GETSET(displayio_tilegrid_x_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_x_obj, (mp_obj_t)&displayio_tilegrid_get_x_obj, (mp_obj_t)&displayio_tilegrid_set_x_obj); @@ -205,7 +205,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_y_obj, displayio_tilegrid_obj_set_y); -const mp_obj_property_getset_t displayio_tilegrid_y_obj = MP_PROPERTY_GETSET(displayio_tilegrid_y_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_y_obj, (mp_obj_t)&displayio_tilegrid_get_y_obj, (mp_obj_t)&displayio_tilegrid_set_y_obj); @@ -218,7 +218,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_width_obj, displayio_tilegrid_obj_get_width); -const mp_obj_property_getter_t displayio_tilegrid_width_obj = MP_PROPERTY_GETTER(displayio_tilegrid_width_obj, +MP_PROPERTY_GETTER(displayio_tilegrid_width_obj, (mp_obj_t)&displayio_tilegrid_get_width_obj); //| height: int @@ -230,7 +230,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_height_obj, displayio_tilegrid_obj_get_height); -const mp_obj_property_getter_t displayio_tilegrid_height_obj = MP_PROPERTY_GETTER(displayio_tilegrid_height_obj, +MP_PROPERTY_GETTER(displayio_tilegrid_height_obj, (mp_obj_t)&displayio_tilegrid_get_height_obj); //| tile_width: int @@ -242,7 +242,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_tile_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_tile_width_obj, displayio_tilegrid_obj_get_tile_width); -const mp_obj_property_getter_t displayio_tilegrid_tile_width_obj = MP_PROPERTY_GETTER(displayio_tilegrid_tile_width_obj, +MP_PROPERTY_GETTER(displayio_tilegrid_tile_width_obj, (mp_obj_t)&displayio_tilegrid_get_tile_width_obj); //| tile_height: int @@ -254,7 +254,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_get_tile_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_tile_height_obj, displayio_tilegrid_obj_get_tile_height); -const mp_obj_property_getter_t displayio_tilegrid_tile_height_obj = MP_PROPERTY_GETTER(displayio_tilegrid_tile_height_obj, +MP_PROPERTY_GETTER(displayio_tilegrid_tile_height_obj, (mp_obj_t)&displayio_tilegrid_get_tile_height_obj); //| flip_x: bool @@ -274,7 +274,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_flip_x(mp_obj_t self_in, mp_obj_t fli } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_flip_x_obj, displayio_tilegrid_obj_set_flip_x); -const mp_obj_property_getset_t displayio_tilegrid_flip_x_obj = MP_PROPERTY_GETSET(displayio_tilegrid_flip_x_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_flip_x_obj, (mp_obj_t)&displayio_tilegrid_get_flip_x_obj, (mp_obj_t)&displayio_tilegrid_set_flip_x_obj); @@ -295,7 +295,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_flip_y(mp_obj_t self_in, mp_obj_t fli } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_flip_y_obj, displayio_tilegrid_obj_set_flip_y); -const mp_obj_property_getset_t displayio_tilegrid_flip_y_obj = MP_PROPERTY_GETSET(displayio_tilegrid_flip_y_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_flip_y_obj, (mp_obj_t)&displayio_tilegrid_get_flip_y_obj, (mp_obj_t)&displayio_tilegrid_set_flip_y_obj); @@ -318,7 +318,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_transpose_xy(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_transpose_xy_obj, displayio_tilegrid_obj_set_transpose_xy); -const mp_obj_property_getset_t displayio_tilegrid_transpose_xy_obj = MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, (mp_obj_t)&displayio_tilegrid_get_transpose_xy_obj, (mp_obj_t)&displayio_tilegrid_set_transpose_xy_obj); @@ -343,7 +343,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_pixel_shader_obj, displayio_tilegrid_obj_set_pixel_shader); -const mp_obj_property_getset_t displayio_tilegrid_pixel_shader_obj = MP_PROPERTY_GETSET(displayio_tilegrid_pixel_shader_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_pixel_shader_obj, (mp_obj_t)&displayio_tilegrid_get_pixel_shader_obj, (mp_obj_t)&displayio_tilegrid_set_pixel_shader_obj); @@ -406,7 +406,7 @@ STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bit } MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_bitmap_obj, displayio_tilegrid_obj_set_bitmap); -const mp_obj_property_getset_t displayio_tilegrid_bitmap_obj = MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj, +MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj, (mp_obj_t)&displayio_tilegrid_get_bitmap_obj, (mp_obj_t)&displayio_tilegrid_set_bitmap_obj); diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c index 307ac908e2..9c97d9a9a3 100644 --- a/shared-bindings/fontio/BuiltinFont.c +++ b/shared-bindings/fontio/BuiltinFont.c @@ -76,7 +76,7 @@ STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bitmap_obj, fontio_builtinfont_obj_get_bitmap); -const mp_obj_property_getter_t fontio_builtinfont_bitmap_obj = MP_PROPERTY_GETTER(fontio_builtinfont_bitmap_obj, +MP_PROPERTY_GETTER(fontio_builtinfont_bitmap_obj, (mp_obj_t)&fontio_builtinfont_get_bitmap_obj); //| def get_bounding_box(self) -> Tuple[int, int]: diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c index 9fab93799e..daff2174fa 100644 --- a/shared-bindings/framebufferio/FramebufferDisplay.c +++ b/shared-bindings/framebufferio/FramebufferDisplay.c @@ -168,7 +168,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_refresh(mp_obj_t s } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_refresh_obj, framebufferio_framebufferdisplay_obj_set_auto_refresh); -const mp_obj_property_getset_t framebufferio_framebufferdisplay_auto_refresh_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj, +MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_auto_refresh_obj, (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_refresh_obj); @@ -202,7 +202,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t sel } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_brightness_obj, framebufferio_framebufferdisplay_obj_set_brightness); -const mp_obj_property_getset_t framebufferio_framebufferdisplay_brightness_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj, +MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_brightness_obj, (mp_obj_t)&framebufferio_framebufferdisplay_set_brightness_obj); @@ -230,7 +230,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_brightness(mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_brightness_obj, framebufferio_framebufferdisplay_obj_set_auto_brightness); -const mp_obj_property_getset_t framebufferio_framebufferdisplay_auto_brightness_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_brightness_obj, +MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_brightness_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_auto_brightness_obj, (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_brightness_obj); @@ -243,7 +243,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_width_obj, framebufferio_framebufferdisplay_obj_get_width); -const mp_obj_property_getter_t framebufferio_framebufferdisplay_width_obj = MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_width_obj, +MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_width_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_width_obj); //| height: int @@ -255,7 +255,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_height_obj, framebufferio_framebufferdisplay_obj_get_height); -const mp_obj_property_getter_t framebufferio_framebufferdisplay_height_obj = MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_height_obj, +MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_height_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_height_obj); //| rotation: int @@ -274,7 +274,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_rotation(mp_obj_t self_ MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_rotation_obj, framebufferio_framebufferdisplay_obj_set_rotation); -const mp_obj_property_getset_t framebufferio_framebufferdisplay_rotation_obj = MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_rotation_obj, +MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_rotation_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_rotation_obj, (mp_obj_t)&framebufferio_framebufferdisplay_set_rotation_obj); @@ -288,7 +288,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_framebuffer_obj, framebufferio_framebufferdisplay_obj_get_framebuffer); -const mp_obj_property_getter_t framebufferio_framebufferframebuffer_obj = MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj, +MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_framebuffer_obj); diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c index 32809cb48f..2f6ebd06c2 100644 --- a/shared-bindings/frequencyio/FrequencyIn.c +++ b/shared-bindings/frequencyio/FrequencyIn.c @@ -193,7 +193,7 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_set_capture_period(mp_obj_t self_in, } MP_DEFINE_CONST_FUN_OBJ_2(frequencyio_frequency_set_capture_period_obj, frequencyio_frequencyin_obj_set_capture_period); -const mp_obj_property_getset_t frequencyio_frequencyin_capture_period_obj = MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj, +MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj, (mp_obj_t)&frequencyio_frequency_get_capture_period_obj, (mp_obj_t)&frequencyio_frequency_set_capture_period_obj); @@ -210,7 +210,7 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_get_value_obj, frequencyio_frequencyin_obj_get_value); -const mp_obj_property_getter_t frequencyio_frequencyin_value_obj = MP_PROPERTY_GETTER(frequencyio_frequencyin_value_obj, +MP_PROPERTY_GETTER(frequencyio_frequencyin_value_obj, (mp_obj_t)&frequencyio_frequencyin_get_value_obj); STATIC const mp_rom_map_elem_t frequencyio_frequencyin_locals_dict_table[] = { diff --git a/shared-bindings/gnss/GNSS.c b/shared-bindings/gnss/GNSS.c index a01e14bca3..0bd800bdc6 100644 --- a/shared-bindings/gnss/GNSS.c +++ b/shared-bindings/gnss/GNSS.c @@ -108,7 +108,7 @@ STATIC mp_obj_t gnss_obj_get_latitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_latitude_obj, gnss_obj_get_latitude); -const mp_obj_property_getter_t gnss_latitude_obj = MP_PROPERTY_GETTER(gnss_latitude_obj, +MP_PROPERTY_GETTER(gnss_latitude_obj, (mp_obj_t)&gnss_get_latitude_obj); //| longitude: float @@ -121,7 +121,7 @@ STATIC mp_obj_t gnss_obj_get_longitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_longitude_obj, gnss_obj_get_longitude); -const mp_obj_property_getter_t gnss_longitude_obj = MP_PROPERTY_GETTER(gnss_longitude_obj, +MP_PROPERTY_GETTER(gnss_longitude_obj, (mp_obj_t)&gnss_get_longitude_obj); //| altitude: float @@ -134,7 +134,7 @@ STATIC mp_obj_t gnss_obj_get_altitude(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_altitude_obj, gnss_obj_get_altitude); -const mp_obj_property_getter_t gnss_altitude_obj = MP_PROPERTY_GETTER(gnss_altitude_obj, +MP_PROPERTY_GETTER(gnss_altitude_obj, (mp_obj_t)&gnss_get_altitude_obj); //| timestamp: time.struct_time @@ -149,7 +149,7 @@ STATIC mp_obj_t gnss_obj_get_timestamp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_timestamp_obj, gnss_obj_get_timestamp); -const mp_obj_property_getter_t gnss_timestamp_obj = MP_PROPERTY_GETTER(gnss_timestamp_obj, +MP_PROPERTY_GETTER(gnss_timestamp_obj, (mp_obj_t)&gnss_get_timestamp_obj); //| fix: PositionFix @@ -162,7 +162,7 @@ STATIC mp_obj_t gnss_obj_get_fix(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(gnss_get_fix_obj, gnss_obj_get_fix); -const mp_obj_property_getter_t gnss_fix_obj = MP_PROPERTY_GETTER(gnss_fix_obj, +MP_PROPERTY_GETTER(gnss_fix_obj, (mp_obj_t)&gnss_get_fix_obj); STATIC const mp_rom_map_elem_t gnss_locals_dict_table[] = { diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c index 5cc600e839..23204329d3 100644 --- a/shared-bindings/ipaddress/IPv4Address.c +++ b/shared-bindings/ipaddress/IPv4Address.c @@ -96,7 +96,7 @@ STATIC mp_obj_t ipaddress_ipv4address_get_packed(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(ipaddress_ipv4address_get_packed_obj, ipaddress_ipv4address_get_packed); -const mp_obj_property_getter_t ipaddress_ipv4address_packed_obj = MP_PROPERTY_GETTER(ipaddress_ipv4address_packed_obj, +MP_PROPERTY_GETTER(ipaddress_ipv4address_packed_obj, (mp_obj_t)&ipaddress_ipv4address_get_packed_obj); //| version: int @@ -116,7 +116,7 @@ STATIC mp_obj_t ipaddress_ipv4address_get_version(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(ipaddress_ipv4address_get_version_obj, ipaddress_ipv4address_get_version); -const mp_obj_property_getter_t ipaddress_ipv4address_version_obj = MP_PROPERTY_GETTER(ipaddress_ipv4address_version_obj, +MP_PROPERTY_GETTER(ipaddress_ipv4address_version_obj, (mp_obj_t)&ipaddress_ipv4address_get_version_obj); //| def __eq__(self, other: object) -> bool: diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c index 146958dc24..e1a87e8ee0 100644 --- a/shared-bindings/is31fl3741/FrameBuffer.c +++ b/shared-bindings/is31fl3741/FrameBuffer.c @@ -166,7 +166,7 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_set_brightness(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(is31fl3741_FrameBuffer_set_brightness_obj, is31fl3741_FrameBuffer_set_brightness); -const mp_obj_property_getset_t is31fl3741_FrameBuffer_brightness_obj = MP_PROPERTY_GETSET(is31fl3741_FrameBuffer_brightness_obj, +MP_PROPERTY_GETSET(is31fl3741_FrameBuffer_brightness_obj, (mp_obj_t)&is31fl3741_FrameBuffer_get_brightness_obj, (mp_obj_t)&is31fl3741_FrameBuffer_set_brightness_obj); @@ -192,7 +192,7 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_FrameBuffer_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_FrameBuffer_get_width_obj, is31fl3741_FrameBuffer_get_width); -const mp_obj_property_getter_t is31fl3741_FrameBuffer_width_obj = MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_width_obj, +MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_width_obj, (mp_obj_t)&is31fl3741_FrameBuffer_get_width_obj); //| height: int @@ -204,7 +204,7 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_get_height(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_FrameBuffer_get_height(self)); } MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_FrameBuffer_get_height_obj, is31fl3741_FrameBuffer_get_height); -const mp_obj_property_getter_t is31fl3741_FrameBuffer_height_obj = MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_height_obj, +MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_height_obj, (mp_obj_t)&is31fl3741_FrameBuffer_get_height_obj); STATIC const mp_rom_map_elem_t is31fl3741_FrameBuffer_locals_dict_table[] = { diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c index ac12da4d09..380b6b5b41 100644 --- a/shared-bindings/keypad/Event.c +++ b/shared-bindings/keypad/Event.c @@ -76,7 +76,7 @@ STATIC mp_obj_t keypad_event_get_key_number(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_number_obj, keypad_event_get_key_number); -const mp_obj_property_getter_t keypad_event_key_number_obj = MP_PROPERTY_GETTER(keypad_event_key_number_obj, +MP_PROPERTY_GETTER(keypad_event_key_number_obj, (mp_obj_t)&keypad_event_get_key_number_obj); //| pressed: bool @@ -90,7 +90,7 @@ STATIC mp_obj_t keypad_event_get_pressed(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_pressed_obj, keypad_event_get_pressed); -const mp_obj_property_getter_t keypad_event_pressed_obj = MP_PROPERTY_GETTER(keypad_event_pressed_obj, +MP_PROPERTY_GETTER(keypad_event_pressed_obj, (mp_obj_t)&keypad_event_get_pressed_obj); //| released: bool @@ -104,7 +104,7 @@ STATIC mp_obj_t keypad_event_get_released(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_released_obj, keypad_event_get_released); -const mp_obj_property_getter_t keypad_event_released_obj = MP_PROPERTY_GETTER(keypad_event_released_obj, +MP_PROPERTY_GETTER(keypad_event_released_obj, (mp_obj_t)&keypad_event_get_released_obj); //| timestamp: int @@ -116,7 +116,7 @@ STATIC mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_timestamp_obj, keypad_event_get_timestamp); -const mp_obj_property_getter_t keypad_event_timestamp_obj = MP_PROPERTY_GETTER(keypad_event_timestamp_obj, +MP_PROPERTY_GETTER(keypad_event_timestamp_obj, (mp_obj_t)&keypad_event_get_timestamp_obj); diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c index 64a673e846..8e45f7ad1d 100644 --- a/shared-bindings/keypad/EventQueue.c +++ b/shared-bindings/keypad/EventQueue.c @@ -129,7 +129,7 @@ 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); -const mp_obj_property_getter_t keypad_eventqueue_overflowed_obj = MP_PROPERTY_GETTER(keypad_eventqueue_overflowed_obj, +MP_PROPERTY_GETTER(keypad_eventqueue_overflowed_obj, (mp_obj_t)&keypad_eventqueue_get_overflowed_obj); STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = { diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c index 133144f993..846207b69b 100644 --- a/shared-bindings/mdns/RemoteService.c +++ b/shared-bindings/mdns/RemoteService.c @@ -52,7 +52,7 @@ STATIC mp_obj_t mdns_remoteservice_get_hostname(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_hostname_obj, mdns_remoteservice_get_hostname); -const mp_obj_property_getter_t mdns_remoteservice_hostname_obj = MP_PROPERTY_GETTER(mdns_remoteservice_hostname_obj, +MP_PROPERTY_GETTER(mdns_remoteservice_hostname_obj, (mp_obj_t)&mdns_remoteservice_get_hostname_obj); //| instance_name: str @@ -65,7 +65,7 @@ STATIC mp_obj_t remoteservice_get_instance_name(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_instance_name_obj, remoteservice_get_instance_name); -const mp_obj_property_getter_t mdns_remoteservice_instance_name_obj = MP_PROPERTY_GETTER(mdns_remoteservice_instance_name_obj, +MP_PROPERTY_GETTER(mdns_remoteservice_instance_name_obj, (mp_obj_t)&mdns_remoteservice_get_instance_name_obj); //| service_type: str @@ -78,7 +78,7 @@ STATIC mp_obj_t remoteservice_get_service_type(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_service_type_obj, remoteservice_get_service_type); -const mp_obj_property_getter_t mdns_remoteservice_service_type_obj = MP_PROPERTY_GETTER(mdns_remoteservice_service_type_obj, +MP_PROPERTY_GETTER(mdns_remoteservice_service_type_obj, (mp_obj_t)&mdns_remoteservice_get_service_type_obj); //| protocol: str @@ -91,7 +91,7 @@ STATIC mp_obj_t remoteservice_get_protocol(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_protocol_obj, remoteservice_get_protocol); -const mp_obj_property_getter_t mdns_remoteservice_protocol_obj = MP_PROPERTY_GETTER(mdns_remoteservice_protocol_obj, +MP_PROPERTY_GETTER(mdns_remoteservice_protocol_obj, (mp_obj_t)&mdns_remoteservice_get_protocol_obj); //| port: int @@ -103,7 +103,7 @@ STATIC mp_obj_t remoteservice_get_port(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_port_obj, remoteservice_get_port); -const mp_obj_property_getter_t mdns_remoteservice_port_obj = MP_PROPERTY_GETTER(mdns_remoteservice_port_obj, +MP_PROPERTY_GETTER(mdns_remoteservice_port_obj, (mp_obj_t)&mdns_remoteservice_get_port_obj); //| def __del__(self) -> None: diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c index a196a9174a..b5e6c11216 100644 --- a/shared-bindings/mdns/Server.c +++ b/shared-bindings/mdns/Server.c @@ -99,7 +99,7 @@ static mp_obj_t mdns_server_set_hostname(mp_obj_t self, mp_obj_t hostname) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_hostname_obj, mdns_server_set_hostname); -const mp_obj_property_getset_t mdns_server_hostname_obj = MP_PROPERTY_GETSET(mdns_server_hostname_obj, +MP_PROPERTY_GETSET(mdns_server_hostname_obj, (mp_obj_t)&mdns_server_get_hostname_obj, (mp_obj_t)&mdns_server_set_hostname_obj); @@ -120,7 +120,7 @@ STATIC mp_obj_t mdns_server_set_instance_name(mp_obj_t self, mp_obj_t new_instan } MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_instance_name_obj, mdns_server_set_instance_name); -const mp_obj_property_getset_t mdns_server_instance_name_obj = MP_PROPERTY_GETSET(mdns_server_instance_name_obj, +MP_PROPERTY_GETSET(mdns_server_instance_name_obj, (mp_obj_t)&mdns_server_get_instance_name_obj, (mp_obj_t)&mdns_server_set_instance_name_obj); diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c index 0a72a1d440..1c39fdcd92 100644 --- a/shared-bindings/memorymonitor/AllocationSize.c +++ b/shared-bindings/memorymonitor/AllocationSize.c @@ -105,7 +105,7 @@ STATIC mp_obj_t memorymonitor_allocationsize_obj_get_bytes_per_block(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationsize_get_bytes_per_block_obj, memorymonitor_allocationsize_obj_get_bytes_per_block); -const mp_obj_property_getter_t memorymonitor_allocationsize_bytes_per_block_obj = MP_PROPERTY_GETTER(memorymonitor_allocationsize_bytes_per_block_obj, +MP_PROPERTY_GETTER(memorymonitor_allocationsize_bytes_per_block_obj, (mp_obj_t)&memorymonitor_allocationsize_get_bytes_per_block_obj); //| def __len__(self) -> int: diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index cbdbd7ebcb..ff1b52eecd 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -88,7 +88,7 @@ STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_frequency_obj, mcu_processor_get_frequency); -const mp_obj_property_getset_t mcu_processor_frequency_obj = MP_PROPERTY_GETSET(mcu_processor_frequency_obj, +MP_PROPERTY_GETSET(mcu_processor_frequency_obj, (mp_obj_t)&mcu_processor_get_frequency_obj, (mp_obj_t)&mcu_processor_set_frequency_obj); @@ -101,7 +101,7 @@ STATIC mp_obj_t mcu_processor_get_reset_reason(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_reset_reason_obj, mcu_processor_get_reset_reason); -const mp_obj_property_getter_t mcu_processor_reset_reason_obj = MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj, +MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj, (mp_obj_t)&mcu_processor_get_reset_reason_obj); //| temperature: Optional[float] @@ -116,7 +116,7 @@ STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_temperature_obj, mcu_processor_get_temperature); -const mp_obj_property_getter_t mcu_processor_temperature_obj = MP_PROPERTY_GETTER(mcu_processor_temperature_obj, +MP_PROPERTY_GETTER(mcu_processor_temperature_obj, (mp_obj_t)&mcu_processor_get_temperature_obj); //| uid: bytearray @@ -130,7 +130,7 @@ STATIC mp_obj_t mcu_processor_get_uid(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_uid_obj, mcu_processor_get_uid); -const mp_obj_property_getter_t mcu_processor_uid_obj = MP_PROPERTY_GETTER(mcu_processor_uid_obj, +MP_PROPERTY_GETTER(mcu_processor_uid_obj, (mp_obj_t)&mcu_processor_get_uid_obj); //| voltage: Optional[float] @@ -145,7 +145,7 @@ STATIC mp_obj_t mcu_processor_get_voltage(mp_obj_t self) { MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_voltage_obj, mcu_processor_get_voltage); -const mp_obj_property_getter_t mcu_processor_voltage_obj = MP_PROPERTY_GETTER(mcu_processor_voltage_obj, +MP_PROPERTY_GETTER(mcu_processor_voltage_obj, (mp_obj_t)&mcu_processor_get_voltage_obj); STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c index 822bf64977..1719e209b2 100644 --- a/shared-bindings/msgpack/ExtType.c +++ b/shared-bindings/msgpack/ExtType.c @@ -80,7 +80,7 @@ STATIC mp_obj_t mod_msgpack_exttype_set_code(mp_obj_t self_in, mp_obj_t code_in) } MP_DEFINE_CONST_FUN_OBJ_2(mod_msgpack_exttype_set_code_obj, mod_msgpack_exttype_set_code); -const mp_obj_property_getset_t mod_msgpack_exttype_code_obj = MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj, +MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj, (mp_obj_t)&mod_msgpack_exttype_get_code_obj, (mp_obj_t)&mod_msgpack_exttype_set_code_obj); @@ -101,7 +101,7 @@ STATIC mp_obj_t mod_msgpack_exttype_set_data(mp_obj_t self_in, mp_obj_t data_in) } MP_DEFINE_CONST_FUN_OBJ_2(mod_msgpack_exttype_set_data_obj, mod_msgpack_exttype_set_data); -const mp_obj_property_getset_t mod_msgpack_exttype_data_obj = MP_PROPERTY_GETSET(mod_msgpack_exttype_data_obj, +MP_PROPERTY_GETSET(mod_msgpack_exttype_data_obj, (mp_obj_t)&mod_msgpack_exttype_get_data_obj, (mp_obj_t)&mod_msgpack_exttype_set_data_obj); diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c index 8f325034c9..21dfdae42c 100644 --- a/shared-bindings/pulseio/PulseIn.c +++ b/shared-bindings/pulseio/PulseIn.c @@ -208,7 +208,7 @@ STATIC mp_obj_t pulseio_pulsein_obj_get_maxlen(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_get_maxlen_obj, pulseio_pulsein_obj_get_maxlen); -const mp_obj_property_getter_t pulseio_pulsein_maxlen_obj = MP_PROPERTY_GETTER(pulseio_pulsein_maxlen_obj, +MP_PROPERTY_GETTER(pulseio_pulsein_maxlen_obj, (mp_obj_t)&pulseio_pulsein_get_maxlen_obj); //| paused: bool @@ -223,7 +223,7 @@ STATIC mp_obj_t pulseio_pulsein_obj_get_paused(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_get_paused_obj, pulseio_pulsein_obj_get_paused); -const mp_obj_property_getter_t pulseio_pulsein_paused_obj = MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj, +MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj, (mp_obj_t)&pulseio_pulsein_get_paused_obj); //| def __bool__(self) -> bool: ... diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c index 42207f8974..60a9dfb8b9 100644 --- a/shared-bindings/pwmio/PWMOut.c +++ b/shared-bindings/pwmio/PWMOut.c @@ -220,7 +220,7 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t duty_ } MP_DEFINE_CONST_FUN_OBJ_2(pwmio_pwmout_set_duty_cycle_obj, pwmio_pwmout_obj_set_duty_cycle); -const mp_obj_property_getset_t pwmio_pwmout_duty_cycle_obj = MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj, +MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj, (mp_obj_t)&pwmio_pwmout_get_duty_cycle_obj, (mp_obj_t)&pwmio_pwmout_set_duty_cycle_obj); @@ -258,7 +258,7 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t freque } MP_DEFINE_CONST_FUN_OBJ_2(pwmio_pwmout_set_frequency_obj, pwmio_pwmout_obj_set_frequency); -const mp_obj_property_getset_t pwmio_pwmout_frequency_obj = MP_PROPERTY_GETSET(pwmio_pwmout_frequency_obj, +MP_PROPERTY_GETSET(pwmio_pwmout_frequency_obj, (mp_obj_t)&pwmio_pwmout_get_frequency_obj, (mp_obj_t)&pwmio_pwmout_set_frequency_obj); diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c index f7d3578b95..d2d4785ed8 100644 --- a/shared-bindings/qrio/QRDecoder.c +++ b/shared-bindings/qrio/QRDecoder.c @@ -107,7 +107,7 @@ STATIC mp_obj_t qrio_qrdecoder_set_width(mp_obj_t self_in, mp_obj_t width_in) { } MP_DEFINE_CONST_FUN_OBJ_2(qrio_qrdecoder_set_width_obj, qrio_qrdecoder_set_width); -const mp_obj_property_getset_t qrio_qrdecoder_width_obj = MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj, +MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj, (mp_obj_t)&qrio_qrdecoder_get_width_obj, (mp_obj_t)&qrio_qrdecoder_set_width_obj); @@ -128,7 +128,7 @@ STATIC mp_obj_t qrio_qrdecoder_set_height(mp_obj_t self_in, mp_obj_t height_in) } MP_DEFINE_CONST_FUN_OBJ_2(qrio_qrdecoder_set_height_obj, qrio_qrdecoder_set_height); -const mp_obj_property_getset_t qrio_qrdecoder_height_obj = MP_PROPERTY_GETSET(qrio_qrdecoder_height_obj, +MP_PROPERTY_GETSET(qrio_qrdecoder_height_obj, (mp_obj_t)&qrio_qrdecoder_get_height_obj, (mp_obj_t)&qrio_qrdecoder_set_height_obj); diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c index c48b550a06..4739807bd0 100644 --- a/shared-bindings/rgbmatrix/RGBMatrix.c +++ b/shared-bindings/rgbmatrix/RGBMatrix.c @@ -310,7 +310,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_set_brightness(mp_obj_t self_in, mp_obj_t va } MP_DEFINE_CONST_FUN_OBJ_2(rgbmatrix_rgbmatrix_set_brightness_obj, rgbmatrix_rgbmatrix_set_brightness); -const mp_obj_property_getset_t rgbmatrix_rgbmatrix_brightness_obj = MP_PROPERTY_GETSET(rgbmatrix_rgbmatrix_brightness_obj, +MP_PROPERTY_GETSET(rgbmatrix_rgbmatrix_brightness_obj, (mp_obj_t)&rgbmatrix_rgbmatrix_get_brightness_obj, (mp_obj_t)&rgbmatrix_rgbmatrix_set_brightness_obj); @@ -336,7 +336,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_rgbmatrix_rgbmatrix_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_width_obj, rgbmatrix_rgbmatrix_get_width); -const mp_obj_property_getter_t rgbmatrix_rgbmatrix_width_obj = MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj, +MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj, (mp_obj_t)&rgbmatrix_rgbmatrix_get_width_obj); //| height: int @@ -349,7 +349,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_height_obj, rgbmatrix_rgbmatrix_get_height); -const mp_obj_property_getter_t rgbmatrix_rgbmatrix_height_obj = MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_height_obj, +MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_height_obj, (mp_obj_t)&rgbmatrix_rgbmatrix_get_height_obj); STATIC const mp_rom_map_elem_t rgbmatrix_rgbmatrix_locals_dict_table[] = { diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c index b80751fce3..0fe22be262 100644 --- a/shared-bindings/rotaryio/IncrementalEncoder.c +++ b/shared-bindings/rotaryio/IncrementalEncoder.c @@ -141,7 +141,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_divisor(mp_obj_t self_in, mp } MP_DEFINE_CONST_FUN_OBJ_2(rotaryio_incrementalencoder_set_divisor_obj, rotaryio_incrementalencoder_obj_set_divisor); -const mp_obj_property_getset_t rotaryio_incrementalencoder_divisor_obj = MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj, +MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj, (mp_obj_t)&rotaryio_incrementalencoder_get_divisor_obj, (mp_obj_t)&rotaryio_incrementalencoder_set_divisor_obj); @@ -166,7 +166,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_position(mp_obj_t self_in, m } MP_DEFINE_CONST_FUN_OBJ_2(rotaryio_incrementalencoder_set_position_obj, rotaryio_incrementalencoder_obj_set_position); -const mp_obj_property_getset_t rotaryio_incrementalencoder_position_obj = MP_PROPERTY_GETSET(rotaryio_incrementalencoder_position_obj, +MP_PROPERTY_GETSET(rotaryio_incrementalencoder_position_obj, (mp_obj_t)&rotaryio_incrementalencoder_get_position_obj, (mp_obj_t)&rotaryio_incrementalencoder_set_position_obj); diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index 381477f5e8..b07f90bd01 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -87,7 +87,7 @@ STATIC mp_obj_t rtc_rtc_obj_set_datetime(mp_obj_t self_in, mp_obj_t datetime) { } MP_DEFINE_CONST_FUN_OBJ_2(rtc_rtc_set_datetime_obj, rtc_rtc_obj_set_datetime); -const mp_obj_property_getset_t rtc_rtc_datetime_obj = MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, +MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, (mp_obj_t)&rtc_rtc_get_datetime_obj, (mp_obj_t)&rtc_rtc_set_datetime_obj); @@ -115,7 +115,7 @@ STATIC mp_obj_t rtc_rtc_obj_set_calibration(mp_obj_t self_in, mp_obj_t calibrati } MP_DEFINE_CONST_FUN_OBJ_2(rtc_rtc_set_calibration_obj, rtc_rtc_obj_set_calibration); -const mp_obj_property_getset_t rtc_rtc_calibration_obj = MP_PROPERTY_GETSET(rtc_rtc_calibration_obj, +MP_PROPERTY_GETSET(rtc_rtc_calibration_obj, (mp_obj_t)&rtc_rtc_get_calibration_obj, (mp_obj_t)&rtc_rtc_set_calibration_obj); diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index a3d4988a00..f6407ff2a8 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -218,7 +218,7 @@ STATIC mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_frequency_obj, sdioio_sdcard_obj_get_frequency); -const mp_obj_property_getter_t sdioio_sdcard_frequency_obj = MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj, +MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj, (mp_obj_t)&sdioio_sdcard_get_frequency_obj); //| @property @@ -233,7 +233,7 @@ STATIC mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_width_obj, sdioio_sdcard_obj_get_width); -const mp_obj_property_getter_t sdioio_sdcard_width_obj = MP_PROPERTY_GETTER(sdioio_sdcard_width_obj, +MP_PROPERTY_GETTER(sdioio_sdcard_width_obj, (mp_obj_t)&sdioio_sdcard_get_width_obj); //| def deinit(self) -> None: diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c index 797452c4b9..5dfa5e599f 100644 --- a/shared-bindings/ssl/SSLContext.c +++ b/shared-bindings/ssl/SSLContext.c @@ -105,7 +105,7 @@ STATIC mp_obj_t ssl_sslcontext_set_check_hostname(mp_obj_t self_in, mp_obj_t val } STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslcontext_set_check_hostname_obj, ssl_sslcontext_set_check_hostname); -const mp_obj_property_getset_t ssl_sslcontext_check_hostname_obj = MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj, +MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj, (mp_obj_t)&ssl_sslcontext_get_check_hostname_obj, (mp_obj_t)&ssl_sslcontext_set_check_hostname_obj); diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c index 61de120f2d..55217ec97a 100644 --- a/shared-bindings/supervisor/Runtime.c +++ b/shared-bindings/supervisor/Runtime.c @@ -69,7 +69,7 @@ STATIC mp_obj_t supervisor_runtime_get_usb_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_usb_connected_obj, supervisor_runtime_get_usb_connected); -const mp_obj_property_getter_t supervisor_runtime_usb_connected_obj = MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj, +MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj, (mp_obj_t)&supervisor_runtime_get_usb_connected_obj); //| serial_connected: bool @@ -80,7 +80,7 @@ STATIC mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_connected_obj, supervisor_runtime_get_serial_connected); -const mp_obj_property_getter_t supervisor_runtime_serial_connected_obj = MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj, +MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj, (mp_obj_t)&supervisor_runtime_get_serial_connected_obj); //| serial_bytes_available: int @@ -93,7 +93,7 @@ STATIC mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_bytes_available_obj, supervisor_runtime_get_serial_bytes_available); -const mp_obj_property_getter_t supervisor_runtime_serial_bytes_available_obj = MP_PROPERTY_GETTER(supervisor_runtime_serial_bytes_available_obj, +MP_PROPERTY_GETTER(supervisor_runtime_serial_bytes_available_obj, (mp_obj_t)&supervisor_runtime_get_serial_bytes_available_obj); supervisor_run_reason_t supervisor_get_run_reason(void) { @@ -112,7 +112,7 @@ STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_run_reason_obj, supervisor_runtime_get_run_reason); -const mp_obj_property_getter_t supervisor_runtime_run_reason_obj = MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj, +MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj, (mp_obj_t)&supervisor_runtime_get_run_reason_obj); STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = { diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c index 8c42358340..7805c1a6a0 100644 --- a/shared-bindings/synthio/MidiTrack.c +++ b/shared-bindings/synthio/MidiTrack.c @@ -132,7 +132,7 @@ STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_sample_rate_obj, synthio_miditrack_obj_get_sample_rate); -const mp_obj_property_getter_t synthio_miditrack_sample_rate_obj = MP_PROPERTY_GETTER(synthio_miditrack_sample_rate_obj, +MP_PROPERTY_GETTER(synthio_miditrack_sample_rate_obj, (mp_obj_t)&synthio_miditrack_get_sample_rate_obj); STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = { diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c index bd80285779..23b35253cb 100644 --- a/shared-bindings/touchio/TouchIn.c +++ b/shared-bindings/touchio/TouchIn.c @@ -120,7 +120,7 @@ STATIC mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_value_obj, touchio_touchin_obj_get_value); -const mp_obj_property_getter_t touchio_touchin_value_obj = MP_PROPERTY_GETTER(touchio_touchin_value_obj, +MP_PROPERTY_GETTER(touchio_touchin_value_obj, (mp_obj_t)&touchio_touchin_get_value_obj); @@ -135,7 +135,7 @@ STATIC mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_raw_value_obj, touchio_touchin_obj_get_raw_value); -const mp_obj_property_getter_t touchio_touchin_raw_value_obj = MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj, +MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj, (mp_obj_t)&touchio_touchin_get_raw_value_obj); @@ -175,7 +175,7 @@ STATIC mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t thr MP_DEFINE_CONST_FUN_OBJ_2(touchio_touchin_set_threshold_obj, touchio_touchin_obj_set_threshold); -const mp_obj_property_getset_t touchio_touchin_threshold_obj = MP_PROPERTY_GETSET(touchio_touchin_threshold_obj, +MP_PROPERTY_GETSET(touchio_touchin_threshold_obj, (mp_obj_t)&touchio_touchin_get_threshold_obj, (mp_obj_t)&touchio_touchin_set_threshold_obj); diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c index f6da33adc7..3a9e9bb421 100644 --- a/shared-bindings/usb/core/Device.c +++ b/shared-bindings/usb/core/Device.c @@ -79,7 +79,7 @@ STATIC mp_obj_t usb_core_device_obj_get_idVendor(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_idVendor_obj, usb_core_device_obj_get_idVendor); -const mp_obj_property_getter_t usb_core_device_idVendor_obj = MP_PROPERTY_GETTER(usb_core_device_idVendor_obj, +MP_PROPERTY_GETTER(usb_core_device_idVendor_obj, (mp_obj_t)&usb_core_device_get_idVendor_obj); //| idProduct: int @@ -91,7 +91,7 @@ STATIC mp_obj_t usb_core_device_obj_get_idProduct(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_idProduct_obj, usb_core_device_obj_get_idProduct); -const mp_obj_property_getter_t usb_core_device_idProduct_obj = MP_PROPERTY_GETTER(usb_core_device_idProduct_obj, +MP_PROPERTY_GETTER(usb_core_device_idProduct_obj, (mp_obj_t)&usb_core_device_get_idProduct_obj); //| serial_number: str @@ -103,7 +103,7 @@ STATIC mp_obj_t usb_core_device_obj_get_serial_number(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_serial_number_obj, usb_core_device_obj_get_serial_number); -const mp_obj_property_getter_t usb_core_device_serial_number_obj = MP_PROPERTY_GETTER(usb_core_device_serial_number_obj, +MP_PROPERTY_GETTER(usb_core_device_serial_number_obj, (mp_obj_t)&usb_core_device_get_serial_number_obj); //| product: str @@ -115,7 +115,7 @@ STATIC mp_obj_t usb_core_device_obj_get_product(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_product_obj, usb_core_device_obj_get_product); -const mp_obj_property_getter_t usb_core_device_product_obj = MP_PROPERTY_GETTER(usb_core_device_product_obj, +MP_PROPERTY_GETTER(usb_core_device_product_obj, (mp_obj_t)&usb_core_device_get_product_obj); //| manufacturer: str @@ -127,7 +127,7 @@ STATIC mp_obj_t usb_core_device_obj_get_manufacturer(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_manufacturer_obj, usb_core_device_obj_get_manufacturer); -const mp_obj_property_getter_t usb_core_device_manufacturer_obj = MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj, +MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj, (mp_obj_t)&usb_core_device_get_manufacturer_obj); //| def write(self, endpoint: int, data: ReadableBuffer, timeout = None) -> int: diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c index 610802d2f1..760efb6278 100644 --- a/shared-bindings/usb_cdc/Serial.c +++ b/shared-bindings/usb_cdc/Serial.c @@ -157,7 +157,7 @@ STATIC mp_obj_t usb_cdc_serial_get_connected(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_connected_obj, usb_cdc_serial_get_connected); -const mp_obj_property_getter_t usb_cdc_serial_connected_obj = MP_PROPERTY_GETTER(usb_cdc_serial_connected_obj, +MP_PROPERTY_GETTER(usb_cdc_serial_connected_obj, (mp_obj_t)&usb_cdc_serial_get_connected_obj); //| in_waiting: int @@ -169,7 +169,7 @@ STATIC mp_obj_t usb_cdc_serial_get_in_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_in_waiting_obj, usb_cdc_serial_get_in_waiting); -const mp_obj_property_getter_t usb_cdc_serial_in_waiting_obj = MP_PROPERTY_GETTER(usb_cdc_serial_in_waiting_obj, +MP_PROPERTY_GETTER(usb_cdc_serial_in_waiting_obj, (mp_obj_t)&usb_cdc_serial_get_in_waiting_obj); //| out_waiting: int @@ -181,7 +181,7 @@ STATIC mp_obj_t usb_cdc_serial_get_out_waiting(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_out_waiting_obj, usb_cdc_serial_get_out_waiting); -const mp_obj_property_getter_t usb_cdc_serial_out_waiting_obj = MP_PROPERTY_GETTER(usb_cdc_serial_out_waiting_obj, +MP_PROPERTY_GETTER(usb_cdc_serial_out_waiting_obj, (mp_obj_t)&usb_cdc_serial_get_out_waiting_obj); //| def reset_input_buffer(self) -> None: @@ -225,7 +225,7 @@ STATIC mp_obj_t usb_cdc_serial_set_timeout(mp_obj_t self_in, mp_obj_t timeout_in } MP_DEFINE_CONST_FUN_OBJ_2(usb_cdc_serial_set_timeout_obj, usb_cdc_serial_set_timeout); -const mp_obj_property_getset_t usb_cdc_serial_timeout_obj = MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj, +MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj, (mp_obj_t)&usb_cdc_serial_get_timeout_obj, (mp_obj_t)&usb_cdc_serial_set_timeout_obj); @@ -249,7 +249,7 @@ STATIC mp_obj_t usb_cdc_serial_set_write_timeout(mp_obj_t self_in, mp_obj_t writ } MP_DEFINE_CONST_FUN_OBJ_2(usb_cdc_serial_set_write_timeout_obj, usb_cdc_serial_set_write_timeout); -const mp_obj_property_getset_t usb_cdc_serial_write_timeout_obj = MP_PROPERTY_GETSET(usb_cdc_serial_write_timeout_obj, +MP_PROPERTY_GETSET(usb_cdc_serial_write_timeout_obj, (mp_obj_t)&usb_cdc_serial_get_write_timeout_obj, (mp_obj_t)&usb_cdc_serial_set_write_timeout_obj); diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 2e6527dada..4ca6a18304 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -236,7 +236,7 @@ STATIC mp_obj_t usb_hid_device_obj_get_last_received_report_property(mp_obj_t se } MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_last_received_report_property_obj, usb_hid_device_obj_get_last_received_report_property); -const mp_obj_property_getter_t usb_hid_device_last_received_report_obj = MP_PROPERTY_GETTER(usb_hid_device_last_received_report_obj, +MP_PROPERTY_GETTER(usb_hid_device_last_received_report_obj, (mp_obj_t)&usb_hid_device_get_last_received_report_property_obj); //| usage_page: int @@ -248,7 +248,7 @@ STATIC mp_obj_t usb_hid_device_obj_get_usage_page(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_usage_page_obj, usb_hid_device_obj_get_usage_page); -const mp_obj_property_getter_t usb_hid_device_usage_page_obj = MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj, +MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj, (mp_obj_t)&usb_hid_device_get_usage_page_obj); //| usage: int @@ -264,7 +264,7 @@ STATIC mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_usage_obj, usb_hid_device_obj_get_usage); -const mp_obj_property_getter_t usb_hid_device_usage_obj = MP_PROPERTY_GETTER(usb_hid_device_usage_obj, +MP_PROPERTY_GETTER(usb_hid_device_usage_obj, (mp_obj_t)&usb_hid_device_get_usage_obj); STATIC const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = { diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c index f29f0de45d..ded1861896 100644 --- a/shared-bindings/vectorio/Circle.c +++ b/shared-bindings/vectorio/Circle.c @@ -76,7 +76,7 @@ STATIC mp_obj_t vectorio_circle_obj_set_radius(mp_obj_t self_in, mp_obj_t radius } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_circle_set_radius_obj, vectorio_circle_obj_set_radius); -const mp_obj_property_getset_t vectorio_circle_radius_obj = MP_PROPERTY_GETSET(vectorio_circle_radius_obj, +MP_PROPERTY_GETSET(vectorio_circle_radius_obj, (mp_obj_t)&vectorio_circle_get_radius_obj, (mp_obj_t)&vectorio_circle_set_radius_obj); @@ -96,7 +96,7 @@ STATIC mp_obj_t vectorio_circle_obj_set_color_index(mp_obj_t self_in, mp_obj_t c } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_circle_set_color_index_obj, vectorio_circle_obj_set_color_index); -const mp_obj_property_getset_t vectorio_circle_color_index_obj = MP_PROPERTY_GETSET(vectorio_circle_color_index_obj, +MP_PROPERTY_GETSET(vectorio_circle_color_index_obj, (mp_obj_t)&vectorio_circle_get_color_index_obj, (mp_obj_t)&vectorio_circle_set_color_index_obj); diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c index 3814656fff..ae9d7a01ca 100644 --- a/shared-bindings/vectorio/Polygon.c +++ b/shared-bindings/vectorio/Polygon.c @@ -82,7 +82,7 @@ STATIC mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t point } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_points_obj, vectorio_polygon_obj_set_points); -const mp_obj_property_getset_t vectorio_polygon_points_obj = MP_PROPERTY_GETSET(vectorio_polygon_points_obj, +MP_PROPERTY_GETSET(vectorio_polygon_points_obj, (mp_obj_t)&vectorio_polygon_get_points_obj, (mp_obj_t)&vectorio_polygon_set_points_obj); @@ -102,7 +102,7 @@ STATIC mp_obj_t vectorio_polygon_obj_set_color_index(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_color_index_obj, vectorio_polygon_obj_set_color_index); -const mp_obj_property_getset_t vectorio_polygon_color_index_obj = MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj, +MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj, (mp_obj_t)&vectorio_polygon_get_color_index_obj, (mp_obj_t)&vectorio_polygon_set_color_index_obj); diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c index 952314e344..fe6be555cd 100644 --- a/shared-bindings/vectorio/VectorShape.c +++ b/shared-bindings/vectorio/VectorShape.c @@ -120,7 +120,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_x(mp_obj_t wrapper_shape, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_x_obj, vectorio_vector_shape_obj_set_x); -const mp_obj_property_getset_t vectorio_vector_shape_x_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_x_obj, +MP_PROPERTY_GETSET(vectorio_vector_shape_x_obj, (mp_obj_t)&vectorio_vector_shape_get_x_obj, (mp_obj_t)&vectorio_vector_shape_set_x_obj); @@ -148,7 +148,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_y(mp_obj_t wrapper_shape, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_y_obj, vectorio_vector_shape_obj_set_y); -const mp_obj_property_getset_t vectorio_vector_shape_y_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_y_obj, +MP_PROPERTY_GETSET(vectorio_vector_shape_y_obj, (mp_obj_t)&vectorio_vector_shape_get_y_obj, (mp_obj_t)&vectorio_vector_shape_set_y_obj); @@ -175,7 +175,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_location(mp_obj_t wrapper_shape, m } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_location_obj, vectorio_vector_shape_obj_set_location); -const mp_obj_property_getset_t vectorio_vector_shape_location_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_location_obj, +MP_PROPERTY_GETSET(vectorio_vector_shape_location_obj, (mp_obj_t)&vectorio_vector_shape_get_location_obj, (mp_obj_t)&vectorio_vector_shape_set_location_obj); @@ -207,7 +207,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_pixel_shader(mp_obj_t wrapper_shap } MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_pixel_shader_obj, vectorio_vector_shape_obj_set_pixel_shader); -const mp_obj_property_getset_t vectorio_vector_shape_pixel_shader_obj = MP_PROPERTY_GETSET(vectorio_vector_shape_pixel_shader_obj, +MP_PROPERTY_GETSET(vectorio_vector_shape_pixel_shader_obj, (mp_obj_t)&vectorio_vector_shape_get_pixel_shader_obj, (mp_obj_t)&vectorio_vector_shape_set_pixel_shader_obj); diff --git a/shared-bindings/vectorio/VectorShape.h b/shared-bindings/vectorio/VectorShape.h index 959a38dff0..13f62922f3 100644 --- a/shared-bindings/vectorio/VectorShape.h +++ b/shared-bindings/vectorio/VectorShape.h @@ -38,10 +38,10 @@ void vectorio_vector_shape_update_transform(vectorio_vector_shape_t *self, displ // Composable property definition for shapes that use VectorShape extern vectorio_draw_protocol_impl_t vectorio_vector_shape_draw_protocol_impl; -extern const mp_obj_property_t vectorio_vector_shape_x_obj; -extern const mp_obj_property_t vectorio_vector_shape_y_obj; -extern const mp_obj_property_t vectorio_vector_shape_location_obj; -extern const mp_obj_property_t vectorio_vector_shape_pixel_shader_obj; +extern const mp_obj_property_getset_t vectorio_vector_shape_x_obj; +extern const mp_obj_property_getset_t vectorio_vector_shape_y_obj; +extern const mp_obj_property_getset_t vectorio_vector_shape_location_obj; +extern const mp_obj_property_getset_t vectorio_vector_shape_pixel_shader_obj; extern const mp_obj_fun_builtin_fixed_t vectorio_vector_shape_contains_obj; #endif // MICROPY_INCLUDED_SHARED_BINDINGS_VECTORIO_SHAPE_H diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c index 1246fb80b1..e00b288080 100644 --- a/shared-bindings/watchdog/WatchDogTimer.c +++ b/shared-bindings/watchdog/WatchDogTimer.c @@ -107,7 +107,7 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_timeout_obj, watchdog_watchdogtimer_obj_set_timeout); -const mp_obj_property_getset_t watchdog_watchdogtimer_timeout_obj = MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj, +MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj, (mp_obj_t)&watchdog_watchdogtimer_get_timeout_obj, (mp_obj_t)&watchdog_watchdogtimer_set_timeout_obj); @@ -155,7 +155,7 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t m } MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_mode_obj, watchdog_watchdogtimer_obj_set_mode); -const mp_obj_property_getset_t watchdog_watchdogtimer_mode_obj = MP_PROPERTY_GETSET(watchdog_watchdogtimer_mode_obj, +MP_PROPERTY_GETSET(watchdog_watchdogtimer_mode_obj, (mp_obj_t)&watchdog_watchdogtimer_get_mode_obj, (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj); diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c index a6a4c7d68b..a63c0a8023 100644 --- a/shared-bindings/wifi/Monitor.c +++ b/shared-bindings/wifi/Monitor.c @@ -92,7 +92,7 @@ STATIC mp_obj_t wifi_monitor_obj_set_channel(mp_obj_t self_in, mp_obj_t channel) } MP_DEFINE_CONST_FUN_OBJ_2(wifi_monitor_set_channel_obj, wifi_monitor_obj_set_channel); -const mp_obj_property_getset_t wifi_monitor_channel_obj = MP_PROPERTY_GETSET(wifi_monitor_channel_obj, +MP_PROPERTY_GETSET(wifi_monitor_channel_obj, (mp_obj_t)&wifi_monitor_get_channel_obj, (mp_obj_t)&wifi_monitor_set_channel_obj); @@ -104,7 +104,7 @@ STATIC mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_queue_obj, wifi_monitor_obj_get_queue); -const mp_obj_property_getter_t wifi_monitor_queue_obj = MP_PROPERTY_GETTER(wifi_monitor_queue_obj, +MP_PROPERTY_GETTER(wifi_monitor_queue_obj, (mp_obj_t)&wifi_monitor_get_queue_obj); //| def deinit(self) -> None: diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c index 1cc12f03cb..9a457b9499 100644 --- a/shared-bindings/wifi/Network.c +++ b/shared-bindings/wifi/Network.c @@ -50,7 +50,7 @@ STATIC mp_obj_t wifi_network_get_ssid(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_ssid_obj, wifi_network_get_ssid); -const mp_obj_property_getter_t wifi_network_ssid_obj = MP_PROPERTY_GETTER(wifi_network_ssid_obj, +MP_PROPERTY_GETTER(wifi_network_ssid_obj, (mp_obj_t)&wifi_network_get_ssid_obj); @@ -63,7 +63,7 @@ STATIC mp_obj_t wifi_network_get_bssid(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_bssid_obj, wifi_network_get_bssid); -const mp_obj_property_getter_t wifi_network_bssid_obj = MP_PROPERTY_GETTER(wifi_network_bssid_obj, +MP_PROPERTY_GETTER(wifi_network_bssid_obj, (mp_obj_t)&wifi_network_get_bssid_obj); @@ -76,7 +76,7 @@ STATIC mp_obj_t wifi_network_get_rssi(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_rssi_obj, wifi_network_get_rssi); -const mp_obj_property_getter_t wifi_network_rssi_obj = MP_PROPERTY_GETTER(wifi_network_rssi_obj, +MP_PROPERTY_GETTER(wifi_network_rssi_obj, (mp_obj_t)&wifi_network_get_rssi_obj); @@ -89,7 +89,7 @@ STATIC mp_obj_t wifi_network_get_channel(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_channel_obj, wifi_network_get_channel); -const mp_obj_property_getter_t wifi_network_channel_obj = MP_PROPERTY_GETTER(wifi_network_channel_obj, +MP_PROPERTY_GETTER(wifi_network_channel_obj, (mp_obj_t)&wifi_network_get_channel_obj); //| country: str @@ -101,7 +101,7 @@ STATIC mp_obj_t wifi_network_get_country(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_country_obj, wifi_network_get_country); -const mp_obj_property_getter_t wifi_network_country_obj = MP_PROPERTY_GETTER(wifi_network_country_obj, +MP_PROPERTY_GETTER(wifi_network_country_obj, (mp_obj_t)&wifi_network_get_country_obj); //| authmode: str @@ -113,7 +113,7 @@ STATIC mp_obj_t wifi_network_get_authmode(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_authmode_obj, wifi_network_get_authmode); -const mp_obj_property_getter_t wifi_network_authmode_obj = MP_PROPERTY_GETTER(wifi_network_authmode_obj, +MP_PROPERTY_GETTER(wifi_network_authmode_obj, (mp_obj_t)&wifi_network_get_authmode_obj); STATIC const mp_rom_map_elem_t wifi_network_locals_dict_table[] = { diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index a09a759a74..cf1e9dfc4e 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -69,7 +69,7 @@ static mp_obj_t wifi_radio_set_enabled(mp_obj_t self, mp_obj_t value) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_enabled_obj, wifi_radio_set_enabled); -const mp_obj_property_getset_t wifi_radio_enabled_obj = MP_PROPERTY_GETSET(wifi_radio_enabled_obj, +MP_PROPERTY_GETSET(wifi_radio_enabled_obj, (mp_obj_t)&wifi_radio_get_enabled_obj, (mp_obj_t)&wifi_radio_set_enabled_obj); @@ -107,7 +107,7 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_hostname_obj, wifi_radio_set_hostname); -const mp_obj_property_getset_t wifi_radio_hostname_obj = MP_PROPERTY_GETSET(wifi_radio_hostname_obj, +MP_PROPERTY_GETSET(wifi_radio_hostname_obj, (mp_obj_t)&wifi_radio_get_hostname_obj, (mp_obj_t)&wifi_radio_set_hostname_obj); @@ -136,7 +136,7 @@ STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_addres } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_obj, wifi_radio_set_mac_address); -const mp_obj_property_getset_t wifi_radio_mac_address_obj = MP_PROPERTY_GETSET(wifi_radio_mac_address_obj, +MP_PROPERTY_GETSET(wifi_radio_mac_address_obj, (mp_obj_t)&wifi_radio_get_mac_address_obj, (mp_obj_t)&wifi_radio_set_mac_address_obj); @@ -165,7 +165,7 @@ STATIC mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_add } MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_ap_obj, wifi_radio_set_mac_address_ap); -const mp_obj_property_getset_t wifi_radio_mac_address_ap_obj = MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj, +MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj, (mp_obj_t)&wifi_radio_get_mac_address_ap_obj, (mp_obj_t)&wifi_radio_set_mac_address_ap_obj); @@ -381,7 +381,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_obj, wifi_radio_get_ipv4_gateway); -const mp_obj_property_getter_t wifi_radio_ipv4_gateway_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj, (mp_obj_t)&wifi_radio_get_ipv4_gateway_obj); //| ipv4_gateway_ap: Optional[ipaddress.IPv4Address] @@ -393,7 +393,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_ap_obj, wifi_radio_get_ipv4_gateway_ap); -const mp_obj_property_getter_t wifi_radio_ipv4_gateway_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_gateway_ap_obj); //| ipv4_subnet: Optional[ipaddress.IPv4Address] @@ -405,7 +405,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_obj, wifi_radio_get_ipv4_subnet); -const mp_obj_property_getter_t wifi_radio_ipv4_subnet_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj, (mp_obj_t)&wifi_radio_get_ipv4_subnet_obj); //| ipv4_subnet_ap: Optional[ipaddress.IPv4Address] @@ -417,7 +417,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4_subnet_ap); -const mp_obj_property_getter_t wifi_radio_ipv4_subnet_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj); //| ipv4_address: Optional[ipaddress.IPv4Address] @@ -429,7 +429,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_address(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, wifi_radio_get_ipv4_address); -const mp_obj_property_getter_t wifi_radio_ipv4_address_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj, (mp_obj_t)&wifi_radio_get_ipv4_address_obj); //| ipv4_address_ap: Optional[ipaddress.IPv4Address] @@ -441,7 +441,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_ap_obj, wifi_radio_get_ipv4_address_ap); -const mp_obj_property_getter_t wifi_radio_ipv4_address_ap_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_address_ap_obj); //| ipv4_dns: Optional[ipaddress.IPv4Address] @@ -453,7 +453,7 @@ STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns); -const mp_obj_property_getter_t wifi_radio_ipv4_dns_obj = MP_PROPERTY_GETTER(wifi_radio_ipv4_dns_obj, +MP_PROPERTY_GETTER(wifi_radio_ipv4_dns_obj, (mp_obj_t)&wifi_radio_get_ipv4_dns_obj); //| ap_info: Optional[Network] @@ -465,7 +465,7 @@ STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); -const mp_obj_property_getter_t wifi_radio_ap_info_obj = MP_PROPERTY_GETTER(wifi_radio_ap_info_obj, +MP_PROPERTY_GETTER(wifi_radio_ap_info_obj, (mp_obj_t)&wifi_radio_get_ap_info_obj); //| def ping(self, ip: ipaddress.IPv4Address, *, timeout: Optional[float] = 0.5) -> Optional[float]: From 510890b2076654b3c567efc5dabfe560773272ba Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 3 May 2022 08:31:41 -0500 Subject: [PATCH 0207/2403] Enable squeezing property storage in flash .. and enable it on atmel-samd and raspberrypi. On trinket_m0 this saves 96 net bytes of flash. There are 216 bytes actually saved by reducing the flash storage size of the property descriptors, but added code in several paths takes back over half of the 'raw savings'. By organizing the "get-only" and "get-set" (but no delete) properties each in a different section, we can represent then more efficiently. Testing performed: that a get-only property can still be gotten but can't be set or deleted; that a get-set property can sill be gotten or set but can't be deleted. Tested on pygamer. Because this requires linker file support, I only enabled it on two of the ports. --- ports/atmel-samd/boards/common.template.ld | 7 +++++++ ports/atmel-samd/mpconfigport.mk | 1 + ports/raspberrypi/link.ld | 8 ++++++++ ports/raspberrypi/mpconfigport.mk | 1 + py/circuitpy_mpconfig.h | 2 ++ py/circuitpy_mpconfig.mk | 5 +++++ py/mpconfig.h | 5 +++++ py/objproperty.c | 17 ++++++++++++++++- py/objproperty.h | 16 ++++++++++++++++ py/objtype.c | 13 ++++++++----- py/runtime.c | 10 ++++++---- 11 files changed, 75 insertions(+), 10 deletions(-) diff --git a/ports/atmel-samd/boards/common.template.ld b/ports/atmel-samd/boards/common.template.ld index 05c0de4210..97504d44e5 100644 --- a/ports/atmel-samd/boards/common.template.ld +++ b/ports/atmel-samd/boards/common.template.ld @@ -28,6 +28,13 @@ SECTIONS _sfixed = .; KEEP(*(.vectors)) /* isr vector table */ + __property_getter_start = .; + *(.property_getter) + __property_getter_end = .; + __property_getset_start = .; + *(.property_getset) + __property_getset_end = .; + /* Sort text sections so that they have fewer *fill* bytes needed. */ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text))) /* .text sections (code) */ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*))) /* .text* sections (code) */ diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 119bc304ac..f031386a73 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -8,6 +8,7 @@ INTERNAL_LIBM = 1 USB_NUM_ENDPOINT_PAIRS = 8 CIRCUITPY_ROTARYIO_SOFTENCODER = 1 +CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1 ###################################################################### # Put samd21-only choices here. diff --git a/ports/raspberrypi/link.ld b/ports/raspberrypi/link.ld index 62b1bd04b6..c9480f84db 100644 --- a/ports/raspberrypi/link.ld +++ b/ports/raspberrypi/link.ld @@ -68,6 +68,14 @@ SECTIONS /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from * FLASH ... we will include any thing excluded here in .data below by default */ *(.init) + + __property_getter_start = .; + *(.property_getter) + __property_getter_end = .; + __property_getset_start = .; + *(.property_getset) + __property_getset_end = .; + *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*) *(.fini) /* Pull all c'tors into .text */ diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk index 80938c47b0..32666ed9ea 100644 --- a/ports/raspberrypi/mpconfigport.mk +++ b/ports/raspberrypi/mpconfigport.mk @@ -1,6 +1,7 @@ # All raspberrypi ports have longints. LONGINT_IMPL = MPZ +CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1 CIRCUITPY_ALARM ?= 1 CIRCUITPY_RP2PIO ?= 1 diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index ec9274464b..03dca0321c 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -573,4 +573,6 @@ void supervisor_run_background_tasks_if_tick(void); #define MICROPY_WRAP_MP_EXECUTE_BYTECODE PLACE_IN_ITCM #endif +#define MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE (CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE) + #endif // __INCLUDED_MPCONFIG_CIRCUITPY_H diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 661829de26..1899541099 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -32,6 +32,11 @@ CIRCUITPY_FULL_BUILD ?= 1 CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD) +# Reduce the size of in-flash properties. Requires support in the .ld linker +# file, so not enabled by default. +CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 0 +CFLAGS += -DCIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE=$(CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE) + # async/await language keyword support MICROPY_PY_ASYNC_AWAIT ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DMICROPY_PY_ASYNC_AWAIT=$(MICROPY_PY_ASYNC_AWAIT) diff --git a/py/mpconfig.h b/py/mpconfig.h index d66d615996..386a9765eb 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1078,6 +1078,11 @@ typedef double mp_float_t; #define MICROPY_PY_BUILTINS_PROPERTY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES) #endif +// Whether to optimize property flash storage size (requires linker script support) +#ifndef MICROPY_PY_BUILTINS_PROPERTY +#define MICROPY_PY_BUILTINS_PROPERTY (0) +#endif + // Whether to implement the start/stop/step attributes (readback) on // the "range" builtin type. Rarely used, and costs ~60 bytes (x86). #ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS diff --git a/py/objproperty.c b/py/objproperty.c index ebb70014a4..e8ae5094fa 100644 --- a/py/objproperty.c +++ b/py/objproperty.c @@ -95,9 +95,24 @@ const mp_obj_type_t mp_type_property = { .locals_dict = (mp_obj_dict_t *)&property_locals_dict, }; -const mp_obj_t *mp_obj_property_get(mp_obj_t self_in) { +#if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE +extern const mp_obj_property_t __property_getter_start, __property_getter_end, __property_getset_start, __property_getset_end; +#endif + +const mp_obj_t *mp_obj_property_get(mp_obj_t self_in, size_t *n_proxy) { mp_check_self(mp_obj_is_type(self_in, &mp_type_property)); mp_obj_property_t *self = MP_OBJ_TO_PTR(self_in); + #if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE + if (self >= &__property_getter_start && self < &__property_getter_end) { + *n_proxy = 1; + } else if (self >= &__property_getset_start && self < &__property_getset_end) { + *n_proxy = 2; + } else { + *n_proxy = 3; + } + #else + *n_proxy = 3; + #endif return self->proxy; } diff --git a/py/objproperty.h b/py/objproperty.h index 2b9e848eb1..c1b5dba460 100644 --- a/py/objproperty.h +++ b/py/objproperty.h @@ -35,11 +35,27 @@ typedef struct _mp_obj_property_t { mp_obj_t proxy[3]; // getter, setter, deleter } mp_obj_property_t; +#if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE +typedef struct _mp_obj_property_getter_t { + mp_obj_base_t base; + mp_obj_t proxy[1]; // getter +} mp_obj_property_getter_t; + +typedef struct _mp_obj_property_getset_t { + mp_obj_base_t base; + mp_obj_t proxy[2]; // getter, setter +} mp_obj_property_getset_t; + +#define MP_PROPERTY_GETTER(P, G) const mp_obj_property_getter_t P __attribute((section(".property_getter"))) = {.base.type = &mp_type_property, .proxy = {G}} +#define MP_PROPERTY_GETSET(P, G, S) const mp_obj_property_getset_t P __attribute((section(".property_getset"))) = {.base.type = &mp_type_property, .proxy = {G, S}} + +#else typedef struct _mp_obj_property_t mp_obj_property_getter_t; typedef struct _mp_obj_property_t mp_obj_property_getset_t; #define MP_PROPERTY_GETTER(P, G) const mp_obj_property_t P = {.base.type = &mp_type_property, .proxy = {G, MP_ROM_NONE, MP_ROM_NONE}} #define MP_PROPERTY_GETSET(P, G, S) const mp_obj_property_t P = {.base.type = &mp_type_property, .proxy = {G, S, MP_ROM_NONE}} +#endif #endif // MICROPY_PY_BUILTINS_PROPERTY diff --git a/py/objtype.c b/py/objtype.c index d247987ce2..62ea1ed602 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -660,7 +660,8 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des // be called by the descriptor code down below. But that way // requires overhead for the nested mp_call's and overhead for // the code. - const mp_obj_t *proxy = mp_obj_property_get(member); + size_t n_proxy; + const mp_obj_t *proxy = mp_obj_property_get(member, &n_proxy); if (proxy[0] == mp_const_none) { mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute")); } else { @@ -740,11 +741,12 @@ STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t val // would be called by the descriptor code down below. But that way // requires overhead for the nested mp_call's and overhead for // the code. - const mp_obj_t *proxy = mp_obj_property_get(member[0]); + size_t n_proxy; + const mp_obj_t *proxy = mp_obj_property_get(member[0], &n_proxy); mp_obj_t dest[2] = {self_in, value}; if (value == MP_OBJ_NULL) { // delete attribute - if (proxy[2] == mp_const_none) { + if (n_proxy < 3 || proxy[2] == mp_const_none) { // TODO better error message? return false; } else { @@ -753,7 +755,7 @@ STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t val } } else { // store attribute - if (proxy[1] == mp_const_none) { + if (n_proxy < 2 || proxy[1] == mp_const_none) { // TODO better error message? return false; } else { @@ -1374,7 +1376,8 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) { // here... #if MICROPY_PY_BUILTINS_PROPERTY if (mp_obj_is_type(member, &mp_type_property)) { - const mp_obj_t *proxy = mp_obj_property_get(member); + size_t n_proxy; + const mp_obj_t *proxy = mp_obj_property_get(member, &n_proxy); if (proxy[0] == mp_const_none) { mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute")); } else { diff --git a/py/runtime.c b/py/runtime.c index bf44234434..f2ad8728a5 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -1087,7 +1087,8 @@ void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t // be called by the descriptor code down below. But that way // requires overhead for the nested mp_call's and overhead for // the code. - const mp_obj_t *proxy = mp_obj_property_get(member); + size_t n_proxy; + const mp_obj_t *proxy = mp_obj_property_get(member, &n_proxy); if (proxy[0] == mp_const_none) { mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute")); } else { @@ -1226,15 +1227,16 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) { // would be called by the descriptor code down below. But that way // requires overhead for the nested mp_call's and overhead for // the code. - const mp_obj_t *proxy = mp_obj_property_get(elem->value); + size_t n_proxy; + const mp_obj_t *proxy = mp_obj_property_get(elem->value, &n_proxy); mp_obj_t dest[2] = {base, value}; if (value == MP_OBJ_NULL) { // delete attribute - if (proxy[2] != mp_const_none) { + if (n_proxy == 3 && proxy[2] != mp_const_none) { mp_call_function_n_kw(proxy[2], 1, 0, dest); return; } - } else if (proxy[1] != mp_const_none) { + } else if (n_proxy > 1 && proxy[1] != mp_const_none) { mp_call_function_n_kw(proxy[1], 2, 0, dest); return; } From 030d5fefa02bfc0a5b243facb7d77a6fea193d9f Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 3 May 2022 09:23:36 -0500 Subject: [PATCH 0208/2403] Ignore SH1107 quirk if not 1bpp --- shared-module/displayio/Display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 579dca49fc..255cd49e06 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -74,7 +74,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self, self->first_manual_refresh = !auto_refresh; self->data_as_commands = data_as_commands; self->backlight_on_high = backlight_on_high; - self->SH1107_addressing = SH1107_addressing; + self->SH1107_addressing = SH1107_addressing && color_depth == 1; self->native_frames_per_second = native_frames_per_second; self->native_ms_per_frame = 1000 / native_frames_per_second; From b292a925d5f776ecd2e865345c46d3b3287dda7c Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 3 May 2022 09:23:47 -0500 Subject: [PATCH 0209/2403] remove stray semicolon --- shared-bindings/displayio/Display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index f7b3305439..b187d1329f 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -172,7 +172,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a primary_display_t *disp = allocate_display_or_raise(); displayio_display_obj_t *self = &disp->display; - ; + self->base.type = &displayio_display_type; common_hal_displayio_display_construct( self, From 7d7986b04143e457636a00f73bacf7efc18797dd Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 3 May 2022 12:21:15 -0500 Subject: [PATCH 0210/2403] Add NEOPIXEL pin Closes: #6307 --- ports/raspberrypi/boards/pimoroni_servo2040/pins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c index 5471283cf9..5868f06b63 100644 --- a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c @@ -23,6 +23,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SERVO_18), MP_ROM_PTR(&pin_GPIO17) }, { MP_ROM_QSTR(MP_QSTR_NUM_SERVOS), MP_ROM_INT(18) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_LED_DATA), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_NUM_LEDS), MP_ROM_INT(6) }, From 49918299f23043e1cb6f929b0ef98b71dceed47e Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 13:42:42 -0400 Subject: [PATCH 0211/2403] Update docs with links to tutorials for I2C, SPI, and UART --- shared-bindings/busio/__init__.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c index 13115eb793..7ac9b58dd2 100644 --- a/shared-bindings/busio/__init__.c +++ b/shared-bindings/busio/__init__.c @@ -70,6 +70,17 @@ //| hardware. The last step is optional because CircuitPython automatically //| resets hardware after a program finishes.""" //| +//| Note that drivers will typically handle communication if provided the bus +//| instance (such as `busio.I2C(board.SCL, board.SDA)`), and that many of +//| the methods listed here are lower level functionalities that are needed +//| for working with custom drivers. +//| +//| Tutorial for I2C and SPI: +//| https://learn.adafruit.com/circuitpython-basics-i2c-and-spi +//| +//| Tutorial for UART: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-uart-serial +//| STATIC const mp_rom_map_elem_t busio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_busio) }, From 2457b2bdf44d5219c89a9541bfa67cf97b9d7d5a Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 13:49:00 -0400 Subject: [PATCH 0212/2403] Link to CPython docs for time module --- shared-bindings/time/__init__.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c index 4b090fc34e..980d012c5c 100644 --- a/shared-bindings/time/__init__.c +++ b/shared-bindings/time/__init__.c @@ -40,7 +40,11 @@ //| //| The `time` module is a strict subset of the CPython `cpython:time` module. So, code //| using `time` written in CircuitPython will work in CPython but not necessarily the other -//| way around.""" +//| way around. +//| +//| For more information about the `time` module, see the CPython documentation: +//| https://docs.python.org/3/library/time.html +//| """ //| //| def monotonic() -> float: //| """Returns an always increasing value of time with an unknown reference From 664a92c2dfc1136ea07286b0a9d47df56305c71a Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 13:57:22 -0400 Subject: [PATCH 0213/2403] Add link to CPython math module --- shared-bindings/math/__init__.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index 4146112d20..9df8e68169 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -41,7 +41,15 @@ //| """mathematical functions //| //| The `math` module provides some basic mathematical functions for -//| working with floating-point numbers.""" +//| working with floating-point numbers. +//| +//| This library is a subset of the CPython library. All code using this +//| library should function in CPython, but not necessarily the other way +//| around. For more information about the `math` module, see the +//| CPython documentation: +//| +//| https://docs.python.org/3/library/math.html +//| """ //| STATIC NORETURN void math_error(void) { From 5bd8fa684200f1d3214857566564b0367e46ff8d Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 13:59:13 -0400 Subject: [PATCH 0214/2403] Add link to CPython random module --- shared-bindings/random/__init__.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index 838e1e72ca..87f0bdc6bc 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -44,7 +44,11 @@ //| Once seeded, it will be deterministic, which is why its bad for cryptography. //| //| .. warning:: Numbers from this module are not cryptographically strong! Use -//| bytes from `os.urandom` directly for true randomness.""" +//| bytes from `os.urandom` directly for true randomness. +//| +//| For more information about the `random` module, see the CPython documentation: +//| https://docs.python.org/3/library/random.html +//| """ //| //| from typing import TypeVar //| _T = TypeVar('_T') From de7a90ab00c67b86a9c5b6b46a703665b08f53ab Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 14:00:52 -0400 Subject: [PATCH 0215/2403] Add link to CPython os module --- shared-bindings/os/__init__.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c index 02efd41988..3d468eb70f 100644 --- a/shared-bindings/os/__init__.c +++ b/shared-bindings/os/__init__.c @@ -41,7 +41,11 @@ //| //| The `os` module is a strict subset of the CPython `cpython:os` module. So, //| code written in CircuitPython will work in CPython but not necessarily the -//| other way around.""" +//| other way around. +//| +//| For more information about the `os` module, see the CPython documentation: +//| https://docs.python.org/3/library/os.html +//| """ //| //| import typing From bbc29e84a7aeb5610143004e86e1079b7588d009 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 12:31:20 -0600 Subject: [PATCH 0216/2403] Add os, "socket", atexit, ssl, struct, traceback, math links --- shared-bindings/atexit/__init__.c | 1 + shared-bindings/math/__init__.c | 7 +------ shared-bindings/os/__init__.c | 7 +------ shared-bindings/socketpool/__init__.c | 3 +++ shared-bindings/ssl/__init__.c | 7 +++++++ shared-bindings/struct/__init__.c | 4 +--- shared-bindings/traceback/__init__.c | 1 + 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c index e6d1372ccf..dd27adaa98 100644 --- a/shared-bindings/atexit/__init__.c +++ b/shared-bindings/atexit/__init__.c @@ -34,6 +34,7 @@ //| These functions are run in the reverse order in which they were registered; //| if you register ``A``, ``B``, and ``C``, they will be run in the order ``C``, ``B``, ``A``. //| +//| |see_cpython_module| :mod:`cpython:atexit`. //| """ //| ... //| diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index 9df8e68169..54dbf004ad 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -43,12 +43,7 @@ //| The `math` module provides some basic mathematical functions for //| working with floating-point numbers. //| -//| This library is a subset of the CPython library. All code using this -//| library should function in CPython, but not necessarily the other way -//| around. For more information about the `math` module, see the -//| CPython documentation: -//| -//| https://docs.python.org/3/library/math.html +//| |see_cpython_module| :mod:`cpython:math`. //| """ //| diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c index 3d468eb70f..2daca52b85 100644 --- a/shared-bindings/os/__init__.c +++ b/shared-bindings/os/__init__.c @@ -39,12 +39,7 @@ //| """functions that an OS normally provides //| -//| The `os` module is a strict subset of the CPython `cpython:os` module. So, -//| code written in CircuitPython will work in CPython but not necessarily the -//| other way around. -//| -//| For more information about the `os` module, see the CPython documentation: -//| https://docs.python.org/3/library/os.html +//| |see_cpython_module| :mod:`cpython:os`. //| """ //| //| import typing diff --git a/shared-bindings/socketpool/__init__.c b/shared-bindings/socketpool/__init__.c index f10196ab0d..b81aa238c8 100644 --- a/shared-bindings/socketpool/__init__.c +++ b/shared-bindings/socketpool/__init__.c @@ -35,6 +35,9 @@ //| """ //| The `socketpool` module provides sockets through a pool. The pools themselves //| act like CPython's `socket` module. +//| +//| For more infomration about the `socket` module, see the CPython documentation: +//| https://docs.python.org/3/library/socket.html //| """ //| diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c index 578c51dfbe..8f32582635 100644 --- a/shared-bindings/ssl/__init__.c +++ b/shared-bindings/ssl/__init__.c @@ -33,6 +33,13 @@ //| """ //| The `ssl` module provides SSL contexts to wrap sockets in. +//| +//| This module is a strict subset of the CPython `ssl` module. +//| So, code written in CircuitPython will work in CPython but not +//| necessarily the other way around. +//| +//| For more information about the `ssl` module see the CPython documentation +//| https://docs.python.org/3/library/ssl.html //| """ //| diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c index 84654a3afe..c29c33c1c0 100644 --- a/shared-bindings/struct/__init__.c +++ b/shared-bindings/struct/__init__.c @@ -40,9 +40,7 @@ //| """Manipulation of c-style data //| -//| This module implements a subset of the corresponding CPython module, -//| as described below. For more information, refer to the original CPython -//| documentation: struct. +//| |see_cpython_module| :mod:`cpython:struct`. //| //| Supported size/byte order prefixes: *@*, *<*, *>*, *!*. //| diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c index aa21210494..880fe08e85 100644 --- a/shared-bindings/traceback/__init__.c +++ b/shared-bindings/traceback/__init__.c @@ -34,6 +34,7 @@ //| This module provides a standard interface to print stack traces of programs. //| This is useful when you want to print stack traces under program control. //| +//| |see_cpython_module| :mod:`cpython:traceback`. //| """ //| ... //| From 24fb138311f7866ba3bd864aa558e1ebc7cdfaf2 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 3 May 2022 14:56:12 -0400 Subject: [PATCH 0217/2403] Use shortcut "directive" for subset note --- shared-bindings/random/__init__.c | 10 ++-------- shared-bindings/ssl/__init__.c | 7 +------ shared-bindings/time/__init__.c | 7 +------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index 87f0bdc6bc..63570fe7e7 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -35,20 +35,14 @@ //| """pseudo-random numbers and choices //| -//| The `random` module is a strict subset of the CPython `cpython:random` -//| module. So, code written in CircuitPython will work in CPython but not -//| necessarily the other way around. +//| |see_cpython_module| :mod:`cpython:random`. //| //| Like its CPython cousin, CircuitPython's random seeds itself on first use //| with a true random from os.urandom() when available or the uptime otherwise. //| Once seeded, it will be deterministic, which is why its bad for cryptography. //| //| .. warning:: Numbers from this module are not cryptographically strong! Use -//| bytes from `os.urandom` directly for true randomness. -//| -//| For more information about the `random` module, see the CPython documentation: -//| https://docs.python.org/3/library/random.html -//| """ +//| bytes from `os.urandom` directly for true randomness.""" //| //| from typing import TypeVar //| _T = TypeVar('_T') diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c index 8f32582635..6967860054 100644 --- a/shared-bindings/ssl/__init__.c +++ b/shared-bindings/ssl/__init__.c @@ -34,12 +34,7 @@ //| """ //| The `ssl` module provides SSL contexts to wrap sockets in. //| -//| This module is a strict subset of the CPython `ssl` module. -//| So, code written in CircuitPython will work in CPython but not -//| necessarily the other way around. -//| -//| For more information about the `ssl` module see the CPython documentation -//| https://docs.python.org/3/library/ssl.html +//| |see_cpython_module| :mod:`cpython:ssl`. //| """ //| diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c index 980d012c5c..5b16ded0e4 100644 --- a/shared-bindings/time/__init__.c +++ b/shared-bindings/time/__init__.c @@ -38,12 +38,7 @@ //| """time and timing related functions //| -//| The `time` module is a strict subset of the CPython `cpython:time` module. So, code -//| using `time` written in CircuitPython will work in CPython but not necessarily the other -//| way around. -//| -//| For more information about the `time` module, see the CPython documentation: -//| https://docs.python.org/3/library/time.html +//| |see_cpython_module| :mod:`cpython:time`. //| """ //| //| def monotonic() -> float: From 9717fd235d31b576855a0c0061b7834c0b0f70a9 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 3 May 2022 15:28:42 -0400 Subject: [PATCH 0218/2403] make Pin hashable --- locale/circuitpython.pot | 2 +- shared-bindings/microcontroller/Pin.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 3bec8b622b..db06147fe0 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -623,7 +623,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c index ee8336fa8a..80c8c1d33c 100644 --- a/shared-bindings/microcontroller/Pin.c +++ b/shared-bindings/microcontroller/Pin.c @@ -78,10 +78,28 @@ STATIC void mcu_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki } } +//| def __hash__(self) -> int: +//| """Returns a hash for the Pin.""" +//| ... +//| +STATIC mp_obj_t mcu_pin_unary_op(mp_unary_op_t op, mp_obj_t self_in) { + switch (op) { + case MP_UNARY_OP_HASH: { + return mp_obj_id(self_in); + } + default: + return MP_OBJ_NULL; // op not supported + } +} + const mp_obj_type_t mcu_pin_type = { { &mp_type_type }, + .flags = MP_TYPE_FLAG_EXTENDED, .name = MP_QSTR_Pin, - .print = mcu_pin_print + .print = mcu_pin_print, + MP_TYPE_EXTENDED_FIELDS( + .unary_op = mcu_pin_unary_op, + ) }; const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj) { From b181caaefc14f8ff2065db9270daab158efb6eeb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 3 May 2022 16:08:01 -0400 Subject: [PATCH 0219/2403] add board.LED to Metro M4 AirLift LIte and PyRuler --- ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c | 2 ++ ports/atmel-samd/boards/pyruler/pins.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c b/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c index 4af8871ff0..dcb6774da8 100644 --- a/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c +++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c @@ -28,6 +28,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA19) }, { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA17) }, + + { MP_OBJ_NEW_QSTR(MP_QSTR_LED),MP_ROM_PTR(&pin_PA16) }, { MP_OBJ_NEW_QSTR(MP_QSTR_D13),MP_ROM_PTR(&pin_PA16) }, // ESP control diff --git a/ports/atmel-samd/boards/pyruler/pins.c b/ports/atmel-samd/boards/pyruler/pins.c index e8f8d64b3d..27583539f3 100644 --- a/ports/atmel-samd/boards/pyruler/pins.c +++ b/ports/atmel-samd/boards/pyruler/pins.c @@ -41,6 +41,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA07) }, { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA07) }, + { MP_ROM_QSTR(MP_QSTR_LED),MP_ROM_PTR(&pin_PA10) }, { MP_ROM_QSTR(MP_QSTR_D13),MP_ROM_PTR(&pin_PA10) }, { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA00) }, From 814640e25acf364ef096a72da20e8889f465524d Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 3 May 2022 16:29:54 -0400 Subject: [PATCH 0220/2403] run circuitpython.org website PR action with adafruit-adabot instead of adafruit-blinka --- .github/workflows/create_website_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml index 2f171fe054..2367b6c475 100644 --- a/.github/workflows/create_website_pr.yml +++ b/.github/workflows/create_website_pr.yml @@ -42,5 +42,5 @@ jobs: working-directory: tools env: RELEASE_TAG: ${{ github.event.release.tag_name }} - ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }} + ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }} if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested') From 6378343bb3d0b6d109bd8cfd80cd3dfa2339ad8f Mon Sep 17 00:00:00 2001 From: KurtE Date: Tue, 3 May 2022 13:39:49 -0700 Subject: [PATCH 0221/2403] As I mentioned in issue #6332, there return of a read operation that times out with no data received is inconsistent: ``` Adafruit CircuitPython 7.3.0-beta.1-31-g73f6b4867-dirty on 2022-04-30; Adafruit Feather RP2040 with rp2040 >>> >>> import board, busio >>> print(board.UART().read(5)) None Adafruit CircuitPython 6.3.0 on 2021-06-01; FeatherS2 with ESP32S2 >>> import board,busio >>> print(board.UART().read(5)) None Adafruit CircuitPython 7.3.0-beta.1 on 2022-04-07; Adafruit Feather STM32F405 Express with STM32F405RG >>> import board, busio >>> print(board.UART().read(5)) None Adafruit CircuitPython 7.3.0-beta.1-31-g73f6b4867-dirty on 2022-04-28; Teensy 4.1 with IMXRT1062DVJ6A >>> import board, busio >>> print(board.UART().read(5)) b'' ``` Since I have a PR on this file anyway, I thought I would put in the change to make it consistent with the other 3 board types I tried. Can not say about any of the others. --- ports/mimxrt10xx/common-hal/busio/UART.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 71de53f07f..57eaada7ef 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -428,6 +428,10 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t uint32_t recvd = 0; LPUART_TransferGetReceiveCount(self->uart, &self->handle, &recvd); LPUART_TransferAbortReceive(self->uart, &self->handle); + if (recvd == 0) { + *errcode = EAGAIN; + return MP_STREAM_ERROR; + } return recvd; } From 024ab1974b18d9f154cc7f8237827234e4bdd1e9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 3 May 2022 16:42:40 -0400 Subject: [PATCH 0222/2403] Fix typo --- shared-bindings/socketpool/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/socketpool/__init__.c b/shared-bindings/socketpool/__init__.c index b81aa238c8..fee81f2820 100644 --- a/shared-bindings/socketpool/__init__.c +++ b/shared-bindings/socketpool/__init__.c @@ -36,7 +36,7 @@ //| The `socketpool` module provides sockets through a pool. The pools themselves //| act like CPython's `socket` module. //| -//| For more infomration about the `socket` module, see the CPython documentation: +//| For more information about the `socket` module, see the CPython documentation: //| https://docs.python.org/3/library/socket.html //| """ //| From 68acd14342f2e1e60444d5fb9e2dee59dc23a211 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 3 May 2022 16:50:48 -0400 Subject: [PATCH 0223/2403] use generic hash routine where possible --- shared-bindings/microcontroller/Pin.c | 22 +++++++--------------- shared-bindings/socketpool/Socket.c | 22 +++++++--------------- shared-bindings/ssl/SSLSocket.c | 22 +++++++--------------- 3 files changed, 21 insertions(+), 45 deletions(-) diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c index 80c8c1d33c..e6809d6b72 100644 --- a/shared-bindings/microcontroller/Pin.c +++ b/shared-bindings/microcontroller/Pin.c @@ -43,6 +43,12 @@ //| ... //| +//| def __hash__(self) -> int: +//| """Returns a hash for the Pin.""" +//| ... +//| +// Provided by mp_generic_unary_op(). + static void get_pin_name(const mcu_pin_obj_t *self, qstr *package, qstr *module, qstr *name) { const mp_map_t *board_map = &board_module_globals.map; for (uint8_t i = 0; i < board_map->alloc; i++) { @@ -78,27 +84,13 @@ STATIC void mcu_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki } } -//| def __hash__(self) -> int: -//| """Returns a hash for the Pin.""" -//| ... -//| -STATIC mp_obj_t mcu_pin_unary_op(mp_unary_op_t op, mp_obj_t self_in) { - switch (op) { - case MP_UNARY_OP_HASH: { - return mp_obj_id(self_in); - } - default: - return MP_OBJ_NULL; // op not supported - } -} - const mp_obj_type_t mcu_pin_type = { { &mp_type_type }, .flags = MP_TYPE_FLAG_EXTENDED, .name = MP_QSTR_Pin, .print = mcu_pin_print, MP_TYPE_EXTENDED_FIELDS( - .unary_op = mcu_pin_unary_op, + .unary_op = mp_generic_unary_op, ) }; diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c index 2dd832f490..bea3cd1624 100644 --- a/shared-bindings/socketpool/Socket.c +++ b/shared-bindings/socketpool/Socket.c @@ -46,6 +46,12 @@ //| recv that do not allocate bytes objects.""" //| +//| def __hash__(self) -> int: +//| """Returns a hash for the Socket.""" +//| ... +//| +// Provided by mp_generic_unary_op(). + //| def __enter__(self) -> Socket: //| """No-op used by Context Managers.""" //| ... @@ -366,20 +372,6 @@ STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_ } STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_settimeout_obj, socketpool_socket_settimeout); -//| def __hash__(self) -> int: -//| """Returns a hash for the Socket.""" -//| ... -//| -STATIC mp_obj_t socketpool_socket_unary_op(mp_unary_op_t op, mp_obj_t self_in) { - switch (op) { - case MP_UNARY_OP_HASH: { - return mp_obj_id(self_in); - } - default: - return MP_OBJ_NULL; // op not supported - } -} - STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&socketpool_socket___exit___obj) }, @@ -407,6 +399,6 @@ const mp_obj_type_t socketpool_socket_type = { .name = MP_QSTR_Socket, .locals_dict = (mp_obj_dict_t *)&socketpool_socket_locals_dict, MP_TYPE_EXTENDED_FIELDS( - .unary_op = socketpool_socket_unary_op, + .unary_op = mp_generic_unary_op, ) }; diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c index 9e25d7f25f..630ab28c68 100644 --- a/shared-bindings/ssl/SSLSocket.c +++ b/shared-bindings/ssl/SSLSocket.c @@ -45,6 +45,12 @@ //| recv that do not allocate bytes objects.""" //| +//| def __hash__(self) -> int: +//| """Returns a hash for the Socket.""" +//| ... +//| +// Provided by mp_generic_unary_op(). + //| def __enter__(self) -> SSLSocket: //| """No-op used by Context Managers.""" //| ... @@ -282,20 +288,6 @@ STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_setblocking_obj, ssl_sslsocket_setblocking); -//| def __hash__(self) -> int: -//| """Returns a hash for the Socket.""" -//| ... -//| -STATIC mp_obj_t ssl_sslsocket_unary_op(mp_unary_op_t op, mp_obj_t self_in) { - switch (op) { - case MP_UNARY_OP_HASH: { - return mp_obj_id(self_in); - } - default: - return MP_OBJ_NULL; // op not supported - } -} - STATIC const mp_rom_map_elem_t ssl_sslsocket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&ssl_sslsocket___exit___obj) }, @@ -321,6 +313,6 @@ const mp_obj_type_t ssl_sslsocket_type = { .name = MP_QSTR_SSLSocket, .locals_dict = (mp_obj_dict_t *)&ssl_sslsocket_locals_dict, MP_TYPE_EXTENDED_FIELDS( - .unary_op = ssl_sslsocket_unary_op, + .unary_op = mp_generic_unary_op, ) }; From e52fd0871b04ab22309be2a4652e2dd049c61412 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Wed, 4 May 2022 04:43:56 +0200 Subject: [PATCH 0224/2403] 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 | 2 +- locale/cs.po | 2 +- locale/de_DE.po | 2 +- locale/el.po | 2 +- locale/en_GB.po | 2 +- locale/es.po | 2 +- locale/fil.po | 2 +- locale/fr.po | 2 +- locale/hi.po | 2 +- locale/it_IT.po | 2 +- locale/ja.po | 2 +- locale/ko.po | 2 +- locale/nl.po | 2 +- locale/pl.po | 2 +- locale/pt_BR.po | 2 +- locale/ru.po | 2 +- locale/sv.po | 2 +- locale/tr.po | 2 +- locale/zh_Latn_pinyin.po | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 259558f5c6..ab78319d05 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -631,7 +631,7 @@ msgstr "Panjang buffer %d terlalu besar. Itu harus kurang dari %d" msgid "Buffer length must be a multiple of 512" msgstr "Panjang buffer harus kelipatan 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 9a1b640b2c..416b2cf952 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -630,7 +630,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index cef3b0462c..bf0bcafe86 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -634,7 +634,7 @@ msgstr "Die Pufferlänge %d ist zu groß. Sie muss kleiner als %d sein" msgid "Buffer length must be a multiple of 512" msgstr "Die Pufferlänge muss ein vielfaches von 512 sein" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Der Puffer muss ein vielfaches von 512 bytes sein" diff --git a/locale/el.po b/locale/el.po index 7e49827d6b..cbb2d24af1 100644 --- a/locale/el.po +++ b/locale/el.po @@ -623,7 +623,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 76b9098a8c..e2a2ee778c 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -632,7 +632,7 @@ msgstr "Buffer length %d too big. It must be less than %d" msgid "Buffer length must be a multiple of 512" msgstr "Buffer length must be a multiple of 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Buffer must be a multiple of 512 bytes" diff --git a/locale/es.po b/locale/es.po index 130d1c9ab0..606dd8ccfa 100644 --- a/locale/es.po +++ b/locale/es.po @@ -637,7 +637,7 @@ msgstr "Longitud del buffer %d es demasiado grande. Tiene que ser menor a %d" msgid "Buffer length must be a multiple of 512" msgstr "El tamaño del búfer debe ser múltiplo de 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Búfer deber ser un múltiplo de 512 bytes" diff --git a/locale/fil.po b/locale/fil.po index 0d5aab815a..1c2b33a600 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -630,7 +630,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index b2114b82e2..4a1a831a1f 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -638,7 +638,7 @@ msgstr "La longueur du tampon %d est trop grande. Il doit être inférieur à %d msgid "Buffer length must be a multiple of 512" msgstr "La longueur de la mémoire tampon doit être un multiple de 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "La mémoire tampon doit être un multiple de 512" diff --git a/locale/hi.po b/locale/hi.po index 0e209da6ff..a9df693b31 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -623,7 +623,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 4f94abb6ea..c93101be8a 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -636,7 +636,7 @@ msgstr "Lunghezza Buffer %d troppo grande. Deve essere meno di %d" msgid "Buffer length must be a multiple of 512" msgstr "La lunghezza del buffer deve essere un multiplo di 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Il buffer deve essere un multiplo di 512 bytes" diff --git a/locale/ja.po b/locale/ja.po index cf5adc15e8..ba4392c275 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -630,7 +630,7 @@ msgstr "バッファ長%dは大きすぎます。%d以下でなければなり msgid "Buffer length must be a multiple of 512" msgstr "バッファ長は512の倍数でなければなりません" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "バッファは512の倍数でなければなりません" diff --git a/locale/ko.po b/locale/ko.po index 8e307851fc..c2ebfdef98 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -626,7 +626,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 0e7310a58c..e647163b94 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -628,7 +628,7 @@ msgstr "Buffer lengte %d te groot. Het moet kleiner zijn dan %d" msgid "Buffer length must be a multiple of 512" msgstr "Buffer lengte moet een veelvoud van 512 zijn" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Buffer moet een veelvoud van 512 bytes zijn" diff --git a/locale/pl.po b/locale/pl.po index 4591aaac3c..73ec566382 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -630,7 +630,7 @@ msgstr "Długość %d bufora jest za duża. Musi być mniejsza niż %d" msgid "Buffer length must be a multiple of 512" msgstr "Długość bufora musi być wielokrotnością 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Bufor musi być wielokrotnością 512 bajtów" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 1d3333e55f..12fef607a9 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -643,7 +643,7 @@ msgstr "O tamanho do buffer %d é muito grande. Deve ser menor que %d" msgid "Buffer length must be a multiple of 512" msgstr "O comprimento do Buffer deve ser um múltiplo de 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "O buffer deve ser um múltiplo de 512 bytes" diff --git a/locale/ru.po b/locale/ru.po index f8725b0f8c..546bafb8f6 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -637,7 +637,7 @@ msgstr "Размер буфера %d слишком большой. Он дол msgid "Buffer length must be a multiple of 512" msgstr "Размер буфера должен быть кратен 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Буфер должен быть кратен 512" diff --git a/locale/sv.po b/locale/sv.po index 16ef753ee3..eadb26173c 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -633,7 +633,7 @@ msgstr "Buffertlängd %d för stor. Den måste vara mindre än %d" msgid "Buffer length must be a multiple of 512" msgstr "Buffertlängd måste vara en multipel av 512" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Bufferten måste vara en multipel av 512 byte" diff --git a/locale/tr.po b/locale/tr.po index dcfc518ce3..f3a597b3ea 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -640,7 +640,7 @@ msgstr "Mevcut arabellek boyutu %d çok büyük. En fazla %d kadar olmalı" msgid "Buffer length must be a multiple of 512" msgstr "Arabellek boyutu 512'nin katı olmalı" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index c989a89851..d2aa5eb907 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -640,7 +640,7 @@ msgstr "Huǎnchōng qū chángdù%d tài dà. Tā bìxū xiǎoyú%d" msgid "Buffer length must be a multiple of 512" msgstr "Huǎnchōngqū chángdù bìxū wéi 512 de bèishù" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "Huǎnchōngqū bìxū shì 512 zìjié de bèishù" From 0b525a285af70d172eec9322df03a87aa41e2ed5 Mon Sep 17 00:00:00 2001 From: s-ol Date: Tue, 5 Apr 2022 19:53:54 +0200 Subject: [PATCH 0225/2403] supervisor: Add supervisor.set_usb_identification() function --- shared-bindings/supervisor/__init__.c | 64 +++++++++++++++++++++++++++ supervisor/shared/usb/usb.c | 28 +++++++++++- supervisor/shared/usb/usb_desc.c | 21 ++++----- supervisor/usb.h | 13 +++++- 4 files changed, 111 insertions(+), 15 deletions(-) diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c index 0b86b7b2a6..fb3b2ff3b6 100644 --- a/shared-bindings/supervisor/__init__.c +++ b/shared-bindings/supervisor/__init__.c @@ -38,6 +38,7 @@ #include "supervisor/shared/traceback.h" #include "supervisor/shared/translate.h" #include "supervisor/shared/workflow.h" +#include "supervisor/usb.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/supervisor/__init__.h" @@ -311,6 +312,66 @@ STATIC mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels) } MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_terminal); +#if CIRCUITPY_USB +//| def set_usb_identification(manufacturer: Optional[str] = None, product: Optional[str] = None, vid: int = -1, pid: int = -1) -> None: +//| """Override identification constants in the USB Device Descriptor. +//| +//| If passed, `manufacturer` and `product` must be ASCII strings (or buffers) of at most 126 +//| characters. Any omitted arguments will be left at their default values. +//| +//| This method must be called in boot.py to have any effect.""" +//| ... +//| +STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + static const mp_arg_t allowed_args[] = { + { MP_QSTR_manufacturer, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, + { MP_QSTR_product, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, + { MP_QSTR_vid, MP_ARG_INT, {.u_int = -1} }, + { MP_QSTR_pid, MP_ARG_INT, {.u_int = -1} }, + }; + struct { + mp_arg_val_t manufacturer; + mp_arg_val_t product; + mp_arg_val_t vid; + mp_arg_val_t pid; + } args; + mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args); + + if (!usb_identification_allocation) { + usb_identification_allocation = allocate_memory(sizeof(usb_identification_t), false, true); + } + usb_identification_t *identification = (usb_identification_t *)usb_identification_allocation->ptr; + + mp_arg_validate_int_range(args.vid.u_int, -1, (1 << 16) - 1, MP_QSTR_vid); + mp_arg_validate_int_range(args.pid.u_int, -1, (1 << 16) - 1, MP_QSTR_pid); + + identification->vid = args.vid.u_int > -1 ? args.vid.u_int : USB_VID; + identification->pid = args.pid.u_int > -1 ? args.pid.u_int : USB_PID; + + mp_buffer_info_t info; + if (args.manufacturer.u_obj != mp_const_none) { + mp_get_buffer_raise(args.manufacturer.u_obj, &info, MP_BUFFER_READ); + mp_arg_validate_length_range(info.len, 0, 126, MP_QSTR_manufacturer); + memcpy(identification->manufacturer_name, info.buf, info.len); + identification->manufacturer_name[info.len] = 0; + } else { + memcpy(identification->manufacturer_name, USB_MANUFACTURER, sizeof(USB_MANUFACTURER)); + } + + if (args.product.u_obj != mp_const_none) { + mp_get_buffer_raise(args.product.u_obj, &info, MP_BUFFER_READ); + mp_arg_validate_length_range(info.len, 0, 126, MP_QSTR_product); + memcpy(identification->product_name, info.buf, info.len); + identification->product_name[info.len] = 0; + } else { + memcpy(identification->product_name, USB_MANUFACTURER, sizeof(USB_MANUFACTURER)); + } + + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_usb_identification_obj, 0, supervisor_set_usb_identification); +#endif + 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) }, @@ -325,6 +386,9 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_get_previous_traceback), MP_ROM_PTR(&supervisor_get_previous_traceback_obj) }, { MP_ROM_QSTR(MP_QSTR_disable_ble_workflow), MP_ROM_PTR(&supervisor_disable_ble_workflow_obj) }, { MP_ROM_QSTR(MP_QSTR_reset_terminal), MP_ROM_PTR(&supervisor_reset_terminal_obj) }, + #if CIRCUITPY_USB + { MP_ROM_QSTR(MP_QSTR_set_usb_identification), MP_ROM_PTR(&supervisor_set_usb_identification_obj) }, + #endif }; STATIC MP_DEFINE_CONST_DICT(supervisor_module_globals, supervisor_module_globals_table); diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c index a1885448de..aa239a5820 100644 --- a/supervisor/shared/usb/usb.c +++ b/supervisor/shared/usb/usb.c @@ -118,9 +118,11 @@ void usb_set_defaults(void) { #endif }; +supervisor_allocation *usb_identification_allocation; + // Some dynamic USB data must be saved after boot.py. How much is needed? size_t usb_boot_py_data_size(void) { - size_t size = 0; + size_t size = sizeof(usb_identification_t); #if CIRCUITPY_USB_HID size += usb_hid_report_descriptor_length(); @@ -131,6 +133,22 @@ size_t usb_boot_py_data_size(void) { // Fill in the data to save. void usb_get_boot_py_data(uint8_t *temp_storage, size_t temp_storage_size) { + if (usb_identification_allocation) { + memcpy(temp_storage, usb_identification_allocation->ptr, sizeof(usb_identification_t)); + free_memory(usb_identification_allocation); + } else { + usb_identification_t defaults = { + .vid = USB_VID, + .pid = USB_PID, + .manufacturer_name = USB_MANUFACTURER, + .product_name = USB_PRODUCT, + }; + memcpy(temp_storage, &defaults, sizeof(defaults)); + } + + temp_storage += sizeof(usb_identification_t); + temp_storage_size -= sizeof(usb_identification_t); + #if CIRCUITPY_USB_HID usb_hid_build_report_descriptor(temp_storage, temp_storage_size); #endif @@ -138,12 +156,18 @@ void usb_get_boot_py_data(uint8_t *temp_storage, size_t temp_storage_size) { // After VM is gone, save data into non-heap storage (storage_allocations). void usb_return_boot_py_data(uint8_t *temp_storage, size_t temp_storage_size) { + usb_identification_t identification; + memcpy(&identification, temp_storage, sizeof(usb_identification_t)); + + temp_storage += sizeof(usb_identification_t); + temp_storage_size -= sizeof(usb_identification_t); + #if CIRCUITPY_USB_HID usb_hid_save_report_descriptor(temp_storage, temp_storage_size); #endif // Now we can also build the rest of the descriptors and place them in storage_allocations. - usb_build_descriptors(); + usb_build_descriptors(&identification); } // Call this when ready to run code.py or a REPL, and a VM has been started. diff --git a/supervisor/shared/usb/usb_desc.c b/supervisor/shared/usb/usb_desc.c index 9fe1eadd4e..fa4cf9607e 100644 --- a/supervisor/shared/usb/usb_desc.c +++ b/supervisor/shared/usb/usb_desc.c @@ -68,9 +68,6 @@ static supervisor_allocation *device_descriptor_allocation; static supervisor_allocation *configuration_descriptor_allocation; static supervisor_allocation *string_descriptors_allocation; -static const char manufacturer_name[] = USB_MANUFACTURER; -static const char product_name[] = USB_PRODUCT; - // Serial number string is UID length * 2 (2 nibbles per byte) + 1 byte for null termination. static char serial_number_hex_string[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH * 2 + 1]; @@ -113,23 +110,23 @@ static const uint8_t configuration_descriptor_template[] = { 0x32, // 8 bMaxPower 100mA }; -static void usb_build_device_descriptor(uint16_t vid, uint16_t pid) { +static void usb_build_device_descriptor(const usb_identification_t *identification) { device_descriptor_allocation = allocate_memory(align32_size(sizeof(device_descriptor_template)), /*high_address*/ false, /*movable*/ false); uint8_t *device_descriptor = (uint8_t *)device_descriptor_allocation->ptr; memcpy(device_descriptor, device_descriptor_template, sizeof(device_descriptor_template)); - device_descriptor[DEVICE_VID_LO_INDEX] = vid & 0xFF; - device_descriptor[DEVICE_VID_HI_INDEX] = vid >> 8; - device_descriptor[DEVICE_PID_LO_INDEX] = pid & 0xFF; - device_descriptor[DEVICE_PID_HI_INDEX] = pid >> 8; + device_descriptor[DEVICE_VID_LO_INDEX] = identification->vid & 0xFF; + device_descriptor[DEVICE_VID_HI_INDEX] = identification->vid >> 8; + device_descriptor[DEVICE_PID_LO_INDEX] = identification->pid & 0xFF; + device_descriptor[DEVICE_PID_HI_INDEX] = identification->pid >> 8; - usb_add_interface_string(current_interface_string, manufacturer_name); + usb_add_interface_string(current_interface_string, identification->manufacturer_name); device_descriptor[DEVICE_MANUFACTURER_STRING_INDEX] = current_interface_string; current_interface_string++; - usb_add_interface_string(current_interface_string, product_name); + usb_add_interface_string(current_interface_string, identification->product_name); device_descriptor[DEVICE_PRODUCT_STRING_INDEX] = current_interface_string; current_interface_string++; @@ -319,7 +316,7 @@ static void usb_build_interface_string_table(void) { // After boot.py runs, the USB devices to be used have been chosen, and the descriptors can be set up. // This is called after the VM is finished, because it uses storage_allocations. -void usb_build_descriptors(void) { +void usb_build_descriptors(const usb_identification_t *identification) { uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH]; common_hal_mcu_processor_get_uid(raw_id); @@ -336,7 +333,7 @@ void usb_build_descriptors(void) { current_interface_string = 1; collected_interface_strings_length = 0; - usb_build_device_descriptor(USB_VID, USB_PID); + usb_build_device_descriptor(identification); usb_build_configuration_descriptor(); usb_build_interface_string_table(); } diff --git a/supervisor/usb.h b/supervisor/usb.h index 420f42391b..3c8da6f3b7 100644 --- a/supervisor/usb.h +++ b/supervisor/usb.h @@ -31,6 +31,8 @@ #include #include +#include "supervisor/memory.h" + // Ports must call this as frequently as they can in order to keep the USB // connection alive and responsive. Normally this is called from background // tasks after the USB IRQ handler is executed, but in specific circumstances @@ -58,10 +60,19 @@ typedef struct { size_t num_out_endpoints; } descriptor_counts_t; +typedef struct { + uint16_t vid; + uint16_t pid; + char manufacturer_name[128]; + char product_name[128]; +} usb_identification_t; + +extern supervisor_allocation *usb_identification_allocation; + // Shared implementation. bool usb_enabled(void); void usb_add_interface_string(uint8_t interface_string_index, const char str[]); -void usb_build_descriptors(void); +void usb_build_descriptors(const usb_identification_t *identification); void usb_disconnect(void); void usb_init(void); void usb_set_defaults(void); From 98ae0475254374c69b0783c5711728bbbec8c375 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 4 May 2022 11:41:48 -0400 Subject: [PATCH 0226/2403] Compile more SAMD things conditionallly --- ports/atmel-samd/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index b529751f7f..53ba302376 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -319,13 +319,10 @@ $(patsubst %.c,$(BUILD)/%.o,$(SRC_PERIPHERALS)): CFLAGS += -Wno-missing-prototyp SRC_C += \ audio_dma.c \ background.c \ - bindings/samd/Clock.c \ - bindings/samd/__init__.c \ boards/$(BOARD)/board.c \ boards/$(BOARD)/pins.c \ eic_handler.c \ fatfs_port.c \ - freetouch/adafruit_ptc.c \ lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \ mphalport.c \ reset.c \ @@ -340,10 +337,18 @@ ifneq (,$(filter 1,$(CIRCUITPY_PWMIO) $(CIRCUITPY_AUDIOIO) $(CIRCUITPY_RGBMATRIX SRC_C += shared_timers.c endif +ifeq ($(CIRCUITPY_SAMD),1) +SRC_C += bindings/samd/Clock.c bindings/samd/__init__.c +endif + ifeq ($(CIRCUITPY_SDIOIO),1) SRC_C += ports/atmel-samd/sd_mmc/sd_mmc.c endif +ifeq ($(CIRCUITPY_TOUCHIO),1) +SRC_C += freetouch/adafruit_ptc.c +endif + # The smallest SAMD51 packages don't have I2S. Everything else does. ifeq ($(CIRCUITPY_AUDIOBUSIO),1) SRC_C += peripherals/samd/i2s.c peripherals/samd/$(PERIPHERALS_CHIP_FAMILY)/i2s.c From 75bfcb36304aa11f3980dc603b796a95f86b29e0 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 4 May 2022 13:05:34 -0400 Subject: [PATCH 0227/2403] add caveat about software RS485 implementations --- shared-bindings/busio/UART.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 1819748992..06a0fb128d 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -63,7 +63,12 @@ //| :param int receiver_buffer_size: the character length of the read buffer (0 to disable). (When a character is 9 bits the buffer will be 2 * receiver_buffer_size bytes.) //| //| *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds. -//| The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds.""" +//| The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds. +//| +//| .. note:: RS485 support on i.MX and Raspberry Pi RP2040 is implemented in software. +//| The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet +//| RS485 specifications intermittently. +//| """ //| ... //| typedef struct { From 802931987aca249a9fcebe4fcd0059e27525282c Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 13:49:47 -0400 Subject: [PATCH 0228/2403] Fix board module additions --- shared-bindings/busio/__init__.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c index 7ac9b58dd2..38bbfaf6ef 100644 --- a/shared-bindings/busio/__init__.c +++ b/shared-bindings/busio/__init__.c @@ -68,10 +68,10 @@ //| This example will initialize the the device, run //| :py:meth:`~busio.I2C.scan` and then :py:meth:`~busio.I2C.deinit` the //| hardware. The last step is optional because CircuitPython automatically -//| resets hardware after a program finishes.""" +//| resets hardware after a program finishes. //| //| Note that drivers will typically handle communication if provided the bus -//| instance (such as `busio.I2C(board.SCL, board.SDA)`), and that many of +//| instance (such as ``busio.I2C(board.SCL, board.SDA)``), and that many of //| the methods listed here are lower level functionalities that are needed //| for working with custom drivers. //| @@ -80,6 +80,7 @@ //| //| Tutorial for UART: //| https://learn.adafruit.com/circuitpython-essentials/circuitpython-uart-serial +//| """ //| STATIC const mp_rom_map_elem_t busio_module_globals_table[] = { From 8651156ee0236f6855ad3bf81c67524748c3390c Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 13:50:08 -0400 Subject: [PATCH 0229/2403] Add link to busio from board module --- shared-bindings/board/__init__.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c index 8b2738a248..a400c19224 100644 --- a/shared-bindings/board/__init__.c +++ b/shared-bindings/board/__init__.c @@ -43,6 +43,10 @@ //| Common container for board base pin names. These will vary from board to //| board so don't expect portability when using this module. //| +//| The most common use of this module is to use serial communciation buses with +//| the default pins and settings. For more information about serial communcication +//| in CircuitPython, see the :mod:`busio`. +//| //| .. warning:: The board module varies by board. The APIs documented here may or may not be //| available on a specific board.""" From 3b665dda3c6add19b241c3c69927709139b35231 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 13:54:20 -0400 Subject: [PATCH 0230/2403] Add Learn guide for digitalio --- shared-bindings/digitalio/__init__.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c index e3f4e9992d..dd17d372a1 100644 --- a/shared-bindings/digitalio/__init__.c +++ b/shared-bindings/digitalio/__init__.c @@ -71,7 +71,11 @@ //| led.value = True //| time.sleep(0.1) //| led.value = False -//| time.sleep(0.1)""" +//| time.sleep(0.1) +//| +//| For more information on using `digitalio`, see this Learn guide: +//| https://learn.adafruit.com/circuitpython-digital-inputs-and-outputs +//| """ //| STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = { From 9d6c4059e062fa26e3f83a3bc7b3bfc2231df1b9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 13:57:37 -0400 Subject: [PATCH 0231/2403] Add CPY essential learn guide link to digitalio --- shared-bindings/digitalio/__init__.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c index dd17d372a1..8bc872be99 100644 --- a/shared-bindings/digitalio/__init__.c +++ b/shared-bindings/digitalio/__init__.c @@ -73,10 +73,13 @@ //| led.value = False //| time.sleep(0.1) //| -//| For more information on using `digitalio`, see this Learn guide: +//| For the essentials of `digitalio`, see the CircuitPython Essentials +//| Learn guide: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-digital-in-out +//| +//| For more information on using `digitalio`, see this additional Learn guide: //| https://learn.adafruit.com/circuitpython-digital-inputs-and-outputs //| """ -//| STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_digitalio) }, From 7a0b0010e83a38fe9238347d394416d2ea8c9c5f Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 13:59:04 -0400 Subject: [PATCH 0232/2403] Add CircuitPython Essentials Learn guide link to pwmio --- shared-bindings/pwmio/__init__.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/pwmio/__init__.c b/shared-bindings/pwmio/__init__.c index c9f7a50155..dbe487d580 100644 --- a/shared-bindings/pwmio/__init__.c +++ b/shared-bindings/pwmio/__init__.c @@ -57,7 +57,12 @@ //| :py:data:`~pwmio.PWMOut.duty_cycle`, and then sleep 0.1 seconds. //| CircuitPython will automatically turn off the PWM when it resets all //| hardware after program completion. Use ``deinit()`` or a ``with`` statement -//| to do it yourself.""" +//| to do it yourself. +//| +//| For the essentials of `pwmio`, see the CircuitPython Essentials +//| Learn guide: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-pwm +//| """ //| STATIC const mp_rom_map_elem_t pwmio_module_globals_table[] = { From 042eb84d84c0b4700f5fe97be0b685b93fde2628 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 14:01:03 -0400 Subject: [PATCH 0233/2403] Add Learn guide link to displayio --- shared-bindings/displayio/__init__.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c index 5588dc83e9..931ec3f77a 100644 --- a/shared-bindings/displayio/__init__.c +++ b/shared-bindings/displayio/__init__.c @@ -49,7 +49,12 @@ //| """Native helpers for driving displays //| //| The `displayio` module contains classes to manage display output -//| including synchronizing with refresh rates and partial updating.""" +//| including synchronizing with refresh rates and partial updating. +//| +//| For more a more thorugh explanation and guide for using `displayio`, please +//| refer to this Learn guide: +//| https://learn.adafruit.com/circuitpython-display-support-using-displayio +//| """ //| //| import paralleldisplay From ba4a253e7792fa772d188bcd2c338bb17dca57e9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 14:04:07 -0400 Subject: [PATCH 0234/2403] Add link to CPY Essentials Learn guide for storage module --- shared-bindings/storage/__init__.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c index 3c957468da..4a3a8384b1 100644 --- a/shared-bindings/storage/__init__.c +++ b/shared-bindings/storage/__init__.c @@ -40,7 +40,12 @@ //| The `storage` provides storage management functionality such as mounting and //| unmounting which is typically handled by the operating system hosting Python. //| CircuitPython does not have an OS, so this module provides this functionality -//| directly.""" +//| directly. + +//| For more information regarding using the `storage` module, refer to the CircuitPython +//| Essentials Learn guide: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-storage +//| """ //| //| def mount(filesystem: VfsFat, mount_path: str, *, readonly: bool = False) -> None: From f4bd20b5e8846c079d6d1804de7069646466d0d1 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 14:20:48 -0400 Subject: [PATCH 0235/2403] Add inofrmation about NeoPixels in neopixel_write module --- shared-bindings/neopixel_write/__init__.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index bcdedf62a7..9375beab06 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -91,7 +91,19 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { //| pin = digitalio.DigitalInOut(board.NEOPIXEL) //| pin.direction = digitalio.Direction.OUTPUT //| pixel_off = bytearray([0, 0, 0]) -//| neopixel_write.neopixel_write(pin, pixel_off)""" +//| neopixel_write.neopixel_write(pin, pixel_off) +//| +//| .. note:: +//| +//| This library is typically not used by user level code. +//| +//| For more information on actually using NeoPixels, refer to the CircuitPython +//| Essentials Learn guide: https://learn.adafruit.com/circuitpython-essentials/circuitpython-neopixel +//| +//| For a much more thorough guide about using NeoPixels, refer to the Adadfruit NeoPixel Überguide: +//| https://learn.adafruit.com/adafruit-neopixel-uberguide +//| +//| """ //| //| def neopixel_write(digitalinout: digitalio.DigitalInOut, buf: ReadableBuffer) -> None: //| """Write buf out on the given DigitalInOut. From aaaa0acde47121c79f54797f396b70cc9ce3aec2 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 14:26:52 -0400 Subject: [PATCH 0236/2403] Add link to CPY Essentials Learn guide for board module --- shared-bindings/board/__init__.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c index a400c19224..895edc6b6b 100644 --- a/shared-bindings/board/__init__.c +++ b/shared-bindings/board/__init__.c @@ -43,10 +43,14 @@ //| Common container for board base pin names. These will vary from board to //| board so don't expect portability when using this module. //| -//| The most common use of this module is to use serial communciation buses with +//| Another common use of this module is to use serial communciation buses with //| the default pins and settings. For more information about serial communcication //| in CircuitPython, see the :mod:`busio`. //| +//| For more information regarding the typical usage of `board`, refer to the CircuitPython +//| Essentials Learn guide: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-pins-and-modules +//| //| .. warning:: The board module varies by board. The APIs documented here may or may not be //| available on a specific board.""" From 9d83b319b3cb0d30be5f4eb58377c6fa021b7060 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 14:27:10 -0400 Subject: [PATCH 0237/2403] Add Learn guide link to CPY Essentials for analogio --- shared-bindings/analogio/__init__.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c index 51f8a21537..89096ae9aa 100644 --- a/shared-bindings/analogio/__init__.c +++ b/shared-bindings/analogio/__init__.c @@ -57,7 +57,15 @@ //| This example will initialize the the device, read //| :py:data:`~analogio.AnalogIn.value` and then //| :py:meth:`~analogio.AnalogIn.deinit` the hardware. The last step is optional -//| because CircuitPython will do it automatically after the program finishes.""" +//| because CircuitPython will do it automatically after the program finishes. +//| +//| For the essentials of `analogio`, see the CircuitPython Essentials +//| Learn guide: +//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-analog-in +//| +//| For more information on using `analogio`, see this additional Learn guide: +//| https://learn.adafruit.com/circuitpython-basics-analog-inputs-and-outputs +//| """ //| STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = { From 76040a93803461d5b86e8d2fd3b5d4a7b0552792 Mon Sep 17 00:00:00 2001 From: billvanleeuwen424 Date: Wed, 4 May 2022 14:57:37 -0400 Subject: [PATCH 0238/2403] removed duplicate include per issue 6278 --- ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c index 0eb3ddecd2..e13275e1d2 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c @@ -27,8 +27,6 @@ #include "shared-bindings/board/__init__.h" -#include "shared-bindings/board/__init__.h" - CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) STATIC const mp_rom_map_elem_t board_module_globals_table[] = { From d1d6d99318b3da73beb5f1e1de05c0bb93e6548a Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 4 May 2022 21:59:08 -0400 Subject: [PATCH 0239/2403] Specify target for `board` --- shared-bindings/board/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c index 895edc6b6b..a496ff0b9c 100644 --- a/shared-bindings/board/__init__.c +++ b/shared-bindings/board/__init__.c @@ -47,7 +47,7 @@ //| the default pins and settings. For more information about serial communcication //| in CircuitPython, see the :mod:`busio`. //| -//| For more information regarding the typical usage of `board`, refer to the CircuitPython +//| For more information regarding the typical usage of :py:mod:`board`, refer to the CircuitPython //| Essentials Learn guide: //| https://learn.adafruit.com/circuitpython-essentials/circuitpython-pins-and-modules //| From 0f3eb9f46e9cd9b63c20cf5a50693ced0df28c1a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 4 May 2022 22:51:27 -0400 Subject: [PATCH 0240/2403] espressif: check properly for pull values --- ports/espressif/common-hal/digitalio/DigitalInOut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c index bf52965d28..1ab232b29a 100644 --- a/ports/espressif/common-hal/digitalio/DigitalInOut.c +++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c @@ -142,9 +142,9 @@ void common_hal_digitalio_digitalinout_set_pull( digitalio_pull_t common_hal_digitalio_digitalinout_get_pull( digitalio_digitalinout_obj_t *self) { gpio_num_t gpio_num = self->pin->number; - if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU) == 1) { + if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU)) { return PULL_UP; - } else if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD) == 1) { + } else if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD)) { return PULL_DOWN; } return PULL_NONE; From a9d929627a0550f83cacc02aa97dbdcdb0e9737e Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 5 May 2022 14:40:49 -0500 Subject: [PATCH 0241/2403] minor comment update --- ports/raspberrypi/common-hal/neopixel_write/__init__.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/common-hal/neopixel_write/__init__.c b/ports/raspberrypi/common-hal/neopixel_write/__init__.c index 034c5de002..5c66d33feb 100644 --- a/ports/raspberrypi/common-hal/neopixel_write/__init__.c +++ b/ports/raspberrypi/common-hal/neopixel_write/__init__.c @@ -63,7 +63,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, uint32_t pins_we_use = 1 << digitalinout->pin->number; bool ok = rp2pio_statemachine_construct(&state_machine, neopixel_program, sizeof(neopixel_program) / sizeof(neopixel_program[0]), - 12800000, // MHz, to get about appropriate sub-bit times in PIO program. + 12800000, // 12.8MHz, to get appropriate sub-bit times in PIO program. NULL, 0, // init program NULL, 1, // out NULL, 1, // in From 02ec1cebf68c853756373f6c82801736e39d2464 Mon Sep 17 00:00:00 2001 From: Guy Dupont Date: Thu, 5 May 2022 21:11:32 -0400 Subject: [PATCH 0242/2403] Fix pin mapping for thing plus 2040 GPIO 26 was mapped to GPIO 28 --- ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c index 22dccc66bb..86adaa926d 100644 --- a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c +++ b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c @@ -46,8 +46,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) }, // SD Card { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO14)}, From 1a9034ff7c3aa2b17822a61e35ea277ec401d2ac Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 6 May 2022 14:21:09 -0500 Subject: [PATCH 0243/2403] rp2pio: Allow background_write(None) to terminate after complete loop --- ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index c38e1ec010..b830a82be8 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -917,7 +917,7 @@ bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t * self->loop = *loop; self->pending_buffers = pending_buffers; - if (self->dma_completed) { + if (self->dma_completed && self->once.info.len) { rp2pio_statemachine_dma_complete(self, SM_DMA_GET_CHANNEL(pio_index, sm)); self->dma_completed = false; } From f776749ca3f5cc69beeff2f7b1005c3527dec27d Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 6 May 2022 14:22:07 -0500 Subject: [PATCH 0244/2403] Key off len, not buf, to decide if anything to DMA --- ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index b830a82be8..00e715be6b 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -894,8 +894,8 @@ bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t * uint8_t pio_index = pio_get_index(self->pio); uint8_t sm = self->state_machine; - int pending_buffers = (once->info.buf != NULL) + (loop->info.buf != NULL); - if (!once->info.buf) { + int pending_buffers = (once->info.len != 0) + (loop->info.len != 0); + if (!once->info.len) { once = loop; } From 23c0fc83549536905b1562a3fd4b5ed0a6fde871 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 6 May 2022 14:42:24 -0500 Subject: [PATCH 0245/2403] add ability to get, clear txstall flag This can be used to make sure a PIO has actually finished all data it was schedule to receive via a 'once' background_write --- .../bindings/rp2pio/StateMachine.c | 34 +++++++++++++++++++ .../bindings/rp2pio/StateMachine.h | 2 ++ .../common-hal/rp2pio/StateMachine.c | 12 +++++++ 3 files changed, 48 insertions(+) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 28668355b1..d234a50a9a 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -708,6 +708,18 @@ STATIC mp_obj_t rp2pio_statemachine_obj_clear_rxfifo(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_rxfifo_obj, rp2pio_statemachine_obj_clear_rxfifo); +//| def clear_txstall(self) -> None: +//| """Clears the txstall flag.""" +//| ... +//| +STATIC mp_obj_t rp2pio_statemachine_obj_clear_txstall(mp_obj_t self_in) { + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); + common_hal_rp2pio_statemachine_clear_txstall(self); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_txstall_obj, rp2pio_statemachine_obj_clear_txstall); + + //| frequency: int //| """The actual state machine frequency. This may not match the frequency requested //| due to internal limitations.""" @@ -736,6 +748,26 @@ const mp_obj_property_t rp2pio_statemachine_frequency_obj = { MP_ROM_NONE}, }; +//| txstall: bool +//| """True when the state machine has stalled due to a full TX FIFO since the last +//| `clear_txstall` call.""" +//| + +STATIC mp_obj_t rp2pio_statemachine_obj_get_txstall(mp_obj_t self_in) { + rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); + check_for_deinit(self); + return MP_OBJ_NEW_SMALL_INT(common_hal_rp2pio_statemachine_get_txstall(self)); +} +MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_txstall_obj, rp2pio_statemachine_obj_get_txstall); + +const mp_obj_property_t rp2pio_statemachine_txstall_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&rp2pio_statemachine_get_txstall_obj, + MP_ROM_NONE, + MP_ROM_NONE}, +}; + + //| rxstall: bool //| """True when the state machine has stalled due to a full RX FIFO since the last //| `clear_rxfifo` call.""" @@ -782,6 +814,7 @@ STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_restart), MP_ROM_PTR(&rp2pio_statemachine_restart_obj) }, { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&rp2pio_statemachine_run_obj) }, { MP_ROM_QSTR(MP_QSTR_clear_rxfifo), MP_ROM_PTR(&rp2pio_statemachine_clear_rxfifo_obj) }, + { MP_ROM_QSTR(MP_QSTR_clear_txstall), MP_ROM_PTR(&rp2pio_statemachine_clear_txstall_obj) }, { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&rp2pio_statemachine_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&rp2pio_statemachine_write_obj) }, @@ -793,6 +826,7 @@ STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&rp2pio_statemachine_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_rxstall), MP_ROM_PTR(&rp2pio_statemachine_rxstall_obj) }, + { MP_ROM_QSTR(MP_QSTR_txstall), MP_ROM_PTR(&rp2pio_statemachine_txstall_obj) }, { MP_ROM_QSTR(MP_QSTR_in_waiting), MP_ROM_PTR(&rp2pio_statemachine_in_waiting_obj) }, }; STATIC MP_DEFINE_CONST_DICT(rp2pio_statemachine_locals_dict, rp2pio_statemachine_locals_dict_table); diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index 087283ced2..36e406032d 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -81,6 +81,8 @@ void common_hal_rp2pio_statemachine_set_frequency(rp2pio_statemachine_obj_t *sel bool common_hal_rp2pio_statemachine_get_rxstall(rp2pio_statemachine_obj_t *self); void common_hal_rp2pio_statemachine_clear_rxfifo(rp2pio_statemachine_obj_t *self); +bool common_hal_rp2pio_statemachine_get_txstall(rp2pio_statemachine_obj_t *self); +void common_hal_rp2pio_statemachine_clear_txstall(rp2pio_statemachine_obj_t *self); size_t common_hal_rp2pio_statemachine_get_in_waiting(rp2pio_statemachine_obj_t *self); void common_hal_rp2pio_statemachine_set_interrupt_handler(rp2pio_statemachine_obj_t *self, void (*handler)(void *), void *arg, int mask); diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 00e715be6b..8017722e62 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -848,6 +848,18 @@ void common_hal_rp2pio_statemachine_clear_rxfifo(rp2pio_statemachine_obj_t *self self->pio->fdebug = stall_mask; } +bool common_hal_rp2pio_statemachine_get_txstall(rp2pio_statemachine_obj_t *self) { + uint32_t stall_mask = 1 << (PIO_FDEBUG_TXSTALL_LSB + self->state_machine); + return (self->pio->fdebug & stall_mask) != 0; +} + +void common_hal_rp2pio_statemachine_clear_txstall(rp2pio_statemachine_obj_t *self) { + uint8_t level = pio_sm_get_rx_fifo_level(self->pio, self->state_machine); + uint32_t stall_mask = 1 << (PIO_FDEBUG_TXSTALL_LSB + self->state_machine); + self->pio->fdebug = stall_mask; +} + + size_t common_hal_rp2pio_statemachine_get_in_waiting(rp2pio_statemachine_obj_t *self) { uint8_t level = pio_sm_get_rx_fifo_level(self->pio, self->state_machine); return level; From b482a732c6ab2293d3a9efdcd39dda92848238d5 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 6 May 2022 15:18:59 -0500 Subject: [PATCH 0246/2403] StateMachine: add swap flag Always use DMA if swap flag is enabled. Improve docs a bit --- locale/circuitpython.pot | 6 ++- .../bindings/rp2pio/StateMachine.c | 42 +++++++++++++------ .../bindings/rp2pio/StateMachine.h | 8 ++-- .../raspberrypi/common-hal/audiobusio/PDMIn.c | 4 +- .../imagecapture/ParallelImageCapture.c | 2 +- .../common-hal/neopixel_write/__init__.c | 2 +- .../common-hal/paralleldisplay/ParallelBus.c | 2 +- .../common-hal/rotaryio/IncrementalEncoder.c | 2 +- .../common-hal/rp2pio/StateMachine.c | 40 +++++++++++++----- .../common-hal/rp2pio/StateMachine.h | 2 +- 10 files changed, 74 insertions(+), 36 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index db06147fe0..3f8322c8dd 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1540,6 +1540,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2033,7 +2037,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index d234a50a9a..c690a0da5d 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -378,7 +378,7 @@ STATIC mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop); -//| def write(self, buffer: ReadableBuffer, *, start: int = 0, end: Optional[int] = None) -> None: +//| def write(self, buffer: ReadableBuffer, *, start: int = 0, end: Optional[int] = None, swap bool = False) -> None: //| """Write the data contained in ``buffer`` to the state machine. If the buffer is empty, nothing happens. //| //| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements @@ -391,14 +391,16 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop //| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer //| :param int start: Start of the slice of ``buffer`` to write out: ``buffer[start:end]`` //| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" +//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" //| ... //| STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer, ARG_start, ARG_end }; + enum { ARG_buffer, ARG_start, ARG_end, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, + { MP_QSTR_swap, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, }; rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -420,7 +422,7 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); } - bool ok = common_hal_rp2pio_statemachine_write(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); + bool ok = common_hal_rp2pio_statemachine_write(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes, args[ARG_swap].u_bool); if (mp_hal_is_interrupted()) { return mp_const_none; } @@ -431,7 +433,7 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write); -//| def background_write(self, once: Optional[ReadableBuffer]=None, *, loop: Optional[ReadableBuffer]=None) -> None: +//| def background_write(self, once: Optional[ReadableBuffer]=None, *, loop: Optional[ReadableBuffer]=None, swap: bool=False) -> None: //| """Write data to the TX fifo in the background, with optional looping. //| //| First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have. @@ -459,8 +461,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| where a change in duty cycle requires a special transitional buffer to be used exactly once. Most //| use cases will probably only use one of ``once`` or ``loop``. //| +//| Having neither ``once`` nor ``loop`` terminates an existing +//| background looping write after exactly a whole loop. This is in contrast to +//| `stop_background_write, which interrupts an ongoing DMA operation. +//| //| :param ~Optional[circuitpython_typing.ReadableBuffer] once: Data to be written once //| :param ~Optional[circuitpython_typing.ReadableBuffer] loop: Data to be written repeatedly +//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" //| """ //| ... //| @@ -483,10 +490,11 @@ STATIC void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_byt } STATIC mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_once, ARG_loop }; + enum { ARG_once, ARG_loop, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_once, MP_ARG_OBJ, {.u_obj = mp_const_none} }, { MP_QSTR_loop, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, + { MP_QSTR_swap, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, }; rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -502,7 +510,7 @@ STATIC mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj return mp_const_none; } - bool ok = common_hal_rp2pio_statemachine_background_write(self, &once_info, &loop_info, stride_in_bytes); + bool ok = common_hal_rp2pio_statemachine_background_write(self, &once_info, &loop_info, stride_in_bytes, args[ARG_swap].u_bool); if (mp_hal_is_interrupted()) { return mp_const_none; @@ -515,7 +523,9 @@ STATIC mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_background_write_obj, 1, rp2pio_statemachine_background_write); //| def stop_background_write(self) -> None: -//| """Immediately stop a background write, if one is in progress. Items already in the TX FIFO are not affected.""" +//| """Immediately stop a background write, if one is in progress. Any +//| DMA in progress is halted, but items already in the TX FIFO are not +//| affected.""" //| STATIC mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); @@ -567,7 +577,7 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = { MP_ROM_NONE}, }; -//| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None) -> None: +//| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None, bool swap) -> None: //| """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer //| includes any data added to the fifo even if it was added before this was called. //| @@ -581,16 +591,18 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = { //| //| :param ~circuitpython_typing.WriteableBuffer buffer: Read data into this buffer //| :param int start: Start of the slice of ``buffer`` to read into: ``buffer[start:end]`` -//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" +//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)`` +//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" //| ... //| STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer, ARG_start, ARG_end }; + enum { ARG_buffer, ARG_start, ARG_end, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, + { MP_QSTR_swap, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, }; rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -613,7 +625,7 @@ STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_ mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less")); } - bool ok = common_hal_rp2pio_statemachine_readinto(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes); + bool ok = common_hal_rp2pio_statemachine_readinto(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes, args[ARG_swap].u_bool); if (!ok) { mp_raise_OSError(MP_EIO); } @@ -639,11 +651,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach //| :param int out_end: End of the slice; this index is not included. Defaults to ``len(buffer_out)`` //| :param int in_start: Start of the slice of ``buffer_in`` to read into: ``buffer_in[in_start:in_end]`` //| :param int in_end: End of the slice; this index is not included. Defaults to ``len(buffer_in)``""" +//| :param bool swap_out: For 2- and 4-byte elements, swap the byte order for the buffer being transmitted (written)""" +//| :param bool swap_in: For 2- and 4-rx elements, swap the byte order for the buffer being received (read)""" //| ... //| STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer_out, ARG_buffer_in, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; + enum { ARG_buffer_out, ARG_buffer_in, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end, ARG_swap_out, ARG_swap_in }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer_out, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_buffer_in, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -651,6 +665,8 @@ STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t { MP_QSTR_out_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, { MP_QSTR_in_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_in_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} }, + { MP_QSTR_swap_out, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, + { MP_QSTR_swap_in, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, }; rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -689,7 +705,7 @@ STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t out_stride_in_bytes, ((uint8_t *)buf_in_info.buf) + in_start, in_length, - in_stride_in_bytes); + in_stride_in_bytes, args[ARG_swap_out].u_bool, args[ARG_swap_in].u_bool); if (!ok) { mp_raise_OSError(MP_EIO); } diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h index 36e406032d..3ec70a8703 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h @@ -65,15 +65,15 @@ void common_hal_rp2pio_statemachine_stop(rp2pio_statemachine_obj_t *self); void common_hal_rp2pio_statemachine_run(rp2pio_statemachine_obj_t *self, const uint16_t *instructions, size_t len); // Writes out the given data. -bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes); -bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once_obj, const sm_buf_info *loop_obj, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes, bool swap); +bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once_obj, const sm_buf_info *loop_obj, uint8_t stride_in_bytes, bool swap); bool common_hal_rp2pio_statemachine_stop_background_write(rp2pio_statemachine_obj_t *self); mp_int_t common_hal_rp2pio_statemachine_get_pending(rp2pio_statemachine_obj_t *self); bool common_hal_rp2pio_statemachine_get_writing(rp2pio_statemachine_obj_t *self); -bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes); +bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes, bool swap); bool common_hal_rp2pio_statemachine_write_readinto(rp2pio_statemachine_obj_t *self, const uint8_t *data_out, size_t out_len, uint8_t out_stride_in_bytes, - uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes); + uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes, bool swap_out, bool swap_in); // Return actual state machine frequency. uint32_t common_hal_rp2pio_statemachine_get_frequency(rp2pio_statemachine_obj_t *self); diff --git a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c index 1a120a45f7..8301f9fde4 100644 --- a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c +++ b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c @@ -157,9 +157,9 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t *se size_t output_count = 0; common_hal_rp2pio_statemachine_clear_rxfifo(&self->state_machine); // Do one read to get the mic going and throw it away. - common_hal_rp2pio_statemachine_readinto(&self->state_machine, (uint8_t *)samples, 2 * sizeof(uint32_t), sizeof(uint32_t)); + common_hal_rp2pio_statemachine_readinto(&self->state_machine, (uint8_t *)samples, 2 * sizeof(uint32_t), sizeof(uint32_t), false); while (output_count < output_buffer_length && !common_hal_rp2pio_statemachine_get_rxstall(&self->state_machine)) { - common_hal_rp2pio_statemachine_readinto(&self->state_machine, (uint8_t *)samples, 2 * sizeof(uint32_t), sizeof(uint32_t)); + common_hal_rp2pio_statemachine_readinto(&self->state_machine, (uint8_t *)samples, 2 * sizeof(uint32_t), sizeof(uint32_t), false); // Call filter_sample just one place so it can be inlined. uint16_t value = filter_sample(samples); if (self->bit_depth == 8) { diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c index c578c3216f..3c5c57eea5 100644 --- a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c @@ -153,7 +153,7 @@ void common_hal_imagecapture_parallelimagecapture_singleshot_capture(imagecaptur pio_sm_exec(pio, sm, pio_encode_jmp(offset)); pio_sm_set_enabled(pio, sm, true); - common_hal_rp2pio_statemachine_readinto(&self->state_machine, bufinfo.buf, bufinfo.len, 4); + common_hal_rp2pio_statemachine_readinto(&self->state_machine, bufinfo.buf, bufinfo.len, 4, false); pio_sm_set_enabled(pio, sm, false); } diff --git a/ports/raspberrypi/common-hal/neopixel_write/__init__.c b/ports/raspberrypi/common-hal/neopixel_write/__init__.c index 5c66d33feb..d473285b02 100644 --- a/ports/raspberrypi/common-hal/neopixel_write/__init__.c +++ b/ports/raspberrypi/common-hal/neopixel_write/__init__.c @@ -90,7 +90,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, while (port_get_raw_ticks(NULL) < next_start_raw_ticks) { } - common_hal_rp2pio_statemachine_write(&state_machine, pixels, num_bytes, 1 /* stride in bytes */); + common_hal_rp2pio_statemachine_write(&state_machine, pixels, num_bytes, 1 /* stride in bytes */, false); // Use a private deinit of the state machine that doesn't reset the pin. rp2pio_statemachine_deinit(&state_machine, true); diff --git a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c index 4f30d121ad..96c89ade95 100644 --- a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +++ b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c @@ -161,7 +161,7 @@ void common_hal_paralleldisplay_parallelbus_send(mp_obj_t obj, display_byte_type paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj); common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA); - common_hal_rp2pio_statemachine_write(&self->state_machine, data, data_length, 1); + common_hal_rp2pio_statemachine_write(&self->state_machine, data, data_length, 1, false); } void common_hal_paralleldisplay_parallelbus_end_transaction(mp_obj_t obj) { diff --git a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c index bbeeb5a1b9..0da12e5923 100644 --- a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c @@ -98,7 +98,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode // We're guaranteed by the init code that some output will be available promptly uint8_t quiescent_state; - common_hal_rp2pio_statemachine_readinto(&self->state_machine, &quiescent_state, 1, 1); + common_hal_rp2pio_statemachine_readinto(&self->state_machine, &quiescent_state, 1, 1, false); shared_module_softencoder_state_init(self, quiescent_state & 3); common_hal_rp2pio_statemachine_set_interrupt_handler(&self->state_machine, incrementalencoder_interrupt_handler, self, PIO_IRQ0_INTF_SM0_RXNEMPTY_BITS); diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 8017722e62..bee77238b5 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -663,7 +663,7 @@ STATIC enum dma_channel_transfer_size _stride_to_dma_size(uint8_t stride) { static bool _transfer(rp2pio_statemachine_obj_t *self, const uint8_t *data_out, size_t out_len, uint8_t out_stride_in_bytes, - uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes) { + uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes, bool swap_out, bool swap_in) { // This implementation is based on SPI but varies because the tx and rx buffers // may be different lengths and occur at different times or speeds. @@ -674,13 +674,26 @@ static bool _transfer(rp2pio_statemachine_obj_t *self, size_t len = MAX(out_len, in_len); bool tx = data_out != NULL; bool rx = data_in != NULL; - if (len >= dma_min_size_threshold) { + bool use_dma = len >= dma_min_size_threshold || swap_out || swap_in; + if (use_dma) { // Use DMA channels to service the two FIFOs if (tx) { chan_tx = dma_claim_unused_channel(false); + // DMA allocation failed... + if (chan_tx < 0) { + return false; + } } if (rx) { chan_rx = dma_claim_unused_channel(false); + // DMA allocation failed... + if (chan_rx < 0) { + // may need to free tx channel + if (chan_tx >= 0) { + dma_channel_unclaim(chan_tx); + } + return false; + } } } volatile uint8_t *tx_destination = NULL; @@ -698,7 +711,6 @@ static bool _transfer(rp2pio_statemachine_obj_t *self, } } uint32_t stall_mask = 1 << (PIO_FDEBUG_TXSTALL_LSB + self->state_machine); - bool use_dma = (!rx || chan_rx >= 0) && (!tx || chan_tx >= 0); if (use_dma) { dma_channel_config c; uint32_t channel_mask = 0; @@ -708,6 +720,7 @@ static bool _transfer(rp2pio_statemachine_obj_t *self, channel_config_set_dreq(&c, self->tx_dreq); channel_config_set_read_increment(&c, true); channel_config_set_write_increment(&c, false); + channel_config_set_bswap(&c, swap_out); dma_channel_configure(chan_tx, &c, tx_destination, data_out, @@ -721,6 +734,7 @@ static bool _transfer(rp2pio_statemachine_obj_t *self, channel_config_set_dreq(&c, self->rx_dreq); channel_config_set_read_increment(&c, false); channel_config_set_write_increment(&c, true); + channel_config_set_bswap(&c, swap_in); dma_channel_configure(chan_rx, &c, data_in, rx_source, @@ -811,27 +825,27 @@ static bool _transfer(rp2pio_statemachine_obj_t *self, // TODO: Provide a way around these checks in case someone wants to use the FIFO // with manually run code. -bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes) { +bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes, bool swap) { if (!self->out) { mp_raise_RuntimeError(translate("No out in program")); } - return _transfer(self, data, len, stride_in_bytes, NULL, 0, 0); + return _transfer(self, data, len, stride_in_bytes, NULL, 0, 0, swap, false); } -bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes) { +bool common_hal_rp2pio_statemachine_readinto(rp2pio_statemachine_obj_t *self, uint8_t *data, size_t len, uint8_t stride_in_bytes, bool swap) { if (!self->in) { mp_raise_RuntimeError(translate("No in in program")); } - return _transfer(self, NULL, 0, 0, data, len, stride_in_bytes); + return _transfer(self, NULL, 0, 0, data, len, stride_in_bytes, false, swap); } bool common_hal_rp2pio_statemachine_write_readinto(rp2pio_statemachine_obj_t *self, const uint8_t *data_out, size_t out_len, uint8_t out_stride_in_bytes, - uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes) { + uint8_t *data_in, size_t in_len, uint8_t in_stride_in_bytes, bool swap_out, bool swap_in) { if (!self->in || !self->out) { mp_raise_RuntimeError(translate("No in or out in program")); } - return _transfer(self, data_out, out_len, out_stride_in_bytes, data_in, in_len, in_stride_in_bytes); + return _transfer(self, data_out, out_len, out_stride_in_bytes, data_in, in_len, in_stride_in_bytes, swap_out, swap_in); } bool common_hal_rp2pio_statemachine_get_rxstall(rp2pio_statemachine_obj_t *self) { @@ -902,7 +916,7 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) { return _current_program_offset[pio_index][sm]; } -bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once, const sm_buf_info *loop, uint8_t stride_in_bytes) { +bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once, const sm_buf_info *loop, uint8_t stride_in_bytes, bool swap) { uint8_t pio_index = pio_get_index(self->pio); uint8_t sm = self->state_machine; @@ -911,11 +925,13 @@ bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t * once = loop; } - if (SM_DMA_ALLOCATED(pio_index, sm)) { if (stride_in_bytes != self->background_stride_in_bytes) { mp_raise_ValueError(translate("Mismatched data size")); } + if (swap != self->byteswap) { + mp_raise_ValueError(translate("Mismatched swap flag")); + } while (self->pending_buffers) { RUN_BACKGROUND_TASKS; @@ -958,12 +974,14 @@ bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t * self->pending_buffers = pending_buffers; self->dma_completed = false; self->background_stride_in_bytes = stride_in_bytes; + self->byteswap = swap; c = dma_channel_get_default_config(channel); channel_config_set_transfer_data_size(&c, _stride_to_dma_size(stride_in_bytes)); channel_config_set_dreq(&c, self->tx_dreq); channel_config_set_read_increment(&c, true); channel_config_set_write_increment(&c, false); + channel_config_set_bswap(&c, swap); dma_channel_configure(channel, &c, tx_destination, once->info.buf, diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h index 470f0ed8b1..03dadc53b3 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h @@ -64,7 +64,7 @@ typedef struct { volatile int pending_buffers; sm_buf_info current, once, loop; int background_stride_in_bytes; - bool dma_completed; + bool dma_completed, byteswap; } rp2pio_statemachine_obj_t; void reset_rp2pio_statemachine(void); From b7882edd013b68db824135148a4957cd5127bd49 Mon Sep 17 00:00:00 2001 From: Michael Wisslead Date: Sat, 7 May 2022 00:57:10 +0000 Subject: [PATCH 0247/2403] Fix buffer issue for rp2040 PulseIn --- ports/raspberrypi/common-hal/pulseio/PulseIn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 83edde25ad..45d31626ec 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -147,9 +147,12 @@ void common_hal_pulseio_pulsein_interrupt(void *self_in) { } // return pulses that are not too short if (result > MIN_PULSE) { - self->buffer[self->buf_index] = (uint16_t)result; + size_t buf_index = (self->start + self->len) % self->maxlen; + self->buffer[buf_index] = (uint16_t)result; if (self->len < self->maxlen) { self->len++; + } else { + self->start = (self->start + 1) % self->maxlen; } if (self->buf_index < self->maxlen) { self->buf_index++; @@ -169,7 +172,6 @@ void common_hal_pulseio_pulsein_interrupt(void *self_in) { pio_sm_restart(self->state_machine.pio,self->state_machine.state_machine); pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, true); self->buf_index = 0; - self->start = 0; } } void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self, From 34427bd6ba02d0a3a3a6c8bfad85cd38dddaa1d8 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 6 May 2022 22:36:24 -0400 Subject: [PATCH 0248/2403] Update StateMachine.c --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index c690a0da5d..eee6e6b018 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -391,7 +391,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop //| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer //| :param int start: Start of the slice of ``buffer`` to write out: ``buffer[start:end]`` //| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" -//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" +//| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order""" //| ... //| STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { @@ -467,7 +467,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| //| :param ~Optional[circuitpython_typing.ReadableBuffer] once: Data to be written once //| :param ~Optional[circuitpython_typing.ReadableBuffer] loop: Data to be written repeatedly -//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" +//| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order //| """ //| ... //| @@ -592,7 +592,7 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = { //| :param ~circuitpython_typing.WriteableBuffer buffer: Read data into this buffer //| :param int start: Start of the slice of ``buffer`` to read into: ``buffer[start:end]`` //| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)`` -//| :param bool swap: For 2- and 4-byte elements, swap the byte order""" +//| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order""" //| ... //| @@ -651,8 +651,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach //| :param int out_end: End of the slice; this index is not included. Defaults to ``len(buffer_out)`` //| :param int in_start: Start of the slice of ``buffer_in`` to read into: ``buffer_in[in_start:in_end]`` //| :param int in_end: End of the slice; this index is not included. Defaults to ``len(buffer_in)``""" -//| :param bool swap_out: For 2- and 4-byte elements, swap the byte order for the buffer being transmitted (written)""" -//| :param bool swap_in: For 2- and 4-rx elements, swap the byte order for the buffer being received (read)""" +//| :param bool swap_out: For 2- and 4-byte elements, swap (reverse) the byte order for the buffer being transmitted (written)""" +//| :param bool swap_in: For 2- and 4-rx elements, swap (reverse) the byte order for the buffer being received (read)""" //| ... //| From 561ed3739a4b61e24999021f97879da1a7b8fca7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 7 May 2022 07:49:16 -0500 Subject: [PATCH 0249/2403] fix the docstrings --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index eee6e6b018..5b903fb2ad 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -378,7 +378,7 @@ STATIC mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) { } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop); -//| def write(self, buffer: ReadableBuffer, *, start: int = 0, end: Optional[int] = None, swap bool = False) -> None: +//| def write(self, buffer: ReadableBuffer, *, start: int = 0, end: Optional[int] = None, swap: bool = False) -> None: //| """Write the data contained in ``buffer`` to the state machine. If the buffer is empty, nothing happens. //| //| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements @@ -390,7 +390,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop //| //| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer //| :param int start: Start of the slice of ``buffer`` to write out: ``buffer[start:end]`` -//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``""" +//| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)`` //| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order""" //| ... //| @@ -463,7 +463,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| //| Having neither ``once`` nor ``loop`` terminates an existing //| background looping write after exactly a whole loop. This is in contrast to -//| `stop_background_write, which interrupts an ongoing DMA operation. +//| `stop_background_write`, which interrupts an ongoing DMA operation. //| //| :param ~Optional[circuitpython_typing.ReadableBuffer] once: Data to be written once //| :param ~Optional[circuitpython_typing.ReadableBuffer] loop: Data to be written repeatedly @@ -577,7 +577,7 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = { MP_ROM_NONE}, }; -//| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None, bool swap) -> None: +//| def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None, swap: bool=False) -> None: //| """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer //| includes any data added to the fifo even if it was added before this was called. //| @@ -650,8 +650,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach //| :param int out_start: Start of the slice of buffer_out to write out: ``buffer_out[out_start:out_end]`` //| :param int out_end: End of the slice; this index is not included. Defaults to ``len(buffer_out)`` //| :param int in_start: Start of the slice of ``buffer_in`` to read into: ``buffer_in[in_start:in_end]`` -//| :param int in_end: End of the slice; this index is not included. Defaults to ``len(buffer_in)``""" -//| :param bool swap_out: For 2- and 4-byte elements, swap (reverse) the byte order for the buffer being transmitted (written)""" +//| :param int in_end: End of the slice; this index is not included. Defaults to ``len(buffer_in)`` +//| :param bool swap_out: For 2- and 4-byte elements, swap (reverse) the byte order for the buffer being transmitted (written) //| :param bool swap_in: For 2- and 4-rx elements, swap (reverse) the byte order for the buffer being received (read)""" //| ... //| From 9a1c7cddd4444dca3eec68d245b1746649ad9487 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sat, 7 May 2022 16:36:08 +0200 Subject: [PATCH 0250/2403] 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/ru.po | 6 +++++- locale/sv.po | 6 +++++- locale/tr.po | 6 +++++- locale/zh_Latn_pinyin.po | 6 +++++- 19 files changed, 95 insertions(+), 19 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index ab78319d05..b3dd782f1e 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1559,6 +1559,10 @@ msgstr "Penundaan mulai mikrofon harus dalam kisaran 0,0 hingga 1,0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Tidak menemukan Pin MISO atau MOSI" @@ -2064,7 +2068,7 @@ msgstr "Kesalahan DeInit RNG" msgid "RNG Init Error" msgstr "Kesalahan Init RNG" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 416b2cf952..f87816126a 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1547,6 +1547,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2042,7 +2046,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index bf0bcafe86..029827eea2 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1567,6 +1567,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Fehlender MISO- oder MOSI-Pin" @@ -2072,7 +2076,7 @@ msgstr "RNG DeInit-Fehler" msgid "RNG Init Error" msgstr "RNG Init-Fehler" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 wird von diesem Gerät nicht unterstützt" diff --git a/locale/el.po b/locale/el.po index cbb2d24af1..2685481acc 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1540,6 +1540,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2033,7 +2037,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index e2a2ee778c..902fe0fc03 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1553,6 +1553,10 @@ msgstr "Microphone startup delay must be in range 0.0 to 1.0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Missing MISO or MOSI pin" @@ -2055,7 +2059,7 @@ msgstr "RNG deinit Error" msgid "RNG Init Error" msgstr "RNG init Error" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 not yet supported on this device" diff --git a/locale/es.po b/locale/es.po index 606dd8ccfa..eeffad5f55 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1571,6 +1571,10 @@ msgstr "Micrófono demora de inicio debe estar en el rango 0.0 a 1.0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Falta el pin MISO o MOSI" @@ -2082,7 +2086,7 @@ msgstr "Error de desinicialización de RNG" msgid "RNG Init Error" msgstr "Error de inicialización de RNG" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 no esta soportado todavía en este dispositivo" diff --git a/locale/fil.po b/locale/fil.po index 1c2b33a600..eb24473bcb 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1555,6 +1555,10 @@ msgstr "Ang delay ng startup ng mikropono ay dapat na nasa 0.0 hanggang 1.0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2052,7 +2056,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 4a1a831a1f..d8b286ade6 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1584,6 +1584,10 @@ msgstr "Le délais au démarrage du micro doit être entre 0.0 et 1.0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Broche MISO ou MOSI manquante" @@ -2095,7 +2099,7 @@ msgstr "Erreur de désinitialisation du RNG" msgid "RNG Init Error" msgstr "Erreur d'initialisation du RNG" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 n'est pas encore supporté sur cet appareil" diff --git a/locale/hi.po b/locale/hi.po index a9df693b31..dfb8add290 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1540,6 +1540,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2033,7 +2037,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index c93101be8a..e14619c464 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1564,6 +1564,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2067,7 +2071,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index ba4392c275..808bea05c3 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1551,6 +1551,10 @@ msgstr "マイクのスタートアップディレイは 0.0 から 1.0 の間 msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISOまたはMOSIピンがありません" @@ -2047,7 +2051,7 @@ msgstr "RNG解体エラー" msgid "RNG Init Error" msgstr "乱数生成器の初期化エラー" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index c2ebfdef98..5f556fee31 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1543,6 +1543,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2036,7 +2040,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index e647163b94..3de959fa49 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1552,6 +1552,10 @@ msgstr "Microfoon opstart vertraging moet in bereik van 0.0 tot 1.0 zijn" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Ontbrekende MISO of MOSI Pin" @@ -2059,7 +2063,7 @@ msgstr "RNG DeInit Fout" msgid "RNG Init Error" msgstr "RNG Init Fout" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/pl.po b/locale/pl.po index 73ec566382..f1cf6f9604 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1551,6 +1551,10 @@ msgstr "Opóźnienie włączenia mikrofonu musi być w zakresie od 0.0 do 1.0" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Brak pinu MISO lub MOSI" @@ -2044,7 +2048,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 12fef607a9..6ed7858a6e 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1579,6 +1579,10 @@ msgstr "O atraso na inicialização do microfone deve estar entre 0,0 e 1,0" msgid "Mismatched data size" msgstr "O tamanho dos dados é incompatível" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "O pino MISO ou MOSI está ausente" @@ -2091,7 +2095,7 @@ msgstr "Erro DeInit RNG" msgid "RNG Init Error" msgstr "Houve um erro na inicialização do RNG" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "Ainda não há suporte para o RS485 neste dispositivo" diff --git a/locale/ru.po b/locale/ru.po index 546bafb8f6..95afcbcd8d 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1576,6 +1576,10 @@ msgstr "Задержка включения микрофона должна бы msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Отсутствует пин MISO или MOSI" @@ -2080,7 +2084,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index eadb26173c..df9e58e816 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1562,6 +1562,10 @@ msgstr "" msgid "Mismatched data size" msgstr "Datastorlek matchar inte" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISO- eller MOSI-pinne saknas" @@ -2067,7 +2071,7 @@ msgstr "RNG DeInit-fel" msgid "RNG Init Error" msgstr "RNG Init-fel" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 stöds ännu inte på den här enheten" diff --git a/locale/tr.po b/locale/tr.po index f3a597b3ea..ab5c85bab4 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1557,6 +1557,10 @@ msgstr "" msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" @@ -2053,7 +2057,7 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index d2aa5eb907..c4218c29e4 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -1574,6 +1574,10 @@ msgstr "Màikèfēng qǐdòng yánchí bìxū zài 0.0 Dào 1.0 De fànwéi nèi msgid "Mismatched data size" msgstr "" +#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +msgid "Mismatched swap flag" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Quēshǎo MISO huò MOSI yǐn jiǎo" @@ -2079,7 +2083,7 @@ msgstr "RNG qǔxiāo chūshǐhuà cuòwù" msgid "RNG Init Error" msgstr "RNG chūshǐhuà cuòwù" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c msgid "RS485 Not yet supported on this device" msgstr "RS485 cǐ shè bèi shàng bù zhī chí" From b03968aee5a5ad473afb1d4d6273c8f0aea774f7 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 7 May 2022 11:49:07 -0500 Subject: [PATCH 0251/2403] hide vectorio objects if their containing group is hidden --- shared-module/displayio/Group.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 28d3d89735..613e75e00b 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -32,6 +32,9 @@ #if CIRCUITPY_VECTORIO #include "shared-bindings/vectorio/VectorShape.h" +#include "shared-bindings/vectorio/Circle.h" +#include "shared-bindings/vectorio/Rectangle.h" +#include "shared-bindings/vectorio/Polygon.h" #endif @@ -66,6 +69,26 @@ void common_hal_displayio_group_set_hidden(displayio_group_t *self, bool hidden) displayio_group_set_hidden_by_parent(layer, hidden); continue; } + #if CIRCUITPY_VECTORIO + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_circle_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_circle_get_draw_protocol(layer)); + continue; + } + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_rectangle_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_rectangle_get_draw_protocol(layer)); + continue; + } + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_polygon_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_polygon_get_draw_protocol(layer)); + continue; + } + #endif } } From d1aab89a5933e36ca5041e5ab5ced1884345e919 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 7 May 2022 11:57:27 -0500 Subject: [PATCH 0252/2403] remove prints and extra whitespace --- shared-module/displayio/Group.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 613e75e00b..083e04678b 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -381,13 +381,7 @@ void displayio_group_construct(displayio_group_t *self, mp_obj_list_t *members, bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorspace_t *colorspace, const displayio_area_t *area, uint32_t *mask, uint32_t *buffer) { // Track if any of the layers finishes filling in the given area. We can ignore any remaining // layers at that point. - //mp_printf(&mp_plat_print, "inside fill area \n"); - //mp_printf(&mp_plat_print, "%d \n", self->hidden); - //mp_printf(&mp_plat_print, "\n"); - - //mp_printf(&mp_plat_print, "inside fill area \n"); if (self->hidden == false){ - //mp_printf(&mp_plat_print, "not hidden\n"); for (int32_t i = self->members->len - 1; i >= 0; i--) { mp_obj_t layer; #if CIRCUITPY_VECTORIO @@ -418,8 +412,6 @@ bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorsp } } } - - return false; } From c77dc3c8284916030987dd5ded7c10cdce9aa998 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 7 May 2022 11:59:26 -0500 Subject: [PATCH 0253/2403] code format --- shared-module/displayio/Group.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 083e04678b..73dea23606 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -71,19 +71,19 @@ void common_hal_displayio_group_set_hidden(displayio_group_t *self, bool hidden) } #if CIRCUITPY_VECTORIO layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_circle_type); + self->members->items[i], &vectorio_circle_type); if (layer != MP_OBJ_NULL) { common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_circle_get_draw_protocol(layer)); continue; } layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_rectangle_type); + self->members->items[i], &vectorio_rectangle_type); if (layer != MP_OBJ_NULL) { common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_rectangle_get_draw_protocol(layer)); continue; } layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_polygon_type); + self->members->items[i], &vectorio_polygon_type); if (layer != MP_OBJ_NULL) { common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_polygon_get_draw_protocol(layer)); continue; @@ -381,7 +381,7 @@ void displayio_group_construct(displayio_group_t *self, mp_obj_list_t *members, bool displayio_group_fill_area(displayio_group_t *self, const _displayio_colorspace_t *colorspace, const displayio_area_t *area, uint32_t *mask, uint32_t *buffer) { // Track if any of the layers finishes filling in the given area. We can ignore any remaining // layers at that point. - if (self->hidden == false){ + if (self->hidden == false) { for (int32_t i = self->members->len - 1; i >= 0; i--) { mp_obj_t layer; #if CIRCUITPY_VECTORIO From 330e01d8e0bb379e38ba1fc173e61d6a92e340c6 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 7 May 2022 12:27:36 -0500 Subject: [PATCH 0254/2403] handle groups inside of groups with vectorio hidden --- shared-module/displayio/Group.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 73dea23606..21b4b2410f 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -115,6 +115,26 @@ void displayio_group_set_hidden_by_parent(displayio_group_t *self, bool hidden) displayio_group_set_hidden_by_parent(layer, hidden); continue; } + #if CIRCUITPY_VECTORIO + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_circle_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_circle_get_draw_protocol(layer)); + continue; + } + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_rectangle_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_rectangle_get_draw_protocol(layer)); + continue; + } + layer = mp_obj_cast_to_native_base( + self->members->items[i], &vectorio_polygon_type); + if (layer != MP_OBJ_NULL) { + common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_polygon_get_draw_protocol(layer)); + continue; + } + #endif } } From 8b026a2c38f1be9a5170ccafce105bf593705c5a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sun, 8 May 2022 09:49:18 -0400 Subject: [PATCH 0255/2403] apply i2c delay fix from adafruit/esp-idf --- ports/espressif/esp-idf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 121ddb87e5..944c01eef4 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 121ddb87e5130314e4fcc5e9cb260a81b7d30d36 +Subproject commit 944c01eef4fbba693f991f9d033cda3f59ca82c9 From 07917fee82cbebf2d5fa3504420b10a8df46af7c Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Sun, 8 May 2022 04:54:30 +0000 Subject: [PATCH 0256/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1057 of 1057 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 6ed7858a6e..43ad72c6c0 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: 2022-04-27 18:11+0000\n" +"PO-Revision-Date: 2022-05-08 16:37+0000\n" "Last-Translator: Wellington Terumi Uemura \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.12.1-dev\n" +"X-Generator: Weblate 4.12.1\n" #: main.c msgid "" @@ -1581,7 +1581,7 @@ msgstr "O tamanho dos dados é incompatível" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched swap flag" -msgstr "" +msgstr "Sinalizador de troca incompatível" #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" From b6a5f421a9b7e3e27534a022c1642e83d7bffdb0 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 8 May 2022 12:02:59 -0500 Subject: [PATCH 0257/2403] use draw protocol impl --- shared-bindings/vectorio/VectorShape.c | 1 + shared-bindings/vectorio/__init__.h | 2 ++ shared-module/displayio/Group.c | 20 ++++---------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c index fe6be555cd..6a3e192cb9 100644 --- a/shared-bindings/vectorio/VectorShape.c +++ b/shared-bindings/vectorio/VectorShape.c @@ -78,6 +78,7 @@ vectorio_draw_protocol_impl_t vectorio_vector_shape_draw_protocol_impl = { .draw_update_transform = (draw_update_transform_fun)vectorio_vector_shape_update_transform, .draw_finish_refresh = (draw_finish_refresh_fun)vectorio_vector_shape_finish_refresh, .draw_get_refresh_areas = (draw_get_refresh_areas_fun)vectorio_vector_shape_get_refresh_areas, + .draw_set_dirty = (draw_set_dirty_fun)common_hal_vectorio_vector_shape_set_dirty, }; // Stub checker does not approve of these shared properties. diff --git a/shared-bindings/vectorio/__init__.h b/shared-bindings/vectorio/__init__.h index a34195de26..d4f10c926c 100644 --- a/shared-bindings/vectorio/__init__.h +++ b/shared-bindings/vectorio/__init__.h @@ -17,6 +17,7 @@ typedef bool (*draw_fill_area_fun)(mp_obj_t draw_protocol_self, const _displayio typedef bool (*draw_get_dirty_area_fun)(mp_obj_t draw_protocol_self, displayio_area_t *current_dirty_area); typedef void (*draw_update_transform_fun)(mp_obj_t draw_protocol_self, displayio_buffer_transform_t *group_transform); typedef void (*draw_finish_refresh_fun)(mp_obj_t draw_protocol_self); +typedef void (*draw_set_dirty_fun)(mp_obj_t draw_protocol_self); typedef displayio_area_t *(*draw_get_refresh_areas_fun)(mp_obj_t draw_protocol_self, displayio_area_t *tail); typedef struct _vectorio_draw_protocol_impl_t { @@ -25,6 +26,7 @@ typedef struct _vectorio_draw_protocol_impl_t { draw_update_transform_fun draw_update_transform; draw_finish_refresh_fun draw_finish_refresh; draw_get_refresh_areas_fun draw_get_refresh_areas; + draw_set_dirty_fun draw_set_dirty; } vectorio_draw_protocol_impl_t; // Draw protocol diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 21b4b2410f..40f34a8336 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -70,22 +70,10 @@ void common_hal_displayio_group_set_hidden(displayio_group_t *self, bool hidden) continue; } #if CIRCUITPY_VECTORIO - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_circle_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_circle_get_draw_protocol(layer)); - continue; - } - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_rectangle_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_rectangle_get_draw_protocol(layer)); - continue; - } - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_polygon_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_polygon_get_draw_protocol(layer)); + const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, self->members->items[i]); + if (draw_protocol != NULL) { + layer = draw_protocol->draw_get_protocol_self(self->members->items[i]); + draw_protocol->draw_protocol_impl->draw_set_dirty(layer); continue; } #endif From 1c564764d6403ff75420d597a0ee25c290a1b296 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 8 May 2022 12:14:28 -0500 Subject: [PATCH 0258/2403] use draw protocol impl in parent hidden too --- shared-module/displayio/Group.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 40f34a8336..1a4e4eafb5 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -32,9 +32,6 @@ #if CIRCUITPY_VECTORIO #include "shared-bindings/vectorio/VectorShape.h" -#include "shared-bindings/vectorio/Circle.h" -#include "shared-bindings/vectorio/Rectangle.h" -#include "shared-bindings/vectorio/Polygon.h" #endif @@ -104,22 +101,10 @@ void displayio_group_set_hidden_by_parent(displayio_group_t *self, bool hidden) continue; } #if CIRCUITPY_VECTORIO - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_circle_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_circle_get_draw_protocol(layer)); - continue; - } - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_rectangle_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_rectangle_get_draw_protocol(layer)); - continue; - } - layer = mp_obj_cast_to_native_base( - self->members->items[i], &vectorio_polygon_type); - if (layer != MP_OBJ_NULL) { - common_hal_vectorio_vector_shape_set_dirty(common_hal_vectorio_polygon_get_draw_protocol(layer)); + const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, self->members->items[i]); + if (draw_protocol != NULL) { + layer = draw_protocol->draw_get_protocol_self(self->members->items[i]); + draw_protocol->draw_protocol_impl->draw_set_dirty(layer); continue; } #endif From 4231eedf8ebad707ae2e450d0a7868137f4bb1ff Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Mon, 9 May 2022 19:03:59 +0100 Subject: [PATCH 0259/2403] Correct USB HID usage range error message. When an invalid usage was given, the error message incorrectly referenced "usage_page". --- shared-bindings/usb_hid/Device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 4ca6a18304..2741013d03 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -107,7 +107,7 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args const uint16_t usage_page = usage_page_arg; const mp_int_t usage_arg = args[ARG_usage].u_int; - mp_arg_validate_int_range(usage_arg, 1, 0xFFFF, MP_QSTR_usage_page); + mp_arg_validate_int_range(usage_arg, 1, 0xFFFF, MP_QSTR_usage); const uint16_t usage = usage_arg; mp_obj_t report_ids = args[ARG_report_ids].u_obj; From 7ecfa6611d20fb1fa50315d8e617d33531c11c1d Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Mon, 9 May 2022 07:52:38 +0000 Subject: [PATCH 0260/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1057 of 1057 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index df9e58e816..5ee114c3c0 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: 2022-04-26 15:40+0000\n" +"PO-Revision-Date: 2022-05-10 08:16+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \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.12.1-dev\n" +"X-Generator: Weblate 4.12.1\n" #: main.c msgid "" @@ -1564,7 +1564,7 @@ msgstr "Datastorlek matchar inte" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched swap flag" -msgstr "" +msgstr "Felaktig swapflagga" #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" From d48f961d0a977cbf23bdc967f36a921aab413bb0 Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Tue, 10 May 2022 18:56:13 +0800 Subject: [PATCH 0261/2403] Add MixGo CE board --- ports/espressif/boards/mixgo_ce_udisk/board.c | 48 + .../mixgo_ce_udisk/mixgoce_lib/Image.py | 58 + .../mixgoce_lib/adafruit_framebuf.py | 549 +++++++++ .../mixgoce_lib/adafruit_irremote.py | 283 +++++ .../mixgoce_lib/adafruit_minimqtt.py | 1000 +++++++++++++++++ .../mixgoce_lib/adafruit_rtttl.py | 204 ++++ .../mixgo_ce_udisk/mixgoce_lib/blynklib.py | 390 +++++++ .../mixgo_ce_udisk/mixgoce_lib/blynktimer.py | 134 +++ .../mixgo_ce_udisk/mixgoce_lib/button.py | 49 + .../mixgo_ce_udisk/mixgoce_lib/infrared.py | 41 + .../mixgo_ce_udisk/mixgoce_lib/irremote.py | 111 ++ .../boards/mixgo_ce_udisk/mixgoce_lib/led.py | 34 + .../mixgo_ce_udisk/mixgoce_lib/matcher.py | 97 ++ .../mixgo_ce_udisk/mixgoce_lib/matrix.py | 277 +++++ .../mixgo_ce_udisk/mixgoce_lib/mixgoce.py | 85 ++ .../mixgo_ce_udisk/mixgoce_lib/mixpy.py | 84 ++ .../mixgo_ce_udisk/mixgoce_lib/mmatrix.py | 139 +++ .../mixgo_ce_udisk/mixgoce_lib/msa301.py | 70 ++ .../mixgo_ce_udisk/mixgoce_lib/music.py | 102 ++ .../mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py | 80 ++ .../mixgo_ce_udisk/mixgoce_lib/pixels.py | 71 ++ .../mixgo_ce_udisk/mixgoce_lib/sensor.py | 55 + .../mixgo_ce_udisk/mixgoce_lib/touchpad.py | 25 + .../boards/mixgo_ce_udisk/mpconfigboard.h | 32 + .../boards/mixgo_ce_udisk/mpconfigboard.mk | 24 + ports/espressif/boards/mixgo_ce_udisk/pins.c | 50 + .../espressif/boards/mixgo_ce_udisk/sdkconfig | 0 27 files changed, 4092 insertions(+) create mode 100644 ports/espressif/boards/mixgo_ce_udisk/board.c create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.h create mode 100644 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk create mode 100644 ports/espressif/boards/mixgo_ce_udisk/pins.c create mode 100644 ports/espressif/boards/mixgo_ce_udisk/sdkconfig diff --git a/ports/espressif/boards/mixgo_ce_udisk/board.c b/ports/espressif/boards/mixgo_ce_udisk/board.c new file mode 100644 index 0000000000..bf5980e627 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/board.c @@ -0,0 +1,48 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +void board_init(void) { + // Debug UART + #ifdef DEBUG + common_hal_never_reset_pin(&pin_GPIO43); + common_hal_never_reset_pin(&pin_GPIO44); + #endif /* DEBUG */ +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py new file mode 100644 index 0000000000..c799b4aadd --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py @@ -0,0 +1,58 @@ +""" +Image + +CircuitPython library for Image - MixGoCE +======================================================= + +Small Cabbage +20210721 +""" + +HEART=bytearray(b'\x00\x00\x00\x0c\x1e\x3f\x7e\xfc\x7e\x3f\x1e\x0c\x00\x00\x00\x00') +HEART_SMALL=bytearray(b'\x00\x00\x00\x00\x0c\x1e\x3c\x78\x3c\x1e\x0c\x00\x00\x00\x00\x00') +HAPPY=bytearray(b'\x00\x00\x00\x0c\x0c\x20\x40\x80\x80\x40\x20\x0c\x0c\x00\x00\x00') +SAD=bytearray(b'\x00\x00\x08\x04\x04\x84\x40\x20\x20\x40\x84\x04\x04\x08\x00\x00') +SMILE=bytearray(b'\x00\x00\x04\x02\x02\x24\x40\x80\x80\x40\x24\x02\x02\x04\x00\x00') +SILLY=bytearray(b'\x00\x00\x04\x0a\x0a\x04\x60\xa0\xa0\x60\x04\x0a\x0a\x04\x00\x00') +FABULOUS=bytearray(b'\x00\x00\x06\x05\x05\x65\xa6\xa0\xa0\xa6\x65\x05\x05\x06\x00\x00') +SURPRISED=bytearray(b'\x00\x00\x00\x00\x00\x00\x00\xbe\x00\x00\x00\x00\x00\x00\x00\x00') +ASLEEP=bytearray(b'\x00\x00\x04\x04\x04\x44\xa0\xa0\xa0\xa0\x44\x04\x04\x04\x00\x00') +ANGRY=bytearray(b'\x00\x00\x01\x02\x84\x42\x21\x10\x10\x21\x42\x84\x02\x01\x00\x00') +CONFUSED=bytearray(b'\x00\x00\x00\x00\x00\x04\x02\xa2\x12\x0c\x00\x00\x00\x00\x00\x00') +NO=bytearray(b'\x00\x00\x00\x00\x42\x24\x18\x18\x24\x42\x00\x00\x00\x00\x00\x00') +YES=bytearray(b'\x00\x00\x00\x00\x10\x20\x40\x40\x20\x10\x08\x04\x02\x00\x00\x00') +LEFT_ARROW=bytearray(b'\x00\x00\x10\x28\x54\x92\x10\x10\x10\x10\x10\x10\x10\x10\x00\x00') +RIGHT_ARROW=bytearray(b'\x00\x00\x10\x10\x10\x10\x10\x10\x10\x10\x92\x54\x28\x10\x00\x00') +DRESS=bytearray(b'\x00\x00\x00\x40\xa2\xd7\xae\xda\xae\xd7\xa2\x40\x00\x00\x00\x00') +TRANSFORMERS=bytearray(b'\x00\x00\x00\x00\x00\x9c\x64\x1a\x64\x9c\x00\x00\x00\x00\x00\x00') +SCISSORS=bytearray(b'\x00\x00\x00\x00\x00\x43\xa6\x6c\x18\x6c\xa6\x43\x00\x00\x00\x00') +EXIT=bytearray(b'\x00\x00\x00\x00\x00\x00\x28\x04\x72\x0e\x17\x25\x48\x88\x00\x00') +TREE=bytearray(b'\x00\x00\x00\x10\x18\x1c\x1e\xff\x1e\x1c\x18\x10\x00\x00\x00\x00') +PACMAN=bytearray(b'\x00\x00\x1c\x36\x63\x41\x45\x41\x49\x55\x22\x00\x00\x00\x00\x00') +TARGET=bytearray(b'\x00\x00\x00\x00\x00\x00\x38\x44\x54\x44\x38\x00\x00\x00\x00\x00') +TSHIRT=bytearray(b'\x00\x00\x00\x04\x0a\xf9\x82\x82\x82\x82\xf9\x0a\x04\x00\x00\x00') +ROLLERSKATE=bytearray(b'\x00\x00\x00\x60\x5f\x71\x11\x17\x14\x14\x74\x58\x60\x00\x00\x00') +DUCK=bytearray(b'\x00\x00\x08\x0c\x0a\xf9\x81\x83\x9e\x90\x90\x90\x50\x30\x10\x00') +HOUSE=bytearray(b'\x04\x06\xfb\x01\x01\xf9\x09\x29\x09\x09\xf9\x01\x01\xfb\x06\x04') +TORTOISE=bytearray(b'\x00\x00\x00\x00\x00\x5e\x3c\x3f\x3f\x3c\x5e\x00\x00\x00\x00\x00') +BUTTERFLY=bytearray(b'\x00\x00\x00\x00\x04\xca\xaa\x5c\x38\x5c\xaa\xca\x04\x00\x00\x00') +STICKFIGURE=bytearray(b'\x00\x00\x00\x00\x00\x90\x4a\x3d\x4a\x90\x00\x00\x00\x00\x00\x00') +GHOST=bytearray(b'\x00\x00\x00\x00\xfe\xdf\xe9\xdf\xe9\xdf\xfe\xc0\x80\x00\x00\x00') +PITCHFORK=bytearray(b'\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x3e\x49\x49\x49\x49\x49') +MUSIC_QUAVERS=bytearray(b'\x20\x10\x08\x0c\x1c\x38\x30\x10\x08\x0c\x1c\x38\x30\x10\x08\x04') +MUSIC_QUAVER=bytearray(b'\x06\x05\x05\x05\x05\x05\x05\x05\x36\x7c\xfc\xfc\xf8\x70\x00\x00') +MUSIC_CROTCHET=bytearray(b'\x02\x02\x02\x02\x02\x02\x02\x02\x1a\x3e\x7e\x7e\x7c\x38\x00\x00') +COW=bytearray(b'\x00\x1e\x1a\x1f\xfe\xfc\x1c\x1c\x1c\xfc\xfc\x08\x10\x10\x20\x00') +RABBIT=bytearray(b'\x14\x2a\x2a\x2a\x2a\x2a\x63\x41\x55\x41\x49\x49\x5d\x41\x3e\x00') +SQUARE_SMALL=bytearray(b'\x00\x00\x00\x00\x00\x00\x3c\x24\x24\x3c\x00\x00\x00\x00\x00\x00') +SQUARE=bytearray(b'\x00\x00\x00\x00\xff\x81\x81\x81\x81\x81\x81\xff\x00\x00\x00\x00') +DIAMOND_SMALL=bytearray(b'\x00\x00\x00\x00\x00\x08\x14\x2c\x14\x08\x00\x00\x00\x00\x00\x00') +DIAMOND=bytearray(b'\x00\x00\x04\x0e\x1b\x35\x6f\xdd\x6f\x35\x1b\x0e\x04\x00\x00\x00') +CHESSBOARD=bytearray(b'\x00\x00\x00\xfe\xaa\xfe\xaa\xfe\xaa\xfe\xaa\xfe\xaa\xfe\x00\x00') +TRIANGLE_LEFT=bytearray(b'\x00\x00\x00\x00\x00\x10\x38\x7c\xfe\x00\x00\x00\x00\x00\x00\x00') +TRIANGLE=bytearray(b'\x00\x00\x40\x60\x70\x78\x7c\x7e\x7e\x7c\x78\x70\x60\x40\x00\x00') +SNAKE=bytearray(b'\x00\x40\x60\x70\x38\x18\x18\x18\x18\x1f\x05\x07\x00\x00\x00\x00') +UMBRELLA=bytearray(b'\x00\x00\x00\x08\x0c\x0e\x0e\xff\x8e\xce\x0c\x08\x00\x00\x00\x00') +SKULL=bytearray(b'\x00\x00\x00\x0c\x1a\x79\x99\xd7\x99\x79\x1a\x0c\x00\x00\x00\x00') +GIRAFFE=bytearray(b'\x00\x00\x00\x00\xe0\x20\x20\xff\x03\x02\x00\x00\x00\x00\x00\x00') +SWORD=bytearray(b'\x00\x00\x18\x18\x7e\x3c\x18\x18\x18\x18\x18\x18\x18\x00\x00\x00') \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py new file mode 100644 index 0000000000..458dcc5410 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py @@ -0,0 +1,549 @@ +# The MIT License (MIT) +# +# Copyright (c) 2018 Kattni Rembor 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. +""" +`adafruit_framebuf` +==================================================== + +CircuitPython pure-python framebuf module, based on the micropython framebuf module. + +* Author(s): Melissa LeBlanc-Williams, Kattni Rembor, Tony DiCola, original file + created by Damien P. George + +Implementation Notes +-------------------- + +**Hardware:** + +* `Adafruit SSD1306 OLED displays `_ + +**Software and Dependencies:** + +* Adafruit CircuitPython firmware for the supported boards: + https://github.com/adafruit/circuitpython/releases + +""" + +__version__ = "0.0.0-auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_framebuf.git" + +import os +import struct + +# Framebuf format constants: +MVLSB = 0 # Single bit displays (like SSD1306 OLED) +RGB565 = 1 # 16-bit color displays +GS4_HMSB = 2 # Unimplemented! +MHMSB = 3 # Single bit displays like the Sharp Memory +RGB888 = 4 # Neopixels and Dotstars + + +class MHMSBFormat: + """MHMSBFormat""" + + @staticmethod + def set_pixel(framebuf, x, y, color): + """Set a given pixel to a color.""" + index = (y * framebuf.stride + x) // 8 + offset = 7 - x & 0x07 + framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( + (color != 0) << offset + ) + + @staticmethod + def get_pixel(framebuf, x, y): + """Get the color of a given pixel""" + index = (y * framebuf.stride + x) // 8 + offset = 7 - x & 0x07 + return (framebuf.buf[index] >> offset) & 0x01 + + @staticmethod + def fill(framebuf, color): + """completely fill/clear the buffer with a color""" + if color: + fill = 0xFF + else: + fill = 0x00 + for i in range(len(framebuf.buf)): + framebuf.buf[i] = fill + + @staticmethod + def fill_rect(framebuf, x, y, width, height, color): + """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws + both the outline and interior.""" + # pylint: disable=too-many-arguments + for _x in range(x, x + width): + offset = 7 - _x & 0x07 + for _y in range(y, y + height): + index = (_y * framebuf.stride + _x) // 8 + framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( + (color != 0) << offset + ) + + +class MVLSBFormat: + """MVLSBFormat""" + + @staticmethod + def set_pixel(framebuf, x, y, color): + """Set a given pixel to a color.""" + index = (y >> 3) * framebuf.stride + x + offset = y & 0x07 + framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( + (color != 0) << offset + ) + + @staticmethod + def get_pixel(framebuf, x, y): + """Get the color of a given pixel""" + index = (y >> 3) * framebuf.stride + x + offset = y & 0x07 + return (framebuf.buf[index] >> offset) & 0x01 + + @staticmethod + def fill(framebuf, color): + """completely fill/clear the buffer with a color""" + if color: + fill = 0xFF + else: + fill = 0x00 + for i in range(len(framebuf.buf)): + framebuf.buf[i] = fill + + @staticmethod + def fill_rect(framebuf, x, y, width, height, color): + """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws + both the outline and interior.""" + # pylint: disable=too-many-arguments + while height > 0: + index = (y >> 3) * framebuf.stride + x + offset = y & 0x07 + for w_w in range(width): + framebuf.buf[index + w_w] = ( + framebuf.buf[index + w_w] & ~(0x01 << offset) + ) | ((color != 0) << offset) + y += 1 + height -= 1 + + +class RGB888Format: + """RGB888Format""" + + @staticmethod + def set_pixel(framebuf, x, y, color): + """Set a given pixel to a color.""" + index = (y * framebuf.stride + x) * 3 + if isinstance(color, tuple): + framebuf.buf[index : index + 3] = bytes(color) + else: + framebuf.buf[index : index + 3] = bytes( + ((color >> 16) & 255, (color >> 8) & 255, color & 255) + ) + + @staticmethod + def get_pixel(framebuf, x, y): + """Get the color of a given pixel""" + index = (y * framebuf.stride + x) * 3 + return ( + (framebuf.buf[index] << 16) + | (framebuf.buf[index + 1] << 8) + | framebuf.buf[index + 2] + ) + + @staticmethod + def fill(framebuf, color): + """completely fill/clear the buffer with a color""" + fill = (color >> 16) & 255, (color >> 8) & 255, color & 255 + for i in range(0, len(framebuf.buf), 3): + framebuf.buf[i : i + 3] = bytes(fill) + + @staticmethod + def fill_rect(framebuf, x, y, width, height, color): + """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws + both the outline and interior.""" + # pylint: disable=too-many-arguments + fill = (color >> 16) & 255, (color >> 8) & 255, color & 255 + for _x in range(x, x + width): + for _y in range(y, y + height): + index = (_y * framebuf.stride + _x) * 3 + framebuf.buf[index : index + 3] = bytes(fill) + + +class FrameBuffer: + """FrameBuffer object. + + :param buf: An object with a buffer protocol which must be large enough to contain every + pixel defined by the width, height and format of the FrameBuffer. + :param width: The width of the FrameBuffer in pixel + :param height: The height of the FrameBuffer in pixel + :param buf_format: Specifies the type of pixel used in the FrameBuffer; permissible values + are listed under Constants below. These set the number of bits used to + encode a color value and the layout of these bits in ``buf``. Where a + color value c is passed to a method, c is a small integer with an encoding + that is dependent on the format of the FrameBuffer. + :param stride: The number of pixels between each horizontal line of pixels in the + FrameBuffer. This defaults to ``width`` but may need adjustments when + implementing a FrameBuffer within another larger FrameBuffer or screen. The + ``buf`` size must accommodate an increased step size. + + """ + + def __init__(self, buf, width, height, buf_format=MVLSB, stride=None): + # pylint: disable=too-many-arguments + self.buf = buf + self.width = width + self.height = height + self.stride = stride + self._font = None + if self.stride is None: + self.stride = width + if buf_format == MVLSB: + self.format = MVLSBFormat() + elif buf_format == MHMSB: + self.format = MHMSBFormat() + elif buf_format == RGB888: + self.format = RGB888Format() + else: + raise ValueError("invalid format") + self._rotation = 0 + + @property + def rotation(self): + """The rotation setting of the display, can be one of (0, 1, 2, 3)""" + return self._rotation + + @rotation.setter + def rotation(self, val): + if not val in (0, 1, 2, 3): + raise RuntimeError("Bad rotation setting") + self._rotation = val + + def fill(self, color): + """Fill the entire FrameBuffer with the specified color.""" + self.format.fill(self, color) + + def fill_rect(self, x, y, width, height, color): + """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws + both the outline and interior.""" + # pylint: disable=too-many-arguments, too-many-boolean-expressions + self.rect(x, y, width, height, color, fill=True) + + def pixel(self, x, y, color=None): + """If ``color`` is not given, get the color value of the specified pixel. If ``color`` is + given, set the specified pixel to the given color.""" + if self.rotation == 1: + x, y = y, x + x = self.width - x - 1 + if self.rotation == 2: + x = self.width - x - 1 + y = self.height - y - 1 + if self.rotation == 3: + x, y = y, x + y = self.height - y - 1 + + if x < 0 or x >= self.width or y < 0 or y >= self.height: + return None + if color is None: + return self.format.get_pixel(self, x, y) + self.format.set_pixel(self, x, y, color) + return None + + def hline(self, x, y, width, color): + """Draw a horizontal line up to a given length.""" + self.rect(x, y, width, 1, color, fill=True) + + def vline(self, x, y, height, color): + """Draw a vertical line up to a given length.""" + self.rect(x, y, 1, height, color, fill=True) + + def circle(self, center_x, center_y, radius, color): + """Draw a circle at the given midpoint location, radius and color. + The ```circle``` method draws only a 1 pixel outline.""" + x = radius - 1 + y = 0 + d_x = 1 + d_y = 1 + err = d_x - (radius << 1) + while x >= y: + self.pixel(center_x + x, center_y + y, color) + self.pixel(center_x + y, center_y + x, color) + self.pixel(center_x - y, center_y + x, color) + self.pixel(center_x - x, center_y + y, color) + self.pixel(center_x - x, center_y - y, color) + self.pixel(center_x - y, center_y - x, color) + self.pixel(center_x + y, center_y - x, color) + self.pixel(center_x + x, center_y - y, color) + if err <= 0: + y += 1 + err += d_y + d_y += 2 + if err > 0: + x -= 1 + d_x += 2 + err += d_x - (radius << 1) + + def rect(self, x, y, width, height, color, *, fill=False): + """Draw a rectangle at the given location, size and color. The ```rect``` method draws only + a 1 pixel outline.""" + # pylint: disable=too-many-arguments + if self.rotation == 1: + x, y = y, x + width, height = height, width + x = self.width - x - width + if self.rotation == 2: + x = self.width - x - width + y = self.height - y - height + if self.rotation == 3: + x, y = y, x + width, height = height, width + y = self.height - y - height + + # pylint: disable=too-many-boolean-expressions + if ( + width < 1 + or height < 1 + or (x + width) <= 0 + or (y + height) <= 0 + or y >= self.height + or x >= self.width + ): + return + x_end = min(self.width - 1, x + width - 1) + y_end = min(self.height - 1, y + height - 1) + x = max(x, 0) + y = max(y, 0) + if fill: + self.format.fill_rect(self, x, y, x_end - x + 1, y_end - y + 1, color) + else: + self.format.fill_rect(self, x, y, x_end - x + 1, 1, color) + self.format.fill_rect(self, x, y, 1, y_end - y + 1, color) + self.format.fill_rect(self, x, y_end, x_end - x + 1, 1, color) + self.format.fill_rect(self, x_end, y, 1, y_end - y + 1, color) + + def line(self, x_0, y_0, x_1, y_1, color): + # pylint: disable=too-many-arguments + """Bresenham's line algorithm""" + d_x = abs(x_1 - x_0) + d_y = abs(y_1 - y_0) + x, y = x_0, y_0 + s_x = -1 if x_0 > x_1 else 1 + s_y = -1 if y_0 > y_1 else 1 + if d_x > d_y: + err = d_x / 2.0 + while x != x_1: + self.pixel(x, y, color) + err -= d_y + if err < 0: + y += s_y + err += d_x + x += s_x + else: + err = d_y / 2.0 + while y != y_1: + self.pixel(x, y, color) + err -= d_x + if err < 0: + x += s_x + err += d_y + y += s_y + self.pixel(x, y, color) + + def blit(self): + """blit is not yet implemented""" + raise NotImplementedError() + + def scroll(self, delta_x, delta_y): + """shifts framebuf in x and y direction""" + if delta_x < 0: + shift_x = 0 + xend = self.width + delta_x + dt_x = 1 + else: + shift_x = self.width - 1 + xend = delta_x - 1 + dt_x = -1 + if delta_y < 0: + y = 0 + yend = self.height + delta_y + dt_y = 1 + else: + y = self.height - 1 + yend = delta_y - 1 + dt_y = -1 + while y != yend: + x = shift_x + while x != xend: + self.format.set_pixel( + self, x, y, self.format.get_pixel(self, x - delta_x, y - delta_y) + ) + x += dt_x + y += dt_y + + # pylint: disable=too-many-arguments + def text(self, string, x, y, color, *, font_name="font5x8.bin", size=1): + """Place text on the screen in variables sizes. Breaks on \n to next line. + + Does not break on line going off screen. + """ + # determine our effective width/height, taking rotation into account + frame_width = self.width + frame_height = self.height + if self.rotation == 1 or self.rotation == 3: + frame_width, frame_height = frame_height, frame_width + + for chunk in string.split("\n"): + if not self._font or self._font.font_name != font_name: + # load the font! + self._font = BitmapFont(font_name) + width = self._font.font_width + height = self._font.font_height + for i, char in enumerate(chunk): + char_x = x + (i * (width + 1)) * size + if ( + char_x + (width * size) > 0 + and char_x < frame_width + and y + (height * size) > 0 + and y < frame_height + ): + self._font.draw_char(char, char_x, y, self, color, size=size) + y += height * size + + # pylint: enable=too-many-arguments + + def image(self, img): + """Set buffer to value of Python Imaging Library image. The image should + be in 1 bit mode and a size equal to the display size.""" + # determine our effective width/height, taking rotation into account + width = self.width + height = self.height + if self.rotation == 1 or self.rotation == 3: + width, height = height, width + + if isinstance(self.format, RGB888Format) and img.mode != "RGB": + raise ValueError("Image must be in mode RGB.") + if isinstance(self.format, (MHMSBFormat, MVLSBFormat)) and img.mode != "1": + raise ValueError("Image must be in mode 1.") + + imwidth, imheight = img.size + if imwidth != width or imheight != height: + raise ValueError( + "Image must be same dimensions as display ({0}x{1}).".format( + width, height + ) + ) + # Grab all the pixels from the image, faster than getpixel. + pixels = img.load() + # Clear buffer + for i in range(len(self.buf)): + self.buf[i] = 0 + # Iterate through the pixels + for x in range(width): # yes this double loop is slow, + for y in range(height): # but these displays are small! + if img.mode == "RGB": + self.pixel(x, y, pixels[(x, y)]) + elif pixels[(x, y)]: + self.pixel(x, y, 1) # only write if pixel is true + + +# MicroPython basic bitmap font renderer. +# Author: Tony DiCola +# License: MIT License (https://opensource.org/licenses/MIT) +class BitmapFont: + """A helper class to read binary font tiles and 'seek' through them as a + file to display in a framebuffer. We use file access so we dont waste 1KB + of RAM on a font!""" + + def __init__(self, font_name="font5x8.bin"): + # Specify the drawing area width and height, and the pixel function to + # call when drawing pixels (should take an x and y param at least). + # Optionally specify font_name to override the font file to use (default + # is font5x8.bin). The font format is a binary file with the following + # format: + # - 1 unsigned byte: font character width in pixels + # - 1 unsigned byte: font character height in pixels + # - x bytes: font data, in ASCII order covering all 255 characters. + # Each character should have a byte for each pixel column of + # data (i.e. a 5x8 font has 5 bytes per character). + self.font_name = font_name + + # Open the font file and grab the character width and height values. + # Note that only fonts up to 8 pixels tall are currently supported. + try: + self._font_code=b'\x05\x08\x00\x00\x00\x00\x00>[O[>>kOk>\x1c>|>\x1c\x18<~<\x18\x1cW}W\x1c\x1c^\x7f^\x1c\x00\x18<\x18\x00\xff\xe7\xc3\xe7\xff\x00\x18$\x18\x00\xff\xe7\xdb\xe7\xff0H:\x06\x0e&)y)&@\x7f\x05\x05\x07@\x7f\x05%?Z<\xe7\x1c\x1c\x08\x08\x1c\x1c>\x7f\x14"\x7f"\x14__\x00__\x06\t\x7f\x01\x7f\x00f\x89\x95j`````\x94\xa2\xff\xa2\x94\x08\x04~\x04\x08\x10 ~ \x10\x08\x08*\x1c\x08\x08\x1c*\x08\x08\x1e\x10\x10\x10\x10\x0c\x1e\x0c\x1e\x0c08>80\x06\x0e>\x0e\x06\x00\x00\x00\x00\x00\x00\x00_\x00\x00\x00\x07\x00\x07\x00\x14\x7f\x14\x7f\x14$*\x7f*\x12#\x13\x08db6IV P\x00\x08\x07\x03\x00\x00\x1c"A\x00\x00A"\x1c\x00*\x1c\x7f\x1c*\x08\x08>\x08\x08\x00\x80p0\x00\x08\x08\x08\x08\x08\x00\x00``\x00 \x10\x08\x04\x02>QIE>\x00B\x7f@\x00rIIIF!AIM3\x18\x14\x12\x7f\x10\'EEE9A]YN|\x12\x11\x12|\x7fIII6>AAA"\x7fAAA>\x7fIIIA\x7f\t\t\t\x01>AAQs\x7f\x08\x08\x08\x7f\x00A\x7fA\x00 @A?\x01\x7f\x08\x14"A\x7f@@@@\x7f\x02\x1c\x02\x7f\x7f\x04\x08\x10\x7f>AAA>\x7f\t\t\t\x06>AQ!^\x7f\t\x19)F&III2\x03\x01\x7f\x01\x03?@@@?\x1f @ \x1f?@8@?c\x14\x08\x14c\x03\x04x\x04\x03aYIMC\x00\x7fAAA\x02\x04\x08\x10 \x00AAA\x7f\x04\x02\x01\x02\x04@@@@@\x00\x03\x07\x08\x00 TTx@\x7f(DD88DDD(8DD(\x7f8TTT\x18\x00\x08~\t\x02\x18\xa4\xa4\x9cx\x7f\x08\x04\x04x\x00D}@\x00 @@=\x00\x7f\x10(D\x00\x00A\x7f@\x00|\x04x\x04x|\x08\x04\x04x8DDD8\xfc\x18$$\x18\x18$$\x18\xfc|\x08\x04\x04\x08HTTT$\x04\x04?D$<@@ |\x1c @ \x1c<@0@III\x00~\x01\x01\x01~*****DD_DD@QJD@@DJQ@\x00\x00\xff\x01\x03\xe0\x80\xff\x00\x00\x08\x08kk\x086\x126$6\x06\x0f\t\x0f\x06\x00\x00\x18\x18\x00\x00\x00\x10\x10\x000@\xff\x01\x01\x00\x1f\x01\x01\x1e\x00\x19\x1d\x17\x12\x00<<<<\x00\x00\x00\x00\x00' + self.font_width, self.font_height = struct.unpack("BB", b'\x05\x08') + # simple font file validation check based on expected file size + #if 2 + 256 * self.font_width != os.stat(font_name)[6]: + # raise RuntimeError("Invalid font file: " + font_name) + except OSError: + print("Could not find font file", font_name) + raise + except OverflowError: + # os.stat can throw this on boards without long int support + # just hope the font file is valid and press on + pass + + def deinit(self): + """Close the font file as cleanup.""" + #self._font.close() + + def __enter__(self): + """Initialize/open the font file""" + self.__init__() + return self + + def __exit__(self, exception_type, exception_value, traceback): + """cleanup on exit""" + #self.deinit() + pass + + def draw_char( + self, char, x, y, framebuffer, color, size=1 + ): # pylint: disable=too-many-arguments + """Draw one character at position (x,y) to a framebuffer in a given color""" + size = max(size, 1) + # Don't draw the character if it will be clipped off the visible area. + # if x < -self.font_width or x >= framebuffer.width or \ + # y < -self.font_height or y >= framebuffer.height: + # return + # Go through each column of the character. + for char_x in range(self.font_width): + # Grab the byte for the current column of font data. + #self._font.seek(2 + (ord(char) * self.font_width) + char_x) + chcode=bytes([self._font_code[(2 + (ord(char) * self.font_width) + char_x)]]) + try: + line = struct.unpack("B", chcode)[0] + except RuntimeError: + continue # maybe character isnt there? go to next + # Go through each row in the column byte. + for char_y in range(self.font_height): + # Draw a pixel for each bit that's flipped on. + if (line >> char_y) & 0x1: + framebuffer.fill_rect( + x + char_x * size, y + char_y * size, size, size, color + ) + + def width(self, text): + """Return the pixel width of the specified text message.""" + return len(text) * (self.font_width + 1) + + +class FrameBuffer1(FrameBuffer): # pylint: disable=abstract-method + """FrameBuffer1 object. Inherits from FrameBuffer.""" diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py new file mode 100644 index 0000000000..e7f1476cfc --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py @@ -0,0 +1,283 @@ +# 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. +""" +`adafruit_irremote` +==================================================== + +Demo code for Circuit Playground Express: + +.. code-block:: python + + # Circuit Playground Express Demo Code + # Adjust the pulseio 'board.PIN' if using something else + import pulseio + import board + import adafruit_irremote + + pulsein = pulseio.PulseIn(board.REMOTEIN, maxlen=120, idle_state=True) + decoder = adafruit_irremote.GenericDecode() + + + while True: + pulses = decoder.read_pulses(pulsein) + print("Heard", len(pulses), "Pulses:", pulses) + try: + code = decoder.decode_bits(pulses) + print("Decoded:", code) + except adafruit_irremote.IRNECRepeatException: # unusual short code! + print("NEC repeat!") + except adafruit_irremote.IRDecodeException as e: # failed to decode + print("Failed to decode: ", e.args) + + print("----------------------------") + +* Author(s): Scott Shawcroft + +Implementation Notes +-------------------- + +**Hardware:** + +* `CircuitPlayground Express `_ + +* `IR Receiver Sensor `_ + +**Software and Dependencies:** + +* Adafruit CircuitPython firmware for the ESP8622 and M0-based boards: + https://github.com/adafruit/circuitpython/releases + +""" + +# Pretend self matter because we may add object level config later. +# pylint: disable=no-self-use + +import array +import time + +__version__ = "0.0.0-auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_IRRemote.git" + + +class IRDecodeException(Exception): + """Generic decode exception""" + + +class IRNECRepeatException(Exception): + """Exception when a NEC repeat is decoded""" + + +class GenericDecode: + """Generic decoding of infrared signals""" + + def bin_data(self, pulses): + """Compute bins of pulse lengths where pulses are +-25% of the average. + + :param list pulses: Input pulse lengths + """ + bins = [[pulses[0], 0]] + + for _, pulse in enumerate(pulses): + matchedbin = False + # print(pulse, end=": ") + for b, pulse_bin in enumerate(bins): + if pulse_bin[0] * 0.75 <= pulse <= pulse_bin[0] * 1.25: + # print("matches bin") + bins[b][0] = (pulse_bin[0] + pulse) // 2 # avg em + bins[b][1] += 1 # track it + matchedbin = True + break + if not matchedbin: + bins.append([pulse, 1]) + # print(bins) + return bins + + def decode_bits(self, pulses): + """Decode the pulses into bits.""" + # pylint: disable=too-many-branches,too-many-statements + + # special exception for NEC repeat code! + if ( + (len(pulses) == 3) + and (8000 <= pulses[0] <= 10000) + and (2000 <= pulses[1] <= 3000) + and (450 <= pulses[2] <= 700) + ): + raise IRNECRepeatException() + + if len(pulses) < 10: + raise IRDecodeException("10 pulses minimum") + + # Ignore any header (evens start at 1), and any trailer. + if len(pulses) % 2 == 0: + pulses_end = -1 + else: + pulses_end = None + + evens = pulses[1:pulses_end:2] + odds = pulses[2:pulses_end:2] + + # bin both halves + even_bins = self.bin_data(evens) + odd_bins = self.bin_data(odds) + + outliers = [b[0] for b in (even_bins + odd_bins) if b[1] == 1] + even_bins = [b for b in even_bins if b[1] > 1] + odd_bins = [b for b in odd_bins if b[1] > 1] + + if not even_bins or not odd_bins: + raise IRDecodeException("Not enough data") + + if len(even_bins) == 1: + pulses = odds + pulse_bins = odd_bins + elif len(odd_bins) == 1: + pulses = evens + pulse_bins = even_bins + else: + raise IRDecodeException("Both even/odd pulses differ") + + if len(pulse_bins) == 1: + raise IRDecodeException("Pulses do not differ") + if len(pulse_bins) > 2: + raise IRDecodeException("Only mark & space handled") + + mark = min(pulse_bins[0][0], pulse_bins[1][0]) + space = max(pulse_bins[0][0], pulse_bins[1][0]) + + if outliers: + # skip outliers + pulses = [ + p + for p in pulses + if not (outliers[0] * 0.75) <= p <= (outliers[0] * 1.25) + ] + # convert marks/spaces to 0 and 1 + for i, pulse_length in enumerate(pulses): + if (space * 0.75) <= pulse_length <= (space * 1.25): + pulses[i] = False + elif (mark * 0.75) <= pulse_length <= (mark * 1.25): + pulses[i] = True + else: + raise IRDecodeException("Pulses outside mark/space") + + # convert bits to bytes! + output = [0] * ((len(pulses) + 7) // 8) + for i, pulse_length in enumerate(pulses): + output[i // 8] = output[i // 8] << 1 + if pulse_length: + output[i // 8] |= 1 + return output + + def _read_pulses_non_blocking( + self, input_pulses, max_pulse=10000, pulse_window=0.10 + ): + """Read out a burst of pulses without blocking until pulses stop for a specified + period (pulse_window), pruning pulses after a pulse longer than ``max_pulse``. + + :param ~pulseio.PulseIn input_pulses: Object to read pulses from + :param int max_pulse: Pulse duration to end a burst + :param float pulse_window: pulses are collected for this period of time + """ + received = None + recent_count = 0 + pruning = False + while True: + while input_pulses: + pulse = input_pulses.popleft() + recent_count += 1 + if pulse > max_pulse: + if received is None: + continue + pruning = True + if not pruning: + if received is None: + received = [] + received.append(pulse) + + if recent_count == 0: + return received + recent_count = 0 + time.sleep(pulse_window) + + def read_pulses( + self, + input_pulses, + *, + max_pulse=10000, + blocking=True, + pulse_window=0.10, + blocking_delay=0.10 + ): + """Read out a burst of pulses until pulses stop for a specified + period (pulse_window), pruning pulses after a pulse longer than ``max_pulse``. + + :param ~pulseio.PulseIn input_pulses: Object to read pulses from + :param int max_pulse: Pulse duration to end a burst + :param bool blocking: If True, will block until pulses found. + If False, will return None if no pulses. + Defaults to True for backwards compatibility + :param float pulse_window: pulses are collected for this period of time + :param float blocking_delay: delay between pulse checks when blocking + """ + while True: + pulses = self._read_pulses_non_blocking( + input_pulses, max_pulse, pulse_window + ) + if blocking and pulses is None: + time.sleep(blocking_delay) + continue + return pulses + + +class GenericTransmit: + """Generic infrared transmit class that handles encoding.""" + + def __init__(self, header, one, zero, trail): + self.header = header + self.one = one + self.zero = zero + self.trail = trail + + def transmit(self, pulseout, data): + """Transmit the ``data`` using the ``pulseout``. + + :param pulseio.PulseOut pulseout: PulseOut to transmit on + :param bytearray data: Data to transmit + """ + durations = array.array("H", [0] * (2 + len(data) * 8 * 2 + 1)) + durations[0] = self.header[0] + durations[1] = self.header[1] + durations[-1] = self.trail + out = 2 + for byte_index, _ in enumerate(data): + for i in range(7, -1, -1): + if (data[byte_index] & 1 << i) > 0: + durations[out] = self.one[0] + durations[out + 1] = self.one[1] + else: + durations[out] = self.zero[0] + durations[out + 1] = self.zero[1] + out += 2 + + # print(durations) + pulseout.send(durations) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py new file mode 100644 index 0000000000..4dde03eb5d --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py @@ -0,0 +1,1000 @@ +# SPDX-FileCopyrightText: 2019-2021 Brent Rubell for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +# Original Work Copyright (c) 2016 Paul Sokolovsky, uMQTT +# Modified Work Copyright (c) 2019 Bradley Beach, esp32spi_mqtt +# Modified Work Copyright (c) 2012-2019 Roger Light and others, Paho MQTT Python + +""" +`adafruit_minimqtt` +================================================================================ + +A minimal MQTT Library for CircuitPython. + +* Author(s): Brent Rubell + +Implementation Notes +-------------------- + +Adapted from https://github.com/micropython/micropython-lib/tree/master/umqtt.simple/umqtt + +**Software and Dependencies:** + +* Adafruit CircuitPython firmware for the supported boards: + https://github.com/adafruit/circuitpython/releases + +""" +import errno +import struct +import time +from random import randint +from micropython import const +from matcher import MQTTMatcher + +__version__ = "0.0.0-auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MiniMQTT.git" + +# Client-specific variables +MQTT_MSG_MAX_SZ = const(268435455) +MQTT_MSG_SZ_LIM = const(10000000) +MQTT_TOPIC_LENGTH_LIMIT = const(65535) +MQTT_TCP_PORT = const(1883) +MQTT_TLS_PORT = const(8883) + +# MQTT Commands +MQTT_PINGREQ = b"\xc0\0" +MQTT_PINGRESP = const(0xD0) +MQTT_SUB = b"\x82" +MQTT_UNSUB = b"\xA2" +MQTT_DISCONNECT = b"\xe0\0" + +# Variable CONNECT header [MQTT 3.1.2] +MQTT_HDR_CONNECT = bytearray(b"\x04MQTT\x04\x02\0\0") + + +CONNACK_ERRORS = { + const(0x01): "Connection Refused - Incorrect Protocol Version", + const(0x02): "Connection Refused - ID Rejected", + const(0x03): "Connection Refused - Server unavailable", + const(0x04): "Connection Refused - Incorrect username/password", + const(0x05): "Connection Refused - Unauthorized", +} + +_default_sock = None # pylint: disable=invalid-name +_fake_context = None # pylint: disable=invalid-name + + +class MMQTTException(Exception): + """MiniMQTT Exception class.""" + + # pylint: disable=unnecessary-pass + # pass + + +# Legacy ESP32SPI Socket API +def set_socket(sock, iface=None): + """Legacy API for setting the socket and network interface. + + :param sock: socket object. + :param iface: internet interface object + + """ + global _default_sock # pylint: disable=invalid-name, global-statement + global _fake_context # pylint: disable=invalid-name, global-statement + _default_sock = sock + if iface: + _default_sock.set_interface(iface) + _fake_context = _FakeSSLContext(iface) + + +class _FakeSSLSocket: + def __init__(self, socket, tls_mode): + self._socket = socket + self._mode = tls_mode + self.settimeout = socket.settimeout + self.send = socket.send + self.recv = socket.recv + self.close = socket.close + + def connect(self, address): + """connect wrapper to add non-standard mode parameter""" + try: + return self._socket.connect(address, self._mode) + except RuntimeError as error: + raise OSError(errno.ENOMEM) from error + + +class _FakeSSLContext: + def __init__(self, iface): + self._iface = iface + + def wrap_socket(self, socket, server_hostname=None): + """Return the same socket""" + # pylint: disable=unused-argument + return _FakeSSLSocket(socket, self._iface.TLS_MODE) + + +class MQTT: + """MQTT Client for CircuitPython. + + :param str broker: MQTT Broker URL or IP Address. + :param int port: Optional port definition, defaults to 8883. + :param str username: Username for broker authentication. + :param str password: Password for broker authentication. + :param network_manager: NetworkManager object, such as WiFiManager from ESPSPI_WiFiManager. + :param str client_id: Optional client identifier, defaults to a unique, generated string. + :param bool is_ssl: Sets a secure or insecure connection with the broker. + :param int keep_alive: KeepAlive interval between the broker and the MiniMQTT client. + :param socket socket_pool: A pool of socket resources available for the given radio. + :param ssl_context: SSL context for long-lived SSL connections. + :param bool use_binary_mode: Messages are passed as bytearray instead of string to callbacks. + + """ + + # pylint: disable=too-many-arguments,too-many-instance-attributes, not-callable, invalid-name, no-member + def __init__( + self, + broker, + port=None, + username=None, + password=None, + client_id=None, + is_ssl=True, + keep_alive=60, + socket_pool=None, + ssl_context=None, + use_binary_mode=False, + ): + + self._socket_pool = socket_pool + self._ssl_context = ssl_context + self._sock = None + self._backwards_compatible_sock = False + self._use_binary_mode = use_binary_mode + + self.keep_alive = keep_alive + self._user_data = None + self._is_connected = False + self._msg_size_lim = MQTT_MSG_SZ_LIM + self._pid = 0 + self._timestamp = 0 + self.logger = None + + self.broker = broker + self._username = username + self._password = password + if ( + self._password and len(password.encode("utf-8")) > MQTT_TOPIC_LENGTH_LIMIT + ): # [MQTT-3.1.3.5] + raise MMQTTException("Password length is too large.") + + self.port = MQTT_TCP_PORT + if is_ssl: + self.port = MQTT_TLS_PORT + if port: + self.port = port + + # define client identifer + if client_id: + # user-defined client_id MAY allow client_id's > 23 bytes or + # non-alpha-numeric characters + self.client_id = client_id + else: + # assign a unique client_id + self.client_id = "cpy{0}{1}".format( + randint(0, int(time.monotonic() * 100) % 1000), randint(0, 99) + ) + # generated client_id's enforce spec.'s length rules + if len(self.client_id.encode("utf-8")) > 23 or not self.client_id: + raise ValueError("MQTT Client ID must be between 1 and 23 bytes") + + # LWT + self._lw_topic = None + self._lw_qos = 0 + self._lw_topic = None + self._lw_msg = None + self._lw_retain = False + + # List of subscribed topics, used for tracking + self._subscribed_topics = [] + self._on_message_filtered = MQTTMatcher() + + # Default topic callback methods + self._on_message = None + self.on_connect = None + self.on_disconnect = None + self.on_publish = None + self.on_subscribe = None + self.on_unsubscribe = None + + # pylint: disable=too-many-branches + def _get_connect_socket(self, host, port, *, timeout=1): + """Obtains a new socket and connects to a broker. + + :param str host: Desired broker hostname + :param int port: Desired broker port + :param int timeout: Desired socket timeout + """ + # For reconnections - check if we're using a socket already and close it + if self._sock: + self._sock.close() + self._sock = None + + # Legacy API - use the interface's socket instead of a passed socket pool + if self._socket_pool is None: + self._socket_pool = _default_sock + + # Legacy API - fake the ssl context + if self._ssl_context is None: + self._ssl_context = _fake_context + + if not isinstance(port, int): + raise RuntimeError("Port must be an integer") + + if port == 8883 and not self._ssl_context: + raise RuntimeError( + "ssl_context must be set before using adafruit_mqtt for secure MQTT." + ) + + if self.logger is not None and port == MQTT_TLS_PORT: + self.logger.info( + "Establishing a SECURE SSL connection to {0}:{1}".format(host, port) + ) + elif self.logger is not None: + self.logger.info( + "Establishing an INSECURE connection to {0}:{1}".format(host, port) + ) + + addr_info = self._socket_pool.getaddrinfo( + host, port, 0, self._socket_pool.SOCK_STREAM + )[0] + + sock = None + retry_count = 0 + while retry_count < 5 and sock is None: + retry_count += 1 + + try: + sock = self._socket_pool.socket(addr_info[0], addr_info[1]) + except OSError: + continue + + connect_host = addr_info[-1][0] + if port == 8883: + sock = self._ssl_context.wrap_socket(sock, server_hostname=host) + connect_host = host + sock.settimeout(timeout) + + try: + sock.connect((connect_host, port)) + except MemoryError: + sock.close() + sock = None + except OSError: + sock.close() + sock = None + + if sock is None: + raise RuntimeError("Repeated socket failures") + + self._backwards_compatible_sock = not hasattr(sock, "recv_into") + return sock + + def __enter__(self): + return self + + def __exit__(self, exception_type, exception_value, traceback): + self.deinit() + + def _sock_exact_recv(self, bufsize): + """Reads _exact_ number of bytes from the connected socket. Will only return + string with the exact number of bytes requested. + + The semantics of native socket receive is that it returns no more than the + specified number of bytes (i.e. max size). However, it makes no guarantees in + terms of the minimum size of the buffer, which could be 1 byte. This is a + wrapper for socket recv() to ensure that no less than the expected number of + bytes is returned or trigger a timeout exception. + + :param int bufsize: number of bytes to receive + """ + stamp = time.monotonic() + rc = self._sock.recv(bufsize) + to_read = bufsize - len(rc) + assert to_read >= 0 + read_timeout = self.keep_alive + while to_read > 0: + recv = self._sock.recv(to_read) + to_read -= len(recv) + rc += recv + if time.monotonic() - stamp > read_timeout: + raise MMQTTException( + "Unable to receive {} bytes within {} seconds.".format( + to_read, read_timeout + ) + ) + return rc + + def deinit(self): + """De-initializes the MQTT client and disconnects from the mqtt broker.""" + self.disconnect() + + @property + def mqtt_msg(self): + """Returns maximum MQTT payload and topic size.""" + return self._msg_size_lim, MQTT_TOPIC_LENGTH_LIMIT + + @mqtt_msg.setter + def mqtt_msg(self, msg_size): + """Sets the maximum MQTT message payload size. + + :param int msg_size: Maximum MQTT payload size. + """ + if msg_size < MQTT_MSG_MAX_SZ: + self._msg_size_lim = msg_size + + def will_set(self, topic=None, payload=None, qos=0, retain=False): + """Sets the last will and testament properties. MUST be called before `connect()`. + + :param str topic: MQTT Broker topic. + :param int|float|str payload: Last will disconnection payload. + payloads of type int & float are converted to a string. + :param int qos: Quality of Service level, defaults to + zero. Conventional options are ``0`` (send at most once), ``1`` + (send at least once), or ``2`` (send exactly once). + + .. note:: Only options ``1`` or ``0`` are QoS levels supported by this library. + :param bool retain: Specifies if the payload is to be retained when + it is published. + """ + if self.logger is not None: + self.logger.debug("Setting last will properties") + self._valid_qos(qos) + if self._is_connected: + raise MMQTTException("Last Will should only be called before connect().") + if payload is None: + payload = "" + if isinstance(payload, (int, float, str)): + payload = str(payload).encode() + else: + raise MMQTTException("Invalid message data type.") + self._lw_qos = qos + self._lw_topic = topic + self._lw_msg = payload + self._lw_retain = retain + + def add_topic_callback(self, mqtt_topic, callback_method): + """Registers a callback_method for a specific MQTT topic. + + :param str mqtt_topic: MQTT topic identifier. + :param function callback_method: The callback method. + """ + if mqtt_topic is None or callback_method is None: + raise ValueError("MQTT topic and callback method must both be defined.") + self._on_message_filtered[mqtt_topic] = callback_method + + def remove_topic_callback(self, mqtt_topic): + """Removes a registered callback method. + + :param str mqtt_topic: MQTT topic identifier string. + """ + if mqtt_topic is None: + raise ValueError("MQTT Topic must be defined.") + try: + del self._on_message_filtered[mqtt_topic] + except KeyError: + raise KeyError( + "MQTT topic callback not added with add_topic_callback." + ) from None + + @property + def on_message(self): + """Called when a new message has been received on a subscribed topic. + + Expected method signature is ``on_message(client, topic, message)`` + """ + return self._on_message + + @on_message.setter + def on_message(self, method): + self._on_message = method + + def _handle_on_message(self, client, topic, message): + matched = False + if topic is not None: + for callback in self._on_message_filtered.iter_match(topic): + callback(client, topic, message) # on_msg with callback + matched = True + + if not matched and self.on_message: # regular on_message + self.on_message(client, topic, message) + + def username_pw_set(self, username, password=None): + """Set client's username and an optional password. + + :param str username: Username to use with your MQTT broker. + :param str password: Password to use with your MQTT broker. + + """ + if self._is_connected: + raise MMQTTException("This method must be called before connect().") + self._username = username + if password is not None: + self._password = password + + # pylint: disable=too-many-branches, too-many-statements, too-many-locals + def connect(self, clean_session=True, host=None, port=None, keep_alive=None): + """Initiates connection with the MQTT Broker. + + :param bool clean_session: Establishes a persistent session. + :param str host: Hostname or IP address of the remote broker. + :param int port: Network port of the remote broker. + :param int keep_alive: Maximum period allowed for communication, in seconds. + + """ + if host: + self.broker = host + if port: + self.port = port + if keep_alive: + self.keep_alive = keep_alive + + if self.logger is not None: + self.logger.debug("Attempting to establish MQTT connection...") + + # Get a new socket + self._sock = self._get_connect_socket(self.broker, self.port) + + # Fixed Header + fixed_header = bytearray([0x10]) + + # NOTE: Variable header is + # MQTT_HDR_CONNECT = bytearray(b"\x04MQTT\x04\x02\0\0") + # because final 4 bytes are 4, 2, 0, 0 + var_header = MQTT_HDR_CONNECT + var_header[6] = clean_session << 1 + + # Set up variable header and remaining_length + remaining_length = 12 + len(self.client_id.encode("utf-8")) + if self._username: + remaining_length += ( + 2 + + len(self._username.encode("utf-8")) + + 2 + + len(self._password.encode("utf-8")) + ) + var_header[6] |= 0xC0 + if self.keep_alive: + assert self.keep_alive < MQTT_TOPIC_LENGTH_LIMIT + var_header[7] |= self.keep_alive >> 8 + var_header[8] |= self.keep_alive & 0x00FF + if self._lw_topic: + remaining_length += ( + 2 + len(self._lw_topic.encode("utf-8")) + 2 + len(self._lw_msg) + ) + var_header[6] |= 0x4 | (self._lw_qos & 0x1) << 3 | (self._lw_qos & 0x2) << 3 + var_header[6] |= self._lw_retain << 5 + + # Remaining length calculation + large_rel_length = False + if remaining_length > 0x7F: + large_rel_length = True + # Calculate Remaining Length [2.2.3] + while remaining_length > 0: + encoded_byte = remaining_length % 0x80 + remaining_length = remaining_length // 0x80 + # if there is more data to encode, set the top bit of the byte + if remaining_length > 0: + encoded_byte |= 0x80 + fixed_header.append(encoded_byte) + if large_rel_length: + fixed_header.append(0x00) + else: + fixed_header.append(remaining_length) + fixed_header.append(0x00) + + if self.logger is not None: + self.logger.debug("Sending CONNECT to broker...") + self.logger.debug( + "Fixed Header: %s\nVariable Header: %s", fixed_header, var_header + ) + self._sock.send(fixed_header) + self._sock.send(var_header) + # [MQTT-3.1.3-4] + self._send_str(self.client_id) + if self._lw_topic: + # [MQTT-3.1.3-11] + self._send_str(self._lw_topic) + self._send_str(self._lw_msg) + if self._username is None: + self._username = None + else: + self._send_str(self._username) + self._send_str(self._password) + if self.logger is not None: + self.logger.debug("Receiving CONNACK packet from broker") + while True: + op = self._wait_for_msg() + if op == 32: + rc = self._sock_exact_recv(3) + assert rc[0] == 0x02 + if rc[2] != 0x00: + raise MMQTTException(CONNACK_ERRORS[rc[2]]) + self._is_connected = True + result = rc[0] & 1 + if self.on_connect is not None: + self.on_connect(self, self._user_data, result, rc[2]) + return result + + def disconnect(self): + """Disconnects the MiniMQTT client from the MQTT broker.""" + self.is_connected() + if self.logger is not None: + self.logger.debug("Sending DISCONNECT packet to broker") + try: + self._sock.send(MQTT_DISCONNECT) + except RuntimeError as e: + if self.logger is not None: + self.logger.warning("Unable to send DISCONNECT packet: {}".format(e)) + if self.logger is not None: + self.logger.debug("Closing socket") + self._sock.close() + self._is_connected = False + self._subscribed_topics = [] + if self.on_disconnect is not None: + self.on_disconnect(self, self._user_data, 0) + + def ping(self): + """Pings the MQTT Broker to confirm if the broker is alive or if + there is an active network connection. + Returns response codes of any messages received while waiting for PINGRESP. + """ + self.is_connected() + if self.logger is not None: + self.logger.debug("Sending PINGREQ") + self._sock.send(MQTT_PINGREQ) + ping_timeout = self.keep_alive + stamp = time.monotonic() + rc, rcs = None, [] + while rc != MQTT_PINGRESP: + rc = self._wait_for_msg() + if rc: + rcs.append(rc) + if time.monotonic() - stamp > ping_timeout: + raise MMQTTException("PINGRESP not returned from broker.") + return rcs + + # pylint: disable=too-many-branches, too-many-statements + def publish(self, topic, msg, retain=False, qos=0): + """Publishes a message to a topic provided. + + :param str topic: Unique topic identifier. + :param str|int|float|bytes msg: Data to send to the broker. + :param bool retain: Whether the message is saved by the broker. + :param int qos: Quality of Service level for the message, defaults to zero. + + """ + self.is_connected() + self._valid_topic(topic) + if "+" in topic or "#" in topic: + raise MMQTTException("Publish topic can not contain wildcards.") + # check msg/qos kwargs + if msg is None: + raise MMQTTException("Message can not be None.") + if isinstance(msg, (int, float)): + msg = str(msg).encode("ascii") + elif isinstance(msg, str): + msg = str(msg).encode("utf-8") + elif isinstance(msg, bytes): + pass + else: + raise MMQTTException("Invalid message data type.") + if len(msg) > MQTT_MSG_MAX_SZ: + raise MMQTTException("Message size larger than %d bytes." % MQTT_MSG_MAX_SZ) + assert ( + 0 <= qos <= 1 + ), "Quality of Service Level 2 is unsupported by this library." + + # fixed header. [3.3.1.2], [3.3.1.3] + pub_hdr_fixed = bytearray([0x30 | retain | qos << 1]) + + # variable header = 2-byte Topic length (big endian) + pub_hdr_var = bytearray(struct.pack(">H", len(topic.encode("utf-8")))) + pub_hdr_var.extend(topic.encode("utf-8")) # Topic name + + remaining_length = 2 + len(msg) + len(topic.encode("utf-8")) + if qos > 0: + # packet identifier where QoS level is 1 or 2. [3.3.2.2] + remaining_length += 2 + self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 + pub_hdr_var.append(self._pid >> 8) + pub_hdr_var.append(self._pid & 0xFF) + + # Calculate remaining length [2.2.3] + if remaining_length > 0x7F: + while remaining_length > 0: + encoded_byte = remaining_length % 0x80 + remaining_length = remaining_length // 0x80 + if remaining_length > 0: + encoded_byte |= 0x80 + pub_hdr_fixed.append(encoded_byte) + else: + pub_hdr_fixed.append(remaining_length) + + if self.logger is not None: + self.logger.debug( + "Sending PUBLISH\nTopic: %s\nMsg: %s\ + \nQoS: %d\nRetain? %r", + topic, + msg, + qos, + retain, + ) + self._sock.send(pub_hdr_fixed) + self._sock.send(pub_hdr_var) + self._sock.send(msg) + if qos == 0 and self.on_publish is not None: + self.on_publish(self, self._user_data, topic, self._pid) + if qos == 1: + while True: + op = self._wait_for_msg() + if op == 0x40: + sz = self._sock_exact_recv(1) + assert sz == b"\x02" + rcv_pid = self._sock_exact_recv(2) + rcv_pid = rcv_pid[0] << 0x08 | rcv_pid[1] + if self._pid == rcv_pid: + if self.on_publish is not None: + self.on_publish(self, self._user_data, topic, rcv_pid) + return + + def subscribe(self, topic, qos=0): + """Subscribes to a topic on the MQTT Broker. + This method can subscribe to one topics or multiple topics. + + :param str|tuple|list topic: Unique MQTT topic identifier string. If + this is a `tuple`, then the tuple should + contain topic identifier string and qos + level integer. If this is a `list`, then + each list element should be a tuple containing + a topic identifier string and qos level integer. + :param int qos: Quality of Service level for the topic, defaults to + zero. Conventional options are ``0`` (send at most once), ``1`` + (send at least once), or ``2`` (send exactly once). + + """ + self.is_connected() + topics = None + if isinstance(topic, tuple): + topic, qos = topic + self._valid_topic(topic) + self._valid_qos(qos) + if isinstance(topic, str): + self._valid_topic(topic) + self._valid_qos(qos) + topics = [(topic, qos)] + if isinstance(topic, list): + topics = [] + for t, q in topic: + self._valid_qos(q) + self._valid_topic(t) + topics.append((t, q)) + # Assemble packet + packet_length = 2 + (2 * len(topics)) + (1 * len(topics)) + packet_length += sum(len(topic.encode("utf-8")) for topic, qos in topics) + packet_length_byte = packet_length.to_bytes(1, "big") + self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 + packet_id_bytes = self._pid.to_bytes(2, "big") + # Packet with variable and fixed headers + packet = MQTT_SUB + packet_length_byte + packet_id_bytes + # attaching topic and QOS level to the packet + for t, q in topics: + topic_size = len(t.encode("utf-8")).to_bytes(2, "big") + qos_byte = q.to_bytes(1, "big") + packet += topic_size + t.encode() + qos_byte + if self.logger is not None: + for t, q in topics: + self.logger.debug("SUBSCRIBING to topic %s with QoS %d", t, q) + self._sock.send(packet) + while True: + op = self._wait_for_msg() + if op == 0x90: + rc = self._sock_exact_recv(4) + assert rc[1] == packet[2] and rc[2] == packet[3] + if rc[3] == 0x80: + raise MMQTTException("SUBACK Failure!") + for t, q in topics: + if self.on_subscribe is not None: + self.on_subscribe(self, self._user_data, t, q) + self._subscribed_topics.append(t) + return + + def unsubscribe(self, topic): + """Unsubscribes from a MQTT topic. + + :param str|list topic: Unique MQTT topic identifier string or list. + + """ + topics = None + if isinstance(topic, str): + self._valid_topic(topic) + topics = [(topic)] + if isinstance(topic, list): + topics = [] + for t in topic: + self._valid_topic(t) + topics.append((t)) + for t in topics: + if t not in self._subscribed_topics: + raise MMQTTException( + "Topic must be subscribed to before attempting unsubscribe." + ) + # Assemble packet + packet_length = 2 + (2 * len(topics)) + packet_length += sum(len(topic.encode("utf-8")) for topic in topics) + packet_length_byte = packet_length.to_bytes(1, "big") + self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 + packet_id_bytes = self._pid.to_bytes(2, "big") + packet = MQTT_UNSUB + packet_length_byte + packet_id_bytes + for t in topics: + topic_size = len(t.encode("utf-8")).to_bytes(2, "big") + packet += topic_size + t.encode() + if self.logger is not None: + for t in topics: + self.logger.debug("UNSUBSCRIBING from topic %s", t) + self._sock.send(packet) + if self.logger is not None: + self.logger.debug("Waiting for UNSUBACK...") + while True: + op = self._wait_for_msg() + if op == 176: + rc = self._sock_exact_recv(3) + assert rc[0] == 0x02 + # [MQTT-3.32] + assert rc[1] == packet_id_bytes[0] and rc[2] == packet_id_bytes[1] + for t in topics: + if self.on_unsubscribe is not None: + self.on_unsubscribe(self, self._user_data, t, self._pid) + self._subscribed_topics.remove(t) + return + + def reconnect(self, resub_topics=True): + """Attempts to reconnect to the MQTT broker. + + :param bool resub_topics: Resubscribe to previously subscribed topics. + + """ + if self.logger is not None: + self.logger.debug("Attempting to reconnect with MQTT broker") + self.connect() + if self.logger is not None: + self.logger.debug("Reconnected with broker") + if resub_topics: + if self.logger is not None: + self.logger.debug( + "Attempting to resubscribe to previously subscribed topics." + ) + subscribed_topics = self._subscribed_topics.copy() + self._subscribed_topics = [] + while subscribed_topics: + feed = subscribed_topics.pop() + self.subscribe(feed) + + def loop(self, timeout=1): + """Non-blocking message loop. Use this method to + check incoming subscription messages. + Returns response codes of any messages received. + + :param int timeout: Socket timeout, in seconds. + + """ + if self._timestamp == 0: + self._timestamp = time.monotonic() + current_time = time.monotonic() + if current_time - self._timestamp >= self.keep_alive: + self._timestamp = 0 + # Handle KeepAlive by expecting a PINGREQ/PINGRESP from the server + if self.logger is not None: + self.logger.debug( + "KeepAlive period elapsed - requesting a PINGRESP from the server..." + ) + rcs = self.ping() + return rcs + self._sock.settimeout(timeout) + rc = self._wait_for_msg() + return [rc] if rc else None + + def _wait_for_msg(self, timeout=0.1): + """Reads and processes network events.""" + # CPython socket module contains a timeout attribute + if hasattr(self._socket_pool, "timeout"): + try: + res = self._sock_exact_recv(1) + except self._socket_pool.timeout: + return None + else: # socketpool, esp32spi + try: + res = self._sock_exact_recv(1) + except OSError as error: + if error.errno == errno.ETIMEDOUT: + # raised by a socket timeout if 0 bytes were present + return None + raise MMQTTException from error + + # Block while we parse the rest of the response + self._sock.settimeout(timeout) + if res in [None, b""]: + # If we get here, it means that there is nothing to be received + return None + if res[0] == MQTT_PINGRESP: + if self.logger is not None: + self.logger.debug("Got PINGRESP") + sz = self._sock_exact_recv(1)[0] + if sz != 0x00: + raise MMQTTException( + "Unexpected PINGRESP returned from broker: {}.".format(sz) + ) + return MQTT_PINGRESP + if res[0] & 0xF0 != 0x30: + return res[0] + sz = self._recv_len() + # topic length MSB & LSB + topic_len = self._sock_exact_recv(2) + topic_len = (topic_len[0] << 8) | topic_len[1] + topic = self._sock_exact_recv(topic_len) + topic = str(topic, "utf-8") + sz -= topic_len + 2 + pid = 0 + if res[0] & 0x06: + pid = self._sock_exact_recv(2) + pid = pid[0] << 0x08 | pid[1] + sz -= 0x02 + # read message contents + raw_msg = self._sock_exact_recv(sz) + msg = raw_msg if self._use_binary_mode else str(raw_msg, "utf-8") + if self.logger is not None: + self.logger.debug( + "Receiving SUBSCRIBE \nTopic: %s\nMsg: %s\n", topic, raw_msg + ) + self._handle_on_message(self, topic, msg) + if res[0] & 0x06 == 0x02: + pkt = bytearray(b"\x40\x02\0\0") + struct.pack_into("!H", pkt, 2, pid) + self._sock.send(pkt) + elif res[0] & 6 == 4: + assert 0 + return res[0] + + def _recv_len(self): + """Unpack MQTT message length.""" + n = 0 + sh = 0 + b = bytearray(1) + while True: + b = self._sock_exact_recv(1)[0] + n |= (b & 0x7F) << sh + if not b & 0x80: + return n + sh += 7 + + def _recv_into(self, buf, size=0): + """Backwards-compatible _recv_into implementation.""" + if self._backwards_compatible_sock: + size = len(buf) if size == 0 else size + b = self._sock.recv(size) + read_size = len(b) + buf[:read_size] = b + return read_size + return self._sock.recv_into(buf, size) + + def _sock_exact_recv(self, bufsize): + """Reads _exact_ number of bytes from the connected socket. Will only return + string with the exact number of bytes requested. + + The semantics of native socket receive is that it returns no more than the + specified number of bytes (i.e. max size). However, it makes no guarantees in + terms of the minimum size of the buffer, which could be 1 byte. This is a + wrapper for socket recv() to ensure that no less than the expected number of + bytes is returned or trigger a timeout exception. + + :param int bufsize: number of bytes to receive + + """ + if not self._backwards_compatible_sock: + # CPython/Socketpool Impl. + rc = bytearray(bufsize) + self._sock.recv_into(rc, bufsize) + else: # ESP32SPI Impl. + stamp = time.monotonic() + read_timeout = self.keep_alive + # This will timeout with socket timeout (not keepalive timeout) + rc = self._sock.recv(bufsize) + if not rc: + if self.logger is not None: + self.logger.debug("_sock_exact_recv timeout") + # If no bytes waiting, raise same exception as socketpool + raise OSError(errno.ETIMEDOUT) + # If any bytes waiting, try to read them all, + # or raise exception if wait longer than read_timeout + to_read = bufsize - len(rc) + assert to_read >= 0 + read_timeout = self.keep_alive + while to_read > 0: + recv = self._sock.recv(to_read) + to_read -= len(recv) + rc += recv + if time.monotonic() - stamp > read_timeout: + raise MMQTTException( + "Unable to receive {} bytes within {} seconds.".format( + to_read, read_timeout + ) + ) + return rc + + def _send_str(self, string): + """Encodes a string and sends it to a socket. + + :param str string: String to write to the socket. + + """ + if isinstance(string, str): + self._sock.send(struct.pack("!H", len(string.encode("utf-8")))) + self._sock.send(str.encode(string, "utf-8")) + else: + self._sock.send(struct.pack("!H", len(string))) + self._sock.send(string) + + @staticmethod + def _valid_topic(topic): + """Validates if topic provided is proper MQTT topic format. + + :param str topic: Topic identifier + + """ + if topic is None: + raise MMQTTException("Topic may not be NoneType") + # [MQTT-4.7.3-1] + if not topic: + raise MMQTTException("Topic may not be empty.") + # [MQTT-4.7.3-3] + if len(topic.encode("utf-8")) > MQTT_TOPIC_LENGTH_LIMIT: + raise MMQTTException("Topic length is too large.") + + @staticmethod + def _valid_qos(qos_level): + """Validates if the QoS level is supported by this library + + :param int qos_level: Desired QoS level. + + """ + if isinstance(qos_level, int): + if qos_level < 0 or qos_level > 2: + raise MMQTTException("QoS must be between 1 and 2.") + else: + raise MMQTTException("QoS must be an integer.") + + def is_connected(self): + """Returns MQTT client session status as True if connected, raises + a `MMQTTException` if `False`. + """ + if self._sock is None or self._is_connected is False: + raise MMQTTException("MiniMQTT is not connected.") + return self._is_connected + + # Logging + def enable_logger(self, logger, log_level=20): + """Enables library logging provided a logger object. + + :param logger: A python logger pacakge. + :param log_level: Numeric value of a logging level, defaults to INFO. + + """ + self.logger = logger.getLogger("log") + self.logger.setLevel(log_level) + + def disable_logger(self): + """Disables logging.""" + if not self.logger: + raise MMQTTException("Can not disable logger, no logger found.") + self.logger = None diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py new file mode 100644 index 0000000000..75665f1bb5 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py @@ -0,0 +1,204 @@ +# The MIT License (MIT) +# +# Copyright (c) 2017, 2018 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. +""" +`adafruit_rtttl` +==================================================== + +Play notes to a digialio pin using ring tone text transfer language (rtttl). + +* Author(s): Scott Shawcroft +""" + +__version__ = "2.4.2" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RTTTL" + +import sys +import time +import pwmio + +AUDIOIO_AVAILABLE = False +try: + import audioio + from adafruit_waveform import sine + + AUDIOIO_AVAILABLE = True + try: + import audiocore + except ImportError: + audiocore = audioio +except ImportError: + pass + +PIANO = { + "4c": 261.626, + "4c#": 277.183, + "4d": 293.665, + "4d#": 311.127, + "4e": 329.628, + "4f": 349.228, + "4f#": 369.994, + "4g": 391.995, + "4g#": 415.305, + "4a": 440, + "4a#": 466.164, + "4b": 493.883, + "5c": 523.251, + "5c#": 554.365, + "5d": 587.330, + "5d#": 622.254, + "5e": 659.255, + "5f": 698.456, + "5f#": 739.989, + "5g": 783.991, + "5g#": 830.609, + "5a": 880, + "5a#": 932.328, + "5b": 987.767, + "6c": 1046.50, + "6c#": 1108.73, + "6d": 1174.66, + "6d#": 1244.51, + "6e": 1318.51, + "6f": 1396.91, + "6f#": 1479.98, + "6g": 1567.98, + "6g#": 1661.22, + "6a": 1760, + "6a#": 1864.66, + "6b": 1975.53, + "7c": 2093, + "7c#": 2217.46, +} + + +def _parse_note(note, duration=2, octave="6"): + note = note.strip() + piano_note = None + note_duration = duration + if note[0].isdigit() and note[1].isdigit(): + note_duration = int(note[:2]) + piano_note = note[2] + elif note[0].isdigit(): + note_duration = int(note[0]) + piano_note = note[1] + else: + piano_note = note[0] + if "." in note: + note_duration *= 1.5 + if "#" in note: + piano_note += "#" + note_octave = octave + if note[-1].isdigit(): + note_octave = note[-1] + piano_note = note_octave + piano_note + return piano_note, note_duration + + +def _get_wave(tune, octave): + """Returns the proper waveform to play the song along with the minimum + frequency in the song. + """ + min_freq = 13000 + + for note in tune.split(","): + piano_note, _ = _parse_note(note, octave=octave) + if piano_note[-1] != "p" and PIANO[piano_note] < min_freq: + min_freq = PIANO[piano_note] + return sine.sine_wave(16000, min_freq), min_freq + + +# pylint: disable-msg=too-many-arguments +def _play_to_pin(tune, base_tone, min_freq, duration, octave, tempo): + """Using the prepared input send the notes to the pin + """ + pwm = isinstance(base_tone, pwmio.PWMOut) + for note in tune.split(","): + piano_note, note_duration = _parse_note(note, duration, octave) + if piano_note in PIANO: + if pwm: + base_tone.frequency = int(PIANO[piano_note]) + base_tone.duty_cycle = 2 ** 15 + else: + # AudioOut interface changed in CP 3.x + if sys.implementation.version[0] >= 3: + pitch = int(PIANO[piano_note]) + sine_wave = sine.sine_wave(16000, pitch) + sine_wave_sample = audiocore.RawSample(sine_wave) + base_tone.play(sine_wave_sample, loop=True) + else: + base_tone.frequency = int(16000 * (PIANO[piano_note] / min_freq)) + base_tone.play(loop=True) + + time.sleep(4 / note_duration * 60 / tempo) + if pwm: + base_tone.duty_cycle = 0 + else: + base_tone.stop() + time.sleep(0.02) + + +# pylint: disable-msg=too-many-arguments +def play(pin, rtttl, octave=None, duration=None, tempo=None): + """Play notes to a digialio pin using ring tone text transfer language (rtttl). + :param ~digitalio.DigitalInOut pin: the speaker pin + :param rtttl: string containing rtttl + :param int octave: represents octave number (default 6 starts at middle c) + :param int duration: length of notes (default 4 quarter note) + :param int tempo: how fast (default 63 beats per minute) + """ + _, defaults, tune = rtttl.lower().split(":") + for default in defaults.split(","): + if default[0] == "d" and not duration: + duration = int(default[2:]) + elif default[0] == "o" and not octave: + octave = default[2:] + elif default[0] == "b" and not tempo: + tempo = int(default[2:]) + if not octave: + octave = 6 + if not duration: + duration = 4 + if not tempo: + tempo = 63 + + base_tone = None + min_freq = 440 + if AUDIOIO_AVAILABLE: + wave, min_freq = _get_wave(tune, octave) + try: + # AudioOut interface changed in CP 3.x; a waveform if now pass + # directly to .play(), generated for each note in _play_to_pin() + if sys.implementation.version[0] >= 3: + base_tone = audioio.AudioOut(pin) + else: + base_tone = audioio.AudioOut(pin, wave) + except ValueError: + # No DAC on the pin so use PWM. + pass + + # Fall back to PWM + if not base_tone: + base_tone = pwmio.PWMOut(pin, duty_cycle=0, variable_frequency=True) + + _play_to_pin(tune, base_tone, min_freq, duration, octave, tempo) + + base_tone.deinit() diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py new file mode 100644 index 0000000000..c174d91c7f --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py @@ -0,0 +1,390 @@ +# Copyright (c) 2019-2020 Anton Morozenko +# Copyright (c) 2015-2019 Volodymyr Shymanskyy. +# See the file LICENSE for copying permission. +# 宋义深 2021/4/25 Modified +__version__ = '0.2.6' + +import socketpool as socket +import ssl +import struct +import time +import wifi + +LOGO = """ + ___ __ __ + / _ )/ /_ _____ / /__ + / _ / / // / _ \\/ '_/ + /____/_/\\_, /_//_/_/\\_\\ + /___/ for Python v{}\n""".format(__version__) + + +def stub_log(*args): + pass + + +def ticks_ms(): + return int(time.time() * 1000) + + +def sleep_ms(ms): + time.sleep(ms // 1000) + + +class BlynkError(Exception): + pass + + +class RedirectError(Exception): + def __init__(self, server, port): + self.server = server + self.port = port + + +class Protocol(object): + MSG_RSP = 0 + MSG_LOGIN = 2 + MSG_PING = 6 + MSG_TWEET = 12 + MSG_EMAIL = 13 + MSG_NOTIFY = 14 + MSG_BRIDGE = 15 + MSG_HW_SYNC = 16 + MSG_INTERNAL = 17 + MSG_PROPERTY = 19 + MSG_HW = 20 + MSG_REDIRECT = 41 + MSG_HEAD_LEN = 5 + + STATUS_INVALID_TOKEN = 9 + STATUS_NO_DATA = 17 + STATUS_OK = 200 + VPIN_MAX_NUM = 32 + + _msg_id = 0 + + def _get_msg_id(self, **kwargs): + if 'msg_id' in kwargs: + return kwargs['msg_id'] + self._msg_id += 1 + return self._msg_id if self._msg_id <= 0xFFFF else 1 + + def _pack_msg(self, msg_type, *args, **kwargs): + data = ('\0'.join([str(curr_arg) for curr_arg in args])).encode('utf-8') + return struct.pack('!BHH', msg_type, self._get_msg_id(**kwargs), len(data)) + data + + def parse_response(self, rsp_data, msg_buffer): + msg_args = [] + try: + msg_type, msg_id, h_data = struct.unpack('!BHH', rsp_data[:self.MSG_HEAD_LEN]) + except Exception as p_err: + print(p_err) + raise BlynkError('Message parse error: {}'.format(p_err)) + if msg_id == 0: + raise BlynkError('invalid msg_id == 0') + elif h_data >= msg_buffer: + raise BlynkError('Command too long. Length = {}'.format(h_data)) + elif msg_type in (self.MSG_RSP, self.MSG_PING): + pass + elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL, self.MSG_REDIRECT): + msg_body = rsp_data[self.MSG_HEAD_LEN: self.MSG_HEAD_LEN + h_data] + msg_args = [itm.decode('utf-8') for itm in msg_body.split(b'\0')] + else: + print('unknown') + raise BlynkError("Unknown message type: '{}'".format(msg_type)) + return msg_type, msg_id, h_data, msg_args + + def heartbeat_msg(self, heartbeat, rcv_buffer): + return self._pack_msg(self.MSG_INTERNAL, 'ver', __version__, 'buff-in', rcv_buffer, 'h-beat', heartbeat, + 'dev', 'python') + + def login_msg(self, token): + return self._pack_msg(self.MSG_LOGIN, token) + + def ping_msg(self): + return self._pack_msg(self.MSG_PING) + + def response_msg(self, *args, **kwargs): + return self._pack_msg(self.MSG_RSP, *args, **kwargs) + + def virtual_write_msg(self, v_pin, *val): + return self._pack_msg(self.MSG_HW, 'vw', v_pin, *val) + + def virtual_sync_msg(self, *pins): + return self._pack_msg(self.MSG_HW_SYNC, 'vr', *pins) + + def email_msg(self, to, subject, body): + return self._pack_msg(self.MSG_EMAIL, to, subject, body) + + def tweet_msg(self, msg): + return self._pack_msg(self.MSG_TWEET, msg) + + def notify_msg(self, msg): + return self._pack_msg(self.MSG_NOTIFY, msg) + + def set_property_msg(self, pin, prop, *val): + return self._pack_msg(self.MSG_PROPERTY, pin, prop, *val) + + def internal_msg(self, *args): + return self._pack_msg(self.MSG_INTERNAL, *args) + + +class Connection(Protocol): + SOCK_MAX_TIMEOUT = 5 + SOCK_TIMEOUT = 0 + SOCK_SSL_TIMEOUT = 1 + EAGAIN = 11 + ETIMEDOUT = 60 + RETRIES_TX_DELAY = 2 + RETRIES_TX_MAX_NUM = 3 + RECONNECT_SLEEP = 1 + TASK_PERIOD_RES = 50 + DISCONNECTED = 0 + CONNECTING = 1 + AUTHENTICATING = 2 + AUTHENTICATED = 3 + + _state = None + _socket = None + _socketPool = None + _last_rcv_time = 0 + _last_ping_time = 0 + _last_send_time = 0 + + def __init__(self, token, server='blynk-cloud.com', port=80, ssl_cert=None, heartbeat=10, rcv_buffer=1024, + log=stub_log): + self.token = token + self.server = server + self.port = port + self.heartbeat = heartbeat + self.rcv_buffer = rcv_buffer + self.log = log + self.ssl_cert = ssl_cert + + def send(self, data): + retries = self.RETRIES_TX_MAX_NUM + while retries > 0: + try: + retries -= 1 + self._last_send_time = ticks_ms() + return self._socket.send(data) + except (Exception): + sleep_ms(self.RETRIES_TX_DELAY) + + def receive(self, length, timeout): + d_buff = bytearray(length) + try: + self._socket.settimeout(timeout) + recv_length = self._socket.recv_into(d_buff) + d_buff = d_buff[:recv_length] + #print(self.parse_response(bytes(d_buff), self.rcv_buffer)) + return bytes(d_buff) + except (Exception) as err: + if 'timed out' in str(err): + return b'' + if str(self.EAGAIN) in str(err) or str(self.ETIMEDOUT) in str(err): + return b'' + raise + + def is_server_alive(self): + now = ticks_ms() + h_beat_ms = self.heartbeat * 1000 + rcv_delta = now - self._last_rcv_time + ping_delta = now - self._last_ping_time + send_delta = now - self._last_send_time + if rcv_delta > h_beat_ms + (h_beat_ms // 2): + return False + if (ping_delta > h_beat_ms // 10) and (send_delta > h_beat_ms or rcv_delta > h_beat_ms): + self.send(self.ping_msg()) + self.log('Heartbeat time: {}'.format(now)) + self._last_ping_time = now + return True + + def _get_socket(self): + try: + self._state = self.CONNECTING + self._socket = socket.SocketPool(wifi.radio).socket() + self._socketPool = socket.SocketPool(wifi.radio) + self._socket.connect(self._socketPool.getaddrinfo(self.server, self.port)[0][4]) + self._socket.settimeout(self.SOCK_TIMEOUT) + if self.ssl_cert: + # system default CA certificates case + if self.ssl_cert == "default": + self.ssl_cert = None + self.log('Using SSL socket...') + ssl_context = ssl.create_default_context(cafile=self.ssl_cert) + ssl_context.verify_mode = ssl.CERT_REQUIRED + self._socket.settimeout(self.SOCK_SSL_TIMEOUT) + self._socket = ssl_context.wrap_socket(sock=self._socket, server_hostname=self.server) + self.log('Connected to blynk server') + except Exception as g_exc: + print(g_exc) + raise BlynkError('Connection with the Blynk server failed: {}'.format(g_exc)) + + def _authenticate(self): + self._state = self.AUTHENTICATING + self.send(self.login_msg(self.token)) + rsp_data = self.receive(self.rcv_buffer, self.SOCK_MAX_TIMEOUT) + if not rsp_data: + raise BlynkError('Auth stage timeout') + msg_type, _, status, args = self.parse_response(rsp_data, self.rcv_buffer) + if status != self.STATUS_OK: + if status == self.STATUS_INVALID_TOKEN: + raise BlynkError('Invalid Auth Token') + if msg_type == self.MSG_REDIRECT: + raise RedirectError(*args) + raise BlynkError('Auth stage failed. Status={}'.format(status)) + self._state = self.AUTHENTICATED + + def _set_heartbeat(self): + self.send(self.heartbeat_msg(self.heartbeat, self.rcv_buffer)) + rcv_data = self.receive(self.rcv_buffer, self.SOCK_MAX_TIMEOUT) + if not rcv_data: + raise BlynkError('Heartbeat stage timeout') + _, _, status, _ = self.parse_response(rcv_data, self.rcv_buffer) + if status != self.STATUS_OK: + raise BlynkError('Set heartbeat returned code={}'.format(status)) + self.log('Heartbeat = {} sec. MaxCmdBuffer = {} bytes'.format(self.heartbeat, self.rcv_buffer)) + + def connected(self): + return True if self._state == self.AUTHENTICATED else False + + +class Blynk(Connection): + _CONNECT_TIMEOUT = 30 # 30sec + _VPIN_WILDCARD = '*' + _VPIN_READ = 'read v' + _VPIN_WRITE = 'write v' + _INTERNAL = 'internal_' + _CONNECT = 'connect' + _DISCONNECT = 'disconnect' + _VPIN_READ_ALL = '{}{}'.format(_VPIN_READ, _VPIN_WILDCARD) + _VPIN_WRITE_ALL = '{}{}'.format(_VPIN_WRITE, _VPIN_WILDCARD) + _events = {} + + def __init__(self, token, **kwargs): + Connection.__init__(self, token, **kwargs) + self._start_time = ticks_ms() + self._last_rcv_time = ticks_ms() + self._last_send_time = ticks_ms() + self._last_ping_time = ticks_ms() + self._state = self.DISCONNECTED + print(LOGO) + + def connect(self, timeout=_CONNECT_TIMEOUT): + end_time = time.time() + timeout + while not self.connected(): + if self._state == self.DISCONNECTED: + try: + self._get_socket() + print('[Connecting 1/5] Socket got.') + self._authenticate() + print('[Connecting 2/5] Authenticated.') + self._set_heartbeat() + print('[Connecting 3/5] Heartbeat sent.') + self._last_rcv_time = ticks_ms() + print('[Connecting 4/5] Last receive time set.') + self.log('Registered events: {}\n'.format(list(self._events.keys()))) + print('[Connecting 5/5] Events registered.') + self.call_handler(self._CONNECT) + return True + except BlynkError as b_err: + self.disconnect(b_err) + sleep_ms(self.TASK_PERIOD_RES) + except RedirectError as r_err: + self.disconnect() + self.server = r_err.server + self.port = r_err.port + sleep_ms(self.TASK_PERIOD_RES) + if time.time() >= end_time: + return False + + def disconnect(self, err_msg=None): + self.call_handler(self._DISCONNECT) + if self._socket: + self._socket.close() + self._state = self.DISCONNECTED + if err_msg: + self.log('[ERROR]: {}\nConnection closed'.format(err_msg)) + self._msg_id = 0 + time.sleep(self.RECONNECT_SLEEP) + + def virtual_write(self, v_pin, *val): + return self.send(self.virtual_write_msg(v_pin, *val)) + + def virtual_sync(self, *v_pin): + return self.send(self.virtual_sync_msg(*v_pin)) + + def email(self, to, subject, body): + return self.send(self.email_msg(to, subject, body)) + + def tweet(self, msg): + return self.send(self.tweet_msg(msg)) + + def notify(self, msg): + return self.send(self.notify_msg(msg)) + + def set_property(self, v_pin, property_name, *val): + return self.send(self.set_property_msg(v_pin, property_name, *val)) + + def internal(self, *args): + return self.send(self.internal_msg(*args)) + + def handle_event(blynk, event_name): + class Deco(object): + def __init__(self, func): + self.func = func + # wildcard 'read V*' and 'write V*' events handling + if str(event_name).lower() in (blynk._VPIN_READ_ALL, blynk._VPIN_WRITE_ALL): + event_base_name = str(event_name).split(blynk._VPIN_WILDCARD)[0] + for i in range(blynk.VPIN_MAX_NUM + 1): + blynk._events['{}{}'.format(event_base_name.lower(), i)] = func + else: + blynk._events[str(event_name).lower()] = func + + def __call__(self): + return self.func() + + return Deco + + def call_handler(self, event, *args, **kwargs): + if event in self._events.keys(): + self.log("Event: ['{}'] -> {}".format(event, args)) + self._events[event](*args, **kwargs) + + def process(self, msg_type, msg_id, msg_len, msg_args): + if msg_type == self.MSG_RSP: + self.log('Response status: {}'.format(msg_len)) + elif msg_type == self.MSG_PING: + self.send(self.response_msg(self.STATUS_OK, msg_id=msg_id)) + elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL): + if msg_type == self.MSG_INTERNAL: + self.call_handler("{}{}".format(self._INTERNAL, msg_args[0]), msg_args[1:]) + elif len(msg_args) >= 3 and msg_args[0] == 'vw': + self.call_handler("{}{}".format(self._VPIN_WRITE, msg_args[1]), int(msg_args[1]), msg_args[2:]) + elif len(msg_args) == 2 and msg_args[0] == 'vr': + self.call_handler("{}{}".format(self._VPIN_READ, msg_args[1]), int(msg_args[1])) + + def read_response(self, timeout=0.5): + end_time = time.time() + timeout + while time.time() <= end_time: + rsp_data = self.receive(self.rcv_buffer, self.SOCK_TIMEOUT) + if rsp_data: + self._last_rcv_time = ticks_ms() + msg_type, msg_id, h_data, msg_args = self.parse_response(rsp_data, self.rcv_buffer) + self.process(msg_type, msg_id, h_data, msg_args) + + def run(self): + if not self.connected(): + self.connect() + else: + try: + self.read_response(timeout=self.SOCK_TIMEOUT) + if not self.is_server_alive(): + self.disconnect('Blynk server is offline') + except KeyboardInterrupt: + raise + except BlynkError as b_err: + self.log(b_err) + self.disconnect() + except Exception as g_exc: + self.log(g_exc) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py new file mode 100644 index 0000000000..8fe26ad3f6 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py @@ -0,0 +1,134 @@ +# Copyright (c) 2019-2020 Anton Morozenko +# 宋义深 2021/4/25 Modified +""" +Polling timers for functions. +Registers timers and performs run once or periodical function execution after defined time intervals. +""" +# select.select call used as polling waiter where it is possible +# cause time.sleep sometimes may load CPU up to 100% with small polling wait interval +try: + # cpython + import time + import select + + polling_wait = lambda x: select.select([], [], [], x) + polling_wait(0.01) +except OSError: + # windows case where select.select call fails + polling_wait = lambda x: time.sleep(x) + +except ImportError: + # micropython + import time + + try: + from uselect import select as s_select + + polling_wait = lambda x: s_select([], [], [], x) + except ImportError: + # case when micropython port does not support select.select + polling_wait = lambda x: time.sleep(x) + +WAIT_SEC = 0.05 +MAX_TIMERS = 16 +DEFAULT_INTERVAL = 10 + + +class TimerError(Exception): + pass + + +class Timer(object): + timers = {} + + def __init__(self, no_timers_err=True): + self.no_timers_err = no_timers_err + + def _get_func_name(self, obj): + """retrieves a suitable name for a function""" + if hasattr(obj, 'func'): + # handles nested decorators + return self._get_func_name(obj.func) + # simply returns 'timer' if on port without function attrs + return getattr(obj, '__name__', 'timer') + + def register(blynk, *args, **kwargs): + # kwargs with defaults are used cause PEP 3102 no supported by Python2 + interval = kwargs.pop('interval', DEFAULT_INTERVAL) + run_once = kwargs.pop('run_once', False) + stopped = kwargs.pop('stopped', False) + + class Deco(object): + def __init__(self, func): + self.func = func + if len(list(Timer.timers.keys())) >= MAX_TIMERS: + raise TimerError('Max allowed timers num={}'.format(MAX_TIMERS)) + _timer = _Timer(interval, func, run_once, stopped, *args, **kwargs) + Timer.timers['{}_{}'.format(len(list(Timer.timers.keys())), blynk._get_func_name(func))] = _timer + + def __call__(self, *f_args, **f_kwargs): + return self.func(*f_args, **f_kwargs) + + return Deco + + @staticmethod + def stop(t_id): + timer = Timer.timers.get(t_id, None) + if timer is None: + raise TimerError('Timer id={} not found'.format(t_id)) + Timer.timers[t_id].stopped = True + + @staticmethod + def start(t_id): + timer = Timer.timers.get(t_id, None) + if timer is None: + raise TimerError('Timer id={} not found'.format(t_id)) + Timer.timers[t_id].stopped = False + Timer.timers[t_id].fire_time = None + Timer.timers[t_id].fire_time_prev = None + + @staticmethod + def is_stopped(t_id): + timer = Timer.timers.get(t_id, None) + if timer is None: + raise TimerError('Timer id={} not found'.format(t_id)) + return timer.stopped + + def get_timers(self): + states = {True: 'Stopped', False: 'Running'} + return {k: states[v.stopped] for k, v in self.timers.items()} + + def run(self): + polling_wait(WAIT_SEC) + timers_intervals = [curr_timer.run() for curr_timer in Timer.timers.values() if not curr_timer.stopped] + if not timers_intervals and self.no_timers_err: + raise TimerError('Running timers not found') + return timers_intervals + + +class _Timer(object): + def __init__(self, interval, deco, run_once, stopped, *args, **kwargs): + self.interval = interval + self.deco = deco + self.args = args + self.run_once = run_once + self.kwargs = kwargs + self.fire_time = None + self.fire_time_prev = None + self.stopped = stopped + + def run(self): + timer_real_interval = 0 + if self.fire_time is None: + self.fire_time = time.time() + self.interval + if self.fire_time_prev is None: + self.fire_time_prev = time.time() + curr_time = time.time() + if curr_time >= self.fire_time: + self.deco(*self.args, **self.kwargs) + if self.run_once: + self.stopped = True + timer_real_interval = curr_time - self.fire_time_prev + self.fire_time_prev = self.fire_time + self.fire_time = curr_time + self.interval + return timer_real_interval diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py new file mode 100644 index 0000000000..e7b3087802 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py @@ -0,0 +1,49 @@ +""" +Button + +CircuitPython library for Button - MixGoCE +======================================================= +Small Cabbage +20210721 +dahanzimin +20210423 +""" + +import time +import board +from digitalio import DigitalInOut, Direction, Pull + +class Button(): + + def __init__(self, pin): + self.pin = DigitalInOut(pin) + self.pin.direction = Direction.INPUT + self.pin.pull = Pull.UP + self.flag = True + + def is_pressed(self): + return self.pin.value == False + + def get_presses(self, delay=1): + last_time, presses = time.monotonic(), 0 + while time.monotonic()< last_time + delay: + time.sleep(0.05) + if self.was_pressed(): + presses += 1 + return presses + + def was_pressed(self): + if self.pin.value != self.flag: + self.flag = self.pin.value + time.sleep(0.01) + if self.flag == False: + return True + else: + return False + +button_A1 = Button(board.IO14) +button_A2 = Button(board.IO21) +button_A3 = Button(board.IO36) +button_A4 = Button(board.IO37) +button_B1 = Button(board.IO0) +button_B2 = Button(board.IO35) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py new file mode 100644 index 0000000000..508b9dd7f8 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py @@ -0,0 +1,41 @@ +""" +Infrared Sensor + +CircuitPython library for Infrared Sensor - MixGoCE +======================================================= + +Small Cabbage +20210721 +dahanzimin +20210423 +""" + +from mixgoce import version +import board +from pwmio import PWMOut + +if version:#new + def near(x, val=10000): + from analogio import AnalogIn + + pwm = PWMOut(board.IO39, frequency=50000, duty_cycle=65535) + if x == 'left': + IR=AnalogIn(board.IO3) + reaction = IR.value-10000 #fix + if x == 'right': + IR=AnalogIn(board.IO16) + reaction = IR.value + IR.deinit() + pwm.deinit() + return reaction > val +else:#old + def near(x, val=10000): + from digitalio import DigitalInOut, Direction + + IR = DigitalInOut(board.IO38) + IR.direction = Direction.INPUT + pwm = PWMOut(board.IO39, frequency=53000, duty_cycle=100) + reaction = IR.value + IR.deinit() + pwm.deinit() + return reaction \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py new file mode 100644 index 0000000000..30445e3503 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py @@ -0,0 +1,111 @@ +""" +IR Remote + +CircuitPython library for IR Remote - MixGoCE +======================================================= + +Small Cabbage +20210811 +""" + +import pulseio +import board +import adafruit_irremote + +first_init =True + +def encode2hex(code): + res = "0X" + for c in code: + c = hex(c)[2:] + if len(c) == 1: + c = "0" + c + res = res + c.upper() + return res + +def decode2list(string): + res = [0, 0, 0, 0] + prefix = "0" * (8 - len(string[2:])) + string = prefix + string[2:] + for i in range(4): + res[i] = int(string[2*i:2*(i+1)], 16) + return res + +def ir_receive_hex(pin=board.IO38, flag=False): + global first_init + global decoder + global pulsein + + if first_init : + pulsein = pulseio.PulseIn(pin, maxlen=120, idle_state=True) + decoder = adafruit_irremote.GenericDecode() + first_init=False + + pulses = decoder.read_pulses(pulsein, blocking=False) + if pulses: + try: + # print("Heard", len(pulses), "Pulses:", pulses) + code = decoder.decode_bits(pulses) + res = encode2hex(code) + if flag: + print("Decoded:", res) + # pulsein.deinit() + return res + except adafruit_irremote.IRNECRepeatException: # unusual short code! + print("NEC repeat!") + except adafruit_irremote.IRDecodeException as e: # failed to decode + if flag: + print("Failed to decode: ", e.args) + # except TypeError as e: + # pass + # finally: + # pulsein.deinit() + +def ir_receive(pin=board.IO38,flag=False): + global first_init + global decoder + global pulsein + + if first_init : + pulsein = pulseio.PulseIn(pin, maxlen=120, idle_state=True) + decoder = adafruit_irremote.GenericDecode() + first_init=False + + pulses = decoder.read_pulses(pulsein, blocking=False) + if pulses: + try: + code = decoder.decode_bits(pulses) + if flag: + print("Decoded:", code) + return code + except adafruit_irremote.IRNECRepeatException: # unusual short code! + print("NEC repeat!") + except adafruit_irremote.IRDecodeException as e: # failed to decode + if flag: + print("Failed to decode: ", e.args) + +def ir_send(content=[255, 0, 0, 0], pin=board.IO39): + pulseout = pulseio.PulseOut(pin, frequency=38000, duty_cycle=2 ** 15) + # Create an encoder that will take numbers and turn them into NEC IR pulses + encoder = adafruit_irremote.GenericTransmit( + header=[9500, 4500], one=[550, 550], zero=[550, 1700], trail=550 + ) + encoder.transmit(pulseout, content) + print("IR signal sent!") + pulseout.deinit() + +def ir_send_hex(content="0XFF000000", pin=board.IO39): # [255, 0, 0, 0] + pulseout = pulseio.PulseOut(pin, frequency=38000, duty_cycle=2 ** 15) + # Create an encoder that will take numbers and turn them into NEC IR pulses + encoder = adafruit_irremote.GenericTransmit( + header=[9500, 4500], one=[550, 550], zero=[550, 1700], trail=550 + ) + encoder.transmit(pulseout, decode2list(content)) + print("IR signal sent!") + pulseout.deinit() + + + + + + \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py new file mode 100644 index 0000000000..33d556a90c --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py @@ -0,0 +1,34 @@ +""" +Led + +CircuitPython library for Led - MixGoCE +======================================================= + +Small Cabbage +20210721 +dahanzimin +20210423 +""" +import board +from pwmio import PWMOut + +class Led(object): #fix + def __init__(self, pin): + self.pin = PWMOut(pin, frequency=5000, duty_cycle=65535) + + def setbrightness(self, val): + self.pin.duty_cycle = 65535 - val + + def setonoff(self, val): + if val == 1: + self.pin.duty_cycle = 0 + elif val == 0: + self.pin.duty_cycle = 65535 + else: + self.pin.duty_cycle = 65535 - self.pin.duty_cycle + + def getonoff(self): + return (65535 - self.pin.duty_cycle) // 65535 + +led_L1 = Led(board.IO33) +led_L2 = Led(board.IO34) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py new file mode 100644 index 0000000000..5d641ccbf3 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py @@ -0,0 +1,97 @@ +# SPDX-FileCopyrightText: 2017 Yoch +# +# SPDX-License-Identifier: EPL-1.0 + +""" +`matcher` +==================================================================================== + +MQTT topic filter matcher from the Eclipse Project's Paho.MQTT.Python +https://github.com/eclipse/paho.mqtt.python/blob/master/src/paho/mqtt/matcher.py +* Author(s): Yoch (https://github.com/yoch) +""" + + +class MQTTMatcher: + """Intended to manage topic filters including wildcards. + + Internally, MQTTMatcher use a prefix tree (trie) to store + values associated with filters, and has an iter_match() + method to iterate efficiently over all filters that match + some topic name. + """ + + # pylint: disable=too-few-public-methods + class Node: + """Individual node on the MQTT prefix tree.""" + + __slots__ = "children", "content" + + def __init__(self): + self.children = {} + self.content = None + + def __init__(self): + self._root = self.Node() + + def __setitem__(self, key, value): + """Add a topic filter :key to the prefix tree + and associate it to :value""" + node = self._root + for sym in key.split("/"): + node = node.children.setdefault(sym, self.Node()) + node.content = value + + def __getitem__(self, key): + """Retrieve the value associated with some topic filter :key""" + try: + node = self._root + for sym in key.split("/"): + node = node.children[sym] + if node.content is None: + raise KeyError(key) + return node.content + except KeyError: + raise KeyError(key) from None + + def __delitem__(self, key): + """Delete the value associated with some topic filter :key""" + lst = [] + try: + parent, node = None, self._root + for k in key.split("/"): + parent, node = node, node.children[k] + lst.append((parent, k, node)) + node.content = None + except KeyError: + raise KeyError(key) from None + else: # cleanup + for parent, k, node in reversed(lst): + if node.children or node.content is not None: + break + del parent.children[k] + + def iter_match(self, topic): + """Return an iterator on all values associated with filters + that match the :topic""" + lst = topic.split("/") + normal = not topic.startswith("$") + + def rec(node, i=0): + if i == len(lst): + if node.content is not None: + yield node.content + else: + part = lst[i] + if part in node.children: + for content in rec(node.children[part], i + 1): + yield content + if "+" in node.children and (normal or i > 0): + for content in rec(node.children["+"], i + 1): + yield content + if "#" in node.children and (normal or i > 0): + content = node.children["#"].content + if content is not None: + yield content + + return rec(self._root) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py new file mode 100644 index 0000000000..5ff56ccb3b --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py @@ -0,0 +1,277 @@ +# The MIT License (MIT) +# +# Copyright (c) 2016 Radomir Dopieralski & Tony DiCola 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. + +""" +`adafruit_ht16k33.ht16k33` +=========================== + +* Authors: Radomir Dopieralski & Tony DiCola for Adafruit Industries + +""" +from adafruit_bus_device import i2c_device +from micropython import const + +__version__ = "0.0.0-auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git" + +_HT16K33_BLINK_CMD = const(0x80) +_HT16K33_BLINK_DISPLAYON = const(0x01) +_HT16K33_CMD_BRIGHTNESS = const(0xE0) +_HT16K33_OSCILATOR_ON = const(0x21) + + +class HT16K33: + """ + The base class for all displays. Contains common methods. + + :param int address: The I2C addess of the HT16K33. + :param bool auto_write: True if the display should immediately change when + set. If False, `show` must be called explicitly. + :param float brightness: 0.0 - 1.0 default brightness level. + """ + + def __init__(self, i2c, address=0x70, auto_write=True, brightness=1.0): + self.i2c_device = i2c_device.I2CDevice(i2c, address) + self._temp = bytearray(1) + self._buffer = bytearray(17) + self._auto_write = auto_write + self.fill(0) + self._write_cmd(_HT16K33_OSCILATOR_ON) + self._blink_rate = None + self._brightness = None + self.blink_rate = 0 + self.brightness = brightness + + def _write_cmd(self, byte): + self._temp[0] = byte + with self.i2c_device: + self.i2c_device.write(self._temp) + + @property + def blink_rate(self): + """The blink rate. Range 0-3.""" + return self._blink_rate + + @blink_rate.setter + def blink_rate(self, rate=None): + if not 0 <= rate <= 3: + raise ValueError("Blink rate must be an integer in the range: 0-3") + rate = rate & 0x03 + self._blink_rate = rate + self._write_cmd(_HT16K33_BLINK_CMD | _HT16K33_BLINK_DISPLAYON | rate << 1) + + @property + def brightness(self): + """The brightness. Range 0.0-1.0""" + return self._brightness + + @brightness.setter + def brightness(self, brightness): + if not 0.0 <= brightness <= 1.0: + raise ValueError( + "Brightness must be a decimal number in the range: 0.0-1.0" + ) + + self._brightness = brightness + xbright = round(15 * brightness) + xbright = xbright & 0x0F + self._write_cmd(_HT16K33_CMD_BRIGHTNESS | xbright) + + @property + def auto_write(self): + """Auto write updates to the display.""" + return self._auto_write + + @auto_write.setter + def auto_write(self, auto_write): + if isinstance(auto_write, bool): + self._auto_write = auto_write + else: + raise ValueError("Must set to either True or False.") + + def show(self): + """Refresh the display and show the changes.""" + with self.i2c_device: + # Byte 0 is 0x00, address of LED data register. The remaining 16 + # bytes are the display register data to set. + self.i2c_device.write(self._buffer) + + def fill(self, color): + """Fill the whole display with the given color.""" + fill = 0xFF if color else 0x00 + for i in range(16): + self._buffer[i + 1] = fill + if self._auto_write: + self.show() + + def _pixel(self, x, y, color=None): + addr = 2 * y + x // 8 + mask = 1 << x % 8 + if color is None: + return bool(self._buffer[addr + 1] & mask) + if color: + # set the bit + self._buffer[addr + 1] |= mask + else: + # clear the bit + self._buffer[addr + 1] &= ~mask + if self._auto_write: + self.show() + return None + + def _set_buffer(self, i, value): + self._buffer[i + 1] = value # Offset by 1 to move past register address. + + def _get_buffer(self, i): + return self._buffer[i + 1] # Offset by 1 to move past register address. + +class MatrixBackpack16x8(HT16K33): + """A single matrix.""" + + _columns = 16 + _rows = 8 + + def pixel(self, x, y, color=None): + """Get or set the color of a given pixel.""" + if not 0 <= x <= 15: + return None + if not 0 <= y <= 7: + return None + return super()._pixel(x, y, color) + + def __getitem__(self, key): + x, y = key + return self.pixel(x, y) + + def __setitem__(self, key, value): + x, y = key + self.pixel(x, y, value) + + # pylint: disable=too-many-branches + def shift(self, x, y, rotate=False): + """ + Shift pixels by x and y + + :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False) + """ + auto_write = self.auto_write + self._auto_write = False + if x > 0: # Shift Right + for _ in range(x): + for row in range(0, self.rows): + last_pixel = self[self.columns - 1, row] if rotate else 0 + for col in range(self.columns - 1, 0, -1): + self[col, row] = self[col - 1, row] + self[0, row] = last_pixel + elif x < 0: # Shift Left + for _ in range(-x): + for row in range(0, self.rows): + last_pixel = self[0, row] if rotate else 0 + for col in range(0, self.columns - 1): + self[col, row] = self[col + 1, row] + self[self.columns - 1, row] = last_pixel + if y > 0: # Shift Up + for _ in range(y): + for col in range(0, self.columns): + last_pixel = self[col, self.rows - 1] if rotate else 0 + for row in range(self.rows - 1, 0, -1): + self[col, row] = self[col, row - 1] + self[col, 0] = last_pixel + elif y < 0: # Shift Down + for _ in range(-y): + for col in range(0, self.columns): + last_pixel = self[col, 0] if rotate else 0 + for row in range(0, self.rows - 1): + self[col, row] = self[col, row + 1] + self[col, self.rows - 1] = last_pixel + self._auto_write = auto_write + if auto_write: + self.show() + + # pylint: enable=too-many-branches + + def shift_right(self, rotate=False): + """ + Shift all pixels right + + :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False) + """ + self.shift(1, 0, rotate) + + def shift_left(self, rotate=False): + """ + Shift all pixels left + + :param rotate: (Optional) Rotate the shifted pixels to the right side (default=False) + """ + self.shift(-1, 0, rotate) + + def shift_up(self, rotate=False): + """ + Shift all pixels up + + :param rotate: (Optional) Rotate the shifted pixels to bottom (default=False) + """ + self.shift(0, 1, rotate) + + def shift_down(self, rotate=False): + """ + Shift all pixels down + + :param rotate: (Optional) Rotate the shifted pixels to top (default=False) + """ + self.shift(0, -1, rotate) + + def image(self, img): + """Set buffer to value of Python Imaging Library image. The image should + be in 1 bit mode and a size equal to the display size.""" + imwidth, imheight = img.size + if imwidth != self.columns or imheight != self.rows: + raise ValueError( + "Image must be same dimensions as display ({0}x{1}).".format( + self.columns, self.rows + ) + ) + # Grab all the pixels from the image, faster than getpixel. + pixels = img.convert("1").load() + # Iterate through the pixels + for x in range(self.columns): # yes this double loop is slow, + for y in range(self.rows): # but these displays are small! + self.pixel(x, y, pixels[(x, y)]) + if self._auto_write: + self.show() + + @property + def columns(self): + """Read-only property for number of columns""" + return self._columns + + @property + def rows(self): + """Read-only property for number of rows""" + return self._rows + + + + + + diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py new file mode 100644 index 0000000000..9042c5c814 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py @@ -0,0 +1,85 @@ +# Paste mixgoce.py + +import board +from rtc import RTC +from busio import I2C + +def do_connect(username, password): + import wifi + from time import sleep + + wifi.radio.connect(ssid=username.encode(), password=password.encode()) + while not wifi.radio.ipv4_address: + sleep(0.1) + print("Wi-Fi connected!") + return wifi.radio + +rtc_clock = RTC() + +try: + i2c = I2C(board.IO41, board.IO42,frequency=400000) + while not i2c.try_lock(): + pass + if 0x6a in i2c.scan(): + version = 99 + elif 0x15 in i2c.scan(): + version = 1 + else: + version = 0 + + i2c.unlock() + + if version == 99: + i2c.deinit() + elif version:#new + import mxc6655xa + acc = mxc6655xa.MXC6655XA(i2c) + + def get_temperature(): + return acc.get_temperature() + else:#old + import msa301 + acc = msa301.MSA301(i2c) + +except Exception as e: + print(e) + +ADDITIONAL_TOPIC = 'b640a0ce465fa2a4150c36b305c1c11b' +WILL_TOPIC = '9d634e1a156dc0c1611eb4c3cff57276' + +def ntp(url='http://mixio.mixly.org/time.php'): + import ssl + import wifi + import socketpool + import adafruit_requests + #TEXT_URL = 'http://mixio.mixly.org/time.php' + #TEXT_URL = url + pool = socketpool.SocketPool(wifi.radio) + requests = adafruit_requests.Session(pool, ssl.create_default_context()) + # print("Fetching text from", TEXT_URL) + response = requests.get(url) + # print("-" * 40) + # print(tuple(response.text.split(","))) + # print("-" * 40) + return tuple(response.text.split(",")) + +def analyse_sharekey(url): + import ssl + import wifi + import socketpool + import adafruit_requests + import json + #TEXT_URL = 'http://mixio.mixly.org/time.php' + #TEXT_URL = url + pool = socketpool.SocketPool(wifi.radio) + requests = adafruit_requests.Session(pool, ssl.create_default_context()) + # print("Fetching text from", TEXT_URL) + response = requests.get(url) + # print("-" * 40) + # print(tuple(response.text.split(","))) + # print("-" * 40) + if response.text == '-1': + print('Invalid share key') + else: + result = json.loads(response.text) + return (result['0'], result['1'], result['2']) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py new file mode 100644 index 0000000000..7aa9b9bc38 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py @@ -0,0 +1,84 @@ +#coding=utf-8 +import math + +def math_map(v, al, ah, bl, bh): + if al==ah: + return bl + if al > ah: + al, ah = ah, al + if v > ah: + v = ah + if v < al: + v = al + return bl + (bh - bl) * (v - al) / (ah - al) + +def math_mean(myList): + localList = [e for e in myList if type(e) == int or type(e) == float] + if not localList: return + return float(sum(localList)) / len(localList) + +def math_median(myList): + localList = sorted([e for e in myList if type(e) == int or type(e) == float]) + if not localList: return + if len(localList) % 2 == 0: + return (localList[len(localList) // 2 - 1] + localList[len(localList) // 2]) / 2.0 + else: + return localList[(len(localList) - 1) // 2] + +def math_modes(some_list): + modes = [] + # Using a lists of [item, count] to keep count rather than dict + # to avoid "unhashable" errors when the counted item is itself a list or dict. + counts = [] + maxCount = 1 + for item in some_list: + found = False + for count in counts: + if count[0] == item: + count[1] += 1 + maxCount = max(maxCount, count[1]) + found = True + if not found: + counts.append([item, 1]) + for counted_item, item_count in counts: + if item_count == maxCount: + modes.append(counted_item) + return modes + +def math_standard_deviation(numbers): + n = len(numbers) + if n == 0: return + mean = float(sum(numbers)) / n + variance = sum((x - mean) ** 2 for x in numbers) / n + return math.sqrt(variance) + +def lists_sort(my_list, type, reverse): + def try_float(s): + try: + return float(s) + except: + return 0 + key_funcs = { + "NUMERIC": try_float, + "TEXT": str, + "IGNORE_CASE": lambda s: str(s).lower() + } + key_func = key_funcs[type] + list_cpy = list(my_list) + return sorted(list_cpy, key=key_func, reverse=reverse) + +def format_content(mydict, cid): + if 'lat' in mydict and 'long' in mydict: + res = '{'+'"lat": "{}", "long": "{}", "clientid": "{}"'.format(mydict.pop('lat'),mydict.pop('long'),cid) + if len(mydict)>0: + res += ', "message": [' + for d in mydict: + res += '{{"label": "{}", "value": "{}"}},'.format(d,mydict[d]) + res = res[:-1] + "]" + res += '}' + return res + else: + print('Invalid Input') + +def format_str(d): + return str(d).replace("'",'"') \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py new file mode 100644 index 0000000000..eb46f4862a --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py @@ -0,0 +1,139 @@ +""" +Matrix + +CircuitPython library for Matrix - MixGoCE +======================================================= + +Small Cabbage +20210721 +""" +import time +from mixgoce import i2c +from matrix import MatrixBackpack16x8 +from adafruit_framebuf import FrameBuffer,MVLSB + +buf = bytearray(16) +fb = FrameBuffer(buf, 16, 8, MVLSB) + +class MixGoMatrix(MatrixBackpack16x8): + + def show_dynamic(self, to_show, delay=200): + # self.fill(0) + if type(to_show)==str or type(to_show)==int: + for i in to_show: + fb.fill(0) + fb.text(i, 5, 0, color=1) + # turn all LEDs off + self.fill(0) + for x in range(16): + # using the FrameBuffer text result + bite = buf[x] + for y in range(8): + bit = 1 << y & bite + # if bit > 0 then set the pixel brightness + if bit: + self[x, y] = 1 + self.show() + if len(to_show)>1: + time.sleep(delay/1000) + elif type(to_show)==list or type(to_show)==tuple: + for i in to_show: + #if type(i)!=str and type(i)!=type(Image.HEART): + if type(i)!=str and type(i)!=type(bytearray(16)): + pass + for i in to_show: + self.show_dynamic(i) + time.sleep(delay/1000) + elif type(to_show)==type(bytearray(16)): + buf = to_show + # turn all LEDs off + self.fill(0) + # print(buf) + for x in range(16): + # using the FrameBuffer text result + bite = buf[x] + # print(bite,end=" ") + for y in range(8): + bit = 1 << y & bite + # if bit > 0 then set the pixel brightness + if bit: + self[x, y] = 1 + self.show() + + def scroll(self, text_to_show, delay=0): + for i in range(len(text_to_show) * 6 + 26): + fb.fill(0) + fb.text(text_to_show, -i + 16, 0, color=1) + # turn all LEDs off + self.fill(0) + for x in range(16): + # using the FrameBuffer text result + bite = buf[x] + for y in range(8): + bit = 1 << y & bite + # if bit > 0 then set the pixel brightness + if bit: + self[x, y] = 1 + self.show() + time.sleep(delay/1000) + + def show_static(self, text_to_show): + fb.fill(0) + if len(text_to_show)==2: + l = 3 + elif len(text_to_show)==1: + l = 5 + else: + l = 0 + fb.text(text_to_show, l, 0, color=1) + # turn all LEDs off + self.fill(0) + for x in range(16): + # using the FrameBuffer text result + bite = buf[x] + for y in range(8): + bit = 1 << y & bite + # if bit > 0 then set the pixel brightness + if bit: + self[x, y] = 1 + self.show() + + def set_brightness(self, val): + self.brightness = max(min(val, 1), 0) + + def get_brightness(self): + return self.brightness + + def set_pixel(self, x, y, val): + self[x, y] = val + self.show() + + def get_pixel(self, x, y): + return int(self[x, y]) + + def clear(self): + self.fill(0) + self.show() + + def up(self, times, rotate=False): + for i in range(times): + self.shift_down(rotate) + self.show() + + def down(self, times, rotate=False): + for i in range(times): + self.shift_up(rotate) + self.show() + + def left(self, times, rotate=False): + for i in range(times): + self.shift_left(rotate) + self.show() + + def right(self, times, rotate=False): + for i in range(times): + self.shift_right(rotate) + self.show() + +display = MixGoMatrix(i2c, auto_write=False, brightness=0.1) +display.clear() \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py new file mode 100644 index 0000000000..141f5e15b0 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py @@ -0,0 +1,70 @@ +""" +MSA301 + +CircuitPython library for the MSA301 Accelerometer +======================================================= + +dahanzimin +20210411 +mixly +""" +import time +import adafruit_bus_device.i2c_device as i2c_device +from micropython import const + +MSA301_ADDRESS = const(0x26) + +MSA301_REG_DEVICE_ID = const(0x01) +MSA301_REG_DATA = const(0x02) +MSA301_REG_ODR = const(0x10) +MSA301_REG_POWERMODE = const(0x11) +MSA301_REG_RESRANGE = const(0x0F) + + +_STANDARD_GRAVITY = 9.806 + +class MSA301: + + _BUFFER = bytearray(2) + data_reg = bytearray(6) + + def __init__(self, i2c_bus): + self._device = i2c_device.I2CDevice(i2c_bus, MSA301_ADDRESS) + if self._chip_id() != 0x13: + raise AttributeError("Cannot find a MSA301") + + self._write_u8(MSA301_REG_ODR,0X09) #RATE_500_HZ + self._write_u8(MSA301_REG_POWERMODE,0X12) #NORMAL & WIDTH_250_HZ + self._write_u8(MSA301_REG_RESRANGE,0X02) #RESOLUTION_14_BIT & RANGE_8_G + + def _read_u8(self, address): + # Read an 8-bit unsigned value from the specified 8-bit address. + with self._device: + self._BUFFER[0] = address & 0xFF + self._device.write(self._BUFFER, end=1) + self._device.readinto(self._BUFFER, end=1) + return self._BUFFER[0] + + def _write_u8(self, address, val): + # Write an 8-bit unsigned value to the specified 8-bit address. + with self._device: + self._BUFFER[0] = address & 0xFF + self._BUFFER[1] = val & 0xFF + self._device.write(self._BUFFER, end=2) + + def _chip_id(self): + return self._read_u8(MSA301_REG_DEVICE_ID) + + def u2s(self,n): + return n if n < (1 << 7) else n - (1 << 8) + + @property + def acceleration(self): + for i in range(0,6): + self.data_reg[i]=self._read_u8(MSA301_REG_DATA+i) + x_acc=((self.u2s(self.data_reg[1])<<8|self.data_reg[0])>>2)/1024.0 + y_acc=((self.u2s(self.data_reg[3])<<8|self.data_reg[2])>>2)/1024.0 + z_acc=((self.u2s(self.data_reg[5])<<8|self.data_reg[4])>>2)/1024.0 + return (-y_acc,-x_acc,z_acc) + + diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py new file mode 100644 index 0000000000..fbf7f1a4ea --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py @@ -0,0 +1,102 @@ +""" +Music + +CircuitPython library for Music - MixGoCE +======================================================= + +Small Cabbage +20210721 +""" + + +import time +from mixgoce import version + +class Music: + def __init__(self, pin, duration='4', octave='6', tempo='63'): + import pwmio + self.pin = pin + self.pwm = pwmio.PWMOut(pin, duty_cycle=0, variable_frequency=True) + self.duration = duration + self.octave = octave + self.tempo = tempo + + def set_duration(self, duration='4'): + self.duration = duration + + def set_octave(self, octave='6'): + self.octave = octave + + def sef_tempo(self, tempo='63'): + self.tempo = tempo + + def set_duration_tempo(self, duration, tempo):#这项等于原来的set_tempo + self.duration = duration + self.tempo = tempo + + def reset(self): + self.set_duration() + self.set_octave() + self.set_tempo() + + def get_duration(self): + return self.duration + + def get_octave(self): + return self.octave + + def get_tempo(self): + return (self.tempo) + + def play_demo(self, demo): + import adafruit_rtttl + if self.pwm: + self.pwm.deinit() + adafruit_rtttl.play(self.pin, demo) + + def play_demo_print(self, demo): + import adafruit_rtttl + if self.pwm: + self.pwm.deinit() + adafruit_rtttl.play(self.pin, demo) + _, defaults, tune = demo.lower().split(":") + print(tune) + + def play(self, note, duration=None): + import pwmio + if self.pwm: + self.pwm.deinit() + self.pwm = pwmio.PWMOut(self.pin, duty_cycle=0, variable_frequency=True) + self.pwm.frequency = int(note) + self.pwm.duty_cycle = 2 ** 15 + if duration: + # print(1) + time.sleep(duration/1000) + self.pwm.duty_cycle = 0 + + def stop(self): + self.pwm.duty_cycle = 0 + self.pwm.deinit() + +BA_DING = "itchy:d=4,o=4,b=300:4b5,2g5" +JUMP_UP = "itchy:d=4,o=5,b=300:c,d,e,f,g" +JUMP_DOWN = "itchy:d=4,o=5,b=300:g,f,e,d,c" +POWER_UP = "itchy:d=4,o=4,b=300:4g4,4c5,4e5,2g5,4e5,1g5" +POWER_DOWN = "itchy:d=4,o=4,b=300:4g5,4d#5,4c5,2g4,4b4,1c5" +DADADADUM = "itchy:d=4,o=4,b=200:2p,g,g,g,1d#,p,f,f,f,1d" +#ENTERTAINER = "itchy:d=4,o=4,b=300:4d4,d#4,e4,2c5,4e4,2c5,4e4,1c5,c5,d5,d#5,e5,c5,d5,2e5,b4,2d5,1c5" +BIRTHDAY = "itchy:d=4,o=4,b=180:6c,12c,4d,4c,4f,2e,6c,12c,4d,4c,4g,2f,6c,12c,4c5,4a,4f,4e,4d,6a#,12a#,4a,4f,4g,2f" +#BLUES = "itchy:d=4,o=4,b=400:2c,4e,4g,4a,4a#,4a,4g,4e,2c,4e,4g,4a,4a#,4a,4g,4e,4f,4a,2c,4d,4d#,4d,4c,4a,2c,4e,4g,4a,4a#,4a,4g,4e,4g,4b,4d,4f,4f,4a,4c,4d#,2c,e,g,e,g,f,e,d" +#PYTHON = "itchy:d=4,o=4,b=380:d5,4b4,p,b4,b4,a#4,b4,g5,p,d5,d5,r,b4,c5,p,c5,c5,p,d5,1e5,p,c5,a4,p,a4,a4,g#4,a4,f#5,p,e5,e5,p,c5,b4,p,b4,b4,p,c5,1d5,p,d5,4b4,p,b4,b4,a#4,b4,b5,p,g5,g5,p,d5,c#5,p,a5,a5,p,a5,1a5,p,g5,f#5,p,a5,a5,g#5,a5,e5,p,a5,a5,g#5,a5,d5,p,c#5,d5,p,c#5,2d5,3p" + +import board + +if version:#new + buzzer = Music(board.IO40) +else:#old + from digitalio import DigitalInOut, Direction + + buzzer = Music(board.IO17) + spk_en = DigitalInOut(board.IO40) + spk_en.direction = Direction.OUTPUT + spk_en.value = True \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py new file mode 100644 index 0000000000..0a5c83dbe0 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py @@ -0,0 +1,80 @@ +""" +MXC6655XA + +CircuitPython library for the MXC6655XA Accelerometer +======================================================= + +dahanzimin +20210411 +mixly +""" +import time +import adafruit_bus_device.i2c_device as i2c_device +from micropython import const + +MXC6655XA_ADDRESS = const(0x15) + +MXC6655XA_REG_DATA = const(0x03) +MXC6655XA_REG_CTRL = const(0x0D) +MXC6655XA_REG_DEVICE_ID = const(0x0E) + +MXC6655XA_CMD_8G_POWER_ON = const(0x40) +MXC6655XA_CMD_4G_POWER_ON = const(0x20) +MXC6655XA_CMD_2G_POWER_ON = const(0x00) + +MXC6655XA_2G_SENSITIVITY =1024 +MXC6655XA_4G_SENSITIVITY =512 +MXC6655XA_8G_SENSITIVITY =256 +MXC6655XA_T_ZERO =25 +MXC6655XA_T_SENSITIVITY =0.586 + +class MXC6655XA: + + _BUFFER = bytearray(2) + data_reg = bytearray(7) + + def __init__(self, i2c_bus): + self._device = i2c_device.I2CDevice(i2c_bus, MXC6655XA_ADDRESS) + if self._chip_id() != 0x02: + raise AttributeError("Cannot find a MXC6655XA") + self._Enable() #star + time.sleep(0.3) + self.range = MXC6655XA_8G_SENSITIVITY #SET 8g range + + def _read_u8(self, address): + # Read an 8-bit unsigned value from the specified 8-bit address. + with self._device: + self._BUFFER[0] = address & 0xFF + self._device.write(self._BUFFER, end=1) + self._device.readinto(self._BUFFER, end=1) + return self._BUFFER[0] + + def _write_u8(self, address, val): + # Write an 8-bit unsigned value to the specified 8-bit address. + with self._device: + self._BUFFER[0] = address & 0xFF + self._BUFFER[1] = val & 0xFF + self._device.write(self._BUFFER, end=2) + + def _chip_id(self): + return self._read_u8(MXC6655XA_REG_DEVICE_ID) + + def _Enable(self): + self._write_u8(MXC6655XA_REG_CTRL,MXC6655XA_CMD_8G_POWER_ON) + + def u2s(self,n): + return n if n < (1 << 7) else n - (1 << 8) + + @property + def acceleration(self): + for i in range(0,6): + self.data_reg[i]=self._read_u8(MXC6655XA_REG_DATA+i) + x_acc=float((self.u2s(self.data_reg[0])<<8|self.data_reg[1])>>4)/self.range + y_acc=float((self.u2s(self.data_reg[2])<<8|self.data_reg[3])>>4)/self.range + z_acc=float((self.u2s(self.data_reg[4])<<8|self.data_reg[5])>>4)/self.range + #t_acc=float(self.u2s(self.data_reg[6]))*MXC6655XA_T_SENSITIVITY + MXC6655XA_T_ZERO + return (-y_acc,-x_acc,z_acc) + + def get_temperature(self): + t_acc=float(self.u2s(self._read_u8(MXC6655XA_REG_DATA+6)))*MXC6655XA_T_SENSITIVITY + MXC6655XA_T_ZERO + return round(t_acc,1) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py new file mode 100644 index 0000000000..f51055e510 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py @@ -0,0 +1,71 @@ +""" +RGB + +CircuitPython library for RGB - MixGoCE +======================================================= + +Small Cabbage +20210721 +""" + + +import time +import board +import neopixel + +def wheel(pos): + # Input a value 0 to 255 to get a color value. + # The colours are a transition r - g - b - back to r. + if pos < 0 or pos > 255: + return (0, 0, 0) + if pos < 85: + return (255 - pos * 3, pos * 3, 0) + if pos < 170: + pos -= 85 + return (0, 255 - pos * 3, pos * 3) + pos -= 170 + return (pos * 3, 0, 255 - pos * 3) + + +class RGB(object): + def __init__(self,pin=board.IO8,num=4,flag="RGB"): + self.pin = pin + self.num = num + self.pixels = neopixel.NeoPixel(pin, num, brightness=0.3, auto_write=False, pixel_order = flag) + + def show_all(self, R, G, B): + color = (R, G, B) + self.pixels.fill(color) + + def show_one(self, index, R, G, B): + color = (R, G, B) + self.pixels[index - 1] = color + + def write(self): + self.pixels.show() + + def color_chase(self, R, G, B, wait): + color = (R, G, B) + for i in range(self.num): + self.pixels[i] = color + time.sleep(wait/1000) + self.pixels.show() + + def rainbow_cycle(self, wait): + for j in range(255): + for i in range(self.num): + rc_index = (i * 256 // self.num) + j + self.pixels[i] = wheel(rc_index & 255) + self.pixels.show() + time.sleep(wait/1000/256) + + def change_mod(self,flag): + import time + if flag in ("RGB","GRB"): + self.pixels.deinit() + time.sleep(0.1) + self.pixels = neopixel.NeoPixel(self.pin, self.num, brightness=0.3, auto_write=False, pixel_order = flag) + +rgb = RGB() +rgb.show_all(0,0,0) +rgb.write() \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py new file mode 100644 index 0000000000..56d6465201 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py @@ -0,0 +1,55 @@ +""" +Analog Sensor + +CircuitPython library for Analog Sensor - MixGoCE +======================================================= + +Small Cabbage +20210721 +dahanzimin +20210423 +""" +from mixgoce import version + +class ADCSensor: + import board + __pins=[board.IO13,board.IO15,board.IO16] + __species = {} + __first_init = True + def __new__(cls, pin, *args, **kwargs): + if pin not in cls.__species.keys(): + cls.__first_init = True + cls.__species[pin]=object.__new__(cls) + return cls.__species[pin] + + def __init__(self,pin): + from analogio import AnalogIn + if self.__first_init: + self.__first_init = False + self.pin = AnalogIn(self.__pins[pin]) + + def read(self): + return self.pin.value + +def get_brightness(): + return ADCSensor(1).read() + +def get_soundlevel(): #fix + value_d= [] + for _ in range(5): + values = [] + for _ in range(5): + val = ADCSensor(0).read() + values.append(val) + value_d.append(max(values) - min(values)) + return max(value_d) + + +if version:#new + from mixgoce import acc + def get_temperature(): + return acc.get_temperature() +else:#old + def get_temperature(): + adc_val = ADCSensor(2).read() + return adc_val * 3.9 / 5900 \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py new file mode 100644 index 0000000000..1aa9b78c6b --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py @@ -0,0 +1,25 @@ +""" +TouchPad + +CircuitPython library for TouchPad - MixGoCE +======================================================= + +Small Cabbage +20210721 +dahanzimin +20210423 +""" +import board +from touchio import TouchIn +class TouchPad(): + def __init__(self,pin,v=18000): + self.pin = TouchIn(pin) + self.v = v + + def is_touched(self): + return self.pin.raw_value > self.v + +touch_T1 = TouchPad(board.IO4) +touch_T2 = TouchPad(board.IO5) +touch_T3 = TouchPad(board.IO6) +touch_T4 = TouchPad(board.IO7) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.h b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.h new file mode 100644 index 0000000000..187687c8f5 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.h @@ -0,0 +1,32 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "MixGo CE" +#define MICROPY_HW_MCU_NAME "ESP32S2" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO45) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk new file mode 100644 index 0000000000..c81df98381 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -0,0 +1,24 @@ +USB_VID = 0x239A +USB_PID = 0x80A8 +USB_PRODUCT = "MixGo CE" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s2 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=40m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_MODULE=wroom + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += boards/$(BOARD)/mixgoce_lib + diff --git a/ports/espressif/boards/mixgo_ce_udisk/pins.c b/ports/espressif/boards/mixgo_ce_udisk/pins.c new file mode 100644 index 0000000000..ca4eb12bf7 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/pins.c @@ -0,0 +1,50 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, + + + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/mixgo_ce_udisk/sdkconfig b/ports/espressif/boards/mixgo_ce_udisk/sdkconfig new file mode 100644 index 0000000000..e69de29bb2 From 58646a936e06fecec9f21ba482621bcfaebd8766 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 10 May 2022 14:01:30 -0400 Subject: [PATCH 0262/2403] Correct errno messages --- locale/circuitpython.pot | 12 ++++++++---- py/moduerrno.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 3f8322c8dd..cbaa54b90e 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1749,6 +1749,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1856,6 +1860,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2521,10 +2529,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/py/moduerrno.c b/py/moduerrno.c index 56d903f115..743be0b85d 100644 --- a/py/moduerrno.c +++ b/py/moduerrno.c @@ -140,7 +140,7 @@ const char *mp_common_errno_to_str(mp_obj_t errno_val, char *buf, size_t len) { const compressed_string_t *desc = NULL; switch (MP_OBJ_SMALL_INT_VALUE(errno_val)) { case EPERM: - desc = MP_ERROR_TEXT("Permission denied"); + desc = MP_ERROR_TEXT("Operation not permitted"); break; case ENOENT: desc = MP_ERROR_TEXT("No such file/directory"); @@ -155,7 +155,7 @@ const char *mp_common_errno_to_str(mp_obj_t errno_val, char *buf, size_t len) { desc = MP_ERROR_TEXT("File exists"); break; case ENODEV: - desc = MP_ERROR_TEXT("Unsupported operation"); + desc = MP_ERROR_TEXT("No such device"); break; case EINVAL: desc = MP_ERROR_TEXT("Invalid argument"); From 8d7390992a0518af84b7eeeee70c6ed523f39ce5 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 10 May 2022 12:28:43 -0700 Subject: [PATCH 0263/2403] Fix BLE autoreload The trigger was happening when reload was suspended and therefore ignored. Now, manage reload in one place in the file. This may trigger reloads on BLE command error but that should be rare. Fixes #6258 --- supervisor/shared/bluetooth/file_transfer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c index 6c206f35c0..a6a2f8062a 100644 --- a/supervisor/shared/bluetooth/file_transfer.c +++ b/supervisor/shared/bluetooth/file_transfer.c @@ -325,7 +325,6 @@ STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) { 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); - autoreload_trigger(); return ANY_COMMAND; } @@ -382,7 +381,6 @@ STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) { #endif // Don't reload until everything is written out of the packet buffer. common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer); - autoreload_trigger(); return ANY_COMMAND; } return WRITE_DATA; @@ -463,7 +461,6 @@ STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) { if (result == FR_OK) { // Don't reload until everything is written out of the packet buffer. common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer); - autoreload_trigger(); } return ANY_COMMAND; } @@ -517,7 +514,6 @@ STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) { if (result == FR_OK) { // Don't reload until everything is written out of the packet buffer. common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer); - autoreload_trigger(); } return ANY_COMMAND; } @@ -664,7 +660,6 @@ STATIC uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) { if (result == FR_OK) { // Don't reload until everything is written out of the packet buffer. common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer); - autoreload_trigger(); } return ANY_COMMAND; } @@ -740,6 +735,14 @@ void supervisor_bluetooth_file_transfer_background(void) { } if (next_command == ANY_COMMAND) { autoreload_resume(AUTORELOAD_SUSPEND_BLE); + // Trigger a reload if the command may have mutated the file system. + if (current_state == WRITE || + current_state == WRITE_DATA || + current_state == DELETE || + current_state == MKDIR || + current_state == MOVE) { + autoreload_trigger(); + } } } running = false; From 8ed10faf1a63fa2911ccf4ea94da7e410a0ffb07 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Tue, 10 May 2022 21:51:09 +0200 Subject: [PATCH 0264/2403] 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 | 15 +++++++++++---- locale/cs.po | 12 ++++++++---- locale/de_DE.po | 15 +++++++++++---- locale/el.po | 12 ++++++++---- locale/en_GB.po | 15 +++++++++++---- locale/es.po | 15 +++++++++++---- locale/fil.po | 15 +++++++++++---- locale/fr.po | 15 +++++++++++---- locale/hi.po | 12 ++++++++---- locale/it_IT.po | 15 +++++++++++---- locale/ja.po | 15 +++++++++++---- locale/ko.po | 12 ++++++++---- locale/nl.po | 15 +++++++++++---- locale/pl.po | 15 +++++++++++---- locale/pt_BR.po | 15 +++++++++++---- locale/ru.po | 12 ++++++++---- locale/sv.po | 15 +++++++++++---- locale/tr.po | 12 ++++++++---- locale/zh_Latn_pinyin.po | 15 +++++++++++---- 19 files changed, 191 insertions(+), 76 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index b3dd782f1e..da7bbd0915 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1768,6 +1768,10 @@ msgstr "Tidak ada pull-down pada pin; 1Mohm direkomendasikan" msgid "No space left on device" msgstr "Tidak ada ruang yang tersisa di perangkat" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Tidak ada file/direktori" @@ -1880,6 +1884,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2556,10 +2564,6 @@ msgstr "Tipe bus tampilan tidak didukung" msgid "Unsupported format" msgstr "Format tidak didukung" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Operasi yang tidak didukung" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -4676,6 +4680,9 @@ msgstr "zi harus berjenis float" msgid "zi must be of shape (n_section, 2)" msgstr "Zi harus berbentuk (n_section, 2)" +#~ msgid "Unsupported operation" +#~ msgstr "Operasi yang tidak didukung" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/cs.po b/locale/cs.po index f87816126a..22f48b15a6 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1756,6 +1756,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1863,6 +1867,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2530,10 +2538,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 029827eea2..6c52a0e8f6 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1776,6 +1776,10 @@ msgstr "Kein Pulldown-Widerstand am Pin; 1 MOhm wird vorgeschlagen" msgid "No space left on device" msgstr "Kein Speicherplatz mehr verfügbar auf dem Gerät" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Keine solche Datei/Verzeichnis" @@ -1889,6 +1893,10 @@ msgstr "Nur eine alarm-time kann gesetzt werden." msgid "Only one color can be transparent at a time" msgstr "Nur eine Farbe kann transparent sein zu einer Zeit" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "Vorgang oder Funktion wird nicht unterstützt" @@ -2577,10 +2585,6 @@ msgstr "Nicht unterstützter display bus type" msgid "Unsupported format" msgstr "Nicht unterstütztes Format" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Nicht unterstützte Operation" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "Update fehlgeschlagen" @@ -4738,6 +4742,9 @@ msgstr "zi muss eine Gleitkommazahl sein" msgid "zi must be of shape (n_section, 2)" msgstr "zi muss die Form (n_section, 2) haben" +#~ msgid "Unsupported operation" +#~ msgstr "Nicht unterstützte Operation" + #~ msgid "divisor must be 4" #~ msgstr "Teiler muss 4 sein" diff --git a/locale/el.po b/locale/el.po index 2685481acc..4ecf46679d 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1749,6 +1749,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1856,6 +1860,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2521,10 +2529,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 902fe0fc03..de542c4b92 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1762,6 +1762,10 @@ msgstr "No pulldown on pin; 1Mohm recommended" msgid "No space left on device" msgstr "No space left on device" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "No such file/directory" @@ -1873,6 +1877,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "Operation or feature not supported" @@ -2552,10 +2560,6 @@ msgstr "Unsupported display bus type" msgid "Unsupported format" msgstr "Unsupported format" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Unsupported operation" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "Update failed" @@ -4677,6 +4681,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 "Unsupported operation" +#~ msgstr "Unsupported operation" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/es.po b/locale/es.po index eeffad5f55..72cedf0de4 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1784,6 +1784,10 @@ msgstr "No hay pulldown en el pin; 1Mohm recomendado" msgid "No space left on device" msgstr "No queda espacio en el dispositivo" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "No existe el archivo/directorio" @@ -1897,6 +1901,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "Operación no característica no soportada" @@ -2583,10 +2591,6 @@ msgstr "Sin capacidad de bus tipo display" msgid "Unsupported format" msgstr "Formato no soportado" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Operación no soportada" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "La actualización fallo" @@ -4724,6 +4728,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 "Unsupported operation" +#~ msgstr "Operación no soportada" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/fil.po b/locale/fil.po index eb24473bcb..b40891ffbb 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1764,6 +1764,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Walang file/directory" @@ -1874,6 +1878,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2543,10 +2551,6 @@ msgstr "Hindi supportadong tipo ng bitmap" msgid "Unsupported format" msgstr "Hindi supportadong format" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Hindi sinusuportahang operasyon" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -4687,6 +4691,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "Unsupported operation" +#~ msgstr "Hindi sinusuportahang operasyon" + #~ msgid "Brightness must be between 0 and 255" #~ msgstr "Ang liwanag ay dapat sa gitna ng 0 o 255" diff --git a/locale/fr.po b/locale/fr.po index d8b286ade6..ffe3184243 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1795,6 +1795,10 @@ msgstr "Pas de pulldown sur la broche ; 1Mohm recommandé" msgid "No space left on device" msgstr "Aucun espace libre sur le dispositif" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Fichier/répertoire introuvable" @@ -1908,6 +1912,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "Opération ou fonction non supportée" @@ -2600,10 +2608,6 @@ msgstr "Type de bus d'affichage non supporté" msgid "Unsupported format" msgstr "Format non supporté" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Opération non supportée" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "Mise-à-jour échouée" @@ -4755,6 +4759,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 "Unsupported operation" +#~ msgstr "Opération non supportée" + #~ msgid "divisor must be 4" #~ msgstr "le diviseur doit être 4" diff --git a/locale/hi.po b/locale/hi.po index dfb8add290..6a4b71b40d 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1749,6 +1749,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1856,6 +1860,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2521,10 +2529,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index e14619c464..16c8264ecc 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1773,6 +1773,10 @@ msgstr "" msgid "No space left on device" msgstr "Non che spazio sul dispositivo" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Nessun file/directory esistente" @@ -1884,6 +1888,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2560,10 +2568,6 @@ msgstr "tipo di bitmap non supportato" msgid "Unsupported format" msgstr "Formato non supportato" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Operazione non supportata" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -4707,6 +4711,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "Unsupported operation" +#~ msgstr "Operazione non supportata" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/ja.po b/locale/ja.po index 808bea05c3..8ff4dd0907 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1760,6 +1760,10 @@ msgstr "ピンにプルダウンがありません。1Mオーム推奨" msgid "No space left on device" msgstr "デバイスに空き容量が残っていません" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "指定されたファイル/ディレクトリはありません" @@ -1869,6 +1873,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2536,10 +2544,6 @@ msgstr "" msgid "Unsupported format" msgstr "非対応の形式" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "非対応の操作" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -4663,6 +4667,9 @@ msgstr "ziはfloat値でなければなりません" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "Unsupported operation" +#~ msgstr "非対応の操作" + #~ msgid "Brightness must be between 0 and 255" #~ msgstr "Brightnessは0から255の間でなければなりません" diff --git a/locale/ko.po b/locale/ko.po index 5f556fee31..d02997cd6b 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1752,6 +1752,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1859,6 +1863,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2525,10 +2533,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 3de959fa49..fc71d36d20 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1761,6 +1761,10 @@ msgstr "Geen pulldown op pin; 1MOhm aangeraden" msgid "No space left on device" msgstr "Geen ruimte meer beschikbaar op apparaat" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Bestand/map bestaat niet" @@ -1874,6 +1878,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2549,10 +2557,6 @@ msgstr "Niet-ondersteund beeldscherm bus type" msgid "Unsupported format" msgstr "Niet-ondersteunde format" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Niet-ondersteunde operatie" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "Update Mislukt" @@ -4683,6 +4687,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 "Unsupported operation" +#~ msgstr "Niet-ondersteunde operatie" + #~ msgid "Brightness must be between 0 and 255" #~ msgstr "Helderheid moet tussen de 0 en 255 liggen" diff --git a/locale/pl.po b/locale/pl.po index f1cf6f9604..d0b725ade5 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1760,6 +1760,10 @@ msgstr "" msgid "No space left on device" msgstr "Brak miejsca" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Brak pliku/katalogu" @@ -1867,6 +1871,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "W danym momencie przezroczysty może być tylko jeden kolor" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2532,10 +2540,6 @@ msgstr "Zły typ magistrali wyświetlaczy" msgid "Unsupported format" msgstr "Zły format" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Zła operacja" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -4654,6 +4658,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "Unsupported operation" +#~ msgstr "Zła operacja" + #~ msgid "Brightness must be between 0 and 255" #~ msgstr "Jasność musi być pomiędzy 0 a 255" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 43ad72c6c0..06e8f706c4 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1790,6 +1790,10 @@ msgstr "Não há pulldown no pino; É recomendável utilizar um resistor de 1M o msgid "No space left on device" msgstr "Não resta espaço no dispositivo" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Este arquivo/diretório não existe" @@ -1902,6 +1906,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "A operação ou o recurso não é suportado" @@ -2596,10 +2604,6 @@ msgstr "Não há suporte para o tipo do display bus" msgid "Unsupported format" msgstr "Formato não suportado" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Operação não suportada" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "A atualização falou" @@ -4748,6 +4752,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 "Unsupported operation" +#~ msgstr "Operação não suportada" + #~ msgid "divisor must be 4" #~ msgstr "o divisor deve ser 4" diff --git a/locale/ru.po b/locale/ru.po index 95afcbcd8d..5c426cecf3 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1787,6 +1787,10 @@ msgstr "Отсутствует подтяжка к земле на пине; Р msgid "No space left on device" msgstr "На устройстве не осталось свободного места" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Файл/директория не существует" @@ -1898,6 +1902,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2570,10 +2578,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index 5ee114c3c0..33c18e3b31 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1771,6 +1771,10 @@ msgstr "Ingen pulldown på pinnen; 1Mohm rekommenderas" msgid "No space left on device" msgstr "Inget utrymme kvar på enheten" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Ingen sådan fil/katalog" @@ -1883,6 +1887,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "Operation eller funktion stöds inte" @@ -2567,10 +2575,6 @@ msgstr "Busstyp för display stöds inte" msgid "Unsupported format" msgstr "Formatet stöds inte" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Åtgärd som inte stöds" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "Uppdateringen misslyckades" @@ -4705,6 +4709,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 "Unsupported operation" +#~ msgstr "Åtgärd som inte stöds" + #~ msgid "divisor must be 4" #~ msgstr "divisor måste vara 4" diff --git a/locale/tr.po b/locale/tr.po index ab5c85bab4..ecaf732da0 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1766,6 +1766,10 @@ msgstr "" msgid "No space left on device" msgstr "" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "" @@ -1873,6 +1877,10 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" @@ -2541,10 +2549,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index c4218c29e4..63c27e3a1f 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -1784,6 +1784,10 @@ msgstr "Yǐn jiǎo shàng méiyǒu xiàlā; 1Mohm tuījiàn" msgid "No space left on device" msgstr "Shèbèi shàng méiyǒu kònggé" +#: py/moduerrno.c +msgid "No such device" +msgstr "" + #: py/moduerrno.c msgid "No such file/directory" msgstr "Méiyǒu cǐ lèi wénjiàn/mùlù" @@ -1896,6 +1900,10 @@ 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" +#: py/moduerrno.c +msgid "Operation not permitted" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "bù zhī chí cāo zuò huò gōng néng" @@ -2578,10 +2586,6 @@ msgstr "Bù zhīchí de gōnggòng qìchē lèixíng" msgid "Unsupported format" msgstr "Bù zhīchí de géshì" -#: py/moduerrno.c -msgid "Unsupported operation" -msgstr "Bù zhīchí de cāozuò" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "gēng xīn shī bài" @@ -4717,6 +4721,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 "Unsupported operation" +#~ msgstr "Bù zhīchí de cāozuò" + #~ msgid "divisor must be 4" #~ msgstr "èr chóng zòu bì xū shì 4" From e7735a363150142c2dd530063f115d140a3126c7 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Thu, 28 Apr 2022 13:41:34 +0200 Subject: [PATCH 0265/2403] Add new board pewpew_lcd --- .gitmodules | 3 + frozen/pew-pewpew-lcd | 1 + ports/atmel-samd/boards/pewpew_lcd/board.c | 104 ++++++++++++++++++ .../boards/pewpew_lcd/mpconfigboard.h | 16 +++ .../boards/pewpew_lcd/mpconfigboard.mk | 57 ++++++++++ ports/atmel-samd/boards/pewpew_lcd/pins.c | 28 +++++ 6 files changed, 209 insertions(+) create mode 160000 frozen/pew-pewpew-lcd create mode 100644 ports/atmel-samd/boards/pewpew_lcd/board.c create mode 100644 ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.h create mode 100644 ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk create mode 100644 ports/atmel-samd/boards/pewpew_lcd/pins.c diff --git a/.gitmodules b/.gitmodules index 9a10cc21e2..93eed8c4c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -286,3 +286,6 @@ [submodule "frozen/Adafruit_CircuitPython_FakeRequests"] path = frozen/Adafruit_CircuitPython_FakeRequests url = https://github.com/adafruit/Adafruit_CircuitPython_FakeRequests.git +[submodule "frozen/pew-pewpew-lcd"] + path = frozen/pew-pewpew-lcd + url = https://github.com/pypewpew/pew-pewpew-lcd.git diff --git a/frozen/pew-pewpew-lcd b/frozen/pew-pewpew-lcd new file mode 160000 index 0000000000..837f3e5f16 --- /dev/null +++ b/frozen/pew-pewpew-lcd @@ -0,0 +1 @@ +Subproject commit 837f3e5f16accae5b3677954921b5ddd517f0799 diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c new file mode 100644 index 0000000000..8198a3c83d --- /dev/null +++ b/ports/atmel-samd/boards/pewpew_lcd/board.c @@ -0,0 +1,104 @@ +/* + * 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 "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" + +displayio_fourwire_obj_t board_display_obj; + +#define DELAY 0x80 + +uint8_t display_init_sequence[] = { + 0xe2, 0, // reset + 0x2f, 0, // power on + 0x80, 0, // contrast 0 + 0xa4, 0, // display normal + 0xaf, 0, // display on + 0x40, 0, // start line 0 +}; + +void board_init(void) { + busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus; + common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, false); + 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, + NULL, // Command or data + &pin_PA19, // Chip select + &pin_PA18, // Reset + 40000000LL, // 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, + 96, // Width + 68, // Height + 0, // column start + 0, // row start + 180, // 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 + false, // reverse_pixels_in_word + 0, // Set column command + 0, // Set row command + 0, // Write memory command + display_init_sequence, + sizeof(display_init_sequence), + NULL, // &pin_PA17, // brightness pin + NO_BRIGHTNESS_COMMAND, + 0.0f, // brightness + false, // auto_brightness + false, // single_byte_bounds + true, // data as commands + true, // auto_refresh + 2, // native_frames_per_second + true, // backlight_on_high + true); // SH1107_addressing +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.h b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.h new file mode 100644 index 0000000000..4123e7a135 --- /dev/null +++ b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.h @@ -0,0 +1,16 @@ +#define MICROPY_HW_BOARD_NAME "PewPew LCD" +#define MICROPY_HW_MCU_NAME "samd21e18" + +#define MICROPY_PORT_A (0) +#define MICROPY_PORT_B (0) +#define MICROPY_PORT_C (0) + +#define CIRCUITPY_INTERNAL_NVM_SIZE 0 +#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (48 * 1024) + +// USB is always used internally so skip the pin objects for it. +#define IGNORE_PIN_PA24 1 +#define IGNORE_PIN_PA25 1 + +#define SAMD21_BOD33_LEVEL (6) +#define CIRCUITPY_REPL_LOGO (0) diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk new file mode 100644 index 0000000000..2bf4992e25 --- /dev/null +++ b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk @@ -0,0 +1,57 @@ +USB_VID = 0x1209 +USB_PID = 0xD1B5 +USB_PRODUCT = "PewPew LCD" +USB_MANUFACTURER = "Radomir Dopieralski" + +CHIP_VARIANT = SAMD21E18A +CHIP_FAMILY = samd21 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = NONE + +CIRCUITPY_FULL_BUILD = 0 + +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_TOUCHIO = 1 +CIRCUITPY_PWMIO = 1 +CIRCUITPY_MATH = 0 + +CIRCUITPY_ANALOGIO = 0 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOBUSIO_I2SOUT = 0 +CIRCUITPY_AUDIOCORE = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMIXER = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_AUDIOPWMIO = 0 +CIRCUITPY_BITBANG_APA102 = 0 +CIRCUITPY_BITBANGIO = 0 +CIRCUITPY_BITBANGIO = 0 +CIRCUITPY_BITMAPTOOLS = 0 +CIRCUITPY_BITMAPTOOLS = 0 +CIRCUITPY_BLEIO = 0 +CIRCUITPY_BUSDEVICE = 0 +CIRCUITPY_FRAMEBUFFERIO = 0 +CIRCUITPY_FREQUENCYIO = 0 +CIRCUITPY_I2CPERIPHERAL = 0 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_NEOPIXEL_WRITE = 0 +CIRCUITPY_NVM = 0 +CIRCUITPY_PIXELBUF = 0 +CIRCUITPY_PS2IO = 0 +CIRCUITPY_PULSEIO = 0 +CIRCUITPY_RGBMATRIX = 0 +CIRCUITPY_ROTARYIO = 0 +CIRCUITPY_ROTARYIO = 0 +CIRCUITPY_RTC = 0 +CIRCUITPY_SAMD = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_USB_HID = 0 +CIRCUITPY_USB_MIDI = 0 +CIRCUITPY_USB_VENDOR = 0 +CIRCUITPY_VECTORIO = 0 +CIRCUITPY_RAINBOWIO = 0 + +CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf +OPTIMIZATION_FLAGS = -Os +FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-lcd diff --git a/ports/atmel-samd/boards/pewpew_lcd/pins.c b/ports/atmel-samd/boards/pewpew_lcd/pins.c new file mode 100644 index 0000000000..13bcf06f4e --- /dev/null +++ b/ports/atmel-samd/boards/pewpew_lcd/pins.c @@ -0,0 +1,28 @@ +#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__SCK), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR__MOSI), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR__CS), MP_ROM_PTR(&pin_PA19) }, + { MP_ROM_QSTR(MP_QSTR__RST), MP_ROM_PTR(&pin_PA18) }, + { MP_ROM_QSTR(MP_QSTR__BL), MP_ROM_PTR(&pin_PA17) }, + + { MP_ROM_QSTR(MP_QSTR__UP), MP_ROM_PTR(&pin_PA03) }, + { MP_ROM_QSTR(MP_QSTR__DOWN), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR__LEFT), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR__RIGHT), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR__O), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR__X), MP_ROM_PTR(&pin_PA07) }, + + { MP_ROM_QSTR(MP_QSTR_P1), MP_ROM_PTR(&pin_PA30) }, + { MP_ROM_QSTR(MP_QSTR_P2), MP_ROM_PTR(&pin_PA31) }, + { MP_ROM_QSTR(MP_QSTR_P3), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_P4), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_P5), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_P6), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_P7), MP_ROM_PTR(&pin_PA14) }, + + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)} +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From 88c331d7495a4ddaf7d9fda3814d96dfe114e771 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Tue, 10 May 2022 21:28:15 +0000 Subject: [PATCH 0266/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1058 of 1058 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 06e8f706c4..06287c37ed 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: 2022-05-08 16:37+0000\n" +"PO-Revision-Date: 2022-05-10 23:52+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -1792,7 +1792,7 @@ msgstr "Não resta espaço no dispositivo" #: py/moduerrno.c msgid "No such device" -msgstr "" +msgstr "Não existe tal dispositivo" #: py/moduerrno.c msgid "No such file/directory" @@ -1908,7 +1908,7 @@ msgstr "Apenas uma cor pode ser transparente de cada vez" #: py/moduerrno.c msgid "Operation not permitted" -msgstr "" +msgstr "A operação não é permitida" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" From 720d1c86f98a00ce67ff1c26461a362da859bf89 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Tue, 10 May 2022 20:44:38 +0000 Subject: [PATCH 0267/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1058 of 1058 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 33c18e3b31..23d29a3b90 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: 2022-05-10 08:16+0000\n" +"PO-Revision-Date: 2022-05-10 23:52+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -1773,7 +1773,7 @@ msgstr "Inget utrymme kvar på enheten" #: py/moduerrno.c msgid "No such device" -msgstr "" +msgstr "Ingen sådan enhet" #: py/moduerrno.c msgid "No such file/directory" @@ -1889,7 +1889,7 @@ msgstr "Bara en färg kan vara genomskinlig i taget" #: py/moduerrno.c msgid "Operation not permitted" -msgstr "" +msgstr "Åtgärden inte tillåten" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" From 142ed2a0242daa6ece7f8e84226d3d5501920ad5 Mon Sep 17 00:00:00 2001 From: Kong Wai Weng Date: Wed, 11 May 2022 15:18:31 +0800 Subject: [PATCH 0268/2403] Added Maker Feather AIoT S3. --- .../cytron_maker_feather_aiot_s3/board.c | 49 ++++++++++ .../mpconfigboard.h | 45 ++++++++++ .../mpconfigboard.mk | 20 +++++ .../cytron_maker_feather_aiot_s3/pins.c | 90 +++++++++++++++++++ .../cytron_maker_feather_aiot_s3/sdkconfig | 34 +++++++ 5 files changed, 238 insertions(+) create mode 100644 ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c create mode 100644 ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h create mode 100644 ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk create mode 100644 ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c create mode 100644 ports/espressif/boards/cytron_maker_feather_aiot_s3/sdkconfig diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c new file mode 100644 index 0000000000..af35cbbe2d --- /dev/null +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "components/driver/include/driver/gpio.h" +#include "components/hal/include/hal/gpio_hal.h" +#include "common-hal/microcontroller/Pin.h" + +void board_init(void) { + reset_board(); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + // Turn on VP by default. + gpio_set_direction(38, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(38, true); +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h new file mode 100644 index 0000000000..478a06c70a --- /dev/null +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h @@ -0,0 +1,45 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Cytron Maker Feather AIoT S3" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO46) +#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO13) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO42) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO6) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO10) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO5) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO11) +#define DEFAULT_UART_BUS_TX (&pin_GPIO4) + +#define DOUBLE_TAP_PIN (&pin_GPIO17) diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk new file mode 100644 index 0000000000..4a444b3d64 --- /dev/null +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk @@ -0,0 +1,20 @@ +USB_VID = 0x303A +USB_PID = 0x80F9 +USB_PRODUCT = "Cytron Maker Feather AIoT S3" +USB_MANUFACTURER = "Cytron" + +IDF_TARGET = esp32s3 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=8MB + +# Include these Python libraries in firmware. +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel \ No newline at end of file diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c new file mode 100644 index 0000000000..92e8e7cfc1 --- /dev/null +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c @@ -0,0 +1,90 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, + + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) }, + + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) }, + + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_VIN), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_VBATT), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, + + { MP_ROM_QSTR(MP_QSTR_VP_EN), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) }, + + { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) }, + + { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) }, + + { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) }, + + { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) }, + + { MP_ROM_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO45) }, + + { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO46) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO46) }, + { MP_ROM_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO46) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/sdkconfig b/ports/espressif/boards/cytron_maker_feather_aiot_s3/sdkconfig new file mode 100644 index 0000000000..f508f4a67c --- /dev/null +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/sdkconfig @@ -0,0 +1,34 @@ +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +# +# SPI RAM config +# +# CONFIG_SPIRAM_MODE_QUAD is not set +CONFIG_SPIRAM_MODE_OCT=y +# CONFIG_SPIRAM_TYPE_AUTO is not set +CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config + +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +# +# PSRAM Clock and CS IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM Clock and CS IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +CONFIG_SPIRAM_USE_MEMMAP=y +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP From 466f2a3644d01fabc85c3454465a72ad293b8b25 Mon Sep 17 00:00:00 2001 From: Kong Wai Weng Date: Wed, 11 May 2022 15:25:32 +0800 Subject: [PATCH 0269/2403] Updated copyright information. --- ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c index af35cbbe2d..5c71b80fc0 100644 --- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * Copyright (c) 2022 Wai Weng for Cytron Technologies * * 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 b9c28742beb6f2d3a1f1df5a171474baf1eff023 Mon Sep 17 00:00:00 2001 From: Kong Wai Weng Date: Wed, 11 May 2022 15:30:45 +0800 Subject: [PATCH 0270/2403] Added newline at the end of the file. --- .../boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk index 4a444b3d64..7a7a032e2c 100644 --- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk @@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_FREQ=80m CIRCUITPY_ESP_FLASH_SIZE=8MB # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel \ No newline at end of file +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel From e08502fa857d49ac4a55774a6c93367cac9b772d Mon Sep 17 00:00:00 2001 From: Neradoc Date: Sun, 17 Apr 2022 02:04:03 +0200 Subject: [PATCH 0271/2403] list frozen modules in the support matrix - fix the list of frozen modules in the board info, separate it from the builtin modules - frozen modules are listed along with the link to their repository - get the repository by running the git command in the frozen directory - frozen modules are listed at the end - they copy the style of the other modules - frozen modules in build_board_info don't need the URLs, they are filtered out --- conf.py | 8 +++-- docs/shared_bindings_matrix.py | 52 +++++++++++++++++++++++++++--- docs/static/filter.css | 17 ++++++++-- docs/static/filter.js | 4 +-- shared-bindings/support_matrix.rst | 12 +++++-- tools/build_board_info.py | 26 ++++++--------- 6 files changed, 90 insertions(+), 29 deletions(-) diff --git a/conf.py b/conf.py index df468d3d0e..c92e8bb719 100644 --- a/conf.py +++ b/conf.py @@ -53,9 +53,13 @@ subprocess.check_output(["make", "stubs"]) modules_support_matrix = shared_bindings_matrix.support_matrix_by_board() modules_support_matrix_reverse = defaultdict(list) for board, modules in modules_support_matrix.items(): - for module in modules: + for module in modules[0]: modules_support_matrix_reverse[module].append(board) -modules_support_matrix_reverse = dict((module, sorted(boards)) for module, boards in modules_support_matrix_reverse.items()) + +modules_support_matrix_reverse = dict( + (module, sorted(boards)) + for module, boards in modules_support_matrix_reverse.items() +) html_context = { 'support_matrix': modules_support_matrix, diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index 44554e1ad7..6f35e67f21 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -62,9 +62,14 @@ additional_modules = { "fontio": "CIRCUITPY_DISPLAYIO", "terminalio": "CIRCUITPY_DISPLAYIO", "adafruit_bus_device": "CIRCUITPY_BUSDEVICE", - "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF" + "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF", + "usb": "CIRCUITPY_USB_HOST", } +frozen_excludes = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"] +"""Files and dirs at the root of a frozen directory that should be ignored. +This is the same list as in the preprocess_frozen_modules script.""" + def get_circuitpython_root_dir(): """ The path to the root './circuitpython' directory """ @@ -162,6 +167,40 @@ def get_settings_from_makefile(port_dir, board_name): return settings +def get_repository_url(directory): + contents = subprocess.run( + ["git", "remote", "get-url", "origin"], + encoding="utf-8", + errors="replace", + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=directory + ) + return contents.stdout.strip() + +def frozen_modules_from_dirs(frozen_mpy_dirs): + """ + Go through the list of frozen directories and extract the python modules. + Paths are of the type: + $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground + $(TOP)/frozen/circuitpython-stage/meowbit + Python modules are at the root of the path, and are python files or directories + containing python files. Except the ones in the frozen_excludes list. + """ + frozen_modules = [] + for frozen_path in filter(lambda x: x, frozen_mpy_dirs.split(" ")): + source_dir = get_circuitpython_root_dir() / frozen_path[7:] + url_repository = get_repository_url(source_dir) + for sub in source_dir.glob("*"): + if sub.name in frozen_excludes: + continue + if sub.name.endswith(".py"): + frozen_modules.append((sub.name[:-3], url_repository)) + continue + if next(sub.glob("**/*.py"), None): # tests if not empty + frozen_modules.append((sub.name, url_repository)) + return frozen_modules + def lookup_setting(settings, key, default=''): while True: value = settings.get(key, default) @@ -207,8 +246,14 @@ def support_matrix_by_board(use_branded_name=True): board_modules.append(base[module]['name']) board_modules.sort() + frozen_modules = [] + if "FROZEN_MPY_DIRS" in settings: + frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"]) + if frozen_modules: + frozen_modules.sort() + # generate alias boards too - board_matrix = [(board_name, board_modules)] + board_matrix = [(board_name, (board_modules, frozen_modules))] if entry.name in aliases_by_board: for alias in aliases_by_board[entry.name]: if use_branded_name: @@ -216,7 +261,7 @@ def support_matrix_by_board(use_branded_name=True): alias = aliases_brand_names[alias] else: alias = alias.replace("_"," ").title() - board_matrix.append( (alias, board_modules) ) + board_matrix.append( (alias, (board_modules, frozen_modules)) ) return board_matrix # this is now a list of (board,modules) @@ -225,7 +270,6 @@ def support_matrix_by_board(use_branded_name=True): # flatmap with comprehensions boards = dict(sorted([board for matrix in mapped_exec for board in matrix])) - # print(json.dumps(boards, indent=2)) return boards if __name__ == '__main__': diff --git a/docs/static/filter.css b/docs/static/filter.css index 12efe14a40..7de9641d34 100644 --- a/docs/static/filter.css +++ b/docs/static/filter.css @@ -7,8 +7,21 @@ right: 10px; top: 4px; } -.support-matrix-table .this_module code, -.support-matrix-table .this_module span { + +.support-matrix-table .reference.external { + box-sizing: border-box; + font-weight: 700; + color: #404050; + font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, monospace; + padding: 2px 5px; + background: white; + border: 1px solid #e1e4e5; + font-size: 75%; +} + +.support-matrix-table .this_module, +.support-matrix-table .this_module.reference.external, +.support-matrix-table .this_module * { background: black; color: white; } diff --git a/docs/static/filter.js b/docs/static/filter.js index 9dc46a9eed..034c9cb463 100644 --- a/docs/static/filter.js +++ b/docs/static/filter.js @@ -44,14 +44,14 @@ $(() => { var nvisible = 0; $(".support-matrix-table tbody tr").each( (index,item) => { var name = $(item).find("td:first-child p").html(); - var modules = $(item).find("a.reference.internal"); + var modules = $(item).find("code, a.reference.external"); var matching_all = true; // list_search.forEach((sstring) => { var matching = (sstring[0] == "-"); for(var modi = 0; modi < modules.length; ++modi) { module = modules[modi]; - var mod_name = module.firstChild.firstChild.textContent; + var mod_name = module.firstChild.textContent; if(sstring[0] == "-") { if(mod_name.match(sstring.substr(1))) { matching = false; diff --git a/shared-bindings/support_matrix.rst b/shared-bindings/support_matrix.rst index 2385183c98..e007e27b47 100644 --- a/shared-bindings/support_matrix.rst +++ b/shared-bindings/support_matrix.rst @@ -4,7 +4,7 @@ Module Support Matrix - Which Modules Are Available on Which Boards =================================================================== The following table lists the available built-in modules for each CircuitPython -capable board. +capable board, as well as each :term:`frozen module` included on it. .. raw:: html @@ -21,6 +21,14 @@ capable board. {% for key, value in support_matrix|dictsort %} {{ '.. _' ~ key|replace(" ", "-") ~ ':' }} * - {{ key }} - - {{ ':py:mod:`' ~ value|join("`, :py:mod:`") ~ '`' }} + - {{ ':py:mod:`' ~ value[0]|join("`, :py:mod:`") ~ '`' }} + + {% for module in value[1] %}\ + {% if loop.index == 1 %}**Frozen Modules:** {% endif %}\ + {% if loop.index > 1 %}, {% endif %}\ + {% if module[1] %}{{ '`' ~ module[0] ~ ' <' ~ module[1] ~ '>`__' }}\ + {% else %}{{ '`' ~ module[0] ~ ' <#>`__' }}\ + {% endif %}\ + {% endfor %} {% endfor %} diff --git a/tools/build_board_info.py b/tools/build_board_info.py index 97192adee7..edef661bca 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -13,14 +13,15 @@ import base64 from datetime import date from sh.contrib import git -sys.path.append("../docs") -import shared_bindings_matrix - sys.path.append("adabot") import adabot.github_requests as github -from shared_bindings_matrix import SUPPORTED_PORTS -from shared_bindings_matrix import aliases_by_board +sys.path.append("../docs") +from shared_bindings_matrix import ( + SUPPORTED_PORTS, + aliases_by_board, + support_matrix_by_board, +) BIN = ("bin",) UF2 = ("uf2",) @@ -124,20 +125,11 @@ def get_board_mapping(): extensions = extension_by_port[port] extensions = extension_by_board.get(board_path.name, extensions) aliases = aliases_by_board.get(board_path.name, []) - frozen_libraries = [] - with open(os.path.join(board_path, "mpconfigboard.mk")) as mpconfig: - frozen_lines = [ - line for line in mpconfig if line.startswith("FROZEN_MPY_DIRS") - ] - frozen_libraries.extend( - [line[line.rfind("/") + 1 :].strip() for line in frozen_lines] - ) boards[board_id] = { "port": port, "extensions": extensions, "download_count": 0, "aliases": aliases, - "frozen_libraries": frozen_libraries, } for alias in aliases: boards[alias] = { @@ -284,7 +276,7 @@ def generate_download_info(): languages = get_languages() - support_matrix = shared_bindings_matrix.support_matrix_by_board(use_branded_name=False) + support_matrix = support_matrix_by_board(use_branded_name=False) new_stable = "-" not in new_tag @@ -321,10 +313,10 @@ def generate_download_info(): new_version = { "stable": new_stable, "version": new_tag, - "modules": support_matrix[alias], + "modules": support_matrix[alias][0], "languages": languages, "extensions": board_info["extensions"], - "frozen_libraries": board_info["frozen_libraries"], + "frozen_libraries": [frozen[0] for frozen in support_matrix[alias][1]], } current_info[alias]["downloads"] = alias_info["download_count"] current_info[alias]["versions"].append(new_version) From f8922a56f96b3a8478a1fb396f46b3eb46ba8051 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 4 May 2022 10:32:42 +0200 Subject: [PATCH 0272/2403] extract documentation URL from frozen directory README.rst --- docs/shared_bindings_matrix.py | 44 +++++++++++++++++++++++++++------- docs/static/filter.css | 2 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index 6f35e67f21..961b38370d 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -70,6 +70,9 @@ frozen_excludes = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"] """Files and dirs at the root of a frozen directory that should be ignored. This is the same list as in the preprocess_frozen_modules script.""" +repository_urls = {} +"""Cache of repository URLs for frozen modules.""" + def get_circuitpython_root_dir(): """ The path to the root './circuitpython' directory """ @@ -168,15 +171,38 @@ def get_settings_from_makefile(port_dir, board_name): return settings def get_repository_url(directory): - contents = subprocess.run( - ["git", "remote", "get-url", "origin"], - encoding="utf-8", - errors="replace", - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - cwd=directory - ) - return contents.stdout.strip() + if directory in repository_urls: + return repository_urls[directory] + readme = None + for readme_path in ( + os.path.join(directory, "README.rst"), + os.path.join(os.path.dirname(directory), "README.rst") + ): + if os.path.exists(readme_path): + readme = readme_path + break + path = None + if readme: + with open(readme, "r") as fp: + for line in fp.readlines(): + if m := re.match("\s+:target:\s+(http\S+(docs.circuitpython|readthedocs)\S+)\s*", line): + path = m.group(1) + break + if m := re.search("<(http[^>]+)>", line): + path = m.group(1) + break + if path is None: + contents = subprocess.run( + ["git", "remote", "get-url", "origin"], + encoding="utf-8", + errors="replace", + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=directory + ) + path = contents.stdout.strip() + repository_urls[directory] = path + return path def frozen_modules_from_dirs(frozen_mpy_dirs): """ diff --git a/docs/static/filter.css b/docs/static/filter.css index 7de9641d34..021f850f4b 100644 --- a/docs/static/filter.css +++ b/docs/static/filter.css @@ -11,7 +11,7 @@ .support-matrix-table .reference.external { box-sizing: border-box; font-weight: 700; - color: #404050; + color: #404040; font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, monospace; padding: 2px 5px; background: white; From 3afec13e8211b64c3b52caabf6a16ac2c0947a5e Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 11 May 2022 14:49:29 +0200 Subject: [PATCH 0273/2403] add frozen submodules to CI deps for docs and website --- tools/ci_fetch_deps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index d31b0d47aa..f8854965c5 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -66,14 +66,14 @@ submodules = [] if target == "test": submodules = ["extmod/", "lib/", "tools/", "extmod/ulab", "lib/berkeley-db-1.xx"] elif target == "docs": - submodules = ["extmod/ulab/"] + submodules = ["extmod/ulab/", "frozen/"] elif target == "mpy-cross-mac": submodules = ["tools/"] # for huffman elif target == "windows": # This builds one board from a number of ports so fill out a bunch of submodules submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"] elif target == "website": - submodules = ["tools/adabot/"] + submodules = ["tools/adabot/", "frozen/"] else: p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk")) if not p: From d4b02e22ae7fc7aa47e6ae46f9bd364e196ca57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Thu, 12 May 2022 09:38:13 +0800 Subject: [PATCH 0274/2403] Thank you. I have applied for PID in espressif --- ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index c81df98381..dbd55bc52a 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -1,5 +1,5 @@ -USB_VID = 0x239A -USB_PID = 0x80A8 +USB_VID = 0x303A +USB_PID = 0x80FC USB_PRODUCT = "MixGo CE" USB_MANUFACTURER = "Espressif" From cb2bf41be6bec85f655fcff9c73b8a8a646a9a56 Mon Sep 17 00:00:00 2001 From: Jonah Date: Wed, 11 May 2022 23:45:37 -0400 Subject: [PATCH 0275/2403] Add fetch-modules to `make help` for main makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 55a35082b7..b35b5c66b9 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \ help: @echo "Please use \`make ' where is one of" + @echo " fetch-submodules to fetch dependencies from submodules, run this right after you clone the repo" @echo " html to make standalone HTML files" @echo " dirhtml to make HTML files named index.html in directories" @echo " singlehtml to make a single large HTML file" From 0d1740ad27ebb8589accd09262f1bc7f5e256edd Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:39:39 -0400 Subject: [PATCH 0276/2403] Create Lilygo-T-oi-Plus-ESP32C3 --- ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 | 1 + 1 file changed, 1 insertion(+) create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 @@ -0,0 +1 @@ + From f86ebe71b6a60bbabeea15faa70e4b55a80b3278 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:40:16 -0400 Subject: [PATCH 0277/2403] Delete Lilygo-T-oi-Plus-ESP32C3 --- ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 deleted file mode 100644 index 8b13789179..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 +++ /dev/null @@ -1 +0,0 @@ - From 35d78c135a094f12280ce7809c17ed6274cc6fd3 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:41:29 -0400 Subject: [PATCH 0278/2403] Create sdkconfig --- ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig | 1 + 1 file changed, 1 insertion(+) create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig @@ -0,0 +1 @@ + From b9ea7458ab5a3034988b26efe3fcd78dce04c481 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:41:53 -0400 Subject: [PATCH 0279/2403] Add files via upload --- .../boards/Lilygo-T-oi-Plus-ESP32C3/board.c | 34 ++++++++++++++++++ .../Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h | 13 +++++++ .../Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk | 10 ++++++ .../boards/Lilygo-T-oi-Plus-ESP32C3/pins.c | 36 +++++++++++++++++++ .../boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig | 6 +++- 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk create mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c new file mode 100644 index 0000000000..13cdffc11c --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c @@ -0,0 +1,34 @@ +#include "shared-bindings/microcontroller/Pin.h" +#include "supervisor/board.h" + +#include "components/driver/include/driver/gpio.h" + +void board_init(void) { + +} + +bool board_requests_safe_mode(void) { + return false; +} + +bool espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Pull LED down on reset rather than the default up + if (pin_number == MICROPY_HW_LED_STATUS->number) { + gpio_config_t cfg = { + .pin_bit_mask = BIT64(pin_number), + .mode = GPIO_MODE_DISABLE, + .pull_up_en = false, + .pull_down_en = true, + .intr_type = GPIO_INTR_DISABLE, + }; + gpio_config(&cfg); + return true; + } + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h new file mode 100644 index 0000000000..71987994e7 --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h @@ -0,0 +1,13 @@ +// Define board +#define MICROPY_HW_BOARD_NAME "LILYGO TTGO T-OI PLUS" +#define MICROPY_HW_MCU_NAME "ESP32-C3" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO3) + +// I2C +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO18, .sda = &pin_GPIO19}} + +// UART +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk new file mode 100644 index 0000000000..21cd460152 --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk @@ -0,0 +1,10 @@ +CIRCUITPY_CREATOR_ID = 0xC3C30000 +CIRCUITPY_CREATION_ID = 0x00C30001 + +IDF_TARGET = esp32c3 + +INTERNAL_FLASH_FILESYSTEM = 1 + +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB \ No newline at end of file diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c new file mode 100644 index 0000000000..668c76b186 --- /dev/null +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c @@ -0,0 +1,36 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig index 8b13789179..7c85db8776 100644 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig @@ -1 +1,5 @@ - +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="LILYGO TTGO T-OI PLUS" +# end of LWIP From b6e6ee7505ba3ad87d7f87dc216ab85a561fe446 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:57:44 -0400 Subject: [PATCH 0280/2403] Update ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk Co-authored-by: Neradoc --- .../espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk index 21cd460152..d40c9b6722 100644 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk @@ -7,4 +7,4 @@ INTERNAL_FLASH_FILESYSTEM = 1 CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m -CIRCUITPY_ESP_FLASH_SIZE = 4MB \ No newline at end of file +CIRCUITPY_ESP_FLASH_SIZE = 4MB From 6908f5a97efca64285c77b6a5e77e579d3e452e3 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:57:52 -0400 Subject: [PATCH 0281/2403] Update ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c Co-authored-by: Neradoc --- ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c index 13cdffc11c..a5f8a704b0 100644 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c @@ -4,7 +4,6 @@ #include "components/driver/include/driver/gpio.h" void board_init(void) { - } bool board_requests_safe_mode(void) { From 6fe728a9d26b82d224d1f39fb0a127e16a4ad0b8 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 11:57:59 -0400 Subject: [PATCH 0282/2403] Update ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c Co-authored-by: Neradoc --- ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c index 668c76b186..12f146ba39 100644 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c @@ -22,7 +22,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, - + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, From 0b586e9c9497c48b98782a653ec8d6a2fe89461b Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 12:43:52 -0400 Subject: [PATCH 0283/2403] Update board.c --- .../boards/Lilygo-T-oi-Plus-ESP32C3/board.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c index a5f8a704b0..aa0cf7657a 100644 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c +++ b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c @@ -10,22 +10,6 @@ bool board_requests_safe_mode(void) { return false; } -bool espressif_board_reset_pin_number(gpio_num_t pin_number) { - // Pull LED down on reset rather than the default up - if (pin_number == MICROPY_HW_LED_STATUS->number) { - gpio_config_t cfg = { - .pin_bit_mask = BIT64(pin_number), - .mode = GPIO_MODE_DISABLE, - .pull_up_en = false, - .pull_down_en = true, - .intr_type = GPIO_INTR_DISABLE, - }; - gpio_config(&cfg); - return true; - } - return false; -} - void reset_board(void) { } From 6903faee5f3f1b4be5a367cd83495b4eac44b34c Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 12:48:55 -0400 Subject: [PATCH 0284/2403] Add files via upload --- tools/build_board_info.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build_board_info.py b/tools/build_board_info.py index 97192adee7..34f751d6c2 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -75,6 +75,7 @@ extension_by_board = { "espressif_esp32c3_devkitm_1_n4": BIN, "lilygo_ttgo_t-01c3": BIN, "microdev_micro_c3": BIN, + "lilygo_ttgo_t-oi_plus":BIN, # broadcom "raspberrypi_zero": KERNEL_IMG, "raspberrypi_zero_w": KERNEL_IMG, From 5a014e62a3f6af777204e163f4f484c239952e4c Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 12:51:46 -0400 Subject: [PATCH 0285/2403] Update build_board_info.py --- tools/build_board_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_board_info.py b/tools/build_board_info.py index 34f751d6c2..ac9006ca32 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -75,7 +75,7 @@ extension_by_board = { "espressif_esp32c3_devkitm_1_n4": BIN, "lilygo_ttgo_t-01c3": BIN, "microdev_micro_c3": BIN, - "lilygo_ttgo_t-oi_plus":BIN, + "lilygo_ttgo_t-oi_plus": BIN, # broadcom "raspberrypi_zero": KERNEL_IMG, "raspberrypi_zero_w": KERNEL_IMG, From 4827502b98ed30e709e59129f8905beae46429a3 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Thu, 12 May 2022 13:05:27 -0400 Subject: [PATCH 0286/2403] Add additional builtins, links to CPython documentation --- docs/library/builtins.rst | 46 +++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst index 8532dc2531..678bb2763d 100644 --- a/docs/library/builtins.rst +++ b/docs/library/builtins.rst @@ -4,11 +4,18 @@ All builtin functions and exceptions are described here. They are also available via ``builtins`` module. +For more information about built-ins, see the following CPython documentation: + +* `Builtin CPython Functions `_ +* `Builtin CPython Exceptions `_ +* `Builtin CPython Constants `_ + +.. note:: Not all of these functions, types, exceptions, and constants are turned + on in all CircuitPython ports, for space reasons. + Functions and types ------------------- -Not all of these functions and types are turned on in all CircuitPython ports, for space reasons. - .. function:: abs() .. function:: all() @@ -160,33 +167,57 @@ Not all of these functions and types are turned on in all CircuitPython ports, f Exceptions ---------- +.. exception:: ArithmeticError + .. exception:: AssertionError .. exception:: AttributeError +.. exception:: BaseException + +.. exception:: BrokenPipeError + +.. exception:: ConnectionError + +.. exception:: EOFError + .. exception:: Exception .. exception:: ImportError +.. exception:: IndentationError + .. exception:: IndexError .. exception:: KeyboardInterrupt .. exception:: KeyError +.. exception:: LookupError + .. exception:: MemoryError +.. exception:: MpyError + + Not a part of the CPython standard library + .. exception:: NameError .. exception:: NotImplementedError .. exception:: OSError +.. exception:: OverflowError + .. exception:: RuntimeError .. exception:: ReloadException `ReloadException` is used internally to deal with soft restarts. + + Not a part of the CPython standard library + +.. exception:: StopAsyncIteration .. exception:: StopIteration @@ -194,12 +225,19 @@ Exceptions .. exception:: SystemExit - |see_cpython| :py:class:`cpython:SystemExit`. +.. exception:: TimeoutError .. exception:: TypeError - |see_cpython| :py:class:`cpython:TypeError`. +.. exception:: UnicodeError .. exception:: ValueError .. exception:: ZeroDivisionError + +Constants +--------- + +.. data:: Ellipsis + +.. data:: NotImplemented From a4f505dcab08b4756c6f45ec737b2d65473531e2 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 13:17:17 -0400 Subject: [PATCH 0287/2403] Delete ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3 directory --- .../boards/Lilygo-T-oi-Plus-ESP32C3/board.c | 17 --------- .../Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h | 13 ------- .../Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk | 10 ------ .../boards/Lilygo-T-oi-Plus-ESP32C3/pins.c | 36 ------------------- .../boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig | 5 --- 5 files changed, 81 deletions(-) delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c delete mode 100644 ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c deleted file mode 100644 index aa0cf7657a..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/board.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/board.h" - -#include "components/driver/include/driver/gpio.h" - -void board_init(void) { -} - -bool board_requests_safe_mode(void) { - return false; -} - -void reset_board(void) { -} - -void board_deinit(void) { -} diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h deleted file mode 100644 index 71987994e7..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.h +++ /dev/null @@ -1,13 +0,0 @@ -// Define board -#define MICROPY_HW_BOARD_NAME "LILYGO TTGO T-OI PLUS" -#define MICROPY_HW_MCU_NAME "ESP32-C3" - -#define MICROPY_HW_LED_STATUS (&pin_GPIO3) - -// I2C -#define CIRCUITPY_BOARD_I2C (1) -#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO18, .sda = &pin_GPIO19}} - -// UART -#define CIRCUITPY_BOARD_UART (1) -#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk deleted file mode 100644 index d40c9b6722..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/mpconfigboard.mk +++ /dev/null @@ -1,10 +0,0 @@ -CIRCUITPY_CREATOR_ID = 0xC3C30000 -CIRCUITPY_CREATION_ID = 0x00C30001 - -IDF_TARGET = esp32c3 - -INTERNAL_FLASH_FILESYSTEM = 1 - -CIRCUITPY_ESP_FLASH_MODE = dio -CIRCUITPY_ESP_FLASH_FREQ = 80m -CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c deleted file mode 100644 index 12f146ba39..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/pins.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "shared-bindings/board/__init__.h" - -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { - CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - - { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, - - { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, - - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, - - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, - - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, - { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, - { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, - - { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, - { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, - - { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, - { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, - { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, -}; -MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig b/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig deleted file mode 100644 index 7c85db8776..0000000000 --- a/ports/espressif/boards/Lilygo-T-oi-Plus-ESP32C3/sdkconfig +++ /dev/null @@ -1,5 +0,0 @@ -# -# LWIP -# -CONFIG_LWIP_LOCAL_HOSTNAME="LILYGO TTGO T-OI PLUS" -# end of LWIP From f69a293795402e68967df404c03c26a81914c6d8 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 13:18:17 -0400 Subject: [PATCH 0288/2403] Create sdkconfig --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig | 1 + 1 file changed, 1 insertion(+) create mode 100644 ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig @@ -0,0 +1 @@ + From 6bdd128fb33a928c096fe75adb68b815e8fffe42 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 13:18:39 -0400 Subject: [PATCH 0289/2403] Add files via upload --- .../boards/lilygo_ttgo_t-oi-plus/board.c | 34 ++++++++++++++++++ .../lilygo_ttgo_t-oi-plus/mpconfigboard.h | 13 +++++++ .../lilygo_ttgo_t-oi-plus/mpconfigboard.mk | 10 ++++++ .../boards/lilygo_ttgo_t-oi-plus/pins.c | 36 +++++++++++++++++++ .../boards/lilygo_ttgo_t-oi-plus/sdkconfig | 6 +++- 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c create mode 100644 ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h create mode 100644 ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk create mode 100644 ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c new file mode 100644 index 0000000000..13cdffc11c --- /dev/null +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c @@ -0,0 +1,34 @@ +#include "shared-bindings/microcontroller/Pin.h" +#include "supervisor/board.h" + +#include "components/driver/include/driver/gpio.h" + +void board_init(void) { + +} + +bool board_requests_safe_mode(void) { + return false; +} + +bool espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Pull LED down on reset rather than the default up + if (pin_number == MICROPY_HW_LED_STATUS->number) { + gpio_config_t cfg = { + .pin_bit_mask = BIT64(pin_number), + .mode = GPIO_MODE_DISABLE, + .pull_up_en = false, + .pull_down_en = true, + .intr_type = GPIO_INTR_DISABLE, + }; + gpio_config(&cfg); + return true; + } + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h new file mode 100644 index 0000000000..71987994e7 --- /dev/null +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h @@ -0,0 +1,13 @@ +// Define board +#define MICROPY_HW_BOARD_NAME "LILYGO TTGO T-OI PLUS" +#define MICROPY_HW_MCU_NAME "ESP32-C3" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO3) + +// I2C +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO18, .sda = &pin_GPIO19}} + +// UART +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk new file mode 100644 index 0000000000..21cd460152 --- /dev/null +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk @@ -0,0 +1,10 @@ +CIRCUITPY_CREATOR_ID = 0xC3C30000 +CIRCUITPY_CREATION_ID = 0x00C30001 + +IDF_TARGET = esp32c3 + +INTERNAL_FLASH_FILESYSTEM = 1 + +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB \ No newline at end of file diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c new file mode 100644 index 0000000000..668c76b186 --- /dev/null +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -0,0 +1,36 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig index 8b13789179..7c85db8776 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/sdkconfig @@ -1 +1,5 @@ - +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="LILYGO TTGO T-OI PLUS" +# end of LWIP From c5db1280ee5f7e29e2203cb0d8e5584f4bfc9a9f Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 13:21:58 -0400 Subject: [PATCH 0290/2403] Update mpconfigboard.mk --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk index 21cd460152..d40c9b6722 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk @@ -7,4 +7,4 @@ INTERNAL_FLASH_FILESYSTEM = 1 CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m -CIRCUITPY_ESP_FLASH_SIZE = 4MB \ No newline at end of file +CIRCUITPY_ESP_FLASH_SIZE = 4MB From a4f4effb447918420c623f827264e233cb193bf9 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Thu, 12 May 2022 14:53:01 -0400 Subject: [PATCH 0291/2403] Update qrio documentation --- shared-bindings/qrio/__init__.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/shared-bindings/qrio/__init__.c b/shared-bindings/qrio/__init__.c index b848190d7e..e052f752b1 100644 --- a/shared-bindings/qrio/__init__.c +++ b/shared-bindings/qrio/__init__.c @@ -31,9 +31,15 @@ #include "py/obj.h" #include "py/enum.h" -//| """`qrio` module. +//| """Low-level QR code decoding //| -//| Provides the `QRDecoder` object.""" +//| Provides the `QRDecoder` object used for decoding QR codes. For more +//| information about working with QR codes, see +//| `this Learn guide `_. +//| +//| .. note:: This library only handles decoding QR codes. If you are looking +//| to generate a QR code, use the +//| `adafruit_miniqr library `_""" //| STATIC const mp_rom_map_elem_t qrio_module_globals_table[] = { From 9c0dbbab2e98720f229da620b94e0dde0f050533 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Thu, 12 May 2022 15:21:46 -0400 Subject: [PATCH 0292/2403] Add links to information for fontio --- shared-bindings/fontio/__init__.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c index fc5c011eb3..3aadd93a53 100644 --- a/shared-bindings/fontio/__init__.c +++ b/shared-bindings/fontio/__init__.c @@ -35,6 +35,12 @@ //| """Core font related data structures""" //| +//| .. note:: This library is intended only for low-level usage. For working with +//| fonts in CircuitPython see the +//| `adafruit_bitmap_font library `_. +//| For infromation on creating custom fonts for use in CircuitPython, see +//| `this Learn guide `_ +//| STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fontio) }, From aa74f2132148d8fe86871afe06da325c55425825 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Thu, 12 May 2022 15:31:00 -0400 Subject: [PATCH 0293/2403] Add note about REPL in terminalio --- shared-bindings/terminalio/__init__.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/terminalio/__init__.c b/shared-bindings/terminalio/__init__.c index 38313dc757..5fd1a2751a 100644 --- a/shared-bindings/terminalio/__init__.c +++ b/shared-bindings/terminalio/__init__.c @@ -38,7 +38,12 @@ //| """Displays text in a TileGrid //| //| The `terminalio` module contains classes to display a character stream on a display. The built -//| in font is available as ``terminalio.FONT``.""" +//| in font is available as ``terminalio.FONT``. +//| +//| .. note:: This module does not give access to the +//| `REPL `_. +//| +//| """ //| //| FONT: fontio.BuiltinFont //| """The built in font""" From b035277e1584ddad6a9ba2fd6b1e335675e27936 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Thu, 12 May 2022 15:33:11 -0400 Subject: [PATCH 0294/2403] Mention other hardware in microcontroller module --- shared-bindings/microcontroller/__init__.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c index ceba9be1ba..707080cfbf 100644 --- a/shared-bindings/microcontroller/__init__.c +++ b/shared-bindings/microcontroller/__init__.c @@ -43,8 +43,9 @@ //| """Pin references and cpu functionality //| -//| The `microcontroller` module defines the pins from the perspective of the -//| microcontroller. See :py:mod:`board` for board-specific pin mappings.""" +//| The `microcontroller` module defines the pins and other bare-metal hardware +//| from the perspective of the microcontroller. See :py:mod:`board` for +//| board-specific pin mappings.""" //| //| from nvm import ByteArray //| from watchdog import WatchDogTimer From 269d51d0231cc52e49d81bb42ad76abf61e75a33 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 12 May 2022 13:18:44 -0700 Subject: [PATCH 0295/2403] Add two stage reset for BLE This lets the BLE stack run through the wait period after a VM run when it may be waiting for more writes due to an auto-reload. User BLE functionality will have their events stopped. Scanning and advertising is also stopped. --- main.c | 21 +++++++++++++++---- ports/espressif/common-hal/_bleio/__init__.c | 11 ++++++++++ .../espressif/common-hal/_bleio/ble_events.c | 12 +++++++++++ .../espressif/common-hal/_bleio/ble_events.h | 1 + ports/espressif/supervisor/port.c | 4 ---- ports/nrf/bluetooth/ble_drv.c | 12 +++++++++++ ports/nrf/bluetooth/ble_drv.h | 1 + ports/nrf/common-hal/_bleio/PacketBuffer.c | 6 ++++-- ports/nrf/common-hal/_bleio/__init__.c | 11 ++++++++++ ports/nrf/supervisor/port.c | 4 ---- py/gc.h | 9 ++++++-- shared-bindings/_bleio/__init__.h | 5 +++++ 12 files changed, 81 insertions(+), 16 deletions(-) diff --git a/main.c b/main.c index a3cc01d165..17fe8167f2 100644 --- a/main.c +++ b/main.c @@ -277,10 +277,10 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) { memorymonitor_reset(); #endif - filesystem_flush(); - stop_mp(); - free_memory(heap); - supervisor_move_memory(); + // Disable user related BLE state that uses the micropython heap. + #if CIRCUITPY_BLEIO + bleio_user_reset(); + #endif #if CIRCUITPY_CANIO common_hal_canio_reset(); @@ -297,6 +297,12 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) { #endif reset_port(); reset_board(); + + // Free the heap last because other modules may reference heap memory and need to shut down. + filesystem_flush(); + stop_mp(); + free_memory(heap); + supervisor_move_memory(); } STATIC void print_code_py_status_message(safe_mode_t safe_mode) { @@ -645,6 +651,12 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re // Done waiting, start the board back up. + // We delay resetting BLE until after the wait in case we're transferring + // more files over. + #if CIRCUITPY_BLEIO + bleio_reset(); + #endif + // free code allocation if unused if ((next_code_options & next_code_stickiness_situation) == 0) { free_memory(next_code_allocation); @@ -888,6 +900,7 @@ int __attribute__((used)) main(void) { serial_init(); #if CIRCUITPY_BLEIO + bleio_reset(); supervisor_bluetooth_enable_workflow(); supervisor_start_bluetooth(); #endif diff --git a/ports/espressif/common-hal/_bleio/__init__.c b/ports/espressif/common-hal/_bleio/__init__.c index 7eba47d6a1..e25f9b0ef1 100644 --- a/ports/espressif/common-hal/_bleio/__init__.c +++ b/ports/espressif/common-hal/_bleio/__init__.c @@ -42,6 +42,17 @@ // #include "common-hal/_bleio/bonding.h" #include "common-hal/_bleio/ble_events.h" +void bleio_user_reset() { + // Stop any user scanning or advertising. + common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj); + common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj); + + ble_event_remove_heap_handlers(); + + // Maybe start advertising the BLE workflow. + supervisor_bluetooth_background(); +} + // Turn off BLE on a reset or reload. void bleio_reset() { // Set this explicitly to save data. diff --git a/ports/espressif/common-hal/_bleio/ble_events.c b/ports/espressif/common-hal/_bleio/ble_events.c index 1ccd72cb61..a072a80623 100644 --- a/ports/espressif/common-hal/_bleio/ble_events.c +++ b/ports/espressif/common-hal/_bleio/ble_events.c @@ -31,6 +31,7 @@ #include #include +#include "py/gc.h" #include "py/misc.h" #include "py/mpstate.h" #include "py/runtime.h" @@ -44,6 +45,17 @@ void ble_event_reset(void) { MP_STATE_VM(ble_event_handler_entries) = NULL; } +void ble_event_remove_heap_handlers(void) { + ble_event_handler_entry_t *it = MP_STATE_VM(ble_event_handler_entries); + while (it != NULL) { + // If the param is on the heap, then delete the handler. + if (HEAP_PTR(it->param)) { + ble_event_remove_handler(it->func, it->param); + } + it = it->next; + } +} + void ble_event_add_handler_entry(ble_event_handler_entry_t *entry, ble_gap_event_fn *func, void *param) { ble_event_handler_entry_t *it = MP_STATE_VM(ble_event_handler_entries); diff --git a/ports/espressif/common-hal/_bleio/ble_events.h b/ports/espressif/common-hal/_bleio/ble_events.h index 03ff351118..cc6c9e92f7 100644 --- a/ports/espressif/common-hal/_bleio/ble_events.h +++ b/ports/espressif/common-hal/_bleio/ble_events.h @@ -40,6 +40,7 @@ typedef struct ble_event_handler_entry { } ble_event_handler_entry_t; void ble_event_reset(void); +void ble_event_remove_heap_handlers(void); void ble_event_add_handler(ble_gap_event_fn *func, void *param); void ble_event_remove_handler(ble_gap_event_fn *func, void *param); diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index 11709eda40..bf606ad159 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -283,10 +283,6 @@ void reset_port(void) { watchdog_reset(); #endif - #if CIRCUITPY_BLEIO - bleio_reset(); - #endif - #if CIRCUITPY_WIFI wifi_reset(); #endif diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c index f5d2f96715..cf3f9382d7 100644 --- a/ports/nrf/bluetooth/ble_drv.c +++ b/ports/nrf/bluetooth/ble_drv.c @@ -35,6 +35,7 @@ #include "nrf_sdm.h" #include "nrf_soc.h" #include "nrfx_power.h" +#include "py/gc.h" #include "py/misc.h" #include "py/mpstate.h" @@ -56,6 +57,17 @@ void ble_drv_reset() { sd_flash_operation_status = SD_FLASH_OPERATION_DONE; } +void ble_drv_remove_heap_handlers(void) { + ble_drv_evt_handler_entry_t *it = MP_STATE_VM(ble_drv_evt_handler_entries); + while (it != NULL) { + // If the param is on the heap, then delete the handler. + if (HEAP_PTR(it->param)) { + ble_drv_remove_event_handler(it->func, it->param); + } + it = it->next; + } +} + 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) { diff --git a/ports/nrf/bluetooth/ble_drv.h b/ports/nrf/bluetooth/ble_drv.h index e7649fceee..798e70e1fb 100644 --- a/ports/nrf/bluetooth/ble_drv.h +++ b/ports/nrf/bluetooth/ble_drv.h @@ -67,6 +67,7 @@ typedef struct ble_drv_evt_handler_entry { } ble_drv_evt_handler_entry_t; void ble_drv_reset(void); +void ble_drv_remove_heap_handlers(void); void ble_drv_add_event_handler(ble_drv_evt_handler_t func, void *param); void ble_drv_remove_event_handler(ble_drv_evt_handler_t func, void *param); diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nrf/common-hal/_bleio/PacketBuffer.c index f7d35cbdb5..38dcdd9041 100644 --- a/ports/nrf/common-hal/_bleio/PacketBuffer.c +++ b/ports/nrf/common-hal/_bleio/PacketBuffer.c @@ -380,9 +380,11 @@ mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, c !mp_hal_is_interrupted()) { RUN_BACKGROUND_TASKS; } + if (mp_hal_is_interrupted()) { + return -1; + } } - if (self->conn_handle == BLE_CONN_HANDLE_INVALID || - mp_hal_is_interrupted()) { + if (self->conn_handle == BLE_CONN_HANDLE_INVALID) { return -1; } diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c index e02cf306af..1d59983896 100644 --- a/ports/nrf/common-hal/_bleio/__init__.c +++ b/ports/nrf/common-hal/_bleio/__init__.c @@ -94,6 +94,17 @@ void check_sec_status(uint8_t sec_status) { } } +void bleio_user_reset() { + // Stop any user scanning or advertising. + common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj); + common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj); + + ble_drv_remove_heap_handlers(); + + // Maybe start advertising the BLE workflow. + supervisor_bluetooth_background(); +} + // Turn off BLE on a reset or reload. void bleio_reset() { // Set this explicitly to save data. diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c index 5c1139271d..0d1f71e886 100644 --- a/ports/nrf/supervisor/port.c +++ b/ports/nrf/supervisor/port.c @@ -246,10 +246,6 @@ void reset_port(void) { timers_reset(); - #if CIRCUITPY_BLEIO - bleio_reset(); - #endif - #if CIRCUITPY_WATCHDOG watchdog_reset(); #endif diff --git a/py/gc.h b/py/gc.h index ddd07fb4c0..b9036ff4ba 100644 --- a/py/gc.h +++ b/py/gc.h @@ -35,11 +35,16 @@ #define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / MP_BYTES_PER_OBJ_WORD) #define BYTES_PER_BLOCK (MICROPY_BYTES_PER_GC_BLOCK) +#define HEAP_PTR(ptr) ( \ + MP_STATE_MEM(gc_pool_start) != 0 /* Not on the heap if it isn't inited */ \ + && ptr >= (void *)MP_STATE_MEM(gc_pool_start) /* must be above start of pool */ \ + && ptr < (void *)MP_STATE_MEM(gc_pool_end) /* must be below end of pool */ \ + ) + // ptr should be of type void* #define VERIFY_PTR(ptr) ( \ ((uintptr_t)(ptr) & (BYTES_PER_BLOCK - 1)) == 0 /* must be aligned on a block */ \ - && ptr >= (void *)MP_STATE_MEM(gc_pool_start) /* must be above start of pool */ \ - && ptr < (void *)MP_STATE_MEM(gc_pool_end) /* must be below end of pool */ \ + && HEAP_PTR(ptr) \ ) void gc_init(void *start, void *end); diff --git a/shared-bindings/_bleio/__init__.h b/shared-bindings/_bleio/__init__.h index 55b527cfa5..f34df306b7 100644 --- a/shared-bindings/_bleio/__init__.h +++ b/shared-bindings/_bleio/__init__.h @@ -54,6 +54,11 @@ extern const mp_obj_type_t mp_type_bleio_BluetoothError; extern const mp_obj_type_t mp_type_bleio_RoleError; extern const mp_obj_type_t mp_type_bleio_SecurityError; +// Resets all user created BLE state in preparation for the heap disappearing. +// It will maintain BLE workflow and connections. +void bleio_user_reset(void); + +// Completely resets the BLE stack including BLE connections. void bleio_reset(void); extern mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj); From 83cd533785f29b02442e518409a1a344ffa64a4e Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 17:26:39 -0400 Subject: [PATCH 0296/2403] Update build_board_info.py --- tools/build_board_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_board_info.py b/tools/build_board_info.py index ac9006ca32..237a310756 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -75,7 +75,7 @@ extension_by_board = { "espressif_esp32c3_devkitm_1_n4": BIN, "lilygo_ttgo_t-01c3": BIN, "microdev_micro_c3": BIN, - "lilygo_ttgo_t-oi_plus": BIN, + "lilygo_ttgo_t-oi-plus": BIN, # broadcom "raspberrypi_zero": KERNEL_IMG, "raspberrypi_zero_w": KERNEL_IMG, From b1935975a2881183c3b3563f8fca193948bcac96 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 17:27:48 -0400 Subject: [PATCH 0297/2403] Update board.c --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c index 13cdffc11c..f48c91c686 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c @@ -3,8 +3,7 @@ #include "components/driver/include/driver/gpio.h" -void board_init(void) { - +void board_init(void) { } bool board_requests_safe_mode(void) { From 0d92b0a155c09c90661e787c3e7192d71b6b008f Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 17:46:49 -0400 Subject: [PATCH 0298/2403] Update board.c --- .../boards/lilygo_ttgo_t-oi-plus/board.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c index f48c91c686..aa0cf7657a 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c @@ -3,29 +3,13 @@ #include "components/driver/include/driver/gpio.h" -void board_init(void) { +void board_init(void) { } bool board_requests_safe_mode(void) { return false; } -bool espressif_board_reset_pin_number(gpio_num_t pin_number) { - // Pull LED down on reset rather than the default up - if (pin_number == MICROPY_HW_LED_STATUS->number) { - gpio_config_t cfg = { - .pin_bit_mask = BIT64(pin_number), - .mode = GPIO_MODE_DISABLE, - .pull_up_en = false, - .pull_down_en = true, - .intr_type = GPIO_INTR_DISABLE, - }; - gpio_config(&cfg); - return true; - } - return false; -} - void reset_board(void) { } From ef4d298ca8b633e32666c90fd0c66532ef184e90 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Thu, 12 May 2022 17:49:48 -0400 Subject: [PATCH 0299/2403] Update pins.c --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c index 668c76b186..963115bf1c 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -2,33 +2,26 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, - { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, From 3e85cfe26bf642c7872996424918cb0c30f90400 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 12 May 2022 15:23:26 -0700 Subject: [PATCH 0300/2403] Fix ESP and HCI build --- devices/ble_hci/common-hal/_bleio/__init__.c | 5 +++++ ports/espressif/common-hal/_bleio/Adapter.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/devices/ble_hci/common-hal/_bleio/__init__.c b/devices/ble_hci/common-hal/_bleio/__init__.c index d8a222ecfe..a22bcfb082 100644 --- a/devices/ble_hci/common-hal/_bleio/__init__.c +++ b/devices/ble_hci/common-hal/_bleio/__init__.c @@ -57,6 +57,11 @@ bool vm_used_ble; // } // } +void bleio_user_reset() { + // HCI doesn't support the BLE workflow so just do a full reset. + bleio_reset(); +} + // Turn off BLE on a reset or reload. void bleio_reset() { // Create a UUID object for all CCCD's. diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c index d72f9dbf02..943e44e7cd 100644 --- a/ports/espressif/common-hal/_bleio/Adapter.c +++ b/ports/espressif/common-hal/_bleio/Adapter.c @@ -574,6 +574,9 @@ void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool } void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) { + if (!common_hal_bleio_adapter_get_advertising(self)) { + return; + } int err_code = ble_gap_ext_adv_stop(0); self->user_advertising = false; From e30d510192a6b110d132bca9366ed2d84d29bd85 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:14:48 -0400 Subject: [PATCH 0301/2403] Reformatting for fontio module --- shared-bindings/fontio/__init__.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c index 3aadd93a53..86c3bd6eb4 100644 --- a/shared-bindings/fontio/__init__.c +++ b/shared-bindings/fontio/__init__.c @@ -33,14 +33,16 @@ #include "shared-bindings/fontio/BuiltinFont.h" #include "shared-bindings/fontio/Glyph.h" -//| """Core font related data structures""" +//| """Core font related data structures //| //| .. note:: This library is intended only for low-level usage. For working with -//| fonts in CircuitPython see the -//| `adafruit_bitmap_font library `_. -//| For infromation on creating custom fonts for use in CircuitPython, see +//| fonts in CircuitPython see the `adafruit_bitmap_font library +//| `_. +//| For information on creating custom fonts for use in CircuitPython, see //| `this Learn guide `_ //| +//| """ +//| STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fontio) }, From 78a87c3bb23ade285015386f310c19c349ae66c3 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:15:05 -0400 Subject: [PATCH 0302/2403] Added link to Learn guide for audiomp3 --- shared-bindings/audiomp3/__init__.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c index d6c408b143..13f02b1ea9 100644 --- a/shared-bindings/audiomp3/__init__.c +++ b/shared-bindings/audiomp3/__init__.c @@ -31,7 +31,12 @@ #include "shared-bindings/audiomp3/MP3Decoder.h" -//| """Support for MP3-compressed audio files""" +//| """Support for MP3-compressed audio files +//| +//| For more infomration about working with MP3 files in CircuitPython, +//| see `this CircuitPython Essentials Learn guide page +//| `_. +//| """ //| STATIC const mp_rom_map_elem_t audiomp3_module_globals_table[] = { From 289fdc124163e0e6fa8e4f418d7153b7349f88b9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:15:26 -0400 Subject: [PATCH 0303/2403] Added link to library and guide for rp2pio --- ports/raspberrypi/bindings/rp2pio/__init__.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c index b3b45dc923..941ede2e12 100644 --- a/ports/raspberrypi/bindings/rp2pio/__init__.c +++ b/ports/raspberrypi/bindings/rp2pio/__init__.c @@ -30,7 +30,14 @@ #include "bindings/rp2pio/StateMachine.h" #include "bindings/rp2pio/__init__.h" -//| """Hardware interface to RP2 series' programmable IO (PIO) peripheral.""" +//| """Hardware interface to RP2 series' programmable IO (PIO) peripheral. +//| +//| .. note:: This module is intended to be used with the `adafruit_pioasm library +//| `_. For an +//| introduction and guide to working with PIO in CircuitPython, see `this +//| Learn guide `_. +//| +//| """ //| //| def pins_are_sequential(pins: List[microcontroller.Pin]) -> bool: From a51b1353ea2c72323d89555523ff93c97e43cda7 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:24:02 -0400 Subject: [PATCH 0304/2403] Add link to Learn guide for alarm module --- shared-bindings/alarm/__init__.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c index 2d532664b9..7fd14b7641 100644 --- a/shared-bindings/alarm/__init__.c +++ b/shared-bindings/alarm/__init__.c @@ -55,6 +55,9 @@ //| //| For both light sleep and deep sleep, if CircuitPython is connected to a host computer, //| maintaining the connection takes priority and power consumption may not be reduced. +//| +//| For more information about working with alarms and light/deep sleep in CircuitPython, +//| see `this Learn guide `_. //| """ //| sleep_memory: SleepMemory From 82810085b5c9059ecb7de6d1a0fddb906595f8bf Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:47:21 -0400 Subject: [PATCH 0305/2403] Add note about display guide to bitmaptools --- shared-bindings/bitmaptools/__init__.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c index df6292afec..5122d039e8 100644 --- a/shared-bindings/bitmaptools/__init__.c +++ b/shared-bindings/bitmaptools/__init__.c @@ -43,7 +43,13 @@ #include "extmod/vfs_posix.h" #endif -//| """Collection of bitmap manipulation tools""" +//| """Collection of bitmap manipulation tools +//| +//| .. note:: If you're looking for information about displaying bitmaps on +//| screens in CircuitPython, see `this Learn guide +//| `_ +//| for information about using the :py:mod:`displayio` module. +//| """ //| STATIC int16_t validate_point(mp_obj_t point, int16_t default_value) { From cb3932ce29ec8883b5706513a52b19fc804f3fa7 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 11:51:30 -0400 Subject: [PATCH 0306/2403] Make other documentation links prettier --- shared-bindings/analogio/__init__.c | 9 ++++----- shared-bindings/board/__init__.c | 6 +++--- shared-bindings/digitalio/__init__.c | 9 ++++----- shared-bindings/displayio/__init__.c | 6 +++--- shared-bindings/neopixel_write/__init__.c | 8 ++++---- shared-bindings/pwmio/__init__.c | 5 ++--- shared-bindings/storage/__init__.c | 6 +++--- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c index 89096ae9aa..eb956d0eb7 100644 --- a/shared-bindings/analogio/__init__.c +++ b/shared-bindings/analogio/__init__.c @@ -59,12 +59,11 @@ //| :py:meth:`~analogio.AnalogIn.deinit` the hardware. The last step is optional //| because CircuitPython will do it automatically after the program finishes. //| -//| For the essentials of `analogio`, see the CircuitPython Essentials -//| Learn guide: -//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-analog-in +//| For the essentials of `analogio`, see the `CircuitPython Essentials +//| Learn guide `_ //| -//| For more information on using `analogio`, see this additional Learn guide: -//| https://learn.adafruit.com/circuitpython-basics-analog-inputs-and-outputs +//| For more information on using `analogio`, see `this additional Learn guide +//| `_ //| """ //| diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c index a496ff0b9c..e4003d4f6b 100644 --- a/shared-bindings/board/__init__.c +++ b/shared-bindings/board/__init__.c @@ -47,9 +47,9 @@ //| the default pins and settings. For more information about serial communcication //| in CircuitPython, see the :mod:`busio`. //| -//| For more information regarding the typical usage of :py:mod:`board`, refer to the CircuitPython -//| Essentials Learn guide: -//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-pins-and-modules +//| For more information regarding the typical usage of :py:mod:`board`, refer to the `CircuitPython +//| Essentials Learn guide +//| `_ //| //| .. warning:: The board module varies by board. The APIs documented here may or may not be //| available on a specific board.""" diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c index 8bc872be99..9a9db69816 100644 --- a/shared-bindings/digitalio/__init__.c +++ b/shared-bindings/digitalio/__init__.c @@ -73,12 +73,11 @@ //| led.value = False //| time.sleep(0.1) //| -//| For the essentials of `digitalio`, see the CircuitPython Essentials -//| Learn guide: -//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-digital-in-out +//| For the essentials of `digitalio`, see the `CircuitPython Essentials +//| Learn guide `_ //| -//| For more information on using `digitalio`, see this additional Learn guide: -//| https://learn.adafruit.com/circuitpython-digital-inputs-and-outputs +//| For more information on using `digitalio`, see `this additional Learn guide +//| `_ //| """ STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = { diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c index 931ec3f77a..2e52f12e84 100644 --- a/shared-bindings/displayio/__init__.c +++ b/shared-bindings/displayio/__init__.c @@ -51,9 +51,9 @@ //| The `displayio` module contains classes to manage display output //| including synchronizing with refresh rates and partial updating. //| -//| For more a more thorugh explanation and guide for using `displayio`, please -//| refer to this Learn guide: -//| https://learn.adafruit.com/circuitpython-display-support-using-displayio +//| For more a more thorough explanation and guide for using `displayio`, please +//| refer to `this Learn guide +//| `_. //| """ //| diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index 9375beab06..94d44ebac1 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -97,11 +97,11 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { //| //| This library is typically not used by user level code. //| -//| For more information on actually using NeoPixels, refer to the CircuitPython -//| Essentials Learn guide: https://learn.adafruit.com/circuitpython-essentials/circuitpython-neopixel +//| For more information on actually using NeoPixels, refer to the `CircuitPython +//| Essentials Learn guide `_ //| -//| For a much more thorough guide about using NeoPixels, refer to the Adadfruit NeoPixel Überguide: -//| https://learn.adafruit.com/adafruit-neopixel-uberguide +//| For a much more thorough guide about using NeoPixels, refer to the `Adafruit NeoPixel Überguide +//| `_. //| //| """ //| diff --git a/shared-bindings/pwmio/__init__.c b/shared-bindings/pwmio/__init__.c index dbe487d580..90aff45819 100644 --- a/shared-bindings/pwmio/__init__.c +++ b/shared-bindings/pwmio/__init__.c @@ -59,9 +59,8 @@ //| hardware after program completion. Use ``deinit()`` or a ``with`` statement //| to do it yourself. //| -//| For the essentials of `pwmio`, see the CircuitPython Essentials -//| Learn guide: -//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-pwm +//| For the essentials of `pwmio`, see the `CircuitPython Essentials +//| Learn guide `_. //| """ //| diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c index 4a3a8384b1..277c8343e0 100644 --- a/shared-bindings/storage/__init__.c +++ b/shared-bindings/storage/__init__.c @@ -42,9 +42,9 @@ //| CircuitPython does not have an OS, so this module provides this functionality //| directly. -//| For more information regarding using the `storage` module, refer to the CircuitPython -//| Essentials Learn guide: -//| https://learn.adafruit.com/circuitpython-essentials/circuitpython-storage +//| For more information regarding using the `storage` module, refer to the `CircuitPython +//| Essentials Learn guide +//| `_. //| """ //| From bc9ed81b758ced1230e9e353e61822581d621eae Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 12:03:14 -0400 Subject: [PATCH 0307/2403] Fix builtins.rst formatting via pre-commit --- docs/library/builtins.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst index 678bb2763d..a3be5ae16e 100644 --- a/docs/library/builtins.rst +++ b/docs/library/builtins.rst @@ -214,7 +214,7 @@ Exceptions .. exception:: ReloadException `ReloadException` is used internally to deal with soft restarts. - + Not a part of the CPython standard library .. exception:: StopAsyncIteration From ae8347f5e58c27de027863d1c504f3a0893e79e5 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 13 May 2022 12:54:46 -0400 Subject: [PATCH 0308/2403] add error msg for SH1107 fix --- locale/circuitpython.pot | 6 +++++- shared-bindings/displayio/Display.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 3bec8b622b..ed60df4069 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -107,6 +107,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" @@ -623,7 +627,7 @@ msgstr "" msgid "Buffer length must be a multiple of 512" msgstr "" -#: ports/stm/common-hal/sdioio/SDCard.c +#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" msgstr "" diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index b187d1329f..11621211e0 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -170,6 +170,12 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a mp_raise_ValueError(translate("Display rotation must be in 90 degree increments")); } + const bool sh1107_addressing = args[ARG_SH1107_addressing].u_bool; + const mp_int_t color_depth = args[ARG_color_depth].u_int; + if (sh1107_addressing && color_depth != 1) { + mp_raise_ValueError_varg(translate("%q must be 1 when %q is True"), MP_QSTR_color_depth, MP_QSTR_SH1107_addressing); + } + primary_display_t *disp = allocate_display_or_raise(); displayio_display_obj_t *self = &disp->display; @@ -177,7 +183,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a common_hal_displayio_display_construct( self, display_bus, args[ARG_width].u_int, args[ARG_height].u_int, args[ARG_colstart].u_int, args[ARG_rowstart].u_int, rotation, - args[ARG_color_depth].u_int, args[ARG_grayscale].u_bool, + color_depth, args[ARG_grayscale].u_bool, args[ARG_pixels_in_byte_share_row].u_bool, args[ARG_bytes_per_cell].u_bool, args[ARG_reverse_pixels_in_byte].u_bool, @@ -194,7 +200,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a args[ARG_auto_refresh].u_bool, args[ARG_native_frames_per_second].u_int, args[ARG_backlight_on_high].u_bool, - args[ARG_SH1107_addressing].u_bool + sh1107_addressing ); return self; From fca1a9bb5f5a86ffcb68fe07c1d4f00eaabd2ad4 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 13 May 2022 14:00:09 -0400 Subject: [PATCH 0309/2403] Change "library" to "module" --- shared-bindings/fontio/__init__.c | 2 +- shared-bindings/neopixel_write/__init__.c | 2 +- shared-bindings/qrio/__init__.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c index 86c3bd6eb4..ea1b8a628b 100644 --- a/shared-bindings/fontio/__init__.c +++ b/shared-bindings/fontio/__init__.c @@ -35,7 +35,7 @@ //| """Core font related data structures //| -//| .. note:: This library is intended only for low-level usage. For working with +//| .. note:: This module is intended only for low-level usage. For working with //| fonts in CircuitPython see the `adafruit_bitmap_font library //| `_. //| For information on creating custom fonts for use in CircuitPython, see diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index 94d44ebac1..d0234fe451 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -95,7 +95,7 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { //| //| .. note:: //| -//| This library is typically not used by user level code. +//| This module is typically not used by user level code. //| //| For more information on actually using NeoPixels, refer to the `CircuitPython //| Essentials Learn guide `_ diff --git a/shared-bindings/qrio/__init__.c b/shared-bindings/qrio/__init__.c index e052f752b1..04c86fd1ee 100644 --- a/shared-bindings/qrio/__init__.c +++ b/shared-bindings/qrio/__init__.c @@ -37,7 +37,7 @@ //| information about working with QR codes, see //| `this Learn guide `_. //| -//| .. note:: This library only handles decoding QR codes. If you are looking +//| .. note:: This module only handles decoding QR codes. If you are looking //| to generate a QR code, use the //| `adafruit_miniqr library `_""" //| From 1f0bdad0832c51c6fbce4a1ede058a61b82658e5 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Fri, 13 May 2022 15:02:26 -0400 Subject: [PATCH 0310/2403] Update ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk Co-authored-by: Scott Shawcroft --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk index d40c9b6722..2f66e69415 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk @@ -1,5 +1,5 @@ CIRCUITPY_CREATOR_ID = 0xC3C30000 -CIRCUITPY_CREATION_ID = 0x00C30001 +CIRCUITPY_CREATION_ID = 0x00C30002 IDF_TARGET = esp32c3 From 28b14e05e3b362cf21cf0909cb7f2c7932d9f73f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 13 May 2022 15:45:12 -0400 Subject: [PATCH 0311/2403] shrink thunderpack_v12 --- ports/espressif/esp-idf | 2 +- ports/stm/boards/thunderpack_v12/mpconfigboard.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 121ddb87e5..944c01eef4 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 121ddb87e5130314e4fcc5e9cb260a81b7d30d36 +Subproject commit 944c01eef4fbba693f991f9d033cda3f59ca82c9 diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk index 526415ca30..f7905f6945 100644 --- a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk +++ b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk @@ -14,6 +14,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C CIRCUITPY_NVM = 1 CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_ZLIB = 0 MCU_SERIES = F4 From d2d08fc94474fbecb5a33bc42ac2cff74326872a Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Fri, 13 May 2022 16:48:13 -0700 Subject: [PATCH 0312/2403] fix SPI pin names qtpy esp32s3 --- .../adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h | 2 +- .../boards/adafruit_qtpy_esp32s3_nopsram/pins.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h index 388041b115..f6e51ea583 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h @@ -37,7 +37,7 @@ {.scl = &pin_GPIO40, .sda = &pin_GPIO41}} #define CIRCUITPY_BOARD_SPI (1) -#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO35, .mosi = &pin_GPIO34, .miso = &pin_GPIO36}} +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO36, .mosi = &pin_GPIO35, .miso = &pin_GPIO37}} #define CIRCUITPY_BOARD_UART (1) #define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO5, .rx = &pin_GPIO16}} diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c index 0a7bcdb165..5d0a3c0baa 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c @@ -36,15 +36,15 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, - { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO34) }, - { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) }, - - { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) }, { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, - { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) }, { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO38) }, { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO39) }, From 341941c0be65a66ebea1df7052db30cdd3f6d272 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sat, 14 May 2022 02:37:37 +0200 Subject: [PATCH 0313/2403] 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/ru.po | 4 ++++ locale/sv.po | 4 ++++ locale/tr.po | 4 ++++ locale/zh_Latn_pinyin.po | 4 ++++ 19 files changed, 76 insertions(+) diff --git a/locale/ID.po b/locale/ID.po index da7bbd0915..c16258bf52 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -113,6 +113,10 @@ msgstr "%q panjang harus >= 1" msgid "%q must be %d-%d" msgstr "%q harus %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q harus <= %d" diff --git a/locale/cs.po b/locale/cs.po index 22f48b15a6..5a87f5bc06 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -112,6 +112,10 @@ msgstr "%q délka musí být >= 1" msgid "%q must be %d-%d" msgstr "%q musí být %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q musí být <= %d" diff --git a/locale/de_DE.po b/locale/de_DE.po index 6c52a0e8f6..498b1fdaf4 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -115,6 +115,10 @@ msgstr "%q Länge muss >= 1 sein" msgid "%q must be %d-%d" msgstr "%q muss %d-%d sein" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q muss <= %d sein" diff --git a/locale/el.po b/locale/el.po index 4ecf46679d..2c21d3b972 100644 --- a/locale/el.po +++ b/locale/el.po @@ -107,6 +107,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index de542c4b92..399fbfd5e7 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -114,6 +114,10 @@ msgstr "%q length must be >= 1" msgid "%q must be %d-%d" msgstr "%q must be %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/es.po b/locale/es.po index 72cedf0de4..d1e4f3205e 100644 --- a/locale/es.po +++ b/locale/es.po @@ -116,6 +116,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "%q debe ser %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/fil.po b/locale/fil.po index b40891ffbb..ea43686206 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -108,6 +108,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index ffe3184243..27fdb3a54a 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -116,6 +116,10 @@ msgstr "La longueur de %q doit être >= 1" msgid "%q must be %d-%d" msgstr "%q doit être %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q doit être <= %d" diff --git a/locale/hi.po b/locale/hi.po index 6a4b71b40d..5f18b16a23 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -107,6 +107,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 16c8264ecc..08fd145a80 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -114,6 +114,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index 8ff4dd0907..d5615d92f8 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -112,6 +112,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index d02997cd6b..21e4bd346a 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -108,6 +108,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index fc71d36d20..a2dc9ab51f 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -110,6 +110,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/pl.po b/locale/pl.po index d0b725ade5..2b1d6ea123 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -112,6 +112,10 @@ msgstr "" msgid "%q must be %d-%d" msgstr "" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 06287c37ed..259adfde7a 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -116,6 +116,10 @@ msgstr "o comprimento %q deve ser >=1" msgid "%q must be %d-%d" msgstr "o %q deve ser %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q deve ser <= %d" diff --git a/locale/ru.po b/locale/ru.po index 5c426cecf3..9b8778f71b 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -115,6 +115,10 @@ msgstr "Длинна %q должна быть >= 1" msgid "%q must be %d-%d" msgstr "%q должен быть %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q должен быть <= %d" diff --git a/locale/sv.po b/locale/sv.po index 23d29a3b90..4d0763c7e0 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -115,6 +115,10 @@ msgstr "längden på %q måste vara >= 1" msgid "%q must be %d-%d" msgstr "%q måste vara %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q måste vara <= %d" diff --git a/locale/tr.po b/locale/tr.po index ecaf732da0..c64c90b204 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -119,6 +119,10 @@ msgstr "%q boyutu >=1 olmalıdır" msgid "%q must be %d-%d" msgstr "%q, %d-%d olmalıdır" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q <= %d olmalıdır" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 63c27e3a1f..5e1b146532 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -118,6 +118,10 @@ msgstr "%q cháng dù bì xū >= 1" msgid "%q must be %d-%d" msgstr "%q bì xū wéi %d-%d" +#: shared-bindings/displayio/Display.c +msgid "%q must be 1 when %q is True" +msgstr "" + #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" msgstr "%q bì xū <= %d" From df024733aa1960db78d491eaafda18d514d6e98a Mon Sep 17 00:00:00 2001 From: Neradoc Date: Sat, 14 May 2022 04:10:37 +0200 Subject: [PATCH 0314/2403] fix readthedocs frozen modules --- .readthedocs.yml | 1 + tools/ci_fetch_deps.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 9743a70494..460ac8f5d8 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,6 +16,7 @@ build: submodules: include: - extmod/ulab + - frozen formats: - pdf diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index f8854965c5..9932d68e45 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -66,6 +66,7 @@ submodules = [] if target == "test": submodules = ["extmod/", "lib/", "tools/", "extmod/ulab", "lib/berkeley-db-1.xx"] elif target == "docs": + # NOTE: must match .readthedocs.yml as this script is not run by readthedocs submodules = ["extmod/ulab/", "frozen/"] elif target == "mpy-cross-mac": submodules = ["tools/"] # for huffman From 016242aa26527adc99b762789b050cb2d2c26f72 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 14 May 2022 06:29:38 -0500 Subject: [PATCH 0315/2403] Get rid of a memset() for the case where finalisers are enabled This saves 24 bytes of flash on trinket m0 --- py/gc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/py/gc.c b/py/gc.c index 826540d353..5f959f3ed4 100644 --- a/py/gc.c +++ b/py/gc.c @@ -138,7 +138,6 @@ void gc_init(void *start, void *end) { MP_STATE_MEM(gc_alloc_table_start) = (byte *)start; #if MICROPY_ENABLE_FINALISER - size_t gc_finaliser_table_byte_len = (MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB + BLOCKS_PER_FTB - 1) / BLOCKS_PER_FTB; MP_STATE_MEM(gc_finaliser_table_start) = MP_STATE_MEM(gc_alloc_table_start) + MP_STATE_MEM(gc_alloc_table_byte_len) + 1; #endif @@ -150,15 +149,11 @@ void gc_init(void *start, void *end) { assert(MP_STATE_MEM(gc_pool_start) >= MP_STATE_MEM(gc_finaliser_table_start) + gc_finaliser_table_byte_len); #endif - // Clear ATBs plus one more byte. The extra byte might be read when we read the final ATB and - // then try to count its tail. Clearing the byte ensures it is 0 and ends the chain. Without an - // FTB, it'll just clear the pool byte early. - memset(MP_STATE_MEM(gc_alloc_table_start), 0, MP_STATE_MEM(gc_alloc_table_byte_len) + 1); - - #if MICROPY_ENABLE_FINALISER - // clear FTBs - memset(MP_STATE_MEM(gc_finaliser_table_start), 0, gc_finaliser_table_byte_len); - #endif + // Clear ATBs & finalisers (if enabled). This also clears the extra byte + // which appears between ATBs and finalisers that ensures every chain in + // the ATB terminates, rather than erroneously using bits from the + // finalisers. + memset(MP_STATE_MEM(gc_alloc_table_start), 0, MP_STATE_MEM(gc_pool_start) - MP_STATE_MEM(gc_alloc_table_start)); // Set first free ATB index to the start of the heap. for (size_t i = 0; i < MICROPY_ATB_INDICES; i++) { From 860f0b823973dc566955db5606ff11cc40435257 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Sat, 14 May 2022 01:59:39 +0000 Subject: [PATCH 0316/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1059 of 1059 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 259adfde7a..e9cf974632 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: 2022-05-10 23:52+0000\n" +"PO-Revision-Date: 2022-05-14 12:35+0000\n" "Last-Translator: Wellington Terumi Uemura \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.12.1\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -118,7 +118,7 @@ msgstr "o %q deve ser %d-%d" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "" +msgstr "%q deve ser 1 quando %q for verdadeiro" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" From 1de1460ea8dff7a7166ce5e39ab002015ee48b7b Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Sat, 14 May 2022 11:18:38 +0000 Subject: [PATCH 0317/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (1059 of 1059 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 4d0763c7e0..80a5d6cb27 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: 2022-05-10 23:52+0000\n" +"PO-Revision-Date: 2022-05-14 12:35+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \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.12.1\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -117,7 +117,7 @@ msgstr "%q måste vara %d-%d" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "" +msgstr "%q måste vara 1 när %q är sann" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" From cb331309c94663e7035dd4dd3b486b0af4515101 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 14 May 2022 07:34:38 -0500 Subject: [PATCH 0318/2403] skip optimized memcpy/memset for small builds This saves 100 bytes on trinket_m0 at the price of making many memset & memcpy calls slower. --- shared/libc/string0.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/shared/libc/string0.c b/shared/libc/string0.c index 86e7cc5960..92b063c552 100644 --- a/shared/libc/string0.c +++ b/shared/libc/string0.c @@ -28,6 +28,8 @@ #include #include +#include "py/mpconfig.h" + #ifndef likely #define likely(x) __builtin_expect((x), 1) #endif @@ -35,6 +37,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-align" void *memcpy(void *dst, const void *src, size_t n) { +#if CIRCUITPY_FULL_BUILD if (likely(!(((uintptr_t)dst) & 3) && !(((uintptr_t)src) & 3))) { // pointers aligned uint32_t *d = dst; @@ -56,7 +59,9 @@ void *memcpy(void *dst, const void *src, size_t n) { // copy byte *((uint8_t*)d) = *((const uint8_t*)s); } - } else { + } else +#endif + { // unaligned access, copy bytes uint8_t *d = dst; const uint8_t *s = src; @@ -93,6 +98,7 @@ void *memmove(void *dest, const void *src, size_t n) { } void *memset(void *s, int c, size_t n) { +#if CIRCUITPY_FULL_BUILD if (c == 0 && ((uintptr_t)s & 3) == 0) { // aligned store of 0 uint32_t *s32 = s; @@ -106,7 +112,9 @@ void *memset(void *s, int c, size_t n) { if (n & 1) { *((uint8_t*)s32) = 0; } - } else { + } else +#endif + { uint8_t *s2 = s; for (; n > 0; n--) { *s2++ = c; From 55f1a2f9e288f457e3d1ebdd2c60b4d2cda9a110 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 14 May 2022 08:54:15 -0400 Subject: [PATCH 0319/2403] frozen update --- frozen/Adafruit_CircuitPython_LSM6DS | 2 +- frozen/Adafruit_CircuitPython_RFM9x | 2 +- frozen/Adafruit_CircuitPython_ST7789 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index 2dfd61a0d5..3d1aab0daf 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit 2dfd61a0d5ffc8048e72d24e5ecdac9a74bb2bc3 +Subproject commit 3d1aab0daf63c3b4476f73cba39cf5da49e1e4aa diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x index 742ac7c8fb..2d8310f19d 160000 --- a/frozen/Adafruit_CircuitPython_RFM9x +++ b/frozen/Adafruit_CircuitPython_RFM9x @@ -1 +1 @@ -Subproject commit 742ac7c8fb52bb85d9fd367b60a7f80475d7ed14 +Subproject commit 2d8310f19d1bdce817df13e807b409b5b057fc21 diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 index 5fdd62ab69..850c3dc512 160000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ b/frozen/Adafruit_CircuitPython_ST7789 @@ -1 +1 @@ -Subproject commit 5fdd62ab69fda70407644acc6f9b45681da9ef68 +Subproject commit 850c3dc512f7feae1eaad20bdc1c5e4c63c92f08 From 624a00ac4550d3b5d25de5cf0017d908cca78000 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 14 May 2022 08:54:46 -0400 Subject: [PATCH 0320/2403] shrink circuitplayground_express_displayio --- .../boards/circuitplayground_express_displayio/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk index fd9e6cc2e6..0ae0c58b42 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk @@ -12,6 +12,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_ONEWIREIO = 0 CIRCUITPY_PIXELBUF = 0 CIRCUITPY_ROTARYIO = 0 CIRCUITPY_RTC = 0 From bb4c63699a768f15e46150e026c39d28e064b72e Mon Sep 17 00:00:00 2001 From: Neradoc Date: Sat, 14 May 2022 16:46:09 +0200 Subject: [PATCH 0321/2403] Fetch the submodules in readthedocs with ci_fetch_deps.py --- .readthedocs.yml | 16 +++++++--------- tools/ci_fetch_deps.py | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 460ac8f5d8..94ba8750b0 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,17 +9,15 @@ version: 2 build: - os: ubuntu-20.04 - tools: - python: "3" - -submodules: - include: - - extmod/ulab - - frozen + os: ubuntu-20.04 + tools: + python: "3" + jobs: + post_install: + - python tools/ci_fetch_deps.py docs HEAD formats: - - pdf + - pdf python: install: diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index 1b0f5b57dc..491d8da0e5 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -68,7 +68,7 @@ submodules = [] if target == "test": submodules = ["extmod/", "lib/", "tools/", "extmod/ulab", "lib/berkeley-db-1.xx"] elif target == "docs": - # NOTE: must match .readthedocs.yml as this script is not run by readthedocs + # used in .readthedocs.yml to generate RTD submodules = ["extmod/ulab/", "frozen/"] elif target == "mpy-cross-mac": submodules = ["tools/"] # for huffman From 8987bf18d02032cbe16ef1331e51bf60672d0b57 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Mon, 16 May 2022 22:39:25 +0200 Subject: [PATCH 0322/2403] Add Winbond flash substitute to boards --- ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk | 2 +- ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk | 2 +- ports/atmel-samd/boards/pygamer/mpconfigboard.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk index 1154d0bb1f..51fccc56e5 100644 --- a/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk @@ -7,5 +7,5 @@ CHIP_VARIANT = SAMD51J19A CHIP_FAMILY = samd51 QSPI_FLASH_FILESYSTEM = 1 -EXTERNAL_FLASH_DEVICES = GD25Q64C +EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" LONGINT_IMPL = MPZ diff --git a/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk b/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk index 86a04be87f..56dab1d788 100644 --- a/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk +++ b/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk @@ -7,5 +7,5 @@ CHIP_VARIANT = SAMD51J19A CHIP_FAMILY = samd51 QSPI_FLASH_FILESYSTEM = 1 -EXTERNAL_FLASH_DEVICES = GD25Q64C +EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" LONGINT_IMPL = MPZ diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk index 26c3fe9d9b..578952d37d 100644 --- a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk @@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51J19A CHIP_FAMILY = samd51 QSPI_FLASH_FILESYSTEM = 1 -EXTERNAL_FLASH_DEVICES = GD25Q64C +EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_AESIO = 0 From 4487f614042c15fd682eb326e3f9dc00d6332ab6 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 18 May 2022 11:37:13 -0400 Subject: [PATCH 0323/2403] Restore automatic gc_collect() after an import --- locale/circuitpython.pot | 4 ++++ py/builtinimport.c | 4 ++++ shared-module/rgbmatrix/RGBMatrix.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 9f4bf97a73..acf7e24b9f 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1022,6 +1022,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c msgid "Failed to allocate RX buffer" diff --git a/py/builtinimport.c b/py/builtinimport.c index dbacc3d657..10539d01a4 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -455,6 +455,10 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name, // not a package. This will be caught on the next iteration // because the file will not exist. } + + // Loading a module thrashes the heap significantly so we explicitly clean up + // afterwards. + gc_collect(); } if (outer_module_obj != MP_OBJ_NULL && VERIFY_PTR(MP_OBJ_TO_PTR(outer_module_obj))) { diff --git a/shared-module/rgbmatrix/RGBMatrix.c b/shared-module/rgbmatrix/RGBMatrix.c index 0bfed0aa6c..c6dbfc02b0 100644 --- a/shared-module/rgbmatrix/RGBMatrix.c +++ b/shared-module/rgbmatrix/RGBMatrix.c @@ -123,7 +123,7 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t *self, mp_raise_ValueError(translate("Invalid argument")); break; case PROTOMATTER_ERR_MALLOC: - mp_raise_msg(&mp_type_MemoryError, NULL); + mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate %q buffer"), MP_QSTR_RGBMatrix); break; default: mp_raise_msg_varg(&mp_type_RuntimeError, From a30de85d575833d4f38001fe48a65b915040dad6 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 18 May 2022 14:01:35 -0700 Subject: [PATCH 0324/2403] Add dotenv read support os.getenv() will use it (when available) to load variables from /.env This will also be useful when we need secrets or config for CircuitPython outside of the VM (like WiFi credentials.) Fixes #4212 --- py/circuitpy_defns.mk | 4 + py/circuitpy_mpconfig.mk | 3 + shared-bindings/dotenv/__init__.c | 105 ++++++++++++++ shared-bindings/dotenv/__init__.h | 39 ++++++ shared-bindings/os/__init__.c | 20 +++ shared-bindings/os/__init__.h | 1 + shared-module/dotenv/__init__.c | 221 ++++++++++++++++++++++++++++++ shared-module/dotenv/__init__.h | 28 ++++ shared-module/os/__init__.c | 14 ++ 9 files changed, 435 insertions(+) create mode 100644 shared-bindings/dotenv/__init__.c create mode 100644 shared-bindings/dotenv/__init__.h create mode 100644 shared-module/dotenv/__init__.c create mode 100644 shared-module/dotenv/__init__.h diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 0ae3341b3a..4d6456b258 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -158,6 +158,9 @@ endif ifeq ($(CIRCUITPY_DISPLAYIO),1) SRC_PATTERNS += displayio/% endif +ifeq ($(CIRCUITPY_DOTENV),1) +SRC_PATTERNS += dotenv/% +endif ifeq ($(CIRCUITPY_PARALLELDISPLAY),1) SRC_PATTERNS += paralleldisplay/% endif @@ -548,6 +551,7 @@ SRC_SHARED_MODULE_ALL = \ displayio/TileGrid.c \ displayio/area.c \ displayio/__init__.c \ + dotenv/__init__.c \ floppyio/__init__.c \ fontio/BuiltinFont.c \ fontio/__init__.c \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 1899541099..20691a0304 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -199,6 +199,9 @@ CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS) CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO) CFLAGS += -DCIRCUITPY_VECTORIO=$(CIRCUITPY_VECTORIO) +CIRCUITPY_DOTENV ?= $(CIRCUITPY_FULL_BUILD) +CFLAGS += -DCIRCUITPY_DOTENV=$(CIRCUITPY_DOTENV) + CIRCUITPY_DUALBANK ?= 0 CFLAGS += -DCIRCUITPY_DUALBANK=$(CIRCUITPY_DUALBANK) diff --git a/shared-bindings/dotenv/__init__.c b/shared-bindings/dotenv/__init__.c new file mode 100644 index 0000000000..89f6fe6792 --- /dev/null +++ b/shared-bindings/dotenv/__init__.c @@ -0,0 +1,105 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * SPDX-FileCopyrightText: Copyright (c) 2022 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 + +#include "extmod/vfs.h" +#include "lib/oofatfs/ff.h" +#include "lib/oofatfs/diskio.h" +#include "py/mpstate.h" +#include "py/obj.h" +#include "py/objstr.h" +#include "py/runtime.h" +#include "shared-bindings/dotenv/__init__.h" + +//| """Functions to manage environment variables from a .env file. +//| +//| A subset of the CPython `dotenv library `_. It does +//| not support variables or double quotes. +//| +//| The simplest way to define keys and values is to put them in single quotes. \ and ' are +//| escaped by \ in single quotes. Newlines can occur in quotes for multiline values. Comments +//| start with # and apply for the rest of the line. +//| +//| File format example: +//| +//| .. code-block:: +//| +//| key=value +//| key2 = value2 +//| 'key3' = 'value with spaces' +//| # comment +//| key4 = value3 # comment 2 +//| 'key5'=value4 +//| key=value5 # overrides the first one +//| multiline = 'hello +//| world +//| how are you?' +//| +//| """ +//| +//| import typing + +//| def get_key(dotenv_path: str, key_to_get: str) -> Optional[str]: +//| """Get the value for the given key from the given .env file. If the key occurs multiple +//| times in the file, then the last value will be returned. +//| +//| Returns None if the key isn't found or doesn't have a value.""" +//| ... +//| +STATIC mp_obj_t _dotenv_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) { + return common_hal_dotenv_get_key(mp_obj_str_get_str(path_in), + mp_obj_str_get_str(key_to_get_in)); +} +MP_DEFINE_CONST_FUN_OBJ_2(dotenv_get_key_obj, _dotenv_get_key); + +//| def load_dotenv() -> None: +//| """Does nothing in CircuitPython because os.getenv will automatically read .env when +//| available. +//| +//| Present in CircuitPython so CPython-compatible code can use it without error.""" +//| ... +//| +STATIC mp_obj_t dotenv_load_dotenv(void) { + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_0(dotenv_load_dotenv_obj, dotenv_load_dotenv); + +STATIC const mp_rom_map_elem_t dotenv_module_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_dotenv) }, + + { MP_ROM_QSTR(MP_QSTR_get_key), MP_ROM_PTR(&dotenv_get_key_obj) }, + { MP_ROM_QSTR(MP_QSTR_load_dotenv), MP_ROM_PTR(&dotenv_load_dotenv_obj) }, +}; + +STATIC MP_DEFINE_CONST_DICT(dotenv_module_globals, dotenv_module_globals_table); + +const mp_obj_module_t dotenv_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&dotenv_module_globals, +}; + +MP_REGISTER_MODULE(MP_QSTR_dotenv, dotenv_module, CIRCUITPY_DOTENV); diff --git a/shared-bindings/dotenv/__init__.h b/shared-bindings/dotenv/__init__.h new file mode 100644 index 0000000000..18a6c280dd --- /dev/null +++ b/shared-bindings/dotenv/__init__.h @@ -0,0 +1,39 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H +#define MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H + +#include +#include + +#include "py/objtuple.h" + +#include "shared-module/dotenv/__init__.h" + +mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c index 2daca52b85..a8545d9079 100644 --- a/shared-bindings/os/__init__.c +++ b/shared-bindings/os/__init__.c @@ -83,6 +83,25 @@ STATIC mp_obj_t os_getcwd(void) { } MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd); +//| def getenv(key: str, default: Optional[str] = None) -> Optional[str]: +//| """Get the environment variable value for the given key or return ``default``. +//| +//| This may load values from disk so cache the result instead of calling this often.""" +//| ... +//| +STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_key, ARG_default }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_key, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_default, 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); + + return common_hal_os_getenv(mp_obj_str_get_str(args[ARG_key].u_obj), args[ARG_default].u_obj); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv); + //| def listdir(dir: str) -> str: //| """With no argument, list the current directory. Otherwise list the given directory.""" //| ... @@ -220,6 +239,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&os_chdir_obj) }, { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&os_getcwd_obj) }, + { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&os_getenv_obj) }, { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_listdir_obj) }, { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&os_mkdir_obj) }, { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_remove_obj) }, diff --git a/shared-bindings/os/__init__.h b/shared-bindings/os/__init__.h index f6f0a25c93..5a27f309b4 100644 --- a/shared-bindings/os/__init__.h +++ b/shared-bindings/os/__init__.h @@ -37,6 +37,7 @@ extern const mp_rom_obj_tuple_t common_hal_os_uname_info_obj; mp_obj_t common_hal_os_uname(void); void common_hal_os_chdir(const char *path); mp_obj_t common_hal_os_getcwd(void); +mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_); mp_obj_t common_hal_os_listdir(const char *path); void common_hal_os_mkdir(const char *path); void common_hal_os_remove(const char *path); diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c new file mode 100644 index 0000000000..3efec3c346 --- /dev/null +++ b/shared-module/dotenv/__init__.c @@ -0,0 +1,221 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * SPDX-FileCopyrightText: Copyright (c) 2022 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 + +#include "shared-bindings/dotenv/__init__.h" + +#include "extmod/vfs.h" +#include "extmod/vfs_fat.h" +#include "py/mpstate.h" +#include "py/objstr.h" + +STATIC uint8_t consume_spaces(FIL *active_file) { + uint8_t character = ' '; + size_t quantity_read = 1; + while (unichar_isspace(character) && quantity_read > 0) { + f_read(active_file, &character, 1, &quantity_read); + } + return character; +} + +// Starting at the start of a new line, determines if the key matches the given +// key. File pointer is left after the = after the key. +STATIC bool key_matches(FIL *active_file, const char *key) { + uint8_t character = ' '; + size_t quantity_read = 1; + character = consume_spaces(active_file); + bool quoted = false; + if (character == '\'') { + quoted = true; + f_read(active_file, &character, 1, &quantity_read); + } + size_t key_pos = 0; + bool escaped = false; + bool matches = true; + size_t key_len = strlen(key); + while (quantity_read > 0) { + if (character == '\\' && !escaped && quoted) { + escaped = true; + } else if (!escaped && quoted && character == '\'') { + quoted = false; + // Move past the quoted before breaking so we can check the validity of data past it. + f_read(active_file, &character, 1, &quantity_read); + break; + } else if (!quoted && (unichar_isspace(character) || character == '=' || character == '\n' || character == '#')) { + break; + } else { + matches = matches && key[key_pos] == character; + escaped = false; + key_pos++; + } + + f_read(active_file, &character, 1, &quantity_read); + } + if (unichar_isspace(character)) { + character = consume_spaces(active_file); + } + if (character == '=' || character == '\n' || character == '#') { + // Rewind one so the value can find it. + f_lseek(active_file, f_tell(active_file) - 1); + } else { + // We're followed by something else that is invalid syntax. + matches = false; + } + return matches && key_pos == key_len; +} + +STATIC bool next_line(FIL *active_file) { + uint8_t character = ' '; + size_t quantity_read = 1; + bool quoted = false; + bool escaped = false; + // Track comments because they last until the end of the line. + bool comment = false; + FRESULT result = FR_OK; + // Consume all characters while quoted or others up to \n. + while (result == FR_OK && quantity_read > 0 && (quoted || character != '\n')) { + if (character == '#' || comment) { + // Comments consume any escaping. + comment = true; + } else if (!escaped) { + if (character == '\'') { + quoted = !quoted; + } else if (character == '\\') { + escaped = true; + } + } else { + escaped = false; + } + result = f_read(active_file, &character, 1, &quantity_read); + } + return result == FR_OK && quantity_read > 0; +} + +STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) { + uint8_t character = ' '; + size_t quantity_read = 1; + // Consume spaces before = + character = consume_spaces(active_file); + if (character != '=') { + if (character == '#' || character == '\n') { + // Keys without an = after them are valid with the value None. + return 0; + } + // All other characters are invalid. + return -1; + } + character = ' '; + // Consume space after = + while (unichar_isspace(character) && quantity_read > 0) { + f_read(active_file, &character, 1, &quantity_read); + } + bool quoted = false; + if (character == '\'') { + quoted = true; + f_read(active_file, &character, 1, &quantity_read); + } + if (character == '"') { + // We don't support double quoted values. + return -1; + } + // Copy the value over. + size_t value_pos = 0; + bool escaped = false; + // Count trailing spaces so we can ignore them at the end of unquoted + // values. + size_t trailing_spaces = 0; + while (quantity_read > 0) { + // Consume the first \ if the value is quoted. + if (quoted && character == '\\' && !escaped) { + escaped = true; + // Drop this slash by short circuiting the rest of the loop. + f_read(active_file, &character, 1, &quantity_read); + continue; + } + if (quoted && !escaped && character == '\'') { + // trailing ' means the value is done. + break; + } + // Unquoted values are ended by a newline or comment. + if (!quoted && (character == '\n' || character == '#')) { + break; + } + if (!quoted && unichar_isspace(character)) { + trailing_spaces += 1; + } else { + trailing_spaces = 0; + } + escaped = false; + // Only copy the value over if we have space. Otherwise, we'll just + // count the overall length. + if (value_pos < value_len) { + value[value_pos] = character; + } + value_pos++; + f_read(active_file, &character, 1, &quantity_read); + } + + return value_pos - trailing_spaces; +} + +mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len) { + FIL active_file; + FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; + FRESULT result = f_open(fs, &active_file, path, FA_READ); + if (result != FR_OK) { + return -1; + } + + mp_int_t actual_value_len = -1; + bool read_ok = true; + while (read_ok) { + if (key_matches(&active_file, key)) { + actual_value_len = read_value(&active_file, value, value_len); + } + + read_ok = next_line(&active_file); + } + f_close(&active_file); + return actual_value_len; +} + +mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key) { + // Use the stack for short values. Longer values will require a heap allocation after we know + // the length. + char value[64]; + mp_int_t actual_len = dotenv_get_key(path, key, value, sizeof(value)); + if (actual_len <= 0) { + return mp_const_none; + } + if ((size_t)actual_len >= sizeof(value)) { + mp_obj_str_t *str = MP_OBJ_TO_PTR(mp_obj_new_str_copy(&mp_type_str, NULL, actual_len + 1)); + dotenv_get_key(path, key, (char *)str->data, actual_len + 1); + str->hash = qstr_compute_hash(str->data, actual_len); + return MP_OBJ_FROM_PTR(str); + } + return mp_obj_new_str(value, actual_len); +} diff --git a/shared-module/dotenv/__init__.h b/shared-module/dotenv/__init__.h new file mode 100644 index 0000000000..6cfb209324 --- /dev/null +++ b/shared-module/dotenv/__init__.h @@ -0,0 +1,28 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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. + */ + +// Allocation free version that returns the full length of the value. +mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len); diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c index 89c7952671..35933ebaf6 100644 --- a/shared-module/os/__init__.c +++ b/shared-module/os/__init__.c @@ -36,6 +36,10 @@ #include "py/runtime.h" #include "shared-bindings/os/__init__.h" +#if CIRCUITPY_DOTENV +#include "shared-bindings/dotenv/__init__.h" +#endif + // This provides all VFS related OS functions so that ports can share the code // as needed. It does not provide uname. @@ -107,6 +111,16 @@ mp_obj_t common_hal_os_getcwd(void) { return mp_vfs_getcwd(); } +mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) { + #if CIRCUITPY_DOTENV + mp_obj_t env_obj = common_hal_dotenv_get_key("/.env", key); + if (env_obj != mp_const_none) { + return env_obj; + } + #endif + return default_; +} + mp_obj_t common_hal_os_listdir(const char *path) { mp_obj_t path_out; mp_vfs_mount_t *vfs = lookup_dir_path(path, &path_out); From a01dec1df971e8382ebaa76a0afc028f57fa4815 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 13 May 2022 15:33:43 -0400 Subject: [PATCH 0325/2403] message consolidation and more use of validators --- .../common-hal/_bleio/Characteristic.c | 6 +- extmod/vfs_fat.c | 35 +- extmod/vfs_fat_file.c | 2 +- locale/circuitpython.pot | 566 ++++-------------- .../common-hal/alarm/pin/PinAlarm.c | 4 +- .../common-hal/alarm/time/TimeAlarm.c | 2 +- .../atmel-samd/common-hal/analogio/AnalogIn.c | 3 +- .../common-hal/analogio/AnalogOut.c | 2 +- .../atmel-samd/common-hal/audiobusio/I2SOut.c | 2 +- .../atmel-samd/common-hal/audioio/AudioOut.c | 11 +- ports/atmel-samd/common-hal/busio/I2C.c | 12 +- ports/atmel-samd/common-hal/busio/SPI.c | 4 +- ports/atmel-samd/common-hal/busio/UART.c | 9 +- .../common-hal/frequencyio/FrequencyIn.c | 13 +- .../common-hal/i2cperipheral/I2CPeripheral.c | 3 +- .../imagecapture/ParallelImageCapture.c | 2 +- .../common-hal/microcontroller/__init__.c | 2 +- ports/atmel-samd/common-hal/ps2io/Ps2.c | 40 +- ports/atmel-samd/common-hal/ps2io/Ps2.h | 2 +- ports/atmel-samd/common-hal/pulseio/PulseIn.c | 10 +- ports/atmel-samd/common-hal/pwmio/PWMOut.c | 2 +- ports/atmel-samd/common-hal/rtc/RTC.c | 8 +- ports/atmel-samd/common-hal/touchio/TouchIn.c | 3 +- ports/broadcom/common-hal/busio/I2C.c | 2 +- ports/broadcom/common-hal/busio/SPI.c | 2 +- ports/broadcom/common-hal/busio/UART.c | 13 +- ports/cxd56/common-hal/analogio/AnalogIn.c | 7 +- ports/cxd56/common-hal/analogio/AnalogOut.c | 2 +- ports/cxd56/common-hal/busio/I2C.c | 3 +- ports/cxd56/common-hal/busio/SPI.c | 3 +- ports/cxd56/common-hal/busio/UART.c | 17 +- ports/cxd56/common-hal/camera/Camera.c | 4 +- .../cxd56/common-hal/digitalio/DigitalInOut.c | 3 +- ports/cxd56/common-hal/gnss/GNSS.c | 2 +- .../common-hal/microcontroller/__init__.c | 2 +- ports/cxd56/common-hal/pulseio/PulseIn.c | 4 +- ports/cxd56/common-hal/pwmio/PWMOut.c | 4 +- ports/cxd56/common-hal/rtc/RTC.c | 2 +- ports/cxd56/common-hal/sdioio/SDCard.c | 7 +- .../common-hal/alarm/touch/TouchAlarm.c | 3 +- .../espressif/common-hal/analogio/AnalogIn.c | 4 +- .../espressif/common-hal/analogio/AnalogOut.c | 2 +- ports/espressif/common-hal/busio/I2C.c | 2 +- ports/espressif/common-hal/busio/SPI.c | 3 +- ports/espressif/common-hal/busio/UART.c | 4 +- ports/espressif/common-hal/canio/CAN.c | 2 +- .../common-hal/frequencyio/FrequencyIn.c | 9 +- .../common-hal/i2cperipheral/I2CPeripheral.c | 5 +- .../imagecapture/ParallelImageCapture.c | 4 +- ports/espressif/common-hal/pulseio/PulseIn.c | 2 +- ports/espressif/common-hal/pwmio/PWMOut.c | 2 +- ports/espressif/common-hal/rtc/RTC.c | 2 +- ports/espressif/common-hal/touchio/TouchIn.c | 3 +- ports/espressif/common-hal/wifi/Radio.c | 7 +- .../mimxrt10xx/common-hal/analogio/AnalogIn.c | 2 +- .../common-hal/analogio/AnalogOut.c | 2 +- ports/mimxrt10xx/common-hal/busio/I2C.c | 2 +- ports/mimxrt10xx/common-hal/busio/SPI.c | 2 +- ports/mimxrt10xx/common-hal/busio/UART.c | 4 +- .../common-hal/microcontroller/__init__.c | 2 +- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 2 +- ports/mimxrt10xx/common-hal/rtc/RTC.c | 2 +- ports/mimxrt10xx/common-hal/usb_host/Port.c | 5 +- ports/nrf/common-hal/alarm/pin/PinAlarm.c | 4 +- ports/nrf/common-hal/alarm/time/TimeAlarm.c | 2 +- ports/nrf/common-hal/analogio/AnalogIn.c | 3 +- ports/nrf/common-hal/analogio/AnalogOut.c | 2 +- ports/nrf/common-hal/audiopwmio/PWMAudioOut.c | 5 +- ports/nrf/common-hal/busio/I2C.c | 3 +- ports/nrf/common-hal/busio/UART.c | 12 +- ports/nrf/common-hal/pulseio/PulseIn.c | 4 +- ports/nrf/common-hal/pwmio/PWMOut.c | 2 +- ports/nrf/common-hal/rtc/RTC.c | 2 +- .../bindings/rp2pio/StateMachine.c | 45 +- .../common-hal/analogio/AnalogIn.c | 3 +- .../common-hal/analogio/AnalogOut.c | 2 +- ports/raspberrypi/common-hal/busio/I2C.c | 9 +- ports/raspberrypi/common-hal/busio/SPI.c | 2 +- ports/raspberrypi/common-hal/busio/UART.c | 14 +- .../raspberrypi/common-hal/pulseio/PulseIn.c | 4 +- ports/raspberrypi/common-hal/pwmio/PWMOut.c | 2 +- ports/raspberrypi/common-hal/rtc/RTC.c | 2 +- ports/stm/common-hal/alarm/time/TimeAlarm.c | 2 +- ports/stm/common-hal/analogio/AnalogIn.c | 2 +- ports/stm/common-hal/analogio/AnalogOut.c | 2 +- ports/stm/common-hal/busio/I2C.c | 6 +- ports/stm/common-hal/busio/SPI.c | 14 +- ports/stm/common-hal/busio/UART.c | 19 +- ports/stm/common-hal/canio/CAN.c | 4 +- ports/stm/common-hal/pulseio/PulseIn.c | 5 +- ports/stm/common-hal/sdioio/SDCard.c | 2 +- py/argcheck.c | 42 +- py/builtinimport.c | 2 +- py/runtime.h | 8 +- shared-bindings/_bleio/Address.c | 2 +- shared-bindings/_bleio/Characteristic.c | 8 +- shared-bindings/_bleio/CharacteristicBuffer.c | 10 +- shared-bindings/_bleio/Descriptor.c | 6 +- shared-bindings/_bleio/PacketBuffer.c | 5 +- shared-bindings/adafruit_pixelbuf/PixelBuf.c | 12 +- shared-bindings/aesio/aes.c | 13 +- shared-bindings/alarm/SleepMemory.c | 5 +- shared-bindings/analogio/AnalogOut.c | 6 +- shared-bindings/audiomixer/Mixer.c | 20 +- shared-bindings/bitbangio/I2C.c | 4 +- shared-bindings/bitbangio/SPI.c | 16 +- shared-bindings/bitops/__init__.c | 11 +- shared-bindings/busio/I2C.c | 4 +- shared-bindings/busio/SPI.c | 17 +- shared-bindings/busio/UART.c | 10 +- shared-bindings/canio/Message.c | 10 +- shared-bindings/digitalio/DigitalInOut.c | 2 +- shared-bindings/displayio/FourWire.c | 16 +- shared-bindings/displayio/Group.c | 11 +- shared-bindings/displayio/I2CDisplay.c | 7 +- shared-bindings/displayio/Shape.c | 10 +- shared-bindings/displayio/TileGrid.c | 5 +- shared-bindings/fontio/BuiltinFont.c | 5 +- .../memorymonitor/AllocationAlarm.c | 13 +- shared-bindings/microcontroller/Pin.c | 8 + shared-bindings/microcontroller/Pin.h | 2 + shared-bindings/microcontroller/__init__.c | 2 +- shared-bindings/msgpack/ExtType.c | 6 +- shared-bindings/nvm/ByteArray.c | 5 +- shared-bindings/paralleldisplay/ParallelBus.c | 6 +- shared-bindings/ps2io/Ps2.c | 12 +- shared-bindings/ps2io/Ps2.h | 2 +- shared-bindings/pwmio/PWMOut.c | 12 +- shared-bindings/rgbmatrix/RGBMatrix.c | 20 +- shared-bindings/sdioio/SDCard.c | 8 +- shared-bindings/supervisor/__init__.c | 5 +- shared-bindings/synthio/__init__.c | 6 +- shared-bindings/usb_hid/Device.c | 14 +- shared-bindings/wifi/Monitor.c | 11 +- shared-bindings/wifi/Radio.c | 12 +- shared-module/_bleio/Attribute.c | 2 +- shared-module/adafruit_pixelbuf/PixelBuf.c | 4 +- shared-module/audiocore/WaveFile.c | 10 +- shared-module/audiomixer/Mixer.c | 4 +- shared-module/audiomp3/MP3Decoder.c | 9 +- shared-module/bitbangio/SPI.c | 12 +- shared-module/displayio/Group.c | 6 +- shared-module/displayio/OnDiskBitmap.c | 2 +- .../framebufferio/FramebufferDisplay.c | 5 +- shared-module/rgbmatrix/RGBMatrix.c | 4 +- shared-module/synthio/MidiTrack.c | 14 +- shared-module/usb_hid/Device.c | 15 +- shared-module/vectorio/Circle.c | 2 +- shared-module/vectorio/Polygon.c | 7 +- shared-module/vectorio/Rectangle.c | 2 +- shared-module/vectorio/VectorShape.c | 8 +- 151 files changed, 557 insertions(+), 1035 deletions(-) diff --git a/devices/ble_hci/common-hal/_bleio/Characteristic.c b/devices/ble_hci/common-hal/_bleio/Characteristic.c index e2f9cad0ef..b6e144f191 100644 --- a/devices/ble_hci/common-hal/_bleio/Characteristic.c +++ b/devices/ble_hci/common-hal/_bleio/Characteristic.c @@ -57,9 +57,9 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, self->value = mp_obj_new_bytes(initial_value_bufinfo->buf, initial_value_bufinfo->len); const mp_int_t max_length_max = 512; - if (max_length < 0 || max_length > max_length_max) { - mp_raise_ValueError(translate("max_length must be <= 512")); - } + + mp_arg_validate_int_range(max_length, 0, max_length_max, MP_QSTR_max_length); + self->max_length = max_length; self->fixed_length = fixed_length; diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c index 208cf101f9..ed5cc6095f 100644 --- a/extmod/vfs_fat.c +++ b/extmod/vfs_fat.c @@ -30,6 +30,11 @@ #define mp_obj_fat_vfs_t fs_user_mount_t +// Factoring this common call saves about 90 bytes. +STATIC NORETURN void mp_raise_OSError_fresult(FRESULT res) { + mp_raise_OSError(fresult_to_errno_table[res]); +} + STATIC mp_import_stat_t fat_vfs_import_stat(void *vfs_in, const char *path) { fs_user_mount_t *vfs = vfs_in; FILINFO fno; @@ -64,7 +69,7 @@ STATIC mp_obj_t fat_vfs_make_new(const mp_obj_type_t *type, size_t n_args, size_ // don't error out if no filesystem, to let mkfs()/mount() create one if wanted vfs->blockdev.flags |= MP_BLOCKDEV_FLAG_NO_FILESYSTEM; } else if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return MP_OBJ_FROM_PTR(vfs); @@ -97,7 +102,7 @@ STATIC mp_obj_t fat_vfs_mkfs(mp_obj_t bdev_in) { res = f_mkfs(&vfs->fatfs, FM_FAT32, 0, working_buf, sizeof(working_buf)); } if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_const_none; @@ -172,7 +177,7 @@ STATIC mp_obj_t fat_vfs_ilistdir_func(size_t n_args, const mp_obj_t *args) { iter->is_str = is_str_type; FRESULT res = f_opendir(&self->fatfs, &iter->dir, path); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return MP_OBJ_FROM_PTR(iter); @@ -188,7 +193,7 @@ STATIC mp_obj_t fat_vfs_remove_internal(mp_obj_t vfs_in, mp_obj_t path_in, mp_in FRESULT res = f_stat(&self->fatfs, path, &fno); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } // check if path is a file or directory @@ -196,7 +201,7 @@ STATIC mp_obj_t fat_vfs_remove_internal(mp_obj_t vfs_in, mp_obj_t path_in, mp_in res = f_unlink(&self->fatfs, path); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_const_none; } else { @@ -226,7 +231,7 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_ FILINFO fno; FRESULT res = f_stat(&self->fatfs, old_path, &fno); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } if ((fno.fattrib & AM_DIR) != 0 && strlen(new_path) > strlen(old_path) && @@ -245,7 +250,7 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_ if (res == FR_OK) { return mp_const_none; } else { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } } @@ -259,7 +264,7 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) { if (res == FR_OK) { return mp_const_none; } else { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } } STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir); @@ -273,7 +278,7 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) { FRESULT res = f_chdir(&self->fatfs, path); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_const_none; @@ -286,7 +291,7 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) { char buf[MICROPY_ALLOC_PATH_MAX + 1]; FRESULT res = f_getcwd(&self->fatfs, buf, sizeof(buf)); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_obj_new_str(buf, strlen(buf)); } @@ -307,7 +312,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) { } else { FRESULT res = f_stat(&self->fatfs, path, &fno); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } } @@ -357,7 +362,7 @@ STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) { FATFS *fatfs = &self->fatfs; FRESULT res = f_getfree(fatfs, &nclst); if (FR_OK != res) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL)); @@ -395,7 +400,7 @@ STATIC mp_obj_t vfs_fat_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs res = f_mkfs(&self->fatfs, FM_FAT | FM_SFD, 0, working_buf, sizeof(working_buf)); } if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } self->blockdev.flags &= ~MP_BLOCKDEV_FLAG_NO_FILESYSTEM; @@ -416,7 +421,7 @@ STATIC mp_obj_t vfs_fat_getlabel(mp_obj_t self_in) { char working_buf[12]; FRESULT res = f_getlabel(&self->fatfs, working_buf, NULL); if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_obj_new_str(working_buf, strlen(working_buf)); } @@ -431,7 +436,7 @@ STATIC mp_obj_t vfs_fat_setlabel(mp_obj_t self_in, mp_obj_t label_in) { if (res == FR_WRITE_PROTECTED) { mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Read-only filesystem")); } - mp_raise_OSError(fresult_to_errno_table[res]); + mp_raise_OSError_fresult(res); } return mp_const_none; } diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c index 65ee5f9024..2415f7d3c1 100644 --- a/extmod/vfs_fat_file.c +++ b/extmod/vfs_fat_file.c @@ -182,7 +182,7 @@ STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_ar } if (rwxa_count != 1 || plus_count > 1 || bt_count > 1 || bad_mode) { - mp_raise_ValueError(translate("Invalid mode")); + mp_arg_error_invalid(MP_QSTR_mode); } assert(vfs != NULL); diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 9f4bf97a73..fdd4d09887 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -66,6 +66,16 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" @@ -82,12 +92,7 @@ msgstr "" msgid "%q in use" msgstr "" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "" @@ -95,14 +100,34 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -119,14 +144,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.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/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c msgid "%q must be >= 1" msgstr "" @@ -135,13 +156,8 @@ msgstr "" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -160,8 +176,12 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c -#: shared-bindings/canio/Match.c +#: ports/stm/common-hal/pulseio/PulseIn.c shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -169,10 +189,6 @@ msgstr "" msgid "%q pin invalid" msgstr "" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -335,10 +351,6 @@ msgstr "" msgid "'yield' outside function" msgstr "" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -374,10 +386,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -468,25 +476,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -556,11 +545,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "" @@ -602,11 +586,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -616,7 +595,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -631,10 +609,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -656,10 +630,6 @@ msgstr "" msgid "Byte buffer must be 16 bytes." msgstr "" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -732,7 +702,7 @@ msgid "Cannot pull on input-only pin." msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." +msgid "Cannot read without MISO pin" msgstr "" #: shared-bindings/audiobusio/PDMIn.c @@ -746,7 +716,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -767,20 +737,23 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +msgid "Cannot write without MOSI pin" msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -795,10 +768,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -807,11 +776,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -822,16 +786,9 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - +#: ports/cxd56/common-hal/camera/Camera.c ports/cxd56/common-hal/gnss/GNSS.c #: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" +msgid "Could not initialize %q" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c @@ -871,20 +828,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -932,10 +875,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -991,11 +930,6 @@ msgstr "" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1022,22 +956,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1106,11 +1024,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1152,16 +1065,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1269,75 +1178,39 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c +#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c +#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/common-hal/busio/I2C.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1345,42 +1218,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1389,32 +1231,10 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "" - #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "Invalid pin for left channel" msgstr "" @@ -1423,44 +1243,10 @@ msgstr "" msgid "Invalid pin for right channel" msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c -#: shared-bindings/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1473,23 +1259,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1503,25 +1272,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1531,10 +1292,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1548,10 +1305,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1587,11 +1348,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1652,15 +1408,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1699,16 +1463,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1853,10 +1607,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1888,11 +1645,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1901,11 +1653,6 @@ msgstr "" msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1927,29 +1674,18 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" +#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c +msgid "Pin cannot wake from deep sleep" msgstr "" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2016,18 +1752,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2050,7 +1778,7 @@ msgid "RNG Init Error" msgstr "" #: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2058,12 +1786,6 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" @@ -2132,29 +1854,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-initialization error" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2175,14 +1888,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2218,10 +1923,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2307,10 +2008,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2330,6 +2027,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2362,19 +2062,15 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init error" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART init error" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" +msgid "UART re-init error" msgstr "" #: ports/stm/common-hal/busio/UART.c @@ -2515,9 +2211,7 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c +#: ports/cxd56/common-hal/busio/I2C.c ports/espressif/common-hal/busio/UART.c msgid "Unsupported baudrate" msgstr "" @@ -2533,6 +2227,10 @@ msgstr "" msgid "Unsupported format" msgstr "" +#: ports/atmel-samd/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c +msgid "Unsupported frequency" +msgstr "" + #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -2595,10 +2293,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2751,10 +2445,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2792,11 +2482,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2805,7 +2490,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2813,12 +2498,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3001,10 +2683,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3679,10 +3357,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3690,10 +3364,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4064,10 +3734,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4114,14 +3780,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4292,10 +3950,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4344,10 +3998,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4367,10 +4017,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4570,13 +4216,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c index eda111639b..b771c5b998 100644 --- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c +++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c @@ -234,7 +234,7 @@ static void pinalarm_set_alarms_light(size_t n_alarms, const mp_obj_t *alarms) { // raise ValueError here MP_FALLTHROUGH case PINALARM_ERR_NOEXTINT: - mp_raise_RuntimeError(translate("No hardware support on pin")); + raise_ValueError_invalid_pin(); case PINALARM_ERR_NOCHANNEL: mp_raise_RuntimeError(translate("A hardware interrupt channel is already in use")); default: @@ -261,7 +261,7 @@ static void pinalarm_set_alarms_deep(size_t n_alarms, const mp_obj_t *alarms) { } } if (t->n < 0) { - mp_raise_ValueError(translate("Pin cannot wake from Deep Sleep")); + mp_raise_ValueError(translate("Pin cannot wake from deep sleep")); } // It is strange, but to my experiment, interrupt during sleep diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c index 14a7346c17..3f116f07e3 100644 --- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c +++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c @@ -100,7 +100,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ continue; } if (timealarm_set) { - mp_raise_ValueError(translate("Only one alarm.time alarm can be set.")); + mp_raise_ValueError(translate("Only one alarm.time alarm can be set")); } timealarm = MP_OBJ_TO_PTR(alarms[i]); timealarm_set = true; diff --git a/ports/atmel-samd/common-hal/analogio/AnalogIn.c b/ports/atmel-samd/common-hal/analogio/AnalogIn.c index 262e44350c..4140324a1c 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogIn.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogIn.c @@ -36,6 +36,7 @@ #include "samd/adc.h" #include "shared-bindings/analogio/AnalogIn.h" +#include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/translate.h" #include "atmel_start_pins.h" @@ -60,7 +61,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, } if (adc_channel == 0xff) { // No ADC function on that pin - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } claim_pin(pin); diff --git a/ports/atmel-samd/common-hal/analogio/AnalogOut.c b/ports/atmel-samd/common-hal/analogio/AnalogOut.c index 91782387b8..2f38fce700 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogOut.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogOut.c @@ -70,7 +70,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, #endif default: - mp_raise_ValueError(translate("AnalogOut not supported on given pin")); + raise_ValueError_invalid_pin(); return; } diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c index a434e2541b..f5531f2bab 100644 --- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c +++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c @@ -255,7 +255,7 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self, } uint8_t channel_count = audiosample_channel_count(sample); if (channel_count > 2) { - mp_raise_ValueError(translate("Too many channels in sample.")); + mp_raise_ValueError(translate("Too many channels in sample")); } #ifdef SAMD21 uint32_t serctrl = (self->clock_unit << I2S_SERCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_TX) | I2S_SERCTRL_TXSAME_SAME | I2S_SERCTRL_EXTEND_MSBIT | I2S_SERCTRL_TXDEFAULT_ONE | I2S_SERCTRL_SLOTADJ_LEFT; diff --git a/ports/atmel-samd/common-hal/audioio/AudioOut.c b/ports/atmel-samd/common-hal/audioio/AudioOut.c index 7be7cf7c4c..87a6ee62ad 100644 --- a/ports/atmel-samd/common-hal/audioio/AudioOut.c +++ b/ports/atmel-samd/common-hal/audioio/AudioOut.c @@ -136,7 +136,7 @@ void common_hal_audioio_audioout_construct(audioio_audioout_obj_t *self, mp_raise_ValueError(translate("Right channel unsupported")); } if (left_channel != &pin_PA02) { - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); } claim_pin(left_channel); #endif @@ -376,14 +376,13 @@ void common_hal_audioio_audioout_play(audioio_audioout_obj_t *self, audio_dma_result result = AUDIO_DMA_OK; uint32_t sample_rate = audiosample_sample_rate(sample); #ifdef SAMD21 - uint32_t max_sample_rate = 350000; + const uint32_t max_sample_rate = 350000; #endif #ifdef SAM_D5X_E5X - uint32_t max_sample_rate = 1000000; + const uint32_t max_sample_rate = 1000000; #endif - if (sample_rate > max_sample_rate) { - mp_raise_ValueError_varg(translate("Sample rate too high. It must be less than %d"), max_sample_rate); - } + mp_arg_validate_int_max(sample_rate, max_sample_rate, MP_QSTR_sample_rate); + #ifdef SAMD21 result = audio_dma_setup_playback(&self->left_dma, sample, loop, true, 0, false /* output unsigned */, diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c index 48ee26a9b6..4124faff4a 100644 --- a/ports/atmel-samd/common-hal/busio/I2C.c +++ b/ports/atmel-samd/common-hal/busio/I2C.c @@ -34,6 +34,7 @@ #include "samd/sercom.h" #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/translate.h" #include "common-hal/busio/__init__.h" @@ -76,7 +77,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, self->sda_pin = NO_PIN; Sercom *sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux); if (sercom == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } #if CIRCUITPY_REQUIRE_I2C_PULLUPS @@ -122,15 +123,12 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, // The maximum frequency divisor gives a clock rate of around 48MHz/2/255 // but set_baudrate does not diagnose this problem. (This is not the // exact cutoff, but no frequency well under 100kHz is available) - if (frequency < 95000) { - mp_raise_ValueError(translate("Unsupported baudrate")); - } - - if (i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE) { + if (frequency < 95000 && + i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE) { reset_pin_number(sda->number); reset_pin_number(scl->number); common_hal_busio_i2c_deinit(self); - mp_raise_ValueError(translate("Unsupported baudrate")); + mp_raise_ValueError(translate("Unsupported frequency")); } self->sda_pin = sda->number; diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c index 0f6f38461c..fde15824c8 100644 --- a/ports/atmel-samd/common-hal/busio/SPI.c +++ b/ports/atmel-samd/common-hal/busio/SPI.c @@ -25,6 +25,7 @@ */ #include "shared-bindings/busio/SPI.h" +#include "shared-bindings/microcontroller/Pin.h" #include "py/mperrno.h" #include "py/runtime.h" @@ -33,7 +34,6 @@ #include "supervisor/board.h" #include "common-hal/busio/__init__.h" -#include "common-hal/microcontroller/Pin.h" #include "hal/include/hal_gpio.h" #include "hal/include/hal_spi_m_sync.h" @@ -133,7 +133,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, } } if (sercom == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } // Set up SPI clocks on SERCOM. diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index 194f1c0217..0af363ae44 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -25,6 +25,7 @@ */ #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/busio/UART.h" #include "mpconfigport.h" @@ -79,9 +80,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device")); } - if (bits > 8) { - mp_raise_NotImplementedError(translate("bytes > 8 bits not supported")); - } + mp_arg_validate_int_max(bits, 8, MP_QSTR_bits); bool have_tx = tx != NULL; bool have_rx = rx != NULL; @@ -145,7 +144,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } } if (sercom == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if (!have_tx) { tx_pad = 0; @@ -175,7 +174,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->buffer = (uint8_t *)gc_alloc(self->buffer_length * sizeof(uint8_t), false, true); if (self->buffer == NULL) { common_hal_busio_uart_deinit(self); - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), self->buffer_length * sizeof(uint8_t)); + m_malloc_fail(self->buffer_length * sizeof(uint8_t)); } } } else { diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c index 4e06b77b56..4a6a620603 100644 --- a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c +++ b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c @@ -45,6 +45,7 @@ #include "peripheral_clk_config.h" #include "hpl_gclk_config.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/time/__init__.h" #include "supervisor/shared/tick.h" #include "supervisor/shared/translate.h" @@ -282,11 +283,11 @@ static void frequencyin_samd51_stop_dpll(void) { void common_hal_frequencyio_frequencyin_construct(frequencyio_frequencyin_obj_t* self, const mcu_pin_obj_t* pin, const uint16_t capture_period) { if (!pin->has_extint) { - mp_raise_RuntimeError(translate("No hardware support on pin")); - } - if ((capture_period == 0) || (capture_period > 500)) { - mp_raise_ValueError(translate("Invalid capture period. Valid range: 1 - 500")); + raise_ValueError_invalid_pin(); } + + mp_arg_validate_int_range(capture_period, 0, 500, MP_QSTR_capture_period); + uint32_t mask = 1 << pin->extint_channel; if (eic_get_enable() == 1 && #ifdef SAMD21 @@ -569,9 +570,7 @@ uint16_t common_hal_frequencyio_frequencyin_get_capture_period(frequencyio_frequ } void common_hal_frequencyio_frequencyin_set_capture_period(frequencyio_frequencyin_obj_t *self, uint16_t capture_period) { - if ((capture_period == 0) || (capture_period > 500)) { - mp_raise_ValueError(translate("Invalid capture period. Valid range: 1 - 500")); - } + mp_arg_validate_int_range(capture_period, 1, 500, MP_QSTR_capture_period); self->capture_period = capture_period; diff --git a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c index e1849a6b15..ae118c1909 100644 --- a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c +++ b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c @@ -25,6 +25,7 @@ */ #include "shared-bindings/i2cperipheral/I2CPeripheral.h" +#include "shared-bindings/microcontroller/Pin.h" #include "common-hal/busio/I2C.h" #include "shared/runtime/interrupt_char.h" @@ -42,7 +43,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe uint32_t sda_pinmux, scl_pinmux; Sercom *sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux); if (sercom == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } self->sercom = sercom; diff --git a/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c b/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c index 8e41f50d8d..1f23b27590 100644 --- a/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c @@ -63,7 +63,7 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle } // The peripheral supports 8, 10, 12, or 14 data bits, but the code only supports 8 at present if (data_count != 8) { - mp_raise_ValueError_varg(translate("Invalid data_count %d"), data_count); + mp_arg_error_invalid(MP_QSTR_datacount); } if (vertical_sync && vertical_sync->number != PIN_PCC_DEN1) { mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_vsync); diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c index 983af7a647..6856f4a48b 100644 --- a/ports/atmel-samd/common-hal/microcontroller/__init__.c +++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c @@ -66,7 +66,7 @@ void common_hal_mcu_enable_interrupts(void) { void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { if (runmode == RUNMODE_BOOTLOADER) { if (!bootloader_available()) { - mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present.")); + mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present")); } // Pretend to be the first of the two reset presses needed to enter the // bootloader. That way one reset will end in the bootloader. diff --git a/ports/atmel-samd/common-hal/ps2io/Ps2.c b/ports/atmel-samd/common-hal/ps2io/Ps2.c index 6e2fb58e51..ad7b110803 100644 --- a/ports/atmel-samd/common-hal/ps2io/Ps2.c +++ b/ports/atmel-samd/common-hal/ps2io/Ps2.c @@ -79,7 +79,7 @@ static void resume_interrupt(ps2io_ps2_obj_t *self) { disable_interrupt(self); self->state = STATE_IDLE; - gpio_set_pin_function(self->clk_pin, GPIO_PIN_FUNCTION_A); + gpio_set_pin_function(self->clock_pin, GPIO_PIN_FUNCTION_A); uint32_t mask = 1 << self->channel; EIC->INTFLAG.reg = mask << EIC_INTFLAG_EXTINT_Pos; EIC->INTENSET.reg = mask << EIC_INTENSET_EXTINT_Pos; @@ -90,14 +90,14 @@ static void resume_interrupt(ps2io_ps2_obj_t *self) { static void clk_hi(ps2io_ps2_obj_t *self) { // External pull-up // Must set pull after setting direction. - gpio_set_pin_direction(self->clk_pin, GPIO_DIRECTION_IN); - gpio_set_pin_pull_mode(self->clk_pin, GPIO_PULL_OFF); + gpio_set_pin_direction(self->clock_pin, GPIO_DIRECTION_IN); + gpio_set_pin_pull_mode(self->clock_pin, GPIO_PULL_OFF); } static bool wait_clk_lo(ps2io_ps2_obj_t *self, uint32_t us) { clk_hi(self); common_hal_mcu_delay_us(1); - while (gpio_get_pin_level(self->clk_pin) && us) { + while (gpio_get_pin_level(self->clock_pin) && us) { --us; common_hal_mcu_delay_us(1); } @@ -107,7 +107,7 @@ static bool wait_clk_lo(ps2io_ps2_obj_t *self, uint32_t us) { static bool wait_clk_hi(ps2io_ps2_obj_t *self, uint32_t us) { clk_hi(self); common_hal_mcu_delay_us(1); - while (!gpio_get_pin_level(self->clk_pin) && us) { + while (!gpio_get_pin_level(self->clock_pin) && us) { --us; common_hal_mcu_delay_us(1); } @@ -115,9 +115,9 @@ static bool wait_clk_hi(ps2io_ps2_obj_t *self, uint32_t us) { } static void clk_lo(ps2io_ps2_obj_t *self) { - gpio_set_pin_pull_mode(self->clk_pin, GPIO_PULL_OFF); - gpio_set_pin_direction(self->clk_pin, GPIO_DIRECTION_OUT); - gpio_set_pin_level(self->clk_pin, 0); + gpio_set_pin_pull_mode(self->clock_pin, GPIO_PULL_OFF); + gpio_set_pin_direction(self->clock_pin, GPIO_DIRECTION_OUT); + gpio_set_pin_level(self->clock_pin, 0); } static void data_hi(ps2io_ps2_obj_t *self) { @@ -244,19 +244,19 @@ void ps2_interrupt_handler(uint8_t channel) { } void common_hal_ps2io_ps2_construct(ps2io_ps2_obj_t *self, - const mcu_pin_obj_t *data_pin, const mcu_pin_obj_t *clk_pin) { - if (!clk_pin->has_extint) { - mp_raise_RuntimeError(translate("No hardware support on clk pin")); + const mcu_pin_obj_t *data_pin, const mcu_pin_obj_t *clock_pin) { + if (!clock_pin->has_extint) { + mp_arg_error_invalid(MP_QSTR_clock_pin); } - if (eic_get_enable() && !eic_channel_free(clk_pin->extint_channel)) { + if (eic_get_enable() && !eic_channel_free(clock_pin->extint_channel)) { mp_raise_RuntimeError(translate("EXTINT channel already in use")); } clk_hi(self); data_hi(self); - self->channel = clk_pin->extint_channel; - self->clk_pin = clk_pin->number; + self->channel = clock_pin->extint_channel; + self->clock_pin = clock_pin->number; self->data_pin = data_pin->number; self->state = STATE_IDLE; self->bufcount = 0; @@ -264,19 +264,19 @@ void common_hal_ps2io_ps2_construct(ps2io_ps2_obj_t *self, self->bufposw = 0; self->waiting_cmd_response = false; - set_eic_channel_data(clk_pin->extint_channel, (void *)self); + set_eic_channel_data(clock_pin->extint_channel, (void *)self); // Check to see if the EIC is enabled and start it up if its not.' if (eic_get_enable() == 0) { turn_on_external_interrupt_controller(); } - gpio_set_pin_function(clk_pin->number, GPIO_PIN_FUNCTION_A); + gpio_set_pin_function(clock_pin->number, GPIO_PIN_FUNCTION_A); gpio_set_pin_function(data_pin->number, GPIO_PIN_FUNCTION_A); turn_on_cpu_interrupt(self->channel); - claim_pin(clk_pin); + claim_pin(clock_pin); claim_pin(data_pin); // Set config will enable the EIC. @@ -284,7 +284,7 @@ void common_hal_ps2io_ps2_construct(ps2io_ps2_obj_t *self, } bool common_hal_ps2io_ps2_deinited(ps2io_ps2_obj_t *self) { - return self->clk_pin == NO_PIN; + return self->clock_pin == NO_PIN; } void common_hal_ps2io_ps2_deinit(ps2io_ps2_obj_t *self) { @@ -293,9 +293,9 @@ void common_hal_ps2io_ps2_deinit(ps2io_ps2_obj_t *self) { } set_eic_handler(self->channel, EIC_HANDLER_NO_INTERRUPT); turn_off_eic_channel(self->channel); - reset_pin_number(self->clk_pin); + reset_pin_number(self->clock_pin); reset_pin_number(self->data_pin); - self->clk_pin = NO_PIN; + self->clock_pin = NO_PIN; self->data_pin = NO_PIN; } diff --git a/ports/atmel-samd/common-hal/ps2io/Ps2.h b/ports/atmel-samd/common-hal/ps2io/Ps2.h index 588dfdd8be..fa8defdbeb 100644 --- a/ports/atmel-samd/common-hal/ps2io/Ps2.h +++ b/ports/atmel-samd/common-hal/ps2io/Ps2.h @@ -35,7 +35,7 @@ typedef struct { mp_obj_base_t base; uint8_t channel; - uint8_t clk_pin; + uint8_t clock_pin; uint8_t data_pin; uint8_t state; diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c index 0927faa00a..4f00fac027 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseIn.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseIn.c @@ -41,6 +41,7 @@ #include "samd/pins.h" #include "samd/timers.h" #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/pulseio/PulseIn.h" #include "supervisor/shared/tick.h" #include "supervisor/shared/translate.h" @@ -152,7 +153,7 @@ void pulsein_reset() { void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu_pin_obj_t *pin, uint16_t maxlen, bool idle_state) { if (!pin->has_extint) { - mp_raise_RuntimeError(translate("No hardware support on pin")); + raise_ValueError_invalid_pin(); } if (eic_get_enable() && !eic_channel_free(pin->extint_channel)) { mp_raise_RuntimeError(translate("EXTINT channel already in use")); @@ -160,7 +161,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } self->channel = pin->extint_channel; self->pin = pin->number; @@ -344,15 +345,14 @@ bool common_hal_pulseio_pulsein_get_paused(pulseio_pulsein_obj_t *self) { return (EIC->INTENSET.reg & (mask << EIC_INTENSET_EXTINT_Pos)) == 0; } -uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, - int16_t index) { +uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_t index) { common_hal_mcu_disable_interrupts(); if (index < 0) { index += self->len; } if (index < 0 || index >= self->len) { common_hal_mcu_enable_interrupts(); - mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn); + mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; common_hal_mcu_enable_interrupts(); diff --git a/ports/atmel-samd/common-hal/pwmio/PWMOut.c b/ports/atmel-samd/common-hal/pwmio/PWMOut.c index eaec10463d..854e70094f 100644 --- a/ports/atmel-samd/common-hal/pwmio/PWMOut.c +++ b/ports/atmel-samd/common-hal/pwmio/PWMOut.c @@ -377,7 +377,7 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t frequency) { uint32_t system_clock = common_hal_mcu_processor_get_frequency(); if (frequency == 0 || frequency > system_clock / 2) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } const pin_timer_t *t = self->timer; uint8_t resolution; diff --git a/ports/atmel-samd/common-hal/rtc/RTC.c b/ports/atmel-samd/common-hal/rtc/RTC.c index e2a67bd174..455f176763 100644 --- a/ports/atmel-samd/common-hal/rtc/RTC.c +++ b/ports/atmel-samd/common-hal/rtc/RTC.c @@ -68,13 +68,7 @@ int common_hal_rtc_get_calibration(void) { } void common_hal_rtc_set_calibration(int calibration) { - if (calibration > 127 || calibration < -127) { - #if CIRCUITPY_FULL_BUILD - mp_raise_ValueError(translate("calibration value out of range +/-127")); - #else - mp_raise_ValueError(translate("calibration is out of range")); - #endif - } + mp_arg_validate_int_range(calibration, -127, 127, MP_QSTR_calibration); hri_rtcmode0_write_FREQCORR_SIGN_bit(RTC, calibration < 0 ? 0 : 1); hri_rtcmode0_write_FREQCORR_VALUE_bf(RTC, abs(calibration)); diff --git a/ports/atmel-samd/common-hal/touchio/TouchIn.c b/ports/atmel-samd/common-hal/touchio/TouchIn.c index 89979b620f..1c0062d52a 100644 --- a/ports/atmel-samd/common-hal/touchio/TouchIn.c +++ b/ports/atmel-samd/common-hal/touchio/TouchIn.c @@ -31,6 +31,7 @@ #include "py/runtime.h" #include "py/binary.h" #include "py/mphal.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/touchio/TouchIn.h" #include "supervisor/shared/translate.h" @@ -60,7 +61,7 @@ static uint16_t get_raw_reading(touchio_touchin_obj_t *self) { void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, const mcu_pin_obj_t *pin) { if (!pin->has_touch) { - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); } claim_pin(pin); diff --git a/ports/broadcom/common-hal/busio/I2C.c b/ports/broadcom/common-hal/busio/I2C.c index e84810cffd..3142fda145 100644 --- a/ports/broadcom/common-hal/busio/I2C.c +++ b/ports/broadcom/common-hal/busio/I2C.c @@ -90,7 +90,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, } } if (instance_index == NUM_I2C) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } i2c_in_use[instance_index] = true; self->index = instance_index; diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c index feba34521d..017674dfc0 100644 --- a/ports/broadcom/common-hal/busio/SPI.c +++ b/ports/broadcom/common-hal/busio/SPI.c @@ -104,7 +104,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, break; } if (instance_index == NUM_SPI) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } self->clock = clock; diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c index ff17d5ff1d..52d1b7a418 100644 --- a/ports/broadcom/common-hal/busio/UART.c +++ b/ports/broadcom/common-hal/busio/UART.c @@ -162,13 +162,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_float_t timeout, uint16_t receiver_buffer_size, byte *receiver_buffer, bool sigint_enabled) { - if (bits > 8) { - mp_raise_ValueError(translate("Invalid word/bit length")); - } - - if (receiver_buffer_size == 0) { - mp_raise_ValueError(translate("Invalid buffer size")); - } + mp_arg_validate_int_max(bits, 8, MP_QSTR_bits); + mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size); if ((rs485_dir != NULL) || (rs485_invert)) { mp_raise_NotImplementedError(translate("RS485 Not yet supported on this device")); @@ -203,7 +198,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, break; } if (instance_index == NUM_UART) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } self->rx_pin = rx; @@ -224,7 +219,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // in the long-lived pool is not strictly necessary) // (This is a macro.) if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) { - mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate RX buffer")); + m_malloc_fail(receiver_buffer_size); } } } diff --git a/ports/cxd56/common-hal/analogio/AnalogIn.c b/ports/cxd56/common-hal/analogio/AnalogIn.c index d1bd68cfbe..bb19d02c25 100644 --- a/ports/cxd56/common-hal/analogio/AnalogIn.c +++ b/ports/cxd56/common-hal/analogio/AnalogIn.c @@ -34,6 +34,7 @@ #include "py/runtime.h" #include "shared-bindings/analogio/AnalogIn.h" +#include "shared-bindings/microcontroller/Pin.h" typedef struct { const char *devpath; @@ -52,7 +53,7 @@ STATIC analogin_dev_t analogin_dev[] = { void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) { if (!pin->analog) { - mp_raise_ValueError(translate("AnalogIn not supported on given pin")); + raise_ValueError_invalid_pin(); } self->number = -1; @@ -65,13 +66,13 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const } if (self->number < 0) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } if (analogin_dev[self->number].fd < 0) { analogin_dev[self->number].fd = open(analogin_dev[self->number].devpath, O_RDONLY); if (analogin_dev[self->number].fd < 0) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } } diff --git a/ports/cxd56/common-hal/analogio/AnalogOut.c b/ports/cxd56/common-hal/analogio/AnalogOut.c index 3f1abe80d1..b57dc8e323 100644 --- a/ports/cxd56/common-hal/analogio/AnalogOut.c +++ b/ports/cxd56/common-hal/analogio/AnalogOut.c @@ -29,7 +29,7 @@ #include "shared-bindings/analogio/AnalogOut.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { - mp_raise_RuntimeError(translate("AnalogOut functionality not supported")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); } void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) { diff --git a/ports/cxd56/common-hal/busio/I2C.c b/ports/cxd56/common-hal/busio/I2C.c index 82b52ca179..ad85860a9d 100644 --- a/ports/cxd56/common-hal/busio/I2C.c +++ b/ports/cxd56/common-hal/busio/I2C.c @@ -32,6 +32,7 @@ #include "py/runtime.h" #include "shared-bindings/busio/I2C.h" +#include "shared-bindings/microcontroller/Pin.h" void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) { @@ -40,7 +41,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t * } if (scl->number != PIN_I2C0_BCK || sda->number != PIN_I2C0_BDT) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } claim_pin(scl); diff --git a/ports/cxd56/common-hal/busio/SPI.c b/ports/cxd56/common-hal/busio/SPI.c index c248b5cc9a..75f530eda1 100644 --- a/ports/cxd56/common-hal/busio/SPI.c +++ b/ports/cxd56/common-hal/busio/SPI.c @@ -33,6 +33,7 @@ #include "py/runtime.h" #include "shared-bindings/busio/SPI.h" +#include "shared-bindings/microcontroller/Pin.h" 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, bool half_duplex) { @@ -55,7 +56,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, const mcu_pin_obj_t * } if (port < 0) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } claim_pin(clock); diff --git a/ports/cxd56/common-hal/busio/UART.c b/ports/cxd56/common-hal/busio/UART.c index 91fbe52441..735d0a3e40 100644 --- a/ports/cxd56/common-hal/busio/UART.c +++ b/ports/cxd56/common-hal/busio/UART.c @@ -40,6 +40,7 @@ #include "py/runtime.h" #include "shared-bindings/busio/UART.h" +#include "shared-bindings/microcontroller/Pin.h" typedef struct { const char *devpath; @@ -68,17 +69,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device")); } - if (bits != 8) { - mp_raise_ValueError(translate("Could not initialize UART")); - } - - if (parity != BUSIO_UART_PARITY_NONE) { - mp_raise_ValueError(translate("Could not initialize UART")); - } - - if (stop != 1) { - mp_raise_ValueError(translate("Could not initialize UART")); - } + mp_arg_validate_int(bits, 8, MP_QSTR_bits); + mp_arg_validate_int(parity, BUSIO_UART_PARITY_NONE, MP_QSTR_parity); + mp_arg_validate_int(stop, 1, MP_QSTR_stop); self->number = -1; @@ -91,7 +84,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } if (self->number < 0) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if (busio_uart_dev[self->number].fd < 0) { diff --git a/ports/cxd56/common-hal/camera/Camera.c b/ports/cxd56/common-hal/camera/Camera.c index 5e159d61dc..7471b12af7 100644 --- a/ports/cxd56/common-hal/camera/Camera.c +++ b/ports/cxd56/common-hal/camera/Camera.c @@ -121,11 +121,11 @@ static void camera_start_preview() { void common_hal_camera_construct(camera_obj_t *self) { if (camera_dev.fd < 0) { if (video_initialize(camera_dev.devpath) < 0) { - mp_raise_ValueError(translate("Could not initialize Camera")); + mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_Camera); } camera_dev.fd = open(camera_dev.devpath, 0); if (camera_dev.fd < 0) { - mp_raise_ValueError(translate("Could not initialize Camera")); + mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_Camera); } } diff --git a/ports/cxd56/common-hal/digitalio/DigitalInOut.c b/ports/cxd56/common-hal/digitalio/DigitalInOut.c index 37b695567d..cfb39301df 100644 --- a/ports/cxd56/common-hal/digitalio/DigitalInOut.c +++ b/ports/cxd56/common-hal/digitalio/DigitalInOut.c @@ -29,10 +29,11 @@ #include "py/runtime.h" #include "shared-bindings/digitalio/DigitalInOut.h" +#include "shared-bindings/microcontroller/Pin.h" digitalinout_result_t common_hal_digitalio_digitalinout_construct(digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->analog) { - mp_raise_ValueError(translate("DigitalInOut not supported on given pin")); + raise_ValueError_invalid_pin(); } claim_pin(pin); diff --git a/ports/cxd56/common-hal/gnss/GNSS.c b/ports/cxd56/common-hal/gnss/GNSS.c index f345f5261d..11b83d07b1 100644 --- a/ports/cxd56/common-hal/gnss/GNSS.c +++ b/ports/cxd56/common-hal/gnss/GNSS.c @@ -56,7 +56,7 @@ void common_hal_gnss_construct(gnss_obj_t *self, unsigned long selection) { if (gnss_dev.fd < 0) { gnss_dev.fd = open(gnss_dev.devpath, O_RDONLY); if (gnss_dev.fd < 0) { - mp_raise_ValueError(translate("Could not initialize GNSS")); + mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_GNSS); } } diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c index 499e0e5f04..dd9a54063f 100644 --- a/ports/cxd56/common-hal/microcontroller/__init__.c +++ b/ports/cxd56/common-hal/microcontroller/__init__.c @@ -72,7 +72,7 @@ void common_hal_mcu_enable_interrupts(void) { void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { if (runmode == RUNMODE_BOOTLOADER) { - mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present.")); + mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present")); } else if (runmode == RUNMODE_SAFE_MODE) { safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE); } diff --git a/ports/cxd56/common-hal/pulseio/PulseIn.c b/ports/cxd56/common-hal/pulseio/PulseIn.c index 264f11a714..165e2a6ece 100644 --- a/ports/cxd56/common-hal/pulseio/PulseIn.c +++ b/ports/cxd56/common-hal/pulseio/PulseIn.c @@ -87,7 +87,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu_pin_obj_t *pin, uint16_t maxlen, bool idle_state) { self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } self->pin = pin; @@ -190,7 +190,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_ } if (index < 0 || index >= self->len) { common_hal_mcu_enable_interrupts(); - mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn); + mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; common_hal_mcu_enable_interrupts(); diff --git a/ports/cxd56/common-hal/pwmio/PWMOut.c b/ports/cxd56/common-hal/pwmio/PWMOut.c index e9bffd21e9..7e27817aab 100644 --- a/ports/cxd56/common-hal/pwmio/PWMOut.c +++ b/ports/cxd56/common-hal/pwmio/PWMOut.c @@ -74,7 +74,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self, self->variable_frequency = variable_frequency; if (ioctl(pwmout_dev[self->number].fd, PWMIOC_SETCHARACTERISTICS, (unsigned long)((uintptr_t)&self->info)) < 0) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } ioctl(pwmout_dev[self->number].fd, PWMIOC_START, 0); @@ -116,7 +116,7 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t fr self->info.frequency = frequency; if (ioctl(pwmout_dev[self->number].fd, PWMIOC_SETCHARACTERISTICS, (unsigned long)((uintptr_t)&self->info)) < 0) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } } diff --git a/ports/cxd56/common-hal/rtc/RTC.c b/ports/cxd56/common-hal/rtc/RTC.c index ce65e6acde..0024e56cb2 100644 --- a/ports/cxd56/common-hal/rtc/RTC.c +++ b/ports/cxd56/common-hal/rtc/RTC.c @@ -50,5 +50,5 @@ int common_hal_rtc_get_calibration(void) { } void common_hal_rtc_set_calibration(int calibration) { - mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); } diff --git a/ports/cxd56/common-hal/sdioio/SDCard.c b/ports/cxd56/common-hal/sdioio/SDCard.c index 56fe5f7057..c86e052ea5 100644 --- a/ports/cxd56/common-hal/sdioio/SDCard.c +++ b/ports/cxd56/common-hal/sdioio/SDCard.c @@ -31,6 +31,7 @@ #include "py/mperrno.h" #include "py/runtime.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/sdioio/SDCard.h" #include "shared-bindings/util.h" @@ -42,7 +43,7 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, struct geometry geo; if (clock->number != PIN_SDIO_CLK || command->number != PIN_SDIO_CMD) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } uint8_t data_pins_num = 0; @@ -54,11 +55,11 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, } if (data_pins_num != DATA_PINS_NUM) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if (open_blockdriver("/dev/mmcsd0", 0, &self->inode) < 0) { - mp_raise_ValueError(translate("Could not initialize SDCard")); + mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_SDCard); } self->inode->u.i_bops->geometry(self->inode, &geo); diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c index 6ae2421e4c..941b99d6fd 100644 --- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c +++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c @@ -26,6 +26,7 @@ #include "shared-bindings/alarm/touch/TouchAlarm.h" #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "esp_sleep.h" #include "peripherals/touch.h" @@ -36,7 +37,7 @@ static volatile bool woke_up = false; void common_hal_alarm_touch_touchalarm_construct(alarm_touch_touchalarm_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->touch_channel == TOUCH_PAD_MAX) { - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); } claim_pin(pin); self->pin = pin; diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c index adb8b15065..4d390e615c 100644 --- a/ports/espressif/common-hal/analogio/AnalogIn.c +++ b/ports/espressif/common-hal/analogio/AnalogIn.c @@ -51,7 +51,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->adc_index == 0 || pin->adc_channel == ADC_CHANNEL_MAX) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } common_hal_mcu_pin_claim(pin); self->pin = pin; @@ -80,7 +80,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { } else if (self->pin->adc_index == ADC_UNIT_2) { adc2_config_channel_atten((adc2_channel_t)self->pin->adc_channel, ATTENUATION); } else { - mp_raise_ValueError(translate("Invalid Pin")); + raise_ValueError_invalid_pin(); } // Automatically select calibration process depending on status of efuse diff --git a/ports/espressif/common-hal/analogio/AnalogOut.c b/ports/espressif/common-hal/analogio/AnalogOut.c index 2b5f9d0b35..2bceefc9f7 100644 --- a/ports/espressif/common-hal/analogio/AnalogOut.c +++ b/ports/espressif/common-hal/analogio/AnalogOut.c @@ -49,7 +49,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, } else if (pin == &pin_GPIO18) { self->channel = DAC_CHANNEL_2; } else { - mp_raise_ValueError(translate("Invalid DAC pin supplied")); + raise_ValueError_invalid_pin(); } dac_output_enable(self->channel); #else diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c index 0706de1df5..5af9e8a4dc 100644 --- a/ports/espressif/common-hal/busio/I2C.c +++ b/ports/espressif/common-hal/busio/I2C.c @@ -42,7 +42,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, // // 46 is also input-only so it'll never work. if (scl->number == 45 || scl->number == 46 || sda->number == 45 || sda->number == 46) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } #if CIRCUITPY_REQUIRE_I2C_PULLUPS diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c index 4eff1be54c..0b894fa215 100644 --- a/ports/espressif/common-hal/busio/SPI.c +++ b/ports/espressif/common-hal/busio/SPI.c @@ -28,6 +28,7 @@ #include "py/runtime.h" #include "shared-bindings/busio/SPI.h" +#include "shared-bindings/microcontroller/Pin.h" #include "driver/spi_common_internal.h" @@ -101,7 +102,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, 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")); + raise_ValueError_invalid_pins(); } set_spi_config(self, 250000, 0, 0, 8); diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 0c44107e60..9d0fd1dbf7 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -101,9 +101,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_float_t timeout, uint16_t receiver_buffer_size, byte *receiver_buffer, bool sigint_enabled) { - if (bits > 8) { - mp_raise_NotImplementedError(translate("bytes > 8 bits not supported")); - } + mp_arg_validate_int_max(bits, 8, MP_QSTR_bytes); bool have_tx = tx != NULL; bool have_rx = rx != NULL; diff --git a/ports/espressif/common-hal/canio/CAN.c b/ports/espressif/common-hal/canio/CAN.c index fb2e35f1b1..c9f585b9be 100644 --- a/ports/espressif/common-hal/canio/CAN.c +++ b/ports/espressif/common-hal/canio/CAN.c @@ -133,7 +133,7 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, const mcu_pin_obj_t * 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")); + raise_ValueError_invalid_pins(); } else if (result != ESP_OK) { mp_raise_OSError_msg_varg(translate("twai_driver_install returned esp-idf error #%d"), (int)result); } diff --git a/ports/espressif/common-hal/frequencyio/FrequencyIn.c b/ports/espressif/common-hal/frequencyio/FrequencyIn.c index e4d65c95bd..a50ec27683 100644 --- a/ports/espressif/common-hal/frequencyio/FrequencyIn.c +++ b/ports/espressif/common-hal/frequencyio/FrequencyIn.c @@ -130,9 +130,7 @@ static void init_timer(frequencyio_frequencyin_obj_t *self) { void common_hal_frequencyio_frequencyin_construct(frequencyio_frequencyin_obj_t *self, const mcu_pin_obj_t *pin, const uint16_t capture_period) { - if ((capture_period == 0) || (capture_period > 500)) { - mp_raise_ValueError(translate("Invalid capture period. Valid range: 1 - 500")); - } + mp_arg_validate_int_range(capture_period, 1, 500, MP_QSTR_capture_period); self->pin = pin->number; self->handle = NULL; @@ -188,9 +186,8 @@ uint16_t common_hal_frequencyio_frequencyin_get_capture_period(frequencyio_frequ } void common_hal_frequencyio_frequencyin_set_capture_period(frequencyio_frequencyin_obj_t *self, uint16_t capture_period) { - if ((capture_period == 0) || (capture_period > 500)) { - mp_raise_ValueError(translate("Invalid capture period. Valid range: 1 - 500")); - } + mp_arg_validate_int_range(capture_period, 1, 500, MP_QSTR_capture_period); + self->capture_period = capture_period; common_hal_frequencyio_frequencyin_clear(self); timer_set_alarm_value(self->timer.group, self->timer.idx, capture_period * 1000000); diff --git a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c b/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c index d073a8a362..6bd71cc797 100644 --- a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c +++ b/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c @@ -30,6 +30,7 @@ #include "py/runtime.h" #include "common-hal/i2cperipheral/I2CPeripheral.h" +#include "shared-bindings/microcontroller/Pin.h" void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_peripheral_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, @@ -39,7 +40,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe // support I2C on these pins. // Also 46 is input-only so it'll never work. if (scl->number == 45 || scl->number == 46 || sda->number == 45 || sda->number == 46) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if (num_addresses > 1) { @@ -72,7 +73,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe if (err == ESP_FAIL) { mp_raise_OSError(MP_EIO); } else { - mp_raise_ValueError(translate("Invalid argument")); + mp_arg_error_invalid(MP_QSTR_I2CPeripheral); } } diff --git a/ports/espressif/common-hal/imagecapture/ParallelImageCapture.c b/ports/espressif/common-hal/imagecapture/ParallelImageCapture.c index b167b5c734..7456e474a9 100644 --- a/ports/espressif/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/espressif/common-hal/imagecapture/ParallelImageCapture.c @@ -41,9 +41,7 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle const mcu_pin_obj_t *horizontal_reference) { // only 8 bits is supported at present - if (data_count < 8 || data_count > 16) { - mp_raise_ValueError_varg(translate("%q must be between %d and %d"), MP_QSTR_data_count, 8, 16); - } + mp_arg_validate_int_range(data_count, 8, 16, MP_QSTR_data_count); // This will throw if unsuccessful. Everything following is guaranteed to succeed. port_i2s_allocate_i2s0(); diff --git a/ports/espressif/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c index 95d69b6a2f..41c1dcb189 100644 --- a/ports/espressif/common-hal/pulseio/PulseIn.c +++ b/ports/espressif/common-hal/pulseio/PulseIn.c @@ -88,7 +88,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu uint16_t maxlen, bool idle_state) { self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } self->pin = pin; self->maxlen = maxlen; diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c index 9ca39c223b..b96c154be6 100644 --- a/ports/espressif/common-hal/pwmio/PWMOut.c +++ b/ports/espressif/common-hal/pwmio/PWMOut.c @@ -217,7 +217,7 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t fr // Calculate duty cycle uint32_t duty_bits = calculate_duty_cycle(frequency); if (duty_bits == 0) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } self->duty_resolution = duty_bits; ledc_set_freq(LEDC_LOW_SPEED_MODE, self->tim_handle.timer_num, frequency); diff --git a/ports/espressif/common-hal/rtc/RTC.c b/ports/espressif/common-hal/rtc/RTC.c index a78c2fb613..866f9b65a0 100644 --- a/ports/espressif/common-hal/rtc/RTC.c +++ b/ports/espressif/common-hal/rtc/RTC.c @@ -48,5 +48,5 @@ int common_hal_rtc_get_calibration(void) { } void common_hal_rtc_set_calibration(int calibration) { - mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); } diff --git a/ports/espressif/common-hal/touchio/TouchIn.c b/ports/espressif/common-hal/touchio/TouchIn.c index 53bc335d30..14a27637c8 100644 --- a/ports/espressif/common-hal/touchio/TouchIn.c +++ b/ports/espressif/common-hal/touchio/TouchIn.c @@ -28,6 +28,7 @@ #include "py/runtime.h" #include "peripherals/touch.h" +#include "shared-bindings/microcontroller/Pin.h" static uint16_t get_raw_reading(touchio_touchin_obj_t *self) { uint32_t touch_value; @@ -41,7 +42,7 @@ static uint16_t get_raw_reading(touchio_touchin_obj_t *self) { void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->touch_channel == TOUCH_PAD_MAX) { - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); } claim_pin(pin); diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index 4f92425c87..8ee1c80926 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -209,7 +209,7 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_ authmode = WIFI_AUTH_WPA_WPA2_PSK; break; default: - mp_raise_ValueError(translate("Invalid AuthMode")); + mp_arg_error_invalid(MP_QSTR_authmode); break; } @@ -221,9 +221,8 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_ config->ap.channel = channel; config->ap.authmode = authmode; - if (max_connections < 0 || max_connections > 10) { - mp_raise_ValueError(translate("max_connections must be between 0 and 10")); - } + mp_arg_validate_int_range(max_connections, 0, 10, MP_QSTR_max_connections); + config->ap.max_connection = max_connections; esp_wifi_set_config(WIFI_IF_AP, config); diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c index 2d809c258c..3f3147971f 100644 --- a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c +++ b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c @@ -42,7 +42,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, adc_config_t config = {0}; if (pin->adc == NULL) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } ADC_GetDefaultConfig(&config); diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c b/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c index bf21e30df3..de807e7e5c 100644 --- a/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +++ b/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c @@ -32,7 +32,7 @@ #include "supervisor/shared/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { - mp_raise_NotImplementedError(translate("AnalogOut functionality not supported")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); } bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c index 77df979e4d..50aae54aba 100644 --- a/ports/mimxrt10xx/common-hal/busio/I2C.c +++ b/ports/mimxrt10xx/common-hal/busio/I2C.c @@ -138,7 +138,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, } if (self->sda == NULL || self->scl == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } else { self->i2c = mcu_i2c_banks[self->sda->bank_idx - 1]; } diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c index 608fae7fbe..0048c2aeb2 100644 --- a/ports/mimxrt10xx/common-hal/busio/SPI.c +++ b/ports/mimxrt10xx/common-hal/busio/SPI.c @@ -168,7 +168,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, if (spi_taken) { mp_raise_ValueError(translate("Hardware busy, try alternative pins")); } else { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } } diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 57eaada7ef..8615002811 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -117,7 +117,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->timeout_ms = timeout * 1000; if (self->character_bits != 7 && self->character_bits != 8) { - mp_raise_ValueError(translate("Invalid word/bit length")); + mp_arg_validate_int_range(self->character_bits, 7, 8, MP_QSTR_bits); } DBGPrintf(&mp_plat_print, "uart_construct: tx:%p rx:%p rts:%p cts:%p rs485:%p\n", tx, rx, rts, cts, rs485_dir); @@ -350,7 +350,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, if (!self->ringbuf) { LPUART_Deinit(self->uart); - mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate RX buffer")); + m_malloc_fail(receiver_buffer_size); } LPUART_TransferCreateHandle(self->uart, &self->handle, LPUART_UserCallback, self); diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c index e6edd6dfc9..3ea454a2b3 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c @@ -70,7 +70,7 @@ void common_hal_mcu_enable_interrupts(void) { void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { if (runmode == RUNMODE_BOOTLOADER) { if (!bootloader_available()) { - mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present.")); + mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present")); } // Pretend to be the first of the two reset presses needed to enter the // bootloader. That way one reset will end in the bootloader. diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index a42bbef7d7..29f72e21e4 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -301,7 +301,7 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, int pulse_count = calculate_pulse_count(frequency, &self->prescaler); if (pulse_count == 0) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } self->pulse_count = pulse_count; diff --git a/ports/mimxrt10xx/common-hal/rtc/RTC.c b/ports/mimxrt10xx/common-hal/rtc/RTC.c index 04aa799ce5..a58b37ae62 100644 --- a/ports/mimxrt10xx/common-hal/rtc/RTC.c +++ b/ports/mimxrt10xx/common-hal/rtc/RTC.c @@ -75,5 +75,5 @@ int common_hal_rtc_get_calibration(void) { void common_hal_rtc_set_calibration(int calibration) { // SNVS has HPCALB_VAL bits for calibration. - mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); } diff --git a/ports/mimxrt10xx/common-hal/usb_host/Port.c b/ports/mimxrt10xx/common-hal/usb_host/Port.c index 52ac12dc86..126160c69c 100644 --- a/ports/mimxrt10xx/common-hal/usb_host/Port.c +++ b/ports/mimxrt10xx/common-hal/usb_host/Port.c @@ -24,9 +24,8 @@ * THE SOFTWARE. */ -#include "shared-bindings/usb_host/Port.h" - #include "shared-bindings/microcontroller/Pin.h" +#include "shared-bindings/usb_host/Port.h" #include "py/runtime.h" @@ -43,7 +42,7 @@ void common_hal_usb_host_port_construct(usb_host_port_obj_t *self, const mcu_pin supported_dm = &pin_USB_OTG2_DN; } if (dp != supported_dp || dm != supported_dm) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } self->init = true; usb_host_init = true; diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.c b/ports/nrf/common-hal/alarm/pin/PinAlarm.c index 4bf412d85b..9d0f8f4b88 100644 --- a/ports/nrf/common-hal/alarm/pin/PinAlarm.c +++ b/ports/nrf/common-hal/alarm/pin/PinAlarm.c @@ -49,10 +49,10 @@ extern uint32_t reset_reason_saved; 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) { - mp_raise_ValueError(translate("Cannot wake on pin edge. Only level.")); + mp_raise_ValueError(translate("Cannot wake on pin edge, only level")); } if (pin->number >= NUMBER_OF_PINS) { - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); } self->pin = pin; self->value = value; diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.c b/ports/nrf/common-hal/alarm/time/TimeAlarm.c index c5f3bfd705..03b91068f9 100644 --- a/ports/nrf/common-hal/alarm/time/TimeAlarm.c +++ b/ports/nrf/common-hal/alarm/time/TimeAlarm.c @@ -85,7 +85,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ continue; } if (timealarm_set) { - mp_raise_ValueError(translate("Only one alarm.time alarm can be set.")); + mp_raise_ValueError(translate("Only one alarm.time alarm can be set")); } timealarm = MP_OBJ_TO_PTR(alarms[i]); timealarm_set = true; diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c index c64e51ec09..8498e20f29 100644 --- a/ports/nrf/common-hal/analogio/AnalogIn.c +++ b/ports/nrf/common-hal/analogio/AnalogIn.c @@ -27,6 +27,7 @@ #include "common-hal/analogio/AnalogIn.h" #include "shared-bindings/analogio/AnalogIn.h" +#include "shared-bindings/microcontroller/Pin.h" #include "py/runtime.h" #include "supervisor/shared/translate.h" @@ -48,7 +49,7 @@ void analogin_init(void) { void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->adc_channel == 0) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } nrf_gpio_cfg_default(pin->number); diff --git a/ports/nrf/common-hal/analogio/AnalogOut.c b/ports/nrf/common-hal/analogio/AnalogOut.c index 7afa773d30..4efd56795a 100644 --- a/ports/nrf/common-hal/analogio/AnalogOut.c +++ b/ports/nrf/common-hal/analogio/AnalogOut.c @@ -34,7 +34,7 @@ #include "supervisor/shared/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { - mp_raise_RuntimeError(translate("AnalogOut functionality not supported")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); } bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c index c3da519454..6728bf1e44 100644 --- a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c @@ -263,9 +263,8 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self, &spacing); self->sample_channel_count = audiosample_channel_count(sample); - if (max_buffer_length > UINT16_MAX) { - mp_raise_ValueError_varg(translate("Buffer length %d too big. It must be less than %d"), max_buffer_length, UINT16_MAX); - } + mp_arg_validate_length_max(max_buffer_length, UINT16_MAX, MP_QSTR_buffer); + uint16_t buffer_length = (uint16_t)max_buffer_length; self->buffers[0] = m_malloc(buffer_length * 2 * sizeof(uint16_t), false); if (!self->single_buffer) { diff --git a/ports/nrf/common-hal/busio/I2C.c b/ports/nrf/common-hal/busio/I2C.c index 322b5f2faa..6c645a512b 100644 --- a/ports/nrf/common-hal/busio/I2C.c +++ b/ports/nrf/common-hal/busio/I2C.c @@ -29,6 +29,7 @@ #include "shared-bindings/busio/I2C.h" #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "py/mperrno.h" #include "py/runtime.h" #include "supervisor/shared/translate.h" @@ -96,7 +97,7 @@ static uint8_t twi_error_to_mp(const nrfx_err_t err) { void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) { if (scl->number == sda->number) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } // Find a free instance. diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c index 132f5d9272..5c08f50012 100644 --- a/ports/nrf/common-hal/busio/UART.c +++ b/ports/nrf/common-hal/busio/UART.c @@ -164,12 +164,10 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_float_t timeout, uint16_t receiver_buffer_size, byte *receiver_buffer, bool sigint_enabled) { - if (bits != 8) { - mp_raise_ValueError(translate("Invalid word/bit length")); - } + mp_arg_validate_int(bits, 8, MP_QSTR_bits); if ((rs485_dir != NULL) || (rs485_invert)) { - mp_raise_ValueError(translate("RS485 Not yet supported on this device")); + mp_raise_NotImplementedError(translate("RS485")); } // Find a free UART peripheral. @@ -189,9 +187,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_raise_ValueError(translate("tx and rx cannot both be None")); } - if (receiver_buffer_size == 0) { - mp_raise_ValueError(translate("Invalid buffer size")); - } + mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size); if (parity == BUSIO_UART_PARITY_ODD) { mp_raise_ValueError(translate("Odd parity is not supported")); @@ -234,7 +230,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // (This is a macro.) } else if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) { nrfx_uarte_uninit(self->uarte); - mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate RX buffer")); + m_malloc_fail(receiver_buffer_size); } self->rx_pin_number = rx->number; diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nrf/common-hal/pulseio/PulseIn.c index 4ab5d609f2..757c56a4ac 100644 --- a/ports/nrf/common-hal/pulseio/PulseIn.c +++ b/ports/nrf/common-hal/pulseio/PulseIn.c @@ -129,7 +129,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } if (refcount == 0) { @@ -271,7 +271,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_ if (!self->paused) { nrfx_gpiote_in_event_enable(self->pin, true); } - mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn); + mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nrf/common-hal/pwmio/PWMOut.c index 27c0b79b5a..619acdfab6 100644 --- a/ports/nrf/common-hal/pwmio/PWMOut.c +++ b/ports/nrf/common-hal/pwmio/PWMOut.c @@ -297,7 +297,7 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t fr uint16_t countertop; nrf_pwm_clk_t base_clock; if (frequency == 0 || !convert_frequency(frequency, &countertop, &base_clock)) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } self->frequency = frequency; diff --git a/ports/nrf/common-hal/rtc/RTC.c b/ports/nrf/common-hal/rtc/RTC.c index 0b7115a14f..ecc687b5e9 100644 --- a/ports/nrf/common-hal/rtc/RTC.c +++ b/ports/nrf/common-hal/rtc/RTC.c @@ -80,5 +80,5 @@ int common_hal_rtc_get_calibration(void) { } void common_hal_rtc_set_calibration(int calibration) { - mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); } diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index a69089696e..2c7efb09d8 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -223,50 +223,31 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n // We don't validate pin in use here because we may be ok sharing them within a PIO. const mcu_pin_obj_t *first_out_pin = validate_obj_is_pin_or_none(args[ARG_first_out_pin].u_obj); - if (args[ARG_out_pin_count].u_int < 1) { - mp_raise_ValueError(translate("Pin count must be at least 1")); - } + mp_int_t out_pin_count = mp_arg_validate_int_min(args[ARG_out_pin_count].u_int, 1, MP_QSTR_out_pin_count); + const mcu_pin_obj_t *first_in_pin = validate_obj_is_pin_or_none(args[ARG_first_in_pin].u_obj); - if (args[ARG_in_pin_count].u_int < 1) { - mp_raise_ValueError(translate("Pin count must be at least 1")); - } + mp_int_t in_pin_count = mp_arg_validate_int_min(args[ARG_in_pin_count].u_int, 1, MP_QSTR_in_pin_count); + const mcu_pin_obj_t *first_set_pin = validate_obj_is_pin_or_none(args[ARG_first_set_pin].u_obj); - if (args[ARG_set_pin_count].u_int < 1) { - mp_raise_ValueError(translate("Pin count must be at least 1")); - } - if (args[ARG_set_pin_count].u_int > 5) { - mp_raise_ValueError(translate("Set pin count must be between 1 and 5")); - } + mp_int_t set_pin_count = mp_arg_validate_int_range(args[ARG_set_pin_count].u_int, 1, 5, MP_QSTR_set_pin_count); + const mcu_pin_obj_t *first_sideset_pin = validate_obj_is_pin_or_none(args[ARG_first_sideset_pin].u_obj); - if (args[ARG_sideset_pin_count].u_int < 1) { - mp_raise_ValueError(translate("Pin count must be at least 1")); - } - if (args[ARG_sideset_pin_count].u_int > 5) { - mp_raise_ValueError(translate("Side set pin count must be between 1 and 5")); - } + mp_int_t sideset_pin_count = mp_arg_validate_int_range(args[ARG_sideset_pin_count].u_int, 1, 5, MP_QSTR_set_pin_count); const mcu_pin_obj_t *jmp_pin = validate_obj_is_pin_or_none(args[ARG_jmp_pin].u_obj); digitalio_pull_t jmp_pin_pull = validate_pull(args[ARG_jmp_pin_pull].u_rom_obj, MP_QSTR_jmp_pull); - mp_int_t pull_threshold = args[ARG_pull_threshold].u_int; - mp_int_t push_threshold = args[ARG_push_threshold].u_int; - if (pull_threshold < 1 || pull_threshold > 32) { - mp_raise_ValueError(translate("pull_threshold must be between 1 and 32")); - } - if (push_threshold < 1 || push_threshold > 32) { - mp_raise_ValueError(translate("push_threshold must be between 1 and 32")); - } + mp_int_t pull_threshold = + mp_arg_validate_int_range(args[ARG_pull_threshold].u_int, 1, 32, MP_QSTR_pull_threshold); + mp_int_t push_threshold = + mp_arg_validate_int_range(args[ARG_push_threshold].u_int, 1, 32, MP_QSTR_push_threshold); - if (bufinfo.len < 2) { - mp_raise_ValueError(translate("Program must contain at least one 16-bit instruction.")); - } + mp_arg_validate_length_range(bufinfo.len, 2, 64, MP_QSTR_program); if (bufinfo.len % 2 != 0) { mp_raise_ValueError(translate("Program size invalid")); } - if (bufinfo.len > 64) { - mp_raise_ValueError(translate("Program too large")); - } + mp_arg_validate_length_range(init_bufinfo.len, 2, 64, MP_QSTR_init); if (init_bufinfo.len % 2 != 0) { mp_raise_ValueError(translate("Init program size invalid")); } diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c index 1d77630063..4b82ab687a 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c @@ -26,6 +26,7 @@ #include "common-hal/analogio/AnalogIn.h" #include "shared-bindings/analogio/AnalogIn.h" +#include "shared-bindings/microcontroller/Pin.h" #include "py/runtime.h" #include "supervisor/shared/translate.h" @@ -36,7 +37,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) { if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number > ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } adc_init(); diff --git a/ports/raspberrypi/common-hal/analogio/AnalogOut.c b/ports/raspberrypi/common-hal/analogio/AnalogOut.c index 7afa773d30..4efd56795a 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogOut.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogOut.c @@ -34,7 +34,7 @@ #include "supervisor/shared/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { - mp_raise_RuntimeError(translate("AnalogOut functionality not supported")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); } bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { diff --git a/ports/raspberrypi/common-hal/busio/I2C.c b/ports/raspberrypi/common-hal/busio/I2C.c index 516cee2227..6b15bee512 100644 --- a/ports/raspberrypi/common-hal/busio/I2C.c +++ b/ports/raspberrypi/common-hal/busio/I2C.c @@ -30,6 +30,7 @@ #include "py/runtime.h" #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/bitbangio/I2C.h" #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" @@ -65,14 +66,14 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, self->peripheral = i2c[sda_instance]; } if (self->peripheral == NULL) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if ((i2c_get_hw(self->peripheral)->enable & I2C_IC_ENABLE_ENABLE_BITS) != 0) { mp_raise_ValueError(translate("I2C peripheral in use")); } - if (frequency > 1000000) { - mp_raise_ValueError(translate("Unsupported baudrate")); - } + + mp_arg_validate_int_max(frequency, 1000000, MP_QSTR_frequency); + #if CIRCUITPY_REQUIRE_I2C_PULLUPS // Test that the pins are in a high state. (Hopefully indicating they are pulled up.) diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c index 4a18d62584..a7b97823f9 100644 --- a/ports/raspberrypi/common-hal/busio/SPI.c +++ b/ports/raspberrypi/common-hal/busio/SPI.c @@ -82,7 +82,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, // TODO: Check to see if we're sharing the SPI with a native APA102. if (instance_index > 1) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } if (instance_index == 0) { diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c index 97af41d495..d1ed3ea27a 100644 --- a/ports/raspberrypi/common-hal/busio/UART.c +++ b/ports/raspberrypi/common-hal/busio/UART.c @@ -32,6 +32,7 @@ #include "supervisor/shared/tick.h" #include "shared/runtime/interrupt_char.h" #include "common-hal/microcontroller/Pin.h" +#include "shared-bindings/microcontroller/Pin.h" #include "src/rp2_common/hardware_irq/include/hardware/irq.h" #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" @@ -66,7 +67,7 @@ static uint8_t pin_init(const uint8_t uart, const mcu_pin_obj_t *pin, const uint return NO_PIN; } if (!(((pin->number % 4) == pin_type) && ((((pin->number + 4) / 8) % NUM_UARTS) == uart))) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } claim_pin(pin); gpio_set_function(pin->number, GPIO_FUNC_UART); @@ -104,13 +105,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_float_t timeout, uint16_t receiver_buffer_size, byte *receiver_buffer, bool sigint_enabled) { - if (bits > 8) { - mp_raise_ValueError(translate("Invalid word/bit length")); - } - - if (receiver_buffer_size == 0) { - mp_raise_ValueError(translate("Invalid buffer size")); - } + mp_arg_validate_int_max(bits, 8, MP_QSTR_bits); + mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size); uint8_t uart_id = ((((tx != NULL) ? tx->number : rx->number) + 4) / 8) % NUM_UARTS; @@ -167,7 +163,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // in the long-lived pool is not strictly necessary) // (This is a macro.) if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) { - mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate RX buffer")); + m_malloc_fail(receiver_buffer_size); } active_uarts[uart_id] = self; if (uart_id == 1) { diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 45d31626ec..97c2b03f7b 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -49,7 +49,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } self->pin = pin->number; self->maxlen = maxlen; @@ -237,7 +237,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, index += self->len; } if (index < 0 || index >= self->len) { - mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn); + mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; return value; diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c index 3ef4fb57f3..958e848b9f 100644 --- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c +++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c @@ -259,7 +259,7 @@ void pwmio_pwmout_set_top(pwmio_pwmout_obj_t *self, uint16_t top) { void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t frequency) { if (frequency == 0 || frequency > (common_hal_mcu_processor_get_frequency() / 2)) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } target_slice_frequencies[self->slice] = frequency; diff --git a/ports/raspberrypi/common-hal/rtc/RTC.c b/ports/raspberrypi/common-hal/rtc/RTC.c index 9bd10abf70..9bfda0af31 100644 --- a/ports/raspberrypi/common-hal/rtc/RTC.c +++ b/ports/raspberrypi/common-hal/rtc/RTC.c @@ -92,5 +92,5 @@ int common_hal_rtc_get_calibration(void) { } void common_hal_rtc_set_calibration(int calibration) { - mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board")); + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); } diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c index 6fb1fc629d..2eb8ee4a81 100644 --- a/ports/stm/common-hal/alarm/time/TimeAlarm.c +++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c @@ -84,7 +84,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ continue; } if (timealarm_set) { - mp_raise_ValueError(translate("Only one alarm.time alarm can be set.")); + mp_raise_ValueError(translate("Only one alarm.time alarm can be set")); } timealarm = MP_OBJ_TO_PTR(alarms[i]); timealarm_set = true; diff --git a/ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm/common-hal/analogio/AnalogIn.c index ed2575493e..c943ce0901 100644 --- a/ports/stm/common-hal/analogio/AnalogIn.c +++ b/ports/stm/common-hal/analogio/AnalogIn.c @@ -51,7 +51,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, // No ADC function on pin if (pin->adc_unit == 0x00) { - mp_raise_ValueError(translate("Pin does not have ADC capabilities")); + raise_ValueError_invalid_pin(); } // TODO: add ADC traits to structure? diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c index 0320b1f99b..b2cdd50153 100644 --- a/ports/stm/common-hal/analogio/AnalogOut.c +++ b/ports/stm/common-hal/analogio/AnalogOut.c @@ -65,7 +65,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, self->channel = DAC_CHANNEL_2; self->dac_index = 1; } else { - mp_raise_ValueError(translate("Invalid DAC pin supplied")); + raise_ValueError_invalid_pin(); } // Only init if the shared DAC is empty or reset diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c index 5ede538b12..3ca8249660 100644 --- a/ports/stm/common-hal/busio/I2C.c +++ b/ports/stm/common-hal/busio/I2C.c @@ -120,7 +120,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, if (i2c_taken) { mp_raise_ValueError(translate("Hardware busy, try alternative pins")); } else { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_I2C); + mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_I2C); } } @@ -155,7 +155,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, } else if (frequency == 100000) { self->handle.Init.Timing = CPY_I2CSTANDARD_TIMINGR; } else { - mp_raise_ValueError(translate("Unsupported baudrate")); + mp_raise_ValueError(translate("Unsupported frequency")); } #else self->handle.Init.ClockSpeed = frequency; @@ -171,7 +171,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, self->handle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE; self->handle.State = HAL_I2C_STATE_RESET; if (HAL_I2C_Init(&(self->handle)) != HAL_OK) { - mp_raise_RuntimeError(translate("I2C Init Error")); + mp_raise_RuntimeError(translate("I2C init error")); } common_hal_mcu_pin_claim(sda); common_hal_mcu_pin_claim(scl); diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index f7961f8cef..fb782daad4 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -165,7 +165,7 @@ STATIC int check_pins(busio_spi_obj_t *self, if (spi_taken) { mp_raise_ValueError(translate("Hardware busy, try alternative pins")); } else { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_SPI); + raise_ValueError_invalid_pin(); } } @@ -224,7 +224,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, self->handle.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; self->handle.Init.CRCPolynomial = 10; if (HAL_SPI_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("SPI Init Error")); + mp_raise_ValueError(translate("SPI init error")); } self->baudrate = (get_busclock(SPIx) / 16); self->prescaler = 16; @@ -306,7 +306,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self, get_busclock(self->handle.Instance)); if (HAL_SPI_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("SPI Re-initialization error")); + mp_raise_ValueError(translate("SPI re-initialization error")); } self->baudrate = baudrate; @@ -346,7 +346,7 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) { bool common_hal_busio_spi_write(busio_spi_obj_t *self, const uint8_t *data, size_t len) { if (self->mosi == NULL) { - mp_raise_ValueError(translate("No MOSI Pin")); + mp_raise_ValueError(translate("No MOSI pin")); } HAL_StatusTypeDef result = HAL_SPI_Transmit(&self->handle, (uint8_t *)data, (uint16_t)len, HAL_MAX_DELAY); return result == HAL_OK; @@ -355,9 +355,9 @@ 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 == NULL && !self->half_duplex) { - mp_raise_ValueError(translate("No MISO Pin")); + mp_raise_ValueError(translate("No MISO pin")); } else if (self->half_duplex && self->mosi == NULL) { - mp_raise_ValueError(translate("No MOSI Pin")); + mp_raise_ValueError(translate("No MOSI pin")); } HAL_StatusTypeDef result = HAL_OK; if ((!self->half_duplex && self->mosi == NULL) || (self->half_duplex && self->mosi != NULL && self->miso == NULL)) { @@ -372,7 +372,7 @@ 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) { if (self->miso == NULL || self->mosi == NULL) { - mp_raise_ValueError(translate("Missing MISO or MOSI Pin")); + mp_raise_ValueError(translate("Missing MISO or MOSI pin")); } HAL_StatusTypeDef result = HAL_SPI_TransmitReceive(&self->handle, (uint8_t *)data_out, data_in, (uint16_t)len,HAL_MAX_DELAY); diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c index 7e35ad86dd..2347c079e8 100644 --- a/ports/stm/common-hal/busio/UART.c +++ b/ports/stm/common-hal/busio/UART.c @@ -58,7 +58,7 @@ STATIC USART_TypeDef *assign_uart_or_throw(busio_uart_obj_t *self, bool pin_eval if (uart_taken) { mp_raise_ValueError(translate("Hardware in use, try alternative pins")); } else { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_UART); + raise_ValueError_invalid_pin(); } } } @@ -164,12 +164,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } // Other errors - if (receiver_buffer_size == 0) { - mp_raise_ValueError(translate("Invalid buffer size")); - } - if (bits != 8 && bits != 9) { - mp_raise_ValueError(translate("Invalid word/bit length")); - } + mp_arg_validate_length_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size); + mp_arg_validate_int_range(bits, 8, 9, MP_QSTR_bits); + if (USARTx == NULL) { // this can only be hit if the periph file is wrong mp_raise_ValueError(translate("Internal define error")); } @@ -211,7 +208,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->handle.Init.HwFlowCtl = UART_HWCONTROL_NONE; self->handle.Init.OverSampling = UART_OVERSAMPLING_16; if (HAL_UART_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART Init Error")); + mp_raise_ValueError(translate("UART init error")); } @@ -221,7 +218,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->ringbuf = (ringbuf_t) { receiver_buffer, receiver_buffer_size }; } else { if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) { - mp_raise_ValueError(translate("UART Buffer allocation error")); + m_malloc_fail(receiver_buffer_size); } } common_hal_mcu_pin_claim(rx); @@ -408,11 +405,11 @@ void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrat // Otherwise de-init and set new rate if (HAL_UART_DeInit(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART De-init error")); + mp_raise_ValueError(translate("UART de-init error")); } self->handle.Init.BaudRate = baudrate; if (HAL_UART_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART Re-init error")); + mp_raise_ValueError(translate("UART re-init error")); } self->baudrate = baudrate; diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c index 74ff7f964b..08ac034bde 100644 --- a/ports/stm/common-hal/canio/CAN.c +++ b/ports/stm/common-hal/canio/CAN.c @@ -59,13 +59,13 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, const mcu_pin_obj_t * const mcu_periph_obj_t *mcu_tx = find_pin_function(mcu_can_tx_list, can_tx_len, tx, -1); if (!mcu_tx) { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_tx); + mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_tx); } int periph_index = mcu_tx->periph_index; const mcu_periph_obj_t *mcu_rx = find_pin_function(mcu_can_rx_list, can_rx_len, rx, periph_index); if (!mcu_rx) { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_rx); + mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_rx); } if (reserved_can[periph_index]) { diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c index b8fbd9a36b..1c323ad711 100644 --- a/ports/stm/common-hal/pulseio/PulseIn.c +++ b/ports/stm/common-hal/pulseio/PulseIn.c @@ -123,8 +123,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false); if (self->buffer == NULL) { // TODO: free the EXTI here? - mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"), - maxlen * sizeof(uint16_t)); + m_malloc_fail(maxlen * sizeof(uint16_t)); } // Set internal variables @@ -257,7 +256,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_ } if (index < 0 || index >= self->len) { stm_peripherals_exti_enable(self->pin->number); - mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn); + mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; stm_peripherals_exti_enable(self->pin->number); diff --git a/ports/stm/common-hal/sdioio/SDCard.c b/ports/stm/common-hal/sdioio/SDCard.c index c7472a459f..40e6eddae1 100644 --- a/ports/stm/common-hal/sdioio/SDCard.c +++ b/ports/stm/common-hal/sdioio/SDCard.c @@ -115,7 +115,7 @@ STATIC int check_pins(sdioio_sdcard_obj_t *self, if (sdio_taken) { mp_raise_ValueError(translate("Hardware busy, try alternative pins")); } else { - mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_SDIO); + raise_ValueError_invalid_pin(); } } diff --git a/py/argcheck.c b/py/argcheck.c index c2066a7c39..5854c9d1d2 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -156,6 +156,13 @@ NORETURN void mp_arg_error_unimpl_kw(void) { #endif +mp_int_t mp_arg_validate_int(mp_int_t i, mp_int_t required_i, qstr arg_name) { + if (i != required_i) { + mp_raise_ValueError_varg(translate("%q must be %d"), arg_name, required_i); + } + return i; +} + 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); @@ -194,6 +201,27 @@ mp_uint_t mp_arg_validate_length_range(mp_uint_t length, mp_uint_t min, mp_uint_ return length; } +mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_name) { + if (length < min) { + mp_raise_ValueError_varg(translate("%q length must be >= %d"), arg_name, min); + } + return length; +} + +mp_uint_t mp_arg_validate_length_max(mp_uint_t length, mp_uint_t max, qstr arg_name) { + if (length > max) { + mp_raise_ValueError_varg(translate("%q length must be <= %d"), arg_name, max); + } + return length; +} + +mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qstr arg_name) { + if (length != required_length) { + mp_raise_ValueError_varg(translate("%q length must be %d"), arg_name, required_length); + } + return length; +} + 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 be of type %q"), arg_name, type->name); @@ -201,9 +229,21 @@ mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_ return obj; } -mp_obj_t mp_arg_validate_string(mp_obj_t obj, qstr arg_name) { +mp_obj_t mp_arg_validate_type_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; } + +mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) { + mp_int_t an_int; + if (!mp_obj_get_int_maybe(obj, &an_int)) { + mp_raise_TypeError_varg(translate("%q must be an int"), arg_name); + } + return an_int; +} + +NORETURN void mp_arg_error_invalid(qstr arg_name) { + mp_raise_ValueError_varg(translate("Invalid %q"), arg_name); +} diff --git a/py/builtinimport.c b/py/builtinimport.c index dbacc3d657..4e4b6f068a 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -282,7 +282,7 @@ STATIC void evaluate_relative_import(mp_int_t level, const char **module_name, s #endif // If we have a __path__ in the globals dict, then we're a package. - bool is_pkg = mp_map_lookup(&mp_globals_get()->map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP); + bool is_pkg = mp_map_lookup(&mp_globals_get()->map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP) != NULL; #if DEBUG_PRINT DEBUG_printf("Current module/package: "); diff --git a/py/runtime.h b/py/runtime.h index 4a309f3975..4fa30d9b2b 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -92,15 +92,21 @@ 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); +NORETURN void mp_arg_error_invalid(qstr arg_name); +mp_int_t mp_arg_validate_int(mp_int_t i, mp_int_t required_i, qstr arg_name); 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); #if MICROPY_PY_BUILTINS_FLOAT mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name); #endif +mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_name); +mp_uint_t mp_arg_validate_length_max(mp_uint_t length, mp_uint_t max, qstr arg_name); mp_uint_t mp_arg_validate_length_range(mp_uint_t length, mp_uint_t min, mp_uint_t max, qstr arg_name); +mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qstr arg_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); +mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name); +mp_obj_t mp_arg_validate_type_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/_bleio/Address.c b/shared-bindings/_bleio/Address.c index 9673642a5b..26aeec3036 100644 --- a/shared-bindings/_bleio/Address.c +++ b/shared-bindings/_bleio/Address.c @@ -69,7 +69,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, const mp_int_t address_type = args[ARG_address_type].u_int; if (address_type < BLEIO_ADDRESS_TYPE_MIN || address_type > BLEIO_ADDRESS_TYPE_MAX) { - mp_raise_ValueError(translate("Address type out of range")); + mp_arg_error_invalid(MP_QSTR_address_type); } common_hal_bleio_address_construct(self, buf_info.buf, address_type); diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c index 4ff37f0623..6f72d96056 100644 --- a/shared-bindings/_bleio/Characteristic.c +++ b/shared-bindings/_bleio/Characteristic.c @@ -100,7 +100,7 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_ const bleio_characteristic_properties_t properties = args[ARG_properties].u_int; if (properties & ~CHAR_PROP_ALL) { - mp_raise_ValueError(translate("Invalid properties")); + mp_arg_error_invalid(MP_QSTR_properties); } const bleio_attribute_security_mode_t read_perm = args[ARG_read_perm].u_int; @@ -109,10 +109,8 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_ const bleio_attribute_security_mode_t write_perm = args[ARG_write_perm].u_int; common_hal_bleio_attribute_security_mode_check_valid(write_perm); - const mp_int_t max_length_int = args[ARG_max_length].u_int; - if (max_length_int < 0) { - mp_raise_ValueError(translate("max_length must be >= 0")); - } + const mp_int_t max_length_int = mp_arg_validate_int_min(args[ARG_max_length].u_int, 0, MP_QSTR_max_length); + const size_t max_length = (size_t)max_length_int; const bool fixed_length = args[ARG_fixed_length].u_bool; mp_obj_t initial_value = args[ARG_initial_value].u_obj; diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c index 78ff07fa77..aea77fb633 100644 --- a/shared-bindings/_bleio/CharacteristicBuffer.c +++ b/shared-bindings/_bleio/CharacteristicBuffer.c @@ -70,15 +70,9 @@ STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type, bleio_characteristic_obj_t *characteristic = mp_arg_validate_type(args[ARG_characteristic].u_obj, &bleio_characteristic_type, MP_QSTR_characteristic); - mp_float_t timeout = mp_obj_get_float(args[ARG_timeout].u_obj); - if (timeout < 0.0f) { - mp_raise_ValueError(translate("timeout must be >= 0.0")); - } + mp_float_t timeout = mp_arg_validate_obj_float_non_negative(args[ARG_timeout].u_obj, 1.0f, MP_QSTR_timeout); - const int buffer_size = args[ARG_buffer_size].u_int; - if (buffer_size < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_buffer_size); - } + const mp_int_t buffer_size = mp_arg_validate_int_min(args[ARG_buffer_size].u_int, 1, MP_QSTR_buffer_size); bleio_characteristic_buffer_obj_t *self = m_new_obj(bleio_characteristic_buffer_obj_t); self->base.type = &bleio_characteristic_buffer_type; diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c index f2ef6b433d..0e662655c4 100644 --- a/shared-bindings/_bleio/Descriptor.c +++ b/shared-bindings/_bleio/Descriptor.c @@ -94,10 +94,8 @@ STATIC mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_o const bleio_attribute_security_mode_t write_perm = args[ARG_write_perm].u_int; common_hal_bleio_attribute_security_mode_check_valid(write_perm); - const mp_int_t max_length_int = args[ARG_max_length].u_int; - if (max_length_int < 0) { - mp_raise_ValueError(translate("max_length must be >= 0")); - } + const mp_int_t max_length_int = mp_arg_validate_int_min(args[ARG_max_length].u_int, 0, MP_QSTR_max_length); + const size_t max_length = (size_t)max_length_int; const bool fixed_length = args[ARG_fixed_length].u_bool; mp_obj_t initial_value = args[ARG_initial_value].u_obj; diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c index 9e64661fd3..30eb8dd8c7 100644 --- a/shared-bindings/_bleio/PacketBuffer.c +++ b/shared-bindings/_bleio/PacketBuffer.c @@ -73,10 +73,7 @@ STATIC mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n bleio_characteristic_obj_t *characteristic = mp_arg_validate_type(args[ARG_characteristic].u_obj, &bleio_characteristic_type, MP_QSTR_characteristic); - const mp_int_t buffer_size = args[ARG_buffer_size].u_int; - if (buffer_size < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_buffer_size); - } + const mp_int_t buffer_size = mp_arg_validate_int_min(args[ARG_buffer_size].u_int, 1, MP_QSTR_buffer_size); size_t max_packet_size = common_hal_bleio_characteristic_get_max_length(characteristic); if (args[ARG_max_packet_size].u_obj != mp_const_none) { diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c index d9436ea45a..8f1ea4eac2 100644 --- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c +++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c @@ -44,6 +44,10 @@ #include "extmod/ulab/code/ndarray.h" #endif +static NORETURN void invalid_byteorder(void) { + mp_arg_error_invalid(MP_QSTR_byteorder); +} + static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t *parsed); //| class PixelBuf: @@ -124,7 +128,7 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t size_t bo_len; const char *byteorder = mp_obj_str_get_data(byteorder_obj, &bo_len); if (bo_len < 3 || bo_len > 4) { - mp_raise_ValueError(translate("Invalid byteorder string")); + invalid_byteorder(); } parsed->order_string = byteorder_obj; @@ -136,7 +140,7 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t char *w = strchr(byteorder, 'W'); int num_chars = (dotstar ? 1 : 0) + (w ? 1 : 0) + (r ? 1 : 0) + (g ? 1 : 0) + (b ? 1 : 0); if ((num_chars < parsed->bpp) || !(r && b && g)) { - mp_raise_ValueError(translate("Invalid byteorder string")); + invalid_byteorder(); } parsed->is_dotstar = dotstar ? true : false; parsed->has_white = w ? true : false; @@ -146,10 +150,10 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t parsed->byteorder.w = w ? w - byteorder : 0; // The dotstar brightness byte is always first (as it goes with the pixel start bits) if (dotstar && byteorder[0] != 'P') { - mp_raise_ValueError(translate("Invalid byteorder string")); + invalid_byteorder(); } if (parsed->has_white && parsed->is_dotstar) { - mp_raise_ValueError(translate("Invalid byteorder string")); + invalid_byteorder(); } } diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c index bb72b10e7e..27d52d8566 100644 --- a/shared-bindings/aesio/aes.c +++ b/shared-bindings/aesio/aes.c @@ -63,15 +63,12 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args, const uint8_t *key = NULL; uint32_t key_length = 0; - if (mp_get_buffer(args[ARG_key].u_obj, &bufinfo, MP_BUFFER_READ)) { - if ((bufinfo.len != 16) && (bufinfo.len != 24) && (bufinfo.len != 32)) { - mp_raise_TypeError(translate("Key must be 16, 24, or 32 bytes long")); - } - key = bufinfo.buf; - key_length = bufinfo.len; - } else { - mp_raise_TypeError(translate("No key was specified")); + mp_get_buffer_raise(args[ARG_key].u_obj, &bufinfo, MP_BUFFER_READ); + if ((bufinfo.len != 16) && (bufinfo.len != 24) && (bufinfo.len != 32)) { + mp_raise_TypeError(translate("Key must be 16, 24, or 32 bytes long")); } + key = bufinfo.buf; + key_length = bufinfo.len; int mode = args[ARG_mode].u_int; switch (args[ARG_mode].u_int) { diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c index 7de36f0cec..37223f1f35 100644 --- a/shared-bindings/alarm/SleepMemory.c +++ b/shared-bindings/alarm/SleepMemory.c @@ -159,9 +159,8 @@ STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, m } else { // store mp_int_t byte_value = mp_obj_get_int(value); - if (byte_value > 0xff || byte_value < 0) { - mp_raise_ValueError(translate("Bytes must be between 0 and 255.")); - } + mp_arg_validate_int_range(byte_value, 0, 255, MP_QSTR_bytes); + uint8_t short_value = byte_value; if (!common_hal_alarm_sleep_memory_set_bytes(self, index, &short_value, 1)) { mp_raise_RuntimeError(translate("Unable to write to sleep_memory.")); diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index 31173f8890..2f171c5a0f 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -108,10 +108,8 @@ STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t valu if (common_hal_analogio_analogout_deinited(self)) { raise_deinited_error(); } - uint32_t v = mp_obj_get_int(value); - if (v >= (1 << 16)) { - mp_raise_ValueError(translate("AnalogOut is only 16 bits. Value must be less than 65536.")); - } + uint16_t v = mp_arg_validate_int_range(mp_obj_get_int(value), 0, 65535, MP_QSTR_value); + common_hal_analogio_analogout_set_value(self, v); return mp_const_none; } diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c index a165435ff0..3ca6ccd5e3 100644 --- a/shared-bindings/audiomixer/Mixer.c +++ b/shared-bindings/audiomixer/Mixer.c @@ -91,19 +91,9 @@ STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_ar mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t voice_count = args[ARG_voice_count].u_int; - if (voice_count < 1 || voice_count > 255) { - mp_raise_ValueError(translate("Invalid voice count")); - } - - mp_int_t channel_count = args[ARG_channel_count].u_int; - if (channel_count < 1 || channel_count > 2) { - mp_raise_ValueError(translate("Invalid channel count")); - } - mp_int_t sample_rate = args[ARG_sample_rate].u_int; - if (sample_rate < 1) { - mp_raise_ValueError(translate("Sample rate must be positive")); - } + mp_int_t voice_count = mp_arg_validate_int_range(args[ARG_voice_count].u_int, 1, 255, MP_QSTR_voice_count); + mp_int_t channel_count = mp_arg_validate_int_range(args[ARG_channel_count].u_int, 1, 2, MP_QSTR_channel_count); + mp_int_t sample_rate = mp_arg_validate_int_min(args[ARG_sample_rate].u_int, 1, MP_QSTR_sample_rate); mp_int_t bits_per_sample = args[ARG_bits_per_sample].u_int; if (bits_per_sample != 8 && bits_per_sample != 16) { mp_raise_ValueError(translate("bits_per_sample must be 8 or 16")); @@ -222,7 +212,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_play(size_t n_args, const mp_obj_t *pos_arg uint8_t v = args[ARG_voice].u_int; if (v > (self->voice_count - 1)) { - mp_raise_ValueError(translate("Invalid voice")); + mp_arg_error_invalid(MP_QSTR_voice); } audiomixer_mixervoice_obj_t *voice = MP_OBJ_TO_PTR(self->voice[v]); mp_obj_t sample = args[ARG_sample].u_obj; @@ -248,7 +238,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *p uint8_t v = args[ARG_voice].u_int; if (v > (self->voice_count - 1)) { - mp_raise_ValueError(translate("Invalid voice")); + mp_arg_error_invalid(MP_QSTR_voice); } audiomixer_mixervoice_obj_t *voice = MP_OBJ_TO_PTR(self->voice[v]); common_hal_audiomixer_mixervoice_stop(voice); diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c index c65b184ca0..67c411120b 100644 --- a/shared-bindings/bitbangio/I2C.c +++ b/shared-bindings/bitbangio/I2C.c @@ -188,9 +188,7 @@ STATIC void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffe size_t length = bufinfo.len; normalize_buffer_bounds(&start, end, &length); - if (length == 0) { - mp_raise_ValueError(translate("Buffer must be at least length 1")); - } + mp_arg_validate_length_min(length, 1, MP_QSTR_buffer); uint8_t status = shared_module_bitbangio_i2c_read(self, address, ((uint8_t *)bufinfo.buf) + start, length); if (status != 0) { diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c index 2c29c09bf9..1f19f8c939 100644 --- a/shared-bindings/bitbangio/SPI.c +++ b/shared-bindings/bitbangio/SPI.c @@ -156,18 +156,10 @@ STATIC mp_obj_t bitbangio_spi_configure(size_t n_args, const mp_obj_t *pos_args, 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); - uint8_t polarity = args[ARG_polarity].u_int; - if (polarity != 0 && polarity != 1) { - mp_raise_ValueError(translate("Invalid polarity")); - } - uint8_t phase = args[ARG_phase].u_int; - if (phase != 0 && phase != 1) { - mp_raise_ValueError(translate("Invalid phase")); - } - uint8_t bits = args[ARG_bits].u_int; - if (bits != 8 && bits != 9) { - mp_raise_ValueError(translate("Invalid number of bits")); - } + uint8_t polarity = (uint8_t)mp_arg_validate_int_range(args[ARG_polarity].u_int, 0, 1, MP_QSTR_polarity); + uint8_t phase = (uint8_t)mp_arg_validate_int_range(args[ARG_phase].u_int, 0, 1, MP_QSTR_phase); + uint8_t bits = (uint8_t)mp_arg_validate_int_range(args[ARG_bits].u_int, 8, 9, MP_QSTR_bits); + shared_module_bitbangio_spi_configure(self, args[ARG_baudrate].u_int, polarity, phase, bits); return mp_const_none; diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c index 5b455dcb0f..0b6b98a8d1 100644 --- a/shared-bindings/bitops/__init__.c +++ b/shared-bindings/bitops/__init__.c @@ -64,10 +64,7 @@ STATIC mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t 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); - int width = args[ARG_width].u_int; - if (width < 2 || width > 8) { - mp_raise_ValueError_varg(translate("width must be from 2 to 8 (inclusive), not %d"), width); - } + mp_int_t width = mp_arg_validate_int_range(args[ARG_width].u_int, 2, 8, MP_QSTR_width); mp_buffer_info_t input_bufinfo; mp_get_buffer_raise(args[ARG_input].u_obj, &input_bufinfo, MP_BUFFER_READ); @@ -80,9 +77,9 @@ STATIC mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t mp_get_buffer_raise(args[ARG_output].u_obj, &output_bufinfo, MP_BUFFER_WRITE); int avail = output_bufinfo.len; int outlen = 8 * (inlen / width); - if (avail < outlen) { - mp_raise_ValueError_varg(translate("Output buffer must be at least %d bytes"), outlen); - } + + mp_arg_validate_length_min(avail, outlen, MP_QSTR_output); + common_hal_bitops_bit_transpose(output_bufinfo.buf, input_bufinfo.buf, inlen, width); return args[ARG_output].u_obj; } diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c index 2d67281df0..e05e4e0546 100644 --- a/shared-bindings/busio/I2C.c +++ b/shared-bindings/busio/I2C.c @@ -210,9 +210,7 @@ STATIC mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, int32_t start = args[ARG_start].u_int; const int32_t end = args[ARG_end].u_int; normalize_buffer_bounds(&start, end, &length); - if (length == 0) { - mp_raise_ValueError_varg(translate("%q length must be >= 1"), MP_QSTR_buffer); - } + mp_arg_validate_length_min(length, 1, MP_QSTR_buffer); uint8_t status = common_hal_busio_i2c_read(self, args[ARG_address].u_int, ((uint8_t *)bufinfo.buf) + start, length); diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index 0a6c32f20b..af853b84ac 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -106,7 +106,7 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz common_hal_busio_spi_construct(self, clock, mosi, miso, args[ARG_half_duplex].u_bool); return MP_OBJ_FROM_PTR(self); #else - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); #endif // CIRCUITPY_BUSIO_SPI } @@ -191,18 +191,9 @@ STATIC mp_obj_t busio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_ 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); - uint8_t polarity = args[ARG_polarity].u_int; - if (polarity != 0 && polarity != 1) { - mp_raise_ValueError(translate("Invalid polarity")); - } - uint8_t phase = args[ARG_phase].u_int; - if (phase != 0 && phase != 1) { - mp_raise_ValueError(translate("Invalid phase")); - } - uint8_t bits = args[ARG_bits].u_int; - if (bits != 8 && bits != 9) { - mp_raise_ValueError(translate("Invalid number of bits")); - } + uint8_t polarity = (uint8_t)mp_arg_validate_int_range(args[ARG_polarity].u_int, 0, 1, MP_QSTR_polarity); + uint8_t phase = (uint8_t)mp_arg_validate_int_range(args[ARG_phase].u_int, 0, 1, MP_QSTR_phase); + uint8_t bits = (uint8_t)mp_arg_validate_int_range(args[ARG_bits].u_int, 8, 9, MP_QSTR_bits); if (!common_hal_busio_spi_configure(self, args[ARG_baudrate].u_int, polarity, phase, bits)) { diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index ae14e314af..7a27b04aec 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -113,10 +113,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si mp_raise_ValueError(translate("tx and rx cannot both be None")); } - if (args[ARG_bits].u_int < 5 || args[ARG_bits].u_int > 9) { - mp_raise_ValueError(translate("bits must be in range 5 to 9")); - } - uint8_t bits = args[ARG_bits].u_int; + uint8_t bits = (uint8_t)mp_arg_validate_int_range(args[ARG_bits].u_int, 5, 9, MP_QSTR_bits); busio_uart_parity_t parity = BUSIO_UART_PARITY_NONE; if (args[ARG_parity].u_obj == MP_OBJ_FROM_PTR(&busio_uart_parity_even_obj)) { @@ -125,10 +122,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si parity = BUSIO_UART_PARITY_ODD; } - uint8_t stop = args[ARG_stop].u_int; - if (stop != 1 && stop != 2) { - mp_raise_ValueError(translate("stop must be 1 or 2")); - } + uint8_t stop = (uint8_t)mp_arg_validate_int_range(args[ARG_stop].u_int, 1, 2, MP_QSTR_stop); mp_float_t timeout = mp_obj_get_float(args[ARG_timeout].u_obj); validate_timeout(timeout); diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c index 64d4094b3f..28c445316a 100644 --- a/shared-bindings/canio/Message.c +++ b/shared-bindings/canio/Message.c @@ -57,9 +57,7 @@ STATIC mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args, mp_buffer_info_t data; mp_get_buffer_raise(args[ARG_data].u_obj, &data, MP_BUFFER_READ); - if (data.len > 8) { - mp_raise_ValueError(translate("Messages limited to 8 bytes")); - } + mp_arg_validate_length_range(data.len, 0, 8, MP_QSTR_data); canio_message_obj_t *self = m_new_obj(canio_message_obj_t); self->base.type = &canio_message_type; @@ -100,9 +98,9 @@ STATIC mp_obj_t canio_message_data_set(const mp_obj_t self_in, const mp_obj_t da canio_message_obj_t *self = self_in; mp_buffer_info_t data; mp_get_buffer_raise(data_in, &data, MP_BUFFER_READ); - if (data.len > 8) { - mp_raise_ValueError(translate("Messages limited to 8 bytes")); - } + + mp_arg_validate_length_range(data.len, 0, 8, MP_QSTR_data); + common_hal_canio_message_set_data(self, data.buf, data.len); return mp_const_none; } diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index 37093add8f..a9026fbd59 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -207,7 +207,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob mp_raise_NotImplementedError(translate("Pin is input only")); } } else { - mp_raise_ValueError(translate("Invalid direction.")); + mp_arg_error_invalid(MP_QSTR_direction); } return mp_const_none; } diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c index 90aa5c6c17..2aa80df61d 100644 --- a/shared-bindings/displayio/FourWire.c +++ b/shared-bindings/displayio/FourWire.c @@ -89,14 +89,8 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_ displayio_fourwire_obj_t *self = &allocate_display_bus_or_raise()->fourwire_bus; self->base.type = &displayio_fourwire_type; - uint8_t polarity = args[ARG_polarity].u_int; - if (polarity != 0 && polarity != 1) { - mp_raise_ValueError(translate("Invalid polarity")); - } - uint8_t phase = args[ARG_phase].u_int; - if (phase != 0 && phase != 1) { - mp_raise_ValueError(translate("Invalid phase")); - } + uint8_t polarity = (uint8_t)mp_arg_validate_int_range(args[ARG_polarity].u_int, 0, 1, MP_QSTR_polarity); + uint8_t phase = (uint8_t)mp_arg_validate_int_range(args[ARG_phase].u_int, 0, 1, MP_QSTR_phase); common_hal_displayio_fourwire_construct(self, MP_OBJ_TO_PTR(spi), command, chip_select, reset, args[ARG_baudrate].u_int, polarity, phase); @@ -133,10 +127,8 @@ STATIC mp_obj_t displayio_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_a mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t command_int = args[ARG_command].u_int; - if (command_int > 255 || command_int < 0) { - mp_raise_ValueError(translate("Command must be an int between 0 and 255")); - } + mp_int_t command_int = mp_arg_validate_int_range(args[ARG_command].u_int, 0, 255, MP_QSTR_command); + displayio_fourwire_obj_t *self = pos_args[0]; uint8_t command = command_int; mp_buffer_info_t bufinfo; diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c index 188331f99d..75cc217af3 100644 --- a/shared-bindings/displayio/Group.c +++ b/shared-bindings/displayio/Group.c @@ -57,10 +57,7 @@ STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_arg mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t scale = args[ARG_scale].u_int; - if (scale < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_scale); - } + mp_int_t scale = mp_arg_validate_int_min(args[ARG_scale].u_int, 1, MP_QSTR_scale); displayio_group_t *self = m_new_obj(displayio_group_t); self->base.type = &displayio_group_type; @@ -114,10 +111,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_group_get_scale_obj, displayio_group_obj_get STATIC mp_obj_t displayio_group_obj_set_scale(mp_obj_t self_in, mp_obj_t scale_obj) { displayio_group_t *self = native_group(self_in); - mp_int_t scale = mp_obj_get_int(scale_obj); - if (scale < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_scale); - } + mp_int_t scale = mp_arg_validate_int_min(mp_obj_get_int(scale_obj), 1, MP_QSTR_scale); + common_hal_displayio_group_set_scale(self, scale); return mp_const_none; } diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c index fbfbd04c64..a637fc5071 100644 --- a/shared-bindings/displayio/I2CDisplay.c +++ b/shared-bindings/displayio/I2CDisplay.c @@ -98,10 +98,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_i2cdisplay_reset_obj, displayio_i2cdisplay_o //| ... //| STATIC mp_obj_t displayio_i2cdisplay_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { - mp_int_t command_int = MP_OBJ_SMALL_INT_VALUE(command_obj); - if (!mp_obj_is_small_int(command_obj) || command_int > 255 || command_int < 0) { - mp_raise_ValueError(translate("Command must be an int between 0 and 255")); - } + mp_int_t command_int = mp_obj_get_int(command_obj); + mp_arg_validate_int_range(command_int, 0, 255, MP_QSTR_command); + uint8_t command = command_int; mp_buffer_info_t bufinfo; mp_get_buffer_raise(data_obj, &bufinfo, MP_BUFFER_READ); diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c index f39e7820a9..cbfe12d551 100644 --- a/shared-bindings/displayio/Shape.c +++ b/shared-bindings/displayio/Shape.c @@ -58,14 +58,8 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t width = args[ARG_width].u_int; - if (width < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_width); - } - mp_int_t height = args[ARG_height].u_int; - if (height < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_height); - } + mp_int_t width = mp_arg_validate_int_min(args[ARG_width].u_int, 1, MP_QSTR_width); + mp_int_t height = mp_arg_validate_int_min(args[ARG_height].u_int, 1, MP_QSTR_height); displayio_shape_t *self = m_new_obj(displayio_shape_t); self->base.type = &displayio_shape_type; diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 113721bcc6..b1557a1777 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -464,9 +464,8 @@ STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t v return MP_OBJ_NULL; // op not supported } else { mp_int_t value = mp_obj_get_int(value_obj); - if (value < 0 || value > 255) { - mp_raise_ValueError(translate("Tile value out of bounds")); - } + mp_arg_validate_int_range(value, 0, 255, MP_QSTR_tile); + common_hal_displayio_tilegrid_set_tile(self, x, y, value); } } diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c index 9c97d9a9a3..5c1b976e81 100644 --- a/shared-bindings/fontio/BuiltinFont.c +++ b/shared-bindings/fontio/BuiltinFont.c @@ -98,10 +98,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builti STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) { fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in); - mp_int_t codepoint; - if (!mp_obj_get_int_maybe(codepoint_obj, &codepoint)) { - mp_raise_ValueError_varg(translate("%q should be an int"), MP_QSTR_codepoint); - } + mp_int_t codepoint = mp_arg_validate_type_int(codepoint_obj, MP_QSTR_codepoint); return common_hal_fontio_builtinfont_get_glyph(self, codepoint); } MP_DEFINE_CONST_FUN_OBJ_2(fontio_builtinfont_get_glyph_obj, fontio_builtinfont_obj_get_glyph); diff --git a/shared-bindings/memorymonitor/AllocationAlarm.c b/shared-bindings/memorymonitor/AllocationAlarm.c index b54645225a..fe25a1a230 100644 --- a/shared-bindings/memorymonitor/AllocationAlarm.c +++ b/shared-bindings/memorymonitor/AllocationAlarm.c @@ -63,10 +63,10 @@ STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t minimum_block_count = args[ARG_minimum_block_count].u_int; - if (minimum_block_count < 1) { - mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_minimum_block_count); - } + + mp_int_t minimum_block_count = + mp_arg_validate_int_min(args[ARG_minimum_block_count].u_int, 1, MP_QSTR_minimum_block_count); + memorymonitor_allocationalarm_obj_t *self = m_new_obj(memorymonitor_allocationalarm_obj_t); self->base.type = &memorymonitor_allocationalarm_type; @@ -90,9 +90,8 @@ STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type //| STATIC mp_obj_t memorymonitor_allocationalarm_obj_ignore(mp_obj_t self_in, mp_obj_t count_obj) { mp_int_t count = mp_obj_get_int(count_obj); - if (count < 0) { - mp_raise_ValueError_varg(translate("%q must be >= 0"), MP_QSTR_count); - } + mp_arg_validate_int_min(count, 0, MP_QSTR_count); + common_hal_memorymonitor_allocationalarm_set_ignore(self_in, count); return self_in; } diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c index e6809d6b72..27c2667d8e 100644 --- a/shared-bindings/microcontroller/Pin.c +++ b/shared-bindings/microcontroller/Pin.c @@ -194,3 +194,11 @@ void validate_pins(qstr what, uint8_t *pin_nos, mp_int_t max_pins, mp_obj_t seq, pin_nos[i] = common_hal_mcu_pin_number(pins[i]); } } + +NORETURN void raise_ValueError_invalid_pin(void) { + mp_arg_error_invalid(MP_QSTR_pin); +} + +NORETURN void raise_ValueError_invalid_pins(void) { + mp_arg_error_invalid(MP_QSTR_pins); +} diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h index a7378ea98e..4ce20331d9 100644 --- a/shared-bindings/microcontroller/Pin.h +++ b/shared-bindings/microcontroller/Pin.h @@ -41,6 +41,8 @@ void validate_no_duplicate_pins(mp_obj_t seq, qstr arg_name); void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1, qstr arg_name2); void validate_list_is_free_pins(qstr what, const mcu_pin_obj_t **pins_out, mp_int_t max_pins, mp_obj_t seq, uint8_t *count_out); void validate_pins(qstr what, uint8_t *pin_nos, mp_int_t max_pins, mp_obj_t seq, uint8_t *count_out); +NORETURN void raise_ValueError_invalid_pin(void); +NORETURN void raise_ValueError_invalid_pins(void); void assert_pin_free(const mcu_pin_obj_t *pin); diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c index 707080cfbf..1b14b32934 100644 --- a/shared-bindings/microcontroller/__init__.c +++ b/shared-bindings/microcontroller/__init__.c @@ -119,7 +119,7 @@ STATIC mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) { } else if (run_mode_obj == MP_OBJ_FROM_PTR(&mcu_runmode_bootloader_obj)) { run_mode = RUNMODE_BOOTLOADER; } else { - mp_raise_ValueError(translate("Invalid run mode.")); + mp_arg_error_invalid(MP_QSTR_run_mode); } common_hal_mcu_on_next_reset(run_mode); return mp_const_none; diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c index 1719e209b2..94c699d469 100644 --- a/shared-bindings/msgpack/ExtType.c +++ b/shared-bindings/msgpack/ExtType.c @@ -47,10 +47,8 @@ STATIC mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - int code = args[ARG_code].u_int; - if (code < 0 || code > 127) { - mp_raise_AttributeError(translate("code outside range 0~127")); - } + int code = mp_arg_validate_int_range(args[ARG_code].u_int, 0, 127, MP_QSTR_code); + self->code = code; mp_obj_t data = args[ARG_data].u_obj; diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c index 6e34b76bd9..b01430c078 100644 --- a/shared-bindings/nvm/ByteArray.c +++ b/shared-bindings/nvm/ByteArray.c @@ -153,9 +153,8 @@ STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj } else { // store mp_int_t byte_value = mp_obj_get_int(value); - if (byte_value > 0xff || byte_value < 0) { - mp_raise_ValueError(translate("Bytes must be between 0 and 255.")); - } + mp_arg_validate_int_range(byte_value, 0, 255, MP_QSTR_bytes); + uint8_t short_value = byte_value; if (!common_hal_nvm_bytearray_set_bytes(self, index, &short_value, 1)) { mp_raise_RuntimeError(translate("Unable to write to nvm.")); diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c index 6e6e778259..c93f363d1a 100644 --- a/shared-bindings/paralleldisplay/ParallelBus.c +++ b/shared-bindings/paralleldisplay/ParallelBus.c @@ -126,10 +126,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(paralleldisplay_parallelbus_reset_obj, paralleldisplay //| ... //| STATIC mp_obj_t paralleldisplay_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { - mp_int_t command_int = MP_OBJ_SMALL_INT_VALUE(command_obj); - if (!mp_obj_is_small_int(command_obj) || command_int > 255 || command_int < 0) { - mp_raise_ValueError(translate("Command must be an int between 0 and 255")); - } + mp_int_t command_int = mp_arg_validate_int_range(mp_obj_get_int(command_obj), 0, 255, MP_QSTR_command); + uint8_t command = command_int; mp_buffer_info_t bufinfo; mp_get_buffer_raise(data_obj, &bufinfo, MP_BUFFER_READ); diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c index a0fb6d607b..2ceca6b044 100644 --- a/shared-bindings/ps2io/Ps2.c +++ b/shared-bindings/ps2io/Ps2.c @@ -68,21 +68,21 @@ //| ... //| STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { - enum { ARG_datapin, ARG_clkpin }; + enum { ARG_data_pin, ARG_clock_pin }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_datapin, MP_ARG_REQUIRED | MP_ARG_OBJ }, - { MP_QSTR_clkpin, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_data_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_clock_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - const mcu_pin_obj_t *clkpin = validate_obj_is_free_pin(args[ARG_clkpin].u_obj); - const mcu_pin_obj_t *datapin = validate_obj_is_free_pin(args[ARG_datapin].u_obj); + const mcu_pin_obj_t *clock_pin = validate_obj_is_free_pin(args[ARG_clock_pin].u_obj); + const mcu_pin_obj_t *data_pin = validate_obj_is_free_pin(args[ARG_data_pin].u_obj); ps2io_ps2_obj_t *self = m_new_obj(ps2io_ps2_obj_t); self->base.type = &ps2io_ps2_type; - common_hal_ps2io_ps2_construct(self, datapin, clkpin); + common_hal_ps2io_ps2_construct(self, data_pin, clock_pin); return MP_OBJ_FROM_PTR(self); } diff --git a/shared-bindings/ps2io/Ps2.h b/shared-bindings/ps2io/Ps2.h index da4c6ba2fe..861fd40232 100644 --- a/shared-bindings/ps2io/Ps2.h +++ b/shared-bindings/ps2io/Ps2.h @@ -34,7 +34,7 @@ extern const mp_obj_type_t ps2io_ps2_type; extern void common_hal_ps2io_ps2_construct(ps2io_ps2_obj_t *self, - const mcu_pin_obj_t *data_pin, const mcu_pin_obj_t *clk_pin); + const mcu_pin_obj_t *data_pin, const mcu_pin_obj_t *clock_pin); extern void common_hal_ps2io_ps2_deinit(ps2io_ps2_obj_t *self); extern bool common_hal_ps2io_ps2_deinited(ps2io_ps2_obj_t *self); extern uint16_t common_hal_ps2io_ps2_get_len(ps2io_ps2_obj_t *self); diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c index 60a9dfb8b9..524a857e64 100644 --- a/shared-bindings/pwmio/PWMOut.c +++ b/shared-bindings/pwmio/PWMOut.c @@ -41,10 +41,10 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) { case PWMOUT_OK: break; case PWMOUT_INVALID_PIN: - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); break; case PWMOUT_INVALID_FREQUENCY: - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); break; case PWMOUT_INVALID_FREQUENCY_ON_PIN: mp_raise_ValueError(translate("Frequency must match existing PWMOut using this timer")); @@ -212,9 +212,9 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t duty_ pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); mp_int_t duty = mp_obj_get_int(duty_cycle); - if (duty < 0 || duty > 0xffff) { - mp_raise_ValueError(translate("PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)")); - } + + mp_arg_validate_int_range(duty, 0, 0xffff, MP_QSTR_duty_cycle); + common_hal_pwmio_pwmout_set_duty_cycle(self, duty); return mp_const_none; } @@ -251,7 +251,7 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t freque } mp_int_t freq = mp_obj_get_int(frequency); if (freq == 0) { - mp_raise_ValueError(translate("Invalid PWM frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } common_hal_pwmio_pwmout_set_frequency(self, freq); return mp_const_none; diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c index 4739807bd0..fc9f438766 100644 --- a/shared-bindings/rgbmatrix/RGBMatrix.c +++ b/shared-bindings/rgbmatrix/RGBMatrix.c @@ -207,11 +207,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n uint8_t clock_pin = validate_pin(args[ARG_clock_pin].u_obj); uint8_t latch_pin = validate_pin(args[ARG_latch_pin].u_obj); uint8_t output_enable_pin = validate_pin(args[ARG_output_enable_pin].u_obj); - int bit_depth = args[ARG_bit_depth].u_int; - - if (bit_depth <= 0 || bit_depth > 6) { - mp_raise_ValueError_varg(translate("Bit depth must be from 1 to 6 inclusive, not %d"), bit_depth); - } + mp_int_t bit_depth = mp_arg_validate_int_range(args[ARG_bit_depth].u_int, 1, 6, MP_QSTR_bit_depth); validate_pins(MP_QSTR_rgb_pins, rgb_pins, MP_ARRAY_SIZE(self->rgb_pins), args[ARG_rgb_list].u_obj, &rgb_count); validate_pins(MP_QSTR_addr_pins, addr_pins, MP_ARRAY_SIZE(self->addr_pins), args[ARG_addr_list].u_obj, &addr_count); @@ -220,12 +216,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n mp_raise_ValueError_varg(translate("Must use a multiple of 6 rgb pins, not %d"), rgb_count); } - int tile = args[ARG_tile].u_int; - - if (tile <= 0) { - mp_raise_ValueError_varg( - translate("tile must be greater than zero")); - } + int tile = mp_arg_validate_int_min(args[ARG_tile].u_int, 1, MP_QSTR_tile); int computed_height = (rgb_count / 3) * (1 << (addr_count)) * tile; if (args[ARG_height].u_int != 0) { @@ -235,21 +226,18 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n } } - if (args[ARG_width].u_int <= 0) { - mp_raise_ValueError(translate("width must be greater than zero")); - } + mp_int_t width = mp_arg_validate_int_min(args[ARG_width].u_int, 1, MP_QSTR_width); preflight_pins_or_throw(clock_pin, rgb_pins, rgb_count, true); mp_obj_t framebuffer = args[ARG_framebuffer].u_obj; if (framebuffer == mp_const_none) { - int width = args[ARG_width].u_int; int bufsize = 2 * width * computed_height; framebuffer = mp_obj_new_bytearray_of_zeros(bufsize); } common_hal_rgbmatrix_rgbmatrix_construct(self, - args[ARG_width].u_int, + width, bit_depth, rgb_count, rgb_pins, addr_count, addr_pins, diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index f6407ff2a8..891ecfe092 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -129,14 +129,10 @@ STATIC mp_obj_t sdioio_sdcard_configure(size_t n_args, const mp_obj_t *pos_args, MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS); mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t frequency = args[ARG_frequency].u_int; - if (frequency < 0) { - mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_baudrate); - } - + mp_int_t frequency = mp_arg_validate_int_min(args[ARG_frequency].u_int, 0, MP_QSTR_frequency); uint8_t width = args[ARG_width].u_int; if (width != 0 && width != 1 && width != 4) { - mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_width); + mp_arg_error_invalid(MP_QSTR_width); } if (!common_hal_sdioio_sdcard_configure(self, frequency, width)) { diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c index 0b86b7b2a6..6fcff963a6 100644 --- a/shared-bindings/supervisor/__init__.c +++ b/shared-bindings/supervisor/__init__.c @@ -106,9 +106,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload); STATIC mp_obj_t supervisor_set_next_stack_limit(mp_obj_t size_obj) { mp_int_t size = mp_obj_get_int(size_obj); - if (size < 256) { - mp_raise_ValueError(translate("Stack size must be at least 256")); - } + mp_arg_validate_int_min(size, 256, MP_QSTR_size); + set_next_stack_size(size); return mp_const_none; diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c index 72fe2eb31f..106a073535 100644 --- a/shared-bindings/synthio/__init__.c +++ b/shared-bindings/synthio/__init__.c @@ -82,7 +82,7 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma } if (bytes_read != sizeof(chunk_header) || memcmp(chunk_header, "MThd\0\0\0\6\0\0\0\1", 12)) { - mp_raise_ValueError(translate("Invalid MIDI file")); + mp_arg_error_invalid(MP_QSTR_file); // TODO: for a multi-track MIDI (type 1), return an AudioMixer } @@ -97,7 +97,7 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma mp_raise_OSError(MP_EIO); } if (bytes_read != 8 || memcmp(chunk_header, "MTrk", 4)) { - mp_raise_ValueError(translate("Invalid MIDI file")); + mp_arg_error_invalid(MP_QSTR_file); } uint32_t track_size = (chunk_header[4] << 24) | (chunk_header[5] << 16) | (chunk_header[6] << 8) | chunk_header[7]; @@ -106,7 +106,7 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma mp_raise_OSError(MP_EIO); } if (bytes_read != track_size) { - mp_raise_ValueError(translate("Invalid MIDI file")); + mp_arg_error_invalid(MP_QSTR_file); } synthio_miditrack_obj_t *result = m_new_obj(synthio_miditrack_obj_t); diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 2741013d03..3f30a6264c 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -114,10 +114,8 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args mp_obj_t in_report_lengths = args[ARG_in_report_lengths].u_obj; mp_obj_t out_report_lengths = args[ARG_out_report_lengths].u_obj; - size_t report_ids_count = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(report_ids)); - if (report_ids_count < 1) { - mp_raise_ValueError_varg(translate("%q length must be >= 1"), MP_QSTR_report_ids); - } + size_t report_ids_count = + mp_arg_validate_length_min((size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(report_ids)), 1, MP_QSTR_report_ids); if ((size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(in_report_lengths)) != report_ids_count || (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(out_report_lengths)) != report_ids_count) { @@ -158,7 +156,7 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args } -//| def send_report(self, buf: ReadableBuffer, report_id: Optional[int] = None) -> None: +//| def send_report(self, report: ReadableBuffer, report_id: Optional[int] = None) -> None: //| """Send an HID report. If the device descriptor specifies zero or one report id's, //| you can supply `None` (the default) as the value of ``report_id``. //| Otherwise you must specify which report id to use when sending the report. @@ -168,9 +166,9 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args STATIC mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); - enum { ARG_buf, ARG_report_id }; + enum { ARG_report, ARG_report_id }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_buf, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_report, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_report_id, MP_ARG_OBJ, {.u_obj = mp_const_none} }, }; @@ -178,7 +176,7 @@ STATIC mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_ar mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[ARG_buf].u_obj, &bufinfo, MP_BUFFER_READ); + mp_get_buffer_raise(args[ARG_report].u_obj, &bufinfo, MP_BUFFER_READ); // -1 asks common_hal to determine the report id if possible. mp_int_t report_id_arg = -1; diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c index a63c0a8023..235ec534aa 100644 --- a/shared-bindings/wifi/Monitor.c +++ b/shared-bindings/wifi/Monitor.c @@ -55,19 +55,14 @@ STATIC mp_obj_t wifi_monitor_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_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - if (args[ARG_channel].u_int < 1 || args[ARG_channel].u_int > 13) { - mp_raise_ValueError_varg(translate("%q out of bounds"), MP_QSTR_channel); - } - - if (args[ARG_queue].u_int < 0) { - mp_raise_ValueError_varg(translate("%q out of bounds"), MP_QSTR_channel); - } + mp_int_t channel = mp_arg_validate_int_range(args[ARG_channel].u_int, 1, 13, MP_QSTR_channel); + mp_int_t queue = mp_arg_validate_int_min(args[ARG_queue].u_int, 0, MP_QSTR_queue); wifi_monitor_obj_t *self = MP_STATE_VM(wifi_monitor_singleton); if (common_hal_wifi_monitor_deinited()) { self = m_new_obj(wifi_monitor_obj_t); self->base.type = &wifi_monitor_type; - common_hal_wifi_monitor_construct(self, args[ARG_channel].u_int, args[ARG_queue].u_int); + common_hal_wifi_monitor_construct(self, channel, queue); MP_STATE_VM(wifi_monitor_singleton) = self; } diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index cf1e9dfc4e..e79d7047b3 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -87,9 +87,7 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) mp_buffer_info_t hostname; mp_get_buffer_raise(hostname_in, &hostname, MP_BUFFER_READ); - if (hostname.len < 1 || hostname.len > 253) { - mp_raise_ValueError(translate("Hostname must be between 1 and 253 characters")); - } + mp_arg_validate_length_range(hostname.len, 1, 253, MP_QSTR_hostname); #ifndef CONFIG_IDF_TARGET_ESP32C3 regex_t regex; // validate hostname according to RFC 1123 @@ -269,9 +267,7 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_ authmode = (1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK); } mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ); - if (password.len > 0 && (password.len < 8 || password.len > 63)) { - mp_raise_ValueError(translate("WiFi password must be between 8 and 63 characters")); - } + mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password); } else { authmode = 1; } @@ -342,9 +338,7 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m password.len = 0; if (args[ARG_password].u_obj != MP_OBJ_NULL) { mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ); - if (password.len > 0 && (password.len < 8 || password.len > 63)) { - mp_raise_ValueError(translate("WiFi password must be between 8 and 63 characters")); - } + mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password); } #define MAC_ADDRESS_LENGTH 6 diff --git a/shared-module/_bleio/Attribute.c b/shared-module/_bleio/Attribute.c index 3acfcf1f53..9c75a69fd1 100644 --- a/shared-module/_bleio/Attribute.c +++ b/shared-module/_bleio/Attribute.c @@ -40,7 +40,7 @@ void common_hal_bleio_attribute_security_mode_check_valid(bleio_attribute_securi case SECURITY_MODE_SIGNED_WITH_MITM: break; default: - mp_raise_ValueError(translate("Invalid security_mode")); + mp_arg_error_invalid(MP_QSTR_security_mode); break; } } diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c index 99980c705e..cab97feace 100644 --- a/shared-module/adafruit_pixelbuf/PixelBuf.c +++ b/shared-module/adafruit_pixelbuf/PixelBuf.c @@ -171,9 +171,7 @@ STATIC void _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color, mp_obj_t *items; size_t len; mp_obj_get_array(color, &len, &items); - if (len < 3 || len > 4) { - mp_raise_ValueError_varg(translate("Expected tuple of length %d, got %d"), byteorder->bpp, len); - } + mp_arg_validate_length_range(len, 3, 4, MP_QSTR_color); *r = _pixelbuf_get_as_uint8(items[PIXEL_R]); *g = _pixelbuf_get_as_uint8(items[PIXEL_G]); diff --git a/shared-module/audiocore/WaveFile.c b/shared-module/audiocore/WaveFile.c index 0cceb979a6..b4056e3f29 100644 --- a/shared-module/audiocore/WaveFile.c +++ b/shared-module/audiocore/WaveFile.c @@ -60,7 +60,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self, if (bytes_read != 16 || memcmp(chunk_header, "RIFF", 4) != 0 || memcmp(chunk_header + 8, "WAVEfmt ", 8) != 0) { - mp_raise_ValueError(translate("Invalid wave file")); + mp_arg_error_invalid(MP_QSTR_file); } uint32_t format_size; if (f_read(&self->file->fp, &format_size, 4, &bytes_read) != FR_OK) { @@ -105,7 +105,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self, mp_raise_OSError(MP_EIO); } if (bytes_read != 4) { - mp_raise_ValueError(translate("Invalid file")); + mp_arg_error_invalid(MP_QSTR_file); } self->file_length = data_length; self->data_start = self->file->fp.fptr; @@ -121,15 +121,13 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self, self->buffer = m_malloc(self->len, false); if (self->buffer == NULL) { common_hal_audioio_wavefile_deinit(self); - mp_raise_msg(&mp_type_MemoryError, - translate("Couldn't allocate first buffer")); + m_malloc_fail(self->len); } self->second_buffer = m_malloc(self->len, false); if (self->second_buffer == NULL) { common_hal_audioio_wavefile_deinit(self); - mp_raise_msg(&mp_type_MemoryError, - translate("Couldn't allocate second buffer")); + m_malloc_fail(self->len); } } } diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c index d6569c66f0..1c5de4d934 100644 --- a/shared-module/audiomixer/Mixer.c +++ b/shared-module/audiomixer/Mixer.c @@ -47,13 +47,13 @@ void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t *self, self->first_buffer = m_malloc(self->len, false); if (self->first_buffer == NULL) { common_hal_audiomixer_mixer_deinit(self); - mp_raise_msg(&mp_type_MemoryError, translate("Couldn't allocate first buffer")); + m_malloc_fail(self->len); } self->second_buffer = m_malloc(self->len, false); if (self->second_buffer == NULL) { common_hal_audiomixer_mixer_deinit(self); - mp_raise_msg(&mp_type_MemoryError, translate("Couldn't allocate second buffer")); + m_malloc_fail(self->len); } self->bits_per_sample = bits_per_sample; diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index bbc7e1c79e..d0b5428a11 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -193,8 +193,7 @@ void common_hal_audiomp3_mp3file_construct(audiomp3_mp3file_obj_t *self, self->inbuf = m_malloc(self->inbuf_length, false); if (self->inbuf == NULL) { common_hal_audiomp3_mp3file_deinit(self); - mp_raise_msg(&mp_type_MemoryError, - translate("Couldn't allocate input buffer")); + m_malloc_fail(self->inbuf_length); } self->decoder = MP3InitDecoder(); if (self->decoder == NULL) { @@ -214,15 +213,13 @@ void common_hal_audiomp3_mp3file_construct(audiomp3_mp3file_obj_t *self, self->buffers[0] = m_malloc(MAX_BUFFER_LEN, false); if (self->buffers[0] == NULL) { common_hal_audiomp3_mp3file_deinit(self); - mp_raise_msg(&mp_type_MemoryError, - translate("Couldn't allocate first buffer")); + m_malloc_fail(MAX_BUFFER_LEN); } self->buffers[1] = m_malloc(MAX_BUFFER_LEN, false); if (self->buffers[1] == NULL) { common_hal_audiomp3_mp3file_deinit(self); - mp_raise_msg(&mp_type_MemoryError, - translate("Couldn't allocate second buffer")); + m_malloc_fail(MAX_BUFFER_LEN); } } diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c index 65511964a6..dc91c6e0d5 100644 --- a/shared-module/bitbangio/SPI.c +++ b/shared-module/bitbangio/SPI.c @@ -41,7 +41,7 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self, const mcu_pin_obj_t *miso) { digitalinout_result_t result = common_hal_digitalio_digitalinout_construct(&self->clock, clock); if (result != DIGITALINOUT_OK) { - mp_raise_ValueError(translate("Clock pin init failed.")); + mp_raise_ValueError_varg(translate("%q init failed"), MP_QSTR_clock); } common_hal_digitalio_digitalinout_switch_to_output(&self->clock, self->polarity == 1, DRIVE_MODE_PUSH_PULL); @@ -49,7 +49,7 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self, result = common_hal_digitalio_digitalinout_construct(&self->mosi, mosi); if (result != DIGITALINOUT_OK) { common_hal_digitalio_digitalinout_deinit(&self->clock); - mp_raise_ValueError(translate("MOSI pin init failed.")); + mp_raise_ValueError_varg(translate("%q init failed"), MP_QSTR_mosi); } self->has_mosi = true; common_hal_digitalio_digitalinout_switch_to_output(&self->mosi, false, DRIVE_MODE_PUSH_PULL); @@ -63,7 +63,7 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self, if (mosi != NULL) { common_hal_digitalio_digitalinout_deinit(&self->mosi); } - mp_raise_ValueError(translate("MISO pin init failed.")); + mp_raise_ValueError_varg(translate("%q init failed"), MP_QSTR_miso); } self->has_miso = true; } @@ -123,7 +123,7 @@ void shared_module_bitbangio_spi_unlock(bitbangio_spi_obj_t *self) { // Writes out the given data. bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t *data, size_t len) { if (len > 0 && !self->has_mosi) { - mp_raise_ValueError(translate("Cannot write without MOSI pin.")); + mp_raise_ValueError(translate("Cannot write without MOSI pin")); } uint32_t delay_half = self->delay_half; @@ -178,7 +178,7 @@ bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t // Reads in len bytes while outputting zeroes. bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data, size_t len, uint8_t write_data) { if (len > 0 && !self->has_miso) { - mp_raise_ValueError(translate("Cannot read without MISO pin.")); + mp_raise_ValueError(translate("Cannot read without MISO pin")); } uint32_t delay_half = self->delay_half; @@ -246,7 +246,7 @@ bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data, // transfer bool shared_module_bitbangio_spi_transfer(bitbangio_spi_obj_t *self, const uint8_t *dout, uint8_t *din, size_t len) { if (len > 0 && (!self->has_mosi || !self->has_miso)) { - mp_raise_ValueError(translate("Cannot transfer without MOSI and MISO pins.")); + mp_raise_ValueError(translate("Cannot transfer without MOSI and MISO pins")); } uint32_t delay_half = self->delay_half; diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 1a4e4eafb5..ad45852379 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -268,7 +268,7 @@ static void _add_layer(displayio_group_t *self, mp_obj_t layer) { if (native_layer != MP_OBJ_NULL) { displayio_tilegrid_t *tilegrid = native_layer; if (tilegrid->in_group) { - mp_raise_ValueError(translate("Layer already in a group.")); + mp_raise_ValueError(translate("Layer already in a group")); } else { tilegrid->in_group = true; } @@ -281,7 +281,7 @@ static void _add_layer(displayio_group_t *self, mp_obj_t layer) { if (native_layer != MP_OBJ_NULL) { displayio_group_t *group = native_layer; if (group->in_group) { - mp_raise_ValueError(translate("Layer already in a group.")); + mp_raise_ValueError(translate("Layer already in a group")); } else { group->in_group = true; } @@ -290,7 +290,7 @@ static void _add_layer(displayio_group_t *self, mp_obj_t layer) { group, self->hidden || self->hidden_by_parent); return; } - mp_raise_ValueError(translate("Layer must be a Group or TileGrid subclass.")); + mp_raise_ValueError(translate("Layer must be a Group or TileGrid subclass")); } static void _remove_layer(displayio_group_t *self, size_t index) { diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c index dd2731a814..2863dffb19 100644 --- a/shared-module/displayio/OnDiskBitmap.c +++ b/shared-module/displayio/OnDiskBitmap.c @@ -50,7 +50,7 @@ void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self, } if (bytes_read != 138 || memcmp(bmp_header, "BM", 2) != 0) { - mp_raise_ValueError(translate("Invalid BMP file")); + mp_arg_error_invalid(MP_QSTR_file); } // We can't cast because we're not aligned. diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c index 48353b7dba..d184d3b8c2 100644 --- a/shared-module/framebufferio/FramebufferDisplay.c +++ b/shared-module/framebufferio/FramebufferDisplay.c @@ -83,9 +83,8 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu self->framebuffer_protocol->get_bufinfo(self->framebuffer, &self->bufinfo); size_t framebuffer_size = self->first_pixel_offset + self->row_stride * self->core.height; - if (self->bufinfo.len < framebuffer_size) { - mp_raise_IndexError_varg(translate("Framebuffer requires %d bytes"), framebuffer_size); - } + + mp_arg_validate_length_min(self->bufinfo.len, framebuffer_size, MP_QSTR_framebuffer); self->first_manual_refresh = !auto_refresh; diff --git a/shared-module/rgbmatrix/RGBMatrix.c b/shared-module/rgbmatrix/RGBMatrix.c index 0bfed0aa6c..a0a9e1390c 100644 --- a/shared-module/rgbmatrix/RGBMatrix.c +++ b/shared-module/rgbmatrix/RGBMatrix.c @@ -117,10 +117,10 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t *self, common_hal_rgbmatrix_rgbmatrix_deinit(self); switch (stat) { case PROTOMATTER_ERR_PINS: - mp_raise_ValueError(translate("Invalid pin")); + raise_ValueError_invalid_pin(); break; case PROTOMATTER_ERR_ARG: - mp_raise_ValueError(translate("Invalid argument")); + mp_arg_error_invalid(MP_QSTR_args); break; case PROTOMATTER_ERR_MALLOC: mp_raise_msg(&mp_type_MemoryError, NULL); diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c index b2693a0c59..f02747d734 100644 --- a/shared-module/synthio/MidiTrack.c +++ b/shared-module/synthio/MidiTrack.c @@ -32,13 +32,17 @@ #define BYTES_PER_SAMPLE (BITS_PER_SAMPLE / 8) #define SILENCE 0x80 +STATIC NORETURN void raise_midi_stream_error(uint32_t pos) { + mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos); +} + STATIC uint8_t parse_note(const uint8_t *buffer, uint32_t len, uint32_t *pos) { if (*pos + 1 >= len) { - mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), *pos); + raise_midi_stream_error(*pos); } uint8_t note = buffer[(*pos)++]; if (note > 127 || buffer[(*pos)++] > 127) { - mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), *pos); + raise_midi_stream_error(*pos); } return note; } @@ -84,7 +88,7 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self, } while ((c & 0x80) && (pos < len)); if (c & 0x80) { - mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos); + raise_midi_stream_error(pos); } dur += delta * sample_rate / tempo; @@ -128,14 +132,14 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self, case 12: case 13: // one data byte to ignore if (pos >= len || buffer[pos++] > 127) { - mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos); + raise_midi_stream_error(pos); } break; case 15: // the full syntax is too complicated, just assume it's "End of Track" event pos = len; break; default: // invalid event - mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos); + raise_midi_stream_error(pos); } } terminate_span(self, &dur, &max_dur); diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c index 8a0c429f84..13e66058c2 100644 --- a/shared-module/usb_hid/Device.c +++ b/shared-module/usb_hid/Device.c @@ -181,16 +181,14 @@ uint8_t common_hal_usb_hid_device_validate_report_id(usb_hid_device_obj_t *self, } if (!(report_id_arg >= 0 && get_report_id_idx(self, (size_t)report_id_arg) < CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR)) { - mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_report_id); + mp_arg_error_invalid(MP_QSTR_report_id); } return (uint8_t)report_id_arg; } void common_hal_usb_hid_device_construct(usb_hid_device_obj_t *self, mp_obj_t report_descriptor, uint16_t usage_page, uint16_t usage, size_t num_report_ids, uint8_t *report_ids, uint8_t *in_report_lengths, uint8_t *out_report_lengths) { - if (num_report_ids > CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR) { - mp_raise_ValueError_varg(translate("More than %d report ids not supported"), - CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR); - } + mp_arg_validate_length_max( + num_report_ids, CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR, MP_QSTR_report_ids); // report buffer pointers are NULL at start, and are created when USB is initialized. mp_buffer_info_t bufinfo; @@ -223,10 +221,7 @@ void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t * // report_id and len have already been validated for this device. size_t id_idx = get_report_id_idx(self, report_id); - if (len != self->in_report_lengths[id_idx]) { - mp_raise_ValueError_varg(translate("Buffer incorrect size. Should be %d bytes."), - self->in_report_lengths[id_idx]); - } + mp_arg_validate_length(len, self->in_report_lengths[id_idx], MP_QSTR_report); // Wait until interface is ready, timeout = 2 seconds uint64_t end_ticks = supervisor_ticks_ms64() + 2000; @@ -235,7 +230,7 @@ void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t * } if (!tud_hid_ready()) { - mp_raise_msg(&mp_type_OSError, translate("USB busy")); + mp_raise_msg(&mp_type_OSError, translate("USB busy")); } if (!tud_hid_report(report_id, report, len)) { diff --git a/shared-module/vectorio/Circle.c b/shared-module/vectorio/Circle.c index 2ec11fe1bb..ee83ad18b9 100644 --- a/shared-module/vectorio/Circle.c +++ b/shared-module/vectorio/Circle.c @@ -15,7 +15,7 @@ void common_hal_vectorio_circle_construct(vectorio_circle_t *self, uint16_t radi void common_hal_vectorio_circle_set_on_dirty(vectorio_circle_t *self, vectorio_event_t on_dirty) { if (self->on_dirty.obj != NULL) { - mp_raise_TypeError(translate("circle can only be registered in one parent")); + mp_raise_TypeError(translate("can only have one parent")); } self->on_dirty = on_dirty; } diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c index 10ebdf1edd..24eb1c501d 100644 --- a/shared-module/vectorio/Polygon.c +++ b/shared-module/vectorio/Polygon.c @@ -40,9 +40,8 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple mp_obj_t *tuple_items; mp_obj_tuple_get(items[i], &tuple_len, &tuple_items); - if (tuple_len != 2) { - mp_raise_ValueError_varg(translate("%q must be a tuple of length 2"), MP_QSTR_point); - } + mp_arg_validate_length(tuple_len, 2, MP_QSTR_point); + mp_int_t x; mp_int_t y; if (!mp_obj_get_int_maybe(tuple_items[ 0 ], &x) @@ -103,7 +102,7 @@ void common_hal_vectorio_polygon_set_points(vectorio_polygon_t *self, mp_obj_t p void common_hal_vectorio_polygon_set_on_dirty(vectorio_polygon_t *self, vectorio_event_t notification) { if (self->on_dirty.obj != NULL) { - mp_raise_TypeError(translate("polygon can only be registered in one parent")); + mp_raise_TypeError(translate("can only have one parent")); } self->on_dirty = notification; } diff --git a/shared-module/vectorio/Rectangle.c b/shared-module/vectorio/Rectangle.c index fbd3d6bdf5..4c2bdc66cb 100644 --- a/shared-module/vectorio/Rectangle.c +++ b/shared-module/vectorio/Rectangle.c @@ -14,7 +14,7 @@ void common_hal_vectorio_rectangle_construct(vectorio_rectangle_t *self, uint32_ void common_hal_vectorio_rectangle_set_on_dirty(vectorio_rectangle_t *self, vectorio_event_t on_dirty) { if (self->on_dirty.obj != NULL) { - mp_raise_TypeError(translate("can only be registered in one parent")); + mp_raise_TypeError(translate("can only have one parent")); } self->on_dirty = on_dirty; } diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c index 04213d36e7..f72cd5cc97 100644 --- a/shared-module/vectorio/VectorShape.c +++ b/shared-module/vectorio/VectorShape.c @@ -63,9 +63,7 @@ (u32 & 0x1 ? '1' : '0') static void short_bound_check(mp_int_t i, qstr name) { - if (i < SHRT_MIN || i > SHRT_MAX) { - mp_raise_ValueError_varg(translate("%q must be between %d and %d"), name, SHRT_MIN, SHRT_MAX); - } + mp_arg_validate_int_range(i, SHRT_MIN, SHRT_MAX, name); } inline __attribute__((always_inline)) @@ -277,9 +275,7 @@ void common_hal_vectorio_vector_shape_set_location(vectorio_vector_shape_t *self size_t tuple_len = 0; mp_obj_t *tuple_items; mp_obj_tuple_get(xy, &tuple_len, &tuple_items); - if (tuple_len != 2) { - mp_raise_TypeError(translate("(x,y) integers required")); - } + mp_arg_validate_length(tuple_len, 2, MP_QSTR_location); mp_int_t x; mp_int_t y; From d875eb2ff4c84d7c384ce7ce0bad86c66169d00e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 22:57:43 +0200 Subject: [PATCH 0326/2403] Add support for VCC-GND Studio YD-RP2040 --- .../boards/vcc_gnd_yd_rp2040/board.c | 40 +++++++++++++ .../boards/vcc_gnd_yd_rp2040/mpconfigboard.h | 2 + .../boards/vcc_gnd_yd_rp2040/mpconfigboard.mk | 15 +++++ .../vcc_gnd_yd_rp2040/pico-sdk-configboard.h | 1 + .../boards/vcc_gnd_yd_rp2040/pins.c | 56 +++++++++++++++++++ 5 files changed, 114 insertions(+) create mode 100644 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c create mode 100644 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c new file mode 100644 index 0000000000..e992ec063c --- /dev/null +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Fabian Affolter + * + * 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) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h new file mode 100644 index 0000000000..01d74410e9 --- /dev/null +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "VCC-GND Studio YD RP2040" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk new file mode 100644 index 0000000000..5a478a49a1 --- /dev/null +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk @@ -0,0 +1,15 @@ +USB_VID = 0x2E8A +USB_PID = 0x000B +USB_PRODUCT = "YD-RP2040" +USB_MANUFACTURER = "VCC-GND Studio" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 + +# Include these Python libraries in firmware +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c new file mode 100644 index 0000000000..c2b39dd740 --- /dev/null +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c @@ -0,0 +1,56 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From f1f9ba237150d2ef7e6bc8497d8804eb39f8c910 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 23:51:25 +0200 Subject: [PATCH 0327/2403] Add support for WeAct Studio Pico --- .../boards/weact_studio_pico/board.c | 40 ++++++++++++++ .../boards/weact_studio_pico/mpconfigboard.h | 2 + .../boards/weact_studio_pico/mpconfigboard.mk | 11 ++++ .../weact_studio_pico/pico-sdk-configboard.h | 1 + .../boards/weact_studio_pico/pins.c | 53 +++++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 ports/raspberrypi/boards/weact_studio_pico/board.c create mode 100644 ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/weact_studio_pico/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/weact_studio_pico/pins.c diff --git a/ports/raspberrypi/boards/weact_studio_pico/board.c b/ports/raspberrypi/boards/weact_studio_pico/board.c new file mode 100644 index 0000000000..e992ec063c --- /dev/null +++ b/ports/raspberrypi/boards/weact_studio_pico/board.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Fabian Affolter + * + * 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) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.h b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.h new file mode 100644 index 0000000000..e3276bbd74 --- /dev/null +++ b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "WeAct Studio Pico" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk new file mode 100644 index 0000000000..358928a9ac --- /dev/null +++ b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x239A +USB_PID = 0x000B +USB_PRODUCT = "Pico" +USB_MANUFACTURER = "WeAct Studio" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/weact_studio_pico/pico-sdk-configboard.h b/ports/raspberrypi/boards/weact_studio_pico/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/weact_studio_pico/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/weact_studio_pico/pins.c b/ports/raspberrypi/boards/weact_studio_pico/pins.c new file mode 100644 index 0000000000..8632d9c322 --- /dev/null +++ b/ports/raspberrypi/boards/weact_studio_pico/pins.c @@ -0,0 +1,53 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From e3896be3455f4949fff9b11bd7e60ad3e915e022 Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Fri, 20 May 2022 09:46:55 +0800 Subject: [PATCH 0328/2403] Modify mixgoce_ Lib is a submodule --- .gitmodules | 3 + ports/espressif/boards/mixgo_ce_udisk/cp_lib | 1 + .../mixgo_ce_udisk/mixgoce_lib/Image.py | 58 - .../mixgoce_lib/adafruit_framebuf.py | 549 --------- .../mixgoce_lib/adafruit_irremote.py | 283 ----- .../mixgoce_lib/adafruit_minimqtt.py | 1000 ----------------- .../mixgoce_lib/adafruit_rtttl.py | 204 ---- .../mixgo_ce_udisk/mixgoce_lib/blynklib.py | 390 ------- .../mixgo_ce_udisk/mixgoce_lib/blynktimer.py | 134 --- .../mixgo_ce_udisk/mixgoce_lib/button.py | 49 - .../mixgo_ce_udisk/mixgoce_lib/infrared.py | 41 - .../mixgo_ce_udisk/mixgoce_lib/irremote.py | 111 -- .../boards/mixgo_ce_udisk/mixgoce_lib/led.py | 34 - .../mixgo_ce_udisk/mixgoce_lib/matcher.py | 97 -- .../mixgo_ce_udisk/mixgoce_lib/matrix.py | 277 ----- .../mixgo_ce_udisk/mixgoce_lib/mixgoce.py | 85 -- .../mixgo_ce_udisk/mixgoce_lib/mixpy.py | 84 -- .../mixgo_ce_udisk/mixgoce_lib/mmatrix.py | 139 --- .../mixgo_ce_udisk/mixgoce_lib/msa301.py | 70 -- .../mixgo_ce_udisk/mixgoce_lib/music.py | 102 -- .../mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py | 80 -- .../mixgo_ce_udisk/mixgoce_lib/pixels.py | 71 -- .../mixgo_ce_udisk/mixgoce_lib/sensor.py | 55 - .../mixgo_ce_udisk/mixgoce_lib/touchpad.py | 25 - .../boards/mixgo_ce_udisk/mpconfigboard.mk | 2 +- 25 files changed, 5 insertions(+), 3939 deletions(-) create mode 160000 ports/espressif/boards/mixgo_ce_udisk/cp_lib delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py delete mode 100644 ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py diff --git a/.gitmodules b/.gitmodules index 9a10cc21e2..089162d33e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -286,3 +286,6 @@ [submodule "frozen/Adafruit_CircuitPython_FakeRequests"] path = frozen/Adafruit_CircuitPython_FakeRequests url = https://github.com/adafruit/Adafruit_CircuitPython_FakeRequests.git +[submodule "ports/espressif/boards/mixgo_ce_udisk/cp_lib"] + path = ports/espressif/boards/mixgo_ce_udisk/cp_lib + url = https://github.com/dahanzimin/circuitpython_lib.git diff --git a/ports/espressif/boards/mixgo_ce_udisk/cp_lib b/ports/espressif/boards/mixgo_ce_udisk/cp_lib new file mode 160000 index 0000000000..d6bb0f58f6 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_udisk/cp_lib @@ -0,0 +1 @@ +Subproject commit d6bb0f58f62983f11e771c5ec91c934eb6ff2b82 diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py deleted file mode 100644 index c799b4aadd..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/Image.py +++ /dev/null @@ -1,58 +0,0 @@ -""" -Image - -CircuitPython library for Image - MixGoCE -======================================================= - -Small Cabbage -20210721 -""" - -HEART=bytearray(b'\x00\x00\x00\x0c\x1e\x3f\x7e\xfc\x7e\x3f\x1e\x0c\x00\x00\x00\x00') -HEART_SMALL=bytearray(b'\x00\x00\x00\x00\x0c\x1e\x3c\x78\x3c\x1e\x0c\x00\x00\x00\x00\x00') -HAPPY=bytearray(b'\x00\x00\x00\x0c\x0c\x20\x40\x80\x80\x40\x20\x0c\x0c\x00\x00\x00') -SAD=bytearray(b'\x00\x00\x08\x04\x04\x84\x40\x20\x20\x40\x84\x04\x04\x08\x00\x00') -SMILE=bytearray(b'\x00\x00\x04\x02\x02\x24\x40\x80\x80\x40\x24\x02\x02\x04\x00\x00') -SILLY=bytearray(b'\x00\x00\x04\x0a\x0a\x04\x60\xa0\xa0\x60\x04\x0a\x0a\x04\x00\x00') -FABULOUS=bytearray(b'\x00\x00\x06\x05\x05\x65\xa6\xa0\xa0\xa6\x65\x05\x05\x06\x00\x00') -SURPRISED=bytearray(b'\x00\x00\x00\x00\x00\x00\x00\xbe\x00\x00\x00\x00\x00\x00\x00\x00') -ASLEEP=bytearray(b'\x00\x00\x04\x04\x04\x44\xa0\xa0\xa0\xa0\x44\x04\x04\x04\x00\x00') -ANGRY=bytearray(b'\x00\x00\x01\x02\x84\x42\x21\x10\x10\x21\x42\x84\x02\x01\x00\x00') -CONFUSED=bytearray(b'\x00\x00\x00\x00\x00\x04\x02\xa2\x12\x0c\x00\x00\x00\x00\x00\x00') -NO=bytearray(b'\x00\x00\x00\x00\x42\x24\x18\x18\x24\x42\x00\x00\x00\x00\x00\x00') -YES=bytearray(b'\x00\x00\x00\x00\x10\x20\x40\x40\x20\x10\x08\x04\x02\x00\x00\x00') -LEFT_ARROW=bytearray(b'\x00\x00\x10\x28\x54\x92\x10\x10\x10\x10\x10\x10\x10\x10\x00\x00') -RIGHT_ARROW=bytearray(b'\x00\x00\x10\x10\x10\x10\x10\x10\x10\x10\x92\x54\x28\x10\x00\x00') -DRESS=bytearray(b'\x00\x00\x00\x40\xa2\xd7\xae\xda\xae\xd7\xa2\x40\x00\x00\x00\x00') -TRANSFORMERS=bytearray(b'\x00\x00\x00\x00\x00\x9c\x64\x1a\x64\x9c\x00\x00\x00\x00\x00\x00') -SCISSORS=bytearray(b'\x00\x00\x00\x00\x00\x43\xa6\x6c\x18\x6c\xa6\x43\x00\x00\x00\x00') -EXIT=bytearray(b'\x00\x00\x00\x00\x00\x00\x28\x04\x72\x0e\x17\x25\x48\x88\x00\x00') -TREE=bytearray(b'\x00\x00\x00\x10\x18\x1c\x1e\xff\x1e\x1c\x18\x10\x00\x00\x00\x00') -PACMAN=bytearray(b'\x00\x00\x1c\x36\x63\x41\x45\x41\x49\x55\x22\x00\x00\x00\x00\x00') -TARGET=bytearray(b'\x00\x00\x00\x00\x00\x00\x38\x44\x54\x44\x38\x00\x00\x00\x00\x00') -TSHIRT=bytearray(b'\x00\x00\x00\x04\x0a\xf9\x82\x82\x82\x82\xf9\x0a\x04\x00\x00\x00') -ROLLERSKATE=bytearray(b'\x00\x00\x00\x60\x5f\x71\x11\x17\x14\x14\x74\x58\x60\x00\x00\x00') -DUCK=bytearray(b'\x00\x00\x08\x0c\x0a\xf9\x81\x83\x9e\x90\x90\x90\x50\x30\x10\x00') -HOUSE=bytearray(b'\x04\x06\xfb\x01\x01\xf9\x09\x29\x09\x09\xf9\x01\x01\xfb\x06\x04') -TORTOISE=bytearray(b'\x00\x00\x00\x00\x00\x5e\x3c\x3f\x3f\x3c\x5e\x00\x00\x00\x00\x00') -BUTTERFLY=bytearray(b'\x00\x00\x00\x00\x04\xca\xaa\x5c\x38\x5c\xaa\xca\x04\x00\x00\x00') -STICKFIGURE=bytearray(b'\x00\x00\x00\x00\x00\x90\x4a\x3d\x4a\x90\x00\x00\x00\x00\x00\x00') -GHOST=bytearray(b'\x00\x00\x00\x00\xfe\xdf\xe9\xdf\xe9\xdf\xfe\xc0\x80\x00\x00\x00') -PITCHFORK=bytearray(b'\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x3e\x49\x49\x49\x49\x49') -MUSIC_QUAVERS=bytearray(b'\x20\x10\x08\x0c\x1c\x38\x30\x10\x08\x0c\x1c\x38\x30\x10\x08\x04') -MUSIC_QUAVER=bytearray(b'\x06\x05\x05\x05\x05\x05\x05\x05\x36\x7c\xfc\xfc\xf8\x70\x00\x00') -MUSIC_CROTCHET=bytearray(b'\x02\x02\x02\x02\x02\x02\x02\x02\x1a\x3e\x7e\x7e\x7c\x38\x00\x00') -COW=bytearray(b'\x00\x1e\x1a\x1f\xfe\xfc\x1c\x1c\x1c\xfc\xfc\x08\x10\x10\x20\x00') -RABBIT=bytearray(b'\x14\x2a\x2a\x2a\x2a\x2a\x63\x41\x55\x41\x49\x49\x5d\x41\x3e\x00') -SQUARE_SMALL=bytearray(b'\x00\x00\x00\x00\x00\x00\x3c\x24\x24\x3c\x00\x00\x00\x00\x00\x00') -SQUARE=bytearray(b'\x00\x00\x00\x00\xff\x81\x81\x81\x81\x81\x81\xff\x00\x00\x00\x00') -DIAMOND_SMALL=bytearray(b'\x00\x00\x00\x00\x00\x08\x14\x2c\x14\x08\x00\x00\x00\x00\x00\x00') -DIAMOND=bytearray(b'\x00\x00\x04\x0e\x1b\x35\x6f\xdd\x6f\x35\x1b\x0e\x04\x00\x00\x00') -CHESSBOARD=bytearray(b'\x00\x00\x00\xfe\xaa\xfe\xaa\xfe\xaa\xfe\xaa\xfe\xaa\xfe\x00\x00') -TRIANGLE_LEFT=bytearray(b'\x00\x00\x00\x00\x00\x10\x38\x7c\xfe\x00\x00\x00\x00\x00\x00\x00') -TRIANGLE=bytearray(b'\x00\x00\x40\x60\x70\x78\x7c\x7e\x7e\x7c\x78\x70\x60\x40\x00\x00') -SNAKE=bytearray(b'\x00\x40\x60\x70\x38\x18\x18\x18\x18\x1f\x05\x07\x00\x00\x00\x00') -UMBRELLA=bytearray(b'\x00\x00\x00\x08\x0c\x0e\x0e\xff\x8e\xce\x0c\x08\x00\x00\x00\x00') -SKULL=bytearray(b'\x00\x00\x00\x0c\x1a\x79\x99\xd7\x99\x79\x1a\x0c\x00\x00\x00\x00') -GIRAFFE=bytearray(b'\x00\x00\x00\x00\xe0\x20\x20\xff\x03\x02\x00\x00\x00\x00\x00\x00') -SWORD=bytearray(b'\x00\x00\x18\x18\x7e\x3c\x18\x18\x18\x18\x18\x18\x18\x00\x00\x00') \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py deleted file mode 100644 index 458dcc5410..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_framebuf.py +++ /dev/null @@ -1,549 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2018 Kattni Rembor 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. -""" -`adafruit_framebuf` -==================================================== - -CircuitPython pure-python framebuf module, based on the micropython framebuf module. - -* Author(s): Melissa LeBlanc-Williams, Kattni Rembor, Tony DiCola, original file - created by Damien P. George - -Implementation Notes --------------------- - -**Hardware:** - -* `Adafruit SSD1306 OLED displays `_ - -**Software and Dependencies:** - -* Adafruit CircuitPython firmware for the supported boards: - https://github.com/adafruit/circuitpython/releases - -""" - -__version__ = "0.0.0-auto.0" -__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_framebuf.git" - -import os -import struct - -# Framebuf format constants: -MVLSB = 0 # Single bit displays (like SSD1306 OLED) -RGB565 = 1 # 16-bit color displays -GS4_HMSB = 2 # Unimplemented! -MHMSB = 3 # Single bit displays like the Sharp Memory -RGB888 = 4 # Neopixels and Dotstars - - -class MHMSBFormat: - """MHMSBFormat""" - - @staticmethod - def set_pixel(framebuf, x, y, color): - """Set a given pixel to a color.""" - index = (y * framebuf.stride + x) // 8 - offset = 7 - x & 0x07 - framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( - (color != 0) << offset - ) - - @staticmethod - def get_pixel(framebuf, x, y): - """Get the color of a given pixel""" - index = (y * framebuf.stride + x) // 8 - offset = 7 - x & 0x07 - return (framebuf.buf[index] >> offset) & 0x01 - - @staticmethod - def fill(framebuf, color): - """completely fill/clear the buffer with a color""" - if color: - fill = 0xFF - else: - fill = 0x00 - for i in range(len(framebuf.buf)): - framebuf.buf[i] = fill - - @staticmethod - def fill_rect(framebuf, x, y, width, height, color): - """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws - both the outline and interior.""" - # pylint: disable=too-many-arguments - for _x in range(x, x + width): - offset = 7 - _x & 0x07 - for _y in range(y, y + height): - index = (_y * framebuf.stride + _x) // 8 - framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( - (color != 0) << offset - ) - - -class MVLSBFormat: - """MVLSBFormat""" - - @staticmethod - def set_pixel(framebuf, x, y, color): - """Set a given pixel to a color.""" - index = (y >> 3) * framebuf.stride + x - offset = y & 0x07 - framebuf.buf[index] = (framebuf.buf[index] & ~(0x01 << offset)) | ( - (color != 0) << offset - ) - - @staticmethod - def get_pixel(framebuf, x, y): - """Get the color of a given pixel""" - index = (y >> 3) * framebuf.stride + x - offset = y & 0x07 - return (framebuf.buf[index] >> offset) & 0x01 - - @staticmethod - def fill(framebuf, color): - """completely fill/clear the buffer with a color""" - if color: - fill = 0xFF - else: - fill = 0x00 - for i in range(len(framebuf.buf)): - framebuf.buf[i] = fill - - @staticmethod - def fill_rect(framebuf, x, y, width, height, color): - """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws - both the outline and interior.""" - # pylint: disable=too-many-arguments - while height > 0: - index = (y >> 3) * framebuf.stride + x - offset = y & 0x07 - for w_w in range(width): - framebuf.buf[index + w_w] = ( - framebuf.buf[index + w_w] & ~(0x01 << offset) - ) | ((color != 0) << offset) - y += 1 - height -= 1 - - -class RGB888Format: - """RGB888Format""" - - @staticmethod - def set_pixel(framebuf, x, y, color): - """Set a given pixel to a color.""" - index = (y * framebuf.stride + x) * 3 - if isinstance(color, tuple): - framebuf.buf[index : index + 3] = bytes(color) - else: - framebuf.buf[index : index + 3] = bytes( - ((color >> 16) & 255, (color >> 8) & 255, color & 255) - ) - - @staticmethod - def get_pixel(framebuf, x, y): - """Get the color of a given pixel""" - index = (y * framebuf.stride + x) * 3 - return ( - (framebuf.buf[index] << 16) - | (framebuf.buf[index + 1] << 8) - | framebuf.buf[index + 2] - ) - - @staticmethod - def fill(framebuf, color): - """completely fill/clear the buffer with a color""" - fill = (color >> 16) & 255, (color >> 8) & 255, color & 255 - for i in range(0, len(framebuf.buf), 3): - framebuf.buf[i : i + 3] = bytes(fill) - - @staticmethod - def fill_rect(framebuf, x, y, width, height, color): - """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws - both the outline and interior.""" - # pylint: disable=too-many-arguments - fill = (color >> 16) & 255, (color >> 8) & 255, color & 255 - for _x in range(x, x + width): - for _y in range(y, y + height): - index = (_y * framebuf.stride + _x) * 3 - framebuf.buf[index : index + 3] = bytes(fill) - - -class FrameBuffer: - """FrameBuffer object. - - :param buf: An object with a buffer protocol which must be large enough to contain every - pixel defined by the width, height and format of the FrameBuffer. - :param width: The width of the FrameBuffer in pixel - :param height: The height of the FrameBuffer in pixel - :param buf_format: Specifies the type of pixel used in the FrameBuffer; permissible values - are listed under Constants below. These set the number of bits used to - encode a color value and the layout of these bits in ``buf``. Where a - color value c is passed to a method, c is a small integer with an encoding - that is dependent on the format of the FrameBuffer. - :param stride: The number of pixels between each horizontal line of pixels in the - FrameBuffer. This defaults to ``width`` but may need adjustments when - implementing a FrameBuffer within another larger FrameBuffer or screen. The - ``buf`` size must accommodate an increased step size. - - """ - - def __init__(self, buf, width, height, buf_format=MVLSB, stride=None): - # pylint: disable=too-many-arguments - self.buf = buf - self.width = width - self.height = height - self.stride = stride - self._font = None - if self.stride is None: - self.stride = width - if buf_format == MVLSB: - self.format = MVLSBFormat() - elif buf_format == MHMSB: - self.format = MHMSBFormat() - elif buf_format == RGB888: - self.format = RGB888Format() - else: - raise ValueError("invalid format") - self._rotation = 0 - - @property - def rotation(self): - """The rotation setting of the display, can be one of (0, 1, 2, 3)""" - return self._rotation - - @rotation.setter - def rotation(self, val): - if not val in (0, 1, 2, 3): - raise RuntimeError("Bad rotation setting") - self._rotation = val - - def fill(self, color): - """Fill the entire FrameBuffer with the specified color.""" - self.format.fill(self, color) - - def fill_rect(self, x, y, width, height, color): - """Draw a rectangle at the given location, size and color. The ``fill_rect`` method draws - both the outline and interior.""" - # pylint: disable=too-many-arguments, too-many-boolean-expressions - self.rect(x, y, width, height, color, fill=True) - - def pixel(self, x, y, color=None): - """If ``color`` is not given, get the color value of the specified pixel. If ``color`` is - given, set the specified pixel to the given color.""" - if self.rotation == 1: - x, y = y, x - x = self.width - x - 1 - if self.rotation == 2: - x = self.width - x - 1 - y = self.height - y - 1 - if self.rotation == 3: - x, y = y, x - y = self.height - y - 1 - - if x < 0 or x >= self.width or y < 0 or y >= self.height: - return None - if color is None: - return self.format.get_pixel(self, x, y) - self.format.set_pixel(self, x, y, color) - return None - - def hline(self, x, y, width, color): - """Draw a horizontal line up to a given length.""" - self.rect(x, y, width, 1, color, fill=True) - - def vline(self, x, y, height, color): - """Draw a vertical line up to a given length.""" - self.rect(x, y, 1, height, color, fill=True) - - def circle(self, center_x, center_y, radius, color): - """Draw a circle at the given midpoint location, radius and color. - The ```circle``` method draws only a 1 pixel outline.""" - x = radius - 1 - y = 0 - d_x = 1 - d_y = 1 - err = d_x - (radius << 1) - while x >= y: - self.pixel(center_x + x, center_y + y, color) - self.pixel(center_x + y, center_y + x, color) - self.pixel(center_x - y, center_y + x, color) - self.pixel(center_x - x, center_y + y, color) - self.pixel(center_x - x, center_y - y, color) - self.pixel(center_x - y, center_y - x, color) - self.pixel(center_x + y, center_y - x, color) - self.pixel(center_x + x, center_y - y, color) - if err <= 0: - y += 1 - err += d_y - d_y += 2 - if err > 0: - x -= 1 - d_x += 2 - err += d_x - (radius << 1) - - def rect(self, x, y, width, height, color, *, fill=False): - """Draw a rectangle at the given location, size and color. The ```rect``` method draws only - a 1 pixel outline.""" - # pylint: disable=too-many-arguments - if self.rotation == 1: - x, y = y, x - width, height = height, width - x = self.width - x - width - if self.rotation == 2: - x = self.width - x - width - y = self.height - y - height - if self.rotation == 3: - x, y = y, x - width, height = height, width - y = self.height - y - height - - # pylint: disable=too-many-boolean-expressions - if ( - width < 1 - or height < 1 - or (x + width) <= 0 - or (y + height) <= 0 - or y >= self.height - or x >= self.width - ): - return - x_end = min(self.width - 1, x + width - 1) - y_end = min(self.height - 1, y + height - 1) - x = max(x, 0) - y = max(y, 0) - if fill: - self.format.fill_rect(self, x, y, x_end - x + 1, y_end - y + 1, color) - else: - self.format.fill_rect(self, x, y, x_end - x + 1, 1, color) - self.format.fill_rect(self, x, y, 1, y_end - y + 1, color) - self.format.fill_rect(self, x, y_end, x_end - x + 1, 1, color) - self.format.fill_rect(self, x_end, y, 1, y_end - y + 1, color) - - def line(self, x_0, y_0, x_1, y_1, color): - # pylint: disable=too-many-arguments - """Bresenham's line algorithm""" - d_x = abs(x_1 - x_0) - d_y = abs(y_1 - y_0) - x, y = x_0, y_0 - s_x = -1 if x_0 > x_1 else 1 - s_y = -1 if y_0 > y_1 else 1 - if d_x > d_y: - err = d_x / 2.0 - while x != x_1: - self.pixel(x, y, color) - err -= d_y - if err < 0: - y += s_y - err += d_x - x += s_x - else: - err = d_y / 2.0 - while y != y_1: - self.pixel(x, y, color) - err -= d_x - if err < 0: - x += s_x - err += d_y - y += s_y - self.pixel(x, y, color) - - def blit(self): - """blit is not yet implemented""" - raise NotImplementedError() - - def scroll(self, delta_x, delta_y): - """shifts framebuf in x and y direction""" - if delta_x < 0: - shift_x = 0 - xend = self.width + delta_x - dt_x = 1 - else: - shift_x = self.width - 1 - xend = delta_x - 1 - dt_x = -1 - if delta_y < 0: - y = 0 - yend = self.height + delta_y - dt_y = 1 - else: - y = self.height - 1 - yend = delta_y - 1 - dt_y = -1 - while y != yend: - x = shift_x - while x != xend: - self.format.set_pixel( - self, x, y, self.format.get_pixel(self, x - delta_x, y - delta_y) - ) - x += dt_x - y += dt_y - - # pylint: disable=too-many-arguments - def text(self, string, x, y, color, *, font_name="font5x8.bin", size=1): - """Place text on the screen in variables sizes. Breaks on \n to next line. - - Does not break on line going off screen. - """ - # determine our effective width/height, taking rotation into account - frame_width = self.width - frame_height = self.height - if self.rotation == 1 or self.rotation == 3: - frame_width, frame_height = frame_height, frame_width - - for chunk in string.split("\n"): - if not self._font or self._font.font_name != font_name: - # load the font! - self._font = BitmapFont(font_name) - width = self._font.font_width - height = self._font.font_height - for i, char in enumerate(chunk): - char_x = x + (i * (width + 1)) * size - if ( - char_x + (width * size) > 0 - and char_x < frame_width - and y + (height * size) > 0 - and y < frame_height - ): - self._font.draw_char(char, char_x, y, self, color, size=size) - y += height * size - - # pylint: enable=too-many-arguments - - def image(self, img): - """Set buffer to value of Python Imaging Library image. The image should - be in 1 bit mode and a size equal to the display size.""" - # determine our effective width/height, taking rotation into account - width = self.width - height = self.height - if self.rotation == 1 or self.rotation == 3: - width, height = height, width - - if isinstance(self.format, RGB888Format) and img.mode != "RGB": - raise ValueError("Image must be in mode RGB.") - if isinstance(self.format, (MHMSBFormat, MVLSBFormat)) and img.mode != "1": - raise ValueError("Image must be in mode 1.") - - imwidth, imheight = img.size - if imwidth != width or imheight != height: - raise ValueError( - "Image must be same dimensions as display ({0}x{1}).".format( - width, height - ) - ) - # Grab all the pixels from the image, faster than getpixel. - pixels = img.load() - # Clear buffer - for i in range(len(self.buf)): - self.buf[i] = 0 - # Iterate through the pixels - for x in range(width): # yes this double loop is slow, - for y in range(height): # but these displays are small! - if img.mode == "RGB": - self.pixel(x, y, pixels[(x, y)]) - elif pixels[(x, y)]: - self.pixel(x, y, 1) # only write if pixel is true - - -# MicroPython basic bitmap font renderer. -# Author: Tony DiCola -# License: MIT License (https://opensource.org/licenses/MIT) -class BitmapFont: - """A helper class to read binary font tiles and 'seek' through them as a - file to display in a framebuffer. We use file access so we dont waste 1KB - of RAM on a font!""" - - def __init__(self, font_name="font5x8.bin"): - # Specify the drawing area width and height, and the pixel function to - # call when drawing pixels (should take an x and y param at least). - # Optionally specify font_name to override the font file to use (default - # is font5x8.bin). The font format is a binary file with the following - # format: - # - 1 unsigned byte: font character width in pixels - # - 1 unsigned byte: font character height in pixels - # - x bytes: font data, in ASCII order covering all 255 characters. - # Each character should have a byte for each pixel column of - # data (i.e. a 5x8 font has 5 bytes per character). - self.font_name = font_name - - # Open the font file and grab the character width and height values. - # Note that only fonts up to 8 pixels tall are currently supported. - try: - self._font_code=b'\x05\x08\x00\x00\x00\x00\x00>[O[>>kOk>\x1c>|>\x1c\x18<~<\x18\x1cW}W\x1c\x1c^\x7f^\x1c\x00\x18<\x18\x00\xff\xe7\xc3\xe7\xff\x00\x18$\x18\x00\xff\xe7\xdb\xe7\xff0H:\x06\x0e&)y)&@\x7f\x05\x05\x07@\x7f\x05%?Z<\xe7\x1c\x1c\x08\x08\x1c\x1c>\x7f\x14"\x7f"\x14__\x00__\x06\t\x7f\x01\x7f\x00f\x89\x95j`````\x94\xa2\xff\xa2\x94\x08\x04~\x04\x08\x10 ~ \x10\x08\x08*\x1c\x08\x08\x1c*\x08\x08\x1e\x10\x10\x10\x10\x0c\x1e\x0c\x1e\x0c08>80\x06\x0e>\x0e\x06\x00\x00\x00\x00\x00\x00\x00_\x00\x00\x00\x07\x00\x07\x00\x14\x7f\x14\x7f\x14$*\x7f*\x12#\x13\x08db6IV P\x00\x08\x07\x03\x00\x00\x1c"A\x00\x00A"\x1c\x00*\x1c\x7f\x1c*\x08\x08>\x08\x08\x00\x80p0\x00\x08\x08\x08\x08\x08\x00\x00``\x00 \x10\x08\x04\x02>QIE>\x00B\x7f@\x00rIIIF!AIM3\x18\x14\x12\x7f\x10\'EEE9A]YN|\x12\x11\x12|\x7fIII6>AAA"\x7fAAA>\x7fIIIA\x7f\t\t\t\x01>AAQs\x7f\x08\x08\x08\x7f\x00A\x7fA\x00 @A?\x01\x7f\x08\x14"A\x7f@@@@\x7f\x02\x1c\x02\x7f\x7f\x04\x08\x10\x7f>AAA>\x7f\t\t\t\x06>AQ!^\x7f\t\x19)F&III2\x03\x01\x7f\x01\x03?@@@?\x1f @ \x1f?@8@?c\x14\x08\x14c\x03\x04x\x04\x03aYIMC\x00\x7fAAA\x02\x04\x08\x10 \x00AAA\x7f\x04\x02\x01\x02\x04@@@@@\x00\x03\x07\x08\x00 TTx@\x7f(DD88DDD(8DD(\x7f8TTT\x18\x00\x08~\t\x02\x18\xa4\xa4\x9cx\x7f\x08\x04\x04x\x00D}@\x00 @@=\x00\x7f\x10(D\x00\x00A\x7f@\x00|\x04x\x04x|\x08\x04\x04x8DDD8\xfc\x18$$\x18\x18$$\x18\xfc|\x08\x04\x04\x08HTTT$\x04\x04?D$<@@ |\x1c @ \x1c<@0@III\x00~\x01\x01\x01~*****DD_DD@QJD@@DJQ@\x00\x00\xff\x01\x03\xe0\x80\xff\x00\x00\x08\x08kk\x086\x126$6\x06\x0f\t\x0f\x06\x00\x00\x18\x18\x00\x00\x00\x10\x10\x000@\xff\x01\x01\x00\x1f\x01\x01\x1e\x00\x19\x1d\x17\x12\x00<<<<\x00\x00\x00\x00\x00' - self.font_width, self.font_height = struct.unpack("BB", b'\x05\x08') - # simple font file validation check based on expected file size - #if 2 + 256 * self.font_width != os.stat(font_name)[6]: - # raise RuntimeError("Invalid font file: " + font_name) - except OSError: - print("Could not find font file", font_name) - raise - except OverflowError: - # os.stat can throw this on boards without long int support - # just hope the font file is valid and press on - pass - - def deinit(self): - """Close the font file as cleanup.""" - #self._font.close() - - def __enter__(self): - """Initialize/open the font file""" - self.__init__() - return self - - def __exit__(self, exception_type, exception_value, traceback): - """cleanup on exit""" - #self.deinit() - pass - - def draw_char( - self, char, x, y, framebuffer, color, size=1 - ): # pylint: disable=too-many-arguments - """Draw one character at position (x,y) to a framebuffer in a given color""" - size = max(size, 1) - # Don't draw the character if it will be clipped off the visible area. - # if x < -self.font_width or x >= framebuffer.width or \ - # y < -self.font_height or y >= framebuffer.height: - # return - # Go through each column of the character. - for char_x in range(self.font_width): - # Grab the byte for the current column of font data. - #self._font.seek(2 + (ord(char) * self.font_width) + char_x) - chcode=bytes([self._font_code[(2 + (ord(char) * self.font_width) + char_x)]]) - try: - line = struct.unpack("B", chcode)[0] - except RuntimeError: - continue # maybe character isnt there? go to next - # Go through each row in the column byte. - for char_y in range(self.font_height): - # Draw a pixel for each bit that's flipped on. - if (line >> char_y) & 0x1: - framebuffer.fill_rect( - x + char_x * size, y + char_y * size, size, size, color - ) - - def width(self, text): - """Return the pixel width of the specified text message.""" - return len(text) * (self.font_width + 1) - - -class FrameBuffer1(FrameBuffer): # pylint: disable=abstract-method - """FrameBuffer1 object. Inherits from FrameBuffer.""" diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py deleted file mode 100644 index e7f1476cfc..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_irremote.py +++ /dev/null @@ -1,283 +0,0 @@ -# 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. -""" -`adafruit_irremote` -==================================================== - -Demo code for Circuit Playground Express: - -.. code-block:: python - - # Circuit Playground Express Demo Code - # Adjust the pulseio 'board.PIN' if using something else - import pulseio - import board - import adafruit_irremote - - pulsein = pulseio.PulseIn(board.REMOTEIN, maxlen=120, idle_state=True) - decoder = adafruit_irremote.GenericDecode() - - - while True: - pulses = decoder.read_pulses(pulsein) - print("Heard", len(pulses), "Pulses:", pulses) - try: - code = decoder.decode_bits(pulses) - print("Decoded:", code) - except adafruit_irremote.IRNECRepeatException: # unusual short code! - print("NEC repeat!") - except adafruit_irremote.IRDecodeException as e: # failed to decode - print("Failed to decode: ", e.args) - - print("----------------------------") - -* Author(s): Scott Shawcroft - -Implementation Notes --------------------- - -**Hardware:** - -* `CircuitPlayground Express `_ - -* `IR Receiver Sensor `_ - -**Software and Dependencies:** - -* Adafruit CircuitPython firmware for the ESP8622 and M0-based boards: - https://github.com/adafruit/circuitpython/releases - -""" - -# Pretend self matter because we may add object level config later. -# pylint: disable=no-self-use - -import array -import time - -__version__ = "0.0.0-auto.0" -__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_IRRemote.git" - - -class IRDecodeException(Exception): - """Generic decode exception""" - - -class IRNECRepeatException(Exception): - """Exception when a NEC repeat is decoded""" - - -class GenericDecode: - """Generic decoding of infrared signals""" - - def bin_data(self, pulses): - """Compute bins of pulse lengths where pulses are +-25% of the average. - - :param list pulses: Input pulse lengths - """ - bins = [[pulses[0], 0]] - - for _, pulse in enumerate(pulses): - matchedbin = False - # print(pulse, end=": ") - for b, pulse_bin in enumerate(bins): - if pulse_bin[0] * 0.75 <= pulse <= pulse_bin[0] * 1.25: - # print("matches bin") - bins[b][0] = (pulse_bin[0] + pulse) // 2 # avg em - bins[b][1] += 1 # track it - matchedbin = True - break - if not matchedbin: - bins.append([pulse, 1]) - # print(bins) - return bins - - def decode_bits(self, pulses): - """Decode the pulses into bits.""" - # pylint: disable=too-many-branches,too-many-statements - - # special exception for NEC repeat code! - if ( - (len(pulses) == 3) - and (8000 <= pulses[0] <= 10000) - and (2000 <= pulses[1] <= 3000) - and (450 <= pulses[2] <= 700) - ): - raise IRNECRepeatException() - - if len(pulses) < 10: - raise IRDecodeException("10 pulses minimum") - - # Ignore any header (evens start at 1), and any trailer. - if len(pulses) % 2 == 0: - pulses_end = -1 - else: - pulses_end = None - - evens = pulses[1:pulses_end:2] - odds = pulses[2:pulses_end:2] - - # bin both halves - even_bins = self.bin_data(evens) - odd_bins = self.bin_data(odds) - - outliers = [b[0] for b in (even_bins + odd_bins) if b[1] == 1] - even_bins = [b for b in even_bins if b[1] > 1] - odd_bins = [b for b in odd_bins if b[1] > 1] - - if not even_bins or not odd_bins: - raise IRDecodeException("Not enough data") - - if len(even_bins) == 1: - pulses = odds - pulse_bins = odd_bins - elif len(odd_bins) == 1: - pulses = evens - pulse_bins = even_bins - else: - raise IRDecodeException("Both even/odd pulses differ") - - if len(pulse_bins) == 1: - raise IRDecodeException("Pulses do not differ") - if len(pulse_bins) > 2: - raise IRDecodeException("Only mark & space handled") - - mark = min(pulse_bins[0][0], pulse_bins[1][0]) - space = max(pulse_bins[0][0], pulse_bins[1][0]) - - if outliers: - # skip outliers - pulses = [ - p - for p in pulses - if not (outliers[0] * 0.75) <= p <= (outliers[0] * 1.25) - ] - # convert marks/spaces to 0 and 1 - for i, pulse_length in enumerate(pulses): - if (space * 0.75) <= pulse_length <= (space * 1.25): - pulses[i] = False - elif (mark * 0.75) <= pulse_length <= (mark * 1.25): - pulses[i] = True - else: - raise IRDecodeException("Pulses outside mark/space") - - # convert bits to bytes! - output = [0] * ((len(pulses) + 7) // 8) - for i, pulse_length in enumerate(pulses): - output[i // 8] = output[i // 8] << 1 - if pulse_length: - output[i // 8] |= 1 - return output - - def _read_pulses_non_blocking( - self, input_pulses, max_pulse=10000, pulse_window=0.10 - ): - """Read out a burst of pulses without blocking until pulses stop for a specified - period (pulse_window), pruning pulses after a pulse longer than ``max_pulse``. - - :param ~pulseio.PulseIn input_pulses: Object to read pulses from - :param int max_pulse: Pulse duration to end a burst - :param float pulse_window: pulses are collected for this period of time - """ - received = None - recent_count = 0 - pruning = False - while True: - while input_pulses: - pulse = input_pulses.popleft() - recent_count += 1 - if pulse > max_pulse: - if received is None: - continue - pruning = True - if not pruning: - if received is None: - received = [] - received.append(pulse) - - if recent_count == 0: - return received - recent_count = 0 - time.sleep(pulse_window) - - def read_pulses( - self, - input_pulses, - *, - max_pulse=10000, - blocking=True, - pulse_window=0.10, - blocking_delay=0.10 - ): - """Read out a burst of pulses until pulses stop for a specified - period (pulse_window), pruning pulses after a pulse longer than ``max_pulse``. - - :param ~pulseio.PulseIn input_pulses: Object to read pulses from - :param int max_pulse: Pulse duration to end a burst - :param bool blocking: If True, will block until pulses found. - If False, will return None if no pulses. - Defaults to True for backwards compatibility - :param float pulse_window: pulses are collected for this period of time - :param float blocking_delay: delay between pulse checks when blocking - """ - while True: - pulses = self._read_pulses_non_blocking( - input_pulses, max_pulse, pulse_window - ) - if blocking and pulses is None: - time.sleep(blocking_delay) - continue - return pulses - - -class GenericTransmit: - """Generic infrared transmit class that handles encoding.""" - - def __init__(self, header, one, zero, trail): - self.header = header - self.one = one - self.zero = zero - self.trail = trail - - def transmit(self, pulseout, data): - """Transmit the ``data`` using the ``pulseout``. - - :param pulseio.PulseOut pulseout: PulseOut to transmit on - :param bytearray data: Data to transmit - """ - durations = array.array("H", [0] * (2 + len(data) * 8 * 2 + 1)) - durations[0] = self.header[0] - durations[1] = self.header[1] - durations[-1] = self.trail - out = 2 - for byte_index, _ in enumerate(data): - for i in range(7, -1, -1): - if (data[byte_index] & 1 << i) > 0: - durations[out] = self.one[0] - durations[out + 1] = self.one[1] - else: - durations[out] = self.zero[0] - durations[out + 1] = self.zero[1] - out += 2 - - # print(durations) - pulseout.send(durations) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py deleted file mode 100644 index 4dde03eb5d..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_minimqtt.py +++ /dev/null @@ -1,1000 +0,0 @@ -# SPDX-FileCopyrightText: 2019-2021 Brent Rubell for Adafruit Industries -# -# SPDX-License-Identifier: MIT - -# Original Work Copyright (c) 2016 Paul Sokolovsky, uMQTT -# Modified Work Copyright (c) 2019 Bradley Beach, esp32spi_mqtt -# Modified Work Copyright (c) 2012-2019 Roger Light and others, Paho MQTT Python - -""" -`adafruit_minimqtt` -================================================================================ - -A minimal MQTT Library for CircuitPython. - -* Author(s): Brent Rubell - -Implementation Notes --------------------- - -Adapted from https://github.com/micropython/micropython-lib/tree/master/umqtt.simple/umqtt - -**Software and Dependencies:** - -* Adafruit CircuitPython firmware for the supported boards: - https://github.com/adafruit/circuitpython/releases - -""" -import errno -import struct -import time -from random import randint -from micropython import const -from matcher import MQTTMatcher - -__version__ = "0.0.0-auto.0" -__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MiniMQTT.git" - -# Client-specific variables -MQTT_MSG_MAX_SZ = const(268435455) -MQTT_MSG_SZ_LIM = const(10000000) -MQTT_TOPIC_LENGTH_LIMIT = const(65535) -MQTT_TCP_PORT = const(1883) -MQTT_TLS_PORT = const(8883) - -# MQTT Commands -MQTT_PINGREQ = b"\xc0\0" -MQTT_PINGRESP = const(0xD0) -MQTT_SUB = b"\x82" -MQTT_UNSUB = b"\xA2" -MQTT_DISCONNECT = b"\xe0\0" - -# Variable CONNECT header [MQTT 3.1.2] -MQTT_HDR_CONNECT = bytearray(b"\x04MQTT\x04\x02\0\0") - - -CONNACK_ERRORS = { - const(0x01): "Connection Refused - Incorrect Protocol Version", - const(0x02): "Connection Refused - ID Rejected", - const(0x03): "Connection Refused - Server unavailable", - const(0x04): "Connection Refused - Incorrect username/password", - const(0x05): "Connection Refused - Unauthorized", -} - -_default_sock = None # pylint: disable=invalid-name -_fake_context = None # pylint: disable=invalid-name - - -class MMQTTException(Exception): - """MiniMQTT Exception class.""" - - # pylint: disable=unnecessary-pass - # pass - - -# Legacy ESP32SPI Socket API -def set_socket(sock, iface=None): - """Legacy API for setting the socket and network interface. - - :param sock: socket object. - :param iface: internet interface object - - """ - global _default_sock # pylint: disable=invalid-name, global-statement - global _fake_context # pylint: disable=invalid-name, global-statement - _default_sock = sock - if iface: - _default_sock.set_interface(iface) - _fake_context = _FakeSSLContext(iface) - - -class _FakeSSLSocket: - def __init__(self, socket, tls_mode): - self._socket = socket - self._mode = tls_mode - self.settimeout = socket.settimeout - self.send = socket.send - self.recv = socket.recv - self.close = socket.close - - def connect(self, address): - """connect wrapper to add non-standard mode parameter""" - try: - return self._socket.connect(address, self._mode) - except RuntimeError as error: - raise OSError(errno.ENOMEM) from error - - -class _FakeSSLContext: - def __init__(self, iface): - self._iface = iface - - def wrap_socket(self, socket, server_hostname=None): - """Return the same socket""" - # pylint: disable=unused-argument - return _FakeSSLSocket(socket, self._iface.TLS_MODE) - - -class MQTT: - """MQTT Client for CircuitPython. - - :param str broker: MQTT Broker URL or IP Address. - :param int port: Optional port definition, defaults to 8883. - :param str username: Username for broker authentication. - :param str password: Password for broker authentication. - :param network_manager: NetworkManager object, such as WiFiManager from ESPSPI_WiFiManager. - :param str client_id: Optional client identifier, defaults to a unique, generated string. - :param bool is_ssl: Sets a secure or insecure connection with the broker. - :param int keep_alive: KeepAlive interval between the broker and the MiniMQTT client. - :param socket socket_pool: A pool of socket resources available for the given radio. - :param ssl_context: SSL context for long-lived SSL connections. - :param bool use_binary_mode: Messages are passed as bytearray instead of string to callbacks. - - """ - - # pylint: disable=too-many-arguments,too-many-instance-attributes, not-callable, invalid-name, no-member - def __init__( - self, - broker, - port=None, - username=None, - password=None, - client_id=None, - is_ssl=True, - keep_alive=60, - socket_pool=None, - ssl_context=None, - use_binary_mode=False, - ): - - self._socket_pool = socket_pool - self._ssl_context = ssl_context - self._sock = None - self._backwards_compatible_sock = False - self._use_binary_mode = use_binary_mode - - self.keep_alive = keep_alive - self._user_data = None - self._is_connected = False - self._msg_size_lim = MQTT_MSG_SZ_LIM - self._pid = 0 - self._timestamp = 0 - self.logger = None - - self.broker = broker - self._username = username - self._password = password - if ( - self._password and len(password.encode("utf-8")) > MQTT_TOPIC_LENGTH_LIMIT - ): # [MQTT-3.1.3.5] - raise MMQTTException("Password length is too large.") - - self.port = MQTT_TCP_PORT - if is_ssl: - self.port = MQTT_TLS_PORT - if port: - self.port = port - - # define client identifer - if client_id: - # user-defined client_id MAY allow client_id's > 23 bytes or - # non-alpha-numeric characters - self.client_id = client_id - else: - # assign a unique client_id - self.client_id = "cpy{0}{1}".format( - randint(0, int(time.monotonic() * 100) % 1000), randint(0, 99) - ) - # generated client_id's enforce spec.'s length rules - if len(self.client_id.encode("utf-8")) > 23 or not self.client_id: - raise ValueError("MQTT Client ID must be between 1 and 23 bytes") - - # LWT - self._lw_topic = None - self._lw_qos = 0 - self._lw_topic = None - self._lw_msg = None - self._lw_retain = False - - # List of subscribed topics, used for tracking - self._subscribed_topics = [] - self._on_message_filtered = MQTTMatcher() - - # Default topic callback methods - self._on_message = None - self.on_connect = None - self.on_disconnect = None - self.on_publish = None - self.on_subscribe = None - self.on_unsubscribe = None - - # pylint: disable=too-many-branches - def _get_connect_socket(self, host, port, *, timeout=1): - """Obtains a new socket and connects to a broker. - - :param str host: Desired broker hostname - :param int port: Desired broker port - :param int timeout: Desired socket timeout - """ - # For reconnections - check if we're using a socket already and close it - if self._sock: - self._sock.close() - self._sock = None - - # Legacy API - use the interface's socket instead of a passed socket pool - if self._socket_pool is None: - self._socket_pool = _default_sock - - # Legacy API - fake the ssl context - if self._ssl_context is None: - self._ssl_context = _fake_context - - if not isinstance(port, int): - raise RuntimeError("Port must be an integer") - - if port == 8883 and not self._ssl_context: - raise RuntimeError( - "ssl_context must be set before using adafruit_mqtt for secure MQTT." - ) - - if self.logger is not None and port == MQTT_TLS_PORT: - self.logger.info( - "Establishing a SECURE SSL connection to {0}:{1}".format(host, port) - ) - elif self.logger is not None: - self.logger.info( - "Establishing an INSECURE connection to {0}:{1}".format(host, port) - ) - - addr_info = self._socket_pool.getaddrinfo( - host, port, 0, self._socket_pool.SOCK_STREAM - )[0] - - sock = None - retry_count = 0 - while retry_count < 5 and sock is None: - retry_count += 1 - - try: - sock = self._socket_pool.socket(addr_info[0], addr_info[1]) - except OSError: - continue - - connect_host = addr_info[-1][0] - if port == 8883: - sock = self._ssl_context.wrap_socket(sock, server_hostname=host) - connect_host = host - sock.settimeout(timeout) - - try: - sock.connect((connect_host, port)) - except MemoryError: - sock.close() - sock = None - except OSError: - sock.close() - sock = None - - if sock is None: - raise RuntimeError("Repeated socket failures") - - self._backwards_compatible_sock = not hasattr(sock, "recv_into") - return sock - - def __enter__(self): - return self - - def __exit__(self, exception_type, exception_value, traceback): - self.deinit() - - def _sock_exact_recv(self, bufsize): - """Reads _exact_ number of bytes from the connected socket. Will only return - string with the exact number of bytes requested. - - The semantics of native socket receive is that it returns no more than the - specified number of bytes (i.e. max size). However, it makes no guarantees in - terms of the minimum size of the buffer, which could be 1 byte. This is a - wrapper for socket recv() to ensure that no less than the expected number of - bytes is returned or trigger a timeout exception. - - :param int bufsize: number of bytes to receive - """ - stamp = time.monotonic() - rc = self._sock.recv(bufsize) - to_read = bufsize - len(rc) - assert to_read >= 0 - read_timeout = self.keep_alive - while to_read > 0: - recv = self._sock.recv(to_read) - to_read -= len(recv) - rc += recv - if time.monotonic() - stamp > read_timeout: - raise MMQTTException( - "Unable to receive {} bytes within {} seconds.".format( - to_read, read_timeout - ) - ) - return rc - - def deinit(self): - """De-initializes the MQTT client and disconnects from the mqtt broker.""" - self.disconnect() - - @property - def mqtt_msg(self): - """Returns maximum MQTT payload and topic size.""" - return self._msg_size_lim, MQTT_TOPIC_LENGTH_LIMIT - - @mqtt_msg.setter - def mqtt_msg(self, msg_size): - """Sets the maximum MQTT message payload size. - - :param int msg_size: Maximum MQTT payload size. - """ - if msg_size < MQTT_MSG_MAX_SZ: - self._msg_size_lim = msg_size - - def will_set(self, topic=None, payload=None, qos=0, retain=False): - """Sets the last will and testament properties. MUST be called before `connect()`. - - :param str topic: MQTT Broker topic. - :param int|float|str payload: Last will disconnection payload. - payloads of type int & float are converted to a string. - :param int qos: Quality of Service level, defaults to - zero. Conventional options are ``0`` (send at most once), ``1`` - (send at least once), or ``2`` (send exactly once). - - .. note:: Only options ``1`` or ``0`` are QoS levels supported by this library. - :param bool retain: Specifies if the payload is to be retained when - it is published. - """ - if self.logger is not None: - self.logger.debug("Setting last will properties") - self._valid_qos(qos) - if self._is_connected: - raise MMQTTException("Last Will should only be called before connect().") - if payload is None: - payload = "" - if isinstance(payload, (int, float, str)): - payload = str(payload).encode() - else: - raise MMQTTException("Invalid message data type.") - self._lw_qos = qos - self._lw_topic = topic - self._lw_msg = payload - self._lw_retain = retain - - def add_topic_callback(self, mqtt_topic, callback_method): - """Registers a callback_method for a specific MQTT topic. - - :param str mqtt_topic: MQTT topic identifier. - :param function callback_method: The callback method. - """ - if mqtt_topic is None or callback_method is None: - raise ValueError("MQTT topic and callback method must both be defined.") - self._on_message_filtered[mqtt_topic] = callback_method - - def remove_topic_callback(self, mqtt_topic): - """Removes a registered callback method. - - :param str mqtt_topic: MQTT topic identifier string. - """ - if mqtt_topic is None: - raise ValueError("MQTT Topic must be defined.") - try: - del self._on_message_filtered[mqtt_topic] - except KeyError: - raise KeyError( - "MQTT topic callback not added with add_topic_callback." - ) from None - - @property - def on_message(self): - """Called when a new message has been received on a subscribed topic. - - Expected method signature is ``on_message(client, topic, message)`` - """ - return self._on_message - - @on_message.setter - def on_message(self, method): - self._on_message = method - - def _handle_on_message(self, client, topic, message): - matched = False - if topic is not None: - for callback in self._on_message_filtered.iter_match(topic): - callback(client, topic, message) # on_msg with callback - matched = True - - if not matched and self.on_message: # regular on_message - self.on_message(client, topic, message) - - def username_pw_set(self, username, password=None): - """Set client's username and an optional password. - - :param str username: Username to use with your MQTT broker. - :param str password: Password to use with your MQTT broker. - - """ - if self._is_connected: - raise MMQTTException("This method must be called before connect().") - self._username = username - if password is not None: - self._password = password - - # pylint: disable=too-many-branches, too-many-statements, too-many-locals - def connect(self, clean_session=True, host=None, port=None, keep_alive=None): - """Initiates connection with the MQTT Broker. - - :param bool clean_session: Establishes a persistent session. - :param str host: Hostname or IP address of the remote broker. - :param int port: Network port of the remote broker. - :param int keep_alive: Maximum period allowed for communication, in seconds. - - """ - if host: - self.broker = host - if port: - self.port = port - if keep_alive: - self.keep_alive = keep_alive - - if self.logger is not None: - self.logger.debug("Attempting to establish MQTT connection...") - - # Get a new socket - self._sock = self._get_connect_socket(self.broker, self.port) - - # Fixed Header - fixed_header = bytearray([0x10]) - - # NOTE: Variable header is - # MQTT_HDR_CONNECT = bytearray(b"\x04MQTT\x04\x02\0\0") - # because final 4 bytes are 4, 2, 0, 0 - var_header = MQTT_HDR_CONNECT - var_header[6] = clean_session << 1 - - # Set up variable header and remaining_length - remaining_length = 12 + len(self.client_id.encode("utf-8")) - if self._username: - remaining_length += ( - 2 - + len(self._username.encode("utf-8")) - + 2 - + len(self._password.encode("utf-8")) - ) - var_header[6] |= 0xC0 - if self.keep_alive: - assert self.keep_alive < MQTT_TOPIC_LENGTH_LIMIT - var_header[7] |= self.keep_alive >> 8 - var_header[8] |= self.keep_alive & 0x00FF - if self._lw_topic: - remaining_length += ( - 2 + len(self._lw_topic.encode("utf-8")) + 2 + len(self._lw_msg) - ) - var_header[6] |= 0x4 | (self._lw_qos & 0x1) << 3 | (self._lw_qos & 0x2) << 3 - var_header[6] |= self._lw_retain << 5 - - # Remaining length calculation - large_rel_length = False - if remaining_length > 0x7F: - large_rel_length = True - # Calculate Remaining Length [2.2.3] - while remaining_length > 0: - encoded_byte = remaining_length % 0x80 - remaining_length = remaining_length // 0x80 - # if there is more data to encode, set the top bit of the byte - if remaining_length > 0: - encoded_byte |= 0x80 - fixed_header.append(encoded_byte) - if large_rel_length: - fixed_header.append(0x00) - else: - fixed_header.append(remaining_length) - fixed_header.append(0x00) - - if self.logger is not None: - self.logger.debug("Sending CONNECT to broker...") - self.logger.debug( - "Fixed Header: %s\nVariable Header: %s", fixed_header, var_header - ) - self._sock.send(fixed_header) - self._sock.send(var_header) - # [MQTT-3.1.3-4] - self._send_str(self.client_id) - if self._lw_topic: - # [MQTT-3.1.3-11] - self._send_str(self._lw_topic) - self._send_str(self._lw_msg) - if self._username is None: - self._username = None - else: - self._send_str(self._username) - self._send_str(self._password) - if self.logger is not None: - self.logger.debug("Receiving CONNACK packet from broker") - while True: - op = self._wait_for_msg() - if op == 32: - rc = self._sock_exact_recv(3) - assert rc[0] == 0x02 - if rc[2] != 0x00: - raise MMQTTException(CONNACK_ERRORS[rc[2]]) - self._is_connected = True - result = rc[0] & 1 - if self.on_connect is not None: - self.on_connect(self, self._user_data, result, rc[2]) - return result - - def disconnect(self): - """Disconnects the MiniMQTT client from the MQTT broker.""" - self.is_connected() - if self.logger is not None: - self.logger.debug("Sending DISCONNECT packet to broker") - try: - self._sock.send(MQTT_DISCONNECT) - except RuntimeError as e: - if self.logger is not None: - self.logger.warning("Unable to send DISCONNECT packet: {}".format(e)) - if self.logger is not None: - self.logger.debug("Closing socket") - self._sock.close() - self._is_connected = False - self._subscribed_topics = [] - if self.on_disconnect is not None: - self.on_disconnect(self, self._user_data, 0) - - def ping(self): - """Pings the MQTT Broker to confirm if the broker is alive or if - there is an active network connection. - Returns response codes of any messages received while waiting for PINGRESP. - """ - self.is_connected() - if self.logger is not None: - self.logger.debug("Sending PINGREQ") - self._sock.send(MQTT_PINGREQ) - ping_timeout = self.keep_alive - stamp = time.monotonic() - rc, rcs = None, [] - while rc != MQTT_PINGRESP: - rc = self._wait_for_msg() - if rc: - rcs.append(rc) - if time.monotonic() - stamp > ping_timeout: - raise MMQTTException("PINGRESP not returned from broker.") - return rcs - - # pylint: disable=too-many-branches, too-many-statements - def publish(self, topic, msg, retain=False, qos=0): - """Publishes a message to a topic provided. - - :param str topic: Unique topic identifier. - :param str|int|float|bytes msg: Data to send to the broker. - :param bool retain: Whether the message is saved by the broker. - :param int qos: Quality of Service level for the message, defaults to zero. - - """ - self.is_connected() - self._valid_topic(topic) - if "+" in topic or "#" in topic: - raise MMQTTException("Publish topic can not contain wildcards.") - # check msg/qos kwargs - if msg is None: - raise MMQTTException("Message can not be None.") - if isinstance(msg, (int, float)): - msg = str(msg).encode("ascii") - elif isinstance(msg, str): - msg = str(msg).encode("utf-8") - elif isinstance(msg, bytes): - pass - else: - raise MMQTTException("Invalid message data type.") - if len(msg) > MQTT_MSG_MAX_SZ: - raise MMQTTException("Message size larger than %d bytes." % MQTT_MSG_MAX_SZ) - assert ( - 0 <= qos <= 1 - ), "Quality of Service Level 2 is unsupported by this library." - - # fixed header. [3.3.1.2], [3.3.1.3] - pub_hdr_fixed = bytearray([0x30 | retain | qos << 1]) - - # variable header = 2-byte Topic length (big endian) - pub_hdr_var = bytearray(struct.pack(">H", len(topic.encode("utf-8")))) - pub_hdr_var.extend(topic.encode("utf-8")) # Topic name - - remaining_length = 2 + len(msg) + len(topic.encode("utf-8")) - if qos > 0: - # packet identifier where QoS level is 1 or 2. [3.3.2.2] - remaining_length += 2 - self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 - pub_hdr_var.append(self._pid >> 8) - pub_hdr_var.append(self._pid & 0xFF) - - # Calculate remaining length [2.2.3] - if remaining_length > 0x7F: - while remaining_length > 0: - encoded_byte = remaining_length % 0x80 - remaining_length = remaining_length // 0x80 - if remaining_length > 0: - encoded_byte |= 0x80 - pub_hdr_fixed.append(encoded_byte) - else: - pub_hdr_fixed.append(remaining_length) - - if self.logger is not None: - self.logger.debug( - "Sending PUBLISH\nTopic: %s\nMsg: %s\ - \nQoS: %d\nRetain? %r", - topic, - msg, - qos, - retain, - ) - self._sock.send(pub_hdr_fixed) - self._sock.send(pub_hdr_var) - self._sock.send(msg) - if qos == 0 and self.on_publish is not None: - self.on_publish(self, self._user_data, topic, self._pid) - if qos == 1: - while True: - op = self._wait_for_msg() - if op == 0x40: - sz = self._sock_exact_recv(1) - assert sz == b"\x02" - rcv_pid = self._sock_exact_recv(2) - rcv_pid = rcv_pid[0] << 0x08 | rcv_pid[1] - if self._pid == rcv_pid: - if self.on_publish is not None: - self.on_publish(self, self._user_data, topic, rcv_pid) - return - - def subscribe(self, topic, qos=0): - """Subscribes to a topic on the MQTT Broker. - This method can subscribe to one topics or multiple topics. - - :param str|tuple|list topic: Unique MQTT topic identifier string. If - this is a `tuple`, then the tuple should - contain topic identifier string and qos - level integer. If this is a `list`, then - each list element should be a tuple containing - a topic identifier string and qos level integer. - :param int qos: Quality of Service level for the topic, defaults to - zero. Conventional options are ``0`` (send at most once), ``1`` - (send at least once), or ``2`` (send exactly once). - - """ - self.is_connected() - topics = None - if isinstance(topic, tuple): - topic, qos = topic - self._valid_topic(topic) - self._valid_qos(qos) - if isinstance(topic, str): - self._valid_topic(topic) - self._valid_qos(qos) - topics = [(topic, qos)] - if isinstance(topic, list): - topics = [] - for t, q in topic: - self._valid_qos(q) - self._valid_topic(t) - topics.append((t, q)) - # Assemble packet - packet_length = 2 + (2 * len(topics)) + (1 * len(topics)) - packet_length += sum(len(topic.encode("utf-8")) for topic, qos in topics) - packet_length_byte = packet_length.to_bytes(1, "big") - self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 - packet_id_bytes = self._pid.to_bytes(2, "big") - # Packet with variable and fixed headers - packet = MQTT_SUB + packet_length_byte + packet_id_bytes - # attaching topic and QOS level to the packet - for t, q in topics: - topic_size = len(t.encode("utf-8")).to_bytes(2, "big") - qos_byte = q.to_bytes(1, "big") - packet += topic_size + t.encode() + qos_byte - if self.logger is not None: - for t, q in topics: - self.logger.debug("SUBSCRIBING to topic %s with QoS %d", t, q) - self._sock.send(packet) - while True: - op = self._wait_for_msg() - if op == 0x90: - rc = self._sock_exact_recv(4) - assert rc[1] == packet[2] and rc[2] == packet[3] - if rc[3] == 0x80: - raise MMQTTException("SUBACK Failure!") - for t, q in topics: - if self.on_subscribe is not None: - self.on_subscribe(self, self._user_data, t, q) - self._subscribed_topics.append(t) - return - - def unsubscribe(self, topic): - """Unsubscribes from a MQTT topic. - - :param str|list topic: Unique MQTT topic identifier string or list. - - """ - topics = None - if isinstance(topic, str): - self._valid_topic(topic) - topics = [(topic)] - if isinstance(topic, list): - topics = [] - for t in topic: - self._valid_topic(t) - topics.append((t)) - for t in topics: - if t not in self._subscribed_topics: - raise MMQTTException( - "Topic must be subscribed to before attempting unsubscribe." - ) - # Assemble packet - packet_length = 2 + (2 * len(topics)) - packet_length += sum(len(topic.encode("utf-8")) for topic in topics) - packet_length_byte = packet_length.to_bytes(1, "big") - self._pid = self._pid + 1 if self._pid < 0xFFFF else 1 - packet_id_bytes = self._pid.to_bytes(2, "big") - packet = MQTT_UNSUB + packet_length_byte + packet_id_bytes - for t in topics: - topic_size = len(t.encode("utf-8")).to_bytes(2, "big") - packet += topic_size + t.encode() - if self.logger is not None: - for t in topics: - self.logger.debug("UNSUBSCRIBING from topic %s", t) - self._sock.send(packet) - if self.logger is not None: - self.logger.debug("Waiting for UNSUBACK...") - while True: - op = self._wait_for_msg() - if op == 176: - rc = self._sock_exact_recv(3) - assert rc[0] == 0x02 - # [MQTT-3.32] - assert rc[1] == packet_id_bytes[0] and rc[2] == packet_id_bytes[1] - for t in topics: - if self.on_unsubscribe is not None: - self.on_unsubscribe(self, self._user_data, t, self._pid) - self._subscribed_topics.remove(t) - return - - def reconnect(self, resub_topics=True): - """Attempts to reconnect to the MQTT broker. - - :param bool resub_topics: Resubscribe to previously subscribed topics. - - """ - if self.logger is not None: - self.logger.debug("Attempting to reconnect with MQTT broker") - self.connect() - if self.logger is not None: - self.logger.debug("Reconnected with broker") - if resub_topics: - if self.logger is not None: - self.logger.debug( - "Attempting to resubscribe to previously subscribed topics." - ) - subscribed_topics = self._subscribed_topics.copy() - self._subscribed_topics = [] - while subscribed_topics: - feed = subscribed_topics.pop() - self.subscribe(feed) - - def loop(self, timeout=1): - """Non-blocking message loop. Use this method to - check incoming subscription messages. - Returns response codes of any messages received. - - :param int timeout: Socket timeout, in seconds. - - """ - if self._timestamp == 0: - self._timestamp = time.monotonic() - current_time = time.monotonic() - if current_time - self._timestamp >= self.keep_alive: - self._timestamp = 0 - # Handle KeepAlive by expecting a PINGREQ/PINGRESP from the server - if self.logger is not None: - self.logger.debug( - "KeepAlive period elapsed - requesting a PINGRESP from the server..." - ) - rcs = self.ping() - return rcs - self._sock.settimeout(timeout) - rc = self._wait_for_msg() - return [rc] if rc else None - - def _wait_for_msg(self, timeout=0.1): - """Reads and processes network events.""" - # CPython socket module contains a timeout attribute - if hasattr(self._socket_pool, "timeout"): - try: - res = self._sock_exact_recv(1) - except self._socket_pool.timeout: - return None - else: # socketpool, esp32spi - try: - res = self._sock_exact_recv(1) - except OSError as error: - if error.errno == errno.ETIMEDOUT: - # raised by a socket timeout if 0 bytes were present - return None - raise MMQTTException from error - - # Block while we parse the rest of the response - self._sock.settimeout(timeout) - if res in [None, b""]: - # If we get here, it means that there is nothing to be received - return None - if res[0] == MQTT_PINGRESP: - if self.logger is not None: - self.logger.debug("Got PINGRESP") - sz = self._sock_exact_recv(1)[0] - if sz != 0x00: - raise MMQTTException( - "Unexpected PINGRESP returned from broker: {}.".format(sz) - ) - return MQTT_PINGRESP - if res[0] & 0xF0 != 0x30: - return res[0] - sz = self._recv_len() - # topic length MSB & LSB - topic_len = self._sock_exact_recv(2) - topic_len = (topic_len[0] << 8) | topic_len[1] - topic = self._sock_exact_recv(topic_len) - topic = str(topic, "utf-8") - sz -= topic_len + 2 - pid = 0 - if res[0] & 0x06: - pid = self._sock_exact_recv(2) - pid = pid[0] << 0x08 | pid[1] - sz -= 0x02 - # read message contents - raw_msg = self._sock_exact_recv(sz) - msg = raw_msg if self._use_binary_mode else str(raw_msg, "utf-8") - if self.logger is not None: - self.logger.debug( - "Receiving SUBSCRIBE \nTopic: %s\nMsg: %s\n", topic, raw_msg - ) - self._handle_on_message(self, topic, msg) - if res[0] & 0x06 == 0x02: - pkt = bytearray(b"\x40\x02\0\0") - struct.pack_into("!H", pkt, 2, pid) - self._sock.send(pkt) - elif res[0] & 6 == 4: - assert 0 - return res[0] - - def _recv_len(self): - """Unpack MQTT message length.""" - n = 0 - sh = 0 - b = bytearray(1) - while True: - b = self._sock_exact_recv(1)[0] - n |= (b & 0x7F) << sh - if not b & 0x80: - return n - sh += 7 - - def _recv_into(self, buf, size=0): - """Backwards-compatible _recv_into implementation.""" - if self._backwards_compatible_sock: - size = len(buf) if size == 0 else size - b = self._sock.recv(size) - read_size = len(b) - buf[:read_size] = b - return read_size - return self._sock.recv_into(buf, size) - - def _sock_exact_recv(self, bufsize): - """Reads _exact_ number of bytes from the connected socket. Will only return - string with the exact number of bytes requested. - - The semantics of native socket receive is that it returns no more than the - specified number of bytes (i.e. max size). However, it makes no guarantees in - terms of the minimum size of the buffer, which could be 1 byte. This is a - wrapper for socket recv() to ensure that no less than the expected number of - bytes is returned or trigger a timeout exception. - - :param int bufsize: number of bytes to receive - - """ - if not self._backwards_compatible_sock: - # CPython/Socketpool Impl. - rc = bytearray(bufsize) - self._sock.recv_into(rc, bufsize) - else: # ESP32SPI Impl. - stamp = time.monotonic() - read_timeout = self.keep_alive - # This will timeout with socket timeout (not keepalive timeout) - rc = self._sock.recv(bufsize) - if not rc: - if self.logger is not None: - self.logger.debug("_sock_exact_recv timeout") - # If no bytes waiting, raise same exception as socketpool - raise OSError(errno.ETIMEDOUT) - # If any bytes waiting, try to read them all, - # or raise exception if wait longer than read_timeout - to_read = bufsize - len(rc) - assert to_read >= 0 - read_timeout = self.keep_alive - while to_read > 0: - recv = self._sock.recv(to_read) - to_read -= len(recv) - rc += recv - if time.monotonic() - stamp > read_timeout: - raise MMQTTException( - "Unable to receive {} bytes within {} seconds.".format( - to_read, read_timeout - ) - ) - return rc - - def _send_str(self, string): - """Encodes a string and sends it to a socket. - - :param str string: String to write to the socket. - - """ - if isinstance(string, str): - self._sock.send(struct.pack("!H", len(string.encode("utf-8")))) - self._sock.send(str.encode(string, "utf-8")) - else: - self._sock.send(struct.pack("!H", len(string))) - self._sock.send(string) - - @staticmethod - def _valid_topic(topic): - """Validates if topic provided is proper MQTT topic format. - - :param str topic: Topic identifier - - """ - if topic is None: - raise MMQTTException("Topic may not be NoneType") - # [MQTT-4.7.3-1] - if not topic: - raise MMQTTException("Topic may not be empty.") - # [MQTT-4.7.3-3] - if len(topic.encode("utf-8")) > MQTT_TOPIC_LENGTH_LIMIT: - raise MMQTTException("Topic length is too large.") - - @staticmethod - def _valid_qos(qos_level): - """Validates if the QoS level is supported by this library - - :param int qos_level: Desired QoS level. - - """ - if isinstance(qos_level, int): - if qos_level < 0 or qos_level > 2: - raise MMQTTException("QoS must be between 1 and 2.") - else: - raise MMQTTException("QoS must be an integer.") - - def is_connected(self): - """Returns MQTT client session status as True if connected, raises - a `MMQTTException` if `False`. - """ - if self._sock is None or self._is_connected is False: - raise MMQTTException("MiniMQTT is not connected.") - return self._is_connected - - # Logging - def enable_logger(self, logger, log_level=20): - """Enables library logging provided a logger object. - - :param logger: A python logger pacakge. - :param log_level: Numeric value of a logging level, defaults to INFO. - - """ - self.logger = logger.getLogger("log") - self.logger.setLevel(log_level) - - def disable_logger(self): - """Disables logging.""" - if not self.logger: - raise MMQTTException("Can not disable logger, no logger found.") - self.logger = None diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py deleted file mode 100644 index 75665f1bb5..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/adafruit_rtttl.py +++ /dev/null @@ -1,204 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2017, 2018 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. -""" -`adafruit_rtttl` -==================================================== - -Play notes to a digialio pin using ring tone text transfer language (rtttl). - -* Author(s): Scott Shawcroft -""" - -__version__ = "2.4.2" -__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RTTTL" - -import sys -import time -import pwmio - -AUDIOIO_AVAILABLE = False -try: - import audioio - from adafruit_waveform import sine - - AUDIOIO_AVAILABLE = True - try: - import audiocore - except ImportError: - audiocore = audioio -except ImportError: - pass - -PIANO = { - "4c": 261.626, - "4c#": 277.183, - "4d": 293.665, - "4d#": 311.127, - "4e": 329.628, - "4f": 349.228, - "4f#": 369.994, - "4g": 391.995, - "4g#": 415.305, - "4a": 440, - "4a#": 466.164, - "4b": 493.883, - "5c": 523.251, - "5c#": 554.365, - "5d": 587.330, - "5d#": 622.254, - "5e": 659.255, - "5f": 698.456, - "5f#": 739.989, - "5g": 783.991, - "5g#": 830.609, - "5a": 880, - "5a#": 932.328, - "5b": 987.767, - "6c": 1046.50, - "6c#": 1108.73, - "6d": 1174.66, - "6d#": 1244.51, - "6e": 1318.51, - "6f": 1396.91, - "6f#": 1479.98, - "6g": 1567.98, - "6g#": 1661.22, - "6a": 1760, - "6a#": 1864.66, - "6b": 1975.53, - "7c": 2093, - "7c#": 2217.46, -} - - -def _parse_note(note, duration=2, octave="6"): - note = note.strip() - piano_note = None - note_duration = duration - if note[0].isdigit() and note[1].isdigit(): - note_duration = int(note[:2]) - piano_note = note[2] - elif note[0].isdigit(): - note_duration = int(note[0]) - piano_note = note[1] - else: - piano_note = note[0] - if "." in note: - note_duration *= 1.5 - if "#" in note: - piano_note += "#" - note_octave = octave - if note[-1].isdigit(): - note_octave = note[-1] - piano_note = note_octave + piano_note - return piano_note, note_duration - - -def _get_wave(tune, octave): - """Returns the proper waveform to play the song along with the minimum - frequency in the song. - """ - min_freq = 13000 - - for note in tune.split(","): - piano_note, _ = _parse_note(note, octave=octave) - if piano_note[-1] != "p" and PIANO[piano_note] < min_freq: - min_freq = PIANO[piano_note] - return sine.sine_wave(16000, min_freq), min_freq - - -# pylint: disable-msg=too-many-arguments -def _play_to_pin(tune, base_tone, min_freq, duration, octave, tempo): - """Using the prepared input send the notes to the pin - """ - pwm = isinstance(base_tone, pwmio.PWMOut) - for note in tune.split(","): - piano_note, note_duration = _parse_note(note, duration, octave) - if piano_note in PIANO: - if pwm: - base_tone.frequency = int(PIANO[piano_note]) - base_tone.duty_cycle = 2 ** 15 - else: - # AudioOut interface changed in CP 3.x - if sys.implementation.version[0] >= 3: - pitch = int(PIANO[piano_note]) - sine_wave = sine.sine_wave(16000, pitch) - sine_wave_sample = audiocore.RawSample(sine_wave) - base_tone.play(sine_wave_sample, loop=True) - else: - base_tone.frequency = int(16000 * (PIANO[piano_note] / min_freq)) - base_tone.play(loop=True) - - time.sleep(4 / note_duration * 60 / tempo) - if pwm: - base_tone.duty_cycle = 0 - else: - base_tone.stop() - time.sleep(0.02) - - -# pylint: disable-msg=too-many-arguments -def play(pin, rtttl, octave=None, duration=None, tempo=None): - """Play notes to a digialio pin using ring tone text transfer language (rtttl). - :param ~digitalio.DigitalInOut pin: the speaker pin - :param rtttl: string containing rtttl - :param int octave: represents octave number (default 6 starts at middle c) - :param int duration: length of notes (default 4 quarter note) - :param int tempo: how fast (default 63 beats per minute) - """ - _, defaults, tune = rtttl.lower().split(":") - for default in defaults.split(","): - if default[0] == "d" and not duration: - duration = int(default[2:]) - elif default[0] == "o" and not octave: - octave = default[2:] - elif default[0] == "b" and not tempo: - tempo = int(default[2:]) - if not octave: - octave = 6 - if not duration: - duration = 4 - if not tempo: - tempo = 63 - - base_tone = None - min_freq = 440 - if AUDIOIO_AVAILABLE: - wave, min_freq = _get_wave(tune, octave) - try: - # AudioOut interface changed in CP 3.x; a waveform if now pass - # directly to .play(), generated for each note in _play_to_pin() - if sys.implementation.version[0] >= 3: - base_tone = audioio.AudioOut(pin) - else: - base_tone = audioio.AudioOut(pin, wave) - except ValueError: - # No DAC on the pin so use PWM. - pass - - # Fall back to PWM - if not base_tone: - base_tone = pwmio.PWMOut(pin, duty_cycle=0, variable_frequency=True) - - _play_to_pin(tune, base_tone, min_freq, duration, octave, tempo) - - base_tone.deinit() diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py deleted file mode 100644 index c174d91c7f..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynklib.py +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright (c) 2019-2020 Anton Morozenko -# Copyright (c) 2015-2019 Volodymyr Shymanskyy. -# See the file LICENSE for copying permission. -# 宋义深 2021/4/25 Modified -__version__ = '0.2.6' - -import socketpool as socket -import ssl -import struct -import time -import wifi - -LOGO = """ - ___ __ __ - / _ )/ /_ _____ / /__ - / _ / / // / _ \\/ '_/ - /____/_/\\_, /_//_/_/\\_\\ - /___/ for Python v{}\n""".format(__version__) - - -def stub_log(*args): - pass - - -def ticks_ms(): - return int(time.time() * 1000) - - -def sleep_ms(ms): - time.sleep(ms // 1000) - - -class BlynkError(Exception): - pass - - -class RedirectError(Exception): - def __init__(self, server, port): - self.server = server - self.port = port - - -class Protocol(object): - MSG_RSP = 0 - MSG_LOGIN = 2 - MSG_PING = 6 - MSG_TWEET = 12 - MSG_EMAIL = 13 - MSG_NOTIFY = 14 - MSG_BRIDGE = 15 - MSG_HW_SYNC = 16 - MSG_INTERNAL = 17 - MSG_PROPERTY = 19 - MSG_HW = 20 - MSG_REDIRECT = 41 - MSG_HEAD_LEN = 5 - - STATUS_INVALID_TOKEN = 9 - STATUS_NO_DATA = 17 - STATUS_OK = 200 - VPIN_MAX_NUM = 32 - - _msg_id = 0 - - def _get_msg_id(self, **kwargs): - if 'msg_id' in kwargs: - return kwargs['msg_id'] - self._msg_id += 1 - return self._msg_id if self._msg_id <= 0xFFFF else 1 - - def _pack_msg(self, msg_type, *args, **kwargs): - data = ('\0'.join([str(curr_arg) for curr_arg in args])).encode('utf-8') - return struct.pack('!BHH', msg_type, self._get_msg_id(**kwargs), len(data)) + data - - def parse_response(self, rsp_data, msg_buffer): - msg_args = [] - try: - msg_type, msg_id, h_data = struct.unpack('!BHH', rsp_data[:self.MSG_HEAD_LEN]) - except Exception as p_err: - print(p_err) - raise BlynkError('Message parse error: {}'.format(p_err)) - if msg_id == 0: - raise BlynkError('invalid msg_id == 0') - elif h_data >= msg_buffer: - raise BlynkError('Command too long. Length = {}'.format(h_data)) - elif msg_type in (self.MSG_RSP, self.MSG_PING): - pass - elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL, self.MSG_REDIRECT): - msg_body = rsp_data[self.MSG_HEAD_LEN: self.MSG_HEAD_LEN + h_data] - msg_args = [itm.decode('utf-8') for itm in msg_body.split(b'\0')] - else: - print('unknown') - raise BlynkError("Unknown message type: '{}'".format(msg_type)) - return msg_type, msg_id, h_data, msg_args - - def heartbeat_msg(self, heartbeat, rcv_buffer): - return self._pack_msg(self.MSG_INTERNAL, 'ver', __version__, 'buff-in', rcv_buffer, 'h-beat', heartbeat, - 'dev', 'python') - - def login_msg(self, token): - return self._pack_msg(self.MSG_LOGIN, token) - - def ping_msg(self): - return self._pack_msg(self.MSG_PING) - - def response_msg(self, *args, **kwargs): - return self._pack_msg(self.MSG_RSP, *args, **kwargs) - - def virtual_write_msg(self, v_pin, *val): - return self._pack_msg(self.MSG_HW, 'vw', v_pin, *val) - - def virtual_sync_msg(self, *pins): - return self._pack_msg(self.MSG_HW_SYNC, 'vr', *pins) - - def email_msg(self, to, subject, body): - return self._pack_msg(self.MSG_EMAIL, to, subject, body) - - def tweet_msg(self, msg): - return self._pack_msg(self.MSG_TWEET, msg) - - def notify_msg(self, msg): - return self._pack_msg(self.MSG_NOTIFY, msg) - - def set_property_msg(self, pin, prop, *val): - return self._pack_msg(self.MSG_PROPERTY, pin, prop, *val) - - def internal_msg(self, *args): - return self._pack_msg(self.MSG_INTERNAL, *args) - - -class Connection(Protocol): - SOCK_MAX_TIMEOUT = 5 - SOCK_TIMEOUT = 0 - SOCK_SSL_TIMEOUT = 1 - EAGAIN = 11 - ETIMEDOUT = 60 - RETRIES_TX_DELAY = 2 - RETRIES_TX_MAX_NUM = 3 - RECONNECT_SLEEP = 1 - TASK_PERIOD_RES = 50 - DISCONNECTED = 0 - CONNECTING = 1 - AUTHENTICATING = 2 - AUTHENTICATED = 3 - - _state = None - _socket = None - _socketPool = None - _last_rcv_time = 0 - _last_ping_time = 0 - _last_send_time = 0 - - def __init__(self, token, server='blynk-cloud.com', port=80, ssl_cert=None, heartbeat=10, rcv_buffer=1024, - log=stub_log): - self.token = token - self.server = server - self.port = port - self.heartbeat = heartbeat - self.rcv_buffer = rcv_buffer - self.log = log - self.ssl_cert = ssl_cert - - def send(self, data): - retries = self.RETRIES_TX_MAX_NUM - while retries > 0: - try: - retries -= 1 - self._last_send_time = ticks_ms() - return self._socket.send(data) - except (Exception): - sleep_ms(self.RETRIES_TX_DELAY) - - def receive(self, length, timeout): - d_buff = bytearray(length) - try: - self._socket.settimeout(timeout) - recv_length = self._socket.recv_into(d_buff) - d_buff = d_buff[:recv_length] - #print(self.parse_response(bytes(d_buff), self.rcv_buffer)) - return bytes(d_buff) - except (Exception) as err: - if 'timed out' in str(err): - return b'' - if str(self.EAGAIN) in str(err) or str(self.ETIMEDOUT) in str(err): - return b'' - raise - - def is_server_alive(self): - now = ticks_ms() - h_beat_ms = self.heartbeat * 1000 - rcv_delta = now - self._last_rcv_time - ping_delta = now - self._last_ping_time - send_delta = now - self._last_send_time - if rcv_delta > h_beat_ms + (h_beat_ms // 2): - return False - if (ping_delta > h_beat_ms // 10) and (send_delta > h_beat_ms or rcv_delta > h_beat_ms): - self.send(self.ping_msg()) - self.log('Heartbeat time: {}'.format(now)) - self._last_ping_time = now - return True - - def _get_socket(self): - try: - self._state = self.CONNECTING - self._socket = socket.SocketPool(wifi.radio).socket() - self._socketPool = socket.SocketPool(wifi.radio) - self._socket.connect(self._socketPool.getaddrinfo(self.server, self.port)[0][4]) - self._socket.settimeout(self.SOCK_TIMEOUT) - if self.ssl_cert: - # system default CA certificates case - if self.ssl_cert == "default": - self.ssl_cert = None - self.log('Using SSL socket...') - ssl_context = ssl.create_default_context(cafile=self.ssl_cert) - ssl_context.verify_mode = ssl.CERT_REQUIRED - self._socket.settimeout(self.SOCK_SSL_TIMEOUT) - self._socket = ssl_context.wrap_socket(sock=self._socket, server_hostname=self.server) - self.log('Connected to blynk server') - except Exception as g_exc: - print(g_exc) - raise BlynkError('Connection with the Blynk server failed: {}'.format(g_exc)) - - def _authenticate(self): - self._state = self.AUTHENTICATING - self.send(self.login_msg(self.token)) - rsp_data = self.receive(self.rcv_buffer, self.SOCK_MAX_TIMEOUT) - if not rsp_data: - raise BlynkError('Auth stage timeout') - msg_type, _, status, args = self.parse_response(rsp_data, self.rcv_buffer) - if status != self.STATUS_OK: - if status == self.STATUS_INVALID_TOKEN: - raise BlynkError('Invalid Auth Token') - if msg_type == self.MSG_REDIRECT: - raise RedirectError(*args) - raise BlynkError('Auth stage failed. Status={}'.format(status)) - self._state = self.AUTHENTICATED - - def _set_heartbeat(self): - self.send(self.heartbeat_msg(self.heartbeat, self.rcv_buffer)) - rcv_data = self.receive(self.rcv_buffer, self.SOCK_MAX_TIMEOUT) - if not rcv_data: - raise BlynkError('Heartbeat stage timeout') - _, _, status, _ = self.parse_response(rcv_data, self.rcv_buffer) - if status != self.STATUS_OK: - raise BlynkError('Set heartbeat returned code={}'.format(status)) - self.log('Heartbeat = {} sec. MaxCmdBuffer = {} bytes'.format(self.heartbeat, self.rcv_buffer)) - - def connected(self): - return True if self._state == self.AUTHENTICATED else False - - -class Blynk(Connection): - _CONNECT_TIMEOUT = 30 # 30sec - _VPIN_WILDCARD = '*' - _VPIN_READ = 'read v' - _VPIN_WRITE = 'write v' - _INTERNAL = 'internal_' - _CONNECT = 'connect' - _DISCONNECT = 'disconnect' - _VPIN_READ_ALL = '{}{}'.format(_VPIN_READ, _VPIN_WILDCARD) - _VPIN_WRITE_ALL = '{}{}'.format(_VPIN_WRITE, _VPIN_WILDCARD) - _events = {} - - def __init__(self, token, **kwargs): - Connection.__init__(self, token, **kwargs) - self._start_time = ticks_ms() - self._last_rcv_time = ticks_ms() - self._last_send_time = ticks_ms() - self._last_ping_time = ticks_ms() - self._state = self.DISCONNECTED - print(LOGO) - - def connect(self, timeout=_CONNECT_TIMEOUT): - end_time = time.time() + timeout - while not self.connected(): - if self._state == self.DISCONNECTED: - try: - self._get_socket() - print('[Connecting 1/5] Socket got.') - self._authenticate() - print('[Connecting 2/5] Authenticated.') - self._set_heartbeat() - print('[Connecting 3/5] Heartbeat sent.') - self._last_rcv_time = ticks_ms() - print('[Connecting 4/5] Last receive time set.') - self.log('Registered events: {}\n'.format(list(self._events.keys()))) - print('[Connecting 5/5] Events registered.') - self.call_handler(self._CONNECT) - return True - except BlynkError as b_err: - self.disconnect(b_err) - sleep_ms(self.TASK_PERIOD_RES) - except RedirectError as r_err: - self.disconnect() - self.server = r_err.server - self.port = r_err.port - sleep_ms(self.TASK_PERIOD_RES) - if time.time() >= end_time: - return False - - def disconnect(self, err_msg=None): - self.call_handler(self._DISCONNECT) - if self._socket: - self._socket.close() - self._state = self.DISCONNECTED - if err_msg: - self.log('[ERROR]: {}\nConnection closed'.format(err_msg)) - self._msg_id = 0 - time.sleep(self.RECONNECT_SLEEP) - - def virtual_write(self, v_pin, *val): - return self.send(self.virtual_write_msg(v_pin, *val)) - - def virtual_sync(self, *v_pin): - return self.send(self.virtual_sync_msg(*v_pin)) - - def email(self, to, subject, body): - return self.send(self.email_msg(to, subject, body)) - - def tweet(self, msg): - return self.send(self.tweet_msg(msg)) - - def notify(self, msg): - return self.send(self.notify_msg(msg)) - - def set_property(self, v_pin, property_name, *val): - return self.send(self.set_property_msg(v_pin, property_name, *val)) - - def internal(self, *args): - return self.send(self.internal_msg(*args)) - - def handle_event(blynk, event_name): - class Deco(object): - def __init__(self, func): - self.func = func - # wildcard 'read V*' and 'write V*' events handling - if str(event_name).lower() in (blynk._VPIN_READ_ALL, blynk._VPIN_WRITE_ALL): - event_base_name = str(event_name).split(blynk._VPIN_WILDCARD)[0] - for i in range(blynk.VPIN_MAX_NUM + 1): - blynk._events['{}{}'.format(event_base_name.lower(), i)] = func - else: - blynk._events[str(event_name).lower()] = func - - def __call__(self): - return self.func() - - return Deco - - def call_handler(self, event, *args, **kwargs): - if event in self._events.keys(): - self.log("Event: ['{}'] -> {}".format(event, args)) - self._events[event](*args, **kwargs) - - def process(self, msg_type, msg_id, msg_len, msg_args): - if msg_type == self.MSG_RSP: - self.log('Response status: {}'.format(msg_len)) - elif msg_type == self.MSG_PING: - self.send(self.response_msg(self.STATUS_OK, msg_id=msg_id)) - elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL): - if msg_type == self.MSG_INTERNAL: - self.call_handler("{}{}".format(self._INTERNAL, msg_args[0]), msg_args[1:]) - elif len(msg_args) >= 3 and msg_args[0] == 'vw': - self.call_handler("{}{}".format(self._VPIN_WRITE, msg_args[1]), int(msg_args[1]), msg_args[2:]) - elif len(msg_args) == 2 and msg_args[0] == 'vr': - self.call_handler("{}{}".format(self._VPIN_READ, msg_args[1]), int(msg_args[1])) - - def read_response(self, timeout=0.5): - end_time = time.time() + timeout - while time.time() <= end_time: - rsp_data = self.receive(self.rcv_buffer, self.SOCK_TIMEOUT) - if rsp_data: - self._last_rcv_time = ticks_ms() - msg_type, msg_id, h_data, msg_args = self.parse_response(rsp_data, self.rcv_buffer) - self.process(msg_type, msg_id, h_data, msg_args) - - def run(self): - if not self.connected(): - self.connect() - else: - try: - self.read_response(timeout=self.SOCK_TIMEOUT) - if not self.is_server_alive(): - self.disconnect('Blynk server is offline') - except KeyboardInterrupt: - raise - except BlynkError as b_err: - self.log(b_err) - self.disconnect() - except Exception as g_exc: - self.log(g_exc) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py deleted file mode 100644 index 8fe26ad3f6..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/blynktimer.py +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright (c) 2019-2020 Anton Morozenko -# 宋义深 2021/4/25 Modified -""" -Polling timers for functions. -Registers timers and performs run once or periodical function execution after defined time intervals. -""" -# select.select call used as polling waiter where it is possible -# cause time.sleep sometimes may load CPU up to 100% with small polling wait interval -try: - # cpython - import time - import select - - polling_wait = lambda x: select.select([], [], [], x) - polling_wait(0.01) -except OSError: - # windows case where select.select call fails - polling_wait = lambda x: time.sleep(x) - -except ImportError: - # micropython - import time - - try: - from uselect import select as s_select - - polling_wait = lambda x: s_select([], [], [], x) - except ImportError: - # case when micropython port does not support select.select - polling_wait = lambda x: time.sleep(x) - -WAIT_SEC = 0.05 -MAX_TIMERS = 16 -DEFAULT_INTERVAL = 10 - - -class TimerError(Exception): - pass - - -class Timer(object): - timers = {} - - def __init__(self, no_timers_err=True): - self.no_timers_err = no_timers_err - - def _get_func_name(self, obj): - """retrieves a suitable name for a function""" - if hasattr(obj, 'func'): - # handles nested decorators - return self._get_func_name(obj.func) - # simply returns 'timer' if on port without function attrs - return getattr(obj, '__name__', 'timer') - - def register(blynk, *args, **kwargs): - # kwargs with defaults are used cause PEP 3102 no supported by Python2 - interval = kwargs.pop('interval', DEFAULT_INTERVAL) - run_once = kwargs.pop('run_once', False) - stopped = kwargs.pop('stopped', False) - - class Deco(object): - def __init__(self, func): - self.func = func - if len(list(Timer.timers.keys())) >= MAX_TIMERS: - raise TimerError('Max allowed timers num={}'.format(MAX_TIMERS)) - _timer = _Timer(interval, func, run_once, stopped, *args, **kwargs) - Timer.timers['{}_{}'.format(len(list(Timer.timers.keys())), blynk._get_func_name(func))] = _timer - - def __call__(self, *f_args, **f_kwargs): - return self.func(*f_args, **f_kwargs) - - return Deco - - @staticmethod - def stop(t_id): - timer = Timer.timers.get(t_id, None) - if timer is None: - raise TimerError('Timer id={} not found'.format(t_id)) - Timer.timers[t_id].stopped = True - - @staticmethod - def start(t_id): - timer = Timer.timers.get(t_id, None) - if timer is None: - raise TimerError('Timer id={} not found'.format(t_id)) - Timer.timers[t_id].stopped = False - Timer.timers[t_id].fire_time = None - Timer.timers[t_id].fire_time_prev = None - - @staticmethod - def is_stopped(t_id): - timer = Timer.timers.get(t_id, None) - if timer is None: - raise TimerError('Timer id={} not found'.format(t_id)) - return timer.stopped - - def get_timers(self): - states = {True: 'Stopped', False: 'Running'} - return {k: states[v.stopped] for k, v in self.timers.items()} - - def run(self): - polling_wait(WAIT_SEC) - timers_intervals = [curr_timer.run() for curr_timer in Timer.timers.values() if not curr_timer.stopped] - if not timers_intervals and self.no_timers_err: - raise TimerError('Running timers not found') - return timers_intervals - - -class _Timer(object): - def __init__(self, interval, deco, run_once, stopped, *args, **kwargs): - self.interval = interval - self.deco = deco - self.args = args - self.run_once = run_once - self.kwargs = kwargs - self.fire_time = None - self.fire_time_prev = None - self.stopped = stopped - - def run(self): - timer_real_interval = 0 - if self.fire_time is None: - self.fire_time = time.time() + self.interval - if self.fire_time_prev is None: - self.fire_time_prev = time.time() - curr_time = time.time() - if curr_time >= self.fire_time: - self.deco(*self.args, **self.kwargs) - if self.run_once: - self.stopped = True - timer_real_interval = curr_time - self.fire_time_prev - self.fire_time_prev = self.fire_time - self.fire_time = curr_time + self.interval - return timer_real_interval diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py deleted file mode 100644 index e7b3087802..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/button.py +++ /dev/null @@ -1,49 +0,0 @@ -""" -Button - -CircuitPython library for Button - MixGoCE -======================================================= -Small Cabbage -20210721 -dahanzimin -20210423 -""" - -import time -import board -from digitalio import DigitalInOut, Direction, Pull - -class Button(): - - def __init__(self, pin): - self.pin = DigitalInOut(pin) - self.pin.direction = Direction.INPUT - self.pin.pull = Pull.UP - self.flag = True - - def is_pressed(self): - return self.pin.value == False - - def get_presses(self, delay=1): - last_time, presses = time.monotonic(), 0 - while time.monotonic()< last_time + delay: - time.sleep(0.05) - if self.was_pressed(): - presses += 1 - return presses - - def was_pressed(self): - if self.pin.value != self.flag: - self.flag = self.pin.value - time.sleep(0.01) - if self.flag == False: - return True - else: - return False - -button_A1 = Button(board.IO14) -button_A2 = Button(board.IO21) -button_A3 = Button(board.IO36) -button_A4 = Button(board.IO37) -button_B1 = Button(board.IO0) -button_B2 = Button(board.IO35) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py deleted file mode 100644 index 508b9dd7f8..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/infrared.py +++ /dev/null @@ -1,41 +0,0 @@ -""" -Infrared Sensor - -CircuitPython library for Infrared Sensor - MixGoCE -======================================================= - -Small Cabbage -20210721 -dahanzimin -20210423 -""" - -from mixgoce import version -import board -from pwmio import PWMOut - -if version:#new - def near(x, val=10000): - from analogio import AnalogIn - - pwm = PWMOut(board.IO39, frequency=50000, duty_cycle=65535) - if x == 'left': - IR=AnalogIn(board.IO3) - reaction = IR.value-10000 #fix - if x == 'right': - IR=AnalogIn(board.IO16) - reaction = IR.value - IR.deinit() - pwm.deinit() - return reaction > val -else:#old - def near(x, val=10000): - from digitalio import DigitalInOut, Direction - - IR = DigitalInOut(board.IO38) - IR.direction = Direction.INPUT - pwm = PWMOut(board.IO39, frequency=53000, duty_cycle=100) - reaction = IR.value - IR.deinit() - pwm.deinit() - return reaction \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py deleted file mode 100644 index 30445e3503..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/irremote.py +++ /dev/null @@ -1,111 +0,0 @@ -""" -IR Remote - -CircuitPython library for IR Remote - MixGoCE -======================================================= - -Small Cabbage -20210811 -""" - -import pulseio -import board -import adafruit_irremote - -first_init =True - -def encode2hex(code): - res = "0X" - for c in code: - c = hex(c)[2:] - if len(c) == 1: - c = "0" + c - res = res + c.upper() - return res - -def decode2list(string): - res = [0, 0, 0, 0] - prefix = "0" * (8 - len(string[2:])) - string = prefix + string[2:] - for i in range(4): - res[i] = int(string[2*i:2*(i+1)], 16) - return res - -def ir_receive_hex(pin=board.IO38, flag=False): - global first_init - global decoder - global pulsein - - if first_init : - pulsein = pulseio.PulseIn(pin, maxlen=120, idle_state=True) - decoder = adafruit_irremote.GenericDecode() - first_init=False - - pulses = decoder.read_pulses(pulsein, blocking=False) - if pulses: - try: - # print("Heard", len(pulses), "Pulses:", pulses) - code = decoder.decode_bits(pulses) - res = encode2hex(code) - if flag: - print("Decoded:", res) - # pulsein.deinit() - return res - except adafruit_irremote.IRNECRepeatException: # unusual short code! - print("NEC repeat!") - except adafruit_irremote.IRDecodeException as e: # failed to decode - if flag: - print("Failed to decode: ", e.args) - # except TypeError as e: - # pass - # finally: - # pulsein.deinit() - -def ir_receive(pin=board.IO38,flag=False): - global first_init - global decoder - global pulsein - - if first_init : - pulsein = pulseio.PulseIn(pin, maxlen=120, idle_state=True) - decoder = adafruit_irremote.GenericDecode() - first_init=False - - pulses = decoder.read_pulses(pulsein, blocking=False) - if pulses: - try: - code = decoder.decode_bits(pulses) - if flag: - print("Decoded:", code) - return code - except adafruit_irremote.IRNECRepeatException: # unusual short code! - print("NEC repeat!") - except adafruit_irremote.IRDecodeException as e: # failed to decode - if flag: - print("Failed to decode: ", e.args) - -def ir_send(content=[255, 0, 0, 0], pin=board.IO39): - pulseout = pulseio.PulseOut(pin, frequency=38000, duty_cycle=2 ** 15) - # Create an encoder that will take numbers and turn them into NEC IR pulses - encoder = adafruit_irremote.GenericTransmit( - header=[9500, 4500], one=[550, 550], zero=[550, 1700], trail=550 - ) - encoder.transmit(pulseout, content) - print("IR signal sent!") - pulseout.deinit() - -def ir_send_hex(content="0XFF000000", pin=board.IO39): # [255, 0, 0, 0] - pulseout = pulseio.PulseOut(pin, frequency=38000, duty_cycle=2 ** 15) - # Create an encoder that will take numbers and turn them into NEC IR pulses - encoder = adafruit_irremote.GenericTransmit( - header=[9500, 4500], one=[550, 550], zero=[550, 1700], trail=550 - ) - encoder.transmit(pulseout, decode2list(content)) - print("IR signal sent!") - pulseout.deinit() - - - - - - \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py deleted file mode 100644 index 33d556a90c..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/led.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -Led - -CircuitPython library for Led - MixGoCE -======================================================= - -Small Cabbage -20210721 -dahanzimin -20210423 -""" -import board -from pwmio import PWMOut - -class Led(object): #fix - def __init__(self, pin): - self.pin = PWMOut(pin, frequency=5000, duty_cycle=65535) - - def setbrightness(self, val): - self.pin.duty_cycle = 65535 - val - - def setonoff(self, val): - if val == 1: - self.pin.duty_cycle = 0 - elif val == 0: - self.pin.duty_cycle = 65535 - else: - self.pin.duty_cycle = 65535 - self.pin.duty_cycle - - def getonoff(self): - return (65535 - self.pin.duty_cycle) // 65535 - -led_L1 = Led(board.IO33) -led_L2 = Led(board.IO34) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py deleted file mode 100644 index 5d641ccbf3..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matcher.py +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Yoch -# -# SPDX-License-Identifier: EPL-1.0 - -""" -`matcher` -==================================================================================== - -MQTT topic filter matcher from the Eclipse Project's Paho.MQTT.Python -https://github.com/eclipse/paho.mqtt.python/blob/master/src/paho/mqtt/matcher.py -* Author(s): Yoch (https://github.com/yoch) -""" - - -class MQTTMatcher: - """Intended to manage topic filters including wildcards. - - Internally, MQTTMatcher use a prefix tree (trie) to store - values associated with filters, and has an iter_match() - method to iterate efficiently over all filters that match - some topic name. - """ - - # pylint: disable=too-few-public-methods - class Node: - """Individual node on the MQTT prefix tree.""" - - __slots__ = "children", "content" - - def __init__(self): - self.children = {} - self.content = None - - def __init__(self): - self._root = self.Node() - - def __setitem__(self, key, value): - """Add a topic filter :key to the prefix tree - and associate it to :value""" - node = self._root - for sym in key.split("/"): - node = node.children.setdefault(sym, self.Node()) - node.content = value - - def __getitem__(self, key): - """Retrieve the value associated with some topic filter :key""" - try: - node = self._root - for sym in key.split("/"): - node = node.children[sym] - if node.content is None: - raise KeyError(key) - return node.content - except KeyError: - raise KeyError(key) from None - - def __delitem__(self, key): - """Delete the value associated with some topic filter :key""" - lst = [] - try: - parent, node = None, self._root - for k in key.split("/"): - parent, node = node, node.children[k] - lst.append((parent, k, node)) - node.content = None - except KeyError: - raise KeyError(key) from None - else: # cleanup - for parent, k, node in reversed(lst): - if node.children or node.content is not None: - break - del parent.children[k] - - def iter_match(self, topic): - """Return an iterator on all values associated with filters - that match the :topic""" - lst = topic.split("/") - normal = not topic.startswith("$") - - def rec(node, i=0): - if i == len(lst): - if node.content is not None: - yield node.content - else: - part = lst[i] - if part in node.children: - for content in rec(node.children[part], i + 1): - yield content - if "+" in node.children and (normal or i > 0): - for content in rec(node.children["+"], i + 1): - yield content - if "#" in node.children and (normal or i > 0): - content = node.children["#"].content - if content is not None: - yield content - - return rec(self._root) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py deleted file mode 100644 index 5ff56ccb3b..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/matrix.py +++ /dev/null @@ -1,277 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2016 Radomir Dopieralski & Tony DiCola 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. - -""" -`adafruit_ht16k33.ht16k33` -=========================== - -* Authors: Radomir Dopieralski & Tony DiCola for Adafruit Industries - -""" -from adafruit_bus_device import i2c_device -from micropython import const - -__version__ = "0.0.0-auto.0" -__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git" - -_HT16K33_BLINK_CMD = const(0x80) -_HT16K33_BLINK_DISPLAYON = const(0x01) -_HT16K33_CMD_BRIGHTNESS = const(0xE0) -_HT16K33_OSCILATOR_ON = const(0x21) - - -class HT16K33: - """ - The base class for all displays. Contains common methods. - - :param int address: The I2C addess of the HT16K33. - :param bool auto_write: True if the display should immediately change when - set. If False, `show` must be called explicitly. - :param float brightness: 0.0 - 1.0 default brightness level. - """ - - def __init__(self, i2c, address=0x70, auto_write=True, brightness=1.0): - self.i2c_device = i2c_device.I2CDevice(i2c, address) - self._temp = bytearray(1) - self._buffer = bytearray(17) - self._auto_write = auto_write - self.fill(0) - self._write_cmd(_HT16K33_OSCILATOR_ON) - self._blink_rate = None - self._brightness = None - self.blink_rate = 0 - self.brightness = brightness - - def _write_cmd(self, byte): - self._temp[0] = byte - with self.i2c_device: - self.i2c_device.write(self._temp) - - @property - def blink_rate(self): - """The blink rate. Range 0-3.""" - return self._blink_rate - - @blink_rate.setter - def blink_rate(self, rate=None): - if not 0 <= rate <= 3: - raise ValueError("Blink rate must be an integer in the range: 0-3") - rate = rate & 0x03 - self._blink_rate = rate - self._write_cmd(_HT16K33_BLINK_CMD | _HT16K33_BLINK_DISPLAYON | rate << 1) - - @property - def brightness(self): - """The brightness. Range 0.0-1.0""" - return self._brightness - - @brightness.setter - def brightness(self, brightness): - if not 0.0 <= brightness <= 1.0: - raise ValueError( - "Brightness must be a decimal number in the range: 0.0-1.0" - ) - - self._brightness = brightness - xbright = round(15 * brightness) - xbright = xbright & 0x0F - self._write_cmd(_HT16K33_CMD_BRIGHTNESS | xbright) - - @property - def auto_write(self): - """Auto write updates to the display.""" - return self._auto_write - - @auto_write.setter - def auto_write(self, auto_write): - if isinstance(auto_write, bool): - self._auto_write = auto_write - else: - raise ValueError("Must set to either True or False.") - - def show(self): - """Refresh the display and show the changes.""" - with self.i2c_device: - # Byte 0 is 0x00, address of LED data register. The remaining 16 - # bytes are the display register data to set. - self.i2c_device.write(self._buffer) - - def fill(self, color): - """Fill the whole display with the given color.""" - fill = 0xFF if color else 0x00 - for i in range(16): - self._buffer[i + 1] = fill - if self._auto_write: - self.show() - - def _pixel(self, x, y, color=None): - addr = 2 * y + x // 8 - mask = 1 << x % 8 - if color is None: - return bool(self._buffer[addr + 1] & mask) - if color: - # set the bit - self._buffer[addr + 1] |= mask - else: - # clear the bit - self._buffer[addr + 1] &= ~mask - if self._auto_write: - self.show() - return None - - def _set_buffer(self, i, value): - self._buffer[i + 1] = value # Offset by 1 to move past register address. - - def _get_buffer(self, i): - return self._buffer[i + 1] # Offset by 1 to move past register address. - -class MatrixBackpack16x8(HT16K33): - """A single matrix.""" - - _columns = 16 - _rows = 8 - - def pixel(self, x, y, color=None): - """Get or set the color of a given pixel.""" - if not 0 <= x <= 15: - return None - if not 0 <= y <= 7: - return None - return super()._pixel(x, y, color) - - def __getitem__(self, key): - x, y = key - return self.pixel(x, y) - - def __setitem__(self, key, value): - x, y = key - self.pixel(x, y, value) - - # pylint: disable=too-many-branches - def shift(self, x, y, rotate=False): - """ - Shift pixels by x and y - - :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False) - """ - auto_write = self.auto_write - self._auto_write = False - if x > 0: # Shift Right - for _ in range(x): - for row in range(0, self.rows): - last_pixel = self[self.columns - 1, row] if rotate else 0 - for col in range(self.columns - 1, 0, -1): - self[col, row] = self[col - 1, row] - self[0, row] = last_pixel - elif x < 0: # Shift Left - for _ in range(-x): - for row in range(0, self.rows): - last_pixel = self[0, row] if rotate else 0 - for col in range(0, self.columns - 1): - self[col, row] = self[col + 1, row] - self[self.columns - 1, row] = last_pixel - if y > 0: # Shift Up - for _ in range(y): - for col in range(0, self.columns): - last_pixel = self[col, self.rows - 1] if rotate else 0 - for row in range(self.rows - 1, 0, -1): - self[col, row] = self[col, row - 1] - self[col, 0] = last_pixel - elif y < 0: # Shift Down - for _ in range(-y): - for col in range(0, self.columns): - last_pixel = self[col, 0] if rotate else 0 - for row in range(0, self.rows - 1): - self[col, row] = self[col, row + 1] - self[col, self.rows - 1] = last_pixel - self._auto_write = auto_write - if auto_write: - self.show() - - # pylint: enable=too-many-branches - - def shift_right(self, rotate=False): - """ - Shift all pixels right - - :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False) - """ - self.shift(1, 0, rotate) - - def shift_left(self, rotate=False): - """ - Shift all pixels left - - :param rotate: (Optional) Rotate the shifted pixels to the right side (default=False) - """ - self.shift(-1, 0, rotate) - - def shift_up(self, rotate=False): - """ - Shift all pixels up - - :param rotate: (Optional) Rotate the shifted pixels to bottom (default=False) - """ - self.shift(0, 1, rotate) - - def shift_down(self, rotate=False): - """ - Shift all pixels down - - :param rotate: (Optional) Rotate the shifted pixels to top (default=False) - """ - self.shift(0, -1, rotate) - - def image(self, img): - """Set buffer to value of Python Imaging Library image. The image should - be in 1 bit mode and a size equal to the display size.""" - imwidth, imheight = img.size - if imwidth != self.columns or imheight != self.rows: - raise ValueError( - "Image must be same dimensions as display ({0}x{1}).".format( - self.columns, self.rows - ) - ) - # Grab all the pixels from the image, faster than getpixel. - pixels = img.convert("1").load() - # Iterate through the pixels - for x in range(self.columns): # yes this double loop is slow, - for y in range(self.rows): # but these displays are small! - self.pixel(x, y, pixels[(x, y)]) - if self._auto_write: - self.show() - - @property - def columns(self): - """Read-only property for number of columns""" - return self._columns - - @property - def rows(self): - """Read-only property for number of rows""" - return self._rows - - - - - - diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py deleted file mode 100644 index 9042c5c814..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixgoce.py +++ /dev/null @@ -1,85 +0,0 @@ -# Paste mixgoce.py - -import board -from rtc import RTC -from busio import I2C - -def do_connect(username, password): - import wifi - from time import sleep - - wifi.radio.connect(ssid=username.encode(), password=password.encode()) - while not wifi.radio.ipv4_address: - sleep(0.1) - print("Wi-Fi connected!") - return wifi.radio - -rtc_clock = RTC() - -try: - i2c = I2C(board.IO41, board.IO42,frequency=400000) - while not i2c.try_lock(): - pass - if 0x6a in i2c.scan(): - version = 99 - elif 0x15 in i2c.scan(): - version = 1 - else: - version = 0 - - i2c.unlock() - - if version == 99: - i2c.deinit() - elif version:#new - import mxc6655xa - acc = mxc6655xa.MXC6655XA(i2c) - - def get_temperature(): - return acc.get_temperature() - else:#old - import msa301 - acc = msa301.MSA301(i2c) - -except Exception as e: - print(e) - -ADDITIONAL_TOPIC = 'b640a0ce465fa2a4150c36b305c1c11b' -WILL_TOPIC = '9d634e1a156dc0c1611eb4c3cff57276' - -def ntp(url='http://mixio.mixly.org/time.php'): - import ssl - import wifi - import socketpool - import adafruit_requests - #TEXT_URL = 'http://mixio.mixly.org/time.php' - #TEXT_URL = url - pool = socketpool.SocketPool(wifi.radio) - requests = adafruit_requests.Session(pool, ssl.create_default_context()) - # print("Fetching text from", TEXT_URL) - response = requests.get(url) - # print("-" * 40) - # print(tuple(response.text.split(","))) - # print("-" * 40) - return tuple(response.text.split(",")) - -def analyse_sharekey(url): - import ssl - import wifi - import socketpool - import adafruit_requests - import json - #TEXT_URL = 'http://mixio.mixly.org/time.php' - #TEXT_URL = url - pool = socketpool.SocketPool(wifi.radio) - requests = adafruit_requests.Session(pool, ssl.create_default_context()) - # print("Fetching text from", TEXT_URL) - response = requests.get(url) - # print("-" * 40) - # print(tuple(response.text.split(","))) - # print("-" * 40) - if response.text == '-1': - print('Invalid share key') - else: - result = json.loads(response.text) - return (result['0'], result['1'], result['2']) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py deleted file mode 100644 index 7aa9b9bc38..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mixpy.py +++ /dev/null @@ -1,84 +0,0 @@ -#coding=utf-8 -import math - -def math_map(v, al, ah, bl, bh): - if al==ah: - return bl - if al > ah: - al, ah = ah, al - if v > ah: - v = ah - if v < al: - v = al - return bl + (bh - bl) * (v - al) / (ah - al) - -def math_mean(myList): - localList = [e for e in myList if type(e) == int or type(e) == float] - if not localList: return - return float(sum(localList)) / len(localList) - -def math_median(myList): - localList = sorted([e for e in myList if type(e) == int or type(e) == float]) - if not localList: return - if len(localList) % 2 == 0: - return (localList[len(localList) // 2 - 1] + localList[len(localList) // 2]) / 2.0 - else: - return localList[(len(localList) - 1) // 2] - -def math_modes(some_list): - modes = [] - # Using a lists of [item, count] to keep count rather than dict - # to avoid "unhashable" errors when the counted item is itself a list or dict. - counts = [] - maxCount = 1 - for item in some_list: - found = False - for count in counts: - if count[0] == item: - count[1] += 1 - maxCount = max(maxCount, count[1]) - found = True - if not found: - counts.append([item, 1]) - for counted_item, item_count in counts: - if item_count == maxCount: - modes.append(counted_item) - return modes - -def math_standard_deviation(numbers): - n = len(numbers) - if n == 0: return - mean = float(sum(numbers)) / n - variance = sum((x - mean) ** 2 for x in numbers) / n - return math.sqrt(variance) - -def lists_sort(my_list, type, reverse): - def try_float(s): - try: - return float(s) - except: - return 0 - key_funcs = { - "NUMERIC": try_float, - "TEXT": str, - "IGNORE_CASE": lambda s: str(s).lower() - } - key_func = key_funcs[type] - list_cpy = list(my_list) - return sorted(list_cpy, key=key_func, reverse=reverse) - -def format_content(mydict, cid): - if 'lat' in mydict and 'long' in mydict: - res = '{'+'"lat": "{}", "long": "{}", "clientid": "{}"'.format(mydict.pop('lat'),mydict.pop('long'),cid) - if len(mydict)>0: - res += ', "message": [' - for d in mydict: - res += '{{"label": "{}", "value": "{}"}},'.format(d,mydict[d]) - res = res[:-1] + "]" - res += '}' - return res - else: - print('Invalid Input') - -def format_str(d): - return str(d).replace("'",'"') \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py deleted file mode 100644 index eb46f4862a..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mmatrix.py +++ /dev/null @@ -1,139 +0,0 @@ -""" -Matrix - -CircuitPython library for Matrix - MixGoCE -======================================================= - -Small Cabbage -20210721 -""" -import time -from mixgoce import i2c -from matrix import MatrixBackpack16x8 -from adafruit_framebuf import FrameBuffer,MVLSB - -buf = bytearray(16) -fb = FrameBuffer(buf, 16, 8, MVLSB) - -class MixGoMatrix(MatrixBackpack16x8): - - def show_dynamic(self, to_show, delay=200): - # self.fill(0) - if type(to_show)==str or type(to_show)==int: - for i in to_show: - fb.fill(0) - fb.text(i, 5, 0, color=1) - # turn all LEDs off - self.fill(0) - for x in range(16): - # using the FrameBuffer text result - bite = buf[x] - for y in range(8): - bit = 1 << y & bite - # if bit > 0 then set the pixel brightness - if bit: - self[x, y] = 1 - self.show() - if len(to_show)>1: - time.sleep(delay/1000) - elif type(to_show)==list or type(to_show)==tuple: - for i in to_show: - #if type(i)!=str and type(i)!=type(Image.HEART): - if type(i)!=str and type(i)!=type(bytearray(16)): - pass - for i in to_show: - self.show_dynamic(i) - time.sleep(delay/1000) - elif type(to_show)==type(bytearray(16)): - buf = to_show - # turn all LEDs off - self.fill(0) - # print(buf) - for x in range(16): - # using the FrameBuffer text result - bite = buf[x] - # print(bite,end=" ") - for y in range(8): - bit = 1 << y & bite - # if bit > 0 then set the pixel brightness - if bit: - self[x, y] = 1 - self.show() - - def scroll(self, text_to_show, delay=0): - for i in range(len(text_to_show) * 6 + 26): - fb.fill(0) - fb.text(text_to_show, -i + 16, 0, color=1) - # turn all LEDs off - self.fill(0) - for x in range(16): - # using the FrameBuffer text result - bite = buf[x] - for y in range(8): - bit = 1 << y & bite - # if bit > 0 then set the pixel brightness - if bit: - self[x, y] = 1 - self.show() - time.sleep(delay/1000) - - def show_static(self, text_to_show): - fb.fill(0) - if len(text_to_show)==2: - l = 3 - elif len(text_to_show)==1: - l = 5 - else: - l = 0 - fb.text(text_to_show, l, 0, color=1) - # turn all LEDs off - self.fill(0) - for x in range(16): - # using the FrameBuffer text result - bite = buf[x] - for y in range(8): - bit = 1 << y & bite - # if bit > 0 then set the pixel brightness - if bit: - self[x, y] = 1 - self.show() - - def set_brightness(self, val): - self.brightness = max(min(val, 1), 0) - - def get_brightness(self): - return self.brightness - - def set_pixel(self, x, y, val): - self[x, y] = val - self.show() - - def get_pixel(self, x, y): - return int(self[x, y]) - - def clear(self): - self.fill(0) - self.show() - - def up(self, times, rotate=False): - for i in range(times): - self.shift_down(rotate) - self.show() - - def down(self, times, rotate=False): - for i in range(times): - self.shift_up(rotate) - self.show() - - def left(self, times, rotate=False): - for i in range(times): - self.shift_left(rotate) - self.show() - - def right(self, times, rotate=False): - for i in range(times): - self.shift_right(rotate) - self.show() - -display = MixGoMatrix(i2c, auto_write=False, brightness=0.1) -display.clear() \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py deleted file mode 100644 index 141f5e15b0..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/msa301.py +++ /dev/null @@ -1,70 +0,0 @@ -""" -MSA301 - -CircuitPython library for the MSA301 Accelerometer -======================================================= - -dahanzimin -20210411 -mixly -""" -import time -import adafruit_bus_device.i2c_device as i2c_device -from micropython import const - -MSA301_ADDRESS = const(0x26) - -MSA301_REG_DEVICE_ID = const(0x01) -MSA301_REG_DATA = const(0x02) -MSA301_REG_ODR = const(0x10) -MSA301_REG_POWERMODE = const(0x11) -MSA301_REG_RESRANGE = const(0x0F) - - -_STANDARD_GRAVITY = 9.806 - -class MSA301: - - _BUFFER = bytearray(2) - data_reg = bytearray(6) - - def __init__(self, i2c_bus): - self._device = i2c_device.I2CDevice(i2c_bus, MSA301_ADDRESS) - if self._chip_id() != 0x13: - raise AttributeError("Cannot find a MSA301") - - self._write_u8(MSA301_REG_ODR,0X09) #RATE_500_HZ - self._write_u8(MSA301_REG_POWERMODE,0X12) #NORMAL & WIDTH_250_HZ - self._write_u8(MSA301_REG_RESRANGE,0X02) #RESOLUTION_14_BIT & RANGE_8_G - - def _read_u8(self, address): - # Read an 8-bit unsigned value from the specified 8-bit address. - with self._device: - self._BUFFER[0] = address & 0xFF - self._device.write(self._BUFFER, end=1) - self._device.readinto(self._BUFFER, end=1) - return self._BUFFER[0] - - def _write_u8(self, address, val): - # Write an 8-bit unsigned value to the specified 8-bit address. - with self._device: - self._BUFFER[0] = address & 0xFF - self._BUFFER[1] = val & 0xFF - self._device.write(self._BUFFER, end=2) - - def _chip_id(self): - return self._read_u8(MSA301_REG_DEVICE_ID) - - def u2s(self,n): - return n if n < (1 << 7) else n - (1 << 8) - - @property - def acceleration(self): - for i in range(0,6): - self.data_reg[i]=self._read_u8(MSA301_REG_DATA+i) - x_acc=((self.u2s(self.data_reg[1])<<8|self.data_reg[0])>>2)/1024.0 - y_acc=((self.u2s(self.data_reg[3])<<8|self.data_reg[2])>>2)/1024.0 - z_acc=((self.u2s(self.data_reg[5])<<8|self.data_reg[4])>>2)/1024.0 - return (-y_acc,-x_acc,z_acc) - - diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py deleted file mode 100644 index fbf7f1a4ea..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/music.py +++ /dev/null @@ -1,102 +0,0 @@ -""" -Music - -CircuitPython library for Music - MixGoCE -======================================================= - -Small Cabbage -20210721 -""" - - -import time -from mixgoce import version - -class Music: - def __init__(self, pin, duration='4', octave='6', tempo='63'): - import pwmio - self.pin = pin - self.pwm = pwmio.PWMOut(pin, duty_cycle=0, variable_frequency=True) - self.duration = duration - self.octave = octave - self.tempo = tempo - - def set_duration(self, duration='4'): - self.duration = duration - - def set_octave(self, octave='6'): - self.octave = octave - - def sef_tempo(self, tempo='63'): - self.tempo = tempo - - def set_duration_tempo(self, duration, tempo):#这项等于原来的set_tempo - self.duration = duration - self.tempo = tempo - - def reset(self): - self.set_duration() - self.set_octave() - self.set_tempo() - - def get_duration(self): - return self.duration - - def get_octave(self): - return self.octave - - def get_tempo(self): - return (self.tempo) - - def play_demo(self, demo): - import adafruit_rtttl - if self.pwm: - self.pwm.deinit() - adafruit_rtttl.play(self.pin, demo) - - def play_demo_print(self, demo): - import adafruit_rtttl - if self.pwm: - self.pwm.deinit() - adafruit_rtttl.play(self.pin, demo) - _, defaults, tune = demo.lower().split(":") - print(tune) - - def play(self, note, duration=None): - import pwmio - if self.pwm: - self.pwm.deinit() - self.pwm = pwmio.PWMOut(self.pin, duty_cycle=0, variable_frequency=True) - self.pwm.frequency = int(note) - self.pwm.duty_cycle = 2 ** 15 - if duration: - # print(1) - time.sleep(duration/1000) - self.pwm.duty_cycle = 0 - - def stop(self): - self.pwm.duty_cycle = 0 - self.pwm.deinit() - -BA_DING = "itchy:d=4,o=4,b=300:4b5,2g5" -JUMP_UP = "itchy:d=4,o=5,b=300:c,d,e,f,g" -JUMP_DOWN = "itchy:d=4,o=5,b=300:g,f,e,d,c" -POWER_UP = "itchy:d=4,o=4,b=300:4g4,4c5,4e5,2g5,4e5,1g5" -POWER_DOWN = "itchy:d=4,o=4,b=300:4g5,4d#5,4c5,2g4,4b4,1c5" -DADADADUM = "itchy:d=4,o=4,b=200:2p,g,g,g,1d#,p,f,f,f,1d" -#ENTERTAINER = "itchy:d=4,o=4,b=300:4d4,d#4,e4,2c5,4e4,2c5,4e4,1c5,c5,d5,d#5,e5,c5,d5,2e5,b4,2d5,1c5" -BIRTHDAY = "itchy:d=4,o=4,b=180:6c,12c,4d,4c,4f,2e,6c,12c,4d,4c,4g,2f,6c,12c,4c5,4a,4f,4e,4d,6a#,12a#,4a,4f,4g,2f" -#BLUES = "itchy:d=4,o=4,b=400:2c,4e,4g,4a,4a#,4a,4g,4e,2c,4e,4g,4a,4a#,4a,4g,4e,4f,4a,2c,4d,4d#,4d,4c,4a,2c,4e,4g,4a,4a#,4a,4g,4e,4g,4b,4d,4f,4f,4a,4c,4d#,2c,e,g,e,g,f,e,d" -#PYTHON = "itchy:d=4,o=4,b=380:d5,4b4,p,b4,b4,a#4,b4,g5,p,d5,d5,r,b4,c5,p,c5,c5,p,d5,1e5,p,c5,a4,p,a4,a4,g#4,a4,f#5,p,e5,e5,p,c5,b4,p,b4,b4,p,c5,1d5,p,d5,4b4,p,b4,b4,a#4,b4,b5,p,g5,g5,p,d5,c#5,p,a5,a5,p,a5,1a5,p,g5,f#5,p,a5,a5,g#5,a5,e5,p,a5,a5,g#5,a5,d5,p,c#5,d5,p,c#5,2d5,3p" - -import board - -if version:#new - buzzer = Music(board.IO40) -else:#old - from digitalio import DigitalInOut, Direction - - buzzer = Music(board.IO17) - spk_en = DigitalInOut(board.IO40) - spk_en.direction = Direction.OUTPUT - spk_en.value = True \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py deleted file mode 100644 index 0a5c83dbe0..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/mxc6655xa.py +++ /dev/null @@ -1,80 +0,0 @@ -""" -MXC6655XA - -CircuitPython library for the MXC6655XA Accelerometer -======================================================= - -dahanzimin -20210411 -mixly -""" -import time -import adafruit_bus_device.i2c_device as i2c_device -from micropython import const - -MXC6655XA_ADDRESS = const(0x15) - -MXC6655XA_REG_DATA = const(0x03) -MXC6655XA_REG_CTRL = const(0x0D) -MXC6655XA_REG_DEVICE_ID = const(0x0E) - -MXC6655XA_CMD_8G_POWER_ON = const(0x40) -MXC6655XA_CMD_4G_POWER_ON = const(0x20) -MXC6655XA_CMD_2G_POWER_ON = const(0x00) - -MXC6655XA_2G_SENSITIVITY =1024 -MXC6655XA_4G_SENSITIVITY =512 -MXC6655XA_8G_SENSITIVITY =256 -MXC6655XA_T_ZERO =25 -MXC6655XA_T_SENSITIVITY =0.586 - -class MXC6655XA: - - _BUFFER = bytearray(2) - data_reg = bytearray(7) - - def __init__(self, i2c_bus): - self._device = i2c_device.I2CDevice(i2c_bus, MXC6655XA_ADDRESS) - if self._chip_id() != 0x02: - raise AttributeError("Cannot find a MXC6655XA") - self._Enable() #star - time.sleep(0.3) - self.range = MXC6655XA_8G_SENSITIVITY #SET 8g range - - def _read_u8(self, address): - # Read an 8-bit unsigned value from the specified 8-bit address. - with self._device: - self._BUFFER[0] = address & 0xFF - self._device.write(self._BUFFER, end=1) - self._device.readinto(self._BUFFER, end=1) - return self._BUFFER[0] - - def _write_u8(self, address, val): - # Write an 8-bit unsigned value to the specified 8-bit address. - with self._device: - self._BUFFER[0] = address & 0xFF - self._BUFFER[1] = val & 0xFF - self._device.write(self._BUFFER, end=2) - - def _chip_id(self): - return self._read_u8(MXC6655XA_REG_DEVICE_ID) - - def _Enable(self): - self._write_u8(MXC6655XA_REG_CTRL,MXC6655XA_CMD_8G_POWER_ON) - - def u2s(self,n): - return n if n < (1 << 7) else n - (1 << 8) - - @property - def acceleration(self): - for i in range(0,6): - self.data_reg[i]=self._read_u8(MXC6655XA_REG_DATA+i) - x_acc=float((self.u2s(self.data_reg[0])<<8|self.data_reg[1])>>4)/self.range - y_acc=float((self.u2s(self.data_reg[2])<<8|self.data_reg[3])>>4)/self.range - z_acc=float((self.u2s(self.data_reg[4])<<8|self.data_reg[5])>>4)/self.range - #t_acc=float(self.u2s(self.data_reg[6]))*MXC6655XA_T_SENSITIVITY + MXC6655XA_T_ZERO - return (-y_acc,-x_acc,z_acc) - - def get_temperature(self): - t_acc=float(self.u2s(self._read_u8(MXC6655XA_REG_DATA+6)))*MXC6655XA_T_SENSITIVITY + MXC6655XA_T_ZERO - return round(t_acc,1) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py deleted file mode 100644 index f51055e510..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/pixels.py +++ /dev/null @@ -1,71 +0,0 @@ -""" -RGB - -CircuitPython library for RGB - MixGoCE -======================================================= - -Small Cabbage -20210721 -""" - - -import time -import board -import neopixel - -def wheel(pos): - # Input a value 0 to 255 to get a color value. - # The colours are a transition r - g - b - back to r. - if pos < 0 or pos > 255: - return (0, 0, 0) - if pos < 85: - return (255 - pos * 3, pos * 3, 0) - if pos < 170: - pos -= 85 - return (0, 255 - pos * 3, pos * 3) - pos -= 170 - return (pos * 3, 0, 255 - pos * 3) - - -class RGB(object): - def __init__(self,pin=board.IO8,num=4,flag="RGB"): - self.pin = pin - self.num = num - self.pixels = neopixel.NeoPixel(pin, num, brightness=0.3, auto_write=False, pixel_order = flag) - - def show_all(self, R, G, B): - color = (R, G, B) - self.pixels.fill(color) - - def show_one(self, index, R, G, B): - color = (R, G, B) - self.pixels[index - 1] = color - - def write(self): - self.pixels.show() - - def color_chase(self, R, G, B, wait): - color = (R, G, B) - for i in range(self.num): - self.pixels[i] = color - time.sleep(wait/1000) - self.pixels.show() - - def rainbow_cycle(self, wait): - for j in range(255): - for i in range(self.num): - rc_index = (i * 256 // self.num) + j - self.pixels[i] = wheel(rc_index & 255) - self.pixels.show() - time.sleep(wait/1000/256) - - def change_mod(self,flag): - import time - if flag in ("RGB","GRB"): - self.pixels.deinit() - time.sleep(0.1) - self.pixels = neopixel.NeoPixel(self.pin, self.num, brightness=0.3, auto_write=False, pixel_order = flag) - -rgb = RGB() -rgb.show_all(0,0,0) -rgb.write() \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py deleted file mode 100644 index 56d6465201..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/sensor.py +++ /dev/null @@ -1,55 +0,0 @@ -""" -Analog Sensor - -CircuitPython library for Analog Sensor - MixGoCE -======================================================= - -Small Cabbage -20210721 -dahanzimin -20210423 -""" -from mixgoce import version - -class ADCSensor: - import board - __pins=[board.IO13,board.IO15,board.IO16] - __species = {} - __first_init = True - def __new__(cls, pin, *args, **kwargs): - if pin not in cls.__species.keys(): - cls.__first_init = True - cls.__species[pin]=object.__new__(cls) - return cls.__species[pin] - - def __init__(self,pin): - from analogio import AnalogIn - if self.__first_init: - self.__first_init = False - self.pin = AnalogIn(self.__pins[pin]) - - def read(self): - return self.pin.value - -def get_brightness(): - return ADCSensor(1).read() - -def get_soundlevel(): #fix - value_d= [] - for _ in range(5): - values = [] - for _ in range(5): - val = ADCSensor(0).read() - values.append(val) - value_d.append(max(values) - min(values)) - return max(value_d) - - -if version:#new - from mixgoce import acc - def get_temperature(): - return acc.get_temperature() -else:#old - def get_temperature(): - adc_val = ADCSensor(2).read() - return adc_val * 3.9 / 5900 \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py b/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py deleted file mode 100644 index 1aa9b78c6b..0000000000 --- a/ports/espressif/boards/mixgo_ce_udisk/mixgoce_lib/touchpad.py +++ /dev/null @@ -1,25 +0,0 @@ -""" -TouchPad - -CircuitPython library for TouchPad - MixGoCE -======================================================= - -Small Cabbage -20210721 -dahanzimin -20210423 -""" -import board -from touchio import TouchIn -class TouchPad(): - def __init__(self,pin,v=18000): - self.pin = TouchIn(pin) - self.v = v - - def is_touched(self): - return self.pin.raw_value > self.v - -touch_T1 = TouchPad(board.IO4) -touch_T2 = TouchPad(board.IO5) -touch_T3 = TouchPad(board.IO6) -touch_T4 = TouchPad(board.IO7) \ No newline at end of file diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index dbd55bc52a..99c623985e 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -20,5 +20,5 @@ CIRCUITPY_MODULE=wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += boards/$(BOARD)/mixgoce_lib +FROZEN_MPY_DIRS += boards/$(BOARD)/cp_lib/mixgoce_lib From 71f65317c498c5df5ba4314aa84ed30d8b74b485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Fri, 20 May 2022 10:37:55 +0800 Subject: [PATCH 0329/2403] Repair No newline at end of file --- .gitmodules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c91fdc2811..6293345f1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -291,4 +291,5 @@ url = https://github.com/pypewpew/pew-pewpew-lcd.git [submodule "ports/espressif/boards/mixgo_ce_udisk/cp_lib"] path = ports/espressif/boards/mixgo_ce_udisk/cp_lib - url = https://github.com/dahanzimin/circuitpython_lib.git \ No newline at end of file + url = https://github.com/dahanzimin/circuitpython_lib.git + From 73f2621cda29e56545bc979727ecc83d8a271592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Fri, 20 May 2022 10:38:14 +0800 Subject: [PATCH 0330/2403] Repair No newline at end of file --- ports/espressif/boards/mixgo_ce_udisk/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/mixgo_ce_udisk/board.c b/ports/espressif/boards/mixgo_ce_udisk/board.c index bf5980e627..0432485111 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/board.c +++ b/ports/espressif/boards/mixgo_ce_udisk/board.c @@ -45,4 +45,4 @@ void reset_board(void) { } void board_deinit(void) { -} \ No newline at end of file +} From 4356a125048dccbd93d195210faecabd019e169c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Fri, 20 May 2022 10:55:23 +0800 Subject: [PATCH 0331/2403] Update mpconfigboard.mk --- ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index 99c623985e..5d201ba73d 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -21,4 +21,3 @@ CIRCUITPY_MODULE=wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += boards/$(BOARD)/cp_lib/mixgoce_lib - From d744939c6c2ab6d8a63afdb97f746c0aa18e3b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Fri, 20 May 2022 11:06:48 +0800 Subject: [PATCH 0333/2403] Fix End of Files --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6293345f1e..542f15d327 100644 --- a/.gitmodules +++ b/.gitmodules @@ -292,4 +292,3 @@ [submodule "ports/espressif/boards/mixgo_ce_udisk/cp_lib"] path = ports/espressif/boards/mixgo_ce_udisk/cp_lib url = https://github.com/dahanzimin/circuitpython_lib.git - From 3c20b5f95f4fd7e656193072ba97378360a6655f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 20 May 2022 00:04:49 -0400 Subject: [PATCH 0334/2403] use validator in mimx UART constructor --- ports/mimxrt10xx/common-hal/busio/UART.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 8615002811..9f801a2f65 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -113,12 +113,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, bool sigint_enabled) { self->baudrate = baudrate; - self->character_bits = bits; + self->character_bits = (uint8_t)mp_arg_validate_int_range(self->character_bits, 7, 8, MP_QSTR_bits); self->timeout_ms = timeout * 1000; - if (self->character_bits != 7 && self->character_bits != 8) { - mp_arg_validate_int_range(self->character_bits, 7, 8, MP_QSTR_bits); - } DBGPrintf(&mp_plat_print, "uart_construct: tx:%p rx:%p rts:%p cts:%p rs485:%p\n", tx, rx, rts, cts, rs485_dir); From f63b26c534c83216de01d3363343b9fad17beafa Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 20 May 2022 10:10:55 -0400 Subject: [PATCH 0335/2403] address jepler's comments and further squeezes --- locale/circuitpython.pot | 131 +++++++----------- .../common-hal/alarm/pin/PinAlarm.c | 2 +- .../atmel-samd/common-hal/audiobusio/I2SOut.c | 6 +- .../atmel-samd/common-hal/audiobusio/PDMIn.c | 4 +- .../atmel-samd/common-hal/audioio/AudioOut.c | 7 +- ports/atmel-samd/common-hal/busio/I2C.c | 2 +- ports/atmel-samd/common-hal/busio/UART.c | 4 +- .../imagecapture/ParallelImageCapture.c | 6 +- ports/atmel-samd/common-hal/pulseio/PulseIn.c | 1 + ports/cxd56/common-hal/busio/I2C.c | 2 +- ports/cxd56/common-hal/busio/UART.c | 4 +- ports/cxd56/common-hal/camera/Camera.c | 4 +- ports/cxd56/common-hal/gnss/GNSS.c | 2 +- ports/cxd56/common-hal/sdioio/SDCard.c | 2 +- ports/espressif/common-hal/busio/I2C.c | 2 +- ports/espressif/common-hal/busio/UART.c | 7 +- ports/mimxrt10xx/common-hal/busio/UART.c | 8 +- .../raspberrypi/common-hal/pulseio/PulseIn.c | 2 +- ports/stm/common-hal/analogio/AnalogIn.c | 4 +- ports/stm/common-hal/busio/I2C.c | 4 +- ports/stm/common-hal/busio/SPI.c | 2 +- ports/stm/common-hal/busio/UART.c | 14 +- ports/stm/common-hal/canio/CAN.c | 4 +- ports/stm/common-hal/pwmio/PWMOut.c | 6 +- py/argcheck.c | 8 ++ py/runtime.h | 1 + shared-bindings/microcontroller/Pin.c | 4 + shared-bindings/microcontroller/Pin.h | 1 + shared-bindings/sdioio/SDCard.c | 2 +- shared-module/bitbangio/SPI.c | 4 +- 30 files changed, 118 insertions(+), 132 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index fdd4d09887..1737dba2b7 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -80,6 +80,10 @@ msgstr "" msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -179,9 +183,9 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c -#: ports/stm/common-hal/pulseio/PulseIn.c shared-bindings/canio/Match.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c +#: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -646,6 +650,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -693,18 +701,10 @@ msgstr "" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "" @@ -752,10 +752,6 @@ msgstr "" msgid "Cannot wake on pin edge. Only level." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin" -msgstr "" - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "" @@ -786,28 +782,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c ports/cxd56/common-hal/gnss/GNSS.c -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize %q" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -1038,6 +1012,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1182,12 +1160,7 @@ msgstr "" msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c -#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c -#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" @@ -1208,8 +1181,7 @@ msgstr "" msgid "Invalid MAC address" msgstr "" -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c ports/espressif/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1235,15 +1207,7 @@ msgstr "" msgid "Invalid multicast MAC address" msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "" - -#: ports/espressif/common-hal/busio/UART.c shared-bindings/busio/UART.c +#: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" @@ -1412,7 +1376,7 @@ msgstr "" msgid "No MISO Pin" msgstr "" -#: ports/stm/common-hal/busio/SPI.c +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" msgstr "" @@ -1421,7 +1385,7 @@ msgstr "" msgid "No MOSI Pin" msgstr "" -#: ports/stm/common-hal/busio/SPI.c +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" msgstr "" @@ -1658,6 +1622,10 @@ msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1678,10 +1646,6 @@ msgstr "" msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -msgid "Pin cannot wake from deep sleep" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" @@ -1777,7 +1741,8 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1790,11 +1755,6 @@ msgstr "" msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -1844,6 +1804,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -1867,7 +1831,7 @@ msgid "SPI peripheral in use" msgstr "" #: ports/stm/common-hal/busio/SPI.c -msgid "SPI re-initialization error" +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2062,19 +2026,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART de-init error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2211,10 +2176,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/cxd56/common-hal/busio/I2C.c ports/espressif/common-hal/busio/UART.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2227,10 +2188,6 @@ msgstr "" msgid "Unsupported format" msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported frequency" -msgstr "" - #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -2671,6 +2628,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3107,6 +3068,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -4025,6 +3990,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c index b771c5b998..9289a66a87 100644 --- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c +++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c @@ -261,7 +261,7 @@ static void pinalarm_set_alarms_deep(size_t n_alarms, const mp_obj_t *alarms) { } } if (t->n < 0) { - mp_raise_ValueError(translate("Pin cannot wake from deep sleep")); + raise_ValueError_invalid_pin(); } // It is strange, but to my experiment, interrupt during sleep diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c index f5531f2bab..eb98cc8d27 100644 --- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c +++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c @@ -151,16 +151,16 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, } #endif if (bc_clock_unit == 0xff) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_bit_clock); + raise_ValueError_invalid_pin_name(MP_QSTR_clock); } if (ws_clock_unit == 0xff) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_word_select); + raise_ValueError_invalid_pin_name(MP_QSTR_word_select); } if (bc_clock_unit != ws_clock_unit) { mp_raise_ValueError(translate("Bit clock and word select must share a clock unit")); } if (serializer == 0xff) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data); + raise_ValueError_invalid_pin_name(MP_QSTR_data); } self->clock_unit = ws_clock_unit; self->serializer = serializer; diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c index e7c00901bf..c3bdd95793 100644 --- a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c +++ b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c @@ -121,7 +121,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self, self->clock_unit = 1; #endif } else { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_clock); + raise_ValueError_invalid_pin_name(MP_QSTR_clock); } self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1 @@ -152,7 +152,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self, self->serializer = 1; #endif } else { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data); + raise_ValueError_invalid_pin_name(MP_QSTR_data); } if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) { diff --git a/ports/atmel-samd/common-hal/audioio/AudioOut.c b/ports/atmel-samd/common-hal/audioio/AudioOut.c index 87a6ee62ad..1e1eb80e9c 100644 --- a/ports/atmel-samd/common-hal/audioio/AudioOut.c +++ b/ports/atmel-samd/common-hal/audioio/AudioOut.c @@ -143,13 +143,14 @@ void common_hal_audioio_audioout_construct(audioio_audioout_obj_t *self, #ifdef SAM_D5X_E5X self->right_channel = NULL; if (left_channel != &pin_PA02 && left_channel != &pin_PA05) { - mp_raise_ValueError(translate("Invalid pin for left channel")); + raise_ValueError_invalid_pin_name(MP_QSTR_left_channel); } if (right_channel != NULL && right_channel != &pin_PA02 && right_channel != &pin_PA05) { - mp_raise_ValueError(translate("Invalid pin for right channel")); + raise_ValueError_invalid_pin_name(MP_QSTR_right_channel); } if (right_channel == left_channel) { - mp_raise_ValueError(translate("Cannot output both channels on the same pin")); + mp_raise_ValueError_varg(translate("%q and %q must be different"), + MP_QSTR_left_channel, MP_QSTR_right_channel); } claim_pin(left_channel); if (right_channel != NULL) { diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c index 4124faff4a..c539cc3abc 100644 --- a/ports/atmel-samd/common-hal/busio/I2C.c +++ b/ports/atmel-samd/common-hal/busio/I2C.c @@ -128,7 +128,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, reset_pin_number(sda->number); reset_pin_number(scl->number); common_hal_busio_i2c_deinit(self); - mp_raise_ValueError(translate("Unsupported frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } self->sda_pin = sda->number; diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index 0af363ae44..510ce087df 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -77,7 +77,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->tx_pin = NO_PIN; if ((rts != NULL) || (cts != NULL) || (rs485_dir != NULL) || (rs485_invert)) { - mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device")); + mp_raise_NotImplementedError(translate("RS485")); } mp_arg_validate_int_max(bits, 8, MP_QSTR_bits); @@ -183,7 +183,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } if (usart_async_init(usart_desc_p, sercom, self->buffer, self->buffer_length, NULL) != ERR_NONE) { - mp_raise_ValueError(translate("Could not initialize UART")); + mp_raise_RuntimeError(translate("UART init")); } // usart_async_init() sets a number of defaults based on a prototypical SERCOM diff --git a/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c b/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c index 1f23b27590..c86ffb8d65 100644 --- a/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c @@ -66,13 +66,13 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle mp_arg_error_invalid(MP_QSTR_datacount); } if (vertical_sync && vertical_sync->number != PIN_PCC_DEN1) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_vsync); + raise_ValueError_invalid_pin_name(MP_QSTR_vsync); } if (horizontal_reference && horizontal_reference->number != PIN_PCC_DEN2) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_href); + raise_ValueError_invalid_pin_name(MP_QSTR_href); } if (data_clock->number != PIN_PCC_CLK) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data_clock); + raise_ValueError_invalid_pin_name(MP_QSTR_data_clock); } // technically, 0 was validated as free already but check again for (int i = 0; i < data_count; i++) { diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c index 4f00fac027..8cc455c958 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseIn.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseIn.c @@ -352,6 +352,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_ } if (index < 0 || index >= self->len) { common_hal_mcu_enable_interrupts(); + // Can't use mp_arg_validate_index_range() here due to the critical section. mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; diff --git a/ports/cxd56/common-hal/busio/I2C.c b/ports/cxd56/common-hal/busio/I2C.c index ad85860a9d..07d9024a51 100644 --- a/ports/cxd56/common-hal/busio/I2C.c +++ b/ports/cxd56/common-hal/busio/I2C.c @@ -37,7 +37,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) { if (frequency != I2C_SPEED_STANDARD && frequency != I2C_SPEED_FAST) { - mp_raise_ValueError(translate("Unsupported baudrate")); + mp_arg_error_invalid(MP_QSTR_frequency); } if (scl->number != PIN_I2C0_BCK || sda->number != PIN_I2C0_BDT) { diff --git a/ports/cxd56/common-hal/busio/UART.c b/ports/cxd56/common-hal/busio/UART.c index 735d0a3e40..aafc0b790e 100644 --- a/ports/cxd56/common-hal/busio/UART.c +++ b/ports/cxd56/common-hal/busio/UART.c @@ -66,7 +66,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, struct termios tio; if ((rts != NULL) || (cts != NULL) || (rs485_dir != NULL) || (rs485_invert)) { - mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device")); + mp_raise_NotImplementedError(translate("RS485")); } mp_arg_validate_int(bits, 8, MP_QSTR_bits); @@ -90,7 +90,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, if (busio_uart_dev[self->number].fd < 0) { busio_uart_dev[self->number].fd = open(busio_uart_dev[self->number].devpath, O_RDWR); if (busio_uart_dev[self->number].fd < 0) { - mp_raise_ValueError(translate("Could not initialize UART")); + mp_raise_RuntimeError(translate("UART init")); } // Wait to make sure the UART is ready diff --git a/ports/cxd56/common-hal/camera/Camera.c b/ports/cxd56/common-hal/camera/Camera.c index 7471b12af7..f304ed8f74 100644 --- a/ports/cxd56/common-hal/camera/Camera.c +++ b/ports/cxd56/common-hal/camera/Camera.c @@ -121,11 +121,11 @@ static void camera_start_preview() { void common_hal_camera_construct(camera_obj_t *self) { if (camera_dev.fd < 0) { if (video_initialize(camera_dev.devpath) < 0) { - mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_Camera); + mp_raise_RuntimeError(translate("Camera init")); } camera_dev.fd = open(camera_dev.devpath, 0); if (camera_dev.fd < 0) { - mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_Camera); + mp_raise_RuntimeError(translate("Camera init")); } } diff --git a/ports/cxd56/common-hal/gnss/GNSS.c b/ports/cxd56/common-hal/gnss/GNSS.c index 11b83d07b1..977d2e9b4b 100644 --- a/ports/cxd56/common-hal/gnss/GNSS.c +++ b/ports/cxd56/common-hal/gnss/GNSS.c @@ -56,7 +56,7 @@ void common_hal_gnss_construct(gnss_obj_t *self, unsigned long selection) { if (gnss_dev.fd < 0) { gnss_dev.fd = open(gnss_dev.devpath, O_RDONLY); if (gnss_dev.fd < 0) { - mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_GNSS); + mp_raise_RuntimeError(translate("GNSS init")); } } diff --git a/ports/cxd56/common-hal/sdioio/SDCard.c b/ports/cxd56/common-hal/sdioio/SDCard.c index c86e052ea5..e8e5df4687 100644 --- a/ports/cxd56/common-hal/sdioio/SDCard.c +++ b/ports/cxd56/common-hal/sdioio/SDCard.c @@ -59,7 +59,7 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, } if (open_blockdriver("/dev/mmcsd0", 0, &self->inode) < 0) { - mp_raise_ValueError_varg(translate("Could not initialize %q"), MP_QSTR_SDCard); + mp_raise_RuntimeError(translate("SDCard init")); } self->inode->u.i_bops->geometry(self->inode, &geo); diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c index 5af9e8a4dc..23906fe2d2 100644 --- a/ports/espressif/common-hal/busio/I2C.c +++ b/ports/espressif/common-hal/busio/I2C.c @@ -113,7 +113,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, if (err == ESP_FAIL) { mp_raise_OSError(MP_EIO); } else { - mp_raise_ValueError(translate("Invalid argument")); + mp_raise_RuntimeError(translate("init I2C")); } } diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 9d0fd1dbf7..27323fecf4 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -25,6 +25,7 @@ */ #include "shared-bindings/microcontroller/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/busio/UART.h" #include "components/driver/include/driver/uart.h" @@ -156,7 +157,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // Install the driver before we change the settings. if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK || uart_set_mode(self->uart_num, mode) != ESP_OK) { - mp_raise_ValueError(translate("Could not initialize UART")); + mp_raise_RuntimeError(translate("UART init")); } // On the debug uart, enable pattern detection to look for CTRL+C #ifdef CIRCUITPY_DEBUG_UART_RX @@ -263,7 +264,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, rts_num = rs485_dir->number; } if (uart_set_pin(self->uart_num, tx_num, rx_num, rts_num, cts_num) != ESP_OK) { - mp_raise_ValueError(translate("Invalid pins")); + raise_ValueError_invalid_pins(); } } @@ -374,7 +375,7 @@ uint32_t common_hal_busio_uart_get_baudrate(busio_uart_obj_t *self) { void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrate) { if (baudrate > UART_BITRATE_MAX || uart_set_baudrate(self->uart_num, baudrate) != ESP_OK) { - mp_raise_ValueError(translate("Unsupported baudrate")); + mp_arg_error_invalid(MP_QSTR_baudrate); } } diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 9f801a2f65..20430c91c8 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -183,10 +183,10 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } if (rx && !rx_config) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RX); + raise_ValueError_invalid_pin_name(MP_QSTR_rx); } if (tx && !tx_config) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_TX); + raise_ValueError_invalid_pin_name(MP_QSTR_tx); } if (uart_taken) { @@ -233,7 +233,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } } if ((rts != NULL) && (rts_config == NULL)) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RTS); + raise_ValueError_invalid_pin_name(MP_QSTR_rts); } } @@ -247,7 +247,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } } if (cts_config == NULL) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_CTS); + raise_ValueError_invalid_pin_name(MP_QSTR_cts); } } diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 97c2b03f7b..71633fcef7 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -237,7 +237,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, index += self->len; } if (index < 0 || index >= self->len) { - mp_raise_IndexError_varg(translate("%q out of range"), MP_QSTR_index); + mp_arg_validate_index_range(index, 0, self->len, MP_QSTR_index); } uint16_t value = self->buffer[(self->start + index) % self->maxlen]; return value; diff --git a/ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm/common-hal/analogio/AnalogIn.c index c943ce0901..3079816e01 100644 --- a/ports/stm/common-hal/analogio/AnalogIn.c +++ b/ports/stm/common-hal/analogio/AnalogIn.c @@ -65,7 +65,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC3); #endif } else { - mp_raise_ValueError(translate("Invalid ADC Unit value")); + mp_raise_RuntimeError(translate("Invalid ADC Unit value")); } common_hal_mcu_pin_claim(pin); self->pin = pin; @@ -147,7 +147,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { ADCx = ADC3; #endif } else { - mp_raise_ValueError(translate("Invalid ADC Unit value")); + mp_raise_RuntimeError(translate("Invalid ADC Unit value")); } LL_GPIO_SetPinMode(pin_port(self->pin->port), (uint32_t)pin_mask(self->pin->number), LL_GPIO_MODE_ANALOG); diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c index 3ca8249660..3ff437c803 100644 --- a/ports/stm/common-hal/busio/I2C.c +++ b/ports/stm/common-hal/busio/I2C.c @@ -120,7 +120,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, if (i2c_taken) { mp_raise_ValueError(translate("Hardware busy, try alternative pins")); } else { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_I2C); + raise_ValueError_invalid_pins(); } } @@ -155,7 +155,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, } else if (frequency == 100000) { self->handle.Init.Timing = CPY_I2CSTANDARD_TIMINGR; } else { - mp_raise_ValueError(translate("Unsupported frequency")); + mp_arg_error_invalid(MP_QSTR_frequency); } #else self->handle.Init.ClockSpeed = frequency; diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index fb782daad4..f772cdeec0 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -306,7 +306,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self, get_busclock(self->handle.Instance)); if (HAL_SPI_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("SPI re-initialization error")); + mp_raise_RuntimeError(translate("SPI re-init")); } self->baudrate = baudrate; diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c index 2347c079e8..d3fdb83c88 100644 --- a/ports/stm/common-hal/busio/UART.c +++ b/ports/stm/common-hal/busio/UART.c @@ -93,7 +93,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, uint8_t periph_index = 0; // origin 0 corrected if ((rts != NULL) || (cts != NULL) || (rs485_dir != NULL) || (rs485_invert == true)) { - mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device")); + mp_raise_NotImplementedError(translate("RS485")); } // Can have both pins, or either @@ -168,7 +168,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, mp_arg_validate_int_range(bits, 8, 9, MP_QSTR_bits); if (USARTx == NULL) { // this can only be hit if the periph file is wrong - mp_raise_ValueError(translate("Internal define error")); + mp_raise_RuntimeError(translate("Internal define error")); } // GPIO Init @@ -208,7 +208,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->handle.Init.HwFlowCtl = UART_HWCONTROL_NONE; self->handle.Init.OverSampling = UART_OVERSAMPLING_16; if (HAL_UART_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART init error")); + mp_raise_RuntimeError(translate("UART init")); } @@ -232,7 +232,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // start the interrupt series if ((HAL_UART_GetState(&self->handle) & HAL_UART_STATE_BUSY_RX) == HAL_UART_STATE_BUSY_RX) { - mp_raise_ValueError(translate("Could not start interrupt, RX busy")); + mp_raise_RuntimeError(translate("Could not start interrupt, RX busy")); } // start the receive interrupt chain @@ -335,7 +335,7 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, Status = HAL_UART_GetState(&self->handle); } } else { - mp_raise_ValueError(translate("UART write error")); + mp_raise_RuntimeError(translate("UART write")); } return len; @@ -405,11 +405,11 @@ void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrat // Otherwise de-init and set new rate if (HAL_UART_DeInit(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART de-init error")); + mp_raise_RuntimeError(translate("UART de-init")); } self->handle.Init.BaudRate = baudrate; if (HAL_UART_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("UART re-init error")); + mp_raise_RuntimeError(translate("UART re-init")); } self->baudrate = baudrate; diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c index 08ac034bde..992745b80a 100644 --- a/ports/stm/common-hal/canio/CAN.c +++ b/ports/stm/common-hal/canio/CAN.c @@ -59,13 +59,13 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, const mcu_pin_obj_t * const mcu_periph_obj_t *mcu_tx = find_pin_function(mcu_can_tx_list, can_tx_len, tx, -1); if (!mcu_tx) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_tx); + raise_ValueError_invalid_pin_name(MP_QSTR_tx); } int periph_index = mcu_tx->periph_index; const mcu_periph_obj_t *mcu_rx = find_pin_function(mcu_can_rx_list, can_rx_len, rx, periph_index); if (!mcu_rx) { - mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_rx); + raise_ValueError_invalid_pin_name(MP_QSTR_rx); } if (reserved_can[periph_index]) { diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c index e5dc18cd79..6710f43f7d 100644 --- a/ports/stm/common-hal/pwmio/PWMOut.c +++ b/ports/stm/common-hal/pwmio/PWMOut.c @@ -279,16 +279,16 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t fr // restart everything, adjusting for new speed if (HAL_TIM_PWM_Init(&self->handle) != HAL_OK) { - mp_raise_ValueError(translate("Could not re-init timer")); + mp_raise_RuntimeError(translate("timer re-init")); } self->chan_handle.Pulse = timer_get_internal_duty(self->duty_cycle, period); if (HAL_TIM_PWM_ConfigChannel(&self->handle, &self->chan_handle, self->channel) != HAL_OK) { - mp_raise_ValueError(translate("Could not re-init channel")); + mp_raise_RuntimeError(translate("channel re-init")); } if (HAL_TIM_PWM_Start(&self->handle, self->channel) != HAL_OK) { - mp_raise_ValueError(translate("Could not restart PWM")); + mp_raise_RuntimeError(translate("PWM restart")); } tim_frequencies[self->tim->tim_index] = frequency; diff --git a/py/argcheck.c b/py/argcheck.c index 5854c9d1d2..592b35940e 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -222,6 +222,14 @@ mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qs return length; } +// int instead of uint because an index can be negative in some cases. +mp_int_t mp_arg_validate_index_range(mp_int_t index, mp_int_t min, mp_int_t max, qstr arg_name) { + if (index < min || index > max) { + mp_raise_IndexError_varg(translate("%q out of range"), arg_name, min, max); + } + return index; +} + 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 be of type %q"), arg_name, type->name); diff --git a/py/runtime.h b/py/runtime.h index 4fa30d9b2b..dccdc2feed 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -104,6 +104,7 @@ mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_n mp_uint_t mp_arg_validate_length_max(mp_uint_t length, mp_uint_t max, qstr arg_name); mp_uint_t mp_arg_validate_length_range(mp_uint_t length, mp_uint_t min, mp_uint_t max, qstr arg_name); mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qstr arg_name); +mp_int_t mp_arg_validate_index_range(mp_int_t index, mp_int_t min, mp_int_t max, qstr arg_name); mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name); mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name); mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name); diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c index 27c2667d8e..db96519dc7 100644 --- a/shared-bindings/microcontroller/Pin.c +++ b/shared-bindings/microcontroller/Pin.c @@ -202,3 +202,7 @@ NORETURN void raise_ValueError_invalid_pin(void) { NORETURN void raise_ValueError_invalid_pins(void) { mp_arg_error_invalid(MP_QSTR_pins); } + +NORETURN void raise_ValueError_invalid_pin_name(qstr pin_name) { + mp_raise_ValueError_varg(translate("Invalid %q pin"), pin_name); +} diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h index 4ce20331d9..12ff422a4a 100644 --- a/shared-bindings/microcontroller/Pin.h +++ b/shared-bindings/microcontroller/Pin.h @@ -43,6 +43,7 @@ void validate_list_is_free_pins(qstr what, const mcu_pin_obj_t **pins_out, mp_in void validate_pins(qstr what, uint8_t *pin_nos, mp_int_t max_pins, mp_obj_t seq, uint8_t *count_out); NORETURN void raise_ValueError_invalid_pin(void); NORETURN void raise_ValueError_invalid_pins(void); +NORETURN void raise_ValueError_invalid_pin_name(qstr pin_name); void assert_pin_free(const mcu_pin_obj_t *pin); diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index 891ecfe092..c06ce18826 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -129,7 +129,7 @@ STATIC mp_obj_t sdioio_sdcard_configure(size_t n_args, const mp_obj_t *pos_args, MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS); mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_int_t frequency = mp_arg_validate_int_min(args[ARG_frequency].u_int, 0, MP_QSTR_frequency); + mp_int_t frequency = mp_arg_validate_int_min(args[ARG_frequency].u_int, 1, MP_QSTR_frequency); uint8_t width = args[ARG_width].u_int; if (width != 0 && width != 1 && width != 4) { mp_arg_error_invalid(MP_QSTR_width); diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c index dc91c6e0d5..972b085978 100644 --- a/shared-module/bitbangio/SPI.c +++ b/shared-module/bitbangio/SPI.c @@ -123,7 +123,7 @@ void shared_module_bitbangio_spi_unlock(bitbangio_spi_obj_t *self) { // Writes out the given data. bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t *data, size_t len) { if (len > 0 && !self->has_mosi) { - mp_raise_ValueError(translate("Cannot write without MOSI pin")); + mp_raise_ValueError(translate("No MOSI pin")); } uint32_t delay_half = self->delay_half; @@ -178,7 +178,7 @@ bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t // Reads in len bytes while outputting zeroes. bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data, size_t len, uint8_t write_data) { if (len > 0 && !self->has_miso) { - mp_raise_ValueError(translate("Cannot read without MISO pin")); + mp_raise_ValueError(translate("No MISO pin")); } uint32_t delay_half = self->delay_half; From ea430d678fd4a9c419ac31ea4a896eebb5c1cc0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 May 2022 08:27:43 +0000 Subject: [PATCH 0336/2403] Translated using Weblate (German) Currently translated at 100.0% (1059 of 1059 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/ --- locale/de_DE.po | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/locale/de_DE.po b/locale/de_DE.po index 498b1fdaf4..9051a04d57 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-03-24 15:57+0000\n" +"PO-Revision-Date: 2022-05-20 19:25+0000\n" "Last-Translator: Fabian Affolter \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "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.12-dev\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -117,7 +117,7 @@ msgstr "%q muss %d-%d sein" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "" +msgstr "%q muss 1 sein, wenn %q wahr ist" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" @@ -895,7 +895,7 @@ msgstr "Konnte first buffer nicht zuteilen" #: shared-module/audiomp3/MP3Decoder.c msgid "Couldn't allocate input buffer" -msgstr "Eingabepuffer konnte nicht reserviert werden" +msgstr "Eingabepuffer konnte nicht zugewiesen werden" #: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c #: shared-module/audiomp3/MP3Decoder.c @@ -908,7 +908,7 @@ msgstr "Absturz in den HardFault_Handler." #: ports/stm/common-hal/analogio/AnalogOut.c msgid "DAC Channel Init Error" -msgstr "DAC Kanal Initialisierungsfehler" +msgstr "DAC-Kanal-Initialisierungsfehler" #: ports/stm/common-hal/analogio/AnalogOut.c msgid "DAC Device Init Error" @@ -1133,6 +1133,8 @@ msgstr "Framepuffer benötigt %d bytes" msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"Die Frequenz muss 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 oder 1008 " +"MHz betragen" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" @@ -1569,11 +1571,11 @@ msgstr "" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched data size" -msgstr "" +msgstr "Nicht übereinstimmende Datengröße" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched swap flag" -msgstr "" +msgstr "Nicht übereinstimmendes Swap-Flag" #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" @@ -1646,7 +1648,7 @@ msgstr "Name zu lang" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" -msgstr "" +msgstr "Neue Bitmap muss die gleiche Größe wie alte Bitmap haben" #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" @@ -1782,7 +1784,7 @@ msgstr "Kein Speicherplatz mehr verfügbar auf dem Gerät" #: py/moduerrno.c msgid "No such device" -msgstr "" +msgstr "Kein solches Gerät" #: py/moduerrno.c msgid "No such file/directory" @@ -1899,7 +1901,7 @@ msgstr "Nur eine Farbe kann transparent sein zu einer Zeit" #: py/moduerrno.c msgid "Operation not permitted" -msgstr "" +msgstr "Operation nicht erlaubt" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" @@ -3381,7 +3383,7 @@ msgstr "Format erfordert ein Wörterbuch (dict)" #: shared-bindings/microcontroller/Processor.c msgid "frequency is read-only for this board" -msgstr "" +msgstr "Frequenz ist für dieses Board schreibgeschützt" #: py/objdeque.c msgid "full" From d98c6ecde2914813d98e1b507edbebc442584f2b Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Fri, 20 May 2022 21:25:25 +0200 Subject: [PATCH 0337/2403] 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 | 907 ++++++++++++++------------------- locale/cs.po | 652 +++++------------------- locale/de_DE.po | 1013 ++++++++++++++++++------------------- locale/el.po | 641 +++++------------------- locale/en_GB.po | 1004 ++++++++++++++++++------------------- locale/es.po | 997 +++++++++++++++++-------------------- locale/fil.po | 805 +++++++++++------------------- locale/fr.po | 1010 ++++++++++++++++++------------------- locale/hi.po | 641 +++++------------------- locale/it_IT.po | 831 +++++++++++-------------------- locale/ja.po | 906 ++++++++++++++------------------- locale/ko.po | 678 ++++++------------------- locale/nl.po | 945 ++++++++++++++++------------------- locale/pl.po | 873 +++++++++++++------------------- locale/pt_BR.po | 1021 ++++++++++++++++++-------------------- locale/ru.po | 887 ++++++++++++++------------------- locale/sv.po | 1014 ++++++++++++++++++------------------- locale/tr.po | 684 +++++++------------------ locale/zh_Latn_pinyin.po | 1016 ++++++++++++++++++------------------- 19 files changed, 6539 insertions(+), 9986 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index c16258bf52..be10475e61 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -72,10 +72,24 @@ msgid "" msgstr "" "%d pin alamat, %d rgb pin dan %d ubin menunjukkan ketinggian %d, bukan %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q dan %q berisi pin duplikat" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q berisi pin duplikat" @@ -88,12 +102,7 @@ msgstr "%q gagal: %d" msgid "%q in use" msgstr "%q sedang digunakan" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q indeks di luar batas" @@ -101,14 +110,34 @@ msgstr "%q indeks di luar batas" msgid "%q indices must be integers, not %s" msgstr "indeks %q harus bilangan bulat, bukan %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q panjang harus %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q panjang harus >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q harus %d-%d" @@ -125,14 +154,10 @@ msgstr "%q harus <= %d" msgid "%q must be >= %d" msgstr "%q harus >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q harus >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q harus >= 1" @@ -141,14 +166,9 @@ msgstr "%q harus >= 1" msgid "%q must be a string" msgstr "%q harus berupa string" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q harus berupa tuple dengan panjang 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q harus antara %d dan %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -166,7 +186,11 @@ msgstr "%q harus pangkat 2" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q di luar jangkauan" @@ -175,10 +199,6 @@ msgstr "%q di luar jangkauan" msgid "%q pin invalid" msgstr "pin %q tidak valid" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q harus berupa int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -341,10 +361,6 @@ msgstr "'yield from' di dalam fungsi async" msgid "'yield' outside function" msgstr "'yield' diluar fungsi" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x harus menjadi target assignment" @@ -380,10 +396,6 @@ msgstr "ADC2 sedang digunakan oleh WiFi" msgid "Address must be %d bytes long" msgstr "Alamat harus sepanjang %d byte" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Jenis alamat di luar batas" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -474,25 +486,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn tidak didukung pada pin yang diberikan" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "fungsionalitas AnalogOut tidak didukung" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut hanya 16 bit. Nilai harus kurang dari 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "pin yang dipakai tidak mendukung AnalogOut" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -564,11 +557,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "Bit clock dan word harus memiliki kesamaan pada clock unit" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Kedalaman bit harus kelipatan 8." @@ -610,11 +598,6 @@ msgstr "Buffer + offset terlalu kecil %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Ukuran buffer salah. Seharusnya %d byte." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffer bukan bytearray." @@ -624,7 +607,6 @@ msgstr "Buffer bukan bytearray." msgid "Buffer is too small" msgstr "Buffer terlalu kecil" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -639,10 +621,6 @@ msgstr "Panjang buffer harus kelipatan 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Penyangga harus memiliki panjang setidaknya 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -664,10 +642,6 @@ msgstr "Pin bus %d sudah digunakan" msgid "Byte buffer must be 16 bytes." msgstr "Byte buffer harus 16 byte." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes harus di antara 0 dan 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Blok CBC harus merupakan kelipatan 16 byte" @@ -684,6 +658,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "Panggil super().__init__() sebelum mengakses objek asli." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -733,20 +711,10 @@ msgstr "" "Tidak dapat memiliki respon pindaian untuk penyebaran yang terhubung dan " "diperluas." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" -"Tidak dapat menggunakan output di kedua channel dengan menggunakan pin yang " -"sama" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Tidak dapat membaca tanpa pin MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Tidak dapat merekam ke file" @@ -758,10 +726,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Tidak dapat melakukan reset ke bootloader karena tidak ada bootloader yang " -"terisi" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -781,8 +747,8 @@ msgid "Cannot subclass slice" msgstr "Tidak dapat membuat subkelas dari irisan" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Tidak dapat transfer tanpa pin MOSI dan MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" @@ -790,14 +756,13 @@ msgstr "" "Tidak dapat membuat variasi frekuensi pada penghitung waktu yang sudah " "digunakan" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Tidak dapat menulis tanpa pin MOSI." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -811,10 +776,6 @@ msgstr "Kode inti CircuitPython mengalami crash. Aduh!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Init pin clock gagal." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Peregangan clock terlalu panjang" @@ -823,11 +784,6 @@ msgstr "Peregangan clock terlalu panjang" msgid "Clock unit in use" msgstr "Clock unit sedang digunakan" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Perintah harus berupa int di antara 0 dan 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -839,35 +795,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "File .mpy rusak" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Tidak dapat menginisialisasi UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Tidak dapat menginisialisasi ulang kanal" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Tidak dapat menginisialisasi ulang timer" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Tidak dapat memulai ulang PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -888,20 +815,6 @@ msgstr "Tidak dapat memulai interupsi, RX sibuk" msgid "Couldn't allocate decoder" msgstr "Tidak dapat mengalokasikan dekoder" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Tidak dapat mengalokasikan penyangga pertama" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Tidak dapat mengalokasikan penyangga masukan" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Tidak dapat mengalokasikan penyangga kedua" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Gagal ke HardFault_Handler." @@ -949,10 +862,6 @@ msgstr "Kapasitas tujuan lebih kecil dari destination_length." msgid "Device in use" msgstr "Perangkat sedang digunakan" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut tidak didukung pada pin yang diberikan" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1008,11 +917,6 @@ msgstr "Diharapkan %q" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Diharapkan tuple dengan panjang %d, didapatkan %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1039,22 +943,6 @@ msgstr "Gagal mengirim perintah." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Gagal memperoleh mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Gagal untuk mengalokasikan buffer RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Gagal untuk megalokasikan buffer RX dari %d byte" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1123,11 +1011,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1142,6 +1025,10 @@ msgstr "Frekuensi harus cocok dengan PWMOut yang ada menggunakan timer ini" msgid "Function requires lock" msgstr "Fungsinya membutuhkan kunci" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1169,17 +1056,13 @@ msgstr "Perangkat keras sibuk, coba pin alternatif" msgid "Hardware in use, try alternative pins" msgstr "Perangkat keras sedang digunakan, coba pin alternatif" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "operasi I/O pada file tertutup" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "Gagal Inisialisasi I2C" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1288,75 +1171,33 @@ msgstr "" msgid "Internal error #%d" msgstr "Kesalahan internal #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "%q pada tidak valid" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Nilai Unit ADC tidak valid" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "File BMP tidak valid" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Pin DAC yang diberikan tidak valid" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Frekuensi PWM tidak valid" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Argumen tidak valid" @@ -1364,42 +1205,11 @@ msgstr "Argumen tidak valid" msgid "Invalid bits per value" msgstr "Bit per nilai tidak valid" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Ukuran buffer tidak valid" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "String byteorder tidak valid" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Periode penangkapan tidak valid. Kisaran yang valid: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Jumlah kanal tidak valid" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Arah tidak valid." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "File tidak valid" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Ukuran potongan format tidak valid" @@ -1408,78 +1218,14 @@ msgstr "Ukuran potongan format tidak valid" msgid "Invalid memory access." msgstr "Akses memori tidak valid." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Jumlah bit tidak valid" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Fase tidak valid" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Pin tidak valid" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Pin untuk channel kiri tidak valid" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Pin untuk channel kanan tidak valid" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Pin-pin tidak valid" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Polaritas tidak valid" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Properti tidak valid" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Mode operasi tidak valid." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "security_mode tidak valid" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1492,23 +1238,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Suara tidak valid" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Hitungan suara tidak valid" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "File wave tidak valid" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Panjang kata/bit tidak valid" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Panjang kunci harus 16, 24, atau 32 byte" @@ -1522,25 +1251,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS dari keyword arg harus menjadi sebuah id" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Layer sudah ada dalam grup." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer harus sebuah Grup atau subklas dari TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "Pin MISO gagal inisialisasi." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Pin MOSI gagal inisialisasi." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1550,10 +1271,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Nilai x maksimum ketika dicerminkan adalah %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Penundaan mulai mikrofon harus dalam kisaran 0,0 hingga 1,0" @@ -1567,10 +1284,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Tidak menemukan Pin MISO atau MOSI" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1606,11 +1327,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Harus berupa subclass %q." @@ -1671,15 +1387,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Tidak ada Pin MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Tidak ada Pin MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1718,16 +1442,6 @@ msgstr "Tidak ada GCLK yang kosong" msgid "No hardware random available" msgstr "Tidak ada perangkat keras acak yang tersedia" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Tidak ada dukungan perangkat keras pada pin clk" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Tidak ada dukungan hardware untuk pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1877,10 +1591,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1912,11 +1629,6 @@ msgstr "Kehabisan socket" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Sampel berlebihan harus kelipatan 8." @@ -1925,11 +1637,6 @@ msgstr "Sampel berlebihan harus kelipatan 8." msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "PWM duty_cycle harus antara 0 dan 65535 inklusif (resolusi 16 bit)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1937,6 +1644,10 @@ msgstr "" "Frekuensi PWM tidak dapat ditulis ketika variabel_frequency Salah pada " "konstruksi." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1953,29 +1664,14 @@ msgstr "Periferal sedang digunakan" msgid "Permission denied" msgstr "Izin ditolak" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Jumlah pin terlalu besar" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin tidak mempunya kemampuan untuk ADC (Analog Digital Converter)" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2047,18 +1743,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull tidak digunakan saat arah output." @@ -2080,8 +1768,9 @@ msgstr "Kesalahan DeInit RNG" msgid "RNG Init Error" msgstr "Kesalahan Init RNG" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2089,21 +1778,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "Pembalikan RS485 ditentukan saat tidak dalam mode RS485" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "Kalibrasi RTC tidak didukung pada board ini" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC tidak didukung di board ini" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 Belum didukung pada perangkat ini" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Kesalahan pembuatan nomor acak" @@ -2155,6 +1833,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2165,30 +1847,21 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "Kesalahan Init SPI" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "Kesalahan Inisialisasi ulang SPI" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Tingkat sampel harus positif" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Nilai sampel terlalu tinggi. Nilai harus kurang dari %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2208,14 +1881,6 @@ msgstr "Serializer sedang digunakan" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2251,10 +1916,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Memisahkan dengan menggunakan sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Ukuran stack minimal harus 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2340,10 +2001,6 @@ msgstr "Tinggi tile harus persis membagi tinggi bitmap" msgid "Tile index out of bounds" msgstr "Indeks ubin di luar batas" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Nilai ubin di luar batas" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Lebar ubin harus persis membagi lebar bitmap" @@ -2363,6 +2020,9 @@ msgid "To exit, please reset the board without " msgstr "Untuk keluar, silahkan reset board tanpa " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Terlalu banyak channel dalam sampel" @@ -2395,24 +2055,21 @@ msgid "Tuple or struct_time argument required" msgstr "Diperlukan argumen Tuple atau struct_time" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "Kesalahan alokasi Buffer UART" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "Kesalahan UART De-init" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "Kesalahan Init UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "Kesalahan Re-init UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "Kesalahan penulisan UART" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2550,12 +2207,6 @@ msgstr "" "Masalah yang tidak ditentukan. Bisa jadi permintaan pemasangan pada " "perangkat lain ditolak atau diabaikan." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Baudrate tidak didukung" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2630,10 +2281,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2786,10 +2433,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2827,11 +2470,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "byte > 8 bit tidak didukung" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2840,7 +2478,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "kalibrasi keluar dari jangkauan" @@ -2848,12 +2486,9 @@ msgstr "kalibrasi keluar dari jangkauan" msgid "calibration is read only" msgstr "kalibrasi adalah read only" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "nilai kalibrasi keluar dari jangkauan +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3024,6 +2659,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3036,10 +2675,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3464,6 +3099,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3714,10 +3353,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3725,10 +3360,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4100,10 +3731,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "Muncul dari PulseIn yang kosong" @@ -4150,14 +3777,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "antrian meluap (overflow)" @@ -4328,10 +3947,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4380,10 +3995,6 @@ msgstr "sintaksis error pada pendeskripsi uctypes" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4403,10 +4014,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "waktu habis harus >= 0,0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4415,6 +4022,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4606,13 +4217,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4684,6 +4289,246 @@ msgstr "zi harus berjenis float" msgid "zi must be of shape (n_section, 2)" msgstr "Zi harus berbentuk (n_section, 2)" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q harus berupa tuple dengan panjang 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q harus antara %d dan %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q harus berupa int" + +#~ msgid "Address type out of range" +#~ msgstr "Jenis alamat di luar batas" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn tidak didukung pada pin yang diberikan" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "fungsionalitas AnalogOut tidak didukung" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut hanya 16 bit. Nilai harus kurang dari 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "pin yang dipakai tidak mendukung AnalogOut" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Ukuran buffer salah. Seharusnya %d byte." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Penyangga harus memiliki panjang setidaknya 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes harus di antara 0 dan 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "" +#~ "Tidak dapat menggunakan output di kedua channel dengan menggunakan pin " +#~ "yang sama" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Tidak dapat membaca tanpa pin MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Tidak dapat melakukan reset ke bootloader karena tidak ada bootloader " +#~ "yang terisi" + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Tidak dapat transfer tanpa pin MOSI dan MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Tidak dapat menulis tanpa pin MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Init pin clock gagal." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Perintah harus berupa int di antara 0 dan 255" + +#~ msgid "Could not initialize UART" +#~ msgstr "Tidak dapat menginisialisasi UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Tidak dapat menginisialisasi ulang kanal" + +#~ msgid "Could not re-init timer" +#~ msgstr "Tidak dapat menginisialisasi ulang timer" + +#~ msgid "Could not restart PWM" +#~ msgstr "Tidak dapat memulai ulang PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Tidak dapat mengalokasikan penyangga pertama" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Tidak dapat mengalokasikan penyangga masukan" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Tidak dapat mengalokasikan penyangga kedua" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut tidak didukung pada pin yang diberikan" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Diharapkan tuple dengan panjang %d, didapatkan %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Gagal untuk mengalokasikan buffer RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Gagal untuk megalokasikan buffer RX dari %d byte" + +#~ msgid "I2C Init Error" +#~ msgstr "Gagal Inisialisasi I2C" + +#~ msgid "Invalid BMP file" +#~ msgstr "File BMP tidak valid" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Pin DAC yang diberikan tidak valid" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Frekuensi PWM tidak valid" + +#~ msgid "Invalid buffer size" +#~ msgstr "Ukuran buffer tidak valid" + +#~ msgid "Invalid byteorder string" +#~ msgstr "String byteorder tidak valid" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Periode penangkapan tidak valid. Kisaran yang valid: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Jumlah kanal tidak valid" + +#~ msgid "Invalid direction." +#~ msgstr "Arah tidak valid." + +#~ msgid "Invalid file" +#~ msgstr "File tidak valid" + +#~ msgid "Invalid number of bits" +#~ msgstr "Jumlah bit tidak valid" + +#~ msgid "Invalid phase" +#~ msgstr "Fase tidak valid" + +#~ msgid "Invalid pin" +#~ msgstr "Pin tidak valid" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Pin untuk channel kiri tidak valid" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Pin untuk channel kanan tidak valid" + +#~ msgid "Invalid polarity" +#~ msgstr "Polaritas tidak valid" + +#~ msgid "Invalid properties" +#~ msgstr "Properti tidak valid" + +#~ msgid "Invalid run mode." +#~ msgstr "Mode operasi tidak valid." + +#~ msgid "Invalid security_mode" +#~ msgstr "security_mode tidak valid" + +#~ msgid "Invalid voice" +#~ msgstr "Suara tidak valid" + +#~ msgid "Invalid voice count" +#~ msgstr "Hitungan suara tidak valid" + +#~ msgid "Invalid wave file" +#~ msgstr "File wave tidak valid" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Panjang kata/bit tidak valid" + +#~ msgid "Layer already in a group." +#~ msgstr "Layer sudah ada dalam grup." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer harus sebuah Grup atau subklas dari TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "Pin MISO gagal inisialisasi." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Pin MOSI gagal inisialisasi." + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Tidak ada dukungan perangkat keras pada pin clk" + +#~ msgid "No hardware support on pin" +#~ msgstr "Tidak ada dukungan hardware untuk pin" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "PWM duty_cycle harus antara 0 dan 65535 inklusif (resolusi 16 bit)" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin tidak mempunya kemampuan untuk ADC (Analog Digital Converter)" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "Kalibrasi RTC tidak didukung pada board ini" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 Belum didukung pada perangkat ini" + +#~ msgid "SPI Init Error" +#~ msgstr "Kesalahan Init SPI" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "Kesalahan Inisialisasi ulang SPI" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Tingkat sampel harus positif" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Nilai sampel terlalu tinggi. Nilai harus kurang dari %d" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Ukuran stack minimal harus 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Nilai ubin di luar batas" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "Kesalahan alokasi Buffer UART" + +#~ msgid "UART De-init error" +#~ msgstr "Kesalahan UART De-init" + +#~ msgid "UART Init Error" +#~ msgstr "Kesalahan Init UART" + +#~ msgid "UART Re-init error" +#~ msgstr "Kesalahan Re-init UART" + +#~ msgid "UART write error" +#~ msgstr "Kesalahan penulisan UART" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Baudrate tidak didukung" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "byte > 8 bit tidak didukung" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "nilai kalibrasi keluar dari jangkauan +/-127" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "waktu habis harus >= 0,0" + #~ msgid "Unsupported operation" #~ msgstr "Operasi yang tidak didukung" diff --git a/locale/cs.po b/locale/cs.po index 5a87f5bc06..ce3fc2a7bc 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -71,10 +71,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q a %q obsahují duplicitní piny" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q obsahuje duplicitní piny" @@ -87,12 +101,7 @@ msgstr "%q: selhání %d" msgid "%q in use" msgstr "%q se právě používá" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "Index %q je mimo rozsah" @@ -100,14 +109,34 @@ msgstr "Index %q je mimo rozsah" msgid "%q indices must be integers, not %s" msgstr "Indexy %q musí být celá čísla, nikoli %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q délka musí být %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q délka musí být >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q musí být %d-%d" @@ -124,14 +153,10 @@ msgstr "%q musí být <= %d" msgid "%q must be >= %d" msgstr "%q musí být >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q musí být >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q musí být > = 1" @@ -140,14 +165,9 @@ msgstr "%q musí být > = 1" msgid "%q must be a string" msgstr "%q musí být string" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q musí být n-tice délky 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q musí být mezi %d a %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -165,7 +185,11 @@ msgstr "%q musí být mocnina 2" msgid "%q out of bounds" msgstr "%q je mimo hranice" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q je mimo rozsah" @@ -174,10 +198,6 @@ msgstr "%q je mimo rozsah" msgid "%q pin invalid" msgstr "pin %q není platný" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q by měl být int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q s ID 0 musím být délky 1" @@ -340,10 +360,6 @@ msgstr "" msgid "'yield' outside function" msgstr "" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -379,10 +395,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -473,25 +485,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -563,11 +556,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "" @@ -609,11 +597,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -623,7 +606,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -638,10 +620,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -663,10 +641,6 @@ msgstr "" msgid "Byte buffer must be 16 bytes." msgstr "" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -683,6 +657,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -730,18 +708,10 @@ msgstr "" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "" @@ -753,7 +723,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -774,20 +744,19 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -802,10 +771,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -814,11 +779,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -829,35 +789,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -878,20 +809,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -939,10 +856,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -998,11 +911,6 @@ msgstr "" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1029,22 +937,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1113,11 +1005,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1132,6 +1019,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1159,16 +1050,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1276,75 +1163,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1352,42 +1197,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1396,78 +1210,14 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1480,23 +1230,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1510,25 +1243,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1538,10 +1263,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1555,10 +1276,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1594,11 +1319,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1659,15 +1379,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1706,16 +1434,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1860,10 +1578,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1895,11 +1616,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1910,12 +1626,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1934,29 +1649,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2025,18 +1725,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2058,8 +1750,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2067,21 +1760,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2131,6 +1813,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2141,29 +1827,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2184,14 +1861,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2227,10 +1896,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2316,10 +1981,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2339,6 +2000,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2371,23 +2035,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2524,12 +2185,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2604,10 +2259,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2760,10 +2411,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2801,11 +2448,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2814,7 +2456,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2822,12 +2464,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -2998,6 +2637,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3010,10 +2653,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3438,6 +3077,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3688,10 +3331,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3699,10 +3338,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4073,10 +3708,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4123,14 +3754,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4301,10 +3924,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4353,10 +3972,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4376,10 +3991,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4388,6 +3999,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4579,13 +4194,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4657,6 +4266,15 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q musí být n-tice délky 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q musí být mezi %d a %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q by měl být int" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/de_DE.po b/locale/de_DE.po index 9051a04d57..73e28062e5 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -74,10 +74,24 @@ msgstr "" "%d Adress-Pins, %d RGB-Pins und %d Kacheln indizieren eine Höhe von %d, " "nicht %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q und %q enthalten doppelte Pins" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q enthält doppelte Pins" @@ -90,12 +104,7 @@ msgstr "%q Fehler: %d" msgid "%q in use" msgstr "%q in Benutzung" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "Der Index %q befindet sich außerhalb des Bereiches" @@ -103,14 +112,34 @@ 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" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q Länge muss %d-%d sein" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q Länge muss >= 1 sein" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q muss %d-%d sein" @@ -127,14 +156,10 @@ msgstr "%q muss <= %d sein" msgid "%q must be >= %d" msgstr "%q muss >= %d sein" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q muss >= 0 sein" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q muss >= 1 sein" @@ -143,14 +168,9 @@ msgstr "%q muss >= 1 sein" msgid "%q must be a string" msgstr "%q muss ein String sein" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q muss ein Tupel der Länge 2 sein" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q muss zwischen %d und %d sein" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -168,7 +188,11 @@ msgstr "%q muss eine Potenz von 2 sein" msgid "%q out of bounds" msgstr "%q außerhalb der Grenzen" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q außerhalb des Bereichs" @@ -177,10 +201,6 @@ msgstr "%q außerhalb des Bereichs" msgid "%q pin invalid" msgstr "%q Pin ungültig" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q sollte ein integer sein" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q mit Berichts-ID von 0 muss von Länge 1 sein" @@ -344,10 +364,6 @@ msgstr "'yield from' innerhalb einer async Funktion" msgid "'yield' outside function" msgstr "'yield' außerhalb einer Funktion" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "(x,y) Integer benötigt" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x muss Zuordnungsziel sein" @@ -383,10 +399,6 @@ msgstr "ADC2 wird vom WiFi benutzt" msgid "Address must be %d bytes long" msgstr "Die Adresse muss %d Bytes lang sein" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Adresstyp außerhalb des zulässigen Bereichs" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Alle CAN-Schnittstellen sind in Benutzung" @@ -477,25 +489,6 @@ msgstr "Läuft bereits" msgid "Already scanning for wifi networks" msgstr "Sucht bereits nach Wifi-Netzwerken" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn ist an diesem Pin nicht unterstützt" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut-Funktion wird nicht unterstützt" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut kann nur 16 Bit. Der Wert muss unter 65536 liegen." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut ist an diesem Pin nicht unterstützt" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Ein anderer PWMAudioOut ist bereits aktiv" @@ -567,11 +560,6 @@ msgstr "Bit clock und word select müssen geordnete Pins sein" msgid "Bit clock and word select must share a clock unit" msgstr "Bit clock und word select müssen eine clock unit teilen" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bittiefe muss zwischen 1 und 6 liegen, nicht %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bit depth muss ein Vielfaches von 8 sein." @@ -613,11 +601,6 @@ msgstr "Buffer + Offset zu klein %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Puffer-Elemente müssen 4 Bytes lang oder kürzer sein" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Der Puffergröße ist inkorrekt. Sie sollte %d bytes haben." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Der Buffer ist kein Byte-Array." @@ -627,7 +610,6 @@ msgstr "Der Buffer ist kein Byte-Array." msgid "Buffer is too small" msgstr "Der Puffer ist zu klein" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -642,10 +624,6 @@ msgstr "Die Pufferlänge muss ein vielfaches von 512 sein" msgid "Buffer must be a multiple of 512 bytes" msgstr "Der Puffer muss ein vielfaches von 512 bytes sein" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Der Puffer muss eine Mindestenslänge von 1 haben" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -667,10 +645,6 @@ msgstr "Bus-Pin %d wird schon benutzt" msgid "Byte buffer must be 16 bytes." msgstr "Der Puffer muss 16 Bytes lang sein." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Ein Bytes kann nur Werte zwischen 0 und 255 annehmen." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC-Blöcke müssen ein Vielfaches von 16 Bytes sein" @@ -687,6 +661,10 @@ msgstr "CRC oder Checksumme ungültig" msgid "Call super().__init__() before accessing native object." msgstr "Rufe super().__init__() vor dem Zugriff auf ein natives Objekt auf." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "Alarm der RTC IO kann nur im deep sleep ausgeführt werden." @@ -737,18 +715,10 @@ msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" "Es können keine Scanantworten für erweiterte, verbindbare Anzeigen vorliegen." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Kann nicht beite Kanäle auf dem gleichen Pin ausgeben" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "Kann nicht 'pull' an einem 'input-only' pin." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Kann ohne MISO-Pin nicht lesen." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Aufnahme in eine Datei nicht möglich" @@ -760,8 +730,8 @@ msgstr "'/' kann nicht wiedereingehängt werden, wenn per USB sichtbar." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Reset zum Bootloader nicht möglich, da Bootloader nicht vorhanden." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -781,23 +751,22 @@ msgid "Cannot subclass slice" msgstr "Slice kann keine sub-klasse sein" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Übertragung ohne MOSI- und MISO-Pins nicht möglich." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" "Die Frequenz eines bereits verwendeten Timers kann nicht variiert werden" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Kann nicht auf Flanke wecken, nur auf Level." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Kann nicht ohne MOSI-Pin schreiben." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Schreiben von CharacteristicBuffer ist nicht vorgesehen" @@ -810,10 +779,6 @@ msgstr "Der CircuitPython-Kerncode ist hart abgestürzt. Hoppla!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Clock pin init fehlgeschlagen." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Clock stretch zu lang" @@ -822,11 +787,6 @@ msgstr "Clock stretch zu lang" msgid "Clock unit in use" msgstr "Clock unit wird benutzt" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Der Befehl muss ein int zwischen 0 und 255 sein" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -839,35 +799,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Beschädigte .mpy Datei" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Konnte Kamera nicht initialisieren" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "GNSS konnte nicht initialisiert werden" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Konnte SDKarte nicht initialisieren" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Konnte UART nicht initialisieren" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Kanal konnte nicht neu initiiert werden" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Timer konnte nicht neu gestartet werden" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "PWM konnte nicht neu gestartet werden" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Clock konnte nicht ermittelt werden" @@ -888,20 +819,6 @@ msgstr "Interrupt konnte nicht gestartet werden, RX beschäftigt" msgid "Couldn't allocate decoder" msgstr "Decoder konnte nicht zugeordnet werden" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Konnte first buffer nicht zuteilen" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Eingabepuffer konnte nicht zugewiesen werden" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Konnte second buffer nicht zuteilen" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Absturz in den HardFault_Handler." @@ -949,10 +866,6 @@ msgstr "Die Zielkapazität ist kleiner als destination_length." msgid "Device in use" msgstr "Gerät in Benutzung" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut wird auf dem angegebenen Pin nicht unterstützt" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1008,11 +921,6 @@ msgstr "Erwartet ein(e) %q" msgid "Expected an alarm" msgstr "Alarm erwartet" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1040,22 +948,6 @@ msgstr "Kommando nicht gesendet." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Mutex konnte nicht akquiriert werden. Status: 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Konnte keinen RX Buffer allozieren" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Konnte keine RX Buffer mit %d allozieren" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Zuweisung des Wifi Speichers ist fehlgeschlagen" @@ -1124,11 +1016,6 @@ msgstr "Für RGB-Farbräume muss die Eingabe-Bitmap 16 Bit pro Pixel haben" msgid "Format not supported" msgstr "Format nicht unterstützt" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Framepuffer benötigt %d bytes" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1147,6 +1034,10 @@ msgstr "" msgid "Function requires lock" msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Generischer Fehler" @@ -1174,17 +1065,13 @@ msgstr "Hardware beschäftigt, versuchen Sie alternative Pins" msgid "Hardware in use, try alternative pins" msgstr "Hardware in Benutzung, probiere alternative Pins" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Der Hostname muss zwischen 1 und 253 Zeichen haben" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Lese/Schreibe-operation an geschlossener Datei" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C-Init-Fehler" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1297,75 +1184,33 @@ msgstr "Interner Fehler" msgid "Internal error #%d" msgstr "Interner Fehler #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Ungültiger %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Ungültiger %q Pin" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Ungültige %q Pin-Auswahl" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Ungültiger ADC-Einheitenwert" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "Ungültiges AuthMode" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Ungültiges BLE Parameter" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Ungültige BMP-Datei" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Ungültige BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Ungültiger DAC-Pin angegeben" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "Ungültige MAC-Adresse" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Ungültige MIDI Datei" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Ungültige PWM Frequenz" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Ungültiger Pin" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Ungültiges Argument" @@ -1373,42 +1218,11 @@ msgstr "Ungültiges Argument" msgid "Invalid bits per value" msgstr "Ungültige Bits pro Wert" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Ungültige Puffergröße" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Ungültige Byteorder-String" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Ungültiger Aufnahmezeitraum. Gültiger Bereich: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Ungültige Anzahl von Kanälen" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "Ungültiger data_count %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "Ungültige data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Ungültige Richtung." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Ungültige Datei" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Ungültige format chunk size" @@ -1417,78 +1231,14 @@ msgstr "Ungültige format chunk size" msgid "Invalid memory access." msgstr "Ungültiger Speicherzugriff." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "Ungültiger Modus" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "Ungültige Multicast-MAC-Adresse" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Ungültige Anzahl von Bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Ungültige Phase" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Ungültiger Pin" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Ungültiger Pin für linken Kanal" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Ungültiger Pin für rechten Kanal" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Ungültige Pins" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Ungültige Polarität" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Ungültige Eigenschaften" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Ungültiger Ausführungsmodus." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Ungültiger security_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Ungültige Größe" @@ -1501,23 +1251,6 @@ msgstr "Ungültiges Socket für TLS" msgid "Invalid state" msgstr "Ungültiger Zustand" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Ungültige Stimme" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Ungültige Anzahl von Stimmen" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Ungültige wave Datei" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Ungültige Wort- / Bitlänge" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Der Schlüssel muss 16, 24 oder 32 Byte lang sein" @@ -1531,25 +1264,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS des Schlüsselwortarguments muss eine id sein" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Layer ist bereits in einer Gruppe." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer muss eine Group- oder TileGrid-Unterklasse sein." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "MAC Adresse war ungültig" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISO pin Initialisierung fehlgeschlagen." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSI pin Initialisierung fehlgeschlagen." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "Zuordnung muss ein Tupel sein" @@ -1559,10 +1284,6 @@ msgstr "Zuordnung muss ein Tupel sein" msgid "Maximum x value when mirrored is %d" msgstr "Maximaler x-Wert beim Spiegeln ist %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Meldungen auf 8 Bytes limitiert" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1577,10 +1298,14 @@ msgstr "Nicht übereinstimmende Datengröße" msgid "Mismatched swap flag" msgstr "Nicht übereinstimmendes Swap-Flag" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Fehlender MISO- oder MOSI-Pin" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1616,11 +1341,6 @@ msgstr "Fehlender first_set_pin. Instruktion %d setzt Pin(s)" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "jmp_pin fehlt. Befehl %d springt auf Pin" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "Mehr als %d Berichts-IDs werden nicht unterstützt" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Muss eine %q Unterklasse sein." @@ -1681,15 +1401,23 @@ msgid "No I2C device at address: 0x%x" msgstr "Kein I2C-Gerät an Adresse: 0x%x" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Kein MISO-Pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Kein MOSI-Pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1728,16 +1456,6 @@ msgstr "Keine freien GCLKs" msgid "No hardware random available" msgstr "Kein hardware random verfügbar" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Keine Hardwareunterstützung am clk Pin" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Keine Hardwareunterstützung an diesem Pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "Nicht in Programm" @@ -1888,10 +1606,13 @@ msgid "Only one address is allowed" msgstr "Nur eine Adresse ist erlaubt" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Nur eine alarm-time kann gesetzt werden." @@ -1923,11 +1644,6 @@ msgstr "Keine Sockets mehr verfügbar" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Out-Buffer-Elemente müssen <= 4 bytes lang sein" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "Ausgabe-Buffer muss mindestens %d Bytes sein" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Oversample muss ein Vielfaches von 8 sein." @@ -1936,16 +1652,15 @@ msgstr "Oversample muss ein Vielfaches von 8 sein." msgid "PDMIn not available" msgstr "PDMIn nicht verfügbar" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "PWM duty_cycle muss zwischen 0 und 65535 (16 Bit-Auflösung) liegen" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "Die PWM-Frequenz ist nicht schreibbar, wenn variable_Frequenz = False." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "PWM-Stück wird bereits verwendet" @@ -1962,29 +1677,14 @@ msgstr "Peripheriegerät wird bereits verwendet" msgid "Permission denied" msgstr "Zugriff verweigert" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "Pin kann nicht aus Deep Sleep aufwachen" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "Pin-Anzahl muss mindestens 1 sein" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Pin-Anzahl zu gross" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin hat keine ADC-Funktionalität" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2057,18 +1757,10 @@ msgstr "Programm macht IN ohne Laden von ISR" msgid "Program does OUT without loading OSR" msgstr "Programm macht OUT ohne Laden von OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "Programm muss mindestens eine 16-Bit-Instruktion enthalten." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "Programm-Größe ist ungültig" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "Das Programm ist zu groß" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull wird nicht verwendet, wenn die Richtung output ist." @@ -2090,30 +1782,20 @@ msgstr "RNG DeInit-Fehler" msgid "RNG Init Error" msgstr "RNG Init-Fehler" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 wird von diesem Gerät nicht unterstützt" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "RS485-Inversion angegeben, wenn nicht im RS485-Modus" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "Die RTC-Kalibrierung wird auf diesem Board nicht unterstützt" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "Eine RTC wird auf diesem Board nicht unterstützt" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS / CTS / RS485 Wird von diesem Gerät noch nicht unterstützt" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Fehler bei der Erzeugung von Zufallszahlen" @@ -2163,6 +1845,10 @@ msgstr "Sicherheitsmodus aktiv! Gespeicherter Code wird nicht ausgeführt\n" msgid "SD card CSD format not supported" msgstr "SD-Card CSD-Format nicht unterstützt" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2173,30 +1859,21 @@ msgstr "SDIO GetCardInfo-Fehler %d" msgid "SDIO Init Error %d" msgstr "SDIO-Init-Fehler %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI-Init-Fehler" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI-Neuinitialisierungsfehler" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "SPI-Konfiguration fehlgeschlagen" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "SPI-Peripheriegeräte wird bereits verwendet" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Abtastrate muss positiv sein" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Abtastrate zu hoch. Wert muss unter %d liegen" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2216,14 +1893,6 @@ msgstr "Serializer wird benutzt" msgid "Server side context cannot have hostname" msgstr "Serverseitiger Kontext kann keinen Hostnamen haben" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "Die Anzahl der Pins muss zwischen 1 und 5 liegen" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "Die Anzahl der Pins für Side set muss zwischen 1 und 5 liegen" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Größe nicht unterstützt" @@ -2259,10 +1928,6 @@ msgstr "Geben Sie genau einen von data0 oder data_pins an" msgid "Splitting with sub-captures" msgstr "Splitting mit sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Die Stackgröße sollte mindestens 256 sein" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "Stereo links muss sich auf PWM-Kanal A befinden" @@ -2360,10 +2025,6 @@ msgstr "Die Kachelhöhe muss die Bitmaphöhe genau teilen" msgid "Tile index out of bounds" msgstr "Kachel index außerhalb der Grenzen" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Kachelwert außerhalb der Grenzen" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Die Kachelbreite muss die Bitmap-Breite genau teilen" @@ -2384,6 +2045,9 @@ msgid "To exit, please reset the board without " msgstr "Zum beenden, resette bitte das board ohne " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Zu viele Kanäle im sample." @@ -2416,24 +2080,21 @@ msgid "Tuple or struct_time argument required" msgstr "Tuple- oder struct_time-Argument erforderlich" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UART Buffer reservierungs Fehler" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART De-Init-Fehler" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UART Init Fehler" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UART Re-Init-Fehler" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART-Schreibfehler" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2573,12 +2234,6 @@ msgstr "" "Nicht näher bezeichnetes Problem. Möglicherweise wurde die Pairing-" "Eingabeaufforderung auf dem anderen Gerät abgelehnt oder ignoriert." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Baudrate wird nicht unterstützt" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "Nicht unterstützter Farbraum" @@ -2663,10 +2318,6 @@ msgstr "" "\n" "Um die vorhandenen Module anzuzeigen, gebe `help(\"modules\")` ein.\n" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFi Passwort muss zwischen 8 und 63 Zeichen lang sein" - #: main.c msgid "Woken up by alarm.\n" msgstr "Aufgeweckt durch Alarm.\n" @@ -2821,10 +2472,6 @@ msgstr "Bitmap-Größen müssen übereinstimmen" msgid "bits must be 32 or less" msgstr "bits müssen 32 oder kleiner sein" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "bits müssen zwischen 5 und 9 liegen" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "Es müssen 8 oder 16 bits_per_sample sein" @@ -2862,11 +2509,6 @@ msgstr "Der Puffer ist zu klein für die angefragten Bytes" msgid "byteorder is not a string" msgstr "Byteorder ist kein String" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "bytes mit mehr als 8 bits werden nicht unterstützt" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "Byte-Länge ist kein vielfaches der Item-Größe" @@ -2875,7 +2517,7 @@ msgstr "Byte-Länge ist kein vielfaches der Item-Größe" msgid "bytes value out of range" msgstr "Byte-Wert außerhalb des Bereichs" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "Kalibrierung ist außerhalb der Reichweite" @@ -2883,13 +2525,10 @@ msgstr "Kalibrierung ist außerhalb der Reichweite" msgid "calibration is read only" msgstr "Kalibrierung ist Schreibgeschützt" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "Kalibrierwert nicht im Bereich von +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" -msgstr "kann nur bei einem Elternteil registriert werden" +msgid "can only have one parent" +msgstr "" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -3067,6 +2706,10 @@ msgstr "Kann nicht eindeutig die Größe (sizeof) des Skalars ermitteln" msgid "casting" msgstr "Umwandlung (cast)" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "(char) Zeichenpuffer zu klein" @@ -3079,10 +2722,6 @@ msgstr "chr() arg ist nicht in range(0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() arg ist nicht in range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "Kreis kann nur in einem Elternteil registriert werden" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "clip Punkt muss ein (x,y) Tupel sein" @@ -3513,6 +3152,10 @@ msgstr "Indizes müssen Integer sein" msgid "indices must be integers, slices, or Boolean lists" msgstr "Indizes müssen Integer, Slices oder Boolesche Listen sein" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "Ausgangswerte müssen iterierbar sein" @@ -3769,10 +3412,6 @@ msgstr "Mathe-Domain-Fehler" msgid "matrix is not positive definite" msgstr "Matrix ist nicht positiv definitiv" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "max_connections muss zwischen 0 und 10 liegen" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3780,10 +3419,6 @@ msgstr "max_connections muss zwischen 0 und 10 liegen" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length muss 0-%d sein, wenn fixed_length %s ist" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length muss >= 0 sein" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "die maximale Anzahl der Dimensionen beträgt 4" @@ -4159,10 +3794,6 @@ msgstr "pixel_shader muss displayio.Palette oder displayio.ColorConverter sein" msgid "poll on file not available on win32" msgstr "Abfrage der Datei unter Win32 nicht verfügbar" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "Polygon kann nur in einem übergeordneten Element registriert werden" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop von einem leeren PulseIn" @@ -4209,14 +3840,6 @@ msgstr "Drücken der linken Taste beim Einschalten\n" msgid "pull masks conflict with direction masks" msgstr "Pull-Masken kollidieren mit Richtungsmasken" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "pull_threshold muss zwischen 1 und 32 liegen" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "push_threshold muss zwischen 1 und 32 liegen" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "Warteschlangenüberlauf" @@ -4389,10 +4012,6 @@ msgstr "start_x sollte ein int sein" msgid "step must be non-zero" msgstr "Schritt (step) darf nicht Null sein" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop muss 1 oder 2 sein" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop ist von start aus nicht erreichbar" @@ -4442,10 +4061,6 @@ msgstr "Syntaxfehler in uctypes Deskriptor" msgid "threshold must be in the range 0-65536" msgstr "threshold muss im Intervall 0-65536 liegen" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "Kachel muss größer als Null sein" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() nimmt eine 9-Sequenz an" @@ -4465,10 +4080,6 @@ msgstr "Das Zeitlimit muss 0,0-100,0 Sekunden betragen" msgid "timeout must be < 655.35 secs" msgstr "timeout muss kleiner als 655.35 Sekunden sein" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeout muss >= 0.0 sein" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "Zeitlimit beim warten auf v1 Karte" @@ -4477,6 +4088,10 @@ msgstr "Zeitlimit beim warten auf v1 Karte" msgid "timeout waiting for v2 card" msgstr "Zeitlimit beim warten auf v2 Karte" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "Zeitstempel außerhalb des Bereichs für Plattform time_t" @@ -4670,13 +4285,7 @@ msgstr "watchdog nicht initialisiert" msgid "watchdog timeout must be greater than 0" msgstr "watchdog Zeitlimit muss größer als 0 sein" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "breite muss zwischen (inklusive) 2 und 8 liegen, nicht %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "Breite muss größer als 0 sein" @@ -4748,6 +4357,350 @@ msgstr "zi muss eine Gleitkommazahl sein" msgid "zi must be of shape (n_section, 2)" msgstr "zi muss die Form (n_section, 2) haben" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q muss ein Tupel der Länge 2 sein" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q muss zwischen %d und %d sein" + +#~ msgid "%q should be an int" +#~ msgstr "%q sollte ein integer sein" + +#~ msgid "(x,y) integers required" +#~ msgstr "(x,y) Integer benötigt" + +#~ msgid "Address type out of range" +#~ msgstr "Adresstyp außerhalb des zulässigen Bereichs" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn ist an diesem Pin nicht unterstützt" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut-Funktion wird nicht unterstützt" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut kann nur 16 Bit. Der Wert muss unter 65536 liegen." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut ist an diesem Pin nicht unterstützt" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bittiefe muss zwischen 1 und 6 liegen, nicht %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Der Puffergröße ist inkorrekt. Sie sollte %d bytes haben." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Der Puffer muss eine Mindestenslänge von 1 haben" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Ein Bytes kann nur Werte zwischen 0 und 255 annehmen." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Kann nicht beite Kanäle auf dem gleichen Pin ausgeben" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Kann ohne MISO-Pin nicht lesen." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Reset zum Bootloader nicht möglich, da Bootloader nicht vorhanden." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Übertragung ohne MOSI- und MISO-Pins nicht möglich." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Kann nicht ohne MOSI-Pin schreiben." + +#~ msgid "Clock pin init failed." +#~ msgstr "Clock pin init fehlgeschlagen." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Der Befehl muss ein int zwischen 0 und 255 sein" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Konnte Kamera nicht initialisieren" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "GNSS konnte nicht initialisiert werden" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Konnte SDKarte nicht initialisieren" + +#~ msgid "Could not initialize UART" +#~ msgstr "Konnte UART nicht initialisieren" + +#~ msgid "Could not re-init channel" +#~ msgstr "Kanal konnte nicht neu initiiert werden" + +#~ msgid "Could not re-init timer" +#~ msgstr "Timer konnte nicht neu gestartet werden" + +#~ msgid "Could not restart PWM" +#~ msgstr "PWM konnte nicht neu gestartet werden" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Konnte first buffer nicht zuteilen" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Eingabepuffer konnte nicht zugewiesen werden" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Konnte second buffer nicht zuteilen" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut wird auf dem angegebenen Pin nicht unterstützt" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Konnte keinen RX Buffer allozieren" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Konnte keine RX Buffer mit %d allozieren" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Framepuffer benötigt %d bytes" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Der Hostname muss zwischen 1 und 253 Zeichen haben" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C-Init-Fehler" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Ungültige %q Pin-Auswahl" + +#~ msgid "Invalid AuthMode" +#~ msgstr "Ungültiges AuthMode" + +#~ msgid "Invalid BMP file" +#~ msgstr "Ungültige BMP-Datei" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Ungültiger DAC-Pin angegeben" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Ungültige MIDI Datei" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Ungültige PWM Frequenz" + +#~ msgid "Invalid Pin" +#~ msgstr "Ungültiger Pin" + +#~ msgid "Invalid buffer size" +#~ msgstr "Ungültige Puffergröße" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Ungültige Byteorder-String" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Ungültiger Aufnahmezeitraum. Gültiger Bereich: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Ungültige Anzahl von Kanälen" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "Ungültiger data_count %d" + +#~ msgid "Invalid direction." +#~ msgstr "Ungültige Richtung." + +#~ msgid "Invalid file" +#~ msgstr "Ungültige Datei" + +#~ msgid "Invalid mode" +#~ msgstr "Ungültiger Modus" + +#~ msgid "Invalid number of bits" +#~ msgstr "Ungültige Anzahl von Bits" + +#~ msgid "Invalid phase" +#~ msgstr "Ungültige Phase" + +#~ msgid "Invalid pin" +#~ msgstr "Ungültiger Pin" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Ungültiger Pin für linken Kanal" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Ungültiger Pin für rechten Kanal" + +#~ msgid "Invalid polarity" +#~ msgstr "Ungültige Polarität" + +#~ msgid "Invalid properties" +#~ msgstr "Ungültige Eigenschaften" + +#~ msgid "Invalid run mode." +#~ msgstr "Ungültiger Ausführungsmodus." + +#~ msgid "Invalid security_mode" +#~ msgstr "Ungültiger security_mode" + +#~ msgid "Invalid voice" +#~ msgstr "Ungültige Stimme" + +#~ msgid "Invalid voice count" +#~ msgstr "Ungültige Anzahl von Stimmen" + +#~ msgid "Invalid wave file" +#~ msgstr "Ungültige wave Datei" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Ungültige Wort- / Bitlänge" + +#~ msgid "Layer already in a group." +#~ msgstr "Layer ist bereits in einer Gruppe." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer muss eine Group- oder TileGrid-Unterklasse sein." + +#~ msgid "MISO pin init failed." +#~ msgstr "MISO pin Initialisierung fehlgeschlagen." + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSI pin Initialisierung fehlgeschlagen." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Meldungen auf 8 Bytes limitiert" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "Mehr als %d Berichts-IDs werden nicht unterstützt" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Keine Hardwareunterstützung am clk Pin" + +#~ msgid "No hardware support on pin" +#~ msgstr "Keine Hardwareunterstützung an diesem Pin" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "Ausgabe-Buffer muss mindestens %d Bytes sein" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "PWM duty_cycle muss zwischen 0 und 65535 (16 Bit-Auflösung) liegen" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "Pin-Anzahl muss mindestens 1 sein" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin hat keine ADC-Funktionalität" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "Programm muss mindestens eine 16-Bit-Instruktion enthalten." + +#~ msgid "Program too large" +#~ msgstr "Das Programm ist zu groß" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 wird von diesem Gerät nicht unterstützt" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "Die RTC-Kalibrierung wird auf diesem Board nicht unterstützt" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS / CTS / RS485 Wird von diesem Gerät noch nicht unterstützt" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI-Init-Fehler" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI-Neuinitialisierungsfehler" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Abtastrate muss positiv sein" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Abtastrate zu hoch. Wert muss unter %d liegen" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "Die Anzahl der Pins muss zwischen 1 und 5 liegen" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "Die Anzahl der Pins für Side set muss zwischen 1 und 5 liegen" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Die Stackgröße sollte mindestens 256 sein" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Kachelwert außerhalb der Grenzen" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UART Buffer reservierungs Fehler" + +#~ msgid "UART De-init error" +#~ msgstr "UART De-Init-Fehler" + +#~ msgid "UART Init Error" +#~ msgstr "UART Init Fehler" + +#~ msgid "UART Re-init error" +#~ msgstr "UART Re-Init-Fehler" + +#~ msgid "UART write error" +#~ msgstr "UART-Schreibfehler" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Baudrate wird nicht unterstützt" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFi Passwort muss zwischen 8 und 63 Zeichen lang sein" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "bits müssen zwischen 5 und 9 liegen" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "bytes mit mehr als 8 bits werden nicht unterstützt" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "Kalibrierwert nicht im Bereich von +/-127" + +#~ msgid "can only be registered in one parent" +#~ msgstr "kann nur bei einem Elternteil registriert werden" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "Kreis kann nur in einem Elternteil registriert werden" + +#~ msgid "max_connections must be between 0 and 10" +#~ msgstr "max_connections muss zwischen 0 und 10 liegen" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length muss >= 0 sein" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "Polygon kann nur in einem übergeordneten Element registriert werden" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "pull_threshold muss zwischen 1 und 32 liegen" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "push_threshold muss zwischen 1 und 32 liegen" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop muss 1 oder 2 sein" + +#~ msgid "tile must be greater than zero" +#~ msgstr "Kachel muss größer als Null sein" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeout muss >= 0.0 sein" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "breite muss zwischen (inklusive) 2 und 8 liegen, nicht %d" + #~ msgid "Unsupported operation" #~ msgstr "Nicht unterstützte Operation" diff --git a/locale/el.po b/locale/el.po index 2c21d3b972..d4229b5592 100644 --- a/locale/el.po +++ b/locale/el.po @@ -66,10 +66,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -82,12 +96,7 @@ msgstr "" msgid "%q in use" msgstr "" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "" @@ -95,14 +104,34 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -119,14 +148,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.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/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c msgid "%q must be >= 1" msgstr "" @@ -135,13 +160,8 @@ msgstr "" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -160,7 +180,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -169,10 +193,6 @@ msgstr "" msgid "%q pin invalid" msgstr "" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -335,10 +355,6 @@ msgstr "" msgid "'yield' outside function" msgstr "" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -374,10 +390,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -468,25 +480,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -556,11 +549,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "" @@ -602,11 +590,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -616,7 +599,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -631,10 +613,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -656,10 +634,6 @@ msgstr "" msgid "Byte buffer must be 16 bytes." msgstr "" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -676,6 +650,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -723,18 +701,10 @@ msgstr "" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "" @@ -746,7 +716,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -767,20 +737,19 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -795,10 +764,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -807,11 +772,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -822,35 +782,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -871,20 +802,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -932,10 +849,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -991,11 +904,6 @@ msgstr "" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1022,22 +930,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1106,11 +998,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1125,6 +1012,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1152,16 +1043,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1269,75 +1156,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1345,42 +1190,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1389,78 +1203,14 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1473,23 +1223,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1503,25 +1236,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1531,10 +1256,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1548,10 +1269,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1587,11 +1312,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1652,15 +1372,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1699,16 +1427,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1853,10 +1571,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1888,11 +1609,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1903,12 +1619,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1927,29 +1642,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2016,18 +1716,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2049,8 +1741,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2058,21 +1751,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2122,6 +1804,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2132,29 +1818,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2175,14 +1852,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2218,10 +1887,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2307,10 +1972,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2330,6 +1991,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2362,23 +2026,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2515,12 +2176,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2595,10 +2250,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2751,10 +2402,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2792,11 +2439,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2805,7 +2447,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2813,12 +2455,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -2989,6 +2628,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3001,10 +2644,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3429,6 +3068,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3679,10 +3322,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3690,10 +3329,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4064,10 +3699,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4114,14 +3745,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4292,10 +3915,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4344,10 +3963,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4367,10 +3982,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4379,6 +3990,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4570,13 +4185,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 399fbfd5e7..21480626d3 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -73,10 +73,24 @@ msgid "" msgstr "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q and %q contain duplicate pins" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q contains duplicate pins" @@ -89,12 +103,7 @@ msgstr "%q failure: %d" msgid "%q in use" msgstr "%q in use" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q index out of range" @@ -102,14 +111,34 @@ msgstr "%q index out of range" msgid "%q indices must be integers, not %s" msgstr "%q indices must be integers, not %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q length must be %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q length must be >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q must be %d-%d" @@ -126,14 +155,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "%q must be >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q must be >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q must be >= 1" @@ -142,14 +167,9 @@ msgstr "%q must be >= 1" msgid "%q must be a string" msgstr "%q must be a string" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q must be a tuple of length 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -167,7 +187,11 @@ msgstr "%q must be power of 2" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q out of range" @@ -176,10 +200,6 @@ msgstr "%q out of range" msgid "%q pin invalid" msgstr "%q pin invalid" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q should be an int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -342,10 +362,6 @@ msgstr "'yield from' inside async function" msgid "'yield' outside function" msgstr "'yield' outside function" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "(x,y) integers required" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x must be assignment target" @@ -381,10 +397,6 @@ msgstr "ADC2 is being used by WiFi" msgid "Address must be %d bytes long" msgstr "Address must be %d bytes long" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Address type out of range" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "All CAN peripherals are in use" @@ -475,25 +487,6 @@ msgstr "Already running" msgid "Already scanning for wifi networks" msgstr "Already scanning for WiFi networks" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn not supported on given pin" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut functionality not supported" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut is only 16 bits. Value must be less than 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut not supported on given pin" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Another PWMAudioOut is already active" @@ -565,11 +558,6 @@ msgstr "Bit clock and word select must be sequential pins" msgid "Bit clock and word select must share a clock unit" msgstr "Bit clock and word select must share a clock unit" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bit depth must be from 1 to 6 inclusive, not %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bit depth must be multiple of 8." @@ -611,11 +599,6 @@ msgstr "Buffer + offset too small %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Buffer elements must be 4 bytes long or less" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Buffer incorrect size. Should be %d bytes." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffer is not a bytearray." @@ -625,7 +608,6 @@ msgstr "Buffer is not a bytearray." msgid "Buffer is too small" msgstr "Buffer is too small" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -640,10 +622,6 @@ msgstr "Buffer length must be a multiple of 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Buffer must be a multiple of 512 bytes" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Buffer must be at least length 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -665,10 +643,6 @@ msgstr "Bus pin %d is already in use" msgid "Byte buffer must be 16 bytes." msgstr "Byte buffer must be 16 bytes." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes must be between 0 and 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC blocks must be multiples of 16 bytes" @@ -685,6 +659,10 @@ msgstr "CRC or checksum was invalid" msgid "Call super().__init__() before accessing native object." msgstr "Call super().__init__() before accessing native object." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "Can only alarm on RTC IO from deep sleep." @@ -732,18 +710,10 @@ msgstr "Cannot get temperature" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "Cannot have scan responses for extended, connectable advertisements." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Cannot output both channels on the same pin" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "Cannot pull on input-only pin." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Cannot read without MISO pin." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Cannot record to a file" @@ -755,8 +725,8 @@ msgstr "Cannot remount '/' when visible via USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -776,22 +746,21 @@ msgid "Cannot subclass slice" msgstr "Cannot subclass slice" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Cannot vary frequency on a timer that is already in use" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Cannot wake on pin edge. Only level." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Cannot write without MOSI pin." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "CharacteristicBuffer writing not provided" @@ -804,10 +773,6 @@ msgstr "CircuitPython core code crashed hard. Crikey!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython was unable to allocate the heap." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Clock pin init failed." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Clock stretch too long" @@ -816,11 +781,6 @@ msgstr "Clock stretch too long" msgid "Clock unit in use" msgstr "Clock unit in use" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Command must be an int between 0 and 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -833,35 +793,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Corrupt .mpy file" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Could not initialise camera" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Could not initialise GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Could not initialise SDCard" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Could not initialise UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Could not reinit channel" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Could not reinit timer" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Could not restart PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Could not retrieve clock" @@ -882,20 +813,6 @@ msgstr "Could not start interrupt, RX busy" msgid "Couldn't allocate decoder" msgstr "Couldn't allocate decoder" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Couldn't allocate first buffer" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Couldn't allocate input buffer" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Couldn't allocate second buffer" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Crash into the HardFault_Handler." @@ -943,10 +860,6 @@ msgstr "Destination capacity is smaller than destination_length." msgid "Device in use" msgstr "Device in use" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut not supported on given pin" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1002,11 +915,6 @@ msgstr "Expected a %q" msgid "Expected an alarm" msgstr "Expected an alarm" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Expected tuple of length %d, got %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1033,22 +941,6 @@ msgstr "Failed sending command." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Failed to acquire mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Failed to allocate RX buffer" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Failed to allocate RX buffer of %d bytes" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Failed to allocate WiFi memory" @@ -1117,11 +1009,6 @@ msgstr "" msgid "Format not supported" msgstr "Format not supported" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Framebuffer requires %d bytes" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1136,6 +1023,10 @@ msgstr "Frequency must match existing PWMOut using this timer" msgid "Function requires lock" msgstr "Function requires lock" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Generic Failure" @@ -1163,17 +1054,13 @@ msgstr "Hardware busy, try alternative pins" msgid "Hardware in use, try alternative pins" msgstr "Hardware in use, try alternative pins" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Hostname must be between 1 and 253 characters" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "I/O operation on closed file" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C init error" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1282,75 +1169,33 @@ msgstr "" msgid "Internal error #%d" msgstr "Internal error #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Invalid %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Invalid %q pin" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Invalid %q pin selection" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Invalid ADC unit value" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "Invalid AuthMode" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Invalid BLE parameter" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Invalid BMP file" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Invalid BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Invalid DAC pin supplied" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Invalid MIDI file" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Invalid PWM frequency" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Invalid pin" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Invalid argument" @@ -1358,42 +1203,11 @@ msgstr "Invalid argument" msgid "Invalid bits per value" msgstr "Invalid bits per value" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Invalid buffer size" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Invalid byteorder string" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Invalid capture period. Valid range: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Invalid channel count" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "Invalid data_count %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "Invalid data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Invalid direction." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Invalid file" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Invalid format chunk size" @@ -1402,78 +1216,14 @@ msgstr "Invalid format chunk size" msgid "Invalid memory access." msgstr "Invalid memory access." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Invalid number of bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Invalid phase" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Invalid pin" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Invalid pin for left channel" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Invalid pin for right channel" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Invalid pins" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Invalid polarity" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Invalid properties" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Invalid run mode." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Invalid security_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Invalid size" @@ -1486,23 +1236,6 @@ msgstr "Invalid socket for TLS" msgid "Invalid state" msgstr "Invalid state" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Invalid voice" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Invalid voice count" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Invalid wave file" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Invalid word/bit length" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Key must be 16, 24, or 32 bytes long" @@ -1516,25 +1249,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS of keyword arg must be an id" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Layer already in a group." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "MAC address was invalid" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISO pin init failed." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSI pin init failed." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1544,10 +1269,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Maximum x value when mirrored is %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Messages limited to 8 bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Microphone startup delay must be in range 0.0 to 1.0" @@ -1561,10 +1282,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Missing MISO or MOSI pin" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1600,11 +1325,6 @@ msgstr "Missing first_set_pin. Instruction %d sets pin(s)" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "Missing jmp_pin. Instruction %d jumps on pin" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "More than %d report ids not supported" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Must be a %q subclass." @@ -1665,15 +1385,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "No MISO pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "No MOSI pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1712,16 +1440,6 @@ msgstr "No free GCLKs" msgid "No hardware random available" msgstr "No hardware random available" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "No hardware support on clk pin" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "No hardware support on pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "No in in program" @@ -1870,10 +1588,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Only one alarm.time alarm can be set." @@ -1905,11 +1626,6 @@ msgstr "Out of sockets" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Out-buffer elements must be <= 4 bytes long" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "Output buffer must be at least %d bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Oversample must be multiple of 8." @@ -1920,15 +1636,13 @@ msgstr "PDMIn not available" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" -"PWM frequency not writable when variable_frequency is False on construction." #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" @@ -1946,29 +1660,14 @@ msgstr "Peripheral in use" msgid "Permission denied" msgstr "Permission denied" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "Pin cannot wake from Deep Sleep" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "Pin count must be at least 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Pin count too large" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin does not have ADC capabilities" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2038,18 +1737,10 @@ msgstr "Program does IN without loading ISR" msgid "Program does OUT without loading OSR" msgstr "Program does OUT without loading OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "Program must contain at least one 16-bit instruction." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "Program size invalid" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "Program too large" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull not used when direction is output." @@ -2071,30 +1762,20 @@ msgstr "RNG deinit Error" msgid "RNG Init Error" msgstr "RNG init Error" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "RS485 inversion specified when not in RS485 mode" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "RTC calibration is not supported on this board" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC is not supported on this board" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 not yet supported on this device" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Random number generation error" @@ -2144,6 +1825,10 @@ msgstr "Running in safe mode! Not running saved code.\n" msgid "SD card CSD format not supported" msgstr "SD card CSD format not supported" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2154,30 +1839,21 @@ msgstr "SDIO GetCardInfo error %d" msgid "SDIO Init Error %d" msgstr "SDIO init error %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI init error" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI reinitialisation error" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "SPI configuration failed" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "SPI peripheral in use" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Sample rate must be positive" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2197,14 +1873,6 @@ msgstr "Serialiser in use" msgid "Server side context cannot have hostname" msgstr "Server side context cannot have hostname" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "Set pin count must be between 1 and 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "Side set pin count must be between 1 and 5" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Size not supported" @@ -2240,10 +1908,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Splitting with sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Stack size must be at least 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "Stereo left must be on PWM channel A" @@ -2336,10 +2000,6 @@ msgstr "Tile height must exactly divide bitmap height" msgid "Tile index out of bounds" msgstr "Tile index out of bounds" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Tile value out of bounds" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Tile width must exactly divide bitmap width" @@ -2359,6 +2019,9 @@ msgid "To exit, please reset the board without " msgstr "To exit, please reset the board without " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Too many channels in sample." @@ -2391,24 +2054,21 @@ msgid "Tuple or struct_time argument required" msgstr "Tuple or struct_time argument required" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UART buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART deinit error" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UART init Error" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UART reinit error" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART write error" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2546,12 +2206,6 @@ msgstr "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Unsupported baudrate" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2626,10 +2280,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFi password must be between 8 and 63 characters" - #: main.c msgid "Woken up by alarm.\n" msgstr "Woken up by alarm.\n" @@ -2783,10 +2433,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "bits must be 32 or less" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "bits must be in range 5 to 9" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample must be 8 or 16" @@ -2824,11 +2470,6 @@ msgstr "Buffer too small for requested bytes" msgid "byteorder is not a string" msgstr "Byteorder is not a string" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "Bytes > 8 bits not supported" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "Bytes length not a multiple of item size" @@ -2837,7 +2478,7 @@ msgstr "Bytes length not a multiple of item size" msgid "bytes value out of range" msgstr "Bytes value out of range" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "Calibration is out of range" @@ -2845,12 +2486,9 @@ msgstr "Calibration is out of range" msgid "calibration is read only" msgstr "Calibration is read only" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "Calibration value out of range +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3023,6 +2661,10 @@ msgstr "cannot unambiguously get sizeof scalar" msgid "casting" msgstr "casting" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "chars buffer too small" @@ -3035,10 +2677,6 @@ msgstr "chr() arg not in range(0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() arg not in range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "circle can only be registered in one parent" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "clip point must be (x,y) tuple" @@ -3464,6 +3102,10 @@ msgstr "indices must be integers" msgid "indices must be integers, slices, or Boolean lists" msgstr "indices must be integers, slices, or Boolean lists" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "initial values must be iterable" @@ -3714,10 +3356,6 @@ msgstr "math domain error" msgid "matrix is not positive definite" msgstr "matrix is not positive definite" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3725,10 +3363,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length must be 0-%d when fixed_length is %s" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length must be >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "maximum number of dimensions is 4" @@ -4099,10 +3733,6 @@ msgstr "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "polygon can only be registered in one parent" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop from an empty PulseIn" @@ -4149,14 +3779,6 @@ msgstr "pressing the left button at start up\n" msgid "pull masks conflict with direction masks" msgstr "pull masks conflict with direction masks" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "pull_threshold must be between 1 and 32" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "push_threshold must be between 1 and 32" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "queue overflow" @@ -4329,10 +3951,6 @@ msgstr "start_x should be an int" msgid "step must be non-zero" msgstr "step must be non-zero" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop must be 1 or 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop not reachable from start" @@ -4381,10 +3999,6 @@ msgstr "syntax error in uctypes descriptor" msgid "threshold must be in the range 0-65536" msgstr "threshold must be in the range 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "tile must be greater than zero" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() takes a 9-sequence" @@ -4404,10 +4018,6 @@ msgstr "timeout must be 0.0-100.0 seconds" msgid "timeout must be < 655.35 secs" msgstr "timeout must be < 655.35 secs" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeout must be >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout waiting for v1 card" @@ -4416,6 +4026,10 @@ msgstr "timeout waiting for v1 card" msgid "timeout waiting for v2 card" msgstr "timeout waiting for v2 card" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp out of range for platform time_t" @@ -4607,13 +4221,7 @@ msgstr "WatchDog not initialised" msgid "watchdog timeout must be greater than 0" msgstr "WatchDog timeout must be greater than 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "width must be from 2 to 8 (inclusive), not %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "width must be greater than zero" @@ -4685,6 +4293,342 @@ 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 "%q must be a tuple of length 2" +#~ msgstr "%q must be a tuple of length 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q must be between %d and %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q should be an int" + +#~ msgid "(x,y) integers required" +#~ msgstr "(x,y) integers required" + +#~ msgid "Address type out of range" +#~ msgstr "Address type out of range" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn not supported on given pin" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut functionality not supported" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut is only 16 bits. Value must be less than 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut not supported on given pin" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bit depth must be from 1 to 6 inclusive, not %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Buffer incorrect size. Should be %d bytes." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Buffer must be at least length 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes must be between 0 and 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Cannot output both channels on the same pin" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Cannot read without MISO pin." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Cannot reset into bootloader because no bootloader is present." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Cannot transfer without MOSI and MISO pins." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Cannot write without MOSI pin." + +#~ msgid "Clock pin init failed." +#~ msgstr "Clock pin init failed." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Command must be an int between 0 and 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Could not initialise camera" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Could not initialise GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Could not initialise SDCard" + +#~ msgid "Could not initialize UART" +#~ msgstr "Could not initialise UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Could not reinit channel" + +#~ msgid "Could not re-init timer" +#~ msgstr "Could not reinit timer" + +#~ msgid "Could not restart PWM" +#~ msgstr "Could not restart PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Couldn't allocate first buffer" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Couldn't allocate input buffer" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Couldn't allocate second buffer" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut not supported on given pin" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Expected tuple of length %d, got %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Failed to allocate RX buffer" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Failed to allocate RX buffer of %d bytes" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Framebuffer requires %d bytes" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Hostname must be between 1 and 253 characters" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C init error" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Invalid %q pin selection" + +#~ msgid "Invalid AuthMode" +#~ msgstr "Invalid AuthMode" + +#~ msgid "Invalid BMP file" +#~ msgstr "Invalid BMP file" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Invalid DAC pin supplied" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Invalid MIDI file" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Invalid PWM frequency" + +#~ msgid "Invalid Pin" +#~ msgstr "Invalid pin" + +#~ msgid "Invalid buffer size" +#~ msgstr "Invalid buffer size" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Invalid byteorder string" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Invalid capture period. Valid range: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Invalid channel count" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "Invalid data_count %d" + +#~ msgid "Invalid direction." +#~ msgstr "Invalid direction." + +#~ msgid "Invalid file" +#~ msgstr "Invalid file" + +#~ msgid "Invalid number of bits" +#~ msgstr "Invalid number of bits" + +#~ msgid "Invalid phase" +#~ msgstr "Invalid phase" + +#~ msgid "Invalid pin" +#~ msgstr "Invalid pin" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Invalid pin for left channel" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Invalid pin for right channel" + +#~ msgid "Invalid polarity" +#~ msgstr "Invalid polarity" + +#~ msgid "Invalid properties" +#~ msgstr "Invalid properties" + +#~ msgid "Invalid run mode." +#~ msgstr "Invalid run mode." + +#~ msgid "Invalid security_mode" +#~ msgstr "Invalid security_mode" + +#~ msgid "Invalid voice" +#~ msgstr "Invalid voice" + +#~ msgid "Invalid voice count" +#~ msgstr "Invalid voice count" + +#~ msgid "Invalid wave file" +#~ msgstr "Invalid wave file" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Invalid word/bit length" + +#~ msgid "Layer already in a group." +#~ msgstr "Layer already in a group." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer must be a Group or TileGrid subclass." + +#~ msgid "MISO pin init failed." +#~ msgstr "MISO pin init failed." + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSI pin init failed." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Messages limited to 8 bytes" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "More than %d report ids not supported" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "No hardware support on clk pin" + +#~ msgid "No hardware support on pin" +#~ msgstr "No hardware support on pin" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "Output buffer must be at least %d bytes" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "Pin count must be at least 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin does not have ADC capabilities" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "Program must contain at least one 16-bit instruction." + +#~ msgid "Program too large" +#~ msgstr "Program too large" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 not yet supported on this device" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "RTC calibration is not supported on this board" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 not yet supported on this device" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI init error" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI reinitialisation error" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Sample rate must be positive" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Sample rate too high. It must be less than %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "Set pin count must be between 1 and 5" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "Side set pin count must be between 1 and 5" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Stack size must be at least 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Tile value out of bounds" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UART buffer allocation error" + +#~ msgid "UART De-init error" +#~ msgstr "UART deinit error" + +#~ msgid "UART Init Error" +#~ msgstr "UART init Error" + +#~ msgid "UART Re-init error" +#~ msgstr "UART reinit error" + +#~ msgid "UART write error" +#~ msgstr "UART write error" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Unsupported baudrate" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFi password must be between 8 and 63 characters" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "bits must be in range 5 to 9" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "Bytes > 8 bits not supported" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "Calibration value out of range +/-127" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "circle can only be registered in one parent" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length must be >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "polygon can only be registered in one parent" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "pull_threshold must be between 1 and 32" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "push_threshold must be between 1 and 32" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop must be 1 or 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "tile must be greater than zero" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeout must be >= 0.0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "width must be from 2 to 8 (inclusive), not %d" + #~ msgid "Unsupported operation" #~ msgstr "Unsupported operation" diff --git a/locale/es.po b/locale/es.po index d1e4f3205e..22a2910295 100644 --- a/locale/es.po +++ b/locale/es.po @@ -75,10 +75,24 @@ msgstr "" "%d pines de dirección, %d pines rgb y %d tiles indican una altura de %d, y " "no de %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -91,12 +105,7 @@ msgstr "%q fallo: %d" msgid "%q in use" msgstr "%q está siendo utilizado" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q indice fuera de rango" @@ -104,14 +113,34 @@ msgstr "%q indice fuera de rango" msgid "%q indices must be integers, not %s" msgstr "%q indices deben ser enteros, no %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q debe ser %d-%d" @@ -128,14 +157,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "%q debe ser >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q debe ser >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q debe ser >= 1" @@ -144,14 +169,9 @@ msgstr "%q debe ser >= 1" msgid "%q must be a string" msgstr "%q debe ser una cadena" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q debe ser una tupla de longitud 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q debe estar entre %d y %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -169,7 +189,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q fuera de rango" @@ -178,10 +202,6 @@ msgstr "%q fuera de rango" msgid "%q pin invalid" msgstr "pin inválido %q" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q debe ser un int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -344,10 +364,6 @@ msgstr "'yield from' dentro de una función asincrónica" msgid "'yield' outside function" msgstr "'yield' fuera de una función" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x debe ser objetivo de la tarea" @@ -383,10 +399,6 @@ msgstr "ADC2 está siendo usado por WiFi" msgid "Address must be %d bytes long" msgstr "La dirección debe tener %d bytes de largo" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Tipo de dirección fuera de rango" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Todos los periféricos CAN están en uso" @@ -479,25 +491,6 @@ msgstr "Ya está en ejecución" msgid "Already scanning for wifi networks" msgstr "Ya se están buscando redes wifi" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "El pin proporcionado no soporta AnalogIn" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Funcionalidad AnalogOut no soportada" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut es solo de 16 bits. El valor debe ser menor que 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "El pin proporcionado no soporta AnalogOut" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Otra salida PWMAudioOut esta ya activada" @@ -569,11 +562,6 @@ msgstr "Le reloj de bit y de selector de palabra deben ser pines secuenciales" msgid "Bit clock and word select must share a clock unit" msgstr "Bit clock y word select deben compartir una unidad de reloj" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bit depth tiene que ser de 1 a 6 inclusivo, no %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bits depth debe ser múltiplo de 8." @@ -616,11 +604,6 @@ msgid "Buffer elements must be 4 bytes long or less" msgstr "" "Los elementos del búfer deben de ser de una longitud de 4 bytes o menos" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Tamaño de buffer incorrecto. Debe ser de %d bytes." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffer no es un bytearray." @@ -630,7 +613,6 @@ msgstr "Buffer no es un bytearray." msgid "Buffer is too small" msgstr "El buffer es muy pequeño" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -645,10 +627,6 @@ msgstr "El tamaño del búfer debe ser múltiplo de 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Búfer deber ser un múltiplo de 512 bytes" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Buffer debe ser de longitud 1 como minimo" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -670,10 +648,6 @@ msgstr "Bus pin %d ya está siendo utilizado" msgid "Byte buffer must be 16 bytes." msgstr "Búfer Byte debe de ser 16 bytes." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes debe estar entre 0 y 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Los bloques CBC deben ser múltiplos de 16 bytes" @@ -690,6 +664,10 @@ msgstr "CRC o suma de comprobación inválida" msgid "Call super().__init__() before accessing native object." msgstr "Llame a super().__init__() antes de acceder al objeto nativo." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "Solo puede alertar en RTC IO de deep sleep." @@ -741,18 +719,10 @@ msgstr "" "No se pueden obtener respuestas de exploración para anuncios extendidos y " "conectables." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "No se puede tener ambos canales en el mismo pin" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "No puede hacer pull en un pin de entrada sola." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "No se puede leer sin pin MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "No se puede grabar en un archivo" @@ -764,8 +734,8 @@ msgstr "No se puede remountar '/' cuanto se es visible vía USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "No se puede reiniciar a bootloader porque no hay bootloader presente." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -785,22 +755,21 @@ msgid "Cannot subclass slice" msgstr "No se puede manejar la partición en una subclase" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "No se puede transmitir sin pines MOSI y MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "No puede variar la frecuencia en un temporizador que ya está en uso" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "No puede despertar en pin edge, solo en nivel." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "No se puede escribir sin pin MOSI." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "CharateristicBuffer escritura no proporcionada" @@ -813,10 +782,6 @@ msgstr "El código central de CircuitPython se estrelló con fuerza. ¡Whoops!\n msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython no puedo encontrar el montículo." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Iniciado de pin de reloj fallido." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Estirado de reloj demasiado largo" @@ -825,11 +790,6 @@ msgstr "Estirado de reloj demasiado largo" msgid "Clock unit in use" msgstr "Clock unit está siendo utilizado" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Command debe ser un int entre 0 y 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -842,35 +802,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Archivo .mpy corrupto" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "No se puede inicializar Camera" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "No se pudo inicializar el GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "No se pudo inicializar SDCard" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "No se puede inicializar la UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "No se pudo reiniciar el canal" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "No se pudo reiniciar el temporizador" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "No se pudo reiniciar el PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "No puedo traer el reloj" @@ -891,20 +822,6 @@ msgstr "No se pudo iniciar la interrupción, RX ocupado" msgid "Couldn't allocate decoder" msgstr "No se pudo encontrar el decodificador" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "No se pudo asignar el primer buffer" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "No se pudo encontrar el buffer de entrada" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "No se pudo asignar el segundo buffer" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Choque contra el HardFault_Handler." @@ -953,10 +870,6 @@ msgstr "Capacidad de destino es mas pequeña que destination_length." msgid "Device in use" msgstr "Dispositivo en uso" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut no es compatible con un pin dado" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1012,11 +925,6 @@ msgstr "Se espera un %q" msgid "Expected an alarm" msgstr "Un objecto alarm era esperado" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Se esperaba un tuple de %d, se obtuvo %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1043,22 +951,6 @@ msgstr "Fallo enviando comando." msgid "Failed to acquire mutex, err 0x%04x" msgstr "No se puede adquirir el mutex, error 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Ha fallado la asignación del buffer RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Falló la asignación del buffer RX de %d bytes" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Fallo al tomar memoria Wifi" @@ -1127,11 +1019,6 @@ msgstr "" msgid "Format not supported" msgstr "Sin capacidades para el formato" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Framebuffer requiere %d bytes" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1147,6 +1034,10 @@ msgstr "" msgid "Function requires lock" msgstr "La función requiere lock" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Fallo Genérico" @@ -1174,17 +1065,13 @@ msgstr "Hardware ocupado, pruebe pines alternativos" msgid "Hardware in use, try alternative pins" msgstr "Hardware en uso, pruebe pines alternativos" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Hostname debe ser entre 1 y 253 caracteres" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Operación I/O en archivo cerrado" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C Error de inicio" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1300,75 +1187,33 @@ msgstr "" msgid "Internal error #%d" msgstr "Error interno #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "%q inválido" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Pin %q inválido" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "selección inválida de pin %q" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Valor de unidad de ADC no válido" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "AuthMode invalido" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Parámetro BLE invalido" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Archivo BMP inválido" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "BSSID inválido" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Pin suministrado inválido para DAC" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Archivo MIDI inválido" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Frecuencia PWM inválida" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Pin inválido" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Argumento inválido" @@ -1376,42 +1221,11 @@ msgstr "Argumento inválido" msgid "Invalid bits per value" msgstr "Inválido bits por valor" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Tamaño de buffer inválido" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Cadena de byteorder inválida" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Inválido periodo de captura. Rango válido: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Cuenta de canales inválida" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "data_count inválido %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "Inválidos los data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Dirección inválida." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Archivo inválido" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Formato de fragmento de formato no válido" @@ -1420,78 +1234,14 @@ msgstr "Formato de fragmento de formato no válido" msgid "Invalid memory access." msgstr "Acceso a memoria no válido." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Numero inválido de bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Fase inválida" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Pin inválido" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Pin inválido para canal izquierdo" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Pin inválido para canal derecho" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "pines inválidos" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Polaridad inválida" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Propiedades inválidas" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Modo de ejecución inválido." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "'security_mode' no válido" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Tamaño incorrecto" @@ -1504,23 +1254,6 @@ msgstr "socket invalido para TLS" msgid "Invalid state" msgstr "Estado invalido" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Voz inválida" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Cuenta de voces inválida" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Archivo wave inválido" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Tamaño no válido de palabra/bit" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "La llave debe tener 16, 24 o 32 bytes de longitud" @@ -1534,25 +1267,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS del agumento por palabra clave deberia ser un identificador" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "La capa ya pertenece a un grupo." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer debe ser una subclase de Group o TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "La dirección MAC es incorrecta" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISO pin init fallido." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSI pin init fallido." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1562,10 +1287,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Valor máximo de x cuando se refleja es %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Mensajes limitados a 8 bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Micrófono demora de inicio debe estar en el rango 0.0 a 1.0" @@ -1579,10 +1300,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Falta el pin MISO o MOSI" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1622,11 +1347,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Debe de ser una subclase de %q." @@ -1687,15 +1407,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Sin pin MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Sin pin MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1734,16 +1462,6 @@ msgstr "Sin GCLKs libres" msgid "No hardware random available" msgstr "No hay hardware random disponible" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Sin soporte de hardware en el pin clk" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Sin soporte de hardware en pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "No hay \"in\" en el programa" @@ -1894,10 +1612,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Solamente una alarm.time puede ser configurada." @@ -1929,11 +1650,6 @@ msgstr "Se acabaron los enchufes" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Los elementos del búfer de salida deben ser de una longitud <= 4 bytes" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "buffer de salida debe ser de por lo menos %d bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "El sobremuestreo debe ser un múltiplo de 8." @@ -1942,11 +1658,6 @@ msgstr "El sobremuestreo debe ser un múltiplo de 8." msgid "PDMIn not available" msgstr "PDMIn no esta disponible" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "PWM duty_cycle debe ser entre 0 y 65535 inclusivo (16 bit resolution)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1954,6 +1665,10 @@ msgstr "" "La frecuencia de PWM no se puede escribir variable_frequency es False en la " "construcción." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "Segmento PWM ya esta en uso" @@ -1970,29 +1685,14 @@ msgstr "Periférico en uso" msgid "Permission denied" msgstr "Permiso denegado" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "El Pin no se puede despertar de un sueño profundo" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "El total de pines debe ser por lo menos 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Total de pines demasiado grande" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin no tiene capacidad ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2065,18 +1765,10 @@ msgstr "El programa hace un IN sin cargar ISR" msgid "Program does OUT without loading OSR" msgstr "El programa hace OUT sin cargar OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "El programa debe contener por lo menos una instrucción de 16 bits." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "El tamaño del programa no es correcto" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "Programa demasiado grande" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull no se usa cuando la dirección es output." @@ -2098,30 +1790,20 @@ msgstr "Error de desinicialización de RNG" msgid "RNG Init Error" msgstr "Error de inicialización de RNG" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 no esta soportado todavía en este dispositivo" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "Se especifica inversión de RS485 si no está en modo RS485" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "Calibración de RTC no es soportada en esta placa" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC no soportado en esta placa" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "Sin capacidad de RTS/CTS/RS485 para este dispositivo" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Error de generación de números aleatorios" @@ -2172,6 +1854,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "Sin capacidad para formato CSD para tarjeta SD" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2182,30 +1868,21 @@ msgstr "Error SDIO GetCardInfo %d" msgid "SDIO Init Error %d" msgstr "Error de iniciado de SDIO %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "Error de inicio de SPI" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "Error de reinicialización de SPI" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "Configuración de SPI fallida" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "Periférico SPI en uso" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Sample rate debe ser positivo" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Frecuencia de muestreo demasiado alta. Debe ser menor a %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2225,14 +1902,6 @@ msgstr "Serializer está siendo utilizado" msgid "Server side context cannot have hostname" msgstr "El contexto del lado del servidor no puede tener un hostname" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "La suma de pines configurados debe estar entre 1 y 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "El conteo de pines de Side set debe estar entre 1 y 5" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Sin capacidades para el tamaño" @@ -2268,10 +1937,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Dividiendo con sub-capturas" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "El tamaño de la pila debe ser de al menos 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "Estéreo izquierdo debe estar en el canal PWM A" @@ -2365,10 +2030,6 @@ msgstr "La altura del Tile debe dividir exacto la altura del bitmap" msgid "Tile index out of bounds" msgstr "Índice de mosaico fuera de límites" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Valor de mosaico fuera de límites" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Ancho del Tile debe dividir exactamente el ancho de mapa de bits" @@ -2390,6 +2051,9 @@ msgid "To exit, please reset the board without " msgstr "Para salir, por favor reinicia la tarjeta sin " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Demasiados canales en sample." @@ -2422,24 +2086,21 @@ msgid "Tuple or struct_time argument required" msgstr "Argumento tuple o struct_time requerido" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "No se pudo encontrar el búfer para UART" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "Error de desinicialización de UART" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "Error de inicialización de UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "Error de reinicialización de UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "Error de escritura UART" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2577,12 +2238,6 @@ msgstr "" "Problema no especificado. Puede ser que la señal de emparejamiento del otro " "dispositivo fue denegada o ignorada." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Baudrate no soportado" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2660,10 +2315,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "La clave de WiFi debe ser entre 8 y 63 caracteres" - #: main.c msgid "Woken up by alarm.\n" msgstr "Despertado por la alarma.\n" @@ -2818,10 +2469,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "los bits deben ser 32 o menos" -#: 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" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample debe ser 8 ó 16" @@ -2859,11 +2506,6 @@ msgstr "búfer muy pequeño para los bytes solicitados" msgid "byteorder is not a string" msgstr "byteorder no es una cadena" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "bytes > 8 bits no soportados" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "el tamaño en bytes no es un múltiplo del tamaño del item" @@ -2872,7 +2514,7 @@ msgstr "el tamaño en bytes no es un múltiplo del tamaño del item" msgid "bytes value out of range" msgstr "valor de bytes fuera de rango" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "calibration esta fuera de rango" @@ -2880,12 +2522,9 @@ msgstr "calibration esta fuera de rango" msgid "calibration is read only" msgstr "calibration es de solo lectura" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "Valor de calibración fuera del rango +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3061,6 +2700,10 @@ msgstr "no se puede sin ambiguedades traer el sizeof del escalar" msgid "casting" msgstr "convirtiendo tipo" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "chars buffer es demasiado pequeño" @@ -3073,10 +2716,6 @@ msgstr "El argumento de chr() esta fuera de rango(0x110000)" msgid "chr() arg not in range(256)" msgstr "El argumento de chr() no esta en el rango(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "circulo solo puede ser registrado con un pariente" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "El punto de recorte debe ser una tupla (x, y)" @@ -3503,6 +3142,10 @@ msgstr "indices deben ser enteros" msgid "indices must be integers, slices, or Boolean lists" msgstr "los índices deben ser enteros, particiones o listas de booleanos" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "los valores iniciales deben permitir iteración" @@ -3756,10 +3399,6 @@ msgstr "error de dominio matemático" msgid "matrix is not positive definite" msgstr "matrix no es definida positiva" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3767,10 +3406,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length debe ser 0-%d cuando fixed_length es %s" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length debe ser >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "Máximo número de dimensiones es 4" @@ -4145,10 +3780,6 @@ msgstr "pixel_shader debe ser displayio.Palette o displayio.ColorConverter" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "el polígono solo se puede registrar en uno de los padres" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop de un PulseIn vacío" @@ -4195,14 +3826,6 @@ msgstr "presione el botón izquierdo al arranque\n" msgid "pull masks conflict with direction masks" msgstr "máscara de pull en conflicto con máscara de dirección" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "pull_threshold debe esta entre 1 y 32" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "push_threshold debe esta entre 1 y 32" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "desbordamiento de cola(queue)" @@ -4375,10 +3998,6 @@ msgstr "start_x deberia ser un int" msgid "step must be non-zero" msgstr "paso debe ser numero no cero" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop debe ser 1 ó 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop no se puede alcanzar del principio" @@ -4427,10 +4046,6 @@ msgstr "error de sintaxis en el descriptor uctypes" msgid "threshold must be in the range 0-65536" msgstr "limite debe ser en el rango 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "tile debe sera mas grande que cero" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() toma un sequencio 9" @@ -4451,10 +4066,6 @@ msgstr "el tiempo de espera debe ser 0.0-100.0 segundos" msgid "timeout must be < 655.35 secs" msgstr "timeout debe ser < 655.35 segundos" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "tiempo muerto debe ser >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "tiempo de espera agotado esperando por tarjeta v1" @@ -4463,6 +4074,10 @@ msgstr "tiempo de espera agotado esperando por tarjeta v1" msgid "timeout waiting for v2 card" msgstr "tiempo de espera agotado esperando a tarjeta v2" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp fuera de rango para plataform time_t" @@ -4654,13 +4269,7 @@ msgstr "watchdog no inicializado" msgid "watchdog timeout must be greater than 0" msgstr "el tiempo de espera del perro guardián debe ser mayor a 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "ancho debe estar entre 2 y 8 (inclusivamente), no %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "el ancho debe ser mayor que cero" @@ -4732,6 +4341,336 @@ 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 be a tuple of length 2" +#~ msgstr "%q debe ser una tupla de longitud 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q debe estar entre %d y %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q debe ser un int" + +#~ msgid "Address type out of range" +#~ msgstr "Tipo de dirección fuera de rango" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "El pin proporcionado no soporta AnalogIn" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Funcionalidad AnalogOut no soportada" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut es solo de 16 bits. El valor debe ser menor que 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "El pin proporcionado no soporta AnalogOut" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bit depth tiene que ser de 1 a 6 inclusivo, no %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Tamaño de buffer incorrecto. Debe ser de %d bytes." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Buffer debe ser de longitud 1 como minimo" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes debe estar entre 0 y 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "No se puede tener ambos canales en el mismo pin" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "No se puede leer sin pin MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "No se puede reiniciar a bootloader porque no hay bootloader presente." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "No se puede transmitir sin pines MOSI y MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "No se puede escribir sin pin MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Iniciado de pin de reloj fallido." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Command debe ser un int entre 0 y 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "No se puede inicializar Camera" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "No se pudo inicializar el GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "No se pudo inicializar SDCard" + +#~ msgid "Could not initialize UART" +#~ msgstr "No se puede inicializar la UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "No se pudo reiniciar el canal" + +#~ msgid "Could not re-init timer" +#~ msgstr "No se pudo reiniciar el temporizador" + +#~ msgid "Could not restart PWM" +#~ msgstr "No se pudo reiniciar el PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "No se pudo asignar el primer buffer" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "No se pudo encontrar el buffer de entrada" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "No se pudo asignar el segundo buffer" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut no es compatible con un pin dado" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Se esperaba un tuple de %d, se obtuvo %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Ha fallado la asignación del buffer RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Falló la asignación del buffer RX de %d bytes" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Framebuffer requiere %d bytes" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Hostname debe ser entre 1 y 253 caracteres" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C Error de inicio" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "selección inválida de pin %q" + +#~ msgid "Invalid AuthMode" +#~ msgstr "AuthMode invalido" + +#~ msgid "Invalid BMP file" +#~ msgstr "Archivo BMP inválido" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Pin suministrado inválido para DAC" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Archivo MIDI inválido" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Frecuencia PWM inválida" + +#~ msgid "Invalid Pin" +#~ msgstr "Pin inválido" + +#~ msgid "Invalid buffer size" +#~ msgstr "Tamaño de buffer inválido" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Cadena de byteorder inválida" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Inválido periodo de captura. Rango válido: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Cuenta de canales inválida" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "data_count inválido %d" + +#~ msgid "Invalid direction." +#~ msgstr "Dirección inválida." + +#~ msgid "Invalid file" +#~ msgstr "Archivo inválido" + +#~ msgid "Invalid number of bits" +#~ msgstr "Numero inválido de bits" + +#~ msgid "Invalid phase" +#~ msgstr "Fase inválida" + +#~ msgid "Invalid pin" +#~ msgstr "Pin inválido" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Pin inválido para canal izquierdo" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Pin inválido para canal derecho" + +#~ msgid "Invalid polarity" +#~ msgstr "Polaridad inválida" + +#~ msgid "Invalid properties" +#~ msgstr "Propiedades inválidas" + +#~ msgid "Invalid run mode." +#~ msgstr "Modo de ejecución inválido." + +#~ msgid "Invalid security_mode" +#~ msgstr "'security_mode' no válido" + +#~ msgid "Invalid voice" +#~ msgstr "Voz inválida" + +#~ msgid "Invalid voice count" +#~ msgstr "Cuenta de voces inválida" + +#~ msgid "Invalid wave file" +#~ msgstr "Archivo wave inválido" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Tamaño no válido de palabra/bit" + +#~ msgid "Layer already in a group." +#~ msgstr "La capa ya pertenece a un grupo." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer debe ser una subclase de Group o TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "MISO pin init fallido." + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSI pin init fallido." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Mensajes limitados a 8 bytes" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Sin soporte de hardware en el pin clk" + +#~ msgid "No hardware support on pin" +#~ msgstr "Sin soporte de hardware en pin" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "buffer de salida debe ser de por lo menos %d bytes" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "PWM duty_cycle debe ser entre 0 y 65535 inclusivo (16 bit resolution)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "El total de pines debe ser por lo menos 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin no tiene capacidad ADC" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "El programa debe contener por lo menos una instrucción de 16 bits." + +#~ msgid "Program too large" +#~ msgstr "Programa demasiado grande" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 no esta soportado todavía en este dispositivo" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "Calibración de RTC no es soportada en esta placa" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "Sin capacidad de RTS/CTS/RS485 para este dispositivo" + +#~ msgid "SPI Init Error" +#~ msgstr "Error de inicio de SPI" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "Error de reinicialización de SPI" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Sample rate debe ser positivo" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Frecuencia de muestreo demasiado alta. Debe ser menor a %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "La suma de pines configurados debe estar entre 1 y 5" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "El conteo de pines de Side set debe estar entre 1 y 5" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "El tamaño de la pila debe ser de al menos 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Valor de mosaico fuera de límites" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "No se pudo encontrar el búfer para UART" + +#~ msgid "UART De-init error" +#~ msgstr "Error de desinicialización de UART" + +#~ msgid "UART Init Error" +#~ msgstr "Error de inicialización de UART" + +#~ msgid "UART Re-init error" +#~ msgstr "Error de reinicialización de UART" + +#~ msgid "UART write error" +#~ msgstr "Error de escritura UART" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Baudrate no soportado" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "La clave de WiFi debe ser entre 8 y 63 caracteres" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "los bits deben estar en el rango de 5 a 9" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "bytes > 8 bits no soportados" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "Valor de calibración fuera del rango +/-127" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "circulo solo puede ser registrado con un pariente" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length debe ser >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "el polígono solo se puede registrar en uno de los padres" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "pull_threshold debe esta entre 1 y 32" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "push_threshold debe esta entre 1 y 32" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop debe ser 1 ó 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "tile debe sera mas grande que cero" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "tiempo muerto debe ser >= 0.0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "ancho debe estar entre 2 y 8 (inclusivamente), no %d" + #~ msgid "Unsupported operation" #~ msgstr "Operación no soportada" diff --git a/locale/fil.po b/locale/fil.po index ea43686206..ebbb837db1 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -67,10 +67,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -83,12 +97,7 @@ msgstr "" msgid "%q in use" msgstr "%q ay ginagamit" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q indeks wala sa sakop" @@ -96,14 +105,34 @@ msgstr "%q indeks wala sa sakop" msgid "%q indices must be integers, not %s" msgstr "%q indeks ay dapat integers, hindi %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -120,14 +149,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.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/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c #, fuzzy msgid "%q must be >= 1" @@ -137,13 +162,8 @@ msgstr "aarehas na haba dapat ang buffer slices" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -162,7 +182,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -171,11 +195,6 @@ msgstr "" msgid "%q pin invalid" msgstr "" -#: shared-bindings/fontio/BuiltinFont.c -#, fuzzy -msgid "%q should be an int" -msgstr "y ay dapat int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -339,10 +358,6 @@ msgstr "" msgid "'yield' outside function" msgstr "'yield' sa labas ng function" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x ay dapat na assignment target" @@ -378,10 +393,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "ang palette ay dapat 32 bytes ang haba" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -473,25 +484,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Hindi supportado ang AnalogOut" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut ay 16 bits. Value ay dapat hindi hihigit pa sa 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "Hindi supportado ang AnalogOut sa ibinigay na pin" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -563,11 +555,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "Ang bit clock at word select dapat makibahagi sa isang clock unit" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bit depth ay dapat multiple ng 8." @@ -609,11 +596,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Mali ang size ng buffer. Dapat %d bytes." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -623,7 +605,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -638,10 +619,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Buffer dapat ay hindi baba sa 1 na haba" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -664,10 +641,6 @@ msgstr "Ginagamit na ang DAC" msgid "Byte buffer must be 16 bytes." msgstr "buffer ay dapat bytes-like object" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Sa gitna ng 0 o 255 dapat ang bytes." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -684,6 +657,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -732,18 +709,10 @@ msgstr "Hindi makuha ang temperatura. status 0x%02x" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Hindi maaaring output ang mga parehong channel sa parehong pin" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Hindi maaring mabasa kapag walang MISO pin." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Hindi ma-record sa isang file" @@ -755,8 +724,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Hindi ma-reset sa bootloader dahil walang bootloader." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -776,21 +745,20 @@ msgid "Cannot subclass slice" msgstr "Hindi magawa ang sublcass slice" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Hindi maaaring ilipat kapag walang MOSI at MISO pin." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Hindi maaring isulat kapag walang MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -804,10 +772,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Nabigo sa pag init ng Clock pin." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Masyadong mahaba ang Clock stretch" @@ -816,12 +780,6 @@ msgstr "Masyadong mahaba ang Clock stretch" msgid "Clock unit in use" msgstr "Clock unit ginagamit" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -#, fuzzy -msgid "Command must be an int between 0 and 255" -msgstr "Sa gitna ng 0 o 255 dapat ang bytes." - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -832,35 +790,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Hindi ma-initialize ang UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -881,20 +810,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Hindi ma-iallocate ang first buffer" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Hindi ma-iallocate ang second buffer" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -945,10 +860,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1004,11 +915,6 @@ msgstr "Umasa ng %q" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1035,22 +941,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nabigo sa pag kuha ng mutex, status: 0x%08lX" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Nabigong ilaan ang RX buffer" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Nabigong ilaan ang RX buffer ng %d bytes" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1119,11 +1009,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1138,6 +1023,10 @@ msgstr "" msgid "Function requires lock" msgstr "Function nangangailangan ng lock" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1165,16 +1054,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "I/O operasyon sa saradong file" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1284,75 +1169,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Mali ang %q pin" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Mali ang BMP file" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Mali ang PWM frequency" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Maling argumento" @@ -1360,42 +1203,11 @@ msgstr "Maling argumento" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Mali ang buffer size" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Maling bilang ng channel" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Mali ang direksyon." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Mali ang file" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Mali ang format ng chunk size" @@ -1404,78 +1216,14 @@ msgstr "Mali ang format ng chunk size" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Mali ang bilang ng bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Mali ang phase" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Mali ang pin" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Mali ang pin para sa kaliwang channel" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Mali ang pin para sa kanang channel" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Mali ang pins" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Mali ang polarity" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Mali ang run mode." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1488,23 +1236,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Maling bilang ng voice" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "May hindi tama sa wave file" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1518,25 +1249,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS ng keyword arg ay dapat na id" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "Hindi ma-initialize ang MISO pin." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Hindi ma-initialize ang MOSI pin." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1546,10 +1269,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Ang delay ng startup ng mikropono ay dapat na nasa 0.0 hanggang 1.0" @@ -1563,10 +1282,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1602,11 +1325,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1667,15 +1385,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1714,16 +1440,6 @@ msgstr "Walang libreng GCLKs" msgid "No hardware random available" msgstr "Walang magagamit na hardware random" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Walang support sa hardware ang pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1871,10 +1587,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1906,11 +1625,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Oversample ay dapat multiple ng 8." @@ -1919,17 +1633,16 @@ msgstr "Oversample ay dapat multiple ng 8." msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "PWM duty_cycle ay dapat sa loob ng 0 at 65535 (16 bit resolution)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "" "PWM frequency hindi writable kapag variable_frequency ay False sa pag buo." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1946,29 +1659,14 @@ msgstr "" msgid "Permission denied" msgstr "Walang pahintulot" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Ang pin ay walang kakayahan sa ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2035,18 +1733,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull hindi ginagamit kapag ang direksyon ay output." @@ -2068,8 +1758,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2077,21 +1768,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "RTC calibration ay hindi supportado ng board na ito" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "Hindi supportado ang RTC sa board na ito" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2142,6 +1822,10 @@ msgstr "Tumatakbo sa safe mode! Hindi tumatakbo ang nai-save na code.\n" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2152,30 +1836,21 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Sample rate ay dapat positibo" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Sample rate ay masyadong mataas. Ito ay dapat hindi hiigit sa %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2195,14 +1870,6 @@ msgstr "Serializer ginagamit" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2238,10 +1905,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Binibiyak gamit ang sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Ang laki ng stack ay dapat na hindi bababa sa 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2327,10 +1990,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2350,6 +2009,9 @@ msgid "To exit, please reset the board without " msgstr "Para lumabas, paki-reset ang board na wala ang " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Sobra ang channels sa sample." @@ -2382,23 +2044,20 @@ msgid "Tuple or struct_time argument required" msgstr "Tuple o struct_time argument kailangan" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2536,12 +2195,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Hindi supportadong baudrate" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2617,10 +2270,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2773,10 +2422,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample ay dapat 8 o 16" @@ -2815,11 +2460,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "hindi sinusuportahan ang bytes > 8 bits" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2828,7 +2468,7 @@ msgstr "" msgid "bytes value out of range" msgstr "bytes value wala sa sakop" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "kalibrasion ay wala sa sakop" @@ -2836,12 +2476,9 @@ msgstr "kalibrasion ay wala sa sakop" msgid "calibration is read only" msgstr "pagkakalibrate ay basahin lamang" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "ang halaga ng pagkakalibrate ay wala sa sakop +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3018,6 +2655,10 @@ msgstr "" msgid "casting" msgstr "casting" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "masyadong maliit ang buffer" @@ -3030,10 +2671,6 @@ msgstr "chr() arg wala sa sakop ng range(0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() arg wala sa sakop ng range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3464,6 +3101,10 @@ msgstr "ang mga indeks ay dapat na integer" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3718,10 +3359,6 @@ msgstr "may pagkakamali sa math domain" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3729,10 +3366,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4105,10 +3738,6 @@ msgstr "pixel_shader ay dapat displayio.Palette o displayio.ColorConverter" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop mula sa walang laman na PulseIn" @@ -4155,14 +3784,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "puno na ang pila (overflow)" @@ -4336,10 +3957,6 @@ msgstr "y ay dapat int" msgid "step must be non-zero" msgstr "step ay dapat hindi zero" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop dapat 1 o 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop hindi maabot sa simula" @@ -4388,10 +4005,6 @@ msgstr "may pagkakamali sa sintaks sa uctypes descriptor" msgid "threshold must be in the range 0-65536" msgstr "ang threshold ay dapat sa range 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() kumukuha ng 9-sequence" @@ -4411,11 +4024,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#, fuzzy -msgid "timeout must be >= 0.0" -msgstr "bits ay dapat walo (8)" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4424,6 +4032,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "wala sa sakop ng timestamp ang platform time_t" @@ -4615,13 +4227,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4695,6 +4301,157 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#, fuzzy +#~ msgid "%q should be an int" +#~ msgstr "y ay dapat int" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Hindi supportado ang AnalogOut" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut ay 16 bits. Value ay dapat hindi hihigit pa sa 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "Hindi supportado ang AnalogOut sa ibinigay na pin" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Mali ang size ng buffer. Dapat %d bytes." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Buffer dapat ay hindi baba sa 1 na haba" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Sa gitna ng 0 o 255 dapat ang bytes." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Hindi maaaring output ang mga parehong channel sa parehong pin" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Hindi maaring mabasa kapag walang MISO pin." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Hindi ma-reset sa bootloader dahil walang bootloader." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Hindi maaaring ilipat kapag walang MOSI at MISO pin." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Hindi maaring isulat kapag walang MOSI pin." + +#~ msgid "Clock pin init failed." +#~ msgstr "Nabigo sa pag init ng Clock pin." + +#, fuzzy +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Sa gitna ng 0 o 255 dapat ang bytes." + +#~ msgid "Could not initialize UART" +#~ msgstr "Hindi ma-initialize ang UART" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Hindi ma-iallocate ang first buffer" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Hindi ma-iallocate ang second buffer" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Nabigong ilaan ang RX buffer" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Nabigong ilaan ang RX buffer ng %d bytes" + +#~ msgid "Invalid BMP file" +#~ msgstr "Mali ang BMP file" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Mali ang PWM frequency" + +#~ msgid "Invalid buffer size" +#~ msgstr "Mali ang buffer size" + +#~ msgid "Invalid channel count" +#~ msgstr "Maling bilang ng channel" + +#~ msgid "Invalid direction." +#~ msgstr "Mali ang direksyon." + +#~ msgid "Invalid file" +#~ msgstr "Mali ang file" + +#~ msgid "Invalid number of bits" +#~ msgstr "Mali ang bilang ng bits" + +#~ msgid "Invalid phase" +#~ msgstr "Mali ang phase" + +#~ msgid "Invalid pin" +#~ msgstr "Mali ang pin" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Mali ang pin para sa kaliwang channel" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Mali ang pin para sa kanang channel" + +#~ msgid "Invalid polarity" +#~ msgstr "Mali ang polarity" + +#~ msgid "Invalid run mode." +#~ msgstr "Mali ang run mode." + +#~ msgid "Invalid voice count" +#~ msgstr "Maling bilang ng voice" + +#~ msgid "Invalid wave file" +#~ msgstr "May hindi tama sa wave file" + +#~ msgid "MISO pin init failed." +#~ msgstr "Hindi ma-initialize ang MISO pin." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Hindi ma-initialize ang MOSI pin." + +#~ msgid "No hardware support on pin" +#~ msgstr "Walang support sa hardware ang pin" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "PWM duty_cycle ay dapat sa loob ng 0 at 65535 (16 bit resolution)" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Ang pin ay walang kakayahan sa ADC" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "RTC calibration ay hindi supportado ng board na ito" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Sample rate ay dapat positibo" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Sample rate ay masyadong mataas. Ito ay dapat hindi hiigit sa %d" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Ang laki ng stack ay dapat na hindi bababa sa 256" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Hindi supportadong baudrate" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "hindi sinusuportahan ang bytes > 8 bits" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "ang halaga ng pagkakalibrate ay wala sa sakop +/-127" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop dapat 1 o 2" + +#, fuzzy +#~ msgid "timeout must be >= 0.0" +#~ msgstr "bits ay dapat walo (8)" + #~ msgid "Unsupported operation" #~ msgstr "Hindi sinusuportahang operasyon" diff --git a/locale/fr.po b/locale/fr.po index 27fdb3a54a..ce6c65ce25 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -75,10 +75,24 @@ msgstr "" "%d broches d'adresse, %d broches RGB et %d pour tile indique une hauteur de " "%d, et non %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q et %q contiennent des broches en double" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q contient des broches en double" @@ -91,12 +105,7 @@ msgstr "Échec de %q : %d" msgid "%q in use" msgstr "%q en cours d'utilisation" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "index %q hors de portée" @@ -104,14 +113,34 @@ 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" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "La longueur de %q doit être %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "La longueur de %q doit être >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q doit être %d-%d" @@ -128,14 +157,10 @@ msgstr "%q doit être <= %d" msgid "%q must be >= %d" msgstr "%q doit être >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q doit être >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q doit être >= 1" @@ -144,14 +169,9 @@ msgstr "%q doit être >= 1" msgid "%q must be a string" msgstr "%q doit être une chaîne de caractères" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q doit être un tuple de longueur 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q doit être entre %d et %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -169,7 +189,11 @@ msgstr "%q doit être une puissance de 2" msgid "%q out of bounds" msgstr "%q est hors limites" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q est hors de porté" @@ -178,10 +202,6 @@ msgstr "%q est hors de porté" msgid "%q pin invalid" msgstr "broche %q invalide" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q doit être un chiffre entier (int)" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q avec un identifiant de rapport à 0 doit être de longueur 1" @@ -344,10 +364,6 @@ msgstr "'yield from' dans une fonction async" msgid "'yield' outside function" msgstr "'yield' dehors d'une fonction" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "Des entiers (x,y) requis" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x doit être la cible de l'assignement" @@ -383,10 +399,6 @@ msgstr "ADC2 est utilisé pars le Wifi" msgid "Address must be %d bytes long" msgstr "L'adresse doit être longue de %d octets" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Type d'adresse hors portée" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Tous les périphériques CAN sont utilisés" @@ -477,27 +489,6 @@ msgstr "Déjà en cours d'exécution" msgid "Already scanning for wifi networks" msgstr "Déjà à la recherche des réseaux wifi" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "'AnalogOut' n'est pas supporté sur la broche indiquée" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Fonctionnalité AnalogOut non supportée" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" -"AnalogOut est seulement 16 bits. Les valeurs doivent être inférieures à " -"65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "'AnalogOut' n'est pas supporté sur la broche indiquée" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Un autre PWMAudioOut est déjà actif" @@ -571,11 +562,6 @@ msgstr "Bit clock et word select doivent êtres sur des broches séquentielles" msgid "Bit clock and word select must share a clock unit" msgstr "'bit clock' et 'word select' doivent partager une horloge" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bit depth doit être entre 1 et 6 inclusivement, et non %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "La profondeur de bit doit être un multiple de 8." @@ -617,11 +603,6 @@ msgstr "Tampon + décalage trop petit %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Éléments du tampon doit être 4 octets ou moins" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Tampon de taille incorrect. Devrait être de %d octets." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Le tampon n'est pas un 'bytearray'." @@ -631,7 +612,6 @@ msgstr "Le tampon n'est pas un 'bytearray'." msgid "Buffer is too small" msgstr "Le tampon est trop petit" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -646,10 +626,6 @@ msgstr "La longueur de la mémoire tampon doit être un multiple de 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "La mémoire tampon doit être un multiple de 512" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Le tampon doit être de longueur au moins 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -671,10 +647,6 @@ msgstr "La broche %d du bus est déjà utilisée" msgid "Byte buffer must be 16 bytes." msgstr "Le tampon doit être de 16 octets." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Les octets 'bytes' doivent être entre 0 et 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Les blocs CBC doivent être des multiples de 16 octets" @@ -691,6 +663,10 @@ msgstr "CRC ou somme de contrôle invalide" msgid "Call super().__init__() before accessing native object." msgstr "Appelez super().__init__() avant d'accéder à l'objet natif." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "L'alarme peut seulement être depuis TRC IO depuis le someil profond." @@ -745,18 +721,10 @@ msgstr "" "Impossible d'avoir des réponses d'analyse pour les publicités étendues et " "connectables." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Les 2 canaux de sortie ne peuvent être sur la même broche" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "Ne peut tirer ('pull') sur une broche d'entrée ('input') seule." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Impossible de lire sans broche MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Impossible d'enregistrer vers un fichier" @@ -768,9 +736,8 @@ msgstr "Ne peut démonter '/' quand est visible par USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Ne peut être redémarré vers le bootloader car il n'y a pas de bootloader." #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -791,22 +758,21 @@ msgid "Cannot subclass slice" msgstr "On ne peut faire de sous-classes de tranches" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Pas de transfert sans broches MOSI et MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Impossible de faire varier la fréquence sur un minuteur déjà utilisée" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Ne peut reveillé sur le board de broche. Seuleument à niveau." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Impossible d'écrire sans broche MOSI." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Ecriture sur 'CharacteristicBuffer' non fournie" @@ -819,10 +785,6 @@ msgstr "Le code principal de CircuitPython s'est écrasé durement. Oups !\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython n'as pu faire l'allocation de la pile." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Échec de l'initialization de la broche d'horloge." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Période de l'horloge trop longue" @@ -831,11 +793,6 @@ msgstr "Période de l'horloge trop longue" msgid "Clock unit in use" msgstr "Horloge en cours d'utilisation" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "La commande doit être un chiffre entier entre 0 et 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -848,35 +805,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Fichier .mpy corrompu" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Impossible d'initialiser Camera" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Impossible d'initialiser GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Impossible d'initialiser la carte SD" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Impossible d'initialiser UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Impossible de réinitialiser le canal" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Impossible de réinitialiser le minuteur" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Impossible de redémarrer PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Impossible d’obtenir l’horloge" @@ -897,20 +825,6 @@ msgstr "Impossible de démarrer l'interruption, RX occupé" msgid "Couldn't allocate decoder" msgstr "Impossible d'allouer le décodeur" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Impossible d'allouer le premier tampon" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Impossible d'allouer le tampon d'entrée" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Impossible d'allouer le deuxième tampon" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Échec vers le HardFault_Handler." @@ -959,10 +873,6 @@ msgstr "La capacité de destination est plus petite que 'destination_length'." msgid "Device in use" msgstr "Appareil utilisé" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut non pris en charge sur la broche donnée" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1019,11 +929,6 @@ msgstr "Attendu un %q" msgid "Expected an alarm" msgstr "Une alarme était prévue" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Tuple de longueur %d attendu, obtenu %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1051,22 +956,6 @@ msgstr "Échec de l'envoi de la commande." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Echec de l'obtention de mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Echec de l'allocation du tampon RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Echec de l'allocation de %d octets du tampon RX" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Impossible d’allouer la mémoire pour Wifi" @@ -1137,11 +1026,6 @@ msgstr "" msgid "Format not supported" msgstr "Format non supporté" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "FrameBuffer nécessite %d octets" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1158,6 +1042,10 @@ msgstr "" msgid "Function requires lock" msgstr "La fonction nécessite un verrou ('lock')" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Échec génerique" @@ -1185,17 +1073,13 @@ msgstr "Matériel occupé, essayez d'autres broches" msgid "Hardware in use, try alternative pins" msgstr "Matériel utilisé, essayez d'autres broches" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Hostname doit être entre 1 et 253 caractères" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Opération d'E/S sur un fichier fermé" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "Erreur d'initialisation I2C" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1313,75 +1197,33 @@ msgstr "Erreur interne" msgid "Internal error #%d" msgstr "Erreur interne #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "%q invalide" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Broche invalide pour '%q'" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Sélection de broche %q invalide" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Valeur d'unité ADC non valide" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "AuthMode invalide" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Paramètre BLE invalide" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Fichier BMP invalide" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "BSSID invalide" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Broche DAC non valide fournie" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "Adresse MAC invalide" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Fichier MIDI invalide" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Fréquence de PWM invalide" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Broche invalide" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Paramètre invalide" @@ -1389,42 +1231,11 @@ msgstr "Paramètre invalide" msgid "Invalid bits per value" msgstr "Bits par valeur invalides" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Longueur de tampon invalide" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Chaîne byteorder non valide" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Période de capture invalide. Portée valide : 1 à 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Nombre de canaux invalide" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "data_count invalide %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "data_pins[%d] invalide" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Direction invalide." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Fichier invalide" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Taille de bloc de formatage invalide" @@ -1433,78 +1244,14 @@ msgstr "Taille de bloc de formatage invalide" msgid "Invalid memory access." msgstr "Accès à la mémoire invalide." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "Adresse MAC multicast invalide" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Nombre de bits invalide" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Phase invalide" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Broche invalide" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Broche invalide pour le canal gauche" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Broche invalide pour le canal droit" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Broches invalides" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Polarité invalide" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Propriétés invalides" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Mode de lancement invalide." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "'security_mode' invalide" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Taille invalide" @@ -1517,23 +1264,6 @@ msgstr "Socket non valide pour TLS" msgid "Invalid state" msgstr "État invalide" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Voix invalide" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Nombre de voix invalide" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Fichier WAVE invalide" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Longueur de mot / bit invalide" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "La clé doit comporter 16, 24 ou 32 octets" @@ -1547,25 +1277,17 @@ msgid "LHS of keyword arg must be an id" msgstr "La partie gauche de l'argument nommé doit être un identifiant" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Couche déjà dans un groupe." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "'Layer' doit être un 'Group' ou une sous-classe 'TileGrid'." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "Adresse physique (MAC) invalide" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "Échec de l'initialization de la broche MISO." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Échec de l'initialization de la broche MOSI." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1575,10 +1297,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "La valeur maximale de x est %d lors d'une opération miroir" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Messages limités à 8 octets" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Le délais au démarrage du micro doit être entre 0.0 et 1.0" @@ -1592,10 +1310,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Broche MISO ou MOSI manquante" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1633,11 +1355,6 @@ msgstr "first_set_pin manquant. L'instruction %d règle la/les broche(s)" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "jmp_pin manquant. L'instruction %d va passer à la broche" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "Plus de %d identifiants de rapport ne sont pas supportés" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Doit être une sous-classe de %q." @@ -1698,15 +1415,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Pas de broche MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Pas de broche MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1745,16 +1470,6 @@ msgstr "Pas de GCLK libre" msgid "No hardware random available" msgstr "Aucunes source de valeurs aléatoire matérielle disponible" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Pas de support matériel sur la broche clk" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Pas de support matériel pour cette broche" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "Programme n'a pas de \"in\"" @@ -1905,10 +1620,13 @@ msgid "Only one address is allowed" msgstr "Seulement une adresse est autorisée" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/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." @@ -1940,11 +1658,6 @@ msgstr "Plus de sockets" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Éléments du tampon de sortie doivent être <= à 4 octets" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "Tampon de sortie doit être au moins %d octets" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Le sur-échantillonage doit être un multiple de 8." @@ -1953,13 +1666,6 @@ msgstr "Le sur-échantillonage doit être un multiple de 8." msgid "PDMIn not available" msgstr "PDMIn non disponible" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"La valeur de duty_cycle de PWM doit être entre 0 et 65535 inclusivement " -"(résolution de 16 bits)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1967,6 +1673,10 @@ msgstr "" "La fréquence de PWM n'est pas modifiable quand variable_frequency est False " "à la construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "PWM slice déja utilisée" @@ -1983,29 +1693,14 @@ msgstr "Périphérique en utilisation" msgid "Permission denied" msgstr "Permission refusée" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "La broche ne peut être réveillée depuis un sommeil profond" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "Nombre de broches doit être au moins 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Nombre de broches trop élevé" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "La broche 'pin' ne supporte pas les capacitées ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2078,18 +1773,10 @@ msgstr "Le programme fait des entrées sans charger d'ISR" msgid "Program does OUT without loading OSR" msgstr "Le programme fait des sorties sans charger d'OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "Le programme doit contenir au moins une instruction de 16 bits." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "Taille du programme invalide" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "Programme trop grand" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'." @@ -2111,30 +1798,20 @@ msgstr "Erreur de désinitialisation du RNG" msgid "RNG Init Error" msgstr "Erreur d'initialisation du RNG" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 n'est pas encore supporté sur cet appareil" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "Inversion RS485 spécifiée sans être en mode RS485" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "La calibration du RTC non supportée sur cette carte" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC non supporté sur cette carte" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS / CTS / RS485 Pas encore supporté sur cet appareil" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Erreur de génération de chiffres aléatoires" @@ -2184,6 +1861,10 @@ msgstr "Mode sans-échec ! Le code sauvegardé n'est pas éxecuté.\n" msgid "SD card CSD format not supported" msgstr "Le format de carte SD CSD n'est pas supporté" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2194,30 +1875,21 @@ msgstr "Erreur de SDIO GetCardInfo %d" msgid "SDIO Init Error %d" msgstr "Erreur d'initialisation SDIO %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "Erreur d'initialisation SPI" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "Erreur de réinitialisation SPI" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "La configuration SPI a échoué" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "Périphérique SPI utilisé" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Le taux d'échantillonage doit être positif" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Taux d'échantillonage trop élevé. Doit être inférieur à %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2237,14 +1909,6 @@ msgstr "Sérialiseur en cours d'utilisation" msgid "Server side context cannot have hostname" msgstr "Un contexte niveau serveur ne peut avoir de hostname" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "Nombre de broches configurées doit être entre 1 et 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "Nombre de broches Side configurées doit être entre 1 et 5" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Taille n'est pas supportée" @@ -2280,10 +1944,6 @@ msgstr "Spécifiez une unique broche parmi data0 ou data_pins" msgid "Splitting with sub-captures" msgstr "Fractionnement avec des sous-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "La pile doit être au moins de 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "Canal stéréo gauche doit être sur le canal PWM A" @@ -2380,10 +2040,6 @@ msgstr "La hauteur de la tuile doit diviser exactement la hauteur de l'image" msgid "Tile index out of bounds" msgstr "Index des tuiles hors limites" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Valeur de tuile hors limites" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "La largeur de la tuile doit diviser exactement la largeur de l'image" @@ -2403,6 +2059,9 @@ msgid "To exit, please reset the board without " msgstr "Pour quitter, SVP redémarrez la carte sans " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Trop de canaux dans l'échantillon." @@ -2435,24 +2094,21 @@ msgid "Tuple or struct_time argument required" msgstr "Paramètre de type tuple ou struct_time requis" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "Erreur d'allocation de tampon UART" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "Erreur de désactivation UART" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "Erreur d'initialisation UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "Erreur de réinitialisation UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "Erreur d'écriture UART" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2594,12 +2250,6 @@ msgstr "" "Problème non spécifié. Il se peut que l'invite d'association sur l'autre " "appareil ait été refusée ou ignorée." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Débit en bauds non supporté" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "Espace de couleur non supporté" @@ -2683,10 +2333,6 @@ msgstr "" "\n" "Pour lister les modules internes, entrez `help(\"modules\")`.\n" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "Le mot de passe WiFi doit faire entre 8 et 63 caractères" - #: main.c msgid "Woken up by alarm.\n" msgstr "Réveil par alarme.\n" @@ -2841,10 +2487,6 @@ msgstr "Les tailles des images doivent correspondre" msgid "bits must be 32 or less" msgstr "Les bits doivent être 32 ou moins" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "les bits doivent être compris entre 5 et 9" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "'bits_per_sample' doivent être 8 ou 16" @@ -2882,11 +2524,6 @@ msgstr "tampon trop petit pour le nombre d'octets demandé" msgid "byteorder is not a string" msgstr "byteorder n'est pas une chaîne" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "octets > 8 bits non supporté" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "bytes length n'est pas un multiple de la taille d'un élément" @@ -2895,7 +2532,7 @@ msgstr "bytes length n'est pas un multiple de la taille d'un élément" msgid "bytes value out of range" msgstr "valeur des octets hors bornes" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "étalonnage hors bornes" @@ -2903,12 +2540,9 @@ msgstr "étalonnage hors bornes" msgid "calibration is read only" msgstr "étalonnage en lecture seule" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "valeur de étalonnage hors bornes +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3086,6 +2720,10 @@ msgstr "ne peut récupérer sans ambigüité le sizeof d'un scalaire" msgid "casting" msgstr "typage" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "tampon de caractères trop petit" @@ -3098,10 +2736,6 @@ msgstr "paramètre de chr() hors les bornes de range(0x11000)" msgid "chr() arg not in range(256)" msgstr "paramètre de chr() hors les bornes de range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "le cercle ne peut être enregistré que dans un seul parent" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "point de coupure doît être un tuple (x,y)" @@ -3531,6 +3165,10 @@ msgid "indices must be integers, slices, or Boolean lists" msgstr "" "les indices doivent être des entiers, des tranches ou des listes booléennes" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "les valeurs initiales doivent être itérables" @@ -3786,10 +3424,6 @@ msgstr "erreur de domaine math" msgid "matrix is not positive definite" msgstr "la matrice n'est pas définie positive" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3797,10 +3431,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length doit être 0-%d lorsque fixed_length est %s" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length doit être >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "nombre maximal de dimensions est 4" @@ -4176,10 +3806,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "le polygone ne peut être enregistré que dans un parent" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "'pop' d'une entrée PulseIn vide" @@ -4226,14 +3852,6 @@ msgstr "appuyer le bouton de gauche au démarage\n" msgid "pull masks conflict with direction masks" msgstr "masque pull est en conflit avec les masques de direction" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "pull_threshold doit être entre 1 et 32" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "push_threshold doit être entre 1 et 32" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "dépassement de file" @@ -4406,10 +4024,6 @@ msgstr "'start_x' doit être un entier 'int'" msgid "step must be non-zero" msgstr "le pas 'step' doit être non nul" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop doit être 1 ou 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop n'est pas accessible au démarrage" @@ -4459,10 +4073,6 @@ msgstr "erreur de syntaxe dans le descripteur d'uctypes" msgid "threshold must be in the range 0-65536" msgstr "le seuil doit être dans la portée 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "tile doit être plus que zéro" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() prend une séquence de longueur 9" @@ -4482,10 +4092,6 @@ msgstr "le délai doit être compris entre 0.0 et 100.0 secondes" msgid "timeout must be < 655.35 secs" msgstr "le délai (timeout) doit être < 655.35 secondes" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "'timeout' doit être >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "Délai d’expiration dépassé en attendant une carte v1" @@ -4494,6 +4100,10 @@ msgstr "Délai d’expiration dépassé en attendant une carte v1" msgid "timeout waiting for v2 card" msgstr "Délai d’expiration dépassé en attendant une carte v2" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp hors bornes pour 'time_t' de la plateforme" @@ -4685,13 +4295,7 @@ msgstr "chien de garde (watchdog) non initialisé" msgid "watchdog timeout must be greater than 0" msgstr "watchdog timeout doit être supérieur à 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "width doit être entre 2 et 8 (inclusivement), non %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "width doit être plus que zero" @@ -4763,6 +4367,346 @@ 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 "%q must be a tuple of length 2" +#~ msgstr "%q doit être un tuple de longueur 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q doit être entre %d et %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q doit être un chiffre entier (int)" + +#~ msgid "(x,y) integers required" +#~ msgstr "Des entiers (x,y) requis" + +#~ msgid "Address type out of range" +#~ msgstr "Type d'adresse hors portée" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "'AnalogOut' n'est pas supporté sur la broche indiquée" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Fonctionnalité AnalogOut non supportée" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "" +#~ "AnalogOut est seulement 16 bits. Les valeurs doivent être inférieures à " +#~ "65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "'AnalogOut' n'est pas supporté sur la broche indiquée" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bit depth doit être entre 1 et 6 inclusivement, et non %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Tampon de taille incorrect. Devrait être de %d octets." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Le tampon doit être de longueur au moins 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Les octets 'bytes' doivent être entre 0 et 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Les 2 canaux de sortie ne peuvent être sur la même broche" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Impossible de lire sans broche MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Ne peut être redémarré vers le bootloader car il n'y a pas de bootloader." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Pas de transfert sans broches MOSI et MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Impossible d'écrire sans broche MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Échec de l'initialization de la broche d'horloge." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "La commande doit être un chiffre entier entre 0 et 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Impossible d'initialiser Camera" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Impossible d'initialiser GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Impossible d'initialiser la carte SD" + +#~ msgid "Could not initialize UART" +#~ msgstr "Impossible d'initialiser UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Impossible de réinitialiser le canal" + +#~ msgid "Could not re-init timer" +#~ msgstr "Impossible de réinitialiser le minuteur" + +#~ msgid "Could not restart PWM" +#~ msgstr "Impossible de redémarrer PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Impossible d'allouer le premier tampon" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Impossible d'allouer le tampon d'entrée" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Impossible d'allouer le deuxième tampon" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut non pris en charge sur la broche donnée" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Tuple de longueur %d attendu, obtenu %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Echec de l'allocation du tampon RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Echec de l'allocation de %d octets du tampon RX" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "FrameBuffer nécessite %d octets" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Hostname doit être entre 1 et 253 caractères" + +#~ msgid "I2C Init Error" +#~ msgstr "Erreur d'initialisation I2C" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Sélection de broche %q invalide" + +#~ msgid "Invalid AuthMode" +#~ msgstr "AuthMode invalide" + +#~ msgid "Invalid BMP file" +#~ msgstr "Fichier BMP invalide" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Broche DAC non valide fournie" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Fichier MIDI invalide" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Fréquence de PWM invalide" + +#~ msgid "Invalid Pin" +#~ msgstr "Broche invalide" + +#~ msgid "Invalid buffer size" +#~ msgstr "Longueur de tampon invalide" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Chaîne byteorder non valide" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Période de capture invalide. Portée valide : 1 à 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Nombre de canaux invalide" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "data_count invalide %d" + +#~ msgid "Invalid direction." +#~ msgstr "Direction invalide." + +#~ msgid "Invalid file" +#~ msgstr "Fichier invalide" + +#~ msgid "Invalid number of bits" +#~ msgstr "Nombre de bits invalide" + +#~ msgid "Invalid phase" +#~ msgstr "Phase invalide" + +#~ msgid "Invalid pin" +#~ msgstr "Broche invalide" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Broche invalide pour le canal gauche" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Broche invalide pour le canal droit" + +#~ msgid "Invalid polarity" +#~ msgstr "Polarité invalide" + +#~ msgid "Invalid properties" +#~ msgstr "Propriétés invalides" + +#~ msgid "Invalid run mode." +#~ msgstr "Mode de lancement invalide." + +#~ msgid "Invalid security_mode" +#~ msgstr "'security_mode' invalide" + +#~ msgid "Invalid voice" +#~ msgstr "Voix invalide" + +#~ msgid "Invalid voice count" +#~ msgstr "Nombre de voix invalide" + +#~ msgid "Invalid wave file" +#~ msgstr "Fichier WAVE invalide" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Longueur de mot / bit invalide" + +#~ msgid "Layer already in a group." +#~ msgstr "Couche déjà dans un groupe." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "'Layer' doit être un 'Group' ou une sous-classe 'TileGrid'." + +#~ msgid "MISO pin init failed." +#~ msgstr "Échec de l'initialization de la broche MISO." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Échec de l'initialization de la broche MOSI." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Messages limités à 8 octets" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "Plus de %d identifiants de rapport ne sont pas supportés" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Pas de support matériel sur la broche clk" + +#~ msgid "No hardware support on pin" +#~ msgstr "Pas de support matériel pour cette broche" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "Tampon de sortie doit être au moins %d octets" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "La valeur de duty_cycle de PWM doit être entre 0 et 65535 inclusivement " +#~ "(résolution de 16 bits)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "Nombre de broches doit être au moins 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "La broche 'pin' ne supporte pas les capacitées ADC" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "Le programme doit contenir au moins une instruction de 16 bits." + +#~ msgid "Program too large" +#~ msgstr "Programme trop grand" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 n'est pas encore supporté sur cet appareil" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "La calibration du RTC non supportée sur cette carte" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS / CTS / RS485 Pas encore supporté sur cet appareil" + +#~ msgid "SPI Init Error" +#~ msgstr "Erreur d'initialisation SPI" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "Erreur de réinitialisation SPI" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Le taux d'échantillonage doit être positif" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Taux d'échantillonage trop élevé. Doit être inférieur à %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "Nombre de broches configurées doit être entre 1 et 5" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "Nombre de broches Side configurées doit être entre 1 et 5" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "La pile doit être au moins de 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Valeur de tuile hors limites" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "Erreur d'allocation de tampon UART" + +#~ msgid "UART De-init error" +#~ msgstr "Erreur de désactivation UART" + +#~ msgid "UART Init Error" +#~ msgstr "Erreur d'initialisation UART" + +#~ msgid "UART Re-init error" +#~ msgstr "Erreur de réinitialisation UART" + +#~ msgid "UART write error" +#~ msgstr "Erreur d'écriture UART" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Débit en bauds non supporté" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "Le mot de passe WiFi doit faire entre 8 et 63 caractères" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "les bits doivent être compris entre 5 et 9" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "octets > 8 bits non supporté" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "valeur de étalonnage hors bornes +/-127" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "le cercle ne peut être enregistré que dans un seul parent" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length doit être >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "le polygone ne peut être enregistré que dans un parent" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "pull_threshold doit être entre 1 et 32" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "push_threshold doit être entre 1 et 32" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop doit être 1 ou 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "tile doit être plus que zéro" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "'timeout' doit être >= 0.0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "width doit être entre 2 et 8 (inclusivement), non %d" + #~ msgid "Unsupported operation" #~ msgstr "Opération non supportée" diff --git a/locale/hi.po b/locale/hi.po index 5f18b16a23..b3367cf365 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -66,10 +66,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -82,12 +96,7 @@ msgstr "" msgid "%q in use" msgstr "" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "" @@ -95,14 +104,34 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -119,14 +148,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.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/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c msgid "%q must be >= 1" msgstr "" @@ -135,13 +160,8 @@ msgstr "" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -160,7 +180,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -169,10 +193,6 @@ msgstr "" msgid "%q pin invalid" msgstr "" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -335,10 +355,6 @@ msgstr "" msgid "'yield' outside function" msgstr "" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -374,10 +390,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -468,25 +480,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -556,11 +549,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "" @@ -602,11 +590,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -616,7 +599,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -631,10 +613,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -656,10 +634,6 @@ msgstr "" msgid "Byte buffer must be 16 bytes." msgstr "" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -676,6 +650,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -723,18 +701,10 @@ msgstr "" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "" @@ -746,7 +716,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -767,20 +737,19 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -795,10 +764,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -807,11 +772,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -822,35 +782,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -871,20 +802,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -932,10 +849,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -991,11 +904,6 @@ msgstr "" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1022,22 +930,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1106,11 +998,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1125,6 +1012,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1152,16 +1043,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1269,75 +1156,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1345,42 +1190,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1389,78 +1203,14 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1473,23 +1223,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1503,25 +1236,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1531,10 +1256,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1548,10 +1269,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1587,11 +1312,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1652,15 +1372,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1699,16 +1427,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1853,10 +1571,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1888,11 +1609,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1903,12 +1619,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1927,29 +1642,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2016,18 +1716,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2049,8 +1741,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2058,21 +1751,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2122,6 +1804,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2132,29 +1818,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2175,14 +1852,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2218,10 +1887,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2307,10 +1972,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2330,6 +1991,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2362,23 +2026,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2515,12 +2176,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2595,10 +2250,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2751,10 +2402,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2792,11 +2439,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2805,7 +2447,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2813,12 +2455,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -2989,6 +2628,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3001,10 +2644,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3429,6 +3068,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3679,10 +3322,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3690,10 +3329,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4064,10 +3699,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4114,14 +3745,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4292,10 +3915,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4344,10 +3963,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4367,10 +3982,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4379,6 +3990,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4570,13 +4185,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 08fd145a80..779b284b35 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -73,10 +73,24 @@ msgid "" msgstr "" "%d pin indirizzo, %d pin rgb e %d tessere indicano l'altezza di %d, non %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -89,12 +103,7 @@ msgstr "%q fallito: %d" msgid "%q in use" msgstr "%q in uso" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "indice %q fuori intervallo" @@ -102,14 +111,34 @@ msgstr "indice %q fuori intervallo" msgid "%q indices must be integers, not %s" msgstr "gli indici %q devono essere interi, non %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -126,14 +155,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q deve essere >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/Shape.c -#: shared-bindings/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c #, fuzzy msgid "%q must be >= 1" @@ -143,13 +168,8 @@ msgstr "slice del buffer devono essere della stessa lunghezza" 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" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -168,7 +188,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q oltre il limite" @@ -177,10 +201,6 @@ msgstr "%q oltre il limite" msgid "%q pin invalid" msgstr "%q pin non valido" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q dovrebbe essere un int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -344,10 +364,6 @@ msgstr "'yield from' è nella funzione sincronizzazione" msgid "'yield' outside function" msgstr "'yield' al di fuori della funzione" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x deve essere il bersaglio del assegnamento" @@ -383,10 +399,6 @@ msgstr "ADC2 sta usando il WiFi" msgid "Address must be %d bytes long" msgstr "L'indirizzo deve essere lungo %d byte" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Tipo di indirizzo fuori intervallo" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Tutte le periferiche CAN sono in uso" @@ -478,25 +490,6 @@ msgstr "Già in funzione" msgid "Already scanning for wifi networks" msgstr "Già in ricerca di collegamenti WiFi" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "funzionalità AnalogOut non supportata" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut ha solo 16 bit. Il valore deve essere meno di 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut non supportato sul pin scelto" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -569,11 +562,6 @@ msgid "Bit clock and word select must share a clock unit" msgstr "" "Clock di bit e selezione parola devono condividere la stessa unità di clock" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "La profondità dei bit deve essere inclusiva da 1 a 6, non %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "La profondità di bit deve essere un multiplo di 8." @@ -615,11 +603,6 @@ msgstr "Buffer + offset troppo piccolo %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Buffer di lunghezza non valida. Dovrebbe essere di %d bytes." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffer non è un array di bites." @@ -629,7 +612,6 @@ msgstr "Buffer non è un array di bites." msgid "Buffer is too small" msgstr "Buffer troppo piccolo" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -644,10 +626,6 @@ msgstr "La lunghezza del buffer deve essere un multiplo di 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Il buffer deve essere un multiplo di 512 bytes" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Il buffer deve essere lungo almeno 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -669,10 +647,6 @@ msgstr "Bus pin %d è già in uso" msgid "Byte buffer must be 16 bytes." msgstr "I buffer byte devono essere di almeno 16 bytes." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "I byte devono essere compresi tra 0 e 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "I blocchi CBC devono essere multipli di 16 bytes" @@ -689,6 +663,10 @@ msgstr "CRC o controllo totale è risultato non valido" msgid "Call super().__init__() before accessing native object." msgstr "Chiama super().__init__() prima di accedere ad un oggetto nativo." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -737,18 +715,10 @@ msgstr "Impossibile leggere la temperatura. status: 0x%02x" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Impossibile dare in output entrambi i canal sullo stesso pin" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Impossibile leggere senza pin MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Impossibile registrare in un file" @@ -760,9 +730,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Impossibile resettare nel bootloader poiché nessun bootloader è presente." #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -782,21 +751,20 @@ msgid "Cannot subclass slice" msgstr "Impossibile subclasare slice" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Impossibile trasferire senza i pin MOSI e MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Impossibile scrivere senza pin MOSI." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -810,10 +778,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Inizializzazione del pin di clock fallita." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Orologio e troppo allungato" @@ -822,12 +786,6 @@ msgstr "Orologio e troppo allungato" msgid "Clock unit in use" msgstr "Unità di clock in uso" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -#, fuzzy -msgid "Command must be an int between 0 and 255" -msgstr "I byte devono essere compresi tra 0 e 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -838,35 +796,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Impossibile inizializzare l'UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -887,20 +816,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Impossibile allocare il primo buffer" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Impossibile allocare il secondo buffer" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -950,10 +865,6 @@ msgstr "La capacità di destinazione è più piccola di destination_length." msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1009,11 +920,6 @@ msgstr "Atteso un %q" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1040,22 +946,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "Impossibile acquisire il mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Impossibile allocare buffer RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Fallita allocazione del buffer RX di %d byte" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1124,11 +1014,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1143,6 +1028,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1170,16 +1059,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "operazione I/O su file chiuso" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1289,75 +1174,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Pin %q non valido" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "File BMP non valido" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Frequenza PWM non valida" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Argomento non valido" @@ -1365,44 +1208,11 @@ msgstr "Argomento non valido" msgid "Invalid bits per value" msgstr "bits per valore invalido" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -#, fuzzy -msgid "Invalid buffer size" -msgstr "lunghezza del buffer non valida" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "periodo di cattura invalido. Zona valida: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -#, fuzzy -msgid "Invalid channel count" -msgstr "Argomento non valido" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Direzione non valida." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "File non valido" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1411,78 +1221,14 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Numero di bit non valido" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Fase non valida" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Pin non valido" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Pin non valido per il canale sinistro" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Pin non valido per il canale destro" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Pin non validi" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Polarità non valida" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Modalità di esecuzione non valida." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1495,24 +1241,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -#, fuzzy -msgid "Invalid voice count" -msgstr "Tipo di servizio non valido" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "File wave non valido" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1526,25 +1254,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer deve essere un Group o TileGrid subclass" +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "inizializzazione del pin MISO fallita." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "inizializzazione del pin MOSI fallita." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1554,10 +1274,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Valore massimo di x quando rispachiato è %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1572,10 +1288,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1611,11 +1331,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1676,15 +1391,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1723,16 +1446,6 @@ msgstr "Nessun GCLK libero" msgid "No hardware random available" msgstr "Nessun generatore hardware di numeri casuali disponibile" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Nessun supporto hardware sul pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1881,10 +1594,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1916,11 +1632,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "L'oversampling deve essere multiplo di 8." @@ -1929,13 +1640,6 @@ msgstr "L'oversampling deve essere multiplo di 8." msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"duty_cycle del PWM deve essere compresa tra 0 e 65535 inclusiva (risoluzione " -"a 16 bit)" - #: shared-bindings/pwmio/PWMOut.c #, fuzzy msgid "" @@ -1944,6 +1648,10 @@ msgstr "" "frequenza PWM frequency non è scrivibile quando variable_frequency è " "impostato nel costruttore a False." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1960,29 +1668,14 @@ msgstr "" msgid "Permission denied" msgstr "Permesso negato" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Il pin non ha capacità di ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2050,18 +1743,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2083,8 +1768,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2092,21 +1778,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "calibrazione RTC non supportata su questa scheda" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC non supportato su questa scheda" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2157,6 +1832,10 @@ msgstr "Modalità sicura in esecuzione! Codice salvato non in esecuzione.\n" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2167,32 +1846,21 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -#, fuzzy -msgid "Sample rate must be positive" -msgstr "STA deve essere attiva" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" -"Frequenza di campionamento troppo alta. Il valore deve essere inferiore a %d" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2212,14 +1880,6 @@ msgstr "Serializer in uso" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2255,10 +1915,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Suddivisione con sotto-catture" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "La dimensione dello stack deve essere almeno 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2344,10 +2000,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2367,6 +2019,9 @@ msgid "To exit, please reset the board without " msgstr "Per uscire resettare la scheda senza " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2399,23 +2054,20 @@ msgid "Tuple or struct_time argument required" msgstr "Tupla o struct_time richiesto come argomento" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2553,12 +2205,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "baudrate non supportato" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2634,10 +2280,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2790,10 +2432,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c #, fuzzy msgid "bits_per_sample must be 8 or 16" @@ -2834,11 +2472,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "byte > 8 bit non supportati" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2847,7 +2480,7 @@ msgstr "" msgid "bytes value out of range" msgstr "valore byte fuori intervallo" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "la calibrazione è fuori intervallo" @@ -2855,12 +2488,9 @@ msgstr "la calibrazione è fuori intervallo" msgid "calibration is read only" msgstr "la calibrazione è in sola lettura" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "valore di calibrazione fuori intervallo +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3032,6 +2662,10 @@ msgstr "" msgid "casting" msgstr "casting" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "buffer dei caratteri troppo piccolo" @@ -3044,10 +2678,6 @@ msgstr "argomento di chr() non è in range(0x110000)" msgid "chr() arg not in range(256)" msgstr "argomento di chr() non è in range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3479,6 +3109,10 @@ msgstr "gli indici devono essere interi" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3734,10 +3368,6 @@ msgstr "errore di dominio matematico" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3745,10 +3375,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4125,10 +3751,6 @@ msgstr "pixel_shader deve essere displayio.Palette o displayio.ColorConverter" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop sun un PulseIn vuoto" @@ -4175,14 +3797,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "overflow della coda" @@ -4356,10 +3970,6 @@ msgstr "y dovrebbe essere un int" msgid "step must be non-zero" msgstr "step deve essere non zero" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop non raggiungibile dall'inizio" @@ -4408,10 +4018,6 @@ msgstr "errore di sintassi nel descrittore uctypes" msgid "threshold must be in the range 0-65536" msgstr "la soglia deve essere nell'intervallo 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4431,11 +4037,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#, fuzzy -msgid "timeout must be >= 0.0" -msgstr "i bit devono essere 8" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4444,6 +4045,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp è fuori intervallo per il time_t della piattaforma" @@ -4635,13 +4240,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4715,6 +4314,178 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q deve essere una tupla di lunghezza 2" + +#~ msgid "%q should be an int" +#~ msgstr "%q dovrebbe essere un int" + +#~ msgid "Address type out of range" +#~ msgstr "Tipo di indirizzo fuori intervallo" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "funzionalità AnalogOut non supportata" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut ha solo 16 bit. Il valore deve essere meno di 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut non supportato sul pin scelto" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "La profondità dei bit deve essere inclusiva da 1 a 6, non %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Buffer di lunghezza non valida. Dovrebbe essere di %d bytes." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Il buffer deve essere lungo almeno 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "I byte devono essere compresi tra 0 e 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Impossibile dare in output entrambi i canal sullo stesso pin" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Impossibile leggere senza pin MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Impossibile resettare nel bootloader poiché nessun bootloader è presente." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Impossibile trasferire senza i pin MOSI e MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Impossibile scrivere senza pin MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Inizializzazione del pin di clock fallita." + +#, fuzzy +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "I byte devono essere compresi tra 0 e 255" + +#~ msgid "Could not initialize UART" +#~ msgstr "Impossibile inizializzare l'UART" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Impossibile allocare il primo buffer" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Impossibile allocare il secondo buffer" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Impossibile allocare buffer RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Fallita allocazione del buffer RX di %d byte" + +#~ msgid "Invalid BMP file" +#~ msgstr "File BMP non valido" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Frequenza PWM non valida" + +#, fuzzy +#~ msgid "Invalid buffer size" +#~ msgstr "lunghezza del buffer non valida" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "periodo di cattura invalido. Zona valida: 1 - 500" + +#, fuzzy +#~ msgid "Invalid channel count" +#~ msgstr "Argomento non valido" + +#~ msgid "Invalid direction." +#~ msgstr "Direzione non valida." + +#~ msgid "Invalid file" +#~ msgstr "File non valido" + +#~ msgid "Invalid number of bits" +#~ msgstr "Numero di bit non valido" + +#~ msgid "Invalid phase" +#~ msgstr "Fase non valida" + +#~ msgid "Invalid pin" +#~ msgstr "Pin non valido" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Pin non valido per il canale sinistro" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Pin non valido per il canale destro" + +#~ msgid "Invalid polarity" +#~ msgstr "Polarità non valida" + +#~ msgid "Invalid run mode." +#~ msgstr "Modalità di esecuzione non valida." + +#, fuzzy +#~ msgid "Invalid voice count" +#~ msgstr "Tipo di servizio non valido" + +#~ msgid "Invalid wave file" +#~ msgstr "File wave non valido" + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer deve essere un Group o TileGrid subclass" + +#~ msgid "MISO pin init failed." +#~ msgstr "inizializzazione del pin MISO fallita." + +#~ msgid "MOSI pin init failed." +#~ msgstr "inizializzazione del pin MOSI fallita." + +#~ msgid "No hardware support on pin" +#~ msgstr "Nessun supporto hardware sul pin" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "duty_cycle del PWM deve essere compresa tra 0 e 65535 inclusiva " +#~ "(risoluzione a 16 bit)" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Il pin non ha capacità di ADC" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "calibrazione RTC non supportata su questa scheda" + +#, fuzzy +#~ msgid "Sample rate must be positive" +#~ msgstr "STA deve essere attiva" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "" +#~ "Frequenza di campionamento troppo alta. Il valore deve essere inferiore a " +#~ "%d" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "La dimensione dello stack deve essere almeno 256" + +#~ msgid "Unsupported baudrate" +#~ msgstr "baudrate non supportato" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "byte > 8 bit non supportati" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "valore di calibrazione fuori intervallo +/-127" + +#, fuzzy +#~ msgid "timeout must be >= 0.0" +#~ msgstr "i bit devono essere 8" + #~ msgid "Unsupported operation" #~ msgstr "Operazione non supportata" diff --git a/locale/ja.po b/locale/ja.po index d5615d92f8..7aff0c1fc8 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -71,10 +71,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -87,12 +101,7 @@ msgstr "%q 失敗: %d" msgid "%q in use" msgstr "%qは使用中" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q インデックスは範囲外" @@ -100,14 +109,34 @@ msgstr "%q インデックスは範囲外" msgid "%q indices must be integers, not %s" msgstr "" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -124,14 +153,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%qは0以上でなければなりません" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%qは1以上でなければなりません" @@ -140,13 +165,8 @@ msgstr "%qは1以上でなければなりません" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%qは長さ2のタプルでなければなりません" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -165,7 +185,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q が範囲外" @@ -174,10 +198,6 @@ msgstr "%q が範囲外" msgid "%q pin invalid" msgstr "%q ピンは無効" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%qはint型でなければなりません" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -340,10 +360,6 @@ msgstr "" msgid "'yield' outside function" msgstr "関数外でのyield" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*xは代入先でなければなりません" @@ -379,10 +395,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "アドレスは、%dバイト長でなければなりません" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "address_typeが範囲外" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "全てのCAN周辺機器が使用中" @@ -473,25 +485,6 @@ msgstr "すでに実行中" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "指定のピンはAnalogInに対応していません" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut機能に対応していません" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOutは16ビットです。値は65536以下でなければなりません" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "指定のピンはAnalogOutに対応していません" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -563,11 +556,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "bit clockとword selectはクロックユニットを共有しなければなりません" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "ビット深度は8の倍数でなければなりません" @@ -609,11 +597,6 @@ msgstr "buffer + offsetが小さすぎます %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "バッファサイズが不正です。%dバイトでなければなりません" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "バッファがbytearrayではありません" @@ -623,7 +606,6 @@ msgstr "バッファがbytearrayではありません" msgid "Buffer is too small" msgstr "バッファが小さすぎます" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -638,10 +620,6 @@ msgstr "バッファ長は512の倍数でなければなりません" msgid "Buffer must be a multiple of 512 bytes" msgstr "バッファは512の倍数でなければなりません" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "バッファ長は少なくとも1以上でなければなりません" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -663,10 +641,6 @@ msgstr "Busピン%dはすでに使用中" msgid "Byte buffer must be 16 bytes." msgstr "バッファは16バイトでなければなりません" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "バイト値は0から255の間でなければなりません" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBCブロックは16バイトの整数倍でなければなりません" @@ -685,6 +659,10 @@ msgstr "" "ネイティブオブジェクトにアクセスする前にsuper().__init__()を呼び出してくださ" "い" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -732,18 +710,10 @@ msgstr "温度を取得できません" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "同じピン上の両チャネルに出力できません" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "MISOピンなしで読み込めません" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "ファイルへ記録できません" @@ -755,8 +725,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "ブートローダが存在しないためブートローダへとリセットできません" +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -776,21 +746,20 @@ msgid "Cannot subclass slice" msgstr "sliceをサブクラス化することはできません" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "MOSIピンとMISOピンなしに転送できません" +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "使用中のタイマー上では周波数を変えられません" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "MOSIピンなしで書き込みできません" +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -804,10 +773,6 @@ msgstr "CircuitPythonのコアコードが激しくクラッシュしました msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPythonはヒープを確保できませんでした" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "クロックピン初期化に失敗" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "クロックのストレッチが長すぎ" @@ -816,11 +781,6 @@ msgstr "クロックのストレッチが長すぎ" msgid "Clock unit in use" msgstr "クロックユニットは使用中" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "commandは0から255の間の整数でなければなりません" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -831,35 +791,6 @@ msgstr "接続は切断済みでもう使えません。新しい接続を作成 msgid "Corrupt .mpy file" msgstr "破損した .mpy ファイル" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "カメラを初期化できません" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "GNSSを初期化できません" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "SDカードを初期化できません" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "UARTを初期化できません" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "チャネルを再初期化できません" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "タイマーを再初期化できません" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "PWMを再スタートできません" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -880,20 +811,6 @@ msgstr "割り込みをスタートできません。RXビジー" msgid "Couldn't allocate decoder" msgstr "デコーダを確保できません" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "1つ目のバッファを確保できません" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "入力バッファを確保できません" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "2つ目のバッファを確保できません" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "クラッシュしてHardFault_Handlerに入りました" @@ -941,10 +858,6 @@ msgstr "宛先バッファがdestination_lengthより小さい" msgid "Device in use" msgstr "デバイス使用中" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "指定されたピンはDigitalInOutに対応していません" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1000,11 +913,6 @@ msgstr "%qが必要" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1031,22 +939,6 @@ msgstr "コマンド送信に失敗" msgid "Failed to acquire mutex, err 0x%04x" msgstr "ミューテックスの取得に失敗。エラー 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "RXバッファの確保に失敗" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "%dバイトのRXバッファの確保に失敗" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Wi-Fiのメモリの確保に失敗" @@ -1115,11 +1007,6 @@ msgstr "" msgid "Format not supported" msgstr "非対応の形式" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1134,6 +1021,10 @@ msgstr "このタイマーを使う既存のPWMOutと周波数を一致させる msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1161,17 +1052,13 @@ msgstr "ハードウェアビジー。代替のピンを試してください" msgid "Hardware in use, try alternative pins" msgstr "ハードウェア使用中。代わりのピンを試してください" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "閉じられたファイルへのI/O操作" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C初期化エラー" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1280,75 +1167,33 @@ msgstr "" msgid "Internal error #%d" msgstr "内部エラー #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "不正な %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "不正な%qピン" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "不正な%qピン選択" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "不正なADCユニット値" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "不正なBMPファイル" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "不正なBSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "不正なDACピンが与えられました" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "無効なPWM周波数" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "不正な引数" @@ -1356,42 +1201,11 @@ msgstr "不正な引数" msgid "Invalid bits per value" msgstr "不正なbits per value" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "不正なバッファサイズ" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "不正なバイトオーダー文字列" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "不正なキャプチャ周期。有効な周期は1-500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "不正なチャンネル数" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "不正な方向" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "不正なファイル" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "フォーマットチャンクのサイズが不正" @@ -1400,78 +1214,14 @@ msgstr "フォーマットチャンクのサイズが不正" msgid "Invalid memory access." msgstr "不正なメモリアクセス" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "不正なビット数" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "不正なphase" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "不正なピン" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "左チャネルのピンが不正" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "右チャネルのピンが不正" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "ピンが不正" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "不正な極性" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "不正なプロパティ" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "不正なrun mode" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "不正なsecurity_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1484,23 +1234,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "不正なボイス" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "不正なボイス数" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "不正なwaveファイル" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "不正なワード/ビット長" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Keyの長さは、16, 24, 32バイトのいずれかでなければなりません" @@ -1514,25 +1247,17 @@ msgid "LHS of keyword arg must be an id" msgstr "キーワード引数の左辺には識別子が必要" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "レイヤはすでにグループに含まれています" +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "レイヤはGroupかTileGridのサブクラスでなければなりません" +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISOピン初期化に失敗" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSIピン初期化に失敗" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1542,10 +1267,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "マイクのスタートアップディレイは 0.0 から 1.0 の間でなければなりません" @@ -1559,10 +1280,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISOまたはMOSIピンがありません" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1598,11 +1323,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "%q のサブクラスでなければなりません" @@ -1663,15 +1383,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "MISOピンなし" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "MOSIピンがありません" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1710,16 +1438,6 @@ msgstr "使われていないGCLKがありません" msgid "No hardware random available" msgstr "利用可能なハードウェア乱数なし" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "clkピンにハードウェア対応がありません" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "ピンにハードウェア対応がありません" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1866,10 +1584,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1901,11 +1622,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "オーバーサンプルは8の倍数でなければなりません" @@ -1914,17 +1630,15 @@ msgstr "オーバーサンプルは8の倍数でなければなりません" msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"PWMのduty_cycle値は0から65535の間でなければなりません（16ビット解像度）" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "PWM周波数は生成時のvariable_frequencyがFalseのとき書き換え不可" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1941,29 +1655,14 @@ msgstr "" msgid "Permission denied" msgstr "パーミッション拒否" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "ピンにADCの能力がありません" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2030,18 +1729,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "方向がoutputのときpullは使われません" @@ -2063,8 +1754,9 @@ msgstr "RNG解体エラー" msgid "RNG Init Error" msgstr "乱数生成器の初期化エラー" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2072,21 +1764,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "このボードはRTCのキャリブレーションに非対応" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "このボードはRTCに対応していません" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485はこのデバイスでは未対応" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "乱数生成エラー" @@ -2136,6 +1817,10 @@ msgstr "セーフモードで実行中！ 保存されたコードは実行し msgid "SD card CSD format not supported" msgstr "SDカードのCSDフォーマットは非対応" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2146,30 +1831,21 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "SDIO初期化エラー %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI初期化エラー" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI再初期化エラー" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "サンプルレートは正数でなければなりません" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "サンプルレートは%d以下でなければなりません" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2189,14 +1865,6 @@ msgstr "シリアライザは使用中" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "サイズは対応していません" @@ -2232,10 +1900,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "スタックサイズは少なくとも256以上でなければなりません" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2321,10 +1985,6 @@ msgstr "タイルの高さはビットマップの高さを割り切れる値で msgid "Tile index out of bounds" msgstr "タイルのインデクスが範囲外" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "タイル値が範囲外" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "タイルの幅はビットマップの幅を割り切れる値でなければなりません" @@ -2344,6 +2004,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "サンプルのチャンネル数が多すぎます" @@ -2376,24 +2039,21 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UARTバッファの確保エラー" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART解放エラー" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UARTの初期化エラー" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UARTの再初期化エラー" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART書き込みエラー" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2530,12 +2190,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "非対応のbaudrate" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2610,10 +2264,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFiパスワードは8〜63文字でなければなりません" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2766,10 +2416,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sampleは8または16でなければなりません" @@ -2807,11 +2453,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "byteorderが文字列ではありません" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2820,7 +2461,7 @@ msgstr "" msgid "bytes value out of range" msgstr "範囲外のバイト値" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "キャリブレーションが範囲外" @@ -2828,12 +2469,9 @@ msgstr "キャリブレーションが範囲外" msgid "calibration is read only" msgstr "calibrationは読み込み専用" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3004,6 +2642,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3016,10 +2658,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3449,6 +3087,10 @@ msgid "indices must be integers, slices, or Boolean lists" msgstr "" "インデクスは、整数、スライス、boolのリストのいずれかでなければなりません" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3699,10 +3341,6 @@ msgstr "定義域エラー" msgid "matrix is not positive definite" msgstr "正定値行列ではありません" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3710,10 +3348,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4086,10 +3720,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4136,14 +3766,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "キューがオーバーフローしました" @@ -4315,10 +3937,6 @@ msgstr "" msgid "step must be non-zero" msgstr "stepは非ゼロ値でなければなりません" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stopは1または2のいずれか" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4367,10 +3985,6 @@ msgstr "uctypedディスクリプタの構文エラー" msgid "threshold must be in the range 0-65536" msgstr "threshouldは0から65536まで" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time()は9要素のシーケンスを受け取ります" @@ -4390,10 +4004,6 @@ msgstr "timeoutは0.0〜100.0秒でなければなりません" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeoutは0.0以上でなければなりません" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "v1カードの待機がタイムアウト" @@ -4402,6 +4012,10 @@ msgstr "v1カードの待機がタイムアウト" msgid "timeout waiting for v2 card" msgstr "v2カードの待機がタイムアウトしました" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestampがプラットフォームのtime_tの範囲外" @@ -4593,13 +4207,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "watchdogのtimeoutは0以上でなければなりません" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4671,6 +4279,248 @@ msgstr "ziはfloat値でなければなりません" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%qは長さ2のタプルでなければなりません" + +#~ msgid "%q should be an int" +#~ msgstr "%qはint型でなければなりません" + +#~ msgid "Address type out of range" +#~ msgstr "address_typeが範囲外" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "指定のピンはAnalogInに対応していません" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut機能に対応していません" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOutは16ビットです。値は65536以下でなければなりません" + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "指定のピンはAnalogOutに対応していません" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "バッファサイズが不正です。%dバイトでなければなりません" + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "バッファ長は少なくとも1以上でなければなりません" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "バイト値は0から255の間でなければなりません" + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "同じピン上の両チャネルに出力できません" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "MISOピンなしで読み込めません" + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "ブートローダが存在しないためブートローダへとリセットできません" + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "MOSIピンとMISOピンなしに転送できません" + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "MOSIピンなしで書き込みできません" + +#~ msgid "Clock pin init failed." +#~ msgstr "クロックピン初期化に失敗" + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "commandは0から255の間の整数でなければなりません" + +#~ msgid "Could not initialize Camera" +#~ msgstr "カメラを初期化できません" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "GNSSを初期化できません" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "SDカードを初期化できません" + +#~ msgid "Could not initialize UART" +#~ msgstr "UARTを初期化できません" + +#~ msgid "Could not re-init channel" +#~ msgstr "チャネルを再初期化できません" + +#~ msgid "Could not re-init timer" +#~ msgstr "タイマーを再初期化できません" + +#~ msgid "Could not restart PWM" +#~ msgstr "PWMを再スタートできません" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "1つ目のバッファを確保できません" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "入力バッファを確保できません" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "2つ目のバッファを確保できません" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "指定されたピンはDigitalInOutに対応していません" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "RXバッファの確保に失敗" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "%dバイトのRXバッファの確保に失敗" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C初期化エラー" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "不正な%qピン選択" + +#~ msgid "Invalid BMP file" +#~ msgstr "不正なBMPファイル" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "不正なDACピンが与えられました" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "無効なPWM周波数" + +#~ msgid "Invalid buffer size" +#~ msgstr "不正なバッファサイズ" + +#~ msgid "Invalid byteorder string" +#~ msgstr "不正なバイトオーダー文字列" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "不正なキャプチャ周期。有効な周期は1-500" + +#~ msgid "Invalid channel count" +#~ msgstr "不正なチャンネル数" + +#~ msgid "Invalid direction." +#~ msgstr "不正な方向" + +#~ msgid "Invalid file" +#~ msgstr "不正なファイル" + +#~ msgid "Invalid number of bits" +#~ msgstr "不正なビット数" + +#~ msgid "Invalid phase" +#~ msgstr "不正なphase" + +#~ msgid "Invalid pin" +#~ msgstr "不正なピン" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "左チャネルのピンが不正" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "右チャネルのピンが不正" + +#~ msgid "Invalid polarity" +#~ msgstr "不正な極性" + +#~ msgid "Invalid properties" +#~ msgstr "不正なプロパティ" + +#~ msgid "Invalid run mode." +#~ msgstr "不正なrun mode" + +#~ msgid "Invalid security_mode" +#~ msgstr "不正なsecurity_mode" + +#~ msgid "Invalid voice" +#~ msgstr "不正なボイス" + +#~ msgid "Invalid voice count" +#~ msgstr "不正なボイス数" + +#~ msgid "Invalid wave file" +#~ msgstr "不正なwaveファイル" + +#~ msgid "Invalid word/bit length" +#~ msgstr "不正なワード/ビット長" + +#~ msgid "Layer already in a group." +#~ msgstr "レイヤはすでにグループに含まれています" + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "レイヤはGroupかTileGridのサブクラスでなければなりません" + +#~ msgid "MISO pin init failed." +#~ msgstr "MISOピン初期化に失敗" + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSIピン初期化に失敗" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "clkピンにハードウェア対応がありません" + +#~ msgid "No hardware support on pin" +#~ msgstr "ピンにハードウェア対応がありません" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "PWMのduty_cycle値は0から65535の間でなければなりません（16ビット解像度）" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "ピンにADCの能力がありません" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "このボードはRTCのキャリブレーションに非対応" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485はこのデバイスでは未対応" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI初期化エラー" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI再初期化エラー" + +#~ msgid "Sample rate must be positive" +#~ msgstr "サンプルレートは正数でなければなりません" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "サンプルレートは%d以下でなければなりません" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "スタックサイズは少なくとも256以上でなければなりません" + +#~ msgid "Tile value out of bounds" +#~ msgstr "タイル値が範囲外" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UARTバッファの確保エラー" + +#~ msgid "UART De-init error" +#~ msgstr "UART解放エラー" + +#~ msgid "UART Init Error" +#~ msgstr "UARTの初期化エラー" + +#~ msgid "UART Re-init error" +#~ msgstr "UARTの再初期化エラー" + +#~ msgid "UART write error" +#~ msgstr "UART書き込みエラー" + +#~ msgid "Unsupported baudrate" +#~ msgstr "非対応のbaudrate" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFiパスワードは8〜63文字でなければなりません" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stopは1または2のいずれか" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeoutは0.0以上でなければなりません" + #~ msgid "Unsupported operation" #~ msgstr "非対応の操作" diff --git a/locale/ko.po b/locale/ko.po index 21e4bd346a..a59b12702a 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -67,10 +67,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -83,12 +97,7 @@ msgstr "" msgid "%q in use" msgstr "%q 사용 중입니다" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q 인덱스 범위를 벗어났습니다" @@ -96,14 +105,34 @@ msgstr "%q 인덱스 범위를 벗어났습니다" msgid "%q indices must be integers, not %s" msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -120,14 +149,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.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/memorymonitor/AllocationAlarm.c #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c msgid "%q must be >= 1" msgstr "%q 는 >=1이어야합니다" @@ -136,13 +161,8 @@ msgstr "%q 는 >=1이어야합니다" msgid "%q must be a string" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -161,7 +181,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "" @@ -170,10 +194,6 @@ msgstr "" msgid "%q pin invalid" msgstr "" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q 는 정수(int) 여야합니다" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -336,10 +356,6 @@ msgstr "" msgid "'yield' outside function" msgstr "'yield' 는 함수 외부에 존재합니다" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -375,10 +391,6 @@ msgstr "" msgid "Address must be %d bytes long" msgstr "" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -469,25 +481,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -559,11 +552,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "" @@ -605,11 +593,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "잘못된 크기의 버퍼. %d 바이트 여야합니다." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -619,7 +602,6 @@ msgstr "" msgid "Buffer is too small" msgstr "" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -634,10 +616,6 @@ msgstr "" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "잘못된 크기의 버퍼. >1 여야합니다" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -659,10 +637,6 @@ msgstr "" msgid "Byte buffer must be 16 bytes." msgstr "잘못된 크기의 버퍼. 16 바이트 여야합니다." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "바이트는 0에서 255 사이 여야합니다." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "" @@ -679,6 +653,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -726,18 +704,10 @@ msgstr "온도 데이터를 수신 할 수 없습니다" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "MISO핀이 없으면 읽을 수 없습니다" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "파일에 녹음 할 수 없습니다" @@ -749,7 +719,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -770,20 +740,19 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -798,10 +767,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -810,11 +775,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "명령은 0에서 255 사이의 정수(int) 여야합니다" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -825,35 +785,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -874,20 +805,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -935,10 +852,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -994,11 +907,6 @@ msgstr "%q 이 예상되었습니다." msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1025,22 +933,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1109,11 +1001,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1128,6 +1015,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1155,16 +1046,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1272,75 +1159,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1348,42 +1193,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "파일이 유효하지 않습니다" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "형식 청크 크기가 잘못되었습니다" @@ -1392,78 +1206,14 @@ msgstr "형식 청크 크기가 잘못되었습니다" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "비트 수가 유효하지 않습니다" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "단계가 잘못되었습니다" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "핀이 잘못되었습니다" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "왼쪽 채널 핀이 유효하지 않습니다" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "오른쪽 채널 핀이 잘못되었습니다" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "핀이 유효하지 않습니다" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1476,23 +1226,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1506,25 +1239,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1534,10 +1259,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1551,10 +1272,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1590,11 +1315,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1655,15 +1375,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1702,16 +1430,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1856,10 +1574,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1891,11 +1612,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1906,12 +1622,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1930,29 +1645,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2019,18 +1719,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2052,8 +1744,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2061,21 +1754,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2125,6 +1807,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2135,29 +1821,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2178,14 +1855,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2221,10 +1890,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2310,10 +1975,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2333,6 +1994,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2365,23 +2029,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2519,12 +2180,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2599,10 +2254,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2755,10 +2406,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample은 8 또는 16이어야합니다." @@ -2796,11 +2443,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2809,7 +2451,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2817,12 +2459,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -2993,6 +2632,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3005,10 +2648,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3433,6 +3072,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3683,10 +3326,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3694,10 +3333,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4068,10 +3703,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4118,14 +3749,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4296,10 +3919,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4348,10 +3967,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4371,10 +3986,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4383,6 +3994,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4574,13 +4189,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4652,6 +4261,43 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q should be an int" +#~ msgstr "%q 는 정수(int) 여야합니다" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "잘못된 크기의 버퍼. %d 바이트 여야합니다." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "잘못된 크기의 버퍼. >1 여야합니다" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "바이트는 0에서 255 사이 여야합니다." + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "MISO핀이 없으면 읽을 수 없습니다" + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "명령은 0에서 255 사이의 정수(int) 여야합니다" + +#~ msgid "Invalid file" +#~ msgstr "파일이 유효하지 않습니다" + +#~ msgid "Invalid number of bits" +#~ msgstr "비트 수가 유효하지 않습니다" + +#~ msgid "Invalid phase" +#~ msgstr "단계가 잘못되었습니다" + +#~ msgid "Invalid pin" +#~ msgstr "핀이 잘못되었습니다" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "왼쪽 채널 핀이 유효하지 않습니다" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "오른쪽 채널 핀이 잘못되었습니다" + #~ msgid "Brightness must be between 0 and 255" #~ msgstr "밝기는 0에서 255 사이 여야합니다" diff --git a/locale/nl.po b/locale/nl.po index a2dc9ab51f..f862d7f4f2 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -69,10 +69,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -85,12 +99,7 @@ msgstr "%q fout: %d" msgid "%q in use" msgstr "%q in gebruik" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q index buiten bereik" @@ -98,14 +107,34 @@ msgstr "%q index buiten bereik" msgid "%q indices must be integers, not %s" msgstr "%q indexen moeten integers zijn, niet %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -122,14 +151,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q moet >= 0 zijn" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q moet >= 1 zijn" @@ -138,13 +163,8 @@ msgstr "%q moet >= 1 zijn" 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" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -163,7 +183,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q buiten bereik" @@ -172,10 +196,6 @@ msgstr "%q buiten bereik" msgid "%q pin invalid" msgstr "%q pin onjuist" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q moet een int zijn" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -338,10 +358,6 @@ msgstr "'yield from' binnen asynchrone functie" msgid "'yield' outside function" msgstr "'yield' buiten de functie" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x moet een assignment target zijn" @@ -377,10 +393,6 @@ msgstr "ADC2 wordt gebruikt door WiFi" msgid "Address must be %d bytes long" msgstr "Adres moet %d bytes lang zijn" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Adres type buiten bereik" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Alle CAN-peripherals zijn in gebruik" @@ -471,25 +483,6 @@ msgstr "Wordt al uitgevoerd" msgid "Already scanning for wifi networks" msgstr "Zoekt al naar WiFi netwerken" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn niet ondersteund door gegeven pin" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut functionaliteit niet ondersteund" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut is slechts 16 bits. Waarde moet minder dan 65536 zijn." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut niet ondersteund door gegeven pin" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -561,11 +554,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "Bit clock en word select moeten een clock eenheid delen" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bitdiepte moet tussen 1 en 6 liggen, niet %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bit diepte moet een meervoud van 8 zijn." @@ -607,11 +595,6 @@ msgstr "Buffer + offset te klein %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Buffer heeft incorrect grootte. Moet %d bytes zijn." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffer is geen bytearray." @@ -621,7 +604,6 @@ msgstr "Buffer is geen bytearray." msgid "Buffer is too small" msgstr "Buffer is te klein" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -636,10 +618,6 @@ msgstr "Buffer lengte moet een veelvoud van 512 zijn" msgid "Buffer must be a multiple of 512 bytes" msgstr "Buffer moet een veelvoud van 512 bytes zijn" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Buffer moet op zijn minst lengte 1 zijn" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -661,10 +639,6 @@ msgstr "Bus pin %d al in gebruik" msgid "Byte buffer must be 16 bytes." msgstr "Byte buffer moet 16 bytes zijn." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes moeten tussen 0 en 255 liggen." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC blocks moeten meervouden van 16 bytes zijn" @@ -681,6 +655,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "Roep super().__init__() aan voor toegang native object." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -729,18 +707,10 @@ msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" "Kan geen scan responses voor extended, connectable advertisements hebben." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Output van beide kanalen kan niet op dezelfde pin" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Kan niet lezen zonder MISO pin." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Kan niet opnemen naar een bestand" @@ -752,9 +722,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Kan niet resetten naar bootloader omdat er geen bootloader aanwezig is." #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -774,21 +743,20 @@ msgid "Cannot subclass slice" msgstr "Kan slice niet subclasseren" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Kan niet overdragen zonder MOSI en MISO pinnen." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Kan de frequentie van een timer die al in gebruik is niet variëren" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Kan niet schrijven zonder MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -802,10 +770,6 @@ msgstr "CircuitPython core code is hard gecrashed. Ojee!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython kon het heap geheugen niet toewijzen." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Clock pin init mislukt." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Clock stretch is te lang" @@ -814,11 +778,6 @@ msgstr "Clock stretch is te lang" msgid "Clock unit in use" msgstr "Clock unit in gebruik" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Command moet een int tussen 0 en 255 zijn" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -831,35 +790,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Corrupt .mpy bestand" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Kon camera niet initialiseren" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Kan GNSS niet initialiseren" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Kan SDCard niet initialiseren" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Kan UART niet initialiseren" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Kan kanaal niet her-initialiseren" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Kan timer niet her-initialiseren" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Kan PWM niet herstarten" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Kon klok niet ophalen" @@ -880,20 +810,6 @@ msgstr "Kan interrupt niet starten, RX is bezig" msgid "Couldn't allocate decoder" msgstr "Kan decoder niet alloceren" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Kan eerste buffer niet alloceren" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Kan input buffer niet alloceren" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Kan tweede buffer niet alloceren" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Crash naar de HardFault_Handler." @@ -941,10 +857,6 @@ msgstr "Bestemming grootte is kleiner dan destination_length." msgid "Device in use" msgstr "Apparaat al in gebruik" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut niet ondersteund door gegeven pin" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1000,11 +912,6 @@ msgstr "Verwacht een %q" msgid "Expected an alarm" msgstr "Verwachtte een alarm" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Verwachtte een tuple met lengte %d, maar kreeg %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1031,22 +938,6 @@ msgstr "Commando verzenden mislukt." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Fout tijdens verkrijgen mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "RX buffer alloceren mislukt" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Mislukt een RX buffer van %d bytes te alloceren" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Kon WiFi geheugen niet toewijzen" @@ -1115,11 +1006,6 @@ msgstr "" msgid "Format not supported" msgstr "Formaat wordt niet ondersteund" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Framebuffer benodigd %d bytes" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1135,6 +1021,10 @@ msgstr "" msgid "Function requires lock" msgstr "Functie vereist lock" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1162,17 +1052,13 @@ msgstr "Hardware bezig, probeer alternatieve pinnen" msgid "Hardware in use, try alternative pins" msgstr "Hardware in gebruik, probeer alternatieve pinnen" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Hostnaam moet tussen 1 en 253 karakters zijn" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "I/O actie op gesloten bestand" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C Init Fout" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1281,75 +1167,33 @@ msgstr "" msgid "Internal error #%d" msgstr "Interne fout #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Ongeldige %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Ongeldige %q pin" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Ongeldige %q pin selectie" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Ongeldige ADC Unit waarde" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Ongeldig BMP bestand" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Ongeldig BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Ongeldige DAC pin opgegeven" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Ongeldige PWM frequentie" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Ongeldige Pin" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Ongeldig argument" @@ -1357,42 +1201,11 @@ msgstr "Ongeldig argument" msgid "Invalid bits per value" msgstr "Ongeldige bits per waarde" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Ongeldige buffer grootte" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Ongeldige byteorder string" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Ongeldige vastlegging periode. Geldig bereik: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Ongeldige kanaal aantallen" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Ongeldige richting." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Ongeldig bestand" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Ongeldig formaat stuk grootte" @@ -1401,78 +1214,14 @@ msgstr "Ongeldig formaat stuk grootte" msgid "Invalid memory access." msgstr "Ongeldig geheugen adres." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Ongeldig aantal bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Ongeldige fase" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Ongeldige pin" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Ongeldige pin voor linker kanaal" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Ongeldige pin voor rechter kanaal" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Ongeldige pinnen" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Ongeldige polariteit" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Ongeldige eigenschappen" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Ongeldige run modus." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Ongeldige security_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1485,23 +1234,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Ongeldige stem" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Ongeldig stem aantal" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Ongeldig wave bestand" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Ongeldig woord/bit lengte" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Sleutel moet 16, 24, of 32 bytes lang zijn" @@ -1515,25 +1247,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS van sleutelwoord arg moet een id zijn" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Laag al in groep." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Laag moet een Groep of TileGrid subklasse zijn." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISO pin init mislukt." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSI pin init mislukt." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1543,10 +1267,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Maximale x waarde indien gespiegeld is %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Berichten zijn beperkt tot 8 bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Microfoon opstart vertraging moet in bereik van 0.0 tot 1.0 zijn" @@ -1560,10 +1280,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Ontbrekende MISO of MOSI Pin" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1599,11 +1323,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "%q moet een subklasse zijn." @@ -1664,15 +1383,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Geen MISO pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Geen MOSI pin" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1711,16 +1438,6 @@ msgstr "Geen vrije GCLKs" msgid "No hardware random available" msgstr "Geen hardware random beschikbaar" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Geen hardware ondersteuning beschikbaar op clk pin" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Geen hardware ondersteuning op pin" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1871,10 +1588,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Slechts één alarm.time alarm kan worden ingesteld." @@ -1906,11 +1626,6 @@ msgstr "Geen sockets meer beschikbaar" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Oversample moet een meervoud van 8 zijn." @@ -1919,12 +1634,6 @@ msgstr "Oversample moet een meervoud van 8 zijn." msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"PWM duty_cycle moet tussen 0 en 65535 inclusief zijn (16 bit resolutie)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1932,6 +1641,10 @@ msgstr "" "PWM frequentie is niet schrijfbaar wanneer de variable_frequency False is " "tijdens constructie." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1948,29 +1661,14 @@ msgstr "" msgid "Permission denied" msgstr "Toegang geweigerd" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin heeft geen ADC mogelijkheden" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2042,18 +1740,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull niet gebruikt wanneer de richting output is." @@ -2075,8 +1765,9 @@ msgstr "RNG DeInit Fout" msgid "RNG Init Error" msgstr "RNG Init Fout" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2084,21 +1775,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "RS485 inversie gespecificeerd terwijl niet in RS485 modus" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "RTC calibratie niet ondersteund door dit board" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC is niet ondersteund door dit board" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 Nog niet ondersteund door dit apparaat" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Random number generatie fout" @@ -2148,6 +1828,10 @@ msgstr "Draaiende in veilige modus! Opgeslagen code wordt niet uitgevoerd.\n" msgid "SD card CSD format not supported" msgstr "SD kaart CSD formaat niet ondersteund" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2158,30 +1842,21 @@ msgstr "SDIO GetCardInfo Fout %d" msgid "SDIO Init Error %d" msgstr "SDIO Init Fout %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI Init Fout" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI Herinitialisatie Fout" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Sample rate moet positief zijn" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Sample rate is te hoog. Moet minder dan %d zijn" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2201,14 +1876,6 @@ msgstr "Serializer in gebruik" msgid "Server side context cannot have hostname" msgstr "Context aan de serverkant kan geen hostnaam hebben" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Afmeting niet ondersteund" @@ -2244,10 +1911,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Splitting met sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Stack grootte moet op zijn minst 256 zijn" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2333,10 +1996,6 @@ msgstr "Tile hoogte moet exact de bitmap hoogte verdelen" msgid "Tile index out of bounds" msgstr "Tile index buiten bereik" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Tile waarde buiten bereik" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Tile breedte moet exact de bitmap breedte verdelen" @@ -2356,6 +2015,9 @@ msgid "To exit, please reset the board without " msgstr "Om te beëindigen, reset het bord zonder " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Teveel kanalen in sample." @@ -2388,24 +2050,21 @@ msgid "Tuple or struct_time argument required" msgstr "Tuple of struct_time argument vereist" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UART Buffer allocatie fout" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART De-init fout" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UART Init Fout" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UART Re-init Fout" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART schrijf fout" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2543,12 +2202,6 @@ msgstr "" "Ongespecificeerd probleem. Kan zijn dat de pariteit prompt op het andere " "apparaat geweigerd of genegeerd werd." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Niet-ondersteunde baudsnelheid" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2627,10 +2280,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFi wachtwoord moet tussen 8 en 63 karakters bevatten" - #: main.c msgid "Woken up by alarm.\n" msgstr "Gewekt door alarm.\n" @@ -2783,10 +2432,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample moet 8 of 16 zijn" @@ -2824,11 +2469,6 @@ msgstr "buffer te klein voor gevraagde bytes" msgid "byteorder is not a string" msgstr "byteorder is geen string" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "butes > 8 niet ondersteund" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "bytes lengte is geen veelvoud van itemgrootte" @@ -2837,7 +2477,7 @@ msgstr "bytes lengte is geen veelvoud van itemgrootte" msgid "bytes value out of range" msgstr "bytes waarde buiten bereik" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "calibration is buiten bereik" @@ -2845,12 +2485,9 @@ msgstr "calibration is buiten bereik" msgid "calibration is read only" msgstr "calibration is alleen-lezen" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "calibration waarde buiten bereik +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3022,6 +2659,10 @@ msgstr "" msgid "casting" msgstr "casting" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "chars buffer te klein" @@ -3034,11 +2675,6 @@ msgstr "chr() arg niet binnen bereik (0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() arg niet binnen bereik (256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" -"cirkel kan slechts bij één object van een hoger niveau worden geregistreerd" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3466,6 +3102,10 @@ msgstr "indices moeten integers zijn" msgid "indices must be integers, slices, or Boolean lists" msgstr "indices moeten integers, segmenten (slices) of Boolean lijsten zijn" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "oorspronkelijke waarden moeten itereerbaar zijn" @@ -3719,10 +3359,6 @@ msgstr "fout in het wiskundig domein (math domain error)" msgid "matrix is not positive definite" msgstr "matrix is niet positief-definiet" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3730,10 +3366,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length moet 0-%d zijn als fixed_length %s is" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "maximaal aantal dimensies is 4" @@ -4104,11 +3736,6 @@ msgstr "pixel_shader moet displayio.Palette of displayio.ColorConverter zijn" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" -"polygoon kan slechts bij één object van een hoger niveau worden geregistreerd" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop van een lege PulseIn" @@ -4155,14 +3782,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "wachtrij overloop" @@ -4335,10 +3954,6 @@ msgstr "start_x moet een int zijn" msgid "step must be non-zero" msgstr "step mag geen nul zijn" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop moet 1 of 2 zijn" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop is niet bereikbaar vanaf start" @@ -4387,10 +4002,6 @@ msgstr "syntaxisfout in uctypes aanduiding" msgid "threshold must be in the range 0-65536" msgstr "drempelwaarde moet in het bereik 0-65536 liggen" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() accepteert een 9-rij" @@ -4410,10 +4021,6 @@ msgstr "timeout moet tussen 0.0 en 100.0 seconden zijn" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeout moet groter dan 0.0 zijn" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout bij wachten op v1 kaart" @@ -4422,6 +4029,10 @@ msgstr "timeout bij wachten op v1 kaart" msgid "timeout waiting for v2 card" msgstr "timeout bij wachten op v2 kaart" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp buiten bereik voor platform time_t" @@ -4613,13 +4224,7 @@ msgstr "watchdog niet geïnitialiseerd" msgid "watchdog timeout must be greater than 0" msgstr "watchdog time-out moet groter zijn dan 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "breedte moet groter dan nul zijn" @@ -4691,6 +4296,286 @@ 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 "%q must be a tuple of length 2" +#~ msgstr "%q moet een tuple van lengte 2 zijn" + +#~ msgid "%q should be an int" +#~ msgstr "%q moet een int zijn" + +#~ msgid "Address type out of range" +#~ msgstr "Adres type buiten bereik" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn niet ondersteund door gegeven pin" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut functionaliteit niet ondersteund" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut is slechts 16 bits. Waarde moet minder dan 65536 zijn." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut niet ondersteund door gegeven pin" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bitdiepte moet tussen 1 en 6 liggen, niet %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Buffer heeft incorrect grootte. Moet %d bytes zijn." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Buffer moet op zijn minst lengte 1 zijn" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes moeten tussen 0 en 255 liggen." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Output van beide kanalen kan niet op dezelfde pin" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Kan niet lezen zonder MISO pin." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Kan niet resetten naar bootloader omdat er geen bootloader aanwezig is." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Kan niet overdragen zonder MOSI en MISO pinnen." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Kan niet schrijven zonder MOSI pin." + +#~ msgid "Clock pin init failed." +#~ msgstr "Clock pin init mislukt." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Command moet een int tussen 0 en 255 zijn" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Kon camera niet initialiseren" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Kan GNSS niet initialiseren" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Kan SDCard niet initialiseren" + +#~ msgid "Could not initialize UART" +#~ msgstr "Kan UART niet initialiseren" + +#~ msgid "Could not re-init channel" +#~ msgstr "Kan kanaal niet her-initialiseren" + +#~ msgid "Could not re-init timer" +#~ msgstr "Kan timer niet her-initialiseren" + +#~ msgid "Could not restart PWM" +#~ msgstr "Kan PWM niet herstarten" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Kan eerste buffer niet alloceren" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Kan input buffer niet alloceren" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Kan tweede buffer niet alloceren" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut niet ondersteund door gegeven pin" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Verwachtte een tuple met lengte %d, maar kreeg %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "RX buffer alloceren mislukt" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Mislukt een RX buffer van %d bytes te alloceren" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Framebuffer benodigd %d bytes" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Hostnaam moet tussen 1 en 253 karakters zijn" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C Init Fout" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Ongeldige %q pin selectie" + +#~ msgid "Invalid BMP file" +#~ msgstr "Ongeldig BMP bestand" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Ongeldige DAC pin opgegeven" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Ongeldige PWM frequentie" + +#~ msgid "Invalid Pin" +#~ msgstr "Ongeldige Pin" + +#~ msgid "Invalid buffer size" +#~ msgstr "Ongeldige buffer grootte" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Ongeldige byteorder string" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Ongeldige vastlegging periode. Geldig bereik: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Ongeldige kanaal aantallen" + +#~ msgid "Invalid direction." +#~ msgstr "Ongeldige richting." + +#~ msgid "Invalid file" +#~ msgstr "Ongeldig bestand" + +#~ msgid "Invalid number of bits" +#~ msgstr "Ongeldig aantal bits" + +#~ msgid "Invalid phase" +#~ msgstr "Ongeldige fase" + +#~ msgid "Invalid pin" +#~ msgstr "Ongeldige pin" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Ongeldige pin voor linker kanaal" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Ongeldige pin voor rechter kanaal" + +#~ msgid "Invalid polarity" +#~ msgstr "Ongeldige polariteit" + +#~ msgid "Invalid properties" +#~ msgstr "Ongeldige eigenschappen" + +#~ msgid "Invalid run mode." +#~ msgstr "Ongeldige run modus." + +#~ msgid "Invalid security_mode" +#~ msgstr "Ongeldige security_mode" + +#~ msgid "Invalid voice" +#~ msgstr "Ongeldige stem" + +#~ msgid "Invalid voice count" +#~ msgstr "Ongeldig stem aantal" + +#~ msgid "Invalid wave file" +#~ msgstr "Ongeldig wave bestand" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Ongeldig woord/bit lengte" + +#~ msgid "Layer already in a group." +#~ msgstr "Laag al in groep." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Laag moet een Groep of TileGrid subklasse zijn." + +#~ msgid "MISO pin init failed." +#~ msgstr "MISO pin init mislukt." + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSI pin init mislukt." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Berichten zijn beperkt tot 8 bytes" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Geen hardware ondersteuning beschikbaar op clk pin" + +#~ msgid "No hardware support on pin" +#~ msgstr "Geen hardware ondersteuning op pin" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "PWM duty_cycle moet tussen 0 en 65535 inclusief zijn (16 bit resolutie)" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin heeft geen ADC mogelijkheden" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "RTC calibratie niet ondersteund door dit board" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 Nog niet ondersteund door dit apparaat" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI Init Fout" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI Herinitialisatie Fout" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Sample rate moet positief zijn" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Sample rate is te hoog. Moet minder dan %d zijn" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Stack grootte moet op zijn minst 256 zijn" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Tile waarde buiten bereik" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UART Buffer allocatie fout" + +#~ msgid "UART De-init error" +#~ msgstr "UART De-init fout" + +#~ msgid "UART Init Error" +#~ msgstr "UART Init Fout" + +#~ msgid "UART Re-init error" +#~ msgstr "UART Re-init Fout" + +#~ msgid "UART write error" +#~ msgstr "UART schrijf fout" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Niet-ondersteunde baudsnelheid" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFi wachtwoord moet tussen 8 en 63 karakters bevatten" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "butes > 8 niet ondersteund" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "calibration waarde buiten bereik +/-127" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "" +#~ "cirkel kan slechts bij één object van een hoger niveau worden " +#~ "geregistreerd" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "" +#~ "polygoon kan slechts bij één object van een hoger niveau worden " +#~ "geregistreerd" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop moet 1 of 2 zijn" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeout moet groter dan 0.0 zijn" + #~ msgid "Unsupported operation" #~ msgstr "Niet-ondersteunde operatie" diff --git a/locale/pl.po b/locale/pl.po index 2b1d6ea123..5e44013409 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -71,10 +71,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "" @@ -87,12 +101,7 @@ msgstr "%q niepowodzenie: %d" msgid "%q in use" msgstr "%q w użyciu" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q poza zakresem" @@ -100,14 +109,34 @@ msgstr "%q poza zakresem" msgid "%q indices must be integers, not %s" msgstr "%q indeks musi być liczbą całkowitą, a nie %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "" @@ -124,14 +153,10 @@ msgstr "" msgid "%q must be >= %d" msgstr "" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q musi być >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q musi być >= 1" @@ -140,13 +165,8 @@ msgstr "%q musi być >= 1" 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" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" +#: py/argcheck.c +msgid "%q must be an int" msgstr "" #: py/argcheck.c @@ -165,7 +185,11 @@ msgstr "" msgid "%q out of bounds" msgstr "" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q poza zakresem" @@ -174,10 +198,6 @@ msgstr "%q poza zakresem" msgid "%q pin invalid" msgstr "nieprawidłowy pin %q" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q powinno być typu int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "" @@ -340,10 +360,6 @@ msgstr "'yield from' wewnątrz funkcji asynchronicznej" msgid "'yield' outside function" msgstr "'yield' poza funkcją" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x musi być obiektem przypisania" @@ -379,10 +395,6 @@ msgstr "ADC2 jest używany przez WiFi" msgid "Address must be %d bytes long" msgstr "Adres musi mieć %d bajtów" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Typ adresu poza zakresem" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" @@ -473,25 +485,6 @@ msgstr "" msgid "Already scanning for wifi networks" msgstr "" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn nie jest obsługiwany na danym pinie" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut jest niewspierane" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut ma 16 bitów. Wartość musi być mniejsza od 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut niewspierany na tej nóżce" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "" @@ -563,11 +556,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "Zegar bitowy i wybór słowa muszą współdzielić jednostkę zegara" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Głębia musi być wielokrotnością 8." @@ -609,11 +597,6 @@ msgstr "Bufor + przesunięcie za małe %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Zła wielkość bufora. Powinno być %d bajtów." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "" @@ -623,7 +606,6 @@ msgstr "" msgid "Buffer is too small" msgstr "Bufor jest za mały" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -638,10 +620,6 @@ msgstr "Długość bufora musi być wielokrotnością 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Bufor musi być wielokrotnością 512 bajtów" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Bufor musi mieć długość 1 lub więcej" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -663,10 +641,6 @@ msgstr "Nóżka magistrali %d jest w użyciu" msgid "Byte buffer must be 16 bytes." msgstr "Bufor musi mieć 16 bajtów." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes musi być między 0 a 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Bloki CBC muszą być wielokrotnościami 16 bajtów" @@ -683,6 +657,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -730,18 +708,10 @@ msgstr "Nie można odczytać temperatury" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Nie można mieć obu kanałów na tej samej nóżce" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Nie można czytać bez nóżki MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Nie można nagrać do pliku" @@ -753,8 +723,8 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Nie można zrestartować -- nie ma bootloadera." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -774,21 +744,20 @@ msgid "Cannot subclass slice" msgstr "Nie można dziedziczyć ze slice" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Nie można przesyłać bez nóżek MOSI i MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Nie można zmieniać częstotliwości timera, który jest już używany" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Nie można pisać bez nóżki MOSI." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." +msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" @@ -802,10 +771,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython nie mógł przydzielić sterty." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Inicjalizacja nóżki zegara nie powiodła się." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Rozciągnięcie zegara zbyt duże" @@ -814,11 +779,6 @@ msgstr "Rozciągnięcie zegara zbyt duże" msgid "Clock unit in use" msgstr "Jednostka zegara w użyciu" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Komenda musi być int pomiędzy 0 a 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -831,35 +791,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Uszkodzony plik .mpy" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Nie można zainicjować GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Nie można zainicjować SDCard" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Ustawienie UART nie powiodło się" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Nie można ponownie zainicjować kanału" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Nie można ponownie zainicjować timera" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Nie można ponownie uruchomić PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -880,20 +811,6 @@ msgstr "Nie można rozpocząć przerwania, RX jest zajęty" msgid "Couldn't allocate decoder" msgstr "Nie udało się przydzielić dekodera" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Nie udała się alokacja pierwszego bufora" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Nie można przydzielić bufora wejściowego" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Nie udała się alokacja drugiego bufora" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -941,10 +858,6 @@ msgstr "Pojemność celu mniejsza od destination_length." msgid "Device in use" msgstr "Urządzenie w użyciu" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut nie jest obsługiwany na podanym pinie" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1000,11 +913,6 @@ msgstr "Oczekiwano %q" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Oczekiwano krotkę długości %d, otrzymano %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1031,22 +939,6 @@ msgstr "Nie udało się wysłać polecenia." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nie udało się uzyskać blokady, błąd 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Nie udała się alokacja bufora RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Nie udała się alokacja %d bajtów na bufor RX" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1115,11 +1007,6 @@ msgstr "" msgid "Format not supported" msgstr "Nie wspierany format" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Bufor ramki wymaga %d bajtów" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1134,6 +1021,10 @@ msgstr "" msgid "Function requires lock" msgstr "Funkcja wymaga blokady" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1161,17 +1052,13 @@ msgstr "Sprzęt zajęty, wypróbuj alternatywne piny" msgid "Hardware in use, try alternative pins" msgstr "Sprzęt w użyciu, wypróbuj alternatywne piny" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Operacja I/O na zamkniętym pliku" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "Błąd inicjalizacji I2C" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1280,75 +1167,33 @@ msgstr "" msgid "Internal error #%d" msgstr "Błąd wewnętrzny #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Nieprawidłowe %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Zła nóżka %q" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Zły BMP" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Zła częstotliwość PWM" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Zły argument" @@ -1356,42 +1201,11 @@ msgstr "Zły argument" msgid "Invalid bits per value" msgstr "Zła liczba bitów wartości" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Zła wielkość bufora" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Zły okres. Poprawny zakres to: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Zła liczba kanałów" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Nieprawidłowy kierunek." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Zły plik" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Zła wielkość fragmentu formatu" @@ -1400,78 +1214,14 @@ msgstr "Zła wielkość fragmentu formatu" msgid "Invalid memory access." msgstr "Nieprawidłowy dostęp do pamięci." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Zła liczba bitów" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Zła faza" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Zła nóżka" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Zła nóżka dla lewego kanału" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Zła nóżka dla prawego kanału" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Złe nóżki" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Zła polaryzacja" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Nieprawidłowe właściwości" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Zły tryb uruchomienia." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Nieprawidłowy security_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Nieprawidłowy rozmiar" @@ -1484,23 +1234,6 @@ msgstr "" msgid "Invalid state" msgstr "Nieprawidłowy stan" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Zła liczba głosów" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Zły plik wave" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Niepoprawna długość słowa/bitu" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Klucz musi mieć długość 16, 24 lub 32 bajtów" @@ -1514,25 +1247,17 @@ msgid "LHS of keyword arg must be an id" msgstr "Lewa strona argumentu nazwanego musi być nazwą" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer musi dziedziczyć z Group albo TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "Nie powiodło się ustawienie pinu MISO." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Nie powiodło się ustawienie pinu MOSI." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1542,10 +1267,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Największa wartość x przy odwróceniu to %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Wiadomości ograniczone do 8 bajtów" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Opóźnienie włączenia mikrofonu musi być w zakresie od 0.0 do 1.0" @@ -1559,10 +1280,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Brak pinu MISO lub MOSI" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1598,11 +1323,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1663,15 +1383,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Brak pinu MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Brak pinu MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1710,16 +1438,6 @@ msgstr "Brak wolnych GLCK" msgid "No hardware random available" msgstr "Brak generatora liczb losowych" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Brak sprzętowej obsługi na nóżce" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1864,10 +1582,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1899,11 +1620,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Nadpróbkowanie musi być wielokrotnością 8." @@ -1912,16 +1628,15 @@ msgstr "Nadpróbkowanie musi być wielokrotnością 8." msgid "PDMIn not available" msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "duty_cycle musi być pomiędzy 0 a 65535 włącznie (rozdzielczość 16 bit)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "Nie można zmienić częstotliwości PWM gdy variable_frequency=False." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "" @@ -1938,29 +1653,14 @@ msgstr "" msgid "Permission denied" msgstr "Odmowa dostępu" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Nóżka nie obsługuje ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2027,18 +1727,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Podciągnięcie nieużywane w trybie wyjścia." @@ -2060,8 +1752,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2069,21 +1762,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "Brak obsługi kalibracji RTC" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "Brak obsługi RTC" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Błąd generowania liczb losowych" @@ -2133,6 +1815,10 @@ msgstr "Uruchomiony tryb bezpieczeństwa! Zapisany kod nie jest uruchamiany.\n" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2143,30 +1829,21 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "Błąd inicjowania SPI" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "Błąd ponownej inicjalizacji SPI" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Częstotliwość próbkowania musi być dodatnia" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Zbyt wysoka częstotliwość próbkowania. Musi być mniejsza niż %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2186,14 +1863,6 @@ msgstr "Serializator w użyciu" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2229,10 +1898,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "Podział z podgrupami" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Stos musi mieć co najmniej 256 bajtów" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2318,10 +1983,6 @@ msgstr "Wysokość bitmapy musi być wielokrotnością wysokości kafelka" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Szerokość bitmapy musi być wielokrotnością szerokości kafelka" @@ -2341,6 +2002,9 @@ msgid "To exit, please reset the board without " msgstr "By wyjść, proszę zresetować płytkę bez " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Zbyt wiele kanałów." @@ -2373,25 +2037,22 @@ msgid "Tuple or struct_time argument required" msgstr "Wymagana krotka lub struct_time" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "Błąd alokacji bufora UART" +msgid "UART de-init" +msgstr "" -#: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" +msgid "UART write" msgstr "" -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "Błąd zapisu UART" - #: shared-module/usb_hid/Device.c msgid "USB busy" msgstr "" @@ -2526,12 +2187,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Zła szybkość transmisji" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2606,10 +2261,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2762,10 +2413,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample musi być 8 lub 16" @@ -2803,11 +2450,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "bajty większe od 8 bitów są niewspierane" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2816,7 +2458,7 @@ msgstr "" msgid "bytes value out of range" msgstr "wartość bytes poza zakresem" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "kalibracja poza zakresem" @@ -2824,12 +2466,9 @@ msgstr "kalibracja poza zakresem" msgid "calibration is read only" msgstr "kalibracja tylko do odczytu" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "wartość kalibracji poza zakresem +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3000,6 +2639,10 @@ msgstr "" msgid "casting" msgstr "rzutowanie" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "bufor chars zbyt mały" @@ -3012,10 +2655,6 @@ msgstr "argument chr() poza zakresem range(0x110000)" msgid "chr() arg not in range(256)" msgstr "argument chr() poza zakresem range(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3441,6 +3080,10 @@ msgstr "indeksy muszą być całkowite" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "wartości początkowe muszą być iterowalne" @@ -3691,10 +3334,6 @@ msgstr "błąd domeny" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3702,10 +3341,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4077,10 +3712,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop z pustego PulseIn" @@ -4127,14 +3758,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "przepełnienie kolejki" @@ -4306,10 +3929,6 @@ msgstr "start_x powinien być całkowity" msgid "step must be non-zero" msgstr "step nie może być zerowe" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop musi być 1 lub 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop nie jest osiągalne ze start" @@ -4358,10 +3977,6 @@ msgstr "błąd składni w deskryptorze uctypes" msgid "threshold must be in the range 0-65536" msgstr "threshold musi być w zakresie 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() wymaga 9-elementowej sekwencji" @@ -4381,10 +3996,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeout musi być >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4393,6 +4004,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp poza zakresem dla time_t na tej platformie" @@ -4584,13 +4199,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "szerokość musi być większa niż zero" @@ -4662,6 +4271,226 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q musi być krotką o długości 2" + +#~ msgid "%q should be an int" +#~ msgstr "%q powinno być typu int" + +#~ msgid "Address type out of range" +#~ msgstr "Typ adresu poza zakresem" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn nie jest obsługiwany na danym pinie" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut jest niewspierane" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut ma 16 bitów. Wartość musi być mniejsza od 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut niewspierany na tej nóżce" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Zła wielkość bufora. Powinno być %d bajtów." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Bufor musi mieć długość 1 lub więcej" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes musi być między 0 a 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Nie można mieć obu kanałów na tej samej nóżce" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Nie można czytać bez nóżki MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Nie można zrestartować -- nie ma bootloadera." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Nie można przesyłać bez nóżek MOSI i MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Nie można pisać bez nóżki MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Inicjalizacja nóżki zegara nie powiodła się." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Komenda musi być int pomiędzy 0 a 255" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Nie można zainicjować GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Nie można zainicjować SDCard" + +#~ msgid "Could not initialize UART" +#~ msgstr "Ustawienie UART nie powiodło się" + +#~ msgid "Could not re-init channel" +#~ msgstr "Nie można ponownie zainicjować kanału" + +#~ msgid "Could not re-init timer" +#~ msgstr "Nie można ponownie zainicjować timera" + +#~ msgid "Could not restart PWM" +#~ msgstr "Nie można ponownie uruchomić PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Nie udała się alokacja pierwszego bufora" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Nie można przydzielić bufora wejściowego" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Nie udała się alokacja drugiego bufora" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut nie jest obsługiwany na podanym pinie" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Oczekiwano krotkę długości %d, otrzymano %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Nie udała się alokacja bufora RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Nie udała się alokacja %d bajtów na bufor RX" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Bufor ramki wymaga %d bajtów" + +#~ msgid "I2C Init Error" +#~ msgstr "Błąd inicjalizacji I2C" + +#~ msgid "Invalid BMP file" +#~ msgstr "Zły BMP" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Zła częstotliwość PWM" + +#~ msgid "Invalid buffer size" +#~ msgstr "Zła wielkość bufora" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Zły okres. Poprawny zakres to: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Zła liczba kanałów" + +#~ msgid "Invalid direction." +#~ msgstr "Nieprawidłowy kierunek." + +#~ msgid "Invalid file" +#~ msgstr "Zły plik" + +#~ msgid "Invalid number of bits" +#~ msgstr "Zła liczba bitów" + +#~ msgid "Invalid phase" +#~ msgstr "Zła faza" + +#~ msgid "Invalid pin" +#~ msgstr "Zła nóżka" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Zła nóżka dla lewego kanału" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Zła nóżka dla prawego kanału" + +#~ msgid "Invalid polarity" +#~ msgstr "Zła polaryzacja" + +#~ msgid "Invalid properties" +#~ msgstr "Nieprawidłowe właściwości" + +#~ msgid "Invalid run mode." +#~ msgstr "Zły tryb uruchomienia." + +#~ msgid "Invalid security_mode" +#~ msgstr "Nieprawidłowy security_mode" + +#~ msgid "Invalid voice count" +#~ msgstr "Zła liczba głosów" + +#~ msgid "Invalid wave file" +#~ msgstr "Zły plik wave" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Niepoprawna długość słowa/bitu" + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer musi dziedziczyć z Group albo TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "Nie powiodło się ustawienie pinu MISO." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Nie powiodło się ustawienie pinu MOSI." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Wiadomości ograniczone do 8 bajtów" + +#~ msgid "No hardware support on pin" +#~ msgstr "Brak sprzętowej obsługi na nóżce" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "duty_cycle musi być pomiędzy 0 a 65535 włącznie (rozdzielczość 16 bit)" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Nóżka nie obsługuje ADC" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "Brak obsługi kalibracji RTC" + +#~ msgid "SPI Init Error" +#~ msgstr "Błąd inicjowania SPI" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "Błąd ponownej inicjalizacji SPI" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Częstotliwość próbkowania musi być dodatnia" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Zbyt wysoka częstotliwość próbkowania. Musi być mniejsza niż %d" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Stos musi mieć co najmniej 256 bajtów" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "Błąd alokacji bufora UART" + +#~ msgid "UART write error" +#~ msgstr "Błąd zapisu UART" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Zła szybkość transmisji" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "bajty większe od 8 bitów są niewspierane" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "wartość kalibracji poza zakresem +/-127" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop musi być 1 lub 2" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeout musi być >= 0.0" + #~ msgid "Unsupported operation" #~ msgstr "Zła operacja" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index e9cf974632..b29c0a79eb 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -75,10 +75,24 @@ msgstr "" "%d pinos de endereço, %d pinos rgb e %d blocos indicam uma altura com %d, " "não %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q e %q contêm pinos duplicados" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q contém pinos duplicados" @@ -91,12 +105,7 @@ msgstr "%q falha: %d" msgid "%q in use" msgstr "%q em uso" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "O índice %q está fora do intervalo" @@ -104,14 +113,34 @@ 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" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "o comprimento %q deve ser %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "o comprimento %q deve ser >=1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "o %q deve ser %d-%d" @@ -128,14 +157,10 @@ msgstr "%q deve ser <= %d" msgid "%q must be >= %d" msgstr "o %q deve ser >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q deve ser >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q deve ser >= 1" @@ -144,14 +169,9 @@ msgstr "%q deve ser >= 1" msgid "%q must be a string" msgstr "%q deve ser uma string" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q deve ser uma tupla de comprimento 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q deve estar entre %d e %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -169,7 +189,11 @@ msgstr "%q deve ser a potência de 2" msgid "%q out of bounds" msgstr "%q fora dos limites" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q fora do alcance" @@ -178,10 +202,6 @@ msgstr "%q fora do alcance" msgid "%q pin invalid" msgstr "%q pino inválido" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q deve ser um int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q com um relatório com ID de 0 deve ter comprimento 1" @@ -348,10 +368,6 @@ msgstr "'yield a partir' de dentro da função async" msgid "'yield' outside function" msgstr "função externa 'yield'" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "(x,y) é obrigatório o uso de números inteiros" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x deve ser o destino da atribuição" @@ -387,10 +403,6 @@ msgstr "O ADC2 está sendo usado pelo WiFi" msgid "Address must be %d bytes long" msgstr "O endereço deve ter %d bytes de comprimento" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "O tipo do endereço está fora do alcance" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Todos os periféricos CAN estão em uso" @@ -481,25 +493,6 @@ msgstr "Já está em execução" msgid "Already scanning for wifi networks" msgstr "Já está em busca das redes de wifi" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "O AnalogIn não é compatível no pino informado" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Funcionalidade AnalogOut não suportada" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "O AnalogOut é de apenas 16 bits. O valor deve ser menor que 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "Saída analógica não suportada no pino fornecido" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Um outro PWMAudioOut já está ativo" @@ -574,11 +567,6 @@ msgstr "" "O clock de bits e a seleção de palavras devem compartilhar uma unidade de " "clock" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "A profundidade dos bits deve ser de 1 até 6 inclusive, porém não %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "A profundidade de bits deve ser o múltiplo de 8." @@ -622,11 +610,6 @@ msgstr "O buffer + desvio é muito pequeno %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Os elementos do buffer devem ter 4 bytes de comprimento ou menos" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Buffer de tamanho incorreto. Deve ser %d bytes." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "O buffer não é um bytearray." @@ -636,7 +619,6 @@ msgstr "O buffer não é um bytearray." msgid "Buffer is too small" msgstr "O buffer é muito pequeno" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -651,10 +633,6 @@ msgstr "O comprimento do Buffer deve ser um múltiplo de 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "O buffer deve ser um múltiplo de 512 bytes" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "O comprimento do buffer deve ter pelo menos 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -676,10 +654,6 @@ msgstr "O pino bus %d já está em uso" msgid "Byte buffer must be 16 bytes." msgstr "O buffer deve ter 16 bytes." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Os bytes devem estar entre 0 e 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Os blocos CBC devem ter múltiplos de 16 bytes" @@ -696,6 +670,10 @@ msgstr "CRC ou checksum inválido" msgid "Call super().__init__() before accessing native object." msgstr "Chame super().__init__() antes de acessar o objeto nativo." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "O alarme só pode acontecer no RTC IO a partir do deep sleep." @@ -748,18 +726,10 @@ msgstr "" "Não é possível ter respostas da verificação para os anúncios estendidos e " "conectáveis." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Não é possível emitir os dois canais no mesmo pino" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "Não é possível obter (pull) nos pinos somente de entrada." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Não é possível ler sem o pino MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Não é possível gravar em um arquivo" @@ -771,9 +741,8 @@ msgstr "Não é possível montar '/' quando estiver visível pelo USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Não é possível redefinir para o bootloader porque o mesmo não está presente." #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -793,22 +762,21 @@ msgid "Cannot subclass slice" msgstr "Não é possível subclassificar a fatia" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Não é possível transferir sem os pinos MOSI e MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Não é possível variar a frequência em um timer que já esteja em uso" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Não é possível acordar (wake) no pino edge. Nível apenas." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Não é possível fazer a escrita sem um pino MOSI." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Escrita CharacteristicBuffer não informada" @@ -821,10 +789,6 @@ msgstr "O núcleo principal do CircuitPython falhou feio. Ops!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "O CircuitPython não conseguiu alocar o heap." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Inicialização do pino de Clock falhou." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Clock se estendeu por tempo demais" @@ -833,11 +797,6 @@ msgstr "Clock se estendeu por tempo demais" msgid "Clock unit in use" msgstr "Unidade de Clock em uso" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "O comando deve ser um int entre 0 e 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -849,35 +808,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Arquivo .mpy corrompido" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Não foi possível inicializar a Câmera" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Não foi possível inicializar o GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Não foi possível inicializar o SDCard" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Não foi possível inicializar o UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Não foi possível reiniciar o canal" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Não foi possível reiniciar o temporizador" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Não foi possível reiniciar o PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Não foi possível recuperar o clock" @@ -898,20 +828,6 @@ msgstr "Não foi possível iniciar a interrupção, RX ocupado" msgid "Couldn't allocate decoder" msgstr "Não foi possível alocar o decodificador" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Não pôde alocar primeiro buffer" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Não foi possível alocar o buffer de entrada" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Não pôde alocar segundo buffer" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Falha no HardFault_Handler." @@ -959,10 +875,6 @@ msgstr "A capacidade do destino é menor que destination_length." msgid "Device in use" msgstr "Dispositivo em uso" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "O DigitalInOut não é compatível em um determinado pino" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1018,11 +930,6 @@ msgstr "Esperado um" msgid "Expected an alarm" msgstr "Um alarme era esperado" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Tupla esperada com comprimento %d, obteve %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1049,22 +956,6 @@ msgstr "Falha ao enviar comando." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Houve uma falha na aquisição do mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Falha ao alocar buffer RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Falha ao alocar buffer RX de %d bytes" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Houve uma falha na alocação da memória do Wifi" @@ -1134,11 +1025,6 @@ msgstr "" msgid "Format not supported" msgstr "O formato não é suportado" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "O Framebuffer requer %d bytes" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1156,6 +1042,10 @@ msgstr "" msgid "Function requires lock" msgstr "A função requer bloqueio" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Falha Genérica" @@ -1183,17 +1073,13 @@ msgstr "O hardware está ocupado, tente os pinos alternativos" msgid "Hardware in use, try alternative pins" msgstr "O hardware está em uso, tente os pinos alternativos" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "O nome do host deve ter entre 1 e 253 caracteres" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Operação I/O no arquivo fechado" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "Erro de inicialização do I2C" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1308,75 +1194,33 @@ msgstr "Erro interno" msgid "Internal error #%d" msgstr "Erro interno #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "%q Inválido" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Pino do %q inválido" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Seleção inválida dos pinos %q" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Valor inválido da unidade ADC" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "AuthMode inválido" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Parâmetro BLE inválido" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Arquivo BMP inválido" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "BSSID Inválido" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "O pino DAC informado é inválido" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "Endereço MAC inválido" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "O arquivo MIDI é inválido" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Frequência PWM inválida" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Pino inválido" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Argumento inválido" @@ -1384,42 +1228,11 @@ msgstr "Argumento inválido" msgid "Invalid bits per value" msgstr "Os valores por bits são inválidos" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "O tamanho do buffer é inválido" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "A cadeia de bytes é inválida" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "O período de captura é inválido. O intervalo válido é: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "A contagem do canal é inválido" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "data_count %d inválido" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "data_pins[%d] inválido" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Direção inválida." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Arquivo inválido" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Tamanho do pedaço de formato inválido" @@ -1428,78 +1241,14 @@ msgstr "Tamanho do pedaço de formato inválido" msgid "Invalid memory access." msgstr "O acesso da memória é inválido." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "Modo inválido" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "Endereço MAC multicast inválido" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Número inválido de bits" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Fase Inválida" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Pino inválido" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Pino inválido para canal esquerdo" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Pino inválido para canal direito" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Pinos inválidos" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Polaridade inválida" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Propriedades inválidas" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "O modo de execução é inválido." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "O Security_mode é inválido" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Tamanho inválido" @@ -1512,23 +1261,6 @@ msgstr "Soquete inválido para o TLS" msgid "Invalid state" msgstr "Estado inválido" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "A voz é inválida" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "A contagem da voz é inválida" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Aqruivo de ondas inválido" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "O comprimento do bit/palavra são inválidos" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "A chave deve ter 16, 24 ou 32 bytes de comprimento" @@ -1542,25 +1274,17 @@ msgid "LHS of keyword arg must be an id" msgstr "O LHS da palavra-chave arg deve ser um ID" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "A camada já existe em um grupo." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "A camada deve ser uma subclasse Group ou TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "Endereço MAC inválido" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "A inicialização do pino MISO falhou." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Inicialização do pino MOSI falhou." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "O mapeamento deve ser uma tupla" @@ -1570,10 +1294,6 @@ msgstr "O mapeamento deve ser uma tupla" msgid "Maximum x value when mirrored is %d" msgstr "O valor máximo de x quando espelhado é %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "As mensagens estão limitadas a 8 bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "O atraso na inicialização do microfone deve estar entre 0,0 e 1,0" @@ -1587,10 +1307,14 @@ msgstr "O tamanho dos dados é incompatível" msgid "Mismatched swap flag" msgstr "Sinalizador de troca incompatível" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "O pino MISO ou MOSI está ausente" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1626,11 +1350,6 @@ msgstr "Faltando first_set_pin. A instrução %d define os pinos(s)" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "Falta o jmp_pin. A instrução %d salta no pino" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "Mais de %d reportam ids não compatíveis" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Deve ser uma subclasse %q." @@ -1691,15 +1410,23 @@ msgid "No I2C device at address: 0x%x" msgstr "Não há nenhum dispositivo I2C no endereço: 0x%x" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Nenhum pino MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Nenhum pino MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1738,16 +1465,6 @@ msgstr "Não há GCLKs livre" msgid "No hardware random available" msgstr "Nenhum hardware aleatório está disponível" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Sem suporte de hardware no pino de clock" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Nenhum suporte de hardware no pino" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "Sem entrada no programa" @@ -1899,10 +1616,13 @@ msgid "Only one address is allowed" msgstr "Apenas um endereço é permitido" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Apenas um alarme alarm.time pode ser definido." @@ -1934,11 +1654,6 @@ msgstr "Sem soquetes" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Os elementos Out-buffer devem ter um comprimento de <= 4 bytes" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "O buffer de saída deve ter ao menos %d bytes" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "A superamostragem deve ser um múltiplo de 8." @@ -1947,13 +1662,6 @@ msgstr "A superamostragem deve ser um múltiplo de 8." msgid "PDMIn not available" msgstr "O PDMIn não está disponível" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"O duty_cycle do PWM deve estar entre 0 e inclusive 65535 (com resolução de " -"16 bits)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1961,6 +1669,10 @@ msgstr "" "A frequência do PWM não pode ser gravada quando variable_frequency for False " "na construção." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "A fatia do PWM já está em uso" @@ -1977,29 +1689,14 @@ msgstr "O periférico está em uso" msgid "Permission denied" msgstr "Permissão negada" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "O pinto não pode acordar do deep sleep" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "A contagem dos pinos deve ser com pelo menos 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "A contagem dos pinos é muito grande" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "O pino não tem recursos de ADC" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2074,18 +1771,10 @@ msgstr "O programa faz IN sem carregar o ISR" msgid "Program does OUT without loading OSR" msgstr "O programa faz OUT sem carregar o OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "O programa deve conter pelo menos uma instrução com 16 bits." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "O tamanho do programa é inválido" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "O programa é muito grande" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "O Pull não foi usado quando a direção for gerada." @@ -2107,30 +1796,20 @@ msgstr "Erro DeInit RNG" msgid "RNG Init Error" msgstr "Houve um erro na inicialização do RNG" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "Ainda não há suporte para o RS485 neste dispositivo" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "A definição da inversão do RS485 quando não está no modo RS485" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "A calibração RTC não é suportada nesta placa" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "O RTC não é suportado nesta placa" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 Ainda não é compatível neste dispositivo" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Houve um erro na geração do número aleatório" @@ -2180,6 +1859,10 @@ msgstr "Rodando em modo seguro! O código salvo não está em execução.\n" msgid "SD card CSD format not supported" msgstr "O formato CSD do Cartão SD não é compatível" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2190,30 +1873,21 @@ msgstr "Erro SDIO GetCardInfo %d" msgid "SDIO Init Error %d" msgstr "Erro SDIO Init %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "Houve um erro na inicialização SPI" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "Houve um erro na reinicialização SPI" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "A configuração SPI falhou" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "O periférico SPI está em uso" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "A taxa de amostragem deve ser positiva" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Taxa de amostragem muito alta. Deve ser menor que %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2233,15 +1907,6 @@ msgstr "Serializer em uso" msgid "Server side context cannot have hostname" msgstr "O contexto do lado do servidor não pode ter nome de host" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "A definição da contagem dos pinos deve estar entre 1 e 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" -"A definição da contagem dos pinos do conjunto lateral deve estar entre 1 e 5" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "O tamanho não é suportado" @@ -2277,10 +1942,6 @@ msgstr "Especifique exatamente um do data0 ou do data_pins" msgid "Splitting with sub-captures" msgstr "Divisão com sub-capturas" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "O tamanho da pilha deve ser pelo menos 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "O estéreo à esquerda deve estar no canal PWM A" @@ -2377,10 +2038,6 @@ msgstr "A altura do bloco deve dividir exatamente com a altura do bitmap" msgid "Tile index out of bounds" msgstr "O índice do bloco está fora dos limites" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "O valor do bloco está fora dos limites" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "A largura do bloco deve dividir exatamente com a largura do bitmap" @@ -2402,6 +2059,9 @@ msgid "To exit, please reset the board without " msgstr "Para sair, por favor, reinicie a placa sem " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Muitos canais na amostra." @@ -2434,24 +2094,21 @@ msgid "Tuple or struct_time argument required" msgstr "O argumento de tupla ou struct_time é necessário" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "Houve um erro na alocação do Buffer UART" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "Houve um erro da não inicialização do UART" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "Houve um erro na inicialização do UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "Houve um erro na reinicialização do UART" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "Houve um erro na gravação UART" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2590,12 +2247,6 @@ msgstr "" "Problema desconhecido. Pode ser que o prompt de emparelhamento no outro " "dispositivo tenha sido recusado ou ignorado." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Taxa de transmissão não suportada" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "Espaço de cor não compatível" @@ -2679,10 +2330,6 @@ msgstr "" "\n" "Para listar os módulos existente digite `help(\"modules\")`.\n" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "A senha do Wi-Fi deve ter entre 8 e 63 caracteres" - #: main.c msgid "Woken up by alarm.\n" msgstr "Foi despertado através do alarme.\n" @@ -2837,10 +2484,6 @@ msgstr "os tamanhos do bitmap devem coincidir" msgid "bits must be 32 or less" msgstr "bits deve ser 32 ou menos" -#: 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" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample deve ser 8 ou 16" @@ -2878,11 +2521,6 @@ msgstr "o buffer é pequeno demais para os bytes requisitados" msgid "byteorder is not a string" msgstr "a ordem dos bytes não é uma cadeia de caracteres" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "bytes > 8 bits não suportado" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "o comprimento dos bytes não é um múltiplo do tamanho do item" @@ -2891,7 +2529,7 @@ msgstr "o comprimento dos bytes não é um múltiplo do tamanho do item" msgid "bytes value out of range" msgstr "o valor dos bytes estão fora do alcance" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "Calibração está fora do intervalo" @@ -2899,13 +2537,10 @@ msgstr "Calibração está fora do intervalo" msgid "calibration is read only" msgstr "Calibração é somente leitura" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "Valor de calibração fora do intervalo +/- 127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" -msgstr "pode ser registrado apenas numa principal" +msgid "can only have one parent" +msgstr "" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -3079,6 +2714,10 @@ msgstr "Não é possível obter de forma inequívoca a escala do sizeof" msgid "casting" msgstr "fundição" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "o buffer dos caracteres é muito pequeno" @@ -3091,10 +2730,6 @@ msgstr "o arg chr() está fora do intervalo(0x110000)" msgid "chr() arg not in range(256)" msgstr "o arg chr() está fora do intervalo(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "o círculo só pode ser registrado em um pai" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "O ponto do clipe deve ser uma tupla (x, y)" @@ -3524,6 +3159,10 @@ msgstr "os índices devem ser inteiros" msgid "indices must be integers, slices, or Boolean lists" msgstr "os índices devem ser números inteiros, fatias ou listas booleanas" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "os valores iniciais devem ser iteráveis" @@ -3778,10 +3417,6 @@ msgstr "erro de domínio matemático" msgid "matrix is not positive definite" msgstr "a matriz não é definitiva positiva" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "max_connections deve estar entre 0 e 10" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3789,10 +3424,6 @@ msgstr "max_connections deve estar entre 0 e 10" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "o max_length deve ser 0-%d quando Fixed_length for %s" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length deve ser >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "O número máximo de dimensões são 4" @@ -4170,10 +3801,6 @@ msgstr "o pixel_shader deve ser displayio.Palette ou displayio.ColorConverter" msgid "poll on file not available on win32" msgstr "a sondagem no arquivo não está disponível no win32" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "o polígono só pode ser registrado em um pai" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop a partir de um PulseIn vazio" @@ -4220,14 +3847,6 @@ msgstr "pressionando o botão esquerdo durante a inicialização\n" msgid "pull masks conflict with direction masks" msgstr "puxe as máscaras em conflito com as máscaras de direção" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "O pull_threshold deve ser entre 1 e 32" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "O pull_threshold deve ser entre 1 e 32" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "estouro de fila" @@ -4400,10 +4019,6 @@ msgstr "start_x deve ser um int" msgid "step must be non-zero" msgstr "o passo deve ser diferente de zero" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "o stop deve ser 1 ou 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop não está acessível a partir do início" @@ -4452,10 +4067,6 @@ msgstr "houve um erro de sintaxe no descritor uctypes" msgid "threshold must be in the range 0-65536" msgstr "Limite deve estar no alcance de 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "o bloco deve ser maior que zero" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() leva uma sequência com 9" @@ -4475,10 +4086,6 @@ msgstr "o tempo limite deve ser entre 0.0 a 100.0 segundos" msgid "timeout must be < 655.35 secs" msgstr "o tempo limite deve ser < 655.35 seg" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "o tempo limite deve ser >= 0,0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "o tempo limite na espera pelo cartão v1" @@ -4487,6 +4094,10 @@ msgstr "o tempo limite na espera pelo cartão v1" msgid "timeout waiting for v2 card" msgstr "o tempo limite na espera pelo cartão v2" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp fora do intervalo para a plataforma time_t" @@ -4678,13 +4289,7 @@ msgstr "o watchdog não foi inicializado" msgid "watchdog timeout must be greater than 0" msgstr "o tempo limite do watchdog deve ser maior que 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "a largura deve ser entre 2 a 8 (inclusive), não %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "a largura deve ser maior que zero" @@ -4756,6 +4361,356 @@ 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 be a tuple of length 2" +#~ 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" + +#~ msgid "%q should be an int" +#~ msgstr "%q deve ser um int" + +#~ msgid "(x,y) integers required" +#~ msgstr "(x,y) é obrigatório o uso de números inteiros" + +#~ msgid "Address type out of range" +#~ msgstr "O tipo do endereço está fora do alcance" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "O AnalogIn não é compatível no pino informado" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Funcionalidade AnalogOut não suportada" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "O AnalogOut é de apenas 16 bits. O valor deve ser menor que 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "Saída analógica não suportada no pino fornecido" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "A profundidade dos bits deve ser de 1 até 6 inclusive, porém não %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Buffer de tamanho incorreto. Deve ser %d bytes." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "O comprimento do buffer deve ter pelo menos 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Os bytes devem estar entre 0 e 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Não é possível emitir os dois canais no mesmo pino" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Não é possível ler sem o pino MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Não é possível redefinir para o bootloader porque o mesmo não está " +#~ "presente." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Não é possível transferir sem os pinos MOSI e MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Não é possível fazer a escrita sem um pino MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Inicialização do pino de Clock falhou." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "O comando deve ser um int entre 0 e 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Não foi possível inicializar a Câmera" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Não foi possível inicializar o GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Não foi possível inicializar o SDCard" + +#~ msgid "Could not initialize UART" +#~ msgstr "Não foi possível inicializar o UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Não foi possível reiniciar o canal" + +#~ msgid "Could not re-init timer" +#~ msgstr "Não foi possível reiniciar o temporizador" + +#~ msgid "Could not restart PWM" +#~ msgstr "Não foi possível reiniciar o PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Não pôde alocar primeiro buffer" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Não foi possível alocar o buffer de entrada" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Não pôde alocar segundo buffer" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "O DigitalInOut não é compatível em um determinado pino" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Tupla esperada com comprimento %d, obteve %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Falha ao alocar buffer RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Falha ao alocar buffer RX de %d bytes" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "O Framebuffer requer %d bytes" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "O nome do host deve ter entre 1 e 253 caracteres" + +#~ msgid "I2C Init Error" +#~ msgstr "Erro de inicialização do I2C" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Seleção inválida dos pinos %q" + +#~ msgid "Invalid AuthMode" +#~ msgstr "AuthMode inválido" + +#~ msgid "Invalid BMP file" +#~ msgstr "Arquivo BMP inválido" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "O pino DAC informado é inválido" + +#~ msgid "Invalid MIDI file" +#~ msgstr "O arquivo MIDI é inválido" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Frequência PWM inválida" + +#~ msgid "Invalid Pin" +#~ msgstr "Pino inválido" + +#~ msgid "Invalid buffer size" +#~ msgstr "O tamanho do buffer é inválido" + +#~ msgid "Invalid byteorder string" +#~ msgstr "A cadeia de bytes é inválida" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "O período de captura é inválido. O intervalo válido é: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "A contagem do canal é inválido" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "data_count %d inválido" + +#~ msgid "Invalid direction." +#~ msgstr "Direção inválida." + +#~ msgid "Invalid file" +#~ msgstr "Arquivo inválido" + +#~ msgid "Invalid mode" +#~ msgstr "Modo inválido" + +#~ msgid "Invalid number of bits" +#~ msgstr "Número inválido de bits" + +#~ msgid "Invalid phase" +#~ msgstr "Fase Inválida" + +#~ msgid "Invalid pin" +#~ msgstr "Pino inválido" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Pino inválido para canal esquerdo" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Pino inválido para canal direito" + +#~ msgid "Invalid polarity" +#~ msgstr "Polaridade inválida" + +#~ msgid "Invalid properties" +#~ msgstr "Propriedades inválidas" + +#~ msgid "Invalid run mode." +#~ msgstr "O modo de execução é inválido." + +#~ msgid "Invalid security_mode" +#~ msgstr "O Security_mode é inválido" + +#~ msgid "Invalid voice" +#~ msgstr "A voz é inválida" + +#~ msgid "Invalid voice count" +#~ msgstr "A contagem da voz é inválida" + +#~ msgid "Invalid wave file" +#~ msgstr "Aqruivo de ondas inválido" + +#~ msgid "Invalid word/bit length" +#~ msgstr "O comprimento do bit/palavra são inválidos" + +#~ msgid "Layer already in a group." +#~ msgstr "A camada já existe em um grupo." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "A camada deve ser uma subclasse Group ou TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "A inicialização do pino MISO falhou." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Inicialização do pino MOSI falhou." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "As mensagens estão limitadas a 8 bytes" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "Mais de %d reportam ids não compatíveis" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Sem suporte de hardware no pino de clock" + +#~ msgid "No hardware support on pin" +#~ msgstr "Nenhum suporte de hardware no pino" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "O buffer de saída deve ter ao menos %d bytes" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "O duty_cycle do PWM deve estar entre 0 e inclusive 65535 (com resolução " +#~ "de 16 bits)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "A contagem dos pinos deve ser com pelo menos 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "O pino não tem recursos de ADC" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "O programa deve conter pelo menos uma instrução com 16 bits." + +#~ msgid "Program too large" +#~ msgstr "O programa é muito grande" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "Ainda não há suporte para o RS485 neste dispositivo" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "A calibração RTC não é suportada nesta placa" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 Ainda não é compatível neste dispositivo" + +#~ msgid "SPI Init Error" +#~ msgstr "Houve um erro na inicialização SPI" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "Houve um erro na reinicialização SPI" + +#~ msgid "Sample rate must be positive" +#~ msgstr "A taxa de amostragem deve ser positiva" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Taxa de amostragem muito alta. Deve ser menor que %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "A definição da contagem dos pinos deve estar entre 1 e 5" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "" +#~ "A definição da contagem dos pinos do conjunto lateral deve estar entre 1 " +#~ "e 5" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "O tamanho da pilha deve ser pelo menos 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "O valor do bloco está fora dos limites" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "Houve um erro na alocação do Buffer UART" + +#~ msgid "UART De-init error" +#~ msgstr "Houve um erro da não inicialização do UART" + +#~ msgid "UART Init Error" +#~ msgstr "Houve um erro na inicialização do UART" + +#~ msgid "UART Re-init error" +#~ msgstr "Houve um erro na reinicialização do UART" + +#~ msgid "UART write error" +#~ msgstr "Houve um erro na gravação UART" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Taxa de transmissão não suportada" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "A senha do Wi-Fi deve ter entre 8 e 63 caracteres" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "os bits devem estar na faixa entre 5 a 9" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "bytes > 8 bits não suportado" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "Valor de calibração fora do intervalo +/- 127" + +#~ msgid "can only be registered in one parent" +#~ msgstr "pode ser registrado apenas numa principal" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "o círculo só pode ser registrado em um pai" + +#~ msgid "max_connections must be between 0 and 10" +#~ msgstr "max_connections deve estar entre 0 e 10" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length deve ser >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "o polígono só pode ser registrado em um pai" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "O pull_threshold deve ser entre 1 e 32" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "O pull_threshold deve ser entre 1 e 32" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "o stop deve ser 1 ou 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "o bloco deve ser maior que zero" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "o tempo limite deve ser >= 0,0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "a largura deve ser entre 2 a 8 (inclusive), não %d" + #~ msgid "Unsupported operation" #~ msgstr "Operação não suportada" diff --git a/locale/ru.po b/locale/ru.po index 9b8778f71b..7e6422b554 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -74,10 +74,24 @@ msgid "" "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d" msgstr "%d адресные пины, %d rgb пины и %d плитки указывают высоту %d а не %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q и %q содержат пины-дупликаты" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q содержит пины-дупликаты" @@ -90,12 +104,7 @@ msgstr "%q сбой: %d" msgid "%q in use" msgstr "%q используется" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "Индекс %q вне диапазона" @@ -103,14 +112,34 @@ msgstr "Индекс %q вне диапазона" msgid "%q indices must be integers, not %s" msgstr "Индексы %q должны быть целыми числами, а не %s" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "Длинна %q должна быть %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "Длинна %q должна быть >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q должен быть %d-%d" @@ -127,14 +156,10 @@ msgstr "%q должен быть <= %d" msgid "%q must be >= %d" msgstr "%q должен быть >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q должен быть >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q должен быть >= 1" @@ -143,14 +168,9 @@ msgstr "%q должен быть >= 1" msgid "%q must be a string" msgstr "%q должен быть строкой" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q должен быть кортежем длинной 2" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q должен быть между %d и %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -168,7 +188,11 @@ msgstr "%q должен быть во 2-й степени" msgid "%q out of bounds" msgstr "%q за пределом" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q вне диапазона" @@ -177,10 +201,6 @@ msgstr "%q вне диапазона" msgid "%q pin invalid" msgstr "Пин %q не допустим" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q должен быть int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q с идентификатором отчёта 0 должен иметь длину 1" @@ -343,10 +363,6 @@ msgstr "'yield from' внутри асинхронной функции" msgid "'yield' outside function" msgstr "'yield' вне функции" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "Требуются целые числа (x,y)" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x должно быть целью назначения" @@ -382,10 +398,6 @@ msgstr "ADC2 используется WiFi" msgid "Address must be %d bytes long" msgstr "Адрес должен быть длиной %d байт" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Тип адреса вне диапазона" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Все периферийные устройства CAN уже используются" @@ -476,25 +488,6 @@ msgstr "Уже запущен" msgid "Already scanning for wifi networks" msgstr "Поиск сетей wifi уже происходит" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn не поддерживается на данном пине" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Функциональность AnalogOut не поддерживается" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut имеет только 16 бит. Значение должно быть меньше 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut не поддерживается на данном пине" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Другой PWMAudioOut уже активен" @@ -570,11 +563,6 @@ msgstr "" "Битовый тактовый генератор и выбор слова должны использовать один источник " "тактирования" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Битовая глубина должна быть от 1 до 6 включительно, а не %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Битовая глубина должна быть кратна 8." @@ -616,11 +604,6 @@ msgstr "Буфер + сдвиг слишком малы %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Элементы буфера должны иметь длину не более 4 байт" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Неправильный размер буфера. Должен быть %d байт." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Буфер не является байтовым массивом (bytearray)." @@ -630,7 +613,6 @@ msgstr "Буфер не является байтовым массивом (byte msgid "Buffer is too small" msgstr "Буфер слишком мал" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -645,10 +627,6 @@ msgstr "Размер буфера должен быть кратен 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Буфер должен быть кратен 512" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Буфер должен быть размером не менее 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -670,10 +648,6 @@ msgstr "Пин шины %d уже используется" msgid "Byte buffer must be 16 bytes." msgstr "Буфер байтов должен быть размером 16 байтам." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes должен быть в диапазоне от 0 до 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "Блоки CBC должны быть кратны 16 байтам" @@ -690,6 +664,10 @@ msgstr "CRC или контрольная сумма неправильная" msgid "Call super().__init__() before accessing native object." msgstr "Вызовите super().__init__() перед обращением к родному объекту." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "Сигнал из глубокого сна может подаваться только на пине RTC IO." @@ -743,19 +721,11 @@ msgstr "" "Невозможно иметь ответы сканирования для расширенных, подключаемых " "объявлений (advertisements)." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Невозможно вывести оба канала на один пин" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" "Невозможно установить подтяжку на пине, предназначенном только для ввода." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Считывание невозможно без пина MISO." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Невозможно записать в файл" @@ -767,8 +737,8 @@ msgstr "Невозможно перемонтировать '/' пока он в #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Невозможно перезагрузится в загрузчик так как он отсутствует." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -788,22 +758,21 @@ msgid "Cannot subclass slice" msgstr "Срез субкласса невозможен" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Передача данных невозможна без пинов MOSI и MISO." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Невозможно изменить частоту на таймере, который уже используется" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Невозможно проснуться по спаду/росту на пине. Только по уровню." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Запись невозможна без пина MOSI." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Запись в CharacteristicBuffer не предусмотрена" @@ -816,10 +785,6 @@ msgstr "Код ядра CircuitPython сильно крашнулся. Упс!\n msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython не смог выделить heap." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Не удалось инициализировать пин Clock." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Длинна такта слишком велика" @@ -828,11 +793,6 @@ msgstr "Длинна такта слишком велика" msgid "Clock unit in use" msgstr "Источник тактирования уже используется" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Команда должна быть целым числом (int) от 0 до 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -845,35 +805,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Файл .mpy поврежден" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Не удалось инициализировать камеру" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Не удалось инициализировать GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Не удалось инициализировать SD карту" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Не удалось инициализировать UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Не удалось повторно инициализировать канал" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Не удалось повторно инициализировать таймер" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Не удалось перезапустить ШИМ" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Не удалось извлечь тактирование" @@ -894,20 +825,6 @@ msgstr "Не удалось запустить прерывание, RX заня msgid "Couldn't allocate decoder" msgstr "Не удалось выделить место для декодера" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Не удалось выделить первый буфер" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Не удалось выделить входной буфер" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Не удалось выделить второй буфер" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Крашнулся в HardFault_Handler." @@ -957,10 +874,6 @@ msgstr "Емкость destination меньше, чем destination_length." msgid "Device in use" msgstr "Устройство используется" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut не поддерживается на данном пине" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1016,11 +929,6 @@ msgstr "Ожидалось(ся) %q" msgid "Expected an alarm" msgstr "Ожидался сигнал" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Ожидался кортеж длины %d, получен %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1047,22 +955,6 @@ msgstr "Не удалось отправить команду." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Не удалось получить mutex, ошибка 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Не удалось выделить буфер RX" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Не удалось выделить буфер RX размером %d байт" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Не удалось выделить память Wifi" @@ -1133,11 +1025,6 @@ msgstr "" msgid "Format not supported" msgstr "Формат не поддерживается" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Фреймбуфер требует %d байт" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1154,6 +1041,10 @@ msgstr "" msgid "Function requires lock" msgstr "Функция требует блокировки" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Общий сбой" @@ -1181,17 +1072,13 @@ msgstr "Оборудование занято, попробуйте исполь msgid "Hardware in use, try alternative pins" msgstr "Оборудование используется, попробуйте использовать другие пины" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Имя хоста должно содержать от 1 до 253 символов" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Операция ввода-вывода на закрытом файле" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "Ошибка инициализации I2C" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1305,75 +1192,33 @@ msgstr "Внутренняя ошибка" msgid "Internal error #%d" msgstr "Внутренняя ошибка #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Недопустимый %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Недопустимый пин %q" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Неверный выбор пина %q" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Недопустимое значение единицы АЦП" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "Недопустимый AuthMode" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Недопустимый параметр BLE" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Неправилный файл BMP" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Неверный BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Передан неверный пин ЦАП" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "Неверный MAC-адрес" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Неверный MIDI-файл" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Недопустимая частота ШИМ" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Неверный пин" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Недопустимый аргумент" @@ -1381,42 +1226,11 @@ msgstr "Недопустимый аргумент" msgid "Invalid bits per value" msgstr "Недопустимое бит-на-значение" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Неверный размер буфера" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Недействительная строка byteorder" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Неверный период захвата. Допустимый диапазон: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Недействительное количество каналов" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "Недействительный data_count %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "Неверный data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Неверное направление." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Неверный файл" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Неверный размер блока формата" @@ -1425,78 +1239,14 @@ msgstr "Неверный размер блока формата" msgid "Invalid memory access." msgstr "Неправильный доступ к памяти." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "Неверный MAC-адрес multicast" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Неверное количество бит" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Неверная фаза" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Недопустимый пин" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Недопустимый пин для левого канала" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Недопустимый пин для правого канала" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Недопустимые пины" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Неправильная полярность" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Недопустимые свойства" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Неверный режим работы." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Неверный security_mode" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Неверный размер" @@ -1509,23 +1259,6 @@ msgstr "Неверный сокет для TLS" msgid "Invalid state" msgstr "Неверное состояние" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Неверный voice" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Неверный счетчик voice" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Неверный wave-файл" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Недопустимая длина слова/бита" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Ключ должен быть длинной 16, 24 или 32 байта" @@ -1539,25 +1272,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS ключевого слова arg должен быть идентификатором(id)" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Слой уже в группе." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Слой должен быть группой (Group) или субклассом TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "MAC адрес был недействительным" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "Не удалось инициализировать пин MISO." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "Не удалось инициализировать пин MOSI." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1567,10 +1292,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "Максимальное значение x при зеркальном отображении - %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Сообщения ограничены 8 байтами" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Задержка включения микрофона должна быть в диапазоне от 0.0 до 1.0" @@ -1584,10 +1305,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Отсутствует пин MISO или MOSI" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1624,11 +1349,6 @@ msgstr "Отсутствует first_set_pin. Инструкция %d устан msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "Отсутствует jmp_pin. Инструкция %d перепрыгивает на пин" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "Не поддерживается более %d идентификаторов отчетов (report ids)" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Должен быть субклассом %q." @@ -1689,15 +1409,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Нет пина MISO" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Нет пина MOSI" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1736,16 +1464,6 @@ msgstr "Свободные GCLK отсутствуют" msgid "No hardware random available" msgstr "Отсутствует аппаратный генератор случайных чисел" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Отсутствует аппаратная поддержка пина clk" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Отсутствует аппаратная поддержка на пине" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "Нет in в программе" @@ -1895,10 +1613,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1930,11 +1651,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1945,12 +1661,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1969,29 +1684,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "Пин не может вывести из глубокого сна" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "Количество пинов должно быть не менее 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Слишком большое количество пинов" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Пин не имеет возможности АЦП" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2063,18 +1763,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2096,8 +1788,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2105,21 +1798,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2169,6 +1851,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2179,29 +1865,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2222,14 +1899,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "Число Set пинов должно быть от 1 до 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2265,10 +1934,6 @@ msgstr "Укажите точно один из data0 или data_pins" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2356,10 +2021,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2379,6 +2040,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2411,23 +2075,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2564,12 +2225,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2644,10 +2299,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2800,10 +2451,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2841,11 +2488,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2854,7 +2496,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2862,12 +2504,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3038,6 +2677,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3050,10 +2693,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3478,6 +3117,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3728,10 +3371,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3739,10 +3378,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4113,10 +3748,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4163,14 +3794,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4341,10 +3964,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4393,10 +4012,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4416,10 +4031,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4428,6 +4039,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4619,13 +4234,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4697,6 +4306,238 @@ msgstr "zi должно быть типа float" msgid "zi must be of shape (n_section, 2)" msgstr "zi должен иметь форму (n_section, 2)" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q должен быть кортежем длинной 2" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q должен быть между %d и %d" + +#~ msgid "%q should be an int" +#~ msgstr "%q должен быть int" + +#~ msgid "(x,y) integers required" +#~ msgstr "Требуются целые числа (x,y)" + +#~ msgid "Address type out of range" +#~ msgstr "Тип адреса вне диапазона" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn не поддерживается на данном пине" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Функциональность AnalogOut не поддерживается" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut имеет только 16 бит. Значение должно быть меньше 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut не поддерживается на данном пине" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Битовая глубина должна быть от 1 до 6 включительно, а не %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Неправильный размер буфера. Должен быть %d байт." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Буфер должен быть размером не менее 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes должен быть в диапазоне от 0 до 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Невозможно вывести оба канала на один пин" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Считывание невозможно без пина MISO." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Невозможно перезагрузится в загрузчик так как он отсутствует." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Передача данных невозможна без пинов MOSI и MISO." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Запись невозможна без пина MOSI." + +#~ msgid "Clock pin init failed." +#~ msgstr "Не удалось инициализировать пин Clock." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Команда должна быть целым числом (int) от 0 до 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Не удалось инициализировать камеру" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Не удалось инициализировать GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Не удалось инициализировать SD карту" + +#~ msgid "Could not initialize UART" +#~ msgstr "Не удалось инициализировать UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Не удалось повторно инициализировать канал" + +#~ msgid "Could not re-init timer" +#~ msgstr "Не удалось повторно инициализировать таймер" + +#~ msgid "Could not restart PWM" +#~ msgstr "Не удалось перезапустить ШИМ" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Не удалось выделить первый буфер" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Не удалось выделить входной буфер" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Не удалось выделить второй буфер" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut не поддерживается на данном пине" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Ожидался кортеж длины %d, получен %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Не удалось выделить буфер RX" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Не удалось выделить буфер RX размером %d байт" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Фреймбуфер требует %d байт" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Имя хоста должно содержать от 1 до 253 символов" + +#~ msgid "I2C Init Error" +#~ msgstr "Ошибка инициализации I2C" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Неверный выбор пина %q" + +#~ msgid "Invalid AuthMode" +#~ msgstr "Недопустимый AuthMode" + +#~ msgid "Invalid BMP file" +#~ msgstr "Неправилный файл BMP" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Передан неверный пин ЦАП" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Неверный MIDI-файл" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Недопустимая частота ШИМ" + +#~ msgid "Invalid Pin" +#~ msgstr "Неверный пин" + +#~ msgid "Invalid buffer size" +#~ msgstr "Неверный размер буфера" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Недействительная строка byteorder" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Неверный период захвата. Допустимый диапазон: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Недействительное количество каналов" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "Недействительный data_count %d" + +#~ msgid "Invalid direction." +#~ msgstr "Неверное направление." + +#~ msgid "Invalid file" +#~ msgstr "Неверный файл" + +#~ msgid "Invalid number of bits" +#~ msgstr "Неверное количество бит" + +#~ msgid "Invalid phase" +#~ msgstr "Неверная фаза" + +#~ msgid "Invalid pin" +#~ msgstr "Недопустимый пин" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Недопустимый пин для левого канала" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Недопустимый пин для правого канала" + +#~ msgid "Invalid polarity" +#~ msgstr "Неправильная полярность" + +#~ msgid "Invalid properties" +#~ msgstr "Недопустимые свойства" + +#~ msgid "Invalid run mode." +#~ msgstr "Неверный режим работы." + +#~ msgid "Invalid security_mode" +#~ msgstr "Неверный security_mode" + +#~ msgid "Invalid voice" +#~ msgstr "Неверный voice" + +#~ msgid "Invalid voice count" +#~ msgstr "Неверный счетчик voice" + +#~ msgid "Invalid wave file" +#~ msgstr "Неверный wave-файл" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Недопустимая длина слова/бита" + +#~ msgid "Layer already in a group." +#~ msgstr "Слой уже в группе." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Слой должен быть группой (Group) или субклассом TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "Не удалось инициализировать пин MISO." + +#~ msgid "MOSI pin init failed." +#~ msgstr "Не удалось инициализировать пин MOSI." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Сообщения ограничены 8 байтами" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "Не поддерживается более %d идентификаторов отчетов (report ids)" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Отсутствует аппаратная поддержка пина clk" + +#~ msgid "No hardware support on pin" +#~ msgstr "Отсутствует аппаратная поддержка на пине" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "Количество пинов должно быть не менее 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Пин не имеет возможности АЦП" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "Число Set пинов должно быть от 1 до 5" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/sv.po b/locale/sv.po index 80a5d6cb27..7703cbbda3 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -74,10 +74,24 @@ msgid "" msgstr "" "%d adresspinnar, %d rgb-pinnar och %d brickor anger en höjd på %d, inte %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q och %q innehåller duplicerade pinnar" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q innehåller dubblettstift" @@ -90,12 +104,7 @@ msgstr "%q-fel: %d" msgid "%q in use" msgstr "%q används redan" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "Index %q ligger utanför intervallet" @@ -103,14 +112,34 @@ 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" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "längden på %q måste vara %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "längden på %q måste vara >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q måste vara %d-%d" @@ -127,14 +156,10 @@ msgstr "%q måste vara <= %d" msgid "%q must be >= %d" msgstr "%q måste vara >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q måste vara >= 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q måste vara >= 1" @@ -143,14 +168,9 @@ msgstr "%q måste vara >= 1" msgid "%q must be a string" msgstr "%q måste vara en sträng" -#: 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" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q måste vara mellan %d och %d" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -168,7 +188,11 @@ msgstr "%q måste vara en potens av 2" msgid "%q out of bounds" msgstr "%q är utanför gränserna" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q utanför intervallet" @@ -177,10 +201,6 @@ msgstr "%q utanför intervallet" msgid "%q pin invalid" msgstr "Pinne %q ogiltig" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q ska vara en int" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "%q med report-ID 0 måste ha längd 1" @@ -343,10 +363,6 @@ msgstr "'yield from' i async-funktion" msgid "'yield' outside function" msgstr "'yield' utanför funktion" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "(x,y) heltal krävs" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x måste vara mål för tilldelning" @@ -382,10 +398,6 @@ msgstr "ADC2 används av WiFi" msgid "Address must be %d bytes long" msgstr "Adressen måste vara %d byte lång" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Adresstyp utanför intervallet" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "All I2C-kringutrustning används" @@ -476,25 +488,6 @@ msgstr "Kör redan" msgid "Already scanning for wifi networks" msgstr "Skannar redan efter wifi-nätverk" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "AnalogIn stöds inte på angiven pinne" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut-funktionalitet stöds inte" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut hanterar bara 16 bitar. Värdet måste vara mindre än 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "AnalogOut stöds inte på angiven pinne" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "En annan PWMAudioOut är redan aktiv" @@ -566,11 +559,6 @@ msgstr "Bitklocka och word select måste vara sekventiella pinnar" msgid "Bit clock and word select must share a clock unit" msgstr "Bitklocka och ordval måste dela en klockenhet" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bitdjup måste vara inom 1 till 6, inte %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bitdjup måste vara multipel av 8." @@ -612,11 +600,6 @@ msgstr "Buffert + offset för liten %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "Buffertelement måste vara fyra byte långa eller mindre" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Buffert har felaktig storlek. Ska vara %d byte." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Buffert är inte en bytearray." @@ -626,7 +609,6 @@ msgstr "Buffert är inte en bytearray." msgid "Buffer is too small" msgstr "Bufferten är för liten" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -641,10 +623,6 @@ msgstr "Buffertlängd måste vara en multipel av 512" msgid "Buffer must be a multiple of 512 bytes" msgstr "Bufferten måste vara en multipel av 512 byte" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Bufferten måste ha minst längd 1" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -666,10 +644,6 @@ msgstr "Busspinne %d används redan" msgid "Byte buffer must be 16 bytes." msgstr "Byte-buffert måste vara 16 byte." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Bytes måste vara mellan 0 och 255." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC-block måste vara multiplar om 16 byte" @@ -686,6 +660,10 @@ msgstr "CRC eller checksumma var ogiltig" msgid "Call super().__init__() before accessing native object." msgstr "Anropa super().__init__() innan du använder det ursprungliga objektet." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "Kan bara larma på RTC-IO från djupsömn." @@ -735,18 +713,10 @@ msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" "Det går inte att ha skanningssvar för utökade, anslutningsbara aviseringar." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Det går inte att mata ut båda kanalerna på samma pinne" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "Kan bara använda pull på pinne för input." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Kan inte läsa utan MISO-pinne." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Det går inte att spela in till en fil" @@ -758,9 +728,8 @@ msgstr "Det går inte att montera om '/' när den är synlig via USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" -"Det går inte att återställa till bootloader eftersom bootloader saknas." #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -780,22 +749,21 @@ msgid "Cannot subclass slice" msgstr "Det går inte att subklassa slice" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Kan inte överföra utan MOSI- och MISO-pinnar." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Det går inte att ändra frekvensen på en timer som redan används" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "Kan inte vakna på nivåskift, enbart nivå." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Kan inte skriva utan MOSI-pinne." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Skrivning för CharacteristicBuffer är inte tillhandahållen" @@ -808,10 +776,6 @@ msgstr "CircuitPython kärnkod kraschade hårt. Hoppsan!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython kunde inte allokera heap." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Initiering av klockpinne misslyckades." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Klockförlängning för lång" @@ -820,11 +784,6 @@ msgstr "Klockförlängning för lång" msgid "Clock unit in use" msgstr "Klockenhet används" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Kommandot måste vara en int mellan 0 och 255" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -837,35 +796,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "Skadad .mpy-fil" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Kunde inte initiera Camera" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "Kan inte initiera GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "Kan inte initiera SD-kort" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Det gick inte att initiera UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Det gick inte att återinitiera kanalen" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Det gick inte att återinitiera timern" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Det gick inte att starta om PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Kunde inte hämta klocka" @@ -886,20 +816,6 @@ msgstr "Det gick inte att starta avbrott, RX upptagen" msgid "Couldn't allocate decoder" msgstr "Det gick inte att allokera avkodaren" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Det gick inte att allokera den första bufferten" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Det gick inte att allokera indatabufferten" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Det gick inte att allokera den andra bufferten" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Krasch in i HardFault_Handler." @@ -947,10 +863,6 @@ msgstr "Målkapaciteten är mindre än destination_length." msgid "Device in use" msgstr "Enheten används redan" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "DigitalInOut stöds inte på given pinne" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1006,11 +918,6 @@ msgstr "Förväntade %q" msgid "Expected an alarm" msgstr "Förväntade ett larm" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Förväntad tupel med längd %d, fick %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1037,22 +944,6 @@ msgstr "Det gick inte att skicka kommandot." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Det gick inte att förvärva mutex, fel 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Det gick inte att tilldela RX-buffert" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Det gick inte att allokera RX-bufferten på %d byte" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Det gick inte att allokera WiFi-minne" @@ -1121,11 +1012,6 @@ msgstr "För RGB-färgrymder måste indatabitmappen ha 16 bitar per pixel" msgid "Format not supported" msgstr "Formatet stöds inte" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "Framebuffer kräver %d byte" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1142,6 +1028,10 @@ msgstr "Frekvensen måste matcha befintlig PWMOut med den här timern" msgid "Function requires lock" msgstr "Funktionen kräver lås" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "Allmänt fel" @@ -1169,17 +1059,13 @@ msgstr "Hårdvaran är upptagen, prova alternativa pinnar" msgid "Hardware in use, try alternative pins" msgstr "Hårdvaran används redan, prova alternativa pinnar" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "Hostname måste vara mellan 1 och 253 tecken" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "I/O-operation på stängd fil" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C init-fel" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1290,75 +1176,33 @@ msgstr "Internt fel" msgid "Internal error #%d" msgstr "Internt fel #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "Ogiltig %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Ogiltig %q-pinne" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "Ogiltigt val av %q pinne" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Ogiltigt ADC-enhetsvärde" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "Ogiltig AuthMode" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Ogiltig BLE-parameter" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Ogiltig BMP-fil" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Ogiltig BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Ogiltig DAC-pinne angiven" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "Ogiltig MAC-adress" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "Ogiltig MIDI-fil" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Ogiltig PWM-frekvens" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "Ogiltig pinne" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Ogiltigt argument" @@ -1366,42 +1210,11 @@ msgstr "Ogiltigt argument" msgid "Invalid bits per value" msgstr "Ogiltigt värde för bitar per värde" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Ogiltig buffertstorlek" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Ogiltig byteorder-sträng" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Ogiltig inspelningsperiod. Giltigt intervall: 1 - 500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Ogiltigt kanalantal" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "Ogiltig data_count %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "Ogiltig data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Ogiltig riktning." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Felaktig fil" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Ogiltig formatsegmentstorlek" @@ -1410,78 +1223,14 @@ msgstr "Ogiltig formatsegmentstorlek" msgid "Invalid memory access." msgstr "Ogiltig minnesåtkomst." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "Ogiltigt läge" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "Ogiltig MAC-adress för multicast" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Ogiltigt antal bitar" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Ogiltig fas" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Ogiltig pinne" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Ogiltig pinne för vänster kanal" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Ogiltig pinne för höger kanal" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Ogiltiga pinnar" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Ogiltig polaritet" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Ogiltiga egenskaper" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Ogiltigt körläge." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Ogiltigt säkerhetsläge" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "Ogiltig storlek" @@ -1494,23 +1243,6 @@ msgstr "Ogiltig socket för TLS" msgid "Invalid state" msgstr "Ogiltigt tillstånd" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Ogiltig kanal" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Ogiltigt kanalantal" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Ogiltig wave-fil" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Ogiltig word-/bitlängd" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "Nyckeln måste vara 16, 24 eller 32 byte lång" @@ -1524,25 +1256,17 @@ msgid "LHS of keyword arg must be an id" msgstr "LHS av keword arg måste vara ett id" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Lagret finns redan i en grupp." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer måste vara en subklass av Group eller TileGrid." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "MAC-adressen var ogiltig" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "init för MISO-pinne misslyckades." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "init för MOSI-pinne misslyckades." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "Mappning måste vara en tuple" @@ -1552,10 +1276,6 @@ msgstr "Mappning måste vara en tuple" msgid "Maximum x value when mirrored is %d" msgstr "Maximum x-värde vid spegling är %d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Meddelanden begränsad till 8 byte" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1570,10 +1290,14 @@ msgstr "Datastorlek matchar inte" msgid "Mismatched swap flag" msgstr "Felaktig swapflagga" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "MISO- eller MOSI-pinne saknas" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1609,11 +1333,6 @@ msgstr "Saknad first_set_pin. Instruktion %d sätter pinnar" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "Saknar jmp_pin. Instruktion %d hoppar på pin" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "Fler än %d rapport-id stöds inte" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Måste vara en %q-subklass." @@ -1674,15 +1393,23 @@ msgid "No I2C device at address: 0x%x" msgstr "Ingen I2C-enhet på adress: 0x%x" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Ingen MISO-pinne" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Ingen MOSI-pinne" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1721,16 +1448,6 @@ msgstr "Inga fria GCLK: er" msgid "No hardware random available" msgstr "Ingen hårdvaru-random tillgänglig" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Inget hårdvarustöd på clk-pinne" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Inget hårdvarustöd på pinne" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "Inget in i programmet" @@ -1880,10 +1597,13 @@ msgid "Only one address is allowed" msgstr "Endast en adress är tillåten" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "Endast ett alarm.time kan ställas in." @@ -1915,11 +1635,6 @@ msgstr "Slut på sockets" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "Element i utbuffer måste vara <= 4 byte långa" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "Utdatabuffert måste vara minst %d byte" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Översampling måste vara multipel av 8." @@ -1928,11 +1643,6 @@ msgstr "Översampling måste vara multipel av 8." msgid "PDMIn not available" msgstr "PDMIn inte tillgänglig" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "PWM duty_cykel måste vara mellan 0 och 65535 (16 bitars upplösning)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." @@ -1940,6 +1650,10 @@ msgstr "" "PWM-frekvensen är inte skrivbar när variable_frequency är falsk vid " "skapandet." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "PWM-segment används redan" @@ -1956,29 +1670,14 @@ msgstr "Periferi i bruk" msgid "Permission denied" msgstr "Åtkomst nekad" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "Pinnen kan inte väcka från djup sömn" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "Antalet pinnar måste vara minst 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "Antal pinnar för stort" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pinnen har inte ADC-funktionalitet" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2050,18 +1749,10 @@ msgstr "Program gör IN utan att ladda ISR" msgid "Program does OUT without loading OSR" msgstr "Program gör OUT utan att läsa in OSR" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "Programmet måste innehålla minst en 16-bitars instruktion." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "Programstorlek ogiltig" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "Programmet är för stort" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Pull används inte när riktningen är output." @@ -2083,30 +1774,20 @@ msgstr "RNG DeInit-fel" msgid "RNG Init Error" msgstr "RNG Init-fel" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 stöds ännu inte på den här enheten" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "RS485-inversion specificerad när den inte är i RS485-läge" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "RTC-kalibrering stöds inte av detta kort" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "RTC stöds inte av detta kort" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 Stöds ännu inte på den här enheten" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Fel vid generering av slumptal" @@ -2156,6 +1837,10 @@ msgstr "Kör i säkert läge! Sparad kod körs inte.\n" msgid "SD card CSD format not supported" msgstr "SD-kort CSD-format stöds inte" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2166,30 +1851,21 @@ msgstr "SDIO GetCardInfo-fel %d" msgid "SDIO Init Error %d" msgstr "SDIO Init-fel %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI Init-fel" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI reinitialiseringsfel" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "SPI-konfigurationen misslyckades" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "SPI-enhet används redan" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Samplingsfrekvensen måste vara positiv" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Samplingsfrekvensen är för hög. Den måste vara mindre än %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2209,14 +1885,6 @@ msgstr "Serializern används redan" msgid "Server side context cannot have hostname" msgstr "Serversidans kontext kan inte ha värdnamn" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "Inställt antal pinnar måste vara mellan 1 och 5" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "Sido-setets antal pinnar måste vara mellan 1 och 5" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "Storleken stöds inte" @@ -2252,10 +1920,6 @@ msgstr "Ange en av data0 eller data_pins" msgid "Splitting with sub-captures" msgstr "Splitting med sub-captures" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Stackstorleken måste vara minst 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "Vänster stereokanal måste använda PWM kanal A" @@ -2351,10 +2015,6 @@ msgstr "Tile-höjden måste vara jämnt delbar med höjd på bitmap" msgid "Tile index out of bounds" msgstr "Tile-index utanför gräns" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Tile-värde utanför intervall" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Tile-bredd måste vara jämnt delbar med bredd på bitmap" @@ -2374,6 +2034,9 @@ msgid "To exit, please reset the board without " msgstr "För att avsluta, gör reset på kortet utan " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "För många kanaler i sampling." @@ -2406,24 +2069,21 @@ msgid "Tuple or struct_time argument required" msgstr "Tuple- eller struct_time-argument krävs" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UART-buffertallokeringsfel" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART deinit-fel" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UART Init-fel" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UART reinit-fel" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART skrivfel" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2561,12 +2221,6 @@ msgstr "" "Ospecificerat problem. Kan vara att parningen på den andra enheten avvisades " "eller ignorerades." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Baudrate stöd inte" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "Färgrymd stöds inte" @@ -2647,10 +2301,6 @@ msgstr "" "\n" "För att lista inbyggda moduler skriver du `help(\"modules\")`.\n" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFi-lösenord måste vara mellan 8 och 63 tecken" - #: main.c msgid "Woken up by alarm.\n" msgstr "Vaknade av larm.\n" @@ -2805,10 +2455,6 @@ msgstr "bitmappsstorlekar måste matcha" msgid "bits must be 32 or less" msgstr "bits måste vara 32 eller färre" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "bits måste mellan 5 och 9" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "bits_per_sample måste vara 8 eller 16" @@ -2846,11 +2492,6 @@ msgstr "buffert för liten för begärd längd" msgid "byteorder is not a string" msgstr "byteorder är inte en sträng" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "bytes> 8 bitar stöds inte" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "bytelängd inte en multipel av storlek" @@ -2859,7 +2500,7 @@ msgstr "bytelängd inte en multipel av storlek" msgid "bytes value out of range" msgstr "bytevärde utanför intervallet" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "kalibrering är utanför intervallet" @@ -2867,13 +2508,10 @@ msgstr "kalibrering är utanför intervallet" msgid "calibration is read only" msgstr "kalibrering är skrivskyddad" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "kalibreringsvärde utanför intervallet +/- 127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" -msgstr "kan endast registreras med en förälder" +msgid "can only have one parent" +msgstr "" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -3045,6 +2683,10 @@ msgstr "Kan inte entydigt få sizeof scalar" msgid "casting" msgstr "casting inte implementerad" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "teckenbuffert för liten" @@ -3057,10 +2699,6 @@ msgstr "chr() arg är inte i intervallet(0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() arg är inte i intervallet(256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "circle kan endast registreras i en förälder" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "klipppunkten måste vara en tuple (x,y)" @@ -3488,6 +3126,10 @@ msgstr "index måste vara heltal" msgid "indices must be integers, slices, or Boolean lists" msgstr "index måste vara heltal, slices, eller Boolean-listor" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "initialvärden måste vara iterable" @@ -3741,10 +3383,6 @@ msgstr "matematikdomänfel" msgid "matrix is not positive definite" msgstr "matrisen är inte positiv bestämd" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "max_connections måste vara mellan 0 och 10" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3752,10 +3390,6 @@ msgstr "max_connections måste vara mellan 0 och 10" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length måste vara 0-%d när fixed_length är %s" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "max_length måste vara >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "maximalt antal dimensioner är 4" @@ -4127,10 +3761,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "filbevakning är inte tillgänglig på win32" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "polygon kan endast registreras i en förälder" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop från en tom PulseIn" @@ -4177,14 +3807,6 @@ msgstr "håll ner vänster knapp vid start\n" msgid "pull masks conflict with direction masks" msgstr "pull-mask är i konflikt med riktnings-mask" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "pull_threshold måste vara mellan 1 och 32" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "push_threshold måste vara mellan 1 och 32" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "köstorlek överskreds" @@ -4357,10 +3979,6 @@ msgstr "start_x ska vara en int" msgid "step must be non-zero" msgstr "step måste vara icke-noll" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "stop måste vara 1 eller 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "stop kan inte nås från start" @@ -4409,10 +4027,6 @@ msgstr "syntaxfel i uctypes deskriptor" msgid "threshold must be in the range 0-65536" msgstr "tröskelvärdet måste ligga i intervallet 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "tile måste vara större än noll" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() kräver en 9-sekvens" @@ -4432,10 +4046,6 @@ msgstr "timeout måste vara 0.0-100.0 sekunder" msgid "timeout must be < 655.35 secs" msgstr "timeout måste vara < 655,35 sekunder" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "timeout måste vara >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout för v1-kort" @@ -4444,6 +4054,10 @@ msgstr "timeout för v1-kort" msgid "timeout waiting for v2 card" msgstr "timeout för v2-kort" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "timestamp utom räckvidd för plattformens \"time_t\"" @@ -4635,13 +4249,7 @@ msgstr "watchdog är inte initierad" msgid "watchdog timeout must be greater than 0" msgstr "watchdog timeout måste vara större än 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "width måste vara mellan 2 och 8, inte %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "width måste vara större än noll" @@ -4713,6 +4321,352 @@ 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 be a tuple of length 2" +#~ 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" + +#~ msgid "%q should be an int" +#~ msgstr "%q ska vara en int" + +#~ msgid "(x,y) integers required" +#~ msgstr "(x,y) heltal krävs" + +#~ msgid "Address type out of range" +#~ msgstr "Adresstyp utanför intervallet" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "AnalogIn stöds inte på angiven pinne" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut-funktionalitet stöds inte" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "" +#~ "AnalogOut hanterar bara 16 bitar. Värdet måste vara mindre än 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "AnalogOut stöds inte på angiven pinne" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bitdjup måste vara inom 1 till 6, inte %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Buffert har felaktig storlek. Ska vara %d byte." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Bufferten måste ha minst längd 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Bytes måste vara mellan 0 och 255." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Det går inte att mata ut båda kanalerna på samma pinne" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Kan inte läsa utan MISO-pinne." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "" +#~ "Det går inte att återställa till bootloader eftersom bootloader saknas." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Kan inte överföra utan MOSI- och MISO-pinnar." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Kan inte skriva utan MOSI-pinne." + +#~ msgid "Clock pin init failed." +#~ msgstr "Initiering av klockpinne misslyckades." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Kommandot måste vara en int mellan 0 och 255" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Kunde inte initiera Camera" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "Kan inte initiera GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "Kan inte initiera SD-kort" + +#~ msgid "Could not initialize UART" +#~ msgstr "Det gick inte att initiera UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Det gick inte att återinitiera kanalen" + +#~ msgid "Could not re-init timer" +#~ msgstr "Det gick inte att återinitiera timern" + +#~ msgid "Could not restart PWM" +#~ msgstr "Det gick inte att starta om PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Det gick inte att allokera den första bufferten" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Det gick inte att allokera indatabufferten" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Det gick inte att allokera den andra bufferten" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "DigitalInOut stöds inte på given pinne" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Förväntad tupel med längd %d, fick %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Det gick inte att tilldela RX-buffert" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Det gick inte att allokera RX-bufferten på %d byte" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "Framebuffer kräver %d byte" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "Hostname måste vara mellan 1 och 253 tecken" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C init-fel" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "Ogiltigt val av %q pinne" + +#~ msgid "Invalid AuthMode" +#~ msgstr "Ogiltig AuthMode" + +#~ msgid "Invalid BMP file" +#~ msgstr "Ogiltig BMP-fil" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Ogiltig DAC-pinne angiven" + +#~ msgid "Invalid MIDI file" +#~ msgstr "Ogiltig MIDI-fil" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Ogiltig PWM-frekvens" + +#~ msgid "Invalid Pin" +#~ msgstr "Ogiltig pinne" + +#~ msgid "Invalid buffer size" +#~ msgstr "Ogiltig buffertstorlek" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Ogiltig byteorder-sträng" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Ogiltig inspelningsperiod. Giltigt intervall: 1 - 500" + +#~ msgid "Invalid channel count" +#~ msgstr "Ogiltigt kanalantal" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "Ogiltig data_count %d" + +#~ msgid "Invalid direction." +#~ msgstr "Ogiltig riktning." + +#~ msgid "Invalid file" +#~ msgstr "Felaktig fil" + +#~ msgid "Invalid mode" +#~ msgstr "Ogiltigt läge" + +#~ msgid "Invalid number of bits" +#~ msgstr "Ogiltigt antal bitar" + +#~ msgid "Invalid phase" +#~ msgstr "Ogiltig fas" + +#~ msgid "Invalid pin" +#~ msgstr "Ogiltig pinne" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Ogiltig pinne för vänster kanal" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Ogiltig pinne för höger kanal" + +#~ msgid "Invalid polarity" +#~ msgstr "Ogiltig polaritet" + +#~ msgid "Invalid properties" +#~ msgstr "Ogiltiga egenskaper" + +#~ msgid "Invalid run mode." +#~ msgstr "Ogiltigt körläge." + +#~ msgid "Invalid security_mode" +#~ msgstr "Ogiltigt säkerhetsläge" + +#~ msgid "Invalid voice" +#~ msgstr "Ogiltig kanal" + +#~ msgid "Invalid voice count" +#~ msgstr "Ogiltigt kanalantal" + +#~ msgid "Invalid wave file" +#~ msgstr "Ogiltig wave-fil" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Ogiltig word-/bitlängd" + +#~ msgid "Layer already in a group." +#~ msgstr "Lagret finns redan i en grupp." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer måste vara en subklass av Group eller TileGrid." + +#~ msgid "MISO pin init failed." +#~ msgstr "init för MISO-pinne misslyckades." + +#~ msgid "MOSI pin init failed." +#~ msgstr "init för MOSI-pinne misslyckades." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Meddelanden begränsad till 8 byte" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "Fler än %d rapport-id stöds inte" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Inget hårdvarustöd på clk-pinne" + +#~ msgid "No hardware support on pin" +#~ msgstr "Inget hårdvarustöd på pinne" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "Utdatabuffert måste vara minst %d byte" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "PWM duty_cykel måste vara mellan 0 och 65535 (16 bitars upplösning)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "Antalet pinnar måste vara minst 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pinnen har inte ADC-funktionalitet" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "Programmet måste innehålla minst en 16-bitars instruktion." + +#~ msgid "Program too large" +#~ msgstr "Programmet är för stort" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 stöds ännu inte på den här enheten" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "RTC-kalibrering stöds inte av detta kort" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 Stöds ännu inte på den här enheten" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI Init-fel" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI reinitialiseringsfel" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Samplingsfrekvensen måste vara positiv" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Samplingsfrekvensen är för hög. Den måste vara mindre än %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "Inställt antal pinnar måste vara mellan 1 och 5" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "Sido-setets antal pinnar måste vara mellan 1 och 5" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Stackstorleken måste vara minst 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Tile-värde utanför intervall" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UART-buffertallokeringsfel" + +#~ msgid "UART De-init error" +#~ msgstr "UART deinit-fel" + +#~ msgid "UART Init Error" +#~ msgstr "UART Init-fel" + +#~ msgid "UART Re-init error" +#~ msgstr "UART reinit-fel" + +#~ msgid "UART write error" +#~ msgstr "UART skrivfel" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Baudrate stöd inte" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFi-lösenord måste vara mellan 8 och 63 tecken" + +#~ msgid "bits must be in range 5 to 9" +#~ msgstr "bits måste mellan 5 och 9" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "bytes> 8 bitar stöds inte" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "kalibreringsvärde utanför intervallet +/- 127" + +#~ msgid "can only be registered in one parent" +#~ msgstr "kan endast registreras med en förälder" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "circle kan endast registreras i en förälder" + +#~ msgid "max_connections must be between 0 and 10" +#~ msgstr "max_connections måste vara mellan 0 och 10" + +#~ msgid "max_length must be >= 0" +#~ msgstr "max_length måste vara >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "polygon kan endast registreras i en förälder" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "pull_threshold måste vara mellan 1 och 32" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "push_threshold måste vara mellan 1 och 32" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "stop måste vara 1 eller 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "tile måste vara större än noll" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "timeout måste vara >= 0.0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "width måste vara mellan 2 och 8, inte %d" + #~ msgid "Unsupported operation" #~ msgstr "Åtgärd som inte stöds" diff --git a/locale/tr.po b/locale/tr.po index c64c90b204..b1a3058c2d 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -78,10 +78,24 @@ msgstr "" "%d adres pinleri, %d RGB pinleri ve %d döşemeleri %d'nin yüksekliği " "gösterir, %d'nin değil" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q ve %q yinelenen pinler içeriyor" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q yinelenen pinler içeriyor" @@ -94,12 +108,7 @@ msgstr "%q hata: %d" msgid "%q in use" msgstr "%q kullanımda" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q indeksi aralık dışında" @@ -107,14 +116,34 @@ msgstr "%q indeksi aralık dışında" msgid "%q indices must be integers, not %s" msgstr "%q indeksleri integer olmalı, %s değil" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q boyutları %d-%d olmalıdır" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q boyutu >=1 olmalıdır" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q, %d-%d olmalıdır" @@ -131,14 +160,10 @@ msgstr "%q <= %d olmalıdır" msgid "%q must be >= %d" msgstr "%q >= %d olmalıdır" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q >= 0 olmalıdır" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q >= 1 olmalıdır" @@ -147,14 +172,9 @@ msgstr "%q >= 1 olmalıdır" msgid "%q must be a string" msgstr "%q bir string olmalıdır" -#: shared-module/vectorio/Polygon.c -msgid "%q must be a tuple of length 2" -msgstr "%q, boyutu 2 olan bir tuple olmalıdır" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -msgid "%q must be between %d and %d" -msgstr "%q, %d ile %d arasında olmalıdır" +#: py/argcheck.c +msgid "%q must be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -172,7 +192,11 @@ msgstr "%q, 2'nin kuvveti olmalıdır" msgid "%q out of bounds" msgstr "%q sınırların dışında" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q aralık dışında" @@ -181,10 +205,6 @@ msgstr "%q aralık dışında" msgid "%q pin invalid" msgstr "%q pini geçersiz" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q bir int olmalıdır" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "Rapor kimliği 0 olan %q, 1 uzunluğunda olmalıdır" @@ -349,10 +369,6 @@ msgstr "asenkron fonksiyon içinde 'yield from'" msgid "'yield' outside function" msgstr "fonksiyon dışında 'yield'" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "(x, y) integerları gereklidir" - #: py/compile.c msgid "*x must be assignment target" msgstr "" @@ -388,10 +404,6 @@ msgstr "ADC2, WiFi tarafından kullanılmaktadır" msgid "Address must be %d bytes long" msgstr "Adres %d byte uzunluğunda olmalıdır" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Adres tipi beklenen aralığın dışında" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "Tüm CAN çevre birimleri kullanımda" @@ -482,25 +494,6 @@ msgstr "Halihazırda çalışıyor" msgid "Already scanning for wifi networks" msgstr "Halihazırda wifi ağları için tarama yapılıyor" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "Verilen pin için AnalogIn desteklenmemektedir" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "AnalogOut işlevi desteklenmemektedir" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut yalnızca 16 bitlik. Değer 65536'dan küçük olmalıdır." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "Verilen pin için AnalogOut desteklenmemektedir" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "Başka bir PWMAudioOut zaten aktif durumda" @@ -572,11 +565,6 @@ msgstr "" msgid "Bit clock and word select must share a clock unit" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "Bit derinliği 1-6 aralığında olmalı, %d değil" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "Bit derinliği 8'in katı olacak şekilde olmalı." @@ -619,11 +607,6 @@ msgstr "" msgid "Buffer elements must be 4 bytes long or less" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Geçersiz arabellek boyutu. %d kadar olmalı" - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Arabellek bayt dizisi değil" @@ -633,7 +616,6 @@ msgstr "Arabellek bayt dizisi değil" msgid "Buffer is too small" msgstr "Arabellek çok küçük" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -648,10 +630,6 @@ msgstr "Arabellek boyutu 512'nin katı olmalı" msgid "Buffer must be a multiple of 512 bytes" msgstr "" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Arabellek boyutu en az 1 olmalı" - #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" @@ -673,10 +651,6 @@ msgstr "Veriyolu pini %d kullanımda" msgid "Byte buffer must be 16 bytes." msgstr "" -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Baytlar 0-255 aralığında olmalı" - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC blokları 16 baytın katları şeklinde olmalı" @@ -693,6 +667,10 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" @@ -740,18 +718,10 @@ msgstr "" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "" @@ -763,7 +733,7 @@ msgstr "" #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." +msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c @@ -784,20 +754,19 @@ msgid "Cannot subclass slice" msgstr "" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." +msgid "Cannot transfer without MOSI and MISO pins" msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c -msgid "Cannot wake on pin edge. Only level." +msgid "Cannot wake on pin edge, only level" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge. Only level." msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c @@ -812,10 +781,6 @@ msgstr "" msgid "CircuitPython was unable to allocate the heap." msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "" - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "" @@ -824,11 +789,6 @@ msgstr "" msgid "Clock unit in use" msgstr "" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -839,35 +799,6 @@ msgstr "" msgid "Corrupt .mpy file" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -888,20 +819,6 @@ msgstr "" msgid "Couldn't allocate decoder" msgstr "" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "" @@ -949,10 +866,6 @@ msgstr "" msgid "Device in use" msgstr "" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1008,11 +921,6 @@ msgstr "" msgid "Expected an alarm" msgstr "" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1039,22 +947,6 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" @@ -1123,11 +1015,6 @@ msgstr "" msgid "Format not supported" msgstr "" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1142,6 +1029,10 @@ msgstr "" msgid "Function requires lock" msgstr "" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1169,16 +1060,12 @@ msgstr "" msgid "Hardware in use, try alternative pins" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" +msgid "I2C init error" msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1286,75 +1173,33 @@ msgstr "" msgid "Internal error #%d" msgstr "" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "" @@ -1362,42 +1207,11 @@ msgstr "" msgid "Invalid bits per value" msgstr "" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "" @@ -1406,78 +1220,14 @@ msgstr "" msgid "Invalid memory access." msgstr "" -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "" - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" @@ -1490,23 +1240,6 @@ msgstr "" msgid "Invalid state" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "" @@ -1520,25 +1253,17 @@ msgid "LHS of keyword arg must be an id" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer already in a group." +msgid "Layer already in a group" msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." +msgid "Layer must be a Group or TileGrid subclass" msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "" - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "" - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "" @@ -1548,10 +1273,6 @@ msgstr "" msgid "Maximum x value when mirrored is %d" msgstr "" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "" @@ -1565,10 +1286,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1604,11 +1329,6 @@ msgstr "" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "" @@ -1669,15 +1389,23 @@ msgid "No I2C device at address: 0x%x" msgstr "" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1716,16 +1444,6 @@ msgstr "" msgid "No hardware random available" msgstr "" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "" @@ -1870,10 +1588,13 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set." msgstr "" @@ -1905,11 +1626,6 @@ msgstr "" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "" @@ -1920,12 +1636,11 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +"PWM frequency not writable when variable_frequency is False on construction." msgstr "" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM frequency not writable when variable_frequency is False on construction." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" msgstr "" #: ports/raspberrypi/common-hal/countio/Counter.c @@ -1944,29 +1659,14 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2036,18 +1736,10 @@ msgstr "" msgid "Program does OUT without loading OSR" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "" - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "" @@ -2069,8 +1761,9 @@ msgstr "" msgid "RNG Init Error" msgstr "" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" msgstr "" #: ports/espressif/common-hal/busio/UART.c @@ -2078,21 +1771,10 @@ msgstr "" msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "" @@ -2142,6 +1824,10 @@ msgstr "" msgid "SD card CSD format not supported" msgstr "" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2152,29 +1838,20 @@ msgstr "" msgid "SDIO Init Error %d" msgstr "" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +msgstr "" + #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" msgstr "" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c @@ -2195,14 +1872,6 @@ msgstr "" msgid "Server side context cannot have hostname" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "" @@ -2238,10 +1907,6 @@ msgstr "" msgid "Splitting with sub-captures" msgstr "" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "" @@ -2327,10 +1992,6 @@ msgstr "" msgid "Tile index out of bounds" msgstr "" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "" @@ -2350,6 +2011,9 @@ msgid "To exit, please reset the board without " msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" @@ -2382,23 +2046,20 @@ msgid "Tuple or struct_time argument required" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" +msgid "UART re-init" msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" +msgid "UART write" msgstr "" #: shared-module/usb_hid/Device.c @@ -2535,12 +2196,6 @@ msgid "" "declined or ignored." msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "" @@ -2615,10 +2270,6 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "" - #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -2771,10 +2422,6 @@ msgstr "" msgid "bits must be 32 or less" msgstr "" -#: shared-bindings/busio/UART.c -msgid "bits must be in range 5 to 9" -msgstr "" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "" @@ -2812,11 +2459,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2825,7 +2467,7 @@ msgstr "" msgid "bytes value out of range" msgstr "" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "" @@ -2833,12 +2475,9 @@ msgstr "" msgid "calibration is read only" msgstr "" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" +msgid "can only have one parent" msgstr "" #: py/emitinlinethumb.c @@ -3009,6 +2648,10 @@ msgstr "" msgid "casting" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "" @@ -3021,10 +2664,6 @@ msgstr "" msgid "chr() arg not in range(256)" msgstr "" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "" @@ -3449,6 +3088,10 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "" @@ -3699,10 +3342,6 @@ msgstr "" msgid "matrix is not positive definite" msgstr "" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3710,10 +3349,6 @@ msgstr "" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "" @@ -4084,10 +3719,6 @@ msgstr "" msgid "poll on file not available on win32" msgstr "" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -4134,14 +3765,6 @@ msgstr "" msgid "pull masks conflict with direction masks" msgstr "" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "" @@ -4312,10 +3935,6 @@ msgstr "" msgid "step must be non-zero" msgstr "" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "" @@ -4364,10 +3983,6 @@ msgstr "" msgid "threshold must be in the range 0-65536" msgstr "" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "" @@ -4387,10 +4002,6 @@ msgstr "" msgid "timeout must be < 655.35 secs" msgstr "" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" @@ -4399,6 +4010,10 @@ msgstr "" msgid "timeout waiting for v2 card" msgstr "" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "" @@ -4590,13 +4205,7 @@ msgstr "" msgid "watchdog timeout must be greater than 0" msgstr "" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "" @@ -4668,6 +4277,47 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "%q must be a tuple of length 2" +#~ msgstr "%q, boyutu 2 olan bir tuple olmalıdır" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q, %d ile %d arasında olmalıdır" + +#~ msgid "%q should be an int" +#~ msgstr "%q bir int olmalıdır" + +#~ msgid "(x,y) integers required" +#~ msgstr "(x, y) integerları gereklidir" + +#~ msgid "Address type out of range" +#~ msgstr "Adres tipi beklenen aralığın dışında" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "Verilen pin için AnalogIn desteklenmemektedir" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "AnalogOut işlevi desteklenmemektedir" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut yalnızca 16 bitlik. Değer 65536'dan küçük olmalıdır." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "Verilen pin için AnalogOut desteklenmemektedir" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "Bit derinliği 1-6 aralığında olmalı, %d değil" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Geçersiz arabellek boyutu. %d kadar olmalı" + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Arabellek boyutu en az 1 olmalı" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Baytlar 0-255 aralığında olmalı" + #~ msgid "" #~ "\n" #~ "Code stopped by auto-reload.\n" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 5e1b146532..adecfd334e 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -77,10 +77,24 @@ msgstr "" "%d de zhǐ yǐn jiǎo, %d rgb yǐn jiǎo hé %d qiē piàn biǎo shì %d de gāo dù, ér " "bù shì %d" +#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c +#: ports/espressif/common-hal/rtc/RTC.c +#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +#: ports/mimxrt10xx/common-hal/rtc/RTC.c +#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/analogio/AnalogOut.c +#: ports/raspberrypi/common-hal/rtc/RTC.c +msgid "%q" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" msgstr "%q hé %q bāo hán chóng fù yǐn jiǎo" +#: ports/atmel-samd/common-hal/audioio/AudioOut.c +msgid "%q and %q must be different" +msgstr "" + #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" msgstr "%q bāo hán chóng fù de yǐn jiǎo" @@ -93,12 +107,7 @@ msgstr "%q Shībài: %d" msgid "%q in use" msgstr "%q zhèngzài bèi shǐyòng" -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c py/obj.c py/objstr.c -#: py/objstrunicode.c +#: py/obj.c py/objstr.c py/objstrunicode.c msgid "%q index out of range" msgstr "%q suǒyǐn chāochū fànwéi" @@ -106,14 +115,34 @@ 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" +#: shared-module/bitbangio/SPI.c +msgid "%q init failed" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be %d" +msgstr "" + #: py/argcheck.c msgid "%q length must be %d-%d" msgstr "%q cháng dù bì xū wéi %d-%d" -#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c +#: py/argcheck.c +msgid "%q length must be <= %d" +msgstr "" + +#: py/argcheck.c +msgid "%q length must be >= %d" +msgstr "" + +#: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" msgstr "%q cháng dù bì xū >= 1" +#: py/argcheck.c +msgid "%q must be %d" +msgstr "" + #: py/argcheck.c msgid "%q must be %d-%d" msgstr "%q bì xū wéi %d-%d" @@ -130,14 +159,10 @@ msgstr "%q bì xū <= %d" msgid "%q must be >= %d" msgstr "%q bì xū >= %d" -#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c +#: py/argcheck.c msgid "%q must be >= 0" msgstr "%q Bìxū > = 0" -#: shared-bindings/_bleio/CharacteristicBuffer.c -#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.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" msgstr "%q bìxū >= 1" @@ -146,14 +171,9 @@ msgstr "%q bìxū >= 1" msgid "%q must be a string" 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" -msgstr "%q bìxū shì chángdù wèi 2 de yuánzǔ" - -#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c -#: shared-module/vectorio/VectorShape.c -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 be an int" +msgstr "" #: py/argcheck.c msgid "%q must be of type %q" @@ -171,7 +191,11 @@ msgstr "%q bì xū shì 2 de zhěng shù cì fāng" msgid "%q out of bounds" msgstr "%q chāo chū jiè xiàn" +#: ports/atmel-samd/common-hal/pulseio/PulseIn.c +#: ports/cxd56/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c +#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c msgid "%q out of range" msgstr "%q chāochū fànwéi" @@ -180,10 +204,6 @@ msgstr "%q chāochū fànwéi" msgid "%q pin invalid" msgstr "%q yǐn jiǎo wúxiào" -#: shared-bindings/fontio/BuiltinFont.c -msgid "%q should be an int" -msgstr "%q yīnggāi shì yīgè zhěngshù (int)" - #: shared-bindings/usb_hid/Device.c msgid "%q with a report ID of 0 must be of length 1" msgstr "bào gào ID shì 0 de %q bì xū cháng dù wéi 1" @@ -346,10 +366,6 @@ msgstr "Yìbù hánshù zhōng cúnzài 'yield from'" msgid "'yield' outside function" msgstr "'yield' wèiyú hánshù zhīwài" -#: shared-module/vectorio/VectorShape.c -msgid "(x,y) integers required" -msgstr "xūyào zhěngshù (x,y)" - #: py/compile.c msgid "*x must be assignment target" msgstr "*x bìxū shì bèi fùzhí de duìxiàng" @@ -385,10 +401,6 @@ msgstr "ADC2 zhèngzài bèi WiFi shǐ yòng" msgid "Address must be %d bytes long" msgstr "dìzhǐ chángdù bìxū shì %d zìjié" -#: shared-bindings/_bleio/Address.c -msgid "Address type out of range" -msgstr "Dìzhǐ lèixíng chāochū fànwéi" - #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "suǒyǒu CAN wàishè dōu zài shǐyòng zhōng" @@ -480,25 +492,6 @@ msgstr "yǐjīng zài yùnxíng" msgid "Already scanning for wifi networks" msgstr "yǐjīng zài sǎomiáo WIFI wǎngluò" -#: ports/cxd56/common-hal/analogio/AnalogIn.c -msgid "AnalogIn not supported on given pin" -msgstr "gěidìng de yǐnjiǎo bù zhīchí AnalogIn" - -#: ports/cxd56/common-hal/analogio/AnalogOut.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c -#: ports/nrf/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/analogio/AnalogOut.c -msgid "AnalogOut functionality not supported" -msgstr "Bù zhīchí AnalogOut gōngnéng" - -#: shared-bindings/analogio/AnalogOut.c -msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "AnalogOut jǐn wèi 16 wèi. Zhí bìxū xiǎoyú 65536." - -#: ports/atmel-samd/common-hal/analogio/AnalogOut.c -msgid "AnalogOut not supported on given pin" -msgstr "zhǐdìng de yǐn jiǎo bù zhīchí AnalogOut" - #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" msgstr "lìng yí gè PWMAudioOut yǐ jīng zài gōngzuò" @@ -572,11 +565,6 @@ msgstr "wèi shí zhōng hé dān cí xuǎn zé bì xū shì shùn xù yǐn jiǎ msgid "Bit clock and word select must share a clock unit" msgstr "Bǐtè shízhōng hé dānzì xuǎnzé bìxū gòngxiǎng shízhōng dānwèi" -#: shared-bindings/rgbmatrix/RGBMatrix.c -#, c-format -msgid "Bit depth must be from 1 to 6 inclusive, not %d" -msgstr "wèi shēndù bìxū shì 1 dào 6, ér búshì %d" - #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." msgstr "wèi shēndù bìxū shì 8 de zhěngshùbèi." @@ -619,11 +607,6 @@ msgstr "huǎnchōngqū yǔ piānyíliàng de hé tài xiǎo %d %d %d" msgid "Buffer elements must be 4 bytes long or less" msgstr "huǎnchōngqū de yuánsù bìxū wéi 4 zìjié cháng huò gèngshǎo" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "Buffer incorrect size. Should be %d bytes." -msgstr "Huǎnchōng qū dàxiǎo bù zhèngquè. Yīnggāi shì %d zì jié." - #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." msgstr "Huǎnchōng qū bùshì bytearray." @@ -633,7 +616,6 @@ msgstr "Huǎnchōng qū bùshì bytearray." msgid "Buffer is too small" msgstr "Huǎnchōng qū tài xiǎo" -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" @@ -648,10 +630,6 @@ msgstr "Huǎnchōngqū chángdù bìxū wéi 512 de bèishù" msgid "Buffer must be a multiple of 512 bytes" msgstr "Huǎnchōngqū bìxū shì 512 zìjié de bèishù" -#: shared-bindings/bitbangio/I2C.c -msgid "Buffer must be at least length 1" -msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù wéi 1" - #: shared-bindings/_bleio/PacketBuffer.c #, fuzzy, c-format msgid "Buffer too short by %d bytes" @@ -673,10 +651,6 @@ msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng" msgid "Byte buffer must be 16 bytes." msgstr "Zìjié huǎnchōng qū bìxū shì 16 zìjié." -#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c -msgid "Bytes must be between 0 and 255." -msgstr "Zìjié bìxū jiè yú 0 dào 255 zhījiān." - #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" msgstr "CBC kuài bìxū shì 16 zìjié de bèishù" @@ -693,6 +667,10 @@ msgstr "CRC huò jiàoyàn hé wúxiào" msgid "Call super().__init__() before accessing native object." msgstr "Zài fǎngwèn yuánshēn dùixiàng zhīqián diàoyòng super().__init__()." +#: ports/cxd56/common-hal/camera/Camera.c +msgid "Camera init" +msgstr "" + #: ports/espressif/common-hal/alarm/pin/PinAlarm.c #, fuzzy msgid "Can only alarm on RTC IO from deep sleep." @@ -745,18 +723,10 @@ msgstr "Wúfǎ huòqǔ wēndù" msgid "Cannot have scan responses for extended, connectable advertisements." msgstr "Nín wúfǎ sǎomiáo kuòzhǎn de, kě liánjiē de guǎnggào." -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Cannot output both channels on the same pin" -msgstr "Wúfǎ shūchū tóng yīgè yǐn jiǎo shàng de liǎng gè píndào" - #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "wú fǎ lā dòng jǐn shū rù yǐn jiǎo." -#: shared-module/bitbangio/SPI.c -msgid "Cannot read without MISO pin." -msgstr "Wúfǎ dòu qǔ méiyǒu MISO de yǐn jiǎo." - #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" msgstr "Wúfǎ jìlù dào wénjiàn" @@ -768,8 +738,8 @@ msgstr "tōng guò USB kě jiàn shí wú fǎ chóng xīn ān zhuāng '/'." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c -msgid "Cannot reset into bootloader because no bootloader is present." -msgstr "Wúfǎ chóng zhì wèi bootloader, yīnwèi méiyǒu bootloader cúnzài." +msgid "Cannot reset into bootloader because no bootloader is present" +msgstr "" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -789,22 +759,21 @@ msgid "Cannot subclass slice" msgstr "Wúfǎ zi fēnlèi" #: shared-module/bitbangio/SPI.c -msgid "Cannot transfer without MOSI and MISO pins." -msgstr "Méiyǒu MOSI/MISO jiù wúfǎ zhuǎnyí." +msgid "Cannot transfer without MOSI and MISO pins" +msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" msgstr "Wúfǎ gēnggǎi yǐ zài shǐyòng de jìshí qì shàng de pínlǜ" -#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c +msgid "Cannot wake on pin edge, only level" +msgstr "" + +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "wú fǎ zài yǐn jiǎo biān yuán huàn xǐng. jǐn jí bié." -#: shared-module/bitbangio/SPI.c -msgid "Cannot write without MOSI pin." -msgstr "Wúfǎ xiě rù MOSI de yǐn jiǎo." - #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" msgstr "Wèi tígōng zìfú huǎncún xiě rù" @@ -817,10 +786,6 @@ msgstr "CircuitPython de héxīn chūxiàn gùzhàng. Āiyā!\n" msgid "CircuitPython was unable to allocate the heap." msgstr "CircuitPython wúfǎ fēnpèi duī." -#: shared-module/bitbangio/SPI.c -msgid "Clock pin init failed." -msgstr "Shízhōng de yǐn jiǎo chūshǐhuà shībài." - #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" msgstr "Shízhōng shēnzhǎn tài zhǎng" @@ -829,11 +794,6 @@ msgstr "Shízhōng shēnzhǎn tài zhǎng" msgid "Clock unit in use" msgstr "Shǐyòng shízhōng dānwèi" -#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c -msgid "Command must be an int between 0 and 255" -msgstr "Mìnglìng bìxū shì 0 dào 255 zhī jiān de int" - #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " @@ -844,35 +804,6 @@ msgstr "Liánjiē yǐ duàn kāi, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xī msgid "Corrupt .mpy file" msgstr "Fǔbài de .mpy wénjiàn" -#: ports/cxd56/common-hal/camera/Camera.c -msgid "Could not initialize Camera" -msgstr "Wúfǎ chūshǐhuà xiàngjī" - -#: ports/cxd56/common-hal/gnss/GNSS.c -msgid "Could not initialize GNSS" -msgstr "wú fǎ chū shǐ huà GNSS" - -#: ports/cxd56/common-hal/sdioio/SDCard.c -msgid "Could not initialize SDCard" -msgstr "wú fǎ chū shǐ huà SDCard" - -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "Could not initialize UART" -msgstr "Wúfǎ chūshǐhuà UART" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init channel" -msgstr "Wúfǎ chóngxīn chūshǐhuà píndào" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not re-init timer" -msgstr "Wúfǎ chóngxīn qǐdòng jìshí qì" - -#: ports/stm/common-hal/pwmio/PWMOut.c -msgid "Could not restart PWM" -msgstr "Wúfǎ chóngqǐ PWM" - #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "Wúfǎ huòqǔ shízhōng" @@ -893,20 +824,6 @@ msgstr "Wúfǎ qǐdòng zhōngduàn,RX máng" msgid "Couldn't allocate decoder" msgstr "Zhǎo bù dào jiěmǎ qì" -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate first buffer" -msgstr "Wúfǎ fēnpèi dì yī gè huǎnchōng qū" - -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate input buffer" -msgstr "Wúfǎ fēnpèi shūrù huǎnchōng qū" - -#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c -#: shared-module/audiomp3/MP3Decoder.c -msgid "Couldn't allocate second buffer" -msgstr "Wúfǎ fēnpèi dì èr gè huǎnchōng qū" - #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." msgstr "Zhuìhuǐ. Shūrù HardFault_Handler." @@ -955,10 +872,6 @@ msgstr "Mùbiāo róngliàng xiǎoyú mùdì de_chángdù." msgid "Device in use" msgstr "Zhèngzài shǐyòng de shèbèi" -#: ports/cxd56/common-hal/digitalio/DigitalInOut.c -msgid "DigitalInOut not supported on given pin" -msgstr "Gěi dìng de yǐn jiǎo bù zhīchí DigitalInOut" - #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." @@ -1014,11 +927,6 @@ msgstr "Yùqí %q" msgid "Expected an alarm" msgstr "yù qī yǒu jǐng bào" -#: shared-module/adafruit_pixelbuf/PixelBuf.c -#, c-format -msgid "Expected tuple of length %d, got %d" -msgstr "Qīwàng de chángdù wèi %d de yuán zǔ, dédào %d" - #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." @@ -1045,22 +953,6 @@ msgstr "Fāsòng mìnglìng shībài." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Wúfǎ huòdé mutex, err 0x%04x" -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c -msgid "Failed to allocate RX buffer" -msgstr "Fēnpèi RX huǎnchōng shībài" - -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/espressif/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c -#: ports/stm/common-hal/pulseio/PulseIn.c -#, c-format -msgid "Failed to allocate RX buffer of %d bytes" -msgstr "Fēnpèi RX huǎnchōng qū%d zì jié shībài" - #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Wúfǎ fēnpèi Wifi nèicún" @@ -1132,11 +1024,6 @@ msgstr "" msgid "Format not supported" msgstr "Bù zhīyuán géshì" -#: shared-module/framebufferio/FramebufferDisplay.c -#, c-format -msgid "Framebuffer requires %d bytes" -msgstr "zhēn huǎn chōng qū xū yào %d zì jié" - #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" @@ -1152,6 +1039,10 @@ msgstr "Pínlǜ bìxū yǔ shǐyòng cǐ jìshí qì de xiàn yǒu PWMOut xiāng msgid "Function requires lock" msgstr "Hánshù xūyào suǒdìng" +#: ports/cxd56/common-hal/gnss/GNSS.c +msgid "GNSS init" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "tōng yòng gù zhàng" @@ -1179,17 +1070,13 @@ msgstr "Yìngjiàn máng, qǐng chángshì qítā zhēnjiǎo" msgid "Hardware in use, try alternative pins" msgstr "Shǐyòng de yìngjiàn, qǐng chángshì qítā yǐn jiǎo" -#: shared-bindings/wifi/Radio.c -msgid "Hostname must be between 1 and 253 characters" -msgstr "zhǔ jī míng bì xū jiè yú 1 hé 253 gè zì fú zhī jiān" - #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Wénjiàn shàng de I/ O cāozuò" #: ports/stm/common-hal/busio/I2C.c -msgid "I2C Init Error" -msgstr "I2C chūshǐhuà cuòwù" +msgid "I2C init error" +msgstr "" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1303,75 +1190,33 @@ msgstr "nèi bù cuò wù" msgid "Internal error #%d" msgstr "nèi bù cuò wù #%d" -#: shared-bindings/sdioio/SDCard.c shared-module/usb_hid/Device.c +#: py/argcheck.c msgid "Invalid %q" msgstr "wú xiào %q" -#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c -#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#: ports/mimxrt10xx/common-hal/busio/UART.c +#: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" msgstr "Wúxiào de %q yǐn jiǎo" -#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c -#: ports/stm/common-hal/sdioio/SDCard.c -msgid "Invalid %q pin selection" -msgstr "wú xiào %q yǐn jiǎo xuǎn zé" - #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" msgstr "Wúxiào de ADC dānwèi zhí" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "Invalid AuthMode" -msgstr "wú xiào AuthMode" - #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "wú xiào BLE cān shù" -#: shared-module/displayio/OnDiskBitmap.c -msgid "Invalid BMP file" -msgstr "Wúxiào de BMP wénjiàn" - #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" msgstr "Wúxiào de BSSID" -#: ports/espressif/common-hal/analogio/AnalogOut.c -#: ports/stm/common-hal/analogio/AnalogOut.c -msgid "Invalid DAC pin supplied" -msgstr "Tí gōng liǎo wúxiào de DAC yǐn jiǎo" - #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" msgstr "wú xiào de MAC dì zhǐ" -#: shared-bindings/synthio/__init__.c -msgid "Invalid MIDI file" -msgstr "wú xiào de MIDI wén jiàn" - -#: ports/atmel-samd/common-hal/pwmio/PWMOut.c -#: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/espressif/common-hal/pwmio/PWMOut.c -#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c -#: ports/nrf/common-hal/pwmio/PWMOut.c -#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c -msgid "Invalid PWM frequency" -msgstr "Wúxiào de PWM pínlǜ" - -#: ports/espressif/common-hal/analogio/AnalogIn.c -msgid "Invalid Pin" -msgstr "wú xiào yǐn jiǎo" - -#: ports/espressif/bindings/espidf/__init__.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/espressif/esp_error.c py/moduerrno.c -#: shared-module/rgbmatrix/RGBMatrix.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c +#: py/moduerrno.c msgid "Invalid argument" msgstr "Wúxiào de cānshù" @@ -1379,42 +1224,11 @@ msgstr "Wúxiào de cānshù" msgid "Invalid bits per value" msgstr "Měi gè zhí de wèi wúxiào" -#: ports/nrf/common-hal/busio/UART.c ports/raspberrypi/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "Invalid buffer size" -msgstr "Wúxiào de huǎnchōng qū dàxiǎo" - -#: shared-bindings/adafruit_pixelbuf/PixelBuf.c -msgid "Invalid byteorder string" -msgstr "Wúxiào de zì jié shùnxù zìfú chuàn" - -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/espressif/common-hal/frequencyio/FrequencyIn.c -msgid "Invalid capture period. Valid range: 1 - 500" -msgstr "Wúxiào de bǔhuò zhōuqí. Yǒuxiào fànwéi: 1-500" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid channel count" -msgstr "Wúxiào de tōngdào jìshù" - -#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format -msgid "Invalid data_count %d" -msgstr "wú xiào data_count %d" - #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" msgstr "wú xiào data_pins[%d]" -#: shared-bindings/digitalio/DigitalInOut.c -msgid "Invalid direction." -msgstr "Wúxiào de fāngxiàng." - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid file" -msgstr "Wúxiào de wénjiàn" - #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" msgstr "Géshì kuài dàxiǎo wúxiào" @@ -1423,78 +1237,14 @@ msgstr "Géshì kuài dàxiǎo wúxiào" msgid "Invalid memory access." msgstr "Wúxiào de nèicún fǎngwèn." -#: extmod/vfs_fat_file.c -msgid "Invalid mode" -msgstr "wú xiào mó shì" - #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" msgstr "wú xiào de duō bō MAC dì zhǐ" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -msgid "Invalid number of bits" -msgstr "Wèi shù wúxiào" - -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid phase" -msgstr "Jiēduàn wúxiào" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c -#: ports/espressif/common-hal/touchio/TouchIn.c -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c -#: shared-module/rgbmatrix/RGBMatrix.c -msgid "Invalid pin" -msgstr "Wúxiào de yǐn jiǎo" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for left channel" -msgstr "Zuǒ tōngdào de yǐn jiǎo wúxiào" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -msgid "Invalid pin for right channel" -msgstr "Yòuxián tōngdào yǐn jiǎo wúxiào" - -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c -#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/espressif/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/SPI.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/espressif/common-hal/canio/CAN.c -#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/I2C.c -#: ports/raspberrypi/common-hal/busio/SPI.c -#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c #: shared-bindings/busio/UART.c msgid "Invalid pins" msgstr "Wúxiào de yǐn jiǎo" -#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c -#: shared-bindings/displayio/FourWire.c -msgid "Invalid polarity" -msgstr "Wúxiào liǎng jí zhí" - -#: shared-bindings/_bleio/Characteristic.c -msgid "Invalid properties" -msgstr "Wúxiào de shǔxìng" - -#: shared-bindings/microcontroller/__init__.c -msgid "Invalid run mode." -msgstr "Wúxiào de yùnxíng móshì." - -#: shared-module/_bleio/Attribute.c -msgid "Invalid security_mode" -msgstr "Ānquán móshì wúxiào" - #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "dà xiǎo wú xiào" @@ -1507,23 +1257,6 @@ msgstr "TLS de chā zuò wú xiào" msgid "Invalid state" msgstr "wú xiào zhuàng tài" -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice" -msgstr "Yǔyīn wúxiào" - -#: shared-bindings/audiomixer/Mixer.c -msgid "Invalid voice count" -msgstr "Wúxiào de yǔyīn jìshù" - -#: shared-module/audiocore/WaveFile.c -msgid "Invalid wave file" -msgstr "Wúxiào de làng làngcháo wénjiàn" - -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c -msgid "Invalid word/bit length" -msgstr "Wúxiào de zì/wèi chángdù" - #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" msgstr "mì yào bì xū wéi 16, 24 huò 32 zì jié cháng" @@ -1537,25 +1270,17 @@ msgid "LHS of keyword arg must be an id" msgstr "Guānjiàn zì arg de LHS bìxū shì id" #: shared-module/displayio/Group.c -msgid "Layer already in a group." -msgstr "Tú céng yǐjīng zài yīgè zǔ zhōng." +msgid "Layer already in a group" +msgstr "" #: shared-module/displayio/Group.c -msgid "Layer must be a Group or TileGrid subclass." -msgstr "Layer bìxū shì Group huò TileGrid zi lèi." +msgid "Layer must be a Group or TileGrid subclass" +msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "MAC dì zhǐ wú xiào" -#: shared-module/bitbangio/SPI.c -msgid "MISO pin init failed." -msgstr "MISO yǐn jiǎo chūshǐhuà shībài." - -#: shared-module/bitbangio/SPI.c -msgid "MOSI pin init failed." -msgstr "MOSI yǐn jiǎo shūrù shībài." - #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" msgstr "yìng shè bì xū shì yuán zǔ" @@ -1565,10 +1290,6 @@ msgstr "yìng shè bì xū shì yuán zǔ" msgid "Maximum x value when mirrored is %d" msgstr "Jìngxiàng shí de zuìdà X zhí wèi%d" -#: shared-bindings/canio/Message.c -msgid "Messages limited to 8 bytes" -msgstr "Yóujiàn xiànzhì wèi 8 gè zì jié" - #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" msgstr "Màikèfēng qǐdòng yánchí bìxū zài 0.0 Dào 1.0 De fànwéi nèi" @@ -1582,10 +1303,14 @@ msgstr "" msgid "Mismatched swap flag" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" msgstr "Quēshǎo MISO huò MOSI yǐn jiǎo" +#: ports/stm/common-hal/busio/SPI.c +msgid "Missing MISO or MOSI pin" +msgstr "" + #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format msgid "Missing first_in_pin. Instruction %d reads pin(s)" @@ -1622,11 +1347,6 @@ msgstr "quē shǎo dì yī zǔ yǐn jiǎo. zhǐ lìng %d shè zhì yǐn jiǎo" msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "shī zōng de jmp_pin. zhǐ lìng %d zài yǐn jiǎo shàng tiào yuè" -#: shared-module/usb_hid/Device.c -#, c-format -msgid "More than %d report ids not supported" -msgstr "chāo guò %d bào gào bù zhī chí de ID" - #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." msgstr "Bìxū shì %q zi lèi." @@ -1687,15 +1407,23 @@ msgid "No I2C device at address: 0x%x" msgstr "dì zhǐ: 0x%x shí méi yǒu I2C qì jiàn" #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "Méiyǒu MISO yǐn jiǎo" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MISO pin" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "Méiyǒu MOSI yǐn jiǎo" +#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c +msgid "No MOSI pin" +msgstr "" + #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c @@ -1734,16 +1462,6 @@ msgstr "Méiyǒu miǎnfèi de GCLKs" msgid "No hardware random available" msgstr "Méiyǒu kěyòng de yìngjiàn suíjī" -#: ports/atmel-samd/common-hal/ps2io/Ps2.c -msgid "No hardware support on clk pin" -msgstr "Shízhōng yǐn jiǎo wú yìngjiàn zhīchí" - -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c -#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/atmel-samd/common-hal/pulseio/PulseIn.c -msgid "No hardware support on pin" -msgstr "Méiyǒu zài yǐn jiǎo shàng de yìngjiàn zhīchí" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No in in program" msgstr "chéng xù zhōng méi yǒu" @@ -1893,10 +1611,13 @@ msgid "Only one address is allowed" msgstr "zhǐ yǔn xǔ yí gè dì zhǐ" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/espressif/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 "" + +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c +#: ports/raspberrypi/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." @@ -1928,11 +1649,6 @@ msgstr "tào jiē zì wài" msgid "Out-buffer elements must be <= 4 bytes long" msgstr "huǎn chōng wài yuán sù bì xū <= 4 zì jié cháng" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "Output buffer must be at least %d bytes" -msgstr "shū chū huǎn chōng qū bì xū zhì shǎo wéi %d zì jié" - #: shared-bindings/audiobusio/PDMIn.c msgid "Oversample must be multiple of 8." msgstr "Guò cǎiyàng bìxū shì 8 de bèishù." @@ -1941,17 +1657,15 @@ msgstr "Guò cǎiyàng bìxū shì 8 de bèishù." msgid "PDMIn not available" msgstr "PDMIn bù kě yòng" -#: shared-bindings/pwmio/PWMOut.c -msgid "" -"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" -msgstr "" -"PWM yìwù zhōuqí bìxū jiè yú 0 zhì 65535 de bāoróng xìng (16 wèi fēnbiàn lǜ)" - #: shared-bindings/pwmio/PWMOut.c msgid "" "PWM frequency not writable when variable_frequency is False on construction." msgstr "Dāng biànliàng_pínlǜ shì False zài jiànzhú shí PWM pínlǜ bùkě xiě." +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "PWM restart" +msgstr "" + #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" msgstr "yǐ jīng zài shǐ yòng de PWM qiē piàn" @@ -1968,29 +1682,14 @@ msgstr "shǐ yòng zhōng de wài shè" msgid "Permission denied" msgstr "Quánxiàn bèi jùjué" -#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Pin cannot wake from Deep Sleep" msgstr "yǐn jiǎo wú fǎ cóng shēn dù shuì mián zhōng huàn xǐng" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Pin count must be at least 1" -msgstr "yǐn jiǎo jì shù bì xū zhì shǎo wéi 1" - #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Pin count too large" msgstr "yǐn jiǎo jì shù tài dà" -#: ports/atmel-samd/common-hal/analogio/AnalogIn.c -#: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/espressif/common-hal/analogio/AnalogIn.c -#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c -#: ports/nrf/common-hal/analogio/AnalogIn.c -#: ports/raspberrypi/common-hal/analogio/AnalogIn.c -#: ports/stm/common-hal/analogio/AnalogIn.c -msgid "Pin does not have ADC capabilities" -msgstr "Pin méiyǒu ADC nénglì" - #: ports/stm/common-hal/alarm/pin/PinAlarm.c #: ports/stm/common-hal/pulseio/PulseIn.c msgid "Pin interrupt already in use" @@ -2062,18 +1761,10 @@ msgstr "chéng xù zài bù jiā zǎi ISR de qíng kuàng xià wán chéng" msgid "Program does OUT without loading OSR" msgstr "chéng xù zài bù jiā zǎi Osr de qíng kuàng xià zhí xíng OUT" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program must contain at least one 16-bit instruction." -msgstr "chéng xù bì xū zhì shǎo bāo hán yí gè 16 wèi zhǐ lìng ." - #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Program size invalid" msgstr "chéng xù dà xiǎo wú xiào" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Program too large" -msgstr "chéng xù tài dà" - #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." msgstr "Fāngxiàng shūchū shí Pull méiyǒu shǐyòng." @@ -2095,30 +1786,20 @@ msgstr "RNG qǔxiāo chūshǐhuà cuòwù" msgid "RNG Init Error" msgstr "RNG chūshǐhuà cuòwù" -#: ports/nrf/common-hal/busio/UART.c -msgid "RS485 Not yet supported on this device" -msgstr "RS485 cǐ shè bèi shàng bù zhī chí" +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "RS485" +msgstr "" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "Wèi chǔyú RS485 móshì shí zhǐdìngle RS485 fǎn zhuǎn" -#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c -#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c -#: ports/raspberrypi/common-hal/rtc/RTC.c -msgid "RTC calibration is not supported on this board" -msgstr "Cǐ bǎn bù zhīchí RTC jiàozhǔn" - #: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c msgid "RTC is not supported on this board" msgstr "Cǐ bǎn bù zhīchí RTC" -#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/stm/common-hal/busio/UART.c -msgid "RTS/CTS/RS485 Not yet supported on this device" -msgstr "RTS/CTS/RS485 gāi shèbèi shàng bù zhīchí" - #: ports/stm/common-hal/os/__init__.c msgid "Random number generation error" msgstr "Suíjī shù shēngchéng cuòwù" @@ -2168,6 +1849,10 @@ msgstr "Zài ānquán móshì xià yùnxíng! Bù yùnxíng yǐ bǎocún de dài msgid "SD card CSD format not supported" msgstr "Bù zhīchí SD kǎ CSD géshì" +#: ports/cxd56/common-hal/sdioio/SDCard.c +msgid "SDCard init" +msgstr "" + #: ports/stm/common-hal/sdioio/SDCard.c #, c-format msgid "SDIO GetCardInfo Error %d" @@ -2178,30 +1863,21 @@ msgstr "SDIO GetCardInfo Cuòwù %d" msgid "SDIO Init Error %d" msgstr "SDIO Init Cuòwù %d" -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Init Error" -msgstr "SPI chūshǐhuà cuòwù" - -#: ports/stm/common-hal/busio/SPI.c -msgid "SPI Re-initialization error" -msgstr "SPI chóngxīn chūshǐhuà cuòwù" - #: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "SPI pèi zhì shī bài" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI init error" +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" -#: shared-bindings/audiomixer/Mixer.c -msgid "Sample rate must be positive" -msgstr "Cǎiyàng lǜ bìxū wèi zhèng shù" - -#: ports/atmel-samd/common-hal/audioio/AudioOut.c -#, c-format -msgid "Sample rate too high. It must be less than %d" -msgstr "Cǎiyàng lǜ tài gāo. Tā bìxū xiǎoyú %d" +#: ports/stm/common-hal/busio/SPI.c +msgid "SPI re-init" +msgstr "" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2221,14 +1897,6 @@ msgstr "Xùliè huà yǐjīng shǐyòngguò" msgid "Server side context cannot have hostname" msgstr "Fúwùqì duān shàngxiàwén bùnéng jùyǒu zhǔjī míng" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Set pin count must be between 1 and 5" -msgstr "shè zhì yǐn jiǎo shù bì xū jiè yú 1 hé 5 zhī jiān" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "Side set pin count must be between 1 and 5" -msgstr "cè miàn shè zhì yǐn jiǎo shù bì xū jiè yú 1 hé 5 zhī jiān" - #: ports/cxd56/common-hal/camera/Camera.c msgid "Size not supported" msgstr "bù zhī chí dà xiǎo" @@ -2264,10 +1932,6 @@ msgstr "zhǐ dìng data0 huò data_pins zhōng de yí gè" msgid "Splitting with sub-captures" msgstr "Yǔ zi bǔhuò fēnliè" -#: shared-bindings/supervisor/__init__.c -msgid "Stack size must be at least 256" -msgstr "Duīzhàn dàxiǎo bìxū zhìshǎo 256" - #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "Stereo left must be on PWM channel A" msgstr "lì tǐ shēng zuǒ bì xū shì zài PWM tōng dào A" @@ -2362,10 +2026,6 @@ msgstr "Píng pū gāodù bìxū huàfēn wèi tú gāodù" msgid "Tile index out of bounds" msgstr "Píng pū zhǐshù chāochū fànwéi" -#: shared-bindings/displayio/TileGrid.c -msgid "Tile value out of bounds" -msgstr "Píng pū zhí chāochū fànwéi" - #: shared-bindings/displayio/TileGrid.c msgid "Tile width must exactly divide bitmap width" msgstr "Píng pū kuāndù bìxū huàfēn wèi tú kuāndù" @@ -2385,6 +2045,9 @@ msgid "To exit, please reset the board without " msgstr "Yào tuìchū, qǐng chóng zhì bǎnkuài ér bùyòng " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c +msgid "Too many channels in sample" +msgstr "" + #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "Chōuyàng zhōng de píndào tài duō." @@ -2417,24 +2080,21 @@ msgid "Tuple or struct_time argument required" msgstr "Xūyào Tuple huò struct_time cānshù" #: ports/stm/common-hal/busio/UART.c -msgid "UART Buffer allocation error" -msgstr "UART huǎnchōng qū fēnpèi cuòwù" +msgid "UART de-init" +msgstr "" + +#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +msgid "UART init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART De-init error" -msgstr "UART qǔxiāo chūshǐhuà cuòwù" +msgid "UART re-init" +msgstr "" #: ports/stm/common-hal/busio/UART.c -msgid "UART Init Error" -msgstr "UART chūshǐhuà cuòwù" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART Re-init error" -msgstr "UART chóngxīn chūshǐhuà cuòwù" - -#: ports/stm/common-hal/busio/UART.c -msgid "UART write error" -msgstr "UART xiě cuòwù" +msgid "UART write" +msgstr "" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2572,12 +2232,6 @@ msgstr "" "Wèi zhǐdìng de wèntí. Kěnéng shì qítā shèbèi shàng de pèiduì tíshì bèi jùjué " "huò hūlüè." -#: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/espressif/common-hal/busio/UART.c -#: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c -msgid "Unsupported baudrate" -msgstr "Bù zhīchí de baudrate" - #: shared-bindings/bitmaptools/__init__.c msgid "Unsupported colorspace" msgstr "bú zhī chí de sè cǎi kōng jiān" @@ -2658,10 +2312,6 @@ msgstr "" "\n" "liè chū nèi zhì mó kuài jiàn rù `help(\"modules\")`.\n" -#: shared-bindings/wifi/Radio.c -msgid "WiFi password must be between 8 and 63 characters" -msgstr "WiFi mìmǎ bìxū jiè yú 8 dào 63 gè zìfú zhī jiān" - #: main.c msgid "Woken up by alarm.\n" msgstr "bèi jǐng bào chǎo xǐng.\n" @@ -2816,10 +2466,6 @@ msgstr "wèi tú dà xiǎo bì xū pǐ pèi" msgid "bits must be 32 or less" 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" -msgstr "wèi bì xū zài fàn wéi nèi 5 zhì 9" - #: shared-bindings/audiomixer/Mixer.c msgid "bits_per_sample must be 8 or 16" msgstr "měi jiàn yàngběn bìxū wèi 8 huò 16" @@ -2857,11 +2503,6 @@ msgstr "huǎn chōng qū tài xiǎo, duì yú qǐng qiú de zì jié" msgid "byteorder is not a string" msgstr "byteorder bùshì zìfú chuàn" -#: ports/atmel-samd/common-hal/busio/UART.c -#: ports/espressif/common-hal/busio/UART.c -msgid "bytes > 8 bits not supported" -msgstr "zì jié > 8 wèi" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "zì jié chángdù, bùshì xiàngmù dàxiǎo de bèishù" @@ -2870,7 +2511,7 @@ msgstr "zì jié chángdù, bùshì xiàngmù dàxiǎo de bèishù" msgid "bytes value out of range" msgstr "zì jié zhí chāochū fànwéi" -#: ports/atmel-samd/bindings/samd/Clock.c ports/atmel-samd/common-hal/rtc/RTC.c +#: ports/atmel-samd/bindings/samd/Clock.c msgid "calibration is out of range" msgstr "jiàozhǔn fànwéi chāochū fànwéi" @@ -2878,13 +2519,10 @@ msgstr "jiàozhǔn fànwéi chāochū fànwéi" msgid "calibration is read only" msgstr "jiàozhǔn zhǐ dú dào" -#: ports/atmel-samd/common-hal/rtc/RTC.c -msgid "calibration value out of range +/-127" -msgstr "jiàozhǔn zhí chāochū fànwéi +/-127" - +#: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c -msgid "can only be registered in one parent" -msgstr "zhǐ néng zài yí gè jiā zhǎng zhōng zhù cè" +msgid "can only have one parent" +msgstr "" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -3055,6 +2693,10 @@ msgstr "bù néng háo bù hán hu de dé dào dà xiǎo de lín" msgid "casting" msgstr "tóuyǐng" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "channel re-init" +msgstr "" + #: shared-bindings/_stage/Text.c msgid "chars buffer too small" msgstr "zìfú huǎnchōng qū tài xiǎo" @@ -3067,10 +2709,6 @@ msgstr "chr() cān shǔ bùzài fànwéi (0x110000)" msgid "chr() arg not in range(256)" msgstr "chr() cān shǔ bùzài fànwéi (256)" -#: shared-module/vectorio/Circle.c -msgid "circle can only be registered in one parent" -msgstr "quānzi zhǐ néng zài yī wèi jiāzhǎng zhōng zhùcè" - #: shared-bindings/bitmaptools/__init__.c msgid "clip point must be (x,y) tuple" msgstr "jiá dian bì xū shì (x,y) kuài" @@ -3500,6 +3138,10 @@ msgstr "suǒyǐn bìxū shì zhěngshù" msgid "indices must be integers, slices, or Boolean lists" msgstr "suǒyǐn bìxū shì zhěngshù, qiēpiàn huò bù'ěr zhí lièbiǎo" +#: ports/espressif/common-hal/busio/I2C.c +msgid "init I2C" +msgstr "" + #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" msgstr "chūshǐ zhí bìxū shì kě diédài de" @@ -3751,10 +3393,6 @@ msgstr "shùxué yù cuòwù" msgid "matrix is not positive definite" msgstr "jǔzhèn bùshì zhèngdìng de" -#: ports/espressif/common-hal/wifi/Radio.c -msgid "max_connections must be between 0 and 10" -msgstr "max_connections bì xū jiè yú 0 hé 10 zhī jiān" - #: ports/espressif/common-hal/_bleio/Descriptor.c #: ports/nrf/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Descriptor.c @@ -3762,10 +3400,6 @@ msgstr "max_connections bì xū jiè yú 0 hé 10 zhī jiān" msgid "max_length must be 0-%d when fixed_length is %s" msgstr "dāng fixed_length de zhí wéi %s shí, max_length bì xū wéi 0-%d" -#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c -msgid "max_length must be >= 0" -msgstr "zuì dà cháng dù bì xū >= 0" - #: extmod/ulab/code/ndarray.c msgid "maximum number of dimensions is 4" msgstr "zuì dà chǐ cùn shù wéi 4" @@ -4136,10 +3770,6 @@ msgstr "pixel_shader bìxū shì displayio.Palette huò displayio.ColorConverter msgid "poll on file not available on win32" msgstr "zài win32 shàng bù tí gōng wén jiàn tóu piào" -#: shared-module/vectorio/Polygon.c -msgid "polygon can only be registered in one parent" -msgstr "duōbiānxíng zhī néng zài yīgè fù jí zhōng zhùcè" - #: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "cóng kōng mài chōng tán chū" @@ -4186,14 +3816,6 @@ msgstr "qǐ dòng shí àn xià zuǒ àn niǔ\n" msgid "pull masks conflict with direction masks" msgstr "lā kǒu zhào yǔ fāng xiàng miàn mó chōng tū" -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "pull_threshold must be between 1 and 32" -msgstr "lā lì yù zhí bì xū jiè yú 1 hé 32 zhī jiān" - -#: ports/raspberrypi/bindings/rp2pio/StateMachine.c -msgid "push_threshold must be between 1 and 32" -msgstr "tuī sòng yù zhí bì xū jiè yú 1 hé 32 zhī jiān" - #: extmod/modutimeq.c msgid "queue overflow" msgstr "duìliè yìchū" @@ -4369,10 +3991,6 @@ msgstr "kāishǐ_x yīnggāi shì yīgè zhěngshù" msgid "step must be non-zero" msgstr "bùzhòu bìxū shìfēi líng" -#: shared-bindings/busio/UART.c -msgid "stop must be 1 or 2" -msgstr "tíngzhǐ bìxū wèi 1 huò 2" - #: shared-bindings/random/__init__.c msgid "stop not reachable from start" msgstr "tíngzhǐ wúfǎ cóng kāishǐ zhōng zhǎodào" @@ -4421,10 +4039,6 @@ msgstr "uctypes miáoshù fú zhōng de yǔfǎ cuòwù" msgid "threshold must be in the range 0-65536" msgstr "yùzhí bìxū zài fànwéi 0-65536" -#: shared-bindings/rgbmatrix/RGBMatrix.c -msgid "tile must be greater than zero" -msgstr "cí tiē bì xū dà yú líng" - #: shared-bindings/time/__init__.c msgid "time.struct_time() takes a 9-sequence" msgstr "time.struct_time() xūyào 9 xùliè" @@ -4444,10 +4058,6 @@ msgstr "Chāo shí shíjiān bìxū wèi 0.0 Dào 100.0 Miǎo" msgid "timeout must be < 655.35 secs" msgstr "chāo shí bì xū < 655.35 miǎo" -#: shared-bindings/_bleio/CharacteristicBuffer.c -msgid "timeout must be >= 0.0" -msgstr "chāoshí bìxū shì >= 0.0" - #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "děngdài v1 kǎ chāoshí" @@ -4456,6 +4066,10 @@ msgstr "děngdài v1 kǎ chāoshí" msgid "timeout waiting for v2 card" msgstr "děngdài v2 kǎ chāoshí" +#: ports/stm/common-hal/pwmio/PWMOut.c +msgid "timer re-init" +msgstr "" + #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" msgstr "time_t shíjiān chuō chāochū píngtái fànwéi" @@ -4647,13 +4261,7 @@ msgstr "wèi chū shǐ huà jiān shì qì" msgid "watchdog timeout must be greater than 0" msgstr "kān mén gǒu chāoshí bìxū dàyú 0" -#: shared-bindings/bitops/__init__.c -#, c-format -msgid "width must be from 2 to 8 (inclusive), not %d" -msgstr "kuān dù bì xū cóng 2 dào 8 ( hán ), ér bù shì %d" - #: shared-bindings/is31fl3741/FrameBuffer.c -#: shared-bindings/rgbmatrix/RGBMatrix.c msgid "width must be greater than zero" msgstr "kuāndù bìxū dàyú líng" @@ -4725,6 +4333,352 @@ 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 be a tuple of length 2" +#~ msgstr "%q bìxū shì chángdù wèi 2 de yuánzǔ" + +#~ msgid "%q must be between %d and %d" +#~ msgstr "%q bì xū zài %d hé %d zhī jiān" + +#~ msgid "%q should be an int" +#~ msgstr "%q yīnggāi shì yīgè zhěngshù (int)" + +#~ msgid "(x,y) integers required" +#~ msgstr "xūyào zhěngshù (x,y)" + +#~ msgid "Address type out of range" +#~ msgstr "Dìzhǐ lèixíng chāochū fànwéi" + +#~ msgid "AnalogIn not supported on given pin" +#~ msgstr "gěidìng de yǐnjiǎo bù zhīchí AnalogIn" + +#~ msgid "AnalogOut functionality not supported" +#~ msgstr "Bù zhīchí AnalogOut gōngnéng" + +#~ msgid "AnalogOut is only 16 bits. Value must be less than 65536." +#~ msgstr "AnalogOut jǐn wèi 16 wèi. Zhí bìxū xiǎoyú 65536." + +#~ msgid "AnalogOut not supported on given pin" +#~ msgstr "zhǐdìng de yǐn jiǎo bù zhīchí AnalogOut" + +#, c-format +#~ msgid "Bit depth must be from 1 to 6 inclusive, not %d" +#~ msgstr "wèi shēndù bìxū shì 1 dào 6, ér búshì %d" + +#, c-format +#~ msgid "Buffer incorrect size. Should be %d bytes." +#~ msgstr "Huǎnchōng qū dàxiǎo bù zhèngquè. Yīnggāi shì %d zì jié." + +#~ msgid "Buffer must be at least length 1" +#~ msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù wéi 1" + +#~ msgid "Bytes must be between 0 and 255." +#~ msgstr "Zìjié bìxū jiè yú 0 dào 255 zhījiān." + +#~ msgid "Cannot output both channels on the same pin" +#~ msgstr "Wúfǎ shūchū tóng yīgè yǐn jiǎo shàng de liǎng gè píndào" + +#~ msgid "Cannot read without MISO pin." +#~ msgstr "Wúfǎ dòu qǔ méiyǒu MISO de yǐn jiǎo." + +#~ msgid "Cannot reset into bootloader because no bootloader is present." +#~ msgstr "Wúfǎ chóng zhì wèi bootloader, yīnwèi méiyǒu bootloader cúnzài." + +#~ msgid "Cannot transfer without MOSI and MISO pins." +#~ msgstr "Méiyǒu MOSI/MISO jiù wúfǎ zhuǎnyí." + +#~ msgid "Cannot write without MOSI pin." +#~ msgstr "Wúfǎ xiě rù MOSI de yǐn jiǎo." + +#~ msgid "Clock pin init failed." +#~ msgstr "Shízhōng de yǐn jiǎo chūshǐhuà shībài." + +#~ msgid "Command must be an int between 0 and 255" +#~ msgstr "Mìnglìng bìxū shì 0 dào 255 zhī jiān de int" + +#~ msgid "Could not initialize Camera" +#~ msgstr "Wúfǎ chūshǐhuà xiàngjī" + +#~ msgid "Could not initialize GNSS" +#~ msgstr "wú fǎ chū shǐ huà GNSS" + +#~ msgid "Could not initialize SDCard" +#~ msgstr "wú fǎ chū shǐ huà SDCard" + +#~ msgid "Could not initialize UART" +#~ msgstr "Wúfǎ chūshǐhuà UART" + +#~ msgid "Could not re-init channel" +#~ msgstr "Wúfǎ chóngxīn chūshǐhuà píndào" + +#~ msgid "Could not re-init timer" +#~ msgstr "Wúfǎ chóngxīn qǐdòng jìshí qì" + +#~ msgid "Could not restart PWM" +#~ msgstr "Wúfǎ chóngqǐ PWM" + +#~ msgid "Couldn't allocate first buffer" +#~ msgstr "Wúfǎ fēnpèi dì yī gè huǎnchōng qū" + +#~ msgid "Couldn't allocate input buffer" +#~ msgstr "Wúfǎ fēnpèi shūrù huǎnchōng qū" + +#~ msgid "Couldn't allocate second buffer" +#~ msgstr "Wúfǎ fēnpèi dì èr gè huǎnchōng qū" + +#~ msgid "DigitalInOut not supported on given pin" +#~ msgstr "Gěi dìng de yǐn jiǎo bù zhīchí DigitalInOut" + +#, c-format +#~ msgid "Expected tuple of length %d, got %d" +#~ msgstr "Qīwàng de chángdù wèi %d de yuán zǔ, dédào %d" + +#~ msgid "Failed to allocate RX buffer" +#~ msgstr "Fēnpèi RX huǎnchōng shībài" + +#, c-format +#~ msgid "Failed to allocate RX buffer of %d bytes" +#~ msgstr "Fēnpèi RX huǎnchōng qū%d zì jié shībài" + +#, c-format +#~ msgid "Framebuffer requires %d bytes" +#~ msgstr "zhēn huǎn chōng qū xū yào %d zì jié" + +#~ msgid "Hostname must be between 1 and 253 characters" +#~ msgstr "zhǔ jī míng bì xū jiè yú 1 hé 253 gè zì fú zhī jiān" + +#~ msgid "I2C Init Error" +#~ msgstr "I2C chūshǐhuà cuòwù" + +#~ msgid "Invalid %q pin selection" +#~ msgstr "wú xiào %q yǐn jiǎo xuǎn zé" + +#~ msgid "Invalid AuthMode" +#~ msgstr "wú xiào AuthMode" + +#~ msgid "Invalid BMP file" +#~ msgstr "Wúxiào de BMP wénjiàn" + +#~ msgid "Invalid DAC pin supplied" +#~ msgstr "Tí gōng liǎo wúxiào de DAC yǐn jiǎo" + +#~ msgid "Invalid MIDI file" +#~ msgstr "wú xiào de MIDI wén jiàn" + +#~ msgid "Invalid PWM frequency" +#~ msgstr "Wúxiào de PWM pínlǜ" + +#~ msgid "Invalid Pin" +#~ msgstr "wú xiào yǐn jiǎo" + +#~ msgid "Invalid buffer size" +#~ msgstr "Wúxiào de huǎnchōng qū dàxiǎo" + +#~ msgid "Invalid byteorder string" +#~ msgstr "Wúxiào de zì jié shùnxù zìfú chuàn" + +#~ msgid "Invalid capture period. Valid range: 1 - 500" +#~ msgstr "Wúxiào de bǔhuò zhōuqí. Yǒuxiào fànwéi: 1-500" + +#~ msgid "Invalid channel count" +#~ msgstr "Wúxiào de tōngdào jìshù" + +#, c-format +#~ msgid "Invalid data_count %d" +#~ msgstr "wú xiào data_count %d" + +#~ msgid "Invalid direction." +#~ msgstr "Wúxiào de fāngxiàng." + +#~ msgid "Invalid file" +#~ msgstr "Wúxiào de wénjiàn" + +#~ msgid "Invalid mode" +#~ msgstr "wú xiào mó shì" + +#~ msgid "Invalid number of bits" +#~ msgstr "Wèi shù wúxiào" + +#~ msgid "Invalid phase" +#~ msgstr "Jiēduàn wúxiào" + +#~ msgid "Invalid pin" +#~ msgstr "Wúxiào de yǐn jiǎo" + +#~ msgid "Invalid pin for left channel" +#~ msgstr "Zuǒ tōngdào de yǐn jiǎo wúxiào" + +#~ msgid "Invalid pin for right channel" +#~ msgstr "Yòuxián tōngdào yǐn jiǎo wúxiào" + +#~ msgid "Invalid polarity" +#~ msgstr "Wúxiào liǎng jí zhí" + +#~ msgid "Invalid properties" +#~ msgstr "Wúxiào de shǔxìng" + +#~ msgid "Invalid run mode." +#~ msgstr "Wúxiào de yùnxíng móshì." + +#~ msgid "Invalid security_mode" +#~ msgstr "Ānquán móshì wúxiào" + +#~ msgid "Invalid voice" +#~ msgstr "Yǔyīn wúxiào" + +#~ msgid "Invalid voice count" +#~ msgstr "Wúxiào de yǔyīn jìshù" + +#~ msgid "Invalid wave file" +#~ msgstr "Wúxiào de làng làngcháo wénjiàn" + +#~ msgid "Invalid word/bit length" +#~ msgstr "Wúxiào de zì/wèi chángdù" + +#~ msgid "Layer already in a group." +#~ msgstr "Tú céng yǐjīng zài yīgè zǔ zhōng." + +#~ msgid "Layer must be a Group or TileGrid subclass." +#~ msgstr "Layer bìxū shì Group huò TileGrid zi lèi." + +#~ msgid "MISO pin init failed." +#~ msgstr "MISO yǐn jiǎo chūshǐhuà shībài." + +#~ msgid "MOSI pin init failed." +#~ msgstr "MOSI yǐn jiǎo shūrù shībài." + +#~ msgid "Messages limited to 8 bytes" +#~ msgstr "Yóujiàn xiànzhì wèi 8 gè zì jié" + +#, c-format +#~ msgid "More than %d report ids not supported" +#~ msgstr "chāo guò %d bào gào bù zhī chí de ID" + +#~ msgid "No hardware support on clk pin" +#~ msgstr "Shízhōng yǐn jiǎo wú yìngjiàn zhīchí" + +#~ msgid "No hardware support on pin" +#~ msgstr "Méiyǒu zài yǐn jiǎo shàng de yìngjiàn zhīchí" + +#, c-format +#~ msgid "Output buffer must be at least %d bytes" +#~ msgstr "shū chū huǎn chōng qū bì xū zhì shǎo wéi %d zì jié" + +#~ msgid "" +#~ "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" +#~ msgstr "" +#~ "PWM yìwù zhōuqí bìxū jiè yú 0 zhì 65535 de bāoróng xìng (16 wèi fēnbiàn " +#~ "lǜ)" + +#~ msgid "Pin count must be at least 1" +#~ msgstr "yǐn jiǎo jì shù bì xū zhì shǎo wéi 1" + +#~ msgid "Pin does not have ADC capabilities" +#~ msgstr "Pin méiyǒu ADC nénglì" + +#~ msgid "Program must contain at least one 16-bit instruction." +#~ msgstr "chéng xù bì xū zhì shǎo bāo hán yí gè 16 wèi zhǐ lìng ." + +#~ msgid "Program too large" +#~ msgstr "chéng xù tài dà" + +#~ msgid "RS485 Not yet supported on this device" +#~ msgstr "RS485 cǐ shè bèi shàng bù zhī chí" + +#~ msgid "RTC calibration is not supported on this board" +#~ msgstr "Cǐ bǎn bù zhīchí RTC jiàozhǔn" + +#~ msgid "RTS/CTS/RS485 Not yet supported on this device" +#~ msgstr "RTS/CTS/RS485 gāi shèbèi shàng bù zhīchí" + +#~ msgid "SPI Init Error" +#~ msgstr "SPI chūshǐhuà cuòwù" + +#~ msgid "SPI Re-initialization error" +#~ msgstr "SPI chóngxīn chūshǐhuà cuòwù" + +#~ msgid "Sample rate must be positive" +#~ msgstr "Cǎiyàng lǜ bìxū wèi zhèng shù" + +#, c-format +#~ msgid "Sample rate too high. It must be less than %d" +#~ msgstr "Cǎiyàng lǜ tài gāo. Tā bìxū xiǎoyú %d" + +#~ msgid "Set pin count must be between 1 and 5" +#~ msgstr "shè zhì yǐn jiǎo shù bì xū jiè yú 1 hé 5 zhī jiān" + +#~ msgid "Side set pin count must be between 1 and 5" +#~ msgstr "cè miàn shè zhì yǐn jiǎo shù bì xū jiè yú 1 hé 5 zhī jiān" + +#~ msgid "Stack size must be at least 256" +#~ msgstr "Duīzhàn dàxiǎo bìxū zhìshǎo 256" + +#~ msgid "Tile value out of bounds" +#~ msgstr "Píng pū zhí chāochū fànwéi" + +#~ msgid "UART Buffer allocation error" +#~ msgstr "UART huǎnchōng qū fēnpèi cuòwù" + +#~ msgid "UART De-init error" +#~ msgstr "UART qǔxiāo chūshǐhuà cuòwù" + +#~ msgid "UART Init Error" +#~ msgstr "UART chūshǐhuà cuòwù" + +#~ msgid "UART Re-init error" +#~ msgstr "UART chóngxīn chūshǐhuà cuòwù" + +#~ msgid "UART write error" +#~ msgstr "UART xiě cuòwù" + +#~ msgid "Unsupported baudrate" +#~ msgstr "Bù zhīchí de baudrate" + +#~ msgid "WiFi password must be between 8 and 63 characters" +#~ msgstr "WiFi mìmǎ bìxū jiè yú 8 dào 63 gè zìfú zhī jiān" + +#~ 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" + +#~ msgid "bytes > 8 bits not supported" +#~ msgstr "zì jié > 8 wèi" + +#~ msgid "calibration value out of range +/-127" +#~ msgstr "jiàozhǔn zhí chāochū fànwéi +/-127" + +#~ msgid "can only be registered in one parent" +#~ msgstr "zhǐ néng zài yí gè jiā zhǎng zhōng zhù cè" + +#~ msgid "circle can only be registered in one parent" +#~ msgstr "quānzi zhǐ néng zài yī wèi jiāzhǎng zhōng zhùcè" + +#~ msgid "max_connections must be between 0 and 10" +#~ msgstr "max_connections bì xū jiè yú 0 hé 10 zhī jiān" + +#~ msgid "max_length must be >= 0" +#~ msgstr "zuì dà cháng dù bì xū >= 0" + +#~ msgid "polygon can only be registered in one parent" +#~ msgstr "duōbiānxíng zhī néng zài yīgè fù jí zhōng zhùcè" + +#~ msgid "pull_threshold must be between 1 and 32" +#~ msgstr "lā lì yù zhí bì xū jiè yú 1 hé 32 zhī jiān" + +#~ msgid "push_threshold must be between 1 and 32" +#~ msgstr "tuī sòng yù zhí bì xū jiè yú 1 hé 32 zhī jiān" + +#~ msgid "stop must be 1 or 2" +#~ msgstr "tíngzhǐ bìxū wèi 1 huò 2" + +#~ msgid "tile must be greater than zero" +#~ msgstr "cí tiē bì xū dà yú líng" + +#~ msgid "timeout must be >= 0.0" +#~ msgstr "chāoshí bìxū shì >= 0.0" + +#, c-format +#~ msgid "width must be from 2 to 8 (inclusive), not %d" +#~ msgstr "kuān dù bì xū cóng 2 dào 8 ( hán ), ér bù shì %d" + #~ msgid "Unsupported operation" #~ msgstr "Bù zhīchí de cāozuò" From e852b28bb234fa8a0af5cb8720a5dca540d4f66c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 20 May 2022 17:52:35 -0400 Subject: [PATCH 0338/2403] update pico-sdk to 1.3.1 --- ports/raspberrypi/sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk index 2062372d20..426e46126b 160000 --- a/ports/raspberrypi/sdk +++ b/ports/raspberrypi/sdk @@ -1 +1 @@ -Subproject commit 2062372d203b372849d573f252cf7c6dc2800c0a +Subproject commit 426e46126b5a1efaea4544cdb71ab81b61983034 From 3e47d24fb9ad544c2af33e04a365808412afd38b Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Sat, 21 May 2022 10:52:14 +0800 Subject: [PATCH 0339/2403] Update submodule and create tag --- ports/espressif/boards/mixgo_ce_udisk/cp_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/mixgo_ce_udisk/cp_lib b/ports/espressif/boards/mixgo_ce_udisk/cp_lib index d6bb0f58f6..8b6cd888b2 160000 --- a/ports/espressif/boards/mixgo_ce_udisk/cp_lib +++ b/ports/espressif/boards/mixgo_ce_udisk/cp_lib @@ -1 +1 @@ -Subproject commit d6bb0f58f62983f11e771c5ec91c934eb6ff2b82 +Subproject commit 8b6cd888b264abaf8f9b1904b09b01313b273bb2 From 199e2ef2fcc46007ee64d7e66817f80ab72b0cc5 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 21 May 2022 00:04:53 -0400 Subject: [PATCH 0340/2403] Turn on f-strings for all builds --- py/circuitpy_mpconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 03dca0321c..1c4430525e 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -213,7 +213,7 @@ typedef long mp_off_t; #define MICROPY_CPYTHON_COMPAT (CIRCUITPY_FULL_BUILD) #endif #define MICROPY_PY_BUILTINS_POW3 (CIRCUITPY_BUILTINS_POW3) -#define MICROPY_PY_FSTRINGS (MICROPY_CPYTHON_COMPAT) +#define MICROPY_PY_FSTRINGS (1) #define MICROPY_MODULE_WEAK_LINKS (0) #define MICROPY_PY_ALL_SPECIAL_METHODS (CIRCUITPY_FULL_BUILD) #ifndef MICROPY_PY_BUILTINS_COMPLEX From 338e14d9d4ecb736ebcf7f621323f7c6e7e944e3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 21 May 2022 08:52:40 -0400 Subject: [PATCH 0341/2403] shrink arduino_mkr1300 --- ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk index c3d75202bf..abbdbe87ef 100644 --- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk +++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = NONE CIRCUITPY_FULL_BUILD = 0 + +CIRCUITPY_RAINBOWIO = 0 From 6b04b7efc839e07e17c1bfce8b98826aa680a1d2 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 21 May 2022 12:09:23 -0500 Subject: [PATCH 0342/2403] display brightness pwm 500hz frequency --- shared-module/displayio/Display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 255cd49e06..5fab660268 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -116,7 +116,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self, if (backlight_pin != NULL && common_hal_mcu_pin_is_free(backlight_pin)) { // Avoid PWM types and functions when the module isn't enabled #if (CIRCUITPY_PWMIO) - pwmout_result_t result = common_hal_pwmio_pwmout_construct(&self->backlight_pwm, backlight_pin, 0, 50000, false); + pwmout_result_t result = common_hal_pwmio_pwmout_construct(&self->backlight_pwm, backlight_pin, 0, 500, false); if (result != PWMOUT_OK) { self->backlight_inout.base.type = &digitalio_digitalinout_type; common_hal_digitalio_digitalinout_construct(&self->backlight_inout, backlight_pin); From 9fe57d27e43f07d77b1ffbf3a09d23de34d94021 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Sat, 21 May 2022 13:06:41 +0000 Subject: [PATCH 0343/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (982 of 982 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 7703cbbda3..c7388049fa 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: 2022-05-14 12:35+0000\n" +"PO-Revision-Date: 2022-05-22 00:18+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -82,7 +82,7 @@ msgstr "" #: ports/raspberrypi/common-hal/analogio/AnalogOut.c #: ports/raspberrypi/common-hal/rtc/RTC.c msgid "%q" -msgstr "" +msgstr "%q" #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" @@ -90,7 +90,7 @@ msgstr "%q och %q innehåller duplicerade pinnar" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "%q and %q must be different" -msgstr "" +msgstr "%q och %q måste vara olika" #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" @@ -114,11 +114,11 @@ msgstr "Indexet %q måste vara ett heltal, inte %s" #: shared-module/bitbangio/SPI.c msgid "%q init failed" -msgstr "" +msgstr "%q init misslyckades" #: py/argcheck.c msgid "%q length must be %d" -msgstr "" +msgstr "längden på %q måste vara %d" #: py/argcheck.c msgid "%q length must be %d-%d" @@ -126,11 +126,11 @@ msgstr "längden på %q måste vara %d-%d" #: py/argcheck.c msgid "%q length must be <= %d" -msgstr "" +msgstr "längden på %q måste vara <= %d" #: py/argcheck.c msgid "%q length must be >= %d" -msgstr "" +msgstr "längden på %q måste vara >= %d" #: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" @@ -138,7 +138,7 @@ msgstr "längden på %q måste vara >= 1" #: py/argcheck.c msgid "%q must be %d" -msgstr "" +msgstr "%q måste vara %d" #: py/argcheck.c msgid "%q must be %d-%d" @@ -170,7 +170,7 @@ msgstr "%q måste vara en sträng" #: py/argcheck.c msgid "%q must be an int" -msgstr "" +msgstr "%q måste vara en int" #: py/argcheck.c msgid "%q must be of type %q" @@ -662,7 +662,7 @@ msgstr "Anropa super().__init__() innan du använder det ursprungliga objektet." #: ports/cxd56/common-hal/camera/Camera.c msgid "Camera init" -msgstr "" +msgstr "Kamera init" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." @@ -729,7 +729,7 @@ msgstr "Det går inte att montera om '/' när den är synlig via USB." #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" -msgstr "" +msgstr "Kan inte återställa till bootloader eftersom ingen bootloader finns" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -750,7 +750,7 @@ msgstr "Det går inte att subklassa slice" #: shared-module/bitbangio/SPI.c msgid "Cannot transfer without MOSI and MISO pins" -msgstr "" +msgstr "Det går inte att överföra utan MOSI- och MISO-pinnar" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" @@ -758,7 +758,7 @@ msgstr "Det går inte att ändra frekvensen på en timer som redan används" #: ports/nrf/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" -msgstr "" +msgstr "Kan inte vakna på pin edge, bara nivå" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." @@ -1030,7 +1030,7 @@ msgstr "Funktionen kräver lås" #: ports/cxd56/common-hal/gnss/GNSS.c msgid "GNSS init" -msgstr "" +msgstr "GNSS start" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" @@ -1065,7 +1065,7 @@ msgstr "I/O-operation på stängd fil" #: ports/stm/common-hal/busio/I2C.c msgid "I2C init error" -msgstr "" +msgstr "I2C-initieringsfel" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1257,11 +1257,11 @@ msgstr "LHS av keword arg måste vara ett id" #: shared-module/displayio/Group.c msgid "Layer already in a group" -msgstr "" +msgstr "Layer är redan med i en grupp" #: shared-module/displayio/Group.c msgid "Layer must be a Group or TileGrid subclass" -msgstr "" +msgstr "Layer måste vara en underklass av Group eller TileGrid" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" @@ -1296,7 +1296,7 @@ msgstr "MISO- eller MOSI-pinne saknas" #: ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI pin" -msgstr "" +msgstr "Saknad MISO- eller MOSI-pinne" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format @@ -1399,7 +1399,7 @@ msgstr "Ingen MISO-pinne" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" -msgstr "" +msgstr "Ingen MISO-pinne" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1408,7 +1408,7 @@ msgstr "Ingen MOSI-pinne" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" -msgstr "" +msgstr "Ingen MOSI-pinne" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c @@ -1600,7 +1600,7 @@ msgstr "Endast en adress är tillåten" #: ports/nrf/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" -msgstr "" +msgstr "Endast ett alarm.time-larm kan ställas in" #: ports/espressif/common-hal/alarm/time/TimeAlarm.c #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c @@ -1652,7 +1652,7 @@ msgstr "" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "PWM restart" -msgstr "" +msgstr "PWM omstart" #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" @@ -1777,7 +1777,7 @@ msgstr "RNG Init-fel" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" -msgstr "" +msgstr "RS485" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c @@ -1839,7 +1839,7 @@ msgstr "SD-kort CSD-format stöds inte" #: ports/cxd56/common-hal/sdioio/SDCard.c msgid "SDCard init" -msgstr "" +msgstr "SDCard start" #: ports/stm/common-hal/sdioio/SDCard.c #, c-format @@ -1857,7 +1857,7 @@ msgstr "SPI-konfigurationen misslyckades" #: ports/stm/common-hal/busio/SPI.c msgid "SPI init error" -msgstr "" +msgstr "SPI-initieringsfel" #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" @@ -1865,7 +1865,7 @@ msgstr "SPI-enhet används redan" #: ports/stm/common-hal/busio/SPI.c msgid "SPI re-init" -msgstr "" +msgstr "SPI omstart" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2035,7 +2035,7 @@ msgstr "För att avsluta, gör reset på kortet utan " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample" -msgstr "" +msgstr "För många kanaler i urvalet" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." @@ -2070,20 +2070,20 @@ msgstr "Tuple- eller struct_time-argument krävs" #: ports/stm/common-hal/busio/UART.c msgid "UART de-init" -msgstr "" +msgstr "UART omstart" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "UART init" -msgstr "" +msgstr "UART start" #: ports/stm/common-hal/busio/UART.c msgid "UART re-init" -msgstr "" +msgstr "UART omstart" #: ports/stm/common-hal/busio/UART.c msgid "UART write" -msgstr "" +msgstr "UART-skrivning" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2511,7 +2511,7 @@ msgstr "kalibrering är skrivskyddad" #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c msgid "can only have one parent" -msgstr "" +msgstr "kan bara ha en förälder" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -2685,7 +2685,7 @@ msgstr "casting inte implementerad" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "channel re-init" -msgstr "" +msgstr "kanal återstart" #: shared-bindings/_stage/Text.c msgid "chars buffer too small" @@ -3128,7 +3128,7 @@ msgstr "index måste vara heltal, slices, eller Boolean-listor" #: ports/espressif/common-hal/busio/I2C.c msgid "init I2C" -msgstr "" +msgstr "I2C start" #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" @@ -4056,7 +4056,7 @@ msgstr "timeout för v2-kort" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "timer re-init" -msgstr "" +msgstr "timer omstart" #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" From 39de1c952b878d75657b65212609fa62191b067f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 21 May 2022 19:14:34 +0000 Subject: [PATCH 0344/2403] Translated using Weblate (English (United Kingdom)) Currently translated at 89.5% (879 of 982 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/en_GB/ --- locale/en_GB.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/locale/en_GB.po b/locale/en_GB.po index 21480626d3..4b24bce857 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2021-09-21 03:37+0000\n" -"Last-Translator: James Carr \n" +"PO-Revision-Date: 2022-05-22 00:18+0000\n" +"Last-Translator: Dan Halbert \n" "Language-Team: none\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "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.9-dev\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -26,10 +26,13 @@ msgstr "" "Code done running.\n" #: main.c +#, fuzzy msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"Code stopped by auto-reload. Reloading soon.\n" #: supervisor/shared/safe_mode.c msgid "" From 1e8f371d2b0fb761a5fa167ad7db4b160eb6927d Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sun, 22 May 2022 02:18:21 +0200 Subject: [PATCH 0345/2403] 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/ru.po | 4 ++++ locale/sv.po | 4 ++++ locale/tr.po | 4 ++++ locale/zh_Latn_pinyin.po | 4 ++++ 19 files changed, 76 insertions(+) diff --git a/locale/ID.po b/locale/ID.po index be10475e61..5860b0f544 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -943,6 +943,10 @@ msgstr "Gagal mengirim perintah." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Gagal memperoleh mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index ce3fc2a7bc..d15b61c9eb 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -937,6 +937,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 73e28062e5..db4b9304c1 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -948,6 +948,10 @@ msgstr "Kommando nicht gesendet." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Mutex konnte nicht akquiriert werden. Status: 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Zuweisung des Wifi Speichers ist fehlgeschlagen" diff --git a/locale/el.po b/locale/el.po index d4229b5592..0460f2a146 100644 --- a/locale/el.po +++ b/locale/el.po @@ -930,6 +930,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 4b24bce857..618d38f484 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -944,6 +944,10 @@ msgstr "Failed sending command." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Failed to acquire mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Failed to allocate WiFi memory" diff --git a/locale/es.po b/locale/es.po index 22a2910295..fd67f869ff 100644 --- a/locale/es.po +++ b/locale/es.po @@ -951,6 +951,10 @@ msgstr "Fallo enviando comando." msgid "Failed to acquire mutex, err 0x%04x" msgstr "No se puede adquirir el mutex, error 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Fallo al tomar memoria Wifi" diff --git a/locale/fil.po b/locale/fil.po index ebbb837db1..b81a0ac156 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -941,6 +941,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nabigo sa pag kuha ng mutex, status: 0x%08lX" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index ce6c65ce25..15b05ca98a 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -956,6 +956,10 @@ msgstr "Échec de l'envoi de la commande." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Echec de l'obtention de mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Impossible d’allouer la mémoire pour Wifi" diff --git a/locale/hi.po b/locale/hi.po index b3367cf365..ca6f580adc 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -930,6 +930,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 779b284b35..187f9648f9 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -946,6 +946,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "Impossibile acquisire il mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index 7aff0c1fc8..32d0336334 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -939,6 +939,10 @@ msgstr "コマンド送信に失敗" msgid "Failed to acquire mutex, err 0x%04x" msgstr "ミューテックスの取得に失敗。エラー 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Wi-Fiのメモリの確保に失敗" diff --git a/locale/ko.po b/locale/ko.po index a59b12702a..10b930ca12 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -933,6 +933,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index f862d7f4f2..58e5c4a676 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -938,6 +938,10 @@ msgstr "Commando verzenden mislukt." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Fout tijdens verkrijgen mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Kon WiFi geheugen niet toewijzen" diff --git a/locale/pl.po b/locale/pl.po index 5e44013409..03357dfb91 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -939,6 +939,10 @@ msgstr "Nie udało się wysłać polecenia." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nie udało się uzyskać blokady, błąd 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index b29c0a79eb..997c5415ff 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -956,6 +956,10 @@ msgstr "Falha ao enviar comando." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Houve uma falha na aquisição do mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Houve uma falha na alocação da memória do Wifi" diff --git a/locale/ru.po b/locale/ru.po index 7e6422b554..06a3702a48 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -955,6 +955,10 @@ msgstr "Не удалось отправить команду." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Не удалось получить mutex, ошибка 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Не удалось выделить память Wifi" diff --git a/locale/sv.po b/locale/sv.po index c7388049fa..b7d1747cf3 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -944,6 +944,10 @@ msgstr "Det gick inte att skicka kommandot." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Det gick inte att förvärva mutex, fel 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Det gick inte att allokera WiFi-minne" diff --git a/locale/tr.po b/locale/tr.po index b1a3058c2d..b0b7afaae2 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -947,6 +947,10 @@ msgstr "" msgid "Failed to acquire mutex, err 0x%04x" msgstr "" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index adecfd334e..224d766066 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -953,6 +953,10 @@ msgstr "Fāsòng mìnglìng shībài." msgid "Failed to acquire mutex, err 0x%04x" msgstr "Wúfǎ huòdé mutex, err 0x%04x" +#: shared-module/rgbmatrix/RGBMatrix.c +msgid "Failed to allocate %q buffer" +msgstr "" + #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "Wúfǎ fēnpèi Wifi nèicún" From b62799a798e21c1e7b56a8d38b97c0c4c240c929 Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Sun, 22 May 2022 10:42:56 +0800 Subject: [PATCH 0346/2403] Add mixgo_ ce_ Serial function, repair sdkconfig --- .../espressif/boards/mixgo_ce_serial/board.c | 70 +++++++++++++++++++ .../boards/mixgo_ce_serial/mpconfigboard.h | 32 +++++++++ .../boards/mixgo_ce_serial/mpconfigboard.mk | 23 ++++++ ports/espressif/boards/mixgo_ce_serial/pins.c | 50 +++++++++++++ .../boards/mixgo_ce_serial/sdkconfig | 6 ++ .../espressif/boards/mixgo_ce_udisk/sdkconfig | 6 ++ 6 files changed, 187 insertions(+) create mode 100644 ports/espressif/boards/mixgo_ce_serial/board.c create mode 100644 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.h create mode 100644 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk create mode 100644 ports/espressif/boards/mixgo_ce_serial/pins.c create mode 100644 ports/espressif/boards/mixgo_ce_serial/sdkconfig diff --git a/ports/espressif/boards/mixgo_ce_serial/board.c b/ports/espressif/boards/mixgo_ce_serial/board.c new file mode 100644 index 0000000000..fb05794ca5 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_serial/board.c @@ -0,0 +1,70 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +#include "lib/oofatfs/ff.h" +#include "extmod/vfs_fat.h" +#include "py/mpstate.h" + +void board_init(void) { + // Debug UART + #ifdef DEBUG + common_hal_never_reset_pin(&pin_GPIO43); + common_hal_never_reset_pin(&pin_GPIO44); + #endif /* DEBUG */ + + mp_import_stat_t stat_b = mp_import_stat("boot.py"); + if (stat_b != MP_IMPORT_STAT_FILE){ + FATFS *fatfs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs; + FIL fs; + UINT char_written = 0; + const byte buffer[] = "#Serial port upload mode\nimport storage\nstorage.remount(\"/\", False)\nstorage.disable_usb_drive()\n"; + // Create or modify existing boot.py file + f_open(fatfs, &fs, "/boot.py", FA_WRITE | FA_CREATE_ALWAYS); + f_write(&fs, buffer, sizeof(buffer) - 1, &char_written); + f_close(&fs); + //Delete code.Py, use main.py + mp_import_stat_t stat_c = mp_import_stat("code.py"); + if (stat_c == MP_IMPORT_STAT_FILE){ + f_unlink(fatfs,"/code.py"); + } + } + +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.h b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.h new file mode 100644 index 0000000000..187687c8f5 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.h @@ -0,0 +1,32 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "MixGo CE" +#define MICROPY_HW_MCU_NAME "ESP32S2" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO45) diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk new file mode 100644 index 0000000000..1db0638936 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -0,0 +1,23 @@ +USB_VID = 0x303A +USB_PID = 0x80FC +USB_PRODUCT = "MixGo CE" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s2 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=40m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_MODULE=wroom + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += boards/mixgo_ce_udisk/cp_lib/mixgoce_lib diff --git a/ports/espressif/boards/mixgo_ce_serial/pins.c b/ports/espressif/boards/mixgo_ce_serial/pins.c new file mode 100644 index 0000000000..ca4eb12bf7 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_serial/pins.c @@ -0,0 +1,50 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, + + + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/mixgo_ce_serial/sdkconfig b/ports/espressif/boards/mixgo_ce_serial/sdkconfig new file mode 100644 index 0000000000..5b9c86dcc3 --- /dev/null +++ b/ports/espressif/boards/mixgo_ce_serial/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/mixgo_ce_udisk/sdkconfig b/ports/espressif/boards/mixgo_ce_udisk/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/sdkconfig +++ b/ports/espressif/boards/mixgo_ce_udisk/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP From 37e376631adf4f06c6ec1338bb8f9d15ee97cf64 Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Sun, 22 May 2022 11:22:58 +0800 Subject: [PATCH 0347/2403] Fix format issues --- ports/espressif/boards/mixgo_ce_serial/board.c | 12 ++++++------ .../boards/mixgo_ce_serial/mpconfigboard.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/espressif/boards/mixgo_ce_serial/board.c b/ports/espressif/boards/mixgo_ce_serial/board.c index fb05794ca5..6f26842269 100644 --- a/ports/espressif/boards/mixgo_ce_serial/board.c +++ b/ports/espressif/boards/mixgo_ce_serial/board.c @@ -39,9 +39,9 @@ void board_init(void) { common_hal_never_reset_pin(&pin_GPIO44); #endif /* DEBUG */ - mp_import_stat_t stat_b = mp_import_stat("boot.py"); - if (stat_b != MP_IMPORT_STAT_FILE){ - FATFS *fatfs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs; + mp_import_stat_t stat_b = mp_import_stat("boot.py"); + if (stat_b != MP_IMPORT_STAT_FILE) { + FATFS *fatfs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; FIL fs; UINT char_written = 0; const byte buffer[] = "#Serial port upload mode\nimport storage\nstorage.remount(\"/\", False)\nstorage.disable_usb_drive()\n"; @@ -49,13 +49,13 @@ void board_init(void) { f_open(fatfs, &fs, "/boot.py", FA_WRITE | FA_CREATE_ALWAYS); f_write(&fs, buffer, sizeof(buffer) - 1, &char_written); f_close(&fs); - //Delete code.Py, use main.py + // Delete code.Py, use main.py mp_import_stat_t stat_c = mp_import_stat("code.py"); - if (stat_c == MP_IMPORT_STAT_FILE){ + if (stat_c == MP_IMPORT_STAT_FILE) { f_unlink(fatfs,"/code.py"); } } - + } bool board_requests_safe_mode(void) { diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk index 1db0638936..4dde6b40a5 100644 --- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -1,5 +1,5 @@ USB_VID = 0x303A -USB_PID = 0x80FC +USB_PID = 0x80FD USB_PRODUCT = "MixGo CE" USB_MANUFACTURER = "Espressif" From e5a5ffb9b0959908e30053db84ea5f4b7bb54fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=B1=89=E5=AD=90=E6=B0=91?= <48112196+dahanzimin@users.noreply.github.com> Date: Sun, 22 May 2022 11:37:39 +0800 Subject: [PATCH 0348/2403] Update board.c --- ports/espressif/boards/mixgo_ce_serial/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/mixgo_ce_serial/board.c b/ports/espressif/boards/mixgo_ce_serial/board.c index 6f26842269..e07fe5cfd7 100644 --- a/ports/espressif/boards/mixgo_ce_serial/board.c +++ b/ports/espressif/boards/mixgo_ce_serial/board.c @@ -38,7 +38,7 @@ void board_init(void) { common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO44); #endif /* DEBUG */ - + mp_import_stat_t stat_b = mp_import_stat("boot.py"); if (stat_b != MP_IMPORT_STAT_FILE) { FATFS *fatfs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; From d2d3b27822d5773302f2e1cd28de8b231becb5ea Mon Sep 17 00:00:00 2001 From: arturo182 Date: Sun, 22 May 2022 15:17:13 +0200 Subject: [PATCH 0349/2403] Add a Round Carrier board file to the RP2040 Stamp build --- .../stamp_round_carrier_board.py | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 ports/raspberrypi/boards/solderparty_rp2040_stamp/stamp_round_carrier_board.py diff --git a/ports/raspberrypi/boards/solderparty_rp2040_stamp/stamp_round_carrier_board.py b/ports/raspberrypi/boards/solderparty_rp2040_stamp/stamp_round_carrier_board.py new file mode 100644 index 0000000000..43ce598460 --- /dev/null +++ b/ports/raspberrypi/boards/solderparty_rp2040_stamp/stamp_round_carrier_board.py @@ -0,0 +1,68 @@ +from board import * +import busio + + +_SPI = None +_UART = None +_I2C = None + + +D0 = GP0 +SDA = D0 +D1 = GP1 +SCL = D1 +D8 = GP8 +CIPO = D8 +MISO = D8 +D9 = GP9 +CS = D9 +D10 = GP10 +SCK = D10 +D11 = GP11 +COPI = D11 +MOSI = D11 +D14 = GP14 +D15 = GP15 +D16 = GP16 +TX = D16 +D17 = GP17 +RX = D17 +D26 = GP26 +A0 = D26 +D27 = GP27 +A1 = D27 +D28 = GP28 +A2 = D28 +D29 = GP29 +A3 = D29 +D24 = GP24 +NEOPIXEL = D24 +D25 = GP25 +LED = D25 + + +def SPI(): + global _SPI + + if not _SPI: + _SPI = busio.SPI(SCK, COPI, CIPO) + + return _SPI + + +def UART(): + global _UART + + if not _UART: + _UART = busio.UART(TX, RX) + + return _UART + + +def I2C(): + global _I2C + + if not _I2C: + _I2C = busio.I2C(SCL, SDA) + + return _I2C From 893fc66d167df7bd74dd6fc19ea5427cb74a4b0d Mon Sep 17 00:00:00 2001 From: Michael Wisslead Date: Tue, 3 May 2022 04:00:58 +0000 Subject: [PATCH 0350/2403] Use common_hal_rp2pio_statemachine_construct for PulseIn --- .../raspberrypi/common-hal/pulseio/PulseIn.c | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 71633fcef7..557cb090c7 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -40,7 +40,7 @@ #define MAX_PULSE 65535 #define MIN_PULSE 10 -uint16_t pulsein_program[] = { +static const uint16_t pulsein_program[] = { 0x4001, // 1: in pins, 1 }; @@ -57,29 +57,23 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, self->start = 0; self->len = 0; - bool ok = rp2pio_statemachine_construct(&self->state_machine, - pulsein_program, sizeof(pulsein_program) / sizeof(pulsein_program[0]), - 1000000, - NULL, 0, - NULL, 0, - pin, 1, - 0,0, - NULL, 0, - NULL, 0, - 1, 0, - NULL, // jump pin - 1 << self->pin, false, true, - false, 8, false, // TX, unused - false, - true, 32, true, // RX auto-push every 32 bits - false, // claim pins - false, // Not user-interruptible. - false, // No sideset enable - 0, -1); // wrap settings - - if (!ok) { - mp_raise_RuntimeError(translate("All state machines in use")); - } + common_hal_rp2pio_statemachine_construct(&self->state_machine, + pulsein_program, MP_ARRAY_SIZE(pulsein_program), + 1000000, // frequency + NULL, 0, // init, init_len + NULL, 0, 0, 0, // first out pin, # out pins, initial_out_pin_state + pin, 1, 0, 0, // first in pin, # in pins + NULL, 0, 0, 0, // first set pin + NULL, 0, 0, 0, // first sideset pin + false, // No sideset enable + NULL, PULL_NONE, // jump pin, jmp_pull + 0, // wait gpio pins + true, // exclusive pin usage + false, 8, false, // TX, setting we don't use + false, // wait for TX stall + true, 32, true, // RX auto pull every 32 bits. shift left to output msb first + false, // Not user-interruptible. + 0, -1); // wrap settings pio_sm_set_enabled(self->state_machine.pio,self->state_machine.state_machine, false); pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine); From 2b0518233b3312845ee99b7b93a218f277154aed Mon Sep 17 00:00:00 2001 From: Michael Wisslead Date: Wed, 18 May 2022 17:34:25 +0000 Subject: [PATCH 0351/2403] rp2040 PulseIn improvements --- .../raspberrypi/common-hal/pulseio/PulseIn.c | 55 ++++--------------- .../raspberrypi/common-hal/pulseio/PulseIn.h | 2 +- 2 files changed, 11 insertions(+), 46 deletions(-) diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 557cb090c7..d30ef79b5f 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -38,7 +38,7 @@ #define NO_PIN 0xff #define MAX_PULSE 65535 -#define MIN_PULSE 10 +#define MIN_PULSE 0 static const uint16_t pulsein_program[] = { 0x4001, // 1: in pins, 1 @@ -75,24 +75,11 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, false, // Not user-interruptible. 0, -1); // wrap settings - pio_sm_set_enabled(self->state_machine.pio,self->state_machine.state_machine, false); - pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine); - self->last_level = self->idle_state; - self->level_count = 0; - self->buf_index = 0; + common_hal_pulseio_pulsein_pause(self); - pio_sm_set_in_pins(self->state_machine.pio,self->state_machine.state_machine,pin->number); common_hal_rp2pio_statemachine_set_interrupt_handler(&(self->state_machine),&common_hal_pulseio_pulsein_interrupt,self,PIO_IRQ0_INTE_SM0_RXNEMPTY_BITS); - // exec a set pindirs to 0 for input - pio_sm_exec(self->state_machine.pio,self->state_machine.state_machine,0xe080); - // exec the appropriate wait for pin - if (self->idle_state == true) { - pio_sm_exec(self->state_machine.pio,self->state_machine.state_machine,0x2020); - } else { - pio_sm_exec(self->state_machine.pio,self->state_machine.state_machine,0x20a0); - } - pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, true); + common_hal_pulseio_pulsein_resume(self, 0); } bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t *self) { @@ -113,9 +100,10 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) { void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) { pio_sm_restart(self->state_machine.pio, self->state_machine.state_machine); pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false); + pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine); self->last_level = self->idle_state; self->level_count = 0; - self->buf_index = 0; + self->paused = true; } void common_hal_pulseio_pulsein_interrupt(void *self_in) { pulseio_pulsein_obj_t *self = self_in; @@ -134,7 +122,7 @@ void common_hal_pulseio_pulsein_interrupt(void *self_in) { } else { uint32_t result = self->level_count; self->last_level = level; - self->level_count = 0; + self->level_count = 1; // Pulses that are longer than MAX_PULSE will return MAX_PULSE if (result > MAX_PULSE) { result = MAX_PULSE; @@ -148,28 +136,15 @@ void common_hal_pulseio_pulsein_interrupt(void *self_in) { } else { self->start = (self->start + 1) % self->maxlen; } - if (self->buf_index < self->maxlen) { - self->buf_index++; - } else { - self->start = 0; - self->buf_index = 0; - } } } } } - -// check for a pulse thats too long (MAX_PULSE us) or maxlen reached, and reset - if ((self->level_count > MAX_PULSE) || (self->buf_index >= self->maxlen)) { - pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false); - pio_sm_init(self->state_machine.pio, self->state_machine.state_machine, self->state_machine.offset, &self->state_machine.sm_config); - pio_sm_restart(self->state_machine.pio,self->state_machine.state_machine); - pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, true); - self->buf_index = 0; - } } void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self, uint16_t trigger_duration) { + + common_hal_pulseio_pulsein_pause(self); // Send the trigger pulse. if (trigger_duration > 0) { gpio_set_function(self->pin,GPIO_FUNC_SIO); @@ -177,11 +152,8 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self, gpio_put(self->pin, !self->idle_state); common_hal_mcu_delay_us((uint32_t)trigger_duration); gpio_set_function(self->pin,GPIO_FUNC_PIO0); - common_hal_mcu_delay_us(125); } - // Reconfigure the pin for PIO - gpio_set_function(self->pin, GPIO_FUNC_PIO0); // exec a wait for the selected pin to change state if (self->idle_state == true) { pio_sm_exec(self->state_machine.pio,self->state_machine.state_machine,0x2020); @@ -189,12 +161,11 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self, pio_sm_exec(self->state_machine.pio,self->state_machine.state_machine,0x20a0); } pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, true); + self->paused = false; } void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t *self) { - self->start = 0; self->len = 0; - self->buf_index = 0; } uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) { @@ -204,12 +175,6 @@ uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) { uint16_t value = self->buffer[self->start]; self->start = (self->start + 1) % self->maxlen; self->len--; - // if we are empty reset buffer pointer and counters - if (self->len == 0) { - self->start = 0; - self->buf_index = 0; - self->level_count = 0; - } return value; } @@ -222,7 +187,7 @@ uint16_t common_hal_pulseio_pulsein_get_len(pulseio_pulsein_obj_t *self) { } bool common_hal_pulseio_pulsein_get_paused(pulseio_pulsein_obj_t *self) { - return true; + return self->paused; } uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.h b/ports/raspberrypi/common-hal/pulseio/PulseIn.h index f2c4fc0d06..8694f75e62 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.h +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.h @@ -37,13 +37,13 @@ typedef struct { mp_obj_base_t base; uint8_t pin; bool idle_state; + bool paused; uint16_t maxlen; uint16_t *buffer; volatile bool last_level; volatile uint32_t level_count; volatile uint16_t len; volatile uint16_t start; - volatile uint16_t buf_index; rp2pio_statemachine_obj_t state_machine; } pulseio_pulsein_obj_t; From 6454c5895b9f665d7f7ddf60155e7a6e2fe41660 Mon Sep 17 00:00:00 2001 From: dahanzimin <353767514@qq.com> Date: Mon, 23 May 2022 11:19:11 +0800 Subject: [PATCH 0352/2403] Repair import and stock in under the frozen / directory --- .gitmodules | 4 ++-- .../boards/mixgo_ce_udisk/cp_lib => frozen/mixgo_cp_lib | 0 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk | 2 +- ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename ports/espressif/boards/mixgo_ce_udisk/cp_lib => frozen/mixgo_cp_lib (100%) diff --git a/.gitmodules b/.gitmodules index 542f15d327..0edcdec653 100644 --- a/.gitmodules +++ b/.gitmodules @@ -289,6 +289,6 @@ [submodule "frozen/pew-pewpew-lcd"] path = frozen/pew-pewpew-lcd url = https://github.com/pypewpew/pew-pewpew-lcd.git -[submodule "ports/espressif/boards/mixgo_ce_udisk/cp_lib"] - path = ports/espressif/boards/mixgo_ce_udisk/cp_lib +[submodule "frozen/mixgo_cp_lib"] + path = frozen/mixgo_cp_lib url = https://github.com/dahanzimin/circuitpython_lib.git diff --git a/ports/espressif/boards/mixgo_ce_udisk/cp_lib b/frozen/mixgo_cp_lib similarity index 100% rename from ports/espressif/boards/mixgo_ce_udisk/cp_lib rename to frozen/mixgo_cp_lib diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk index 4dde6b40a5..860f611354 100644 --- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -20,4 +20,4 @@ CIRCUITPY_MODULE=wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += boards/mixgo_ce_udisk/cp_lib/mixgoce_lib +FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index 5d201ba73d..7e6646225f 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -20,4 +20,4 @@ CIRCUITPY_MODULE=wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel -FROZEN_MPY_DIRS += boards/$(BOARD)/cp_lib/mixgoce_lib +FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib From af80d54c3861457297bf5b58d9c48b17fc54a262 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Sun, 22 May 2022 13:53:43 +0000 Subject: [PATCH 0353/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (983 of 983 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 b7d1747cf3..aafbc0ab75 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: 2022-05-22 00:18+0000\n" +"PO-Revision-Date: 2022-05-23 14:18+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -946,7 +946,7 @@ msgstr "Det gick inte att förvärva mutex, fel 0x%04x" #: shared-module/rgbmatrix/RGBMatrix.c msgid "Failed to allocate %q buffer" -msgstr "" +msgstr "Det gick inte att allokera buffert för %q" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" From 4a155712957d684b74d207dcf2368d1cec0f8255 Mon Sep 17 00:00:00 2001 From: Tyler Crumpton Date: Mon, 23 May 2022 13:03:03 -0500 Subject: [PATCH 0354/2403] Fix a minor namespace issue in the countio example --- shared-bindings/countio/Counter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c index 19141245e1..79ac3e75da 100644 --- a/shared-bindings/countio/Counter.c +++ b/shared-bindings/countio/Counter.c @@ -30,7 +30,7 @@ //| import countio //| //| # Count rising edges only. -//| pin_counter = countio.Counter(board.D1, edge=Edge.RISE) +//| pin_counter = countio.Counter(board.D1, edge=countio.Edge.RISE) //| # Reset the count after 100 counts. //| while True: //| if pin_counter.count >= 100: From 22cada10fa214fcf396d0279620a029067186160 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 23 May 2022 11:29:30 -0700 Subject: [PATCH 0355/2403] Fix 64bit builds --- shared-module/dotenv/__init__.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c index 3efec3c346..a7d0f9ba0d 100644 --- a/shared-module/dotenv/__init__.c +++ b/shared-module/dotenv/__init__.c @@ -35,7 +35,7 @@ STATIC uint8_t consume_spaces(FIL *active_file) { uint8_t character = ' '; - size_t quantity_read = 1; + UINT quantity_read = 1; while (unichar_isspace(character) && quantity_read > 0) { f_read(active_file, &character, 1, &quantity_read); } @@ -46,7 +46,7 @@ STATIC uint8_t consume_spaces(FIL *active_file) { // key. File pointer is left after the = after the key. STATIC bool key_matches(FIL *active_file, const char *key) { uint8_t character = ' '; - size_t quantity_read = 1; + UINT quantity_read = 1; character = consume_spaces(active_file); bool quoted = false; if (character == '\'') { @@ -90,7 +90,7 @@ STATIC bool key_matches(FIL *active_file, const char *key) { STATIC bool next_line(FIL *active_file) { uint8_t character = ' '; - size_t quantity_read = 1; + UINT quantity_read = 1; bool quoted = false; bool escaped = false; // Track comments because they last until the end of the line. @@ -117,7 +117,7 @@ STATIC bool next_line(FIL *active_file) { STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) { uint8_t character = ' '; - size_t quantity_read = 1; + UINT quantity_read = 1; // Consume spaces before = character = consume_spaces(active_file); if (character != '=') { From 3179db4ef4f423c77f2170034dcd3a1544b8336c Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 4 May 2022 01:49:51 +0200 Subject: [PATCH 0356/2403] move frozen adafruit_circuitplayground to express subdirectory --- .../boards/circuitplayground_express/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_crickit/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_displayio/mpconfigboard.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index 5311cdc1d4..b64fd2033d 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -19,7 +19,7 @@ CIRCUITPY_COUNTIO = 1 CIRCUITPY_BUSDEVICE = 1 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index 4d749d2134..975d892b9a 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -18,7 +18,7 @@ CIRCUITPY_KEYPAD = 0 CIRCUITPY_ONEWIREIO = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk index 0ae0c58b42..4338fe3e1e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk @@ -24,7 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_PARALLELDISPLAY = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor From 2aea5ed7429b7788ba1a8300be29c76f23fb8c58 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Mon, 23 May 2022 22:12:40 +0200 Subject: [PATCH 0357/2403] update adafruit_circuitplayground to last release with frozen dir --- frozen/Adafruit_CircuitPython_CircuitPlayground | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index f82d3ef195..54b2fa03d8 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit f82d3ef195256aa71d274a34ea25f760d7e651d1 +Subproject commit 54b2fa03d8af80562b77460841e63d47f12eee43 From bb4beb3fab66209d0dae47452282d18f3b1037f2 Mon Sep 17 00:00:00 2001 From: lady ada Date: Mon, 23 May 2022 23:57:35 -0400 Subject: [PATCH 0358/2403] add esp32s3 tft --- .../adafruit_feather_esp32s3_tft/board.c | 154 ++++++++++++++++++ .../mpconfigboard.h | 45 +++++ .../mpconfigboard.mk | 20 +++ .../adafruit_feather_esp32s3_tft/pins.c | 78 +++++++++ .../adafruit_feather_esp32s3_tft/sdkconfig | 47 ++++++ 5 files changed, 344 insertions(+) create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_tft/sdkconfig diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c new file mode 100644 index 0000000000..46f1fbd31c --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c @@ -0,0 +1,154 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/busio/SPI.h" +#include "shared-bindings/displayio/FourWire.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" +#include "shared-bindings/board/__init__.h" + +displayio_fourwire_obj_t board_display_obj; + +#define DELAY 0x80 + +// display init sequence according to LilyGO example app +uint8_t display_init_sequence[] = { + // sw reset + 0x01, 0 | DELAY, 150, + // sleep out + 0x11, 0 | DELAY, 255, + // normal display mode on + 0x13, 0, + // display and color format settings + 0x36, 1, 0x68, + 0xB6, 2, 0x0A, 0x82, + 0x3A, 1 | DELAY, 0x55, 10, + // ST7789V frame rate setting + 0xB2, 5, 0x0C, 0x0C, 0x00, 0x33, 0x33, + // voltages: VGH / VGL + 0xB7, 1, 0x35, + // ST7789V power setting + 0xBB, 1, 0x28, + 0xC0, 1, 0x0C, + 0xC2, 2, 0x01, 0xFF, + 0xC3, 1, 0x10, + 0xC4, 1, 0x20, + 0xC6, 1, 0x0F, + 0xD0, 2, 0xA4, 0xA1, + // ST7789V gamma setting + 0xE0, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x32, 0x44, 0x42, 0x06, 0x0E, 0x12, 0x14, 0x17, + 0xE1, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x31, 0x54, 0x47, 0x0E, 0x1C, 0x17, 0x1B, 0x1E, + 0x21, 0, + // display on + 0x29, 0 | DELAY, 255, +}; + + +void board_init(void) { + // THIS SHOULD BE HANDLED BY espressif_board_reset_pin_number(), but it is not working. + // TEMPORARY FIX UNTIL IT'S DIAGNOSED. + common_hal_never_reset_pin(&pin_GPIO21); + gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(21, true); + + busio_spi_obj_t *spi = common_hal_board_create_spi(0); + displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus; + bus->base.type = &displayio_fourwire_type; + + common_hal_displayio_fourwire_construct( + bus, + spi, + &pin_GPIO39, // DC + &pin_GPIO7, // CS + &pin_GPIO40, // RST + 40000000, // baudrate + 0, // polarity + 0 // phase + ); + displayio_display_obj_t *display = &displays[0].display; + display->base.type = &displayio_display_type; + + // workaround as board_init() is called before reset_port() in main.c + pwmout_reset(); + + common_hal_displayio_display_construct( + display, + bus, + 240, // width (after rotation) + 135, // height (after rotation) + 40, // column start + 53, // row start + 0, // 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 + display_init_sequence, + sizeof(display_init_sequence), + &pin_GPIO45, // backlight pin + NO_BRIGHTNESS_COMMAND, + 1.0f, // brightness (ignored) + false, // 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 + ); + + common_hal_never_reset_pin(&pin_GPIO45); // backlight pin +} + +bool board_requests_safe_mode(void) { + return false; +} + +bool espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Override the I2C/TFT power pin reset to prevent resetting the display. + if (pin_number == 21) { + // Turn on TFT and I2C + gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(21, true); + return true; + } + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { + // TODO: Should we turn off the display when asleep? +} diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h new file mode 100644 index 0000000000..f2bf81d3d2 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h @@ -0,0 +1,45 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32-S3 TFT" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO33) +#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO34) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO42) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO2) +#define DEFAULT_UART_BUS_TX (&pin_GPIO1) + +#define DOUBLE_TAP_PIN (&pin_GPIO38) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk new file mode 100644 index 0000000000..b3c68b3b62 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -0,0 +1,20 @@ +USB_VID = 0x239A +USB_PID = 0x811E + +USB_PRODUCT = "Feather ESP32-S3 TFT" +USB_MANUFACTURER = "Adafruit" + +IDF_TARGET = esp32s3 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=40m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_MODULE=wroom diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c new file mode 100644 index 0000000000..fb2f898a18 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c @@ -0,0 +1,78 @@ +#include "shared-bindings/board/__init__.h" + +#include "shared-module/displayio/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, + + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) }, + + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO34) }, + + { MP_ROM_QSTR(MP_QSTR_TFT_I2C_POWER), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) }, + + { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_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_module_globals_table); diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s3_tft/sdkconfig new file mode 100644 index 0000000000..9a05ab0205 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/sdkconfig @@ -0,0 +1,47 @@ +# +# Component config +# +# +# ESP32S3-Specific +# +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +# +# SPI RAM config +# +CONFIG_SPIRAM_MODE_QUAD=y +# CONFIG_SPIRAM_MODE_OCT is not set +CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set +CONFIG_SPIRAM_SIZE=2097152 +# +# PSRAM Clock and CS IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM Clock and CS IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +# CONFIG_SPIRAM_SPEED_120M is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +CONFIG_SPIRAM_USE_MEMMAP=y +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +# end of SPI RAM config + +# end of ESP32S3-Specific + +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + +# end of Component config From d47662c4487ee388f8e47a283c2b7db7d60239fe Mon Sep 17 00:00:00 2001 From: KurtE Date: Mon, 23 May 2022 17:29:46 -0700 Subject: [PATCH 0359/2403] Teensy Builds retain Filesystem Changed a few things in the link step that satisfies the teensy loader apps, both the teensy.exe as well as the teensy_loader_cli such that when you program the board again it should retain the file sytem that is stored in the upper area of the Flash --- .../boards/sparkfun_teensy_micromod/flash_config.c | 6 ++++-- ports/mimxrt10xx/boards/teensy40/flash_config.c | 6 ++++-- ports/mimxrt10xx/boards/teensy41/flash_config.c | 6 ++++-- ports/mimxrt10xx/linking/common.ld | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c index 09886dece6..e0f5a5bd7d 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c @@ -15,7 +15,7 @@ __attribute__((section(".boot_hdr.ivt"))) * IVT Data *************************************/ const ivt image_vector_table = { - IVT_HEADER, /* IVT Header */ + 0x432000D1, /* Teensy bootloader looks for this value*/ IMAGE_ENTRY_ADDRESS, /* Image Entry Function */ IVT_RSVD, /* Reserved = 0 */ (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ @@ -25,13 +25,15 @@ const ivt image_vector_table = { IVT_RSVD /* Reserved = 0 */ }; +extern unsigned long _flashimagelen; + __attribute__((section(".boot_hdr.boot_data"))) /************************************* * Boot Data *************************************/ const BOOT_DATA_T boot_data = { FLASH_BASE, /* boot start location */ - FLASH_SIZE, /* size */ + (uint32_t)&_flashimagelen, /* actual size of image */ PLUGIN_FLAG, /* Plugin flag*/ 0xFFFFFFFF /* empty - extra data word */ }; diff --git a/ports/mimxrt10xx/boards/teensy40/flash_config.c b/ports/mimxrt10xx/boards/teensy40/flash_config.c index 3f4ab0271d..d878124b40 100644 --- a/ports/mimxrt10xx/boards/teensy40/flash_config.c +++ b/ports/mimxrt10xx/boards/teensy40/flash_config.c @@ -15,7 +15,7 @@ __attribute__((section(".boot_hdr.ivt"))) * IVT Data *************************************/ const ivt image_vector_table = { - IVT_HEADER, /* IVT Header */ + 0x432000D1, /* Teensy bootloader looks for this value*/ IMAGE_ENTRY_ADDRESS, /* Image Entry Function */ IVT_RSVD, /* Reserved = 0 */ (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ @@ -25,13 +25,15 @@ const ivt image_vector_table = { IVT_RSVD /* Reserved = 0 */ }; +extern unsigned long _flashimagelen; + __attribute__((section(".boot_hdr.boot_data"))) /************************************* * Boot Data *************************************/ const BOOT_DATA_T boot_data = { FLASH_BASE, /* boot start location */ - FLASH_SIZE, /* size */ + (uint32_t)&_flashimagelen, /* actual size of image */ PLUGIN_FLAG, /* Plugin flag*/ 0xFFFFFFFF /* empty - extra data word */ }; diff --git a/ports/mimxrt10xx/boards/teensy41/flash_config.c b/ports/mimxrt10xx/boards/teensy41/flash_config.c index 09886dece6..e0f5a5bd7d 100644 --- a/ports/mimxrt10xx/boards/teensy41/flash_config.c +++ b/ports/mimxrt10xx/boards/teensy41/flash_config.c @@ -15,7 +15,7 @@ __attribute__((section(".boot_hdr.ivt"))) * IVT Data *************************************/ const ivt image_vector_table = { - IVT_HEADER, /* IVT Header */ + 0x432000D1, /* Teensy bootloader looks for this value*/ IMAGE_ENTRY_ADDRESS, /* Image Entry Function */ IVT_RSVD, /* Reserved = 0 */ (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ @@ -25,13 +25,15 @@ const ivt image_vector_table = { IVT_RSVD /* Reserved = 0 */ }; +extern unsigned long _flashimagelen; + __attribute__((section(".boot_hdr.boot_data"))) /************************************* * Boot Data *************************************/ const BOOT_DATA_T boot_data = { FLASH_BASE, /* boot start location */ - FLASH_SIZE, /* size */ + (uint32_t)&_flashimagelen, /* actual size of image */ PLUGIN_FLAG, /* Plugin flag*/ 0xFFFFFFFF /* empty - extra data word */ }; diff --git a/ports/mimxrt10xx/linking/common.ld b/ports/mimxrt10xx/linking/common.ld index 44e8d537c4..b6f1acc8d0 100644 --- a/ports/mimxrt10xx/linking/common.ld +++ b/ports/mimxrt10xx/linking/common.ld @@ -74,7 +74,6 @@ SECTIONS _etext = .; /* define a global symbol at end of code */ __etext = .; /* define a global symbol at end of code */ } > FLASH_FIRMWARE - _ld_filesystem_start = ORIGIN(FLASH_FATFS); _ld_filesystem_end = _ld_filesystem_start + LENGTH(FLASH_FATFS); @@ -127,6 +126,8 @@ SECTIONS _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data); _ld_dtcm_data_size = SIZEOF(.dtcm_data); + _flashimagelen = _ld_dtcm_data_flash_copy + _ld_dtcm_data_size - flash_config_location; + .dtcm_bss : { . = ALIGN(4); From 9439ce04bda11592d5860d9a624c0c28e527b649 Mon Sep 17 00:00:00 2001 From: lady ada Date: Tue, 24 May 2022 11:28:55 -0400 Subject: [PATCH 0360/2403] try to remove some space? --- .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index b3c68b3b62..75107eac1b 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -6,6 +6,10 @@ USB_MANUFACTURER = "Adafruit" IDF_TARGET = esp32s3 + +CIRCUITPY_AUDIOCORE = 0 +CIRCUITPY_PULSEIO = 0 + INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = MPZ From eefba1664411a374ba1b970ba0c1954cb2de2085 Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:40:51 -0700 Subject: [PATCH 0361/2403] Correctly scale analog reading per issue #4794 --- ports/atmel-samd/common-hal/analogio/AnalogIn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/atmel-samd/common-hal/analogio/AnalogIn.c b/ports/atmel-samd/common-hal/analogio/AnalogIn.c index 4140324a1c..e6db95b358 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogIn.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogIn.c @@ -123,8 +123,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { adc_sync_read_channel(&adc, self->channel, ((uint8_t *)&value), 2); adc_sync_deinit(&adc); - // Shift the value to be 16 bit. - return value << 4; + // Stretch 12-bit ADC reading to 16-bit range + return (value << 4) | (value >> 8); } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From e9b9f0b13facd16a7cff56450811a8ef4159d25c Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:42:00 -0700 Subject: [PATCH 0362/2403] Correctly scale analog reading per issue #4794 --- ports/stm/common-hal/analogio/AnalogIn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm/common-hal/analogio/AnalogIn.c index 3079816e01..9ec93ccc84 100644 --- a/ports/stm/common-hal/analogio/AnalogIn.c +++ b/ports/stm/common-hal/analogio/AnalogIn.c @@ -204,8 +204,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { uint16_t value = (uint16_t)HAL_ADC_GetValue(&AdcHandle); HAL_ADC_Stop(&AdcHandle); - // // Shift the value to be 16 bit. - return value << 4; + // Stretch 12-bit ADC reading to 16-bit range + return (value << 4) | (value >> 8); } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From 44b31b098e1264d50201137c135766fd65efa1fd Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:44:09 -0700 Subject: [PATCH 0363/2403] Correctly scale analog reading per issue #4794 --- ports/mimxrt10xx/common-hal/analogio/AnalogIn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c index 3f3147971f..ac0b0b8300 100644 --- a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c +++ b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c @@ -81,8 +81,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { } - // Shift the value to be 16 bit - return ADC_GetChannelConversionValue(self->pin->adc, ADC_CHANNEL_GROUP) << 4; + // Stretch 12-bit ADC reading to 16 bits via 24-bit interim result + return (ADC_GetChannelConversionValue(self->pin->adc, ADC_CHANNEL_GROUP) * 0x1001) >> 8; } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From 5ef1f2dd5a9c223592aab5a147b54058232b652b Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:45:14 -0700 Subject: [PATCH 0364/2403] Correctly scale analog reading per issue #4794 --- ports/nrf/common-hal/analogio/AnalogIn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c index 8498e20f29..347426af99 100644 --- a/ports/nrf/common-hal/analogio/AnalogIn.c +++ b/ports/nrf/common-hal/analogio/AnalogIn.c @@ -125,8 +125,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { value = 0; } - // Map value to from 14 to 16 bits - return value << 2; + // Stretch 14-bit ADC reading to 16-bit range + return (value << 2) | (value >> 12); } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From e22de975b3de56429ddea132d27178f54f88ea56 Mon Sep 17 00:00:00 2001 From: lady ada Date: Tue, 24 May 2022 11:46:03 -0400 Subject: [PATCH 0365/2403] try just bitbangio remove --- .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index 75107eac1b..7fa81dd40e 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -7,8 +7,9 @@ USB_MANUFACTURER = "Adafruit" IDF_TARGET = esp32s3 -CIRCUITPY_AUDIOCORE = 0 -CIRCUITPY_PULSEIO = 0 +#CIRCUITPY_AUDIOCORE = 0 +#CIRCUITPY_PULSEIO = 0 +CIRCUITPY_BITBANGIO = 0 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = MPZ From c3f58193ca746c148c4688b93ca855265f9b02ce Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:46:39 -0700 Subject: [PATCH 0366/2403] Correctly scale analog reading per issue #4794 --- ports/raspberrypi/common-hal/analogio/AnalogIn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c index 4b82ab687a..d164d9a18b 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c @@ -65,8 +65,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER); uint16_t value = adc_read(); - // Map value to from 12 to 16 bits - return value << 4; + // Stretch 12-bit ADC reading to 16-bit range + return (value << 4) | (value >> 8); } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From 92fa02effa957d80969f36459cb947371f33b436 Mon Sep 17 00:00:00 2001 From: Paint Your Dragon Date: Tue, 24 May 2022 08:49:05 -0700 Subject: [PATCH 0367/2403] Change 12- to 16-bit scaling to match other ports Result is identical, implementation just resembles other ports instead of being all 1337 about it. --- ports/mimxrt10xx/common-hal/analogio/AnalogIn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c index ac0b0b8300..f5d2e7f42e 100644 --- a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c +++ b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c @@ -81,8 +81,10 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { } - // Stretch 12-bit ADC reading to 16 bits via 24-bit interim result - return (ADC_GetChannelConversionValue(self->pin->adc, ADC_CHANNEL_GROUP) * 0x1001) >> 8; + uint16_t value = ADC_GetChannelConversionValue(self->pin->adc, ADC_CHANNEL_GROUP); + + // Stretch 12-bit ADC reading to 16-bit range + return (value << 4) | (value >> 8); } float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { From 74c92ffe9ec1a81176d882f8823154ae88bd09fb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 20 May 2022 23:22:04 -0400 Subject: [PATCH 0368/2403] Remove busio.OneWire and bitbangio.OneWire --- docs/redirects.txt | 3 +-- ports/atmel-samd/tools/gen_pin_name_table.py | 4 ++-- shared-bindings/bitbangio/__init__.c | 4 ---- shared-bindings/busio/__init__.c | 6 ------ 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/docs/redirects.txt b/docs/redirects.txt index 248a042e7a..e548a821f9 100644 --- a/docs/redirects.txt +++ b/docs/redirects.txt @@ -45,12 +45,10 @@ shared-bindings/audiomp3/__init__.rst shared-bindings/audiomp3/ shared-bindings/audiopwmio/PWMAudioOut.rst shared-bindings/audiopwmio/#audiopwmio.PWMAudioOut shared-bindings/audiopwmio/__init__.rst shared-bindings/audiopwmio/ shared-bindings/bitbangio/I2C.rst shared-bindings/bitbangio/#bitbangio.I2C -shared-bindings/bitbangio/OneWire.rst shared-bindings/bitbangio/#bitbangio.OneWire shared-bindings/bitbangio/SPI.rst shared-bindings/bitbangio/#bitbangio.SPI shared-bindings/bitbangio/__init__.rst shared-bindings/bitbangio/ shared-bindings/board/__init__.rst shared-bindings/board/ shared-bindings/busio/I2C.rst shared-bindings/busio/#busio.I2C -shared-bindings/busio/OneWire.rst shared-bindings/busio/#busio.OneWire shared-bindings/busio/Parity.rst shared-bindings/busio/#busio.Parity shared-bindings/busio/SPI.rst shared-bindings/busio/#busio.SPI shared-bindings/busio/UART.rst shared-bindings/busio/#busio.UART @@ -101,6 +99,7 @@ shared-bindings/neopixel_write/__init__.rst shared-bindings/neopixel_write/ shared-bindings/network/__init__.rst shared-bindings/network/ shared-bindings/nvm/ByteArray.rst shared-bindings/nvm/#nvm.ByteArray shared-bindings/nvm/__init__.rst shared-bindings/nvm/ +shared-bindings/onewireio/OneWire.rst shared-bindings/onewireio/#onewireio.OneWire shared-bindings/os/__init__.rst shared-bindings/os/ shared-bindings/protomatter/__init__.rst shared-bindings/protomatter/ shared-bindings/ps2io/Ps2.rst shared-bindings/ps2io/#ps2io.Ps2 diff --git a/ports/atmel-samd/tools/gen_pin_name_table.py b/ports/atmel-samd/tools/gen_pin_name_table.py index a78144d400..3eb0fbdbb3 100644 --- a/ports/atmel-samd/tools/gen_pin_name_table.py +++ b/ports/atmel-samd/tools/gen_pin_name_table.py @@ -164,11 +164,10 @@ capabilities = { "AnalogOut": ["PA02"], }, "audioio": {"AudioOut": ["PA02"]}, - "bitbangio": {"I2C": ALL_BUT_USB, "OneWire": ALL_BUT_USB, "SPI": ALL_BUT_USB}, + "bitbangio": {"I2C": ALL_BUT_USB, "SPI": ALL_BUT_USB}, "busio": { "I2C - SDA": ["PA00", "PB08", "PA08", "PA12", "PA16", "PA22", "PB02"], # SERCOM pad 0 "I2C - SCL": ["PA01", "PB09", "PA09", "PA13", "PA17", "PA23", "PB03"], # SERCOM pad 1 - "OneWire": ALL_BUT_USB, "SPI - MISO": [ "PA00", "PA01", @@ -299,6 +298,7 @@ capabilities = { ], # pad 0 or 2 }, "digitalio": {"DigitalInOut": ALL_BUT_USB}, + "onewireio": {"OneWire": ALL_BUT_USB}, "pulseio": { "PulseIn": ALL_BUT_USB, "PWMOut": [ diff --git a/shared-bindings/bitbangio/__init__.c b/shared-bindings/bitbangio/__init__.c index 57348a3c1e..43117db494 100644 --- a/shared-bindings/bitbangio/__init__.c +++ b/shared-bindings/bitbangio/__init__.c @@ -34,7 +34,6 @@ #include "shared-bindings/bitbangio/__init__.h" #include "shared-bindings/bitbangio/I2C.h" -#include "shared-bindings/onewireio/OneWire.h" #include "shared-bindings/bitbangio/SPI.h" #include "py/runtime.h" @@ -72,9 +71,6 @@ STATIC const mp_rom_map_elem_t bitbangio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitbangio) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&bitbangio_i2c_type) }, - #if CIRCUITPY_ONEWIREIO - { MP_ROM_QSTR(MP_QSTR_OneWire), MP_ROM_PTR(&onewireio_onewire_type) }, - #endif { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&bitbangio_spi_type) }, }; diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c index 38bbfaf6ef..969c10e938 100644 --- a/shared-bindings/busio/__init__.c +++ b/shared-bindings/busio/__init__.c @@ -34,9 +34,6 @@ #include "shared-bindings/busio/I2C.h" #include "shared-bindings/busio/SPI.h" #include "shared-bindings/busio/UART.h" -#if CIRCUITPY_ONEWIREIO -#include "shared-bindings/onewireio/OneWire.h" -#endif #include "py/runtime.h" @@ -87,9 +84,6 @@ STATIC const mp_rom_map_elem_t busio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_busio) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&busio_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&busio_spi_type) }, - #if CIRCUITPY_ONEWIREIO - { MP_ROM_QSTR(MP_QSTR_OneWire), MP_ROM_PTR(&onewireio_onewire_type) }, - #endif { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&busio_uart_type) }, }; From 335c93c04416544550517b7da64c70470aa858c9 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 24 May 2022 12:34:08 -0400 Subject: [PATCH 0369/2403] restore rainbowio to small builds --- ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk | 2 -- ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk | 3 --- ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk | 1 - ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk | 1 - 4 files changed, 7 deletions(-) diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk index abbdbe87ef..c3d75202bf 100644 --- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk +++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk @@ -9,5 +9,3 @@ CHIP_FAMILY = samd21 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = NONE CIRCUITPY_FULL_BUILD = 0 - -CIRCUITPY_RAINBOWIO = 0 diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk index 38b1e96d6b..895c027ee5 100644 --- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk +++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk @@ -9,6 +9,3 @@ CHIP_FAMILY = samd21 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = NONE CIRCUITPY_FULL_BUILD = 0 - -# This board has many pins, and we have to remove something else to make room. -CIRCUITPY_RAINBOWIO = 0 diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk index 5d0734f69d..f1c3631dcb 100644 --- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk +++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk @@ -11,4 +11,3 @@ LONGINT_IMPL = NONE CIRCUITPY_FULL_BUILD = 0 CIRCUITPY_ONEWIREIO = 0 -CIRCUITPY_RAINBOWIO = 0 diff --git a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk index ea14f63ad9..0fc15cb321 100644 --- a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk @@ -12,5 +12,4 @@ CIRCUITPY_FULL_BUILD = 0 # There are many pin definitions on this board; it doesn't quite fit on very large translations. CIRCUITPY_ONEWIREIO = 0 -CIRCUITPY_RAINBOWIO = 0 CIRCUITPY_USB_MIDI = 0 From 99d7d0d8bb75b8c1877a282ee2577025f1f0303b Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 24 May 2022 14:59:34 -0400 Subject: [PATCH 0370/2403] Disable ulab for ESP32-S3 TFT --- .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index 7fa81dd40e..aed663c250 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -6,10 +6,8 @@ USB_MANUFACTURER = "Adafruit" IDF_TARGET = esp32s3 - -#CIRCUITPY_AUDIOCORE = 0 -#CIRCUITPY_PULSEIO = 0 -CIRCUITPY_BITBANGIO = 0 +# Make room for build +CIRCUITPY_ULAB = 0 INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = MPZ From c0152e7dab9678a8e98ecc599d189e36a17a22dd Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Thu, 21 Oct 2021 20:52:51 +0200 Subject: [PATCH 0371/2403] Remove gamepadshift module Everything should be using the keypad module instead. Note: there are several boards that still had gamepadshift enabled. I did not contact their authors to make sure they already switched to keypad in their code and documentation. We should probably wait with merging this for their go ahead. --- docs/porting.rst | 2 - docs/redirects.txt | 4 - .../boards/openbook_m4/mpconfigboard.mk | 2 +- .../boards/pybadge/mpconfigboard.mk | 2 +- .../boards/pygamer/mpconfigboard.mk | 2 +- ports/atmel-samd/supervisor/port.c | 6 - ports/mimxrt10xx/supervisor/port.c | 6 - ports/stm/boards/swan_r5/mpconfigboard.mk | 2 - py/circuitpy_defns.mk | 5 - py/circuitpy_mpconfig.h | 9 -- py/circuitpy_mpconfig.mk | 3 - shared-bindings/gamepadshift/GamePadShift.c | 123 ------------------ shared-bindings/gamepadshift/GamePadShift.h | 42 ------ shared-bindings/gamepadshift/__init__.c | 51 -------- shared-bindings/gamepadshift/__init__.h | 31 ----- shared-module/gamepadshift/GamePadShift.c | 52 -------- shared-module/gamepadshift/GamePadShift.h | 43 ------ shared-module/gamepadshift/__init__.c | 57 -------- shared-module/gamepadshift/__init__.h | 33 ----- supervisor/shared/tick.c | 12 +- 20 files changed, 5 insertions(+), 482 deletions(-) delete mode 100644 shared-bindings/gamepadshift/GamePadShift.c delete mode 100644 shared-bindings/gamepadshift/GamePadShift.h delete mode 100644 shared-bindings/gamepadshift/__init__.c delete mode 100644 shared-bindings/gamepadshift/__init__.h delete mode 100644 shared-module/gamepadshift/GamePadShift.c delete mode 100644 shared-module/gamepadshift/GamePadShift.h delete mode 100644 shared-module/gamepadshift/__init__.c delete mode 100644 shared-module/gamepadshift/__init__.h diff --git a/docs/porting.rst b/docs/porting.rst index 013c367291..07a2b1e9c4 100644 --- a/docs/porting.rst +++ b/docs/porting.rst @@ -79,8 +79,6 @@ as a natural "TODO" list. An example minimal build list is shown below: # any port once their prerequisites in common-hal are complete. # Requires DigitalIO: CIRCUITPY_BITBANGIO = 0 - # Requires DigitalIO - CIRCUITPY_GAMEPADSHIFT = 0 # Requires neopixel_write or SPI (dotstar) CIRCUITPY_PIXELBUF = 0 # Requires OS diff --git a/docs/redirects.txt b/docs/redirects.txt index 248a042e7a..2f72e672a8 100644 --- a/docs/redirects.txt +++ b/docs/redirects.txt @@ -82,10 +82,6 @@ shared-bindings/framebufferio/FramebufferDisplay.rst shared-bindings/framebuffer shared-bindings/framebufferio/__init__.rst shared-bindings/framebufferio/ shared-bindings/frequencyio/FrequencyIn.rst shared-bindings/frequencyio/#frequencyio.FrequencyIn shared-bindings/frequencyio/__init__.rst shared-bindings/frequencyio/ -shared-bindings/gamepad/GamePad.rst shared-bindings/gamepad/#gamepad.GamePad -shared-bindings/gamepad/__init__.rst shared-bindings/gamepad/ -shared-bindings/gamepadshift/GamePadShift.rst shared-bindings/gamepadshift/#gamepadshift.GamePadShift -shared-bindings/gamepadshift/__init__.rst shared-bindings/gamepadshift/ shared-bindings/gnss/__init__.rst shared-bindings/gnss/ shared-bindings/i2cperipheral/__init__.rst shared-bindings/i2cperipheral/ shared-bindings/i2csecondary/__init__.rst shared-bindings/i2csecondary/ diff --git a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk index 85b2dd4205..c46ed6a9fd 100644 --- a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk @@ -10,4 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = GD25Q16C LONGINT_IMPL = MPZ -CIRCUITPY_GAMEPADSHIFT = 1 +CIRCUITPY_KEYPAD = 1 diff --git a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk index bbee2ee9a1..fd002609b1 100644 --- a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ CIRCUITPY_AESIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 -CIRCUITPY_GAMEPADSHIFT = 1 CIRCUITPY_GIFIO = 0 +CIRCUITPY_KEYPAD = 1 CIRCUITPY_STAGE = 1 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk index 26c3fe9d9b..7446c241db 100644 --- a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ CIRCUITPY_AESIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 -CIRCUITPY_GAMEPADSHIFT = 1 CIRCUITPY_GIFIO = 0 +CIRCUITPY_KEYPAD = 1 CIRCUITPY_STAGE = 1 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pygamer diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c index 885d23c726..424acece78 100644 --- a/ports/atmel-samd/supervisor/port.c +++ b/ports/atmel-samd/supervisor/port.c @@ -122,9 +122,6 @@ #include "tusb.h" -#if CIRCUITPY_GAMEPADSHIFT -#include "shared-module/gamepadshift/__init__.h" -#endif #if CIRCUITPY_PEW #include "common-hal/_pew/PewPew.h" #endif @@ -428,9 +425,6 @@ void reset_port(void) { reset_gclks(); - #if CIRCUITPY_GAMEPADSHIFT - gamepadshift_reset(); - #endif #if CIRCUITPY_PEW pew_reset(); #endif diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c index 38ecfd5c18..fbf0e8a9d8 100644 --- a/ports/mimxrt10xx/supervisor/port.c +++ b/ports/mimxrt10xx/supervisor/port.c @@ -46,9 +46,6 @@ #include "supervisor/background_callback.h" -#if CIRCUITPY_GAMEPADSHIFT -#include "shared-module/gamepadshift/__init__.h" -#endif #if CIRCUITPY_PEW #include "shared-module/_pew/PewPew.h" #endif @@ -294,9 +291,6 @@ void reset_port(void) { rtc_reset(); #endif - #if CIRCUITPY_GAMEPADSHIFT - gamepadshift_reset(); - #endif #if CIRCUITPY_PEW pew_reset(); #endif diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk index 24b73e332d..b33636309e 100644 --- a/ports/stm/boards/swan_r5/mpconfigboard.mk +++ b/ports/stm/boards/swan_r5/mpconfigboard.mk @@ -49,8 +49,6 @@ CIRCUITPY_DISPLAYIO = 0 # any port once their prerequisites in common-hal are complete. # Requires DigitalIO: CIRCUITPY_BITBANGIO = 1 -# Requires DigitalIO -CIRCUITPY_GAMEPADSHIFT = 1 # Requires neopixel_write or SPI (dotstar) CIRCUITPY_PIXELBUF = 0 # Requires OS diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 0ae3341b3a..c177a9ff89 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -181,9 +181,6 @@ ifeq ($(CIRCUITPY_FUTURE),1) SRC_PATTERNS += __future__/% endif -ifeq ($(CIRCUITPY_GAMEPADSHIFT),1) -SRC_PATTERNS += gamepadshift/% -endif ifeq ($(CIRCUITPY_GETPASS),1) SRC_PATTERNS += getpass/% endif @@ -553,8 +550,6 @@ SRC_SHARED_MODULE_ALL = \ fontio/__init__.c \ framebufferio/FramebufferDisplay.c \ framebufferio/__init__.c \ - gamepadshift/GamePadShift.c \ - gamepadshift/__init__.c \ getpass/__init__.c \ gifio/__init__.c \ gifio/GifWriter.c \ diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index ec9274464b..bcfa72077b 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -311,14 +311,6 @@ typedef long mp_off_t; #define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (0) #endif -#if 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_KEYPAD #define KEYPAD_ROOT_POINTERS mp_obj_t keypad_scanners_linked_list; #else @@ -419,7 +411,6 @@ struct _supervisor_allocation_node; #define CIRCUITPY_COMMON_ROOT_POINTERS \ FLASH_ROOT_POINTERS \ KEYPAD_ROOT_POINTERS \ - GAMEPAD_ROOT_POINTERS \ BOARD_UART_ROOT_POINTER \ WIFI_MONITOR_ROOT_POINTERS \ MEMORYMONITOR_ROOT_POINTERS \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 661829de26..c2a12440ae 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -222,9 +222,6 @@ CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO) CIRCUITPY_FUTURE ?= 1 CFLAGS += -DCIRCUITPY_FUTURE=$(CIRCUITPY_FUTURE) -CIRCUITPY_GAMEPADSHIFT ?= 0 -CFLAGS += -DCIRCUITPY_GAMEPADSHIFT=$(CIRCUITPY_GAMEPADSHIFT) - CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS) diff --git a/shared-bindings/gamepadshift/GamePadShift.c b/shared-bindings/gamepadshift/GamePadShift.c deleted file mode 100644 index 1c43eeac7b..0000000000 --- a/shared-bindings/gamepadshift/GamePadShift.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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/runtime.h" -#include "py/mphal.h" -#include "py/gc.h" -#include "py/mpstate.h" -#include "shared-bindings/gamepadshift/GamePadShift.h" -#include "shared-bindings/gamepadshift/__init__.h" -#include "supervisor/shared/translate.h" -#include "supervisor/shared/tick.h" - -//| class GamePadShift: -//| """Scan buttons for presses through a shift register""" -//| -//| def __init__(self, clock: digitalio.DigitalInOut, data: digitalio.DigitalInOut, latch: digitalio.DigitalInOut) -> None: -//| """Initializes button scanning routines. -//| -//| The ``clock``, ``data`` and ``latch`` parameters are ``DigitalInOut`` -//| objects connected to the shift register controlling the buttons. -//| -//| The button presses are accumulated, until the ``get_pressed`` method -//| is called, at which point the button state is cleared, and the new -//| button presses start to be recorded. -//| -//| Only one `gamepadshift.GamePadShift` may be used at a time.""" -//| ... -//| -STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args, - size_t n_kw, const mp_obj_t *all_args) { - - enum { ARG_clock, ARG_data, ARG_latch }; - static const mp_arg_t allowed_args[] = { - { MP_QSTR_clock, MP_ARG_REQUIRED | MP_ARG_OBJ}, - { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ }, - { MP_QSTR_latch, MP_ARG_REQUIRED | MP_ARG_OBJ}, - }; - mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; - mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), - allowed_args, args); - - digitalio_digitalinout_obj_t *clock_pin = assert_digitalinout(args[ARG_clock].u_obj); - digitalio_digitalinout_obj_t *data_pin = assert_digitalinout(args[ARG_data].u_obj); - digitalio_digitalinout_obj_t *latch_pin = assert_digitalinout(args[ARG_latch].u_obj); - - gamepadshift_obj_t *gamepad_singleton = MP_STATE_VM(gamepad_singleton); - if (!gamepad_singleton || - !mp_obj_is_type(MP_OBJ_FROM_PTR(gamepad_singleton), - &gamepadshift_type)) { - gamepad_singleton = m_new_ll_obj(gamepadshift_obj_t); - gamepad_singleton->base.type = &gamepadshift_type; - if (!MP_STATE_VM(gamepad_singleton)) { - supervisor_enable_tick(); - } - MP_STATE_VM(gamepad_singleton) = gamepad_singleton; - } - common_hal_gamepadshift_gamepadshift_init(gamepad_singleton, clock_pin, data_pin, latch_pin); - return MP_OBJ_FROM_PTR(gamepad_singleton); -} - -//| def get_pressed(self) -> int: -//| """Get the status of buttons pressed since the last call and clear it. -//| -//| Returns an 8-bit number, with bits that correspond to buttons, -//| which have been pressed (or held down) since the last call to this -//| function set to 1, and the remaining bits set to 0. Then it clears -//| the button state, so that new button presses (or buttons that are -//| held down) can be recorded for the next call.""" -//| ... -//| -STATIC mp_obj_t gamepadshift_get_pressed(mp_obj_t self_in) { - gamepadshift_obj_t *gamepad_singleton = MP_STATE_VM(gamepad_singleton); - mp_obj_t pressed = MP_OBJ_NEW_SMALL_INT(gamepad_singleton->pressed); - gamepad_singleton->pressed = gamepad_singleton->last; - return pressed; -} -MP_DEFINE_CONST_FUN_OBJ_1(gamepadshift_get_pressed_obj, gamepadshift_get_pressed); - -//| def deinit(self) -> None: -//| """Disable button scanning.""" -//| ... -//| -STATIC mp_obj_t gamepadshift_deinit(mp_obj_t self_in) { - common_hal_gamepadshift_gamepadshift_deinit(self_in); - return mp_const_none; -} -MP_DEFINE_CONST_FUN_OBJ_1(gamepadshift_deinit_obj, gamepadshift_deinit); - - -STATIC const mp_rom_map_elem_t gamepadshift_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_get_pressed), MP_ROM_PTR(&gamepadshift_get_pressed_obj)}, - { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gamepadshift_deinit_obj)}, -}; -STATIC MP_DEFINE_CONST_DICT(gamepadshift_locals_dict, gamepadshift_locals_dict_table); -const mp_obj_type_t gamepadshift_type = { - { &mp_type_type }, - .name = MP_QSTR_GamePadShift, - .make_new = gamepadshift_make_new, - .locals_dict = (mp_obj_dict_t *)&gamepadshift_locals_dict, -}; diff --git a/shared-bindings/gamepadshift/GamePadShift.h b/shared-bindings/gamepadshift/GamePadShift.h deleted file mode 100644 index 8856e133ac..0000000000 --- a/shared-bindings/gamepadshift/GamePadShift.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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_GAMEPADSHIFT_GAMEPADSHIFT_H -#define MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPADSHIFT_GAMEPADSHIFT_H - -#include "shared-module/gamepadshift/GamePadShift.h" - -extern const mp_obj_type_t gamepadshift_type; - -void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift, - digitalio_digitalinout_obj_t *clock_pin, - digitalio_digitalinout_obj_t *data_pin, - digitalio_digitalinout_obj_t *latch_pin); - -void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift); - -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPADSHIFT_GAMEPADSHIFT_H diff --git a/shared-bindings/gamepadshift/__init__.c b/shared-bindings/gamepadshift/__init__.c deleted file mode 100644 index 816fd8d7b0..0000000000 --- a/shared-bindings/gamepadshift/__init__.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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/runtime.h" -#include "py/mphal.h" -#include "shared-bindings/gamepadshift/GamePadShift.h" -#include "shared-bindings/digitalio/DigitalInOut.h" -#include "shared-bindings/util.h" - -//| """Tracks button presses read through a shift register. -//| -//| .. note:: `gamepadshift` is deprecated in CircuitPython 7.0.0 and will be removed in 8.0.0. -//| Use `keypad` instead. -//| """ -//| -STATIC const mp_rom_map_elem_t gamepadshift_module_globals_table[] = { - { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gamepadshift) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_GamePadShift), MP_ROM_PTR(&gamepadshift_type)}, -}; - -STATIC MP_DEFINE_CONST_DICT(gamepadshift_module_globals, gamepadshift_module_globals_table); - -const mp_obj_module_t gamepadshift_module = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&gamepadshift_module_globals, -}; - -MP_REGISTER_MODULE(MP_QSTR_gamepadshift, gamepadshift_module, CIRCUITPY_GAMEPADSHIFT); diff --git a/shared-bindings/gamepadshift/__init__.h b/shared-bindings/gamepadshift/__init__.h deleted file mode 100644 index 4b4be756a6..0000000000 --- a/shared-bindings/gamepadshift/__init__.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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_GAMEPADSHIFT___INIT___H -#define MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPADSHIFT___INIT___H - -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPADSHIFT___INIT___H diff --git a/shared-module/gamepadshift/GamePadShift.c b/shared-module/gamepadshift/GamePadShift.c deleted file mode 100644 index 0fb7d1e8d3..0000000000 --- a/shared-module/gamepadshift/GamePadShift.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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/mpstate.h" -#include "shared-bindings/digitalio/DigitalInOut.h" -#include "shared-bindings/gamepadshift/GamePadShift.h" -#include "shared-module/gamepadshift/GamePadShift.h" -#include "supervisor/shared/tick.h" - -void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift, - digitalio_digitalinout_obj_t *clock_pin, - digitalio_digitalinout_obj_t *data_pin, - digitalio_digitalinout_obj_t *latch_pin) { - common_hal_digitalio_digitalinout_switch_to_input(data_pin, PULL_NONE); - gamepadshift->data_pin = data_pin; - common_hal_digitalio_digitalinout_switch_to_output(clock_pin, 0, - DRIVE_MODE_PUSH_PULL); - gamepadshift->clock_pin = clock_pin; - common_hal_digitalio_digitalinout_switch_to_output(latch_pin, 1, - DRIVE_MODE_PUSH_PULL); - gamepadshift->latch_pin = latch_pin; - - gamepadshift->last = 0; -} - -void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift) { - MP_STATE_VM(gamepad_singleton) = NULL; - supervisor_disable_tick(); -} diff --git a/shared-module/gamepadshift/GamePadShift.h b/shared-module/gamepadshift/GamePadShift.h deleted file mode 100644 index 53aef50986..0000000000 --- a/shared-module/gamepadshift/GamePadShift.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Radomir Dopieralski 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_GAMEPADSHIFT_GAMEPADSHIFT_H -#define MICROPY_INCLUDED_GAMEPADSHIFT_GAMEPADSHIFT_H - -#include - -#include "shared-bindings/digitalio/DigitalInOut.h" - -typedef struct { - mp_obj_base_t base; - digitalio_digitalinout_obj_t *data_pin; - digitalio_digitalinout_obj_t *clock_pin; - digitalio_digitalinout_obj_t *latch_pin; - volatile uint8_t pressed; - volatile uint8_t last; -} gamepadshift_obj_t; - -#endif // MICROPY_INCLUDED_GAMEPADSHIFT_GAMEPADSHIFT_H diff --git a/shared-module/gamepadshift/__init__.c b/shared-module/gamepadshift/__init__.c deleted file mode 100644 index eadd3034f6..0000000000 --- a/shared-module/gamepadshift/__init__.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2019 Scott Shawcroft - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "shared-module/gamepadshift/__init__.h" - -#include "py/mpstate.h" -#include "shared-bindings/gamepadshift/GamePadShift.h" - -void gamepadshift_tick(void) { - void *singleton = MP_STATE_VM(gamepad_singleton); - if (singleton == NULL || !mp_obj_is_type(MP_OBJ_FROM_PTR(singleton), &gamepadshift_type)) { - return; - } - - gamepadshift_obj_t *self = MP_OBJ_TO_PTR(singleton); - uint8_t current = 0; - uint8_t bit = 1; - common_hal_digitalio_digitalinout_set_value(self->latch_pin, 1); - for (int i = 0; i < 8; ++i) { - common_hal_digitalio_digitalinout_set_value(self->clock_pin, 0); - if (common_hal_digitalio_digitalinout_get_value(self->data_pin)) { - current |= bit; - } - common_hal_digitalio_digitalinout_set_value(self->clock_pin, 1); - bit <<= 1; - } - common_hal_digitalio_digitalinout_set_value(self->latch_pin, 0); - self->pressed |= self->last & current; - self->last = current; -} - -void gamepadshift_reset(void) { - MP_STATE_VM(gamepad_singleton) = NULL; -} diff --git a/shared-module/gamepadshift/__init__.h b/shared-module/gamepadshift/__init__.h deleted file mode 100644 index 225db73361..0000000000 --- a/shared-module/gamepadshift/__init__.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 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_GAMEPADSHIFT___INIT___H -#define MICROPY_INCLUDED_GAMEPADSHIFT___INIT___H - -void gamepadshift_tick(void); -void gamepadshift_reset(void); - -#endif // MICROPY_INCLUDED_GAMEPADSHIFT___INIT___H diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c index 104083fb20..9e54254123 100644 --- a/supervisor/shared/tick.c +++ b/supervisor/shared/tick.c @@ -44,10 +44,6 @@ #include "shared-module/displayio/__init__.h" #endif -#if CIRCUITPY_GAMEPADSHIFT -#include "shared-module/gamepadshift/__init__.h" -#endif - #if CIRCUITPY_KEYPAD #include "shared-module/keypad/__init__.h" #endif @@ -102,12 +98,8 @@ void supervisor_tick(void) { filesystem_tick(); #endif - #ifdef CIRCUITPY_GAMEPAD_TICKS - if (!(port_get_raw_ticks(NULL) & CIRCUITPY_GAMEPAD_TICKS)) { - #if CIRCUITPY_GAMEPADSHIFT - gamepadshift_tick(); - #endif - } + #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS + autoreload_tick(); #endif #if CIRCUITPY_KEYPAD From 4e467b7f34af7b4150b090f4f8eae1f8297981ef Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 09:46:20 +0800 Subject: [PATCH 0372/2403] Add Cytron Maker Zero SAMD21 --- .../boards/cytron_maker_zero_samd21/board.c | 42 ++++++++++++++++ .../cytron_maker_zero_samd21/mpconfigboard.h | 27 ++++++++++ .../cytron_maker_zero_samd21/mpconfigboard.mk | 11 +++++ .../boards/cytron_maker_zero_samd21/pins.c | 49 +++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c new file mode 100644 index 0000000000..e0a7487bd2 --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c @@ -0,0 +1,42 @@ +/* + * 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" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h new file mode 100644 index 0000000000..7e0d96f0fe --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h @@ -0,0 +1,27 @@ +#define MICROPY_HW_BOARD_NAME "Cytron Maker Zero SAMD21" +#define MICROPY_HW_MCU_NAME "samd21g18" + +#define MICROPY_HW_LED_TX &pin_PA27 +#define MICROPY_HW_LED_RX &pin_PB03 + +#define DEFAULT_I2C_BUS_SCL (&pin_PA23) +#define DEFAULT_I2C_BUS_SDA (&pin_PA22) + +#define DEFAULT_SPI_BUS_SCK (&pin_PB11) +#define DEFAULT_SPI_BUS_MOSI (&pin_PB10) +#define DEFAULT_SPI_BUS_MISO (&pin_PA12) + +#define DEFAULT_UART_BUS_RX (&pin_PA11) +#define DEFAULT_UART_BUS_TX (&pin_PA10) + +// USB is always used internally so skip the pin objects for it. +#define IGNORE_PIN_PA24 1 +#define IGNORE_PIN_PA25 1 + +// Connected to a crystal +#define IGNORE_PIN_PA00 1 +#define IGNORE_PIN_PA01 1 + +// SWD-only +#define IGNORE_PIN_PA30 1 +#define IGNORE_PIN_PA31 1 diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk new file mode 100644 index 0000000000..9466ce571a --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x04D8 +USB_PID = 0xE799 +USB_PRODUCT = "Maker Zero SAMD21" +USB_MANUFACTURER = "Cytron" + +CHIP_VARIANT = SAMD21G18A +CHIP_FAMILY = samd21 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = NONE +CIRCUITPY_FULL_BUILD = 0 diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c new file mode 100644 index 0000000000..90279da115 --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c @@ -0,0 +1,49 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, + + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) }, + + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA14) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) }, + + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA17) }, + + { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_PA13) }, + { MP_ROM_QSTR(MP_QSTR_ATN), MP_ROM_PTR(&pin_PA13) }, + + { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA12) }, + + { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 9649d80ea3f1b70cddc69f9d454dba9af6358a23 Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:03:34 +0800 Subject: [PATCH 0373/2403] Delete pins.c --- .../boards/cytron_maker_zero_samd21/pins.c | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c deleted file mode 100644 index 90279da115..0000000000 --- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "shared-bindings/board/__init__.h" - -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { - CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - - { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, - { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) }, - { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) }, - { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, - { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) }, - { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) }, - - { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, - - { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) }, - { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) }, - - { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA14) }, - { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA09) }, - { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) }, - { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) }, - { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, - { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) }, - { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, - { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) }, - { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, - { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) }, - { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) }, - - { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA17) }, - - { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_PA13) }, - { MP_ROM_QSTR(MP_QSTR_ATN), MP_ROM_PTR(&pin_PA13) }, - - { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PA22) }, - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) }, - { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_PA23) }, - { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, - { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, - { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) }, - { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA12) }, - - { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 8806f5b5d85cbb5d8734556d5ec3eb6360ee63f5 Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:03:45 +0800 Subject: [PATCH 0374/2403] Delete mpconfigboard.mk --- .../boards/cytron_maker_zero_samd21/mpconfigboard.mk | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk deleted file mode 100644 index 9466ce571a..0000000000 --- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk +++ /dev/null @@ -1,11 +0,0 @@ -USB_VID = 0x04D8 -USB_PID = 0xE799 -USB_PRODUCT = "Maker Zero SAMD21" -USB_MANUFACTURER = "Cytron" - -CHIP_VARIANT = SAMD21G18A -CHIP_FAMILY = samd21 - -INTERNAL_FLASH_FILESYSTEM = 1 -LONGINT_IMPL = NONE -CIRCUITPY_FULL_BUILD = 0 From 5453b331f7ac63c173445b919ef91acb65b7fe63 Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:03:53 +0800 Subject: [PATCH 0375/2403] Delete mpconfigboard.h --- .../cytron_maker_zero_samd21/mpconfigboard.h | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h deleted file mode 100644 index 7e0d96f0fe..0000000000 --- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h +++ /dev/null @@ -1,27 +0,0 @@ -#define MICROPY_HW_BOARD_NAME "Cytron Maker Zero SAMD21" -#define MICROPY_HW_MCU_NAME "samd21g18" - -#define MICROPY_HW_LED_TX &pin_PA27 -#define MICROPY_HW_LED_RX &pin_PB03 - -#define DEFAULT_I2C_BUS_SCL (&pin_PA23) -#define DEFAULT_I2C_BUS_SDA (&pin_PA22) - -#define DEFAULT_SPI_BUS_SCK (&pin_PB11) -#define DEFAULT_SPI_BUS_MOSI (&pin_PB10) -#define DEFAULT_SPI_BUS_MISO (&pin_PA12) - -#define DEFAULT_UART_BUS_RX (&pin_PA11) -#define DEFAULT_UART_BUS_TX (&pin_PA10) - -// USB is always used internally so skip the pin objects for it. -#define IGNORE_PIN_PA24 1 -#define IGNORE_PIN_PA25 1 - -// Connected to a crystal -#define IGNORE_PIN_PA00 1 -#define IGNORE_PIN_PA01 1 - -// SWD-only -#define IGNORE_PIN_PA30 1 -#define IGNORE_PIN_PA31 1 From 6fa552e257f050cb3ba7411e2634f0e892d7908b Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:04:06 +0800 Subject: [PATCH 0376/2403] Delete board.c --- .../boards/cytron_maker_zero_samd21/board.c | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c deleted file mode 100644 index e0a7487bd2..0000000000 --- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c +++ /dev/null @@ -1,42 +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" - -void board_init(void) { -} - -bool board_requests_safe_mode(void) { - return false; -} - -void reset_board(void) { -} - -void board_deinit(void) { -} From 9385f793dca96e402c971989375cbe421e85a2c6 Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:07:33 +0800 Subject: [PATCH 0377/2403] Add Cytron Maker Zero SAMD21 --- .../boards/cytron_maker_zero_samd21/board.c | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c new file mode 100644 index 0000000000..e0a7487bd2 --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c @@ -0,0 +1,42 @@ +/* + * 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" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} From 46f4fcc42f27a5f0bf1960767c0de248b3879eba Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:08:17 +0800 Subject: [PATCH 0378/2403] Add Cytron Maker Zero SAMD21 --- .../boards/cytron_maker_zero_samd21/pins.c | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c new file mode 100644 index 0000000000..90279da115 --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c @@ -0,0 +1,49 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, + + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) }, + + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA14) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) }, + + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA17) }, + + { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_PA13) }, + { MP_ROM_QSTR(MP_QSTR_ATN), MP_ROM_PTR(&pin_PA13) }, + + { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA12) }, + + { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 0b9996783905adf4275d0a91e78a9ed39dbee73a Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:08:58 +0800 Subject: [PATCH 0379/2403] Add Cytron Maker Zero SAMD21 --- .../boards/cytron_maker_zero_samd21/mpconfigboard.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk new file mode 100644 index 0000000000..9466ce571a --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x04D8 +USB_PID = 0xE799 +USB_PRODUCT = "Maker Zero SAMD21" +USB_MANUFACTURER = "Cytron" + +CHIP_VARIANT = SAMD21G18A +CHIP_FAMILY = samd21 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = NONE +CIRCUITPY_FULL_BUILD = 0 From 9ed71f0c0945ecdfc7f49919ab4168a48b08cd94 Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Wed, 25 May 2022 10:09:30 +0800 Subject: [PATCH 0380/2403] Add Cytron Maker Zero SAMD21 --- .../cytron_maker_zero_samd21/mpconfigboard.h | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h new file mode 100644 index 0000000000..7e0d96f0fe --- /dev/null +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/mpconfigboard.h @@ -0,0 +1,27 @@ +#define MICROPY_HW_BOARD_NAME "Cytron Maker Zero SAMD21" +#define MICROPY_HW_MCU_NAME "samd21g18" + +#define MICROPY_HW_LED_TX &pin_PA27 +#define MICROPY_HW_LED_RX &pin_PB03 + +#define DEFAULT_I2C_BUS_SCL (&pin_PA23) +#define DEFAULT_I2C_BUS_SDA (&pin_PA22) + +#define DEFAULT_SPI_BUS_SCK (&pin_PB11) +#define DEFAULT_SPI_BUS_MOSI (&pin_PB10) +#define DEFAULT_SPI_BUS_MISO (&pin_PA12) + +#define DEFAULT_UART_BUS_RX (&pin_PA11) +#define DEFAULT_UART_BUS_TX (&pin_PA10) + +// USB is always used internally so skip the pin objects for it. +#define IGNORE_PIN_PA24 1 +#define IGNORE_PIN_PA25 1 + +// Connected to a crystal +#define IGNORE_PIN_PA00 1 +#define IGNORE_PIN_PA01 1 + +// SWD-only +#define IGNORE_PIN_PA30 1 +#define IGNORE_PIN_PA31 1 From b143314b222a900292aaffe3f79cf6c3b46fec4a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 24 May 2022 22:32:17 -0400 Subject: [PATCH 0381/2403] Espressif: fix allocation of multiple Incremental Encoders --- ports/espressif/common-hal/countio/Counter.c | 4 +- .../common-hal/frequencyio/FrequencyIn.c | 4 +- .../common-hal/rotaryio/IncrementalEncoder.c | 44 +++++++++---------- ports/espressif/peripherals/pcnt.c | 44 ++++++++++--------- ports/espressif/peripherals/pcnt.h | 4 +- 5 files changed, 49 insertions(+), 51 deletions(-) diff --git a/ports/espressif/common-hal/countio/Counter.c b/ports/espressif/common-hal/countio/Counter.c index d18196051f..4203356d12 100644 --- a/ports/espressif/common-hal/countio/Counter.c +++ b/ports/espressif/common-hal/countio/Counter.c @@ -36,7 +36,7 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self, claim_pin(pin); // Prepare configuration for the PCNT unit - const pcnt_config_t pcnt_config = { + pcnt_config_t pcnt_config = { // Set PCNT input signal and control GPIOs .pulse_gpio_num = pin->number, .ctrl_gpio_num = PCNT_PIN_NOT_USED, @@ -48,7 +48,7 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self, }; // Initialize PCNT unit - const int8_t unit = peripherals_pcnt_init(pcnt_config); + const int8_t unit = peripherals_pcnt_init(&pcnt_config); if (unit == -1) { mp_raise_RuntimeError(translate("All PCNT units in use")); } diff --git a/ports/espressif/common-hal/frequencyio/FrequencyIn.c b/ports/espressif/common-hal/frequencyio/FrequencyIn.c index e4d65c95bd..a6bef57f10 100644 --- a/ports/espressif/common-hal/frequencyio/FrequencyIn.c +++ b/ports/espressif/common-hal/frequencyio/FrequencyIn.c @@ -69,7 +69,7 @@ static void IRAM_ATTR timer_interrupt_handler(void *self_in) { static void init_pcnt(frequencyio_frequencyin_obj_t *self) { // Prepare configuration for the PCNT unit - const pcnt_config_t pcnt_config = { + pcnt_config_t pcnt_config = { // Set PCNT input signal and control GPIOs .pulse_gpio_num = self->pin, .ctrl_gpio_num = PCNT_PIN_NOT_USED, @@ -83,7 +83,7 @@ static void init_pcnt(frequencyio_frequencyin_obj_t *self) { }; // initialize PCNT - const int8_t unit = peripherals_pcnt_init(pcnt_config); + const int8_t unit = peripherals_pcnt_init(&pcnt_config); if (unit == -1) { mp_raise_RuntimeError(translate("All PCNT units in use")); } diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c index 15e7fc4b8f..07b97cf9a3 100644 --- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c @@ -36,45 +36,41 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode claim_pin(pin_b); // Prepare configuration for the PCNT unit - pcnt_config_t pcnt_config = { + pcnt_config_t pcnt_config_channel_0 = { // Set PCNT input signal and control GPIOs .pulse_gpio_num = pin_a->number, .ctrl_gpio_num = pin_b->number, .channel = PCNT_CHANNEL_0, // What to do on the positive / negative edge of pulse input? - .pos_mode = PCNT_COUNT_DEC, // Count up on the positive edge - .neg_mode = PCNT_COUNT_INC, // Keep the counter value on the negative edge + .pos_mode = PCNT_COUNT_DEC, // Count up on the positive edge + .neg_mode = PCNT_COUNT_INC, // Keep the counter value on the negative edge // What to do when control input is low or high? .lctrl_mode = PCNT_MODE_REVERSE, // Reverse counting direction if low .hctrl_mode = PCNT_MODE_KEEP, // Keep the primary counter mode if high }; - // Initialize PCNT unit - const int8_t unit = peripherals_pcnt_get_unit(pcnt_config); + // Allocate and initialize PCNT unit, CHANNEL_0. + const int8_t unit = peripherals_pcnt_init(&pcnt_config_channel_0); if (unit == -1) { mp_raise_RuntimeError(translate("All PCNT units in use")); } - pcnt_unit_config(&pcnt_config); + pcnt_config_t pcnt_config_channel_1 = { + // Set PCNT input signal and control GPIOs + .pulse_gpio_num = pin_b->number, // Pins are reversed from above + .ctrl_gpio_num = pin_a->number, + .channel = PCNT_CHANNEL_1, + // What to do on the positive / negative edge of pulse input? + .pos_mode = PCNT_COUNT_DEC, // Count up on the positive edge + .neg_mode = PCNT_COUNT_INC, // Keep the counter value on the negative edge + // What to do when control input is low or high? + .lctrl_mode = PCNT_MODE_KEEP, // Keep the primary counter mode if low + .hctrl_mode = PCNT_MODE_REVERSE, // Reverse counting direction if high + .unit = unit, + }; - pcnt_config.pulse_gpio_num = pin_b->number; // What was control is now signal - pcnt_config.ctrl_gpio_num = pin_a->number; // What was signal is now control - pcnt_config.channel = PCNT_CHANNEL_1; - // What to do on the positive / negative edge of pulse input? - pcnt_config.pos_mode = PCNT_COUNT_DEC; // Count up on the positive edge - pcnt_config.neg_mode = PCNT_COUNT_INC; // Keep the counter value on the negative edge - // What to do when control input is low or high? - pcnt_config.lctrl_mode = PCNT_MODE_KEEP; // Keep the primary counter mode if low - pcnt_config.hctrl_mode = PCNT_MODE_REVERSE; // Reverse counting direction if high - - pcnt_unit_config(&pcnt_config); - - // Initialize PCNT's counter - pcnt_counter_pause(pcnt_config.unit); - pcnt_counter_clear(pcnt_config.unit); - - // Everything is set up, now go to counting - pcnt_counter_resume(pcnt_config.unit); + // Reinitalize same unit, CHANNEL_1 with different parameters. + peripherals_pcnt_reinit(&pcnt_config_channel_1); self->pin_a = pin_a->number; self->pin_b = pin_b->number; diff --git a/ports/espressif/peripherals/pcnt.c b/ports/espressif/peripherals/pcnt.c index d1b85fbb13..fa8a3e05d1 100644 --- a/ports/espressif/peripherals/pcnt.c +++ b/ports/espressif/peripherals/pcnt.c @@ -29,48 +29,50 @@ #define PCNT_UNIT_ACTIVE 1 #define PCNT_UNIT_INACTIVE 0 -static uint8_t pcnt_unit_state[4]; +static uint8_t pcnt_unit_state[PCNT_UNIT_MAX]; void peripherals_pcnt_reset(void) { - for (uint8_t i = 0; i <= 3; i++) { + for (uint8_t i = 0; i < PCNT_UNIT_MAX; i++) { pcnt_unit_state[i] = PCNT_UNIT_INACTIVE; } } -int peripherals_pcnt_get_unit(pcnt_config_t pcnt_config) { +static int peripherals_pcnt_get_unit(pcnt_config_t *pcnt_config) { // Look for available pcnt unit - for (uint8_t i = 0; i <= 3; i++) { + for (uint8_t i = 0; i < PCNT_UNIT_MAX; i++) { if (pcnt_unit_state[i] == PCNT_UNIT_INACTIVE) { - pcnt_config.unit = (pcnt_unit_t)i; + pcnt_config->unit = (pcnt_unit_t)i; pcnt_unit_state[i] = PCNT_UNIT_ACTIVE; - break; - } else if (i == 3) { - return -1; + return i; } } - return pcnt_config.unit; + return -1; } -int peripherals_pcnt_init(pcnt_config_t pcnt_config) { - // Look for available pcnt unit +void peripherals_pcnt_reinit(pcnt_config_t *pcnt_config) { + // Reinitialize a pcnt unit that has already been allocated. + // Initialize PCNT unit + pcnt_unit_config(pcnt_config); + + // Initialize PCNT's counter + pcnt_counter_pause(pcnt_config->unit); + pcnt_counter_clear(pcnt_config->unit); + + // Everything is set up, now go to counting + pcnt_counter_resume(pcnt_config->unit); +} + +int peripherals_pcnt_init(pcnt_config_t *pcnt_config) { const int8_t unit = peripherals_pcnt_get_unit(pcnt_config); if (unit == -1) { return -1; } - // Initialize PCNT unit - pcnt_unit_config(&pcnt_config); + peripherals_pcnt_reinit(pcnt_config); - // Initialize PCNT's counter - pcnt_counter_pause(pcnt_config.unit); - pcnt_counter_clear(pcnt_config.unit); - - // Everything is set up, now go to counting - pcnt_counter_resume(pcnt_config.unit); - - return pcnt_config.unit; + return pcnt_config->unit; } void peripherals_pcnt_deinit(pcnt_unit_t *unit) { diff --git a/ports/espressif/peripherals/pcnt.h b/ports/espressif/peripherals/pcnt.h index c73c41a232..d34d971601 100644 --- a/ports/espressif/peripherals/pcnt.h +++ b/ports/espressif/peripherals/pcnt.h @@ -30,8 +30,8 @@ #include "driver/pcnt.h" #include "soc/pcnt_struct.h" -extern int peripherals_pcnt_init(pcnt_config_t pcnt_config); -extern int peripherals_pcnt_get_unit(pcnt_config_t pcnt_config); +extern int peripherals_pcnt_init(pcnt_config_t *pcnt_config); +extern void peripherals_pcnt_reinit(pcnt_config_t *pcnt_config); extern void peripherals_pcnt_deinit(pcnt_unit_t *unit); extern void peripherals_pcnt_reset(void); From 06dd1ffbce68b8d06a4c17e69017a3bd78107c3f Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Wed, 25 May 2022 11:18:08 +0200 Subject: [PATCH 0382/2403] Update supervisor/shared/tick.c Co-authored-by: Dan Halbert --- supervisor/shared/tick.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c index 9e54254123..429ca35d60 100644 --- a/supervisor/shared/tick.c +++ b/supervisor/shared/tick.c @@ -98,9 +98,6 @@ void supervisor_tick(void) { filesystem_tick(); #endif - #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS - autoreload_tick(); - #endif #if CIRCUITPY_KEYPAD keypad_tick(); From 8630ecbebac70441a8bd55522d64e36e6f77ec2e Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Tue, 24 May 2022 11:05:20 +0000 Subject: [PATCH 0383/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (983 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 71 +++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 997c5415ff..56c8a4737b 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: 2022-05-14 12:35+0000\n" +"PO-Revision-Date: 2022-05-25 11:17+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -83,7 +83,7 @@ msgstr "" #: ports/raspberrypi/common-hal/analogio/AnalogOut.c #: ports/raspberrypi/common-hal/rtc/RTC.c msgid "%q" -msgstr "" +msgstr "%q" #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" @@ -91,7 +91,7 @@ msgstr "%q e %q contêm pinos duplicados" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "%q and %q must be different" -msgstr "" +msgstr "%q e %q devem ser diferentes" #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" @@ -115,11 +115,11 @@ msgstr "Os índices %q devem ser inteiros, e não %s" #: shared-module/bitbangio/SPI.c msgid "%q init failed" -msgstr "" +msgstr "a inicialização do %q falhou" #: py/argcheck.c msgid "%q length must be %d" -msgstr "" +msgstr "O comprimento de %q deve ser %d" #: py/argcheck.c msgid "%q length must be %d-%d" @@ -127,11 +127,11 @@ msgstr "o comprimento %q deve ser %d-%d" #: py/argcheck.c msgid "%q length must be <= %d" -msgstr "" +msgstr "o comprimento de %q deve ser <= %d" #: py/argcheck.c msgid "%q length must be >= %d" -msgstr "" +msgstr "o comprimento de %q deve ser >= %d" #: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" @@ -139,7 +139,7 @@ msgstr "o comprimento %q deve ser >=1" #: py/argcheck.c msgid "%q must be %d" -msgstr "" +msgstr "%q deve ser %d" #: py/argcheck.c msgid "%q must be %d-%d" @@ -171,7 +171,7 @@ msgstr "%q deve ser uma string" #: py/argcheck.c msgid "%q must be an int" -msgstr "" +msgstr "%q deve ser um inteiro" #: py/argcheck.c msgid "%q must be of type %q" @@ -672,7 +672,7 @@ msgstr "Chame super().__init__() antes de acessar o objeto nativo." #: ports/cxd56/common-hal/camera/Camera.c msgid "Camera init" -msgstr "" +msgstr "Inicialização da câmera" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." @@ -743,6 +743,7 @@ msgstr "Não é possível montar '/' quando estiver visível pelo USB." #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" msgstr "" +"Não é possível redefinir no bootloader pois nenhum bootloader está presente" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -763,7 +764,7 @@ msgstr "Não é possível subclassificar a fatia" #: shared-module/bitbangio/SPI.c msgid "Cannot transfer without MOSI and MISO pins" -msgstr "" +msgstr "Não é possível transferir sem os pinos MOSI e MISO" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" @@ -771,7 +772,7 @@ msgstr "Não é possível variar a frequência em um timer que já esteja em uso #: ports/nrf/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" -msgstr "" +msgstr "Não é possível acordar na borda do pino, nível apenas" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." @@ -958,7 +959,7 @@ msgstr "Houve uma falha na aquisição do mutex, err 0x%04x" #: shared-module/rgbmatrix/RGBMatrix.c msgid "Failed to allocate %q buffer" -msgstr "" +msgstr "Houve uma falha ao alocar o buffer %q" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" @@ -1048,7 +1049,7 @@ msgstr "A função requer bloqueio" #: ports/cxd56/common-hal/gnss/GNSS.c msgid "GNSS init" -msgstr "" +msgstr "Inicialização do GNSS" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" @@ -1083,7 +1084,7 @@ msgstr "Operação I/O no arquivo fechado" #: ports/stm/common-hal/busio/I2C.c msgid "I2C init error" -msgstr "" +msgstr "Erro de inicialização do I2C" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1279,11 +1280,11 @@ msgstr "O LHS da palavra-chave arg deve ser um ID" #: shared-module/displayio/Group.c msgid "Layer already in a group" -msgstr "" +msgstr "Camada já está num grupo" #: shared-module/displayio/Group.c msgid "Layer must be a Group or TileGrid subclass" -msgstr "" +msgstr "A camada deve ser uma subclasse Group ou TileGrid" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" @@ -1317,7 +1318,7 @@ msgstr "O pino MISO ou MOSI está ausente" #: ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI pin" -msgstr "" +msgstr "Falta o pino MISO ou o MOSI" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format @@ -1420,7 +1421,7 @@ msgstr "Nenhum pino MISO" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" -msgstr "" +msgstr "Nenhum pino MISO" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1429,7 +1430,7 @@ msgstr "Nenhum pino MOSI" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" -msgstr "" +msgstr "Nenhum pino MOSI" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c @@ -1623,7 +1624,7 @@ msgstr "Apenas um endereço é permitido" #: ports/nrf/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" -msgstr "" +msgstr "Apenas um alarme alarm.time pode ser definido" #: ports/espressif/common-hal/alarm/time/TimeAlarm.c #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c @@ -1675,7 +1676,7 @@ msgstr "" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "PWM restart" -msgstr "" +msgstr "Reinício do PWM" #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" @@ -1803,7 +1804,7 @@ msgstr "Houve um erro na inicialização do RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" -msgstr "" +msgstr "RS485" #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c @@ -1865,7 +1866,7 @@ msgstr "O formato CSD do Cartão SD não é compatível" #: ports/cxd56/common-hal/sdioio/SDCard.c msgid "SDCard init" -msgstr "" +msgstr "Inicialização do cartão SD" #: ports/stm/common-hal/sdioio/SDCard.c #, c-format @@ -1883,7 +1884,7 @@ msgstr "A configuração SPI falhou" #: ports/stm/common-hal/busio/SPI.c msgid "SPI init error" -msgstr "" +msgstr "Erro de inicialização do SPI" #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" @@ -1891,7 +1892,7 @@ msgstr "O periférico SPI está em uso" #: ports/stm/common-hal/busio/SPI.c msgid "SPI re-init" -msgstr "" +msgstr "Reinicialização do SPI" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "Scale dimensions must divide by 3" @@ -2064,7 +2065,7 @@ msgstr "Para sair, por favor, reinicie a placa sem " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample" -msgstr "" +msgstr "Muitos canais na amostra" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." @@ -2099,20 +2100,20 @@ msgstr "O argumento de tupla ou struct_time é necessário" #: ports/stm/common-hal/busio/UART.c msgid "UART de-init" -msgstr "" +msgstr "descontinuar o início UART" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "UART init" -msgstr "" +msgstr "inicialização do UART" #: ports/stm/common-hal/busio/UART.c msgid "UART re-init" -msgstr "" +msgstr "Reinicialização do UART" #: ports/stm/common-hal/busio/UART.c msgid "UART write" -msgstr "" +msgstr "Escrita UART" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2544,7 +2545,7 @@ msgstr "Calibração é somente leitura" #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c msgid "can only have one parent" -msgstr "" +msgstr "pode ter apenas um principal" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -2720,7 +2721,7 @@ msgstr "fundição" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "channel re-init" -msgstr "" +msgstr "reinício do canal" #: shared-bindings/_stage/Text.c msgid "chars buffer too small" @@ -3165,7 +3166,7 @@ msgstr "os índices devem ser números inteiros, fatias ou listas booleanas" #: ports/espressif/common-hal/busio/I2C.c msgid "init I2C" -msgstr "" +msgstr "inicialização do I2C" #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" @@ -4100,7 +4101,7 @@ msgstr "o tempo limite na espera pelo cartão v2" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "timer re-init" -msgstr "" +msgstr "reinicialização do temporizador" #: shared-bindings/time/__init__.c msgid "timestamp out of range for platform time_t" From aef5bc40fbc114c814854374763c1a70b8db667a Mon Sep 17 00:00:00 2001 From: Luqmanul Hakim Zulkifli <49841356+mlhakimz@users.noreply.github.com> Date: Thu, 26 May 2022 00:13:27 +0800 Subject: [PATCH 0384/2403] Deleted white spaces --- ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c index 90279da115..4bb0f48467 100644 --- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c +++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/pins.c @@ -30,7 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA17) }, - + { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_PA13) }, { MP_ROM_QSTR(MP_QSTR_ATN), MP_ROM_PTR(&pin_PA13) }, From b607631ae16bedafc5a35739dec181ceaf73b245 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Wed, 25 May 2022 14:18:37 -0700 Subject: [PATCH 0385/2403] feat(swan_r5): UF2 support, with UF2 family IDs assigned to stm32 chipsets. --- ports/stm/Makefile | 4 ++-- ports/stm/boards/swan_r5/mpconfigboard.mk | 1 + ports/stm/mpconfigport.mk | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/stm/Makefile b/ports/stm/Makefile index 48b0000a65..5eeff2c80a 100755 --- a/ports/stm/Makefile +++ b/ports/stm/Makefile @@ -302,11 +302,11 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf $(BUILD)/firmware.uf2: $(BUILD)/firmware.hex $(ECHO) "Create $@" - $(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0x57755a57 -b $(BOOTLOADER_OFFSET) -c -o "$(BUILD)/firmware.uf2" $^ + $(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID) -b $(BOOTLOADER_OFFSET) -c -o "$(BUILD)/firmware.uf2" $^ flash: $(BUILD)/firmware.bin $(ECHO) "Writing $< to the board" - dfu-util -a 0 --dfuse-address 0x08000000 -D $(BUILD)/firmware.bin + dfu-util -a 0 --dfuse-address $(BOOTLOADER_OFFSET) -D $(BUILD)/firmware.bin include $(TOP)/py/mkrules.mk diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk index b33636309e..a451b3d18f 100644 --- a/ports/stm/boards/swan_r5/mpconfigboard.mk +++ b/ports/stm/boards/swan_r5/mpconfigboard.mk @@ -14,6 +14,7 @@ LD_DEFAULT = boards/STM32L4R5_default.ld # UF2 boot option LD_BOOT = boards/STM32L4R5_boot.ld UF2_OFFSET = 0x8010000 +UF2_BOOTLOADER ?= 1 # Turn all of the below off while trying to get the thing to run # These modules are implemented in ports//common-hal: diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk index ba383d41d2..b9f6c2df65 100644 --- a/ports/stm/mpconfigport.mk +++ b/ports/stm/mpconfigport.mk @@ -8,6 +8,7 @@ ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx)) CIRCUITPY_SDIOIO ?= 1 # Number of USB endpoint pairs. USB_NUM_ENDPOINT_PAIRS = 4 + UF2_FAMILY_ID ?= 0x6d0922fa endif ifeq ($(MCU_SERIES),F4) @@ -25,6 +26,7 @@ ifeq ($(MCU_SERIES),F4) CIRCUITPY_ROTARYIO ?= 0 CIRCUITPY_RTC ?= 0 USB_NUM_ENDPOINT_PAIRS = 4 + UF2_FAMILY_ID ?= 0x57755a57 endif ifeq ($(MCU_SERIES),H7) @@ -43,6 +45,7 @@ ifeq ($(MCU_SERIES),H7) CIRCUITPY_RTC ?= 0 USB_NUM_ENDPOINT_PAIRS = 9 + UF2_FAMILY_ID ?= 0x6db66082 endif ifeq ($(MCU_SERIES),F7) @@ -59,6 +62,7 @@ ifeq ($(MCU_SERIES),F7) CIRCUITPY_RTC ?= 0 USB_NUM_ENDPOINT_PAIRS = 6 + UF2_FAMILY_ID ?= 0x53b80f00 endif ifeq ($(MCU_SERIES),L4) @@ -77,6 +81,7 @@ ifeq ($(MCU_SERIES),L4) # This slide deck https://www.st.com/content/ccc/resource/training/technical/product_training/98/89/c8/6c/3e/e9/49/79/STM32L4_Peripheral_USB.pdf/files/STM32L4_Peripheral_USB.pdf/jcr:content/translations/en.STM32L4_Peripheral_USB.pdf # cites 16 endpoints, 8 endpoint pairs, while section 3.39 of the L4R5 datasheet states 6 endpoint pairs. USB_NUM_ENDPOINT_PAIRS = 6 + UF2_FAMILY_ID ?= 0x00ff6919 endif CIRCUITPY_PARALLELDISPLAY := 0 From 5bbaa3b7323dc867b10d1c3d5fdc31e8332612e9 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Wed, 25 May 2022 14:19:35 -0700 Subject: [PATCH 0386/2403] feat(swan_r5): the upper 1MB of flash (bank 2) is made available for the filesystem --- ports/stm/boards/STM32L4R5_boot.ld | 2 +- ports/stm/boards/STM32L4R5_default.ld | 2 +- ports/stm/supervisor/internal_flash.c | 11 +++++------ ports/stm/supervisor/internal_flash.h | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/stm/boards/STM32L4R5_boot.ld b/ports/stm/boards/STM32L4R5_boot.ld index 16204205e6..ab34b281a8 100644 --- a/ports/stm/boards/STM32L4R5_boot.ld +++ b/ports/stm/boards/STM32L4R5_boot.ld @@ -8,7 +8,7 @@ MEMORY FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */ FLASH_ISR (rx) : ORIGIN = 0x08010000, LENGTH = 4K /* ISR vector. Kind of wasteful. */ FLASH_FIRMWARE (rx) : ORIGIN = 0x08011000, LENGTH = 1024K-128K-64K-4K /* For now, limit to 1MB so that bank switching is still possible. */ - FLASH_FS (rw) : ORIGIN = 0x080e0000, LENGTH = 128K + FLASH_FS (rw) : ORIGIN = 0x08100000, LENGTH = 1024K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 640K } diff --git a/ports/stm/boards/STM32L4R5_default.ld b/ports/stm/boards/STM32L4R5_default.ld index 1f6e04f6be..1bffcee04e 100644 --- a/ports/stm/boards/STM32L4R5_default.ld +++ b/ports/stm/boards/STM32L4R5_default.ld @@ -8,7 +8,7 @@ MEMORY FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */ FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 4K /* ISR vector. Kind of wasteful. */ FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 1024K-128K-4K /* For now, limit to 1MB so that bank switching is still possible. */ - FLASH_FS (rw) : ORIGIN = 0x080e0000, LENGTH = 128K + FLASH_FS (rw) : ORIGIN = 0x08100000, LENGTH = 1024K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 640K } diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c index 8d8ca2e0e1..cd693d0c66 100644 --- a/ports/stm/supervisor/internal_flash.c +++ b/ports/stm/supervisor/internal_flash.c @@ -95,12 +95,8 @@ STATIC const flash_layout_t flash_layout[] = { STATIC uint8_t _flash_cache[0x20000] __attribute__((aligned(4))); #elif defined(STM32L4) -// todo - the L4 devices can have different flash sizes and different page sizes -// depending upon the dual bank configuration -// This is hardcoded for the Swan R5. When support for other devices is needed more conditionals will be required -// to differentiate. STATIC const flash_layout_t flash_layout[] = { - { 0x08000000, 0x1000, 256 }, + { 0x08100000, 0x1000, 256 }, }; STATIC uint8_t _flash_cache[0x1000] __attribute__((aligned(4))); @@ -174,6 +170,9 @@ uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *si } void supervisor_flash_init(void) { + #ifdef STM32L4 + // todo - check that the device is in dual bank mode + #endif } uint32_t supervisor_flash_get_block_size(void) { @@ -202,7 +201,7 @@ void port_internal_flash_flush(void) { FLASH_EraseInitTypeDef EraseInitStruct = {}; #if CPY_STM32L4 EraseInitStruct.TypeErase = TYPEERASE_PAGES; - EraseInitStruct.Banks = FLASH_BANK_1; + EraseInitStruct.Banks = FLASH_BANK_2; // filesystem stored in upper 1MB of flash in dual bank mode #else EraseInitStruct.TypeErase = TYPEERASE_SECTORS; EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V diff --git a/ports/stm/supervisor/internal_flash.h b/ports/stm/supervisor/internal_flash.h index 421ee63267..98c55d30e8 100644 --- a/ports/stm/supervisor/internal_flash.h +++ b/ports/stm/supervisor/internal_flash.h @@ -97,9 +97,9 @@ #endif #ifdef STM32L4R5xx -#define STM32_FLASH_SIZE 0x100000 // 1MB // for now just use the first bank -#define INTERNAL_FLASH_FILESYSTEM_SIZE 0x20000 // 128KiB -#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x080e0000 +#define STM32_FLASH_SIZE 0x200000 // 2MB +#define INTERNAL_FLASH_FILESYSTEM_SIZE 0x100000 // 1024KiB +#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08100000 #endif #define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE) From 65a5ad09abeed55688c3c188cd0e77e59146c5ff Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Wed, 25 May 2022 14:21:03 -0700 Subject: [PATCH 0387/2403] feat(swan_r5): define an `ext` attribute on the board, which contains attributes for the extended set of castellated pins --- ports/stm/boards/swan_r5/pins.c | 124 ++++++++++++++++++++++++++------ 1 file changed, 103 insertions(+), 21 deletions(-) diff --git a/ports/stm/boards/swan_r5/pins.c b/ports/stm/boards/swan_r5/pins.c index f630d05997..6780795dee 100644 --- a/ports/stm/boards/swan_r5/pins.c +++ b/ports/stm/boards/swan_r5/pins.c @@ -1,14 +1,23 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -// Core Feather Pins -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { - CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS +// extended pins +STATIC const mp_rom_map_elem_t board_module_carrier_table[] = { + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PD09) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PD08) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PF15) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PE13) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PE03) }, - { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), MP_ROM_PTR(&pin_PE04) }, - { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), MP_ROM_PTR(&pin_PE06) }, - { MP_ROM_QSTR(MP_QSTR_DISABLE_DISCHARGING), MP_ROM_TRUE }, - { MP_ROM_QSTR(MP_QSTR_ENABLE_DISCHARGING), MP_ROM_FALSE }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PD01) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB15) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB14) }, + { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_PD00) }, + + { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_PTR(&pin_PG12) }, + { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_PTR(&pin_PB04) }, + { MP_ROM_QSTR(MP_QSTR_RX0), MP_ROM_PTR(&pin_PG08) }, + { MP_ROM_QSTR(MP_QSTR_TX0), MP_ROM_PTR(&pin_PG07) }, { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA01) }, @@ -16,34 +25,107 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PC01) }, { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PC04) }, { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PC05) }, + { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB01) }, + { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PC02) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB09) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PE01) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_SCL3), MP_ROM_PTR(&pin_PC00) }, + { MP_ROM_QSTR(MP_QSTR_SDA3), MP_ROM_PTR(&pin_PC09) }, + + { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_PD06) }, + { MP_ROM_QSTR(MP_QSTR_RTS2), MP_ROM_PTR(&pin_PD04) }, + { MP_ROM_QSTR(MP_QSTR_CTS2), MP_ROM_PTR(&pin_PD03) }, + { MP_ROM_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_PB10) }, + { MP_ROM_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_PB11) }, + { MP_ROM_QSTR(MP_QSTR_RTS3), MP_ROM_PTR(&pin_PD02) }, + { MP_ROM_QSTR(MP_QSTR_CTS3), MP_ROM_PTR(&pin_PB13) }, + + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PE09) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PE11) }, + { MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_PF01) }, + { MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_PF00) }, + + { MP_ROM_QSTR(MP_QSTR_QEN), MP_ROM_PTR(&pin_PD05) }, + { MP_ROM_QSTR(MP_QSTR_QCS), MP_ROM_PTR(&pin_PC11) }, + { MP_ROM_QSTR(MP_QSTR_QCLK), MP_ROM_PTR(&pin_PE10) }, + + { MP_ROM_QSTR(MP_QSTR_EN), MP_ROM_PTR(&pin_PE04) }, + { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA07) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PD15) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PF12) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PF13) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB06) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB07) }, + { MP_ROM_QSTR(MP_QSTR_QIO3), MP_ROM_PTR(&pin_PE15) }, + { MP_ROM_QSTR(MP_QSTR_QIO2), MP_ROM_PTR(&pin_PE14) }, + { MP_ROM_QSTR(MP_QSTR_QIO1), MP_ROM_PTR(&pin_PB00) }, + { MP_ROM_QSTR(MP_QSTR_QIO0), MP_ROM_PTR(&pin_PE12) }, + +}; + +MP_DEFINE_CONST_DICT(board_module_carrier, board_module_carrier_table); + +const mp_obj_type_t carrier_type = { + { &mp_type_type }, + .name = MP_QSTR_Ext, + .locals_dict = (mp_obj_dict_t *)&board_module_carrier, +}; + + +// Core Feather Pins +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_ext), MP_ROM_PTR(&carrier_type) }, + + { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), MP_ROM_PTR(&pin_PE04) }, + { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), MP_ROM_PTR(&pin_PE06) }, + { MP_ROM_QSTR(MP_QSTR_DISABLE_DISCHARGING), MP_ROM_TRUE }, + { MP_ROM_QSTR(MP_QSTR_ENABLE_DISCHARGING), MP_ROM_FALSE }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, // PWM, ADC + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA01) }, // PWM, ADC + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PC03) }, // ADC + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PC01) }, // ADC + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PC04) }, // ADC + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PC05) }, // ADC + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PA00) }, { MP_ROM_QSTR(MP_QSTR_BUTTON_USR), MP_ROM_PTR(&pin_PC13) }, { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PE04) }, - { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PB02) }, // boot button, but looks like it's wired to GND on the schematic + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PB02) }, - { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PE11) }, - { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PE09) }, - { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PD15) }, - { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA04) }, // DAC1 output also - { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA07) }, - { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PE11) }, // PWM + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PE09) }, // PWM + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PD15) }, // PWM + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA04) }, // ADC, DAC1 output also + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA07) }, // ADC, PWM + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA06) }, // ADC, PWM { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PE02) }, - { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA05) }, // DAC1 output also + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA05) }, // ADC, PWM, DAC2 output also - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB07) }, - { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB06) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB07) }, // PWM + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB06) }, // PWM { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_PA04) }, // D10 { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_PA05) }, // D13 { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PD00) }, { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PD01) }, - { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB14) }, - { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB15) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB14) }, // PWM? + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB15) }, // PWM? - { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA09) }, - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA09) }, // ADC, PWM + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA10) }, // PWM { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, From 321163da1a3a2bf90b4a50ebb926acba55b50929 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Wed, 25 May 2022 14:22:19 -0700 Subject: [PATCH 0388/2403] feat(swan_r5): blink the LED on startup. set VUSB_SELECT and DISCHARGE to floating to avoid any potential issues with them being outputs. --- ports/stm/boards/swan_r5/board.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/ports/stm/boards/swan_r5/board.c b/ports/stm/boards/swan_r5/board.c index 5ad6d464bf..36f3946236 100644 --- a/ports/stm/boards/swan_r5/board.c +++ b/ports/stm/boards/swan_r5/board.c @@ -33,14 +33,19 @@ void initialize_discharge_pin(void) { /* Initialize the 3V3 discharge to be OFF and the output power to be ON */ __HAL_RCC_GPIOE_CLK_ENABLE(); + __HAL_RCC_GPIOC_CLK_ENABLE(); + GPIO_InitTypeDef GPIO_InitStruct; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD; + /* Set the DISCHARGE pin and the USB_DETECT pin to FLOAT */ + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_LOW; GPIO_InitStruct.Pin = GPIO_PIN_6; - HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); - HAL_GPIO_WritePin(GPIOE, GPIO_PIN_6, GPIO_PIN_SET); + HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); /* PE6 DISCHRG */ + HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); /* PC6 is USB_DETECT */ + + /* Turn on the 3V3 regulator */ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Speed = GPIO_SPEED_LOW; GPIO_InitStruct.Pin = GPIO_PIN_4; HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); HAL_GPIO_WritePin(GPIOE, GPIO_PIN_4, GPIO_PIN_SET); @@ -53,6 +58,19 @@ void board_init(void) { // Set tick interrupt priority, default HAL value is intentionally invalid // Without this, USB does not function. HAL_InitTick((1UL << __NVIC_PRIO_BITS) - 1UL); + + initialize_discharge_pin(); + + __HAL_RCC_GPIOE_CLK_ENABLE(); + GPIO_InitTypeDef GPIO_InitStruct; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_LOW; + GPIO_InitStruct.Pin = GPIO_PIN_2; + HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); + HAL_GPIO_WritePin(GPIOE, GPIO_PIN_2, GPIO_PIN_SET); + HAL_Delay(50); + HAL_GPIO_WritePin(GPIOE, GPIO_PIN_2, GPIO_PIN_RESET); } bool board_requests_safe_mode(void) { @@ -60,7 +78,6 @@ bool board_requests_safe_mode(void) { } void reset_board(void) { - initialize_discharge_pin(); } void board_deinit(void) { From fb3077ccc246480b59549e35bd52a156944803d7 Mon Sep 17 00:00:00 2001 From: George White Date: Wed, 25 May 2022 21:34:06 +0000 Subject: [PATCH 0389/2403] Implement UART hardware flow control on SAMD chips --- ports/atmel-samd/common-hal/busio/UART.c | 60 ++++++++++++++++++++++-- ports/atmel-samd/common-hal/busio/UART.h | 2 + 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index 510ce087df..b69d861e37 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -71,12 +71,16 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, uint8_t rx_pad = 255; // Unset pad uint32_t tx_pinmux = 0; uint8_t tx_pad = 255; // Unset pad + uint32_t rts_pinmux = 0; + uint32_t cts_pinmux = 0; // Set state so the object is deinited to start. self->rx_pin = NO_PIN; self->tx_pin = NO_PIN; + self->rts_pin = NO_PIN; + self->cts_pin = NO_PIN; - if ((rts != NULL) || (cts != NULL) || (rs485_dir != NULL) || (rs485_invert)) { + if ((rs485_dir != NULL) || (rs485_invert)) { mp_raise_NotImplementedError(translate("RS485")); } @@ -84,6 +88,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, bool have_tx = tx != NULL; bool have_rx = rx != NULL; + bool have_rts = rts != NULL; + bool have_cts = cts != NULL; + if (!have_tx && !have_rx) { mp_raise_ValueError(translate("tx and rx cannot both be None")); } @@ -122,6 +129,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, #endif tx_pinmux = PINMUX(tx->number, (i == 0) ? MUX_C : MUX_D); tx_pad = tx->sercom[i].pad; + if (have_cts) { + cts_pinmux = PINMUX(cts->number, (i == 0) ? MUX_C : MUX_D); + } if (rx == NULL) { sercom = potential_sercom; break; @@ -134,6 +144,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, rx->sercom[j].pad != tx_pad) { rx_pinmux = PINMUX(rx->number, (j == 0) ? MUX_C : MUX_D); rx_pad = rx->sercom[j].pad; + if (have_rts) { + rts_pinmux = PINMUX(rts->number, (j == 0) ? MUX_C : MUX_D); + } sercom = sercom_insts[rx->sercom[j].index]; sercom_index = rx->sercom[j].index; break; @@ -193,21 +206,32 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // Set pads computed for this SERCOM. // TXPO: // 0x0: TX pad 0; no RTS/CTS - // 0x1: TX pad 2; no RTS/CTS - // 0x2: TX pad 0; RTS: pad 2, CTS: pad 3 (not used by us right now) - // So divide by 2 to map pad to value. + // 0x1: resevered + // 0x2: TX pad 0; RTS: pad 2, CTS: pad 3 + // 0x3: TX pad 0; RTS: pad 2; no CTS // RXPO: // 0x0: RX pad 0 // 0x1: RX pad 1 // 0x2: RX pad 2 // 0x3: RX pad 3 + // Default to TXPO with no RTS/CTS + uint8_t computed_txpo = 0; + // If we have both CTS (with or without RTS), use second pinout + if (have_cts) { + computed_txpo = 2; + } + // If we have RTS only, use the third pinout + if (have_rts && !have_cts) { + computed_txpo = 3; + } + // Doing a group mask and set of the registers saves 60 bytes over setting the bitfields individually. sercom->USART.CTRLA.reg &= ~(SERCOM_USART_CTRLA_TXPO_Msk | SERCOM_USART_CTRLA_RXPO_Msk | SERCOM_USART_CTRLA_FORM_Msk); - sercom->USART.CTRLA.reg |= SERCOM_USART_CTRLA_TXPO(tx_pad / 2) | + sercom->USART.CTRLA.reg |= SERCOM_USART_CTRLA_TXPO(computed_txpo) | SERCOM_USART_CTRLA_RXPO(rx_pad) | (parity == BUSIO_UART_PARITY_NONE ? 0 : SERCOM_USART_CTRLA_FORM(1)); @@ -257,6 +281,26 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->rx_pin = NO_PIN; } + if (have_rts) { + gpio_set_pin_direction(rts->number, GPIO_DIRECTION_OUT); + gpio_set_pin_pull_mode(rts->number, GPIO_PULL_OFF); + gpio_set_pin_function(rts->number, rts_pinmux); + self->rts_pin = rts->number; + claim_pin(rts); + } else { + self->rts_pin = NO_PIN; + } + + if (have_cts) { + gpio_set_pin_direction(cts->number, GPIO_DIRECTION_IN); + gpio_set_pin_pull_mode(cts->number, GPIO_PULL_OFF); + gpio_set_pin_function(cts->number, cts_pinmux); + self->cts_pin = cts->number; + claim_pin(cts); + } else { + self->cts_pin = NO_PIN; + } + usart_async_enable(usart_desc_p); } @@ -270,6 +314,8 @@ void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) { never_reset_sercom(hw); never_reset_pin_number(self->rx_pin); never_reset_pin_number(self->tx_pin); + never_reset_pin_number(self->rts_pin); + never_reset_pin_number(self->cts_pin); } } return; @@ -289,8 +335,12 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) { usart_async_deinit(usart_desc_p); reset_pin_number(self->rx_pin); reset_pin_number(self->tx_pin); + reset_pin_number(self->rts_pin); + reset_pin_number(self->cts_pin); self->rx_pin = NO_PIN; self->tx_pin = NO_PIN; + self->rts_pin = NO_PIN; + self->cts_pin = NO_PIN; } // Read characters. diff --git a/ports/atmel-samd/common-hal/busio/UART.h b/ports/atmel-samd/common-hal/busio/UART.h index c95fbf1556..b99a16d7db 100644 --- a/ports/atmel-samd/common-hal/busio/UART.h +++ b/ports/atmel-samd/common-hal/busio/UART.h @@ -38,6 +38,8 @@ typedef struct { struct usart_async_descriptor usart_desc; uint8_t rx_pin; uint8_t tx_pin; + int8_t rts_pin; + int8_t cts_pin; uint8_t character_bits; bool rx_error; uint32_t baudrate; From ef3c56816a4df0e463dcb7cbe1a76fdec5397c49 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 25 May 2022 15:54:26 -0700 Subject: [PATCH 0390/2403] Fix two consecutive matches --- shared-module/dotenv/__init__.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c index a7d0f9ba0d..bd1973366d 100644 --- a/shared-module/dotenv/__init__.c +++ b/shared-module/dotenv/__init__.c @@ -162,6 +162,10 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) { } // Unquoted values are ended by a newline or comment. if (!quoted && (character == '\n' || character == '#')) { + if (character == '\n') { + // Rewind one so the next_line can find the \n. + f_lseek(active_file, f_tell(active_file) - 1); + } break; } if (!quoted && unichar_isspace(character)) { From 99b23b96d9f35f5e03b883a18d8db562b579b23d Mon Sep 17 00:00:00 2001 From: George White Date: Thu, 26 May 2022 00:03:46 +0000 Subject: [PATCH 0391/2403] fix comment typo and mention datasheet --- ports/atmel-samd/common-hal/busio/UART.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index b69d861e37..71576b5e18 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -203,10 +203,10 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // which don't necessarily match what we need. After calling it, set the values // specific to this instantiation of UART. - // Set pads computed for this SERCOM. + // Set pads computed for this SERCOM. Refer to the datasheet for details on pads. // TXPO: // 0x0: TX pad 0; no RTS/CTS - // 0x1: resevered + // 0x1: reserved // 0x2: TX pad 0; RTS: pad 2, CTS: pad 3 // 0x3: TX pad 0; RTS: pad 2; no CTS // RXPO: From 8539d6518ebb064b3690ee7c605d7574f6190698 Mon Sep 17 00:00:00 2001 From: George White Date: Thu, 26 May 2022 00:06:00 +0000 Subject: [PATCH 0392/2403] flip CTS and RTS pinmux to match RX and TX --- ports/atmel-samd/common-hal/busio/UART.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index 71576b5e18..ce471f8c1a 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -129,8 +129,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, #endif tx_pinmux = PINMUX(tx->number, (i == 0) ? MUX_C : MUX_D); tx_pad = tx->sercom[i].pad; - if (have_cts) { - cts_pinmux = PINMUX(cts->number, (i == 0) ? MUX_C : MUX_D); + if (have_rts) { + rts_pinmux = PINMUX(rts->number, (i == 0) ? MUX_C : MUX_D); } if (rx == NULL) { sercom = potential_sercom; @@ -144,8 +144,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, rx->sercom[j].pad != tx_pad) { rx_pinmux = PINMUX(rx->number, (j == 0) ? MUX_C : MUX_D); rx_pad = rx->sercom[j].pad; - if (have_rts) { - rts_pinmux = PINMUX(rts->number, (j == 0) ? MUX_C : MUX_D); + if (have_cts) { + cts_pinmux = PINMUX(cts->number, (j == 0) ? MUX_C : MUX_D); } sercom = sercom_insts[rx->sercom[j].index]; sercom_index = rx->sercom[j].index; From d74193c298b73ff2df5a9ed2e603c885ed728abf Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 26 May 2022 10:58:08 -0400 Subject: [PATCH 0393/2403] Use -flto and -flto-partition only as needed --- ports/atmel-samd/Makefile | 6 ++++-- ports/nrf/Makefile | 2 +- ports/nrf/boards/bluemicro833/mpconfigboard.mk | 2 +- ports/nrf/boards/microbit_v2/mpconfigboard.mk | 2 +- ports/nrf/boards/pca10100/mpconfigboard.mk | 2 +- ports/nrf/boards/simmel/mpconfigboard.mk | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index 53ba302376..f0847de2fe 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -124,7 +124,7 @@ $(echo PERIPHERALS_CHIP_FAMILY=$(PERIPHERALS_CHIP_FAMILY)) ifeq ($(DEBUG), 1) CFLAGS += -ggdb3 -Og -Os # You may want to disable -flto if it interferes with debugging. - CFLAGS += -flto -flto-partition=none + CFLAGS += -flto -flto-partition=one # You may want to enable these flags to make setting breakpoints easier. # CFLAGS += -fno-inline -fno-ipa-sra ifeq ($(CHIP_FAMILY), samd21) @@ -147,10 +147,11 @@ else CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT) endif - CFLAGS += -flto -flto-partition=none + CFLAGS += -flto ifeq ($(CIRCUITPY_FULL_BUILD),0) CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20 + CFLAGS += -flto-partition=one endif ifdef CFLAGS_BOARD @@ -168,6 +169,7 @@ CFLAGS += \ -msoft-float \ -mfloat-abi=soft \ -DSAMD21 + -flto-partition=one endif ifeq ($(CHIP_FAMILY), samd51) CFLAGS += \ diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 6db2b547c5..c165242b19 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -91,7 +91,7 @@ ifeq ($(DEBUG), 1) else OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions CFLAGS += -DNDEBUG -ggdb3 - CFLAGS += -flto -flto-partition=none + # If -flto is needed, give it in OPTIMIZATION_FLAGS per board endif ifeq ($(NRF_DEBUG_PRINT), 1) diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk index 6c8c7172c1..22ea8df1b9 100644 --- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk +++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk @@ -50,4 +50,4 @@ SUPEROPT_GC = 0 SUPEROPT_VM = 0 # Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os +OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nrf/boards/microbit_v2/mpconfigboard.mk index dc47f2be4e..738444c91c 100644 --- a/ports/nrf/boards/microbit_v2/mpconfigboard.mk +++ b/ports/nrf/boards/microbit_v2/mpconfigboard.mk @@ -30,6 +30,6 @@ CIRCUITPY_USB = 0 MICROPY_PY_ASYNC_AWAIT = 0 # Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os +OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one SUPEROPT_VM = 0 SUPEROPT_GC = 0 diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk index 95a2dd4d98..7c7bb06c1f 100644 --- a/ports/nrf/boards/pca10100/mpconfigboard.mk +++ b/ports/nrf/boards/pca10100/mpconfigboard.mk @@ -40,4 +40,4 @@ SUPEROPT_GC = 0 SUPEROPT_VM = 0 # Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os +OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index bdafadceb7..0885462951 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -48,6 +48,6 @@ CIRCUITPY_ZLIB = 0 #CIRCUITPY_ENABLE_MPY_NATIVE = 1 # Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os +OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one SUPEROPT_VM = 0 SUPEROPT_GC = 0 From 95fc7e471368d681755de42792e6873ca686dfeb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 26 May 2022 11:52:58 -0400 Subject: [PATCH 0394/2403] harmless change to force all ports to build --- ports/atmel-samd/Makefile | 4 ++-- py/circuitpy_mpconfig.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index f0847de2fe..4bcbb5cf83 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -168,8 +168,8 @@ CFLAGS += \ -mcpu=cortex-m0plus \ -msoft-float \ -mfloat-abi=soft \ - -DSAMD21 - -flto-partition=one + -DSAMD21 \ + -flto-partition=one endif ifeq ($(CHIP_FAMILY), samd51) CFLAGS += \ diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index aedd96014b..e42f844e34 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -57,8 +57,7 @@ CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT) CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO) -# TODO: CIRCUITPY_ALARM will gradually be added to -# as many ports as possible +# TODO: CIRCUITPY_ALARM will gradually be added to as many ports as possible # so make this 1 or CIRCUITPY_FULL_BUILD eventually CIRCUITPY_ALARM ?= 0 CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM) From ca085150eeca3cdeaea277d95e8e1a5c7e07d176 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 26 May 2022 15:33:04 -0400 Subject: [PATCH 0395/2403] disable traceback on samd21; re-enable onewireio on Metro m0 --- ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk | 2 -- ports/atmel-samd/mpconfigport.mk | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index 1914c85990..4e7d799985 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -9,5 +9,3 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ - -CIRCUITPY_ONEWIREIO = 0 diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index f031386a73..9cd5b39d70 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -45,6 +45,7 @@ CIRCUITPY_RE ?= 0 CIRCUITPY_SDCARDIO ?= 0 CIRCUITPY_SYNTHIO ?= 0 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1 +CIRCUITPY_TRACEBACK = 0 CIRCUITPY_ULAB = 0 CIRCUITPY_VECTORIO = 0 CIRCUITPY_ZLIB = 0 From 947f564672322b66cbf8e206dc9f772ae9717f9e Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 26 May 2022 13:47:54 -0400 Subject: [PATCH 0396/2403] tune LTO on nrf --- ports/nrf/Makefile | 9 ++++++++- ports/nrf/boards/bluemicro833/mpconfigboard.mk | 6 ------ ports/nrf/boards/microbit_v2/mpconfigboard.mk | 5 ----- ports/nrf/boards/pca10100/mpconfigboard.mk | 6 ------ ports/nrf/boards/simmel/mpconfigboard.mk | 5 ----- ports/nrf/mpconfigport.mk | 4 ++++ 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index c165242b19..68bc3cc41c 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -84,6 +84,14 @@ INC += -I../../lib/mp-readline INC += -I../../lib/tinyusb/src INC += -I../../supervisor/shared/usb +ifeq ($(MCU_CHIP),nrf52833) + OPTIMIZATION_FLAGS ?= -Os -flto -flto-partition=one +else + ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) + OPTIMIZATION_FLAGS ?= -Os -flto + endif +endif + #Debugging/Optimization ifeq ($(DEBUG), 1) CFLAGS += -ggdb3 @@ -91,7 +99,6 @@ ifeq ($(DEBUG), 1) else OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions CFLAGS += -DNDEBUG -ggdb3 - # If -flto is needed, give it in OPTIMIZATION_FLAGS per board endif ifeq ($(NRF_DEBUG_PRINT), 1) diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk index 22ea8df1b9..bfefcbf100 100644 --- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk +++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk @@ -45,9 +45,3 @@ CIRCUITPY_VECTORIO = 0 CIRCUITPY_ZLIB = 0 MICROPY_PY_ASYNC_AWAIT = 0 - -SUPEROPT_GC = 0 -SUPEROPT_VM = 0 - -# Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nrf/boards/microbit_v2/mpconfigboard.mk index 738444c91c..413efda7f7 100644 --- a/ports/nrf/boards/microbit_v2/mpconfigboard.mk +++ b/ports/nrf/boards/microbit_v2/mpconfigboard.mk @@ -28,8 +28,3 @@ CIRCUITPY_ULAB = 0 CIRCUITPY_USB = 0 MICROPY_PY_ASYNC_AWAIT = 0 - -# Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one -SUPEROPT_VM = 0 -SUPEROPT_GC = 0 diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk index 7c7bb06c1f..553da88963 100644 --- a/ports/nrf/boards/pca10100/mpconfigboard.mk +++ b/ports/nrf/boards/pca10100/mpconfigboard.mk @@ -35,9 +35,3 @@ CIRCUITPY_VECTORIO = 0 CIRCUITPY_ZLIB = 0 MICROPY_PY_ASYNC_AWAIT = 0 - -SUPEROPT_GC = 0 -SUPEROPT_VM = 0 - -# Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index 0885462951..faf9d2d1e3 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -46,8 +46,3 @@ CIRCUITPY_ZLIB = 0 # Enable micropython.native #CIRCUITPY_ENABLE_MPY_NATIVE = 1 - -# Override optimization to keep binary small -OPTIMIZATION_FLAGS = -Os -flto -flto-partition=one -SUPEROPT_VM = 0 -SUPEROPT_GC = 0 diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index 1a12c20f2d..6cbbce1846 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -77,6 +77,10 @@ MCU_SERIES = m4 MCU_VARIANT = nrf52 MCU_SUB_VARIANT = nrf52833 +# Need the space +SUPEROPT_GC ?= 0 +SUPEROPT_VM ?= 0 + SD ?= s140 SOFTDEV_VERSION ?= 7.0.1 From c6762538347b8021cd691968702ba64943e13d13 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 26 May 2022 16:44:48 -0700 Subject: [PATCH 0397/2403] Switch translate() to the header file This allows the compile stage to optimize most of the translate() function away and saves a ton of space (~40k on ESP). *However*, it requires us to wait for the qstr output before we compile the rest of our .o files. (Only qstr.o used to wait.) This isn't as good as the current setup with LTO though. Trinket M0 loses <1k with this setup. So, we should probably conditionalize this along with LTO. --- .../mpconfigboard.mk | 3 --- py/mkrules.mk | 4 ++-- supervisor/shared/translate.c | 16 --------------- supervisor/shared/translate.h | 20 ++++++++++++++++++- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index aed663c250..b3c68b3b62 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -6,9 +6,6 @@ USB_MANUFACTURER = "Adafruit" IDF_TARGET = esp32s3 -# Make room for build -CIRCUITPY_ULAB = 0 - INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = MPZ diff --git a/py/mkrules.mk b/py/mkrules.mk index 6bef64fd82..b83a40dc29 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -58,7 +58,7 @@ $(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $< endef vpath %.c . $(TOP) $(USER_C_MODULES) $(DEVICES_MODULES) -$(BUILD)/%.o: %.c +$(BUILD)/%.o: %.c | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/qstrdefs.enum.h $(call compile_c) vpath %.cpp . $(TOP) $(USER_C_MODULES) @@ -89,7 +89,7 @@ $(BUILD)/%.pp: %.c # the right .o's to get recompiled if the generated.h file changes. Adding # an order-only dependency to all of the .o's will cause the generated .h # to get built before we try to compile any of them. -$(OBJ): | $(HEADER_BUILD)/qstrdefs.enum.h $(HEADER_BUILD)/mpversion.h +$(OBJ): | $(HEADER_BUILD)/mpversion.h # The logic for qstr regeneration (applied by makeqstrdefs.py) is: # - if anything in QSTR_GLOBAL_DEPENDENCIES is newer, then process all source files ($^) diff --git a/supervisor/shared/translate.c b/supervisor/shared/translate.c index fefda46006..55cc7d5d1e 100644 --- a/supervisor/shared/translate.c +++ b/supervisor/shared/translate.c @@ -134,19 +134,3 @@ char *decompress(const compressed_string_t *compressed, char *decompressed) { decompressed[length - 1] = '\0'; return decompressed; } - -inline -// gcc10 -flto has issues with this being always_inline for debug builds. -#if CIRCUITPY_DEBUG < 1 -__attribute__((always_inline)) -#endif -const compressed_string_t *translate(const char *original) { - #ifndef NO_QSTR - #define QDEF(id, hash, len, str) - #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else - #include "genhdr/qstrdefs.generated.h" -#undef TRANSLATION -#undef QDEF - #endif - return NULL; -} diff --git a/supervisor/shared/translate.h b/supervisor/shared/translate.h index da58e1eb78..1963c6fe65 100644 --- a/supervisor/shared/translate.h +++ b/supervisor/shared/translate.h @@ -27,7 +27,9 @@ #ifndef MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H #define MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H +#include #include +#include // The format of the compressed data is: // - the size of the uncompressed string in UTF-8 bytes, encoded as a @@ -77,7 +79,7 @@ typedef struct compressed_string { // Return the compressed, translated version of a source string // Usually, due to LTO, this is optimized into a load of a constant // pointer. -const compressed_string_t *translate(const char *c); +// const compressed_string_t *translate(const char *c); void serial_write_compressed(const compressed_string_t *compressed); char *decompress(const compressed_string_t *compressed, char *decompressed); uint16_t decompress_length(const compressed_string_t *compressed); @@ -90,4 +92,20 @@ uint16_t decompress_length(const compressed_string_t *compressed); #define MP_ERROR_TEXT(x) translate(x) #endif +static inline +// gcc10 -flto has issues with this being always_inline for debug builds. +#if CIRCUITPY_DEBUG < 1 +__attribute__((always_inline)) +#endif +const compressed_string_t *translate(const char *original) { + #ifndef NO_QSTR + #define QDEF(id, hash, len, str) + #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else + #include "genhdr/qstrdefs.generated.h" +#undef TRANSLATION +#undef QDEF + #endif + return NULL; +} + #endif // MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H From 9d10a3da66cd799b659457ca9785be1a33105dc6 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 May 2022 12:59:54 -0700 Subject: [PATCH 0398/2403] Conditionalize LTO --- devices/ble_hci/common-hal/_bleio/att.c | 1 + extmod/moduasyncio.c | 2 + extmod/modubinascii.c | 2 + extmod/moductypes.c | 2 +- extmod/moduhashlib.c | 2 +- extmod/moduheapq.c | 2 +- extmod/modujson.c | 2 +- extmod/modutimeq.c | 2 +- extmod/moduzlib.c | 2 +- extmod/vfs_fat.c | 2 +- extmod/vfs_posix_file.c | 2 +- main.c | 2 +- ports/atmel-samd/Makefile | 9 +- ports/atmel-samd/common-hal/_pew/PewPew.c | 2 +- .../atmel-samd/common-hal/analogio/AnalogIn.c | 2 +- .../common-hal/analogio/AnalogOut.c | 2 +- .../atmel-samd/common-hal/audiobusio/I2SOut.c | 2 +- .../atmel-samd/common-hal/audiobusio/PDMIn.c | 280 +++++++++--------- .../atmel-samd/common-hal/audioio/AudioOut.c | 2 +- ports/atmel-samd/common-hal/busio/I2C.c | 2 +- ports/atmel-samd/common-hal/busio/SPI.c | 1 + ports/atmel-samd/common-hal/busio/UART.c | 2 +- ports/atmel-samd/common-hal/countio/Counter.c | 2 +- .../common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/frequencyio/FrequencyIn.c | 2 +- .../common-hal/microcontroller/Pin.c | 1 + .../common-hal/microcontroller/__init__.c | 2 +- ports/atmel-samd/common-hal/ps2io/Ps2.c | 2 +- ports/atmel-samd/common-hal/pulseio/PulseIn.c | 2 +- .../atmel-samd/common-hal/pulseio/PulseOut.c | 2 +- ports/atmel-samd/common-hal/pwmio/PWMOut.c | 2 +- .../common-hal/rotaryio/IncrementalEncoder.c | 2 +- ports/atmel-samd/common-hal/rtc/RTC.c | 2 +- ports/atmel-samd/common-hal/sdioio/SDCard.c | 2 +- ports/atmel-samd/common-hal/touchio/TouchIn.c | 2 +- ports/atmel-samd/mpconfigport.mk | 8 + .../common-hal/digitalio/DigitalInOut.c | 2 +- ports/broadcom/common-hal/sdioio/SDCard.c | 2 +- ports/espressif/Makefile | 2 - .../espressif/common-hal/analogio/AnalogIn.c | 2 +- .../espressif/common-hal/analogio/AnalogOut.c | 2 +- .../espressif/common-hal/audiobusio/I2SOut.c | 2 +- ports/espressif/common-hal/busio/I2C.c | 2 +- ports/espressif/common-hal/busio/UART.c | 2 +- ports/espressif/common-hal/countio/Counter.c | 2 +- .../common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/Processor.c | 2 +- ports/litex/Makefile | 4 +- .../litex/common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/Processor.c | 2 +- ports/mimxrt10xx/Makefile | 7 +- .../common-hal/analogio/AnalogOut.c | 2 +- .../common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/__init__.c | 2 +- ports/mimxrt10xx/common-hal/pwmio/PWMOut.c | 2 +- ports/mimxrt10xx/common-hal/rtc/RTC.c | 2 +- ports/nrf/Makefile | 8 - ports/nrf/common-hal/analogio/AnalogIn.c | 4 +- ports/nrf/common-hal/analogio/AnalogOut.c | 2 +- ports/nrf/common-hal/audiopwmio/PWMAudioOut.c | 2 +- ports/nrf/common-hal/busio/I2C.c | 2 +- ports/nrf/common-hal/busio/UART.c | 2 +- ports/nrf/common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/Processor.c | 3 +- ports/nrf/common-hal/pulseio/PulseOut.c | 2 +- ports/nrf/common-hal/pwmio/PWMOut.c | 2 +- ports/nrf/common-hal/rtc/RTC.c | 2 +- ports/nrf/mpconfigport.mk | 8 + .../bindings/rp2pio/StateMachine.c | 2 +- .../common-hal/analogio/AnalogIn.c | 2 +- .../common-hal/analogio/AnalogOut.c | 2 +- .../common-hal/audiobusio/I2SOut.c | 2 +- .../raspberrypi/common-hal/audiobusio/PDMIn.c | 2 +- .../common-hal/audiopwmio/PWMAudioOut.c | 2 +- .../raspberrypi/common-hal/countio/Counter.c | 2 +- .../common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/__init__.c | 2 +- .../raspberrypi/common-hal/pulseio/PulseIn.c | 2 +- .../raspberrypi/common-hal/pulseio/PulseOut.c | 2 +- ports/raspberrypi/common-hal/pwmio/PWMOut.c | 2 +- ports/stm/Makefile | 2 - ports/stm/common-hal/analogio/AnalogIn.c | 2 +- ports/stm/common-hal/analogio/AnalogOut.c | 2 +- ports/stm/common-hal/busio/I2C.c | 2 +- ports/stm/common-hal/busio/SPI.c | 2 +- ports/stm/common-hal/busio/UART.c | 2 +- ports/stm/common-hal/digitalio/DigitalInOut.c | 2 +- .../common-hal/microcontroller/Processor.c | 2 +- ports/stm/common-hal/pulseio/PulseOut.c | 2 +- ports/stm/common-hal/pwmio/PWMOut.c | 2 +- ports/stm/common-hal/sdioio/SDCard.c | 2 +- ports/stm/peripherals/timers.c | 2 +- ports/unix/modffi.c | 2 +- ports/unix/modmachine.c | 2 +- py/argcheck.c | 2 +- py/bc.c | 2 +- py/binary.c | 2 +- py/builtinevex.c | 2 +- py/builtinhelp.c | 2 + py/builtinimport.c | 2 +- py/circuitpy_defns.mk | 13 +- py/compile.c | 10 +- py/enum.c | 2 + py/lexer.c | 2 +- py/makeqstrdata.py | 2 +- py/modbuiltins.c | 2 +- py/modmath.c | 2 +- py/modmicropython.c | 2 +- py/modstruct.c | 2 +- py/modthread.c | 2 +- py/moduerrno.c | 2 +- py/obj.c | 2 +- py/obj.h | 2 +- py/objarray.c | 2 +- py/objcomplex.c | 2 +- py/objdeque.c | 2 +- py/objdict.c | 2 +- py/objexcept.c | 2 +- py/objfloat.c | 2 +- py/objgenerator.c | 2 +- py/objint.c | 2 +- py/objint_longlong.c | 2 +- py/objint_mpz.c | 2 +- py/objlist.c | 2 +- py/objnamedtuple.c | 2 +- py/objobject.c | 2 +- py/objrange.c | 2 +- py/objset.c | 2 +- py/objslice.c | 2 +- py/objstr.c | 2 +- py/objstringio.c | 2 +- py/objstrunicode.c | 2 +- py/objtuple.c | 2 +- py/objtype.c | 2 +- py/parse.c | 2 +- py/parsenum.c | 2 +- py/persistentcode.c | 2 +- py/proto.c | 2 + py/qstr.c | 1 + py/runtime.c | 2 +- py/runtime.h | 2 + py/sequence.c | 2 +- py/stream.c | 2 +- py/vm.c | 1 + runtime.py | 10 + shared-bindings/_pew/PewPew.c | 2 +- shared-bindings/_stage/Layer.c | 2 +- shared-bindings/_stage/Text.c | 2 +- .../i2c_device/I2CDevice.c | 2 +- .../spi_device/SPIDevice.c | 2 +- shared-bindings/alarm/SleepMemory.c | 2 +- shared-bindings/alarm/pin/PinAlarm.c | 2 +- shared-bindings/alarm/time/TimeAlarm.c | 2 +- shared-bindings/analogio/AnalogOut.c | 2 +- shared-bindings/audiobusio/I2SOut.c | 2 +- shared-bindings/audiobusio/PDMIn.c | 2 +- shared-bindings/audiocore/RawSample.c | 2 +- shared-bindings/audiocore/WaveFile.c | 2 +- shared-bindings/audioio/AudioOut.c | 2 +- shared-bindings/audiomixer/Mixer.c | 2 +- shared-bindings/audiomixer/MixerVoice.c | 2 +- shared-bindings/audiomp3/MP3Decoder.c | 2 +- shared-bindings/audiopwmio/PWMAudioOut.c | 2 +- shared-bindings/bitbangio/I2C.c | 2 +- shared-bindings/bitbangio/SPI.c | 2 +- shared-bindings/busio/I2C.c | 2 +- shared-bindings/busio/SPI.c | 2 +- shared-bindings/busio/UART.c | 2 +- shared-bindings/digitalio/DigitalInOut.c | 2 +- shared-bindings/digitalio/Pull.c | 1 + shared-bindings/displayio/Bitmap.c | 2 +- shared-bindings/displayio/ColorConverter.c | 2 +- shared-bindings/displayio/Display.c | 2 +- shared-bindings/displayio/EPaperDisplay.c | 2 +- shared-bindings/displayio/FourWire.c | 2 +- shared-bindings/displayio/Group.c | 2 +- shared-bindings/displayio/I2CDisplay.c | 2 +- shared-bindings/displayio/OnDiskBitmap.c | 2 +- shared-bindings/displayio/Palette.c | 2 +- shared-bindings/displayio/Shape.c | 2 +- shared-bindings/displayio/TileGrid.c | 2 +- shared-bindings/fontio/BuiltinFont.c | 2 +- .../framebufferio/FramebufferDisplay.c | 2 +- shared-bindings/frequencyio/FrequencyIn.c | 2 +- shared-bindings/math/__init__.c | 2 +- .../memorymonitor/AllocationAlarm.c | 2 +- .../memorymonitor/AllocationSize.c | 2 +- shared-bindings/microcontroller/Pin.c | 2 +- shared-bindings/microcontroller/Processor.c | 2 +- shared-bindings/microcontroller/__init__.c | 2 +- shared-bindings/multiterminal/__init__.c | 2 +- shared-bindings/neopixel_write/__init__.c | 2 +- shared-bindings/nvm/ByteArray.c | 2 +- shared-bindings/os/__init__.c | 1 + shared-bindings/paralleldisplay/ParallelBus.c | 2 +- shared-bindings/ps2io/Ps2.c | 2 +- shared-bindings/pulseio/PulseIn.c | 2 +- shared-bindings/pulseio/PulseOut.c | 2 +- shared-bindings/pwmio/PWMOut.c | 2 +- shared-bindings/random/__init__.c | 2 +- shared-bindings/rtc/RTC.c | 2 +- shared-bindings/sdioio/SDCard.c | 2 +- shared-bindings/storage/__init__.c | 2 +- shared-bindings/struct/__init__.c | 2 +- shared-bindings/supervisor/__init__.c | 2 +- shared-bindings/synthio/MidiTrack.c | 2 +- shared-bindings/terminalio/Terminal.c | 2 +- shared-bindings/time/__init__.c | 2 +- shared-bindings/touchio/TouchIn.c | 2 +- shared-bindings/usb_cdc/Serial.c | 2 +- shared-bindings/usb_cdc/__init__.c | 1 + shared-bindings/usb_hid/Device.c | 1 + shared-bindings/usb_hid/__init__.c | 2 + shared-bindings/usb_midi/PortIn.c | 2 +- shared-bindings/usb_midi/PortOut.c | 2 +- shared-bindings/usb_midi/__init__.c | 1 + shared-bindings/util.c | 2 +- shared-bindings/vectorio/Circle.c | 2 +- shared-bindings/vectorio/Polygon.c | 2 +- shared-bindings/vectorio/Rectangle.c | 2 +- shared-bindings/vectorio/VectorShape.c | 2 +- shared-bindings/zlib/__init__.c | 2 +- shared-module/audiocore/WaveFile.c | 2 +- shared-module/audiomp3/MP3Decoder.c | 2 +- shared-module/bitbangio/I2C.c | 2 +- shared-module/bitbangio/SPI.c | 2 +- shared-module/board/__init__.c | 2 +- shared-module/msgpack/__init__.c | 2 +- shared-module/storage/__init__.c | 1 + shared-module/struct/__init__.c | 2 +- shared-module/usb_hid/Device.c | 2 +- shared-module/usb_hid/__init__.c | 1 + shared-module/usb_midi/PortIn.c | 2 +- shared-module/usb_midi/PortOut.c | 2 +- shared-module/usb_midi/__init__.c | 1 + shared/libc/abort_.c | 2 +- shared/netutils/netutils.c | 2 +- supervisor/shared/safe_mode.c | 2 +- .../compressed_string.h} | 29 +- supervisor/shared/{ => translate}/translate.c | 6 +- supervisor/shared/translate/translate.h | 55 ++++ supervisor/shared/translate/translate_impl.h | 52 ++++ supervisor/supervisor.mk | 2 +- 243 files changed, 534 insertions(+), 413 deletions(-) create mode 100644 runtime.py rename supervisor/shared/{translate.h => translate/compressed_string.h} (81%) rename supervisor/shared/{ => translate}/translate.c (97%) create mode 100644 supervisor/shared/translate/translate.h create mode 100644 supervisor/shared/translate/translate_impl.h diff --git a/devices/ble_hci/common-hal/_bleio/att.c b/devices/ble_hci/common-hal/_bleio/att.c index abfe7429f4..f649967ca9 100644 --- a/devices/ble_hci/common-hal/_bleio/att.c +++ b/devices/ble_hci/common-hal/_bleio/att.c @@ -44,6 +44,7 @@ #include "shared-bindings/_bleio/Service.h" #include "shared-bindings/_bleio/UUID.h" #include "supervisor/shared/tick.h" +#include "supervisor/shared/translate/translate.h" STATIC uint16_t max_mtu = BT_ATT_DEFAULT_LE_MTU; // 23 STATIC unsigned long timeout = 5000; diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c index 016ffcbc99..c4c4d36ad8 100644 --- a/extmod/moduasyncio.c +++ b/extmod/moduasyncio.c @@ -33,6 +33,8 @@ #include "shared-bindings/supervisor/__init__.h" #endif +#include "supervisor/shared/translate/translate.h" + #if MICROPY_PY_UASYNCIO // Used when task cannot be guaranteed to be non-NULL. diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c index 7157be31fa..5aa9eacefd 100644 --- a/extmod/modubinascii.c +++ b/extmod/modubinascii.c @@ -11,6 +11,8 @@ #include "py/runtime.h" #include "py/binary.h" +#include "supervisor/shared/translate/translate.h" + static void check_not_unicode(const mp_obj_t arg) { #if MICROPY_CPYTHON_COMPAT if (mp_obj_is_str(arg)) { diff --git a/extmod/moductypes.c b/extmod/moductypes.c index 265cbd6d5d..f770ead006 100644 --- a/extmod/moductypes.c +++ b/extmod/moductypes.c @@ -11,7 +11,7 @@ #include "py/objtuple.h" #include "py/binary.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UCTYPES diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c index 741f43c74c..a84254c566 100644 --- a/extmod/moduhashlib.c +++ b/extmod/moduhashlib.c @@ -8,7 +8,7 @@ #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UHASHLIB diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c index 34867a5838..0200245f86 100644 --- a/extmod/moduheapq.c +++ b/extmod/moduheapq.c @@ -6,7 +6,7 @@ #include "py/objlist.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UHEAPQ diff --git a/extmod/modujson.c b/extmod/modujson.c index 9a4db7c273..cff02ae95c 100644 --- a/extmod/modujson.c +++ b/extmod/modujson.c @@ -13,7 +13,7 @@ #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UJSON diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c index 495675ad1d..fcef14ce98 100644 --- a/extmod/modutimeq.c +++ b/extmod/modutimeq.c @@ -10,7 +10,7 @@ #include "py/runtime.h" #include "py/smallint.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UTIMEQ diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c index b1eeac934b..6a1a2d6111 100644 --- a/extmod/moduzlib.c +++ b/extmod/moduzlib.c @@ -10,7 +10,7 @@ #include "py/stream.h" #include "py/mperrno.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_UZLIB diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c index ed5cc6095f..d19a53a9ef 100644 --- a/extmod/vfs_fat.c +++ b/extmod/vfs_fat.c @@ -20,7 +20,7 @@ #include "extmod/vfs_fat.h" #include "shared/timeutils/timeutils.h" #include "supervisor/filesystem.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if FF_MAX_SS == FF_MIN_SS #define SECSIZE(fs) (FF_MIN_SS) diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c index a984ace4a2..94ddbe5f7b 100644 --- a/extmod/vfs_posix_file.c +++ b/extmod/vfs_posix_file.c @@ -8,7 +8,7 @@ #include "py/runtime.h" #include "py/stream.h" #include "extmod/vfs_posix.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if (defined(MICROPY_VFS_POSIX) && MICROPY_VFS_POSIX) || (defined(MICROPY_VFS_POSIX_FILE) && MICROPY_VFS_POSIX_FILE) diff --git a/main.c b/main.c index 17fe8167f2..d2b3edb16a 100644 --- a/main.c +++ b/main.c @@ -58,7 +58,7 @@ #include "supervisor/shared/status_leds.h" #include "supervisor/shared/tick.h" #include "supervisor/shared/traceback.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/workflow.h" #include "supervisor/usb.h" #include "supervisor/workflow.h" diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index 4bcbb5cf83..281b5efd2f 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -123,8 +123,6 @@ $(echo PERIPHERALS_CHIP_FAMILY=$(PERIPHERALS_CHIP_FAMILY)) #Debugging/Optimization ifeq ($(DEBUG), 1) CFLAGS += -ggdb3 -Og -Os - # You may want to disable -flto if it interferes with debugging. - CFLAGS += -flto -flto-partition=one # You may want to enable these flags to make setting breakpoints easier. # CFLAGS += -fno-inline -fno-ipa-sra ifeq ($(CHIP_FAMILY), samd21) @@ -147,11 +145,8 @@ else CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT) endif - CFLAGS += -flto - ifeq ($(CIRCUITPY_FULL_BUILD),0) CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20 - CFLAGS += -flto-partition=one endif ifdef CFLAGS_BOARD @@ -168,8 +163,7 @@ CFLAGS += \ -mcpu=cortex-m0plus \ -msoft-float \ -mfloat-abi=soft \ - -DSAMD21 \ - -flto-partition=one + -DSAMD21 endif ifeq ($(CHIP_FAMILY), samd51) CFLAGS += \ @@ -206,7 +200,6 @@ endif CFLAGS += -Wno-stringop-overread -Wno-stringop-overflow LDFLAGS = $(CFLAGS) -nostartfiles -Wl,-nostdlib -Wl,-T,$(GENERATED_LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs -LDFLAGS += -flto=$(shell $(NPROC)) LIBS := -lgcc -lc # Use toolchain libm if we're not using our own. diff --git a/ports/atmel-samd/common-hal/_pew/PewPew.c b/ports/atmel-samd/common-hal/_pew/PewPew.c index 40cd52134a..c4d94e3dbd 100644 --- a/ports/atmel-samd/common-hal/_pew/PewPew.c +++ b/ports/atmel-samd/common-hal/_pew/PewPew.c @@ -35,7 +35,7 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/util.h" #include "samd/timers.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "timer_handler.h" diff --git a/ports/atmel-samd/common-hal/analogio/AnalogIn.c b/ports/atmel-samd/common-hal/analogio/AnalogIn.c index e6db95b358..d15be8308a 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogIn.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogIn.c @@ -37,7 +37,7 @@ #include "samd/adc.h" #include "shared-bindings/analogio/AnalogIn.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_adc_sync.h" diff --git a/ports/atmel-samd/common-hal/analogio/AnalogOut.c b/ports/atmel-samd/common-hal/analogio/AnalogOut.c index 2f38fce700..b4d556429c 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogOut.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/audioio/AudioOut.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_dac_sync.h" diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c index eb98cc8d27..447252aace 100644 --- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c +++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c @@ -40,7 +40,7 @@ #include "shared-bindings/audiobusio/I2SOut.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_gpio.h" diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c index c3bdd95793..3711ba9c1b 100644 --- a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c +++ b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c @@ -37,7 +37,7 @@ #include "shared-bindings/audiobusio/PDMIn.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_gpio.h" @@ -58,11 +58,11 @@ #define MIN_MIC_CLOCK 1000000 #ifdef SAMD21 -#define SERCTRL(name) I2S_SERCTRL_ ## name +#define SERCTRL(name) I2S_SERCTRL_##name #endif #ifdef SAM_D5X_E5X -#define SERCTRL(name) I2S_RXCTRL_ ## name +#define SERCTRL(name) I2S_RXCTRL_##name #endif // Set by interrupt handler when DMA block has finished transferring. @@ -80,102 +80,104 @@ void pdmin_reset(void) { pdmin_dma_block_done = false; pdmin_event_channel = EVSYS_SYNCH_NUM; - while (I2S->SYNCBUSY.reg & I2S_SYNCBUSY_ENABLE) {} + while (I2S->SYNCBUSY.reg & I2S_SYNCBUSY_ENABLE) { + } I2S->INTENCLR.reg = I2S_INTENCLR_MASK; I2S->INTFLAG.reg = I2S_INTFLAG_MASK; I2S->CTRLA.reg &= ~I2S_SYNCBUSY_ENABLE; - while (I2S->SYNCBUSY.reg & I2S_SYNCBUSY_ENABLE) {} + while (I2S->SYNCBUSY.reg & I2S_SYNCBUSY_ENABLE) { + } I2S->CTRLA.reg = I2S_CTRLA_SWRST; } // Caller validates that pins are free. -void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self, - const mcu_pin_obj_t* clock_pin, - const mcu_pin_obj_t* data_pin, - uint32_t sample_rate, - uint8_t bit_depth, - bool mono, - uint8_t oversample) { +void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, + const mcu_pin_obj_t *clock_pin, + const mcu_pin_obj_t *data_pin, + uint32_t sample_rate, + uint8_t bit_depth, + bool mono, + uint8_t oversample) { self->clock_pin = clock_pin; // PA10, PA20 -> SCK0, PB11 -> SCK1 #ifdef SAMD21 - if (clock_pin == &pin_PA10 + if (clock_pin == &pin_PA10 #if defined(PIN_PA20) && !defined(IGNORE_PIN_PA20) - || clock_pin == &pin_PA20 - #endif - ) { - self->clock_unit = 0; - #if defined(PIN_PB11) && !defined(IGNORE_PIN_PB11) - } else if (clock_pin == &pin_PB11) { - self->clock_unit = 1; + || clock_pin == &pin_PA20 #endif + ) { + self->clock_unit = 0; + #if defined(PIN_PB11) && !defined(IGNORE_PIN_PB11) + } else if (clock_pin == &pin_PB11) { + self->clock_unit = 1; + #endif #endif #ifdef SAM_D5X_E5X - if (clock_pin == &pin_PA10 || clock_pin == &pin_PB16) { - self->clock_unit = 0; + if (clock_pin == &pin_PA10 || clock_pin == &pin_PB16) { + self->clock_unit = 0; } else if (clock_pin == &pin_PB12 - #if defined(PIN_PB28) && !defined(IGNORE_PIN_PB28) - || data_pin == &pin_PB28) { - #else - ) { + #if defined(PIN_PB28) && !defined(IGNORE_PIN_PB28) + || data_pin == &pin_PB28) { + #else + ) { #endif - self->clock_unit = 1; + self->clock_unit = 1; #endif - } else { - raise_ValueError_invalid_pin_name(MP_QSTR_clock); - } +} else { + raise_ValueError_invalid_pin_name(MP_QSTR_clock); +} - self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1 +self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1 #ifdef SAMD21 - if (false +if (false #if defined(PIN_PA07) && !defined(IGNORE_PIN_PA07) - || data_pin == &pin_PA07 + || data_pin == &pin_PA07 #endif #if defined(PIN_PA19) && !defined(IGNORE_PIN_PA19) - || data_pin == &pin_PA19 + || data_pin == &pin_PA19 #endif - ) { - self->serializer = 0; - } - else if (false + ) { + self->serializer = 0; +} else if (false #if defined(PIN_PA08) && !defined(IGNORE_PIN_PA08) - || data_pin == &pin_PA08 + || data_pin == &pin_PA08 #endif - #if defined (PIN_PB16) && !defined(IGNORE_PIN_PB16) - || data_pin == &pin_PB16 + #if defined(PIN_PB16) && !defined(IGNORE_PIN_PB16) + || data_pin == &pin_PB16 #endif - ) { - self->serializer = 1; + ) { + self->serializer = 1; #endif #ifdef SAM_D5X_E5X - if (data_pin == &pin_PB10 || data_pin == &pin_PA22) { - self->serializer = 1; +if (data_pin == &pin_PB10 || data_pin == &pin_PA22) { + self->serializer = 1; #endif - } else { - raise_ValueError_invalid_pin_name(MP_QSTR_data); - } +}else { + raise_ValueError_invalid_pin_name(MP_QSTR_data); +} - if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) { - mp_raise_NotImplementedError(translate("Only 8 or 16 bit mono with " MP_STRINGIFY(OVERSAMPLING) "x oversampling is supported.")); - } +if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) { + mp_raise_NotImplementedError(translate("Only 8 or 16 bit mono with " MP_STRINGIFY(OVERSAMPLING) "x oversampling is supported.")); +} - turn_on_i2s(); +turn_on_i2s(); - if (I2S->CTRLA.bit.ENABLE == 0) { - I2S->CTRLA.bit.SWRST = 1; - while (I2S->CTRLA.bit.SWRST == 1) {} - } else { - #ifdef SAMD21 - if ((I2S->CTRLA.vec.SEREN & (1 << self->serializer)) != 0) { - mp_raise_RuntimeError(translate("Serializer in use")); - } - #endif - #ifdef SAM_D5X_E5X - if (I2S->CTRLA.bit.RXEN == 1) { - mp_raise_RuntimeError(translate("Serializer in use")); - } - #endif +if (I2S->CTRLA.bit.ENABLE == 0) { + I2S->CTRLA.bit.SWRST = 1; + while (I2S->CTRLA.bit.SWRST == 1) { } +} else { + #ifdef SAMD21 + if ((I2S->CTRLA.vec.SEREN & (1 << self->serializer)) != 0) { + mp_raise_RuntimeError(translate("Serializer in use")); + } + #endif + #ifdef SAM_D5X_E5X + if (I2S->CTRLA.bit.RXEN == 1) { + mp_raise_RuntimeError(translate("Serializer in use")); + } + #endif +} #ifdef SAM_D5X_E5X #define GPIO_I2S_FUNCTION GPIO_PIN_FUNCTION_J #endif @@ -183,69 +185,69 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self, #define GPIO_I2S_FUNCTION GPIO_PIN_FUNCTION_G #endif - uint32_t clock_divisor = (uint32_t) roundf( 48000000.0f / sample_rate / oversample); - float mic_clock_freq = 48000000.0f / clock_divisor; - self->sample_rate = mic_clock_freq / oversample; - if (mic_clock_freq < MIN_MIC_CLOCK || clock_divisor == 0) { - mp_raise_ValueError(translate("sampling rate out of range")); - } - // Find a free GCLK to generate the MCLK signal. - uint8_t gclk = find_free_gclk(clock_divisor); - if (gclk > GCLK_GEN_NUM) { - mp_raise_RuntimeError(translate("Unable to find free GCLK")); - } - self->gclk = gclk; +uint32_t clock_divisor = (uint32_t)roundf(48000000.0f / sample_rate / oversample); +float mic_clock_freq = 48000000.0f / clock_divisor; +self->sample_rate = mic_clock_freq / oversample; +if (mic_clock_freq < MIN_MIC_CLOCK || clock_divisor == 0) { + mp_raise_ValueError(translate("sampling rate out of range")); +} +// Find a free GCLK to generate the MCLK signal. +uint8_t gclk = find_free_gclk(clock_divisor); +if (gclk > GCLK_GEN_NUM) { + mp_raise_RuntimeError(translate("Unable to find free GCLK")); +} +self->gclk = gclk; - enable_clock_generator(self->gclk, CLOCK_48MHZ, clock_divisor); - connect_gclk_to_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit); +enable_clock_generator(self->gclk, CLOCK_48MHZ, clock_divisor); +connect_gclk_to_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit); - // Clock unit configuration +// Clock unit configuration - uint32_t clkctrl = I2S_CLKCTRL_MCKSEL_GCLK | - I2S_CLKCTRL_NBSLOTS(2) | - I2S_CLKCTRL_FSWIDTH_SLOT | - I2S_CLKCTRL_SLOTSIZE_16; +uint32_t clkctrl = I2S_CLKCTRL_MCKSEL_GCLK | + I2S_CLKCTRL_NBSLOTS(2) | + I2S_CLKCTRL_FSWIDTH_SLOT | + I2S_CLKCTRL_SLOTSIZE_16; - // Serializer configuration +// Serializer configuration #ifdef SAMD21 - uint32_t serctrl = (self->clock_unit << I2S_SERCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); +uint32_t serctrl = (self->clock_unit << I2S_SERCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); #endif #ifdef SAM_D5X_E5X - uint32_t serctrl = (self->clock_unit << I2S_RXCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); +uint32_t serctrl = (self->clock_unit << I2S_RXCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); #endif - // Configure the I2S peripheral - i2s_set_enable(false); +// Configure the I2S peripheral +i2s_set_enable(false); - I2S->CLKCTRL[self->clock_unit].reg = clkctrl; +I2S->CLKCTRL[self->clock_unit].reg = clkctrl; #ifdef SAMD21 - I2S->SERCTRL[self->serializer].reg = serctrl; +I2S->SERCTRL[self->serializer].reg = serctrl; #endif #ifdef SAM_D5X_E5X - I2S->RXCTRL.reg = serctrl; +I2S->RXCTRL.reg = serctrl; #endif - i2s_set_enable(true); +i2s_set_enable(true); - // Run the clock all the time. This eliminates startup delay for the microphone, - // which can be 10-100ms. Turn serializer on as needed. - i2s_set_clock_unit_enable(self->clock_unit, true); +// Run the clock all the time. This eliminates startup delay for the microphone, +// which can be 10-100ms. Turn serializer on as needed. +i2s_set_clock_unit_enable(self->clock_unit, true); - claim_pin(clock_pin); - claim_pin(data_pin); +claim_pin(clock_pin); +claim_pin(data_pin); - gpio_set_pin_function(self->clock_pin->number, GPIO_I2S_FUNCTION); - gpio_set_pin_function(self->data_pin->number, GPIO_I2S_FUNCTION); +gpio_set_pin_function(self->clock_pin->number, GPIO_I2S_FUNCTION); +gpio_set_pin_function(self->data_pin->number, GPIO_I2S_FUNCTION); - self->bytes_per_sample = oversample >> 3; - self->bit_depth = bit_depth; +self->bytes_per_sample = oversample >> 3; +self->bit_depth = bit_depth; } -bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t* self) { +bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t *self) { return self->clock_pin == NULL; } -void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t* self) { +void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t *self) { if (common_hal_audiobusio_pdmin_deinited(self)) { return; } @@ -264,24 +266,24 @@ void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t* self) { self->data_pin = NULL; } -uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t* self) { +uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t *self) { return self->bit_depth; } -uint32_t common_hal_audiobusio_pdmin_get_sample_rate(audiobusio_pdmin_obj_t* self) { +uint32_t common_hal_audiobusio_pdmin_get_sample_rate(audiobusio_pdmin_obj_t *self) { return self->sample_rate; } -static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length, - DmacDescriptor* descriptor, - DmacDescriptor* second_descriptor, - uint32_t words_per_buffer, uint8_t words_per_sample, - uint32_t* first_buffer, uint32_t* second_buffer) { +static void setup_dma(audiobusio_pdmin_obj_t *self, uint32_t length, + DmacDescriptor *descriptor, + DmacDescriptor *second_descriptor, + uint32_t words_per_buffer, uint8_t words_per_sample, + uint32_t *first_buffer, uint32_t *second_buffer) { descriptor->BTCTRL.reg = DMAC_BTCTRL_VALID | - DMAC_BTCTRL_BLOCKACT_NOACT | - DMAC_BTCTRL_EVOSEL_BLOCK | - DMAC_BTCTRL_DSTINC | - DMAC_BTCTRL_BEATSIZE_WORD; + DMAC_BTCTRL_BLOCKACT_NOACT | + DMAC_BTCTRL_EVOSEL_BLOCK | + DMAC_BTCTRL_DSTINC | + DMAC_BTCTRL_BEATSIZE_WORD; // Block transfer count is the number of beats per block (aka descriptor). // In this case there are two bytes per beat so divide the length by two. @@ -291,7 +293,7 @@ static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length, } descriptor->BTCNT.reg = block_transfer_count; - descriptor->DSTADDR.reg = ((uint32_t) first_buffer + sizeof(uint32_t) * block_transfer_count); + descriptor->DSTADDR.reg = ((uint32_t)first_buffer + sizeof(uint32_t) * block_transfer_count); descriptor->DESCADDR.reg = 0; if (length * words_per_sample > words_per_buffer) { descriptor->DESCADDR.reg = ((uint32_t)second_descriptor); @@ -314,7 +316,7 @@ static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length, block_transfer_count = length * words_per_sample - words_per_buffer; second_descriptor->DESCADDR.reg = 0; } - second_descriptor->DSTADDR.reg = ((uint32_t) second_buffer + sizeof(uint32_t) * block_transfer_count); + second_descriptor->DSTADDR.reg = ((uint32_t)second_buffer + sizeof(uint32_t) * block_transfer_count); second_descriptor->BTCNT.reg = block_transfer_count; #ifdef SAMD21 @@ -324,10 +326,10 @@ static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length, second_descriptor->SRCADDR.reg = (uint32_t)&I2S->RXDATA; #endif second_descriptor->BTCTRL.reg = DMAC_BTCTRL_VALID | - DMAC_BTCTRL_BLOCKACT_NOACT | - DMAC_BTCTRL_EVOSEL_BLOCK | - DMAC_BTCTRL_DSTINC | - DMAC_BTCTRL_BEATSIZE_WORD; + DMAC_BTCTRL_BLOCKACT_NOACT | + DMAC_BTCTRL_EVOSEL_BLOCK | + DMAC_BTCTRL_DSTINC | + DMAC_BTCTRL_BEATSIZE_WORD; } } @@ -341,7 +343,7 @@ static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length, // higher sample rate than specified. Then after the audio is // recorded, a more expensive filter non-real-time filter could be // used to down-sample and low-pass. -const uint16_t sinc_filter [OVERSAMPLING] = { +const uint16_t sinc_filter[OVERSAMPLING] = { 0, 2, 9, 21, 39, 63, 94, 132, 179, 236, 302, 379, 467, 565, 674, 792, 920, 1055, 1196, 1341, 1487, 1633, 1776, 1913, @@ -353,26 +355,26 @@ const uint16_t sinc_filter [OVERSAMPLING] = { }; #ifdef SAMD21 -#define REPEAT_16_TIMES(X) do { for(uint8_t j=0; j<4; j++) { X X X X } } while (0) +#define REPEAT_16_TIMES(X) do { for (uint8_t j = 0; j < 4; j++) { X X X X } } while (0) #else -#define REPEAT_16_TIMES(X) do { X X X X X X X X X X X X X X X X } while(0) +#define REPEAT_16_TIMES(X) do { X X X X X X X X X X X X X X X X } while (0) #endif static uint16_t filter_sample(uint32_t pdm_samples[4]) { uint16_t running_sum = 0; const uint16_t *filter_ptr = sinc_filter; - for (uint8_t i = 0; i < OVERSAMPLING/16; i++) { + for (uint8_t i = 0; i < OVERSAMPLING / 16; i++) { // The sample is 16-bits right channel in the upper two bytes and 16-bits left channel // in the lower two bytes. // We just ignore the upper bits uint32_t pdm_sample = pdm_samples[i]; - REPEAT_16_TIMES( { - if (pdm_sample & 0x8000) { - running_sum += *filter_ptr; - } - filter_ptr++; - pdm_sample <<= 1; + REPEAT_16_TIMES({ + if (pdm_sample & 0x8000) { + running_sum += *filter_ptr; } + filter_ptr++; + pdm_sample <<= 1; + } ); } return running_sum; @@ -380,8 +382,8 @@ static uint16_t filter_sample(uint32_t pdm_samples[4]) { // output_buffer may be a byte buffer or a halfword buffer. // output_buffer_length is the number of slots, not the number of bytes. -uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* self, - uint16_t* output_buffer, uint32_t output_buffer_length) { +uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t *self, + uint16_t *output_buffer, uint32_t output_buffer_length) { uint8_t dma_channel = dma_allocate_channel(); pdmin_event_channel = find_sync_event_channel_raise(); pdmin_dma_block_done = false; @@ -399,7 +401,7 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se COMPILER_ALIGNED(16) DmacDescriptor second_descriptor; setup_dma(self, output_buffer_length, dma_descriptor(dma_channel), &second_descriptor, - words_per_buffer, words_per_sample, first_buffer, second_buffer); + words_per_buffer, words_per_sample, first_buffer, second_buffer); uint8_t trigger_source = I2S_DMAC_ID_RX_0; #ifdef SAMD21 @@ -444,7 +446,7 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se // Flip back and forth between processing the first and second buffers. uint32_t *buffer = first_buffer; - DmacDescriptor* descriptor = dma_descriptor(dma_channel); + DmacDescriptor *descriptor = dma_descriptor(dma_channel); if (buffers_processed % 2 == 1) { buffer = second_buffer; descriptor = &second_descriptor; @@ -459,7 +461,7 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se uint16_t value = filter_sample(buffer + i * words_per_sample); if (self->bit_depth == 8) { // Truncate to 8 bits. - ((uint8_t*) output_buffer)[values_output] = value >> 8; + ((uint8_t *)output_buffer)[values_output] = value >> 8; } else { output_buffer[values_output] = value; } @@ -471,7 +473,7 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se // Compute how many more samples we need, and if the last buffer is the last // set of samples needed, adjust the DMA count to only fetch as necessary. remaining_samples_needed = output_buffer_length - values_output; - if (remaining_samples_needed <= samples_per_buffer*2 && + if (remaining_samples_needed <= samples_per_buffer * 2 && remaining_samples_needed > samples_per_buffer) { // Adjust the DMA settings for the current buffer, which will be processed // after the other buffer, which is now receiving samples via DMA. @@ -484,7 +486,7 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se // Set up to receive the last set of samples (don't include the alternate buffer, now in use). uint32_t samples_needed_for_last_buffer = remaining_samples_needed - samples_per_buffer; descriptor->BTCNT.reg = samples_needed_for_last_buffer * words_per_sample; - descriptor->DSTADDR.reg = ((uint32_t) buffer) + descriptor->DSTADDR.reg = ((uint32_t)buffer) + samples_needed_for_last_buffer * words_per_sample * sizeof(buffer[0]); // Break chain to alternate buffer. diff --git a/ports/atmel-samd/common-hal/audioio/AudioOut.c b/ports/atmel-samd/common-hal/audioio/AudioOut.c index 1e1eb80e9c..a565a77042 100644 --- a/ports/atmel-samd/common-hal/audioio/AudioOut.c +++ b/ports/atmel-samd/common-hal/audioio/AudioOut.c @@ -35,7 +35,7 @@ #include "shared-bindings/audioio/AudioOut.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_gpio.h" diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c index c539cc3abc..2ca193c99f 100644 --- a/ports/atmel-samd/common-hal/busio/I2C.c +++ b/ports/atmel-samd/common-hal/busio/I2C.c @@ -35,7 +35,7 @@ #include "samd/sercom.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "common-hal/busio/__init__.h" diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c index fde15824c8..3bb0cabf9e 100644 --- a/ports/atmel-samd/common-hal/busio/SPI.c +++ b/ports/atmel-samd/common-hal/busio/SPI.c @@ -33,6 +33,7 @@ #include "peripheral_clk_config.h" #include "supervisor/board.h" +#include "supervisor/shared/translate/translate.h" #include "common-hal/busio/__init__.h" #include "hal/include/hal_gpio.h" diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c index ce471f8c1a..3a9b628e0b 100644 --- a/ports/atmel-samd/common-hal/busio/UART.c +++ b/ports/atmel-samd/common-hal/busio/UART.c @@ -34,7 +34,7 @@ #include "py/mperrno.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/tick.h" #include "hpl_sercom_config.h" diff --git a/ports/atmel-samd/common-hal/countio/Counter.c b/ports/atmel-samd/common-hal/countio/Counter.c index c68b9e18ef..e3694615ab 100644 --- a/ports/atmel-samd/common-hal/countio/Counter.c +++ b/ports/atmel-samd/common-hal/countio/Counter.c @@ -7,7 +7,7 @@ #include "eic_handler.h" #include "samd/external_interrupts.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_countio_counter_construct(countio_counter_obj_t *self, const mcu_pin_obj_t *pin, countio_edge_t edge, digitalio_pull_t pull) { diff --git a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c index dee927ce88..8358ac4d87 100644 --- a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c +++ b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c @@ -34,7 +34,7 @@ #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/digitalio/DigitalInOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" digitalinout_result_t common_hal_digitalio_digitalinout_construct( digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) { diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c index 4a6a620603..22200c5d1c 100644 --- a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c +++ b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c @@ -48,7 +48,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/time/__init__.h" #include "supervisor/shared/tick.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #ifdef SAMD21 #include "hpl/gclk/hpl_gclk_base.h" diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.c b/ports/atmel-samd/common-hal/microcontroller/Pin.c index 1460ece59e..b36286e5f2 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Pin.c +++ b/ports/atmel-samd/common-hal/microcontroller/Pin.c @@ -27,6 +27,7 @@ #include "py/runtime.h" #include "shared-bindings/microcontroller/Pin.h" +#include "supervisor/shared/translate/translate.h" #include "atmel_start_pins.h" #include "hal/include/hal_gpio.h" diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c index 6856f4a48b..60b35a2c5c 100644 --- a/ports/atmel-samd/common-hal/microcontroller/__init__.c +++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c @@ -36,7 +36,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Processor.h" #include "supervisor/shared/safe_mode.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_mcu_delay_us(uint32_t delay) { mp_hal_delay_us(delay); diff --git a/ports/atmel-samd/common-hal/ps2io/Ps2.c b/ports/atmel-samd/common-hal/ps2io/Ps2.c index ad7b110803..43f40aa48e 100644 --- a/ports/atmel-samd/common-hal/ps2io/Ps2.c +++ b/ports/atmel-samd/common-hal/ps2io/Ps2.c @@ -43,7 +43,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/ps2io/Ps2.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define STATE_IDLE 0 #define STATE_RECV 1 diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c index 8cc455c958..8bf889bed3 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseIn.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseIn.c @@ -44,7 +44,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/pulseio/PulseIn.h" #include "supervisor/shared/tick.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/port.h" // This timer is shared amongst all PulseIn objects as a higher resolution clock. diff --git a/ports/atmel-samd/common-hal/pulseio/PulseOut.c b/ports/atmel-samd/common-hal/pulseio/PulseOut.c index b0407a1136..dc98e4bd18 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseOut.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseOut.c @@ -36,7 +36,7 @@ #include "py/gc.h" #include "py/runtime.h" #include "shared-bindings/pulseio/PulseOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "timer_handler.h" // This timer is shared amongst all PulseOut objects under the assumption that diff --git a/ports/atmel-samd/common-hal/pwmio/PWMOut.c b/ports/atmel-samd/common-hal/pwmio/PWMOut.c index 854e70094f..c6e9e07304 100644 --- a/ports/atmel-samd/common-hal/pwmio/PWMOut.c +++ b/ports/atmel-samd/common-hal/pwmio/PWMOut.c @@ -38,7 +38,7 @@ #include "hal/utils/include/utils_repeat_macro.h" #include "samd/pins.h" #include "samd/timers.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #undef ENABLE diff --git a/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c b/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c index 856fe04dbc..d253e0967e 100644 --- a/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c @@ -33,7 +33,7 @@ #include "eic_handler.h" #include "samd/external_interrupts.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self, const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) { diff --git a/ports/atmel-samd/common-hal/rtc/RTC.c b/ports/atmel-samd/common-hal/rtc/RTC.c index 455f176763..0ebb61e11b 100644 --- a/ports/atmel-samd/common-hal/rtc/RTC.c +++ b/ports/atmel-samd/common-hal/rtc/RTC.c @@ -37,7 +37,7 @@ #include "shared-bindings/rtc/__init__.h" #include "shared-bindings/rtc/RTC.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // This is the time in seconds since 2000 that the RTC was started. // TODO: Change the offset to ticks so that it can be a subsecond adjustment. diff --git a/ports/atmel-samd/common-hal/sdioio/SDCard.c b/ports/atmel-samd/common-hal/sdioio/SDCard.c index 10ccb63a55..7ce8a1e1b1 100644 --- a/ports/atmel-samd/common-hal/sdioio/SDCard.c +++ b/ports/atmel-samd/common-hal/sdioio/SDCard.c @@ -32,7 +32,7 @@ #include "shared-bindings/sdioio/SDCard.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "genhdr/sdiodata.h" diff --git a/ports/atmel-samd/common-hal/touchio/TouchIn.c b/ports/atmel-samd/common-hal/touchio/TouchIn.c index 1c0062d52a..c3fae041fb 100644 --- a/ports/atmel-samd/common-hal/touchio/TouchIn.c +++ b/ports/atmel-samd/common-hal/touchio/TouchIn.c @@ -33,7 +33,7 @@ #include "py/mphal.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/touchio/TouchIn.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Native touchio only exists for SAMD21 #ifdef SAMD21 diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 9cd5b39d70..38abbb81f6 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -78,6 +78,8 @@ endif SUPEROPT_GC = 0 SUPEROPT_VM = 0 +CIRCUITPY_LTO = one + ifeq ($(CIRCUITPY_FULL_BUILD),0) # On the smallest boards, this saves about 180 bytes. On other boards, it may -increase- space used. CFLAGS_BOARD = -fweb -frename-registers @@ -94,6 +96,12 @@ ifeq ($(CHIP_FAMILY),samd51) # No native touchio on SAMD51. CIRCUITPY_TOUCHIO_USE_NATIVE = 0 +ifeq ($(CIRCUITPY_FULL_BUILD),1) +CIRCUITPY_LTO ?= balanced +else +CIRCUITPY_LTO ?= one +endif + # The ?='s allow overriding in mpconfigboard.mk. diff --git a/ports/broadcom/common-hal/digitalio/DigitalInOut.c b/ports/broadcom/common-hal/digitalio/DigitalInOut.c index 38a7cbb2b8..d8ac3472de 100644 --- a/ports/broadcom/common-hal/digitalio/DigitalInOut.c +++ b/ports/broadcom/common-hal/digitalio/DigitalInOut.c @@ -32,7 +32,7 @@ #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/digitalio/DigitalInOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "peripherals/broadcom/gpio.h" diff --git a/ports/broadcom/common-hal/sdioio/SDCard.c b/ports/broadcom/common-hal/sdioio/SDCard.c index 85a84ac213..27b36041de 100644 --- a/ports/broadcom/common-hal/sdioio/SDCard.c +++ b/ports/broadcom/common-hal/sdioio/SDCard.c @@ -35,7 +35,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/__init__.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "peripherals/broadcom/cpu.h" #include "peripherals/broadcom/defines.h" diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 96360d06bd..acdf496edb 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -165,8 +165,6 @@ else # RISC-V is larger than xtensa so do -Os for it OPTIMIZATION_FLAGS ?= -Os endif - # TODO: Test with -flto - ### CFLAGS += -flto endif # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c index 4d390e615c..a81a8add22 100644 --- a/ports/espressif/common-hal/analogio/AnalogIn.c +++ b/ports/espressif/common-hal/analogio/AnalogIn.c @@ -28,7 +28,7 @@ #include "shared-bindings/analogio/AnalogIn.h" #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "components/driver/include/driver/adc_common.h" #include "components/esp_adc_cal/include/esp_adc_cal.h" diff --git a/ports/espressif/common-hal/analogio/AnalogOut.c b/ports/espressif/common-hal/analogio/AnalogOut.c index 2bceefc9f7..cc99d4faa1 100644 --- a/ports/espressif/common-hal/analogio/AnalogOut.c +++ b/ports/espressif/common-hal/analogio/AnalogOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #ifdef CONFIG_IDF_TARGET_ESP32S2 #include "components/driver/include/driver/dac_common.h" diff --git a/ports/espressif/common-hal/audiobusio/I2SOut.c b/ports/espressif/common-hal/audiobusio/I2SOut.c index 6548f46071..440151e881 100644 --- a/ports/espressif/common-hal/audiobusio/I2SOut.c +++ b/ports/espressif/common-hal/audiobusio/I2SOut.c @@ -42,7 +42,7 @@ #include "shared-bindings/audiobusio/I2SOut.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "driver/i2s.h" diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c index 23906fe2d2..92bd4fb157 100644 --- a/ports/espressif/common-hal/busio/I2C.c +++ b/ports/espressif/common-hal/busio/I2C.c @@ -32,7 +32,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) { diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 27323fecf4..7322abc8ef 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -38,7 +38,7 @@ #include "py/runtime.h" #include "py/stream.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/tick.h" uint8_t never_reset_uart_mask = 0; diff --git a/ports/espressif/common-hal/countio/Counter.c b/ports/espressif/common-hal/countio/Counter.c index d18196051f..bdfc44522c 100644 --- a/ports/espressif/common-hal/countio/Counter.c +++ b/ports/espressif/common-hal/countio/Counter.c @@ -29,7 +29,7 @@ #include "common-hal/microcontroller/Pin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_countio_counter_construct(countio_counter_obj_t *self, const mcu_pin_obj_t *pin, countio_edge_t edge, digitalio_pull_t pull) { diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c index 1ab232b29a..a3e8f41147 100644 --- a/ports/espressif/common-hal/digitalio/DigitalInOut.c +++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c @@ -26,7 +26,7 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "components/driver/include/driver/gpio.h" diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c index e4782c30ab..5ceefa411f 100644 --- a/ports/espressif/common-hal/microcontroller/Processor.c +++ b/ports/espressif/common-hal/microcontroller/Processor.c @@ -33,7 +33,7 @@ #include "common-hal/microcontroller/Processor.h" #include "shared-bindings/microcontroller/Processor.h" #include "shared-bindings/microcontroller/ResetReason.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "esp_sleep.h" #include "esp_system.h" diff --git a/ports/litex/Makefile b/ports/litex/Makefile index 6fe9e46bec..6b1e33c8d1 100644 --- a/ports/litex/Makefile +++ b/ports/litex/Makefile @@ -81,8 +81,6 @@ ifeq ($(DEBUG), 1) else CFLAGS += -DNDEBUG -ggdb3 OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions - # TODO: Test with -flto - ### CFLAGS += -flto endif # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk @@ -99,7 +97,7 @@ LDFLAGS = $(CFLAGS) -Wl,-nostdlib -Wl,-T,$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -W LIBS := -lgcc -lc -LDFLAGS += -flto -ffreestanding -nostartfiles -Wl,--gc-section -Wl,-Bstatic -Wl,-melf32lriscv -nostartfiles \ +LDFLAGS += -ffreestanding -nostartfiles -Wl,--gc-section -Wl,-Bstatic -Wl,-melf32lriscv -nostartfiles \ -Wl,--no-warn-mismatch \ -Wl,--build-id=none diff --git a/ports/litex/common-hal/digitalio/DigitalInOut.c b/ports/litex/common-hal/digitalio/DigitalInOut.c index 96cc95dfa6..a48d698fcb 100644 --- a/ports/litex/common-hal/digitalio/DigitalInOut.c +++ b/ports/litex/common-hal/digitalio/DigitalInOut.c @@ -27,7 +27,7 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "csr.h" diff --git a/ports/litex/common-hal/microcontroller/Processor.c b/ports/litex/common-hal/microcontroller/Processor.c index ff2f041876..12c3787c79 100644 --- a/ports/litex/common-hal/microcontroller/Processor.c +++ b/ports/litex/common-hal/microcontroller/Processor.c @@ -31,7 +31,7 @@ #include "common-hal/microcontroller/Processor.h" #include "shared-bindings/microcontroller/Processor.h" #include "shared-bindings/microcontroller/ResetReason.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "csr.h" #include "generated/soc.h" diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile index 4a74b8fce5..4b05c91714 100644 --- a/ports/mimxrt10xx/Makefile +++ b/ports/mimxrt10xx/Makefile @@ -75,7 +75,7 @@ INC += \ # NDEBUG disables assert() statements. This reduces code size pretty dramatically, per tannewt. -CFLAGS += -Os -ftree-vrp -DNDEBUG -ffreestanding +CFLAGS += -ftree-vrp -DNDEBUG # TinyUSB defines CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=1024 @@ -84,12 +84,8 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_ # Never set -fno-inline because we use inline to move small functions into routines that must be # in RAM. If inlining is disallowed, then we may end up calling a function in flash when we cannot. ifeq ($(DEBUG), 1) - # You may want to disable -flto if it interferes with debugging. - # CFLAGS += -flto -flto-partition=none # You may want to enable these flags to make setting breakpoints easier. CFLAGS += -fno-ipa-sra -else - #CFLAGS += -flto -flto-partition=none endif CFLAGS += $(INC) -ggdb -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes @@ -105,7 +101,6 @@ CFLAGS += \ -mfloat-abi=hard \ -mfpu=fpv5-sp-d16 \ -DCPU_$(CHIP_VARIANT) \ - -DDEBUG \ -DIMXRT10XX \ -g3 -Wno-unused-parameter \ -ffunction-sections -fdata-sections -fstack-usage diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c b/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c index de807e7e5c..14e1faab09 100644 --- a/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c +++ b/ports/mimxrt10xx/common-hal/analogio/AnalogOut.c @@ -29,7 +29,7 @@ #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c index 27753f47dc..dde7b3badd 100644 --- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c +++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c @@ -36,7 +36,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/digitalio/DigitalInOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c index 3ea454a2b3..8de63061ad 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Processor.h" #include "supervisor/shared/safe_mode.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define DBL_TAP_REG SNVS->LPGPR[3] diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index 29f72e21e4..97892b1095 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -35,7 +35,7 @@ #include "fsl_pwm.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "periph.h" // Debug print support set to zero to enable debug printing diff --git a/ports/mimxrt10xx/common-hal/rtc/RTC.c b/ports/mimxrt10xx/common-hal/rtc/RTC.c index a58b37ae62..7ed65a3499 100644 --- a/ports/mimxrt10xx/common-hal/rtc/RTC.c +++ b/ports/mimxrt10xx/common-hal/rtc/RTC.c @@ -33,7 +33,7 @@ #include "shared-bindings/rtc/__init__.h" #include "shared-bindings/rtc/RTC.h" #include "common-hal/rtc/RTC.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "fsl_snvs_hp.h" diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 68bc3cc41c..bbe102ffc8 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -84,14 +84,6 @@ INC += -I../../lib/mp-readline INC += -I../../lib/tinyusb/src INC += -I../../supervisor/shared/usb -ifeq ($(MCU_CHIP),nrf52833) - OPTIMIZATION_FLAGS ?= -Os -flto -flto-partition=one -else - ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) - OPTIMIZATION_FLAGS ?= -Os -flto - endif -endif - #Debugging/Optimization ifeq ($(DEBUG), 1) CFLAGS += -ggdb3 diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c index 347426af99..b9d4b6a199 100644 --- a/ports/nrf/common-hal/analogio/AnalogIn.c +++ b/ports/nrf/common-hal/analogio/AnalogIn.c @@ -29,7 +29,7 @@ #include "shared-bindings/analogio/AnalogIn.h" #include "shared-bindings/microcontroller/Pin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "nrf_saadc.h" #include "nrf_gpio.h" @@ -77,7 +77,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { // Something else might have used the ADC in a different way, // so we completely re-initialize it. - nrf_saadc_value_t value; + nrf_saadc_value_t value = -1; const nrf_saadc_channel_config_t config = { .resistor_p = NRF_SAADC_RESISTOR_DISABLED, diff --git a/ports/nrf/common-hal/analogio/AnalogOut.c b/ports/nrf/common-hal/analogio/AnalogOut.c index 4efd56795a..38ff935674 100644 --- a/ports/nrf/common-hal/analogio/AnalogOut.c +++ b/ports/nrf/common-hal/analogio/AnalogOut.c @@ -31,7 +31,7 @@ #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c index 6728bf1e44..bc6302cb42 100644 --- a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/tick.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // TODO: This should be the same size as PWMOut.c:pwms[], but there's no trivial way to accomplish that STATIC audiopwmio_pwmaudioout_obj_t *active_audio[4]; diff --git a/ports/nrf/common-hal/busio/I2C.c b/ports/nrf/common-hal/busio/I2C.c index 6c645a512b..2bd1416f5a 100644 --- a/ports/nrf/common-hal/busio/I2C.c +++ b/ports/nrf/common-hal/busio/I2C.c @@ -32,7 +32,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "nrfx_twim.h" #include "nrfx_spim.h" diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c index 5c08f50012..04c502a4bd 100644 --- a/ports/nrf/common-hal/busio/UART.c +++ b/ports/nrf/common-hal/busio/UART.c @@ -33,7 +33,7 @@ #include "py/mperrno.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "nrfx_uarte.h" #include "nrf_gpio.h" diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nrf/common-hal/digitalio/DigitalInOut.c index b42d7dc704..95e488f3b7 100644 --- a/ports/nrf/common-hal/digitalio/DigitalInOut.c +++ b/ports/nrf/common-hal/digitalio/DigitalInOut.c @@ -26,7 +26,7 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "nrf_gpio.h" diff --git a/ports/nrf/common-hal/microcontroller/Processor.c b/ports/nrf/common-hal/microcontroller/Processor.c index fa2dfad6a4..2fca3a3c0a 100644 --- a/ports/nrf/common-hal/microcontroller/Processor.c +++ b/ports/nrf/common-hal/microcontroller/Processor.c @@ -31,7 +31,6 @@ #include "common-hal/alarm/__init__.h" #include "shared-bindings/microcontroller/ResetReason.h" -#include "supervisor/shared/translate.h" #include "nrfx_saadc.h" #ifdef BLUETOOTH_SD @@ -72,7 +71,7 @@ uint32_t common_hal_mcu_processor_get_frequency(void) { } float common_hal_mcu_processor_get_voltage(void) { - nrf_saadc_value_t value; + nrf_saadc_value_t value = -1; const nrf_saadc_channel_config_t config = { .resistor_p = NRF_SAADC_RESISTOR_DISABLED, diff --git a/ports/nrf/common-hal/pulseio/PulseOut.c b/ports/nrf/common-hal/pulseio/PulseOut.c index 1c3c317a05..2f822b4184 100644 --- a/ports/nrf/common-hal/pulseio/PulseOut.c +++ b/ports/nrf/common-hal/pulseio/PulseOut.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "shared-bindings/pulseio/PulseOut.h" #include "shared-bindings/pwmio/PWMOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // A single timer is shared amongst all PulseOut objects under the assumption that // the code is single threaded. diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nrf/common-hal/pwmio/PWMOut.c index 619acdfab6..1bd38e7a6e 100644 --- a/ports/nrf/common-hal/pwmio/PWMOut.c +++ b/ports/nrf/common-hal/pwmio/PWMOut.c @@ -30,7 +30,7 @@ #include "py/runtime.h" #include "common-hal/pwmio/PWMOut.h" #include "shared-bindings/pwmio/PWMOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "nrf_gpio.h" diff --git a/ports/nrf/common-hal/rtc/RTC.c b/ports/nrf/common-hal/rtc/RTC.c index ecc687b5e9..29d308eccc 100644 --- a/ports/nrf/common-hal/rtc/RTC.c +++ b/ports/nrf/common-hal/rtc/RTC.c @@ -33,7 +33,7 @@ #include "common-hal/rtc/RTC.h" #include "shared-bindings/rtc/RTC.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // This is the time in seconds since 2000 that the RTC was started. __attribute__((section(".uninitialized"))) static uint32_t rtc_offset[3]; diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index 6cbbce1846..4bb4f3dfb4 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -71,6 +71,11 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840 # Defined here because system_nrf52840.c doesn't #include any of our own include files. CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS +ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) + OPTIMIZATION_FLAGS ?= -Os + CIRCUITPY_LTO=balanced +endif + else ifeq ($(MCU_CHIP),nrf52833) MCU_SERIES = m4 @@ -87,5 +92,8 @@ SOFTDEV_VERSION ?= 7.0.1 BOOT_SETTING_ADDR = 0x7F000 NRF_DEFINES += -DNRF52833_XXAA -DNRF52833 +OPTIMIZATION_FLAGS ?= -Os + +CIRCUITPY_LTO=one endif endif diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 2c7efb09d8..1203f4abac 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -40,7 +40,7 @@ #include "py/mperrno.h" #include "py/objproperty.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class StateMachine: diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c index d164d9a18b..b827068e1a 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c @@ -28,7 +28,7 @@ #include "shared-bindings/analogio/AnalogIn.h" #include "shared-bindings/microcontroller/Pin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2_common/hardware_adc/include/hardware/adc.h" diff --git a/ports/raspberrypi/common-hal/analogio/AnalogOut.c b/ports/raspberrypi/common-hal/analogio/AnalogOut.c index 4efd56795a..38ff935674 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogOut.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogOut.c @@ -31,7 +31,7 @@ #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_AnalogOut); diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c index 037163472d..7db053a39d 100644 --- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c +++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-module/audiocore/__init__.h" #include "bindings/rp2pio/StateMachine.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" const uint16_t i2s_program[] = { // ; Load the next set of samples diff --git a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c index 8301f9fde4..c3aadd2bbe 100644 --- a/ports/raspberrypi/common-hal/audiobusio/PDMIn.c +++ b/ports/raspberrypi/common-hal/audiobusio/PDMIn.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "shared-bindings/audiobusio/PDMIn.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "audio_dma.h" diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c index 2f09124f4b..8b5c3accec 100644 --- a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c @@ -39,7 +39,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Processor.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2040/hardware_structs/include/hardware/structs/dma.h" #include "src/rp2_common/hardware_pwm/include/hardware/pwm.h" diff --git a/ports/raspberrypi/common-hal/countio/Counter.c b/ports/raspberrypi/common-hal/countio/Counter.c index 0ae773bdf3..44db126656 100644 --- a/ports/raspberrypi/common-hal/countio/Counter.c +++ b/ports/raspberrypi/common-hal/countio/Counter.c @@ -2,7 +2,7 @@ #include "py/runtime.h" #include "py/mpstate.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/countio/Edge.h" #include "shared-bindings/digitalio/Pull.h" diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c index a8a5a6b4d9..ef431d8506 100644 --- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c +++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c @@ -32,7 +32,7 @@ #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/digitalio/DigitalInOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c index ed68835e71..3b656edc07 100644 --- a/ports/raspberrypi/common-hal/microcontroller/__init__.c +++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c @@ -38,7 +38,7 @@ #include "supervisor/filesystem.h" #include "supervisor/port.h" #include "supervisor/shared/safe_mode.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2040/hardware_structs/include/hardware/structs/sio.h" #include "src/rp2_common/hardware_sync/include/hardware/sync.h" diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.c b/ports/raspberrypi/common-hal/pulseio/PulseIn.c index 71633fcef7..33e6b0d89c 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.c @@ -32,7 +32,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/pulseio/PulseIn.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "bindings/rp2pio/StateMachine.h" #include "common-hal/pulseio/PulseIn.h" diff --git a/ports/raspberrypi/common-hal/pulseio/PulseOut.c b/ports/raspberrypi/common-hal/pulseio/PulseOut.c index 7704fdff6f..881e003579 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseOut.c +++ b/ports/raspberrypi/common-hal/pulseio/PulseOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/pwmio/PWMOut.h" #include "shared-bindings/microcontroller/__init__.h" #include "common-hal/pwmio/PWMOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2040/hardware_structs/include/hardware/structs/pwm.h" #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" #include "src/rp2_common/hardware_pwm/include/hardware/pwm.h" diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c index 958e848b9f..e6f88f8894 100644 --- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c +++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c @@ -32,7 +32,7 @@ #include "shared-bindings/pwmio/PWMOut.h" #include "shared-bindings/microcontroller/Processor.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "src/rp2040/hardware_regs/include/hardware/platform_defs.h" #include "src/rp2_common/hardware_clocks/include/hardware/clocks.h" diff --git a/ports/stm/Makefile b/ports/stm/Makefile index 5eeff2c80a..afde51bdc0 100755 --- a/ports/stm/Makefile +++ b/ports/stm/Makefile @@ -88,8 +88,6 @@ else CFLAGS += -DNDEBUG OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions CFLAGS += -ggdb3 - # TODO: Test with -flto - # CFLAGS += -flto endif # to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk diff --git a/ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm/common-hal/analogio/AnalogIn.c index 9ec93ccc84..7bed932c71 100644 --- a/ports/stm/common-hal/analogio/AnalogIn.c +++ b/ports/stm/common-hal/analogio/AnalogIn.c @@ -27,7 +27,7 @@ #include "common-hal/analogio/AnalogIn.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c index b2cdd50153..3c2860c9ad 100644 --- a/ports/stm/common-hal/analogio/AnalogOut.c +++ b/ports/stm/common-hal/analogio/AnalogOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/microcontroller/Pin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "common-hal/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c index 3ff437c803..4faa5ca2ef 100644 --- a/ports/stm/common-hal/busio/I2C.c +++ b/ports/stm/common-hal/busio/I2C.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "shared-bindings/microcontroller/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/Pin.h" // I2C timing specs for the H7 and F7 diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index f772cdeec0..1daa29a923 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -33,7 +33,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "supervisor/board.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/Pin.h" // Note that any bugs introduced in this file can cause crashes at startup diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c index d3fdb83c88..171e915dd9 100644 --- a/ports/stm/common-hal/busio/UART.c +++ b/ports/stm/common-hal/busio/UART.c @@ -35,7 +35,7 @@ #include "py/mperrno.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define ALL_UARTS 0xFFFF diff --git a/ports/stm/common-hal/digitalio/DigitalInOut.c b/ports/stm/common-hal/digitalio/DigitalInOut.c index 39c72b73c9..3a0e27943b 100644 --- a/ports/stm/common-hal/digitalio/DigitalInOut.c +++ b/ports/stm/common-hal/digitalio/DigitalInOut.c @@ -28,7 +28,7 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/microcontroller/Pin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // The HAL is sparse on obtaining register information, so we use the LLs here. #if (CPY_STM32H7) diff --git a/ports/stm/common-hal/microcontroller/Processor.c b/ports/stm/common-hal/microcontroller/Processor.c index 13c661a60a..67cf9a73e4 100644 --- a/ports/stm/common-hal/microcontroller/Processor.c +++ b/ports/stm/common-hal/microcontroller/Processor.c @@ -32,7 +32,7 @@ #endif #include "common-hal/microcontroller/Processor.h" #include "shared-bindings/microcontroller/ResetReason.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include STM32_HAL_H diff --git a/ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm/common-hal/pulseio/PulseOut.c index fe3caa08b2..7725d8cdde 100644 --- a/ports/stm/common-hal/pulseio/PulseOut.c +++ b/ports/stm/common-hal/pulseio/PulseOut.c @@ -33,7 +33,7 @@ #include "py/runtime.h" #include "shared-bindings/pulseio/PulseOut.h" #include "shared-bindings/pwmio/PWMOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include STM32_HAL_H #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c index 6710f43f7d..45f00b901b 100644 --- a/ports/stm/common-hal/pwmio/PWMOut.c +++ b/ports/stm/common-hal/pwmio/PWMOut.c @@ -29,7 +29,7 @@ #include "py/runtime.h" #include "common-hal/pwmio/PWMOut.h" #include "shared-bindings/pwmio/PWMOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/__init__.h" #include STM32_HAL_H diff --git a/ports/stm/common-hal/sdioio/SDCard.c b/ports/stm/common-hal/sdioio/SDCard.c index 40e6eddae1..8eeae2781d 100644 --- a/ports/stm/common-hal/sdioio/SDCard.c +++ b/ports/stm/common-hal/sdioio/SDCard.c @@ -32,7 +32,7 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/util.h" #include "supervisor/board.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c index f0054648fc..371b8f414b 100644 --- a/ports/stm/peripherals/timers.c +++ b/ports/stm/peripherals/timers.c @@ -29,7 +29,7 @@ #include "py/gc.h" #include "py/obj.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c index d1966c51f0..d8b63b571e 100644 --- a/ports/unix/modffi.c +++ b/ports/unix/modffi.c @@ -38,7 +38,7 @@ #include "py/objint.h" #include "py/gc.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" /* * modffi uses character codes to encode a value type, based on "struct" diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c index 04ff325eef..987c70b26e 100644 --- a/ports/unix/modmachine.c +++ b/ports/unix/modmachine.c @@ -36,7 +36,7 @@ #include "extmod/machine_signal.h" #include "extmod/machine_pulse.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PLAT_DEV_MEM #include diff --git a/py/argcheck.c b/py/argcheck.c index 592b35940e..cabfaeeaae 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -29,7 +29,7 @@ #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) { // TODO maybe take the function name as an argument so we can print nicer error messages diff --git a/py/bc.c b/py/bc.c index 33b94c4a9f..e1645dbff0 100644 --- a/py/bc.c +++ b/py/bc.c @@ -33,7 +33,7 @@ #include "py/bc0.h" #include "py/bc.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_DEBUG_VERBOSE // print debugging info #define DEBUG_PRINT (1) diff --git a/py/binary.c b/py/binary.c index 06f0157567..439993c0f7 100644 --- a/py/binary.c +++ b/py/binary.c @@ -36,7 +36,7 @@ #include "py/objint.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Helpers to work with binary-encoded data diff --git a/py/builtinevex.c b/py/builtinevex.c index a96a3a5344..46d4a1277a 100644 --- a/py/builtinevex.c +++ b/py/builtinevex.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "py/builtin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_COMPILE diff --git a/py/builtinhelp.c b/py/builtinhelp.c index 7411c57aae..86632f6dde 100644 --- a/py/builtinhelp.c +++ b/py/builtinhelp.c @@ -32,6 +32,8 @@ #include "py/mpconfig.h" #include "py/objmodule.h" +#include "supervisor/shared/translate/translate.h" + #if MICROPY_PY_BUILTINS_HELP const char mp_help_default_text[] = diff --git a/py/builtinimport.c b/py/builtinimport.c index d938cde7ea..92f3150306 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -39,7 +39,7 @@ #include "py/builtin.h" #include "py/frozenmod.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_DEBUG_VERBOSE // print debugging info #define DEBUG_PRINT (1) diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 2514cbaa2b..681eae779b 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -51,8 +51,7 @@ BASE_CFLAGS = \ -DCIRCUITPY_SOFTWARE_SAFE_MODE=0x0ADABEEF \ -DCIRCUITPY_CANARY_WORD=0xADAF00 \ -DCIRCUITPY_SAFE_RESTART_WORD=0xDEADBEEF \ - -DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" \ - --param max-inline-insns-single=500 + -DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" # Use these flags to debug build times and header includes. # -ftime-report @@ -67,6 +66,13 @@ else CFLAGS += -DCIRCUITPY_DEBUG=0 endif +CIRCUITPY_LTO ?= 0 +ifneq ($(CIRCUITPY_LTO),0) +CFLAGS += -DCIRCUITPY_LTO=1 -flto=auto -flto-partition=$(CIRCUITPY_LTO) +else +CFLAGS += -DCIRCUITPY_LTO=0 +endif + ### # Handle frozen modules. @@ -756,3 +762,6 @@ endif check-release-needs-clean-build: @echo "RELEASE_NEEDS_CLEAN_BUILD = $(RELEASE_NEEDS_CLEAN_BUILD)" + +# Ignore these errors +$(BUILD)/lib/libm/kf_rem_pio2.o: CFLAGS += -Wno-maybe-uninitialized diff --git a/py/compile.c b/py/compile.c index e5f341a656..63f96f6085 100644 --- a/py/compile.c +++ b/py/compile.c @@ -37,7 +37,7 @@ #include "py/asmbase.h" #include "py/persistentcode.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_ENABLE_COMPILER @@ -92,7 +92,7 @@ typedef enum { #define NATIVE_EMITTER(f) emit_native_table[mp_dynamic_compiler.native_arch]->emit_##f #define NATIVE_EMITTER_TABLE emit_native_table[mp_dynamic_compiler.native_arch] -STATIC const emit_method_table_t *emit_native_table[] = { +STATIC const emit_method_table_t * emit_native_table[] = { NULL, &emit_native_x86_method_table, &emit_native_x64_method_table, @@ -131,7 +131,7 @@ STATIC const emit_method_table_t *emit_native_table[] = { #define ASM_EMITTER(f) emit_asm_table[mp_dynamic_compiler.native_arch]->asm_##f #define ASM_EMITTER_TABLE emit_asm_table[mp_dynamic_compiler.native_arch] -STATIC const emit_inline_asm_method_table_t *emit_asm_table[] = { +STATIC const emit_inline_asm_method_table_t * emit_asm_table[] = { NULL, NULL, NULL, @@ -3527,7 +3527,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f switch (s->emit_options) { - #if MICROPY_EMIT_NATIVE + #if MICROPY_EMIT_NATIVE case MP_EMIT_OPT_NATIVE_PYTHON: case MP_EMIT_OPT_VIPER: if (emit_native == NULL) { @@ -3536,7 +3536,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f comp->emit_method_table = NATIVE_EMITTER_TABLE; comp->emit = emit_native; break; - #endif // MICROPY_EMIT_NATIVE + #endif // MICROPY_EMIT_NATIVE default: comp->emit = emit_bc; diff --git a/py/enum.c b/py/enum.c index 4728c7f11d..681c3b3103 100644 --- a/py/enum.c +++ b/py/enum.c @@ -27,6 +27,8 @@ #include "py/enum.h" #include "py/runtime.h" +#include "supervisor/shared/translate/translate.h" + mp_obj_t cp_enum_find(const mp_obj_type_t *type, int value) { const mp_obj_dict_t *dict = type->locals_dict; for (size_t i = 0; i < dict->map.used; i++) { diff --git a/py/lexer.c b/py/lexer.c index 196f9a2644..0d6de0d522 100644 --- a/py/lexer.c +++ b/py/lexer.c @@ -32,7 +32,7 @@ #include "py/lexer.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_ENABLE_COMPILER diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py index 74ad78c47d..dada7e8e59 100644 --- a/py/makeqstrdata.py +++ b/py/makeqstrdata.py @@ -4,7 +4,7 @@ Process raw qstr file and output qstr data with length, hash and data bytes. This script works with Python 2.7, 3.3 and 3.4. For documentation about the format of compressed translated strings, see -supervisor/shared/translate.h +supervisor/shared/translate/translate.h """ from __future__ import print_function diff --git a/py/modbuiltins.c b/py/modbuiltins.c index ebdbd52dff..91712812bc 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -35,7 +35,7 @@ #include "py/builtin.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT #include diff --git a/py/modmath.c b/py/modmath.c index 103310db5e..167d46d02b 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -27,7 +27,7 @@ #include "py/builtin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH diff --git a/py/modmicropython.c b/py/modmicropython.c index 0465a4eef8..42c84e5292 100644 --- a/py/modmicropython.c +++ b/py/modmicropython.c @@ -32,7 +32,7 @@ #include "py/gc.h" #include "py/mphal.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Various builtins specific to MicroPython runtime, // living in micropython module diff --git a/py/modstruct.c b/py/modstruct.c index c0b0fb7890..17dfc548ab 100644 --- a/py/modstruct.c +++ b/py/modstruct.c @@ -33,7 +33,7 @@ #include "py/objtuple.h" #include "py/binary.h" #include "py/parsenum.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_STRUCT diff --git a/py/modthread.c b/py/modthread.c index 333d750a36..a3960cddcb 100644 --- a/py/modthread.c +++ b/py/modthread.c @@ -30,7 +30,7 @@ #include "py/runtime.h" #include "py/stackctrl.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_THREAD diff --git a/py/moduerrno.c b/py/moduerrno.c index 743be0b85d..0ac0503ccc 100644 --- a/py/moduerrno.c +++ b/py/moduerrno.c @@ -30,7 +30,7 @@ #include "py/obj.h" #include "py/mperrno.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // This list can be defined per port in mpconfigport.h to tailor it to a // specific port's needs. If it's not defined then we provide a default. diff --git a/py/obj.c b/py/obj.c index cc7f9006e8..da609aa8ce 100644 --- a/py/obj.c +++ b/py/obj.c @@ -41,7 +41,7 @@ #include "supervisor/linker.h" #include "supervisor/shared/stack.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" const mp_obj_type_t *MICROPY_WRAP_MP_OBJ_GET_TYPE(mp_obj_get_type)(mp_const_obj_t o_in) { #if MICROPY_OBJ_IMMEDIATE_OBJS && MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A diff --git a/py/obj.h b/py/obj.h index 5f8f71ba0b..8f38a4c7c0 100644 --- a/py/obj.h +++ b/py/obj.h @@ -34,7 +34,7 @@ #include "py/mpprint.h" #include "py/runtime0.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/compressed_string.h" // This is the definition of the opaque MicroPython object type. // All concrete objects have an encoding within this type and the diff --git a/py/objarray.c b/py/objarray.c index b71687fb35..a66a73a5ac 100644 --- a/py/objarray.c +++ b/py/objarray.c @@ -34,7 +34,7 @@ #include "py/objstr.h" #include "py/objarray.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW diff --git a/py/objcomplex.c b/py/objcomplex.c index b37b059d59..f205249bb4 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -31,7 +31,7 @@ #include "py/parsenum.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_COMPLEX diff --git a/py/objdeque.c b/py/objdeque.c index 2d29d71e3b..59c4c709fc 100644 --- a/py/objdeque.c +++ b/py/objdeque.c @@ -28,7 +28,7 @@ #include #include "py/mpconfig.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_COLLECTIONS_DEQUE diff --git a/py/objdict.c b/py/objdict.c index 5f233741fa..306205d12f 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -34,7 +34,7 @@ #include "py/objstr.h" #include "supervisor/linker.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" const mp_obj_dict_t mp_const_empty_dict_obj = { .base = { .type = &mp_type_dict }, diff --git a/py/objexcept.c b/py/objexcept.c index fc0787631f..230f9d11ba 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -39,7 +39,7 @@ #include "py/gc.h" #include "py/mperrno.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Number of items per traceback entry (file, line, block) #define TRACEBACK_ENTRY_LEN (3) diff --git a/py/objfloat.c b/py/objfloat.c index 6d1d10188c..f8261df933 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -32,7 +32,7 @@ #include "py/parsenum.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT diff --git a/py/objgenerator.c b/py/objgenerator.c index c63ea6b816..b18101cfa1 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -35,7 +35,7 @@ #include "py/objfun.h" #include "py/stackctrl.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Instance of GeneratorExit exception - needed by generator.close() const mp_obj_exception_t mp_const_GeneratorExit_obj = {{&mp_type_GeneratorExit}, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj, (mp_obj_traceback_t *)&mp_const_empty_traceback_obj}; diff --git a/py/objint.c b/py/objint.c index 50bcbf56f8..98178e7ffa 100644 --- a/py/objint.c +++ b/py/objint.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "py/binary.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT #include diff --git a/py/objint_longlong.c b/py/objint_longlong.c index 368c74ec1d..67ec844f47 100644 --- a/py/objint_longlong.c +++ b/py/objint_longlong.c @@ -32,7 +32,7 @@ #include "py/objint.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT #include diff --git a/py/objint_mpz.c b/py/objint_mpz.c index b804ce28af..fd74803fe7 100644 --- a/py/objint_mpz.c +++ b/py/objint_mpz.c @@ -33,7 +33,7 @@ #include "py/objint.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT #include diff --git a/py/objlist.c b/py/objlist.c index 9d1949b7dc..434bca7d0a 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "py/stackctrl.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf); STATIC mp_obj_list_t *list_new(size_t n); diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c index c970d1afba..60a0a31847 100644 --- a/py/objnamedtuple.c +++ b/py/objnamedtuple.c @@ -33,7 +33,7 @@ #include "py/objnamedtuple.h" #include "py/objtype.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_COLLECTIONS diff --git a/py/objobject.c b/py/objobject.c index d9c75faff9..b32e5fac0d 100644 --- a/py/objobject.c +++ b/py/objobject.c @@ -29,7 +29,7 @@ #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" typedef struct _mp_obj_object_t { mp_obj_base_t base; diff --git a/py/objrange.c b/py/objrange.c index b23ab23bd7..b0c74815dc 100644 --- a/py/objrange.c +++ b/py/objrange.c @@ -28,7 +28,7 @@ #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" /******************************************************************************/ /* range iterator */ diff --git a/py/objset.c b/py/objset.c index d7dda6ba59..237e4c2471 100644 --- a/py/objset.c +++ b/py/objset.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "py/builtin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_SET diff --git a/py/objslice.c b/py/objslice.c index 142f62fdac..3172f798c0 100644 --- a/py/objslice.c +++ b/py/objslice.c @@ -30,7 +30,7 @@ #include "py/obj.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" /******************************************************************************/ /* slice object */ diff --git a/py/objstr.c b/py/objstr.c index 3d45383bb3..df735a45cd 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "py/stackctrl.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_STR_OP_MODULO STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict); diff --git a/py/objstringio.c b/py/objstringio.c index 336a041baf..c6d22d6c89 100644 --- a/py/objstringio.c +++ b/py/objstringio.c @@ -33,7 +33,7 @@ #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_IO diff --git a/py/objstrunicode.c b/py/objstrunicode.c index eb79d54991..0f26da62cf 100644 --- a/py/objstrunicode.c +++ b/py/objstrunicode.c @@ -32,7 +32,7 @@ #include "py/objlist.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_STR_UNICODE diff --git a/py/objtuple.c b/py/objtuple.c index 90b0773bb4..87d16905df 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "py/objtype.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" /******************************************************************************/ diff --git a/py/objtype.c b/py/objtype.c index 62ea1ed602..071065041f 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "supervisor/shared/stack.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_DEBUG_VERBOSE // print debugging info #define DEBUG_PRINT (1) diff --git a/py/parse.c b/py/parse.c index dee662b4ec..b3be279c5b 100644 --- a/py/parse.c +++ b/py/parse.c @@ -39,7 +39,7 @@ #include "py/objstr.h" #include "py/builtin.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_ENABLE_COMPILER diff --git a/py/parsenum.c b/py/parsenum.c index bd41488204..adf2a4d84d 100644 --- a/py/parsenum.c +++ b/py/parsenum.c @@ -32,7 +32,7 @@ #include "py/parsenum.h" #include "py/smallint.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT #include diff --git a/py/persistentcode.c b/py/persistentcode.c index e604569fe2..787f724bf6 100644 --- a/py/persistentcode.c +++ b/py/persistentcode.c @@ -36,7 +36,7 @@ #include "py/objstr.h" #include "py/mpthread.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE diff --git a/py/proto.c b/py/proto.c index 9f110b9f9a..d70a9d2aac 100644 --- a/py/proto.c +++ b/py/proto.c @@ -28,6 +28,8 @@ #include "py/proto.h" #include "py/runtime.h" +#include "supervisor/shared/translate/translate.h" + #ifndef MICROPY_UNSAFE_PROTO const void *mp_proto_get(uint16_t name, mp_const_obj_t obj) { const mp_obj_type_t *type = mp_obj_get_type(obj); diff --git a/py/qstr.c b/py/qstr.c index 41176ec5ab..083e12d6f0 100644 --- a/py/qstr.c +++ b/py/qstr.c @@ -35,6 +35,7 @@ #include "py/runtime.h" #include "supervisor/linker.h" +#include "supervisor/shared/translate/translate.h" // NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings) // ultimately we will replace this with a static hash table of some kind diff --git a/py/runtime.c b/py/runtime.c index f2ad8728a5..7fcad7366a 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -45,7 +45,7 @@ #include "py/stackctrl.h" #include "py/gc.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_DEBUG_VERBOSE // print debugging info #define DEBUG_PRINT (1) diff --git a/py/runtime.h b/py/runtime.h index dccdc2feed..a78969780b 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -33,6 +33,8 @@ #include "supervisor/linker.h" +#include "supervisor/shared/translate/translate.h" + typedef enum { MP_VM_RETURN_NORMAL, MP_VM_RETURN_YIELD, diff --git a/py/sequence.c b/py/sequence.c index ee400ccd8d..7befc85763 100644 --- a/py/sequence.c +++ b/py/sequence.c @@ -28,7 +28,7 @@ #include #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Helpers for sequence types diff --git a/py/stream.c b/py/stream.c index b12d693c62..27609043fc 100644 --- a/py/stream.c +++ b/py/stream.c @@ -31,7 +31,7 @@ #include "py/objstr.h" #include "py/stream.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // This file defines generic Python stream read/write methods which // dispatch to the underlying stream interface of an object. diff --git a/py/vm.c b/py/vm.c index 8cb01d3552..12a0f2d445 100644 --- a/py/vm.c +++ b/py/vm.c @@ -37,6 +37,7 @@ #include "py/profile.h" #include "supervisor/linker.h" +#include "supervisor/shared/translate/translate.h" // *FORMAT-OFF* diff --git a/runtime.py b/runtime.py new file mode 100644 index 0000000000..28bf98962e --- /dev/null +++ b/runtime.py @@ -0,0 +1,10 @@ +import pathlib +paths = pathlib.Path(".").glob("**/*.c") +translate_h = "#include \"supervisor/shared/translate/translate.h\"" +for p in paths: + if "esp-idf" in p: + continue + lines = p.read_text().split("\n") + if "#include \"py/runtime.h\"" in lines and translate_h in lines: + lines.remove(translate_h) + p.write_text("\n".join(lines)) diff --git a/shared-bindings/_pew/PewPew.c b/shared-bindings/_pew/PewPew.c index 4015d31161..1a4356c719 100644 --- a/shared-bindings/_pew/PewPew.c +++ b/shared-bindings/_pew/PewPew.c @@ -32,7 +32,7 @@ #include "shared-bindings/util.h" #include "PewPew.h" #include "common-hal/_pew/PewPew.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PewPew: //| """This is an internal module to be used by the ``pew.py`` library from diff --git a/shared-bindings/_stage/Layer.c b/shared-bindings/_stage/Layer.c index c3c0aa1801..9e64a252db 100644 --- a/shared-bindings/_stage/Layer.c +++ b/shared-bindings/_stage/Layer.c @@ -28,7 +28,7 @@ #include "__init__.h" #include "Layer.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Layer: //| """Keep information about a single layer of graphics""" diff --git a/shared-bindings/_stage/Text.c b/shared-bindings/_stage/Text.c index d6b22171d6..48747bfd67 100644 --- a/shared-bindings/_stage/Text.c +++ b/shared-bindings/_stage/Text.c @@ -28,7 +28,7 @@ #include "__init__.h" #include "Text.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Text: //| """Keep information about a single grid of text""" diff --git a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c index 327e8e72b4..3ae5fc2a2f 100644 --- a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c +++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c @@ -36,7 +36,7 @@ #include "shared/runtime/context_manager_helpers.h" #include "py/runtime.h" #include "py/smallint.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class I2CDevice: diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c index 2c5708b831..f7cc357e91 100644 --- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c +++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c @@ -35,7 +35,7 @@ #include "shared/runtime/buffer_helper.h" #include "shared/runtime/context_manager_helpers.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class SPIDevice: diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c index 37223f1f35..b4e68c964c 100644 --- a/shared-bindings/alarm/SleepMemory.c +++ b/shared-bindings/alarm/SleepMemory.c @@ -31,7 +31,7 @@ #include "py/runtime0.h" #include "shared-bindings/alarm/SleepMemory.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class SleepMemory: //| """Store raw bytes in RAM that persists during deep sleep. diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c index ff34716786..06ad77c56d 100644 --- a/shared-bindings/alarm/pin/PinAlarm.c +++ b/shared-bindings/alarm/pin/PinAlarm.c @@ -33,7 +33,7 @@ #include "py/obj.h" #include "py/objproperty.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PinAlarm: //| """Trigger an alarm when a pin changes state.""" diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c index ab0274afa9..0b77913c9b 100644 --- a/shared-bindings/alarm/time/TimeAlarm.c +++ b/shared-bindings/alarm/time/TimeAlarm.c @@ -33,7 +33,7 @@ #include "shared-bindings/rtc/__init__.h" #include "shared-bindings/time/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE mp_obj_t MP_WEAK rtc_get_time_source_time(void) { diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index 2f171c5a0f..41c9b053eb 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -34,7 +34,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class AnalogOut: //| """Output analog values (a specific voltage). diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c index 93c316d374..7c660abc4a 100644 --- a/shared-bindings/audiobusio/I2SOut.c +++ b/shared-bindings/audiobusio/I2SOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/audiobusio/I2SOut.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class I2SOut: //| """Output an I2S audio signal""" diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c index aa810f2930..29752a442c 100644 --- a/shared-bindings/audiobusio/PDMIn.c +++ b/shared-bindings/audiobusio/PDMIn.c @@ -34,7 +34,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/audiobusio/PDMIn.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PDMIn: //| """Record an input PDM audio stream""" diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c index 82c02450ba..02d4bbaa2f 100644 --- a/shared-bindings/audiocore/RawSample.c +++ b/shared-bindings/audiocore/RawSample.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "shared-bindings/util.h" #include "shared-bindings/audiocore/RawSample.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class RawSample: //| """A raw audio sample buffer in memory""" diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c index 285bd7cbbe..b1c51a9746 100644 --- a/shared-bindings/audiocore/WaveFile.c +++ b/shared-bindings/audiocore/WaveFile.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "shared-bindings/audiocore/WaveFile.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class WaveFile: //| """Load a wave file for audio playback diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c index 0b4ed7b975..75ba7b5ec5 100644 --- a/shared-bindings/audioio/AudioOut.c +++ b/shared-bindings/audioio/AudioOut.c @@ -34,7 +34,7 @@ #include "shared-bindings/audioio/AudioOut.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class AudioOut: //| """Output an analog audio signal""" diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c index 3ca6ccd5e3..47dbd94f19 100644 --- a/shared-bindings/audiomixer/Mixer.c +++ b/shared-bindings/audiomixer/Mixer.c @@ -36,7 +36,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Mixer: //| """Mixes one or more audio samples together into one sample.""" diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c index f02b9521af..f7bf16fb49 100644 --- a/shared-bindings/audiomixer/MixerVoice.c +++ b/shared-bindings/audiomixer/MixerVoice.c @@ -35,7 +35,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class MixerVoice: //| """Voice objects used with Mixer diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index 16efa361b8..8251b26c73 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "shared-bindings/audiomp3/MP3Decoder.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class MP3Decoder: //| """Load a mp3 file for audio playback diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c index 8118eb47f2..f4f3675750 100644 --- a/shared-bindings/audiopwmio/PWMAudioOut.c +++ b/shared-bindings/audiopwmio/PWMAudioOut.c @@ -34,7 +34,7 @@ #include "shared-bindings/audiopwmio/PWMAudioOut.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PWMAudioOut: //| """Output an analog audio signal by varying the PWM duty cycle.""" diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c index 67c411120b..9c0555dd5a 100644 --- a/shared-bindings/bitbangio/I2C.c +++ b/shared-bindings/bitbangio/I2C.c @@ -35,7 +35,7 @@ #include "shared/runtime/context_manager_helpers.h" #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class I2C: //| """Two wire serial protocol""" diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c index 1f19f8c939..103dd9fbaa 100644 --- a/shared-bindings/bitbangio/SPI.c +++ b/shared-bindings/bitbangio/SPI.c @@ -37,7 +37,7 @@ #include "shared/runtime/context_manager_helpers.h" #include "py/mperrno.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class SPI: //| """A 3-4 wire serial protocol diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c index e05e4e0546..b3afd9801d 100644 --- a/shared-bindings/busio/I2C.c +++ b/shared-bindings/busio/I2C.c @@ -34,7 +34,7 @@ #include "shared/runtime/buffer_helper.h" #include "shared/runtime/context_manager_helpers.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class I2C: //| """Two wire serial protocol""" diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index af853b84ac..eb89746d05 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -38,7 +38,7 @@ #include "py/mperrno.h" #include "py/objproperty.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class SPI: diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 7a27b04aec..baa7f2cdba 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -38,7 +38,7 @@ #include "py/objtype.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define STREAM_DEBUG(...) (void)0 // #define STREAM_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__) diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index a9026fbd59..ae72b5cb55 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -41,7 +41,7 @@ #include "shared-bindings/digitalio/DriveMode.h" #include "shared-bindings/digitalio/Pull.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class DigitalInOut: //| """Digital input and output diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c index 4db68dda10..364be05de0 100644 --- a/shared-bindings/digitalio/Pull.c +++ b/shared-bindings/digitalio/Pull.c @@ -26,6 +26,7 @@ #include "py/runtime.h" #include "shared-bindings/digitalio/Pull.h" +#include "supervisor/shared/translate/translate.h" //| class Pull: //| """Defines the pull of a digital input pin""" diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index 3af152ffdc..ef5727261c 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -34,7 +34,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Bitmap: //| """Stores values of a certain size in a 2D array diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c index 18b88664c0..7b33b1ec8f 100644 --- a/shared-bindings/displayio/ColorConverter.c +++ b/shared-bindings/displayio/ColorConverter.c @@ -34,7 +34,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class ColorConverter: //| """Converts one color format to another.""" diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index b19c0bac53..4b5db33928 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| _DisplayBus = Union['FourWire', 'paralleldisplay.ParallelBus', 'I2CDisplay'] //| """:py:class:`FourWire`, :py:class:`paralleldisplay.ParallelBus` or :py:class:`I2CDisplay`""" diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c index 94d2978cef..81863b2a7a 100644 --- a/shared-bindings/displayio/EPaperDisplay.c +++ b/shared-bindings/displayio/EPaperDisplay.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class EPaperDisplay: //| """Manage updating an epaper display over a display bus diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c index 2aa80df61d..7e72169230 100644 --- a/shared-bindings/displayio/FourWire.c +++ b/shared-bindings/displayio/FourWire.c @@ -37,7 +37,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class FourWire: //| """Manage updating a display over SPI four wire protocol in the background while Python code runs. diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c index 75cc217af3..4a57b4a5f1 100644 --- a/shared-bindings/displayio/Group.c +++ b/shared-bindings/displayio/Group.c @@ -33,7 +33,7 @@ #include "py/objproperty.h" #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Group: //| """Manage a group of sprites and groups and how they are inter-related.""" diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c index a637fc5071..86138d8a36 100644 --- a/shared-bindings/displayio/I2CDisplay.c +++ b/shared-bindings/displayio/I2CDisplay.c @@ -37,7 +37,7 @@ #include "shared-bindings/busio/I2C.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class I2CDisplay: //| """Manage updating a display over I2C in the background while Python code runs. diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c index aa749bf7f7..02c370c3c4 100644 --- a/shared-bindings/displayio/OnDiskBitmap.c +++ b/shared-bindings/displayio/OnDiskBitmap.c @@ -30,7 +30,7 @@ #include "py/runtime.h" #include "py/objproperty.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/displayio/OnDiskBitmap.h" //| class OnDiskBitmap: diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c index ad6d7c319a..171a243a95 100644 --- a/shared-bindings/displayio/Palette.c +++ b/shared-bindings/displayio/Palette.c @@ -34,7 +34,7 @@ #include "py/runtime.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Palette: //| """Map a pixel palette_index to a full color. Colors are transformed to the display's format internally to diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c index cbfe12d551..30a51dadce 100644 --- a/shared-bindings/displayio/Shape.c +++ b/shared-bindings/displayio/Shape.c @@ -32,7 +32,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Shape: //| """Represents a shape made by defining boundaries that may be mirrored.""" diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index b1557a1777..d084d94be2 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -38,7 +38,7 @@ #include "shared-bindings/displayio/OnDiskBitmap.h" #include "shared-bindings/displayio/Palette.h" #include "shared-bindings/displayio/Shape.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class TileGrid: //| """A grid of tiles sourced out of one bitmap diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c index 5c1b976e81..02d3373797 100644 --- a/shared-bindings/fontio/BuiltinFont.c +++ b/shared-bindings/fontio/BuiltinFont.c @@ -34,7 +34,7 @@ #include "py/runtime.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| from typing_extensions import Protocol # for compat with python < 3.8 //| diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c index daff2174fa..6af8f16ce8 100644 --- a/shared-bindings/framebufferio/FramebufferDisplay.c +++ b/shared-bindings/framebufferio/FramebufferDisplay.c @@ -38,7 +38,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class FramebufferDisplay: //| """Manage updating a display with framebuffer in RAM diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c index 2f6ebd06c2..b72627b19f 100644 --- a/shared-bindings/frequencyio/FrequencyIn.c +++ b/shared-bindings/frequencyio/FrequencyIn.c @@ -33,7 +33,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/frequencyio/FrequencyIn.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class FrequencyIn: //| """Read a frequency signal diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index 54dbf004ad..f5fb45cb4d 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -27,7 +27,7 @@ #include "py/builtin.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #if MICROPY_PY_BUILTINS_FLOAT diff --git a/shared-bindings/memorymonitor/AllocationAlarm.c b/shared-bindings/memorymonitor/AllocationAlarm.c index fe25a1a230..45e7019912 100644 --- a/shared-bindings/memorymonitor/AllocationAlarm.c +++ b/shared-bindings/memorymonitor/AllocationAlarm.c @@ -31,7 +31,7 @@ #include "py/runtime0.h" #include "shared-bindings/memorymonitor/AllocationAlarm.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class AllocationAlarm: //| diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c index 1c39fdcd92..ed8252b67a 100644 --- a/shared-bindings/memorymonitor/AllocationSize.c +++ b/shared-bindings/memorymonitor/AllocationSize.c @@ -31,7 +31,7 @@ #include "py/runtime0.h" #include "shared-bindings/memorymonitor/AllocationSize.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class AllocationSize: //| diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c index db96519dc7..840f468e2a 100644 --- a/shared-bindings/microcontroller/Pin.c +++ b/shared-bindings/microcontroller/Pin.c @@ -31,7 +31,7 @@ #include "py/nlr.h" #include "py/obj.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Pin: //| """Identifies an IO pin on the microcontroller.""" diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index ff1b52eecd..067d6b0097 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -38,7 +38,7 @@ #include "py/objtype.h" #include "py/objproperty.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Processor: diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c index 1b14b32934..46382dc3e6 100644 --- a/shared-bindings/microcontroller/__init__.c +++ b/shared-bindings/microcontroller/__init__.c @@ -39,7 +39,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Processor.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """Pin references and cpu functionality //| diff --git a/shared-bindings/multiterminal/__init__.c b/shared-bindings/multiterminal/__init__.c index f3f8d1ab6c..8726e9a655 100644 --- a/shared-bindings/multiterminal/__init__.c +++ b/shared-bindings/multiterminal/__init__.c @@ -28,7 +28,7 @@ #include "py/obj.h" #include "py/mphal.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """Manage additional terminal sources //| diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index d0234fe451..e45e970179 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -30,7 +30,7 @@ #include "py/runtime.h" #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // RGB LED timing information: diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c index b01430c078..936e3bcee5 100644 --- a/shared-bindings/nvm/ByteArray.c +++ b/shared-bindings/nvm/ByteArray.c @@ -29,7 +29,7 @@ #include "py/runtime.h" #include "py/runtime0.h" #include "shared-bindings/nvm/ByteArray.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class ByteArray: //| r"""Presents a stretch of non-volatile memory as a bytearray. diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c index a8545d9079..4c249c368e 100644 --- a/shared-bindings/os/__init__.c +++ b/shared-bindings/os/__init__.c @@ -36,6 +36,7 @@ #include "py/objstr.h" #include "py/runtime.h" #include "shared-bindings/os/__init__.h" +#include "supervisor/shared/translate/translate.h" //| """functions that an OS normally provides //| diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c index c93f363d1a..a8b37fa956 100644 --- a/shared-bindings/paralleldisplay/ParallelBus.c +++ b/shared-bindings/paralleldisplay/ParallelBus.c @@ -35,7 +35,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/util.h" #include "shared-module/displayio/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class ParallelBus: //| """Manage updating a display over 8-bit parallel bus in the background while Python code runs. This diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c index 2ceca6b044..d84e788de5 100644 --- a/shared-bindings/ps2io/Ps2.c +++ b/shared-bindings/ps2io/Ps2.c @@ -34,7 +34,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/ps2io/Ps2.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Ps2: //| """Communicate with a PS/2 keyboard or mouse diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c index 21dfdae42c..1769f5c7a8 100644 --- a/shared-bindings/pulseio/PulseIn.c +++ b/shared-bindings/pulseio/PulseIn.c @@ -33,7 +33,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/pulseio/PulseIn.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PulseIn: //| """Measure a series of active and idle pulses. This is commonly used in infrared receivers diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c index ac568231b9..3de2176ffc 100644 --- a/shared-bindings/pulseio/PulseOut.c +++ b/shared-bindings/pulseio/PulseOut.c @@ -34,7 +34,7 @@ #include "shared-bindings/pulseio/PulseOut.h" #include "shared-bindings/pwmio/PWMOut.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PulseOut: //| """Pulse PWM "carrier" output on and off. This is commonly used in infrared remotes. The diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c index 524a857e64..4acb2a6a8a 100644 --- a/shared-bindings/pwmio/PWMOut.c +++ b/shared-bindings/pwmio/PWMOut.c @@ -33,7 +33,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/pwmio/PWMOut.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) { diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index 63570fe7e7..eee574d29e 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -31,7 +31,7 @@ #include "py/obj.h" #include "py/runtime.h" #include "shared-bindings/random/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """pseudo-random numbers and choices //| diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index b07f90bd01..9e75576487 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -34,7 +34,7 @@ #include "shared-bindings/rtc/__init__.h" #include "shared-bindings/rtc/RTC.h" #include "shared-bindings/time/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" const rtc_rtc_obj_t rtc_rtc_obj = {{&rtc_rtc_type}}; diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index c06ce18826..dbeb50ddf3 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -38,7 +38,7 @@ #include "py/mperrno.h" #include "py/objproperty.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class SDCard: //| """SD Card Block Interface with SDIO diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c index 277c8343e0..baf91a35c1 100644 --- a/shared-bindings/storage/__init__.c +++ b/shared-bindings/storage/__init__.c @@ -33,7 +33,7 @@ #include "py/objnamedtuple.h" #include "py/runtime.h" #include "shared-bindings/storage/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """Storage management //| diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c index c29c33c1c0..5b63a15f15 100644 --- a/shared-bindings/struct/__init__.c +++ b/shared-bindings/struct/__init__.c @@ -36,7 +36,7 @@ #include "py/parsenum.h" #include "shared-bindings/struct/__init__.h" #include "shared-module/struct/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """Manipulation of c-style data //| diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c index 6fcff963a6..cad8ccdeec 100644 --- a/shared-bindings/supervisor/__init__.c +++ b/shared-bindings/supervisor/__init__.c @@ -36,7 +36,7 @@ #include "supervisor/shared/reload.h" #include "supervisor/shared/stack.h" #include "supervisor/shared/traceback.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/workflow.h" #include "shared-bindings/microcontroller/__init__.h" diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c index 7805c1a6a0..e27ff903c6 100644 --- a/shared-bindings/synthio/MidiTrack.c +++ b/shared-bindings/synthio/MidiTrack.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "shared-bindings/util.h" #include "shared-bindings/synthio/MidiTrack.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class MidiTrack: //| """Simple square-wave MIDI synth""" diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c index cdeca59164..c6fd389b12 100644 --- a/shared-bindings/terminalio/Terminal.c +++ b/shared-bindings/terminalio/Terminal.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "py/stream.h" #include "shared-bindings/fontio/BuiltinFont.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Terminal: //| """Display a character stream with a TileGrid""" diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c index 5b16ded0e4..096c80d382 100644 --- a/shared-bindings/time/__init__.c +++ b/shared-bindings/time/__init__.c @@ -34,7 +34,7 @@ #include "shared/timeutils/timeutils.h" #include "shared-bindings/rtc/__init__.h" #include "shared-bindings/time/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """time and timing related functions //| diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c index 23b35253cb..729cf94d5d 100644 --- a/shared-bindings/touchio/TouchIn.c +++ b/shared-bindings/touchio/TouchIn.c @@ -36,7 +36,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/touchio/TouchIn.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class TouchIn: //| """Read the state of a capacitive touch sensor diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c index 760efb6278..8a74380be3 100644 --- a/shared-bindings/usb_cdc/Serial.c +++ b/shared-bindings/usb_cdc/Serial.c @@ -33,7 +33,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Serial: //| """Receives cdc commands over USB""" diff --git a/shared-bindings/usb_cdc/__init__.c b/shared-bindings/usb_cdc/__init__.c index eabe26ad07..e23e289309 100644 --- a/shared-bindings/usb_cdc/__init__.c +++ b/shared-bindings/usb_cdc/__init__.c @@ -31,6 +31,7 @@ #include "shared-bindings/usb_cdc/__init__.h" #include "shared-bindings/usb_cdc/Serial.h" +#include "supervisor/shared/translate/translate.h" #include "py/runtime.h" diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 3f30a6264c..f0074f9cac 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -27,6 +27,7 @@ #include "py/objproperty.h" #include "shared-bindings/usb_hid/Device.h" #include "py/runtime.h" +#include "supervisor/shared/translate/translate.h" //| class Device: //| """HID Device specification""" diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c index 3922ded03c..dcdf6933f7 100644 --- a/shared-bindings/usb_hid/__init__.c +++ b/shared-bindings/usb_hid/__init__.c @@ -31,6 +31,8 @@ #include "shared-bindings/usb_hid/__init__.h" #include "shared-bindings/usb_hid/Device.h" +#include "supervisor/shared/translate/translate.h" + //| """USB Human Interface Device //| //| The `usb_hid` module allows you to output data as a HID device.""" diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c index 0056a0818a..273fa77b35 100644 --- a/shared-bindings/usb_midi/PortIn.c +++ b/shared-bindings/usb_midi/PortIn.c @@ -33,7 +33,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PortIn: //| """Receives midi commands over USB""" diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c index c468401924..d5652be5d4 100644 --- a/shared-bindings/usb_midi/PortOut.c +++ b/shared-bindings/usb_midi/PortOut.c @@ -33,7 +33,7 @@ #include "py/objproperty.h" #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class PortOut: //| """Sends midi messages to a computer over USB""" diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c index ec065d1e18..d3d5cf2626 100644 --- a/shared-bindings/usb_midi/__init__.c +++ b/shared-bindings/usb_midi/__init__.c @@ -32,6 +32,7 @@ #include "shared-bindings/usb_midi/__init__.h" #include "shared-bindings/usb_midi/PortIn.h" #include "shared-bindings/usb_midi/PortOut.h" +#include "supervisor/shared/translate/translate.h" #include "py/runtime.h" diff --git a/shared-bindings/util.c b/shared-bindings/util.c index c1ca01e0ad..5c5eafad4a 100644 --- a/shared-bindings/util.c +++ b/shared-bindings/util.c @@ -30,7 +30,7 @@ #include "py/runtime.h" #include "shared-bindings/util.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // If so, deinit() has already been called on the object, so complain. void raise_deinited_error(void) { diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c index ded1861896..f955cd2afe 100644 --- a/shared-bindings/vectorio/Circle.c +++ b/shared-bindings/vectorio/Circle.c @@ -8,7 +8,7 @@ #include "py/objproperty.h" #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Circle: //| diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c index ae9d7a01ca..60a4582e5a 100644 --- a/shared-bindings/vectorio/Polygon.c +++ b/shared-bindings/vectorio/Polygon.c @@ -9,7 +9,7 @@ #include "py/objproperty.h" #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define VECTORIO_POLYGON_DEBUG(...) (void)0 diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c index 739a1ba9d1..34b9e1eabe 100644 --- a/shared-bindings/vectorio/Rectangle.c +++ b/shared-bindings/vectorio/Rectangle.c @@ -7,7 +7,7 @@ #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| class Rectangle: //| def __init__(self, pixel_shader: Union[displayio.ColorConverter, displayio.Palette], width: int, height: int, x: int, y: int) -> None: diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c index 6a3e192cb9..ba55cfb851 100644 --- a/shared-bindings/vectorio/VectorShape.c +++ b/shared-bindings/vectorio/VectorShape.c @@ -16,7 +16,7 @@ #include "py/objproperty.h" #include "py/objtype.h" #include "py/runtime.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // shape: The shape implementation to draw. diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c index 65bec244e3..e3858d008d 100644 --- a/shared-bindings/zlib/__init__.c +++ b/shared-bindings/zlib/__init__.c @@ -39,7 +39,7 @@ #include "shared-bindings/zlib/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" //| """zlib decompression functionality //| diff --git a/shared-module/audiocore/WaveFile.c b/shared-module/audiocore/WaveFile.c index b4056e3f29..1b87532551 100644 --- a/shared-module/audiocore/WaveFile.c +++ b/shared-module/audiocore/WaveFile.c @@ -33,7 +33,7 @@ #include "py/runtime.h" #include "shared-module/audiocore/WaveFile.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" struct wave_format_chunk { uint16_t audio_format; diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index d0b5428a11..506ed5eff2 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -35,7 +35,7 @@ #include "py/runtime.h" #include "shared-module/audiomp3/MP3Decoder.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/background_callback.h" #include "lib/mp3/src/mp3common.h" diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index eb897e122f..65926b8c07 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -32,7 +32,7 @@ #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/digitalio/DigitalInOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" STATIC void delay(bitbangio_i2c_obj_t *self) { // We need to use an accurate delay to get acceptable I2C diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c index 972b085978..d740a214e7 100644 --- a/shared-module/bitbangio/SPI.c +++ b/shared-module/bitbangio/SPI.c @@ -32,7 +32,7 @@ #include "shared-bindings/bitbangio/SPI.h" #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/microcontroller/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #define MAX_BAUDRATE (common_hal_mcu_get_clock_frequency() / 48) diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c index 7bd0d42339..5d08c368b5 100644 --- a/shared-module/board/__init__.c +++ b/shared-module/board/__init__.c @@ -27,7 +27,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-module/board/__init__.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "mpconfigboard.h" #include "py/runtime.h" diff --git a/shared-module/msgpack/__init__.c b/shared-module/msgpack/__init__.c index e1b98a9f93..d32550722c 100644 --- a/shared-module/msgpack/__init__.c +++ b/shared-module/msgpack/__init__.c @@ -36,7 +36,7 @@ #include "py/runtime.h" #include "py/stream.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/msgpack/ExtType.h" #include "shared-bindings/msgpack/__init__.h" #include "shared-module/msgpack/__init__.h" diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c index e36d3ec21e..8806b7c8c6 100644 --- a/shared-module/storage/__init__.c +++ b/shared-module/storage/__init__.c @@ -38,6 +38,7 @@ #include "shared-bindings/storage/__init__.h" #include "supervisor/filesystem.h" #include "supervisor/flash.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/usb.h" #if CIRCUITPY_USB_MSC diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c index a0abd16408..e87321ae79 100644 --- a/shared-module/struct/__init__.c +++ b/shared-module/struct/__init__.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "py/binary.h" #include "py/parsenum.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "shared-bindings/struct/__init__.h" STATIC void struct_validate_format(char fmt) { diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c index 13e66058c2..f92c93baa3 100644 --- a/shared-module/usb_hid/Device.c +++ b/shared-module/usb_hid/Device.c @@ -31,7 +31,7 @@ #include "shared-bindings/usb_hid/Device.h" #include "shared-module/usb_hid/__init__.h" #include "shared-module/usb_hid/Device.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/tick.h" #include "tusb.h" diff --git a/shared-module/usb_hid/__init__.c b/shared-module/usb_hid/__init__.c index 89a05c77b3..99be84542f 100644 --- a/shared-module/usb_hid/__init__.c +++ b/shared-module/usb_hid/__init__.c @@ -33,6 +33,7 @@ #include "shared-bindings/usb_hid/__init__.h" #include "shared-bindings/usb_hid/Device.h" #include "supervisor/memory.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/usb.h" static const uint8_t usb_hid_descriptor_template[] = { diff --git a/shared-module/usb_midi/PortIn.c b/shared-module/usb_midi/PortIn.c index b16b77cf97..a5c73aa256 100644 --- a/shared-module/usb_midi/PortIn.c +++ b/shared-module/usb_midi/PortIn.c @@ -26,7 +26,7 @@ #include "shared-bindings/usb_midi/PortIn.h" #include "shared-module/usb_midi/PortIn.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "tusb.h" size_t common_hal_usb_midi_portin_read(usb_midi_portin_obj_t *self, uint8_t *data, size_t len, int *errcode) { diff --git a/shared-module/usb_midi/PortOut.c b/shared-module/usb_midi/PortOut.c index 4005d8b77d..c9d229635e 100644 --- a/shared-module/usb_midi/PortOut.c +++ b/shared-module/usb_midi/PortOut.c @@ -26,7 +26,7 @@ #include "shared-bindings/usb_midi/PortOut.h" #include "shared-module/usb_midi/PortOut.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "tusb.h" size_t common_hal_usb_midi_portout_write(usb_midi_portout_obj_t *self, const uint8_t *data, size_t len, int *errcode) { diff --git a/shared-module/usb_midi/__init__.c b/shared-module/usb_midi/__init__.c index 8cac2ba8af..ed1b8a0518 100644 --- a/shared-module/usb_midi/__init__.c +++ b/shared-module/usb_midi/__init__.c @@ -34,6 +34,7 @@ #include "shared-bindings/usb_midi/PortIn.h" #include "shared-bindings/usb_midi/PortOut.h" #include "supervisor/memory.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/usb.h" #include "tusb.h" diff --git a/shared/libc/abort_.c b/shared/libc/abort_.c index 45a2e0dedd..0c1d860aef 100644 --- a/shared/libc/abort_.c +++ b/shared/libc/abort_.c @@ -1,6 +1,6 @@ #include -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" NORETURN void abort_(void); diff --git a/shared/netutils/netutils.c b/shared/netutils/netutils.c index fe92e8bafb..030b1535cd 100644 --- a/shared/netutils/netutils.c +++ b/shared/netutils/netutils.c @@ -31,7 +31,7 @@ #include "py/runtime.h" #include "shared/netutils/netutils.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" // Takes an array with a raw IPv4 address and returns something like '192.168.0.1'. mp_obj_t netutils_format_ipv4_addr(uint8_t *ip, netutils_endian_t endian) { diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index 7922cffc2b..875a1a0220 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -37,7 +37,7 @@ #include "supervisor/serial.h" #include "supervisor/shared/rgb_led_colors.h" #include "supervisor/shared/status_leds.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "supervisor/shared/tick.h" #define SAFE_MODE_DATA_GUARD 0xad0000af diff --git a/supervisor/shared/translate.h b/supervisor/shared/translate/compressed_string.h similarity index 81% rename from supervisor/shared/translate.h rename to supervisor/shared/translate/compressed_string.h index 1963c6fe65..e331a5866f 100644 --- a/supervisor/shared/translate.h +++ b/supervisor/shared/translate/compressed_string.h @@ -24,8 +24,7 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H -#define MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H +#pragma once #include #include @@ -83,29 +82,3 @@ typedef struct compressed_string { void serial_write_compressed(const compressed_string_t *compressed); char *decompress(const compressed_string_t *compressed, char *decompressed); uint16_t decompress_length(const compressed_string_t *compressed); - - -// Map MicroPython's error messages to our translations. -#if defined(MICROPY_ENABLE_DYNRUNTIME) && MICROPY_ENABLE_DYNRUNTIME -#define MP_ERROR_TEXT(x) (x) -#else -#define MP_ERROR_TEXT(x) translate(x) -#endif - -static inline -// gcc10 -flto has issues with this being always_inline for debug builds. -#if CIRCUITPY_DEBUG < 1 -__attribute__((always_inline)) -#endif -const compressed_string_t *translate(const char *original) { - #ifndef NO_QSTR - #define QDEF(id, hash, len, str) - #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else - #include "genhdr/qstrdefs.generated.h" -#undef TRANSLATION -#undef QDEF - #endif - return NULL; -} - -#endif // MICROPY_INCLUDED_SUPERVISOR_TRANSLATE_H diff --git a/supervisor/shared/translate.c b/supervisor/shared/translate/translate.c similarity index 97% rename from supervisor/shared/translate.c rename to supervisor/shared/translate/translate.c index 55cc7d5d1e..cde3b90a1d 100644 --- a/supervisor/shared/translate.c +++ b/supervisor/shared/translate/translate.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include #include @@ -134,3 +134,7 @@ char *decompress(const compressed_string_t *compressed, char *decompressed) { decompressed[length - 1] = '\0'; return decompressed; } + +#if CIRCUITPY_LTO == 1 +#include "supervisor/shared/translate/translate_impl.h" +#endif diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h new file mode 100644 index 0000000000..d87fce8746 --- /dev/null +++ b/supervisor/shared/translate/translate.h @@ -0,0 +1,55 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include +#include +#include + +#include "supervisor/shared/translate/compressed_string.h" + +// Map MicroPython's error messages to our translations. +#if defined(MICROPY_ENABLE_DYNRUNTIME) && MICROPY_ENABLE_DYNRUNTIME +#define MP_ERROR_TEXT(x) (x) +#else +#define MP_ERROR_TEXT(x) translate(x) +#endif + +// translate() is a giant function with many strcmp calls. The assumption is +// that the build process will optimize this away and replace it with the +// appropriate compressed data for each call site. + +#if CIRCUITPY_LTO == 0 +// Without LTO, we need to include a copy of this function in each compilation +// unit so that the compile stage can do the optimization. Otherwise the linker +// will leave this as a giant function and have each call site call into it. +#include "supervisor/shared/translate/translate_impl.h" +#else +// In link time optimized (LTO) builds, we can compile this once into a .o and +// at link time the calls will be optimized. +const compressed_string_t *translate(const char *c); +#endif diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h new file mode 100644 index 0000000000..48dea90d6b --- /dev/null +++ b/supervisor/shared/translate/translate_impl.h @@ -0,0 +1,52 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include +#include +#include + +#include "supervisor/shared/translate/compressed_string.h" + +#if CIRCUITPY_LTO == 0 +static +#endif +inline +// gcc10 -flto has issues with this being always_inline for debug builds. +#if CIRCUITPY_DEBUG < 1 +__attribute__((always_inline)) +#endif +const compressed_string_t *translate(const char *original) { + #ifndef NO_QSTR + #define QDEF(id, hash, len, str) + #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else + #include "genhdr/qstrdefs.generated.h" +#undef TRANSLATION +#undef QDEF + #endif + return NULL; +} diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index f4ca11db43..5f4a65623f 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -15,7 +15,7 @@ SRC_SUPERVISOR = \ supervisor/shared/status_leds.c \ supervisor/shared/tick.c \ supervisor/shared/traceback.c \ - supervisor/shared/translate.c \ + supervisor/shared/translate/translate.c \ supervisor/shared/workflow.c ifeq ($(DISABLE_FILESYSTEM),1) From 90fe20a15343b62e03fc8f8eee793b3a3ebab1e7 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Fri, 27 May 2022 15:33:54 -0500 Subject: [PATCH 0399/2403] Adding manual IP address set --- ports/espressif/common-hal/wifi/Radio.c | 19 +++++++++ ports/espressif/common-hal/wifi/__init__.c | 10 +++++ ports/espressif/common-hal/wifi/__init__.h | 2 + shared-bindings/wifi/Radio.c | 46 ++++++++++++++++++++++ shared-bindings/wifi/Radio.h | 5 +++ 5 files changed, 82 insertions(+) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index 8ee1c80926..e43ce2fa51 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -398,6 +398,25 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) { return common_hal_ipaddress_new_ipv4address(self->dns_info.ip.u_addr.ip4.addr); } +void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) { + esp_netif_dhcpc_start(self->netif); +} + +void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) { + esp_netif_dhcpc_stop(self->netif); +} + +void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway) { + common_hal_wifi_radio_stop_dhcp_client(self); // Must stop DHCP to set a manual address + + esp_netif_ip_info_t ip_info; + ipaddress_ipaddress_to_esp_idf_ip4(ipv4, &ip_info.ip); + ipaddress_ipaddress_to_esp_idf_ip4(netmask, &ip_info.netmask); + ipaddress_ipaddress_to_esp_idf_ip4(gateway, &ip_info.gw); + + esp_netif_set_ip_info(self->netif, &ip_info); +} + mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) { esp_ping_config_t ping_config = ESP_PING_DEFAULT_CONFIG(); ipaddress_ipaddress_to_esp_idf(ip_address, &ping_config.target_addr); diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index cb9b028aba..36cf27a69f 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -189,6 +189,16 @@ void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_addre IP_ADDR4(esp_ip_address, bytes[0], bytes[1], bytes[2], bytes[3]); } +void ipaddress_ipaddress_to_esp_idf_ip4(mp_obj_t ip_address, esp_ip4_addr_t *esp_ip_address) { + if (!mp_obj_is_type(ip_address, &ipaddress_ipv4address_type)) { + mp_raise_ValueError(translate("Only IPv4 addresses supported")); + } + mp_obj_t packed = common_hal_ipaddress_ipv4address_get_packed(ip_address); + size_t len; + const char *bytes = mp_obj_str_get_data(packed, &len); + esp_netif_set_ip4_addr(esp_ip_address, bytes[0], bytes[1], bytes[2], bytes[3]); +} + void common_hal_wifi_gc_collect(void) { common_hal_wifi_radio_gc_collect(&common_hal_wifi_radio_obj); } diff --git a/ports/espressif/common-hal/wifi/__init__.h b/ports/espressif/common-hal/wifi/__init__.h index be91dca758..4258f1643f 100644 --- a/ports/espressif/common-hal/wifi/__init__.h +++ b/ports/espressif/common-hal/wifi/__init__.h @@ -30,9 +30,11 @@ #include "py/obj.h" #include "lwip/api.h" +#include "components/esp_wifi/include/esp_wifi.h" void wifi_reset(void); void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_address); +void ipaddress_ipaddress_to_esp_idf_ip4(mp_obj_t ip_address, esp_ip4_addr_t *esp_ip_address); #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WIFI___INIT___H diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index e79d7047b3..93c8009e50 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -414,6 +414,27 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj); +//| def set_ipv4_address(self, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address) -> None: +//| """Sets the IP v4 address of the station. Must include the netmask and gateway. +//| Setting the address manually will stop the DHCP client.""" +//| ... +STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_ipv4, ARG_netmask, ARG_gateway }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_OBJ, }, + { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_OBJ, }, + { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_OBJ, }, + }; + + wifi_radio_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); + + common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj); + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 4, wifi_radio_set_ipv4_address); + //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station when connected to an access point. None otherwise.""" //| @@ -459,6 +480,26 @@ STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); +//| def wifi_radio_start_dhcp_client(self) -> None: +//| """Starts the DHCP client.""" +//| ... +//| +STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) { + common_hal_wifi_radio_start_dhcp_client(self); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhcp_client); + +//| def wifi_radio_stop_dhcp_client(self) -> None: +//| """Stops the DHCP client. Needed to assign a static IP address.""" +//| ... +//| +STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) { + common_hal_wifi_radio_stop_dhcp_client(self); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_client_obj, wifi_radio_stop_dhcp_client); + MP_PROPERTY_GETTER(wifi_radio_ap_info_obj, (mp_obj_t)&wifi_radio_get_ap_info_obj); @@ -509,6 +550,9 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_start_ap), MP_ROM_PTR(&wifi_radio_start_ap_obj) }, { MP_ROM_QSTR(MP_QSTR_stop_ap), MP_ROM_PTR(&wifi_radio_stop_ap_obj) }, + { MP_ROM_QSTR(MP_QSTR_start_dhcp), MP_ROM_PTR(&wifi_radio_start_dhcp_client_obj) }, + { MP_ROM_QSTR(MP_QSTR_stop_dhcp), MP_ROM_PTR(&wifi_radio_stop_dhcp_client_obj) }, + { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&wifi_radio_connect_obj) }, // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise), MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) }, @@ -521,6 +565,8 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ipv4_address), MP_ROM_PTR(&wifi_radio_ipv4_address_obj) }, { MP_ROM_QSTR(MP_QSTR_ipv4_address_ap), MP_ROM_PTR(&wifi_radio_ipv4_address_ap_obj) }, + { MP_ROM_QSTR(MP_QSTR_set_ipv4_address), MP_ROM_PTR(&wifi_radio_set_ipv4_address_obj) }, + // { MP_ROM_QSTR(MP_QSTR_access_point_active), MP_ROM_PTR(&wifi_radio_access_point_active_obj) }, // { MP_ROM_QSTR(MP_QSTR_start_access_point), MP_ROM_PTR(&wifi_radio_start_access_point_obj) }, diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index cee9f6ef15..5590e17990 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -91,6 +91,9 @@ extern void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self); extern void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections); extern void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self); +extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self); +extern void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self); + extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len); extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self); @@ -102,6 +105,8 @@ extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self); +extern void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway); + extern mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_WIFI_RADIO_H From 3cc46c74b95d6fdef0d31b37d08b18ad072c63ef Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 May 2022 15:39:55 -0700 Subject: [PATCH 0400/2403] Fix compiles --- mpy-cross/mpy-cross.mk | 2 +- ports/unix/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 825566efec..0689322127 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -67,7 +67,7 @@ SRC_C += \ shared/runtime/gchelper_generic.c \ supervisor/stub/safe_mode.c \ supervisor/stub/stack.c \ - supervisor/shared/translate.c + supervisor/shared/translate/translate.c # Add fmode when compiling with mingw gcc COMPILER_TARGET := $(shell $(CC) -dumpmachine) diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 9857ec5f88..c9a9289d42 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -233,7 +233,7 @@ SRC_C += \ supervisor/stub/filesystem.c \ supervisor/stub/safe_mode.c \ supervisor/stub/stack.c \ - supervisor/shared/translate.c \ + supervisor/shared/translate/translate.c \ $(SRC_MOD) \ $(wildcard $(VARIANT_DIR)/*.c) From 8d559196eda0ae9a60d65c7f47a757e6178a19ba Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 May 2022 15:48:01 -0700 Subject: [PATCH 0401/2403] Fix unix and pre-commit --- py/compile.c | 8 ++++---- py/mkrules.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/py/compile.c b/py/compile.c index 63f96f6085..432aeca561 100644 --- a/py/compile.c +++ b/py/compile.c @@ -92,7 +92,7 @@ typedef enum { #define NATIVE_EMITTER(f) emit_native_table[mp_dynamic_compiler.native_arch]->emit_##f #define NATIVE_EMITTER_TABLE emit_native_table[mp_dynamic_compiler.native_arch] -STATIC const emit_method_table_t * emit_native_table[] = { +STATIC const emit_method_table_t *emit_native_table[] = { NULL, &emit_native_x86_method_table, &emit_native_x64_method_table, @@ -131,7 +131,7 @@ STATIC const emit_method_table_t * emit_native_table[] = { #define ASM_EMITTER(f) emit_asm_table[mp_dynamic_compiler.native_arch]->asm_##f #define ASM_EMITTER_TABLE emit_asm_table[mp_dynamic_compiler.native_arch] -STATIC const emit_inline_asm_method_table_t * emit_asm_table[] = { +STATIC const emit_inline_asm_method_table_t *emit_asm_table[] = { NULL, NULL, NULL, @@ -3527,7 +3527,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f switch (s->emit_options) { - #if MICROPY_EMIT_NATIVE + #if MICROPY_EMIT_NATIVE case MP_EMIT_OPT_NATIVE_PYTHON: case MP_EMIT_OPT_VIPER: if (emit_native == NULL) { @@ -3536,7 +3536,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f comp->emit_method_table = NATIVE_EMITTER_TABLE; comp->emit = emit_native; break; - #endif // MICROPY_EMIT_NATIVE + #endif // MICROPY_EMIT_NATIVE default: comp->emit = emit_bc; diff --git a/py/mkrules.mk b/py/mkrules.mk index b83a40dc29..ef0f66117d 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -62,7 +62,7 @@ $(BUILD)/%.o: %.c | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/qstrdef $(call compile_c) vpath %.cpp . $(TOP) $(USER_C_MODULES) -$(BUILD)/%.o: %.cpp +$(BUILD)/%.o: %.cpp | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/qstrdefs.enum.h $(call compile_cxx) QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR -x c From db318726a2250e66f189dc611a6a1b1f7a882894 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 27 May 2022 18:05:44 -0500 Subject: [PATCH 0402/2403] tilegrid.contains() function --- shared-bindings/displayio/TileGrid.c | 19 +++++++++++++++++++ shared-bindings/displayio/TileGrid.h | 2 ++ shared-module/displayio/TileGrid.c | 11 +++++++++++ 3 files changed, 32 insertions(+) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index b1557a1777..5d7db650e0 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -322,6 +322,24 @@ MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, (mp_obj_t)&displayio_tilegrid_get_transpose_xy_obj, (mp_obj_t)&displayio_tilegrid_set_transpose_xy_obj); +//| def contains(self, touch_tuple: tuple) -> bool: +//| """returns true if first two values in touch_tuple represent an x,y coordinate +//| inside the tilegrid rectangle bounds""" +//| +STATIC mp_obj_t displayio_tilegrid_obj_contains(mp_obj_t self_in, mp_obj_t touch_tuple) { + displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in); + + mp_obj_t *touch_tuple_items; + mp_obj_get_array_fixed_n(touch_tuple, 3, &touch_tuple_items); + uint16_t x = 0; + uint16_t y = 0; + x = mp_obj_get_int(touch_tuple_items[0]); + y = mp_obj_get_int(touch_tuple_items[1]); + + return mp_obj_new_bool(common_hal_displayio_tilegrid_contains(self, x, y)); +} +MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_contains_obj, displayio_tilegrid_obj_contains); + //| pixel_shader: Union[ColorConverter, Palette] //| """The pixel shader of the tilegrid.""" //| @@ -484,6 +502,7 @@ STATIC const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_flip_x), MP_ROM_PTR(&displayio_tilegrid_flip_x_obj) }, { MP_ROM_QSTR(MP_QSTR_flip_y), MP_ROM_PTR(&displayio_tilegrid_flip_y_obj) }, { MP_ROM_QSTR(MP_QSTR_transpose_xy), MP_ROM_PTR(&displayio_tilegrid_transpose_xy_obj) }, + { MP_ROM_QSTR(MP_QSTR_contains), MP_ROM_PTR(&displayio_tilegrid_contains_obj) }, { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_tilegrid_pixel_shader_obj) }, { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_tilegrid_bitmap_obj) }, }; diff --git a/shared-bindings/displayio/TileGrid.h b/shared-bindings/displayio/TileGrid.h index 2c7941222f..2b4e42cb46 100644 --- a/shared-bindings/displayio/TileGrid.h +++ b/shared-bindings/displayio/TileGrid.h @@ -56,6 +56,8 @@ void common_hal_displayio_tilegrid_set_flip_y(displayio_tilegrid_t *self, bool f bool common_hal_displayio_tilegrid_get_transpose_xy(displayio_tilegrid_t *self); void common_hal_displayio_tilegrid_set_transpose_xy(displayio_tilegrid_t *self, bool transpose_xy); +bool common_hal_displayio_tilegrid_contains(displayio_tilegrid_t *self, uint16_t x, uint16_t y); + uint16_t common_hal_displayio_tilegrid_get_width(displayio_tilegrid_t *self); uint16_t common_hal_displayio_tilegrid_get_height(displayio_tilegrid_t *self); diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index 5c968c30e1..5f347420ac 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -342,6 +342,17 @@ void common_hal_displayio_tilegrid_set_transpose_xy(displayio_tilegrid_t *self, self->moved = true; } +bool common_hal_displayio_tilegrid_contains(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { + uint16_t right_edge = self->x + (self->width_in_tiles * self->tile_width); + uint16_t bottom_edge = self->y + (self->height_in_tiles * self->tile_height); + if (x >= self->x && x <= right_edge && + y >= self->y && y <= bottom_edge) { + return true; + } else { + return false; + } +} + void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { self->top_left_x = x; self->top_left_y = y; From ffc451b3386a27a650783f7d21770050035a93d9 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 28 May 2022 12:01:05 -0500 Subject: [PATCH 0403/2403] argument for backlight_pwm_frequency and use it in pyportal titano build --- ports/atmel-samd/boards/pyportal_titano/board.c | 3 ++- shared-bindings/displayio/Display.c | 9 ++++++--- shared-bindings/displayio/Display.h | 2 +- shared-module/displayio/Display.c | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/atmel-samd/boards/pyportal_titano/board.c b/ports/atmel-samd/boards/pyportal_titano/board.c index 9fa7887a11..fcf8c5f44d 100644 --- a/ports/atmel-samd/boards/pyportal_titano/board.c +++ b/ports/atmel-samd/boards/pyportal_titano/board.c @@ -118,7 +118,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 500); // backlight_pwm_frequency } bool board_requests_safe_mode(void) { diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index b19c0bac53..680018bfe9 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -111,6 +111,7 @@ //| :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 //| :param int set_vertical_scroll: This parameter is accepted but ignored for backwards compatibility. It will be removed in a future release. +//| :param int backlight_pwm_frequency: The frequency to use to drive the PWM for backlight brightness control. Default is 50000. //| """ //| ... //| @@ -123,7 +124,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command, ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands, ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high, - ARG_SH1107_addressing }; + ARG_SH1107_addressing, ARG_backlight_pwm_frequency }; static const mp_arg_t allowed_args[] = { { MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_init_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -151,7 +152,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a { MP_QSTR_auto_refresh, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} }, { MP_QSTR_native_frames_per_second, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 60} }, { MP_QSTR_backlight_on_high, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} }, - { MP_QSTR_SH1107_addressing, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} } + { MP_QSTR_SH1107_addressing, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} }, + { MP_QSTR_backlight_pwm_frequency, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 50000} } }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -200,7 +202,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a args[ARG_auto_refresh].u_bool, args[ARG_native_frames_per_second].u_int, args[ARG_backlight_on_high].u_bool, - sh1107_addressing + sh1107_addressing, + args[ARG_backlight_pwm_frequency].u_int ); return self; diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h index f193e61d2f..adc8623a69 100644 --- a/shared-bindings/displayio/Display.h +++ b/shared-bindings/displayio/Display.h @@ -44,7 +44,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self, uint8_t *init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t *backlight_pin, uint16_t brightness_command, mp_float_t brightness, bool auto_brightness, bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second, - bool backlight_on_high, bool SH1107_addressing); + bool backlight_on_high, bool SH1107_addressing, uint16_t backlight_pwm_frequency); bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group); diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 5fab660268..9523d068ac 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -53,7 +53,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self, uint8_t *init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t *backlight_pin, uint16_t brightness_command, mp_float_t brightness, bool auto_brightness, bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second, - bool backlight_on_high, bool SH1107_addressing) { + bool backlight_on_high, bool SH1107_addressing, uint16_t backlight_pwm_frequency) { // Turn off auto-refresh as we init. self->auto_refresh = false; @@ -116,7 +116,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self, if (backlight_pin != NULL && common_hal_mcu_pin_is_free(backlight_pin)) { // Avoid PWM types and functions when the module isn't enabled #if (CIRCUITPY_PWMIO) - pwmout_result_t result = common_hal_pwmio_pwmout_construct(&self->backlight_pwm, backlight_pin, 0, 500, false); + pwmout_result_t result = common_hal_pwmio_pwmout_construct(&self->backlight_pwm, backlight_pin, 0, backlight_pwm_frequency, false); if (result != PWMOUT_OK) { self->backlight_inout.base.type = &digitalio_digitalinout_type; common_hal_digitalio_digitalinout_construct(&self->backlight_inout, backlight_pin); From e8dd5d35d6d3549089212529563336a1eaa084a9 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Sun, 29 May 2022 16:13:38 +0200 Subject: [PATCH 0404/2403] # WARNING: head commit changed in the meantime Fixed STM SPI frequency settings. Corrected default frequency settings in common_hal_busio_spi_construct. Fixed common_hal_busio_spi_get_frequency. --- ports/stm/common-hal/busio/SPI.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index f772cdeec0..a66a8dcb88 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -206,6 +206,10 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, spi_clock_enable(1 << (self->sck->periph_index - 1)); reserved_spi[self->sck->periph_index - 1] = true; + // Always start at 250khz which is what SD cards need. They are sensitive to + // SPI bus noise before they are put into SPI mode. + const uint32_t default_baudrate = 250000UL; + self->handle.Instance = SPIx; self->handle.Init.Mode = SPI_MODE_MASTER; // Direction change only required for RX-only, see RefMan RM0090:884 @@ -218,7 +222,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, self->handle.Init.CLKPolarity = SPI_POLARITY_LOW; self->handle.Init.CLKPhase = SPI_PHASE_1EDGE; self->handle.Init.NSS = SPI_NSS_SOFT; - self->handle.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256; + self->handle.Init.BaudRatePrescaler = stm32_baud_to_spi_div(default_baudrate, &self->prescaler, get_busclock(self->handle.Instance)); self->handle.Init.FirstBit = SPI_FIRSTBIT_MSB; self->handle.Init.TIMode = SPI_TIMODE_DISABLE; self->handle.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; @@ -226,8 +230,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, if (HAL_SPI_Init(&self->handle) != HAL_OK) { mp_raise_ValueError(translate("SPI init error")); } - self->baudrate = (get_busclock(SPIx) / 16); - self->prescaler = 16; + self->baudrate = default_baudrate; + // self->prescaler = 16; // Initialised above by stm32_baud_to_spi_div self->half_duplex = half_duplex; self->polarity = 0; self->phase = 0; @@ -381,7 +385,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t *self) { // returns actual frequency - uint32_t result = HAL_RCC_GetPCLK2Freq() / self->prescaler; + uint32_t result = get_busclock(self->handle.Instance) / self->prescaler; return result; } From f36dbb386b2616c3af400aa120c16e6314af1f73 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Mon, 30 May 2022 11:47:51 -0400 Subject: [PATCH 0405/2403] Add files via upload --- .../boards/lilygo_ttgo_t-oi-plus/board.c | 21 +++++++++++++ .../lilygo_ttgo_t-oi-plus/mpconfigboard.h | 11 +++---- .../boards/lilygo_ttgo_t-oi-plus/pins.c | 30 +++++++++++-------- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c index aa0cf7657a..deeb8041ea 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c @@ -4,12 +4,33 @@ #include "components/driver/include/driver/gpio.h" void board_init(void) { + // Debug UART + #ifdef DEBUG + common_hal_never_reset_pin(&pin_GPIO20); + common_hal_never_reset_pin(&pin_GPIO21); + #endif } bool board_requests_safe_mode(void) { return false; } +bool espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Pull LED down on reset rather than the default up + if (pin_number == MICROPY_HW_LED_STATUS->number) { + gpio_config_t cfg = { + .pin_bit_mask = BIT64(pin_number), + .mode = GPIO_MODE_DISABLE, + .pull_up_en = false, + .pull_down_en = true, + .intr_type = GPIO_INTR_DISABLE, + }; + gpio_config(&cfg); + return true; + } + return false; +} + void reset_board(void) { } diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h index 71987994e7..eb3ff11932 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h @@ -1,13 +1,10 @@ -// Define board #define MICROPY_HW_BOARD_NAME "LILYGO TTGO T-OI PLUS" #define MICROPY_HW_MCU_NAME "ESP32-C3" #define MICROPY_HW_LED_STATUS (&pin_GPIO3) -// I2C -#define CIRCUITPY_BOARD_I2C (1) -#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO18, .sda = &pin_GPIO19}} +#define DEFAULT_UART_BUS_RX (&pin_GPIO20) +#define DEFAULT_UART_BUS_TX (&pin_GPIO21) -// UART -#define CIRCUITPY_BOARD_UART (1) -#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} +#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c index 963115bf1c..1f4080ba55 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -2,28 +2,32 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, - { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, - { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, - { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, - { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From b2344bcde204fc680df564b4777e101988aafed3 Mon Sep 17 00:00:00 2001 From: SimonVail <35699287+SimonVail@users.noreply.github.com> Date: Mon, 30 May 2022 11:52:29 -0400 Subject: [PATCH 0406/2403] Update pins.c --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c index 1f4080ba55..79f2e2e42d 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -2,11 +2,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, - + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, @@ -14,20 +12,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, - { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) }, { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO3) }, { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From f0b387e882a85e9e0363f7f3776bb7e1e9f80f28 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 31 May 2022 16:13:15 +0200 Subject: [PATCH 0407/2403] fix autoapi bug ourselves for now --- conf.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/conf.py b/conf.py index c92e8bb719..145bed4d7b 100644 --- a/conf.py +++ b/conf.py @@ -33,6 +33,25 @@ from sphinx import addnodes tools_describe = str(pathlib.Path(__file__).parent / "tools/describe") +# Monkeypatch autoapi +def _format_args(args_info, include_annotations=True, ignore_self=None): + result = [] + + for i, (prefix, name, annotation, default) in enumerate(args_info): + if i == 0 and ignore_self is not None and name == ignore_self: + continue + formatted = "{}{}{}{}".format( + prefix or "", + name or "", + ": {}".format(annotation) if annotation and include_annotations else "", + (" = {}" if annotation else "={}").format(default) if default else "", + ) + result.append(formatted) + return ", ".join(result) + +import autoapi.mappers.python.objects as objects +objects._format_args = _format_args + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. From 4d776339ad8d609bed6a628dca413e59cd0910b8 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 31 May 2022 12:18:05 -0700 Subject: [PATCH 0408/2403] Separate translate object control from LTO --- ports/broadcom/Makefile | 2 +- ports/cxd56/mpconfigport.mk | 2 ++ py/circuitpy_defns.mk | 13 ++++++++++++- supervisor/shared/translate/translate.c | 2 +- supervisor/shared/translate/translate.h | 2 +- supervisor/shared/translate/translate_impl.h | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/broadcom/Makefile b/ports/broadcom/Makefile index 921d26958a..9731f819eb 100644 --- a/ports/broadcom/Makefile +++ b/ports/broadcom/Makefile @@ -107,7 +107,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o)) # BCM CLFAGS -CFLAGS += -ffreestanding -nostartfiles -DMICROPY_HW_MCU_NAME="\"$(CHIP_VARIANT)\"" +CFLAGS += -nostartfiles -DMICROPY_HW_MCU_NAME="\"$(CHIP_VARIANT)\"" OPTIMIZATION_FLAGS ?= -O3 diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk index 8787c55bcc..813d85d4a7 100644 --- a/ports/cxd56/mpconfigport.mk +++ b/ports/cxd56/mpconfigport.mk @@ -3,6 +3,8 @@ USB_HIGHSPEED = 1 # Number of USB endpoint pairs. USB_NUM_ENDPOINT_PAIRS = 6 +CIRCUITPY_TRANSLATE_OBJECT = 1 + # Longints can be implemented as mpz, as longlong, or not LONGINT_IMPL = MPZ diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 681eae779b..6a946dd248 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -51,7 +51,8 @@ BASE_CFLAGS = \ -DCIRCUITPY_SOFTWARE_SAFE_MODE=0x0ADABEEF \ -DCIRCUITPY_CANARY_WORD=0xADAF00 \ -DCIRCUITPY_SAFE_RESTART_WORD=0xDEADBEEF \ - -DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" + -DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" \ + --param max-inline-insns-single=500 # Use these flags to debug build times and header includes. # -ftime-report @@ -73,6 +74,16 @@ else CFLAGS += -DCIRCUITPY_LTO=0 endif +# Produce an object file for translate.c instead of including it in a header. +# The header version can be optimized on non-LTO builds *if* inlining is allowed +# otherwise, it blows up the binary sizes with tons of translate copies. +ifeq ($(CIRCUITPY_LTO), 0) +CIRCUITPY_TRANSLATE_OBJECT ?= 0 +else +CIRCUITPY_TRANSLATE_OBJECT ?= 1 +endif +CFLAGS += -DCIRCUITPY_TRANSLATE_OBJECT=$(CIRCUITPY_TRANSLATE_OBJECT) + ### # Handle frozen modules. diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c index cde3b90a1d..ae6c7524e5 100644 --- a/supervisor/shared/translate/translate.c +++ b/supervisor/shared/translate/translate.c @@ -135,6 +135,6 @@ char *decompress(const compressed_string_t *compressed, char *decompressed) { return decompressed; } -#if CIRCUITPY_LTO == 1 +#if CIRCUITPY_TRANSLATE_OBJECT == 1 #include "supervisor/shared/translate/translate_impl.h" #endif diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h index d87fce8746..8bb343cabe 100644 --- a/supervisor/shared/translate/translate.h +++ b/supervisor/shared/translate/translate.h @@ -43,7 +43,7 @@ // that the build process will optimize this away and replace it with the // appropriate compressed data for each call site. -#if CIRCUITPY_LTO == 0 +#if CIRCUITPY_TRANSLATE_OBJECT == 0 // Without LTO, we need to include a copy of this function in each compilation // unit so that the compile stage can do the optimization. Otherwise the linker // will leave this as a giant function and have each call site call into it. diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h index 48dea90d6b..acccfa4cd5 100644 --- a/supervisor/shared/translate/translate_impl.h +++ b/supervisor/shared/translate/translate_impl.h @@ -32,7 +32,7 @@ #include "supervisor/shared/translate/compressed_string.h" -#if CIRCUITPY_LTO == 0 +#if CIRCUITPY_TRANSLATE_OBJECT == 0 static #endif inline From 7fc0aa57914d2d32f44e8531362ed9c991803398 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 31 May 2022 14:48:41 -0700 Subject: [PATCH 0409/2403] Fix windows and two samd builds --- ports/atmel-samd/Makefile | 3 +++ ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk | 2 ++ ports/atmel-samd/mpconfigport.mk | 6 ++++++ py/circuitpy_defns.mk | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index 281b5efd2f..a0a211edb0 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -270,6 +270,9 @@ SRC_ASF += \ hpl/oscctrl/hpl_oscctrl.c \ hpl/trng/hpl_trng.c \ +# Ignore these errors +$(BUILD)/asf4/same54/hpl/sercom/hpl_sercom.o: CFLAGS += -Wno-maybe-uninitialized + else ifeq ($(CHIP_FAMILY), same51) SRC_ASF += \ hal/src/hal_rand_sync.c \ diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk index 088748a0cc..452acd15af 100644 --- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk @@ -12,3 +12,5 @@ LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 CIRCUITPY_CANIO = 1 + +CIRCUITPY_LTO = one diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 38abbb81f6..1b0ad7ed67 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -124,6 +124,12 @@ ifeq ($(CHIP_FAMILY),same51) # No native touchio on SAME51. CIRCUITPY_TOUCHIO_USE_NATIVE = 0 +ifeq ($(CIRCUITPY_FULL_BUILD),1) +CIRCUITPY_LTO ?= balanced +else +CIRCUITPY_LTO ?= one +endif + # The ?='s allow overriding in mpconfigboard.mk. CIRCUITPY_ALARM ?= 1 diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 6a946dd248..a93dce17ca 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -69,7 +69,7 @@ endif CIRCUITPY_LTO ?= 0 ifneq ($(CIRCUITPY_LTO),0) -CFLAGS += -DCIRCUITPY_LTO=1 -flto=auto -flto-partition=$(CIRCUITPY_LTO) +CFLAGS += -DCIRCUITPY_LTO=1 -flto=$(shell $(NPROC)) -flto-partition=$(CIRCUITPY_LTO) else CFLAGS += -DCIRCUITPY_LTO=0 endif From 4f6d4e2284b4461a843c98b048f62b0681251fd6 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Tue, 31 May 2022 22:13:18 -0500 Subject: [PATCH 0410/2403] Doc fix and add set for DNS --- ports/espressif/common-hal/wifi/Radio.c | 6 ++++++ shared-bindings/wifi/Radio.c | 20 ++++++++++++++------ shared-bindings/wifi/Radio.h | 1 + 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index e43ce2fa51..b6f8fc1058 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -398,6 +398,12 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) { return common_hal_ipaddress_new_ipv4address(self->dns_info.ip.u_addr.ip4.addr); } +void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dns_addr) { + esp_netif_dns_info_t dns_addr; + ipaddress_ipaddress_to_esp_idf_ip4(ipv4_dns_addr, &dns_addr.ip.u_addr.ip4); + esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_addr); +} + void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) { esp_netif_dhcpc_start(self->netif); } diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 93c8009e50..958164d74a 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -459,8 +459,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_ap_obj, wifi_radio_get_ipv MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_address_ap_obj); -//| ipv4_dns: Optional[ipaddress.IPv4Address] -//| """IP v4 Address of the DNS server in use when connected to an access point. None otherwise.""" +//| ipv4_dns: ipaddress.IPv4Address +//| """IP v4 Address of the DNS server to be used.""" //| STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_dns(self); @@ -468,8 +468,16 @@ STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns); -MP_PROPERTY_GETTER(wifi_radio_ipv4_dns_obj, - (mp_obj_t)&wifi_radio_get_ipv4_dns_obj); +STATIC mp_obj_t wifi_radio_set_ipv4_dns(mp_obj_t self, mp_obj_t ipv4_dns_addr) { + common_hal_wifi_radio_set_ipv4_dns(self, ipv4_dns_addr); + + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_ipv4_dns_obj, wifi_radio_set_ipv4_dns); + +MP_PROPERTY_GETSET(wifi_radio_ipv4_dns_obj, + (mp_obj_t)&wifi_radio_get_ipv4_dns_obj, + (mp_obj_t)&wifi_radio_set_ipv4_dns_obj); //| ap_info: Optional[Network] //| """Network object containing BSSID, SSID, authmode, channel, country and RSSI when connected to an access point. None otherwise.""" @@ -480,7 +488,7 @@ STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); -//| def wifi_radio_start_dhcp_client(self) -> None: +//| def start_dhcp(self) -> None: //| """Starts the DHCP client.""" //| ... //| @@ -490,7 +498,7 @@ STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhcp_client); -//| def wifi_radio_stop_dhcp_client(self) -> None: +//| def stop_dhcp(self) -> None: //| """Stops the DHCP client. Needed to assign a static IP address.""" //| ... //| diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index 5590e17990..208be8c44c 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -98,6 +98,7 @@ extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self); +extern void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dns_addr); extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway_ap(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self); From 6d3698848c97a02fd23fb7a12b27633d3b152ca3 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 1 Jun 2022 10:46:46 -0700 Subject: [PATCH 0411/2403] Fix PDMIn.c formatting --- .../atmel-samd/common-hal/audiobusio/PDMIn.c | 173 +++++++++--------- 1 file changed, 87 insertions(+), 86 deletions(-) diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c index 3711ba9c1b..6796fe03f8 100644 --- a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c +++ b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c @@ -110,74 +110,75 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, } else if (clock_pin == &pin_PB11) { self->clock_unit = 1; #endif - #endif + #else #ifdef SAM_D5X_E5X if (clock_pin == &pin_PA10 || clock_pin == &pin_PB16) { self->clock_unit = 0; } else if (clock_pin == &pin_PB12 #if defined(PIN_PB28) && !defined(IGNORE_PIN_PB28) - || data_pin == &pin_PB28) { - #else + || data_pin == &pin_PB28 + #endif ) { - #endif self->clock_unit = 1; #endif -} else { - raise_ValueError_invalid_pin_name(MP_QSTR_clock); -} + #endif + } else { + raise_ValueError_invalid_pin_name(MP_QSTR_clock); + } -self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1 + self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1 #ifdef SAMD21 -if (false + if (false #if defined(PIN_PA07) && !defined(IGNORE_PIN_PA07) - || data_pin == &pin_PA07 + || data_pin == &pin_PA07 #endif #if defined(PIN_PA19) && !defined(IGNORE_PIN_PA19) - || data_pin == &pin_PA19 + || data_pin == &pin_PA19 #endif - ) { - self->serializer = 0; -} else if (false - #if defined(PIN_PA08) && !defined(IGNORE_PIN_PA08) - || data_pin == &pin_PA08 + ) { + self->serializer = 0; + } else if (false + #if defined(PIN_PA08) && !defined(IGNORE_PIN_PA08) + || data_pin == &pin_PA08 + #endif + #if defined(PIN_PB16) && !defined(IGNORE_PIN_PB16) + || data_pin == &pin_PB16 + #endif + ) { + self->serializer = 1; + #else + #ifdef SAM_D5X_E5X + if (data_pin == &pin_PB10 || data_pin == &pin_PA22) { + self->serializer = 1; + #endif #endif - #if defined(PIN_PB16) && !defined(IGNORE_PIN_PB16) - || data_pin == &pin_PB16 - #endif - ) { - self->serializer = 1; - #endif - #ifdef SAM_D5X_E5X -if (data_pin == &pin_PB10 || data_pin == &pin_PA22) { - self->serializer = 1; - #endif -}else { - raise_ValueError_invalid_pin_name(MP_QSTR_data); -} - -if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) { - mp_raise_NotImplementedError(translate("Only 8 or 16 bit mono with " MP_STRINGIFY(OVERSAMPLING) "x oversampling is supported.")); -} - -turn_on_i2s(); - -if (I2S->CTRLA.bit.ENABLE == 0) { - I2S->CTRLA.bit.SWRST = 1; - while (I2S->CTRLA.bit.SWRST == 1) { + } else { + raise_ValueError_invalid_pin_name(MP_QSTR_data); } -} else { - #ifdef SAMD21 - if ((I2S->CTRLA.vec.SEREN & (1 << self->serializer)) != 0) { - mp_raise_RuntimeError(translate("Serializer in use")); + + if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) { + mp_raise_NotImplementedError(translate("Only 8 or 16 bit mono with " MP_STRINGIFY(OVERSAMPLING) "x oversampling is supported.")); } - #endif - #ifdef SAM_D5X_E5X - if (I2S->CTRLA.bit.RXEN == 1) { - mp_raise_RuntimeError(translate("Serializer in use")); + + turn_on_i2s(); + + if (I2S->CTRLA.bit.ENABLE == 0) { + I2S->CTRLA.bit.SWRST = 1; + while (I2S->CTRLA.bit.SWRST == 1) { + } + } else { + #ifdef SAMD21 + if ((I2S->CTRLA.vec.SEREN & (1 << self->serializer)) != 0) { + mp_raise_RuntimeError(translate("Serializer in use")); + } + #endif + #ifdef SAM_D5X_E5X + if (I2S->CTRLA.bit.RXEN == 1) { + mp_raise_RuntimeError(translate("Serializer in use")); + } + #endif } - #endif -} #ifdef SAM_D5X_E5X #define GPIO_I2S_FUNCTION GPIO_PIN_FUNCTION_J #endif @@ -185,62 +186,62 @@ if (I2S->CTRLA.bit.ENABLE == 0) { #define GPIO_I2S_FUNCTION GPIO_PIN_FUNCTION_G #endif -uint32_t clock_divisor = (uint32_t)roundf(48000000.0f / sample_rate / oversample); -float mic_clock_freq = 48000000.0f / clock_divisor; -self->sample_rate = mic_clock_freq / oversample; -if (mic_clock_freq < MIN_MIC_CLOCK || clock_divisor == 0) { - mp_raise_ValueError(translate("sampling rate out of range")); -} -// Find a free GCLK to generate the MCLK signal. -uint8_t gclk = find_free_gclk(clock_divisor); -if (gclk > GCLK_GEN_NUM) { - mp_raise_RuntimeError(translate("Unable to find free GCLK")); -} -self->gclk = gclk; + uint32_t clock_divisor = (uint32_t)roundf(48000000.0f / sample_rate / oversample); + float mic_clock_freq = 48000000.0f / clock_divisor; + self->sample_rate = mic_clock_freq / oversample; + if (mic_clock_freq < MIN_MIC_CLOCK || clock_divisor == 0) { + mp_raise_ValueError(translate("sampling rate out of range")); + } + // Find a free GCLK to generate the MCLK signal. + uint8_t gclk = find_free_gclk(clock_divisor); + if (gclk > GCLK_GEN_NUM) { + mp_raise_RuntimeError(translate("Unable to find free GCLK")); + } + self->gclk = gclk; -enable_clock_generator(self->gclk, CLOCK_48MHZ, clock_divisor); -connect_gclk_to_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit); + enable_clock_generator(self->gclk, CLOCK_48MHZ, clock_divisor); + connect_gclk_to_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit); -// Clock unit configuration + // Clock unit configuration -uint32_t clkctrl = I2S_CLKCTRL_MCKSEL_GCLK | - I2S_CLKCTRL_NBSLOTS(2) | - I2S_CLKCTRL_FSWIDTH_SLOT | - I2S_CLKCTRL_SLOTSIZE_16; + uint32_t clkctrl = I2S_CLKCTRL_MCKSEL_GCLK | + I2S_CLKCTRL_NBSLOTS(2) | + I2S_CLKCTRL_FSWIDTH_SLOT | + I2S_CLKCTRL_SLOTSIZE_16; -// Serializer configuration + // Serializer configuration #ifdef SAMD21 -uint32_t serctrl = (self->clock_unit << I2S_SERCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); + uint32_t serctrl = (self->clock_unit << I2S_SERCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); #endif #ifdef SAM_D5X_E5X -uint32_t serctrl = (self->clock_unit << I2S_RXCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); + uint32_t serctrl = (self->clock_unit << I2S_RXCTRL_CLKSEL_Pos) | SERCTRL(SERMODE_PDM2) | SERCTRL(DATASIZE_32); #endif -// Configure the I2S peripheral -i2s_set_enable(false); + // Configure the I2S peripheral + i2s_set_enable(false); -I2S->CLKCTRL[self->clock_unit].reg = clkctrl; + I2S->CLKCTRL[self->clock_unit].reg = clkctrl; #ifdef SAMD21 -I2S->SERCTRL[self->serializer].reg = serctrl; + I2S->SERCTRL[self->serializer].reg = serctrl; #endif #ifdef SAM_D5X_E5X -I2S->RXCTRL.reg = serctrl; + I2S->RXCTRL.reg = serctrl; #endif -i2s_set_enable(true); + i2s_set_enable(true); -// Run the clock all the time. This eliminates startup delay for the microphone, -// which can be 10-100ms. Turn serializer on as needed. -i2s_set_clock_unit_enable(self->clock_unit, true); + // Run the clock all the time. This eliminates startup delay for the microphone, + // which can be 10-100ms. Turn serializer on as needed. + i2s_set_clock_unit_enable(self->clock_unit, true); -claim_pin(clock_pin); -claim_pin(data_pin); + claim_pin(clock_pin); + claim_pin(data_pin); -gpio_set_pin_function(self->clock_pin->number, GPIO_I2S_FUNCTION); -gpio_set_pin_function(self->data_pin->number, GPIO_I2S_FUNCTION); + gpio_set_pin_function(self->clock_pin->number, GPIO_I2S_FUNCTION); + gpio_set_pin_function(self->data_pin->number, GPIO_I2S_FUNCTION); -self->bytes_per_sample = oversample >> 3; -self->bit_depth = bit_depth; + self->bytes_per_sample = oversample >> 3; + self->bit_depth = bit_depth; } bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t *self) { From 09c61efcff64937234b268b8a9d58f9ae15ffcb6 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 1 Jun 2022 11:12:14 -0700 Subject: [PATCH 0412/2403] Split partition from LTO enable --- .../boards/feather_m4_can/mpconfigboard.mk | 2 +- ports/atmel-samd/mpconfigport.mk | 15 ++++++--------- ports/nrf/mpconfigport.mk | 6 ++++-- py/circuitpy_defns.mk | 13 ++++--------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk index 452acd15af..1c337d6256 100644 --- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk @@ -13,4 +13,4 @@ LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 CIRCUITPY_CANIO = 1 -CIRCUITPY_LTO = one +CIRCUITPY_LTO_PARTITION = one diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 1b0ad7ed67..66ebb54a6b 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -9,6 +9,7 @@ USB_NUM_ENDPOINT_PAIRS = 8 CIRCUITPY_ROTARYIO_SOFTENCODER = 1 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1 +CIRCUITPY_LTO = 1 ###################################################################### # Put samd21-only choices here. @@ -78,7 +79,7 @@ endif SUPEROPT_GC = 0 SUPEROPT_VM = 0 -CIRCUITPY_LTO = one +CIRCUITPY_LTO_PARTITION = one ifeq ($(CIRCUITPY_FULL_BUILD),0) # On the smallest boards, this saves about 180 bytes. On other boards, it may -increase- space used. @@ -96,10 +97,8 @@ ifeq ($(CHIP_FAMILY),samd51) # No native touchio on SAMD51. CIRCUITPY_TOUCHIO_USE_NATIVE = 0 -ifeq ($(CIRCUITPY_FULL_BUILD),1) -CIRCUITPY_LTO ?= balanced -else -CIRCUITPY_LTO ?= one +ifeq ($(CIRCUITPY_FULL_BUILD),0) +CIRCUITPY_LTO_PARTITION ?= one endif # The ?='s allow overriding in mpconfigboard.mk. @@ -124,10 +123,8 @@ ifeq ($(CHIP_FAMILY),same51) # No native touchio on SAME51. CIRCUITPY_TOUCHIO_USE_NATIVE = 0 -ifeq ($(CIRCUITPY_FULL_BUILD),1) -CIRCUITPY_LTO ?= balanced -else -CIRCUITPY_LTO ?= one +ifeq ($(CIRCUITPY_FULL_BUILD),0) +CIRCUITPY_LTO_PARTITION ?= one endif # The ?='s allow overriding in mpconfigboard.mk. diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index 4bb4f3dfb4..f265ac1940 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -73,7 +73,8 @@ CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) OPTIMIZATION_FLAGS ?= -Os - CIRCUITPY_LTO=balanced + CIRCUITPY_LTO = 1 + CIRCUITPY_LTO_PARTITION = balanced endif else @@ -94,6 +95,7 @@ NRF_DEFINES += -DNRF52833_XXAA -DNRF52833 OPTIMIZATION_FLAGS ?= -Os -CIRCUITPY_LTO=one +CIRCUITPY_LTO = 1 +CIRCUITPY_LTO_PARTITION = one endif endif diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index a93dce17ca..1918938255 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -68,20 +68,15 @@ CFLAGS += -DCIRCUITPY_DEBUG=0 endif CIRCUITPY_LTO ?= 0 -ifneq ($(CIRCUITPY_LTO),0) -CFLAGS += -DCIRCUITPY_LTO=1 -flto=$(shell $(NPROC)) -flto-partition=$(CIRCUITPY_LTO) -else -CFLAGS += -DCIRCUITPY_LTO=0 +CIRCUITPY_LTO_PARTITION ?= balanced +ifeq ($(CIRCUITPY_LTO),1) +CFLAGS += -flto -flto-partition=$(CIRCUITPY_LTO_PARTITION) endif # Produce an object file for translate.c instead of including it in a header. # The header version can be optimized on non-LTO builds *if* inlining is allowed # otherwise, it blows up the binary sizes with tons of translate copies. -ifeq ($(CIRCUITPY_LTO), 0) -CIRCUITPY_TRANSLATE_OBJECT ?= 0 -else -CIRCUITPY_TRANSLATE_OBJECT ?= 1 -endif +CIRCUITPY_TRANSLATE_OBJECT ?= $(CIRCUITPY_LTO) CFLAGS += -DCIRCUITPY_TRANSLATE_OBJECT=$(CIRCUITPY_TRANSLATE_OBJECT) ### From 14ab3c737506087acf2a98a18efa08a0e6f2c107 Mon Sep 17 00:00:00 2001 From: KurtE Date: Wed, 1 Jun 2022 17:09:44 -0700 Subject: [PATCH 0413/2403] ESP32 USE uart_param_config Use this function instead of several individual configuration functions to configure such things as Baud rate, transfer size, stop bits, parity... This function also resets both the RX and TX Hardware Fifo reset functions are called to setup the hardware. --- ports/espressif/common-hal/busio/UART.c | 52 +++++++++++++++---------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 27323fecf4..e7ddb9433b 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -108,6 +108,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, bool have_rx = rx != NULL; bool have_rts = rts != NULL; bool have_cts = cts != NULL; + + uart_config_t uart_config = {0}; bool have_rs485_dir = rs485_dir != NULL; if (!have_tx && !have_rx) { mp_raise_ValueError(translate("tx and rx cannot both be None")); @@ -135,25 +137,26 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } uart_mode_t mode = UART_MODE_UART; - uart_hw_flowcontrol_t flow_control = UART_HW_FLOWCTRL_DISABLE; + uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE; if (have_rs485_dir) { mode = UART_MODE_RS485_HALF_DUPLEX; if (!rs485_invert) { + // This one is not in the set uart_set_line_inverse(self->uart_num, UART_SIGNAL_DTR_INV); } } else if (have_rts && have_cts) { - flow_control = UART_HW_FLOWCTRL_CTS_RTS; + uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS_RTS; } else if (have_rts) { - flow_control = UART_HW_FLOWCTRL_RTS; + uart_config.flow_ctrl = UART_HW_FLOWCTRL_RTS; } else if (have_rts) { - flow_control = UART_HW_FLOWCTRL_CTS; + uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS; } if (receiver_buffer_size <= UART_FIFO_LEN) { receiver_buffer_size = UART_FIFO_LEN + 8; } - uint8_t rx_threshold = UART_FIFO_LEN - 8; + uart_config.rx_flow_ctrl_thresh = UART_FIFO_LEN - 8; // Install the driver before we change the settings. if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK || uart_set_mode(self->uart_num, mode) != ESP_OK) { @@ -175,55 +178,62 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, CONFIG_PTHREAD_TASK_PRIO_DEFAULT, &self->event_task, xPortGetCoreID()); - uart_set_hw_flow_ctrl(self->uart_num, flow_control, rx_threshold); + // uart_set_hw_flow_ctrl(self->uart_num, uart_config.flow_control, uart_config.rx_flow_ctrl_thresh); // Set baud rate - common_hal_busio_uart_set_baudrate(self, baudrate); + // common_hal_busio_uart_set_baudrate(self, baudrate); + uart_config.baud_rate = baudrate; - uart_word_length_t word_length = UART_DATA_8_BITS; + uart_config.data_bits = UART_DATA_8_BITS; switch (bits) { // Shared bindings prevents data < 7 bits. // case 5: - // word_length = UART_DATA_5_BITS; + // uart_config.data_bits = UART_DATA_5_BITS; // break; // case 6: - // word_length = UART_DATA_6_BITS; + // uart_config.data_bits = UART_DATA_6_BITS; // break; case 7: - word_length = UART_DATA_7_BITS; + uart_config.data_bits = UART_DATA_7_BITS; break; case 8: - word_length = UART_DATA_8_BITS; + uart_config.data_bits = UART_DATA_8_BITS; break; default: // Won't hit this because shared-bindings limits to 7-9 bits. We error on 9 above. break; } - uart_set_word_length(self->uart_num, word_length); + // uart_set_word_length(self->uart_num, uart_config.data_bits); - uart_parity_t parity_mode = UART_PARITY_DISABLE; + uart_config.parity = UART_PARITY_DISABLE; switch (parity) { case BUSIO_UART_PARITY_NONE: - parity_mode = UART_PARITY_DISABLE; + uart_config.parity = UART_PARITY_DISABLE; break; case BUSIO_UART_PARITY_EVEN: - parity_mode = UART_PARITY_EVEN; + uart_config.parity = UART_PARITY_EVEN; break; case BUSIO_UART_PARITY_ODD: - parity_mode = UART_PARITY_ODD; + uart_config.parity = UART_PARITY_ODD; break; default: // Won't reach here because the input is an enum that is completely handled. break; } - uart_set_parity(self->uart_num, parity_mode); + // uart_set_parity(self->uart_num, uart_config.parity); // Stop is 1 or 2 always. - uart_stop_bits_t stop_bits = UART_STOP_BITS_1; + uart_config.stop_bits = UART_STOP_BITS_1; if (stop == 2) { - stop_bits = UART_STOP_BITS_2; + uart_config.stop_bits = UART_STOP_BITS_2; + } + // uart_set_stop_bits(self->uart_num, stop_bits); + uart_config.source_clk = UART_SCLK_APB; // guessing here... + + // config all in one? + if (uart_param_config(self->uart_num, &uart_config) != ESP_OK) { + mp_raise_RuntimeError(translate("UART init")); } - uart_set_stop_bits(self->uart_num, stop_bits); self->tx_pin = NULL; self->rx_pin = NULL; From 40e890323b24038aaf98aa95935689ab28ed06f8 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Wed, 1 Jun 2022 20:13:51 -0500 Subject: [PATCH 0414/2403] Add DNS optional to set IP --- ports/espressif/common-hal/wifi/Radio.c | 6 +++++- shared-bindings/wifi/Radio.c | 9 +++++---- shared-bindings/wifi/Radio.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index b6f8fc1058..6451cb1414 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -412,7 +412,7 @@ void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) { esp_netif_dhcpc_stop(self->netif); } -void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway) { +void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) { common_hal_wifi_radio_stop_dhcp_client(self); // Must stop DHCP to set a manual address esp_netif_ip_info_t ip_info; @@ -421,6 +421,10 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv ipaddress_ipaddress_to_esp_idf_ip4(gateway, &ip_info.gw); esp_netif_set_ip_info(self->netif, &ip_info); + + if (ipv4_dns != MP_OBJ_NULL) { + common_hal_wifi_radio_set_ipv4_dns(self, ipv4_dns); + } } mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) { diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 958164d74a..a0cf97c092 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -414,23 +414,24 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj); -//| def set_ipv4_address(self, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address) -> None: -//| """Sets the IP v4 address of the station. Must include the netmask and gateway. +//| def set_ipv4_address(self, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address, ipv4_dns: Optional[ipaddress.IPv4Address]) -> None: +//| """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional. //| Setting the address manually will stop the DHCP client.""" //| ... STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_ipv4, ARG_netmask, ARG_gateway }; + enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_OBJ, }, { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_OBJ, }, { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_OBJ, }, + { MP_QSTR_ipv4_dns, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, }; wifi_radio_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); - common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj); + common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 4, wifi_radio_set_ipv4_address); diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index 208be8c44c..09a66b2e63 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -106,7 +106,7 @@ extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self); -extern void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway); +extern void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns_addr); extern mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout); From 27fb96e6b0ce6770bbfc3cdd70b36439d6602763 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 1 Jun 2022 21:35:01 -0400 Subject: [PATCH 0415/2403] Remove trailing whitespace --- ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c index 79f2e2e42d..c906b7a555 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -4,7 +4,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, From 3202d52554c6f6790b7ca5ad5f3edfc398c9c31f Mon Sep 17 00:00:00 2001 From: Maxime Leroy Date: Thu, 2 Jun 2022 04:51:02 +0000 Subject: [PATCH 0416/2403] Translated using Weblate (French) Currently translated at 95.5% (939 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/ --- locale/fr.po | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/locale/fr.po b/locale/fr.po index 15b05ca98a..0639a2ba88 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2021-12-13 05:53+0000\n" -"Last-Translator: Jeff Epler \n" +"PO-Revision-Date: 2022-06-02 04:53+0000\n" +"Last-Translator: Maxime Leroy \n" "Language: fr\n" "MIME-Version: 1.0\n" "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.10-dev\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -147,7 +147,7 @@ msgstr "%q doit être %d-%d" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "" +msgstr "%q doit être à 1 alors que %q est True" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" @@ -179,7 +179,7 @@ msgstr "%q doit être du type %q" #: shared-bindings/digitalio/Pull.c msgid "%q must be of type %q or None" -msgstr "" +msgstr "%q doit être du type %q ou None" #: ports/atmel-samd/common-hal/busio/UART.c msgid "%q must be power of 2" @@ -1034,6 +1034,8 @@ msgstr "Format non supporté" msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"La fréquence doit être 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 ou " +"1008 MHz" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" @@ -1282,7 +1284,7 @@ msgstr "La partie gauche de l'argument nommé doit être un identifiant" #: shared-module/displayio/Group.c msgid "Layer already in a group" -msgstr "" +msgstr "Ce calque est déjà dans un groupe" #: shared-module/displayio/Group.c msgid "Layer must be a Group or TileGrid subclass" @@ -1320,7 +1322,7 @@ msgstr "Broche MISO ou MOSI manquante" #: ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI pin" -msgstr "" +msgstr "La broche MISO ou MOSI est manquante" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format @@ -1416,7 +1418,7 @@ msgstr "Aucun minuteur de rythme DMA trouvé" #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c #, c-format msgid "No I2C device at address: 0x%x" -msgstr "" +msgstr "Aucun périphérique I2S à l'adresse : 0x%x" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1425,7 +1427,7 @@ msgstr "Pas de broche MISO" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" -msgstr "" +msgstr "Aucune broche MISO" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1434,7 +1436,7 @@ msgstr "Pas de broche MOSI" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" -msgstr "" +msgstr "Aucune broche MOSI" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c @@ -1520,7 +1522,7 @@ msgstr "Aucun espace libre sur le dispositif" #: py/moduerrno.c msgid "No such device" -msgstr "" +msgstr "Aucun périphérique correspondant" #: py/moduerrno.c msgid "No such file/directory" @@ -1640,7 +1642,7 @@ msgstr "Une seule couleur peut être transparente à la fois" #: py/moduerrno.c msgid "Operation not permitted" -msgstr "" +msgstr "Cette opération n'est pas permise" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" @@ -1792,7 +1794,7 @@ msgstr "Mode RAISE n'est pas implémenté" #: ports/raspberrypi/common-hal/countio/Counter.c msgid "RISE_AND_FALL not available on this chip" -msgstr "" +msgstr "RISE_AND_FALL n'est pas disponible sur cette puce" #: ports/stm/common-hal/os/__init__.c msgid "RNG DeInit Error" @@ -2547,7 +2549,7 @@ msgstr "étalonnage en lecture seule" #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c #: shared-module/vectorio/Rectangle.c msgid "can only have one parent" -msgstr "" +msgstr "ne peut avoir qu'un seul parent" #: py/emitinlinethumb.c msgid "can only have up to 4 parameters to Thumb assembly" @@ -2590,7 +2592,7 @@ msgstr "impossible de convertir l'objet '%q' en '%q' implicitement" #: extmod/ulab/code/numpy/vector.c msgid "can't convert complex to float" -msgstr "" +msgstr "ne peut convertir un complexe en flottant" #: py/obj.c msgid "can't convert to %q" @@ -2698,11 +2700,11 @@ msgstr "output ne peut être projeté sans règle de projection" #: extmod/ulab/code/ndarray.c msgid "cannot convert complex to dtype" -msgstr "" +msgstr "ne peut convertir un complexe en dtype" #: extmod/ulab/code/ndarray.c msgid "cannot convert complex type" -msgstr "" +msgstr "ne peut convertir un type complexe" #: py/objtype.c msgid "cannot create '%q' instances" @@ -2893,7 +2895,7 @@ msgstr "division par zéro" #: extmod/ulab/code/numpy/vector.c msgid "dtype must be float, or complex" -msgstr "" +msgstr "le dtype doit être un flottant, ou un complexe" #: py/objdeque.c msgid "empty" @@ -3040,7 +3042,7 @@ msgstr "le format nécessite un dict" #: shared-bindings/microcontroller/Processor.c msgid "frequency is read-only for this board" -msgstr "" +msgstr "la fréquence est en lecture seule pour cette carte" #: py/objdeque.c msgid "full" @@ -3220,7 +3222,7 @@ msgstr "la matrice d'entrée est singulière" #: extmod/ulab/code/numpy/carray/carray.c msgid "input must be a 1D ndarray" -msgstr "" +msgstr "l'entrée doit être un ndarray 1D" #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" @@ -3623,7 +3625,7 @@ msgstr "pas assez d'arguments pour la chaîne de format" #: extmod/ulab/code/numpy/carray/carray_tools.c msgid "not implemented for complex dtype" -msgstr "" +msgstr "n'est pas implémenté pour les dtype complexes" #: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" From 29e9f447249e46a98e471593196e2b8cf3321cd1 Mon Sep 17 00:00:00 2001 From: ajs256 Date: Wed, 1 Jun 2022 22:02:36 +0000 Subject: [PATCH 0417/2403] Translated using Weblate (French) Currently translated at 95.5% (939 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/ --- locale/fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/fr.po b/locale/fr.po index 0639a2ba88..ce77777225 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" "PO-Revision-Date: 2022-06-02 04:53+0000\n" -"Last-Translator: Maxime Leroy \n" +"Last-Translator: ajs256 \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -83,7 +83,7 @@ msgstr "" #: ports/raspberrypi/common-hal/analogio/AnalogOut.c #: ports/raspberrypi/common-hal/rtc/RTC.c msgid "%q" -msgstr "" +msgstr "%q" #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" @@ -91,7 +91,7 @@ msgstr "%q et %q contiennent des broches en double" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "%q and %q must be different" -msgstr "" +msgstr "%q et %q doivent être différents" #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" @@ -119,7 +119,7 @@ msgstr "" #: py/argcheck.c msgid "%q length must be %d" -msgstr "" +msgstr "La longeur de %q doit être %d" #: py/argcheck.c msgid "%q length must be %d-%d" @@ -127,11 +127,11 @@ msgstr "La longueur de %q doit être %d-%d" #: py/argcheck.c msgid "%q length must be <= %d" -msgstr "" +msgstr "La longeur de %q doit être <= %d" #: py/argcheck.c msgid "%q length must be >= %d" -msgstr "" +msgstr "La longeur de %q doit être >= %d" #: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" @@ -139,7 +139,7 @@ msgstr "La longueur de %q doit être >= 1" #: py/argcheck.c msgid "%q must be %d" -msgstr "" +msgstr "%q doit être %d" #: py/argcheck.c msgid "%q must be %d-%d" @@ -171,7 +171,7 @@ msgstr "%q doit être une chaîne de caractères" #: py/argcheck.c msgid "%q must be an int" -msgstr "" +msgstr "%q doit être un entier" #: py/argcheck.c msgid "%q must be of type %q" From fd5ef009a40ed6d056495da95c7970f2fafdac2a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Jun 2022 11:48:56 -0700 Subject: [PATCH 0418/2403] Move compressed strings into own object file This breaks the translation dependency to all of the other objects and therefore speeds up subsequent builds. Now, even when the big translate() function is inlined in the header, it only needs to be optimized once. --- py/makeqstrdata.py | 369 +------------ py/maketranslationdata.py | 525 +++++++++++++++++++ py/py.mk | 13 +- supervisor/shared/translate/translate_impl.h | 10 +- supervisor/supervisor.mk | 2 +- 5 files changed, 556 insertions(+), 363 deletions(-) create mode 100644 py/maketranslationdata.py diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py index dada7e8e59..2abbdedefd 100644 --- a/py/makeqstrdata.py +++ b/py/makeqstrdata.py @@ -24,10 +24,6 @@ if hasattr(sys.stdout, "reconfigure"): py = os.path.dirname(sys.argv[0]) top = os.path.dirname(py) -sys.path.append(os.path.join(top, "tools/huffman")) - -import huffman - # Python 2/3 compatibility: # - iterating through bytes is different # - codepoint2name lives in a different module @@ -262,325 +258,6 @@ def compute_hash(qstr, bytes_hash): return (hash & ((1 << (8 * bytes_hash)) - 1)) or 1 -def translate(translation_file, i18ns): - with open(translation_file, "rb") as f: - table = gettext.GNUTranslations(f) - - translations = [] - for original in i18ns: - unescaped = original - for s in C_ESCAPES: - unescaped = unescaped.replace(C_ESCAPES[s], s) - translation = table.gettext(unescaped) - # Add in carriage returns to work in terminals - translation = translation.replace("\n", "\r\n") - translations.append((original, translation)) - return translations - - -class TextSplitter: - def __init__(self, words): - words = sorted(words, key=lambda x: len(x), reverse=True) - self.words = set(words) - if words: - pat = "|".join(re.escape(w) for w in words) + "|." - else: - pat = "." - self.pat = re.compile(pat, flags=re.DOTALL) - - def iter_words(self, text): - s = [] - words = self.words - for m in self.pat.finditer(text): - t = m.group(0) - if t in words: - if s: - yield (False, "".join(s)) - s = [] - yield (True, t) - else: - s.append(t) - if s: - yield (False, "".join(s)) - - def iter(self, text): - for m in self.pat.finditer(text): - yield m.group(0) - - -def iter_substrings(s, minlen, maxlen): - len_s = len(s) - maxlen = min(len_s, maxlen) - for n in range(minlen, maxlen + 1): - for begin in range(0, len_s - n + 1): - yield s[begin : begin + n] - - -def compute_huffman_coding(translations, compression_filename): - texts = [t[1] for t in translations] - words = [] - - start_unused = 0x80 - end_unused = 0xFF - max_ord = 0 - for text in texts: - for c in text: - ord_c = ord(c) - max_ord = max(ord_c, max_ord) - if 0x80 <= ord_c < 0xFF: - end_unused = min(ord_c, end_unused) - max_words = end_unused - 0x80 - - bits_per_codepoint = 16 if max_ord > 255 else 8 - values_type = "uint16_t" if max_ord > 255 else "uint8_t" - while len(words) < max_words: - # Until the dictionary is filled to capacity, use a heuristic to find - # the best "word" (2- to 11-gram) to add to it. - # - # The TextSplitter allows us to avoid considering parts of the text - # that are already covered by a previously chosen word, for example - # if "the" is in words then not only will "the" not be considered - # again, neither will "there" or "wither", since they have "the" - # as substrings. - extractor = TextSplitter(words) - counter = collections.Counter() - for t in texts: - for atom in extractor.iter(t): - counter[atom] += 1 - cb = huffman.codebook(counter.items()) - lengths = sorted(dict((v, len(cb[k])) for k, v in counter.items()).items()) - - def bit_length(s): - return sum(len(cb[c]) for c in s) - - def est_len(occ): - idx = bisect.bisect_left(lengths, (occ, 0)) - return lengths[idx][1] + 1 - - # The cost of adding a dictionary word is just its storage size - # while its savings is close to the difference between the original - # huffman bit-length of the string and the estimated bit-length - # of the dictionary word, times the number of times the word appears. - # - # The savings is not strictly accurate because including a word into - # the Huffman tree bumps up the encoding lengths of all words in the - # same subtree. In the extreme case when the new word is so frequent - # that it gets a one-bit encoding, all other words will cost an extra - # bit each. This is empirically modeled by the constant factor added to - # cost, but the specific value used isn't "proven" to be correct. - # - # Another source of inaccuracy is that compressed strings end up - # on byte boundaries, not bit boundaries, so saving 1 bit somewhere - # might not save a byte. - # - # In fact, when this change was first made, some translations (luckily, - # ones on boards not at all close to full) wasted up to 40 bytes, - # while the most constrained boards typically gained 100 bytes or - # more. - # - # The difference between the two is the estimated net savings, in bits. - def est_net_savings(s, occ): - savings = occ * (bit_length(s) - est_len(occ)) - cost = len(s) * bits_per_codepoint + 24 - return savings - cost - - counter = collections.Counter() - for t in texts: - for (found, word) in extractor.iter_words(t): - if not found: - for substr in iter_substrings(word, minlen=2, maxlen=11): - counter[substr] += 1 - - # Score the candidates we found. This is a semi-empirical formula that - # attempts to model the number of bits saved as closely as possible. - # - # It attempts to compute the codeword lengths of the original word - # to the codeword length the dictionary entry would get, times - # the number of occurrences, less the ovehead of the entries in the - # words[] array. - - scores = sorted( - ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items()), key=lambda x: x[1] - ) - - # Pick the one with the highest score. The score must be negative. - if not scores or scores[0][-1] >= 0: - break - - word = scores[0][0] - words.append(word) - - words.sort(key=len) - extractor = TextSplitter(words) - counter = collections.Counter() - for t in texts: - for atom in extractor.iter(t): - counter[atom] += 1 - cb = huffman.codebook(counter.items()) - - word_start = start_unused - word_end = word_start + len(words) - 1 - print("// # words", len(words)) - print("// words", words) - - values = [] - length_count = {} - renumbered = 0 - last_length = None - canonical = {} - for atom, code in sorted(cb.items(), key=lambda x: (len(x[1]), x[0])): - values.append(atom) - length = len(code) - if length not in length_count: - length_count[length] = 0 - length_count[length] += 1 - if last_length: - renumbered <<= length - last_length - canonical[atom] = "{0:0{width}b}".format(renumbered, width=length) - # print(f"atom={repr(atom)} code={code}", file=sys.stderr) - if len(atom) > 1: - o = words.index(atom) + 0x80 - s = "".join(C_ESCAPES.get(ch1, ch1) for ch1 in atom) - else: - s = C_ESCAPES.get(atom, atom) - o = ord(atom) - print("//", o, s, counter[atom], canonical[atom], renumbered) - renumbered += 1 - last_length = length - lengths = bytearray() - print("// length count", length_count) - - for i in range(1, max(length_count) + 2): - lengths.append(length_count.get(i, 0)) - print("// values", values, "lengths", len(lengths), lengths) - - print("//", values, lengths) - values = [(atom if len(atom) == 1 else chr(0x80 + words.index(atom))) for atom in values] - max_translation_encoded_length = max( - len(translation.encode("utf-8")) for (original, translation) in translations - ) - - maxlen = len(words[-1]) - minlen = len(words[0]) - wlencount = [len([None for w in words if len(w) == l]) for l in range(minlen, maxlen + 1)] - - with open(compression_filename, "w") as f: - f.write("typedef {} mchar_t;".format(values_type)) - f.write("const uint8_t lengths[] = {{ {} }};\n".format(", ".join(map(str, lengths)))) - f.write( - "const mchar_t values[] = {{ {} }};\n".format(", ".join(str(ord(u)) for u in values)) - ) - f.write( - "#define compress_max_length_bits ({})\n".format( - max_translation_encoded_length.bit_length() - ) - ) - f.write( - "const mchar_t words[] = {{ {} }};\n".format( - ", ".join(str(ord(c)) for w in words for c in w) - ) - ) - f.write( - "const uint8_t wlencount[] = {{ {} }};\n".format(", ".join(str(p) for p in wlencount)) - ) - f.write("#define word_start {}\n".format(word_start)) - f.write("#define word_end {}\n".format(word_end)) - f.write("#define minlen {}\n".format(minlen)) - f.write("#define maxlen {}\n".format(maxlen)) - - return (values, lengths, words, canonical, extractor) - - -def decompress(encoding_table, encoded, encoded_length_bits): - (values, lengths, words, _, _) = encoding_table - dec = [] - this_byte = 0 - this_bit = 7 - b = encoded[this_byte] - bits = 0 - for i in range(encoded_length_bits): - bits <<= 1 - if 0x80 & b: - bits |= 1 - - b <<= 1 - if this_bit == 0: - this_bit = 7 - this_byte += 1 - if this_byte < len(encoded): - b = encoded[this_byte] - else: - this_bit -= 1 - length = bits - - i = 0 - while i < length: - bits = 0 - bit_length = 0 - max_code = lengths[0] - searched_length = lengths[0] - while True: - bits <<= 1 - if 0x80 & b: - bits |= 1 - - b <<= 1 - bit_length += 1 - if this_bit == 0: - this_bit = 7 - this_byte += 1 - if this_byte < len(encoded): - b = encoded[this_byte] - else: - this_bit -= 1 - if max_code > 0 and bits < max_code: - # print('{0:0{width}b}'.format(bits, width=bit_length)) - break - max_code = (max_code << 1) + lengths[bit_length] - searched_length += lengths[bit_length] - - v = values[searched_length + bits - max_code] - if v >= chr(0x80) and v < chr(0x80 + len(words)): - v = words[ord(v) - 0x80] - i += len(v.encode("utf-8")) - dec.append(v) - return "".join(dec) - - -def compress(encoding_table, decompressed, encoded_length_bits, len_translation_encoded): - if not isinstance(decompressed, str): - raise TypeError() - (_, _, _, canonical, extractor) = encoding_table - - enc = bytearray(len(decompressed) * 3) - current_bit = 7 - current_byte = 0 - - bits = encoded_length_bits + 1 - for i in range(bits - 1, 0, -1): - if len_translation_encoded & (1 << (i - 1)): - enc[current_byte] |= 1 << current_bit - if current_bit == 0: - current_bit = 7 - current_byte += 1 - else: - current_bit -= 1 - - for atom in extractor.iter(decompressed): - for b in canonical[atom]: - if b == "1": - enc[current_byte] |= 1 << current_bit - if current_bit == 0: - current_bit = 7 - current_byte += 1 - else: - current_bit -= 1 - - if current_bit != 7: - current_byte += 1 - return enc[:current_byte] - - def qstr_escape(qst): def esc_char(m): c = ord(m.group(0)) @@ -694,7 +371,7 @@ def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr): return '%d, %d, "%s"' % (qhash, qlen, qdata) -def print_qstr_data(encoding_table, qcfgs, qstrs, i18ns): +def print_qstr_data(qcfgs, qstrs, i18ns): # get config variables cfg_bytes_len = int(qcfgs["BYTES_IN_LEN"]) cfg_bytes_hash = int(qcfgs["BYTES_IN_HASH"]) @@ -707,7 +384,6 @@ def print_qstr_data(encoding_table, qcfgs, qstrs, i18ns): print('QDEF(MP_QSTRnull, 0, 0, "")') total_qstr_size = 0 - total_qstr_compressed_size = 0 # go through each qstr and print it out for order, ident, qstr in sorted(qstrs.values(), key=lambda x: x[0]): qbytes = make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr) @@ -715,34 +391,14 @@ def print_qstr_data(encoding_table, qcfgs, qstrs, i18ns): total_qstr_size += len(qstr) - total_text_size = 0 - total_text_compressed_size = 0 - max_translation_encoded_length = max( - len(translation.encode("utf-8")) for original, translation in i18ns + print( + "// Enumerate translated texts but don't actually include translations. Instead, the linker will link them in." ) - encoded_length_bits = max_translation_encoded_length.bit_length() - for original, translation in i18ns: - translation_encoded = translation.encode("utf-8") - compressed = compress( - encoding_table, translation, encoded_length_bits, len(translation_encoded) - ) - total_text_compressed_size += len(compressed) - decompressed = decompress(encoding_table, compressed, encoded_length_bits) - assert decompressed == translation - for c in C_ESCAPES: - decompressed = decompressed.replace(c, C_ESCAPES[c]) - print( - 'TRANSLATION("{}", {}) // {}'.format( - original, ", ".join(["{:d}".format(x) for x in compressed]), decompressed - ) - ) - total_text_size += len(translation.encode("utf-8")) + for i, original in enumerate(i18ns): + print('TRANSLATION("{}", {})'.format(original, i)) print() print("// {} bytes worth of qstr".format(total_qstr_size)) - print("// {} bytes worth of translations".format(total_text_size)) - print("// {} bytes worth of translations compressed".format(total_text_compressed_size)) - print("// {} bytes saved".format(total_text_size - total_text_compressed_size)) def print_qstr_enums(qstrs): @@ -768,19 +424,18 @@ if __name__ == "__main__": "infiles", metavar="N", type=str, nargs="+", help="an integer for the accumulator" ) parser.add_argument( - "--translation", default=None, type=str, help="translations for i18n() items" - ) - parser.add_argument( - "--compression_filename", default=None, type=str, help="header for compression info" + "--output_type", + default="enums", + type=str, + help="output definitions", + choices=("enums", "data"), ) args = parser.parse_args() qcfgs, qstrs, i18ns = parse_input_headers(args.infiles) - if args.translation: + if args.output_type == "data": i18ns = sorted(i18ns) - translations = translate(args.translation, i18ns) - encoding_table = compute_huffman_coding(translations, args.compression_filename) - print_qstr_data(encoding_table, qcfgs, qstrs, translations) + print_qstr_data(qcfgs, qstrs, i18ns) else: print_qstr_enums(qstrs) diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py new file mode 100644 index 0000000000..07dd06c631 --- /dev/null +++ b/py/maketranslationdata.py @@ -0,0 +1,525 @@ +""" +Process raw qstr file and output qstr data with length, hash and data bytes. + +This script works with Python 2.7, 3.3 and 3.4. + +For documentation about the format of compressed translated strings, see +supervisor/shared/translate/translate.h +""" + +from __future__ import print_function + +import bisect +import re +import sys + +import collections +import gettext +import os.path + +if hasattr(sys.stdout, "reconfigure"): + sys.stdout.reconfigure(encoding="utf-8") + sys.stderr.reconfigure(errors="backslashreplace") + +py = os.path.dirname(sys.argv[0]) +top = os.path.dirname(py) + +sys.path.append(os.path.join(top, "tools/huffman")) + +import huffman + +# Python 2/3 compatibility: +# - iterating through bytes is different +# - codepoint2name lives in a different module +import platform + +if platform.python_version_tuple()[0] == "2": + bytes_cons = lambda val, enc=None: bytearray(val) + from htmlentitydefs import codepoint2name +elif platform.python_version_tuple()[0] == "3": + bytes_cons = bytes + from html.entities import codepoint2name +# end compatibility code + +codepoint2name[ord("-")] = "hyphen" + +# add some custom names to map characters that aren't in HTML +codepoint2name[ord(" ")] = "space" +codepoint2name[ord("'")] = "squot" +codepoint2name[ord(",")] = "comma" +codepoint2name[ord(".")] = "dot" +codepoint2name[ord(":")] = "colon" +codepoint2name[ord(";")] = "semicolon" +codepoint2name[ord("/")] = "slash" +codepoint2name[ord("%")] = "percent" +codepoint2name[ord("#")] = "hash" +codepoint2name[ord("(")] = "paren_open" +codepoint2name[ord(")")] = "paren_close" +codepoint2name[ord("[")] = "bracket_open" +codepoint2name[ord("]")] = "bracket_close" +codepoint2name[ord("{")] = "brace_open" +codepoint2name[ord("}")] = "brace_close" +codepoint2name[ord("*")] = "star" +codepoint2name[ord("!")] = "bang" +codepoint2name[ord("\\")] = "backslash" +codepoint2name[ord("+")] = "plus" +codepoint2name[ord("$")] = "dollar" +codepoint2name[ord("=")] = "equals" +codepoint2name[ord("?")] = "question" +codepoint2name[ord("@")] = "at_sign" +codepoint2name[ord("^")] = "caret" +codepoint2name[ord("|")] = "pipe" +codepoint2name[ord("~")] = "tilde" + +C_ESCAPES = { + "\a": "\\a", + "\b": "\\b", + "\f": "\\f", + "\n": "\\n", + "\r": "\\r", + "\t": "\\t", + "\v": "\\v", + "'": "\\'", + '"': '\\"', +} + +# this must match the equivalent function in qstr.c +def compute_hash(qstr, bytes_hash): + hash = 5381 + for b in qstr: + hash = (hash * 33) ^ b + # Make sure that valid hash is never zero, zero means "hash not computed" + return (hash & ((1 << (8 * bytes_hash)) - 1)) or 1 + + +def translate(translation_file, i18ns): + with open(translation_file, "rb") as f: + table = gettext.GNUTranslations(f) + + translations = [] + for original in i18ns: + unescaped = original + for s in C_ESCAPES: + unescaped = unescaped.replace(C_ESCAPES[s], s) + translation = table.gettext(unescaped) + # Add in carriage returns to work in terminals + translation = translation.replace("\n", "\r\n") + translations.append((original, translation)) + return translations + + +class TextSplitter: + def __init__(self, words): + words = sorted(words, key=lambda x: len(x), reverse=True) + self.words = set(words) + if words: + pat = "|".join(re.escape(w) for w in words) + "|." + else: + pat = "." + self.pat = re.compile(pat, flags=re.DOTALL) + + def iter_words(self, text): + s = [] + words = self.words + for m in self.pat.finditer(text): + t = m.group(0) + if t in words: + if s: + yield (False, "".join(s)) + s = [] + yield (True, t) + else: + s.append(t) + if s: + yield (False, "".join(s)) + + def iter(self, text): + for m in self.pat.finditer(text): + yield m.group(0) + + +def iter_substrings(s, minlen, maxlen): + len_s = len(s) + maxlen = min(len_s, maxlen) + for n in range(minlen, maxlen + 1): + for begin in range(0, len_s - n + 1): + yield s[begin : begin + n] + + +def compute_huffman_coding(translations, f): + texts = [t[1] for t in translations] + words = [] + + start_unused = 0x80 + end_unused = 0xFF + max_ord = 0 + for text in texts: + for c in text: + ord_c = ord(c) + max_ord = max(ord_c, max_ord) + if 0x80 <= ord_c < 0xFF: + end_unused = min(ord_c, end_unused) + max_words = end_unused - 0x80 + + bits_per_codepoint = 16 if max_ord > 255 else 8 + values_type = "uint16_t" if max_ord > 255 else "uint8_t" + while len(words) < max_words: + # Until the dictionary is filled to capacity, use a heuristic to find + # the best "word" (2- to 11-gram) to add to it. + # + # The TextSplitter allows us to avoid considering parts of the text + # that are already covered by a previously chosen word, for example + # if "the" is in words then not only will "the" not be considered + # again, neither will "there" or "wither", since they have "the" + # as substrings. + extractor = TextSplitter(words) + counter = collections.Counter() + for t in texts: + for atom in extractor.iter(t): + counter[atom] += 1 + cb = huffman.codebook(counter.items()) + lengths = sorted(dict((v, len(cb[k])) for k, v in counter.items()).items()) + + def bit_length(s): + return sum(len(cb[c]) for c in s) + + def est_len(occ): + idx = bisect.bisect_left(lengths, (occ, 0)) + return lengths[idx][1] + 1 + + # The cost of adding a dictionary word is just its storage size + # while its savings is close to the difference between the original + # huffman bit-length of the string and the estimated bit-length + # of the dictionary word, times the number of times the word appears. + # + # The savings is not strictly accurate because including a word into + # the Huffman tree bumps up the encoding lengths of all words in the + # same subtree. In the extreme case when the new word is so frequent + # that it gets a one-bit encoding, all other words will cost an extra + # bit each. This is empirically modeled by the constant factor added to + # cost, but the specific value used isn't "proven" to be correct. + # + # Another source of inaccuracy is that compressed strings end up + # on byte boundaries, not bit boundaries, so saving 1 bit somewhere + # might not save a byte. + # + # In fact, when this change was first made, some translations (luckily, + # ones on boards not at all close to full) wasted up to 40 bytes, + # while the most constrained boards typically gained 100 bytes or + # more. + # + # The difference between the two is the estimated net savings, in bits. + def est_net_savings(s, occ): + savings = occ * (bit_length(s) - est_len(occ)) + cost = len(s) * bits_per_codepoint + 24 + return savings - cost + + counter = collections.Counter() + for t in texts: + for (found, word) in extractor.iter_words(t): + if not found: + for substr in iter_substrings(word, minlen=2, maxlen=11): + counter[substr] += 1 + + # Score the candidates we found. This is a semi-empirical formula that + # attempts to model the number of bits saved as closely as possible. + # + # It attempts to compute the codeword lengths of the original word + # to the codeword length the dictionary entry would get, times + # the number of occurrences, less the ovehead of the entries in the + # words[] array. + + scores = sorted( + ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items()), key=lambda x: x[1] + ) + + # Pick the one with the highest score. The score must be negative. + if not scores or scores[0][-1] >= 0: + break + + word = scores[0][0] + words.append(word) + + words.sort(key=len) + extractor = TextSplitter(words) + counter = collections.Counter() + for t in texts: + for atom in extractor.iter(t): + counter[atom] += 1 + cb = huffman.codebook(counter.items()) + + word_start = start_unused + word_end = word_start + len(words) - 1 + f.write(f"// # words {len(words)}\n") + f.write(f"// words {words}\n") + + values = [] + length_count = {} + renumbered = 0 + last_length = None + canonical = {} + for atom, code in sorted(cb.items(), key=lambda x: (len(x[1]), x[0])): + values.append(atom) + length = len(code) + if length not in length_count: + length_count[length] = 0 + length_count[length] += 1 + if last_length: + renumbered <<= length - last_length + canonical[atom] = "{0:0{width}b}".format(renumbered, width=length) + # print(f"atom={repr(atom)} code={code}", file=sys.stderr) + if len(atom) > 1: + o = words.index(atom) + 0x80 + s = "".join(C_ESCAPES.get(ch1, ch1) for ch1 in atom) + else: + s = C_ESCAPES.get(atom, atom) + o = ord(atom) + f.write(f"// {o} {s} {counter[atom]} {canonical[atom]} {renumbered}\n") + renumbered += 1 + last_length = length + lengths = bytearray() + f.write(f"// length count {length_count}\n") + + for i in range(1, max(length_count) + 2): + lengths.append(length_count.get(i, 0)) + f.write(f"// values {values} lengths {len(lengths)} {lengths}\n") + + f.write(f"// {values} {lengths}\n") + values = [(atom if len(atom) == 1 else chr(0x80 + words.index(atom))) for atom in values] + max_translation_encoded_length = max( + len(translation.encode("utf-8")) for (original, translation) in translations + ) + + maxlen = len(words[-1]) + minlen = len(words[0]) + wlencount = [len([None for w in words if len(w) == l]) for l in range(minlen, maxlen + 1)] + + f.write("typedef {} mchar_t;\n".format(values_type)) + f.write("const uint8_t lengths[] = {{ {} }};\n".format(", ".join(map(str, lengths)))) + f.write("const mchar_t values[] = {{ {} }};\n".format(", ".join(str(ord(u)) for u in values))) + f.write( + "#define compress_max_length_bits ({})\n".format( + max_translation_encoded_length.bit_length() + ) + ) + f.write( + "const mchar_t words[] = {{ {} }};\n".format( + ", ".join(str(ord(c)) for w in words for c in w) + ) + ) + f.write("const uint8_t wlencount[] = {{ {} }};\n".format(", ".join(str(p) for p in wlencount))) + f.write("#define word_start {}\n".format(word_start)) + f.write("#define word_end {}\n".format(word_end)) + f.write("#define minlen {}\n".format(minlen)) + f.write("#define maxlen {}\n".format(maxlen)) + + return (values, lengths, words, canonical, extractor) + + +def decompress(encoding_table, encoded, encoded_length_bits): + (values, lengths, words, _, _) = encoding_table + dec = [] + this_byte = 0 + this_bit = 7 + b = encoded[this_byte] + bits = 0 + for i in range(encoded_length_bits): + bits <<= 1 + if 0x80 & b: + bits |= 1 + + b <<= 1 + if this_bit == 0: + this_bit = 7 + this_byte += 1 + if this_byte < len(encoded): + b = encoded[this_byte] + else: + this_bit -= 1 + length = bits + + i = 0 + while i < length: + bits = 0 + bit_length = 0 + max_code = lengths[0] + searched_length = lengths[0] + while True: + bits <<= 1 + if 0x80 & b: + bits |= 1 + + b <<= 1 + bit_length += 1 + if this_bit == 0: + this_bit = 7 + this_byte += 1 + if this_byte < len(encoded): + b = encoded[this_byte] + else: + this_bit -= 1 + if max_code > 0 and bits < max_code: + # print('{0:0{width}b}'.format(bits, width=bit_length)) + break + max_code = (max_code << 1) + lengths[bit_length] + searched_length += lengths[bit_length] + + v = values[searched_length + bits - max_code] + if v >= chr(0x80) and v < chr(0x80 + len(words)): + v = words[ord(v) - 0x80] + i += len(v.encode("utf-8")) + dec.append(v) + return "".join(dec) + + +def compress(encoding_table, decompressed, encoded_length_bits, len_translation_encoded): + if not isinstance(decompressed, str): + raise TypeError() + (_, _, _, canonical, extractor) = encoding_table + + enc = bytearray(len(decompressed) * 3) + current_bit = 7 + current_byte = 0 + + bits = encoded_length_bits + 1 + for i in range(bits - 1, 0, -1): + if len_translation_encoded & (1 << (i - 1)): + enc[current_byte] |= 1 << current_bit + if current_bit == 0: + current_bit = 7 + current_byte += 1 + else: + current_bit -= 1 + + for atom in extractor.iter(decompressed): + for b in canonical[atom]: + if b == "1": + enc[current_byte] |= 1 << current_bit + if current_bit == 0: + current_bit = 7 + current_byte += 1 + else: + current_bit -= 1 + + if current_bit != 7: + current_byte += 1 + return enc[:current_byte] + + +def qstr_escape(qst): + def esc_char(m): + c = ord(m.group(0)) + try: + name = codepoint2name[c] + except KeyError: + name = "0x%02x" % c + return "_" + name + "_" + + return re.sub(r"[^A-Za-z0-9_]", esc_char, qst) + + +def parse_input_headers(infiles): + i18ns = set() + + # read the qstrs in from the input files + for infile in infiles: + with open(infile, "rt") as f: + for line in f: + line = line.strip() + + match = re.match(r'^TRANSLATE\("(.*)"\)$', line) + if match: + i18ns.add(match.group(1)) + continue + + return i18ns + + +def escape_bytes(qstr): + if all(32 <= ord(c) <= 126 and c != "\\" and c != '"' for c in qstr): + # qstr is all printable ASCII so render it as-is (for easier debugging) + return qstr + else: + # qstr contains non-printable codes so render entire thing as hex pairs + qbytes = bytes_cons(qstr, "utf8") + return "".join(("\\x%02x" % b) for b in qbytes) + + +def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr): + qbytes = bytes_cons(qstr, "utf8") + qlen = len(qbytes) + qhash = compute_hash(qbytes, cfg_bytes_hash) + if qlen >= (1 << (8 * cfg_bytes_len)): + print("qstr is too long:", qstr) + assert False + qdata = escape_bytes(qstr) + return '%d, %d, "%s"' % (qhash, qlen, qdata) + + +def output_translation_data(encoding_table, i18ns, out): + # print out the starter of the generated C file + out.write("// This file was automatically generated by maketranslatedata.py\n") + out.write('#include "supervisor/shared/translate/compressed_string.h"\n') + out.write("\n") + + total_text_size = 0 + total_text_compressed_size = 0 + max_translation_encoded_length = max( + len(translation.encode("utf-8")) for original, translation in i18ns + ) + encoded_length_bits = max_translation_encoded_length.bit_length() + for i, translation in enumerate(i18ns): + original, translation = translation + translation_encoded = translation.encode("utf-8") + compressed = compress( + encoding_table, translation, encoded_length_bits, len(translation_encoded) + ) + total_text_compressed_size += len(compressed) + decompressed = decompress(encoding_table, compressed, encoded_length_bits) + assert decompressed == translation + for c in C_ESCAPES: + decompressed = decompressed.replace(c, C_ESCAPES[c]) + formatted = ["{:d}".format(x) for x in compressed] + out.write( + "const compressed_string_t translation{} = {{ .data = {}, .tail = {{ {} }} }}; // {}\n".format( + i, formatted[0], ", ".join(formatted[1:]), original, decompressed + ) + ) + total_text_size += len(translation.encode("utf-8")) + + out.write("\n") + out.write("// {} bytes worth of translations\n".format(total_text_size)) + out.write("// {} bytes worth of translations compressed\n".format(total_text_compressed_size)) + out.write("// {} bytes saved\n".format(total_text_size - total_text_compressed_size)) + + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser( + description="Process QSTR definitions into headers for compilation" + ) + parser.add_argument( + "infiles", metavar="N", type=str, nargs="+", help="an integer for the accumulator" + ) + parser.add_argument( + "--translation", default=None, type=str, help="translations for i18n() items" + ) + parser.add_argument( + "--compression_filename", + type=argparse.FileType("w", encoding="UTF-8"), + help="header for compression info", + ) + parser.add_argument( + "--translation_filename", + type=argparse.FileType("w", encoding="UTF-8"), + help="c file for translation data", + ) + + args = parser.parse_args() + + i18ns = parse_input_headers(args.infiles) + i18ns = sorted(i18ns) + translations = translate(args.translation, i18ns) + encoding_table = compute_huffman_coding(translations, args.compression_filename) + output_translation_data(encoding_table, translations, args.translation_filename) diff --git a/py/py.mk b/py/py.mk index f1864e58b3..2d10358e47 100644 --- a/py/py.mk +++ b/py/py.mk @@ -252,19 +252,24 @@ $(HEADER_BUILD)/qstrdefs.preprocessed.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEF # qstr data $(HEADER_BUILD)/qstrdefs.enum.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h $(STEPECHO) "GEN $@" - $(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@ + $(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py --output_type=enums $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@ # Adding an order only dependency on $(HEADER_BUILD) causes $(HEADER_BUILD) to get # created before we run the script to generate the .h # Note: we need to protect the qstr names from the preprocessor, so we wrap # the lines in "" and then unwrap after the preprocessor is finished. -$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h +$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h $(STEPECHO) "GEN $@" - $(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@ + $(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py --output_type=data $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@ + +$(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/compression.generated.h: $(PY_SRC)/maketranslationdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h + $(STEPECHO) "GEN $@" + $(Q)$(PYTHON) $(PY_SRC)/maketranslationdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo --translation_filename $(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/qstrdefs.preprocessed.h + +PY_O += $(PY_BUILD)/translations-$(TRANSLATION).o $(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h - # build a list of registered modules for py/objmodule.c. $(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h @$(ECHO) "GEN $@" diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h index acccfa4cd5..ff90aae525 100644 --- a/supervisor/shared/translate/translate_impl.h +++ b/supervisor/shared/translate/translate_impl.h @@ -32,6 +32,14 @@ #include "supervisor/shared/translate/compressed_string.h" +#ifndef NO_QSTR +#define QDEF(id, hash, len, str) +#define TRANSLATION(english_id, number) extern compressed_string_t translation##number; +#include "genhdr/qstrdefs.generated.h" +#undef TRANSLATION +#undef QDEF +#endif + #if CIRCUITPY_TRANSLATE_OBJECT == 0 static #endif @@ -43,7 +51,7 @@ __attribute__((always_inline)) const compressed_string_t *translate(const char *original) { #ifndef NO_QSTR #define QDEF(id, hash, len, str) - #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else + #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return &translation##number; } else #include "genhdr/qstrdefs.generated.h" #undef TRANSLATION #undef QDEF diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 5f4a65623f..9c78f420a8 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -190,7 +190,7 @@ endif USB_HIGHSPEED ?= 0 CFLAGS += -DUSB_HIGHSPEED=$(USB_HIGHSPEED) -$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h +$(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf" From 4f27337207a74351a4d85016428df815896c0efa Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 2 Jun 2022 21:24:56 +0200 Subject: [PATCH 0419/2403] Only check the savings if a word occurs at least twice Profiling shows that `est_net_savings` is one of the highest costs of the whole process. Approximately, you can save storage only if a word appears more than once, and doing this greatly reduces the number of `est_net_savings` calls. Locally, it reduces the time for this specific build step by 50% on ports/unix coverage build, without affecting the size of the generated binary. --- py/makeqstrdata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py index 74ad78c47d..7222ded805 100644 --- a/py/makeqstrdata.py +++ b/py/makeqstrdata.py @@ -400,7 +400,8 @@ def compute_huffman_coding(translations, compression_filename): # words[] array. scores = sorted( - ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items()), key=lambda x: x[1] + ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items() if occ > 1), + key=lambda x: x[1], ) # Pick the one with the highest score. The score must be negative. From 36b4d49a78092550a8c5666c30e4a5fa3bce5d5c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Jun 2022 12:26:42 -0700 Subject: [PATCH 0420/2403] Fix display resources build qstrdefs.generated.h no longer includes the translated strings. So, use the .po file directly. --- supervisor/supervisor.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 9c78f420a8..d5c49aa7fc 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -156,7 +156,7 @@ ifeq ($(CIRCUITPY_DISPLAYIO), 1) supervisor/shared/display.c ifeq ($(CIRCUITPY_TERMINALIO), 1) - SUPERVISOR_O += $(BUILD)/autogen_display_resources.o + SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o endif endif @@ -194,10 +194,10 @@ $(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.gener CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf" -$(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD) +$(BUILD)/autogen_display_resources-$(TRANSLATION).c: ../../tools/gen_display_resources.py $(TOP)/locale/$(TRANSLATION).po Makefile | $(HEADER_BUILD) $(STEPECHO) "GEN $@" $(Q)install -d $(BUILD)/genhdr $(Q)$(PYTHON) ../../tools/gen_display_resources.py \ --font $(CIRCUITPY_DISPLAY_FONT) \ - --sample_file $(HEADER_BUILD)/qstrdefs.generated.h \ - --output_c_file $(BUILD)/autogen_display_resources.c + --sample_file $(TOP)/locale/$(TRANSLATION).po \ + --output_c_file $(BUILD)/autogen_display_resources-$(TRANSLATION).c From 0d257fc4f875d2e44e01abf7703ee124b4af8e66 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Jun 2022 12:30:19 -0700 Subject: [PATCH 0421/2403] Fix mpy-cross and unix builds --- mpy-cross/mpy-cross.mk | 2 +- ports/unix/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 0689322127..311b5239d1 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -78,6 +78,6 @@ endif OBJ = $(PY_CORE_O) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) -$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h +$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h include $(TOP)/py/mkrules.mk diff --git a/ports/unix/Makefile b/ports/unix/Makefile index c9a9289d42..cd72b45fe6 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -363,4 +363,4 @@ install: $(PROG) uninstall: -rm $(BINDIR)/$(PROG) -$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h +$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h From b6901078506de8cd468a9d8d3fe1623d3fe8b05d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Jun 2022 12:33:51 -0700 Subject: [PATCH 0422/2403] Fix mpy-cross again --- mpy-cross/mpy-cross.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 311b5239d1..452e2f3c1f 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -78,6 +78,6 @@ endif OBJ = $(PY_CORE_O) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) -$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h +$(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h include $(TOP)/py/mkrules.mk From 1d0546da313b27cd33f4788c7e351917b1c1a496 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Thu, 2 Jun 2022 16:31:39 -0500 Subject: [PATCH 0423/2403] Made tcp set arguments keywords --- shared-bindings/wifi/Radio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index a0cf97c092..cb5090d0f4 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -414,17 +414,17 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj); -//| def set_ipv4_address(self, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address, ipv4_dns: Optional[ipaddress.IPv4Address]) -> None: +//| def set_ipv4_address(self, *, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address, ipv4_dns: Optional[ipaddress.IPv4Address]) -> None: //| """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional. //| Setting the address manually will stop the DHCP client.""" //| ... STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_OBJ, }, - { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_OBJ, }, - { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_OBJ, }, - { MP_QSTR_ipv4_dns, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, }, + { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, }, + { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, }, + { MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL} }, }; wifi_radio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); @@ -434,7 +434,7 @@ STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_a common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 4, wifi_radio_set_ipv4_address); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address); //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station when connected to an access point. None otherwise.""" From fdb133bbe8262ec72e469976b5c652f8d66364a3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 2 Jun 2022 16:41:11 -0400 Subject: [PATCH 0424/2403] add adafruit_feather_esp32s3_4mbflash_2mbpsram --- .../board.c | 50 +++++++++++++ .../mpconfigboard.h | 45 ++++++++++++ .../mpconfigboard.mk | 22 ++++++ .../pins.c | 73 +++++++++++++++++++ .../sdkconfig | 47 ++++++++++++ 5 files changed, 237 insertions(+) create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/sdkconfig diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c new file mode 100644 index 0000000000..d4d55c2e23 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c @@ -0,0 +1,50 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "components/driver/include/driver/gpio.h" +#include "components/hal/include/hal/gpio_hal.h" +#include "common-hal/microcontroller/Pin.h" + +void board_init(void) { + reset_board(); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + // Turn on I2C power by default. + + gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(7, true); +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h new file mode 100644 index 0000000000..125d0440d5 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h @@ -0,0 +1,45 @@ +/* + * 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32S3 4MB Flash 2MB PSPRAM" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO33) +#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO38) +#define DEFAULT_UART_BUS_TX (&pin_GPIO39) + +#define DOUBLE_TAP_PIN (&pin_GPIO34) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk new file mode 100644 index 0000000000..c2785fba92 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk @@ -0,0 +1,22 @@ +USB_VID = 0x239A +USB_PID = 0x811C +USB_PRODUCT = "Adafruit Feather ESP32S3 4MB Flash 2MB PSRAM" +USB_MANUFACTURER = "Adafruit" + +IDF_TARGET = esp32s3 + +# Make room for build +CIRCUITPY_ULAB = 0 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=qio +CIRCUITPY_ESP_FLASH_FREQ=40m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_MODULE=wrover diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c new file mode 100644 index 0000000000..cf4c915e7f --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c @@ -0,0 +1,73 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) }, + + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, + + { MP_ROM_QSTR(MP_QSTR_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, + + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) }, + + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) }, + + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, + + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/sdkconfig new file mode 100644 index 0000000000..9a05ab0205 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/sdkconfig @@ -0,0 +1,47 @@ +# +# Component config +# +# +# ESP32S3-Specific +# +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +# +# SPI RAM config +# +CONFIG_SPIRAM_MODE_QUAD=y +# CONFIG_SPIRAM_MODE_OCT is not set +CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set +CONFIG_SPIRAM_SIZE=2097152 +# +# PSRAM Clock and CS IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM Clock and CS IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +# CONFIG_SPIRAM_SPEED_120M is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +CONFIG_SPIRAM_USE_MEMMAP=y +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +# end of SPI RAM config + +# end of ESP32S3-Specific + +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + +# end of Component config From 963861d0b6b64a1326c0043d4422f71f9eb6cb71 Mon Sep 17 00:00:00 2001 From: ajs256 Date: Thu, 2 Jun 2022 04:53:36 +0000 Subject: [PATCH 0425/2403] Translated using Weblate (French) Currently translated at 95.5% (939 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/ --- locale/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/fr.po b/locale/fr.po index ce77777225..94aa8879de 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-06-02 04:53+0000\n" +"PO-Revision-Date: 2022-06-03 01:35+0000\n" "Last-Translator: ajs256 \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "%q doit être %d-%d" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "%q doit être à 1 alors que %q est True" +msgstr "%q doit être 1 quand %q est True" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" From 113b070e77041e738206c63bf0c7105ff947296c Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Fri, 3 Jun 2022 14:19:47 -0700 Subject: [PATCH 0426/2403] fix(swan_r5): 3v3 was enabled but then immediately reset. Moved initialization to `reset_board` which happens after `reset_all_pins`. --- ports/stm/boards/swan_r5/board.c | 3 +-- ports/stm/boards/swan_r5/mpconfigboard.h | 3 +++ ports/stm/boards/swan_r5/pins.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/stm/boards/swan_r5/board.c b/ports/stm/boards/swan_r5/board.c index 36f3946236..bb424eea0b 100644 --- a/ports/stm/boards/swan_r5/board.c +++ b/ports/stm/boards/swan_r5/board.c @@ -59,8 +59,6 @@ void board_init(void) { // Without this, USB does not function. HAL_InitTick((1UL << __NVIC_PRIO_BITS) - 1UL); - initialize_discharge_pin(); - __HAL_RCC_GPIOE_CLK_ENABLE(); GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; @@ -78,6 +76,7 @@ bool board_requests_safe_mode(void) { } void reset_board(void) { + initialize_discharge_pin(); } void board_deinit(void) { diff --git a/ports/stm/boards/swan_r5/mpconfigboard.h b/ports/stm/boards/swan_r5/mpconfigboard.h index da07d6530b..e82b8ab3d2 100644 --- a/ports/stm/boards/swan_r5/mpconfigboard.h +++ b/ports/stm/boards/swan_r5/mpconfigboard.h @@ -64,3 +64,6 @@ #define DEFAULT_UART_BUS_RX (&pin_PA10) #define DEFAULT_UART_BUS_TX (&pin_PA09) + +#define SWAN_R5_DISCHARGE_3V3 (&pin_PE06) +#define SWAN_R5_ENABLE_3V3 (&pin_PE04) \ No newline at end of file diff --git a/ports/stm/boards/swan_r5/pins.c b/ports/stm/boards/swan_r5/pins.c index 6780795dee..7032eae4c4 100644 --- a/ports/stm/boards/swan_r5/pins.c +++ b/ports/stm/boards/swan_r5/pins.c @@ -86,8 +86,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ext), MP_ROM_PTR(&carrier_type) }, - { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), MP_ROM_PTR(&pin_PE04) }, - { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), MP_ROM_PTR(&pin_PE06) }, + { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), MP_ROM_PTR(SWAN_R5_ENABLE_3V3) }, + { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), MP_ROM_PTR(SWAN_R5_DISCHARGE_3V3) }, { MP_ROM_QSTR(MP_QSTR_DISABLE_DISCHARGING), MP_ROM_TRUE }, { MP_ROM_QSTR(MP_QSTR_ENABLE_DISCHARGING), MP_ROM_FALSE }, From 87f4cd6bcaacc3f0d5d32dd8f069fb111790b675 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 3 Jun 2022 16:21:50 -0500 Subject: [PATCH 0427/2403] return expression instead of if statement Co-authored-by: Scott Shawcroft --- shared-module/displayio/TileGrid.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index 5f347420ac..3fd4c99d44 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -345,12 +345,8 @@ void common_hal_displayio_tilegrid_set_transpose_xy(displayio_tilegrid_t *self, bool common_hal_displayio_tilegrid_contains(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { uint16_t right_edge = self->x + (self->width_in_tiles * self->tile_width); uint16_t bottom_edge = self->y + (self->height_in_tiles * self->tile_height); - if (x >= self->x && x <= right_edge && - y >= self->y && y <= bottom_edge) { - return true; - } else { - return false; - } + return x >= self->x && x <= right_edge && + y >= self->y && y <= bottom_edge; } void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { From bc0fdaa026e2c8164a149c8337df7e0d6fb33cee Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 3 Jun 2022 17:01:24 -0500 Subject: [PATCH 0428/2403] fix tilegrid.contains() docstring --- shared-bindings/displayio/TileGrid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index 5d7db650e0..89010674f9 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -323,8 +323,8 @@ MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, (mp_obj_t)&displayio_tilegrid_set_transpose_xy_obj); //| def contains(self, touch_tuple: tuple) -> bool: -//| """returns true if first two values in touch_tuple represent an x,y coordinate -//| inside the tilegrid rectangle bounds""" +//| """Returns True if the first two values in ``touch_tuple`` represent an x,y coordinate +//| inside the tilegrid rectangle bounds.""" //| STATIC mp_obj_t displayio_tilegrid_obj_contains(mp_obj_t self_in, mp_obj_t touch_tuple) { displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in); From 6831dd8aaa92238b6edec45839f99abc571e6ea4 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 3 Jun 2022 17:04:53 -0500 Subject: [PATCH 0429/2403] return expression formatting --- shared-module/displayio/TileGrid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index 3fd4c99d44..dde398109f 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -346,7 +346,7 @@ bool common_hal_displayio_tilegrid_contains(displayio_tilegrid_t *self, uint16_t uint16_t right_edge = self->x + (self->width_in_tiles * self->tile_width); uint16_t bottom_edge = self->y + (self->height_in_tiles * self->tile_height); return x >= self->x && x <= right_edge && - y >= self->y && y <= bottom_edge; + y >= self->y && y <= bottom_edge; } void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { From 8ccb95547540ee8d07b95d603138f562ca093bd0 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 3 Jun 2022 15:06:58 -0700 Subject: [PATCH 0430/2403] Move translation .o to PY_CORE_O --- py/py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/py.mk b/py/py.mk index 2d10358e47..6827fbe786 100644 --- a/py/py.mk +++ b/py/py.mk @@ -266,7 +266,7 @@ $(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/compression.generated. $(STEPECHO) "GEN $@" $(Q)$(PYTHON) $(PY_SRC)/maketranslationdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo --translation_filename $(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/qstrdefs.preprocessed.h -PY_O += $(PY_BUILD)/translations-$(TRANSLATION).o +PY_CORE_O += $(PY_BUILD)/translations-$(TRANSLATION).o $(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h From 78e4b9446b822b13bd6a52af9a907486966f3689 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Fri, 3 Jun 2022 15:12:41 -0700 Subject: [PATCH 0431/2403] chore(swan_r5): pre-commit formatting --- ports/stm/boards/swan_r5/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/stm/boards/swan_r5/mpconfigboard.h b/ports/stm/boards/swan_r5/mpconfigboard.h index e82b8ab3d2..94cc58ff9d 100644 --- a/ports/stm/boards/swan_r5/mpconfigboard.h +++ b/ports/stm/boards/swan_r5/mpconfigboard.h @@ -66,4 +66,4 @@ #define DEFAULT_UART_BUS_TX (&pin_PA09) #define SWAN_R5_DISCHARGE_3V3 (&pin_PE06) -#define SWAN_R5_ENABLE_3V3 (&pin_PE04) \ No newline at end of file +#define SWAN_R5_ENABLE_3V3 (&pin_PE04) From d1cdb7202000b8aae0d03cefb7cea3201ef6dd90 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 3 Jun 2022 18:21:20 -0400 Subject: [PATCH 0432/2403] Update ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h Co-authored-by: Scott Shawcroft --- .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h index 125d0440d5..da623f73be 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h @@ -26,7 +26,7 @@ // Micropython setup -#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32S3 4MB Flash 2MB PSPRAM" +#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32S3 4MB Flash 2MB PSRAM" #define MICROPY_HW_MCU_NAME "ESP32S3" #define MICROPY_HW_NEOPIXEL (&pin_GPIO33) From c9c864a4f7cab0ad32fd6bc758fc663c33651e59 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 3 Jun 2022 17:51:33 -0500 Subject: [PATCH 0433/2403] fix off by one right and bottom edges of tilegrid.contains() --- shared-module/displayio/TileGrid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index dde398109f..36cbf76619 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -345,8 +345,8 @@ void common_hal_displayio_tilegrid_set_transpose_xy(displayio_tilegrid_t *self, bool common_hal_displayio_tilegrid_contains(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { uint16_t right_edge = self->x + (self->width_in_tiles * self->tile_width); uint16_t bottom_edge = self->y + (self->height_in_tiles * self->tile_height); - return x >= self->x && x <= right_edge && - y >= self->y && y <= bottom_edge; + return x >= self->x && x < right_edge && + y >= self->y && y < bottom_edge; } void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) { From be6936c8ec6028943b18940e2c34d06b293b2a98 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 3 Jun 2022 18:57:01 -0700 Subject: [PATCH 0434/2403] Shrink MatrixPortal M4 build --- ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk index fdedf9bc9b..3a1d417626 100644 --- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk @@ -10,6 +10,8 @@ QSPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ +CIRCUITPY_LTO_PARTITION = one + CIRCUITPY_AESIO = 0 CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_PARALLELDISPLAY = 0 From 761e66e85b76eef2df59f3e962bc0b102a57e2d6 Mon Sep 17 00:00:00 2001 From: Nathan Young <77929198+NathanY3G@users.noreply.github.com> Date: Sat, 4 Jun 2022 15:21:06 +0200 Subject: [PATCH 0435/2403] Enable UF2 builds for STM32 Thing Plus --- tools/build_board_info.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build_board_info.py b/tools/build_board_info.py index 1534288b04..b86e6dd4ba 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -69,6 +69,7 @@ extension_by_board = { "microbit_v2": COMBINED_HEX, # stm32 "meowbit_v121": UF2, + "sparkfun_stm32_thing_plus": BIN_UF2, # esp32c3 "adafruit_qtpy_esp32c3": BIN, "ai_thinker_esp32-c3s": BIN, From cbff9dd8e3cd590a26239814e7ec543c0936ef37 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 4 Jun 2022 11:08:20 -0500 Subject: [PATCH 0436/2403] add new argument for all boards with built-in display --- ports/atmel-samd/boards/hallowing_m0_express/board.c | 3 ++- ports/atmel-samd/boards/hallowing_m4_express/board.c | 3 ++- ports/atmel-samd/boards/monster_m4sk/board.c | 3 ++- ports/atmel-samd/boards/pewpew_lcd/board.c | 3 ++- ports/atmel-samd/boards/pewpew_m4/board.c | 3 ++- ports/atmel-samd/boards/pybadge/board.c | 3 ++- ports/atmel-samd/boards/pygamer/board.c | 3 ++- ports/atmel-samd/boards/pyportal/board.c | 3 ++- ports/atmel-samd/boards/seeeduino_wio_terminal/board.c | 3 ++- ports/atmel-samd/boards/ugame10/board.c | 3 ++- ports/espressif/boards/adafruit_esp32s2_camera/board.c | 3 ++- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 3 ++- .../boards/adafruit_feather_esp32s2_tftback_nopsram/board.c | 3 ++- ports/espressif/boards/adafruit_funhouse/board.c | 3 ++- ports/espressif/boards/espressif_esp32s3_box/board.c | 3 ++- ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c | 3 ++- ports/espressif/boards/hexky_s2/board.c | 3 ++- ports/espressif/boards/hiibot_iots2/board.c | 3 ++- ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c | 3 ++- ports/espressif/boards/morpheans_morphesp-240/board.c | 3 ++- ports/nrf/boards/clue_nrf52840_express/board.c | 3 ++- ports/nrf/boards/hiibot_bluefi/board.c | 3 ++- ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c | 3 ++- ports/nrf/boards/ohs2020_badge/board.c | 3 ++- ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c | 3 ++- ports/raspberrypi/boards/pimoroni_picosystem/board.c | 3 ++- ports/stm/boards/meowbit_v121/board.c | 3 ++- 27 files changed, 54 insertions(+), 27 deletions(-) diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c index aace060b01..5a6b43e475 100644 --- a/ports/atmel-samd/boards/hallowing_m0_express/board.c +++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c @@ -111,7 +111,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c index 358c326b62..d17835d0f8 100644 --- a/ports/atmel-samd/boards/hallowing_m4_express/board.c +++ b/ports/atmel-samd/boards/hallowing_m4_express/board.c @@ -91,7 +91,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c index e4e5da3ea5..e42721dee7 100644 --- a/ports/atmel-samd/boards/monster_m4sk/board.c +++ b/ports/atmel-samd/boards/monster_m4sk/board.c @@ -92,7 +92,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c index 8198a3c83d..7f5cac5241 100644 --- a/ports/atmel-samd/boards/pewpew_lcd/board.c +++ b/ports/atmel-samd/boards/pewpew_lcd/board.c @@ -90,7 +90,8 @@ void board_init(void) { true, // auto_refresh 2, // native_frames_per_second true, // backlight_on_high - true); // SH1107_addressing + true, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c index 50f829fa88..331056fb9f 100644 --- a/ports/atmel-samd/boards/pewpew_m4/board.c +++ b/ports/atmel-samd/boards/pewpew_m4/board.c @@ -144,7 +144,8 @@ void board_init(void) { false, // auto_refresh 20, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c index ce5beb6bc3..b7646cabe1 100644 --- a/ports/atmel-samd/boards/pybadge/board.c +++ b/ports/atmel-samd/boards/pybadge/board.c @@ -114,7 +114,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c index 9a85e166c4..a9041de305 100644 --- a/ports/atmel-samd/boards/pygamer/board.c +++ b/ports/atmel-samd/boards/pygamer/board.c @@ -114,7 +114,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c index 262850cbf2..8176d363c9 100644 --- a/ports/atmel-samd/boards/pyportal/board.c +++ b/ports/atmel-samd/boards/pyportal/board.c @@ -101,7 +101,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c index 62b2299f56..4a25ed64ec 100644 --- a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c +++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c @@ -109,7 +109,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency // Enabling the Power of the 40-pin at the back CTR_5V.base.type = &digitalio_digitalinout_type; diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c index d75841be54..53bc613088 100644 --- a/ports/atmel-samd/boards/ugame10/board.c +++ b/ports/atmel-samd/boards/ugame10/board.c @@ -111,7 +111,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c index 109e9b4b9a..23a2eb7a34 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c +++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c @@ -96,7 +96,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index 46f1fbd31c..aab7fbc608 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -125,7 +125,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); common_hal_never_reset_pin(&pin_GPIO45); // backlight pin diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c index 71b381616f..04b6a46779 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c @@ -101,7 +101,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency */ } diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c index 03e967148c..8b4adc5fa9 100644 --- a/ports/espressif/boards/adafruit_funhouse/board.c +++ b/ports/espressif/boards/adafruit_funhouse/board.c @@ -104,7 +104,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/espressif/boards/espressif_esp32s3_box/board.c b/ports/espressif/boards/espressif_esp32s3_box/board.c index 8e93c31e07..7eb4c6b20c 100644 --- a/ports/espressif/boards/espressif_esp32s3_box/board.c +++ b/ports/espressif/boards/espressif_esp32s3_box/board.c @@ -87,7 +87,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency // Debug UART #ifdef DEBUG diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c index edb8e6a994..0cfedf9933 100644 --- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c @@ -115,7 +115,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool espressif_board_reset_pin_number(gpio_num_t pin_number) { diff --git a/ports/espressif/boards/hexky_s2/board.c b/ports/espressif/boards/hexky_s2/board.c index 88ac4fc661..584253488b 100644 --- a/ports/espressif/boards/hexky_s2/board.c +++ b/ports/espressif/boards/hexky_s2/board.c @@ -119,7 +119,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); common_hal_never_reset_pin(&pin_GPIO45); // backlight pin diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c index 23ba71ed7e..e65401deda 100644 --- a/ports/espressif/boards/hiibot_iots2/board.c +++ b/ports/espressif/boards/hiibot_iots2/board.c @@ -124,7 +124,8 @@ static void display_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); common_hal_never_reset_pin(&pin_GPIO38); // backlight pin diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c index 492c3f8f4d..8f0d01fe79 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c @@ -124,7 +124,8 @@ static void display_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); common_hal_never_reset_pin(&pin_GPIO33); // backlight pin diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c index b15562de38..54e83eaaab 100644 --- a/ports/espressif/boards/morpheans_morphesp-240/board.c +++ b/ports/espressif/boards/morpheans_morphesp-240/board.c @@ -205,7 +205,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second false, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); } diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c index f2e648f473..549b3a54ca 100644 --- a/ports/nrf/boards/clue_nrf52840_express/board.c +++ b/ports/nrf/boards/clue_nrf52840_express/board.c @@ -91,7 +91,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // not SH1107 + false, // not SH1107 + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c index 9616596caa..6ee4292e70 100644 --- a/ports/nrf/boards/hiibot_bluefi/board.c +++ b/ports/nrf/boards/hiibot_bluefi/board.c @@ -92,7 +92,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c index 87c9b2f226..db65ecbbd2 100644 --- a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c +++ b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c @@ -92,7 +92,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c index dd0a9b2547..14f1467c79 100644 --- a/ports/nrf/boards/ohs2020_badge/board.c +++ b/ports/nrf/boards/ohs2020_badge/board.c @@ -91,7 +91,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second false, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c index 7b00ff7ecc..7aa9feee1b 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c @@ -103,7 +103,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - true); // SH1107_addressing + true, // SH1107_addressing + 50000); // backlight pwm frequency } bool board_requests_safe_mode(void) { diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c index e8458e90d9..0a07f3b0dd 100644 --- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c +++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c @@ -108,7 +108,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency } void board_deinit(void) { diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c index 59ba948237..95d9139998 100644 --- a/ports/stm/boards/meowbit_v121/board.c +++ b/ports/stm/boards/meowbit_v121/board.c @@ -111,7 +111,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false); // SH1107_addressing + false, // SH1107_addressing + 50000); // backlight pwm frequency board_buzz_obj.base.type = &audiopwmio_pwmaudioout_type; common_hal_audiopwmio_pwmaudioout_construct(&board_buzz_obj, From 67de89861e5834e5adfa40090d6f3de0675d3b52 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 4 Jun 2022 11:36:45 -0500 Subject: [PATCH 0437/2403] new argument for feather s3 tft display init --- ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c index 46f1fbd31c..aab7fbc608 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c @@ -125,7 +125,8 @@ void board_init(void) { true, // auto_refresh 60, // native_frames_per_second true, // backlight_on_high - false // SH1107_addressing + false, // SH1107_addressing + 50000 // backlight pwm frequency ); common_hal_never_reset_pin(&pin_GPIO45); // backlight pin From 7a073317f7a3a7257391624cecfa5509291f9518 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 01:03:02 +0200 Subject: [PATCH 0438/2403] Update PID (0x102E) --- ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk index 358928a9ac..73f3676825 100644 --- a/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk +++ b/ports/raspberrypi/boards/weact_studio_pico/mpconfigboard.mk @@ -1,5 +1,5 @@ USB_VID = 0x239A -USB_PID = 0x000B +USB_PID = 0x102E USB_PRODUCT = "Pico" USB_MANUFACTURER = "WeAct Studio" From 2f0d82a50ba16300dff596f6ddc7c957f803179a Mon Sep 17 00:00:00 2001 From: Nathan Young <77929198+NathanY3G@users.noreply.github.com> Date: Mon, 6 Jun 2022 09:52:23 +0200 Subject: [PATCH 0439/2403] Disable board.SPI() for Challenger NB RP2040 WiFi This was done as a result of an issue with the SPI pin mappings. Please refer to the following for additional information: https://ilabs.se/challenger-rp2040-wifi-spi-bug --- .../boards/challenger_nb_rp2040_wifi/mpconfigboard.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/mpconfigboard.h b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/mpconfigboard.h index 013b8e9276..a3f79af481 100644 --- a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/mpconfigboard.h +++ b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/mpconfigboard.h @@ -5,6 +5,3 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO17) #define DEFAULT_I2C_BUS_SDA (&pin_GPIO0) #define DEFAULT_I2C_BUS_SCL (&pin_GPIO1) -#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22) -#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23) -#define DEFAULT_SPI_BUS_MISO (&pin_GPIO24) From 6b09f99eaa1930505c5d9149ca0ddc48a0007a92 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 6 Jun 2022 10:35:37 -0700 Subject: [PATCH 0440/2403] Add back ULAB --- .../mpconfigboard.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk index c2785fba92..22175fce5d 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk @@ -5,9 +5,6 @@ USB_MANUFACTURER = "Adafruit" IDF_TARGET = esp32s3 -# Make room for build -CIRCUITPY_ULAB = 0 - INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = MPZ From 0a3808807510eea8d8aef6199587f198a307b3cd Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 7 Jun 2022 07:35:54 +0200 Subject: [PATCH 0441/2403] Fix dependencies for translate.c again --- ports/unix/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/unix/Makefile b/ports/unix/Makefile index cd72b45fe6..ae293fcb7d 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -363,4 +363,4 @@ install: $(PROG) uninstall: -rm $(BINDIR)/$(PROG) -$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h +$(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h From 37bbd2c6758d9230ca59617d97e826511977bb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Soukup?= Date: Sun, 5 Jun 2022 20:00:40 +0000 Subject: [PATCH 0442/2403] Translated using Weblate (Czech) Currently translated at 11.3% (112 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/cs/ --- locale/cs.po | 130 +++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/locale/cs.po b/locale/cs.po index d15b61c9eb..3a95daae9c 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -6,15 +6,15 @@ 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-12-23 01:53+0000\n" -"Last-Translator: dronecz \n" +"PO-Revision-Date: 2022-06-07 16:16+0000\n" +"Last-Translator: Matěj Soukup \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.10.1\n" +"X-Generator: Weblate 4.13-dev\n" #: main.c msgid "" @@ -79,7 +79,7 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d" #: ports/raspberrypi/common-hal/analogio/AnalogOut.c #: ports/raspberrypi/common-hal/rtc/RTC.c msgid "%q" -msgstr "" +msgstr "%q" #: shared-bindings/microcontroller/Pin.c msgid "%q and %q contain duplicate pins" @@ -87,7 +87,7 @@ msgstr "%q a %q obsahují duplicitní piny" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "%q and %q must be different" -msgstr "" +msgstr "%q a %q musí být rozdílné" #: shared-bindings/microcontroller/Pin.c msgid "%q contains duplicate pins" @@ -111,31 +111,31 @@ msgstr "Indexy %q musí být celá čísla, nikoli %s" #: shared-module/bitbangio/SPI.c msgid "%q init failed" -msgstr "" +msgstr "Inicializace %q selhala" #: py/argcheck.c msgid "%q length must be %d" -msgstr "" +msgstr "Délka %q musí být %d" #: py/argcheck.c msgid "%q length must be %d-%d" -msgstr "%q délka musí být %d-%d" +msgstr "%q délka musí být %d-%d" #: py/argcheck.c msgid "%q length must be <= %d" -msgstr "" +msgstr "Délka %q musí být <= %d" #: py/argcheck.c msgid "%q length must be >= %d" -msgstr "" +msgstr "Délka %q musí být >= %d" #: shared-bindings/busio/I2C.c msgid "%q length must be >= 1" -msgstr "%q délka musí být >= 1" +msgstr "%q délka musí být >= 1" #: py/argcheck.c msgid "%q must be %d" -msgstr "" +msgstr "%q musí být %d" #: py/argcheck.c msgid "%q must be %d-%d" @@ -143,7 +143,7 @@ msgstr "%q musí být %d-%d" #: shared-bindings/displayio/Display.c msgid "%q must be 1 when %q is True" -msgstr "" +msgstr "%q musí být 1, pokud %q je True" #: py/argcheck.c shared-bindings/gifio/GifWriter.c msgid "%q must be <= %d" @@ -167,7 +167,7 @@ msgstr "%q musí být string" #: py/argcheck.c msgid "%q must be an int" -msgstr "" +msgstr "%q musí být int" #: py/argcheck.c msgid "%q must be of type %q" @@ -175,7 +175,7 @@ msgstr "%q musí být typu %q" #: shared-bindings/digitalio/Pull.c msgid "%q must be of type %q or None" -msgstr "" +msgstr "%q musí být typu %q nebo None" #: ports/atmel-samd/common-hal/busio/UART.c msgid "%q must be power of 2" @@ -310,47 +310,47 @@ msgstr "" #: shared-module/struct/__init__.c msgid "'S' and 'O' are not supported format types" -msgstr "" +msgstr "'S' a 'O' nejsou podporované typy formátů" #: py/compile.c msgid "'align' requires 1 argument" -msgstr "" +msgstr "'align' vyžaduje 1 argument" #: py/compile.c msgid "'await' outside function" -msgstr "" +msgstr "'await' je volán mimo funkci" #: py/compile.c msgid "'await', 'async for' or 'async with' outside async function" -msgstr "" +msgstr "'await', 'async for' nebo 'async' je volán mimo async" #: py/compile.c msgid "'break' outside loop" -msgstr "" +msgstr "'break' je volán vně cyklu" #: py/compile.c msgid "'continue' outside loop" -msgstr "" +msgstr "'continue' je volán vně cyklu" #: py/objgenerator.c msgid "'coroutine' object is not an iterator" -msgstr "" +msgstr "Objekt 'coroutine' není iterátor" #: py/compile.c msgid "'data' requires at least 2 arguments" -msgstr "" +msgstr "'data' vyžaduje nejméně 2 argumenty" #: py/compile.c msgid "'data' requires integer arguments" -msgstr "" +msgstr "'data' vyžaduje celočíselné argumenty" #: py/compile.c msgid "'label' requires 1 argument" -msgstr "" +msgstr "'label' vyžaduje 1 argument" #: py/compile.c msgid "'return' outside function" -msgstr "" +msgstr "'return' je volán mimo funkci" #: py/compile.c msgid "'yield from' inside async function" @@ -366,7 +366,7 @@ msgstr "" #: py/obj.c msgid ", in %q\n" -msgstr ", v %q\n" +msgstr ", v% q\n" #: py/objcomplex.c msgid "0.0 to a complex power" @@ -374,11 +374,11 @@ msgstr "" #: py/modbuiltins.c msgid "3-arg pow() not supported" -msgstr "" +msgstr "pow() nepodporuje 3 argumenty" #: shared-module/msgpack/__init__.c msgid "64 bit types" -msgstr "" +msgstr "64 bit typy" #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/atmel-samd/common-hal/countio/Counter.c @@ -388,22 +388,22 @@ msgstr "" #: ports/espressif/common-hal/analogio/AnalogIn.c msgid "ADC2 is being used by WiFi" -msgstr "" +msgstr "WiFi používá ADC2" #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c #, c-format msgid "Address must be %d bytes long" -msgstr "" +msgstr "Adresa musí být %d bajtů dlouhá" #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" -msgstr "" +msgstr "Všechny CAN periferie jsou používány" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c #: ports/nrf/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" -msgstr "" +msgstr "Všechny I2C periferie jsou používány" #: ports/espressif/common-hal/countio/Counter.c #: ports/espressif/common-hal/frequencyio/FrequencyIn.c @@ -419,19 +419,19 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" -msgstr "" +msgstr "Všechny SPI periferie jsou používány" #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c msgid "All UART peripherals are in use" -msgstr "" +msgstr "Všechny UART periferie jsou používány" #: ports/nrf/common-hal/countio/Counter.c #: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" -msgstr "" +msgstr "Všechny kanály jsou používány" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "All event channels in use" @@ -448,7 +448,7 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "All timers for this pin are in use" -msgstr "" +msgstr "Všechny časovače pro tento pin jsou používány" #: ports/atmel-samd/common-hal/_pew/PewPew.c #: ports/atmel-samd/common-hal/audioio/AudioOut.c @@ -465,7 +465,7 @@ msgstr "" #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c msgid "All timers in use" -msgstr "" +msgstr "Všechny časovače jsou použity" #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c @@ -479,15 +479,15 @@ msgstr "" #: shared-module/memorymonitor/AllocationAlarm.c #: shared-module/memorymonitor/AllocationSize.c msgid "Already running" -msgstr "" +msgstr "Již běží" #: ports/espressif/common-hal/wifi/Radio.c msgid "Already scanning for wifi networks" -msgstr "" +msgstr "Již skenuje wifi sítě" #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" -msgstr "" +msgstr "Jiný PWMAudioOut je již aktivní" #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c @@ -496,28 +496,28 @@ msgstr "" #: shared-bindings/pulseio/PulseOut.c msgid "Array must contain halfwords (type 'H')" -msgstr "" +msgstr "Pole musí obsahovat poloviční slova (typ „H“)" #: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c msgid "Array values should be single bytes." -msgstr "" +msgstr "Hodnoty pole by měly být jednoduché bajty." #: shared-bindings/microcontroller/Pin.c msgid "At most %d %q may be specified (not %d)" -msgstr "" +msgstr "Lze zadat maximálně %d %q (nikoli %d)" #: shared-module/memorymonitor/AllocationAlarm.c #, c-format msgid "Attempt to allocate %d blocks" -msgstr "" +msgstr "Pokus o alokování %d bloků" #: supervisor/shared/safe_mode.c msgid "Attempted heap allocation when VM not running." -msgstr "" +msgstr "Pokus o alokaci haldy, když neběží VM." #: ports/raspberrypi/audio_dma.c msgid "Audio conversion not implemented" -msgstr "" +msgstr "Konverze audia není implementována" #: shared-bindings/wifi/Radio.c msgid "AuthMode.OPEN is not used with password" @@ -525,28 +525,28 @@ msgstr "" #: shared-bindings/wifi/Radio.c msgid "Authentication failure" -msgstr "" +msgstr "Autentizace selhala" #: main.c msgid "Auto-reload is off.\n" -msgstr "Automatické načtení je vypnuté.\n" +msgstr "Automatické načtení je vypnuto.\n" #: main.c msgid "" "Auto-reload is on. Simply save files over USB to run them or enter REPL to " "disable.\n" msgstr "" -"Automatické načtení je zapnuté. Stačí uložit soubory na USB nebo vstoupit " -"do REPLu pro jeho zakázání.\n" +"Automatické opětovné načtení je zapnuto. Jednoduše uložte soubory přes USB a " +"spusťte je, nebo vypněte REPL.\n" #: ports/espressif/common-hal/canio/CAN.c msgid "Baudrate not supported by peripheral" -msgstr "" +msgstr "Baudrate není podporován periférií" #: shared-module/displayio/Display.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" -msgstr "" +msgstr "Pod minimální obnovovací frekvencí" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must be sequential pins" @@ -558,40 +558,40 @@ msgstr "" #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." -msgstr "" +msgstr "Bitová hloubka musí být násobkem 8." #: shared-bindings/bitmaptools/__init__.c msgid "Bitmap size and bits per value must match" -msgstr "" +msgstr "Velikost bitmapy a počet bitů na hodnotu se musí shodovat" #: supervisor/shared/safe_mode.c msgid "Boot device must be first device (interface #0)." -msgstr "" +msgstr "Bootovací zařízení musí být první (rozhraní #0)." #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "Both RX and TX required for flow control" -msgstr "" +msgstr "RX a TX jsou vyžadovány pro kontrolu toku" #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c msgid "Both pins must support hardware interrupts" -msgstr "" +msgstr "Oba piny musí podporovat hardwarové přerušení" #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "Brightness must be 0-1.0" -msgstr "" +msgstr "Jas musí být 0-1,0" #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" -msgstr "" +msgstr "Jas není nastavitelný" #: shared-bindings/_bleio/UUID.c #, c-format msgid "Buffer + offset too small %d %d %d" -msgstr "" +msgstr "Vyrovnávací paměť + offset je příliš malý %d %d %d" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Buffer elements must be 4 bytes long or less" @@ -604,17 +604,17 @@ msgstr "" #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is too small" -msgstr "" +msgstr "Vyrovnávací paměť je příliš malá" #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c #, c-format msgid "Buffer length %d too big. It must be less than %d" -msgstr "" +msgstr "Délka vyrovnávací paměti %d je příliš velká. Musí být menší než %d" #: ports/atmel-samd/common-hal/sdioio/SDCard.c #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c msgid "Buffer length must be a multiple of 512" -msgstr "" +msgstr "Délka vyrovnávací paměti musí být násobkem 512" #: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" @@ -659,7 +659,7 @@ msgstr "" #: ports/cxd56/common-hal/camera/Camera.c msgid "Camera init" -msgstr "" +msgstr "Inizializace kamery" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." From db28264c5c9ca2cbe26a3cde6016f1fd3f176082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Soukup?= Date: Tue, 7 Jun 2022 21:17:21 +0000 Subject: [PATCH 0443/2403] Translated using Weblate (Czech) Currently translated at 11.6% (115 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/cs/ --- locale/cs.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/cs.po b/locale/cs.po index 3a95daae9c..08b236ec9f 100644 --- a/locale/cs.po +++ b/locale/cs.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: 2022-06-07 16:16+0000\n" +"PO-Revision-Date: 2022-06-07 21:19+0000\n" "Last-Translator: Matěj Soukup \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -358,7 +358,7 @@ msgstr "" #: py/compile.c msgid "'yield' outside function" -msgstr "" +msgstr "'yield' je volán mimo funkci" #: py/compile.c msgid "*x must be assignment target" @@ -384,7 +384,7 @@ msgstr "64 bit typy" #: ports/atmel-samd/common-hal/countio/Counter.c #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c msgid "A hardware interrupt channel is already in use" -msgstr "" +msgstr "Kanál hardwarového přerušení je již používán" #: ports/espressif/common-hal/analogio/AnalogIn.c msgid "ADC2 is being used by WiFi" @@ -435,7 +435,7 @@ msgstr "Všechny kanály jsou používány" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "All event channels in use" -msgstr "" +msgstr "Všechny kanály událostí jsou již používány" #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c From 91000ea294b40c8cca34a29b19078ce77f538ef5 Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 8 Jun 2022 16:38:21 +0200 Subject: [PATCH 0444/2403] Adds support for Challenger RP2040 LoRa boards --- .../boards/challenger_rp2040_lora/board.c | 40 +++++++++ .../challenger_rp2040_lora/mpconfigboard.h | 10 +++ .../challenger_rp2040_lora/mpconfigboard.mk | 13 +++ .../pico-sdk-configboard.h | 1 + .../boards/challenger_rp2040_lora/pins.c | 85 +++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 ports/raspberrypi/boards/challenger_rp2040_lora/board.c create mode 100644 ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/challenger_rp2040_lora/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/challenger_rp2040_lora/pins.c diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/board.c b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c new file mode 100644 index 0000000000..dc22834750 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Pontus Oldberg, Invector Labs + * + * 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) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.h b/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.h new file mode 100644 index 0000000000..a5245b98fe --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.h @@ -0,0 +1,10 @@ +#define MICROPY_HW_BOARD_NAME "Challenger RP2040 LoRa" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define DEFAULT_UART_BUS_TX (&pin_GPIO16) +#define DEFAULT_UART_BUS_RX (&pin_GPIO17) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO0) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO1) +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO20) diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.mk new file mode 100644 index 0000000000..1150bfb331 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/mpconfigboard.mk @@ -0,0 +1,13 @@ +USB_VID = 0x2e8a +USB_PID = 0x1023 +USB_PRODUCT = "Challenger RP2040 LoRa" +USB_MANUFACTURER = "Invector Labs" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" + +CIRCUITPY__EVE = 1 + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/pico-sdk-configboard.h b/ports/raspberrypi/boards/challenger_rp2040_lora/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c b/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c new file mode 100644 index 0000000000..0eff192f9f --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c @@ -0,0 +1,85 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + + // RFM95W connections + { MP_ROM_QSTR(MP_QSTR_RFM95W_CS), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_SCK), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_SDO), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_SDI), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_RST), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_DIO0), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_DIO1), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_RFM95W_DIO2), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + + { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 5c13f844c723513096236e4c47dbc7fe31fb490a Mon Sep 17 00:00:00 2001 From: Pontus Oldberg Date: Wed, 8 Jun 2022 16:43:49 +0200 Subject: [PATCH 0445/2403] Fixed pre-commit trailing whitespace --- ports/raspberrypi/boards/challenger_rp2040_lora/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/board.c b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c index dc22834750..e8208ee5d3 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_lora/board.c +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2022 Pontus Oldberg, Invector Labs + * Copyright (c) 2022 Pontus Oldberg, Invector Labs * * 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 d492565ab64f8b124335f2fffe5bb1f3796fcb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Soukup?= Date: Tue, 7 Jun 2022 21:30:09 +0000 Subject: [PATCH 0446/2403] Translated using Weblate (Czech) Currently translated at 20.7% (204 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/cs/ --- locale/cs.po | 179 ++++++++++++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 88 deletions(-) diff --git a/locale/cs.po b/locale/cs.po index 08b236ec9f..a60095c054 100644 --- a/locale/cs.po +++ b/locale/cs.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: 2022-06-07 21:19+0000\n" +"PO-Revision-Date: 2022-06-08 15:15+0000\n" "Last-Translator: Matěj Soukup \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -470,7 +470,7 @@ msgstr "Všechny časovače jsou použity" #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Already advertising." -msgstr "" +msgstr "Již propagujeme." #: ports/atmel-samd/common-hal/canio/Listener.c msgid "Already have all-matches listener" @@ -492,7 +492,7 @@ msgstr "Jiný PWMAudioOut je již aktivní" #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c msgid "Another send is already active" -msgstr "" +msgstr "Další odesílání je již aktivní" #: shared-bindings/pulseio/PulseOut.c msgid "Array must contain halfwords (type 'H')" @@ -554,7 +554,7 @@ msgstr "" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must share a clock unit" -msgstr "" +msgstr "Výběr bitových hodin a slov musí sdílet jednotku hodin" #: shared-bindings/audiobusio/PDMIn.c msgid "Bit depth must be multiple of 8." @@ -599,7 +599,7 @@ msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." -msgstr "" +msgstr "Buffer není bytearray." #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c @@ -623,7 +623,7 @@ msgstr "" #: shared-bindings/_bleio/PacketBuffer.c #, c-format msgid "Buffer too short by %d bytes" -msgstr "" +msgstr "Buffer je příliš krátký o %d bajtů" #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c msgid "Buffers must be same size" @@ -635,15 +635,15 @@ msgstr "" #: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" -msgstr "" +msgstr "Sběrnicový pin %d je již používán" #: shared-bindings/_bleio/UUID.c msgid "Byte buffer must be 16 bytes." -msgstr "" +msgstr "Bajtový buffer musí být 16 bajtů." #: shared-bindings/aesio/aes.c msgid "CBC blocks must be multiples of 16 bytes" -msgstr "" +msgstr "Bloky CBC musí být násobky 16 bajtů" #: supervisor/shared/safe_mode.c msgid "CIRCUITPY drive could not be found or created." @@ -655,7 +655,7 @@ msgstr "" #: py/objtype.c msgid "Call super().__init__() before accessing native object." -msgstr "" +msgstr "Volání super().__init__() před přístupem k nativnímu objektu." #: ports/cxd56/common-hal/camera/Camera.c msgid "Camera init" @@ -676,7 +676,7 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" -msgstr "" +msgstr "Nelze nastavit CCCD na místní charakteristiku" #: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c #: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c @@ -691,18 +691,18 @@ msgstr "" #: shared-bindings/memorymonitor/AllocationSize.c #: shared-bindings/pulseio/PulseIn.c msgid "Cannot delete values" -msgstr "" +msgstr "Nelze odstranit hodnoty" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c #: ports/nrf/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" -msgstr "" +msgstr "Nelze získat ve výstupním režimu" #: ports/nrf/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" -msgstr "" +msgstr "Nelze získat teplotu" #: shared-bindings/_bleio/Adapter.c msgid "Cannot have scan responses for extended, connectable advertisements." @@ -714,7 +714,7 @@ msgstr "" #: shared-bindings/audiobusio/PDMIn.c msgid "Cannot record to a file" -msgstr "" +msgstr "Nelze nahrávat do souboru" #: shared-module/storage/__init__.c msgid "Cannot remount '/' when visible via USB." @@ -732,16 +732,16 @@ msgstr "" #: shared-bindings/digitalio/DigitalInOut.c msgid "Cannot set value when direction is input." -msgstr "" +msgstr "Nelze nastavit hodnotu, když směr je vstup." #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "Cannot specify RTS or CTS in RS485 mode" -msgstr "" +msgstr "Nelze určit RTS nebo CTS v režimu RS485" #: py/objslice.c msgid "Cannot subclass slice" -msgstr "" +msgstr "Nelze použít řez podtřídy" #: shared-module/bitbangio/SPI.c msgid "Cannot transfer without MOSI and MISO pins" @@ -749,7 +749,7 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Cannot vary frequency on a timer that is already in use" -msgstr "" +msgstr "Nelze měnit frekvenci časovače, který je již používán" #: ports/nrf/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" @@ -761,11 +761,11 @@ msgstr "" #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "CharacteristicBuffer writing not provided" -msgstr "" +msgstr "CharacteristicBuffer psaní není poskytováno" #: supervisor/shared/safe_mode.c msgid "CircuitPython core code crashed hard. Whoops!\n" -msgstr "" +msgstr "Jádro kódu CircuitPython tvrdě havarovalo. Jejda!\n" #: supervisor/shared/safe_mode.c msgid "CircuitPython was unable to allocate the heap." @@ -773,17 +773,18 @@ msgstr "" #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" -msgstr "" +msgstr "Hodiny jsou příliš dlouhé" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Clock unit in use" -msgstr "" +msgstr "Jednotka hodin je používána" #: shared-bindings/_bleio/Connection.c msgid "" "Connection has been disconnected and can no longer be used. Create a new " "connection." msgstr "" +"Připojení bylo odpojeno a nelze jej dále používat. Vytvořte nové připojení." #: py/persistentcode.c msgid "Corrupt .mpy file" @@ -799,40 +800,40 @@ msgstr "" #: shared-bindings/pwmio/PWMOut.c msgid "Could not start PWM" -msgstr "" +msgstr "Nelze spustit PWM" #: ports/stm/common-hal/busio/UART.c msgid "Could not start interrupt, RX busy" -msgstr "" +msgstr "Nelze začít přerušení, RX je zaneprázdněn" #: shared-module/audiomp3/MP3Decoder.c msgid "Couldn't allocate decoder" -msgstr "" +msgstr "Dekodér nelze přiřadit" #: supervisor/shared/safe_mode.c msgid "Crash into the HardFault_Handler." -msgstr "" +msgstr "Pád do HardFault_Handler." #: ports/stm/common-hal/analogio/AnalogOut.c msgid "DAC Channel Init Error" -msgstr "" +msgstr "Chyba inicializace kanálu DAC" #: ports/stm/common-hal/analogio/AnalogOut.c msgid "DAC Device Init Error" -msgstr "" +msgstr "Chyba inicializace zařízení DAC" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "DAC already in use" -msgstr "" +msgstr "DAC se již používá" #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" -msgstr "" +msgstr "Datový pin 0 musí být zarovnán na bajty" #: shared-module/audiocore/WaveFile.c msgid "Data chunk must follow fmt chunk" -msgstr "" +msgstr "Datový blok musí následovat fmt blok" #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c @@ -842,7 +843,7 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" -msgstr "" +msgstr "Data jsou příliš velká pro propagovaný paket" #: ports/stm/common-hal/alarm/pin/PinAlarm.c msgid "Deep sleep pins must use a rising edge with pulldown" @@ -850,22 +851,22 @@ msgstr "" #: shared-bindings/audiobusio/PDMIn.c msgid "Destination capacity is smaller than destination_length." -msgstr "" +msgstr "Cílová kapacita je menší než destination_length." #: ports/nrf/common-hal/audiobusio/I2SOut.c msgid "Device in use" -msgstr "" +msgstr "Zařízení je používáno" #: shared-bindings/displayio/Display.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." -msgstr "" +msgstr "Displej musí mít 16bitový barevný prostor." #: shared-bindings/displayio/Display.c #: shared-bindings/displayio/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" -msgstr "" +msgstr "Otočení displeje musí být po 90 stupních" #: shared-bindings/digitalio/DigitalInOut.c msgid "Drive mode not used when direction is input." @@ -873,7 +874,7 @@ msgstr "" #: shared-bindings/aesio/aes.c msgid "ECB only operates on 16 bytes at a time" -msgstr "" +msgstr "ECB operuje najednou pouze 16 bajtů" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/canio/CAN.c @@ -885,7 +886,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c msgid "EXTINT channel already in use" -msgstr "" +msgstr "EXTINT kanál se již používá" #: shared-module/synthio/MidiTrack.c #, c-format @@ -894,7 +895,7 @@ msgstr "" #: extmod/modure.c msgid "Error in regex" -msgstr "" +msgstr "Chyba v regulárním výrazu" #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c msgid "Error: Failure to bind" @@ -905,7 +906,7 @@ msgstr "" #: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c #: shared-bindings/neopixel_write/__init__.c msgid "Expected a %q" -msgstr "" +msgstr "Očekává se %q" #: shared-bindings/alarm/__init__.c msgid "Expected an alarm" @@ -930,7 +931,7 @@ msgstr "" #: shared-bindings/ps2io/Ps2.c msgid "Failed sending command." -msgstr "" +msgstr "Nepodařilo se odeslat příkaz." #: ports/nrf/sd_mutex.c #, c-format @@ -956,11 +957,11 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" -msgstr "" +msgstr "Připojení se nezdařilo: interní chyba" #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" -msgstr "" +msgstr "Nepodařilo se připojit: časový limit" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to init wifi" @@ -968,7 +969,7 @@ msgstr "" #: shared-module/audiomp3/MP3Decoder.c msgid "Failed to parse MP3 file" -msgstr "" +msgstr "Soubor MP3 se nepodařilo analyzovat" #: ports/nrf/sd_mutex.c #, c-format @@ -977,7 +978,7 @@ msgstr "" #: supervisor/shared/safe_mode.c msgid "Failed to write internal flash." -msgstr "" +msgstr "Nepodařilo se zapsat do interní paměti." #: supervisor/shared/safe_mode.c msgid "Fatal error." @@ -985,7 +986,7 @@ msgstr "" #: py/moduerrno.c msgid "File exists" -msgstr "" +msgstr "soubor existuje" #: ports/atmel-samd/common-hal/canio/Listener.c #: ports/espressif/common-hal/canio/Listener.c @@ -1021,7 +1022,7 @@ msgstr "" #: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c #: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c msgid "Function requires lock" -msgstr "" +msgstr "Funkce vyžaduje zámek" #: ports/cxd56/common-hal/gnss/GNSS.c msgid "GNSS init" @@ -1035,7 +1036,7 @@ msgstr "" #: shared-bindings/displayio/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Group already used" -msgstr "" +msgstr "Skupina již byla použita" #: ports/atmel-samd/common-hal/busio/SPI.c ports/cxd56/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/SPI.c @@ -1048,11 +1049,11 @@ msgstr "" #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c #: ports/stm/common-hal/sdioio/SDCard.c msgid "Hardware busy, try alternative pins" -msgstr "" +msgstr "Hardware je zaneprázdněn, zkuste alternativní piny" #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" -msgstr "" +msgstr "Hardware je používán, zkuste alternativní piny" #: extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" @@ -1073,7 +1074,7 @@ msgstr "" #: shared-bindings/aesio/aes.c #, c-format msgid "IV must be %d bytes long" -msgstr "" +msgstr "IV musí být dlouhé %d bajtů" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "In-buffer elements must be <= 4 bytes long" @@ -1084,10 +1085,12 @@ msgid "" "Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/" "mpy-update for more info." msgstr "" +"Nekompatibilní soubor .mpy. Aktualizujte prosím všechny soubory .mpy. Další " +"informace naleznete na adrese http://adafru.it/mpy-update." #: shared-bindings/_pew/PewPew.c msgid "Incorrect buffer size" -msgstr "" +msgstr "Nesprávná velikost vyrovnávací paměti" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Init program size invalid" @@ -1116,7 +1119,7 @@ msgstr "" #: ports/espressif/common-hal/neopixel_write/__init__.c py/moduerrno.c msgid "Input/output error" -msgstr "" +msgstr "Vstupně/výstupní chyba" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format @@ -1140,11 +1143,11 @@ msgstr "" #: ports/nrf/common-hal/_bleio/__init__.c msgid "Insufficient authentication" -msgstr "" +msgstr "Nedostatečná autentizace" #: ports/nrf/common-hal/_bleio/__init__.c msgid "Insufficient encryption" -msgstr "" +msgstr "Nedostatečné šifrování" #: ports/espressif/common-hal/wifi/Radio.c msgid "Interface must be started" @@ -1165,7 +1168,7 @@ msgstr "" #: shared-module/rgbmatrix/RGBMatrix.c #, c-format msgid "Internal error #%d" -msgstr "" +msgstr "Vnitřní chyba #%d" #: py/argcheck.c msgid "Invalid %q" @@ -1173,11 +1176,11 @@ msgstr "" #: shared-bindings/microcontroller/Pin.c msgid "Invalid %q pin" -msgstr "" +msgstr "Neplatný pin %q" #: ports/stm/common-hal/analogio/AnalogIn.c msgid "Invalid ADC Unit value" -msgstr "" +msgstr "Neplatná hodnota jednotky ADC" #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c @@ -1195,7 +1198,7 @@ msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #: py/moduerrno.c msgid "Invalid argument" -msgstr "" +msgstr "Neplatný argument" #: shared-module/displayio/Bitmap.c msgid "Invalid bits per value" @@ -1208,11 +1211,11 @@ msgstr "" #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" -msgstr "" +msgstr "Neplatná velikost bloku" #: supervisor/shared/safe_mode.c msgid "Invalid memory access." -msgstr "" +msgstr "Neplatný přístup k paměti." #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" @@ -1220,7 +1223,7 @@ msgstr "" #: shared-bindings/busio/UART.c msgid "Invalid pins" -msgstr "" +msgstr "Neplatné piny" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" @@ -1236,7 +1239,7 @@ msgstr "" #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" -msgstr "" +msgstr "Klíč musí být dlouhý 16, 24 nebo 32 bajtů" #: shared-module/is31fl3741/FrameBuffer.c msgid "LED mappings must match display size" @@ -1265,7 +1268,7 @@ msgstr "" #: shared-module/displayio/Shape.c #, c-format msgid "Maximum x value when mirrored is %d" -msgstr "" +msgstr "Maximální hodnota x při zrcadlení je %d" #: shared-bindings/audiobusio/PDMIn.c msgid "Microphone startup delay must be in range 0.0 to 1.0" @@ -1282,7 +1285,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" -msgstr "" +msgstr "Chybí pin MISO nebo MOSI" #: ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI pin" @@ -1325,16 +1328,16 @@ msgstr "" #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c msgid "Must be a %q subclass." -msgstr "" +msgstr "Musí být podtřída %q." #: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c msgid "Must provide MISO or MOSI pin" -msgstr "" +msgstr "Musí poskytnout pin MISO nebo MOSI" #: shared-bindings/rgbmatrix/RGBMatrix.c #, c-format msgid "Must use a multiple of 6 rgb pins, not %d" -msgstr "" +msgstr "Je nutné použít několik kolíků 6 rgb, nikoli %d" #: supervisor/shared/safe_mode.c msgid "NLR jump failed. Likely memory corruption." @@ -1346,7 +1349,7 @@ msgstr "" #: py/qstr.c msgid "Name too long" -msgstr "" +msgstr "Jméno je příliš dlouhé" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" @@ -1359,19 +1362,19 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/nrf/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" -msgstr "" +msgstr "Žádné CCCD pro tuto charakteristiku" #: ports/atmel-samd/common-hal/analogio/AnalogOut.c #: ports/stm/common-hal/analogio/AnalogOut.c msgid "No DAC on chip" -msgstr "" +msgstr "Žádný DAC na čipu" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c #: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "No DMA channel found" -msgstr "" +msgstr "Nebyl nalezen žádný kanál DMA" #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c msgid "No DMA pacing timer found" @@ -1385,7 +1388,7 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" -msgstr "" +msgstr "Žádný pin MISO" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" @@ -1394,7 +1397,7 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MOSI Pin" -msgstr "" +msgstr "Žádný pin MOSI" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" @@ -1405,18 +1408,18 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "No RX pin" -msgstr "" +msgstr "Žádný RX pin" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "No TX pin" -msgstr "" +msgstr "Žádný TX pin" #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c msgid "No available clocks" -msgstr "" +msgstr "Žádné dostupné hodiny" #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c msgid "No capture in progress" @@ -1424,15 +1427,15 @@ msgstr "" #: shared-bindings/_bleio/PacketBuffer.c msgid "No connection: length cannot be determined" -msgstr "" +msgstr "Žádné připojení: nelze určit délku" #: shared-bindings/board/__init__.c msgid "No default %q bus" -msgstr "" +msgstr "Žádná výchozí sběrnice %q" #: ports/atmel-samd/common-hal/touchio/TouchIn.c msgid "No free GCLKs" -msgstr "" +msgstr "Žádné volné GCLK" #: shared-bindings/os/__init__.c msgid "No hardware random available" @@ -1448,7 +1451,7 @@ msgstr "" #: shared-bindings/aesio/aes.c msgid "No key was specified" -msgstr "" +msgstr "Nebyl zadán klíč" #: shared-bindings/time/__init__.c msgid "No long integer support" @@ -1476,11 +1479,11 @@ msgstr "" #: shared-module/touchio/TouchIn.c msgid "No pulldown on pin; 1Mohm recommended" -msgstr "" +msgstr "Žádný pulldown na pinu; doporučeno 1Mohm" #: py/moduerrno.c msgid "No space left on device" -msgstr "" +msgstr "Na zařízení nezůstal žádný prostor" #: py/moduerrno.c msgid "No such device" @@ -1488,11 +1491,11 @@ msgstr "" #: py/moduerrno.c msgid "No such file/directory" -msgstr "" +msgstr "Žádný takový soubor / adresář" #: shared-module/rgbmatrix/RGBMatrix.c msgid "No timer available" -msgstr "" +msgstr "Není k dispozici žádný časovač" #: supervisor/shared/safe_mode.c msgid "Nordic system firmware failure assertion." @@ -1510,12 +1513,12 @@ msgstr "" #: ports/nrf/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" -msgstr "" +msgstr "Nepřipojený" #: shared-bindings/audiobusio/I2SOut.c shared-bindings/audioio/AudioOut.c #: shared-bindings/audiopwmio/PWMAudioOut.c msgid "Not playing" -msgstr "" +msgstr "Nehraje" #: shared-bindings/_bleio/__init__.c msgid "Not settable" From 64460107531ee110c809edec7823a557e1455b49 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 6 Jun 2022 16:54:02 -0700 Subject: [PATCH 0447/2403] Wi-Fi autoconnect and title bar status This adds support for CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD in `/.env`. When both are defined, CircuitPython will attempt to connect to the network even when user code isn't running. If the user code attempts to a network with the same SSID, it will return immediately. Connecting to another SSID will disconnect from the auto-connected network. If the user code initiates the connection, then it will be shutdown after user code exits. (Should match <8 behavior.) This PR also reworks the default displayio terminal. It now supports a title bar TileGrid in addition to the (newly renamed) scroll area. The default title bar is the top row of the display and is positioned to the right of the Blinka logo when it is enabled. The scroll area is now below the Blinka logo. The Wi-Fi auto-connect code now uses the title bar to show its state including the IP address when connected. It does this through the "standard" OSC control sequence `ESC ] 0 ; ESC \` where is the title bar string. This is commonly supported by terminals so it should work over USB and UART as well. Related to #6174 --- README.rst | 7 +- docs/environment.rst | 40 +++++++ docs/index.rst | 1 + locale/circuitpython.pot | 12 ++ main.c | 33 ++--- .../espressif_esp32s3_usb_otg_n8/board.c | 4 + .../espressif/common-hal/socketpool/Socket.c | 2 +- .../espressif/common-hal/socketpool/Socket.h | 2 +- .../common-hal/socketpool/__init__.c | 8 ++ ports/espressif/common-hal/wifi/Radio.c | 32 ++++- ports/espressif/common-hal/wifi/__init__.c | 20 +++- ports/espressif/supervisor/port.c | 8 -- py/circuitpy_defns.mk | 4 +- py/circuitpy_mpconfig.mk | 3 + shared-bindings/displayio/TileGrid.h | 1 + shared-bindings/socketpool/__init__.h | 2 + shared-bindings/terminalio/Terminal.c | 33 ++++- shared-bindings/terminalio/Terminal.h | 2 +- shared-bindings/wifi/Radio.c | 4 +- shared-bindings/wifi/Radio.h | 1 + shared-bindings/wifi/__init__.c | 2 +- shared-bindings/wifi/__init__.h | 4 +- shared-module/displayio/TileGrid.c | 21 ++++ shared-module/terminalio/Terminal.c | 113 +++++++++++------- shared-module/terminalio/Terminal.h | 7 +- supervisor/shared/background_callback.c | 18 ++- supervisor/shared/display.c | 101 ++++++++-------- supervisor/shared/display.h | 3 +- supervisor/shared/translate/translate_impl.h | 2 +- supervisor/shared/web_workflow/web_workflow.c | 92 ++++++++++++++ supervisor/shared/web_workflow/web_workflow.h | 35 ++++++ supervisor/shared/workflow.c | 69 +++++++++++ supervisor/supervisor.mk | 4 + supervisor/workflow.h | 4 + tools/gen_display_resources.py | 37 +++++- 35 files changed, 587 insertions(+), 144 deletions(-) create mode 100644 docs/environment.rst create mode 100644 supervisor/shared/web_workflow/web_workflow.c create mode 100644 supervisor/shared/web_workflow/web_workflow.h diff --git a/README.rst b/README.rst index 801466cbad..1f45007082 100644 --- a/README.rst +++ b/README.rst @@ -120,7 +120,7 @@ Behavior make each file independent from each other. - ``boot.py`` runs only once on start up before - USB is initialized. This lays the ground work for configuring USB at + workflows are initialized. This lays the ground work for configuring USB at startup rather than it being fixed. Since serial is not available, output is written to ``boot_out.txt``. - ``code.py`` (or ``main.py``) is run after every reload until it @@ -135,7 +135,10 @@ Behavior possible to fix code that causes nasty crashes by making it available through mass storage after the crash. A reset (the button) is needed after it's fixed to get back into normal mode. - RGB status LED indicating CircuitPython state. -- Re-runs ``code.py`` or other main file after file system writes over USB mass storage. (Disable with + - One green flash - code completed without error. + - Two red flashes - code ended due to an exception. + - Three yellow flashes - safe mode. May be due to CircuitPython internal error. +- Re-runs ``code.py`` or other main file after file system writes by a workflow. (Disable with ``supervisor.disable_autoreload()``) - Autoreload is disabled while the REPL is active. - Main is one of these: ``code.txt``, ``code.py``, ``main.py``, diff --git a/docs/environment.rst b/docs/environment.rst new file mode 100644 index 0000000000..2e5d81fca8 --- /dev/null +++ b/docs/environment.rst @@ -0,0 +1,40 @@ +Environment Variables +===================== + +CircuitPython 8.0.0 introduces support for environment variables. Environment +variables are commonly used to store "secrets" such as Wi-Fi passwords and API +keys. This method *does not* make them secure. It only separates them from the +code. + +CircuitPython supports these by mimicking the `dotenv `_ +CPython library. Other languages such as Javascript, PHP and Ruby also have +dotenv libraries. + +These libraries store environment variables in a ``.env`` file. Here is a simple +example: + +.. code-block:: bash + + KEY1='value1' + # Comment + KEY2='value2 + is multiple lines' + +CircuitPython uses the ``.env`` at the drive root (no folder) as the environment. +User code can access the values from the file using `os.getenv()`. It is +recommended to save any values used repeatedly in a variable because `os.getenv()` +will parse the ``/.env`` on every access. + +CircuitPython behavior +---------------------- + +CircuitPython will also read the environment to configure its behavior. Other +keys are ignored by CircuitPython. Here are the keys it uses: + +CIRCUITPY_WIFI_PASSWORD +~~~~~~~~~~~~~~~~~~~~~~~ +Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID + +CIRCUITPY_WIFI_SSID +~~~~~~~~~~~~~~~~~~~ +Wi-Fi SSID to auto-connect to even if user code is not running. diff --git a/docs/index.rst b/docs/index.rst index 6e9789852e..6a67fe0b7c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,6 +22,7 @@ Full Table of Contents supported_ports.rst troubleshooting.rst drivers.rst + environment.rst .. toctree:: :maxdepth: 1 diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index aa94f2485f..f965506d1b 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -1375,6 +1375,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2254,6 +2258,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3579,6 +3587,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/main.c b/main.c index d2b3edb16a..3488899946 100644 --- a/main.c +++ b/main.c @@ -101,6 +101,10 @@ #include "shared-module/memorymonitor/__init__.h" #endif +#if CIRCUITPY_SOCKETPOOL +#include "shared-bindings/socketpool/__init__.h" +#endif + #if CIRCUITPY_USB_HID #include "shared-module/usb_hid/__init__.h" #endif @@ -290,6 +294,16 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) { keypad_reset(); #endif + // Close user-initiated sockets. + #if CIRCUITPY_SOCKETPOOL + socketpool_user_reset(); + #endif + + // Turn off user initiated WiFi connections. + #if CIRCUITPY_WIFI + wifi_user_reset(); + #endif + // reset_board_buses() first because it may release pins from the never_reset state, so that // reset_port() can reset them. #if CIRCUITPY_BOARD @@ -303,6 +317,9 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) { stop_mp(); free_memory(heap); supervisor_move_memory(); + + // Let the workflows know we've reset in case they want to restart. + supervisor_workflow_reset(); } STATIC void print_code_py_status_message(safe_mode_t safe_mode) { @@ -889,21 +906,7 @@ int __attribute__((used)) main(void) { run_boot_py(safe_mode); - // Start USB after giving boot.py a chance to tweak behavior. - #if CIRCUITPY_USB - // Setup USB connection after heap is available. - // It needs the heap to build descriptors. - usb_init(); - #endif - - // Set up any other serial connection. - serial_init(); - - #if CIRCUITPY_BLEIO - bleio_reset(); - supervisor_bluetooth_enable_workflow(); - supervisor_start_bluetooth(); - #endif + supervisor_workflow_start(); // Boot script is finished, so now go into REPL or run code.py. int exit_code = PYEXEC_FORCED_EXIT; diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c index 0cfedf9933..f278c7ddbc 100644 --- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c @@ -117,6 +117,10 @@ void board_init(void) { true, // backlight_on_high false, // SH1107_addressing 50000); // backlight pwm frequency + + #if CIRCUITPY_DEBUG + common_hal_never_reset_pin(DEFAULT_UART_BUS_TX); + #endif } bool espressif_board_reset_pin_number(gpio_num_t pin_number) { diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index c16be01998..856400a4e7 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -39,7 +39,7 @@ STATIC socketpool_socket_obj_t *open_socket_handles[CONFIG_LWIP_MAX_SOCKETS]; -void socket_reset(void) { +void socket_user_reset(void) { for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) { if (open_socket_handles[i]) { if (open_socket_handles[i]->num > 0) { diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h index 943b5d9fdd..2b8ea9fcbf 100644 --- a/ports/espressif/common-hal/socketpool/Socket.h +++ b/ports/espressif/common-hal/socketpool/Socket.h @@ -45,7 +45,7 @@ typedef struct { mp_uint_t timeout_ms; } socketpool_socket_obj_t; -void socket_reset(void); +void socket_user_reset(void); bool register_open_socket(socketpool_socket_obj_t *self); #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SOCKETPOOL_SOCKET_H diff --git a/ports/espressif/common-hal/socketpool/__init__.c b/ports/espressif/common-hal/socketpool/__init__.c index fa0e7d5f3f..595977d24f 100644 --- a/ports/espressif/common-hal/socketpool/__init__.c +++ b/ports/espressif/common-hal/socketpool/__init__.c @@ -23,3 +23,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "shared-bindings/socketpool/__init__.h" + +#include "common-hal/socketpool/Socket.h" + +void socketpool_user_reset(void) { + socket_user_reset(); +} diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index 6451cb1414..e4a9aa4646 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -236,6 +236,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t if (!common_hal_wifi_radio_get_enabled(self)) { mp_raise_RuntimeError(translate("wifi is not enabled")); } + wifi_config_t *config = &self->sta_config; EventBits_t bits; // can't block since both bits are false after wifi_init @@ -245,16 +246,31 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t pdTRUE, pdTRUE, 0); - if (((bits & WIFI_CONNECTED_BIT) != 0) && - !((bits & WIFI_DISCONNECTED_BIT) != 0)) { - return WIFI_RADIO_ERROR_NONE; + bool connected = ((bits & WIFI_CONNECTED_BIT) != 0) && + !((bits & WIFI_DISCONNECTED_BIT) != 0); + if (connected) { + if (memcmp(ssid, config->sta.ssid, ssid_len) == 0) { + // Already connected to the desired network. + return WIFI_RADIO_ERROR_NONE; + } else { + xEventGroupClearBits(self->event_group_handle, WIFI_DISCONNECTED_BIT); + // Trying to switch networks so disconnect first. + esp_wifi_disconnect(); + do { + RUN_BACKGROUND_TASKS; + bits = xEventGroupWaitBits(self->event_group_handle, + WIFI_DISCONNECTED_BIT, + pdTRUE, + pdTRUE, + 0); + } while ((bits & WIFI_DISCONNECTED_BIT) == 0 && !mp_hal_is_interrupted()); + } } // explicitly clear bits since xEventGroupWaitBits may have timed out xEventGroupClearBits(self->event_group_handle, WIFI_CONNECTED_BIT); xEventGroupClearBits(self->event_group_handle, WIFI_DISCONNECTED_BIT); set_mode_station(self, true); - wifi_config_t *config = &self->sta_config; memcpy(&config->sta.ssid, ssid, ssid_len); config->sta.ssid[ssid_len] = 0; memcpy(&config->sta.password, password, password_len); @@ -368,6 +384,14 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) { return common_hal_ipaddress_new_ipv4address(self->ap_ip_info.netmask.addr); } +uint32_t wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) { + if (!esp_netif_is_netif_up(self->netif)) { + return 0; + } + esp_netif_get_ip_info(self->netif, &self->ip_info); + return self->ip_info.ip.addr; +} + mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) { if (!esp_netif_is_netif_up(self->netif)) { return mp_const_none; diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index 36cf27a69f..3da0fc7297 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -42,6 +42,8 @@ wifi_radio_obj_t common_hal_wifi_radio_obj; #include "components/log/include/esp_log.h" +#include "supervisor/workflow.h" + static const char *TAG = "wifi"; static void event_handler(void *arg, esp_event_base_t event_base, @@ -106,12 +108,19 @@ static void event_handler(void *arg, esp_event_base_t event_base, radio->retries_left = radio->starting_retries; xEventGroupSetBits(radio->event_group_handle, WIFI_CONNECTED_BIT); } + supervisor_workflow_request_background(); } -static bool wifi_inited, wifi_ever_inited; +static bool wifi_inited; +static bool wifi_ever_inited; +static bool wifi_user_initiated; -void common_hal_wifi_init(void) { +void common_hal_wifi_init(bool user_initiated) { + if (wifi_inited) { + return; + } wifi_inited = true; + wifi_user_initiated = user_initiated; common_hal_wifi_radio_obj.base.type = &wifi_radio_type; if (!wifi_ever_inited) { @@ -157,6 +166,12 @@ void common_hal_wifi_init(void) { common_hal_wifi_radio_set_enabled(self, true); } +void wifi_user_reset(void) { + if (wifi_user_initiated) { + wifi_reset(); + } +} + void wifi_reset(void) { if (!wifi_inited) { return; @@ -176,6 +191,7 @@ void wifi_reset(void) { esp_netif_destroy(radio->ap_netif); radio->ap_netif = NULL; wifi_inited = false; + supervisor_workflow_request_background(); } void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_address) { diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index bf606ad159..7ecdd140a2 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -282,14 +282,6 @@ void reset_port(void) { #if CIRCUITPY_WATCHDOG watchdog_reset(); #endif - - #if CIRCUITPY_WIFI - wifi_reset(); - #endif - - #if CIRCUITPY_SOCKETPOOL - socket_reset(); - #endif } void reset_to_bootloader(void) { diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 1918938255..c5c89ab19f 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -70,7 +70,9 @@ endif CIRCUITPY_LTO ?= 0 CIRCUITPY_LTO_PARTITION ?= balanced ifeq ($(CIRCUITPY_LTO),1) -CFLAGS += -flto -flto-partition=$(CIRCUITPY_LTO_PARTITION) +CFLAGS += -flto -flto-partition=$(CIRCUITPY_LTO_PARTITION) -DCIRCUITPY_LTO=1 +else +CFLAGS += -DCIRCUITPY_LTO=0 endif # Produce an object file for translate.c instead of including it in a header. diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 69f4c248bc..758e0226a8 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -480,6 +480,9 @@ CFLAGS += -DCIRCUITPY_WATCHDOG=$(CIRCUITPY_WATCHDOG) CIRCUITPY_WIFI ?= 0 CFLAGS += -DCIRCUITPY_WIFI=$(CIRCUITPY_WIFI) +CIRCUITPY_WEB_WORKFLOW ?= $(CIRCUITPY_WIFI) +CFLAGS += -DCIRCUITPY_WEB_WORKFLOW=$(CIRCUITPY_WEB_WORKFLOW) + # tinyusb port tailored configuration CIRCUITPY_TUSB_MEM_ALIGN ?= 4 CFLAGS += -DCIRCUITPY_TUSB_MEM_ALIGN=$(CIRCUITPY_TUSB_MEM_ALIGN) diff --git a/shared-bindings/displayio/TileGrid.h b/shared-bindings/displayio/TileGrid.h index 2b4e42cb46..fb56ba6101 100644 --- a/shared-bindings/displayio/TileGrid.h +++ b/shared-bindings/displayio/TileGrid.h @@ -69,5 +69,6 @@ void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t // Private API for scrolling the TileGrid. void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y); +void common_hal_displayio_tilegrid_set_all_tiles(displayio_tilegrid_t *self, uint8_t tile_index); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_TILEGRID_H diff --git a/shared-bindings/socketpool/__init__.h b/shared-bindings/socketpool/__init__.h index a017e96c6d..46034f257d 100644 --- a/shared-bindings/socketpool/__init__.h +++ b/shared-bindings/socketpool/__init__.h @@ -27,4 +27,6 @@ #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL___INIT___H #define MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL___INIT___H +void socketpool_user_reset(void); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL___INIT___H diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c index c6fd389b12..605ee2727f 100644 --- a/shared-bindings/terminalio/Terminal.c +++ b/shared-bindings/terminalio/Terminal.c @@ -38,31 +38,52 @@ #include "supervisor/shared/translate/translate.h" //| class Terminal: -//| """Display a character stream with a TileGrid""" +//| """Display a character stream with a TileGrid //| -//| def __init__(self, tilegrid: displayio.TileGrid, font: fontio.BuiltinFont) -> None: +//| ASCII control: +//| * ``\\r`` - Move cursor to column 1 +//| * ``\\n`` - Move cursor down a row +//| * ``\\b`` - Move cursor left one if possible +//| +//| OSC control sequences: +//| * ``ESC ] 0; ESC \\`` - Set title bar to +//| * ``ESC ] ####; ESC \\`` - Ignored +//| +//| VT100 control sequences: +//| * ``ESC [ K`` - Clear the remainder of the line +//| * ``ESC [ #### D`` - Move the cursor to the left by #### +//| * ``ESC [ 2 J`` - Erase the entire display +//| * ``ESC [ nnnn ; mmmm H`` - Move the cursor to mmmm, nnnn. +//| """ +//| +//| def __init__(self, scroll_area: displayio.TileGrid, font: fontio.BuiltinFont, *, title_bar: displayio.TileGrid = None) -> None: //| """Terminal manages tile indices and cursor position based on VT100 commands. The font should be //| a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap.""" //| ... //| STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { - enum { ARG_tilegrid, ARG_font }; + enum { ARG_scroll_area, ARG_font, ARG_title_bar }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_tilegrid, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_scroll_area, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_font, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_title_bar, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - displayio_tilegrid_t *tilegrid = mp_arg_validate_type(args[ARG_tilegrid].u_obj, &displayio_tilegrid_type, MP_QSTR_tilegrid); + displayio_tilegrid_t *scroll_area = mp_arg_validate_type(args[ARG_scroll_area].u_obj, &displayio_tilegrid_type, MP_QSTR_scroll_area); + displayio_tilegrid_t *title_bar = NULL; + if (args[ARG_title_bar].u_obj != mp_const_none) { + title_bar = mp_arg_validate_type(args[ARG_title_bar].u_obj, &displayio_tilegrid_type, MP_QSTR_title_bar); + } fontio_builtinfont_t *font = mp_arg_validate_type(args[ARG_font].u_obj, &fontio_builtinfont_type, MP_QSTR_font); terminalio_terminal_obj_t *self = m_new_obj(terminalio_terminal_obj_t); self->base.type = &terminalio_terminal_type; - common_hal_terminalio_terminal_construct(self, tilegrid, font); + common_hal_terminalio_terminal_construct(self, scroll_area, font, title_bar); return MP_OBJ_FROM_PTR(self); } diff --git a/shared-bindings/terminalio/Terminal.h b/shared-bindings/terminalio/Terminal.h index f884edd6d5..64609b49b1 100644 --- a/shared-bindings/terminalio/Terminal.h +++ b/shared-bindings/terminalio/Terminal.h @@ -34,7 +34,7 @@ extern const mp_obj_type_t terminalio_terminal_type; extern void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self, - displayio_tilegrid_t *tilegrid, const fontio_builtinfont_t *font); + displayio_tilegrid_t *scroll_area, const fontio_builtinfont_t *font, displayio_tilegrid_t *title_bar); // Write characters. len is in characters NOT bytes! extern size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index cb5090d0f4..0b55df70fa 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -439,11 +439,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station when connected to an access point. None otherwise.""" //| -STATIC mp_obj_t wifi_radio_get_ipv4_address(mp_obj_t self) { +STATIC mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_address(self); } -MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, wifi_radio_get_ipv4_address); +MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, _wifi_radio_get_ipv4_address); MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj, (mp_obj_t)&wifi_radio_get_ipv4_address_obj); diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index 09a66b2e63..b2593ba8ff 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -103,6 +103,7 @@ extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway_ap(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self); +uint32_t wifi_radio_get_ipv4_address(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self); extern mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self); diff --git a/shared-bindings/wifi/__init__.c b/shared-bindings/wifi/__init__.c index 0f9dee8462..f5bfd3a362 100644 --- a/shared-bindings/wifi/__init__.c +++ b/shared-bindings/wifi/__init__.c @@ -42,7 +42,7 @@ // Called when wifi is imported. STATIC mp_obj_t wifi___init__(void) { - common_hal_wifi_init(); + common_hal_wifi_init(true); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_0(wifi___init___obj, wifi___init__); diff --git a/shared-bindings/wifi/__init__.h b/shared-bindings/wifi/__init__.h index e626727e77..9553e92ce1 100644 --- a/shared-bindings/wifi/__init__.h +++ b/shared-bindings/wifi/__init__.h @@ -31,7 +31,9 @@ extern wifi_radio_obj_t common_hal_wifi_radio_obj; -void common_hal_wifi_init(void); +void common_hal_wifi_init(bool user_initiated); void common_hal_wifi_gc_collect(void); +void wifi_user_reset(void); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_WIFI___INIT___H diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index 36cbf76619..769c334ac6 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -296,6 +296,27 @@ void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t self->partial_change = true; } +void common_hal_displayio_tilegrid_set_all_tiles(displayio_tilegrid_t *self, uint8_t tile_index) { + if (tile_index >= self->tiles_in_bitmap) { + mp_raise_ValueError(translate("Tile index out of bounds")); + } + uint8_t *tiles = self->tiles; + if (self->inline_tiles) { + tiles = (uint8_t *)&self->tiles; + } + if (tiles == NULL) { + return; + } + + for (uint16_t x = 0; x < self->width_in_tiles; x++) { + for (uint16_t y = 0; y < self->height_in_tiles; y++) { + tiles[y * self->width_in_tiles + x] = tile_index; + } + } + + self->full_change = true; +} + bool common_hal_displayio_tilegrid_get_flip_x(displayio_tilegrid_t *self) { return self->flip_x; } diff --git a/shared-module/terminalio/Terminal.c b/shared-module/terminalio/Terminal.c index fc33533b17..d45495d14a 100644 --- a/shared-module/terminalio/Terminal.c +++ b/shared-module/terminalio/Terminal.c @@ -30,24 +30,28 @@ #include "shared-bindings/displayio/TileGrid.h" #include "shared-bindings/terminalio/Terminal.h" -void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self, displayio_tilegrid_t *tilegrid, const fontio_builtinfont_t *font) { +void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self, + displayio_tilegrid_t *scroll_area, const fontio_builtinfont_t *font, + displayio_tilegrid_t *title_bar) { self->cursor_x = 0; self->cursor_y = 0; self->font = font; - self->tilegrid = tilegrid; + self->scroll_area = scroll_area; + self->title_bar = title_bar; + self->title_x = 0; + self->title_y = 0; self->first_row = 0; - for (uint16_t x = 0; x < self->tilegrid->width_in_tiles; x++) { - for (uint16_t y = 0; y < self->tilegrid->height_in_tiles; y++) { - common_hal_displayio_tilegrid_set_tile(self->tilegrid, x, y, 0); - } + common_hal_displayio_tilegrid_set_all_tiles(self->scroll_area, 0); + if (self->title_bar) { + common_hal_displayio_tilegrid_set_all_tiles(self->title_bar, 0); } - common_hal_displayio_tilegrid_set_top_left(self->tilegrid, 0, 1); + common_hal_displayio_tilegrid_set_top_left(self->scroll_area, 0, 1); } size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, const byte *data, size_t len, int *errcode) { // Make sure the terminal is initialized before we do anything with it. - if (self->tilegrid == NULL) { + if (self->scroll_area == NULL) { return len; } const byte *i = data; @@ -55,11 +59,34 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con while (i < data + len) { unichar c = utf8_get_char(i); i = utf8_next_char(i); + if (self->in_osc_command) { + if (c == 0x1b && i[0] == '\\') { + self->in_osc_command = false; + self->title_x = 0; + self->title_y = 0; + i += 1; + } else if (self->osc_command == 0 && self->title_bar != NULL && self->title_y < self->title_bar->height_in_tiles) { + uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c); + if (tile_index != 0xff) { + // Clear the tile grid before we start putting new info. + if (self->title_x == 0 && self->title_y == 0) { + common_hal_displayio_tilegrid_set_all_tiles(self->title_bar, 0); + } + common_hal_displayio_tilegrid_set_tile(self->title_bar, self->title_x, self->title_y, tile_index); + self->title_x++; + if (self->title_x >= self->title_bar->width_in_tiles) { + self->title_y++; + self->title_x %= self->title_bar->width_in_tiles; + } + } + } + continue; + } // Always handle ASCII. if (c < 128) { if (c >= 0x20 && c <= 0x7e) { uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c); - common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index); + common_hal_displayio_tilegrid_set_tile(self->scroll_area, self->cursor_x, self->cursor_y, tile_index); self->cursor_x++; } else if (c == '\r') { self->cursor_x = 0; @@ -71,25 +98,25 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con self->cursor_x--; } } else if (c == 0x1b) { + // Handle commands of the form \x1b.####D where . is ignored. + uint16_t n = 0; + uint8_t j = 1; + for (; j < 6; j++) { + if ('0' <= i[j] && i[j] <= '9') { + n = n * 10 + (i[j] - '0'); + } else { + c = i[j]; + break; + } + } if (i[0] == '[') { if (i[1] == 'K') { // Clear the rest of the line. - for (uint16_t j = self->cursor_x; j < self->tilegrid->width_in_tiles; j++) { - common_hal_displayio_tilegrid_set_tile(self->tilegrid, j, self->cursor_y, 0); + for (uint16_t k = self->cursor_x; k < self->scroll_area->width_in_tiles; k++) { + common_hal_displayio_tilegrid_set_tile(self->scroll_area, k, self->cursor_y, 0); } i += 2; } else { - // Handle commands of the form \x1b[####D - uint16_t n = 0; - uint8_t j = 1; - for (; j < 6; j++) { - if ('0' <= i[j] && i[j] <= '9') { - n = n * 10 + (i[j] - '0'); - } else { - c = i[j]; - break; - } - } if (c == 'D') { if (n > self->cursor_x) { self->cursor_x = 0; @@ -99,14 +126,10 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con } if (c == 'J') { if (n == 2) { - common_hal_displayio_tilegrid_set_top_left(self->tilegrid, 0, 0); + common_hal_displayio_tilegrid_set_top_left(self->scroll_area, 0, 0); self->cursor_x = self->cursor_y = start_y = 0; n = 0; - for (uint16_t x = 0; x < self->tilegrid->width_in_tiles; x++) { - for (uint16_t y = 0; y < self->tilegrid->height_in_tiles; y++) { - common_hal_displayio_tilegrid_set_tile(self->tilegrid, x, y, 0); - } - } + common_hal_displayio_tilegrid_set_all_tiles(self->scroll_area, 0); } } if (c == ';') { @@ -126,13 +149,13 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con if (m > 0) { m--; } - if (n >= self->tilegrid->height_in_tiles) { - n = self->tilegrid->height_in_tiles - 1; + if (n >= self->scroll_area->height_in_tiles) { + n = self->scroll_area->height_in_tiles - 1; } - if (m >= self->tilegrid->width_in_tiles) { - m = self->tilegrid->width_in_tiles - 1; + if (m >= self->scroll_area->width_in_tiles) { + m = self->scroll_area->width_in_tiles - 1; } - n = (n + self->tilegrid->top_left_y) % self->tilegrid->height_in_tiles; + n = (n + self->scroll_area->top_left_y) % self->scroll_area->height_in_tiles; self->cursor_x = m; self->cursor_y = n; start_y = self->cursor_y; @@ -141,30 +164,34 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con i += j + 1; continue; } + } else if (i[0] == ']' && c == ';') { + self->in_osc_command = true; + self->osc_command = n; + i += j + 1; } } } else { uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c); if (tile_index != 0xff) { - common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index); + common_hal_displayio_tilegrid_set_tile(self->scroll_area, self->cursor_x, self->cursor_y, tile_index); self->cursor_x++; } } - if (self->cursor_x >= self->tilegrid->width_in_tiles) { + if (self->cursor_x >= self->scroll_area->width_in_tiles) { self->cursor_y++; - self->cursor_x %= self->tilegrid->width_in_tiles; + self->cursor_x %= self->scroll_area->width_in_tiles; } - if (self->cursor_y >= self->tilegrid->height_in_tiles) { - self->cursor_y %= self->tilegrid->height_in_tiles; + if (self->cursor_y >= self->scroll_area->height_in_tiles) { + self->cursor_y %= self->scroll_area->height_in_tiles; } if (self->cursor_y != start_y) { // clear the new row in case of scroll up - if (self->cursor_y == self->tilegrid->top_left_y) { - for (uint16_t j = 0; j < self->tilegrid->width_in_tiles; j++) { - common_hal_displayio_tilegrid_set_tile(self->tilegrid, j, self->cursor_y, 0); + if (self->cursor_y == self->scroll_area->top_left_y) { + for (uint16_t j = 0; j < self->scroll_area->width_in_tiles; j++) { + common_hal_displayio_tilegrid_set_tile(self->scroll_area, j, self->cursor_y, 0); } - common_hal_displayio_tilegrid_set_top_left(self->tilegrid, 0, (self->cursor_y + self->tilegrid->height_in_tiles + 1) % self->tilegrid->height_in_tiles); + common_hal_displayio_tilegrid_set_top_left(self->scroll_area, 0, (self->cursor_y + self->scroll_area->height_in_tiles + 1) % self->scroll_area->height_in_tiles); } start_y = self->cursor_y; } @@ -173,5 +200,5 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con } bool common_hal_terminalio_terminal_ready_to_tx(terminalio_terminal_obj_t *self) { - return self->tilegrid != NULL; + return self->scroll_area != NULL; } diff --git a/shared-module/terminalio/Terminal.h b/shared-module/terminalio/Terminal.h index 2ba7e21f72..2e628f5df6 100644 --- a/shared-module/terminalio/Terminal.h +++ b/shared-module/terminalio/Terminal.h @@ -39,8 +39,13 @@ typedef struct { const fontio_builtinfont_t *font; uint16_t cursor_x; uint16_t cursor_y; - displayio_tilegrid_t *tilegrid; + displayio_tilegrid_t *scroll_area; + displayio_tilegrid_t *title_bar; + uint16_t title_x; + uint16_t title_y; uint16_t first_row; + uint16_t osc_command; + bool in_osc_command; } terminalio_terminal_obj_t; #endif /* SHARED_MODULE_TERMINALIO_TERMINAL_H */ diff --git a/supervisor/shared/background_callback.c b/supervisor/shared/background_callback.c index e53edb506f..88ffc15911 100644 --- a/supervisor/shared/background_callback.c +++ b/supervisor/shared/background_callback.c @@ -111,16 +111,28 @@ void background_callback_end_critical_section() { CALLBACK_CRITICAL_END; } + +// Filter out queued callbacks if they are allocated on the heap. void background_callback_reset() { + background_callback_t *new_head = NULL; + background_callback_t **previous_next = &new_head; + background_callback_t *new_tail = NULL; CALLBACK_CRITICAL_BEGIN; background_callback_t *cb = (background_callback_t *)callback_head; while (cb) { background_callback_t *next = cb->next; - memset(cb, 0, sizeof(*cb)); + if (!HEAP_PTR((void *)cb)) { + *previous_next = cb; + previous_next = &cb->next; + cb->next = NULL; + new_tail = cb; + } else { + memset(cb, 0, sizeof(*cb)); + } cb = next; } - callback_head = NULL; - callback_tail = NULL; + callback_head = new_head; + callback_tail = new_tail; in_background_callback = false; CALLBACK_CRITICAL_END; } diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index a8a9b056f2..849b9c3fe2 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -61,37 +61,26 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { uint8_t scale = 2; #if CIRCUITPY_TERMINALIO - displayio_tilegrid_t *grid = &supervisor_terminal_text_grid; - bool tall = height_px > width_px; + displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid; + displayio_tilegrid_t *title_bar = &supervisor_terminal_title_bar_text_grid; bool reset_tiles = false; - #if CIRCUITPY_REPL_LOGO - uint16_t terminal_width_px = tall ? width_px : width_px - blinka_bitmap.width; - uint16_t terminal_height_px = tall ? height_px - blinka_bitmap.height : height_px; - #else - uint16_t terminal_width_px = width_px; - uint16_t terminal_height_px = height_px; - #endif - uint16_t width_in_tiles = terminal_width_px / grid->tile_width; + uint16_t width_in_tiles = width_px / scroll_area->tile_width; // determine scale based on h if (width_in_tiles < 80) { scale = 1; } - width_in_tiles = terminal_width_px / (grid->tile_width * scale); + width_in_tiles = width_px / (scroll_area->tile_width * scale); if (width_in_tiles < 1) { width_in_tiles = 1; } - uint16_t height_in_tiles = terminal_height_px / (grid->tile_height * scale); - uint16_t remaining_pixels = tall ? 0 : terminal_height_px % (grid->tile_height * scale); - if (height_in_tiles < 1 || remaining_pixels > 0) { - height_in_tiles += 1; - } + uint16_t height_in_tiles = height_px / (scroll_area->tile_height * scale); uint16_t total_tiles = width_in_tiles * height_in_tiles; // check if the terminal tile dimensions are the same - if ((grid->width_in_tiles != width_in_tiles) || - (grid->height_in_tiles != height_in_tiles)) { + if ((scroll_area->width_in_tiles != width_in_tiles) || + (scroll_area->height_in_tiles != height_in_tiles - 1)) { reset_tiles = true; } // Reuse the previous allocation if possible @@ -114,27 +103,39 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { uint8_t *tiles = (uint8_t *)tilegrid_tiles->ptr; #if CIRCUITPY_REPL_LOGO - grid->y = tall ? blinka_bitmap.height : 0; - grid->x = tall ? 0 : blinka_bitmap.width; + title_bar->x = blinka_bitmap.width; + // Align the title bar to the bottom of the logo. + title_bar->y = blinka_bitmap.height - title_bar->tile_height; #else - grid->y = 0; - grid->x = 0; + title_bar->x = 0; + title_bar->y = 0; #endif - grid->top_left_y = 0; - if (remaining_pixels > 0) { - grid->y -= (grid->tile_height - remaining_pixels); - } - grid->width_in_tiles = width_in_tiles; - grid->height_in_tiles = height_in_tiles; + title_bar->top_left_y = 0; + title_bar->width_in_tiles = width_in_tiles; + title_bar->height_in_tiles = 1; assert(width_in_tiles > 0); - assert(height_in_tiles > 0); - grid->pixel_width = width_in_tiles * grid->tile_width; - grid->pixel_height = height_in_tiles * grid->tile_height; - grid->tiles = tiles; + title_bar->pixel_width = width_in_tiles * title_bar->tile_width; + title_bar->pixel_height = title_bar->tile_height; + title_bar->tiles = tiles; + title_bar->full_change = true; - grid->full_change = true; + scroll_area->x = 0; + #if CIRCUITPY_REPL_LOGO + scroll_area->y = blinka_bitmap.height; + #else + scroll_area->y = scroll_area->tile_height; + #endif + scroll_area->top_left_y = 0; + scroll_area->width_in_tiles = width_in_tiles; + scroll_area->height_in_tiles = height_in_tiles - 1; + assert(width_in_tiles > 0); + assert(height_in_tiles > 1); + scroll_area->pixel_width = width_in_tiles * scroll_area->tile_width; + scroll_area->pixel_height = (height_in_tiles - 1) * scroll_area->tile_height; + scroll_area->tiles = tiles + width_in_tiles; + scroll_area->full_change = true; - common_hal_terminalio_terminal_construct(&supervisor_terminal, grid, &supervisor_terminal_font); + common_hal_terminalio_terminal_construct(&supervisor_terminal, scroll_area, &supervisor_terminal_font, title_bar); } #endif @@ -146,18 +147,24 @@ void supervisor_stop_terminal(void) { if (tilegrid_tiles != NULL) { free_memory(tilegrid_tiles); tilegrid_tiles = NULL; - supervisor_terminal_text_grid.tiles = NULL; - supervisor_terminal.tilegrid = NULL; + supervisor_terminal_scroll_area_text_grid.tiles = NULL; + supervisor_terminal_title_bar_text_grid.tiles = NULL; + supervisor_terminal.scroll_area = NULL; + supervisor_terminal.title_bar = NULL; } #endif } void supervisor_display_move_memory(void) { #if CIRCUITPY_TERMINALIO + displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid; + displayio_tilegrid_t *title_bar = &supervisor_terminal_title_bar_text_grid; if (tilegrid_tiles != NULL) { - supervisor_terminal_text_grid.tiles = (uint8_t *)tilegrid_tiles->ptr; + title_bar->tiles = (uint8_t *)tilegrid_tiles->ptr; + scroll_area->tiles = (uint8_t *)tilegrid_tiles->ptr + scroll_area->width_in_tiles; } else { - supervisor_terminal_text_grid.tiles = NULL; + scroll_area->tiles = NULL; + title_bar->tiles = NULL; } #endif @@ -298,21 +305,21 @@ displayio_tilegrid_t blinka_sprite = { #if CIRCUITPY_TERMINALIO #if CIRCUITPY_REPL_LOGO -mp_obj_t members[] = { &blinka_sprite, &supervisor_terminal_text_grid, }; +mp_obj_t members[] = { &blinka_sprite, &supervisor_terminal_title_bar_text_grid, &supervisor_terminal_scroll_area_text_grid, }; +mp_obj_list_t splash_children = { + .base = {.type = &mp_type_list }, + .alloc = 3, + .len = 3, + .items = members, +}; +#else +mp_obj_t members[] = { &supervisor_terminal_title_bar_text_grid, &supervisor_terminal_scroll_area_text_grid, }; mp_obj_list_t splash_children = { .base = {.type = &mp_type_list }, .alloc = 2, .len = 2, .items = members, }; -#else -mp_obj_t members[] = { &supervisor_terminal_text_grid, }; -mp_obj_list_t splash_children = { - .base = {.type = &mp_type_list }, - .alloc = 1, - .len = 1, - .items = members, -}; #endif #else #if CIRCUITPY_REPL_LOGO diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h index 4110cfe8e4..d965fdc764 100644 --- a/supervisor/shared/display.h +++ b/supervisor/shared/display.h @@ -43,7 +43,8 @@ extern const fontio_builtinfont_t supervisor_terminal_font; // These will change so they must live in RAM. extern displayio_bitmap_t supervisor_terminal_font_bitmap; -extern displayio_tilegrid_t supervisor_terminal_text_grid; +extern displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid; +extern displayio_tilegrid_t supervisor_terminal_title_bar_text_grid; extern terminalio_terminal_obj_t supervisor_terminal; #endif diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h index ff90aae525..1c144197cb 100644 --- a/supervisor/shared/translate/translate_impl.h +++ b/supervisor/shared/translate/translate_impl.h @@ -45,7 +45,7 @@ static #endif inline // gcc10 -flto has issues with this being always_inline for debug builds. -#if CIRCUITPY_DEBUG < 1 +#if !CIRCUITPY_LTO || CIRCUITPY_DEBUG < 1 __attribute__((always_inline)) #endif const compressed_string_t *translate(const char *original) { diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c new file mode 100644 index 0000000000..dcc79ecf27 --- /dev/null +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -0,0 +1,92 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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 + +#include "shared-bindings/wifi/Radio.h" +#include "supervisor/shared/translate/translate.h" +#include "supervisor/shared/web_workflow/web_workflow.h" + +#if CIRCUITPY_WIFI +#include "shared-bindings/wifi/__init__.h" +#endif + +#if CIRCUITPY_DOTENV +#include "shared-module/dotenv/__init__.h" +#endif + +static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; + +void supervisor_web_workflow_status(void) { + serial_write_compressed(translate("Wi-Fi: ")); + if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) { + uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj); + if (wifi_status != WIFI_RADIO_ERROR_NONE) { + mp_printf(&mp_plat_print, "%d", wifi_status); + } else if (ipv4_address == 0) { + serial_write_compressed(translate("No IP")); + } else { + uint8_t *octets = (uint8_t *)&ipv4_address; + mp_printf(&mp_plat_print, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + } + } else { + serial_write_compressed(translate("off")); + } +} + +void supervisor_start_web_workflow(void) { + #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI + char ssid[33]; + char password[64]; + mp_int_t ssid_len = 0; + mp_int_t password_len = 0; + + #if CIRCUITPY_DOTENV + ssid_len = dotenv_get_key("/.env", "CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid) - 1); + password_len = dotenv_get_key("/.env", "CIRCUITPY_WIFI_PASSWORD", password, sizeof(password) - 1); + #endif + if (ssid_len <= 0 || (size_t)ssid_len >= sizeof(ssid) || + password_len <= 0 || (size_t)password_len >= sizeof(password)) { + return; + } + common_hal_wifi_init(false); + common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true); + + // NUL terminate the strings because dotenv doesn't. + ssid[ssid_len] = '\0'; + password[password_len] = '\0'; + wifi_status = common_hal_wifi_radio_connect( + &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len, + 0, 1, NULL, 0); + + if (wifi_status != WIFI_RADIO_ERROR_NONE) { + common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false); + } + #endif +} + +void supervisor_stop_web_workflow(void) { +} diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h new file mode 100644 index 0000000000..6e550aaa9d --- /dev/null +++ b/supervisor/shared/web_workflow/web_workflow.h @@ -0,0 +1,35 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include + +void supervisor_wifi_background(void); +void supervisor_wifi_init(void); +void supervisor_web_workflow_status(void); +void supervisor_start_web_workflow(void); +void supervisor_stop_web_workflow(void); diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c index 8d2c0f74fc..335f0f3b97 100644 --- a/supervisor/shared/workflow.c +++ b/supervisor/shared/workflow.c @@ -26,14 +26,61 @@ #include #include "py/mpconfig.h" +#include "supervisor/background_callback.h" #include "supervisor/workflow.h" +#include "supervisor/serial.h" #include "supervisor/shared/workflow.h" +#if CIRCUITPY_BLEIO +#include "shared-bindings/_bleio/__init__.h" +#include "supervisor/shared/bluetooth/bluetooth.h" +#endif + #if CIRCUITPY_USB +#include "supervisor/usb.h" #include "tusb.h" #endif +#if CIRCUITPY_WEB_WORKFLOW +#include "supervisor/shared/web_workflow/web_workflow.h" +#endif +static background_callback_t workflow_background_cb; + +static void supervisor_workflow_update_status_bar(void) { + // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code + // doesn't get terminated after two following characters and the value is invalid. + // This is the OSC command to set the title and the icon text. It can be up to 255 characters + // but some may be cut off. + serial_write("\x1b" "]0;"); + serial_write("🐍 "); + #if CIRCUITPY_WEB_WORKFLOW + supervisor_web_workflow_status(); + #endif + // Send string terminator + serial_write("\x1b" "\\"); +} + +static void workflow_background(void *data) { + supervisor_workflow_update_status_bar(); +} + +// Called during a VM reset. Doesn't actually reset things. void supervisor_workflow_reset(void) { + #if CIRCUITPY_BLEIO + supervisor_start_bluetooth(); + #endif + + #if CIRCUITPY_WEB_WORKFLOW + supervisor_start_web_workflow(); + #endif + + workflow_background_cb.fun = workflow_background; + workflow_background_cb.data = NULL; + supervisor_workflow_request_background(); +} + +void supervisor_workflow_request_background(void) { + background_callback_add_core(&workflow_background_cb); } // Return true as soon as USB communication with host has started, @@ -58,3 +105,25 @@ bool supervisor_workflow_active(void) { return false; #endif } + +void supervisor_workflow_start(void) { + // Start USB after giving boot.py a chance to tweak behavior. + #if CIRCUITPY_USB + // Setup USB connection after heap is available. + // It needs the heap to build descriptors. + usb_init(); + #endif + + // Set up any other serial connection. + serial_init(); + + #if CIRCUITPY_BLEIO + bleio_reset(); + supervisor_bluetooth_enable_workflow(); + supervisor_start_bluetooth(); + #endif + + #if CIRCUITPY_WEB_WORKFLOW + supervisor_start_web_workflow(); + #endif +} diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index d5c49aa7fc..2fa9ff1f0e 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -146,6 +146,10 @@ ifeq ($(CIRCUITPY_USB),1) endif endif +ifeq ($(CIRCUITPY_WEB_WORKFLOW),1) + SRC_SUPERVISOR += supervisor/shared/web_workflow/web_workflow.c +endif + SRC_TINYUSB = $(filter lib/tinyusb/%.c, $(SRC_SUPERVISOR)) $(patsubst %.c,$(BUILD)/%.o,$(SRC_TINYUSB)): CFLAGS += -Wno-missing-prototypes diff --git a/supervisor/workflow.h b/supervisor/workflow.h index 31900392cd..f550f8e88c 100755 --- a/supervisor/workflow.h +++ b/supervisor/workflow.h @@ -30,3 +30,7 @@ void supervisor_workflow_reset(void); // True when the user could be actively iterating on their code. bool supervisor_workflow_active(void); + +void supervisor_workflow_request_background(void); + +void supervisor_workflow_start(void); diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py index 552e5f1245..3c481cc812 100644 --- a/tools/gen_display_resources.py +++ b/tools/gen_display_resources.py @@ -139,11 +139,41 @@ displayio_palette_t supervisor_terminal_color = { c_file.write( """\ -displayio_tilegrid_t supervisor_terminal_text_grid = {{ +displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid = {{ .base = {{ .type = &displayio_tilegrid_type }}, .bitmap = (displayio_bitmap_t*) &supervisor_terminal_font_bitmap, .pixel_shader = &supervisor_terminal_color, - .x = 16, + .x = 0, + .y = 0, + .pixel_width = {1}, + .pixel_height = {2}, + .bitmap_width_in_tiles = {0}, + .tiles_in_bitmap = {0}, + .width_in_tiles = 1, + .height_in_tiles = 1, + .tile_width = {1}, + .tile_height = {2}, + .tiles = NULL, + .partial_change = false, + .full_change = false, + .hidden = false, + .hidden_by_parent = false, + .moved = false, + .inline_tiles = false, + .in_group = true +}}; +""".format( + len(all_characters), tile_x, tile_y + ) +) + +c_file.write( + """\ +displayio_tilegrid_t supervisor_terminal_title_bar_text_grid = {{ + .base = {{ .type = &displayio_tilegrid_type }}, + .bitmap = (displayio_bitmap_t*) &supervisor_terminal_font_bitmap, + .pixel_shader = &supervisor_terminal_color, + .x = 0, .y = 0, .pixel_width = {1}, .pixel_height = {2}, @@ -228,7 +258,8 @@ terminalio_terminal_obj_t supervisor_terminal = { .font = &supervisor_terminal_font, .cursor_x = 0, .cursor_y = 0, - .tilegrid = NULL + .scroll_area = NULL, + .title_bar = NULL }; """ ) From 09091ecb8351f62cfd57859dd7e207e90e6bc8a4 Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Fri, 10 Jun 2022 08:28:58 +0100 Subject: [PATCH 0448/2403] Enable collections deque for CIRCUITPY_FULL_BUILD I'd like to use `collections.deque`: https://docs.circuitpython.org/en/latest/docs/library/collections.html#collections.deque ...on my RP2040-based Keybow 2040 (https://circuitpython.org/board/pimoroni_keybow2040/). For MicroPython, `collections.deque` is enabled for all `rp2` devices, because they all have `MICROPY_CONFIG_ROM_LEVEL` set to 'extra features': https://github.com/micropython/micropython/blob/cf7d962cf38db296d1ac419fc4d5302b64c59644/ports/rp2/mpconfigport.h#L44 ...which includes `MICROPY_PY_COLLECTIONS_DEQUE` (see https://github.com/micropython/micropython/blob/6bda80d81147217a1d830b99b93d2e35d372e8f9/py/mpconfig.h#L1225-L1227 ). For CircuitPython, it looks like `MICROPY_CONFIG_ROM_LEVEL` defaults to 'core' (`MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES`) and isn't updated against any of the ports, so the only port getting `collections.deque` is the `unix` port, which explcitly sets `MICROPY_PY_COLLECTIONS_DEQUE`: https://github.com/adafruit/circuitpython/blob/6925a001382d41940ea9b412b1d1ba517d9880f9/ports/unix/mpconfigport.h#L134 At Dan Halbert's suggestion... https://github.com/adafruit/circuitpython/pull/6474#issuecomment-1152364768 ... this commit enables `MICROPY_PY_COLLECTIONS_DEQUE` for all builds where `CIRCUITPY_FULL_BUILD` is true - which includes Raspberry Pi: https://github.com/adafruit/circuitpython/blob/6925a001382d41940ea9b412b1d1ba517d9880f9/ports/raspberrypi/mpconfigport.mk#L11 See also: * https://github.com/adafruit/circuitpython/issues/5734 * https://github.com/micropython/micropython/commit/970eedce8f37af46cb2b67fa0e91d76c82057541 which originally added collections.deque to MicroPython --- py/circuitpy_mpconfig.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 24d8fb98ca..973f7caf1d 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -226,6 +226,9 @@ typedef long mp_off_t; #ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (CIRCUITPY_FULL_BUILD) #endif +#ifndef MICROPY_PY_COLLECTIONS_DEQUE +#define MICROPY_PY_COLLECTIONS_DEQUE (CIRCUITPY_FULL_BUILD) +#endif #define MICROPY_PY_URE_MATCH_GROUPS (CIRCUITPY_RE) #define MICROPY_PY_URE_MATCH_SPAN_START_END (CIRCUITPY_RE) #define MICROPY_PY_URE_SUB (CIRCUITPY_RE) From 6e090c96a559672bc94490494b336c13f90d473b Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 10 Jun 2022 16:24:52 -0400 Subject: [PATCH 0449/2403] squeeze some specialized builds --- ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 2 ++ ports/atmel-samd/mpconfigport.h | 1 + ports/nrf/boards/bluemicro833/mpconfigboard.mk | 1 + ports/nrf/boards/pca10100/mpconfigboard.mk | 1 + ports/nrf/boards/simmel/mpconfigboard.mk | 1 + 5 files changed, 6 insertions(+) diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk index 11abb8a727..9bc50ab429 100644 --- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk +++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk @@ -27,6 +27,8 @@ CIRCUITPY_PS2IO = 0 CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_ROTARYIO = 0 CIRCUITPY_TOUCHIO = 0 +CIRCUITPY_USB_HID = 0 +CIRCUITPY_USB_MIDI = 0 CIRCUITPY_ULAB = 0 diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index e200ce67db..9d4ddd7134 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -46,6 +46,7 @@ #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0) #define MICROPY_PY_FUNCTION_ATTRS (0) #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) +#define MICROPY_PY_COLLECTIONS_DEQUE (0) #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0) #define MICROPY_PY_UERRNO_LIST \ X(EPERM) \ diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk index bfefcbf100..61dc4de325 100644 --- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk +++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk @@ -23,6 +23,7 @@ CIRCUITPY_COUNTIO = 0 CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_FREQUENCYIO = 0 +CIRCUITPY_GETPASS = 0 CIRCUITPY_I2CPERIPHERAL = 0 CIRCUITPY_JSON = 0 CIRCUITPY_KEYPAD = 1 diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk index 553da88963..88ed0cfb14 100644 --- a/ports/nrf/boards/pca10100/mpconfigboard.mk +++ b/ports/nrf/boards/pca10100/mpconfigboard.mk @@ -18,6 +18,7 @@ CIRCUITPY_COUNTIO = 0 CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_FREQUENCYIO = 0 +CIRCUITPY_GETPASS = 0 CIRCUITPY_I2CPERIPHERAL = 0 CIRCUITPY_JSON = 0 CIRCUITPY_KEYPAD = 0 diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index faf9d2d1e3..68aae1f503 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -14,6 +14,7 @@ CIRCUITPY_ALARM = 0 CIRCUITPY_AESIO = 1 CIRCUITPY_AUDIOMIXER = 0 CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BITBANGIO = 0 CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_BUSDEVICE = 0 CIRCUITPY_BUSIO = 1 From b6c7815f83d4da190f52f9dc9c5d9000f3e599dd Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 10 Jun 2022 18:01:02 -0500 Subject: [PATCH 0450/2403] improving rotozoom() argument docstrings --- shared-bindings/bitmaptools/__init__.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c index 5122d039e8..6c00ca44a9 100644 --- a/shared-bindings/bitmaptools/__init__.c +++ b/shared-bindings/bitmaptools/__init__.c @@ -139,23 +139,29 @@ STATIC void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tupl //| :param bitmap dest_bitmap: Destination bitmap that will be copied into //| :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied //| :param int ox: Horizontal pixel location in destination bitmap where source bitmap -//| point (px,py) is placed +//| point (px,py) is placed. Defaults to None which causes it to use the horizontal +//| midway point of the destination bitmap. //| :param int oy: Vertical pixel location in destination bitmap where source bitmap -//| point (px,py) is placed +//| point (px,py) is placed. Defaults to None which causes it to use the vertical +//| midway point of the destination bitmap. //| :param Tuple[int,int] dest_clip0: First corner of rectangular destination clipping //| region that constrains region of writing into destination bitmap //| :param Tuple[int,int] dest_clip1: Second corner of rectangular destination clipping //| region that constrains region of writing into destination bitmap //| :param int px: Horizontal pixel location in source bitmap that is placed into the -//| destination bitmap at (ox,oy) +//| destination bitmap at (ox,oy). Defaults to None which causes it to use the +//| horizontal midway point in the source bitmap. //| :param int py: Vertical pixel location in source bitmap that is placed into the -//| destination bitmap at (ox,oy) +//| destination bitmap at (ox,oy). Defaults to None which causes it to use the +//| vertical midway point in the source bitmap. //| :param Tuple[int,int] source_clip0: First corner of rectangular source clipping //| region that constrains region of reading from the source bitmap //| :param Tuple[int,int] source_clip1: Second corner of rectangular source clipping //| region that constrains region of reading from the source bitmap -//| :param float angle: Angle of rotation, in radians (positive is clockwise direction) -//| :param float scale: Scaling factor +//| :param float angle: Angle of rotation, in radians (positive is clockwise direction). +//| Defaults to None which gets treated as 0.0 radians or no rotation. +//| :param float scale: Scaling factor. Defaults to None which gets treated as 1.0 or same +//| as original source size. //| :param int skip_index: Bitmap palette index in the source that will not be copied, //| set to None to copy all pixels""" //| ... From a8896384686e0ec5830b1629a203f835d88b6f2e Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Tue, 7 Jun 2022 13:39:31 -0700 Subject: [PATCH 0451/2403] feat(swan_r5): adds a basic RTC implementation. --- ports/stm/boards/swan_r5/mpconfigboard.mk | 1 + ports/stm/common-hal/rtc/RTC.c | 54 +++++++++++++++++++++++ ports/stm/common-hal/rtc/RTC.h | 33 ++++++++++++++ ports/stm/common-hal/rtc/__init__.c | 0 ports/stm/common-hal/rtc/__init__.h | 0 ports/stm/peripherals/rtc.c | 41 +++++++++++++++++ ports/stm/peripherals/rtc.h | 7 +++ ports/stm/supervisor/port.c | 7 +++ 8 files changed, 143 insertions(+) create mode 100644 ports/stm/common-hal/rtc/RTC.c create mode 100644 ports/stm/common-hal/rtc/RTC.h create mode 100644 ports/stm/common-hal/rtc/__init__.c create mode 100644 ports/stm/common-hal/rtc/__init__.h diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk index a451b3d18f..5d51c9406b 100644 --- a/ports/stm/boards/swan_r5/mpconfigboard.mk +++ b/ports/stm/boards/swan_r5/mpconfigboard.mk @@ -70,3 +70,4 @@ CIRCUITPY_BLEIO = 0 CIRCUITPY_BUSDEVICE = 0 CIRCUITPY_KEYPAD = 1 CIRCUITPY_RGBMATRIX = 0 +CIRCUITPY_RTC = 1 diff --git a/ports/stm/common-hal/rtc/RTC.c b/ports/stm/common-hal/rtc/RTC.c new file mode 100644 index 0000000000..1ea2d63ebf --- /dev/null +++ b/ports/stm/common-hal/rtc/RTC.c @@ -0,0 +1,54 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 20212 Matthew McGowan for Blues Wireless Inc + * + * 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 + +#include "py/obj.h" +#include "py/runtime.h" +#include "shared/timeutils/timeutils.h" +#include "shared-bindings/rtc/__init__.h" +#include "common-hal/rtc/RTC.h" +#include "shared-bindings/rtc/RTC.h" +#include "supervisor/port.h" +#include "supervisor/shared/translate.h" +#include "peripherals/rtc.h" + + +void common_hal_rtc_set_time(timeutils_struct_time_t *tm) { + stm32_peripherals_rtc_set_time(tm); +} + +void common_hal_rtc_get_time(timeutils_struct_time_t *tm) { + stm32_peripherals_rtc_get_time(tm); +} + +int common_hal_rtc_get_calibration(void) { + return 0; +} + +void common_hal_rtc_set_calibration(int calibration) { + mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration); +} diff --git a/ports/stm/common-hal/rtc/RTC.h b/ports/stm/common-hal/rtc/RTC.h new file mode 100644 index 0000000000..d0ba720bfc --- /dev/null +++ b/ports/stm/common-hal/rtc/RTC.h @@ -0,0 +1,33 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc + * + * 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_STM_COMMON_HAL_RTC_RTC_H +#define MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H + +extern void rtc_init(void); +extern void rtc_reset(void); + +#endif // MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H diff --git a/ports/stm/common-hal/rtc/__init__.c b/ports/stm/common-hal/rtc/__init__.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ports/stm/common-hal/rtc/__init__.h b/ports/stm/common-hal/rtc/__init__.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c index 9b0eb399c2..bd65ccbf17 100644 --- a/ports/stm/peripherals/rtc.c +++ b/ports/stm/peripherals/rtc.c @@ -4,6 +4,7 @@ * The MIT License (MIT) * * Copyright (c) 2021 Lucian Copeland for Adafruit Industries + * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -76,6 +77,46 @@ void stm32_peripherals_rtc_init(void) { HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn); } +#if CIRCUITPY_RTC +void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm) { + RTC_DateTypeDef date = {0}; + RTC_TimeTypeDef time = {0}; + + int code; + if ((code = HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN)) == HAL_OK && + (code = HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN)) == HAL_OK) { + tm->tm_hour = time.Hours; + tm->tm_min = time.Minutes; + tm->tm_sec = time.Seconds; + tm->tm_wday = date.WeekDay - 1; + tm->tm_mday = date.Date; + tm->tm_mon = date.Month; + tm->tm_year = date.Year + 2000; + tm->tm_yday = -1; + } +} + +void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) { + RTC_DateTypeDef date = {0}; + RTC_TimeTypeDef time = {0}; + + time.Hours = tm->tm_hour; + time.Minutes = tm->tm_min; + time.Seconds = tm->tm_sec; + date.WeekDay = tm->tm_wday + 1; + date.Date = tm->tm_mday; + date.Month = tm->tm_mon; + date.Year = tm->tm_year - 2000; + time.DayLightSaving = RTC_DAYLIGHTSAVING_NONE; + time.StoreOperation = RTC_STOREOPERATION_RESET; + + if (HAL_RTC_SetTime(&hrtc, &time, RTC_FORMAT_BIN) != HAL_OK || + HAL_RTC_SetDate(&hrtc, &date, RTC_FORMAT_BIN) != HAL_OK) { + // todo - throw an exception + } +} +#endif + // This function is called often for timing so we cache the seconds elapsed computation based on the // register value. The STM HAL always does shifts and conversion if we use it directly. uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) { diff --git a/ports/stm/peripherals/rtc.h b/ports/stm/peripherals/rtc.h index 65cae14d1c..474cba1881 100644 --- a/ports/stm/peripherals/rtc.h +++ b/ports/stm/peripherals/rtc.h @@ -4,6 +4,7 @@ * The MIT License (MIT) * * Copyright (c) 2021 Lucian Copeland for Adafruit Industries + * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -48,4 +49,10 @@ void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void (*callb void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks); bool stm32_peripherals_rtc_alarm_triggered(uint8_t alarm_idx); +#if CIRCUITPY_RTC +typedef struct _timeutils_struct_time_t timeutils_struct_time_t; +void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm); +void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm); +#endif + #endif // __MICROPY_INCLUDED_STM32_PERIPHERALS_RTC_H__ diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c index e4cce571ea..b15d81611e 100644 --- a/ports/stm/supervisor/port.c +++ b/ports/stm/supervisor/port.c @@ -61,6 +61,9 @@ #if CIRCUITPY_ALARM #include "common-hal/alarm/__init__.h" #endif +#if CIRCUITPY_RTC +#include "shared-bindings/rtc/__init__.h" +#endif #include "peripherals/clocks.h" #include "peripherals/gpio.h" @@ -241,6 +244,10 @@ void SysTick_Handler(void) { void reset_port(void) { reset_all_pins(); + #if CIRCUITPY_RTC + rtc_reset(); + #endif + #if CIRCUITPY_AUDIOPWMIO audiopwmout_reset(); #endif From 6ee8e0093630620b48abeedba71ba478d586084f Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Fri, 10 Jun 2022 12:19:43 -0700 Subject: [PATCH 0452/2403] fix(stm32): correct include path after translation header was moved --- ports/stm/common-hal/rtc/RTC.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/stm/common-hal/rtc/RTC.c b/ports/stm/common-hal/rtc/RTC.c index 1ea2d63ebf..48c47fda8c 100644 --- a/ports/stm/common-hal/rtc/RTC.c +++ b/ports/stm/common-hal/rtc/RTC.c @@ -33,7 +33,7 @@ #include "common-hal/rtc/RTC.h" #include "shared-bindings/rtc/RTC.h" #include "supervisor/port.h" -#include "supervisor/shared/translate.h" +#include "supervisor/shared/translate/translate.h" #include "peripherals/rtc.h" From beafbc7c60c27bb9099eb609c713949079351ce3 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Fri, 10 Jun 2022 17:36:32 -0700 Subject: [PATCH 0453/2403] enable RTC for all STM32 devices --- ports/stm/mpconfigport.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk index b9f6c2df65..4f18637f13 100644 --- a/ports/stm/mpconfigport.mk +++ b/ports/stm/mpconfigport.mk @@ -24,7 +24,7 @@ ifeq ($(MCU_SERIES),F4) CIRCUITPY_I2CPERIPHERAL ?= 0 CIRCUITPY_NVM ?= 0 CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 + CIRCUITPY_RTC ?= 1 USB_NUM_ENDPOINT_PAIRS = 4 UF2_FAMILY_ID ?= 0x57755a57 endif @@ -42,7 +42,7 @@ ifeq ($(MCU_SERIES),H7) CIRCUITPY_PULSEIO ?= 0 CIRCUITPY_PWMIO ?= 0 CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 + CIRCUITPY_RTC ?= 1 USB_NUM_ENDPOINT_PAIRS = 9 UF2_FAMILY_ID ?= 0x6db66082 @@ -59,7 +59,7 @@ ifeq ($(MCU_SERIES),F7) CIRCUITPY_NEOPIXEL_WRITE ?= 0 CIRCUITPY_NVM ?= 0 CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 + CIRCUITPY_RTC ?= 1 USB_NUM_ENDPOINT_PAIRS = 6 UF2_FAMILY_ID ?= 0x53b80f00 @@ -76,7 +76,7 @@ ifeq ($(MCU_SERIES),L4) CIRCUITPY_NEOPIXEL_WRITE ?= 0 CIRCUITPY_NVM ?= 0 CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 + CIRCUITPY_RTC ?= 1 # todo - this varies between devices in the series # This slide deck https://www.st.com/content/ccc/resource/training/technical/product_training/98/89/c8/6c/3e/e9/49/79/STM32L4_Peripheral_USB.pdf/files/STM32L4_Peripheral_USB.pdf/jcr:content/translations/en.STM32L4_Peripheral_USB.pdf # cites 16 endpoints, 8 endpoint pairs, while section 3.39 of the L4R5 datasheet states 6 endpoint pairs. From 9485cab5944d0fa855b3e2016e0a431471a63e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Soukup?= Date: Fri, 10 Jun 2022 09:14:27 +0000 Subject: [PATCH 0454/2403] Translated using Weblate (Czech) Currently translated at 26.4% (260 of 983 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/cs/ --- locale/cs.po | 119 +++++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/locale/cs.po b/locale/cs.po index a60095c054..184afcf453 100644 --- a/locale/cs.po +++ b/locale/cs.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: 2022-06-08 15:15+0000\n" +"PO-Revision-Date: 2022-06-11 10:17+0000\n" "Last-Translator: Matěj Soukup \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -29,6 +29,8 @@ msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"Kód byl zastaven kvůli automatickému načtení. K načtení dojde brzy.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -243,17 +245,17 @@ msgstr "'%s' očekává popisek" #: py/emitinlinethumb.c py/emitinlinextensa.c #, c-format msgid "'%s' expects a register" -msgstr "'%s' očekává register" +msgstr "'%s' očekává registr" #: py/emitinlinethumb.c #, c-format msgid "'%s' expects a special register" -msgstr "'%s' očekává speciální register" +msgstr "'%s' očekává speciální registr" #: py/emitinlinethumb.c #, c-format msgid "'%s' expects an FPU register" -msgstr "'%s' očekává register FPU" +msgstr "'%s' očekává registr FPU" #: py/emitinlinethumb.c #, c-format @@ -354,7 +356,7 @@ msgstr "'return' je volán mimo funkci" #: py/compile.c msgid "'yield from' inside async function" -msgstr "" +msgstr "'yield from' volán uvnitř funkce async" #: py/compile.c msgid "'yield' outside function" @@ -409,13 +411,13 @@ msgstr "Všechny I2C periferie jsou používány" #: ports/espressif/common-hal/frequencyio/FrequencyIn.c #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c msgid "All PCNT units in use" -msgstr "" +msgstr "Všechny PCNT jednotky jsou používány" #: ports/atmel-samd/common-hal/canio/Listener.c #: ports/espressif/common-hal/canio/Listener.c #: ports/stm/common-hal/canio/Listener.c msgid "All RX FIFOs in use" -msgstr "" +msgstr "Všechny RX FIFO jsou používány" #: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" @@ -521,7 +523,7 @@ msgstr "Konverze audia není implementována" #: shared-bindings/wifi/Radio.c msgid "AuthMode.OPEN is not used with password" -msgstr "" +msgstr "AuthMode.OPEN nepoužívá heslo" #: shared-bindings/wifi/Radio.c msgid "Authentication failure" @@ -550,7 +552,7 @@ msgstr "Pod minimální obnovovací frekvencí" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must be sequential pins" -msgstr "" +msgstr "Bitové hodiny a výběr slov musí být sekvenční piny" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must share a clock unit" @@ -595,7 +597,7 @@ msgstr "Vyrovnávací paměť + offset je příliš malý %d %d %d" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c msgid "Buffer elements must be 4 bytes long or less" -msgstr "" +msgstr "Prvky bufferu musí být 4 bajty dlouhé nebo méně" #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Buffer is not a bytearray." @@ -618,7 +620,7 @@ msgstr "Délka vyrovnávací paměti musí být násobkem 512" #: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c msgid "Buffer must be a multiple of 512 bytes" -msgstr "" +msgstr "Buffer musí být násobkem 512 bajtů" #: shared-bindings/_bleio/PacketBuffer.c #, c-format @@ -627,7 +629,7 @@ msgstr "Buffer je příliš krátký o %d bajtů" #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c msgid "Buffers must be same size" -msgstr "" +msgstr "Buffery musí mít stejnou velikost" #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c @@ -647,7 +649,7 @@ msgstr "Bloky CBC musí být násobky 16 bajtů" #: supervisor/shared/safe_mode.c msgid "CIRCUITPY drive could not be found or created." -msgstr "" +msgstr "Disk CIRCUITPY nelze nalézt nebo vytvořit." #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "CRC or checksum was invalid" @@ -681,11 +683,11 @@ msgstr "Nelze nastavit CCCD na místní charakteristiku" #: 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" -msgstr "" +msgstr "Nelze změnit USB zařízení" #: shared-bindings/_bleio/Adapter.c msgid "Cannot create a new Adapter; use _bleio.adapter;" -msgstr "" +msgstr "Není možné vytvořit nový adaptér; použití _bleio.adapter;" #: shared-bindings/displayio/Bitmap.c #: shared-bindings/memorymonitor/AllocationSize.c @@ -718,13 +720,13 @@ msgstr "Nelze nahrávat do souboru" #: shared-module/storage/__init__.c msgid "Cannot remount '/' when visible via USB." -msgstr "" +msgstr "Není možné znovu připojit '/', pokud je viditelné pomocí USB." #: ports/atmel-samd/common-hal/microcontroller/__init__.c #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" -msgstr "" +msgstr "Reset do bootloaderu není možný, protože žádný bootloader není přítomen" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -769,7 +771,7 @@ msgstr "Jádro kódu CircuitPython tvrdě havarovalo. Jejda!\n" #: supervisor/shared/safe_mode.c msgid "CircuitPython was unable to allocate the heap." -msgstr "" +msgstr "CircuitPython nedokázal alokovat haldu." #: shared-module/bitbangio/I2C.c msgid "Clock stretch too long" @@ -788,7 +790,7 @@ msgstr "" #: py/persistentcode.c msgid "Corrupt .mpy file" -msgstr "" +msgstr "Poškozený soubor .mpy" #: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" @@ -796,7 +798,7 @@ msgstr "" #: shared-bindings/_bleio/Adapter.c msgid "Could not set address" -msgstr "" +msgstr "Není možné nastavit adresu" #: shared-bindings/pwmio/PWMOut.c msgid "Could not start PWM" @@ -891,7 +893,7 @@ msgstr "EXTINT kanál se již používá" #: shared-module/synthio/MidiTrack.c #, c-format msgid "Error in MIDI stream at position %d" -msgstr "" +msgstr "Chyba v MIDI přenosu na pozici %d" #: extmod/modure.c msgid "Error in regex" @@ -923,7 +925,7 @@ msgstr "" #: extmod/ulab/code/numpy/fft/fft_tools.c msgid "FFT is implemented for linear arrays only" -msgstr "" +msgstr "FFT je implementován pouze pro lineární pole" #: ports/espressif/common-hal/ssl/SSLSocket.c msgid "Failed SSL handshake" @@ -940,11 +942,11 @@ msgstr "" #: shared-module/rgbmatrix/RGBMatrix.c msgid "Failed to allocate %q buffer" -msgstr "" +msgstr "Chyba alokace %q bufferu" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" -msgstr "" +msgstr "Chyba alokace paměti WiFi" #: ports/espressif/common-hal/wifi/ScannedNetworks.c msgid "Failed to allocate wifi scan memory" @@ -965,7 +967,7 @@ msgstr "Nepodařilo se připojit: časový limit" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to init wifi" -msgstr "" +msgstr "Chyba inicializace WiFi" #: shared-module/audiomp3/MP3Decoder.c msgid "Failed to parse MP3 file" @@ -982,7 +984,7 @@ msgstr "Nepodařilo se zapsat do interní paměti." #: supervisor/shared/safe_mode.c msgid "Fatal error." -msgstr "" +msgstr "Fatální chyba." #: py/moduerrno.c msgid "File exists" @@ -996,7 +998,7 @@ msgstr "" #: ports/espressif/common-hal/dualbank/__init__.c msgid "Firmware image is invalid" -msgstr "" +msgstr "Obraz firmwaru je nevalidní" #: shared-bindings/bitmaptools/__init__.c msgid "For L8 colorspace, input bitmap must have 8 bits per pixel" @@ -1008,12 +1010,14 @@ msgstr "" #: ports/cxd56/common-hal/camera/Camera.c msgid "Format not supported" -msgstr "" +msgstr "Formát není podporován" #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c msgid "" "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz" msgstr "" +"Frekvence musí být 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 nebo 1008 " +"Mhz" #: shared-bindings/pwmio/PWMOut.c msgid "Frequency must match existing PWMOut using this timer" @@ -1026,11 +1030,11 @@ msgstr "Funkce vyžaduje zámek" #: ports/cxd56/common-hal/gnss/GNSS.c msgid "GNSS init" -msgstr "" +msgstr "Inicializace GNSS" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" -msgstr "" +msgstr "Základní chyba" #: shared-bindings/displayio/Display.c #: shared-bindings/displayio/EPaperDisplay.c @@ -1061,11 +1065,11 @@ msgstr "" #: ports/stm/common-hal/busio/I2C.c msgid "I2C init error" -msgstr "" +msgstr "Chyba inicializace I2C" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" -msgstr "" +msgstr "Periférie I2C je používána" #: shared-bindings/audiobusio/I2SOut.c msgid "I2SOut not available" @@ -1115,7 +1119,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c msgid "Input taking too long" -msgstr "" +msgstr "Vstup trval příliš dlouho" #: ports/espressif/common-hal/neopixel_write/__init__.c py/moduerrno.c msgid "Input/output error" @@ -1163,7 +1167,7 @@ msgstr "" #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c msgid "Internal error" -msgstr "" +msgstr "Interní chyba" #: shared-module/rgbmatrix/RGBMatrix.c #, c-format @@ -1185,15 +1189,15 @@ msgstr "Neplatná hodnota jednotky ADC" #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" -msgstr "" +msgstr "Chybný BLE parametr" #: shared-bindings/wifi/Radio.c msgid "Invalid BSSID" -msgstr "" +msgstr "Chybné BSSID" #: shared-bindings/wifi/Radio.c msgid "Invalid MAC address" -msgstr "" +msgstr "Chybná MAC adresa" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #: py/moduerrno.c @@ -1207,7 +1211,7 @@ msgstr "" #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c #, c-format msgid "Invalid data_pins[%d]" -msgstr "" +msgstr "Chybný data_pin[%d]" #: shared-module/audiocore/WaveFile.c msgid "Invalid format chunk size" @@ -1219,7 +1223,7 @@ msgstr "Neplatný přístup k paměti." #: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid multicast MAC address" -msgstr "" +msgstr "Chybná multicastová MAC adresa" #: shared-bindings/busio/UART.c msgid "Invalid pins" @@ -1227,15 +1231,15 @@ msgstr "Neplatné piny" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" -msgstr "" +msgstr "Chybná velikost" #: ports/espressif/common-hal/ssl/SSLContext.c msgid "Invalid socket for TLS" -msgstr "" +msgstr "Chybný soket pro TLS" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid state" -msgstr "" +msgstr "Chybný stav" #: shared-bindings/aesio/aes.c msgid "Key must be 16, 24, or 32 bytes long" @@ -1243,7 +1247,7 @@ msgstr "Klíč musí být dlouhý 16, 24 nebo 32 bajtů" #: shared-module/is31fl3741/FrameBuffer.c msgid "LED mappings must match display size" -msgstr "" +msgstr "Mapování LED musí korespondovat s velikostí displeje" #: py/compile.c msgid "LHS of keyword arg must be an id" @@ -1259,7 +1263,7 @@ msgstr "" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" -msgstr "" +msgstr "MAC adresa byla chybná" #: shared-bindings/is31fl3741/IS31FL3741.c msgid "Mapping must be a tuple" @@ -1289,7 +1293,7 @@ msgstr "Chybí pin MISO nebo MOSI" #: ports/stm/common-hal/busio/SPI.c msgid "Missing MISO or MOSI pin" -msgstr "" +msgstr "Chybějící MISO nebo MOSI pin" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #, c-format @@ -1345,7 +1349,7 @@ msgstr "" #: ports/espressif/common-hal/nvm/ByteArray.c msgid "NVS Error" -msgstr "" +msgstr "Chyba NVS" #: py/qstr.c msgid "Name too long" @@ -1353,7 +1357,7 @@ msgstr "Jméno je příliš dlouhé" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" -msgstr "" +msgstr "Nová bitmapa musí mít stejnou velikost jako původní bitmapa" #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" @@ -1383,7 +1387,7 @@ msgstr "" #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c #, c-format msgid "No I2C device at address: 0x%x" -msgstr "" +msgstr "Žádné I2C zařízení na adrese: 0x%x" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1392,7 +1396,7 @@ msgstr "Žádný pin MISO" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MISO pin" -msgstr "" +msgstr "Žádný MISO pin" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1401,7 +1405,7 @@ msgstr "Žádný pin MOSI" #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c msgid "No MOSI pin" -msgstr "" +msgstr "Žádný MOSI pin" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c @@ -1460,11 +1464,11 @@ msgstr "" #: shared-module/usb_hid/__init__.c #, c-format msgid "No more than %d HID devices allowed" -msgstr "" +msgstr "Ne více než %d HID zařízení je povoleno" #: shared-bindings/wifi/Radio.c msgid "No network with that ssid" -msgstr "" +msgstr "Žádná síť s takovým SSID" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "No out in program" @@ -1487,7 +1491,7 @@ msgstr "Na zařízení nezůstal žádný prostor" #: py/moduerrno.c msgid "No such device" -msgstr "" +msgstr "Žádné takové zařízení" #: py/moduerrno.c msgid "No such file/directory" @@ -1507,7 +1511,7 @@ msgstr "" #: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c msgid "Not a valid IP string" -msgstr "" +msgstr "Nevalidní IP string" #: ports/espressif/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c @@ -1527,12 +1531,13 @@ msgstr "" #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" -msgstr "" +msgstr "Počet data_pins musí být 8 nebo 16, nikoli %d" #: shared-bindings/util.c msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" +"Objekt byl deinicializován a nelze jej dále používat. Vytvořte nový objekt." #: ports/nrf/common-hal/busio/UART.c msgid "Odd parity is not supported" @@ -1545,11 +1550,11 @@ msgstr "" #: ports/espressif/common-hal/wifi/__init__.c msgid "Only IPv4 addresses supported" -msgstr "" +msgstr "Pouze IPv4 adresy podporovány" #: ports/espressif/common-hal/socketpool/SocketPool.c msgid "Only IPv4 sockets supported" -msgstr "" +msgstr "Pouze IPv4 sokety podporovány" #: shared-module/displayio/OnDiskBitmap.c #, c-format From b191075ab81c79b4675391fe35544f0a18001aaa Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 13 Jun 2022 09:18:42 -0700 Subject: [PATCH 0455/2403] Better length checks --- ports/espressif/common-hal/wifi/Radio.c | 8 ++++++-- shared-bindings/wifi/Radio.c | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index e4a9aa4646..c914bdd8e1 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -249,7 +249,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t bool connected = ((bits & WIFI_CONNECTED_BIT) != 0) && !((bits & WIFI_DISCONNECTED_BIT) != 0); if (connected) { - if (memcmp(ssid, config->sta.ssid, ssid_len) == 0) { + // SSIDs are up to 32 bytes. Assume it is null terminated if it is less. + if (memcmp(ssid, config->sta.ssid, ssid_len) == 0 && + (ssid_len == 32 || strlen((const char *)config->sta.ssid) == ssid_len)) { // Already connected to the desired network. return WIFI_RADIO_ERROR_NONE; } else { @@ -272,7 +274,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t set_mode_station(self, true); memcpy(&config->sta.ssid, ssid, ssid_len); - config->sta.ssid[ssid_len] = 0; + if (ssid_len < 32) { + config->sta.ssid[ssid_len] = 0; + } memcpy(&config->sta.password, password, password_len); config->sta.password[password_len] = 0; config->sta.channel = channel; diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 0b55df70fa..42a4c53161 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -257,6 +257,7 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_ mp_buffer_info_t ssid; mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ); + mp_arg_validate_length_range(ssid.len, 1, 32, MP_QSTR_ssid); mp_buffer_info_t password; password.len = 0; @@ -330,9 +331,7 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m mp_buffer_info_t ssid; ssid.len = 0; mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ); - if (ssid.len > 32) { - mp_raise_ValueError(translate("ssid can't be more than 32 bytes")); - } + mp_arg_validate_length_range(ssid.len, 1, 32, MP_QSTR_ssid); mp_buffer_info_t password; password.len = 0; From 4e70781c454839b1842748bcf1937e03abff8e7a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 13 Jun 2022 09:21:41 -0700 Subject: [PATCH 0456/2403] Remove extra glyph padding --- tools/gen_display_resources.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py index 3c481cc812..dc9dbd69a4 100644 --- a/tools/gen_display_resources.py +++ b/tools/gen_display_resources.py @@ -75,8 +75,7 @@ for c in set(all_characters): if missing > 0: print("Font missing", missing, "characters", file=sys.stderr) -x, y, dx, dy = f.get_bounding_box() -tile_x, tile_y = x - dx, y - dy +tile_x, tile_y, dx, dy = f.get_bounding_box() total_bits = tile_x * len(all_characters) total_bits += 32 - total_bits % 32 bytes_per_row = total_bits // 8 From 1a3d2a5b5eeb555e4c5cec0cb5d0bf2483b27dc4 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 13 Jun 2022 15:36:15 -0700 Subject: [PATCH 0457/2403] Shrink nrf52833 builds Make them CIRCUITPY_FULL_BUILD = 0 and rework the boards to have the same modules enabled (ish.) Also make ZLIB require FULL_BUILD and disable advanced `micropython` module APIs by default on all builds. --- .../nrf/boards/bluemicro833/mpconfigboard.mk | 33 +------------------ ports/nrf/boards/microbit_v2/mpconfigboard.mk | 23 +------------ ports/nrf/boards/pca10100/mpconfigboard.mk | 29 ---------------- ports/nrf/boards/simmel/mpconfigboard.mk | 18 ---------- ports/nrf/mpconfigport.mk | 17 +++++++--- py/circuitpy_mpconfig.h | 2 +- py/circuitpy_mpconfig.mk | 2 +- 7 files changed, 16 insertions(+), 108 deletions(-) diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk index bfefcbf100..6108f23102 100644 --- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk +++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk @@ -7,41 +7,10 @@ MCU_CHIP = nrf52833 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ALARM = 0 CIRCUITPY_AUDIOBUSIO = 0 -#CIRCUITPY_AUDIOCORE = 0 -#CIRCUITPY_AUDIOIO = 0 CIRCUITPY_AUDIOMIXER = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 0 -CIRCUITPY_BITMAPTOOLS = 0 -CIRCUITPY_BUILTINS_POW3=0 -CIRCUITPY_BUSDEVICE = 0 -CIRCUITPY_COUNTIO = 0 -CIRCUITPY_DISPLAYIO = 0 -CIRCUITPY_FRAMEBUFFERIO = 0 -CIRCUITPY_FREQUENCYIO = 0 -CIRCUITPY_I2CPERIPHERAL = 0 -CIRCUITPY_JSON = 0 CIRCUITPY_KEYPAD = 1 -CIRCUITPY_MSGPACK = 0 -#CIRCUITPY_NEOPIXEL_WRITE = 1 -CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_NVM = 0 +CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_PIXELBUF = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_RGBMATRIX = 0 -CIRCUITPY_SDCARDIO = 0 -CIRCUITPY_SYNTHIO = 0 -CIRCUITPY_TRACEBACK = 0 CIRCUITPY_TOUCHIO = 0 -CIRCUITPY_TRACEBACK = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_USB_MIDI = 0 -CIRCUITPY_VECTORIO = 0 -CIRCUITPY_ZLIB = 0 - -MICROPY_PY_ASYNC_AWAIT = 0 diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nrf/boards/microbit_v2/mpconfigboard.mk index 413efda7f7..78e76d3b53 100644 --- a/ports/nrf/boards/microbit_v2/mpconfigboard.mk +++ b/ports/nrf/boards/microbit_v2/mpconfigboard.mk @@ -5,26 +5,5 @@ MCU_CHIP = nrf52833 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ALARM = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BITBANGIO = 0 -CIRCUITPY_BUILTINS_POW3=0 -CIRCUITPY_BUSDEVICE = 0 -CIRCUITPY_COUNTIO = 0 -CIRCUITPY_DISPLAYIO = 0 -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 -CIRCUITPY_PIXELBUF = 0 -CIRCUITPY_RE = 0 -CIRCUITPY_RGBMATRIX = 0 -CIRCUITPY_SDCARDIO = 0 -CIRCUITPY_ULAB = 0 +# USB pins aren't used. CIRCUITPY_USB = 0 - -MICROPY_PY_ASYNC_AWAIT = 0 diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk index 553da88963..356eb16f11 100644 --- a/ports/nrf/boards/pca10100/mpconfigboard.mk +++ b/ports/nrf/boards/pca10100/mpconfigboard.mk @@ -6,32 +6,3 @@ USB_MANUFACTURER = "Nordic Semiconductor" MCU_CHIP = nrf52833 INTERNAL_FLASH_FILESYSTEM = 1 - -CIRCUITPY_AESIO = 0 -CIRCUITPY_ALARM = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 0 -CIRCUITPY_BITMAPTOOLS = 0 -CIRCUITPY_BUSDEVICE = 0 -CIRCUITPY_COUNTIO = 0 -CIRCUITPY_DISPLAYIO = 0 -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 -CIRCUITPY_PIXELBUF = 0 -CIRCUITPY_RE = 0 -CIRCUITPY_RGBMATRIX = 0 -CIRCUITPY_SDCARDIO = 0 -CIRCUITPY_SYNTHIO = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_USB_MIDI = 0 -CIRCUITPY_VECTORIO = 0 -CIRCUITPY_ZLIB = 0 - -MICROPY_PY_ASYNC_AWAIT = 0 diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index faf9d2d1e3..20a50ac700 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -13,36 +13,18 @@ INTERNAL_FLASH_FILESYSTEM = 1 CIRCUITPY_ALARM = 0 CIRCUITPY_AESIO = 1 CIRCUITPY_AUDIOMIXER = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BITMAPTOOLS = 0 -CIRCUITPY_BUSDEVICE = 0 -CIRCUITPY_BUSIO = 1 -CIRCUITPY_COUNTIO = 0 -CIRCUITPY_DISPLAYIO = 0 -CIRCUITPY_ERRNO = 0 -CIRCUITPY_FRAMEBUFFERIO = 0 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_MSGPACK = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 CIRCUITPY_NVM = 0 CIRCUITPY_ONEWIREIO = 0 -CIRCUITPY_PIXELBUF = 0 CIRCUITPY_PULSEIO = 0 CIRCUITPY_PWMIO = 1 # Deliberately excluded for other reasons than code space, see #5534 CIRCUITPY_RAINBOWIO = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_ROTARYIO = 0 -CIRCUITPY_RTC = 1 -CIRCUITPY_SDCARDIO = 0 -CIRCUITPY_SYNTHIO = 0 CIRCUITPY_TOUCHIO = 0 -CIRCUITPY_ULAB = 0 CIRCUITPY_USB_CDC = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_WATCHDOG = 1 -CIRCUITPY_ZLIB = 0 # Enable micropython.native #CIRCUITPY_ENABLE_MPY_NATIVE = 1 diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index f265ac1940..6aff88b289 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -32,12 +32,7 @@ CIRCUITPY_RTC ?= 1 # frequencyio not yet implemented CIRCUITPY_FREQUENCYIO = 0 -CIRCUITPY_RGBMATRIX ?= 1 CIRCUITPY_ROTARYIO_SOFTENCODER = 1 -CIRCUITPY_FRAMEBUFFERIO ?= 1 - -CIRCUITPY_COUNTIO ?= 1 -CIRCUITPY_WATCHDOG ?= 1 # Sleep and Wakeup CIRCUITPY_ALARM ?= 1 @@ -60,6 +55,12 @@ MCU_SUB_VARIANT = nrf52840 # Fits on nrf52840 but space is tight on nrf52833. CIRCUITPY_AESIO ?= 1 +CIRCUITPY_RGBMATRIX ?= 1 +CIRCUITPY_FRAMEBUFFERIO ?= 1 + +CIRCUITPY_COUNTIO ?= 1 +CIRCUITPY_WATCHDOG ?= 1 + SD ?= s140 SOFTDEV_VERSION ?= 6.1.0 @@ -87,6 +88,8 @@ MCU_SUB_VARIANT = nrf52833 SUPEROPT_GC ?= 0 SUPEROPT_VM ?= 0 +CIRCUITPY_SYNTHIO ?= 0 + SD ?= s140 SOFTDEV_VERSION ?= 7.0.1 @@ -97,5 +100,9 @@ OPTIMIZATION_FLAGS ?= -Os CIRCUITPY_LTO = 1 CIRCUITPY_LTO_PARTITION = one +ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) + CIRCUITPY_FULL_BUILD ?= 0 + CIRCUITPY_PULSEIO ?= 1 +endif endif endif diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 24d8fb98ca..2936e0f124 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -230,7 +230,7 @@ typedef long mp_off_t; #define MICROPY_PY_URE_MATCH_SPAN_START_END (CIRCUITPY_RE) #define MICROPY_PY_URE_SUB (CIRCUITPY_RE) -#define CIRCUITPY_MICROPYTHON_ADVANCED (CIRCUITPY_FULL_BUILD) +#define CIRCUITPY_MICROPYTHON_ADVANCED (0) #ifndef MICROPY_FATFS_EXFAT #define MICROPY_FATFS_EXFAT (CIRCUITPY_FULL_BUILD) diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 758e0226a8..8505fe1cb7 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -460,7 +460,7 @@ CIRCUITPY_USTACK ?= 0 CFLAGS += -DCIRCUITPY_USTACK=$(CIRCUITPY_USTACK) # for decompressing utlities -CIRCUITPY_ZLIB ?= 1 +CIRCUITPY_ZLIB ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB) # ulab numerics library From dc794f91c0eea3cca7ed4cf8fb74867c191a0941 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 13 Jun 2022 15:38:19 -0700 Subject: [PATCH 0458/2403] Speed up auto-wifi with wrong password This adds basic timeout support to connect by preventing subsequent retries if over time. The first connect may still take more than the timeout. --- ports/espressif/common-hal/wifi/Radio.c | 8 ++++++++ supervisor/shared/web_workflow/web_workflow.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index c914bdd8e1..b6b155a71c 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -238,6 +238,10 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t } wifi_config_t *config = &self->sta_config; + size_t timeout_ms = timeout * 1000; + uint32_t start_time = common_hal_time_monotonic_ms(); + uint32_t end_time = start_time + timeout_ms; + EventBits_t bits; // can't block since both bits are false after wifi_init // both bits are true after an existing connection stops @@ -309,6 +313,10 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t pdTRUE, pdTRUE, 0); + // Don't retry anymore if we're over our time budget. + if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) { + self->retries_left = 0; + } } while ((bits & (WIFI_CONNECTED_BIT | WIFI_DISCONNECTED_BIT)) == 0 && !mp_hal_is_interrupted()); if ((bits & WIFI_DISCONNECTED_BIT) != 0) { if (self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) { diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index dcc79ecf27..bb83048dca 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -44,13 +44,17 @@ void supervisor_web_workflow_status(void) { serial_write_compressed(translate("Wi-Fi: ")); if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) { uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj); - if (wifi_status != WIFI_RADIO_ERROR_NONE) { + if (wifi_status == WIFI_RADIO_ERROR_AUTH_EXPIRE || + wifi_status == WIFI_RADIO_ERROR_AUTH_FAIL) { + serial_write_compressed(translate("Authentication failure")); + } else if (wifi_status != WIFI_RADIO_ERROR_NONE) { mp_printf(&mp_plat_print, "%d", wifi_status); } else if (ipv4_address == 0) { serial_write_compressed(translate("No IP")); } else { uint8_t *octets = (uint8_t *)&ipv4_address; mp_printf(&mp_plat_print, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + // TODO: Use these unicode to show signal strength: ▂▄▆█ } } else { serial_write_compressed(translate("off")); @@ -75,12 +79,15 @@ void supervisor_start_web_workflow(void) { common_hal_wifi_init(false); common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true); + // TODO: Do our own scan so that we can find the channel we want before calling connect. + // Otherwise, connect will do a full slow scan to pick the best AP. + // NUL terminate the strings because dotenv doesn't. ssid[ssid_len] = '\0'; password[password_len] = '\0'; wifi_status = common_hal_wifi_radio_connect( &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len, - 0, 1, NULL, 0); + 0, 0.1, NULL, 0); if (wifi_status != WIFI_RADIO_ERROR_NONE) { common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false); From 9fbad229c06f2dc89fa3ca4ac7c6ce4d2da3cafd Mon Sep 17 00:00:00 2001 From: Omer Kilic Date: Tue, 14 Jun 2022 15:51:10 +0100 Subject: [PATCH 0459/2403] Add custom board: Electrolama minik (RP2040) --- .../boards/electrolama_minik/board.c | 40 ++++++++++++++ .../boards/electrolama_minik/mpconfigboard.h | 8 +++ .../boards/electrolama_minik/mpconfigboard.mk | 11 ++++ .../electrolama_minik/pico-sdk-configboard.h | 1 + .../boards/electrolama_minik/pins.c | 52 +++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 ports/raspberrypi/boards/electrolama_minik/board.c create mode 100644 ports/raspberrypi/boards/electrolama_minik/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/electrolama_minik/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/electrolama_minik/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/electrolama_minik/pins.c diff --git a/ports/raspberrypi/boards/electrolama_minik/board.c b/ports/raspberrypi/boards/electrolama_minik/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/electrolama_minik/board.c @@ -0,0 +1,40 @@ +/* + * 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 "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.h b/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.h new file mode 100644 index 0000000000..f2261ac8b7 --- /dev/null +++ b/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.h @@ -0,0 +1,8 @@ +#define MICROPY_HW_BOARD_NAME "Electrolama minik" +#define MICROPY_HW_MCU_NAME "rp2040" + +// GPIO25 is the WS2812 LED on the module +#define MICROPY_HW_NEOPIXEL (&pin_GPIO25) + +// GPIO15 is not routed out +#define IGNORE_PIN_GPIO15 1 diff --git a/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.mk b/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.mk new file mode 100644 index 0000000000..8bd2394127 --- /dev/null +++ b/ports/raspberrypi/boards/electrolama_minik/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x1209 +USB_PID = 0xF123 +USB_PRODUCT = "minik" +USB_MANUFACTURER = "Electrolama" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/electrolama_minik/pico-sdk-configboard.h b/ports/raspberrypi/boards/electrolama_minik/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/electrolama_minik/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/electrolama_minik/pins.c b/ports/raspberrypi/boards/electrolama_minik/pins.c new file mode 100644 index 0000000000..21331ffda5 --- /dev/null +++ b/ports/raspberrypi/boards/electrolama_minik/pins.c @@ -0,0 +1,52 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + // GPIO15 is not routed out. + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 015e95807a44fdc9bfd9b1a4eecf47d541a207ec Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 12:14:05 -0500 Subject: [PATCH 0460/2403] Fix for Issue #6478 --- ports/nrf/boards/clue_nrf52840_express/board.c | 1 + ports/nrf/common-hal/alarm/__init__.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c index f2e648f473..06ee622f93 100644 --- a/ports/nrf/boards/clue_nrf52840_express/board.c +++ b/ports/nrf/boards/clue_nrf52840_express/board.c @@ -102,4 +102,5 @@ void reset_board(void) { } void board_deinit(void) { + common_hal_displayio_release_displays(); } diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 92dac1c789..c79158e8f1 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,6 +48,9 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" +#ifdef NRF_DEBUG_PRINT +void print_wakeup_cause(nrf_sleep_source_t cause); +#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { From ad56a16c2df8840a97c2100c7e5705dbe364f51f Mon Sep 17 00:00:00 2001 From: Patrick Van Oosterwijck Date: Tue, 14 Jun 2022 11:28:41 -0600 Subject: [PATCH 0461/2403] Add board Silicognition LLC RP2040-Shim --- .../boards/silicognition_rp2040_shim/board.c | 43 +++++++++++++++++++ .../silicognition_rp2040_shim/mpconfigboard.h | 14 ++++++ .../mpconfigboard.mk | 9 ++++ .../pico-sdk-configboard.h | 4 ++ .../boards/silicognition_rp2040_shim/pins.c | 38 ++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 ports/raspberrypi/boards/silicognition_rp2040_shim/board.c create mode 100644 ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/silicognition_rp2040_shim/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c b/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c new file mode 100644 index 0000000000..eac54ce460 --- /dev/null +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c @@ -0,0 +1,43 @@ +/* + * 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 "supervisor/board.h" + +#include "shared-bindings/microcontroller/Pin.h" +#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.h b/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.h new file mode 100644 index 0000000000..ebfdf8bd9e --- /dev/null +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.h @@ -0,0 +1,14 @@ +#define MICROPY_HW_BOARD_NAME "Silicognition LLC RP2040-Shim" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO23) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO17) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO16) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO10) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO12) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO1) +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.mk b/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.mk new file mode 100644 index 0000000000..df18e3ffe8 --- /dev/null +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/mpconfigboard.mk @@ -0,0 +1,9 @@ +USB_VID = 0x1209 +USB_PID = 0xF502 +USB_PRODUCT = "RP2040-Shim" +USB_MANUFACTURER = "Silicognition LLC" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "P25Q32H" diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/pico-sdk-configboard.h b/ports/raspberrypi/boards/silicognition_rp2040_shim/pico-sdk-configboard.h new file mode 100644 index 0000000000..a41131dd22 --- /dev/null +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/pico-sdk-configboard.h @@ -0,0 +1,4 @@ +// Put board-specific pico-sdk definitions here. This file must exist. + +// Allow extra time for xosc to start. +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c b/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c new file mode 100644 index 0000000000..fcde354c2d --- /dev/null +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c @@ -0,0 +1,38 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO6) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO23) }, + + { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From c95f4cdd0306be1d436fcc5bbd388bd1f8a25d86 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Tue, 14 Jun 2022 19:41:43 +0200 Subject: [PATCH 0462/2403] 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 | 12 ++++++++++++ locale/cs.po | 15 ++++++++++++++- locale/de_DE.po | 12 ++++++++++++ locale/el.po | 12 ++++++++++++ locale/en_GB.po | 12 ++++++++++++ locale/es.po | 12 ++++++++++++ locale/fil.po | 12 ++++++++++++ locale/fr.po | 12 ++++++++++++ locale/hi.po | 12 ++++++++++++ locale/it_IT.po | 12 ++++++++++++ locale/ja.po | 12 ++++++++++++ locale/ko.po | 12 ++++++++++++ locale/nl.po | 12 ++++++++++++ locale/pl.po | 12 ++++++++++++ locale/pt_BR.po | 12 ++++++++++++ locale/ru.po | 12 ++++++++++++ locale/sv.po | 12 ++++++++++++ locale/tr.po | 12 ++++++++++++ locale/zh_Latn_pinyin.po | 12 ++++++++++++ 19 files changed, 230 insertions(+), 1 deletion(-) diff --git a/locale/ID.po b/locale/ID.po index 5860b0f544..a301eb7852 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -1390,6 +1390,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2285,6 +2289,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3610,6 +3618,10 @@ msgstr "" msgid "odd-length string" msgstr "panjang data string memiliki keganjilan (odd-length)" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 184afcf453..bfd9dc8db8 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -726,7 +726,8 @@ msgstr "Není možné znovu připojit '/', pokud je viditelné pomocí USB." #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" -msgstr "Reset do bootloaderu není možný, protože žádný bootloader není přítomen" +msgstr "" +"Reset do bootloaderu není možný, protože žádný bootloader není přítomen" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -1389,6 +1390,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "Žádné I2C zařízení na adrese: 0x%x" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2271,6 +2276,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3596,6 +3605,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index db4b9304c1..ac02ca72f2 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -1404,6 +1404,10 @@ msgstr "Kein DMA-Pacing Timer gefunden" msgid "No I2C device at address: 0x%x" msgstr "Kein I2C-Gerät an Adresse: 0x%x" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2322,6 +2326,10 @@ msgstr "" "\n" "Um die vorhandenen Module anzuzeigen, gebe `help(\"modules\")` ein.\n" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Aufgeweckt durch Alarm.\n" @@ -3670,6 +3678,10 @@ msgstr "Objekt mit Pufferprotokoll (buffer protocol) erforderlich" msgid "odd-length string" msgstr "String mit ungerader Länge" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "Offset ist zu groß" diff --git a/locale/el.po b/locale/el.po index 0460f2a146..86529084bb 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1375,6 +1375,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2254,6 +2258,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3579,6 +3587,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 618d38f484..7f2642fe10 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -1391,6 +1391,10 @@ msgstr "No DMA pacing timer found" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2287,6 +2291,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Woken up by alarm.\n" @@ -3616,6 +3624,10 @@ msgstr "object with buffer protocol required" msgid "odd-length string" msgstr "odd-length string" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset is too large" diff --git a/locale/es.po b/locale/es.po index fd67f869ff..fbd682d61a 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1410,6 +1410,10 @@ msgstr "timer por establecedor de paso DMA no encontrado" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2319,6 +2323,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Despertado por la alarma.\n" @@ -3660,6 +3668,10 @@ msgstr "objeto con protocolo de buffer requerido" msgid "odd-length string" msgstr "string de longitud impar" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset es demasiado grande" diff --git a/locale/fil.po b/locale/fil.po index b81a0ac156..8112eb048c 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -1388,6 +1388,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2274,6 +2278,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3616,6 +3624,10 @@ msgstr "object na may buffer protocol kinakailangan" msgid "odd-length string" msgstr "odd-length string" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 94aa8879de..33f58c6185 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1420,6 +1420,10 @@ msgstr "Aucun minuteur de rythme DMA trouvé" msgid "No I2C device at address: 0x%x" msgstr "Aucun périphérique I2S à l'adresse : 0x%x" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2339,6 +2343,10 @@ msgstr "" "\n" "Pour lister les modules internes, entrez `help(\"modules\")`.\n" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Réveil par alarme.\n" @@ -3685,6 +3693,10 @@ msgstr "un objet avec un protocole de tampon est nécessaire" msgid "odd-length string" msgstr "chaîne de longueur impaire" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset est trop large" diff --git a/locale/hi.po b/locale/hi.po index ca6f580adc..2c18e7ca9a 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1375,6 +1375,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2254,6 +2258,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3579,6 +3587,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 187f9648f9..20c57c6475 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -1394,6 +1394,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2284,6 +2288,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3627,6 +3635,10 @@ msgstr "" msgid "odd-length string" msgstr "stringa di lunghezza dispari" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index 32d0336334..d459a06b25 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1386,6 +1386,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2268,6 +2272,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3598,6 +3606,10 @@ msgstr "" msgid "odd-length string" msgstr "奇数長の文字列" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 10b930ca12..95b68a1b77 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -1378,6 +1378,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2258,6 +2262,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3583,6 +3591,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 58e5c4a676..39199c71c2 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1386,6 +1386,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2284,6 +2288,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Gewekt door alarm.\n" @@ -3616,6 +3624,10 @@ msgstr "object met buffer protocol vereist" msgid "odd-length string" msgstr "string met oneven lengte" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "compensatie is te groot" diff --git a/locale/pl.po b/locale/pl.po index 03357dfb91..21f695316b 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1386,6 +1386,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2265,6 +2269,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3591,6 +3599,10 @@ msgstr "wymagany obiekt z protokołem buforu" msgid "odd-length string" msgstr "łańcuch o nieparzystej długości" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 56c8a4737b..d685d80c86 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1414,6 +1414,10 @@ msgstr "Nenhum temporizador DMA foi encontrado" msgid "No I2C device at address: 0x%x" msgstr "Não há nenhum dispositivo I2C no endereço: 0x%x" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2335,6 +2339,10 @@ msgstr "" "\n" "Para listar os módulos existente digite `help(\"modules\")`.\n" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Foi despertado através do alarme.\n" @@ -3677,6 +3685,10 @@ msgstr "é necessário objeto com protocolo do buffer" msgid "odd-length string" msgstr "sequência com comprimento ímpar" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "o offset é muito grande" diff --git a/locale/ru.po b/locale/ru.po index 06a3702a48..07bcb2967a 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1412,6 +1412,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2303,6 +2307,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3628,6 +3636,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index aafbc0ab75..e2a9ccedfa 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1396,6 +1396,10 @@ msgstr "Ingen DMA pacing timer hittades" msgid "No I2C device at address: 0x%x" msgstr "Ingen I2C-enhet på adress: 0x%x" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2305,6 +2309,10 @@ msgstr "" "\n" "För att lista inbyggda moduler skriver du `help(\"modules\")`.\n" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "Vaknade av larm.\n" @@ -3640,6 +3648,10 @@ msgstr "objekt med buffertprotokoll krävs" msgid "odd-length string" msgstr "sträng har udda längd" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset är för stor" diff --git a/locale/tr.po b/locale/tr.po index b0b7afaae2..7f1a22dafd 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1392,6 +1392,10 @@ msgstr "" msgid "No I2C device at address: 0x%x" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2274,6 +2278,10 @@ msgid "" "To list built-in modules type `help(\"modules\")`.\n" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "" @@ -3599,6 +3607,10 @@ msgstr "" msgid "odd-length string" msgstr "" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 224d766066..41964f866b 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -1410,6 +1410,10 @@ msgstr "wèi zhǎo dào DMA qǐ bó qì" msgid "No I2C device at address: 0x%x" msgstr "dì zhǐ: 0x%x shí méi yǒu I2C qì jiàn" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "No IP" +msgstr "" + #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "No MISO Pin" @@ -2316,6 +2320,10 @@ msgstr "" "\n" "liè chū nèi zhì mó kuài jiàn rù `help(\"modules\")`.\n" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "Wi-Fi: " +msgstr "" + #: main.c msgid "Woken up by alarm.\n" msgstr "bèi jǐng bào chǎo xǐng.\n" @@ -3650,6 +3658,10 @@ msgstr "xūyào huǎnchōng qū xiéyì de duìxiàng" msgid "odd-length string" msgstr "jīshù zìfú chuàn" +#: supervisor/shared/web_workflow/web_workflow.c +msgid "off" +msgstr "" + #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "piān yí tài dà" From 669e45497c83b42a53f9b685d6c429ad06f122eb Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 13:27:15 -0500 Subject: [PATCH 0463/2403] Uncommented call to print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index c79158e8f1..1acc0c0324 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -49,7 +49,7 @@ #include "nrfx.h" #include "nrfx_gpiote.h" #ifdef NRF_DEBUG_PRINT -void print_wakeup_cause(nrf_sleep_source_t cause); +static void print_wakeup_cause(nrf_sleep_source_t cause); #endif // Singleton instance of SleepMemory. @@ -111,7 +111,7 @@ bool common_hal_alarm_woken_from_sleep(void) { nrf_sleep_source_t cause = _get_wakeup_cause(); #ifdef NRF_DEBUG_PRINT if (cause != NRF_SLEEP_WAKEUP_UNDEFINED) { - // print_wakeup_cause(cause); + print_wakeup_cause(cause); } #endif return cause == NRF_SLEEP_WAKEUP_GPIO || cause == NRF_SLEEP_WAKEUP_TIMER From 8668dee3dfe8b9e9bc4ad63ae5ea6d95a15aab4b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 20:51:07 -0500 Subject: [PATCH 0464/2403] Fix declaration of print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 1acc0c0324..043be0b319 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,9 +48,6 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" -#ifdef NRF_DEBUG_PRINT -static void print_wakeup_cause(nrf_sleep_source_t cause); -#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { @@ -99,7 +96,7 @@ static const char *cause_str[] = { "VBUS", "RESETPIN", }; -void print_wakeup_cause(nrf_sleep_source_t cause) { +static void print_wakeup_cause(nrf_sleep_source_t cause) { if (cause >= 0 && cause < NRF_SLEEP_WAKEUP_ZZZ) { mp_printf(&mp_plat_print, "wakeup cause = NRF_SLEEP_WAKEUP_%s\r\n", cause_str[(int)cause]); From 987196fe78728b04f8f3c1d09fb61d6fd47bec3a Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Tue, 14 Jun 2022 20:26:17 +0000 Subject: [PATCH 0465/2403] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (986 of 986 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index d685d80c86..c2de3f1b02 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: 2022-05-25 11:17+0000\n" +"PO-Revision-Date: 2022-06-16 08:18+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -1416,7 +1416,7 @@ msgstr "Não há nenhum dispositivo I2C no endereço: 0x%x" #: supervisor/shared/web_workflow/web_workflow.c msgid "No IP" -msgstr "" +msgstr "Sem IP" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -2341,7 +2341,7 @@ msgstr "" #: supervisor/shared/web_workflow/web_workflow.c msgid "Wi-Fi: " -msgstr "" +msgstr "Wi-Fi: " #: main.c msgid "Woken up by alarm.\n" @@ -3687,7 +3687,7 @@ msgstr "sequência com comprimento ímpar" #: supervisor/shared/web_workflow/web_workflow.c msgid "off" -msgstr "" +msgstr "desligado" #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" From 81aa14327138c8ba8d6ae72d7aba7f9c92a6f832 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Wed, 15 Jun 2022 08:01:42 +0000 Subject: [PATCH 0466/2403] Translated using Weblate (Swedish) Currently translated at 100.0% (986 of 986 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 e2a9ccedfa..fb23e98880 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: 2022-05-23 14:18+0000\n" +"PO-Revision-Date: 2022-06-16 08:18+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -1398,7 +1398,7 @@ msgstr "Ingen I2C-enhet på adress: 0x%x" #: supervisor/shared/web_workflow/web_workflow.c msgid "No IP" -msgstr "" +msgstr "Ingen IP" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -2311,7 +2311,7 @@ msgstr "" #: supervisor/shared/web_workflow/web_workflow.c msgid "Wi-Fi: " -msgstr "" +msgstr "Wi-Fi: " #: main.c msgid "Woken up by alarm.\n" @@ -3650,7 +3650,7 @@ msgstr "sträng har udda längd" #: supervisor/shared/web_workflow/web_workflow.c msgid "off" -msgstr "" +msgstr "av" #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" From 53f4eeaf8b2a99da2562faa9828f3e80c4871800 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Thu, 16 Jun 2022 19:27:08 +0200 Subject: [PATCH 0467/2403] Fixed build issue when DISABLE_FILESYSTEM is set. --- supervisor/supervisor.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 2fa9ff1f0e..7fa1061bc5 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -35,6 +35,9 @@ CFLAGS += -DQSPI_FLASH_FILESYSTEM=$(QSPI_FLASH_FILESYSTEM) SPI_FLASH_FILESYSTEM ?= 0 CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM) +DISABLE_FILESYSTEM ?= 0 +CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM) + ifeq ($(CIRCUITPY_BLEIO),1) SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c CIRCUITPY_CREATOR_ID ?= $(USB_VID) From 8ed791060c56a838d15d5e6a460194466a031c92 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 16 Jun 2022 21:10:19 +0200 Subject: [PATCH 0468/2403] include python executable path in the idf key I noticed that the latest time we needed to switch the idf key was when the environment changed from python 3.10.4 to 3.10.5. I don't know if this is the only cause of needing to change the key, but it seems to be a good idea to make the key include it. I think this is what's going on because when I replaced a virtualenv's "python" with a dangling symlink (same as would occur when python's version gets bumped), I got a similar error. --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f260117ad..e2d58c1416 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -382,6 +382,7 @@ jobs: if: ${{ needs.test.outputs.boards-espressif != '[]' }} steps: - name: Set up Python 3 + id: py3 uses: actions/setup-python@v2 with: python-version: "3.x" @@ -400,7 +401,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From 3c588708166a218116620b77349c2af5a4b04913 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Thu, 16 Jun 2022 21:43:07 +0200 Subject: [PATCH 0469/2403] Fixes from PR feedback: Test DISABLE_FILESYSTEM after it set. https://github.com/adafruit/circuitpython/pull/6492/files/53f4eeaf8b2a99da2562faa9828f3e80c4871800#r899419987 --- supervisor/supervisor.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 7fa1061bc5..fb946f468c 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -18,12 +18,6 @@ SRC_SUPERVISOR = \ supervisor/shared/translate/translate.c \ supervisor/shared/workflow.c -ifeq ($(DISABLE_FILESYSTEM),1) -SRC_SUPERVISOR += supervisor/stub/filesystem.c -else -SRC_SUPERVISOR += supervisor/shared/filesystem.c -endif - NO_USB ?= $(wildcard supervisor/usb.c) INTERNAL_FLASH_FILESYSTEM ?= 0 @@ -38,6 +32,12 @@ CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM) DISABLE_FILESYSTEM ?= 0 CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM) +ifeq ($(DISABLE_FILESYSTEM),1) +SRC_SUPERVISOR += supervisor/stub/filesystem.c +else +SRC_SUPERVISOR += supervisor/shared/filesystem.c +endif + ifeq ($(CIRCUITPY_BLEIO),1) SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c CIRCUITPY_CREATOR_ID ?= $(USB_VID) From cdc71403185cef54605a3d7afa16b1cd19315ff6 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Jun 2022 14:56:18 -0500 Subject: [PATCH 0470/2403] Test for a BLE disconnect while reading --- ports/nrf/common-hal/_bleio/__init__.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c index 1d59983896..718b28c7fe 100644 --- a/ports/nrf/common-hal/_bleio/__init__.c +++ b/ports/nrf/common-hal/_bleio/__init__.c @@ -185,7 +185,12 @@ STATIC bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) { } break; } - + case BLE_GAP_EVT_DISCONNECTED: { + read->conn_handle = BLE_CONN_HANDLE_INVALID; + read->done = true; + return false; + break; + } default: // For debugging. // mp_printf(&mp_plat_print, "Unhandled characteristic event: 0x%04x\n", ble_evt->header.evt_id); @@ -219,6 +224,8 @@ size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_ while (!read_info.done) { RUN_BACKGROUND_TASKS; } + // Test if we were disconnected while reading + common_hal_bleio_check_connected(read_info.conn_handle); ble_drv_remove_event_handler(_on_gattc_read_rsp_evt, &read_info); check_gatt_status(read_info.status); From da26c9ce829f6d00df96d8f150d39ee8c9e58049 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Jun 2022 16:21:27 +0200 Subject: [PATCH 0471/2403] use setup-python v4 for python-path support --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d58c1416..4a9bd65d8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -383,7 +383,7 @@ jobs: steps: - name: Set up Python 3 id: py3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: "3.x" - uses: actions/checkout@v2.2.0 From f0bf14094be3a66d0105147f3198ffacf7435da2 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 17 Jun 2022 10:59:59 -0400 Subject: [PATCH 0472/2403] Update samd-peripherals to fix SPI DMA problem --- ports/atmel-samd/peripherals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index d3b20192cf..79bf4e87e9 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit d3b20192cf94fdea68a412596e082108ba5ebbf0 +Subproject commit 79bf4e87e98356c54f13799ccb8fb84dff987bd1 From cbcd37f95bec95f4eed6c92d2e5f85d7db9b401d Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 17 Jun 2022 12:45:52 -0400 Subject: [PATCH 0473/2403] update frozen libraries --- frozen/Adafruit_CircuitPython_APDS9960 | 2 +- frozen/Adafruit_CircuitPython_BLE | 2 +- frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +- frozen/Adafruit_CircuitPython_BusDevice | 2 +- frozen/Adafruit_CircuitPython_CircuitPlayground | 2 +- frozen/Adafruit_CircuitPython_Crickit | 2 +- frozen/Adafruit_CircuitPython_DRV2605 | 2 +- frozen/Adafruit_CircuitPython_DS3231 | 2 +- frozen/Adafruit_CircuitPython_Display_Shapes | 2 +- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_DotStar | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_FakeRequests | 2 +- frozen/Adafruit_CircuitPython_FocalTouch | 2 +- frozen/Adafruit_CircuitPython_HID | 2 +- frozen/Adafruit_CircuitPython_IRRemote | 2 +- frozen/Adafruit_CircuitPython_LC709203F | 2 +- frozen/Adafruit_CircuitPython_LIS3DH | 2 +- frozen/Adafruit_CircuitPython_LSM6DS | 2 +- frozen/Adafruit_CircuitPython_MIDI | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_PortalBase | 2 +- frozen/Adafruit_CircuitPython_ProgressBar | 2 +- frozen/Adafruit_CircuitPython_RFM69 | 2 +- frozen/Adafruit_CircuitPython_RFM9x | 2 +- frozen/Adafruit_CircuitPython_Register | 2 +- frozen/Adafruit_CircuitPython_Requests | 2 +- frozen/Adafruit_CircuitPython_SD | 2 +- frozen/Adafruit_CircuitPython_ST7789 | 2 +- frozen/Adafruit_CircuitPython_SimpleIO | 2 +- frozen/Adafruit_CircuitPython_SimpleMath | 2 +- frozen/Adafruit_CircuitPython_Thermistor | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960 index 9bd4882092..13856be616 160000 --- a/frozen/Adafruit_CircuitPython_APDS9960 +++ b/frozen/Adafruit_CircuitPython_APDS9960 @@ -1 +1 @@ -Subproject commit 9bd48820928afad549832fe9b4ae497b224007f0 +Subproject commit 13856be616eee2eb84280b7c4914951c1ddbfd36 diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index 13c529288e..7d9635ba1d 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76 +Subproject commit 7d9635ba1dda31ce45b84519c4da76ff86d0debe diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center index 258bb62c58..e5cf8206c0 160000 --- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center +++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center @@ -1 +1 @@ -Subproject commit 258bb62c58e545c38749b8a66f5872035b2384cb +Subproject commit e5cf8206c0173228252ae74367cab85b0531488e diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index b96f0d2794..9addf6a26f 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit b96f0d279481446017ca1cc1ff4abf1f5a10346f +Subproject commit 9addf6a26fef3a32c78d574c66452b6210eca5c5 diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index f82d3ef195..843def7dae 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit f82d3ef195256aa71d274a34ea25f760d7e651d1 +Subproject commit 843def7daee741c8fb04fe21c3c7b98f22862471 diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit index 938f6bb335..0a045871d3 160000 --- a/frozen/Adafruit_CircuitPython_Crickit +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -1 +1 @@ -Subproject commit 938f6bb335ba5e4c56a8062c591ff9f3c18c4297 +Subproject commit 0a045871d3da681d1c9c9578f09174bfc6d84f1d diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605 index 8e7e111a9f..6a429bcd0e 160000 --- a/frozen/Adafruit_CircuitPython_DRV2605 +++ b/frozen/Adafruit_CircuitPython_DRV2605 @@ -1 +1 @@ -Subproject commit 8e7e111a9ff39d3f4311caa7babeb451422c759f +Subproject commit 6a429bcd0e6b22ee181197ce0477ae70f5adb80d diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231 index df24498154..22931594bc 160000 --- a/frozen/Adafruit_CircuitPython_DS3231 +++ b/frozen/Adafruit_CircuitPython_DS3231 @@ -1 +1 @@ -Subproject commit df2449815433e05ea0f89c19518ccde7a10a2faa +Subproject commit 22931594bc52ab259eaf313d26219a507703c315 diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes index 2fad6f2f98..d90f9e7b12 160000 --- a/frozen/Adafruit_CircuitPython_Display_Shapes +++ b/frozen/Adafruit_CircuitPython_Display_Shapes @@ -1 +1 @@ -Subproject commit 2fad6f2f98c0df135e2306d32af18bb2796b852c +Subproject commit d90f9e7b122aad072d59a01df524036995cf4a78 diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index de3276cc08..a5672998d9 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit de3276cc08ba13901d1f69060ff7501c1699bc4d +Subproject commit a5672998d9a555247ebd69b17f56813a03d8d40f diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index a90579e1e1..f9469d26ed 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit a90579e1e1e1c973e6ba8f6cf8e914d77fc8f0f2 +Subproject commit f9469d26ed9eb95d43982de88c035ac3862dd258 diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index ddd26eb4ab..a8c8f71727 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit ddd26eb4abcd3c10ae5dd33b1345d10d58707995 +Subproject commit a8c8f717271562fbfab295bdfd506c39f50de0fb diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests index f6cdec74b6..2ea025b1b6 160000 --- a/frozen/Adafruit_CircuitPython_FakeRequests +++ b/frozen/Adafruit_CircuitPython_FakeRequests @@ -1 +1 @@ -Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3 +Subproject commit 2ea025b1b68b0be95a0514732d4bc623f313fd75 diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch index a77f0f9c2e..b637c47423 160000 --- a/frozen/Adafruit_CircuitPython_FocalTouch +++ b/frozen/Adafruit_CircuitPython_FocalTouch @@ -1 +1 @@ -Subproject commit a77f0f9c2e8f64568bbb68254d0134fbc7b5a8af +Subproject commit b637c47423eb85233ba614424aadadace37fcfb1 diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID index 2fddabcaf0..47cc914748 160000 --- a/frozen/Adafruit_CircuitPython_HID +++ b/frozen/Adafruit_CircuitPython_HID @@ -1 +1 @@ -Subproject commit 2fddabcaf0df1763111ed9dbf9e2d4cdb5b0434e +Subproject commit 47cc91474823677218239b5b37901590755cac4c diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote index 1e478b1530..a2491a806b 160000 --- a/frozen/Adafruit_CircuitPython_IRRemote +++ b/frozen/Adafruit_CircuitPython_IRRemote @@ -1 +1 @@ -Subproject commit 1e478b1530b3be81bd84f13620d0a23502d377f1 +Subproject commit a2491a806b636f66caf670527c49b864923f125c diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F index a9cf0cde77..72367f37cd 160000 --- a/frozen/Adafruit_CircuitPython_LC709203F +++ b/frozen/Adafruit_CircuitPython_LC709203F @@ -1 +1 @@ -Subproject commit a9cf0cde77c185c6bbc79a3b6d77dd024a9683d2 +Subproject commit 72367f37cd221c7af7822ba3a9cd21cd3cd70292 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH index acc4bdd73f..a06c8a116e 160000 --- a/frozen/Adafruit_CircuitPython_LIS3DH +++ b/frozen/Adafruit_CircuitPython_LIS3DH @@ -1 +1 @@ -Subproject commit acc4bdd73fdceb74d75cd5a1f261ae157ee32613 +Subproject commit a06c8a116e5767a8481b9018239fe729e01760a6 diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index 3d1aab0daf..5acf8a850d 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit 3d1aab0daf63c3b4476f73cba39cf5da49e1e4aa +Subproject commit 5acf8a850d98789a79fe37836b2ac7b623d95913 diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI index 3d871907f0..d3f9adce6e 160000 --- a/frozen/Adafruit_CircuitPython_MIDI +++ b/frozen/Adafruit_CircuitPython_MIDI @@ -1 +1 @@ -Subproject commit 3d871907f0187c627277382f184209f5520703a6 +Subproject commit d3f9adce6e48d37222ef171a280cfa3122faf15b diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index 207953aac0..df61e7b0be 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c +Subproject commit df61e7b0be9dc0c6a1bbe60f526fbdc01b6c2819 diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index 36d4a31010..eb5bb54429 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit 36d4a31010461e47f265553ebd764c69d38a254c +Subproject commit eb5bb5442949e032ced5dd1cc143e5cdb689a24d diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase index bcfaae874f..a5b3f74049 160000 --- a/frozen/Adafruit_CircuitPython_PortalBase +++ b/frozen/Adafruit_CircuitPython_PortalBase @@ -1 +1 @@ -Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944 +Subproject commit a5b3f74049dfa0d39caf1c0520e46d773ba4d643 diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar index 011acd627f..1c39469bac 160000 --- a/frozen/Adafruit_CircuitPython_ProgressBar +++ b/frozen/Adafruit_CircuitPython_ProgressBar @@ -1 +1 @@ -Subproject commit 011acd627fc24342c397fc640b204a798f7b69dd +Subproject commit 1c39469bac98eea022af695ac42e5096dae6130c diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69 index c58defd709..74ea48f7a5 160000 --- a/frozen/Adafruit_CircuitPython_RFM69 +++ b/frozen/Adafruit_CircuitPython_RFM69 @@ -1 +1 @@ -Subproject commit c58defd70947531c5a9c37ddcb569f240567a78b +Subproject commit 74ea48f7a5d85591f5af804cacb57e9cfaab46c6 diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x index 2d8310f19d..cd1da8c938 160000 --- a/frozen/Adafruit_CircuitPython_RFM9x +++ b/frozen/Adafruit_CircuitPython_RFM9x @@ -1 +1 @@ -Subproject commit 2d8310f19d1bdce817df13e807b409b5b057fc21 +Subproject commit cd1da8c9384537b886ea697d5c38c7b34f8a178a diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register index 49ab415d6b..d1e8ac7ad9 160000 --- a/frozen/Adafruit_CircuitPython_Register +++ b/frozen/Adafruit_CircuitPython_Register @@ -1 +1 @@ -Subproject commit 49ab415d6b601c99979262f9e91c21dcb3a927a7 +Subproject commit d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7 diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index 2e6b3f9fee..6e03832b11 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit 2e6b3f9feeacc678402454f7d3416b04a9a93e17 +Subproject commit 6e03832b1170d75d7a7e0b8a578160298905b726 diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index da02c76d4c..332143d4ca 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35 +Subproject commit 332143d4ca5762d2d351ceb170c0b4e37dd42793 diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 index 850c3dc512..995959d5dc 160000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ b/frozen/Adafruit_CircuitPython_ST7789 @@ -1 +1 @@ -Subproject commit 850c3dc512f7feae1eaad20bdc1c5e4c63c92f08 +Subproject commit 995959d5dca23fbe49590700d1aa26a96dca1df7 diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO index 272d225365..d238fe99e2 160000 --- a/frozen/Adafruit_CircuitPython_SimpleIO +++ b/frozen/Adafruit_CircuitPython_SimpleIO @@ -1 +1 @@ -Subproject commit 272d225365eed46916390cf1f393dd08bc00b7d4 +Subproject commit d238fe99e24ea4cdb472f1d8a9c99dd189b0aeca diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath index fad0f89e76..632655b8f5 160000 --- a/frozen/Adafruit_CircuitPython_SimpleMath +++ b/frozen/Adafruit_CircuitPython_SimpleMath @@ -1 +1 @@ -Subproject commit fad0f89e760829a76f553ef8459f61001597a846 +Subproject commit 632655b8f5f6f62e3b4d0b6161213634e0ae74e9 diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor index e86f258e43..0c3a5ecaac 160000 --- a/frozen/Adafruit_CircuitPython_Thermistor +++ b/frozen/Adafruit_CircuitPython_Thermistor @@ -1 +1 @@ -Subproject commit e86f258e43591ce4a04661277e77e9fdf6fec27e +Subproject commit 0c3a5ecaac0891776822556b18f79722d72a8f04 diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 3aaf72165b..1230da9e11 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 3aaf72165bc6ba10bf5219716c8654651649f87b +Subproject commit 1230da9e11381767c7298d41c029ba63672ee1a6 From 094b3b3b614e7cbc39d8244c3223cdeea42653b3 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 16 Jun 2022 21:10:19 +0200 Subject: [PATCH 0474/2403] include python executable path in the idf key I noticed that the latest time we needed to switch the idf key was when the environment changed from python 3.10.4 to 3.10.5. I don't know if this is the only cause of needing to change the key, but it seems to be a good idea to make the key include it. I think this is what's going on because when I replaced a virtualenv's "python" with a dangling symlink (same as would occur when python's version gets bumped), I got a similar error. --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f260117ad..e2d58c1416 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -382,6 +382,7 @@ jobs: if: ${{ needs.test.outputs.boards-espressif != '[]' }} steps: - name: Set up Python 3 + id: py3 uses: actions/setup-python@v2 with: python-version: "3.x" @@ -400,7 +401,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From 111a25f9339f12bd7d7f5915fa0bb7c3fc95ebfe Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Jun 2022 16:21:27 +0200 Subject: [PATCH 0475/2403] use setup-python v4 for python-path support --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d58c1416..4a9bd65d8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -383,7 +383,7 @@ jobs: steps: - name: Set up Python 3 id: py3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: "3.x" - uses: actions/checkout@v2.2.0 From 7f968f18c0c7dbc01418481995a45a8882ab3c89 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 4 May 2022 01:49:51 +0200 Subject: [PATCH 0476/2403] move frozen adafruit_circuitplayground to express subdirectory --- .../boards/circuitplayground_express/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_crickit/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_displayio/mpconfigboard.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index 5311cdc1d4..b64fd2033d 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -19,7 +19,7 @@ CIRCUITPY_COUNTIO = 1 CIRCUITPY_BUSDEVICE = 1 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index 4d749d2134..975d892b9a 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -18,7 +18,7 @@ CIRCUITPY_KEYPAD = 0 CIRCUITPY_ONEWIREIO = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk index 0ae0c58b42..4338fe3e1e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk @@ -24,7 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_PARALLELDISPLAY = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor From 019a160983c92c8ef022b18e6f189ba6a671a9ce Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Mon, 20 Jun 2022 14:46:58 -0700 Subject: [PATCH 0477/2403] exposes `DigitalInOutPin` instances on the board, initialized and reserved. --- ports/stm/boards/swan_r5/board.c | 17 +++++++++++++++++ ports/stm/boards/swan_r5/board.h | 10 ++++++++++ ports/stm/boards/swan_r5/pins.c | 7 +++---- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 ports/stm/boards/swan_r5/board.h diff --git a/ports/stm/boards/swan_r5/board.c b/ports/stm/boards/swan_r5/board.c index bb424eea0b..4f29be35f8 100644 --- a/ports/stm/boards/swan_r5/board.c +++ b/ports/stm/boards/swan_r5/board.c @@ -30,11 +30,27 @@ #include "stm32l4xx.h" #include "stm32l4r5xx.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-bindings/digitalio/DigitalInOut.h" +#include "shared-bindings/digitalio/Direction.h" +#include "shared-bindings/digitalio/DriveMode.h" +#include "board.h" + +digitalio_digitalinout_obj_t power_pin = { .base.type = &digitalio_digitalinout_type }; +digitalio_digitalinout_obj_t discharge_pin = { .base.type = &digitalio_digitalinout_type }; + void initialize_discharge_pin(void) { + /* Initialize the 3V3 discharge to be OFF and the output power to be ON */ __HAL_RCC_GPIOE_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE(); + + common_hal_digitalio_digitalinout_construct(&power_pin, &pin_PE04); + common_hal_digitalio_digitalinout_construct(&discharge_pin, &pin_PE06); + common_hal_digitalio_digitalinout_never_reset(&power_pin); + common_hal_digitalio_digitalinout_never_reset(&discharge_pin); + GPIO_InitTypeDef GPIO_InitStruct; /* Set the DISCHARGE pin and the USB_DETECT pin to FLOAT */ GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; @@ -49,6 +65,7 @@ void initialize_discharge_pin(void) { GPIO_InitStruct.Pin = GPIO_PIN_4; HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); HAL_GPIO_WritePin(GPIOE, GPIO_PIN_4, GPIO_PIN_SET); + } void board_init(void) { diff --git a/ports/stm/boards/swan_r5/board.h b/ports/stm/boards/swan_r5/board.h new file mode 100644 index 0000000000..56c62c34a0 --- /dev/null +++ b/ports/stm/boards/swan_r5/board.h @@ -0,0 +1,10 @@ +#ifndef _BOARDS_SWAN_R5_BOARD_H_ +#define _BOARDS_SWAN_R5_BOARD_H_ + +#include "common-hal/digitalio/DigitalInOut.h" + +extern digitalio_digitalinout_obj_t power_pin; +extern digitalio_digitalinout_obj_t discharge_pin; + + +#endif // _BOARDS_SWAN_R5_BOARD_H_ diff --git a/ports/stm/boards/swan_r5/pins.c b/ports/stm/boards/swan_r5/pins.c index 7032eae4c4..cf97c3587a 100644 --- a/ports/stm/boards/swan_r5/pins.c +++ b/ports/stm/boards/swan_r5/pins.c @@ -1,5 +1,6 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" +#include "board.h" // extended pins STATIC const mp_rom_map_elem_t board_module_carrier_table[] = { @@ -86,10 +87,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ext), MP_ROM_PTR(&carrier_type) }, - { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), MP_ROM_PTR(SWAN_R5_ENABLE_3V3) }, - { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), MP_ROM_PTR(SWAN_R5_DISCHARGE_3V3) }, - { MP_ROM_QSTR(MP_QSTR_DISABLE_DISCHARGING), MP_ROM_TRUE }, - { MP_ROM_QSTR(MP_QSTR_ENABLE_DISCHARGING), MP_ROM_FALSE }, + { MP_ROM_QSTR(MP_QSTR_ENABLE_3V3), &power_pin }, + { MP_ROM_QSTR(MP_QSTR_DISCHARGE_3V3), &discharge_pin }, { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, // PWM, ADC { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA01) }, // PWM, ADC From d03bba3adb6cbc2c1e0bfb3d86addbae7e20f513 Mon Sep 17 00:00:00 2001 From: Matthew McGowan Date: Tue, 21 Jun 2022 14:47:33 -0700 Subject: [PATCH 0478/2403] feat(swan_r5): Enable UF2 support for Swan R5 board --- tools/build_board_info.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build_board_info.py b/tools/build_board_info.py index b86e6dd4ba..72ccb98551 100755 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -70,6 +70,7 @@ extension_by_board = { # stm32 "meowbit_v121": UF2, "sparkfun_stm32_thing_plus": BIN_UF2, + "swan_r5": BIN_UF2, # esp32c3 "adafruit_qtpy_esp32c3": BIN, "ai_thinker_esp32-c3s": BIN, From d3903bf2f4354c073f1b51b38af3d2542ac2aec8 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 12:14:05 -0500 Subject: [PATCH 0479/2403] Fix for Issue #6478 --- ports/nrf/boards/clue_nrf52840_express/board.c | 1 + ports/nrf/common-hal/alarm/__init__.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c index f2e648f473..06ee622f93 100644 --- a/ports/nrf/boards/clue_nrf52840_express/board.c +++ b/ports/nrf/boards/clue_nrf52840_express/board.c @@ -102,4 +102,5 @@ void reset_board(void) { } void board_deinit(void) { + common_hal_displayio_release_displays(); } diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 92dac1c789..c79158e8f1 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,6 +48,9 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" +#ifdef NRF_DEBUG_PRINT +void print_wakeup_cause(nrf_sleep_source_t cause); +#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { From 803c18c71f08df852ed6ae8b6cf1e69312b95d02 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 13:27:15 -0500 Subject: [PATCH 0480/2403] Uncommented call to print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index c79158e8f1..1acc0c0324 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -49,7 +49,7 @@ #include "nrfx.h" #include "nrfx_gpiote.h" #ifdef NRF_DEBUG_PRINT -void print_wakeup_cause(nrf_sleep_source_t cause); +static void print_wakeup_cause(nrf_sleep_source_t cause); #endif // Singleton instance of SleepMemory. @@ -111,7 +111,7 @@ bool common_hal_alarm_woken_from_sleep(void) { nrf_sleep_source_t cause = _get_wakeup_cause(); #ifdef NRF_DEBUG_PRINT if (cause != NRF_SLEEP_WAKEUP_UNDEFINED) { - // print_wakeup_cause(cause); + print_wakeup_cause(cause); } #endif return cause == NRF_SLEEP_WAKEUP_GPIO || cause == NRF_SLEEP_WAKEUP_TIMER From 1ad3daf75bda5b6961ba17939ebbbc2193c9c46d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 20:51:07 -0500 Subject: [PATCH 0481/2403] Fix declaration of print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 1acc0c0324..043be0b319 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,9 +48,6 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" -#ifdef NRF_DEBUG_PRINT -static void print_wakeup_cause(nrf_sleep_source_t cause); -#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { @@ -99,7 +96,7 @@ static const char *cause_str[] = { "VBUS", "RESETPIN", }; -void print_wakeup_cause(nrf_sleep_source_t cause) { +static void print_wakeup_cause(nrf_sleep_source_t cause) { if (cause >= 0 && cause < NRF_SLEEP_WAKEUP_ZZZ) { mp_printf(&mp_plat_print, "wakeup cause = NRF_SLEEP_WAKEUP_%s\r\n", cause_str[(int)cause]); From e8023f33a964e27d0d4dfed236d8d0a4d56efabf Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Jun 2022 14:56:18 -0500 Subject: [PATCH 0482/2403] Test for a BLE disconnect while reading --- ports/nrf/common-hal/_bleio/__init__.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c index 1d59983896..718b28c7fe 100644 --- a/ports/nrf/common-hal/_bleio/__init__.c +++ b/ports/nrf/common-hal/_bleio/__init__.c @@ -185,7 +185,12 @@ STATIC bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) { } break; } - + case BLE_GAP_EVT_DISCONNECTED: { + read->conn_handle = BLE_CONN_HANDLE_INVALID; + read->done = true; + return false; + break; + } default: // For debugging. // mp_printf(&mp_plat_print, "Unhandled characteristic event: 0x%04x\n", ble_evt->header.evt_id); @@ -219,6 +224,8 @@ size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_ while (!read_info.done) { RUN_BACKGROUND_TASKS; } + // Test if we were disconnected while reading + common_hal_bleio_check_connected(read_info.conn_handle); ble_drv_remove_event_handler(_on_gattc_read_rsp_evt, &read_info); check_gatt_status(read_info.status); From fcf46552f09f7cb7b7bd871e76d587dd81c61434 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 21 Jun 2022 22:03:59 -0500 Subject: [PATCH 0483/2403] validate bounds of pixel index in make_transparent --- locale/circuitpython.pot | 13 ++++++------- shared-bindings/displayio/Palette.c | 4 ++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index f965506d1b..d26cf4d2f0 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -72,7 +72,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -432,7 +432,6 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -518,7 +517,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -3687,6 +3686,10 @@ msgstr "" msgid "palette must be 32 bytes long" msgstr "" +#: shared-bindings/displayio/Palette.c +msgid "palette_index out of bounds" +msgstr "" + #: shared-bindings/displayio/Palette.c msgid "palette_index should be an int" msgstr "" @@ -3915,10 +3918,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c index 171a243a95..c1ce36f574 100644 --- a/shared-bindings/displayio/Palette.c +++ b/shared-bindings/displayio/Palette.c @@ -160,6 +160,10 @@ STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_ if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } + if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { + mp_raise_IndexError(translate("palette_index out of bounds")); + } + common_hal_displayio_palette_make_transparent(self, palette_index); return mp_const_none; } From 8daa1be701168858fd6e6cf80a55eb093dccad87 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 21 Jun 2022 22:11:58 -0500 Subject: [PATCH 0484/2403] validate bounds of pixel index in make_opaque and is_transparent --- shared-bindings/displayio/Palette.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c index c1ce36f574..a0e7d2b596 100644 --- a/shared-bindings/displayio/Palette.c +++ b/shared-bindings/displayio/Palette.c @@ -179,6 +179,10 @@ STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t pal if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } + if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { + mp_raise_IndexError(translate("palette_index out of bounds")); + } + common_hal_displayio_palette_make_opaque(self, palette_index); return mp_const_none; } @@ -195,6 +199,10 @@ STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } + if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { + mp_raise_IndexError(translate("palette_index out of bounds")); + } + return mp_obj_new_bool(common_hal_displayio_palette_is_transparent(self, palette_index)); } MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_is_transparent_obj, displayio_palette_obj_is_transparent); From 692492f83f2fd686c7f73e72e1f1e9ba11dd13c0 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 21 Jun 2022 22:19:19 -0500 Subject: [PATCH 0485/2403] undo unrelated translation changes --- locale/circuitpython.pot | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index d26cf4d2f0..0e3b723fdf 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -72,7 +72,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -432,6 +432,7 @@ msgstr "" msgid "All event channels in use" msgstr "" +#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -517,7 +518,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c +#: shared-bindings/wifi/Radio.c msgid "Authentication failure" msgstr "" @@ -3918,6 +3919,10 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" +#: shared-bindings/wifi/Radio.c +msgid "ssid can't be more than 32 bytes" +msgstr "" + #: py/objstr.c msgid "start/end indices" msgstr "" From ba72287db4cd445d9427c4c1eeb90f9e085896ab Mon Sep 17 00:00:00 2001 From: Neradoc Date: Tue, 21 Jun 2022 21:13:18 +0200 Subject: [PATCH 0486/2403] Implement default ports to IOTS2 --- ports/espressif/boards/hiibot_iots2/mpconfigboard.h | 9 +++++++++ ports/espressif/boards/hiibot_iots2/pins.c | 1 + 2 files changed, 10 insertions(+) diff --git a/ports/espressif/boards/hiibot_iots2/mpconfigboard.h b/ports/espressif/boards/hiibot_iots2/mpconfigboard.h index 61696716ee..269bea8566 100644 --- a/ports/espressif/boards/hiibot_iots2/mpconfigboard.h +++ b/ports/espressif/boards/hiibot_iots2/mpconfigboard.h @@ -34,3 +34,12 @@ #define MICROPY_HW_BUTTON (&pin_GPIO21) #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO21) + +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO1, .sda = &pin_GPIO2}} + +#define CIRCUITPY_BOARD_SPI (1) +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO40, .mosi = &pin_GPIO42, .miso = &pin_GPIO41}} + +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO43, .rx = &pin_GPIO44}} diff --git a/ports/espressif/boards/hiibot_iots2/pins.c b/ports/espressif/boards/hiibot_iots2/pins.c index 55e81ef3c5..a2277364f2 100644 --- a/ports/espressif/boards/hiibot_iots2/pins.c +++ b/ports/espressif/boards/hiibot_iots2/pins.c @@ -71,6 +71,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_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) }, }; From 03023d2829e5ddee56a0e99a73cce0d40d5e7f5c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 22 Jun 2022 09:13:41 -0400 Subject: [PATCH 0487/2403] update frozen libraries --- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index a5672998d9..bb9cb75e15 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit a5672998d9a555247ebd69b17f56813a03d8d40f +Subproject commit bb9cb75e15b4bfce3063a94b40dfad2375d5605e diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index a8c8f71727..f3d504be1d 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit a8c8f717271562fbfab295bdfd506c39f50de0fb +Subproject commit f3d504be1dc82cc4a8e4ea9b38bd5c2ce74d59ba diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index eb5bb54429..015eb1ccd5 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit eb5bb5442949e032ced5dd1cc143e5cdb689a24d +Subproject commit 015eb1ccd5eb5364d8e1cf20358e7dcda9f12efc diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 1230da9e11..148345d232 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 1230da9e11381767c7298d41c029ba63672ee1a6 +Subproject commit 148345d232c83133de3649fb70b471f11501b3d2 From c3ed4585e7c33404e5a63ab456e5e3a387f28bdd Mon Sep 17 00:00:00 2001 From: Patrick Van Oosterwijck Date: Wed, 22 Jun 2022 17:06:27 -0600 Subject: [PATCH 0488/2403] Update nvm.toml to add support for Puya P25Q32H --- data/nvm.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/nvm.toml b/data/nvm.toml index 266ea20ed8..2d292ad4e6 160000 --- a/data/nvm.toml +++ b/data/nvm.toml @@ -1 +1 @@ -Subproject commit 266ea20ed80104c315dcb124b482fa5f9f48cdec +Subproject commit 2d292ad4e67890d4b85b027431ba9fef7bf561fd From a45de19731ad506c0c5d0f8211ed2b0e72a991bd Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 23 Jun 2022 07:28:04 -0500 Subject: [PATCH 0489/2403] use validate_int_range(). remove string translation entry --- locale/circuitpython.pot | 4 ---- shared-bindings/displayio/Palette.c | 12 +++--------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 0e3b723fdf..f965506d1b 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -3687,10 +3687,6 @@ msgstr "" msgid "palette must be 32 bytes long" msgstr "" -#: shared-bindings/displayio/Palette.c -msgid "palette_index out of bounds" -msgstr "" - #: shared-bindings/displayio/Palette.c msgid "palette_index should be an int" msgstr "" diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c index a0e7d2b596..89460bfc03 100644 --- a/shared-bindings/displayio/Palette.c +++ b/shared-bindings/displayio/Palette.c @@ -160,9 +160,7 @@ STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_ if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } - if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { - mp_raise_IndexError(translate("palette_index out of bounds")); - } + palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index); common_hal_displayio_palette_make_transparent(self, palette_index); return mp_const_none; @@ -179,9 +177,7 @@ STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t pal if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } - if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { - mp_raise_IndexError(translate("palette_index out of bounds")); - } + palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index); common_hal_displayio_palette_make_opaque(self, palette_index); return mp_const_none; @@ -199,9 +195,7 @@ STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) { mp_raise_ValueError(translate("palette_index should be an int")); } - if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) { - mp_raise_IndexError(translate("palette_index out of bounds")); - } + palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index); return mp_obj_new_bool(common_hal_displayio_palette_is_transparent(self, palette_index)); } From 02069eb0b529cc2660715f5ae1da618cb6ddb541 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 23 Jun 2022 15:59:06 -0400 Subject: [PATCH 0490/2403] wip --- data/nvm.toml | 2 +- frozen/Adafruit_CircuitPython_APDS9960 | 2 +- frozen/Adafruit_CircuitPython_BLE | 2 +- ...ircuitPython_BLE_Apple_Notification_Center | 2 +- frozen/Adafruit_CircuitPython_BusDevice | 2 +- .../Adafruit_CircuitPython_CircuitPlayground | 2 +- frozen/Adafruit_CircuitPython_Crickit | 2 +- frozen/Adafruit_CircuitPython_DRV2605 | 2 +- frozen/Adafruit_CircuitPython_DS3231 | 2 +- frozen/Adafruit_CircuitPython_Display_Shapes | 2 +- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_DotStar | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_FakeRequests | 2 +- frozen/Adafruit_CircuitPython_FocalTouch | 2 +- frozen/Adafruit_CircuitPython_HID | 2 +- frozen/Adafruit_CircuitPython_IRRemote | 2 +- frozen/Adafruit_CircuitPython_LC709203F | 2 +- frozen/Adafruit_CircuitPython_LIS3DH | 2 +- frozen/Adafruit_CircuitPython_LSM6DS | 2 +- frozen/Adafruit_CircuitPython_MIDI | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_PortalBase | 2 +- frozen/Adafruit_CircuitPython_ProgressBar | 2 +- frozen/Adafruit_CircuitPython_RFM69 | 2 +- frozen/Adafruit_CircuitPython_RFM9x | 2 +- frozen/Adafruit_CircuitPython_Register | 2 +- frozen/Adafruit_CircuitPython_Requests | 2 +- frozen/Adafruit_CircuitPython_SD | 2 +- frozen/Adafruit_CircuitPython_ST7789 | 2 +- frozen/Adafruit_CircuitPython_SimpleIO | 2 +- frozen/Adafruit_CircuitPython_SimpleMath | 2 +- frozen/Adafruit_CircuitPython_Thermistor | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- ports/atmel-samd/peripherals | 2 +- .../adafruit_esp32s2_camera/mpconfigboard.mk | 8 +- .../adafruit_feather_esp32s2/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 8 +- .../boards/adafruit_funhouse/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../adafruit_metro_esp32s2/mpconfigboard.mk | 8 +- .../adafruit_qtpy_esp32c3/mpconfigboard.mk | 8 +- .../adafruit_qtpy_esp32s2/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 6 +- .../ai_thinker_esp32-c3s-2m/mpconfigboard.mk | 6 +- .../ai_thinker_esp32-c3s/mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 8 +- .../boards/artisense_rd00/mpconfigboard.mk | 8 +- .../atmegazero_esp32s2/mpconfigboard.mk | 6 +- .../crumpspace_crumps2/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 6 +- .../electroniccats_bastwifi/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../espressif_esp32s3_box/mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../espressif_hmi_devkit_1/mpconfigboard.mk | 8 +- .../espressif_kaluga_1.3/mpconfigboard.mk | 8 +- .../espressif_kaluga_1/mpconfigboard.mk | 8 +- .../espressif_saola_1_wroom/mpconfigboard.mk | 8 +- .../espressif_saola_1_wrover/mpconfigboard.mk | 8 +- .../franzininho_wifi_wroom/mpconfigboard.mk | 8 +- .../franzininho_wifi_wrover/mpconfigboard.mk | 8 +- .../gravitech_cucumber_m/mpconfigboard.mk | 8 +- .../gravitech_cucumber_ms/mpconfigboard.mk | 8 +- .../gravitech_cucumber_r/mpconfigboard.mk | 8 +- .../gravitech_cucumber_rs/mpconfigboard.mk | 8 +- .../boards/hexky_s2/mpconfigboard.mk | 6 +- .../boards/hiibot_iots2/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../boards/lilygo_ttgo_t8_s2/mpconfigboard.mk | 2 +- .../lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk | 2 +- .../boards/lolin_s2_mini/mpconfigboard.mk | 6 +- .../boards/lolin_s2_pico/mpconfigboard.mk | 6 +- .../boards/microdev_micro_c3/mpconfigboard.mk | 6 +- .../boards/microdev_micro_s2/mpconfigboard.mk | 6 +- .../boards/mixgo_ce_serial/mpconfigboard.mk | 8 +- .../boards/mixgo_ce_udisk/mpconfigboard.mk | 8 +- .../morpheans_morphesp-240/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../odt_pixelwing_esp32_s2/mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 8 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../mpconfigboard.mk | 6 +- .../unexpectedmaker_pros3/mpconfigboard.mk | 6 +- .../unexpectedmaker_tinys2/mpconfigboard.mk | 6 +- .../unexpectedmaker_tinys3/mpconfigboard.mk | 6 +- .../esp-idf-config/sdkconfig-8MB.defaults | 7 +- .../esp-idf-config/sdkconfig-ble.defaults | 156 +----------------- .../esp-idf-config/sdkconfig-opt.defaults | 50 +++--- .../esp-idf-config/sdkconfig.defaults | 129 +++++++++------ ports/espressif/modules/wroom.c | 37 ----- ports/espressif/modules/wrover.c | 38 ----- ports/espressif/mpconfigport.mk | 9 +- 108 files changed, 379 insertions(+), 567 deletions(-) delete mode 100644 ports/espressif/modules/wroom.c delete mode 100644 ports/espressif/modules/wrover.c diff --git a/data/nvm.toml b/data/nvm.toml index 2d292ad4e6..266ea20ed8 160000 --- a/data/nvm.toml +++ b/data/nvm.toml @@ -1 +1 @@ -Subproject commit 2d292ad4e67890d4b85b027431ba9fef7bf561fd +Subproject commit 266ea20ed80104c315dcb124b482fa5f9f48cdec diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960 index 13856be616..9bd4882092 160000 --- a/frozen/Adafruit_CircuitPython_APDS9960 +++ b/frozen/Adafruit_CircuitPython_APDS9960 @@ -1 +1 @@ -Subproject commit 13856be616eee2eb84280b7c4914951c1ddbfd36 +Subproject commit 9bd48820928afad549832fe9b4ae497b224007f0 diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index 7d9635ba1d..13c529288e 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit 7d9635ba1dda31ce45b84519c4da76ff86d0debe +Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76 diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center index e5cf8206c0..258bb62c58 160000 --- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center +++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center @@ -1 +1 @@ -Subproject commit e5cf8206c0173228252ae74367cab85b0531488e +Subproject commit 258bb62c58e545c38749b8a66f5872035b2384cb diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index 9addf6a26f..b96f0d2794 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit 9addf6a26fef3a32c78d574c66452b6210eca5c5 +Subproject commit b96f0d279481446017ca1cc1ff4abf1f5a10346f diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index 843def7dae..54b2fa03d8 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit 843def7daee741c8fb04fe21c3c7b98f22862471 +Subproject commit 54b2fa03d8af80562b77460841e63d47f12eee43 diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit index 0a045871d3..938f6bb335 160000 --- a/frozen/Adafruit_CircuitPython_Crickit +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -1 +1 @@ -Subproject commit 0a045871d3da681d1c9c9578f09174bfc6d84f1d +Subproject commit 938f6bb335ba5e4c56a8062c591ff9f3c18c4297 diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605 index 6a429bcd0e..8e7e111a9f 160000 --- a/frozen/Adafruit_CircuitPython_DRV2605 +++ b/frozen/Adafruit_CircuitPython_DRV2605 @@ -1 +1 @@ -Subproject commit 6a429bcd0e6b22ee181197ce0477ae70f5adb80d +Subproject commit 8e7e111a9ff39d3f4311caa7babeb451422c759f diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231 index 22931594bc..df24498154 160000 --- a/frozen/Adafruit_CircuitPython_DS3231 +++ b/frozen/Adafruit_CircuitPython_DS3231 @@ -1 +1 @@ -Subproject commit 22931594bc52ab259eaf313d26219a507703c315 +Subproject commit df2449815433e05ea0f89c19518ccde7a10a2faa diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes index d90f9e7b12..2fad6f2f98 160000 --- a/frozen/Adafruit_CircuitPython_Display_Shapes +++ b/frozen/Adafruit_CircuitPython_Display_Shapes @@ -1 +1 @@ -Subproject commit d90f9e7b122aad072d59a01df524036995cf4a78 +Subproject commit 2fad6f2f98c0df135e2306d32af18bb2796b852c diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index bb9cb75e15..de3276cc08 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit bb9cb75e15b4bfce3063a94b40dfad2375d5605e +Subproject commit de3276cc08ba13901d1f69060ff7501c1699bc4d diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index f9469d26ed..a90579e1e1 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit f9469d26ed9eb95d43982de88c035ac3862dd258 +Subproject commit a90579e1e1e1c973e6ba8f6cf8e914d77fc8f0f2 diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index f3d504be1d..ddd26eb4ab 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit f3d504be1dc82cc4a8e4ea9b38bd5c2ce74d59ba +Subproject commit ddd26eb4abcd3c10ae5dd33b1345d10d58707995 diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests index 2ea025b1b6..f6cdec74b6 160000 --- a/frozen/Adafruit_CircuitPython_FakeRequests +++ b/frozen/Adafruit_CircuitPython_FakeRequests @@ -1 +1 @@ -Subproject commit 2ea025b1b68b0be95a0514732d4bc623f313fd75 +Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3 diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch index b637c47423..a77f0f9c2e 160000 --- a/frozen/Adafruit_CircuitPython_FocalTouch +++ b/frozen/Adafruit_CircuitPython_FocalTouch @@ -1 +1 @@ -Subproject commit b637c47423eb85233ba614424aadadace37fcfb1 +Subproject commit a77f0f9c2e8f64568bbb68254d0134fbc7b5a8af diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID index 47cc914748..2fddabcaf0 160000 --- a/frozen/Adafruit_CircuitPython_HID +++ b/frozen/Adafruit_CircuitPython_HID @@ -1 +1 @@ -Subproject commit 47cc91474823677218239b5b37901590755cac4c +Subproject commit 2fddabcaf0df1763111ed9dbf9e2d4cdb5b0434e diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote index a2491a806b..1e478b1530 160000 --- a/frozen/Adafruit_CircuitPython_IRRemote +++ b/frozen/Adafruit_CircuitPython_IRRemote @@ -1 +1 @@ -Subproject commit a2491a806b636f66caf670527c49b864923f125c +Subproject commit 1e478b1530b3be81bd84f13620d0a23502d377f1 diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F index 72367f37cd..a9cf0cde77 160000 --- a/frozen/Adafruit_CircuitPython_LC709203F +++ b/frozen/Adafruit_CircuitPython_LC709203F @@ -1 +1 @@ -Subproject commit 72367f37cd221c7af7822ba3a9cd21cd3cd70292 +Subproject commit a9cf0cde77c185c6bbc79a3b6d77dd024a9683d2 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH index a06c8a116e..acc4bdd73f 160000 --- a/frozen/Adafruit_CircuitPython_LIS3DH +++ b/frozen/Adafruit_CircuitPython_LIS3DH @@ -1 +1 @@ -Subproject commit a06c8a116e5767a8481b9018239fe729e01760a6 +Subproject commit acc4bdd73fdceb74d75cd5a1f261ae157ee32613 diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index 5acf8a850d..3d1aab0daf 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit 5acf8a850d98789a79fe37836b2ac7b623d95913 +Subproject commit 3d1aab0daf63c3b4476f73cba39cf5da49e1e4aa diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI index d3f9adce6e..3d871907f0 160000 --- a/frozen/Adafruit_CircuitPython_MIDI +++ b/frozen/Adafruit_CircuitPython_MIDI @@ -1 +1 @@ -Subproject commit d3f9adce6e48d37222ef171a280cfa3122faf15b +Subproject commit 3d871907f0187c627277382f184209f5520703a6 diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index df61e7b0be..207953aac0 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit df61e7b0be9dc0c6a1bbe60f526fbdc01b6c2819 +Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index 015eb1ccd5..36d4a31010 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit 015eb1ccd5eb5364d8e1cf20358e7dcda9f12efc +Subproject commit 36d4a31010461e47f265553ebd764c69d38a254c diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase index a5b3f74049..bcfaae874f 160000 --- a/frozen/Adafruit_CircuitPython_PortalBase +++ b/frozen/Adafruit_CircuitPython_PortalBase @@ -1 +1 @@ -Subproject commit a5b3f74049dfa0d39caf1c0520e46d773ba4d643 +Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944 diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar index 1c39469bac..011acd627f 160000 --- a/frozen/Adafruit_CircuitPython_ProgressBar +++ b/frozen/Adafruit_CircuitPython_ProgressBar @@ -1 +1 @@ -Subproject commit 1c39469bac98eea022af695ac42e5096dae6130c +Subproject commit 011acd627fc24342c397fc640b204a798f7b69dd diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69 index 74ea48f7a5..c58defd709 160000 --- a/frozen/Adafruit_CircuitPython_RFM69 +++ b/frozen/Adafruit_CircuitPython_RFM69 @@ -1 +1 @@ -Subproject commit 74ea48f7a5d85591f5af804cacb57e9cfaab46c6 +Subproject commit c58defd70947531c5a9c37ddcb569f240567a78b diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x index cd1da8c938..2d8310f19d 160000 --- a/frozen/Adafruit_CircuitPython_RFM9x +++ b/frozen/Adafruit_CircuitPython_RFM9x @@ -1 +1 @@ -Subproject commit cd1da8c9384537b886ea697d5c38c7b34f8a178a +Subproject commit 2d8310f19d1bdce817df13e807b409b5b057fc21 diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register index d1e8ac7ad9..49ab415d6b 160000 --- a/frozen/Adafruit_CircuitPython_Register +++ b/frozen/Adafruit_CircuitPython_Register @@ -1 +1 @@ -Subproject commit d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7 +Subproject commit 49ab415d6b601c99979262f9e91c21dcb3a927a7 diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index 6e03832b11..2e6b3f9fee 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit 6e03832b1170d75d7a7e0b8a578160298905b726 +Subproject commit 2e6b3f9feeacc678402454f7d3416b04a9a93e17 diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index 332143d4ca..da02c76d4c 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit 332143d4ca5762d2d351ceb170c0b4e37dd42793 +Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35 diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 index 995959d5dc..850c3dc512 160000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ b/frozen/Adafruit_CircuitPython_ST7789 @@ -1 +1 @@ -Subproject commit 995959d5dca23fbe49590700d1aa26a96dca1df7 +Subproject commit 850c3dc512f7feae1eaad20bdc1c5e4c63c92f08 diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO index d238fe99e2..272d225365 160000 --- a/frozen/Adafruit_CircuitPython_SimpleIO +++ b/frozen/Adafruit_CircuitPython_SimpleIO @@ -1 +1 @@ -Subproject commit d238fe99e24ea4cdb472f1d8a9c99dd189b0aeca +Subproject commit 272d225365eed46916390cf1f393dd08bc00b7d4 diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath index 632655b8f5..fad0f89e76 160000 --- a/frozen/Adafruit_CircuitPython_SimpleMath +++ b/frozen/Adafruit_CircuitPython_SimpleMath @@ -1 +1 @@ -Subproject commit 632655b8f5f6f62e3b4d0b6161213634e0ae74e9 +Subproject commit fad0f89e760829a76f553ef8459f61001597a846 diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor index 0c3a5ecaac..e86f258e43 160000 --- a/frozen/Adafruit_CircuitPython_Thermistor +++ b/frozen/Adafruit_CircuitPython_Thermistor @@ -1 +1 @@ -Subproject commit 0c3a5ecaac0891776822556b18f79722d72a8f04 +Subproject commit e86f258e43591ce4a04661277e77e9fdf6fec27e diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 148345d232..3aaf72165b 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 148345d232c83133de3649fb70b471f11501b3d2 +Subproject commit 3aaf72165bc6ba10bf5219716c8654651649f87b diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index 79bf4e87e9..d3b20192cf 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit 79bf4e87e98356c54f13799ccb8fb84dff987bd1 +Subproject commit d3b20192cf94fdea68a412596e082108ba5ebbf0 diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk index d99a431599..724a85370d 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk index 3f2fee9cf4..b975aecd5e 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk index 0f099f8b22..c6d34efbd1 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk @@ -13,8 +13,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk index e1a9793289..38167546b9 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk @@ -12,11 +12,11 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk index 22175fce5d..69f7dd09e0 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s3_wrover diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk index 7c768eb51c..37979eed6f 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index b3c68b3b62..088dd9386c 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -13,8 +13,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s3_wroom diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk index fb7b969b80..aa1f5a40fb 100644 --- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk @@ -12,11 +12,11 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk index 3091d298e9..a03c697931 100644 --- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk @@ -12,11 +12,11 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk index a7204b957d..8bd07381d6 100644 --- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk index 36d9c3b5d6..6ca93a9fd4 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk @@ -1,10 +1,10 @@ CIRCUITPY_CREATOR_ID = 0x0000239A -CIRCUITPY_CREATION_ID = 0x00010001 +CIRCUITPY_CREATION_ID = 0x00c30001 IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk index d415e140cb..2273fbe307 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk @@ -13,8 +13,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk index 657855cad8..49ec368c49 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk @@ -13,9 +13,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk index 6d7a58ea5c..125666b599 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk @@ -5,6 +5,6 @@ IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=2MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 2MB diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk index 3a83ab500b..eb88c5caab 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk @@ -5,6 +5,6 @@ IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk index 1883b1fbfa..433c43f1ff 100644 --- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk index 1f9d037ef2..31fbf593ed 100644 --- a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk +++ b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk index 79246b1393..453591d3f8 100644 --- a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 16MB diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk index e55ca0e4e8..8014d03bf1 100644 --- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk +++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk @@ -12,13 +12,13 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB CIRCUITPY_BITBANG_APA102 = 1 -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover # Include these Python libraries in firmware. # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk index 7a7a032e2c..84ab3422e8 100644 --- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk index 8e2517ba23..77de160464 100644 --- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk +++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk @@ -14,8 +14,8 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 CIRCUITPY_NEOPIXEL_WRITE = 0 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk index b952dacef7..a652d71e8f 100644 --- a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk @@ -5,6 +5,6 @@ IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk index e902c3975a..7d7ef438f6 100644 --- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk index d007558640..06947b1275 100644 --- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk index 6664ba8c98..86865981e6 100644 --- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk index b6ead37eee..8e7b09dbc9 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk index 7fff66f5d8..698c1fff88 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk index 4e65fc940d..f9c6cd9c44 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk index 9558b05576..d6b401ac87 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk index e9eab16f91..3197d78a31 100644 --- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk @@ -12,6 +12,6 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk index 1b11f4fbee..02395a4fa8 100644 --- a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk index 7823674329..e261ad372d 100644 --- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk index 7823674329..e261ad372d 100644 --- a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk index f25cdc4a63..e24f540814 100644 --- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk index b4154bf3a4..38c74fd064 100644 --- a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk index f1ed49a32a..2b5328ad31 100644 --- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk index 1478332fac..8f7a39f117 100644 --- a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk index ad9bce8cc0..63b35234b7 100644 --- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk index c96ac0dc09..8bfc6e1c02 100644 --- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk index 51f5fe468f..d044160804 100644 --- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk index 6cb8d13d8e..02c1669434 100644 --- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/hexky_s2/mpconfigboard.mk b/ports/espressif/boards/hexky_s2/mpconfigboard.mk index 726bd3bb51..dbde2f77e4 100644 --- a/ports/espressif/boards/hexky_s2/mpconfigboard.mk +++ b/ports/espressif/boards/hexky_s2/mpconfigboard.mk @@ -13,8 +13,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk index 58a7176119..b52c88cdc6 100644 --- a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk +++ b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk @@ -12,7 +12,7 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=8MB -#CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 8MB +#CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk index 528938f7ac..379b6f087e 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk index f0c9eb5c0b..1eed59fc41 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk index c7795bbdeb..1738a22c0e 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk index 5e40a1e13c..acedc2ad51 100644 --- a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk +++ b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB # Include these Python libraries in firmware. diff --git a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk index b060be0261..bd4aca0337 100644 --- a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk +++ b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB # Include these Python libraries in firmware. diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk index 12bd7358b8..ce431624ae 100644 --- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk +++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk @@ -5,6 +5,6 @@ IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk index 887e6d8b9b..d551a5601c 100644 --- a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk +++ b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk @@ -11,6 +11,6 @@ INTERNAL_FLASH_FILESYSTEM = 1 # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk index 860f611354..db600060d6 100644 --- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -12,11 +12,11 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index 7e6646225f..9917654502 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -12,11 +12,11 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk index 567f2ddea1..2b5c7b7d39 100644 --- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk +++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk index 7385906921..baf78ce4b8 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk index 6060a5c581..4a7ce7966c 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk index f4c0be83dc..1ad615ef48 100644 --- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk +++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk index a64f49c144..959161f193 100644 --- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wroom +CIRCUITPY_MODULE = esp32s2_wroom diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk index 6683acac15..d0f2c7304c 100644 --- a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk @@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE=wrover +CIRCUITPY_MODULE = esp32s2_wrover diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk index 84c9787733..10ddea75f1 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 16MB CIRCUITPY_BITBANG_APA102 = 1 diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk index cef7355051..f42f8ca7cc 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB CIRCUITPY_BITBANG_NEOPIXEL = 1 diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk index 84c9787733..10ddea75f1 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=40m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 16MB CIRCUITPY_BITBANG_APA102 = 1 diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk index 866bd15ffa..eb6673b563 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB #CIRCUITPY_BITBANG_NEOPIXEL = 1 diff --git a/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk index 3b50324d3c..4413a8b641 100644 --- a/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=16MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB # CIRCUITPY_BITBANG_NEOPIXEL = 1 diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk index ead608e6b2..8b1cd8bb51 100644 --- a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=qio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=4MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB CIRCUITPY_BITBANG_NEOPIXEL = 1 diff --git a/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk index 32a711c257..9de950e632 100644 --- a/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk +++ b/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk @@ -12,9 +12,9 @@ LONGINT_IMPL = MPZ # so increase it to 32. CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 -CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m -CIRCUITPY_ESP_FLASH_SIZE=8MB +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 8MB # CIRCUITPY_BITBANG_NEOPIXEL = 1 diff --git a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults index 1ecb1b4c16..ba91195364 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults @@ -6,6 +6,9 @@ # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="8MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y # end of Serial flasher config @@ -13,6 +16,6 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y # # Partition Table # -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB.csv" -CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB.csv" +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" # end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-ble.defaults b/ports/espressif/esp-idf-config/sdkconfig-ble.defaults index 8180786fbf..0260d9f53f 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-ble.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-ble.defaults @@ -4,161 +4,7 @@ # # Bluetooth # -CONFIG_BT_ENABLED=y -# -# Bluetooth controller -# -CONFIG_BT_CTRL_MODE_EFF=1 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10 -CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0 -CONFIG_BT_CTRL_PINNED_TO_CORE=0 -CONFIG_BT_CTRL_HCI_MODE_VHCI=y -# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set -CONFIG_BT_CTRL_HCI_TL=1 -CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30 -# CONFIG_BT_CTRL_HW_CCA is not set -CONFIG_BT_CTRL_HW_CCA_VAL=20 -CONFIG_BT_CTRL_HW_CCA_EFF=0 -CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set -CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0 -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0 -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0 -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N27 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N24 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N21 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N18 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3=y -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P18 is not set -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=10 -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 -CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 -# CONFIG_BT_CTRL_BLE_SCAN_DUPL is not set -# CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN is not set -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS=y -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0 -# -# MODEM SLEEP Options -# -# CONFIG_BT_CTRL_MODEM_SLEEP is not set -# end of MODEM SLEEP Options - -CONFIG_BT_CTRL_SLEEP_MODE_EFF=0 -CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0 -CONFIG_BT_CTRL_HCI_TL_EFF=1 -# CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set -# end of Bluetooth controller - -# CONFIG_BT_BLUEDROID_ENABLED is not set -CONFIG_BT_NIMBLE_ENABLED=y -# CONFIG_BT_CONTROLLER_ONLY is not set -# -# NimBLE Options -# -CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y -# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set -# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set -# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set -# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set -CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y -# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set -CONFIG_BT_NIMBLE_LOG_LEVEL=1 -CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 -CONFIG_BT_NIMBLE_MAX_BONDS=3 -CONFIG_BT_NIMBLE_MAX_CCCDS=8 -CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0 -CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096 -CONFIG_BT_NIMBLE_ROLE_CENTRAL=y -CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y -CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y -CONFIG_BT_NIMBLE_ROLE_OBSERVER=y -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SM_LEGACY=y -CONFIG_BT_NIMBLE_SM_SC=y -# CONFIG_BT_NIMBLE_DEBUG is not set -# CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble" -CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31 -CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256 -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0 -CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20 -CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255 -CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 -CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30 -CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8 -CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12 -# CONFIG_BT_NIMBLE_HS_FLOW_CTRL is not set -CONFIG_BT_NIMBLE_RPA_TIMEOUT=900 -# CONFIG_BT_NIMBLE_MESH is not set -CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y -CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000 -# CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY is not set -CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=y -CONFIG_BT_NIMBLE_MAX_CONN_REATTEMPT=3 -CONFIG_BT_NIMBLE_EXT_ADV=y -CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=1 -CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN=1650 -CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV=y -CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=1 -# CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set -CONFIG_BT_NIMBLE_USE_ESP_TIMER=y -# end of NimBLE Options - +# CONFIG_BT_ENABLED is not set # end of Bluetooth # end of Component config - -# -# Deprecated options for backward compatibility -# -# CONFIG_BLUEDROID_ENABLED is not set -CONFIG_NIMBLE_ENABLED=y -CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y -# CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set -CONFIG_NIMBLE_MAX_CONNECTIONS=3 -CONFIG_NIMBLE_MAX_BONDS=3 -CONFIG_NIMBLE_MAX_CCCDS=8 -CONFIG_NIMBLE_L2CAP_COC_MAX_NUM=0 -CONFIG_NIMBLE_TASK_STACK_SIZE=4096 -CONFIG_NIMBLE_ROLE_CENTRAL=y -CONFIG_NIMBLE_ROLE_PERIPHERAL=y -CONFIG_NIMBLE_ROLE_BROADCASTER=y -CONFIG_NIMBLE_ROLE_OBSERVER=y -CONFIG_NIMBLE_NVS_PERSIST=y -CONFIG_NIMBLE_SM_LEGACY=y -CONFIG_NIMBLE_SM_SC=y -# CONFIG_NIMBLE_DEBUG is not set -# CONFIG_NIMBLE_SM_SC_DEBUG_KEYS is not set -CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME="nimble" -CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31 -CONFIG_NIMBLE_ATT_PREFERRED_MTU=256 -CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0 -CONFIG_NIMBLE_ACL_BUF_COUNT=20 -CONFIG_NIMBLE_ACL_BUF_SIZE=255 -CONFIG_NIMBLE_HCI_EVT_BUF_SIZE=70 -CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT=30 -CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8 -CONFIG_NIMBLE_MSYS1_BLOCK_COUNT=12 -# CONFIG_NIMBLE_HS_FLOW_CTRL is not set -CONFIG_NIMBLE_RPA_TIMEOUT=900 -# CONFIG_NIMBLE_MESH is not set -CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y -CONFIG_SW_COEXIST_ENABLE=y -# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults index e9b91113d5..b00d04770f 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults @@ -14,44 +14,36 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_COMPILER_OPTIMIZATION_PERF is not set # CONFIG_COMPILER_OPTIMIZATION_NONE is not set -# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set -CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=1 +CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set # end of Compiler options # # Component config # -# -# ESP32S3-Specific -# -CONFIG_ESP32S3_DEBUG_OCDAWARE=y -# end of ESP32S3-Specific - # # Common ESP-related # -# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set +CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # end of Common ESP-related # # ESP System Settings # -# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set +CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y # CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set -CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y +# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set -# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set -# CONFIG_ESP_CONSOLE_USB_CDC is not set -# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set +CONFIG_ESP_CONSOLE_UART_DEFAULT=y # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set -CONFIG_ESP_CONSOLE_NONE=y -# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set -CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y +# CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y -CONFIG_ESP_CONSOLE_UART_NUM=-1 +CONFIG_ESP_CONSOLE_UART_NUM=0 +CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 # end of ESP System Settings # @@ -70,7 +62,8 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y # CONFIG_HAL_ASSERTION_DISABLE is not set # CONFIG_HAL_ASSERTION_SILIENT is not set -CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=1 +# CONFIG_HAL_ASSERTION_ENABLE is not set +CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 # end of Hardware Abstraction Layer (HAL) and Low Level (LL) # @@ -86,16 +79,17 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y # # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set -CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y +CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y +# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set -CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1 -# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set +CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2 +CONFIG_ESP32S2_PANIC_PRINT_HALT=y # CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set -CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y +# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set # CONFIG_ESP32S2_PANIC_GDBSTUB is not set -# CONFIG_CONSOLE_UART_DEFAULT is not set +CONFIG_CONSOLE_UART_DEFAULT=y # CONFIG_CONSOLE_UART_CUSTOM is not set -CONFIG_ESP_CONSOLE_UART_NONE=y -CONFIG_CONSOLE_UART_NUM=-1 +# CONFIG_ESP_CONSOLE_UART_NONE is not set +CONFIG_CONSOLE_UART_NUM=0 +CONFIG_CONSOLE_UART_BAUDRATE=115200 # end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 5fb49faa82..9ad89d4811 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -54,37 +54,25 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # -CONFIG_SECURE_BOOT_SUPPORTS_RSA=y -CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set # end of Security features -# -# Boot ROM Behavior -# -CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y -# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set -# end of Boot ROM Behavior - # # Serial flasher config # CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set -# CONFIG_ESPTOOLPY_OCT_FLASH is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set CONFIG_ESPTOOLPY_FLASHMODE_DIO=y # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" CONFIG_ESPTOOLPY_BEFORE_RESET=y @@ -108,10 +96,10 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table # -# CONFIG_PARTITION_TABLE_SINGLE_APP is not set +CONFIG_PARTITION_TABLE_SINGLE_APP=y # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set -CONFIG_PARTITION_TABLE_CUSTOM=y +# CONFIG_PARTITION_TABLE_CUSTOM is not set CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table @@ -142,7 +130,6 @@ CONFIG_APPTRACE_DEST_NONE=y CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing -# CONFIG_BLE_MESH is not set # # Driver configurations # @@ -172,6 +159,10 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # TWAI configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set +# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set +# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set # end of TWAI configuration # @@ -180,6 +171,18 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration +# +# RTCIO configuration +# +# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set +# end of RTCIO configuration + +# +# GPIO Configuration +# +# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set +# end of GPIO Configuration + # # GDMA Configuration # @@ -194,24 +197,45 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # # CONFIG_EFUSE_CUSTOM_TABLE is not set # CONFIG_EFUSE_VIRTUAL is not set -CONFIG_EFUSE_MAX_BLK_LEN=256 +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set +CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set +CONFIG_EFUSE_MAX_BLK_LEN=192 # end of eFuse Bit Manager # # ESP-TLS # CONFIG_ESP_TLS_USING_MBEDTLS=y -CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y -CONFIG_ESP_TLS_SERVER=y +# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set +CONFIG_ESP_TLS_SERVER=y # CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set +# CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set # CONFIG_ESP_TLS_INSECURE is not set # end of ESP-TLS +# +# ADC-Calibration +# +CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y +CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CAL_LUT_ENABLE=y +# end of ADC-Calibration + # # Ethernet # +CONFIG_ETH_ENABLED=y +CONFIG_ETH_USE_ESP32_EMAC=y +CONFIG_ETH_PHY_INTERFACE_RMII=y +CONFIG_ETH_RMII_CLK_INPUT=y +# CONFIG_ETH_RMII_CLK_OUTPUT is not set +CONFIG_ETH_RMII_CLK_IN_GPIO=0 +CONFIG_ETH_DMA_BUFFER_SIZE=512 +CONFIG_ETH_DMA_RX_BUFFER_NUM=10 +CONFIG_ETH_DMA_TX_BUFFER_NUM=10 # CONFIG_ETH_USE_SPI_ETHERNET is not set # CONFIG_ETH_USE_OPENETH is not set # end of Ethernet @@ -240,16 +264,9 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y # Sleep Config # CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y -# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set # CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set # end of Sleep Config -# -# RTC Clock Config -# -CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y -# end of RTC Clock Config - # end of Hardware Settings # @@ -266,7 +283,7 @@ CONFIG_ESP_IPC_ISR_ENABLE=y CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120 CONFIG_ESP_NETIF_TCPIP_LWIP=y # CONFIG_ESP_NETIF_LOOPBACK is not set -# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set +CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=y # end of ESP NETIF Adapter # @@ -276,32 +293,34 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 +CONFIG_ESP_PHY_REDUCE_TX_POWER=y # end of PHY # # Power Management # # CONFIG_PM_ENABLE is not set -CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y -CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y # end of Power Management # # ESP System Settings # # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set -CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y -CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_INT_WDT_CHECK_CPU1=y -# CONFIG_ESP_TASK_WDT is not set +CONFIG_ESP_TASK_WDT=y +# CONFIG_ESP_TASK_WDT_PANIC is not set +CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 +CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y +CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set +# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y # end of ESP System Settings @@ -314,16 +333,15 @@ CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set -CONFIG_ESP_TIMER_IMPL_SYSTIMER=y +# CONFIG_ESP_TIMER_IMPL_FRC2 is not set +CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # end of High resolution timer (esp_timer) # # Wi-Fi # # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set -# CONFIG_ESP_WIFI_FTM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set -# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # end of Wi-Fi @@ -340,10 +358,6 @@ CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # FreeRTOS # CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y -CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y -# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set -CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y CONFIG_FREERTOS_HZ=100 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set @@ -366,6 +380,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set +# CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # end of FreeRTOS @@ -578,7 +593,6 @@ CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.p CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_AES=y -CONFIG_MBEDTLS_AES_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_ROM_MD5=y @@ -729,7 +743,6 @@ CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # CONFIG_SPI_FLASH_VERIFY_WRITE is not set # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -# CONFIG_SPI_FLASH_ROM_IMPL is not set CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set @@ -750,7 +763,6 @@ CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -783,6 +795,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_TESTING_OPTIONS is not set # CONFIG_WPA_WPS_STRICT is not set # CONFIG_WPA_11KV_SUPPORT is not set +# CONFIG_WPA_MBO_SUPPORT is not set +# CONFIG_WPA_DPP_SUPPORT is not set # end of Supplicant # end of Component config @@ -826,18 +840,41 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_WARN_WRITE_STRINGS is not set # CONFIG_DISABLE_GCC8_WARNINGS is not set CONFIG_ADC2_DISABLE_DAC=y +CONFIG_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ULP_COPROC_ENABLED is not set +CONFIG_ULP_COPROC_RESERVE_MEM=0 +CONFIG_BROWNOUT_DET=y +CONFIG_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_BROWNOUT_DET_LVL=0 +# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set +# CONFIG_NO_BLOBS is not set +# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y +# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set +CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y +CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 CONFIG_IPC_TASK_STACK_SIZE=1536 -CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 +CONFIG_MAIN_TASK_STACK_SIZE=3584 +CONFIG_CONSOLE_UART=y CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_INT_WDT_CHECK_CPU1=y -# CONFIG_TASK_WDT is not set +CONFIG_TASK_WDT=y +# CONFIG_TASK_WDT_PANIC is not set +CONFIG_TASK_WDT_TIMEOUT_S=5 +CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y +CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y CONFIG_TIMER_TASK_STACK_SIZE=3584 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 diff --git a/ports/espressif/modules/wroom.c b/ports/espressif/modules/wroom.c deleted file mode 100644 index 5e530701bf..0000000000 --- a/ports/espressif/modules/wroom.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/modules/wrover.c b/ports/espressif/modules/wrover.c deleted file mode 100644 index 23fa7ee5ca..0000000000 --- a/ports/espressif/modules/wrover.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash and RAM - common_hal_never_reset_pin(&pin_GPIO26); - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index 2eeb86e49d..69b732e097 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -33,7 +33,12 @@ CIRCUITPY_ESPIDF ?= 1 CIRCUITPY_MODULE ?= none -ifeq ($(IDF_TARGET),esp32c3) +ifeq ($(IDF_TARGET),esp32) +CIRCUITPY_BLEIO = 0 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_USB = 0 + +else ifeq ($(IDF_TARGET),esp32c3) CIRCUITPY_AESIO = 0 CIRCUITPY_ALARM = 0 CIRCUITPY_AUDIOBUSIO = 0 @@ -49,11 +54,13 @@ CIRCUITPY_ROTARYIO = 0 CIRCUITPY_TOUCHIO ?= 1 CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_USB = 0 + else ifeq ($(IDF_TARGET),esp32s3) CIRCUITPY_BLEIO = 1 CIRCUITPY_BLEIO_HCI = 0 CIRCUITPY_IMAGECAPTURE = 0 CIRCUITPY_PARALLELDISPLAY = 0 + else ifeq ($(IDF_TARGET),esp32s2) # No BLE on S2 CIRCUITPY_BLEIO = 0 From 55784c93de618e8f7e569e2196e49c7651465d56 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sun, 26 Jun 2022 17:45:35 -0400 Subject: [PATCH 0491/2403] wip; compiles --- ports/espressif/Makefile | 18 +- .../boards/adafruit_feather_esp32_v2/board.c | 49 +++++ .../adafruit_feather_esp32_v2/mpconfigboard.h | 48 +++++ .../mpconfigboard.mk | 17 ++ .../boards/adafruit_feather_esp32_v2/pins.c | 86 +++++++++ .../adafruit_feather_esp32_v2/sdkconfig | 51 ++++++ .../boards/adafruit_feather_esp32s2/sdkconfig | 16 +- .../common-hal/alarm/touch/TouchAlarm.c | 30 ++- .../espressif/common-hal/analogio/AnalogIn.c | 6 +- .../espressif/common-hal/analogio/AnalogOut.c | 31 ++-- ports/espressif/common-hal/canio/CAN.c | 12 ++ .../common-hal/frequencyio/FrequencyIn.c | 16 +- .../common-hal/microcontroller/Pin.c | 7 +- .../common-hal/microcontroller/Processor.c | 22 ++- .../common-hal/microcontroller/__init__.c | 118 +++++++++++- ports/espressif/common-hal/touchio/TouchIn.c | 6 +- .../esp-idf-config/partitions-8MB-no-uf2.csv | 9 + .../sdkconfig-8MB-no-uf2.defaults | 18 ++ .../esp-idf-config/sdkconfig-8MB.defaults | 7 +- .../esp-idf-config/sdkconfig-ble.defaults | 156 +++++++++++++++- .../esp-idf-config/sdkconfig-esp32.defaults | 171 ++++++++++++++++++ .../esp-idf-config/sdkconfig-opt.defaults | 50 ++--- .../esp-idf-config/sdkconfig.defaults | 129 +++++-------- ports/espressif/modules/esp32_pico_mini_02.c | 37 ++++ ports/espressif/modules/esp32s2_wroom.c | 37 ++++ ports/espressif/modules/esp32s2_wrover.c | 38 ++++ ports/espressif/modules/esp32s3_wroom.c | 37 ++++ ports/espressif/modules/esp32s3_wrover.c | 38 ++++ ports/espressif/mpconfigport.h | 12 +- ports/espressif/mpconfigport.mk | 4 + ports/espressif/mphalport.c | 4 +- ports/espressif/peripherals/esp32/pins.c | 69 +++++++ ports/espressif/peripherals/esp32/pins.h | 111 ++++++++++++ ports/espressif/peripherals/esp32c3/pins.h | 22 +++ ports/espressif/peripherals/esp32s2/pins.h | 43 +++++ ports/espressif/peripherals/esp32s3/pins.h | 45 +++++ ports/espressif/peripherals/pins.h | 4 +- ports/espressif/peripherals/touch.c | 8 + ports/espressif/supervisor/port.c | 7 + ports/espressif/tools/build_memory_info.py | 9 + 40 files changed, 1450 insertions(+), 148 deletions(-) create mode 100644 ports/espressif/boards/adafruit_feather_esp32_v2/board.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h create mode 100644 ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk create mode 100644 ports/espressif/boards/adafruit_feather_esp32_v2/pins.c create mode 100644 ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig create mode 100644 ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv create mode 100644 ports/espressif/esp-idf-config/sdkconfig-8MB-no-uf2.defaults create mode 100644 ports/espressif/esp-idf-config/sdkconfig-esp32.defaults create mode 100644 ports/espressif/modules/esp32_pico_mini_02.c create mode 100644 ports/espressif/modules/esp32s2_wroom.c create mode 100644 ports/espressif/modules/esp32s2_wrover.c create mode 100644 ports/espressif/modules/esp32s3_wroom.c create mode 100644 ports/espressif/modules/esp32s3_wrover.c create mode 100644 ports/espressif/peripherals/esp32/pins.c create mode 100644 ports/espressif/peripherals/esp32/pins.h diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index acdf496edb..f713e942e6 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -194,7 +194,12 @@ LDFLAGS += \ -Wl,--build-id=none \ -fno-rtti -ifeq ($(IDF_TARGET),esp32c3) +ifeq ($(IDF_TARGET),esp32) +LDFLAGS += \ + -T$(IDF_TARGET).rom.newlib-data.ld \ + -T$(IDF_TARGET).rom.newlib-funcs.ld \ + -T$(IDF_TARGET).rom.spiflash.ld +else ifeq ($(IDF_TARGET),esp32c3) LDFLAGS += \ -Tesp32c3.rom.newlib.ld \ -Tesp32c3.rom.version.ld \ @@ -362,6 +367,9 @@ $(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a libsmartconfig.a libwapi.a BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS)) +ifeq ($(IDF_TARGET),esp32) +BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a +endif ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) app_update bootloader_support driver efuse esp_adc_cal esp_common esp_event esp_hw_support esp_ipc esp_netif esp_pm esp_phy esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls mdns newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant ifneq ($(CIRCUITPY_BLEIO),0) @@ -380,12 +388,16 @@ BINARY_BLOBS += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a endif -ifeq ($(IDF_TARGET),esp32c3) +ifeq ($(IDF_TARGET),esp32) +BOOTLOADER_OFFSET = 0x0 +else ifeq ($(IDF_TARGET),esp32c3) BOOTLOADER_OFFSET = 0x0 else ifeq ($(IDF_TARGET),esp32s3) BOOTLOADER_OFFSET = 0x0 -else +else ifeq ($(IDF_TARGET),esp32s2) BOOTLOADER_OFFSET = 0x1000 +else +$(error unknown IDF_TARGET $(IDF_TARGET)) endif IDF_CMAKE_TARGETS = \ diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c new file mode 100644 index 0000000000..4c433a9da8 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "components/driver/include/driver/gpio.h" +#include "components/hal/include/hal/gpio_hal.h" +#include "common-hal/microcontroller/Pin.h" + +void board_init(void) { + reset_board(); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + // Turn on NeoPixel and I2C power by default. + gpio_set_direction(2, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(2, true); +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h new file mode 100644 index 0000000000..886963028b --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h @@ -0,0 +1,48 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32 V2" +#define MICROPY_HW_MCU_NAME "ESP32" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO0) +#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO2) + +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO20, .sda = &pin_GPIO22}} + +#define CIRCUITPY_BOARD_SPI (1) +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO5, .mosi = &pin_GPIO19, .miso = &pin_GPIO21}} + +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO8, .rx = &pin_GPIO7}} + +// For entering safe mode, use SW38 button +#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO38) + +// Explanation of how a user got into safe mode +#define BOARD_USER_SAFE_MODE_ACTION translate("pressing SW38 button at start up.\n") diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk new file mode 100644 index 0000000000..9ec5919f54 --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk @@ -0,0 +1,17 @@ +CIRCUITPY_CREATOR_ID = 0x0000239A +CIRCUITPY_CREATION_ID = 0x00320001 + +IDF_TARGET = esp32 + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE = dio +CIRCUITPY_ESP_FLASH_FREQ = 40m +CIRCUITPY_ESP_FLASH_SIZE = 8MB + +CIRCUITPY_MODULE = esp32_pico_mini_02 diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c b/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c new file mode 100644 index 0000000000..43cca6a7af --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c @@ -0,0 +1,86 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // External pins are in silkscreen order, from top to bottom, left side, then right side + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) }, + + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, + + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, + + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO13) }, + + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO33) }, + + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO15) }, + + { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) }, + { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO32) }, + + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO14) }, + + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO35) }, + + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_SW38), MP_ROM_PTR(&pin_GPIO38) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_I2C_POWER), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig new file mode 100644 index 0000000000..94333353af --- /dev/null +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig @@ -0,0 +1,51 @@ + +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +# Bootloader config +# +CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set +CONFIG_BOOTLOADER_LOG_LEVEL=0 +# end of Bootloader config + +# +# Serial flasher config +# +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set +# end of Serial flasher config + +# +# Partition Table +# +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" +# end of Partition Table + +# +# Compiler options +# +# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set +# end of Compiler options + +# +# Component config +# +# +# ESP32-specific +# +# CONFIG_ESP32_SPIRAM_SUPPORT is not set +# end of ESP32-specific + +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2" +# end of LWIP + +# end of Component config + +# +# Deprecated options for backward compatibility +# +# CONFIG_SPIRAM_SUPPORT is not set +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig index f19afafa3d..37fd534249 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig @@ -1,3 +1,9 @@ +# +# Component config +# +# +# ESP32S2-specific +# CONFIG_ESP32S2_SPIRAM_SUPPORT=y # # SPI RAM config @@ -7,12 +13,10 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 -# end of SPI RAM config - -CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # PSRAM clock and cs IO for ESP32S2 # +CONFIG_DEFAULT_PSRAM_CLK_IO=30 CONFIG_DEFAULT_PSRAM_CS_IO=26 # end of PSRAM clock and cs IO for ESP32S2 @@ -30,8 +34,14 @@ CONFIG_SPIRAM_USE_MEMMAP=y # CONFIG_SPIRAM_USE_MALLOC is not set CONFIG_SPIRAM_MEMTEST=y # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set +# end of SPI RAM config + +# end of ESP32S2-specific + # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif" # end of LWIP + +# end of Component config diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c index 941b99d6fd..0caeeea915 100644 --- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c +++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c @@ -58,10 +58,17 @@ mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void) { alarm->base.type = &alarm_touch_touchalarm_type; alarm->pin = NULL; + #if defined(CONFIG_IDF_TARGET_ESP32) + touch_pad_t wake_channel; + if (touch_pad_get_wakeup_status(&wake_channel) != ESP_OK) { + return alarm; + } + #else touch_pad_t wake_channel = touch_pad_get_current_meas_channel(); if (wake_channel == TOUCH_PAD_MAX) { return alarm; } + #endif // Map the pin number back to a pin object. for (size_t i = 0; i < mcu_pin_globals.map.used; i++) { @@ -122,16 +129,27 @@ void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alar mp_hal_delay_ms(10); // configure trigger threshold + #if defined(CONFIG_IDF_TARGET_ESP32) + uint16_t touch_value; + touch_pad_read(touch_channel, &touch_value); + touch_pad_set_thresh(touch_channel, touch_value * 0.1); // 10% + #else uint32_t touch_value; touch_pad_read_benchmark(touch_channel, &touch_value); - touch_pad_set_thresh(touch_channel, touch_value * 0.1); // 10% + touch_pad_set_threshold(touch_channel, touch_value * 0.1); // 10% + #endif } } // configure touch interrupt + #if defined(CONFIG_IDF_TARGET_ESP32) + touch_pad_isr_register(touch_interrupt, NULL); + touch_pad_intr_enable(); + #else touch_pad_timeout_set(true, SOC_TOUCH_PAD_THRESHOLD_MAX); touch_pad_isr_register(touch_interrupt, NULL, TOUCH_PAD_INTR_MASK_ALL); touch_pad_intr_enable(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE); + #endif } void alarm_touch_touchalarm_prepare_for_deep_sleep(void) { @@ -154,17 +172,25 @@ void alarm_touch_touchalarm_prepare_for_deep_sleep(void) { // intialize touchpad peripherals_touch_init(touch_channel); + #if !defined(CONFIG_IDF_TARGET_ESP32) // configure touchpad for sleep touch_pad_sleep_channel_enable(touch_channel, true); touch_pad_sleep_channel_enable_proximity(touch_channel, false); + #endif // wait for touch data to reset mp_hal_delay_ms(10); // configure trigger threshold + #if defined(CONFIG_IDF_TARGET_ESP32) + uint16_t touch_value; + touch_pad_read_filtered(touch_channel, &touch_value); + touch_pad_set_thresh(touch_channel, touch_value); + #else uint32_t touch_value; touch_pad_sleep_channel_read_smooth(touch_channel, &touch_value); - touch_pad_sleep_set_threshold(touch_channel, touch_value * 0.1); // 10% + touch_pad_sleep_set_threshold(touch_channel, touch_value / 10); // 10% + #endif // enable touchpad wakeup esp_sleep_enable_touchpad_wakeup(); diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c index a81a8add22..fb2e098cb4 100644 --- a/ports/espressif/common-hal/analogio/AnalogIn.c +++ b/ports/espressif/common-hal/analogio/AnalogIn.c @@ -40,12 +40,16 @@ #define DEFAULT_VREF 1100 #define NO_OF_SAMPLES 2 #define ATTENUATION ADC_ATTEN_DB_11 -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if defined(CONFIG_IDF_TARGET_ESP32) +#define DATA_WIDTH ADC_WIDTH_BIT_12 +#elif defined(CONFIG_IDF_TARGET_ESP32C3) #define DATA_WIDTH ADC_WIDTH_BIT_12 #elif defined(CONFIG_IDF_TARGET_ESP32S2) #define DATA_WIDTH ADC_WIDTH_BIT_13 #elif defined(CONFIG_IDF_TARGET_ESP32S3) #define DATA_WIDTH ADC_WIDTH_BIT_12 +#else +#error No known CONFIG_IDF_TARGET_xxx found #endif void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, diff --git a/ports/espressif/common-hal/analogio/AnalogOut.c b/ports/espressif/common-hal/analogio/AnalogOut.c index cc99d4faa1..8720dcf8bb 100644 --- a/ports/espressif/common-hal/analogio/AnalogOut.c +++ b/ports/espressif/common-hal/analogio/AnalogOut.c @@ -35,20 +35,29 @@ #include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/translate/translate.h" -#ifdef CONFIG_IDF_TARGET_ESP32S2 +#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) #include "components/driver/include/driver/dac_common.h" +#define HAS_DAC 1 +#if defined(CONFIG_IDF_TARGET_ESP32) +#define pin_CHANNEL_1 pin_GPIO25 +#define pin_CHANNEL_2 pin_GPIO26 +#elif defined(CONFIG_IDF_TARGET_ESP32S2) +#define pin_CHANNEL_1 pin_GPIO17 +#define pin_CHANNEL_2 pin_GPIO18 +#endif +#else +#define HAS_DAC 0 #endif - -#include "common-hal/microcontroller/Pin.h" void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { - #ifdef CONFIG_IDF_TARGET_ESP32S2 - if (pin == &pin_GPIO17) { + #if HAS_DAC + if (pin == &pin_CHANNEL_1) { self->channel = DAC_CHANNEL_1; - } else if (pin == &pin_GPIO18) { + } else if (pin == &pin_CHANNEL_2) { self->channel = DAC_CHANNEL_2; - } else { + } + else { raise_ValueError_invalid_pin(); } dac_output_enable(self->channel); @@ -58,7 +67,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, } bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { - #ifdef CONFIG_IDF_TARGET_ESP32S2 + #if HAS_DAC return self->channel == DAC_CHANNEL_MAX; #else return false; @@ -66,7 +75,7 @@ bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { } void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) { - #ifdef CONFIG_IDF_TARGET_ESP32S2 + #if HAS_DAC dac_output_disable(self->channel); self->channel = DAC_CHANNEL_MAX; #endif @@ -74,7 +83,7 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) { void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self, uint16_t value) { - #ifdef CONFIG_IDF_TARGET_ESP32S2 + #if HAS_DAC uint8_t dac_value = (value * 255) / 65535; dac_output_enable(self->channel); dac_output_voltage(self->channel, dac_value); @@ -82,7 +91,7 @@ void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self, } void analogout_reset(void) { - #ifdef CONFIG_IDF_TARGET_ESP32S2 + #if HAS_DAC dac_output_disable(DAC_CHANNEL_1); dac_output_disable(DAC_CHANNEL_2); #endif diff --git a/ports/espressif/common-hal/canio/CAN.c b/ports/espressif/common-hal/canio/CAN.c index c9f585b9be..67cf7b9591 100644 --- a/ports/espressif/common-hal/canio/CAN.c +++ b/ports/espressif/common-hal/canio/CAN.c @@ -76,30 +76,42 @@ STATIC twai_timing_config_t get_t_config(int baudrate) { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_25KBITS(); return t_config; } + #if defined(TWAI_TIMING_CONFIG_20KBITS) case 20000: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_20KBITS(); return t_config; } + #endif + #if defined(TWAI_TIMING_CONFIG_16KBITS) case 16000: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_16KBITS(); return t_config; } + #endif + #if defined(TWAI_TIMING_CONFIG_12_5KBITS) case 12500: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_12_5KBITS(); return t_config; } + #endif + #if defined(TWAI_TIMING_CONFIG_10KBITS) case 10000: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_10KBITS(); return t_config; } + #endif + #if defined(TWAI_TIMING_CONFIG_5KBITS) case 5000: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_5KBITS(); return t_config; } + #endif + #if defined(TWAI_TIMING_CONFIG_1KBITS) case 1000: { twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1KBITS(); return t_config; } + #endif default: mp_raise_ValueError(translate("Baudrate not supported by peripheral")); } diff --git a/ports/espressif/common-hal/frequencyio/FrequencyIn.c b/ports/espressif/common-hal/frequencyio/FrequencyIn.c index 9a7e8e812f..d35614ea19 100644 --- a/ports/espressif/common-hal/frequencyio/FrequencyIn.c +++ b/ports/espressif/common-hal/frequencyio/FrequencyIn.c @@ -55,15 +55,29 @@ static void IRAM_ATTR timer_interrupt_handler(void *self_in) { // reset interrupt timg_dev_t *device = self->timer.group ? &(TIMERG1) : &(TIMERG0); + + #if defined(CONFIG_IDF_TARGET_ESP32) + if (self->timer.idx) { + device->int_clr_timers.t1 = 1; + } else { + device->int_clr_timers.t0 = 1; + } + #else if (self->timer.idx) { device->int_clr_timers.t1_int_clr = 1; } else { device->int_clr_timers.t0_int_clr = 1; } - #ifdef CONFIG_IDF_TARGET_ESP32S2 + #endif + + #if defined(CONFIG_IDF_TARGET_ESP32) + device->hw_timer[self->timer.idx].config.alarm_en = 1; + #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C2) device->hw_timer[self->timer.idx].config.tx_alarm_en = 1; #elif defined(CONFIG_IDF_TARGET_ESP32S3) device->hw_timer[self->timer.idx].config.tn_alarm_en = 1; + #else + #error No known CONFIG_IDF_TARGET_xxx found #endif } diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index 1323c9ae5d..957ddd3492 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -55,7 +55,12 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) { } STATIC void _reset_pin(gpio_num_t pin_number) { - #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) + // Never ever reset pins used for flash and RAM. + #if defined(CONFIG_IDF_TARGET_ESP32) + if (pin_number == 6 || pin_number == 11 || pin_number == 9 || pin_number == 10) { + return; + } + #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) // Never ever reset pins used for flash and RAM. if (26 <= pin_number && pin_number <= 32) { return; diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c index 5ceefa411f..9b97b98cbd 100644 --- a/ports/espressif/common-hal/microcontroller/Processor.c +++ b/ports/espressif/common-hal/microcontroller/Processor.c @@ -39,11 +39,14 @@ #include "esp_system.h" #include "soc/efuse_reg.h" + +#if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S3) #include "driver/temp_sensor.h" +#endif float common_hal_mcu_processor_get_temperature(void) { float tsens_out; - #ifdef CONFIG_IDF_TARGET_ESP32S3 + #if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32) mp_raise_NotImplementedError(NULL); #else temp_sensor_config_t temp_sensor = TSENS_CONFIG_DEFAULT(); // DEFAULT: range:-10℃ ~ 80℃, error < 1℃. @@ -60,12 +63,16 @@ float common_hal_mcu_processor_get_voltage(void) { } uint32_t common_hal_mcu_processor_get_frequency(void) { - #ifdef CONFIG_IDF_TARGET_ESP32C3 + #if defined(CONFIG_IDF_TARGET_ESP32) + return CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 100000; + #elif defined(CONFIG_IDF_TARGET_ESP32C3) return CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ * 1000000; #elif defined(CONFIG_IDF_TARGET_ESP32S2) return CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000; #elif defined(CONFIG_IDF_TARGET_ESP32S3) return CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000; + #else + #error No known CONFIG_IDF_TARGET_xxx found #endif } @@ -78,7 +85,13 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { uint8_t *ptr = &raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH - 1]; // MAC address contains 48 bits (6 bytes), 32 in the low order word + + #if defined(CONFIG_IDF_TARGET_ESP32) + uint32_t mac_address_part = REG_READ(EFUSE_BLK0_RDATA1_REG); + #else uint32_t mac_address_part = REG_READ(EFUSE_RD_MAC_SPI_SYS_0_REG); + #endif + *ptr-- = swap_nibbles(mac_address_part & 0xff); mac_address_part >>= 8; *ptr-- = swap_nibbles(mac_address_part & 0xff); @@ -88,7 +101,12 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { *ptr-- = swap_nibbles(mac_address_part & 0xff); // and 16 in the high order word + #if defined(CONFIG_IDF_TARGET_ESP32) + mac_address_part = REG_READ(EFUSE_BLK0_RDATA2_REG); + #else mac_address_part = REG_READ(EFUSE_RD_MAC_SPI_SYS_1_REG); + #endif + *ptr-- = swap_nibbles(mac_address_part & 0xff); mac_address_part >>= 8; *ptr-- = swap_nibbles(mac_address_part & 0xff); diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c index 3cf41ba7f0..4af5ddba86 100644 --- a/ports/espressif/common-hal/microcontroller/__init__.c +++ b/ports/espressif/common-hal/microcontroller/__init__.c @@ -45,7 +45,9 @@ #include "soc/rtc_cntl_reg.h" #include "esp_private/system_internal.h" -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if defined(CONFIG_IDF_TARGET_ESP32) +#include "esp32/rom/rtc.h" +#elif defined(CONFIG_IDF_TARGET_ESP32C3) #include "esp32c3/rom/rtc.h" #elif defined(CONFIG_IDF_TARGET_ESP32S2) #include "esp32s2/rom/rtc.h" @@ -55,6 +57,8 @@ #include "esp32s3/rom/rtc.h" #include "esp32s3/rom/usb/usb_persist.h" #include "esp32s3/rom/usb/chip_usb_dw_wrapper.h" +#else +#error No known CONFIG_IDF_TARGET_xxx found #endif void common_hal_mcu_delay_us(uint32_t delay) { @@ -85,16 +89,22 @@ void common_hal_mcu_enable_interrupts(void) { void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { switch (runmode) { case RUNMODE_UF2: - #ifndef CONFIG_IDF_TARGET_ESP32C3 + #if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3) + mp_arg_error_invalid(MP_QSTR_run_mode); + #else // 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2 esp_reset_reason_set_hint(0x11F2); #endif break; case RUNMODE_NORMAL: + #if defined(CONFIG_IDF_TARGET_ESP32) + safe_mode_on_next_reset(NO_SAFE_MODE); + #else // revert back to normal boot REG_WRITE(RTC_RESET_CAUSE_REG, 0); // reset uf2 REG_WRITE(RTC_CNTL_STORE0_REG, 0); // reset safe mode REG_WRITE(RTC_CNTL_OPTION1_REG, 0); // reset bootloader + #endif break; case RUNMODE_SAFE_MODE: // enter safe mode on next boot @@ -102,10 +112,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { break; case RUNMODE_BOOTLOADER: // DFU download - #ifndef CONFIG_IDF_TARGET_ESP32C3 + #if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3) + mp_arg_error_invalid(MP_QSTR_run_mode); + #else chip_usb_set_persist_flags(USBDC_BOOT_DFU); - #endif REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT); + #endif break; default: break; @@ -149,49 +161,145 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = { // This maps MCU pin names to pin objects. STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { + #ifdef GPIO0_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO0), MP_ROM_PTR(&pin_GPIO0) }, + #endif + #ifdef GPIO1_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO1), MP_ROM_PTR(&pin_GPIO1) }, + #endif + #ifdef GPIO2_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO2), MP_ROM_PTR(&pin_GPIO2) }, + #endif + #ifdef GPIO3_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO3), MP_ROM_PTR(&pin_GPIO3) }, + #endif + #ifdef GPIO4_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO4), MP_ROM_PTR(&pin_GPIO4) }, + #endif + #ifdef GPIO5_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO5), MP_ROM_PTR(&pin_GPIO5) }, + #endif + #ifdef GPIO6_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO6), MP_ROM_PTR(&pin_GPIO6) }, + #endif + #ifdef GPIO7_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO7), MP_ROM_PTR(&pin_GPIO7) }, + #endif + #ifdef GPIO8_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO8), MP_ROM_PTR(&pin_GPIO8) }, + #endif + #ifdef GPIO9_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO9), MP_ROM_PTR(&pin_GPIO9) }, + #endif + #ifdef GPIO10_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO10), MP_ROM_PTR(&pin_GPIO10) }, + #endif + #ifdef GPIO11_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO11), MP_ROM_PTR(&pin_GPIO11) }, + #endif + #ifdef GPIO12_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO12), MP_ROM_PTR(&pin_GPIO12) }, + #endif + #ifdef GPIO13_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO13), MP_ROM_PTR(&pin_GPIO13) }, + #endif + #ifdef GPIO14_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO14), MP_ROM_PTR(&pin_GPIO14) }, + #endif + #ifdef GPIO15_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO15), MP_ROM_PTR(&pin_GPIO15) }, + #endif + #ifdef GPIO16_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO16), MP_ROM_PTR(&pin_GPIO16) }, + #endif + #ifdef GPIO17_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO17), MP_ROM_PTR(&pin_GPIO17) }, + #endif + #ifdef GPIO18_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO18), MP_ROM_PTR(&pin_GPIO18) }, + #endif + #ifdef GPIO19_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO19), MP_ROM_PTR(&pin_GPIO19) }, + #endif + #ifdef GPIO20_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO20), MP_ROM_PTR(&pin_GPIO20) }, + #endif + #ifdef GPIO21_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO21), MP_ROM_PTR(&pin_GPIO21) }, - #ifndef CONFIG_IDF_TARGET_ESP32C3 + #endif + #ifdef GPIO22_EXISTS + { MP_ROM_QSTR(MP_QSTR_GPIO22), MP_ROM_PTR(&pin_GPIO22) }, + #endif + #ifdef GPIO23_EXISTS + { MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) }, + #endif + #ifdef GPIO24_EXISTS + { MP_ROM_QSTR(MP_QSTR_GPIO24), MP_ROM_PTR(&pin_GPIO24) }, + #endif + #ifdef GPIO25_EXISTS + { MP_ROM_QSTR(MP_QSTR_GPIO25), MP_ROM_PTR(&pin_GPIO25) }, + #endif + #ifdef GPIO26_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO26), MP_ROM_PTR(&pin_GPIO26) }, + #endif + #ifdef GPIO27_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO27), MP_ROM_PTR(&pin_GPIO27) }, + #endif + #ifdef GPIO28_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO28), MP_ROM_PTR(&pin_GPIO28) }, + #endif + #ifdef GPIO29_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO29), MP_ROM_PTR(&pin_GPIO29) }, + #endif + #ifdef GPIO30_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO30), MP_ROM_PTR(&pin_GPIO30) }, + #endif + #ifdef GPIO31_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO31), MP_ROM_PTR(&pin_GPIO31) }, + #endif + #ifdef GPIO32_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO32), MP_ROM_PTR(&pin_GPIO32) }, + #endif + #ifdef GPIO33_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO33), MP_ROM_PTR(&pin_GPIO33) }, + #endif + #ifdef GPIO34_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO34), MP_ROM_PTR(&pin_GPIO34) }, + #endif + #ifdef GPIO35_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO35), MP_ROM_PTR(&pin_GPIO35) }, + #endif + #ifdef GPIO36_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO36), MP_ROM_PTR(&pin_GPIO36) }, + #endif + #ifdef GPIO37_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO37), MP_ROM_PTR(&pin_GPIO37) }, + #endif + #ifdef GPIO38_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO38), MP_ROM_PTR(&pin_GPIO38) }, + #endif + #ifdef GPIO39_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO39), MP_ROM_PTR(&pin_GPIO39) }, + #endif + #ifdef GPIO40_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO40), MP_ROM_PTR(&pin_GPIO40) }, + #endif + #ifdef GPIO41_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO41), MP_ROM_PTR(&pin_GPIO41) }, + #endif + #ifdef GPIO42_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO42), MP_ROM_PTR(&pin_GPIO42) }, + #endif + #ifdef GPIO43_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO43), MP_ROM_PTR(&pin_GPIO43) }, + #endif + #ifdef GPIO44_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO44), MP_ROM_PTR(&pin_GPIO44) }, + #endif + #ifdef GPIO45_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO45), MP_ROM_PTR(&pin_GPIO45) }, + #endif + #ifdef GPIO46_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO46), MP_ROM_PTR(&pin_GPIO46) }, #endif }; diff --git a/ports/espressif/common-hal/touchio/TouchIn.c b/ports/espressif/common-hal/touchio/TouchIn.c index 14a27637c8..523245f359 100644 --- a/ports/espressif/common-hal/touchio/TouchIn.c +++ b/ports/espressif/common-hal/touchio/TouchIn.c @@ -31,12 +31,16 @@ #include "shared-bindings/microcontroller/Pin.h" static uint16_t get_raw_reading(touchio_touchin_obj_t *self) { + #if defined(CONFIG_IDF_TARGET_ESP32) + uint16_t touch_value; + #else uint32_t touch_value; + #endif; touch_pad_read_raw_data(self->pin->touch_channel, &touch_value); if (touch_value > UINT16_MAX) { return UINT16_MAX; } - return touch_value; + return (uint16_t)touch_value; } void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, diff --git a/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv new file mode 100644 index 0000000000..e7bfe0c51f --- /dev/null +++ b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv @@ -0,0 +1,9 @@ +# ESP-IDF Partition Table +# Name, Type, SubType, Offset, Size, Flags +# bootloader.bin,, 0x1000, 32K +# partition table,, 0x8000, 4K +nvs, data, nvs, 0x9000, 20K, +otadata, data, ota, 0xe000, 8K, +ota_0, 0, ota_0, 0x10000, 2048K, +ota_1, 0, ota_1, 0x210000, 2048K, +user_fs, data, fat, 0x410000, 4032K, diff --git a/ports/espressif/esp-idf-config/sdkconfig-8MB-no-uf2.defaults b/ports/espressif/esp-idf-config/sdkconfig-8MB-no-uf2.defaults new file mode 100644 index 0000000000..2a2548ba04 --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-8MB-no-uf2.defaults @@ -0,0 +1,18 @@ +# +# Serial flasher config +# +# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set +CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y +# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set +CONFIG_ESPTOOLPY_FLASHSIZE="8MB" +CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# end of Serial flasher config + +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" +# +# Partition Table +# +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" +# end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults index ba91195364..1ecb1b4c16 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults @@ -6,9 +6,6 @@ # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set -# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set -# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set -# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="8MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y # end of Serial flasher config @@ -16,6 +13,6 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y # # Partition Table # -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB.csv" +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB.csv" # end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-ble.defaults b/ports/espressif/esp-idf-config/sdkconfig-ble.defaults index 0260d9f53f..8180786fbf 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-ble.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-ble.defaults @@ -4,7 +4,161 @@ # # Bluetooth # -# CONFIG_BT_ENABLED is not set +CONFIG_BT_ENABLED=y +# +# Bluetooth controller +# +CONFIG_BT_CTRL_MODE_EFF=1 +CONFIG_BT_CTRL_BLE_MAX_ACT=10 +CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10 +CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0 +CONFIG_BT_CTRL_PINNED_TO_CORE=0 +CONFIG_BT_CTRL_HCI_MODE_VHCI=y +# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set +CONFIG_BT_CTRL_HCI_TL=1 +CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30 +# CONFIG_BT_CTRL_HW_CCA is not set +CONFIG_BT_CTRL_HW_CCA_VAL=20 +CONFIG_BT_CTRL_HW_CCA_EFF=0 +CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y +# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set +# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set +CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0 +CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y +# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set +CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0 +CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y +# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set +CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0 +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N27 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N24 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N21 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N18 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N15 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set +CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3=y +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P12 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P15 is not set +# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P18 is not set +CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=10 +CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y +CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 +CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +# CONFIG_BT_CTRL_BLE_SCAN_DUPL is not set +# CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN is not set +CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS=y +CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0 +# +# MODEM SLEEP Options +# +# CONFIG_BT_CTRL_MODEM_SLEEP is not set +# end of MODEM SLEEP Options + +CONFIG_BT_CTRL_SLEEP_MODE_EFF=0 +CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0 +CONFIG_BT_CTRL_HCI_TL_EFF=1 +# CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set +# end of Bluetooth controller + +# CONFIG_BT_BLUEDROID_ENABLED is not set +CONFIG_BT_NIMBLE_ENABLED=y +# CONFIG_BT_CONTROLLER_ONLY is not set +# +# NimBLE Options +# +CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y +# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set +# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set +# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set +# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set +CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y +# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set +CONFIG_BT_NIMBLE_LOG_LEVEL=1 +CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 +CONFIG_BT_NIMBLE_MAX_BONDS=3 +CONFIG_BT_NIMBLE_MAX_CCCDS=8 +CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0 +CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096 +CONFIG_BT_NIMBLE_ROLE_CENTRAL=y +CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y +CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y +CONFIG_BT_NIMBLE_ROLE_OBSERVER=y +CONFIG_BT_NIMBLE_NVS_PERSIST=y +CONFIG_BT_NIMBLE_SM_LEGACY=y +CONFIG_BT_NIMBLE_SM_SC=y +# CONFIG_BT_NIMBLE_DEBUG is not set +# CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set +CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble" +CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31 +CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256 +CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0 +CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20 +CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255 +CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 +CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30 +CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8 +CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12 +# CONFIG_BT_NIMBLE_HS_FLOW_CTRL is not set +CONFIG_BT_NIMBLE_RPA_TIMEOUT=900 +# CONFIG_BT_NIMBLE_MESH is not set +CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y +CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000 +# CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY is not set +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=y +CONFIG_BT_NIMBLE_MAX_CONN_REATTEMPT=3 +CONFIG_BT_NIMBLE_EXT_ADV=y +CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=1 +CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN=1650 +CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV=y +CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=1 +# CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set +CONFIG_BT_NIMBLE_USE_ESP_TIMER=y +# end of NimBLE Options + # end of Bluetooth # end of Component config + +# +# Deprecated options for backward compatibility +# +# CONFIG_BLUEDROID_ENABLED is not set +CONFIG_NIMBLE_ENABLED=y +CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y +# CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set +CONFIG_NIMBLE_MAX_CONNECTIONS=3 +CONFIG_NIMBLE_MAX_BONDS=3 +CONFIG_NIMBLE_MAX_CCCDS=8 +CONFIG_NIMBLE_L2CAP_COC_MAX_NUM=0 +CONFIG_NIMBLE_TASK_STACK_SIZE=4096 +CONFIG_NIMBLE_ROLE_CENTRAL=y +CONFIG_NIMBLE_ROLE_PERIPHERAL=y +CONFIG_NIMBLE_ROLE_BROADCASTER=y +CONFIG_NIMBLE_ROLE_OBSERVER=y +CONFIG_NIMBLE_NVS_PERSIST=y +CONFIG_NIMBLE_SM_LEGACY=y +CONFIG_NIMBLE_SM_SC=y +# CONFIG_NIMBLE_DEBUG is not set +# CONFIG_NIMBLE_SM_SC_DEBUG_KEYS is not set +CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME="nimble" +CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31 +CONFIG_NIMBLE_ATT_PREFERRED_MTU=256 +CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0 +CONFIG_NIMBLE_ACL_BUF_COUNT=20 +CONFIG_NIMBLE_ACL_BUF_SIZE=255 +CONFIG_NIMBLE_HCI_EVT_BUF_SIZE=70 +CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT=30 +CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8 +CONFIG_NIMBLE_MSYS1_BLOCK_COUNT=12 +# CONFIG_NIMBLE_HS_FLOW_CTRL is not set +CONFIG_NIMBLE_RPA_TIMEOUT=900 +# CONFIG_NIMBLE_MESH is not set +CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y +CONFIG_SW_COEXIST_ENABLE=y +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults new file mode 100644 index 0000000000..6d949c2898 --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults @@ -0,0 +1,171 @@ +CONFIG_IDF_TARGET_ARCH_XTENSA=y +CONFIG_IDF_TARGET="esp32" +CONFIG_IDF_TARGET_ESP32=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 +# +# SDK tool configuration +# +CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" +# end of SDK tool configuration + +# +# Bootloader config +# +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 +# end of Bootloader config + +# +# Component config +# +# +# ESP32-specific +# +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_DPORT_WORKAROUND=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP32_TRAX is not set +CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_ULP_COPROC_ENABLED is not set +CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32_DEBUG_OCDAWARE=y +CONFIG_ESP32_BROWNOUT_DET=y +CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_ESP32_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 +CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 +CONFIG_ESP32_XTAL_FREQ_40=y +# CONFIG_ESP32_XTAL_FREQ_26 is not set +# CONFIG_ESP32_XTAL_FREQ_AUTO is not set +CONFIG_ESP32_XTAL_FREQ=40 +# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set +# CONFIG_ESP32_NO_BLOBS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set +# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set +CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 +# end of ESP32-specific + +# +# Hardware Settings +# +# +# MAC Config +# +# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 +# end of MAC Config + +# +# Sleep Config +# +CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y +# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set +# end of Sleep Config + +# end of Hardware Settings + +# +# ESP System Settings +# +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y +# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set +# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +# end of ESP System Settings + +# +# Ethernet +# +CONFIG_ETH_USE_ESP32_EMAC=n + +# +# Wi-Fi +# +CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 +CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 +# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y +CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 +# CONFIG_ESP32_WIFI_CSI_ENABLED is not set +CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y +CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +CONFIG_ESP32_WIFI_NVS_ENABLED=y +CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y +# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set +CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y +# end of Wi-Fi + +# +# FreeRTOS +# +# CONFIG_FREERTOS_UNICORE is not set +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y +# end of FreeRTOS + +# end of Component config + +# +# Deprecated options for backward compatibility +# +CONFIG_TOOLPREFIX="xtensa-esp32-elf-" +# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set +CONFIG_ESP32_APPTRACE_DEST_NONE=y +CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set +CONFIG_ESP_SYSTEM_PD_FLASH=y +# CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set +CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y +# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set +CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 +CONFIG_ESP32_PHY_MAX_TX_POWER=20 +CONFIG_ESP32_REDUCE_PHY_TX_POWER=y +# CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 +CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 +CONFIG_ESP32_PTHREAD_STACK_MIN=768 +CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y +# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0 is not set +# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set +CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults index b00d04770f..e9b91113d5 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults @@ -14,36 +14,44 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_COMPILER_OPTIMIZATION_PERF is not set # CONFIG_COMPILER_OPTIMIZATION_NONE is not set -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y -# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set -CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 +CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=1 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set # end of Compiler options # # Component config # +# +# ESP32S3-Specific +# +CONFIG_ESP32S3_DEBUG_OCDAWARE=y +# end of ESP32S3-Specific + # # Common ESP-related # -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y +# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set # end of Common ESP-related # # ESP System Settings # -CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y +# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set # CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set -# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set +CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set -CONFIG_ESP_CONSOLE_UART_DEFAULT=y +# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set +# CONFIG_ESP_CONSOLE_USB_CDC is not set +# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set -# CONFIG_ESP_CONSOLE_NONE is not set -CONFIG_ESP_CONSOLE_UART=y +CONFIG_ESP_CONSOLE_NONE=y +# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set +CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 +CONFIG_ESP_CONSOLE_UART_NUM=-1 # end of ESP System Settings # @@ -62,8 +70,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y # CONFIG_HAL_ASSERTION_DISABLE is not set # CONFIG_HAL_ASSERTION_SILIENT is not set -# CONFIG_HAL_ASSERTION_ENABLE is not set -CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 +CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=1 # end of Hardware Abstraction Layer (HAL) and Low Level (LL) # @@ -79,17 +86,16 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y # # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y -# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set +# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set +CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set -CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2 -CONFIG_ESP32S2_PANIC_PRINT_HALT=y +CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1 +# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set # CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set -# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set +CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y # CONFIG_ESP32S2_PANIC_GDBSTUB is not set -CONFIG_CONSOLE_UART_DEFAULT=y +# CONFIG_CONSOLE_UART_DEFAULT is not set # CONFIG_CONSOLE_UART_CUSTOM is not set -# CONFIG_ESP_CONSOLE_UART_NONE is not set -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 +CONFIG_ESP_CONSOLE_UART_NONE=y +CONFIG_CONSOLE_UART_NUM=-1 # end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 9ad89d4811..5fb49faa82 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -54,25 +54,37 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # +CONFIG_SECURE_BOOT_SUPPORTS_RSA=y +CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set # end of Security features +# +# Boot ROM Behavior +# +CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y +# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set +# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set +# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set +# end of Boot ROM Behavior + # # Serial flasher config # CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set +# CONFIG_ESPTOOLPY_OCT_FLASH is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set CONFIG_ESPTOOLPY_FLASHMODE_DIO=y # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" +# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y -# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" CONFIG_ESPTOOLPY_BEFORE_RESET=y @@ -96,10 +108,10 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table # -CONFIG_PARTITION_TABLE_SINGLE_APP=y +# CONFIG_PARTITION_TABLE_SINGLE_APP is not set # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set -# CONFIG_PARTITION_TABLE_CUSTOM is not set +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table @@ -130,6 +142,7 @@ CONFIG_APPTRACE_DEST_NONE=y CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing +# CONFIG_BLE_MESH is not set # # Driver configurations # @@ -159,10 +172,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # TWAI configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set -# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set -# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set -# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set -# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set # end of TWAI configuration # @@ -171,18 +180,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - -# -# GPIO Configuration -# -# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set -# end of GPIO Configuration - # # GDMA Configuration # @@ -197,45 +194,24 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # # CONFIG_EFUSE_CUSTOM_TABLE is not set # CONFIG_EFUSE_VIRTUAL is not set -# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y -# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set -CONFIG_EFUSE_MAX_BLK_LEN=192 +CONFIG_EFUSE_MAX_BLK_LEN=256 # end of eFuse Bit Manager # # ESP-TLS # CONFIG_ESP_TLS_USING_MBEDTLS=y -# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set -# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set +CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y CONFIG_ESP_TLS_SERVER=y +# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set -# CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set # CONFIG_ESP_TLS_INSECURE is not set # end of ESP-TLS -# -# ADC-Calibration -# -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y -# end of ADC-Calibration - # # Ethernet # -CONFIG_ETH_ENABLED=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y -CONFIG_ETH_RMII_CLK_INPUT=y -# CONFIG_ETH_RMII_CLK_OUTPUT is not set -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 # CONFIG_ETH_USE_SPI_ETHERNET is not set # CONFIG_ETH_USE_OPENETH is not set # end of Ethernet @@ -264,9 +240,16 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y # Sleep Config # CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y +# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set # CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set # end of Sleep Config +# +# RTC Clock Config +# +CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y +# end of RTC Clock Config + # end of Hardware Settings # @@ -283,7 +266,7 @@ CONFIG_ESP_IPC_ISR_ENABLE=y CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120 CONFIG_ESP_NETIF_TCPIP_LWIP=y # CONFIG_ESP_NETIF_LOOPBACK is not set -CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=y +# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set # end of ESP NETIF Adapter # @@ -293,34 +276,32 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 -CONFIG_ESP_PHY_REDUCE_TX_POWER=y # end of PHY # # Power Management # # CONFIG_PM_ENABLE is not set +CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y +CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y # end of Power Management # # ESP System Settings # # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set +CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y +CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y -# CONFIG_ESP_TASK_WDT_PANIC is not set -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y +# CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set -# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y # end of ESP System Settings @@ -333,15 +314,16 @@ CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set -# CONFIG_ESP_TIMER_IMPL_FRC2 is not set -CONFIG_ESP_TIMER_IMPL_TG0_LAC=y +CONFIG_ESP_TIMER_IMPL_SYSTIMER=y # end of High resolution timer (esp_timer) # # Wi-Fi # # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set +# CONFIG_ESP_WIFI_FTM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set +# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # end of Wi-Fi @@ -358,6 +340,10 @@ CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # FreeRTOS # CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF +CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y +CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y +# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set +CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y CONFIG_FREERTOS_HZ=100 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set @@ -380,7 +366,6 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set -# CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # end of FreeRTOS @@ -593,6 +578,7 @@ CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.p CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_AES=y +CONFIG_MBEDTLS_AES_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_ROM_MD5=y @@ -743,6 +729,7 @@ CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # CONFIG_SPI_FLASH_VERIFY_WRITE is not set # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y +# CONFIG_SPI_FLASH_ROM_IMPL is not set CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set @@ -763,6 +750,7 @@ CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -795,8 +783,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_TESTING_OPTIONS is not set # CONFIG_WPA_WPS_STRICT is not set # CONFIG_WPA_11KV_SUPPORT is not set -# CONFIG_WPA_MBO_SUPPORT is not set -# CONFIG_WPA_DPP_SUPPORT is not set # end of Supplicant # end of Component config @@ -840,41 +826,18 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_WARN_WRITE_STRINGS is not set # CONFIG_DISABLE_GCC8_WARNINGS is not set CONFIG_ADC2_DISABLE_DAC=y -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 -# CONFIG_ULP_COPROC_ENABLED is not set -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y -# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set -CONFIG_BROWNOUT_DET_LVL=0 -# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_NO_BLOBS is not set -# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 CONFIG_IPC_TASK_STACK_SIZE=1536 +CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART=y +CONFIG_MAIN_TASK_STACK_SIZE=8192 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y -# CONFIG_TASK_WDT_PANIC is not set -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y +# CONFIG_TASK_WDT is not set CONFIG_TIMER_TASK_STACK_SIZE=3584 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 diff --git a/ports/espressif/modules/esp32_pico_mini_02.c b/ports/espressif/modules/esp32_pico_mini_02.c new file mode 100644 index 0000000000..e115ca27e0 --- /dev/null +++ b/ports/espressif/modules/esp32_pico_mini_02.c @@ -0,0 +1,37 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "modules/module.h" + +void never_reset_module_internal_pins(void) { + // SPI Flash + common_hal_never_reset_pin(&pin_GPIO6); + common_hal_never_reset_pin(&pin_GPIO11); + + // PSRAM + common_hal_never_reset_pin(&pin_GPIO9); + common_hal_never_reset_pin(&pin_GPIO10); +} diff --git a/ports/espressif/modules/esp32s2_wroom.c b/ports/espressif/modules/esp32s2_wroom.c new file mode 100644 index 0000000000..5e530701bf --- /dev/null +++ b/ports/espressif/modules/esp32s2_wroom.c @@ -0,0 +1,37 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "modules/module.h" + +void never_reset_module_internal_pins(void) { + // SPI Flash + common_hal_never_reset_pin(&pin_GPIO27); + common_hal_never_reset_pin(&pin_GPIO28); + common_hal_never_reset_pin(&pin_GPIO29); + common_hal_never_reset_pin(&pin_GPIO30); + common_hal_never_reset_pin(&pin_GPIO31); + common_hal_never_reset_pin(&pin_GPIO32); +} diff --git a/ports/espressif/modules/esp32s2_wrover.c b/ports/espressif/modules/esp32s2_wrover.c new file mode 100644 index 0000000000..23fa7ee5ca --- /dev/null +++ b/ports/espressif/modules/esp32s2_wrover.c @@ -0,0 +1,38 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "modules/module.h" + +void never_reset_module_internal_pins(void) { + // SPI Flash and RAM + common_hal_never_reset_pin(&pin_GPIO26); + common_hal_never_reset_pin(&pin_GPIO27); + common_hal_never_reset_pin(&pin_GPIO28); + common_hal_never_reset_pin(&pin_GPIO29); + common_hal_never_reset_pin(&pin_GPIO30); + common_hal_never_reset_pin(&pin_GPIO31); + common_hal_never_reset_pin(&pin_GPIO32); +} diff --git a/ports/espressif/modules/esp32s3_wroom.c b/ports/espressif/modules/esp32s3_wroom.c new file mode 100644 index 0000000000..5e530701bf --- /dev/null +++ b/ports/espressif/modules/esp32s3_wroom.c @@ -0,0 +1,37 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "modules/module.h" + +void never_reset_module_internal_pins(void) { + // SPI Flash + common_hal_never_reset_pin(&pin_GPIO27); + common_hal_never_reset_pin(&pin_GPIO28); + common_hal_never_reset_pin(&pin_GPIO29); + common_hal_never_reset_pin(&pin_GPIO30); + common_hal_never_reset_pin(&pin_GPIO31); + common_hal_never_reset_pin(&pin_GPIO32); +} diff --git a/ports/espressif/modules/esp32s3_wrover.c b/ports/espressif/modules/esp32s3_wrover.c new file mode 100644 index 0000000000..23fa7ee5ca --- /dev/null +++ b/ports/espressif/modules/esp32s3_wrover.c @@ -0,0 +1,38 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "modules/module.h" + +void never_reset_module_internal_pins(void) { + // SPI Flash and RAM + common_hal_never_reset_pin(&pin_GPIO26); + common_hal_never_reset_pin(&pin_GPIO27); + common_hal_never_reset_pin(&pin_GPIO28); + common_hal_never_reset_pin(&pin_GPIO29); + common_hal_never_reset_pin(&pin_GPIO30); + common_hal_never_reset_pin(&pin_GPIO31); + common_hal_never_reset_pin(&pin_GPIO32); +} diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h index f390112387..72a9b32478 100644 --- a/ports/espressif/mpconfigport.h +++ b/ports/espressif/mpconfigport.h @@ -53,11 +53,13 @@ // Nearly all boards have this because it is used to enter the ROM bootloader. #ifndef CIRCUITPY_BOOT_BUTTON -#ifdef CONFIG_IDF_TARGET_ESP32C3 -#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9) -#else -#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) -#endif + #ifdef CONFIG_IDF_TARGET_ESP32C3 + #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9) + #else + #ifndef CONFIG_IDF_TARGET_ESP32 + #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) + #endif + #endif #endif #define CIRCUITPY_INTERNAL_NVM_START_ADDR (0x9000) diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index 69b732e097..834bd3c248 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -36,6 +36,10 @@ CIRCUITPY_MODULE ?= none ifeq ($(IDF_TARGET),esp32) CIRCUITPY_BLEIO = 0 CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_IMAGECAPTURE = 0 +CIRCUITPY_PARALLELDISPLAY = 0 +# Protomatter needs to support ESP32. +CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB = 0 else ifeq ($(IDF_TARGET),esp32c3) diff --git a/ports/espressif/mphalport.c b/ports/espressif/mphalport.c index 39b080fba3..76d2c05cc3 100644 --- a/ports/espressif/mphalport.c +++ b/ports/espressif/mphalport.c @@ -28,7 +28,9 @@ #include "py/mphal.h" #include "supervisor/cpu.h" -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if defined(CONFIG_IDF_TARGET_ESP32) +#include "components/esp_rom/include/esp32/rom/ets_sys.h" +#elif defined(CONFIG_IDF_TARGET_ESP32C3) #include "components/esp_rom/include/esp32c3/rom/ets_sys.h" #elif defined(CONFIG_IDF_TARGET_ESP32S2) #include "components/esp_rom/include/esp32s2/rom/ets_sys.h" diff --git a/ports/espressif/peripherals/esp32/pins.c b/ports/espressif/peripherals/esp32/pins.c new file mode 100644 index 0000000000..9bf00a0e56 --- /dev/null +++ b/ports/espressif/peripherals/esp32/pins.c @@ -0,0 +1,69 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "peripherals/pins.h" + +const mcu_pin_obj_t pin_GPIO0 = PIN(0, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH_PAD_NUM1); +const mcu_pin_obj_t pin_GPIO1 = PIN(1, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO2 = PIN(2, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH_PAD_NUM2); +const mcu_pin_obj_t pin_GPIO3 = PIN(3, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO4 = PIN(4, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH_PAD_NUM0); +const mcu_pin_obj_t pin_GPIO5 = PIN(5, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO6 = PIN(6, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO7 = PIN(7, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO8 = PIN(8, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO9 = PIN(9, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO10 = PIN(10, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO11 = PIN(11, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO12 = PIN(12, ADC_UNIT_2, ADC_CHANNEL_5, TOUCH_PAD_NUM5); +const mcu_pin_obj_t pin_GPIO13 = PIN(13, ADC_UNIT_2, ADC_CHANNEL_4, TOUCH_PAD_NUM4); +const mcu_pin_obj_t pin_GPIO14 = PIN(14, ADC_UNIT_2, ADC_CHANNEL_6, TOUCH_PAD_NUM6); +const mcu_pin_obj_t pin_GPIO15 = PIN(15, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH_PAD_NUM3); +const mcu_pin_obj_t pin_GPIO16 = PIN(16, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO17 = PIN(17, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO18 = PIN(18, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO19 = PIN(19, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +// GPIO20 not exposed on some packages, but available in some modules +const mcu_pin_obj_t pin_GPIO20 = PIN(20, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO21 = PIN(21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO22 = PIN(22, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO23 = PIN(23, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL); +// no GPIO24 +const mcu_pin_obj_t pin_GPIO25 = PIN(25, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO26 = PIN(26, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO27 = PIN(27, ADC_UNIT_2, ADC_CHANNEL_7, TOUCH_PAD_NUM7); +// no GPIO28 +// no GPIO29 +// no GPIO30 +// no GPIO31 +const mcu_pin_obj_t pin_GPIO32 = PIN(32, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH_PAD_NUM9); +const mcu_pin_obj_t pin_GPIO33 = PIN(33, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM8); +const mcu_pin_obj_t pin_GPIO34 = PIN(34, ADC_UNIT_1, ADC_CHANNEL_6, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO35 = PIN(35, ADC_UNIT_1, ADC_CHANNEL_7, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO36 = PIN(36, ADC_UNIT_1, ADC_CHANNEL_0, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO37 = PIN(37, ADC_UNIT_1, ADC_CHANNEL_1, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO38 = PIN(38, ADC_UNIT_1, ADC_CHANNEL_2, NO_TOUCH_CHANNEL); +const mcu_pin_obj_t pin_GPIO39 = PIN(39, ADC_UNIT_1, ADC_CHANNEL_3, NO_TOUCH_CHANNEL); diff --git a/ports/espressif/peripherals/esp32/pins.h b/ports/espressif/peripherals/esp32/pins.h new file mode 100644 index 0000000000..6ec7c624a0 --- /dev/null +++ b/ports/espressif/peripherals/esp32/pins.h @@ -0,0 +1,111 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +// DO NOT include this file directly. +// Use shared-bindings/microcontroller/Pin.h instead. +// This ensures that all necessary includes are already included. + +#ifndef MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32_PINS_H +#define MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32_PINS_H + +#define GPIO0_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO0; +#define GPIO1_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO1; +#define GPIO2_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO2; +#define GPIO3_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO3; +#define GPIO4_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO4; +#define GPIO5_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO5; +#define GPIO6_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO6; +#define GPIO7_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO7; +#define GPIO8_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO8; +#define GPIO9_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO9; +#define GPIO10_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO10; +#define GPIO11_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO11; +#define GPIO12_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO12; +#define GPIO13_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO13; +#define GPIO14_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO14; +#define GPIO15_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO15; +#define GPIO16_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO16; +#define GPIO17_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO17; +#define GPIO18_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO18; +#define GPIO19_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO19; +// GPIO20 not exposed on some packages, but available in some modules +#define GPIO20_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO20; +#define GPIO21_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO21; +#define GPIO22_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO22; +#define GPIO23_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO23; +// no GPIO24 +#define GPIO25_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO25; +#define GPIO26_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO26; +#define GPIO27_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO27; +// no GPIO28 +// no GPIO29 +// no GPIO30 +// no GPIO31 +#define GPIO32_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO32; +#define GPIO33_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO33; +#define GPIO34_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO34; +#define GPIO35_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO35; +#define GPIO36_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO36; +#define GPIO37_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO37; +#define GPIO38_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO38; +#define GPIO39_EXISTS 1 +extern const mcu_pin_obj_t pin_GPIO39; + +#endif // MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32_PINS_H diff --git a/ports/espressif/peripherals/esp32c3/pins.h b/ports/espressif/peripherals/esp32c3/pins.h index 3cce2763c6..9f55768825 100644 --- a/ports/espressif/peripherals/esp32c3/pins.h +++ b/ports/espressif/peripherals/esp32c3/pins.h @@ -31,27 +31,49 @@ #ifndef MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32C3_PINS_H #define MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32C3_PINS_H +#define GPIO0_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO0; +#define GPIO1_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO1; +#define GPIO2_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO2; +#define GPIO3_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO3; +#define GPIO4_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO4; +#define GPIO5_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO5; +#define GPIO6_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO6; +#define GPIO7_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO7; +#define GPIO8_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO8; +#define GPIO9_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO9; +#define GPIO10_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO10; +#define GPIO11_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO11; +#define GPIO12_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO12; +#define GPIO13_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO13; +#define GPIO14_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO14; +#define GPIO15_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO15; +#define GPIO16_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO16; +#define GPIO17_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO17; +#define GPIO18_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO18; +#define GPIO19_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO19; +#define GPIO20_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO20; +#define GPIO21_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO21; #endif // MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32C3_PINS_H diff --git a/ports/espressif/peripherals/esp32s2/pins.h b/ports/espressif/peripherals/esp32s2/pins.h index b66db79861..cff6fea7cb 100644 --- a/ports/espressif/peripherals/esp32s2/pins.h +++ b/ports/espressif/peripherals/esp32s2/pins.h @@ -31,48 +31,91 @@ #ifndef MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S2_PINS_H #define MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S2_PINS_H +#define GPIO0_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO0; +#define GPIO1_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO1; +#define GPIO2_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO2; +#define GPIO3_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO3; +#define GPIO4_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO4; +#define GPIO5_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO5; +#define GPIO6_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO6; +#define GPIO7_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO7; +#define GPIO8_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO8; +#define GPIO9_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO9; +#define GPIO10_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO10; +#define GPIO11_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO11; +#define GPIO12_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO12; +#define GPIO13_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO13; +#define GPIO14_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO14; +#define GPIO15_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO15; +#define GPIO16_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO16; +#define GPIO17_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO17; +#define GPIO18_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO18; +#define GPIO19_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO19; +#define GPIO20_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO20; +#define GPIO21_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO21; +#define GPIO26_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO26; +#define GPIO27_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO27; +#define GPIO28_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO28; +#define GPIO29_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO29; +#define GPIO30_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO30; +#define GPIO31_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO31; +#define GPIO32_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO32; +#define GPIO33_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO33; +#define GPIO34_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO34; +#define GPIO35_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO35; +#define GPIO36_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO36; +#define GPIO37_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO37; +#define GPIO38_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO38; +#define GPIO39_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO39; +#define GPIO40_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO40; +#define GPIO41_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO41; +#define GPIO42_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO42; +#define GPIO43_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO43; +#define GPIO44_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO44; +#define GPIO45_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO45; +#define GPIO46_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO46; #endif // MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S2_PINS_H diff --git a/ports/espressif/peripherals/esp32s3/pins.h b/ports/espressif/peripherals/esp32s3/pins.h index c2a932f572..7c0b8edd64 100644 --- a/ports/espressif/peripherals/esp32s3/pins.h +++ b/ports/espressif/peripherals/esp32s3/pins.h @@ -31,50 +31,95 @@ #ifndef MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S3_PINS_H #define MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S3_PINS_H +#define GPIO0_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO0; +#define GPIO1_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO1; +#define GPIO2_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO2; +#define GPIO3_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO3; +#define GPIO4_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO4; +#define GPIO5_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO5; +#define GPIO6_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO6; +#define GPIO7_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO7; +#define GPIO8_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO8; +#define GPIO9_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO9; +#define GPIO10_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO10; +#define GPIO11_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO11; +#define GPIO12_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO12; +#define GPIO13_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO13; +#define GPIO14_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO14; +#define GPIO15_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO15; +#define GPIO16_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO16; +#define GPIO17_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO17; +#define GPIO18_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO18; +#define GPIO19_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO19; +#define GPIO20_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO20; +#define GPIO21_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO21; +#define GPIO26_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO26; +#define GPIO27_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO27; +#define GPIO28_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO28; +#define GPIO29_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO29; +#define GPIO30_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO30; +#define GPIO31_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO31; +#define GPIO32_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO32; +#define GPIO33_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO33; +#define GPIO34_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO34; +#define GPIO35_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO35; +#define GPIO36_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO36; +#define GPIO37_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO37; +#define GPIO38_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO38; +#define GPIO39_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO39; +#define GPIO40_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO40; +#define GPIO41_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO41; +#define GPIO42_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO42; +#define GPIO43_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO43; +#define GPIO44_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO44; +#define GPIO45_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO45; +#define GPIO46_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO46; +#define GPIO47_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO47; +#define GPIO48_EXISTS 1 extern const mcu_pin_obj_t pin_GPIO48; #endif // MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_ESP32S3_PINS_H diff --git a/ports/espressif/peripherals/pins.h b/ports/espressif/peripherals/pins.h index 4958c46410..9edad560c8 100644 --- a/ports/espressif/peripherals/pins.h +++ b/ports/espressif/peripherals/pins.h @@ -65,7 +65,9 @@ extern const mp_obj_type_t mcu_pin_type; } // Choose based on chip -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if defined(CONFIG_IDF_TARGET_ESP32) +#include "esp32/pins.h" +#elif defined(CONFIG_IDF_TARGET_ESP32C3) #include "esp32c3/pins.h" #elif defined(CONFIG_IDF_TARGET_ESP32S2) #include "esp32s2/pins.h" diff --git a/ports/espressif/peripherals/touch.c b/ports/espressif/peripherals/touch.c index eeba49c683..e656bbddf1 100644 --- a/ports/espressif/peripherals/touch.c +++ b/ports/espressif/peripherals/touch.c @@ -48,9 +48,17 @@ void peripherals_touch_init(const touch_pad_t touchpad) { // touch_pad_config() must be done before touch_pad_fsm_start() the first time. // Otherwise the calibration is wrong and we get maximum raw values if there is // a trace of any significant length on the pin. + #if defined(CONFIG_IDF_TARGET_ESP32) + touch_pad_config(touchpad, 0); + #else touch_pad_config(touchpad); + #endif if (!touch_inited) { + #if defined(CONFIG_IDF_TARGET_ESP32) + touch_pad_sw_start(); + #else touch_pad_fsm_start(); + #endif touch_inited = true; } } diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index 7ecdd140a2..b90e9d5712 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -78,7 +78,10 @@ #include "cam.h" #endif +#ifndef CONFIG_IDF_TARGET_ESP32 #include "soc/cache_memory.h" +#endif + #include "soc/rtc_cntl_reg.h" #include "esp_debug_helpers.h" @@ -91,6 +94,10 @@ // Heap sizes for when there is no external RAM for CircuitPython to use // exclusively. +#ifdef CONFIG_IDF_TARGET_ESP32 +// TODO: Determine better: 520kB of internal RAM; similar to 512kB for ESP32-S3. +#define HEAP_SIZE (176 * 1024) +#endif #ifdef CONFIG_IDF_TARGET_ESP32S2 #define HEAP_SIZE (48 * 1024) #endif diff --git a/ports/espressif/tools/build_memory_info.py b/ports/espressif/tools/build_memory_info.py index b26c007741..4f5304a288 100644 --- a/ports/espressif/tools/build_memory_info.py +++ b/ports/espressif/tools/build_memory_info.py @@ -15,6 +15,15 @@ from elftools.elf.elffile import ELFFile print() internal_memory = { + "esp32": [ + # Name, Start, Length + ("RTC Fast Memory", (0x3FF8_0000, 0x400C_0000), 8 * 1024), + ("RTC Slow Memory", (0x5000_0000,), 8 * 1024), + # First 64kB of Internal SRAM 0 can be configured as cached, and starts at 0x4007_0000 + ("Internal SRAM 0", (0x4008_0000,), 128 * 1024), + ("Internal SRAM 1", (0x3FFE_0000, 0x400A_0000), 128 * 1024), + ("Internal SRAM 2", (0x3FFA_E000,), 200 * 1024), + ], "esp32s2": [ # Name, Start, Length ("RTC Fast Memory", (0x3FF9_E000, 0x4007_0000), 8 * 1024), From 91e15af84e42338e459a5cc784e17e4de55e13c8 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 27 Jun 2022 09:49:00 -0500 Subject: [PATCH 0492/2403] fix diagnostic when building unix port for tests --- py/gc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/py/gc.c b/py/gc.c index 5f959f3ed4..fc6bc90b67 100644 --- a/py/gc.c +++ b/py/gc.c @@ -146,6 +146,8 @@ void gc_init(void *start, void *end) { MP_STATE_MEM(gc_pool_end) = end; #if MICROPY_ENABLE_FINALISER + size_t gc_finaliser_table_byte_len = (MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB + BLOCKS_PER_FTB - 1) / BLOCKS_PER_FTB; + (void)gc_finaliser_table_byte_len; // avoid unused variable diagnostic if asserts are disabled assert(MP_STATE_MEM(gc_pool_start) >= MP_STATE_MEM(gc_finaliser_table_start) + gc_finaliser_table_byte_len); #endif From 301f3e0456c2a8eeec8cd5184fb3649a4fce1fd3 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 9 Jun 2022 16:59:24 -0700 Subject: [PATCH 0493/2403] Start of web server --- .../common-hal/socketpool/SocketPool.c | 35 +++++++++------- shared-bindings/socketpool/Socket.c | 2 +- supervisor/shared/web_workflow/web_workflow.c | 40 +++++++++++++++++++ 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/ports/espressif/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c index 4cea95ec41..8373410d8a 100644 --- a/ports/espressif/common-hal/socketpool/SocketPool.c +++ b/ports/espressif/common-hal/socketpool/SocketPool.c @@ -40,6 +40,26 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel } } +void socketpool_socket(socketpool_socketpool_obj_t *self, + socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type + socketpool_socket_obj_t *sock) { + sock->type = socket_type; + sock->family = addr_family; + sock->ipproto = ipproto; + sock->pool = self; + sock->timeout_ms = (uint)-1; + + // Create LWIP socket + int socknum = -1; + socknum = lwip_socket(sock->family, sock->type, sock->ipproto); + if (socknum < 0 || !register_open_socket(sock)) { + mp_raise_RuntimeError(translate("Out of sockets")); + } + sock->num = socknum; + // Sockets should be nonblocking in most cases + lwip_fcntl(socknum, F_SETFL, O_NONBLOCK); +} + socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self, socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) { @@ -68,21 +88,8 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_ socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t); sock->base.type = &socketpool_socket_type; - sock->type = socket_type; - sock->family = addr_family; - sock->ipproto = ipproto; - sock->pool = self; - sock->timeout_ms = (uint)-1; - // Create LWIP socket - int socknum = -1; - socknum = lwip_socket(sock->family, sock->type, sock->ipproto); - if (socknum < 0 || !register_open_socket(sock)) { - mp_raise_RuntimeError(translate("Out of sockets")); - } - sock->num = socknum; - // Sockets should be nonblocking in most cases - lwip_fcntl(socknum, F_SETFL, O_NONBLOCK); + socketpool_socket(self, family, type, sock); return sock; } diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c index bea3cd1624..873fe5b3d2 100644 --- a/shared-bindings/socketpool/Socket.c +++ b/shared-bindings/socketpool/Socket.c @@ -155,7 +155,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_connect_obj, socketpool_socke //| def listen(self, backlog: int) -> None: //| """Set socket to listen for incoming connections //| -//| :param ~int backlog: length of backlog queue for waiting connetions""" +//| :param ~int backlog: length of backlog queue for waiting connections""" //| ... //| STATIC mp_obj_t socketpool_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index bb83048dca..c8f563b640 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -40,6 +40,9 @@ static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; +static socketpool_socketpool_obj_t pool; +static socketpool_socket_obj_t listening; + void supervisor_web_workflow_status(void) { serial_write_compressed(translate("Wi-Fi: ")); if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) { @@ -91,7 +94,44 @@ void supervisor_start_web_workflow(void) { if (wifi_status != WIFI_RADIO_ERROR_NONE) { common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false); + return; } + + pool.base.type = &socketpool_socketpool_type; + common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj); + + listening.base.type = &socketpool_socket_type; + socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening); + // Bind to any ip. + // TODO: Make this port .env configurable. + common_hal_socketpool_socket_bind(&listening, "", 0, 80); + common_hal_socketpool_socket_listen(&listening, 1); + + // Accept a connection and start parsing: + // * HTTP method + // * HTTP path + // * Headers we care about: + // * Authentication + // * Must match CIRCUITPY_WEB_AUTH + // * Host + // * IP - ok + // * cpy-mac.local - ok + // * circuitpython.local - redirect + // * Content-Length + // + // PUT /fs/ + // GET /fs/ + // - File contents + // - JSON directory representation + // GET /cp/devices.json + // - JSON list of MDNS results + // GET /cp/version.json + // - JSON version info + // GET / + // - Super basic editor + // GET /ws/circuitpython + // GET /ws/user + // - WebSockets #endif } From 61d0f7947b7175104f1294140c3c9be4287e02d1 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 14 Jun 2022 17:02:34 -0700 Subject: [PATCH 0494/2403] WIP doesn't flush response before closing --- ports/espressif/background.c | 7 + .../espressif/common-hal/socketpool/Socket.c | 78 ++++++++-- .../common-hal/socketpool/SocketPool.c | 50 +++--- shared-bindings/socketpool/Socket.c | 16 +- shared-bindings/socketpool/Socket.h | 7 + shared-bindings/socketpool/SocketPool.h | 6 + supervisor/shared/web_workflow/web_workflow.c | 146 +++++++++++++++++- supervisor/shared/web_workflow/web_workflow.h | 5 +- 8 files changed, 263 insertions(+), 52 deletions(-) diff --git a/ports/espressif/background.c b/ports/espressif/background.c index 37fe3d5be0..1bf44700be 100644 --- a/ports/espressif/background.c +++ b/ports/espressif/background.c @@ -40,6 +40,9 @@ #include "common-hal/pulseio/PulseIn.h" #endif +#if CIRCUITPY_WEB_WORKFLOW +#include "supervisor/shared/web_workflow/web_workflow.h" +#endif void port_background_task(void) { // Zero delay in case FreeRTOS wants to switch to something else. @@ -47,6 +50,10 @@ void port_background_task(void) { #if CIRCUITPY_PULSEIO pulsein_background(); #endif + + #if CIRCUITPY_WEB_WORKFLOW + supervisor_web_workflow_background(); + #endif } void port_start_background_task(void) { diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index 856400a4e7..86944f8b00 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -37,6 +37,10 @@ #include "components/lwip/lwip/src/include/lwip/sys.h" #include "components/lwip/lwip/src/include/lwip/netdb.h" +#include "esp_log.h" + +static const char *TAG = "socket"; + STATIC socketpool_socket_obj_t *open_socket_handles[CONFIG_LWIP_MAX_SOCKETS]; void socket_user_reset(void) { @@ -62,8 +66,7 @@ bool register_open_socket(socketpool_socket_obj_t *self) { return false; } -socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self, - uint8_t *ip, uint32_t *port) { +int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) { struct sockaddr_in accept_addr; socklen_t socklen = sizeof(accept_addr); int newsoc = -1; @@ -81,7 +84,10 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o newsoc = lwip_accept(self->num, (struct sockaddr *)&accept_addr, &socklen); // In non-blocking mode, fail instead of timing out if (newsoc == -1 && self->timeout_ms == 0) { - mp_raise_OSError(MP_EAGAIN); + if (errno != EAGAIN) { + ESP_LOGE(TAG, "accept failed %d", errno); + } + return -MP_EAGAIN; } } @@ -90,8 +96,17 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o memcpy((void *)ip, (void *)&accept_addr.sin_addr.s_addr, sizeof(accept_addr.sin_addr.s_addr)); *port = accept_addr.sin_port; } else { - mp_raise_OSError(ETIMEDOUT); + return -ETIMEDOUT; } + if (newsoc < 0) { + return -MP_EBADF; + } + return newsoc; +} + +socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self, + uint8_t *ip, uint32_t *port) { + int newsoc = socketpool_socket_accept(self, ip, port); if (newsoc > 0) { // Create the socket @@ -108,7 +123,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK); return sock; } else { - mp_raise_OSError(MP_EBADF); + mp_raise_OSError(-newsoc); return NULL; } } @@ -125,17 +140,22 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self, if (err != 0) { mp_raise_RuntimeError(translate("Cannot set socket options")); } - int result = lwip_bind(self->num, (struct sockaddr *)&bind_addr, sizeof(bind_addr)) == 0; - return result; + int result = lwip_bind(self->num, (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ESP_LOGE(TAG, "bind result %d", result); + return result == 0; } -void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) { +void socketpool_socket_close(socketpool_socket_obj_t *self) { self->connected = false; if (self->num >= 0) { - lwip_shutdown(self->num, 0); + lwip_shutdown(self->num, SHUT_RDWR); lwip_close(self->num); self->num = -1; } +} + +void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) { + socketpool_socket_close(self); // Remove socket record for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) { if (open_socket_handles[i] == self) { @@ -199,7 +219,9 @@ bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) { } bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) { - return lwip_listen(self->num, backlog) == 0; + int result = lwip_listen(self->num, backlog); + ESP_LOGE(TAG, "listen result %d", result); + return result == 0; } mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *self, @@ -242,7 +264,8 @@ mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *se return received; } -mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) { +int socketpool_socket_recv_into(socketpool_socket_obj_t *self, + const uint8_t *buf, uint32_t len) { int received = 0; bool timed_out = false; @@ -261,31 +284,52 @@ mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, // In non-blocking mode, fail instead of looping if (received == -1 && self->timeout_ms == 0) { - mp_raise_OSError(MP_EAGAIN); + if (errno != EAGAIN) { + ESP_LOGE(TAG, "recv %d", errno); + } + return -MP_EAGAIN; } } } else { - mp_raise_OSError(MP_EBADF); + return -MP_EBADF; } if (timed_out) { - mp_raise_OSError(ETIMEDOUT); + return -ETIMEDOUT; } return received; } -mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) { +mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) { + int received = socketpool_socket_recv_into(self, buf, len); + if (received < 0) { + mp_raise_OSError(received); + } + return received; +} + +int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) { int sent = -1; if (self->num != -1) { // LWIP Socket // TODO: deal with potential failure/add timeout? sent = lwip_send(self->num, buf, len, 0); } else { - mp_raise_OSError(MP_EBADF); + sent = -MP_EBADF; } if (sent < 0) { - mp_raise_OSError(errno); + return -errno; + } + + return sent; +} + +mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) { + int sent = socketpool_socket_send(self, buf, len); + + if (sent < 0) { + mp_raise_OSError(-sent); } return sent; } diff --git a/ports/espressif/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c index 8373410d8a..f9bf62d253 100644 --- a/ports/espressif/common-hal/socketpool/SocketPool.c +++ b/ports/espressif/common-hal/socketpool/SocketPool.c @@ -40,29 +40,9 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel } } -void socketpool_socket(socketpool_socketpool_obj_t *self, - socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type +bool socketpool_socket(socketpool_socketpool_obj_t *self, + socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type, socketpool_socket_obj_t *sock) { - sock->type = socket_type; - sock->family = addr_family; - sock->ipproto = ipproto; - sock->pool = self; - sock->timeout_ms = (uint)-1; - - // Create LWIP socket - int socknum = -1; - socknum = lwip_socket(sock->family, sock->type, sock->ipproto); - if (socknum < 0 || !register_open_socket(sock)) { - mp_raise_RuntimeError(translate("Out of sockets")); - } - sock->num = socknum; - // Sockets should be nonblocking in most cases - lwip_fcntl(socknum, F_SETFL, O_NONBLOCK); -} - -socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self, - socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) { - int addr_family; int ipproto; if (family == SOCKETPOOL_AF_INET) { @@ -81,15 +61,37 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_ } else { // SOCKETPOOL_SOCK_RAW socket_type = SOCK_RAW; } + sock->type = socket_type; + sock->family = addr_family; + sock->ipproto = ipproto; + sock->pool = self; + sock->timeout_ms = (uint)-1; - if (addr_family == AF_INET6 || ipproto == IPPROTO_IPV6) { + // Create LWIP socket + int socknum = -1; + socknum = lwip_socket(sock->family, sock->type, sock->ipproto); + if (socknum < 0) { + return false; + } + sock->num = socknum; + // Sockets should be nonblocking in most cases + lwip_fcntl(socknum, F_SETFL, O_NONBLOCK); + return true; +} + +socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self, + socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) { + if (family != SOCKETPOOL_AF_INET) { mp_raise_NotImplementedError(translate("Only IPv4 sockets supported")); } socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t); sock->base.type = &socketpool_socket_type; - socketpool_socket(self, family, type, sock); + if (!socketpool_socket(self, family, type, sock) || + !register_open_socket(sock)) { + mp_raise_RuntimeError(translate("Out of sockets")); + } return sock; } diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c index 873fe5b3d2..716ff673ee 100644 --- a/shared-bindings/socketpool/Socket.c +++ b/shared-bindings/socketpool/Socket.c @@ -75,7 +75,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket___exit___obj, 4, 4, //| creating a new socket of type SOCK_STREAM. //| Returns a tuple of (new_socket, remote_address)""" //| -STATIC mp_obj_t socketpool_socket_accept(mp_obj_t self_in) { +STATIC mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t ip[4]; uint32_t port; @@ -87,7 +87,7 @@ STATIC mp_obj_t socketpool_socket_accept(mp_obj_t self_in) { tuple_contents[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG); return mp_obj_new_tuple(2, tuple_contents); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, socketpool_socket_accept); +STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, _socketpool_socket_accept); //| def bind(self, address: Tuple[str, int]) -> None: //| """Bind a socket to an address @@ -120,12 +120,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_bind_obj, socketpool_socket_b //| def close(self) -> None: //| """Closes this Socket and makes its resources available to its SocketPool.""" //| -STATIC mp_obj_t socketpool_socket_close(mp_obj_t self_in) { +STATIC mp_obj_t _socketpool_socket_close(mp_obj_t self_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_socketpool_socket_close(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, socketpool_socket_close); +STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, _socketpool_socket_close); //| def connect(self, address: Tuple[str, int]) -> None: //| """Connect a socket to a remote address @@ -208,7 +208,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool //| :param int bufsize: optionally, a maximum number of bytes to read.""" //| ... //| -STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) { +STATIC mp_obj_t _socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); if (common_hal_socketpool_socket_get_closed(self)) { // Bad file number. @@ -238,7 +238,7 @@ STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) mp_int_t ret = common_hal_socketpool_socket_recv_into(self, (byte *)bufinfo.buf, len); return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, socketpool_socket_recv_into); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, _socketpool_socket_recv_into); //| def send(self, bytes: ReadableBuffer) -> int: //| """Send some bytes to the connected remote address. @@ -247,7 +247,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3 //| :param ~bytes bytes: some bytes to send""" //| ... //| -STATIC mp_obj_t socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { +STATIC mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_socketpool_socket_get_closed(self)) { // Bad file number. @@ -264,7 +264,7 @@ STATIC mp_obj_t socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { } return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, socketpool_socket_send); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_send); //| def sendto(self, bytes: ReadableBuffer, address: Tuple[str, int]) -> int: //| """Send some bytes to a specific address. diff --git a/shared-bindings/socketpool/Socket.h b/shared-bindings/socketpool/Socket.h index 1f4ab6fc35..c6c2a66630 100644 --- a/shared-bindings/socketpool/Socket.h +++ b/shared-bindings/socketpool/Socket.h @@ -47,4 +47,11 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self, const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len); void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms); +// Non-allocating versions for internal use. +int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port); +void socketpool_socket_close(socketpool_socket_obj_t *self); +int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len); +int socketpool_socket_recv_into(socketpool_socket_obj_t *self, + const uint8_t *buf, uint32_t len); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKET_H diff --git a/shared-bindings/socketpool/SocketPool.h b/shared-bindings/socketpool/SocketPool.h index 10a943d38b..92382078e1 100644 --- a/shared-bindings/socketpool/SocketPool.h +++ b/shared-bindings/socketpool/SocketPool.h @@ -52,4 +52,10 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_ mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self, const char *host); +// Non-allocating version for internal use. These sockets are not registered and, therefore, not +// closed automatically. +bool socketpool_socket(socketpool_socketpool_obj_t *self, + socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type, + socketpool_socket_obj_t *sock); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKETPOOL_H diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index c8f563b640..2ca25c6b72 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -30,6 +30,10 @@ #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" +#include "shared-bindings/socketpool/__init__.h" +#include "shared-bindings/socketpool/Socket.h" +#include "shared-bindings/socketpool/SocketPool.h" + #if CIRCUITPY_WIFI #include "shared-bindings/wifi/__init__.h" #endif @@ -38,10 +42,35 @@ #include "shared-module/dotenv/__init__.h" #endif +#include "esp_log.h" + +static const char *TAG = "CP webserver"; + +enum request_state { + STATE_METHOD, + STATE_PATH, + STATE_VERSION, + STATE_HEADER_KEY, + STATE_HEADER_VALUE, + STATE_BODY +}; + +typedef struct { + enum request_state state; + char method[6]; + char path[256]; + uint32_t content_length; + size_t offset; +} _request; + static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; static socketpool_socketpool_obj_t pool; static socketpool_socket_obj_t listening; +static socketpool_socket_obj_t active; + +static _request active_request; + void supervisor_web_workflow_status(void) { serial_write_compressed(translate("Wi-Fi: ")); @@ -66,6 +95,13 @@ void supervisor_web_workflow_status(void) { void supervisor_start_web_workflow(void) { #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI + + if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj) && + wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj) != 0) { + // Already started. + return; + } + char ssid[33]; char password[64]; mp_int_t ssid_len = 0; @@ -102,11 +138,19 @@ void supervisor_start_web_workflow(void) { listening.base.type = &socketpool_socket_type; socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening); + common_hal_socketpool_socket_settimeout(&listening, 0); // Bind to any ip. // TODO: Make this port .env configurable. - common_hal_socketpool_socket_bind(&listening, "", 0, 80); + const char *ip = "192.168.1.94"; + common_hal_socketpool_socket_bind(&listening, ip, strlen(ip), 80); common_hal_socketpool_socket_listen(&listening, 1); + ESP_LOGW(TAG, "listening on socket %d", listening.num); + + active.base.type = &socketpool_socket_type; + active.num = -1; + active.connected = false; + // Accept a connection and start parsing: // * HTTP method // * HTTP path @@ -135,5 +179,105 @@ void supervisor_start_web_workflow(void) { #endif } +static void _process_request(socketpool_socket_obj_t *socket, _request *request) { + bool more = true; + bool error = false; + uint8_t c; + while (more && !error) { + int len = socketpool_socket_recv_into(socket, &c, 1); + if (len != 1) { + if (len != -EAGAIN && len != -EBADF) { + ESP_LOGW(TAG, "received %d", len); + } + more = false; + break; + } + ESP_LOGI(TAG, "%c", c); + switch (request->state) { + case STATE_METHOD: { + if (c == ' ') { + request->method[request->offset] = '\0'; + request->offset = 0; + request->state = STATE_PATH; + } else if (request->offset > sizeof(request->method) - 1) { + // Skip methods that are too long. + } else { + request->method[request->offset] = c; + request->offset++; + } + break; + } + case STATE_PATH: { + if (c == ' ') { + request->path[request->offset] = '\0'; + request->offset = 0; + ESP_LOGW(TAG, "Request %s %s", request->method, request->path); + request->state = STATE_VERSION; + error = true; + } else if (request->offset > sizeof(request->path) - 1) { + // Skip methods that are too long. + } else { + request->path[request->offset] = c; + request->offset++; + } + break; + } + case STATE_VERSION: + break; + case STATE_HEADER_KEY: + break; + case STATE_HEADER_VALUE: + break; + case STATE_BODY: + break; + } + } + if (error) { + const char *error_response = "HTTP/1.1 501 Not Implemented"; + int nodelay = 1; + int err = lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); + int sent = socketpool_socket_send(socket, (const uint8_t *)error_response, strlen(error_response)); + ESP_LOGW(TAG, "sent %d %d", sent, err); + vTaskDelay(0); + socketpool_socket_close(socket); + } +} + + +void supervisor_web_workflow_background(void) { + // Otherwise, see if we have another socket to accept. + if (!common_hal_socketpool_socket_get_connected(&active) && + !common_hal_socketpool_socket_get_closed(&listening) && + listening.num > 0) { + uint32_t ip; + uint32_t port; + int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port); + if (newsoc != -11) { + ESP_LOGI(TAG, "newsoc %d", newsoc); + } + if (newsoc > 0) { + ESP_LOGE(TAG, "Accepted socket %d", newsoc); + // TODO: Don't do this because it uses the private struct layout. + // Create the socket + active.num = newsoc; + active.pool = &pool; + active.connected = true; + + + common_hal_socketpool_socket_settimeout(&active, 0); + + active_request.state = STATE_METHOD; + active_request.offset = 0; + + lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK); + } + } + + // If we have a request in progress, continue working on it. + if (common_hal_socketpool_socket_get_connected(&active)) { + _process_request(&active, &active_request); + } +} + void supervisor_stop_web_workflow(void) { } diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h index 6e550aaa9d..f233c06e48 100644 --- a/supervisor/shared/web_workflow/web_workflow.h +++ b/supervisor/shared/web_workflow/web_workflow.h @@ -28,8 +28,9 @@ #include -void supervisor_wifi_background(void); -void supervisor_wifi_init(void); +// This background function should be called repeatedly. It cannot be done based +// on events. +void supervisor_web_workflow_background(void); void supervisor_web_workflow_status(void); void supervisor_start_web_workflow(void); void supervisor_stop_web_workflow(void); From 0882cbf82396f380a80fa6f692e19eeddc8ecea3 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 15 Jun 2022 12:10:42 -0700 Subject: [PATCH 0495/2403] web server kinda works --- ports/espressif/common-hal/mdns/Server.c | 19 ++-- .../espressif/common-hal/socketpool/Socket.c | 5 +- shared-bindings/mdns/Server.h | 3 + supervisor/shared/web_workflow/web_workflow.c | 98 +++++++++++++++++-- 4 files changed, 110 insertions(+), 15 deletions(-) diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c index 9da67a9145..38deac9c3d 100644 --- a/ports/espressif/common-hal/mdns/Server.c +++ b/ports/espressif/common-hal/mdns/Server.c @@ -35,13 +35,9 @@ STATIC bool inited = false; -void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface) { - if (network_interface != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) { - mp_raise_ValueError(translate("mDNS only works with built-in WiFi")); - return; - } +void mdns_server_construct(mdns_server_obj_t *self) { if (inited) { - mp_raise_RuntimeError(translate("mDNS already initialized")); + return; } mdns_init(); @@ -65,6 +61,17 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_ mdns_delegate_hostname_add("circuitpython", &our_ip); } +void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface) { + if (network_interface != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) { + mp_raise_ValueError(translate("mDNS only works with built-in WiFi")); + return; + } + if (inited) { + mp_raise_RuntimeError(translate("mDNS already initialized")); + } + mdns_server_construct(self); +} + void common_hal_mdns_server_deinit(mdns_server_obj_t *self) { inited = false; mdns_free(); diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index 86944f8b00..fc42345e4a 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -284,7 +284,10 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self, // In non-blocking mode, fail instead of looping if (received == -1 && self->timeout_ms == 0) { - if (errno != EAGAIN) { + if (errno == ENOTCONN) { + self->connected = false; + return -MP_ENOTCONN; + } else if (errno != EAGAIN) { ESP_LOGE(TAG, "recv %d", errno); } return -MP_EAGAIN; diff --git a/shared-bindings/mdns/Server.h b/shared-bindings/mdns/Server.h index a178e9bd2d..2146dca311 100644 --- a/shared-bindings/mdns/Server.h +++ b/shared-bindings/mdns/Server.h @@ -41,3 +41,6 @@ const char *common_hal_mdns_server_get_instance_name(mdns_server_obj_t *self); void common_hal_mdns_server_set_instance_name(mdns_server_obj_t *self, const char *instance_name); mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_float_t timeout); void common_hal_mdns_server_advertise_service(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_int_t port); + +// For internal use. +void mdns_server_construct(mdns_server_obj_t *self); diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 2ca25c6b72..fc37dea2db 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -30,6 +30,7 @@ #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" +#include "shared-bindings/mdns/Server.h" #include "shared-bindings/socketpool/__init__.h" #include "shared-bindings/socketpool/Socket.h" #include "shared-bindings/socketpool/SocketPool.h" @@ -59,12 +60,18 @@ typedef struct { enum request_state state; char method[6]; char path[256]; + char header_key[64]; + char header_value[64]; uint32_t content_length; size_t offset; + bool redirect; + bool done; } _request; static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; +static mdns_server_obj_t mdns; + static socketpool_socketpool_obj_t pool; static socketpool_socket_obj_t listening; static socketpool_socket_obj_t active; @@ -133,6 +140,8 @@ void supervisor_start_web_workflow(void) { return; } + mdns_server_construct(&mdns); + pool.base.type = &socketpool_socketpool_type; common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj); @@ -183,6 +192,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) bool more = true; bool error = false; uint8_t c; + // This code assumes header lines are terminated with \r\n while (more && !error) { int len = socketpool_socket_recv_into(socket, &c, 1); if (len != 1) { @@ -192,7 +202,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) more = false; break; } - ESP_LOGI(TAG, "%c", c); + // ESP_LOGI(TAG, "%c", c); switch (request->state) { case STATE_METHOD: { if (c == ' ') { @@ -213,7 +223,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) request->offset = 0; ESP_LOGW(TAG, "Request %s %s", request->method, request->path); request->state = STATE_VERSION; - error = true; } else if (request->offset > sizeof(request->path) - 1) { // Skip methods that are too long. } else { @@ -222,25 +231,93 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) } break; } - case STATE_VERSION: + case STATE_VERSION: { + const char *supported_version = "HTTP/1.1\r"; + error = supported_version[request->offset] != c; + request->offset++; + if (request->offset == strlen(supported_version)) { + ESP_LOGW(TAG, "Version ok"); + request->state = STATE_HEADER_KEY; + request->offset = 0; + } break; - case STATE_HEADER_KEY: + } + case STATE_HEADER_KEY: { + if (c == '\r') { + request->state = STATE_BODY; + ESP_LOGW(TAG, "Body"); + } else if (c == '\n') { + // Consume the \n + } else if (c == ':') { + request->header_key[request->offset] = '\0'; + request->offset = 0; + request->state = STATE_HEADER_VALUE; + } else if (request->offset > sizeof(request->header_key) - 1) { + // Skip methods that are too long. + } else { + request->header_key[request->offset] = c; + request->offset++; + } break; - case STATE_HEADER_VALUE: + } + case STATE_HEADER_VALUE: { + if (request->offset == 0) { + error = c != ' '; + request->offset++; + } else if (c == '\r') { + request->header_value[request->offset - 1] = '\0'; + request->offset = 0; + request->state = STATE_HEADER_KEY; + if (strcmp(request->header_key, "Authorization") == 0) { + ESP_LOGW(TAG, "Authorization"); + } else if (strcmp(request->header_key, "Host") == 0) { + ESP_LOGW(TAG, "Host header check '%s'", request->header_value); + request->redirect = strcmp(request->header_value, "circuitpython.local") == 0; + } + ESP_LOGW(TAG, "Header %s %s", request->header_key, request->header_value); + } else if (request->offset > sizeof(request->header_value) - 1) { + // Skip methods that are too long. + } else { + request->header_value[request->offset - 1] = c; + request->offset++; + } break; + } case STATE_BODY: + request->done = true; + more = false; break; } } if (error) { - const char *error_response = "HTTP/1.1 501 Not Implemented"; + const char *error_response = "HTTP/1.1 501 Not Implemented\r\n\r\n"; int nodelay = 1; int err = lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); int sent = socketpool_socket_send(socket, (const uint8_t *)error_response, strlen(error_response)); ESP_LOGW(TAG, "sent %d %d", sent, err); - vTaskDelay(0); - socketpool_socket_close(socket); } + if (!request->done) { + return; + } + if (request->redirect) { + const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; + int nodelay = 1; + int err = lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); + int sent = socketpool_socket_send(socket, (const uint8_t *)redirect_response, strlen(redirect_response)); + const char *instance_name = common_hal_mdns_server_get_instance_name(&mdns); + sent += socketpool_socket_send(socket, (const uint8_t *)instance_name, strlen(instance_name)); + const char *local = ".local"; + sent += socketpool_socket_send(socket, (const uint8_t *)local, strlen(local)); + sent += socketpool_socket_send(socket, (const uint8_t *)request->path, strlen(request->path)); + const char *two_lines = "\r\n\r\n"; + sent += socketpool_socket_send(socket, (const uint8_t *)two_lines, strlen(two_lines)); + ESP_LOGW(TAG, "sent %d %d", sent, err); + } else { + const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; + int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + ESP_LOGW(TAG, "sent ok %d", sent); + } + request->done = false; } @@ -249,6 +326,9 @@ void supervisor_web_workflow_background(void) { if (!common_hal_socketpool_socket_get_connected(&active) && !common_hal_socketpool_socket_get_closed(&listening) && listening.num > 0) { + if (!common_hal_socketpool_socket_get_closed(&active)) { + common_hal_socketpool_socket_close(&active); + } uint32_t ip; uint32_t port; int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port); @@ -268,6 +348,8 @@ void supervisor_web_workflow_background(void) { active_request.state = STATE_METHOD; active_request.offset = 0; + active_request.done = false; + active_request.redirect = false; lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK); } From 32478345f8adb1b0b7acf426f8142bc5a88be030 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 15 Jun 2022 16:34:26 -0700 Subject: [PATCH 0496/2403] more tweaks --- .../espressif/common-hal/socketpool/Socket.c | 3 + supervisor/shared/web_workflow/web_workflow.c | 158 ++++++++++++++++++ 2 files changed, 161 insertions(+) diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index fc42345e4a..d808314c20 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -322,6 +322,9 @@ int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, ui } if (sent < 0) { + if (errno == ECONNRESET || errno == ENOTCONN) { + self->connected = false; + } return -errno; } diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index fc37dea2db..01a4e7bfe1 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -26,6 +26,11 @@ #include +#include "extmod/vfs.h" +#include "extmod/vfs_fat.h" + +#include "py/mpstate.h" + #include "shared-bindings/wifi/Radio.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" @@ -180,6 +185,8 @@ void supervisor_start_web_workflow(void) { // - JSON list of MDNS results // GET /cp/version.json // - JSON version info + // GET /cp/serial.txt + // - Most recent 1k of serial output. // GET / // - Super basic editor // GET /ws/circuitpython @@ -188,6 +195,44 @@ void supervisor_start_web_workflow(void) { #endif } +static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { + char encoded_len[sizeof(size_t) * 2 + 1]; + int len = snprintf(encoded_len, sizeof(encoded_len), "%X", strlen(chunk)); + int sent = socketpool_socket_send(socket, (const uint8_t *)encoded_len, len); + if (sent < len) { + ESP_LOGE(TAG, "short send %d %d", sent, len); + } + sent = socketpool_socket_send(socket, (const uint8_t *)"\r\n", 2); + if (sent < 2) { + ESP_LOGE(TAG, "short send %d %d", sent, 2); + } + sent = socketpool_socket_send(socket, (const uint8_t *)chunk, strlen(chunk)); + if (sent < (int)strlen(chunk)) { + ESP_LOGE(TAG, "short send %d %d", sent, strlen(chunk)); + } + sent = socketpool_socket_send(socket, (const uint8_t *)"\r\n", 2); + if (sent < 2) { + ESP_LOGE(TAG, "short send %d %d", sent, 2); + } +} + +static void _send_str(socketpool_socket_obj_t *socket, const char *str) { + int sent = socketpool_socket_send(socket, (const uint8_t *)str, strlen(str)); + if (sent < (int)strlen(str)) { + ESP_LOGE(TAG, "short send %d %d", sent, strlen(str)); + } +} + +static bool _endswith(const char *str, const char *suffix) { + if (str == NULL || suffix == NULL) { + return false; + } + if (strlen(suffix) > strlen(str)) { + return false; + } + return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0; +} + static void _process_request(socketpool_socket_obj_t *socket, _request *request) { bool more = true; bool error = false; @@ -284,7 +329,9 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) break; } case STATE_BODY: + ESP_LOGW(TAG, "BODY %c", c); request->done = true; + request->state = STATE_METHOD; more = false; break; } @@ -312,6 +359,117 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) const char *two_lines = "\r\n\r\n"; sent += socketpool_socket_send(socket, (const uint8_t *)two_lines, strlen(two_lines)); ESP_LOGW(TAG, "sent %d %d", sent, err); + } else if (memcmp(request->path, "/fs/", 4) == 0) { + ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); + const char *path = request->path + 3; + size_t pathlen = strlen(path); + FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; + // Trailing / is a directory. + if (path[pathlen - 1] == '/') { + if (strcmp(request->method, "GET") == 0) { + FF_DIR dir; + FRESULT res = f_opendir(fs, &dir, path); + if (res != FR_OK) { + // TODO: Send 404 + } + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" + "Content-Type: text/html\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, ""); + _send_chunk(socket, path); + _send_chunk(socket, "

"); + _send_chunk(socket, path); + _send_chunk(socket, "

");
+                if (strlen(path) > 1) {
+                    _send_chunk(socket, "🗀\t..
");
+                }
+
+                FILINFO file_info;
+                char *fn = file_info.fname;
+                res = f_readdir(&dir, &file_info);
+                while (res == FR_OK && fn[0] != 0) {
+                    // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
+                    //     (file_info.fdate >> 5) & 0xf,
+                    //     file_info.fdate & 0x1f,
+                    //     file_info.ftime >> 11,
+                    //     (file_info.ftime >> 5) & 0x1f,
+                    //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
+                    // entry->truncated_time = truncated_time;
+                    // 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;
+                    // }
+                    // _send_chunk(socket, "
  • ");
+                    if ((file_info.fattrib & AM_DIR) != 0) {
+                        _send_chunk(socket, "🗀\t");
+                    } else if (_endswith(path, ".txt") || _endswith(path, ".py")) {
+                        _send_chunk(socket, "🖹\t");
+                    } else {
+                        _send_chunk(socket, "⭳\t");
+                    }
+                    _send_chunk(socket, "path);
+                    _send_chunk(socket, file_info.fname);
+                    if ((file_info.fattrib & AM_DIR) != 0) {
+                        _send_chunk(socket, "/");
+                    }
+                    _send_chunk(socket, "\">");
+
+                    _send_chunk(socket, file_info.fname);
+                    _send_chunk(socket, "✏️🗑️
    ");
+                    res = f_readdir(&dir, &file_info);
+                }
+                _send_chunk(socket, "
    • Upload:"); + _send_chunk(socket, ""); + f_closedir(&dir); + } + + } else { // Dealing with a file. + if (strcmp(request->method, "GET") == 0) { + FIL active_file; + FRESULT result = f_open(fs, &active_file, path, FA_READ); + + if (result != FR_OK) { + // TODO: 404 + } + uint32_t total_length = f_size(&active_file); + char encoded_len[10]; + snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); + + _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: "); + _send_str(socket, encoded_len); + _send_str(socket, "\r\n"); + if (_endswith(path, ".txt") || _endswith(path, ".py")) { + _send_str(socket, "Content-Type: text/plain\r\n"); + } else { + _send_str(socket, "Content-Type: application/octet-stream\r\n"); + } + _send_str(socket, "\r\n"); + + uint32_t total_read = 0; + while (total_read < total_length) { + uint8_t data_buffer[64]; + size_t quantity_read; + f_read(&active_file, data_buffer, 64, &quantity_read); + total_read += quantity_read; + uint32_t send_offset = 0; + while (send_offset < quantity_read) { + int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset); + if (sent < 0) { + ESP_LOGE(TAG, "file send error %d", sent); + break; + } + send_offset += sent; + } + } + ESP_LOGW(TAG, "file return done"); + + f_close(&active_file); + } + } } else { const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); From 77cecdbe2a0836fe5ef5051d2cf37babdc33345e Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 16 Jun 2022 11:43:04 -0700 Subject: [PATCH 0497/2403] Turn on mdns service --- supervisor/shared/web_workflow/web_workflow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 01a4e7bfe1..c24b7094cd 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -146,6 +146,7 @@ void supervisor_start_web_workflow(void) { } mdns_server_construct(&mdns); + common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", 80); pool.base.type = &socketpool_socketpool_type; common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj); From 4f0a7aedfd102bf5fa418068b3ec3962b1b5de5a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 16 Jun 2022 17:03:52 -0700 Subject: [PATCH 0498/2403] WIP adding devices.json and auth --- .../espressif_esp32s3_box/mpconfigboard.mk | 2 +- ports/espressif/common-hal/mdns/Server.c | 74 +++- ports/espressif/common-hal/wifi/Radio.c | 20 +- ports/espressif/common-hal/wifi/__init__.c | 2 +- .../esp-idf-config/sdkconfig.defaults | 6 +- shared-bindings/mdns/Server.c | 4 +- shared-bindings/mdns/Server.h | 6 +- supervisor/shared/web_workflow/web_workflow.c | 401 +++++++++++++----- 8 files changed, 370 insertions(+), 145 deletions(-) diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk index 6664ba8c98..5d4e6dda74 100644 --- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk @@ -13,5 +13,5 @@ LONGINT_IMPL = MPZ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 CIRCUITPY_ESP_FLASH_MODE=dio -CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_FREQ=40m CIRCUITPY_ESP_FLASH_SIZE=16MB diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c index 38deac9c3d..6cc562a34c 100644 --- a/ports/espressif/common-hal/mdns/Server.c +++ b/ports/espressif/common-hal/mdns/Server.c @@ -35,7 +35,7 @@ STATIC bool inited = false; -void mdns_server_construct(mdns_server_obj_t *self) { +void mdns_server_construct(mdns_server_obj_t *self, bool workflow) { if (inited) { return; } @@ -46,19 +46,21 @@ void mdns_server_construct(mdns_server_obj_t *self) { snprintf(self->default_hostname, sizeof(self->default_hostname), "cpy-%02x%02x%02x", mac[3], mac[4], mac[5]); common_hal_mdns_server_set_hostname(self, self->default_hostname); - // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local" - // queries as well. - // TODO: Allow for disabling this with `supervisor.disable_web_workflow()`. - mdns_ip_addr_t our_ip; - esp_netif_get_ip_info(common_hal_wifi_radio_obj.netif, &common_hal_wifi_radio_obj.ip_info); - our_ip.next = NULL; - our_ip.addr.type = ESP_IPADDR_TYPE_V4; - our_ip.addr.u_addr.ip4 = common_hal_wifi_radio_obj.ip_info.ip; - our_ip.addr.u_addr.ip6.addr[1] = 0; - our_ip.addr.u_addr.ip6.addr[2] = 0; - our_ip.addr.u_addr.ip6.addr[3] = 0; - our_ip.addr.u_addr.ip6.zone = 0; - mdns_delegate_hostname_add("circuitpython", &our_ip); + if (workflow) { + // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local" + // queries as well. + // TODO: Allow for disabling this with `supervisor.disable_web_workflow()`. + mdns_ip_addr_t our_ip; + esp_netif_get_ip_info(common_hal_wifi_radio_obj.netif, &common_hal_wifi_radio_obj.ip_info); + our_ip.next = NULL; + our_ip.addr.type = ESP_IPADDR_TYPE_V4; + our_ip.addr.u_addr.ip4 = common_hal_wifi_radio_obj.ip_info.ip; + our_ip.addr.u_addr.ip6.addr[1] = 0; + our_ip.addr.u_addr.ip6.addr[2] = 0; + our_ip.addr.u_addr.ip6.addr[3] = 0; + our_ip.addr.u_addr.ip6.zone = 0; + mdns_delegate_hostname_add("circuitpython", &our_ip); + } } void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface) { @@ -69,7 +71,7 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_ if (inited) { mp_raise_RuntimeError(translate("mDNS already initialized")); } - mdns_server_construct(self); + mdns_server_construct(self, false); } void common_hal_mdns_server_deinit(mdns_server_obj_t *self) { @@ -104,6 +106,48 @@ void common_hal_mdns_server_set_instance_name(mdns_server_obj_t *self, const cha self->instance_name = instance_name; } +size_t mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, + mp_float_t timeout, mdns_remoteservice_obj_t *out, size_t out_len) { + mdns_search_once_t *search = mdns_query_async_new(NULL, service_type, protocol, MDNS_TYPE_PTR, timeout * 1000, 255, NULL); + if (search == NULL) { + return 0; + } + mdns_result_t *results; + while (!mdns_query_async_get_results(search, 1, &results)) { + RUN_BACKGROUND_TASKS; + } + mdns_query_async_delete(search); + // Count how many results we got. + // TODO: Remove this loop when moving off 4.4. Newer APIs will give us num_results + // back directly. + mdns_result_t *next = results; + uint8_t num_results = 0; + while (next != NULL) { + num_results++; + next = next->next; + } + + next = results; + // Don't error if we're out of memory. Instead, truncate the tuple. + uint8_t added = 0; + while (next != NULL && added < out_len) { + mdns_remoteservice_obj_t *service = &out[added]; + + service->result = next; + service->base.type = &mdns_remoteservice_type; + next = next->next; + // Break the linked list so we free each result separately. + service->result->next = NULL; + added++; + } + if (added < out_len) { + // Free the remaining results from the IDF because we don't have + // enough space in Python. + mdns_query_results_free(next); + } + return num_results; +} + mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_float_t timeout) { mdns_search_once_t *search = mdns_query_async_new(NULL, service_type, protocol, MDNS_TYPE_PTR, timeout * 1000, 255, NULL); if (search == NULL) { diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index b6b155a71c..fae1f77514 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -48,6 +48,10 @@ #define MAC_ADDRESS_LENGTH 6 +#include "esp_log.h" + +static const char *TAG = "radio"; + static void set_mode_station(wifi_radio_obj_t *self, bool state) { wifi_mode_t next_mode; if (state) { @@ -236,11 +240,12 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t if (!common_hal_wifi_radio_get_enabled(self)) { mp_raise_RuntimeError(translate("wifi is not enabled")); } + ESP_LOGI(TAG, "connect"); wifi_config_t *config = &self->sta_config; - size_t timeout_ms = timeout * 1000; - uint32_t start_time = common_hal_time_monotonic_ms(); - uint32_t end_time = start_time + timeout_ms; + // size_t timeout_ms = timeout * 1000; + // uint32_t start_time = common_hal_time_monotonic_ms(); + // uint32_t end_time = start_time + timeout_ms; EventBits_t bits; // can't block since both bits are false after wifi_init @@ -304,7 +309,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t esp_wifi_set_config(ESP_IF_WIFI_STA, config); self->starting_retries = 5; self->retries_left = 5; + ESP_LOGI(TAG, "wifi connect"); esp_wifi_connect(); + ESP_LOGI(TAG, "wifi connect done"); do { RUN_BACKGROUND_TASKS; @@ -314,10 +321,11 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t pdTRUE, 0); // Don't retry anymore if we're over our time budget. - if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) { - self->retries_left = 0; - } + // if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) { + // self->retries_left = 0; + // } } while ((bits & (WIFI_CONNECTED_BIT | WIFI_DISCONNECTED_BIT)) == 0 && !mp_hal_is_interrupted()); + ESP_LOGI(TAG, "connect done"); if ((bits & WIFI_DISCONNECTED_BIT) != 0) { if (self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) { return WIFI_RADIO_ERROR_AUTH_FAIL; diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index 3da0fc7297..61af5b774f 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -44,7 +44,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj; #include "supervisor/workflow.h" -static const char *TAG = "wifi"; +static const char *TAG = "CP wifi"; static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) { diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 5fb49faa82..121c20ad34 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -297,7 +297,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 +CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 CONFIG_ESP_INT_WDT_CHECK_CPU1=y # CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP_PANIC_HANDLER_IRAM is not set @@ -805,9 +805,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y CONFIG_LOG_BOOTLOADER_LEVEL=3 # CONFIG_APP_ROLLBACK_ENABLE is not set # CONFIG_FLASH_ENCRYPTION_ENABLED is not set -# CONFIG_FLASHMODE_QIO is not set +CONFIG_FLASHMODE_QIO=y # CONFIG_FLASHMODE_QOUT is not set -CONFIG_FLASHMODE_DIO=y +# CONFIG_FLASHMODE_DIO is not set # CONFIG_FLASHMODE_DOUT is not set # CONFIG_MONITOR_BAUD_9600B is not set # CONFIG_MONITOR_BAUD_57600B is not set diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c index b5e6c11216..97574ff0e2 100644 --- a/shared-bindings/mdns/Server.c +++ b/shared-bindings/mdns/Server.c @@ -136,7 +136,7 @@ MP_PROPERTY_GETSET(mdns_server_instance_name_obj, //| :param float/int timeout: Time to wait for responses""" //| ... //| -STATIC mp_obj_t mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -156,7 +156,7 @@ STATIC mp_obj_t mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_ return common_hal_mdns_server_find(self, service_type, protocol, timeout); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, mdns_server_find); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find); //| def advertise_service(self, *, service_type: str, protocol: str, port: int) -> None: //| """Respond to queries for the given service with the given port. diff --git a/shared-bindings/mdns/Server.h b/shared-bindings/mdns/Server.h index 2146dca311..351ab664b2 100644 --- a/shared-bindings/mdns/Server.h +++ b/shared-bindings/mdns/Server.h @@ -30,6 +30,8 @@ #include "common-hal/mdns/Server.h" +#include "shared-bindings/mdns/RemoteService.h" + extern const mp_obj_type_t mdns_server_type; void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface); @@ -43,4 +45,6 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic void common_hal_mdns_server_advertise_service(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_int_t port); // For internal use. -void mdns_server_construct(mdns_server_obj_t *self); +void mdns_server_construct(mdns_server_obj_t *self, bool workflow); +size_t mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, + mp_float_t timeout, mdns_remoteservice_obj_t *out, size_t out_len); diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index c24b7094cd..85a175e420 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -28,13 +28,14 @@ #include "extmod/vfs.h" #include "extmod/vfs_fat.h" - +#include "genhdr/mpversion.h" #include "py/mpstate.h" #include "shared-bindings/wifi/Radio.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" +#include "shared-bindings/mdns/RemoteService.h" #include "shared-bindings/mdns/Server.h" #include "shared-bindings/socketpool/__init__.h" #include "shared-bindings/socketpool/Socket.h" @@ -71,6 +72,7 @@ typedef struct { size_t offset; bool redirect; bool done; + bool authenticated; } _request; static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; @@ -83,6 +85,72 @@ static socketpool_socket_obj_t active; static _request active_request; +static char _api_password[64]; + +// in_len is the number of bytes to encode. out_len is the number of bytes we +// have to do it. +static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) { + size_t triples = (((in_len - 1) / 3) + 1); + size_t encoded_len = triples * 4; + if (encoded_len + 1 > out_len) { + return false; + } + ESP_LOGI(TAG, "triples %d", triples); + + // First pass, we convert input buffer to numeric base 64 values + char *in = buf + (triples - 1) * 3; + char *out = buf + (triples - 1) * 4; + int r = in_len % 3; + int partial = 0; + if (r != 0) { + out[0] = (in[0] & 0xFC) >> 2; + out[1] = (in[0] & 0x03) << 4; + if (r == 2) { + out[1] |= (in[1] & 0xF0) >> 4; + out[2] = (in[1] & 0x0F) << 2; + } else { + out[2] = 64; + } + out[3] = 64; + in -= 3; + out -= 4; + partial = 1; + } else { + ESP_LOGI(TAG, "no partial"); + } + buf[encoded_len] = '\0'; + for (size_t i = 0; i < triples - partial; i++) { + ESP_LOGI(TAG, "in %d %d %d", in[0], in[1], in[2]); + out[0] = (in[0] & 0xFC) >> 2; + out[1] = (in[0] & 0x03) << 4 | (in[1] & 0xF0) >> 4; + out[2] = (in[1] & 0x0F) << 2 | (in[2] & 0xC0) >> 6; + out[3] = in[2] & 0x3F; + ESP_LOGI(TAG, "out %d %d %d %d", out[0], out[1], out[2], out[3]); + in -= 3; + out -= 4; + } + + // Second pass, we convert number base 64 values to actual base64 ascii encoding + out = buf; + for (mp_uint_t j = 0; j < encoded_len; j++) { + if (*out < 26) { + *out += 'A'; + } else if (*out < 52) { + *out += 'a' - 26; + } else if (*out < 62) { + *out += '0' - 52; + } else if (*out == 62) { + *out = '+'; + } else if (*out == 63) { + *out = '/'; + } else { + *out = '='; + } + out++; + } + return true; +} + void supervisor_web_workflow_status(void) { serial_write_compressed(translate("Wi-Fi: ")); @@ -145,7 +213,8 @@ void supervisor_start_web_workflow(void) { return; } - mdns_server_construct(&mdns); + mdns_server_construct(&mdns, true); + common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME); common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", 80); pool.base.type = &socketpool_socketpool_type; @@ -160,6 +229,16 @@ void supervisor_start_web_workflow(void) { common_hal_socketpool_socket_bind(&listening, ip, strlen(ip), 80); common_hal_socketpool_socket_listen(&listening, 1); + + mp_int_t api_password_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, sizeof(_api_password) - 2); + if (api_password_len > 0) { + _api_password[0] = ':'; + _api_password[api_password_len + 1] = '\0'; + ESP_LOGW(TAG, "password before: %s", _api_password); + _base64_in_place(_api_password, api_password_len + 1, sizeof(_api_password)); + ESP_LOGW(TAG, "password encoded: %s", _api_password); + } + ESP_LOGW(TAG, "listening on socket %d", listening.num); active.base.type = &socketpool_socket_type; @@ -234,6 +313,37 @@ static bool _endswith(const char *str, const char *suffix) { return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0; } +static void _reply_missing(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 401 Unauthorized\r\n" + "Content-Length: 0\r\n" + "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_forbidden(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 403 Forbidden\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_unauthorized(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 401 Unauthorized\r\n" + "Content-Length: 0\r\n" + "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_redirect(socketpool_socket_obj_t *socket, const char *path) { + const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; + int nodelay = 1; + lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); + _send_str(socket, redirect_response); + _send_str(socket, common_hal_mdns_server_get_instance_name(&mdns)); + _send_str(socket, ".local"); + _send_str(socket, path); + _send_str(socket, "\r\n\r\n"); +} + static void _process_request(socketpool_socket_obj_t *socket, _request *request) { bool more = true; bool error = false; @@ -348,129 +458,188 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) return; } if (request->redirect) { - const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; - int nodelay = 1; - int err = lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); - int sent = socketpool_socket_send(socket, (const uint8_t *)redirect_response, strlen(redirect_response)); - const char *instance_name = common_hal_mdns_server_get_instance_name(&mdns); - sent += socketpool_socket_send(socket, (const uint8_t *)instance_name, strlen(instance_name)); - const char *local = ".local"; - sent += socketpool_socket_send(socket, (const uint8_t *)local, strlen(local)); - sent += socketpool_socket_send(socket, (const uint8_t *)request->path, strlen(request->path)); - const char *two_lines = "\r\n\r\n"; - sent += socketpool_socket_send(socket, (const uint8_t *)two_lines, strlen(two_lines)); - ESP_LOGW(TAG, "sent %d %d", sent, err); + _reply_redirect(socket, request->path); } else if (memcmp(request->path, "/fs/", 4) == 0) { - ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); - const char *path = request->path + 3; - size_t pathlen = strlen(path); - FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; - // Trailing / is a directory. - if (path[pathlen - 1] == '/') { - if (strcmp(request->method, "GET") == 0) { - FF_DIR dir; - FRESULT res = f_opendir(fs, &dir, path); - if (res != FR_OK) { - // TODO: Send 404 - } - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: text/html\r\n\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _send_chunk(socket, ""); - _send_chunk(socket, path); - _send_chunk(socket, "

    "); - _send_chunk(socket, path); - _send_chunk(socket, "

    ");
-                if (strlen(path) > 1) {
-                    _send_chunk(socket, "🗀\t..
    ");
-                }
-
-                FILINFO file_info;
-                char *fn = file_info.fname;
-                res = f_readdir(&dir, &file_info);
-                while (res == FR_OK && fn[0] != 0) {
-                    // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
-                    //     (file_info.fdate >> 5) & 0xf,
-                    //     file_info.fdate & 0x1f,
-                    //     file_info.ftime >> 11,
-                    //     (file_info.ftime >> 5) & 0x1f,
-                    //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
-                    // entry->truncated_time = truncated_time;
-                    // 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;
-                    // }
-                    // _send_chunk(socket, "
  • ");
-                    if ((file_info.fattrib & AM_DIR) != 0) {
-                        _send_chunk(socket, "🗀\t");
-                    } else if (_endswith(path, ".txt") || _endswith(path, ".py")) {
-                        _send_chunk(socket, "🖹\t");
-                    } else {
-                        _send_chunk(socket, "⭳\t");
+        if (!request->authenticated) {
+            if (_api_password[0] != '\0') {
+                _reply_unauthorized(socket);
+            } else {
+                _reply_forbidden(socket);
+            }
+        } else {
+            ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3);
+            const char *path = request->path + 3;
+            size_t pathlen = strlen(path);
+            FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+            // Trailing / is a directory.
+            if (path[pathlen - 1] == '/') {
+                if (strcmp(request->method, "GET") == 0) {
+                    FF_DIR dir;
+                    FRESULT res = f_opendir(fs, &dir, path);
+                    if (res != FR_OK) {
+                        _reply_missing(socket);
                     }
-                    _send_chunk(socket, "path);
-                    _send_chunk(socket, file_info.fname);
-                    if ((file_info.fattrib & AM_DIR) != 0) {
-                        _send_chunk(socket, "/");
+                    const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n"
+                        "Content-Type: text/html\r\n\r\n";
+                    socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response));
+                    _send_chunk(socket, "");
+                    _send_chunk(socket, path);
+                    _send_chunk(socket, "
    ");
+                    _send_chunk(socket, path);
+                    _send_chunk(socket, "
    ");
+                    if (strlen(path) > 1) {
+                        _send_chunk(socket, "🗀\t..
    ");
                     }
-                    _send_chunk(socket, "\">");
 
-                    _send_chunk(socket, file_info.fname);
-                    _send_chunk(socket, "✏️🗑️
    ");
+                    FILINFO file_info;
+                    char *fn = file_info.fname;
                     res = f_readdir(&dir, &file_info);
-                }
-                _send_chunk(socket, "
    Upload:");
-                _send_chunk(socket, "");
-                f_closedir(&dir);
-            }
-
-        } else { // Dealing with a file.
-            if (strcmp(request->method, "GET") == 0) {
-                FIL active_file;
-                FRESULT result = f_open(fs, &active_file, path, FA_READ);
-
-                if (result != FR_OK) {
-                    // TODO: 404
-                }
-                uint32_t total_length = f_size(&active_file);
-                char encoded_len[10];
-                snprintf(encoded_len, sizeof(encoded_len), "%d", total_length);
-
-                _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: ");
-                _send_str(socket, encoded_len);
-                _send_str(socket, "\r\n");
-                if (_endswith(path, ".txt") || _endswith(path, ".py")) {
-                    _send_str(socket, "Content-Type: text/plain\r\n");
-                } else {
-                    _send_str(socket, "Content-Type: application/octet-stream\r\n");
-                }
-                _send_str(socket, "\r\n");
-
-                uint32_t total_read = 0;
-                while (total_read < total_length) {
-                    uint8_t data_buffer[64];
-                    size_t quantity_read;
-                    f_read(&active_file, data_buffer, 64, &quantity_read);
-                    total_read += quantity_read;
-                    uint32_t send_offset = 0;
-                    while (send_offset < quantity_read) {
-                        int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset);
-                        if (sent < 0) {
-                            ESP_LOGE(TAG, "file send error %d", sent);
-                            break;
+                    while (res == FR_OK && fn[0] != 0) {
+                        // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
+                        //     (file_info.fdate >> 5) & 0xf,
+                        //     file_info.fdate & 0x1f,
+                        //     file_info.ftime >> 11,
+                        //     (file_info.ftime >> 5) & 0x1f,
+                        //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
+                        // entry->truncated_time = truncated_time;
+                        // 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;
+                        // }
+                        // _send_chunk(socket, "
  • ");
+                        if ((file_info.fattrib & AM_DIR) != 0) {
+                            _send_chunk(socket, "🗀\t");
+                        } else if (_endswith(file_info.fname, ".txt") ||
+                                   _endswith(file_info.fname, ".py")) {
+                            _send_chunk(socket, "🖹\t");
+                        } else {
+                            _send_chunk(socket, "⬇\t");
                         }
-                        send_offset += sent;
-                    }
-                }
-                ESP_LOGW(TAG, "file return done");
+                        _send_chunk(socket, "path);
+                        _send_chunk(socket, file_info.fname);
+                        if ((file_info.fattrib & AM_DIR) != 0) {
+                            _send_chunk(socket, "/");
+                        }
+                        _send_chunk(socket, "\">");
 
-                f_close(&active_file);
+                        _send_chunk(socket, file_info.fname);
+                        _send_chunk(socket, "✏️🗑️
    ");
+                        res = f_readdir(&dir, &file_info);
+                    }
+                    _send_chunk(socket, "
    • Upload:"); + _send_chunk(socket, ""); + f_closedir(&dir); + } + + } else { // Dealing with a file. + if (strcmp(request->method, "GET") == 0) { + FIL active_file; + FRESULT result = f_open(fs, &active_file, path, FA_READ); + + if (result != FR_OK) { + // TODO: 404 + } + uint32_t total_length = f_size(&active_file); + char encoded_len[10]; + snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); + + _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: "); + _send_str(socket, encoded_len); + _send_str(socket, "\r\n"); + if (_endswith(path, ".txt") || _endswith(path, ".py")) { + _send_str(socket, "Content-Type: text/plain\r\n"); + } else { + _send_str(socket, "Content-Type: application/octet-stream\r\n"); + } + _send_str(socket, "\r\n"); + + uint32_t total_read = 0; + while (total_read < total_length) { + uint8_t data_buffer[64]; + size_t quantity_read; + f_read(&active_file, data_buffer, 64, &quantity_read); + total_read += quantity_read; + uint32_t send_offset = 0; + while (send_offset < quantity_read) { + int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset); + if (sent < 0) { + ESP_LOGE(TAG, "file send error %d", sent); + break; + } + send_offset += sent; + } + } + ESP_LOGW(TAG, "file return done"); + + f_close(&active_file); + } } } + } else if (memcmp(request->path, "/cp/", 4) == 0) { + ESP_LOGW(TAG, "circuitpython %s %s", request->method, request->path + 3); + const char *path = request->path + 3; + if (strcmp(request->method, "GET") != 0) { + // Return error if not a GET + } + if (strcmp(path, "/devices.json") == 0) { + mdns_remoteservice_obj_t found_devices[32]; + size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices)); + size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices)); + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, "{\"total\": "); + char total_encoded[4]; + snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); + _send_chunk(socket, total_encoded); + _send_chunk(socket, ", \"devices\": ["); + ESP_LOGW(TAG, "%d total devices", total_results); + for (size_t i = 0; i < count; i++) { + if (i > 0) { + _send_chunk(socket, ","); + } + _send_chunk(socket, "{\"hostname\": \""); + _send_chunk(socket, common_hal_mdns_remoteservice_get_hostname(&found_devices[i])); + _send_chunk(socket, "\", \"instance_name\": \""); + _send_chunk(socket, common_hal_mdns_remoteservice_get_instance_name(&found_devices[i])); + _send_chunk(socket, "\", \"port\": "); + char port_encoded[4]; + int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]); + snprintf(port_encoded, sizeof(port_encoded), "%d", port); + _send_chunk(socket, port_encoded); + _send_chunk(socket, "}"); + common_hal_mdns_remoteservice_deinit(&found_devices[i]); + } + _send_chunk(socket, "]}"); + // Empty chunk signals the end of the response. + _send_chunk(socket, ""); + } else if (strcmp(path, "/version.json") == 0) { + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, "{\"web_api_version\": 1, \"version\": \""); + _send_chunk(socket, MICROPY_GIT_TAG); + _send_chunk(socket, "\", \"build_date\": \""); + _send_chunk(socket, MICROPY_BUILD_DATE); + _send_chunk(socket, "\", \"board_name\": \""); + _send_chunk(socket, MICROPY_HW_BOARD_NAME); + _send_chunk(socket, "\", \"mcu_name\": \""); + _send_chunk(socket, MICROPY_HW_MCU_NAME); + _send_chunk(socket, "\", \"board_id\": \""); + _send_chunk(socket, CIRCUITPY_BOARD_ID); + _send_chunk(socket, "\", \"creator_id\": "); + char encoded_id[8]; + snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATOR_ID); + _send_chunk(socket, encoded_id); + _send_chunk(socket, ", \"creation_id\": "); + snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); + _send_chunk(socket, encoded_id); + _send_chunk(socket, "}"); + // Empty chunk signals the end of the response. + _send_chunk(socket, ""); + } } else { const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); From 35045f0eabf0ead28da5ab5368ebf30d91d1e283 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 17 Jun 2022 08:54:06 -0700 Subject: [PATCH 0499/2403] Auth works --- supervisor/shared/web_workflow/web_workflow.c | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 85a175e420..586127a348 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -95,7 +95,6 @@ static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) { if (encoded_len + 1 > out_len) { return false; } - ESP_LOGI(TAG, "triples %d", triples); // First pass, we convert input buffer to numeric base 64 values char *in = buf + (triples - 1) * 3; @@ -103,29 +102,25 @@ static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) { int r = in_len % 3; int partial = 0; if (r != 0) { - out[0] = (in[0] & 0xFC) >> 2; - out[1] = (in[0] & 0x03) << 4; + out[3] = 64; if (r == 2) { - out[1] |= (in[1] & 0xF0) >> 4; out[2] = (in[1] & 0x0F) << 2; + out[1] = (in[0] & 0x03) << 4 | (in[1] & 0xF0) >> 4; } else { out[2] = 64; + out[1] = (in[0] & 0x03) << 4; } - out[3] = 64; + out[0] = (in[0] & 0xFC) >> 2; in -= 3; out -= 4; partial = 1; - } else { - ESP_LOGI(TAG, "no partial"); } buf[encoded_len] = '\0'; for (size_t i = 0; i < triples - partial; i++) { - ESP_LOGI(TAG, "in %d %d %d", in[0], in[1], in[2]); - out[0] = (in[0] & 0xFC) >> 2; - out[1] = (in[0] & 0x03) << 4 | (in[1] & 0xF0) >> 4; - out[2] = (in[1] & 0x0F) << 2 | (in[2] & 0xC0) >> 6; out[3] = in[2] & 0x3F; - ESP_LOGI(TAG, "out %d %d %d %d", out[0], out[1], out[2], out[3]); + out[2] = (in[1] & 0x0F) << 2 | (in[2] & 0xC0) >> 6; + out[1] = (in[0] & 0x03) << 4 | (in[1] & 0xF0) >> 4; + out[0] = (in[0] & 0xFC) >> 2; in -= 3; out -= 4; } @@ -425,7 +420,10 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) request->offset = 0; request->state = STATE_HEADER_KEY; if (strcmp(request->header_key, "Authorization") == 0) { - ESP_LOGW(TAG, "Authorization"); + const char *prefix = "Basic "; + request->authenticated = memcmp(request->header_value, prefix, strlen(prefix)) == 0 && + strcmp(_api_password, request->header_value + strlen(prefix)) == 0; + ESP_LOGW(TAG, "Authorization %d", request->authenticated); } else if (strcmp(request->header_key, "Host") == 0) { ESP_LOGW(TAG, "Host header check '%s'", request->header_value); request->redirect = strcmp(request->header_value, "circuitpython.local") == 0; @@ -567,13 +565,20 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) while (send_offset < quantity_read) { int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset); if (sent < 0) { - ESP_LOGE(TAG, "file send error %d", sent); - break; + if (sent == -EAGAIN) { + sent = 0; + } else { + ESP_LOGE(TAG, "file send error %d", sent); + break; + } } send_offset += sent; } } ESP_LOGW(TAG, "file return done"); + if (total_read < total_length) { + socketpool_socket_close(socket); + } f_close(&active_file); } From 92593aa7a123da6bc8fa43e6bb619886a64aba38 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 17 Jun 2022 09:30:12 -0700 Subject: [PATCH 0500/2403] Fix bind, remove hard coded ip --- ports/espressif/common-hal/socketpool/Socket.c | 13 +++++++++++-- supervisor/shared/web_workflow/web_workflow.c | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index d808314c20..d09800811d 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -131,7 +131,17 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self, const char *host, size_t hostlen, uint32_t port) { struct sockaddr_in bind_addr; - bind_addr.sin_addr.s_addr = inet_addr(host); + const char *broadcast = ""; + uint32_t ip; + if (hostlen == 0) { + ip = IPADDR_ANY; + } else if (hostlen == strlen(broadcast) && + memcmp(host, broadcast, strlen(broadcast)) == 0) { + ip = IPADDR_BROADCAST; + } else { + ip = inet_addr(host); + } + bind_addr.sin_addr.s_addr = ip; bind_addr.sin_family = AF_INET; bind_addr.sin_port = htons(port); @@ -141,7 +151,6 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self, mp_raise_RuntimeError(translate("Cannot set socket options")); } int result = lwip_bind(self->num, (struct sockaddr *)&bind_addr, sizeof(bind_addr)); - ESP_LOGE(TAG, "bind result %d", result); return result == 0; } diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 586127a348..fac3e949ac 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -220,11 +220,9 @@ void supervisor_start_web_workflow(void) { common_hal_socketpool_socket_settimeout(&listening, 0); // Bind to any ip. // TODO: Make this port .env configurable. - const char *ip = "192.168.1.94"; - common_hal_socketpool_socket_bind(&listening, ip, strlen(ip), 80); + common_hal_socketpool_socket_bind(&listening, "", 0, 80); common_hal_socketpool_socket_listen(&listening, 1); - mp_int_t api_password_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, sizeof(_api_password) - 2); if (api_password_len > 0) { _api_password[0] = ':'; From 847ac60dce84b318e6113a17354d1e69b6791d2c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 17 Jun 2022 16:41:42 -0700 Subject: [PATCH 0501/2403] Fix wifi but not ble builds. Add DELETE and PUT support --- supervisor/shared/web_workflow/web_workflow.c | 682 ++++++++++++------ supervisor/supervisor.mk | 38 +- 2 files changed, 499 insertions(+), 221 deletions(-) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index fac3e949ac..b3aa5d1f13 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -30,10 +30,13 @@ #include "extmod/vfs_fat.h" #include "genhdr/mpversion.h" #include "py/mpstate.h" +#include "py/stackctrl.h" #include "shared-bindings/wifi/Radio.h" +#include "shared-module/storage/__init__.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" +#include "supervisor/usb.h" #include "shared-bindings/mdns/RemoteService.h" #include "shared-bindings/mdns/Server.h" @@ -64,15 +67,16 @@ enum request_state { typedef struct { enum request_state state; - char method[6]; + char method[8]; char path[256]; char header_key[64]; char header_value[64]; - uint32_t content_length; + size_t content_length; size_t offset; bool redirect; bool done; bool authenticated; + bool expect; } _request; static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; @@ -306,10 +310,26 @@ static bool _endswith(const char *str, const char *suffix) { return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0; } +static void _reply_continue(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 100 Continue\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_created(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 201 Created\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_no_content(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 204 No Content\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + static void _reply_missing(socketpool_socket_obj_t *socket) { - const char *response = "HTTP/1.1 401 Unauthorized\r\n" - "Content-Length: 0\r\n" - "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n\r\n"; + const char *response = "HTTP/1.1 404 Not Found\r\n" + "Content-Length: 0\r\n\r\n"; _send_str(socket, response); } @@ -319,6 +339,24 @@ static void _reply_forbidden(socketpool_socket_obj_t *socket) { _send_str(socket, response); } +static void _reply_conflict(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 409 Conflict\r\n" + "Content-Length: 19\r\n\r\nUSB storage active."; + _send_str(socket, response); +} + +static void _reply_payload_too_large(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 413 Payload Too Large\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + +static void _reply_expectation_failed(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 417 Expectation Failed\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + static void _reply_unauthorized(socketpool_socket_obj_t *socket) { const char *response = "HTTP/1.1 401 Unauthorized\r\n" "Content-Length: 0\r\n" @@ -326,17 +364,438 @@ static void _reply_unauthorized(socketpool_socket_obj_t *socket) { _send_str(socket, response); } +static void _reply_server_error(socketpool_socket_obj_t *socket) { + const char *response = "HTTP/1.1 500 Internal Server Error\r\n" + "Content-Length: 0\r\n\r\n"; + _send_str(socket, response); +} + static void _reply_redirect(socketpool_socket_obj_t *socket, const char *path) { const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; int nodelay = 1; lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); _send_str(socket, redirect_response); - _send_str(socket, common_hal_mdns_server_get_instance_name(&mdns)); + _send_str(socket, common_hal_mdns_server_get_hostname(&mdns)); _send_str(socket, ".local"); _send_str(socket, path); _send_str(socket, "\r\n\r\n"); } +static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir, const char *request_path, const char *path) { + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" + "Content-Type: text/html\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, ""); + _send_chunk(socket, path); + _send_chunk(socket, "

    "); + _send_chunk(socket, path); + _send_chunk(socket, "

    ");
+    if (strlen(path) > 1) {
+        _send_chunk(socket, "🗀\t..
    ");
+    }
+
+    FILINFO file_info;
+    char *fn = file_info.fname;
+    FRESULT res = f_readdir(dir, &file_info);
+    while (res == FR_OK && fn[0] != 0) {
+        // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
+        //     (file_info.fdate >> 5) & 0xf,
+        //     file_info.fdate & 0x1f,
+        //     file_info.ftime >> 11,
+        //     (file_info.ftime >> 5) & 0x1f,
+        //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
+        // entry->truncated_time = truncated_time;
+        // 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;
+        // }
+        // _send_chunk(socket, "
  • ");
+        bool editable = false;
+        if ((file_info.fattrib & AM_DIR) != 0) {
+            _send_chunk(socket, "🗀\t");
+        } else if (_endswith(file_info.fname, ".txt") ||
+                   _endswith(file_info.fname, ".py") ||
+                   _endswith(file_info.fname, ".js") ||
+                   _endswith(file_info.fname, ".json")) {
+            _send_chunk(socket, "🖹\t");
+            editable = true;
+        } else if (_endswith(file_info.fname, ".html")) {
+            _send_chunk(socket, "🌐\t");
+            editable = true;
+        } else {
+            _send_chunk(socket, "⬇\t");
+        }
+
+        _send_chunk(socket, "");
+
+        _send_chunk(socket, file_info.fname);
+        _send_chunk(socket, "");
+        if (editable) {
+            _send_chunk(socket, "✏️");
+        }
+        _send_chunk(socket, "🗑️
    ");
+        res = f_readdir(dir, &file_info);
+    }
+    _send_chunk(socket, "
    • Upload:"); + _send_chunk(socket, ""); +} + +static void _reply_with_file(socketpool_socket_obj_t *socket, const char *filename, FIL *active_file) { + uint32_t total_length = f_size(active_file); + char encoded_len[10]; + snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); + + _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: "); + _send_str(socket, encoded_len); + _send_str(socket, "\r\n"); + if (_endswith(filename, ".txt") || _endswith(filename, ".py")) { + _send_str(socket, "Content-Type: text/plain\r\n"); + } else if (_endswith(filename, ".js")) { + _send_str(socket, "Content-Type: text/javascript\r\n"); + } else if (_endswith(filename, ".html")) { + _send_str(socket, "Content-Type: text/html\r\n"); + } else if (_endswith(filename, ".json")) { + _send_str(socket, "Content-Type: application/json\r\n"); + } else { + _send_str(socket, "Content-Type: application/octet-stream\r\n"); + } + _send_str(socket, "\r\n"); + + uint32_t total_read = 0; + while (total_read < total_length) { + uint8_t data_buffer[64]; + size_t quantity_read; + f_read(active_file, data_buffer, 64, &quantity_read); + total_read += quantity_read; + uint32_t send_offset = 0; + while (send_offset < quantity_read) { + int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset); + if (sent < 0) { + if (sent == -EAGAIN) { + sent = 0; + } else { + ESP_LOGE(TAG, "file send error %d", sent); + break; + } + } + send_offset += sent; + } + } + ESP_LOGW(TAG, "file return done"); + if (total_read < total_length) { + socketpool_socket_close(socket); + } +} + +static void _reply_with_devices_json(socketpool_socket_obj_t *socket) { + mdns_remoteservice_obj_t found_devices[32]; + size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices)); + size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices)); + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, "{\"total\": "); + char total_encoded[4]; + snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); + _send_chunk(socket, total_encoded); + _send_chunk(socket, ", \"devices\": ["); + ESP_LOGW(TAG, "%d total devices", total_results); + for (size_t i = 0; i < count; i++) { + if (i > 0) { + _send_chunk(socket, ","); + } + _send_chunk(socket, "{\"hostname\": \""); + _send_chunk(socket, common_hal_mdns_remoteservice_get_hostname(&found_devices[i])); + _send_chunk(socket, "\", \"instance_name\": \""); + _send_chunk(socket, common_hal_mdns_remoteservice_get_instance_name(&found_devices[i])); + _send_chunk(socket, "\", \"port\": "); + char port_encoded[4]; + int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]); + snprintf(port_encoded, sizeof(port_encoded), "%d", port); + _send_chunk(socket, port_encoded); + _send_chunk(socket, "}"); + common_hal_mdns_remoteservice_deinit(&found_devices[i]); + } + _send_chunk(socket, "]}"); + // Empty chunk signals the end of the response. + _send_chunk(socket, ""); +} + +static void _reply_with_version_json(socketpool_socket_obj_t *socket) { + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, "{\"web_api_version\": 1, \"version\": \""); + _send_chunk(socket, MICROPY_GIT_TAG); + _send_chunk(socket, "\", \"build_date\": \""); + _send_chunk(socket, MICROPY_BUILD_DATE); + _send_chunk(socket, "\", \"board_name\": \""); + _send_chunk(socket, MICROPY_HW_BOARD_NAME); + _send_chunk(socket, "\", \"mcu_name\": \""); + _send_chunk(socket, MICROPY_HW_MCU_NAME); + _send_chunk(socket, "\", \"board_id\": \""); + _send_chunk(socket, CIRCUITPY_BOARD_ID); + _send_chunk(socket, "\", \"creator_id\": "); + char encoded_id[8]; + snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATOR_ID); + _send_chunk(socket, encoded_id); + _send_chunk(socket, ", \"creation_id\": "); + snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); + _send_chunk(socket, encoded_id); + _send_chunk(socket, "}"); + // Empty chunk signals the end of the response. + _send_chunk(socket, ""); +} + +STATIC bool _usb_active(void) { + // Check to see if USB has already been mounted. If not, then we "eject" from USB until we're done. + #if CIRCUITPY_USB && CIRCUITPY_USB_MSC + if (storage_usb_enabled() && !usb_msc_lock()) { + return true; + } + #endif + return false; +} + +// Copied from ble file_transfer.c. We should share it. +STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) { + FF_DIR dir; + FRESULT res = f_opendir(fs, &dir, path); + FILINFO file_info; + // Check the stack since we're putting paths on it. + if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) { + return FR_INT_ERR; + } + while (res == FR_OK) { + res = f_readdir(&dir, &file_info); + if (res != FR_OK || file_info.fname[0] == '\0') { + break; + } + size_t pathlen = strlen(path); + size_t fnlen = strlen(file_info.fname); + TCHAR full_path[pathlen + 1 + fnlen]; + memcpy(full_path, path, pathlen); + full_path[pathlen] = '/'; + size_t full_pathlen = pathlen + 1 + fnlen; + memcpy(full_path + pathlen + 1, file_info.fname, fnlen); + full_path[full_pathlen] = '\0'; + if ((file_info.fattrib & AM_DIR) != 0) { + res = _delete_directory_contents(fs, full_path); + } + if (res != FR_OK) { + break; + } + res = f_unlink(fs, full_path); + } + f_closedir(&dir); + return res; +} + +static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *request, FATFS *fs, const TCHAR *path) { + FIL active_file; + + if (_usb_active()) { + _reply_conflict(socket); + return; + } + FRESULT result = f_open(fs, &active_file, path, FA_WRITE); + bool new_file = false; + if (result == FR_NO_FILE) { + new_file = true; + result = f_open(fs, &active_file, path, FA_WRITE | FA_OPEN_ALWAYS); + } + + if (result != FR_OK) { + ESP_LOGW(TAG, "file write error %d %s", result, path); + _reply_server_error(socket); + } else if (request->expect) { + _reply_continue(socket); + } + + // Change the file size to start. + f_lseek(&active_file, request->content_length); + if (f_tell(&active_file) < request->content_length) { + f_close(&active_file); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif + // Too large. + if (request->expect) { + _reply_expectation_failed(socket); + } else { + _reply_payload_too_large(socket); + } + + return; + } + f_truncate(&active_file); + f_rewind(&active_file); + + size_t total_read = 0; + bool error = false; + while (total_read < request->content_length && !error) { + uint8_t bytes[64]; + size_t read_len = MIN(sizeof(bytes), request->content_length - total_read); + int len = socketpool_socket_recv_into(socket, bytes, read_len); + if (len < 0) { + if (len == -EAGAIN) { + continue; + } else { + ESP_LOGW(TAG, "other error %d", len); + } + error = true; + break; + } + UINT actual; + f_write(&active_file, bytes, len, &actual); + if (actual != (UINT)len) { + ESP_LOGE(TAG, "didn't write whole file"); + } + total_read += len; + } + + f_close(&active_file); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif + if (new_file) { + _reply_created(socket); + } else { + _reply_no_content(socket); + } +} + +static void _reply(socketpool_socket_obj_t *socket, _request *request) { + if (request->redirect) { + _reply_redirect(socket, request->path); + } else if (memcmp(request->path, "/fs/", 4) == 0) { + if (!request->authenticated) { + ESP_LOGW(TAG, "not authed"); + if (_api_password[0] != '\0') { + _reply_unauthorized(socket); + } else { + _reply_forbidden(socket); + } + } else { + ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); + char *path = request->path + 3; + size_t pathlen = strlen(path); + FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; + // Trailing / is a directory. + bool directory = false; + if (path[pathlen - 1] == '/') { + // FATFS lib doesn't like a trailing / for paths besides root. + if (pathlen > 1) { + path[pathlen - 1] = '\0'; + } + directory = true; + } + // Delete is almost identical for files and directories so share the + // implementation. + if (strcmp(request->method, "DELETE") == 0) { + if (_usb_active()) { + _reply_conflict(socket); + return; + } + + FILINFO file; + FRESULT result = f_stat(fs, path, &file); + if (result == FR_OK) { + if ((file.fattrib & AM_DIR) != 0) { + result = _delete_directory_contents(fs, path); + } + if (result == FR_OK) { + result = f_unlink(fs, path); + } + } + + if (result == FR_NO_PATH || result == FR_NO_FILE) { + _reply_missing(socket); + } else if (result != FR_OK) { + ESP_LOGW(TAG, "rm error %d %s", result, path); + _reply_server_error(socket); + } else { + _reply_no_content(socket); + } + } else if (directory) { + if (strcmp(request->method, "GET") == 0) { + FF_DIR dir; + FRESULT res = f_opendir(fs, &dir, path); + // Put the / back for replies. + if (pathlen > 1) { + path[pathlen - 1] = '/'; + } + if (res != FR_OK) { + ESP_LOGW(TAG, "unable to open %d %s", res, path); + _reply_missing(socket); + return; + } + _reply_directory_html(socket, &dir, request->path, path); + f_closedir(&dir); + } else if (strcmp(request->method, "PUT") == 0) { + if (_usb_active()) { + _reply_conflict(socket); + return; + } + + FRESULT result = f_mkdir(fs, path); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif + if (result == FR_EXIST) { + _reply_no_content(socket); + } else if (result == FR_NO_PATH) { + _reply_missing(socket); + } else if (result != FR_OK) { + ESP_LOGE(TAG, "mkdir error %d %s", result, path); + _reply_server_error(socket); + } else { + _reply_created(socket); + } + } + } else { // Dealing with a file. + if (strcmp(request->method, "GET") == 0) { + FIL active_file; + FRESULT result = f_open(fs, &active_file, path, FA_READ); + + if (result != FR_OK) { + // TODO: 404 + _reply_missing(socket); + } else { + _reply_with_file(socket, path, &active_file); + } + + f_close(&active_file); + } else if (strcmp(request->method, "PUT") == 0) { + _write_file_and_reply(socket, request, fs, path); + } + } + } + } else if (memcmp(request->path, "/cp/", 4) == 0) { + ESP_LOGW(TAG, "circuitpython %s %s", request->method, request->path + 3); + const char *path = request->path + 3; + if (strcmp(request->method, "GET") != 0) { + // Return error if not a GET + } + if (strcmp(path, "/devices.json") == 0) { + _reply_with_devices_json(socket); + } else if (strcmp(path, "/version.json") == 0) { + _reply_with_version_json(socket); + } + } else { + const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; + int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + ESP_LOGW(TAG, "sent ok %d", sent); + } +} + static void _process_request(socketpool_socket_obj_t *socket, _request *request) { bool more = true; bool error = false; @@ -385,7 +844,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) error = supported_version[request->offset] != c; request->offset++; if (request->offset == strlen(supported_version)) { - ESP_LOGW(TAG, "Version ok"); request->state = STATE_HEADER_KEY; request->offset = 0; } @@ -394,7 +852,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) case STATE_HEADER_KEY: { if (c == '\r') { request->state = STATE_BODY; - ESP_LOGW(TAG, "Body"); } else if (c == '\n') { // Consume the \n } else if (c == ':') { @@ -421,10 +878,12 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) const char *prefix = "Basic "; request->authenticated = memcmp(request->header_value, prefix, strlen(prefix)) == 0 && strcmp(_api_password, request->header_value + strlen(prefix)) == 0; - ESP_LOGW(TAG, "Authorization %d", request->authenticated); } else if (strcmp(request->header_key, "Host") == 0) { - ESP_LOGW(TAG, "Host header check '%s'", request->header_value); request->redirect = strcmp(request->header_value, "circuitpython.local") == 0; + } else if (strcmp(request->header_key, "Content-Length") == 0) { + request->content_length = strtoul(request->header_value, NULL, 10); + } else if (strcmp(request->header_key, "Expect") == 0) { + request->expect = strcmp(request->header_value, "100-continue") == 0; } ESP_LOGW(TAG, "Header %s %s", request->header_key, request->header_value); } else if (request->offset > sizeof(request->header_value) - 1) { @@ -436,7 +895,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) break; } case STATE_BODY: - ESP_LOGW(TAG, "BODY %c", c); request->done = true; request->state = STATE_METHOD; more = false; @@ -453,201 +911,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) if (!request->done) { return; } - if (request->redirect) { - _reply_redirect(socket, request->path); - } else if (memcmp(request->path, "/fs/", 4) == 0) { - if (!request->authenticated) { - if (_api_password[0] != '\0') { - _reply_unauthorized(socket); - } else { - _reply_forbidden(socket); - } - } else { - ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); - const char *path = request->path + 3; - size_t pathlen = strlen(path); - FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; - // Trailing / is a directory. - if (path[pathlen - 1] == '/') { - if (strcmp(request->method, "GET") == 0) { - FF_DIR dir; - FRESULT res = f_opendir(fs, &dir, path); - if (res != FR_OK) { - _reply_missing(socket); - } - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: text/html\r\n\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _send_chunk(socket, ""); - _send_chunk(socket, path); - _send_chunk(socket, "

    "); - _send_chunk(socket, path); - _send_chunk(socket, "

    ");
-                    if (strlen(path) > 1) {
-                        _send_chunk(socket, "🗀\t..
    ");
-                    }
-
-                    FILINFO file_info;
-                    char *fn = file_info.fname;
-                    res = f_readdir(&dir, &file_info);
-                    while (res == FR_OK && fn[0] != 0) {
-                        // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
-                        //     (file_info.fdate >> 5) & 0xf,
-                        //     file_info.fdate & 0x1f,
-                        //     file_info.ftime >> 11,
-                        //     (file_info.ftime >> 5) & 0x1f,
-                        //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
-                        // entry->truncated_time = truncated_time;
-                        // 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;
-                        // }
-                        // _send_chunk(socket, "
  • ");
-                        if ((file_info.fattrib & AM_DIR) != 0) {
-                            _send_chunk(socket, "🗀\t");
-                        } else if (_endswith(file_info.fname, ".txt") ||
-                                   _endswith(file_info.fname, ".py")) {
-                            _send_chunk(socket, "🖹\t");
-                        } else {
-                            _send_chunk(socket, "⬇\t");
-                        }
-                        _send_chunk(socket, "path);
-                        _send_chunk(socket, file_info.fname);
-                        if ((file_info.fattrib & AM_DIR) != 0) {
-                            _send_chunk(socket, "/");
-                        }
-                        _send_chunk(socket, "\">");
-
-                        _send_chunk(socket, file_info.fname);
-                        _send_chunk(socket, "✏️🗑️
    ");
-                        res = f_readdir(&dir, &file_info);
-                    }
-                    _send_chunk(socket, "
    • Upload:"); - _send_chunk(socket, ""); - f_closedir(&dir); - } - - } else { // Dealing with a file. - if (strcmp(request->method, "GET") == 0) { - FIL active_file; - FRESULT result = f_open(fs, &active_file, path, FA_READ); - - if (result != FR_OK) { - // TODO: 404 - } - uint32_t total_length = f_size(&active_file); - char encoded_len[10]; - snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); - - _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: "); - _send_str(socket, encoded_len); - _send_str(socket, "\r\n"); - if (_endswith(path, ".txt") || _endswith(path, ".py")) { - _send_str(socket, "Content-Type: text/plain\r\n"); - } else { - _send_str(socket, "Content-Type: application/octet-stream\r\n"); - } - _send_str(socket, "\r\n"); - - uint32_t total_read = 0; - while (total_read < total_length) { - uint8_t data_buffer[64]; - size_t quantity_read; - f_read(&active_file, data_buffer, 64, &quantity_read); - total_read += quantity_read; - uint32_t send_offset = 0; - while (send_offset < quantity_read) { - int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset); - if (sent < 0) { - if (sent == -EAGAIN) { - sent = 0; - } else { - ESP_LOGE(TAG, "file send error %d", sent); - break; - } - } - send_offset += sent; - } - } - ESP_LOGW(TAG, "file return done"); - if (total_read < total_length) { - socketpool_socket_close(socket); - } - - f_close(&active_file); - } - } - } - } else if (memcmp(request->path, "/cp/", 4) == 0) { - ESP_LOGW(TAG, "circuitpython %s %s", request->method, request->path + 3); - const char *path = request->path + 3; - if (strcmp(request->method, "GET") != 0) { - // Return error if not a GET - } - if (strcmp(path, "/devices.json") == 0) { - mdns_remoteservice_obj_t found_devices[32]; - size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices)); - size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices)); - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _send_chunk(socket, "{\"total\": "); - char total_encoded[4]; - snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); - _send_chunk(socket, total_encoded); - _send_chunk(socket, ", \"devices\": ["); - ESP_LOGW(TAG, "%d total devices", total_results); - for (size_t i = 0; i < count; i++) { - if (i > 0) { - _send_chunk(socket, ","); - } - _send_chunk(socket, "{\"hostname\": \""); - _send_chunk(socket, common_hal_mdns_remoteservice_get_hostname(&found_devices[i])); - _send_chunk(socket, "\", \"instance_name\": \""); - _send_chunk(socket, common_hal_mdns_remoteservice_get_instance_name(&found_devices[i])); - _send_chunk(socket, "\", \"port\": "); - char port_encoded[4]; - int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]); - snprintf(port_encoded, sizeof(port_encoded), "%d", port); - _send_chunk(socket, port_encoded); - _send_chunk(socket, "}"); - common_hal_mdns_remoteservice_deinit(&found_devices[i]); - } - _send_chunk(socket, "]}"); - // Empty chunk signals the end of the response. - _send_chunk(socket, ""); - } else if (strcmp(path, "/version.json") == 0) { - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _send_chunk(socket, "{\"web_api_version\": 1, \"version\": \""); - _send_chunk(socket, MICROPY_GIT_TAG); - _send_chunk(socket, "\", \"build_date\": \""); - _send_chunk(socket, MICROPY_BUILD_DATE); - _send_chunk(socket, "\", \"board_name\": \""); - _send_chunk(socket, MICROPY_HW_BOARD_NAME); - _send_chunk(socket, "\", \"mcu_name\": \""); - _send_chunk(socket, MICROPY_HW_MCU_NAME); - _send_chunk(socket, "\", \"board_id\": \""); - _send_chunk(socket, CIRCUITPY_BOARD_ID); - _send_chunk(socket, "\", \"creator_id\": "); - char encoded_id[8]; - snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATOR_ID); - _send_chunk(socket, encoded_id); - _send_chunk(socket, ", \"creation_id\": "); - snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); - _send_chunk(socket, encoded_id); - _send_chunk(socket, "}"); - // Empty chunk signals the end of the response. - _send_chunk(socket, ""); - } - } else { - const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; - int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - ESP_LOGW(TAG, "sent ok %d", sent); - } + _reply(socket, request); request->done = false; } @@ -663,7 +927,11 @@ void supervisor_web_workflow_background(void) { uint32_t ip; uint32_t port; int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port); - if (newsoc != -11) { + if (newsoc == -EBADF) { + common_hal_socketpool_socket_close(&listening); + return; + } + if (newsoc != -EAGAIN) { ESP_LOGI(TAG, "newsoc %d", newsoc); } if (newsoc > 0) { diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index fb946f468c..99088bc79a 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -20,6 +20,30 @@ SRC_SUPERVISOR = \ NO_USB ?= $(wildcard supervisor/usb.c) + +ifeq ($(CIRCUITPY_USB),1) +CIRCUITPY_CREATOR_ID ?= $(USB_VID) +CIRCUITPY_CREATION_ID ?= $(USB_PID) +endif + +ifneq ($(CIRCUITPY_CREATOR_ID),) +CFLAGS += -DCIRCUITPY_CREATOR_ID=$(CIRCUITPY_CREATOR_ID) +endif + +ifneq ($(CIRCUITPY_CREATION_ID),) +CFLAGS += -DCIRCUITPY_CREATION_ID=$(CIRCUITPY_CREATION_ID) +endif + +ifeq ($(CIRCUITPY_BLEIO),1) + SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c + ifeq ($(CIRCUITPY_BLE_FILE_SERVICE),1) + SRC_SUPERVISOR += supervisor/shared/bluetooth/file_transfer.c + endif + ifeq ($(CIRCUITPY_SERIAL_BLE),1) + SRC_SUPERVISOR += supervisor/shared/bluetooth/serial.c + endif +endif + INTERNAL_FLASH_FILESYSTEM ?= 0 CFLAGS += -DINTERNAL_FLASH_FILESYSTEM=$(INTERNAL_FLASH_FILESYSTEM) @@ -38,20 +62,6 @@ else SRC_SUPERVISOR += supervisor/shared/filesystem.c endif -ifeq ($(CIRCUITPY_BLEIO),1) - 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) - SRC_SUPERVISOR += supervisor/shared/bluetooth/file_transfer.c - endif - ifeq ($(CIRCUITPY_SERIAL_BLE),1) - SRC_SUPERVISOR += supervisor/shared/bluetooth/serial.c - endif -endif - # Choose which flash filesystem impl to use. # (Right now INTERNAL_FLASH_FILESYSTEM and (Q)SPI_FLASH_FILESYSTEM are mutually exclusive. # But that might not be true in the future.) From 964828398e662e935b8de52c3d7a179110844ae4 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 21 Jun 2022 16:18:34 -0700 Subject: [PATCH 0502/2403] JSON directory API --- supervisor/shared/web_workflow/web_workflow.c | 64 ++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index b3aa5d1f13..c8b8c630db 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -34,6 +34,7 @@ #include "shared-bindings/wifi/Radio.h" #include "shared-module/storage/__init__.h" +#include "shared/timeutils/timeutils.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" #include "supervisor/usb.h" @@ -77,6 +78,7 @@ typedef struct { bool done; bool authenticated; bool expect; + bool json; } _request; static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE; @@ -381,6 +383,59 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, const char *path) { _send_str(socket, "\r\n\r\n"); } +static void _reply_directory_json(socketpool_socket_obj_t *socket, FF_DIR *dir, const char *request_path, const char *path) { + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" + "Content-Type: application/json\r\n\r\n"; + socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_chunk(socket, "["); + bool first = true; + + FILINFO file_info; + char *fn = file_info.fname; + FRESULT res = f_readdir(dir, &file_info); + while (res == FR_OK && fn[0] != 0) { + if (!first) { + _send_chunk(socket, ","); + } + _send_chunk(socket, "{\"name\": \""); + _send_chunk(socket, file_info.fname); + _send_chunk(socket, "\", \"directory\": "); + if ((file_info.fattrib & AM_DIR) != 0) { + _send_chunk(socket, "true"); + } else { + _send_chunk(socket, "false"); + } + // We use nanoseconds past Jan 1, 1970 for consistency with BLE API and + // LittleFS. + _send_chunk(socket, ", \"modified_ns\": "); + + uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9), + (file_info.fdate >> 5) & 0xf, + file_info.fdate & 0x1f, + file_info.ftime >> 11, + (file_info.ftime >> 5) & 0x1f, + (file_info.ftime & 0x1f) * 2) * 1000000000ULL; + + char encoded_number[32]; + snprintf(encoded_number, sizeof(encoded_number), "%lld", truncated_time); + _send_chunk(socket, encoded_number); + + _send_chunk(socket, ", \"file_size\": "); + size_t file_size = 0; + if ((file_info.fattrib & AM_DIR) == 0) { + file_size = file_info.fsize; + } + snprintf(encoded_number, sizeof(encoded_number), "%d", file_size); + _send_chunk(socket, encoded_number); + + _send_chunk(socket, "}"); + first = false; + res = f_readdir(dir, &file_info); + } + _send_chunk(socket, "]"); + _send_chunk(socket, ""); +} + static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir, const char *request_path, const char *path) { const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" "Content-Type: text/html\r\n\r\n"; @@ -737,7 +792,12 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { _reply_missing(socket); return; } - _reply_directory_html(socket, &dir, request->path, path); + if (request->json) { + _reply_directory_json(socket, &dir, request->path, path); + } else { + _reply_directory_html(socket, &dir, request->path, path); + } + f_closedir(&dir); } else if (strcmp(request->method, "PUT") == 0) { if (_usb_active()) { @@ -884,6 +944,8 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) request->content_length = strtoul(request->header_value, NULL, 10); } else if (strcmp(request->header_key, "Expect") == 0) { request->expect = strcmp(request->header_value, "100-continue") == 0; + } else if (strcmp(request->header_key, "Accept") == 0) { + request->json = strcmp(request->header_value, "application/json") == 0; } ESP_LOGW(TAG, "Header %s %s", request->header_key, request->header_value); } else if (request->offset > sizeof(request->header_value) - 1) { From d6eaaafee8725ef3bce43b454a41c83a65894bef Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 21 Jun 2022 17:02:01 -0700 Subject: [PATCH 0503/2403] Basic JS --- supervisor/shared/web_workflow/web_workflow.c | 19 ++++++------- tools/circuitpython.js | 27 +++++++++++++++++++ 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 tools/circuitpython.js diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index c8b8c630db..28662fdbb7 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -442,7 +442,9 @@ static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir, socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); _send_chunk(socket, ""); _send_chunk(socket, path); - _send_chunk(socket, "

    "); + _send_chunk(socket, ""); + _send_chunk(socket, ""); + _send_chunk(socket, "

    "); _send_chunk(socket, path); _send_chunk(socket, "

    ");
     if (strlen(path) > 1) {
@@ -468,7 +470,6 @@ static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir,
         //     entry->file_size = file_info.fsize;
         // }
         // _send_chunk(socket, "
  • ");
-        bool editable = false;
         if ((file_info.fattrib & AM_DIR) != 0) {
             _send_chunk(socket, "🗀\t");
         } else if (_endswith(file_info.fname, ".txt") ||
@@ -476,10 +477,8 @@ static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir,
                    _endswith(file_info.fname, ".js") ||
                    _endswith(file_info.fname, ".json")) {
             _send_chunk(socket, "🖹\t");
-            editable = true;
         } else if (_endswith(file_info.fname, ".html")) {
             _send_chunk(socket, "🌐\t");
-            editable = true;
         } else {
             _send_chunk(socket, "⬇\t");
         }
@@ -494,13 +493,15 @@ static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir,
 
         _send_chunk(socket, file_info.fname);
         _send_chunk(socket, "");
-        if (editable) {
-            _send_chunk(socket, "✏️");
-        }
-        _send_chunk(socket, "🗑️
    ");
+        _send_chunk(socket, "
    ");
         res = f_readdir(dir, &file_info);
     }
-    _send_chunk(socket, "
    • Upload:"); + _send_chunk(socket, "
    "); + + _send_chunk(socket, "
    +🗀"); + _send_chunk(socket, ""); _send_chunk(socket, ""); } diff --git a/tools/circuitpython.js b/tools/circuitpython.js new file mode 100644 index 0000000000..7574799292 --- /dev/null +++ b/tools/circuitpython.js @@ -0,0 +1,27 @@ +console.log("Hello world"); + +function mkdir(e) { + console.log("mkdir"); + console.log(e); +} + +function upload(e) { + console.log("upload"); + console.log(e); +} + +function del(e) { + console.log("delete"); + console.log(e); + if (confirm("Delete" + e.target.value + "?")) { + console.log("do it"); + } +} + +document.getElementById("mkdir").onclick = mkdir; +document.getElementById("upload").onclick = upload; + +const collection = document.getElementsByClassName("delete"); +for (let i = 0; i < collection.length; i++) { + collection[i].onclick = del; +} From eeb9b7881e07076c17286c19ecab28829e37517c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 21 Jun 2022 17:20:34 -0700 Subject: [PATCH 0504/2403] Disable/enable buttons --- supervisor/shared/web_workflow/web_workflow.c | 2 +- tools/circuitpython.js | 27 ++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 28662fdbb7..70f5c572d6 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -500,7 +500,7 @@ static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir, } _send_chunk(socket, "
    "); - _send_chunk(socket, "
    +🗀"); + _send_chunk(socket, "
    +🗀 "); _send_chunk(socket, ""); _send_chunk(socket, ""); } diff --git a/tools/circuitpython.js b/tools/circuitpython.js index 7574799292..b92cdc40f1 100644 --- a/tools/circuitpython.js +++ b/tools/circuitpython.js @@ -1,5 +1,9 @@ console.log("Hello world"); +let new_directory_name = document.getElementById("name"); +let files = document.getElementById("files"); + + function mkdir(e) { console.log("mkdir"); console.log(e); @@ -7,19 +11,34 @@ function mkdir(e) { function upload(e) { console.log("upload"); - console.log(e); + console.log(files.files); } function del(e) { console.log("delete"); console.log(e); - if (confirm("Delete" + e.target.value + "?")) { + if (confirm("Delete " + e.target.value + " and all of its contents?")) { console.log("do it"); } } -document.getElementById("mkdir").onclick = mkdir; -document.getElementById("upload").onclick = upload; +let mkdir_button = document.getElementById("mkdir"); +mkdir_button.onclick = mkdir; + +let upload_button = document.getElementById("upload"); +upload_button.onclick = upload; + +upload_button.disabled = files.files.length == 0; + +files.onchange = () => { + upload_button.disabled = files.files.length == 0; +} + +mkdir_button.disabled = new_directory_name.value.length == 0; + +new_directory_name.oninput = () => { + mkdir_button.disabled = new_directory_name.value.length == 0; +} const collection = document.getElementsByClassName("delete"); for (let i = 0; i < collection.length; i++) { From 7543dd9af088afa7c0513c04b88839828cd18a1e Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 22 Jun 2022 16:44:41 -0700 Subject: [PATCH 0505/2403] CORS works and autoreload too --- .../espressif/common-hal/socketpool/Socket.c | 18 +- ports/espressif/common-hal/wifi/__init__.c | 1 + supervisor/shared/reload.h | 3 +- supervisor/shared/web_workflow/web_workflow.c | 326 ++++++++++-------- tools/circuitpython.js | 159 ++++++++- tools/directory.html | 4 + 6 files changed, 338 insertions(+), 173 deletions(-) create mode 100644 tools/directory.html diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index d09800811d..fcfc95873c 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -44,6 +44,7 @@ static const char *TAG = "socket"; STATIC socketpool_socket_obj_t *open_socket_handles[CONFIG_LWIP_MAX_SOCKETS]; void socket_user_reset(void) { + ESP_LOGW(TAG, "Reset sockets"); for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) { if (open_socket_handles[i]) { if (open_socket_handles[i]->num > 0) { @@ -74,16 +75,14 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_ uint64_t start_ticks = supervisor_ticks_ms64(); // Allow timeouts and interrupts - while (newsoc == -1 && - !timed_out && - !mp_hal_is_interrupted()) { + while (newsoc == -1 && !timed_out) { if (self->timeout_ms != (uint)-1 && self->timeout_ms != 0) { timed_out = supervisor_ticks_ms64() - start_ticks >= self->timeout_ms; } RUN_BACKGROUND_TASKS; newsoc = lwip_accept(self->num, (struct sockaddr *)&accept_addr, &socklen); // In non-blocking mode, fail instead of timing out - if (newsoc == -1 && self->timeout_ms == 0) { + if (newsoc == -1 && (self->timeout_ms == 0 || mp_hal_is_interrupted())) { if (errno != EAGAIN) { ESP_LOGE(TAG, "accept failed %d", errno); } @@ -283,8 +282,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self, uint64_t start_ticks = supervisor_ticks_ms64(); received = -1; while (received == -1 && - !timed_out && - !mp_hal_is_interrupted()) { + !timed_out) { if (self->timeout_ms != (uint)-1 && self->timeout_ms != 0) { timed_out = supervisor_ticks_ms64() - start_ticks >= self->timeout_ms; } @@ -301,6 +299,14 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self, } return -MP_EAGAIN; } + // Check this after going through the loop once so it can make + // progress while interrupted. + if (mp_hal_is_interrupted()) { + if (received == -1) { + return -MP_EAGAIN; + } + break; + } } } else { return -MP_EBADF; diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index 61af5b774f..a827e3ba64 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -168,6 +168,7 @@ void common_hal_wifi_init(bool user_initiated) { void wifi_user_reset(void) { if (wifi_user_initiated) { + ESP_LOGW(TAG, "Reset wifi"); wifi_reset(); } } diff --git a/supervisor/shared/reload.h b/supervisor/shared/reload.h index cb3385e7ca..fb5e04961a 100644 --- a/supervisor/shared/reload.h +++ b/supervisor/shared/reload.h @@ -43,7 +43,8 @@ enum { enum { AUTORELOAD_SUSPEND_REPL = 0x1, AUTORELOAD_SUSPEND_BLE = 0x2, - AUTORELOAD_SUSPEND_USB = 0x4 + AUTORELOAD_SUSPEND_USB = 0x4, + AUTORELOAD_SUSPEND_WEB = 0x8 }; typedef struct { diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 70f5c572d6..736ff915ee 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -35,6 +35,7 @@ #include "shared-bindings/wifi/Radio.h" #include "shared-module/storage/__init__.h" #include "shared/timeutils/timeutils.h" +#include "supervisor/shared/reload.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" #include "supervisor/usb.h" @@ -72,10 +73,14 @@ typedef struct { char path[256]; char header_key[64]; char header_value[64]; + // We store the origin so we can reply back with it. + char origin[64]; size_t content_length; size_t offset; + uint64_t timestamp_ms; bool redirect; bool done; + bool in_progress; bool authenticated; bool expect; bool json; @@ -221,6 +226,7 @@ void supervisor_start_web_workflow(void) { pool.base.type = &socketpool_socketpool_type; common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj); + ESP_LOGW(TAG, "Starting web workflow"); listening.base.type = &socketpool_socket_type; socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening); common_hal_socketpool_socket_settimeout(&listening, 0); @@ -274,32 +280,27 @@ void supervisor_start_web_workflow(void) { #endif } -static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { - char encoded_len[sizeof(size_t) * 2 + 1]; - int len = snprintf(encoded_len, sizeof(encoded_len), "%X", strlen(chunk)); - int sent = socketpool_socket_send(socket, (const uint8_t *)encoded_len, len); +static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) { + int sent = -EAGAIN; + while (sent == -EAGAIN) { + sent = socketpool_socket_send(socket, buf, len); + } if (sent < len) { ESP_LOGE(TAG, "short send %d %d", sent, len); } - sent = socketpool_socket_send(socket, (const uint8_t *)"\r\n", 2); - if (sent < 2) { - ESP_LOGE(TAG, "short send %d %d", sent, 2); - } - sent = socketpool_socket_send(socket, (const uint8_t *)chunk, strlen(chunk)); - if (sent < (int)strlen(chunk)) { - ESP_LOGE(TAG, "short send %d %d", sent, strlen(chunk)); - } - sent = socketpool_socket_send(socket, (const uint8_t *)"\r\n", 2); - if (sent < 2) { - ESP_LOGE(TAG, "short send %d %d", sent, 2); - } } static void _send_str(socketpool_socket_obj_t *socket, const char *str) { - int sent = socketpool_socket_send(socket, (const uint8_t *)str, strlen(str)); - if (sent < (int)strlen(str)) { - ESP_LOGE(TAG, "short send %d %d", sent, strlen(str)); - } + _send_raw(socket, (const uint8_t *)str, strlen(str)); +} + +static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { + char encoded_len[sizeof(size_t) * 2 + 1]; + int len = snprintf(encoded_len, sizeof(encoded_len), "%X", strlen(chunk)); + _send_raw(socket, (const uint8_t *)encoded_len, len); + _send_raw(socket, (const uint8_t *)"\r\n", 2); + _send_raw(socket, (const uint8_t *)chunk, strlen(chunk)); + _send_raw(socket, (const uint8_t *)"\r\n", 2); } static bool _endswith(const char *str, const char *suffix) { @@ -312,67 +313,112 @@ static bool _endswith(const char *str, const char *suffix) { return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0; } -static void _reply_continue(socketpool_socket_obj_t *socket) { - const char *response = "HTTP/1.1 100 Continue\r\n\r\n"; - _send_str(socket, response); +static void _cors_header(socketpool_socket_obj_t *socket, _request *request) { + bool origin_ok = false; + #if CIRCUITPY_DEBUG + origin_ok = true; + #endif + _send_str(socket, "Access-Control-Allow-Credentials: true\r\nVary: Origin\r\n"); + if (origin_ok) { + _send_str(socket, "Access-Control-Allow-Origin: "); + _send_str(socket, request->origin); + _send_str(socket, "\r\n"); + } } -static void _reply_created(socketpool_socket_obj_t *socket) { +static void _reply_continue(socketpool_socket_obj_t *socket, _request *request) { + const char *response = "HTTP/1.1 100 Continue\r\n"; + _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); +} + +static void _reply_created(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 201 Created\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_no_content(socketpool_socket_obj_t *socket) { +static void _reply_no_content(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 204 No Content\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_missing(socketpool_socket_obj_t *socket) { +static void _reply_access_control(socketpool_socket_obj_t *socket, _request *request) { + const char *response = "HTTP/1.1 204 No Content\r\n" + "Content-Length: 0\r\n" + "Access-Control-Allow-Methods: PUT, GET, DELETE, OPTIONS\r\n" + "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n"; + _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); +} + +static void _reply_missing(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 404 Not Found\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_forbidden(socketpool_socket_obj_t *socket) { +static void _reply_forbidden(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 403 Forbidden\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_conflict(socketpool_socket_obj_t *socket) { +static void _reply_conflict(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 409 Conflict\r\n" - "Content-Length: 19\r\n\r\nUSB storage active."; + "Content-Length: 19\r\n"; + _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\nUSB storage active."); } -static void _reply_payload_too_large(socketpool_socket_obj_t *socket) { +static void _reply_payload_too_large(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 413 Payload Too Large\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_expectation_failed(socketpool_socket_obj_t *socket) { +static void _reply_expectation_failed(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 417 Expectation Failed\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_unauthorized(socketpool_socket_obj_t *socket) { +static void _reply_unauthorized(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 401 Unauthorized\r\n" "Content-Length: 0\r\n" - "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n\r\n"; + "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n"; + _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_server_error(socketpool_socket_obj_t *socket) { +static void _reply_server_error(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 500 Internal Server Error\r\n" - "Content-Length: 0\r\n\r\n"; + "Content-Length: 0\r\n"; _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_redirect(socketpool_socket_obj_t *socket, const char *path) { +static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request, const char *path) { const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; int nodelay = 1; lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); @@ -380,13 +426,17 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, const char *path) { _send_str(socket, common_hal_mdns_server_get_hostname(&mdns)); _send_str(socket, ".local"); _send_str(socket, path); - _send_str(socket, "\r\n\r\n"); + _send_str(socket, "\r\n"); + _cors_header(socket, request); + _send_str(socket, "\r\n"); } -static void _reply_directory_json(socketpool_socket_obj_t *socket, FF_DIR *dir, const char *request_path, const char *path) { +static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) { const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: application/json\r\n\r\n"; + "Content-Type: application/json\r\n"; socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _cors_header(socket, request); + _send_str(socket, "\r\n"); _send_chunk(socket, "["); bool first = true; @@ -436,76 +486,23 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, FF_DIR *dir, _send_chunk(socket, ""); } -static void _reply_directory_html(socketpool_socket_obj_t *socket, FF_DIR *dir, const char *request_path, const char *path) { +static void _reply_directory_html(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) { const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: text/html\r\n\r\n"; + "Content-Type: text/html\r\n"; socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _send_chunk(socket, ""); - _send_chunk(socket, path); - _send_chunk(socket, ""); + _cors_header(socket, request); + _send_str(socket, "\r\n"); + _send_chunk(socket, ""); _send_chunk(socket, ""); - _send_chunk(socket, "

    "); - _send_chunk(socket, path); - _send_chunk(socket, "

    ");
-    if (strlen(path) > 1) {
-        _send_chunk(socket, "🗀\t..
    ");
-    }
+    _send_chunk(socket, "
    ");
+    _send_chunk(socket, "
    TypeSizePathModified
    ");
 
-    FILINFO file_info;
-    char *fn = file_info.fname;
-    FRESULT res = f_readdir(dir, &file_info);
-    while (res == FR_OK && fn[0] != 0) {
-        // uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
-        //     (file_info.fdate >> 5) & 0xf,
-        //     file_info.fdate & 0x1f,
-        //     file_info.ftime >> 11,
-        //     (file_info.ftime >> 5) & 0x1f,
-        //     (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
-        // entry->truncated_time = truncated_time;
-        // 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;
-        // }
-        // _send_chunk(socket, "
  • ");
-        if ((file_info.fattrib & AM_DIR) != 0) {
-            _send_chunk(socket, "🗀\t");
-        } else if (_endswith(file_info.fname, ".txt") ||
-                   _endswith(file_info.fname, ".py") ||
-                   _endswith(file_info.fname, ".js") ||
-                   _endswith(file_info.fname, ".json")) {
-            _send_chunk(socket, "🖹\t");
-        } else if (_endswith(file_info.fname, ".html")) {
-            _send_chunk(socket, "🌐\t");
-        } else {
-            _send_chunk(socket, "⬇\t");
-        }
-
-        _send_chunk(socket, "");
-
-        _send_chunk(socket, file_info.fname);
-        _send_chunk(socket, "");
-        _send_chunk(socket, "
    ");
-        res = f_readdir(dir, &file_info);
-    }
-    _send_chunk(socket, "
    • "); - - _send_chunk(socket, "
    +🗀 "); + _send_chunk(socket, "
    +🗀 "); _send_chunk(socket, ""); _send_chunk(socket, ""); } -static void _reply_with_file(socketpool_socket_obj_t *socket, const char *filename, FIL *active_file) { +static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request, const char *filename, FIL *active_file) { uint32_t total_length = f_size(active_file); char encoded_len[10]; snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); @@ -524,6 +521,7 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, const char *filena } else { _send_str(socket, "Content-Type: application/octet-stream\r\n"); } + _cors_header(socket, request); _send_str(socket, "\r\n"); uint32_t total_read = 0; @@ -552,12 +550,14 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, const char *filena } } -static void _reply_with_devices_json(socketpool_socket_obj_t *socket) { +static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *request) { mdns_remoteservice_obj_t found_devices[32]; size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices)); size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices)); - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n"; socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _cors_header(socket, request); + _send_str(socket, "\r\n"); _send_chunk(socket, "{\"total\": "); char total_encoded[4]; snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); @@ -585,9 +585,11 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket) { _send_chunk(socket, ""); } -static void _reply_with_version_json(socketpool_socket_obj_t *socket) { - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n\r\n"; +static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *request) { + const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n"; socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _cors_header(socket, request); + _send_str(socket, "\r\n"); _send_chunk(socket, "{\"web_api_version\": 1, \"version\": \""); _send_chunk(socket, MICROPY_GIT_TAG); _send_chunk(socket, "\", \"build_date\": \""); @@ -658,7 +660,7 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req FIL active_file; if (_usb_active()) { - _reply_conflict(socket); + _reply_conflict(socket, request); return; } FRESULT result = f_open(fs, &active_file, path, FA_WRITE); @@ -670,9 +672,9 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req if (result != FR_OK) { ESP_LOGW(TAG, "file write error %d %s", result, path); - _reply_server_error(socket); + _reply_server_error(socket, request); } else if (request->expect) { - _reply_continue(socket); + _reply_continue(socket, request); } // Change the file size to start. @@ -684,9 +686,9 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req #endif // Too large. if (request->expect) { - _reply_expectation_failed(socket); + _reply_expectation_failed(socket, request); } else { - _reply_payload_too_large(socket); + _reply_payload_too_large(socket, request); } return; @@ -722,22 +724,22 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req usb_msc_unlock(); #endif if (new_file) { - _reply_created(socket); + _reply_created(socket, request); } else { - _reply_no_content(socket); + _reply_no_content(socket, request); } } -static void _reply(socketpool_socket_obj_t *socket, _request *request) { +static bool _reply(socketpool_socket_obj_t *socket, _request *request) { if (request->redirect) { - _reply_redirect(socket, request->path); + _reply_redirect(socket, request, request->path); } else if (memcmp(request->path, "/fs/", 4) == 0) { if (!request->authenticated) { ESP_LOGW(TAG, "not authed"); if (_api_password[0] != '\0') { - _reply_unauthorized(socket); + _reply_unauthorized(socket, request); } else { - _reply_forbidden(socket); + _reply_forbidden(socket, request); } } else { ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); @@ -755,10 +757,12 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { } // Delete is almost identical for files and directories so share the // implementation. - if (strcmp(request->method, "DELETE") == 0) { + if (strcmp(request->method, "OPTIONS") == 0) { + _reply_access_control(socket, request); + } else if (strcmp(request->method, "DELETE") == 0) { if (_usb_active()) { - _reply_conflict(socket); - return; + _reply_conflict(socket, request); + return false; } FILINFO file; @@ -773,12 +777,13 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { } if (result == FR_NO_PATH || result == FR_NO_FILE) { - _reply_missing(socket); + _reply_missing(socket, request); } else if (result != FR_OK) { ESP_LOGW(TAG, "rm error %d %s", result, path); - _reply_server_error(socket); + _reply_server_error(socket, request); } else { - _reply_no_content(socket); + _reply_no_content(socket, request); + return true; } } else if (directory) { if (strcmp(request->method, "GET") == 0) { @@ -790,20 +795,20 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { } if (res != FR_OK) { ESP_LOGW(TAG, "unable to open %d %s", res, path); - _reply_missing(socket); - return; + _reply_missing(socket, request); + return false; } if (request->json) { - _reply_directory_json(socket, &dir, request->path, path); + _reply_directory_json(socket, request, &dir, request->path, path); } else { - _reply_directory_html(socket, &dir, request->path, path); + _reply_directory_html(socket, request, &dir, request->path, path); } f_closedir(&dir); } else if (strcmp(request->method, "PUT") == 0) { if (_usb_active()) { - _reply_conflict(socket); - return; + _reply_conflict(socket, request); + return false; } FRESULT result = f_mkdir(fs, path); @@ -811,14 +816,15 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { usb_msc_unlock(); #endif if (result == FR_EXIST) { - _reply_no_content(socket); + _reply_no_content(socket, request); } else if (result == FR_NO_PATH) { - _reply_missing(socket); + _reply_missing(socket, request); } else if (result != FR_OK) { ESP_LOGE(TAG, "mkdir error %d %s", result, path); - _reply_server_error(socket); + _reply_server_error(socket, request); } else { - _reply_created(socket); + _reply_created(socket, request); + return true; } } } else { // Dealing with a file. @@ -828,14 +834,15 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { if (result != FR_OK) { // TODO: 404 - _reply_missing(socket); + _reply_missing(socket, request); } else { - _reply_with_file(socket, path, &active_file); + _reply_with_file(socket, request, path, &active_file); } f_close(&active_file); } else if (strcmp(request->method, "PUT") == 0) { _write_file_and_reply(socket, request, fs, path); + return true; } } } @@ -846,15 +853,16 @@ static void _reply(socketpool_socket_obj_t *socket, _request *request) { // Return error if not a GET } if (strcmp(path, "/devices.json") == 0) { - _reply_with_devices_json(socket); + _reply_with_devices_json(socket, request); } else if (strcmp(path, "/version.json") == 0) { - _reply_with_version_json(socket); + _reply_with_version_json(socket, request); } } else { const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); ESP_LOGW(TAG, "sent ok %d", sent); } + return false; } static void _process_request(socketpool_socket_obj_t *socket, _request *request) { @@ -865,12 +873,16 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) while (more && !error) { int len = socketpool_socket_recv_into(socket, &c, 1); if (len != 1) { - if (len != -EAGAIN && len != -EBADF) { + if (len != -EAGAIN && len != -EBADF && len != -EPERM) { ESP_LOGW(TAG, "received %d", len); } more = false; break; } + if (!request->in_progress) { + autoreload_suspend(AUTORELOAD_SUSPEND_WEB); + request->in_progress = true; + } // ESP_LOGI(TAG, "%c", c); switch (request->state) { case STATE_METHOD: { @@ -947,6 +959,11 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) request->expect = strcmp(request->header_value, "100-continue") == 0; } else if (strcmp(request->header_key, "Accept") == 0) { request->json = strcmp(request->header_value, "application/json") == 0; + } else if (strcmp(request->header_key, "Origin") == 0) { + strcpy(request->origin, request->header_value); + } else if (strcmp(request->header_key, "X-Timestamp") == 0) { + request->timestamp_ms = strtoul(request->header_value, NULL, 10); + ; } ESP_LOGW(TAG, "Header %s %s", request->header_key, request->header_value); } else if (request->offset > sizeof(request->header_value) - 1) { @@ -974,23 +991,27 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) if (!request->done) { return; } - _reply(socket, request); + bool reload = _reply(socket, request); + ESP_LOGI(TAG, "request done"); request->done = false; + request->in_progress = false; + autoreload_resume(AUTORELOAD_SUSPEND_WEB); + if (reload) { + autoreload_trigger(); + } } void supervisor_web_workflow_background(void) { // Otherwise, see if we have another socket to accept. - if (!common_hal_socketpool_socket_get_connected(&active) && + if ((!common_hal_socketpool_socket_get_connected(&active) || !active_request.in_progress) && !common_hal_socketpool_socket_get_closed(&listening) && listening.num > 0) { - if (!common_hal_socketpool_socket_get_closed(&active)) { - common_hal_socketpool_socket_close(&active); - } uint32_t ip; uint32_t port; int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port); if (newsoc == -EBADF) { + ESP_LOGW(TAG, "Closing listening socket"); common_hal_socketpool_socket_close(&listening); return; } @@ -998,6 +1019,11 @@ void supervisor_web_workflow_background(void) { ESP_LOGI(TAG, "newsoc %d", newsoc); } if (newsoc > 0) { + // Close the active socket because we have another we accepted. + if (!common_hal_socketpool_socket_get_closed(&active)) { + ESP_LOGW(TAG, "Closing active socket"); + common_hal_socketpool_socket_close(&active); + } ESP_LOGE(TAG, "Accepted socket %d", newsoc); // TODO: Don't do this because it uses the private struct layout. // Create the socket @@ -1005,13 +1031,15 @@ void supervisor_web_workflow_background(void) { active.pool = &pool; active.connected = true; - common_hal_socketpool_socket_settimeout(&active, 0); active_request.state = STATE_METHOD; active_request.offset = 0; active_request.done = false; + active_request.in_progress = false; active_request.redirect = false; + active_request.origin[0] = '\0'; + active_request.timestamp_ms = 0; lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK); } diff --git a/tools/circuitpython.js b/tools/circuitpython.js index b92cdc40f1..73e7caa05a 100644 --- a/tools/circuitpython.js +++ b/tools/circuitpython.js @@ -1,27 +1,155 @@ -console.log("Hello world"); - let new_directory_name = document.getElementById("name"); let files = document.getElementById("files"); +var url_base = window.location; +var current_path; -function mkdir(e) { - console.log("mkdir"); - console.log(e); +async function refresh_list() { + current_path = window.location.hash.substr(1); + if (current_path == "") { + current_path = "/"; + } + const response = await fetch(new URL("/fs" + current_path, url_base), + { + headers: { + "Accept": "application/json" + }, + credentials: "include" + } + ); + const data = await response.json(); + console.log(data); + var new_children = []; + var template = document.querySelector('#row'); + + if (window.location.path != "/fs/") { + var clone = template.content.cloneNode(true); + var td = clone.querySelectorAll("td"); + td[0].textContent = "🗀"; + var path = clone.querySelector("a"); + let parent = new URL("..", "file://" + current_path); + path.href = "#" + parent.pathname; + path.textContent = ".."; + // Remove the delete button + td[4].replaceChildren(); + new_children.push(clone); + } + + for (const f of data) { + // Clone the new row and insert it into the table + var clone = template.content.cloneNode(true); + var td = clone.querySelectorAll("td"); + var icon = "⬇"; + var file_path = current_path + f.name; + let api_url = new URL("/fs" + file_path, url_base); + if (f.directory) { + file_path = "#" + file_path + "/"; + api_url += "/"; + } else { + file_path = api_url; + } + + if (f.directory) { + icon = "🗀"; + } else if(f.name.endsWith(".txt") || + f.name.endsWith(".py") || + f.name.endsWith(".js") || + f.name.endsWith(".json")) { + icon = "🖹"; + } else if (f.name.endsWith(".html")) { + icon = "🌐"; + } + td[0].textContent = icon; + td[1].textContent = f.file_size; + var path = clone.querySelector("a"); + path.href = file_path; + path.textContent = f.name; + td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString(); + var delete_button = clone.querySelector("button.delete"); + delete_button.value = api_url; + delete_button.onclick = del; + + new_children.push(clone); + } + var tbody = document.querySelector("tbody"); + tbody.replaceChildren(...new_children); } -function upload(e) { - console.log("upload"); - console.log(files.files); +async function find_devices() { + const response = await fetch("http://circuitpython.local/cp/devices.json"); + let url = new URL("/", response.url); + console.log(response, url); + url_base = url.href; + const data = await response.json(); + console.log(data); + refresh_list(); } -function del(e) { - console.log("delete"); - console.log(e); - if (confirm("Delete " + e.target.value + " and all of its contents?")) { - console.log("do it"); +async function mkdir(e) { + const response = await fetch( + new URL("/fs" + current_path + new_directory_name.value + "/", url_base), + { + method: "PUT", + headers: { + 'X-Timestamp': Date.now() + } + } + ); + if (response.ok) { + refresh_list(); + new_directory_name.value = ""; + mkdir_button.disabled = true; } } +async function upload(e) { + console.log("upload"); + for (const file of files.files) { + console.log(file); + let file_path = new URL("/fs" + current_path + file.name, url_base); + const response = await fetch(file_path, + { + method: "PUT", + headers: { + 'Content-Type': 'application/octet-stream', + 'X-Timestamp': file.lastModified + }, + body: file + } + ) + if (response.ok) { + refresh_list(); + console.log(files); + files.value = ""; + upload_button.disabled = true; + } + } +} + +async function del(e) { + console.log("delete"); + console.log(e); + let fn = new URL(e.target.value); + var prompt = "Delete " + fn.pathname.substr(3); + if (e.target.value.endsWith("/")) { + prompt += " and all of its contents?"; + } else { + prompt += "?"; + } + if (confirm(prompt)) { + const response = await fetch(e.target.value, + { + method: "DELETE" + } + ) + if (response.ok) { + refresh_list(); + } + } +} + +find_devices(); + let mkdir_button = document.getElementById("mkdir"); mkdir_button.onclick = mkdir; @@ -40,7 +168,4 @@ new_directory_name.oninput = () => { mkdir_button.disabled = new_directory_name.value.length == 0; } -const collection = document.getElementsByClassName("delete"); -for (let i = 0; i < collection.length; i++) { - collection[i].onclick = del; -} +window.onhashchange = refresh_list; diff --git a/tools/directory.html b/tools/directory.html new file mode 100644 index 0000000000..40aa204757 --- /dev/null +++ b/tools/directory.html @@ -0,0 +1,4 @@ + + +

    TypeSizePathModified
    +🗀  + From 3cd05291d04995e4ddb5dc410f72508b0cb1dfb5 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 23 Jun 2022 16:32:42 -0700 Subject: [PATCH 0506/2403] Static files + welcome page --- .../espressif/common-hal/mdns/RemoteService.c | 28 ++++ shared-bindings/mdns/RemoteService.h | 4 + .../web_workflow/static/blinka_16x16.ico | Bin 0 -> 318 bytes .../web_workflow/static}/directory.html | 2 +- .../shared/web_workflow/static/directory.js | 23 ++- .../shared/web_workflow/static/welcome.html | 21 +++ .../shared/web_workflow/static/welcome.js | 62 ++++++++ supervisor/shared/web_workflow/web_workflow.c | 150 ++++++++++++------ supervisor/supervisor.mk | 12 +- tools/gen_web_workflow_static.py | 36 +++++ 10 files changed, 273 insertions(+), 65 deletions(-) create mode 100644 supervisor/shared/web_workflow/static/blinka_16x16.ico rename {tools => supervisor/shared/web_workflow/static}/directory.html (88%) rename tools/circuitpython.js => supervisor/shared/web_workflow/static/directory.js (90%) create mode 100644 supervisor/shared/web_workflow/static/welcome.html create mode 100644 supervisor/shared/web_workflow/static/welcome.js create mode 100644 tools/gen_web_workflow_static.py diff --git a/ports/espressif/common-hal/mdns/RemoteService.c b/ports/espressif/common-hal/mdns/RemoteService.c index 1d80c738bd..a19fe8cc20 100644 --- a/ports/espressif/common-hal/mdns/RemoteService.c +++ b/ports/espressif/common-hal/mdns/RemoteService.c @@ -26,6 +26,8 @@ #include "shared-bindings/mdns/RemoteService.h" +#include "shared-bindings/ipaddress/IPv4Address.h" + const char *common_hal_mdns_remoteservice_get_service_type(mdns_remoteservice_obj_t *self) { if (self->result == NULL) { return ""; @@ -61,6 +63,32 @@ mp_int_t common_hal_mdns_remoteservice_get_port(mdns_remoteservice_obj_t *self) return self->result->port; } +uint32_t mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self) { + if (self->result == NULL || + self->result->ip_protocol != MDNS_IP_PROTOCOL_V4 || + self->result->addr == NULL) { + return 0; + } + mdns_ip_addr_t *cur = self->result->addr; + while (cur != NULL) { + if (cur->addr.type == ESP_IPADDR_TYPE_V4) { + return cur->addr.u_addr.ip4.addr; + } + + cur = cur->next; + } + + return 0; +} + +mp_obj_t common_hal_mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self) { + uint32_t addr = mdns_remoteservice_get_ipv4(self); + if (addr == 0) { + return mp_const_none; + } + return common_hal_ipaddress_new_ipv4address(addr); +} + void common_hal_mdns_remoteservice_deinit(mdns_remoteservice_obj_t *self) { mdns_query_results_free(self->result); self->result = NULL; diff --git a/shared-bindings/mdns/RemoteService.h b/shared-bindings/mdns/RemoteService.h index f751b683ed..5a9d3d5e5b 100644 --- a/shared-bindings/mdns/RemoteService.h +++ b/shared-bindings/mdns/RemoteService.h @@ -38,4 +38,8 @@ const char *common_hal_mdns_remoteservice_get_protocol(mdns_remoteservice_obj_t const char *common_hal_mdns_remoteservice_get_instance_name(mdns_remoteservice_obj_t *self); const char *common_hal_mdns_remoteservice_get_hostname(mdns_remoteservice_obj_t *self); mp_int_t common_hal_mdns_remoteservice_get_port(mdns_remoteservice_obj_t *self); +mp_obj_t common_hal_mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self); void common_hal_mdns_remoteservice_deinit(mdns_remoteservice_obj_t *self); + +// For internal use. +uint32_t mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self); diff --git a/supervisor/shared/web_workflow/static/blinka_16x16.ico b/supervisor/shared/web_workflow/static/blinka_16x16.ico new file mode 100644 index 0000000000000000000000000000000000000000..ff2937dfee32c98d6a34162b96e5d8b4ee8aafe6 GIT binary patch literal 318 zcmZ{fu}T9$6h-gGfMo^?+sIUlrL$d-4Ve+GC01)2wlI}NB3RjM`m7&dXJ?ZEi)q5* zhxiG`N<HYMX~zRyXl#7ft3uVT~Gu!kQNqyfCl5U>@S)=YSSD0G17(^w%NaXQTuC Pb%9L^{7eaRP19`w1vX@( literal 0 HcmV?d00001 diff --git a/tools/directory.html b/supervisor/shared/web_workflow/static/directory.html similarity index 88% rename from tools/directory.html rename to supervisor/shared/web_workflow/static/directory.html index 40aa204757..50d05e815d 100644 --- a/tools/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -1,4 +1,4 @@ - +

    TypeSizePathModified
    +🗀  diff --git a/tools/circuitpython.js b/supervisor/shared/web_workflow/static/directory.js similarity index 90% rename from tools/circuitpython.js rename to supervisor/shared/web_workflow/static/directory.js index 73e7caa05a..d053a28ba7 100644 --- a/tools/circuitpython.js +++ b/supervisor/shared/web_workflow/static/directory.js @@ -18,7 +18,6 @@ async function refresh_list() { } ); const data = await response.json(); - console.log(data); var new_children = []; var template = document.querySelector('#row'); @@ -76,12 +75,17 @@ async function refresh_list() { } async function find_devices() { - const response = await fetch("http://circuitpython.local/cp/devices.json"); - let url = new URL("/", response.url); - console.log(response, url); - url_base = url.href; - const data = await response.json(); - console.log(data); + const version_response = await fetch("/cp/version.json"); + if (version_response.ok) { + url_base = new URL("/", window.location).href; + } else { + // TODO: Remove this when we've settled things. It is only used when this file isn't hosted + // by a CP device. + const response = await fetch("http://circuitpython.local/cp/devices.json"); + let url = new URL("/", response.url); + url_base = url.href; + const data = await response.json(); + } refresh_list(); } @@ -103,9 +107,7 @@ async function mkdir(e) { } async function upload(e) { - console.log("upload"); for (const file of files.files) { - console.log(file); let file_path = new URL("/fs" + current_path + file.name, url_base); const response = await fetch(file_path, { @@ -119,7 +121,6 @@ async function upload(e) { ) if (response.ok) { refresh_list(); - console.log(files); files.value = ""; upload_button.disabled = true; } @@ -127,8 +128,6 @@ async function upload(e) { } async function del(e) { - console.log("delete"); - console.log(e); let fn = new URL(e.target.value); var prompt = "Delete " + fn.pathname.substr(3); if (e.target.value.endsWith("/")) { diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html new file mode 100644 index 0000000000..941d99df80 --- /dev/null +++ b/supervisor/shared/web_workflow/static/welcome.html @@ -0,0 +1,21 @@ + + + + CircuitPython + + + + +

    Welcome!

    + Welcome to CircuitPython's Web API. Through your browser you can work with files. Make sure you've set CIRCUITPY_WEB_API_PASSWORD in /.env and provide it when the browser prompts for it. Leave the username blank. +

    Device Info

    + Board:
    + Version:
    + Hostname:
    + IP: +

    Other Devices

    + Here are other CircuitPython devices on your network: +
      +
    + + diff --git a/supervisor/shared/web_workflow/static/welcome.js b/supervisor/shared/web_workflow/static/welcome.js new file mode 100644 index 0000000000..79efb7e9a8 --- /dev/null +++ b/supervisor/shared/web_workflow/static/welcome.js @@ -0,0 +1,62 @@ +var url_base = window.location; +var current_path; + +var mdns_works = window.location.hostname.endsWith(".local"); + +async function find_devices() { + var version_response = await fetch("/cp/version.json"); + if (version_response.ok) { + url_base = new URL("/", window.location).href; + } else { + // TODO: Remove this when we've settled things. It is only used when this file isn't hosted + // by a CP device. + version_response = await fetch("http://circuitpython.local/cp/version.json", {mode: "cors"}); + mdns_works = mdns_works || version_response.redirected; + if (!version_response.ok && version_response.redirected) { + version_response = await fetch(version_response.url); + } + let url = new URL("/", version_response.url); + url_base = url.href; + } + const version_info = await version_response.json(); + let version_span = document.querySelector("#version"); + version_span.textContent = version_info.version; + let board_link = document.querySelector("#board"); + board_link.href = "https://circuitpython.org/board/" + version_info.board_id + "/"; + board_link.textContent = version_info.board_name; + let hostname = document.querySelector("#hostname"); + var port = ""; + if (version_info.port != 80) { + port = ":" + version_info.port; + } + hostname.href = "http://" + version_info.hostname + ".local" + port + "/"; + hostname.textContent = version_info.hostname; + let ip = document.querySelector("#ip"); + ip.href = "http://" + version_info.ip + port + "/"; + ip.textContent = version_info.ip; + const response = await fetch(new URL("/cp/devices.json", url_base)); + const data = await response.json(); + let device_list = document.querySelector("#devices"); + let new_devices = []; + for (device of data.devices) { + let li = document.createElement("li"); + let a = document.createElement("a"); + li.appendChild(a); + var port = ""; + if (device.port != 80) { + port = ":" + version_info.port; + } + var server; + if (mdns_works) { + server = device.hostname + ".local"; + } else { + server = device.ip; + } + a.href = "http://" + server + port + "/"; + a.textContent = device.instance_name + " (" + device.hostname + ")"; + new_devices.push(li); + } + device_list.replaceChildren(...new_devices); +} + +find_devices(); diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 736ff915ee..0895e8b9a5 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -250,29 +250,10 @@ void supervisor_start_web_workflow(void) { active.num = -1; active.connected = false; - // Accept a connection and start parsing: - // * HTTP method - // * HTTP path - // * Headers we care about: - // * Authentication - // * Must match CIRCUITPY_WEB_AUTH - // * Host - // * IP - ok - // * cpy-mac.local - ok - // * circuitpython.local - redirect - // * Content-Length - // - // PUT /fs/ - // GET /fs/ - // - File contents - // - JSON directory representation - // GET /cp/devices.json - // - JSON list of MDNS results - // GET /cp/version.json - // - JSON version info + // TODO: // GET /cp/serial.txt // - Most recent 1k of serial output. - // GET / + // GET /edit/ // - Super basic editor // GET /ws/circuitpython // GET /ws/user @@ -313,17 +294,32 @@ static bool _endswith(const char *str, const char *suffix) { return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0; } -static void _cors_header(socketpool_socket_obj_t *socket, _request *request) { - bool origin_ok = false; +const char *ok_hosts[] = {"code.circuitpython.org"}; + +static bool _origin_ok(const char *origin) { #if CIRCUITPY_DEBUG - origin_ok = true; + return true; #endif - _send_str(socket, "Access-Control-Allow-Credentials: true\r\nVary: Origin\r\n"); - if (origin_ok) { - _send_str(socket, "Access-Control-Allow-Origin: "); - _send_str(socket, request->origin); - _send_str(socket, "\r\n"); + const char *localhost = "127.0.0.1:"; + const char *http = "http://"; + // This is a prefix check. + if (memcmp(origin + strlen(http), localhost, strlen(localhost)) == 0) { + return true; } + for (size_t i = 0; i < MP_ARRAY_SIZE(ok_hosts); i++) { + // This checks exactly. + if (strcmp(origin + strlen(http), ok_hosts[i]) == 0) { + return true; + } + } + return false; +} + +static void _cors_header(socketpool_socket_obj_t *socket, _request *request) { + _send_str(socket, "Access-Control-Allow-Credentials: true\r\nVary: Origin\r\n"); + _send_str(socket, "Access-Control-Allow-Origin: "); + _send_str(socket, request->origin); + _send_str(socket, "\r\n"); } static void _reply_continue(socketpool_socket_obj_t *socket, _request *request) { @@ -367,6 +363,14 @@ static void _reply_missing(socketpool_socket_obj_t *socket, _request *request) { _send_str(socket, "\r\n"); } +static void _reply_method_not_allowed(socketpool_socket_obj_t *socket, _request *request) { + const char *response = "HTTP/1.1 405 Method Not Allowed\r\n" + "Content-Length: 0\r\n"; + _send_str(socket, response); + _cors_header(socket, request); + _send_str(socket, "\r\n"); +} + static void _reply_forbidden(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 403 Forbidden\r\n" "Content-Length: 0\r\n"; @@ -486,22 +490,6 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req _send_chunk(socket, ""); } -static void _reply_directory_html(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) { - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: text/html\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - _cors_header(socket, request); - _send_str(socket, "\r\n"); - _send_chunk(socket, ""); - _send_chunk(socket, ""); - _send_chunk(socket, "

    "); - _send_chunk(socket, "
    TypeSizePathModified
    "); - - _send_chunk(socket, "
    +🗀 "); - _send_chunk(socket, ""); - _send_chunk(socket, ""); -} - static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request, const char *filename, FIL *active_file) { uint32_t total_length = f_size(active_file); char encoded_len[10]; @@ -577,7 +565,14 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request * int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]); snprintf(port_encoded, sizeof(port_encoded), "%d", port); _send_chunk(socket, port_encoded); - _send_chunk(socket, "}"); + _send_chunk(socket, ", \"ip\": \""); + + char ip_encoded[4 * 4]; + uint32_t ipv4_address = mdns_remoteservice_get_ipv4(&found_devices[i]); + uint8_t *octets = (uint8_t *)&ipv4_address; + snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + _send_chunk(socket, ip_encoded); + _send_chunk(socket, "\"}"); common_hal_mdns_remoteservice_deinit(&found_devices[i]); } _send_chunk(socket, "]}"); @@ -607,7 +602,17 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request * _send_chunk(socket, ", \"creation_id\": "); snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); _send_chunk(socket, encoded_id); - _send_chunk(socket, "}"); + _send_chunk(socket, ", \"hostname\": \""); + _send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns)); + _send_chunk(socket, "\", \"port\": 80"); + _send_chunk(socket, ", \"ip\": \""); + + char ip_encoded[4 * 4]; + uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj); + uint8_t *octets = (uint8_t *)&ipv4_address; + snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + _send_chunk(socket, ip_encoded); + _send_chunk(socket, "\"}"); // Empty chunk signals the end of the response. _send_chunk(socket, ""); } @@ -730,9 +735,36 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req } } +#define STATIC_FILE(filename) extern uint32_t filename##_length; extern uint8_t filename[]; extern const char *filename##_content_type; + +STATIC_FILE(directory_html); +STATIC_FILE(directory_js); +STATIC_FILE(welcome_html); +STATIC_FILE(welcome_js); +STATIC_FILE(blinka_16x16_ico); + +static void _reply_static(socketpool_socket_obj_t *socket, _request *request, const uint8_t *response, size_t response_len, const char *content_type) { + uint32_t total_length = response_len; + char encoded_len[10]; + snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); + + _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Length: "); + _send_str(socket, encoded_len); + _send_str(socket, "\r\n"); + _send_str(socket, "Content-Type: "); + _send_str(socket, content_type); + _send_str(socket, "\r\n"); + _send_str(socket, "\r\n"); + _send_raw(socket, response, response_len); +} + +#define _REPLY_STATIC(socket, request, filename) _reply_static(socket, request, filename, filename##_length, filename##_content_type) + static bool _reply(socketpool_socket_obj_t *socket, _request *request) { if (request->redirect) { _reply_redirect(socket, request, request->path); + } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) { + _reply_forbidden(socket, request); } else if (memcmp(request->path, "/fs/", 4) == 0) { if (!request->authenticated) { ESP_LOGW(TAG, "not authed"); @@ -800,8 +832,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { } if (request->json) { _reply_directory_json(socket, request, &dir, request->path, path); + } else if (pathlen == 1) { + _REPLY_STATIC(socket, request, directory_html); } else { - _reply_directory_html(socket, request, &dir, request->path, path); + _reply_missing(socket, request); } f_closedir(&dir); @@ -857,10 +891,24 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { } else if (strcmp(path, "/version.json") == 0) { _reply_with_version_json(socket, request); } + } else if (strcmp(request->method, "GET") != 0) { + _reply_method_not_allowed(socket, request); } else { - const char *ok_response = "HTTP/1.1 200 OK\r\nContent-Length: 11\r\nContent-Type: text/plain\r\n\r\nHello World"; - int sent = socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); - ESP_LOGW(TAG, "sent ok %d", sent); + if (strcmp(request->path, "/") == 0) { + // TODO: Autogenerate this based on the blinka bitmap and change the + // palette based on MAC address. + _REPLY_STATIC(socket, request, welcome_html); + } else if (strcmp(request->path, "/directory.js") == 0) { + _REPLY_STATIC(socket, request, directory_js); + } else if (strcmp(request->path, "/welcome.js") == 0) { + _REPLY_STATIC(socket, request, welcome_js); + } else if (strcmp(request->path, "/favicon.ico") == 0) { + // TODO: Autogenerate this based on the blinka bitmap and change the + // palette based on MAC address. + _REPLY_STATIC(socket, request, blinka_16x16_ico); + } else { + _reply_missing(socket, request); + } } return false; } diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 99088bc79a..e420472c14 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -159,8 +159,18 @@ ifeq ($(CIRCUITPY_USB),1) endif endif +STATIC_RESOURCES = $(wildcard $(TOP)/supervisor/shared/web_workflow/static/*) + +$(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) + $(STEPECHO) "GEN $@" + $(Q)$(PYTHON) $< \ + --output_c_file $@ \ + $(STATIC_RESOURCES) + ifeq ($(CIRCUITPY_WEB_WORKFLOW),1) SRC_SUPERVISOR += supervisor/shared/web_workflow/web_workflow.c + + SRC_SUPERVISOR += $(BUILD)/autogen_web_workflow_static.c endif SRC_TINYUSB = $(filter lib/tinyusb/%.c, $(SRC_SUPERVISOR)) @@ -217,4 +227,4 @@ $(BUILD)/autogen_display_resources-$(TRANSLATION).c: ../../tools/gen_display_res $(Q)$(PYTHON) ../../tools/gen_display_resources.py \ --font $(CIRCUITPY_DISPLAY_FONT) \ --sample_file $(TOP)/locale/$(TRANSLATION).po \ - --output_c_file $(BUILD)/autogen_display_resources-$(TRANSLATION).c + --output_c_file $@ diff --git a/tools/gen_web_workflow_static.py b/tools/gen_web_workflow_static.py new file mode 100644 index 0000000000..5f0febd084 --- /dev/null +++ b/tools/gen_web_workflow_static.py @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors) +# +# SPDX-License-Identifier: MIT + +import argparse +import gzip +import mimetypes +import pathlib + +parser = argparse.ArgumentParser(description="Generate displayio resources.") +parser.add_argument("--output_c_file", type=argparse.FileType("w"), required=True) +parser.add_argument("files", metavar="FILE", type=argparse.FileType("rb"), nargs="+") + +args = parser.parse_args() + + +c_file = args.output_c_file + +c_file.write(f"// Autogenerated by tools/gen_web_workflow_static.py\n") +c_file.write(f"#include \n\n") + +for f in args.files: + path = pathlib.Path(f.name) + variable = path.name.replace(".", "_") + uncompressed = f.read() + ulen = len(uncompressed) + compressed = gzip.compress(uncompressed) + clen = len(compressed) + compressed = ", ".join([hex(x) for x in compressed]) + mime = mimetypes.guess_type(f.name)[0] + + c_file.write(f"// {f.name}\n") + c_file.write(f"// Original length: {ulen} Compressed length: {clen}\n") + c_file.write(f"const uint32_t {variable}_length = {clen};\n") + c_file.write(f'const char* {variable}_content_type = "{mime}";\n') + c_file.write(f"const uint8_t {variable}[{clen}] = {{{compressed}}};\n\n") From 7acc5ebeb9a7139296ef142d1c371be85938890d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 24 Jun 2022 15:15:42 -0700 Subject: [PATCH 0507/2403] Add logo for going to home. Fix origin check --- ports/espressif/fatfs_port.c | 22 +- .../shared/web_workflow/static/directory.html | 2 +- .../shared/web_workflow/static/directory.js | 20 ++ .../shared/web_workflow/static/welcome.html | 2 +- supervisor/shared/web_workflow/web_workflow.c | 192 +++++++++++------- 5 files changed, 164 insertions(+), 74 deletions(-) diff --git a/ports/espressif/fatfs_port.c b/ports/espressif/fatfs_port.c index 631f7f0982..38c2d923b8 100644 --- a/ports/espressif/fatfs_port.c +++ b/ports/espressif/fatfs_port.c @@ -26,8 +26,26 @@ #include "py/runtime.h" #include "lib/oofatfs/ff.h" +#include "shared/timeutils/timeutils.h" +#include "shared-bindings/rtc/RTC.h" +#include "shared-bindings/time/__init__.h" +#include "supervisor/fatfs_port.h" +DWORD _time_override = 0; DWORD get_fattime(void) { - // TODO: Implement this function. For now, fake it. - return ((2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2); + if (_time_override > 0) { + return _time_override; + } + #if CIRCUITPY_RTC + timeutils_struct_time_t tm; + common_hal_rtc_get_time(&tm); + return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) | + (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1); + #else + return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2); + #endif +} + +void override_fattime(DWORD time) { + _time_override = time; } diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html index 50d05e815d..d6b28bc7de 100644 --- a/supervisor/shared/web_workflow/static/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -1,4 +1,4 @@ -

    TypeSizePathModified
    +🗀  +

     

    TypeSizePathModified
    +🗀  diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js index d053a28ba7..b193f1f950 100644 --- a/supervisor/shared/web_workflow/static/directory.js +++ b/supervisor/shared/web_workflow/static/directory.js @@ -3,12 +3,14 @@ let files = document.getElementById("files"); var url_base = window.location; var current_path; +var editable = undefined; async function refresh_list() { current_path = window.location.hash.substr(1); if (current_path == "") { current_path = "/"; } + // Do the fetch first because the browser will prompt for credentials. const response = await fetch(new URL("/fs" + current_path, url_base), { headers: { @@ -19,8 +21,24 @@ async function refresh_list() { ); const data = await response.json(); var new_children = []; + var title = document.querySelector("title"); + title.textContent = current_path; + var path = document.querySelector("#path"); + path.textContent = current_path; var template = document.querySelector('#row'); + if (editable === undefined) { + const status = await fetch(new URL("/fs/", url_base), + { + method: "OPTIONS", + credentials: "include" + } + ); + editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE"); + new_directory_name.disabled = !editable; + files.disabled = !editable; + } + if (window.location.path != "/fs/") { var clone = template.content.cloneNode(true); var td = clone.querySelectorAll("td"); @@ -66,8 +84,10 @@ async function refresh_list() { td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString(); var delete_button = clone.querySelector("button.delete"); delete_button.value = api_url; + delete_button.disabled = !editable; delete_button.onclick = del; + new_children.push(clone); } var tbody = document.querySelector("tbody"); diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html index 941d99df80..fc85c0cc2c 100644 --- a/supervisor/shared/web_workflow/static/welcome.html +++ b/supervisor/shared/web_workflow/static/welcome.html @@ -6,7 +6,7 @@ -

    Welcome!

    +

     Welcome!

    Welcome to CircuitPython's Web API. Through your browser you can work with files. Make sure you've set CIRCUITPY_WEB_API_PASSWORD in /.env and provide it when the browser prompts for it. Leave the username blank.

    Device Info

    Board:
    diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 0895e8b9a5..d5c1cf5a82 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -35,6 +35,7 @@ #include "shared-bindings/wifi/Radio.h" #include "shared-module/storage/__init__.h" #include "shared/timeutils/timeutils.h" +#include "supervisor/fatfs_port.h" #include "supervisor/shared/reload.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/web_workflow/web_workflow.h" @@ -54,6 +55,7 @@ #include "shared-module/dotenv/__init__.h" #endif +// TODO: Remove ESP specific stuff. For now, it is useful as we refine the server. #include "esp_log.h" static const char *TAG = "CP webserver"; @@ -98,6 +100,9 @@ static _request active_request; static char _api_password[64]; +static uint32_t _encoded_ip = 0; +static char _our_ip_encoded[4 * 4]; + // in_len is the number of bytes to encode. out_len is the number of bytes we // have to do it. static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) { @@ -170,8 +175,13 @@ void supervisor_web_workflow_status(void) { } else if (ipv4_address == 0) { serial_write_compressed(translate("No IP")); } else { - uint8_t *octets = (uint8_t *)&ipv4_address; - mp_printf(&mp_plat_print, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + if (_encoded_ip != ipv4_address) { + uint8_t *octets = (uint8_t *)&ipv4_address; + snprintf(_our_ip_encoded, sizeof(_our_ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); + _encoded_ip = ipv4_address; + } + + mp_printf(&mp_plat_print, "%s", _our_ip_encoded); // TODO: Use these unicode to show signal strength: ▂▄▆█ } } else { @@ -226,7 +236,7 @@ void supervisor_start_web_workflow(void) { pool.base.type = &socketpool_socketpool_type; common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj); - ESP_LOGW(TAG, "Starting web workflow"); + ESP_LOGI(TAG, "Starting web workflow"); listening.base.type = &socketpool_socket_type; socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening); common_hal_socketpool_socket_settimeout(&listening, 0); @@ -239,13 +249,9 @@ void supervisor_start_web_workflow(void) { if (api_password_len > 0) { _api_password[0] = ':'; _api_password[api_password_len + 1] = '\0'; - ESP_LOGW(TAG, "password before: %s", _api_password); _base64_in_place(_api_password, api_password_len + 1, sizeof(_api_password)); - ESP_LOGW(TAG, "password encoded: %s", _api_password); } - ESP_LOGW(TAG, "listening on socket %d", listening.num); - active.base.type = &socketpool_socket_type; active.num = -1; active.connected = false; @@ -297,15 +303,32 @@ static bool _endswith(const char *str, const char *suffix) { const char *ok_hosts[] = {"code.circuitpython.org"}; static bool _origin_ok(const char *origin) { - #if CIRCUITPY_DEBUG - return true; - #endif - const char *localhost = "127.0.0.1:"; const char *http = "http://"; - // This is a prefix check. + const char *local = ".local"; + + if (memcmp(origin, http, strlen(http)) != 0) { + return false; + } + // These are prefix checks up to : so that any port works. + const char *hostname = common_hal_mdns_server_get_hostname(&mdns); + const char *end = origin + strlen(http) + strlen(hostname) + strlen(local); + if (memcmp(origin + strlen(http), hostname, strlen(hostname)) == 0 && + memcmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 && + (end[0] == '\0' || end[0] == ':')) { + return true; + } + + end = origin + strlen(http) + strlen(_our_ip_encoded); + if (memcmp(origin + strlen(http), _our_ip_encoded, strlen(_our_ip_encoded)) == 0 && + (end[0] == '\0' || end[0] == ':')) { + return true; + } + + const char *localhost = "127.0.0.1:"; if (memcmp(origin + strlen(http), localhost, strlen(localhost)) == 0) { return true; } + for (size_t i = 0; i < MP_ARRAY_SIZE(ok_hosts); i++) { // This checks exactly. if (strcmp(origin + strlen(http), ok_hosts[i]) == 0) { @@ -315,6 +338,16 @@ static bool _origin_ok(const char *origin) { return false; } +STATIC bool _usb_active(void) { + // Check to see if USB has already been mounted. If not, then we "eject" from USB until we're done. + #if CIRCUITPY_USB && CIRCUITPY_USB_MSC + if (storage_usb_enabled() && !usb_msc_lock()) { + return true; + } + #endif + return false; +} + static void _cors_header(socketpool_socket_obj_t *socket, _request *request) { _send_str(socket, "Access-Control-Allow-Credentials: true\r\nVary: Origin\r\n"); _send_str(socket, "Access-Control-Allow-Origin: "); @@ -348,9 +381,18 @@ static void _reply_no_content(socketpool_socket_obj_t *socket, _request *request static void _reply_access_control(socketpool_socket_obj_t *socket, _request *request) { const char *response = "HTTP/1.1 204 No Content\r\n" "Content-Length: 0\r\n" - "Access-Control-Allow-Methods: PUT, GET, DELETE, OPTIONS\r\n" - "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n"; + "Access-Control-Expose-Headers: Access-Control-Allow-Methods\r\n" + "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n" + "Access-Control-Allow-Methods:GET, OPTIONS"; + _send_str(socket, response); + if (!_usb_active()) { + _send_str(socket, ", PUT, DELETE"); + } + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif + _send_str(socket, "\r\n"); _cors_header(socket, request); _send_str(socket, "\r\n"); } @@ -532,7 +574,6 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request, send_offset += sent; } } - ESP_LOGW(TAG, "file return done"); if (total_read < total_length) { socketpool_socket_close(socket); } @@ -551,7 +592,6 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request * snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); _send_chunk(socket, total_encoded); _send_chunk(socket, ", \"devices\": ["); - ESP_LOGW(TAG, "%d total devices", total_results); for (size_t i = 0; i < count; i++) { if (i > 0) { _send_chunk(socket, ","); @@ -606,27 +646,12 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request * _send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns)); _send_chunk(socket, "\", \"port\": 80"); _send_chunk(socket, ", \"ip\": \""); - - char ip_encoded[4 * 4]; - uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj); - uint8_t *octets = (uint8_t *)&ipv4_address; - snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); - _send_chunk(socket, ip_encoded); + _send_chunk(socket, _our_ip_encoded); _send_chunk(socket, "\"}"); // Empty chunk signals the end of the response. _send_chunk(socket, ""); } -STATIC bool _usb_active(void) { - // Check to see if USB has already been mounted. If not, then we "eject" from USB until we're done. - #if CIRCUITPY_USB && CIRCUITPY_USB_MSC - if (storage_usb_enabled() && !usb_msc_lock()) { - return true; - } - #endif - return false; -} - // Copied from ble file_transfer.c. We should share it. STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) { FF_DIR dir; @@ -661,13 +686,36 @@ STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) { return res; } +// FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution. +// This function truncates the time the time to a resolution storable by FATFS and fills in the +// FATFS encoded version into fattime. +STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { + timeutils_struct_time_t tm; + uint64_t seconds_since_epoch = timeutils_seconds_since_epoch_from_nanoseconds_since_1970(input_time); + timeutils_seconds_since_epoch_to_struct_time(seconds_since_epoch, &tm); + uint64_t truncated_time = timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970((seconds_since_epoch / 2) * 2 * 1000000000); + + *fattime = ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) | + (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1); + return truncated_time; +} + static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *request, FATFS *fs, const TCHAR *path) { FIL active_file; if (_usb_active()) { _reply_conflict(socket, request); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif return; } + if (request->timestamp_ms > 0) { + DWORD fattime; + truncate_time(request->timestamp_ms * 1000000, &fattime); + override_fattime(fattime); + } + FRESULT result = f_open(fs, &active_file, path, FA_WRITE); bool new_file = false; if (result == FR_NO_FILE) { @@ -676,7 +724,8 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req } if (result != FR_OK) { - ESP_LOGW(TAG, "file write error %d %s", result, path); + ESP_LOGE(TAG, "file write error %d %s", result, path); + override_fattime(0); _reply_server_error(socket, request); } else if (request->expect) { _reply_continue(socket, request); @@ -686,6 +735,7 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req f_lseek(&active_file, request->content_length); if (f_tell(&active_file) < request->content_length) { f_close(&active_file); + override_fattime(0); #if CIRCUITPY_USB_MSC usb_msc_unlock(); #endif @@ -711,7 +761,7 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req if (len == -EAGAIN) { continue; } else { - ESP_LOGW(TAG, "other error %d", len); + ESP_LOGE(TAG, "other error %d", len); } error = true; break; @@ -728,6 +778,8 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req #if CIRCUITPY_USB_MSC usb_msc_unlock(); #endif + + override_fattime(0); if (new_file) { _reply_created(socket, request); } else { @@ -767,14 +819,12 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { _reply_forbidden(socket, request); } else if (memcmp(request->path, "/fs/", 4) == 0) { if (!request->authenticated) { - ESP_LOGW(TAG, "not authed"); if (_api_password[0] != '\0') { _reply_unauthorized(socket, request); } else { _reply_forbidden(socket, request); } } else { - ESP_LOGW(TAG, "filesystem %s %s", request->method, request->path + 3); char *path = request->path + 3; size_t pathlen = strlen(path); FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs; @@ -794,6 +844,9 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { } else if (strcmp(request->method, "DELETE") == 0) { if (_usb_active()) { _reply_conflict(socket, request); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif return false; } @@ -811,7 +864,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { if (result == FR_NO_PATH || result == FR_NO_FILE) { _reply_missing(socket, request); } else if (result != FR_OK) { - ESP_LOGW(TAG, "rm error %d %s", result, path); + ESP_LOGE(TAG, "rm error %d %s", result, path); _reply_server_error(socket, request); } else { _reply_no_content(socket, request); @@ -826,7 +879,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { path[pathlen - 1] = '/'; } if (res != FR_OK) { - ESP_LOGW(TAG, "unable to open %d %s", res, path); _reply_missing(socket, request); return false; } @@ -842,10 +894,19 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { } else if (strcmp(request->method, "PUT") == 0) { if (_usb_active()) { _reply_conflict(socket, request); + #if CIRCUITPY_USB_MSC + usb_msc_unlock(); + #endif return false; } + if (request->timestamp_ms > 0) { + DWORD fattime; + truncate_time(request->timestamp_ms * 1000000, &fattime); + override_fattime(fattime); + } FRESULT result = f_mkdir(fs, path); + override_fattime(0); #if CIRCUITPY_USB_MSC usb_msc_unlock(); #endif @@ -881,12 +942,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { } } } else if (memcmp(request->path, "/cp/", 4) == 0) { - ESP_LOGW(TAG, "circuitpython %s %s", request->method, request->path + 3); const char *path = request->path + 3; if (strcmp(request->method, "GET") != 0) { - // Return error if not a GET - } - if (strcmp(path, "/devices.json") == 0) { + _reply_method_not_allowed(socket, request); + } else if (strcmp(path, "/devices.json") == 0) { _reply_with_devices_json(socket, request); } else if (strcmp(path, "/version.json") == 0) { _reply_with_version_json(socket, request); @@ -913,6 +972,20 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { return false; } +static void _reset_request(_request *request) { + request->state = STATE_METHOD; + request->origin[0] = '\0'; + request->content_length = 0; + request->offset = 0; + request->timestamp_ms = 0; + request->redirect = false; + request->done = false; + request->in_progress = false; + request->authenticated = false; + request->expect = false; + request->json = false; +} + static void _process_request(socketpool_socket_obj_t *socket, _request *request) { bool more = true; bool error = false; @@ -921,9 +994,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) while (more && !error) { int len = socketpool_socket_recv_into(socket, &c, 1); if (len != 1) { - if (len != -EAGAIN && len != -EBADF && len != -EPERM) { - ESP_LOGW(TAG, "received %d", len); - } more = false; break; } @@ -931,7 +1001,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) autoreload_suspend(AUTORELOAD_SUSPEND_WEB); request->in_progress = true; } - // ESP_LOGI(TAG, "%c", c); switch (request->state) { case STATE_METHOD: { if (c == ' ') { @@ -950,7 +1019,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) if (c == ' ') { request->path[request->offset] = '\0'; request->offset = 0; - ESP_LOGW(TAG, "Request %s %s", request->method, request->path); + ESP_LOGI(TAG, "Request %s %s", request->method, request->path); request->state = STATE_VERSION; } else if (request->offset > sizeof(request->path) - 1) { // Skip methods that are too long. @@ -1010,10 +1079,9 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) } else if (strcmp(request->header_key, "Origin") == 0) { strcpy(request->origin, request->header_value); } else if (strcmp(request->header_key, "X-Timestamp") == 0) { - request->timestamp_ms = strtoul(request->header_value, NULL, 10); - ; + request->timestamp_ms = strtoull(request->header_value, NULL, 10); } - ESP_LOGW(TAG, "Header %s %s", request->header_key, request->header_value); + ESP_LOGI(TAG, "Header %s %s", request->header_key, request->header_value); } else if (request->offset > sizeof(request->header_value) - 1) { // Skip methods that are too long. } else { @@ -1024,7 +1092,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) } case STATE_BODY: request->done = true; - request->state = STATE_METHOD; more = false; break; } @@ -1032,17 +1099,14 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request) if (error) { const char *error_response = "HTTP/1.1 501 Not Implemented\r\n\r\n"; int nodelay = 1; - int err = lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); - int sent = socketpool_socket_send(socket, (const uint8_t *)error_response, strlen(error_response)); - ESP_LOGW(TAG, "sent %d %d", sent, err); + lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); + socketpool_socket_send(socket, (const uint8_t *)error_response, strlen(error_response)); } if (!request->done) { return; } bool reload = _reply(socket, request); - ESP_LOGI(TAG, "request done"); - request->done = false; - request->in_progress = false; + _reset_request(request); autoreload_resume(AUTORELOAD_SUSPEND_WEB); if (reload) { autoreload_trigger(); @@ -1059,20 +1123,14 @@ void supervisor_web_workflow_background(void) { uint32_t port; int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port); if (newsoc == -EBADF) { - ESP_LOGW(TAG, "Closing listening socket"); common_hal_socketpool_socket_close(&listening); return; } - if (newsoc != -EAGAIN) { - ESP_LOGI(TAG, "newsoc %d", newsoc); - } if (newsoc > 0) { // Close the active socket because we have another we accepted. if (!common_hal_socketpool_socket_get_closed(&active)) { - ESP_LOGW(TAG, "Closing active socket"); common_hal_socketpool_socket_close(&active); } - ESP_LOGE(TAG, "Accepted socket %d", newsoc); // TODO: Don't do this because it uses the private struct layout. // Create the socket active.num = newsoc; @@ -1081,13 +1139,7 @@ void supervisor_web_workflow_background(void) { common_hal_socketpool_socket_settimeout(&active, 0); - active_request.state = STATE_METHOD; - active_request.offset = 0; - active_request.done = false; - active_request.in_progress = false; - active_request.redirect = false; - active_request.origin[0] = '\0'; - active_request.timestamp_ms = 0; + _reset_request(&active_request); lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK); } From 41039445c9440d87fa0c232030e91eee1d7f06f9 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 24 Jun 2022 17:02:11 -0700 Subject: [PATCH 0508/2403] Clean up and add docs --- docs/index.rst | 1 + docs/workflows.md | 267 ++++++++++++++++++ .../espressif/common-hal/mdns/RemoteService.c | 6 +- ports/espressif/common-hal/mdns/Server.c | 1 - .../espressif/common-hal/socketpool/Socket.c | 14 +- ports/espressif/common-hal/wifi/Radio.c | 21 +- ports/espressif/common-hal/wifi/__init__.c | 1 - .../esp-idf-config/sdkconfig.defaults | 2 +- shared-bindings/mdns/RemoteService.c | 13 + shared-bindings/mdns/RemoteService.h | 4 +- supervisor/shared/web_workflow/web_workflow.c | 2 +- 11 files changed, 296 insertions(+), 36 deletions(-) create mode 100644 docs/workflows.md diff --git a/docs/index.rst b/docs/index.rst index 6a67fe0b7c..a200a5238b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,6 +22,7 @@ Full Table of Contents supported_ports.rst troubleshooting.rst drivers.rst + workflows environment.rst .. toctree:: diff --git a/docs/workflows.md b/docs/workflows.md new file mode 100644 index 0000000000..74f35532e3 --- /dev/null +++ b/docs/workflows.md @@ -0,0 +1,267 @@ +# Workflows + +Workflows are the process used to 1) manipulate files on the CircuitPython device and 2) interact +with the serial connection to CircuitPython. The serial connection is usually used to access the +REPL. + +Starting with CircuitPython 3.x we moved to a USB-only workflow. Prior to that, we used the serial +connection alone to do the whole workflow. In CircuitPython 7.x, a BLE workflow was added with the +advantage of working with mobile devices. CircuitPython 8.x added a web workflow that works over the +local network (usually Wi-Fi) and a web browser. Other clients can also use the Web REST API. Boards +should clearly document which workflows are supported. + +Code for workflows lives in `supervisor/shared`. + +The workflow APIs are documented here. + +## USB + +These USB interfaces are enabled by default on boards with USB support. They are usable once the +device has been plugged into a host. + +### CIRCUITPY drive +CircuitPython exposes a standard mass storage (MSC) interface to enable file manipulation over a +standard interface. This interface works underneath the file system at the block level so using it +excludes other types of workflows from manipulating the file system at the same time. + +### CDC serial +CircuitPython exposes one CDC USB interface for CircuitPython serial. This is a standard serial +USB interface. + +TODO: Document how it designates itself from the user CDC. + +Setting baudrate 1200 and disconnecting will reboot into a bootloader. (Used by Arduino to trigger +a reset into bootloader.) + +## BLE + +The BLE workflow is enabled for nRF boards. By default, to prevent malicious access, it is disabled. +To connect to the BLE workflow, press the reset button while the status led blinks blue quickly +after the safe mode blinks. The board will restart and broadcast the file transfer service UUID +(`0xfebb`) along with the board's [Creation IDs](https://github.com/creationid/creators). This +public broadcast is done at a lower transmit level so the devices must be closer. On connection, the +device will need to pair and bond. Once bonded, the device will broadcast whenever disconnected +using a rotating key rather than a static one. Non-bonded devices won't be able to resolve it. After +connection, the central device can discover two default services. One for file transfer and one for +CircuitPython specifically that includes serial characteristics. + +### File Transfer API + +CircuitPython uses [an open File Transfer API](https://github.com/adafruit/Adafruit_CircuitPython_BLE_File_Transfer) +to enable file system access. + +### CircuitPython Service + +The base UUID for the CircuitPython service is `ADAFXXXX-4369-7263-7569-7450794686e`. The `XXXX` is +replaced by the four specific digits below. The service itself is `0001`. + +#### TX - `0002` / RX - `0003` + +These characteristic work just like the Nordic Uart Service (NUS) but have different UUIDs to prevent +conflicts with user created NUS services. + +#### Version - `0100` +Read-only characteristic that returns the UTF-8 encoded version string. + +## Web + +The web workflow is depends on adding Wi-Fi credentials into the `/.env` file. The keys are +`CIRCUITPY_WIFI_SSID` and `CIRCUITPY_WIFI_PASSWORD`. Once these are defined, CircuitPython will +automatically connect to the network and start the webserver used for the workflow. The webserver +is on port 80. It also enables MDNS. + +MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a device specific +hostname of the form `cpy-XXXXXX.local`. The `XXXXXX` is based on network MAC address. The device +also provides the MDNS service with service type `_circuitpython` and protocol `_tcp`. + +The web server is HTTP 1.1 and may use chunked responses so that it doesn't need to precompute +content length. + +### `/` +The root welcome page links to the file system page and also displays other CircuitPython devices +found using MDNS service discovery. This allows web browsers to find other devices from one. (All +devices will respond to `circuitpython.local` so the device redirected to may vary.) + +### CORS +The web server will allow requests from `cpy-XXXXXX.local`, `127.0.0.1`, the device's IP and +`code.circuitpython.org`. (`circuitpython.local` requests will be redirected to `cpy-XXXXXX.local`.) + +### File REST API +All file system related APIs are protected by HTTP basic authentication. It is *NOT* secure but will +hopefully prevent some griefing in shared settings. The password is sent unencrypted so do not reuse +a password with something important. + +The password is taken from `/.env` with the key `CIRCUITPY_WEB_API_PASSWORD`. If this is unset, the +server will respond with `403 Forbidden`. When a password is set, but not provided in a request, it +will respond `401 Unauthorized`. + +#### `/fs/` + +The `/fs/` page will respond with a directory browsing HTML once authenticated. This page is always +gzipped. If the `Accept: application/json` header is provided, then the JSON representation of the +root will be returned. + +#### OPTIONS +When requested with the `OPTIONS` method, the server will respond with . + +#### `/fs//` +Directory paths must end with a /. Otherwise, the path is assumed to be a file. + +##### GET +Returns a JSON representation of the directory. + +* `200 OK` - Directory exists and JSON returned +* `404 Not Found` - Missing directory + +##### PUT +Tries to make a directory at the given path. Request body is ignored. Returns: + +* `204 No Content` - Directory exists +* `201 Created` - Directory created +* `409 Conflict` - USB is active and preventing file system modification +* `404 Not Found` - Missing parent directory +* `500 Server Error` - Other, unhandled error + +Example: + +``sh +curl -v -u :passw0rd -X PUT -L --location-trusted http://circuitpython.local/fs/lib/hello/world/ +`` + +##### DELETE +Deletes the directory and all of its contents. + + +* `404 Not Found` - No directory +* `409 Conflict` - USB is active and preventing file system modification + +Example: + +``sh +curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world/ +`` + + +#### `/fs/` + +##### GET +Returns the raw file contents. `Content-Type` will be set based on extension: + +* `text/plain` - `.py`, `.txt` +* `text/javascript` - `.js` +* `text/html` - `.html` +* `application/json` - `.json` +* `application/octet-stream` - Everything else + +Will return: +* `200 OK` - File exists and file returned +* `404 Not Found` - Missing file + +##### PUT +Stores the provided content to the file path. Returns: + +* `201 Created` - File created and saved +* `204 No Content` - File existed and overwritten +* `404 Not Found` - Missing parent directory +* `409 Conflict` - USB is active and preventing file system modification +* `413 Payload Too Large` - `Expect` header not sent and file is too large +* `417 Expectation Failed` - `Expect` header sent and file is too large +* `500 Server Error` - Other, unhandled error + +If the client sends the `Expect` header, the server will reply with `100 Continue` when ok. + +##### DELETE +Deletes the file. + +* `404 Not Found` - File not found +* `409 Conflict` - USB is active and preventing file system modification + +Example: + +``sh +curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt +`` + +### `/cp/` + +`/cp/` serves basic info about the CircuitPython device and others discovered through MDNS. It is +not protected by basic auth in case the device is someone elses. + +Only `GET` requests are supported and will return `XXX Method Not Allowed` otherwise. + +#### `/cp/version.json` + +Returns information about the device. + +* `web_api_version`: Always `1`. This versions the rest of the API and new versions may not be backwards compatible. +* `version`: CircuitPython build version. +* `build_date`: CircuitPython build date. +* `board_name`: Human readable name of the board. +* `mcu_name`: Human readable name of the microcontroller. +* `board_id`: Board id used in code and on circuitpython.org. +* `creator_id`: Creator ID for the board. +* `creation_id`: Creation ID for the board, set by the creator. +* `hostname`: MDNS hostname. +* `port`: Port of CircuitPython Web Service. +* `ip`: IP address of the device. + +Example: +```sh +curl -v -L http://circuitpython.local/cp/version.json +``` + +```json +{ + "web_api_version": 1, + "version": "8.0.0-alpha.1-20-ge1d4518a9-dirty", + "build_date": "2022-06-24", + "board_name": "ESP32-S3-USB-OTG-N8", + "mcu_name": "ESP32S3", + "board_id": "espressif_esp32s3_usb_otg_n8", + "creator_id": 12346, + "creation_id": 28683, + "hostname": "cpy-f57ce8", + "port": 80, + "ip": "192.168.1.94" +} +``` + +#### `/cp/devices.json` + +Returns information about other devices found on the network using MDNS. + +* `total`: Total MDNS response count. May be more than in `devices` if internal limits were hit. +* `devices`: List of discovered devices. + * `hostname`: MDNS hostname + * `instance_name`: MDNS instance name. Defaults to human readable board name. + * `port`: Port of CircuitPython Web API + * `ip`: IP address + +Example: +```sh +curl -v -L http://circuitpython.local/cp/devices.json +``` + +```json +{ + "total": 1, + "devices": [ + { + "hostname": "cpy-951032", + "instance_name": "Adafruit Feather ESP32-S2 TFT", + "port": 80, + "ip": "192.168.1.235" + } + ] +} +``` + +### Static files + +* `/favicon.ico` - Blinka +* `/directory.js` - JavaScript for `/fs/` +* `/welcome.js` - JavaScript for `/` + +### WebSocket + +Coming soon! diff --git a/ports/espressif/common-hal/mdns/RemoteService.c b/ports/espressif/common-hal/mdns/RemoteService.c index a19fe8cc20..5a84c4a79b 100644 --- a/ports/espressif/common-hal/mdns/RemoteService.c +++ b/ports/espressif/common-hal/mdns/RemoteService.c @@ -63,7 +63,7 @@ mp_int_t common_hal_mdns_remoteservice_get_port(mdns_remoteservice_obj_t *self) return self->result->port; } -uint32_t mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self) { +uint32_t mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self) { if (self->result == NULL || self->result->ip_protocol != MDNS_IP_PROTOCOL_V4 || self->result->addr == NULL) { @@ -81,8 +81,8 @@ uint32_t mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self) { return 0; } -mp_obj_t common_hal_mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self) { - uint32_t addr = mdns_remoteservice_get_ipv4(self); +mp_obj_t common_hal_mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self) { + uint32_t addr = mdns_remoteservice_get_ipv4_address(self); if (addr == 0) { return mp_const_none; } diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c index 6cc562a34c..3c0070ae6f 100644 --- a/ports/espressif/common-hal/mdns/Server.c +++ b/ports/espressif/common-hal/mdns/Server.c @@ -49,7 +49,6 @@ void mdns_server_construct(mdns_server_obj_t *self, bool workflow) { if (workflow) { // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local" // queries as well. - // TODO: Allow for disabling this with `supervisor.disable_web_workflow()`. mdns_ip_addr_t our_ip; esp_netif_get_ip_info(common_hal_wifi_radio_obj.netif, &common_hal_wifi_radio_obj.ip_info); our_ip.next = NULL; diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index fcfc95873c..0774204bad 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -37,14 +37,9 @@ #include "components/lwip/lwip/src/include/lwip/sys.h" #include "components/lwip/lwip/src/include/lwip/netdb.h" -#include "esp_log.h" - -static const char *TAG = "socket"; - STATIC socketpool_socket_obj_t *open_socket_handles[CONFIG_LWIP_MAX_SOCKETS]; void socket_user_reset(void) { - ESP_LOGW(TAG, "Reset sockets"); for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) { if (open_socket_handles[i]) { if (open_socket_handles[i]->num > 0) { @@ -83,9 +78,6 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_ newsoc = lwip_accept(self->num, (struct sockaddr *)&accept_addr, &socklen); // In non-blocking mode, fail instead of timing out if (newsoc == -1 && (self->timeout_ms == 0 || mp_hal_is_interrupted())) { - if (errno != EAGAIN) { - ESP_LOGE(TAG, "accept failed %d", errno); - } return -MP_EAGAIN; } } @@ -227,9 +219,7 @@ bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) { } bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) { - int result = lwip_listen(self->num, backlog); - ESP_LOGE(TAG, "listen result %d", result); - return result == 0; + return lwip_listen(self->num, backlog); } mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *self, @@ -294,8 +284,6 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self, if (errno == ENOTCONN) { self->connected = false; return -MP_ENOTCONN; - } else if (errno != EAGAIN) { - ESP_LOGE(TAG, "recv %d", errno); } return -MP_EAGAIN; } diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index fae1f77514..94345fdf90 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -48,10 +48,6 @@ #define MAC_ADDRESS_LENGTH 6 -#include "esp_log.h" - -static const char *TAG = "radio"; - static void set_mode_station(wifi_radio_obj_t *self, bool state) { wifi_mode_t next_mode; if (state) { @@ -240,12 +236,11 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t if (!common_hal_wifi_radio_get_enabled(self)) { mp_raise_RuntimeError(translate("wifi is not enabled")); } - ESP_LOGI(TAG, "connect"); wifi_config_t *config = &self->sta_config; - // size_t timeout_ms = timeout * 1000; - // uint32_t start_time = common_hal_time_monotonic_ms(); - // uint32_t end_time = start_time + timeout_ms; + size_t timeout_ms = timeout * 1000; + uint32_t start_time = common_hal_time_monotonic_ms(); + uint32_t end_time = start_time + timeout_ms; EventBits_t bits; // can't block since both bits are false after wifi_init @@ -309,9 +304,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t esp_wifi_set_config(ESP_IF_WIFI_STA, config); self->starting_retries = 5; self->retries_left = 5; - ESP_LOGI(TAG, "wifi connect"); esp_wifi_connect(); - ESP_LOGI(TAG, "wifi connect done"); do { RUN_BACKGROUND_TASKS; @@ -321,11 +314,11 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t pdTRUE, 0); // Don't retry anymore if we're over our time budget. - // if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) { - // self->retries_left = 0; - // } + if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) { + self->retries_left = 0; + } } while ((bits & (WIFI_CONNECTED_BIT | WIFI_DISCONNECTED_BIT)) == 0 && !mp_hal_is_interrupted()); - ESP_LOGI(TAG, "connect done"); + if ((bits & WIFI_DISCONNECTED_BIT) != 0) { if (self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) { return WIFI_RADIO_ERROR_AUTH_FAIL; diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index a827e3ba64..61af5b774f 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -168,7 +168,6 @@ void common_hal_wifi_init(bool user_initiated) { void wifi_user_reset(void) { if (wifi_user_initiated) { - ESP_LOGW(TAG, "Reset wifi"); wifi_reset(); } } diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 121c20ad34..f30e8c1109 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -297,7 +297,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 +CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_INT_WDT_CHECK_CPU1=y # CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP_PANIC_HANDLER_IRAM is not set diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c index 846207b69b..49eda58557 100644 --- a/shared-bindings/mdns/RemoteService.c +++ b/shared-bindings/mdns/RemoteService.c @@ -106,6 +106,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_port_obj, remoteservice_ MP_PROPERTY_GETTER(mdns_remoteservice_port_obj, (mp_obj_t)&mdns_remoteservice_get_port_obj); +//| ipv4_address: Optional[ipaddress.IPv4Address] +//| """IP v4 Address of the remote service. None if no A records are found.""" +//| +STATIC mp_obj_t _mdns_remoteservice_get_ipv4_address(mp_obj_t self) { + return common_hal_mdns_remoteservice_get_ipv4_address(self); + +} +MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_ipv4_address_obj, _mdns_remoteservice_get_ipv4_address); + +MP_PROPERTY_GETTER(mdns_remoteservice_ipv4_address_obj, + (mp_obj_t)&mdns_remoteservice_get_ipv4_address_obj); + //| def __del__(self) -> None: //| """Deletes the RemoteService object.""" //| ... @@ -123,6 +135,7 @@ STATIC const mp_rom_map_elem_t mdns_remoteservice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_service_type), MP_ROM_PTR(&mdns_remoteservice_service_type_obj) }, { MP_ROM_QSTR(MP_QSTR_protocol), MP_ROM_PTR(&mdns_remoteservice_protocol_obj) }, { MP_ROM_QSTR(MP_QSTR_port), MP_ROM_PTR(&mdns_remoteservice_port_obj) }, + { MP_ROM_QSTR(MP_QSTR_ipv4_address), MP_ROM_PTR(&mdns_remoteservice_ipv4_address_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mdns_remoteservice_deinit_obj) }, }; diff --git a/shared-bindings/mdns/RemoteService.h b/shared-bindings/mdns/RemoteService.h index 5a9d3d5e5b..4783170e88 100644 --- a/shared-bindings/mdns/RemoteService.h +++ b/shared-bindings/mdns/RemoteService.h @@ -38,8 +38,8 @@ const char *common_hal_mdns_remoteservice_get_protocol(mdns_remoteservice_obj_t const char *common_hal_mdns_remoteservice_get_instance_name(mdns_remoteservice_obj_t *self); const char *common_hal_mdns_remoteservice_get_hostname(mdns_remoteservice_obj_t *self); mp_int_t common_hal_mdns_remoteservice_get_port(mdns_remoteservice_obj_t *self); -mp_obj_t common_hal_mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self); +mp_obj_t common_hal_mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self); void common_hal_mdns_remoteservice_deinit(mdns_remoteservice_obj_t *self); // For internal use. -uint32_t mdns_remoteservice_get_ipv4(mdns_remoteservice_obj_t *self); +uint32_t mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self); diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index d5c1cf5a82..1e1196ce4f 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -608,7 +608,7 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request * _send_chunk(socket, ", \"ip\": \""); char ip_encoded[4 * 4]; - uint32_t ipv4_address = mdns_remoteservice_get_ipv4(&found_devices[i]); + uint32_t ipv4_address = mdns_remoteservice_get_ipv4_address(&found_devices[i]); uint8_t *octets = (uint8_t *)&ipv4_address; snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); _send_chunk(socket, ip_encoded); From d19270e3188f1b32da020671c51d6a51713ea760 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 27 Jun 2022 13:31:29 -0700 Subject: [PATCH 0509/2403] Add docs and 404 in file PUT into non-existent dir --- docs/workflows.md | 128 +++++++++++++++--- supervisor/shared/web_workflow/web_workflow.c | 7 +- 2 files changed, 113 insertions(+), 22 deletions(-) diff --git a/docs/workflows.md b/docs/workflows.md index 74f35532e3..d5f951809d 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -74,9 +74,24 @@ MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a hostname of the form `cpy-XXXXXX.local`. The `XXXXXX` is based on network MAC address. The device also provides the MDNS service with service type `_circuitpython` and protocol `_tcp`. +### HTTP The web server is HTTP 1.1 and may use chunked responses so that it doesn't need to precompute content length. +The API generally consists of an HTTP method such as GET or PUT and a path. Requests and responses +also have headers. Responses will contain a status code and status text such as `404 Not Found`. +This API tries to use standard status codes to encode the status of the various operations. The +[Mozilla Developer Network HTTP docs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP) +are a great reference. + +#### Examples +The examples use `curl`, a common command line program for issuing HTTP requests. The examples below +use `circuitpython.local` as the easiest way to work. If you have multiple active devices, you'll +want to use the specific `cpy-XXXXXX.local` version. + +The examples also use `passw0rd` as the password placeholder. Replace it with your password before +running the example. + ### `/` The root welcome page links to the file system page and also displays other CircuitPython devices found using MDNS service discovery. This allows web browsers to find other devices from one. (All @@ -101,8 +116,17 @@ The `/fs/` page will respond with a directory browsing HTML once authenticated. gzipped. If the `Accept: application/json` header is provided, then the JSON representation of the root will be returned. -#### OPTIONS -When requested with the `OPTIONS` method, the server will respond with . +##### OPTIONS +When requested with the `OPTIONS` method, the server will respond with CORS related headers. Most +aren't needed for API use. They are there for the web browser. + +* `Access-Control-Allow-Methods` - Varies with USB state. `GET, OPTIONS` when USB is active. `GET, OPTIONS, PUT, DELETE` otherwise. + +Example: + +```sh +curl -v -u :passw0rd -X OPTIONS -L --location-trusted http://circuitpython.local/fs/ +``` #### `/fs//` Directory paths must end with a /. Otherwise, the path is assumed to be a file. @@ -111,39 +135,101 @@ Directory paths must end with a /. Otherwise, the path is assumed to be a file. Returns a JSON representation of the directory. * `200 OK` - Directory exists and JSON returned +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set * `404 Not Found` - Missing directory +Returns information about each file in the directory: + +* `name` - File name. No trailing `/` on directory names +* `directory` - `true` when a directory. `false` otherwise +* `modified_ns` - File modification time in nanoseconds since January 1st, 1970. May not use full resolution +* `file_size` - File size in bytes. `0` for directories + +Example: + +```sh +curl -v -u :passw0rd -H "Accept: application/json" -L --location-trusted http://circuitpython.local/fs/lib/hello/ +``` + +```json +[ + { + "name": "world.txt", + "directory": false, + "modified_ns": 946934328000000000, + "file_size": 12 + } +] +``` + ##### PUT -Tries to make a directory at the given path. Request body is ignored. Returns: +Tries to make a directory at the given path. Request body is ignored. The custom `X-Timestamp` +header can provide a timestamp in milliseconds since January 1st, 1970 (to match JavaScript's file +time resolution) used for the directories modification time. The RTC time will used otherwise. + +Returns: * `204 No Content` - Directory exists * `201 Created` - Directory created +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set * `409 Conflict` - USB is active and preventing file system modification * `404 Not Found` - Missing parent directory * `500 Server Error` - Other, unhandled error Example: -``sh +```sh curl -v -u :passw0rd -X PUT -L --location-trusted http://circuitpython.local/fs/lib/hello/world/ -`` +``` ##### DELETE Deletes the directory and all of its contents. - +* `204 No Content` - Directory and its contents deleted +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set * `404 Not Found` - No directory * `409 Conflict` - USB is active and preventing file system modification Example: -``sh +```sh curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world/ -`` +``` #### `/fs/` +##### PUT +Stores the provided content to the file path. + +The custom `X-Timestamp` header can provide a timestamp in milliseconds since January 1st, 1970 +(to match JavaScript's file time resolution) used for the directories modification time. The RTC +time will used otherwise. + +Returns: + +* `201 Created` - File created and saved +* `204 No Content` - File existed and overwritten +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set +* `404 Not Found` - Missing parent directory +* `409 Conflict` - USB is active and preventing file system modification +* `413 Payload Too Large` - `Expect` header not sent and file is too large +* `417 Expectation Failed` - `Expect` header sent and file is too large +* `500 Server Error` - Other, unhandled error + +If the client sends the `Expect` header, the server will reply with `100 Continue` when ok. + +Example: + +```sh +echo "Hello world" >> test.txt +curl -v -u :passw0rd -T test.txt -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt +``` + ##### GET Returns the raw file contents. `Content-Type` will be set based on extension: @@ -155,39 +241,39 @@ Returns the raw file contents. `Content-Type` will be set based on extension: Will return: * `200 OK` - File exists and file returned +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set * `404 Not Found` - Missing file -##### PUT -Stores the provided content to the file path. Returns: +Example: -* `201 Created` - File created and saved -* `204 No Content` - File existed and overwritten -* `404 Not Found` - Missing parent directory -* `409 Conflict` - USB is active and preventing file system modification -* `413 Payload Too Large` - `Expect` header not sent and file is too large -* `417 Expectation Failed` - `Expect` header sent and file is too large -* `500 Server Error` - Other, unhandled error +```sh +curl -v -u :passw0rd -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt +``` -If the client sends the `Expect` header, the server will reply with `100 Continue` when ok. ##### DELETE Deletes the file. + +* `204 No Content` - File existed and deleted +* `401 Unauthorized` - Incorrect password +* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set * `404 Not Found` - File not found * `409 Conflict` - USB is active and preventing file system modification Example: -``sh +```sh curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt -`` +``` ### `/cp/` `/cp/` serves basic info about the CircuitPython device and others discovered through MDNS. It is not protected by basic auth in case the device is someone elses. -Only `GET` requests are supported and will return `XXX Method Not Allowed` otherwise. +Only `GET` requests are supported and will return `405 Method Not Allowed` otherwise. #### `/cp/version.json` diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 1e1196ce4f..e902c4828a 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -723,10 +723,16 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req result = f_open(fs, &active_file, path, FA_WRITE | FA_OPEN_ALWAYS); } + if (result == FR_NO_PATH) { + override_fattime(0); + _reply_missing(socket, request); + return; + } if (result != FR_OK) { ESP_LOGE(TAG, "file write error %d %s", result, path); override_fattime(0); _reply_server_error(socket, request); + return; } else if (request->expect) { _reply_continue(socket, request); } @@ -928,7 +934,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) { FRESULT result = f_open(fs, &active_file, path, FA_READ); if (result != FR_OK) { - // TODO: 404 _reply_missing(socket, request); } else { _reply_with_file(socket, request, path, &active_file); From 08c93ad0ce0bfb307d1765dde911dc61b9a59fd1 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 27 Jun 2022 14:40:38 -0700 Subject: [PATCH 0510/2403] Fix creator ID and build order --- supervisor/shared/web_workflow/web_workflow.c | 6 +++--- supervisor/supervisor.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index e902c4828a..6e6b95d5e8 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -636,11 +636,11 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request * _send_chunk(socket, "\", \"board_id\": \""); _send_chunk(socket, CIRCUITPY_BOARD_ID); _send_chunk(socket, "\", \"creator_id\": "); - char encoded_id[8]; - snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATOR_ID); + char encoded_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0 + snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATOR_ID); _send_chunk(socket, encoded_id); _send_chunk(socket, ", \"creation_id\": "); - snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); + snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATION_ID); _send_chunk(socket, encoded_id); _send_chunk(socket, ", \"hostname\": \""); _send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns)); diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index e420472c14..45df5f687f 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -161,7 +161,7 @@ endif STATIC_RESOURCES = $(wildcard $(TOP)/supervisor/shared/web_workflow/static/*) -$(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) +$(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) | $(HEADER_BUILD) $(STEPECHO) "GEN $@" $(Q)$(PYTHON) $< \ --output_c_file $@ \ From 131d70cebd1697ff9199120f550e31832a67f140 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 28 Jun 2022 16:10:55 -0400 Subject: [PATCH 0511/2403] restore traceback to matrixportal build --- ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk index fdedf9bc9b..7178994d96 100644 --- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk @@ -15,7 +15,6 @@ CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_PARALLELDISPLAY = 0 CIRCUITPY_SDCARDIO = 0 CIRCUITPY_SHARPDISPLAY = 0 -CIRCUITPY_TRACEBACK = 0 CIRCUITPY_ZLIB=0 # Include these Python libraries in firmware. From ca649505031f77a02ee3f7473fc7c14d131e0fb4 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 28 Jun 2022 18:32:08 -0400 Subject: [PATCH 0512/2403] wip fixes --- ports/espressif/Makefile | 5 +++-- .../boards/adafruit_feather_esp32_v2/mpconfigboard.h | 3 +++ .../espressif/boards/adafruit_feather_esp32_v2/sdkconfig | 8 +------- ports/espressif/common-hal/alarm/touch/TouchAlarm.c | 4 ++-- ports/espressif/common-hal/microcontroller/Pin.c | 9 ++++++++- ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv | 4 ++-- ports/espressif/modules/esp32_pico_mini_02.c | 7 +++---- ports/espressif/tools/build_memory_info.py | 9 ++++++--- 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index f713e942e6..3280ffa105 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -388,8 +388,9 @@ BINARY_BLOBS += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a endif +# BOOTLOADER_OFFSET is determined by chip type, based on the ROM bootloader, and is not changeable. ifeq ($(IDF_TARGET),esp32) -BOOTLOADER_OFFSET = 0x0 +BOOTLOADER_OFFSET = 0x1000 else ifeq ($(IDF_TARGET),esp32c3) BOOTLOADER_OFFSET = 0x0 else ifeq ($(IDF_TARGET),esp32s3) @@ -412,7 +413,7 @@ ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld $(B FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE) -ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset +ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset --baud 460800 ifeq ($(UF2_BOOTLOADER),1) all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h index 886963028b..5a010cb5c7 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h @@ -46,3 +46,6 @@ // Explanation of how a user got into safe mode #define BOARD_USER_SAFE_MODE_ACTION translate("pressing SW38 button at start up.\n") + +#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO8) +#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO7) diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig index 94333353af..731ea37c4d 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig @@ -33,7 +33,7 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" # # ESP32-specific # -# CONFIG_ESP32_SPIRAM_SUPPORT is not set +CONFIG_ESP32_SPIRAM_SUPPORT=y # end of ESP32-specific # @@ -43,9 +43,3 @@ CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2" # end of LWIP # end of Component config - -# -# Deprecated options for backward compatibility -# -# CONFIG_SPIRAM_SUPPORT is not set -# end of Deprecated options for backward compatibility diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c index 0caeeea915..02f176cbf7 100644 --- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c +++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c @@ -132,11 +132,11 @@ void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alar #if defined(CONFIG_IDF_TARGET_ESP32) uint16_t touch_value; touch_pad_read(touch_channel, &touch_value); - touch_pad_set_thresh(touch_channel, touch_value * 0.1); // 10% + touch_pad_set_thresh(touch_channel, touch_value / 10); // 10% #else uint32_t touch_value; touch_pad_read_benchmark(touch_channel, &touch_value); - touch_pad_set_threshold(touch_channel, touch_value * 0.1); // 10% + touch_pad_set_thresh(touch_channel, touch_value / 10); // 10% #endif } } diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index 957ddd3492..995c281611 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -33,6 +33,10 @@ #include "components/driver/include/driver/gpio.h" #include "components/hal/include/hal/gpio_hal.h" +#include "esp_log.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + STATIC uint32_t never_reset_pins[2]; STATIC uint32_t in_use[2]; @@ -57,7 +61,7 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) { STATIC void _reset_pin(gpio_num_t pin_number) { // Never ever reset pins used for flash and RAM. #if defined(CONFIG_IDF_TARGET_ESP32) - if (pin_number == 6 || pin_number == 11 || pin_number == 9 || pin_number == 10) { + if (pin_number == 1 || pin_number == 6 || pin_number == 11 || pin_number == 9 || pin_number == 10 || pin_number == 17 || pin_number == 23) { return; } #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) @@ -129,12 +133,15 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) { } void reset_all_pins(void) { + ESP_LOGI("Pin.c", "reset_all_pins"); for (uint8_t i = 0; i < GPIO_PIN_COUNT; i++) { uint32_t iomux_address = GPIO_PIN_MUX_REG[i]; if (iomux_address == 0 || (never_reset_pins[i / 32] & (1 << i % 32)) != 0) { continue; } + ESP_LOGI("Pin.c", "about to reset pin %d", i); + vTaskDelay(100); _reset_pin(i); } in_use[0] = never_reset_pins[0]; diff --git a/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv index e7bfe0c51f..ba92d9fc73 100644 --- a/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv +++ b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv @@ -4,6 +4,6 @@ # partition table,, 0x8000, 4K nvs, data, nvs, 0x9000, 20K, otadata, data, ota, 0xe000, 8K, -ota_0, 0, ota_0, 0x10000, 2048K, -ota_1, 0, ota_1, 0x210000, 2048K, +ota_0, app, ota_0, 0x10000, 2048K, +ota_1, app, ota_1, 0x210000, 2048K, user_fs, data, fat, 0x410000, 4032K, diff --git a/ports/espressif/modules/esp32_pico_mini_02.c b/ports/espressif/modules/esp32_pico_mini_02.c index e115ca27e0..e94c22dd0b 100644 --- a/ports/espressif/modules/esp32_pico_mini_02.c +++ b/ports/espressif/modules/esp32_pico_mini_02.c @@ -27,11 +27,10 @@ #include "modules/module.h" void never_reset_module_internal_pins(void) { - // SPI Flash + // SPI Flash and PSRAM common_hal_never_reset_pin(&pin_GPIO6); - common_hal_never_reset_pin(&pin_GPIO11); - - // PSRAM common_hal_never_reset_pin(&pin_GPIO9); common_hal_never_reset_pin(&pin_GPIO10); + common_hal_never_reset_pin(&pin_GPIO11); + } diff --git a/ports/espressif/tools/build_memory_info.py b/ports/espressif/tools/build_memory_info.py index 4f5304a288..df9d6a801e 100644 --- a/ports/espressif/tools/build_memory_info.py +++ b/ports/espressif/tools/build_memory_info.py @@ -82,9 +82,12 @@ with open(sys.argv[2], "r") as f: elif subtype == "ota_0": ota = partition[4].strip() size = app if ota is None else ota - if size[-1] not in ("k", "K"): - raise RuntimeError("Unhandled partition size suffix") - firmware_region = int(size[:-1]) * 1024 + if size[-1] in ("k", "K"): + firmware_region = int(size[:-1]) * 1024 + elif size[-1] in ("m", "M"): + firmware_region = int(size[:-1]) * 1024 * 1024 + else: + raise RuntimeError("Unhandled partition size suffix:", size[-1]) regions = dict((name, 0) for name, _, _ in internal_memory[target]) From a8bb3eb557d1006b3fda0ebbf3f43eb8397cdcbe Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 28 Jun 2022 12:33:35 -0700 Subject: [PATCH 0513/2403] Update to newer 4.4 branch --- .gitmodules | 4 ++-- ports/espressif/esp-idf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0edcdec653..cf0d86f3ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -145,8 +145,8 @@ url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git [submodule "ports/espressif/esp-idf"] path = ports/espressif/esp-idf - url = https://github.com/espressif/esp-idf.git - branch = release/v4.4 + url = https://github.com/adafruit/esp-idf.git + branch = circuitpython8 [submodule "ports/espressif/certificates/nina-fw"] path = ports/espressif/certificates/nina-fw url = https://github.com/adafruit/nina-fw.git diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 944c01eef4..15dc9d9809 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 944c01eef4fbba693f991f9d033cda3f59ca82c9 +Subproject commit 15dc9d980946059cd5287207a7f1286c523216fb From 7608d90fcb4ffa0bb6919743915700a89e8c924e Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 28 Jun 2022 18:42:03 -0500 Subject: [PATCH 0514/2403] Use arm-none-eabi-gcc-action --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a9bd65d8d..8dc31a3ff6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -287,12 +287,13 @@ jobs: fetch-depth: 1 - name: Get CP deps run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }} + - uses: carlosperate/arm-none-eabi-gcc-action@v1 + with: + release: '10-2020-q4' - name: Install dependencies run: | sudo apt-get install -y gettext pip install -r requirements-ci.txt -r requirements-dev.txt - wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 - sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 - name: Versions run: | gcc --version @@ -487,8 +488,9 @@ jobs: pip install -r requirements-ci.txt -r requirements-dev.txt wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz - wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 - sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 + - uses: carlosperate/arm-none-eabi-gcc-action@v1 + with: + release: '10-2020-q4' - name: Install mkfs.fat run: | wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz From 780c4963cb7a216d7fb64b6f5aad6bfe33876fb2 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 28 Jun 2022 23:06:49 -0400 Subject: [PATCH 0515/2403] wip; change never-ever reset pin mechanism --- ports/espressif/Makefile | 1 - ports/espressif/README.rst | 7 +- .../adafruit_esp32s2_camera/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../adafruit_feather_esp32s2/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../boards/adafruit_funhouse/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../adafruit_metro_esp32s2/mpconfigboard.mk | 2 +- .../adafruit_qtpy_esp32s2/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../boards/artisense_rd00/mpconfigboard.mk | 2 +- .../crumpspace_crumps2/mpconfigboard.mk | 2 +- .../electroniccats_bastwifi/mpconfigboard.mk | 2 +- .../espressif_hmi_devkit_1/mpconfigboard.mk | 2 +- .../espressif_kaluga_1.3/mpconfigboard.mk | 2 +- .../espressif_kaluga_1/mpconfigboard.mk | 2 +- .../espressif_saola_1_wroom/mpconfigboard.mk | 2 +- .../espressif_saola_1_wrover/mpconfigboard.mk | 2 +- .../franzininho_wifi_wroom/mpconfigboard.mk | 2 +- .../franzininho_wifi_wrover/mpconfigboard.mk | 2 +- .../gravitech_cucumber_m/mpconfigboard.mk | 2 +- .../gravitech_cucumber_ms/mpconfigboard.mk | 2 +- .../gravitech_cucumber_r/mpconfigboard.mk | 2 +- .../gravitech_cucumber_rs/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../boards/lilygo_ttgo_t8_s2/mpconfigboard.mk | 2 +- .../lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk | 2 +- .../boards/mixgo_ce_serial/mpconfigboard.mk | 2 +- .../boards/mixgo_ce_udisk/mpconfigboard.mk | 2 +- .../morpheans_morphesp-240/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../odt_pixelwing_esp32_s2/mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../mpconfigboard.mk | 2 +- .../common-hal/microcontroller/Pin.c | 101 ++++++++++++------ ports/espressif/modules/esp32_pico_mini_02.c | 36 ------- ports/espressif/modules/esp32s2_wroom.c | 37 ------- ports/espressif/modules/esp32s2_wrover.c | 38 ------- ports/espressif/modules/esp32s3_wroom.c | 37 ------- ports/espressif/modules/esp32s3_wrover.c | 38 ------- ports/espressif/modules/module.h | 35 ------ ports/espressif/modules/none.c | 30 ------ ports/espressif/mpconfigport.mk | 7 +- ports/espressif/supervisor/port.c | 2 - 49 files changed, 117 insertions(+), 326 deletions(-) delete mode 100644 ports/espressif/modules/esp32_pico_mini_02.c delete mode 100644 ports/espressif/modules/esp32s2_wroom.c delete mode 100644 ports/espressif/modules/esp32s2_wrover.c delete mode 100644 ports/espressif/modules/esp32s3_wroom.c delete mode 100644 ports/espressif/modules/esp32s3_wrover.c delete mode 100644 ports/espressif/modules/module.h delete mode 100644 ports/espressif/modules/none.c diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 3280ffa105..0a8fdb36d5 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -247,7 +247,6 @@ SRC_C += \ bindings/espidf/__init__.c \ boards/$(BOARD)/board.c \ boards/$(BOARD)/pins.c \ - modules/$(CIRCUITPY_MODULE).c \ shared/netutils/netutils.c \ peripherals/i2c.c \ peripherals/rmt.c \ diff --git a/ports/espressif/README.rst b/ports/espressif/README.rst index cea95dea04..949f3533ae 100644 --- a/ports/espressif/README.rst +++ b/ports/espressif/README.rst @@ -9,6 +9,7 @@ Support Status: .. csv-table:: :header: SoC, Status + ESP, "beta" ESP32-C3, "beta" ESP32-S2, "stable" ESP32-S3, "beta" @@ -20,13 +21,17 @@ How this port is organized: - **boards/** contains the configuration files for each development board and breakout available on the port. - **common-hal/** contains the port-specific module implementations, used by shared-module and shared-bindings. - **esp-idf/** contains the Espressif IoT Development Framework installation, including all the drivers for the port. -- **modules/** contains information specific to certain Espressif SoC based hardware modules, such as the pins used for flash and RAM on the WROVER and WROOM. - **peripherals/** contains peripheral setup files and peripheral mapping information, sorted by family and sub-variant. Most files in this directory can be generated with the python scripts in **tools/**. - **supervisor/** contains port-specific implementations of internal flash, serial and USB, as well as the **port.c** file, which initializes the port at startup. - **tools/** includes useful Python scripts for debugging and other purposes. At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled CircuitPython modules. +Connecting to the ESP32 +--------------------------------------- +The ESP32 chip itself has no USB support. On many boards there is a USB-serial adapter chip, such as a CP2102N, CP2104 or CH9102F, usually connected to the ESP32 TXD0 (GPIO1)and RXD0 (GPIO3) pins, for access to the bootloader. CircuitPython also uses this serial channel for the REPL. + + Connecting to the ESP32-C3 --------------------------------------- diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk index 724a85370d..7a352fc83c 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk index 9ec5919f54..a83269f3ac 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk @@ -14,4 +14,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 8MB -CIRCUITPY_MODULE = esp32_pico_mini_02 +CIRCUITPY_ESP_PSRAM = 1 diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk index b975aecd5e..407844ed4b 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk index c6d34efbd1..d939630dfd 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk @@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk index 38167546b9..7a2f3d3691 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk @@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk index 69f7dd09e0..6e4c716fe0 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s3_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk index 088dd9386c..0412fabed3 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk @@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s3_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk index aa1f5a40fb..961e3371bc 100644 --- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk @@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk index a03c697931..beccc8275e 100644 --- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk @@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk index 8bd07381d6..d293096e4b 100644 --- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk index 2273fbe307..64cf3630bb 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk @@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk index 433c43f1ff..8c81c7bc6c 100644 --- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk index 31fbf593ed..621b714156 100644 --- a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk +++ b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk index 8014d03bf1..4d4ae5de60 100644 --- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk +++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk @@ -18,7 +18,7 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB CIRCUITPY_BITBANG_APA102 = 1 -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 # Include these Python libraries in firmware. # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk index 77de160464..99a75f1db4 100644 --- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk +++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk @@ -18,4 +18,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk index 02395a4fa8..aedb03801b 100644 --- a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk index e261ad372d..5c0d16346d 100644 --- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk index e261ad372d..5c0d16346d 100644 --- a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk index e24f540814..56b5a65eb8 100644 --- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk index 38c74fd064..4442a577b6 100644 --- a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk index 2b5328ad31..53d1a4a846 100644 --- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk index 8f7a39f117..5f5bd893cb 100644 --- a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk index 63b35234b7..04f713043f 100644 --- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk index 8bfc6e1c02..b3421d59a1 100644 --- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk index d044160804..c4b76ff756 100644 --- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk index 02c1669434..d15530b48c 100644 --- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk +++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk index 379b6f087e..68521578a7 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk index 1eed59fc41..5de3534e39 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk index 1738a22c0e..dc311d0558 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk index db600060d6..30ca08c176 100644 --- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index 9917654502..3148b3ece7 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk index 2b5c7b7d39..4b4b69a347 100644 --- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk +++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk index baf78ce4b8..f4a3560716 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk index 4a7ce7966c..800c55d57c 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk index 1ad615ef48..f00e1082ba 100644 --- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk +++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk index 959161f193..08cce69957 100644 --- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk +++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wroom +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk index d0f2c7304c..a668d5ae9c 100644 --- a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk +++ b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB -CIRCUITPY_MODULE = esp32s2_wrover +CIRCUITPY_ESP_PSRAM = 0 diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index 995c281611..c271ae8686 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -40,6 +40,73 @@ STATIC uint32_t never_reset_pins[2]; STATIC uint32_t in_use[2]; +// Bit mask of all pins that should never ever be reset. +// Typically these are SPI flash and PSRAM control pins, and communication pins. +static const uint64_t pin_mask_reset_forbidden = + #if defined(CONFIG_IDF_TARGET_ESP32) + // Never ever reset serial pins for bootloader and possibly USB-serial converter. + GPIO_SEL_1 | // TXD0 + GPIO_SEL_3 | // RXD0 + // Never ever reset pins used to communicate with SPI flash and PSRAM. + GPIO_SEL_6 | // CLK + GPIO_SEL_9 | // (PSRAM) SD2 + GPIO_SEL_10 | // (PSRAM) SD3 + GPIO_SEL_11 | // CMD + GPIO_SEL_16 | // SPIHD + GPIO_SEL_17 | // SPIDO + GPIO_SEL_18 | // SPIWP + GPIO_SEL_23 | // SPIDI + #endif // ESP32 + + #if defined(CONFIG_IDF_TARGET_ESP32C3) + // Never ever reset pins used to communicate with SPI flash. + GPIO_SEL_11 | // VDD_SPI + GPIO_SEL_12 | // SPIHD + GPIO_SEL_13 | // SPIWP + GPIO_SEL_14 | // SPICS0 + GPIO_SEL_15 | // SPICLK + GPIO_SEL_16 | // SPID + GPIO_SEL_17 | // SPIQ + #if CIRCUITPY_ESP_USB_SERIAL_JTAG + // Never ever reset serial/JTAG communication pins. + GPIO_SEL_18 | // USB D- + GPIO_SEL_19 | // USB D+ + #endif + #endif // ESP32C3 + + #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) + // Never ever reset pins used to communicate with SPI flash and PSRAM. + GPIO_SEL_19 | // USB D- + GPIO_SEL_20 | // USB D+ + #if CIRCUITPY_ESP_PSRAM + // Board uses PSRAM, and needs another chip select. + GPIO_SEL_26 | // SPICS1 + #endif + GPIO_SEL_27 | // SPIHD + GPIO_SEL_28 | // SPIWP + GPIO_SEL_29 | // SPICS0 + GPIO_SEL_30 | // SPICLK + GPIO_SEL_31 | // SPIHD + GPIO_SEL_32 | // SPIQ + #if defined(CONFIG_SPIRAM_MODE_OCT) + // Never reset octal SPI flash pins DQ4-DQ7 and DQS/DM. + GPIO_SEL_33 | // SPIIO4 + GPIO_SEL_34 | // SPIIO5 + GPIO_SEL_35 | // SPIIO6 + GPIO_SEL_36 | // SPIIO7 + GPIO_SEL_37 | // SPIDQS + #endif + #if CIRCUITPY_USB + // Never ever reset USB pins. + GPIO_SEL_19 | // USB D- + GPIO_SEL_20 | // USB D+ + #endif + #endif // ESP32S2, ESP32S3 + + 0; // Terminate last "|". + + + void never_reset_pin_number(gpio_num_t pin_number) { if (pin_number == NO_PIN) { return; @@ -59,40 +126,10 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) { } STATIC void _reset_pin(gpio_num_t pin_number) { - // Never ever reset pins used for flash and RAM. - #if defined(CONFIG_IDF_TARGET_ESP32) - if (pin_number == 1 || pin_number == 6 || pin_number == 11 || pin_number == 9 || pin_number == 10 || pin_number == 17 || pin_number == 23) { + // Never ever reset pins used for flash, RAM, and basic communication. + if (pin_mask_reset_forbidden & (((uint64_t)1) << pin_number)) { return; } - #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) - // Never ever reset pins used for flash and RAM. - if (26 <= pin_number && pin_number <= 32) { - return; - } - #ifdef CONFIG_SPIRAM_MODE_OCT - // Octal DQ4-DQ7 and DQS/DM - if (33 <= pin_number && pin_number <= 37) { - return; - } - #endif - - #if CIRCUITPY_USB - // Never reset USB pins. - if (pin_number == 19 || pin_number == 20) { - return; - } - #endif - #elif defined(CONFIG_IDF_TARGET_ESP32C3) - // Never ever reset pins used for flash and RAM. - if (11 <= pin_number && pin_number <= 17) { - return; - } - #if CIRCUITPY_ESP_USB_SERIAL_JTAG - if (pin_number == 18 || pin_number == 19) { - return; - } - #endif - #endif // Give the board a chance to reset the pin in a particular way. if (espressif_board_reset_pin_number(pin_number)) { diff --git a/ports/espressif/modules/esp32_pico_mini_02.c b/ports/espressif/modules/esp32_pico_mini_02.c deleted file mode 100644 index e94c22dd0b..0000000000 --- a/ports/espressif/modules/esp32_pico_mini_02.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash and PSRAM - common_hal_never_reset_pin(&pin_GPIO6); - common_hal_never_reset_pin(&pin_GPIO9); - common_hal_never_reset_pin(&pin_GPIO10); - common_hal_never_reset_pin(&pin_GPIO11); - -} diff --git a/ports/espressif/modules/esp32s2_wroom.c b/ports/espressif/modules/esp32s2_wroom.c deleted file mode 100644 index 5e530701bf..0000000000 --- a/ports/espressif/modules/esp32s2_wroom.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/modules/esp32s2_wrover.c b/ports/espressif/modules/esp32s2_wrover.c deleted file mode 100644 index 23fa7ee5ca..0000000000 --- a/ports/espressif/modules/esp32s2_wrover.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash and RAM - common_hal_never_reset_pin(&pin_GPIO26); - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/modules/esp32s3_wroom.c b/ports/espressif/modules/esp32s3_wroom.c deleted file mode 100644 index 5e530701bf..0000000000 --- a/ports/espressif/modules/esp32s3_wroom.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/modules/esp32s3_wrover.c b/ports/espressif/modules/esp32s3_wrover.c deleted file mode 100644 index 23fa7ee5ca..0000000000 --- a/ports/espressif/modules/esp32s3_wrover.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { - // SPI Flash and RAM - common_hal_never_reset_pin(&pin_GPIO26); - common_hal_never_reset_pin(&pin_GPIO27); - common_hal_never_reset_pin(&pin_GPIO28); - common_hal_never_reset_pin(&pin_GPIO29); - common_hal_never_reset_pin(&pin_GPIO30); - common_hal_never_reset_pin(&pin_GPIO31); - common_hal_never_reset_pin(&pin_GPIO32); -} diff --git a/ports/espressif/modules/module.h b/ports/espressif/modules/module.h deleted file mode 100644 index 643cdc854e..0000000000 --- a/ports/espressif/modules/module.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - - -#ifndef MICROPY_INCLUDED_ESPRESSIF_MODULES_MODULE_H -#define MICROPY_INCLUDED_ESPRESSIF_MODULES_MODULE_H - -#include "shared-bindings/microcontroller/Pin.h" - -void never_reset_module_internal_pins(void); - -#endif // MICROPY_INCLUDED_ESPRESSIF_MODULES_MODULE_H diff --git a/ports/espressif/modules/none.c b/ports/espressif/modules/none.c deleted file mode 100644 index aa751bf3f4..0000000000 --- a/ports/espressif/modules/none.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "modules/module.h" - -void never_reset_module_internal_pins(void) { -} diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index 834bd3c248..04bfd7e4c5 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -31,8 +31,6 @@ CIRCUITPY_WATCHDOG ?= 1 CIRCUITPY_ESPIDF ?= 1 -CIRCUITPY_MODULE ?= none - ifeq ($(IDF_TARGET),esp32) CIRCUITPY_BLEIO = 0 CIRCUITPY_BLEIO_HCI = 0 @@ -82,3 +80,8 @@ endif # only if something else is turned off, such as HID. USB_NUM_ENDPOINT_PAIRS = 7 USB_NUM_IN_ENDPOINTS = 5 + +#ifndef CIRCUITPY_ESP_PSRAM +#error CIRCUITPY_ESP_PSRAM must be specified in mpconfigboard.mk as 0 or 1. Use 1 if the board has PSRAM. +#endif +CFLAGS += -DCIRCUITPY_ESP_PSRAM=$(CIRCUITPY_ESP_PSRAM) diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index b90e9d5712..38ca3573e6 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -29,7 +29,6 @@ #include #include "supervisor/board.h" #include "supervisor/port.h" -#include "modules/module.h" #include "py/runtime.h" #include "supervisor/esp_port.h" @@ -162,7 +161,6 @@ safe_mode_t port_init(void) { #endif heap = NULL; - never_reset_module_internal_pins(); #ifndef DEBUG #define DEBUG (0) From 1599844b82c57e2f52a5f86572a6a9363908fc5c Mon Sep 17 00:00:00 2001 From: Xu Hao Date: Wed, 29 Jun 2022 15:03:29 +0800 Subject: [PATCH 0516/2403] Add some frozen libraries to elecfreaks_picoed --- .gitmodules | 15 +++++++++++++++ frozen/Adafruit_CircuitPython_IS31FL3731 | 1 + frozen/Adafruit_CircuitPython_Ticks | 1 + frozen/Adafruit_CircuitPython_asyncio | 1 + frozen/circuitpython_ef_music | 1 + frozen/circuitpython_picoed | 1 + .../boards/elecfreaks_picoed/mpconfigboard.mk | 8 ++++++++ 7 files changed, 28 insertions(+) create mode 160000 frozen/Adafruit_CircuitPython_IS31FL3731 create mode 160000 frozen/Adafruit_CircuitPython_Ticks create mode 160000 frozen/Adafruit_CircuitPython_asyncio create mode 160000 frozen/circuitpython_ef_music create mode 160000 frozen/circuitpython_picoed diff --git a/.gitmodules b/.gitmodules index 0edcdec653..360d73c9b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -292,3 +292,18 @@ [submodule "frozen/mixgo_cp_lib"] path = frozen/mixgo_cp_lib url = https://github.com/dahanzimin/circuitpython_lib.git +[submodule "frozen/Adafruit_CircuitPython_IS31FL3731"] + path = frozen/Adafruit_CircuitPython_IS31FL3731 + url = https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731.git +[submodule "frozen/Adafruit_CircuitPython_Ticks"] + path = frozen/Adafruit_CircuitPython_Ticks + url = https://github.com/adafruit/Adafruit_CircuitPython_Ticks.git +[submodule "frozen/Adafruit_CircuitPython_asyncio"] + path = frozen/Adafruit_CircuitPython_asyncio + url = https://github.com/adafruit/Adafruit_CircuitPython_asyncio.git +[submodule "frozen/circuitpython_ef_music"] + path = frozen/circuitpython_ef_music + url = https://github.com/elecfreaks/circuitpython_ef_music.git +[submodule "frozen/circuitpython_picoed"] + path = frozen/circuitpython_picoed + url = https://github.com/elecfreaks/circuitpython_picoed.git diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731 new file mode 160000 index 0000000000..28eb0526cc --- /dev/null +++ b/frozen/Adafruit_CircuitPython_IS31FL3731 @@ -0,0 +1 @@ +Subproject commit 28eb0526cc7c80c65f711c8b43ee83e191b5984d diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks new file mode 160000 index 0000000000..6757c5b37c --- /dev/null +++ b/frozen/Adafruit_CircuitPython_Ticks @@ -0,0 +1 @@ +Subproject commit 6757c5b37cf26458448930042cb0a41f8ad0a5ef diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio new file mode 160000 index 0000000000..c496cfb576 --- /dev/null +++ b/frozen/Adafruit_CircuitPython_asyncio @@ -0,0 +1 @@ +Subproject commit c496cfb5768cd506d61100284fdab94dd439ec3b diff --git a/frozen/circuitpython_ef_music b/frozen/circuitpython_ef_music new file mode 160000 index 0000000000..6e8eedb147 --- /dev/null +++ b/frozen/circuitpython_ef_music @@ -0,0 +1 @@ +Subproject commit 6e8eedb1475e2b91f8dea7bceebb20e44d70b171 diff --git a/frozen/circuitpython_picoed b/frozen/circuitpython_picoed new file mode 160000 index 0000000000..d890d23f42 --- /dev/null +++ b/frozen/circuitpython_picoed @@ -0,0 +1 @@ +Subproject commit d890d23f4261722338280f284cc1640e22e50e14 diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk index 42200ac8c7..ea72feef00 100644 --- a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk +++ b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.mk @@ -9,3 +9,11 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" CIRCUITPY__EVE = 1 + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_asyncio +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IS31FL3731 +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Ticks +FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython_ef_music +FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython_picoed From 1f065a313c6174e00356742d6d257c99d2a96474 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 29 Jun 2022 11:12:29 -0700 Subject: [PATCH 0517/2403] Update with startup fix instead of revert --- ports/espressif/esp-idf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 15dc9d9809..171e5af9c5 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 15dc9d980946059cd5287207a7f1286c523216fb +Subproject commit 171e5af9c5b9b126c5f81f217c7b1ff931d54863 From 8dc826527563c67d5f677cafe524eff434889d1d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 29 Jun 2022 11:53:10 -0700 Subject: [PATCH 0518/2403] Fix auto-wifi created crash The wifi event_handler runs on the other core so we need to be careful when calling into CP APIs. Fixes #6503 --- .../common-hal/microcontroller/__init__.c | 6 ++--- ports/espressif/common-hal/wifi/__init__.c | 22 ++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c index 3cf41ba7f0..81a512bdd6 100644 --- a/ports/espressif/common-hal/microcontroller/__init__.c +++ b/ports/espressif/common-hal/microcontroller/__init__.c @@ -65,6 +65,7 @@ volatile uint32_t nesting_count = 0; static portMUX_TYPE cp_mutex = portMUX_INITIALIZER_UNLOCKED; void common_hal_mcu_disable_interrupts(void) { + assert(xPortGetCoreID() == CONFIG_ESP_MAIN_TASK_AFFINITY); if (nesting_count == 0) { portENTER_CRITICAL(&cp_mutex); } @@ -72,9 +73,8 @@ void common_hal_mcu_disable_interrupts(void) { } void common_hal_mcu_enable_interrupts(void) { - if (nesting_count == 0) { - // Maybe log here because it's very bad. - } + assert(xPortGetCoreID() == CONFIG_ESP_MAIN_TASK_AFFINITY); + assert(nesting_count > 0); nesting_count--; if (nesting_count > 0) { return; diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index 3da0fc7297..80d01a253e 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -42,12 +42,25 @@ wifi_radio_obj_t common_hal_wifi_radio_obj; #include "components/log/include/esp_log.h" +#include "supervisor/port.h" #include "supervisor/workflow.h" +#include "esp_ipc.h" + static const char *TAG = "wifi"; +STATIC void schedule_background_on_cp_core(void *arg) { + supervisor_workflow_request_background(); + + // CircuitPython's VM is run in a separate FreeRTOS task from wifi callbacks. So, we have to + // notify the main task every time in case it's waiting for us. + port_wake_main_task(); +} + static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) { + // This runs on the PRO CORE! It cannot share CP interrupt enable/disable + // directly. wifi_radio_obj_t *radio = arg; if (event_base == WIFI_EVENT) { switch (event_id) { @@ -108,7 +121,14 @@ static void event_handler(void *arg, esp_event_base_t event_base, radio->retries_left = radio->starting_retries; xEventGroupSetBits(radio->event_group_handle, WIFI_CONNECTED_BIT); } - supervisor_workflow_request_background(); + // Use IPC to ensure we run schedule background on the same core as CircuitPython. + #if defined(CONFIG_FREERTOS_UNICORE) && CONFIG_FREERTOS_UNICORE + schedule_background_on_cp_core(NULL); + #else + // This only blocks until the start of the function. That's ok since the PRO + // core shouldn't care what we do. + esp_ipc_call(CONFIG_ESP_MAIN_TASK_AFFINITY, schedule_background_on_cp_core, NULL); + #endif } static bool wifi_inited; From d42c811fb9c37ce0eda811f3e47304b75e2ae691 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 29 Jun 2022 12:31:18 -0700 Subject: [PATCH 0519/2403] Safe mode when ESP interrupt watchdog fires This makes us enter safe mode when sleep on the S3 fails. The task watchdog is used for the user watchdog. --- locale/circuitpython.pot | 17 ++++++----------- ports/espressif/supervisor/port.c | 3 +++ supervisor/shared/safe_mode.c | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index f965506d1b..5740e1e288 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -72,7 +72,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -432,7 +432,6 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -518,7 +517,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1160,6 +1159,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2244,10 +2247,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3915,10 +3914,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index 7ecdd140a2..75362134d8 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -214,6 +214,9 @@ safe_mode_t port_init(void) { case ESP_RST_PANIC: return HARD_CRASH; case ESP_RST_INT_WDT: + // The interrupt watchdog is used internally to make sure that latency sensitive + // interrupt code isn't blocked. User watchdog resets come through ESP_RST_WDT. + return WATCHDOG_RESET; case ESP_RST_WDT: default: break; diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index 875a1a0220..aefae1e48b 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -178,7 +178,7 @@ void print_safe_mode_message(safe_mode_t reason) { message = translate("Boot device must be first device (interface #0)."); break; case WATCHDOG_RESET: - message = translate("Watchdog timer expired."); + message = translate("Internal watchdog timer expired."); break; case NO_CIRCUITPY: message = translate("CIRCUITPY drive could not be found or created."); From e210b9c8169e3f3418ab7374e5b1b35312150a59 Mon Sep 17 00:00:00 2001 From: Xu Hao Date: Thu, 30 Jun 2022 09:49:47 +0800 Subject: [PATCH 0520/2403] Update Adafruit_CircuitPython_IS31FL3731 submodule --- frozen/Adafruit_CircuitPython_IS31FL3731 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731 index 28eb0526cc..b4a0461889 160000 --- a/frozen/Adafruit_CircuitPython_IS31FL3731 +++ b/frozen/Adafruit_CircuitPython_IS31FL3731 @@ -1 +1 @@ -Subproject commit 28eb0526cc7c80c65f711c8b43ee83e191b5984d +Subproject commit b4a0461889ead5da69f4ed6d0118276b01613981 From b0efd130c9a0134ae7927fcbfb41245393ea86eb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 29 Jun 2022 23:19:36 -0400 Subject: [PATCH 0521/2403] ESP32 REPL working through debug UART --- ports/espressif/Makefile | 2 +- .../adafruit_feather_esp32_v2/sdkconfig | 1 + ports/espressif/common-hal/busio/UART.c | 4 +-- .../common-hal/microcontroller/Pin.c | 33 ++++++++----------- supervisor/shared/serial.c | 2 +- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 0a8fdb36d5..204802cb16 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -412,7 +412,7 @@ ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld $(B FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE) -ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset --baud 460800 +ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset --baud 921600 ifeq ($(UF2_BOOTLOADER),1) all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig index 731ea37c4d..94333b1591 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig @@ -34,6 +34,7 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv" # ESP32-specific # CONFIG_ESP32_SPIRAM_SUPPORT=y +CONFIG_UART_ISR_IN_IRAM=y # end of ESP32-specific # diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 0ca608a002..385307cc3e 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -75,8 +75,8 @@ static void uart_event_task(void *param) { void uart_reset(void) { for (uart_port_t num = 0; num < UART_NUM_MAX; num++) { // Ignore the UART used by the IDF. - #ifdef CONFIG_CONSOLE_UART_NUM - if (num == CONFIG_CONSOLE_UART_NUM) { + #ifdef CONFIG_ESP_CONSOLE_UART_NUM + if (num == CONFIG_ESP_CONSOLE_UART_NUM) { continue; } #endif diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index c271ae8686..943386306f 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -33,12 +33,11 @@ #include "components/driver/include/driver/gpio.h" #include "components/hal/include/hal/gpio_hal.h" -#include "esp_log.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" +STATIC uint64_t never_reset_pins; +STATIC uint64_t in_use; -STATIC uint32_t never_reset_pins[2]; -STATIC uint32_t in_use[2]; +// 64-bit pin mask for a single bit +#define PIN_BIT(pin_number) (((uint64_t)1) << pin_number) // Bit mask of all pins that should never ever be reset. // Typically these are SPI flash and PSRAM control pins, and communication pins. @@ -111,7 +110,7 @@ void never_reset_pin_number(gpio_num_t pin_number) { if (pin_number == NO_PIN) { return; } - never_reset_pins[pin_number / 32] |= 1 << pin_number % 32; + never_reset_pins |= PIN_BIT(pin_number); } void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) { @@ -127,7 +126,7 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) { STATIC void _reset_pin(gpio_num_t pin_number) { // Never ever reset pins used for flash, RAM, and basic communication. - if (pin_mask_reset_forbidden & (((uint64_t)1) << pin_number)) { + if (pin_mask_reset_forbidden & PIN_BIT(pin_number)) { return; } @@ -152,8 +151,8 @@ void reset_pin_number(gpio_num_t pin_number) { if (pin_number == NO_PIN) { return; } - never_reset_pins[pin_number / 32] &= ~(1 << pin_number % 32); - in_use[pin_number / 32] &= ~(1 << pin_number % 32); + never_reset_pins &= ~PIN_BIT(pin_number); + in_use &= ~PIN_BIT(pin_number); _reset_pin(pin_number); } @@ -170,30 +169,26 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) { } void reset_all_pins(void) { - ESP_LOGI("Pin.c", "reset_all_pins"); for (uint8_t i = 0; i < GPIO_PIN_COUNT; i++) { uint32_t iomux_address = GPIO_PIN_MUX_REG[i]; if (iomux_address == 0 || - (never_reset_pins[i / 32] & (1 << i % 32)) != 0) { + (never_reset_pins & PIN_BIT(i))) { continue; } - ESP_LOGI("Pin.c", "about to reset pin %d", i); - vTaskDelay(100); _reset_pin(i); } - in_use[0] = never_reset_pins[0]; - in_use[1] = never_reset_pins[1]; + in_use = never_reset_pins; } void claim_pin_number(gpio_num_t pin_number) { if (pin_number == NO_PIN) { return; } - in_use[pin_number / 32] |= (1 << (pin_number % 32)); + in_use |= PIN_BIT(pin_number); } void claim_pin(const mcu_pin_obj_t *pin) { - in_use[pin->number / 32] |= (1 << (pin->number % 32)); + claim_pin_number(pin->number); } void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) { @@ -201,9 +196,7 @@ void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) { } bool pin_number_is_free(gpio_num_t pin_number) { - uint8_t offset = pin_number / 32; - uint32_t mask = 1 << (pin_number % 32); - return (in_use[offset] & mask) == 0; + return in_use & PIN_BIT(pin_number); } bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) { diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c index af90fce4d7..6453a4a930 100644 --- a/supervisor/shared/serial.c +++ b/supervisor/shared/serial.c @@ -54,7 +54,7 @@ #include "py/mpprint.h" #include "shared-bindings/busio/UART.h" busio_uart_obj_t debug_uart; -byte buf_array[64]; +byte buf_array[256]; #endif #if CIRCUITPY_USB_VENDOR From 6a833a77ccadfdd2252e691e5dfd30af0cb472a8 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 30 Jun 2022 15:21:04 -0500 Subject: [PATCH 0522/2403] modbuiltins: Catch most exceptions during dir() This helps with Python-compatibility (see issue #4171) but doesn't completely resolve it. Now, `dir()` still computes any properties of the underlying object, HOWEVER, if the property raises an exception this expression is captured. This ability to capture exceptions always existed in `mp_load_method_protected`, we just need to turn it on via the `catch_all_exc` boolean parameter. --- py/modbuiltins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/modbuiltins.c b/py/modbuiltins.c index 91712812bc..4e9fbfcd93 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -190,8 +190,8 @@ STATIC mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) { // Implemented by probing all possible qstrs with mp_load_method_maybe size_t nqstr = QSTR_TOTAL(); for (size_t i = MP_QSTR_ + 1; i < nqstr; ++i) { - mp_obj_t dest[2]; - mp_load_method_protected(args[0], i, dest, false); + mp_obj_t dest[2] = {}; + mp_load_method_protected(args[0], i, dest, true); if (dest[0] != MP_OBJ_NULL) { #if MICROPY_PY_ALL_SPECIAL_METHODS // Support for __dir__: see if we can dispatch to this special method From ed326c4c7072e012b4384520d8bf39149733dd9f Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 30 Jun 2022 15:59:04 -0500 Subject: [PATCH 0523/2403] Always release displays during deep sleep Closes #6523 --- main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.c b/main.c index 3488899946..952a17e8a8 100644 --- a/main.c +++ b/main.c @@ -587,6 +587,9 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re else if (awoke_from_true_deep_sleep || port_get_raw_ticks(NULL) > CIRCUITPY_WORKFLOW_CONNECTION_SLEEP_DELAY * 1024) { // OK to start sleeping, real or fake. + #if CIRCUITPY_DISPLAYIO + common_hal_displayio_release_displays(); + #endif status_led_deinit(); deinit_rxtx_leds(); board_deinit(); From 2a563cc8bada8dd0e8b34825f7ee27d3c2d129b8 Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Thu, 30 Jun 2022 15:10:16 -0700 Subject: [PATCH 0524/2403] first cut at wifi.radio.tx_power --- ports/espressif/common-hal/wifi/Radio.c | 10 ++++++++++ shared-bindings/wifi/Radio.c | 21 +++++++++++++++++++++ shared-bindings/wifi/Radio.h | 3 +++ 3 files changed, 34 insertions(+) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index b6b155a71c..4aa9f9cfdd 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -139,6 +139,16 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t esp_wifi_set_mac(ESP_IF_WIFI_STA, mac); } +uint8_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) { + int8_t tx_power; + esp_wifi_get_max_tx_power(&tx_power); + return tx_power; +} + +void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const uint8_t tx_power) { + esp_wifi_set_max_tx_power(tx_power); +} + mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) { uint8_t mac[MAC_ADDRESS_LENGTH]; esp_wifi_get_mac(ESP_IF_WIFI_AP, mac); diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 42a4c53161..70ee16a090 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -138,6 +138,27 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_obj, (mp_obj_t)&wifi_radio_get_mac_address_obj, (mp_obj_t)&wifi_radio_set_mac_address_obj); +//| tx_power: int +//| """Set TX WiFi power.""" +//| +STATIC mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) { + wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); + return mp_obj_new_int(common_hal_wifi_radio_get_tx_power(self)); +} +MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_tx_power_obj, wifi_radio_get_tx_power); + +STATIC mp_obj_t wifi_radio_set_tx_power(mp_obj_t self_in, mp_obj_t tx_power_in) { + mp_int_t tx_power = mp_obj_get_int(tx_power_in); + wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); + common_hal_wifi_radio_set_tx_power(self, tx_power); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_tx_power_obj, wifi_radio_set_tx_power); + +MP_PROPERTY_GETSET(wifi_radio_tx_power_obj, + (mp_obj_t)&wifi_radio_get_tx_power_obj, + (mp_obj_t)&wifi_radio_set_tx_power_obj); + //| mac_address_ap: ReadableBuffer //| """MAC address for the AP. When the address is altered after interface is started //| the changes would only be reflected once the interface restarts.""" diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index b2593ba8ff..e89e22ebe9 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -82,6 +82,9 @@ extern void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const extern mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self); extern void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint8_t *mac); +extern uint8_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self); +extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const uint8_t power); + extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self); extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self); From 1bc3bdcfc434123411526421afbdfc35b287f8d4 Mon Sep 17 00:00:00 2001 From: Maxime Leroy Date: Wed, 29 Jun 2022 21:29:30 +0000 Subject: [PATCH 0525/2403] Translated using Weblate (French) Currently translated at 98.0% (967 of 986 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/ --- locale/fr.po | 63 +++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/locale/fr.po b/locale/fr.po index 33f58c6185..89f8efbc92 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-06-03 01:35+0000\n" -"Last-Translator: ajs256 \n" +"PO-Revision-Date: 2022-06-30 22:19+0000\n" +"Last-Translator: Maxime Leroy \n" "Language: fr\n" "MIME-Version: 1.0\n" "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.13-dev\n" +"X-Generator: Weblate 4.13.1-dev\n" #: main.c msgid "" @@ -30,6 +30,9 @@ msgid "" "\n" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" +"\n" +"Le code a été arrêté par l'actualisation automatique. Rechargement prochain." +"\n" #: supervisor/shared/safe_mode.c msgid "" @@ -115,7 +118,7 @@ msgstr "les indices %q doivent être des entiers, pas %s" #: shared-module/bitbangio/SPI.c msgid "%q init failed" -msgstr "" +msgstr "échec de l'initialisation %q" #: py/argcheck.c msgid "%q length must be %d" @@ -665,7 +668,7 @@ msgstr "Appelez super().__init__() avant d'accéder à l'objet natif." #: ports/cxd56/common-hal/camera/Camera.c msgid "Camera init" -msgstr "" +msgstr "Initialisation de la caméra" #: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." @@ -737,7 +740,7 @@ msgstr "Ne peut démonter '/' quand est visible par USB." #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" -msgstr "" +msgstr "Impossible de redémarrer dans le bootloader puisque aucun n'est présent" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -958,7 +961,7 @@ msgstr "Echec de l'obtention de mutex, err 0x%04x" #: shared-module/rgbmatrix/RGBMatrix.c msgid "Failed to allocate %q buffer" -msgstr "" +msgstr "Échec d'allocation du tampon %q" #: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" @@ -1050,7 +1053,7 @@ msgstr "La fonction nécessite un verrou ('lock')" #: ports/cxd56/common-hal/gnss/GNSS.c msgid "GNSS init" -msgstr "" +msgstr "Initialisation GNSS" #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" @@ -1085,7 +1088,7 @@ msgstr "Opération d'E/S sur un fichier fermé" #: ports/stm/common-hal/busio/I2C.c msgid "I2C init error" -msgstr "" +msgstr "Erreur d'initialisation I2C" #: ports/raspberrypi/common-hal/busio/I2C.c msgid "I2C peripheral in use" @@ -1310,11 +1313,11 @@ msgstr "Le délais au démarrage du micro doit être entre 0.0 et 1.0" #: ports/raspberrypi/bindings/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched data size" -msgstr "" +msgstr "La taille des données ne correspond pas" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Mismatched swap flag" -msgstr "" +msgstr "Le drapeau d'échange ne correspond pas" #: ports/mimxrt10xx/common-hal/busio/SPI.c msgid "Missing MISO or MOSI Pin" @@ -1388,7 +1391,7 @@ msgstr "Nom trop long" #: shared-bindings/displayio/TileGrid.c msgid "New bitmap must be same size as old bitmap" -msgstr "" +msgstr "La taille du nouveau bitmap doit être la même que l'ancien" #: ports/espressif/common-hal/_bleio/__init__.c msgid "Nimble out of memory" @@ -1422,7 +1425,7 @@ msgstr "Aucun périphérique I2S à l'adresse : 0x%x" #: supervisor/shared/web_workflow/web_workflow.c msgid "No IP" -msgstr "" +msgstr "Aucune IP" #: ports/espressif/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/SPI.c @@ -1633,7 +1636,7 @@ msgstr "Seulement une adresse est autorisée" #: ports/nrf/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" -msgstr "" +msgstr "Seule une alarme alarm.time peut être définie" #: ports/espressif/common-hal/alarm/time/TimeAlarm.c #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c @@ -1685,7 +1688,7 @@ msgstr "" #: ports/stm/common-hal/pwmio/PWMOut.c msgid "PWM restart" -msgstr "" +msgstr "Redémarrage PWM" #: ports/raspberrypi/common-hal/countio/Counter.c msgid "PWM slice already in use" @@ -1873,7 +1876,7 @@ msgstr "Le format de carte SD CSD n'est pas supporté" #: ports/cxd56/common-hal/sdioio/SDCard.c msgid "SDCard init" -msgstr "" +msgstr "Initialisation SDCard" #: ports/stm/common-hal/sdioio/SDCard.c #, c-format @@ -1891,7 +1894,7 @@ msgstr "La configuration SPI a échoué" #: ports/stm/common-hal/busio/SPI.c msgid "SPI init error" -msgstr "" +msgstr "Erreur d'initialisation SPI" #: ports/raspberrypi/common-hal/busio/SPI.c msgid "SPI peripheral in use" @@ -2070,7 +2073,7 @@ msgstr "Pour quitter, SVP redémarrez la carte sans " #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample" -msgstr "" +msgstr "Trop de canaux dans l'échantillon" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." @@ -2110,7 +2113,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "UART init" -msgstr "" +msgstr "Initialisation UART" #: ports/stm/common-hal/busio/UART.c msgid "UART re-init" @@ -2118,7 +2121,7 @@ msgstr "" #: ports/stm/common-hal/busio/UART.c msgid "UART write" -msgstr "" +msgstr "Écriture UART" #: shared-module/usb_hid/Device.c msgid "USB busy" @@ -2182,7 +2185,7 @@ msgstr "Impossible de lire les données de la palette de couleurs" #: ports/espressif/common-hal/mdns/Server.c msgid "Unable to start mDNS query" -msgstr "" +msgstr "Impossible de lancer la requête mDNS" #: shared-bindings/nvm/ByteArray.c msgid "Unable to write to nvm." @@ -2204,12 +2207,12 @@ msgstr "Erreur ESP TLS non gérée %d %d %x %d" #: ports/espressif/common-hal/_bleio/__init__.c #, c-format msgid "Unknown BLE error at %s:%d: %d" -msgstr "" +msgstr "Erreur BLE inconnue à %s:%d : %d" #: ports/espressif/common-hal/_bleio/__init__.c #, c-format msgid "Unknown BLE error: %d" -msgstr "" +msgstr "Erreur BLE inconnue : %d" #: shared-bindings/wifi/Radio.c #, c-format @@ -2244,7 +2247,7 @@ msgstr "Faute inconnue du logiciel systême : %04x" #: ports/espressif/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %d" -msgstr "" +msgstr "Erreur du firmware système inconnue : %d" #: shared-bindings/adafruit_pixelbuf/PixelBuf.c #, c-format @@ -2345,7 +2348,7 @@ msgstr "" #: supervisor/shared/web_workflow/web_workflow.c msgid "Wi-Fi: " -msgstr "" +msgstr "Wi-Fi : " #: main.c msgid "Woken up by alarm.\n" @@ -3181,7 +3184,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c msgid "init I2C" -msgstr "" +msgstr "initialisation I2C" #: extmod/ulab/code/scipy/optimize/optimize.c msgid "initial values must be iterable" @@ -3246,7 +3249,7 @@ msgstr "l'entrée doit être un ndarray" #: extmod/ulab/code/numpy/carray/carray.c msgid "input must be an ndarray, or a scalar" -msgstr "" +msgstr "l'entrée doit être un ndarray, ou un scalaire" #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" @@ -3420,7 +3423,7 @@ msgstr "" #: ports/espressif/common-hal/mdns/Server.c msgid "mDNS only works with built-in WiFi" -msgstr "" +msgstr "mDNS ne fonctionne que avec le WiFi intégré" #: py/parse.c msgid "malformed f-string" @@ -3695,7 +3698,7 @@ msgstr "chaîne de longueur impaire" #: supervisor/shared/web_workflow/web_workflow.c msgid "off" -msgstr "" +msgstr "inactif" #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" @@ -4339,7 +4342,7 @@ msgstr "type d'entrée incorrect" #: extmod/ulab/code/numpy/transform.c msgid "wrong length of condition array" -msgstr "" +msgstr "mauvaise taille du tableau de condition" #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" From d13f24648e4456b1565fb61f8afa6112b8fff4cc Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Thu, 30 Jun 2022 15:27:57 -0700 Subject: [PATCH 0526/2403] first cut at wifi.radio.tx_power --- shared-bindings/wifi/Radio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 70ee16a090..7420c592cf 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -570,6 +570,7 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_mac_address), MP_ROM_PTR(&wifi_radio_mac_address_obj) }, { MP_ROM_QSTR(MP_QSTR_mac_address_ap), MP_ROM_PTR(&wifi_radio_mac_address_ap_obj) }, + { MP_ROM_QSTR(MP_QSTR_tx_power), MP_ROM_PTR(&wifi_radio_tx_power_obj) }, { MP_ROM_QSTR(MP_QSTR_start_scanning_networks), MP_ROM_PTR(&wifi_radio_start_scanning_networks_obj) }, { MP_ROM_QSTR(MP_QSTR_stop_scanning_networks), MP_ROM_PTR(&wifi_radio_stop_scanning_networks_obj) }, From 698d563dcfee91bd67254cc9b2ba55b39693e8f4 Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Thu, 30 Jun 2022 15:33:03 -0700 Subject: [PATCH 0527/2403] adust wifi.radio.tx_power to be x4 (in db) as mentioned in #6540 --- ports/espressif/common-hal/wifi/Radio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index 4aa9f9cfdd..bc6e12dfd3 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -142,11 +142,11 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t uint8_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) { int8_t tx_power; esp_wifi_get_max_tx_power(&tx_power); - return tx_power; + return tx_power / 4; } void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const uint8_t tx_power) { - esp_wifi_set_max_tx_power(tx_power); + esp_wifi_set_max_tx_power(tx_power * 4); } mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) { From 95d3289df6c106e397aaff1bd7bb744a2dcd4830 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 30 Jun 2022 16:37:51 -0700 Subject: [PATCH 0528/2403] Doc tweak and add vararg send helpers --- docs/workflows.md | 11 + .../shared/web_workflow/static/welcome.html | 2 +- supervisor/shared/web_workflow/web_workflow.c | 254 ++++++++++-------- 3 files changed, 152 insertions(+), 115 deletions(-) diff --git a/docs/workflows.md b/docs/workflows.md index d5f951809d..1b262011b2 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -70,6 +70,17 @@ The web workflow is depends on adding Wi-Fi credentials into the `/.env` file. T automatically connect to the network and start the webserver used for the workflow. The webserver is on port 80. It also enables MDNS. +Here is an example `/.env`: + +```bash +# To auto-connect to Wi-Fi +CIRCUITPY_WIFI_SSID='scottswifi' +CIRCUITPY_WIFI_PASSWORD='secretpassword' + +# To enable modifying files from the web. Change this too! +CIRCUITPY_WEB_API_PASSWORD='passw0rd' +``` + MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a device specific hostname of the form `cpy-XXXXXX.local`. The `XXXXXX` is based on network MAC address. The device also provides the MDNS service with service type `_circuitpython` and protocol `_tcp`. diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html index fc85c0cc2c..7fb68c302e 100644 --- a/supervisor/shared/web_workflow/static/welcome.html +++ b/supervisor/shared/web_workflow/static/welcome.html @@ -7,7 +7,7 @@

     Welcome!

    - Welcome to CircuitPython's Web API. Through your browser you can work with files. Make sure you've set CIRCUITPY_WEB_API_PASSWORD in /.env and provide it when the browser prompts for it. Leave the username blank. + Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.

    Device Info

    Board:
    Version:
    diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index 6e6b95d5e8..cbe1b24e86 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -281,6 +281,19 @@ static void _send_str(socketpool_socket_obj_t *socket, const char *str) { _send_raw(socket, (const uint8_t *)str, strlen(str)); } +// The last argument must be NULL! Otherwise, it won't stop. +static void _send_strs(socketpool_socket_obj_t *socket, ...) { + va_list ap; + va_start(ap, socket); + + const char *str = va_arg(ap, const char *); + while (str != NULL) { + _send_str(socket, str); + str = va_arg(ap, const char *); + } + va_end(ap); +} + static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { char encoded_len[sizeof(size_t) * 2 + 1]; int len = snprintf(encoded_len, sizeof(encoded_len), "%X", strlen(chunk)); @@ -290,6 +303,37 @@ static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { _send_raw(socket, (const uint8_t *)"\r\n", 2); } +// A bit of a misnomer because it sends all arguments as one chunk. +// The last argument must be NULL! Otherwise, it won't stop. +static void _send_chunks(socketpool_socket_obj_t *socket, ...) { + va_list strs_to_count; + va_start(strs_to_count, socket); + + va_list strs_to_send; + va_copy(strs_to_send, strs_to_count); + + size_t chunk_len = 0; + const char *str = va_arg(strs_to_count, const char *); + while (str != NULL) { + chunk_len += strlen(str); + str = va_arg(strs_to_count, const char *); + } + va_end(strs_to_count); + + char encoded_len[sizeof(size_t) * 2 + 1]; + snprintf(encoded_len, sizeof(encoded_len), "%X", chunk_len); + _send_strs(socket, encoded_len, "\r\n", NULL); + + str = va_arg(strs_to_send, const char *); + while (str != NULL) { + _send_str(socket, str); + str = va_arg(strs_to_send, const char *); + } + va_end(strs_to_send); + + _send_str(socket, "\r\n"); +} + static bool _endswith(const char *str, const char *suffix) { if (str == NULL || suffix == NULL) { return false; @@ -348,44 +392,46 @@ STATIC bool _usb_active(void) { return false; } + +static const char *OK_JSON = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n"; + static void _cors_header(socketpool_socket_obj_t *socket, _request *request) { - _send_str(socket, "Access-Control-Allow-Credentials: true\r\nVary: Origin\r\n"); - _send_str(socket, "Access-Control-Allow-Origin: "); - _send_str(socket, request->origin); - _send_str(socket, "\r\n"); + _send_strs(socket, + "Access-Control-Allow-Credentials: true\r\n", + "Vary: Origin\r\n", + "Access-Control-Allow-Origin: ", request->origin, "\r\n", + NULL); } static void _reply_continue(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 100 Continue\r\n"; - _send_str(socket, response); + _send_str(socket, "HTTP/1.1 100 Continue\r\n"); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_created(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 201 Created\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 201 Created\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_no_content(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 204 No Content\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 204 No Content\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_access_control(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 204 No Content\r\n" - "Content-Length: 0\r\n" - "Access-Control-Expose-Headers: Access-Control-Allow-Methods\r\n" - "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n" - "Access-Control-Allow-Methods:GET, OPTIONS"; - - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 204 No Content\r\n", + "Content-Length: 0\r\n", + "Access-Control-Expose-Headers: Access-Control-Allow-Methods\r\n", + "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n", + "Access-Control-Allow-Methods:GET, OPTIONS", NULL); if (!_usb_active()) { _send_str(socket, ", PUT, DELETE"); } @@ -398,89 +444,85 @@ static void _reply_access_control(socketpool_socket_obj_t *socket, _request *req } static void _reply_missing(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 404 Not Found\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 404 Not Found\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_method_not_allowed(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 405 Method Not Allowed\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 405 Method Not Allowed\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_forbidden(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 403 Forbidden\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 403 Forbidden\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_conflict(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 409 Conflict\r\n" - "Content-Length: 19\r\n"; - - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 409 Conflict\r\n", + "Content-Length: 19\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\nUSB storage active."); } static void _reply_payload_too_large(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 413 Payload Too Large\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 413 Payload Too Large\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_expectation_failed(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 417 Expectation Failed\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 417 Expectation Failed\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_unauthorized(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 401 Unauthorized\r\n" - "Content-Length: 0\r\n" - "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n"; - - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 401 Unauthorized\r\n", + "Content-Length: 0\r\n", + "WWW-Authenticate: Basic realm=\"CircuitPython\"\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_server_error(socketpool_socket_obj_t *socket, _request *request) { - const char *response = "HTTP/1.1 500 Internal Server Error\r\n" - "Content-Length: 0\r\n"; - _send_str(socket, response); + _send_strs(socket, + "HTTP/1.1 500 Internal Server Error\r\n", + "Content-Length: 0\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request, const char *path) { - const char *redirect_response = "HTTP/1.1 301 Moved Permanently\r\nConnection: close\r\nContent-Length: 0\r\nLocation: http://"; int nodelay = 1; lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); - _send_str(socket, redirect_response); - _send_str(socket, common_hal_mdns_server_get_hostname(&mdns)); - _send_str(socket, ".local"); - _send_str(socket, path); - _send_str(socket, "\r\n"); + const char *hostname = common_hal_mdns_server_get_hostname(&mdns); + _send_strs(socket, + "HTTP/1.1 301 Moved Permanently\r\n", + "Connection: close\r\n", + "Content-Length: 0\r\n", + "Location: http://", hostname, ".local", path, "\r\n", NULL); _cors_header(socket, request); _send_str(socket, "\r\n"); } static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) { - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n" - "Content-Type: application/json\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON)); _cors_header(socket, request); _send_str(socket, "\r\n"); _send_chunk(socket, "["); @@ -493,9 +535,9 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req if (!first) { _send_chunk(socket, ","); } - _send_chunk(socket, "{\"name\": \""); - _send_chunk(socket, file_info.fname); - _send_chunk(socket, "\", \"directory\": "); + _send_chunks(socket, + "{\"name\": \"", file_info.fname, "\",", + "\"directory\": ", NULL); if ((file_info.fattrib & AM_DIR) != 0) { _send_chunk(socket, "true"); } else { @@ -514,17 +556,13 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req char encoded_number[32]; snprintf(encoded_number, sizeof(encoded_number), "%lld", truncated_time); - _send_chunk(socket, encoded_number); - - _send_chunk(socket, ", \"file_size\": "); + _send_chunks(socket, encoded_number, ", \"file_size\": ", NULL); size_t file_size = 0; if ((file_info.fattrib & AM_DIR) == 0) { file_size = file_info.fsize; } snprintf(encoded_number, sizeof(encoded_number), "%d", file_size); - _send_chunk(socket, encoded_number); - - _send_chunk(socket, "}"); + _send_chunks(socket, encoded_number, "}", NULL); first = false; res = f_readdir(dir, &file_info); } @@ -537,9 +575,10 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request, char encoded_len[10]; snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); - _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Length: "); - _send_str(socket, encoded_len); - _send_str(socket, "\r\n"); + _send_strs(socket, + "HTTP/1.1 200 OK\r\n", + "Content-Length: ", encoded_len, "\r\n", NULL); + // TODO: Make this a table to save space. if (_endswith(filename, ".txt") || _endswith(filename, ".py")) { _send_str(socket, "Content-Type: text/plain\r\n"); } else if (_endswith(filename, ".js")) { @@ -583,36 +622,30 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request * mdns_remoteservice_obj_t found_devices[32]; size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices)); size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices)); - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON)); _cors_header(socket, request); _send_str(socket, "\r\n"); - _send_chunk(socket, "{\"total\": "); char total_encoded[4]; snprintf(total_encoded, sizeof(total_encoded), "%d", total_results); - _send_chunk(socket, total_encoded); - _send_chunk(socket, ", \"devices\": ["); + _send_chunks(socket, "{\"total\": ", total_encoded, ", \"devices\": [", NULL); for (size_t i = 0; i < count; i++) { if (i > 0) { _send_chunk(socket, ","); } - _send_chunk(socket, "{\"hostname\": \""); - _send_chunk(socket, common_hal_mdns_remoteservice_get_hostname(&found_devices[i])); - _send_chunk(socket, "\", \"instance_name\": \""); - _send_chunk(socket, common_hal_mdns_remoteservice_get_instance_name(&found_devices[i])); - _send_chunk(socket, "\", \"port\": "); + const char *hostname = common_hal_mdns_remoteservice_get_hostname(&found_devices[i]); + const char *instance_name = common_hal_mdns_remoteservice_get_instance_name(&found_devices[i]); char port_encoded[4]; int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]); snprintf(port_encoded, sizeof(port_encoded), "%d", port); - _send_chunk(socket, port_encoded); - _send_chunk(socket, ", \"ip\": \""); - char ip_encoded[4 * 4]; uint32_t ipv4_address = mdns_remoteservice_get_ipv4_address(&found_devices[i]); uint8_t *octets = (uint8_t *)&ipv4_address; snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); - _send_chunk(socket, ip_encoded); - _send_chunk(socket, "\"}"); + _send_chunks(socket, + "{\"hostname\": \"", hostname, "\", ", + "\"instance_name\": \"", instance_name, "\", ", + "\"port\": ", port_encoded, ", ", + "\"ip\": \"", ip_encoded, "\"}", NULL); common_hal_mdns_remoteservice_deinit(&found_devices[i]); } _send_chunk(socket, "]}"); @@ -621,33 +654,27 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request * } static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *request) { - const char *ok_response = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: application/json\r\n"; - socketpool_socket_send(socket, (const uint8_t *)ok_response, strlen(ok_response)); + _send_str(socket, OK_JSON); _cors_header(socket, request); _send_str(socket, "\r\n"); - _send_chunk(socket, "{\"web_api_version\": 1, \"version\": \""); - _send_chunk(socket, MICROPY_GIT_TAG); - _send_chunk(socket, "\", \"build_date\": \""); - _send_chunk(socket, MICROPY_BUILD_DATE); - _send_chunk(socket, "\", \"board_name\": \""); - _send_chunk(socket, MICROPY_HW_BOARD_NAME); - _send_chunk(socket, "\", \"mcu_name\": \""); - _send_chunk(socket, MICROPY_HW_MCU_NAME); - _send_chunk(socket, "\", \"board_id\": \""); - _send_chunk(socket, CIRCUITPY_BOARD_ID); - _send_chunk(socket, "\", \"creator_id\": "); - char encoded_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0 - snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATOR_ID); - _send_chunk(socket, encoded_id); - _send_chunk(socket, ", \"creation_id\": "); - snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATION_ID); - _send_chunk(socket, encoded_id); - _send_chunk(socket, ", \"hostname\": \""); - _send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns)); - _send_chunk(socket, "\", \"port\": 80"); - _send_chunk(socket, ", \"ip\": \""); - _send_chunk(socket, _our_ip_encoded); - _send_chunk(socket, "\"}"); + char encoded_creator_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0 + snprintf(encoded_creator_id, sizeof(encoded_creator_id), "%u", CIRCUITPY_CREATOR_ID); + char encoded_creation_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0 + snprintf(encoded_creation_id, sizeof(encoded_creation_id), "%u", CIRCUITPY_CREATION_ID); + const char *hostname = common_hal_mdns_server_get_hostname(&mdns); + _send_chunks(socket, + "{\"web_api_version\": 1, ", + "\"version\": \"", MICROPY_GIT_TAG, "\", ", + "\"build_date\": \"", MICROPY_BUILD_DATE, "\", ", + "\"board_name\": \"", MICROPY_HW_BOARD_NAME, "\", ", + "\"mcu_name\": \"", MICROPY_HW_MCU_NAME, "\", ", + "\"board_id\": \"", CIRCUITPY_BOARD_ID, "\", ", + "\"creator_id\": ", encoded_creator_id, ", ", + "\"creation_id\": ", encoded_creation_id, ", ", + "\"hostname\": \"", hostname, "\", ", + "\"port\": 80, ", + "\"ip\": \"", _our_ip_encoded, + "\"}", NULL); // Empty chunk signals the end of the response. _send_chunk(socket, ""); } @@ -806,13 +833,12 @@ static void _reply_static(socketpool_socket_obj_t *socket, _request *request, co char encoded_len[10]; snprintf(encoded_len, sizeof(encoded_len), "%d", total_length); - _send_str(socket, "HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Length: "); - _send_str(socket, encoded_len); - _send_str(socket, "\r\n"); - _send_str(socket, "Content-Type: "); - _send_str(socket, content_type); - _send_str(socket, "\r\n"); - _send_str(socket, "\r\n"); + _send_strs(socket, + "HTTP/1.1 200 OK\r\n", + "Content-Encoding: gzip\r\n", + "Content-Length: ", encoded_len, "\r\n", + "Content-Type: ", content_type, "\r\n", + "\r\n", NULL); _send_raw(socket, response, response_len); } From a59b52bd433fdcbebbfe1b1e1ff8178deab5945d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 30 Jun 2022 16:54:06 -0700 Subject: [PATCH 0529/2403] Add USB warning --- .../shared/web_workflow/static/directory.html | 22 ++++++++++++++++--- .../shared/web_workflow/static/directory.js | 4 ++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html index d6b28bc7de..d0ca1a3b32 100644 --- a/supervisor/shared/web_workflow/static/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -1,4 +1,20 @@ - - -

     

    TypeSizePathModified
    +🗀  + + + + + + + + +

     

    + + + + + +
    TypeSizePathModified
    +
    + +
    + +🗀  diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js index b193f1f950..b2b76648c2 100644 --- a/supervisor/shared/web_workflow/static/directory.js +++ b/supervisor/shared/web_workflow/static/directory.js @@ -37,6 +37,10 @@ async function refresh_list() { editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE"); new_directory_name.disabled = !editable; files.disabled = !editable; + if (!editable) { + let usbwarning = document.querySelector("#usbwarning"); + usbwarning.style.display = "block"; + } } if (window.location.path != "/fs/") { From a57d1ad0c46ecaa4ec507083ecc5a93e43b6e0a0 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Fri, 1 Jul 2022 04:56:42 +0200 Subject: [PATCH 0530/2403] 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 | 17 ++++++----------- locale/cs.po | 17 ++++++----------- locale/de_DE.po | 23 ++++++++++++----------- locale/el.po | 17 ++++++----------- locale/en_GB.po | 20 +++++++++----------- locale/es.po | 20 +++++++++----------- locale/fil.po | 17 ++++++----------- locale/fr.po | 30 ++++++++++++++++-------------- locale/hi.po | 17 ++++++----------- locale/it_IT.po | 17 ++++++----------- locale/ja.po | 17 ++++++----------- locale/ko.po | 17 ++++++----------- locale/nl.po | 20 +++++++++----------- locale/pl.po | 17 ++++++----------- locale/pt_BR.po | 23 ++++++++++++----------- locale/ru.po | 17 ++++++----------- locale/sv.po | 23 ++++++++++++----------- locale/tr.po | 17 ++++++----------- locale/zh_Latn_pinyin.po | 23 ++++++++++++----------- 19 files changed, 157 insertions(+), 212 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index a301eb7852..16ba43395a 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -78,7 +78,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -438,7 +438,6 @@ msgstr "" msgid "All event channels in use" msgstr "Semua channel event sedang digunakan" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -524,7 +523,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1175,6 +1174,10 @@ msgstr "" msgid "Internal error #%d" msgstr "Kesalahan internal #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2275,10 +2278,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3947,10 +3946,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index bfd9dc8db8..ee6688f185 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -79,7 +79,7 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "%q" @@ -439,7 +439,6 @@ msgstr "Všechny kanály jsou používány" msgid "All event channels in use" msgstr "Všechny kanály událostí jsou již používány" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -525,7 +524,7 @@ msgstr "Konverze audia není implementována" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN nepoužívá heslo" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Autentizace selhala" @@ -1175,6 +1174,10 @@ msgstr "Interní chyba" msgid "Internal error #%d" msgstr "Vnitřní chyba #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2262,10 +2265,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3933,10 +3932,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index ac02ca72f2..2f31a32f02 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -80,7 +80,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -441,7 +441,6 @@ msgstr "Alle Kanäle werden verwendet" msgid "All event channels in use" msgstr "Alle Event-Kanäle werden benutzt" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Alle State-Maschinen in Verwendung" @@ -527,7 +526,7 @@ msgstr "Audio-Konvertierung nicht implementiert" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN wird mit Passwort nicht verwendet" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Authentifizierungsfehler" @@ -1188,6 +1187,10 @@ msgstr "Interner Fehler" msgid "Internal error #%d" msgstr "Interner Fehler #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Ungültiger %q" @@ -2307,10 +2310,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout muss größer als 0 sein" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Watchdog timer abgelaufen." - #: py/builtinhelp.c #, c-format msgid "" @@ -4012,10 +4011,6 @@ msgstr "source_bitmap muss value_count von 65536 haben" msgid "source_bitmap must have value_count of 8" msgstr "source_bitmap muss value_count von 8 haben" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "ssid kann nicht mehr als 32 Bytes lang sein" - #: py/objstr.c msgid "start/end indices" msgstr "start/end Indizes" @@ -4373,6 +4368,12 @@ msgstr "zi muss eine Gleitkommazahl sein" msgid "zi must be of shape (n_section, 2)" msgstr "zi muss die Form (n_section, 2) haben" +#~ msgid "Watchdog timer expired." +#~ msgstr "Watchdog timer abgelaufen." + +#~ msgid "ssid can't be more than 32 bytes" +#~ msgstr "ssid kann nicht mehr als 32 Bytes lang sein" + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q muss ein Tupel der Länge 2 sein" diff --git a/locale/el.po b/locale/el.po index 86529084bb..454be46f59 100644 --- a/locale/el.po +++ b/locale/el.po @@ -72,7 +72,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -432,7 +432,6 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -518,7 +517,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1160,6 +1159,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2244,10 +2247,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3915,10 +3914,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 7f2642fe10..951b573b3b 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -82,7 +82,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -442,7 +442,6 @@ msgstr "All channels in use" msgid "All event channels in use" msgstr "All event channels in use" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "All state machines in use" @@ -528,7 +527,7 @@ msgstr "Audio conversion not implemented" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN is not used with password" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Authentication failure" @@ -1176,6 +1175,10 @@ msgstr "" msgid "Internal error #%d" msgstr "Internal error #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Invalid %q" @@ -2277,10 +2280,6 @@ msgstr "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout must be greater than 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "WatchDog timer expired." - #: py/builtinhelp.c #, c-format msgid "" @@ -3954,10 +3953,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "start/end indices" @@ -4312,6 +4307,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 "Watchdog timer expired." +#~ msgstr "WatchDog timer expired." + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q must be a tuple of length 2" diff --git a/locale/es.po b/locale/es.po index fbd682d61a..608f59ca29 100644 --- a/locale/es.po +++ b/locale/es.po @@ -81,7 +81,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -441,7 +441,6 @@ msgstr "Todos los canales esta en uso" msgid "All event channels in use" msgstr "Todos los canales de eventos estan siendo usados" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Todas las máquinas de estado en uso" @@ -529,7 +528,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN no se usa con contraseña" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Fallo de autenticación" @@ -1191,6 +1190,10 @@ msgstr "" msgid "Internal error #%d" msgstr "Error interno #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "%q inválido" @@ -2309,10 +2312,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout debe ser mayor a 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Temporizador de perro guardián expirado." - #: py/builtinhelp.c #, c-format msgid "" @@ -3998,10 +3997,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "índices inicio/final" @@ -4357,6 +4352,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 "Watchdog timer expired." +#~ msgstr "Temporizador de perro guardián expirado." + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q debe ser una tupla de longitud 2" diff --git a/locale/fil.po b/locale/fil.po index 8112eb048c..821bf45dbf 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -73,7 +73,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -436,7 +436,6 @@ msgstr "" msgid "All event channels in use" msgstr "Lahat ng event channels ginagamit" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -522,7 +521,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1173,6 +1172,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2264,10 +2267,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3956,10 +3955,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "start/end indeks" diff --git a/locale/fr.po b/locale/fr.po index 89f8efbc92..c98b2f54db 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -31,8 +31,8 @@ msgid "" "Code stopped by auto-reload. Reloading soon.\n" msgstr "" "\n" -"Le code a été arrêté par l'actualisation automatique. Rechargement prochain." -"\n" +"Le code a été arrêté par l'actualisation automatique. Rechargement " +"prochain.\n" #: supervisor/shared/safe_mode.c msgid "" @@ -84,7 +84,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "%q" @@ -444,7 +444,6 @@ msgstr "Tout les canaux sont utilisés" msgid "All event channels in use" msgstr "Tous les canaux d'événements sont utilisés" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Tous les automates finis sont utilisés" @@ -532,7 +531,7 @@ msgstr "La conversion audio n'est pas implémentée" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN n'est pas utilisé avec un mot de passe" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Échec d'authentification" @@ -740,7 +739,8 @@ msgstr "Ne peut démonter '/' quand est visible par USB." #: ports/cxd56/common-hal/microcontroller/__init__.c #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c msgid "Cannot reset into bootloader because no bootloader is present" -msgstr "Impossible de redémarrer dans le bootloader puisque aucun n'est présent" +msgstr "" +"Impossible de redémarrer dans le bootloader puisque aucun n'est présent" #: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" @@ -1206,6 +1206,10 @@ msgstr "Erreur interne" msgid "Internal error #%d" msgstr "Erreur interne #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "%q invalide" @@ -2327,10 +2331,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout doit être supérieur à 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Le minuteur Watchdog a expiré." - #: py/builtinhelp.c #, c-format msgid "" @@ -4029,10 +4029,6 @@ msgstr "source_bitmap doit avoir une value_count de 65536" msgid "source_bitmap must have value_count of 8" msgstr "source_bitmap doit avoir une value_count de 8" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "un ssid ne peut pas faire plus de 32 octets" - #: py/objstr.c msgid "start/end indices" msgstr "indices de début/fin" @@ -4388,6 +4384,12 @@ 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 "Watchdog timer expired." +#~ msgstr "Le minuteur Watchdog a expiré." + +#~ msgid "ssid can't be more than 32 bytes" +#~ msgstr "un ssid ne peut pas faire plus de 32 octets" + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q doit être un tuple de longueur 2" diff --git a/locale/hi.po b/locale/hi.po index 2c18e7ca9a..db817163af 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -72,7 +72,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -432,7 +432,6 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -518,7 +517,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1160,6 +1159,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2244,10 +2247,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3915,10 +3914,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 20c57c6475..b58f3c963f 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -79,7 +79,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -442,7 +442,6 @@ msgstr "" msgid "All event channels in use" msgstr "Tutti i canali eventi utilizati" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Tutte le state machines sono in uso" @@ -528,7 +527,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Autenticazione Fallita" @@ -1178,6 +1177,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2274,10 +2277,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3969,10 +3968,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index d459a06b25..466fbdd362 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -77,7 +77,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -437,7 +437,6 @@ msgstr "" msgid "All event channels in use" msgstr "全てのイベントチャネルが使用中" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -523,7 +522,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "認証失敗" @@ -1171,6 +1170,10 @@ msgstr "" msgid "Internal error #%d" msgstr "内部エラー #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "不正な %q" @@ -2258,10 +2261,6 @@ msgstr "WatchDogTimer.modeはいったんWatchDogMode.RESETに設定すると変 msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeoutは0以上でなければなりません" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3937,10 +3936,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 95b68a1b77..f01d690729 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -73,7 +73,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -433,7 +433,6 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -519,7 +518,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "" @@ -1163,6 +1162,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2248,10 +2251,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3919,10 +3918,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 39199c71c2..7db50b2eea 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -75,7 +75,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -435,7 +435,6 @@ msgstr "" msgid "All event channels in use" msgstr "Alle event kanalen zijn in gebruik" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -521,7 +520,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Authenticatiefout" @@ -1171,6 +1170,10 @@ msgstr "" msgid "Internal error #%d" msgstr "Interne fout #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Ongeldige %q" @@ -2274,10 +2277,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout moet groter dan 0 zijn" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Watchdog-timer verstreken." - #: py/builtinhelp.c #, c-format msgid "" @@ -3954,10 +3953,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "start/stop indices" @@ -4312,6 +4307,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 "Watchdog timer expired." +#~ msgstr "Watchdog-timer verstreken." + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q moet een tuple van lengte 2 zijn" diff --git a/locale/pl.po b/locale/pl.po index 21f695316b..0e6137203e 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -77,7 +77,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -437,7 +437,6 @@ msgstr "" msgid "All event channels in use" msgstr "Wszystkie kanały zdarzeń w użyciu" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "" @@ -523,7 +522,7 @@ msgstr "" msgid "AuthMode.OPEN is not used with password" msgstr "" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Błąd autoryzacji" @@ -1171,6 +1170,10 @@ msgstr "" msgid "Internal error #%d" msgstr "Błąd wewnętrzny #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Nieprawidłowe %q" @@ -2255,10 +2258,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout musi być większe od 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3929,10 +3928,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "początkowe/końcowe indeksy" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index c2de3f1b02..b6124350e3 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -81,7 +81,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "%q" @@ -445,7 +445,6 @@ msgstr "Todos os canais estão em uso" msgid "All event channels in use" msgstr "Todos os canais de eventos em uso" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "O estado de todas as máquinas em uso" @@ -532,7 +531,7 @@ msgstr "A conversão de áudio ainda não foi implementada" msgid "AuthMode.OPEN is not used with password" msgstr "O AuthMode.OPEN não é usado com senha" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Houve um falha na autenticação" @@ -1199,6 +1198,10 @@ msgstr "Erro interno" msgid "Internal error #%d" msgstr "Erro interno #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "%q Inválido" @@ -2320,10 +2323,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "O WatchDogTimer.timeout deve ser maior que 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "O temporizador Watchdog expirou." - #: py/builtinhelp.c #, c-format msgid "" @@ -4020,10 +4019,6 @@ msgstr "o source_bitmap deve ter o value_count de 65536" msgid "source_bitmap must have value_count of 8" msgstr "o source_bitmap deve ter o value_count de 8" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "O ssid não pode ter mais do que 32 bytes" - #: py/objstr.c msgid "start/end indices" msgstr "os índices de início/fim" @@ -4378,6 +4373,12 @@ 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 "Watchdog timer expired." +#~ msgstr "O temporizador Watchdog expirou." + +#~ msgid "ssid can't be more than 32 bytes" +#~ msgstr "O ssid não pode ter mais do que 32 bytes" + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q deve ser uma tupla de comprimento 2" diff --git a/locale/ru.po b/locale/ru.po index 07bcb2967a..bac9e97b7b 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -80,7 +80,7 @@ msgstr "%d адресные пины, %d rgb пины и %d плитки ука #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -440,7 +440,6 @@ msgstr "Все каналы уже используются" msgid "All event channels in use" msgstr "Все каналы событий уже используются" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Все машины состояний уже используются" @@ -526,7 +525,7 @@ msgstr "Преобразование звука не реализовано" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN не используется с паролем" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Ошибка аутентификации" @@ -1196,6 +1195,10 @@ msgstr "Внутренняя ошибка" msgid "Internal error #%d" msgstr "Внутренняя ошибка #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Недопустимый %q" @@ -2293,10 +2296,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3964,10 +3963,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index fb23e98880..def6c74aa1 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -80,7 +80,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "%q" @@ -440,7 +440,6 @@ msgstr "Alla kanaler används" msgid "All event channels in use" msgstr "Alla händelsekanaler används" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Alla tillståndsmaskiner används" @@ -526,7 +525,7 @@ msgstr "Ljudkonvertering inte implementerad" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN används inte med lösenord" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Autentiseringsfel" @@ -1180,6 +1179,10 @@ msgstr "Internt fel" msgid "Internal error #%d" msgstr "Internt fel #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "Ogiltig %q" @@ -2290,10 +2293,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.timeout måste vara större än 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Watchdog-timern har löpt ut." - #: py/builtinhelp.c #, c-format msgid "" @@ -3979,10 +3978,6 @@ msgstr "source_bitmap måste ha value_count av 65536" msgid "source_bitmap must have value_count of 8" msgstr "source_bitmap måste ha value_count av 8" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "ssid kan vara max 32 bytes" - #: py/objstr.c msgid "start/end indices" msgstr "start-/slutindex" @@ -4337,6 +4332,12 @@ 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 "Watchdog timer expired." +#~ msgstr "Watchdog-timern har löpt ut." + +#~ msgid "ssid can't be more than 32 bytes" +#~ msgstr "ssid kan vara max 32 bytes" + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q måste vara en tuple av längd 2" diff --git a/locale/tr.po b/locale/tr.po index 7f1a22dafd..b303e6419a 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -84,7 +84,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -446,7 +446,6 @@ msgstr "Tüm kanallar kullanımda" msgid "All event channels in use" msgstr "Tüm olay kanalları kullanımda" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "Tüm durum makineleri kullanımda" @@ -532,7 +531,7 @@ msgstr "Ses dönüşümü implemente edilmedi" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN bir şifre ile kullanılmadı" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "Kimlik doğrulama hatası" @@ -1177,6 +1176,10 @@ msgstr "" msgid "Internal error #%d" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "" @@ -2264,10 +2267,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "" - #: py/builtinhelp.c #, c-format msgid "" @@ -3935,10 +3934,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "" - #: py/objstr.c msgid "start/end indices" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 41964f866b..c6e7e7b364 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -83,7 +83,7 @@ msgstr "" #: ports/mimxrt10xx/common-hal/rtc/RTC.c #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c -#: ports/raspberrypi/common-hal/rtc/RTC.c +#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c msgid "%q" msgstr "" @@ -443,7 +443,6 @@ msgstr "suǒyǒu píndào dōu zài shǐyòng zhōng" msgid "All event channels in use" msgstr "suǒyǒu shìjiàn píndào dōu zài shǐyòng zhōng" -#: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" msgstr "suǒyǒu zhuàngtàijī dōu zài shǐyòng zhōng" @@ -530,7 +529,7 @@ msgstr "yīnpín zhuǎnhuàn wèi bèi shíxiàn" msgid "AuthMode.OPEN is not used with password" msgstr "AuthMode.OPEN wèi shǐyòng mìmǎ" -#: shared-bindings/wifi/Radio.c +#: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c msgid "Authentication failure" msgstr "shēnfèn ren4zheng4 shībài" @@ -1194,6 +1193,10 @@ msgstr "nèi bù cuò wù" msgid "Internal error #%d" msgstr "nèi bù cuò wù #%d" +#: supervisor/shared/safe_mode.c +msgid "Internal watchdog timer expired." +msgstr "" + #: py/argcheck.c msgid "Invalid %q" msgstr "wú xiào %q" @@ -2301,10 +2304,6 @@ msgstr "" msgid "WatchDogTimer.timeout must be greater than 0" msgstr "WatchDogTimer.Timeout bìxū dàyú 0" -#: supervisor/shared/safe_mode.c -msgid "Watchdog timer expired." -msgstr "Kān mén gǒu dìngshí qì yǐ guòqí." - #: py/builtinhelp.c #, c-format msgid "" @@ -3991,10 +3990,6 @@ msgstr "" msgid "source_bitmap must have value_count of 8" msgstr "yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū shì 8" -#: shared-bindings/wifi/Radio.c -msgid "ssid can't be more than 32 bytes" -msgstr "ssid bù néng chāo guò 32 gè zì jié" - #: py/objstr.c msgid "start/end indices" msgstr "kāishǐ/jiéshù zhǐshù" @@ -4349,6 +4344,12 @@ 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 "Watchdog timer expired." +#~ msgstr "Kān mén gǒu dìngshí qì yǐ guòqí." + +#~ msgid "ssid can't be more than 32 bytes" +#~ msgstr "ssid bù néng chāo guò 32 gè zì jié" + #~ msgid "%q must be a tuple of length 2" #~ msgstr "%q bìxū shì chángdù wèi 2 de yuánzǔ" From 8bb369cac50a88a2622cf20429bd56b750502171 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 30 Jun 2022 20:42:30 -0400 Subject: [PATCH 0531/2403] refactor debug UART to console UART; get working on ESP32 --- ports/broadcom/mpconfigport.h | 4 +- .../adafruit_feather_esp32_v2/mpconfigboard.h | 5 +- .../ai_thinker_esp32-c3s-2m/mpconfigboard.h | 4 +- .../ai_thinker_esp32-c3s/mpconfigboard.h | 4 +- .../mpconfigboard.h | 4 +- .../boards/lilygo_ttgo_t-01c3/mpconfigboard.h | 4 +- .../lilygo_ttgo_t-oi-plus/mpconfigboard.h | 4 +- .../boards/microdev_micro_c3/mpconfigboard.h | 4 +- ports/espressif/common-hal/busio/UART.c | 18 ++-- ports/espressif/common-hal/busio/UART.h | 2 +- .../common-hal/microcontroller/Pin.c | 2 +- ports/espressif/supervisor/serial.c | 21 ++--- .../boards/imxrt1060_evk/mpconfigboard.h | 5 +- ports/mimxrt10xx/supervisor/serial.c | 6 +- ports/nrf/boards/microbit_v2/mpconfigboard.h | 5 +- .../stm/boards/nucleo_f746zg/mpconfigboard.h | 4 +- py/circuitpy_mpconfig.h | 19 ++++- py/circuitpy_mpconfig.mk | 3 - supervisor/serial.h | 3 +- supervisor/shared/serial.c | 83 +++++++++---------- supervisor/shared/usb/tusb_config.h | 4 +- 21 files changed, 110 insertions(+), 98 deletions(-) diff --git a/ports/broadcom/mpconfigport.h b/ports/broadcom/mpconfigport.h index 4fce84c973..fc3966fc71 100644 --- a/ports/broadcom/mpconfigport.h +++ b/ports/broadcom/mpconfigport.h @@ -60,7 +60,7 @@ #define MICROPY_PORT_ROOT_POINTERS \ CIRCUITPY_COMMON_ROOT_POINTERS -#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO14) -#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO15) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) #endif // __INCLUDED_MPCONFIGPORT_H diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h index 5a010cb5c7..104fbfc86d 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h @@ -47,5 +47,6 @@ // Explanation of how a user got into safe mode #define BOARD_USER_SAFE_MODE_ACTION translate("pressing SW38 button at start up.\n") -#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO8) -#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO7) +// UART pins attached to the USB-serial converter chip +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h index d7a81502fa..a42f8b0436 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h +++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h @@ -37,5 +37,5 @@ #define DEFAULT_UART_BUS_TX (&pin_GPIO21) // Serial over UART -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h index 0b8a3b0ae8..20fb1ff022 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h +++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h @@ -37,5 +37,5 @@ #define DEFAULT_UART_BUS_TX (&pin_GPIO21) // Serial over UART -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h index 69c4580aba..2b8ab21ad6 100644 --- a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h +++ b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h @@ -37,5 +37,5 @@ #define DEFAULT_UART_BUS_TX (&pin_GPIO21) // Serial over UART -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.h index e0eebc9754..bbb8cff195 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.h +++ b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.h @@ -6,5 +6,5 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO20) #define DEFAULT_UART_BUS_TX (&pin_GPIO21) -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h index eb3ff11932..26a30e07dd 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.h @@ -6,5 +6,5 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO20) #define DEFAULT_UART_BUS_TX (&pin_GPIO21) -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h index e94f14c80b..f5bc8faf0b 100644 --- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h +++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h @@ -44,5 +44,5 @@ #define DEFAULT_UART_BUS_TX (&pin_GPIO21) // Serial over UART -#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX +#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX +#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 385307cc3e..740a327a47 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -50,8 +50,8 @@ static void uart_event_task(void *param) { if (xQueueReceive(self->event_queue, &event, portMAX_DELAY)) { switch (event.type) { case UART_PATTERN_DET: - // When the debug uart receives CTRL+C, wake the main task and schedule a keyboard interrupt - if (self->is_debug) { + // When the console uart receives CTRL+C, wake the main task and schedule a keyboard interrupt + if (self->is_console) { port_wake_main_task(); if (mp_interrupt_char == CHAR_CTRL_C) { uart_flush(self->uart_num); @@ -60,8 +60,8 @@ static void uart_event_task(void *param) { } break; case UART_DATA: - // When the debug uart receives any key, wake the main task - if (self->is_debug) { + // When the console uart receives any key, wake the main task + if (self->is_console) { port_wake_main_task(); } break; @@ -162,13 +162,15 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, uart_set_mode(self->uart_num, mode) != ESP_OK) { mp_raise_RuntimeError(translate("UART init")); } - // On the debug uart, enable pattern detection to look for CTRL+C - #ifdef CIRCUITPY_DEBUG_UART_RX - if (rx == CIRCUITPY_DEBUG_UART_RX) { - self->is_debug = true; + + // On the console uart, enable pattern detection to look for CTRL+C + #if CIRCUITPY_CONSOLE_UART + if (rx == CIRCUITPY_CONSOLE_UART_RX) { + self->is_console = true; uart_enable_pattern_det_baud_intr(self->uart_num, CHAR_CTRL_C, 1, 1, 0, 0); } #endif + // Start a task to listen for uart events xTaskCreatePinnedToCore( uart_event_task, diff --git a/ports/espressif/common-hal/busio/UART.h b/ports/espressif/common-hal/busio/UART.h index cd2dcc4d57..4880346015 100644 --- a/ports/espressif/common-hal/busio/UART.h +++ b/ports/espressif/common-hal/busio/UART.h @@ -46,7 +46,7 @@ typedef struct { uint8_t character_bits; bool rx_error; uint32_t timeout_ms; - bool is_debug; + bool is_console; QueueHandle_t event_queue; TaskHandle_t event_task; } busio_uart_obj_t; diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index 943386306f..d2ccc897d4 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -196,7 +196,7 @@ void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) { } bool pin_number_is_free(gpio_num_t pin_number) { - return in_use & PIN_BIT(pin_number); + return !(in_use & PIN_BIT(pin_number)); } bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) { diff --git a/ports/espressif/supervisor/serial.c b/ports/espressif/supervisor/serial.c index 9a0ecee4df..7b0166f5b1 100644 --- a/ports/espressif/supervisor/serial.c +++ b/ports/espressif/supervisor/serial.c @@ -27,6 +27,10 @@ #include "py/mpconfig.h" #include "supervisor/serial.h" +#if CIRCUITPY_ESP_USB_SERIAL_JTAG && CIRCUITPY_CONSOLE_UART +#error CIRCUITPY_ESP_USB_SERIAL_JTAG and CIRCUITPY_CONSOLE_UART cannot both be enabled. +#endif + #if CIRCUITPY_ESP_USB_SERIAL_JTAG #include "supervisor/usb_serial_jtag.h" #endif @@ -37,14 +41,13 @@ void port_serial_init(void) { #endif } + bool port_serial_connected(void) { #if CIRCUITPY_ESP_USB_SERIAL_JTAG - if (usb_serial_jtag_connected()) { - return true; - } - #endif - + return usb_serial_jtag_connected(); + #else return false; + #endif } char port_serial_read(void) { @@ -58,12 +61,10 @@ char port_serial_read(void) { bool port_serial_bytes_available(void) { #if CIRCUITPY_ESP_USB_SERIAL_JTAG - if (usb_serial_jtag_bytes_available()) { - return true; - } - #endif - + return usb_serial_jtag_bytes_available(); + #else return false; + #endif } void port_serial_write_substring(const char *text, uint32_t length) { diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1060_evk/mpconfigboard.h index 8e026fa7ce..3b63172328 100644 --- a/ports/mimxrt10xx/boards/imxrt1060_evk/mpconfigboard.h +++ b/ports/mimxrt10xx/boards/imxrt1060_evk/mpconfigboard.h @@ -16,9 +16,8 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B1_07) #define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B1_06) -#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO_AD_B0_12) -#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO_AD_B0_13) - +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_AD_B0_12) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_AD_B0_13) // Put host on the first USB so that right angle OTG adapters can fit. This is // the right port when looking at the board. diff --git a/ports/mimxrt10xx/supervisor/serial.c b/ports/mimxrt10xx/supervisor/serial.c index 63f468beaf..cb557d36a8 100644 --- a/ports/mimxrt10xx/supervisor/serial.c +++ b/ports/mimxrt10xx/supervisor/serial.c @@ -33,9 +33,7 @@ #include "fsl_clock.h" #include "fsl_lpuart.h" -// TODO: Switch this to using DEBUG_UART. -// If the board defined a debug uart tx or rx pin then we enable this code -#if defined(CIRCUITPY_DEBUG_UART_TX) || defined(CIRCUITPY_DEBUG_UART_RX) +#if defined(CIRCUITPY_CONSOLE_UART) // static LPUART_Type *uart_instance = LPUART1; // evk static LPUART_Type *uart_instance = LPUART4; // feather 1011 // static LPUART_Type *uart_instance = LPUART2; // feather 1062 @@ -89,4 +87,4 @@ void port_serial_write_substring(const char *text, uint32_t len) { LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len); } -#endif // USE_DEBUG_PORT_CODE +#endif // CIRCUITPY_CONSOLE_UART diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.h b/ports/nrf/boards/microbit_v2/mpconfigboard.h index bae49dfae2..eba5af6c22 100644 --- a/ports/nrf/boards/microbit_v2/mpconfigboard.h +++ b/ports/nrf/boards/microbit_v2/mpconfigboard.h @@ -52,5 +52,6 @@ #define BOOTLOADER_SETTING_SIZE (0) #define BOARD_HAS_32KHZ_XTAL (0) -#define CIRCUITPY_DEBUG_UART_TX (&pin_P0_06) -#define CIRCUITPY_DEBUG_UART_RX (&pin_P1_08) + +#define CIRCUITPY_CONSOLE_UART_TX (&pin_P0_06) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_P1_08) diff --git a/ports/stm/boards/nucleo_f746zg/mpconfigboard.h b/ports/stm/boards/nucleo_f746zg/mpconfigboard.h index c4399f5a3d..bde2c3ec73 100644 --- a/ports/stm/boards/nucleo_f746zg/mpconfigboard.h +++ b/ports/stm/boards/nucleo_f746zg/mpconfigboard.h @@ -46,5 +46,5 @@ #define BOARD_HSE_SOURCE (RCC_HSE_BYPASS) // ST boards use the STLink clock signal #define BOARD_HAS_LOW_SPEED_CRYSTAL (1) -#define CIRCUITPY_DEBUG_UART_TX (&pin_PD08) -#define CIRCUITPY_DEBUG_UART_RX (&pin_PD09) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_PD08) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_PD09) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 752020bafc..c26e34aab9 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -198,10 +198,11 @@ typedef long mp_off_t; // extra built in names to add to the global namespace +// Not indented so as not to confused the editor. #define MICROPY_PORT_BUILTINS \ - { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ - { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ - { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, +{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ +{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ +{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \ ////////////////////////////////////////////////////////////////////////////////////////////////// // board-specific definitions, which control and may override definitions below. @@ -296,6 +297,18 @@ typedef long mp_off_t; #define BOARD_UART_ROOT_POINTER mp_obj_t board_uart_bus; #endif +#if defined(CIRCUITPY_CONSOLE_UART_RX) || defined(CIRCUITPY_CONSOLE_UART_TX) +#if !(defined(CIRCUITPY_CONSOLE_UART_RX) && defined(CIRCUITPY_CONSOLE_UART_TX)) +#error Both CIRCUITPY_CONSOLE_UART_RX and CIRCUITPY_CONSOLE_UART_TX must be defined if one is defined. +#endif +#define CIRCUITPY_CONSOLE_UART (1) +#ifndef CIRCUITPY_CONSOLE_UART_BAUDRATE +#define CIRCUITPY_CONSOLE_UART_BAUDRATE (115200) +#endif +#else +#define CIRCUITPY_CONSOLE_UART (0) +#endif + // These CIRCUITPY_xxx values should all be defined in the *.mk files as being on or off. // So if any are not defined in *.mk, they'll throw an error here. diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 8505fe1cb7..4b1ff9cb67 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -168,9 +168,6 @@ CFLAGS += -DCIRCUITPY_OPT_LOAD_ATTR_FAST_PATH=$(CIRCUITPY_OPT_LOAD_ATTR_FAST_PAT CIRCUITPY_OPT_MAP_LOOKUP_CACHE ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_OPT_MAP_LOOKUP_CACHE=$(CIRCUITPY_OPT_MAP_LOOKUP_CACHE) -CIRCUITPY_CONSOLE_UART ?= 0 -CFLAGS += -DCIRCUITPY_CONSOLE_UART=$(CIRCUITPY_CONSOLE_UART) - CIRCUITPY_COUNTIO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_COUNTIO=$(CIRCUITPY_COUNTIO) diff --git a/supervisor/serial.h b/supervisor/serial.h index a6646e9542..997a2bc38f 100644 --- a/supervisor/serial.h +++ b/supervisor/serial.h @@ -51,12 +51,13 @@ bool serial_connected(void); // These have no-op versions that are weak and the port can override. They work // in tandem with the cross-port mechanics like USB and BLE. +void port_serial_early_init(void); void port_serial_init(void); bool port_serial_connected(void); char port_serial_read(void); bool port_serial_bytes_available(void); void port_serial_write_substring(const char *text, uint32_t length); -int debug_uart_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); +int console_uart_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); #endif // MICROPY_INCLUDED_SUPERVISOR_SERIAL_H diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c index 6453a4a930..7c9861dfec 100644 --- a/supervisor/shared/serial.c +++ b/supervisor/shared/serial.c @@ -45,42 +45,43 @@ #include "tusb.h" #endif -/* - * Note: DEBUG_UART currently only works on STM32 and nRF. - * Enabling on another platform will cause a crash. - */ - -#if defined(CIRCUITPY_DEBUG_UART_TX) || defined(CIRCUITPY_DEBUG_UART_RX) +#if CIRCUITPY_CONSOLE_UART #include "py/mpprint.h" #include "shared-bindings/busio/UART.h" -busio_uart_obj_t debug_uart; -byte buf_array[256]; + +busio_uart_obj_t console_uart; +// on Espressif, the receive buffer must be larger than the hardware FIFO length. See uart_driver_install(). +#if defined(SOC_UART_FIFO_LEN) +byte console_uart_rx_buf[SOC_UART_FIFO_LEN + 1]; +#else +byte console_uart_rx_buf[64]; +#endif #endif #if CIRCUITPY_USB_VENDOR bool tud_vendor_connected(void); #endif -#if defined(CIRCUITPY_DEBUG_UART_TX) -STATIC void debug_uart_print_strn(void *env, const char *str, size_t len) { +#if CIRCUITPY_CONSOLE_UART +STATIC void console_uart_print_strn(void *env, const char *str, size_t len) { (void)env; int uart_errcode; - common_hal_busio_uart_write(&debug_uart, (const uint8_t *)str, len, &uart_errcode); + common_hal_busio_uart_write(&console_uart, (const uint8_t *)str, len, &uart_errcode); } -const mp_print_t debug_uart_print = {NULL, debug_uart_print_strn}; +const mp_print_t console_uart_print = {NULL, console_uart_print_strn}; #endif -int debug_uart_printf(const char *fmt, ...) { - #if defined(CIRCUITPY_DEBUG_UART_TX) - // Skip prints that occur before debug serial is started. It's better than +int console_uart_printf(const char *fmt, ...) { + #if CIRCUITPY_CONSOLE_UART + // Skip prints that occur before console serial is started. It's better than // crashing. - if (common_hal_busio_uart_deinited(&debug_uart)) { + if (common_hal_busio_uart_deinited(&console_uart)) { return 0; } va_list ap; va_start(ap, fmt); - int ret = mp_vprintf(&debug_uart_print, fmt, ap); + int ret = mp_vprintf(&console_uart_print, fmt, ap); va_end(ap); return ret; #else @@ -88,6 +89,9 @@ int debug_uart_printf(const char *fmt, ...) { #endif } +MP_WEAK void port_serial_early_init(void) { +} + MP_WEAK void port_serial_init(void) { } @@ -109,29 +113,24 @@ MP_WEAK void port_serial_write_substring(const char *text, uint32_t length) { } void serial_early_init(void) { - #if defined(CIRCUITPY_DEBUG_UART_TX) || defined(CIRCUITPY_DEBUG_UART_RX) - debug_uart.base.type = &busio_uart_type; + // Set up console UART, if enabled. - #if defined(CIRCUITPY_DEBUG_UART_RX) - const mcu_pin_obj_t *rx = MP_OBJ_TO_PTR(CIRCUITPY_DEBUG_UART_RX); - #else - const mcu_pin_obj_t *rx = NULL; - #endif + #if CIRCUITPY_CONSOLE_UART + console_uart.base.type = &busio_uart_type; - #if defined(CIRCUITPY_DEBUG_UART_TX) - const mcu_pin_obj_t *tx = MP_OBJ_TO_PTR(CIRCUITPY_DEBUG_UART_TX); - #else - const mcu_pin_obj_t *tx = NULL; - #endif + const mcu_pin_obj_t *console_rx = MP_OBJ_TO_PTR(CIRCUITPY_CONSOLE_UART_RX); + const mcu_pin_obj_t *console_tx = MP_OBJ_TO_PTR(CIRCUITPY_CONSOLE_UART_TX); - common_hal_busio_uart_construct(&debug_uart, tx, rx, NULL, NULL, NULL, - false, 115200, 8, BUSIO_UART_PARITY_NONE, 1, 1.0f, 64, - buf_array, true); - common_hal_busio_uart_never_reset(&debug_uart); + common_hal_busio_uart_construct(&console_uart, console_tx, console_rx, NULL, NULL, NULL, + false, 115200, 8, BUSIO_UART_PARITY_NONE, 1, 1.0f, sizeof(console_uart_rx_buf), + console_uart_rx_buf, true); + common_hal_busio_uart_never_reset(&console_uart); // Do an initial print so that we can confirm the serial output is working. - debug_uart_printf("Serial debug setup\r\n"); + console_uart_printf("Serial console setup\r\n"); #endif + + port_serial_early_init(); } void serial_init(void) { @@ -145,7 +144,7 @@ bool serial_connected(void) { } #endif - #if defined(CIRCUITPY_DEBUG_UART_TX) && defined(CIRCUITPY_DEBUG_UART_RX) + #if CIRCUITPY_CONSOLE_UART return true; #endif @@ -180,11 +179,11 @@ char serial_read(void) { } #endif - #if defined(CIRCUITPY_DEBUG_UART_RX) - if (common_hal_busio_uart_rx_characters_available(&debug_uart)) { + #if CIRCUITPY_CONSOLE_UART + if (common_hal_busio_uart_rx_characters_available(&console_uart)) { int uart_errcode; char text; - common_hal_busio_uart_read(&debug_uart, (uint8_t *)&text, 1, &uart_errcode); + common_hal_busio_uart_read(&console_uart, (uint8_t *)&text, 1, &uart_errcode); return text; } #endif @@ -217,8 +216,8 @@ bool serial_bytes_available(void) { } #endif - #if defined(CIRCUITPY_DEBUG_UART_RX) - if (common_hal_busio_uart_rx_characters_available(&debug_uart)) { + #if CIRCUITPY_CONSOLE_UART + if (common_hal_busio_uart_rx_characters_available(&console_uart)) { return true; } #endif @@ -261,10 +260,10 @@ void serial_write_substring(const char *text, uint32_t length) { } #endif - #if defined(CIRCUITPY_DEBUG_UART_TX) + #if CIRCUITPY_CONSOLE_UART int uart_errcode; - common_hal_busio_uart_write(&debug_uart, (const uint8_t *)text, length, &uart_errcode); + common_hal_busio_uart_write(&console_uart, (const uint8_t *)text, length, &uart_errcode); #endif #if CIRCUITPY_SERIAL_BLE diff --git a/supervisor/shared/usb/tusb_config.h b/supervisor/shared/usb/tusb_config.h index 13b4367f47..c2ad1362a3 100644 --- a/supervisor/shared/usb/tusb_config.h +++ b/supervisor/shared/usb/tusb_config.h @@ -48,8 +48,8 @@ extern "C" { // COMMON CONFIGURATION // --------------------------------------------------------------------+ -// When debugging TinyUSB, only output to the UART debug link. -#if CIRCUITPY_DEBUG_TINYUSB > 0 && defined(CIRCUITPY_DEBUG_UART_TX) +// When debugging TinyUSB, only output to the console UART link. +#if CIRCUITPY_DEBUG_TINYUSB > 0 && defined(CIRCUITPY_CONSOLE_UART) #define CFG_TUSB_DEBUG CIRCUITPY_DEBUG_TINYUSB #define CFG_TUSB_DEBUG_PRINTF debug_uart_printf #endif From 6bcd75a391c3ddec5fc57911f94c05c96e0ebf07 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 1 Jul 2022 10:44:07 -0500 Subject: [PATCH 0532/2403] Add WiFi workflow to the section about branding --- README.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 1f45007082..15cfb41829 100644 --- a/README.rst +++ b/README.rst @@ -90,9 +90,11 @@ If you'd like to use the term "CircuitPython" and Blinka for your product here i * Your product is listed on `circuitpython.org `__ (source `here `_). This is to ensure that a user of your product can always download the latest version of CircuitPython from the standard place. -* Your product has a user accessible USB plug which appears as a CIRCUITPY drive when plugged in - AND/OR provides file and serial access over Bluetooth Low Energy. Boards that do not support USB - should be clearly marked as BLE-only CircuitPython. +* Your product supports at least one standard "workflow" for serial and file access: + * With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in. + * With file and serial access over Bluetooth Low Energy using the BLE Workflow. + * With file access over WiFi using the WiFi workflow, and serial access over USB. +* Boards that do not support the USB workflow should be clearly marked. If you choose not to meet these requirements, then we ask you call your version of CircuitPython something else (for example, SuperDuperPython) and not use the Blinka logo. You can say it is From 2d7793e140ce3b1f3ccfceb73eb1f95091212a48 Mon Sep 17 00:00:00 2001 From: Tod Kurt Date: Fri, 1 Jul 2022 09:49:59 -0700 Subject: [PATCH 0533/2403] update tx_power description per dhalbert suggestion --- shared-bindings/wifi/Radio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index 7420c592cf..a0a4df2548 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -139,7 +139,7 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_obj, (mp_obj_t)&wifi_radio_set_mac_address_obj); //| tx_power: int -//| """Set TX WiFi power.""" +//| """Wifi transmission power, in dBm.""" //| STATIC mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); From a1fa1ad0d8049827981c8c422f507c4d028e081c Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 30 Jun 2022 15:59:04 -0500 Subject: [PATCH 0534/2403] Always release displays during deep sleep Closes #6523 --- main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.c b/main.c index 17fe8167f2..015c4b512c 100644 --- a/main.c +++ b/main.c @@ -570,6 +570,9 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re else if (awoke_from_true_deep_sleep || port_get_raw_ticks(NULL) > CIRCUITPY_WORKFLOW_CONNECTION_SLEEP_DELAY * 1024) { // OK to start sleeping, real or fake. + #if CIRCUITPY_DISPLAYIO + common_hal_displayio_release_displays(); + #endif status_led_deinit(); deinit_rxtx_leds(); board_deinit(); From 7589e53fea04d2bada44b7729432a3ee2a9237a4 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 29 Jun 2022 16:31:55 -0700 Subject: [PATCH 0535/2403] WIP websocket accept and hashlib --- locale/circuitpython.pot | 4 + ports/espressif/common-hal/hashlib/Hash.c | 52 +++++++++ ports/espressif/common-hal/hashlib/Hash.h | 41 +++++++ ports/espressif/common-hal/hashlib/__init__.c | 40 +++++++ ports/espressif/mpconfigport.mk | 1 + py/circuitpy_defns.mk | 5 + shared-bindings/hashlib/Hash.c | 103 ++++++++++++++++++ shared-bindings/hashlib/Hash.h | 43 ++++++++ shared-bindings/hashlib/__init__.c | 90 +++++++++++++++ shared-bindings/hashlib/__init__.h | 36 ++++++ .../shared/web_workflow/static/serial.html | 16 +++ .../shared/web_workflow/static/serial.js | 43 ++++++++ .../shared/web_workflow/static/welcome.html | 2 +- supervisor/shared/web_workflow/web_workflow.c | 40 +++++++ 14 files changed, 515 insertions(+), 1 deletion(-) create mode 100644 ports/espressif/common-hal/hashlib/Hash.c create mode 100644 ports/espressif/common-hal/hashlib/Hash.h create mode 100644 ports/espressif/common-hal/hashlib/__init__.c create mode 100644 shared-bindings/hashlib/Hash.c create mode 100644 shared-bindings/hashlib/Hash.h create mode 100644 shared-bindings/hashlib/__init__.c create mode 100644 shared-bindings/hashlib/__init__.h create mode 100644 supervisor/shared/web_workflow/static/serial.html create mode 100644 supervisor/shared/web_workflow/static/serial.js diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 5740e1e288..a66a386f1d 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2199,6 +2199,10 @@ msgstr "" msgid "Unsupported format" msgstr "" +#: shared-bindings/hashlib/__init__.c +msgid "Unsupported hash algorithm" +msgstr "" + #: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" diff --git a/ports/espressif/common-hal/hashlib/Hash.c b/ports/espressif/common-hal/hashlib/Hash.c new file mode 100644 index 0000000000..8e2ab02edb --- /dev/null +++ b/ports/espressif/common-hal/hashlib/Hash.c @@ -0,0 +1,52 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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 "shared-bindings/hashlib/Hash.h" + +#include "components/mbedtls/mbedtls/include/mbedtls/ssl.h" + +void common_hal_hashlib_hash_update(hashlib_hash_obj_t *self, const uint8_t *data, size_t datalen) { + if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) { + mbedtls_sha1_update_ret(&self->sha1, data, datalen); + return; + } +} + +void common_hal_hashlib_hash_digest(hashlib_hash_obj_t *self, uint8_t *data, size_t datalen) { + if (datalen < common_hal_hashlib_hash_get_digest_size(self)) { + return; + } + if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) { + mbedtls_sha1_finish_ret(&self->sha1, data); + } +} + +size_t common_hal_hashlib_hash_get_digest_size(hashlib_hash_obj_t *self) { + if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) { + return 20; + } + return 0; +} diff --git a/ports/espressif/common-hal/hashlib/Hash.h b/ports/espressif/common-hal/hashlib/Hash.h new file mode 100644 index 0000000000..ece282833e --- /dev/null +++ b/ports/espressif/common-hal/hashlib/Hash.h @@ -0,0 +1,41 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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_ESPRESSIF_COMMON_HAL_HASHLIB_HASH_H +#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_HASHLIB_HASH_H + +#include "components/mbedtls/mbedtls/include/mbedtls/sha1.h" + +typedef struct { + mp_obj_base_t base; + union { + mbedtls_sha1_context sha1; + }; + // Of MBEDTLS_SSL_HASH_* + uint8_t hash_type; +} hashlib_hash_obj_t; + +#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_HASHLIB_HASH_H diff --git a/ports/espressif/common-hal/hashlib/__init__.c b/ports/espressif/common-hal/hashlib/__init__.c new file mode 100644 index 0000000000..1e6b2a4802 --- /dev/null +++ b/ports/espressif/common-hal/hashlib/__init__.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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 "shared-bindings/hashlib/__init__.h" + +#include "components/mbedtls/mbedtls/include/mbedtls/ssl.h" + + +bool common_hal_hashlib_new(hashlib_hash_obj_t *self, const char *algorithm) { + if (strcmp(algorithm, "sha1") == 0) { + self->hash_type = MBEDTLS_SSL_HASH_SHA1; + mbedtls_sha1_init(&self->sha1); + mbedtls_sha1_starts_ret(&self->sha1); + return true; + } + return false; +} diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index 2eeb86e49d..ddaa4836d3 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -19,6 +19,7 @@ CIRCUITPY_COUNTIO ?= 1 CIRCUITPY_DUALBANK ?= 1 CIRCUITPY_FRAMEBUFFERIO ?= 1 CIRCUITPY_FREQUENCYIO ?= 1 +CIRCUITPY_HASHLIB ?= 1 CIRCUITPY_IMAGECAPTURE ?= 1 CIRCUITPY_I2CPERIPHERAL ?= 1 CIRCUITPY_RGBMATRIX ?= 1 diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index c5c89ab19f..af49c876ba 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -207,6 +207,9 @@ endif ifeq ($(CIRCUITPY_GNSS),1) SRC_PATTERNS += gnss/% endif +ifeq ($(CIRCUITPY_HASHLIB),1) +SRC_PATTERNS += hashlib/% +endif ifeq ($(CIRCUITPY_I2CPERIPHERAL),1) SRC_PATTERNS += i2cperipheral/% endif @@ -419,6 +422,8 @@ SRC_COMMON_HAL_ALL = \ gnss/GNSS.c \ gnss/PositionFix.c \ gnss/SatelliteSystem.c \ + hashlib/__init__.c \ + hashlib/Hash.c \ i2cperipheral/I2CPeripheral.c \ i2cperipheral/__init__.c \ microcontroller/Pin.c \ diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c new file mode 100644 index 0000000000..5dab05fa10 --- /dev/null +++ b/shared-bindings/hashlib/Hash.c @@ -0,0 +1,103 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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 "shared-bindings/hashlib/Hash.h" + +// #include "shared-bindings/util.h" + +// #include "shared/runtime/buffer_helper.h" +// #include "shared/runtime/interrupt_char.h" + +// #include "py/mperrno.h" +// #include "py/mphal.h" +#include "py/obj.h" +#include "py/objproperty.h" +#include "py/objstr.h" +#include "py/runtime.h" + +//| class Hash: +//| """In progress hash algorithm. This object is always created by a `hashlib.new()`. It has no +//| user-visible constructor.""" +//| + +//| digest_size: int +//| """Digest size in bytes""" +//| +STATIC mp_obj_t hashlib_hash_get_digest_size(mp_obj_t self_in) { + mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type)); + hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in); + return MP_OBJ_NEW_SMALL_INT(common_hal_hashlib_hash_get_digest_size(self)); +} +MP_PROPERTY_GETTER(hashlib_hash_digest_size_obj, hashlib_hash_get_digest_size); + +//| def update(self, data: ReadableBuffer) -> None: +//| """Update the hash with the given bytes. +//| +//| :param ~circuitpython_typing.ReadableBuffer data: Update the hash from data in this buffer""" +//| ... +//| +mp_obj_t hashlib_hash_update(mp_obj_t self_in, mp_obj_t buf_in) { + mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type)); + hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in); + + mp_buffer_info_t bufinfo; + mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ); + + common_hal_hashlib_hash_update(self, bufinfo.buf, bufinfo.len); + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_hash_update_obj, hashlib_hash_update); + +//| def digest(self) -> bytes: +//| """Returns the current digest as bytes() with a length of `hashlib.Hash.digest_size`.""" +//| ... +//| +STATIC mp_obj_t hashlib_hash_digest(mp_obj_t self_in) { + mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type)); + hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in); + + size_t size = common_hal_hashlib_hash_get_digest_size(self); + mp_obj_t obj = mp_obj_new_bytes_of_zeros(size); + mp_obj_str_t *o = MP_OBJ_TO_PTR(obj); + + common_hal_hashlib_hash_digest(self, (uint8_t *)o->data, size); + return obj; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_hash_digest_obj, hashlib_hash_digest); + +STATIC const mp_rom_map_elem_t hashlib_hash_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_PTR(&hashlib_hash_digest_size_obj) }, + { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_hash_update_obj) }, + { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_hash_digest_obj) }, +}; + +STATIC MP_DEFINE_CONST_DICT(hashlib_hash_locals_dict, hashlib_hash_locals_dict_table); + +const mp_obj_type_t hashlib_hash_type = { + { &mp_type_type }, + .name = MP_QSTR_Hash, + .locals_dict = (mp_obj_dict_t *)&hashlib_hash_locals_dict, +}; diff --git a/shared-bindings/hashlib/Hash.h b/shared-bindings/hashlib/Hash.h new file mode 100644 index 0000000000..f3845b02ff --- /dev/null +++ b/shared-bindings/hashlib/Hash.h @@ -0,0 +1,43 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB_HASH_H +#define MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB_HASH_H + +#include "py/obj.h" + +#include "common-hal/hashlib/Hash.h" + +extern const mp_obj_type_t hashlib_hash_type; + +// So that new can call it when given data. +mp_obj_t hashlib_hash_update(mp_obj_t self_in, mp_obj_t buf_in); + +void common_hal_hashlib_hash_update(hashlib_hash_obj_t *self, const uint8_t *data, size_t datalen); +void common_hal_hashlib_hash_digest(hashlib_hash_obj_t *self, uint8_t *data, size_t datalen); +size_t common_hal_hashlib_hash_get_digest_size(hashlib_hash_obj_t *self); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB_HASH_H diff --git a/shared-bindings/hashlib/__init__.c b/shared-bindings/hashlib/__init__.c new file mode 100644 index 0000000000..4b5be0165b --- /dev/null +++ b/shared-bindings/hashlib/__init__.c @@ -0,0 +1,90 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 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 + +#include "py/obj.h" +#include "py/mpconfig.h" +#include "py/runtime.h" +#include "shared-bindings/hashlib/__init__.h" +#include "shared-bindings/hashlib/Hash.h" +#include "supervisor/shared/translate/translate.h" + +//| """Hashing related functions +//| +//| |see_cpython_module| :mod:`cpython:hashlib`. +//| """ +//| +//| def new(name, data=b"") -> hashlib.Hash: +//| """Returns a Hash object setup for the named algorithm. Raises ValueError when the named +//| algorithm is unsupported. +//| +//| :return: a hash object for the given algorithm +//| :rtype: hashlib.Hash""" +//| ... +//| +STATIC mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_name, ARG_data }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_name, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_data, 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); + + const char *algorithm = mp_obj_str_get_str(args[ARG_name].u_obj); + + hashlib_hash_obj_t *self = m_new_obj(hashlib_hash_obj_t); + self->base.type = &hashlib_hash_type; + + if (!common_hal_hashlib_new(self, algorithm)) { + mp_raise_ValueError(translate("Unsupported hash algorithm")); + } + + if (args[ARG_data].u_obj != mp_const_none) { + hashlib_hash_update(self, args[ARG_data].u_obj); + } + return self; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(hashlib_new_obj, 1, hashlib_new); + +STATIC const mp_rom_map_elem_t hashlib_module_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) }, + + { MP_ROM_QSTR(MP_QSTR_new), MP_ROM_PTR(&hashlib_new_obj) }, + + // Hash is deliberately omitted here because CPython doesn't expose the + // object on `hashlib` only the internal `_hashlib`. +}; + +STATIC MP_DEFINE_CONST_DICT(hashlib_module_globals, hashlib_module_globals_table); + +const mp_obj_module_t hashlib_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&hashlib_module_globals, +}; + +MP_REGISTER_MODULE(MP_QSTR_hashlib, hashlib_module, CIRCUITPY_HASHLIB); diff --git a/shared-bindings/hashlib/__init__.h b/shared-bindings/hashlib/__init__.h new file mode 100644 index 0000000000..ae47b546a4 --- /dev/null +++ b/shared-bindings/hashlib/__init__.h @@ -0,0 +1,36 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB___INIT___H +#define MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB___INIT___H + +#include + +#include "shared-bindings/hashlib/Hash.h" + +bool common_hal_hashlib_new(hashlib_hash_obj_t *self, const char *algorithm); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_HASHLIB___INIT___H diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html new file mode 100644 index 0000000000..766a7a23e2 --- /dev/null +++ b/supervisor/shared/web_workflow/static/serial.html @@ -0,0 +1,16 @@ + + + + Simple client + + + + + 
    
+  
    
+    
+    
+    
+  
    
+
+
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
new file mode 100644
index 0000000000..36c980dc08
--- /dev/null
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -0,0 +1,43 @@
+
+var ws;
+
+function onSubmit() {
+  var input = document.getElementById("input");
+  // You can send message to the Web Socket using ws.send.
+  ws.send(input.value);
+  output("send: " + input.value);
+  input.value = "";
+  input.focus();
+}
+
+function onCloseClick() {
+  ws.close();
+}
+
+function output(str) {
+  var log = document.getElementById("log");
+  log.innerHTML += str;
+}
+
+// Connect to Web Socket
+ws = new WebSocket("ws://cpy-f57ce8.local/cp/serial/");
+// ws = new WebSocket("ws://127.0.0.1:9001")
+
+// Set event handlers.
+ws.onopen = function() {
+  output("onopen");
+};
+
+ws.onmessage = function(e) {
+  // e.data contains received string.
+  output("onmessage: " + e.data);
+};
+
+ws.onclose = function() {
+  output("onclose");
+};
+
+ws.onerror = function(e) {
+  output("onerror");
+  console.log(e)
+};
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 7fb68c302e..6ef1ccd767 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -3,8 +3,8 @@
 
     CircuitPython
     
+    
 
-
 
     
     Welcome!
    
     Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index cbe1b24e86..b9a1de67f2 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -86,6 +86,10 @@ typedef struct {
     bool authenticated;
     bool expect;
     bool json;
+    bool websocket;
+    uint32_t websocket_version;
+    // RFC6455 for websockets says this header should be 24 base64 characters long.
+    char websocket_key[24 + 1];
 } _request;
 
 static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE;
@@ -519,6 +523,7 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
         "Location: http://", hostname, ".local", path, "\r\n", NULL);
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
+    ESP_LOGI(TAG, "redirect");
 }
 
 static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) {
@@ -826,6 +831,8 @@ STATIC_FILE(directory_html);
 STATIC_FILE(directory_js);
 STATIC_FILE(welcome_html);
 STATIC_FILE(welcome_js);
+STATIC_FILE(serial_html);
+STATIC_FILE(serial_js);
 STATIC_FILE(blinka_16x16_ico);
 
 static void _reply_static(socketpool_socket_obj_t *socket, _request *request, const uint8_t *response, size_t response_len, const char *content_type) {
@@ -844,6 +851,13 @@ static void _reply_static(socketpool_socket_obj_t *socket, _request *request, co
 
 #define _REPLY_STATIC(socket, request, filename) _reply_static(socket, request, filename, filename##_length, filename##_content_type)
 
+static void _reply_websocket_upgrade(socketpool_socket_obj_t *socket, _request *request) {
+    ESP_LOGI(TAG, "websocket!");
+    // Compute accept key
+    // Reply with upgrade
+    // Copy socket state into websocket and mark given socket as closed even though it isn't actually.
+}
+
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         _reply_redirect(socket, request, request->path);
@@ -980,6 +994,22 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             _reply_with_devices_json(socket, request);
         } else if (strcmp(path, "/version.json") == 0) {
             _reply_with_version_json(socket, request);
+        } else if (strcmp(path, "/serial/") == 0) {
+            if (!request->authenticated) {
+                if (_api_password[0] != '\0') {
+                    _reply_unauthorized(socket, request);
+                } else {
+                    _reply_forbidden(socket, request);
+                }
+            } else if (request->websocket) {
+                ESP_LOGI(TAG, "websocket!");
+                _reply_websocket_upgrade(socket, request);
+            } else {
+                _REPLY_STATIC(socket, request, serial_html);
+            }
+            _reply_with_version_json(socket, request);
+        } else {
+            _reply_missing(socket, request);
         }
     } else if (strcmp(request->method, "GET") != 0) {
         _reply_method_not_allowed(socket, request);
@@ -992,6 +1022,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             _REPLY_STATIC(socket, request, directory_js);
         } else if (strcmp(request->path, "/welcome.js") == 0) {
             _REPLY_STATIC(socket, request, welcome_js);
+        } else if (strcmp(request->path, "/serial.js") == 0) {
+            _REPLY_STATIC(socket, request, serial_js);
         } else if (strcmp(request->path, "/favicon.ico") == 0) {
             // TODO: Autogenerate this based on the blinka bitmap and change the
             // palette based on MAC address.
@@ -1015,6 +1047,7 @@ static void _reset_request(_request *request) {
     request->authenticated = false;
     request->expect = false;
     request->json = false;
+    request->websocket = false;
 }
 
 static void _process_request(socketpool_socket_obj_t *socket, _request *request) {
@@ -1111,6 +1144,13 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                         strcpy(request->origin, request->header_value);
                     } else if (strcmp(request->header_key, "X-Timestamp") == 0) {
                         request->timestamp_ms = strtoull(request->header_value, NULL, 10);
+                    } else if (strcmp(request->header_key, "Upgrade") == 0) {
+                        request->websocket = strcmp(request->header_value, "websocket") == 0;
+                    } else if (strcmp(request->header_key, "Sec-WebSocket-Version") == 0) {
+                        request->websocket_version = strtoul(request->header_value, NULL, 10);
+                    } else if (strcmp(request->header_key, "Sec-WebSocket-Key") == 0 &&
+                               strlen(request->header_value) == 24) {
+                        strcpy(request->websocket_key, request->header_value);
                     }
                     ESP_LOGI(TAG, "Header %s %s", request->header_key, request->header_value);
                 } else if (request->offset > sizeof(request->header_value) - 1) {

From 38efb636c4360c8d8d4a05f3b4f8a13d6cc8bcc9 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Fri, 1 Jul 2022 13:14:00 +0000
Subject: [PATCH 0536/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (985 of 985 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index def6c74aa1..683d5b380f 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: 2022-06-16 08:18+0000\n"
+"PO-Revision-Date: 2022-07-01 17:46+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.13-dev\n"
+"X-Generator: Weblate 4.13.1-dev\n"
 
 #: main.c
 msgid ""
@@ -1181,7 +1181,7 @@ msgstr "Internt fel #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Intern watchdog-timer har löpt ut."
 
 #: py/argcheck.c
 msgid "Invalid %q"

From 6a9892e864df8d32bdfce5dbf9760381f1b37630 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 1 Jul 2022 13:57:15 -0500
Subject: [PATCH 0537/2403] link to workflow page in docs. Capitalize
 "Workflow"

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 15cfb41829..66ad78f6eb 100644
--- a/README.rst
+++ b/README.rst
@@ -90,11 +90,11 @@ If you'd like to use the term "CircuitPython" and Blinka for your product here i
 * Your product is listed on `circuitpython.org `__ (source
   `here `_). This is to ensure that a user of your
   product can always download the latest version of CircuitPython from the standard place.
-* Your product supports at least one standard "workflow" for serial and file access:
+* Your product supports at least one standard "`Workflow `__" for serial and file access:
   * With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
   * With file and serial access over Bluetooth Low Energy using the BLE Workflow.
-  * With file access over WiFi using the WiFi workflow, and serial access over USB.
-* Boards that do not support the USB workflow should be clearly marked.
+  * With file access over WiFi using the WiFi Workflow with serial access over USB and/or WebSocket.
+* Boards that do not support the USB Workflow should be clearly marked.
 
 If you choose not to meet these requirements, then we ask you call your version of CircuitPython
 something else (for example, SuperDuperPython) and not use the Blinka logo. You can say it is

From fd4695d0f20dbc5995fa7bd43c1af75b18ff2237 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Wed, 6 Apr 2022 14:20:28 -0700
Subject: [PATCH 0538/2403] Gettting started with pin mapping.

---
 ports/espressif/boards/lolin_c3_mini/board.c  | 48 ++++++++++
 .../boards/lolin_c3_mini/mpconfigboard.h      | 37 ++++++++
 .../boards/lolin_c3_mini/mpconfigboard.mk     | 21 +++++
 ports/espressif/boards/lolin_c3_mini/pins.c   | 91 +++++++++++++++++++
 .../espressif/boards/lolin_c3_mini/sdkconfig  | 37 ++++++++
 5 files changed, 234 insertions(+)
 create mode 100644 ports/espressif/boards/lolin_c3_mini/board.c
 create mode 100644 ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lolin_c3_mini/pins.c
 create mode 100644 ports/espressif/boards/lolin_c3_mini/sdkconfig

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
new file mode 100644
index 0000000000..0432485111
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
new file mode 100644
index 0000000000..12b0826e5c
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "LOLIN_C3_MINI" // from Wemos MP
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10) // no I2C labels on S2 Mini, def from Wemos MP
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // no I2C labels on S2 Mini, def from Wemos MP
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)   // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4) // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)  // no SPI labels on S2 Mini, def from Wemos MP
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
new file mode 100644
index 0000000000..d41a67a305
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -0,0 +1,21 @@
+USB_VID = 0x303A
+USB_PID = 0x80C3
+USB_PRODUCT = "C3 Mini"
+USB_MANUFACTURER = "Lolin"
+
+IDF_TARGET = esp32c3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
new file mode 100644
index 0000000000..a4b18c4e9b
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -0,0 +1,91 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // S2 Mini Board bottom, right, top-bottom
+    // GPIO0-GPIO14: broken out as a bloc on ESP32-S2FN4R2 SoC
+    // mpconfigboard.h: GPIO0: CIRCUITPY_BOOT_BUTTON
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },  // RTC_GPIO0,GPIO0
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },  // RTC_GPIO1,GPIO1,TOUCH1,ADC1_CH0
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },  // RTC_GPIO2,GPIO2,TOUCH2,ADC1_CH1
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },  // RTC_GPIO3,GPIO3,TOUCH3,ADC1_CH2
+    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO3) },  // D1 mini pin A0
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },  // RTC_GPIO4,GPIO4,TOUCH4,ADC1_CH3
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },  // RTC_GPIO5,GPIO5,TOUCH5,ADC1_CH4
+    { MP_ROM_QSTR(MP_QSTR_D0),  MP_ROM_PTR(&pin_GPIO5) },  // D1 mini pin D0 GPIO16
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },  // RTC_GPIO6,GPIO6,TOUCH6,ADC1_CH5
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },  // RTC_GPIO7,GPIO7,TOUCH7,ADC1_CH6
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) },  // def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D5),  MP_ROM_PTR(&pin_GPIO7) },  // D1 mini pin D5 GPIO14
+
+    // mpconfigboard.h: GPIO8/GPIO9: SCL/SDA I2C0
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },  // RTC_GPIO8,GPIO8,TOUCH8,ADC1_CH7
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },  // RTC_GPIO9,GPIO9,TOUCH9,ADC1_CH8,FSPIHD
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) }, // def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D6),  MP_ROM_PTR(&pin_GPIO9) },  // D1 mini pin D6 GPIO12
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },// RTC_GPIO10,GPIO10,TOUCH10,ADC1_CH9,FSPICS0,FSPIIO4
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },// RTC_GPIO11,GPIO11,TOUCH11,ADC2_CH0,FSPID,FSPIIO5
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D7),   MP_ROM_PTR(&pin_GPIO11) },// D1 mini pin D7 GPIO13
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },// RTC_GPIO12,GPIO12,TOUCH12,ADC2_CH1,FSPICLK,FSPIIO6
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },// RTC_GPIO13,GPIO13,TOUCH13,ADC2_CH2,FSPIQ,FSPIIO7
+    { MP_ROM_QSTR(MP_QSTR_D8),   MP_ROM_PTR(&pin_GPIO13) },// D1 mini pin D8 GPIO15
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },// RTC_GPIO14,GPIO14,TOUCH14,ADC2_CH3,FSPIWP,FSPIDQS
+
+    // S2 Mini Board bottom, left, bottom-top
+    // mpconfigboard.h: GPIO15: CIRCUITPY_STATUS_LED_POWER
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },// XTAL_32K_P: RTC_GPIO15,GPIO15,U0RTS,ADC2_CH4,XTAL_32K_P
+
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },// XTAL_32K_N: RTC_GPIO16,GPIO16,U0CTS,ADC2_CH5,XTAL_32K_N
+    { MP_ROM_QSTR(MP_QSTR_D4),   MP_ROM_PTR(&pin_GPIO16) },// D1 mini pin D4 GPIO2 LED
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },// DAC_1: RTC_GPIO17,GPIO17,U1TXD,ADC2_CH6,DAC_1
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },// DAC_2: RTC_GPIO18,GPIO18,U1RXD,ADC2_CH7,DAC_2,CLK_OUT3
+    { MP_ROM_QSTR(MP_QSTR_D3),   MP_ROM_PTR(&pin_GPIO18) },// D1 mini pin D3 GPIO0
+    // skip GPIO19-GPIO20: USB_D-/USB_D+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },// RTC_GPIO21,GPIO21
+
+    // skip GPIO22-GPIO25: not broken out on ESP32-S2FN4R2 SoC
+    // skip GPIO26-GPIO32: SPI Flash & RAM, not broken out on S2 Mini (internal to ESP32-S2FN4R2 SoC?)
+
+    // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO33) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D2),   MP_ROM_PTR(&pin_GPIO33) },// D1 mini pin D2 GPIO4
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },// SPIIO5,GPIO34,FSPICS0
+
+    // mpconfigboard.h: GPIO35/GPIO36/GPIO37: MOSI/MESO/SCK SPI
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },// SPIIO6,GPIO35,FSPID
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO35) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D1),   MP_ROM_PTR(&pin_GPIO35) },// D1 mini pin D1 GPIO5
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },// SPIIO7,GPIO36,FSPICLK
+
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },// SPIDQS,GPIO37,FSPIQ
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },//        GPIO38,FSPIWP
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },// MTCK,GPIO39,CLK_OUT3
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },// MTDO,GPIO40,CLK_OUT2
+
+    // S2 Mini - not broken out on board
+    /*
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },// MTDI,GPIO41,CLK_OUT1
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },// MTMS,GPIO42
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },  // U0TXD,GPIO43,CLK_OUT1
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },//
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },  // U0RXD,GPIO44,CLK_OUT2
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },// GPIO45
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },// GPIO46
+    */
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, // board singleton implicit from schematic/shield standard
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
new file mode 100644
index 0000000000..007cca768e
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="LC3Mini"
+# end of LWIP

From dc1c86738a213bb08279899104636fbf39dfc1c8 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:52:22 -0700
Subject: [PATCH 0539/2403] Initial pin mapping pass

---
 .../boards/lolin_c3_mini/mpconfigboard.h      |  14 +-
 .../boards/lolin_c3_mini/mpconfigboard.mk     |   4 +-
 ports/espressif/boards/lolin_c3_mini/pins.c   | 129 +++++++-----------
 3 files changed, 57 insertions(+), 90 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 12b0826e5c..b45cc706a0 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -29,9 +29,13 @@
 #define MICROPY_HW_BOARD_NAME       "LOLIN_C3_MINI" // from Wemos MP
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10) // no I2C labels on S2 Mini, def from Wemos MP
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // no I2C labels on S2 Mini, def from Wemos MP
+// From Wemos C3 Mini Schematic
+// https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
+// And MP Config
+// https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)   // no SPI labels on S2 Mini, def from Wemos MP
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4) // no SPI labels on S2 Mini, def from Wemos MP
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)  // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d41a67a305..d353ff4497 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x303A
-USB_PID = 0x80C3
+USB_VID = 0x303A # TODO: I Assume this is Wemos, need to check
+USB_PID = 0x80C3 # TODO: Does this board have a new PID?
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index a4b18c4e9b..1406ae19bc 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -3,89 +3,52 @@
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
-    // S2 Mini Board bottom, right, top-bottom
-    // GPIO0-GPIO14: broken out as a bloc on ESP32-S2FN4R2 SoC
-    // mpconfigboard.h: GPIO0: CIRCUITPY_BOOT_BUTTON
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },  // RTC_GPIO0,GPIO0
-    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },  // RTC_GPIO1,GPIO1,TOUCH1,ADC1_CH0
+    // C3 Mini Board
+    // From Wemos C3 Mini Schematic
+    // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
+    // Starting on Left side going counterclockwise
+    // And MP Config
+    // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
 
-    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },  // RTC_GPIO2,GPIO2,TOUCH2,ADC1_CH1
-    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },  // RTC_GPIO3,GPIO3,TOUCH3,ADC1_CH2
-    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO3) },  // D1 mini pin A0
-
-    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },  // RTC_GPIO4,GPIO4,TOUCH4,ADC1_CH3
-    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },  // RTC_GPIO5,GPIO5,TOUCH5,ADC1_CH4
-    { MP_ROM_QSTR(MP_QSTR_D0),  MP_ROM_PTR(&pin_GPIO5) },  // D1 mini pin D0 GPIO16
-
-    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },  // RTC_GPIO6,GPIO6,TOUCH6,ADC1_CH5
-    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },  // RTC_GPIO7,GPIO7,TOUCH7,ADC1_CH6
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) },  // def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D5),  MP_ROM_PTR(&pin_GPIO7) },  // D1 mini pin D5 GPIO14
-
-    // mpconfigboard.h: GPIO8/GPIO9: SCL/SDA I2C0
-    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },  // RTC_GPIO8,GPIO8,TOUCH8,ADC1_CH7
-    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },  // RTC_GPIO9,GPIO9,TOUCH9,ADC1_CH8,FSPIHD
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) }, // def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D6),  MP_ROM_PTR(&pin_GPIO9) },  // D1 mini pin D6 GPIO12
-
-    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },// RTC_GPIO10,GPIO10,TOUCH10,ADC1_CH9,FSPICS0,FSPIIO4
-    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },// RTC_GPIO11,GPIO11,TOUCH11,ADC2_CH0,FSPID,FSPIIO5
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D7),   MP_ROM_PTR(&pin_GPIO11) },// D1 mini pin D7 GPIO13
-
-    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },// RTC_GPIO12,GPIO12,TOUCH12,ADC2_CH1,FSPICLK,FSPIIO6
-    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },// RTC_GPIO13,GPIO13,TOUCH13,ADC2_CH2,FSPIQ,FSPIIO7
-    { MP_ROM_QSTR(MP_QSTR_D8),   MP_ROM_PTR(&pin_GPIO13) },// D1 mini pin D8 GPIO15
-
-    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },// RTC_GPIO14,GPIO14,TOUCH14,ADC2_CH3,FSPIWP,FSPIDQS
-
-    // S2 Mini Board bottom, left, bottom-top
-    // mpconfigboard.h: GPIO15: CIRCUITPY_STATUS_LED_POWER
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },// XTAL_32K_P: RTC_GPIO15,GPIO15,U0RTS,ADC2_CH4,XTAL_32K_P
-
-    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },// XTAL_32K_N: RTC_GPIO16,GPIO16,U0CTS,ADC2_CH5,XTAL_32K_N
-    { MP_ROM_QSTR(MP_QSTR_D4),   MP_ROM_PTR(&pin_GPIO16) },// D1 mini pin D4 GPIO2 LED
-    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },// DAC_1: RTC_GPIO17,GPIO17,U1TXD,ADC2_CH6,DAC_1
-
-    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },// DAC_2: RTC_GPIO18,GPIO18,U1RXD,ADC2_CH7,DAC_2,CLK_OUT3
-    { MP_ROM_QSTR(MP_QSTR_D3),   MP_ROM_PTR(&pin_GPIO18) },// D1 mini pin D3 GPIO0
-    // skip GPIO19-GPIO20: USB_D-/USB_D+
-    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },// RTC_GPIO21,GPIO21
-
-    // skip GPIO22-GPIO25: not broken out on ESP32-S2FN4R2 SoC
-    // skip GPIO26-GPIO32: SPI Flash & RAM, not broken out on S2 Mini (internal to ESP32-S2FN4R2 SoC?)
-
-    // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG
-    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD
-    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO33) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D2),   MP_ROM_PTR(&pin_GPIO33) },// D1 mini pin D2 GPIO4
-    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },// SPIIO5,GPIO34,FSPICS0
-
-    // mpconfigboard.h: GPIO35/GPIO36/GPIO37: MOSI/MESO/SCK SPI
-    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },// SPIIO6,GPIO35,FSPID
-    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO35) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D1),   MP_ROM_PTR(&pin_GPIO35) },// D1 mini pin D1 GPIO5
-    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },// SPIIO7,GPIO36,FSPICLK
-
-    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },// SPIDQS,GPIO37,FSPIQ
-    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },//        GPIO38,FSPIWP
-
-    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },// MTCK,GPIO39,CLK_OUT3
-    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },// MTDO,GPIO40,CLK_OUT2
-
-    // S2 Mini - not broken out on board
-    /*
-    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },// MTDI,GPIO41,CLK_OUT1
-    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },// MTMS,GPIO42
-    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },  // U0TXD,GPIO43,CLK_OUT1
-    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },//
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },  // U0RXD,GPIO44,CLK_OUT2
-    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
-    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },// GPIO45
-    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },// GPIO46
-    */
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, // board singleton implicit from schematic/shield standard
+    // 1: LAN_IN
+    // 2: VDD3P3
+    // 3: VDD3P3
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
+    // 7: CHIP_EN
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
+    // 11: VDD3P3_RTC
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, // 16: GPIO10/FSPICS0
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
+    // 17: VDD3P3_SPI
+    // 18: VDD_SPI
+    // 19: SPIHD
+    // 20: SPIWP
+    // 21: SPICSO
+    // 22: SPICLK
+    // 23: SPID
+    // 24: SPIQ
+    // Used for USB 25: GPIO18/D-
+    // Used for USB 26: GPIO19/D+
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO22) }, // 28: FPIO22/U0TXD
+    // 29: XTAL_N
+    // 30: XTAL_P
+    // 31: VDDA
+    // 32: VDDA
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From bcf27e146be86f2c2dde6cdf249b068915072351 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:16:15 -0700
Subject: [PATCH 0540/2403] fix build break and add io 20/21

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 1406ae19bc..82c0499ab5 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -31,9 +31,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
     { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
-    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, // 16: GPIO10/FSPICS0
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
     { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-    // 17: VDD3P3_SPI
+    // 17: VDD3P3_CPJ
     // 18: VDD_SPI
     // 19: SPIHD
     // 20: SPIWP
@@ -44,7 +44,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // Used for USB 25: GPIO18/D-
     // Used for USB 26: GPIO19/D+
     { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO22) }, // 28: FPIO22/U0TXD
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
     // 29: XTAL_N
     // 30: XTAL_P
     // 31: VDDA

From 6763b7b968bcea6e156522cc600646864babd667 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:32:58 -0700
Subject: [PATCH 0541/2403] add A5

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 82c0499ab5..fcbb97232c 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -24,6 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
     // 11: VDD3P3_RTC
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h

From 9bae8549c517cb6bb78148d56d76eca74e47b81d Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:40:10 -0700
Subject: [PATCH 0542/2403] add UART RX TX to mpconfigboard

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index b45cc706a0..5c253a4d33 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -39,3 +39,6 @@
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
 #define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO21)

From c1e6003d2676e564bf9863e979992d35bda72460 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:56:41 -0700
Subject: [PATCH 0543/2403] remove comment that breaks {ID Checker

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d353ff4497..d41a67a305 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x303A # TODO: I Assume this is Wemos, need to check
-USB_PID = 0x80C3 # TODO: Does this board have a new PID?
+USB_VID = 0x303A
+USB_PID = 0x80C3
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 

From af629ab180dbcb44a9f605c8ad533d810dedcc02 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:50:07 -0700
Subject: [PATCH 0544/2403] Add assumed PID value

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d41a67a305..b745b2d29e 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x303A
-USB_PID = 0x80C3
+USB_PID = 0x80F5
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 

From f95edd93a0fd090c89748b13ab7a04f55c504e84 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:09:33 -0700
Subject: [PATCH 0545/2403] C3 boards are Bin only

---
 tools/build_board_info.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 72ccb98551..79d9bf7b46 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -77,6 +77,7 @@ extension_by_board = {
     "ai_thinker_esp32-c3s-2m": BIN,
     "espressif_esp32c3_devkitm_1_n4": BIN,
     "lilygo_ttgo_t-01c3": BIN,
+    "lolin-c3-mini": BIN,
     "microdev_micro_c3": BIN,
     "lilygo_ttgo_t-oi-plus": BIN,
     # broadcom

From 03c1871d6b2972cecdbbc562db9cf3a927234d69 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:19:56 -0700
Subject: [PATCH 0546/2403] Folders have underscores not dashes

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

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 79d9bf7b46..d73f0e3f1c 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -77,7 +77,7 @@ extension_by_board = {
     "ai_thinker_esp32-c3s-2m": BIN,
     "espressif_esp32c3_devkitm_1_n4": BIN,
     "lilygo_ttgo_t-01c3": BIN,
-    "lolin-c3-mini": BIN,
+    "lolin_c3_mini": BIN,
     "microdev_micro_c3": BIN,
     "lilygo_ttgo_t-oi-plus": BIN,
     # broadcom

From b37236f83f45692bab0933d9443ca36ff77e77d6 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:44:49 -0700
Subject: [PATCH 0547/2403] C3 does not have PSRAM

---
 .../espressif/boards/lolin_c3_mini/sdkconfig  | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index 007cca768e..b96cda80a6 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,35 +1,4 @@
-CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=2097152
-# end of SPI RAM config
-
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-#
-# PSRAM clock and cs IO for ESP32S2
-#
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM clock and cs IO for ESP32S2
-
-# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
-# CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_SPEED_80M is not set
-CONFIG_SPIRAM_SPEED_40M=y
-# CONFIG_SPIRAM_SPEED_26M is not set
-# CONFIG_SPIRAM_SPEED_20M is not set
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
 #
 # LWIP
 #

From a3070f6c2a6057182a8972d3980cd47eb95df669 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 12 Apr 2022 20:05:41 -0700
Subject: [PATCH 0548/2403] Changes to Pin Mappings

---
 ports/espressif/boards/lolin_c3_mini/board.c  |  4 +--
 .../boards/lolin_c3_mini/mpconfigboard.h      |  4 +++
 .../boards/lolin_c3_mini/mpconfigboard.mk     |  4 +--
 ports/espressif/boards/lolin_c3_mini/pins.c   | 26 ++++++++++++++-----
 .../espressif/boards/lolin_c3_mini/sdkconfig  |  3 +--
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
index 0432485111..d77b968d3e 100644
--- a/ports/espressif/boards/lolin_c3_mini/board.c
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -31,8 +31,8 @@
 void board_init(void) {
     // Debug UART
     #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
+    common_hal_never_reset_pin(&pin_GPIO20);
+    common_hal_never_reset_pin(&pin_GPIO21);
     #endif /* DEBUG */
 }
 
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 5c253a4d33..3956d2c5b0 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -42,3 +42,7 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_GPIO20)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO21)
+
+// // Serial over UART
+#define CIRCUITPY_DEBUG_UART_RX     DEFAULT_UART_BUS_RX
+#define CIRCUITPY_DEBUG_UART_TX     DEFAULT_UART_BUS_TX
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index b745b2d29e..60c8639232 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x303A
 USB_PID = 0x80F5
-USB_PRODUCT = "C3 Mini"
-USB_MANUFACTURER = "Lolin"
+USB_PRODUCT = "Lolin C3 Mini"
+USB_MANUFACTURER = "Wemos"
 
 IDF_TARGET = esp32c3
 
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index fcbb97232c..230ed31b9f 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -7,25 +7,32 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // From Wemos C3 Mini Schematic
     // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
     // Starting on Left side going counterclockwise
-    // And MP Config
+    // MP Config
     // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
+    // C3 Data Sheet
+    // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
     // 1: LAN_IN
     // 2: VDD3P3
     // 3: VDD3P3
+
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
+
     // 7: CHIP_EN
+
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
-    // 11: VDD3P3_RTC
+
+    // 11: VDD3P3_RTC: Input power supply for RTC
+
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
@@ -34,24 +41,29 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
     { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-    // 17: VDD3P3_CPJ
+
+    // 17: VDD3P3_CPU: Input power supply for CPU IO
     // 18: VDD_SPI
+
+    // Ports of embedded flash for ESP32-C3FH4
     // 19: SPIHD
     // 20: SPIWP
     // 21: SPICSO
     // 22: SPICLK
     // 23: SPID
     // 24: SPIQ
-    // Used for USB 25: GPIO18/D-
-    // Used for USB 26: GPIO19/D+
+
+    // 25: GPIO18/D-: Used for USB
+    // 26: GPIO19/D+: Used for USB
+
     { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
-    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
     // 29: XTAL_N
     // 30: XTAL_P
     // 31: VDDA
     // 32: VDDA
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index b96cda80a6..833f8368fa 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,6 +1,5 @@
-# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="LC3Mini"
+CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP

From f10fa566aacc9d4fc67fbd3b77a9c3f8f598bb34 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Wed, 13 Apr 2022 00:21:29 -0700
Subject: [PATCH 0549/2403] REPL works. Based on QTPYC3.

---
 ports/espressif/boards/lolin_c3_mini/board.c  | 15 ++-
 .../boards/lolin_c3_mini/mpconfigboard.h      | 27 ++---
 .../boards/lolin_c3_mini/mpconfigboard.mk     |  9 --
 ports/espressif/boards/lolin_c3_mini/pins.c   | 99 +++++++++----------
 4 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
index d77b968d3e..8bca964dc7 100644
--- a/ports/espressif/boards/lolin_c3_mini/board.c
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -24,24 +24,23 @@
  * THE SOFTWARE.
  */
 
-#include "supervisor/board.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
+
+#include "components/driver/include/driver/gpio.h"
 
 void board_init(void) {
-    // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO20);
-    common_hal_never_reset_pin(&pin_GPIO21);
-    #endif /* DEBUG */
 }
 
 bool board_requests_safe_mode(void) {
     return false;
 }
 
-void reset_board(void) {
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    return false;
+}
 
+void reset_board(void) {
 }
 
 void board_deinit(void) {
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 3956d2c5b0..03e4d5d436 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -24,25 +24,28 @@
  * THE SOFTWARE.
  */
 
-// Micropython setup
+// Board setup
 
-#define MICROPY_HW_BOARD_NAME       "LOLIN_C3_MINI" // from Wemos MP
+#define MICROPY_HW_BOARD_NAME       "Wemos Lolin C3 Mini" // from Wemos MP
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
 
 // From Wemos C3 Mini Schematic
 // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
 // And MP Config
 // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
+// Status LED
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO7)
 
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO6, .sda = &pin_GPIO5}}
 
-#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO10, .mosi = &pin_GPIO7, .miso = &pin_GPIO8}}
 
-// // Serial over UART
-#define CIRCUITPY_DEBUG_UART_RX     DEFAULT_UART_BUS_RX
-#define CIRCUITPY_DEBUG_UART_TX     DEFAULT_UART_BUS_TX
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 60c8639232..793730f025 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -6,16 +6,7 @@ USB_MANUFACTURER = "Wemos"
 IDF_TARGET = esp32c3
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
 CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
-
-
-# Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 230ed31b9f..d3828311ed 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -4,7 +4,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
     // C3 Mini Board
-    // From Wemos C3 Mini Schematic
+    // Wemos Lolin C3 Mini Schematic
     // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
     // Starting on Left side going counterclockwise
     // MP Config
@@ -12,58 +12,51 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
-    // 1: LAN_IN
-    // 2: VDD3P3
-    // 3: VDD3P3
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
-
-    // 7: CHIP_EN
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
-
-    // 11: VDD3P3_RTC: Input power supply for RTC
-
-    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
-    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
-    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
-    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
-    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-
-    // 17: VDD3P3_CPU: Input power supply for CPU IO
-    // 18: VDD_SPI
-
-    // Ports of embedded flash for ESP32-C3FH4
-    // 19: SPIHD
-    // 20: SPIWP
-    // 21: SPICSO
-    // 22: SPICLK
-    // 23: SPID
-    // 24: SPIQ
-
-    // 25: GPIO18/D-: Used for USB
-    // 26: GPIO19/D+: Used for USB
-
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
-
-    // 29: XTAL_N
-    // 30: XTAL_P
-    // 31: VDDA
-    // 32: VDDA
-
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 3253ae250312a57e0c542452c93c945bee7137f6 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:34:36 -0700
Subject: [PATCH 0550/2403] tested and corrected several pins

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 62 ++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index d3828311ed..8078ffad48 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -12,49 +12,49 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
 
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
 
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
-
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
-
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
 
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
-
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
-
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
-
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
 
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+
     { 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) },

From 6c7faf0eba6dbdd3119b0b4af97e363c88f0beba Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:54:59 -0700
Subject: [PATCH 0551/2403] Change USB VID & PID to Creator and Creation IDs

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 793730f025..bdb569f430 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,7 +1,5 @@
-USB_VID = 0x303A
-USB_PID = 0x80F5
-USB_PRODUCT = "Lolin C3 Mini"
-USB_MANUFACTURER = "Wemos"
+CIRCUITPY_CREATOR_ID =  0x1988_1988
+CIRCUITPY_CREATION_ID = 0x00C3_0001
 
 IDF_TARGET = esp32c3
 

From d4b26daf1be096367e73b467ad626bb556f23dc8 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Sat, 11 Jun 2022 23:41:35 -0700
Subject: [PATCH 0552/2403] correct creator and creation IDs

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index bdb569f430..28e4190adf 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x1988_1988
-CIRCUITPY_CREATION_ID = 0x00C3_0001
+CIRCUITPY_CREATOR_ID =  0x19881988
+CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 

From 7e367eeb584ff1dbc2e15c8ee0f91a9297a4c13d Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Thu, 16 Jun 2022 00:09:26 -0700
Subject: [PATCH 0553/2403] Update "D" mappings

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 34 ++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 8078ffad48..ccc70f6043 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -12,47 +12,59 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
 
-    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
 
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },

From aa53d3693428590c09a461fe20b130717634708f Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Thu, 23 Jun 2022 14:54:23 -0700
Subject: [PATCH 0554/2403] setting CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER to 8.5

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index 833f8368fa..b511505909 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,5 +1,6 @@
 #
 # LWIP
 #
+CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=8.5
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP

From aaeda978184006a7ce9271e778ce93a63adf89fd Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Mon, 27 Jun 2022 21:57:32 -0700
Subject: [PATCH 0555/2403] update PHY section, correct name

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index b511505909..d997c9aa57 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,6 +1,13 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=15
+# end of PHY
+
 #
 # LWIP
 #
-CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=8.5
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP
+
+

From c3cf9ba9cea944ff5783a530b68121a7e8f7d266 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:47:58 -0700
Subject: [PATCH 0556/2403] remove wifi max from sdkconfig

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index d997c9aa57..2cb6b06589 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,9 +1,3 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=15
-# end of PHY
-
 #
 # LWIP
 #

From 07b2697ae387e3157616e606ed970291d487270c Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 1 Jul 2022 16:57:10 -0700
Subject: [PATCH 0557/2403] WIP websocket to serial

---
 ports/espressif/common-hal/hashlib/Hash.c     |   5 +
 py/circuitpy_mpconfig.mk                      |   3 +
 supervisor/shared/serial.c                    |  27 +++
 supervisor/shared/web_workflow/web_workflow.c |  41 +++-
 supervisor/shared/web_workflow/websocket.c    | 179 ++++++++++++++++++
 supervisor/shared/web_workflow/websocket.h    |  38 ++++
 supervisor/supervisor.mk                      |   4 +-
 7 files changed, 288 insertions(+), 9 deletions(-)
 create mode 100644 supervisor/shared/web_workflow/websocket.c
 create mode 100644 supervisor/shared/web_workflow/websocket.h

diff --git a/ports/espressif/common-hal/hashlib/Hash.c b/ports/espressif/common-hal/hashlib/Hash.c
index 8e2ab02edb..8090128acb 100644
--- a/ports/espressif/common-hal/hashlib/Hash.c
+++ b/ports/espressif/common-hal/hashlib/Hash.c
@@ -40,7 +40,12 @@ void common_hal_hashlib_hash_digest(hashlib_hash_obj_t *self, uint8_t *data, siz
         return;
     }
     if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) {
+        // We copy the sha1 state so we can continue to update if needed or get
+        // the digest a second time.
+        mbedtls_sha1_context copy;
+        mbedtls_sha1_clone(©, &self->sha1);
         mbedtls_sha1_finish_ret(&self->sha1, data);
+        mbedtls_sha1_clone(&self->sha1, ©);
     }
 }
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 8505fe1cb7..de88dcc727 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -242,6 +242,9 @@ CFLAGS += -DCIRCUITPY_GIFIO=$(CIRCUITPY_GIFIO)
 CIRCUITPY_GNSS ?= 0
 CFLAGS += -DCIRCUITPY_GNSS=$(CIRCUITPY_GNSS)
 
+CIRCUITPY_HASHLIB ?= $(CIRCUITPY_WEB_WORKFLOW)
+CFLAGS += -DCIRCUITPY_HASHLIB=$(CIRCUITPY_HASHLIB)
+
 CIRCUITPY_I2CPERIPHERAL ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_I2CPERIPHERAL=$(CIRCUITPY_I2CPERIPHERAL)
 
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index af90fce4d7..04e974e4b5 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -45,6 +45,10 @@
 #include "tusb.h"
 #endif
 
+#if CIRCUITPY_WEB_WORKFLOW
+#include "supervisor/shared/web_workflow/websocket.h"
+#endif
+
 /*
  * Note: DEBUG_UART currently only works on STM32 and nRF.
  * Enabling on another platform will cause a crash.
@@ -165,6 +169,13 @@ bool serial_connected(void) {
     }
     #endif
 
+    #if CIRCUITPY_WEB_WORKFLOW
+    if (websocket_connected()) {
+        return true;
+    }
+    #endif
+
+
     if (port_serial_connected()) {
         return true;
     }
@@ -195,6 +206,12 @@ char serial_read(void) {
     }
     #endif
 
+    #if CIRCUITPY_WEB_WORKFLOW
+    if (websocket_available()) {
+        return websocket_read_char();
+    }
+    #endif
+
     #if CIRCUITPY_USB_CDC
     if (!usb_cdc_console_enabled()) {
         return -1;
@@ -229,6 +246,12 @@ bool serial_bytes_available(void) {
     }
     #endif
 
+    #if CIRCUITPY_WEB_WORKFLOW
+    if (websocket_available()) {
+        return true;
+    }
+    #endif
+
     #if CIRCUITPY_USB_CDC
     if (usb_cdc_console_enabled() && tud_cdc_available() > 0) {
         return true;
@@ -271,6 +294,10 @@ void serial_write_substring(const char *text, uint32_t length) {
     ble_serial_write(text, length);
     #endif
 
+    #if CIRCUITPY_WEB_WORKFLOW
+    websocket_write(text, length);
+    #endif
+
     #if CIRCUITPY_USB_CDC
     if (!usb_cdc_console_enabled()) {
         return;
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index b9a1de67f2..07298c17e9 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -39,8 +39,11 @@
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
+#include "supervisor/shared/web_workflow/websocket.h"
 #include "supervisor/usb.h"
 
+#include "shared-bindings/hashlib/__init__.h"
+#include "shared-bindings/hashlib/Hash.h"
 #include "shared-bindings/mdns/RemoteService.h"
 #include "shared-bindings/mdns/Server.h"
 #include "shared-bindings/socketpool/__init__.h"
@@ -260,20 +263,19 @@ void supervisor_start_web_workflow(void) {
     active.num = -1;
     active.connected = false;
 
+    websocket_init();
+
     // TODO:
     // GET /cp/serial.txt
     //   - Most recent 1k of serial output.
     // GET /edit/
     //   - Super basic editor
-    // GET /ws/circuitpython
-    // GET /ws/user
-    //   - WebSockets
     #endif
 }
 
 static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
     int sent = -EAGAIN;
-    while (sent == -EAGAIN) {
+    while (sent == -EAGAIN && common_hal_socketpool_socket_get_connected(socket)) {
         sent = socketpool_socket_send(socket, buf, len);
     }
     if (sent < len) {
@@ -851,17 +853,39 @@ static void _reply_static(socketpool_socket_obj_t *socket, _request *request, co
 
 #define _REPLY_STATIC(socket, request, filename) _reply_static(socket, request, filename, filename##_length, filename##_content_type)
 
+
+
 static void _reply_websocket_upgrade(socketpool_socket_obj_t *socket, _request *request) {
     ESP_LOGI(TAG, "websocket!");
     // Compute accept key
+    hashlib_hash_obj_t hash;
+    common_hal_hashlib_new(&hash, "sha1");
+    common_hal_hashlib_hash_update(&hash, (const uint8_t *)request->websocket_key, strlen(request->websocket_key));
+    const char *magic_string = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    common_hal_hashlib_hash_update(&hash, (const uint8_t *)magic_string, strlen(magic_string));
+    size_t digest_size = common_hal_hashlib_hash_get_digest_size(&hash);
+    size_t encoded_size = (digest_size + 1) * 4 / 3 + 1;
+    uint8_t encoded_accept[encoded_size];
+    common_hal_hashlib_hash_digest(&hash, encoded_accept, sizeof(encoded_accept));
+    _base64_in_place((char *)encoded_accept, digest_size, encoded_size);
+
     // Reply with upgrade
-    // Copy socket state into websocket and mark given socket as closed even though it isn't actually.
+    _send_strs(socket, "HTTP/1.1 101 Switching Protocols\r\n",
+        "Upgrade: websocket\r\n",
+        "Connection: Upgrade\r\n",
+        "Sec-WebSocket-Accept: ", encoded_accept, "\r\n",
+        "\r\n", NULL);
+    websocket_handoff(socket);
+
+    ESP_LOGI(TAG, "socket upgrade done");
+    // socket is now closed and "disconnected".
 }
 
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         _reply_redirect(socket, request, request->path);
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
+        ESP_LOGI(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (memcmp(request->path, "/fs/", 4) == 0) {
         if (!request->authenticated) {
@@ -995,7 +1019,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else if (strcmp(path, "/version.json") == 0) {
             _reply_with_version_json(socket, request);
         } else if (strcmp(path, "/serial/") == 0) {
-            if (!request->authenticated) {
+            if (false && !request->authenticated) {
                 if (_api_password[0] != '\0') {
                     _reply_unauthorized(socket, request);
                 } else {
@@ -1007,7 +1031,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             } else {
                 _REPLY_STATIC(socket, request, serial_html);
             }
-            _reply_with_version_json(socket, request);
         } else {
             _reply_missing(socket, request);
         }
@@ -1177,6 +1200,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
         return;
     }
     bool reload = _reply(socket, request);
+    ESP_LOGI(TAG, "reply done");
     _reset_request(request);
     autoreload_resume(AUTORELOAD_SUSPEND_WEB);
     if (reload) {
@@ -1194,10 +1218,12 @@ void supervisor_web_workflow_background(void) {
         uint32_t port;
         int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port);
         if (newsoc == -EBADF) {
+            ESP_LOGI(TAG, "listen closed");
             common_hal_socketpool_socket_close(&listening);
             return;
         }
         if (newsoc > 0) {
+            ESP_LOGI(TAG, "new socket %d", newsoc);
             // Close the active socket because we have another we accepted.
             if (!common_hal_socketpool_socket_get_closed(&active)) {
                 common_hal_socketpool_socket_close(&active);
@@ -1218,6 +1244,7 @@ void supervisor_web_workflow_background(void) {
 
     // If we have a request in progress, continue working on it.
     if (common_hal_socketpool_socket_get_connected(&active)) {
+        ESP_LOGI(TAG, "active connected");
         _process_request(&active, &active_request);
     }
 }
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
new file mode 100644
index 0000000000..8aec9d206c
--- /dev/null
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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/web_workflow/websocket.h"
+
+typedef struct {
+    socketpool_socket_obj_t socket;
+    uint8_t opcode;
+    uint8_t frame_len;
+    uint8_t payload_len_size;
+    bool masked;
+    uint32_t mask;
+    size_t frame_index;
+    size_t payload_remaining;
+} _websocket;
+
+static _websocket cp_serial;
+
+static const char *TAG = "CP websocket";
+
+void websocket_init(void) {
+    cp_serial.socket.num = -1;
+    cp_serial.socket.connected = false;
+}
+
+void websocket_handoff(socketpool_socket_obj_t *socket) {
+    ESP_LOGI(TAG, "socket handed off");
+    cp_serial.socket = *socket;
+    // Mark the original socket object as closed without telling the lower level.
+    socket->connected = false;
+    socket->num = -1;
+    ESP_LOGI(TAG, "socket hand off done");
+}
+
+bool websocket_connected(void) {
+    return common_hal_socketpool_socket_get_connected(&cp_serial.socket);
+}
+
+static bool _read_byte(uint8_t *c) {
+    int len = socketpool_socket_recv_into(&cp_serial.socket, c, 1);
+    if (len != 1) {
+        if (len != -EAGAIN) {
+            ESP_LOGE(TAG, "recv error %d", len);
+        }
+        return false;
+    }
+    return true;
+}
+
+static void _read_next_frame_header(void) {
+    uint8_t h;
+    if (cp_serial.frame_index == 0 && _read_byte(&h)) {
+        cp_serial.frame_index++;
+        cp_serial.opcode = h & 0xf;
+        ESP_LOGI(TAG, "fin %d opcode %x", h >> 7, cp_serial.opcode);
+    }
+    if (cp_serial.frame_index == 1 && _read_byte(&h)) {
+        cp_serial.frame_index++;
+        uint8_t len = h & 0xf;
+        cp_serial.masked = (h >> 7) == 1;
+        if (len <= 125) {
+            cp_serial.payload_remaining = len;
+            cp_serial.payload_len_size = 0;
+        } else if (len == 126) { // 16 bit length
+            cp_serial.payload_len_size = 2;
+        } else if (len == 127) { // 64 bit length
+            cp_serial.payload_len_size = 8;
+        }
+        cp_serial.frame_len = 2 + cp_serial.payload_len_size;
+        if (cp_serial.masked) {
+            cp_serial.frame_len += 4;
+        }
+
+        ESP_LOGI(TAG, "mask %d length %x", cp_serial.masked, len);
+    }
+    while (cp_serial.frame_index > 1 &&
+           cp_serial.frame_index < (cp_serial.payload_len_size + 2) &&
+           _read_byte(&h)) {
+        cp_serial.frame_index++;
+        cp_serial.payload_remaining = cp_serial.payload_remaining << 8 | c;
+    }
+    while (cp_serial.frame_index > (cp_serial.payload_len_size + 2) &&
+           cp_serial.frame_index < cp_serial.frame_len &&
+           _read_byte(&h)) {
+        cp_serial.frame_index++;
+        cp_serial.mask = cp_serial.mask << 8 | c;
+    }
+}
+
+static bool _read_next_payload_byte(uint8_t *c) {
+    _read_next_frame_header();
+    if (cp_serial.frame_index > cp_serial.frame_len &&
+        cp_serial.payload_remaining > 0) {
+        if (_read_byte(c)) {
+            cp_serial.frame_index++;
+            cp_serial.payload_remaining--;
+            return true;
+        }
+    }
+    return false;
+}
+
+bool websocket_available(void) {
+    if (!websocket_connected()) {
+        return false;
+    }
+    _read_next_frame_header();
+    return cp_serial.payload_remaining > 0 && cp_serial.frame_index >= cp_serial.frame_len;
+}
+
+char websocket_read_char(void) {
+    return _read_next_payload_byte();
+}
+
+static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
+    int sent = -EAGAIN;
+    while (sent == -EAGAIN) {
+        sent = socketpool_socket_send(socket, buf, len);
+    }
+    if (sent < len) {
+        ESP_LOGE(TAG, "short send %d %d", sent, len);
+    }
+}
+
+static void _websocket_send(_websocket *ws, const char *text, size_t len) {
+    if (!websocket_connected()) {
+        return;
+    }
+    uint32_t opcode = 1;
+    uint8_t frame_header[2];
+    frame_header[0] = 1 << 7 | opcode;
+    uint8_t payload_len;
+    if (len <= 125) {
+        payload_len = len;
+    } else if (len < (1 << 16)) {
+        payload_len = 126;
+    } else {
+        payload_len = 127;
+    }
+    frame_header[1] = payload_len;
+    _send_raw(&ws->socket, (const uint8_t *)frame_header, 2);
+    if (payload_len == 126) {
+        _send_raw(&ws->socket, (const uint8_t *)&len, 2);
+    } else if (payload_len == 127) {
+        uint32_t zero = 0;
+        // 64 bits where top four bytes are zero.
+        _send_raw(&ws->socket, (const uint8_t *)&zero, 4);
+        _send_raw(&ws->socket, (const uint8_t *)&len, 4);
+    }
+    _send_raw(&ws->socket, (const uint8_t *)text, len);
+    ESP_LOGI(TAG, "sent over websocket: %s", text);
+}
+
+void websocket_write(const char *text, size_t len) {
+    _websocket_send(&cp_serial, text, len);
+}
diff --git a/supervisor/shared/web_workflow/websocket.h b/supervisor/shared/web_workflow/websocket.h
new file mode 100644
index 0000000000..c5c5114586
--- /dev/null
+++ b/supervisor/shared/web_workflow/websocket.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include 
+
+#include "shared-bindings/socketpool/Socket.h"
+
+void websocket_init(void);
+void websocket_handoff(socketpool_socket_obj_t *socket);
+bool websocket_connected(void);
+bool websocket_available(void);
+char websocket_read_char(void);
+void websocket_write(const char *text, size_t len);
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 45df5f687f..5b8cb513a7 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -168,8 +168,8 @@ $(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $
 		$(STATIC_RESOURCES)
 
 ifeq ($(CIRCUITPY_WEB_WORKFLOW),1)
-  SRC_SUPERVISOR += supervisor/shared/web_workflow/web_workflow.c
-
+  SRC_SUPERVISOR += supervisor/shared/web_workflow/web_workflow.c \
+                    supervisor/shared/web_workflow/websocket.c
   SRC_SUPERVISOR += $(BUILD)/autogen_web_workflow_static.c
 endif
 

From dce9396fe325922394a783bb47b81f2263231713 Mon Sep 17 00:00:00 2001
From: Nick Lopez 
Date: Sat, 2 Jul 2022 14:30:36 -0700
Subject: [PATCH 0558/2403] issue adafruit#6538 loose bounds checking on WAIT
 PIO instruction

---
 ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index bee77238b5..9e8d5feebc 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -436,7 +436,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
                 if (first_in_pin == NULL) {
                     mp_raise_ValueError_varg(translate("Missing first_in_pin. Instruction %d waits based on pin"), i);
                 }
-                if (wait_index > in_pin_count) {
+                if (wait_index >= in_pin_count) {
                     mp_raise_ValueError_varg(translate("Instruction %d waits on input outside of count"), i);
                 }
             }

From 5522ba532229b44cb5d167ba1a27a2a44d4bf659 Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Fri, 1 Jul 2022 21:19:02 +0000
Subject: [PATCH 0559/2403] Translated using Weblate (French)

Currently translated at 98.9% (975 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
---
 locale/fr.po | 77 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/locale/fr.po b/locale/fr.po
index c98b2f54db..f553567e50 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-06-30 22:19+0000\n"
+"PO-Revision-Date: 2022-07-03 00:22+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -558,7 +558,9 @@ msgstr "Au-dessous de la fréquence d'images minimale"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must be sequential pins"
-msgstr "Bit clock et word select doivent êtres sur des broches séquentielles"
+msgstr ""
+"La sélection du bit d'horloge et de mot doit être sur des broches "
+"séquentielles"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
@@ -603,7 +605,7 @@ msgstr "Tampon + décalage trop petit %d %d %d"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
-msgstr "Éléments du tampon doit être 4 octets ou moins"
+msgstr "Les éléments du tampon doivent faire 4 octets ou moins"
 
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is not a bytearray."
@@ -655,7 +657,7 @@ msgstr "Les blocs CBC doivent être des multiples de 16 octets"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr ""
+msgstr "L’appareil CIRCUITPY ne peut pas être trouvé ou créé."
 
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
@@ -671,18 +673,18 @@ msgstr "Initialisation de la caméra"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
-msgstr "L'alarme peut seulement être depuis TRC IO depuis le someil profond."
+msgstr "L'alarme ne peut être que sur TRC IO depuis un sommeil profond."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on one low pin while others alarm high from deep sleep."
 msgstr ""
 "L'alarme peut seulement être sur une broche basse tandis que d'autres "
-"alarment sont sur des broches hautes depuis le someil profond."
+"alarment sont sur des broches hautes depuis le sommeil profond."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on two low pins from deep sleep."
 msgstr ""
-"L'alarme peut seulement être sur deux broches basses depuis le someil "
+"L'alarme peut seulement être sur deux broches basses depuis le sommeil "
 "profond."
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
@@ -762,7 +764,7 @@ msgstr "On ne peut faire de sous-classes de tranches"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "Impossible de transférer sans une broche MOSI ou MISO"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
@@ -771,10 +773,13 @@ msgstr "Impossible de faire varier la fréquence sur un minuteur déjà utilisé
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr ""
+"Impossible de réveiller via une bordure d'une broche, seulement via un niveau"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
-msgstr "Ne peut reveillé sur le board de broche. Seuleument à niveau."
+msgstr ""
+"Impossible de réveiller via une bordure d'une broche. Seulement via un "
+"niveau."
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
@@ -782,7 +787,7 @@ msgstr "Ecriture sur 'CharacteristicBuffer' non fournie"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython core code crashed hard. Whoops!\n"
-msgstr "Le code principal de CircuitPython s'est écrasé durement. Oups !\n"
+msgstr "Le code principal de CircuitPython s'est complètement planté. Oups !\n"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython was unable to allocate the heap."
@@ -1027,7 +1032,7 @@ msgstr ""
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
 msgstr ""
-"Avec l'espace de couleur RGB, l'image d'entrée doit avoir 16 bits par pixel"
+"Avec l'espace de couleur RVB, l'image d'entrée doit avoir 16 bits par pixel"
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Format not supported"
@@ -1295,7 +1300,7 @@ msgstr "Ce calque est déjà dans un groupe"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "Le calque doit être une sous-classe de Group ou TileGrid"
 
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
@@ -1521,7 +1526,7 @@ msgstr "Aucun out dans le programme"
 #: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/busio/I2C.c
 msgid "No pull up found on SDA or SCL; check your wiring"
-msgstr "Aucun pull up trouvé sur SDA ou SCL; vérifiez votre cablage"
+msgstr "Aucun pull up trouvé sur SDA ou SCL; vérifiez votre câblage"
 
 #: shared-module/touchio/TouchIn.c
 msgid "No pulldown on pin; 1Mohm recommended"
@@ -1579,7 +1584,7 @@ msgstr "Le nombre de data_pins doit être 8 ou 16, et non %d"
 msgid ""
 "Object has been deinitialized and can no longer be used. Create a new object."
 msgstr ""
-"L'objet a été désinitialisé et ne peut plus être utilisé. Créez un nouvel "
+"L'objet a été dés-initialisé et ne peut plus être utilisé. Créez un nouvel "
 "objet."
 
 #: ports/nrf/common-hal/busio/UART.c
@@ -1630,7 +1635,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Seulement une TouchAlarm peu être réglée en someil profond."
+msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
 
 #: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
 msgid "Only one address is allowed"
@@ -1780,7 +1785,8 @@ msgstr ""
 #: main.c
 msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n"
 msgstr ""
-"Feinte de someil profond jusqu'à l'alarme, CTRL-C ou écriture au fichier.\n"
+"Feinte un sommeil profond jusqu'à l'alarme, CTRL-C ou l'écriture d'un "
+"fichier.\n"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Program does IN without loading ISR"
@@ -1818,7 +1824,7 @@ msgstr "Erreur d'initialisation du RNG"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
-msgstr ""
+msgstr "RS485"
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -2241,7 +2247,7 @@ msgstr "Erreur de sécurité inconnue : 0x%04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error at %s:%d: %d"
-msgstr ""
+msgstr "Erreur du firmware système inconnue à %s:%d : %d"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 #, c-format
@@ -2314,7 +2320,7 @@ msgstr "ATTENTION : le nom de fichier de votre code a deux extensions\n"
 #: ports/raspberrypi/common-hal/watchdog/WatchDogTimer.c
 msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
 msgstr ""
-"WatchDogTimer ne peut pas être désinitialisé une fois que le mode est réglé "
+"WatchDogTimer ne peut pas être dés-initialisé une fois que le mode est réglé "
 "sur RESET"
 
 #: shared-bindings/watchdog/WatchDogTimer.c
@@ -2367,8 +2373,8 @@ msgstr "Vous êtres en mode sûr parce que :\n"
 msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
-"Vous avez pressé le bouton de reset pendant le démarrage. Pressez le à "
-"nouveau pour sortir du mode sûr."
+"Vous avez pressé le bouton reset pendant le démarrage. Pressez-le à nouveau "
+"pour sortir du mode sûr."
 
 #: supervisor/shared/safe_mode.c
 msgid "You requested starting safe mode by "
@@ -2518,7 +2524,7 @@ msgstr "tampon est plus petit que la taille demandée"
 
 #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
 msgid "buffer size must be a multiple of element size"
-msgstr "taille du tampon doit être un multiple de la taille de l'élement"
+msgstr "taille du tampon doit être un multiple de la taille de l’élément"
 
 #: shared-module/struct/__init__.c
 msgid "buffer size must match format"
@@ -2564,11 +2570,11 @@ msgstr "ne peut avoir qu'un seul parent"
 
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
-msgstr "il peut y avoir jusqu'à 4 paramètres pour l'assemblage Thumb"
+msgstr "il ne peut pas y avoir plus de 4 paramètres pour l'assemblage Thumb"
 
 #: py/emitinlinextensa.c
 msgid "can only have up to 4 parameters to Xtensa assembly"
-msgstr "maximum 4 paramètres pour l'assembleur Xtensa"
+msgstr "il ne peut pas y avoir plus de 4 paramètres pour l'assemblage Xtensa"
 
 #: py/objtype.c
 msgid "can't add special method to already-subclassed class"
@@ -2659,7 +2665,7 @@ msgstr "impossible de charger avec l'indice '%q'"
 
 #: py/builtinimport.c
 msgid "can't perform relative import"
-msgstr ""
+msgstr "ne peut importer relativement"
 
 #: py/objgenerator.c
 msgid "can't send non-None value to a just-started generator"
@@ -2772,7 +2778,9 @@ msgstr ""
 
 #: shared-bindings/displayio/Palette.c
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
-msgstr "tampon color doit être un bytearray ou une matrice de type 'b' ou 'B'"
+msgstr ""
+"le tampon de couleurs doit être un bytearray ou une matrice de type 'b' ou "
+"'B'"
 
 #: shared-bindings/displayio/Palette.c
 msgid "color must be between 0x000000 and 0xffffff"
@@ -3082,7 +3090,7 @@ msgstr "fonction définie que pour les ndarrays"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "function is implemented for ndarrays only"
-msgstr ""
+msgstr "la fonction n'est implémentée que pour les ndarrays"
 
 #: py/argcheck.c
 #, c-format
@@ -3220,7 +3228,7 @@ msgstr "les données d'entrée doivent être un itérable"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "input dtype must be float or complex"
-msgstr ""
+msgstr "le dtype d'entrée doit être un flottant ou un complexe"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
@@ -3273,7 +3281,7 @@ msgstr "les entrées ne sont pas itérables"
 
 #: py/parsenum.c
 msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "l'argument 2 de int() doit être >=2 et <=36"
+msgstr "Le deuxième argument de int() doit être compris entre 2 et 36 inclus"
 
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
@@ -3356,7 +3364,8 @@ msgstr "l'argument 1 de issubclass() doit être une classe"
 #: py/objtype.c
 msgid "issubclass() arg 2 must be a class or a tuple of classes"
 msgstr ""
-"l'argument 2 de issubclass() doit être une classe ou un tuple de classes"
+"le deuxième argument de issubclass() doit être une classe ou un tuple de "
+"classes"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "iterations did not converge"
@@ -3419,7 +3428,7 @@ msgstr "loopback + silent mode non pris en charge par le périphérique"
 
 #: ports/espressif/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
-msgstr ""
+msgstr "mDNS a déjà été initialisé"
 
 #: ports/espressif/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
@@ -3710,7 +3719,8 @@ msgstr "offset doit être >= 0"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "offset must be non-negative and no greater than buffer length"
-msgstr "offset doit être non-négatif, et au plus la taille du tampon"
+msgstr ""
+"offset ne doit pas être négatif, et pas plus grand que la taille du tampon"
 
 #: py/objstr.c py/objstrunicode.c
 msgid "offset out of bounds"
@@ -3766,8 +3776,7 @@ msgstr "ord attend un caractère"
 #, c-format
 msgid "ord() expected a character, but string of length %d found"
 msgstr ""
-"ord() attend un caractère mais une chaîne de caractère de longueur %d a été "
-"trouvée"
+"ord() attend un caractère mais une chaîne de %d caractères a été trouvée"
 
 #: extmod/ulab/code/utils/utils.c
 msgid "out array is too small"

From 2879cc21b33008c0d09e0295588d8c85659b1161 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Fri, 1 Jul 2022 23:40:48 +0000
Subject: [PATCH 0560/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (985 of 985 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 b6124350e3..b89963bf8f 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: 2022-06-16 08:18+0000\n"
+"PO-Revision-Date: 2022-07-03 00:22+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.13-dev\n"
+"X-Generator: Weblate 4.13.1-dev\n"
 
 #: main.c
 msgid ""
@@ -1200,7 +1200,7 @@ msgstr "Erro interno #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "O temporizador do watchdog interno expirou."
 
 #: py/argcheck.c
 msgid "Invalid %q"

From 046af7629eb07497e5ffb42ff2678549000de0f8 Mon Sep 17 00:00:00 2001
From: thetazero 
Date: Tue, 5 Jul 2022 12:03:04 -0400
Subject: [PATCH 0561/2403] Correct typo

---
 BUILDING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILDING.md b/BUILDING.md
index fc7b116595..37800e689f 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -70,7 +70,7 @@ The test suite in the top level `tests` directory.  It needs the unix port to ru
 Then you can run the test suite:
 
     cd ../../tests
-    ./run-tests
+    ./run-tests.py
 
 A successful run will say something like
 

From cd77517b2f95271a709bb9d6a2726256da7960e0 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 5 Jul 2022 16:35:42 -0700
Subject: [PATCH 0562/2403] Add build for ESP32-S3 Box Lite

---
 .../boards/espressif_esp32s3_box_lite/board.c | 109 ++++++++++++++++++
 .../mpconfigboard.h                           |  30 +++++
 .../mpconfigboard.mk                          |  17 +++
 .../boards/espressif_esp32s3_box_lite/pins.c  |  67 +++++++++++
 .../espressif_esp32s3_box_lite/sdkconfig      |  37 ++++++
 5 files changed, 260 insertions(+)
 create mode 100644 ports/espressif/boards/espressif_esp32s3_box_lite/board.c
 create mode 100644 ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.h
 create mode 100644 ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/espressif_esp32s3_box_lite/pins.c
 create mode 100644 ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig

diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
new file mode 100644
index 0000000000..1f439e52fb
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.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"
+
+uint8_t display_init_sequence[] = {
+    0x01, 0x80, 0x96, //  _SWRESET and Delay 150ms
+    0x11, 0x80, 0xFF, //  _SLPOUT and Delay 500ms
+    0x3A, 0x81, 0x55, 0x0A, //  _COLMOD and Delay 10ms
+    0x13, 0x80, 0x0A, //  _NORON and Delay 10ms
+    0x36, 0x01, 0xC8, //  _MADCTL
+    0x29, 0x80, 0xFF, //  _DISPON and Delay 500ms
+};
+
+void board_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, false);
+    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_GPIO4, // TFT_DC Command or data
+        &pin_GPIO5, // TFT_CS Chip select
+        &pin_GPIO48, // 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
+        240, // Height
+        0, // column start
+        0, // row start
+        0, // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO45,  // 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
+        false, // backlight_on_high
+        false, // SH1107_addressing
+        50000); // backlight pwm frequency
+
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.h
new file mode 100644
index 0000000000..fddcddc7c3
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.h
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "ESP32-S3-Box-Lite"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
new file mode 100644
index 0000000000..647ad3440a
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x303A
+USB_PID = 0x7005
+USB_PRODUCT = "ESP32-S3-Box-Lite"
+USB_MANUFACTURER = "Espressif"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=16MB
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c b/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c
new file mode 100644
index 0000000000..73ef15697c
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c
@@ -0,0 +1,67 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // First PMOD connector
+    { MP_ROM_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_U0TXD), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_G43), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_U0RXD), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_G44), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_G11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_G13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_G12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_G14), MP_ROM_PTR(&pin_GPIO14) },
+
+    // Second PMOD connector
+    { MP_ROM_QSTR(MP_QSTR_G38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_G39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_G40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_G41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_G42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_G21), MP_ROM_PTR(&pin_GPIO21) },
+
+    // LCD & touchscreen
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CTRL), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_CTP_INT), MP_ROM_PTR(&pin_GPIO3) },
+
+    // Audio
+    { MP_ROM_QSTR(MP_QSTR_I2S_ADC_SDOUT), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_MCLK), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_SCLK), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_LRCK), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_CODEC_DSDIN), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_PA_CTRL), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_MUTE_STATUS), MP_ROM_PTR(&pin_GPIO1) },
+
+    // Internal I2C bus
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) },
+
+    // boot button, also usable as a software button
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig
new file mode 100644
index 0000000000..7fcf8ef297
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP

From d83720f6595c16df580acb67918f73bc2df8e721 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 5 Jul 2022 17:02:52 -0700
Subject: [PATCH 0563/2403] Tweak display init

---
 ports/espressif/boards/espressif_esp32s3_box_lite/board.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
index 1f439e52fb..dbd3c17313 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -37,8 +37,9 @@ uint8_t display_init_sequence[] = {
     0x01, 0x80, 0x96, //  _SWRESET and Delay 150ms
     0x11, 0x80, 0xFF, //  _SLPOUT and Delay 500ms
     0x3A, 0x81, 0x55, 0x0A, //  _COLMOD and Delay 10ms
+    0x21, 0x80, 10,                 // _INVON
     0x13, 0x80, 0x0A, //  _NORON and Delay 10ms
-    0x36, 0x01, 0xC8, //  _MADCTL
+    0x36, 0x01, 0x80, //  _MADCTL
     0x29, 0x80, 0xFF, //  _DISPON and Delay 500ms
 };
 

From 591390ad850d8d04535211c75e15a778b1d3ea8c Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Tue, 5 Jul 2022 05:00:51 +0000
Subject: [PATCH 0564/2403] Translated using Weblate (French)

Currently translated at 99.5% (981 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
---
 locale/fr.po | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/locale/fr.po b/locale/fr.po
index f553567e50..7e282a026c 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-03 00:22+0000\n"
+"PO-Revision-Date: 2022-07-06 05:15+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -1074,8 +1074,9 @@ msgstr "Groupe déjà utilisé"
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 #: ports/raspberrypi/common-hal/busio/SPI.c
+#, fuzzy
 msgid "Half duplex SPI is not implemented"
-msgstr ""
+msgstr "Le half duplex du SPI n'est pas implémenté"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
@@ -1212,8 +1213,9 @@ msgid "Internal error #%d"
 msgstr "Erreur interne #%d"
 
 #: supervisor/shared/safe_mode.c
+#, fuzzy
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Le minuteur du watchdog interne a expiré."
 
 #: py/argcheck.c
 msgid "Invalid %q"
@@ -1307,8 +1309,9 @@ msgid "MAC address was invalid"
 msgstr "Adresse physique (MAC) invalide"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
+#, fuzzy
 msgid "Mapping must be a tuple"
-msgstr ""
+msgstr "Le mapping doit être un tuple"
 
 #: shared-module/displayio/Shape.c
 #, c-format
@@ -1403,8 +1406,9 @@ msgid "New bitmap must be same size as old bitmap"
 msgstr "La taille du nouveau bitmap doit être la même que l'ancien"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
+#, fuzzy
 msgid "Nimble out of memory"
-msgstr ""
+msgstr "Nimble n'a plus de mémoire"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Characteristic.c
@@ -1912,7 +1916,7 @@ msgstr "Périphérique SPI utilisé"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI re-init"
-msgstr ""
+msgstr "Ré-initialisation du SPI"
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "Scale dimensions must divide by 3"
@@ -2118,7 +2122,7 @@ msgstr "Paramètre de type tuple ou struct_time requis"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART de-init"
-msgstr ""
+msgstr "Dé-initialisation du UART"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
@@ -2127,7 +2131,7 @@ msgstr "Initialisation UART"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr ""
+msgstr "Ré-initialisation du UART"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
@@ -2745,7 +2749,7 @@ msgstr "typage"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "channel re-init"
-msgstr ""
+msgstr "Ré-initialisation du canal"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
@@ -3834,7 +3838,7 @@ msgstr ""
 
 #: extmod/vfs_posix_file.c
 msgid "poll on file not available on win32"
-msgstr ""
+msgstr "le polling sur un fichier n'est pas disponible sous win32"
 
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 msgid "pop from an empty PulseIn"
@@ -4128,7 +4132,7 @@ msgstr "Délai d’expiration dépassé en attendant une carte v2"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr ""
+msgstr "Ré-initialisation du miniteur"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"

From ac9cb9389c8d2290f9404c9d1008a7491d09f721 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Tue, 5 Jul 2022 22:31:33 -0700
Subject: [PATCH 0565/2403] Check parameters of int.from_bytes

---
 locale/circuitpython.pot |  8 ++++++++
 py/objint.c              | 24 ++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5740e1e288..1cf3725cd2 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2450,6 +2450,10 @@ msgstr ""
 msgid "byteorder is not a string"
 msgstr ""
 
+#: py/objint.c
+msgid "byteorder must be 'little' or 'big'"
+msgstr ""
+
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2953,6 +2957,10 @@ msgstr ""
 msgid "frequency is read-only for this board"
 msgstr ""
 
+#: py/objint.c
+msgid "from_bytes() does not implement signed=True"
+msgstr ""
+
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/py/objint.c b/py/objint.c
index 98178e7ffa..fa8bc7985c 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -480,19 +480,31 @@ MP_DEFINE_CONST_FUN_OBJ_1(int_bit_length_obj, int_bit_length);
 #endif
 
 // this is a classmethod
-STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO: Support signed param (assumes signed=False at the moment)
-    (void)n_args;
+
+    enum { ARG_signed };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_signed,    MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 3, pos_args + 3, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (args[ARG_signed].u_bool) {
+        mp_raise_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("from_bytes() does not implement signed=True"));
+    }
 
     // get the buffer info
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
+    mp_get_buffer_raise(pos_args[1], &bufinfo, MP_BUFFER_READ);
 
     const byte *buf = (const byte *)bufinfo.buf;
     int delta = 1;
-    if (args[2] == MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
+    if (pos_args[2] == MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
         buf += bufinfo.len - 1;
         delta = -1;
+    } else if (pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_big)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("byteorder must be 'little' or 'big'"));
     }
 
     mp_uint_t value = 0;
@@ -501,7 +513,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
         #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
         if (value > (MP_SMALL_INT_MAX >> 8)) {
             // Result will overflow a small-int so construct a big-int
-            return mp_obj_int_from_bytes_impl(args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf);
+            return mp_obj_int_from_bytes_impl(pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf);
         }
         #endif
         value = (value << 8) | *buf;
@@ -509,7 +521,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_int_from_uint(value);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_from_bytes);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(int_from_bytes_fun_obj, 3, int_from_bytes);
 STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
 
 STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

From 4d3ab4f4fc714d4886ad06741b0521d170529e16 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Wed, 6 Jul 2022 07:22:45 -0700
Subject: [PATCH 0566/2403] Added non-keyword args to allowed_args

---
 locale/circuitpython.pot | 12 ++++--------
 py/objint.c              | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1cf3725cd2..07323bfc83 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
@@ -2450,10 +2454,6 @@ msgstr ""
 msgid "byteorder is not a string"
 msgstr ""
 
-#: py/objint.c
-msgid "byteorder must be 'little' or 'big'"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2957,10 +2957,6 @@ msgstr ""
 msgid "frequency is read-only for this board"
 msgstr ""
 
-#: py/objint.c
-msgid "from_bytes() does not implement signed=True"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/py/objint.c b/py/objint.c
index fa8bc7985c..b44a2e3b4a 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -483,28 +483,30 @@ MP_DEFINE_CONST_FUN_OBJ_1(int_bit_length_obj, int_bit_length);
 STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO: Support signed param (assumes signed=False at the moment)
 
-    enum { ARG_signed };
+    enum { ARG_bytes, ARG_byteorder, ARG_signed };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_signed,    MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_bytes, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_byteorder, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_signed, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 3, pos_args + 3, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     if (args[ARG_signed].u_bool) {
-        mp_raise_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("from_bytes() does not implement signed=True"));
+        mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q=%q"), MP_QSTR_signed, MP_QSTR_True);
     }
 
     // get the buffer info
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(pos_args[1], &bufinfo, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[ARG_bytes].u_obj, &bufinfo, MP_BUFFER_READ);
 
     const byte *buf = (const byte *)bufinfo.buf;
     int delta = 1;
-    if (pos_args[2] == MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
+    if (args[ARG_byteorder].u_obj == MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
         buf += bufinfo.len - 1;
         delta = -1;
-    } else if (pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_big)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("byteorder must be 'little' or 'big'"));
+    } else if (args[ARG_byteorder].u_obj != MP_OBJ_NEW_QSTR(MP_QSTR_big)) {
+        mp_arg_error_invalid(MP_QSTR_byteorder);
     }
 
     mp_uint_t value = 0;
@@ -513,7 +515,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
         if (value > (MP_SMALL_INT_MAX >> 8)) {
             // Result will overflow a small-int so construct a big-int
-            return mp_obj_int_from_bytes_impl(pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf);
+            return mp_obj_int_from_bytes_impl(args[ARG_byteorder].u_obj != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf);
         }
         #endif
         value = (value << 8) | *buf;

From eb7e32da9982654f36d6005fd71ecf7b9eddc44d Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Wed, 6 Jul 2022 09:15:18 -0700
Subject: [PATCH 0567/2403] Added field initializers

---
 py/objint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index b44a2e3b4a..7f8d08d37a 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -485,8 +485,8 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     enum { ARG_bytes, ARG_byteorder, ARG_signed };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_bytes, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_byteorder, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_bytes, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_byteorder, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_signed, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];

From a4035aa1f73ea1033743d918948d80a71b88dab5 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 6 Jul 2022 17:05:14 -0700
Subject: [PATCH 0568/2403] websocket serial kinda works

---
 .../shared/web_workflow/static/serial.js      | 10 +++---
 supervisor/shared/web_workflow/web_workflow.c |  3 +-
 supervisor/shared/web_workflow/websocket.c    | 34 ++++++++++++++-----
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 36c980dc08..5fb80b59fa 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -5,7 +5,7 @@ function onSubmit() {
   var input = document.getElementById("input");
   // You can send message to the Web Socket using ws.send.
   ws.send(input.value);
-  output("send: " + input.value);
+  // output("send: " + input.value);
   input.value = "";
   input.focus();
 }
@@ -25,19 +25,19 @@ ws = new WebSocket("ws://cpy-f57ce8.local/cp/serial/");
 
 // Set event handlers.
 ws.onopen = function() {
-  output("onopen");
+  console.log("onopen");
 };
 
 ws.onmessage = function(e) {
   // e.data contains received string.
-  output("onmessage: " + e.data);
+  output(e.data);
 };
 
 ws.onclose = function() {
-  output("onclose");
+  console.log("onclose");
 };
 
 ws.onerror = function(e) {
-  output("onerror");
+  // output("onerror");
   console.log(e)
 };
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 07298c17e9..c7bf673fdc 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1059,6 +1059,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
 }
 
 static void _reset_request(_request *request) {
+    ESP_LOGI(TAG, "reset request");
     request->state = STATE_METHOD;
     request->origin[0] = '\0';
     request->content_length = 0;
@@ -1244,7 +1245,7 @@ void supervisor_web_workflow_background(void) {
 
     // If we have a request in progress, continue working on it.
     if (common_hal_socketpool_socket_get_connected(&active)) {
-        ESP_LOGI(TAG, "active connected");
+        // ESP_LOGI(TAG, "active connected %d", active_request.in_progress);
         _process_request(&active, &active_request);
     }
 }
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 8aec9d206c..446f2073c3 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -32,8 +32,8 @@ typedef struct {
     uint8_t frame_len;
     uint8_t payload_len_size;
     bool masked;
-    uint32_t mask;
-    size_t frame_index;
+    uint8_t mask[4];
+    int frame_index;
     size_t payload_remaining;
 } _websocket;
 
@@ -96,27 +96,38 @@ static void _read_next_frame_header(void) {
 
         ESP_LOGI(TAG, "mask %d length %x", cp_serial.masked, len);
     }
-    while (cp_serial.frame_index > 1 &&
+    while (cp_serial.frame_index >= 2 &&
            cp_serial.frame_index < (cp_serial.payload_len_size + 2) &&
            _read_byte(&h)) {
         cp_serial.frame_index++;
-        cp_serial.payload_remaining = cp_serial.payload_remaining << 8 | c;
+        cp_serial.payload_remaining = cp_serial.payload_remaining << 8 | h;
     }
-    while (cp_serial.frame_index > (cp_serial.payload_len_size + 2) &&
+    int mask_start = cp_serial.payload_len_size + 2;
+    while (cp_serial.frame_index >= mask_start &&
            cp_serial.frame_index < cp_serial.frame_len &&
            _read_byte(&h)) {
+        size_t mask_offset = cp_serial.frame_index - mask_start;
+        cp_serial.mask[mask_offset] = h;
         cp_serial.frame_index++;
-        cp_serial.mask = cp_serial.mask << 8 | c;
+        ESP_LOGI(TAG, "mask %08x", (uint32_t)*cp_serial.mask);
     }
 }
 
 static bool _read_next_payload_byte(uint8_t *c) {
     _read_next_frame_header();
-    if (cp_serial.frame_index > cp_serial.frame_len &&
+    if (cp_serial.frame_index >= cp_serial.frame_len &&
         cp_serial.payload_remaining > 0) {
         if (_read_byte(c)) {
+            uint8_t mask_offset = (cp_serial.frame_index - cp_serial.frame_len) % 4;
+            ESP_LOGI(TAG, "payload byte read %02x mask offset %d", *c, mask_offset);
+            *c ^= cp_serial.mask[mask_offset];
+            ESP_LOGI(TAG, "byte unmasked %02x", *c);
             cp_serial.frame_index++;
             cp_serial.payload_remaining--;
+            ESP_LOGI(TAG, "payload remaining %d", cp_serial.payload_remaining);
+            if (cp_serial.payload_remaining == 0) {
+                cp_serial.frame_index = 0;
+            }
             return true;
         }
     }
@@ -132,7 +143,9 @@ bool websocket_available(void) {
 }
 
 char websocket_read_char(void) {
-    return _read_next_payload_byte();
+    uint8_t c;
+    _read_next_payload_byte(&c);
+    return c;
 }
 
 static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
@@ -171,7 +184,10 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
         _send_raw(&ws->socket, (const uint8_t *)&len, 4);
     }
     _send_raw(&ws->socket, (const uint8_t *)text, len);
-    ESP_LOGI(TAG, "sent over websocket: %s", text);
+    char copy[len];
+    memcpy(copy, text, len);
+    copy[len] = '\0';
+    ESP_LOGI(TAG, "sent over websocket: %s", copy);
 }
 
 void websocket_write(const char *text, size_t len) {

From 4e88d795e17b183aedb698a891f8feb14d2342f6 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 6 Jul 2022 23:01:19 -0400
Subject: [PATCH 0569/2403] Thonny causing crash emitglue.c:199:

---
 .../adafruit_feather_esp32_v2/sdkconfig       | 269 +++++++++++++++++-
 ports/espressif/common-hal/busio/UART.c       |   6 +-
 ports/espressif/supervisor/port.c             |  11 +
 py/circuitpy_mpconfig.h                       |   4 +
 supervisor/shared/workflow.c                  |  22 +-
 5 files changed, 295 insertions(+), 17 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index 94333b1591..0b2491f3b3 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -1,4 +1,4 @@
-
+# Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
 # Bootloader config
@@ -12,6 +12,9 @@ CONFIG_BOOTLOADER_LOG_LEVEL=0
 # Serial flasher config
 #
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 # end of Serial flasher config
 
 #
@@ -24,23 +27,283 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
 #
 # Compiler options
 #
-# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
 # end of Compiler options
 
 #
 # Component config
 #
+#
+# Bluetooth
+#
+# CONFIG_BT_ENABLED is not set
+# end of Bluetooth
+
+#
+# Driver configurations
+#
+#
+# TWAI configuration
+#
+# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
+# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+# end of TWAI configuration
+
+#
+# UART configuration
+#
+CONFIG_UART_ISR_IN_IRAM=y
+# end of UART configuration
+
+#
+# RTCIO configuration
+#
+# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set
+# end of RTCIO configuration
+
+#
+# GPIO Configuration
+#
+# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set
+# end of GPIO Configuration
+
+# end of Driver configurations
+
+#
+# eFuse Bit Manager
+#
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
+CONFIG_EFUSE_MAX_BLK_LEN=192
+# end of eFuse Bit Manager
+
+#
+# ESP-TLS
+#
+# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
+# CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set
+# end of ESP-TLS
+
 #
 # ESP32-specific
 #
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_SPIRAM_SUPPORT=y
-CONFIG_UART_ISR_IN_IRAM=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+#
+# SPIRAM cache workaround debugging
+#
+CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y
+# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST is not set
+# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS is not set
+# end of SPIRAM cache workaround debugging
+
+#
+# SPIRAM workaround libraries placement
+#
+CONFIG_SPIRAM_CACHE_LIBJMP_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMATH_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBNUMPARSER_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBIO_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMEM_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBRAND_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBENV_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBFILE_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y
+# end of SPIRAM workaround libraries placement
+
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
+CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+# CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY is not set
+#
+# PSRAM clock and cs IO for ESP32-DOWD
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+# end of PSRAM clock and cs IO for ESP32-DOWD
+
+#
+# PSRAM clock and cs IO for ESP32-D2WD
+#
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+# end of PSRAM clock and cs IO for ESP32-D2WD
+
+#
+# PSRAM clock and cs IO for ESP32-PICO
+#
+CONFIG_PICO_PSRAM_CS_IO=10
+# end of PSRAM clock and cs IO for ESP32-PICO
+
+# CONFIG_SPIRAM_CUSTOM_SPIWP_SD3_PIN is not set
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
+# CONFIG_SPIRAM_2T_MODE is not set
+# end of SPI RAM config
+
 # end of ESP32-specific
 
+#
+# ADC-Calibration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# end of ADC-Calibration
+
+#
+# Common ESP-related
+#
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+# end of Common ESP-related
+
+#
+# Ethernet
+#
+# CONFIG_ETH_USE_ESP32_EMAC is not set
+# end of Ethernet
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+# end of PHY
+
+#
+# ESP System Settings
+#
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+# end of ESP System Settings
+
+#
+# High resolution timer (esp_timer)
+#
+# CONFIG_ESP_TIMER_IMPL_FRC2 is not set
+CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
+# end of High resolution timer (esp_timer)
+
+#
+# Wi-Fi
+#
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
+# end of Wi-Fi
+
+#
+# FreeRTOS
+#
+# CONFIG_FREERTOS_FPU_IN_ISR is not set
+# end of FreeRTOS
+
+#
+# Hardware Abstraction Layer (HAL) and Low Level (LL)
+#
+# CONFIG_HAL_ASSERTION_ENABLE is not set
+CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
+# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
+
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2"
 # end of LWIP
 
+#
+# mbedTLS
+#
+# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
+# end of mbedTLS
+
+#
+# Supplicant
+#
+# CONFIG_WPA_MBO_SUPPORT is not set
+# CONFIG_WPA_DPP_SUPPORT is not set
+# end of Supplicant
+
 # end of Component config
+
+#
+# Deprecated options for backward compatibility
+#
+CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y
+# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
+CONFIG_LOG_BOOTLOADER_LEVEL=0
+CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
+# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
+CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
+CONFIG_SPIRAM_SUPPORT=y
+# CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST is not set
+CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ULP_COPROC_ENABLED is not set
+CONFIG_ULP_COPROC_RESERVE_MEM=0
+CONFIG_BROWNOUT_DET=y
+CONFIG_BROWNOUT_DET_LVL_SEL_0=y
+# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set
+CONFIG_BROWNOUT_DET_LVL=0
+# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
+# CONFIG_NO_BLOBS is not set
+# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
+# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
+CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
+CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
+CONFIG_ESP32S2_PANIC_PRINT_HALT=y
+# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
+CONFIG_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_UART_NONE is not set
+CONFIG_CONSOLE_UART=y
+CONFIG_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_TX_GPIO=8
+CONFIG_CONSOLE_UART_RX_GPIO=7
+CONFIG_CONSOLE_UART_BAUDRATE=115200
+# end of Deprecated options for backward compatibility
diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
index 740a327a47..cdaf25250f 100644
--- a/ports/espressif/common-hal/busio/UART.c
+++ b/ports/espressif/common-hal/busio/UART.c
@@ -41,7 +41,7 @@
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/tick.h"
 
-uint8_t never_reset_uart_mask = 0;
+static uint8_t never_reset_uart_mask = 0;
 
 static void uart_event_task(void *param) {
     busio_uart_obj_t *self = param;
@@ -74,13 +74,13 @@ static void uart_event_task(void *param) {
 
 void uart_reset(void) {
     for (uart_port_t num = 0; num < UART_NUM_MAX; num++) {
-        // Ignore the UART used by the IDF.
         #ifdef CONFIG_ESP_CONSOLE_UART_NUM
+        // Do not reset the UART used by the IDF for logging.
         if (num == CONFIG_ESP_CONSOLE_UART_NUM) {
             continue;
         }
         #endif
-        if (uart_is_driver_installed(num) && !(never_reset_uart_mask & 1 << num)) {
+        if (uart_is_driver_installed(num) && !(never_reset_uart_mask & (1 << num))) {
             uart_driver_delete(num);
         }
     }
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 38ca3573e6..57f34a6430 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -166,6 +166,17 @@ safe_mode_t port_init(void) {
     #define DEBUG (0)
     #endif
 
+    #define pin_GPIOn(n) pin_GPIO##n
+    #define pin_GPIOn_EXPAND(x) pin_GPIOn(x)
+
+    #ifdef CONFIG_CONSOLE_UART_TX_GPIO
+    common_hal_never_reset_pin(&pin_GPIOn_EXPAND(CONFIG_CONSOLE_UART_TX_GPIO));
+    #endif
+
+    #ifdef CONFIG_CONSOLE_UART_RX_GPIO
+    common_hal_never_reset_pin(&pin_GPIOn_EXPAND(CONFIG_CONSOLE_UART_RX_GPIO));
+    #endif
+
     #if DEBUG
     // debug UART
     #ifdef CONFIG_IDF_TARGET_ESP32C3
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index c26e34aab9..1ef6bcbfb8 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -297,6 +297,10 @@ typedef long mp_off_t;
 #define BOARD_UART_ROOT_POINTER     mp_obj_t board_uart_bus;
 #endif
 
+#if MICROPY_PY_ASYNC_AWAIT && !CIRCUITPY_TRACEBACK
+#error CIRCUITPY_ASYNCIO requires CIRCUITPY_TRACEBACK
+#endif
+
 #if defined(CIRCUITPY_CONSOLE_UART_RX) || defined(CIRCUITPY_CONSOLE_UART_TX)
 #if !(defined(CIRCUITPY_CONSOLE_UART_RX) && defined(CIRCUITPY_CONSOLE_UART_TX))
 #error Both CIRCUITPY_CONSOLE_UART_RX and CIRCUITPY_CONSOLE_UART_TX must be defined if one is defined.
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 335f0f3b97..202b11ec71 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -47,17 +47,17 @@
 static background_callback_t workflow_background_cb;
 
 static void supervisor_workflow_update_status_bar(void) {
-    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
-    // doesn't get terminated after two following characters and the value is invalid.
-    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
-    // but some may be cut off.
-    serial_write("\x1b" "]0;");
-    serial_write("🐍 ");
-    #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_web_workflow_status();
-    #endif
-    // Send string terminator
-    serial_write("\x1b" "\\");
+    // // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
+    // // doesn't get terminated after two following characters and the value is invalid.
+    // // This is the OSC command to set the title and the icon text. It can be up to 255 characters
+    // // but some may be cut off.
+    // serial_write("\x1b" "]0;");
+    // serial_write("🐍 ");
+    // #if CIRCUITPY_WEB_WORKFLOW
+    // supervisor_web_workflow_status();
+    // #endif
+    // // Send string terminator
+    // serial_write("\x1b" "\\");
 }
 
 static void workflow_background(void *data) {

From 432ea886e737c956fb83e7b7155ea45f64792b8f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 13:26:10 -0500
Subject: [PATCH 0570/2403] update ulab to 5.0.9

---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index 5d01882c41..308627c9aa 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 5d01882c41dbc4115bc94f0b61c093d5a6b812b6
+Subproject commit 308627c9aa862698725b2ba22fa2e8b2300e6803

From 1c3655c07b2e2345c8095be490f1cec00753f77a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 13:28:54 -0500
Subject: [PATCH 0571/2403] update translations

---
 locale/circuitpython.pot | 55 ++++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5740e1e288..465eabe0e4 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2352,6 +2352,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2719,6 +2723,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2810,6 +2818,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2913,7 +2925,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3061,7 +3073,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3128,6 +3140,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3136,11 +3152,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3341,7 +3353,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3590,7 +3602,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3740,6 +3752,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4175,6 +4188,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4216,7 +4237,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4224,6 +4255,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""

From 8d816db108892ffe592ff83adbe4c86caaf0de86 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 13:42:03 -0500
Subject: [PATCH 0572/2403] update expected results of help(modules)

---
 tests/unix/extra_coverage.py.exp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 98e56439ef..582d90e1bc 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -38,12 +38,12 @@ hashlib         json            math            qrio
 rainbowio       re              sys             termios
 traceback       ubinascii       uctypes         uerrno
 uheapq          uio             ujson           ulab
-ulab.fft        ulab.linalg     ulab.numpy      ulab.scipy
-ulab.scipy.linalg               ulab.scipy.optimize
-ulab.scipy.signal               ulab.scipy.special
-ulab.utils      uos             urandom         ure
-uselect         ustruct         utime           utimeq
-uzlib           zlib
+ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
+ulab.scipy      ulab.scipy.linalg
+ulab.scipy.optimize             ulab.scipy.signal
+ulab.scipy.special              ulab.utils      uos
+urandom         ure             uselect         ustruct
+utime           utimeq          uzlib           zlib
 ime
 
 utime           utimeq

From 601eb91b89b33806e1af78ed3ff7bb83a29cf1d3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 17:00:00 -0500
Subject: [PATCH 0573/2403] Disable gifio on matrixportal to reclaim flash
 space

---
 ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
index 8fccfa8f29..6db1a3c93a 100644
--- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
@@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_LTO_PARTITION = one
 
 CIRCUITPY_AESIO = 0
+CIRCUITPY_GIFIO = 0
 CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_SDCARDIO = 0

From 989acab11ab904d822f6c1c49f897941e77e18bc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 17:16:48 -0500
Subject: [PATCH 0574/2403] Pull in a fix for ulab on REPR_A builds (some
 broadcom builds)

---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index 308627c9aa..346c936e14 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 308627c9aa862698725b2ba22fa2e8b2300e6803
+Subproject commit 346c936e14c6ea3a8d3d65cb1fa46202dc92999d

From c4dfd8e30a50063db43a004c2cd6f2d0eba366a5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 17:17:15 -0500
Subject: [PATCH 0575/2403] Fix default BOARD setting & messages

It's important that these lines NOT be indented with tabs, because
that provokes Make to say that commands appear before a target.
---
 ports/broadcom/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/broadcom/Makefile b/ports/broadcom/Makefile
index 9731f819eb..757e7f3450 100644
--- a/ports/broadcom/Makefile
+++ b/ports/broadcom/Makefile
@@ -1,12 +1,12 @@
 # Select the board to build for.
-BOARD=raspberrypi_pi4
+BOARD?=raspberrypi_pi4b
 
 ifeq ($(BOARD),)
-	$(error You must provide a BOARD parameter)
+  $(error You must provide a BOARD parameter)
 else
-	ifeq ($(wildcard boards/$(BOARD)/.),)
-		$(error Invalid BOARD specified)
-	endif
+  ifeq ($(wildcard boards/$(BOARD)/.),)
+    $(error Invalid BOARD "$(BOARD)" specified)
+  endif
 endif
 
 # If the build directory is not given, make it reflect the board name.

From 9c2633820cbd22054666ff88a2c6752a064fd924 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Fri, 8 Jul 2022 00:18:36 +0200
Subject: [PATCH 0576/2403] Upgrade the pewpew-lcd frozen library to tag 1.0.1

---
 frozen/pew-pewpew-lcd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/pew-pewpew-lcd b/frozen/pew-pewpew-lcd
index 837f3e5f16..6452f2a78f 160000
--- a/frozen/pew-pewpew-lcd
+++ b/frozen/pew-pewpew-lcd
@@ -1 +1 @@
-Subproject commit 837f3e5f16accae5b3677954921b5ddd517f0799
+Subproject commit 6452f2a78f32cf3b5d07e699f26d25e9c4d10d09

From 8d9c9952981d5c8eb10f7db2da587a8aabc360bd Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 7 Jul 2022 16:55:04 -0700
Subject: [PATCH 0577/2403] Support ping & close. Refine html and js for serial

---
 .../shared/web_workflow/static/serial.html    |  8 +--
 .../shared/web_workflow/static/serial.js      | 36 +++++++++-
 supervisor/shared/web_workflow/websocket.c    | 68 +++++++++++++++----
 3 files changed, 89 insertions(+), 23 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index 766a7a23e2..d8ab86a7c8 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -7,10 +7,8 @@
 
 
   
    
-  
    
-    
-    
-    
-  
    
+  
+  
+  
 
 
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 5fb80b59fa..ab0893ad08 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -1,8 +1,20 @@
 
 var ws;
+var input = document.getElementById("input");
+var title = document.querySelector("title");
+
+function set_enabled(enabled) {
+  input.disabled = !enabled;
+  var buttons = document.querySelectorAll("button");
+  for (button of buttons) {
+    button.disabled = !enabled;
+  }
+}
+
+set_enabled(false);
 
 function onSubmit() {
-  var input = document.getElementById("input");
+  console.log("submit");
   // You can send message to the Web Socket using ws.send.
   ws.send(input.value);
   // output("send: " + input.value);
@@ -11,6 +23,7 @@ function onSubmit() {
 }
 
 function onCloseClick() {
+  console.log("close clicked");
   ws.close();
 }
 
@@ -26,18 +39,35 @@ ws = new WebSocket("ws://cpy-f57ce8.local/cp/serial/");
 // Set event handlers.
 ws.onopen = function() {
   console.log("onopen");
+  set_enabled(true);
 };
 
+var setting_title = false;
 ws.onmessage = function(e) {
   // e.data contains received string.
-  output(e.data);
+  if (e.data == "\x1b]0;") {
+    setting_title = true;
+    title.textContent = "";
+  } else if (e.data == "\x1b\\") {
+    setting_title = false;
+  } else if (setting_title) {
+    title.textContent += e.data;
+  } else {
+    output(e.data);
+  }
 };
 
 ws.onclose = function() {
   console.log("onclose");
+  set_enabled(false);
 };
 
 ws.onerror = function(e) {
   // output("onerror");
-  console.log(e)
+  console.log(e);
+  set_enabled(false);
 };
+
+input.onbeforeinput = function(e) {
+  console.log(e);
+}
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 446f2073c3..0f4c4fc84c 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -32,6 +32,7 @@ typedef struct {
     uint8_t frame_len;
     uint8_t payload_len_size;
     bool masked;
+    bool closed;
     uint8_t mask[4];
     int frame_index;
     size_t payload_remaining;
@@ -49,6 +50,10 @@ void websocket_init(void) {
 void websocket_handoff(socketpool_socket_obj_t *socket) {
     ESP_LOGI(TAG, "socket handed off");
     cp_serial.socket = *socket;
+    cp_serial.closed = false;
+    cp_serial.opcode = 0;
+    cp_serial.frame_index = 0;
+    cp_serial.frame_len = 2;
     // Mark the original socket object as closed without telling the lower level.
     socket->connected = false;
     socket->num = -1;
@@ -56,7 +61,7 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
 }
 
 bool websocket_connected(void) {
-    return common_hal_socketpool_socket_get_connected(&cp_serial.socket);
+    return !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
 }
 
 static bool _read_byte(uint8_t *c) {
@@ -70,6 +75,16 @@ static bool _read_byte(uint8_t *c) {
     return true;
 }
 
+static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
+    int sent = -EAGAIN;
+    while (sent == -EAGAIN) {
+        sent = socketpool_socket_send(socket, buf, len);
+    }
+    if (sent < len) {
+        ESP_LOGE(TAG, "short send on %d err %d len %d", socket->num, sent, len);
+    }
+}
+
 static void _read_next_frame_header(void) {
     uint8_t h;
     if (cp_serial.frame_index == 0 && _read_byte(&h)) {
@@ -111,20 +126,53 @@ static void _read_next_frame_header(void) {
         cp_serial.frame_index++;
         ESP_LOGI(TAG, "mask %08x", (uint32_t)*cp_serial.mask);
     }
+    // Reply to PINGs and CLOSE.
+    while ((cp_serial.opcode == 0x8 ||
+            cp_serial.opcode == 0x9) &&
+           cp_serial.frame_index >= cp_serial.frame_len) {
+
+        if (cp_serial.frame_index == cp_serial.frame_len) {
+            uint8_t opcode = 0x8; // CLOSE
+            if (cp_serial.opcode == 0x9) {
+                ESP_LOGI(TAG, "websocket ping");
+                opcode = 0xA; // PONG
+            }
+            uint8_t frame_header[2];
+            frame_header[0] = 1 << 7 | opcode;
+            if (cp_serial.payload_remaining > 125) {
+                ESP_LOGE(TAG, "CLOSE or PING has long payload");
+            }
+            frame_header[1] = cp_serial.payload_remaining;
+            _send_raw(&cp_serial.socket, (const uint8_t *)frame_header, 2);
+        }
+
+        if (cp_serial.payload_remaining > 0 && _read_byte(&h)) {
+            // Send the payload back to the client.
+            cp_serial.frame_index++;
+            cp_serial.payload_remaining--;
+            _send_raw(&cp_serial.socket, &h, 1);
+        }
+
+        if (cp_serial.payload_remaining == 0) {
+            cp_serial.frame_index = 0;
+            if (cp_serial.opcode == 0x8) {
+                ESP_LOGI(TAG, "websocket closed");
+                cp_serial.closed = true;
+            }
+        }
+    }
 }
 
 static bool _read_next_payload_byte(uint8_t *c) {
     _read_next_frame_header();
-    if (cp_serial.frame_index >= cp_serial.frame_len &&
+    if (cp_serial.opcode == 0x1 &&
+        cp_serial.frame_index >= cp_serial.frame_len &&
         cp_serial.payload_remaining > 0) {
         if (_read_byte(c)) {
             uint8_t mask_offset = (cp_serial.frame_index - cp_serial.frame_len) % 4;
-            ESP_LOGI(TAG, "payload byte read %02x mask offset %d", *c, mask_offset);
             *c ^= cp_serial.mask[mask_offset];
-            ESP_LOGI(TAG, "byte unmasked %02x", *c);
             cp_serial.frame_index++;
             cp_serial.payload_remaining--;
-            ESP_LOGI(TAG, "payload remaining %d", cp_serial.payload_remaining);
             if (cp_serial.payload_remaining == 0) {
                 cp_serial.frame_index = 0;
             }
@@ -148,16 +196,6 @@ char websocket_read_char(void) {
     return c;
 }
 
-static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
-    int sent = -EAGAIN;
-    while (sent == -EAGAIN) {
-        sent = socketpool_socket_send(socket, buf, len);
-    }
-    if (sent < len) {
-        ESP_LOGE(TAG, "short send %d %d", sent, len);
-    }
-}
-
 static void _websocket_send(_websocket *ws, const char *text, size_t len) {
     if (!websocket_connected()) {
         return;

From ab3e78661157c08b68d3290b5d84a3b1a2bc8c07 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 7 Jul 2022 20:00:12 -0500
Subject: [PATCH 0578/2403] disable additional module on matrixportal_m4

---
 ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
index 6db1a3c93a..e502f6b569 100644
--- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
@@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_LTO_PARTITION = one
 
 CIRCUITPY_AESIO = 0
+CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_GIFIO = 0
 CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0

From d3e1d1b10406f096608191758de7bebfefdade44 Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Thu, 7 Jul 2022 19:42:11 -0700
Subject: [PATCH 0579/2403] Fix #6559

---
 ports/espressif/common-hal/wifi/Radio.c | 8 ++++----
 shared-bindings/wifi/Radio.c            | 6 +++---
 shared-bindings/wifi/Radio.h            | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 698da291e7..9715894f78 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -139,14 +139,14 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t
     esp_wifi_set_mac(ESP_IF_WIFI_STA, mac);
 }
 
-uint8_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
+float common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
     int8_t tx_power;
     esp_wifi_get_max_tx_power(&tx_power);
-    return tx_power / 4;
+    return tx_power / 4.0;
 }
 
-void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const uint8_t tx_power) {
-    esp_wifi_set_max_tx_power(tx_power * 4);
+void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const float tx_power) {
+    esp_wifi_set_max_tx_power(tx_power * 4.0);
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index a0a4df2548..bcd998d806 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -138,17 +138,17 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_obj,
     (mp_obj_t)&wifi_radio_get_mac_address_obj,
     (mp_obj_t)&wifi_radio_set_mac_address_obj);
 
-//|     tx_power: int
+//|     tx_power: float
 //|     """Wifi transmission power, in dBm."""
 //|
 STATIC mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int(common_hal_wifi_radio_get_tx_power(self));
+    return mp_obj_new_float(common_hal_wifi_radio_get_tx_power(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_tx_power_obj, wifi_radio_get_tx_power);
 
 STATIC mp_obj_t wifi_radio_set_tx_power(mp_obj_t self_in, mp_obj_t tx_power_in) {
-    mp_int_t tx_power = mp_obj_get_int(tx_power_in);
+    mp_float_t tx_power = mp_obj_get_float(tx_power_in);
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_wifi_radio_set_tx_power(self, tx_power);
     return mp_const_none;
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index e89e22ebe9..1e389b6c56 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -82,8 +82,8 @@ extern void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const
 extern mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint8_t *mac);
 
-extern uint8_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self);
-extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const uint8_t power);
+extern float common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self);
+extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const float power);
 
 extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self);

From 75208573f41b01a3eba3f86ecfc8238059967b43 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 09:53:29 -0400
Subject: [PATCH 0580/2403] tweak sdkconfig; add temp logging to
 mp_make_function_from_raw_code

---
 .../boards/adafruit_feather_esp32_v2/sdkconfig   | 16 +++-------------
 py/emitglue.c                                    |  3 +++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index 0b2491f3b3..7209675d27 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -106,13 +106,10 @@ CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-# CONFIG_SPIRAM_USE_MEMMAP is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-CONFIG_SPIRAM_USE_MALLOC=y
+# CONFIG_SPIRAM_USE_MALLOC is not set
 CONFIG_SPIRAM_MEMTEST=y
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
@@ -143,7 +140,6 @@ CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y
 
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
-# CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY is not set
 #
 # PSRAM clock and cs IO for ESP32-DOWD
 #
@@ -225,6 +221,7 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 # Wi-Fi
 #
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
@@ -250,12 +247,6 @@ CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2"
 # end of LWIP
 
-#
-# mbedTLS
-#
-# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
-# end of mbedTLS
-
 #
 # Supplicant
 #
@@ -275,7 +266,6 @@ CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
 CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
 CONFIG_SPIRAM_SUPPORT=y
-# CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST is not set
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ULP_COPROC_ENABLED is not set
 CONFIG_ULP_COPROC_RESERVE_MEM=0
diff --git a/py/emitglue.c b/py/emitglue.c
index e701d0808f..47d2821bae 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -26,6 +26,8 @@
 
 // This code glues the code emitters to the runtime.
 
+#include "esp_log.h"
+
 #include 
 #include 
 #include 
@@ -195,6 +197,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
             break;
         #endif
         default:
+            ESP_LOGI("mp_make_function_from_raw_code", "kind: %d, scope_flags: 0x%x, n_pos_args: %d, fun_data: %p, const_table: %p", rc->kind, rc->scope_flags, rc->n_pos_args, rc->fun_data, rc->const_table);
             // rc->kind should always be set and BYTECODE is the only remaining case
             assert(rc->kind == MP_CODE_BYTECODE);
             fun = mp_obj_new_fun_bc(def_args, def_kw_args, rc->fun_data, rc->const_table);

From c3cd32e7737e6c038510521072ed3c996828587d Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 10:50:00 -0400
Subject: [PATCH 0581/2403] CPU freq to 240 MHz, redo sdkconfigs

---
 .../adafruit_feather_esp32_v2/sdkconfig       |  277 +----
 .../esp-idf-config/sdkconfig-esp32.defaults   | 1063 ++++++++++++++++-
 2 files changed, 1051 insertions(+), 289 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index 7209675d27..ad957c841f 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -1,22 +1,3 @@
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=0
-# end of Bootloader config
-
-#
-# Serial flasher config
-#
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
-# end of Serial flasher config
-
 #
 # Partition Table
 #
@@ -24,175 +5,7 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv
 CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
 # end of Partition Table
 
-#
-# Compiler options
-#
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
-CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
-# end of Compiler options
-
-#
-# Component config
-#
-#
-# Bluetooth
-#
-# CONFIG_BT_ENABLED is not set
-# end of Bluetooth
-
-#
-# Driver configurations
-#
-#
-# TWAI configuration
-#
-# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
-# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
-# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
-# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
-# end of TWAI configuration
-
-#
-# UART configuration
-#
-CONFIG_UART_ISR_IN_IRAM=y
-# end of UART configuration
-
-#
-# RTCIO configuration
-#
-# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set
-# end of RTCIO configuration
-
-#
-# GPIO Configuration
-#
-# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set
-# end of GPIO Configuration
-
-# end of Driver configurations
-
-#
-# eFuse Bit Manager
-#
-# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
-CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
-# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
-CONFIG_EFUSE_MAX_BLK_LEN=192
-# end of eFuse Bit Manager
-
-#
-# ESP-TLS
-#
-# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
-# CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set
-# end of ESP-TLS
-
-#
-# ESP32-specific
-#
-CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-#
-# SPI RAM config
-#
-CONFIG_SPIRAM_TYPE_AUTO=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=-1
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
-# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
-#
-# SPIRAM cache workaround debugging
-#
-CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y
-# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST is not set
-# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS is not set
-# end of SPIRAM cache workaround debugging
-
-#
-# SPIRAM workaround libraries placement
-#
-CONFIG_SPIRAM_CACHE_LIBJMP_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBMATH_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBNUMPARSER_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBIO_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBMEM_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBRAND_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBENV_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBFILE_IN_IRAM=y
-CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y
-# end of SPIRAM workaround libraries placement
-
-CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
-CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
-#
-# PSRAM clock and cs IO for ESP32-DOWD
-#
-CONFIG_D0WD_PSRAM_CLK_IO=17
-CONFIG_D0WD_PSRAM_CS_IO=16
-# end of PSRAM clock and cs IO for ESP32-DOWD
-
-#
-# PSRAM clock and cs IO for ESP32-D2WD
-#
-CONFIG_D2WD_PSRAM_CLK_IO=9
-CONFIG_D2WD_PSRAM_CS_IO=10
-# end of PSRAM clock and cs IO for ESP32-D2WD
-
-#
-# PSRAM clock and cs IO for ESP32-PICO
-#
-CONFIG_PICO_PSRAM_CS_IO=10
-# end of PSRAM clock and cs IO for ESP32-PICO
-
-# CONFIG_SPIRAM_CUSTOM_SPIWP_SD3_PIN is not set
-CONFIG_SPIRAM_SPIWP_SD3_PIN=7
-# CONFIG_SPIRAM_2T_MODE is not set
-# end of SPI RAM config
-
-# end of ESP32-specific
-
-#
-# ADC-Calibration
-#
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
-
-#
-# Common ESP-related
-#
-CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
-# end of Common ESP-related
-
-#
-# Ethernet
-#
-# CONFIG_ETH_USE_ESP32_EMAC is not set
-# end of Ethernet
-
-#
-# PHY
-#
-CONFIG_ESP_PHY_REDUCE_TX_POWER=y
-# end of PHY
-
+# *** temporary custom CONSOLE_UART settings, to send log output to TX/RX pins on Feather ESP32V2
 #
 # ESP System Settings
 #
@@ -209,91 +22,3 @@ CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
 # end of ESP System Settings
-
-#
-# High resolution timer (esp_timer)
-#
-# CONFIG_ESP_TIMER_IMPL_FRC2 is not set
-CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
-# end of High resolution timer (esp_timer)
-
-#
-# Wi-Fi
-#
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
-# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
-# end of Wi-Fi
-
-#
-# FreeRTOS
-#
-# CONFIG_FREERTOS_FPU_IN_ISR is not set
-# end of FreeRTOS
-
-#
-# Hardware Abstraction Layer (HAL) and Low Level (LL)
-#
-# CONFIG_HAL_ASSERTION_ENABLE is not set
-CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
-# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
-
-#
-# LWIP
-#
-CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2"
-# end of LWIP
-
-#
-# Supplicant
-#
-# CONFIG_WPA_MBO_SUPPORT is not set
-# CONFIG_WPA_DPP_SUPPORT is not set
-# end of Supplicant
-
-# end of Component config
-
-#
-# Deprecated options for backward compatibility
-#
-CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y
-# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=0
-CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
-CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
-CONFIG_SPIRAM_SUPPORT=y
-CONFIG_TRACEMEM_RESERVE_DRAM=0x0
-# CONFIG_ULP_COPROC_ENABLED is not set
-CONFIG_ULP_COPROC_RESERVE_MEM=0
-CONFIG_BROWNOUT_DET=y
-CONFIG_BROWNOUT_DET_LVL_SEL_0=y
-# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
-# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set
-CONFIG_BROWNOUT_DET_LVL=0
-# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
-# CONFIG_NO_BLOBS is not set
-# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
-# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
-CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
-CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
-CONFIG_ESP32S2_PANIC_PRINT_HALT=y
-# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
-CONFIG_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_UART_NONE is not set
-CONFIG_CONSOLE_UART=y
-CONFIG_CONSOLE_UART_CUSTOM_NUM_0=y
-# CONFIG_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_CONSOLE_UART_NUM=0
-CONFIG_CONSOLE_UART_TX_GPIO=8
-CONFIG_CONSOLE_UART_RX_GPIO=7
-CONFIG_CONSOLE_UART_BAUDRATE=115200
-# end of Deprecated options for backward compatibility
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 6d949c2898..ff691341cc 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -2,24 +2,261 @@ CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
+
 #
 # SDK tool configuration
 #
 CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
+# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
 # end of SDK tool configuration
 
+#
+# Build type
+#
+CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
+# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
+CONFIG_APP_BUILD_GENERATE_BINARIES=y
+CONFIG_APP_BUILD_BOOTLOADER=y
+CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
+# end of Build type
+
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 #
 # Bootloader config
 #
 CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL=0
+# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
+# CONFIG_BOOTLOADER_FACTORY_RESET is not set
+# CONFIG_BOOTLOADER_APP_TEST is not set
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
+CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
+# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
+#
+# Security features
+#
+# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
+# CONFIG_SECURE_BOOT is not set
+# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
+# end of Security features
+
+#
+# Serial flasher config
+#
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+# CONFIG_ESPTOOLPY_NO_STUB is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+# end of Serial flasher config
+
+#
+# Partition Table
+#
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
+# CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
+# CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
+# end of Partition Table
+
+#
+# Compiler options
+#
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
+# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set
+CONFIG_COMPILER_HIDE_PATHS_MACROS=y
+# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
+# CONFIG_COMPILER_CXX_RTTI is not set
+CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
+# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
+# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
+# CONFIG_COMPILER_DUMP_RTL_FILES is not set
+# end of Compiler options
+
 #
 # Component config
 #
+
+#
+# Application Level Tracing
+#
+# CONFIG_APPTRACE_DEST_JTAG is not set
+CONFIG_APPTRACE_DEST_NONE=y
+CONFIG_APPTRACE_LOCK_ENABLE=y
+# end of Application Level Tracing
+
+#
+# Bluetooth
+#
+# CONFIG_BT_ENABLED is not set
+# end of Bluetooth
+
+#
+# Driver configurations
+#
+
+#
+# ADC configuration
+#
+# CONFIG_ADC_FORCE_XPD_FSM is not set
+CONFIG_ADC_DISABLE_DAC=y
+# end of ADC configuration
+
+#
+# MCPWM configuration
+#
+# CONFIG_MCPWM_ISR_IN_IRAM is not set
+# end of MCPWM configuration
+
+#
+# SPI configuration
+#
+# CONFIG_SPI_MASTER_IN_IRAM is not set
+CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+# CONFIG_SPI_SLAVE_IN_IRAM is not set
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# end of SPI configuration
+
+#
+# TWAI configuration
+#
+# CONFIG_TWAI_ISR_IN_IRAM is not set
+# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
+# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+# end of TWAI configuration
+
+#
+# UART configuration
+#
+CONFIG_UART_ISR_IN_IRAM=y
+# end of UART configuration
+
+#
+# RTCIO configuration
+#
+# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set
+# end of RTCIO configuration
+
+#
+# GPIO Configuration
+#
+# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set
+# end of GPIO Configuration
+
+#
+# GDMA Configuration
+#
+# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_GDMA_ISR_IRAM_SAFE is not set
+# end of GDMA Configuration
+# end of Driver configurations
+
+#
+# eFuse Bit Manager
+#
+# CONFIG_EFUSE_CUSTOM_TABLE is not set
+# CONFIG_EFUSE_VIRTUAL is not set
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
+CONFIG_EFUSE_MAX_BLK_LEN=192
+# end of eFuse Bit Manager
+
+#
+# ESP-TLS
+#
+CONFIG_ESP_TLS_USING_MBEDTLS=y
+# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
+# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
+CONFIG_ESP_TLS_SERVER=y
+# CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set
+# CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set
+# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
+# CONFIG_ESP_TLS_INSECURE is not set
+# end of ESP-TLS
+
 #
 # ESP32-specific
 #
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_1 is not set
 # CONFIG_ESP32_REV_MIN_2 is not set
@@ -27,9 +264,84 @@ CONFIG_ESP32_REV_MIN_0=y
 CONFIG_ESP32_REV_MIN=0
 CONFIG_ESP32_DPORT_WORKAROUND=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
-# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+#
+# SPIRAM cache workaround debugging
+#
+CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y
+# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST is not set
+# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS is not set
+# end of SPIRAM cache workaround debugging
+
+#
+# SPIRAM workaround libraries placement
+#
+CONFIG_SPIRAM_CACHE_LIBJMP_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMATH_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBNUMPARSER_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBIO_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMEM_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBRAND_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBENV_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBFILE_IN_IRAM=y
+CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y
+# end of SPIRAM workaround libraries placement
+
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
+CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+
+#
+# PSRAM clock and cs IO for ESP32-DOWD
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+# end of PSRAM clock and cs IO for ESP32-DOWD
+
+#
+# PSRAM clock and cs IO for ESP32-D2WD
+#
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+# end of PSRAM clock and cs IO for ESP32-D2WD
+
+#
+# PSRAM clock and cs IO for ESP32-PICO
+#
+CONFIG_PICO_PSRAM_CS_IO=10
+# end of PSRAM clock and cs IO for ESP32-PICO
+
+# CONFIG_SPIRAM_CUSTOM_SPIWP_SD3_PIN is not set
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
+# CONFIG_SPIRAM_2T_MODE is not set
+# end of SPI RAM config
+
 # CONFIG_ESP32_TRAX is not set
 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ESP32_ULP_COPROC_ENABLED is not set
@@ -67,12 +379,52 @@ CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 # end of ESP32-specific
 
+#
+# ADC-Calibration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# end of ADC-Calibration
+
+#
+# Common ESP-related
+#
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+# end of Common ESP-related
+
+#
+# Ethernet
+#
+# CONFIG_ETH_USE_ESP32_EMAC is not set
+# CONFIG_ETH_USE_SPI_ETHERNET is not set
+# CONFIG_ETH_USE_OPENETH is not set
+# end of Ethernet
+
+#
+# Event Loop Library
+#
+# CONFIG_ESP_EVENT_LOOP_PROFILING is not set
+CONFIG_ESP_EVENT_POST_FROM_ISR=y
+CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
+# end of Event Loop Library
+
+#
+# GDB Stub
+#
+# end of GDB Stub
+
 #
 # Hardware Settings
 #
+
 #
 # MAC Config
 #
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
 # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
@@ -81,25 +433,106 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 #
 # Sleep Config
 #
-CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
+CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
+# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set
+# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 # end of Sleep Config
 
+#
+# RTC Clock Config
+#
+# end of RTC Clock Config
 # end of Hardware Settings
 
+#
+# IPC (Inter-Processor Call)
+#
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
+CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
+CONFIG_ESP_IPC_ISR_ENABLE=y
+# end of IPC (Inter-Processor Call)
+
+#
+# ESP NETIF Adapter
+#
+CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
+CONFIG_ESP_NETIF_TCPIP_LWIP=y
+# CONFIG_ESP_NETIF_LOOPBACK is not set
+# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set
+# end of ESP NETIF Adapter
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
+# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
+CONFIG_ESP_PHY_MAX_TX_POWER=20
+CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+# end of PHY
+
+#
+# Power Management
+#
+# CONFIG_PM_ENABLE is not set
+# end of Power Management
+
 #
 # ESP System Settings
 #
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
+# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
+
+#
+# Memory protection
+#
+# end of Memory protection
+
+CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
+CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
+# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set
+CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
+CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_CHECK_CPU1=y
+# CONFIG_ESP_TASK_WDT is not set
+# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
+# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y
 # end of ESP System Settings
 
 #
-# Ethernet
+# High resolution timer (esp_timer)
 #
-CONFIG_ETH_USE_ESP32_EMAC=n
+# CONFIG_ESP_TIMER_PROFILING is not set
+CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
+CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
+CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1
+# CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
+# CONFIG_ESP_TIMER_IMPL_FRC2 is not set
+CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
+# end of High resolution timer (esp_timer)
 
 #
 # Wi-Fi
@@ -107,15 +540,17 @@ CONFIG_ETH_USE_ESP32_EMAC=n
 CONFIG_ESP32_WIFI_ENABLED=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
@@ -124,42 +559,637 @@ CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_IRAM_OPT=y
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
 CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
+# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
+# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # end of Wi-Fi
 
+#
+# Core dump
+#
+# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set
+# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
+CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
+# end of Core dump
+
 #
 # FreeRTOS
 #
 # CONFIG_FREERTOS_UNICORE is not set
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y
 CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
 CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
+CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
+# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
+CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
+# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
+CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
+# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
+# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
+# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
+# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
+CONFIG_FREERTOS_DEBUG_OCDAWARE=y
+# CONFIG_FREERTOS_FPU_IN_ISR is not set
+CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
+# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
 # end of FreeRTOS
 
+#
+# Hardware Abstraction Layer (HAL) and Low Level (LL)
+#
+CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
+# CONFIG_HAL_ASSERTION_DISABLE is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_ENABLE is not set
+CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
+# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
+
+#
+# Heap memory debugging
+#
+CONFIG_HEAP_POISONING_DISABLED=y
+# CONFIG_HEAP_POISONING_LIGHT is not set
+# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
+CONFIG_HEAP_TRACING_OFF=y
+# CONFIG_HEAP_TRACING_STANDALONE is not set
+# CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
+# end of Heap memory debugging
+
+#
+# Log output
+#
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
+# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
+# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
+CONFIG_LOG_MAXIMUM_LEVEL=3
+CONFIG_LOG_COLORS=y
+CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
+# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
+# end of Log output
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2"
+# CONFIG_LWIP_NETIF_API is not set
+# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
+CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
+# CONFIG_LWIP_L2_TO_L3_COPY is not set
+# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_TIMERS_ONDEMAND=y
+CONFIG_LWIP_MAX_SOCKETS=8
+# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
+# CONFIG_LWIP_SO_LINGER is not set
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_SO_REUSE_RXTOALL=y
+CONFIG_LWIP_SO_RCVBUF=y
+# CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP4_FRAG=y
+CONFIG_LWIP_IP6_FRAG=y
+# CONFIG_LWIP_IP4_REASSEMBLY is not set
+# CONFIG_LWIP_IP6_REASSEMBLY is not set
+# CONFIG_LWIP_IP_FORWARD is not set
+# CONFIG_LWIP_STATS is not set
+# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
+CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
+CONFIG_LWIP_GARP_TMR_INTERVAL=60
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
+CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
+# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
+
+#
+# DHCP server
+#
+CONFIG_LWIP_DHCPS=y
+CONFIG_LWIP_DHCPS_LEASE_UNIT=60
+CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
+# end of DHCP server
+
+# CONFIG_LWIP_AUTOIP is not set
+CONFIG_LWIP_IPV6=y
+# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
+# CONFIG_LWIP_IPV6_FORWARD is not set
+# CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
+CONFIG_LWIP_NETIF_LOOPBACK=y
+CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
+
+#
+# TCP
+#
+CONFIG_LWIP_MAX_ACTIVE_TCP=4
+CONFIG_LWIP_MAX_LISTENING_TCP=4
+CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
+CONFIG_LWIP_TCP_MAXRTX=12
+CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_MSS=1440
+CONFIG_LWIP_TCP_TMR_INTERVAL=250
+CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=2880
+CONFIG_LWIP_TCP_WND_DEFAULT=2880
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+# CONFIG_LWIP_TCP_SACK_OUT is not set
+# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_LWIP_TCP_OVERSIZE_MSS=y
+# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
+CONFIG_LWIP_TCP_RTO_TIME=3000
+# end of TCP
+
+#
+# UDP
+#
+CONFIG_LWIP_MAX_UDP_PCBS=16
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
+# end of UDP
+
+#
+# Checksums
+#
+# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set
+# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set
+CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y
+# end of Checksums
+
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
+CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_LWIP_PPP_SUPPORT is not set
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+# CONFIG_LWIP_SLIP_SUPPORT is not set
+
+#
+# ICMP
+#
+CONFIG_LWIP_ICMP=y
+# CONFIG_LWIP_MULTICAST_PING is not set
+# CONFIG_LWIP_BROADCAST_PING is not set
+# end of ICMP
+
+#
+# LWIP RAW API
+#
+CONFIG_LWIP_MAX_RAW_PCBS=16
+# end of LWIP RAW API
+
+#
+# SNTP
+#
+CONFIG_LWIP_SNTP_MAX_SERVERS=1
+# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+# end of SNTP
+
+CONFIG_LWIP_ESP_LWIP_ASSERT=y
+
+#
+# Hooks
+#
+# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
+CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
+# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
+CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
+# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
+CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y
+# CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set
+# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
+CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
+# end of Hooks
+
+# CONFIG_LWIP_DEBUG is not set
+# end of LWIP
+
+#
+# mbedTLS
+#
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
+# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
+# CONFIG_MBEDTLS_DEBUG is not set
+
+#
+# mbedTLS v2.28.x related
+#
+# CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH is not set
+CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y
+# CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set
+# CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
+CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
+
+#
+# DTLS-based configurations
+#
+# CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID is not set
+# CONFIG_MBEDTLS_SSL_DTLS_SRTP is not set
+# end of DTLS-based configurations
+# end of mbedTLS v2.28.x related
+
+#
+# Certificate Bundle
+#
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
+CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
+CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem"
+# end of Certificate Bundle
+
+CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_ROM_MD5=y
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set
+CONFIG_MBEDTLS_HAVE_TIME=y
+# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
+CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
+CONFIG_MBEDTLS_SHA512_C=y
+CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
+# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
+# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set
+# CONFIG_MBEDTLS_TLS_DISABLED is not set
+CONFIG_MBEDTLS_TLS_SERVER=y
+CONFIG_MBEDTLS_TLS_CLIENT=y
+CONFIG_MBEDTLS_TLS_ENABLED=y
+
+#
+# TLS Key Exchange Methods
+#
+CONFIG_MBEDTLS_PSK_MODES=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
+# end of TLS Key Exchange Methods
+
+CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
+# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 is not set
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
+# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_MBEDTLS_SSL_ALPN=y
+CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
+CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y
+CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y
+CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
+
+#
+# Symmetric Ciphers
+#
+CONFIG_MBEDTLS_AES_C=y
+# CONFIG_MBEDTLS_CAMELLIA_C is not set
+# CONFIG_MBEDTLS_DES_C is not set
+CONFIG_MBEDTLS_RC4_DISABLED=y
+# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
+# CONFIG_MBEDTLS_RC4_ENABLED is not set
+# CONFIG_MBEDTLS_BLOWFISH_C is not set
+# CONFIG_MBEDTLS_XTEA_C is not set
+CONFIG_MBEDTLS_CCM_C=y
+CONFIG_MBEDTLS_GCM_C=y
+# CONFIG_MBEDTLS_NIST_KW_C is not set
+# end of Symmetric Ciphers
+
+# CONFIG_MBEDTLS_RIPEMD160_C is not set
+
+#
+# Certificates
+#
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+CONFIG_MBEDTLS_PEM_WRITE_C=y
+CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
+CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
+# end of Certificates
+
+CONFIG_MBEDTLS_ECP_C=y
+CONFIG_MBEDTLS_ECDH_C=y
+CONFIG_MBEDTLS_ECDSA_C=y
+# CONFIG_MBEDTLS_ECJPAKE_C is not set
+CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
+CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+# CONFIG_MBEDTLS_POLY1305_C is not set
+# CONFIG_MBEDTLS_CHACHA20_C is not set
+# CONFIG_MBEDTLS_HKDF_C is not set
+# CONFIG_MBEDTLS_THREADING_C is not set
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
+# CONFIG_MBEDTLS_SECURITY_RISKS is not set
+# end of mbedTLS
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_TASK_STACK_SIZE=4096
+# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_MDNS_TASK_AFFINITY_CPU0=y
+# CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set
+CONFIG_MDNS_TASK_AFFINITY=0x0
+CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
+# CONFIG_MDNS_STRICT_MODE is not set
+CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
+# end of mDNS
+
+#
+# Newlib
+#
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
+CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+# end of Newlib
+
+#
+# NVS
+#
+# end of NVS
+
+#
+# OpenThread
+#
+# CONFIG_OPENTHREAD_ENABLED is not set
+# end of OpenThread
+
+#
+# PThreads
+#
+CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY=y
+# CONFIG_PTHREAD_DEFAULT_CORE_0 is not set
+# CONFIG_PTHREAD_DEFAULT_CORE_1 is not set
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
+# end of PThreads
+
+#
+# SPI Flash driver
+#
+# CONFIG_SPI_FLASH_VERIFY_WRITE is not set
+# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
+# CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
+# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
+# CONFIG_SPI_FLASH_YIELD_DURING_ERASE is not set
+CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+# CONFIG_SPI_FLASH_SIZE_OVERRIDE is not set
+# CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set
+# CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set
+
+#
+# Auto-detect flash chips
+#
+CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y
+# end of Auto-detect flash chips
+
+CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y
+# end of SPI Flash driver
+
+#
+# Virtual file system
+#
+CONFIG_VFS_SUPPORT_IO=y
+CONFIG_VFS_SUPPORT_DIR=y
+CONFIG_VFS_SUPPORT_SELECT=y
+CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_VFS_SUPPORT_TERMIOS=y
+
+#
+# Host File System I/O (Semihosting)
+#
+CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# end of Host File System I/O (Semihosting)
+# end of Virtual file system
+
+#
+# Supplicant
+#
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+# CONFIG_WPA_WAPI_PSK is not set
+# CONFIG_WPA_SUITE_B_192 is not set
+# CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
+# CONFIG_WPA_WPS_STRICT is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
+# CONFIG_WPA_MBO_SUPPORT is not set
+# CONFIG_WPA_DPP_SUPPORT is not set
+# end of Supplicant
 # end of Component config
 
 #
-# Deprecated options for backward compatibility
+# Compatibility options
 #
+# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
+# end of Compatibility options
+
+# Deprecated options for backward compatibility
 CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
+CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y
+# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
+CONFIG_LOG_BOOTLOADER_LEVEL=0
+# CONFIG_APP_ROLLBACK_ENABLE is not set
+# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
+# CONFIG_FLASHMODE_QIO is not set
+# CONFIG_FLASHMODE_QOUT is not set
+CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DOUT is not set
+# CONFIG_MONITOR_BAUD_9600B is not set
+# CONFIG_MONITOR_BAUD_57600B is not set
+CONFIG_MONITOR_BAUD_115200B=y
+# CONFIG_MONITOR_BAUD_230400B is not set
+# CONFIG_MONITOR_BAUD_921600B is not set
+# CONFIG_MONITOR_BAUD_2MB is not set
+# CONFIG_MONITOR_BAUD_OTHER is not set
+CONFIG_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_MONITOR_BAUD=115200
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
+# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
+CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
+# CONFIG_CXX_EXCEPTIONS is not set
+CONFIG_STACK_CHECK_NONE=y
+# CONFIG_STACK_CHECK_NORM is not set
+# CONFIG_STACK_CHECK_STRONG is not set
+# CONFIG_STACK_CHECK_ALL is not set
+# CONFIG_WARN_WRITE_STRINGS is not set
+# CONFIG_DISABLE_GCC8_WARNINGS is not set
 # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
+CONFIG_ADC2_DISABLE_DAC=y
+CONFIG_SPIRAM_SUPPORT=y
+CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ULP_COPROC_ENABLED is not set
+CONFIG_ULP_COPROC_RESERVE_MEM=0
+CONFIG_BROWNOUT_DET=y
+CONFIG_BROWNOUT_DET_LVL_SEL_0=y
+# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set
+CONFIG_BROWNOUT_DET_LVL=0
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
-CONFIG_ESP_SYSTEM_PD_FLASH=y
+# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
+# CONFIG_NO_BLOBS is not set
+# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
+# CONFIG_EVENT_LOOP_PROFILING is not set
+CONFIG_POST_EVENTS_FROM_ISR=y
+CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
+# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
+CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
+CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
 # CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set
+CONFIG_IPC_TASK_STACK_SIZE=1536
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
 CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+CONFIG_ESP32S2_PANIC_PRINT_HALT=y
+# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
+CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_MAIN_TASK_STACK_SIZE=8192
+# CONFIG_CONSOLE_UART_DEFAULT is not set
+CONFIG_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_UART_NONE is not set
+CONFIG_CONSOLE_UART=y
+CONFIG_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_TX_GPIO=8
+CONFIG_CONSOLE_UART_RX_GPIO=7
+CONFIG_CONSOLE_UART_BAUDRATE=115200
+CONFIG_INT_WDT=y
+CONFIG_INT_WDT_TIMEOUT_MS=300
+CONFIG_INT_WDT_CHECK_CPU1=y
+# CONFIG_TASK_WDT is not set
 # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set
+CONFIG_TIMER_TASK_STACK_SIZE=3584
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+CONFIG_TIMER_TASK_PRIORITY=1
+CONFIG_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_TIMER_QUEUE_LENGTH=10
+# CONFIG_L2_TO_L3_COPY is not set
+# CONFIG_USE_ONLY_LWIP_SELECT is not set
+CONFIG_ESP_GRATUITOUS_ARP=y
+CONFIG_GARP_TMR_INTERVAL=60
+CONFIG_TCPIP_RECVMBOX_SIZE=32
+CONFIG_TCP_MAXRTX=12
+CONFIG_TCP_SYNMAXRTX=6
+CONFIG_TCP_MSS=1440
+CONFIG_TCP_MSL=60000
+CONFIG_TCP_SND_BUF_DEFAULT=2880
+CONFIG_TCP_WND_DEFAULT=2880
+CONFIG_TCP_RECVMBOX_SIZE=6
+CONFIG_TCP_QUEUE_OOSEQ=y
+# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_TCP_OVERSIZE_MSS=y
+# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_TCP_OVERSIZE_DISABLE is not set
+CONFIG_UDP_RECVMBOX_SIZE=6
+CONFIG_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
+# CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set
+CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_PPP_SUPPORT is not set
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_ESP32_PTHREAD_STACK_MIN=768
@@ -168,4 +1198,11 @@ CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
 # CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
-# end of Deprecated options for backward compatibility
+CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
+CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_SUPPORT_TERMIOS=y
+CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# End of deprecated options

From afbf4de071a81a752b03272da975244788b5f0dd Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 12:53:25 -0400
Subject: [PATCH 0582/2403] Uncomment or remove debugging changes

---
 .../adafruit_feather_esp32_v2/sdkconfig       | 34 +++++++++----------
 py/emitglue.c                                 |  3 --
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index ad957c841f..7921ca6eff 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -5,20 +5,20 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv
 CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
 # end of Partition Table
 
-# *** temporary custom CONSOLE_UART settings, to send log output to TX/RX pins on Feather ESP32V2
-#
-# ESP System Settings
-#
-CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-# end of ESP System Settings
+### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### # CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings
diff --git a/py/emitglue.c b/py/emitglue.c
index 47d2821bae..e701d0808f 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -26,8 +26,6 @@
 
 // This code glues the code emitters to the runtime.
 
-#include "esp_log.h"
-
 #include 
 #include 
 #include 
@@ -197,7 +195,6 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
             break;
         #endif
         default:
-            ESP_LOGI("mp_make_function_from_raw_code", "kind: %d, scope_flags: 0x%x, n_pos_args: %d, fun_data: %p, const_table: %p", rc->kind, rc->scope_flags, rc->n_pos_args, rc->fun_data, rc->const_table);
             // rc->kind should always be set and BYTECODE is the only remaining case
             assert(rc->kind == MP_CODE_BYTECODE);
             fun = mp_obj_new_fun_bc(def_args, def_kw_args, rc->fun_data, rc->const_table);

From 76e32dcf93a562210c027dd8a8714da44741a3fb Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 14:54:55 -0400
Subject: [PATCH 0583/2403] remove need for CIRCUITPY_ESP_PSRAM

---
 .../boards/adafruit_esp32s2_camera/mpconfigboard.mk      | 2 --
 .../boards/adafruit_feather_esp32_v2/mpconfigboard.mk    | 2 --
 .../espressif/boards/adafruit_feather_esp32_v2/sdkconfig | 9 +++++++++
 .../boards/adafruit_feather_esp32s2/mpconfigboard.mk     | 2 --
 .../boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk | 2 --
 .../mpconfigboard.mk                                     | 2 --
 .../mpconfigboard.mk                                     | 2 --
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk | 2 --
 .../espressif/boards/adafruit_funhouse/mpconfigboard.mk  | 2 --
 .../adafruit_magtag_2.9_grayscale/mpconfigboard.mk       | 2 --
 .../boards/adafruit_metro_esp32s2/mpconfigboard.mk       | 2 --
 .../boards/adafruit_qtpy_esp32s2/mpconfigboard.mk        | 2 --
 .../boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk   | 2 --
 ports/espressif/boards/artisense_rd00/mpconfigboard.mk   | 2 --
 .../espressif/boards/crumpspace_crumps2/mpconfigboard.mk | 2 --
 .../boards/electroniccats_bastwifi/mpconfigboard.mk      | 2 --
 .../boards/espressif_hmi_devkit_1/mpconfigboard.mk       | 2 --
 .../boards/espressif_kaluga_1.3/mpconfigboard.mk         | 2 --
 .../espressif/boards/espressif_kaluga_1/mpconfigboard.mk | 2 --
 .../boards/espressif_saola_1_wroom/mpconfigboard.mk      | 2 --
 .../boards/espressif_saola_1_wrover/mpconfigboard.mk     | 2 --
 .../boards/franzininho_wifi_wroom/mpconfigboard.mk       | 2 --
 .../boards/franzininho_wifi_wrover/mpconfigboard.mk      | 2 --
 .../boards/gravitech_cucumber_m/mpconfigboard.mk         | 2 --
 .../boards/gravitech_cucumber_ms/mpconfigboard.mk        | 2 --
 .../boards/gravitech_cucumber_r/mpconfigboard.mk         | 2 --
 .../boards/gravitech_cucumber_rs/mpconfigboard.mk        | 2 --
 .../lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk       | 2 --
 .../espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk  | 2 --
 .../boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk     | 2 --
 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk  | 2 --
 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk   | 2 --
 .../boards/morpheans_morphesp-240/mpconfigboard.mk       | 2 --
 .../boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk   | 2 --
 .../boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk  | 2 --
 .../boards/odt_pixelwing_esp32_s2/mpconfigboard.mk       | 2 --
 .../boards/targett_module_clip_wroom/mpconfigboard.mk    | 2 --
 .../boards/targett_module_clip_wrover/mpconfigboard.mk   | 2 --
 ports/espressif/common-hal/microcontroller/Pin.c         | 3 ++-
 ports/espressif/esp-idf-config/sdkconfig-esp32.defaults  | 4 ++--
 ports/espressif/mpconfigport.mk                          | 5 -----
 41 files changed, 13 insertions(+), 82 deletions(-)

diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
index 7a352fc83c..6b351c772b 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
index a83269f3ac..21a87a9456 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
@@ -13,5 +13,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-
-CIRCUITPY_ESP_PSRAM = 1
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index 7921ca6eff..b8b4a9690d 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -5,6 +5,15 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv
 CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
 # end of Partition Table
 
+#
+# SPI RAM config
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+
 ### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
 ### #
 ### # ESP System Settings
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
index 407844ed4b..6af258b3d0 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
index d939630dfd..870c2aa3d0 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
@@ -16,5 +16,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
index 7a2f3d3691..43c286ae3b 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
@@ -16,8 +16,6 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP_PSRAM = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index 6e4c716fe0..e1e9be782c 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index 0412fabed3..81b6eb1edc 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -16,5 +16,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index 961e3371bc..531627d5a6 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -16,8 +16,6 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP_PSRAM = 0
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index beccc8275e..e1bd4997b7 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -16,8 +16,6 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP_PSRAM = 0
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
index d293096e4b..a0e7bfe6fc 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
index 64cf3630bb..44c33310cc 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
@@ -16,5 +16,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
index 8c81c7bc6c..de0fc66b9d 100644
--- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
index 621b714156..b617b33fac 100644
--- a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
+++ b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
index 4d4ae5de60..5cd7682090 100644
--- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
+++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
@@ -18,7 +18,5 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_BITBANG_APA102 = 1
 
-CIRCUITPY_ESP_PSRAM = 0
-
 # Include these Python libraries in firmware.
 # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
index 99a75f1db4..df377b2b6c 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -17,5 +17,3 @@ CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
index aedb03801b..bd8e6c6e31 100644
--- a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
index 5c0d16346d..0ff4eab64f 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
index 5c0d16346d..0ff4eab64f 100644
--- a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index 56b5a65eb8..5e09be7b2e 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
index 4442a577b6..6185e40809 100644
--- a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index 53d1a4a846..dc777ecd95 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
index 5f5bd893cb..4d5081dd7f 100644
--- a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index 04f713043f..04f23bf4bb 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
index b3421d59a1..77861c0228 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
index c4b76ff756..5e4f6c4b98 100644
--- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
index d15530b48c..96b9dddf8b 100644
--- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
index 68521578a7..1d5e3ec719 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
index 5de3534e39..781818f53e 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
index dc311d0558..4d6a586ff8 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index 30ca08c176..31955af81f 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -16,8 +16,6 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP_PSRAM = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index 3148b3ece7..4b8fe6846c 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -16,8 +16,6 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP_PSRAM = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
index 4b4b69a347..79dd73f58a 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
+++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index f4a3560716..d1b4b1b453 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
index 800c55d57c..80557e1575 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
index f00e1082ba..d02872f445 100644
--- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index 08cce69957..2345469304 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
index a668d5ae9c..80014bdf98 100644
--- a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -15,5 +15,3 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index d2ccc897d4..d3bec8c37b 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -77,7 +77,8 @@ static const uint64_t pin_mask_reset_forbidden =
     // Never ever reset pins used to communicate with SPI flash and PSRAM.
     GPIO_SEL_19 |         // USB D-
     GPIO_SEL_20 |         // USB D+
-    #if CIRCUITPY_ESP_PSRAM
+    #if defined (CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
+    // Note ESP32-C3 does not have SPIRAM support.
     // Board uses PSRAM, and needs another chip select.
     GPIO_SEL_26 |         // SPICS1
     #endif
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index ff691341cc..b08d088ed2 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -267,12 +267,12 @@ CONFIG_ESP32_DPORT_WORKAROUND=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 04bfd7e4c5..53f57dc895 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -80,8 +80,3 @@ endif
 # only if something else is turned off, such as HID.
 USB_NUM_ENDPOINT_PAIRS = 7
 USB_NUM_IN_ENDPOINTS = 5
-
-#ifndef CIRCUITPY_ESP_PSRAM
-#error CIRCUITPY_ESP_PSRAM must be specified in mpconfigboard.mk as 0 or 1. Use 1 if the board has PSRAM.
-#endif
-CFLAGS += -DCIRCUITPY_ESP_PSRAM=$(CIRCUITPY_ESP_PSRAM)

From d869b441f4cf060dac214209527307161f89ba71 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 15:27:00 -0400
Subject: [PATCH 0584/2403] further ESP32 sdkconfig fixes; add
 CIRCUITPY_STATUS_BAR

---
 .../mpconfigboard.mk                          |  3 +++
 .../adafruit_feather_esp32_v2/sdkconfig       | 21 ++++++++++++++-
 .../esp-idf-config/sdkconfig-esp32.defaults   | 20 --------------
 py/circuitpy_mpconfig.mk                      |  3 +++
 supervisor/shared/workflow.c                  | 26 +++++++++++--------
 5 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
index 21a87a9456..f25eda463f 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
@@ -10,6 +10,9 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
+CIRCUITPY_STATUS_BAR = 0
+CIRCUITPY_WEB_WORKFLOW = 0
+
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index b8b4a9690d..f2e8085d3e 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -8,11 +8,30 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
 # CONFIG_SPIRAM_TYPE_AUTO is not set
 CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+#
+# SPI RAM config
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 
 ### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
 ### #
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index b08d088ed2..ed573c303e 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -269,26 +269,6 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
 # CONFIG_ESP32_SPIRAM_SUPPORT is not set
 
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=-1
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
-# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
-
 #
 # SPIRAM cache workaround debugging
 #
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 4b1ff9cb67..a9740ab8d8 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -366,6 +366,9 @@ CFLAGS += -DCIRCUITPY_SSL=$(CIRCUITPY_SSL)
 CIRCUITPY_STAGE ?= 0
 CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE)
 
+CIRCUITPY_STATUS_BAR ?= $(CIRCUITPY_WEB_WORKFLOW)
+CFLAGS += -DCIRCUITPY_STATUS_BAR=$(CIRCUITPY_STATUS_BAR)
+
 CIRCUITPY_STORAGE ?= 1
 CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE)
 
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 202b11ec71..775087bda7 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -46,22 +46,26 @@
 #endif
 static background_callback_t workflow_background_cb;
 
+#if CIRCUITPY_STATUS_BAR
 static void supervisor_workflow_update_status_bar(void) {
-    // // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
-    // // doesn't get terminated after two following characters and the value is invalid.
-    // // This is the OSC command to set the title and the icon text. It can be up to 255 characters
-    // // but some may be cut off.
-    // serial_write("\x1b" "]0;");
-    // serial_write("🐍 ");
-    // #if CIRCUITPY_WEB_WORKFLOW
-    // supervisor_web_workflow_status();
-    // #endif
-    // // Send string terminator
-    // serial_write("\x1b" "\\");
+    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
+    // doesn't get terminated after two following characters and the value is invalid.
+    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
+    // but some may be cut off.
+    serial_write("\x1b" "]0;");
+    serial_write("🐍 ");
+    #if CIRCUITPY_WEB_WORKFLOW
+    supervisor_web_workflow_status();
+    #endif
+    // Send string terminator
+    serial_write("\x1b" "\\");
 }
+#endif
 
 static void workflow_background(void *data) {
+#if CIRCUITPY_STATUS_BAR
     supervisor_workflow_update_status_bar();
+#endif
 }
 
 // Called during a VM reset. Doesn't actually reset things.

From a9d4f09360eafc90f9ccf22064d3a617c48951c5 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 16:11:01 -0400
Subject: [PATCH 0585/2403] Update ci_check_duplicate_usb_vid_pid.py for ESP32

---
 tools/ci_check_duplicate_usb_vid_pid.py | 27 +++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index d9e7d99687..4cbb7e4567 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -79,7 +79,7 @@ def check_vid_pid(files, clusterlist):
 
     vid_pattern = re.compile(r"^USB_VID\s*=\s*(.*)", flags=re.M)
     pid_pattern = re.compile(r"^USB_PID\s*=\s*(.*)", flags=re.M)
-    usb_pattern = re.compile(r"^CIRCUITPY_USB\s*=\s*0$|^IDF_TARGET = esp32c3$", flags=re.M)
+    usb_pattern = re.compile(r"^CIRCUITPY_USB\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3)$", flags=re.M)
 
     usb_ids = defaultdict(set)
     for board_config in files:
@@ -95,7 +95,7 @@ def check_vid_pid(files, clusterlist):
         elif non_usb:
             continue
         else:
-            raise SystemExit(f"Could not parse {board_config}")
+            raise SystemExit(f"Could not find expected settings in {board_config}")
 
         usb_ids[id_group].add(board_name)
 
@@ -120,6 +120,29 @@ def check_vid_pid(files, clusterlist):
             f"Otherwise, companies should pay the USB-IF for a vendor ID: https://www.usb.org/getting-vendor-id"
         )
         sys.exit(duplicate_message)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     else:
         print("No USB PID duplicates found.")
 

From 2c7ad7a39f62e1fe76f8ecb3d59c842754144cd9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 16:53:53 -0400
Subject: [PATCH 0586/2403] make translate and pre-commit formatting fixes

---
 locale/circuitpython.pot                      |  5 +++++
 .../espressif/common-hal/analogio/AnalogOut.c |  3 +--
 .../common-hal/microcontroller/Pin.c          |  2 +-
 .../common-hal/microcontroller/__init__.c     |  4 ++--
 py/circuitpy_mpconfig.h                       |  6 ++---
 supervisor/shared/workflow.c                  |  4 ++--
 tools/ci_check_duplicate_usb_vid_pid.py       | 22 -------------------
 7 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5740e1e288..c5f7a895d5 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3739,7 +3739,12 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/ports/espressif/common-hal/analogio/AnalogOut.c b/ports/espressif/common-hal/analogio/AnalogOut.c
index 8720dcf8bb..1a1e74391b 100644
--- a/ports/espressif/common-hal/analogio/AnalogOut.c
+++ b/ports/espressif/common-hal/analogio/AnalogOut.c
@@ -56,8 +56,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
         self->channel = DAC_CHANNEL_1;
     } else if (pin == &pin_CHANNEL_2) {
         self->channel = DAC_CHANNEL_2;
-    }
-    else {
+    } else {
         raise_ValueError_invalid_pin();
     }
     dac_output_enable(self->channel);
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index d3bec8c37b..201fa0ac2b 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -77,7 +77,7 @@ static const uint64_t pin_mask_reset_forbidden =
     // Never ever reset pins used to communicate with SPI flash and PSRAM.
     GPIO_SEL_19 |         // USB D-
     GPIO_SEL_20 |         // USB D+
-    #if defined (CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
+    #if defined(CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
     // Note ESP32-C3 does not have SPIRAM support.
     // Board uses PSRAM, and needs another chip select.
     GPIO_SEL_26 |         // SPICS1
diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c
index 27943eab32..1014ce9532 100644
--- a/ports/espressif/common-hal/microcontroller/__init__.c
+++ b/ports/espressif/common-hal/microcontroller/__init__.c
@@ -89,7 +89,7 @@ void common_hal_mcu_enable_interrupts(void) {
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     switch (runmode) {
         case RUNMODE_UF2:
-            #if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3)
+            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
             mp_arg_error_invalid(MP_QSTR_run_mode);
             #else
             // 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2
@@ -112,7 +112,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
             break;
         case RUNMODE_BOOTLOADER:
             // DFU download
-            #if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3)
+            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
             mp_arg_error_invalid(MP_QSTR_run_mode);
             #else
             chip_usb_set_persist_flags(USBDC_BOOT_DFU);
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 1ef6bcbfb8..950cf91e2e 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -200,9 +200,9 @@ typedef long mp_off_t;
 // extra built in names to add to the global namespace
 // Not indented so as not to confused the editor.
 #define MICROPY_PORT_BUILTINS \
-{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj },      \
-{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
-{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },   \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj },      \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },   \
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // board-specific definitions, which control and may override definitions below.
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 775087bda7..a7bddca84d 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -63,9 +63,9 @@ static void supervisor_workflow_update_status_bar(void) {
 #endif
 
 static void workflow_background(void *data) {
-#if CIRCUITPY_STATUS_BAR
+    #if CIRCUITPY_STATUS_BAR
     supervisor_workflow_update_status_bar();
-#endif
+    #endif
 }
 
 // Called during a VM reset. Doesn't actually reset things.
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 4cbb7e4567..060bc8ea17 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -121,28 +121,6 @@ def check_vid_pid(files, clusterlist):
         )
         sys.exit(duplicate_message)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     else:
         print("No USB PID duplicates found.")
 

From bc14b7ad47ccc1a32727f163d529ab271709ed1c Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Fri, 8 Jul 2022 15:40:59 -0700
Subject: [PATCH 0587/2403] Fix the display on the esp box lite

---
 ports/espressif/boards/espressif_esp32s3_box_lite/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
index dbd3c17313..71659f4b0e 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -37,9 +37,9 @@ uint8_t display_init_sequence[] = {
     0x01, 0x80, 0x96, //  _SWRESET and Delay 150ms
     0x11, 0x80, 0xFF, //  _SLPOUT and Delay 500ms
     0x3A, 0x81, 0x55, 0x0A, //  _COLMOD and Delay 10ms
-    0x21, 0x80, 10,                 // _INVON
+    0x21, 0x80, 0x0A, //  _INVON
     0x13, 0x80, 0x0A, //  _NORON and Delay 10ms
-    0x36, 0x01, 0x80, //  _MADCTL
+    0x36, 0x01, 0xA0, //  _MADCTL
     0x29, 0x80, 0xFF, //  _DISPON and Delay 500ms
 };
 

From 557e35469f7bece08c68a65a29dca82126c4b242 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 8 Jul 2022 16:57:19 -0700
Subject: [PATCH 0588/2403] Make serial page work ok including on mobile

---
 .../shared/web_workflow/static/serial.html    | 22 +++++--
 .../shared/web_workflow/static/serial.js      | 60 +++++++++++--------
 supervisor/shared/web_workflow/websocket.c    |  9 ++-
 3 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index d8ab86a7c8..aaf416b8b3 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -1,14 +1,24 @@
 
-
+
+
 
   Simple client
 
   
 
-
-  
    
-  
-  
-  
+
+  
    
+    
    
+     
+  
    
+  
    
+    
    
+      Ctrl
+      
+      
+    
    
+    
+    
+  
    
 
 
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index ab0893ad08..595bbe6653 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -1,7 +1,9 @@
 
 var ws;
 var input = document.getElementById("input");
+input.value = "";
 var title = document.querySelector("title");
+var log = document.getElementById("log");
 
 function set_enabled(enabled) {
   input.disabled = !enabled;
@@ -14,35 +16,21 @@ function set_enabled(enabled) {
 set_enabled(false);
 
 function onSubmit() {
-  console.log("submit");
-  // You can send message to the Web Socket using ws.send.
-  ws.send(input.value);
-  // output("send: " + input.value);
-  input.value = "";
-  input.focus();
-}
-
-function onCloseClick() {
-  console.log("close clicked");
-  ws.close();
-}
-
-function output(str) {
-  var log = document.getElementById("log");
-  log.innerHTML += str;
+    ws.send("\r");
+    input.value = "";
+    input.focus();
 }
 
 // Connect to Web Socket
-ws = new WebSocket("ws://cpy-f57ce8.local/cp/serial/");
-// ws = new WebSocket("ws://127.0.0.1:9001")
+ws = new WebSocket("ws://" + window.location.host + "/cp/serial/");
 
-// Set event handlers.
 ws.onopen = function() {
-  console.log("onopen");
   set_enabled(true);
 };
 
 var setting_title = false;
+var encoder = new TextEncoder();
+var left_count = 0;
 ws.onmessage = function(e) {
   // e.data contains received string.
   if (e.data == "\x1b]0;") {
@@ -52,22 +40,44 @@ ws.onmessage = function(e) {
     setting_title = false;
   } else if (setting_title) {
     title.textContent += e.data;
+  } else if (e.data == "\b") {
+    left_count += 1;
+  } else if (e.data == "\x1b[K") { // Clear line
+    log.textContent = log.textContent.slice(0, -left_count);
+    left_count = 0;
   } else {
-    output(e.data);
+    log.textContent += e.data;
   }
+  document.querySelector("span").scrollIntoView();
 };
 
 ws.onclose = function() {
-  console.log("onclose");
   set_enabled(false);
 };
 
 ws.onerror = function(e) {
-  // output("onerror");
-  console.log(e);
   set_enabled(false);
 };
 
 input.onbeforeinput = function(e) {
-  console.log(e);
+  if (e.inputType == "insertLineBreak") {
+    ws.send("\r");
+    input.value = "";
+    input.focus();
+    e.preventDefault();
+  } else if (e.inputType == "insertText") {
+    ws.send(e.data);
+  } else if (e.inputType == "deleteContentBackward") {
+    ws.send("\b");
+  }
+}
+
+let ctrl_c = document.querySelector("#c");
+ctrl_c.onclick = function() {
+  ws.send("\x03");
+}
+
+let ctrl_d = document.querySelector("#d");
+ctrl_d.onclick = function() {
+  ws.send("\x04");
 }
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 0f4c4fc84c..7a2f37b168 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -124,7 +124,6 @@ static void _read_next_frame_header(void) {
         size_t mask_offset = cp_serial.frame_index - mask_start;
         cp_serial.mask[mask_offset] = h;
         cp_serial.frame_index++;
-        ESP_LOGI(TAG, "mask %08x", (uint32_t)*cp_serial.mask);
     }
     // Reply to PINGs and CLOSE.
     while ((cp_serial.opcode == 0x8 ||
@@ -136,6 +135,11 @@ static void _read_next_frame_header(void) {
             if (cp_serial.opcode == 0x9) {
                 ESP_LOGI(TAG, "websocket ping");
                 opcode = 0xA; // PONG
+            } else {
+                // Set the TCP socket to send immediately so that we send the payload back before
+                // closing the connection.
+                int nodelay = 1;
+                lwip_setsockopt(cp_serial.socket.num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
             }
             uint8_t frame_header[2];
             frame_header[0] = 1 << 7 | opcode;
@@ -158,6 +162,8 @@ static void _read_next_frame_header(void) {
             if (cp_serial.opcode == 0x8) {
                 ESP_LOGI(TAG, "websocket closed");
                 cp_serial.closed = true;
+
+                common_hal_socketpool_socket_close(&cp_serial.socket);
             }
         }
     }
@@ -193,6 +199,7 @@ bool websocket_available(void) {
 char websocket_read_char(void) {
     uint8_t c;
     _read_next_payload_byte(&c);
+    ESP_LOGI(TAG, "read %c", c);
     return c;
 }
 

From fa62c875361b0370f2e94bd13eb058e7ae146c1b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 20:37:47 -0400
Subject: [PATCH 0589/2403] ESP32 .bin only; update nvm.toml

---
 data/nvm.toml             | 2 +-
 tools/build_board_info.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/nvm.toml b/data/nvm.toml
index 266ea20ed8..2d292ad4e6 160000
--- a/data/nvm.toml
+++ b/data/nvm.toml
@@ -1 +1 @@
-Subproject commit 266ea20ed80104c315dcb124b482fa5f9f48cdec
+Subproject commit 2d292ad4e67890d4b85b027431ba9fef7bf561fd
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index d73f0e3f1c..c58dc42a9d 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -71,6 +71,8 @@ extension_by_board = {
     "meowbit_v121": UF2,
     "sparkfun_stm32_thing_plus": BIN_UF2,
     "swan_r5": BIN_UF2,
+    # esp32
+    "adafruit_feather_esp32_v2": BIN,
     # esp32c3
     "adafruit_qtpy_esp32c3": BIN,
     "ai_thinker_esp32-c3s": BIN,

From 3f8b8d4b2f68df29288a3e7d4a945f5a1c428b92 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 22:42:13 -0400
Subject: [PATCH 0590/2403] update frozen libraries

---
 frozen/Adafruit_CircuitPython_APDS9960                      | 2 +-
 frozen/Adafruit_CircuitPython_BLE                           | 2 +-
 frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +-
 frozen/Adafruit_CircuitPython_BusDevice                     | 2 +-
 frozen/Adafruit_CircuitPython_CircuitPlayground             | 2 +-
 frozen/Adafruit_CircuitPython_Crickit                       | 2 +-
 frozen/Adafruit_CircuitPython_DRV2605                       | 2 +-
 frozen/Adafruit_CircuitPython_DS3231                        | 2 +-
 frozen/Adafruit_CircuitPython_Display_Shapes                | 2 +-
 frozen/Adafruit_CircuitPython_Display_Text                  | 2 +-
 frozen/Adafruit_CircuitPython_DotStar                       | 2 +-
 frozen/Adafruit_CircuitPython_ESP32SPI                      | 2 +-
 frozen/Adafruit_CircuitPython_FakeRequests                  | 2 +-
 frozen/Adafruit_CircuitPython_FocalTouch                    | 2 +-
 frozen/Adafruit_CircuitPython_HID                           | 2 +-
 frozen/Adafruit_CircuitPython_IRRemote                      | 2 +-
 frozen/Adafruit_CircuitPython_LC709203F                     | 2 +-
 frozen/Adafruit_CircuitPython_LIS3DH                        | 2 +-
 frozen/Adafruit_CircuitPython_LSM6DS                        | 2 +-
 frozen/Adafruit_CircuitPython_MIDI                          | 2 +-
 frozen/Adafruit_CircuitPython_Motor                         | 2 +-
 frozen/Adafruit_CircuitPython_NeoPixel                      | 2 +-
 frozen/Adafruit_CircuitPython_PortalBase                    | 2 +-
 frozen/Adafruit_CircuitPython_ProgressBar                   | 2 +-
 frozen/Adafruit_CircuitPython_RFM69                         | 2 +-
 frozen/Adafruit_CircuitPython_RFM9x                         | 2 +-
 frozen/Adafruit_CircuitPython_Register                      | 2 +-
 frozen/Adafruit_CircuitPython_Requests                      | 2 +-
 frozen/Adafruit_CircuitPython_SD                            | 2 +-
 frozen/Adafruit_CircuitPython_ST7789                        | 2 +-
 frozen/Adafruit_CircuitPython_SimpleIO                      | 2 +-
 frozen/Adafruit_CircuitPython_SimpleMath                    | 2 +-
 frozen/Adafruit_CircuitPython_Thermistor                    | 2 +-
 frozen/Adafruit_CircuitPython_seesaw                        | 2 +-
 frozen/mixgo_cp_lib                                         | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
index 9bd4882092..13856be616 160000
--- a/frozen/Adafruit_CircuitPython_APDS9960
+++ b/frozen/Adafruit_CircuitPython_APDS9960
@@ -1 +1 @@
-Subproject commit 9bd48820928afad549832fe9b4ae497b224007f0
+Subproject commit 13856be616eee2eb84280b7c4914951c1ddbfd36
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
index 13c529288e..7d9635ba1d 160000
--- a/frozen/Adafruit_CircuitPython_BLE
+++ b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76
+Subproject commit 7d9635ba1dda31ce45b84519c4da76ff86d0debe
diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
index 258bb62c58..e5cf8206c0 160000
--- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
+++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
@@ -1 +1 @@
-Subproject commit 258bb62c58e545c38749b8a66f5872035b2384cb
+Subproject commit e5cf8206c0173228252ae74367cab85b0531488e
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
index b96f0d2794..9addf6a26f 160000
--- a/frozen/Adafruit_CircuitPython_BusDevice
+++ b/frozen/Adafruit_CircuitPython_BusDevice
@@ -1 +1 @@
-Subproject commit b96f0d279481446017ca1cc1ff4abf1f5a10346f
+Subproject commit 9addf6a26fef3a32c78d574c66452b6210eca5c5
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
index 54b2fa03d8..843def7dae 160000
--- a/frozen/Adafruit_CircuitPython_CircuitPlayground
+++ b/frozen/Adafruit_CircuitPython_CircuitPlayground
@@ -1 +1 @@
-Subproject commit 54b2fa03d8af80562b77460841e63d47f12eee43
+Subproject commit 843def7daee741c8fb04fe21c3c7b98f22862471
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
index 938f6bb335..0a045871d3 160000
--- a/frozen/Adafruit_CircuitPython_Crickit
+++ b/frozen/Adafruit_CircuitPython_Crickit
@@ -1 +1 @@
-Subproject commit 938f6bb335ba5e4c56a8062c591ff9f3c18c4297
+Subproject commit 0a045871d3da681d1c9c9578f09174bfc6d84f1d
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
index 8e7e111a9f..6a429bcd0e 160000
--- a/frozen/Adafruit_CircuitPython_DRV2605
+++ b/frozen/Adafruit_CircuitPython_DRV2605
@@ -1 +1 @@
-Subproject commit 8e7e111a9ff39d3f4311caa7babeb451422c759f
+Subproject commit 6a429bcd0e6b22ee181197ce0477ae70f5adb80d
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
index df24498154..22931594bc 160000
--- a/frozen/Adafruit_CircuitPython_DS3231
+++ b/frozen/Adafruit_CircuitPython_DS3231
@@ -1 +1 @@
-Subproject commit df2449815433e05ea0f89c19518ccde7a10a2faa
+Subproject commit 22931594bc52ab259eaf313d26219a507703c315
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
index 2fad6f2f98..cdef09114d 160000
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit 2fad6f2f98c0df135e2306d32af18bb2796b852c
+Subproject commit cdef09114d2b43d2e461d066a5b56697ab567abc
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index de3276cc08..bb9cb75e15 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit de3276cc08ba13901d1f69060ff7501c1699bc4d
+Subproject commit bb9cb75e15b4bfce3063a94b40dfad2375d5605e
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
index a90579e1e1..f9469d26ed 160000
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@@ -1 +1 @@
-Subproject commit a90579e1e1e1c973e6ba8f6cf8e914d77fc8f0f2
+Subproject commit f9469d26ed9eb95d43982de88c035ac3862dd258
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
index ddd26eb4ab..f3d504be1d 160000
--- a/frozen/Adafruit_CircuitPython_ESP32SPI
+++ b/frozen/Adafruit_CircuitPython_ESP32SPI
@@ -1 +1 @@
-Subproject commit ddd26eb4abcd3c10ae5dd33b1345d10d58707995
+Subproject commit f3d504be1dc82cc4a8e4ea9b38bd5c2ce74d59ba
diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests
index f6cdec74b6..2ea025b1b6 160000
--- a/frozen/Adafruit_CircuitPython_FakeRequests
+++ b/frozen/Adafruit_CircuitPython_FakeRequests
@@ -1 +1 @@
-Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3
+Subproject commit 2ea025b1b68b0be95a0514732d4bc623f313fd75
diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch
index a77f0f9c2e..b637c47423 160000
--- a/frozen/Adafruit_CircuitPython_FocalTouch
+++ b/frozen/Adafruit_CircuitPython_FocalTouch
@@ -1 +1 @@
-Subproject commit a77f0f9c2e8f64568bbb68254d0134fbc7b5a8af
+Subproject commit b637c47423eb85233ba614424aadadace37fcfb1
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
index 2fddabcaf0..47cc914748 160000
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@@ -1 +1 @@
-Subproject commit 2fddabcaf0df1763111ed9dbf9e2d4cdb5b0434e
+Subproject commit 47cc91474823677218239b5b37901590755cac4c
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
index 1e478b1530..a2491a806b 160000
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@@ -1 +1 @@
-Subproject commit 1e478b1530b3be81bd84f13620d0a23502d377f1
+Subproject commit a2491a806b636f66caf670527c49b864923f125c
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
index a9cf0cde77..72367f37cd 160000
--- a/frozen/Adafruit_CircuitPython_LC709203F
+++ b/frozen/Adafruit_CircuitPython_LC709203F
@@ -1 +1 @@
-Subproject commit a9cf0cde77c185c6bbc79a3b6d77dd024a9683d2
+Subproject commit 72367f37cd221c7af7822ba3a9cd21cd3cd70292
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index acc4bdd73f..a06c8a116e 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit acc4bdd73fdceb74d75cd5a1f261ae157ee32613
+Subproject commit a06c8a116e5767a8481b9018239fe729e01760a6
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
index 3d1aab0daf..5acf8a850d 160000
--- a/frozen/Adafruit_CircuitPython_LSM6DS
+++ b/frozen/Adafruit_CircuitPython_LSM6DS
@@ -1 +1 @@
-Subproject commit 3d1aab0daf63c3b4476f73cba39cf5da49e1e4aa
+Subproject commit 5acf8a850d98789a79fe37836b2ac7b623d95913
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
index 3d871907f0..d3f9adce6e 160000
--- a/frozen/Adafruit_CircuitPython_MIDI
+++ b/frozen/Adafruit_CircuitPython_MIDI
@@ -1 +1 @@
-Subproject commit 3d871907f0187c627277382f184209f5520703a6
+Subproject commit d3f9adce6e48d37222ef171a280cfa3122faf15b
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
index 207953aac0..df61e7b0be 160000
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c
+Subproject commit df61e7b0be9dc0c6a1bbe60f526fbdc01b6c2819
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
index 36d4a31010..015eb1ccd5 160000
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit 36d4a31010461e47f265553ebd764c69d38a254c
+Subproject commit 015eb1ccd5eb5364d8e1cf20358e7dcda9f12efc
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
index bcfaae874f..217af2bc7d 160000
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944
+Subproject commit 217af2bc7de658ff2f6380a066d99a149e69693e
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
index 011acd627f..1c39469bac 160000
--- a/frozen/Adafruit_CircuitPython_ProgressBar
+++ b/frozen/Adafruit_CircuitPython_ProgressBar
@@ -1 +1 @@
-Subproject commit 011acd627fc24342c397fc640b204a798f7b69dd
+Subproject commit 1c39469bac98eea022af695ac42e5096dae6130c
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
index c58defd709..74ea48f7a5 160000
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit c58defd70947531c5a9c37ddcb569f240567a78b
+Subproject commit 74ea48f7a5d85591f5af804cacb57e9cfaab46c6
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
index 2d8310f19d..13cdb9912b 160000
--- a/frozen/Adafruit_CircuitPython_RFM9x
+++ b/frozen/Adafruit_CircuitPython_RFM9x
@@ -1 +1 @@
-Subproject commit 2d8310f19d1bdce817df13e807b409b5b057fc21
+Subproject commit 13cdb9912ba31f6e267f1afb9f71fddf5b1c139c
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
index 49ab415d6b..d1e8ac7ad9 160000
--- a/frozen/Adafruit_CircuitPython_Register
+++ b/frozen/Adafruit_CircuitPython_Register
@@ -1 +1 @@
-Subproject commit 49ab415d6b601c99979262f9e91c21dcb3a927a7
+Subproject commit d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index 2e6b3f9fee..b168b28fc5 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit 2e6b3f9feeacc678402454f7d3416b04a9a93e17
+Subproject commit b168b28fc58973cf20269cc87a655d7812659fd0
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
index da02c76d4c..332143d4ca 160000
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35
+Subproject commit 332143d4ca5762d2d351ceb170c0b4e37dd42793
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
index 850c3dc512..995959d5dc 160000
--- a/frozen/Adafruit_CircuitPython_ST7789
+++ b/frozen/Adafruit_CircuitPython_ST7789
@@ -1 +1 @@
-Subproject commit 850c3dc512f7feae1eaad20bdc1c5e4c63c92f08
+Subproject commit 995959d5dca23fbe49590700d1aa26a96dca1df7
diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO
index 272d225365..d238fe99e2 160000
--- a/frozen/Adafruit_CircuitPython_SimpleIO
+++ b/frozen/Adafruit_CircuitPython_SimpleIO
@@ -1 +1 @@
-Subproject commit 272d225365eed46916390cf1f393dd08bc00b7d4
+Subproject commit d238fe99e24ea4cdb472f1d8a9c99dd189b0aeca
diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath
index fad0f89e76..632655b8f5 160000
--- a/frozen/Adafruit_CircuitPython_SimpleMath
+++ b/frozen/Adafruit_CircuitPython_SimpleMath
@@ -1 +1 @@
-Subproject commit fad0f89e760829a76f553ef8459f61001597a846
+Subproject commit 632655b8f5f6f62e3b4d0b6161213634e0ae74e9
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
index e86f258e43..3816a4f4c9 160000
--- a/frozen/Adafruit_CircuitPython_Thermistor
+++ b/frozen/Adafruit_CircuitPython_Thermistor
@@ -1 +1 @@
-Subproject commit e86f258e43591ce4a04661277e77e9fdf6fec27e
+Subproject commit 3816a4f4c997b03d4a7ebfe35a617d1e50124b04
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
index 3aaf72165b..148345d232 160000
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@@ -1 +1 @@
-Subproject commit 3aaf72165bc6ba10bf5219716c8654651649f87b
+Subproject commit 148345d232c83133de3649fb70b471f11501b3d2
diff --git a/frozen/mixgo_cp_lib b/frozen/mixgo_cp_lib
index 8b6cd888b2..4ba6956d49 160000
--- a/frozen/mixgo_cp_lib
+++ b/frozen/mixgo_cp_lib
@@ -1 +1 @@
-Subproject commit 8b6cd888b264abaf8f9b1904b09b01313b273bb2
+Subproject commit 4ba6956d49752f2d0cdc73903b86a34c225934ef

From 9d77a36fbfd5888c90ccf6a991c8e7b8d3e04ff2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 8 Jul 2022 22:47:36 -0400
Subject: [PATCH 0591/2403] update samd-peripherals submodule

---
 ports/atmel-samd/peripherals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals
index d3b20192cf..57133eefeb 160000
--- a/ports/atmel-samd/peripherals
+++ b/ports/atmel-samd/peripherals
@@ -1 +1 @@
-Subproject commit d3b20192cf94fdea68a412596e082108ba5ebbf0
+Subproject commit 57133eefeb077f73b5ac17ee044d9feaf566da8e

From f464ec3047401de12748d811745a4a4f252a0f1f Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Sat, 9 Jul 2022 22:17:02 -0700
Subject: [PATCH 0592/2403] Update ports/espressif/common-hal/wifi/Radio.c

Co-authored-by: Dan Halbert 
---
 ports/espressif/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 9715894f78..ac997cc0b7 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -139,7 +139,7 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t
     esp_wifi_set_mac(ESP_IF_WIFI_STA, mac);
 }
 
-float common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
+mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
     int8_t tx_power;
     esp_wifi_get_max_tx_power(&tx_power);
     return tx_power / 4.0;

From 98692150ac890582b989bba2499f3ce330d35b53 Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Sat, 9 Jul 2022 22:17:12 -0700
Subject: [PATCH 0593/2403] Update ports/espressif/common-hal/wifi/Radio.c

Co-authored-by: Dan Halbert 
---
 ports/espressif/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index ac997cc0b7..9503d5ab36 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -142,7 +142,7 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t
 mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
     int8_t tx_power;
     esp_wifi_get_max_tx_power(&tx_power);
-    return tx_power / 4.0;
+    return tx_power / 4.0f;
 }
 
 void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const float tx_power) {

From 22e061ba357282c6cd5f57926a3fc9edf4e8bd36 Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Sat, 9 Jul 2022 22:17:18 -0700
Subject: [PATCH 0594/2403] Update ports/espressif/common-hal/wifi/Radio.c

Co-authored-by: Dan Halbert 
---
 ports/espressif/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 9503d5ab36..c464ea21d8 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -145,7 +145,7 @@ mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
     return tx_power / 4.0f;
 }
 
-void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const float tx_power) {
+void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t tx_power) {
     esp_wifi_set_max_tx_power(tx_power * 4.0);
 }
 

From a6580076733d02017c90a23deccbe9ba34daa880 Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Sat, 9 Jul 2022 22:17:26 -0700
Subject: [PATCH 0595/2403] Update ports/espressif/common-hal/wifi/Radio.c

Co-authored-by: Dan Halbert 
---
 ports/espressif/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index c464ea21d8..545af1d6cb 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -146,7 +146,7 @@ mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t tx_power) {
-    esp_wifi_set_max_tx_power(tx_power * 4.0);
+    esp_wifi_set_max_tx_power(tx_power * 4.0f);
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {

From 5bf07d966210e809909066f12d8ef818920d57d3 Mon Sep 17 00:00:00 2001
From: Tod Kurt 
Date: Sat, 9 Jul 2022 22:17:35 -0700
Subject: [PATCH 0596/2403] Update shared-bindings/wifi/Radio.h

Co-authored-by: Dan Halbert 
---
 shared-bindings/wifi/Radio.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 1e389b6c56..312e9e5395 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -82,8 +82,8 @@ extern void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const
 extern mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint8_t *mac);
 
-extern float common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self);
-extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const float power);
+extern mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self);
+extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t power);
 
 extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self);

From f22f4f896a461b2b6190ba48bffe79e374f17cea Mon Sep 17 00:00:00 2001
From: Nathan Young <77929198+NathanY3G@users.noreply.github.com>
Date: Sun, 10 Jul 2022 21:34:07 +0200
Subject: [PATCH 0597/2403] stm: Make family IDs consistent with TinyUF2

This should allow UF2 images for STM32F405 boards to be flashed by
TinyUF2.
---
 ports/stm/mpconfigport.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 4f18637f13..dd83e0d7bc 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -8,6 +8,9 @@ ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         CIRCUITPY_SDIOIO ?= 1
         # Number of USB endpoint pairs.
         USB_NUM_ENDPOINT_PAIRS = 4
+endif
+
+ifeq ($(MCU_VARIANT),STM32F407xx)
         UF2_FAMILY_ID ?= 0x6d0922fa
 endif
 

From be3482ff05f9f50507dbba7a79732cff0070a7df Mon Sep 17 00:00:00 2001
From: Xu Hao 
Date: Mon, 11 Jul 2022 16:51:06 +0800
Subject: [PATCH 0598/2403] Set MICROPY_HW_LED_STATUS pin to the
 elecfreaks_picoed

---
 ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h
index 0a73b3d73b..03d892091e 100644
--- a/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h
+++ b/ports/raspberrypi/boards/elecfreaks_picoed/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "ELECFREAKS PICO:ED"
 #define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO25)

From 6b474b9e6e3bde394d4fdea10535f7bd207313d3 Mon Sep 17 00:00:00 2001
From: Xu Hao 
Date: Mon, 11 Jul 2022 21:33:58 +0800
Subject: [PATCH 0599/2403] Update circuitpython_picoed submodule

---
 frozen/circuitpython_picoed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython_picoed b/frozen/circuitpython_picoed
index d890d23f42..53f1560246 160000
--- a/frozen/circuitpython_picoed
+++ b/frozen/circuitpython_picoed
@@ -1 +1 @@
-Subproject commit d890d23f4261722338280f284cc1640e22e50e14
+Subproject commit 53f15602460329f69fef95498e6b8293aebb513a

From 08b4a64bd20ae2413cc55e04a283fc93d68c4b74 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Mon, 11 Jul 2022 08:39:10 -0700
Subject: [PATCH 0600/2403] Update the PID

---
 .../boards/espressif_esp32s3_box_lite/mpconfigboard.mk          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
index 647ad3440a..de3d4cd0ed 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x303A
-USB_PID = 0x7005
+USB_PID = 0x700D
 USB_PRODUCT = "ESP32-S3-Box-Lite"
 USB_MANUFACTURER = "Espressif"
 

From e92ac0caf4c7e92ba8e51c1dfd510eed9d7827cd Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 11 Jul 2022 11:04:06 -0500
Subject: [PATCH 0601/2403] adding links in docs

---
 shared-bindings/keypad/__init__.c       | 3 +++
 shared-bindings/msgpack/__init__.c      | 3 +++
 shared-bindings/sharpdisplay/__init__.c | 7 +++++--
 shared-bindings/touchio/__init__.c      | 5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
index 97db750af7..3822b8ea53 100644
--- a/shared-bindings/keypad/__init__.c
+++ b/shared-bindings/keypad/__init__.c
@@ -86,6 +86,9 @@ const mp_obj_property_t keypad_generic_events_obj = {
 //| connected independently to individual pins,
 //| connected to a shift register,
 //| or connected in a row-and-column matrix.
+//|
+//| For more information about working with the `keypad` module in CircuitPython,
+//| see `this Learn guide `_.
 //| """
 //|
 
diff --git a/shared-bindings/msgpack/__init__.c b/shared-bindings/msgpack/__init__.c
index 65374fb443..e13fb28819 100644
--- a/shared-bindings/msgpack/__init__.c
+++ b/shared-bindings/msgpack/__init__.c
@@ -41,6 +41,9 @@
 //|
 //| Not implemented: 64-bit int, uint, float.
 //|
+//| For more information about working with msgpack,
+//| see `the CPython Library Documentation `_.
+//|
 //| Example 1::
 //|
 //|    import msgpack
diff --git a/shared-bindings/sharpdisplay/__init__.c b/shared-bindings/sharpdisplay/__init__.c
index 8c01c8c98c..a7e0bff77d 100644
--- a/shared-bindings/sharpdisplay/__init__.c
+++ b/shared-bindings/sharpdisplay/__init__.c
@@ -31,9 +31,12 @@
 
 #include "shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h"
 
-//| """Support for Sharp Memory Display framebuffers"""
+//| """Support for Sharp Memory Display framebuffers
+//|
+//| For more information about working with Sharp Memory Displays,
+//| see `this Learn guide `_.
+//| """
 //|
-
 STATIC const mp_rom_map_elem_t sharpdisplay_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sharpdisplay) },
     { MP_ROM_QSTR(MP_QSTR_SharpMemoryFramebuffer), MP_ROM_PTR(&sharpdisplay_framebuffer_type) },
diff --git a/shared-bindings/touchio/__init__.c b/shared-bindings/touchio/__init__.c
index e2a6ad9317..2d6bf5f31c 100644
--- a/shared-bindings/touchio/__init__.c
+++ b/shared-bindings/touchio/__init__.c
@@ -45,7 +45,10 @@
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info.
 //|
-//| For example::
+//| For more information about working with the `touchio` module in CircuitPython,
+//| see `this Learn guide page `_.
+//|
+//| Example::
 //|
 //|   import touchio
 //|   from board import *

From 69b84e0c8e752969a5f1f49b836c3e90ed76ff8f Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Mon, 11 Jul 2022 22:05:49 +0200
Subject: [PATCH 0602/2403] 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             | 55 +++++++++++++++++++++++++++------
 locale/cs.po             | 55 +++++++++++++++++++++++++++------
 locale/de_DE.po          | 66 +++++++++++++++++++++++++++++++---------
 locale/el.po             | 55 +++++++++++++++++++++++++++------
 locale/en_GB.po          | 63 +++++++++++++++++++++++++++++++-------
 locale/es.po             | 66 +++++++++++++++++++++++++++++++---------
 locale/fil.po            | 55 +++++++++++++++++++++++++++------
 locale/fr.po             | 66 +++++++++++++++++++++++++++++++---------
 locale/hi.po             | 55 +++++++++++++++++++++++++++------
 locale/it_IT.po          | 55 +++++++++++++++++++++++++++------
 locale/ja.po             | 58 +++++++++++++++++++++++++++--------
 locale/ko.po             | 55 +++++++++++++++++++++++++++------
 locale/nl.po             | 66 +++++++++++++++++++++++++++++++---------
 locale/pl.po             | 58 +++++++++++++++++++++++++++--------
 locale/pt_BR.po          | 66 +++++++++++++++++++++++++++++++---------
 locale/ru.po             | 55 +++++++++++++++++++++++++++------
 locale/sv.po             | 66 +++++++++++++++++++++++++++++++---------
 locale/tr.po             | 55 +++++++++++++++++++++++++++------
 locale/zh_Latn_pinyin.po | 66 +++++++++++++++++++++++++++++++---------
 19 files changed, 911 insertions(+), 225 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 16ba43395a..06ec3d9769 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2383,6 +2383,10 @@ msgstr "argumen harus berupa ndarrays"
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2750,6 +2754,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2841,6 +2849,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "heap kosong"
@@ -2944,7 +2956,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3092,7 +3104,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr "lapisan (padding) tidak benar"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3159,6 +3171,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3167,11 +3183,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3372,7 +3384,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3621,7 +3633,7 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3772,6 +3784,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4207,6 +4220,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4248,7 +4269,17 @@ msgstr "indeks sumbu salah"
 msgid "wrong axis specified"
 msgstr "sumbu yang ditentukan salah"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "tipe input salah"
 
@@ -4256,6 +4287,10 @@ msgstr "tipe input salah"
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "jumlah argumen salah"
diff --git a/locale/cs.po b/locale/cs.po
index ee6688f185..cd5167bd28 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2370,6 +2370,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2737,6 +2741,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2828,6 +2836,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2931,7 +2943,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3079,7 +3091,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3146,6 +3158,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3154,11 +3170,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3359,7 +3371,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3608,7 +3620,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3758,6 +3770,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4193,6 +4206,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4234,7 +4255,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4242,6 +4273,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 2f31a32f02..faa220b622 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2422,6 +2422,10 @@ msgstr "Argumente müssen ndarrays sein"
 msgid "array and index length must be equal"
 msgstr "Array- und Indexlänge müssen gleich sein"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2799,6 +2803,10 @@ msgstr "Convolve-Argumente müssen ndarrays sein"
 msgid "convolve arguments must not be empty"
 msgstr "Convolve Argumente dürfen nicht leer sein"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "Vandermonde-Matrix konnte nicht invertiert werden"
@@ -2892,6 +2900,10 @@ msgstr "dtype muss Float oder komplex sein"
 msgid "empty"
 msgstr "leer"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "leerer heap"
@@ -2995,7 +3007,7 @@ msgstr "das erste Argument muss eine Funktion sein"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "das erste Argument muss ein Tupel von ndarrays sein"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "Das erste Argument muss ein Ndarray sein"
 
@@ -3145,7 +3157,7 @@ msgstr "unvollständiger Formatschlüssel"
 msgid "incorrect padding"
 msgstr "padding ist inkorrekt"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "Index ist außerhalb der Grenzen"
 
@@ -3212,6 +3224,10 @@ msgstr "Eingabematrix ist asymmetrisch"
 msgid "input matrix is singular"
 msgstr "Eingabematrix ist singulär"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr "Eingabe muss ein 1D ndarray sein"
@@ -3220,11 +3236,7 @@ msgstr "Eingabe muss ein 1D ndarray sein"
 msgid "input must be a dense ndarray"
 msgstr "Eingabe muss ein dichtes ndarray sein"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "Eingabe muss ein Tensor von Rang 2 sein"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "Eingabe muss ein ndarray sein"
 
@@ -3431,8 +3443,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length muss 0-%d sein, wenn fixed_length %s ist"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "die maximale Anzahl der Dimensionen beträgt 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3681,7 +3693,7 @@ msgstr "String mit ungerader Länge"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "Offset ist zu groß"
 
@@ -3835,6 +3847,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() mit 3 Argumenten erfordert Integer"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "Drücken der Boot-Taste beim Start.\n"
@@ -4275,6 +4288,14 @@ msgstr "nicht unterstützter Typ für Operator"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "nicht unterstützte Typen für %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4316,7 +4337,17 @@ msgstr "falscher Achsenindex"
 msgid "wrong axis specified"
 msgstr "falsche Achse gewählt"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "falscher Indextyp"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "falscher Eingabetyp"
 
@@ -4324,6 +4355,10 @@ msgstr "falscher Eingabetyp"
 msgid "wrong length of condition array"
 msgstr "falsche Länge des Array von Bedingungen"
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "falsche Anzahl an Argumenten"
@@ -4368,6 +4403,12 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "input must be a tensor of rank 2"
+#~ msgstr "Eingabe muss ein Tensor von Rang 2 sein"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "die maximale Anzahl der Dimensionen beträgt 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Watchdog timer abgelaufen."
 
@@ -5131,9 +5172,6 @@ msgstr "zi muss die Form (n_section, 2) haben"
 #~ msgid "wrong argument type"
 #~ msgstr "falscher Argumenttyp"
 
-#~ msgid "wrong index type"
-#~ msgstr "falscher Indextyp"
-
 #~ msgid ""
 #~ "\n"
 #~ "To exit, please reset the board without "
diff --git a/locale/el.po b/locale/el.po
index 454be46f59..540dde009c 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2352,6 +2352,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2719,6 +2723,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2810,6 +2818,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2913,7 +2925,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3061,7 +3073,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3128,6 +3140,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3136,11 +3152,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3341,7 +3353,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3590,7 +3602,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3740,6 +3752,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4175,6 +4188,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4216,7 +4237,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4224,6 +4255,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 951b573b3b..9243e0c73b 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2386,6 +2386,10 @@ msgstr "arguments must be ndarrays"
 msgid "array and index length must be equal"
 msgstr "array and index length must be equal"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2755,6 +2759,10 @@ msgstr "convolve arguments must be ndarrays"
 msgid "convolve arguments must not be empty"
 msgstr "convolve arguments must not be empty"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "could not invert Vandermonde matrix"
@@ -2847,6 +2855,10 @@ msgstr ""
 msgid "empty"
 msgstr "empty"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "empty heap"
@@ -2950,7 +2962,7 @@ msgstr "first argument must be a function"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "first argument must be a tuple of ndarrays"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "first argument must be an ndarray"
 
@@ -3098,7 +3110,7 @@ msgstr "incomplete format key"
 msgid "incorrect padding"
 msgstr "incorrect padding"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "index is out of bounds"
 
@@ -3165,6 +3177,10 @@ msgstr "input matrix is asymmetric"
 msgid "input matrix is singular"
 msgstr "input matrix is singular"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3173,11 +3189,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr "input must be a dense ndarray"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "input must be a tensor of rank 2"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "input must be an ndarray"
 
@@ -3378,8 +3390,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length must be 0-%d when fixed_length is %s"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3627,7 +3639,7 @@ msgstr "odd-length string"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "offset is too large"
 
@@ -3777,6 +3789,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() with 3 arguments requires integers"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "pressing boot button at start up.\n"
@@ -4214,6 +4227,14 @@ msgstr "unsupported type for operator"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "unsupported types for %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4255,7 +4276,17 @@ msgstr "wrong axis index"
 msgid "wrong axis specified"
 msgstr "wrong axis specified"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "wrong input type"
 
@@ -4263,6 +4294,10 @@ msgstr "wrong input type"
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "wrong number of arguments"
@@ -4307,6 +4342,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "input must be a tensor of rank 2"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "maximum number of dimensions is 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "WatchDog timer expired."
 
diff --git a/locale/es.po b/locale/es.po
index 608f59ca29..05e913ae03 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2419,6 +2419,10 @@ msgstr "argumentos deben ser ndarrays"
 msgid "array and index length must be equal"
 msgstr "Longitud del array e índice tienen que ser iguales"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2791,6 +2795,10 @@ msgstr "los argumentos para convolve deben ser ndarrays"
 msgid "convolve arguments must not be empty"
 msgstr "los argumentos para convolve no deben estar vacíos"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "no se pudo invertir la matriz de Vandermonde"
@@ -2884,6 +2892,10 @@ msgstr ""
 msgid "empty"
 msgstr "vacío"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "heap vacío"
@@ -2987,7 +2999,7 @@ msgstr "el primer argumento debe ser una función"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "Primer argumento tiene que ser una tupla de ndarrays"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "el primer argumento debe ser ndarray"
 
@@ -3135,7 +3147,7 @@ msgstr "formato de llave incompleto"
 msgid "incorrect padding"
 msgstr "relleno (padding) incorrecto"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "el índice está fuera de límites"
 
@@ -3202,6 +3214,10 @@ msgstr "la matriz de entrada es asimétrica"
 msgid "input matrix is singular"
 msgstr "la matriz de entrada es singular"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3210,11 +3226,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr "Entrada tiene que ser un ndarray denso"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "Entrada tiene que ser un tensor de rango 2"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "Entrada tiene que ser un ndarray"
 
@@ -3418,8 +3430,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length debe ser 0-%d cuando fixed_length es %s"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "Máximo número de dimensiones es 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3671,7 +3683,7 @@ msgstr "string de longitud impar"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "offset es demasiado grande"
 
@@ -3821,6 +3833,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argumentos requiere enteros"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "presionando botón de arranque al inicio.\n"
@@ -4259,6 +4272,14 @@ msgstr "tipo de operador no soportado"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "tipos no soportados para %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4300,7 +4321,17 @@ msgstr "indice de eje erróneo"
 msgid "wrong axis specified"
 msgstr "eje especificado erróneo"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "tipo de índice incorrecto"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "tipo de entrada incorrecta"
 
@@ -4308,6 +4339,10 @@ msgstr "tipo de entrada incorrecta"
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "numero erroneo de argumentos"
@@ -4352,6 +4387,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "Entrada tiene que ser un tensor de rango 2"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "Máximo número de dimensiones es 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Temporizador de perro guardián expirado."
 
@@ -5210,9 +5251,6 @@ msgstr "zi debe ser una forma (n_section,2)"
 #~ msgid "wrong argument type"
 #~ msgstr "tipo de argumento incorrecto"
 
-#~ msgid "wrong index type"
-#~ msgstr "tipo de índice incorrecto"
-
 #~ msgid "specify size or data, but not both"
 #~ msgstr "especifique o tamaño o datos, pero no ambos"
 
diff --git a/locale/fil.po b/locale/fil.po
index 821bf45dbf..d2509b761f 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2372,6 +2372,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2746,6 +2750,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2841,6 +2849,10 @@ msgstr ""
 msgid "empty"
 msgstr "walang laman"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "walang laman ang heap"
@@ -2945,7 +2957,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3094,7 +3106,7 @@ msgstr "hindi kumpleto ang format key"
 msgid "incorrect padding"
 msgstr "mali ang padding"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3161,6 +3173,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3169,11 +3185,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3378,7 +3390,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3627,7 +3639,7 @@ msgstr "odd-length string"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3779,6 +3791,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() na may 3 argumento kailangan ng integers"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4217,6 +4230,14 @@ msgstr "hindi sinusuportahang type para sa operator"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4258,7 +4279,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4266,6 +4297,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "mali ang bilang ng argumento"
diff --git a/locale/fr.po b/locale/fr.po
index 7e282a026c..9c892a7f11 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2453,6 +2453,10 @@ msgstr "les paramètres doivent être des ndarrays"
 msgid "array and index length must be equal"
 msgstr "la taille de la matrice et de l'index doivent être égaux"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2830,6 +2834,10 @@ msgstr "les paramêtres pour convolve doivent être des ndarrays"
 msgid "convolve arguments must not be empty"
 msgstr "les arguments convolve ne doivent pas être vides"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "n'a pas pu inverser la matrice Vandermonde"
@@ -2924,6 +2932,10 @@ msgstr "le dtype doit être un flottant, ou un complexe"
 msgid "empty"
 msgstr "vide"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "tas vide"
@@ -3027,7 +3039,7 @@ msgstr "le premier argument doit être une fonction"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "le premier paramêtre doit être un tuple de ndarrays"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "le premier paramêtre doit être un ndarray"
 
@@ -3175,7 +3187,7 @@ msgstr "clé de format incomplète"
 msgid "incorrect padding"
 msgstr "espacement incorrect"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "l'index est hors limites"
 
@@ -3243,6 +3255,10 @@ msgstr "la matrice d'entrée est asymétrique"
 msgid "input matrix is singular"
 msgstr "la matrice d'entrée est singulière"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr "l'entrée doit être un ndarray 1D"
@@ -3251,11 +3267,7 @@ msgstr "l'entrée doit être un ndarray 1D"
 msgid "input must be a dense ndarray"
 msgstr "l'entrée doit être un ndarray dense"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "l'entrée doit être un tenseur de rang 2"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "l'entrée doit être un ndarray"
 
@@ -3462,8 +3474,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length doit être 0-%d lorsque fixed_length est %s"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "nombre maximal de dimensions est 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3713,7 +3725,7 @@ msgstr "chaîne de longueur impaire"
 msgid "off"
 msgstr "inactif"
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "offset est trop large"
 
@@ -3866,6 +3878,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() avec 3 arguments nécessite des entiers"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "bouton boot appuyé lors du démarrage.\n"
@@ -4304,6 +4317,14 @@ msgstr "type non supporté pour l'opérateur"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "types non supportés pour %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4345,7 +4366,17 @@ msgstr "index d'axe incorrecte"
 msgid "wrong axis specified"
 msgstr "axe incorrecte spécifiée"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "type d'index incorrect"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "type d'entrée incorrect"
 
@@ -4353,6 +4384,10 @@ msgstr "type d'entrée incorrect"
 msgid "wrong length of condition array"
 msgstr "mauvaise taille du tableau de condition"
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "mauvais nombres d'arguments"
@@ -4397,6 +4432,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "l'entrée doit être un tenseur de rang 2"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "nombre maximal de dimensions est 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Le minuteur Watchdog a expiré."
 
@@ -5270,9 +5311,6 @@ msgstr "zi doit être de forme (n_section, 2)"
 #~ msgid "wrong argument type"
 #~ msgstr "type d'argument incorrect"
 
-#~ msgid "wrong index type"
-#~ msgstr "type d'index incorrect"
-
 #~ msgid "Must provide SCK pin"
 #~ msgstr "Vous devez fournir un code PIN SCK"
 
diff --git a/locale/hi.po b/locale/hi.po
index db817163af..1cd3603ccb 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2352,6 +2352,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2719,6 +2723,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2810,6 +2818,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2913,7 +2925,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3061,7 +3073,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3128,6 +3140,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3136,11 +3152,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3341,7 +3353,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3590,7 +3602,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3740,6 +3752,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4175,6 +4188,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4216,7 +4237,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4224,6 +4255,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b58f3c963f..8c8ac6e551 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2382,6 +2382,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2755,6 +2759,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2849,6 +2857,10 @@ msgstr ""
 msgid "empty"
 msgstr "vuoto"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "heap vuoto"
@@ -2953,7 +2965,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3102,7 +3114,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr "padding incorretto"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3169,6 +3181,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3177,11 +3193,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3387,7 +3399,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3638,7 +3650,7 @@ msgstr "stringa di lunghezza dispari"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3792,6 +3804,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argomenti richiede interi"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4230,6 +4243,14 @@ msgstr "tipo non supportato per l'operando"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4271,7 +4292,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4279,6 +4310,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "numero di argomenti errato"
diff --git a/locale/ja.po b/locale/ja.po
index 466fbdd362..e45ac2ff0f 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2366,6 +2366,10 @@ msgstr "引数はndarrayでなければなりません"
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2735,6 +2739,10 @@ msgstr "convolve引数はndarrayでなければなりません"
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "ヴァンデルモンド行列の逆行列を求められません"
@@ -2828,6 +2836,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2931,7 +2943,7 @@ msgstr "1つ目の引数は関数でなければなりません"
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "1つ目の引数はndarrayでなければなりません"
 
@@ -3079,7 +3091,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3147,6 +3159,10 @@ msgstr "入力行列が非対称"
 msgid "input matrix is singular"
 msgstr "入力が非正則行列"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3155,11 +3171,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3360,7 +3372,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3609,7 +3621,7 @@ msgstr "奇数長の文字列"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3761,6 +3773,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow()の第3引数には整数が必要"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4197,6 +4210,14 @@ msgstr "演算子が対応していない型"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "%q が対応していない型: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4238,7 +4259,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "インデクスの型が不正"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4246,6 +4277,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
@@ -4832,9 +4867,6 @@ msgstr ""
 #~ msgid "wrong argument type"
 #~ msgstr "引数の型が不正"
 
-#~ msgid "wrong index type"
-#~ msgstr "インデクスの型が不正"
-
 #~ msgid "Must provide SCK pin"
 #~ msgstr "SCKピンが必要"
 
diff --git a/locale/ko.po b/locale/ko.po
index f01d690729..ec1f2371fc 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2356,6 +2356,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2723,6 +2727,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2814,6 +2822,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2917,7 +2929,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3065,7 +3077,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3132,6 +3144,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3140,11 +3156,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3345,7 +3357,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3594,7 +3606,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3744,6 +3756,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4179,6 +4192,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4220,7 +4241,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4228,6 +4259,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 7db50b2eea..4a1f3ab520 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2382,6 +2382,10 @@ msgstr "argumenten moeten ndarrays zijn"
 msgid "array and index length must be equal"
 msgstr "array en indexlengte moeten gelijk zijn"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2750,6 +2754,10 @@ msgstr "convolutie argumenten moeten ndarrays zijn"
 msgid "convolve arguments must not be empty"
 msgstr "convolutie argumenten mogen niet leeg zijn"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "kon de Vandermonde matrix niet omkeren"
@@ -2843,6 +2851,10 @@ msgstr ""
 msgid "empty"
 msgstr "leeg"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "lege heap"
@@ -2946,7 +2958,7 @@ msgstr "eerste argument moet een functie zijn"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "eerste argument moet een tupel van ndarrays zijn"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "eerst argument moet een ndarray zijn"
 
@@ -3095,7 +3107,7 @@ msgstr "incomplete formaatsleutel"
 msgid "incorrect padding"
 msgstr "vulling (padding) is onjuist"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "index is buiten bereik"
 
@@ -3162,6 +3174,10 @@ msgstr "invoermatrix is asymmetrisch"
 msgid "input matrix is singular"
 msgstr "invoermatrix is singulier"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3170,11 +3186,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr "invoer moet een gesloten ndarray zijn"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "invoer moet een tensor van rang 2 zijn"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "invoer moet een ndarray zijn"
 
@@ -3378,8 +3390,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length moet 0-%d zijn als fixed_length %s is"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "maximaal aantal dimensies is 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3627,7 +3639,7 @@ msgstr "string met oneven lengte"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "compensatie is te groot"
 
@@ -3777,6 +3789,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() met 3 argumenten vereist integers"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "druk bootknop in bij opstarten.\n"
@@ -4214,6 +4227,14 @@ msgstr "niet ondersteund type voor operator"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "niet ondersteunde types voor %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4255,7 +4276,17 @@ msgstr "foute index voor as"
 msgid "wrong axis specified"
 msgstr "onjuiste as gespecificeerd"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "onjuist indextype"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "onjuist invoertype"
 
@@ -4263,6 +4294,10 @@ msgstr "onjuist invoertype"
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "onjuist aantal argumenten"
@@ -4307,6 +4342,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "invoer moet een tensor van rang 2 zijn"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "maximaal aantal dimensies is 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Watchdog-timer verstreken."
 
@@ -5037,9 +5078,6 @@ msgstr "zi moet vorm (n_section, 2) hebben"
 #~ msgid "wrong argument type"
 #~ msgstr "onjuist argumenttype"
 
-#~ msgid "wrong index type"
-#~ msgstr "onjuist indextype"
-
 #~ msgid "Must provide SCK pin"
 #~ msgstr "SCK pin moet opgegeven worden"
 
diff --git a/locale/pl.po b/locale/pl.po
index 0e6137203e..fbf2283bfa 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2363,6 +2363,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2730,6 +2734,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2822,6 +2830,10 @@ msgstr ""
 msgid "empty"
 msgstr "puste"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "pusta sterta"
@@ -2925,7 +2937,7 @@ msgstr "pierwszy argument musi być funkcją"
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3073,7 +3085,7 @@ msgstr "niepełny klucz formatu"
 msgid "incorrect padding"
 msgstr "złe wypełnienie"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "indeks jest poza zakresem"
 
@@ -3140,6 +3152,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3148,11 +3164,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3353,7 +3365,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3602,7 +3614,7 @@ msgstr "łańcuch o nieparzystej długości"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3753,6 +3765,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "trzyargumentowe pow() wymaga liczb całkowitych"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4189,6 +4202,14 @@ msgstr "zły typ dla operatora"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4230,7 +4251,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "zły typ indeksu"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "nieprawidłowy typ wejścia"
 
@@ -4238,6 +4269,10 @@ msgstr "nieprawidłowy typ wejścia"
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "zła liczba argumentów"
@@ -4747,9 +4782,6 @@ msgstr ""
 #~ msgid "wrong argument type"
 #~ msgstr "zły typ argumentu"
 
-#~ msgid "wrong index type"
-#~ msgstr "zły typ indeksu"
-
 #~ msgid "Must provide SCK pin"
 #~ msgstr "Należy podać pin SCK"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b89963bf8f..b447e8e7c7 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2435,6 +2435,10 @@ msgstr "os argumentos devem ser ndarrays"
 msgid "array and index length must be equal"
 msgstr "a matriz e comprimento do índice devem ser iguais"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2808,6 +2812,10 @@ msgstr "os argumentos convolutivos devem ser ndarrays"
 msgid "convolve arguments must not be empty"
 msgstr "os argumentos convolutivos não devem estar vazios"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "não foi possível inverter a matriz Vandermonde"
@@ -2902,6 +2910,10 @@ msgstr "dtype deve ser flutuante ou complexo"
 msgid "empty"
 msgstr "vazio"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "a área de alocação dinâmica de variáveis (heap) está vazia"
@@ -3005,7 +3017,7 @@ msgstr "o primeiro argumento deve ser uma função"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "o primeiro argumento deve ser um tuple de ndarrays"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "o primeiro argumento deve ser um ndarray"
 
@@ -3153,7 +3165,7 @@ msgstr "a chave do formato está incompleto"
 msgid "incorrect padding"
 msgstr "preenchimento incorreto"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "o índice está fora dos limites"
 
@@ -3221,6 +3233,10 @@ msgstr "a matriz da entrada é assimétrica"
 msgid "input matrix is singular"
 msgstr "a matriz da entrada é singular"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr "a entrada deve ser um 1D ndarray"
@@ -3229,11 +3245,7 @@ msgstr "a entrada deve ser um 1D ndarray"
 msgid "input must be a dense ndarray"
 msgstr "a entrada deve ser um ndarray denso"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "a entrada dos dados deve ser um tensor de nível 2"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "a entrada deve ser um ndarray"
 
@@ -3437,8 +3449,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "o max_length deve ser 0-%d quando Fixed_length for %s"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "O número máximo de dimensões são 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3688,7 +3700,7 @@ msgstr "sequência com comprimento ímpar"
 msgid "off"
 msgstr "desligado"
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "o offset é muito grande"
 
@@ -3843,6 +3855,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "o pow() com 3 argumentos requer números inteiros"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "pressionando o botão de boot na inicialização.\n"
@@ -4280,6 +4293,14 @@ msgstr "tipo não compatível para o operador"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "tipo sem suporte para %q: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4321,7 +4342,17 @@ msgstr "índice do eixo errado"
 msgid "wrong axis specified"
 msgstr "um eixo errado foi definido"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "tipo do índice errado"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "tipo da entrada incorreta"
 
@@ -4329,6 +4360,10 @@ msgstr "tipo da entrada incorreta"
 msgid "wrong length of condition array"
 msgstr "comprimento errado na condição da matriz"
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "quantidade errada dos argumentos"
@@ -4373,6 +4408,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "a entrada dos dados deve ser um tensor de nível 2"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "O número máximo de dimensões são 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "O temporizador Watchdog expirou."
 
@@ -5295,9 +5336,6 @@ msgstr "zi deve estar na forma (n_section, 2)"
 #~ msgid "wrong argument type"
 #~ msgstr "tipo do argumento errado"
 
-#~ msgid "wrong index type"
-#~ msgstr "tipo do índice errado"
-
 #~ msgid "specify size or data, but not both"
 #~ msgstr "defina o tamanho ou os dados, porém não ambos"
 
diff --git a/locale/ru.po b/locale/ru.po
index bac9e97b7b..9625bd470c 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2401,6 +2401,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2768,6 +2772,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2859,6 +2867,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2962,7 +2974,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3110,7 +3122,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3177,6 +3189,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3185,11 +3201,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3390,7 +3402,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3639,7 +3651,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3789,6 +3801,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4224,6 +4237,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4265,7 +4286,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4273,6 +4304,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 683d5b380f..23f6013a74 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2405,6 +2405,10 @@ msgstr "argumenten måste vara ndarray"
 msgid "array and index length must be equal"
 msgstr "array och indexlängd måste vara lika"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2774,6 +2778,10 @@ msgstr "Argumenten convolve måste vara ndarray:er"
 msgid "convolve arguments must not be empty"
 msgstr "Argumenten convolve kan inte vara tomma"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "kan inte invertera Vandermonde-matris"
@@ -2868,6 +2876,10 @@ msgstr "dtype måste vara float eller complex"
 msgid "empty"
 msgstr "tom"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "tom heap"
@@ -2971,7 +2983,7 @@ msgstr "första argumentet måste vara en funktion"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "första argumentet måste vara en tupel av ndarray"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "första argumentet måste vara en ndarray"
 
@@ -3119,7 +3131,7 @@ msgstr "ofullständig formatnyckel"
 msgid "incorrect padding"
 msgstr "felaktig utfyllnad"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "index är utanför gränserna"
 
@@ -3186,6 +3198,10 @@ msgstr "indatamatrisen är asymmetrisk"
 msgid "input matrix is singular"
 msgstr "indatamatrisen är singulär"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr "indata måste vara en 1D ndarray"
@@ -3194,11 +3210,7 @@ msgstr "indata måste vara en 1D ndarray"
 msgid "input must be a dense ndarray"
 msgstr "indata måste vara en dense ndarray"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "indata måste vara en tensor av rank 2"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "indata måste vara en ndarray"
 
@@ -3402,8 +3414,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "max_length måste vara 0-%d när fixed_length är %s"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "maximalt antal dimensioner är 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3651,7 +3663,7 @@ msgstr "sträng har udda längd"
 msgid "off"
 msgstr "av"
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "offset är för stor"
 
@@ -3802,6 +3814,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() med 3 argument kräver heltal"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "trycka på startknappen vid start.\n"
@@ -4239,6 +4252,14 @@ msgstr "typ stöds inte för operatören"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "typen %q stöder inte '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4280,7 +4301,17 @@ msgstr "fel axelindex"
 msgid "wrong axis specified"
 msgstr "fel axel angiven"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "fel indextyp"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "fel indatatyp"
 
@@ -4288,6 +4319,10 @@ msgstr "fel indatatyp"
 msgid "wrong length of condition array"
 msgstr "fel längd på villkorsmatrisen"
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "fel antal argument"
@@ -4332,6 +4367,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "indata måste vara en tensor av rank 2"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "maximalt antal dimensioner är 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Watchdog-timern har löpt ut."
 
@@ -5236,9 +5277,6 @@ msgstr "zi måste vara i formen (n_section, 2)"
 #~ msgid "wrong argument type"
 #~ msgstr "fel typ av argument"
 
-#~ msgid "wrong index type"
-#~ msgstr "fel indextyp"
-
 #~ msgid "specify size or data, but not both"
 #~ msgstr "ange storlek eller data, men inte båda"
 
diff --git a/locale/tr.po b/locale/tr.po
index b303e6419a..529ecdbee9 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2372,6 +2372,10 @@ msgstr ""
 msgid "array and index length must be equal"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2739,6 +2743,10 @@ msgstr ""
 msgid "convolve arguments must not be empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr ""
@@ -2830,6 +2838,10 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr ""
@@ -2933,7 +2945,7 @@ msgstr ""
 msgid "first argument must be a tuple of ndarrays"
 msgstr ""
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr ""
 
@@ -3081,7 +3093,7 @@ msgstr ""
 msgid "incorrect padding"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr ""
 
@@ -3148,6 +3160,10 @@ msgstr ""
 msgid "input matrix is singular"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr ""
@@ -3156,11 +3172,7 @@ msgstr ""
 msgid "input must be a dense ndarray"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr ""
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr ""
 
@@ -3361,7 +3373,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
+msgid "maximum number of dimensions is "
 msgstr ""
 
 #: py/runtime.c
@@ -3610,7 +3622,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr ""
 
@@ -3760,6 +3772,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4195,6 +4208,14 @@ msgstr ""
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr ""
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4236,7 +4257,17 @@ msgstr ""
 msgid "wrong axis specified"
 msgstr ""
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr ""
 
@@ -4244,6 +4275,10 @@ msgstr ""
 msgid "wrong length of condition array"
 msgstr ""
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index c6e7e7b364..186c640e3d 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2416,6 +2416,10 @@ msgstr "cānshù bìxū shì ndarrays"
 msgid "array and index length must be equal"
 msgstr "shù zǔ hé suǒ yǐn cháng dù bì xū xiāng děng"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "array has too many dimensions"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2787,6 +2791,10 @@ msgstr "juàn jī cānshù bìxū shì ndarrays"
 msgid "convolve arguments must not be empty"
 msgstr "juàn jī cān shǔ bùnéng wéi kōng"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "corrupted file"
+msgstr ""
+
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
 msgstr "wúfǎ fǎn zhuǎn fàndéméng dé jǔzhèn"
@@ -2880,6 +2888,10 @@ msgstr "dtype bì xū shì fú diǎn xíng huò fù shù"
 msgid "empty"
 msgstr "kòngxián"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "empty file"
+msgstr ""
+
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
 msgstr "kōng yīn yīnxiào"
@@ -2983,7 +2995,7 @@ msgstr "dì yīgè cānshù bìxū shì yī gè hánshù"
 msgid "first argument must be a tuple of ndarrays"
 msgstr "dì yī gè cān shù bì xū shì yí gè yuán zǔ ndarrays"
 
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
 msgid "first argument must be an ndarray"
 msgstr "dì yī gè cānshù bìxū shì ndarray"
 
@@ -3131,7 +3143,7 @@ msgstr "géshì bù wánzhěng de mì yào"
 msgid "incorrect padding"
 msgstr "bù zhèngquè de tiánchōng"
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
 msgid "index is out of bounds"
 msgstr "suǒyǐn chāochū fànwéi"
 
@@ -3198,6 +3210,10 @@ msgstr "shūrù jǔzhèn bù duìchèn"
 msgid "input matrix is singular"
 msgstr "shūrù jǔzhèn shì qíyì de"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "input must be 1- or 2-d"
+msgstr ""
+
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
 msgstr "shū rù bì xū shì 1D ndarray"
@@ -3206,11 +3222,7 @@ msgstr "shū rù bì xū shì 1D ndarray"
 msgid "input must be a dense ndarray"
 msgstr "shū rù bì xū shì mì jí de ndarray"
 
-#: extmod/ulab/code/numpy/create.c
-msgid "input must be a tensor of rank 2"
-msgstr "shū rù bì xū shì děng jí 2 de zhāng liàng"
-
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
+#: extmod/ulab/code/user/user.c
 msgid "input must be an ndarray"
 msgstr "shū rù bì xū shì ndarray"
 
@@ -3412,8 +3424,8 @@ msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr "dāng fixed_length de zhí wéi %s shí, max_length bì xū wéi 0-%d"
 
 #: extmod/ulab/code/ndarray.c
-msgid "maximum number of dimensions is 4"
-msgstr "zuì dà chǐ cùn shù wéi 4"
+msgid "maximum number of dimensions is "
+msgstr ""
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3661,7 +3673,7 @@ msgstr "jīshù zìfú chuàn"
 msgid "off"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
+#: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
 msgstr "piān yí tài dà"
 
@@ -3811,6 +3823,7 @@ msgid "pow() with 3 arguments requires integers"
 msgstr "pow() yǒu 3 cānshù xūyào zhěngshù"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
@@ -4251,6 +4264,14 @@ msgstr "bù zhīchí de cāozuò zhě lèixíng"
 msgid "unsupported types for %q: '%q', '%q'"
 msgstr "%q bù zhīchí de lèixíng: '%q', '%q'"
 
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols is too high"
+msgstr ""
+
+#: extmod/ulab/code/numpy/io/io.c
+msgid "usecols keyword must be specified"
+msgstr ""
+
 #: py/objint.c
 #, c-format
 msgid "value must fit in %d byte(s)"
@@ -4292,7 +4313,17 @@ msgstr "cuò wù de zhóu suǒ yǐn"
 msgid "wrong axis specified"
 msgstr "zhǐ dìng de zhóu cuò wù"
 
-#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/numpy/io/io.c
+msgid "wrong dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong index type"
+msgstr "cuòwù de suǒyǐn lèixíng"
+
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
+#: extmod/ulab/code/numpy/vector.c
 msgid "wrong input type"
 msgstr "shūrù lèixíng cuòwù"
 
@@ -4300,6 +4331,10 @@ msgstr "shūrù lèixíng cuòwù"
 msgid "wrong length of condition array"
 msgstr "tiáo jiàn shù zǔ de cháng dù cuò wù"
 
+#: extmod/ulab/code/numpy/transform.c
+msgid "wrong length of index array"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"
 msgstr "cānshù shù cuòwù"
@@ -4344,6 +4379,12 @@ 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 "input must be a tensor of rank 2"
+#~ msgstr "shū rù bì xū shì děng jí 2 de zhāng liàng"
+
+#~ msgid "maximum number of dimensions is 4"
+#~ msgstr "zuì dà chǐ cùn shù wéi 4"
+
 #~ msgid "Watchdog timer expired."
 #~ msgstr "Kān mén gǒu dìngshí qì yǐ guòqí."
 
@@ -5214,9 +5255,6 @@ msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 #~ msgid "wrong argument type"
 #~ msgstr "cuòwù de cānshù lèixíng"
 
-#~ msgid "wrong index type"
-#~ msgstr "cuòwù de suǒyǐn lèixíng"
-
 #~ msgid "Must provide SCK pin"
 #~ msgstr "bì xū tí gòng SCK yǐn jiǎo"
 

From d9f6e999422a1deedcc5c6f82d87171056e646d6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 11 Jul 2022 13:36:44 -0700
Subject: [PATCH 0603/2403] Fix RP2040 UART

It couldn't receive more than 32 bytes in while checking in_waiting
because in_waiting didn't turn interrupts back on correctly.

Fixes #6579
---
 ports/raspberrypi/common-hal/busio/UART.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
index d1ed3ea27a..c06bb21903 100644
--- a/ports/raspberrypi/common-hal/busio/UART.c
+++ b/ports/raspberrypi/common-hal/busio/UART.c
@@ -311,7 +311,7 @@ uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self) {
     // The UART only interrupts after a threshold so make sure to copy anything
     // out of its FIFO before measuring how many bytes we've received.
     _copy_into_ringbuf(&self->ringbuf, self->uart);
-    irq_set_enabled(self->uart_irq_id, false);
+    irq_set_enabled(self->uart_irq_id, true);
     return ringbuf_num_filled(&self->ringbuf);
 }
 

From 8cfdfb95f78a8f5082fbdefcd0c8adbf5cb49cc6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 11 Jul 2022 14:32:28 -0700
Subject: [PATCH 0604/2403] Remove extra logging, auth /cp/serial and add doc

---
 docs/workflows.md                             | 78 +++++++++++--------
 .../shared/web_workflow/static/welcome.html   |  3 +-
 supervisor/shared/web_workflow/web_workflow.c |  4 +-
 supervisor/shared/web_workflow/websocket.c    |  9 ---
 4 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 1b262011b2..b011acd01c 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -286,6 +286,44 @@ not protected by basic auth in case the device is someone elses.
 
 Only `GET` requests are supported and will return `405 Method Not Allowed` otherwise.
 
+#### `/cp/devices.json`
+
+Returns information about other devices found on the network using MDNS.
+
+* `total`: Total MDNS response count. May be more than in `devices` if internal limits were hit.
+* `devices`: List of discovered devices.
+	* `hostname`: MDNS hostname
+	* `instance_name`: MDNS instance name. Defaults to human readable board name.
+	* `port`: Port of CircuitPython Web API
+	* `ip`: IP address
+
+Example:
+```sh
+curl -v -L http://circuitpython.local/cp/devices.json
+```
+
+```json
+{
+	"total": 1,
+	"devices": [
+		{
+			"hostname": "cpy-951032",
+			"instance_name": "Adafruit Feather ESP32-S2 TFT",
+			"port": 80,
+			"ip": "192.168.1.235"
+		}
+	]
+}
+```
+
+#### `/cp/serial/`
+
+
+Serves a basic serial terminal program when a `GET` request is received without the
+`Upgrade: websocket` header. Otherwise the socket is upgraded to a WebSocket. See WebSockets below for more detail.
+
+This is an authenticated endpoint in both modes.
+
 #### `/cp/version.json`
 
 Returns information about the device.
@@ -323,36 +361,6 @@ curl -v -L http://circuitpython.local/cp/version.json
 }
 ```
 
-#### `/cp/devices.json`
-
-Returns information about other devices found on the network using MDNS.
-
-* `total`: Total MDNS response count. May be more than in `devices` if internal limits were hit.
-* `devices`: List of discovered devices.
-	* `hostname`: MDNS hostname
-	* `instance_name`: MDNS instance name. Defaults to human readable board name.
-	* `port`: Port of CircuitPython Web API
-	* `ip`: IP address
-
-Example:
-```sh
-curl -v -L http://circuitpython.local/cp/devices.json
-```
-
-```json
-{
-	"total": 1,
-	"devices": [
-		{
-			"hostname": "cpy-951032",
-			"instance_name": "Adafruit Feather ESP32-S2 TFT",
-			"port": 80,
-			"ip": "192.168.1.235"
-		}
-	]
-}
-```
-
 ### Static files
 
 * `/favicon.ico` - Blinka
@@ -361,4 +369,12 @@ curl -v -L http://circuitpython.local/cp/devices.json
 
 ### WebSocket
 
-Coming soon!
+The CircuitPython serial interactions are available over a WebSocket. A WebSocket begins as a
+special HTTP request that gets upgraded to a WebSocket. Authentication happens before upgrading.
+
+WebSockets are *not* bare sockets once upgraded. Instead they have their own framing format for data.
+CircuitPython can handle PING and CLOSE opcodes. All others are treated as TEXT. Data to
+CircuitPython is expected to be masked UTF-8, as the spec requires. Data from CircuitPython to the
+client is unmasked. It is also unbuffered so the client will get a variety of frame sizes.
+
+Only one WebSocket at a time is supported.
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 6ef1ccd767..139e9eba39 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -3,11 +3,12 @@
 
     CircuitPython
     
+    
     
 
 
     
     Welcome!
    
-    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
+    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
     
    Device Info
    
     Board: 
    
     Version: 
    
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index c7bf673fdc..3f9920d1c7 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1019,14 +1019,13 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else if (strcmp(path, "/version.json") == 0) {
             _reply_with_version_json(socket, request);
         } else if (strcmp(path, "/serial/") == 0) {
-            if (false && !request->authenticated) {
+            if (!request->authenticated) {
                 if (_api_password[0] != '\0') {
                     _reply_unauthorized(socket, request);
                 } else {
                     _reply_forbidden(socket, request);
                 }
             } else if (request->websocket) {
-                ESP_LOGI(TAG, "websocket!");
                 _reply_websocket_upgrade(socket, request);
             } else {
                 _REPLY_STATIC(socket, request, serial_html);
@@ -1059,7 +1058,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
 }
 
 static void _reset_request(_request *request) {
-    ESP_LOGI(TAG, "reset request");
     request->state = STATE_METHOD;
     request->origin[0] = '\0';
     request->content_length = 0;
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 7a2f37b168..8d3941b434 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -48,7 +48,6 @@ void websocket_init(void) {
 }
 
 void websocket_handoff(socketpool_socket_obj_t *socket) {
-    ESP_LOGI(TAG, "socket handed off");
     cp_serial.socket = *socket;
     cp_serial.closed = false;
     cp_serial.opcode = 0;
@@ -57,7 +56,6 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
     // Mark the original socket object as closed without telling the lower level.
     socket->connected = false;
     socket->num = -1;
-    ESP_LOGI(TAG, "socket hand off done");
 }
 
 bool websocket_connected(void) {
@@ -90,7 +88,6 @@ static void _read_next_frame_header(void) {
     if (cp_serial.frame_index == 0 && _read_byte(&h)) {
         cp_serial.frame_index++;
         cp_serial.opcode = h & 0xf;
-        ESP_LOGI(TAG, "fin %d opcode %x", h >> 7, cp_serial.opcode);
     }
     if (cp_serial.frame_index == 1 && _read_byte(&h)) {
         cp_serial.frame_index++;
@@ -108,8 +105,6 @@ static void _read_next_frame_header(void) {
         if (cp_serial.masked) {
             cp_serial.frame_len += 4;
         }
-
-        ESP_LOGI(TAG, "mask %d length %x", cp_serial.masked, len);
     }
     while (cp_serial.frame_index >= 2 &&
            cp_serial.frame_index < (cp_serial.payload_len_size + 2) &&
@@ -133,7 +128,6 @@ static void _read_next_frame_header(void) {
         if (cp_serial.frame_index == cp_serial.frame_len) {
             uint8_t opcode = 0x8; // CLOSE
             if (cp_serial.opcode == 0x9) {
-                ESP_LOGI(TAG, "websocket ping");
                 opcode = 0xA; // PONG
             } else {
                 // Set the TCP socket to send immediately so that we send the payload back before
@@ -160,7 +154,6 @@ static void _read_next_frame_header(void) {
         if (cp_serial.payload_remaining == 0) {
             cp_serial.frame_index = 0;
             if (cp_serial.opcode == 0x8) {
-                ESP_LOGI(TAG, "websocket closed");
                 cp_serial.closed = true;
 
                 common_hal_socketpool_socket_close(&cp_serial.socket);
@@ -199,7 +192,6 @@ bool websocket_available(void) {
 char websocket_read_char(void) {
     uint8_t c;
     _read_next_payload_byte(&c);
-    ESP_LOGI(TAG, "read %c", c);
     return c;
 }
 
@@ -232,7 +224,6 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
     char copy[len];
     memcpy(copy, text, len);
     copy[len] = '\0';
-    ESP_LOGI(TAG, "sent over websocket: %s", copy);
 }
 
 void websocket_write(const char *text, size_t len) {

From 425a0efeca5da563f981bc8dd271bf7f9421fb5d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 11 Jul 2022 14:53:20 -0700
Subject: [PATCH 0605/2403] A bit more cleanup

---
 shared-bindings/hashlib/Hash.c                |  7 -------
 .../shared/web_workflow/static/serial.js      |  2 --
 supervisor/shared/web_workflow/web_workflow.c | 21 ++++++++-----------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c
index 5dab05fa10..e27b71ef78 100644
--- a/shared-bindings/hashlib/Hash.c
+++ b/shared-bindings/hashlib/Hash.c
@@ -26,13 +26,6 @@
 
 #include "shared-bindings/hashlib/Hash.h"
 
-// #include "shared-bindings/util.h"
-
-// #include "shared/runtime/buffer_helper.h"
-// #include "shared/runtime/interrupt_char.h"
-
-// #include "py/mperrno.h"
-// #include "py/mphal.h"
 #include "py/obj.h"
 #include "py/objproperty.h"
 #include "py/objstr.h"
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 595bbe6653..6ecc2b1659 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -21,7 +21,6 @@ function onSubmit() {
     input.focus();
 }
 
-// Connect to Web Socket
 ws = new WebSocket("ws://" + window.location.host + "/cp/serial/");
 
 ws.onopen = function() {
@@ -32,7 +31,6 @@ var setting_title = false;
 var encoder = new TextEncoder();
 var left_count = 0;
 ws.onmessage = function(e) {
-  // e.data contains received string.
   if (e.data == "\x1b]0;") {
     setting_title = true;
     title.textContent = "";
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 3f9920d1c7..6cf765b8f9 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -522,10 +522,16 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
         "HTTP/1.1 301 Moved Permanently\r\n",
         "Connection: close\r\n",
         "Content-Length: 0\r\n",
-        "Location: http://", hostname, ".local", path, "\r\n", NULL);
+        "Location: ", NULL);
+    if (request->websocket) {
+        _send_str(socket, "ws");
+    } else {
+        _send_str(socket, "http");
+    }
+
+    _send_strs(socket, "://", hostname, ".local", path, "\r\n", NULL);
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
-    ESP_LOGI(TAG, "redirect");
 }
 
 static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) {
@@ -853,10 +859,7 @@ static void _reply_static(socketpool_socket_obj_t *socket, _request *request, co
 
 #define _REPLY_STATIC(socket, request, filename) _reply_static(socket, request, filename, filename##_length, filename##_content_type)
 
-
-
 static void _reply_websocket_upgrade(socketpool_socket_obj_t *socket, _request *request) {
-    ESP_LOGI(TAG, "websocket!");
     // Compute accept key
     hashlib_hash_obj_t hash;
     common_hal_hashlib_new(&hash, "sha1");
@@ -876,8 +879,6 @@ static void _reply_websocket_upgrade(socketpool_socket_obj_t *socket, _request *
         "Sec-WebSocket-Accept: ", encoded_accept, "\r\n",
         "\r\n", NULL);
     websocket_handoff(socket);
-
-    ESP_LOGI(TAG, "socket upgrade done");
     // socket is now closed and "disconnected".
 }
 
@@ -885,7 +886,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         _reply_redirect(socket, request, request->path);
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
-        ESP_LOGI(TAG, "bad origin %s", request->origin);
+        ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (memcmp(request->path, "/fs/", 4) == 0) {
         if (!request->authenticated) {
@@ -1199,7 +1200,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
         return;
     }
     bool reload = _reply(socket, request);
-    ESP_LOGI(TAG, "reply done");
     _reset_request(request);
     autoreload_resume(AUTORELOAD_SUSPEND_WEB);
     if (reload) {
@@ -1217,12 +1217,10 @@ void supervisor_web_workflow_background(void) {
         uint32_t port;
         int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port);
         if (newsoc == -EBADF) {
-            ESP_LOGI(TAG, "listen closed");
             common_hal_socketpool_socket_close(&listening);
             return;
         }
         if (newsoc > 0) {
-            ESP_LOGI(TAG, "new socket %d", newsoc);
             // Close the active socket because we have another we accepted.
             if (!common_hal_socketpool_socket_get_closed(&active)) {
                 common_hal_socketpool_socket_close(&active);
@@ -1243,7 +1241,6 @@ void supervisor_web_workflow_background(void) {
 
     // If we have a request in progress, continue working on it.
     if (common_hal_socketpool_socket_get_connected(&active)) {
-        // ESP_LOGI(TAG, "active connected %d", active_request.in_progress);
         _process_request(&active, &active_request);
     }
 }

From 83b62567d2f61fa747f8ba0abcdb03e606d7f5c7 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 12 Jul 2022 01:36:08 +0000
Subject: [PATCH 0606/2403] 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 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b447e8e7c7..2f8c578292 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: 2022-07-03 00:22+0000\n"
+"PO-Revision-Date: 2022-07-12 13:10+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -2437,7 +2437,7 @@ msgstr "a matriz e comprimento do índice devem ser iguais"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "a matriz possui muitas dimensões"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2814,7 +2814,7 @@ msgstr "os argumentos convolutivos não devem estar vazios"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "arquivo corrompido"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2912,7 +2912,7 @@ msgstr "vazio"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "arquivo vazio"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3235,7 +3235,7 @@ msgstr "a matriz da entrada é singular"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "a entrada deve ser 1- ou 2-d"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3450,7 +3450,7 @@ msgstr "o max_length deve ser 0-%d quando Fixed_length for %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "a quantidade máxima de dimensões é "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -4295,11 +4295,11 @@ msgstr "tipo sem suporte para %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols é muito alto"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "palavra-chave para o usecols deve ser definida"
 
 #: py/objint.c
 #, c-format
@@ -4344,7 +4344,7 @@ msgstr "um eixo errado foi definido"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "dtype errado"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4362,7 +4362,7 @@ msgstr "comprimento errado na condição da matriz"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "comprimento errado do índice da matriz"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From 636e22b05b3c59123f4bc642ded002d971d29a2b Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Mon, 11 Jul 2022 21:03:44 +0000
Subject: [PATCH 0607/2403] 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 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index 23f6013a74..78ebb6b6ab 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: 2022-07-01 17:46+0000\n"
+"PO-Revision-Date: 2022-07-12 13:10+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -2407,7 +2407,7 @@ msgstr "array och indexlängd måste vara lika"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "array har för många dimensioner"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2780,7 +2780,7 @@ msgstr "Argumenten convolve kan inte vara tomma"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "korrupt fil"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2878,7 +2878,7 @@ msgstr "tom"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "tom fil"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3200,7 +3200,7 @@ msgstr "indatamatrisen är singulär"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "input måste vara 1- eller 2-d"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3415,7 +3415,7 @@ msgstr "max_length måste vara 0-%d när fixed_length är %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "maximalt antal dimensioner är "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -4254,11 +4254,11 @@ msgstr "typen %q stöder inte '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols är för hög"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "nyckelordet usecols måste anges"
 
 #: py/objint.c
 #, c-format
@@ -4303,7 +4303,7 @@ msgstr "fel axel angiven"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "fel dtype"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4321,7 +4321,7 @@ msgstr "fel längd på villkorsmatrisen"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "fel längd av index array"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From 15fe3864574d0a92f8d9612f0ab1da976ffc3ee0 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 12 Jul 2022 11:13:17 -0700
Subject: [PATCH 0608/2403] Fix build and minify html and js

---
 docs/library/hashlib.rst                   | 1 +
 requirements-dev.txt                       | 4 ++++
 supervisor/shared/web_workflow/websocket.c | 3 +++
 tools/gen_web_workflow_static.py           | 6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/docs/library/hashlib.rst b/docs/library/hashlib.rst
index 8e5ebc2d1a..061f9fd1e0 100644
--- a/docs/library/hashlib.rst
+++ b/docs/library/hashlib.rst
@@ -5,6 +5,7 @@
 
 .. module:: hashlib
    :synopsis: hashing algorithms
+   :noindex:
 
 |see_cpython_module| :mod:`cpython:hashlib`.
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 0b2e08163a..3b4411bd3a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -26,3 +26,7 @@ pyelftools
 
 # for stubs and annotations
 adafruit-circuitpython-typing
+
+# for web workflow minify
+minify_html
+jsmin
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 8d3941b434..313e18a86d 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -26,6 +26,9 @@
 
 #include "supervisor/shared/web_workflow/websocket.h"
 
+// TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
+#include "esp_log.h"
+
 typedef struct {
     socketpool_socket_obj_t socket;
     uint8_t opcode;
diff --git a/tools/gen_web_workflow_static.py b/tools/gen_web_workflow_static.py
index 5f0febd084..b8c5baf619 100644
--- a/tools/gen_web_workflow_static.py
+++ b/tools/gen_web_workflow_static.py
@@ -4,6 +4,8 @@
 
 import argparse
 import gzip
+import minify_html
+import jsmin
 import mimetypes
 import pathlib
 
@@ -24,6 +26,10 @@ for f in args.files:
     variable = path.name.replace(".", "_")
     uncompressed = f.read()
     ulen = len(uncompressed)
+    if f.name.endswith(".html"):
+        uncompressed = minify_html.minify(uncompressed.decode("utf-8")).encode("utf-8")
+    elif f.name.endswith(".js"):
+        uncompressed = jsmin.jsmin(uncompressed.decode("utf-8")).encode("utf-8")
     compressed = gzip.compress(uncompressed)
     clen = len(compressed)
     compressed = ", ".join([hex(x) for x in compressed])

From 8093f8e55521cccaaf273bb5f821e40f65432608 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 12 Jul 2022 14:12:25 -0700
Subject: [PATCH 0609/2403] Default gifio to camera setting

---
 py/circuitpy_mpconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index de88dcc727..5d6ef0ddf6 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -233,7 +233,7 @@ CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS)
 
 ifeq ($(CIRCUITPY_DISPLAYIO),1)
-CIRCUITPY_GIFIO ?= $(CIRCUITPY_FULL_BUILD)
+CIRCUITPY_GIFIO ?= $(CIRCUITPY_CAMERA)
 else
 CIRCUITPY_GIFIO ?= 0
 endif

From 031c124a81d6129f9bf8fa47cea1066788d481ba Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 12 Jul 2022 14:12:39 -0700
Subject: [PATCH 0610/2403] Tweak serial page to work better in Chrome

---
 supervisor/shared/web_workflow/static/serial.html | 8 ++++----
 supervisor/shared/web_workflow/static/serial.js   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index aaf416b8b3..0c13248904 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -1,15 +1,15 @@
 
 
-
 
   Simple client
-
+  
+  
   
 
 
-  
    
+  
    
     
    
-     
+    
   
    
   
    
     
    
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 6ecc2b1659..86ec077e92 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -57,7 +57,7 @@ ws.onerror = function(e) {
   set_enabled(false);
 };
 
-input.onbeforeinput = function(e) {
+input.addEventListener("beforeinput", function(e) {
   if (e.inputType == "insertLineBreak") {
     ws.send("\r");
     input.value = "";
@@ -68,7 +68,7 @@ input.onbeforeinput = function(e) {
   } else if (e.inputType == "deleteContentBackward") {
     ws.send("\b");
   }
-}
+});
 
 let ctrl_c = document.querySelector("#c");
 ctrl_c.onclick = function() {

From afbaa2eb6c90990c5965913bd7070f997c83c21c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 12 Jul 2022 16:28:33 -0500
Subject: [PATCH 0611/2403] decode_backtrace: Show even more information

addr2line can show information about how functions were inlined,
including function names

Typical new output:
```
0x400dec57: mp_obj_get_type at /home/jepler/src/circuitpython/ports/espressif/../../py/obj.c:68
 (inlined by) mp_obj_print_helper at /home/jepler/src/circuitpython/ports/espressif/../../py/obj.c:133
 (inlined by) mp_obj_print_helper at /home/jepler/src/circuitpython/ports/espressif/../../py/obj.c:114
0x400e1a25: fun_builtin_1_call at /home/jepler/src/circuitpython/ports/espressif/../../py/objfun.c:75
0x400dd016: mp_call_function_n_kw at /home/jepler/src/circuitpython/ports/espressif/../../py/runtime.c:665
0x400eac99: mp_execute_bytecode at /home/jepler/src/circuitpython/ports/espressif/../../py/vm.c:936
0x400e1ae9: fun_bc_call at /home/jepler/src/circuitpython/ports/espressif/../../py/objfun.c:297 (discriminator 4)
0x400dd016: mp_call_function_n_kw at /home/jepler/src/circuitpython/ports/espressif/../../py/runtime.c:665
0x400dd03a: mp_call_function_0 at /home/jepler/src/circuitpython/ports/espressif/../../py/runtime.c:638
0x40117c03: parse_compile_execute at /home/jepler/src/circuitpython/ports/espressif/../../shared/runtime/pyexec.c:146
0x4011800d: pyexec_friendly_repl at /home/jepler/src/circuitpython/ports/espressif/../../shared/runtime/pyexec.c:734
0x400eeded: run_repl at /home/jepler/src/circuitpython/ports/espressif/../../main.c:823
 (inlined by) main at /home/jepler/src/circuitpython/ports/espressif/../../main.c:922
0x400ef5e3: app_main at /home/jepler/src/circuitpython/ports/espressif/supervisor/port.c:410
0x401bb461: main_task at /home/jepler/src/circuitpython/ports/espressif/build-adafruit_feather_esp32_v2/esp-idf/../../esp-idf/components/freertos/port/port_common.c:141
```
---
 ports/espressif/tools/decode_backtrace.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/tools/decode_backtrace.py b/ports/espressif/tools/decode_backtrace.py
index 523677baea..38b2c12b66 100644
--- a/ports/espressif/tools/decode_backtrace.py
+++ b/ports/espressif/tools/decode_backtrace.py
@@ -18,7 +18,7 @@ while True:
         addresses = addresses[len("Backtrace:") :]
     addresses = addresses.strip().split()
     addresses = [address.split(":")[0] for address in addresses]
-    print("got", addresses)
     subprocess.run(
-        ["xtensa-esp32s2-elf-addr2line", "-e", "build-{}/firmware.elf".format(board)] + addresses
+        ["xtensa-esp32s2-elf-addr2line", "-aipfe", "build-{}/firmware.elf".format(board)]
+        + addresses
     )

From 953f44b46e07b5efef3a63c1eea424d66608a0da Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 10:51:19 -0500
Subject: [PATCH 0612/2403] Fix spiram limit calculation on esp32

esp32 places the psram start at SOC_EXTRAM_DATA_LOW and it can extend
up to SOC_EXTRAM_DATA_SIZE. This is different than esp32-s2 and later,
which place the end at EXTRAM_DATA_HIGH and the limitation of
SOC_EXTRAM_DATA_SIZE was not previously identified as important.
Additionally, the esp32 has a reserved area within himem which was
not being accounted for.

With this change, the Feather ESP32 V2 feather can be used via thonny,
and the other "quick memory corruption tests" I was performing
also all succeed instead of failing.

Before this change, the incorrect address being used for spiram was
0x3fa00000..0x3fc00000 (2MiB). Now, it's 0x3f800000..0x3f9c0000 (1.75MiB)
due to the reserved area and the changed start address.

This is intended to be a no-effect change for other espressif chips besides
original esp32.
---
 ports/espressif/supervisor/port.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index f9d978c5b4..f2288ebcb0 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -89,6 +89,17 @@
 
 #ifdef CONFIG_SPIRAM
 #include "esp32/spiram.h"
+#ifdef CONFIG_IDF_TARGET_ESP32
+#include "esp32/himem.h"
+#else
+#define esp_himem_reserved_area_size() (0)
+#endif
+
+static size_t spiram_size_usable_for_malloc(void) {
+    /* SPIRAM chip may be larger than the size we can map into address space */
+    size_t s = MIN(esp_spiram_get_size(), SOC_EXTRAM_DATA_SIZE);
+    return s - esp_himem_reserved_area_size();
+}
 #endif
 
 // Heap sizes for when there is no external RAM for CircuitPython to use
@@ -209,8 +220,12 @@ safe_mode_t port_init(void) {
 
     #ifdef CONFIG_SPIRAM
     if (esp_spiram_is_initialized()) {
-        size_t spiram_size = esp_spiram_get_size();
+        size_t spiram_size = spiram_size_usable_for_malloc();
+        #ifdef CONFIG_IDF_TARGET_ESP32
+        heap = (uint32_t *)SOC_EXTRAM_DATA_LOW;
+        #else
         heap = (uint32_t *)(SOC_EXTRAM_DATA_HIGH - spiram_size);
+        #endif
         heap_size = spiram_size / sizeof(uint32_t);
     }
     #endif

From ea52ca66dc7cb532066249fecb9873783034917e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 10:56:58 -0500
Subject: [PATCH 0613/2403] Disable SPIRAM bankswitch on esp32

We don't use this facility, which was reserving the last 256kiB of
psram.
---
 ports/espressif/esp-idf-config/sdkconfig-esp32.defaults | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index ed573c303e..6c244f3bbe 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -294,8 +294,7 @@ CONFIG_SPIRAM_CACHE_LIBFILE_IN_IRAM=y
 CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y
 # end of SPIRAM workaround libraries placement
 
-CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
-CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=n
 
 #
 # PSRAM clock and cs IO for ESP32-DOWD

From f620c2901cdb71d09c1e5b973c1481364405565c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 11:10:00 -0500
Subject: [PATCH 0614/2403] Set a small but working heap size for esp32 without
 psram

---
 ports/espressif/supervisor/port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index f2288ebcb0..371c616f44 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -106,7 +106,7 @@ static size_t spiram_size_usable_for_malloc(void) {
 // exclusively.
 #ifdef CONFIG_IDF_TARGET_ESP32
 // TODO: Determine better: 520kB of internal RAM; similar to 512kB for ESP32-S3.
-#define HEAP_SIZE (176 * 1024)
+#define HEAP_SIZE (48 * 1024)
 #endif
 #ifdef CONFIG_IDF_TARGET_ESP32S2
 #define HEAP_SIZE (48 * 1024)

From 5c6ee20ca5e7cf042b1d5507268ab78e9eb8ad4f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 11:55:04 -0500
Subject: [PATCH 0615/2403] on esp32 need to initialize nvs before starting
 wifi

Also, change error handling so that the esp-idf error number
is shown in the traceback in the case of an error.

This allows scanning & connecting to work. I didn't try requests yet.
---
 ports/espressif/common-hal/wifi/__init__.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index e5d6980228..04612d745d 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "bindings/espidf/__init__.h"
 #include "common-hal/wifi/__init__.h"
 #include "shared-bindings/wifi/__init__.h"
 
@@ -47,6 +48,10 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 
 #include "esp_ipc.h"
 
+#ifdef CONFIG_IDF_TARGET_ESP32
+#include "nvs_flash.h"
+#endif
+
 static const char *TAG = "CP wifi";
 
 STATIC void schedule_background_on_cp_core(void *arg) {
@@ -174,11 +179,21 @@ void common_hal_wifi_init(bool user_initiated) {
         &self->handler_instance_got_ip));
 
     wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
+    #ifdef CONFIG_IDF_TARGET_ESP32
+    esp_err_t err = nvs_flash_init();
+    if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+        // NVS partition was truncated and needs to be erased
+        // Retry nvs_flash_init
+        ESP_ERROR_CHECK(nvs_flash_erase());
+        err = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK(err);
+    #endif
     esp_err_t result = esp_wifi_init(&config);
     if (result == ESP_ERR_NO_MEM) {
         mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate Wifi memory"));
     } else if (result != ESP_OK) {
-        mp_raise_RuntimeError(translate("Failed to init wifi"));
+        raise_esp_error(result);
     }
     // set station mode to avoid the default SoftAP
     common_hal_wifi_radio_start_station(self);

From 13be10ef1411459cd165df0d66697136a123c506 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 13:28:51 -0500
Subject: [PATCH 0616/2403] rename function to avoid confusion

---
 ports/espressif/supervisor/port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 371c616f44..5990a60d7f 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -95,7 +95,7 @@
 #define esp_himem_reserved_area_size() (0)
 #endif
 
-static size_t spiram_size_usable_for_malloc(void) {
+static size_t spiram_size_usable(void) {
     /* SPIRAM chip may be larger than the size we can map into address space */
     size_t s = MIN(esp_spiram_get_size(), SOC_EXTRAM_DATA_SIZE);
     return s - esp_himem_reserved_area_size();
@@ -220,7 +220,7 @@ safe_mode_t port_init(void) {
 
     #ifdef CONFIG_SPIRAM
     if (esp_spiram_is_initialized()) {
-        size_t spiram_size = spiram_size_usable_for_malloc();
+        size_t spiram_size = spiram_size_usable();
         #ifdef CONFIG_IDF_TARGET_ESP32
         heap = (uint32_t *)SOC_EXTRAM_DATA_LOW;
         #else

From c1b6c367fffcff5cbc8169bda0344d2122181bac Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 13:53:08 -0500
Subject: [PATCH 0617/2403] esp32 can allocate 88kB successfully

---
 ports/espressif/supervisor/port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 5990a60d7f..0169f5ce16 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -106,7 +106,7 @@ static size_t spiram_size_usable(void) {
 // exclusively.
 #ifdef CONFIG_IDF_TARGET_ESP32
 // TODO: Determine better: 520kB of internal RAM; similar to 512kB for ESP32-S3.
-#define HEAP_SIZE (48 * 1024)
+#define HEAP_SIZE (88 * 1024)
 #endif
 #ifdef CONFIG_IDF_TARGET_ESP32S2
 #define HEAP_SIZE (48 * 1024)

From 09d1c846c4a72c1e6a2d72657c58c2abe55984cf Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 13:53:22 -0500
Subject: [PATCH 0618/2403] Set heap size to 0 when heap allocation fails

---
 ports/espressif/supervisor/port.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 0169f5ce16..78c3508458 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -235,6 +235,7 @@ safe_mode_t port_init(void) {
         heap_size = HEAP_SIZE / sizeof(uint32_t);
     }
     if (heap == NULL) {
+        heap_size = 0;
         return NO_HEAP;
     }
 

From afa8b2ea724f862fc0a23db303f7d0f937e181d7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 13:56:49 -0500
Subject: [PATCH 0619/2403] Don't hard fault trying to run boot.py if there's
 no heap

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

diff --git a/main.c b/main.c
index 952a17e8a8..5fcb2d61a6 100644
--- a/main.c
+++ b/main.c
@@ -704,6 +704,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 vstr_t *boot_output;
 
 STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
+    if (safe_mode == NO_HEAP) {
+        return;
+    }
+
     // If not in safe mode, run boot before initing USB and capture output in a file.
 
     // There is USB setup to do even if boot.py is not actually run.

From 09b754ffa0431bca5c88b955bb2a1e7aaae0c0c5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 14:00:59 -0500
Subject: [PATCH 0620/2403] espressif: Set heap size automatically, like
 micropython

rather than setting the heap size statically, micropython allocates
the biggest contiguous chunk possible, but in no event more than half the
total internal sram. On esp32 this gives 123728 bytes of `gc.mem_free`
in the repl.
---
 ports/espressif/supervisor/port.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 78c3508458..8d10c1f7dc 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -102,22 +102,6 @@ static size_t spiram_size_usable(void) {
 }
 #endif
 
-// Heap sizes for when there is no external RAM for CircuitPython to use
-// exclusively.
-#ifdef CONFIG_IDF_TARGET_ESP32
-// TODO: Determine better: 520kB of internal RAM; similar to 512kB for ESP32-S3.
-#define HEAP_SIZE (88 * 1024)
-#endif
-#ifdef CONFIG_IDF_TARGET_ESP32S2
-#define HEAP_SIZE (48 * 1024)
-#endif
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#define HEAP_SIZE (176 * 1024)
-#endif
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-#define HEAP_SIZE (88 * 1024)
-#endif
-
 uint32_t *heap;
 uint32_t heap_size;
 
@@ -231,8 +215,10 @@ safe_mode_t port_init(void) {
     #endif
 
     if (heap == NULL) {
-        heap = malloc(HEAP_SIZE);
-        heap_size = HEAP_SIZE / sizeof(uint32_t);
+        size_t heap_total = heap_caps_get_total_size(MALLOC_CAP_8BIT);
+        heap_size = MIN(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT), heap_total / 2);
+        heap = malloc(heap_size);
+        heap_size = heap_size / sizeof(uint32_t);
     }
     if (heap == NULL) {
         heap_size = 0;

From 104ac5b9654c82450cd8290d4c663c3b2f4d4c85 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 13 Jul 2022 14:53:25 -0500
Subject: [PATCH 0621/2403] signal errors in ci_fetch_deps subprocesses

A recent build failed. The original error seemed to be during ci_fetch_deps
where a build message said
```
  fatal: reference is not a tree: 346c936e14c6ea3a8d3d65cb1fa46202dc92999d
  fatal: Unable to checkout '346c936e14c6ea3a8d3d65cb1fa46202dc92999d' in submodule path 'extmod/ulab'
```
(along with other problems), but this step didn't signal failure to
github actions.

By adding the check= parameter, a failure of the subprocess will cause
a CalledProcessError to be raised, which will make ci_fetch_deps exit with
nonzero status. In turn, this should let Actions understand that something
went wrong with this step, instead of waiting for some subsequent step(s)
to go wrong.
---
 tools/ci_fetch_deps.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 491d8da0e5..44295a06e9 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -47,9 +47,11 @@ def run(title, command):
     print("::group::" + title, flush=True)
     print(command, flush=True)
     start = time.monotonic()
-    subprocess.run(shlex.split(command), stderr=subprocess.STDOUT)
-    print("Duration:", time.monotonic() - start, flush=True)
-    print("::endgroup::", flush=True)
+    try:
+        subprocess.run(shlex.split(command), stderr=subprocess.STDOUT, check=True)
+    finally:
+        print("Duration:", time.monotonic() - start, flush=True)
+        print("::endgroup::", flush=True)
 
 
 run(

From 04004210f5676e1e3561e4d4e43ba88dc721689a Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 13 Jul 2022 23:16:06 +0200
Subject: [PATCH 0622/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 06ec3d9769..3b0586f5fe 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2230,6 +2230,10 @@ msgstr "Tipe bus tampilan tidak didukung"
 msgid "Unsupported format"
 msgstr "Format tidak didukung"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index cd5167bd28..15656093d9 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2217,6 +2217,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index faa220b622..6ed2f74d25 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2257,6 +2257,10 @@ msgstr "Nicht unterstützter display bus type"
 msgid "Unsupported format"
 msgstr "Nicht unterstütztes Format"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "Update fehlgeschlagen"
diff --git a/locale/el.po b/locale/el.po
index 540dde009c..f71d2dbb5d 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2199,6 +2199,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 9243e0c73b..a0f87cca1c 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2232,6 +2232,10 @@ msgstr "Unsupported display bus type"
 msgid "Unsupported format"
 msgstr "Unsupported format"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "Update failed"
diff --git a/locale/es.po b/locale/es.po
index 05e913ae03..862af5b014 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2261,6 +2261,10 @@ msgstr "Sin capacidad de bus tipo display"
 msgid "Unsupported format"
 msgstr "Formato no soportado"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "La actualización fallo"
diff --git a/locale/fil.po b/locale/fil.po
index d2509b761f..447e26e9ea 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2219,6 +2219,10 @@ msgstr "Hindi supportadong tipo ng bitmap"
 msgid "Unsupported format"
 msgstr "Hindi supportadong format"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 9c892a7f11..9b84fef41e 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2289,6 +2289,10 @@ msgstr "Type de bus d'affichage non supporté"
 msgid "Unsupported format"
 msgstr "Format non supporté"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "Mise-à-jour échouée"
diff --git a/locale/hi.po b/locale/hi.po
index 1cd3603ccb..3ca50e056e 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2199,6 +2199,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 8c8ac6e551..9f46fdc57b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2229,6 +2229,10 @@ msgstr "tipo di bitmap non supportato"
 msgid "Unsupported format"
 msgstr "Formato non supportato"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index e45ac2ff0f..93584df996 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2213,6 +2213,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr "非対応の形式"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index ec1f2371fc..042eccc72b 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2203,6 +2203,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 4a1f3ab520..4eeaa5fcba 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2225,6 +2225,10 @@ msgstr "Niet-ondersteund beeldscherm bus type"
 msgid "Unsupported format"
 msgstr "Niet-ondersteunde format"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "Update Mislukt"
diff --git a/locale/pl.po b/locale/pl.po
index fbf2283bfa..1e10bdf212 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2210,6 +2210,10 @@ msgstr "Zły typ magistrali wyświetlaczy"
 msgid "Unsupported format"
 msgstr "Zły format"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 2f8c578292..36b89e4d95 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2271,6 +2271,10 @@ msgstr "Não há suporte para o tipo do display bus"
 msgid "Unsupported format"
 msgstr "Formato não suportado"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "A atualização falou"
diff --git a/locale/ru.po b/locale/ru.po
index 9625bd470c..b53fd7d02e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2248,6 +2248,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 78ebb6b6ab..fd0108c188 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2244,6 +2244,10 @@ msgstr "Busstyp för display stöds inte"
 msgid "Unsupported format"
 msgstr "Formatet stöds inte"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "Uppdateringen misslyckades"
diff --git a/locale/tr.po b/locale/tr.po
index 529ecdbee9..8b7cfa5af7 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2219,6 +2219,10 @@ msgstr ""
 msgid "Unsupported format"
 msgstr ""
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 186c640e3d..64153212c3 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2255,6 +2255,10 @@ msgstr "Bù zhīchí de gōnggòng qìchē lèixíng"
 msgid "Unsupported format"
 msgstr "Bù zhīchí de géshì"
 
+#: shared-bindings/hashlib/__init__.c
+msgid "Unsupported hash algorithm"
+msgstr ""
+
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
 msgstr "gēng xīn shī bài"

From e9dd25412779106c018a9d4b6d00413bd4296257 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 12 Jul 2022 09:37:09 -0700
Subject: [PATCH 0623/2403] Add socket select task to wake CP

This fixes the web workflow on boards without a display.

Fixes #6552
---
 ports/espressif/background.c                  |   8 -
 .../espressif/common-hal/socketpool/Socket.c  | 217 ++++++++++++++++--
 .../espressif/common-hal/socketpool/Socket.h  |   1 -
 .../common-hal/socketpool/SocketPool.c        |  56 +----
 ports/espressif/supervisor/port.c             |   5 +
 supervisor/shared/web_workflow/web_workflow.c |  43 ++--
 supervisor/shared/workflow.c                  |   4 +
 7 files changed, 234 insertions(+), 100 deletions(-)

diff --git a/ports/espressif/background.c b/ports/espressif/background.c
index 1bf44700be..0b5bb96a3b 100644
--- a/ports/espressif/background.c
+++ b/ports/espressif/background.c
@@ -40,20 +40,12 @@
 #include "common-hal/pulseio/PulseIn.h"
 #endif
 
-#if CIRCUITPY_WEB_WORKFLOW
-#include "supervisor/shared/web_workflow/web_workflow.h"
-#endif
-
 void port_background_task(void) {
     // Zero delay in case FreeRTOS wants to switch to something else.
     vTaskDelay(0);
     #if CIRCUITPY_PULSEIO
     pulsein_background();
     #endif
-
-    #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_web_workflow_background();
-    #endif
 }
 
 void port_start_background_task(void) {
diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 0774204bad..45d5f1fea0 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -30,38 +30,213 @@
 #include "shared/runtime/interrupt_char.h"
 #include "py/mperrno.h"
 #include "py/runtime.h"
+#include "shared-bindings/socketpool/SocketPool.h"
+#include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
+#include "supervisor/workflow.h"
 
 #include "components/lwip/lwip/src/include/lwip/err.h"
 #include "components/lwip/lwip/src/include/lwip/sockets.h"
 #include "components/lwip/lwip/src/include/lwip/sys.h"
 #include "components/lwip/lwip/src/include/lwip/netdb.h"
+#include "components/vfs/include/esp_vfs_eventfd.h"
 
-STATIC socketpool_socket_obj_t *open_socket_handles[CONFIG_LWIP_MAX_SOCKETS];
+StackType_t socket_select_stack[2 * configMINIMAL_STACK_SIZE];
+
+STATIC int open_socket_fds[CONFIG_LWIP_MAX_SOCKETS];
+STATIC bool user_socket[CONFIG_LWIP_MAX_SOCKETS];
+StaticTask_t socket_select_task_handle;
+STATIC int socket_change_fd = -1;
+
+STATIC void socket_select_task(void *arg) {
+    uint64_t signal;
+
+    while (true) {
+        fd_set readfds;
+        fd_set errfds;
+        FD_ZERO(&readfds);
+        FD_ZERO(&errfds);
+        FD_SET(socket_change_fd, &readfds);
+        FD_SET(socket_change_fd, &errfds);
+        int max_fd = socket_change_fd;
+        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+            if (open_socket_fds[i] < 0) {
+                continue;
+            }
+            max_fd = MAX(max_fd, open_socket_fds[i]);
+            FD_SET(open_socket_fds[i], &readfds);
+            FD_SET(open_socket_fds[i], &errfds);
+        }
+
+        int num_triggered = select(max_fd + 1, &readfds, NULL, &errfds, NULL);
+        if (num_triggered < 0) {
+            // Maybe bad file descriptor
+            for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+                int sockfd = open_socket_fds[i];
+                if (sockfd < 0) {
+                    continue;
+                }
+                if (FD_ISSET(sockfd, &errfds)) {
+                    int err;
+                    int optlen = sizeof(int);
+                    int ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, (socklen_t *)&optlen);
+                    if (ret < 0) {
+                        open_socket_fds[i] = -1;
+                        // Try again.
+                        continue;
+                    }
+                }
+            }
+        }
+        assert(num_triggered >= 0);
+
+        if (FD_ISSET(socket_change_fd, &readfds)) {
+            read(socket_change_fd, &signal, sizeof(signal));
+            num_triggered -= 1;
+        }
+        if (num_triggered > 0) {
+            supervisor_workflow_request_background();
+
+            // Wake up CircuitPython. We know it is asleep because we are lower
+            // priority.
+            port_wake_main_task();
+        }
+
+    }
+    close(socket_change_fd);
+    vTaskDelete(NULL);
+}
 
 void socket_user_reset(void) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) {
-        if (open_socket_handles[i]) {
-            if (open_socket_handles[i]->num > 0) {
-                // Close automatically clears socket handle
-                common_hal_socketpool_socket_close(open_socket_handles[i]);
-            } else {
-                open_socket_handles[i] = NULL;
-            }
+    if (socket_change_fd < 0) {
+        esp_vfs_eventfd_config_t config = ESP_VFS_EVENTD_CONFIG_DEFAULT();
+        ESP_ERROR_CHECK(esp_vfs_eventfd_register(&config));
+
+        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+            open_socket_fds[i] = -1;
+            user_socket[i] = false;
+        }
+        socket_change_fd = eventfd(0, 0);
+        // This task runs at a lower priority than CircuitPython and is used to wake CircuitPython
+        // up when any open sockets have data to read. It allows us to sleep otherwise.
+        (void)xTaskCreateStaticPinnedToCore(socket_select_task,
+            "socket_select",
+            2 * configMINIMAL_STACK_SIZE,
+            NULL,
+            0, // Run this at IDLE priority. We only need it when CP isn't running (at 1).
+            socket_select_stack,
+            &socket_select_task_handle,
+            xPortGetCoreID());
+    }
+
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+        if (open_socket_fds[i] >= 0 && user_socket[i]) {
+            int num = open_socket_fds[i];
+            // Close automatically clears socket handle
+            lwip_shutdown(num, SHUT_RDWR);
+            lwip_close(num);
+            open_socket_fds[i] = -1;
+            user_socket[i] = false;
         }
     }
 }
 
-bool register_open_socket(socketpool_socket_obj_t *self) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) {
-        if (open_socket_handles[i] == NULL) {
-            open_socket_handles[i] = self;
+// The writes below send an event to the socket select task so that it redoes the
+// select with the new open socket set.
+
+STATIC bool register_open_socket(int fd) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+        if (open_socket_fds[i] == -1) {
+            open_socket_fds[i] = fd;
+            user_socket[i] = false;
+            uint64_t signal = 1;
+            write(socket_change_fd, &signal, sizeof(signal));
             return true;
         }
     }
     return false;
 }
 
+STATIC void unregister_open_socket(int fd) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+        if (open_socket_fds[i] == fd) {
+            open_socket_fds[i] = -1;
+            user_socket[i] = false;
+            write(socket_change_fd, &fd, sizeof(fd));
+            return;
+        }
+    }
+}
+
+STATIC void mark_user_socket(int fd) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+        if (open_socket_fds[i] == fd) {
+            user_socket[i] = true;
+            return;
+        }
+    }
+}
+
+bool socketpool_socket(socketpool_socketpool_obj_t *self,
+    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
+    socketpool_socket_obj_t *sock) {
+    int addr_family;
+    int ipproto;
+    if (family == SOCKETPOOL_AF_INET) {
+        addr_family = AF_INET;
+        ipproto = IPPROTO_IP;
+    } else { // INET6
+        addr_family = AF_INET6;
+        ipproto = IPPROTO_IPV6;
+    }
+
+    int socket_type;
+    if (type == SOCKETPOOL_SOCK_STREAM) {
+        socket_type = SOCK_STREAM;
+    } else if (type == SOCKETPOOL_SOCK_DGRAM) {
+        socket_type = SOCK_DGRAM;
+    } else { // SOCKETPOOL_SOCK_RAW
+        socket_type = SOCK_RAW;
+    }
+    sock->type = socket_type;
+    sock->family = addr_family;
+    sock->ipproto = ipproto;
+    sock->pool = self;
+    sock->timeout_ms = (uint)-1;
+
+    // Create LWIP socket
+    int socknum = -1;
+    socknum = lwip_socket(sock->family, sock->type, sock->ipproto);
+    if (socknum < 0) {
+        return false;
+    }
+    // This shouldn't happen since we have room for the same number of sockets as LWIP.
+    if (!register_open_socket(socknum)) {
+        lwip_close(socknum);
+        return false;
+    }
+    sock->num = socknum;
+    // Sockets should be nonblocking in most cases
+    lwip_fcntl(socknum, F_SETFL, O_NONBLOCK);
+    return true;
+}
+
+socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
+    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) {
+    if (family != SOCKETPOOL_AF_INET) {
+        mp_raise_NotImplementedError(translate("Only IPv4 sockets supported"));
+    }
+
+    socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
+    sock->base.type = &socketpool_socket_type;
+
+    if (!socketpool_socket(self, family, type, sock)) {
+        mp_raise_RuntimeError(translate("Out of sockets"));
+    }
+    mark_user_socket(sock->num);
+    return sock;
+}
+
 int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
     struct sockaddr_in accept_addr;
     socklen_t socklen = sizeof(accept_addr);
@@ -92,6 +267,10 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     if (newsoc < 0) {
         return -MP_EBADF;
     }
+    if (!register_open_socket(newsoc)) {
+        lwip_close(newsoc);
+        return -MP_EBADF;
+    }
     return newsoc;
 }
 
@@ -100,6 +279,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
     int newsoc = socketpool_socket_accept(self, ip, port);
 
     if (newsoc > 0) {
+        mark_user_socket(newsoc);
         // Create the socket
         socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
         sock->base.type = &socketpool_socket_type;
@@ -107,10 +287,6 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
         sock->pool = self->pool;
         sock->connected = true;
 
-        if (!register_open_socket(sock)) {
-            mp_raise_OSError(MP_EBADF);
-        }
-
         lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
         return sock;
     } else {
@@ -150,18 +326,13 @@ void socketpool_socket_close(socketpool_socket_obj_t *self) {
     if (self->num >= 0) {
         lwip_shutdown(self->num, SHUT_RDWR);
         lwip_close(self->num);
+        unregister_open_socket(self->num);
         self->num = -1;
     }
 }
 
 void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) {
     socketpool_socket_close(self);
-    // Remove socket record
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_handles); i++) {
-        if (open_socket_handles[i] == self) {
-            open_socket_handles[i] = NULL;
-        }
-    }
 }
 
 void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h
index 2b8ea9fcbf..b91419807c 100644
--- a/ports/espressif/common-hal/socketpool/Socket.h
+++ b/ports/espressif/common-hal/socketpool/Socket.h
@@ -46,6 +46,5 @@ typedef struct {
 } socketpool_socket_obj_t;
 
 void socket_user_reset(void);
-bool register_open_socket(socketpool_socket_obj_t *self);
 
 #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SOCKETPOOL_SOCKET_H
diff --git a/ports/espressif/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c
index f9bf62d253..1d1aafa638 100644
--- a/ports/espressif/common-hal/socketpool/SocketPool.c
+++ b/ports/espressif/common-hal/socketpool/SocketPool.c
@@ -40,61 +40,7 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel
     }
 }
 
-bool socketpool_socket(socketpool_socketpool_obj_t *self,
-    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
-    socketpool_socket_obj_t *sock) {
-    int addr_family;
-    int ipproto;
-    if (family == SOCKETPOOL_AF_INET) {
-        addr_family = AF_INET;
-        ipproto = IPPROTO_IP;
-    } else { // INET6
-        addr_family = AF_INET6;
-        ipproto = IPPROTO_IPV6;
-    }
-
-    int socket_type;
-    if (type == SOCKETPOOL_SOCK_STREAM) {
-        socket_type = SOCK_STREAM;
-    } else if (type == SOCKETPOOL_SOCK_DGRAM) {
-        socket_type = SOCK_DGRAM;
-    } else { // SOCKETPOOL_SOCK_RAW
-        socket_type = SOCK_RAW;
-    }
-    sock->type = socket_type;
-    sock->family = addr_family;
-    sock->ipproto = ipproto;
-    sock->pool = self;
-    sock->timeout_ms = (uint)-1;
-
-    // Create LWIP socket
-    int socknum = -1;
-    socknum = lwip_socket(sock->family, sock->type, sock->ipproto);
-    if (socknum < 0) {
-        return false;
-    }
-    sock->num = socknum;
-    // Sockets should be nonblocking in most cases
-    lwip_fcntl(socknum, F_SETFL, O_NONBLOCK);
-    return true;
-}
-
-socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
-    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) {
-    if (family != SOCKETPOOL_AF_INET) {
-        mp_raise_NotImplementedError(translate("Only IPv4 sockets supported"));
-    }
-
-    socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
-    sock->base.type = &socketpool_socket_type;
-
-    if (!socketpool_socket(self, family, type, sock) ||
-        !register_open_socket(sock)) {
-        mp_raise_RuntimeError(translate("Out of sockets"));
-    }
-    return sock;
-}
-
+// common_hal_socketpool_socket is in socketpool/Socket.c to centralize open socket tracking.
 
 mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
     const char *host) {
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 8d10c1f7dc..adefff3f71 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -53,6 +53,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/RunMode.h"
 #include "shared-bindings/rtc/__init__.h"
+#include "shared-bindings/socketpool/__init__.h"
 
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
@@ -296,6 +297,10 @@ void reset_port(void) {
     rtc_reset();
     #endif
 
+    #if CIRCUITPY_SOCKETPOOL
+    socketpool_user_reset();
+    #endif
+
     #if CIRCUITPY_TOUCHIO_USE_NATIVE
     peripherals_touch_reset();
     #endif
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 6cf765b8f9..81730c92d0 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -404,7 +404,7 @@ static const char *OK_JSON = "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nC
 static void _cors_header(socketpool_socket_obj_t *socket, _request *request) {
     _send_strs(socket,
         "Access-Control-Allow-Credentials: true\r\n",
-        "Vary: Origin\r\n",
+        "Vary: Origin, Accept, Upgrade\r\n",
         "Access-Control-Allow-Origin: ", request->origin, "\r\n",
         NULL);
 }
@@ -440,10 +440,10 @@ static void _reply_access_control(socketpool_socket_obj_t *socket, _request *req
         "Access-Control-Allow-Methods:GET, OPTIONS", NULL);
     if (!_usb_active()) {
         _send_str(socket, ", PUT, DELETE");
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
     }
-    #if CIRCUITPY_USB_MSC
-    usb_msc_unlock();
-    #endif
     _send_str(socket, "\r\n");
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
@@ -740,14 +740,25 @@ STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) {
     return truncated_time;
 }
 
+STATIC void _discard_incoming(socketpool_socket_obj_t *socket, size_t amount) {
+    size_t discarded = 0;
+    while (discarded < amount) {
+        uint8_t bytes[64];
+        size_t read_len = MIN(sizeof(bytes), amount - discarded);
+        int len = socketpool_socket_recv_into(socket, bytes, read_len);
+        if (len < 0) {
+            break;
+        }
+        discarded += read_len;
+    }
+}
+
 static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *request, FATFS *fs, const TCHAR *path) {
     FIL active_file;
 
     if (_usb_active()) {
+        _discard_incoming(socket, request->content_length);
         _reply_conflict(socket, request);
-        #if CIRCUITPY_USB_MSC
-        usb_msc_unlock();
-        #endif
         return;
     }
     if (request->timestamp_ms > 0) {
@@ -765,12 +776,20 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
 
     if (result == FR_NO_PATH) {
         override_fattime(0);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        _discard_incoming(socket, request->content_length);
         _reply_missing(socket, request);
         return;
     }
     if (result != FR_OK) {
         ESP_LOGE(TAG, "file write error %d %s", result, path);
         override_fattime(0);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        _discard_incoming(socket, request->content_length);
         _reply_server_error(socket, request);
         return;
     } else if (request->expect) {
@@ -785,6 +804,7 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
         #if CIRCUITPY_USB_MSC
         usb_msc_unlock();
         #endif
+        _discard_incoming(socket, request->content_length);
         // Too large.
         if (request->expect) {
             _reply_expectation_failed(socket, request);
@@ -915,9 +935,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             } else if (strcmp(request->method, "DELETE") == 0) {
                 if (_usb_active()) {
                     _reply_conflict(socket, request);
-                    #if CIRCUITPY_USB_MSC
-                    usb_msc_unlock();
-                    #endif
                     return false;
                 }
 
@@ -932,6 +949,9 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     }
                 }
 
+                #if CIRCUITPY_USB_MSC
+                usb_msc_unlock();
+                #endif
                 if (result == FR_NO_PATH || result == FR_NO_FILE) {
                     _reply_missing(socket, request);
                 } else if (result != FR_OK) {
@@ -965,9 +985,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 } else if (strcmp(request->method, "PUT") == 0) {
                     if (_usb_active()) {
                         _reply_conflict(socket, request);
-                        #if CIRCUITPY_USB_MSC
-                        usb_msc_unlock();
-                        #endif
                         return false;
                     }
 
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index a7bddca84d..23532181c6 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -66,6 +66,10 @@ static void workflow_background(void *data) {
     #if CIRCUITPY_STATUS_BAR
     supervisor_workflow_update_status_bar();
     #endif
+
+    #if CIRCUITPY_WEB_WORKFLOW
+    supervisor_web_workflow_background();
+    #endif
 }
 
 // Called during a VM reset. Doesn't actually reset things.

From 3111d2dba98bced2a8c1f07115514d0d1b2aed3b Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 14 Jul 2022 02:36:55 +0200
Subject: [PATCH 0624/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 3b0586f5fe..c3482857bc 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -3787,6 +3787,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/cs.po b/locale/cs.po
index 15656093d9..008d3e6203 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -3773,6 +3773,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6ed2f74d25..94769061c0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3850,6 +3850,10 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() mit 3 Argumenten erfordert Integer"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/el.po b/locale/el.po
index f71d2dbb5d..c1054162a9 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -3755,6 +3755,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/en_GB.po b/locale/en_GB.po
index a0f87cca1c..c474977fcc 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -3792,6 +3792,10 @@ msgstr "pow() 3rd argument cannot be 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() with 3 arguments requires integers"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/es.po b/locale/es.po
index 862af5b014..e291b95406 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -3836,6 +3836,10 @@ msgstr "el 3er argumento de pow() no puede ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argumentos requiere enteros"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/fil.po b/locale/fil.po
index 447e26e9ea..f612547e04 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -3794,6 +3794,10 @@ msgstr "pow() 3rd argument ay hindi maaring 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() na may 3 argumento kailangan ng integers"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/fr.po b/locale/fr.po
index 9b84fef41e..926aa94e6e 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -3881,6 +3881,10 @@ msgstr "le 3e argument de pow() ne peut être 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() avec 3 arguments nécessite des entiers"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/hi.po b/locale/hi.po
index 3ca50e056e..8037a1fc2b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -3755,6 +3755,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 9f46fdc57b..28c9c90ff6 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -3807,6 +3807,10 @@ msgstr "il terzo argomento di pow() non può essere 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argomenti richiede interi"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/ja.po b/locale/ja.po
index 93584df996..b19bd4d049 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -3776,6 +3776,10 @@ msgstr "pow()の3つ目の引数は0にできません"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow()の第3引数には整数が必要"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/ko.po b/locale/ko.po
index 042eccc72b..74fb1a09b7 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -3759,6 +3759,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/nl.po b/locale/nl.po
index 4eeaa5fcba..61a6a09dfe 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -3792,6 +3792,10 @@ msgstr "derde argument van pow() mag geen 0 zijn"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() met 3 argumenten vereist integers"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/pl.po b/locale/pl.po
index 1e10bdf212..ed311e97c4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -3768,6 +3768,10 @@ msgstr "trzeci argument pow() nie może być 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "trzyargumentowe pow() wymaga liczb całkowitych"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 36b89e4d95..7e6fce911f 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -3858,6 +3858,10 @@ msgstr "O terceiro argumento pow() não pode ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "o pow() com 3 argumentos requer números inteiros"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/ru.po b/locale/ru.po
index b53fd7d02e..1206fdbc20 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -3804,6 +3804,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/sv.po b/locale/sv.po
index fd0108c188..8e0c363fc6 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -3817,6 +3817,10 @@ msgstr "pow() 3: e argument kan inte vara 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() med 3 argument kräver heltal"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/tr.po b/locale/tr.po
index 8b7cfa5af7..09c8cc9e18 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -3775,6 +3775,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 64153212c3..8f6a570e2d 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -3826,6 +3826,10 @@ msgstr "pow() 3 cān shǔ bùnéng wéi 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() yǒu 3 cānshù xūyào zhěngshù"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c

From 626296b6136f1a169522138bae00a1bf7b8b8f1e Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 14 Jul 2022 11:24:20 +0200
Subject: [PATCH 0625/2403] implement root_group in
 framebufferio.FramebufferDisplay

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 14 ++++++++++++++
 shared-bindings/framebufferio/FramebufferDisplay.h |  1 +
 shared-module/framebufferio/FramebufferDisplay.c   |  4 ++++
 3 files changed, 19 insertions(+)

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 6af8f16ce8..c3eaced598 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -353,6 +353,19 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, con
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, framebufferio_framebufferdisplay_obj_fill_row);
 
+//|     root_group: Group
+//|     """The root group on the display."""
+//|
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return common_hal_framebufferio_framebufferdisplay_get_root_group(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_root_group_obj, framebufferio_framebufferdisplay_obj_get_root_group);
+
+MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_root_group_obj,
+    (mp_obj_t)&framebufferio_framebufferdisplay_get_root_group_obj);
+
 STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&framebufferio_framebufferdisplay_show_obj) },
     { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&framebufferio_framebufferdisplay_refresh_obj) },
@@ -367,6 +380,7 @@ STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_tabl
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&framebufferio_framebufferdisplay_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_rotation), MP_ROM_PTR(&framebufferio_framebufferdisplay_rotation_obj) },
     { MP_ROM_QSTR(MP_QSTR_framebuffer), MP_ROM_PTR(&framebufferio_framebufferframebuffer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_root_group), MP_ROM_PTR(&framebufferio_framebufferdisplay_root_group_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(framebufferio_framebufferdisplay_locals_dict, framebufferio_framebufferdisplay_locals_dict_table);
 
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index f96b47eb55..8b262cf727 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -63,5 +63,6 @@ bool common_hal_framebufferio_framebufferdisplay_set_brightness(framebufferio_fr
 
 mp_obj_t common_hal_framebufferio_framebufferdisplay_framebuffer(framebufferio_framebufferdisplay_obj_t *self);
 
+mp_obj_t common_hal_framebufferio_framebufferdisplay_get_root_group(framebufferio_framebufferdisplay_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_FRAMEBUFFERDISPLAY_H
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index d184d3b8c2..6f9d9ec6ad 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -372,3 +372,7 @@ void framebufferio_framebufferdisplay_reset(framebufferio_framebufferdisplay_obj
         release_framebufferdisplay(self);
     }
 }
+
+mp_obj_t common_hal_framebufferio_framebufferdisplay_get_root_group(framebufferio_framebufferdisplay_obj_t *self) {
+    return self->core.current_group;
+}

From 50a9beda041e524cf65696e9fe77215cc317ef84 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 2 Jul 2022 21:47:14 +0200
Subject: [PATCH 0626/2403] Retrieve the BLE name from dotenv if available

Format:
CIRCUITPY_BLE_NAME = My BLE Board

- the length is limited to 31 characters
- for the NRF version it repeatedly truncates the name if it's too long
- the ESP version defaults to "nimble" if the name is too long
---
 devices/ble_hci/common-hal/_bleio/Adapter.c | 30 +++++++++----
 ports/espressif/common-hal/_bleio/Adapter.c | 17 ++++++++
 ports/nrf/common-hal/_bleio/Adapter.c       | 48 ++++++++++++++++-----
 3 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index 839519dc33..8c7b8f67eb 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -49,6 +49,10 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
+#if CIRCUITPY_DOTENV
+#include "shared-module/dotenv/__init__.h"
+#endif
+
 #define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
 #define SEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000000) / (RESOLUTION))
 #define UNITS_TO_SEC(TIME, RESOLUTION) (((TIME)*(RESOLUTION)) / 1000000)
@@ -278,17 +282,27 @@ char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0
 // Get various values and limits set by the adapter.
 // Set event mask.
 STATIC void bleio_adapter_hci_init(bleio_adapter_obj_t *self) {
+    mp_int_t name_len = 0;
 
-    const size_t len = sizeof(default_ble_name);
+    #if CIRCUITPY_DOTENV
+    char ble_name[32];
+    name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
+    if (name_len > 0) {
+        self->name = mp_obj_new_str(ble_name, (size_t)name_len);
+    }
+    #endif
 
-    bt_addr_t addr;
-    hci_check_error(hci_read_bd_addr(&addr));
+    if (name_len <= 0) {
+        name_len = sizeof(default_ble_name);
+        bt_addr_t addr;
+        hci_check_error(hci_read_bd_addr(&addr));
 
-    default_ble_name[len - 4] = nibble_to_hex_lower[addr.val[1] >> 4 & 0xf];
-    default_ble_name[len - 3] = nibble_to_hex_lower[addr.val[1] & 0xf];
-    default_ble_name[len - 2] = nibble_to_hex_lower[addr.val[0] >> 4 & 0xf];
-    default_ble_name[len - 1] = nibble_to_hex_lower[addr.val[0] & 0xf];
-    self->name = mp_obj_new_str(default_ble_name, len);
+        default_ble_name[name_len - 4] = nibble_to_hex_lower[addr.val[1] >> 4 & 0xf];
+        default_ble_name[name_len - 3] = nibble_to_hex_lower[addr.val[1] & 0xf];
+        default_ble_name[name_len - 2] = nibble_to_hex_lower[addr.val[0] >> 4 & 0xf];
+        default_ble_name[name_len - 1] = nibble_to_hex_lower[addr.val[0] & 0xf];
+        self->name = mp_obj_new_str(default_ble_name, (uint8_t)name_len);
+    }
 
     // Get version information.
     if (hci_read_local_version(&self->hci_version, &self->hci_revision, &self->lmp_version,
diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 943e44e7cd..0515cc4ee4 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -59,6 +59,10 @@
 #include "esp_bt.h"
 #include "esp_nimble_hci.h"
 
+#if CIRCUITPY_DOTENV
+#include "shared-module/dotenv/__init__.h"
+#endif
+
 bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
 
 // static void bluetooth_adapter_background(void *data) {
@@ -96,7 +100,20 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         // ble_hs_cfg.reset_cb = blecent_on_reset;
         ble_hs_cfg.sync_cb = _on_sync;
         // ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
+
+        #if CIRCUITPY_DOTENV
+        mp_int_t name_len = 0;
+        char ble_name[32];
+        name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
+        if (name_len > 0) {
+            ble_name[name_len] = '\0';
+            ble_svc_gap_device_name_set(ble_name);
+        } else {
+            ble_svc_gap_device_name_set("CIRCUITPY");
+        }
+        #else
         ble_svc_gap_device_name_set("CIRCUITPY");
+        #endif
 
         // Clear all of the internal connection objects.
         for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 288cf2f217..98dda3c1c4 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -52,6 +52,10 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
+#if CIRCUITPY_DOTENV
+#include "shared-module/dotenv/__init__.h"
+#endif
+
 #define BLE_MIN_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
 #define BLE_MAX_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
 #define BLE_SLAVE_LATENCY            0
@@ -329,18 +333,30 @@ STATIC void get_address(bleio_adapter_obj_t *self, ble_gap_addr_t *address) {
 char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0, 0, 0};
 
 STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
-    uint8_t len = sizeof(default_ble_name) - 1;
-
-    ble_gap_addr_t local_address;
-    get_address(self, &local_address);
-
-    default_ble_name[len - 4] = nibble_to_hex_lower[local_address.addr[1] >> 4 & 0xf];
-    default_ble_name[len - 3] = nibble_to_hex_lower[local_address.addr[1] & 0xf];
-    default_ble_name[len - 2] = nibble_to_hex_lower[local_address.addr[0] >> 4 & 0xf];
-    default_ble_name[len - 1] = nibble_to_hex_lower[local_address.addr[0] & 0xf];
+    // setup the default name
+    ble_gap_addr_t addr; // local_address
+    get_address(self, &addr);
+    mp_int_t len = sizeof(default_ble_name) - 1;
+    default_ble_name[len - 4] = nibble_to_hex_lower[addr.addr[1] >> 4 & 0xf];
+    default_ble_name[len - 3] = nibble_to_hex_lower[addr.addr[1] & 0xf];
+    default_ble_name[len - 2] = nibble_to_hex_lower[addr.addr[0] >> 4 & 0xf];
+    default_ble_name[len - 1] = nibble_to_hex_lower[addr.addr[0] & 0xf];
     default_ble_name[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
 
-    common_hal_bleio_adapter_set_name(self, (char *)default_ble_name);
+    mp_int_t name_len = 0;
+
+    #if CIRCUITPY_DOTENV
+    char ble_name[32];
+    name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
+    if (name_len > 0) {
+        ble_name[name_len] = '\0';
+        common_hal_bleio_adapter_set_name(self, (char *)ble_name);
+    }
+    #endif
+
+    if (name_len <= 0) {
+        common_hal_bleio_adapter_set_name(self, (char *)default_ble_name);
+    }
 }
 
 static void bluetooth_adapter_background(void *data) {
@@ -448,7 +464,17 @@ void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *na
     ble_gap_conn_sec_mode_t sec;
     sec.lv = 0;
     sec.sm = 0;
-    sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, strlen(name));
+    int result;
+    result = sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, strlen(name));
+    for (int name_len = strlen(name); name_len > 0; --name_len) {
+        result = sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, name_len);
+        // expecting NRF_ERROR_DATA_SIZE when name too long
+        if (result == NRF_SUCCESS) {
+            return;
+        }
+    }
+    // default back to default if all fails
+    sd_ble_gap_device_name_set(&sec, (const uint8_t *)default_ble_name, sizeof(default_ble_name) - 1);
 }
 
 STATIC uint32_t _update_identities(bool is_central) {

From 5ca6d8953d68edbf637e9d554c51545c8087a8f3 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 2 Jul 2022 22:34:42 +0200
Subject: [PATCH 0627/2403] use available constants instead of testing errors
 for length

---
 ports/espressif/common-hal/_bleio/Adapter.c |  3 +++
 ports/nrf/common-hal/_bleio/Adapter.c       | 14 ++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 0515cc4ee4..5eaf6e9cf4 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -106,6 +106,9 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         char ble_name[32];
         name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
         if (name_len > 0) {
+            if (name_len > MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH) {
+                name_len = MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH;
+            }
             ble_name[name_len] = '\0';
             ble_svc_gap_device_name_set(ble_name);
         } else {
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 98dda3c1c4..5cebf2fa0f 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -464,17 +464,11 @@ void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *na
     ble_gap_conn_sec_mode_t sec;
     sec.lv = 0;
     sec.sm = 0;
-    int result;
-    result = sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, strlen(name));
-    for (int name_len = strlen(name); name_len > 0; --name_len) {
-        result = sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, name_len);
-        // expecting NRF_ERROR_DATA_SIZE when name too long
-        if (result == NRF_SUCCESS) {
-            return;
-        }
+    uint16_t len = strlen(name);
+    if (len > BLE_GAP_DEVNAME_MAX_LEN) {
+        len = BLE_GAP_DEVNAME_MAX_LEN;
     }
-    // default back to default if all fails
-    sd_ble_gap_device_name_set(&sec, (const uint8_t *)default_ble_name, sizeof(default_ble_name) - 1);
+    sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, len);
 }
 
 STATIC uint32_t _update_identities(bool is_central) {

From 17d65fe8f331a48c3ba996bb031ef4db1af335f7 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 14 Jul 2022 13:31:41 +0200
Subject: [PATCH 0628/2403] fix the docs

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index c3eaced598..e999ac9bc1 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -353,7 +353,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, con
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, framebufferio_framebufferdisplay_obj_fill_row);
 
-//|     root_group: Group
+//|     root_group: displayio.Group
 //|     """The root group on the display."""
 //|
 //|

From 49a5e83a611b12bbca1f466adefea7f1f4041896 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 14 Jul 2022 15:53:52 +0000
Subject: [PATCH 0629/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 8e0c363fc6..af46f6e8bb 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: 2022-07-12 13:10+0000\n"
+"PO-Revision-Date: 2022-07-14 18:05+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -2246,7 +2246,7 @@ msgstr "Formatet stöds inte"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Hash-algoritmen stöds inte"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -3819,7 +3819,7 @@ msgstr "pow() med 3 argument kräver heltal"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "genom att trycka på SW38-knappen vid start.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h

From 44a91c12be610a16d272213099500fa616b3dda8 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 14 Jul 2022 20:31:53 +0200
Subject: [PATCH 0630/2403] add docs for dotenv BLE

---
 docs/environment.rst | 10 +++++++++-
 docs/workflows.md    |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/environment.rst b/docs/environment.rst
index 2e5d81fca8..4d12009848 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -31,9 +31,17 @@ CircuitPython behavior
 CircuitPython will also read the environment to configure its behavior. Other
 keys are ignored by CircuitPython. Here are the keys it uses:
 
+CIRCUITPY_BLE_NAME
+~~~~~~~~~~~~~~~~~~
+Default BLE name the board advertises as, including for the BLE workflow.
+
+CIRCUITPY_WEB_API_PASSWORD
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Password required to make modifications to the board from the Web Workflow.
+
 CIRCUITPY_WIFI_PASSWORD
 ~~~~~~~~~~~~~~~~~~~~~~~
-Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID
+Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID.
 
 CIRCUITPY_WIFI_SSID
 ~~~~~~~~~~~~~~~~~~~
diff --git a/docs/workflows.md b/docs/workflows.md
index b011acd01c..2196d1111a 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -45,6 +45,10 @@ using a rotating key rather than a static one. Non-bonded devices won't be able
 connection, the central device can discover two default services. One for file transfer and one for
 CircuitPython specifically that includes serial characteristics.
 
+To change the default BLE advertising name without (or before) running user code, the desired name
+can be put in the `/.env` file. The key is `CIRCUITPY_BLE_NAME`. It's limited to approximately
+30 characters depending on the port's settings and will be truncated if longer.
+
 ### File Transfer API
 
 CircuitPython uses [an open File Transfer API](https://github.com/adafruit/Adafruit_CircuitPython_BLE_File_Transfer)

From 72f5537027c79b2fd8246dba3e6ee9fafc722911 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 14 Jul 2022 14:57:12 -0500
Subject: [PATCH 0631/2403] esp32: don't fully reset the wifi device

.. this makes reconnecting without a full reset not work.

Because this works on other generations of the esp32 (c2, c3, etc),
apply this behavior only to esp32.

After this change, it's possible to connect multiple times to wifi in
different runs of code.py or the repl after soft rebooting.
---
 ports/espressif/common-hal/wifi/__init__.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index 04612d745d..d823912d6d 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -214,6 +214,7 @@ void wifi_reset(void) {
     common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
     wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
     common_hal_wifi_radio_set_enabled(radio, false);
+    #ifndef CONFIG_IDF_TARGET_ESP32
     ESP_ERROR_CHECK(esp_event_handler_instance_unregister(WIFI_EVENT,
         ESP_EVENT_ANY_ID,
         radio->handler_instance_all_wifi));
@@ -226,6 +227,7 @@ void wifi_reset(void) {
     esp_netif_destroy(radio->ap_netif);
     radio->ap_netif = NULL;
     wifi_inited = false;
+    #endif
     supervisor_workflow_request_background();
 }
 

From dcc27a8c88665172da2571f8bc93dff75c0bf580 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 14 Jul 2022 15:09:26 -0500
Subject: [PATCH 0632/2403] Need to ensure wifi radio is set enabled again on
 esp32

.. otherwise, nothing set it enabled on the second soft reboot.
---
 ports/espressif/common-hal/wifi/__init__.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index d823912d6d..885cc98f96 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -141,7 +141,12 @@ static bool wifi_ever_inited;
 static bool wifi_user_initiated;
 
 void common_hal_wifi_init(bool user_initiated) {
+    wifi_radio_obj_t *self = &common_hal_wifi_radio_obj;
+
     if (wifi_inited) {
+        if (user_initiated && !wifi_user_initiated) {
+            common_hal_wifi_radio_set_enabled(self, true);
+        }
         return;
     }
     wifi_inited = true;
@@ -154,7 +159,6 @@ void common_hal_wifi_init(bool user_initiated) {
     }
     wifi_ever_inited = true;
 
-    wifi_radio_obj_t *self = &common_hal_wifi_radio_obj;
     self->netif = esp_netif_create_default_wifi_sta();
     self->ap_netif = esp_netif_create_default_wifi_ap();
     self->started = false;
@@ -204,6 +208,7 @@ void common_hal_wifi_init(bool user_initiated) {
 void wifi_user_reset(void) {
     if (wifi_user_initiated) {
         wifi_reset();
+        wifi_user_initiated = false;
     }
 }
 

From 8cdbeb62f6ded5f83ad73de4f66ab446b2fff583 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 14 Jul 2022 15:16:28 -0500
Subject: [PATCH 0633/2403] Pass check=False for an expected-fail command

---
 tools/ci_fetch_deps.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 44295a06e9..55985ffe15 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -43,12 +43,12 @@ port_deps = {
 }
 
 
-def run(title, command):
+def run(title, command, check=True):
     print("::group::" + title, flush=True)
     print(command, flush=True)
     start = time.monotonic()
     try:
-        subprocess.run(shlex.split(command), stderr=subprocess.STDOUT, check=True)
+        subprocess.run(shlex.split(command), stderr=subprocess.STDOUT, check=check)
     finally:
         print("Duration:", time.monotonic() - start, flush=True)
         print("::endgroup::", flush=True)
@@ -108,7 +108,11 @@ if submodules:
     submodules = " ".join(submodules)
     # This line will fail because the submodule's need different commits than the tip of the branch. We
     # fix it later.
-    run("Init the submodules we'll need", f"git submodule update --init -N --depth 1 {submodules}")
+    run(
+        "Init the submodules we'll need",
+        f"git submodule update --init -N --depth 1 {submodules}",
+        check=False,
+    )
 
     run(
         "Fetch the submodule sha",

From 6e7fdcc24b2aec8397528577d74a04bf36226ded Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 15 Jul 2022 13:48:19 -0700
Subject: [PATCH 0634/2403] Add wait for MDNS hostname to be set

---
 ports/espressif/common-hal/mdns/Server.c | 4 ++++
 ports/espressif/esp-idf                  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c
index 3c0070ae6f..c6c2a748a9 100644
--- a/ports/espressif/common-hal/mdns/Server.c
+++ b/ports/espressif/common-hal/mdns/Server.c
@@ -90,6 +90,10 @@ const char *common_hal_mdns_server_get_hostname(mdns_server_obj_t *self) {
 
 void common_hal_mdns_server_set_hostname(mdns_server_obj_t *self, const char *hostname) {
     mdns_hostname_set(hostname);
+    // Wait for the mdns task to set the new hostname.
+    while (!mdns_hostname_exists(hostname)) {
+        RUN_BACKGROUND_TASKS;
+    }
     self->hostname = hostname;
 }
 
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 171e5af9c5..0180c0cb80 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 171e5af9c5b9b126c5f81f217c7b1ff931d54863
+Subproject commit 0180c0cb80f052919badc15df164e8edde6344ad

From c2a8ef752c4d3401ce688445c4915a2fdea49659 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 15 Jul 2022 14:01:50 -0700
Subject: [PATCH 0635/2403] Remove ps2io to make space

---
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk | 2 ++
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index e1e9be782c..39804bad26 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -15,3 +15,5 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_PS2IO = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index 81b6eb1edc..db7ccf9337 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -16,3 +16,5 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_PS2IO = 0

From d39236b114732610c669ffd0ba90724e3066d681 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 14 Jul 2022 20:24:09 +0000
Subject: [PATCH 0636/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (995 of 995 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 7e6fce911f..5acd4e4e0f 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: 2022-07-12 13:10+0000\n"
+"PO-Revision-Date: 2022-07-15 21:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -2273,7 +2273,7 @@ msgstr "Formato não suportado"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Sem compatibilidade com o algoritmo de hash"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -3860,7 +3860,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "pressionando o botão SW38 na inicialização.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h

From a46a44db26cd9e8b73b95cb1f498139ace19f769 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 15 Jul 2022 16:25:57 -0500
Subject: [PATCH 0637/2403] adding edit page

---
 .../shared/web_workflow/static/directory.html |  2 +-
 .../shared/web_workflow/static/edit.html      | 40 +++++++++
 supervisor/shared/web_workflow/static/edit.js | 90 +++++++++++++++++++
 supervisor/shared/web_workflow/web_workflow.c |  4 +
 4 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 supervisor/shared/web_workflow/static/edit.html
 create mode 100644 supervisor/shared/web_workflow/static/edit.js

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index d0ca1a3b32..7eeff1542e 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -8,7 +8,7 @@
 
     
     
    
     
-    
+    
     
diff --git a/supervisor/shared/web_workflow/static/edit.html b/supervisor/shared/web_workflow/static/edit.html
new file mode 100644
index 0000000000..417cebbed0
--- /dev/null
+++ b/supervisor/shared/web_workflow/static/edit.html
@@ -0,0 +1,40 @@
+
+
+
+    
+    Code Edit
+    
+    
+    
+    
+    
+
+
+
+
+
+
+
    Loading
    
+
    
+
+
+
+
diff --git a/supervisor/shared/web_workflow/static/edit.js b/supervisor/shared/web_workflow/static/edit.js
new file mode 100644
index 0000000000..a3f8a7d5a9
--- /dev/null
+++ b/supervisor/shared/web_workflow/static/edit.js
@@ -0,0 +1,90 @@
+let editor;
+require(["ace/ace", "ace/ext/settings_menu"], function (ace) {
+    editor = ace.edit("code_textarea");
+    ace.config.set('basePath', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.6.0/');
+    console.log("after create editor");
+    console.log(editor);
+
+    editor.session.setMode("ace/mode/python");
+    ace.require('ace/ext/settings_menu').init(editor);
+    editor.commands.addCommands([{
+        name: "showSettingsMenu",
+        bindKey: {win: "Ctrl-e", mac: "Ctrl-e"},
+        exec: function (editor) {
+            console.log("ctrl-e")
+            editor.showSettingsMenu();
+        },
+        readOnly: true
+    }, {
+        name: "infoDocsSearch",
+        bindKey: {win: "Ctrl-i", mac: "Ctrl-i"},
+        exec: function (editor) {
+            window.open(`https://docs.circuitpython.org/en/latest/search.html?q=${editor.getSelectedText()}`, '_blank');
+        },
+        readOnly: true
+    },{
+        name: 'Save',
+        bindKey: {win: 'Ctrl-S', mac: 'Command-S'},
+        exec: function (editor) {
+            console.log("ctrl-s save");
+            save();
+
+        }
+    },{
+        name: "replaceCtrlR",
+        bindKey: {win: "Ctrl-r", mac: "Ctrl-r"},
+        exec: function (editor_arg) {
+            console.log("override ctrl r");
+            editor.execCommand('replace');
+            console.log(editor);
+        },
+        readOnly: true
+    }]);
+
+
+});
+
+let filename = location.hash.substring(1);
+let $output_text = document.querySelector("#output_text");
+/*let $code_text = document.querySelector("#code_textarea");*/
+
+fetch(`/fs/${filename}`)
+    .then(function (response) {
+        $output_text.innerText = `Loading Status: ${response.status}`;
+        return response.status === 200 ? response.text() : "";
+    })
+    .then(function (data) {
+        editor.setValue(data, -1)
+    });
+
+function save() {
+    $output_text.innerText = "Saving..."
+    const requestOptions = {
+        method: 'PUT',
+        body: editor.getValue()
+    };
+    fetch(`/fs/${filename}`, requestOptions)
+        .then(function (response) {
+            $output_text.innerText = `Saving Status: ${response.status}`;
+            return response.text();
+        })
+        .then(function (data) {
+            console.log("after fetch: " + data);
+        });
+}
+
+document.querySelector("#save_btn").onclick = function () {
+    console.log("Click Save!");
+    save();
+}
+document.querySelector("#docs_btn").onclick = function () {
+    window.open(`https://docs.circuitpython.org/en/latest/search.html?q=${editor.getSelectedText()}`, '_blank');
+}
+
+document.querySelector("#undo_btn").onclick = function () {
+    editor.undo();
+}
+
+document.querySelector("#redo_btn").onclick = function () {
+    editor.redo();
+}
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 6cf765b8f9..5eeb49a570 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -839,6 +839,8 @@ STATIC_FILE(directory_html);
 STATIC_FILE(directory_js);
 STATIC_FILE(welcome_html);
 STATIC_FILE(welcome_js);
+STATIC_FILE(edit_html);
+STATIC_FILE(edit_js);
 STATIC_FILE(serial_html);
 STATIC_FILE(serial_js);
 STATIC_FILE(blinka_16x16_ico);
@@ -1047,6 +1049,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             _REPLY_STATIC(socket, request, welcome_js);
         } else if (strcmp(request->path, "/serial.js") == 0) {
             _REPLY_STATIC(socket, request, serial_js);
+        } else if (strcmp(request->path, "/edit.js") == 0) {
+            _REPLY_STATIC(socket, request, edit_js);
         } else if (strcmp(request->path, "/favicon.ico") == 0) {
             // TODO: Autogenerate this based on the blinka bitmap and change the
             // palette based on MAC address.

From 78b4159448c6ec54da110eb3ddf380847def650e Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 13 Jul 2022 16:51:01 -0700
Subject: [PATCH 0638/2403] Allow for dynamic reconfigure including port

---
 docs/environment.rst                          |  4 +
 docs/workflows.md                             |  4 +-
 ports/espressif/common-hal/mdns/Server.c      |  6 +-
 shared-bindings/mdns/Server.c                 |  3 +
 .../shared/web_workflow/static/welcome.js     |  2 +-
 supervisor/shared/web_workflow/web_workflow.c | 93 +++++++++++++------
 6 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/docs/environment.rst b/docs/environment.rst
index 4d12009848..b1619f37bf 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -39,6 +39,10 @@ CIRCUITPY_WEB_API_PASSWORD
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 Password required to make modifications to the board from the Web Workflow.
 
+CIRCUITPY_WEB_API_PORT
+~~~~~~~~~~~~~~~~~~~~~~
+TCP port number used for the web HTTP API. Defaults to 80 when omitted.
+
 CIRCUITPY_WIFI_PASSWORD
 ~~~~~~~~~~~~~~~~~~~~~~~
 Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID.
diff --git a/docs/workflows.md b/docs/workflows.md
index 2196d1111a..8530269534 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -72,7 +72,7 @@ Read-only characteristic that returns the UTF-8 encoded version string.
 The web workflow is depends on adding Wi-Fi credentials into the `/.env` file. The keys are
 `CIRCUITPY_WIFI_SSID` and `CIRCUITPY_WIFI_PASSWORD`. Once these are defined, CircuitPython will
 automatically connect to the network and start the webserver used for the workflow. The webserver
-is on port 80. It also enables MDNS.
+is on port 80 unless overridden by `CIRCUITPY_WEB_API_PORT`. It also enables MDNS.
 
 Here is an example `/.env`:
 
@@ -83,6 +83,8 @@ CIRCUITPY_WIFI_PASSWORD='secretpassword'
 
 # To enable modifying files from the web. Change this too!
 CIRCUITPY_WEB_API_PASSWORD='passw0rd'
+
+CIRCUITPY_WEB_API_PORT=80
 ```
 
 MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a device specific
diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c
index c6c2a748a9..d657a84eb7 100644
--- a/ports/espressif/common-hal/mdns/Server.c
+++ b/ports/espressif/common-hal/mdns/Server.c
@@ -204,5 +204,9 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic
 }
 
 void common_hal_mdns_server_advertise_service(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_int_t port) {
-    mdns_service_add(NULL, service_type, protocol, port, NULL, 0);
+    if (mdns_service_exists(service_type, protocol, NULL)) {
+        mdns_service_port_set(service_type, protocol, port);
+    } else {
+        mdns_service_add(NULL, service_type, protocol, port, NULL, 0);
+    }
 }
diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index 97574ff0e2..e11c1c4730 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -161,6 +161,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 //|     def advertise_service(self, *,  service_type: str, protocol: str, port: int) -> None:
 //|         """Respond to queries for the given service with the given port.
 //|
+//|         service_type and protocol can only occur on one port. Any call after the first will
+//|         update the entry's port.
+//|
 //|         :param str service_type: The service type such as "_http"
 //|         :param str protocol: The service protocol such as "_tcp"
 //|         :param int port: The port used by the service"""
diff --git a/supervisor/shared/web_workflow/static/welcome.js b/supervisor/shared/web_workflow/static/welcome.js
index 79efb7e9a8..d53950d37c 100644
--- a/supervisor/shared/web_workflow/static/welcome.js
+++ b/supervisor/shared/web_workflow/static/welcome.js
@@ -44,7 +44,7 @@ async function find_devices() {
         li.appendChild(a);
         var port = "";
         if (device.port != 80) {
-            port = ":" + version_info.port;
+            port = ":" + device.port;
         }
         var server;
         if (mdns_works) {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 81730c92d0..c586b9e24b 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -98,6 +98,7 @@ typedef struct {
 static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE;
 
 static mdns_server_obj_t mdns;
+static uint32_t web_api_port = 80;
 
 static socketpool_socketpool_obj_t pool;
 static socketpool_socket_obj_t listening;
@@ -189,6 +190,9 @@ void supervisor_web_workflow_status(void) {
             }
 
             mp_printf(&mp_plat_print, "%s", _our_ip_encoded);
+            if (web_api_port != 80) {
+                mp_printf(&mp_plat_print, ":%d", web_api_port);
+            }
             // TODO: Use these unicode to show signal strength: ▂▄▆█
         }
     } else {
@@ -199,11 +203,6 @@ void supervisor_web_workflow_status(void) {
 void supervisor_start_web_workflow(void) {
     #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI
 
-    if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj) &&
-        wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj) != 0) {
-        // Already started.
-        return;
-    }
 
     char ssid[33];
     char password[64];
@@ -218,8 +217,10 @@ void supervisor_start_web_workflow(void) {
         password_len <= 0 || (size_t)password_len >= sizeof(password)) {
         return;
     }
-    common_hal_wifi_init(false);
-    common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
+    if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+        common_hal_wifi_init(false);
+        common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
+    }
 
     // TODO: Do our own scan so that we can find the channel we want before calling connect.
     // Otherwise, connect will do a full slow scan to pick the best AP.
@@ -227,6 +228,9 @@ void supervisor_start_web_workflow(void) {
     // NUL terminate the strings because dotenv doesn't.
     ssid[ssid_len] = '\0';
     password[password_len] = '\0';
+    // We can all connect again because it will return early if we're already connected to the
+    // network. If we are connected to a different network, then it will disconnect before
+    // attempting to connect to the given network.
     wifi_status = common_hal_wifi_radio_connect(
         &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len,
         0, 0.1, NULL, 0);
@@ -236,21 +240,46 @@ void supervisor_start_web_workflow(void) {
         return;
     }
 
-    mdns_server_construct(&mdns, true);
-    common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
-    common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", 80);
+    char port_encoded[6];
+    size_t port_len = 0;
+    size_t new_port = web_api_port;
+    #if CIRCUITPY_DOTENV
+    port_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PORT", port_encoded, sizeof(port_encoded) - 1);
+    #endif
+    if (0 < port_len && port_len < sizeof(port_encoded)) {
+        new_port = strtoul(port_encoded, NULL, 10);
+    }
 
-    pool.base.type = &socketpool_socketpool_type;
-    common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj);
+    bool first_start = mdns.base.type != &mdns_server_type;
+    bool port_changed = new_port != web_api_port;
 
-    ESP_LOGI(TAG, "Starting web workflow");
-    listening.base.type = &socketpool_socket_type;
-    socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
-    common_hal_socketpool_socket_settimeout(&listening, 0);
-    // Bind to any ip.
-    // TODO: Make this port .env configurable.
-    common_hal_socketpool_socket_bind(&listening, "", 0, 80);
-    common_hal_socketpool_socket_listen(&listening, 1);
+    if (first_start) {
+        ESP_LOGI(TAG, "Starting web workflow");
+        mdns_server_construct(&mdns, true);
+        mdns.base.type = &mdns_server_type;
+        common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
+        pool.base.type = &socketpool_socketpool_type;
+        common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj);
+
+        listening.base.type = &socketpool_socket_type;
+        active.base.type = &socketpool_socket_type;
+        active.num = -1;
+        active.connected = false;
+
+        websocket_init();
+    }
+    if (port_changed) {
+        common_hal_socketpool_socket_close(&listening);
+    }
+    if (first_start || port_changed) {
+        web_api_port = new_port;
+        common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
+        socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
+        common_hal_socketpool_socket_settimeout(&listening, 0);
+        // Bind to any ip.
+        common_hal_socketpool_socket_bind(&listening, "", 0, web_api_port);
+        common_hal_socketpool_socket_listen(&listening, 1);
+    }
 
     mp_int_t api_password_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, sizeof(_api_password) - 2);
     if (api_password_len > 0) {
@@ -259,12 +288,6 @@ void supervisor_start_web_workflow(void) {
         _base64_in_place(_api_password, api_password_len + 1, sizeof(_api_password));
     }
 
-    active.base.type = &socketpool_socket_type;
-    active.num = -1;
-    active.connected = false;
-
-    websocket_init();
-
     // TODO:
     // GET /cp/serial.txt
     //   - Most recent 1k of serial output.
@@ -529,7 +552,13 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
         _send_str(socket, "http");
     }
 
-    _send_strs(socket, "://", hostname, ".local", path, "\r\n", NULL);
+    _send_strs(socket, "://", hostname, ".local", NULL);
+    if (web_api_port != 80) {
+        char encoded_port[6];
+        snprintf(encoded_port, sizeof(encoded_port), "%d", web_api_port);
+        _send_strs(socket, ":", encoded_port, NULL);
+    }
+    _send_strs(socket, path, "\r\n", NULL);
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
 }
@@ -647,7 +676,7 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *
         }
         const char *hostname = common_hal_mdns_remoteservice_get_hostname(&found_devices[i]);
         const char *instance_name = common_hal_mdns_remoteservice_get_instance_name(&found_devices[i]);
-        char port_encoded[4];
+        char port_encoded[6];
         int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]);
         snprintf(port_encoded, sizeof(port_encoded), "%d", port);
         char ip_encoded[4 * 4];
@@ -675,6 +704,8 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     char encoded_creation_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0
     snprintf(encoded_creation_id, sizeof(encoded_creation_id), "%u", CIRCUITPY_CREATION_ID);
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
+    char encoded_port[6];
+    snprintf(encoded_port, sizeof(encoded_port), "%d", web_api_port);
     _send_chunks(socket,
         "{\"web_api_version\": 1, ",
         "\"version\": \"", MICROPY_GIT_TAG, "\", ",
@@ -685,7 +716,7 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
         "\"creator_id\": ", encoded_creator_id, ", ",
         "\"creation_id\": ", encoded_creation_id, ", ",
         "\"hostname\": \"", hostname, "\", ",
-        "\"port\": 80, ",
+        "\"port\": ", encoded_port, ", ",
         "\"ip\": \"", _our_ip_encoded,
         "\"}", NULL);
     // Empty chunk signals the end of the response.
@@ -1173,7 +1204,9 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                         request->authenticated = memcmp(request->header_value, prefix, strlen(prefix)) == 0 &&
                             strcmp(_api_password, request->header_value + strlen(prefix)) == 0;
                     } else if (strcmp(request->header_key, "Host") == 0) {
-                        request->redirect = strcmp(request->header_value, "circuitpython.local") == 0;
+                        // Do a prefix check so that port is ignored.
+                        const char *cp_local = "circuitpython.local";
+                        request->redirect = memcmp(request->header_value, cp_local, strlen(cp_local)) == 0;
                     } else if (strcmp(request->header_key, "Content-Length") == 0) {
                         request->content_length = strtoul(request->header_value, NULL, 10);
                     } else if (strcmp(request->header_key, "Expect") == 0) {

From 584e27139e3d7e1e97ace249aba96c7ab9453123 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 15 Jul 2022 19:49:03 -0500
Subject: [PATCH 0639/2403] add back /edit/ handler and specify ES6 quote chars
 for jsmin

---
 supervisor/shared/web_workflow/static/edit.js |  2 --
 supervisor/shared/web_workflow/web_workflow.c | 10 ++++++++++
 tools/gen_web_workflow_static.py              |  4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/edit.js b/supervisor/shared/web_workflow/static/edit.js
index a3f8a7d5a9..11d569abe2 100644
--- a/supervisor/shared/web_workflow/static/edit.js
+++ b/supervisor/shared/web_workflow/static/edit.js
@@ -40,8 +40,6 @@ require(["ace/ace", "ace/ext/settings_menu"], function (ace) {
         },
         readOnly: true
     }]);
-
-
 });
 
 let filename = location.hash.substring(1);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 5eeb49a570..c7f30f8bf6 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1013,6 +1013,16 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 }
             }
         }
+    } else if (strcmp(request->path, "/edit/") == 0) {
+        if (!request->authenticated) {
+            if (_api_password[0] != '\0') {
+                _reply_unauthorized(socket, request);
+            } else {
+                _reply_forbidden(socket, request);
+            }
+        } else {
+            _REPLY_STATIC(socket, request, edit_html);
+        }
     } else if (memcmp(request->path, "/cp/", 4) == 0) {
         const char *path = request->path + 3;
         if (strcmp(request->method, "GET") != 0) {
diff --git a/tools/gen_web_workflow_static.py b/tools/gen_web_workflow_static.py
index b8c5baf619..172a80dac0 100644
--- a/tools/gen_web_workflow_static.py
+++ b/tools/gen_web_workflow_static.py
@@ -29,7 +29,9 @@ for f in args.files:
     if f.name.endswith(".html"):
         uncompressed = minify_html.minify(uncompressed.decode("utf-8")).encode("utf-8")
     elif f.name.endswith(".js"):
-        uncompressed = jsmin.jsmin(uncompressed.decode("utf-8")).encode("utf-8")
+        uncompressed = jsmin.jsmin(uncompressed.decode("utf-8"), quote_chars="'\"`").encode(
+            "utf-8"
+        )
     compressed = gzip.compress(uncompressed)
     clen = len(compressed)
     compressed = ", ".join([hex(x) for x in compressed])

From 541e448100bd9c892a55b43b377cdf083a15cfd2 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 15 Jul 2022 19:56:29 -0500
Subject: [PATCH 0640/2403] set the href for edit links in the directory list

---
 supervisor/shared/web_workflow/static/directory.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index b2b76648c2..9dbe8384d6 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -91,6 +91,9 @@ async function refresh_list() {
         delete_button.disabled = !editable;
         delete_button.onclick = del;
 
+        let edit_url = new URL("/edit/#" + f.name, url_base);
+        let edit_link = clone.querySelector(".edit_link");
+        edit_link.href = edit_url
 
         new_children.push(clone);
     }

From 868a03ff57980cd2143e1035298fd586417993b5 Mon Sep 17 00:00:00 2001
From: Aria Burrell 
Date: Sun, 17 Jul 2022 04:50:50 -0600
Subject: [PATCH 0641/2403] Fixed empty characteristic issue with bleio+nimble.

- Based on espressif/nimble's blecent example code. Confirms that the characteristic is not empty before trying to catalogue its descriptors.
- Running ble_gattc_disc_all_dscs on empty (no length) characteristics fails with the (not-very-informative) BLE_HS_EINVAL error if this check is not performed.
---
 ports/espressif/common-hal/_bleio/Connection.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/espressif/common-hal/_bleio/Connection.c b/ports/espressif/common-hal/_bleio/Connection.c
index 7dbcbd6e5f..63c85099e6 100644
--- a/ports/espressif/common-hal/_bleio/Connection.c
+++ b/ports/espressif/common-hal/_bleio/Connection.c
@@ -394,6 +394,11 @@ STATIC void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t
                 ? service->end_handle
                 : next_characteristic->def_handle - 1;
 
+            // Pre-check if characteristic is empty so descriptor discovery doesn't fail
+            if (end_handle <= characteristic->handle) {
+                continue;
+            }
+
             _last_discovery_status = BLE_ERR_SUCCESS;
             CHECK_NIMBLE_ERROR(ble_gattc_disc_all_dscs(self->conn_handle, characteristic->handle,
                 end_handle,

From 71c22232f01261954c05be0236a66c66eae6ff48 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Sun, 17 Jul 2022 11:48:45 -0700
Subject: [PATCH 0642/2403] board config compelted

---
 .../boards/beetle-esp32-c3/README.md          |  0
 .../espressif/boards/beetle-esp32-c3/board.c  | 47 +++++++++++++
 .../boards/beetle-esp32-c3/mpconfigboard.h    | 47 +++++++++++++
 .../boards/beetle-esp32-c3/mpconfigboard.mk   | 11 ++++
 ports/espressif/boards/beetle-esp32-c3/pins.c | 66 +++++++++++++++++++
 .../boards/beetle-esp32-c3/sdkconfig          |  7 ++
 tools/build_board_info.py                     |  1 +
 7 files changed, 179 insertions(+)
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/README.md
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/board.c
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/pins.c
 create mode 100644 ports/espressif/boards/beetle-esp32-c3/sdkconfig

diff --git a/ports/espressif/boards/beetle-esp32-c3/README.md b/ports/espressif/boards/beetle-esp32-c3/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/espressif/boards/beetle-esp32-c3/board.c b/ports/espressif/boards/beetle-esp32-c3/board.c
new file mode 100644
index 0000000000..8bca964dc7
--- /dev/null
+++ b/ports/espressif/boards/beetle-esp32-c3/board.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
+
+#include "components/driver/include/driver/gpio.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
new file mode 100644
index 0000000000..3db8a44463
--- /dev/null
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+// Board setup
+
+#define MICROPY_HW_BOARD_NAME       "DFRobot Beetle ESP32-C3"
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
+
+// Status LED
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO10)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO9, .sda = &pin_GPIO8}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO4, .mosi = &pin_GPIO6, .miso = &pin_GPIO5}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
new file mode 100644
index 0000000000..371b6c570c
--- /dev/null
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -0,0 +1,11 @@
+# TODO
+CIRCUITPY_CREATOR_ID =  0x19881988
+CIRCUITPY_CREATION_ID = 0x00C30001
+
+IDF_TARGET = esp32c3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/beetle-esp32-c3/pins.c b/ports/espressif/boards/beetle-esp32-c3/pins.c
new file mode 100644
index 0000000000..f9060cc306
--- /dev/null
+++ b/ports/espressif/boards/beetle-esp32-c3/pins.c
@@ -0,0 +1,66 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },     // ADC1_0
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // ADC1_1
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // ADC1_2
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    // Pad on Board
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // ADC1_3
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // ADC1_4, JTAG MTMS
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // JTAG MTDI
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // JTAG MTCK
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // JTAG MTDO
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/beetle-esp32-c3/sdkconfig b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
new file mode 100644
index 0000000000..129c537108
--- /dev/null
+++ b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
@@ -0,0 +1,7 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="beetle-esp32-c3
+# end of LWIP
+
+
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index d73f0e3f1c..fc5a8bb09b 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -75,6 +75,7 @@ extension_by_board = {
     "adafruit_qtpy_esp32c3": BIN,
     "ai_thinker_esp32-c3s": BIN,
     "ai_thinker_esp32-c3s-2m": BIN,
+    "beetle-esp32-c3": BIN,
     "espressif_esp32c3_devkitm_1_n4": BIN,
     "lilygo_ttgo_t-01c3": BIN,
     "lolin_c3_mini": BIN,

From 1e99d68af7cdde92e65cab55e7b61c8aa9ee24e2 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Sun, 17 Jul 2022 12:38:27 -0700
Subject: [PATCH 0643/2403] Add Creator ID

---
 ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
index 371b6c570c..c76ee76120 100644
--- a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -1,5 +1,5 @@
 # TODO
-CIRCUITPY_CREATOR_ID =  0x19881988
+CIRCUITPY_CREATOR_ID =  0x10101010
 CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3

From 51f2253cef5bbd0f856eeadd03b04504b288f81a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 19 Jul 2022 14:07:18 -0400
Subject: [PATCH 0644/2403] no Russian font for SAMD21; adjust unix build
 warnings

---
 ports/atmel-samd/mpconfigport.mk | 9 ++-------
 ports/unix/Makefile              | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 66ebb54a6b..3ea6c44049 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -61,17 +61,12 @@ endif
 
 MICROPY_PY_ASYNC_AWAIT = 0
 
-# We don't have room for the fonts for terminalio for ja and ko
+# We don't have room for the fonts for terminalio for certain languages,
 # so turn off terminalio, and if it's off and displayio is on,
 # force a clean build.
 # Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
 # ifeq, because it's not set yet.
-ifeq ($(TRANSLATION), ja)
-CIRCUITPY_TERMINALIO = 0
-RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
-endif
-
-ifeq ($(TRANSLATION), ko)
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
 CIRCUITPY_TERMINALIO = 0
 RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
 endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index ae293fcb7d..c0d2bdfc63 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -37,8 +37,8 @@ INC += -I$(BUILD)
 
 # compiler settings
 CWARN = -Wall -Werror
-CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
-CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
+CWARN += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
+CFLAGS += $(INC) $(CWARN) -std=gnu11 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG

From 1cdf325c96e36084f706adacbd650f25848c8fbf Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 19 Jul 2022 16:35:23 -0400
Subject: [PATCH 0645/2403] shrink Feather ESP32S3 TFT

---
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index b3c68b3b62..afc76833e0 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_MODULE=wroom
+CIRCUITPY_PS2IO = 0

From e8776440120cbdc89872f758b9f67029bda8a6fc Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 19 Jul 2022 17:45:29 -0400
Subject: [PATCH 0646/2403] use -Os on Feather ESP32-S3 TFT to shrink build

---
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index db7ccf9337..dcbd2f9c7a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_PS2IO = 0
+OPTIMIZATION_FLAGS = -Os

From 6a2ba173624905a6116ebb7da4b21bea77fdb00f Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Tue, 19 Jul 2022 05:05:46 +0000
Subject: [PATCH 0647/2403] Translated using Weblate (French)

Currently translated at 99.5% (991 of 995 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index 926aa94e6e..b63967b2ff 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-06 05:15+0000\n"
+"PO-Revision-Date: 2022-07-19 23:15+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -2291,7 +2291,7 @@ msgstr "Format non supporté"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Algorithme de hachage non supporté"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2459,7 +2459,7 @@ msgstr "la taille de la matrice et de l'index doivent être égaux"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "la tableau à trop de dimensions"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2840,7 +2840,7 @@ msgstr "les arguments convolve ne doivent pas être vides"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "fichier corrompu"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2938,7 +2938,7 @@ msgstr "vide"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "fichier vide"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3261,7 +3261,7 @@ msgstr "la matrice d'entrée est singulière"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "l'entrée doit être 1D ou 2D"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3479,7 +3479,7 @@ msgstr "max_length doit être 0-%d lorsque fixed_length est %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "le nombre maximal de dimensions est "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3883,7 +3883,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "presser le bouton SW38 au démarrage.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -4327,11 +4327,11 @@ msgstr "types non supportés pour %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols est trop grand"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "le mot-clé \"usecols\" doit être spécifié"
 
 #: py/objint.c
 #, c-format
@@ -4376,7 +4376,7 @@ msgstr "axe incorrecte spécifiée"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "dtype invalide"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4394,7 +4394,7 @@ msgstr "mauvaise taille du tableau de condition"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "mauvaise longueur du tableau d'indices"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From 7b3ac1ce6552ec459488d964f4f1f489799e5dee Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 20 Jul 2022 01:15:35 +0200
Subject: [PATCH 0648/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index c3482857bc..457615d505 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -211,6 +211,10 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/cs.po b/locale/cs.po
index 008d3e6203..9c042c6c51 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -212,6 +212,10 @@ msgstr "%q() vyžaduje %d pozičních argumentů, ale %d jich bylo zadáno"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, a %q musí mít všechny shodnou délku"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 94769061c0..8f46245988 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -214,6 +214,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/el.po b/locale/el.po
index c1054162a9..e7abd4d7ff 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index c474977fcc..f3b8bedb75 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -215,6 +215,10 @@ msgstr "%q() takes %d positional arguments but %d were given"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, and %q must all be the same length"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/es.po b/locale/es.po
index e291b95406..3652d1847e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -214,6 +214,10 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/fil.po b/locale/fil.po
index f612547e04..4cf9806fa3 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -208,6 +208,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/fr.po b/locale/fr.po
index b63967b2ff..8cf8e5cb77 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -217,6 +217,10 @@ msgstr "%q() prend %d paramètres positionnels mais %d ont été donnés"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, et %q doivent tous être de la même longueur"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/hi.po b/locale/hi.po
index 8037a1fc2b..aea67d4580 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 28c9c90ff6..e418f789f9 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -213,6 +213,10 @@ msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/ja.po b/locale/ja.po
index b19bd4d049..7fb9268a9d 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -210,6 +210,10 @@ msgstr "%q() は %d 個の位置引数を取りますが、%d 個与えられま
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/ko.po b/locale/ko.po
index 74fb1a09b7..fce40622bd 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -206,6 +206,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/nl.po b/locale/nl.po
index 61a6a09dfe..55b10b872a 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -208,6 +208,10 @@ msgstr "%q() verwacht %d positionele argumenten maar kreeg %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/pl.po b/locale/pl.po
index ed311e97c4..3041284599 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -210,6 +210,10 @@ msgstr "%q() bierze %d argumentów pozycyjnych, lecz podano %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 5acd4e4e0f..5d9c4517ec 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -214,6 +214,10 @@ msgstr "%q() recebe %d argumentos posicionais, porém %d foram informados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/ru.po b/locale/ru.po
index 1206fdbc20..e993d00aec 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -213,6 +213,10 @@ msgstr "%q() принимает %d позиционных аргументов,
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, и %q должны быть одной длинны"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/sv.po b/locale/sv.po
index af46f6e8bb..4a53d9bcda 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -213,6 +213,10 @@ msgstr "% q() tar %d positionsargument men %d gavs"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q och %q måste vara lika långa"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/tr.po b/locale/tr.po
index 09c8cc9e18..a2d8d41ea7 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -217,6 +217,10 @@ msgstr "%q(), %d konumsal argümanını alır ancak %d verildi"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 8f6a570e2d..5985e012b0 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -216,6 +216,10 @@ msgstr "%q() yāoqiú shūrù %d gè wèizhì cānshù, dàn mùqián shūrù le
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

From 21af8f42ccd57f183b66807b6013c54040358f0a Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 11:11:49 -0500
Subject: [PATCH 0649/2403] Create board.c

---
 .../boards/bwshockley_figpi/board.c           | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 ports/raspberrypi/boards/bwshockley_figpi/board.c

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/board.c b/ports/raspberrypi/boards/bwshockley_figpi/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/bwshockley_figpi/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}

From d2865764ca23b170f06f5fbb5bf60354562d4a24 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 12:12:31 -0500
Subject: [PATCH 0650/2403] Create mpconfigboard.h

Added file.
---
 .../boards/bwshockley_figpi/mpconfigboard.h       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
new file mode 100644
index 0000000000..1efb990d03
--- /dev/null
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
@@ -0,0 +1,15 @@
+#define MICROPY_HW_BOARD_NAME "Fig Pi"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO13)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO1)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO17, .sda = &pin_GPIO16}, \
+                                     {.scl = &pin_GPIO19, .sda = &pin_GPIO18}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO6, .mosi = &pin_GPIO7, .miso = &pin_GPIO4}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO28, .rx = &pin_GPIO29}}

From 3647cfa4247ad866aea63a7daa6f12d67e458f5b Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 12:17:39 -0500
Subject: [PATCH 0651/2403] Create mpconfigboard.mk

---
 .../raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
new file mode 100644
index 0000000000..95bd9715d6
--- /dev/null
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x2019
+USB_PID = 0x7103
+USB_PRODUCT = "Fig Pi"
+USB_MANUFACTURER = "Benjamin Shockley"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"

From 3861a97f38fa4f4b7842985fe6fbe53a97cde1e9 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 12:18:22 -0500
Subject: [PATCH 0652/2403] Create pico-sdk-configboard.h

---
 .../boards/bwshockley_figpi/pico-sdk-configboard.h            | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 ports/raspberrypi/boards/bwshockley_figpi/pico-sdk-configboard.h

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pico-sdk-configboard.h b/ports/raspberrypi/boards/bwshockley_figpi/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/bwshockley_figpi/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64

From d01b65dd329a43f449d5b6739fe3160bedede1b5 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 12:35:08 -0500
Subject: [PATCH 0653/2403] Create pins.c

---
 .../boards/bwshockley_figpi/pins.c            | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 ports/raspberrypi/boards/bwshockley_figpi/pins.c

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pins.c b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
new file mode 100644
index 0000000000..1e2b0264e2
--- /dev/null
+++ b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
@@ -0,0 +1,62 @@
+#include "shared-bindings/board/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO7) },
+  
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO19) },
+
+    { 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_STEMMA_I2C), MP_ROM_PTR(&board_stemma_i2c_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From e9eeaf2096b8dc841a3256384dba0cfc25964035 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 12:35:40 -0500
Subject: [PATCH 0654/2403] Update mpconfigboard.h

Moved UART to pins 24/25.
---
 ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
index 1efb990d03..fbd03379dd 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
@@ -12,4 +12,4 @@
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO6, .mosi = &pin_GPIO7, .miso = &pin_GPIO4}}
 
 #define CIRCUITPY_BOARD_UART        (1)
-#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO28, .rx = &pin_GPIO29}}
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO24, .rx = &pin_GPIO25}}

From dc686545c2ec90bf3c9fdf99d90c114982baf379 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Wed, 20 Jul 2022 15:40:43 -0500
Subject: [PATCH 0655/2403] Update pins.c

Minor whitespace change.
---
 ports/raspberrypi/boards/bwshockley_figpi/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pins.c b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
index 1e2b0264e2..1bec6fd91b 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/pins.c
+++ b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
@@ -37,7 +37,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO7) },
-  
+
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO23) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO22) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO5) },

From 01f6051bc461fb41985f4dfc7f0c9da6c287782a Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 20 Jul 2022 20:05:56 +0000
Subject: [PATCH 0656/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (996 of 996 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 4a53d9bcda..8c60691712 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: 2022-07-14 18:05+0000\n"
+"PO-Revision-Date: 2022-07-21 20:15+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -215,7 +215,7 @@ msgstr "%q, %q och %q måste vara lika långa"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format

From ae6c0e347c22763ccfcc3d0420b997069918ad39 Mon Sep 17 00:00:00 2001
From: ViktorWiz 
Date: Fri, 22 Jul 2022 17:31:58 +0900
Subject: [PATCH 0657/2403] Add WIZNet W5500-EVB-Pico

---
 .../boards/wiznet_w5500_evb_pico/board.c      | 40 ++++++++++++++
 .../wiznet_w5500_evb_pico/mpconfigboard.h     |  9 ++++
 .../wiznet_w5500_evb_pico/mpconfigboard.mk    | 11 ++++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/wiznet_w5500_evb_pico/pins.c       | 54 +++++++++++++++++++
 5 files changed, 115 insertions(+)
 create mode 100644 ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
 create mode 100644 ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/wiznet_w5500_evb_pico/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c

diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.h b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.h
new file mode 100644
index 0000000000..00faa83742
--- /dev/null
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.h
@@ -0,0 +1,9 @@
+#define MICROPY_HW_BOARD_NAME "W5500-EVB-Pico"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.mk b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.mk
new file mode 100644
index 0000000000..3789a76e0b
--- /dev/null
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x2E8A
+USB_PID = 0x1029
+USB_PRODUCT = "W5500-EVB-Pico"
+USB_MANUFACTURER = "WIZnet"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pico-sdk-configboard.h b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c
new file mode 100644
index 0000000000..87ff27fa46
--- /dev/null
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c
@@ -0,0 +1,54 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 955bcee1b3feddece875b1e891ecf6873d950154 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 23 Jul 2022 20:01:31 -0500
Subject: [PATCH 0658/2403] It's OK for an init program to be zero bytes long

Closes #6636
---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 1203f4abac..f8ced08177 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -247,7 +247,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n
         mp_raise_ValueError(translate("Program size invalid"));
     }
 
-    mp_arg_validate_length_range(init_bufinfo.len, 2, 64, MP_QSTR_init);
+    mp_arg_validate_length_range(init_bufinfo.len, 0, 64, MP_QSTR_init);
     if (init_bufinfo.len % 2 != 0) {
         mp_raise_ValueError(translate("Init program size invalid"));
     }

From 40cb0aac7c509f99d27457538947f34baea1e99e Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 5 Jul 2022 17:18:22 +0200
Subject: [PATCH 0659/2403] CORS preflight: allow OPTIONS without
 authentication check for 127.0.0.1 without a port specified

---
 supervisor/shared/web_workflow/web_workflow.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 81730c92d0..379b88fd18 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -356,6 +356,7 @@ static bool _origin_ok(const char *origin) {
     const char *http = "http://";
     const char *local = ".local";
 
+    // note: redirected requests send an Origin of "null" and will be caught by this
     if (memcmp(origin, http, strlen(http)) != 0) {
         return false;
     }
@@ -374,8 +375,11 @@ static bool _origin_ok(const char *origin) {
         return true;
     }
 
-    const char *localhost = "127.0.0.1:";
-    if (memcmp(origin + strlen(http), localhost, strlen(localhost)) == 0) {
+    // Port or no port
+    const char *localhost = "127.0.0.1";
+    const int locallen = 9;
+    if (memcmp(origin + strlen(http), localhost, locallen) == 0
+        && (localhost[locallen] == '\0' || localhost[locallen] == ':')) {
         return true;
     }
 
@@ -909,7 +913,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (memcmp(request->path, "/fs/", 4) == 0) {
-        if (!request->authenticated) {
+        // OPTIONS is sent for CORS preflight, unauthenticated
+        if (!request->authenticated && strcmp(request->method, "OPTIONS") != 0) {
             if (_api_password[0] != '\0') {
                 _reply_unauthorized(socket, request);
             } else {
@@ -1030,7 +1035,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         }
     } else if (memcmp(request->path, "/cp/", 4) == 0) {
         const char *path = request->path + 3;
-        if (strcmp(request->method, "GET") != 0) {
+        if (strcmp(request->method, "OPTIONS") == 0) {
+            // handle preflight requests to /cp/
+            _reply_access_control(socket, request);
+        } else if (strcmp(request->method, "GET") != 0) {
             _reply_method_not_allowed(socket, request);
         } else if (strcmp(path, "/devices.json") == 0) {
             _reply_with_devices_json(socket, request);

From 9a6c3884a73466d27a9909572c8d39ad9daec5f4 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 24 Jul 2022 10:07:41 +0200
Subject: [PATCH 0660/2403] do options unauthenticated first, fix testing
 localhost

---
 supervisor/shared/web_workflow/web_workflow.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 379b88fd18..eaa3e1800f 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -375,11 +375,10 @@ static bool _origin_ok(const char *origin) {
         return true;
     }
 
-    // Port or no port
     const char *localhost = "127.0.0.1";
-    const int locallen = 9;
-    if (memcmp(origin + strlen(http), localhost, locallen) == 0
-        && (localhost[locallen] == '\0' || localhost[locallen] == ':')) {
+    end = origin + strlen(http) + strlen(localhost);
+    if (memcmp(origin + strlen(http), localhost, strlen(localhost)) == 0
+        && (end[0] == '\0' || end[0] == ':')) {
         return true;
     }
 
@@ -913,8 +912,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (memcmp(request->path, "/fs/", 4) == 0) {
-        // OPTIONS is sent for CORS preflight, unauthenticated
-        if (!request->authenticated && strcmp(request->method, "OPTIONS") != 0) {
+        if (strcmp(request->method, "OPTIONS") == 0) {
+            // OPTIONS is sent for CORS preflight, unauthenticated
+            _reply_access_control(socket, request);
+        } else if (!request->authenticated) {
             if (_api_password[0] != '\0') {
                 _reply_unauthorized(socket, request);
             } else {
@@ -935,9 +936,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             }
             // Delete is almost identical for files and directories so share the
             // implementation.
-            if (strcmp(request->method, "OPTIONS") == 0) {
-                _reply_access_control(socket, request);
-            } else if (strcmp(request->method, "DELETE") == 0) {
+            if (strcmp(request->method, "DELETE") == 0) {
                 if (_usb_active()) {
                     _reply_conflict(socket, request);
                     return false;

From 6575598ae6fed99727c455b175cd068d3b27945f Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 24 Jul 2022 12:28:17 +0200
Subject: [PATCH 0661/2403] HTTP headers and methods are not case sensitive had
 the issue where Firefox would send "authorization" in lower case

---
 supervisor/shared/web_workflow/web_workflow.c | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index eaa3e1800f..11f00c125f 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -912,7 +912,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (memcmp(request->path, "/fs/", 4) == 0) {
-        if (strcmp(request->method, "OPTIONS") == 0) {
+        if (strcasecmp(request->method, "OPTIONS") == 0) {
             // OPTIONS is sent for CORS preflight, unauthenticated
             _reply_access_control(socket, request);
         } else if (!request->authenticated) {
@@ -936,7 +936,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             }
             // Delete is almost identical for files and directories so share the
             // implementation.
-            if (strcmp(request->method, "DELETE") == 0) {
+            if (strcasecmp(request->method, "DELETE") == 0) {
                 if (_usb_active()) {
                     _reply_conflict(socket, request);
                     return false;
@@ -966,7 +966,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     return true;
                 }
             } else if (directory) {
-                if (strcmp(request->method, "GET") == 0) {
+                if (strcasecmp(request->method, "GET") == 0) {
                     FF_DIR dir;
                     FRESULT res = f_opendir(fs, &dir, path);
                     // Put the / back for replies.
@@ -986,7 +986,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     }
 
                     f_closedir(&dir);
-                } else if (strcmp(request->method, "PUT") == 0) {
+                } else if (strcasecmp(request->method, "PUT") == 0) {
                     if (_usb_active()) {
                         _reply_conflict(socket, request);
                         return false;
@@ -1015,7 +1015,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     }
                 }
             } else { // Dealing with a file.
-                if (strcmp(request->method, "GET") == 0) {
+                if (strcasecmp(request->method, "GET") == 0) {
                     FIL active_file;
                     FRESULT result = f_open(fs, &active_file, path, FA_READ);
 
@@ -1026,7 +1026,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     }
 
                     f_close(&active_file);
-                } else if (strcmp(request->method, "PUT") == 0) {
+                } else if (strcasecmp(request->method, "PUT") == 0) {
                     _write_file_and_reply(socket, request, fs, path);
                     return true;
                 }
@@ -1034,10 +1034,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         }
     } else if (memcmp(request->path, "/cp/", 4) == 0) {
         const char *path = request->path + 3;
-        if (strcmp(request->method, "OPTIONS") == 0) {
+        if (strcasecmp(request->method, "OPTIONS") == 0) {
             // handle preflight requests to /cp/
             _reply_access_control(socket, request);
-        } else if (strcmp(request->method, "GET") != 0) {
+        } else if (strcasecmp(request->method, "GET") != 0) {
             _reply_method_not_allowed(socket, request);
         } else if (strcmp(path, "/devices.json") == 0) {
             _reply_with_devices_json(socket, request);
@@ -1058,7 +1058,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else {
             _reply_missing(socket, request);
         }
-    } else if (strcmp(request->method, "GET") != 0) {
+    } else if (strcasecmp(request->method, "GET") != 0) {
         _reply_method_not_allowed(socket, request);
     } else {
         if (strcmp(request->path, "/") == 0) {
@@ -1175,27 +1175,27 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                     request->header_value[request->offset - 1] = '\0';
                     request->offset = 0;
                     request->state = STATE_HEADER_KEY;
-                    if (strcmp(request->header_key, "Authorization") == 0) {
+                    if (strcasecmp(request->header_key, "Authorization") == 0) {
                         const char *prefix = "Basic ";
                         request->authenticated = memcmp(request->header_value, prefix, strlen(prefix)) == 0 &&
                             strcmp(_api_password, request->header_value + strlen(prefix)) == 0;
-                    } else if (strcmp(request->header_key, "Host") == 0) {
+                    } else if (strcasecmp(request->header_key, "Host") == 0) {
                         request->redirect = strcmp(request->header_value, "circuitpython.local") == 0;
-                    } else if (strcmp(request->header_key, "Content-Length") == 0) {
+                    } else if (strcasecmp(request->header_key, "Content-Length") == 0) {
                         request->content_length = strtoul(request->header_value, NULL, 10);
-                    } else if (strcmp(request->header_key, "Expect") == 0) {
+                    } else if (strcasecmp(request->header_key, "Expect") == 0) {
                         request->expect = strcmp(request->header_value, "100-continue") == 0;
-                    } else if (strcmp(request->header_key, "Accept") == 0) {
-                        request->json = strcmp(request->header_value, "application/json") == 0;
-                    } else if (strcmp(request->header_key, "Origin") == 0) {
+                    } else if (strcasecmp(request->header_key, "Accept") == 0) {
+                        request->json = strcasecmp(request->header_value, "application/json") == 0;
+                    } else if (strcasecmp(request->header_key, "Origin") == 0) {
                         strcpy(request->origin, request->header_value);
-                    } else if (strcmp(request->header_key, "X-Timestamp") == 0) {
+                    } else if (strcasecmp(request->header_key, "X-Timestamp") == 0) {
                         request->timestamp_ms = strtoull(request->header_value, NULL, 10);
-                    } else if (strcmp(request->header_key, "Upgrade") == 0) {
+                    } else if (strcasecmp(request->header_key, "Upgrade") == 0) {
                         request->websocket = strcmp(request->header_value, "websocket") == 0;
-                    } else if (strcmp(request->header_key, "Sec-WebSocket-Version") == 0) {
+                    } else if (strcasecmp(request->header_key, "Sec-WebSocket-Version") == 0) {
                         request->websocket_version = strtoul(request->header_value, NULL, 10);
-                    } else if (strcmp(request->header_key, "Sec-WebSocket-Key") == 0 &&
+                    } else if (strcasecmp(request->header_key, "Sec-WebSocket-Key") == 0 &&
                                strlen(request->header_value) == 24) {
                         strcpy(request->websocket_key, request->header_value);
                     }

From 09915ab0b987fc999666a354f3f0ace1ecd14064 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 24 Jul 2022 15:15:10 +0200
Subject: [PATCH 0662/2403] compare all static ok hosts with port, add
 127.0.0.1 and localhost to it use strncmp rather than memcmp, one of the
 strings coul be smaller than the other

---
 supervisor/shared/web_workflow/web_workflow.c | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 11f00c125f..1fb8cdeff9 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -350,41 +350,40 @@ static bool _endswith(const char *str, const char *suffix) {
     return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0;
 }
 
-const char *ok_hosts[] = {"code.circuitpython.org"};
+const char *ok_hosts[] = {
+    "code.circuitpython.org",
+    "127.0.0.1",
+    "localhost",
+};
 
 static bool _origin_ok(const char *origin) {
     const char *http = "http://";
     const char *local = ".local";
 
     // note: redirected requests send an Origin of "null" and will be caught by this
-    if (memcmp(origin, http, strlen(http)) != 0) {
+    if (strncmp(origin, http, strlen(http)) != 0) {
         return false;
     }
     // These are prefix checks up to : so that any port works.
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
     const char *end = origin + strlen(http) + strlen(hostname) + strlen(local);
-    if (memcmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
-        memcmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 &&
+    if (strncmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
+        strncmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 &&
         (end[0] == '\0' || end[0] == ':')) {
         return true;
     }
 
     end = origin + strlen(http) + strlen(_our_ip_encoded);
-    if (memcmp(origin + strlen(http), _our_ip_encoded, strlen(_our_ip_encoded)) == 0 &&
+    if (strncmp(origin + strlen(http), _our_ip_encoded, strlen(_our_ip_encoded)) == 0 &&
         (end[0] == '\0' || end[0] == ':')) {
         return true;
     }
 
-    const char *localhost = "127.0.0.1";
-    end = origin + strlen(http) + strlen(localhost);
-    if (memcmp(origin + strlen(http), localhost, strlen(localhost)) == 0
-        && (end[0] == '\0' || end[0] == ':')) {
-        return true;
-    }
-
     for (size_t i = 0; i < MP_ARRAY_SIZE(ok_hosts); i++) {
-        // This checks exactly.
-        if (strcmp(origin + strlen(http), ok_hosts[i]) == 0) {
+        // Allows any port
+        end = origin + strlen(http) + strlen(ok_hosts[i]);
+        if (strncmp(origin + strlen(http), ok_hosts[i], strlen(ok_hosts[i])) == 0
+            && (end[0] == '\0' || end[0] == ':')) {
             return true;
         }
     }
@@ -911,7 +910,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
         ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
-    } else if (memcmp(request->path, "/fs/", 4) == 0) {
+    } else if (strncmp(request->path, "/fs/", 4) == 0) {
         if (strcasecmp(request->method, "OPTIONS") == 0) {
             // OPTIONS is sent for CORS preflight, unauthenticated
             _reply_access_control(socket, request);
@@ -1032,7 +1031,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 }
             }
         }
-    } else if (memcmp(request->path, "/cp/", 4) == 0) {
+    } else if (strncmp(request->path, "/cp/", 4) == 0) {
         const char *path = request->path + 3;
         if (strcasecmp(request->method, "OPTIONS") == 0) {
             // handle preflight requests to /cp/
@@ -1177,7 +1176,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                     request->state = STATE_HEADER_KEY;
                     if (strcasecmp(request->header_key, "Authorization") == 0) {
                         const char *prefix = "Basic ";
-                        request->authenticated = memcmp(request->header_value, prefix, strlen(prefix)) == 0 &&
+                        request->authenticated = strncmp(request->header_value, prefix, strlen(prefix)) == 0 &&
                             strcmp(_api_password, request->header_value + strlen(prefix)) == 0;
                     } else if (strcasecmp(request->header_key, "Host") == 0) {
                         request->redirect = strcmp(request->header_value, "circuitpython.local") == 0;

From 22e774fbb2b26f4c1b373bd322681ec2c2eafedd Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sun, 24 Jul 2022 22:22:22 +0000
Subject: [PATCH 0663/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (996 of 996 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 5d9c4517ec..38cf9c7ff0 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: 2022-07-15 21:21+0000\n"
+"PO-Revision-Date: 2022-07-24 22:22+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -216,7 +216,7 @@ msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format

From 4ccbcfaaf6f7b686ccee8b6c10b7c58fa07d856e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 25 Jul 2022 14:08:18 -0500
Subject: [PATCH 0664/2403] Remove workaround for autoapi bug

https://github.com/readthedocs/sphinx-autoapi/issues/328 has been fixed
and released in version 1.9.0 on pypi.  This version should
automatically be picked up, as we use unversioned dependencies on the
package.
---
 conf.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/conf.py b/conf.py
index 145bed4d7b..c92e8bb719 100644
--- a/conf.py
+++ b/conf.py
@@ -33,25 +33,6 @@ from sphinx import addnodes
 
 tools_describe = str(pathlib.Path(__file__).parent / "tools/describe")
 
-# Monkeypatch autoapi
-def _format_args(args_info, include_annotations=True, ignore_self=None):
-    result = []
-
-    for i, (prefix, name, annotation, default) in enumerate(args_info):
-        if i == 0 and ignore_self is not None and name == ignore_self:
-            continue
-        formatted = "{}{}{}{}".format(
-            prefix or "",
-            name or "",
-            ": {}".format(annotation) if annotation and include_annotations else "",
-            (" = {}" if annotation else "={}").format(default) if default else "",
-        )
-        result.append(formatted)
-    return ", ".join(result)
-
-import autoapi.mappers.python.objects as objects
-objects._format_args = _format_args
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

From 66d5fa9a55e7aa3763037b8ceb45dc33c7cb29bd Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 25 Jul 2022 16:19:27 -0700
Subject: [PATCH 0665/2403] Save space on Feather S3 4mb with -Os

---
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index 39804bad26..1b4c4015f5 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_PS2IO = 0
+OPTIMIZATION_FLAGS = -Os

From f4927dd2d6e1503bd86415ed8187d250f313fdbe Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 25 Jul 2022 16:58:54 -0700
Subject: [PATCH 0666/2403] Use mp_printf instead of snprintf

---
 supervisor/shared/web_workflow/web_workflow.c | 99 +++++++++----------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 055fdcbd29..e641bb8605 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -306,6 +306,10 @@ static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int l
     }
 }
 
+STATIC void _print_raw(void *env, const char *str, size_t len) {
+    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, (size_t)len);
+}
+
 static void _send_str(socketpool_socket_obj_t *socket, const char *str) {
     _send_raw(socket, (const uint8_t *)str, strlen(str));
 }
@@ -324,14 +328,19 @@ static void _send_strs(socketpool_socket_obj_t *socket, ...) {
 }
 
 static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) {
-    char encoded_len[sizeof(size_t) * 2 + 1];
-    int len = snprintf(encoded_len, sizeof(encoded_len), "%X", strlen(chunk));
-    _send_raw(socket, (const uint8_t *)encoded_len, len);
-    _send_raw(socket, (const uint8_t *)"\r\n", 2);
+    mp_print_t _socket_print = {socket, _print_raw};
+    mp_printf(&_socket_print, "%X\r\n", strlen(chunk));
     _send_raw(socket, (const uint8_t *)chunk, strlen(chunk));
     _send_raw(socket, (const uint8_t *)"\r\n", 2);
 }
 
+STATIC void _print_chunk(void *env, const char *str, size_t len) {
+    mp_print_t _socket_print = {socket, _print_raw};
+    mp_printf(&_socket_print, "%X\r\n", len);
+    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, len);
+    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)"\r\n", 2);
+}
+
 // A bit of a misnomer because it sends all arguments as one chunk.
 // The last argument must be NULL! Otherwise, it won't stop.
 static void _send_chunks(socketpool_socket_obj_t *socket, ...) {
@@ -349,9 +358,9 @@ static void _send_chunks(socketpool_socket_obj_t *socket, ...) {
     }
     va_end(strs_to_count);
 
-    char encoded_len[sizeof(size_t) * 2 + 1];
-    snprintf(encoded_len, sizeof(encoded_len), "%X", chunk_len);
-    _send_strs(socket, encoded_len, "\r\n", NULL);
+
+    mp_print_t _socket_print = {socket, _print_raw};
+    mp_printf(&_socket_print, "%X\r\n", chunk_len);
 
     str = va_arg(strs_to_send, const char *);
     while (str != NULL) {
@@ -556,9 +565,8 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
 
     _send_strs(socket, "://", hostname, ".local", NULL);
     if (web_api_port != 80) {
-        char encoded_port[6];
-        snprintf(encoded_port, sizeof(encoded_port), "%d", web_api_port);
-        _send_strs(socket, ":", encoded_port, NULL);
+        mp_print_t _socket_print = {socket, _print_raw};
+        mp_printf(&_socket_print, ":%d", web_api_port);
     }
     _send_strs(socket, path, "\r\n", NULL);
     _cors_header(socket, request);
@@ -569,6 +577,7 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
     socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON));
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
+    mp_print_t _socket_print = {socket, _print_chunk};
     _send_chunk(socket, "[");
     bool first = true;
 
@@ -589,7 +598,7 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
         }
         // We use nanoseconds past Jan 1, 1970 for consistency with BLE API and
         // LittleFS.
-        _send_chunk(socket, ", \"modified_ns\": ");
+        _send_chunk(socket, ", ");
 
         uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
             (file_info.fdate >> 5) & 0xf,
@@ -598,15 +607,13 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
             (file_info.ftime >> 5) & 0x1f,
             (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
 
-        char encoded_number[32];
-        snprintf(encoded_number, sizeof(encoded_number), "%lld", truncated_time);
-        _send_chunks(socket, encoded_number, ", \"file_size\": ", NULL);
+        mp_printf(&_socket_print, "\"modified_ns\": %lld, ", truncated_time);
         size_t file_size = 0;
         if ((file_info.fattrib & AM_DIR) == 0) {
             file_size = file_info.fsize;
         }
-        snprintf(encoded_number, sizeof(encoded_number), "%d", file_size);
-        _send_chunks(socket, encoded_number, "}", NULL);
+        mp_printf(&_socket_print, "\"file_size\": %d }", file_size);
+
         first = false;
         res = f_readdir(dir, &file_info);
     }
@@ -619,9 +626,9 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
     char encoded_len[10];
     snprintf(encoded_len, sizeof(encoded_len), "%d", total_length);
 
-    _send_strs(socket,
-        "HTTP/1.1 200 OK\r\n",
-        "Content-Length: ", encoded_len, "\r\n", NULL);
+    _send_str(socket, "HTTP/1.1 200 OK\r\n");
+    mp_print_t _socket_print = {socket, _print_raw};
+    mp_printf(&_socket_print, "Content-Length: %d\r\n", total_length);
     // TODO: Make this a table to save space.
     if (_endswith(filename, ".txt") || _endswith(filename, ".py")) {
         _send_str(socket, "Content-Type: text/plain\r\n");
@@ -669,27 +676,23 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *
     socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON));
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
-    char total_encoded[4];
-    snprintf(total_encoded, sizeof(total_encoded), "%d", total_results);
-    _send_chunks(socket, "{\"total\": ", total_encoded, ", \"devices\": [", NULL);
+    mp_print_t _socket_print = {socket, _print_chunk};
+
+    mp_printf(&_socket_print, "{\"total\": %d, \"devices\": [", total_results);
     for (size_t i = 0; i < count; i++) {
         if (i > 0) {
             _send_chunk(socket, ",");
         }
         const char *hostname = common_hal_mdns_remoteservice_get_hostname(&found_devices[i]);
         const char *instance_name = common_hal_mdns_remoteservice_get_instance_name(&found_devices[i]);
-        char port_encoded[6];
         int port = common_hal_mdns_remoteservice_get_port(&found_devices[i]);
-        snprintf(port_encoded, sizeof(port_encoded), "%d", port);
-        char ip_encoded[4 * 4];
         uint32_t ipv4_address = mdns_remoteservice_get_ipv4_address(&found_devices[i]);
         uint8_t *octets = (uint8_t *)&ipv4_address;
-        snprintf(ip_encoded, sizeof(ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]);
-        _send_chunks(socket,
-            "{\"hostname\": \"", hostname, "\", ",
-            "\"instance_name\": \"", instance_name, "\", ",
-            "\"port\": ", port_encoded, ", ",
-            "\"ip\": \"", ip_encoded, "\"}", NULL);
+        mp_printf(&_socket_print,
+            "{\"hostname\": \"%s\", "
+            "\"instance_name\": \"%s\", "
+            "\"port\": %d, "
+            "\"ip\": \"%d.%d.%d.%d\"}", hostname, instance_name, port, octets[0], octets[1], octets[2], octets[3]);
         common_hal_mdns_remoteservice_deinit(&found_devices[i]);
     }
     _send_chunk(socket, "]}");
@@ -701,26 +704,22 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _send_str(socket, OK_JSON);
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
-    char encoded_creator_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0
-    snprintf(encoded_creator_id, sizeof(encoded_creator_id), "%u", CIRCUITPY_CREATOR_ID);
-    char encoded_creation_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0
-    snprintf(encoded_creation_id, sizeof(encoded_creation_id), "%u", CIRCUITPY_CREATION_ID);
+    mp_print_t _socket_print = {socket, _print_chunk};
+
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
-    char encoded_port[6];
-    snprintf(encoded_port, sizeof(encoded_port), "%d", web_api_port);
-    _send_chunks(socket,
-        "{\"web_api_version\": 1, ",
-        "\"version\": \"", MICROPY_GIT_TAG, "\", ",
-        "\"build_date\": \"", MICROPY_BUILD_DATE, "\", ",
-        "\"board_name\": \"", MICROPY_HW_BOARD_NAME, "\", ",
-        "\"mcu_name\": \"", MICROPY_HW_MCU_NAME, "\", ",
-        "\"board_id\": \"", CIRCUITPY_BOARD_ID, "\", ",
-        "\"creator_id\": ", encoded_creator_id, ", ",
-        "\"creation_id\": ", encoded_creation_id, ", ",
-        "\"hostname\": \"", hostname, "\", ",
-        "\"port\": ", encoded_port, ", ",
-        "\"ip\": \"", _our_ip_encoded,
-        "\"}", NULL);
+    // Note: this leverages the fact that C concats consecutive string literals together.
+    mp_printf(&_socket_print,
+        "{\"web_api_version\": 1, "
+        "\"version\": \"" MICROPY_GIT_TAG "\", "
+        "\"build_date\": \"" MICROPY_BUILD_DATE "\", "
+        "\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "
+        "\"mcu_name\": \"" MICROPY_HW_MCU_NAME "\", "
+        "\"board_id\": \"" CIRCUITPY_BOARD_ID "\", "
+        "\"creator_id\": %u, "
+        "\"creation_id\": %u, "
+        "\"hostname\": \"%s\", "
+        "\"port\": %d, "
+        "\"ip\": \"%s\"}", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
     // Empty chunk signals the end of the response.
     _send_chunk(socket, "");
 }

From a33985a73ff60968314ca7d0abed9599c83d6c7f Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 25 Jul 2022 19:15:43 -0500
Subject: [PATCH 0667/2403] change to basic 
 
 
 
diff --git a/supervisor/shared/web_workflow/static/edit.js b/supervisor/shared/web_workflow/static/edit.js
index 11d569abe2..5d9e4fdfe3 100644
--- a/supervisor/shared/web_workflow/static/edit.js
+++ b/supervisor/shared/web_workflow/static/edit.js
@@ -1,50 +1,6 @@
-let editor;
-require(["ace/ace", "ace/ext/settings_menu"], function (ace) {
-    editor = ace.edit("code_textarea");
-    ace.config.set('basePath', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.6.0/');
-    console.log("after create editor");
-    console.log(editor);
-
-    editor.session.setMode("ace/mode/python");
-    ace.require('ace/ext/settings_menu').init(editor);
-    editor.commands.addCommands([{
-        name: "showSettingsMenu",
-        bindKey: {win: "Ctrl-e", mac: "Ctrl-e"},
-        exec: function (editor) {
-            console.log("ctrl-e")
-            editor.showSettingsMenu();
-        },
-        readOnly: true
-    }, {
-        name: "infoDocsSearch",
-        bindKey: {win: "Ctrl-i", mac: "Ctrl-i"},
-        exec: function (editor) {
-            window.open(`https://docs.circuitpython.org/en/latest/search.html?q=${editor.getSelectedText()}`, '_blank');
-        },
-        readOnly: true
-    },{
-        name: 'Save',
-        bindKey: {win: 'Ctrl-S', mac: 'Command-S'},
-        exec: function (editor) {
-            console.log("ctrl-s save");
-            save();
-
-        }
-    },{
-        name: "replaceCtrlR",
-        bindKey: {win: "Ctrl-r", mac: "Ctrl-r"},
-        exec: function (editor_arg) {
-            console.log("override ctrl r");
-            editor.execCommand('replace');
-            console.log(editor);
-        },
-        readOnly: true
-    }]);
-});
-
+let $editor = document.querySelector("#code_textarea");
 let filename = location.hash.substring(1);
 let $output_text = document.querySelector("#output_text");
-/*let $code_text = document.querySelector("#code_textarea");*/
 
 fetch(`/fs/${filename}`)
     .then(function (response) {
@@ -52,14 +8,14 @@ fetch(`/fs/${filename}`)
         return response.status === 200 ? response.text() : "";
     })
     .then(function (data) {
-        editor.setValue(data, -1)
+        $editor.value = data;
     });
 
 function save() {
     $output_text.innerText = "Saving..."
     const requestOptions = {
         method: 'PUT',
-        body: editor.getValue()
+        body: $editor.value
     };
     fetch(`/fs/${filename}`, requestOptions)
         .then(function (response) {
@@ -74,15 +30,4 @@ function save() {
 document.querySelector("#save_btn").onclick = function () {
     console.log("Click Save!");
     save();
-}
-document.querySelector("#docs_btn").onclick = function () {
-    window.open(`https://docs.circuitpython.org/en/latest/search.html?q=${editor.getSelectedText()}`, '_blank');
-}
-
-document.querySelector("#undo_btn").onclick = function () {
-    editor.undo();
-}
-
-document.querySelector("#redo_btn").onclick = function () {
-    editor.redo();
-}
+}
\ No newline at end of file

From 0ef6871a931c1d7feec7d3bfe0b26175e158ba4e Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 25 Jul 2022 19:30:44 -0500
Subject: [PATCH 0668/2403] save with ctrl-s

---
 supervisor/shared/web_workflow/static/edit.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/supervisor/shared/web_workflow/static/edit.js b/supervisor/shared/web_workflow/static/edit.js
index 5d9e4fdfe3..d73a9db94c 100644
--- a/supervisor/shared/web_workflow/static/edit.js
+++ b/supervisor/shared/web_workflow/static/edit.js
@@ -30,4 +30,18 @@ function save() {
 document.querySelector("#save_btn").onclick = function () {
     console.log("Click Save!");
     save();
+}
+
+let isCtrl = false;
+document.onkeyup=function(e){
+    if(e.keyCode === 17) isCtrl=false;
+}
+
+document.onkeydown=function(e){
+    if(e.keyCode === 17) isCtrl=true;
+    if(e.keyCode === 83 && isCtrl === true) {
+        //ctrl-s pressed
+        save();
+        return false;
+    }
 }
\ No newline at end of file

From 4c4a7072b0644f7cc0f4ee1ea4be9d4eb12c8ab7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 24 Jul 2022 14:12:06 -0500
Subject: [PATCH 0669/2403] readline: make ctrl-l clear screen & redraw line

.. similar to how standard Python does it. The specific escape sequence
is chosen for compatibility with the built-in `terminalio.Terminal`.

Closes: #6635
---
 shared/readline/readline.c | 11 +++++++++++
 shared/readline/readline.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index 23183342a7..908aec8426 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -177,6 +177,17 @@ int readline_process_char(int c) {
             vstr_cut_tail_bytes(rl.line, rl.line->len - rl.cursor_pos);
             // set redraw parameters
             redraw_from_cursor = true;
+        #endif
+        } else if (c == CHAR_CTRL_L) {
+            // CTRL-L is clear screen / redraw. This specific sequence is used
+            // (instead of a slightly more minimal sequence) for compatibility
+            // with the built-in Terminal class
+            mp_hal_stdout_tx_str("I'm a little teapot\x1b[;H\x1b[2J");
+            mp_hal_stdout_tx_str(rl.prompt);
+            mp_hal_stdout_tx_strn(rl.line->buf + rl.orig_line_len, rl.cursor_pos - rl.orig_line_len);
+            // set redraw parameters
+            redraw_from_cursor = true;
+        #if MICROPY_REPL_EMACS_KEYS
         } else if (c == CHAR_CTRL_N) {
             // CTRL-N is go to next line in history
             goto down_arrow_key;
diff --git a/shared/readline/readline.h b/shared/readline/readline.h
index 4658ee19e8..9af19b181e 100644
--- a/shared/readline/readline.h
+++ b/shared/readline/readline.h
@@ -35,6 +35,7 @@
 #define CHAR_CTRL_E (5)
 #define CHAR_CTRL_F (6)
 #define CHAR_CTRL_K (11)
+#define CHAR_CTRL_L (12)
 #define CHAR_CTRL_N (14)
 #define CHAR_CTRL_P (16)
 #define CHAR_CTRL_U (21)

From 1a7082ff1d869e31908d885041d173f848b53927 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 26 Jul 2022 08:37:33 -0700
Subject: [PATCH 0670/2403] Add newline for pre-commit

---
 supervisor/shared/web_workflow/static/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/edit.js b/supervisor/shared/web_workflow/static/edit.js
index d73a9db94c..60dd8b1073 100644
--- a/supervisor/shared/web_workflow/static/edit.js
+++ b/supervisor/shared/web_workflow/static/edit.js
@@ -44,4 +44,4 @@ document.onkeydown=function(e){
         save();
         return false;
     }
-}
\ No newline at end of file
+}

From d021d9ae4ad1f9d0d73b52f5f96c35fcc2b91080 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 13 May 2022 11:38:03 +0200
Subject: [PATCH 0671/2403] Move build extensions to board directories - define
 CIRCUITPY_BUILD_EXTENSIONS to predefined values - set
 CIRCUITPY_BUILD_EXTENSIONS in port and board config - reuse the support
 matrix "get_settings_from_makefile" to get it - move the existing port and
 board specific values - remove the C3 specific board values because it's not
 the default - update build_release_files.py to use get_settings_from_makefile

---
 docs/shared_bindings_matrix.py                | 13 ++-
 .../boards/arduino_mkr1300/mpconfigboard.mk   |  2 +
 .../boards/arduino_mkrzero/mpconfigboard.mk   |  2 +
 .../arduino_nano_33_iot/mpconfigboard.mk      |  2 +
 .../boards/arduino_zero/mpconfigboard.mk      |  2 +
 .../feather_m0_adalogger/mpconfigboard.mk     |  2 +
 .../boards/feather_m0_basic/mpconfigboard.mk  |  2 +
 .../boards/feather_m0_rfm69/mpconfigboard.mk  |  2 +
 .../boards/feather_m0_rfm9x/mpconfigboard.mk  |  2 +
 .../atmel-samd/boards/uchip/mpconfigboard.mk  |  2 +
 ports/atmel-samd/mpconfigport.mk              |  2 +
 .../boards/raspberrypi_zero/mpconfigboard.mk  |  2 +
 .../raspberrypi_zero_w/mpconfigboard.mk       |  2 +
 ports/broadcom/mpconfigport.mk                |  2 +
 ports/cxd56/mpconfigport.mk                   |  2 +
 ports/espressif/mpconfigport.mk               |  4 +
 ports/litex/mpconfigport.mk                   |  2 +
 ports/mimxrt10xx/mpconfigport.mk              |  2 +
 .../electronut_labs_blip/mpconfigboard.mk     |  2 +
 .../makerdiary_nrf52840_mdk/mpconfigboard.mk  |  2 +
 .../mpconfigboard.mk                          |  2 +
 ports/nrf/boards/microbit_v2/mpconfigboard.mk |  2 +
 ports/nrf/boards/pca10056/mpconfigboard.mk    |  2 +
 ports/nrf/boards/pca10059/mpconfigboard.mk    |  2 +
 ports/nrf/mpconfigport.mk                     |  2 +
 ports/raspberrypi/mpconfigport.mk             |  2 +
 .../stm/boards/meowbit_v121/mpconfigboard.mk  |  2 +
 ports/stm/mpconfigport.mk                     |  2 +
 tools/build_board_info.py                     | 88 ++++---------------
 tools/build_release_files.py                  |  8 +-
 30 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 961b38370d..8b4f5f876a 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -272,6 +272,11 @@ def support_matrix_by_board(use_branded_name=True):
                 board_modules.append(base[module]['name'])
         board_modules.sort()
 
+        if "CIRCUITPY_BUILD_EXTENSIONS" in settings:
+            board_extensions = settings["CIRCUITPY_BUILD_EXTENSIONS"]
+        else:
+            raise "Board extensions undefined."
+
         frozen_modules = []
         if "FROZEN_MPY_DIRS" in settings:
             frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"])
@@ -279,7 +284,9 @@ def support_matrix_by_board(use_branded_name=True):
                 frozen_modules.sort()
 
         # generate alias boards too
-        board_matrix = [(board_name, (board_modules, frozen_modules))]
+        board_matrix = [(
+            board_name, (board_modules, frozen_modules, board_extensions)
+        )]
         if entry.name in aliases_by_board:
             for alias in aliases_by_board[entry.name]:
                 if use_branded_name:
@@ -287,7 +294,9 @@ def support_matrix_by_board(use_branded_name=True):
                         alias = aliases_brand_names[alias]
                     else:
                         alias = alias.replace("_"," ").title()
-                board_matrix.append( (alias, (board_modules, frozen_modules)) )
+                board_matrix.append((
+                    alias, (board_modules, frozen_modules, board_extensions),
+                ))
 
         return board_matrix # this is now a list of (board,modules)
 
diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
index c3d75202bf..4dd49a489a 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
index eea3a27f13..a771332b99 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
index 895c027ee5..40b39dc4f9 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index f1c3631dcb..92560d8d2c 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 62336ecf50..087cb507c3 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
index cfd1f63cb3..b4d32497aa 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 48c0f47064..782fa55a5e 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index 4003dd67f0..b991fb35d8 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/uchip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
index 90b5600dcb..0182b92d1a 100644
--- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Itaca Innovation"
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 3ea6c44049..9d8472c8ea 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -133,3 +133,5 @@ CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
 
 endif # same51
 ######################################################################
+
+CIRCUITPY_BUILD_EXTENSIONS ?= BIN_UF2
diff --git a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
index 74f8511c2d..861fd6720f 100644
--- a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
+++ b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
@@ -4,3 +4,5 @@ USB_PRODUCT = "Zero"
 USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = "bcm2835"
+
+CIRCUITPY_BUILD_EXTENSIONS = KERNEL_IMG
diff --git a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
index 24d09e0530..fa2267391d 100644
--- a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
+++ b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
@@ -4,3 +4,5 @@ USB_PRODUCT = "Zero W"
 USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = "bcm2835"
+
+CIRCUITPY_BUILD_EXTENSIONS = KERNEL_IMG
diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index 7296461d1f..1f99f43922 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -24,3 +24,5 @@ INTERNAL_FLASH_FILESYSTEM = 1
 
 USB_NUM_ENDPOINT_PAIRS = 8
 USB_HIGHSPEED = 1
+
+CIRCUITPY_BUILD_EXTENSIONS ?= KERNEL8_IMG
diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index 813d85d4a7..972f4a98f0 100644
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@@ -25,3 +25,5 @@ CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 INTERNAL_LIBM = 1
+
+CIRCUITPY_BUILD_EXTENSIONS ?= SPK
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 457dd21a3d..03603bbbf7 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -40,6 +40,7 @@ CIRCUITPY_PARALLELDISPLAY = 0
 # Protomatter needs to support ESP32.
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_USB = 0
+CIRCUITPY_BUILD_EXTENSIONS ?= BIN
 
 else ifeq ($(IDF_TARGET),esp32c3)
 CIRCUITPY_AESIO = 0
@@ -57,6 +58,7 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB = 0
+CIRCUITPY_BUILD_EXTENSIONS ?= BIN
 
 else ifeq ($(IDF_TARGET),esp32s3)
 CIRCUITPY_BLEIO = 1
@@ -70,6 +72,8 @@ CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
 endif
 
+CIRCUITPY_BUILD_EXTENSIONS ?= BIN_UF2
+
 # From ESP32-S2/S3 Technical Reference Manual:
 #
 # Endpoint number 0 always present (bi-directional, consisting of EP0 IN and EP0 OUT)
diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk
index 57f5113b69..6c43dfc1b8 100644
--- a/ports/litex/mpconfigport.mk
+++ b/ports/litex/mpconfigport.mk
@@ -29,3 +29,5 @@ CIRCUITPY_SDCARDIO = 0
 # Enable USB support
 CIRCUITPY_USB_HID = 1
 CIRCUITPY_USB_MIDI = 1
+
+CIRCUITPY_BUILD_EXTENSIONS ?= DFU
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index e7e7abe141..244603b30a 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -21,3 +21,5 @@ CIRCUITPY_PULSEIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_USB_MIDI = 1
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_BUILD_EXTENSIONS ?= HEX_UF2
diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
index 2b46f4397a..4e9e0e2d4d 100644
--- a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
+++ b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
@@ -5,6 +5,8 @@ USB_MANUFACTURER = "Electronut Labs"
 
 MCU_CHIP = nrf52840
 
+CIRCUITPY_BUILD_EXTENSIONS = HEX
+
 INTERNAL_FLASH_FILESYSTEM = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_DISPLAYIO = 1
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
index 7da9ed1896..c90d1218ba 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
@@ -5,5 +5,7 @@ USB_MANUFACTURER = "makerdiary"
 
 MCU_CHIP = nrf52840
 
+CIRCUITPY_BUILD_EXTENSIONS = HEX
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25R6435F"
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
index c4fa121744..c6b578c087 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
@@ -5,4 +5,6 @@ USB_MANUFACTURER = "makerdiary"
 
 MCU_CHIP = nrf52840
 
+CIRCUITPY_BUILD_EXTENSIONS = HEX_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nrf/boards/microbit_v2/mpconfigboard.mk
index 78e76d3b53..a5d0becd68 100644
--- a/ports/nrf/boards/microbit_v2/mpconfigboard.mk
+++ b/ports/nrf/boards/microbit_v2/mpconfigboard.mk
@@ -3,6 +3,8 @@ CIRCUITPY_CREATION_ID = 0x80D8
 
 MCU_CHIP = nrf52833
 
+CIRCUITPY_BUILD_EXTENSIONS = COMBINED_HEX
+
 INTERNAL_FLASH_FILESYSTEM = 1
 
 # USB pins aren't used.
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 48f68a30ae..0e6d4397d1 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -5,5 +5,7 @@ USB_MANUFACTURER = "Nordic Semiconductor"
 
 MCU_CHIP = nrf52840
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25R6435F"
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index 9dc3cc71ed..2c023a9d92 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -5,4 +5,6 @@ USB_MANUFACTURER = "Nordic Semiconductor"
 
 MCU_CHIP = nrf52840
 
+CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index 6aff88b289..c8cd4b9f68 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -4,6 +4,8 @@ LD_TEMPLATE_FILE = boards/common.template.ld
 
 INTERNAL_LIBM = 1
 
+CIRCUITPY_BUILD_EXTENSIONS ?= UF2
+
 # Number of USB endpoint pairs.
 USB_NUM_ENDPOINT_PAIRS = 8
 
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 32666ed9ea..230fe1ad1a 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -1,5 +1,7 @@
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
+CIRCUITPY_BUILD_EXTENSIONS ?= UF2
+CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 CIRCUITPY_ALARM ?= 1
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index 77b046ada7..8342ce6444 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -13,6 +13,8 @@ MCU_SERIES = F4
 MCU_VARIANT = STM32F401xE
 MCU_PACKAGE = LQFP64
 
+CIRCUITPY_BUILD_EXTENSIONS = UF2
+
 OPTIMIZATION_FLAGS = -Os
 
 LD_COMMON = boards/common_default.ld
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index dd83e0d7bc..107c4e7247 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -1,6 +1,8 @@
 LONGINT_IMPL ?= MPZ
 INTERNAL_LIBM ?= 1
 
+CIRCUITPY_BUILD_EXTENSIONS ?= BIN
+
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         CIRCUITPY_ALARM = 1
         CIRCUITPY_CANIO = 1
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index f78ffa3eac..dff0a9e523 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -23,69 +23,18 @@ from shared_bindings_matrix import (
     support_matrix_by_board,
 )
 
-BIN = ("bin",)
-UF2 = ("uf2",)
-BIN_UF2 = ("bin", "uf2")
-HEX = ("hex",)
-HEX_UF2 = ("hex", "uf2")
-SPK = ("spk",)
-DFU = ("dfu",)
-BIN_DFU = ("bin", "dfu")
-COMBINED_HEX = ("combined.hex",)
-KERNEL8_IMG = ("disk.img.zip", "kernel8.img")
-KERNEL_IMG = ("disk.img.zip", "kernel.img")
-
-# Default extensions
-extension_by_port = {
-    "atmel-samd": UF2,
-    "broadcom": KERNEL8_IMG,
-    "cxd56": SPK,
-    "espressif": BIN_UF2,
-    "litex": DFU,
-    "mimxrt10xx": HEX_UF2,
-    "nrf": UF2,
-    "raspberrypi": UF2,
-    "stm": BIN,
-}
-
-# Per board overrides
-extension_by_board = {
-    # samd
-    "arduino_mkr1300": BIN_UF2,
-    "arduino_mkrzero": BIN_UF2,
-    "arduino_nano_33_iot": BIN_UF2,
-    "arduino_zero": BIN_UF2,
-    "feather_m0_adalogger": BIN_UF2,
-    "feather_m0_basic": BIN_UF2,
-    "feather_m0_rfm69": BIN_UF2,
-    "feather_m0_rfm9x": BIN_UF2,
-    "uchip": BIN_UF2,
-    # nRF52840 dev kits that may not have UF2 bootloaders,
-    "makerdiary_nrf52840_mdk": HEX,
-    "makerdiary_nrf52840_mdk_usb_dongle": HEX_UF2,
-    "pca10056": BIN_UF2,
-    "pca10059": BIN_UF2,
-    "electronut_labs_blip": HEX,
-    "microbit_v2": COMBINED_HEX,
-    # stm32
-    "meowbit_v121": UF2,
-    "sparkfun_stm32_thing_plus": BIN_UF2,
-    "swan_r5": BIN_UF2,
-    # esp32
-    "adafruit_feather_esp32_v2": BIN,
-    # esp32c3
-    "adafruit_qtpy_esp32c3": BIN,
-    "ai_thinker_esp32-c3s": BIN,
-    "ai_thinker_esp32-c3s-2m": BIN,
-    "beetle-esp32-c3": BIN,
-    "espressif_esp32c3_devkitm_1_n4": BIN,
-    "lilygo_ttgo_t-01c3": BIN,
-    "lolin_c3_mini": BIN,
-    "microdev_micro_c3": BIN,
-    "lilygo_ttgo_t-oi-plus": BIN,
-    # broadcom
-    "raspberrypi_zero": KERNEL_IMG,
-    "raspberrypi_zero_w": KERNEL_IMG,
+extensions_by_macro = {
+    "BIN": ("bin",),
+    "UF2": ("uf2",),
+    "BIN_UF2": ("bin", "uf2"),
+    "HEX": ("hex",),
+    "HEX_UF2": ("hex", "uf2"),
+    "SPK": ("spk",),
+    "DFU": ("dfu",),
+    "BIN_DFU": ("bin", "dfu"),
+    "COMBINED_HEX": ("combined.hex",),
+    "KERNEL8_IMG": ("disk.img.zip", "kernel8.img"),
+    "KERNEL_IMG": ("disk.img.zip", "kernel.img"),
 }
 
 language_allow_list = set(
@@ -129,19 +78,15 @@ def get_board_mapping():
             if board_path.is_dir():
                 board_files = os.listdir(board_path.path)
                 board_id = board_path.name
-                extensions = extension_by_port[port]
-                extensions = extension_by_board.get(board_path.name, extensions)
                 aliases = aliases_by_board.get(board_path.name, [])
                 boards[board_id] = {
                     "port": port,
-                    "extensions": extensions,
                     "download_count": 0,
                     "aliases": aliases,
                 }
                 for alias in aliases:
                     boards[alias] = {
                         "port": port,
-                        "extensions": extensions,
                         "download_count": 0,
                         "alias": True,
                         "aliases": [],
@@ -310,20 +255,21 @@ def generate_download_info():
                 board_files = os.listdir(board_path.path)
                 board_id = board_path.name
                 board_info = board_mapping[board_id]
-
                 for alias in [board_id] + board_info["aliases"]:
                     alias_info = board_mapping[alias]
+                    modules_list = support_matrix[alias][0]
+                    frozen_libraries = [frozen[0] for frozen in support_matrix[alias][1]]
+                    extensions = support_matrix[alias][2]
                     if alias not in current_info:
                         changes["new_boards"].append(alias)
                         current_info[alias] = {"downloads": 0, "versions": []}
-
                     new_version = {
                         "stable": new_stable,
                         "version": new_tag,
                         "modules": support_matrix[alias][0],
                         "languages": languages,
-                        "extensions": board_info["extensions"],
-                        "frozen_libraries": [frozen[0] for frozen in support_matrix[alias][1]],
+                        "extensions": extensions,
+                        "frozen_libraries": frozen_libraries,
                     }
                     current_info[alias]["downloads"] = alias_info["download_count"]
                     current_info[alias]["versions"].append(new_version)
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index 3fe714e393..473038ec10 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -12,6 +12,9 @@ import shutil
 import build_board_info as build_info
 import time
 
+sys.path.append("../docs")
+from shared_bindings_matrix import get_settings_from_makefile
+
 for port in build_info.SUPPORTED_PORTS:
     result = subprocess.run("rm -rf ../ports/{port}/build*".format(port=port), shell=True)
 
@@ -39,6 +42,7 @@ for board in build_boards:
     bin_directory = "../bin/{}/".format(board)
     os.makedirs(bin_directory, exist_ok=True)
     board_info = all_boards[board]
+    board_settings = get_settings_from_makefile("../ports/" + board_info["port"], board)
 
     for language in languages:
         bin_directory = "../bin/{board}/{language}".format(board=board, language=language)
@@ -82,8 +86,10 @@ for board in build_boards:
             success = "\033[31mfailed\033[0m"
 
         other_output = ""
+        extensions_id = board_settings["CIRCUITPY_BUILD_EXTENSIONS"]
+        extensions = build_info.extensions_by_macro[extensions_id]
 
-        for extension in board_info["extensions"]:
+        for extension in extensions:
             temp_filename = "../ports/{port}/{build}/firmware.{extension}".format(
                 port=board_info["port"], build=build_dir, extension=extension
             )

From eabe8b971a0f1091ba6026c31ae55177c084b9e5 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 19 Jul 2022 23:35:51 +0200
Subject: [PATCH 0672/2403] list extensions instead of macros names ("bin,uf2"
 not BIN_UF2) the modules_support_matrix usees a dictionnary per board instead
 of a list optionally include the frozen modules URLs in it

---
 conf.py                                       |  4 +--
 docs/shared_bindings_matrix.py                | 32 +++++++++++++------
 .../boards/arduino_mkr1300/mpconfigboard.mk   |  2 +-
 .../boards/arduino_mkrzero/mpconfigboard.mk   |  2 +-
 .../arduino_nano_33_iot/mpconfigboard.mk      |  2 +-
 .../boards/arduino_zero/mpconfigboard.mk      |  2 +-
 .../feather_m0_adalogger/mpconfigboard.mk     |  2 +-
 .../boards/feather_m0_basic/mpconfigboard.mk  |  2 +-
 .../boards/feather_m0_rfm69/mpconfigboard.mk  |  2 +-
 .../boards/feather_m0_rfm9x/mpconfigboard.mk  |  2 +-
 .../atmel-samd/boards/uchip/mpconfigboard.mk  |  2 +-
 ports/atmel-samd/mpconfigport.mk              |  2 +-
 .../boards/raspberrypi_zero/mpconfigboard.mk  |  2 +-
 .../raspberrypi_zero_w/mpconfigboard.mk       |  2 +-
 ports/broadcom/mpconfigport.mk                |  2 +-
 ports/cxd56/mpconfigport.mk                   |  2 +-
 ports/espressif/mpconfigport.mk               |  6 ++--
 ports/litex/mpconfigport.mk                   |  2 +-
 ports/mimxrt10xx/mpconfigport.mk              |  2 +-
 .../electronut_labs_blip/mpconfigboard.mk     |  2 +-
 .../makerdiary_nrf52840_mdk/mpconfigboard.mk  |  2 +-
 .../mpconfigboard.mk                          |  2 +-
 ports/nrf/boards/microbit_v2/mpconfigboard.mk |  2 +-
 ports/nrf/boards/pca10056/mpconfigboard.mk    |  2 +-
 ports/nrf/boards/pca10059/mpconfigboard.mk    |  2 +-
 ports/nrf/mpconfigport.mk                     |  2 +-
 ports/raspberrypi/mpconfigport.mk             |  2 +-
 .../stm/boards/meowbit_v121/mpconfigboard.mk  |  2 +-
 ports/stm/mpconfigport.mk                     |  2 +-
 shared-bindings/support_matrix.rst            |  4 +--
 tools/build_board_info.py                     | 29 ++++-------------
 tools/build_release_files.py                  |  6 ++--
 32 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/conf.py b/conf.py
index c92e8bb719..b7e2f29914 100644
--- a/conf.py
+++ b/conf.py
@@ -52,8 +52,8 @@ subprocess.check_output(["make", "stubs"])
 #modules_support_matrix = shared_bindings_matrix.support_matrix_excluded_boards()
 modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
 modules_support_matrix_reverse = defaultdict(list)
-for board, modules in modules_support_matrix.items():
-    for module in modules[0]:
+for board, matrix_info in modules_support_matrix.items():
+    for module in matrix_info["modules"]:
         modules_support_matrix_reverse[module].append(board)
 
 modules_support_matrix_reverse = dict(
diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 8b4f5f876a..41202a4fae 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -204,7 +204,7 @@ def get_repository_url(directory):
     repository_urls[directory] = path
     return path
 
-def frozen_modules_from_dirs(frozen_mpy_dirs):
+def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
     Go through the list of frozen directories and extract the python modules.
     Paths are of the type:
@@ -221,10 +221,16 @@ def frozen_modules_from_dirs(frozen_mpy_dirs):
             if sub.name in frozen_excludes:
                 continue
             if sub.name.endswith(".py"):
-                frozen_modules.append((sub.name[:-3], url_repository))
+                if withurl:
+                    frozen_modules.append((sub.name[:-3], url_repository))
+                else:
+                    frozen_modules.append(sub.name[:-3])
                 continue
             if next(sub.glob("**/*.py"), None): # tests if not empty
-                frozen_modules.append((sub.name, url_repository))
+                if withurl:
+                    frozen_modules.append((sub.name, url_repository))
+                else:
+                    frozen_modules.append(sub.name)
     return frozen_modules
 
 def lookup_setting(settings, key, default=''):
@@ -244,7 +250,7 @@ def all_ports_all_boards(ports=SUPPORTED_PORTS):
                 continue
             yield (port, entry)
 
-def support_matrix_by_board(use_branded_name=True):
+def support_matrix_by_board(use_branded_name=True, withurl=True):
     """ Compiles a list of the available core modules available for each
         board.
     """
@@ -275,17 +281,21 @@ def support_matrix_by_board(use_branded_name=True):
         if "CIRCUITPY_BUILD_EXTENSIONS" in settings:
             board_extensions = settings["CIRCUITPY_BUILD_EXTENSIONS"]
         else:
-            raise "Board extensions undefined."
+            raise OSError(f"Board extensions undefined: {board_name}.")
 
         frozen_modules = []
         if "FROZEN_MPY_DIRS" in settings:
-            frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"])
+            frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"], withurl)
             if frozen_modules:
                 frozen_modules.sort()
 
         # generate alias boards too
         board_matrix = [(
-            board_name, (board_modules, frozen_modules, board_extensions)
+            board_name, {
+                "modules": board_modules,
+                "frozen_libraries": frozen_modules,
+                "extensions": board_extensions,
+            }
         )]
         if entry.name in aliases_by_board:
             for alias in aliases_by_board[entry.name]:
@@ -295,7 +305,11 @@ def support_matrix_by_board(use_branded_name=True):
                     else:
                         alias = alias.replace("_"," ").title()
                 board_matrix.append((
-                    alias, (board_modules, frozen_modules, board_extensions),
+                    alias, {
+                        "modules": board_modules,
+                        "frozen_libraries": frozen_modules,
+                        "extensions": board_extensions,
+                    },
                 ))
 
         return board_matrix # this is now a list of (board,modules)
@@ -303,7 +317,7 @@ def support_matrix_by_board(use_branded_name=True):
     executor = ThreadPoolExecutor(max_workers=os.cpu_count())
     mapped_exec = executor.map(support_matrix, all_ports_all_boards())
     # flatmap with comprehensions
-    boards = dict(sorted([board for matrix in mapped_exec for board in matrix]))
+    boards = dict(sorted([board for matrix in mapped_exec for board in matrix], key=lambda x: x[0]))
 
     return boards
 
diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
index 4dd49a489a..261e30d7e5 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
index a771332b99..4f058e4f2a 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
index 40b39dc4f9..f289aad065 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index 92560d8d2c..a347b70a63 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Arduino"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 087cb507c3..b0e01e43a5 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
index b4d32497aa..f54da83f11 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 782fa55a5e..a1891f972e 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index b991fb35d8..3bc3fa3ed0 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/boards/uchip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
index 0182b92d1a..543007ce11 100644
--- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_MANUFACTURER = "Itaca Innovation"
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 9d8472c8ea..94b19c5303 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -134,4 +134,4 @@ CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
 endif # same51
 ######################################################################
 
-CIRCUITPY_BUILD_EXTENSIONS ?= BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
diff --git a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
index 861fd6720f..b6adb5d6bb 100644
--- a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
+++ b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.mk
@@ -5,4 +5,4 @@ USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = "bcm2835"
 
-CIRCUITPY_BUILD_EXTENSIONS = KERNEL_IMG
+CIRCUITPY_BUILD_EXTENSIONS = disk.img.zip,kernel.img
diff --git a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
index fa2267391d..cd55f73ee8 100644
--- a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
+++ b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.mk
@@ -5,4 +5,4 @@ USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = "bcm2835"
 
-CIRCUITPY_BUILD_EXTENSIONS = KERNEL_IMG
+CIRCUITPY_BUILD_EXTENSIONS = disk.img.zip,kernel.img
diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index 1f99f43922..d0c6acf408 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -25,4 +25,4 @@ INTERNAL_FLASH_FILESYSTEM = 1
 USB_NUM_ENDPOINT_PAIRS = 8
 USB_HIGHSPEED = 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= KERNEL8_IMG
+CIRCUITPY_BUILD_EXTENSIONS ?= disk.img.zip,kernel8.img
diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index 972f4a98f0..2f0cd90c7f 100644
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@@ -26,4 +26,4 @@ CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 INTERNAL_LIBM = 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= SPK
+CIRCUITPY_BUILD_EXTENSIONS ?= spk
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 03603bbbf7..2655093be5 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -40,7 +40,7 @@ CIRCUITPY_PARALLELDISPLAY = 0
 # Protomatter needs to support ESP32.
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_USB = 0
-CIRCUITPY_BUILD_EXTENSIONS ?= BIN
+CIRCUITPY_BUILD_EXTENSIONS ?= bin
 
 else ifeq ($(IDF_TARGET),esp32c3)
 CIRCUITPY_AESIO = 0
@@ -58,7 +58,7 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB = 0
-CIRCUITPY_BUILD_EXTENSIONS ?= BIN
+CIRCUITPY_BUILD_EXTENSIONS ?= bin
 
 else ifeq ($(IDF_TARGET),esp32s3)
 CIRCUITPY_BLEIO = 1
@@ -72,7 +72,7 @@ CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
 endif
 
-CIRCUITPY_BUILD_EXTENSIONS ?= BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
 
 # From ESP32-S2/S3 Technical Reference Manual:
 #
diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk
index 6c43dfc1b8..2e342db47d 100644
--- a/ports/litex/mpconfigport.mk
+++ b/ports/litex/mpconfigport.mk
@@ -30,4 +30,4 @@ CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_USB_HID = 1
 CIRCUITPY_USB_MIDI = 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= DFU
+CIRCUITPY_BUILD_EXTENSIONS ?= dfu
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 244603b30a..5ffec18cfb 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -22,4 +22,4 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_USB_MIDI = 1
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_BUILD_EXTENSIONS ?= HEX_UF2
+CIRCUITPY_BUILD_EXTENSIONS ?= hex,uf2
diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
index 4e9e0e2d4d..0e3b1b9048 100644
--- a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
+++ b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_MANUFACTURER = "Electronut Labs"
 
 MCU_CHIP = nrf52840
 
-CIRCUITPY_BUILD_EXTENSIONS = HEX
+CIRCUITPY_BUILD_EXTENSIONS = hex
 
 INTERNAL_FLASH_FILESYSTEM = 1
 CIRCUITPY_AUDIOIO = 0
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
index c90d1218ba..887bf0a7da 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_MANUFACTURER = "makerdiary"
 
 MCU_CHIP = nrf52840
 
-CIRCUITPY_BUILD_EXTENSIONS = HEX
+CIRCUITPY_BUILD_EXTENSIONS = hex
 
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25R6435F"
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
index c6b578c087..1a650d5d4d 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
@@ -5,6 +5,6 @@ USB_MANUFACTURER = "makerdiary"
 
 MCU_CHIP = nrf52840
 
-CIRCUITPY_BUILD_EXTENSIONS = HEX_UF2
+CIRCUITPY_BUILD_EXTENSIONS = hex,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nrf/boards/microbit_v2/mpconfigboard.mk
index a5d0becd68..d0430ea403 100644
--- a/ports/nrf/boards/microbit_v2/mpconfigboard.mk
+++ b/ports/nrf/boards/microbit_v2/mpconfigboard.mk
@@ -3,7 +3,7 @@ CIRCUITPY_CREATION_ID = 0x80D8
 
 MCU_CHIP = nrf52833
 
-CIRCUITPY_BUILD_EXTENSIONS = COMBINED_HEX
+CIRCUITPY_BUILD_EXTENSIONS = combined.hex
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 0e6d4397d1..b30e6ee7a2 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_MANUFACTURER = "Nordic Semiconductor"
 
 MCU_CHIP = nrf52840
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25R6435F"
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index 2c023a9d92..fe702a50c9 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -5,6 +5,6 @@ USB_MANUFACTURER = "Nordic Semiconductor"
 
 MCU_CHIP = nrf52840
 
-CIRCUITPY_BUILD_EXTENSIONS = BIN_UF2
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index c8cd4b9f68..c1d3dce6e5 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -4,7 +4,7 @@ LD_TEMPLATE_FILE = boards/common.template.ld
 
 INTERNAL_LIBM = 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= UF2
+CIRCUITPY_BUILD_EXTENSIONS ?= uf2
 
 # Number of USB endpoint pairs.
 USB_NUM_ENDPOINT_PAIRS = 8
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 230fe1ad1a..6d4ff8bbe8 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -1,6 +1,6 @@
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
-CIRCUITPY_BUILD_EXTENSIONS ?= UF2
+CIRCUITPY_BUILD_EXTENSIONS ?= uf2
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index 8342ce6444..3bbfb7eec8 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -13,7 +13,7 @@ MCU_SERIES = F4
 MCU_VARIANT = STM32F401xE
 MCU_PACKAGE = LQFP64
 
-CIRCUITPY_BUILD_EXTENSIONS = UF2
+CIRCUITPY_BUILD_EXTENSIONS = uf2
 
 OPTIMIZATION_FLAGS = -Os
 
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 107c4e7247..1628925a89 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -1,7 +1,7 @@
 LONGINT_IMPL ?= MPZ
 INTERNAL_LIBM ?= 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= BIN
+CIRCUITPY_BUILD_EXTENSIONS ?= bin
 
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         CIRCUITPY_ALARM = 1
diff --git a/shared-bindings/support_matrix.rst b/shared-bindings/support_matrix.rst
index e007e27b47..c54bfa94e1 100644
--- a/shared-bindings/support_matrix.rst
+++ b/shared-bindings/support_matrix.rst
@@ -21,9 +21,9 @@ capable board, as well as each :term:`frozen module` included on it.
    {% for key, value in support_matrix|dictsort %}
        {{ '.. _' ~ key|replace(" ", "-") ~ ':' }}
    * - {{ key }}
-     - {{ ':py:mod:`' ~ value[0]|join("`, :py:mod:`") ~ '`' }}
+     - {{ ':py:mod:`' ~ value.modules|join("`, :py:mod:`") ~ '`' }}
 
-       {% for module in value[1] %}\
+       {% for module in value.frozen_libraries %}\
        {% if loop.index == 1 %}**Frozen Modules:** {% endif %}\
        {% if loop.index > 1 %}, {% endif %}\
        {% if module[1] %}{{ '`' ~ module[0] ~ ' <' ~ module[1] ~ '>`__' }}\
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index dff0a9e523..de6f15f207 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -23,20 +23,6 @@ from shared_bindings_matrix import (
     support_matrix_by_board,
 )
 
-extensions_by_macro = {
-    "BIN": ("bin",),
-    "UF2": ("uf2",),
-    "BIN_UF2": ("bin", "uf2"),
-    "HEX": ("hex",),
-    "HEX_UF2": ("hex", "uf2"),
-    "SPK": ("spk",),
-    "DFU": ("dfu",),
-    "BIN_DFU": ("bin", "dfu"),
-    "COMBINED_HEX": ("combined.hex",),
-    "KERNEL8_IMG": ("disk.img.zip", "kernel8.img"),
-    "KERNEL_IMG": ("disk.img.zip", "kernel.img"),
-}
-
 language_allow_list = set(
     [
         "ID",
@@ -228,7 +214,7 @@ def generate_download_info():
 
     languages = get_languages()
 
-    support_matrix = support_matrix_by_board(use_branded_name=False)
+    support_matrix = support_matrix_by_board(use_branded_name=False, withurl=False)
 
     new_stable = "-" not in new_tag
 
@@ -257,19 +243,17 @@ def generate_download_info():
                 board_info = board_mapping[board_id]
                 for alias in [board_id] + board_info["aliases"]:
                     alias_info = board_mapping[alias]
-                    modules_list = support_matrix[alias][0]
-                    frozen_libraries = [frozen[0] for frozen in support_matrix[alias][1]]
-                    extensions = support_matrix[alias][2]
                     if alias not in current_info:
                         changes["new_boards"].append(alias)
                         current_info[alias] = {"downloads": 0, "versions": []}
                     new_version = {
                         "stable": new_stable,
                         "version": new_tag,
-                        "modules": support_matrix[alias][0],
                         "languages": languages,
-                        "extensions": extensions,
-                        "frozen_libraries": frozen_libraries,
+                        # add modules, extensions, frozen_libraries explicitly
+                        "modules": support_matrix[alias]["modules"],
+                        "extensions": support_matrix[alias]["extensions"],
+                        "frozen_libraries": support_matrix[alias]["frozen_libraries"],
                     }
                     current_info[alias]["downloads"] = alias_info["download_count"]
                     current_info[alias]["versions"].append(new_version)
@@ -279,9 +263,10 @@ def generate_download_info():
     if changes["new_release"] and user:
         create_pr(changes, current_info, git_info, user)
     else:
-        print("No new release to update")
         if "DEBUG" in os.environ:
             print(create_json(current_info).decode("utf8"))
+        else:
+            print("No new release to update")
 
 
 if __name__ == "__main__":
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index 473038ec10..309d91c368 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -86,8 +86,10 @@ for board in build_boards:
             success = "\033[31mfailed\033[0m"
 
         other_output = ""
-        extensions_id = board_settings["CIRCUITPY_BUILD_EXTENSIONS"]
-        extensions = build_info.extensions_by_macro[extensions_id]
+        extensions = [
+            extension.strip()
+            for extension in board_settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
+        ]
 
         for extension in extensions:
             temp_filename = "../ports/{port}/{build}/firmware.{extension}".format(

From f472996e80d358046fccd0b60de855b46cc39e90 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 21 Jul 2022 03:08:51 +0200
Subject: [PATCH 0673/2403] move get_board_mapping to shared_binding_matrix
 because it just uses a list from there uppercase some of the configuration
 lists and dicts properly split the extensions into a list

---
 docs/shared_bindings_matrix.py | 61 +++++++++++++++++++++++++---------
 tools/build_board_info.py      | 30 ++---------------
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 41202a4fae..daa8d9f8b8 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -32,7 +32,7 @@ from concurrent.futures import ThreadPoolExecutor
 
 SUPPORTED_PORTS = ['atmel-samd', 'broadcom', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
 
-aliases_by_board = {
+ALIASES_BY_BOARD = {
     "circuitplayground_express": [
         "circuitplayground_express_4h",
         "circuitplayground_express_digikey_pycon2019",
@@ -43,7 +43,7 @@ aliases_by_board = {
     "pewpew10": ["pewpew13"],
 }
 
-aliases_brand_names = {
+ALIASES_BRAND_NAMES = {
     "circuitplayground_express_4h":
         "Adafruit Circuit Playground Express 4-H",
     "circuitplayground_express_digikey_pycon2019":
@@ -58,7 +58,7 @@ aliases_brand_names = {
         "PewPew 13",
 }
 
-additional_modules = {
+ADDITIONAL_MODULES = {
     "fontio": "CIRCUITPY_DISPLAYIO",
     "terminalio": "CIRCUITPY_DISPLAYIO",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
@@ -66,7 +66,7 @@ additional_modules = {
     "usb": "CIRCUITPY_USB_HOST",
 }
 
-frozen_excludes = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
+FROZEN_EXCLUDES = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
 """Files and dirs at the root of a frozen directory that should be ignored.
 This is the same list as in the preprocess_frozen_modules script."""
 
@@ -74,7 +74,7 @@ repository_urls = {}
 """Cache of repository URLs for frozen modules."""
 
 def get_circuitpython_root_dir():
-    """ The path to the root './circuitpython' directory
+    """ The path to the root './circuitpython' directory.
     """
     file_path = pathlib.Path(__file__).resolve()
     root_dir = file_path.parent.parent
@@ -82,12 +82,40 @@ def get_circuitpython_root_dir():
     return root_dir
 
 def get_shared_bindings():
-    """ Get a list of modules in shared-bindings based on folder names
+    """ Get a list of modules in shared-bindings based on folder names.
     """
     shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
     return [item.name for item in shared_bindings_dir.iterdir()] + ["binascii", "errno", "json", "re", "ulab"]
 
 
+def get_board_mapping():
+    """
+    Compiles the list of boards from the directories, with aliases and mapping
+    to the port.
+    """
+    boards = {}
+    for port in SUPPORTED_PORTS:
+        board_path = os.path.join("../ports", port, "boards")
+        for board_path in os.scandir(board_path):
+            if board_path.is_dir():
+                board_files = os.listdir(board_path.path)
+                board_id = board_path.name
+                aliases = ALIASES_BY_BOARD.get(board_path.name, [])
+                boards[board_id] = {
+                    "port": port,
+                    "download_count": 0,
+                    "aliases": aliases,
+                }
+                for alias in aliases:
+                    boards[alias] = {
+                        "port": port,
+                        "download_count": 0,
+                        "alias": True,
+                        "aliases": [],
+                    }
+    return boards
+
+
 def read_mpconfig():
     """ Open 'circuitpy_mpconfig.mk' and return the contents.
     """
@@ -112,8 +140,8 @@ def build_module_map():
     full_build = False
     for module in modules:
         full_name = module
-        if module in additional_modules:
-            search_identifier = additional_modules[module]
+        if module in ADDITIONAL_MODULES:
+            search_identifier = ADDITIONAL_MODULES[module]
         else:
             search_identifier = 'CIRCUITPY_'+module.lstrip("_").upper()
         re_pattern = f"{re.escape(search_identifier)}\s*\??=\s*(.+)"
@@ -211,14 +239,14 @@ def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
         $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
         $(TOP)/frozen/circuitpython-stage/meowbit
     Python modules are at the root of the path, and are python files or directories
-    containing python files. Except the ones in the frozen_excludes list.
+    containing python files. Except the ones in the FROZEN_EXCLUDES list.
     """
     frozen_modules = []
     for frozen_path in filter(lambda x: x, frozen_mpy_dirs.split(" ")):
         source_dir = get_circuitpython_root_dir() / frozen_path[7:]
         url_repository = get_repository_url(source_dir)
         for sub in source_dir.glob("*"):
-            if sub.name in frozen_excludes:
+            if sub.name in FROZEN_EXCLUDES:
                 continue
             if sub.name.endswith(".py"):
                 if withurl:
@@ -279,7 +307,10 @@ def support_matrix_by_board(use_branded_name=True, withurl=True):
         board_modules.sort()
 
         if "CIRCUITPY_BUILD_EXTENSIONS" in settings:
-            board_extensions = settings["CIRCUITPY_BUILD_EXTENSIONS"]
+            board_extensions = [
+                extension.strip() for extension in
+                settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
+            ]
         else:
             raise OSError(f"Board extensions undefined: {board_name}.")
 
@@ -297,11 +328,11 @@ def support_matrix_by_board(use_branded_name=True, withurl=True):
                 "extensions": board_extensions,
             }
         )]
-        if entry.name in aliases_by_board:
-            for alias in aliases_by_board[entry.name]:
+        if entry.name in ALIASES_BY_BOARD:
+            for alias in ALIASES_BY_BOARD[entry.name]:
                 if use_branded_name:
-                    if alias in aliases_brand_names:
-                        alias = aliases_brand_names[alias]
+                    if alias in ALIASES_BRAND_NAMES:
+                        alias = ALIASES_BRAND_NAMES[alias]
                     else:
                         alias = alias.replace("_"," ").title()
                 board_matrix.append((
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index de6f15f207..f810d942a7 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -19,11 +19,11 @@ import adabot.github_requests as github
 sys.path.append("../docs")
 from shared_bindings_matrix import (
     SUPPORTED_PORTS,
-    aliases_by_board,
     support_matrix_by_board,
+    get_board_mapping,
 )
 
-language_allow_list = set(
+LANGUAGE_ALLOW_LIST = set(
     [
         "ID",
         "de_DE",
@@ -52,34 +52,10 @@ def get_languages(list_all=False):
         if f.name.endswith(".po"):
             languages.add(f.name[:-3])
     if not list_all:
-        languages = languages & language_allow_list
+        languages = languages & LANGUAGE_ALLOW_LIST
     return sorted(list(languages), key=str.casefold)
 
 
-def get_board_mapping():
-    boards = {}
-    for port in SUPPORTED_PORTS:
-        board_path = os.path.join("../ports", port, "boards")
-        for board_path in os.scandir(board_path):
-            if board_path.is_dir():
-                board_files = os.listdir(board_path.path)
-                board_id = board_path.name
-                aliases = aliases_by_board.get(board_path.name, [])
-                boards[board_id] = {
-                    "port": port,
-                    "download_count": 0,
-                    "aliases": aliases,
-                }
-                for alias in aliases:
-                    boards[alias] = {
-                        "port": port,
-                        "download_count": 0,
-                        "alias": True,
-                        "aliases": [],
-                    }
-    return boards
-
-
 def get_version_info():
     version = None
     sha = git("rev-parse", "--short", "HEAD").stdout.decode("utf-8")

From 87e8994c4a08f4915e59a426f1662c98d961eefe Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 21 Jul 2022 03:52:15 +0200
Subject: [PATCH 0674/2403] no default extension for ESP, fix duplicate line in
 rp2

---
 ports/espressif/mpconfigport.mk   | 4 ++--
 ports/raspberrypi/mpconfigport.mk | 4 ++--
 ports/stm/mpconfigport.mk         | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 2655093be5..f390cbb21a 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -65,14 +65,14 @@ CIRCUITPY_BLEIO = 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
 
 else ifeq ($(IDF_TARGET),esp32s2)
 # No BLE on S2
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
-endif
-
 CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
+endif
 
 # From ESP32-S2/S3 Technical Reference Manual:
 #
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 6d4ff8bbe8..65e39ee99d 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -1,7 +1,5 @@
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
-CIRCUITPY_BUILD_EXTENSIONS ?= uf2
-CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 CIRCUITPY_ALARM ?= 1
@@ -38,6 +36,8 @@ CIRCUITPY_AUDIOMIXER = 1
 
 INTERNAL_LIBM = 1
 
+CIRCUITPY_BUILD_EXTENSIONS ?= uf2
+
 # Number of USB endpoint pairs.
 USB_NUM_ENDPOINT_PAIRS = 8
 
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 1628925a89..9705dcd0a0 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -1,8 +1,6 @@
 LONGINT_IMPL ?= MPZ
 INTERNAL_LIBM ?= 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= bin
-
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         CIRCUITPY_ALARM = 1
         CIRCUITPY_CANIO = 1
@@ -90,3 +88,4 @@ ifeq ($(MCU_SERIES),L4)
 endif
 
 CIRCUITPY_PARALLELDISPLAY := 0
+CIRCUITPY_BUILD_EXTENSIONS ?= bin

From 6e5c818311e213351dd73e7225166bbe4d17ffef Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 21 Jul 2022 19:43:57 +0200
Subject: [PATCH 0675/2403] fix extensions for atmel and 2 boards, matching
 main

---
 ports/atmel-samd/mpconfigport.mk                            | 2 +-
 ports/stm/boards/sparkfun_stm32_thing_plus/mpconfigboard.mk | 2 ++
 ports/stm/boards/swan_r5/mpconfigboard.mk                   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 94b19c5303..56cde4964b 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -134,4 +134,4 @@ CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
 endif # same51
 ######################################################################
 
-CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
+CIRCUITPY_BUILD_EXTENSIONS ?= uf2
diff --git a/ports/stm/boards/sparkfun_stm32_thing_plus/mpconfigboard.mk b/ports/stm/boards/sparkfun_stm32_thing_plus/mpconfigboard.mk
index 62d0136be5..24505eb23d 100644
--- a/ports/stm/boards/sparkfun_stm32_thing_plus/mpconfigboard.mk
+++ b/ports/stm/boards/sparkfun_stm32_thing_plus/mpconfigboard.mk
@@ -19,3 +19,5 @@ LD_BOOT = boards/STM32F405_boot.ld
 UF2_OFFSET = 0x8010000
 
 CIRCUITPY_RGBMATRIX ?= 1
+
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk
index 5d51c9406b..ee17f65f7c 100644
--- a/ports/stm/boards/swan_r5/mpconfigboard.mk
+++ b/ports/stm/boards/swan_r5/mpconfigboard.mk
@@ -71,3 +71,5 @@ CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_RTC = 1
+
+CIRCUITPY_BUILD_EXTENSIONS = bin,uf2

From 920c68e9d5965a59b96ab3d91a895e5801f99f86 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 26 Jul 2022 11:39:18 -0500
Subject: [PATCH 0676/2403] Update shared/readline/readline.c

Co-authored-by: Scott Shawcroft 
---
 shared/readline/readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index 908aec8426..d8602a9e28 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -182,7 +182,7 @@ int readline_process_char(int c) {
             // CTRL-L is clear screen / redraw. This specific sequence is used
             // (instead of a slightly more minimal sequence) for compatibility
             // with the built-in Terminal class
-            mp_hal_stdout_tx_str("I'm a little teapot\x1b[;H\x1b[2J");
+            mp_hal_stdout_tx_str("\x1b[;H\x1b[2J");
             mp_hal_stdout_tx_str(rl.prompt);
             mp_hal_stdout_tx_strn(rl.line->buf + rl.orig_line_len, rl.cursor_pos - rl.orig_line_len);
             // set redraw parameters

From f9cc4ec61b31b0210c9c42ce570a70daa983705a Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 26 Jul 2022 11:51:10 -0700
Subject: [PATCH 0677/2403] Fix print chunk

---
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index e641bb8605..5225cfe13e 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -335,7 +335,7 @@ static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) {
 }
 
 STATIC void _print_chunk(void *env, const char *str, size_t len) {
-    mp_print_t _socket_print = {socket, _print_raw};
+    mp_print_t _socket_print = {env, _print_raw};
     mp_printf(&_socket_print, "%X\r\n", len);
     _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, len);
     _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)"\r\n", 2);

From 1a7cca66395e2b6b568aab0b6f8ed5978ae1809b Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Tue, 26 Jul 2022 22:12:22 +0200
Subject: [PATCH 0678/2403] Add PNG image support to the Stage library

That requires zlib to be enabled.
---
 frozen/circuitpython-stage                         | 2 +-
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 3bdd335452..d12ac5ba4f 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 3bdd335452ff14a53d1e840de043e3159cb3b829
+Subproject commit d12ac5ba4feea2bf8bac8835bf120760c6970ee4
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index cffbaf619a..6858eac1ed 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -42,6 +42,7 @@ CIRCUITPY_KEYPAD = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
 CIRCUITPY_SYNTHIO = 1
+CIRCUITPY_ZLIB = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf

From d510e605119fb534acecb65f465cad59181e93c5 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Wed, 27 Jul 2022 00:08:02 +0200
Subject: [PATCH 0679/2403] Disable bitmaptools and busdevice on pewpew_m4 to
 fit ja translation

---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index cffbaf619a..06346b43de 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -33,6 +33,8 @@ CIRCUITPY_USB_CDC = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_VECTORIO = 0
+CIRCUITPY_BUSDEVICE = 0
+CIRCUITPY_BITMAPTOOLS = 0
 
 CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOIO = 1
@@ -42,6 +44,7 @@ CIRCUITPY_KEYPAD = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
 CIRCUITPY_SYNTHIO = 1
+CIRCUITPY_ZLIB = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf

From 931757f4a9524a2bd0959f6442aad01878f5e567 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 26 Jul 2022 15:29:49 -0700
Subject: [PATCH 0680/2403] Improve web workflow responsiveness

1. Run the socket select task at the same priority as CP. This is
  needed because it queues up the background work. Without it, CP
  needed to sleep to let the lower priority task go.
2. Close the active socket on disconnect. This prevents looping
  over a disconnected but not closed socket.

Fixes #6610. Fixes #6613
---
 .../espressif/common-hal/socketpool/Socket.c  | 51 ++++++++++---------
 supervisor/shared/web_workflow/web_workflow.c |  3 ++
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 45d5f1fea0..f6025d329c 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -60,32 +60,35 @@ STATIC void socket_select_task(void *arg) {
         FD_SET(socket_change_fd, &errfds);
         int max_fd = socket_change_fd;
         for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-            if (open_socket_fds[i] < 0) {
+            int sockfd = open_socket_fds[i];
+            if (sockfd < 0) {
                 continue;
             }
-            max_fd = MAX(max_fd, open_socket_fds[i]);
-            FD_SET(open_socket_fds[i], &readfds);
-            FD_SET(open_socket_fds[i], &errfds);
+            max_fd = MAX(max_fd, sockfd);
+            FD_SET(sockfd, &readfds);
+            FD_SET(sockfd, &errfds);
         }
 
         int num_triggered = select(max_fd + 1, &readfds, NULL, &errfds, NULL);
-        if (num_triggered < 0) {
-            // Maybe bad file descriptor
-            for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-                int sockfd = open_socket_fds[i];
-                if (sockfd < 0) {
-                    continue;
-                }
-                if (FD_ISSET(sockfd, &errfds)) {
-                    int err;
-                    int optlen = sizeof(int);
-                    int ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, (socklen_t *)&optlen);
-                    if (ret < 0) {
-                        open_socket_fds[i] = -1;
-                        // Try again.
-                        continue;
-                    }
-                }
+        // Check for bad file descriptor and queue up the background task before
+        // circling around.
+        if (num_triggered == -1 && errno == EBADF) {
+            // One for the change fd and one for the closed socket.
+            num_triggered = 2;
+        }
+        // Try and find the bad file and remove it from monitoring.
+        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
+            int sockfd = open_socket_fds[i];
+            if (sockfd < 0) {
+                continue;
+            }
+            int err;
+            int optlen = sizeof(int);
+            int ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, (socklen_t *)&optlen);
+            if (ret < 0) {
+                open_socket_fds[i] = -1;
+                // Raise num_triggered so that we skip the assert and queue the background task.
+                num_triggered = 2;
             }
         }
         assert(num_triggered >= 0);
@@ -117,13 +120,13 @@ void socket_user_reset(void) {
             user_socket[i] = false;
         }
         socket_change_fd = eventfd(0, 0);
-        // This task runs at a lower priority than CircuitPython and is used to wake CircuitPython
-        // up when any open sockets have data to read. It allows us to sleep otherwise.
+        // Run this at the same priority as CP so that the web workflow background task can be
+        // queued while CP is running. Both tasks can still sleep and, therefore, sleep overall.
         (void)xTaskCreateStaticPinnedToCore(socket_select_task,
             "socket_select",
             2 * configMINIMAL_STACK_SIZE,
             NULL,
-            0, // Run this at IDLE priority. We only need it when CP isn't running (at 1).
+            uxTaskPriorityGet(NULL),
             socket_select_stack,
             &socket_select_task_handle,
             xPortGetCoreID());
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 1fb8cdeff9..ff1c4060c3 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1265,6 +1265,9 @@ void supervisor_web_workflow_background(void) {
     // If we have a request in progress, continue working on it.
     if (common_hal_socketpool_socket_get_connected(&active)) {
         _process_request(&active, &active_request);
+    } else {
+        // Close the active socket if it is no longer connected.
+        common_hal_socketpool_socket_close(&active);
     }
 }
 

From bb734c75d7cbf2837010cdbda5b1e37cafd687cf Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 26 Jul 2022 15:33:13 -0700
Subject: [PATCH 0681/2403] Improve build matrix computation

If a changed file is in frozen, supervisor, shared-bindings,
shared-module or common-hal, then compute board settings to
determine if it is impacted.

This should reduce the boards built for changes that are in those
directories.
---
 tools/ci_set_matrix.py | 52 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index efb4427e7e..03aa362632 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -21,6 +21,7 @@ import json
 import yaml
 
 import build_board_info
+from shared_bindings_matrix import get_settings_from_makefile
 
 PORT_TO_ARCH = {
     "atmel-samd": "arm",
@@ -53,6 +54,7 @@ def set_boards_to_build(build_all):
     all_board_ids = set()
     port_to_boards = {}
     board_to_port = {}
+    board_settings = {}
     for board_id in boards_info_json:
         info = boards_info_json[board_id]
         if info.get("alias", False):
@@ -70,6 +72,9 @@ def set_boards_to_build(build_all):
         boards_to_build = set()
         board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
         port_pattern = re.compile(r"^ports/([^/]+)/")
+        module_pattern = re.compile(
+            r"^(ports/[^/]+/common-hal|shared-bindings|shared-module)/([^/]+)/"
+        )
         for p in changed_files:
             # See if it is board specific
             board_matches = board_pattern.search(p)
@@ -80,7 +85,8 @@ def set_boards_to_build(build_all):
 
             # See if it is port specific
             port_matches = port_pattern.search(p)
-            if port_matches:
+            module_matches = module_pattern.search(p)
+            if port_matches and not module_matches:
                 port = port_matches.group(1)
                 if port != "unix":
                     boards_to_build.update(port_to_boards[port])
@@ -94,6 +100,48 @@ def set_boards_to_build(build_all):
             if p.startswith("tests"):
                 continue
 
+            # As a (nearly) last resort, for some certain files, we compute the settings from the
+            # makefile for each board and determine whether to build them that way.
+            if p.startswith("frozen") or p.startswith("supervisor") or module_matches:
+                for board in all_board_ids:
+                    if board not in board_settings:
+                        board_settings[board] = get_settings_from_makefile(
+                            "../ports/" + board_to_port[board], board
+                        )
+                    settings = board_settings[board]
+
+                    # Check frozen files to see if they are in each board.
+                    frozen = settings.get("FROZEN_MPY_DIRS", "")
+                    if frozen and p.startswith("frozen") and p in frozen:
+                        boards_to_build.add(board)
+                        continue
+
+                    # Check supervisor files. This is useful for limiting workflow changes to the
+                    # relevant boards.
+                    supervisor = settings["SRC_SUPERVISOR"]
+                    if p.startswith("supervisor"):
+                        if p in supervisor:
+                            boards_to_build.add(board)
+                            continue
+
+                        web_workflow = settings["CIRCUITPY_WEB_WORKFLOW"]
+                        while web_workflow.startswith("$("):
+                            web_workflow = settings[web_workflow[2:-1]]
+                        if (
+                            p.startswith("supervisor/shared/web_workflow/static/")
+                            and web_workflow != "0"
+                        ):
+                            boards_to_build.add(board)
+                            continue
+
+                    # Check module matches
+                    if module_matches:
+                        module = module_matches.group(2) + "/"
+                        if module in settings["SRC_PATTERNS"]:
+                            boards_to_build.add(board)
+                            continue
+                continue
+
             # Otherwise build it all
             boards_to_build = all_board_ids
             break
@@ -101,7 +149,7 @@ def set_boards_to_build(build_all):
     # Split boards by architecture.
     print("Building boards:")
     arch_to_boards = {"aarch": [], "arm": [], "riscv": [], "espressif": []}
-    for board in boards_to_build:
+    for board in sorted(boards_to_build):
         print(" ", board)
         port = board_to_port.get(board)
         # A board can appear due to its _deletion_ (rare)

From a55aebc7180a747dbd1195b57bc603fff2c5a570 Mon Sep 17 00:00:00 2001
From: Arudinne 
Date: Tue, 26 Jul 2022 20:34:01 -0500
Subject: [PATCH 0682/2403] Added support for 8MB flash for Challenger 840

---
 ports/nrf/boards/challenger_840/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nrf/boards/challenger_840/mpconfigboard.mk
index 61af9ac029..ddb55ce705 100644
--- a/ports/nrf/boards/challenger_840/mpconfigboard.mk
+++ b/ports/nrf/boards/challenger_840/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "Invector Labs AB"
 MCU_CHIP = nrf52840
 
 SPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV"
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV,W25Q64FV"

From 38db1d5f605cba9ab5ab6708608cb5007b231af7 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Wed, 27 Jul 2022 09:59:19 +0200
Subject: [PATCH 0683/2403] Remove GIF support to make room for PNG

---
 frozen/circuitpython-stage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index d12ac5ba4f..9c88283920 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit d12ac5ba4feea2bf8bac8835bf120760c6970ee4
+Subproject commit 9c88283920607119b687dd647582d06dc60e268d

From 2a9d3c5ed27e9622e3e146d7b79a2297452f106b Mon Sep 17 00:00:00 2001
From: Chris Dailey 
Date: Wed, 27 Jul 2022 08:38:52 -0400
Subject: [PATCH 0684/2403] Adds BOOT0 (GPIO 0) as a named pin for MagTag.

---
 ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c
index 2aa2b11b06..1df28f8e05 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c
@@ -37,6 +37,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BUTTON_D), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
 
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
     { MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
 

From 6d10fe57030d42ba759d3aa38aad395a36f21eab Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Wed, 27 Jul 2022 15:56:35 +0200
Subject: [PATCH 0685/2403] Bump Stage to 1.3.4

---
 frozen/circuitpython-stage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 9c88283920..f993d5fac6 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 9c88283920607119b687dd647582d06dc60e268d
+Subproject commit f993d5fac69f3a0cfa33988268666c462b72c0ec

From addd52e7c600eaa094adab9166495aea780d3f01 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Wed, 27 Jul 2022 18:28:01 +0100
Subject: [PATCH 0686/2403] Update requirements-dev.txt

added pre-commit as it wasn't installed resulting in error when following learn guide: https://learn.adafruit.com/building-circuitpython/build-circuitpython
---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3b4411bd3a..f65c13fa69 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -17,6 +17,7 @@ polib
 # For pre-commit
 pyyaml
 black
+pre-commit
 
 # for combining the Nordic SoftDevice with CircuitPython
 intelhex

From 0a6f9112b166b79776d5f0b5b3391cfcac8afd9f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 27 Jul 2022 14:50:57 -0400
Subject: [PATCH 0687/2403] update mpy-cross macOS build to macos 11; make
 macos mpy-cross names consistent

---
 .github/workflows/build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8dc31a3ff6..b767a92376 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,7 +143,7 @@ jobs:
 
 
   mpy-cross-mac:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
     - name: Dump GitHub context
       env:
@@ -176,7 +176,7 @@ jobs:
       run: make -C mpy-cross -j2
     - uses: actions/upload-artifact@v2
       with:
-        name: mpy-cross-macos-catalina
+        name: mpy-cross-macos-11-x64
         path: mpy-cross/mpy-cross
     - name: Select SDK for M1 build
       run: sudo xcode-select -switch /Applications/Xcode_12.3.app
@@ -184,19 +184,19 @@ jobs:
       run: make -C mpy-cross -j2 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v2
       with:
-        name: mpy-cross-macos-bigsur-arm64
+        name: mpy-cross-macos-11-arm64
         path: mpy-cross/mpy-cross-arm64
     - name: Make universal binary
-      run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
+      run: lipo -create -output mpy-cross-macos-11-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
     - uses: actions/upload-artifact@v2
       with:
-        name: mpy-cross-macos-universal
-        path: mpy-cross-macos-universal
+        name: mpy-cross-macos-11-universal
+        path: mpy-cross-macos-11-universal
     - name: Upload mpy-cross build to S3
       run: |
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-universal-${{ env.CP_VERSION }} --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-bigsur-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

From bea955222ab200027b6b2fcdf9164e9c8fc4a3d1 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 27 Jul 2022 12:15:13 -0700
Subject: [PATCH 0688/2403] Improve USB to Serial/JTAG TX

It had a tight 5ms timeout before that caused some characters to
drop. Now the wait is longer and reset after a successful transmit.
This follows what MicroPython does.

Fixes #6220
---
 ports/espressif/supervisor/usb_serial_jtag.c | 27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c
index 064d7d668c..33f0ec3a8e 100644
--- a/ports/espressif/supervisor/usb_serial_jtag.c
+++ b/ports/espressif/supervisor/usb_serial_jtag.c
@@ -98,14 +98,23 @@ bool usb_serial_jtag_bytes_available(void) {
 }
 
 void usb_serial_jtag_write(const char *text, uint32_t length) {
-    if (USB_SERIAL_JTAG.fram_num.sof_frame_index > 0) {
-        size_t total_written = 0;
-        uint32_t start_time = supervisor_ticks_ms32();
-        // Time out after 5 milliseconds in case usb isn't actually reading CDC.
-        while (total_written < length && start_time - supervisor_ticks_ms32() < 5) {
-            total_written += usb_serial_jtag_ll_write_txfifo((const uint8_t *)(text + total_written), length - total_written);
-            RUN_BACKGROUND_TASKS;
-        }
-        usb_serial_jtag_ll_txfifo_flush();
+    if (!usb_serial_jtag_connected()) {
+        return;
     }
+    size_t total_written = 0;
+    while (total_written < length) {
+        uint32_t start_time = supervisor_ticks_ms32();
+        // Wait until we can write to the FIFO again. If it takes too long, then
+        // assume we're disconnected.
+        while (!usb_serial_jtag_ll_txfifo_writable()) {
+            uint32_t now = supervisor_ticks_ms32();
+            if (now - start_time > 200) {
+                connected = false;
+                return;
+            }
+        }
+        total_written += usb_serial_jtag_ll_write_txfifo((const uint8_t *)(text + total_written), length - total_written);
+        RUN_BACKGROUND_TASKS;
+    }
+    usb_serial_jtag_ll_txfifo_flush();
 }

From db6c9836b089222650a66ebace2a479c8aa8bff2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 27 Jul 2022 22:28:00 -0400
Subject: [PATCH 0689/2403] don't need to select macOS sdk any more

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b767a92376..94837e4082 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -178,8 +178,6 @@ jobs:
       with:
         name: mpy-cross-macos-11-x64
         path: mpy-cross/mpy-cross
-    - name: Select SDK for M1 build
-      run: sudo xcode-select -switch /Applications/Xcode_12.3.app
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j2 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v2

From 8b4a5816bd557e4644eba4b13a5c574a2143ac5e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 27 Jul 2022 22:51:14 -0400
Subject: [PATCH 0690/2403] don't specify -sdk in Makefile.m1 for mpy-cross

---
 mpy-cross/Makefile.m1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpy-cross/Makefile.m1 b/mpy-cross/Makefile.m1
index 34e9841540..13431f708b 100644
--- a/mpy-cross/Makefile.m1
+++ b/mpy-cross/Makefile.m1
@@ -7,4 +7,4 @@ BUILD=build-arm64
 
 include mpy-cross.mk
 # Because mpy-cross.mk unconditionally overwrites CC for Darwin, we must set it BELOW the inclusion
-CC := $(shell xcrun --sdk macosx11.1 --find clang) -isysroot $(shell xcrun --sdk macosx11.1 --show-sdk-path) -target arm64-apple-macos11
+CC := $(shell xcrun --find clang) -isysroot $(shell xcrun --show-sdk-path) -target arm64-apple-macos11

From 2a0e4f7ee22e8c133efeba8e199fd9a30b10f964 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Thu, 28 Jul 2022 12:03:22 +0100
Subject: [PATCH 0691/2403] added css support to web workflow

Added a bare minimum css implementation to web workflow to improve readability
---
 supervisor/shared/web_workflow/static/directory.html | 1 +
 supervisor/shared/web_workflow/static/serial.html    | 1 +
 supervisor/shared/web_workflow/static/style.css      | 7 +++++++
 supervisor/shared/web_workflow/static/welcome.html   | 1 +
 supervisor/shared/web_workflow/web_workflow.c        | 3 +++
 5 files changed, 13 insertions(+)
 create mode 100644 supervisor/shared/web_workflow/static/style.css

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index d0ca1a3b32..0586cd0a54 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -4,6 +4,7 @@
     
     
     
+    
 
 
     
     
    
diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index 0c13248904..5dfcb6cc7d 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -5,6 +5,7 @@
   
   
   
+  
 
 
   
    
diff --git a/supervisor/shared/web_workflow/static/style.css b/supervisor/shared/web_workflow/static/style.css
new file mode 100644
index 0000000000..7aa3eda00b
--- /dev/null
+++ b/supervisor/shared/web_workflow/static/style.css
@@ -0,0 +1,7 @@
+body {
+  max-width: 960px;
+  margin: 20px auto;
+  font-size: 18px;
+  font-family: "Proxima Nova", Verdana, sans-serif;
+  line-height: 20.7px;
+}
\ No newline at end of file
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 139e9eba39..d63b47584f 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -5,6 +5,7 @@
     
     
     
+    
 
 
     
     Welcome!
    
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index ff1c4060c3..a9435cc258 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -861,6 +861,7 @@ STATIC_FILE(directory_html);
 STATIC_FILE(directory_js);
 STATIC_FILE(welcome_html);
 STATIC_FILE(welcome_js);
+STATIC_FILE(style_css);
 STATIC_FILE(serial_html);
 STATIC_FILE(serial_js);
 STATIC_FILE(blinka_16x16_ico);
@@ -1070,6 +1071,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             _REPLY_STATIC(socket, request, welcome_js);
         } else if (strcmp(request->path, "/serial.js") == 0) {
             _REPLY_STATIC(socket, request, serial_js);
+        } else if (strcmp(request->path, "/style.css") == 0) {
+            _REPLY_STATIC(socket, request, style_css);    
         } else if (strcmp(request->path, "/favicon.ico") == 0) {
             // TODO: Autogenerate this based on the blinka bitmap and change the
             // palette based on MAC address.

From 555bf7cc12dd4f6b3d990b6a918aa3461e1f3123 Mon Sep 17 00:00:00 2001
From: Michael Himing 
Date: Tue, 26 Jul 2022 21:07:55 +1000
Subject: [PATCH 0692/2403] Add board: seeed_xiao_esp32c3

---
 .../boards/seeed_xiao_esp32c3/board.c         | 26 +++++++++++
 .../boards/seeed_xiao_esp32c3/mpconfigboard.h | 14 ++++++
 .../seeed_xiao_esp32c3/mpconfigboard.mk       | 10 +++++
 .../boards/seeed_xiao_esp32c3/pins.c          | 43 +++++++++++++++++++
 .../boards/seeed_xiao_esp32c3/sdkconfig       |  5 +++
 5 files changed, 98 insertions(+)
 create mode 100644 ports/espressif/boards/seeed_xiao_esp32c3/board.c
 create mode 100644 ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/seeed_xiao_esp32c3/pins.c
 create mode 100644 ports/espressif/boards/seeed_xiao_esp32c3/sdkconfig

diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/board.c b/ports/espressif/boards/seeed_xiao_esp32c3/board.c
new file mode 100644
index 0000000000..f5fd5702c3
--- /dev/null
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/board.c
@@ -0,0 +1,26 @@
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
+
+#include "components/driver/include/driver/gpio.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO20);
+    common_hal_never_reset_pin(&pin_GPIO21);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.h b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.h
new file mode 100644
index 0000000000..638be9d197
--- /dev/null
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Seeed Studio XIAO ESP32C3"
+#define MICROPY_HW_MCU_NAME "ESP32-C3FN4"
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO7)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO6)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO8)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO10)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO9)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
new file mode 100644
index 0000000000..9e14c9ac7f
--- /dev/null
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID = 0x000C2886
+CIRCUITPY_CREATION_ID = 0x00C30001
+
+IDF_TARGET = esp32c3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/pins.c b/ports/espressif/boards/seeed_xiao_esp32c3/pins.c
new file mode 100644
index 0000000000..5fc475d564
--- /dev/null
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/pins.c
@@ -0,0 +1,43 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO10) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/sdkconfig b/ports/espressif/boards/seeed_xiao_esp32c3/sdkconfig
new file mode 100644
index 0000000000..b2c9bc0fe6
--- /dev/null
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/sdkconfig
@@ -0,0 +1,5 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="seeed-xiao-esp32c3"
+# end of LWIP

From ddeb833a3ac106d35a362e9eada26d652a16a8a0 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 07:43:39 -0700
Subject: [PATCH 0693/2403] Shrink Feather S3 4mb build with -Os

---
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index 39804bad26..1b4c4015f5 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_PS2IO = 0
+OPTIMIZATION_FLAGS = -Os

From 2baf3455bd22590e241e08fdec20c12af9826d40 Mon Sep 17 00:00:00 2001
From: David Glaude 
Date: Thu, 28 Jul 2022 16:46:56 +0200
Subject: [PATCH 0694/2403] Add board.LED (alias of board.LED_R part of RGB)

Totally untested change (will try with the artifact), but I think every board should have a board.LED if possible to be able to use the learn guide basic instruction.
---
 ports/raspberrypi/boards/pimoroni_interstate75/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/boards/pimoroni_interstate75/pins.c b/ports/raspberrypi/boards/pimoroni_interstate75/pins.c
index 2460ebc76a..801a418015 100644
--- a/ports/raspberrypi/boards/pimoroni_interstate75/pins.c
+++ b/ports/raspberrypi/boards/pimoroni_interstate75/pins.c
@@ -22,6 +22,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_SW_A), MP_ROM_PTR(&pin_GPIO14) },
 
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_LED_R), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_LED_G), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_LED_B), MP_ROM_PTR(&pin_GPIO18) },

From ccd60632845f4d3b38cc5424844985478ec115a7 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Thu, 28 Jul 2022 16:08:05 +0100
Subject: [PATCH 0695/2403] Update welcome.html

Made html more semantic.
---
 .../shared/web_workflow/static/welcome.html   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index d63b47584f..321fe09d43 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -8,16 +8,26 @@
     
 
 
+
     
     Welcome!
    
-    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
+
+    
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
    
+
     
    Device Info
    
-    Board: 
    
-    Version: 
    
-    Hostname: 
    
-    IP: 
-    
    Other Devices
    
-    Here are other CircuitPython devices on your network:
+
+    
    
+        
    Board:
    
+        
    
+        
    Version:
    
+        
    
+        
    Hostname:
    
+        
    
+        
    IP:
    
+        
    
+        
    Other Devices
    
+    
    
+    
    Here are other CircuitPython devices on your network:
    
     
      
-    
    
+        
 
 

From 1332bb6534fe1888f8c4ca10ed3d36df2b64ff06 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 08:16:16 -0700
Subject: [PATCH 0696/2403] Add newline

---
 supervisor/shared/web_workflow/static/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/style.css b/supervisor/shared/web_workflow/static/style.css
index 7aa3eda00b..f6ef757b3f 100644
--- a/supervisor/shared/web_workflow/static/style.css
+++ b/supervisor/shared/web_workflow/static/style.css
@@ -4,4 +4,4 @@ body {
   font-size: 18px;
   font-family: "Proxima Nova", Verdana, sans-serif;
   line-height: 20.7px;
-}
\ No newline at end of file
+}

From df14f953981500b56b19753215adee2d64ab03c5 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 08:16:51 -0700
Subject: [PATCH 0697/2403] Delete trailing spaces

---
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index a9435cc258..b87493b1bc 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1072,7 +1072,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else if (strcmp(request->path, "/serial.js") == 0) {
             _REPLY_STATIC(socket, request, serial_js);
         } else if (strcmp(request->path, "/style.css") == 0) {
-            _REPLY_STATIC(socket, request, style_css);    
+            _REPLY_STATIC(socket, request, style_css);
         } else if (strcmp(request->path, "/favicon.ico") == 0) {
             // TODO: Autogenerate this based on the blinka bitmap and change the
             // palette based on MAC address.

From 8b6e4cc4e80834b452dc0a912bb8cd6cca049ec3 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 08:18:52 -0700
Subject: [PATCH 0698/2403] Delete trailing spaces

---
 supervisor/shared/web_workflow/static/welcome.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 321fe09d43..a7976055d3 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -28,6 +28,6 @@
     
     
    Here are other CircuitPython devices on your network:
    
     
      
-    
        
+    
 
 

From babd4ee618b87b043eca95b6e97aa01f72cf465e Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 08:43:36 -0700
Subject: [PATCH 0699/2403] Tweaks based on review comments

---
 shared-bindings/mdns/Server.c                 |  4 ++--
 supervisor/shared/web_workflow/web_workflow.c | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index e11c1c4730..bcf761d72a 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -161,8 +161,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 //|     def advertise_service(self, *,  service_type: str, protocol: str, port: int) -> None:
 //|         """Respond to queries for the given service with the given port.
 //|
-//|         service_type and protocol can only occur on one port. Any call after the first will
-//|         update the entry's port.
+//|         ``service_type`` and ``protocol`` can only occur on one port. Any call after the first
+//|         will update the entry's port.
 //|
 //|         :param str service_type: The service type such as "_http"
 //|         :param str protocol: The service protocol such as "_tcp"
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 5225cfe13e..98ee007328 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -247,6 +247,7 @@ void supervisor_start_web_workflow(void) {
     port_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PORT", port_encoded, sizeof(port_encoded) - 1);
     #endif
     if (0 < port_len && port_len < sizeof(port_encoded)) {
+        port_encoded[port_len] = '\0';
         new_port = strtoul(port_encoded, NULL, 10);
     }
 
@@ -623,8 +624,6 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
 
 static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request, const char *filename, FIL *active_file) {
     uint32_t total_length = f_size(active_file);
-    char encoded_len[10];
-    snprintf(encoded_len, sizeof(encoded_len), "%d", total_length);
 
     _send_str(socket, "HTTP/1.1 200 OK\r\n");
     mp_print_t _socket_print = {socket, _print_raw};
@@ -1209,9 +1208,12 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                         request->authenticated = strncmp(request->header_value, prefix, strlen(prefix)) == 0 &&
                             strcmp(_api_password, request->header_value + strlen(prefix)) == 0;
                     } else if (strcasecmp(request->header_key, "Host") == 0) {
-                        // Do a prefix check so that port is ignored.
+                        // Do a prefix check so that port is ignored. Length must be the same or the
+                        // header ends in :.
                         const char *cp_local = "circuitpython.local";
-                        request->redirect = strncmp(request->header_value, cp_local, strlen(cp_local)) == 0;
+                        request->redirect = strncmp(request->header_value, cp_local, strlen(cp_local)) == 0 &&
+                            (strlen(request->header_value) == strlen(cp_local) ||
+                                request->header_value[strlen(cp_local)] == ':');
                     } else if (strcasecmp(request->header_key, "Content-Length") == 0) {
                         request->content_length = strtoul(request->header_value, NULL, 10);
                     } else if (strcasecmp(request->header_key, "Expect") == 0) {

From ac53e7e4390d91b3791e6a0de3e087ad2cb94948 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Thu, 28 Jul 2022 16:57:02 +0100
Subject: [PATCH 0700/2403] further refinements

---
 supervisor/shared/web_workflow/static/welcome.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index a7976055d3..125158fd8d 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -13,7 +13,7 @@
 
     
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
    
 
-    
    Device Info
    
+    
    Device Info:
    
 
     
    
         
    Board:
    
@@ -22,12 +22,12 @@
         
    
         
    Hostname:
    
         
    
-        
    IP:
    
-        
    
-        
    Other Devices
    
+        
    IP:
    
+        
    
     
    
+    
     
    Here are other CircuitPython devices on your network:
    
     
      
-    
    
+        
 
 

From b11eb12da53f6c0f87642f7cdee157160d3cd33b Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 11:00:26 -0700
Subject: [PATCH 0701/2403] Fix modified time. Use snprintf for uint64_t
 printing.

---
 supervisor/shared/web_workflow/web_workflow.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 98ee007328..a4679c0932 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -608,7 +608,11 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
             (file_info.ftime >> 5) & 0x1f,
             (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
 
-        mp_printf(&_socket_print, "\"modified_ns\": %lld, ", truncated_time);
+        // Use snprintf because mp_printf doesn't support 64 bit numbers by
+        // default.
+        char encoded_time[32];
+        snprintf(encoded_time, sizeof(encoded_time), "%llu", truncated_time);
+        mp_printf(&_socket_print, "\"modified_ns\": %s, ", encoded_time);
         size_t file_size = 0;
         if ((file_info.fattrib & AM_DIR) == 0) {
             file_size = file_info.fsize;

From 35797ff3f07ef2cee2841125b2bf1d235595d43d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 28 Jul 2022 12:52:41 -0700
Subject: [PATCH 0702/2403] Remove trailing spaces

---
 supervisor/shared/web_workflow/static/welcome.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 125158fd8d..e075c0200d 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -25,9 +25,9 @@
         
    IP:
    
         
    
     
-    
+
     
    Here are other CircuitPython devices on your network:
    
     
      
-    
        
+    
 
 

From 3817d007aa78b3389adbf26cbbb4e08e16870d12 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 28 Jul 2022 17:52:27 -0400
Subject: [PATCH 0703/2403] clean up esp32 sdkconfigs

---
 .../adafruit_feather_esp32_v2/sdkconfig       | 59 ++++++-------------
 .../esp-idf-config/sdkconfig-esp32.defaults   | 17 +-----
 2 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index f2e8085d3e..4250aa45e3 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -1,11 +1,4 @@
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-# end of Partition Table
-
-#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
 # SPI RAM config
 #
 # CONFIG_SPIRAM_TYPE_AUTO is not set
@@ -13,40 +6,22 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
-# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
+# end of SPI RAM config
 
+# Uncomment to send log output to TX/RX pins on Feather ESP32V2
 #
-# SPI RAM config
+# ESP System Settings
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-
-### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
-### #
-### # ESP System Settings
-### #
-### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-### # CONFIG_ESP_CONSOLE_NONE is not set
-### CONFIG_ESP_CONSOLE_UART=y
-### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-### CONFIG_ESP_CONSOLE_UART_NUM=0
-### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
-### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
-### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-### # end of ESP System Settings
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# # CONFIG_ESP_CONSOLE_NONE is not set
+# CONFIG_ESP_CONSOLE_UART=y
+# nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+# CONFIG_ESP_CONSOLE_UART_NUM=0
+# CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+# CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+# CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+# # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+# # end of ESP System Settings
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 6c244f3bbe..0b8efe48cd 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -1,3 +1,6 @@
+#
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_TARGET_ESP32=y
@@ -112,19 +115,6 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # end of Serial flasher config
 
-#
-# Partition Table
-#
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
-# CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
-# CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-# CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_MD5=y
-# end of Partition Table
-
 #
 # Compiler options
 #
@@ -1081,7 +1071,6 @@ CONFIG_STACK_CHECK_NONE=y
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 CONFIG_ADC2_DISABLE_DAC=y
-CONFIG_SPIRAM_SUPPORT=y
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ULP_COPROC_ENABLED is not set
 CONFIG_ULP_COPROC_RESERVE_MEM=0

From cfa7de7592a43792fd58ec3e5142992d2cb2ae64 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 28 Jul 2022 18:14:32 -0400
Subject: [PATCH 0704/2403] fix name for macOS mpy-cross universal build

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94837e4082..84224a1c1a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -185,11 +185,11 @@ jobs:
         name: mpy-cross-macos-11-arm64
         path: mpy-cross/mpy-cross-arm64
     - name: Make universal binary
-      run: lipo -create -output mpy-cross-macos-11-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
+      run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
     - uses: actions/upload-artifact@v2
       with:
         name: mpy-cross-macos-11-universal
-        path: mpy-cross-macos-11-universal
+        path: mpy-cross-macos-universal
     - name: Upload mpy-cross build to S3
       run: |
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1

From d6344812e8ca7032b50f4c0f0aedb88448183f02 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 27 Jul 2022 17:00:38 -0700
Subject: [PATCH 0705/2403] Lots of web workflow, C3 and title bar fixes

* Fixes #6221 - C3 hang on `import wifi`. Enabling the WiFi PHY was
  disabling USB. Now boards that use it set CONFIG_ESP_PHY_ENABLE_USB
  explicitly.
* Fixes #6655 - Allows pasting into the web serial page. Fixes reading
  more than 0xf bytes at a time.
* Fixes #6653 - Fixes web socket encoding of payloads >125 bytes. Can
  happen when printing a long string.
* Fixes C3 responsiveness when waiting for key to enter REPL. (It
  now correctly stops sleeping.)
* Disables title bar updates when in raw REPL. Related to #6548.
* Adds version to title bar.
---
 main.c                                        |  4 +
 .../boards/adafruit_qtpy_esp32c3/sdkconfig    |  8 ++
 .../boards/beetle-esp32-c3/sdkconfig          |  6 ++
 .../espressif/boards/lolin_c3_mini/sdkconfig  |  6 ++
 ports/espressif/common-hal/wifi/__init__.c    |  3 +-
 ports/espressif/esp-idf                       |  2 +-
 ports/espressif/supervisor/port.c             |  9 +-
 ports/espressif/supervisor/usb_serial_jtag.c  | 27 +++---
 supervisor/port.h                             | 12 ++-
 .../esp_port.h => supervisor/shared/port.c    | 14 ++-
 supervisor/shared/serial.c                    | 12 ++-
 supervisor/shared/title_bar.c                 | 93 +++++++++++++++++++
 supervisor/shared/title_bar.h                 | 34 +++++++
 .../shared/web_workflow/static/serial.js      |  4 +-
 supervisor/shared/web_workflow/web_workflow.c | 54 +++++++----
 supervisor/shared/web_workflow/web_workflow.h |  1 +
 supervisor/shared/web_workflow/websocket.c    | 22 ++++-
 supervisor/shared/workflow.c                  | 20 ----
 supervisor/supervisor.mk                      |  2 +
 19 files changed, 262 insertions(+), 71 deletions(-)
 rename ports/espressif/supervisor/esp_port.h => supervisor/shared/port.c (78%)
 create mode 100644 supervisor/shared/title_bar.c
 create mode 100644 supervisor/shared/title_bar.h

diff --git a/main.c b/main.c
index 5fcb2d61a6..d310f571a6 100644
--- a/main.c
+++ b/main.c
@@ -57,6 +57,7 @@
 #include "supervisor/shared/stack.h"
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/tick.h"
+#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/traceback.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/workflow.h"
@@ -822,7 +823,9 @@ STATIC int run_repl(bool first_run) {
     status_led_deinit();
     #endif
     if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+        supervisor_title_bar_suspend();
         exit_code = pyexec_raw_repl();
+        supervisor_title_bar_resume();
     } else {
         exit_code = pyexec_friendly_repl();
     }
@@ -914,6 +917,7 @@ int __attribute__((used)) main(void) {
     run_boot_py(safe_mode);
 
     supervisor_workflow_start();
+    supervisor_title_bar_start();
 
     // Boot script is finished, so now go into REPL or run code.py.
     int exit_code = PYEXEC_FORCED_EXIT;
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
index f9b0292400..5111900c7e 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
@@ -30,6 +30,14 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
 #
 # Component config
 #
+#
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # ESP System Settings
 #
diff --git a/ports/espressif/boards/beetle-esp32-c3/sdkconfig b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
index 129c537108..331a5d14dc 100644
--- a/ports/espressif/boards/beetle-esp32-c3/sdkconfig
+++ b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
@@ -1,3 +1,9 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # LWIP
 #
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index 2cb6b06589..c548ee3c69 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,3 +1,9 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # LWIP
 #
diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index 885cc98f96..ca0533525d 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -44,6 +44,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 #include "components/log/include/esp_log.h"
 
 #include "supervisor/port.h"
+#include "supervisor/shared/title_bar.h"
 #include "supervisor/workflow.h"
 
 #include "esp_ipc.h"
@@ -55,7 +56,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 static const char *TAG = "CP wifi";
 
 STATIC void schedule_background_on_cp_core(void *arg) {
-    supervisor_workflow_request_background();
+    supervisor_title_bar_request_update(false);
 
     // CircuitPython's VM is run in a separate FreeRTOS task from wifi callbacks. So, we have to
     // notify the main task every time in case it's waiting for us.
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 0180c0cb80..ddb7ddbcb6 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 0180c0cb80f052919badc15df164e8edde6344ad
+Subproject commit ddb7ddbcb613a582e0a91eda8b1d2510dd0a2d83
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index adefff3f71..5245c9f025 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -30,7 +30,6 @@
 #include "supervisor/board.h"
 #include "supervisor/port.h"
 #include "py/runtime.h"
-#include "supervisor/esp_port.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -390,6 +389,14 @@ void port_wake_main_task() {
     xTaskNotifyGive(circuitpython_task);
 }
 
+void port_wake_main_task_from_isr() {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    vTaskNotifyGiveFromISR(circuitpython_task, &xHigherPriorityTaskWoken);
+    if (xHigherPriorityTaskWoken == pdTRUE) {
+        portYIELD_FROM_ISR();
+    }
+}
+
 void sleep_timer_cb(void *arg) {
     port_wake_main_task();
 }
diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c
index 33f0ec3a8e..c666c9bb3c 100644
--- a/ports/espressif/supervisor/usb_serial_jtag.c
+++ b/ports/espressif/supervisor/usb_serial_jtag.c
@@ -28,19 +28,23 @@
 #include "py/ringbuf.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "usb_serial_jtag.h"
+#include "supervisor/port.h"
+#include "supervisor/usb_serial_jtag.h"
 
 #include "hal/usb_serial_jtag_ll.h"
 #include "esp_intr_alloc.h"
 #include "soc/periph_defs.h"
 
-#include "supervisor/esp_port.h"
 
 #define USB_SERIAL_JTAG_BUF_SIZE (64)
 
 STATIC ringbuf_t ringbuf;
 STATIC uint8_t buf[128];
-STATIC bool connected;
+STATIC volatile bool connected;
+
+#if CIRCUITPY_ESP_USB_SERIAL_JTAG && !CONFIG_ESP_PHY_ENABLE_USB
+#error "CONFIG_ESP_PHY_ENABLE_USB must be enabled in sdkconfig"
+#endif
 
 static void usb_serial_jtag_isr_handler(void *arg) {
     uint32_t flags = usb_serial_jtag_ll_get_intsts_mask();
@@ -49,6 +53,11 @@ static void usb_serial_jtag_isr_handler(void *arg) {
         usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF);
     }
 
+    if (flags & USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1) {
+        usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
+        connected = true;
+    }
+
     if (flags & USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT) {
         usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
         size_t req_len = ringbuf_num_empty(&ringbuf);
@@ -64,25 +73,19 @@ static void usb_serial_jtag_isr_handler(void *arg) {
                 ringbuf_put(&ringbuf, rx_buf[i]);
             }
         }
-        vTaskNotifyGiveFromISR(circuitpython_task, NULL);
+        port_wake_main_task_from_isr();
     }
 }
 
 void usb_serial_jtag_init(void) {
     ringbuf_init(&ringbuf, buf, sizeof(buf));
-    usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
-    usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
+    usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
+    usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
     ESP_ERROR_CHECK(esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, ESP_INTR_FLAG_LEVEL1,
         usb_serial_jtag_isr_handler, NULL, NULL));
 }
 
 bool usb_serial_jtag_connected(void) {
-    // Make connected sticky. Otherwise we'll be disconnected every time the SOF
-    // index is 0. (It's only ~15 bits so it wraps around frequently.)
-    if (connected) {
-        return true;
-    }
-    connected = USB_SERIAL_JTAG.fram_num.sof_frame_index > 0;
     return connected;
 }
 
diff --git a/supervisor/port.h b/supervisor/port.h
index 0a8cdfd342..d693d49440 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -99,8 +99,14 @@ void port_background_task(void);
 void port_start_background_task(void);
 void port_finish_background_task(void);
 
-// Some ports need special handling to wake the main task from an interrupt
-// context or other task.  The port must implement the necessary code in this
-// function.  A default weak implementation is provided that does nothing.
+// Some ports need special handling to wake the main task from another task. The
+// port must implement the necessary code in this function.  A default weak
+// implementation is provided that does nothing.
 void port_wake_main_task(void);
+
+// Some ports need special handling to wake the main task from an interrupt
+// context.  The port must implement the necessary code in this function.  A
+// default weak implementation is provided that does nothing.
+void port_wake_main_task_from_isr(void);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_PORT_H
diff --git a/ports/espressif/supervisor/esp_port.h b/supervisor/shared/port.c
similarity index 78%
rename from ports/espressif/supervisor/esp_port.h
rename to supervisor/shared/port.c
index 90ba3f65f1..5d4eeea093 100644
--- a/ports/espressif/supervisor/esp_port.h
+++ b/supervisor/shared/port.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2022 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,10 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_SUPERVISOR_PORT_H
-#define MICROPY_INCLUDED_ESPRESSIF_SUPERVISOR_PORT_H
+#include "supervisor/port.h"
 
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
+MP_WEAK void port_wake_main_task(void) {
+}
 
-extern TaskHandle_t circuitpython_task;
-
-#endif // MICROPY_INCLUDED_ESPRESSIF_SUPERVISOR_PORT_H
+MP_WEAK void port_wake_main_task_from_isr(void) {
+}
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 710046e62e..974dd12b32 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -207,10 +207,17 @@ char serial_read(void) {
 
     #if CIRCUITPY_WEB_WORKFLOW
     if (websocket_available()) {
-        return websocket_read_char();
+        char c = websocket_read_char();
+        if (c != -1) {
+            return c;
+        }
     }
     #endif
 
+    if (port_serial_bytes_available() > 0) {
+        return port_serial_read();
+    }
+
     #if CIRCUITPY_USB_CDC
     if (!usb_cdc_console_enabled()) {
         return -1;
@@ -220,9 +227,6 @@ char serial_read(void) {
     return (char)tud_cdc_read_char();
     #endif
 
-    if (port_serial_bytes_available() > 0) {
-        return port_serial_read();
-    }
     return -1;
 }
 
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
new file mode 100644
index 0000000000..b836765ba3
--- /dev/null
+++ b/supervisor/shared/title_bar.c
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 
+#include "genhdr/mpversion.h"
+#include "py/mpconfig.h"
+#include "supervisor/background_callback.h"
+#include "supervisor/serial.h"
+#include "supervisor/shared/title_bar.h"
+
+#if CIRCUITPY_WEB_WORKFLOW
+#include "supervisor/shared/web_workflow/web_workflow.h"
+#endif
+static background_callback_t title_bar_background_cb;
+
+static bool _forced_dirty = false;
+static bool _suspended = false;
+
+static void title_bar_background(void *data) {
+    if (_suspended) {
+        return;
+    }
+    bool dirty = _forced_dirty;
+
+    #if CIRCUITPY_WEB_WORKFLOW
+    dirty = dirty || supervisor_web_workflow_status_dirty();
+    #endif
+
+    if (!dirty) {
+        return;
+    }
+    _forced_dirty = false;
+    #if CIRCUITPY_STATUS_BAR
+    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
+    // doesn't get terminated after two following characters and the value is invalid.
+    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
+    // but some may be cut off.
+    serial_write("\x1b" "]0;");
+    serial_write("🐍 ");
+    #if CIRCUITPY_WEB_WORKFLOW
+    supervisor_web_workflow_status();
+    #endif
+    serial_write("|");
+    serial_write(MICROPY_GIT_TAG);
+    // Send string terminator
+    serial_write("\x1b" "\\");
+    #endif
+}
+
+void supervisor_title_bar_start(void) {
+    title_bar_background_cb.fun = title_bar_background;
+    title_bar_background_cb.data = NULL;
+    supervisor_title_bar_request_update(true);
+}
+
+void supervisor_title_bar_request_update(bool force_dirty) {
+    if (force_dirty) {
+        _forced_dirty = true;
+    }
+    background_callback_add_core(&title_bar_background_cb);
+}
+
+void supervisor_title_bar_suspend(void) {
+    _suspended = true;
+}
+
+void supervisor_title_bar_resume(void) {
+    _suspended = false;
+    supervisor_title_bar_request_update(false);
+}
diff --git a/supervisor/shared/title_bar.h b/supervisor/shared/title_bar.h
new file mode 100644
index 0000000000..778d768086
--- /dev/null
+++ b/supervisor/shared/title_bar.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include 
+
+void supervisor_title_bar_start(void);
+void supervisor_title_bar_suspend(void);
+void supervisor_title_bar_resume(void);
+void supervisor_title_bar_request_update(bool force_dirty);
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 86ec077e92..5c644795a0 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -63,10 +63,12 @@ input.addEventListener("beforeinput", function(e) {
     input.value = "";
     input.focus();
     e.preventDefault();
-  } else if (e.inputType == "insertText") {
+  } else if (e.inputType == "insertText" || e.inputType == "insertFromPaste") {
     ws.send(e.data);
   } else if (e.inputType == "deleteContentBackward") {
     ws.send("\b");
+  } else {
+    console.log(e);
   }
 });
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index bd7b150765..ca68155e36 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -95,7 +95,12 @@ typedef struct {
     char websocket_key[24 + 1];
 } _request;
 
-static wifi_radio_error_t wifi_status = WIFI_RADIO_ERROR_NONE;
+static wifi_radio_error_t _wifi_status = WIFI_RADIO_ERROR_NONE;
+
+// Store last status state to compute dirty.
+static bool _last_enabled = false;
+static uint32_t _last_ip = 0;
+static wifi_radio_error_t _last_wifi_status = WIFI_RADIO_ERROR_NONE;
 
 static mdns_server_obj_t mdns;
 static uint32_t web_api_port = 80;
@@ -108,6 +113,7 @@ static _request active_request;
 
 static char _api_password[64];
 
+// Store the encoded IP so we don't duplicate work.
 static uint32_t _encoded_ip = 0;
 static char _our_ip_encoded[4 * 4];
 
@@ -170,25 +176,41 @@ static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) {
     return true;
 }
 
+STATIC void _update_encoded_ip(void) {
+    uint32_t ipv4_address = 0;
+    if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+        ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj);
+    }
+    if (_encoded_ip != ipv4_address) {
+        uint8_t *octets = (uint8_t *)&ipv4_address;
+        snprintf(_our_ip_encoded, sizeof(_our_ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]);
+        _encoded_ip = ipv4_address;
+    }
+}
+
+bool supervisor_web_workflow_status_dirty(void) {
+    return common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj) != _last_enabled ||
+           _encoded_ip != _last_ip ||
+           _last_wifi_status != _wifi_status;
+}
 
 void supervisor_web_workflow_status(void) {
     serial_write_compressed(translate("Wi-Fi: "));
-    if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+    _last_enabled = common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj);
+    if (_last_enabled) {
         uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj);
-        if (wifi_status == WIFI_RADIO_ERROR_AUTH_EXPIRE ||
-            wifi_status == WIFI_RADIO_ERROR_AUTH_FAIL) {
+        _last_wifi_status = _wifi_status;
+        if (_wifi_status == WIFI_RADIO_ERROR_AUTH_EXPIRE ||
+            _wifi_status == WIFI_RADIO_ERROR_AUTH_FAIL) {
             serial_write_compressed(translate("Authentication failure"));
-        } else if (wifi_status != WIFI_RADIO_ERROR_NONE) {
-            mp_printf(&mp_plat_print, "%d", wifi_status);
+        } else if (_wifi_status != WIFI_RADIO_ERROR_NONE) {
+            mp_printf(&mp_plat_print, "%d", _wifi_status);
         } else if (ipv4_address == 0) {
+            _last_ip = 0;
             serial_write_compressed(translate("No IP"));
         } else {
-            if (_encoded_ip != ipv4_address) {
-                uint8_t *octets = (uint8_t *)&ipv4_address;
-                snprintf(_our_ip_encoded, sizeof(_our_ip_encoded), "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]);
-                _encoded_ip = ipv4_address;
-            }
-
+            _update_encoded_ip();
+            _last_ip = _encoded_ip;
             mp_printf(&mp_plat_print, "%s", _our_ip_encoded);
             if (web_api_port != 80) {
                 mp_printf(&mp_plat_print, ":%d", web_api_port);
@@ -231,11 +253,11 @@ void supervisor_start_web_workflow(void) {
     // We can all connect again because it will return early if we're already connected to the
     // network. If we are connected to a different network, then it will disconnect before
     // attempting to connect to the given network.
-    wifi_status = common_hal_wifi_radio_connect(
+    _wifi_status = common_hal_wifi_radio_connect(
         &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len,
         0, 0.1, NULL, 0);
 
-    if (wifi_status != WIFI_RADIO_ERROR_NONE) {
+    if (_wifi_status != WIFI_RADIO_ERROR_NONE) {
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false);
         return;
     }
@@ -290,8 +312,6 @@ void supervisor_start_web_workflow(void) {
     }
 
     // TODO:
-    // GET /cp/serial.txt
-    //   - Most recent 1k of serial output.
     // GET /edit/
     //   - Super basic editor
     #endif
@@ -406,6 +426,7 @@ static bool _origin_ok(const char *origin) {
         return true;
     }
 
+    _update_encoded_ip();
     end = origin + strlen(http) + strlen(_our_ip_encoded);
     if (strncmp(origin + strlen(http), _our_ip_encoded, strlen(_our_ip_encoded)) == 0 &&
         (end[0] == '\0' || end[0] == ':')) {
@@ -710,6 +731,7 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     mp_print_t _socket_print = {socket, _print_chunk};
 
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
+    _update_encoded_ip();
     // Note: this leverages the fact that C concats consecutive string literals together.
     mp_printf(&_socket_print,
         "{\"web_api_version\": 1, "
diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h
index f233c06e48..a325b0667e 100644
--- a/supervisor/shared/web_workflow/web_workflow.h
+++ b/supervisor/shared/web_workflow/web_workflow.h
@@ -31,6 +31,7 @@
 // This background function should be called repeatedly. It cannot be done based
 // on events.
 void supervisor_web_workflow_background(void);
+bool supervisor_web_workflow_status_dirty(void);
 void supervisor_web_workflow_status(void);
 void supervisor_start_web_workflow(void);
 void supervisor_stop_web_workflow(void);
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 313e18a86d..5a42eefb35 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -26,6 +26,8 @@
 
 #include "supervisor/shared/web_workflow/websocket.h"
 
+#include "supervisor/shared/title_bar.h"
+
 // TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
 #include "esp_log.h"
 
@@ -59,6 +61,9 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
     // Mark the original socket object as closed without telling the lower level.
     socket->connected = false;
     socket->num = -1;
+
+    // Send the title bar for the new client.
+    supervisor_title_bar_request_update(true);
 }
 
 bool websocket_connected(void) {
@@ -94,7 +99,7 @@ static void _read_next_frame_header(void) {
     }
     if (cp_serial.frame_index == 1 && _read_byte(&h)) {
         cp_serial.frame_index++;
-        uint8_t len = h & 0xf;
+        uint8_t len = h & 0x7f;
         cp_serial.masked = (h >> 7) == 1;
         if (len <= 125) {
             cp_serial.payload_remaining = len;
@@ -194,7 +199,9 @@ bool websocket_available(void) {
 
 char websocket_read_char(void) {
     uint8_t c;
-    _read_next_payload_byte(&c);
+    if (!_read_next_payload_byte(&c)) {
+        c = -1;
+    }
     return c;
 }
 
@@ -215,13 +222,20 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
     }
     frame_header[1] = payload_len;
     _send_raw(&ws->socket, (const uint8_t *)frame_header, 2);
+    uint8_t extended_len[4];
     if (payload_len == 126) {
-        _send_raw(&ws->socket, (const uint8_t *)&len, 2);
+        extended_len[0] = (len >> 8) & 0xff;
+        extended_len[1] = len & 0xff;
+        _send_raw(&ws->socket, extended_len, 2);
     } else if (payload_len == 127) {
         uint32_t zero = 0;
         // 64 bits where top four bytes are zero.
         _send_raw(&ws->socket, (const uint8_t *)&zero, 4);
-        _send_raw(&ws->socket, (const uint8_t *)&len, 4);
+        extended_len[0] = (len >> 24) & 0xff;
+        extended_len[1] = (len >> 16) & 0xff;
+        extended_len[2] = (len >> 8) & 0xff;
+        extended_len[3] = len & 0xff;
+        _send_raw(&ws->socket, extended_len, 4);
     }
     _send_raw(&ws->socket, (const uint8_t *)text, len);
     char copy[len];
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 23532181c6..7b14c663c4 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -46,27 +46,7 @@
 #endif
 static background_callback_t workflow_background_cb;
 
-#if CIRCUITPY_STATUS_BAR
-static void supervisor_workflow_update_status_bar(void) {
-    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
-    // doesn't get terminated after two following characters and the value is invalid.
-    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
-    // but some may be cut off.
-    serial_write("\x1b" "]0;");
-    serial_write("🐍 ");
-    #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_web_workflow_status();
-    #endif
-    // Send string terminator
-    serial_write("\x1b" "\\");
-}
-#endif
-
 static void workflow_background(void *data) {
-    #if CIRCUITPY_STATUS_BAR
-    supervisor_workflow_update_status_bar();
-    #endif
-
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_web_workflow_background();
     #endif
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 5b8cb513a7..912b5c5f37 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -8,12 +8,14 @@ SRC_SUPERVISOR = \
 	supervisor/shared/lock.c \
 	supervisor/shared/memory.c \
 	supervisor/shared/micropython.c \
+	supervisor/shared/port.c \
 	supervisor/shared/reload.c \
 	supervisor/shared/safe_mode.c \
   supervisor/shared/serial.c \
 	supervisor/shared/stack.c \
 	supervisor/shared/status_leds.c \
 	supervisor/shared/tick.c \
+	supervisor/shared/title_bar.c \
 	supervisor/shared/traceback.c \
 	supervisor/shared/translate/translate.c \
   supervisor/shared/workflow.c

From 312e29889044f8b97494a01bb9336a582661022a Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 29 Jul 2022 11:02:35 -0700
Subject: [PATCH 0706/2403] Fix other ESP builds and arduino_nano_33_iot

---
 ports/espressif/common-hal/alarm/pin/PinAlarm.c |  8 ++------
 .../espressif/common-hal/alarm/time/TimeAlarm.c |  4 ++--
 .../common-hal/alarm/touch/TouchAlarm.c         |  8 ++------
 ports/espressif/supervisor/usb.c                |  1 -
 supervisor/shared/title_bar.c                   | 17 +++++++++++++++--
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 6318cc2cca..62496ec4c6 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -27,7 +27,7 @@
 
 #include "py/runtime.h"
 
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
@@ -90,11 +90,7 @@ STATIC void gpio_interrupt(void *arg) {
             gpio_ll_intr_disable(&GPIO, 32 + i);
         }
     }
-    BaseType_t high_task_wakeup;
-    vTaskNotifyGiveFromISR(circuitpython_task, &high_task_wakeup);
-    if (high_task_wakeup) {
-        portYIELD_FROM_ISR();
-    }
+    port_wake_main_task_from_isr();
 }
 
 bool alarm_pin_pinalarm_woke_this_cycle(void) {
diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.c b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
index 256d96a75f..973da33c67 100644
--- a/ports/espressif/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
@@ -27,7 +27,7 @@
 #include "esp_sleep.h"
 
 #include "py/runtime.h"
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 
 #include "components/esp_timer/include/esp_timer.h"
 
@@ -66,7 +66,7 @@ STATIC bool woke_up = false;
 STATIC void timer_callback(void *arg) {
     (void)arg;
     woke_up = true;
-    xTaskNotifyGive(circuitpython_task);
+    port_wake_main_task();
 }
 
 bool alarm_time_timealarm_woke_this_cycle(void) {
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
index 02f176cbf7..fc44c1dcc0 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
@@ -30,7 +30,7 @@
 
 #include "esp_sleep.h"
 #include "peripherals/touch.h"
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 
 static uint16_t touch_channel_mask;
 static volatile bool woke_up = false;
@@ -86,11 +86,7 @@ mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void) {
 STATIC void touch_interrupt(void *arg) {
     (void)arg;
     woke_up = true;
-    BaseType_t task_wakeup;
-    vTaskNotifyGiveFromISR(circuitpython_task, &task_wakeup);
-    if (task_wakeup) {
-        portYIELD_FROM_ISR();
-    }
+    port_wake_main_task_from_isr();
 }
 
 void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c
index a4f26b366c..61e6b5f09d 100644
--- a/ports/espressif/supervisor/usb.c
+++ b/ports/espressif/supervisor/usb.c
@@ -27,7 +27,6 @@
 
 #include "py/runtime.h"
 #include "supervisor/usb.h"
-#include "supervisor/esp_port.h"
 #include "supervisor/port.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/readline/readline.h"
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
index b836765ba3..7fa3116b47 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/title_bar.c
@@ -40,6 +40,9 @@ static bool _forced_dirty = false;
 static bool _suspended = false;
 
 static void title_bar_background(void *data) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
     if (_suspended) {
         return;
     }
@@ -53,7 +56,6 @@ static void title_bar_background(void *data) {
         return;
     }
     _forced_dirty = false;
-    #if CIRCUITPY_STATUS_BAR
     // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
     // doesn't get terminated after two following characters and the value is invalid.
     // This is the OSC command to set the title and the icon text. It can be up to 255 characters
@@ -67,16 +69,21 @@ static void title_bar_background(void *data) {
     serial_write(MICROPY_GIT_TAG);
     // Send string terminator
     serial_write("\x1b" "\\");
-    #endif
 }
 
 void supervisor_title_bar_start(void) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
     title_bar_background_cb.fun = title_bar_background;
     title_bar_background_cb.data = NULL;
     supervisor_title_bar_request_update(true);
 }
 
 void supervisor_title_bar_request_update(bool force_dirty) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
     if (force_dirty) {
         _forced_dirty = true;
     }
@@ -84,10 +91,16 @@ void supervisor_title_bar_request_update(bool force_dirty) {
 }
 
 void supervisor_title_bar_suspend(void) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
     _suspended = true;
 }
 
 void supervisor_title_bar_resume(void) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
     _suspended = false;
     supervisor_title_bar_request_update(false);
 }

From 1348cb435bd01cf995c3f54408f2d1b570b43c34 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 29 Jul 2022 19:07:33 -0400
Subject: [PATCH 0707/2403] Fix SAMD I2C frequency check

---
 ports/atmel-samd/common-hal/busio/I2C.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c
index 2ca193c99f..06d627d2e7 100644
--- a/ports/atmel-samd/common-hal/busio/I2C.c
+++ b/ports/atmel-samd/common-hal/busio/I2C.c
@@ -123,7 +123,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     // The maximum frequency divisor gives a clock rate of around 48MHz/2/255
     // but set_baudrate does not diagnose this problem. (This is not the
     // exact cutoff, but no frequency well under 100kHz is available)
-    if (frequency < 95000 &&
+    if (frequency < 95000 ||
         i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE) {
         reset_pin_number(sda->number);
         reset_pin_number(scl->number);

From c71cc4e0dd9b73dda436a27da5e7bdd728c80abb Mon Sep 17 00:00:00 2001
From: bill88t 
Date: Sat, 30 Jul 2022 15:35:48 +0300
Subject: [PATCH 0708/2403] Add Waveshare ESP32-S2-Pico

---
 .../boards/waveshare_esp32s2_pico/board.c     | 48 +++++++++++++++++++
 .../waveshare_esp32s2_pico/mpconfigboard.h    | 32 +++++++++++++
 .../waveshare_esp32s2_pico/mpconfigboard.mk   | 17 +++++++
 .../boards/waveshare_esp32s2_pico/pins.c      | 43 +++++++++++++++++
 .../boards/waveshare_esp32s2_pico/sdkconfig   | 17 +++++++
 5 files changed, 157 insertions(+)
 create mode 100644 ports/espressif/boards/waveshare_esp32s2_pico/board.c
 create mode 100644 ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
 create mode 100644 ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/waveshare_esp32s2_pico/pins.c
 create mode 100644 ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/board.c b/ports/espressif/boards/waveshare_esp32s2_pico/board.c
new file mode 100644
index 0000000000..0432485111
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
new file mode 100644
index 0000000000..ed9cbffa60
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Waveshare ESP32-S2-Pico"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO9)
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
new file mode 100644
index 0000000000..e1f3ff274d
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x2E8A
+USB_PID = 0x101F
+USB_PRODUCT = "ESP32-S2-Pico"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+IDF_TARGET = esp32s2
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
new file mode 100644
index 0000000000..16256b84ae
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
@@ -0,0 +1,43 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO9) },
+    
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_GP35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_GP36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_GP37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_GP38), MP_ROM_PTR(&pin_GPIO38) },
+    
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GP42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_GP43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_GP44), MP_ROM_PTR(&pin_GPIO44) }
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
new file mode 100644
index 0000000000..e1635f6d17
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
@@ -0,0 +1,17 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_MEMTEST=y
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="waveshare"
+# end of LWIP

From 03181fe362be21870e0b9c4d0ddf7ecbdeaa266b Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Sun, 31 Jul 2022 10:36:04 +0200
Subject: [PATCH 0709/2403] Adds support for the Challenger RP2040 SubGHz
 board.

---
 .../boards/challenger_rp2040_subghz/board.c   | 40 +++++++++
 .../challenger_rp2040_subghz/mpconfigboard.h  | 10 +++
 .../challenger_rp2040_subghz/mpconfigboard.mk | 13 +++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/challenger_rp2040_subghz/pins.c    | 85 +++++++++++++++++++
 5 files changed, 149 insertions(+)
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_subghz/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c

diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c b/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
new file mode 100644
index 0000000000..e8208ee5d3
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Pontus Oldberg, Invector Labs
+ *
+ * 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) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.h b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.h
new file mode 100644
index 0000000000..0e41e9f3a5
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Challenger RP2040 SubGHz"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_UART_BUS_TX   (&pin_GPIO16)
+#define DEFAULT_UART_BUS_RX   (&pin_GPIO17)
+#define DEFAULT_I2C_BUS_SDA   (&pin_GPIO0)
+#define DEFAULT_I2C_BUS_SCL   (&pin_GPIO1)
+#define DEFAULT_SPI_BUS_SCK   (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO  (&pin_GPIO20)
diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
new file mode 100644
index 0000000000..97c402a306
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
@@ -0,0 +1,13 @@
+USB_VID = 0x2e8a
+USB_PID = 0x1030
+USB_PRODUCT = "Challenger RP2040 SubGHz"
+USB_MANUFACTURER = "Invector Labs"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
+
+CIRCUITPY__EVE = 1
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM69
diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/pico-sdk-configboard.h b/ports/raspberrypi/boards/challenger_rp2040_subghz/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c b/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c
new file mode 100644
index 0000000000..f5275e84dc
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c
@@ -0,0 +1,85 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+
+    // RFM69HCW connections
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_SCK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_SDO), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_SDI), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_RST), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_DIO0), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_DIO1), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_RFM69HCW_DIO2), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 9baa2724a79c8873358b63611179bfbfd76d640e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 1 Aug 2022 00:27:25 -0400
Subject: [PATCH 0710/2403] code formatting suggestion

---
 ports/atmel-samd/common-hal/busio/I2C.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c
index 06d627d2e7..d97fa227b2 100644
--- a/ports/atmel-samd/common-hal/busio/I2C.c
+++ b/ports/atmel-samd/common-hal/busio/I2C.c
@@ -123,8 +123,8 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     // The maximum frequency divisor gives a clock rate of around 48MHz/2/255
     // but set_baudrate does not diagnose this problem. (This is not the
     // exact cutoff, but no frequency well under 100kHz is available)
-    if (frequency < 95000 ||
-        i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE) {
+    if ((frequency < 95000) ||
+        (i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE)) {
         reset_pin_number(sda->number);
         reset_pin_number(scl->number);
         common_hal_busio_i2c_deinit(self);

From 9661d3256c00185c2cf50090945504947ea4ceee Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 29 Jul 2022 17:01:41 -0700
Subject: [PATCH 0711/2403] Add more ESP32 boards and enable web workflow

---
 locale/circuitpython.pot                      |  17 ++-
 ports/atmel-samd/boards/pybadge/board.c       |   2 -
 .../boards/adafruit_feather_esp32_v2/board.c  |  16 ++
 .../mpconfigboard.mk                          |   3 -
 .../boards/adafruit_qtpy_esp32_pico/board.c   |  52 +++++++
 .../adafruit_qtpy_esp32_pico/mpconfigboard.h  |  49 +++++++
 .../adafruit_qtpy_esp32_pico/mpconfigboard.mk |  15 ++
 .../boards/adafruit_qtpy_esp32_pico/pins.c    |  63 ++++++++
 .../boards/adafruit_qtpy_esp32_pico/sdkconfig |  52 +++++++
 .../boards/hardkernel_odroid_go/board.c       | 138 ++++++++++++++++++
 .../hardkernel_odroid_go/mpconfigboard.h      |  42 ++++++
 .../hardkernel_odroid_go/mpconfigboard.mk     |  15 ++
 .../boards/hardkernel_odroid_go/pins.c        |  10 ++
 .../boards/hardkernel_odroid_go/sdkconfig     |  54 +++++++
 .../common-hal/microcontroller/Pin.c          |   2 +
 .../esp-idf-config/partitions-16MB-no-uf2.csv |   9 ++
 .../sdkconfig-16MB-no-uf2.defaults            |  18 +++
 supervisor/shared/web_workflow/web_workflow.c |  12 +-
 18 files changed, 551 insertions(+), 18 deletions(-)
 create mode 100644 ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
 create mode 100644 ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 create mode 100644 ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c
 create mode 100644 ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
 create mode 100644 ports/espressif/boards/hardkernel_odroid_go/board.c
 create mode 100644 ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 create mode 100644 ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/hardkernel_odroid_go/pins.c
 create mode 100644 ports/espressif/boards/hardkernel_odroid_go/sdkconfig
 create mode 100644 ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
 create mode 100644 ports/espressif/esp-idf-config/sdkconfig-16MB-no-uf2.defaults

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1607df3ec8..decd4816a3 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -958,10 +958,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1616,7 +1612,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3759,11 +3755,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index b7646cabe1..17b7b180ed 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -33,8 +33,6 @@
 #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[] = {
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
index 4c433a9da8..a76c5da36c 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
@@ -47,3 +47,19 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Pull LED down on reset rather than the default up
+    if (pin_number == 13) {
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_DISABLE,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
index f25eda463f..21a87a9456 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
@@ -10,9 +10,6 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
-CIRCUITPY_STATUS_BAR = 0
-CIRCUITPY_WEB_WORKFLOW = 0
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
new file mode 100644
index 0000000000..0eca2f0969
--- /dev/null
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+    reset_board();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+    // Turn on NeoPixel power by default.
+    gpio_set_direction(8, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(8, true);
+}
+
+void board_deinit(void) {
+    // Turn off NeoPixel
+    gpio_set_direction(8, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(8, false);
+}
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
new file mode 100644
index 0000000000..42a575aa68
--- /dev/null
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "Adafruit QT Py ESP32 PICO"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO5)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO33, .sda = &pin_GPIO4}, \
+                                     {.scl = &pin_GPIO19, .sda = &pin_GPIO22}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO32, .rx = &pin_GPIO7}}
+
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
new file mode 100644
index 0000000000..53d7f109c1
--- /dev/null
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
@@ -0,0 +1,15 @@
+CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c
new file mode 100644
index 0000000000..5d760603c1
--- /dev/null
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c
@@ -0,0 +1,63 @@
+#include "shared-bindings/board/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_stemma_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
new file mode 100644
index 0000000000..f2e8085d3e
--- /dev/null
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
@@ -0,0 +1,52 @@
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
+# end of Partition Table
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+#
+# SPI RAM config
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+
+### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### # CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings
diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
new file mode 100644
index 0000000000..eff481e63d
--- /dev/null
+++ b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -0,0 +1,138 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.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 "common-hal/microcontroller/Pin.h"
+
+#define DELAY 0x80
+
+uint8_t display_init_sequence[] = {
+    0x0f, 3, 0x03, 0x80, 0x02, // RDDSDR
+    0xcf, 3, 0x00, 0xcf, 0x30, // PWCRTLB
+    0xed, 4, 0x64, 0x03, 0x12, 0x81, // PWRONCTRL, b"\x64\x03\x12\x81"),
+    0xe8, 3, 0x85, 0x00, 0x78, //        (_DTCTRLA, b"\x85\x00\x78"),
+    0xcb, 5, 0x39, 0x2c, 0x00, 0x34, 0x02, //        (_PWCTRLA, b"\x39\x2c\x00\x34\x02"),
+    0xf7, 1, 0x20, //        (_PRCTRL, b"\x20"),
+    0xea, 2, 0x00, 0x00, //        (_DTCTRLB, b"\x00\x00"),
+    0xc0, 1, 0x1b, //        (_PWCTRL1, b"\x1b"),
+    0xc1, 1, 0x12, //        (_PWCTRL2, b"\x12"),
+    0xc5, 2, 0x3e, 0x3c, //        (_VMCTRL1, b"\x3e\x3c"),
+    0xc7, 1, 0x91, //        (_VMCTRL2, b"\x91"),
+    0x36, 1, 0xa8, //        (_MADCTL, b"\xa8"),
+    0x3a, 1, 0x55, //        (_PIXSET, b"\x55"),
+    0xb1, 2, 0x00, 0x1b, //        (_FRMCTR1, b"\x00\x1b"),
+    0xb6, 3, 0x0a, 0xa2, 0x27, //        (_DISCTRL, b"\x0a\xa2\x27"),
+    0xf6, 2, 0x01, 0x30, //        (_INTFACE, b"\x01\x30"),
+    0xf2, 1, 0x00, //        (_ENA3G, b"\x00"),
+    0x26, 1, 0x01, //        (_GAMSET, b"\x01"),
+    0xe0, 15, 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1, 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00,
+    //        (_PGAMCTRL, b"\x0f\x31\x2b\x0c\x0e\x08\x4e\xf1\x37\x07\x10\x03\x0e\x09\x00"),
+    0xe1, 15, 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1, 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f,
+    //        (_NGAMCTRL, b"\x00\x0e\x14\x03\x11\x07\x31\xc1\x48\x08\x0f\x0c\x31\x36\x0f")):
+    0x11, 0 | DELAY, 10, // _SLPOUT
+    0x29, 0 | DELAY, 100, // _DISPON
+};
+
+void board_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO23, NULL, false);
+    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_GPIO21, // TFT_DC Command or data
+        &pin_GPIO5, // TFT_CS Chip select
+        NULL, // TFT_RST Reset
+        40000000, // 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
+        0, // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO14,  // 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
+        50000); // backlight pwm frequency
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Pull LED down on reset rather than the default up
+    if (pin_number == 2) {
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_DISABLE,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
new file mode 100644
index 0000000000..423890f2e1
--- /dev/null
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "Hardkernel Odroid Go"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing VOLUME button at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
new file mode 100644
index 0000000000..1e08a80972
--- /dev/null
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
@@ -0,0 +1,15 @@
+CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/hardkernel_odroid_go/pins.c b/ports/espressif/boards/hardkernel_odroid_go/pins.c
new file mode 100644
index 0000000000..4d4ff5258e
--- /dev/null
+++ b/ports/espressif/boards/hardkernel_odroid_go/pins.c
@@ -0,0 +1,10 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_VOLUME), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/hardkernel_odroid_go/sdkconfig b/ports/espressif/boards/hardkernel_odroid_go/sdkconfig
new file mode 100644
index 0000000000..f220cff390
--- /dev/null
+++ b/ports/espressif/boards/hardkernel_odroid_go/sdkconfig
@@ -0,0 +1,54 @@
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
+# end of Partition Table
+
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=3000
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM32=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=4194304
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+#
+# SPI RAM config
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+
+### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
+### #
+### # ESP System Settings
+### #
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### # CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=12
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=15
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 201fa0ac2b..6e733b9095 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -48,6 +48,8 @@ static const uint64_t pin_mask_reset_forbidden =
     GPIO_SEL_3 |          // RXD0
     // Never ever reset pins used to communicate with SPI flash and PSRAM.
     GPIO_SEL_6 |          // CLK
+    GPIO_SEL_7 |
+    GPIO_SEL_8 |
     GPIO_SEL_9 |          // (PSRAM) SD2
     GPIO_SEL_10 |         // (PSRAM) SD3
     GPIO_SEL_11 |         // CMD
diff --git a/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
new file mode 100644
index 0000000000..8e73e8d056
--- /dev/null
+++ b/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
@@ -0,0 +1,9 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+user_fs,  data, fat,    0x410000,  12224K,
diff --git a/ports/espressif/esp-idf-config/sdkconfig-16MB-no-uf2.defaults b/ports/espressif/esp-idf-config/sdkconfig-16MB-no-uf2.defaults
new file mode 100644
index 0000000000..6065abcd93
--- /dev/null
+++ b/ports/espressif/esp-idf-config/sdkconfig-16MB-no-uf2.defaults
@@ -0,0 +1,18 @@
+#
+# Serial flasher config
+#
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# end of Serial flasher config
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
+# end of Partition Table
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 0f92f635a4..2906b4492c 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -622,18 +622,16 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
         // LittleFS.
         _send_chunk(socket, ", ");
 
-        uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
+        uint32_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
             (file_info.fdate >> 5) & 0xf,
             file_info.fdate & 0x1f,
             file_info.ftime >> 11,
             (file_info.ftime >> 5) & 0x1f,
-            (file_info.ftime & 0x1f) * 2) * 1000000000ULL;
+            (file_info.ftime & 0x1f) * 2);
 
-        // Use snprintf because mp_printf doesn't support 64 bit numbers by
-        // default.
-        char encoded_time[32];
-        snprintf(encoded_time, sizeof(encoded_time), "%llu", truncated_time);
-        mp_printf(&_socket_print, "\"modified_ns\": %s, ", encoded_time);
+        // Manually append zeros to make the time nanoseconds. Support for printing 64 bit numbers
+        // varies across chipsets.
+        mp_printf(&_socket_print, "\"modified_ns\": %lu000000000, ", truncated_time);
         size_t file_size = 0;
         if ((file_info.fattrib & AM_DIR) == 0) {
             file_size = file_info.fsize;

From f0c6a8c49a3702aba4b41a4bb9c22d3e09e2247b Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 1 Aug 2022 15:52:01 -0700
Subject: [PATCH 0712/2403] Odroid pin defs

---
 .../boards/hardkernel_odroid_go/board.c       | 44 ++++++++---------
 .../hardkernel_odroid_go/mpconfigboard.mk     |  4 +-
 .../boards/hardkernel_odroid_go/pins.c        | 47 +++++++++++++++++++
 3 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
index eff481e63d..2249adeacd 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/board.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -35,31 +35,31 @@
 
 #define DELAY 0x80
 
+// ILI9341 init sequence from:
+// https://github.com/hardkernel/ODROID-GO-MicroPython/blob/loboris/odroid_go/utils/lcd/lcd.py#L55
 uint8_t display_init_sequence[] = {
     0x0f, 3, 0x03, 0x80, 0x02, // RDDSDR
     0xcf, 3, 0x00, 0xcf, 0x30, // PWCRTLB
-    0xed, 4, 0x64, 0x03, 0x12, 0x81, // PWRONCTRL, b"\x64\x03\x12\x81"),
-    0xe8, 3, 0x85, 0x00, 0x78, //        (_DTCTRLA, b"\x85\x00\x78"),
-    0xcb, 5, 0x39, 0x2c, 0x00, 0x34, 0x02, //        (_PWCTRLA, b"\x39\x2c\x00\x34\x02"),
-    0xf7, 1, 0x20, //        (_PRCTRL, b"\x20"),
-    0xea, 2, 0x00, 0x00, //        (_DTCTRLB, b"\x00\x00"),
-    0xc0, 1, 0x1b, //        (_PWCTRL1, b"\x1b"),
-    0xc1, 1, 0x12, //        (_PWCTRL2, b"\x12"),
-    0xc5, 2, 0x3e, 0x3c, //        (_VMCTRL1, b"\x3e\x3c"),
-    0xc7, 1, 0x91, //        (_VMCTRL2, b"\x91"),
-    0x36, 1, 0xa8, //        (_MADCTL, b"\xa8"),
-    0x3a, 1, 0x55, //        (_PIXSET, b"\x55"),
-    0xb1, 2, 0x00, 0x1b, //        (_FRMCTR1, b"\x00\x1b"),
-    0xb6, 3, 0x0a, 0xa2, 0x27, //        (_DISCTRL, b"\x0a\xa2\x27"),
-    0xf6, 2, 0x01, 0x30, //        (_INTFACE, b"\x01\x30"),
-    0xf2, 1, 0x00, //        (_ENA3G, b"\x00"),
-    0x26, 1, 0x01, //        (_GAMSET, b"\x01"),
-    0xe0, 15, 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1, 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00,
-    //        (_PGAMCTRL, b"\x0f\x31\x2b\x0c\x0e\x08\x4e\xf1\x37\x07\x10\x03\x0e\x09\x00"),
-    0xe1, 15, 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1, 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f,
-    //        (_NGAMCTRL, b"\x00\x0e\x14\x03\x11\x07\x31\xc1\x48\x08\x0f\x0c\x31\x36\x0f")):
-    0x11, 0 | DELAY, 10, // _SLPOUT
-    0x29, 0 | DELAY, 100, // _DISPON
+    0xed, 4, 0x64, 0x03, 0x12, 0x81, // PWRONCTRL
+    0xe8, 3, 0x85, 0x00, 0x78, // DTCTRLA
+    0xcb, 5, 0x39, 0x2c, 0x00, 0x34, 0x02, // PWCTRLA
+    0xf7, 1, 0x20, // PRCTRL
+    0xea, 2, 0x00, 0x00, // DTCTRLB
+    0xc0, 1, 0x1b, // PWCTRL1
+    0xc1, 1, 0x12, // PWCTRL2
+    0xc5, 2, 0x3e, 0x3c, // VMCTRL1
+    0xc7, 1, 0x91, // VMCTRL2
+    0x36, 1, 0xa8, // MADCTL
+    0x3a, 1, 0x55, // PIXSET
+    0xb1, 2, 0x00, 0x1b, // FRMCTR1
+    0xb6, 3, 0x0a, 0xa2, 0x27, // DISCTRL
+    0xf6, 2, 0x01, 0x30, // INTFACE
+    0xf2, 1, 0x00, // ENA3G
+    0x26, 1, 0x01, // GAMSET
+    0xe0, 15, 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1, 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00, // PGAMCTRL
+    0xe1, 15, 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1, 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f, // NGAMCTRL
+    0x11, 0 | DELAY, 10, // SLPOUT
+    0x29, 0 | DELAY, 100, // DISPON
 };
 
 void board_init(void) {
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
index 1e08a80972..80cd6cd11c 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x0000239A
-CIRCUITPY_CREATION_ID = 0x00320002
+CIRCUITPY_CREATOR_ID =  0x0D10D000
+CIRCUITPY_CREATION_ID = 0x00320060
 
 IDF_TARGET = esp32
 
diff --git a/ports/espressif/boards/hardkernel_odroid_go/pins.c b/ports/espressif/boards/hardkernel_odroid_go/pins.c
index 4d4ff5258e..c7152bf365 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/pins.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/pins.c
@@ -1,10 +1,57 @@
 #include "shared-bindings/board/__init__.h"
 
+// Pin names from: https://wiki.odroid.com/odroid_go/odroid_go
+
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
+    // Left side
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_START), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_AXIS_X), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_AXIS_Y), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_A), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_B), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER_IN_M), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER_IN_P), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_SELECT), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT_PWM), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_EXT3), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN_MENU), MP_ROM_PTR(&pin_GPIO13) },
+
+    // Right side.
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_EXT8), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_EXT7), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_EXT2), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_EXT5), MP_ROM_PTR(&pin_GPIO4) },
+
     { MP_ROM_QSTR(MP_QSTR_BTN_VOLUME), MP_ROM_PTR(&pin_GPIO0) },
 
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_EXT4), MP_ROM_PTR(&pin_GPIO15) },
+
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From da8451b7cc4317d9e7a8ad8e687fda58e107ccbf Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 1 Aug 2022 21:56:11 -0500
Subject: [PATCH 0713/2403] fix edit URL for files inside of directories

---
 supervisor/shared/web_workflow/static/directory.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 9dbe8384d6..91389343d6 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -63,6 +63,7 @@ async function refresh_list() {
         var icon = "⬇";
         var file_path = current_path + f.name;
         let api_url = new URL("/fs" + file_path, url_base);
+        let edit_url = "/edit/#" + file_path;
         if (f.directory) {
             file_path = "#" + file_path + "/";
             api_url += "/";
@@ -91,7 +92,7 @@ async function refresh_list() {
         delete_button.disabled = !editable;
         delete_button.onclick = del;
 
-        let edit_url = new URL("/edit/#" + f.name, url_base);
+        edit_url = new URL(edit_url, url_base);
         let edit_link = clone.querySelector(".edit_link");
         edit_link.href = edit_url
 

From 60429f51c728b837ceec52c570aac2e107cbfa22 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 2 Aug 2022 09:43:17 +0300
Subject: [PATCH 0714/2403] Add official vid/pid

---
 .../espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
index e1f3ff274d..f5d73a7d20 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x2E8A
-USB_PID = 0x101F
+USB_VID = 0x239a
+USB_PID = 0x00a5
 USB_PRODUCT = "ESP32-S2-Pico"
 USB_MANUFACTURER = "Waveshare Electronics"
 

From 1448bcab6bbfc0ec82d1921cda1e55752d50e2bd Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Tue, 2 Aug 2022 16:36:20 +0100
Subject: [PATCH 0715/2403] added remote CSS links to web work flow

added remote css URL to pull additional CSS from the circuitpython.org site (apologies for the  black background - this is temporary, I'll send an update to the CP.org css *very* shortly that will undo this)
---
 supervisor/shared/web_workflow/static/directory.html | 1 +
 supervisor/shared/web_workflow/static/serial.html    | 1 +
 supervisor/shared/web_workflow/static/welcome.html   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 0466cb717d..de26686c10 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -5,6 +5,7 @@
     
     
     
+    
 
 
     
     
    
diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index 5dfcb6cc7d..9f7c3c5ede 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -6,6 +6,7 @@
   
   
   
+  
 
 
   
    
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index e075c0200d..8a98182bb5 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -6,6 +6,7 @@
     
     
     
+    
 
 
 

From 5d653772cd0c8827c689eb94752873b7fb08a1d4 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Tue, 2 Aug 2022 16:43:40 +0100
Subject: [PATCH 0716/2403] added version number to file name

added version number to file name
---
 supervisor/shared/web_workflow/static/directory.html | 2 +-
 supervisor/shared/web_workflow/static/serial.html    | 2 +-
 supervisor/shared/web_workflow/static/welcome.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index de26686c10..b88e74684b 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -5,7 +5,7 @@
     
     
     
-    
+    
 
 
     
     
    
diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index 9f7c3c5ede..9193953443 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -6,7 +6,7 @@
   
   
   
-  
+  
 
 
   
    
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 8a98182bb5..3ed978cfe7 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
 
 
 

From 063e168810cdc70e002782b924d0c4271bfa71df Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 2 Aug 2022 18:40:10 +0200
Subject: [PATCH 0717/2403] Add Authorization to Allow-Headers in web workflow
 Makes Safari happy

---
 docs/workflows.md                             | 3 ++-
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 8530269534..345379b9f8 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -82,6 +82,7 @@ CIRCUITPY_WIFI_SSID='scottswifi'
 CIRCUITPY_WIFI_PASSWORD='secretpassword'
 
 # To enable modifying files from the web. Change this too!
+# Leave the User field blank in the browser.
 CIRCUITPY_WEB_API_PASSWORD='passw0rd'
 
 CIRCUITPY_WEB_API_PORT=80
@@ -121,7 +122,7 @@ The web server will allow requests from `cpy-XXXXXX.local`, `127.0.0.1`, the dev
 ### File REST API
 All file system related APIs are protected by HTTP basic authentication. It is *NOT* secure but will
 hopefully prevent some griefing in shared settings. The password is sent unencrypted so do not reuse
-a password with something important.
+a password with something important. The user field is left blank.
 
 The password is taken from `/.env` with the key `CIRCUITPY_WEB_API_PASSWORD`. If this is unset, the
 server will respond with `403 Forbidden`. When a password is set, but not provided in a request, it
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 4c768e320b..a93ce529d3 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -492,7 +492,7 @@ static void _reply_access_control(socketpool_socket_obj_t *socket, _request *req
         "HTTP/1.1 204 No Content\r\n",
         "Content-Length: 0\r\n",
         "Access-Control-Expose-Headers: Access-Control-Allow-Methods\r\n",
-        "Access-Control-Allow-Headers: X-Timestamp, Content-Type\r\n",
+        "Access-Control-Allow-Headers: X-Timestamp, Content-Type, Authorization\r\n",
         "Access-Control-Allow-Methods:GET, OPTIONS", NULL);
     if (!_usb_active()) {
         _send_str(socket, ", PUT, DELETE");

From 74e841d8355200f8ca1f7df682d9bf1943390aa0 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 2 Aug 2022 12:01:42 -0700
Subject: [PATCH 0718/2403] Read fuses to know what flash and ram pins to never
 reset

---
 ports/espressif/Makefile                      |  2 +
 .../adafruit_qtpy_esp32_pico/mpconfigboard.mk |  2 +-
 .../common-hal/microcontroller/Pin.c          | 12 +--
 ports/espressif/supervisor/port.c             | 97 +++++++++++++++++++
 4 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 204802cb16..febc6764bb 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -98,6 +98,8 @@ INC += \
 	-isystem esp-idf/components/bt/host/nimble/port/include \
 	-isystem esp-idf/components/driver/include \
 	-isystem esp-idf/components/driver/$(IDF_TARGET)/include \
+	-isystem esp-idf/components/efuse/include \
+	-isystem esp-idf/components/efuse/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/esp_adc_cal/include \
 	-isystem esp-idf/components/esp_common/include \
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
index 53d7f109c1..5b14bad0dc 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
@@ -1,5 +1,5 @@
 CIRCUITPY_CREATOR_ID =  0x0000239A
-CIRCUITPY_CREATION_ID = 0x00320002
+CIRCUITPY_CREATION_ID = 0x00320003
 
 IDF_TARGET = esp32
 
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 6e733b9095..4ac98c7927 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -46,17 +46,7 @@ static const uint64_t pin_mask_reset_forbidden =
     // Never ever reset serial pins for bootloader and possibly USB-serial converter.
     GPIO_SEL_1 |          // TXD0
     GPIO_SEL_3 |          // RXD0
-    // Never ever reset pins used to communicate with SPI flash and PSRAM.
-    GPIO_SEL_6 |          // CLK
-    GPIO_SEL_7 |
-    GPIO_SEL_8 |
-    GPIO_SEL_9 |          // (PSRAM) SD2
-    GPIO_SEL_10 |         // (PSRAM) SD3
-    GPIO_SEL_11 |         // CMD
-    GPIO_SEL_16 |         // SPIHD
-    GPIO_SEL_17 |         // SPIDO
-    GPIO_SEL_18 |         // SPIWP
-    GPIO_SEL_23 |         // SPIDI
+    // SPI flash and PSRAM pins are protected at runtime in supervisor/port.c.
     #endif // ESP32
 
     #if defined(CONFIG_IDF_TARGET_ESP32C3)
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 5245c9f025..9f58e8625b 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -81,11 +81,19 @@
 #include "soc/cache_memory.h"
 #endif
 
+#include "soc/efuse_reg.h"
 #include "soc/rtc_cntl_reg.h"
 
 #include "esp_debug_helpers.h"
 
+#include "bootloader_flash_config.h"
+#include "esp_efuse.h"
 #include "esp_ipc.h"
+#include "esp_rom_efuse.h"
+
+#ifdef CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/efuse.h"
+#endif
 
 #ifdef CONFIG_SPIRAM
 #include "esp32/spiram.h"
@@ -134,6 +142,93 @@ STATIC void tick_timer_cb(void *arg) {
 
 void sleep_timer_cb(void *arg);
 
+// The ESP-IDF determines these pins at runtime so we do too. This code is based on:
+// https://github.com/espressif/esp-idf/blob/6d85d53ceec30c818a92c2fff8f5437d21c4720f/components/esp_hw_support/port/esp32/spiram_psram.c#L810
+// IO-pins for PSRAM.
+// WARNING: PSRAM shares all but the CS and CLK pins with the flash, so these defines
+// hardcode the flash pins as well, making this code incompatible with either a setup
+// that has the flash on non-standard pins or ESP32s with built-in flash.
+#define PSRAM_SPIQ_SD0_IO          7
+#define PSRAM_SPID_SD1_IO          8
+#define PSRAM_SPIWP_SD3_IO         10
+#define PSRAM_SPIHD_SD2_IO         9
+
+#define FLASH_HSPI_CLK_IO          14
+#define FLASH_HSPI_CS_IO           15
+#define PSRAM_HSPI_SPIQ_SD0_IO     12
+#define PSRAM_HSPI_SPID_SD1_IO     13
+#define PSRAM_HSPI_SPIWP_SD3_IO    2
+#define PSRAM_HSPI_SPIHD_SD2_IO    4
+
+// PSRAM clock and cs IO should be configured based on hardware design.
+// For ESP32-WROVER or ESP32-WROVER-B module, the clock IO is IO17, the cs IO is IO16,
+// they are the default value for these two configs.
+#define D0WD_PSRAM_CLK_IO          CONFIG_D0WD_PSRAM_CLK_IO  // Default value is 17
+#define D0WD_PSRAM_CS_IO           CONFIG_D0WD_PSRAM_CS_IO   // Default value is 16
+
+#define D2WD_PSRAM_CLK_IO          CONFIG_D2WD_PSRAM_CLK_IO  // Default value is 9
+#define D2WD_PSRAM_CS_IO           CONFIG_D2WD_PSRAM_CS_IO   // Default value is 10
+
+// There is no reason to change the pin of an embedded psram.
+// So define the number of pin directly, instead of configurable.
+#define D0WDR2_V3_PSRAM_CLK_IO    6
+#define D0WDR2_V3_PSRAM_CS_IO     16
+
+// For ESP32-PICO chip, the psram share clock with flash. The flash clock pin is fixed, which is IO6.
+#define PICO_PSRAM_CLK_IO          6
+#define PICO_PSRAM_CS_IO           CONFIG_PICO_PSRAM_CS_IO   // Default value is 10
+
+#define PICO_V3_02_PSRAM_CLK_IO    10
+#define PICO_V3_02_PSRAM_CS_IO     9
+
+static void _never_reset_spi_ram_flash(void) {
+    #if defined(CONFIG_IDF_TARGET_ESP32)
+    uint32_t pkg_ver = esp_efuse_get_pkg_ver();
+    if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5) {
+        never_reset_pin_number(D2WD_PSRAM_CLK_IO);
+        never_reset_pin_number(D2WD_PSRAM_CS_IO);
+    } else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 && esp_efuse_get_chip_ver() >= 3) {
+        // This chip is ESP32-PICO-V3 and doesn't have PSRAM.
+    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
+        never_reset_pin_number(PICO_PSRAM_CLK_IO);
+        never_reset_pin_number(PICO_PSRAM_CS_IO);
+    } else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
+        never_reset_pin_number(PICO_V3_02_PSRAM_CLK_IO);
+        never_reset_pin_number(PICO_V3_02_PSRAM_CS_IO);
+    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5)) {
+        never_reset_pin_number(D0WD_PSRAM_CLK_IO);
+        never_reset_pin_number(D0WD_PSRAM_CS_IO);
+    } else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3) {
+        never_reset_pin_number(D0WDR2_V3_PSRAM_CLK_IO);
+        never_reset_pin_number(D0WDR2_V3_PSRAM_CS_IO);
+    }
+
+    const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info();
+    if (spiconfig == ESP_ROM_EFUSE_FLASH_DEFAULT_SPI) {
+        never_reset_pin_number(SPI_IOMUX_PIN_NUM_CLK);
+        never_reset_pin_number(SPI_IOMUX_PIN_NUM_CS);
+        never_reset_pin_number(PSRAM_SPIQ_SD0_IO);
+        never_reset_pin_number(PSRAM_SPID_SD1_IO);
+        never_reset_pin_number(PSRAM_SPIWP_SD3_IO);
+        never_reset_pin_number(PSRAM_SPIHD_SD2_IO);
+    } else if (spiconfig == ESP_ROM_EFUSE_FLASH_DEFAULT_HSPI) {
+        never_reset_pin_number(FLASH_HSPI_CLK_IO);
+        never_reset_pin_number(FLASH_HSPI_CS_IO);
+        never_reset_pin_number(PSRAM_HSPI_SPIQ_SD0_IO);
+        never_reset_pin_number(PSRAM_HSPI_SPID_SD1_IO);
+        never_reset_pin_number(PSRAM_HSPI_SPIWP_SD3_IO);
+        never_reset_pin_number(PSRAM_HSPI_SPIHD_SD2_IO);
+    } else {
+        never_reset_pin_number(EFUSE_SPICONFIG_RET_SPICLK(spiconfig));
+        never_reset_pin_number(EFUSE_SPICONFIG_RET_SPICS0(spiconfig));
+        never_reset_pin_number(EFUSE_SPICONFIG_RET_SPIQ(spiconfig));
+        never_reset_pin_number(EFUSE_SPICONFIG_RET_SPID(spiconfig));
+        never_reset_pin_number(EFUSE_SPICONFIG_RET_SPIHD(spiconfig));
+        never_reset_pin_number(bootloader_flash_get_wp_pin());
+    }
+    #endif
+}
+
 safe_mode_t port_init(void) {
     esp_timer_create_args_t args;
     args.callback = &tick_timer_cb;
@@ -214,6 +309,8 @@ safe_mode_t port_init(void) {
     }
     #endif
 
+    _never_reset_spi_ram_flash();
+
     if (heap == NULL) {
         size_t heap_total = heap_caps_get_total_size(MALLOC_CAP_8BIT);
         heap_size = MIN(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT), heap_total / 2);

From b67f3585e85159f93b6a7cf65e00a77cc6b643b3 Mon Sep 17 00:00:00 2001
From: Andy Warburton 
Date: Tue, 2 Aug 2022 21:10:39 +0100
Subject: [PATCH 0719/2403] css tweaks for edit.html

added remote css support to webworkflow edit.html and moved in page css out to the external stylesheet.
---
 supervisor/shared/web_workflow/static/edit.html | 14 ++------------
 supervisor/shared/web_workflow/static/style.css | 12 ++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/edit.html b/supervisor/shared/web_workflow/static/edit.html
index c223a11047..e11b094d2c 100644
--- a/supervisor/shared/web_workflow/static/edit.html
+++ b/supervisor/shared/web_workflow/static/edit.html
@@ -3,18 +3,8 @@
 
     
     Code Edit
-    
-
+    
+    
 
 
 
diff --git a/supervisor/shared/web_workflow/static/style.css b/supervisor/shared/web_workflow/static/style.css
index f6ef757b3f..17564af4fd 100644
--- a/supervisor/shared/web_workflow/static/style.css
+++ b/supervisor/shared/web_workflow/static/style.css
@@ -5,3 +5,15 @@ body {
   font-family: "Proxima Nova", Verdana, sans-serif;
   line-height: 20.7px;
 }
+
+
+/* for edit.html */
+#code_textarea {
+    width: 90%;
+    height: 600px;
+}
+
+#output_text {
+    margin: 0;
+    font-size: 0.7em;
+}

From 1c69fe1727bdc5e9bcd23abaf566330cf90bae74 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 2 Aug 2022 14:11:09 -0700
Subject: [PATCH 0720/2403] Fix S2/S3 USB

The new Kconfig that fixed C3 added a dependency on USB_OTG_SUPPORTED
that is only calculated if we include the usb module in cmake.

Fixes #6679
---
 ports/espressif/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
index 4c834397b9..1c79b448fe 100644
--- a/ports/espressif/CMakeLists.txt
+++ b/ports/espressif/CMakeLists.txt
@@ -6,7 +6,7 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 
 # The component list here determines what options we get in menuconfig and what the ninja file
 # can build.
-set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip wpa_supplicant freertos bt)
+set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip wpa_supplicant freertos bt usb)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(circuitpython)

From 9de8ae70b64b291d0df18e3cff8813488b07a5ab Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 2 Aug 2022 15:25:19 -0700
Subject: [PATCH 0721/2403] Fix C3 when pasting 128+ characters

The ringbuf used to fill up and the recv interrupt would block CP.
Now it'll disable the interrupt until we have enough room in the
ringbuf.

Fixes #6678
---
 ports/espressif/supervisor/usb_serial_jtag.c | 50 +++++++++++++-------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c
index c666c9bb3c..646d2c3a5e 100644
--- a/ports/espressif/supervisor/usb_serial_jtag.c
+++ b/ports/espressif/supervisor/usb_serial_jtag.c
@@ -46,6 +46,29 @@ STATIC volatile bool connected;
 #error "CONFIG_ESP_PHY_ENABLE_USB must be enabled in sdkconfig"
 #endif
 
+// Make sure the recv interrupt is disabled during this. Otherwise, it could reorder data if it
+// interrupts itself.
+static void _copy_out_of_fifo(void) {
+    size_t req_len = ringbuf_num_empty(&ringbuf);
+    if (req_len == 0) {
+        // Disable the interrupt so that CircuitPython can run and process the ringbuf. It will
+        // re-enable the interrupt once the ringbuf is empty.
+        usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
+    }
+    if (req_len > USB_SERIAL_JTAG_BUF_SIZE) {
+        req_len = USB_SERIAL_JTAG_BUF_SIZE;
+    }
+    uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
+    size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
+    for (size_t i = 0; i < len; ++i) {
+        if (rx_buf[i] == mp_interrupt_char) {
+            mp_sched_keyboard_interrupt();
+        } else {
+            ringbuf_put(&ringbuf, rx_buf[i]);
+        }
+    }
+}
+
 static void usb_serial_jtag_isr_handler(void *arg) {
     uint32_t flags = usb_serial_jtag_ll_get_intsts_mask();
 
@@ -60,25 +83,13 @@ static void usb_serial_jtag_isr_handler(void *arg) {
 
     if (flags & USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT) {
         usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
-        size_t req_len = ringbuf_num_empty(&ringbuf);
-        if (req_len > USB_SERIAL_JTAG_BUF_SIZE) {
-            req_len = USB_SERIAL_JTAG_BUF_SIZE;
-        }
-        uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
-        size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
-        for (size_t i = 0; i < len; ++i) {
-            if (rx_buf[i] == mp_interrupt_char) {
-                mp_sched_keyboard_interrupt();
-            } else {
-                ringbuf_put(&ringbuf, rx_buf[i]);
-            }
-        }
+        _copy_out_of_fifo();
         port_wake_main_task_from_isr();
     }
 }
 
 void usb_serial_jtag_init(void) {
-    ringbuf_init(&ringbuf, buf, sizeof(buf));
+    ringbuf_init(&ringbuf, buf, sizeof(buf) - 1);
     usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
     usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
     ESP_ERROR_CHECK(esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, ESP_INTR_FLAG_LEVEL1,
@@ -93,11 +104,18 @@ char usb_serial_jtag_read_char(void) {
     if (ringbuf_num_filled(&ringbuf) == 0) {
         return -1;
     }
-    return ringbuf_get(&ringbuf);
+    char c = ringbuf_get(&ringbuf);
+    // Maybe re-enable the recv interrupt if we've emptied the ringbuf.
+    if (ringbuf_num_filled(&ringbuf) == 0) {
+        usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
+        _copy_out_of_fifo();
+        usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
+    }
+    return c;
 }
 
 bool usb_serial_jtag_bytes_available(void) {
-    return ringbuf_num_filled(&ringbuf);
+    return ringbuf_num_filled(&ringbuf) > 0;
 }
 
 void usb_serial_jtag_write(const char *text, uint32_t length) {

From 8bd54726e4c9a24f3b247fc7137129170aed1a09 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 3 Aug 2022 03:31:53 +0200
Subject: [PATCH 0722/2403] 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             | 17 +++++++++++------
 locale/cs.po             | 20 ++++++++++++++------
 locale/de_DE.po          | 20 ++++++++++++++------
 locale/el.po             | 17 +++++++++++------
 locale/en_GB.po          | 20 ++++++++++++++------
 locale/es.po             | 20 ++++++++++++++------
 locale/fil.po            | 17 +++++++++++------
 locale/fr.po             | 20 ++++++++++++++------
 locale/hi.po             | 17 +++++++++++------
 locale/it_IT.po          | 17 +++++++++++------
 locale/ja.po             | 17 +++++++++++------
 locale/ko.po             | 17 +++++++++++------
 locale/nl.po             | 20 ++++++++++++++------
 locale/pl.po             | 17 +++++++++++------
 locale/pt_BR.po          | 20 ++++++++++++++------
 locale/ru.po             | 20 ++++++++++++++------
 locale/sv.po             | 20 ++++++++++++++------
 locale/tr.po             | 17 +++++++++++------
 locale/zh_Latn_pinyin.po | 20 ++++++++++++++------
 19 files changed, 239 insertions(+), 114 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 457615d505..c0f9237a9d 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -971,10 +971,6 @@ msgstr "Gagal terhubung: kesalahan internal"
 msgid "Failed to connect: timeout"
 msgstr "Gagal terhubung: habis waktu"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Gagal mengurai file MP3"
@@ -1564,7 +1560,7 @@ msgstr "Hanya 8 atau 16 bit mono dengan "
 msgid "Only IPv4 addresses supported"
 msgstr "Hanya alamat IPv4 yang didukung"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Hanysa socket IPv4 yang didukung"
 
@@ -1636,7 +1632,7 @@ msgstr "Waktu habis"
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Kehabisan socket"
 
@@ -3791,11 +3787,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/cs.po b/locale/cs.po
index 9c042c6c51..02405a1bd0 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -969,10 +969,6 @@ msgstr "Připojení se nezdařilo: interní chyba"
 msgid "Failed to connect: timeout"
 msgstr "Nepodařilo se připojit: časový limit"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Chyba inicializace WiFi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Soubor MP3 se nepodařilo analyzovat"
@@ -1564,7 +1560,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr "Pouze IPv4 adresy podporovány"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Pouze IPv4 sokety podporovány"
 
@@ -1632,7 +1628,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3777,11 +3773,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4333,6 +4338,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Failed to init wifi"
+#~ msgstr "Chyba inicializace WiFi"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q musí být n-tice délky 2"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 8f46245988..0dc5be2557 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -976,10 +976,6 @@ msgstr "Verbindung fehlgeschlagen: interner Fehler"
 msgid "Failed to connect: timeout"
 msgstr "Verbindung nicht erfolgreich: timeout"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Wifi Initialisierung ist fehlgeschlagen"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "MP3-Datei konnte nicht analysiert werden"
@@ -1579,7 +1575,7 @@ msgstr "Nur 8 oder 16 bit mono mit "
 msgid "Only IPv4 addresses supported"
 msgstr "Nur IPv4-Adressen werden unterstützt"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Nur IPv4-Sockets werden unterstützt"
 
@@ -1651,7 +1647,7 @@ msgstr "Zeit für Vorgang abgelaufen"
 msgid "Out of memory"
 msgstr "Kein Speicher mehr verfügbar"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Keine Sockets mehr verfügbar"
 
@@ -3854,11 +3850,20 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() mit 3 Argumenten erfordert Integer"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4415,6 +4420,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Failed to init wifi"
+#~ msgstr "Wifi Initialisierung ist fehlgeschlagen"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "Eingabe muss ein Tensor von Rang 2 sein"
 
diff --git a/locale/el.po b/locale/el.po
index e7abd4d7ff..be14e4289c 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -958,10 +958,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1616,7 +1612,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3759,11 +3755,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index f3b8bedb75..eb462b4dad 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -972,10 +972,6 @@ msgstr "Failed to connect: internal error"
 msgid "Failed to connect: timeout"
 msgstr "Failed to connect: timeout"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Failed to init WiFi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Failed to parse MP3 file"
@@ -1565,7 +1561,7 @@ msgstr "Only 8 or 16 bit mono with "
 msgid "Only IPv4 addresses supported"
 msgstr "Only IPv4 addresses supported"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Only IPv4 sockets supported"
 
@@ -1636,7 +1632,7 @@ msgstr "Operation timed out"
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Out of sockets"
 
@@ -3796,11 +3792,20 @@ msgstr "pow() 3rd argument cannot be 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() with 3 arguments requires integers"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4354,6 +4359,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 "Failed to init wifi"
+#~ msgstr "Failed to init WiFi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "input must be a tensor of rank 2"
 
diff --git a/locale/es.po b/locale/es.po
index 3652d1847e..ea5c7abbfc 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -979,10 +979,6 @@ msgstr "Error al conectar: error interno"
 msgid "Failed to connect: timeout"
 msgstr "Error al conectar: tiempo de espera agotado"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Fallo al inicializar wifi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Error al analizar el archivo MP3"
@@ -1585,7 +1581,7 @@ msgstr "Solo mono de 8 ó 16 bit con "
 msgid "Only IPv4 addresses supported"
 msgstr "Solo hay capacidad para direcciones IPv4"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Solo se admiten sockets IPv4"
 
@@ -1657,7 +1653,7 @@ msgstr "Tiempo de espera agotado"
 msgid "Out of memory"
 msgstr "Memoria agotada"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Se acabaron los enchufes"
 
@@ -3840,11 +3836,20 @@ msgstr "el 3er argumento de pow() no puede ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argumentos requiere enteros"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4399,6 +4404,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 "Failed to init wifi"
+#~ msgstr "Fallo al inicializar wifi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "Entrada tiene que ser un tensor de rango 2"
 
diff --git a/locale/fil.po b/locale/fil.po
index 4cf9806fa3..2ce57b913a 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -969,10 +969,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1564,7 +1560,7 @@ msgstr "Tanging 8 o 16 na bit mono na may "
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1632,7 +1628,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3798,11 +3794,20 @@ msgstr "pow() 3rd argument ay hindi maaring 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() na may 3 argumento kailangan ng integers"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/fr.po b/locale/fr.po
index 8cf8e5cb77..ff498bf168 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -993,10 +993,6 @@ msgstr "Impossible de se connecter : erreur interne"
 msgid "Failed to connect: timeout"
 msgstr "Impossible de se connecter: délai dépassé"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Echec de l'initialisation du Wifi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Impossible d'analyser le fichier MP3"
@@ -1608,7 +1604,7 @@ msgstr "Uniquement 8 ou 16 bit mono avec "
 msgid "Only IPv4 addresses supported"
 msgstr "Seulement les adresses IPv4 sont supportées"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Seulement les sockets IPv4 sont supportés"
 
@@ -1680,7 +1676,7 @@ msgstr "Timeout de l'opération"
 msgid "Out of memory"
 msgstr "Hors de mémoire"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Plus de sockets"
 
@@ -3885,11 +3881,20 @@ msgstr "le 3e argument de pow() ne peut être 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() avec 3 arguments nécessite des entiers"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr "presser le bouton SW38 au démarrage.\n"
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4444,6 +4449,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 "Failed to init wifi"
+#~ msgstr "Echec de l'initialisation du Wifi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "l'entrée doit être un tenseur de rang 2"
 
diff --git a/locale/hi.po b/locale/hi.po
index aea67d4580..76817fd84f 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -958,10 +958,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1616,7 +1612,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3759,11 +3755,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index e418f789f9..168b23e23d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -974,10 +974,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1571,7 +1567,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1639,7 +1635,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3811,11 +3807,20 @@ msgstr "il terzo argomento di pow() non può essere 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argomenti richiede interi"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/ja.po b/locale/ja.po
index 7fb9268a9d..844b3bd2d5 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -967,10 +967,6 @@ msgstr "接続失敗: 内部エラー"
 msgid "Failed to connect: timeout"
 msgstr "接続失敗: タイムアウト"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "MP3ファイルのパーズに失敗"
@@ -1561,7 +1557,7 @@ msgstr "8または16ビットの "
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1629,7 +1625,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3780,11 +3776,20 @@ msgstr "pow()の3つ目の引数は0にできません"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow()の第3引数には整数が必要"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/ko.po b/locale/ko.po
index fce40622bd..4334a2dbc1 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -961,10 +961,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1551,7 +1547,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1619,7 +1615,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3763,11 +3759,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/nl.po b/locale/nl.po
index 55b10b872a..b4e9e6c484 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -966,10 +966,6 @@ msgstr "Verbinding mislukt: interne fout"
 msgid "Failed to connect: timeout"
 msgstr "Verbinding mislukt: timeout"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Kon WiFi niet initialiseren"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Mislukt om MP3 bestand te ontleden"
@@ -1561,7 +1557,7 @@ msgstr "Alleen 8 of 16 bit mono met "
 msgid "Only IPv4 addresses supported"
 msgstr "Alleen IPv4 adressen worden ondersteund"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Alleen IPv4-sockets ondersteund"
 
@@ -1633,7 +1629,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Geen sockets meer beschikbaar"
 
@@ -3796,11 +3792,20 @@ msgstr "derde argument van pow() mag geen 0 zijn"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() met 3 argumenten vereist integers"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4354,6 +4359,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 "Failed to init wifi"
+#~ msgstr "Kon WiFi niet initialiseren"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "invoer moet een tensor van rang 2 zijn"
 
diff --git a/locale/pl.po b/locale/pl.po
index 3041284599..afadb604d0 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -967,10 +967,6 @@ msgstr "Nie udało się połączyć: błąd wewnętrzny"
 msgid "Failed to connect: timeout"
 msgstr "Nie udało się połączyć: upłynął limit czasu"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Nie można przeanalizować pliku MP3"
@@ -1559,7 +1555,7 @@ msgstr "Tylko 8 lub 16 bitów mono z "
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1627,7 +1623,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3772,11 +3768,20 @@ msgstr "trzeci argument pow() nie może być 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "trzyargumentowe pow() wymaga liczb całkowitych"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 38cf9c7ff0..3ddb5d65a8 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -985,10 +985,6 @@ msgstr "Falha ao conectar: erro interno"
 msgid "Failed to connect: timeout"
 msgstr "Falha ao conectar: tempo limite"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Houve uma falha ao iniciar o wifi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Falha ao analisar o arquivo MP3"
@@ -1590,7 +1586,7 @@ msgstr "Apenas mono com 8 ou 16 bits com "
 msgid "Only IPv4 addresses supported"
 msgstr "Somente os endereços IPv4 são suportados"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Apenas soquetes IPv4 são suportados"
 
@@ -1662,7 +1658,7 @@ msgstr "A operação expirou"
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Sem soquetes"
 
@@ -3862,11 +3858,20 @@ msgstr "O terceiro argumento pow() não pode ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "o pow() com 3 argumentos requer números inteiros"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr "pressionando o botão SW38 na inicialização.\n"
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4420,6 +4425,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 "Failed to init wifi"
+#~ msgstr "Houve uma falha ao iniciar o wifi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "a entrada dos dados deve ser um tensor de nível 2"
 
diff --git a/locale/ru.po b/locale/ru.po
index e993d00aec..d4e434ad67 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -983,10 +983,6 @@ msgstr "Не удалось подключиться: внутренняя ош
 msgid "Failed to connect: timeout"
 msgstr "Не удалось подключиться: тайм-аут"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Не удалось инициировать wifi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Не удалось распарсить файл MP3"
@@ -1588,7 +1584,7 @@ msgstr "Только 8- или 16-битное моно с "
 msgid "Only IPv4 addresses supported"
 msgstr "Поддерживаются только адреса IPv4"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Поддерживаются только сокеты IPv4"
 
@@ -1658,7 +1654,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3808,11 +3804,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4364,6 +4369,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "Failed to init wifi"
+#~ msgstr "Не удалось инициировать wifi"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q должен быть кортежем длинной 2"
 
diff --git a/locale/sv.po b/locale/sv.po
index 8c60691712..e5ae4df26e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -972,10 +972,6 @@ msgstr "Det gick inte att ansluta: internt fel"
 msgid "Failed to connect: timeout"
 msgstr "Det gick inte att ansluta: timeout"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Kunde inte initiera WiFi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Det gick inte att tolka MP3-filen"
@@ -1571,7 +1567,7 @@ msgstr "Endast 8 eller 16 bitars mono med "
 msgid "Only IPv4 addresses supported"
 msgstr "Endast IPv4-adresser stöds"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Endast IPv4-socket stöds"
 
@@ -1642,7 +1638,7 @@ msgstr "Åtgärden orsakade timeout"
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Slut på sockets"
 
@@ -3821,11 +3817,20 @@ msgstr "pow() 3: e argument kan inte vara 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() med 3 argument kräver heltal"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr "genom att trycka på SW38-knappen vid start.\n"
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4379,6 +4384,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 "Failed to init wifi"
+#~ msgstr "Kunde inte initiera WiFi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "indata måste vara en tensor av rank 2"
 
diff --git a/locale/tr.po b/locale/tr.po
index a2d8d41ea7..f8d52779ef 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -975,10 +975,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1565,7 +1561,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1633,7 +1629,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -3779,11 +3775,20 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 5985e012b0..b98cab412f 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -981,10 +981,6 @@ msgstr "Liánjiē shībài: Nèibù cuòwù"
 msgid "Failed to connect: timeout"
 msgstr "Liánjiē shībài: Chāoshí"
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr "Wúfǎ chūshǐhuà wifi"
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr "Wúfǎ jiěxī MP3 wénjiàn"
@@ -1584,7 +1580,7 @@ msgstr "Zhǐyǒu 8 huò 16 wèi dānwèi "
 msgid "Only IPv4 addresses supported"
 msgstr "Jǐn zhīchí IPv4 dìzhǐ"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "jǐn zhī chí IPv4 tào jiē zì"
 
@@ -1656,7 +1652,7 @@ msgstr "cāo zuò yǐ fēn shí"
 msgid "Out of memory"
 msgstr "nèi cún bù zú"
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "tào jiē zì wài"
 
@@ -3830,11 +3826,20 @@ msgstr "pow() 3 cān shǔ bùnéng wéi 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() yǒu 3 cānshù xūyào zhěngshù"
 
+#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+msgid "pressing BOOT button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "pressing VOLUME button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
@@ -4391,6 +4396,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 "Failed to init wifi"
+#~ msgstr "Wúfǎ chūshǐhuà wifi"
+
 #~ msgid "input must be a tensor of rank 2"
 #~ msgstr "shū rù bì xū shì děng jí 2 de zhāng liàng"
 

From 534a482d9428f75fea1a077a51989936645eb1ac Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 2 Aug 2022 21:47:46 -0400
Subject: [PATCH 0723/2403] initial HUZZAH32 bring-up, with hacked pins

---
 .../boards/adafruit_feather_huzzah32/board.c  | 45 +++++++++++
 .../adafruit_feather_huzzah32/mpconfigboard.h | 45 +++++++++++
 .../mpconfigboard.mk                          | 18 +++++
 .../boards/adafruit_feather_huzzah32/pins.c   | 79 +++++++++++++++++++
 .../adafruit_feather_huzzah32/sdkconfig       | 22 ++++++
 .../common-hal/microcontroller/Pin.c          |  4 +
 6 files changed, 213 insertions(+)
 create mode 100644 ports/espressif/boards/adafruit_feather_huzzah32/board.c
 create mode 100644 ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.h
 create mode 100644 ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/adafruit_feather_huzzah32/pins.c
 create mode 100644 ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig

diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/board.c b/ports/espressif/boards/adafruit_feather_huzzah32/board.c
new file mode 100644
index 0000000000..c5e2797b00
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/board.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.h
new file mode 100644
index 0000000000..0c481d6a4b
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Adafruit Feather HUZZAH32"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO13)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO23}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO5, .mosi = &pin_GPIO18, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
new file mode 100644
index 0000000000..2ed08856f9
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -0,0 +1,18 @@
+CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_STATUS_BAR = 0
+CIRCUITPY_WEB_WORKFLOW = 0
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/pins.c b/ports/espressif/boards/adafruit_feather_huzzah32/pins.c
new file mode 100644
index 0000000000..2d96457aad
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/pins.c
@@ -0,0 +1,79 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO0) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig b/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig
new file mode 100644
index 0000000000..9c1fcd9382
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig
@@ -0,0 +1,22 @@
+### TEST
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# Uncomment to send log output to TX/RX pins
+#
+# ESP System Settings
+#
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+# end of ESP System Settings
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 201fa0ac2b..372819e545 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -48,6 +48,10 @@ static const uint64_t pin_mask_reset_forbidden =
     GPIO_SEL_3 |          // RXD0
     // Never ever reset pins used to communicate with SPI flash and PSRAM.
     GPIO_SEL_6 |          // CLK
+    /////////TEMP
+    GPIO_SEL_7 |          // SD0
+    GPIO_SEL_8 |          // SD1
+    ////////END TEMP
     GPIO_SEL_9 |          // (PSRAM) SD2
     GPIO_SEL_10 |         // (PSRAM) SD3
     GPIO_SEL_11 |         // CMD

From b027d111a9c533f1ae1d53872b74e5ba67142de2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 2 Aug 2022 22:00:59 -0400
Subject: [PATCH 0724/2403] remove custom console UART from
 sdkconfig-esp32.defaults

---
 .../esp-idf-config/sdkconfig-esp32.defaults          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 0b8efe48cd..c60941afdf 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -470,16 +470,10 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
 # CONFIG_ESP_CONSOLE_UART_DEFAULT is not set
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
+CONFIG_ESP_CONSOLE_NONE=y
 CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_CONSOLE_UART_NUM=-1
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y

From d3d5e36548fdaf7b0d3b7bce7861986ed8080829 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 2 Aug 2022 22:37:06 -0400
Subject: [PATCH 0725/2403] update adafruit/esp-idf for
 ESP32_ECO3_CACHE_LOCK_FIX fix

---
 ports/espressif/esp-idf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 0180c0cb80..d51f7d8821 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 0180c0cb80f052919badc15df164e8edde6344ad
+Subproject commit d51f7d882187afa4b39c2613fd0fe2ac2fea1145

From efa3e40f90033ef1acbc3a4c170e687f8006ac05 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 3 Aug 2022 08:48:28 +0300
Subject: [PATCH 0726/2403] Add the one obtained from esp

---
 .../espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
index f5d73a7d20..3d4937bd93 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x239a
-USB_PID = 0x00a5
+USB_VID = 0x303a
+USB_PID = 0x810a
 USB_PRODUCT = "ESP32-S2-Pico"
 USB_MANUFACTURER = "Waveshare Electronics"
 

From 68bb6b9988f15d75914e636e0972081aa5d1fae8 Mon Sep 17 00:00:00 2001
From: bill88t 
Date: Wed, 3 Aug 2022 09:14:26 +0300
Subject: [PATCH 0727/2403] ran precommit

---
 locale/circuitpython.pot                             |  8 ++------
 ports/espressif/boards/waveshare_esp32s2_pico/pins.c | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1607df3ec8..f1ccecce08 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -958,10 +958,6 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: ports/espressif/common-hal/wifi/__init__.c
-msgid "Failed to init wifi"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1616,7 +1612,7 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-#: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
index 16256b84ae..1b7a8d705c 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
@@ -10,18 +10,18 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO9) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
@@ -32,7 +32,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP36), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_GP37), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_GP38), MP_ROM_PTR(&pin_GPIO38) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO40) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },

From c884194c92a3096879b46a144d707dfdbc693f63 Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Wed, 3 Aug 2022 08:45:39 +0200
Subject: [PATCH 0728/2403] Fixed incorrect PID.

---
 .../boards/challenger_rp2040_subghz/mpconfigboard.mk            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
index 97c402a306..8bd9ac2318 100644
--- a/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x2e8a
-USB_PID = 0x1030
+USB_PID = 0x1032
 USB_PRODUCT = "Challenger RP2040 SubGHz"
 USB_MANUFACTURER = "Invector Labs"
 

From f3db5709c3a91fc542fbc05c26c34f3a90a86956 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 3 Aug 2022 16:33:13 -0400
Subject: [PATCH 0729/2403] Add filename sort to web workflow file manager

---
 .../shared/web_workflow/static/directory.html |   4 +-
 .../shared/web_workflow/static/directory.js   | 169 ++++++++++++++++++
 2 files changed, 171 insertions(+), 2 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index b88e74684b..6e2b833d6f 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -11,8 +11,8 @@
     
     
    
     
     
-    
    
         
    TypeSizePathModified
    
         
    
-        
+    
    TypeSizePathModified
    
+        
    TypeSizeModified
    
         
     
    
     
    
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 91389343d6..657a8169d4 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -1,3 +1,172 @@
+/*
+ *   This content is licensed according to the W3C Software License at
+ *   https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+ *
+ *   File:   sortable-table.js
+ *
+ *   Desc:   Adds sorting to a HTML data table that implements ARIA Authoring Practices
+ */
+
+'use strict';
+
+class SortableTable {
+  constructor(tableNode) {
+    this.tableNode = tableNode;
+
+    this.columnHeaders = tableNode.querySelectorAll('thead th');
+
+    this.sortColumns = [];
+
+    for (var i = 0; i < this.columnHeaders.length; i++) {
+      var ch = this.columnHeaders[i];
+      var buttonNode = ch.querySelector('button');
+      if (buttonNode) {
+        this.sortColumns.push(i);
+        buttonNode.setAttribute('data-column-index', i);
+        buttonNode.addEventListener('click', this.handleClick.bind(this));
+      }
+    }
+
+    this.optionCheckbox = document.querySelector(
+      'input[type="checkbox"][value="show-unsorted-icon"]'
+    );
+
+    if (this.optionCheckbox) {
+      this.optionCheckbox.addEventListener(
+        'change',
+        this.handleOptionChange.bind(this)
+      );
+      if (this.optionCheckbox.checked) {
+        this.tableNode.classList.add('show-unsorted-icon');
+      }
+    }
+  }
+
+  setColumnHeaderSort(columnIndex) {
+    if (typeof columnIndex === 'string') {
+      columnIndex = parseInt(columnIndex);
+    }
+
+    for (var i = 0; i < this.columnHeaders.length; i++) {
+      var ch = this.columnHeaders[i];
+      var buttonNode = ch.querySelector('button');
+      if (i === columnIndex) {
+        var value = ch.getAttribute('aria-sort');
+        if (value === 'descending') {
+          ch.setAttribute('aria-sort', 'ascending');
+          this.sortColumn(
+            columnIndex,
+            'ascending',
+            ch.classList.contains('num')
+          );
+        } else {
+          ch.setAttribute('aria-sort', 'descending');
+          this.sortColumn(
+            columnIndex,
+            'descending',
+            ch.classList.contains('num')
+          );
+        }
+      } else {
+        if (ch.hasAttribute('aria-sort') && buttonNode) {
+          ch.removeAttribute('aria-sort');
+        }
+      }
+    }
+  }
+
+  sortColumn(columnIndex, sortValue, isNumber) {
+    function compareValues(a, b) {
+      if (sortValue === 'ascending') {
+        if (a.value === b.value) {
+          return 0;
+        } else {
+          if (isNumber) {
+            return a.value - b.value;
+          } else {
+            return a.value < b.value ? -1 : 1;
+          }
+        }
+      } else {
+        if (a.value === b.value) {
+          return 0;
+        } else {
+          if (isNumber) {
+            return b.value - a.value;
+          } else {
+            return a.value > b.value ? -1 : 1;
+          }
+        }
+      }
+    }
+
+    if (typeof isNumber !== 'boolean') {
+      isNumber = false;
+    }
+
+    var tbodyNode = this.tableNode.querySelector('tbody');
+    var rowNodes = [];
+    var dataCells = [];
+
+    var rowNode = tbodyNode.firstElementChild;
+
+    var index = 0;
+    while (rowNode) {
+      rowNodes.push(rowNode);
+      var rowCells = rowNode.querySelectorAll('th, td');
+      var dataCell = rowCells[columnIndex];
+
+      var data = {};
+      data.index = index;
+      data.value = dataCell.textContent.toLowerCase().trim();
+      if (isNumber) {
+        data.value = parseFloat(data.value);
+      }
+      dataCells.push(data);
+      rowNode = rowNode.nextElementSibling;
+      index += 1;
+    }
+
+    dataCells.sort(compareValues);
+
+    // remove rows
+    while (tbodyNode.firstChild) {
+      tbodyNode.removeChild(tbodyNode.lastChild);
+    }
+
+    // add sorted rows
+    for (var i = 0; i < dataCells.length; i += 1) {
+      tbodyNode.appendChild(rowNodes[dataCells[i].index]);
+    }
+  }
+
+  /* EVENT HANDLERS */
+
+  handleClick(event) {
+    var tgt = event.currentTarget;
+    this.setColumnHeaderSort(tgt.getAttribute('data-column-index'));
+  }
+
+  handleOptionChange(event) {
+    var tgt = event.currentTarget;
+
+    if (tgt.checked) {
+      this.tableNode.classList.add('show-unsorted-icon');
+    } else {
+      this.tableNode.classList.remove('show-unsorted-icon');
+    }
+  }
+}
+
+// Initialize sortable table buttons
+window.addEventListener('load', function () {
+  var sortableTables = document.querySelectorAll('table.sortable');
+  for (var i = 0; i < sortableTables.length; i++) {
+    new SortableTable(sortableTables[i]);
+  }
+});
+
+
 let new_directory_name = document.getElementById("name");
 let files = document.getElementById("files");
 

From 82be75adb57a062aeca6766c7a27cfa07e43f6ad Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 Aug 2022 07:10:51 -0500
Subject: [PATCH 0730/2403] Add ability to reserve psram

.. the primary user of which will be the camera, since the framebuffers
must be allocated via esp-idf allocation function and never from the
gc heap.

A board can have a default value, and the value can also be set in the
/.env file using the key CIRCUITPY_RESERVED_PSRAM with the value being
the reserved size in bytes.

Co-authored-by: Dan Halbert 
---
 docs/environment.rst                         |   6 +
 locale/circuitpython.pot                     |  26 +--
 main.c                                       |   4 +
 ports/espressif/Makefile                     |   2 +
 ports/espressif/bindings/espidf/__init__.c   |  79 ++------
 ports/espressif/bindings/espidf/__init__.h   |   7 +
 ports/espressif/common-hal/espidf/__init__.c | 194 +++++++++++++++++++
 ports/espressif/common-hal/espidf/__init__.h |  29 +++
 ports/espressif/mpconfigport.h               |   9 +
 ports/espressif/supervisor/port.c            |  47 ++---
 py/circuitpy_mpconfig.h                      |   4 +
 shared-module/dotenv/__init__.c              |  24 +++
 shared-module/dotenv/__init__.h              |   8 +
 supervisor/port.h                            |   6 +
 supervisor/shared/memory.c                   |   2 +
 supervisor/stub/misc.c                       |  33 ++++
 supervisor/supervisor.mk                     |   5 +-
 17 files changed, 385 insertions(+), 100 deletions(-)
 create mode 100644 ports/espressif/common-hal/espidf/__init__.c
 create mode 100644 ports/espressif/common-hal/espidf/__init__.h
 create mode 100644 supervisor/stub/misc.c

diff --git a/docs/environment.rst b/docs/environment.rst
index b1619f37bf..5766b54380 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -35,6 +35,12 @@ CIRCUITPY_BLE_NAME
 ~~~~~~~~~~~~~~~~~~
 Default BLE name the board advertises as, including for the BLE workflow.
 
+CIRCUITPY_RESERVED_PSRAM
+~~~~~~~~~~~~~~~~~~~~~~~~
+On boards with Espressif microcontrollers with PSRAM (also called SPIRAM), permanently reserve a portion of PSRAM for use by esp-idf.
+This storage is removed from the CircuitPython "heap" and is available for allocation by esp-idf routines in the core instead.
+Generally, only set this to a non-zero value when it is required by a specific core module.
+
 CIRCUITPY_WEB_API_PASSWORD
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 Password required to make modifications to the board from the Web Workflow.
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index decd4816a3..332331e14f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -209,7 +209,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1188,7 +1188,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -1218,7 +1218,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1226,7 +1226,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1600,15 +1600,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1783,7 +1783,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1799,7 +1799,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2221,7 +2221,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/main.c b/main.c
index d310f571a6..9bea7f891c 100644
--- a/main.c
+++ b/main.c
@@ -792,8 +792,12 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     usb_get_boot_py_data(usb_boot_py_data, size);
     #endif
 
+    port_post_boot_py(true);
+
     cleanup_after_vm(heap, result.exception);
 
+    port_post_boot_py(false);
+
     #if CIRCUITPY_USB
     // Now give back the data we saved from the heap going away.
     usb_return_boot_py_data(usb_boot_py_data, size);
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index febc6764bb..e111fa3441 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -281,6 +281,8 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 SRC_C += common-hal/_bleio/ble_events.c
 endif
 
+SRC_C += $(wildcard common-hal/espidf/*.c)
+
 SRC_COMMON_HAL_EXPANDED = \
 	$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
 	$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index 4f7da39540..c73e494f6c 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -120,6 +120,20 @@ const mp_obj_type_t mp_type_espidf_MemoryError = {
     .parent = &mp_type_MemoryError,
 };
 
+//| def get_total_psram() -> int:
+//|     """Returns the number of bytes of psram detected, or 0 if psram is not present or not configured"""
+STATIC mp_obj_t espidf_get_total_psram(void) {
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_total_psram());
+}
+MP_DEFINE_CONST_FUN_OBJ_0(espidf_get_total_psram_obj, espidf_get_total_psram);
+
+//| def get_reserved_psram() -> int:
+//|     """Returns number of bytes of psram reserved for use by esp-idf, either a board-specific default value or the value defined in ``/.env``."""
+STATIC mp_obj_t espidf_get_reserved_psram(void) {
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_reserved_psram());
+}
+MP_DEFINE_CONST_FUN_OBJ_0(espidf_get_reserved_psram_obj, espidf_get_reserved_psram);
+
 STATIC const mp_rom_map_elem_t espidf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espidf) },
 
@@ -129,6 +143,8 @@ STATIC const mp_rom_map_elem_t espidf_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_erase_nvs), MP_ROM_PTR(&espidf_erase_nvs_obj)},
 
+    { MP_ROM_QSTR(MP_QSTR_get_total_psram), MP_ROM_PTR(&espidf_get_total_psram_obj)},
+    { MP_ROM_QSTR(MP_QSTR_get_reserved_psram), MP_ROM_PTR(&espidf_get_reserved_psram_obj)},
     { MP_ROM_QSTR(MP_QSTR_IDFError), MP_ROM_PTR(&mp_type_espidf_IDFError) },
     { MP_ROM_QSTR(MP_QSTR_MemoryError),      MP_ROM_PTR(&mp_type_espidf_MemoryError) },
 };
@@ -139,66 +155,3 @@ const mp_obj_module_t espidf_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&espidf_module_globals,
 };
-
-void raise_esp_error(esp_err_t err) {
-    const compressed_string_t *msg = NULL;
-    const mp_obj_type_t *exception_type = &mp_type_espidf_IDFError;
-    switch (err) {
-        case ESP_FAIL:
-            msg = translate("Generic Failure");
-            break;
-        case ESP_ERR_NO_MEM:
-            exception_type = &mp_type_espidf_MemoryError;
-            msg = translate("Out of memory");
-            break;
-        case ESP_ERR_INVALID_ARG:
-            msg = translate("Invalid argument");
-            break;
-        case ESP_ERR_INVALID_STATE:
-            msg = translate("Invalid state");
-            break;
-        case ESP_ERR_INVALID_SIZE:
-            msg = translate("Invalid size");
-            break;
-        case ESP_ERR_NOT_FOUND:
-            msg = translate("Requested resource not found");
-            break;
-        case ESP_ERR_NOT_SUPPORTED:
-            msg = translate("Operation or feature not supported");
-            break;
-        case ESP_ERR_TIMEOUT:
-            msg = translate("Operation timed out");
-            break;
-        case ESP_ERR_INVALID_RESPONSE:
-            msg = translate("Received response was invalid");
-            break;
-        case ESP_ERR_INVALID_CRC:
-            msg = translate("CRC or checksum was invalid");
-            break;
-        case ESP_ERR_INVALID_VERSION:
-            msg = translate("Version was invalid");
-            break;
-        case ESP_ERR_INVALID_MAC:
-            msg = translate("MAC address was invalid");
-            break;
-    }
-    if (msg) {
-        mp_raise_msg(exception_type, msg);
-    }
-
-    const char *group = "ESP-IDF";
-
-    // tests must be in descending order
-    MP_STATIC_ASSERT(ESP_ERR_FLASH_BASE > ESP_ERR_MESH_BASE);
-    MP_STATIC_ASSERT(ESP_ERR_MESH_BASE > ESP_ERR_WIFI_BASE);
-    if (err >= ESP_ERR_FLASH_BASE) {
-        group = "Flash";
-    } else if (err >= ESP_ERR_MESH_BASE) {
-        group = "Mesh";
-    } else if (err >= ESP_ERR_WIFI_BASE) {
-        group = "WiFi";
-    }
-    mp_raise_msg_varg(exception_type, translate("%s error 0x%x"), group, err);
-}
-
-MP_REGISTER_MODULE(MP_QSTR_espidf, espidf_module, CIRCUITPY_ESPIDF);
diff --git a/ports/espressif/bindings/espidf/__init__.h b/ports/espressif/bindings/espidf/__init__.h
index 5891d2c5c0..e091a5c477 100644
--- a/ports/espressif/bindings/espidf/__init__.h
+++ b/ports/espressif/bindings/espidf/__init__.h
@@ -39,4 +39,11 @@ NORETURN void mp_raise_espidf_MemoryError(void);
 void raise_esp_error(esp_err_t err) NORETURN;
 #define CHECK_ESP_RESULT(x) do { int res = (x); if (res != ESP_OK) raise_esp_error(res); } while (0)
 
+void common_hal_espidf_reserve_psram(void);
+bool common_hal_espidf_set_reserved_psram(size_t amount);
+size_t common_hal_espidf_get_reserved_psram(void);
+size_t common_hal_espidf_get_total_psram(void);
+intptr_t common_hal_espidf_get_psram_start(void);
+intptr_t common_hal_espidf_get_psram_end(void);
+
 #endif  // MICROPY_INCLUDED_ESPRESSIF_BINDINGS_ESPIDF___INIT___H
diff --git a/ports/espressif/common-hal/espidf/__init__.c b/ports/espressif/common-hal/espidf/__init__.c
new file mode 100644
index 0000000000..183ebb3817
--- /dev/null
+++ b/ports/espressif/common-hal/espidf/__init__.c
@@ -0,0 +1,194 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "bindings/espidf/__init__.h"
+#include "supervisor/shared/translate/translate.h"
+#include "supervisor/memory.h"
+#include "py/runtime.h"
+
+#include "esp_log.h"
+#define TAG "espidf"
+
+#ifdef CONFIG_SPIRAM
+#include "esp32/spiram.h"
+#include "esp_heap_caps.h"
+#include "esp_heap_caps_init.h"
+#include "soc/soc.h"
+#ifdef CONFIG_IDF_TARGET_ESP32
+#include "esp32/himem.h"
+#else
+#define esp_himem_reserved_area_size() (0)
+#endif
+bool ok_to_reserve_psram = true;
+size_t reserved_psram = DEFAULT_RESERVED_PSRAM;
+#endif
+
+static size_t psram_size_usable(void) {
+    #ifdef CONFIG_SPIRAM
+    /* PSRAM chip may be larger than the size we can map into address space */
+    size_t s = MIN(esp_spiram_get_size(), SOC_EXTRAM_DATA_SIZE);
+    return s - esp_himem_reserved_area_size();
+    #else
+    return 0;
+    #endif
+}
+
+bool common_hal_espidf_set_reserved_psram(size_t amount) {
+    #ifdef CONFIG_SPIRAM
+    if (!esp_spiram_is_initialized()) {
+        return false;
+    }
+    if (!ok_to_reserve_psram) {
+        return false;
+    }
+    if (amount > psram_size_usable()) {
+        return false;
+    }
+    reserved_psram = amount;
+    return true;
+    #else
+    return false;
+    #endif
+}
+
+supervisor_allocation *psram_for_idf;
+
+void common_hal_espidf_reserve_psram(void) {
+    #ifdef CONFIG_SPIRAM
+    if (!psram_for_idf) {
+        ESP_LOGI(TAG, "Reserving %d bytes of psram", reserved_psram);
+        if (reserved_psram == 0) {
+            return;
+        }
+        psram_for_idf = allocate_memory(reserved_psram, true, false);
+        if (psram_for_idf) {
+            intptr_t psram_for_idf_start = (intptr_t)psram_for_idf->ptr;
+            intptr_t psram_for_idf_end = psram_for_idf_start + reserved_psram;
+            ESP_LOGI(TAG, "Reserved %x..%x", psram_for_idf_start, psram_for_idf_end);
+            heap_caps_add_region(psram_for_idf_start, psram_for_idf_end);
+        } else {
+            ESP_LOGE(TAG, "supervisor allocation failed");
+        }
+    }
+    #endif
+}
+
+size_t common_hal_espidf_get_reserved_psram(void) {
+    #ifdef CONFIG_SPIRAM
+    return reserved_psram;
+    #else
+    return 0;
+    #endif
+}
+
+size_t common_hal_espidf_get_total_psram(void) {
+    return psram_size_usable();
+}
+
+intptr_t common_hal_espidf_get_psram_start(void) {
+    #ifdef CONFIG_SPIRAM
+    if (esp_spiram_is_initialized()) {
+        #ifdef CONFIG_IDF_TARGET_ESP32
+        return SOC_EXTRAM_DATA_LOW;
+        #else
+        return SOC_EXTRAM_DATA_HIGH - psram_size_usable();
+        #endif
+    }
+    #endif
+    return 0;
+}
+
+intptr_t common_hal_espidf_get_psram_end(void) {
+    #ifdef CONFIG_SPIRAM
+    if (esp_spiram_is_initialized()) {
+        return common_hal_espidf_get_psram_start() + psram_size_usable();
+    }
+    #endif
+    return 0;
+}
+
+void raise_esp_error(esp_err_t err) {
+    const compressed_string_t *msg = NULL;
+    const mp_obj_type_t *exception_type = &mp_type_espidf_IDFError;
+    switch (err) {
+        case ESP_FAIL:
+            msg = translate("Generic Failure");
+            break;
+        case ESP_ERR_NO_MEM:
+            exception_type = &mp_type_espidf_MemoryError;
+            msg = translate("Out of memory");
+            break;
+        case ESP_ERR_INVALID_ARG:
+            msg = translate("Invalid argument");
+            break;
+        case ESP_ERR_INVALID_STATE:
+            msg = translate("Invalid state");
+            break;
+        case ESP_ERR_INVALID_SIZE:
+            msg = translate("Invalid size");
+            break;
+        case ESP_ERR_NOT_FOUND:
+            msg = translate("Requested resource not found");
+            break;
+        case ESP_ERR_NOT_SUPPORTED:
+            msg = translate("Operation or feature not supported");
+            break;
+        case ESP_ERR_TIMEOUT:
+            msg = translate("Operation timed out");
+            break;
+        case ESP_ERR_INVALID_RESPONSE:
+            msg = translate("Received response was invalid");
+            break;
+        case ESP_ERR_INVALID_CRC:
+            msg = translate("CRC or checksum was invalid");
+            break;
+        case ESP_ERR_INVALID_VERSION:
+            msg = translate("Version was invalid");
+            break;
+        case ESP_ERR_INVALID_MAC:
+            msg = translate("MAC address was invalid");
+            break;
+    }
+    if (msg) {
+        mp_raise_msg(exception_type, msg);
+    }
+
+    const char *group = "ESP-IDF";
+
+    // tests must be in descending order
+    MP_STATIC_ASSERT(ESP_ERR_FLASH_BASE > ESP_ERR_MESH_BASE);
+    MP_STATIC_ASSERT(ESP_ERR_MESH_BASE > ESP_ERR_WIFI_BASE);
+    if (err >= ESP_ERR_FLASH_BASE) {
+        group = "Flash";
+    } else if (err >= ESP_ERR_MESH_BASE) {
+        group = "Mesh";
+    } else if (err >= ESP_ERR_WIFI_BASE) {
+        group = "WiFi";
+    }
+    mp_raise_msg_varg(exception_type, translate("%s error 0x%x"), group, err);
+}
+
+MP_REGISTER_MODULE(MP_QSTR_espidf, espidf_module, CIRCUITPY_ESPIDF);
diff --git a/ports/espressif/common-hal/espidf/__init__.h b/ports/espressif/common-hal/espidf/__init__.h
new file mode 100644
index 0000000000..0d168b105c
--- /dev/null
+++ b/ports/espressif/common-hal/espidf/__init__.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "bindings/espidf/__init__.h"
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index 72a9b32478..632a7a13cd 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -90,4 +90,13 @@
 #define CIRCUITPY_ESP_USB_SERIAL_JTAG (0)
 #endif
 
+#ifndef DEFAULT_RESERVED_PSRAM
+#define DEFAULT_RESERVED_PSRAM (0)
+#endif
+
+#if defined(CONFIG_SPIRAM)
+#undef CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS
+#define CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS (1)
+#endif
+
 #endif  // MICROPY_INCLUDED_ESPRESSIF_MPCONFIGPORT_H
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 9f58e8625b..ceedce367d 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -29,11 +29,13 @@
 #include 
 #include "supervisor/board.h"
 #include "supervisor/port.h"
+#include "supervisor/filesystem.h"
 #include "py/runtime.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#include "bindings/espidf/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/busio/I2C.h"
@@ -53,6 +55,7 @@
 #include "shared-bindings/microcontroller/RunMode.h"
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/socketpool/__init__.h"
+#include "shared-module/dotenv/__init__.h"
 
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
@@ -95,20 +98,8 @@
 #include "esp32/rom/efuse.h"
 #endif
 
-#ifdef CONFIG_SPIRAM
-#include "esp32/spiram.h"
-#ifdef CONFIG_IDF_TARGET_ESP32
-#include "esp32/himem.h"
-#else
-#define esp_himem_reserved_area_size() (0)
-#endif
-
-static size_t spiram_size_usable(void) {
-    /* SPIRAM chip may be larger than the size we can map into address space */
-    size_t s = MIN(esp_spiram_get_size(), SOC_EXTRAM_DATA_SIZE);
-    return s - esp_himem_reserved_area_size();
-}
-#endif
+#include "esp_log.h"
+#define TAG "port"
 
 uint32_t *heap;
 uint32_t heap_size;
@@ -298,14 +289,16 @@ safe_mode_t port_init(void) {
     #endif
 
     #ifdef CONFIG_SPIRAM
-    if (esp_spiram_is_initialized()) {
-        size_t spiram_size = spiram_size_usable();
-        #ifdef CONFIG_IDF_TARGET_ESP32
-        heap = (uint32_t *)SOC_EXTRAM_DATA_LOW;
-        #else
-        heap = (uint32_t *)(SOC_EXTRAM_DATA_HIGH - spiram_size);
-        #endif
-        heap_size = spiram_size / sizeof(uint32_t);
+    {
+        intptr_t heap_start = common_hal_espidf_get_psram_start();
+        intptr_t heap_end = common_hal_espidf_get_psram_end();
+        size_t spiram_size = heap_end - heap_start;
+        if (spiram_size > 0) {
+            heap = (uint32_t *)heap_start;
+            heap_size = (heap_end - heap_start) / sizeof(uint32_t);
+        } else {
+            ESP_LOGE(TAG, "CONFIG_SPIRAM enabled but no spiram heap available");
+        }
     }
     #endif
 
@@ -514,6 +507,16 @@ void port_idle_until_interrupt(void) {
     }
 }
 
+void port_post_boot_py(bool heap_valid) {
+    if (!heap_valid && filesystem_present()) {
+        mp_int_t reserved;
+        if (dotenv_get_key_int("/.env", "CIRCUITPY_RESERVED_PSRAM", &reserved)) {
+            common_hal_espidf_set_reserved_psram(reserved);
+        }
+        common_hal_espidf_reserve_psram();
+    }
+}
+
 // Wrap main in app_main that the IDF expects.
 extern void main(void);
 extern void app_main(void);
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 950cf91e2e..acdf08e6a4 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -564,6 +564,10 @@ void supervisor_run_background_tasks_if_tick(void);
 #error "CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR must be at least 1"
 #endif
 
+#ifndef CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS
+#define CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS (0)
+#endif
+
 #ifndef USB_MIDI_EP_NUM_OUT
 #define USB_MIDI_EP_NUM_OUT (0)
 #endif
diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index bd1973366d..f251c9ae79 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include 
 #include 
 
 #include "shared-bindings/dotenv/__init__.h"
@@ -223,3 +224,26 @@ mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key) {
     }
     return mp_obj_new_str(value, actual_len);
 }
+
+bool dotenv_get_key_terminated(const char *path, const char *key, char *value, mp_int_t value_len) {
+    mp_int_t actual_len = dotenv_get_key(path, key, value, value_len - 1);
+    if (actual_len >= value_len) {
+        return false;
+    }
+    value[actual_len] = '\0'; // terminate string
+    return true;
+}
+
+bool dotenv_get_key_int(const char *path, const char *key, mp_int_t *value) {
+    char buf[16];
+    if (!dotenv_get_key_terminated(path, key, buf, (mp_int_t)sizeof(buf))) {
+        return false;
+    }
+    char *end;
+    long result = strtol(buf, &end, 0);
+    if (end == buf || *end) { // If the whole buffer was not consumed it's an error
+        return false;
+    }
+    *value = (mp_int_t)result;
+    return true;
+}
diff --git a/shared-module/dotenv/__init__.h b/shared-module/dotenv/__init__.h
index 6cfb209324..fb27233692 100644
--- a/shared-module/dotenv/__init__.h
+++ b/shared-module/dotenv/__init__.h
@@ -26,3 +26,11 @@
 
 // Allocation free version that returns the full length of the value.
 mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len);
+
+// Returns true and sets value to a '\0'-terminated string if key is present
+// and the value (including the terminating '\0') fits strictly within
+// value_len bytes.
+bool dotenv_get_key_terminated(const char *path, const char *key, char *value, mp_int_t value_len);
+
+// Returns true and sets value to the read value.  Returns false if the value was not numeric.
+bool dotenv_get_key_int(const char *path, const char *key, mp_int_t *value);
diff --git a/supervisor/port.h b/supervisor/port.h
index d693d49440..0d6862fae8 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -109,4 +109,10 @@ void port_wake_main_task(void);
 // default weak implementation is provided that does nothing.
 void port_wake_main_task_from_isr(void);
 
+// Some ports need special handling just after completing boot.py execution.
+// This function is called once while boot.py's VM is still valid, and
+// then a second time after the VM is finalized.
+// A default weak implementation is provided that does nothing.
+void port_post_boot_py(bool heap_valid);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_PORT_H
diff --git a/supervisor/shared/memory.c b/supervisor/shared/memory.c
index ff0382fc17..06c568b42e 100644
--- a/supervisor/shared/memory.c
+++ b/supervisor/shared/memory.c
@@ -56,6 +56,8 @@ enum {
         #if CIRCUITPY_USB_VENDOR
         + 1  // usb_vendor_add_descriptor
         #endif
+
+        + CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS
     ,
 
     CIRCUITPY_SUPERVISOR_MOVABLE_ALLOC_COUNT =
diff --git a/supervisor/stub/misc.c b/supervisor/stub/misc.c
new file mode 100644
index 0000000000..a17188beff
--- /dev/null
+++ b/supervisor/stub/misc.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "stdbool.h"
+
+#include "supervisor/port.h"
+#include "py/mpconfig.h"
+
+
+MP_WEAK void port_post_boot_py(bool heap_valid) {
+}
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 912b5c5f37..8b9f07e362 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -11,14 +11,15 @@ SRC_SUPERVISOR = \
 	supervisor/shared/port.c \
 	supervisor/shared/reload.c \
 	supervisor/shared/safe_mode.c \
-  supervisor/shared/serial.c \
+	supervisor/shared/serial.c \
 	supervisor/shared/stack.c \
 	supervisor/shared/status_leds.c \
 	supervisor/shared/tick.c \
 	supervisor/shared/title_bar.c \
 	supervisor/shared/traceback.c \
 	supervisor/shared/translate/translate.c \
-  supervisor/shared/workflow.c
+	supervisor/shared/workflow.c \
+	supervisor/stub/misc.c \
 
 NO_USB ?= $(wildcard supervisor/usb.c)
 

From 9e2f6dfc13c1f368cf07fb17ec9066f8ce84ea37 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 3 Aug 2022 17:56:43 -0400
Subject: [PATCH 0731/2403] Turn off edit links when not editable

---
 supervisor/shared/web_workflow/static/directory.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 657a8169d4..34aa1e7f70 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -261,9 +261,11 @@ async function refresh_list() {
         delete_button.disabled = !editable;
         delete_button.onclick = del;
 
-        edit_url = new URL(edit_url, url_base);
-        let edit_link = clone.querySelector(".edit_link");
-        edit_link.href = edit_url
+        if (editable) {
+            edit_url = new URL(edit_url, url_base);
+            let edit_link = clone.querySelector(".edit_link");
+            edit_link.href = edit_url
+        }
 
         new_children.push(clone);
     }

From 202fac59f8da7af930234c5d29e21d617ed061df Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 4 Aug 2022 13:44:52 -0400
Subject: [PATCH 0732/2403] ESP32 fixes for no PSRAM; some cleanup

---
 .../adafruit_feather_esp32_v2/sdkconfig       | 46 +++++++++++--------
 .../adafruit_feather_huzzah32/sdkconfig       | 36 +++++++--------
 .../boards/adafruit_qtpy_esp32_pico/sdkconfig | 11 +----
 .../boards/hardkernel_odroid_go/sdkconfig     | 37 ++++-----------
 ports/espressif/supervisor/port.c             |  6 ++-
 5 files changed, 62 insertions(+), 74 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index 4250aa45e3..c09d8c409a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -6,22 +6,32 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
-# end of SPI RAM config
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
 
-# Uncomment to send log output to TX/RX pins on Feather ESP32V2
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-# # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# # CONFIG_ESP_CONSOLE_NONE is not set
-# CONFIG_ESP_CONSOLE_UART=y
-# nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-# # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-# CONFIG_ESP_CONSOLE_UART_NUM=0
-# CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
-# CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
-# CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-# # end of ESP System Settings
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### # CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig b/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig
index 9c1fcd9382..6c0168c829 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig
@@ -1,22 +1,20 @@
-### TEST
 CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
-
 CONFIG_ESP32_SPIRAM_SUPPORT=n
 
-# Uncomment to send log output to TX/RX pins
-#
-# ESP System Settings
-#
-CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-# end of ESP System Settings
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
index f2e8085d3e..bec9e436b7 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig
@@ -1,10 +1,3 @@
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-# end of Partition Table
-
 #
 # SPI RAM config
 #
@@ -33,7 +26,7 @@ CONFIG_ESP32_SPIRAM_SUPPORT=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 
-### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
+### # Uncomment (remove ###) to send ESP_LOG output to TX/RX pins
 ### #
 ### # ESP System Settings
 ### #
@@ -45,7 +38,7 @@ CONFIG_ESP32_SPIRAM_SUPPORT=y
 ### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
 ### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
 ### CONFIG_ESP_CONSOLE_UART_NUM=0
-### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=32
 ### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
 ### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 ### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
diff --git a/ports/espressif/boards/hardkernel_odroid_go/sdkconfig b/ports/espressif/boards/hardkernel_odroid_go/sdkconfig
index f220cff390..f4fea0c732 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/sdkconfig
+++ b/ports/espressif/boards/hardkernel_odroid_go/sdkconfig
@@ -1,13 +1,4 @@
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
-# end of Partition Table
-
-CONFIG_ESP_INT_WDT_TIMEOUT_MS=3000
-
-#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
 # SPI RAM config
 #
 # CONFIG_SPIRAM_TYPE_AUTO is not set
@@ -27,28 +18,20 @@ CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 
-#
-# SPI RAM config
-#
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-
-### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
 ### #
 ### # ESP System Settings
 ### #
-CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 ### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
 ### # CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### CONFIG_ESP_CONSOLE_UART=y
+### nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
 ### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=12
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=15
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=12
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=15
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 ### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
 ### # end of ESP System Settings
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 9f58e8625b..84ff736c47 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -160,6 +160,7 @@ void sleep_timer_cb(void *arg);
 #define PSRAM_HSPI_SPIWP_SD3_IO    2
 #define PSRAM_HSPI_SPIHD_SD2_IO    4
 
+#ifdef CONFIG_SPIRAM
 // PSRAM clock and cs IO should be configured based on hardware design.
 // For ESP32-WROVER or ESP32-WROVER-B module, the clock IO is IO17, the cs IO is IO16,
 // they are the default value for these two configs.
@@ -180,9 +181,11 @@ void sleep_timer_cb(void *arg);
 
 #define PICO_V3_02_PSRAM_CLK_IO    10
 #define PICO_V3_02_PSRAM_CS_IO     9
+#endif // CONFIG_SPIRAM
 
 static void _never_reset_spi_ram_flash(void) {
     #if defined(CONFIG_IDF_TARGET_ESP32)
+    #if defined(CONFIG_SPIRAM)
     uint32_t pkg_ver = esp_efuse_get_pkg_ver();
     if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5) {
         never_reset_pin_number(D2WD_PSRAM_CLK_IO);
@@ -202,6 +205,7 @@ static void _never_reset_spi_ram_flash(void) {
         never_reset_pin_number(D0WDR2_V3_PSRAM_CLK_IO);
         never_reset_pin_number(D0WDR2_V3_PSRAM_CS_IO);
     }
+    #endif // CONFIG_SPIRAM
 
     const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info();
     if (spiconfig == ESP_ROM_EFUSE_FLASH_DEFAULT_SPI) {
@@ -226,7 +230,7 @@ static void _never_reset_spi_ram_flash(void) {
         never_reset_pin_number(EFUSE_SPICONFIG_RET_SPIHD(spiconfig));
         never_reset_pin_number(bootloader_flash_get_wp_pin());
     }
-    #endif
+    #endif // CONFIG_IDF_TARGET_ESP32
 }
 
 safe_mode_t port_init(void) {

From 5ac3aeaac72ad0624d78900a5a70a45035ab7880 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:47 -0500
Subject: [PATCH 0733/2403] Remove unused header

---
 shared-bindings/floppyio/__init__.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c
index 3ef58b2f66..a6b041c4a0 100644
--- a/shared-bindings/floppyio/__init__.c
+++ b/shared-bindings/floppyio/__init__.c
@@ -31,7 +31,6 @@
 #include 
 
 #include "py/binary.h"
-#include "py/enum.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 

From 8e08cc38f852111d8b9870a84de1c548ad753cb4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:48 -0500
Subject: [PATCH 0734/2403] Add default I2C bus to Kaluga

---
 ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h | 3 +++
 ports/espressif/boards/espressif_kaluga_1.3/pins.c          | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
index 8f89bfcbc4..459a5b3289 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
@@ -30,3 +30,6 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO7)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/pins.c b/ports/espressif/boards/espressif_kaluga_1.3/pins.c
index dff98ceeb9..caa7ecd064 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/pins.c
+++ b/ports/espressif/boards/espressif_kaluga_1.3/pins.c
@@ -140,5 +140,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_LRCK_DAC1), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_BCLK_DAC2), MP_ROM_PTR(&pin_GPIO18) },
 
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 07afb3eab81463e588c05bf2183568728d0887e8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:49 -0500
Subject: [PATCH 0735/2403] Fix typo

---
 shared-bindings/countio/Edge.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/countio/Edge.h b/shared-bindings/countio/Edge.h
index ca4cddbef3..86112fb4a3 100644
--- a/shared-bindings/countio/Edge.h
+++ b/shared-bindings/countio/Edge.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 an Halbertfor Adafruit Industries
+ * 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

From 5db6db01287079b0314a5356cd9b5c40886e4d23 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:50 -0500
Subject: [PATCH 0736/2403] add esp32-camera

This uses the esp32-camera code instead of our own homebrewed camera code.
In theory it supports esp32, esp32-s2 and esp32-s3, as long as they have
PSRAM.

This is very basic and doesn't support changing any camera parameters,
including switching resolution or pixelformat.

This is tested on the Kaluga (ESP32-S2) and ESP32-S3-Eye boards.

First, reserve some PSRAM by putting this line in `CIRCUITPY/_env`:
```
CIRCUITPY_RESERVED_PSRAM=524288
```
and hard-reset the board for it to take effect.

Now, the following script will take a very low-resolution jpeg file and print
it in the REPL in escape coded form:

```python
import board
import esp32_camera

c = esp32_camera.Camera(
    data_pins=board.CAMERA_DATA,
    external_clock_pin=board.CAMERA_XCLK,
    pixel_clock_pin=board.CAMERA_PCLK,
    vsync_pin=board.CAMERA_VSYNC,
    href_pin=board.CAMERA_HREF,
    pixel_format=esp32_camera.PixelFormat.JPEG,
    i2c=board.I2C(),
    external_clock_frequency=20_000_000)

m = c.take()
if m is not None:
    print(bytes(m))
```

Then on desktop open a python repl and run something like
```python
>>> with open("my.jpg", "wb") as f: f.write()
```
and open my.jpg in a viewer.
---
 .gitmodules                                   |   3 +
 ports/espressif/CMakeLists.txt                |   7 +
 ports/espressif/Makefile                      |  28 +-
 .../espressif/bindings/esp32_camera/Camera.c  | 232 +++++++++++++++++
 .../espressif/bindings/esp32_camera/Camera.h  |  59 +++++
 .../bindings/esp32_camera/__init__.c          | 243 ++++++++++++++++++
 .../bindings/esp32_camera/__init__.h          |  43 ++++
 .../boards/espressif_esp32s3_eye/board.c      |  48 ++++
 .../espressif_esp32s3_eye/mpconfigboard.h     |  39 +++
 .../espressif_esp32s3_eye/mpconfigboard.mk    |  17 ++
 .../boards/espressif_esp32s3_eye/pins.c       |  55 ++++
 .../boards/espressif_esp32s3_eye/sdkconfig    |  34 +++
 .../common-hal/esp32_camera/Camera.c          | 144 +++++++++++
 .../common-hal/esp32_camera/Camera.h          |  38 +++
 .../esp-idf-config/sdkconfig-esp32s3.defaults |  28 ++
 ports/espressif/esp32-camera                  |   1 +
 ports/espressif/mpconfigport.mk               |  10 +-
 ports/espressif/supervisor/port.c             |   1 +
 py/circuitpy_mpconfig.mk                      |   3 +
 19 files changed, 1026 insertions(+), 7 deletions(-)
 create mode 100644 ports/espressif/bindings/esp32_camera/Camera.c
 create mode 100644 ports/espressif/bindings/esp32_camera/Camera.h
 create mode 100644 ports/espressif/bindings/esp32_camera/__init__.c
 create mode 100644 ports/espressif/bindings/esp32_camera/__init__.h
 create mode 100644 ports/espressif/boards/espressif_esp32s3_eye/board.c
 create mode 100644 ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
 create mode 100644 ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/espressif_esp32s3_eye/pins.c
 create mode 100644 ports/espressif/boards/espressif_esp32s3_eye/sdkconfig
 create mode 100644 ports/espressif/common-hal/esp32_camera/Camera.c
 create mode 100644 ports/espressif/common-hal/esp32_camera/Camera.h
 create mode 160000 ports/espressif/esp32-camera

diff --git a/.gitmodules b/.gitmodules
index 0177e5a2ea..e0d0a262ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -307,3 +307,6 @@
 [submodule "frozen/circuitpython_picoed"]
 	path = frozen/circuitpython_picoed
 	url = https://github.com/elecfreaks/circuitpython_picoed.git
+[submodule "ports/espressif/esp32-camera"]
+	path = ports/espressif/esp32-camera
+	url = https://github.com/adafruit/esp32-camera/
diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
index 1c79b448fe..d05af27539 100644
--- a/ports/espressif/CMakeLists.txt
+++ b/ports/espressif/CMakeLists.txt
@@ -8,6 +8,13 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 # can build.
 set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip wpa_supplicant freertos bt usb)
 
+if("${CIRCUITPY_ESP32_CAMERA}")
+message("Including esp32-camera")
+set(EXTRA_COMPONENT_DIRS "esp32-camera")
+list(APPEND COMPONENTS "esp32-camera")
+message("COMPONENTS = ${COMPONENTS}")
+endif()
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(circuitpython)
 
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index e111fa3441..e8baf35935 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -261,7 +261,6 @@ SRC_C += \
 	peripherals/touch.c
 ifeq ($(IDF_TARGET),esp32s2)
 SRC_C += \
-	cam.c \
 	i2s_lcd_esp32s2_driver.c
 endif
 endif
@@ -283,6 +282,22 @@ endif
 
 SRC_C += $(wildcard common-hal/espidf/*.c)
 
+ifneq ($(CIRCUITPY_ESP32_CAMERA),0)
+SRC_CAMERA := \
+	$(wildcard common-hal/esp32_camera/*.c) \
+	$(wildcard bindings/esp32_camera/*.c)
+SRC_C += $(SRC_CAMERA)
+$(info SRC_CAMERA = $(SRC_CAMERA))
+CFLAGS += -isystem esp32-camera/driver/include
+CFLAGS += -isystem esp32-camera/conversions/include
+endif
+
+ifneq ($(CIRCUITPY_IMAGECAPTURE),0)
+$(error IMAGECAPTURE)
+SRC_C += cam.c
+endif
+
+
 SRC_COMMON_HAL_EXPANDED = \
 	$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
 	$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
@@ -341,8 +356,10 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 	SDKCONFIGS := esp-idf-config/sdkconfig-ble.defaults;$(SDKCONFIGS)
 endif
 # create the config headers
-$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf
-	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja
+.PHONY: do-sdkconfig
+do-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
+$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig CMakeLists.txt | $(BUILD)/esp-idf
+	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)
 
 # build a lib
 # Adding -d explain -j 1 -v to the ninja line will output debug info
@@ -391,6 +408,11 @@ BINARY_BLOBS += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 endif
 
+ifneq ($(CIRCUITPY_ESP32_CAMERA),0)
+ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp32-camera/libesp32-camera.a
+#$(error $(ESP_IDF_COMPONENTS_EXPANDED))
+endif
+
 # BOOTLOADER_OFFSET is determined by chip type, based on the ROM bootloader, and is not changeable.
 ifeq ($(IDF_TARGET),esp32)
 BOOTLOADER_OFFSET = 0x1000
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
new file mode 100644
index 0000000000..2dc61f73ca
--- /dev/null
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -0,0 +1,232 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "py/mphal.h"
+#include "py/obj.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+
+#include "bindings/esp32_camera/__init__.h"
+#include "bindings/esp32_camera/Camera.h"
+#include "common-hal/esp32_camera/Camera.h"
+
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+#include "esp_camera.h"
+#include "sensor.h"
+
+//| class Camera:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         data_pins: List[microcontroller.Pin],
+//|         pixel_clock: microcontroller.Pin,
+//|         vsync: microcontroller.Pin,
+//|         href: microcontroller.Pin,
+//|         i2c: busio.I2C,
+//|         external_clock_pin: microcontroller.Pin,
+//|         external_clock_frequency: int,
+//|         powerdown_pin: Optional[microcontroller.Pin] = None,
+//|         reset_pin: Optional[microcontroller.Pin] = None,
+//|         pixel_format: PixelFormat=PixelFormat.RGB565,
+//|         frame_size: FrameSize=FrameSize.QQVGA,
+//|         jpeg_quality: int=15,
+//|         double_buffered: bool = True,
+//|         grab_mode: GrabMode = GrabMode.WhenEmpty,
+//|     ):
+//|     """
+//|     Configure and initialize a camera with the given properties
+//|
+//|     This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
+//|
+//|     :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
+//|     :param pixel_clock: The pixel clock output from the camera module
+//|     :param vsync: The vertical sync pulse output from the camera module
+//|     :param href: The horizontal reference output from the camera module
+//|     :param i2c: The I2C bus connected to the camera module
+//|     :param external_clock_frequency: The frequency generated on the external clock pin
+//|     :param external_clock_pin: The pin on which to generate the external clock
+//|     :param powerdown_pin: The powerdown input to the camera module
+//|     :param reset_pin: The reset input to the camera module
+//|     :param pixel_format: The pixel format of the captured image
+//|     :param frame_size: The size of captured image
+//|     :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
+//|     :param framebuffer_count: The number of framebuffers
+//|     :param grab_mode: When to grab a new frame
+//|     """
+//|
+STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_pixel_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_vsync_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_href_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_i2c, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_external_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY },
+        { MP_QSTR_external_clock_frequency, MP_ARG_INT | MP_ARG_REQUIRED },
+        { MP_QSTR_powerdown_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_reset_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_pixel_format, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&pixel_format_RGB565_obj) } },
+        { MP_QSTR_frame_size, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&frame_size_QQVGA_obj) } },
+        { MP_QSTR_jpeg_quality, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 15 } },
+        { MP_QSTR_framebuffer_count, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 1 } },
+        { MP_QSTR_grab_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&grab_mode_WHEN_EMPTY_obj) } },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS);
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    uint8_t data_pins[8];
+    uint8_t data_pin_count;
+    validate_pins(MP_QSTR_data_pins, data_pins, MP_ARRAY_SIZE(data_pins), args[ARG_data_pins].u_obj, &data_pin_count);
+    mp_arg_validate_length(data_pin_count, 8, MP_QSTR_data_pins);
+
+    const mcu_pin_obj_t *pixel_clock_pin = validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj);
+    const mcu_pin_obj_t *vsync_pin = validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj);
+    const mcu_pin_obj_t *href_pin = validate_obj_is_free_pin(args[ARG_href_pin].u_obj);
+    const busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
+    const mcu_pin_obj_t *external_clock_pin = validate_obj_is_free_pin(args[ARG_external_clock_pin].u_obj);
+    const mcu_pin_obj_t *powerdown_pin = validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj);
+    const mcu_pin_obj_t *reset_pin = validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj);
+    const mp_int_t external_clock_frequency = mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_clock_frequency);
+
+    camera_grab_mode_t grab_mode = validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode);
+    framesize_t frame_size = validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size);
+    pixformat_t pixel_format = validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format);
+    mp_int_t jpeg_quality = mp_arg_validate_int_range(args[ARG_jpeg_quality].u_int, 2, 55, MP_QSTR_jpeg_quality);
+    mp_int_t framebuffer_count = mp_arg_validate_int_range(args[ARG_framebuffer_count].u_int, 1, 2, MP_QSTR_framebuffer_count);
+
+    esp32_camera_camera_obj_t *self = m_new_obj(esp32_camera_camera_obj_t);
+    self->base.type = &esp32_camera_camera_type;
+    common_hal_esp32_camera_camera_construct(
+        self,
+        data_pins,
+        external_clock_pin,
+        pixel_clock_pin,
+        vsync_pin,
+        href_pin,
+        powerdown_pin,
+        reset_pin,
+        i2c,
+        external_clock_frequency,
+        pixel_format,
+        frame_size,
+        jpeg_quality,
+        framebuffer_count,
+        grab_mode);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Deinitialises the camera and releases all memory resources for reuse."""
+//|         ...
+//|
+STATIC mp_obj_t esp32_camera_camera_deinit(mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_esp32_camera_camera_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_deinit_obj, esp32_camera_camera_deinit);
+
+STATIC void check_for_deinit(esp32_camera_camera_obj_t *self) {
+    if (common_hal_esp32_camera_camera_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     def __enter__(self) -> Camera:
+//|         """No-op used by Context Managers."""
+//|         ...
+//|
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
+STATIC mp_obj_t esp32_camera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_esp32_camera_camera_deinit(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera___exit___obj, 4, 4, esp32_camera_camera_obj___exit__);
+
+//|     frame_available: bool
+//|     """True if a frame is available, False otherwise"""
+
+STATIC mp_obj_t esp32_camera_camera_frame_available_get(const mp_obj_t self_in) {
+    return mp_obj_new_bool(false);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, esp32_camera_camera_frame_available_get);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
+    (mp_obj_t)&esp32_camera_camera_frame_available_get_obj);
+
+//|     def take(timeout: Optional[float]=0.25) -> Optional[ReadableBuffer]:
+//|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured."""
+//|
+STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]);
+    check_for_deinit(self);
+    camera_fb_t *result = common_hal_esp32_camera_camera_take(self, (int)MICROPY_FLOAT_C_FUN(round)(timeout * 1000));
+    if (!result) {
+        return mp_const_none;
+    }
+    return mp_obj_new_memoryview('b', result->len, result->buf);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
+
+//|     pixel_format: PixelFormat
+//|     """The pixel format of the camera"""
+//|
+//|     frame_size: FrameSize
+//|     """The size of the captured image"""
+//|
+//|     contrast: int
+//|     """The contrast of the sensor"""
+
+STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_available), MP_ROM_PTR(&esp32_camera_camera_frame_available_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_camera_camera_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&esp32_camera_camera___exit___obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_camera_locals_dict, esp32_camera_camera_locals_table);
+
+const mp_obj_type_t esp32_camera_camera_type = {
+    .base = { &mp_type_type },
+    .name = MP_QSTR_Camera,
+    .make_new = esp32_camera_camera_make_new,
+    .locals_dict = (mp_obj_t)&esp32_camera_camera_locals_dict,
+};
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/esp32_camera/Camera.h
new file mode 100644
index 0000000000..1163b14f61
--- /dev/null
+++ b/ports/espressif/bindings/esp32_camera/Camera.h
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/enum.h"
+#include "py/obj.h"
+
+#include "esp_camera.h"
+
+#include "shared-bindings/busio/I2C.h"
+
+extern const mp_obj_type_t esp32_camera_camera_type;
+typedef struct esp32_camera_camera_obj esp32_camera_camera_obj_t;
+
+extern void common_hal_esp32_camera_camera_construct(
+    esp32_camera_camera_obj_t *self,
+    uint8_t data_pins[8],
+    const mcu_pin_obj_t *external_clock_pin,
+    const mcu_pin_obj_t *pixel_clock_pin,
+    const mcu_pin_obj_t *vsync_pin,
+    const mcu_pin_obj_t *href_pin,
+    const mcu_pin_obj_t *powerdown_pin,
+    const mcu_pin_obj_t *reset_pin,
+    const busio_i2c_obj_t *i2c,
+    mp_int_t external_clock_frequency,
+    pixformat_t pixel_format,
+    framesize_t frame_size,
+    mp_int_t jpeg_quality,
+    mp_int_t framebuffer_count,
+    camera_grab_mode_t grab_mode);
+
+extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *self);
+extern bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self);
+extern bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self);
+extern camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
new file mode 100644
index 0000000000..d56084e977
--- /dev/null
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -0,0 +1,243 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "bindings/espidf/__init__.h"
+#include "bindings/esp32_camera/__init__.h"
+#include "bindings/esp32_camera/Camera.h"
+
+#include "esp_camera.h"
+#include "sensor.h"
+
+int oooo;
+
+//| """Wrapper for the esp32_camera library
+//|
+//| This library enables access to any camera sensor supported by the library,
+//| including OV5640 and OV2640.
+//| """
+
+//| class GrabMode:
+//|     """Controls when a new frame is grabbed."""
+//|
+//|     WHEN_EMPTY: GrabMode
+//|     """Fills buffers when they are empty. Less resources but first ``fb_count`` frames might be old"""
+//|
+//|     LATEST: GrabMode
+//|     """Except when 1 frame buffer is used, queue will always contain the last `fb_count` frames"""
+//|
+
+MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);
+MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, LATEST, CAMERA_GRAB_LATEST);
+
+MAKE_ENUM_MAP(esp32_camera_grab_mode) {
+    MAKE_ENUM_MAP_ENTRY(grab_mode, WHEN_EMPTY),
+    MAKE_ENUM_MAP_ENTRY(grab_mode, LATEST),
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_grab_mode_locals_dict, esp32_camera_grab_mode_locals_table);
+MAKE_PRINTER(esp32_camera, esp32_camera_grab_mode);
+MAKE_ENUM_TYPE(esp32_camera, GrabMode, esp32_camera_grab_mode);
+
+camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
+    return cp_enum_value(&esp32_camera_grab_mode_type, mp_arg_validate_type(obj, &esp32_camera_grab_mode_type, arg_name));
+}
+
+//| class PixelFormat:
+//|     """Format of data in the captured frames"""
+//|
+//|     RGB565: PixelFormat
+//|     """A 16-bit format with 5 bits of Red and Blue and 6 bits of Green"""
+//|
+//|     GRAYSCALE: PixelFormat
+//|     """An 8-bit format with 8-bits of luminance"""
+//|
+//|     JPEG: PixelFormat
+//|     """A compressed format"""
+//|
+
+MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, RGB565, PIXFORMAT_RGB565);
+MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, GRAYSCALE, PIXFORMAT_GRAYSCALE);
+MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, JPEG, PIXFORMAT_JPEG);
+
+MAKE_ENUM_MAP(esp32_camera_pixel_format) {
+    MAKE_ENUM_MAP_ENTRY(pixel_format, RGB565),
+    MAKE_ENUM_MAP_ENTRY(pixel_format, GRAYSCALE),
+    MAKE_ENUM_MAP_ENTRY(pixel_format, JPEG),
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_pixel_format_locals_dict, esp32_camera_pixel_format_locals_table);
+MAKE_PRINTER(esp32_camera, esp32_camera_pixel_format);
+MAKE_ENUM_TYPE(esp32_camera, PixelFormat, esp32_camera_pixel_format);
+
+pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
+    return cp_enum_value(&esp32_camera_pixel_format_type, mp_arg_validate_type(obj, &esp32_camera_pixel_format_type, arg_name));
+}
+
+//| class FrameSize:
+//|     """The pixel size of the captured frames"""
+//|
+//|     R96X96: FrameSize
+//|     """96x96"""
+//|
+//|     QQVGA: FrameSize
+//|     """160x120"""
+//|
+//|     QCIF: FrameSize
+//|     """176x144"""
+//|
+//|     HQVGA: FrameSize
+//|     """240x176"""
+//|
+//|     R240X240: FrameSize
+//|     """240x240"""
+//|
+//|     QVGA: FrameSize
+//|     """320x240 """
+//|
+//|     CIF: FrameSize
+//|     """400x296"""
+//|
+//|     HVGA: FrameSize
+//|     """480x320"""
+//|
+//|     VGA: FrameSize
+//|     """640x480"""
+//|
+//|     SVGA: FrameSize
+//|     """800x600"""
+//|
+//|     XGA: FrameSize
+//|     """1024x768"""
+//|
+//|     HD: FrameSize
+//|     """1280x720"""
+//|
+//|     SXGA: FrameSize
+//|     """1280x1024"""
+//|
+//|     UXGA: FrameSize
+//|     """1600x1200"""
+//|
+//|     FHD: FrameSize
+//|     """1920x1080"""
+//|
+//|     P_HD: FrameSize
+//|     """ 720x1280"""
+//|
+//|     P_3MP: FrameSize
+//|     """ 864x1536"""
+//|
+//|     QXGA: FrameSize
+//|     """2048x1536"""
+//|
+//|     QHD: FrameSize
+//|     """2560x1440"""
+//|
+//|     WQXGA: FrameSize
+//|     """2560x1600"""
+//|
+//|     P_FHD: FrameSize
+//|     """1080x1920"""
+//|
+//|     QSXGA: FrameSize
+//|     """2560x1920"""
+//|
+
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R96X96, FRAMESIZE_96X96);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R240X240, FRAMESIZE_240X240);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QQVGA, FRAMESIZE_QQVGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QCIF, FRAMESIZE_QCIF);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HQVGA, FRAMESIZE_HQVGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QVGA, FRAMESIZE_QVGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, CIF, FRAMESIZE_CIF);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HVGA, FRAMESIZE_HVGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, VGA, FRAMESIZE_VGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, SVGA, FRAMESIZE_SVGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, XGA, FRAMESIZE_XGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HD, FRAMESIZE_HD);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, SXGA, FRAMESIZE_SXGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, UXGA, FRAMESIZE_UXGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, FHD, FRAMESIZE_FHD);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_HD, FRAMESIZE_P_HD);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_3MP, FRAMESIZE_P_3MP);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QXGA, FRAMESIZE_QXGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QHD, FRAMESIZE_QHD);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, WQXGA, FRAMESIZE_WQXGA);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_FHD, FRAMESIZE_P_FHD);
+MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QSXGA, FRAMESIZE_QSXGA);
+MAKE_ENUM_MAP(esp32_camera_frame_size) {
+    MAKE_ENUM_MAP_ENTRY(frame_size, R96X96),
+    MAKE_ENUM_MAP_ENTRY(frame_size, R240X240),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QQVGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QCIF),
+    MAKE_ENUM_MAP_ENTRY(frame_size, HQVGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QVGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, CIF),
+    MAKE_ENUM_MAP_ENTRY(frame_size, HVGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, VGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, SVGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, XGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, HD),
+    MAKE_ENUM_MAP_ENTRY(frame_size, SXGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, UXGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, FHD),
+    MAKE_ENUM_MAP_ENTRY(frame_size, P_HD),
+    MAKE_ENUM_MAP_ENTRY(frame_size, P_3MP),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QXGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QHD),
+    MAKE_ENUM_MAP_ENTRY(frame_size, WQXGA),
+    MAKE_ENUM_MAP_ENTRY(frame_size, P_FHD),
+    MAKE_ENUM_MAP_ENTRY(frame_size, QSXGA),
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_frame_size_locals_dict, esp32_camera_frame_size_locals_table);
+MAKE_PRINTER(esp32_camera, esp32_camera_frame_size);
+MAKE_ENUM_TYPE(esp32_camera, FrameSize, esp32_camera_frame_size);
+
+framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
+    return cp_enum_value(&esp32_camera_frame_size_type, mp_arg_validate_type(obj, &esp32_camera_frame_size_type, arg_name));
+}
+
+STATIC const mp_rom_map_elem_t esp32_camera_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32_camera) },
+    { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&esp32_camera_camera_type), },
+    { MP_ROM_QSTR(MP_QSTR_FrameSize), &esp32_camera_frame_size_type },
+    { MP_ROM_QSTR(MP_QSTR_GrabMode), &esp32_camera_grab_mode_type },
+    { MP_ROM_QSTR(MP_QSTR_PixelFormat), &esp32_camera_pixel_format_type },
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_module_globals, esp32_camera_module_globals_table);
+
+const mp_obj_module_t esp32_camera_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&esp32_camera_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_esp32_camera, esp32_camera_module, CIRCUITPY_ESP32_CAMERA);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.h b/ports/espressif/bindings/esp32_camera/__init__.h
new file mode 100644
index 0000000000..ff1f6c6f6d
--- /dev/null
+++ b/ports/espressif/bindings/esp32_camera/__init__.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/enum.h"
+#include "py/obj.h"
+
+#include "esp_camera.h"
+
+extern const mp_obj_type_t esp32_camera_grab_mode_type;
+extern const cp_enum_obj_t grab_mode_WHEN_EMPTY_obj;
+extern const mp_obj_type_t esp32_camera_pixel_format_type;
+extern const cp_enum_obj_t pixel_format_RGB565_obj;
+extern const mp_obj_type_t esp32_camera_frame_size_type;
+extern const cp_enum_obj_t frame_size_QQVGA_obj;
+
+extern camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name);
+extern pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name);
+extern framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name);
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
new file mode 100644
index 0000000000..ff9418ec86
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
new file mode 100644
index 0000000000..093bcb0e68
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "ESP32-S3-EYE"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+// Shared by the camera and accelerometer
+#define DEFAULT_I2C_BUS_SDA         (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SCL         (&pin_GPIO5)
+
+// This is the SD card connection, not the LCD
+#define DEFAULT_SPI_BUS_SCK         (&pin_GPIO39)
+#define DEFAULT_SPI_BUS_MISO        (&pin_GPIO40)
+#define DEFAULT_SPI_BUS_MOSI        (&pin_GPIO38)
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
new file mode 100644
index 0000000000..3dc5a14c88
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x303A
+USB_PID = 0x7003
+USB_PRODUCT = "ESP32-S3-EYE"
+USB_MANUFACTURER = "Espressif"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/pins.c b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
new file mode 100644
index 0000000000..7ebda4309d
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
@@ -0,0 +1,55 @@
+#include "py/objtuple.h"
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
+    {&mp_type_tuple},
+    8,
+    {
+        MP_ROM_PTR(&pin_GPIO11),
+        MP_ROM_PTR(&pin_GPIO9),
+        MP_ROM_PTR(&pin_GPIO8),
+        MP_ROM_PTR(&pin_GPIO10),
+        MP_ROM_PTR(&pin_GPIO12),
+        MP_ROM_PTR(&pin_GPIO18),
+        MP_ROM_PTR(&pin_GPIO17),
+        MP_ROM_PTR(&pin_GPIO16),
+    }
+};
+
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTONS), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_MIC_SDO), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_GPIO21) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_MIC_SCK), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_MIC_WS), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO43) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO44) }, // LCD
+    // { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, // LCD -- unused?
+    // { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, // LCD -- unused?
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO47) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO48) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) }, // LCD
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+
+    // TODO
+    // { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/sdkconfig b/ports/espressif/boards/espressif_esp32s3_eye/sdkconfig
new file mode 100644
index 0000000000..1a24832767
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s3_eye/sdkconfig
@@ -0,0 +1,34 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_OCT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3-eye"
+# end of LWIP
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
new file mode 100644
index 0000000000..83eabe8c2a
--- /dev/null
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -0,0 +1,144 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "bindings/esp32_camera/Camera.h"
+#include "bindings/espidf/__init__.h"
+#include "common-hal/esp32_camera/Camera.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "common-hal/microcontroller/Pin.h"
+
+static void maybe_claim_pin(const mcu_pin_obj_t *pin) {
+    if (pin) {
+        claim_pin(pin);
+    }
+}
+
+void common_hal_esp32_camera_camera_construct(
+    esp32_camera_camera_obj_t *self,
+    uint8_t data_pins[8],
+    const mcu_pin_obj_t *external_clock_pin,
+    const mcu_pin_obj_t *pixel_clock_pin,
+    const mcu_pin_obj_t *vsync_pin,
+    const mcu_pin_obj_t *href_pin,
+    const mcu_pin_obj_t *powerdown_pin,
+    const mcu_pin_obj_t *reset_pin,
+    const busio_i2c_obj_t *i2c,
+    mp_int_t external_clock_frequency,
+    pixformat_t pixel_format,
+    framesize_t frame_size,
+    mp_int_t jpeg_quality,
+    mp_int_t framebuffer_count,
+    camera_grab_mode_t grab_mode) {
+
+    for (int i = 0; i < 8; i++) {
+        claim_pin_number(data_pins[i]);
+    }
+    claim_pin(external_clock_pin);
+    claim_pin(pixel_clock_pin);
+    claim_pin(vsync_pin);
+    claim_pin(href_pin);
+    maybe_claim_pin(powerdown_pin);
+    maybe_claim_pin(reset_pin);
+
+    common_hal_pwmio_pwmout_construct(&self->pwm, external_clock_pin, 1, external_clock_frequency, true);
+
+    self->camera_config.pin_pwdn = common_hal_mcu_pin_number(powerdown_pin);
+    self->camera_config.pin_reset = common_hal_mcu_pin_number(reset_pin);
+    self->camera_config.pin_xclk = common_hal_mcu_pin_number(external_clock_pin);
+
+    self->camera_config.pin_sccb_sda = NO_PIN;
+    self->camera_config.pin_sccb_scl = NO_PIN;
+    /* sccb i2c port set below */
+
+    self->camera_config.pin_d7 = data_pins[7];
+    self->camera_config.pin_d6 = data_pins[6];
+    self->camera_config.pin_d5 = data_pins[5];
+    self->camera_config.pin_d4 = data_pins[4];
+    self->camera_config.pin_d3 = data_pins[3];
+    self->camera_config.pin_d2 = data_pins[2];
+    self->camera_config.pin_d1 = data_pins[1];
+    self->camera_config.pin_d0 = data_pins[0];
+
+    self->camera_config.pin_vsync = common_hal_mcu_pin_number(vsync_pin);
+    self->camera_config.pin_href = common_hal_mcu_pin_number(href_pin);
+    self->camera_config.pin_pclk = common_hal_mcu_pin_number(pixel_clock_pin);
+
+    self->camera_config.xclk_freq_hz = external_clock_frequency;
+
+    self->camera_config.ledc_timer = self->pwm.tim_handle.timer_num;
+    self->camera_config.ledc_channel = self->pwm.chan_handle.channel;
+
+    self->camera_config.pixel_format = pixel_format;
+    self->camera_config.frame_size = frame_size;
+    self->camera_config.jpeg_quality = jpeg_quality;
+    self->camera_config.fb_count = framebuffer_count;
+    self->camera_config.grab_mode = grab_mode;
+
+    self->camera_config.sccb_i2c_port = i2c->i2c_num;
+
+    CHECK_ESP_RESULT(esp_camera_init(&self->camera_config));
+}
+
+extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *self) {
+    if (common_hal_esp32_camera_camera_deinited(self)) {
+        return;
+    }
+
+    common_hal_pwmio_pwmout_deinit(&self->pwm);
+
+    reset_pin_number(self->camera_config.pin_pwdn);
+    reset_pin_number(self->camera_config.pin_reset);
+    reset_pin_number(self->camera_config.pin_xclk);
+
+    reset_pin_number(self->camera_config.pin_d7);
+    reset_pin_number(self->camera_config.pin_d6);
+    reset_pin_number(self->camera_config.pin_d5);
+    reset_pin_number(self->camera_config.pin_d4);
+    reset_pin_number(self->camera_config.pin_d3);
+    reset_pin_number(self->camera_config.pin_d2);
+    reset_pin_number(self->camera_config.pin_d1);
+    reset_pin_number(self->camera_config.pin_d0);
+
+    esp_camera_deinit();
+
+    self->camera_config.xclk_freq_hz = 0;
+}
+
+bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self) {
+    return !self->camera_config.xclk_freq_hz;
+}
+
+bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self) {
+    return esp_camera_fb_available();
+}
+
+camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms) {
+    if (self->buffer_to_return) {
+        esp_camera_fb_return(self->buffer_to_return);
+        self->buffer_to_return = NULL;
+    }
+    return esp_camera_fb_get_timeout(timeout_ms);
+}
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.h b/ports/espressif/common-hal/esp32_camera/Camera.h
new file mode 100644
index 0000000000..9c21f81b16
--- /dev/null
+++ b/ports/espressif/common-hal/esp32_camera/Camera.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+#include "esp_camera.h"
+#include "shared-bindings/pwmio/PWMOut.h"
+
+typedef struct esp32_camera_camera_obj {
+    mp_obj_base_t base;
+    camera_config_t camera_config;
+    camera_fb_t *buffer_to_return;
+    pwmio_pwmout_obj_t pwm;
+} esp32_camera_obj_t;
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
index bfb867d923..ce0d9f8d62 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
@@ -191,3 +191,31 @@ CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # end of Deprecated options for backward compatibility
+
+#
+# Camera configuration
+#
+CONFIG_OV7670_SUPPORT=y
+# CONFIG_OV7725_SUPPORT is not set
+# CONFIG_NT99141_SUPPORT is not set
+CONFIG_OV2640_SUPPORT=y
+CONFIG_OV3660_SUPPORT=y
+CONFIG_OV5640_SUPPORT=y
+# CONFIG_GC2145_SUPPORT is not set
+# CONFIG_GC032A_SUPPORT is not set
+# CONFIG_GC0308_SUPPORT is not set
+# CONFIG_BF3005_SUPPORT is not set
+# CONFIG_BF20A6_SUPPORT is not set
+# CONFIG_SC101IOT_SUPPORT is not set
+# CONFIG_SC030IOT_SUPPORT is not set
+# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
+CONFIG_SCCB_HARDWARE_I2C_PORT1=y
+CONFIG_SCCB_CLK_FREQ=100000
+CONFIG_CAMERA_CORE0=y
+# CONFIG_CAMERA_CORE1 is not set
+# CONFIG_CAMERA_NO_AFFINITY is not set
+CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
+# CONFIG_CAMERA_CONVERTER_ENABLED is not set
+# end of Camera configuration
+# end of Component config
+
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
new file mode 160000
index 0000000000..28804391c0
--- /dev/null
+++ b/ports/espressif/esp32-camera
@@ -0,0 +1 @@
+Subproject commit 28804391c002f6a3ea5ce6a55aee3b191be3ecde
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f390cbb21a..f782f10e27 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -20,7 +20,7 @@ CIRCUITPY_DUALBANK ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
 CIRCUITPY_HASHLIB ?= 1
-CIRCUITPY_IMAGECAPTURE ?= 1
+CIRCUITPY_IMAGECAPTURE ?= 0
 CIRCUITPY_I2CPERIPHERAL ?= 1
 CIRCUITPY_RGBMATRIX ?= 1
 CIRCUITPY_ROTARYIO ?= 1
@@ -35,12 +35,12 @@ CIRCUITPY_ESPIDF ?= 1
 ifeq ($(IDF_TARGET),esp32)
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 # Protomatter needs to support ESP32.
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_USB = 0
 CIRCUITPY_BUILD_EXTENSIONS ?= bin
+CIRCUITPY_ESP32_CAMERA ?= 1
 
 else ifeq ($(IDF_TARGET),esp32c3)
 CIRCUITPY_AESIO = 0
@@ -51,7 +51,6 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DUALBANK = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_ROTARYIO = 0
@@ -63,15 +62,16 @@ CIRCUITPY_BUILD_EXTENSIONS ?= bin
 else ifeq ($(IDF_TARGET),esp32s3)
 CIRCUITPY_BLEIO = 1
 CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
+CIRCUITPY_ESP32_CAMERA ?= 1
 
 else ifeq ($(IDF_TARGET),esp32s2)
 # No BLE on S2
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
+CIRCUITPY_ESP32_CAMERA ?= 1
 endif
 
 # From ESP32-S2/S3 Technical Reference Manual:
@@ -85,3 +85,5 @@ endif
 # only if something else is turned off, such as HID.
 USB_NUM_ENDPOINT_PAIRS = 7
 USB_NUM_IN_ENDPOINTS = 5
+
+CIRCUITPY_ESP32_CAMERA ?= 0
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index ceedce367d..c6766fdf8a 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -334,6 +334,7 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    // TODO deinit for esp32-camera
     #if CIRCUITPY_IMAGECAPTURE
     cam_deinit();
     #endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 4d7d026aa5..157fa35b59 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -214,6 +214,9 @@ CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
+CIRCUITPY_ESP32_CAMERA ?= 0
+CFLAGS += -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)
+
 CIRCUITPY__EVE ?= 0
 CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
 

From 8d673bdbf5e50d2614238a8815df658fdb0e54c9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:51 -0500
Subject: [PATCH 0737/2403] reserve 1MB of PSRAM for camera framebuffer on
 esp32s3-eye

.. this setting can be overridden with a bigger or smaller value in
CIRCUITPY/.env but 1/8 of PSRAM seems like a good initial value. It's
enough to store a single 800x600 or 640x480 RGB565 frame, or multiple
smaller frames such as 320x240.
---
 ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
index 093bcb0e68..7bf1fa8993 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
@@ -37,3 +37,5 @@
 #define DEFAULT_SPI_BUS_SCK         (&pin_GPIO39)
 #define DEFAULT_SPI_BUS_MISO        (&pin_GPIO40)
 #define DEFAULT_SPI_BUS_MOSI        (&pin_GPIO38)
+
+#define DEFAULT_RESERVED_PSRAM      (1048576)

From b903a020fd5b6c39caf84ddddbda1adf33c0dd8f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:52 -0500
Subject: [PATCH 0738/2403] Enable display on esp32-s3-eye

---
 .../boards/espressif_esp32s3_eye/board.c      | 98 ++++++++++++++++++-
 .../espressif_esp32s3_eye/mpconfigboard.h     |  6 ++
 2 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index ff9418ec86..7829a4be94 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -26,14 +26,104 @@
 
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+#define DELAY 0x80
+
+// display init sequence according to LilyGO example app
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 150,
+    // sleep out
+    0x11, 0 | DELAY, 255,
+    // normal display mode on
+    0x13, 0,
+    // display and color format settings
+    0x36, 1, 0x08,
+    0xB6, 2, 0x0A, 0x82,
+    0x3A, 1 | DELAY,  0x55, 10,
+    // ST7789V frame rate setting
+    0xB2, 5, 0x0C, 0x0C, 0x00, 0x33, 0x33,
+    // voltages: VGH / VGL
+    0xB7, 1, 0x35,
+    // ST7789V power setting
+    0xBB, 1, 0x28,
+    0xC0, 1, 0x0C,
+    0xC2, 2, 0x01, 0xFF,
+    0xC3, 1, 0x10,
+    0xC4, 1, 0x20,
+    0xC6, 1, 0x0F,
+    0xD0, 2, 0xA4, 0xA1,
+    // ST7789V gamma setting
+    0xE0, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x32, 0x44, 0x42, 0x06, 0x0E, 0x12, 0x14, 0x17,
+    0xE1, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x31, 0x54, 0x47, 0x0E, 0x1C, 0x17, 0x1B, 0x1E,
+    0x21, 0,
+    // display on
+    0x29, 0 | DELAY, 255,
+};
 
 void board_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(1);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO43,    // DC
+        &pin_GPIO44,    // CS
+        NULL,           // no reset pin
+        40000000,       // baudrate
+        0,              // polarity
+        0               // phase
+        );
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+
+    // workaround as board_init() is called before reset_port() in main.c
+    pwmout_reset();
+
+    common_hal_displayio_display_construct(
+        display,
+        bus,
+        240,            // width (after rotation)
+        240,            // height (after rotation)
+        0,              // column start
+        0,              // row start
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO48,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness (ignored)
+        false,          // auto_brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        false,          // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+    common_hal_never_reset_pin(&pin_GPIO48); // backlight pin
     // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
-    #endif
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
index 7bf1fa8993..d32704c8bf 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
@@ -38,4 +38,10 @@
 #define DEFAULT_SPI_BUS_MISO        (&pin_GPIO40)
 #define DEFAULT_SPI_BUS_MOSI        (&pin_GPIO38)
 
+#define CIRCUITPY_BOARD_SPI         (2)
+#define CIRCUITPY_BOARD_SPI_PIN     { \
+        {.clock = &pin_GPIO39, .mosi = &pin_GPIO40, .miso = &pin_GPIO38}, \
+        {.clock = &pin_GPIO21, .mosi = &pin_GPIO47, .miso = NULL}, \
+}
+
 #define DEFAULT_RESERVED_PSRAM      (1048576)

From 1d1e139379b1e017c2608880248f6aeb2f023d4c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:53 -0500
Subject: [PATCH 0739/2403] fix taking multiple pictures

---
 ports/espressif/common-hal/esp32_camera/Camera.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 83eabe8c2a..0b836f034d 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -140,5 +140,5 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
         esp_camera_fb_return(self->buffer_to_return);
         self->buffer_to_return = NULL;
     }
-    return esp_camera_fb_get_timeout(timeout_ms);
+    return self->buffer_to_return = esp_camera_fb_get_timeout(timeout_ms);
 }

From f54c7adddcd829f76752d1ef514e7bb4acab779a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:54 -0500
Subject: [PATCH 0740/2403] Must treat NO_PIN cast to uint8_t the same as
 NO_PIN

Otherwise, deinitializing a camera with e.g., the powerdown
pin unspecified results in an assertion failure in a debug build.
---
 ports/espressif/common-hal/microcontroller/Pin.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 4ac98c7927..8a09c98d74 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -100,7 +100,9 @@ static const uint64_t pin_mask_reset_forbidden =
 
 
 void never_reset_pin_number(gpio_num_t pin_number) {
-    if (pin_number == NO_PIN) {
+    // Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
+    // Also allow pin 255 to be treated as NO_PIN to avoid crashes
+    if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
     never_reset_pins |= PIN_BIT(pin_number);
@@ -141,7 +143,9 @@ STATIC void _reset_pin(gpio_num_t pin_number) {
 
 // Mark pin as free and return it to a quiescent state.
 void reset_pin_number(gpio_num_t pin_number) {
-    if (pin_number == NO_PIN) {
+    // Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
+    // Also allow pin 255 to be treated as NO_PIN to avoid crashes
+    if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
     never_reset_pins &= ~PIN_BIT(pin_number);
@@ -174,7 +178,9 @@ void reset_all_pins(void) {
 }
 
 void claim_pin_number(gpio_num_t pin_number) {
-    if (pin_number == NO_PIN) {
+    // Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
+    // Also allow pin 255 to be treated as NO_PIN to avoid crashes
+    if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
     in_use |= PIN_BIT(pin_number);

From d1b89fca91890916ee89826509e7ecc9fe6a2855 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:55 -0500
Subject: [PATCH 0741/2403] Reset camera when interpreter is reset

---
 ports/espressif/Makefile          | 6 ------
 ports/espressif/supervisor/port.c | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index e8baf35935..1f01513d32 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -292,12 +292,6 @@ CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
-ifneq ($(CIRCUITPY_IMAGECAPTURE),0)
-$(error IMAGECAPTURE)
-SRC_C += cam.c
-endif
-
-
 SRC_COMMON_HAL_EXPANDED = \
 	$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
 	$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index c6766fdf8a..3727d8af44 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -76,8 +76,8 @@
 #include "shared-bindings/_bleio/__init__.h"
 #endif
 
-#if CIRCUITPY_IMAGECAPTURE
-#include "cam.h"
+#if CIRCUITPY_ESP32_CAMERA
+#include "esp_camera.h"
 #endif
 
 #ifndef CONFIG_IDF_TARGET_ESP32
@@ -335,8 +335,8 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     // TODO deinit for esp32-camera
-    #if CIRCUITPY_IMAGECAPTURE
-    cam_deinit();
+    #if CIRCUITPY_ESP32_CAMERA
+    esp_camera_deinit();
     #endif
 
     reset_all_pins();

From 69949ecb4350ceba86b6c865a4dc2d202ae7aada Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:56 -0500
Subject: [PATCH 0742/2403] update PID for this board

---
 ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
index 3dc5a14c88..bf9464353f 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x303A
-USB_PID = 0x7003
+USB_PID = 0x700F
 USB_PRODUCT = "ESP32-S3-EYE"
 USB_MANUFACTURER = "Espressif"
 

From 258f72640afcd1033a3752a50a9d2f327511041e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:57 -0500
Subject: [PATCH 0743/2403] Implement a pile of getters & setters

---
 locale/circuitpython.pot                      |   6 +-
 .../espressif/bindings/esp32_camera/Camera.c  | 632 +++++++++++++++++-
 .../espressif/bindings/esp32_camera/Camera.h  |  41 ++
 .../bindings/esp32_camera/__init__.c          |  43 +-
 .../bindings/esp32_camera/__init__.h          |   2 +
 .../common-hal/esp32_camera/Camera.c          |  57 ++
 6 files changed, 769 insertions(+), 12 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 332331e14f..da40283128 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3236,6 +3236,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3491,7 +3495,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 2dc61f73ca..d33a5948a4 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -205,21 +205,635 @@ STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
 
-//|     pixel_format: PixelFormat
-//|     """The pixel format of the camera"""
-//|
-//|     frame_size: FrameSize
-//|     """The size of the captured image"""
-//|
+
+//|     pixel_format: pixformat_t
+//|     """The pixel format of captured frames"""
+
+STATIC mp_obj_t esp32_camera_camera_get_pixel_format(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&esp32_camera_pixel_format_type, common_hal_esp32_camera_camera_get_pixel_format(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_pixel_format_obj, esp32_camera_camera_get_pixel_format);
+
+STATIC mp_obj_t esp32_camera_camera_set_pixel_format(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_pixel_format(self, validate_pixel_format(arg, MP_QSTR_pixel_format));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_pixel_format_obj, esp32_camera_camera_set_pixel_format);
+MP_PROPERTY_GETSET(esp32_camera_camera_pixel_format_obj,
+    (mp_obj_t)&esp32_camera_camera_get_pixel_format_obj,
+    (mp_obj_t)&esp32_camera_camera_set_pixel_format_obj);
+
+
+//|     frame_size: framesize_t
+//|     """The size of captured frames"""
+
+STATIC mp_obj_t esp32_camera_camera_get_frame_size(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&esp32_camera_frame_size_type, common_hal_esp32_camera_camera_get_frame_size(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_frame_size_obj, esp32_camera_camera_get_frame_size);
+
+STATIC mp_obj_t esp32_camera_camera_set_frame_size(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_frame_size(self, validate_frame_size(arg, MP_QSTR_frame_size));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_frame_size_obj, esp32_camera_camera_set_frame_size);
+MP_PROPERTY_GETSET(esp32_camera_camera_frame_size_obj,
+    (mp_obj_t)&esp32_camera_camera_get_frame_size_obj,
+    (mp_obj_t)&esp32_camera_camera_set_frame_size_obj);
+
 //|     contrast: int
-//|     """The contrast of the sensor"""
+//|     """Access the contrast property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_contrast(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_contrast(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_contrast_obj, esp32_camera_camera_get_contrast);
+
+STATIC mp_obj_t esp32_camera_camera_set_contrast(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_contrast(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_contrast_obj, esp32_camera_camera_set_contrast);
+MP_PROPERTY_GETSET(esp32_camera_camera_contrast_obj,
+    (mp_obj_t)&esp32_camera_camera_get_contrast_obj,
+    (mp_obj_t)&esp32_camera_camera_set_contrast_obj);
+
+//|     brightness: int
+//|     """Access the brightness property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_brightness(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_brightness(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_brightness_obj, esp32_camera_camera_get_brightness);
+
+STATIC mp_obj_t esp32_camera_camera_set_brightness(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_brightness(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_brightness_obj, esp32_camera_camera_set_brightness);
+MP_PROPERTY_GETSET(esp32_camera_camera_brightness_obj,
+    (mp_obj_t)&esp32_camera_camera_get_brightness_obj,
+    (mp_obj_t)&esp32_camera_camera_set_brightness_obj);
+
+//|     saturation: int
+//|     """Access the saturation property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_saturation(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_saturation(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_saturation_obj, esp32_camera_camera_get_saturation);
+
+STATIC mp_obj_t esp32_camera_camera_set_saturation(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_saturation(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_saturation_obj, esp32_camera_camera_set_saturation);
+MP_PROPERTY_GETSET(esp32_camera_camera_saturation_obj,
+    (mp_obj_t)&esp32_camera_camera_get_saturation_obj,
+    (mp_obj_t)&esp32_camera_camera_set_saturation_obj);
+
+//|     sharpness: int
+//|     """Access the sharpness property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_sharpness(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_sharpness(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_sharpness_obj, esp32_camera_camera_get_sharpness);
+
+STATIC mp_obj_t esp32_camera_camera_set_sharpness(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_sharpness(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_sharpness_obj, esp32_camera_camera_set_sharpness);
+MP_PROPERTY_GETSET(esp32_camera_camera_sharpness_obj,
+    (mp_obj_t)&esp32_camera_camera_get_sharpness_obj,
+    (mp_obj_t)&esp32_camera_camera_set_sharpness_obj);
+
+//|     denoise: int
+//|     """Access the denoise property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_denoise(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_denoise(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_denoise_obj, esp32_camera_camera_get_denoise);
+
+STATIC mp_obj_t esp32_camera_camera_set_denoise(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_denoise(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_denoise_obj, esp32_camera_camera_set_denoise);
+MP_PROPERTY_GETSET(esp32_camera_camera_denoise_obj,
+    (mp_obj_t)&esp32_camera_camera_get_denoise_obj,
+    (mp_obj_t)&esp32_camera_camera_set_denoise_obj);
+
+//|     gain_ceiling: GainCeiling
+//|     """Access the gain ceiling property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_gain_ceiling(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&esp32_camera_gain_ceiling_type, common_hal_esp32_camera_camera_get_gainceiling(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_gain_ceiling_obj, esp32_camera_camera_get_gain_ceiling);
+
+STATIC mp_obj_t esp32_camera_camera_set_gain_ceiling(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_gainceiling(self, validate_gain_ceiling(arg, MP_QSTR_gain_ceiling));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_gain_ceiling_obj, esp32_camera_camera_set_gain_ceiling);
+MP_PROPERTY_GETSET(esp32_camera_camera_gain_ceiling_obj,
+    (mp_obj_t)&esp32_camera_camera_get_gain_ceiling_obj,
+    (mp_obj_t)&esp32_camera_camera_set_gain_ceiling_obj);
+
+//|     quality: int
+//|     """Access the quality property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_quality(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_quality(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_quality_obj, esp32_camera_camera_get_quality);
+
+STATIC mp_obj_t esp32_camera_camera_set_quality(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_quality(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_quality_obj, esp32_camera_camera_set_quality);
+MP_PROPERTY_GETSET(esp32_camera_camera_quality_obj,
+    (mp_obj_t)&esp32_camera_camera_get_quality_obj,
+    (mp_obj_t)&esp32_camera_camera_set_quality_obj);
+
+//|     colorbar: bool
+//|     """Access the colorbar property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_colorbar(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_colorbar(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_colorbar_obj, esp32_camera_camera_get_colorbar);
+
+STATIC mp_obj_t esp32_camera_camera_set_colorbar(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_colorbar(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_colorbar_obj, esp32_camera_camera_set_colorbar);
+MP_PROPERTY_GETSET(esp32_camera_camera_colorbar_obj,
+    (mp_obj_t)&esp32_camera_camera_get_colorbar_obj,
+    (mp_obj_t)&esp32_camera_camera_set_colorbar_obj);
+
+//|     whitebal: bool
+//|     """Access the whitebal property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_whitebal(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_whitebal(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_whitebal_obj, esp32_camera_camera_get_whitebal);
+
+STATIC mp_obj_t esp32_camera_camera_set_whitebal(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_whitebal(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_whitebal_obj, esp32_camera_camera_set_whitebal);
+MP_PROPERTY_GETSET(esp32_camera_camera_whitebal_obj,
+    (mp_obj_t)&esp32_camera_camera_get_whitebal_obj,
+    (mp_obj_t)&esp32_camera_camera_set_whitebal_obj);
+
+//|     gain_ctrl: bool
+//|     """Access the gain_ctrl property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_gain_ctrl(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_gain_ctrl(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_gain_ctrl_obj, esp32_camera_camera_get_gain_ctrl);
+
+STATIC mp_obj_t esp32_camera_camera_set_gain_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_gain_ctrl(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_gain_ctrl_obj, esp32_camera_camera_set_gain_ctrl);
+MP_PROPERTY_GETSET(esp32_camera_camera_gain_ctrl_obj,
+    (mp_obj_t)&esp32_camera_camera_get_gain_ctrl_obj,
+    (mp_obj_t)&esp32_camera_camera_set_gain_ctrl_obj);
+
+//|     exposure_ctrl: bool
+//|     """Access the exposure_ctrl property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_exposure_ctrl(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_exposure_ctrl(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_exposure_ctrl_obj, esp32_camera_camera_get_exposure_ctrl);
+
+STATIC mp_obj_t esp32_camera_camera_set_exposure_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_exposure_ctrl(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_exposure_ctrl_obj, esp32_camera_camera_set_exposure_ctrl);
+MP_PROPERTY_GETSET(esp32_camera_camera_exposure_ctrl_obj,
+    (mp_obj_t)&esp32_camera_camera_get_exposure_ctrl_obj,
+    (mp_obj_t)&esp32_camera_camera_set_exposure_ctrl_obj);
+
+//|     hmirror: bool
+//|     """Access the hmirror property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_hmirror(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_hmirror(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_hmirror_obj, esp32_camera_camera_get_hmirror);
+
+STATIC mp_obj_t esp32_camera_camera_set_hmirror(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_hmirror(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_hmirror_obj, esp32_camera_camera_set_hmirror);
+MP_PROPERTY_GETSET(esp32_camera_camera_hmirror_obj,
+    (mp_obj_t)&esp32_camera_camera_get_hmirror_obj,
+    (mp_obj_t)&esp32_camera_camera_set_hmirror_obj);
+
+//|     vflip: bool
+//|     """Access the vflip property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_vflip(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_vflip(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_vflip_obj, esp32_camera_camera_get_vflip);
+
+STATIC mp_obj_t esp32_camera_camera_set_vflip(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_vflip(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_vflip_obj, esp32_camera_camera_set_vflip);
+MP_PROPERTY_GETSET(esp32_camera_camera_vflip_obj,
+    (mp_obj_t)&esp32_camera_camera_get_vflip_obj,
+    (mp_obj_t)&esp32_camera_camera_set_vflip_obj);
+
+//|     aec2: bool
+//|     """Access the aec2 property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_aec2(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_aec2(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_aec2_obj, esp32_camera_camera_get_aec2);
+
+STATIC mp_obj_t esp32_camera_camera_set_aec2(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_aec2(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_aec2_obj, esp32_camera_camera_set_aec2);
+MP_PROPERTY_GETSET(esp32_camera_camera_aec2_obj,
+    (mp_obj_t)&esp32_camera_camera_get_aec2_obj,
+    (mp_obj_t)&esp32_camera_camera_set_aec2_obj);
+
+//|     awb_gain: bool
+//|     """Access the awb_gain property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_awb_gain(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_awb_gain(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_awb_gain_obj, esp32_camera_camera_get_awb_gain);
+
+STATIC mp_obj_t esp32_camera_camera_set_awb_gain(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_awb_gain(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_awb_gain_obj, esp32_camera_camera_set_awb_gain);
+MP_PROPERTY_GETSET(esp32_camera_camera_awb_gain_obj,
+    (mp_obj_t)&esp32_camera_camera_get_awb_gain_obj,
+    (mp_obj_t)&esp32_camera_camera_set_awb_gain_obj);
+
+//|     agc_gain: int
+//|     """Access the agc_gain property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_agc_gain(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_agc_gain(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_agc_gain_obj, esp32_camera_camera_get_agc_gain);
+
+STATIC mp_obj_t esp32_camera_camera_set_agc_gain(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_agc_gain(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_agc_gain_obj, esp32_camera_camera_set_agc_gain);
+MP_PROPERTY_GETSET(esp32_camera_camera_agc_gain_obj,
+    (mp_obj_t)&esp32_camera_camera_get_agc_gain_obj,
+    (mp_obj_t)&esp32_camera_camera_set_agc_gain_obj);
+
+//|     aec_value: int
+//|     """Access the aec_value property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_aec_value(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_aec_value(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_aec_value_obj, esp32_camera_camera_get_aec_value);
+
+STATIC mp_obj_t esp32_camera_camera_set_aec_value(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_aec_value(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_aec_value_obj, esp32_camera_camera_set_aec_value);
+MP_PROPERTY_GETSET(esp32_camera_camera_aec_value_obj,
+    (mp_obj_t)&esp32_camera_camera_get_aec_value_obj,
+    (mp_obj_t)&esp32_camera_camera_set_aec_value_obj);
+
+//|     special_effect: int
+//|     """Access the special_effect property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_special_effect(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_special_effect(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_special_effect_obj, esp32_camera_camera_get_special_effect);
+
+STATIC mp_obj_t esp32_camera_camera_set_special_effect(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_special_effect(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_special_effect_obj, esp32_camera_camera_set_special_effect);
+MP_PROPERTY_GETSET(esp32_camera_camera_special_effect_obj,
+    (mp_obj_t)&esp32_camera_camera_get_special_effect_obj,
+    (mp_obj_t)&esp32_camera_camera_set_special_effect_obj);
+
+//|     wb_mode: int
+//|     """Access the wb_mode property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_wb_mode(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_wb_mode(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_wb_mode_obj, esp32_camera_camera_get_wb_mode);
+
+STATIC mp_obj_t esp32_camera_camera_set_wb_mode(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_wb_mode(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_wb_mode_obj, esp32_camera_camera_set_wb_mode);
+MP_PROPERTY_GETSET(esp32_camera_camera_wb_mode_obj,
+    (mp_obj_t)&esp32_camera_camera_get_wb_mode_obj,
+    (mp_obj_t)&esp32_camera_camera_set_wb_mode_obj);
+
+//|     ae_level: int
+//|     """Access the ae_level property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_ae_level(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_ae_level(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_ae_level_obj, esp32_camera_camera_get_ae_level);
+
+STATIC mp_obj_t esp32_camera_camera_set_ae_level(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_ae_level(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_ae_level_obj, esp32_camera_camera_set_ae_level);
+MP_PROPERTY_GETSET(esp32_camera_camera_ae_level_obj,
+    (mp_obj_t)&esp32_camera_camera_get_ae_level_obj,
+    (mp_obj_t)&esp32_camera_camera_set_ae_level_obj);
+
+//|     dcw: bool
+//|     """Access the dcw property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_dcw(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_dcw(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_dcw_obj, esp32_camera_camera_get_dcw);
+
+STATIC mp_obj_t esp32_camera_camera_set_dcw(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_dcw(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_dcw_obj, esp32_camera_camera_set_dcw);
+MP_PROPERTY_GETSET(esp32_camera_camera_dcw_obj,
+    (mp_obj_t)&esp32_camera_camera_get_dcw_obj,
+    (mp_obj_t)&esp32_camera_camera_set_dcw_obj);
+
+//|     bpc: bool
+//|     """Access the bpc property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_bpc(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_bpc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_bpc_obj, esp32_camera_camera_get_bpc);
+
+STATIC mp_obj_t esp32_camera_camera_set_bpc(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_bpc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_bpc_obj, esp32_camera_camera_set_bpc);
+MP_PROPERTY_GETSET(esp32_camera_camera_bpc_obj,
+    (mp_obj_t)&esp32_camera_camera_get_bpc_obj,
+    (mp_obj_t)&esp32_camera_camera_set_bpc_obj);
+
+//|     wpc: bool
+//|     """Access the wpc property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_wpc(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_wpc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_wpc_obj, esp32_camera_camera_get_wpc);
+
+STATIC mp_obj_t esp32_camera_camera_set_wpc(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_wpc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_wpc_obj, esp32_camera_camera_set_wpc);
+MP_PROPERTY_GETSET(esp32_camera_camera_wpc_obj,
+    (mp_obj_t)&esp32_camera_camera_get_wpc_obj,
+    (mp_obj_t)&esp32_camera_camera_set_wpc_obj);
+
+//|     raw_gma: bool
+//|     """Access the raw_gma property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_raw_gma(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_raw_gma(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_raw_gma_obj, esp32_camera_camera_get_raw_gma);
+
+STATIC mp_obj_t esp32_camera_camera_set_raw_gma(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_raw_gma(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_raw_gma_obj, esp32_camera_camera_set_raw_gma);
+MP_PROPERTY_GETSET(esp32_camera_camera_raw_gma_obj,
+    (mp_obj_t)&esp32_camera_camera_get_raw_gma_obj,
+    (mp_obj_t)&esp32_camera_camera_set_raw_gma_obj);
+
+//|     lenc: bool
+//|     """Access the lenc property of the camera sensor"""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_get_lenc(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_lenc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_lenc_obj, esp32_camera_camera_get_lenc);
+
+STATIC mp_obj_t esp32_camera_camera_set_lenc(const mp_obj_t self_in, const mp_obj_t arg) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_esp32_camera_camera_set_lenc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_lenc_obj, esp32_camera_camera_set_lenc);
+MP_PROPERTY_GETSET(esp32_camera_camera_lenc_obj,
+    (mp_obj_t)&esp32_camera_camera_get_lenc_obj,
+    (mp_obj_t)&esp32_camera_camera_set_lenc_obj);
+
+
 
 STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
-    { MP_ROM_QSTR(MP_QSTR_frame_available), MP_ROM_PTR(&esp32_camera_camera_frame_available_obj) },
+    { MP_ROM_QSTR(MP_QSTR_aec2), MP_ROM_PTR(&esp32_camera_camera_aec2_obj) },
+    { MP_ROM_QSTR(MP_QSTR_aec_value), MP_ROM_PTR(&esp32_camera_camera_aec_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ae_level), MP_ROM_PTR(&esp32_camera_camera_ae_level_obj) },
+    { MP_ROM_QSTR(MP_QSTR_agc_gain), MP_ROM_PTR(&esp32_camera_camera_agc_gain_obj) },
+    { MP_ROM_QSTR(MP_QSTR_awb_gain), MP_ROM_PTR(&esp32_camera_camera_awb_gain_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bpc), MP_ROM_PTR(&esp32_camera_camera_bpc_obj) },
+    { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&esp32_camera_camera_brightness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_colorbar), MP_ROM_PTR(&esp32_camera_camera_colorbar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_contrast), MP_ROM_PTR(&esp32_camera_camera_contrast_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dcw), MP_ROM_PTR(&esp32_camera_camera_dcw_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_camera_camera_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_denoise), MP_ROM_PTR(&esp32_camera_camera_denoise_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&esp32_camera_camera___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_exposure_ctrl), MP_ROM_PTR(&esp32_camera_camera_exposure_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_available), MP_ROM_PTR(&esp32_camera_camera_frame_available_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_size), MP_ROM_PTR(&esp32_camera_camera_frame_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gain_ceiling), MP_ROM_PTR(&esp32_camera_camera_gain_ceiling_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gain_ctrl), MP_ROM_PTR(&esp32_camera_camera_gain_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hmirror), MP_ROM_PTR(&esp32_camera_camera_hmirror_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lenc), MP_ROM_PTR(&esp32_camera_camera_lenc_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pixel_format), MP_ROM_PTR(&esp32_camera_camera_pixel_format_obj) },
+    { MP_ROM_QSTR(MP_QSTR_quality), MP_ROM_PTR(&esp32_camera_camera_quality_obj) },
+    { MP_ROM_QSTR(MP_QSTR_raw_gma), MP_ROM_PTR(&esp32_camera_camera_raw_gma_obj) },
+    { MP_ROM_QSTR(MP_QSTR_saturation), MP_ROM_PTR(&esp32_camera_camera_saturation_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sharpness), MP_ROM_PTR(&esp32_camera_camera_sharpness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_special_effect), MP_ROM_PTR(&esp32_camera_camera_special_effect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
+    { MP_ROM_QSTR(MP_QSTR_vflip), MP_ROM_PTR(&esp32_camera_camera_vflip_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wb_mode), MP_ROM_PTR(&esp32_camera_camera_wb_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_whitebal), MP_ROM_PTR(&esp32_camera_camera_whitebal_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&esp32_camera_camera_wpc_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(esp32_camera_camera_locals_dict, esp32_camera_camera_locals_table);
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/esp32_camera/Camera.h
index 1163b14f61..bb79fdb39a 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.h
+++ b/ports/espressif/bindings/esp32_camera/Camera.h
@@ -57,3 +57,44 @@ extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *sel
 extern bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self);
 extern bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self);
 extern camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms);
+
+#define DECLARE_SENSOR_GETSET(type, name, field_name, setter_function_name) \
+    DECLARE_SENSOR_GET(type, name, field_name, setter_function_name) \
+    DECLARE_SENSOR_SET(type, name, setter_function_name)
+
+#define DECLARE_SENSOR_STATUS_GETSET(type, name, status_field_name, setter_function_name) \
+    DECLARE_SENSOR_GETSET(type, name, status.status_field_name, setter_function_name)
+
+#define DECLARE_SENSOR_GET(type, name, status_field_name, setter_function_name) \
+    extern type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self);
+
+#define DECLARE_SENSOR_SET(type, name, setter_function_name) \
+    extern void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value);
+
+DECLARE_SENSOR_GETSET(pixformat_t, pixel_format, pixformat, set_pixformat)
+DECLARE_SENSOR_STATUS_GETSET(framesize_t, frame_size, framesize, set_framesize)
+DECLARE_SENSOR_STATUS_GETSET(int, contrast, contrast, set_contrast);
+DECLARE_SENSOR_STATUS_GETSET(int, brightness, brightness, set_brightness);
+DECLARE_SENSOR_STATUS_GETSET(int, saturation, saturation, set_saturation);
+DECLARE_SENSOR_STATUS_GETSET(int, sharpness, sharpness, set_sharpness);
+DECLARE_SENSOR_STATUS_GETSET(int, denoise, denoise, set_denoise);
+DECLARE_SENSOR_STATUS_GETSET(gainceiling_t, gainceiling, gainceiling, set_gainceiling);
+DECLARE_SENSOR_STATUS_GETSET(int, quality, quality, set_quality);
+DECLARE_SENSOR_STATUS_GETSET(bool, colorbar, colorbar, set_colorbar);
+DECLARE_SENSOR_STATUS_GETSET(bool, whitebal, whitebal, set_whitebal);
+DECLARE_SENSOR_STATUS_GETSET(bool, gain_ctrl, gain_ctrl, set_gain_ctrl);
+DECLARE_SENSOR_STATUS_GETSET(bool, exposure_ctrl, exposure_ctrl, set_exposure_ctrl);
+DECLARE_SENSOR_STATUS_GETSET(bool, hmirror, hmirror, set_hmirror);
+DECLARE_SENSOR_STATUS_GETSET(bool, vflip, vflip, set_vflip);
+DECLARE_SENSOR_STATUS_GETSET(bool, aec2, aec2, set_aec2);
+DECLARE_SENSOR_STATUS_GETSET(bool, awb_gain, awb_gain, set_awb_gain);
+DECLARE_SENSOR_STATUS_GETSET(int, agc_gain, agc_gain, set_agc_gain);
+DECLARE_SENSOR_STATUS_GETSET(int, aec_value, aec_value, set_aec_value);
+DECLARE_SENSOR_STATUS_GETSET(int, special_effect, special_effect, set_special_effect);
+DECLARE_SENSOR_STATUS_GETSET(int, wb_mode, wb_mode, set_wb_mode);
+DECLARE_SENSOR_STATUS_GETSET(int, ae_level, ae_level, set_ae_level);
+DECLARE_SENSOR_STATUS_GETSET(bool, dcw, dcw, set_dcw);
+DECLARE_SENSOR_STATUS_GETSET(bool, bpc, bpc, set_bpc);
+DECLARE_SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
+DECLARE_SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
+DECLARE_SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index d56084e977..09582d440b 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -35,8 +35,6 @@
 #include "esp_camera.h"
 #include "sensor.h"
 
-int oooo;
-
 //| """Wrapper for the esp32_camera library
 //|
 //| This library enables access to any camera sensor supported by the library,
@@ -225,10 +223,51 @@ framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
     return cp_enum_value(&esp32_camera_frame_size_type, mp_arg_validate_type(obj, &esp32_camera_frame_size_type, arg_name));
 }
 
+//| class GainCeiling:
+//|     """The maximum amount of gain applied to raw sensor data.
+//|
+//|     Higher values are useful in darker conditions, but increase image noise."""
+//|
+//|     GAIN_2X: GainCeiling
+//|     GAIN_4X: GainCeiling
+//|     GAIN_8X: GainCeiling
+//|     GAIN_16X: GainCeiling
+//|     GAIN_32X: GainCeiling
+//|     GAIN_64X: GainCeiling
+//|     GAIN_128X: GainCeiling
+//|
+
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_2X, GAINCEILING_2X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_4X, GAINCEILING_4X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_8X, GAINCEILING_8X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_16X, GAINCEILING_16X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_32X, GAINCEILING_32X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_64X, GAINCEILING_64X);
+MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_128X, GAINCEILING_128X);
+
+MAKE_ENUM_MAP(esp32_camera_gain_ceiling) {
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_2X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_4X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_8X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_16X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_32X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_64X),
+    MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_128X)
+};
+
+STATIC MP_DEFINE_CONST_DICT(esp32_camera_gain_ceiling_locals_dict, esp32_camera_gain_ceiling_locals_table);
+MAKE_PRINTER(esp32_camera, esp32_camera_gain_ceiling);
+MAKE_ENUM_TYPE(esp32_camera, GainCeiling, esp32_camera_gain_ceiling);
+
+gainceiling_t validate_gain_ceiling(mp_obj_t obj, qstr arg_name) {
+    return cp_enum_value(&esp32_camera_gain_ceiling_type, mp_arg_validate_type(obj, &esp32_camera_gain_ceiling_type, arg_name));
+}
+
 STATIC const mp_rom_map_elem_t esp32_camera_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32_camera) },
     { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&esp32_camera_camera_type), },
     { MP_ROM_QSTR(MP_QSTR_FrameSize), &esp32_camera_frame_size_type },
+    { MP_ROM_QSTR(MP_QSTR_GainCeiling), &esp32_camera_gain_ceiling_type },
     { MP_ROM_QSTR(MP_QSTR_GrabMode), &esp32_camera_grab_mode_type },
     { MP_ROM_QSTR(MP_QSTR_PixelFormat), &esp32_camera_pixel_format_type },
 };
diff --git a/ports/espressif/bindings/esp32_camera/__init__.h b/ports/espressif/bindings/esp32_camera/__init__.h
index ff1f6c6f6d..a0e7290ff9 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.h
+++ b/ports/espressif/bindings/esp32_camera/__init__.h
@@ -37,7 +37,9 @@ extern const mp_obj_type_t esp32_camera_pixel_format_type;
 extern const cp_enum_obj_t pixel_format_RGB565_obj;
 extern const mp_obj_type_t esp32_camera_frame_size_type;
 extern const cp_enum_obj_t frame_size_QQVGA_obj;
+extern const mp_obj_type_t esp32_camera_gain_ceiling_type;
 
 extern camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name);
 extern pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name);
 extern framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name);
+extern gainceiling_t validate_gain_ceiling(mp_obj_t obj, qstr arg_name);
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 0b836f034d..b77b8ac59e 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+
 #include "bindings/esp32_camera/Camera.h"
 #include "bindings/espidf/__init__.h"
 #include "common-hal/esp32_camera/Camera.h"
@@ -142,3 +144,58 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
     }
     return self->buffer_to_return = esp_camera_fb_get_timeout(timeout_ms);
 }
+
+#define SENSOR_GETSET(type, name, field_name, setter_function_name) \
+    SENSOR_GET(type, name, field_name, setter_function_name) \
+    SENSOR_SET(type, name, setter_function_name)
+
+#define SENSOR_STATUS_GETSET(type, name, status_field_name, setter_function_name) \
+    SENSOR_GETSET(type, name, status.status_field_name, setter_function_name)
+
+#define SENSOR_GET(type, name, status_field_name, setter_function_name) \
+    type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self) { \
+        sensor_t *sensor = esp_camera_sensor_get(); \
+        if (!sensor->setter_function_name) { \
+            mp_raise_AttributeError(translate("no such attribute")); \
+        } \
+        return sensor->status_field_name; \
+    }
+
+#define SENSOR_SET(type, name, setter_function_name) \
+    void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value) { \
+        sensor_t *sensor = esp_camera_sensor_get(); \
+        if (!sensor->setter_function_name) { \
+            mp_raise_AttributeError(translate("no such attribute")); \
+        } \
+        if (sensor->setter_function_name(sensor, value) < 0) { \
+            mp_raise_ValueError(translate("invalid setting")); \
+        } \
+    }
+
+SENSOR_GETSET(pixformat_t, pixel_format, pixformat, set_pixformat);
+SENSOR_STATUS_GETSET(framesize_t, frame_size, framesize, set_framesize);
+SENSOR_STATUS_GETSET(int, contrast, contrast, set_contrast);
+SENSOR_STATUS_GETSET(int, brightness, brightness, set_brightness);
+SENSOR_STATUS_GETSET(int, saturation, saturation, set_saturation);
+SENSOR_STATUS_GETSET(int, sharpness, sharpness, set_sharpness);
+SENSOR_STATUS_GETSET(int, denoise, denoise, set_denoise);
+SENSOR_STATUS_GETSET(gainceiling_t, gainceiling, gainceiling, set_gainceiling);
+SENSOR_STATUS_GETSET(int, quality, quality, set_quality);
+SENSOR_STATUS_GETSET(bool, colorbar, colorbar, set_colorbar);
+SENSOR_STATUS_GETSET(bool, whitebal, awb, set_whitebal);
+SENSOR_STATUS_GETSET(bool, gain_ctrl, agc, set_gain_ctrl);
+SENSOR_STATUS_GETSET(bool, exposure_ctrl, aec, set_exposure_ctrl);
+SENSOR_STATUS_GETSET(bool, hmirror, hmirror, set_hmirror);
+SENSOR_STATUS_GETSET(bool, vflip, vflip, set_vflip);
+SENSOR_STATUS_GETSET(bool, aec2, aec2, set_aec2);
+SENSOR_STATUS_GETSET(bool, awb_gain, awb_gain, set_awb_gain);
+SENSOR_STATUS_GETSET(int, agc_gain, agc_gain, set_agc_gain);
+SENSOR_STATUS_GETSET(int, aec_value, aec_value, set_aec_value);
+SENSOR_STATUS_GETSET(int, special_effect, special_effect, set_special_effect);
+SENSOR_STATUS_GETSET(int, wb_mode, wb_mode, set_wb_mode);
+SENSOR_STATUS_GETSET(int, ae_level, ae_level, set_ae_level);
+SENSOR_STATUS_GETSET(bool, dcw, dcw, set_dcw);
+SENSOR_STATUS_GETSET(bool, bpc, bpc, set_bpc);
+SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
+SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
+SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);

From 64b1d003df853923c4b5b672acc55fd6f8283736 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:58 -0500
Subject: [PATCH 0744/2403] Allow a Bitmap to be constructed from a buffer (in
 C anyway)

.. so that Camera.take() can return one without copying
---
 shared-bindings/displayio/Bitmap.h |  2 ++
 shared-module/displayio/Bitmap.c   | 30 ++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.h b/shared-bindings/displayio/Bitmap.h
index 458047510a..074f7dfa5c 100644
--- a/shared-bindings/displayio/Bitmap.h
+++ b/shared-bindings/displayio/Bitmap.h
@@ -33,6 +33,8 @@ extern const mp_obj_type_t displayio_bitmap_type;
 
 void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t width,
     uint32_t height, uint32_t bits_per_value);
+void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self, uint32_t width,
+    uint32_t height, uint32_t bits_per_value, uint32_t *data, bool read_only);
 
 void common_hal_displayio_bitmap_load_row(displayio_bitmap_t *self, uint16_t y, uint8_t *data,
     uint16_t len);
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 933d3a8227..676aec2186 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -30,20 +30,29 @@
 
 #include "py/runtime.h"
 
-void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t width,
-    uint32_t height, uint32_t bits_per_value) {
+enum { align_bits = 8 * sizeof(uint32_t) };
+
+static int stride(uint32_t width, uint32_t bits_per_value) {
     uint32_t row_width = width * bits_per_value;
     // align to uint32_t
-    uint8_t align_bits = 8 * sizeof(uint32_t);
-    if (row_width % align_bits != 0) {
-        self->stride = (row_width / align_bits + 1);
-    } else {
-        self->stride = row_width / align_bits;
-    }
+    return (row_width + align_bits - 1) / align_bits;
+}
+
+void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t width,
+    uint32_t height, uint32_t bits_per_value) {
+    common_hal_displayio_bitmap_construct_from_buffer(self, width, height, bits_per_value, NULL, false);
+}
+
+void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self, uint32_t width,
+    uint32_t height, uint32_t bits_per_value, uint32_t *data, bool read_only) {
     self->width = width;
     self->height = height;
-    self->data = m_malloc(self->stride * height * sizeof(uint32_t), false);
-    self->read_only = false;
+    self->stride = stride(width, bits_per_value);
+    if (!data) {
+        data = m_malloc(self->stride * height * sizeof(uint32_t), false);
+    }
+    self->data = data;
+    self->read_only = read_only;
     self->bits_per_value = bits_per_value;
 
     if (bits_per_value > 8 && bits_per_value != 16 && bits_per_value != 32) {
@@ -70,6 +79,7 @@ void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t wi
     self->dirty_area.y2 = height;
 }
 
+
 uint16_t common_hal_displayio_bitmap_get_height(displayio_bitmap_t *self) {
     return self->height;
 }

From 54fe753602d10866620ddb472c338f5b9d166842 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:11:59 -0500
Subject: [PATCH 0745/2403] Enable gifio and qrio when appropriate

---
 ports/espressif/mpconfigport.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f782f10e27..b48efbae40 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -87,3 +87,5 @@ USB_NUM_ENDPOINT_PAIRS = 7
 USB_NUM_IN_ENDPOINTS = 5
 
 CIRCUITPY_ESP32_CAMERA ?= 0
+CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESP32_CAMERA)
+CIRCUITPY_QRIO ?= $(CIRCUITPY_ESP32_CAMERA)

From aead0dfe45589633521ea57918b4070584c1be82 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:00 -0500
Subject: [PATCH 0746/2403] Return a Bitmap from take() when appropriate

---
 .../espressif/bindings/esp32_camera/Camera.c  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index d33a5948a4..307f900680 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -35,6 +35,7 @@
 #include "bindings/esp32_camera/Camera.h"
 #include "common-hal/esp32_camera/Camera.h"
 
+#include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/util.h"
 #include "esp_camera.h"
@@ -190,8 +191,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, es
 MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
     (mp_obj_t)&esp32_camera_camera_frame_available_get_obj);
 
-//|     def take(timeout: Optional[float]=0.25) -> Optional[ReadableBuffer]:
-//|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured."""
+//|     def take(timeout: Optional[float]=0.25) -> Optional[displayio.Bitmap | ReadableBuffer]:
+//|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
+//|
+//|         In the case of timeout, `None` is returned.
+//|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a `ReadableBuffer`.
+//|         Otherwise, the returned value is a `displayio.Bitmap`.
+//|         """
 //|
 STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -201,7 +207,18 @@ STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
     if (!result) {
         return mp_const_none;
     }
-    return mp_obj_new_memoryview('b', result->len, result->buf);
+    pixformat_t format = common_hal_esp32_camera_camera_get_pixel_format(self);
+    if (format == PIXFORMAT_JPEG) {
+        return mp_obj_new_memoryview('b', result->len, result->buf);
+    } else {
+        int width = common_hal_esp32_camera_camera_get_width(self);
+        int height = common_hal_esp32_camera_camera_get_height(self);
+        displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
+        bitmap->base.type = &displayio_bitmap_type;
+        mp_printf(&mp_plat_print, "construct bitmap %dx%d @%p\n", width, height, result->buf);
+        common_hal_displayio_bitmap_construct_from_buffer(bitmap, width, height, (format == PIXFORMAT_RGB565) ? 16 : 8, (uint32_t *)(void *)result->buf, true);
+        return bitmap;
+    }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
 

From badcae5ace1d32bab334a12276d79900d1ac4460 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:01 -0500
Subject: [PATCH 0747/2403] Fix docstring errors

---
 ports/espressif/bindings/esp32_camera/Camera.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 307f900680..a9dcf37fd4 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -223,7 +223,7 @@ STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
 
 
-//|     pixel_format: pixformat_t
+//|     pixel_format: PixelFormat
 //|     """The pixel format of captured frames"""
 
 STATIC mp_obj_t esp32_camera_camera_get_pixel_format(const mp_obj_t self_in) {
@@ -245,7 +245,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_pixel_format_obj,
     (mp_obj_t)&esp32_camera_camera_set_pixel_format_obj);
 
 
-//|     frame_size: framesize_t
+//|     frame_size: FrameSize
 //|     """The size of captured frames"""
 
 STATIC mp_obj_t esp32_camera_camera_get_frame_size(const mp_obj_t self_in) {

From 8bdbe0355aef485f7c801b81340a8a80e6c63044 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:02 -0500
Subject: [PATCH 0748/2403] Add more getters

---
 .../espressif/bindings/esp32_camera/Camera.c  | 87 +++++++++++++++++++
 .../espressif/bindings/esp32_camera/Camera.h  |  8 ++
 .../common-hal/esp32_camera/Camera.c          | 36 ++++++++
 3 files changed, 131 insertions(+)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index a9dcf37fd4..f81b076728 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -816,9 +816,91 @@ MP_PROPERTY_GETSET(esp32_camera_camera_lenc_obj,
     (mp_obj_t)&esp32_camera_camera_get_lenc_obj,
     (mp_obj_t)&esp32_camera_camera_set_lenc_obj);
 
+//|     max_frame_size: FrameSize
+//|     """The maximum frame size that can be captured"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_max_frame_size(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&esp32_camera_frame_size_type, common_hal_esp32_camera_camera_get_max_frame_size(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_max_frame_size_obj, esp32_camera_camera_get_max_frame_size);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_max_frame_size_obj,
+    (mp_obj_t)&esp32_camera_camera_get_max_frame_size_obj);
+
+
+//|     address: int
+//|     """The I2C (SCCB) address of the sensor"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_address(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_address(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_address_obj, esp32_camera_camera_get_address);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_address_obj,
+    (mp_obj_t)&esp32_camera_camera_get_address_obj);
+
+
+//|     sensor_name: str
+//|     """The name of the sensor"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_sensor_name(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    const char *sensor_name = common_hal_esp32_camera_camera_get_sensor_name(self);
+    return mp_obj_new_str(sensor_name, strlen(sensor_name));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_sensor_name_obj, esp32_camera_camera_get_sensor_name);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_sensor_name_obj,
+    (mp_obj_t)&esp32_camera_camera_get_sensor_name_obj);
+
+
+//|     supports_jpeg: bool
+//|     """True if the sensor can capture images in JPEG format"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_supports_jpeg(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_supports_jpeg(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_supports_jpeg_obj, esp32_camera_camera_get_supports_jpeg);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_supports_jpeg_obj,
+    (mp_obj_t)&esp32_camera_camera_get_supports_jpeg_obj);
+
+//|     height: int
+//|     """The height of the image being captured"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_height(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_height(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_height_obj, esp32_camera_camera_get_height);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_height_obj,
+    (mp_obj_t)&esp32_camera_camera_get_height_obj);
+
+//|     width: int
+//|     """The width of the image being captured"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_width(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_width(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_width_obj, esp32_camera_camera_get_width);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_width_obj,
+    (mp_obj_t)&esp32_camera_camera_get_width_obj);
 
 
 STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&esp32_camera_camera_address_obj) },
     { MP_ROM_QSTR(MP_QSTR_aec2), MP_ROM_PTR(&esp32_camera_camera_aec2_obj) },
     { MP_ROM_QSTR(MP_QSTR_aec_value), MP_ROM_PTR(&esp32_camera_camera_aec_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_ae_level), MP_ROM_PTR(&esp32_camera_camera_ae_level_obj) },
@@ -838,17 +920,22 @@ STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_frame_size), MP_ROM_PTR(&esp32_camera_camera_frame_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_gain_ceiling), MP_ROM_PTR(&esp32_camera_camera_gain_ceiling_obj) },
     { MP_ROM_QSTR(MP_QSTR_gain_ctrl), MP_ROM_PTR(&esp32_camera_camera_gain_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&esp32_camera_camera_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_hmirror), MP_ROM_PTR(&esp32_camera_camera_hmirror_obj) },
     { MP_ROM_QSTR(MP_QSTR_lenc), MP_ROM_PTR(&esp32_camera_camera_lenc_obj) },
+    { MP_ROM_QSTR(MP_QSTR_max_frame_size), MP_ROM_PTR(&esp32_camera_camera_max_frame_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_pixel_format), MP_ROM_PTR(&esp32_camera_camera_pixel_format_obj) },
     { MP_ROM_QSTR(MP_QSTR_quality), MP_ROM_PTR(&esp32_camera_camera_quality_obj) },
     { MP_ROM_QSTR(MP_QSTR_raw_gma), MP_ROM_PTR(&esp32_camera_camera_raw_gma_obj) },
     { MP_ROM_QSTR(MP_QSTR_saturation), MP_ROM_PTR(&esp32_camera_camera_saturation_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sensor_name), MP_ROM_PTR(&esp32_camera_camera_sensor_name_obj) },
     { MP_ROM_QSTR(MP_QSTR_sharpness), MP_ROM_PTR(&esp32_camera_camera_sharpness_obj) },
     { MP_ROM_QSTR(MP_QSTR_special_effect), MP_ROM_PTR(&esp32_camera_camera_special_effect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_supports_jpeg), MP_ROM_PTR(&esp32_camera_camera_supports_jpeg_obj) },
     { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
     { MP_ROM_QSTR(MP_QSTR_vflip), MP_ROM_PTR(&esp32_camera_camera_vflip_obj) },
     { MP_ROM_QSTR(MP_QSTR_wb_mode), MP_ROM_PTR(&esp32_camera_camera_wb_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&esp32_camera_camera_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_whitebal), MP_ROM_PTR(&esp32_camera_camera_whitebal_obj) },
     { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&esp32_camera_camera_wpc_obj) },
 };
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/esp32_camera/Camera.h
index bb79fdb39a..6d830c9e49 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.h
+++ b/ports/espressif/bindings/esp32_camera/Camera.h
@@ -98,3 +98,11 @@ DECLARE_SENSOR_STATUS_GETSET(bool, bpc, bpc, set_bpc);
 DECLARE_SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
 DECLARE_SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
 DECLARE_SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
+
+// From camera_sensor_info_t
+extern int common_hal_esp32_camera_camera_get_address(esp32_camera_camera_obj_t *self);
+extern const char *common_hal_esp32_camera_camera_get_sensor_name(esp32_camera_camera_obj_t *self);
+extern const bool common_hal_esp32_camera_camera_get_supports_jpeg(esp32_camera_camera_obj_t *self);
+extern framesize_t common_hal_esp32_camera_camera_get_max_frame_size(esp32_camera_camera_obj_t *self);
+extern int common_hal_esp32_camera_camera_get_width(esp32_camera_camera_obj_t *self);
+extern int common_hal_esp32_camera_camera_get_height(esp32_camera_camera_obj_t *self);
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index b77b8ac59e..ef62795b14 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -199,3 +199,39 @@ SENSOR_STATUS_GETSET(bool, bpc, bpc, set_bpc);
 SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
 SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
 SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
+
+const char *common_hal_esp32_camera_camera_get_sensor_name(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
+    return sensor_info->name;
+}
+
+const bool common_hal_esp32_camera_camera_get_supports_jpeg(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
+    return sensor_info->support_jpeg;
+}
+
+const framesize_t common_hal_esp32_camera_camera_get_max_frame_size(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
+    return sensor_info->max_size;
+}
+
+const int common_hal_esp32_camera_camera_get_address(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
+    return sensor_info->sccb_addr;
+}
+
+const int common_hal_esp32_camera_camera_get_width(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    framesize_t framesize = sensor->status.framesize;
+    return resolution[framesize].width;
+}
+
+const int common_hal_esp32_camera_camera_get_height(esp32_camera_camera_obj_t *self) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    framesize_t framesize = sensor->status.framesize;
+    return resolution[framesize].height;
+}

From 277b439562035a1509e01783778e3f0bfb5f45e6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:03 -0500
Subject: [PATCH 0749/2403] Bump setuptools version

Building locally I saw this message:
```
/home/jepler/.espressif/python_env/idf4.4_py3.9_env/lib/python3.9/site-packages/setuptools_scm/integration.py:27: RuntimeWarning:
ERROR: setuptools==44.1.1 is used in combination with setuptools_scm>=6.x

Your build configuration is incomplete and previously worked by accident!
setuptools_scm requires setuptools>=45
```

For some reason this dependency is not automatically met, e.g., by
setuptools_scm specifying a versioned dependency itself! So specify
it here.
---
 requirements-doc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-doc.txt b/requirements-doc.txt
index 2eaf513d3d..40ab2ad4ac 100644
--- a/requirements-doc.txt
+++ b/requirements-doc.txt
@@ -5,7 +5,7 @@ isort
 twine
 wheel
 astroid
-setuptools
+setuptools>=45
 setuptools_scm
 
 # For sphinx

From 81fb9a5f20fc28918e271ba3068b9a1493f75742 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:04 -0500
Subject: [PATCH 0750/2403] specify return type for docs

---
 .../espressif/bindings/esp32_camera/Camera.c  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index f81b076728..d1d8bc8c5d 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -59,27 +59,27 @@
 //|         jpeg_quality: int=15,
 //|         double_buffered: bool = True,
 //|         grab_mode: GrabMode = GrabMode.WhenEmpty,
-//|     ):
-//|     """
-//|     Configure and initialize a camera with the given properties
+//|     ) -> None:
+//|         """
+//|         Configure and initialize a camera with the given properties
 //|
-//|     This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
+//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
 //|
-//|     :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
-//|     :param pixel_clock: The pixel clock output from the camera module
-//|     :param vsync: The vertical sync pulse output from the camera module
-//|     :param href: The horizontal reference output from the camera module
-//|     :param i2c: The I2C bus connected to the camera module
-//|     :param external_clock_frequency: The frequency generated on the external clock pin
-//|     :param external_clock_pin: The pin on which to generate the external clock
-//|     :param powerdown_pin: The powerdown input to the camera module
-//|     :param reset_pin: The reset input to the camera module
-//|     :param pixel_format: The pixel format of the captured image
-//|     :param frame_size: The size of captured image
-//|     :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
-//|     :param framebuffer_count: The number of framebuffers
-//|     :param grab_mode: When to grab a new frame
-//|     """
+//|         :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
+//|         :param pixel_clock: The pixel clock output from the camera module
+//|         :param vsync: The vertical sync pulse output from the camera module
+//|         :param href: The horizontal reference output from the camera module
+//|         :param i2c: The I2C bus connected to the camera module
+//|         :param external_clock_frequency: The frequency generated on the external clock pin
+//|         :param external_clock_pin: The pin on which to generate the external clock
+//|         :param powerdown_pin: The powerdown input to the camera module
+//|         :param reset_pin: The reset input to the camera module
+//|         :param pixel_format: The pixel format of the captured image
+//|         :param frame_size: The size of captured image
+//|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
+//|         :param framebuffer_count: The number of framebuffers
+//|         :param grab_mode: When to grab a new frame
+//|         """
 //|
 STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS };

From 7cb40c90546777ec0cd63d9bec6e54980574020e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:05 -0500
Subject: [PATCH 0751/2403] further doc build fixes

---
 conf.py                                          | 1 +
 ports/espressif/bindings/esp32_camera/__init__.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index b7e2f29914..ad35596d7a 100644
--- a/conf.py
+++ b/conf.py
@@ -199,6 +199,7 @@ exclude_patterns = ["**/build*",
                     "ports/cxd56/spresense-exported-sdk",
                     "ports/espressif/certificates",
                     "ports/espressif/esp-idf",
+                    "ports/espressif/esp32-camera",
                     "ports/espressif/.idf_tools",
                     "ports/espressif/peripherals",
                     "ports/litex/hw",
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index 09582d440b..69d8071cb2 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -48,7 +48,7 @@
 //|     """Fills buffers when they are empty. Less resources but first ``fb_count`` frames might be old"""
 //|
 //|     LATEST: GrabMode
-//|     """Except when 1 frame buffer is used, queue will always contain the last `fb_count` frames"""
+//|     """Except when 1 frame buffer is used, queue will always contain the last ``fb_count`` frames"""
 //|
 
 MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);

From a9d53ad2a682890075515dd84a19fe231bc776b5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:06 -0500
Subject: [PATCH 0752/2403] Fix "check-stubs" problems

---
 ports/espressif/bindings/esp32_camera/Camera.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index d1d8bc8c5d..654917c28b 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -58,7 +58,7 @@
 //|         frame_size: FrameSize=FrameSize.QQVGA,
 //|         jpeg_quality: int=15,
 //|         double_buffered: bool = True,
-//|         grab_mode: GrabMode = GrabMode.WhenEmpty,
+//|         grab_mode: GrabMode = GrabMode.WHEN_EMPTY,
 //|     ) -> None:
 //|         """
 //|         Configure and initialize a camera with the given properties
@@ -191,7 +191,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, es
 MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
     (mp_obj_t)&esp32_camera_camera_frame_available_get_obj);
 
-//|     def take(timeout: Optional[float]=0.25) -> Optional[displayio.Bitmap | ReadableBuffer]:
+//|     def take(self, timeout: Optional[float]=0.25) -> Optional[displayio.Bitmap | ReadableBuffer]:
 //|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
 //|
 //|         In the case of timeout, `None` is returned.

From 230532f0eb02e24a5ca82b25ddfbc8b6d0f3aa31 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:07 -0500
Subject: [PATCH 0753/2403] one last doc build fix

---
 ports/espressif/bindings/esp32_camera/Camera.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 654917c28b..1b62f26280 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -195,8 +195,8 @@ MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
 //|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
 //|
 //|         In the case of timeout, `None` is returned.
-//|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a `ReadableBuffer`.
-//|         Otherwise, the returned value is a `displayio.Bitmap`.
+//|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a read-only `memoryview`.
+//|         Otherwise, the returned value is a read-only `displayio.Bitmap`.
 //|         """
 //|
 STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {

From 0e26a937ccc8187aaf15f98c763a669dd7caa7a5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:08 -0500
Subject: [PATCH 0754/2403] Disable camera everywhere it doesn't fit

---
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk | 1 +
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk        | 1 +
 ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk       | 2 ++
 .../boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk       | 2 ++
 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk         | 2 ++
 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk          | 2 ++
 6 files changed, 10 insertions(+)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index 1b4c4015f5..b8bea2c02c 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -17,3 +17,4 @@ CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 OPTIMIZATION_FLAGS = -Os
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index dcbd2f9c7a..380423ba10 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -18,3 +18,4 @@ CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 OPTIMIZATION_FLAGS = -Os
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index 531627d5a6..4962806178 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -16,6 +16,8 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP32_CAMERA = 0
+
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index e1bd4997b7..2df1532535 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -16,6 +16,8 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP32_CAMERA = 0
+
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index 31955af81f..b6d165b82d 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -16,6 +16,8 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP32_CAMERA = 0
+
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index 4b8fe6846c..5d6fc8368f 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -16,6 +16,8 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP32_CAMERA = 0
+
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib

From 428fbcd34328767d1ce8d53f0a494ecce544b566 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:10 -0500
Subject: [PATCH 0755/2403] remove debug message during build

---
 ports/espressif/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 1f01513d32..af1788d01e 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -287,7 +287,6 @@ SRC_CAMERA := \
 	$(wildcard common-hal/esp32_camera/*.c) \
 	$(wildcard bindings/esp32_camera/*.c)
 SRC_C += $(SRC_CAMERA)
-$(info SRC_CAMERA = $(SRC_CAMERA))
 CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif

From 98202c85688384f702802ad263c30afa8c74da9e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:11 -0500
Subject: [PATCH 0756/2403] Allow changing camera settings that require reinit

These can only be changed in a group, though any items to keep
unchanged can be unspecified or specified as None.
---
 .../espressif/bindings/esp32_camera/Camera.c  | 119 ++++++++++++++----
 .../espressif/bindings/esp32_camera/Camera.h  |  12 +-
 .../common-hal/esp32_camera/Camera.c          |  46 ++++++-
 3 files changed, 147 insertions(+), 30 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 1b62f26280..665c120a70 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -77,7 +77,7 @@
 //|         :param pixel_format: The pixel format of the captured image
 //|         :param frame_size: The size of captured image
 //|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
-//|         :param framebuffer_count: The number of framebuffers
+//|         :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered)
 //|         :param grab_mode: When to grab a new frame
 //|         """
 //|
@@ -175,8 +175,7 @@ STATIC void check_for_deinit(esp32_camera_camera_obj_t *self) {
 //|
 STATIC mp_obj_t esp32_camera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
-    common_hal_esp32_camera_camera_deinit(args[0]);
-    return mp_const_none;
+    return esp32_camera_camera_deinit(args[0]);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera___exit___obj, 4, 4, esp32_camera_camera_obj___exit__);
 
@@ -184,7 +183,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera___exit___obj, 4,
 //|     """True if a frame is available, False otherwise"""
 
 STATIC mp_obj_t esp32_camera_camera_frame_available_get(const mp_obj_t self_in) {
-    return mp_obj_new_bool(false);
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(esp_camera_fb_available());
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, esp32_camera_camera_frame_available_get);
 
@@ -215,7 +216,6 @@ STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
         int height = common_hal_esp32_camera_camera_get_height(self);
         displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
         bitmap->base.type = &displayio_bitmap_type;
-        mp_printf(&mp_plat_print, "construct bitmap %dx%d @%p\n", width, height, result->buf);
         common_hal_displayio_bitmap_construct_from_buffer(bitmap, width, height, (format == PIXFORMAT_RGB565) ? 16 : 8, (uint32_t *)(void *)result->buf, true);
         return bitmap;
     }
@@ -223,6 +223,59 @@ STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
 
 
+//|     def reconfigure(
+//|         self,
+//|         frame_size: Optional[FrameSize] = None,
+//|         pixel_format: Optional[PixelFormat] = None,
+//|         grab_mode: Optional[GrabMode] = None,
+//|         framebuffer_count: Optional[int] = None,
+//|     ) -> None:
+//|         """Set the frame size and pixel format
+//|
+//|         Because these settings interact in complex ways, and take longer than
+//|         the other properties to set, they are set together in a single function call.
+//|
+//|         If an argument is unspecified or None, then the setting is unchanged."""
+//|
+
+STATIC mp_obj_t esp32_camera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+
+    enum { ARG_frame_size, ARG_pixel_format, ARG_grab_mode, ARG_framebuffer_count };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_frame_size, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_pixel_format, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_grab_mode, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_framebuffer_count, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+    };
+
+    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);
+
+    framesize_t frame_size =
+        args[ARG_frame_size].u_obj != MP_ROM_NONE
+        ?  validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size)
+        : common_hal_esp32_camera_camera_get_frame_size(self);
+    pixformat_t pixel_format =
+        args[ARG_pixel_format].u_obj != MP_ROM_NONE
+        ?  validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format)
+        : common_hal_esp32_camera_camera_get_pixel_format(self);
+    camera_grab_mode_t grab_mode =
+        args[ARG_grab_mode].u_obj != MP_ROM_NONE
+        ?  validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode)
+        : common_hal_esp32_camera_camera_get_grab_mode(self);
+    bool framebuffer_count =
+        args[ARG_framebuffer_count].u_obj != MP_ROM_NONE
+        ?  mp_obj_get_int(args[ARG_framebuffer_count].u_obj)
+        : common_hal_esp32_camera_camera_get_framebuffer_count(self);
+
+    common_hal_esp32_camera_camera_reconfigure(self, frame_size, pixel_format, grab_mode, framebuffer_count);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(esp32_camera_camera_reconfigure_obj, 1, esp32_camera_camera_reconfigure);
+
 //|     pixel_format: PixelFormat
 //|     """The pixel format of captured frames"""
 
@@ -233,16 +286,8 @@ STATIC mp_obj_t esp32_camera_camera_get_pixel_format(const mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_pixel_format_obj, esp32_camera_camera_get_pixel_format);
 
-STATIC mp_obj_t esp32_camera_camera_set_pixel_format(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_pixel_format(self, validate_pixel_format(arg, MP_QSTR_pixel_format));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_pixel_format_obj, esp32_camera_camera_set_pixel_format);
-MP_PROPERTY_GETSET(esp32_camera_camera_pixel_format_obj,
-    (mp_obj_t)&esp32_camera_camera_get_pixel_format_obj,
-    (mp_obj_t)&esp32_camera_camera_set_pixel_format_obj);
+MP_PROPERTY_GETTER(esp32_camera_camera_pixel_format_obj,
+    (mp_obj_t)&esp32_camera_camera_get_pixel_format_obj);
 
 
 //|     frame_size: FrameSize
@@ -255,16 +300,8 @@ STATIC mp_obj_t esp32_camera_camera_get_frame_size(const mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_frame_size_obj, esp32_camera_camera_get_frame_size);
 
-STATIC mp_obj_t esp32_camera_camera_set_frame_size(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_frame_size(self, validate_frame_size(arg, MP_QSTR_frame_size));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_frame_size_obj, esp32_camera_camera_set_frame_size);
-MP_PROPERTY_GETSET(esp32_camera_camera_frame_size_obj,
-    (mp_obj_t)&esp32_camera_camera_get_frame_size_obj,
-    (mp_obj_t)&esp32_camera_camera_set_frame_size_obj);
+MP_PROPERTY_GETTER(esp32_camera_camera_frame_size_obj,
+    (mp_obj_t)&esp32_camera_camera_get_frame_size_obj);
 
 //|     contrast: int
 //|     """Access the contrast property of the camera sensor"""
@@ -898,6 +935,33 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_width_obj, esp32_camera
 MP_PROPERTY_GETTER(esp32_camera_camera_width_obj,
     (mp_obj_t)&esp32_camera_camera_get_width_obj);
 
+//|     grab_mode: GrabMode
+//|     """The grab mode of the camera"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_grab_mode(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&esp32_camera_grab_mode_type, common_hal_esp32_camera_camera_get_grab_mode(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_grab_mode_obj, esp32_camera_camera_get_grab_mode);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_grab_mode_obj,
+    (mp_obj_t)&esp32_camera_camera_get_grab_mode_obj);
+
+
+//|     framebuffer_count: int
+//|     """True if double buffering is used"""
+//|
+STATIC mp_obj_t esp32_camera_camera_get_framebuffer_count(const mp_obj_t self_in) {
+    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_framebuffer_count(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_framebuffer_count_obj, esp32_camera_camera_get_framebuffer_count);
+
+MP_PROPERTY_GETTER(esp32_camera_camera_framebuffer_count_obj,
+    (mp_obj_t)&esp32_camera_camera_get_framebuffer_count_obj);
+
 
 STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&esp32_camera_camera_address_obj) },
@@ -913,6 +977,7 @@ STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_dcw), MP_ROM_PTR(&esp32_camera_camera_dcw_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_camera_camera_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_denoise), MP_ROM_PTR(&esp32_camera_camera_denoise_obj) },
+    { MP_ROM_QSTR(MP_QSTR_framebuffer_count), MP_ROM_PTR(&esp32_camera_camera_framebuffer_count_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&esp32_camera_camera___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_exposure_ctrl), MP_ROM_PTR(&esp32_camera_camera_exposure_ctrl_obj) },
@@ -920,6 +985,7 @@ STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_frame_size), MP_ROM_PTR(&esp32_camera_camera_frame_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_gain_ceiling), MP_ROM_PTR(&esp32_camera_camera_gain_ceiling_obj) },
     { MP_ROM_QSTR(MP_QSTR_gain_ctrl), MP_ROM_PTR(&esp32_camera_camera_gain_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_grab_mode), MP_ROM_PTR(&esp32_camera_camera_grab_mode_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&esp32_camera_camera_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_hmirror), MP_ROM_PTR(&esp32_camera_camera_hmirror_obj) },
     { MP_ROM_QSTR(MP_QSTR_lenc), MP_ROM_PTR(&esp32_camera_camera_lenc_obj) },
@@ -927,6 +993,7 @@ STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pixel_format), MP_ROM_PTR(&esp32_camera_camera_pixel_format_obj) },
     { MP_ROM_QSTR(MP_QSTR_quality), MP_ROM_PTR(&esp32_camera_camera_quality_obj) },
     { MP_ROM_QSTR(MP_QSTR_raw_gma), MP_ROM_PTR(&esp32_camera_camera_raw_gma_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reconfigure), MP_ROM_PTR(&esp32_camera_camera_reconfigure_obj) },
     { MP_ROM_QSTR(MP_QSTR_saturation), MP_ROM_PTR(&esp32_camera_camera_saturation_obj) },
     { MP_ROM_QSTR(MP_QSTR_sensor_name), MP_ROM_PTR(&esp32_camera_camera_sensor_name_obj) },
     { MP_ROM_QSTR(MP_QSTR_sharpness), MP_ROM_PTR(&esp32_camera_camera_sharpness_obj) },
@@ -935,8 +1002,8 @@ STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
     { MP_ROM_QSTR(MP_QSTR_vflip), MP_ROM_PTR(&esp32_camera_camera_vflip_obj) },
     { MP_ROM_QSTR(MP_QSTR_wb_mode), MP_ROM_PTR(&esp32_camera_camera_wb_mode_obj) },
-    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&esp32_camera_camera_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_whitebal), MP_ROM_PTR(&esp32_camera_camera_whitebal_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&esp32_camera_camera_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&esp32_camera_camera_wpc_obj) },
 };
 
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/esp32_camera/Camera.h
index 6d830c9e49..146cd0da05 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.h
+++ b/ports/espressif/bindings/esp32_camera/Camera.h
@@ -57,6 +57,7 @@ extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *sel
 extern bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self);
 extern bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self);
 extern camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms);
+extern void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count);
 
 #define DECLARE_SENSOR_GETSET(type, name, field_name, setter_function_name) \
     DECLARE_SENSOR_GET(type, name, field_name, setter_function_name) \
@@ -65,14 +66,17 @@ extern camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_
 #define DECLARE_SENSOR_STATUS_GETSET(type, name, status_field_name, setter_function_name) \
     DECLARE_SENSOR_GETSET(type, name, status.status_field_name, setter_function_name)
 
+#define DECLARE_SENSOR_STATUS_GET(type, name, status_field_name, setter_function_name) \
+    DECLARE_SENSOR_GET(type, name, status.status_field_name, setter_function_name)
+
 #define DECLARE_SENSOR_GET(type, name, status_field_name, setter_function_name) \
     extern type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self);
 
 #define DECLARE_SENSOR_SET(type, name, setter_function_name) \
     extern void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value);
 
-DECLARE_SENSOR_GETSET(pixformat_t, pixel_format, pixformat, set_pixformat)
-DECLARE_SENSOR_STATUS_GETSET(framesize_t, frame_size, framesize, set_framesize)
+DECLARE_SENSOR_GET(pixformat_t, pixel_format, pixformat, set_pixformat)
+DECLARE_SENSOR_STATUS_GET(framesize_t, frame_size, framesize, set_framesize)
 DECLARE_SENSOR_STATUS_GETSET(int, contrast, contrast, set_contrast);
 DECLARE_SENSOR_STATUS_GETSET(int, brightness, brightness, set_brightness);
 DECLARE_SENSOR_STATUS_GETSET(int, saturation, saturation, set_saturation);
@@ -99,6 +103,10 @@ DECLARE_SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
 DECLARE_SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
 DECLARE_SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
 
+// From settings
+extern camera_grab_mode_t common_hal_esp32_camera_camera_get_grab_mode(esp32_camera_camera_obj_t *self);
+extern int common_hal_esp32_camera_camera_get_framebuffer_count(esp32_camera_camera_obj_t *self);
+
 // From camera_sensor_info_t
 extern int common_hal_esp32_camera_camera_get_address(esp32_camera_camera_obj_t *self);
 extern const char *common_hal_esp32_camera_camera_get_sensor_name(esp32_camera_camera_obj_t *self);
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index ef62795b14..af1d20542a 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -32,6 +32,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "common-hal/microcontroller/Pin.h"
 
+#include "esp32-camera/driver/private_include/cam_hal.h"
+
 static void maybe_claim_pin(const mcu_pin_obj_t *pin) {
     if (pin) {
         claim_pin(pin);
@@ -172,8 +174,40 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
         } \
     }
 
-SENSOR_GETSET(pixformat_t, pixel_format, pixformat, set_pixformat);
-SENSOR_STATUS_GETSET(framesize_t, frame_size, framesize, set_framesize);
+pixformat_t common_hal_esp32_camera_camera_get_pixel_format(esp32_camera_camera_obj_t *self) {
+    return self->camera_config.pixel_format;
+}
+
+framesize_t common_hal_esp32_camera_camera_get_frame_size(esp32_camera_camera_obj_t *self) {
+    return self->camera_config.frame_size;
+}
+
+#include "esp_log.h"
+
+void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count) {
+    sensor_t *sensor = esp_camera_sensor_get();
+    camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
+
+    if (PIXFORMAT_JPEG == pixel_format && (!sensor_info->support_jpeg)) {
+        raise_esp_error(ESP_ERR_NOT_SUPPORTED);
+    }
+
+    if (frame_size > sensor_info->max_size) {
+        frame_size = sensor_info->max_size;
+    }
+
+    cam_deinit();
+    self->camera_config.pixel_format = pixel_format;
+    self->camera_config.frame_size = frame_size;
+    self->camera_config.grab_mode = grab_mode;
+    self->camera_config.fb_count = framebuffer_count;
+    sensor->set_pixformat(sensor, self->camera_config.pixel_format);
+    sensor->set_framesize(sensor, self->camera_config.frame_size);
+    cam_init(&self->camera_config);
+    cam_config(&self->camera_config, frame_size, sensor_info->pid);
+    cam_start();
+}
+
 SENSOR_STATUS_GETSET(int, contrast, contrast, set_contrast);
 SENSOR_STATUS_GETSET(int, brightness, brightness, set_brightness);
 SENSOR_STATUS_GETSET(int, saturation, saturation, set_saturation);
@@ -235,3 +269,11 @@ const int common_hal_esp32_camera_camera_get_height(esp32_camera_camera_obj_t *s
     framesize_t framesize = sensor->status.framesize;
     return resolution[framesize].height;
 }
+
+const camera_grab_mode_t common_hal_esp32_camera_camera_get_grab_mode(esp32_camera_camera_obj_t *self) {
+    return self->camera_config.grab_mode;
+}
+
+const int common_hal_esp32_camera_camera_get_framebuffer_count(esp32_camera_camera_obj_t *self) {
+    return self->camera_config.fb_count;
+}

From 861fa9625dc4229638ced6bd91ab6ea55a49a047 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 Aug 2022 15:12:12 -0500
Subject: [PATCH 0757/2403] Add the ESP32-EYE aka ESP-EYE

---
 .../boards/espressif_esp32_eye/board.c        | 46 ++++++++++++
 .../espressif_esp32_eye/mpconfigboard.h       | 39 ++++++++++
 .../espressif_esp32_eye/mpconfigboard.mk      | 14 ++++
 .../boards/espressif_esp32_eye/pins.c         | 39 ++++++++++
 .../boards/espressif_esp32_eye/sdkconfig      | 72 +++++++++++++++++++
 5 files changed, 210 insertions(+)
 create mode 100644 ports/espressif/boards/espressif_esp32_eye/board.c
 create mode 100644 ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
 create mode 100644 ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/espressif_esp32_eye/pins.c
 create mode 100644 ports/espressif/boards/espressif_esp32_eye/sdkconfig

diff --git a/ports/espressif/boards/espressif_esp32_eye/board.c b/ports/espressif/boards/espressif_esp32_eye/board.c
new file mode 100644
index 0000000000..d66ab9e5f1
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_eye/board.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+    reset_board();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
new file mode 100644
index 0000000000..63a6f2307e
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Espressif ESP32-EYE"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO23, .sda = &pin_GPIO18}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
+
+#define DEFAULT_RESERVED_PSRAM      (1048576)
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
new file mode 100644
index 0000000000..a23b6ef6a8
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
@@ -0,0 +1,14 @@
+CIRCUITPY_CREATOR_ID =  0x000C303A
+CIRCUITPY_CREATION_ID = 0x00320001
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+CIRCUITPY_STATUS_BAR = 0
+CIRCUITPY_WEB_WORKFLOW = 0
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_esp32_eye/pins.c b/ports/espressif/boards/espressif_esp32_eye/pins.c
new file mode 100644
index 0000000000..2b640681c9
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_eye/pins.c
@@ -0,0 +1,39 @@
+#include "py/objtuple.h"
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
+    {&mp_type_tuple},
+    8,
+    {
+        MP_ROM_PTR(&pin_GPIO34),
+        MP_ROM_PTR(&pin_GPIO13),
+        MP_ROM_PTR(&pin_GPIO14),
+        MP_ROM_PTR(&pin_GPIO35),
+        MP_ROM_PTR(&pin_GPIO39), // "S_VN"
+        MP_ROM_PTR(&pin_GPIO38),
+        MP_ROM_PTR(&pin_GPIO37),
+        MP_ROM_PTR(&pin_GPIO36), // "S_VP"
+    }
+};
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_LED_WHITE), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO4) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/espressif_esp32_eye/sdkconfig b/ports/espressif/boards/espressif_esp32_eye/sdkconfig
new file mode 100644
index 0000000000..a73d92e0a2
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_eye/sdkconfig
@@ -0,0 +1,72 @@
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
+#
+# Component config
+#
+#
+# ESP32-specific
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+# CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set
+# end of SPI RAM config
+
+# end of ESP32-specific
+
+#
+# NVS
+#
+# CONFIG_NVS_ASSERT_ERROR_CHECK is not set
+# end of NVS
+
+#
+# Camera configuration
+#
+CONFIG_OV7670_SUPPORT=y
+CONFIG_OV7725_SUPPORT=y
+CONFIG_NT99141_SUPPORT=y
+CONFIG_OV2640_SUPPORT=y
+CONFIG_OV3660_SUPPORT=y
+CONFIG_OV5640_SUPPORT=y
+CONFIG_GC2145_SUPPORT=y
+CONFIG_GC032A_SUPPORT=y
+CONFIG_GC0308_SUPPORT=y
+CONFIG_BF3005_SUPPORT=y
+CONFIG_BF20A6_SUPPORT=y
+# CONFIG_SC101IOT_SUPPORT is not set
+CONFIG_SC030IOT_SUPPORT=y
+# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
+CONFIG_SCCB_HARDWARE_I2C_PORT1=y
+CONFIG_SCCB_CLK_FREQ=100000
+# CONFIG_GC_SENSOR_WINDOWING_MODE is not set
+CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y
+CONFIG_CAMERA_CORE0=y
+# CONFIG_CAMERA_CORE1 is not set
+# CONFIG_CAMERA_NO_AFFINITY is not set
+CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
+# end of Camera configuration
+
+# end of Component config
+#
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=1
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=3
+

From 125b276af02d373153de6f4277d22e9d215980ec Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 4 Aug 2022 16:06:27 -0700
Subject: [PATCH 0758/2403] Get CIRCUITPY FATFS directly.

Otherwise, you may actually get a non-root filesystem.

Fixes #6575
---
 ports/espressif/boards/mixgo_ce_serial/board.c |  3 ++-
 shared-module/dotenv/__init__.c                |  3 ++-
 supervisor/filesystem.h                        |  2 ++
 supervisor/shared/bluetooth/file_transfer.c    | 13 +++++++------
 supervisor/shared/filesystem.c                 | 13 +++++++++++--
 supervisor/shared/web_workflow/web_workflow.c  |  3 ++-
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ports/espressif/boards/mixgo_ce_serial/board.c b/ports/espressif/boards/mixgo_ce_serial/board.c
index e07fe5cfd7..32cb1749ca 100644
--- a/ports/espressif/boards/mixgo_ce_serial/board.c
+++ b/ports/espressif/boards/mixgo_ce_serial/board.c
@@ -31,6 +31,7 @@
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs_fat.h"
 #include "py/mpstate.h"
+#include "supervisor/filesystem.h"
 
 void board_init(void) {
     // Debug UART
@@ -41,7 +42,7 @@ void board_init(void) {
 
     mp_import_stat_t stat_b = mp_import_stat("boot.py");
     if (stat_b != MP_IMPORT_STAT_FILE) {
-        FATFS *fatfs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+        FATFS *fatfs = filesystem_circuitpy();
         FIL fs;
         UINT char_written = 0;
         const byte buffer[] = "#Serial port upload mode\nimport storage\nstorage.remount(\"/\", False)\nstorage.disable_usb_drive()\n";
diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index bd1973366d..f17d684e12 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -32,6 +32,7 @@
 #include "extmod/vfs_fat.h"
 #include "py/mpstate.h"
 #include "py/objstr.h"
+#include "supervisor/filesystem.h"
 
 STATIC uint8_t consume_spaces(FIL *active_file) {
     uint8_t character = ' ';
@@ -188,7 +189,7 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
 
 mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len) {
     FIL active_file;
-    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    FATFS *fs = filesystem_circuitpy();
     FRESULT result = f_open(fs, &active_file, path, FA_READ);
     if (result != FR_OK) {
         return -1;
diff --git a/supervisor/filesystem.h b/supervisor/filesystem.h
index 6f4faf0b82..3954291513 100644
--- a/supervisor/filesystem.h
+++ b/supervisor/filesystem.h
@@ -45,4 +45,6 @@ void filesystem_set_concurrent_write_protection(fs_user_mount_t *vfs, bool concu
 bool filesystem_is_writable_by_python(fs_user_mount_t *vfs);
 bool filesystem_is_writable_by_usb(fs_user_mount_t *vfs);
 
+FATFS *filesystem_circuitpy(void);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_FILESYSTEM_H
diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c
index a6a2f8062a..216cf3d567 100644
--- a/supervisor/shared/bluetooth/file_transfer.c
+++ b/supervisor/shared/bluetooth/file_transfer.c
@@ -43,6 +43,7 @@
 #include "common-hal/_bleio/__init__.h"
 
 #include "supervisor/fatfs_port.h"
+#include "supervisor/filesystem.h"
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/bluetooth/file_transfer.h"
 #include "supervisor/shared/bluetooth/file_transfer_protocol.h"
@@ -172,7 +173,7 @@ STATIC uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
     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;
+    FATFS *fs = filesystem_circuitpy();
     FRESULT result = f_open(fs, &active_file, path, FA_READ);
     if (result != FR_OK) {
         response.status = STATUS_ERROR;
@@ -289,7 +290,7 @@ STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
         return ANY_COMMAND;
     }
 
-    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    FATFS *fs = filesystem_circuitpy();
     DWORD fattime;
     _truncated_time = truncate_time(command->modification_time, &fattime);
     override_fattime(fattime);
@@ -438,7 +439,7 @@ STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
     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;
+    FATFS *fs = filesystem_circuitpy();
     char *path = (char *)((uint8_t *)command) + header_size;
     path[command->path_length] = '\0';
     FILINFO file;
@@ -495,7 +496,7 @@ STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
     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;
+    FATFS *fs = filesystem_circuitpy();
     char *path = (char *)command->path;
     _terminate_path(path, command->path_length);
 
@@ -552,7 +553,7 @@ STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
         return THIS_COMMAND;
     }
 
-    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    FATFS *fs = filesystem_circuitpy();
     char *path = (char *)&command->path;
     _terminate_path(path, command->path_length);
     // mp_printf(&mp_plat_print, "list %s\n", path);
@@ -640,7 +641,7 @@ STATIC uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) {
     if (command_len < header_size + total_path_length) {
         return THIS_COMMAND;
     }
-    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    FATFS *fs = filesystem_circuitpy();
     char *old_path = (char *)command->paths;
     old_path[command->old_path_length] = '\0';
 
diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c
index 820dbe9783..283849adc3 100644
--- a/supervisor/shared/filesystem.c
+++ b/supervisor/shared/filesystem.c
@@ -92,6 +92,9 @@ bool filesystem_init(bool create_allowed, bool force_create) {
     vfs_fat->blockdev.flags = 0;
     supervisor_flash_init_vfs(vfs_fat);
 
+    mp_vfs_mount_t *vfs = &_mp_vfs;
+    vfs->len = 0;
+
     // try to mount the flash
     FRESULT res = f_mount(&vfs_fat->fatfs);
     if ((res == FR_NO_FILESYSTEM && create_allowed) || force_create) {
@@ -140,7 +143,6 @@ bool filesystem_init(bool create_allowed, bool force_create) {
     } else if (res != FR_OK) {
         return false;
     }
-    mp_vfs_mount_t *vfs = &_mp_vfs;
     vfs->str = "/";
     vfs->len = 1;
     vfs->obj = MP_OBJ_FROM_PTR(vfs_fat);
@@ -199,5 +201,12 @@ void filesystem_set_concurrent_write_protection(fs_user_mount_t *vfs, bool concu
 }
 
 bool filesystem_present(void) {
-    return true;
+    return _mp_vfs.len > 0;
+}
+
+FATFS *filesystem_circuitpy(void) {
+    if (!filesystem_present()) {
+        return NULL;
+    }
+    return &_internal_vfs.fatfs;
 }
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 9e8c32d963..dc93aeb0bc 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -36,6 +36,7 @@
 #include "shared-module/storage/__init__.h"
 #include "shared/timeutils/timeutils.h"
 #include "supervisor/fatfs_port.h"
+#include "supervisor/filesystem.h"
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
@@ -979,7 +980,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else {
             char *path = request->path + 3;
             size_t pathlen = strlen(path);
-            FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+            FATFS *fs = filesystem_circuitpy();
             // Trailing / is a directory.
             bool directory = false;
             if (path[pathlen - 1] == '/') {

From 0ca29fa213dc305bb01b80cf4147a949d23b96e6 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Thu, 4 Aug 2022 18:12:27 -0500
Subject: [PATCH 0759/2403] Check if CS parameter is DigitalInOut type

---
 shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index f7cc357e91..7a44679d28 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -89,6 +89,10 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
 
     busio_spi_obj_t *spi = args[ARG_spi].u_obj;
 
+    if (!mp_obj_is_type(args[ARG_chip_select].u_obj, &digitalio_digitalinout_type)) {
+        mp_raise_TypeError_varg(translate("unsupported %q type"), digitalio_digitalinout_type.name);
+    }
+
     common_hal_adafruit_bus_device_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_cs_active_value].u_bool, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
         args[ARG_phase].u_int, args[ARG_extra_clocks].u_int);
 

From 185d3e19ecdc7182d93bac3a2f052ab1312690b0 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 4 Aug 2022 16:25:50 -0700
Subject: [PATCH 0760/2403] Switch to temporary redirect for cp.local

This prevents browsers from caching it. Thanks to MakerMelissa for
the suggestion.
---
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 9e8c32d963..8c86a8c2bd 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -575,7 +575,7 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
     lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
     _send_strs(socket,
-        "HTTP/1.1 301 Moved Permanently\r\n",
+        "HTTP/1.1 307 Temporary Redirect\r\n",
         "Connection: close\r\n",
         "Content-Length: 0\r\n",
         "Location: ", NULL);

From 577d53dda40ad4bfdd19d2629ca85c6fdd2cb781 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 2 Aug 2022 17:01:41 -0700
Subject: [PATCH 0761/2403] Add execution status into title bar

---
 main.c                                        | 80 ++++++++++++-------
 supervisor/shared/title_bar.c                 |  6 +-
 supervisor/shared/title_bar.h                 |  4 +
 supervisor/shared/web_workflow/web_workflow.c | 21 +++--
 4 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/main.c b/main.c
index d310f571a6..800843e419 100644
--- a/main.c
+++ b/main.c
@@ -204,6 +204,32 @@ STATIC void stop_mp(void) {
     gc_deinit();
 }
 
+STATIC const char *_last_executing_filename = NULL;
+STATIC const char *_current_executing_filename = NULL;
+
+STATIC pyexec_result_t _exec_result = {0, MP_OBJ_NULL, 0};
+STATIC int _last_return_code = 0;
+STATIC int _last_exception_line = 0;
+
+bool supervisor_execution_status_dirty(void) {
+    return _last_executing_filename != _current_executing_filename ||
+           _last_return_code != _exec_result.return_code ||
+           _last_exception_line != _exec_result.exception_line;
+}
+
+void supervisor_execution_status(void) {
+    mp_obj_exception_t *exception = MP_OBJ_TO_PTR(_exec_result.exception);
+    if ((_exec_result.return_code & PYEXEC_EXCEPTION) != 0 &&
+        exception != NULL) {
+        mp_printf(&mp_plat_print, "@%d %q", _exec_result.exception_line, exception->base.type->name);
+    } else if (_current_executing_filename != NULL) {
+        serial_write(_current_executing_filename);
+    }
+    _last_executing_filename = _current_executing_filename;
+    _last_return_code = _exec_result.return_code;
+    _last_exception_line = _exec_result.exception_line;
+}
+
 #define STRING_LIST(...) {__VA_ARGS__, ""}
 
 // Look for the first file that exists in the list of filenames, using mp_import_stat().
@@ -218,17 +244,23 @@ STATIC const char *first_existing_file_in_list(const char *const *filenames) {
     return NULL;
 }
 
-STATIC bool maybe_run_list(const char *const *filenames, pyexec_result_t *exec_result) {
-    const char *filename = first_existing_file_in_list(filenames);
-    if (filename == NULL) {
+STATIC bool maybe_run_list(const char *const *filenames) {
+    _exec_result.return_code = 0;
+    _exec_result.exception = MP_OBJ_NULL;
+    _exec_result.exception_line = 0;
+    _current_executing_filename = first_existing_file_in_list(filenames);
+    if (_current_executing_filename == NULL) {
         return false;
     }
-    mp_hal_stdout_tx_str(filename);
+    mp_hal_stdout_tx_str(_current_executing_filename);
     serial_write_compressed(translate(" output:\n"));
-    pyexec_file(filename, exec_result);
+    supervisor_title_bar_request_update(false);
+    pyexec_file(_current_executing_filename, &_exec_result);
     #if CIRCUITPY_ATEXIT
-    shared_module_atexit_execute(exec_result);
+    shared_module_atexit_execute(&_exec_result);
     #endif
+    _current_executing_filename = "Done";
+    supervisor_title_bar_request_update(false);
     return true;
 }
 
@@ -347,12 +379,6 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
     }
     #endif
 
-    pyexec_result_t result;
-
-    result.return_code = 0;
-    result.exception = MP_OBJ_NULL;
-    result.exception_line = 0;
-
     bool skip_repl = false;
     bool skip_wait = false;
     bool found_main = false;
@@ -391,7 +417,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
             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, ""};
                 // This is where the user's python code is actually executed:
-                found_main = maybe_run_list(next_list, &result);
+                found_main = maybe_run_list(next_list);
                 if (!found_main) {
                     serial_write(((next_code_info_t *)next_code_allocation->ptr)->filename);
                     serial_write_compressed(translate(" not found.\n"));
@@ -401,11 +427,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
         // Otherwise, default to the standard list of filenames
         if (!found_main) {
             // This is where the user's python code is actually executed:
-            found_main = maybe_run_list(supported_filenames, &result);
+            found_main = maybe_run_list(supported_filenames);
             // If that didn't work, double check the extensions
             #if CIRCUITPY_FULL_BUILD
             if (!found_main) {
-                found_main = maybe_run_list(double_extension_filenames, &result);
+                found_main = maybe_run_list(double_extension_filenames);
                 if (found_main) {
                     serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
                 }
@@ -417,7 +443,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
         // Print done before resetting everything so that we get the message over
         // BLE before it is reset and we have a delay before reconnect.
-        if ((result.return_code & PYEXEC_RELOAD) && supervisor_get_run_reason() == RUN_REASON_AUTO_RELOAD) {
+        if ((_exec_result.return_code & PYEXEC_RELOAD) && supervisor_get_run_reason() == RUN_REASON_AUTO_RELOAD) {
             serial_write_compressed(translate("\nCode stopped by auto-reload. Reloading soon.\n"));
         } else {
             serial_write_compressed(translate("\nCode done running.\n"));
@@ -425,7 +451,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
-        cleanup_after_vm(heap, result.exception);
+        cleanup_after_vm(heap, _exec_result.exception);
 
         // 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
@@ -436,7 +462,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
             next_code_options |= SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
         }
 
-        if (result.return_code & PYEXEC_RELOAD) {
+        if (_exec_result.return_code & PYEXEC_RELOAD) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
             // Reload immediately unless the reload is due to autoreload. In that
             // case, we wait below to see if any other writes occur.
@@ -444,7 +470,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
                 skip_repl = true;
                 skip_wait = true;
             }
-        } else if (result.return_code == 0) {
+        } else if (_exec_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;
@@ -455,12 +481,12 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
             // 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)) {
+                && !(_exec_result.return_code & PYEXEC_DEEP_SLEEP)) {
                 skip_repl = true;
                 skip_wait = true;
             }
         }
-        if (result.return_code & PYEXEC_FORCED_EXIT) {
+        if (_exec_result.return_code & PYEXEC_FORCED_EXIT) {
             skip_repl = false;
             skip_wait = true;
         }
@@ -478,12 +504,12 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
     uint8_t blink_count;
     bool led_active = false;
     #if CIRCUITPY_ALARM
-    if (result.return_code & PYEXEC_DEEP_SLEEP) {
+    if (_exec_result.return_code & PYEXEC_DEEP_SLEEP) {
         color = BLACK;
         blink_count = 0;
     } else
     #endif
-    if (result.return_code != PYEXEC_EXCEPTION) {
+    if (_exec_result.return_code != PYEXEC_EXCEPTION) {
         if (safe_mode == NO_SAFE_MODE) {
             color = ALL_DONE;
             blink_count = ALL_DONE_BLINKS;
@@ -568,7 +594,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
         // Sleep until our next interrupt.
         #if CIRCUITPY_ALARM
-        if (result.return_code & PYEXEC_DEEP_SLEEP) {
+        if (_exec_result.return_code & PYEXEC_DEEP_SLEEP) {
             const bool awoke_from_true_deep_sleep =
                 common_hal_mcu_processor_get_reset_reason() == RESET_REASON_DEEP_SLEEP_ALARM;
 
@@ -730,8 +756,6 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     usb_set_defaults();
     #endif
 
-    pyexec_result_t result = {0, MP_OBJ_NULL, 0};
-
     if (ok_to_run) {
         #ifdef CIRCUITPY_BOOT_OUTPUT_FILE
         vstr_t boot_text;
@@ -742,7 +766,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         // Write version info
         mp_printf(&mp_plat_print, "%s\nBoard ID:%s\n", MICROPY_FULL_VERSION_INFO, CIRCUITPY_BOARD_ID);
 
-        bool found_boot = maybe_run_list(boot_py_filenames, &result);
+        bool found_boot = maybe_run_list(boot_py_filenames);
         (void)found_boot;
 
 
@@ -792,7 +816,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     usb_get_boot_py_data(usb_boot_py_data, size);
     #endif
 
-    cleanup_after_vm(heap, result.exception);
+    cleanup_after_vm(heap, _exec_result.exception);
 
     #if CIRCUITPY_USB
     // Now give back the data we saved from the heap going away.
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
index 7fa3116b47..395b11105e 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/title_bar.c
@@ -52,6 +52,8 @@ static void title_bar_background(void *data) {
     dirty = dirty || supervisor_web_workflow_status_dirty();
     #endif
 
+    dirty = dirty || supervisor_execution_status_dirty();
+
     if (!dirty) {
         return;
     }
@@ -64,8 +66,10 @@ static void title_bar_background(void *data) {
     serial_write("🐍 ");
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_web_workflow_status();
+    serial_write(" | ");
     #endif
-    serial_write("|");
+    supervisor_execution_status();
+    serial_write(" | ");
     serial_write(MICROPY_GIT_TAG);
     // Send string terminator
     serial_write("\x1b" "\\");
diff --git a/supervisor/shared/title_bar.h b/supervisor/shared/title_bar.h
index 778d768086..6aeddfe121 100644
--- a/supervisor/shared/title_bar.h
+++ b/supervisor/shared/title_bar.h
@@ -32,3 +32,7 @@ void supervisor_title_bar_start(void);
 void supervisor_title_bar_suspend(void);
 void supervisor_title_bar_resume(void);
 void supervisor_title_bar_request_update(bool force_dirty);
+
+// Provided by main.c
+bool supervisor_execution_status_dirty(void);
+void supervisor_execution_status(void);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 9e8c32d963..dd27ace7f9 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -195,10 +195,20 @@ bool supervisor_web_workflow_status_dirty(void) {
 }
 
 void supervisor_web_workflow_status(void) {
-    serial_write_compressed(translate("Wi-Fi: "));
     _last_enabled = common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj);
     if (_last_enabled) {
         uint32_t ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj);
+        if (ipv4_address != 0) {
+            _update_encoded_ip();
+            _last_ip = _encoded_ip;
+            mp_printf(&mp_plat_print, "%s", _our_ip_encoded);
+            if (web_api_port != 80) {
+                mp_printf(&mp_plat_print, ":%d", web_api_port);
+            }
+            // TODO: Use these unicode to show signal strength: ▂▄▆█
+            return;
+        }
+        serial_write_compressed(translate("Wi-Fi: "));
         _last_wifi_status = _wifi_status;
         if (_wifi_status == WIFI_RADIO_ERROR_AUTH_EXPIRE ||
             _wifi_status == WIFI_RADIO_ERROR_AUTH_FAIL) {
@@ -209,15 +219,10 @@ void supervisor_web_workflow_status(void) {
             _last_ip = 0;
             serial_write_compressed(translate("No IP"));
         } else {
-            _update_encoded_ip();
-            _last_ip = _encoded_ip;
-            mp_printf(&mp_plat_print, "%s", _our_ip_encoded);
-            if (web_api_port != 80) {
-                mp_printf(&mp_plat_print, ":%d", web_api_port);
-            }
-            // TODO: Use these unicode to show signal strength: ▂▄▆█
         }
     } else {
+        // Keep Wi-Fi print separate so its data can be matched with the one above.
+        serial_write_compressed(translate("Wi-Fi: "));
         serial_write_compressed(translate("off"));
     }
 }

From 3a2bcbc5c7c8443be827c11c9d9a7570259ee331 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 3 Aug 2022 12:13:27 -0700
Subject: [PATCH 0762/2403] Enable title bar on all builds

* Tweak scroll area position so last line is complete and top is
  under the title bar.
* Pick Blinka size based on the font to minimize unused space in
  title bar. Related to #2791
* Update the title bar after terminal is started. Fixes #6078

Fixes #6668
---
 locale/circuitpython.pot       |   4 +
 main.c                         |  32 +++----
 py/circuitpy_mpconfig.mk       |   2 +-
 supervisor/shared/display.c    | 146 ++++---------------------------
 supervisor/shared/display.h    |   1 +
 supervisor/shared/title_bar.c  |  42 +++++----
 supervisor/shared/title_bar.h  |   8 +-
 tools/gen_display_resources.py | 154 +++++++++++++++++++++++++++++++++
 8 files changed, 222 insertions(+), 167 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index decd4816a3..5176ecc9b7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -863,6 +863,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
diff --git a/main.c b/main.c
index 800843e419..35a78c551f 100644
--- a/main.c
+++ b/main.c
@@ -204,30 +204,20 @@ STATIC void stop_mp(void) {
     gc_deinit();
 }
 
-STATIC const char *_last_executing_filename = NULL;
 STATIC const char *_current_executing_filename = NULL;
 
 STATIC pyexec_result_t _exec_result = {0, MP_OBJ_NULL, 0};
-STATIC int _last_return_code = 0;
-STATIC int _last_exception_line = 0;
-
-bool supervisor_execution_status_dirty(void) {
-    return _last_executing_filename != _current_executing_filename ||
-           _last_return_code != _exec_result.return_code ||
-           _last_exception_line != _exec_result.exception_line;
-}
 
 void supervisor_execution_status(void) {
     mp_obj_exception_t *exception = MP_OBJ_TO_PTR(_exec_result.exception);
-    if ((_exec_result.return_code & PYEXEC_EXCEPTION) != 0 &&
-        exception != NULL) {
-        mp_printf(&mp_plat_print, "@%d %q", _exec_result.exception_line, exception->base.type->name);
-    } else if (_current_executing_filename != NULL) {
+    if (_current_executing_filename != NULL) {
         serial_write(_current_executing_filename);
+    } else if ((_exec_result.return_code & PYEXEC_EXCEPTION) != 0 &&
+               exception != NULL) {
+        mp_printf(&mp_plat_print, "@%d %q", _exec_result.exception_line, exception->base.type->name);
+    } else {
+        serial_write_compressed(translate("Done"));
     }
-    _last_executing_filename = _current_executing_filename;
-    _last_return_code = _exec_result.return_code;
-    _last_exception_line = _exec_result.exception_line;
 }
 
 #define STRING_LIST(...) {__VA_ARGS__, ""}
@@ -254,13 +244,13 @@ STATIC bool maybe_run_list(const char *const *filenames) {
     }
     mp_hal_stdout_tx_str(_current_executing_filename);
     serial_write_compressed(translate(" output:\n"));
-    supervisor_title_bar_request_update(false);
+    supervisor_title_bar_update();
     pyexec_file(_current_executing_filename, &_exec_result);
     #if CIRCUITPY_ATEXIT
     shared_module_atexit_execute(&_exec_result);
     #endif
-    _current_executing_filename = "Done";
-    supervisor_title_bar_request_update(false);
+    _current_executing_filename = NULL;
+    supervisor_title_bar_update();
     return true;
 }
 
@@ -851,7 +841,11 @@ STATIC int run_repl(bool first_run) {
         exit_code = pyexec_raw_repl();
         supervisor_title_bar_resume();
     } else {
+        _current_executing_filename = "REPL";
+        supervisor_title_bar_update();
         exit_code = pyexec_friendly_repl();
+        _current_executing_filename = NULL;
+        supervisor_title_bar_update();
     }
     #if CIRCUITPY_ATEXIT
     pyexec_result_t result;
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 4d7d026aa5..6b6f629e18 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -369,7 +369,7 @@ CFLAGS += -DCIRCUITPY_SSL=$(CIRCUITPY_SSL)
 CIRCUITPY_STAGE ?= 0
 CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE)
 
-CIRCUITPY_STATUS_BAR ?= $(CIRCUITPY_WEB_WORKFLOW)
+CIRCUITPY_STATUS_BAR ?= 1
 CFLAGS += -DCIRCUITPY_STATUS_BAR=$(CIRCUITPY_STATUS_BAR)
 
 CIRCUITPY_STORAGE ?= 1
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 849b9c3fe2..fdd0a0341a 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -34,6 +34,7 @@
 #include "shared-bindings/displayio/Palette.h"
 #include "shared-bindings/displayio/TileGrid.h"
 #include "supervisor/memory.h"
+#include "supervisor/shared/title_bar.h"
 
 #if CIRCUITPY_RGBMATRIX
 #include "shared-module/displayio/__init__.h"
@@ -65,7 +66,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     displayio_tilegrid_t *title_bar = &supervisor_terminal_title_bar_text_grid;
     bool reset_tiles = false;
     uint16_t width_in_tiles = width_px / scroll_area->tile_width;
-    // determine scale based on h
+    // determine scale based on width
     if (width_in_tiles < 80) {
         scale = 1;
     }
@@ -103,9 +104,9 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         uint8_t *tiles = (uint8_t *)tilegrid_tiles->ptr;
 
         #if CIRCUITPY_REPL_LOGO
-        title_bar->x = blinka_bitmap.width;
+        title_bar->x = supervisor_blinka_sprite.pixel_width + 1;
         // Align the title bar to the bottom of the logo.
-        title_bar->y = blinka_bitmap.height - title_bar->tile_height;
+        title_bar->y = supervisor_blinka_sprite.pixel_height - title_bar->tile_height;
         #else
         title_bar->x = 0;
         title_bar->y = 0;
@@ -120,11 +121,6 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         title_bar->full_change = true;
 
         scroll_area->x = 0;
-        #if CIRCUITPY_REPL_LOGO
-        scroll_area->y = blinka_bitmap.height;
-        #else
-        scroll_area->y = scroll_area->tile_height;
-        #endif
         scroll_area->top_left_y = 0;
         scroll_area->width_in_tiles = width_in_tiles;
         scroll_area->height_in_tiles = height_in_tiles - 1;
@@ -132,10 +128,21 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         assert(height_in_tiles > 1);
         scroll_area->pixel_width = width_in_tiles * scroll_area->tile_width;
         scroll_area->pixel_height = (height_in_tiles - 1) * scroll_area->tile_height;
+        #if CIRCUITPY_REPL_LOGO
+        scroll_area->y = blinka_bitmap.height;
+        #else
+        scroll_area->y = title_bar->tile_height;
+        #endif
+        int16_t extra_height = (scroll_area->pixel_height + scroll_area->y) - height_px;
+        // Subtract extra height so that the bottom line fully shows. The top line will be under the
+        // title bar and Blinka logo.
+        scroll_area->y -= extra_height;
         scroll_area->tiles = tiles + width_in_tiles;
         scroll_area->full_change = true;
 
         common_hal_terminalio_terminal_construct(&supervisor_terminal, scroll_area, &supervisor_terminal_font, title_bar);
+        // Update the title bar since we just cleared the terminal.
+        supervisor_title_bar_update();
     }
     #endif
 
@@ -186,126 +193,9 @@ void supervisor_display_move_memory(void) {
     #endif
 }
 
-#if CIRCUITPY_REPL_LOGO
-uint32_t blinka_bitmap_data[32] = {
-    0x00000011, 0x11000000,
-    0x00000111, 0x53100000,
-    0x00000111, 0x56110000,
-    0x00000111, 0x11140000,
-    0x00000111, 0x20002000,
-    0x00000011, 0x13000000,
-    0x00000001, 0x11200000,
-    0x00000000, 0x11330000,
-    0x00000000, 0x01122000,
-    0x00001111, 0x44133000,
-    0x00032323, 0x24112200,
-    0x00111114, 0x44113300,
-    0x00323232, 0x34112200,
-    0x11111144, 0x44443300,
-    0x11111111, 0x11144401,
-    0x23232323, 0x21111110
-};
-
-displayio_bitmap_t blinka_bitmap = {
-    .base = {.type = &displayio_bitmap_type },
-    .width = 16,
-    .height = 16,
-    .data = blinka_bitmap_data,
-    .stride = 2,
-    .bits_per_value = 4,
-    .x_shift = 3,
-    .x_mask = 0x7,
-    .bitmask = 0xf,
-    .read_only = true
-};
-
-_displayio_color_t blinka_colors[7] = {
-    {
-        .rgb888 = 0x000000,
-        .rgb565 = 0x0000,
-        .luma = 0x00,
-        .chroma = 0,
-        .transparent = true
-    },
-    {
-        .rgb888 = 0x8428bc,
-        .rgb565 = 0x8978,
-        .luma = 0xff, // We cheat the luma here. It is actually 0x60
-        .hue = 184,
-        .chroma = 148
-    },
-    {
-        .rgb888 = 0xff89bc,
-        .rgb565 = 0xFCB8,
-        .luma = 0xb5,
-        .hue = 222,
-        .chroma = 118
-    },
-    {
-        .rgb888 = 0x7beffe,
-        .rgb565 = 0x869F,
-        .luma = 0xe0,
-        .hue = 124,
-        .chroma = 131
-    },
-    {
-        .rgb888 = 0x51395f,
-        .rgb565 = 0x5A0D,
-        .luma = 0x47,
-        .hue = 185,
-        .chroma = 38
-    },
-    {
-        .rgb888 = 0xffffff,
-        .rgb565 = 0xffff,
-        .luma = 0xff,
-        .chroma = 0
-    },
-    {
-        .rgb888 = 0x0736a0,
-        .rgb565 = 0x01f5,
-        .luma = 0x44,
-        .hue = 147,
-        .chroma = 153
-    },
-};
-
-displayio_palette_t blinka_palette = {
-    .base = {.type = &displayio_palette_type },
-    .colors = blinka_colors,
-    .color_count = 7,
-    .needs_refresh = false
-};
-
-displayio_tilegrid_t blinka_sprite = {
-    .base = {.type = &displayio_tilegrid_type },
-    .bitmap = &blinka_bitmap,
-    .pixel_shader = &blinka_palette,
-    .x = 0,
-    .y = 0,
-    .pixel_width = 16,
-    .pixel_height = 16,
-    .bitmap_width_in_tiles = 1,
-    .width_in_tiles = 1,
-    .height_in_tiles = 1,
-    .tile_width = 16,
-    .tile_height = 16,
-    .top_left_x = 16,
-    .top_left_y = 16,
-    .tiles = 0,
-    .partial_change = false,
-    .full_change = false,
-    .hidden = false,
-    .hidden_by_parent = false,
-    .moved = false,
-    .inline_tiles = true,
-    .in_group = true
-};
-#endif
-
 #if CIRCUITPY_TERMINALIO
 #if CIRCUITPY_REPL_LOGO
-mp_obj_t members[] = { &blinka_sprite, &supervisor_terminal_title_bar_text_grid, &supervisor_terminal_scroll_area_text_grid, };
+mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_blinka_sprite, &supervisor_terminal_title_bar_text_grid, };
 mp_obj_list_t splash_children = {
     .base = {.type = &mp_type_list },
     .alloc = 3,
@@ -313,7 +203,7 @@ mp_obj_list_t splash_children = {
     .items = members,
 };
 #else
-mp_obj_t members[] = { &supervisor_terminal_title_bar_text_grid, &supervisor_terminal_scroll_area_text_grid, };
+mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_terminal_title_bar_text_grid,};
 mp_obj_list_t splash_children = {
     .base = {.type = &mp_type_list },
     .alloc = 2,
@@ -323,7 +213,7 @@ mp_obj_list_t splash_children = {
 #endif
 #else
 #if CIRCUITPY_REPL_LOGO
-mp_obj_t members[] = { &blinka_sprite };
+mp_obj_t members[] = { &supervisor_blinka_sprite };
 mp_obj_list_t splash_children = {
     .base = {.type = &mp_type_list },
     .alloc = 1,
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h
index d965fdc764..7979bc30ab 100644
--- a/supervisor/shared/display.h
+++ b/supervisor/shared/display.h
@@ -42,6 +42,7 @@
 extern const fontio_builtinfont_t supervisor_terminal_font;
 
 // These will change so they must live in RAM.
+extern displayio_tilegrid_t supervisor_blinka_sprite;
 extern displayio_bitmap_t supervisor_terminal_font_bitmap;
 extern displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid;
 extern displayio_tilegrid_t supervisor_terminal_title_bar_text_grid;
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
index 395b11105e..6a2462a399 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/title_bar.c
@@ -39,6 +39,29 @@ static background_callback_t title_bar_background_cb;
 static bool _forced_dirty = false;
 static bool _suspended = false;
 
+
+void supervisor_title_bar_update(void) {
+    #if !CIRCUITPY_STATUS_BAR
+    return;
+    #endif
+    _forced_dirty = false;
+    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
+    // doesn't get terminated after two following characters and the value is invalid.
+    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
+    // but some may be cut off.
+    serial_write("\x1b" "]0;");
+    serial_write("🐍");
+    #if CIRCUITPY_WEB_WORKFLOW
+    supervisor_web_workflow_status();
+    serial_write(" | ");
+    #endif
+    supervisor_execution_status();
+    serial_write(" | ");
+    serial_write(MICROPY_GIT_TAG);
+    // Send string terminator
+    serial_write("\x1b" "\\");
+}
+
 static void title_bar_background(void *data) {
     #if !CIRCUITPY_STATUS_BAR
     return;
@@ -52,27 +75,10 @@ static void title_bar_background(void *data) {
     dirty = dirty || supervisor_web_workflow_status_dirty();
     #endif
 
-    dirty = dirty || supervisor_execution_status_dirty();
-
     if (!dirty) {
         return;
     }
-    _forced_dirty = false;
-    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
-    // doesn't get terminated after two following characters and the value is invalid.
-    // This is the OSC command to set the title and the icon text. It can be up to 255 characters
-    // but some may be cut off.
-    serial_write("\x1b" "]0;");
-    serial_write("🐍 ");
-    #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_web_workflow_status();
-    serial_write(" | ");
-    #endif
-    supervisor_execution_status();
-    serial_write(" | ");
-    serial_write(MICROPY_GIT_TAG);
-    // Send string terminator
-    serial_write("\x1b" "\\");
+    supervisor_title_bar_update();
 }
 
 void supervisor_title_bar_start(void) {
diff --git a/supervisor/shared/title_bar.h b/supervisor/shared/title_bar.h
index 6aeddfe121..092b5add32 100644
--- a/supervisor/shared/title_bar.h
+++ b/supervisor/shared/title_bar.h
@@ -31,8 +31,14 @@
 void supervisor_title_bar_start(void);
 void supervisor_title_bar_suspend(void);
 void supervisor_title_bar_resume(void);
+
+// Update the title bar immediately. Useful from main.c where we know state has changed and the code
+// will only be run once.
+void supervisor_title_bar_update(void);
+
+// Use this if requesting from the background, as code is executing or if the status may not have
+// changed.
 void supervisor_title_bar_request_update(bool force_dirty);
 
 // Provided by main.c
-bool supervisor_execution_status_dirty(void);
 void supervisor_execution_status(void);
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index dc9dbd69a4..e5e543b79c 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -110,6 +110,160 @@ c_file.write(
 """
 )
 
+
+c_file.write(
+    """\
+#if CIRCUITPY_REPL_LOGO
+"""
+)
+if tile_y == 16:
+    blinka_size = 16
+    c_file.write(
+        """\
+uint32_t blinka_bitmap_data[32] = {
+    0x00000011, 0x11000000,
+    0x00000111, 0x53100000,
+    0x00000111, 0x56110000,
+    0x00000111, 0x11140000,
+    0x00000111, 0x20002000,
+    0x00000011, 0x13000000,
+    0x00000001, 0x11200000,
+    0x00000000, 0x11330000,
+    0x00000000, 0x01122000,
+    0x00001111, 0x44133000,
+    0x00032323, 0x24112200,
+    0x00111114, 0x44113300,
+    0x00323232, 0x34112200,
+    0x11111144, 0x44443300,
+    0x11111111, 0x11144401,
+    0x23232323, 0x21111110
+};
+"""
+    )
+else:
+    blinka_size = 12
+    c_file.write(
+        """\
+uint32_t blinka_bitmap_data[28] = {
+    0x00000111, 0x00000000,
+    0x00001153, 0x10000000,
+    0x00001156, 0x11000000,
+    0x00001111, 0x14000000,
+    0x00000112, 0x00200000,
+    0x00000011, 0x30000000,
+    0x00000011, 0x20000000,
+    0x00011144, 0x13000000,
+    0x00232324, 0x12000000,
+    0x01111444, 0x13000000,
+    0x32323234, 0x12010000,
+    0x11111144, 0x44100000
+};
+"""
+    )
+
+c_file.write(
+    """\
+displayio_bitmap_t blinka_bitmap = {{
+    .base = {{.type = &displayio_bitmap_type }},
+    .width = {0},
+    .height = {0},
+    .data = blinka_bitmap_data,
+    .stride = 2,
+    .bits_per_value = 4,
+    .x_shift = 3,
+    .x_mask = 0x7,
+    .bitmask = 0xf,
+    .read_only = true
+}};
+
+_displayio_color_t blinka_colors[7] = {{
+    {{
+        .rgb888 = 0x000000,
+        .rgb565 = 0x0000,
+        .luma = 0x00,
+        .chroma = 0,
+        .transparent = true
+    }},
+    {{
+        .rgb888 = 0x8428bc,
+        .rgb565 = 0x8978,
+        .luma = 0xff, // We cheat the luma here. It is actually 0x60
+        .hue = 184,
+        .chroma = 148
+    }},
+    {{
+        .rgb888 = 0xff89bc,
+        .rgb565 = 0xFCB8,
+        .luma = 0xb5,
+        .hue = 222,
+        .chroma = 118
+    }},
+    {{
+        .rgb888 = 0x7beffe,
+        .rgb565 = 0x869F,
+        .luma = 0xe0,
+        .hue = 124,
+        .chroma = 131
+    }},
+    {{
+        .rgb888 = 0x51395f,
+        .rgb565 = 0x5A0D,
+        .luma = 0x47,
+        .hue = 185,
+        .chroma = 38
+    }},
+    {{
+        .rgb888 = 0xffffff,
+        .rgb565 = 0xffff,
+        .luma = 0xff,
+        .chroma = 0
+    }},
+    {{
+        .rgb888 = 0x0736a0,
+        .rgb565 = 0x01f5,
+        .luma = 0x44,
+        .hue = 147,
+        .chroma = 153
+    }},
+}};
+
+displayio_palette_t blinka_palette = {{
+    .base = {{.type = &displayio_palette_type }},
+    .colors = blinka_colors,
+    .color_count = 7,
+    .needs_refresh = false
+}};
+
+displayio_tilegrid_t supervisor_blinka_sprite = {{
+    .base = {{.type = &displayio_tilegrid_type }},
+    .bitmap = &blinka_bitmap,
+    .pixel_shader = &blinka_palette,
+    .x = 0,
+    .y = 0,
+    .pixel_width = {0},
+    .pixel_height = {0},
+    .bitmap_width_in_tiles = 1,
+    .width_in_tiles = 1,
+    .height_in_tiles = 1,
+    .tile_width = {0},
+    .tile_height = {0},
+    .top_left_x = {0},
+    .top_left_y = {0},
+    .tiles = 0,
+    .partial_change = false,
+    .full_change = false,
+    .hidden = false,
+    .hidden_by_parent = false,
+    .moved = false,
+    .inline_tiles = true,
+    .in_group = true
+}};
+#endif
+""".format(
+        blinka_size
+    )
+)
+
 c_file.write(
     """\
 _displayio_color_t terminal_colors[2] = {

From 83cbbc994616de4dab35d66a49c28e45a0e36e75 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 3 Aug 2022 14:35:28 -0700
Subject: [PATCH 0763/2403] Add BLE status to title bar

---
 locale/circuitpython.pot                | 12 +++++
 ports/nrf/common-hal/_bleio/Adapter.c   | 20 +++++---
 shared-bindings/_bleio/Adapter.c        |  4 +-
 shared-bindings/_bleio/Adapter.h        |  3 ++
 supervisor/shared/bluetooth/bluetooth.c | 63 +++++++++++++++++++++----
 supervisor/shared/bluetooth/bluetooth.h |  4 ++
 supervisor/shared/title_bar.c           | 13 +++++
 7 files changed, 103 insertions(+), 16 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5176ecc9b7..69fa24fa77 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1539,6 +1539,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1791,6 +1799,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 5cebf2fa0f..49b5d638f3 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -449,15 +449,23 @@ bool common_hal_bleio_adapter_set_address(bleio_adapter_obj_t *self, bleio_addre
     return sd_ble_gap_addr_set(&local_address) == NRF_SUCCESS;
 }
 
+uint16_t bleio_adapter_get_name(char *buf, uint16_t len) {
+    uint16_t full_len = 0;
+    sd_ble_gap_device_name_get(NULL, &full_len);
+
+    uint32_t err_code = sd_ble_gap_device_name_get((uint8_t *)buf, &len);
+    if (err_code != NRF_SUCCESS) {
+        return 0;
+    }
+    return full_len;
+}
+
 mp_obj_str_t *common_hal_bleio_adapter_get_name(bleio_adapter_obj_t *self) {
     uint16_t len = 0;
     sd_ble_gap_device_name_get(NULL, &len);
-    uint8_t buf[len];
-    uint32_t err_code = sd_ble_gap_device_name_get(buf, &len);
-    if (err_code != NRF_SUCCESS) {
-        return NULL;
-    }
-    return mp_obj_new_str((char *)buf, len);
+    char buf[len];
+    bleio_adapter_get_name(buf, len);
+    return mp_obj_new_str(buf, len);
 }
 
 void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *name) {
diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c
index ce1080934e..53bd6be3c2 100644
--- a/shared-bindings/_bleio/Adapter.c
+++ b/shared-bindings/_bleio/Adapter.c
@@ -158,10 +158,10 @@ MP_PROPERTY_GETSET(bleio_adapter_address_obj,
 //|     The name is "CIRCUITPY" + the last four hex digits of ``adapter.address``,
 //|     to make it easy to distinguish multiple CircuitPython boards."""
 //|
-STATIC mp_obj_t bleio_adapter_get_name(mp_obj_t self) {
+STATIC mp_obj_t _bleio_adapter_get_name(mp_obj_t self) {
     return MP_OBJ_FROM_PTR(common_hal_bleio_adapter_get_name(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_name_obj, bleio_adapter_get_name);
+MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_name_obj, _bleio_adapter_get_name);
 
 
 STATIC mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) {
diff --git a/shared-bindings/_bleio/Adapter.h b/shared-bindings/_bleio/Adapter.h
index 1dce615a40..49bb4421e7 100644
--- a/shared-bindings/_bleio/Adapter.h
+++ b/shared-bindings/_bleio/Adapter.h
@@ -50,6 +50,9 @@ extern bool common_hal_bleio_adapter_get_connected(bleio_adapter_obj_t *self);
 extern bleio_address_obj_t *common_hal_bleio_adapter_get_address(bleio_adapter_obj_t *self);
 extern bool common_hal_bleio_adapter_set_address(bleio_adapter_obj_t *self, bleio_address_obj_t *address);
 
+// Copies the adapter name into the given buffer up to len and returns the full length (may be more
+// than len if the buffer was too short.)
+uint16_t bleio_adapter_get_name(char *buf, uint16_t len);
 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);
 
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index 426aad9891..59fd1b87ed 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -39,8 +39,11 @@
 
 #include "common-hal/_bleio/__init__.h"
 
+#include "supervisor/serial.h"
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/tick.h"
+#include "supervisor/shared/title_bar.h"
+#include "supervisor/shared/translate/translate.h"
 
 #include "py/mpstate.h"
 
@@ -75,18 +78,13 @@ 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 CIRCPYXXXX device name.
-uint8_t circuitpython_scan_response_data[] = {
-    0x0a, 0x09, 0x43, 0x49, 0x52, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00,
-    #if CIRCUITPY_SERIAL_BLE
-    0x11, 0x06, 0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x01, 0x00, 0xaf, 0xad
-    #endif
-};
-
+// This scan response advertises the full device name (if it fits.)
+uint8_t circuitpython_scan_response_data[31];
 
 #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
 STATIC bool boot_in_discovery_mode = false;
 STATIC bool advertising = false;
+STATIC bool _private_advertising = false;
 STATIC bool ble_started = false;
 
 #define WORKFLOW_UNSET 0
@@ -96,6 +94,36 @@ STATIC bool ble_started = false;
 STATIC uint8_t workflow_state = WORKFLOW_UNSET;
 STATIC bool was_connected = false;
 
+// To detect when the title bar changes.
+STATIC bool _last_connected = false;
+STATIC bool _last_advertising = false;
+
+// Title bar status
+bool supervisor_bluetooth_status_dirty(void) {
+    return _last_advertising != advertising ||
+           _last_connected != was_connected;
+}
+
+void supervisor_bluetooth_status(void) {
+    serial_write("BLE:");
+    if (advertising) {
+        if (_private_advertising) {
+            serial_write_compressed(translate("Reconnecting"));
+        } else {
+            const char *name = (char *)circuitpython_scan_response_data + 2;
+            int len = MIN(strlen(name), sizeof(circuitpython_scan_response_data) - 2);
+            serial_write_substring(name, len);
+        }
+    } else if (was_connected) {
+        serial_write_compressed(translate("Ok"));
+    } else {
+        serial_write_compressed(translate("Off"));
+    }
+
+    _last_connected = was_connected;
+    _last_advertising = advertising;
+}
+
 STATIC void supervisor_bluetooth_start_advertising(void) {
     if (workflow_state != WORKFLOW_ENABLED) {
         return;
@@ -118,6 +146,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     size_t adv_len = sizeof(private_advertising_data);
     const uint8_t *scan_response = NULL;
     size_t scan_response_len = 0;
+    _private_advertising = true;
     // 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) {
@@ -126,6 +155,20 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
         adv_len = sizeof(public_advertising_data);
         scan_response = circuitpython_scan_response_data;
         scan_response_len = sizeof(circuitpython_scan_response_data);
+        uint16_t max_name_len = sizeof(circuitpython_scan_response_data) - 2;
+        uint16_t name_len = bleio_adapter_get_name((char *)circuitpython_scan_response_data + 2,
+            max_name_len);
+        if (name_len > max_name_len) {
+            circuitpython_scan_response_data[0] = max_name_len + 1;
+            circuitpython_scan_response_data[1] = 0x8;
+        } else {
+            circuitpython_scan_response_data[0] = name_len + 1;
+            circuitpython_scan_response_data[1] = 0x9;
+        }
+        scan_response_len = circuitpython_scan_response_data[0] + 1;
+        assert(scan_response_len < 32);
+        mp_printf(&mp_plat_print, "sr len %d\n", scan_response_len);
+        _private_advertising = false;
     }
     uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
         true,
@@ -232,6 +275,9 @@ void supervisor_bluetooth_background(void) {
         supervisor_bluetooth_file_transfer_disconnected();
         #endif
     }
+    if (was_connected != is_connected) {
+        supervisor_title_bar_request_update(false);
+    }
     was_connected = is_connected;
     if (!is_connected) {
         supervisor_bluetooth_start_advertising();
@@ -266,6 +312,7 @@ void supervisor_start_bluetooth(void) {
 
     // Kick off advertisements
     supervisor_bluetooth_background();
+    supervisor_title_bar_request_update(false);
 
     #endif
 }
diff --git a/supervisor/shared/bluetooth/bluetooth.h b/supervisor/shared/bluetooth/bluetooth.h
index 9de82719a5..231fde3c54 100644
--- a/supervisor/shared/bluetooth/bluetooth.h
+++ b/supervisor/shared/bluetooth/bluetooth.h
@@ -38,4 +38,8 @@ void supervisor_stop_bluetooth(void);
 void supervisor_bluetooth_enable_workflow(void);
 void supervisor_bluetooth_disable_workflow(void);
 
+// Title bar status
+bool supervisor_bluetooth_status_dirty(void);
+void supervisor_bluetooth_status(void);
+
 #endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_H
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
index 6a2462a399..cd519c5b7a 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/title_bar.c
@@ -34,6 +34,11 @@
 #if CIRCUITPY_WEB_WORKFLOW
 #include "supervisor/shared/web_workflow/web_workflow.h"
 #endif
+
+#if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
+#include "supervisor/shared/bluetooth/bluetooth.h"
+#endif
+
 static background_callback_t title_bar_background_cb;
 
 static bool _forced_dirty = false;
@@ -55,6 +60,10 @@ void supervisor_title_bar_update(void) {
     supervisor_web_workflow_status();
     serial_write(" | ");
     #endif
+    #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
+    supervisor_bluetooth_status();
+    serial_write(" | ");
+    #endif
     supervisor_execution_status();
     serial_write(" | ");
     serial_write(MICROPY_GIT_TAG);
@@ -75,6 +84,10 @@ static void title_bar_background(void *data) {
     dirty = dirty || supervisor_web_workflow_status_dirty();
     #endif
 
+    #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
+    dirty = dirty || supervisor_bluetooth_status_dirty();
+    #endif
+
     if (!dirty) {
         return;
     }

From eb7ddf52e6000294faa62aa88220ccc29a301956 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 3 Aug 2022 16:30:07 -0700
Subject: [PATCH 0764/2403] Fix BLE workflow and add boot_out.txt UID

Fixes #6621
---
 main.c                                  | 19 +++++++++++++++++++
 supervisor/shared/bluetooth/bluetooth.c |  8 +++++---
 supervisor/shared/title_bar.c           |  4 ++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 35a78c551f..b4bf82cb61 100644
--- a/main.c
+++ b/main.c
@@ -748,6 +748,8 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     if (ok_to_run) {
         #ifdef CIRCUITPY_BOOT_OUTPUT_FILE
+        // Turn off title bar updates when writing out to boot_out.txt.
+        supervisor_title_bar_suspend();
         vstr_t boot_text;
         vstr_init(&boot_text, 512);
         boot_output = &boot_text;
@@ -755,6 +757,15 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
         // Write version info
         mp_printf(&mp_plat_print, "%s\nBoard ID:%s\n", MICROPY_FULL_VERSION_INFO, CIRCUITPY_BOARD_ID);
+        #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
+        uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
+        common_hal_mcu_processor_get_uid(raw_id);
+        mp_printf(&mp_plat_print, "UID:");
+        for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
+            mp_printf(&mp_plat_print, "%02X", raw_id[i]);
+        }
+        mp_printf(&mp_plat_print, "\n");
+        #endif
 
         bool found_boot = maybe_run_list(boot_py_filenames);
         (void)found_boot;
@@ -766,6 +777,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         FATFS *fs = &vfs->fatfs;
 
         boot_output = NULL;
+        supervisor_title_bar_resume();
         bool write_boot_output = true;
         FIL boot_output_file;
         if (f_open(fs, &boot_output_file, CIRCUITPY_BOOT_OUTPUT_FILE, FA_READ) == FR_OK) {
@@ -855,6 +867,13 @@ STATIC int run_repl(bool first_run) {
     }
     #endif
     cleanup_after_vm(heap, MP_OBJ_SENTINEL);
+
+    // Also reset bleio. The above call omits it in case workflows should continue. In this case,
+    // we're switching straight to another VM so we want to reset.
+    #if CIRCUITPY_BLEIO
+    bleio_reset();
+    #endif
+
     #if CIRCUITPY_STATUS_LED
     status_led_init();
     new_status_color(BLACK);
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index 59fd1b87ed..a007219e4d 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -166,8 +166,6 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
             circuitpython_scan_response_data[1] = 0x9;
         }
         scan_response_len = circuitpython_scan_response_data[0] + 1;
-        assert(scan_response_len < 32);
-        mp_printf(&mp_plat_print, "sr len %d\n", scan_response_len);
         _private_advertising = false;
     }
     uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
@@ -282,6 +280,8 @@ void supervisor_bluetooth_background(void) {
     if (!is_connected) {
         supervisor_bluetooth_start_advertising();
         return;
+    } else {
+        advertising = false;
     }
 
     #if CIRCUITPY_BLE_FILE_SERVICE
@@ -293,7 +293,7 @@ void supervisor_bluetooth_background(void) {
 void supervisor_start_bluetooth(void) {
     #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
 
-    if (workflow_state != WORKFLOW_ENABLED) {
+    if (workflow_state != WORKFLOW_ENABLED || ble_started) {
         return;
     }
 
@@ -324,6 +324,8 @@ void supervisor_stop_bluetooth(void) {
         return;
     }
 
+    ble_started = false;
+
     #if CIRCUITPY_SERIAL_BLE
     supervisor_stop_bluetooth_serial();
     #endif
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/title_bar.c
index cd519c5b7a..9326a1f9ed 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/title_bar.c
@@ -49,6 +49,10 @@ void supervisor_title_bar_update(void) {
     #if !CIRCUITPY_STATUS_BAR
     return;
     #endif
+    if (_suspended) {
+        supervisor_title_bar_request_update(true);
+        return;
+    }
     _forced_dirty = false;
     // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
     // doesn't get terminated after two following characters and the value is invalid.

From e7d72b1ebecd5f07b39bb15e6c4f9befbb7ffd04 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 4 Aug 2022 11:33:24 -0700
Subject: [PATCH 0765/2403] Use libgcc from Arch on SAMD21 (it's smaller.)

Fixes #4705
---
 ports/atmel-samd/Makefile                     |   4 +++-
 .../libs/libgcc-12.1.0-Os-v6-m-nofp.a         | Bin 0 -> 10054260 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 ports/atmel-samd/libs/libgcc-12.1.0-Os-v6-m-nofp.a

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index a0a211edb0..4405766d00 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -164,6 +164,9 @@ CFLAGS += \
 	-msoft-float \
 	-mfloat-abi=soft \
 	-DSAMD21
+LIBS := libs/libgcc-12.1.0-Os-v6-m-nofp.a -lc
+else
+LIBS := -lgcc -lc
 endif
 ifeq ($(CHIP_FAMILY), samd51)
 CFLAGS += \
@@ -200,7 +203,6 @@ endif
 CFLAGS += -Wno-stringop-overread -Wno-stringop-overflow
 
 LDFLAGS = $(CFLAGS) -nostartfiles -Wl,-nostdlib -Wl,-T,$(GENERATED_LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
-LIBS := -lgcc -lc
 
 # Use toolchain libm if we're not using our own.
 ifndef INTERNAL_LIBM
diff --git a/ports/atmel-samd/libs/libgcc-12.1.0-Os-v6-m-nofp.a b/ports/atmel-samd/libs/libgcc-12.1.0-Os-v6-m-nofp.a
new file mode 100644
index 0000000000000000000000000000000000000000..56692d5d05632c3f9efea9a376f20e2025505e3a
GIT binary patch
literal 10054260
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ⅈf<^@mEz}XKNZ|4=m$J?FjHB$zk%$A=`
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⁣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
    7gzKnqkzwPP8>p7^8&
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
z
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
    p}bngfU`!Z>QD9llZUO3mN&pTMjk-h
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%0AA$8}HKKhIL+Jwon3IS^r%`#($L=P0%)
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
    $NzpsTW&dCDbsOh+y*w)12C=y3wV3oG
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¥sY8!}HMAQN^!pEF-L+*fdm<69j6K*8~^=jSHy
zCgYRwYdUXne2fde!G~r0JrItMr-sGxGtX(J0P?6XRC{t_rfdU%MFrZE6ACdwqa)5L
z6qvqQXK{RYoG!~57mMTb>TsO9@jI|^{Ix^E@#oH;(=b$f{GI{q@q1QY3iQ&m#2jXADDd$bAkMr0#n0ZrKUE)kL3S^
zDiWa|VQq=On%VKSqg(gwkI
zE%E6_dA8h(xKbWNTqVyUt`;K7HS#ya#u7h@9_9#Xoa$vc`k5=l&9g1>=Rx0C;y;Ze
zHJ12)g#KdrEaD}y06iE4Ut8j0+Be{hnk>Z5c~_#WDo?u5>>_<<9WOQJ|37x
z9^@&D<3;h(__X-kcrcz99~FXLA)@|)2+7r41|p{ydFMD!2g>M-aU3ef;8zCF
z-eYuT^1ui1G2vaRIH`*khUdfeA_f83=mMRcScGAijGwWIFLYlK0&)_b@#<}X$%)Y5
zIl#54Vn%M>&2D2=A8>9&&Ax9{FL~uVWli6g+?WDAZ5B|tLqy)7`WAnuF;69iA)Um`
zL#(o0kt-)t8!KIsQk0~+EBn%kmNP1Qdb`t5?Cy07lc~;RstxH)$-ZQBvNM@JdvQmy
zwY4qfO<=V2p52q~_OknuW&QfKE_i+5afFy_+a2xN-AoR$UV8%c6Ha8tGz%in%9y>h
z*7WJ7eUs4HoFPjTGAyEy9BatFGjm8;+#BU+RK!qj
zg6VG)3jF<%N0}hZj%?;f;650N&3q^NrIoB1iwi>aR7h}&hj8$bW}z1KH>NP7GC7}7ZPJrFAF4xZK`&Ya|ZUWthEf$NdpjKwJe>CLAC6#1iYJ;3t*PFM3n6c*foqHLduRU8
    5wtKBOYVt>+=tR)AMMn97WO5tjfU$X04b!z+=>B|JnBVzw*pk9Ih2`r_MYF1Yv?7Cx81QFQY4fAW9*>6Js$uvhtUWPeujhI0#@6!Y$jk
zf82|JaMYuMfb<7DGF`AED;e04?FT!?8L%VAfE_VE*pWLh*Z~N$AJ{P%qq@dJ3KF`&
zGpfZ0fux9terB@aj;dKZ!(k5_3CY!y!6ML0fJF@a5zcxCz(|09D8Js+=t_o(e`s5=
zO?%)qz4o@c>=#Ys<8JQi>~#!Y_U@s6(_v@VhOJ$joBG-}w{B>5xvGK3_&g73>#TFR
zR_vr(p+B2?KSOKVY5Oe0dVq=81QD)je3UVf1X$qxg@_nHhu_Er!vsUTbpbFr_X-=>
zaPJj%+WmCxbO3x{^X@*^TV6Y7E9~w}=UO)RG}pLSl3UNZ*U_$ldvH^4M|1ZUmkZrq
z0@2_3+(jAHehhBA?{6k`zS9M`2OhT*-fo%Z)4Ll+!d1c-gOqR&{La%Z6W|^J?y;}n
z9@pRnlsJIlQ2)M8->xOMh-3M~TK-ncvAzfFr8En`$asa8S5x9VZq)K;I{ywW@6!3o
zoB%zT1{IE>Uia_@U#-*2wIn|UaSq-)Mj6+@T`0gcaM_&zi-`)QIP(6Ck5UEOcB&H)
zMvpdR#`)PXP|w7f#uQf}8LmP6%LLQjA;|FBvv0xVc@cU;;Tpv-WF_M?p*h2}&AyJn
zJlo8O4yLRHX>Y$*0$iAbyrFOnMXYQZgEZ~=agBS>UY>3*3lhUs*Y_e%9Yn3)VSK6J
z8c#rppU+UZ2Km$PXTv&}@%eF$KYH5Z(|{S@4T!Uj!7FaThkFz(ktVQ=|9)H}ibhhw
zHReDsZW@DRzYM$Z@BKVp^jyEeaE;Yyk8{!lj*WrR%tfaA*e^1N!Zp5x`8SglbTIAt
zag8@IzGsaRq|pPeQC~G2T%)#HZ!0@AuJK`h_^{R`;u?2^x>vn}Z;Zh;GO+@{D!v1s
zTRtwpI90_yxa&OLhCXnOukZ&c8vZO(l1>^TpcUU{DlM{=skDrP@Bv|+$FHdw&Zxoc
z07m4C9Ro
zH#p9eIC8S&I>fW(9CSTSPQx)r+RB8M`XUNUSk4rf;OJoJ|_fv?*
z{tBa+DJAHAmJ}j?w)_WmOXYUN=g5tS&z0#ouLI=&(84@<6s^q{Iyscd;m9e+Y5{Vm
zpO0fDwqN8vv8N-yTJ}f0MyheF75+HZ$#>C9z1)W50(k((200P67RnzGUnFUWFP8rx
zzC<_~mdYJCE|cTXg26Q=pk=J{H~=T_;u;@=g26Q|MwJ9yBl$WHE{7N%uCW+39590<
z@E|*Bz;yvo@gn*ReE@?vsOV;#12BtE;xeP4oN8&YQ;`{pVdO_ooK4k7plWX!8@dnC
zV~Sp8t#D2&)x)tvSUH^Y4V4*Fk1f%hmsu8#h1p{?NBLkxV_!m>fH=;fW;A>-Qh9`e
z2yyTOVnAE&IuAb5;f|rcK6;%8^=ydae#8-zqo-Ng>udn|5mb&W;8R?DU388Hgg6RhJ@3{!4d%oWKZog
z`v^ubme++$n4lJhByKe8Um!BV?Pgtsgls7e)?hCe@sds(gJ#Fp)(x9BcQv_y1-A?Y
zZG2ZxUwk0Uq<5o@nDj#~dR-UscNaz3*4x~)*#%XCU1`l;j==&F*Ph(c+T1;&1tcQ@
zOSU*`wfId`i%8bl>rsZW8|{0saKzjh#w1L#&RtVA0tTObWNnCouFc04;3cPSXlm`<
zP_>}8x^kgsw_Lr&b|OU7($&}9)74^Gs}4G7QGCvdp60gr(XHKGz3qKnJ!i~~S5=o+
zmE(n;RnEQXcOfg@z3Mf5aUEo3Ka55(XuXAq_ZiVeR$k#f
zI~qBQKS|N>7N#Wq7fM7wPvJ0V(dQq?igFroR*axiRES=Q>H{)p*(*kD1}(ZEgrp6%
z41<=9tk?`%HzD7w7_k|&23j%Fi}TNwH5gJd2Ce_W=@!bbpko-c>=h$iC18*hn?Z}f
zl36kG1oVsL2;@wcFJPQA#LJ+?#hUwxmqDu#z0Z<=L36gefV!n}4Rq$nR}nYJip`+K
z2Zs5=Wu<1t$R7}|kWL&c@bcqH#UG(u#B&t(j}|2Yg=*CP}64E6O1H(MakqM8k?yogx-HcP;qMMTA5ED=5c
z0#SLDBD}flbR>$Hh-f556-3oykx(%c6;Paqf3-*pNDA}TA-xv=4wAy&h@_}+wiix8
zbs09CqHZ8yrYaHASq-^)?Ouwc47iS@376Ifr*ORpf1@#n@VNo+Jt~|Ym35XEAj!Id
zvx8wfG?1bJ0^w{_h~fiMd8(X;WD7`4eU{@##u+p01)wKnx_>2cBCU@b|rwbI5C
zNoA%O_nhy9`Q_Bcc`C`Q63k$_8!&tZ5#S5_K3Zl`H&a6?GF`Fqoass>)F
z)cZn8YfA9c!D}91BmqY9e#J;q-TU@6yh{-qc}L4Vjgio^lxs$|Yk3|e`crF2Aity2
zKi1_WGok*^b-v-wdQj&-s`LM>CEx70X2h&1p&ga!W3=Qu<|tzxxcdZ{2QIr4c<*K?
z#Xs-M_~=xiQOO&O9_`DFEBgQ>^}KKMeEnzeuO(T6JTmi`VA?wb8D3lWlbAHAtR<<1
zy(<;WqZRY5)pQDJ`fc&`dnbU0IP!=o@O;p`k{^RKbr7|FjrQV<=wQnHn8&kdFBQz=
z&u9;-PB88HF^|`v#BmLUdAyDG9(G!D$L_~G{_Saxrag1MHz3Y27|i1Ve9)<29`n#h
zDwxON#2(PT3GA0)7yiBTAYABPzriq%&1f$b%;OUFixV3P^Wa*hnQBD#!F(Qm%%c$F
zdp3z4Fpq@`hJkqm`{QE52K(a%`{Uw`Acrex08dnTDJhIoj6Xv1IGD9}(S$F=W0#%5Q7B&NuaHo#PEg|s2DJrigv4EDzb
zuL-ULuZyv<9gKI?WVW-jpo4edZU_}xpqGlRYxMTVt*si~{VlS+I;Y~cdwTZ{ugL%zK}G{c=tYw
zc!g}iu~O*DX}o*KqqQ1|<2bN)@8Qrl-o0d8Pv+fwFj`3T?#)j0?mYzx1A6!FDL#1m
z9uL6>52h65=(`l-IjHEDI5oKTk_0|<3365zsb3+75B>y}`}yGMi470nPeUJevBCJ@
zyQr!8;LpPhqDwD*t{M0(k<0U%m|1)?GGP)|-xJ@6+UB|A}+}70Nd?)tO9deDgY~adku0*gAZX!#F
zV()jRIaB-EM!0;ZQ|EZ<$ogL|@mbqF^
z)UsI1nOe@(vW^nIE{9U$mH0?4PuB8OEzi*MEG<7liT?IwKKQ1CPe
z*4i$=L-WB$>AS-(YAA|E_&36^{q`6A!O
zFw*2YD28M+8V<`V$dAZstkzE#@+xNtw;74b`N+?d669pbw-L{lPoV2@(t~4;d>Bo}
zq!6XKavXB5+fhP9*@Bbg#^pvS4Q
zKk81C2T@uqYmqZu$d5lmZb5!rD$r($%t!uy@>#_9m&Im8+pM
zNBG5_E0b|v2goyMVV+{apD*0GwM@7zMY%kUc!jj!SSchmtCDTVua+2Es1g30*9vc(
zb@Dy*QZKjTxIiAnu|XC?f1&&@;)~=doathD2k|BHGW3@UUG$g9foQ?t8WYhn_PNb~
zs>@o!Cjf(M{1>Vuu$CmpH7-XlXJqEQbpe=hH~I`M!XO;hl8@t}qF^f3(qgO8NhlX1
z*L?6?EoAe-1J~F@op5XwYJ@(F!?8u=jzPgiO2pI>q-f4xsTPg>hYd$_?nVnpeHm@S
z5%@%EM#G07l{*J|ggE#?FhJjhIEcjgAP(xK#0UQ*8yt)e{&jR^_~7%qF&1ul>m`JD
zC`;}~Q=}_NAb-av8h{)&=L)|3UU%vN$x3?giTKD$(m+-MOx!THr$xFgZhD(W!uL$|
zs%mq;hcJPRk_AQ+JXw1*Be;bbV)%aC@6%9|a{=>49eLm^GXcv*oKfNX!9w1R#xi@!
za7HWKc<)M*z9$9R>tE>$6BhARhA+rFiojEcT-Q5
zbT{gx$MnX{i4BYu4ij?*$)Ju=<8$waOZGNd>ot(J4|$>o9PgfOa7W7VzRm{j%=`^D
z!*$8s1MGtjRD787z5z4M$9gx6gtvsxaw+ka;8qr3A9xmqZTSUUGfKX;QogF?TUx%O
zWrXjoD9_eX`R5@$NvFBV8_W0Ca;}yYTGnaF&GD$WLd#WJ9--wrEl<#LgO;sYo~q?(
zTAr@uSz4Z}$Loy&i|>F%B}!?Zd1qh9@hE)rzPL*y!<8AI=wD$V6Zn|NY$UWoTpu6?8Cq
zcO%WX390g!kSD}kzp=<;G85x_)|?ciIme3X+PW$m)KJIDesMdeUPB-CH8s_?%Fr0d
zztJZGoV6Kj4CLIKtdb|ND{caJ`#JbD)vma!F)Z&hpv&F99N#f;x8Dy17=`cTFOQ_>
zF;k*{WGXGP37r51QKsc^gw{NuAPX^Hfr8AjHHorh)8e0qf-L6vqzUgL88xYSH{=keA{_Nz)31~7Vq!r2)E&wpQ;ywaR
zvnwtigbL-S(3v1y{WDR>0X|9ifHhe-i;KkG758woFjcxyI!zuxez9DRu}zn!(ZUS5
z6K%%zuDGWoKXF%F(x1flR`&LB53ig;I+6B56Q;v8+aX
ziM)hwec
z*s%a-3$TNP?Z~#QmZC{)BbqZ!iP)v62NdLHHWdvYhE(3cP$LS$=PU-^UkBlCr`q7$
z?WGvt(A@1?&^JI2dc0IXe;#}OD-wS0_BswHBUIqyZpV5HD=U;S8v?(Tl8n-2&?O)0
z29o+}kA#&W8f3`qzXT-9WrxX5#tt*i&kmDg*kNLZ9VXWcXH3J7W?s20FTzN(33!wi
zttl8U`RR?5&nyD^8R04xRj{T&kBV@JKd=8*xJ|fjJ~(7daJTbEdn}_LDQ$AAxZ6u2
zS>q#8q7aakiB_uap4OJ0)?VyF+r9}@%N<=?V3sx}ENpbRVPjKotL5%>Yj1Dc&pg`V
zF55_9Q(I+e1LttB)6;tnfS6P659c)ZoYCFa<&0E0DsQN>D%AF`6-btKc6GLvwKi>R
zFAE6K148r`XR5R}bad$Loi)(2dl16DMToxY$o27qsut*dKjUQ`%1{oe_Qo#5*Jx>P
z*QP#XG-0dIrTo6t_m*|U%T6|bALxyjeV`iukefDb>1^(6@9He;1!4%vyq2cECU07O
zRogpHF5BF`5ns{WgBlgTi?b?+a9m5*mW`gBu@%Nv?R@%PZXR-nbLSXymr<&9PLdnS
zR$ETnHjz;xG)R?NDk)nYi%jRHUj0%)_c$3&Nsh-)`0L?
zH&_FLi-0f^9E8^~B^(6LEYuCwfCMN0)=3qp$9g8v
z^20zEW>bghCHPN;zx|J}<-CYN(7ul;>)7M{xW}I6Z@&lNLmd6FU!D)FXiC!1>OGHC
z`P;o~7Y4&UQsr-d6XWB!hQd9_-~KrCOfX~j;~r!jHth|DdpwE{Iu-u*suXdLqo5Zz
zgM;LCX4r*)FD?_s_)@_=y3rozqzUGHDa~AD+2!mPnG+Ew7d!i9`|Q)qc|@(BVgAiz
zL&Q3U+$#+2FbmD(yV
zuSoc-fQn^#U$k)xqFof$j`B8j?=yA}V{JBR$H2@C+q7(o`Ws?L#jtF;r`f5_wS?PA
z&%SuAU7e2kCfEqnOcrHmQ&w<({*GO|LYep~w$_(*RCIQ2>ej{?=K}V%v~P9IU$%d>
zwwNlTprdHR1fI<*_qY?i`TTvxJeAy&?)0V~POSPD@fXlC9VC`ha&3^G0pwhAg`2xFMw8RJ>`vRk|Uh7BYI%
zuzGu+4p7ARy)<+K(~z*PfPmtQUCK=UaaNUw7go&>$JQ<%O7b;2PfA5g_d_~`GA&>YWX`YpVIO<
zE&rnB-?e;0%eS=*;fadvXKIw41{Jxfog9qh5*Xdtr$>sR07x1@ZqI0g>!YYBp
z6m;w%wC#BV%NSC%6;?vm)L}ig_qyrKQ%3s@J`Sr9{|qPL*3|%`4DVC4)9|17F4_>i
z?UC!~3&=CUlpTo-6K5G6Cnp;vPZ@2L-hMBE?T7uaU*3I9zohr}wnyrVvyf+kDQiat
z<2-K$EEKo6&ff%<@xMJ!DufqE3x_a9ZHnflLjj*pFB>4DlzsUlB`$M?;
z4$sMST+iYgagAR`1k=U|E`R$!pbrn!RkK=R;<(JTzAgALvQ8G{pk6GkT
z7XF|Y$zjl(A|bReRc4@cn*0X&i99DiM1EYRL(}k_&<%Be`2vnJWeVyVo|9)#*YKQt
z8S%Li!+9MbPoafGo|84mF+3-y;Hn#*lRo4p@|^ICS|{H`FZJ?c92dy1aBPqjsI^cY
zM|_byhcj9%Zy>%zUWNWrxdunWb5etNqvWGy@SNm8)%Ec8@|=7QY6%{`$$3t`gkFZ{
z;rmz2j-?aVp!pCH3CG#@d?Z5ry;@Q9Lmc7vI|o+_Bqw|}(d;McXDBV!hf9qD`ZL4t
z_eg4ob53L`9IIzpI7j^eh7GyN^DK+TUSnA_M=d^z#y*cr0JmQ9%3zish!k#Sn3Ztr
zCG!pg^j&fj^2oy^uD&yxznyw6e>
z^icGjo%SxE~Fx<+RgWmoj5M9o$)$hJZ0)OZB}++cs3kmS-melj<0DC0@UFt>Pj#rX^*p
z4ERZ!Ho%{7!yd4xu3x(*k?Y+{@{+P;b@!Z#y`SkmyhEnXj_)#z*3
z@4Yv!{meO#KQ13q$C8bfwg5NaS;`ak2~KwPsAE4>20pogPww9Clk4YYS2kgMiEqZ+
zCw*dX*K(JZTuaOR-)gz9^0M>ojXuB%#>ZX6#smuA4-qL8Gpb0EKM-|9*zvtHp}?=)1GaD
zDO-&UuWkHum_UDo9{o=-O&r_!@rau`h*~-LiJaldFws+ddh^l9CRWhF=rPaRZ+Ag*
zK9Y|^&(vWPUqE|tMszS`XCm!w?-I0^hdiDK5mf%7^ZF8lG<6WQZbExdb%H6|fgEpp
z*FuT)*&glBroC$rH+2xT?m~O_FrtGgy9#MW~^rlryQJ??GE_(<;6dJro78+vgar(nMfcj4bVzFR!kkNB|}-{Xj5dUQjmFb#v}
zoHT)BW1uv1k?GaYizAaJ>+$$!d;EOZr)OGPZJ2+vk!ONwk9E9y^y7ZsC_x&%it4&b
z4L&Fc!uGfPpzkMIlB~{9}A-e?f#Z#RM0rcpmyd
zDo*E5Q8e7el%zL65BS3cOr=GdnM%u;kIMw4;ycs~XT&kLfK(6|fhO6xvbd!{B2rP#
z{^UgDi+mHqNRypV49P~+3d{dPeneJcLZwR-r5SQP@}u$@*#<6ZzE=Mhi7C
z9+Hb>CEBTzub`KDg;y+4ctwLOfc`>-S}c;^<4hOJ3(#32e}eu}xeUi;LMYQPvhybx
zNQLq&NV^~{+KBq;AAy45BKZ`mq<~a>61@x$shEix4m@!>t4pjL*9FkSF7z3y#2_3l
zk~48pQ9!;GU=k}a$PhtPhlc$~6oj}}?E0cV;RvK+32TIN$Y_GpN1+UCf(QaVNXOVI9qt*QAoujY%o-C
zKZQXmm~fDazhh`XDwINg4~GGyf~m6$zKY>u4ydvZq5g6BkMP!{aSKExz%9T?!rgQe
zDA=drwqsNSCk{hKsH?X
z!t0-E+IWxL!UHIyt-YnC)%AHF!>lOl*V(9r>(IH!y~Otss`V{>tsUJCAeRi#7&XH6
z0L19jw>wT&%`DO%4es@z!2z^EJks6NK;bVgSiZ5f!CkVDgLnQ>$2fQ=3NQ{_cu#=6OodV$`MQsfQH6o95Sn#Z
zho2t<^}H|hn9eF3j-zRt88o3jZ5sEKtw!8y+r9%6C>i&NALA%Or^z_i{TK%wp?lDW
z31&>2km2o@7{VOn5kug0;5kwHF^-?2y*TnsFzxvEHJ13BLD
z{SitW&rlf0U(wz@PHXOGaFwq;a-*2`VE%W`*N<_~T7C>nlqPU|{P$xVS!g5`jAK6Z
z;-)c3Gk5Mn+4;)H3hCe$rQ_pbS%P$1f=6)YKAlFF~fj#JZ5Wt3YjS(9Tz|`
zBuAoFGNgmsdL%X*>sX@+k*@kf@A{{a0Cn6n_(fcg5i|lO0*j_4xhUTb!ZWED?
zE796~xdBImbP)BZkYjMH6q?2j(!p&_Yt(+WwZfZaom`Jz>g8uRE|B|iY>;`-Stw5;
zzDORznJ$*M5nrPAzg?lW}%HI^IBY?wX7>P%uab?^-D!9hah);UOK>
zsNo9rxNPjdZ9b9ntV=T#(#LP(q~RpJ6tEbdR8*#^lU$K`Z&X!o@1EP
zV}9oJ+<}?X^O7*9k59s!o*J^j*GwO>5#=Hb^*e{V%Tf4X`IBd5WnG~p<4KoXa7LKW
z51q(Tc>Gviaxnlp;Uz>b9}zqeKoVnvnAv;|V;GVMpomtFE!JkXc8E8c+nRc;Bv3?u
z>vxOC`n|2Uxe4UkUW`y(Wz8GpUU8?NR5@(cuS{I^641E!xf?a~b~J6?+_7b|&B2s#
zZAYID-F)+dl^1*2$_u`W4Yclpj~xLvVLy0{1e@S>ObwghZ50o~_z$p&0GoKfViT!y
zq5lK#sSTGAB3a&p8_)=}aO{7_05`)CZJJWb0jTAoP>{V!^H
zrIs`jG5=Od)Kgdlq;hIRz8`y-#qTxxg9&rgu?F5*0;~ZS-VJlAh9tRb8t)=-%u)^JpcSi`3=z5%cXy>qK~4TU!z@SMx}_<~2J22(Xt?!YnN
zIS+Ww@w6ZCoI6`K_G5_+c+Np`(i!ladw9&9$rA9KlL1FLAlEx?v?{s4Nz$t}F%|Hf
zZ)mBhwk@Yg9Fq5879KC{jxpM*>9QMpV4C`Y(RWxzU&mDMA|t*z81S5{_abu$c+M^B
z23!o#NeLd|Pfll|D`$8)6z2aVhzf^*)i+;%g&-uQ@b6!_pW1F_raY*ivs`^@6eQ2KZ
zW0LsQ+C1lUhjn~vi*ZXS{uXSMuOX7$r}jDM!>5)$r0}WjW=hh3tVHxe3dg5*9*mLj
zsinIid}>Jz4xicwZOzM&nZ->mld*@aLcYkw7)F}VyEG)ts1=rHkROpcxN4`%TdMB2
zkpKVL`x5xLs_OqanVDpoG?TSUx-sdNZduzV-ASR)mPHGtDsE}EwvlX2(y}U5L0mvk
zHbs=q-RSMpKFdhjvnU9x1cjm?m}EHi%?P_KS#P!
z+7MUCbBL?uB$U?(JwoS$ewgebj!*5yI7+Qthqz9@g?N$FLw~W{jr0N3Q1yIj-wTCd`qX|HM;V?^?KHG-eQLL}xx^2_xPT<&
zL7Zl|8YkiU)SiSvMa5XCg`088N0bbw#TvSSkN`XJ_r%i05BzH*}6iFhQt&?d2#djub;
zq~-RFe7O7`w%u-Wdi3`b+|uY;p`0B9y;b4POKxXZ!}hNB#=f@p)`n(}f*fQBDeuHI
zVg=hk_I0`A$pKl^FoHSD?WE#~)&^YVdyK2xwI2l><@^SCX7AnK1#$>P9vjxIOk&~>
zjHgHTG&U#i&wG#)dhE<+md~7l&nzFR_&`N!JTHVp^k(rw*sy#0^TnnGUS-Vl+R%Jv
z@rZ%IXT-o~Ht?B!v-!;4gBKn8pz;-!((-xyPV-#P$@0Icv_7-{)jSDJS)Ze_P-ThA
zDJths;>Gq*O4zRtSNU$08&!6y>``e}ZlnM6HE(=q(VmN5dEDz%-mH@EW<1UWm9tgS
zk8ywb&f*Spu(-~ScrNmzah-Ypw_ynqcVKSVVCz<+0MjT`uN5a?;-vGPC1rqZL)F*O
z*CbzoO}3@zjl&#V%LW>(UMuqc<4%GvWCCTWzO&p5)V4t~v=RL!n9yMBPDS3|-!k;a
zUrqMs_no}}dD{lb&<^wmRX5nWb5Y{&?-(fYw~_tvxdo;)lfM?ywm~vl=V^w_2f{|xWMgU}JixZ>nl$A99Me!VMj4@l=bd!On-m~cDv5}Kyq
z=U})C|NirPw{QIXzO#=(50}21Z5V!w{^mJJ6Z4!HC~<3a!{{OU&d$U9o8h){`e8Pe
zr=uO`_e>f+@N_Iv;*EWTCv>m=HU`8+6SDBhCtr=L_G=_KQ*7`UIv#*N(1a%bbi^X>
zWKJ^YLJth%+nLLVzKywzteLnxKoc&ZW+ZDW<`&R|Z<+?Nvr(8$>ic9gp_Ipyqfjnp
zr_l`gI26NjELuh6*C>xl6(&@syky#b3gt1OOZq6Yk7~Aj2I(AW!J$XX35auLExL?L
zJK{W9jFNoev@8(ra9U{gLM@UX;^P*}SD`aTHX8L4J-SPLu+)
zog}wGbF$Q+WQvfR{SdQfYr^c`S}M6HpDNqYYMOBG)amj!l+2LdLUX1(h_+>N7D{Fb
z>3n7jcNU%_KSR%R4Fmf;`G3$Xm!&AF5N^v^DFlS8P+&YvoGBb#f!(MKTAqi{*Btm&i}?Ntep+kX|Ogg8p*(B;pkY`#4nck*=2rdIp;C
zGBPfj5G81$XhM|tE6dQ4S%ThEcTLSa0)_Dp;3&gG6Q-brizaMkbBRyDxBxV`1;-3e
z#7Vel!X^wVDhjBU5hvk#_)65fT;yw55sA;DS|qod_5VT9+e`k9Bq}yR8BoH*REx!*
zrCKcadQ%wZM!WzP3@#CiEI=;rKd2$F@E5dZK(n0!3)J(t$O%D@V=J?3Dp7&?$PqWl
zx{V!%AEdhOnaXrM3YW3^DV&&?>OzO4UwOz;y3061fBKC~hkhf=qv|LvT3a-UU&sT1
zk^|r5B!&;%*F(qS-x~OxpF7N^b!HE5j3}>PhRYhB5kXCs`Ax)qW}Qi-S4syfa3y9;N`&@NXH?@COGV4YzjP?VGwAni_i@qrJ1ushlghh$y82q1`?`9Z!nV%#w$4_hx3~4SHMO<3^_{x>z~Kq^
z93caK@PyK4xK@5c%3;3+`}}Z_IGaU;C8bC0|$1s
z=Ar`^z-{d9Xzt$T(aJdNFa2SGfFL|^d~0`CZyRpgr_N4P*Hlzj@O_zYTLW=$@Bt&h
z6EFw}yMrfi9EXM{;0A{f;0bsO!n5>q7z@f5RKBS4Rh4wQV|^4amy|gw3sjC%NoPgY
zPg9APUX!m>xlrX&l`B=QR(Y(-^(s$P*`TsjukvD*pHq32
z$~POHa39`3d7XZuav(h61+6C=CG~|b&yX>dyUW2rW=-M@C#gJD<@;5Bh!V#$I0E!8
z*Yc~hoLkkg-r@=7&o_4f7Nrntidcml@VAMkZEp$sway|{cP@Ot@!
z)tiSxrp>E5B=!6+@jt*52Er3+tE!y^2SdaYc9ZveT1F%v6vXLxzrTfR_ZwU+KIhut
zp$d=lPMym8&9wqR6_R!p*9`wH`hHRWEwO}B@WH0W_7|ev)*F5yoQp2
zdB2PBx#q~z=wYr|nPGXqk3>m@+3hr$_xn_o*GPZf?`!ZGYvpFdb#fvAM*{F)jcP`tyFDieW~@B&xZ*-|Lx+#Fw%z
zlI!RFZa|I8`~3&1#p170EtX4fhVWK=>eiAXBvEk*GC&oS_nXX2d0A*eRDq9741{}k
z!uw6NUF7}#JI)Hr6X**PDs02Cxjccn!Fj&{3(2st27IeLFadjkzUg_tGXX3p?>CbH
z@3)jjvkRh9n#jn&WVF`J{j_Ys9zK8=0*JxR1)x?AJ&51Q-uQY~xhpVCwmS5t*@D!M
z?m0GIhd7tXF*h`xm4$s2LS_$$be
z8Hw`k6YCD{Hm29;Tlw=6i>zZ#GA}VA)=rTTJqiu5ULj2DZ6x|(YDTjD&0H+YZ0{hk
z9u#KLDLhM7QhQux0ZOEl#}e!q2>TT+`59&%Kv=jiE+UtsJSxwiJX3BmZ3Eu#XEAK^
zg(PSTgsVmZ-fuz$UpJF2{y9#eSnk!Fma+IsOc|gBOE6ZLxucLvZ-wvg%pY-_`J>)m
zn)z6Jkm>ECnU!uI%~+xKC
zKZIXR{7a>wYp#Tmq`b4Mb1>G_fcHD#{cagxvIM-}uHDWfKrsgCWTx-rT)_Js@P2!C
zZ!=v2t8bE>cP~=cxZsF~m!xo<1-#$B#|S<|@a@P8VdEm<&*yj*!?IQ>e;sx&+kP@1LrN|m)Lm#bW*lJEFz&n1SGC#u}2a0Hf1>gcmA_E=8VUYic<{wr0q{`o`{F6$$f3ZEjGR99jRMC5C
zM_*$TWM7XXx7bu)>nY&oZfWd;jj^e>cj$)3#-7H`&EWB_XlZTQwz+{z7i}7S2fW`H
zd%jZf-o&FMHhg
zAZ^@9s`H!hA^Q8dh=`s
z(jJ!*Q`HR@K<{?s;`k@F$?&RN;aAzy)FSh!##B7a1AR90gqWy=3dTl(k5VTNeT3`^%7?;&M3xB^AP3X{DTmxJqcEtd?$+
z*9e!w%oh@AEf9YF7RncKlv=q3ah=?Qc##|i{l)S)(o5u7eA1;tBjhr90s7133dAd9
zDSEK1-{dr385$jjs>{=n*@`BX_50&!VtG2U$kUNqk7xt_=>|y95yb&iXpNBqSE^DP`
zEV2T*{647Dxt1550nOlCThPeD$^5aiH;TgM5Ln)es5cN7_!Fq(^C3?<`V>117qQGG
z?O>)3`D!Y>gj0jFtx3L>?XIwd
zC%Ncq2ctZ@;f8SqLfc`sXFJSEXFD97YCFuew!^r!9p#&@GSFA3gmLQ!{GE6(O^n
zjNO@uWfHy=zE~)-XNYeE)%cYd$y^}g#}pebkQ^x*TU<20C|oMhSaCF5GOj2JPLRVS
zD&a#D8G`%1_1YVnziw||E9ku0W)G8u^frZ>yE?t~`1{&__c+I`kPd>5w_r1P%)2^6
ztKYIAad>r|F7Qs2cbE;*AUCylHTIP^HnlD9?b_6bg2tZaEz9XLSle6PktpA6|K8f0
zD1U1W{vkJQ+Sb|3e#?77_yNf>K6Lx@#vIz#xw*W(tqJ>QI;0>6AydeP^~V`kPS1pL
zfH8*Hua3FsCncMn8mc=QIvU$LL&rHE(&{#MfMh4dIktD})~$|HX-n6(ruJ5kePKlL
zha^#jI2qRr=J%`yl~C%2jE$Xr-hKcat`WB@<9g4nIN%0pY-!u>PG?X57$6w(rf@NF;P3E@+e|Gk%aKFoVzcYJpFo-hQT
zU32^8<7L1(9{B5iiErU}!T7q$n^hht{<@#Rn<&qp79Yy5sk~X`K>oVMrVM>BwyDpTJf2S~S2;N*%z3Kp
zP|5eteabar?otPb`!7jU@wIYZ$03aw64C}tF%wD=QxBKOgj7A&F_ht-_wT{<=0PX*
zxcrTo^0-iN4R6jZe4dtdKL}=JY*S$33$lQsOjP%&#}40
zZbxAnJY)?|E(s608;W7sfmZ48kh@Sm7#_l_ZSjz|;*`?iAUP0S3A!+<9`3lm>
zc*rl&+dQFV-Qpo!o>M6#W~mbXkT8+V!%A+%$pZoTJ?mXO
zq>|GtBmO?r`SB29tS%n%Ug(4`hDItL@>TX2iGLQ#{qT?{O`*j@c2HCC5PpYnr@bAY%a3_)g46NSL2ZgL?Szkd;Hh
zL!i_j4~b-l3?LH8eq$g+B$5M_01`2zxWj=&`k8dMY~3}OWQ}7lc8p7Yvnmh+*Cw~W
z(UOA|CRyWIfe8fBQaw_(Wqos?B}qVm!AcA|bg<$g)@mF;BJK)^5$eMpKqBss&tCFu
zci#8{OaxEhN$2txVGGpf{8o|n>4K%H2-3X7{dmCS9S*zIUDV5fW^*)7Q}uV
z{G&s}M1G2sN;qAZ*!Gu-i9}#Cr_FsZOysZVZzz~ZG5Q+{CL;J!4FwaKm?SDx4
zF%ge-{Y7Ibj((g!Yq7{_%t_|a=ov_dp-9PyZf7ndOIg={K+Q;2DdsBHh&*T-#K`EC
zeHV(7*NCj-DGH%TkuTshG7Q!bmJYOv$Wthf8s76vdC|0e4eBxJLwc0Np`R_6BAp{$
zm>HvmJlna_2A#NYYUhc=y3S2N3*=^K7RuX^E)tT=7t8(793wjrkCk%~j}tCtw3x_R
zXigB$^@)bPWs*Dzoyl@M&TWd>ef1Ez4t*wM5;RL?A*(>5Ah;73i^xX0i>76U-5~S%3qLPCJUgyT)u{Qg<+qu
zm`E5sgLQo@R6R^&3l3p1kxS7e2@^@(%hjwAiGK`78P*yR03m0vjl^eSFo1qMiUR@f
z=)v$IH=T7E@wemSm|apw`q9_Cu64JBrgVkEwR{X}w&
z+e#$<5hw!)d6K=x;{Rk_EcbR(82=E401HDp*i$SrAGy3`I3)rhTzk#EEeMx^R9o0%&;=u|
zrhmbRyD%hkGz<~INP@K?G|UYL2(c#3&Q`3RVCH~cC~`_~b0Zw`?T2dGR9zc7Siukb
zAp_LIz21gZ#oOwVD;t{HlWT{^*pocQc8$m$Lp^jw%?4e~;Bb`hl-S*#ko8-4z1#iJ
zqhs-H?wH@u-qO?Jettvrz8kAT?6Cv%BS1g!E7R1v$hY#T|CY0Rk1@stL$^@BV8
zy+vue$m`S3A)t5bV2eWdb{F6u#5?@&xy(N1M)`IMy&RPVD#xh|_KkJMXJ2u+pO05hUXM#u8mC$0uhqQqK180*qtyGh${(q;
zYeMJ_%KG1^{ENyLRlcTjf9)H484Uz5Hhw|nHIz8t8&!T^%Z(ucdWK6F^-pL$P1M9M
z%*!5RjpkRXq+{!T!Z&ai3h)gKzZ-BXF`*1G@6Wh|CeU!^4_0p;3Ymtz#suooOk@M5
zt_epWwryCzH6PE|&V6-9B8@2&s>eUW?U+1&gx+BI2FYludB$G
zVCz~?;6Lv502yYXjK}3T@H0`SuKBnV{UuOtgY7RB-*_1P4F%u$1Ns{ZzVTZq@qBoG
z{57}dcMa0^9FPpXjQ)m#Z~W2MAD;$ne>Z48CK0_|+zaT)H!zyEst-8X(a!#CEUKh8-TcuowIb}ll129Jxv!SIdCG5@Bsfd<=O
z>Y5L(>3P~JL0UcF8;j=;3*V?7G6&XQa7=_GeBSF|DeR891as!6g^DDR*Pi9dKk5n
zg-a%<2%Q-Yk=sz7P$sNpC{JGb!Cg>i81AZ>@*A`*6I$hG$)}K>EmQEh<`}lGxrPI4
zo;-y<%jIbFSz*|(D&;hk;P!=9)v_JsHHHIgzG2<6Ojy_BD7A7c;ySqx@gg}6trpAA
zkzOMI!Y5rSuOhun{)Xc&m#Yx3FnnGXQI2!bBnjn6
z&xCaejxt=7!yqFPUxdK`u5mvO|9iyA0sLRk#e<_;;DGxb+V18qV#uIRqjss(IVY7M>E4S27GB0d6J(eMI>v2cUyb
zaxT!pO!Re}9smwg5$nXUfp0J~6N*#uANwj!GU6!kw{s2tUCiT;P$cGI!kK>H1Giim
zHt=C?Az+v)6=&tdAY0HH=)me8I9yl*A|LO-(54_C+;}$I{J!Fjv@TQxZvtE|To6o&
zFYsrVVMipCjT|is2xnr6v#DX3qkuRazQIXl1AblHV`Fl1#@&N>By(Sl8RL*&jVnSZ
zNoBvv&II>WWg=tvTh;D0>MP?~ykE($`XL(qj8`pN112nQn~O?A0#>=bw!EXVvujg#
zrNh+a8piv`pW~VmlPu(hHq2FYSk6Mh+K$0EueQ0ob2OEMk;q#npb*_KFc0_2>;sG=
z*su1ahVAX`Egd1+*xS2KcIW=C?pTnr0kHWhx}9$7uCB$c)M2mM)Y{m$t;a)eJG=V4
z4HI+~1Nr(+I?Zk0+|xYY+W`0=q`q3^EHB&(fQLo%ERr}F1D5lk%109kWtts&pg@;%Lgbq3%6VO-py@@z^R&)^%7eD!Aj
z7OnrTO475l+;U!#lbijJi-P5UR>_w-;u#ZEmZ>x@!zkygBw5-}->yAW$-@Z+5tD)c=
zw7pi_PSA%Qb3igQ
zRGh<)OVDm@`@1HkKjIueX2%-rv93Vg|9Occ@Oty}(wJxay8&sovG~R9xX|x478w*G
zu#W$!IL8!p0;8K7tlqsSVcLdz;te(f$>TEIiGTn3z2Y0co#7lC(I4le4fa@+b}q7R
zPjg$viU-0u>Z+@UfpY}=+G4_H%i9p=$V$wH(ZauTKy$486q@7YailG(@jCP;$p7KiGf}t^#3aK*HCbk%WQw$4
zjvOK_&`AiFXq8F?r1*XYih^Nb+P%=ZfvS6ls2R)Ywm%hxB9;9c>x1cje&PUt1
zaxQe{$>$K4n;lLngy>GC5MQVg+RdwFIy7tKS)_w~Z6mql>;jtcZVV^@iC|w_@bFjm
z_B2;QmRHwQR9944n_opmWzrv2l6S7dmjNEG<#<1?*kbN|_D$Kk)!RJG4Gm3=;D={{
z<2G-rI<~hqB%2Ot=?LwdC202z%l7c}&|TQ)T1lL&&#+>B{b`&FeB|w93HG&h{hEj8
zC7o4z0$wSsynN_S)cM{RJ(a=Z$ow6f|{zuKA(LB
zx{^KjhiDESNw!`*Ke{38zEL|xVY9QMTaEW}z8!fX*w+>u>=+K(o$gS{cTMJhqVf@y
zzfeh+B-THp@_Cj2Q2B3_|5X|6YwL{H{dltExILuuF_llM{GH0@RKB3{MU}6r1OQ|D
zq3<30%TZaVGNE#w%JnMGQTa)gWVmJf%T->Z@+&I8q4HLh+;)-r_oy`f=Ey&)`CwmL
zOn8J+{NoZ0Y6Bdqt&lb(_Gbfah5y2s+hFTxzrp1Q)oaB@7`PVUjS!|}V;{m>yRlU*
zgS2g^IvYBlWiY#nWs{^JJw+B$=j>eG8AY_jJ$RVKFMS6Ne6
zvv?S`uG;y#$>W~7uPtpnlWBk%cwgJsaP7T)ZOyJ9t~c++taH727h#&go0mKa@aCNb
zGY!0X4WuE?zP9wIP3O(K4&@@(;WX^Nw&Y5W$kQl~3c-*}dCj!tLXnu9j`S!Q1O06I
z0@69M9fuw*n-E)X-WY20g@?B^a%6pM6l85oR2iwU$=o#L;Sr`@<#GQon@hYL;{wNC^DL4PKNTYx{v^(2Rml%Hu`+V!Qcd@@CEJQJnGjQR
z-F@E)o#cIOm!cnUU)v8r8RoLzv#VJARo2CF?=^+-kD*U*Ut2QB
zmIEC0zPuQ&4|2#{7=@4yX5l*EI!64&*0zm?r2froiw(%yU4y)_l6jkS
zn(RoUEm^bD?Dp$gn2e#-n(21aqt|w0jZN-B_JN15JvP6H!M3&|*oN
zy@6lvf$GvXS{{>NZ(EE9ZfUc5KY%311?2{n
zT`FN5*w_BQxJw28zZiBmz=CB$8DieQVMH>4wt9cCdbHIu&1=U%J^!y6z6vJLwr<<7
zfOB9dd)o#)?i{U9=o9$&V-o?7yE8u@#kgROc5{pvMjnrQ-GbrmZM&O1?%3NliO1bw
zA~)gd`8Rz1{Lh6RkGol)5sQ*f0)!8z(r!EeCNc|OZD1m|Q8SV?9`|q$6Zsknv%iO;
zbeKpz%0;fmX=DiD*s!$YFcEna7ijFy*QHz@^75UM9D&1i-{bEk}2{9)E*+2qdXx+
z=(AL~iTqR{1^G1Dfq1&aar7CW+omt@Q<#2b;>Set@ww*6z35@C5Nw_&k0CCXYLrx%
zeQqm_$8i<-G3X2YZj{%^SoAhuW+1iQzcLoImRlQEIaP#6#sNzdcH1N{sO69JEVFWX3b4hF*mLYgpq$W3HjMtluE
zPMD}pI`rcxl!reEjSVHgMhy4hxo8}&NA$LmznhZWOPva{VkwqOtO!8J%RGh)gq(`O
z1rYLHYQ`dSkjwid6bOVE+I3t#H1l}eAAzC;LX^jydPCxI=gO^}^0>diBU>K#6L2oW
z<8cQfyKiuiHye+;yM67TJnpV$z~e5_SaCF5GOj3^l^H$^JSX8p6B&XjZB3Nc;k?-f=YivHLyt}8XueG_a
ztH&v9>uhi9Y(;u|TW?!aTYFpIsmr&twY0Q4wED)iy64pHzAo3O=lDr43{{$gR3ht9
zmXz;fr*u2zcuorff)nf^;9?T$SMKKbBoN|u8UP;#ZQ?ZC4Ucq#W_Wxceh2kEMQ38a
zD0|aUeRqM6^$v8GbgJH{441dPAEwaT=-$G(s%cY4`_6A+{T5**xv=klY7@TQ4a950
zN814Zz#t&(4zCHvaY(!-m|Ow=fmbcq!JosJQNEz^MU}6rd_!fxp1F+O^ynd$g
z36)Q&JWzPtAL6SvK8NwEhy0!9x!9TIFRBc9+%X=o0TlCl0FwiK)0q!d^q$($*VqKv
z*W<`7Hr3a9N?)j=rLhkHMpJKZsDcF*>3-q@d;=rt27HA~C_}ur@r`F-U$em;_ed1@
z?f3zYyE8(m_(s6vo*v&Ac|7iQwZqz{wq`+Qfb8ucgZLzhJLnOjPe|5!=XpZiHLKh8C}NZBZ%{a^hWv8
z4$T6&6`F6Xc&b;zWs~?Id{u
z<&)(YluVJ&;ye#A$Voz`LbFsVQ9e~Ziu5$eL_A$aq0bqTf%2L1EZUX{DZysRXONyP
z<8hcd@)&xaD|CUFCl4bomqjS45Sqd(r2}!5@CUzIno(XO1?XYEBoHr<0mq-dygsKszkX)@!g@ds^~Lq^`rP^%^@a7b>ND!c
z*N>{tuIJ^><(eI!95omW;2IC(K)^Ll!SEqBmUS6%($a@Xn&vL-I06;nGf?dExG!Og
zNbaXm2B2dHl*8BHQz?)8anN^o+<|L6#$IFb|Dgrc0DYEl2VhkE$cXq3v;*L=nO(&q
z#GLXjfi3|LGRHAw<6kb%Z)D+Qx~*8iBVu^mspj#x7o_2F=hi%FdEEcSBPox2;k$5b
z0vx>lGtpow{)-m!*x0D{k0?~i_8mLUjB;n(>~I#a+v$Y&=-1)e1JojuMBOs
z+Eo~~l+_<3YF9LaNk3fSF|zMS;cVXpe)b>Z&?A|jeY``@o^}C;VP`LmW*0=IG+{W}
zS0$UC_A`R9`;0m%Yzj1w2gEuf6vGH;*$+b0A|PZxfC<@oyIkyo1^bVly`O!j`dxB}1?`ne%!Zq`yDfORIbZHn}B5Z#_C$gEAYeUJDBRm`God
zgMsn590z;cGmy4zkPLke{Uw;tVCzmn-rwK3=r12-?2qGP`#T?L+Xl%Ho!6o223wbk
zO4brv^k|7dE|C9+0wl0->{aRmtG{D*ZZa|uCs#T@_C*_5
z$NyCB^_TE{9}4$+F%Finok8-r40qz+KYm~Hjo;3=*B79_d8P*^;<+(U+PTO)IocB_
z9Bhx-9hiU9*+7HsFO`q#`#8U+trDcw10U6*;p{ORaIa&+2Hfilr32rDT6sU>Iyn#V
zA{mGIyI4Mt^b+|V=GRjB0n*FleoVLJ@*%`4q!72tLxne*die!vSB7GLK*k^ui_kv2
z0ty#okS0D9?m+Y@la^4V0JWp2axDI{XP~Me6j_dR&b!c029O9=3>ArZ3)@KiA>1v1
zJ(vfMjQDgX_cBfaNW^q>2b5t3H6!t7aoLdzxYyHrF86c$3ndY+gNHrfUf%>#_}lSzoJN+~-tvw_`DXj~*4{+<
zTWjzSxoOk3&gQ@eFXPPPPkz<*Aq4)I~t~0y60(-!5-Ceuk-BeP}e5kBF_M|Kw)*xGPjwD+yAIfY9
zxYt9WOEDOL3l6DX2@Y8G;t}D_)`3h@nU8|
zDPrp3ea!^N2U0T-tYa9et&lb(+lKAfU%AEzlc^
zt?L5l-HsNt>sebNO$4|_xYriR&^lDYZ081htx|1W19Pu0s;YJzYfY?9w!XAeQoCS*
zDXXnnSnH?{?uUD0u{o_|KU{FHKZF5^h6F|g*h7nP#*=S^mEn0L_(^T>ct-vQeR$xW
zOyff=Vz?S4lSDx9z`crf8PR6uGP0H#!$kCEW2VTeqJ1Kk^&6^4>}nKdKZ2rU58MhK
zPu_uYkt=EJ5W4Dy^e|Vx51o1P0OE34i;@bVk7lK8L|i3*MO-a?D6cV2
zpz~!S`dJ{W(9c5oB92lkw;-;Qdk`;@I_NK!$B|wl+}>lU{2S?I@+asom(L+yA>5k5
z@{AOsXL#V6ol-JBkrAs$`^;V_SP$Hfpve$Ca4*79X!jbj2X2^_t>t6aqI)>wo`dFL
z?!LIPDE|zQd28hK!g&~03?K`O%iyVer-g}@`zvZm40mz7Z
zBAD6iol|=x``?DK(jlBJmO(u{LBiu?cR54&#_8->>EA}rzK8Co-78bxo@v1ed~FXz
zU)v4G9p|z+koRQw469q(Hg8F`uI@#1s{IP^ls!9YKmWmPTesGP_SVjp8`iHi!{->o
zRyH?p>u`+Froc5j(Ima$I7c<9(0&HT{M6hrzoEUQr^Ow@wnZHsx)ZG$z@3c%)AoTa
zZd>Np=mwj~I|Ux(7FJ`p_Y92(DwoLqbGo(Dkn_ZI0^S3L*Zt2J;=HL1ln)L&o}$Q^yWb)^|=0*cYEApR1d-gUVj>qY_P{&g91#WP`y@M
zfC={;b%DuWjrpA
z$InFh0sPxGNQN#%e+ecu*g6sv`1|{e&#%<)m&^HW+pvq9(H~UZVC&99iNC+=p~Umy
z`O)lR&+j^slq?QdHABf#aLmSJnQ)X
zeU(=4Nqm9R`Q_fPdJrc32YLxjQ}DP9cjMoGez*F@&+nJ}IP@?*y4i+d5>B3T(gvOz
z1Ermd%&&o70)>P55or1XoOR~hp`H9
zq7N6VFpiQgR?&rz1-1}#gB}2@_$o#coao6|1%CmDgjMh-GAyL37#Uba7;`QiR&g%Q
zGa0LxigQlJDkh-q3?aBU7*@fJQ|8H?h%Hv}1kx6(AWfLXDk3<_eAo{6I#xkb{a(i^
z7GQ)99s72CB^0Yj1}MT+IElkczKzfCVHIU)vrAaT>F8`2Sj8uxPOO3tYYaH-PO%E=
z4GF9GKX$msunIgANq|)taAE+gg1_E7$13WFf>l5%4OUUVY&x-uNcI~6SOLTE(C9&E
zND9D;!0X$!VE47OZTEae9qYB4vW<(ptJrpOM+f*G4|rmb4QtW>Dkr%gGa0NH9xTxx
z+SmeU!^HxUyy16q*H^bwzcc-iL5dB!e{cX+aQIrfwl#sI-rCp$u!7%#k?18p0>BEs
z(+5}u-?2FoUf3`DyKdv{)v>n(SVe$U94uJHReb4&{q1^{UsoAm6&M%TO=sgfPdO5>
z3f_SNtit;pV9MH94`!@__=OGj^U~Vkw~Y@KtGEbrIbl14wEgWWRzWvzn7!R#``cBl
zf}2O~Nvwif9u5Vo_*H;am}>~EV*X+WnlN#H+#(gLsB#uqBnDqsaRvcg80j3m(cw3T
z^)*ov>R$a5B$C%w+=44N@Y;%B8!N9}TVW7v7q9p*>)f>!(`iVKL=~?{V18k3#l2LK
zn87RVL{Yl66>Cr~@B6#^;(N521&-;>Rl%qohLm;}tC^
zuaW+E#U(gOtyy7FXI5C)wG~`vVb@kXhjjAV3L*h^Z3TaJ`>m}YPuMW=inDN(VXdtI
zNO3aTNW21r;jN-*!SEqBj&-_<;%1zVyNcpSROl*-NB9^OiO*yUcNIl1l*7kE$)z;s
zLX&U?qUMq)DzUcWHMWT58alIB{DT+*Z*4^la(Nd(fp`U-K^O=C?}XBvYH2CW=`1h~
z|53#$NK5XnsbD7h4<5x~_OgJUtp&hQC7djxAKoQJR7;V$Pm4vD*b
z8|Rnv%opGj0X}h{;uGiNC5Cv!B`QC!@>-R~jDz}{G;f>+ksmI9`ODh=b(NOCe0SGU
zY~^b_UfQ;)JdG0PccIEFRsKJf-=&294^-Z%<#x@4d9TB}cLl!NG>G7xe4nq8;GHGF
z9Wd~|VC~#xDC0dEm(7HM)>673#
ze}=O#VeW(8U~43DVID}wU7or|Vmap8p-$H(w&%17Isb8wfhlG@$_85_aR&NJn4X--
z_Lqt~w4gs4lGxwQ)<|5A{)U1(kXxPOJlGnE8_?fRoKrKgJ-@4v^MBqmeEscgjl>za
z&?mrpXaoD>f9e{EhjDKh${LBkLoZ=FgS1wjyOH*v-&wx#+u0h4{2{K9ST@8p67L@3
z8i|W=e$Vb=(br9efV=9OSO%BSb8|5)%a2
z!4f{;#3G}R3rRYge18jj#IdkPJqvq2kb=zVp`4r*IbqyQvmz3XugJ*(Q_zx}r8$dp
zgm=Xv6z1fh0ABhm7$vf{h>7e{SnMldy3g?&z9;eaPDIf8>9aR96d;g;EF9`ZoFT8r
zb79~Wy@N`n;k>Sd;i}v<@0EkIyt22anZ)Gf4*j;Z@CDrEeGQ$hum)S(LsP(Au9L+~
zBr|oACexm_6?-(pbN~*x%iA`0wzed69FmR3c8;bq7yAjXhQP4ncDzeY>w&X+8fSGs
zm5#kq#({mIdvl@r)wc@4f1PX#s-!r4yUl4AZSLyaZVEQFHui1n@qFbwyZSm@P3K%3
z^x`zPw7I7lq(}ZEd6ZL5i-5a4g{>{%F6Z-x8;q~{rnXaBTgt(JR?*A~zCV&g6|Z2%
zR>Suy+HAOPoYL@GKxvldD^=F2T&{AJ%A-{tuku8d8&z&r*{RYz2H`koYyJ}|4KD`D
zFV%d&UG7|uW;`nLy0oe6Qn^j#=_)^{GT<(E#_Jn=RlvC2s`7^_?@{>^m5-`?QswVe
z8tPcI|GVb#l`%HUfV&(6fiP5CVHI>SHQhj4VZdE}P;r;n)eXbewRgD7Z@|}cVE@_|
zj1gfd{3oWj)U3>Rxec-Pul)(q*1z_zNDu5^OOw!^@UQ&@jxsF&+VEVoaQQ$!
zz~&M!!?<{^w!Iihllf+%Vkd2ePZebOBiie5C
zUu0b@_s8e~xeL&>=U+<~=RD)u3jf;g;&=>b=K0sA;V!4%p5X)eGfvIrE^o%U1l;AP
zmEemU4TWQlRna9TFMuJ@E!$;2klo-e5BNX=uiJ*el4{NF`^b`d!1IAv%hX=;y6x|F
zxTVpxho!Ts4ui9N_bjRb4M?Y2u+vyphd=|eVa>`UZvMdV+Mm^akvrA-1q-;#YuA?_
z8_FD=b?hi9j13zYJ(c&VG&W(>
z|5Eb-cR9uj@9r29BMnA_ym54aFCBd)SwAeBcwg%&eHCdR?G6^V+!4=RPRtHpbvKX?
z<`Ec?Y_N5!Q2+=eRIe2SahJax^|lRF2jVVoOVJ~Dc{)CjR_OVUI}jfT_x1E2cOX8H
zQ&ajIh`aoPl>P?d135RPzk#^RuTAN1AU=>QQ~Dc-yZlD&kH5PNzclmv)2VufM+~s$n)_*+);x6a!DW*}k)7#$RE}vmLhqTu|9e4RNY4qTiyI40)
zHHgKad?3|zL*8d~BX5dk)jx&92ND8z`E3}GWG;{|;i^54Q^y088@zp1ld+0TXzg*A
ze~3Ak3xtN}onjR~#@B0Ltm0A{j}@yp5gkY5573XwLQJSkdDXOau!_@=9wk}O&z8?4
zog-~H^k_K|aWYo10wwv<0L=pV4m1m89n$HrikG38j8z;4&2(7B=W%Y93*@WlGa+N3
zX|amak)9?WL!1t)xBzV}RuRSLnj?>+hoNB=wA81=DlW#E*UEK>>*QOAEmmH!oVg<=XoL82EDfcy@v8PLoFDEL^0rwsE&(alw<
z=KvIZhMS1Wacp%;=#`8jmQ*80j}=PM??c`=b@xDsgVU{h
z!+H-I=-k%P0LRr{_nP;1G`6>QY-@M6f=wE}fQvlE7n+ka#WmgYCU0t8jQUagaCWM%MqTbpTk&CzMwL|9-Q$Q>HDVc
zEv^sakB<59H@up1Uc9XGzbZ*q%JLkQg(^!_PEk3B5-;F<yFXalX&DN6
z@5SXaf&TgaVD;vqkZE2&2I~3W$T1yFNQW)lVLOM0?Qb>Gew*?}Oq_I_AF0^FtLSTz
z?Znq#n=g%IXbk4yiA-p)OID@8*JUVDDj`)JD|k#VSoI!w&!;((zXqfp{vl}Jxpk@byp(q
z?{A~8KmOX={%%B?ZL09kK!@`qjA_NmvyT6%*uvNFolnR4ai8ittwW&)p_i~3NFJBr
zF8uq?Z;NmI=zn0(FBMz(3;N@nw1MZwKxyY9^W*U$6DXt)191ZO$Lqsm`le-Q5$4|v
zl-XeWOT`vW!TCL7l_0HNWzFL1g~M3~QDvcs!MVos(_ssx-K)QW58z@8SvZr)SL3R^
zhy-Vf4Oqc&KNPXQ>2Dz{(h!TD$zPCIM7Kws3w11V;0}_27~aNQMiyOb05O<7zav=_
zFvXy9HQHt0jdT`FeJB~1S%MNN1FaO=r5N~B3>bj(8Hm^NnJ1hK`qunyo^jn#wRjj^=KdU?TZ@a{pwR0ry&Nr
zJ1^X5s%*f2ZaE4ILYYS(9sdCO87{WK6)eCOCSWjtCfs69A-)O2haA_D09!Z)eTTn=
z^L1A|)T1JNGEbpIdB$h4MI_fab423Y0X2LKlp4p*WRJ1jhuKvu{w&pExy0AP@5Okw
zmJ}h0iVq_Ln4t-MVtUU*F7JmJIl>GiMq@w^$uNVgQ-FaQ9>q9sko+on00VDzlkuNL
zACXY_kBB4fT_+=1!t@*z&SLdbI6E=bg>S-)H=i1)f
zb82^AmuvKNtj!BUJLL)r@Pb{!3+&e>*`hzZ%}ZS~bn}+R9`~y4*Yyd*g9ZX}@Kkc}
z4XZp50sw@ALT&96s>b)Q6pbHVw*PeS$L%!TJPe9G=1?;7$@?0T_3G!1Oku3^DJq
zxNIiu4J?4h9~;~K4xhV0U
zU(9E_H)bi+b6l>)zioqLs1N=9kO>X8?n>nS{pI`m+Zh%xA79jZSoLgRfBa9y0($XX
z9|{(55%dzaGe|xMFx-WI|M`u_`PuQ?85ZzO^f%A+;6(QGQsUO=hTrnIC>#t6;0--xme|)DvwZkw94aDzFp;eR5q(@Q`x0*o66Hweo*B(D$i4Sp~}yyyh7!5D!;1o
z8!Er8@-~%ss=Qz2Ln`0XC
zgz$TP0{R)TXg6;Su}Bkhl6k!mu@6vWMBjr}aCoJYDI8wS2Cb2-8knWvJ$t*Oc_EtT
z{0c?MoEqi}BJV`G$d_>%8S)t@hGhdI#V7&+cG&9z0H!dk)AE%@VVy5AJM~H`8s-=XS`p_t$ipb9lt#o=#s{`q
zwxhhpc+t)`-meRUknBRa9!IH_TM^gEeTWyyBD7j8KSz3r{0g6Rsl1BxGWi4am&?V7
zR|w&%LxtX$^-_$USB6GMpz8X)W^P6k%c-#gYS!;Hi+-=U^@!;A8ZSpxK`4uUuX&fC
z$*}xh!+cO!Huf;Y;kV#~>PzS!4W^Bcu_uXFV~F7YdK>ED|N4FmDst0Vml5X?;pw`b
zxk&s_)a4vprLe8g~i{VyBGa=+>1
zE<`)Hz#7~!7FmT{emqI5~=DuCHq|@WUdic}(Dr|Lcn=i_)<<
z6fR=g^?WrIFX0S8s9`E%TrDBt$;>36NdL@O1){8Q5#3~uMDj5F`>8en(8#b|W6_1@
z`wA+KNjdnU_4kv_a{OdtNxDkYG0NK+aKpF);qHLh-tK@o>2?Pkow_?_MvX0P+e6qN%v;^wc5+9@DSe)m#NFg;dslm7Ut4=?
zL$hZF#fhZ6{5pnGum3^qrpGx%1vK3>v~_g1w>9G^*j#b-TQ(#PudYitdrv0HJNmY4
z>u7>BpRv4gq&n4FXU-AqKkHdKI4$<*_K92CHg9n+zTwL7>}w|LkpaL*yrrottj-awz7Q)wO!N|Fw5Fw%UU@R!@*zIA6%tmWBh)uxh4H>P>8WdwWYqsH5?e
z1}>Jdv&X3Jf?Mq>=f-8bF}EkT(_q`h{u>8Z`i+3R3g%|9-|Vk^OXI_bgfh;EkIqec
zYvZ%WN;-%&w&I5-B&A431K(PV0w22Q1>=Q1;9G0%aD2KPj$bWpI`r$SQyKWxI^z-e
z)jH#_ul;JxQc=uD8eTXruT%Lol{c&8_ExOFL*;!cA5!_a%BNJO`qjRq<-)gY^pmO5
zEIdVig62zA&Qe*aa)HWvO1vS{L_`}n=~pSOKkdb;ceTo|YdzO{Q|}fnC$9qYcdIlT
zf#E!?zb)^bJkDyBcthW}{HTxe
z3ma@5O)r=-p?aB-6v4u?{5c`_`Aq)
z;qwZ|ocU|;Z`&Xl`ZoG|fC&w@?h54n{e9HepWoN^2I#R3e^VJggfHpajiJTKvyT7Y
zRcZBpf$w=bUt1by>^UGAdIfq3CN$W&b0_lt^Si(|etuuuN1=!5(QVt4PlI#P274?@
zI~Q5E3VI0?4(4myg84Vyb_QwtOZBzA66g1H8a?>h)>ZFI`~jTaN%+HToUy?lxGID*
z#Rd<5_&Wv=_`@fl0Q`ZB2EZT8&0AuZGM5o;K`Y=7wYWUMAAU$p7k~JLX%PE=C>#?0
zz@NLY(14r{f4B+dL&G0P5|JlsaZ2g%2Lisu@*U`mkxs-Gf5<_3GXC&i9MR$rgx@F2
zdX!9&D{-F5_(Ltqlkta1IQk6X!j+lwSF|mY>yVx$=OUeqKk&zVo;-or;t$UwT`6ZE
zu9DXfTl`@>dYCU|hzG_W)1@8S=$In6TS8(A00eFt+c{_t5-7(WN+
z?#CZU%aV*g6r&^+fA|Sn0gX`nVLQ80{DJpK;tzZ_V?g7b;SW?xi$6Te_Im?=sK)sO
z_(PGRBE!KSLOXCt5FBLT4GTc*6n_XQ01@C1#tW~zr?sW0wHIcqj|^&$gBzMivcNYVc)*0Z
zyRK|*-qxXDfos0?BaDQ0=GQo=i{gU;y+jW065pO-ull;mn^lfW7y|qu
zz#lkg-h}wWqQ(0Xe~6{v50w~ogFj^AtLT58^YDk~j8!)JasC{|BBwDYnIzZ&BeLOa
z%80%Xmk#(tIlkJ!AAUg1NY)J8v$6hx@E|nl;GgplijvnqtmL;}jzzg$|8Nr&!_t9P
z5wkYHu7CKSX^U;{fIpmqv|a!3Iiz!>7l$4#&4_b_rt7$j#yuxb>QQ3xhaW)Gu7BV{
zvts!fG{?wC5s#IN5Ra1rlqcg4FX2okniT?*%=&@Jay&|=n7vOAksHycUH`BU<;nO%
z5sp5?@J7#+f1>{~xfVLJqZQWH-2E4z48+W?`D0B*31xd+UhY
z6={vV9nIa_ye&kXIoO}G$NOfPMH=3+ko`zI6RdyW!xBR{$zzXsJU;tE7>`siXZix4
zn!RA2=)EjjXZdpMj}|5`gbfR-Kkt8ErT%`vAMo@M;176D!i9bgmxl5Ml`pD%RplEh
zqkPMR9$oz?`N~ZhtbcIEVPCI**i~NfAMyPd*DYB8fN{VZdokxXZb9@*XFgQXdum5t
zV-sXwk0ZC(RA1{UeW8k$#y;?gH}&?0Dp*jF?%gK9A25<`z^%fB0DlP9Kk#=qSpTq_
z>mTMSGUPMGikYmI#%Ex^JV$x8-7r
zO~to+@>gNDC)=C<+0O1d8p-;-vCu}}&!3)HgdhR1h?|XweT>58Vw#1AO<)m*$SsmJ
z9rt5k5f3<;Tsn~bQxqj*5es;patzAF@E1Am=3&{0RuOp)4?Y5
z>(Cr0q$9Fe#F5aPAb-OVCrS~HGD&_8&B<~EN~XxC@qrGJ8&IAwtWc%G#e-AjOthM2
z7@4L^9DUA^*P%I6_^4JUTs$&MK8y5h$;aoKBfmrsbA<~X=gIwu%VjxADuhcKE2R^0
zmHY*9wQNCojbx*T`BH+|u7$V^N2!&sAg+_|B3>j%K!36P80jVQCw!u%@;uVZgj9*k
z<;#dy2v=@cEFu#_v_L<|8F)f@og|Cl-@^h!n%FJkoPhyXw^?GiAViWhJOAYd{T1siclZaT_b
z0-9uCDy%>xpkQK;J8U@9Pr`(&yVpU8{(MWLJievubbL!WseDVLE#FeEu+HhuCxPddl
z2CRm2kAOMMX~Ic-pwcZ#X858rC7KnkNF<`!;T4IfRAz)RGp&7TuPl7vreYvau~LJG~)*&3)3FM8tivep|Rcoa~NS9_6Ha4a1cTbN-?(o5eMhVl8+#k
zbBQ)C8~6aSGM;}{O?yP^{m=0lY)0VAxA_?#Zye+{F{T#-O@&%Ov
z{@{$qNMHXjT>RlXc>m;ezFj3wNv~j9-b=A5e9J?Jt#IX(N<)UW4%~eG&aV=Jw`|3;mh>pLdI|KU&i4=S{^IPRE5_
zXDlmDr#wIYr}8U3fbahyj*5w`-o2`CtNsE#&LJCkT!uUG?>|33Kh;R&SK5K`d)l12
z6WQxlIlroA;V|%pU@ucl*kCWyU@udm0l{9T!Ct1=ywo*RIy^WYiNEVYZ+7AfT+U(m
z?L8>Wz}9q{Vxcox&z;s}Jr~*Cr{zyaU2*!c-s$Z!5jml?KKCkj0DucaDo$(6xGIhq`@3fm@
z{unzYUQ>tV-`vyMUeVIpv~6=kTj!=OxIUY7V^dR4>vq2lvazSJb2F$cRiVADv(={I
zI~}TM?&|1h1-oU%%Hxl%Xzc6jX=~cn2mN7${l&#zg>$ra5uPq>g~48?2hm=p^Q#u@
z*S$=Q|19@1<-#n#|E$O5pYNO#J_~XA#sUw3yrXB
z#$k4kOZ*(1)4*Kf{rzW0;r5j5KkMve>gN)7{AZ8BxlIwWRwr|bbJLAvE)R!G9PVeX
z|E$9$?)cC8_cA5>!#uNpspS&qRv?u^LWwG&52)o5FFXP2V~>p!b|nI`+sHbG%P|JgmYmnpq_({YJ=uC(01G<*ThWmSnGiOI-S
zF7XrbA^UNO)2kUiwmYD|yIkU3>`J-BH)AryrR5U;4ciaOJ*Dw6(OfcDlo>
z8=D3s;tp-cUNodyE11KOvTGL9H7m_-sIFzmkagIOL95^y=K=>?;vddfdlV5)-n+<7
zeu2+>JH^80D0my$fDQrTjuk9j~278%?Lg!-~?3i<)g1t;R3jKX;
z57@m-=U3J4*S$;=m|ccToLgS{pJYA!;jj3TV=vQ>@#iKMAzuRU2g7p0>>nTWQN&|fT%BfUh(n!Z&2jr2147xb6Q
zmk_Uz!_b4pAL8g4T;h39^|-_d0a^Uv(`b^!-;o}FxCloXE`P^4Y~yl?KZFB$T;gS{
z%ZRVT#|e|~+~E=j=s=bZzzk$q3BL=`+e&^39aLOuMEq==dzd`$%IeVseV0r8S!BY6
zh*G)44b@C6ejeI^%3~9|ibcrmp3mPm;tzb*VnE}a;SW?x%Oy@wX>k03L@mSQ60b&!
zfJ@x+cnoVV(@&11f)}@(Gm(3YYj@d_TtLc|hgEDoH@ea=z5G%t8JXL+W|B9#+V
zmZ~HjD)s2rNlEhxWj!U{kT+1mxBWzwXK1~#NkQ*w&3|3%zoGILEx$wacdPudmV>?_
ziQ{9n=3!>o*IXaCy9D?HhTRSLikMJ_IKUqqE)9+Y?NOAeTpwrQdy+u84R-uexjy_{
z6+7el2=E7IB=3a4ttV9PWJ3oq{!q7g7+fE<)eCEf$|Zgb0a@7Z9c<9y5)Vx~Dwa}yE)Q3#Jk{13c4$D$wLk4P-i$(&?<(}rft(51@RM6rvw3;RtA)YRIIQk6v4>V`WAJMiP6|0gL!|up!tTwxIhk5Q3vfkXnz!fra5XrV{C9mL-ZWG?{76
zup1|ryV@I0g-~E`cnpbnK2{wSWc^m^aMbX;&WcGu@P^!DAbla4fa#&fh$TqmK6x?3
zXnNpl69XU50gLz_A;_;D-ZKfqB2KX}S;T(?(cQC%Z^R~dViCUz`#uJX_;fT_7|)*v
zsD!|tHb3lNEaG{)Wf3pj9g8@x1RMC$YI(}}+`wh>4Xj_OEaHWEcm`G`3rn%i#A3K4
zkIq&IjgLiqCu2kBOJ;0vgB|wNUH8XJ_#H<=>q%{P+B5#`W>E;y)Eh|G@lzXU=eEN5I1(5};x-
zVLsL`)Q%AS{HAV&;Z;~{+e~x%u<>w)590fMJe=WF<&B3koLbK#xdR&PK6N4;)mtwp
zhhh?WQ?Wds9ib2HWgugNZ7U%x{e#^#?OqJDb=U@7Y#|y1Tb9ciek_EzU)(>V
z;{q~$Jr-LBQSVx`_iaWr*s@&C@RK9$QEz7V?-s;ahkQ>A{m|}>hco<(c&?0xGyE5j
z%b1q^6}QW<9ZU3lyf)H*Whk@z_g%#C7#jrm0Xx6Y#)0;DiS}A#@j}RDkU0(UQY>tb
z=bPI^dqFrJ*I!kT3fp6ys2n-hA0I;woZ(9+GAF6y495lQIKv%hICcMyGu&~8JI?UI
zk%1f?+J3M4wTdUl89vazF%#&OsbbGc*naW}l{@+xT6;T(I)kglafbJe_WC3_S>4t-
zFxuW5PCei_!+lbm_O9me@*0a!D7dhw9$p%xx(DlS!y{h@{C0?bJuuBL
zkTApzGjTL+jMqVi;|vG?2YQ2kuAfo7OYzH!_bEQ0_=uw84EOu(8hrn<|87vcN%1zt
zI}{yfxZh7ke~SKs3dHz9JI-))1j2ZAh14P8k_rO-A021-{=^wxUq6xg@tW%E>c;Cc
zJ7o-?*;IOP4aY1bJu!ctsT8iRS-0Z${5c}jirNr*%PMC_2TdTU#OqNT-m=#jNS#H9
zB~L}Ikh9|&N+$B_pq7HS?B{&R_ad|K5oBe1%hqsv@>=AJT#Ma^886hhaB|gz`~mq%
zS&9GgJc*$+U*3oOl)N4J1yX{XLg5sT*_<6zoTsG^Ys=ZO36iDq6-buJX^5B0JviJc
zax-M6N*mVGgq#r5<#&i%&W__CX*oL%Lg`HTB1&gT1NLFIY{LN^B%elpMrK2@(y(dF
zk#`_|u)GiJD)BixIA~>_@Go_~yc2a7$a#n#B554gq4IOIaF~#wYoXkMb+xQTPK|IV
zOs%{c>pCGJMZJt5f05zuXfQk=jY4Xpu{b*pgS_SJco0WwIXiv|`4vJ1`bw$7o>I{RHT&2qnRQBeMb|^62+TMW}18>@m&#hBvA;**=Jb;8Z$q2DY^jOvL~{B
zDsd!IlOI9}y=BSH!oWKw@Rp_bEw%o}l3=`LDV9qV{u|^a$;Se3S;oCY@4#6|RG5O_
zV-G|NN_(+MddspT1Id|KlGLxOTP)7CIJel?^gE86j!vO5%=)PMW*jeOyRtNPN1ySgH*w
zOkM&)4d>(fZ|~!}Vcj~zX>C<-REacsS;W?TTe^JZQ*>%RqtdJkbSEZR?``VYxG6g?
zBzra@FXhyT(Oqud*XBgr$uoU)^X5g~hIMPR8N{Pqnxp;PaCG*Wd9hm14M+Rij&|FA
zJcDA6&ONFeCB-!V@@-ET(U7~H{-%pU4We-kZ(Y^VG1?c@ph$QryNMMiG_m5#&+z^H
zzOQ_xbiS{AyW*P_-*&^WM>xLCqtSn1bUfeA|8;-i`8FyS_=S-fmHw%mw2Jt7#TUx+
z{THqOcf}MxmeKCs_J8Ha7>6@gD&oU=Z}VrEC&&K5pn>7v=s)O%0*jeHt{xd0aJo%k
ze^U;p-Gp2@mNCr7@
zxLnK!J@@OiSfcIyFJy`$88-T+9JzmD=Z-|44OXrj8PV{Nyk4YrK>wP<_)h_n~=eZ3TNwho(UMSF0g41z7Y2szRACP9e(kn8(;1M+MgHZp|v
z?qfuQExQisXnRv4?NJNHbIA5@!@@eWTQDreje4Tdp7?2&ak*R3%AJpA%2>XyUspMR
z2_J)8M&kr~?c9rabpK{z|LpmQ`o5BM8K-`bbs6qQdkg)jS##eQi1u1!`dMxlnY;6S
zor3Fc9xG_D?dAHuF2w%*+6n=!Tx~;rL!+2SqU`~bCTaJ}`~ziYdjR#;+4g`mB(v=S|3J=Mc?^=fvjUsqUp$oKCd8
zCL;{{1n2fBpK!kJ!r23yJz#&a2aubTdiswkenQdN1JEzfaZbn&eWYvaNX^*qM$R4(
zKF=AmdQ4{z2=&j@i}Rn8=0f|U8U-0J-`
zX2u94I0C@h2U3yo0*UB&fwJg$fhJVoXH0@NPaQ9i8NYoXy{uA}CzlqjEuUG0d%xI=
zBPWKO$|-Bhn~{|_&sz(NWqzXxTREYA86{cZn3e94I6X{%BU}T*pop!yaBTk
z*6iel7BmG9tl@SO?H}!H&6+-RxUa3ZcU(j(ZfF5bY&qi}!l^<3%}ojBi)>fC+I$^#
zV++g+8Eg@JGY-R^8C$@ABxg%_41GY|^OK5CDL$k4H$^($P>vH+5$TUhELEJYI7^We
zd$Ifw#ahM1ipv#ODXvjGL2AlcGV+IO75B9G+j-^6x9|Y7Wo8X!%P$wt%yIk)!7fMKiw}
z(nFelD-rwqK}D)unEsTO-=TQ7=G(Cc^iQVk;84XSig0n>>thl4q;a+fbbKV>wliUG
z*d92)s||L$$07rlnb)EPTXEsgS9*725n}kG&e%p!*GAtIiL=Q$xb`@X!3HbWjg07a
z$#b1S-tNXCoP+i#XM=4ocPs*Vn)&a^_MmtPY#F&@5k83aAQ}YQ-bKiX?%!4jQK7QC
zu?U|)d-nych5d3}PJ7!T?LFUE1bPdPXDq^3@GKb5ScJzRmx=5j-?td<#S%T?i%+adw)maTSNlk}`M-V>ytD#b=*<`%bta8cf
zm2Dd22(9gH!#*+XKH-&a_l#qoSxF3K<=~>;@-m_wOpnC)vZ9~o-eM_i~%yL*BQ$rl;GpWYR
zA>81pdf~J*_Wb84?o4tI64Z>vJ-n~+)Qm@6Y`gEpGSJv|cry26=9wtfj6GyWG2;(9
zu>HYHpgDNfGUa%=-!n0TAckZzPPzPdp+HT`M&rVTgPAVFEG7!|iyu
z2XKi|M>neYX2rKEp09Y3;$?~-P;@-pe*Zl{9V+_qyNZu0{!)?Dvn=NzaU$=`3Hv_}
zb@kSCcD0XgZ0+gq9`H2Y*4{qUwI!;BY#VCp-`F*51$uk>yKH=TWXP-O80hQk!uwXu
zs#8v=X&V_C>S-Sxf&2u*%f(xQ!PZ$%Me?9H9`5~$hkI%L1aw_5ns+0Yhnq&OS-0T!
zd=`>Hu`91QJvI76(c_JvymurxplD8qhKqe!nP;NlH
zNH$~BlcWvnVtEyA63fHA5;-NZ5t60yWk{CEYY{J(@8NK>dAR=t$!s3(S3z=y{0>_@
zP^O`-<>78Y&TOII@j>z_$RlofxQlUI
zhsw{;!eK)1;)Oy}R<*Psr$&B=c&+qcT_;asT`$APUnFFWXaL`C$h+|&Y^6y!1KSe$
z0@lsa0{Nx#0OHH!aUAJ#`5(j&mnaW+JzB7SwgqSzJlvBY8u;1fy#@jkxMgljS<8Z!Sjzz|1ucawIMD~AM!>uAAFM9v
z`RJFBe0vx@iPSWd#m~fkuCBNjt-}}h1VWb~0kf$qWD-kx@<%&mfBq_byV(SGh(
zG7fvd)ZsMkuOu8<+G|I*F^CNfE$lC@ulqa?_i;GCP(}rT!}`bK;a-D$
zTqa%%7KUB%aFf_I+TN~sxO;NscE!Wp1-a;Ucg4efZccl<;^8JKK(xJG@o-;~)84Ll
zxG&6UZ&y6rAIWKNS3KO;=Crpf9`0MUJ=!f8$isaC)Oj}W9B|?MzeFqdE<6jy@_oHu
zEh4OL4i)0Iw
zwUeY9>tc!WZus^9S{F*?Ymh9H(^0EjevHG-=G};+bh;#vZ+SOPg5(V0qvJq17^O4i
zhd70^WHoYT%lojO2g#kt&&V7|R>}h8XWIixu|IQ#15f73lc+mi{u?rucf+>_{0c1`
zW^~RAg+p4Zm~9Ptea&u
z3qfIXlTqM<#2#uaN1co!;K-i>_nZcL)d
zfolKaY7~`v`P^js5>%OxJpjBLZ)csr2+)h3gsxwW0JB*ZOP_+a_PCf6SD6^Ozfa0RNv9|`RoA{^X&nA3rhq%8%bJrc5e?D#3rB59)L%uxOq7(rN)Hp0q8k%`W$&iOmK}^
z^`>=l9^TZ`J<{6NH!upP30pXZ$Me2Kp3%Cof3$VDZKRvLzoVU-M~B;jU8maCxkQf)
zWOayR=4!VwYF%4=?I;3Ur
z%R_f}Ki%l}wofcFhW@!VJkub~*swlS**gLa&H@_tr*GouA82hG?&}yF4X@l?^=){E
z8C&8aPsa-cF8O1PAILhrFR9P8vj^b4$A(am~)RQ$8z-xUR)ge=cjELJR6
zoT0ctu~G5$iZ7NsMdQzn{J&_LDh$f~JI~9BCx^2K;Q0^@xSUOx
zk2RmE(50BLtNA+@qLg)@w=sco(SI3SW+pg$z}Q?Em!NlSpR=Q!J-}Qp-d6$pi9KM^
z(us@@sH<1%jNS8a-wpl^grt9OF7OWUrh7$LdzFK0K7t$9a&f0-;tHGfQQV@>ATqX1
zK*tE2#lMAAg35Z>1jr5y&;PeG6-%};70ai?H^vAUGN(j7r?U*l2z(IL3%`M^Y?}Zd
z5}vFv`q1}N!z-M2Ixeq6!wI3jJSmG|WXhAjnYz@er-U>!1(FZ>LirHlMbd*!PZD~C
z7t5>BWLnO`da^Vjr$kyISt_4{WSN|dc)5HRhdV_|ATw3Y#Cn?i1(MU{Ux-_qz>$!&
zV+5#io+;l!=`1+{`!HKB#C{$mHz7YGQz2O?bC5qr-i-Lc@*b@17y%CInJ15-?tHlv
zG7IEAh#w+J9M_@peY9|xd>S$fh4XP%OEYq6gn!euLLGIT{2J?ep@;k;NuY%WDaX1|
zjzl|)9E8rmP=Ie@L$CsziSE;Z0Z1K>
z!-495H6;`2YL+F6-)S<_!`REjI+O&X0ltSs!XFLrN6MtqCi5miLip34_Heave#t^_*k}DVj
zd{Dw|Q}9dd3Esm__uhteO#YrOM)wOYd;Zgk?<`#l%~I$n
z{gQHygnT5M%wIcb3X{A}yj?l^PmdoU@#!+XJei*tKT?u~@s*jRR3-~cu^v;wZ#9v9
zgMq4LA5`z}?62S1X7xw*2&mw5s(q*0?-&e~ltx=0DjxTgYClV<{SxZ*v#f8vUUgMR
z$7o+fi5+N99U1mO|HjN%I^=AfJ|7o*R+qow=+J6FLM7+uKZcd%sic^M!9$
zoY;KdaGcnDi{XnEKdHhn5l(FOV_6I@@8MfghgStEt)1-ucvnE6yz}#Sdi__bpZ`Sl
z`k%v>0`>CuDBh>|ZACLF70Q31=_eHbSMhI(|5D@>VQjBVk#2@e&sIE?i0@OXJLtE6
zlw!A*pQm`C;s+J2KR>>6_qrcHo(xWJ&xd0q@avXgJ{CSRahgn+h~A#{Y{2DXLayHa
zaO8f>HjcR6?i$3S`q~68kSifau4Y_b#wNh_bN%=qhfK;gf^r+}iNq20{(!#>&VOcu
zmFq%Abh}rBD4E;gc8REFFxQVig`LWv%m&+Dt{?wL(4J8sLNLlMY+!8#6W
z$6-w!JeiE3k-y5<$bT4*c%)Y00)ZNS8DC6N2@)20GM4-M&Z_K$ugXq_s_c^KFcyVs
z?EJCR*r{AKc7au67g{xTQLY->n}WUaA2;@a=06+ww-EP+S-RKt$-zgrb?>&i(=k-O
zw&-P=0?}^XX>~h>&K~^t)9TvuZDH
z+kKA1dR$W+M)_K7*EzNAURB!$h75BDjO9e`pQN^~;nw;kjf?7*HitgvN?4S=!<_>o
zgF^$Ip10jaD#r0q$NU1t$%<1I
z4^*sFoUd4|*r2#n@d(A$ipMFgQ#@7ibj1$E9!1At?Vpb;_$h$%a<$_1iXT@r!_HBD
zr>4K8_%+1`6di{(E_7b&K6sTtTxz@30ghK!NF5T}vw=EAy1Ut6%c#G>>GE2%;0!3Z
zn(^@mm5tH+@RN!Czay#5E
zRbFWwdj|NtPs%3LD$u^#8+*ZwbOOU
z)lg3)h5d^sOIo{|Q{3*;WGovzF2x}2^HbBVpAzLQSZ<>qVaYkx&B7H4T3
zoUW^1$wbEM(P+ER>AIY*D_a9Z<3Z^CtF#05av={#pmZ8b?;HGsyyPy5!DgMV%m0XQ
zx-O^da=I>GhqX|3QR@}YSA4Ic({;J|+W6FTx-S2}gSsc&8bR2Lx~}HMPS?e8-f^L`
zZ^G%i%xr6QLTdGTse*2Akr|8KAXIWU%3-)jovzF2x}2`7)%kTfzpg>2>vFoTj*%=q
zOY=)QTG#n?wY72xveR|J2-~#2`UEd;QvL}AQkIw^Q-y396*5CeC7&IvJ)5}+?@v3T
zrSZVp?dOh%J2Sg}!~p;WapPGKO2my-KAPrep)kb3%oGh~F0JSoSQOG{A%@M+mQTMJ
zj+Y^FtP61l5kdAC`^
z7w6XnjSQa&PS+KVvFoTbQNrfm{;R3RAf0_m*eZgbe~%WdfP^Ndb?UX!g*XHlSepR
zm(z7QU6<2!Vd{0~*A?`@OFeb6({(vr7j+HJugllDI9-?D4^G$R_k)?E82881s(Yiy
zCFdsaYKG758)<6?jtu#@$;L*yw!-(Svuy-(0<;egkAGr-wxPEEjquZ|@%3B1J^fua
z?sQ$gp3CXFaP1-Ndwg9D4HKDD)^XG0A>#PD+!#jZ*X71Ax-pEcPS@phT~62KbX^?{
z;ZRvG)mZVaR6Ic|Di7c;8skx7vn=#g3a^oL`so>vDcwp6BLaG|Vu;xEtr!)!&t=?%vWf+|%CE
z+cR?ZicLM8on8Hb4~NrrIbE02bva#^({+vZ44v8P=3(SV1%lIcIbD~VhtbzXIc|E#
z*TrX|uWstZ+non0M+
z_1VeLp{0YRAybh_hO^3b54Lu;_h#2^%1$l`k{lhIooYJM8*A>l*80BIzP6rzudRP1
z9B13nH{9i!IpaD9M%#P4BJgX8l3)3B&+J=Iyb`Ne@93-|5ceJ6V&ar6ZOpC34
z3*n4(PS@phT~62KbY1?JjK6leE~o2qx-O^da@_RcQ_<q<4({+KN%kgzNzb@z3)iE+K1pSuNb#d-DqpxzhuFj0pb@^&=pL)L0S0wtnzhj1+
zuFL7VoUSYQctOPJx}2`d>AIY*%jvqpr=rt!`F-*7>AD*09XGwxbva#^({+*Fy
zj<3t_hpUx4{(40YrQvmQo8p~{UsC*<;sc7`ReV(Omx_*?-hc8qzAk_M$J5ar)F;{S
z2qs%Q*Cv3rtViQ@T6Qu>_5aL?4Kz@W%ZQ?tTV3RN2dNCf%5fXm)SxZe_qgdB7ddWv
zr|WXME~o3lGs@|@oUY61x}2_yE^TfMBYVNuZ8=?6*641h>)M#f8BpvGdv|Y;4Yip)QPO{J6hvYHTzmZXQNA4vDcwcoI3kF6Ym7CafRa1ipMFQqIjC(8HyVf`xS>3->GO<^sy46T
zQnnCrKHXZdFr0x$S2G&ta|*)%&BE;+jwRZj({-Ukv`-@4>g`3puI8qle7XD#=hr2-
z!;33l&c}tEk_N;JS~>?EBb`kb=>K?Jnw)=_gH<|tB@Dfv0XXY*WppeMoRXnN)N_1Y>;=!OZCG5l*y*~?!s93|M?t5RkgK81O3D+^D(5*}msFuQ7Rj&CKMg`9
zccUDJ%f{)toUY61x}2`d>AIY*%jvq@JdBQ;-tl#r?+Lqdx-O^da=I?3>vCfl?Gw@Q
zby@uz5t@V`>^;A(#fy9RA@TIeqN1X;<;#ke7cDIkh^NYtSyY6K
zq@PhBvbLNhg_UTp77Z6Qa$81VZTUAGs$M|*lZYr$Vr-9OOZRo&(Mx}0B^^XqbcUCyt|`E@zJ
zF6Y-3`MTh@2ftLp;P|>c?=Ex)bzxstyif4~#YYr>r1*2iClr6L_$S5Z6#uCh$44F8
zFHoGUI92gL#Y)Bbiq(n@ic1xbP+YBeoZ>pgQx#8F>`?4cbbej_`EX+xyM}RzjypJA
zm(z9aAzfF~BB$$ex-O^dN>|Z8D^~m$`e%Wu9;!Zga?N$RE~6P2r|TMSGfrQ9g8@@B
ziK`cnyc?h$0P4RvfsCbrn42NwdT-kw=`Av)%Fi`
z57zqo7qmUn*|Q~duo&JnFf@{BUDeSs+UJ?h3Iu!3>g(G&;)O04J#f@gN$ad)I@0Ud
z)HW1U>)X=h*P*zT>*(z27_7@q)@LUdWhWc5lZ`>Ld$6^$y*EgjmYcGZOM)c#FFVzA
zrkCSN;&*m^Uu$1mPrujJKN4Pf9eu-kFr5RV?Y&)LziB@Njw)GQ&^@?iaj*+phdbI(
zbGTokN|$7J8cd`n;?Y=_kf)gWcD#
z$Uj44bi|UbkU+h6unqg|Um(XAMO0gFuYcQhb++;z91iwDJ2596o>RX(JgI)VF>-Z{
zu`|uB;fWn?H*NQi_VMWvZg{v4JJmPZ>$jA3$a>DQdv8l`Z)bRj=IRO0)fSw&MPc7Z
z&y#J1BH_ho?zP~cy9eu=ItKc;n2heOwvo}H@LFF
zM7ZaE5X^`YraW)kRFj|d=SNrozP0Jz+i!nu$&SOkADx#OT=Nu^3Q14QpJ)M%53@c8
zZNoE&z*#K_g^48Jp<{{s|D_Tlm84z@qr=W+O7gZFNPU11OOlo?7Rzro3X0@SMqQC#
z&rxNm{6~Gs4(i>$A!by67px{CuI%%wDY70
zrTOw{*ZYJFOmdWXpnNO8)YThSu7vLR+{7vte41rSU1ZN
zsI^pnfcP@`6^>@P{1x%ToPq6is(|GdYb!g{^X{R!}0lV2!
zaVHv#N%6bczNG8XanO!^0p-w+or|tU>R^<`M{yvlD@b#Og5wE^;@7cKB7FqK62`od
zA``8Z>X`A)wd_8%SlzY6At~
zxX=yLONC=Y3&XLYMPrQ(os>H^wAhXfP1~`dlXJ(0mej}*6?VAj{ED^ZrBasHa=Gi1tLA&i$5scu`nlIkxc$i`B|$s!)HXCQ
zDV{p-8n3jhEXYq3d455`wrjkZ*f1|N9*YgphdsQHgC4-W#Y_2HSjWA$VI7mdr;G7;
zHh($1oSs*s23=aUuR*j*vznUPtY0levM2vSqtInkLp@NliTfE&47SPqvn9n#n%$2-
zo0Md{yu5ry`2ka>#0&8l#DL;yQ_2r0k5@`EH6(-8(
zJ=nG1s(g?256_-rUoW=bYkoKNY}^!FV@3%Vss>FmRI$ByeQ$Q(T1D@=b>_OVg+|re
z+PblSv~{>`q?_u_(M@feH~V_USC;yBgI-hzx`^bf7{ydzq7;RX)sTTK&2mAN^<^E
z_K<%hUov(eh!=ZHdQ!1@MMjnhEL(LLR&5-s;7KK-$)@$yCwO_2@=qv`vcwdbD%0Z!
zNQKOh+2NauscqhDHOAMPKkWz-h{Vl%LzolS*B_e`heR|`r(7J(h`cBOphIB|ygB)w9WiuI^wd|u%s9q_
zn0v`NRC%m1tjrv%Kr_cG(9E%l_xw35$1c~Y+!958aI)TN#p4y%E51&#O>vXrfZ`U#
zH!EJGc$wk{6t7XdLGdO8nqNOGe^BvzijOKjrud}dQ;N?h{!Nh=
z6WhU?r@B@$HK5
zQM_333dO4wuT%V};wKb8rT96;FDc%u_)W!!6@Q@kQ$;En*k8X@{G;NZ75}a%c#WrA
zzGAUrx#A4P1&WP|uUEWC@k+((6+fwXm*Q6xzpnU@B9$uK{!bKttN66ybBg~`OyV&?
z`ALdYyD&XNu~Kn?Vy$AMVha(E4r(!|e?LueNO6neI~3ooco7lXxk1x6Dt=P)?^67l
z=6^%cXfROk$D00`;;)Fv=Z7Bm$9xb1U!&=M#m_2!TajO@F?-YTAc~y&7iJjP;bN8S3h->FjDB-PqdG
z-#vgzCf?TGKGe0vipx{A1>R@mjKV
z5cTR&kcnj2DE|{|oO0{X$S)buV9Pp@&e|?6HvS)RyWF1L?pqMIbrAI$aM5NM(O}EA
zA{}k77wz#-*d7VSY7n#!#=i3h3
zE5X8TMlMV50AyAn&j#Bb>qOoaCm|j=Dd*$teYrJFs@#K#4Ab@a+Bm~|(v4E{4l
z@7B-`W1K-#$qOI=we*{DsIbG_XCU={LM+Kk9Cnz)(Q+)2{1PP-`E|IzV2Am+FUfz(
zqDPUHZHGCQJ1nn7zR1V08!`D51mn_=S_yd;`AInj7g?SZawp|ZR$SIUh
zB3>ltVAGT2O;{I8Cz?#ld$FD@Cn2Xq1|eB0-+*M9v>{$DkKwqd$ODj>DsRJjn&hK&
zy6}a|+F^JD&X71-I8Y8k=}h@KBxlKb?89ui7W;XS+>QK<%!6d5G$DVET!{F=@+3?lm9{8`EnED3*=hF50Pm&u0!QXv~ZXiRlm^KUaDm+a%$xFXunq8f_0tz
zAJ+Bq7UVCI1JFW)%*VP>PC+}1<^N$TP4Zc+m&n(!ZkF|sUn<{6e3?9lBU&!cA%3|0
z3-T-ER;*Xb(P+WiVam`l>@Ym=&<;b}gSEq4g(~B)!(5K7Ow11RG&ZTmmqt|fjW4jc
zoX?gdU574;Z^p)ttT3-wvEm;h0UOI((7!Og%!gQf1be@_g4PfeoIywwzmfG5>6H{q
z6o0^Era9>}%q_oWSt|VxmZge0l@n4QKqD}|Y@uW-aU@bDyqRcxxfOW~eAx($FMPAZ
zgTsH~c6hM8Pz;)X-{KP3V5*Qa2a9imp|zwIscI}qnu}nAVIJpjZ^mLxG0Zy+>2+9A
z&tOMkiea9Y?8TnJ6vG5RX3kY79!tllU^PLagC}eWm=+e2aGJ-
zEG`6=n7X#zv1}~7Qf=U?w>=P?d0xi9$9iA3u}q!n8(F58mnTc}V0p=_EU$ImdUb0Owj*+G_ZVfe8|i0h5y3LFxDXDEHKUjGt%1L)f|pT
z$gz9u_ZArc&3IQf7`~wF%QhIkE#os@1K!0VVPCY#P)~#}Df5X^Hik{6s&i+v4BlwW
zYb*7`M!$+TOkX{F#x8?=>Zn-Gw{oJf%K&fFw6V(|ZR|3@?VA5}#RnC?r}(JiV~S5I
zKBf4KqOr@My&al1b{V9NT?SZ+PUrqiS2T7Rq>Wt$XzVgTW0wIMyA06SWq_-+p0Udy
zZR|2YW0wIMyA06SWq`&m12lFS;AX9VmZGuCAm7+!fW|HZGWt$XzVgTW0wIMyA06SWq`&m1AJKP|3J~$Wsq;|GC*UO0UEmu(AZ^w#x4Uib{U|t
z%K(jC259UuKx3By8oLb8*kypmE(0`n8KAMt0B^vj6VJ!Zinl3#QSn~IZz(>k_%p>P
z6#t<3j3N~I}LD~
zrj4Bj>Gv>=?O(3>S1Nu?@n*%_h>-iD;@36*0mbiV{!cainBuQB-{|~MpC6ChZ}S`g
z&egPe4j{ck)8;-$nmTdH|Cb^^SZVj=^OX7KIRm7Mf@wZuW7r7)514)l>^OL=MNBEq
zjuYsg=c9XRC%`E-!PgaQ0)SiC1nSHgH_8Se<)R7&`)~Lvl>?Z-XMe&LB5vC|2Jxu=
z{cqV(TF4(NT3yB*RAeA7bN_8$u&DGNQqjbs`+l|CSOKljYm8>dPqU26
z=M}BoWoYCeU&O4f+oIDf{$LF4#e{3}Z(-o=#U9S6CXq|Ag&vE&w}V)@I_GVD0tpkyNdFx+3T
z;~0~^q(}u^^nGMy+i_NLd$Jz+BDZ2UV#2@NxSWm6B;=3CPs)k7$e_(bX}+YfzbSba
z@(Uz`oI<$~@gg}Jo1P>+SQkqVnoLVMN+-*S$SIMnh?mN}kSvoP#LMLwv@=D13dyOm
z4eM!gE!NY8FJjh?^Lj|m5WW>3C^JxZrttQeC2z#O%@&RtI!Nw7enx5_St+ZKKSwS{
z{9ySo)>Tr0x^ra;^5+>F%6$1O;tPx=^PTUD-*NhG@wRcym=R^
zOS&2T0vpY5uuT|d-hrM(Y97ks1K7{i73O6umOc{)7SBV@DbwabG)|wA_0y^uPY?tD*8-Ey=aI<=rFr-olMcnQO*(vWtb)uOEWSzSLgdsU#T`!m2?>~VegJ4e
ztQm_n=`in1q&u*r{*HryNr!n}awGN(CLJa&Li#<-yA{U;lMeGfiS+-&5}0(j58Dv7
zMvXet(S|eXWDO(Yc$;ja&bQdL!5pBOxF
zU+|b4YMukaBHz*zrGBy6-3blG*~ySJ>>HA}t>N~)IXp+nZ0u1uGA1~&*A5SL_`}Lx
z(PT{fz>u7m*!HvDH=%A=?+>wxviXE#34-ATFP?R2KeYE~*YSRT5zI^b*=QRxCel6v
z$p;mVT?+<7whi}n4337T8~@_-S+s0b+Hb;fZiY%K9Fp|!ZTR8qv$Ol~EsI*AFvPRI
z%URBkjWE2Bu{hK#;bU(?b|1We7(J7-`*_}y=sW7kpHg&oAHP3dDR!R^;!~LC?>fbg
zDc+*^Sw-VK3c33={ea>R6@R7pwBmD$|57yLaZulk#{ru0I6yNV2WZCQ0L^$Dpc#(?
zG~;oAEmTwB8`6x&!DGRU#{q6+KJZLMs>_%*Y&XCQG<~t6vHPICYczem;-?hvP`sN6
zIb-($epmBHwy^8NuyhV}U!h6~NgU6e*
z|DfB0!2bt^`BGk~>&6D#-Z99a4!%VT-VOcx0?6&o
z{zHA=cJ|2&QMXkXZ!{bvB}
zjmQ4OhQ?$6c^le$-0mFE?q9C`ClzTAxAHFSKiyE8z7dNJY>!K>{pYJ_WIXnt$03)o
zjRA2QP1ufg^n8?H|7`zRdkv5OyI63I4w_0>CGZg9HEDxAULqdPL8yb=c~Gzahf6aT`Kgka_N>lIQa8EtTlw
zQ(y8vXCP&K3}Q*VB|=}HUxSum3o?!riTp!xufZ1durGNns_&9p?G%VwZZ*1P#N`as
zvfOIEEy(9q`#ADb@=nNGZncjgUL+&f^d#xT+H$L%kA0dftB^Amx7v?!xKre7keMoU
zD4HgMcBTvI#jGvJ=T@UB>_DkN=}h?{BxlKLGTc0a`hvYnY
z5_RXxhaj^+=&EFGK|Z${?FkEoLxHP>Y+g0;Q^aefAL}}yi%Gp~LH;5sL<(7!{s?_cZJ-D^-41W$=ZS@p=H>DN+BB9
zf|9StCe#*`yc|`mEy$4K<#Ma#ag&qZi>*w|7DN+IU<-OHs|U8Ahp|oAf|NRqX0>=f
z_A{^roq{dGxC4bZz*47~k!OiC-;Ls*h4dNI8qrMr4G?OZ#y5{R$;#R*3LpUM&o5Xx
zum#;~GSio#9&ACI*nTQ;I8r62qb6-Ze8*#`!jfeR;=_rzPnplHMme8b?Kgv
z9sHkILIV+uIY@gj&ArLn8eV%k}e;w8nRlPR1I-0dm{k*4W)?Q+pjy-`d$E+GJ%)YbX=$#q<
z9J3lJ9qqX^=AjqBtd`TUZZ3}9&77V^uy(X>9o@Hi*7&BfuaEJ`U?2UEun~j%@)#fX
z>v+fb;C02>deC3gW%Fa5=xjZHKfKb$_`FbC&x80H<9YwSB9$;qKdxxF*pPl!(>oMj
zYFp0`H4*q=+@fg5^t@ZshIrcXTp4}sZGGCG=aLNXs~h%k;%Bx
zTL38+)fm`+xmT$izyza@vW3X8?NNUf)!C0gCzgU7)zr9@pc?V_D|hV987OG6jX=gm
zsn)V_M7?X#$a@*lV9Pp@j&7G6XVk56yX*(M-Q2M|bl}gR+y>iTuI=V#v`6(G+rupr
zw0AM$whp3Ztj&0AH+Q2w?ibsm%FyoL^@vB?Bl*<-BF_d}mTSBDYNS2f>Op(AAkI4M
z3x@Sj`;5nSa~m2NkL~6m$Yo5+{))%JupLYEe0(d?f6r&Tc^d8UnzX?lFA8zx}8Xjis^q34v;5Hj=Mj$0~UR#AF-UMX^{WXI(wG@OvDk)M<&
zke?^Fo4TaQN=XCa1t5>(*qqm3U1aPolZ5n&#lnG~X*mPy$!4~h62rz;DjbYgCIx7%
zTyDl;P7z+(Q{~lIPm^z>?sWM+;?^GXcgW8W4%j$Q$jdcTK915^Lc7as>BN2>B%P4S
z$hWbsG_%mmkw&zCupEhXmHZZxa}9IaJoy~z&X;qLvp|LrKSVwQnM37b)IH41oU>4_
zLYvj%=6ZH>J$v5SxJKgMFxGp2vXMZAVrK@iDwSX|5N3=^OTDLwrtF^4>2*T$e>he2
zelfhjp8p(Q@I6g3H5O$~tDOSm#ptH(@x1ITQxluy!|wKe&MxKq;k&t>U&c`c!N8hu
ztWD0%xQFKL*q8Lhcq<5ko9o&0-jCkkn1K%|UaxqgBEL;p{u#x)6u+!^pW*|Gk0|~~
z@#l(9DE?mYPl|MOV*CG8jN|iy=>o;cic=L2RIF5-uUM_vptw}=2*uTk$0@E;JXP^@
z#SX|Uq_l7b>n-B((v{->c~6dUkU?;}&&uJ+l)Ka9d^R
zx-Kd5ynB#Gy`I$-Qgwt|C`*TRG79OFW&_({$klaS3*Fg8evw&QIq15UOlYp>hC1JU
zc^tYf>emngT^Hwi-gbLS$>18&{acM!%6KB*4iyYLfX8Y>L7@418uDPJc?TaJsRX%7
zp!xc;0Xw?@9W|l(YND^Lrw%#V(b|n;=;#Uqx$WLav!|8ILFO36Pv2
z|HKxvJ&}(`&TJuL{Xs%+*NkK!St%S+G)LZr_`!yorb?z@>vIK+2Z1N@4TxJ$#Zj;jbF7giglgP=hS*4m!gFR$zZ)}PvqkvZ#|L8-#?Zo@(Q$&
z?TK8J<%yiv4gt$bb2-kE^+YzaJWp!DCODaMaW#r`mgn@uJ(1}rt+NZzk3H8Z`A~Eb
zC}|$XHsF-J1zj7z1iN)~g_*u7R$PfX>Yw~5b_O!15fa6(MFISin^6NPdW|Es4OK(;
zIc=ASUmF~x1L>>d=;eK4w#>`nfRrdK%>boCPZdX$~zaM4w
zs9%dE`Exd?(*;<+V+xR~a~TDm!lvwe0%gYUSSJ*q73UNz8A
zhLGiBY@CW|^s;WczL^LQqU?E|K@h_UnG>X-DKM5KJfBYH
zvjpV%vjmLA2*WGO2K-k9`+}>Vm)-qX@5?U3yPa`4gV~mk$i!q%I|GMm)}7pfH?;-o
z+p1>j5gh+I4{xAP>e$pa6x=BFJs#jV#L#Ry;(pR&lW+>31o&N^y{2{aakJuCisvf6UGY7N7b{+&c$MOHiXT<{gyN?ZKd1O5#d{UMsrazs4-|i@_$x(z
zQ1dwdsQ72azbgv9Gg)r<{DFqgA6TyWGZYsn?rxrC4jgBDRND|grO2VxOq;1Df#1^f
z!-_vsd_wULid1#5-v22IzuA#aDNa_LrZ`K{@cBdT5KS*8LbYP}{GqrreEvYg=K?f*
zEbvDT@&aKXzMV8
zx*hs_+hEI%K?W`*uSE;)#KrR)$kA67mrmeYn(Mir1q
zK{N=q>;mLO_wR=g;(oC`zSr3OyB={{2T|`2XzyE$Xs~5;bd0w5i%5Ia<=OUbL7a8)
z`eXuU-#yvrV*E7Axa9J$aN@~>d=ay@a`&mcEm{D%j7c%Q
zq!OD^8+HvdU6Q2CNRL>u2em?mmCsNzkv|((SIDsP5o8v99a&@9HI6~PW!t|If^q4@
zW)g;p-m>lg)zqbba7xZbyuk437aFhMBI(6Bnj|FBD3&*1Z_+~cYRj;)*9pno>g7$yUnFU?&>;LfZxlW_7t576>L&RZ)=T70tea&y1R0>}SBRax69y{~M|(+x{1@zdqZ3$h)!>mE)XdWGcbQze}!06Etz~L@*$k&9H(ehPi!|VTE$OiG%NR2cmE~
zmXKj3Fme2Z4Jv)UHF5j^c`e8`CXOh-e(H7D7vFn_+e+B+KFWy4(qUrFh@^pBwQr`!p{$$;E#P@rd_}-p#
zpEEmjDJ5%r>#B~9(Z0YWK#?Xd%SwRR7CciYI+3lo^22(1?{mJWaYs*xxg%!}l~-$|oA9Gca;
z2kV=<`+7ZpwvJky_UitD{t2=2=4IE}OZZ+D{c2{KFNI-vAzb(qwwK`QqQ1x3
zOPsyrm2NLF+$gXQT!&9r+A}_;c#ERp!AJgGn!aDr@Zclg@ZbY;?Ij$)&i4MLn8ar@
z(~}ep4?fZ}G+n94;oFomJorGvgAZ(BK0e1c5TO`6P0?_pAZ@r&fQB0d_--vX8Z*?V
zgDdOZsAvYhBmXX@fnU>n&LK#-2Q~l4nl_VIBHwVMK%QzU*5l{jSoV}vn*T;c(h5_K
zpN@Oku7anPv#X%ng8;Rg3G=b$a~!AAggs$bA?tz-cDu(Q1DBH5q6H=R0~!xE$_lhq
zZyP~f8{HI%vq=&o(?(%~mFq-Cbh`&k@ofpav#b0K?PY9ZK-*rfUFBG`$N$pZ*;OiV
z6F@~D1lwM&UFEfCkLPE1c9n%_@B2Y(;r`{?RnCaC$F~Na8n%B67VbkG76#s*6c%&#rPU+8d8ugQ
zDqFFCkB=c&+pwf=Lh~9oG%WH>FT3YP`3JU%kY!hS>+N4j9#`ly**}Y$H?Xcu#hx4M
z${!Gkz9)v(l}Gv9#=j=LNG4tQ7a+jcDL4*f0?=;LVilNB3>Xfa1j^ERfreK
zMr?YLoQid^nc+7rR5eeQM&y*p5F|_Gi;ygn4&F-g01kJG;V_vh{g9j{&q8v#VR%14
zsFkcRc9?#8-WnvhdtMv&A>8*=J|!wl-B2l4+g>{AG{h@V*eiqicaz4byVO@DE+KElbxcP75dN!3x)FKsFSJ>?gyi>CH>+#$$nF%wOF~vgq`m(K_{54j7
zA=BE@!pKRObsb7!uIxOXjvD%rhK1qvC
zVLX2x08yE+NyR)wFs<+YZB5zbSdupMTaHO3#epKo#>K`zLnITaLRptJ$8Z+Md|{Mh
z9u;_6naBDj%*2|RY|e)0bC_?-b|?5)!d3QdtY7iQ5<@UwoAC`LM`x?HEKASurk?JR
z*0#QZQE0ENdN!c!86N5C8#LMb1aVIeX#;hoj=yJQAUJQn^4L+yJ1Y5+R)2s)M_)s0
zZ|6{FaEbIZ_x0(N4{ED=VWUPImHe5lKBv!1J$hs>Qpxjqu{5|eUcTvrcQTZ8?q`M)
zzHRKvPQo%bt^}Qc@M7#F?8kA9E5XIZcSC0NFKSJp$FZC-VjE#dflK4spToM~Xo)_=K>QWOIFF`W@0*ah~rEo5aO1;Di#EV{!
zc4*^Z!MH|{#H9E{){*pscv`@eVH`JNjuYN-!h>|4exklQtbd?&%Rq12NKbE9YezWi
zpX#_N=XA;)LuU{E`{|Ue=_7|G#w0`UY?FK`waa5zG@2bJynh?+$1{^g*@v>OycaO_
zsIBkj9G#H&e8Axq4&ceT8U2&g)-~K(zocfRsc7`CDCY=r%HyNP=qm4^SX3cN0#G#F;^V{sT;jzp`@FQR4J^
zEq=ClC3HX3i9z-4(Gv;Zv?k4Q{4Vosb)ku50gc!Y^r@$oz**4HKCEkcv*@o=5PxQ(`l>-M(Xi_oE$i
zN@fnO`69Z;dikdQ4xw2Wp|8J#4vy-hLvHwQLLOeeui;IdO3?QcUcQ$bNWF;=%!*h_
zWkw?DGjZo9p`e17@6Em>DOd{W6PxYjTgknYYUGQYOC^ZB3xaW3g<1(A=SouQa82dO
z&rMyLT2gWb;sx>))`h~E7K?;#oRj1Ttg~lDtU^wStVYYFat$QQqzUnIAr)KptcX8>
zrmSC~JeSo$zZCyE=m
zCy8`9#S+DxCNupyNW+=;E|#Uzzh+sg_*#>h<~R?y_O7C2Dlr|Y$@fD*K%7EW9|mZ`
zpO+h+av?YTEJ%mMDWrZs3ptyy#8Sfve={3ZVVJCl~dN1H{-dOHxH!j*l0+OQdz#Xd?xS9)GL+z9hXb!8teZR
z89o!9K()Yu#eLeKS5~-V$BfjDX;X;R3&fjN4*K`PX+vX|6i(Vj9rLdjwhZ6jM4_CL
zD4YbR;1t;7Bb)UZ_8a!tZZ$5T7TW?S*Q!0eD2ZkOdioc6wg
zl6~2MI9??2LMe}z$dvN<42e${u&X5U;$2b$c9ofjXK?04tZu=23)^(yAj}Ns8r-pI
z1@*>F!_|G6>W%hy(r~8wq(xYO-QA=89V0yh{ng;pCo+%k>d|!jXislvPyfd1-kx@F
znn0p|pn7esUC>BOgabU>L?CIxQI^tV;hI`t3dV5CBUa_gCv$Lx|@aB7^sc|=~
zTbISXU^?{Ql{&@VXD`DF<_T#wxf_Y6KQ2*k5gPm{iE8RDkgS_dZdxPS~74J~|qT;=ZqzR?`D}{6ZN~#;6
zJiS`+IwJPpsL6nLYX04dP^}sr`fNq|OVStk3dR3bgw9}Z`vmjJvwt`RqwhHW8d`%a
z|6C-4fXmDTDn=-W(_=!Tq6L;Q%*VoK^6uoQm(Ja8^dsGF_c)aUm~bT4U$KoNZnwJz
z@u+V8fD-TuL5^x+{@X$KW%lb-psjbJ0kiEkxQzyAY3V_h~4V
z79fw?Wk1;MQa5kwAnF~43pc}v23vME($V(lH;O|s?eSmOws#5Qwhp4+acFNWzhG+C
zqU|j}d)zPXANAh0y^kOsZSRd}?`z1j!IoW%jA(mxk@k50YL4$3t6zRz2>yhu~2`dD&a_|doQi2mhbFzD$`NiYr
zLmA=8$8FJQ!1Bz;%VH0Ev2C{xuJMlj$CEpDV4Mkd)LKjmQrNRupTJc?a&lfdHiWz=
z--kRbCLQQ6=#pR0l;nNXK_c-dnJkm|-H4q9LT{A!KD+
zOlr72IRW`1AHr_Lo?&fK5-5
zR;-H+7kgUz(C}nA8aXA>1<6wR5+uvyHHeqXJviJcax-M6N*mVG
z&Jfai9Vk;!ccy$1lCz`%IkROe_VXaQ4fz>45R#RK4}Olk74d`RVyvrVGTNML_~Ylv
z1E@P+Eb-ipx{vtzs
z-XLVMZs*tuUPTD}~d~*x7XR
z(K2{ZoVT-7*Hry
zft=}B;^%nJ#Y#zkQiaqU=4|zp5TzceYApGDFeR9z6yQK2zWkpJrUyRQBBo=EdK>s0y3-4t7C8YRo%&3G>{_)^+
zpw|r%%A_=kiv+io&5eN#K0)dzuX)}ziAiZc;uXet_ChHbQhXth)2CoeQOT-nbV_#J
z2DUy%V`K5B@Y=M2Z`SsRaR2ba{TbH#viW1`0aIxHm|k94G3`GYBQt{VG
zGA}+alPr$EA(PC{pfJ8X1M7(7l_v}0UEouREB+L|iR{aE622gF
z@dG{uB4J;&n^5P&7fkl+Say@DPH)U7Am3!EkL5dV3|}hLjS#8VAkHA-Gk*>dLUo$I
zL~*6!YQ^If*DJnGu}yK4;(+27#WyQnqa2k10N>_>|%^ihomt8pPBybM>OWnX4CAicV*H(-mhanz?$BZ|3R+)@uG@
z#pQ~t6xS%4xq2bLUeji-UZl-jy+AWpFVM`@3*4-7XDObmXy)ogxtXgMc(LYRp?H|5))c
z#os9YQSmQ|B$?&@Ca4bp7AbN-HPaP}vlR~|;%oc}B0d$5Qe3BKIOvhzp=qOhKzdZu
zX6|03|AT3?Z@B1@zEI1J9R=xYHEp=*A$PmV-=k{t9RMSgnH-pXer>zn5X@KR0lITSgvLN{P(;m`k1J!Urkk-tI^MMD+)PcHrgI9V1Cu~02#Rf*q%@K=X_F$L*rK9>ARvmMC?Lbb
z2MCB0Jb^0kgvYF)qN1Q6s37nMR6ykaefz9^?zuO&Y0`nFaP}|ve0x}XoiS%v-`Z<$
zgIwGy1M)aC-Ho4r`##}2e*N(+mqQ<~Nt?KBOhnvjy~OzQHK^o!iPgvR!*%*DOXuIX
z=S=l_C5~+>-*OJN@7XkR;9DAN4b$Q-cFwo#?!3OC9Q-rRz^u0MrUSZ{Glr4JwJgF8
zkNrPf5yNmOc-7dH;95A>18jumu@?jm#4o>+_`>Dr3Uey8>xOO`&`Wl0}BqD3%`NOXMHe?^5|A
zWQNJ-upBOB&@)2fsJC1T8JbZt3>rpDEn3IOYmgi(?bwEK!l`D)iwU|UjgTytLs36L
zzKQ%qxgN_3nTfuWWIXC8O9+~$$WM@;D&L2mX~KV;>B8wMX2|cMZKk}4Wu<%wHC3>!
z^Of#w)YM2J^0h){V3t%NUndK(te1~K&ulZRZ-bf7caCt%+C~$(ey%)^{5*+3!+gm`
z-vv^FZCEJxpw}YdPz}qqRG<}HOC_2UT+3DnSgs|8O&tK&at+ovD6S>63_U!qsN7GiXGF9!Wa>{y7zp*O8>H)SqC_3AP+P%<1lf}O+pW_qA-
zj1w4uX!#dc6OC2jFrf6Tsf=9*)u3HIgWjNBjz+2QatM%i;kjYr&7hya^AxkROJa84
z3Ur!)Ut)IOYLqJR%lbF7+-8$u?S^LN+h{I#bKvyC&maZ4v-oAr3c|DMj~j*iYP9WHa|-57b1
zwsvh<*O7>L77SUj$CCdFiHKgiIpeQYx+i&;77P~j&hTD}NyIP09q}uC4;jk*3O3J6
zLy=E0pA*ckyHLwtRW$C(Xg9I!fj6n#?TRKU4EjB;@=qxKUfcQY$L&ky
zRcf?;v0}60nTq@@eV1d~Z^3s^z^mZ6`xA_9CQZST_jH_Alj;>MSUK9TnRm?!F0aC8
zhfTQLO-kiemZJ6rs~mZ&Z#nX~?3^b2n8Hw&ZeHJ1UZn;Wi-GVet8i_8!&PmTcD-#V
z`PZ8VJNZC(m6xF}oScwBbIs}$lu4un@Z8v1yCcE+nrgg$cqHrf5X92Nfk
zCGTVP(XK=T5X(2=$38XqG5rVnRvDv?TV@-7sl3XOP%;o+h4JX)t}3(SdYSIV&%b@G
zzT;BVkFBdmL&6g2BKYr9gJjQKrgT>
z54e&X$&&MHR3)=3Roq-zje3!*u^DzG%QEx|%PXk2>`E3|vxL-sR6dXTY#D}{9HCh}
zS3ZVwmS^VqO*fLI6Ou*pGe{N-2Xmzx$r46u@<^ONS0es
z9~b^(*^w+~AwN;RieWE-h?k<=ER$iQ9%@B#T-c`A0?x}#%|aJtD$F7>O8q^P4e&qTCa4DP=Bx>M6U8W86G6bGUbk02zZb8O~5W|>oi=#
z`!!HkU*lctCTE|FN?E-$dCbk88i*21^t-nv`nCT+K`gI9#qt^gVY|%x>W=slzK;Za
ziTg&jJM;PSI1Y?2!7UewFOmUY67VJOSH9$7d_9qW_@&~G=JYk=PayY}%Izt>#EdtA
zvF{|B0)S?`36KT=mOn+rdcUY;etWb2TZ-2x8lD7lCVm(2e_0PS<4l05e8_bE-{Y%(
zw&F@feD%NU{0Htt0sn#H?oZZkyF2`c{~O;J39y1x{^MZOJ&kL{CcEBL{)6^s`o`1L
zi_6Bd%ct@mGhpUgY?VOHX4`#vWSx&f$uZ1mvT|)GpVfC0^6XQCAJb#_M;!?NF$GEn!hfuQT-<1O7hEsX-T3*pk9?Fp
ze*N(u8=!9>{KuEMUhEjJ)&BU8?+uXu7=!J5mK(0g9%t|$wQ~nCt|XY>7Z+?Wzi%+V
zFL{a^a5n&J@pasDP%^I`(by7PAYd)#@r5WF<`5c3(pmre&iN5`=lqBy=JzNZ0qb^!
zlbgFJH-x)iR#-x@MY*}K_ag`tVqFREvL&d@&2^(fu_9Y!WeGDm<(NaHIu~4=-<&>%
zw|CqPbQqhxp}F@3J{Cew4_oD}SU$)N;hh3MsWuY|RKq}5xv^{G&OWl8s;cUwziP}u
z;5h5sPibqdgu%E9{0yidD1+gmYJ=GrYr?QWkZgJA%@1L>jMmE83FEh0O!&oaZ0kx)
zp|EZ}?BMI^liuFh-O=8Hd4tiq{P5NB18e8#bdK@LPGi3T8Y6mT^SbthJzeX2QPGSU
zAcKh^JU3*WG;`ksJhJCM#qrq`gZX{iPu$qn8uybu1D+YeJ*(bH_Ul;Ry{5Hpmg|h3
zW|+%+ct!~S6c9;QUJ$n^K_M~Keb|rsUbidrwb6cq)8RDX$Fvp(u10JG%*nKX@O>uRX0ZE(eR?(6#kzo=mXcCSGjv);)_@$H?CZ5jImx)9>J!tQt};oD2Ed-(RA
z2?5v-OuQ}0q^mn3rnq>xlNc37%<~)I_biTdE
zpkCw}nk|HZ$U?FKD-Fy4Lw!V+X2IwnQM6{scTpdevrwNc!%>qX*CU@R44RQAYq881
znyX_b7JGplgqlLx2+1P37m~%Y2Kf^CBlf#g9)jdB`81ZpvS^ZpvxGiJp!gUgVV1*!xHh+=Nm=CpG|wUN|I+3G)5=_EIhpGG#QRVJ-88OsPew8o$U>RH(5~
ztWWO)sB1#?JPI(Dz85To42%~nrQ|YfE`53_e*$EWqdX1$JBd<1pl~V1EN4U6GwOV1
zU!!1_YZTo7e0#^>R-NS7tFiW-kMaDt#-8Sc8*kwB8_d#6o8B7NY-^2Kw3|1)U!8t;?%x{(IoTsYPFAm4
z;>`&i1Us?+dmz_NPEZ!E6%+BLntM81y0;|emoRqE6q6_aZHIKQlYM5jb-(R)|#Z7Y!X+w<>+O(305?+1N-sB<(Pm5lvulg-k=Ve@P|1lQU|E97fikGy}q*TZLP
zD(X^wdKseEug?THK%GstjS&I-`W}Nm>yzsD>Ae7QwhwjCObk&k*|u|0r*Z(3Y9JTaJi)&4+=IM-`(E=MKfh1!FCmA^sGEJ6j(|R1lQwbNn27dT
zWcd?ZFDiHD(|akdzsc;N$?8kxIp`DpXDbA>a^N{;&lwEQF{?&tk)87#+tTnHXM8s!
zGdIVLWbz;mj2FqI5L;x}j^~g`&vxjXyeILI)Bl{jV`xSWM=qnJ$9CL_)qxiw(>frw
z!x*V`PTsz3hdU>4U$)~EtU6CNV3{1rq#8Bp*p7R#yUBC%GVF75BomkIU?3OEcHDte
zXy@eJh8;>~I~aH@neE^Nuakr^%hS!t>t{Pi2F(=CJ!{#H`;o7f4`W#)zroV79sfeU
zPO_lc&dGZf_OU^}hvgi(8_PzigUnoc4EcG&>2>DI>&PcZGGSP>6t;t8NP_KH2?5J?
z_#>J0!*+ZLYZ)BdQHmZO+i@nldu)eBGEugJK}bUX#0Gk7M-z4uq{bq4@+gi|O{JNL
zH*_#syhtX`P|Tw^Zo$48?xd}(1X(mF+i?v0E8B4tx{&SQ%M}y)p37hG8DV7Li
zQgn(VIv=m)JtFiL&;TY$kxMMQ!M8l8*s>ceZ7n$yT5ZIVN;J>F&(Cg*L~}ad<$l=>
zsCaJ?8%kUhCwWohy*MqqF`tLfd!+Dj#<_OQa|MqvK5S47M|0#zW_eC>{4q+>(G~tX
zXCJyE&-od2?7wtH4kpZ%YD|MGVBM@y%6fqJAFG|x?}=$}?WB}}clhQOcbGvXMhhel
zHK;a@@zp0cRCZQx>{{Pl-O;{|LkjFA)7#qq{+JHe?yw
z!m%l)OW;@T-Bx&o>_xxwp%8w=yn614tKhpwz*XQNAni{45gx~ZaTUBjxpt9&s|dJ?
z_bXR1*!Ux6{#$&Lh55k^%vRjhc^E7%2yg%;Ya_EDom#n^XQRCmfQy|3Suru!A
z7U-k@rcGAg6{zs*+vd{;v%GhlQ@Mvv;zSRGd-yr-IRoJyUV~iRZk(={#e4AcZ{O#A
z$FD!`p>%-UL(>4chqVLb9xlfA{h1rC$sT8L4|8`ryj%;!37({6A9vp
zfEWnki5RnA4~&4Y>{Zszs;aH3v39IrXz@
z<~Am16b*fpyuqzqz1^F;S{-Nkfd|fuPhEm&QSqbNy1RPXd%HHDI!yyi4Jli${dOP*
z@kD}nB0)S6*M>L~MkLx2S1Eo@F^DJ9+}pdkeH}*3_4w}{JIn7YKV|x*TDu6hk+#Ah
zo`~c0>T$7ty9Z(9dpg@0V;RE~>iOBWLXP%Vo9wYA;$Or|=R{U!_IT|7*jr(z
z{0B0ATXar1LiY=J%W{4}#1uJ=HGMqIN
z#wo-UF+tNM`VCa(K8&j5m?FkhE=QwYLGB(Yi?A_Nrq8QKwEv4Mya%GTCgctc0
zYUt=W7r)5kD8TWSb)Mrb3p}$+DexLL4dF$MKy(AP1v3V+z;PYqO`=s;WVta$E<*N8
z`1!qXao-xe7p^+34$2ib$!%8^WGA8#uO3k(j7Xf5h)A59E+TPWYDD6E8<99>BN7)R
z`O@N46jsUNvQW&8Vmzg6Wl50~XEu#I4adDGg19nn!^#q$FRoXI!*wkWnYqy;V~8SL
zdPjgQB4^}ejO=#iPAYCXq+&vJ>+n)yV@z
zfFwIsP*7Ot^$A6{K{zKA-Flf*R9x)UN3h26rX_n@`iLaF7;Wm~;+x|R(b7n$3=<3@9?1a`$qv^2@*uD7q>
z{m|Mkc4^+ho^{SXopta?*RwHj`+ZLsaW}M|xWV%q+}oyGd)*uV#5J{@YdV|TH#$cq
z&)V10+0*6*Om6MkvaX{oVM5XXES?#vWkd63Z`%58OdcJEhNCs!IO>yt-
zY2LKSY2MhI2*ExiO}VSw|ND0@Ac?(NhO(8{Oaf~+G>A%a(waSP`{lRcj{JQ20uuQ7
zy02inFibED#$XW-)-`1tPcKE4;@Tb4ezS1Vqxc#Gm~ia$}jSJB2J`L&jx
zReVA5RYe+Ks6WCFeqf%W8C;9KRoLu?6uA%Jdb^$-G+DV;l#|w5>c;2bdiflKdV`+;
z+CIoSZ$V$28BMnB6qNn?>Yzal5FG
z?>$!EmB`yZ$U0Tf_XsnZY#R-%etn1f^wCgg_1%a(`_$ma^dIOu78XyN*v8*&idJql
zl#I7R+D18=Nr^V~LN0C#K(3eRF8uu4ceL;L`Td0-gB&iSZuVi~yn?(YZL;ek+G~+*
z+qqs;?krZxQ@Dv$SY<$~FEv(4E4J^MG;-B-b8G7c#i7&>I95qFPd*+S^#(L1`^2W`
z=!}aGaDE{xx|eTX_6}~c>DiRGu`9fCY)Y^xFXMoMO(A;#(dskmSW8`tjjFn?iGfu8T>v;KZ)W@Y9>nfLds84277?ER=O32TZdy$_fFXF_`m%kvtKwiUo7s@qQE|L|{VA&MLG4I2sbV9(g
zDHov20N9kzVl9JXQ^@r!8h!-SgF-o#-CYVL)Q+kH%5K7rfIoSN?H-#_PO*#_!;6I8
zKwjCDd$7G8n?iFoNRzoZFgI~s08
zsqk>_VJi~N-e)37OgDLRM(No>kGY>Tof+tA3TkDpEX
z8p^!1{A>!2uM9e-$@_~RjM
z`IK;uLqerAjP;~vR7%6S5J?;4omZqyeABi&WFF3?&ZDT>Un!OB%+MBzWQ7ikd%ViQ
z8DTsytodwU@l$q#S6Sg2nq6b9f0jOfg!g?-ue?`z6%B}CPqs?|%y#;np!Hqyk@s&?
zy-Ph957!{*`+iTg_)qPSi&k
zYxDW1r+BiP`;*s^r9C<|=e`f2!mq>~@hW@^8Opp$A-0b{H{s>qmxf~OciMjN25-JM
z((x=6txmej*4Tn*^M%>f$$)KxHWDK38^lpWoX8182-Rr)97W?S2|0d(Q2tQGRf@+e
zHY?JuM!7DiGqj
z0b_yrKL;+2%Q7=G;cp*xKoUDW-3%M{RzHE3yR`}+I8;5(xH8J8ThVc^a
zIF-|!e`XZ%AE5#@6YvY4f|t7zz86-bREb~YNff}fu&xQYM*QsjxU4$~Iv^5px#nF2#mol3dn(2jy$Zs1M6pxKCKdj>n_J97$#+k~$%26+DTZ}n%qcM~UM`AT4zHu>jEX&Bu
zJlH%y%ft$BGE-EfU)dN)@e(o{WzfB(HEZ6{?f&AQk&RDaIh0wNVZ+>!FC$8j%6vm#
zK+zm5k=#&296ZgTRU~TWEQo|MD=;EPGD~)gt)ZoFV_VloV^iC&hs5aM0&AmO7lbr=
z&xAA@0;6G)27(N7EKHhNc~`ld=O9MH^!dc^*_0T9<7Z6=91MSOqhsv_4Tkj_6)k_WP0N)SBelkhK7?ax*n=>>9{Zj?WdF
z?9=dIRM5Vu9xfMrV>;6ou%0EIO=V(`c6TGU*99pM+*@3;a|to
zcOLS#53)`x^bLgHc?$ZtJ=Di{C%b)DBJbDtG3aB6B%5qoD!=o*Pakdpo<9C>vJd}<
znHYEf7-I->%WUKCHbpD<-%v6Te&+$m#nIO$?g!Id`1z0D%f91h`55m1WBB13?FN|i
z0`&2kw29lsM8s{`OCxc!8VJ9$0w<0C3pQDOsr(L4#4}b1Xyw4~)XyChzcb4X#vk7~
zzw;xWeEeI~8*urZ1M;#T-Bx~AC_D2D2goll+T##+4q%yZ)B*o`4r6Oz9}MFldtA>b
zY^jM<_6jn*l59$FJ-@>N2G_HNkF{u+Burv#%^56tk;+CvGq|2_Q!<=23;%22dhRhD
zq8Fnw_jjmD=6cM=%kikUV{6Pf2w~W&u)L1?h#Za!F4J%~S%xc#%9*IQk;<+`K3CRa
z)p;gBkR4mI6?;-3m8iF4Ywm}n9b5Br>~5*t0T~;qOwc+){*4;T^|+DB{(>zTE#+t(
zBafhUtSm&$I5`_TG~Vz>ag9_KM}6|x8vY+m5;}5BmOr5H6!{8drpg7#Pm^)jujwWl
z+YI4L$4sHMzEU_jd6h7RRkf_gvPPc4vQ|z;{VZXqtvV^f(vGdU9BXNio3NZC+p%nv
zg^-^sk03u!p2nWemsgNqATMFP3*`zd7fBT~SgxlOn!)vu=<>Lp$SMdZ*AqDhT`bp=
zSqAN?k;*a;LS?}hv6jJdJ)P_$u|^yWusio*MTt=~`E1LGk-7@;HN_h`vw#g=AhJ)h
zJrDbEY?*l}3&%D=IP?S5tR2oPEVKgh?$p2`4pv!LmJIyAhHgZM??!d8RtVV#q;5t{_QhlLK5H{e%t9=4tH2D7rX
z3N<8p_-aa`$E2-(wx=2byUh0FI|vI_o-sc%x4d*^NhA21%*oD5Jh!rvh#lpDqDhrQ
zo9*!hFiVTjXl9bY2ZyFj(jlGCV8k$
z8Yah{z@Z)6%uZo!w|3_&P9MIh717W-I@Yvzc6YS5wXWemWRJ&#xR-BjN;xs6!)>oi
zY4?xnN;lABO@r3~m~8f7oAE8)o~-Y#ZNRP69Zj>ot+{v0=0u3Oja|K+
zo}^COfI%(|C!OZiwj_OHkXXAsU(mm3}0V{!O~GSs=9IJVJEVVf~H
zl(`)q*MV|7xFZ=`Qo!v5+|K?w7H3zvoxAaYOzz`;#h)u0=TX$t@WS@LD88onj^e%=
zi(|PQdU=wIv0TngTK+x}+x=5T%jG<(?Z4D|I~M0nEz_<^4rij`Y{lh@A5!d8gjE7I
z64(5}e*7*b(!fP5CF0YQoB+#vU`!5fR{>{(Bk3g=?M#}2C9McJl_nX}s^$q+j`nfp
zdG44f=eHEtr`*A)w|yvQ>`=DR*R~9KzpcIlwy-GVXrAUNXBTc)Drd764Nblk*z5+#
z+B~w(vtfL(INEKp`cgTYtDui&J?f+F#_Br{
zdD{nBhjDiX!r6Qe`nX-xM@zfacO~+EeH@JNSJc^L+fq53AN%y-U)|GpBl7ISW5IL?
z%sn45CLg!VHvUpMn{PwOKscLwAs2U5nI-pw=`Q^I=i_eQ@#~MXc^>+BP1?k5V!niMM+U;#EX7IV|AI|cAMb7Ue}iq0Vf&u3LO?4A&Zc3`AUK;~zGVD^2JBxt^yh7OJ6(WflPdM92W@5IJtaP)T
zL{n!w$+okdd|f3_QA<=4485*B~Y-c8egQo-tdKaMZ3`wlBKvm3W`GDK3s{N2+D(|G5W4mV0!
z(qYrtQmh8|=$+ir(VDRH4&^}v??L;rcX|?6eab(h8s3BXlJUBL6f$2&Zr&~PwIh*2
z4jd_bDa5bD_3fv$wN~Q4q^gBY{C)(Z?b=!JvBmEy+HD!9fM|SgAv9IX)rt*@CdLZn
zmTLJB#iJCDQ(UWfqT)tH^BRQyXKMKiipJi9dX5R_c6>weO2uz0^4pZ{-&gz}#h)nt
zOz}a*Unp|WDf`ihiukPJ-xOa_{HNmEiXptFQQmkq0SmM|OmVbgxgtX!P`*;JPI0c{
zV#R|L4^cc)@mR$Z6k8PA6}uF-D1Kb=48_kWo~wAF;w6fgDPFC3o#M@kKUBP3@h-*t
z6dzW6T=BPxPb)sB_@d&gif<^sqZr|+
zM|NjUW;h({kL;g0`4Q~*z-CT<32WTdnUgu>B6;RyPL42SXHL$-LGk>NGwBj;W6zw8
z|3B-GoR!WW*_}E06zuPy{E9n5;k?eKQiS8
z6zhLSGbi&!@gV$?WBvPPPTqz_GA%oc^^d!CTHD`n<5L`(pF1~~p2T6;=c4n<1wO_o
z2eJO)PpmU1Gg80KoILng|7Pms{xk%!{zC{GGpeM&>67<;tpEPqjA330oQ$`$ceJ)|
zJh8H)eI1Of@yhiZyDEEnn_Et*?B3kf+t$+Cwb`v~-`LTD
zduwZ(8_b7x>Xyx?cK3EULpaEP!Uhxg8n0N=duq3DV&#_obRuPI>oj)nwuGItqr17y
zaqj?XaO>+(+{f*BLvxZHy>ZQ6a54@e{_ll||Ng6BD7qOBZU17v7Y}v+Vz{el!b`m`
z4Q2mg9@l~T7vt9B+O6^GZ~O!CZDQ=!Kx4NC8oM>j-4mcUi1m-pEPnaoxa2ApDUMJa
zt2j|{nqsx$Y{mJCOB9zY9;UcT@i@gbifxJ~DQ;5ynBwV*pH@6e@jS(^D1Ke>3dR3Y
zyg~66#ak8cRJ=#=e#J)>f2H`O;-3`%qWF^H>xyqF3ci1NJoj|0|7%t6jf&q>a^jlyjqAHGL4e6OuUogd
z?PPyzM^{Tndk>gvUytU^%^Oc_ORCzu@x(r2{MfLHF&lwX)za13*+zCCvGVnsn>!)2
zi*&(g97|mGN&dYkdI^`LN#$5l4n`)E>J=@pjfuXLw4v`zjy{~J>*aI8Ci`@w&ED!}
z+Y0<%vC4gI%aHfm_JdgeI3P&mT>Zx-i1qJYpO4|V;4CFZ>*Z+Fi+l^4ks*u}6OvY}#&Ro7VC^#H
zKc?@FxRuRVb)KxlGMQUhj+#RGC^Q#|%dLC}`4Sljx6*?x86|zWm6h1Gal(*s`+o84Tvj
zOUN&f7qJZsg@XnbnOUE0td|%xFL82{xs^3o#SXcZye6z-HGcV(&{pIaZY6dO)-ot=
z1#$hivX8{3<6wX{`5ClE8&mPg(Ke&!)elnr*5lTkGi*P^+$c&LtVQ@bt6hWvIHnVc9
zKdyg~8{mavnvLXNYzP$%
zsk0=tlVP_}YuyfM6Vdtj0Vdq&l?0oBn9ZPk?E~t{l
zWr!}5OX6or*~*e4Db8#fd0H9%wIig2OoPV=6&adH>+o6WSEr;=QXCf(#D6mnyE((i
zm{%KIl;l_Roym>N&uNh}IBRltLIe{iCxje^n_^gfPts4G*r5Dj8%)3uFxfRbJ;hbM!HkunRusj&jwvF;jrwX-vtl(
zRW8wIH4L55D?^(T;j8UX=0y1JW7AONK*-n7e#PUMjsr<|lcW8NaS{ywfra5efQJ77
z8vY|!`44=W)31~~$Q(s8*D=ZmY1!CKQC_9x;}x3~Hz;-~o~-zB#d8%eRJ=rypNm}Y
z)r!|C-mLgT#oHC{QoK*`Va3N4f2;Vk;&X~GD!!`thT=PlhX25J82$rj_z$4rKY)h+
z02=-SX!sAH;Xi{sUcfQJ778vX-l_z$4rKY)h+
z02=-SX!sAH;Xi{sUcfQJ778vX-l_z$4rKY)h+
z02=-SX!sAH;Xi<4
z2h!5RvWcA!G_mu6CU!p1#Lfpkta86p{H@~iiY9hG@ar9A6FVPhV&?-*?0g_i
zB5XIY^MUjuXE`Z$K8&O$c0TY#wgXR6JXO(H2~htj?f*5c|EA)VT5sa2K>v@me!HRx
zZjAb0sT@Dz$ZMF7J>V=YFH!u6BEI>Z41DGBUP5`OFlffnpiFZf`J+7;HwCX+K8hjW
zH#`nv3XV1J&p3r9)hk-yy`Cu@zrkmKO}KPTO64~iQTwb_j=a^k40&97P7{7i+i~$c
z4>{T)a0!^_3%BbS{A?d&ov~PHjjzIHdC#|b${hwJyzkp&+gefKU+=YWx1EYQu9xfM
zJ`q#nrrZU6an##n^`*v5c?9}+T~l8UepcUk$lE^1I)8#bh&3BSeRu^pS)YsP+xCa
z8tQ5rT#=pg8!zyNh<^+Bf78xo{L_#d-TpOfo@F_*%dtIUx8vOX3mIN7HYFn3o2XaO
z$S3%)iH1AS8!X2`ki+c7pJ$0yJwjGF4i-j`+(gN6)+AhEU^yNz9io?^GM5)|GRrZa
z>yu{Gi`<0G$PhjxLqZdKSpJQA8_~WPty%JI)JKI=&1Op+H92Pf;9NNotIm^SvCNki
zsEo;Hu`Cc0FNJanB#Y$d=v6H3$d||y*xgdO2QtItG%Sb9YmgivA=Hl)UdLrZK4g@<
zj5UrH#(WlD!WI^X7;bVHT{26_x
z2t$xfm5Y(L5$#`sh8c1zWM&E-AS&f3)Km#g;nmWKWsUp|%UU@d^|K@!8tP;umi2NZ
z^vo7S%LdDFC6;sK7AzZODdgwMUC7Uq=dnlgSOb7Q)?TsMeYZ~qv?(No0WK6L{K>OlT9Kp=Rq&{Gn
zH`GUjA@ekneNqVfh(C0FbPHGOhOVCs`3d+%FQRTYay_4&EAT6sjYZ!G_7SiSyER|2
zxrH!zy$&p4H2Q(gQ>=W#(4DF{l^p5Ie0&gxFNOKY1jC^d6*IfTVDmZtVDkm$f$Xpj
z8r_tR-{9llCOlodb(^PZj`P2$8p`~}4yO_hm0`|c6KcLXo{@nY{nBJpR1jyL!zN6O
z>z3x;cFc>s{P5NB18e8RYiCu}R@KBSJB_stxW1#Sxwo=;UHihGuJygBXx`kiVId8%
z4Ly~e@yZkJ-v@f)l^>XeA8`HpEgM^?x3UK#Ie@HdZSHOMm)|cuM=z9(i84&ux^gNtNW
z?T<>c@5v6lMesY1^Wcb+@rhVoe)4x8+5)}<2LUN$zWm+1Tc(8}kwV5o;4hb&9{7wh
zwwwX+9r*9%Yhl25XgqlscVFc30KTdi@Ez{)c(3stcjF_N=h?)Q2by^DKz5hYyHCJ#;IMm%_iiSh8{U_3
z>P&KNsagP7Iogz&=ec8|oc}`}m#|5+)!06)AV>W#tK8SN40*qO`w?6;1K~LuVAQJh
zt-xkC_;e%doQUi0!^~*1a;+%)*ZU*b)#Iq!Q#{A7eRg^tA8f8UzUKk$HXu7-p2N>e
z@O{SWyD~)|d5-_1Voi2ksXPaH1fFm1FO7Lt-;Kz#kL53DD<4RF_;FA&5T2und;|2`
z#Pu@Wg`fX?{L6Rz`r|p)LLaY5o9zA)?X}3ZbGTkq?u_TS9@k%mRR*;BQhAOjIEQD_
z$bsjmo7;!ma4TGfBbnz2;=|*D4dTNG@!?5G1o7c*$nPLNJZ;3ZP6hGdhlS6_7uJw7GbDA{$qxY6TC;oByK7x|BOL=c;D9rzsvb`lt`hZuWq)(S;3cr`0$A1jN?Ij
z*At3=P<&SLZ;G!d{!{U7MLI{Zf3{+Q;xNV0igYTY+!V!1#X7~gii;HwQanWQNX26n
zPf%=8Y**}3+@kn##WNH?r+BX7g^HIbUZ!}p;&qBQEB;XNcE!6C?^AqO@o~l9Dn70F
zoZ^d$uPVNw2m;0&ryxGO&j#s5hH=Bm>^K6p`10-
z?Z^f=P+K8wNYrN&^}TLahP-W~{f2k9Cj6Mz!obytjesfH*rlv(Y5~f&59R3B|0QNL
z*|x(`ws|%M@!`|^^d5oZ%wuemJ!Yx4uFGK)JJ$*UtsHD!vj;O5V#996EOBz)nd&_8
zPP}{h!#MNSr#Ctc+cWk?Lnb8q^d=&gybgIph5rmLKDam<-a|6!dJmu8i`kYDp`$u{
zdh2kp!KZgSCBs?OFiydz_m>orDC2nL(5p7tr?-lSMvg_j$Yt1!3}K+JkaVF}SpJ6k
zh%AItTc!wFv*Z@kN99wf&z1tz?=gKCmI!~Ih%$H-JGA3WdvOt!hrch3VWRd&?
zlEv~tJBu7aG>PO2s^c^F72#%Gbu?^$o
z3T)?ixdruc84JmBnS=TX@@eEJ$^}?fNE!N0k{r}emcOI#6uAcZsd72;(%l=q
zX)@Q65jzedp`W6^=jpqe4dK{qiiPvP#CA@Jcx;(QE-@bH(flVV7LC11v1q;_;-azh
zAqYp_F0MBk=DdmpEm$iZdB2G|CQ=doMJ}P-jzYmdfHwNC&&4nD92JI2Sm!zPvOwNv
zDFyzDO+(}oBT#%2wngCC%hD&&N*8p0oDwh*l5Wn&Js$Uce~nY(kT*(k&ShAVB17Uh
z86&%$#!1CZhg3|6zB9a(SUFXk;U$-$oiqicP?{>u~D~qNSjR3M+u%9-X`OJfEVArSPo^M-cYubhH|7Nlq)5}
zOG`qdBs47XrN7bLASihDH>Vg!RN1*?skqN17Pt{ta$$jL)mB
z!u95c$M9c9#=KhNT}h@`>uhL0aYJ(5UNp$s?R$4Dv4e+Ep1lsCQBC*|;UU5URv(7O(oDXsjIyPQ3V34Saab+Y^sO
zB880ij=x-(C?FRy(L@qed&GyAuOUc$u?+lp13%vX;x{)8N&8#el5_Dj%I*G|BFAjA
ze7z#)MPvCkMMmainZuTe4=Vmf@oB~PO575D!1?`mX@6ze`tNSlGQRZRZ9iV#fqX{v
z{WxF=j@`bp&(FlVX(#0QW7?4~FV8pSY@#nOeZ6h6ZOc*Nx8vW93+O4x(Z>{*jpt)}
zEb_JwvQ7~U5#xOoHrt*eR|6#%vV$fo*M_oxy;s3^bSmmneR)quo$W&vJBnFyD%$+|
z9`O01`h9uNPtmudm?h_===&Y?@!84kug
zJ`Oot9^KT%v^QdwOmbD5rQP;ae&gTRzGu_Of!~;;K}h0EuIH}FYChSQw_(a-y
zRzhV=IA>0mgQIo$x%W(
z{AeK$Fh&@HZmcXv%{ciOc4)j@gZj7>Lb6;qfM$X)wD?3}=#2^qL+2!U3X+qB|8i60
z639#y8mqxCVZWx!qtGxz_>wSFIBRev!bFheU>LJ%S%qbdJc?zltVjJUc?tPC`45)$
zG6#BQ%lTMKgItc~9JvY0MwyP*xw0MkdGZkUbiO=|`~vwMAwS(YP{bKj=29GM59GDezWa4g3-^jJKcw{EZ;q^dw|jKXmN
znehWuhDKu}4lMg2l!Mn;kAsQ^-q=x^gUZnN(eAMvE7%Z@O{G{kznksq2y
zH6Ec@H1=nTMe}brm9bCb5P;=4jBAR9>rpD0h!(OOd~svqvFeZIpj>|}$2{~WJD7Dl
z6^6)K*y!xcFGuBpYnAA;oHSfjyuBbOMGSGJ=~XuV%&AS85`RKw>w=Nl8V+e-W0f%
z8x8};3Yc?EOl8_97+ZO`qKRFA12KVR2-RpkKjm#X}WWDITxbthhn3OYvmI
zk1L+5c%kAYikB%~t;i2zuJ>leA1a#I>!`m=%l9chtVo*+`~6n&X~pLhUsQZm@eM_o
zBTT;tK2q7APKLxH#Sw~Q6(=gvIg@hLinA5xD=tx7u6UT@D#haz*C@6ro}{=*@nedo
zD}Gw>EXDH_zoPhc#VZsIhk@-h90u?ft-n=~W(e-bJ&N}$KC1XD#U~a2r1%%bmlR)D
zd`nUAJxRTLYwp<_RKMXcupYx<01bx$G#m!da2P0en&Wzo}?qk)S?`Pi}5^
zfuf1MjM#q
zKUuk%sAS%J`2#7(b7+%&VjY4C+lOsS@%yP&?rWn>2af@#2|uQ5an64YIojxPIe0d8
z8o>PeI5l9oufk^AQ{<*V$>&gKla*^jg@3)<@F1ItI?`~!^
z*|y73_Uqg3(}&xHr|%}@*{23SrmJzHIsKi>LCgQEn9WZy%$djMKU4-&*2xnk6)p*kZ-OHcEu2|+G
zyA<0r_6D54zahhG#->Efb{
zTxDP`OaLm0UV-kpkDw}i^GUXl9mtn7>
zvKjeo$%lN7dHDo@frMQD-ebvDwH-z7RjBEES6)CFOdhZyQT6Y$PANC
zEQgyB3?ocba?4z-faECoe^}#a;oPfZfuBQW{ZHCBH|$
zTGnD&BYe=;N(<^|NiH?Fa2rlTKM)igtOB~?6^cdk`IJFv8}=J?#qpGkhHFtOJO_Ew6?_L{!Yu)G
zMNu;=$MOY?75qmDnds^iD?@1nYff|inNh^h>J=zWV9hCx23xO2iAO5y2{bz)3i0cN
zL`H~_P@Pa2>(-+DLHwf6V>>ZIgLO{vhp=JfFId`|#kZ}n(eN2Gk_3zLCY2M)nhZcz
z(h(bGx>XxIT?3+rQ-*Lv21;yb|7e2l$OYR09%Sf-Sl5YZv6*-XIhWvtafjRu46Rj1j$^UcPbN6ZLQH08PFtsEUmt1_bapc)yWP!qamAsip`2=D)OuHU7nwI3*LnT&IHHZpLow_nt~ti!KOguP+YLkIz)<>yI-D;U593_L9|i
z4r=`RYM_tXMSXk^vfFnR^0p7M&T!~^j2TU~?Q)d;`Wk)uc>b)un~-N8{{J#D1j`|?
zdD_G_{!%%U*-$bN&g5vw#jP?R*UNM_e*W!i@*O|Rad7`1#}AiLH^8J`=$mN^KyDio
z(O!!zU(WTSlAHPzKJj==UkYlVPTuDZUqwti5YN!@@s
zlYe8KNJ-;8LU{H%t;rH7tG7O
zEP2ey`7C+NNi7Z=n3Eq-GMqIV{|jJF9y1-H|Aoq&U!y7=b8-UeMM%K89`+&OgDNbq
zpgtl8;sVQ*EVO3H&8Uyc=TV<6!%&kW*CC%PAH%Bi%$&8!%*j&J7fL52i{xjJES8TT
zpN=`LbNMbJsg~9(ytk;#2S|{sR>wv=u#I>QONZKRfz^bt_O_hF{jp*hKIr
ztaC~>VVlUGu(Y+56r5nzT9&eSt5W6!cV;dD&OfS42INcP(SA$?}0Ej9d4
zF2=!N*Ki<@!Y_qYDRik6p6|@eRTqYjx-g7K10OiJxsXpWS;s#eEpAgu;_2uR_l8X^
zxZ3cuYsJ3;ueM)exqs6kh7DQZvLTV2qIg8g15#woy7dUWwLX}kw#A+G(HIzEd#&8q
zwb3;>RvX)E^~nvDoz)w=)^}HTw6B8|GGUr+Z9ln>|MZfUmMxu5a)>h}MFvQQw5ANZ
z2&fTWqwBj*p6wm^Q+isOJKDf9xv{Fufz_#R69+kI97j^Y8ue4cS*>2098PR^!&5|n6V*1Gd2Wh#)bgR*btx@8v-^fO0F*5s
zV#bD`{3+I>{};9WON!r8WC#-WyN(DsGe!jXzgo8Q)u!?w)A@go@A=t^D;4p*|E}{M
zxDy4u2adZxS$i$bHM~dTbecqKjXzmA+L)Q=`D3CSp9MD2fWwr^d#pg+KzNVGZ~;A!
zji7xWmyKtSPvt$P!N9fHZWQEfw%wOU*4Y3h$1tPG%C(`4%h_qt`X9p}G8K8Qm&XC>
z4W{xQcR*hpZ8lkbsk{f{NYPkDef{ws4EIl4j7?VGIjHb&-)j)!c2OVSZ|wG6g}m*9
ztV2WcZtUj7=tiGF&XCGMCOu8Q@dX+KLxMjBSm&$wWXwKSuRo?B5
z)TIhYpsO!stU{uNFW#&VY#TdOQyi^Wt~f=pQn5~Pt|ILf)N_#HA&N&T9;K#QRWxyWQ2&^g
zf2(MG)lvT!Ex)X2Y?b`(7)-pH&21f3?liRh2h&&St9%JzJGXVMrEj+mQEIBP1c5Yen#O@}Dw63zJqs?z!R9)Wt1%W1@r
zuR<^+N1<0(UO;_B7U8*`X`;Ai$wjD-3WIQGn`r7eCbD|2d=#tBljE^W_VHbennKwC
z%|-H4^eUF)kWc61`%g$F`}i^f{3u~CnbAToSnK1rpq6od4`D{KGVcVsT7)Ts^nqlw?4j%lu|3b
zsGntGt<;$qDb~mLB5ZksT!ZBt`2m*J$M=7cw?4klA)oByI~7}EeSCAEIn~EE^Dqe5
z*=s+GYsyAP$x0X3JXml{Uqi@|z|#6*o<7
z%4izdl--omgcD6KUN5dY9kt=^I~B(z;qKduV~diYE!2VSJgDp*Xt$of9CYM){vOW$
z;aCHEsOK+dnD|CL{Z@qfW6VLk3y3a-2TfEt8!)4y=wS5A;>-4ph?q~Yi
z{xl@bU+YGFFWqs}cV1#PrSbaZYx+?3`rXk4wr=3}tk4PZh@HjuU<^L#8v?#(L;L#P
zHO-w}TQ(-XQ-gT$TRPXpD?5$P}*>p*`Z!-q_ti%cQ+u7|(D3UTm
zthWKdG`6G{D{E&})mGK$poAe71O+b-d|Ta792CBL3?*AHZ5fG#$#PKO&rNtY_obm2
z7X`1(#-_sKn$GVxeN1@V@Q`S`p&gIMfbpy8&qL%GWTJ^HjgvWnWeC-1{T#(0F1&l3
zM$mqW<26=sqT)2gYQ@=#^A(pUE>}EEah2k6ifa^uxbW_A{t&)wdA!e6{F>qwiq|UM
zsQ3d#28U(8dlikn8Rg$-`DsOtXr&y(#S-6C6n?~`Y;N!Mxc5D_oBILq0&VBLWsk>)$1Ui+;`BQj
z#|QtS9#dG4yg%XcF{vC&%Hi~wlq$zIrYZRG-n=upnUG0cFVB@t_UXm*ZFRG41%Bz~
zwq?EF-v0tFpr^1AH2LCk@O)7jS=X;`G*&d;S7EasO_8I$>mt;Q9osYZ2RL_vgTU*>rbL937a$MzgHgBPOKDqO!ur0$(dWzWa({Yl(e%wmQa8?zrSg;?DQ$(VC?&Umzs$}+KDc2{*pkCw}Y(|FM
z0Kt%KK(Da;Kh#HLDK4u_iJ~=2zKi;(oQ3*qVYr?gxgPmk>Bg$_WG$BYWDW6^hv
zJO#43^RxAOf!3JrHPbZCC@^CwVaG)4NUN4KTd<>EGdSDIw{ApUXF*J*>Wk?
z(jeDkIY)ksWuqJh`ML4{^7G^s?9qIA5%~oI?hCWp@?Uq6EP@8heiTA8*pD)Zda>a%
z85Pa4AD5!b0N9VSv6hU%upfvGe>(d}tO^GMB!_Xk$cUYW!-vvXwq?YQ$L@rFg3a-G
zjzifHjxC^AIR8SnN3joHgp)HM9Qq)Hya*@1V~=R;P4vsF)5sh
z3Yma1DP%|{=?(MT#GNKF{jEP_$rv1Sp1;JS$h{&=6&83N;I@jZ49PqPbDTSo9m-@y
zpNQ?D5rS|eIhhiX>Uc)Rpy`Re=F3*RO4E22Okx|57M`WFcTYqpu_jr={sh5D-lbq9
z_Ne!zE(SMCZ4iWnCoC;Vu{0nl*0uR&fK4~x!n>95zkjY*A_cR)v%?wOFsUI&Qt&%$
zM;rxTLWeR(fz9*MP~;@|>Wt4E^D>`~lSuyxeCN
z%{;Y`yI;$XD*j5*%u|c@KWX_diZ3a?uK1QB?K51jnWq+*ujLZOQHoO)>lF-97D;NX_H2G;V>@;=7Re^|hvCo0W;av5LEnX{_j1MWC~_(}%HN@Qm)7$$
zjXZ+k4}p`kj4$waKekA~GniN)IP_k^b%+*M_kt^o)0jHBe=zFyz)>yKxk
zOEj-Zo49REM0+i=JQH$pRMMY;oB`L%cN4DDcUd}z;`*D6I-9J%RG#58*uFnoA)u85
z&oH+yx8M>FZoRv-^UwydMR36eu|x*XQlr+0*9wM5`OL=Nhd6r@eB^
zhUU%QdeVif4q}TSfJ-7^3{OnsntJ!(x<25`Hv5A{xB`h2+q2Fb-XOL}5L?85nFO&#
zd|xB{rh!%4A9)O|{C>>9_Z&XKjIGA_c;f?z-$bAg3H$J1lrCR3b
zQPv-&c%0%|#S;}bD)uOzsrUuO3lzVq_zlG?6~C=`qvH1!gV-YO@jn9}pF9siY!UZ3
z1hGZ%58_Mv$|t!7+hFY?+#K2pU-ubhY#Z%2xO|-^{Fv6_))mASah%g}EMS}JHU|ZZ
z*4%;Fy3U8(cF5DNheNqTTi5Q#7MWEucQ8J+^$qo|_|9XCY@;F8_{|aA*dq7K0kKgB
z9ukvBw@!DS*gBzbO!x8^ae%CMZT2u+QDbk#6Yd3MxaT&(FP3h&@GWGl^_*~oLr38=
z`wT0i5%ofBHzJweCuBrUKxa7FPJpElPPSL!x
z0n2=N$KgZ@ADsm<8#RTp36e!}HzbQ?9r7jeAa=J@z6+UQ!iVl~c@vT&JC4bLBqd=gIG|r}O2n$S;sTL4Kip1
zZ3LQ^IC)`+CcJCuoNB#mx1mdtcWr(XR>2S=vH55!a!hQIg3qDLpuB5CZ=?5u;XGrZ
zFb-K$*|(q*KDVb)lf-Iqh~Q;=JKEu8dpaag8pgJa*g=#G=PzX`99zt`aQ-JvWsDqL
z=tk_-+TjOK_Yn|k9zL0BqWMp-M>O^}dqnf;wHrDSqHSg4kVV5eD8SLy@RHFmr@<^d
z6D@SKW#Aj8QvBr7qGnc(rGKuyaTL2#2~sW*W@H?s>740KCHN}ZmY}p4zX(Z7INY+%
zbGT(;HOe2L03)El@zw}L*I-*PgCGlEMB~}`MXRvLa_15J9LmiY0Zj!sMD#%X6C|*6HNEoL$ClRMOH(i|Kywo_w`8G~*%*H7$Nb;ctl~!0K
zi_1bWH@5MVvXv!8Qk>Z|@-*ywQ3QV1Zo|qFpAW8AhePyp9y0Zdbzk|N;>;s13?GSE
z0*9GT0H?U@YG?AwYbQ@Cj&8kn^6=8isp1STxwi6J=Q2Ep`IV69l9Qj0As;wxIHS06
zxr&gBs*20PPVumG>MnB%3JblC@a)}29Y|rP6s4_h0sB;3?3dE&ZLZWdy5%653yxQn
z*$S26Wor{y8*i`iU&d?tK`e)|H}J?|rJ)=t2_b&<@Y0fzC82VOL`x%~GPne1Wrhxr
zNOq|1;E06s4vuHYpnZdTdfPg?T}w$9%wwKOY9B?9PGf2tR1oPS-8tTZi3&IG+ldOT
zLn^Iu`*rM+^ak6Oo!NO){MA~UHznq2+|R7N)+ad0&~5DGZJpljqNBUH&2fE=^0Tu!wMv}Xm2_Mr%d~}XC^5;GI?&w
zmd!17iM?U8l*G|>_iba>n*G^M%uq5W(2@7=nuw^B@c7=I&i-ZA+mE
zznPzOzbR+t-km$Qo$t&Ueo68zM7+ou$W#sR-w7y8a*~PMvsk+
z(PIOR9vf)%*wBIOk7J79n6>#m$PnirW<5t$4oT#fqO$
z+^Kkt;&m
ze3c;I_$mP!UnM}}s|09#l>m*e5}@%_0$ii@jjs}oE>NshY*1__;$wXy5sKQA6#Eso
zDW0SF0mbu)*dHfhv)<vk1-LzQ;w+7d~gieI*5A9
zQIHB{*eIU~Hcq*d(8%`~(O}Ekk|5ZgR_aQXG>)r+{cMmccx8XX-
zrECJo{W9#rfB5*$3-ur0Bkb`#hB$^%AHakM&>qL64R&8dI~G~?7w#9CRfvzrKilK^
z;XXsd(%TQ2bC73)ZI5-ra+l-yp0+|jD_7gFc=57PaWBi&4gB7@m&1ZLa;^8M97+D=r8D6h3kN)$gLx5$$`ND(IGDR22ufuNIwi}&{Fs@E
z`040Hc!Dr%;7Y;u%#_60rb4_OZGeNhmLjpj18}LKj1ECcevEjboXGMV4(0^pTMlL?
z1fy~?nu^IEk)O-Kd>Z))c|Y>jZaJ7=qJ;zHi;!6)yRfa6Ly%J=-$%SwHe*{S&th9I+mOE)-Y&?&
zQ15R!m@BZCM!6B&WpX>VO|lyD%jIFjR|uz29V9OxzEXaT{jQSBu|3%MW3e1eDOw)J
z!SMaTaxmwj$_O|Z!<>x9!%373(ZN;kK=UA8NTez85+$FvcJht*Az)qZWO=~Blu;~_
zJep;(vXx8)91NK;qy}*8QSxKT!5jghfP;CGH3ANX>kmYGAR2Hm7b5`J&`bM10+mURo?c7
zu`u3QI5vcsHw`Qd@7^ZtmW82|r!-7n7KQ`Y2ELfv-))}d)Ak`2rZW|ZzS=Cz5x#ow
z)n3YTh~|uX*-?=(`zi}_gikVA4WX~EUb<)Z25)@h`+eAv{1~>ix9m%Ju#I*-&tYnZ
z%~>+akum8Ol1{!0`B#OEv8T?lFj@10SBr(=m*nm^7`}pxWe$el|I{t|0WbccFcy8b
zP)|fX1N$|f&z9kS7x}lD4wjCR-_J&?e;2eQ#8B`^3T`w#fpZPK|Xakt6<<^|ybR=C(zM}akT$#w(C{)q=R@8l)P$!Nw8w(rDxdjA*cB?MPE6->ms>#bD!ei2G$f*!`Y?
zxUGYzw;Vq_#fS!5Hk6n70NUeEVSBhlg7z*z+}1(VGmC>VqQRC8qxjD(lD1dYt}tC%g1iU0Q~noMlI2)UF^
z0Qox@cHuvKK0X)fzdi9XkD)z|NgHfm5OLei2Hc!R;%B}NCym#F4YoaKJ%ek5WnaPZ
zJ#B@6Rt~&O!_v|5GL63Y-g%iTc=B;sG#F4`rf_WnyiCIIG6l-Z!0SBTmCwxKWv1c?
zr(c87@xO?01la&y#w;2VD|{3ezvX2T@ojwSC1Rb(#PYkJF_8E-LL~l9R0feV9%m1{
zj9Jq=R#=2f4ZO@JP_N``h!>iveC
z6u!z$ltFB(Ek)0cJ8rq4BhL-^u
z)6P1x(|FzjAfDJQTRF0rx8D)ioYQGDID3GCqIB(@G?s%6H6Y*8nH62
zhKv;7b)uJ|zfP?>h&8zUa=^>%VvT^8;SxE~V;~yvGW19fUM9_^60xaBl|PBr$;^Ld#sBQ`^8Waq{lik!9hk3Yf&^YAinMfM34$l+zy;aHTHxdeqAMqys&
zt4NcZ3G*^IrQ&#*J@PVq5wQG(|2Xvmjz#CjR80eqQcqr{l(*2`Opgg_?TMLTD`aN&
z+f9qZxf#zp3rC1&qTyz+d!}|jL&k73s6)Mo<7Qq4H$y#PPe*T$v0V3E=Ud(0zcgJ2
zE=t;Zd$NY{nbW(ww-06wwFA@aZM|LT!Aw_2OIy~}3})?&j-S~+(3TD@%-Pym-{|eD
z42?Z4j+*iP9c33s?d)r5Z|w@^Ui=H*kaGL>6?cQQLAlM$rk;-WR2$tSg_nHI+Vuyf
z{x5%h-+jRy`;I&g)Q0#XTuER`vy)ki!Hy-Gi3NR$#;-^
z^JDn_?6?`e#^LSXOsx0gej3V#P>34FB%2X67Np^HrLp0~oBpV{8H^I6J96BN`qPKb
z$Z<3H=0!hzftmoI@uv?o{`7&ypFYs|(+57Ha^F{ct+^TFPanteQG7=8ct53R{IVcz
zY=eO}YyK^YcPKh;2K@%50(G>+b&4k`UaI&tMW{huYiFT%VhXiOT-N0F9n9kmjwMpWgVAIK+7O!%!4vkn8XDO
zrsp<_NP<&MN^VD1?&`n|>@jIXz8KG65xEG0Q8^m5V#3vg<8l}VU4i`0)cq*(6Ouu^
zNdAFsvC!L8iO|_rsc?#fojWsthR4ZVJjVV#y91W%QHi
znNxlKrWr#1lEBg5La=r6i>#a|yOWg@$-lF5qUP#H05S7sBOOa2RsI9W
zl9>4=@)+jeKOkmkLBl&GubBzH(=y8W#0+P|g`4ysV)FD_wnFsG-vm#(ZW>v1QXez-~KF?c^2U#M=tJyRZydhkgZ
zjYdLO;C~2@GtJJg5idbI!{UMs7spNjRa$Hw&0fNmmzMKU4FSw+v7rR)KF%&qA5dMK
zO_^g`s0cYg%hoz8=FQ;@8b6%rCCB;g+5J%Qfs^hxYA|=gC!Tr1Z@|^Y!k=S1mOYkD
zoannOn^b`?Ipnjfs33Zz#7m-$sd!=Z=u{0nmo4jzM+=(m>c+F;#pB~L>(!q?<7UqE
zv<+r@d#VRI3=X8KJKNKP>2TW2SjqHks_x3PVx194^z>E_45r(*RQL7w4x(ajzn_`u
z>B{tUAiga#kZH|yWd?Vw+MH=`@9>#2(q?V_JNgED1Es6uW!?z9%+|m+AWz{N)NPs7
z^K;0JcH&I9Zc~f%Smq|ly!@4nhmkYwr+J6^oaY$uV#YV)-ElO0l^*LHO$x{82fU+&
z!dRX^!+ss<{22@u^P)N$j;0RnQy0EWk)JP2uTwl)af70pKjZh0@oR>DGJef~#;+N0
z4L;7Xn*9>UhqhyXl}*#5&Qdg#d{RLqxh)ePZjO_87f^^?;nbEV8V2f
zqFM78>FJuDqqtCUDG?v=M-rg`=9&OR<9i0UMbkSJ-=k=ZpV6+FKLfdoH2+FPJD=vi
zn1E(*oM7dsielWTA%K+Q^TP)F)H@Oxwhqf^J{+@!p|Zme
z59{pPp>isR+}^mGw?U>pv;!O69BLa;?|h86&oH9F%C#dM-tS-~RG`S?e%TLb-ryNP
zTL)3E9zQ(Ahz46Wl)DLY54Z$__AWr&)?pLJqdlm+f?&&rayR4(cw9U_z9ZS=yBcv@
z2T`vb?LEtg23xih>G1EpGt?e#0YQ5=AkI2`W-}ZKozGj0-p5a~jQ_Ok4$EDEMtJ?(
zVCC*X2IDr|4!M*~0Qox@cHuvKd=KFGsD0$`-4l27B--Pcw88F+h}&)uN^z4K$-El+
z+vBxhgKZC*x8T}f*^hC2Pg^0Nl>>LvR6h#t#;vQ23)HQv?ABE#!E!zB2B2HGj1N**
z@%18+T!R4uj%5X3q7pGq-tr{h{E^{wLd>TV;@S03xE4x5b}f{`d~2a3hOUKDWYU2lj^M-y3!SqMmv2k-sI&z*h?I6!@1~qu<=kQn_wjWorDWGFuv2
z-8Pu}z(O~Fz%Ii5#&_*x^_)Y@y-hN^Qh-Umk~0bN%wK_))vc?%kE^QvX-(U@y4thr
zhnTUoG~kD*XkP3EGd#i*KC_bh5oZ|C}FDm|3@g>DL
zU**wnC5jUiQ;LfeHz=N~_z}fR6)#u3TG9A-K)Y^TWens{n2I>MKDfg)gvuC2_n9yY
zTgvTC2T1+MNOXnNA+bFhxL>*ix51WCe}mKJHEY4CP;j|*mERESDlZ@1y2>xpx4*8d
zyjS1;#y*)oWb&-9d>6F}yYcO>>nop1k)gi*-;TivGi5W6CstTRrG&1pd@thpeET1a
zeCtDoOXx&p0~(H*wTG<_nLnGlzHk525Vt;LE18o0SwOGwaXs9J41N2X^_5?yZ-2I7eftk@Z@B-Mvv@S*ew=Urii#-}BVS?p
zweaolOp{+9(`4t=-#1Bq74^MVz2;kg|7(igBi0P==Img6$kx9h2
z^68d{(Om}!nQILs-baYU4IvXL+>d(iSp4&pj1`vS77bp8bW6z{i0AtD=Z(UXCgh74
zBUAYl1f%j+v>1~okZ*aJ7fjvDk)Mz)h!;r_>@kYvBZ!yCJFw4EITl;%H|8bekCOwD
zQ!Z`zf#c;S)Zc3XyHJi^SMRFb$qofL{5!7j+|O~E4Fp=G`98fHsmiBctU{RnDN+JzcC-eu{Fvk
zv0Wzrg>946LVme?74a2j6@!E13B*^*Q`qk+xft7nr3NinUgm#M3SQ=KD9HMaAvI=s
znfIb(1b$<-qn*+EjoHFFfp34~L@tu-MTdfcDPdV8xe`Ao%Jm0)-~J$DRd@mG>&DIzWv9ehT~;k
z5#Ro1&E=Qv+uyFbOyBZEah#rp**-
z^m2F#tQO%b-YIUIGA7VOLqU%F=oU64Q>V_-*GcI>D1Lfr}(_$i;90$d`U45wE^Wz
z6vr!0QkRL}gA~^&939mhG83@0gGs%X?Q$cHilI+53uo55|$
zaWm-lAmG+u!dT&EoNs^sd<^AgoNs^s{bDFLGxmJ@FIh6Gb(ia#>PE`Vv{#z35jQl4
z=dZim_oe2<1BEfHyqtp7eBW&k;+bOo_$Maf>YjcxZnHz@$rQ!n{Ne?n@;IMCiFh9$
zNr~90Oi96i8c1;d0*DyAoC69gsOSzR$c)4N8?4SZe94PZz4%+m%Jt*VSr(owL%zsW
zIE;vd=gIsC`Eh9m?@}PYH+4UT))Mkg#EWDCA|*2o`vKj;RMkA1UvL53l;rSFd0PT#HkLhF`
zNgjaC00VO;S_1>K4c&)S0m~vuoe{H?DW8M^^AesBa~XO@{rIneknhJIT+3aokx2dt
zt)buH8f&t7p-Pn9jAV2JY6X7$w
zQ>21oSvUUvy2^aNi|bq%#&i7j$DhY>SwH>bkK*3cQGW`O{A8W56r15r`Qww2txoxI
z%0|z(;Gl*%*x!RQ{;c<$jg!U;J?Io=J?IqY^Pp2Q)Pqi`^`KK`J?JEdde9kHBdaH4
zJ%AFDC-Wz-uNaRjym`NOVWtl_-DtuuSYM%w2aFHb*SrbgJmY_#jz)*ffr(ka_v6aT
zeFGAVk{oaOWcR@P28Ic#*Rkv!e^0Ybq#%09nF8ndHK|m*
zIC^j@4t6(+k$GsYBC4;yqrJalz#G_{>4ck}?%u5-Ju(zNEv@N+4sRfE-~9@#RcsV$
zui%G{B+zI3d_-0+?x)>U6SHPQeIss~{%XUW9qGZX
z{n-`VdwK`6ETQ__Ay+tz)ELHNv}bvYeCqw4-j+SF8kWxBdCI!;dP9;MuacLd;e1AR
z?uP#=x+YnEPVD{Be~)}b#x%FVcOo0c;ye@cT8{%H=9_1dZ|HL}HT9ClRva5M#{_8R
zm;lWjlM-lBM$;x5Je6dzK2T=5CTrxc%4d|uJ;7}(!mHEnndqz#V&G&}~-@EAbD
zV*m}00W>@Y(C`>Q!(#vqj{!712GH;rK*M7I4UYjdJOXZw)RW+QunYk4DxqqQRE6
zBOTsvbA|sqxL@{z-R~KQ+d7DP186VBhz47>9qDj;$A#M4lmGdP(H=yDVA~tYFPsV?
z9v6=fkF?WOon&kL?34~D}I_~
z{Qs(=mAfAo?@V9BY^~fqDrbv+3ptJ<8`#ebyYL@AzP?cZ@%e7g$76_Nc=Q2G*bfIE
zZjbwAAlk9W^r4VTA(QV2u#z_IaolpBXfFuu7=LquRJLzfCoFdsj_>I_ab
zY=S9=3Up<9I&6Gku-~g`>+SCDfOSXBniGzxNe>S8XIil=`v8XOh{IG!;#358n4!8o
zt0$SIa#qhVRE}*h%*X#obcNIn**dJp_MHED&l}W!vAVN$;HvWJ&fWvLu&%2eawE}o
zT?o0`QI~o>t1HZ>>pBjF)VbSW&(%;}*A>u-oo|JJRt~zZWusYZv2jU5Q_6(B`#CA4
zq7y1$e+>Gzv?Z`coN`D>QXYBf0Plw{?O#5v@9>AvL4iGO0!KFe20TcAh6sPT4X}iz
zM{al~IUSI-uKfWs6Y(}&0kEz;#fTJ`WqKp=6HysvwN=nO!mM^DMPh{$pshkHTnVH2
zHpC01nqrd*CL>2`xIbBee36|vjEKjm;#Q};iRpO9|Ei)0++
zi{(PZON5K7mderCmI)Quc)1Re6XdOkSIF)7xs`GqWF|@)+ba1L
zBqte*Q|sU4NJvhRXRybqBB(n}z5&VUvIIFZ`_RIHLT71<mgwMo4gBEc4JR_5Q?ll?KZSCDtp@K!`R8H
zDl;OaEQ9LN?Kt)|lZ|s6NzO+X!LHWOzLDerIu)rR?j@3Jf*|Z_o0y6vm$EEYcACjd
zZbGxsLs1eqHMy5!iR6nEgW8PcZ$WkF#7+wi&0)FKuOw8BZPA@rb
zoc~S%ahmYr+GL1%l{De?6TT@m#|8^*;NY_X50~Kg-~!>uybs&4Y{DBYlFDeYRH#>y
z=oE=glE5KJEIOMGNv0i{iU`KKRjQ24W|z{=TDNWUDk|d|2dcYM)tl_!n+8(VZ(59h
zU}xvn*T+q~J)OR?a13i^Hy(ey@su7uVCROUZ(DYe$?XGe=`NVbXExErh_UYVoj>^g
zTe7ODKwCv)=#9s(&-FmhOxwx6)~c<0NlRCIe|wOfY3lBVv3_s=U`n0C_=%i`Z5uG(
zZ(p+5_Yb2=v5klN`?Mk)eEYD1*68lD_QYX*EgfHU^`7o+95N%qRLP!NTE)KZ>xT}r
zUEF%wX~B?icDq|zUU@ep=Bsaaen|M%F_!edWqjKSLiX*5S!3B&m;E>*TV0NK1io;N
z#$IhMi&IU4xcp~pI=b?s-p1;kNkTz
zP5+>j`<|llJA$ma-=z+dxK@!in@m$hLxdjSwYK-=9cbS$_(k8nUV8jR*f+oJ
zdHxt0@E`ty$8a^_C~Q>+VA4lm`zXeU4YurXWMFuC&06qV44@|=N0l#zNnqqCQ|Qi>mcg=8ttVR(O}DV
zARTV+4``37EVdW6`MnTnTL)3E7##`GAlS0=kP~h%hEC@3u)R|J+vEET;9^
zGNQqjU4eACz0y#7?_u(!#@KRcE=c1jGty1|H-$8<(8olUh_6sxqFepxD9WG
zT*@YZ+%LnO_zxdnC63SbU)bjNamZnK^sx@ZcC^PaX@lJt(T+uyeTMr*=H6_6@5K0<
zYa0XF_J;Bxb8vjmo;Ng3c|64=KYhF?`6=h;RhiU_FCG3VBUs`4IIsvKhU&J8vU~
z7Kz2p+TXFl`M5N|hkO_nioc6^?mE0R+@HJ&`IZm45Q26c-rpeK@*#pDS17)Jk$*$J
zF6vtUB9lXs^
zNPdd=O8GgCVU=8ht@ST59r0%QD@wtK{2ht>{zXQ}hrAo@jE)bXOPbY|59wj`fCTwE
zjwU(_zw?mEnCE%ks5a<4uE_JU*Z_(X<|=&2<7&~hpa{YX8gx@vB5li2;YW|qd*QH(uQNP
ze8`0;`jhQ~12hF0`wBNEH{_Z6+U5{L=0Skt)lf
z?1>Oz8+M`H;q47)MD$Uj3+>|eYyyWG2TArx=np@Wg$*7@!7nn8;c5E_Bl0h~Xs6Ee
z6=g(*tK~Ll)pEYB5fkXQ^>(EPGhH1mZP^L?-F^8?hL>j5ztqbv9n4m6PE4E=6RPuD
zy8^whQB?26Onu`Kd8nH$K@&dpv`^WoZ`9S7|1Z-bmfXpl-rc=@Pzj(MhN!)FYbyvV
zE4Yu)B=+YxM&wmsMEKRWJ3fT(A!C^j!Mm@S`wu|CD}E@9MSg@j9ej`Z&I2Pj-pWdX!sGx
zt<&_;iW?M9R!l2yR_s;Wruc5f^A#^vH2zG`{!UF_qj;?%KeTzA#;^@|o2L0e&HVcm
zA5x?~hxtz^KBf4a;`53xDjI(#kmvg|>luG0KKlFpX~T~I4L^c>!;b(BKZ1P2j{prnf_#3@k^h*f
zc!;7=r6Kn7nU+J}Qx8l>s@gwNhaNs?hVLtwOZ^ke(!PmiR
z0$}A9X`JVefpUDd+F+ktL-~>8ATSbsB!&So5`JVhb~F-xWG%+j&Gz7c_IGq39@fV{
zjR)ESN8mV9U-!
zPWbqyp*aejA*cBS0Ej3kNSPv9xmIUy&Dl{ojUw8`~mHa
zgdbUhMtIHJz&7}QucFOA6>=$?0NU|#C*tAbTNLWQJ@F%Fp*@aC8@NvfB5uV&xDIl4
z$mDy5ZI9=N`?O=8!av3hYyl%0YV0H-I1x=@$bIwcSc(EbNfAA{9e2_Ewz)Hk=nUaD7AxDmb
zsYrYaQ<1_MI7yfmVyORE;S^i};8gB26%tpWdhuPz%JsHBi~AE^d?NpW!-&XdAsCfb
z)QSn2g1FQ{-&Y{KpbCXv-V?GF@gj*pzF0nvc!{)Q*QN4iY|CUlnoP?3upKA$$SIeT
zAvs>Y2+0X@6ygW`S9McA;=K>jClz
zS~yU?4w*$}Mo6_RK~9bQ3^}zz)~QbZ2itn-ME+taMGH%Wp4}T{8IE?TT!_6i$`#ly
zlN+&ZlGTu3F1I7TLioaSkUWL>N_heDtK@2I4>msIR||)Bv-};UU_;Eiqn#ZRe>--e
zvqRz^ftZ~gVy5*B^|oF>kLbzwqMcE(ArUD%jddhB1)YJJANONN;5|CgeMpUGStNNh
z+Kzq+hqJ-wO=4xuD2Sep?2VHj#TIPH0@jF?nb)pZ^4$=Qa;{L|c>Q5El}K_iS4^}VhC5_yF`V*Mzi
zFTC888yd&tEJ3?!}3`Xcr2e)xxS*Q1eeY{k32!4
znKv;@SW>aRVj8c!#F(A%p-$HW-|EKRZ3v@LVA+Y1($btc7x-lu^mt?xtJ`!W{7&VW
zV1W%hr8e-5)b0U;k>~qc*pBHr7bRk*T$D>?MKIwaRuJuwm7Hvm$~)I0q+0S_qBFxM
z6T(*CRt(E>wsdy&rn3rtF4dRkqkZ5swdM}neh+lC1*$pcEuC{TjANQi&!+0GOe;JZ
zA*ZLedSEc!wxt@23J!L(VGTh)Gt4;m@O9_rTnx4hw3-W}XKQy0
z)QtndRWi_>?&|8^+U3tC$>}~vCScN!KjseWPY+pM*SST{yUMHo-LyMCfo~XNnNQ%0
zjtygxKi~%nU*_14Bb#4=_Yef?EJicGqK@)VF7lI#=;l}W{ov+T`2Fx&&#xG*KXhX-
zh;e%-K5;mH?^87V0n&y)0KQi9E37~C58z9i$8)jbP9l_P)-Sr{0r)ve{XRa5U-S78
zxMMhdKl(i!c+X{+kAL1vaoS91P_$s>s9R;6=Z}GM;je4|%iHsgLcXm-Io@YKZyOJl
z9gcWd&pQVL<#UjuUK_*2e8cm&$QOm%dk!)*@wUN6GehL)5M`|u3YB#r9^UT*Py+KA
z#Qk!A)Ey9q>iZjUP$}fwVD~#z-~Z!Kd+ZTc*A+;IfA1ec?LieD9N&$Ivksq=3^h2>%|=b)r&-4Tq4ObnaP5yo-+v+GQhrlr
zYjretA{9QqzlZt{(ct(VM;xcV&s4_dMzl8)egBWSUmQ5~{nXuazvcMnK10LO`#U;g
zF7j;PZ)F&&?=Qtkd&Vy^TPp{B|6*0(k4)eHGW|kDypkD_hh_FDYp1|oWW3jR`1kO0
ztlqz9I*x1l^*D!rKqRd9FAi2&{RQNq_oufWXhb(NB?VtJkT{1BiFe^ALhrv2od&(X
znfezioQshLz5fHg!xMC1wxMuqOCV)85G$K@aluL60=
z)Fo+=kh2gkk}}8_%hiaNNH2C>DlORBSrGq*hR4ZDESZh`
z{pEd#&z1|Yog?G0_qk@3&Ut1A!hHESWEPlt2n(eIzv}?`Fsy;wyyHTMm-n
zBEC}o7stO!K7;MSQjZp_SExd?yv8dng=jDfBK{T#SiS!RsFI`iFXJw_%4)J2MdLlA
z_aFB`>}9li|1(%el5^1+(DXlm)}ZM>4c&*-G?qn@$6!Cu=^w>ZEV+bbv9fD2clu0CCV2woC?G)wxuVXUTNJYU%kbtsZU7T^P-*WRDfwG_P
zM-05T$mQeHWB{g?R6%^&NYpc#c0hRW?*8jUG;{acT|3dN;UX)pU)UCw7
zWdWG?W~7h9f8v)oRyc%Wo>!5^5s?pI>dZoVM2ndgcz5feH1ANl+-eGIRwl-m-R>J2bYvU7;B}LEH4q<9ZQF<#9C%oVolnWSjUBZ
zJWa!6vV8X|v5wEP5-aCKgj_~dRwD4>@E-YQdWRw$1+nKf(80$4~fgUQzSqZ{NcB
z!o}XnhN$`452q_l4SYTs$&v9Bcq2jJJE!9(JnuR71769WSA0>?%x^$GKg?Nf<~IP1
zjT&$~zgdBfpYZ!(tn(8iU9a^?d>HY(KBM@*ihou7r(y}eSio3?!;1sqe=y3iRJYd5{z|5sPgjq4qMNIHKMOXym<&Xs}f}kPh$nPH1lG
zkjMS9AE@jg4&_0p>P;cv2HW0H9%Q6`p?;6{u#d#EqObhW^3CU%7bv;$TNB5
zz=Jd_8^yc_w-zie0Jj#bTML#<27O(DzPJqc9Hg$|D@G!@1_K0S#tOa|C1RYY;z>S2
zVED{{m_IWhp4H)(PlEnBtG_SIr@v1O)!!Fc{e7|3-fg$K^fUTCh}+IM+I3$>QDUL|+}72s_Z!6*6#uOF55*{6(QPVp$k;}uU-e7j4ZrI0{`?|TAKm!p@b-v})NSEr`7)CSn?(pfredKW>}ko5ubtWh<@xA-~+T@&^eX8Nng!WNhc
z=jiVSRtC3SKo6+)kxdXK($VrG-$i4Wvxog6{1j*brVd)=aioA$D
zP8E7B&$lKlJ&B}b1|;p8u=Mva+juaUBgJSlcTL#K(3)KnHi_SLfcy+Cm8=x4IJBp0AxVETKDIhy1k`V*;1D2wv7W8LJt
zIQAmRWOHDOOiN#FzhrxZ&h>6{1(Gjem$F8u1i>&Hb%KzH^Q
z)=$K^M#eZ2e)Rf5$7~EV*39emW4vz&Ot}&HK);&}?#T!GZ*Y{sny~FS7V8q^LR2K*
z5%z)Z)`Sfi_`WP3=w?mWm+1qYZS0JBRaJIT*qrv95A?mP3OhD@pj&l<^)+nMfg#$f
zjGHvj(-rM6He(c87A@$2r^^0rjYwA+f-GiIAcDDkJKbGor
zYi89zZ|5K~(lGvVtHTCLlblsWbDh^XJ76#9CS7(lNE>vA+%8QX|Kg{PCO*8Q#@L6gQD|=?)OhE
zP7wQPsp3J3YZMPxJVtSY;z^1viXDnu6i-t;UGY7NXDfbC@dCw56)#h~Qt`8j*DHQO
z@m9reD&D1dzv3f`R0{C-8CzlCFEsrt#osCZQSonzueLAr8}Mb!alZYIpamU7Spnc(YKH3485!+iYn-n=)t
zMUWY~Up`-Luum`Emu=fDI}ZQ(e4!tKd^`@kX8bdhVn95JgP=;7r=9KbxZaBYaC^J+
zh5pVVa%<7Z&B(LCw$X`<@P2=bhuQ+3tKcKx7BN}WOXJLoi3){4Y
zeWP%E+d6DwcfQciAJQIeP72P03uBK$H(2ydDLNirF690kBVxJpXPw7db90LK%
zjr=>RSkEYhlhOK6kLZQQBl$QKJuK%dz=@NeLKFpCARIjbLV>@O@3BU}ja<+2eB8*%tgqb2!w@1jLZ@;JyxHXC
zMtqOx6wBukJ^pRh&qIa8!xYH)Fa?rA1wJw@1u_qD>|OF1I#(GN=u!F`q2u$IaRy=>
zpPMvp1$2>4N9gLrq+qydbfIq={l<2X9xlOmja33@;
z?@n)T*__$5IeRr^??$hUojJd(cIPvlFCAlo%NE
z66ce|@C;Bc8=e7Zcm|;18Gwdo02-bFXm|#o;TeF2X8;QF>ffb5V6c;F(HCIt?)?5W%p!pwF{FLHn6t7jhS#hY(^!qiRZa2B#
z?<>;RC)2-D{F5Txf->K%xe6@8=P}b&iqjR%nybiPsOg+FSE0Z&Ypw#V&-4$e+{YBJ
zCZhbaiq~mAKgjrzKT8p6$JgF>I$o(lD*8R!@;iP2XDAz>Trz>WSjKt&7#i>&{_w^y
zGvR1#Z5?JDivO=-EZAVnjz9*6i`T3LM`NIHJ>I?X1OJ3fiERXRZFDFqI=f->|Q4DjlGGF#7YM{J>FYFNHE2Y2P~cc9aL*VCKkyaE
zrS#Yc{2dH;;XizQi$eXkCw|}uXpdvk2K#%7b}X_ih98+iChZWY>*s!Xez?!ju=MD=
ze;)E|uJ#T|sVJf7_DmM23A(sT+*y*IJi5
zmUOkD&j);i;6p1EoX-&FGo%e4mDHtW6nho7D!yCseTwHQI-enazkLM?0QTQE6*;S!
z=?4`bQ+z`4=ZZ#m3c25FnpftiZIrX7zspDltwT}jsQ-fz4Yur9q-~rmX|Eoasy023wXv2IKtQ49B5?KZb7WEaU&6
zqLo{R#i{b?&bSX8dLO`qcF2uH*L5M}ZbuF3_0W~O)pZ?*LjG18?C%(=>$(E{a=sM;
zS~=*t7B6wSuG2B3qe7?cF}WPtthhXblU^Vsx-P#T{!4XJHz_(@7cLY8r|WXMu5ye6
z>h+*`3BoI&>uRWXx-O^d;*GaPxI|>FG-F#Qbp28EYBjoM5yF$kOMLJoUY61
zx}2^{7k>&qs+_LNd~!OwuC!S_-RL8-rZjFXsO}{#UG4qt!SyoSwWx2c7g*7R=LfU<
zU_9iTEDcw5IJ+)q*A)yb-iDm6%ktU$ScrKqaFKx^L<6?l&x+>ED&aRq_$z~HS`B1_
z({(vr*NGTl)b+hx(b;wR{c$cnlh`jGQM^>~az*2c4CPMOmA#*YV@}uQbX~8Ku50OX
zr|WXME~o2C&VeZ(7I*p+-tyqfa1NhLv9h^%$Ah23XQA>#>g^^o`8JBUIgHM(%NTOy
zd}2AfE;ok}Zps47EvM^(4V#<8_;UQ#`MtNTtE=7Fbp>kBA@1OuUDu3UWfVRhovsUS
zY0xPgioPHorFeqkNs6Z`Zc^+~98i3};)fM4Qgn7*e!n_hm){Q?RF~y+U0ff<&0%zN
z7{}Zk#%0T#uFL7VoUY61x;&5T&O|-)k|%#lmSI_Q;TtplWsfeHhRp!+YHDh8{^-)n
z^TP8&&?vr8sxil}X0u_H?QFlk{*Ly3tQKa|@c+`%njY}y2KMwqjSv*QPHQ*VBjXpA
zo5MKR8=MdG$?5F6oUW@q6}HK8x-O^ddPA=P9jMsc97enjAUL}&XV>NIx_lkiBGqv@
zT~~N5V5jSHx~?&&>smgVwQHSkdgreTuR3lHqqFOBa~Rzm#+J7J9eqyM6*lBr5-9%M
z97d}XcDgR7>vFoT{&ZWGrD^XS?CbAs_q@XoIb=m@!J7WI&8ZVQ`g#X4gT4Jb7N+VK
z*VNb4jj44+jgm_@PS@phT~62KbY0Fjz2`aK^u7)8*!NA}Snqt(i?i!;c3sY{%h`3Q
z(!&2X@9AyX*4vdH%yf0Mv}HZcclQO_3}@HnbX|Sf1?Y@&%jvo@n|eB&U6dGi!?pKrZSBh5aNHb5-%hf%qbcho-pyf@39(9<
zD3hZ5$z+)#ZVqED^l+T3*r>Ql(amA>`(-LD>DfQC6z3~eD=tx7uDDupo#Ii7$16Hr
zm(z7QU6<2!;dWr=%fA71T}zyAdZ+6Wr|WXME~o2qx~{>FHW(J9sylmnt1~@(l|g)4
zW+2m=>BY~OePE>TdF28@C(*Af(@p;7;
z75}REl44xvD3&NrP)sShIgITcty?#>3=FzCjC7jFf8M*?9LBLWhq1B2`KEWeE~o2)
zH+tur-ude?Ud5eVm(z8Hd~VeRhJ40yt3EgB?7DgevZh>4*99MbO)ZVV7;$!8nf@&;
zu#rs&w|2K?FE3};<$3YO4b{hZ1*L_@6gj&t>bRV)%lilW
z0lL7b>Smm-%kPhev_BqKd_vLby1bgfj_vRt-<}>!do`^C171ykM^}xnvdZ*y_M*tB
zuhOlp{TzzW
znYBnV$}OksYEQLoPWSuM?ON8fwQcS8<3?YRqu$C%*j{vYUCyq{>AIX<7v3;5IJ+*-
zy9a$i9o2)1k1GC9@n?$9DE>zA1;sxrI$f9FkGoWtb)TZsbq(z39!$4-HL$qyakGs%
zT^BAM4b;^z)ZyR8nQp-UA7Q&^gDqQx3|zKevlcjiU2hm&SCjKi?{r;G*X49wxOF>S
zm(z7QU6<2!!LwA$_JOuEyhf?bmeY0lhJOA^qYWWdUp~)K&aNxa76&%6&aTV(rq{1S
zuH)$DFgjhAucJC&byF8BenN4l;x&rbD&C}ci{fpHPS@r4C#I)(5iFqw9hcK}p&RDo
zpK}VM_-CLFD;zLUQVRY*-Vt~7K7~MLIZXHIq4x?L#vCaAG$}#22NjST%!4@}%(amA(?H^1H
zQHi>B7(-u6{0?>gx}05?ud8voF25h{R)1g*Dn6$8gyPQ?f2H_)MW^fXZ!K1b<#b)1
zM?I7cwqG*HVBG4kj)SAIeO%YI*sa6p?7Ey?m$U1_ZO_?tIlC@r*X8WGoL!ey)A@E>
z*~K-TT^GD>u@f4%yeqKXYU^)XlJ%>#t+Q`iw!@rV*T80{>xz2C_EXECv+Htm7|+Fr
zHs^3UyDq;UzM{ISZz?)nmw(F`YKMjHF<}yn#c#Z@Th;%Z9B62yz-c4yaxVdLz&oL!f*>vDEo&aTVZb)|AlxpER#VdVUEIe%Tw
zUzhXO#V-y&I9-?1bva#^uj9H&bz4r?<=-2o0;t2X)9IY9%kP&X0bxI3A0Ow>&Ez_@
zh4{DYKfWDt_MZ)pLVe-vx{R)?vEJ#rPRH#gDu-ZD#N={lv*Pj$uCxND>ykO>jm7dT
z`e%vIQD1``h-=8{x}2`d>AIY*%jvqDuFL7Va+Dap;g?&7F;~y&)?svW811(g(doLJ
zuFL7VoUSW;Pq1;P>+-z)Y-a$i-pc8^Jdb)k8*IOfM~1cSW7!qZ0iJJ#fL0E6T}{J%
zbUC{&r|Xh?q1mc;x-MwTBeCSOQ29k-Wp78HAoVs}T9HKA^(;#yFN0bXsjEz8a*dIU
zt)OHgR)mx%3%qD@8a(<%=6EF~2bV;XxH!v@w_;Z0p!o7xmFp{-P#T-(t*?Ndb-c_?
zRzPTKvV0O0u387)6$@h$O&(lQQnJ2cMae-W%S!~}i3((vlprJSXB3I7uV6{>EVNgP
zhD#c_FC(zNVj3qCRN@~8h(IzR8{8a5H;2*9VRUmC-5f@%s&R7|dwK`EgV~C{g`S(k
zxM`^WE$x_&ftGsAl&D+YS~;>>t*Y@mM?d9UCyrSzo7c4kz28?m1b<~oURK`o>5_X)%(8kFDJ_1!Jq=}eE8?itLE
zyteKE{W0ymTU)z2vi+w05Ez~0bOD@-FAWZ1`#@V7H3u@AdOF%uM$Yu6wvg@Kpe=S>
zPQv!0^VjA4bvb`sIVw@N4kO+xvcavx=y`4(Mql^i)?xJf!TF~5?+?yjm){T0uIuIL
zx>^R(gPnW`AHV+i<7;|rhtFs9a~c~Oj7F?+d4r0aT72fZqYv}Hh5d6O-hyCmBy-+|
z8CVE$f2=OR9MnnB)7>u3H+u&b{phUypSbyy@)Oop9P-4?FCAF;aJg6bq6=QTUKAc{wtRe}Sw*Sx@On1(T5@
z=7-2;*$&C^@?A(ykPPA#@;&_AN+B&YQTnj0lD|W8lKd6%{ZQt4
zljRghPLaQ1k5gqn>P{1yMo*VD$eAG@!Ew%%JCUD~8c5EPImq8%E@T!rl%nSeIu
z%AX-QPkxNL^W`$gERc^NzEEc1cO4+VLkkDWmm#xA?!vZOPC`zN{1EY4c_+4Y@=I*%
zy@=xy=)r7c@tj_iHX{
zE^fxjEx;~UR;@)F@n>;BtExCS;wK{7JlTvRDLaFWO0o&P1-04TD2LkY9P}?zGg%f%
z9*g}!iFPbgvE*SaiI^VR^&NnTy^G%aO=bMhJk=2v!6x8{X*H?_k-KBZI
zcTL9Gjq?ZS+*JKhUN1T!9-5kpQ-hz1`_pl;SY7ODIc}#H@e=Ie2yQ--jbh9pgvFDx
zAvPl=8+gC-Bp&w)I1wf06-0|(+8HY-E*S8N&YHC|R#_RT!?r3u;MLFD>0#C^+F?V(
z8k=ESgxs<@J7YC?a
zujAsy&EZGyD3o}#f}yfvVntO&95?V@iI+uZrs9REctNy36^|A~i)$(>;)#Na_;}<;
z3uaYRRaWeWN)zLWs)FcdiI+t8tBDt_j-$pYHSy?Vwiw8aFNkgtluS&;OZJZ!)yB)~
z*=SkKB<`;wf}ti>N!Hij(ca%N;0qg5`D7glXTMI6*lQ@7gI+cOa4_)65QZqrxc!4=iE
z-Y%%FyE(_LLYH`USJ
zLZT{rGtiz5ZVrArdvoy9*;DMN8$uLJp4&rHOP2i@Xf~xVXCzC@a=x_rTC?UrY|@<9;mIsS74;@$6Q-P=q_QCj*D-w4WgoB~Cq&Ra*_W|4Zw@Hg
z;TO3%$_NgXzcqpl_d={voI=D)_x?m2GTUbPGDUuPGrdmnXhpo&oBWd%(~6rFdlk1S
zzFYBp#fud`p}14=8pUfBZ&JKP@ixU>iuWl#r1-ev6N*nMKBxG+;){w@gYfrpFcI-S
zYmlFlOpjNbq&QuXpO!3Ns93AGRPi9iHHwET9;3KH@g&6-#SXlMGCc&p+!74K5KU-1#e?<@X9@fV7}Qv97FwQKB`zbOhXL#7KA
z%M>dVrzkE^Y*0K!@qERPD_*U5qv9=!-%zAtiTis%@lnMeDL$o0MHA(Ir}!tue<;Rq
zyI^^V;snLXiZc`sAmUcBnpos{blXonUU8#ho8l(Lt%^Go-%G^)KB(#Q6+fkTrQ&}Q
zA$OCezoht8&A&_2_bGly^M9!6pD6xZ^PkuB3yQ{A3++>D%HI)JEG8mjQl;a3;a}=8uTNSA#h~U=Ddn4s=C4aEY{NJ}ucocH
zySoElu%UWTzIQ`t%?ZcUqz4E4Gp%^b9>8xLVR*f4pcmozaQb`=53m9MeD2tQOVEV%
z*iz1hc0`t7eA!^j)*%B!)oa#*%@};!AvY0eo^n><(|RNRZ5>3tkD(y^5@E|W4UzjO
z8X2&Kp|Uo_!~1;_JLL0^`{n-Ze);SRRriW8UQ@`k!IqtljBtBL;33U%&GvlFlHcw}
zkhXOY^%kPN3Pv>8vJW90ZttyVkH^LK_;zBC?<&M?9YnpAXm4gH!$zr254U$}s6D>j
z*!KP#an`Zt^c3v$9ca@Amht~qMJsnJbX_y8kd{&IZjIZbA3!c;6F}~l;ST(Vk8g9R
z|M=cxkMB{$al7jSnD7_0$1!OG_sKxCW0C1OI2kEqqFE3DetXC=`$T&|I247mgH*O}
zStl&F9S!{=k6iGbcKrGyM#8Htt5bq4wRc|aPH37DhVp7r&+uwRM_vYAt>Tcx`pa(q
z@Y-BnEp~(`ujZY_H+)<>XM%P?rv@C`Ty)O#dvHsRqT4vaY{+tK=6RBce-Z*9B0hxf
z0LS({0}1nNi^RK83mn@~XgLy#e}|H>!ozV5f@3ojog{8UX7R6)m5*cVMZU-_IE;wg
z0l}!e2kk?pj-0q`#6T>N$%q%qJ;+bUCm~-X^N~|5w;^64WOqts2ey`DI~&I|PTql>
zayb){5toFILOR|sE~KjhDoU!d-M;X{9cT#EQYnTy|b
zfcyz994OyMYm3Y}In{D1a%$xNA*WWhV_PRhs8uf?M*d=%kN6U4#MW|bU&3A*Z2I$(vAXxjcjT3V9K~=pZRT-Ic;u=v8tJwg<}wv|u^5Sttd^RteE8$F>~;mSejR
zRYt(EU5!1CiernB*7G^G*l!U%xav6UDRv0jSzUD^q7fxdJYV=l&?;vX@8>^5=
z*@G;PBtML<2Hn<3u}Jc5_~{_nx|xb4k6~G?>~khF`BD5L5Nv;BSt41229YwaRf**1
z&;_8|`YD-+k>(snl8$uS*MJNw@t>D&iyOL)Vsjxf8~<@bw~@T6L#l>3!|67zhXlHf
zQkHIuE8WICzGt0{|0rLUK({gP+eqKdyt8qDpxc=DG}1q2UOP6R+nAR`Ul!v(x*Bqz
z+n6^G>HV3yf+wv@xg
z<(6R7<*;$Vp%)|!Cl{piGjprK%q@h&h>
z0%{`6osW1z%SIhnKGBx9EzS#Cve-YRLr4#f!ewt1&dy#sj-bo+4WAz9ZtL4Rltnx&
zXEq2=^bi&?OIWscgq#HD86iyp;mBr|2Px8zo!wn~o{WcSc-8*oL!EC|8)j+9kG{SH
z9o|#;WxhL(jxRW4nWN)p1iym(;J*jk)L7)~sF&lX4*NA9XE&#P7;T5gk*}wt{@v)a
zpaz`RhZDI!(-2~xFn^h%;q8!Kr|F{=Hz*q34&`Z0Q*X)oy^7lu4R42h
zem}DOVnxH-A-z-6*C-m^4*54}`W8jQ+aZ6KrtedHNbzw+!`ngbDNR48_`D*O4m=LS
z+X115GHJuxA#Hd&pyBO+P{NpU!`mTkcsros?SO{20~+2AXm~rI;q8Eiw*wm94rq8g
zpyBO+hPMM6-VSJZJD}n1fT!#J4R43E;q8Eiw*wm94rq8gpyBO+hPMM6-VSJZJD}n1
zfQGjN8r}|Qcsros?SO{21AbrkZ+JVT4Q~fDydBW+c0j}10S#{lG`tJ?<@XP@fpS6D!!;l
z#TMHUs2qq1#c_&NiqjQox=y);ic5)5YaB_0lKogkv(gOGr)s)Kv0w2l#d8!5Z-;g-
z(e%d^X~xfXuTwO<9pt{Q>Dv_zZ-@McHT{^P;q8$Bw5ETlXm~s1|3%Y(S2VmG@=I}R
z8r}~14VrFJq^_F%GEcEyv02gbcOTL8{ff^hj^nsP{rQUKdP3S<
zFTnFPpE?ZMC-A;bd2_!5UZiQm-{DL9mE-Sldks-&j=%GtPv~xMKK{uMVJMkEUM?JP
z%1l^IFTN-Ld{3~!mVF2r;r4Dvdps_-$9Fh;d{-fE>mcgA7wwIN
zzq>co9&Q0ad;hKN@tuO>c2hlcZXuX9FsQKz98c95QIL+)gcqjn)fO07g=VXcFa@w3XDJA_iV83Av?G>
zSoS0u`h^t&TDcH^x8b$m?;_qIiQ5ak0}3!NZbCuDA+p40?!W|@8F7(-xx4)^y!W4(
z!`U5)qc)t~EOZq|l?_?W4l^5YkB(mh0k9dDqN~8!9R<0FB+T>h+*R6c;+#0;NhIlEHaZwe)f<4wr<
zkhh%Ojfj`XS=e={^kG{j88n%cDUcs089xY52vRc#RX-H0&ZXDYT`6^nNDc?YTN;$jZke|!hEkND5G8_5x3|}^1_@G~4
zSToDn{R%A{C_hJQi{u4tt7QXnYA~CEucseHPMuUDUN7%O{$ewqZHbwi*C1rImdbV5
zOQU=p+hy_qwoTIg|JnNz_^PUF{j+k1+)S5*gfIzQAV35X5(p6HFexZ1GSt_<`XD3$
zQVGE%;83kpZSCM#wAE_sR9~rWwc1+ST3f`qt+Upr)>nOw?W?U;t+uxH|9$(cea^Wz
z7r0Txpm+ar&bRm4Ywxqq&bepU-`;DX)HL}W;?t!B@fq?j#AljSh_mD-l$vc;9$Lk<#Kjl=gwhqmz@I%_cV^_Q*x7;mlHo3
zXA>?$bC;F#HyY*(((>{uMju9W#Xxo>Sh{Aadz{@5jWBLzQN@b5M$qT%o<%Ww6GWZh
z?9QiVEW8A%K2y;)a&~+fWvIcn8_teuqo6Vpo6FhV1_=vQQ_`KYevIXlXJi!?9V&=xchoE>GaBK@+FVF%8RvILrb0JhLX=z+7NtRCq)%Gexm
zc9g9^dMRbUL|eewao$`P(iyW+{8#>_Q&Ds4NosfpJi(-jf)L$Z3iH?ea
z8^aPg8^tw;fO`_IRLnqtdZ8=}52%o35QLq;5;?3`!&)>a8tZf#4y_o5MRIX>dD|c?
zrz^nW@h=T7k&AkiT{J(pLn*ub!aO&61bDgu13dYFih#V5tLUQO(sW&#dzjJW?{Z@?
zcNLw!xkT6$5_r)6)-;uYex-pai~ZUiN;rcTSG=H-Mi
zZ5w@~`HpuIn40LGT(+i~gcezV>#FEj+}?M5W6
zw+k$wibC*gubsnF!Q|CMQ*pKYgee}4z^mb{V_CTW4qc<73O&nT5}`7r2(sU&QEMBUtgACGe7#iQ3-E(1M-&mA)(f
zj$a$Soxk(PYTS2Xz7jL^X8w--njwFOr@K2&m*wvq=Oy$7`Iany=k~+?#@~G%;{p8t
zU8!g$KO@Zv>y*=+6Ol9Wi8~cJh{yDQD`xpS^ann3dmDdu4u78*Pk3DMHO1lh=B0d^
z;!4HMiq|W0JY(PTceuS~`8)KwAMmd*VGQ=5YCMjjC;T0sZ#LMc@?r>V-OOvowm12^
zt8k!9_`54{9qtG;#73LYo*-Y8DSy`pE-QhuHrV>!D}VP{)VDYJy9-et*IU?Nqp9of
zGUe~SiHjl={*L3lS^f@l6nwju3o_#GYU}G0ChU3r-3m@*z!0wc+jQ+(7T@Gl+}{7m
z+_|xm`A5fg=3X%`|H-WhSW25OwepZmDtK_~2&bZNH2;}_^TFtW=aY)?Ar5!&4Y2Xcy0
ziJ7S^p6N?N!-OL{s1nYdhMy)_K)wyA&C8`YyJVY}jnJ_+FMkBZkhG&>YxB}wkLTLF
z{3+xyIUD+UlE9NCU#>^IKt7F=DwN}}x9jmv!BP6iB1qENyyWDjWSf^U)RWHUC8^E9
zl0dGtdAR~@7;0>DCfmH63VE{4%fTo+O7bDMHZM8J$J)Gf*Wt(*$^L>Y)0CP^jsc0Jy=ag-@?Gxk&EZtUx21@x!MTQFAw&m!E=y<@QK_?tgxVAk!HXyy0T1x6s_AR6@rk*auqwH;@-=J(WS_V>&GA^zggw5K$
zq^ud~)s)pj52PMtUqbrxlvSewkb0E;0O{{h#uc?7^y?!ky3yF2?W4i@jUDS{jh&vH)v&;}aKRGWLc;>OZAm_QeV{EqE9kdc
zo4FNzLTP3&z6Hf3m++XZ>
z=F)y=-jLyu+$DSB6g^V$kW{msAQe4>orjTIgw4*vgln@il3x;$2{32%-s#1Uhvm*x
z7O^?YBDQ5)Uwt&&slab?*BcLCEsCL1%ecu={|3dU6zOV*
zat^cXTRsuD(JY^cUiSl^Lk#bSPYe!$;LO2
z5yWwO+XOJ-PpEIaO#tor5(EEsX8;!TWwIV{5e_ywO?@cN<9cBe+V`B7@{b$f6IW!y
zC)Q1^ugjEAtiib=czj~9)5qZ=GRpx*-azh<)wr$FG5|x=^LNLkXkhzj-w|vd7q5X3
zG-eGYwt=af$RQ|zb$ucHOR%o*3~GjR-(o73dz~o|qmjd0S`f^Yxzz3-<$^OA&SMF@
zOkrGaDGr|_WM4uuAEm-_8RQXp0rIHaXv&@ic}ylDo+mr7&zDbNUm$aFutMSEr$}a@
z%DAk?zK@hcQY-^dLy2@iv#;bKUMl20%H(qB^ph3Xm&^Uo>@Qq6W!Lq+1N}k5N9bUA
z5xED*wa6V}c(1jqyhUHxd;1NsetB0W3O|P(2irBj6*$>
zg?1;W$f?**6)ugdm;T6|Cf`7Oy4->@ogu$Ke5TwB{aJE4_OqogS~5p?T{OrO$eruN
zo#Ilk&}=B2pTnj)AwIV+FmZ9h{Kw@{1TUq>eShxUs+xEBZe3usVIcUUd?>fM;E#tst
zk33(|)sE|TrwNX=+Bas`+U%F3yj}UmyFO^=SLy75t=b#I=JtH{g72$+Ibd#^
z&7a}^J5X-cG9`6eicc$daf<82%AT^h)UwX2yk~}?kdjh+)i$2@@9`I&rTiG(e^O&h
z=c?MNbrWl*1ZV4=OAc4}=iE5`)$Vk;m`H
z92};Ii0b%VMZ~ACL1SkQO8h>fe1hT>MZS_#zCh8K1wne5ra!5;T9M!4)ZeIRUW1VS
zoTk65c!A>A6u+T(wc>XauUEWD@fO9~6z^8NPm$k>JpL1kzgK)g@&6QGQ+!MDUy3w8
z!t!~F#?BSeoYO)1U_~>39%*C$3RtD`Ns4A(J>+vVy-@K`#UmAuQao0%NwHP2UD3?T
zM}42x^k)^%QZ)9qkiSjSmndGYc#YzB70vh@^l#Smt%|oR-mCb4;$w
zuPDB*_;z(-Y%X|<-Du_gk!8Ak@bs&f7^IbPW#e?pnM4f0$BxqgLq?F#6s=x(P$
zGgjl)RgcPfpTZZRH}*rjW3~)cY1i*7jA*cVha+v{%(?}7?o@17(dKc$BY514F@KBa
z#p7a_&pYn1h}$xVI**{fQyI}<^IDN+oafE36peo~a9d{{w=PAiw-C4PbYo{c1`f3e
zU_vwWG8yYSA9_1bg5!GVN^>5?K%Oh=^TJYO@?34O=aD+rbp`t69IFJhdV#U7MRTj$
zC)BtDS!VCX-Tf4GSuVvC_
zXKI5#%iVAwvB)+kVDx}ij=K4vS&LG>51PBFnd*avE8jBmL30ZfL$U>jd4E1=+&S;N
z@(_N-hVG$oMRIq$9ynsZT)
zwP)q}prIkp@$!4@tJDV#XHZX&GqJCc9MoWa&?FF_BonZ=bKY;lk0jX#&Cw`jebDfc
zVSUj23CEo!9LSz6OHhNI^FAE6=5BM|kB34AbKa{^o1OE1HCpms=Dg2C9brz+--8bt
z42<0cRSb;L@l5z~v~a;d^9=HQ(5%O)V^oY|fxbN}vm7%VKM(qQ@Imt#7FQoMcFsH3
zBQT)KxWBk(t)bKa@vJD=e#ek3-3&ifLi7GVqh8H(zB#?E#B8bmF~TgCi<)0v>N
z89TR~xC|P$Vi{^Hnw5i2+7tyr7vBT+QbC|PUO-^wAwRmHIylzv5Xj6!Q;D{~VYV3_U
z%y#5AJ9)WBlb3seR};RXa2*+zX`K=;EK2(F!ZGp>v=i4n|4lWSCOs-l^f484V#UZS{M(fBVxJ`QE-U$5A%xJ8k3wRrq<
z6t^i}qR5FN%)dtQyNWj`^1YP#w<_MQc(39EijOHirTDDkONy^3zOKm6a@PBjP(C#`j3jdYj8ZgQt>dwwTk?FrU@b4<3!6)+@ds{aJ_1I`h#0HzkdpRyOr$IA*gK>aYp~v~FxFk&7Y}ZO`whW@q
z1ROLkAh6MODSGv&gx8Y|R<8+y;BkLm>Np9=cw8Qj=S1YQ!j?hQxfk^%7|~$!PCz5OrwiAF5ukd0&DgSl^$Z#P+a0KFw|Wu0q_FLDcyt>br#z
z4K^=zUhf-$`tTF;>bnkcmf^FPfiBZCnb&&&DoMvp+=V)98(7~==p`7@V6UB>NC(gN
zpMn14dxAaRM-a#5u}O+TR?|o7YROBjoG|Ipe}lVxH+!
zTN6%n)4@*VKcAFE|9B~lUypHUrQtzx&^5e@Z18!Id~^)v|6T|Mj1X_bDT4!E7>deGHZ
zNIs8J>1_Yd@l{N=K|fEba3SW)j}b4B&*RXAvIYAhIR^E|C4t;N!WpU7ugAmC>?<9p
zp;Y*SP$qXmv!9SLDVHx`-(P5p#_}MaM@t4tf7CEo#-Qv0@;G#c2&bG5mG2*a8iohJW__;mRz&S-{&PbEEDv%8j@UCEq!fqr{CdE4
z2`-iR9J~O4@pupwE8~IG4Cdv;`QjC(sUr33@q0AV_3Huh<5ScL$Csn0!|Sp8#6ZKt
zhl{R4DP)j00T1$5s(H45UNXWst;b;){CH}{!Zg3s=S4Jtwtx6i#*o04Wc!DA3;t#z
zO%6=|P;C@aBPluAxieI98zePIRa4^m^_Yd!G;E>2AY1)<9EmjFg)A+?lADljrk>Iw
zl>H3pA5(S;8mN9f9!2^$l(k}~em%nIR^EU@eAua95BmAwrEO^w)>n_T@%3>ldO`hq
z{0C&l*9T8e{d&-J(COGv=^p8noc=e@!)@s!$*DLOq7y79!S29ShEv6@YH2u}a7mOL
zC&r!wuY&)87sWM~tPCd|{1-*}2oK|hp3Xe-2hgVmzISQC2l`R3h{vadW1eIBSaDvb
zVOi#Yqbcr-CiLy=W%f<@nWzQ6JKO{1;|O{j&v%EL(q5iSJSEje}Y;VTpKYo{h$hs}wqHZ$-G
zT)UyYv8xK^8)kL3ukC`Mv7>4IEKY!((plA(s9IV!l&aTF$}H|M{%s0+tjqVt;fVv)>Vhsx9;^Gyt+~*
zjJpa`oUE&kRlFBAbu>-#SJJ#+R~^e;V%1*!?CZ&a3x7>ZV0wPK|4Y)paj&i<=;eG=
z0`DiinUCU2E~oIgf$z6|=#BgohL8A3gg3wR{8UA=ljd!~9b@Czw;7AZn33VAfQF+2
z8jcE|fg?~a$G~fdkWW=KLnTNr)btWXzW-Cta8$rXO|MsMS2P?I@;UBE{c{xgP0qC8
zsDOr}0$!tX!%-o9gQjm*G#nM=w`=-d#Rn80Q+!JCS;dzWUr~Hr(Qs6#&u~;g!%+bZ
zM+Gz-70_^0K*Lc1N8+Es_8X20XgDgM;i!OyqXHU^3TQYgpy8;1hNA)+jtXcvDxl%0
zfQF+28jcERI4YpwsDNka@eN0XwBe|LhNA)+jtXcvDxl%0fQF+28jcERI4YpwsDOr}
z0ve7AXgDgM;i!OyqXKdWisx@QDxl%0fQF+28jcDm_)e#u;i!OyqXHU^3TQYgpy8;1
zhNA)+jtXcvD&W_(o+}l%E7B@A>)(@)jwe;`S;ZF>4M&CYhNA)s2ULKDqXHU^3TQYg
zpy8;1hNA)+jtZE>QDK1Ga8y9E!W+1n^#V64av+cCt%_$Vevyd!F4VL!Ob)&6nx^?}
zmb*dqey-^qipJgn%5$iZdd4_3@Cns_Uga+|2{U_!!G_Z|HSD;9p_F80`q-|O*n;(a1v0o^uP#@n{SRa0hUVY~xZp$F*EJl5NPq4w}eF=hKeW##4
zwukj`1lYFkD#UFWM4e+$U%Gxt<=)N=)Q4MuSKoD7AKxh$j>bVV;of#&yla?S#O&E7
zZg(jfA$HF|FJTivo(IEDY{BzAJJ5f-WLIlQKdMT{iD;FJb!GX-WP!I0&D1EfUx>!%j%_0o(|DM(*E8fsxyW
z9`#lx#SFQT6KO+}K*i0(e-c!jE=e*}oWufak(N?TIk*`-jU*247Sz1!wMcwWS`Kau
zo*I^eI~~U?ln(5RjK}%7oPmn_$PtiO4(kl
zi{x@}3DjWMA}vHcljS-bWs0$~Gu2oUsu#X~O_TqDe7d}gGnygqB0keFjI-n#l(K7)
zDiCiF<>1CZ)#u=XYmv@}+AcUa{s%1wcNvb-GY&3+L(VL(LLD&2a~_L(9Nc{rx~q=B
z!EuHKQtNSMVB5IFEbUUG@E!O!s{ajAa<2ak5O05G372?74D8mxLUbfDo-$xLI9-cm
zIJoDaMh=cIl?;{Gk~lctjd%yvwMf+S{crGAG!~mrzVW4LIySo&iGDEn0(CgG0{%BX
zgLD`5lzgKeZ=O3TQ}T_nSCM|1vS#c+zEL(2{aKC8l5doeR9ivWWaz2?jn5!`GG*UK
zqt*Y$cBHSMj5inczwtcM&tSuuf2_&3)CEmswu4-pN3fNF3M(66*tqb3N|%S@brOxj
z-3C2m@an@Yh|fFf8Xfem$C3G7DBcYhCxV_WjBkw~GZ*tbLB#s1Cx|1AV~xH8^l0G$
z13aApl|h{#FIOBmO3E=)c{*QnYuI5q^^9>^xHwSDR<{)9S|USsx@$zT4>2sES5=-ILtc0j94w=Lk@o3GCB)(%@ae
z2E5UDR|TITxMlDSY(HT7a-*TR(0fMp9!b8LAo=p6SY0;U_{A6=*&W*#1>3hEc@);#
z_3B*Ty0&XoV_W-XETphQw4RZ#&aRfWO-7uNsjs%yjjN37^AFnQSDImBnEpx~yleKU
zzSKeIEcIvTy$R?SpW5?G(C;JaFT47zr8)5)*}WkBZu(K{@%z-{56Pq^CG5}KT^ZHX
zHfhy{=8k6X*WX&-*5;_4B$s-06KU&MyJ=N3xFWX+2X!#47dzhPK|*Z02^X{?9o_sjRKV?7w8
z|G4;d#a_LJZzB1khfs%=@46ew?#8(DaPy8*=
z5F2emdxAXDdhj%>AtP_be&Bf!Q+d6wVdN$Oxed0yR9=t1?Tewr`gX_b-HiG&;r0F-
z^|3vykE6=AeODoF+kmL^E7TVX2y8T!*Lx;VA8w6aeb;Gyd}m;|4+qVJ*PDow9p)A>
zdmfh?ho)^Cn6UzS2}U&7>t!d>!T-n0f&SYauh)h8IGApOJr)tSe=l4Cy-aw$2Q%dL
z-bVYL^J@3cF~IAs$b{F+`pUo$H0vuP>nnq7Th>(&SD_P9}SkPENtMbQ-#*KIj5>+M_=>UjBsQ
z?-gHA{69rAZUw!!H2p6{en+!>o?;)xeu{$?hbx*Ha?r2Rv>69O+RSSQ&QbY7#X}X3
zR6I)YSj8sAR>gM3&5EB^{H)?xisvY9Q@lj+a>Z*DzpHqI;?0V;D&DSmui^uWk10N-
z_^jefimxcXuK0IFkV~dNBOI4Se`I}SY+i?FZR5suEuBtv)>lRYes>J3F~F7emErp1
z2nFm%^)_D_6YA=c?@4e$-FO%%zYthyC{c0|xErzv*E5
z7PtN~a?5d38FDeG1m1NxGHOH2^Ar0b^f4=4E$Fl|B~fD_N@Aa5Dkt)vD22)CX2nxD
z@_pW*!np%5G=-V&cbft+dgjTy1)^M8Ol_T`&S|rbG(ax$1vDc^xQs1iY%zu9QOF}Q
z8iTS?`J*X&1!{}Qafs*1+t}yJx!4!T8jOS%$};SW{_5fp7YKY8*WT?>f
z&@ki4HX$(R0y|M$_%=c|AU;w~#=b&mVr!JV1*5Mqb9gR*r#uBFu(xj(R`r>x7ijWH}c{nIhlBeyW+T
zUN6(2Kh4ZqpDtXMI75Dq+?nz`^k>Oev7apyQNtXmK)gZzf!w)HzFAS0^W~ga1IkB^
zf`ZzKihLGoc8bzg=kZ9R=K%2q^KP=
zg=na2?!X^mkD2SmxC$^={TC>Jx$4KD?~tMqFQg8lO1S7Cro!=|%nKKtW`yz0s1}1`
z_cJdR{~hyUMfCrJ)Jf=37>7EBnz8U$q&S#wCZ^L27z0@YxvWnkg@ftM7bD^3hf>_+
z2&_X{*361gV3tl{|`UfmtZl(Fnn@RMVO1l+jului3tjpowyi
ztLT)jK%kK#7cZR#Ne~Hi`
zZp?Rxo0rZZZhopm+yd(mx6nGoElPEW8?Tl*14HrY1#H%sfs0E^q;Irgz{vygGmWsp
zCc|rQu{jBqq5Fc>=_&OM$_~H_d})%P2%UKqw%}B9bS=pmW7a9=nsws5Vk?f(rA5uS
zVV8%)u{`4%g9*d#SQShw4{J%hgLx$b;@tfFI4>hD;UEi_7pyZm;a$|v)%N)JB0y6E
zuR9yMO?{5J>lK{Sp|S712>U(+*Bf#Qw++6N;s?7kS0W)ACMpdTNa?`RP`>mJl}RL4
z27^VI+FTF~bxJjSXT%f6cSh>e-p$7!?+pp`{$baYPwpO%z8<;QxF*OB!hXnuuq%%|
z()=UrU=;t6Q=BF`im;-#Eo#Mwvu>@>44Kv>Cu~qf32ys3R5mR6c8aqRHdmX_v{&_VjpQ<=paiQW8
zMKg~O^%y%tKz>xP-t~&@idz&p7mNAlC~i|Uc7`CoT+`Pmepm4Z#hVq4ogwJouIYOf
zA5eTu@hQb;6<<<(Me%h-V`m8Uy{l>S6^e8LI-2b*QS7g1?43Y9Qqu=2PEeezI74x+
z;=ziCDK1z1q~a>Y7RBQfk5@cF@l?e#6u+o=p5jG{mnvSV_-)1SEB;XNr;5K+yi@Vl
ziVrD1uE-C1_RDjMe^C63;+u-^C<@-qslT^;VO*p28Q;pNmlnWTf2uEx->Cc%MPp|O
zddAKWkb@d5M{~(UGw&E^<{bmW{6+^BDE3txs5n${ED>MHG}Fy-@%f6zz7W!@HErw*
zA#Lmn0Z*VD^&1bcNS~#8UsJqPkwZ?@vpz9Oc%9;Sm5PTdu2DQyk>7v&*5?I3pFSEB
zbO)pFaQV95(7-xu!GKG~gyGmz5C0+)QuUa}z;PMghxep69y+PVWjPz{aXG4E>t^0e
zY&5lPgUve#0$f^7gJygWpYpUn#d)Z>gv|Fo>;D8cTLw|*@6h4>%my1>4}py{uM(B~
zmsJYnH6tE8?kT12^~&S&cpPUSa?mMQ-~FgB0htXp??ecK^?eKV@ma|Fg7b6FL)w->
z)cG^&gQ^#7-j^W>*7qYQu|2Gh?=QA}S0irAAnFKyRCh6=!RGPV6|9dwK5Tu#`MK9a
zk7f9bWw;ylO~JsT4b0>AGexWSFZ}+8StZS*-rX9vS@eyOunC|Y&$%7(VEgU}^j~m(
zE(eM6uis>=pbrgRlQ!^}3`Bb^GQFP1g^=$Qyg%`{{QvNnsLu;u!1Y(*rQCX$WSOAe
zqiEmrY4pHZOrGqL5N7W(6t2LHyL*qbc%S~gEoX5D8s~8q7&>x>T#o
z%n@GL4I-!+oW*NMcy@Inhd{w{7H!DMfU`IQN9h@7@kdmwoCUdk*T;9L59*myeiWM{
zMRZsK&Z0lA0nYD1MQL6
zeEMQ3QcJLv{1VxuFUWGNgP@6ON?%ZRHqvKe>-!{{Ncw_8r}Stviu46jry-i9FFb}L
z1NwqwR}bh5*q|YO5qo!#VK54n!7yp_NWi}a|FtCggHH%64mhKTsblcVom4u*Q^G}O
zNR8bd^6L88`(rVzi|=j&gzJx2
zqbzCbPh*G0-dNa4S%$;-HE3>W+BDg_dN{K@JNew}4qhi8HTMeUt1ruO@S8pO{mV2*
zJNytbqX5A)M;rVQGGG3|wD0empAH#u9Jqy1H_LH2&P(hEj1|42__|`2<8b?Bf8jXx
zam;+xTHp0&*Sq
z*vbQW2O-YUga&L3zr$Gbe?xCiTt^r~R+(@elQ5LD)2-U54q!RVr<<;irrE(p+^6#C>
zb^ICi&C2yFmb`7eAn~24&%2b7HLNxVH9{3esNfz
z!BKX2=l(QPIT6x};5ukBA6$odxP^23;`#^IVQ%#j`wEKZ-2_oOu46jnmh0e1Zb+7)
z;;`WXEZ6b8Df?B(W72}SG7gezc>wVV@*mjO2p{{k@(IW%
z%0CgGB%HKRC!E4FSo#PnGXsUoR7&GfjSu_;h&$XF5ZkMtr6`3H@1eHukfn
z5;a(^;|=73>v#tlKG#7<-d)tj3Q_Yb=$~k9j%q
znK-l1D~P*(yhGQZk)9v#1(1iKVa{39jCe}V;L@1^cz;?aUC?Gk5nf*7hK0O
zYR1A9NX1E{lj~sbGw|WHJFbIzF4w`SDSS+h#FmEZ_!Y9rb=(GA2bCtODc3<6|3PPB
z^SBNQozlb6C~_T4Wx0-|)hAi50~ZLMM;@DFp2HuNWgK=$G6Sw7XyDow!{qu^#^bU#
zX0>)x?Gzmr4bB;dUu93FbB)sk7t3C{^@O&z6T4EUL~m?gwWWPSV^`~jmQ_u@S6*1Z
z&o18B?|e$HT<)?4zR?R_9BLumUQ8VB%r4&8w8b9}Ke4l^aYKvK1IN+bNQ%zmePb@c
zALPez5l2SOq|GIo#OSE|Z+n@3L>6$oUnkPGJNTBhAdRA^w;-p%O*;EA*DpGl~JNr1p
zm(IIn?xus&ukUyQKiNXN2R-|-&M-{7An^ePjEVW7HuJ8C96hqR08q=-sI1_SflgeG+aV|!JlWkH3
z*LTp}uH`&-zrMq@N!5LQ$8$KMwMpf!@8HUap~5u-$?H4#&`st%xaMG#JOxd=zJm)P
z)2;8|3&MDzfg@{^imw6_r`JBhK6ne`yxa0$=
zi8wPX*x<4qpVBza2;-kbgF~0$a#(FFTZImRlIJ&>HmO4YfJW262=+ebVSIjj=BXC3
zDm72F6ME!4_;SU-wJ^KmJgDb#9$aqQo%2|R@`qz9`3bVgc{~klg`fqSW@eH^}SF9(?y`#wt<}
z>JS>VI>Z>Xvg279FdQn@N04zeJ-B<9y4|>s
z=FGT{l?#%Wv}E1w!dq@3GlXyk(WzgB!$@d-t{2E&Jt)u~w>jmw4`#ULBM%pCB29g%Yd+paee4$wUFTy%bItRP*S>87qRxS+52{|U
zd8unYVr6c5*2ni4Ti?})+cKyOfy;Y
zu^5$PvgX6snR2T(d!7fw?bw3X!2q<+_TTR8TYUk?9dBxIclLaV_F81lkD!-;a8GMK
z9>w)n;Z|k#wmz<73tYZVCEE9V8odd1(`u&mfCtI?pT!R}>wh-ue-;Eq*8gl(*8l95
z$-aGjPU@W8<HC{CZ)-`J)V$Zt2HE47)@J?B
zHcy)94y>kG%kmMn3>0*BV6O;ssrf_ySrb6G_11g$TK-=4stF)(B;Ti`Qm#SwpVZjW
zxvF+*-Nc${_5K19*Bg3@esg;lxVmP?Ie7m3>50m@9Zl;K%UU+IceaAOJL$lLYecSB
zjqwIPAMkB~54S)FIr#7jgslHr%qvEJaQ^O1id?MC^lgfFE8eI0h~g89zgK)g@&6Rf
z3?bC>mZtxu7{bRN>(5i{qu5Vzu;OsVF^W}+Fj#BKPg9(uxKQy>#UmAuQao0%NwHP2
zU2(JGrxib|c$VThirW+~QM_F78pZD_-k^B1;;o9eD{`_G`{4n_#}uDZd{*%##a9$x
zSNyx;yNVHxW1_yS|JkhnS^U(@_zf-xr-2EC)fnK)`k&n&{LfCC*dzb5b@g@b(Ab{m
z{9c%5&M(H_5@*bFo*Iy|>EM4OVePrccw-)NBOai<^Kf+3hCFX-@2k-Feb6>CB~fD;
zLSkm!M^5A@l!A?uDHxK(MBi(8lM3h3r6*<$-)RcOE`%`uF^H0FoK*98vJ7&OtI&)b
zxde(KS%Fev`7`7ZX~6S5Dq-a2$~Pg8$>$)?g9}TJe{Dy+K)P_~LTSdnNH~BVmp1JC
z$YMx}^(@z?)FE>_9`pX{?w>C}=gXSRl7mhes2BPc%
zLYvS-WEvzxg$`1O$&VpVNCKL}$mbCsDHmd2A!RuFDESLCM++aVW8?zpR0?Km
z!k#<5s*aUsQNuX74m#uIR_v=}J|xxh5aQMc?K6ni$`;5c%D)kxBt@vFPU=z5WVr%I
znIb>HeyZ%i-uj?@5OM2+_BF(38f*2lgahfbg|1uX$PmOEq!2aFbqfBCglFRwh)JnoT=lQ3T#TpK6h-{N25+H((AqaM$m
z`)66H#K)qyV7C2c)5iD~^eG)-N2$S=E>jtnO(4gN4HJda8NuXxnf`7%O{*
zd9gTM03&5=@WkTVP>Ju3b|zANeg}2V_obmZ2L3$cvf@SxliblpnjCnerP?T{jKmf(
zUTJC8oooOv@`&e^b_P<@u!T5_Tdleug!BSx1+2QSKzb?lUO_|EsQU(_KSkMEG*C^u
zlRw!)*_YAY`$MHX>RCviK^cjF2ST}{0asxACN`WzI!o}ze`|{4+Hi_@TdX7K?%g)p
z-McN0w;0q+th;yHJm0%*emd{A1*zU`3$1tCBJ15Yp5$p33{jt5d$%o4I$_j8PdPQ*gx_WNS^_M&8X7vVd(qLS?In4NZ@DhC-``$aN
zHzLtKkx;avbUhfTcT>6{W}6Pc#oKfjWc=I
zZr<3`)!M$X3YK1olr=YYH3rik#BATJjrYB80oUzxpzF(ZtiM<9Uoio2Ql?`
zeWO2W^`6Y0SgY^uke4@V7OX34;k~nQ6|J}jhjr;hm2V*{7tKxb%$yzOJ*cCx$$y&g
zxAg%I^Y(6EwtNZ6&iUmV7vHw{lI@3(@iH4sa|VnbLXL0eo&A{6oL}4ydphTrUmlz*
zIaP7C;zGqGipv$VbAH|ant<<6_SlovP2zWR~ZE2+_{*eL>Uv%J#{geA;fs=QqdZxg?!PbGB^ng_^!tal7L8
z6mK9x@8_D{p=buqAg8HS*7vC56GX_L*YwMZuc-WOP5)DocOT9j<`@96R*|;EnLb!?
zrDB`nNs3=kyiyUP5&L@XG46iZxyR^sFW?qq!WiuNT)@BDggQkFR&P86jPrlTKs`Qt
zY`{;+ghQ~mWhiLCMxzBb*t~-v2=We`dt47a4n5q&TZ6fz93$g#*$?)(ryy?2AnN=d>Ps-9!RDpTJ>H7?_%vsI
z9J#Ueamdt`LDVTgM`kkj_MSV{}W`oVU9D?BaUL2?o({jD~
zu1B0@_{?YcJL+3%Mugln^SJ#?(dzB(xyM%o`mZ<6J^lgO_q^LBW^el$bC2tK2yMd<>TeK$E8A^Y4Ku9UpTT9`YuFA4SWkxWNd;m7?{VY=J7GVF~a!g(FNdRR#7t+o{Cf-zF?7$;R_!Fe;&Kx
zW2iO?DkHJEd<@?tdFR^&A49JKYI*)3Xf0s5faUoWNH4`^`52m--+=U|C~HIm)%?82
z$I!tK_!u7bEa;p;y<+ULd`yz9mi>i~X~^<1dxwt+T7|Gf$nS}p$=ad!n3@lQnX&&H
zGt#+g^6o7dmx8cLo7>h**fOQ6ZNkR(wVNimc49p0psTrc
zi$Bn>(^Ka*HEnKllHC%xJ_g)5*JkEx*8Y4qb19tx&ZKF5V~4Y6nx+Sq>C;juA7d-@
zE0_BO$;QoXBvO2r7`@8+iv1y*-=g=^qoWU)vD#t;Yg-z-Hg^Qp3$=H(d73(*9E8V|
z<4*RZO&v{G1YzsWTBG;6;sct0&)3~u*tt=wXKm4cn_uY|
zkN>{n4;6o^_)En*6@RVBArF>&T=8i|dK;wt4~lP)96iXEcDOM`h
zDW>uYW*~J%68GUACYEIi5w^)#uVSLE&5|v4+ck9D{fTmP~>nymXE=(
z8t+pWEFM6_Fojdyc~V5>26+Q}0$T_3ZEH$)8W)){bZ;@>vk8F6oaX()C!
z9efv_8+Lt6-bnni4IlFlMEI6%1DKSD`GAq=&j9(}YMDP!7>j&{54~8}Jd-5$B?`S|
zGGolJc;rT^gmXvYmJB}TN~8+h^)Vb|w)XHjRPD&2(6M~Xe?c)Mji@o*`WV{ikI84C
zZ~2%j5ibzBk1dpAu}@wfGaVAk#{}2MaDif(?7+e8`WV`T?=M^;lFY~a4M!X-bZC5l
zJdE5Sau6g#WgFU=ygr7`Ws>=rBGfs`c5f5e&2kUt_m
zQ@EUUmRybfY~#t;@-Y$AJl84g3ssMgiSYfy+QSd7kBM@9Op#q56X$XdwTIv5EF7h0
zd`tljIkUV9b-*6JaUtySF~6qJ<6{P~>YVs;92*N>xa`SiUd}ec_{nH+_hgIg
z8(s+|&mR60Ea8zb{0)THLA7OIDWb?Y8wv0+t*j~*o{UtnA;rPR@P&?nKM%RAr2G1q
zT(drgYPn`z4BrrA-g=l(C^iyXh(`R>3Vuv^7n-)WjE&`8C=0DZ1HiYKI49PCXJM_D
zUvYoivd48UILp)}F5OqNMBUXaxk-y(a0W@~oc=e@>yKYu_a!g+{*sr1bW2_eQXMh@T`zelNw?&M7h#$uFIb}z&etU`SiAxyEN)qf83!gBrNw&KyMIr-
z$36UyI;UfwBk#nEaQh;)$Vmt?!HgA8NE#>JtLA&www~D1T!rzt>h)&ULqwbiE)Fzk
zXD-&3aFvO>03|mX0x>P2szfBeB$CU8D4}R*bOMV`^05jVk`4G4rca#jdz)tWUaHlb=~@8*`(y8?-!J7CDv?6&YhB+oa!aX7$v8s9G8^Y
zOIM-nONwJNKqO&eNUnpe?!m(Mn^EV?wMivxr6
zCg1@jH}@Pf5EhJp#OuVIaV(42^FqNd9N!@Qabj7WIbr?$nREn;2$^N
z#?H2;O`CmQ)AfDOef^04^D>R}|6w0%JW1<2U(6Em
z*cTkauW&usV2{f=ueh|F2F+N}heIsx+69cZcxw$(*L37#dRzJ#{wwvdAO%F
z9h|}Z8|c|!+n2hgV@aSsKHbrsrv6k8VHtj;nXKu!3iq2~_Mku>m)qTn02A(jUP9vp
z9+%;EY{C9p5$M0&t?76k^^G?*xI25kL^JxLdBr%%1cc>C^M1tR^8dqQ1};md2G?H&
zWH#9PSSF~~jP^Zmm4H?cYdY$C;#W6oPaYR+)}DOUo;=?4v-afo>VUL2Fw^^elX~+x
zF=UjrC*RfX{p;Kzv5)*Lc>Di1gKz$Tlu7y{T_)*|UcLXp;k4tAwQZ}~8e2CyjT-}=
z44T?t+{+B8HMehGv!TTwWmD&(-XN}-0&mY}FW4yZDh>{;e;g;k+dh5&qrz_QZP~D)
z*&q0Rufx8!RoU@gcj?WppI{Swg0#v1`DE?MyB`r*d-9I+HFO2XnZBWTwc>Xa`EAPl
zn-p(RyiJkcn#{jX@e#!*6o0Syf@0R5yxU({d-85S{4d8(as3!Sp1@Z%ZN@3_ncAZ{
z%pENos+(KZz+!ys#
zFg02|ciCapja^+Gt!uErt`n`vI1Gj+$0v9m4DLK7H_p8sCmD`7_3SuDsvh$gG94=<
z4`a))9P4}29xRZ@@f&ov(}0a(HRz{$Gy+3AW}Jp&H5~h*?VwAo=56f*A?iO
zbF323>aFT*>{?6ngo_p*d1Q6_gc^4;tl7J9cR!`hH6uT@X3~^Q=ga;a)7lV{=F9HH
zVvgdQif?qrt4tHuA)2iO@5l
zL%(w4*XRB9iQ-##9Q5wHj&m9|PCd2rY-2-lCPVJVf9Rixu%~SB?VhmnFte8PN-+cR
zbNF{)^6f(gVpkG!B5P3!c25qXW;k*;HN&|F<9>nJx@Kao#C{B6{vRPqwtHfJU}grX
z$jxX*j&R0lNKQn>n6w8;L{{QTjLJa7b76)87pQz4_2kJINb==Y#0%t$ICP<$gnbbv
z($Ve-O%e5xPeM{Gr$Mtso`7aw*@Sqh(CB%Y@bTGCcy*OaIdc2U-x0U-Y}Y_@kZ`W-
zV5vs#0mhd65IGuc7%JP*&SCOv$P+Rdn!{x_dmu_(zL&|d-6pT$-wT()hN=ldA3m;Qti;cfT-G`pN)E4JM`h>(aeT{KfwuM
zBJNjNzr^RD<6wmTE;I^LZ@-MLMyi&1IdR&?$3)!qOoiigC4dwsc_VcJ>cSY?o6L*F
z3s_66=xHO2)13k4*&avDSoo7j_1TIz?Vfxe$glvLXZM75e2O99Zzf{q*-~v3QX?rb
z^KCi*w+5+dO3b`lmYRdqG;Ee1n}+M)j;(tHODoq-0b
z9s2u_zLPTEq<dnf!?n|Lnz~v=3HzcHs{x_-Wa5ZQFc9gL2cO6uHvDT
z@$}SY%4VdG$A%8rC4TXaIe3MP2f!n6(s7q^bKb4i?MHvpMiBu=Vn=
zQyhw&1`PmG#S@vrA@Z$Ov1u0Mw43npl;`RLoLpGvFDNXuc}}>%ajP~u#cq;y
zKo^%J?eW{w4x{l=nE1!}a%WFhpr;*Eo--BwP>+3D1O5DY+JMKk_iw_lhreA;{pigT
zqsvPB(KdgPPK|C%U|#gFYFO#-Fq5P6t6`!)7A=jG3}bqDX?YpuQkRzYi^R&Kq4g3e
z2o0!?dp1r(!Qawt93)m
zswUrh0&JtF8PM#}aQcypjrHx1s+ZPYZ1q2Rdj0y=@KojLNzWJB*g8(`nF
zjhUdmCwC^SYv9Kpa7-FmPfFOELB_-E@6GIg62m~IXaDu#$~zq2-c0W%^`-J9wo6kO
zp5Rct^#PEinsxE&KOQ)rJ}I?VUA*=_+y73jq9+$~l0=^2QDg5JQ(HZS2q>ZS2qh
z&D?C@5Y4Ypm~7Vk73{|5Z~+#w=h
z9kvD7Y``UC!eZ>HX9MSObMVy$o3{`GJnEbV&Dep9Z!7dT7n}cb7U7e7B{o|IQRm0V
z;QikQo3{=E8)x24sN}4Gz($*p7d&nQ92^0+*nJuaVtwhW@qObq%Y7|~$!PCzzei9C*{?5F5kM9XK*t{=65UlSfsE_SpeSA}~?YjzbTLw|59rXr!>jK)#94;#6b$F%pe?A=2Ig`5siM_;6Tj18R!Q@ycbCR(Rv9{_
z(k6gB4~CuCg6+E}(0}eQqkI03Ko7UOO)SGO6ZP?$w1LNDAmTCMh4s*@fe_W2_bDD1
zB6CdC=Y@-L{qeqMgRKu@9@h*1jf$T0QvUxSz}qd#gtwbAEptE6Ur58-g&aIZz}n?K
znRf_SyW-OMvBj6(_~m)I4;DMQ&m3JW4>^^gC&P>68K?5iCpR7JY~?CU{B};m`wu!H
znXlV{Tk@{?I{KLgU$+(g3MRv>V3Ozq6iV!DLQbR&T>`#t0cr+c_akbCa~tp*1Yh@(
ztI4;4{O2G_$JecgT;vC6MvmdZLehj%VfiQI5jh+eV$^tv&J{j9V?rmtd6IyBzVX~#
zAgANdh0=k&_&@7RMQL3-BB5wJ*ozUqg{1KN+ALQcI5&wD1*U`iD
zASpl%gJleI50FQpIYbtr4MXK3oX{}ii#j3I&>Sw~ARl2oMvpW;uq$K)%8oLgo=3}b
zC_6^3fKH`cg!q9n6z4To{(_pv8IRH9g(l{!gk({*JcGF9>*#s9R?dWcqVX6#$@r+Y
zeBE_8$`ttp_EY74>@8pSKZsktj`sRz3SXsX$u-!|Hr}r-UpELfcjN2+6HT>z-T5ez
z0bh3+j?yE(F5;7Pk(ns$Ig37zHA%c4T@>Mq$Gm~&^)aXDJ|sZPorxX?Nyls1C+XHQ
z6^M0|P)25P7($RZ)pYJ1wB;5~Cnt@-Q9!W<6
zj<*kUD>ft@)kZ-w5?i<%Nf-8vdLZd2E5`NA7qU<_GC1T43aK9(4I(iD%T~;G%{mf+U^$nxG^d{Z5180!vp`Mt-fV9PC?dI+o6_ZK$addUL?i
zRnN369siMGC(c^p-xc?0t}~;Z22fTwXf_TrH&M@Ki+HOiJeW2ST?gCuyU4u$`W!}Lau97)+W-f{Xg){
zX6`ub8tHV$k>Q9&rYx^I40D!p4}&S#aGCUz{-FUfPzK3R_x%z&Hkh|{O@y7-@Wtt-ID7!0
zPslN3xj45U_BSr>8vNAx|NEXI-C{ER3&lGXf1~(_;**NcD$+JD%W*)8_%}skCkg2=
zZXuKxDE3txs5n${ED@s=bBOrno3D7J;z~sh12TV|;$}r-Hwp63Fpc9GE)MB)H2)il
zW<3Gq|D}3{i$j{z=2q<@c-HaB+~EN!`HzRk`8fkbX_|X*`?t7%mR-
z2yTt6pEh+UH(VUj169sDH|2(lgWPy{1#-NZ{W4myRn<
zH6b26ZXr08^^ozn><4??R1S{AdS
zU2Na(IJhHGAJ;zEV56xV+}VNpa0~F-cOBv^W8bef;h_JCI&EMcw^R=9{tP*|SD}}%
zl>yn$3_Gy}{~s3y`fqm}Trpk-GvVOK)n&rLZNT-%`<@LvR|eh_?QetWZ=rq9F`~ih
z1vt3nnQ(AZYjhD^Vs-v$3zr<^8a8(;6|j}IUP|sr!@=b^^J6=5ow3m;w~pu=EuAlu
zT=oq&UBkZRc8W#}kxSl@0znIrD6ZMZUsEY%F{_x&Z6s4uu|g
zw{J3)69JnC$TciTIC2*?!?~oYz`H$Z3dC-LF#lH&CG&1`c|17+a=T9MXHX0YAFyE|
zPiNQ3{oRxep}jFV8Sy+Bfu~2ld;{@he-y2#GA_Bu?IZJWbrs9Wh?mGuq1jiCL%dX8
zMm=T5zeGRdt-IWCVf}?J87%L1EHnqnztNJx5=Yqsy$`3U(c;v=OD`wHRXc9ikuJ=$caYoi31#juIj@@|5f!MpLU;jfb;!)kfAD^Mf@-t8>3q({74_$?gLT^#58qtIn=Pve;2)IN`%
z1j9xO6RCALv+zFhC@bE7YT`|zC^bQvtN%e4i5etWlu0ScI&V>d@wInkAY1)|9|MgQ)KUtLCC^5BD>l1Mje~R8RtYTrHqrrK*907y9?A!n
z-%xD&a7psjz28xAKSw86nupziON39bC@8pSjYq*%LWs3+xOK;D6xSR=P`yx=g$Go~
zGL#QHW}TeAB^a8^iN-pehC?fcfrE>??AajDbyy`w=P^-MWGjPPjfRSb(Og@X+o93?
z!aO&61jx7n13dYFih#Vb25pRTDV=*{_b{VL(s99?SxTpEim)kIOc#$9@)^Q5sVF{L
zMR<6Fs?(ZWs&2HQ>I%82PUT)9H-Zu%>voZs6T(ms7t(1Pypw<_2lwP^N3kKEJU+;m
zqwlf6PHWCN0(zsdPfO$RCu&1C8m|WbTl^OG7aA`wGz2u>h$I@XG`OZNQV^8{7Sz?I
zUr-l?o05W>NM1L_4wvYAUP(ve`x{%@HyX;oT~-%l3+%A`E_}9U$l-Oa*_R9Kl=QGo
zU$eG$ij(E=vK*f0XTtY&(Q7!olHZ!v2Xc1++MT%9eUjl
z_*a-P276F79!Jp={w_EKVxP*3QJ1Zo2WZAN+hzvx79t+xZSDb4vK4ydsc;Elbj)qn
zN?@?QtB{cif5*iUI|2o5vd?isr=m!P+u{W
zSf7qSnR?Gf+LmD*pGAF{@OQyAZ)93*`>sl$E=m
zKm8_@GFd~%@!nx5YXi@b+g*xQUID#?O#pcw3_Gy}{~r$q`fqpq-2&9-zZ3d>%VXp5
z;e}1m%Y?tX0@vSYuasXO#NKa%+0UST&!y1|@OKL`;_qtf>k}sInZH}X#l-koxW7%;
zSA6kJPQ~s0pUj;bE17?EY-jEj^I!ur0dr~drB)u2Nd*sX9pO~;jpjcya6TA4@O-ep
zcu4cSoM)V|4wmsGz)ZS!FyB3m{JOWM4y(wVAv1RXI?>Q2F#^pW|H
z6iX*GOXNOi_LXMDOXUHaZn6!`5OR}kV15FcgXCQtaj*%qvD0vH-)&}Ock(+D-lXgMJ315=N3#T?!$zhOG3q6xhkWXP>
zBb>@qDJY>B~I=_95Q}Bj?y!3?|*Q}+1A(m87!V^;*$1D
z!R?J?UQYaQ90p|FGN!`uxy%a}on?gaGtl7hPjD*gYyLl>d;vHB9sHS*KAb62O-txJQO0gM`I2QORyzzdu0&tH&fE&$Q_|l>ba!e(}>k0
zgIBjt>U{z!FgZ@>QDm#r`3*>~rIwO@FQ%Rvzog7tFSiLTQz!Hz(07BdS>u<~
zYesrCW#gd-QjfAPA^myEs!=IOJ<5K7^!F&^tTT{$yuzMD`eDj&6D6s~)(?QZ3>(h;
zV@>Ln7-q7-B_`1umFSZo$HyMR<-#XjIe5PEv4-ahkDZRh^d&Cohpu&^4Mry%U9l~^
zY+E=SE{rZUG4qHF)WDLw1=2PquQOb;`QMCjOosu6B9VgF1XzrW9=R>Nd|TKl@R&cZ
zJ!RnjwpVQj_g7Y4=tg66wvPtqH+HO-HFkP(R>K0@!Uaog3k?hCwk7%K^?|ndtf1d&
zZRS?=jeicOC7r`o7`F`MxjdnNEcdK=-T|$5@#6z)=xce$F_>sbMPVrHc^igieXh?c|9R5pU8WO4c+*}C0OWWwG5)}+0Q+P7(&VgTATuiDtsxvF+*-Nc${^}gdR
z_ji$^-`w7{siVEwaSon8e|n;FZb#Gl#Ilx6?VYV%?Hwl_n5dmtU0Yql*A{;D@SV)^
zi+t;`fv+}m_Y+&4i)^FK>$jJ{yB9v60--nA>SX_B$TQ+{bjSaC!ZRL-GURLck0xeq
zb-Mk)p)&SI)>fz65Bu6yXHR*?JMf9l|JSb-A6DeR8s*k@r}6iN^cyM{jEFElrucqs
zb=viS$FV+;1a>{(shT#cC2%~u9`FK{+x39gX!=?r^z3@TpQ`*9D!1za?^F51D!1za
zpH=ybD!1za-&FZORBqP;=3&Tz?Tr(0T)Q4{h{{K(+^z>SPH3P{uEFqvid=xeberNe
zigx|qNdB&nZ*0^8zpUvS6rWNY$o~)WIY_c^`9$1CvwR|Y-4FPenDBo1#NZGJE+rEd
zV{hxGU@Nw%HWP81w-E6lkF*Ko(I)8e+QTJcp5`1LTZzqNP$E=ea)|gWbW$dK;#I|&@ridpuM+jz
z!1G|(i7oj5SRLrU-SLTkLVe>+4erjKFEQ|McLsnE%!E%|goBMvQ(r2dxC!lhE{$G*
zPh61+pIA3FbDNwsI9CLZPb`KVve$5umII8uf!rahaa*NzZiZ+$LZ2fb@61~BSmX$(
zgY8?&Cxk@5Y9O|OkP|rs1wi_R@Gk-B$F*oE_ZCyJ-0NJ;4hVD4z)vby=2E+Vv;-0v
z&SOb21=!})~PQO#48w%&=u&GXn&+Q9LT%0ifad}iZ3|syvWR*DKS%?=Lje5xaF{5Hu
zLqS7v!{~;|4WWi;Ls>(-p{QY0L*ItVhMa~04S5au4g7Z(9nLZme*m2Uif=d$3W~47
zO&K!TsUWp
z&n_q^SX?^2U`D~T0)cw06vBc62qLZ^Ph@c^bMl9yz6q$f031@>Rajhl0N#`wem0|l
z2snj6I0^BP(}{hKyb~|N??dpPkG@KF<*Ptn#NAo<5WiD=^wPeE88*-we-l*)kk&wJlG-it0wP$
z7W@8hLeHMASv}*sNi)ew-U1Gjtn-o__Fc2VOPbuCEyPI~HRIJ+zpA!vRa;~0MkmRu
zQ&Z2}TG{hiyJ?H>_^9`fn%icxBlce(R(tea6?9f*PuW~O{{MxTcKBe$p
z5(puFB?jLPkcT%OCkKb2eLapN^Sg?OPhW$^*AtW~H9bLbiXvahslPz+P{n16pHy6}
z$Zv7#Z&Wm|K}dg2(_dD+K=Ese-%z|-@jHswE8e7di{fpHcPrkf_=w^YioaKULGk|-
zUsHTb@n4EGKf?CsDfUt1oDRxq@|kGn&jZJ3x=L}9qM28Z{5hIlsCcO2k%~tt9;?`-
z*s9pBXy)akzE5lVvx@XR!uFh_xJ~gA#mg11QT(o=8J|PBn>Br_;_Zs}DsrkN>wiqq
zjOQW!tfpU5d`0nf#lI_pWHRL=e3eJJ0>!?H2}O?AFn_tCnH7jMCu&koCkRB&L?s%Z
zPe6WhF>UP30e_ngw2UonpT39w+cZhrNG6lC3?fuTL7@zS
zPk4eLJd{CEoDcymWe^Y)L`8}`!J>eIs3@SI{eRy+YoB}W?M-t7rL=JO@1C>vUT5un
z_SyH0>sxy*TL)QVM9EKHo9s5~Z!p|Wqi$G_TUP@b=Y5KwQ(U+|`W>@%kaea&=CjOb
zvfGYB+2*+kqO?>tQI(aTJ2`Ska!B
zR$?QM)h2r!$-1tqFfQAz5U7>&>AIFLuI{R-jm49jch_^&c!WWdf>sF=#fTb?D3tV&WOfSK(d(otX)(ruOm=gO%tD%UoQt7W_ne
zd8$G}@;vx92F)H*_iNxsWE=97^P~$WS-z~pI?-O9VR5XzJZ;&eoL^Cz&WAsVZY>#M0vHAgMpMkQ
zqF>EYvK2kOsxj&ew|OyW?la8j`8e*lk^EsO4Y>mQppiVivobYeNidS5nm9}lKMsf(6cw1%*PIbReD=!31Q4zZC9iq>7
zRZ*ZG$36$^l(y!L98^tsCVPJkUsjw(1`@*%@FF_!%I5f|=4SJL5Eh58`RLHjYzYU8
zncj2=8so+)oO4)eFIGddf+q>=)rWaz=XJC>FRSJt}S@A
zwi`XYcyC{8N4H_8r5#VxXO;1w(%jYA>+P`Z#FOZ;79@E)=k=
zr>Qyq;NV4(1O>!z>H|lfNwz)T+~i%>`$5(I&U>-qM}yzSoMoFDkvW)j@_u~?Uv>G>
zQ)@eGG$~#I?^^iW@TI+V_S7cD)80CJ|48uNjT)PH3Yxw9%hcG%QxKn@{uG26LNOTp
za%seprfoS+H&^dP9Vm~VHlhX_05#YEsKEx%-3i<>Xl|}%iZzdJ2=NBV_WWy
z!)_gq=as&s^zTYvS1R~e;J9TgEl^slbfi*F*QVSor6(%guJlr+*DC$0(r+pKzEXn;
zpq&S`{HW4hN}pEB>Ga%RCiV=*0hUhI*8D)np4ra(3~smIR{9gAbf-XmA&Kht4;T^Rd`E$U2MB9^VgavfDlbhQGaSXpi*=
zvNd0W_D0!8AaAqDw&v&f+QY5X>)%aU$G%^6VW;WDo_PqmuW_hr6ZgyIUZs}*0_0-0
z0BTQ(oyhx-_d?(J@x8~6-=oMwQQQq;Qa%Qm=cG;ccuDb?@KOWh(y=w)jPtL;s}&!=
zz3?~mZ+8kgAO5yFJ^ZbHj*HL@jK6J5jlTt*X`x-fah})~bF#XRbSmH2CCmT$Y>HSj
z<1s2G)(la9|9fs6Un9T-eC;BP9V~l4#*$>27fFd+!BQaHgTn^CHV1zRY|`(cWGK5D
z*BS7&r%i>(x53PP1guo}8tuw$tQp#32c-|SLPB3n)*n?d?l0NG$yX8i82C9-4Nk87
zFY70H;t0%nUU)>_yUze6c)^!!40}AURCvxvEso!FssR
zn8ezo)3$!3aC+7#8HT-#md7A7M*b6h7%N}K)^WyCJ|+v$=6G2E{sf^}^hCKH>vAFd
zGf6n1twMf}x|8K*oI%i{vP@
zVDYsG_6U5pQ1|p59pVb8ci?3abD*gDQs=_9Vubq#*3<_ThG3JjKYvyCD?)js7
z7!3nEI~OAfh>hqQO7BO{;H1ZkHN(kwZmb!YslT5xq39aa2(@ALA0v!yNT}dS)WU}C
z5C+ut6vaG$RKGCHD5nMhYU`wAB-Dt~5I)fewfzn}rWlr#P@5ZThGLT-G7-zZV$CeX
z_PJPsFQ9_PnpuVNv8?BdHNzWP3+2=;)twOkKFZ%E??dRI#+vy#$`6v)hLy&e31L`y
zvkg{2PGik5_6$$$U^TXBtQjx<%#9cYjWzRr$gHFs?vFOs4Bc6M919vv8)|!3#+tbV
zgU}z;7W1Gsj$FWn+H4l*TmsM*BgTfmD2tEq5GKFo?71?OTSg=db|LgC1^Fzm3Va|n
zns_pyNOrGgBZWC`_Anr8g+=guRaE3{EQ-Z9q7@)+?v8SaxViiB;>oyM92-w2*T$2{
z%~e)zSwcJ+ZArUqa5v)_O8H(Te>|Cfws~Hlv=3hYornwk<>q=Ux7P-T)7AoT`UGx2
zKA&P7Lrr_(a53j~Y&v9cIOFpvE7%hwW|mt`oUXK_xC~@iI8que%qp=yoD@$Z2)7*4
zBN9aOj2ynW-YV91sK<)&Lf;V1$V7^1tzt~^Doj?Y>FsHD=RBDbbmmo^U7has8e=|R
zvvp2YM@?tf#_pQ-whf%$WO0?gmbR^N6}-AUan12Jws$qfHSsQ@>eX`<^KrK-oD7*{
z#!rzsj)9`=-VmC|btXh{%QOI6ZDO&`Ipi=n&+tA?@GTQR#{0{8rZlX}#E)6WJ6mU0
zUxzm`>Yj*K(n+T|$#7P09L{R)X@;XNdr2jPlz9{I+iDk2w#}J)NWArdaW`9$f9!sp
z-SW;uZsv=-Kg=zL_mhJia~rL%SA2!_r-K=Di=m@wVs5x5Tpe2mbIZhy`3gS$h%tRl
z>9>^Ls`Q6S?@{_=rH?3mOzD$K4>acXKhPhr|6fviozisU#w25IbdJFGURL@~r9y=Y
z`1{MBlkqwLh53563)-o)N9i`DXDR(ODfWMfmM>L$ol=I?Wjj>GQO-;iKzWDqjSmj+
zAJ(#&Ab{*j4N9qJ
zCPr4Fv`(o}!GeE+mOrf2%(nyo7g~mmr>SqSZt&-7`9GDK`Doxn+XdB^i&1cYFds1W
zE>c=TitlL7(c$(%&9mxjJ*BTY#Vbb!d&5A+6aEsDCSy$<2TmoEh^hILl}m-a#e9M|
zg-lw3wXH+O8Z7C=jX4V^-!?QtjER3a+hf1hV)3{4S!_rLd%FmYTYXT2Q7FvD0+?JncvmdwVKP?Cm_?`0WdO;~?{#w8@Sw
zDIO1Anhv>IFwv~BVdD7l|KT}c&v|5>58(Xcea|M_9@q(Tm!qNGRtVI}`LMSo>0od5
zwR0NM#om6M0((26aA&qtnZ3)I7Ijy~b=SDxi8H{#yb
zA5>&4dTTJaH<01kWRsnp76^BM6-VTB#@jYNa3i5^3|R7vw`}t;35AKe0g5wI-6X;p
zxVewv5=@Ko4Tt2Ay+Ee3ZlTC*73FLAgfvJ*1Hg#o%_Mg=umJWTp#E
zjjCiBIMwnL@-^~dtZRj)MRnrNaVtOzGi5Z^vt%jSnJs(Iaa#`gx#G@odjUr@U)(uv
zFGGHzT#NN0nTr+IF7*)&O~V~jtpqq(JY0c$70-3GPAxz(bLi4(9IY;jS2HU2)Qv~;&a^c
z@YjM3bZbOD#IfN%L+o_7lh}SFWTv|T0x=jIUn-d@u_Rz{yc_YF8S2J_prlRmJlIAd6+oN>pyf=zoNeU;`7><~cuva^Cw&XDV=
z9uVYPfIuy|SrV4L;?Dq%Ad?AEn)bho!PWBy)Or*q_SYhy>$)vLq(
zSXGBnQiB@UstVB9!rrcpePA@fNB=?tM)g*8#Hu#g-|@Y%s^e#10o}N9OJ_6Nt?F$x
zl)RRvz9xU!c!O)}+*IXaXprdas_N})YCfq7F#-Bev8%^rwsq3m2=ZIodfPU%wYT-1
zx^Qz_OG|5~r=oA}Ikh`8!H$5(p)kR2u;88_Yxlc2ivy-!i-bZG3Kl$Zv7hFSnd{nH
zdRn{_r>&u*!$|;Y2REZG6TpQhojbT&+uK_@oP#=mOR@s4r9aH?O~8EiOykY*EzGj>
zH}h^o``j-TzH8YyF8;55zQi2tcwf1F%fg$VKOM|?AICLKybsrdtJfP0-ZuqxsL!ue
zYV`6bQ!zmPF-mFg$MSzE<-SQ2MmeXO+IFl!^=P=O0R`*JRn?3!r)U9AkN?(##w?cRUUiyzg$P
zANc>J8^7fhmH(I00F^kXPjh$DQl(>*GF&tH^an>en-rQN8ln>)J5K2)r6(ypRq4Am
zeoHa0BaB0p(!-RR`vv&?O6K+-DgBF5kj4Xl~S$8G8G*M7T3dVG=uA5
z)Z+<%g-MgKj$pwlZPH+HJwC^5vQOU?VA!^~jZtwt@tfpLL;yED%xx_+9RgZh=pl0aGLd?+%NaX;~?d;&elQJ`8-s_F=jN`ZG;K@
z?cIm=h#RrJec^hypgmq^Hre(*1BSo7U!gtrhwbs*%=YhUu1i(!uo}#`#y_)r$8WZ139O=GV}_-6`aJxZav{aJ@|Y
z7F?j2_$`_EEkxTg@muUX2hb`v$f}*nkPy5Dv0O6oTQ=6saWe5+4&0=exK?++PlK_#
zHKQbto8Z6QI`b6%5Hs;xpf;wa^w4!fXU@|Etf8fA%ZB#2CrrOqJmJjC#BcHN7oGwQ
z38nq2^Y;Fp_)R70V$?Z7`#WU$!KBCbeLmpZ!kB${ti64~@#`p__Vxvb$=SY?iQj@a
z3m6aT%QNv?+;O-PAH^JxYn9%p^k${ED7{1JT}tm)nu*`idum5t(+12h=<9LmW}D+Q
z0>oW`ErnCPp%>v;GVxoC4hg4@m#9xh6{SJoy8T
zX1@Fr`~~tPBwAYkp*Ps5ge?A8f+S-bVmV=sfV
zTc?xDg{3RdMu^W$*Ns$&@P`+s%HYsur5n#g_koJuE)WOCt=y2>k~%)2A15*PVviM94Nu~iu|9Y$sl$>r1g6vF
z@QYMh9L~uKPNzBbni#C35o^SHLJF2jI8qWuJd$-1&Iy(y9?6(+PF1)dxFHrU433Yv
zo|MXAVl7$40Zd04WLy#|JJO0s;@VpJ-PgciIIaz#H=Rr%k}YlREpLyVbh0(%mJfe8
zKKNA39Ly2D*REP+!gN^8nz2dGI7p&7?tX|)vUZgltHx8H`7hG6ZK>bOQA!3>4<~^T
zer@sovZ1!uMkeZal7F|oaL<}}V6bLm!frgKd1wEDRv();6Z)mYUCxn
z)A`cDXcx`bdVZyH98=jvr+O^%osl+#JXXdPp{)=p%ySGiZ@Ey7Phc6U0Die}d%aR)
z6OHmxEgz$FwbK7m+N5-|(k`W2l^UC9w6k5y{C?qnj7>D?m0G@5sj-O$|7I5)p0Rk~WKu>nOp>$Kde^dzMpR(i71k1G9y(oZYBK86QZXw<`aKO7BtnW2KKMeN3sbiAKHMT7F*XOG-`L5o~{5%YrW=
zj+2Qy0&3!pfEFu%q|!>Ivy_^+Bakz3M?g*75l|D09P}G1_Z_7>m74Ia*#5AVA5;2&
zO6lvF{h)FF`8DP5p+h0={mKc(~%rC(Eemr{No
zb4EVzVQde(H1r~+C8RL4+le~MNj9Zy~O&DC?Bu4
zv8Sm6Vdvjui1|?%8(dBv0_y5~!O(3xl>?8Nfaj^S69eICyV{p>Oz_ZD2I|U4Xdk>>Mp4V*8
zZ_7;moUMbbvk>hSGo#6FI~QetdrzS~_KWS|k?i&F8su#qWSy00kJ?+C>^442{p~&H
zYY&&0*WTBWXPsIsOh@AST!qCZZsYQOrB?1zG&0T#={Cy!Nb`2n_aGOu1yGJN6YmNB
z{{7iEetui#pFUli5XpUQU^X}TicV?s?ALMR~2~q;SbJy^)kvoQW
zA9*V}XR(~@*C93LQk)5oqgy;%Y>I@!{PqPV^M8;Bmh(Z35wzR{S%Bqy-H-@_o&(F_
zB@8Ubc(e<-5ko@RWw@Sz<^0H%+=l8ow}F+2<&5Y4q!E0PbI^@|d=i2|;e#(EKL_FYgaxr8or3d*b@(N_8%8$^(H2ELMOcw%P
zRZ<5|wed<+BgcVLYkU*c$p^rnA%6g8ru+lzSuzdn%oax9m?K}rx?XO=xsjp?
zo|iX2Z*HETN^UWjd3j)jT}GbBiehfbACER`(0IWt?#~FUC?1XHTC`dY8(~?KN319w
zDn(h1Wv7k6Wg2#Z5i1)Qe#_zLLLusVJPe<|ITb1L^G0Kz#R&|)Bi@9?LK(=q??4LM
zL|oVgcYBWwCq0ejwbLSdMvl8O6pG|uBP+eKc@E&O!N2ChK3boTg%s@U+}tQ0IChf*
zcSAVIi28)~xfi}6@sHf6aS-Rsh~i+b3=ftV2qriJ
z7)xGOuve)+lO6Kj{JfO}3#f~)E}
z)^#+sbvjL*eXV=>_usNPj&3z~^lI!3wb}MGy&87ID>pOvyB+QQ0IYZoX8;ufjB~uP
z?cHFqom)B>xS==B?`Udo@7U7rhB`?Yz9f7544{&6J+m0@$zmt8c6ar*!GGAPQ`DoG
zc~R{TPvKid22bHD6knhCS|3kAgLL@I{Hl*9#&Ty3e7%@2gtYJ!+=w~m89YT}O5g?k
zMUDsP%StnNiaQ>M3Z8N;K2`YteO2kVl=5Sj{Cku>sPs{#yOh$Lk#cl_OKRe{gBl+*
zpvK1xXo%nIpm|D*l#Wo!;Hca_l@wphG*l&SLLCO_Ksd_DTK^L&f40)kEB%5}s-L)@
zo0Rgd!2MM!U8Quh(oZPm2jT(7FL1ZX;1?KnFY#W@L>&$9!}tqLnx)hdD@R>1^XB6o
zlyaYYE*C21}AnO$1kGYo_O?F!{esQ0#
zJ!)iZdtXPMb!xRf^=@;FO2uVx8<%AKA_tA6gI`oaF6K66*4!`CU0D3b`>=2P_Jv<8
zM|(UcZDQY;NbR}Eav%2#=0NzxB{=`eSwWL+kM}g3a$b50{d>kM#s34~7c*za;fvUS
z_{Gc_Dl%|z9fVAhc^XGK8C+l$)3FQ!2*
zAdw4L3WRyd0l%1lzX)?tjFCVny9nni@Qa5`g~(@7J?A@MrNS@ffiH3ax)BhnfrGLU
zwLJ8
z<)J3xd66tfzF0Vkutcth^(cp}g
zv(V3R^55XcgqPBI843Ob=|z5`d<^SyiD2)O@sF$p7R(Hkw*kt4Z~jINJRUJHNFyeyB!e2B
z5Kg)bw87aWZx!0``~0@*R|Gs>ml#KRV>g`h?0Xgo^op4|ByZmw68qm6M;-^se37-Q
zU98}c1v~b#K<<2enIKmJ!i!D(T9TZBq|0#PgQFC=%Z{rTHv_OSHAJb0{+!n{<6{=Ng+oS
z1?fOo$97)#_{7II|AEFjaM#IT9ll$=(FwCmB@XY$_zO)UhT%`pUYRrs@Z7&(?__a@0zb~v~7zPreUb5{aV;wI*h~qpE)=`P}?)6%W
zk8?8C@i$+4eEMTJP5a4M2i?OggqqSO_K!<4)-er@q=R)FL(IW82Fm?1-G#;ff4t!v
zzkOjH?P!nZq)m4GNbR}EZJbLI19Kp(gIHU+Z4A`5myC7fm-LHu%$_+YtYcP#D?TvR
zkEwB%ODt(HE1d%
zPe9&c9)B@)ISJ9u*>EwBeb3pbL0>H9!H~ih^GIjThKqUZ#vT*rY|I76&e>qpYKwV{
z20sz=aOZ5igd?(ZHqM2NowMO$9>jH~8Lwm0%{&b|XX6pnvU4_`Lf+2V_&4%1h0&wm
z+MErVH(1Pr-nsUgvvE8GEauUHf2kkL<8W+xt8+H^hzLl5PSjA$;|4MV7V}7)ow3NA
zViwZS*%=+^aFCN|)*FXj!J{DL#f|2ijo?2a(L5rIbsY2fmRm|OedCiDX<{D#1Z6Tt
zTKky3K{*%mpb5&}n8yid<2Wos35gK%coMV?j8-fb^C0hhls|>V!#v20Pv2lEgLw=V
z^C0HfALdcG_wS@cgt1&nWL`&9k}C%tt+>r*?$%f;|XV9E={7ndFg)
zHCzKdW>sfbr|Xuc#`x!{**d4Hqo%WKW4DdPVU?b5*Cda66ziO~cjAW~gm(n@@S~7MRj<=S;>c3MgoK2G?Rb*6thGxLC$eNB5W{0x@4+<5
zV~Okf%>I8F=UIoC^Q?TlKJ6iuO~w)|>EIx*;Tu0493&r_uXJ#b`8eNx!VYM%
zeQH73uXpDhgG%rQ!a;Iy(#Etc65C!f4)Pk>#?#s7blp?`M#_JxC-gZ9$FLB7rX;=l&NL4J<&uiW&=UD^L583(CE|DH)9
zhdCehb%Ve`GVynDfo9_GX5#PSOCS?}w+jBJYkCn<6*Lon*Teyx4Ua8WsM)#(*B
zWa97Y$+Ce~{N~g-D744+-x`Fb*j7pM)MAP=y?@*kXL-eq-RoL5w0lLfHSRXX6zjdM
z)DkC_=A7gth5V#UCjM?F{w_uUKGn9)a6GlWU&U|FRf@z<#*8v}P|D!Mk#&c6Sx-}Q
zpLfA#;_v#tE@+>~ucLU%#NTxsPS&RV?wv}1r1T-Bk1Bm!>2H+&PU#<&{zd7lO8=!a
zh>t(EpQCh$(qT$RDIKqLveGK0GnLL&dYICsN{?2$O6mKQeo$$%(l(`CO1CKeh|-TK
zJzME^r57u`OzD+MuT^@Z(wmjuqLfqTdE9p?rGs3Sf2#BsN}o{rw9;plzNqwNrT2#&5m7cBie5IdLdbv{LjsWf5pyivD8Xr60n*fKP_bT7mpQHS9
zEz|ul`}13+M(>L9pS5iCl=w_V+}%w4T?|9IxZS+!BcSgT4whl!Z8{)IfXtLXmL)qrJiN1`>REETEqmI(Q-%FwUp^lCF
zh1$#0i7{TJt%I!dDBAldGn(wSHk6sSx-&Yo{X0({P29$%PpOq#nwMI4#(iK{-5@5l
zKrS6!*M*SVff`VGdH!Jvk>|0ZJuj`qIP+L-vd59E>$(c#vfT=SS~=*t8U`1CckT>V
zH8!x#uTj(`+5DpKh`$>`{N0Zq9(ZI_pzNF7M@p>m@YkPx8Jn!flZc7FOY7g?qoX)P
zFU6zpJ_&gk`hJKPcqFueCCM@_t0Zy;OJ4NdiTDp;_WNZ@hO&p_E&vKVXleBnx}7(Rb&8Ggi*T0gV&C_3s$)6Rm#*
zZB7#28g2AlPLHwCcXM!DQ;k=bX~Jnh)8z+PS4l1QRc#{i*2szA)XLLX*GV(@Gh`3)
zGbM_4Z1mmj*vlNb0_%GD8rBUm12S{v4&>(vW5~{z|3f}8`tCHeV59H;16%iszPl0v
zgN(lW5wtTXk0)V1CS8vw;ZdmUd2H`wOA?)kA%eS;TX@EJhQLv53o~Hz(h(2iK(XO4
zl2E}?R`T4OoMM>KP8EE0E|k7+n9*%$1a3~~U>>LT6qJU17I~Wd($^f*
zNGx8+-SfcY&4Cw6sM)zYSWK}=C`}~CbKK6G70>Lrx08h^&BYSr^Hlw|uSWS;O8NY@
z6JGx?<$jNjs@wK2qkJ`atI_c2Ps_@-^*cEI5c%
zzTSGFQVEKJ<*W6HcPoIj4p(uh=I!px(;LS
zg3IS0Pb)eriMY{sL-{7ut}hI)SK9>QjcOp?Xd&7vEP{`wqB56do}$`hE}P7EWAny$
zlpD<1LpF&C%^U9mgY)jy19sYLu)#FgPrP299haMEVU@#M~&oh~v8@76{@|Wc3!^J*_Q0t-bJ$(zda0T~kNb7DO?z
z8#BJ-n>Ms9?Csjv7t8pPwy_xKYhy>dQ)5u9#Q6{X!=VXb
zdF_8qz=;u(-{BCw=2f~sJ7d0>|ikb?iXmW}og+kdP47nM&(!0adWpR`l1P+F(d
z+y}s4qh~1*60@#o9L|Lf&$bX~Yp*=v^lx9yPRg<1i(HLv1mqhK3<{l#
zh2&}Q!_tToD@$HAb@{N0$SKI@AiO7SpTB^7o}7eT=gWy$7YJ_xQ3+$~5NQObP(FnG
zP`L$?MRFqY#qt0Sw?w`R$zjrgb*Y?+^>Fzc*4Dp0FXEBHkn^LY1a(Kteb_oi2!o83
zE6~qzay|Gli9vF_%mjaedHt=W2FtjjJ%CVj$OVG}2`8@VAN4|n}z1)Iz
zgU}27T=^05^W-TU>3n$(`31&%|3cx!yhXAYEm*WC8!ZFv5r}&J?XxyQz@j~8p^EkO
zlFj(M`Hff+B`K)FrlC&uQskqb#9ju4_JkhCEnXq|MtgICKPR8jZndVQ*;kl?;FAK!-lgU45;TZibbLfkBriT
zh8g`7h5*3NI!Z=D^(YPLL!Q9T3!qHAJW>KbIR63sP;3%JCSnO2;O9Ybc<19u9`+*k
z&PT}rKfAG6z1%MYZwaM*UhdbRyb??BMRZi1+_$6rA@Z8gL3MS{XUbOc=wJ`P5BGXD
z%AX()_bChfT!rixvEU%m27Zz-9^6w9G&czyI^=+#FJlP$^ZJtS0zY9V0z?TX<4QbI
zyew`#7+c(PfcFF=d@cq6%a|7s#e*W*z3SFJl8d^KVl%{poPg#nRui;fkypiS4RUVF
zjaNFUJi7RA(t9B@`3`S0hcq%1&dw4*Fy#bjf;r;iFe#n8qzl3Ly-oO(T^XPEn_^YR
z_hOmh(v2IpbT;?3b#+$twi=3U8(W(Cn*3#>XKd@-RMpR^+#~^|ozjYj5j2b>Zf=mX_A|B!uRkQ@i`RoaKq0AzUr>?0xGr
z50KUVUcOv<6=X3+w})7;UwiU%fMLJyFYX`1{egj*jK}+=VNU~$S?yjPYgfl%l1w>y7>;9FI1C;;=B*GbsA7#i)|exqKwSm(v(&Ez
zV7oej6b{j}`(wCI}UFqve1>Zg#zig!iN{f|_
zR9dODKOAPT{$Bd?d;hfVhl&#R>qVviR4V+i2Y-M0dl@Lk?>6oa%1NVT05v!a_HT4#
zC||1EsRE+hSCtwZ26DG+d52Pi!+_5iu9W||QiH>Q|BRNOQ)+M+@L$t16<7PhV>lmx
z_{)(>*DCE$N`)A=pQH3kN}-K7(0B~)ei=Ll!|o+qk|s^Yn$HFN)h4+*UoC)Gx#^nc
zf5${QK6`A!C1X-D9@7Xe9ah_9+gk<(PD!UxH_-1)1LUZB#wp|J;i-zXbtrl`WYWQ7
z7Ne0HSV5C*qXlLEerrq8!(;x4_F}d%P}^QI9-sKlZSy!
z2amZB?Xf=F<9OTlu0h`4-dMEv1b8;tZOM4drM~t6X?X2@9eLK_GoR@nXm2Ids5WsM
zmt;IBb*8M
z50}P5r~Alzaq(I_CdbUaAs&-F`vyqL&v-+3r`F_#!qhzgWqF>=Ncaps^dccMwL!8B
zlrNFbm2%Y-isr181yUjDC)j?}8swJZ1{`iFix_+MHw}1l!p+UxbXEedFRWPosrt
zCerY9VIbNnSpZJ8iE?Xa-|$tVPP)LKVImFBG_j5C?3>H5mpO7h*7b5L)^_&I{m9$d
zH-A7rarR9;dSdYyP9|9F}7Cxj63_LiaVA96Rz09V{S3Mv3Sf#Hto%`S;3Nryqt&bqI4QM9QryAWqs-4s2f@f
zA`2A@fg0)G4X~fmk(_sa}@W`d2UT%|8r}GrkY#BlQ0Fu0!$>7s}Kut6^676aM{0+^OyRVDxj}XsAWR>zPCd9?gekO
zWZ;cWovke~bx7|yT4~4sfoBk34F@yl
zWD4b>`{cVjX=cueI}RDF!ySi11?zaTzU}{oZ&9B2A$*#W<|r*yN=GE*mn)@egyq?!
z__RHW6pGd3ly)oaQ)=dzK>k84TTJ6JmchSPsl_tx&~krsL7+Q2&=>;lDj5s`!|o;O
zgP9HlhVTH+2b=7Emx1Be<*xyTa3ACb!Vq$yIm)$-pbeYd?8|dsG}%6k8BJEM1!ez!
zM?;Zc1|Ijz=MI`Tl=G8p9b_H)T8S~E$!<%=5N4r0YN7_h5PH#GIvBzd2(e!SVFwjF*e!1@-`TD@kcSA15j3$mV(_L8n|Hm5N
z`0Wcrcn0lFH!Zj;d%UE$9eSw{2N?sCb`rcFalib3xKH0{>D1!U=8Q=AI)6e*>@84O2Q(aw?@S}Ts$Jy9+N^46M^cL04
zyamCgw+gDF>doffXO%|QTahgvd=83i&uEi8JMKxzEoOYz9~@TjarNbXw|KYzzfr!$
zJ=d6G+;NR5#@&TyeAjo(T-V;x)8g3xzg6w9{Tq1Q)wgzd?Y4I}wZhj~S5IF|-TgPU
zx36pK=x%RoZCSSwx1U~5mUS_YAgLVxPu=bDKh-U#VE}JC_tw1;xw`eO?d>h`LwvJp
zU)!sU@A{1Idf(>&zA5})ANcpcO2TcQ9tz^rMD@)
zQz^eSx&0xfk1Bm!>2H+&PU#<&{za*=v_buUX*q~DDz-3F4+m1ca`
zyW^GdUEjK4%cga0og2HH>K2o4+OVOgb*ogZ?%
zN?g78gk!6l`ucj>HUNR{#VMM08U;z5n%*78wNr{$w|A=XDrfIh$#QIiDP3J5aTr^N
z_1Ip&m?t0EF*KJ9C?c6!8$iTkqUmMOd
zCedCt;2aU%A_BVN<)>IzNh3JbLhlzf
zLLVEo@>i_uf|Ce8j5}l640fo
zX>A_cjuhN)n9*}E1hA*=q+}#C7o{O3s7!lWdWvVFGTrlULN6lJnDd$m8+%%c(P_Q0
z?KF0^w7Fdl&N9jv`&!mI5v5gFf(*nB`&#nOLwOq(>)(XDU!i;-mLQ$G!M_Q4qxJL*
zGO_{eZONMhUNx3r8-yQli>e*@*$uwVcNwBc3D+r12VQ<>);a=uY=F+hI9T@H!9K7??SS{cg9mlHzy
zWyVcPsH_}?^69S66gbPD3R!iQZ?ia0HQ{U{__FUtoDeIhH+`LfW1QSOSy{bK&bIMa
zhO(kL*T~8hlT0BRrDOc)NVvNn8H@8B%!4%^`BBa6-oNu)bUHU5H}(2*xWF&VLTk*G
zm4RPYuKe<;mOphmOq8?Wj6cimkGsbS^y!ifS1pm89J>Y1akjzne>5056MX_fDLR2A
zfK9npDr$}gd^+vV$8=uXZZOA{2XS)q@|?WIz;ib+?70#P0ebI~aH(UHm@8B;!9)&h24(Lg=Bjde=@GrUXK1jNicTW}Hc
z7Lvs)%lSC+0eL-IfXANjy22uZ^HKaJ)ZTHG_-5{q5gx)gpV6V6+3+b-%v4f5jF#AN
z%GD+C?ms3L&Ylp?3icRF?A&UKl$O9+ySR8*I8qwU%aT}iIHxWQnG>tS!4U}pSuonp
zs}1MWgbV8!HlSd^n|4>z>-jYA?1EO!@mrEwO;bO1-5qV6uG3~$Pe&E4tpP_a@%#qo
z9X0P><+`z;&d^mLHaF4PjC161Yhy>$)yL{)RM%D4B5;6FsDW;5?`rC+I#ePG*dced
zn(unOz3~!mkNNG^*4zE4hPh*1M^js;vuahM+xU*&RyP1bOV^eS?X7X^>Njc3eUSR9
zY3l5Y<6<0j#}38DvSzaByn!C5e&t)@QDIzb&!7+3DjE~ob)`ocP6cyjb
z$O7-YX*a)K`m^iii%iCc4PTG=#>S7KcnUhSyo#rwv7GXkOH2*EWpNw__F-erbz{di
z7`txj5oupquQX%V?T$yruG<}lcgn7Nu(1U0!)FN3W5)U;{gu++DSbid%StmoY%os1
z-K-BAhRx)-<&%O>#Utr3<;S#Ku5^m>XK9(fNhnX%GVR^XeFSucmZ?%Df4fqH8=`Dt
zb%566M#t?RRJuj!MN02d`Y)waHyp^A1?KMh?l5n6-YLwA&oTUc30N6V`L9NW2YlwByF91XY-8*S!|h)Z_pMQ2NNPU01^F8htOdR$;?c0Ba^KYWtv{~Esz~+9vRD%BP
z_Db>pz=!!QPYd&_o8y9iv4Jta1)P9^%fiK--IxWy{PK4MovGnnIY$xk%K_q-3&bz@
z$hL{20+${hdNi~=@KosNOAr4mP`@3^oNaj1KNHu^nS1smV1RRRqy_^Vj$z{&W>Xvk
zq>n3LfM0+B(2;X79KZm-4LNwq`3g&c@EI%xvKuKG3KPi!2H1dW5E$SeO@#=9HRnDF
zRw@i|J@^&_ybFRsVZfe{yaK+(0Q2$O$QDk5iO9L&TMY0f^ff<2f09+(3_}?
zg!~Xjdi5|sKG-Y<_!k^^i989;FoXV;$|cAT7aFf5Vt_-?!YCn@GFo1O%ot&?p|K_w
z!#KGe{Fq{Z%fL^>04q>;l8gYqLjH}qlZ64}E9HNYw;15_XknW0rDwW4i*=Q(0;gJD
zN4`eR!@5>-QL9c)2Y-fCB0p2;5oeYhk9KCu4cN;Z`99Y5@&MKi(u`VjWf$`Egf0o^
z%j?K5kSLCBq3l4dMY0AhSPYOJgMa}N5cYiPWN}`b#Q?8Fl{7HGOR<;1`PAXn>cu!X
zm(?Xo;4jpPJsv)S0WX01J%>UZ1Dr{*K(rg%LV4)9Vt|jKza9p-fifNjcs-j5ML!P-
zpnk+d;YCL=z~2~V^fELA4DeHwjD(ItX$TQ(Vu06z$Fu;;J}^Lv4GIH%1r-znybw)q
z!{WyPUqqQFs2>BY!#_kjs$d`brWoMSC?7%I76>Z_$ak<0lgH@jiUDp%`P1Z8LryWk
z8&ST7yzgKX6a)MX%8!zVd#A+!8P;N$83uW8V}O$}2x(w|r7i|oS^-3dVszzK45a*$b;8|SCadE&9;w9uc1Oh`5-1;Kcu$0&sbETy?!qN&f$5O>~%b&g=5g2s$JtGw`
z7|L~s4CaS&_W&Bq2W2^bhAHFizyk;K%|YhRNCpS}
z7{SYcRa@IxI{OZ2k&F=9+6(~;U~j9ZN$v+GT<*dpZxJm_g-d$M>aAVv!1UT%*EPox
z3Pfs7p>@to^*OlXUc8MnehvcUFabhqevjaW_I{Cp4EH}|n2hUfc5%IptxbJfdgAxO
z&aS@ryd(Fn$$w+cNvC-?@8+K7nQ`zg6Xn7i7#*(G-gR~Lvu4!J^`V*x^V95U-qO{F
zfJ80uZ+^rP^J0~Ydzv@LPH64!>TN@WqEn}+xd~oWs1fK7Bjmfx!Hf~|^Q9Jxo8s@;
zEC-F2Q8$^gPuXS4)Vjq}&}j4gWxuY3?NOT+Pj3b@q&^Vuf95kY6=qo8;-t8gT>T*R
z_kaML0J=fF87XyMq$c(Sx;ueo2yslvuUAU72+K>A9;0-%(*IK0q;#{=E~Q(QQfJC`
zwky3@>19f(L*VvnmENfIW~H|%y+i3;O7BDL9`h?P_l|HMK-_6|5%S!*DbdOS4
zzM1WLN{1>nxFPBpTmy8X@~0@RQ94_xi9rsz#acd6sfj@jzKKB&YGROsni%Auttxkt
zQhukizb7mGsM1d;|@^lM7LrSw*%KU8{;(jO~*MCoHnpH#YA
z>GMiyOwNA%UFqveP3#NsP3#L$6Z-c3RQP~Klnzm9{6T?l{6T>l
ze^8*t9~5YUKPV{ojXx+*`koGeu2*XOjHBG687)7j)Wp63-^9Lvyul4Y4Q>d&!3|M1xFM*)
z4Z)A$mdWEXxFM*)4Z%0KA<70f1cgd`pSa;gy8TZ|XYjm%TIv|3Ta})#^s7prQfkg0
z$WuQ;`v~6GS>N36KyCXaT+&(s(VlE=xf>l+SlXK%{JH9dJ5)_F@B#@y`dM=
z%*d!taeK|+h8W0r!e3(2WUTpw#3^Qyi%n<&#L7+AywPnTPdUF1#6Fc*`05~QfSz=4
z!$v&pwxJQ?WBkk69{aTxi|qrl&P~|B`@c75G8q2$Dsd6j2q`dadN8Z*!)_D!>@jbyNyX`Yz
z_}gnhd+Zn6ZHLmaKp+JxS>;-jah<6
zM2fPA8is)y2A*;%oreRgnz)G
z03$pX0zgkb!jfbi4LM+h26YL9&txf(U5S=~5&n>pq3js0H(-R1nhKGdz|7^GxI~O_
zG504Yf-mw7bR!^qB?t;1v>|y3{IDE{3j-4l*hvYZzY(F!w;YLqlWQW8=gCIwI$!<+
z>jG&*lTj(g)*&(jvfp0NFMob?m
zuc9ZTgptBW%QKJ}Bdfs~D_5bP<4kPzm{db@yvzZAf{B1W(ZqBwmnil=Npiri5Wccb
zHgQ8LRx>oplQzs{bKSRpU+Dw^@
z^(+&?WVU=3dzm9wV_h%b#JWLNLw>I8M1G#UiX)mYyOCcYyhSgR?_j-1mY@ZT5puR2
zFv4*Vjbnsu5U?2GRj85%Mz{^_3<@K}jKE&jk!S-3185*YG2nk^VL(wD#chG;dK^yp
zW#nBnF#JRG%tZsk-$QoI2#y=310F^3P;?n9hYBt;%;?#W05JG7Zi_@i+)bq5M}`@_
z1S1Mya4RJvp&2L*;S50ngPeiKREfm{2EPj?uRL?xHIoA=b|g4Uv4qUzK+2qe(n@m7
z!ga;O|iYFi76jC|^P;4Z=ZQ1b@M6lzSZqfysg7tptxRRKYIv4Zt9IA3}Kp
zdHg~HFi772p#0zDl|c@`AbHK{y5|&2QI}R>U#PIeMFmSnqA+r_TNphSg|U^UfJaco
ze670>q0Qo~^b-DYoD69;=btc$p0FJ(E>xJG+wIg%;>m`dm!ZwN;fDntXv0~RbSAyUR%NeTERBb7gLG)kk#YH4hxO5sf(
z6AInlx;-gRzzy{{?6kkatb9JQu$w|<6_zUt&ugHE+LAf$!tywJsC=)In?a2{uTJtd
zKUNqYQ5=PnuY;9e$fMw}6`KD%K8PwXvRno55&+oH9_I0=P#!owHEhTmj7@vNhPdu{
zQ6BuTA!h_)B4EmigqUu)DHhHPjsPBbZ0ZSxd08c#O^6l>WA0Q!M2T4)3m2jizW3fd
zWXMT(ovoN{NA>8tV}{`=z0FOSaWaz&dz#&8w#J_%z=f*Lu1?oKSB;q%
zRI_zXRYy%{*T(Le_O=c5Bxwh*ucd8ke5R1<)E755Z|QK%OiWL(?c|OQs1`C1;UMC~
ztaicogLF!vJq6yy&|tFOt2aLL?%g!O(EgK|*@P#pYdWx4Azxq)cC4`6zF~P=_|5xdaN=-ap$lapl
zok}fMxJ%1VD}7GsOG;l+YGTKroe*_Fpm|D*l+v`H{IN=>l0vg`7%3F_M<`vTbgfcO
zA>j5+O1CJb%{}>?{=jw(R*3R;}2at14e9L=~{-vl{EeS;OEe82L4qVfhS
z1pi6p|5o`1D+K>9%4a}f_QPO>;D_(I_|Y{{p3Yu|baBV0-(*2y-Ds!*rW$HW?$F?rRUX2CsiNAC@;FDkK}`Av+Diu`{59m#
z!3guQvkKcdD36sX86#YR{_S=*nYESkVT4Q4!U$(H)TZlC^cyKK!ou%3<#!F=mAyDJ
z^oSE9JF~AkJa^Z&n3EMeLh9rZnVI+Swh2yoQC99#BaVO2v^
ze=*c4yu-y2d3|~~;xHVM!4Y3T#*ZTc0lXXkKpakd0wutSoZ$t`Wj#xhW$a=kaymozHiuyQ?I31i+IO0P%+!EpGJxsc>E;U|9hs&$T
zC*p`S*%<}LY{U_NjICp&0i3b&N%S)jM;rxyB96ERoJsO0NLI)$)SWC0NLMN6A#djz
z{uV7yldnN$y4;R+l`I9PS{_EeMw+m$mET}pC*9!B5WfD*lzg-^OK2uITh7HX&XF%*
zT`xCc-5`AQ&XwDcpC`Y@koD&=J!A}Y6G#J?#QDflrfdvgtmM544E^#Cav1Gq?N
z8cIWmD-u$C8P%AM!IA(emVm))W+)=s+#M{YT-acVPa@ZV4ICTS(J1jd8f_9`4E`7e
zV2PC4hVp4x>?A|-Zb$j6SnMQ2@@Sw{jU~7lodT9f9-WG=A@73_29`+P7f~jj7(|$R
zVu|G4jq(oisv!p~k-R^kY;eQR;P8PZ@@2aWOFkBhC338{qTGW8N1is8m;@VQl5{XK
zZ@kP8&&^v=tlmfuH7s$cIfy*>7%&=~lbQ@I;vB=NhFi(XQ0Y_`Nt`+lg?Y!gNFs*Z
z$!at*p{z9*hfcUS6bj{Mtu#6F=)*Siy1cJeU|s=uFN^0M&g0xKMraGpgn54`u?eP7
zX<62)i$kj~4)q5ImSlH3*Hv9t0R*r#-_1r2yRL#02&WbRFXJ|4Or7e95P+vCJOHu!oR_f8r=HuqR)PR4rfaqc-Y;YhcIO4*9t=E95deJLNK
z#nQd#KqEl9a^_sTIxxbRwPJP
zOiz%+D+-WF?MpC%8I7e4Bq^sf@=j&bUfAR@c;w+CKlrgp*XL<=a2)W*G2_G8#|-56
z)N_1#R0_wZKr$y7&!@*KVwrCd%iN)1sewm@H;-1j0HxJs_cNdIEly;#t!E}L_O&)+
zN=&S3V`o=YTPMR%AiuS(w{1gPdt2YB3pcm5w6wa&F=6E9o>RLqdC`s^F{6fc8Gom7
z2aIn$I$7e_)~UbKw|CZ}e`2reWYWcc<1p`*PL-jD;e>+iuX`;u@9*GbYnQmLgY9nK
zLoj8_0fi}(#`*1xZ1!%S*|Xl~ZIlAL9
z9BElWnN{0OBmHtiX{+{P(vC5OE!~y_e
zvC5BX`QxPMhs7!{QohA1X-Up{H>jM&DsNT(50r1Q%7>KyGv!;X@@eJ&UilWQ{JZl1
zseFr7=1>KP{c@rO`)9FA6G{mD3Cg!vWu3|s7a^uNS1C>NS^k((Gfx@inY^ArKdAId
zrDmQj_M@pv#};M-)|I~fdrdzYg^I%YjCO?oz9
z$_j<~IgWXT#ttSDJ|5x#6j$Oh2cY=hhC~SE08l&%6#ys(@t0tJqKSAI%6^rlNcK&x
zB*BU7PvDZumc^7Fo;4I48P9!5A^0LIvHO7V79SKE|Agdn@Wb*u@U!HbrtaC`M=<*m
zf4S_yI#>P!>pWSEo#hK3KLxT7O-5xs)3qz#`l0}k(e6et%e2H8MnPIX9
z>r(j%B!|l{k+-yRHQe1wjY-(%}&xdB_p7%!q@r3L*QCoPbP$xpBzFEn(TAhXc^
zL^&Mma(Nz{NoLkzg~2c<%W2?LN)OtZBHw|`RJj0krx{|0!ci#GlUb|W(tFz&XQ?pXSQ^pZ*%0MSl7#TtQ%xFw$7C+ke?^F;YjDp50GCV
z_d|Z6d>rdVLNlzxgy%)0JdUl4oycw!46aCAGPno=7Y5i>C)k12MJ6v!h<{uTMUKUi
zI|-YHI-!Ng=bealh%0hK`NGD$#=^#m#@UU*#;nGY#%N&P(V_9QPV{Rk=
z?t0**SIYbWe`aq
zhgY+eNOZB049%ltB$R`aBdO4_0w)-qH$DK+Xne_v;)Xn&dKJzJ+*`v#Wm2>_FBlya
zEyPuuRqo{FEy@exMwuOwV02Ml9+0wmdGqt;<_W|j#bD;;fdL4Oj2w{_#mwZ6M|(AB
zI1l(#)D>7!JQ{CM=Cc_cM8YBX(y7P?onEXDe84kL32QwFS`8V@zt?SO>UC$wq@_*Y
zckD2ut$9n)!)(u}yURHLd++Jb?f;)N*}@d#VUJ94e`?Z`bZjnIu|E{*_IMDrDIRc2
zr=%Uks&w1!gHnZVJJ-9x+}Qe$9cFZ>o<^1LKS?peTwUtc_V$*zzddtq#s4eLkeLyO
zG5nB+?FU8TC*#|x4SyF-*YWGlw+)N+l|IZF9TPPrvYk5+nu(*IPt
zUMauDDc`Boyau8CNiCnN^dhC7S9*ogYm{EE^y^B$qx3eVcPjmn(ub5js`PQCzft--
zrGHfV7p1Q%{g+bCDrf(VO+M%lEz_cdd>ASkI$r5yrBzCeUJP;!F+usmlrB|zv{Ga1
zkL~Z%veBcV+^pp`rCmz5DE)}ik10J{>2{?TE4@sq(aWLTYqfl%(wmjuqVx`>cPYJJ
zshM+t`oGZf6H1>}`mE9ymAA4&l-nQ;j7RUYl+DJ@bOQ#xJgYNcl@JzwePlwPj%
z8m0W?V!Jmh{hm_eY6tv#wQT0Vp!{j%=N5=L)YnfLj^_GM3r`FTjUft5V
zVaujK9dY2E5qLN@g@b#7{f12$KH1{O9CUu{lxb5}=4E1qH1i%&SV
zx~Z?Pr)|TQKFALuje;zO-n+xN`h$1_I82kqV@)}HcbSwd$8AiLvG86pkQ{YLwhppJ
zSIAFZo9s5~Z!p|Wqi$G_TNllKd7t9v6c_G~e$#9nWQ||K&oZOQZaWTTo98Bm9C6LO
zT|v8z3J?E&FNO6M_rv}2?rZn^LF8>6WF0zd`Y1D+?6x+PnYX$#IK^=O?z^pX8<)N$
zxuv*ur_!BqAJ|nlh)FGwOGnprA>?+T2K9OvN^=}k5%5^io|jf)BahW4dmK=eCCFWc
zaoKK#K&_ll*R_0cbytlV-5Yh5n|If9)MZzF-Hfz#T_q{(@`KLd(H-JU%i6VV;)#d5
zQGc?Q=fdhf9`z@Ps6RoC`qOXBAKtJ{%pcy7I6^kX4e$-75^=R)kx(y&4f-+zpi0E3
z%@{o$%s@6hg+X6tCfbFvC*wW=ec3KkA@XIM?fu65*#J=+^M}*+g0c~{QpNna1^kH6
zXxhg7q2YC&(HZ5-2ho87;bb5i^XG7I3gt|kdPC(wNZOb`kK=GlP{8{UX^kw^41RDjrp?!txcDoVqGPx(Pp*mM!rV+u&$NAVqGU^fImYD(ZWm_hxIJs
zWjk9g!(Qgd^;p--tynk6(U6}j_ai?~UcwR0mp>rCKwg3TLb(p>MX~@bSUY?{%do>Q
zglOCjzX<}?4*z0Q>BkPg3Y)AQ{@K{epzQEN^sDB@{5g%)J(K*0(J)kJ=i*-oU4XtU
z8Ns+w(5V@aE)ab`N+Eh8)0jW^LdJ{vvx-f5F@G*%#ZdH2NI;uL?O@yv-%NvqrVT>?
zJN!;cMnd%JHKY+M+Tni-JSKC~y}YoA%u#gY#kWOXGhyS}i((5=noo`~$3G98`8@bN!+!F-~D
zdiEXbl$P(jH`s)C1n(T-%M)%K=9)cJEZ=j2V`Aa#2?JQY_v@RBuD$YVQ^oShe#@rr
zevP5kK4r|_=k!)}#Hu#g-|@Y%s^e#10o}N9OJ{RmTUTdQFRa%=$)m4pe|f`}w)U2`
z&P`RWrz_XOy|=Ha`J^g@hIn&k@5}c#Mb22iH+RR?qz8xf`|`zor*^l-)w|7`n|d64
zRU;aey}nXu?lbN~K;uYTr#@eZ51o39qXt-JrrpRY0p
z6E@)2%kYht`kPw5R+$uke`fJuwsGgUrfK7ji`vz{QHRUpr>&~NC_wqu$+E#H@W)MH
z8A2Qr^6QmmY~0=P$k@2M#;-NvUQd&BXF?$H6$Uz-RB<70c&b-e;g*GFT&M
z9?u)lNlK4bx=HCLmENk
zVxP(@R1UqawV<}I$POx&PYCx3n`|4+U=Ryx)D4&7
z;kp@l?w9zN-S0<`w{?(pZiZeb#*8Mr?PQew?J*!0-&fe4YM@NJ=c8=vAnQDW_KKO&
zWVd|=Wq*6L+GM}j9^ct)|E@;f)J2JKN-Y?I9<+rF3i+QY5WYwsrHS;xL-{Rulw
z$M$_S4mK5jcdxbwVp1REVwxx6aWL(~;y>P)Z~XZFV~>~i47lBQgP3#)+T%HClRaKi
z-{0=+fLuDZ?|%mHS793iwe2P2fwk!0?i6x9JaBb-cwntUhU;_BTzbqh5xYn3yVBb~
zcl8GLiR9V7m*FG>9+q$1;Nj
zCdc)mpC99oD+j~HGs~tp4j91T!x0y4x`B|K%cremeGPK(vh@{~0^yTc3S>7@G8877
z1$+AjT)@Bq|7a>ih~e~$1Fnat^~ZG=1cO57mlg+f@FQ|AJ}P
zzU)kwXR)r5RcNzXUPr!0&cM1>a#5>JP6vO6vD%+0_2A5sYLSw=LvI^6x}SMnn4}HQ+(4NdD0}ECZi#Nk+IV
z`4=+eAH^*Bm+FzBI_&#%vmNI#6l@7E`ezr_%J-Pkwv
z>oW&=ymo`@A*_CVK7%yLzF-yP)UVHJNPmHO6_8WEKAz1k&c0N?KAR!)6UyO6={y?D
znE-en>36W812QK6(%IhH?fv@X;XmsG`8N)v(zuzf4K8@|DMJSqxa6OW;#|~#6P8c6
z-VCC@5!Z(g{su$lB@=+5oKDbuWB@}^Y&RP7(#i;q03$eJw9U8
zm>OqX^e|R76GvrCZMm;FE+sfQ$xn~I{3t``#H^p5m`B=8PV&>EExE+tKx6u98a?$CR=A#e0+A0*1Ey6x)8^97;R4gKj;?lneS7`J_SS~(
zme%I_#)OX@uqSCqfb4Xhemb4Uo=&84{6r2XOw_y9o%|v-j$z4c7S1`BuA#WiG+azo
za&nqu)c#2#J8?>n-Oi4i%ai2=>!*2tsoSm7Q__k5a~Jc1_TS#+Bw#8b+2skh`ioa6a)%@Ri_*&+Ee@*dQir-P>K!2A1P|-{qK-&7}G3rC4pV4wNHwo#ie;&8r
zc9wr0s+Y;*nehX_<(fW5@jS&}D;jMf#$IXYlAJ@7a4xOCkm1$6aPHlKwDdEV?f*9
zvA#HqzmD@QhWm#NR<02l{_XZ;$opLlUM+4L1KRdTeE8e@1KOhob$h(u{b(-}-tQf>
z7uEL2&af+)z5d}fsglF
zk`eD$HLE6W!uEN;SFufmB;Idv(dHbdEa!P=O5lZ_vCf#0ks@cf)3MZ<@~`J*j2v+I
zqJO@Iaek-p+OxK?qT~?FoIj4h;MrsYSh|Nm1tcgx;|eYsrU@(XBFCZ(l;4jGL{BFK
z!fmJw$}f%$fbuiX^iU4%S%DS&I_fFccPPcw_YNmWIdU{)?3}+#AsCcTqD9N~xxRN?
zu8(t*qVivmw_M*fi08{%Y_mX)z`9V5M3a{5mhPF)b`N?zsBG~$PW6x@Wyo|aN
zh0If#a0*@WoIehHnkwWu%jH09tHM~;s+4uesWNu4rpXD&pKdI1&5#nbGgJ0OJJs@4
zY^6r7zocQv
z0%r%Jb*LX%1p&+ToeQz8aDBYx+c|$d*h*iyzAo1BCi*>u)^wsDX7`n_ED$>oyAz6F
zA3fhYi&)@I>H8AOk>YgJ&@B*C-#fIv<@(+M*Y^Z#xDIy^bDXB(bYFymUl@p8h-WRC>Z$Xf>9|w~$lwnDt{dhOxHKV?FD3|cP!&}j0ED7H`bx6&@5_|$1QQtd!
zkva;Co$N=yIA2Ek3zQ4sJiOoamGcPYFd#1j3{)P14nAe1r`res`f4de-klusT
z_s$xmKh3;q$f@t0FC)zfe?eMfRo^>5MEY9h@#X@)uN=UMe&oe*a0^P2Mn5|dK8-_8Uc#fymQYdL
z@1-W+o581Bjd~tjq65`~%OS>%&cI>1T`+c@%&;=Qj7!(K+br^JC1smA(Wn#6&9!?+
zuRlC35PC2UJF%~)go=Ev^ti2Xd^y4?c(CW$7JPN|_*|ha>KUik9%)){fBK*qCJL+!W@g^q{
zj0xxaRgkF5t0+MjGN@!2U~o7(BwQ33WS!T{1BsW18Gce4rvI8!a(~O>soY<_sbHAC
zCCPeNYk{w8UCY|;`i8dl4L;VyGsoBE%|Ob?C|}ma%||-d&+6D+$|LLIroT<{^Gu8x
z-g5gao}cgb+j~n`DDzq*=b4nS=Yq?Re>`2>q*7u{4LfM^pY7aTK=Nf>+%(j4M9H2(
z`0Z`O(_GiA2{hA@)hZ}^ekLwHHHwksfpUhG;`g)}I
z)%1aiD-=Je$ZfISI>mOyjf$M>z;X_RCQ@-hyhQO*#j6yrQ@ly>7R5Uh?^1j~@lnO6
z6<<(%S@AW+Hx%Ded{>crU+zyBpJPO$!2lL(Iy>Lb?U&t!@4K7o7yN$@DN<9y^wxaZ
zaO5=0|E(B+HiPK_ibE7fDUMU5<7vuO6QL>DpNKJ|^fyg3>P_Hrn%>iW+LZ7*LO)RD
zLtLo%DaA7tA6I-&aXzmz$TupUsc3j<YZB
zKWE1bD>qf+M#Y3U<@g-4!Bu3roUpCKGO9E)@oB?J?3wtqfzAx-e7n`e{vC@fU$%2O
z&NDyJW6K(m?dOv^z@M!~9{D)-1CN8qXPvEssB<~AuW?2+*fP=u{`MZrkl(u#?eRLZ
z!M1l6GW_kmlp(+O6xs{gM$m?hemkW-@{c?|9xrZr-tpdmIO|klVfYn*>Udy+GP!`t@SN!9jz_RP4#P`1?}?YKe%V?PM8H_
z&ylQ8o0iVwaNDkL=xS^1*pMJsTq0(_&W6UsEHnNai7Tf6OmXoTp#)=;axuE}P(yQ9
z{j^y#r&rDP&BjSO6YXiy)ZPtKq)m>qbn)Uj@v?=TjqBovH+QsmwRE?4o-`@$n%nDF
zdTih41HNhO7qy$4^=accSE4JZ@4iOyM#Y;If2Me+;(dybDDqp8^|L;0+hXMh+*rliJ+VbxC>wmym1gM(Th<%?*U}x
z$Z|^S==BQ39XS~JB3EKJ0>X)HK{*Nyhvc`&56eQRX(RHEsY~CzQ8@|mTq%Kkp78>m
zFRQU>n1jK(P>w*8F^QmbfK(%=NRC6iSZ+nFfpQGuCGsE+caZ!9l7poU>mhOy)&E2_JUr7Q9E*x&oA&E^v7hx3po!ACOv7dlWMT&lakXi)65Pj{a$C{halxM$c31vdD
z*{l&N{2WA)Ivx_xoIT94XzXp4MGJ2;nXxm_5Js;bMagK0R@Mf*0XdFd|2Fa%Xd>7f
zy-xozP?MW$#`Rc3u`$SrV@Y_dVfRd7j_0w41K4Y@1Rp~M^;mN#()&|NjaISsPNY9W
zxj$n^F^HXcUq$+S=B>dFs>hnkkp3p~=+;NQ&hTxIZ+=1Uq8grh2GOUm;2=KM1JRuq
z(FOjI=jdK?CL!EDLL+1a)Pd1q$O*VZ&ux@K5&Q*^L`f(Bk1mdyjv_b2a|*6v@b1&)
zETbKyA~_se!Kn3=dJ))@iWEVr7RH{6hG8Q)4hDwfY@&%L|M+ltcoDQ%6pU`U)C|Bz
zYq}}4k-R1Bv)e{(`jOQ|48Tz8aTr29q$Hdh2~Oqk>XmVf
zmWC~);X1xLI7GrxjI53X>m@iY9?l;X&IvYDgo}cuFsoF_2GnGd^x0$*Kb&3VuYWYB
z{hZ#4ouq9mf}xuEP_E5WQ~*?7WKAOVQTT3C$Bc2i=O|vF
z$d6R!oAJ@Wt2AxKMDO~n(@&z<#zzB3;SXRtV-+VURw`C28oMr#Td3)!iU%pKQ2c~qy<)TC
zaf-()o}hTL;^~TJ94WSQo~AES{D$J?ir-T-_K+ZN#+?F{RSg{G#HSM6`FIrY}~!TJd^CYC$M>yQViO
z8Z{j9AJg|Z?t^apFe26v4@2GcQpOJB8L3o%M<6hA{BT{&s983u}jfh&nUlK
z)3+=BN|B$(oTblu7~8=n4gR;{AYu$kIZgM8S0K?)k?!u7G2_tM-q_mG1T?IqUQvc4HCNAsEu$JT@Sa4H(x+uE8j!_U{$+RlbH2rWGPpo)g>?#`Aq
zm`=!^%Pfq97%nr94R!UuiMlv-O(?~ha`+2PNR?w5!$d56E^JS3Dr8c(>sK(??NXy<
z+eXwm7)t<(5*uvUe#pS7=hSJzN}LR}kfT}~rv!B?X1|UA+B%3jRQK}!Y=bT1v&P0*
zb_g1Ii4hI9tO;rVcE5s??NH=#yX*(M-OnR#>mce>;-rl;qQRD(h_t`G7ttQiYqpn%
z#kO}I;8gb@w4>};g{?Y)lnxL<6K?^CwDD-pMK5OrvF3s!mDVH=cEnXCIiu)i%b^{z;=Gwv5kXh+D?zO~jKKpG9b4n~V?VZ1s`xITu^$lf9x)
z1#0Xw%2GmhovtPg}-^><<|qzC<#_u_Q4*ybJNp>oPtR<9%l`b3W_b6D-i+NY#NR;t;
z1!>xl^fNyHLHd0xIEaro;}gQ2+0XdsE0c0Q1Hq;YjC-C%_$C9-A-J1IZPfH(68lqx
zIz^-1I$L3Z>c|2O^szu}#m^uaCMX6bs18g}YzRoDA;ah-gUMl|6U5NKUc^w{Jcu|0
zLwQ@a$_#m1S7vBnpe{W#6n78KtnqyG`pG=+<9i%46wVKp#uLO4n4$STW+<3thH4y+
zQFaF`H^LW3`+8^T!K>nnr_It~q4DxIqu2zlZEbJpE^k=VGQX>RZ8tI+Fp_k>Au_tk
z+v4TN+8+(-95NjXaP8U+>l@i_`NwOXK(Fu6b;moV1HIwkEhn_KVPsrdw#d&f^jDT>
z)v`2<)^Xn9@w}+rAyWpnZ*->*Y*7-uVY@kFmT1*7muqs#-n4D4?Wk{>G2Q)J)3CPv
zjxAc@9ud1@{f0IYa)}uWU2T}n(6*t~J({G$%`!vlb#Q>WfYbcb{c&=^N6!qoZ`51k
zhWL8YpSdCG5B9?127G7uLVx6nsAr;{B90{;S2V84N%x>KdME0ujeZvT7Jdm)FH3a<
zk*~_+iN+8iRHga+8e+NOi-7xT`as1Mil0<$P^1oz_1YCTDjL2B`R8c*0!70YA)h)f
z*1Jm4@I^@9q-lOju{>)}$L$Bh7ok54Uj#IK5zz2OK*JXS4POK_d=YSW^Pge(BJ8)}
zi+DWv6z6$xwc_^`4PS)(J2h?iBBTvp1T=gR(C|gT*HzB&MMxXI2x#~spy7*vAJ(3Z
z;ftU|UQOi%(C|e-!xsU2G~e(=NE^Ng+ckU<(uOYr8omf<_#&X;iy&wCBBVEIJBBYp
zzTu0IZ}=jhQSKq%@I^=)z6faeBIFys2x-F?0eQb6uT!pAtGHCLS&_PK%KcRFe#KW6
zp~f`jP;En9|
zVWUkb^Yasr4a$r!`V1!VX<`(bxuZmysm7p
zWvP5o6&hlFwueWv*WQ(g+d7Ck=cB#9F`~hi@mcCW-dbOKxYWJ&ZbY1Q_{?WG4Z5RD
z_@XD#$lh)hvt}DysNb~vz=FR+F3yMsd%oO-w15BVuz$Ay_&2R1s22r~I}<2}16)R3j5FayM0mE?5DkSneiHo71CR$Vw2qIwXy_=W
zBr*kZmXZ&EUpLnq^y3G_o#A$m44bLn3`c_vUPwGi4~Dwo4TCs5S33Oo@?d?<;kgt=gWTBbb*kVDl{{VV)7^C
z50H__DUw6caVY<#e+#(IdfVm;K%m9aB{Wn!#L8p@(kkh0^Ou**$)B4)J6}*GuLPO-`N#;n8JI-2
zyo4nMrD(GfjTd4kVy?jQlD+U;i&e-z!)?~Y;mb>kWniRk*k_01G7USysFe*2y=4)0
zp~xJB*#LKvek8o+RAit(Z!c`KBq@XMh~LHHr-0D4=yi9}Pt@gcaJP3~QIMV6;Z#kD
zZW*yRJ;3LIl+l!VrlhIM$55K=oV>gkpOjkUm>G&@p3v5}Ky3p5aPFQBJojwiZrUTk
zrNR?)GuHig`c6qn5a-J9l3<<;4GuDsbb`Y%6(>Iu?2?KwPM~-o-IN@wi%nyKDLV@%
z%eB;ZH??d`SaeZCC$59>w7kly6)ruo+wv>+f-nTz&frz-2G(|bsQEWZw190hV@9Qy
z`myVHk3!nPRLV9;8zrl}ExYN2%WF5Cu(#!={r>LL5CFCHHQ9MLjo`xUNzuSd*d}nF
z-<{2uirINLZh!RGc{gTYCH}9k;S+`b8_l&4jURI0b(*F@6Xu(NoWRYRHh##F
zeoE6XEB-<8FN*(EG=2#nAL4g9Fkf+?;&8>$ij#@>Ql^Vh@|BAf4S$04YE7rkw>g3N
zXx}(uh1?k`M|Y!a=NpQbsoV{U)bVk9Wr_zWHYwsuJ;7VxbB*_mt@0N5RNR5Q1>T#o
zyal@33%pk|P&dQ-F#bXlW-3~+a#NAPxcPbqQjYa(z$t1%DsM3lxp&yc5x4E_hd53p
zrw$9l5AZ2ZevSHhoI>V%pY2nLYU?2CybBr5BecOr*CE5kSyqNduC+qGGM*p`FAjk3-pTIT?gtJ%*Wj>mW2``%gG66Y7awJ+VmhT{Epe#eYL^v^b
zkbDc0gJmVwLu579L*)gmEq^fwk|X4K9Gm4YcLH6D7F-A+&kr~Gi{P91KN^RJdA3Gluds5o@LD&e
zRK^Ny%2FABKqI6wI5>rYH-l|a8I*IW48E34g!EV}2`b}YqiYb-B
zyt9x#4a>miv5TZKn3Ky{U{mQW;m5Up;|b
zMp3@uGTfwjFyN2j6T)Ac&k37NpUyL{p1`V6R5fuYmDccta2xZSTC>q@Y&#vz!Sm7v
zJe$0u#1+Mp_F=4dYnlU-PdbH!$NqgKJgkmvw=^}@OApe7nGe}XCXJPAHng-hmD7(2
z)W_xP+t)XjH)A$UrI}w-xv{3at#W<)+K$TBmNoQXVo!p;5+7N@qq!+w?=nLkH_^DR
zq0{TpbcBbWV{}LKyDcPo(`zeJzs;+bBu|iOscmbsz9QVlx4}rH;XYQS_!TAzk)2Lr
zY?4)b|1D{S=?R|D|5w@ziXt4iC?P%W>`~ut>@4?rMEboC%KnR+T0XOcZsewp@pwR~S
z(}Ud42V}7yGvYn)yr({=FTBSj%0nMprD*1lAib}q4^&*CXy%WgoL?ZUw@$HLkprrj
zZ|08x&(ZV+ie~-@@~Jzb+*OL#Dc+=bi=vr70=c_1{ea@5icc%@Go0Ju_nLmQ^4{LAC_+!S0o$<#E
zJc-Hz;K_;{j>`Q!SJPiryh728lZ5+;y`2
z2fE!0(4Uz=g%0n>_zO*Nb*!2ISh=YhH@X1CDd+!0$0=$8RYA56GnQbv-!|?m+YfP^
zLQWkPhQHz)|5?aU)r(Was3W*vsr*L)G+vqTA9K;jy{K=4-KQpG__s@adl~Y$U2YG}
z8%*Ut1P2~RnGLqRRQ}_yXpjBE_VTdU_Rd4x)j0BX4F5IBguxUlKi9N+=YuJ&Nlwo4l12@hl&U$-Njn@n>%TbbzqmeQ
z1+hJIccx}|4;%#V(Ig4xB;{hA8x*o^M_xNzT!Z|xZ+erGh7LBXK4Cd#fub;DFKvUsp)GKZ&JKf@fV8sDjK^zsAtBT
z17Fbm-zpltEAnY@nfu8rllsa&`5DOiFE%Tl4^PMsF4E`XT=
z=m4R5HhL+mJDZ2JtwYgCkohVj8f@9YNZUAzeg-*?p|`=7QAg?D?#0mkQ1{2}Qsrg0
z`zge29Ymcc(ca07Xs~51NHcDAXY@tz58rK_Wn8*bjOQX}w9wmbvQ7I*
zIErMO_H-XGUj770Yt#M$0Xs1tOe?!Ai
z!?S6B9IGeUw8y|-bzPi~vd|jz%)Z0#K@V7)_J2aQdNIBc`|DXWS;VG1oA&C(xE&JE
zpFPMj&!+t?CezxqryYBY{T+i14H$+Jj{W^9@)+V+wqetrV!ZE6#*&duds?UYpf>G4
zi5*O}X@3s(H*3>A$tnu&LA|V^;J%U=AB+DA!90C*B=1hLX>U9mXJpf!-i>`W?V0@0
zHtoHwdp7O2;_WzY`omq}d6qnmIBV0s3u6vj)^^u7w6$-5WiPANfa;-sO+%Nfg3Wq6
z&f2tx0dS7e-h+o5_ZpeLuEDz;+!35f$*lGI&W6Us4a4Z!n-e2nTRR$>?QmvykSC1A
zyPhPPo9a2@KVe9ob4(%H0caP>db`SJK^3!Gz*h#WUW96^NMWDF5P)b%ibmSWbXz1ttg2QvC)
z6#fME&sfDtiX6Mg{A$IyiVGE&DjuY0d>}*q6Pm79Y*sWrkWqfTri~9|q)*oL>53nB
zoAx*2)13YO6UCn?@{^tUS)2Cg2MpMJj>;4C$H&R0eM5F^H16VwfLn$MA7*THT-zYn
zrzUv^+cxu8V#(UH&)T%#^KIHsuj!KyTlC&*Z=t~2h>1?Xl{o4;=t=*L2wv>Gkn7pFH~vgK-^a)E$>8xsR81#%
zA{t~#_&y#DRW^8{$4v#-_c86EB-^;J;0DFziN1l|2#D+Zn3l;y@;v0jG8=4UME+{(
z(#Tj;jz>IK@*$rm7b2c-ydD?GO6-8;iT;E90WupoMM9G!#qtB>43w3Km&k8$xP#;;
z*!W;+!+MCEg!NFNlM8DjWv6(q8rJvmpHO$AT#mYyC(6ZfO_oQ{!W8lQK6ZH`nt@C9eN2{Qy2Q{zvhU;b
zv6ULR4C`6O19Gh_N8Q=R5Aq!0aD=(?GD_#kd)SBh!ijwggkFU$PsF(<;E4u9)Uy#2
zsfR!xd7>|1D}CaLU?b*u){)p)bOx-#+=+by2h@)4Luxq70B$6b6h
zm@@(JFD(DWf`dqB9p4y*FO?*FE9p(-r`XYt^fsA~?a>;2w71Fp+=R*eymTh>^HWXc
z7g&?|h1O(#EXjO5-cSc@-DG}II&z2?_SQ_q43ia@EfZz81>j^DZjNn~9p`sYJOq-i
zb7SP|L@8suK0v3%bZ;D$!$WyRNj{GK4J3OwhWCw7(Gb_)u^DrrZARHJXBI2@T44h}Ct7-9|WqqJUpK97Tu;Dk7A?@I(VgB#+3J;~#7
zFKvETvNpduS#_PAZBScZ?YKs0k`2%plQf)~vir|ASl4pwI#1hcl=2Bq!6bL&90RMo
zS8}7RzOA8Uz0TP2=y1{%VqD)rtgXll63*
zWre)^#7<&`_#(YEPKa+L{h1TO?s=go
zpy7XjhW`N?{s(CIAE4oXfQJ78o`(~I|Jy~1-%z|<@q3EjSNxIUZHm88q^VuD^N`}>
zioa6)wc;y^e^mU7;y)DMQxtr#u)Q3`Ld6or5sGDsGZl|kM$H$P#{QhC`9=>1`EO~OY9_X4Y}7#R
zCQaY0_){YCjUEJY4`}``HQ(?*$p5wG|5o$g(Da*%*4E8f-UpyQp*oK^S8;{n=M}%F
zXlzA6?m10UF~xdNdhBYOIQSyU+QdP(djXfC2@|pA^8kOf39fEg696kWRpb2c7%1o0
zCg2h>A(i(z5V>#L#u2ye?T0u{J*N%}!#X_3s-W!Ho=u#^klEr^F>Bl2I;3oz1&eT=
z75Fl2vRqnY=xlIP1|~CN^>2L3{jv*q%{H
z0-3%Ni`@rA9hxiu3nLnAS*lGOHe}la^=tS#rfJj&-Kq%bvT1D}4;P%~2!G0zZ*
zp2}1pd?YHvAHZnz8YmxIE`(R(1q`0c?vB|5jp~zDuySJ
zO5{|?)5ximwOCilt5{EyHOQYX&_#mlDaLxH)S{hg>CN@bhrH!_UdEAHu7{WWd^rc}
z1yX?)EZ0MFWT8`#3sH~j39o>F^=HicR+2w}!a8hX6&5Jrd8rtG#sfYC*E1QN0e0tR
zv<7x(Bf1Z%VxCC>*a64M;Br0XEDsgdu^<$yrC6x&bd)1?Ja#yA1v+W<5WZ`K4up{B
z4?wvd`j7_Ka|cC9oixMYDswFDvzkpsL-Y|-L_USI4~+{l@bZvv7B?_6$+dBgp?xTp
zW9S~b1BiMw&qP!kizWCNvM~pU?~hTR_5XP&BNY^U1N)}N|AU8P2QcS{vO)U50G-2D
zEseu&z|L%!zQIwZkTl`mB#rfJ3_2w`#}Yr-$E36x-p}pLb5mz?=5t_dy^qrLelP7sQ4yRAR2;5XDi7;}j<;
zRul1=yFU>Mwu2Qr6uT7-zkzno*Yt&omk^PEm7>u_Ak;%CEfCo~}|55IKu)9NNZ5@a>byyy>jU#T$
z_CwsShhL4adfMWLx)vYz)DgJ*bp+7XK@{pxsvH?}gN?33(#Bab2#p-zikP)6YeLGu
z-7+Zk$%}Bi><7DDa$~j*qE0>9i!-9ZmZkCub!d~v0i)UA#Up+>Tr;ACVax7
z5aNEZJ@&WVzbg^1gW)bL{{LgOum85iC;S!d@tm}Q`^G@D=OWX4k;g#h_V|Q(
zIRD16f(F}ODxc7S{d?640j*qR^^B^%_!!RG*vAQ*wXvVIu}?A}YhyoaV;@HKlQg5*
zQSTpvQSVz(-tFx1?|dpx_yPpjSBhgB2Xc8oQl{$?o2?p)UzbAR{{1K|Dk
zkZh|TR0nM9?@aqgSsVM)t7g|GT;jSjJ5ny*ruOcR&h{pZ&Rx8CPP}YkXXCo~;msZG
zT`k@1ohMC-ySnForNi}oKH$6Ceo?!*SsVLV8~cs;sH8rwMX_CRgW~5DPgOia@f^hq
z6faS{R55E~-|g3|jeYlCWA!AZs>iTux~=H|Gu0JRhlEqk3vBNnc4LU!GU{)VbU#pV
zWo_)ccKq>Qbl48;Z#MSpyBfOJ(!%DF<%b^8!ZOaymuAz{@BG$TK+HLGm-m3>KbOLu3F-hYHnt0yz~z!yuLN8LX@1J*=n67m+_*hNFcUQik!^7G}}STB%$(SjXqI|41kvPvOD
zz0tOjHdMEkRn9~eJK8p9I9e~L!-}JA3;7QgJ30Fz9{VP$^vSYHD1uGS8?qd2gg%2E
zsvCX<+JU{5^VpKa_CXh6)a|_}$Ee%0(WyvHW?3M1FeO8UpI|B!@2hu
zx*JEO18WVnAwFQ?*t2@6WMJG55^#*gqZ^z41Tj
zlQhG73nGVJ5IXFFP^e%*sN^k0rv>FyzF1a-mp-FXiM!qfRt8*GjU*9=AQMcZyBL*os$XTCrt#
zGs&|pP|DrKEnD1e*%YpaLcdgx7PwM2<>ck(JNX3#R?>HjJ?@cM$&lG2-MyZaRs@}E
zk3KL9ehVtFPCHzhm#z&Uw!FU%R~D~p4ixFn!=(q645rB#i3HmP1Eu$lhjXWfbH>1W
zOlJkhOy^Y?<1vFUuDYaTa5y?7oF9>S;oNC3EfYK%BCc^6TOPsa>inv3?g8PVY2n;Y
zu!VvO*SO3F7;)Xz-Q3pUs-oI4h|N=4Z)MzdTg&=-W8A~lUU1~1)g5&;H+pen)u6F`
zeZum1%L#35Cw3<+jl0^b_3iZ=+glsDTUwjz8xvk=u}3L-5$f{#q*6a@xiJh*^XIND
z^hRt2zHOHtyehtU+ALM1#LL@^$_u!*wY{OcykSjC)&s##_CSz4tiGw`_~X6v24|f+
zHr9V)8Kq{GCu5S+oPJ}h6
z7}kf9e6`|w#ZJW@#V;zJNyK*T810KSp9&AQbG@P+t9`qsH!0pjME%D!{gmQ!n*XY%
z|Db4W&p`eiO~0=wR5~G_#+JF=BE`X)KSr@!^Jyl4a@KZDIj<)ub2!1CxL9$O;#$Se
zDt<-rCyMVVQsK+`%M{O2g!*ikjzKqf(>=qajWZH`hi>$kYopXg+6G(-CX`}LIh+zE
zq{^|3VImgle6}Yy6*8&Y^=mrpc9*Lhz=Te$sie2TZg*c~;FNRfwBQFg`8puSvDP?c
zys^KqRB
zO`H)8wv1X+e|uj>dsLFKJ^vVVs^M)NM4e8whvCd#uw`c<$KT$?Xpj5D_V}J=_wNeC
zZ5>3NFQL5wz6=}vHp=|%UFK^K!?V5iZa|!Ms<1Fzh>bR*O&eIoBgYn
zt8xGnhM`l+Yy!yRVAzbszkgTz`p-WG{Yl8-9PMBo1{ib6XbgHQoUB~_W6@2)Y#*PeJyeRTyXjur%+?$UF54d>IpPwtb!=c6#y4EeH
zY}wMAq5Cmz&+p@~c(&O9hK>)T1Vi^Hq`=Vi;IapWVJ0m}#5~U=`W2Q1!fmJwhHeu6
zX)tu8+Q872?8B3dv%*7m@?zQ;1uJZZl*C3oqy)@;)Rn
zg%90e8M;FtIYRiT9VwjPvX?vs$x*TlIiuww?C0KcEArzq29l*R1^Hv-%ZQJauVFn-
z2B6LH@*hY}kXKN5qFe@S9BR>dE?f|Aju{kUY6_Pha>hsw5&`mfhW$2ECkjK!`UwDF{yC0%R
zoeN{x$8J1z$217?NJ~K0B=w3jD56aNBUr16$=$sxl&4)7U@zG#X1*VlAn_?@r49{$jp)+-;KSFS~<;J&c@iTO8
zTW*Q&krHp)X6TaZnUuRjJt?jD7`lSMK9`~t>$D6VFI^jYF?7rDMB%H(X^;rWd$B@1
ziv&4*7RWXY;rFt(;8avpCjBZQ;y8XA3}_U3=yGUaE7m!<10>4Uaf29<;)Icn9on2D
z;UKBEk`KhtRcx1`JC+O`=()n9l%C7Mkz3VpW(JY^NY5>E8HwG7rQ1{Kxn(ZfROW_a{bN&gx$IAPJYR9aTvDX4UuT*YHRG+keE4Q7|JvQ
zBod~_%%FzEV2d@)zIi8UD%N`BI`34oz0?jciIhtAuRFd!SV`iSIA5I7@pF8a*&X;f
zs9_uqNOJ?exqP8N@^#eB@db?in~tyRUZNWm^v)_4W|ByID&{j
zbPN$flQe&pB6X^i+gI^G#TAO5RBTXOr`WEzQIYyfwsVf+1&Ws_UaEMN;&qBQDc+)Z
zhvHp|4=6sW__X2+iZ3g^ruc>;l?~hTjlT$>@fQL7g_hr=_>iLE>`-nvJD{@fQIsQ@NRn#$N>T4QB`Zy5@6WGTZyEqT%e2Hk=*MaCSh$
z*#Qk_2Q-`=kT!f--*9$7!`T51X9qN#9WYA83(#JK)tSXE-~g4QB^AqvJ$+la?FK
z4*7<&L%!kcfQGX}zTxbU{)5UJ&JOv8vqS#-nr}Ee4vju{EyV|tjTor3N&!auQ7uaCS&O(O2y&t1J?ho7JyPMs=
zD-gGJ5OvN&d+Gdcq;ht*``W`Tz-#XYZLf-rA$$WH&4jb#!S3x=F>CGXB__}d85;LQYPk)|iHh`~t2tAPC>o~s-eBCMNW)K?fOiAQN
z2BK#Z=qZxQawg(Kg)_V?U+2!K`wRADq>$0tOP+~<%t;FGk
z-a`EFA$&;*@r`QbaFUx~=oV4Nn^9+8K0~q3K_c`W^q2B=2Sdo?>z-f@Z${lOAd1wf
z5C&hz8H_l+rz16hd@%VszMwKJ!Lkj$j$*twO~&HRsQU?W_*GWToZd6)o=5QqvkYtx5UTS@ryj-@^v*dAUC6YBZJ5-y`MTtKzT?7-
zIz2A86(3(03mk$Obu+O}%h&PJwV@YZx5TIp_Bg(7`!nhcUx#^h{uy^S#q
zeKRJVQSZHe2Trep{(Kist~;@-v7t3FId9F{X*JHCO59n7BFosh{v;BV!rG4drZue|
zHDG2o)g&ipc}aF(a;oOIq{7
zND$atH&OR7W$Dc1=2YEUS7H)tc1GQC^$pEk_0wj}+;JA~+^=!IQl;bU_&&3{aCUX}
z#S1T+{?MN}JN9peoE~x+T6pUHU4r&DS!|uY_od;C}_xEdx-%|XJ;&qC2
zvr4&J6gMkoIXmJO5+S;~FOFa|W6^6Z*p0`Sl<6DZCu5K;i3!
z6A{~yoZXGsP$rz+9Z*s3NY3skaAI-qs1nEcK{>k<(cX^a?9N7enas1xl(YMKhMe6N
zD890s9mee>>|ZX)h_joPx&2Escmc|O_u4E&awvGjs+*ljvFGp4`D8S(xF^0m3S}^6
z+R5WGE&s8eQfF*#B#hZvd5Z&&$=LAnqZbWxs_u9$#~FLcqIX{q=k3=v?T62RQ_65X
zd6qCaxM|dFASnKfND6OvFYXWt-tO0i-w1c|NgWN5R|9WH!;T>3j9pC666Q#30KA={@(=DmkBM=)Bum&}`w|7|vw;84hcrDGnghjV0MumZxc
zd&xX&)-uR>u`qkd5pg#{<~qu8Si_^i91^3yMEXH2IP#CZ`OD~>{JG)T`OEp_=B4B}
zf5{%gzeV;d&ziu@o1lbUXu@=xH{F|bhnaTMDIZy33}&h(qgNXPwLCPTO55PwFbsp1
z2ridKjn0j}vMG><`A%fJQh{JFW%y)n)F$e?iUeA8A@+?}Nd6P+t6!bPTmN({{0$y4^SbM@lohjhiu*RI{LzL6$6
z%V9{A$UKf{^{3ZtXlZR~S$}MKYs(tU{Dj2%_VTXohQ{N{;Wnik727-A%$D`7E$f>R
z-`LXCvZkfArTe7$>sp$cnq4-Qy8#QYug{IamIaYLJ9?2dYZu9;LHKSM*9^{%9!
zo2+pf*EMu{)pjqtnb}EtYGKvTq|I&K-`LvG(Cj4n1!`z*b=K!K#6GWJgL74cDwFKgfv`uOncIN;pKJbR#rstL2~8W9ERcUe^M9}TR6ufnIe~!f|4Y;VQ4Hdi$b6$L
zgWN!-fkQQajHV|jaxM`2VPC~hD4weLRmE!+pHO^XaRF}Wtly+)ZE5~M(|0IR#Y#CU
zBLeu==6#%L-rtG;tw@F1j-9WE+i8~jL$4+R{t6Q&VvWDTd+NIUf?LM5mE-&a#*HEg
zNI5>wY{02xLMr!1t>#o)h`4QUU&M2<)L~&5G!XOVAjfkNrvjex?tZNT+B%3jSEC>k
z?vL)Ue(S4fqm5|8zunJc{#6I^xLx*x-EQi9y^EnHj-%WL+g>X7_quPs87?`my>k(_
zb=bzOXfG4)?|rn#{o?-d{mt&*6^Q%WdkF1~^kvv+>U_P>&_sK>otU@#2*5_U}o=aeM0km~ehd
zd-iyVcno;qcF1KiU+?we%;xLuh5dWQYd!HF__)87nQ(tIXVuP(o3MQwn^o)(To&%N
zS%&@@;Jk^0w47b|?N7+_VX8Y|)Y8lWkA@F{I7m7&I3VfFgG!>UOa;RG
zqXH(^nWsi5d^#mVId9_+!c0A-^E#24b2=`m99c-|p^;+bNGZ1^utEpb-l5ohKu$n*
zQ1~DX$v2T7mfs;iB0n^B&p>`uW+0v`o3PH4Be2ewh1ghuaN2mG%twv5Qa!bL3|@(z(W`-8^{!^7G|1tQQDhY4#DG7j^O+YAtl4uOMN#x?0o^
zE`Y%K0q&|3Y{TlmO>R2#teqDZDQQd^P>bhWE
zq;61Mtgf(beBHphvbsRsu)5s3ygL5fg$J{a#2!UwfSoJFM#0XFb5sA+6q*A&H=dHA
z*zeH|NEw1H6fD!g|-+>GKp>)-ayc
zzF;_Y{hEd@cLGXAvuJjzWVV*8oS%P40m5scSe=!X;=CF)6~9Ujc>l4t5@CF
z+S-&L3e35c_^&wQWO{;Ma<#L`q!C3DC!?XOyuX@e-Y}nVqsds?+|a$DGcnz7eS3Fe
zyQAjvN>2GDiU%kj
zu4wc{C||AVV-?pcn%5wde@WA4D;j+d^8ZKE-%`9%@fyV&6>nDjnc|&__bEQ2_@v@<
zivO$lJHW^n9Dzl-eH8aqJV5a<
z#Um9zrO1(5tkoEDc-913&ndCIpB_RPbt!@J=4EcH2P$uIXsj3yfUem?32B)&gRyNrsg#p
zj;(K5zqTEw#7w+l&6>{UjeaF$LubSKW1C@M%oX4m3mbuEqVX8sr}#O=h1;8l#nwU8*xCCkBN}Yk!ARRUi++Z-{2Zq(
zqr$_#-HS1Zi`(ILdH1#3{S@N14x-MJXzyf3G}y8hq#5UNGaQNr{^7f=vy4l(qLteh
zx9)VhGj0Q$>HwI~1UbL%%x;(H>sIG{$ZbL%^?K+^a~wrL9xK}O!l5YSvD#qUg9*6@~MX`sZ
z=;o5e2gWvuu}wAR@I_;cN10rDl$o0BQ6{|1^(Yfkk20I~+p13)GuHh+{8RtHp|Qto
z*qTq7lhEBzMzo+ep++~)_I%1r
zg#6Zh%24fYeaf5yN$XRl1MzfY-CdtD@1mB~pK(-tvQL>uP&!H$V&6s!Z^_oDOf@7+
zWgPO8ZB)5FW!{FQ9qWD>Wb9b?@wn0^8#`Q6gyxK<$~{Dqutx;JBi?>e}yY36e`7_Xia3C1KW!G;QqE8iO<(MN}K#)Kom&N$6XUJB+mkY-Au{8
zYDvNpl(i_e`zqT%W)`bbhpew_@J_=$P)py||Hi75Xt#myGmB%1LYT>Wa9C2+^OLgfQDZHX8p>z{jx>-CyWT*ZZoOBD}NT%q_0#d^hN#p4u@S3E)SWX01J&s025@gl`<
zC|<7kJ;m=U{z&mQ#a}4iqxg{G1*!z5a})~|OB6>a
zmMP9u+@4>Vt5uGs7})-g74KB!z%J%zZB(HjFd8arqw2%jsKV_uJ5C*U$wa^VC4AGN_o8<9cY
zrcMi%;9Y+w}{XByE_ecx47WJVA0JZ
z79Uu!Ddepp=HSwVohm-{^Iktbds&A!+@~yoAFYBo9M!u$+$d5IGO)
zp^}Gu%iVDd{|L!N3nQfzb@!6rKxUMD0{bvpzKhbmg*TqK%)_=yWghaAxw|;(j+X(*
zpCE6b?nI%JxiT~6-ujpMD_WQ$zeH7JQ3bBu_e;H78$FLw2qb0FW3sy%Ae;zU@xYR)G9PE4O=cu99t2igh^Dpx{D|`NB
z%x56azb#15wV
zm*L$qmAj*(oK*iZ3n2%~Re!+d`K_}Lmg4KsVOjq&JBhoiLx&f*+?|bP#@)qH(Z_4y
zMrWSpPJy+zWQCHo5Ga!u*j_k;?1ykp(1U?EiEkzECW;)B?x&6@J_`CC<58(gPS06KXYdtzg
zX8p$$smx;fRYhxO>hGEss2o@xRiv7X=^=_V`_43n#1kheRuiGtpaP40*};k&?$7jU
zMOrXtx>K=7@r#OQ64CC3n!Z@^YDIc6W__ycD0jQ2Hz^vMAjp4A(@!a8`MVFx-{E$e
z-*uF$GWBzUv+GBn0UjY`r?J#`>7Jqx>?@D|bHk!)c-S2A;w;Hd#8??PD
zAj5aDkxclzeCP@@;qRtGuFP%PtnFLdW~BW5-DAG~+ZKPf67BJvw80)P5sw2e^gs@D
zhZ*x^+e4Pwrak8={DTbnyO*$kuXwE|{sSL>w
zce#;*#WFMRF=uR^lMDV%9(N{(pO>+r{f}NGFFBL{_WUrI6e_wSjc=LJ=%7)XaA|V{
z56?0iz}bsw|ZN^|79*iuwZLVm8qk&|a^TICB#nF2Wq>q0paO~wop
zH$bY9QzR!svRIx#t${*{r$nB?;SLg>f`jD*tcS=yAPLe6`NITPlrvn8hU5r&6I&c9
zWQ_Kbr;wjK-|lYY#|?XE=i6O~T4Uu3tj9?dZH^arzTGRRJ5eq{Yh`i~;*-SnE%O(&
zkUZaxlf5dW_k6q0Ab+~}=iBXzcB&bPZ8@j3E49MN3)9pdwZ
zug~-4Dy;2%yK#uu3GMrVvnzyX!ncfnzTNo{%Yd^x4O{6eXSacMJl`^pU_)T(zKHGv
zXE&H-ftb#$Tf$T*wjaxqXV%fJn6h)6>Fcp`PqBvUPzEuW!yIm26r+WA;%`8~8K?)M
zPAA#Xr_TU73nEcR3#JTpSUjSR4qA8%;e}G{`j(+w!nX|XOOvrAe9J6AY7Um*QxH_&
zGRGiIpEG{nGG9WPyoukp%=eMLhI!<))wc{u%}1HngcTS%?$U7lZ-cP}M?+41%aDoV
zXvAPO>dG+`KQ)zD(0aj@Kkaj?8}#=-Jaje`|f<6wo>
zIM|MuWasxSb1VA9?^^~ZA|InQ%Akd6>g*&t_>kdiQUM*g9DYH_JZn{Ypp}j%`;Fmw
zMShMd8ir_GGYBRm`Hd;^nu*)k%sRWdtx|baK4NbxR310g<579slT$n@&n+urD=a`b
zW$RR)PfGp9@DP*8MUZg5J?e4&#%x#0_>D2$rAO{|l_qcp4_J1xC~ydvyeh2IGI@18
z9u2*iygK)ia!!N5uD2MMP#&)1BMDDIhqgL!oo>#NaF8?WN(Pk-E*Vl1{s6P^;_x3c
z&CJ7_7Y+_*Ti!H1I}fiiTyzj;@fB96=a{_WcvwmUAv~y;B&%7ov+`Uw7L5&b?cyvw
zcvXDyv{`Xi8yqihGiqp{@rF_k`~CB~+Shg?qoK2L-F)hrYr4wY;^oKMA6>>AGW{c-
zm1mXc?v$~t>zIUrG1zQuTGQ&$1IAuiO>%OUmt^-Pr)rK%Dy-chX6~}{@O*A((4{F|
zoFIYR(>XEK(oOp*;dIPUed7P!tz5^Xj-_a7a8l+xX07G9UapMMP7X-u_e35)KKSaD
zj>oG*+3qqAkESQwV7|?40{TdN#rQ&R`+L-aB|>ledwx9z-k8j2b-%oMcl0uXW_FyH
zggi%XCqfV=g*o1yuVHmqGMtBpOU>2S(Qa8G;?(@cPQ*alk##
z^G%BPDRM|U^Pg0-{$l>5>AxvbRYtiG^)tY%zZmob$b{|ri{TxMJZ8D#K8iHK#QgP&
z|D||?;1dVR*bcZG&K+!pjl2
zZ8N_cOD6teUcyO8H9Yw$KEc@@pVX_c_}jY-1)0ply8(^d?yG2{jc5;#RHqIL19`j-
zAh*ly+3lwKi}?(+`f-%oVB0$Z8UFTe_3=>K;_=QR?`9hV+V;*$Y0uBQ@y*2U-xa<(
zh&tawd(`CGV56x#9(ghzCyy7mNUuF!)2vg4h2bX<%EVvHAiNG`!sE?^T$$UnS@Sp;
zHe>Pk-?P5{v%DMk_em_ct@E!k;TW_>eYp+xc!_unc;U;C%Y?_fHA5cn57@s~yw(%{
zn~%p^nF)`V^%sK+H0v)W>n{dx0$G1CTh|{r6&009KdKm#EyClL2R&3dRIU~4%)QSl
zU#)80rac>X%*e>PUDjVr*5&%nbh&QNOrr%)s98-ip=CA69jQT2tEBy4cI}cUz}Vy2
z%}m+Z-8OW?ZtHbD>n|o@&XoUT;)>}%Q(3&rCF?K7{fNl=i^=+nITCMh)boEzu~D%_
zv0ZV4;^!1kRpbaP);~w_0!5>DL;j_jzDm*P;gElmrf*TaL-8)f2NWMwd|L4Z#g`Rd
zQ+z}5EyZ^gK{lEF;}{g~XVzZ~yvbz!#Tfk!P6ww>^(m{N;L7@oaedPGbzS|mVPyfZ~Z
zG&BTTQuH%~LFZ=^0^uXEI~bQ<1&t+aNx5cya;8Fi1(9=6FYg(|lgFi3@DOAr@nb6t=KhkJ23B1h1%^g8W>eb*VhL0`Yv=h;0_gTC59Ye>54B
zHmnE8V&oLbagZ!FcAo~yF^HGQCLHb{xgIiur2*?95=1*g<^K@3wxkY*#V^D1Q})>T47NzVF}VXo7$3Ejr6Cn*pcdNeIwGHSb~4Xj^6Lue)=lX=QD2|c2I3eU5)g2n8!H}
z7;XL*>OPG0gUsVD>S*&95q%yD4&q}y+T8gqx**N)@{k?h9U5ncmj|5a7zhVkJ5V;t
zE{vd)!3YIxoxnhj2|o-&&?OAZO$h!G;P|s5y=p{kjU30+7~!vBOh2(5oU6>oMa&R#
zD7D2+;O`B&+p;ZTe_3Zlpf>$LY@WgY&)#YF-HaMk->ri1kEF_5(3c;5+0u$geT
z`aY?fIu_KoH}^CL``os;qr>x=9o*{Rkzi<<~L9j9TQ
z_O8={o;9Mc!uhxxRlT>HM>22B;c?aBuTH+8jAXwi_T`B<630*Tb)T<_?8kw|PY-m1
z<{Kl&7@D!uSedcYK&lraz)3{-*EO%dI9Ug3{vt)ryrtYBibpA~Q#@IbpV^e#tk|W<
z?;PfH92xNv#VZs)rg*L5jf$UFyj9VBB%=PEn!a1{KE($Vf2#Pn;_nonRs6H!-xZAw
zB(%%7ZtfqZ2pTL<9Ic2+?IwS!;sJ^WDpn~jROGB-wzo?0FvX)4*D1bPv0jn0i&^g!
z#ZwheQ#?!Ye8u-FUZ(hA#j6$nPw_K~Ur@YV@oS3TQv9Cc4;3F${F&mf6rWW5z2ftV
zFDbsPXndI9c#IDdpz&b>G(Jp##)k>89G_e~?ixko!vyI|H2rZ!qjy67&6>Vl@#~7l
zhY8B>)iiBDv)xA(jSVEEjSVEAv4I3MHjsd3YCF)_Kmr;YNI+u)321B}0gVkLps|4j
z%&>t3Wv;P-1T;2~fE%fZ02&)eKw|?5c#h^98%RhS8%Su+*g!(s*gygr8%RK70|{ts
zAVJR9Ktg((wqtA{A>Y_QLcXzq1T;2~kZ%l7ApM-m|CxyVe`)%^irHhKsf>!?OV`{7
zfDM{HP0{?Gk^ebO|5%YqDb|CQ!;3)Q!+RLh*rdS^Dvl*$Am#*356d@wU(4xzl>^=V
z_6?&&lhG&mIhj5L7{BvG8*pixP>MC>a0*S}jzeDdSm$>k&(>iRD{;}L7|~$MPDeW2-V11t*EQSA$6}A;
zGQ@2iM7?^nSHg$}TlRjW!|kylo*%Zy_b1!l^@!U#hxx$H%V=b}71A=w-J@|^^mE9iYy!yRV7MDgc>jvAf42X^
zW1W8jIb5UNti$jxw8v}G25ysqXs<=4%SK_l$mBZ??_=C9+vhgzHIJyb2AO4yXt3?E
zPFOC5{d>v^0j(VPpPG67I3GX5XMX&3!2i_FuklNF&i|yi^Y~f#zu|J+7sqp-!2c9I
zo?m$0>b!?073Rgj{>1PIf|rrEL_WIOdqmcDA4dB`o|nM`O~D=;9*B%IuP7V(@j%qr
zg9kbd-8mQ!bP6h`d7#fzGG=)oKBWiXfmU;S89Wdl=VCoL5A+ip?pWCd
znf+u7)|Ll)1@TNC=$|-l%L6@((y4M7a;6ELy=U@3`y)S-2TJ1lnjtSia;E$abuACX
zM`9)q^d-p5mAkRFJkZY&uaeDJSIaY4TONp0w-!hV)-`ez+8KxkS_yf}1Mzjt@<4xu
z{BpS->lH#8Ig1A}Z?=I?k+(s>@<5lO%5LF-%F#nB$MK9Q50oZ4&tgk#!C3b*35ML-6c!Svi4@5DF44DU_X(7i06~La+
z(gNBw5P^`;ge|
z>$yk7OaaFYZEkCBZs|smT`Y7fh8qG>^*~*$;f4y88-mb*ns2xvlpAgcc!=g7rMOPf
za6>3>&@}aRY`05stD@nCkbjA$`Qc1C!wmtc&tm#UMZ*mteXFJoH-xm|hJbf#{(XuM
zDE?H@a6^#e$2!}6R`Jh@e^+$=G5r29+z|T7a6>@D4FL@|1T@?b&~QUQ!wmrqHv}}?
z5YTW#K*J3I4L1Zd+z@bA`?oi?v(c{MhJc0}0vc`zXt*Ju;f8?DKL*Y>6xfCv0vc`z
z{bINwqzyL&q<)kfPKDww;fA2_=6!ciZU|qpyO0~gC!OPl(A`1c^Mhd)7IF{J$eG~l
zpEUuna(sp}4hq5q$}!IdXzxro0&81`85^+-g&Vp67sF7vp+;=TDoWVC-4>rUHqQKp
zA#y|C96K~_=&&JjLxmx313#UB%egFT|27Sg8=8Xlczyso
z{i_BtbU=GF6mIA)G&0?o+|V-Y-&0lyXyw2SEnKq4xuNLe(T7f6y>8W;
zrga}Csk+rKKbye=jm6$gy%tx-9}y`G?KOBH&Xh>c2l_QqX&z`3Q<7uu^O889sR*V;
z5OSyB%wax|@<0>tGsAo!!vlQ>@qy+8)gfQxGVDe~d>-gzv>21ek#FY%{ngaH0r?3z
z1@S!Dj&;6VigkhTM_(wM8&V`EVmFd<2G*mb3OU7c5?UTDw?cA^tVO&;euTpvD_@1o
ze$s*UIC&nDu*Q6#8LSa2QXZ%m!m(@6UpgP?2*?NXf$nFkiR6>4kti}#+7d~+
zKEZsTli6A#HXEr?|APQ|Aif+j@MU8MJP^frznP82pAYn9al(Ku9eC~A
zfahhcoTaGzFMg3Pg+#-=?n4-XN##w2qF``_i_7{PFjlUG-bL+Tk*x
zy`{dXB@piD_8d{P_Yg%J*7V%f=uHLr3uAVav
zRQEo3pWxT%VDpCfIx>>^BJ5reMj}7NS6RL0W{nY
z&~QUQzIro1jt(Z8(Uri_ns)Ps{C?Tf^M;Ji1)PVg@Kw(9@(INo6pg+L`L}7>3_eBr
zyPCdF(ajt3`|l}y2a_v)weyA!J^*0o5
z=xAJLsnCwtC|+AKxQL;0LmfEq6zbYw+dCZ@VQyon+|VUxuf#S6wCz!`9Byx@+|YGs
z?}-80yEd!6p>jj#K`%5EZs?IAaziifVs2>c5V@f`$niSh_!sg#xO@hjH?$EiRAnf$
z!Jdy{a6^k04Tl?AP`!Al^M;-Re~FMWZ|Dc(tM4em(G+=OCVzgFH{+M1ywZ)UKewv-
z&adI8Y^}xR^42?*KBFJT0r7p@1`t6f@^P5RB_RWPhxXeNu{f0!nET`F)MJO5vYZbP
zB60q@8@}+!H+IijD~-F&P3!$DYqvxkT24Q-H6D$ksXyK
zXfY<+kRO+sxYTmQw={Pa_dmpf>CX=!e>rpZmImNOJ
zEsvI~AUQ@V5HArr&w~;{D}KsC9s}VqGTBB4>vD1d=ml8|u!IZse3p58?;PKOi$(
zZb#iY#zx*;`4l88WE^rTh15co9ENqZd=Kk+vI_b00{WKLW`9X7E6OW|r%8tvsAf_PB_wlZ9HXg%vlvKS{Be9%p17m}p#ka`ij
z0Cs2&+6MDuti;8V`7DbSHJi-j2@r{%i=NpyZYJtRNe4EJt6(#UqT7*({st0F6aPc;
zMDku%P869L)`{fXQ4f^RDpM94g;eqh2#^wb9(fEL4=2}*YGCGM@;U4={!og2FXohs
zo#}lqI+`Pi_!OLtC1$uFiXV*BDlDUKMMBh#`8s4APca%$xhFc2f}4Nvpt9xSP$Zb
z)`NJF@pWF{yE>nekDjfRl@p^$ObCiEDVR0!@RHFoCZ}$~nG^9djnn11%BoxRVsj9h
zhwckEry^s*c~c6|Ss594vG+cNWdI^*f;I9sVUi(&Dz5bkz{Ws0QFLQ$X7y)h&iQQ3
zXDg=j{@`cltiK|*0Y9#IRyvxKlb`S9uqv)Kl|n4U<$$rtYIF*ud2&r1gZ_1m)lI-@PVMU)OY`f%v4nLpe79YlEW99kVdPSLB{;r??^*~^^OEn!
z{WM3Rro%vfuK8KOK4hN`iEqKlf3zhH(sCTi}H@jF3dJ>wR4_5${QiLWz~9sS2JSYF-$1tq
zf%j^LSy)~zzrlOG4Y)K-I09?iHZzXFawo128*JI3$O!B4e~yoS+V8{E0(|@XngQ+?
zhq~K3hFo@tzjCe4#ZTbneTN
zg~Q-CoDXRH0GtnK=L4E_#20Wk06B3r?m0+(3coj`NcVu8Sjv~4L@W;}PX^Nd_gC!4
ze8qk|t=KOfkGGDrQa^VfrG6q?sh?++`uSF=Uyz|-=j|PLgMO-PWO-*`iF&;(m6wx6
zVE2S~6f9EJxTUSVxe9|ND>}P6TPj)_8rz%?=#H(<-Nzfxq?08%vh3@aqIjp`-HP`qKA`whMNYWq{{Bw!S;apq(&9GD|E;)PG0s3BSvpIEWZpr
zE$x-fEsgN<+}7FJ(xgm$JI9Wk}-^
z3IhF)aAcDWw(J;W*f`5LNHfg$*)r-V!`uBRbU)Owal2G`+3mg!aa#vb?-8_j79$#L
zSsT)fTbUEdRO@XNS;R@
z0D%YSo%#SUzMyIQnrhtsxS?nf%^3wj+>l0(k?9M1
z7IFr%{jv>*o9PSsSx9F3g7$5{JdQ0+mhC9DzM$tIXPVGw@pK8>en}#Ke+k=uq5td|
z@;gXcU(h6sGJQe&wqLG;%v`wz>k2s#y-{iW0a#zq9NIZgeA_R)^)8U@SX*Dv7h&IO
z(5oO|ZNHp}%fgQC&E>G{!aA%t
zx)-B3Il4EOqkEHmXlGcXdt-&D5%>Vu#Oi?=7{eI{W?;5sZ(_7~a>&H*VN)3MtG=LX
zSt+pnqQ0Q(DIK!?vKm5x?U(PfMqvBp^AJT!ZND7DwiB`av7x~B%h!>|K;`@nY`;*9
zBD1j!$rtops4x^C03q8iyr*A|C3+NgFxwY2N4`5>&>7=~ar5anZrG4O0}T01`-0y4
zeE4Qt+%bQt-Y=9jOA{Carema0d0RMO~ca#Z|Q4+
zNg`YMb=L?xJO8_8nDK_St1|qY8?M6neNJVmad{7299;cOEeTT8lDBrW?`FTx{VaTJ
zZV2{ZHz}F%(!sCH!ECzl1!W}Zp{egkhnN|+#IaC*z;{F_j6@qR7%F6RChXUN#vGRo
z}n-2ggT6i3sLQVXJqVoZO{=ldm;~yGm{6nLEjGY&x-v~Yc
z8p0gJjv0#fuBP_3-oD;&jexaC(;PjWoBE0Ii^ftPy?s4iWm8v2M+-hWLxZqedm1_*
zwCaSTD;xUydfFQC!ps3vLkp83hM%Y5Xjp@ax^TcHZ$c^7l!NxjglsvMF}#*>(0u;b
zV4s>tAj7uJvW-}FrJa{XY-l?h)?l}_8EG45k@ErIcTn~?=%LzqaXtY2{>vT*J-82m
zngzr154~{l;*<$H_YeJF4uXeX&;JdF{X^#)|IqP}e`tA7;0vJpu>QUPZU-OqNBl(a
zf)@nvLEpk1BFzUqiWK;uE}sPIOL05kKKp}X{4yoh(}ERhBd$|
zN~S`xR3;%m(8xuE$V{k)m9dsV@NXHi0jILs<|@
zE=0e>@XJ}~k{G8`oivf$8wyT=aO`H}s4oCIi3s?hM_D4dM||2z5qB^
zW)zt{8h)YiKZX>R9q>UE<8yB|mL2&5ScCF9EYTmJ!ch32zhFPq7eK%VHDd>}`JngW
zNE{!u3;3W^$QQsgoGJAMV57+C?+M_w`-C1BvJhje{i{y^YdMDRFfor(JFxDb;HZsp
zgZYF`q0okYd{D~!3(7{MMStImHr`F_0P+R)=Rce=y+Zg&CkHpjO3IIXkuol
zbda;~-d
zf4^_Lf!?q#P2O~F>8NjPgL=bKbj}(Lx}$#APBZ97!t|y|nAe{ovS)rb(Lwye9E=M}
zp==~`LD;<@j709I7<lxk$Xm}r>;eCLH_W>H-
z2lzu=XygHn?`Po8H2o{ZCl!CM_`KpviZ3e)K7rXzuA=e%jC6^nCn=UI)+oM3@iN7$
z6o+fy|A$(S18%t=KT~{4(ae89{)?KXL0`%x6lpS->2Zov70VPkE}!KKiTGqcf(V}V
z7{#60ojFJ4E>PqrKHIxe)5dBo+WV}gZ&tij<-V!uZHnL1eA*S^ei+^dXm}sAYj_`|
z4etXqzMqkAd_N=oU#*vI*Jd&ABRIZ86dM#zQ@ld)bBaG!{FNd!9DCaS4IaB8>c#Os
z0Y~y$c%Kx`qYe1Un2^o;tVixpc%O}Upbf?M^NCRB4TbmFfa~)a-6sNWK_)a~jZ53B
zGbzve=-8q8em)2nZA$A9Y@v^9>;IkVB5>KfAcT2$LIFW?B8^v
zy}#MUfVRDC-iHm@_CWmxbA4{nI@Q|7Moa`6ihciE(a3bIL*RC~+@lCE;X%lyG)};2
zG~sTn!{;M`{j>eYaVeDJ{{93DZb#h!6J9`jVcyXmFVS9$6r2LhR|=UsvwyP;8!a;}
z`zzaCHt#b5`}foUa#ag!YKGxFJcUwWcYu67Wr{mf{QIj{%7jmfW1h_X^7`Z
z0d_lIK8|>Sv|^iu!k>SUyd6y@s$pYjQ3*8BimOCLiM%E)|r2uuO$ipbj^#6Pd@>4PqlGgw8*@zz?bkI>IIcU@R
zfBqfnTK~^{1Rf}PIIh|93$&2w|9K&DtpDfD=r-&Bc{B1e{XZXtb{5Kqu$5Z*6xNI6
zHmn!RO4M2+-$8t-@b&8;c@ptu@>j?&m+P_4^#A+{O2PRQKs2!MpA+`~d?~67f%7>B
z?F^Um>17>B9)Qk(P5&QaLtuHj(0xdiuq={13Woz~XEjr?LO
zzKVHo!k(#>|7}QrlX>dxnOl7d=_i=STcdh={s*G|9bX1A3uH|7l!|YFUoGaxvOEQV
zNyY@4ETNqK28D8cgF=b4L7@%fM+=P#<)w`ZV>4^hI+AN4duK%h-;06-BNO_Z4Vc}rxZ_4i28{Yjt!;ElP)AhFrBDCF^GCxeL8n69u%x`9ORZaU78U
zHuhS44zM4G!~x;8#c@FR5`>QXS@aq4&x(In{I?=?j4Y4yiy3IXoPo~Av)>|5kiOkwbBrzq@=6oX7T|5WPt8D#ed0UQ5LGZ_>2!Jpg&5r$hc-n*SZe
zdsO~mO`Cz;kf-4rw)2eU|3Q&DX>vPD6pvKgq)6LLEWcXu+lo&s{!@`(!V!G*Qei=P
zY|7vV6`|HPbF(IBdRR8b`dUu!s~qT~%yB&E&LH5{Wx_11dEdt=Hlaq*f|a8_opGbZ
z08%cjFQA@*A)Dhl4tX!w#u2ye9g28Zx8IJ7fvRJwvvEln9SisCL@c%rqFxwL|g`qNP-oo4c04}z*$m4doJv49dUBFOvkFHx&$g{zgWpg|~L3_Ne*LOZa@e80xwQ?5Li{uil7t45*E|E_l
zzEr+}BRxp&LVTIrhkdXfn)!-hJv2Xt(p6sKNfaCYhUU?tD5
zj|131aXt>5j|1o)1C3zXy1P*j)&yhGTf6I<8{31VDXq;+E(($yNS&FgJ;fWy9*^^J
z0PA<`Ea&4O&D!{0W}S}%|7W=iY*PhOYMhS)ym=uw9|z9I!AW?@r(W-EicN}bid~9Z
z6yK?MuHwatmndGL_%X$66>n7hyrT1Q;P<=pap3Da@V#b2jiLoyE+!0BS6B^cTZa|d
z9zS_)uw~TWgmpg~q2O{p4tzffI2YZvzebvmgZkcvK3J$~>RW&K@yAzoRaN^&YRuY?
z`|H}88k6UAT~K;Bf1b{tC&wW>f1WV;UDeyuR0XVAXlc(#-{vhHjlqd<
z{yh6X!K%W~s^F@2x-S1q#_778uFL7Ve4Uf?=jl5F&9s31Dh*!a_VRk!ymq>-ecPXB
zNY}O2>AIkmj0wFf#^q@Y^2w3g5YLs1k)MzSi08>Rr|ZJ)$mzPAuB)NZjq7r{uAVcx
zovzF2x}2`dYLTe_UR<9Zu-EIWlwQM}W2fu#$7eOREKaLZ2O8rT=veYD-{n>JW}y^MW^fX``hWdoUY4_
z>)NZvb**!{E~o3lkWDv-5sxs;XmoQJi(nZ~@M6OuSW?xvrLDcWibJtFyEAIY*%jvpo4`3Yb*7QtXUsKoFRo~Ft(bT;qt*!DWS{}+t1sO`J^sHYq
z_-uYq=yY8mVQbe_9PQ;4<{q6VV`5`vKN%mLAQNShOoOq7%)lqN4KeSpG+`EmXvSAIY*Yp>FEt#P_8r|WXM
zt|DiztCufz@^aGYy0&(;H}ti&x70VKt@d|x2VY-q4r7xW*OmSlHxtX!U-`~nm(_l_
zIgGExmxLSF<;Hb2ws}&D$FkFP`F<*?bDG506c~jrR~=N9Vy)tG#Wjk?PCM$Ipy@X&
zZdBZ)*r{kAJSG^_)_Vu?SAr)!CA&Xx-Y@+t%3D-qv@<^383{%`KgQw$JIhx}C18v)A`h>FjmE
zWvQFP=*D%;uU-s9+Evary|dTl<}kW(
zT~62KbX~2TT@`Jee3fy!uIjXEueqhEdtPSJ>AIY*D{C5_v)7d#-RR~pI$amPf${@A
z86#1zAS(@LW?^ptD8-O1F9Nf6)28TbmO`<)jM66({j;IT$dZyg&uI@y4<*~
zs0XD(C^%i0=Q-Q-zAoxq)gfK1c!}Z_iXT(FR`Eu~&nw=l_!Y%F6`iij?_a2gy$D>W
zd6m6qbo4be0{eP=+-zfgEvNUv&Q?QTgIC$u+v`>Kw6v?)t+vkAE^C6Tp|P>2Wox*!
zp{Jp9Qwu8i^A?@1%jvrC^V{2WU2B}K%jvqDuFL7VoUY61x+>hbuKGrNw;P*VPS@ph
zUDouNKSi-7r0N^UBcSuc7>s=k?xoH)eb@@Wo5L8=gmIjg8`t#+bret$IzNnlKR8{N
z-w!|5ab!PHd|dGf#osHwpy+g6{;h>N7=~F`I7Sp-_a@XRTCj4}$gpviQSK%5sSUPl
zE;6XeuhRlIhjFjdb**>0E~o3lPuuxn#3RP}VRW|XoxLtMhtcV})E1W;*X0{Xce*ZE
zGGr&zo^ocO&uZ#vT9BT~>&A7tab0d)m*?GrZ(-`L?of2&y8Qld;B
z@mq@DS9H2ARVpc9Cxx%eNcv_gY$?*QWhP9UsGS@Z|dv6{Q;3w_N%Z
zt=u7)em-4g2v%;S&ta@uShILxDjllR(Uc$e*R?e@rle-kVn34Fn1A*mM;$7{BlUy8
zBT72udDX=xKkn;M%e`W6l=oL$sBuq>f8_X!D4)6!z57G0mJ^F}9z-OT`#oI1kwpAh
z{@fF>9yrM{YB9FGhYs79gG{+px};6R|FkRoGae
z%)`1!mZQm}Y{Yt$j6+VbOh5~xr3aE@BoFZtxfzE!R<4E2ezG3xadJN-$IGLLPcU6D
zQC^1pBzYKHoGj0vbc)=B(y3C8oN3aG{hTh%kV(n?SeHr+`TI)^+CM;6V_hb{N6rlS
z86;=Q*HCwsoQa%r=|TKJxdSq@vFm-
zr|WXME~o3-y0|`Ve#+^(oUY5C%A09x-XFf!(9&B!Z&8iYbva#^({**>lZLv!EsF0{
zJXg`pVf6dQ>ALV`8VZvU$0g$7OVtElf1n8fzEMpm#hP;Xx-}tNj%5r^*X49wybh`s
zF05YAPrv17I9-?1bx9etV)Nx0++P+52XxlR99%XFr2~4nS~&~rMREz&i)B1Ym&hj&
zUn<|gedZv!3-M)gALN(Id04NIF}N?S6zV|h!Nizbz|$2
zbwzbE>c-TS*G1|k)aBLX*Fji{j$s{1K7iY4BvMq0jZ(Yir<`qiXPe&Hrgw7~-5kcI
zhV~ZE>AIY*t0Ne}r79gat}B%_b=B#*@Jf~rPS@phT~619&kE@JK8z0&;x&rbE4p!A
z>H9@E=5$>c`V#68tFzvFc~{VT!EVRYlV+_)|`uB%gj21d>0bX`u@g%7ch;5&-rbv~hZz2fH-oxLuvFoT-K6VUxX9_coUY61x}2`d>AIY*tFNW0ud65JbX`u@)$8Uk_8Bwm
z&R&+10;o4PtWTJQo@x$1$~eCr3ersAHM2XEeFYMY!#4qFw
z>O|~prX=Tk1`<~jBJn0vjzn?~LDP{~{A-kqzt;iSoH1;MUUqE(LdQdASe?xv;j>z@A97&)wSH6t=guEB|c`^<;`EoPj1#&(%
zT`0X+7s>HxGAUF&jFLAYr&u~6Ia=<8(|b1Mvyw
zv`m!aAvsCdUz24SN~g#VP&!pk!ahusk7GZl%h!>gk}^n^%2MR-FYiPA0Qo4^WikPE
zXGjt9XUb!!J4-%?c)9S&f1pglam|*e(ZU@04qBTl4`E#)zs0&zp2xaMHep>YuV6h-
z&V=NAnSvG;$Q-O|1gF(oC||}_YUTS_FOo;GUMwphzeJuve5pKvqd7=&QFodA9`eiO
zYOGhtTC}iI#v@)QRVZEM73M=U5_x|laTx07bU@(p$hi>kaxTK^gC;IsE>Bz$Mc#@f
z$t!fUmwOcAqdtKxMy`y^WI@^Tx`Mjmx|wwg>!Nizbz|$2bwzbE>c-TS*G1|k)aBLX
z*Wu(wvB_oQ4o4etPBX5X_&HRKNYUkNNs=|_qDZ9ZZWKi#$urTZNG)brBzYtyV?~>o
ziY1q^ELL=d$xOZ<`yNRY{exwR5qD0;|bCO?9Mjo*Tjvq#NjyNOsma*AglM=p=a
zC(!~!9TvHU=WBEW3#JwzIu@Dyv5a{;OFtCbkD0uN7hp-8>0J>U%{@30DIQaz$-6RE
z!WK_NYCV={K2~frN(+j&F~XgoNyX@FM81oN7c0PFbBS$5RW7k|WOIp)$G&p$q}+=p
zr{InRun`rWjngoJ4?B0V
z;U%MGOitZ|Gbggz=s0)GG#BjGm~acauijhGGja3OL_`D5K6(TyZ&BHZW9Z6DXYR5fmCYj3WCN}!^%tFxt|rJ=E{VpCI7Rc}vI
z6|iF7{K|Qi)m80njYxTwl~o!46!E;)w$odhE1+PhY{H&;Yz(@F%FW!*blGN>;a=*+
zk&PX?JWt}$l9H0Kamgu)=gf%9WUlk($8)B{6FJem%6LJJ#B+0^`K=}K!kp3Zf;Y#b
zIR}?Oz9bdTi*}_V2^@=6YjpRtH21)?#PP@XozdMA3}xBc+Fjq+(A(nG*EjI!>RUUu
zw42h-F6?q3*Ri#wzO}upA)V9OJ+Id5Yw76rdN+6V^riSPvK#AdX$s;E&23w~rmoK3
zAgArLj*ip&<_GDWIR>pil+W-$oC=zS*~#<~b+&YM2C|K<*vaD$H;3Fx9amdNcY9k?
zLth(&4m)N;>fm{cQvOLyRdn=i-qO(sGzVIN-dNt-)!K)QhMuO)%emd!-inS?#U}fI
zY;UUK*!ft1t*u)+o7ipzj-JT8=7zq8aN1l?ZJnDc{42)ylF-}N&~!>gcTd;8<2oU@
znwrqxEneEeAFq=7RZUG>(i$eyuU^yUhMwTG;cD~igfFTQHRIM^>D>9n_47LFI~v+L
zy@t-d^o7{efuEH*^5(8Bjp&6fR;Q#L5TrAXy|sJm!k{De(D1|h`c0i%g16<~)>BW_
zAGPkO{|gWHH+)ub|7cz?-#^X)eyEFD(kHsTyP?Il>;I%1+S~nKWJ_~Bf1bVGxi`E8E)M-kd&cbKRy-Dekyi=clg)-|c1QFM=X9!CslWQjp?p7kAUGCZn~b
zp>Io1`jT^++or6Z^}E-<+QK)bP3cb4(VQ*4_45|h%&%UuINgMQ-Dh1w&0T%CS2ug!
zVFw?)G*!L|&xX_qE!|zcZSZ?@#)0}c;X|A+qT3O~i@YmYSY%#Kna@y%WmPh9LF7{L
zR?R`eJbpbXMKoT!uHtAfr!e>EJQ))kEBnd#=meQ4lVn=@tp;)od~2{F=KXcMjT568
zrA(W5i$ElboN$QZrHML?bclI;>0caVWNyCy_(!~NhC*h
zn$!0VJlt>{g)b}I<%1+|7(s%!nE~#yc-O~v@^KjaaLLEvaewoX;73P3bPViK>Rx$X
zBKTI|5fjHLP9ow$W4#E34%GZbiab8bAEJ1a;yT5X6&n;cD|RVvRXj`aJjE*&KdyM4
z;-?jFR=iD-U-I0KyA;2x$S-#0KdAVq;x84SP<&4DFN!ZJ{zs7~jqT(p7AlTWq|Sil
z(-g}TXDe1K)+#PjT&=iP@fgMRiYF^>RBTmjSL{(dUGd$D7bw0@@p8qh6t7YIl;UR<
zzo_^n#jh)FQ~bW-j}#wP{JG+<6`xZ4gW?N{|4{s|VkF}CTS76ZI973zVyR-4;z5dy
zidQOLt9Y~G?TTMl{I=q~iVrA0s`x9#rxgFF_&3FWEArOH^PQ_$s5nt^n&NCCKGzQ>
z;w$$s#iO+RO`3kI;yV;O72lbr(?c0zhS(}#@=49vZtlJl9`nQ+{#R$&kMA5wsu*LprNs`r)8^O)h})DYHDxm
z#p_k5Mng|S=O%oehO&A(H}w-6oP6M(`OQP&+X05+)y^`1z5V3!{4vyEsbfTgee%vl
znord_&EJfNS_*MK4=BTh&y1t7;3ph}KE&?FHDrS=I~*C|_TGc`iqQz$#gpw!IG_ZtEcG{S57e-zsd`r6>!xcQ4vwzp_34rfhqB-q|{cdVfHB
zzh*>(E&CMG;r1R3wMV6tZI91O)~UwAa4$~6$wpJc6+hzDZmhk@lJk)>eAG?1)LmZb;H^78;w8v}G2D>dHZpA_PDCD}43FV}D
zhhcj>Kip>Mvh)(jd^_@Nuvy=LKJK5Z-@jgeO$(`{&d~X>V?=u#M|7v-kIjEb-`|!ED>v$i2
zF}*h4hrf+F%lnXo*~7fg8ADMQ5YKD=KJ#`~0_jEm!ahQ<3taZ=6u1s*Jh_n8ge
zXZBpn`^;VA^FI8#4e>sQ`Ml3;!y
zT(z~fqNA#_tF_y*n6~Xc5_f^JTUDXHqB@fa^!dEBuFG*gm>xd}=ac>6y!q607r*W_
zP{uiSoR8ytQd!goZ#P-QRGN!xYzZ+Z15{iba9C_+NsuC=)!Na%<9k@Y!4_3vy?k(&
zGIY;~<$U-;vbS(PHTKQPeEA0nyfINLlnzm&6$z*LMV}6P6X(P8vzs{|-0#zz54jw2
zJ}Dyf8T{aIoR8-{fqtNl{5i$HD88uZI3K@%w&5F{{WQ`!pZ}w>0Q*T*6Oki`iH`H}
z`(f|od~hoZ(KU|qN$a3z;XXyKfI1F_^t04Y<7aC^HP(#VCo1K_N{g70^7ZRs-TY8F
zpVLu)S8_gwVuyyp`Mh-(b3WhL#hlOMyO{I&3)=gIo-2Yqzn?-peBK=Av)ehJbwlEO
zY8Ta-2|q)a=QEe;VCWA0->{wMGE_fDMnR9*);zp$p
z`6A!O-bCbE5RA$Ns1+05uHtecILRC{!zWkxUY3xLKt50Ap)}vjx+#Ft9!DYPU|l4n
z4U%Ra&L}w&ImPl`NRF0AQEQBF;z)@+hNB)UcSCYNGp}ZxT!i>|A^pMeJDxXD+95ef
zCZUDNas=v5k)I-esrWuZ4x|v6ml9iAw6^`TBUv5PF0J$COGMR_EGh{mQXUbEk
zJ4?vFmCIF#A1E_%T(jlxXnBtO1V=qrp2WIBIKHG(1d>&92IAFHjQBix4g$#YmQmNlrgME-^NQh5$XbC66#-DOe<`Q`FytXIg%Xkn%J
z+|P29V$M%7MAO_4XLs2-KOE9AggHMqVT;3>^MlzvW}c8F>(CisdG5!CFrVkc=su)Y
zu)Rp~cpOf=7W;U@xC)fVe}+9#;=nur`zrd)`n!W
zdoG^1SwNwAM1#x%3bR4D6~%J1W&s`Lvq35JXEHqt=vbc(;)zi<$VLZZgLvuK(2or|
z%6kN5Bb*JwtezS19G?nm9dP!~LNoivQbC2UiVET^nP3jhtC<9pt>W%IHBj|ofc+kv
z38a%JET3WK0`053kUhxPi4d}z=fp2Z4(*x=L3ZqTvp>w-cCncsw9cnu_oxfL^bVLA
zKLhYXI(a9of47x*T@H6HknMoh`OU!{#J|4hWu?<3gkSzzCj_lav#f8R$v|eNrafVt
zgOu*ZV2Wl#Z%0%2mNaKM*ty=jSR#ASyJ;#AzvKp+2gKKsy@eB6X5XLoLQZIUuW_^Gk~^IvgqJ6LO<>_1
zAznx1i#T>aJV%Iwpz@)o;Af1RE97{iy?w6GRrr)9KlBO38x%jUc$=cJV*|OnG<~1q
zzA{&cW=J?kXSj2OsPkw4J*-I84AYM*j?6hkxYap633u>x;PZxI7M54bCxz7>e2y^8
z#S-QvZomVs9C=iAQ-%w-mpzB*9OV5L*N_c%|EN_9xA!Bqhep^QG=M>S*>i|CQpPp{
zIUCKML$npYfqInNVC6O;BfQ-g$9i50dE74Z?QxuqxUGYz_fxc&Vnl;2%br6t7C#g|
z``O-(<`BJv_V8E^f^F|o&w|#{`~In{_U4A#+tD1N-=Mu#
zs9SB|{&C5kLv#r45#jeFEB6DHxAmJL$Lqxg_A|rxv4oGeCe(lIAA3G{Y`BcN0VaF^
z?eUtl!S){!xAY)<6>{ewb3Af5c82Zo{BWD0%hFqn%y%Hq2HRft9HKSYzh|uw(8`78
z5Um*!pR}-c$adqtiESce@JX+f7T@vSxX&qN+KnrC=&md-Nm8-H>tHqRoKi29m-7$o
zKIRdDN20RY@<@pkj%4aBIP3pJgl~;DfJbUYkLCro<8si4;E~?PCubr?f(Ja3d0t53
zI;JA=x1ut5q&1X`#m%!emb(&{Jb0w%O@#ypbmTvbtV|xMlA9II02H|vdlL~pxubF#
zYQ^M_$hWrR1f{uhFY*)ePUPpwDCFeJClN1@^RVec>A|{4_+Flr3$Y$0Cn2X;HbHW<
zd>fKuNOa*~vwg~?Kh(kb#NBfeCg#StAOIjFl#Ucz>l%V)4&AxEPH%OjPdbd^^y3ZiKqsRsgbcm%IjB94?P^8S4aA;vPV2V2*mxec+K6u`H524u=DdsFkT$av{rNMISYp
z$;+{qaoP{uIF6iT{0}H?oJhlaV2)m5jlg!?lMqFUh6m$cL`lFS9gmz*t*A{NiL=HT
z)?krqu1B5X{J{?8kcQIt|Xj?j@*F7PUb`#8;Bldx`D1y_qxG-@f+&sb`p%m8NYq8(7W{1AJwfuZx{=M8mNihdcNH??}Eb
z$=Qx`w&V77+i}C?gSO$*ntTWKF2ws4f2#NkMe1T$zNc)*oq`Wl7-;ai6pgC}s3+dT
zG|&v=27X-AHxRLZpH(yiyOF+C)AY5#@~RIN(4s(B;@{I)PF=Lw
zz9Q7~b$?ebYwBzBF
zLK%4n%5dTKviTj(7orZ<2D{zEkrCGGe}E4=G{W|{FSfmGey0uvw6kf0jb`&Z&A0|x
z*9I%M2^ksN#f8bS58N*E?RK;IojcK93gtG~_Okh%8_*sPh3)N#-}x2V8w$VkCA7zW
zWqUi~cV0kyzk-YncK<$wjPUV(Gt}OW_?;i)Bn-ty+$`KHhQjZxgNBxuMvIE5u0~ijBCRVE;gn1i@}M#P6&h3cpjc
zXy|@{s(C>{Jy~O*9M{(<@2@yW%gw}JM8VXJIAcH5-N^~a7-Q=*5kHoXr9|vF-o+*7
zDg%jjLL^T517u7Trvzlo`IL<1{*$RhF6jrDe(OPI?)kXHa%B~z$LEYjj+AnT1Zr52
zF~?!^5$6Nj`M`EQu<@ff154EF#d^;>fChOc!C`)1g+ZdmM|
zQJXm||0_;yzUS2DX#+U>il>!s>E|~kkrq*@yW#g4(^ZPKik!#5{56WyNi%(dBEPel-l)iLY^FOE
z&1(?S7i#+bikxgtIgV~3enRnj#m_0;qIiemHx$3Ec#qaW@vn;i
zRQ#W!F^!D<$-~za_sa}(0`8}2x>035O)C&*DOM;hP+X$8Qt=SQBNd$wY`_0f{NzMG
z&Q)Bec(LN8iXT?IM)7*Zn-p(V{Hh`?Ot9VWEB;uKHW--yxZ)FvzgK)g5kDED!yL9h
zi=nuz2;5Vs2Mgx|+uMj+m-B(`d1v9egWjbZV8RIYfxULs9`S)am_LMzGDb3I`9nC^
z^Uk?@*!~bY@Z(S0#8H0;ALJb&5qm$*3e;zr{t$F5v--jQ9wh@m*e{q0i7z2@06*B3
zJi8hG5IFlND(^1Q%Xu`ftlTV{orXTD>k)P=Y+xLe+-$>RE
z_F(=H$feB{dSR-NKVe-dFJoOLG*475`DnrV!7fL9fh@w>j%9vzez4c01v{2m{a~Ai
ze&7fD3<%h<%opJ-WsGIsRerDs^M{b>1R?$z?8};o=EB;sA8g|XE0+8Sq9CwGLB=WuG{%T
zfSFPB1IKm#Qt=7J=M?{<$e~1(bN&$ge%MA`J^EvB^M`N?KAgGVUsn8vB5l+%-}%7y
z`++(&_Qzo3nyKsHIA+5IfFt8jygfI*8MiVwz8O894){5mFbiv(4(iEGNIy&cw3Vwy
zl5zV)r5v?eHei^e2^>obO314-DbI8M5d4nF9^X7vAK15s
zyV)PYr5Vi6fc_Bb!2jGsJ2n~q5a!};VEiFO@g(GzgblD`!(q;8?uX#Oe8SkS$&LHsB!#-m7exPMkg)e18ZqV)IT`iY4EUevi}U&509#2N@I?dxo*(HQ0A>
zKci45?GNFvCNoK+H*tDV2<+I<9Y=8`4w2jsZ3!_Pg=KJm2=8ENmK__P`|0lwfh`8y
z4G@<*ZcOThWoK
z*ku2Y?M+o2J0A6D7@o~}Mr?CS9|+dA7Z3JdYAZM|)cZS8G+XDr{`*4*6E8K`obdd}$X>k5*-9^LuM
zHl%{FP?NUrZjx!6?IY2;jn!Na;
z&oyjqZ*T4hew*g{TNotid|-aIlL6oLylsUd=?ivuj_iM}ZV}e`w5Hv0v#V+LZbW*`
zw)?u9XrUc(LVTm$TR5S;*|tr19ys-+d~39U>E$*7WSSF?ZD87rD+BU;?abEAuJnh{
zfbHR1!}&vi9{dOB2kOHgRCK(N-yhddMSyW$?h}7Jx->go$)Lkb3h5T~)BGxO!
zpF=br@j59-Df}VO@l2XW3eO?>7{oGoq=Ee*T#qddmq)sabpn3~=6yYqr1SH%U+t6l
zQWh(sFKm!U%UBjG3e6UZ(<_DV4*}%Se<|iWK|nTcMHBzW`hj2V%aI$W4~c+BqC1XJ
z3n5A#iEn-kYp@LN58+gnX7Naa`$J%x!}Ny`%pNMombk>egG-0Y?%|7^KLqg-Q_#C1
ze+cSLdp2?-&L2WHd*u5=Sd*#B8`Nf#)m69p{v9`UZV61z^@8&-dd^)%A{q7M9`vd`
z1RBW^N1a`rzNwWeqwcNRT3gXk)!EhBUF8#7fu_5UGs6OHd4^da=SSPQMMw=`{c5;w
zwACxO)#>lH=|pw|Bg^)abBo~lE?cT_;wystQU%!cs$STo16KG1zuuZM+#&>brnFr-
zy&{80+#Z@p#IH8z4*{K^p}#FDT8v7EDD2LLLll18!XcVr(U@biIr}CZq8Mdgl1>^9
zX#cGAysY%==?|d+`@&&s&L4u~gPcDEe8Yj?p>~P5P4OPZ!TcdStL1-D{JSD<4yK)4
z#X?2ude}b44ije+p?iB79w+xha=dXrZ721-4Eag&FdmbW
zdcW3KxVF7jdg|dhv57n;QBZNi}Qz2A6SCf+ST6B*Vf)r-_#Q5
zZ9BSyC>3hXAHoQoXpz=iIe!Rgo}u0!OCMfVyR63y>(0FonXYR4OUzJ&9K;QS#xjh8ao!FT=;{C>EV!?(~MUs1eM@ovTY
z6dzFhsUqz-v)=C%pH=*`A}tZH{NIY(7326oVt#?*7{!#L^M~O3M(FM9@hY3TIyzb~
z^RIH%2}f5p^!4?$HE!u^p=*&Lhslsc*Js!Q3RgzAn^1~1lB?o1ix?2Lf_zAbem4XYNYu?sKVIfMX7YCPDfLI++Ww$)R>amg^N{W
zWB%EP9CfIOy#jc=<-zs9~8LVGEr<*Se!BgZ0MB9Gvx$I7=Lxu3LRJx<1=biDizajP<0
z1<6S=8ZAtgxhS0?5219b)MFo}$)~WN)8!`Qr(`T7OJz0k_ZJSmJwV=rb(xf-?hM%v
z`7`CWs5?vOXS-ZJg!q9n4aYTGeu@_62yF+=mB+BIkms&v9E}z1Bh0qtQ
zwSzMqrLcpO57G4akF_wNl5ICTLKbA3J9|*jLdGAj9
zKv;v+YUVU~SH?=%;;~2_jV0{^fnKMLK^zWF{swj}$~L}>h!-1$!{!p(imF`FR&UNm
zITz3QKp4pC4b|Tvt2apDw4(oTyErbES1s#f)r)hkkKX9bycYM_#59x@7v30~dBaRx
z5a+1#1D?=)Sw{gI<;Z572L#Az;1yy6N57Xt;be!XcOKSz-Un>j1KeiwIEjnL
zw@vKO<#`g1mXwr?jZ02ZJZDB+CUc!v6VHjBnTjWJqIs3^f*kldI5u7|Ii8yn&95wp
z7iM}wNJV0pZ(_gshc;%J(z|qkaxh$M{uUS;cf*ypw6!-oJ2y>DTROZA#~*L({@W{*
z%D7rDLnYa6^WP{W&K+NG&UrqxC!nbt>{WLn2G67AjC?tmUGZ5ZX%
z8MxVS{Nb6N6~f)Vg=D88eu(&m%
zY}$+z?QFJzwJoQf8eD;`-ScW&JKFb+;mhVlG(3KpZL9)HY3zGg^Fyq#^zSX=2
z4RrPM4LCf8xs2(t{;bG+=odJ~nR-Z`7mm5)M-FkEqVW%mub%yxhR}hUzetf|v?+gx
zB9D*hb&4k|HYjdZG}dz=XJ$VGspnxm^U4goQqvz-yiW1ciZ?6XrubFGyA;2xXuclN
zp0jD=_wQBw%twFhYc_4J#1{^a>;Dw#rIP8}73qtRX``P4I$sEWe|(R65%h=kg}^x)
z9CKZzXnxm78!Zix_Y?XHFV=E%-$4EcHH}+~7r_THpGRzG*#49IT2Ak)9OzEAZ#YAE
zy?F?u5y5HUGnelPHrOZcTx8&J;MHkCGfs30aXt?y!-da`W3cc!WA@JZ_iy
zcDv^wZtEcGeHQJd7|~$M-i36yy)U6X{s!1y0T$cd6^Pq9hHNdZfec{V3EPevUzVwluz$~4A)u85-&4D=
zAIIZo49xc|neUhGobUPhAbd~UFg&qoqrmo*n>e|i%MiaWPVR@x1-GTZ^+b+(`C0Hi
z+s|IPeLL(5;ecKR=ksq=8ye@c61@!0$IJ_g<5a{$x>O0j@n-?Mf?D{2J14Jin=qT
z2>F9^KEFo`bL2Z{ZLU0ob%p#E>q>bZYs>k(g7`dnHzeoF6tuQL=3s3(pZ|xg)XFxj
z7s-QITh8aVh+ED_Pj3Y^dTSUrR2iLb?R9z2o$
zFu?M>8=VTyXEwzG&c}DSk*s4`Hs|vKC9^r7t8uXL&!HsXe43C`Om32#58n_OmSO3~
z`QR?lpYx%$n*~_XoX^on9nKuX`LM-$q~3-l&H3=oZaAMZL=5Lsj)>!YjO&6~6Av#L
zEn{-(CY(7@@I1heGn&ZqYA~RugJ$%h8stVIHT;yq_X#Z{dI{L*x%>
zpVt1gPdqQ$mWt#$?x(?6ydT)(fiqPTn1pbqYPxF!<+CA(76nOiQj5F|YX@MePRS73
z4JK|=2O$dtX~!3vq7D!ztM>wLu&hx_3>
ziQ|6w;zcb=I*bJSHAi80s7K&A+U?vAZr6Mdc7CuO_p`6tugT_qsCpu&Vf|p!e6r(y
zpzDRkgZ;2gF`N6L`jMPXt>Q6?8x?s!c^$YP+{qmGgRT#P)kV)j4mksyP7`VrEm%3~
z`WZKR5g_Hlx(lerOrYLAtfTLSt~`Z2YOW~5h1=tGVcSO3DC>v9{alXrhQj@@okK-J~Z5>3tZ=$^vBN}YkyO0jIw+-##PHhw`(eh?VS6m;mL;zvBrR%>*F&&g+~+}NscGX07bnNXoQ@HuFYV9y6==!
z-D<-DdB4T*u;*9)5;uo{12TRK9>Q54#BV`*-p>K}jerCC7@wSpn3+)_IpmAM?A(GT
zG4F@JGR*twrerMsV@k$yH{%io2gI2jko+bx3tmLlKpfDy$QSuG_9h}6l@XPTP%9=y
z$cak{n$3{|5YH9P-AKp{kk6BO$jO&`5HFBVL#9w@1HVX4#NH(3-B^zjG6dHD^^=ga
z{;$J+3wj_qPFAAS`Yk{P{1&vM{Yg@d7ADI{D7AhIXj^WYd=dLO-OSoa$x29;$}z~_
zUv5PF0J$COGC2%&XGkgXXUd<@<}CRU;?{4$OelwE3vb19jMwG4@-*74kQcG8lqe*t
zq!;mO8H4yd`7rijzEmT=KvrU1BWuv+LisheQY(MKdXc<>we?$&guL}zP=$D=--5TI
z1v~HO2$X^Y;*B;v@8?_y*m*zw{1yy6?`IpfJ}eFh#1CgJf%vIIXMo>%6h{Pp=fmg}
zq}H=6lBC~)_;c8ub>sM(0M$dbC{9lr8z%k&Ys~vOi8W$HpYc=ILKriBrs25K{;yv!
znaSIb89yHl1RT(r$SFP%J3tQT0kpud2Fu|7ubWt!<+ork|JQ7h*W`LEQQnLV^~0xz
zp?;R=w_I|9mcv24c&r>i0AyVcQ
z6s#zS;$9eC>zyTMHnB6w-1s;;iY|>FR6tMB_;nSTbOfHGOUE8wvKVdT
z&h%K4z~q|5(o)IrDV^8f$w9tu5{Fk1lW1~9K>=C@YlAJ2#3?L6W0O%f=wepOydi6XUHYmOCG;(EJ+93e~Lf
zS)npW!GnQih17!qPmKD%wo#rv|BAtB(y+!xfc?mzHJ(4N;XD+M*a<TGFFWlznh&$Lue-JLfC@7Kn0K`=Vj%?qMG>^G?Y
z>kaFCV#Vmy&5Bxfop)k&!fsxW`Qh1L%nHg`!PMLy_xRf3`WCta&uQ79IZFM
zM&`)2wr~2xwnsOz939xbaz>qe&nvIl!-4J4p*q3tN5J-;3KQ4|AG|bGzN)8bbLxba
z?ylapzOJ4#4ovwT7x)HJh-I*OL3~Boo4BF0jw=0{#bewX<^_fIC4B4Wd%g`!FSiLG
z(;O#l1JfMSj4w0uMY1!lXnu1rD@gC+_NLxC{5eCo%GlfFjd(5P<86Hc5jqi$h2oqc
z9!oy-75uDmbBBCg5%ubSVSfN$RQ!)3PbBkm6blu{DAMK#%cm)pDMC+R@~ahV6_+Wl
zR$QxijN*F5lNC2AwkozO_9&jN_-@4u6yK+~uk%M&;aiUV{|Ut#6hE(co1*o9U`D4x
z{)d|XpyIC-pHlpzB0U(g{eLS`VbAog_J82~VSAOFKIBz4H}t_9LgW8u?@Qq8sLJ-|
z&Am6dNt)Xw-8a%gH)xioZQ69>77DcNr4$v!G+Wz9Hj=agB2{EP^5e$_J<*{9VDN|K~aLo|(BfH|ES8@7vkw
zGDn%`6yZ)6@=CZxc>#ZS6Ly7H3W`DOQ=6PXke|2>54h>b!z08zYgmuZl4G&heL&PX
z1ItSk-Dt37d{zegdz$^B6ZQv*pvUi|&nfyK>)1|E&qkXAaYUU~hz6;@ZG)}19vQ*y
z{tM5<66A5a%(us}331y7QRi{=SHg$}Tb9l%jmNW<&wlm?*_hYgX2fk9M4dO$A0EqI
zux07I(oFQnab?5otiHsJxDRJEQ17rY*G~;&LwH`NBCy1#&&&h4Nq6^dQ-Yb?S_wRmd444X8QP
z%>EfBoF`N)KgLlHmpgFC){5L%^fOBSgdA%{?g-QzD|zT)oK&K8y!;5I6J!PUVWM%B
zu%DUFRAS~fO_G_&pDdfuYJW4Y=m4QJJ_j<(Z;^xJg#6yny39OnccB-C=5
zDL=xxRDO6u$3x#1nYV7Jl6B20`;rq
z4a677(>T(FQh>ILp+iWRxcUa+sj
z7JJJkZDt#98qxR7E+pD9h+vauvn(gE7>5I<2Xr;i_*Xr
zOAr-Vf+&$r5DnfQK{O=8w4tHF9&$$AeF$#noJy2Fy{I^thcQ}>r3VhF5FApWu_sq)
zIi$)3m?VVxLX*+T_kz8tX5zKTi1X}h*9$f;6&t#-M+=-6QMM;fCCY`(IMFwvKjjVJ>*H#
zD>pQs9IrzviMG%0|CJd&7Y^ZMDZ}iqZL;vo~&4_xL&bMaiiiV6wg!S*D1Guwc>S(H!I$z
zxJB_EMarkx?g7O|6`xRiR*|wY)_Xopy7XjhW`N?{s(CIAE4oXfNOO7hW|m@@IOGq{{RjD12p^(
z(C|M%!~Xyc{{#Gj_H&Km^@_JB-mdt+ir-b-s`#MdV~Rgld`|I2Maq*nUcXm-Tk&s-
z|5D7!aqGnu6N_IX=VxAZ`3#1C9S{pz(hVO!0pWLFW-{2Q>b#QEvQSBTcPd
z=2J(R*rs?c5rT=&C{obD^wo+t64B2sir-MAp91E8Tk*S!KT!OUB1MbruS(JUf03qy
z0fr*XJ&fh(%GA45k@pkwU*wfp-bXg#@B$n1IT%eZ;BR8WuJAbvyxwrGG(HoE%gjk?
z`onlwl_1XhK7?Xs;j`gbEOs9dby~4JjBCdRTb9n}oXv+HI%0pkme?oz2
z0q>PI*l05{Y@B5$;~M*rtrRHZ^CWm2XXC=;HOcKV-)?sk;=%szM1Lj7v%!{~jf`M_
zv^mE^VSn4>bDlzfc&vKC_V?e&3HEm*`r|mTKmMoe{(Tj3+XhkR|IptnjA*cBHy|DC
z@3ugH6gt`d?nInzDzGs0$2_6wZr5hb?J}hEIYAqH93Q)X>3mK*?j^h?ZLr5nwAU=l
zu0g#u$RwXbZifBw{BTSHm!&>zlx8HMY&TE2w%0{I@UuZ40S;)~=FTyBfyJgk?Pi9(i!A$haZ
ziT@S_hK8As_K_vHXfMg>K%Nt6!Rk^I7biLtrTMIK43>f^C>rWSNtG0yf__NDu;75j
z$-?B2)9@zSZZoU7qDhLnvawtnI^t;
zpVAU_r?kX;a$*Sn{<%Iek(Y^>h^G@1`IeX{u*5`RkXGQ#74w;d9Ynw(1VZTl+8E68
ze71)EuUi{2H)CT{XH#8Mb5qxui`O?bG&Ht)lBN2NGuuP|*KipGIcrUSds@lhEcpF1
zy4AyM3QrclQ+Bs@pS>+B6s9;GgXmq*Zrb;rI=1axTh&X)h
z@I%CWWd_rO9LM(tSI-iDKjz@w%E)B!;bUaBKz>tFb~KiVO4Bu6u2`kWc?+z!Oz|ki
z6BPNK&GI#h>lFFz&-_ls3lu-6Xkf~B-lh0G#rqZc4ax01uK1MV
z^NPPwd{yxeiti}?UGd+F5u9-Lm#;WjafBjWsj_^MB26qXU8*=+v0Cw9#lsYjQe3I{
z0mV}l>lK?6+Y~n_eq8aBil0`zNO7~`Rf^Xt-lX_-#XA&3|JUyMdxM`EIFHnuBjPW!
zbFxa;jdfG&+BT@AH`Z-fS5sS8*U`8!D66dPsBK*bf7V)|xv90$#zX(t?&lP5#JqPc
z!h%cH3o~#_z06DbWyc~fSdUg0DBH8amZi%cuY~M}+u{9@cVD|*%7bhhM4hM5-zON+
zV9T12X57lojzNWrMo`_`gDj3
z6;M9jKF7&?l#Z8QAb*0?V;?38JuIdALpU7yss0dVqU{tRuQgTv4{fIj?U_uMD-pNa
z%dS5Ja%eN<*I1Vd`LZ(kC)U;$P61k3e+bhNpDpvSo+D(C=gJSTl`8oe*7M{ySkISb
zXj?6RLVSU|j-y#9&~E;QSZ=|3iJXWY4i>)mB;_EK!WPaDRQ0u&&qM{Qy}TLK
zQnZ&d+rptmqF!k)#|}pe&mY27Z0;#CKY?vRf~HOos!DDkwHPeIO*&!Lps%e2MBVD7Zn+=|?xwJexW
zh$tl9=Fc+B+z&I_!r6@W$DrB@EOFxxfj!nB#Wub4hu~ShnTEDpq8DJr#mOiD+~+Od
zG+<-`TFV?L^X`HNS@!-ATvym=cpzFwaY=^$5PIVeA=Q2jY+={b)pn+NZsaFx=n>nD
zRB3Hp)8fvywOu8pEw!+0u$bbYs?O4ulG1hdcO0zQ99M~jR&Ca9Xsz#RYHKa+Y&6I`
z&iD+b2cYE}BN$6F4BzyzmKIES4QhVDN2o7G+}G^hbkk&8U+deR*%LIGt*ENI26N~h
zp?7`|Rxe+g;^*BE1-@(Z&_6bX@SbRt_ta`HHL!J;gWvgli`|=S-k9$}zO?O7HcTmn
zAG*tiAy5c}&>uprc@GZ#A%y-Aj6O4T!HhmL(C9M*jXpEb=raS2J~PnhGXsr2GjJ=#
z1VE$D3^e-8K%>tLH2Tayqt6U9`piJ1&kQvB%s`{h3^e-8K%>tLH2Tayqt6U9`piJ1
z&kQvB%s`{h3^e-8K%>tLyqq!s;8zrHQT(Rjw-xVI{GlRk*0SBRij>AMy|>!4`5NUN
z*#FxV?^L{7k(K~hzEyE=@rMA@HXV)4N)~LNS!iynZ*J1bWoty<44
zgx_v$M{NtJilrwUQ&!v6)zMV9p$jxdwqZ~5h0XT_8z34pfjXt2ew?I9K?o1Ia0%j+
z8L|!+K826Pf?I+Y+7S!=Avg|&ronLu{UNxQ2s!HDb@dXYs<^bwbyW
z$%H-6AHux3b9=-6>;``bsa~@4aGU}
zIUqBU#`A|@rp(jEbuVGfs{{sr84@gnh6a&`*$GB8Q^pB$4hX8#Utt?bEW=><{t&Lh
z@F8^w%hVsj|6zALe+Xx=AeuOZ)uKfteqvLSf3&6J6`mb
z$xPgW%-HGZz~g{u8fXX^JaRyM^J7?srEmNpu*Z|o+lg3u=?`Hmc9Tn#96pz*#|lkC
zZ(O2OBjOUWLK(ee_lZ9Q*GqQ15~CdYLkRFeDYk4ve+aJHc57psuh1U)%3fDrU*6eK
zUv6kAV@ezX+0xKgwy)yvD|f4}>~2&}XRRl{HVk2Zc*?d!THks@*fsrqOBoG#?+2?_
z`HW8Mh8A8Mo!%+$Y=H@$mJQ9lBZ=(T?aAa2FJ|90{66J6+n%0meInTUSt|PDO@&`|
zp+5vl8~o6Ho&dF7{m>u2vUgixdx0H1=>%FZ74tj$3c}BV!K-Lr^@s2WKJYw$2pgG_T%(O3@ynR<
z{2|Q1J;V2hFw=&!%)@ED02NFkg>_+4}tVm+;|4C{tz~!ZK1Sb
z(}Sc2>r{UTi;$C@KZFSS$>a~=AK2nJ7z+3OAsmaGO#TpNA%Aj;KZL>9da6H!>riKB
z{UOw1AFMxwuOM#yAzY8GR0%Eo&yycwZT%t8EwlB9@MpwR{UIETJ+W*O{cv~lhd`GU
zmQ6Yrf8-Q4DYHL>3$c~nvPql;=1(K~J~jmYNc|y)~ucQrI^^k=-drhjzaOX{?=y?N$PH)^OMl^XJ;>HS6&SxNNT_Kp6WlQTN&Ycc&Q
z=-1x0X0)`venU%OT2=}nl#;Ohx)SmFmf1DU4IK^M>FqvksCU+#LdOTIm-!@=CkvxqxW~%eZ0|dzQAhWdu-?r0RqTCh!~5y
zenuq4qA_J>v^3?1h%>_QJT`|M&yF~v_t76hE%%c$z|bFp@;{&q4gUi){15OIj1TR`
z8~z9QmZlB=gS6p)fQJ788vX}p_#dF*e}IPn0UG`XX!swX;eUXJ{{b5Q2Wa>opy7Xj
zhW`PE{t(>rVfY`6hnYVFH1mgm@0UM>xA5)G>*TMB?G=W{}T2=2I~^EshE1oP-~()pa_;J&BpwM2j*)r5zz4)S4pu|I_B
zS-s$MLVpN&2!#F+LVpP0RziOWJ87XB1)1^=(|cNnZpKPP7P4r0_15
z-89i+;91%V{UKDkg8B>tF|U^{f`fnI&>uqktSa0PH=0}I+Q!cyO0Q{NmN!;&+o?crMk_?a+*Zw55cwfO*`+DQWI(8gE*E5!7snh
zm@ZeWQsle^<}Xt`O7R56&>w<3KA}GZcO3qVH&R|N?<#Inj8O)P{6fWHiY1CO6;~;K
zTJd7V|53a~@dm}ODc+%YkKzv$A5?r?@oB|hDZZi@`a{4U8lflM@7~H3-QL{(C1G=z9<8B#DjMUrFZ>(`u0?1w(iIR$bX;)TYk<{;x>Gu1!B3D~6}@(I)&D!)L@
zVbY4YwT*K(_S^bLp!Jwhl7ka%{UfYF&9Ra|594GmO2-?woD+;^fr)Yj_H#dZ1ou3h)8(^>&ycY=t^?&S=;0vY{d%Uc
zkW*@`vy>Sx3D!RXeI?A2vrx0rcw3llEaX`K2)AM@Rq`FI=gA{jTiZBv7HVzdyodNA
z`75@&Sgyu;i5!MKIao#^o|Nh6xtndAkD`LrX1)N`QnZ;f`$xC}Tj`ZHbBz9$7L8ni
z?qmGBCdb^0Lxshh&$1^;%)t=BM$QjW1g+)^F{nsYvdp!Z1H(AAOhpq%u`F7237ba~
zpTWLExb_Ci;t6_sLFz@5nYaQ63nw5n02TWn;^z;ZitdLLAWCiKFC(AfXe<)+k1!0)
zxsSZPc>WQXITINNVu_#SY>p14e}u!4TE-mXAAvotMCv#!5#FHabRklL$QDK_5TV(d
z2%kLq*16ZDUOs{(`O6y+YjIl6Ll
zG+K0Y?hTQfoT=C1jvhY%Wy6Nt6rFnGR6c7F)+8rh3yAaeKPszO$wtQ`%e^#kQEA{c
zVgvPM?3Qu8@dBb#vWRmY);aReL=kRr!siGU>75qUPDnz1zi{ihLEJ_izJp?iF3Fcz
zq`0_vcuaDOV!2adG9#8dJCtd1ILyJ+rIF=u2
zE5nPdh!uWVN$bj$DdxH}2wa1DleTrs#>Sdd#Z}s_cDfo{+MWKEz-EvDK@e+I(Hbh7
zeBs27rLrqmn8RO7ox@PKxv9CK|E=H*JmIYUSMYM{8!xrq)tstWnMtkLtLj-{QN?n9
zoKsYpQxbO1`$@0acF%#?go+^Pe0wGiFU$~?XttojU>$xh&!$uo0}VaIqJ?D
zz41;ot_i5K+p*mjRGaOw_N#*gyOI9VUgisEPd0D(MzS~gLr7wO-Qd4fG2Pu)uD+pZ
z?Y+?-0%ga172`SDfsGrrPnPyi^^&|pdkMa$WVi+4+ZfxST^qi+7QpcEOd=HB`N2^z
z0&lrM$|NZdp?wY`8wZZmw2_VDVw=n~D$UURd5ZMT$99J)^0=5@rFgPpt>SvcHpPvK
zpHMU}%4mPNrum)9{;pHJS@AZ-EsFOj-lzD0;-iXBC_bxb^qJA`E1G^?@h!!_D88r2
zlg9lB?b*2Fu&4S%;5>Mqr`r_oRQ#^u{fZAO_LV<`1is6;-D1UwiU$($@qQ=~f5sye
zkJj=JYWl;96u7WntD+ILA-ze{7ZB0k#fn!bUZ?mqBKG5U#oqcupbV7#mnt5ic!DCo
zrFXa88uKj@hsYk)Pt4v%!{8su%3<
z5=hU6U}Jo~@LJ+_`3xe5YTF>{(9Q11K!%N;mR7F;*D9YeHrRUWkP+POb$I5LAdlN+
zzTNJ*h}$-ZI`^T!5=J!GvX3Jj>~Aaj!=ae|Ks$K-U52=AgQ)W&`lG#n8*JId$O!iL
z1p4DRaR2x$w)@BDoo$1t^A7s^H6t2q+4V>V`+F|XAEi>ZKRz$nhR=V7pW-CY?z{~w
z<8rT}tv4O_l>KZaEn_`CUx_wQ&zaYd4csongII$5*ONa4dLPDR)Xp{x{oxPcBW~Ab
zZTCH$`*|DV_gaQ}0q$pcmfTO3OAoCnIQOul4|k=1ZpQ+R1G|0Zyny#HgxDMd)15J}
z{?&e$GdTeh9xnIeOdp!Y{1hS`KPt%lI9uB9jV=GzYq90;y|(r6t=la3^HOpfFZNB_
zwmpgg_Bf!q*n1uwfaXmovEC>
z6InAF`w44C^OmC*a6sGmM3Oik#D(8SRw@T%t}|JWe9Hlm4T*^BAE7%3hU8!mD$H@IO9M_Cx6?8HN1O
z!hg;faXFy<(Ze{Ihtlyv;rj$}{Uh*AV?TKq`IZCXvptmqT7b4wWIyCj6~0kg{|Iz9
zkjep(o1ZDa#ky2zL$6E(t;*#yh*!uE#AnIb*jA;KAwF9cV?9R>M?Z7rK5V5*ev0)x
zc@gXRQiE32@)qI?B!c)t8H~1zqyR^^SZ+nDCF1%=;D0+Q2ci@lkeQ5^^SPY(5onVe
z^p9{ks%60e-G(jpjsv29tR*8qfbK#3T+8Mz@e^xA)*)l=#*TpXd6MNG2Xq9h`AOo;v;_MJ=gHS94LC**+UU^EvL
zE{s(dt|-nKb@w6UGf%=|nHY{7Zg6}E`W(=S0S;&~%2GL?my`qItymo)*k~pWh}Vb>
zyl2=gn+NNO&NIl`TR5PyZ0MhLB~=gxhHN=Uke3brb2<9UhW|MU8_I_NX@&?a8~*1;Jo8Ghk2~Uj9z=hvX9LHKA)Wtu0R8cK
z&i=N?|NI~N%ZC4X8vSL%|GbO-s8Vc$-M{OR5#(212=uo-{^#eoAhO|qX5wCv4gYgA
z>Se?K{4Owl93OjKrSm^$r1fWymxx=t7j8toc4Siahu0m`AI}fR#QrxBb%rA|8~*1n
z*gr~wZLr(*q(I9KU$uMqpTS2C4)8yA=1-wF^T(N-pThsN-mEtF4V(}Uz=SX=+tqfvjbd>A>F|9KQOE&uZl4u80O550|$4y;GYIarU9
zIPz2H0F6cuO
zC$>^0Kf-#RJcadq`7l~l%Wn~1ApE;5lqlLRl1Zq)SiX$)68QjnupSNQuL1nebR2w+
z$Nx|T#m)h`5KXe+e~ho|%X6l3`v)ve7AA)zrzYnnBgx$4@MI!cl$??rmYkl<34aYv7FtQZoF*?aOam-W51^;sz>v;Un^(HfM
zHELki5B)g!{LkwqGx1q;1pen-c6t=z%KwbO!IS^t)yr@qmY(^adX{G7f9^$l{QUxR
zfY@X2_@8^Qr(B}n!2WTG{t78BQ7W);aU`4r)EE5Ekd!$0H{$K_eYUn~AjFLBcV0QH2!A|
zZs7Tz4Y(0Th#oUf+IaL5KJX-0=l|TsR8H)pxC$}@@@dc8D_(Gx2>P7NzYDjHN>IvmAjD
zxaZNq;V52)rMTXa%cI5Y)6D!~cae!G;2$Sah6s%UMo2f@hX{)Cir|68wH|cKkXnj1!$M0Y6v-?^3INWcXCi@6|SMNzI{*Tfb4~?^rrVG3%Q`)aY1$*_s9uA
z%Y34W_pKi0{_qgerwN5qf9joOE=}qgK-}#!fZP|*fx-dtCD{%BI~CId*#;cHEc$W|
z5Z-{&bx-i#fwy)pAqNz4K=`r^IUvWO2#VvdRq-LkpDI41_)EoC6={!!?cPm<^?*NT*EAU3$k6RRtF&^yC9h&~OBIOC(-ybOc
zNU^6mKm1nS{kGn4%L=(3jJzN4w>6=^xt=p1)hfZ3vYG4iFs>aN?EbAlMv#NJl2S4}
z&ete8~upa%0Iun-vusThqmZIl6b*xH!#=d#B8{p(5E#n*wCkS=+l~%%Qx^Z
z2g&k9+;fn+p0675#8O-!pj;O41u7oRM=CRkQN$S?lX76vYtrx)#q+@+M5lsEfGFRm
zCrC}?`qV^TCTb#{PEF)nYNEhW6NTy2goC?*-frv-&Al_635YnIEZyy%Ts-yhEKF-z
zp;HfTRr=ebiru^`B=>fF$1?M9l0+yVhp=%cEo5b2Z2HD~ioKpQS;h*^V=@B3&|Av<
zn*KG6)sH?=?3oTF;fR%O|&vWoKNraGj`ea~X`@1GH@(5E$2
zEciNtk1dFI4e}e6>9It7WKP#~xnh;#V#Q^OM=745$ZvG^vqq8M*i5%7n%5wtFVOVo
z6faf0Lh(zAHz?k!NZlj$cb6h(;4^){;zNp$D?X*j?_t*ajpD0{e^7i!@$ZV%bYlGo
zKI(}1iu5_jG-rDg$0<%yoTeE1w06fQ^l9B#w_#mPQ|sC`r>w!mYwPMd8aD=om9-tU
zt?L>)ZH4Bh)f2gc8sSj4Z0QNdl+|{1bu`s&=tBKogmI{gOVib30?tWm
zYvm-9w4Rl7q}O8~4AZbs7PX^#lp)zRh??z&KCK~>)N!#gw!`qPnn`x{3Dm;7(>iOt=Kk?((3Zq-Zp9NSvtNUm7)fK-rU1i9RZSZp
zcu4haJ={ntVi&tY2}80-?m?&yZv|h+IfGvFDNN<$(UCOl+We3;J>S;A{F%tzZPG7|Yy
zjZXA5Auljp&PP91ui5o&OnLj?6
    -lmLT2;#*5nmwh;Yb%s5oAe=)AMWaB{ug|oXsnb>&zfV3UAq%ALFo~
z?R*%k3s+ulXI5X?D3jUxV*pPr3NMt$&9Um*|t|giB_@VCdT#
zBhxE==2X81*0(iZ2SUFFxkF=xDQ>N;Ujr)%$U@p06am?0JxE@+qsDAo8iNV%mob|i
zt1+*y9k8ZsLU#u3zQucEmBu%CZ<2eOMVsYIjgMqc0keL6ZHMm=HFS0D8myU>Lcq+g
z@z1ea?w@2g-M_-y0cqqWv}+UEwMp|d5Hp|DK|;xr}t^
z*V-Ky&a>zE4CVg=QlL`BBNPqag?y+f8NO_Y<{MrO`Il;XI1$Q~eQVbSx3W;z86)cl
z2&qiyEib|I$3VdbC0jPwCog5~p!uAn7KDBc+=2KwAUH0eUjs-UF(!Pz+G~*`wJ-TK
z*ggDDpZGOM!miC$$ANF_biW3)VPg0n!ILqK|Dl@!-><A+x>Vl6x=j9!b-8TBx*}2qgcS6{NUCUqMG)
zLjGr1P&0j}{aUBlvr)g+l^EdAuYu)%cFwQC9_-2>eHwUYZHgE;Tki(l387F&fA{I=
zdz>JA0tChKP0%1yJ@a6dD#tJ&HVYi2>!6s`ZKfe|DpHd^LtsjMf?#hTfkO7Drm3a9
zxv8fT_LOJUl7rdH-`B0rG`%I|WLJBswe7R2
z*0wY|uCc9hTnVMEZLNEUO27G18z?qyl6;Ld0k7$S5b{5}#Q)%BCgguY{s$j0kn3N<
zPkLbJ*T5YIT21D7P~VpLbH!gMhJFn&E)Y2E8T=1!Wg-6)crrrjqp6Vp3H=)IQn(&V
zke>?uTD!J%I3^I6dZ7>fS})6v|Jft_8Y~6>b3gbW*TD5u(RF%_n3$s`Gzb0co7`GQj`TVVp7l=VT+5j~QKyXx=LH0{-W3tRnHRp?Lvq
z_^0weoPX;`C-N=-L(L64|0kF7eK|4@`Uf%|@jUq{dW*{!xPx*aath=-h!+Z{jtr8E
zur8A0(Pcs|zAZLisQru8^0X2t7Ct4MYJOAea)EOboSdWwgQ94QzxWSGVY|t4a
zji@x{RQ_ic+DP5_@v6j6ysqb5RPv
z2C4IZK7;0#|G5m+Quv?DehuzMliu<_X3mhu|F{kfEdR5F{pBR+CL7$&*-S+f$78UO
z`X7^NX8Ob)!v4E{4M6(PY>tvXh+!(>7*c5{_&tso1vj!h8tp)4tPyebYw$BvCI3S!
zh72zM)01C=Q&A&*{!h<-4cKRPehs!@AGt)~)863{{WVftqGw=}T>6Lk@eK!sehqlT
z4E-9MR~#FZfdO*;8Z1i{&F!{{K%N?GANwZ8ot#_L-;mBLb+KOWhm?3b6`v#0)ee`#0I-L=2w?R$`(qpR@Q
zl`d_k0{`09z<-hd&3TP2-Uv0f*ETwCf3|va^X?{u?CA=99JFurXH%WNp{e7vn%1_O
z+Rm2x_6r)7Cw{poc|1L+y{E|h(R0dl|A1_}qXj4!k%;9WNmLJlZ<
z4k(jfgIbIwOrwW>4ItwW=K$e@H{^hN?bqNniVZMs)W;?MS&@Q8rbE957zc`2$~w<%
z>8h;*c6GS8-p0Bb&wxFzhT1MLIdz>d{ngRfT*l0@bR9f=a)n$^;0XvhkEZ&Y>k0iD
zxC5O&*C+IA;9i62bA9$DzXsWGJ)vI%JOo0&2BBXAk}RQL1KNMiXcgKiD=Sa=(Qvfm
z1Z_p*kxzY8$c)O?8#|X)dX$BL-B#_vx>o4dptG^QtEsKEv!oRA{jS>5K)P;2Q*%R8
z>$+0cem82gwv~2v)z+U@+TPLDg@$b%Ze~*}&DJ8mv8l7EuBo}H>&(ULn;IG#TRpL3
zeaD&YU2R^H(yRG3bGNT=Y<3`Y{M&oSznR2-HM3f3T56kGofPSCFXiR-?-cqqsBy1g
zU-RBg`@&o|9h`%c@vQhBop(YO9{M$KU4Mj=Ae_*zLFm`uReZA3FG1+nz#WG>@aD+z
zxLfgF#UCj?qWCk#XB2;>__E?_if<~0ehosu2DlWwK>I85*a2(DhIVNN%WC8dkx!!LQ27;V4wDYVi{$|v
zb*dkONhlp`~
zzJ&Px@^!2akm+bUMPkUGDo>*AH2D_d){ntN9M^&J5A<-5v7SFu9zma_@*LJ>LKdxD
z)?!^Df5Uo~oP(N`G8{e3mi@7|c5Jp{D^>CY*7M{gtmn&O)UTGe5nmuL<470EP_$hn
zFJm99AA=-%uy$-_q7-&)=)}RdV?%R2R*yMLKL%H0i@nlgj{OT8Sv-=O=P+qQHT2kL
zvF}UAd<$z>x0#P2f;}5`X>bt+6{)%0N>1WPR*4ohFcnQ4$FgYA`6e@QKDvca4VOD0
z5oIs&qUTL!;)~3TM%SQb?8Atw9h=+G5A~RN{V^=VvNLvUy8AI;kKOIql%RiVEJrvc
z;CqZzA;P%^PV_5SbBW%E{o@jS3@I+rr*JyC^p7?(OvA(%OcFRqEnHEowqf$St2h_<
z{!t4v`9~d;?jN@M
zJs=8Z_DyAFPpPzWL(^G%k0^Ha%9X}yfA9o`hHFx6VZ$`G9i2>~S?|QtPIeYPXIHOW
zk?JQQsBr9Rsn)m5u4!)QXz;e%G{2?A>J=}ouis!3o-S&zj|@u7cK`YJ?5)0Xy4uW!
z(@*#I%az0W28-PE`zyB%T^eMe%WN-*ebS`Oc5T}5&17j}$fu$gME)!1V%ei)zqEnv
z2iK>;A}_;#yJFTr)Mq{#$Hg~zo}*zoI9~r7H%Q>JS{l@LxoVV-KfKTj9w>hiN
z%s1EqyiAu7hvQq42w4ODbW#RtY?DJja~RXWk&4FWFGK{BnMS1nH7SKzqp***>U!Zt7zoyXyR#QQ%aRwlS|
zUQGaSd73Z@Yu3Z*F(JJk%NV9%>5Z@D;CA^8vH?#b6J}zK$AObHDM*foI8F)Td>*h4
z7jExZEOs9dHIwXVXTkI)MxuZBDC4As*Y>
zVC(TY6Ws1~c;=NLkK1Lw-R>sDZ5u?LZ==5wMl{&6vyl$=w-x>2P)vVtyX^J18FAYN
zQRi9ohsUlLY}tP!C)nQ;=#S&d{o}LP?%!7tw`~x0-avmZF`~hi-GFqkzvlw|Q95P&
zyAyG?sldWO7T_aBWaXw=#)Z$(V7+O$M`ZFr{S&PRFkw0B@fxy$+huqNOK|^Q3XC7e
z$L`;Ah~qM92bj>6)*ttYfoT6LOkan3?Z~8U4!*;%Kb{|MGjLftLy)-!c{bSoh9V$Vcm)&uubIjmt~+aJiq{iNl`6tJwaQ=OORoOwK*Zrpf#K
z*Om(KJ~_w!^R<_@k^6ZYehlDy0teTf|DjZHP~a%R@uc!U{Huchxe)bG_BnLo^FLo@
z%Hw}dV$EobmfU^*=Uvkvej75g;(y2Q+h%Kt1uek%Vn2W_XwP~=k
z#U)Bb6E2QSM`z>l+{sZg26w;6KJUl61|wrx7)0H7EZjPCkKY_!xj7mwS{~qkCZj?s
z|MRxX|DfF*ltpnho)pcA!ZH?!Am$+L@H5)IMsVe6;0d>(8xgeJc?M;B3lUTnV1UT|
z1kKsF+)qg?Khji^6Au|6*Cs}NE!E?lBaU5Na_FpiC9^8aW|dWxl(ra^Q{dX>w%V@J
z+PbF2oo#EokWt%FzkV@=%vGJGEhVMv?C&_J*dJGkg{t;zH?$hH`=Gjgzo_4L6B(`d
zCF81+@5!I`E>_5jhs{v$@oo%OFVDbXot92g^nr%HcQ*GlXV$CLS$gkG*#ysWZ&{&W
z+xayi15^WN4>jh#_CT3t^3ZYHNV<=vS-5=l92!5TURRE6mj@^=7)&!;2KN^B{ghMNrE3D&WIFQ4&@7c
zjkJO3SvCP=n*4|jOdpMfZ}2=v{m%d3VQ%@KvDhB@p96`IZIls1{>OO*<3RcM>xyqF
z{zdUUMV>U)%T=TbEz`pksW-~>M8yLX=`xb}ut#gKN^z0mA&Sctk5xQT@npp{ifa{{
z6+0BqP&`NRQ;MHeyhL$d;eXP7TK_M;+ISv9{>L4Mt&k^hJa)wYtl;$zne!=%l-c9!
z&)nOXZ+K(irCN?#OF#Iu-hew<$p2tyy@0>73DdB~>Axf;aomUt
zvjllN;(v^9TJ4Kq`%CA4dh%(#Inajfe~bMKzE#-%()pjKv41>|JK}%-hW?&s#~N&Z
zHy|B6-ky9K+=+T@!|Q?JXIb(;rMOpQ!~gW;(>k61`5lgz??XIZjt{Rt9)CLja|X7{
zYtjaLyhK+J=a$@vdfD(l^l7lhb_TTlrSm_3!T!CTp&t03IdgX_{}c3SZTO$S%%2F)
z<3V}gfbvo}p!R#EBzed`U)y>(B**wnFg(!G6b`5aM{ec-Wy=9w$|vadIUox3!2$i4
zHN81N$^r2KoD~Q39aQW+2lRPtdXUiCeJTf3i=6)9fT&@T$^jjYn{Xx$Xbkdq!~y*j
zz0H(gV_hnL#JWuWiM8c`3ebb)fTklpTjpWi=N!;rToe8rpxwa%Wh8#U?{sH-Vpriz
zt{OQ9|49%(?MN6_a`l*BVw`*q=vp_m6C4mHK#>Fb8G2waUuxITS^Lmh7EBn1C~sMV
zunap1t8`xm@w1%G(V=8O@wW?bKtZ3DwL=%Ya7i({qP#Gp&RvcwDU`p?Tyq={+XF3|9Bp)!T%KO+x$;A+NASzXP~+;
z@EC(Vmj7A3$|X#^*uB#}t3ANS#`izo_^-#osHwt@t;^e<|kR+nDX*iV4Nx
zienWgDV8fPRIF3{g5sAHZ&duc;ub|pm$`vzZEPOIYCiklQKAVLOwv7!-lAbp*tzedD<-L812;@yhhSKO+&BmUAt
zf2wBpivQ_bpVq~&{5AtLLy58ch9d)ybN(ScF+k$HXE>m@IS=U26kpb3@lV;F4LIMI
z^GzW;1
z@l11oHeu75Y``6Z{7n20-&<1W02Se%mB|L2poeiX1*O&o+!5G^i9%atsr=7@$WP^e
zO3-$S{2Mhb|8ooKWSRrS_mi1I?UYjCyGWV*25V~rj^30k|1$_Z%$9LjTmFaE%c|u2
zSkIHku(mefUO?R1fcrP%sW#x|qX#<&Xf%!vzO3^xC_evlDk}6i2Pm^I>t5S{Q^Rkm
z6MuaErxbhbTYLL3Q{HSJwf6RL>}6~{N@_=T;$M!5KYv6bHX5t?F|?iM+koTzF{Cov
zfE!$eF(CiLH$DbF9p#!E&}K+?{%2?={-RNT
z{MT}clAz+^NPo=!>2ByP-#7GDkjcN$_;QOIZ(MDD>8PCVukKF%oK@wI^6JG>(W+PU9&gI!Ib)58%%PZ
zSIU7*O;ruRSw5?mrOsyBRoic?m$~-lf|ujoJKLuldE9WiYjiKg6kccpF0=u6=%EWr
zrZ2^W(UKDy+uJ&u;85wz89K)lFD8Sq3=|G%8IHvbcySMekORuzr#0V1GTmI#IUwka
z8V-n`AK@IJkOR7&pZ(wrZc)5l@qZP+t2od&pskb+;J6=Bqz*3Aw8TO*nx#Nm<7b+B
zxy1hFfKJ2LJ~<#GY6G6jG^7)sQM^>~YQ-Cg*e}YKh~H4WL-E^+-&Op9;*S)m`_BGL
z6)orUK5;#G9SXS~oC+`C?`J}Pb3Hxzv_2MFxBI{y*@Wd`Tst<{vLlfZuMIB;CHXY1|H=r0?t=ixwqltJ0!
zy%TZnAD{OOPvRtGW9zLP_mFJn`t;<}`XOv9cpcET9WMnQFUQC3U;131v$5ToD7V3m
zEfKd~FWiE9+06ABjg7AHTKVTHeXb8}(Y>Cb9_ISYpVbSlC-iBJ3pVs=9s0B;3-b;9
z%SpE2o`cl&eAS32mf`||`<(@Rk%~w2k;+VF6oD;SFewM#U?vS;Q9K`p&Z1MD6}WfA
ze41hiOg-lM6h&SpiXxs)QRG{SqQFuVg+YRWzGxiW4fJ-y8#+8EQ?{YJIy2?%{!xBJF_j3C^1f86In^o-tw5OQsm;H
zPwUX9wQFT@kMe8czb5b{fnU3Rh&XwE07b`APJWA2%`J(-YG`&V~onot^c@09n3pD*X
z#Y+{hQ2dhO4T`raepB%-#qTNJugGsm9>?Q~Pbt#&1@nKS_^RR`6yH(&yW+nUBlw79
zJEP(RG*jJyBQ$@U;v~gsilvIP6{{5wRy<7cD8-eEA5c71v0kxBu}yJ<;>Q&~srYHd
zixf92UZr@g;!TQQSG+?p^l9y$?>G3Vf%E*fBLA6`bvk98XSQ_J)&aXZTwHHsU5#gS
zIc2oB>Xg-Wc4jY)tnH|6UDt>P4aNa>b5m=hjiYa;tiG+Kr4f#G%a)#SOj&JLS4UIb
zhA!0aMHq*=IK|!_W=>jLD<_$x^{kjKy&n5un1+S-k{#8f49T`Z)M0<2PwN5Y)4IC4
z7qTw+w04f!ba6Y9Il6w%YX=o~6%ao_n
ztTt`#<^3a?cL;icU+Z^FgYEk@s6$oj*V^@Kuo0~?=`_>#P9~k^UAJj72K$gnr+EYp
zf1J!hsnuyd1^bYlUxS%wo9fqqbBZ$QH1CREgL|-*DtQ>|dGZ|A^TqXR@H*lP#Pw@H
z`BAD)Gd%`ao#q2j3cuE=Hf>Hvg&uX9i;loa{xBA(t-|VylXo=YgKx$bd*|1HzH2R_pNEZkjMtav*MR12d`)NdYw+LLcZkyd!7|UU^{Xb+>NFd_1}CCJ
z^=nOaVd^wfubg2ymcH?8z#hrtd=N_pn>J<0Ha2Z&+=klAPL!-97hkjaIi$FRehs$o
z*SZG7w_RQ4?fW%Qzt(tX;AI{9H3?aYY(lj9k9C1o+Xq$
z)~-!x&!!HRNj&Lajq5hrOV_Wj?MN|W(#Kw|y$uCDQ)lhnI`n7I+S#EZaS+_-n<`t_{Wo0+JQDUl31GG`s+A
z!_-q`KJ_w*hR*^HXBx_t)GK9vulWO#3T549XW;uP)OE&adckrGz2zk=<4O?+-xF-G
zPhRSkf(CMuT9B<>8|ni0rCpoQuYt=qeHG(s&oxg;=+}Uw;EoAy)n3?rehsSOzS0k_
zFKaj5KYp$I#IHe;{;eN{4B7K-y*&;n)wgx_91sQi-F#bT!vTF1Pl{dRfaukFkaS_4
z>et{y$jM~ahIaUd%LBN6Mo1&pBgN%_a*#jT{Nct(18$aM#pQsiv4`X3S=5{$JI4XN
zini0l<$$R5F+(Qi!Oxid13e!kyN3h%E4I5>cu!d(K@Mmp_ThcufMC}qmH7D?_RY6z
zL*hr-p4g>`dwvbpv%oWPL*ge!9_s^RUg!H;G?6U_^kFno4(NPrnH&(`02z+PvNIeI
z-!KnH+htf>-`4DLB~r&>$-n`T`Y{|3b&f&~s1Vxhh11?IzXq;v>$p+>a$Q>6=y;qR
z_tL<%r-9dq4S4DG*eCq4c>((H-3QP9ur7L`n~8_g#%G?T%}aJSb1@Y^?X>
zcC`&n8y&b??d;CObk=&cnm*Rjaz>Z0SnW!rTia?jwl%{Ub#r4)y>HGN+svRCJ-5s2
zjgrH;U4Db^oX|kEZ4>f8aQADZ?EbaX-%9%SKfVdT`ogBmHXiwk(tJuL8mIC&-LJ+n`PUeEvO#{E2sO?2aaK7Vuh6j9%&K^xk~{P{nF&*8y=`=P}`25Lt1l}`iqnVnAq+9l-T&-{4`DK60hoE>oN%3IskwwE_I)uECn5bq+f=S?S3x5Vyj
zmbJ}owLTl?a(k}a+)QyGRjBh`g4{`!lTJChZGz0A;c_axeK5&csmYM|XznHu1;MwDy#Q{tZAS?h@;>dYR8BflG3E$#C|McO_;Z@dx7UpY8iJ;Csp5H2-HA
z_SX$~l@El0%>VEl^(p_8(WgOo{)civ@;{U@ggy;Ip9TYE{!efDpRJT2fbYrHrvW80
ztWR4`#P<~Y+OPG#?$aRTc>)hWL@D!O*cF~9D5tPb*q!BhIL{{=p9Yt6f*3Y75{RlFrvYh
z@%V!M-G=^nDD023i*0|K5w~p+bzVS!#f)gMW&e$Iu)pu4KaKT9u
z=#MfeyMK2g&VAtXp5bwvglv2o9E5vYHa-oGMm=6bHgLNP4`B%&?_+`Sbbq~Umf~1zy%xnGzfhffMp4N8W_<=wOfx*~lGS)WMc5UbgOaW`_YVm5i
zw1>G3opzR&Ti;PX+b54`o6Gm?;mt>@?Q99>KX^md(AL%7(bnKNM{IZg!%`X{Hm>Cz
znS^MpYE|hmPVS(*WAbHKbhwO=QIXLyM#joS`)T66<=bxyW<;HLws{4JL{h%$m=1n@
zFpaO4K!}(x8b71E%-YNa^(u6?Sw&Y$eu$W_%wQV&S)oq@W1BwoX@GBGd|Zb<4cu{f
zoHAI9$J2_xQhY@*^l9MUN9Opq6BD!dzuw9eZ8z*M^l31Vd>T~G>y7`;s*1|_+3GYu
z<_bkUo#xRF+!0Pbbc>T4edc86ge@y4es<{zTb>)bY4p}D?MHkZ4_B+DoJW^46E1|@
z@{foFwUp!07&T6yX8Z!`Lp`~jfB1N`hAGLt$v~Wa!9BsLxL9*?^2XvV0H$efWX)(^
zF@#lcPjIhWb2BpYuSHg#tYGa?xnq!HUMn1-X%vw&u^TyZC9)&(Q{+VD9;{=Mz|%cf
zer4Kz0lmfLIK=bi4Xg{K1M5OL6`LL;$6#FqixRM!FP&HqmQv&lk)`N)s9cPi!=w`N
zVtE{gJ6yJ)&InnD^+@?WYL1e(5x45e2cYIyc>`MoTFk?{cZdxzMLUn0IpevA5x<$thVBD2whRZspaN|(YT1*#hL5b
ziEYB_QWF=)oVY?(S&d~-DT;p=Na93O9emNqL$HoKjU8G%k{3thgNP=_a7>`T{84r)iGN_Ua&n69
zMLG1Bk8x8)EXzr7;R5s&
z){IA|AeG=NuY5KlGanxR#j{u16+h=;n_SJ;V8Yr1x{H0-5F`3Ob#9cU#Q)T$Ka0^;|`kw
zZ-1RNI9lIT00|lVb@AsE$;rX33CSq_r>mlgM6A=9H}%?RVq~0=4rlVU_yULzV*@{j
z4RH3@YFJLiwb5Z?~51VD_0m(-2>G!j2%`=J?7WU-M$@dV`Dp132tbtZ?E#MYolyD
z&r2G4T}rCzw3MW83ufg?b7>hlqq_R^l^`=Y0I(;k4@8-(^}6;pxE=jpyV+e8Y1Xy|
zj4y?9&8*G*+wt#Xxn@hJF9!{UoHZ)_ZS1U>HE&L3MfLn{vlvp%*<>l?#M=PBd$u8n
zlXG@rP*KWv5ML(tBsnPcS^U6vB0og%x)luFeZ88OFt18?U$4P0K)xmMW!Dc8qoor}
z^A*hx5qt;)Lj;zphadx=73MuUlP+$C7ZRhpLw~Wx?lo52N)C|vJVc(894HD+CSsQ>
zG=H8VKZ{uJFvX)4`4Z0jlND*iVGE&
zDjuPDjN&TA4=L6tHY%Q`c)H@p6hEPOzT$<7|E>5xieFUxisDxlzoB@i;&&8(p!j3O
zpC~@5_zT5fEB;pT4aGkx(t{tzP5({t-->4bEy@e|bqgG(I7V@zBIhW
zy9__X65PM%0^^6Mw|`F|j#J+bFkut=<27jmx5+@X*CNxmal6RmI|AQAxLuwfZWH}^
z;V}%x{$9!-Teb<-dmTIV+YI%fvpT=p70jEpYmeT|aO3W}YR(*!**|jpP3dxc$bnor
z{_}|N`mw>6j^orBhdCEj{j@K
zQ|0(HoMh$rd_kKa<;a;R9oWxQIX)kosd9Weww)rcqUKcDinh~)?vtlW2jZ!6{HsxC
zrre5ksoaBgnQ-z;xg3jih0pf@!1kVKXZga=S*_^DX3%R_>bU7tsMUe)L$&;
zVZB63&_kLW{~Z+ga{Rd%IxEL-K}i;J{021XogAOHYL(+};|`7d05T$nA?nHTKfq2s
zIsVtoK3X~c|3gK{@hfq>klfE;O;3)0n#oL%6M*DCRgV8&&O|`gbU)|PC`wF*idQQM>`{gYQixxl&RC!(DGE$LD(~LL}u2
zkZDQ){IEOZ__&7{c}6J5cbwNS^pwZGsTj)f-SG(J`0hCDsdD@e@_L25arevdarX%2
z`2GzWF-U(*n1=O0mE*71VjXyd<%NM{#0Xh~wUy$(fq1GE|5yF+mn0XQEKqJ5`ELvO86Z|0Z&#$UCSxRVX-|Cg&k%x}1Y}sucfb)R`%FVO=T@
zU|lApvXtfN+V~%1PtimJYo|-`Z#J1$ihm+&suZ706s7poj9{RqfTxX5O?!UW@Q>1y
zHa;63jB;{GzBYa+#pf$TCT;u^sEyy@YU2-&GtwE*#?Kw3IXy`6N6V^=8u>hJHgwa-
zAMHGXvb|r5FOz$#j32aaV5M21I6oBUhvNL8N7g*N9LT-+htV
z6&XIqF&kZc+_OR%KE{f&`%s4Oj>F!ri+>ZpE^$6@Q@m60yNdTKKCJk-;@+x@|3O~A
z?~4o{caKnp@7}C+4cU(gyCTC6eoEugG=U;E+cz_g#*&RL{vRPd$wn9dCy>uj!P5r2
zt#!z-ahBZ$X-zgV{L7(RU4r^M(#4;Ur40Xn(I0iacchEII7=D+1L%(ek{#*dACLYX
zM?D+tSftDF9}DzHffa_y^nW{$Z7Q%ZOvqA(zYzDYY-IQ!M!gc#v%BJU8GeW*A4?Jo
z!_$HBL)6>9bY1+j(cetd!d=Oi~l?9)NeD?
zgABj2SAIhKMTUR>s5B{lkGlA_Cy?SM*kjZ{=*EnejSL@mu3pRVXP|G&NGX>fE>S#8k@6+xb0RG9WW`!V%7B>Prnpg&wicLwk>X~>
z(4LMvE}=agcN}(PPp7vs{GZ|Tk=Grk-xGhW_&Y^o!yNgc9)7yk0`4B63?FwXKUf*%
zuE_9%AJVu4O-PsFAB)_+l;QWro=#uN@Uzv!&sK(?tsZ{1GJNXcKd$G1V9)Q)%JBEg
zQii`6_nT0LZ}jlzggzjJ>d_H76oS&IT!Tw8Ca>Z`%9SmM=gFs$AD7vP=gU^CLm!Z#
z4@e5&zd<>DJn=rn@=$sB2C>=9`nJDfwLA
zlzd($Q}Xe2Q}X%Nlzf3TC103sN*;zmv3I=R8nV$u%!*SRB2FjPIr7g$5saG)@5orB
z+*r3R$7gbBYg=n$X(Rj-hCU!$HqQ06@+d->8?fQr+Su0W$rtL@&Z=@kGwE;`8k$M3
zgG#Kik>MNS$i_^1Cizw91G1}z|GUr!WatCZyVnjJS?-=Bt2J*3x(a60ho32O(l67$QhZtQHN`g-|E&0~;x@$?U**xhP;r=I
ziQ-JfRf?Zhyjbyn6t7V<_Q=uS*ED^HA`O;uJ3ml-P|@f>BmZelhdv;2;Ui4Kf>Xpf
z;3n*pppNQJCI=3|
z!ed2$UN|1(%wx5|_Lr`&dL72)B3lV)>p@?&YWMnpjBIhD^Z_}{_<$U?<+w-9n-E71&ACk9a@5seww2cGTdZ@M*k
zU&_kr#OG15XMNSrptnp`C%W5?rh@ul*$=zav%c!hs53%N!Fr_p0yRg;?+{P5I`J!P
zah&`KrQ_uulunQ;Z|tNcJzbTh&q1clXJ<)txg=rnrd}|jtQu*%FB>}e2u5C%JbvhD2xwC+M$?$
zDv*__4@fpl)mLR5(&fitL1&rdaiI^$gRKw9gS+{F)Et~Z*CR&g19InmK<+?cb-C;H
zZcq37I8Y^-%U#7mdy*(g2>m{G*4B6;%Q>Eug;o>ln!V&s2sBei*&2{GN}KzP*T>)(
z?7c$FRLzz3bZl$RV2Zho&~mi-8}Xjv|BH;*O5dV)U1PwpVkUvV_kSBWLQcF@@Vloc
zyAyo>+mqy=!EexX0(I~A0crlbMy?Rrjt=ck3=|)b={l=M=88XZ=mQep-T0oSypeV)
zoU+a{Te@oNfL$FfuD3C|e00hhYP)KkvbxSrr!0dHNOSiHbyhKuez5Y#X~?3y7J?5G
zdXiUDX392J6w7*jsk0jTfHcGJd=?Otr-wcu-RqM)B(70Uj=u@_NnVpS*z1`HxtbSt
zn-9pUig~-&2V^EWe$PH2dzRx<)Vecrd`d)Ny&@>b|2(qtWCc&bsN69)4Kj%*LdH;d
zDre%}kz)j?5&0f+qH+_~F-d?Y%9V#rTUU<12=RP*7V843!MaekFUK!K&qL+os5wli
zY+Wp_56GLb@t)=QLs4_AkcjG8j^BblOXPQ0PZC#-e2mykVVoe<&q9uWq^TKIIsP!D
z5^K?Mk3Jx~%ke3-PnF|SYM&~{XPr=v&zFcy)}vR^dUU4~%JC%@DMpAD=MIfUCgtuQ
z%gvQoUhbS&39z6f7Rim|A2}QqV!5FlAG)YbE$z)s^|f71&{sa<*wrP6&YD*;tFmlX
zSw%@{ixE%(*EYA+c9lZwdvRym+Ad_&cGRz5Oexf!Xm}!&h8Ab%+(6pR@DH)~%JD;?J$$*k
z_Dx(n;K9@C|7CVjXrIoO1U!DyQuf-GW~X=4ZOYd+ozd7(3X-m@-tn$}a~zotrr*p*
zhjM(rnjyUZJ|Neh9{PZEoR@JfXmj8-#WxlItoW|tHpLi(8mwQaI84;fP%DGRNrSuX4s2ACTj=JW<@U4@l1b$*hh4vMa?uAF@cOEVnb|`GEYqk)p;<
z#U%=De5$@f8~<+B^tACGH4Wl)a+sAi{?}2lXKnniqPI-i_(AK@WC;?|iS=Nq#4csh
z#(y4%J6yJ)&InnDwelbyH}y@p~w#+W2%1I;;;!s#Rob;}2!=?}N-x7XKAE
zf{obF`AbF{za2+gu=Qxe;?oD@+95t5O-b|I=6u$poexM6%h~kxceM9+3?-zFVbanQ0AicA5ptG&Bt8;MI>TR9v?HxT{E=dN5
zHuel<`gipW_Ii%vKax29L*^UOUs@Beq@6v3!G)E_5v0B59Iubt=gt??$cXa+>3l$%
zCq|9pUoexO=lH;7%
zYmp^~&Ijb;#fR1hWIhgmcps3o=@n)1p+$cusZQTuPH1805yO8bFW|qVRHB_ZDe}EV
zrY<%OiYpA6nj{@>$$Uxif10xRWHhsN@fYEyZgugmgW&Ki{)e%Py|MVK(SO=-^W)@L
zj3pn7|2-V;B>6W;T3!6#LNcFCo!?-Omc{pN>TE#CEVE`Ho5f#*@@y9Wd6dkP7jQ(@
zrp^^8$!AmNE09?vcOkBpA0V!g#}L=bHpF%EG-Au*r_sX_nTgoi)VTyBZZR)H*4>>G;woRQD2v`<>5DkZ6@%PUMHIu8+JrwYx
zEWU3@M_K%ALpoz{j8MQo6$c5G`{m39)cre5VVd8X;_Fc}j1NeX|FE!g9pl)L$
zW%0R4V^|-Mg|PU}2V|_`)|XY_jJ9JN8H-OJkl8FgeL$KL=L0fVAAe3#4zv$Q$K1cT
z%st%LSQgbW_tx~c)6TDqGVcXz=Z}oNw~ip~_2*c8$KtnU!Vf;Y9-4x?6LZc7z3_`+thN{y+h-bZ><7qYPt(18@qDI2u%;D1}Lm?c#^8x8N
z{Fge1?|eX7D>?%sw5Q{IKpqSZ|3KQ)`8_lsZ@|Ab>cfM13G~-DAszi+>3l%u=kT2m
zNL(m-t$?x%!Xf1FmpC7g&IhE>AxVwgj<{Bu5!cB*h!@LT+|}ykH%KoLI>fLHeK%eW
z8s&|Mm&xUbo1_A@%jKg;uaK|e-nUY|j`S+I7Z>$vc`M>IG7+~*%g{f9+I3#)aa0&R
z`zExHuYtgov3~vz;@ya@GHLM=6Hr@1k<+k^nTM(gUSc)UrLRFhvG>R3vtsV*=F;Zz
z&GVa=HpiQbnkO};luV?5V`%lV^Gsp-wG?qaAe|3La0bo?B($-k6q_@dey~iY=Q9cId_X!Mkb^BR
zHnH2ESrUHJ;9x?7Lq56R)7#QI(4Fbqkz=7G&n11pEUnm^(&21YWi;77$1_(DoDWFn
z1Je0`#9IK287$&U0nqt??DuLiz1`g%SXEWC?(EZQS_cRFJKJ^)VjboP!gR=zJHzXk
z3Ar2~rrU%n#FWF!mmq%@zN3cfNZEVVe^BH|mwYD*OWuc~Y^%{V9EBW>a;vHO9tg(enb+
z>Zy?5BF?rq@dJ#1y3iuS4EY*rXUbBP%#sT+&ZA`jeOAh|h^u4@%Cj|9pF+tz`5h$Z
z%XiUsfn0==h4MzEt-Xnlq3v<9tSpEJi{F8r_}(8uiM6u1Z*Kxd
zCT=mKu|_6JSQkqhhVC(>&z?LV_3?M1{W(*AjQxQqYobh`w0gcNv_#o%)&<@lY4!s-
zs_#Qn^>j+65>t>%lX{DKf1HH91l}KMOCsCe#5YlLG(@PGnYhTiJU-zvl$?m%2`uUK
zu85aY=GDm2ga$f$$=I8q9hV$U)wG<6AGE|UBi57SSUEE>c5JfGI|Ke7$EH(E40yAz
zON^fg;kcLLT`3k6dpM6l(^wsvOp=Y>49Z~hzkZp7u}S8qa3es%4yBldlf3^z9QWRe
zI3~}f%W(fO_g4H`WMsxKy_%ZZtiM{=9PqrTNlbJK-JWW^4c2VqIK#Sa<`xdKe@Qd^
z_@%{aJo+eDk4`6x=H}XsuA$v%DJoBvl+8|#nVpoXm|*PoMRSifC+I}4rvpZoDeW7e
zuxI$AQm@e2;5yU)w>=Di0h
z^TL5lYggF5ZOh_D??`n6X-|vM4{KSvXLGE^+(k7mx>{ajJ-t00)g7>tU2Ckw*6wVq
z?yl|W-O^X=~Ez09`O{-7By
zDZfor&(hd_t_x&Lc5!w#ynYTpyU`ofdur#_9vJd9)8QMy^-Vj67ICx8KWsY7_xhPt
zXlHg$nyJ|~N(SimFzY;yOj*_Lkr&;lGaIfk>oZh6F4rC#^hR#LfZn6ba<{69Lo(MOuii5u{gPn#2b
z(I@_g;vI^2D)Qx@^*>eQvQ_4}43hXq#lI;&ubAL_E$V6Fl1OD2A{|;0XDJ>_#Ov-_
zB6#ED70*(nNllh#6t^nwP~4@+_bT>Nsd$p&YZSq?crm;OkTw|o;Y_R*M}^<684(0F}xqfi7SEBljS_{KPU0^*rNT-(CZn+CfK?Qkc;;B74*mJn*EKz
zX8XGWY1;-#k1paM?oyfz
z{gJe?{e2N>w&Ax1hMD-0&cbih2G()AUD3*|#E+L$mkn0#J1Aha!h$&bk3n#F4*!2J
zz5~JGKZL{0$Klg#ayEzmD8_F&{0C4wQ%*+7EaA6?Y!3f8lxK7Je?iGS`9Da`m;XlF
z1#&q`@^SbyB(+HRFT7g5kGMwuAL3fsinvbrFWYkXW$0mv%s@Omhrb5$mc#!gjx-;K
zzZ^Z}aQI^&8glrrgTO)O@YDE(2ksvC#NqRs6FB@+aAffahfgwo7!LpK5Cx;(3kfK@
z?q>Ud!~cRQv>bjbC6&YHXBx-h*OuaASc4Z&uP9xaTwc1NdW1?jZM#)*msQpT*rDfo>ojhu`8jeE)k^YsWy#;$;nv!^iVg@P^DZ-+l3d
z9|>_U@^WtK$r6MiZrF!tKKc&G{`mGEhPYuZqItf3hanDio@j_eS%N$VUM!4GMIju%
z^Zn>-PF&A7QE)eo!}sUGarj=%V8?~f%cj2;ucmEaz%QuD^YY+0{OBz>;5-+gly`qn
zA0{*?THrmJfqW^`{Qkl~Imh99p5yQxhtJ
z_^lcS|NoGPKD~tu{!a|snS85Ha~eWaim3k$2LC;*izPG61zPy#({iAN|4oWWil%l8
zV(`iT56|HLFZQ%I2A|r_d(*<_qJv4sI>S+NG2|!9Wr!=J1m)Qb{;x59%iwbjz)U#@
zC9{NU4YC>hWhl>P@c)UDc`^p^e52pLK(0l4p?n1WWNYDn1HCPh`w>^mqljzd_lRp{
z0CAl>huAXsQ_;f`S%|nnPC!5TwD4aJdCTDc4~{6C!T&s3t&#QUA&0@A4AGFm{}%{Y
z2LFR-axk>;hp68F5IX`O2GAQ1+mO&ucwf3!e>7MkAgZUkjfy8RS~9p|h8a7CyhD
z?mvT%M+x4S5;#MFf_|b1Ujpz+CR-hU;xOv?(U;62>i84AyV1|#u8uEr_DdIk1kNCR
zrqJkNw`}d%(XxfExxhCL&|{Njnc*QZOgmM5czHY^jv?*zsx4`ob)5cT$>}?{kHI~{
zzk(Yg3qA5I&}nLE^c;`xc>Ixbyh$#fu-m
zL;S1aM-@M%c%$OYinl5r?z;FJ@EfOYe!C*M;6tm6@BBXw$ItH%j~{)J#-(Zk&oyYH
zAe@L)A-ecaFpRy7U@z>&hR){YCX2?~Vp8bgXWw;Yt^nCmzGJi-0zZm^3Vh0-R@e=K|$g0nC
zzbKrHG_?u1U!EWC6PHpD?!#ov33B1}!ZuO4Co!nU^T^dU*4K^D|KkDW@rQVR999<}
zmT;&=9}@b7tK?I^I+jRARq`bj(ZxR#6JtF;)^L)t?CBg>UHmGHC7(SVUl;!l?EEO<
z4PdfdjJQG$jV}I`*jF}_e<*eFKaRbxkrC>%p-aT4<%8Q03fnPlmC
zJ2ceth2CZH@}W#Vmpt;{*$LP}CjWKF(WVYMd&w~QT;#StO#Y;ZJ)N=2;tz2EIrgP)
zQzu!Kl-c{m<6A~}uQqjZ^UY_n|Itjj3$wyb!K+F7egO^
zWVUn;3&)R+$9Fvbi^JpdDbVrwe0<$M9-s4A2#=2^3&S^z#HP+M=$pLhGQ~BD>lIH`
z+^ERMamw?FpSVr2S8=Bz?JcnWa>c6^uT{KG@zaVoD&C}ct0G@E+0R{y_bPIMH_IPZ
zq`DaMk10N(_y@&5EB-_A1w|NTH0??iCn#1Z&QzSEc#LAL;!?$xit7|lQanv@qvER+
zTNFDKw=15nc!A;@72l?KiQ;<|KcM(w#g{sd{{Y`_aUJ|fkqUmy|4Q*G#lI47xP2RWd2rVj7hHrO#`
zP*8%cSt|vN^_#4sR{dxLxJU-4FPSzpd@#~!r
zNaq96`G9mjAaNVsg)Qz4AU^cA*#mXRJ(^NK0M^ruDS-X5pKgg}vVwcCuo9Sjr`dI9
zHl2pj2l_LN&JJ+~9pV|H<=L6FDfOI|}&G(t6tY6Ra
zAm@BQQV-}E(rZD82XBIYQ9MhFhz|kKnTdqB(Ig5BoDWFn1Je0`#A7l@nMLF+fzAh{
z^8pFvEOV!%j_E3FmT%*o^BCMx-^YXoTX#D0HqEN9LT-x65NzGck=qF~x8vFmcK$>!uyQan^^{dGp`|t)kqUICcBF2XC&sqaOzu
z_=S891D^R-oP{4?*i_H6Ayi=94SCpbv+(DMX&7bGXjaY&cTmvOk0gr6Xf
zl5-GGmY+kiLLNohTBM-C^l9=v>~XsM1+_DTpC)G-YY?+!JH~mm>_VTF@-*Tqp)-cr
zaxPlUk#@v$Z+BLOr%q+OO&;n
z!t@ysiT7iYHcxIq+xQ)*ZJYXMR;J2sV2ePH^#klJm8OY(_=Q|&L=qLqrSFAY)TZ=8
z^c3i^Qb*O^Hj1dn%5RIaAVI%`<1g}HGTiuuETTV1*6|+Z-;)YbUoE2*=c*XYI9E;D
zP~L>!b8^170l)Pk*mq8?s1nwcZzxx*&BYUBUb?(Ao}QlGR53xuSKzlX*DEbuQyRyO
zxg;U+^qSIAScHbP=hEe+f{wG5W)YKt1j&znPz
zI_vzRGp|mZbv36tg~*#?^UUC^@t@j^F(2c97ZVaQ<`h3*c%WA{(5}p{E^Q7S`Gs%(Uy)^N2O77E(g;IWR}(Fk!h*g5gVGfqdU0ry82o>
ztS3p|qaGYAwsdy)b#->Mx6tWo=zP(?N<$x>em->K>E}ap-+sOTD-+q;@$GbOX~zr4
zvrLW>N029kt|@t?8n>&#P|5n?BaiR6aZ5+*;Ew*#hiy;qU^wY&P=OlW+b;^*XSxSM
z`AmOiNjS4dpbN+oeE+F|<@C^DYR*54gJgYzZ#q#wkkR*FK25Akk9~Xm9kDC$?CkVc
zF$WC$V~2usx_A9m^V=V>{wklbso&@HSN(Z#`m6pt{1`u8UKfulKCbwb;vW_Ns`#9u
z;Pry-iWSQg%N3_7E>vt#e2wDeiXT$EUhxLSFDY^fB=>WN;{H~M74=e&R$Q#e_q9W5Z^GOqoSrIXJq);XP1qkj)#zI^E;SQ2
zAhvz8;I-Ix;(D;b)~!bY`O{{t_$OGBYamBE4Y*_ij(QW)whcvp02vyYwZYbHMS)GT
z?moQilef0P)@4u--7kGV@_#w^o5DtpfXKB7whfZrGz_Ye2@SR`S5Nix=#Shm`x}GJ
z_ICx+whfZr3iJmKB?z|eQj|o;_cip#@vuKWgV_E)fwXOdq<0$n`wTMgCA)j_9oWh{=(n44eW#4cNA?o?M?W+mS4jCGTezRdc5>aY3C2g
zV0;fDjZ@zTFyXSC{_OD*?X^h3+aOno!oBIK{sfaT$Moz+w!d8N{^uCf<9X!3-7j74
zlkq058$$qykvU7kj5KJI=8`mB`SBhJU&{|;@lx%)Su
zB%8bcINBD*-Pb@eA9sHN#?~nBLcB~qh}d%XpF!Gk_xB(@Ja_*%YKL(5r(vigP6N5WySk^hr=z-~wXM_W
z96JqUOXeD8e`FfSwyAQ@-7Vd%ojn0%Y6#eRueAqPpdk?3dv~;Tb$9`**s?B@+0h;5
zGuvAGgVtO6b}kJv`$pvlJEDPhJ64~u%ychl>1yw94~jdRy1Oma?hoq-bo^-N!14C{
zK(ODueeRc$h_l_cj;8Rs&f(0>uO+zfm^+}#$&S0{yQ_Vp^j{te(Pzf1Yb4;2HWEg&
zFG%u2g>d)I7o@X2aXo$(!wz;XBc
z&D}2>na{_A&)tvra`f(};UA^ZyMG1=ehIQ6)Vt?83UK#3z(hgszKuC4qQ*D4`!_Kc
zOP0kzOH>;Ye2sKU}VopF@7NT!DCvG@*wa
zy?eUB4E65MgMj7kX&|8hz57n=WklRP>_@+rZ34pnKd>WE^r~#1U|lTzavV;aZUcPx
zk6`PUup-dAe;ewNe6xl?T6&yheo7;pUXqR
z-wSnveMR9+D=jyBC!M~j^7zHeDi_z+EUu}mtnN1KEO1L#Z|h(+=_)MtNB~0Aoae!|+PVb(Ygkgwhz5nr%3Ce4ca47Wdo&QJ2-5>7U
z{l5BtbliQR+`aSjNV@{j0OH03$K4+}+&y*EZLsHeU-j-Qp^;jM-u)VUGj)3RAYL2m
zmygWP#>el5EX;-)hdkL1vNMg1B1vZ@fkxLR>4aMqDSqL~Pl6
zJXM3eABWgl%^AwxFNVBj?;pmITK4`y+zqVNoJHs%hrNFu)ggO-76dGN-;J6>!rp(*
z48gMZ|HKf$-mk&ofU-X>i?YAK6sGw#DN5NdgHY>ae!9uFnv>1m^HV@*HRl|5rR@E0
z(UR=_qbOrI7TfUbJy$m7Sj}NW!``!wtCkkA8&3*x`sl3YV5abohRdt6t>!G;lhqua
zBO8WT%{kWNReyxA_p6dJXQcGKfHX
zKs8vfM?rWUQU}sz4vktAVl(G{a5|?4qX@^8L0QyBOQAM%X28TkWuE@_)n?8r^mia_
z=Fph)5A%#~U%7i{GsmCI!foa(S?qi}I^T}Yx1;mzh&zY#?P#br-yB3wZ_Cc!E@(=3
zb+lwcdnw(0S!$XiQp$F8uA_7JozBg(B*6K01T#);>1CtMLb@gDMi;efM|FVhpdaa`
z&w~#ahuY@(I<6gUrC};hs*p@JZmd4dD;isTT8T_dOp>FdB0fc?$~2jUH^=M{eV=u{
z9X;<9Ob=}&pRM>R#m$PeU(5O)#R0{4D85JWD#Z^fepK<3il0^dlHx6jUse33;@yhh
zQ=|?X_y36EFBE^R_&ddC6rWWzx-4iH#|dY9voaMpPV+}8PFJi_T%cI3xI}Te;#$S^
zil-=^rRaP+`t$94JGOVU?bzBfFz9?c@+QoUHX&AF!%rm$&bOmK6`T{xyRzia`F32g
zWF)>F8SCi6obLLVNVvMnf-o20wqK62_vx6#Xj;C1vdS2lk%hxU^t1!e7E){48^+;xGD=
z{b*iHi_68b4*QB#6iq;hd1&xtJjzAR#O`B`>vCL|bhdSNbq?-Yy{)soy(2VTo9W-x=R5#L>8pciZNPC|^}aobJQLx#uKLi9
zZdC2mvRgFb8=AgwTvv{1^R1aowQusJwyU!Zx!TZbekNyT{protJv>PM{T$Z?gKT_s
z2X{liJ4E`-Ax{$a8UXT$ksym)g~jm=FZ~oJ=6%rxS!j$aOW0#21?5
zy1!XnCY8;90AjfrqC30NX
zQt1W{*C=m9yi6`f+$0s?%$CbXkzOHR#lMr4@^z$F$-TJttu?`k_$^p#f{&nfotJu?
zPc*Uj#8ORYA72B3D`Wlqxx~8>U1ieZC8&^BLXp$3jhTn430{Kkhe}_Ae&`E`6?0cN
zmo|@Yp5MH*Io@2h7k|F;Jh5ymB;@{e@B?bv2E|*M{S|
zKwdbm%W++f>w*oDYOeJdfC;7{D?q%On%b;Cig;f1%Pr_oyrfp+g|%jzA>Qn(YhQmy
zdp|xM**sq4TH0C%e2ZDWUu9eMA~|NTyXQ-`v)AR;FuFC2TYEa%D`|fq(13~ho%R=a
zWxAKNbhY=l2S4o2rtWS}t0G@(bg3j2=r%fXIEEycQAEE-*9P=bzGO@
zy0X7o;k^U@V1wYeF2{8_uFG*<(7hULZF5{#aAQQm-Y4k~#im(LUjcvhH3FCo>gbiw
zab0FgOvE|kHu|})hB{}P-r4JNYZ#qg7j9QhugmFmIlV5Y*X8uOqI7msOK60R^mbEA
zgKsx1pW!B7pfRAKoNanK-GrZy)`9L!-;R(B9d7b+jEdCQs?C>by7(DMYj0`e23
z9_e!VG7dM}qStRBSs{;NIM$*Um)cE}pJ9*FC5E;$x$-BJ%#&Y3a=z?F+XceOw-&wr8#2erjc9wEdej(92BRT0C>&N-44l
z+t_LpPVkD>BVBd@`r#@^Rur_#G5#IwWc6fT5%D`Q&^43KL=tNs|AjqC`tO(`tbL><
zHLQI+4Y~Lhv^Zhvz1RaPCQ>Yxu4gV$Mzd~M204z65@p*>VftLiW8veytV^Z8#ky44
zCrx4cJj`e;kvN%>sl+_w(l4M!E{z)#YuKx?%PJok*UG|~Uxy%F$@7PjxX`;SUj9Lp
z%tQ`9I4^OLcX@mQZL_UKZZ%6fy(@f~jmVvW4V^E#Bfi^X)!Bsz>w=Gw=qIG0Ou
zb!7r;AyX@=WMz{1SjDX`L;uO4i!qD*#hAt6V$4ky6NC#gQ{jTll6(s?$K)=^EVT1bos$HYGVCshQ2{N&$dCEmo;fW~80heZt*V~MvO$KW>X%qxMU7TN$
zSj;QJ`9NJ-HYU>PU!RE?tJ<2(CQ-laboC9i3h6wRnT8?&
zn^EO`P^k;m?Y41;xVd>rGyM3a#gdGdBP7dP1LJzkIIS~Uuv
zS=Vc=v4&o|v$49nwx@SXpIQJ9=!wDh&Yd9-lBMjmrK`7fFc9p#pu79R!3ftxO{f-M
zEzDkV9B8AL+1A=0G=m1H-zKVWHma<#MF*c_hRx7Is_hjh&gn6qyw04Xpg8NOVa6*|
z{@S-ishiI7FM?nP(Fxp>!d^?u)}9?LTl!lwgJ`?0_54n!!)H!p)=VCLI(*%#VNE_f
z;~a1vB&P)UFU-fe7ZAjYy&*leEbBdp4-=!wZvkzpg@MmRVTj{VCmM#@b~6uQfyhwX
zZqYYDJ|*#CHwlH6o
zyjt;E#p@J5t$3p%UlX~XTNUq6yi4(3#Rn80R{WXbV~S5G{z382ivLi2K@m@pW`CuM
z6BH{HXDZH7JVvorajD`;#dV4&DW0adQSnuZEs7nA+ZE4Oyg>1dif>cAMDe|fA5i?T
z;`NH3QT&1;U)njZw<~@_@!N{@yvO?QEB;vVQN_m)(s1L>&`x{rgdc$=zg!kKaon5alhOj
z|8o*~kB{~@9fPVwnGLq?0u)61yAA#Ex@LbgR%QFU0%_X@NpB_kD`!H3t-BQYXn*&h
zKaPj}@xQR`?-NMdHb{D>qrV?8p~2RD4Ebn(4@UaKln4EN5oxyJ|4fET{77fvH);dx
zxZSR3<<{WGn~!(@j>-W{*bKQ!O%r$=40mFSj_)Ut`9m@o-$O{_)b{~QxETHMnzVsq
zV<6gVk@?SazbNE00-r*-U!EWC6a59@K1{}(AQ#Rp+eGD_#GoF}BUjtluw*2DHx3Su
ze{n94pT?mZ9{=}9@cOYKM6Q!V7ePT!E5&JpLCTvq-*%xLUr8xJLL-yjEHf*U3|eEstM}9+t>t#KZIW
zO^~-d{?BowmdAe_W3W8_67-P6<3Eq;kjH-|1P(fnPgA`+q
z5%Bn9&;~p{KOzj_@!w<$)18nX!sGvkDYQJkdHzx!pU>dr@k!7#@PF7Iczm+<**rcQ
zX7l)z*@$k=V1J%C9^di!gIFn#EB~d+3MT3%q;xyJ2Tm7|E-&myAj=Z8H}`dOc4HtE+Pw-*2K
zT#N5`e14h=ew&WRkK^qWud9*3x79El2|PX?1q`1-pT;~^@{oMbCpsSAp9ja|`}5#<
ze19Gsk8f2NaQARLe)taoDZXVgI36E7FXqAV`2ICv`FY3V^Vi{X{~!f}um>K0=}3GE
zfyZw!>iCs=*T=ud|KO9Yk3T17^zk>wrr-RkS?^gl{pJTJ?4FXNjXw>)a>L^P9f|xb
z{$qymOuhkJBv^byib@gnz+;lSjCHZ(xy;3iRU7}`DH*W%|3wi=U5CPgSbTm17@o!d
z40_uei@yP*Nz0oNkCWlF@qd8Bog`m}%uzCcc(VA~`2R#Yo5lYh?9sCL52ALaoQ{%N
z!ZiokEdFAYXS4W8JY~-_ez)h#FVJ>@d^l;z%uv|3}ELmg^C(5q^r#Vev~K8nXE9
z5U?!%WoUAh(ab-<+W3!Qm&2&w--~@(75sN#EGJB*GJL3le-?6a((xN7S5q`s8~;*D
zC(=fRAXgjz>u3hueAUL^N=aq$H=`@E_|%MGpr$~;;!}-+pEmhJ@wM@XviNK`l*Q-A
z2{QTU>?OnEx8rE7CcOV@mQNf1Y-;28``Y-EQcMg)wDF6^YDx3l=K0r|Z>(7w`BP+L
zUX6U7HXEokV#i^=J5TX=Z5{3!`E!yod!)+v1D(c7XO<%IUJdBxa_$2m=RVMp30Rg^
zs(EL6dqS(dzCL%z#rix9*2eGb?P?wD?CNOAgc|7GeV)_R-`3gQ-q90GX{LWypCj~-
zOhSLtMql~fw+rDfaxm$kisbu8<~tJKk@&$Kh2OBk&tGQYPI!NQDOw!yALfSB#ph#$
z)5Z56r1nP_pYvFVE1`|~r}Is6attrF+)dc_+QzohsT
z#cwL|<)8B3Q#@RC@n6a76gtC)UKbyC569tS_QL>n#f1Ig@T0HNxHL^5#b*0v!Kv5^
z(Z&Bg*potZ@xKdxrVw5HTR^aF;{Y_+F=dc1!Pczh@5hJWN~HJ3;m<5k7ym2hkGkG_
z)5Tw1pf3Km&|e|C_-CTO@98lS?D6L6;@=nPkAxM!_Ot&lY8%Vp&n!?Ee{R3%?h5nX(vZau6`odczdPi}sk9E-8!v#I0j;@=FJqhu>$%i=$cbT*5B
zFm&5lA42!=KRr_vJ$JfQLMjt~I@Xbn8HKgM!;46!t
zt$@GWTy55nPDBAez8*ELljpPVTo!+LU3{(wB#Y1Wiws%1_=T|eZ0K103QS!)Hp`wD
z#^O&N!s4eai+@A)4f$C7X~VGi(Pe-`So~>63X5MiQWoFp^NyIgZ+FanM`o}S-zX}p
zw{T@|H9lb2ys>W6*|W8}tFsNB3L(+cTRkw?n%Q36*WWt`!QOtqu(OBDagpBHIndeG
z+0{9?YqewUX)}aW{o;UZG}(||G+C#LA2GRqz}?|(I$@|;r)3?X&$zC>)(&f`=R~6;
z-P+aF(%IeD)!EVBvITZu!moFvim{?0IGcVxJe__%JfD8vnF`<8xc#DF(lSmJ|4^vn
zQz2tG4xbMZj>E?!AnXr^&v`6_!^cC$h&lXY&^NhH@)E=~it820FR`2|G{jdcwknbX
zVtKFPPDR>UVEN^WS1Vqtc%9;>6`egDf4-bO9e*D7mBW7kuaCU$XhxU#sN$~_xh$XM
zqt%|yi^t*P?%_Cm+>OFuxySwC@S`u%xb#fefY|oUg43}bNDhA__H+&;hkrCU@=6|%
z278PbARpzR3+3?FqQ7$68PN8ZYfq<84*zWQ_q{y*?JI|Wbb%cHYTR!ehYzLd#)jq2
z2c+`>>3l#sACR~W@4^=M_?_v{8)pw_g3)hB-Ez)kd7PCMC}l?{q^ZSOPB*lsp?E|6
z()~BDl4nUkj+GUA9t_iFbf<^0rXFZfXRUrX0A|#Kjte!Po@Hyrsb?Ra>eVn*@~}H+^k5Y8TQ|!XdZ)*e~0GZqsRrTl>4CKM-@M*
z_*um-Dc+*^RmE>A-mS>@U-tKq;v6^b8F{D|Tw6+fqVlj3cP
z#vVEL_Z`g}9cbi#sQI5M{!-EKr>K8g^ZaE}=XgZ+yhF>`ojqH6Vd}f1ZO7J@*0#3(
zj-62wGBDBY3k+|HdtWVYV}Ut_j;RmsFu69hahN7lA*LL3Bu&VbV;w`GTp_==*fwm(
z{uSOvc%OoPR-nJR3TfMhqQ^kyeN1Sub>tdtnpIzgTvX54
z*1a5c(fwWnEg;?_x!+=J+&A;*VY6+J^d3TgZ)8G)t?NXdX&yJjndsoi_5rzc@d$lD
z?x)R(YhD)n>G6qI&$@cu?(*G3y+8f~lWy!yJc!ePizo=8Zt5>^?qD^#jX&*FqK!Ez
zqS835NW6&$ilw0qQG!qb)dr*>)
zn-N>@j}M!+*P^$SY(Tn1o<=-Ix)7JjYq0CFatdPW{qb>>kCQr-SWVS;qr`fDya|Up
zN%(K`D4}xVWZ8_kLVkwWYO0=tkxY}{V~^A2pXg_X@Zaf7X+X&=!`B@x7opEe`9H)}
zQi1YpdlPZAnkTah9Sfxo{a8)aPowQ|LUSC8nJ~
z@OHacRzR{|{(Lj&!B`1nE_BKlZy?
zE=IgYXye-2oA@JY;r;PRRD|{>Xdm3#o7j$;VKh~%QDrq%cc7n{_s
z_h1juRK1&Gf%nI+n8NfcFr)DPxRwo434W+Z)4M4(RcT0qVG_2$-UOEbrBT2iif?a%
zi-kzyQ!_L4{&*sCC$PkLf20gQke`bUoxNo2P4HnhM^iNo?~h62{W0+5I9AR~j2)Zo
z^VY)uFNTj7NQ|Wu$gz`#QC8)dvjP96f}!yL6i(}Z
zAs)phCys&_$aJ!3Zm$2w8v1{fqVi-(*^A)-a-hwblsFiQsg^bKmG(vldl?;5RE?1Q
z(2?r}GTXY!0DUR8_6({=%R^0N?z2b8BbCxrBOSandv*M2fCp=+r6X9cRrfM
z0v}1PAB|lf``g?JzC2X<4Gj9U4s>Vwc7#q|eWND6hVe$d9w*_^8dEC3cs=49%yeo(V9xL_o4DSjwyerV~uBFcZ;|n@J&i|u-
zos2gBk9*Ts{SUkv^7`g0Kk-h*Tzyr;x1yfQASpN6{6ALmI>hVqNs6ygSG^kp
zEyU);P52i`e#!!~CuZO}uC$#2ZGZc!ueu8T9Y}rEGteK2JR9uz_Elfi
z*_`lavT&OdOY4{WhM-McHze(sG&cCu{r=mW$mZ~ecz!H^!za!966WxKg~Q)h4*xl{
zJ#0CAve^fn!#@f);K1GEo;dsz1P=v=e+G`)arm`(KPqeR;^`HoE0fDhH_hWW&Eb$IQ;f%kW4ihJ_dlCtp;rZkB@i;
z3N?j>bpYu&eApo9>F5m&D7S4{+~{#xyT8Ug1FO@hJ?ZpKmB%k$R=K#oW^qkjWp%gV
zq<~wxdRqspTiZHU5A<#sL_uqRX4`6V-Idi_?cW(NAaO=LHX4%HvZKcsk%$_T
zI26VuETiT){Lm=Di)dpam&k`lp~Fxe`3Q9V=s5fq$KiJjv@BlMP+zyaDf~*IAFce)
z6!vb~-a80$KkeX_jz4}y<-&FN4^Vk_M_=ziC+z?1I!6C#;8DeK`2KsW(PQ?LCXO4G
zm9SucY)%x);XB`tp7$80oLub_ihof2vm#&HS?@S}e;&S#Cv47#t|fx#JYMlE#Z8JC#jT3Q0TbkD{gLgc8^wMq6<>S~-}!zVj+=KJzJHzW
z&2F^g@cr)=x8paB+iIX+@9ainG7xGTmo|*h_hXY!^Y7jF<9+_eo*dtg*&Ke3y=Z>E
zpScqs+hQc5B|4!5PedsMEjYyZsqlm}Is}PsU
z$=KOgX+m5k8*mJ1c@X8}gbM@4OAUISAUjYpQD`KkT<*Z(PLj_;@+jGic(QaMt`I&l
zSuOm{7|Aqw1bdt=PobX~!bNN|r5Po&_NY>o1E#LMLUh?`^~IJ1!&>7p`Q_H;Y0O)6Wau;_g^tXNUy;3LG}K53<0$L
zQXEeFVaWNa_wnmd9JqR1#P*4F94+Eg5CvNJ#!YD=Z5}>SWnZCKpoRZgcAQF|fEk4r
z{we4mm-blX(l?zWwg!yC^
zT|Qv{`y3=|BYWoY`4HiB@%_iB{o(OBkA>*sJO7W4$G;x0uH>OVqxc2IFDu@zI9mNb
zz85ck96u=y;zt#YCoSap($Dgn6>n8M+;#Cuz>wE(SHvszA=brr{vQtpj~{)J#-(Zk
z&ozFAK{yeqLUi$;hBbpi{6BshOidxW_+J7YFc^#?921F`5^T*{cMT4r66wA1_;Yam
zQqBf@jJdk_x1qoB5MqDOax|<2*E(E*&9*_(J0ATNqKkhI`eS?c=kp$Z{u9VY`#Tr?
zeHUdm*t%R@{0Afb(SQV56ZZc_Y;0rg-&Em8I;$838d%3Im&ad=`xOZ<8?4-SP{6be
zn;}{P?;)gd>d7IQa54H@WHUg!FQUB`S^atL7lmA}N4f%3%K|P*F4m^J22>m}EP#%AX=SP0jH%xx6JsoiHU%-)v
zg#NdX3sv%|vJ6810|rvt34vLi7-latt78a#Nf~=OK9heY_8H6a{1|2OeS12?G5PPr
zp7zG%uSWlt$)~P&J|@3#dph689xanU)Sgb1$@lH)M49|2(KcHbpC7Ta?dkYTej)aB
zd?tUWJ)NOUzHd**XYzOBvbIeA{g|12_H>lVf08FA_MTX(8NZEWfx7tomtpPc>_3x#
zgBgNl^8bq2vI_Vg|kP;
zzJa#N
z@oH}PPQK@p_Z-fq&M{iQOmU6kdc{)}H!AXRoc*;bZd2@4+^P6_#mg11R=ig6I>k>b
z-l%w!;;o8zDBh)bui^uW4=d87E64SiB9+US|AXS675VDU@)s1HO&xzeMvFfFzVi6r
z;+rha>vt6&R2=O-AS-ztf?qsIk&0`~gCab{JU;Fo&ZZ7#Jq*0}GAzJ`TWY{*lDvrq
zD@V?hX`VX<%JJT911?DuHXycbSa3471Igo$#HJ4K+cwxSWl&IptywDy#|
z^2j!t?tDNVB(3bx#MRn&G@|nX>3l%G0`I4^V{x8hMzK?|S8<2p>lNRk_%6lE6|Yvj
zR`EK;Pb=Q2NR=n<_f|zNW@i2_#d{SWP<&YNXNr$0KB4G*Kn@g6GddrTMh`Q}b!~&T&&>p)*STwGtM?TN4Xq-d7yiN0IBx!yeQn8Z(y_vi=Gn>WKd
z-Me#K{qf(em^gL&x(9FWyQ3cmnDhh+elQIIM45+lx%?*%car=YWR4O#FqkYqf@FpK3h60QjCiV4KysS=6nmU5|AX2Y
zavRELN-aueNk7JUv<#rnO8G6~DxvYF*>WaY&5_q3o-5CwWS-DR;e5FpZ5PNON)`$^
z4{MF$V`zJv(0Rln`7GjUp<~_}xf^k1KHhwXjC<3^IWZ
zYhpbF)EY%%5H;2sMRF>7FKtG&3ES9eR88=b>ya+Ypq~+0qlkY4I|+P3p3CNeVG8pN
zIF@e4Ou{h5|3MJyto7IpR8^}fnMl)JH*(ueVVdSM;&c(Zc{0Dbz!Bsv6!T3`pbpDp
zrV6`Bm3_oOn!ZJ0jpAgsPbDTGm*!WKs6FYqXcp+O{tbfmmQh3(NDkjKyoXpf*ue5YcX&fJ_N)i%JuPH5sHE39RE?r(K=x9ti
z3QJ3U)6Xm@71>bE#MmnA=|I?#9&g5~cBpauFUOXn$~wE~%&QY;U7f&>n_twtNj8u3
z<$pIzc$3C_%+#?yF==+uIaen(p#^6e6U#yqGvYb20XO1cZ~Pgfl1c)j+T4T`#dk@v
zd`_~cKGy~0%R?8CrzXeLC8f%!tDcbU*Q>9;qrJZ)WEkKntfj4Wz$XxUdci&fWWzpb
ztr`=inckjo51kiucV9Rdau$1|FZ1w7j>U8=<{@G+EitCdTa>HEmL&5tNwgc;Kh&gGE;Gm;xUS~ic1w&Dy~yJN%1trjf$^QY*Fk`
z+^%@O;suItRD7G_C5rD={D9(z6|YzPjN%s*4;LF0m*e$>^FC64kh!|6KhS<2QT%Vk
z-zok{@ma+L-)XVmeYGWhCfkDmJ4dlgu}_h2R@6!5T6E%KMZAL_QXN%umvB0&nDsE=
zCt|_^#C&VUDKmjQNHkbEauQ7Q+%Zrt`WB5#%7hJwZ5tN665CGOd8BSV(&SE?u`&D|
zEXg&HqfG@|DuIoGO-M)kyB{+Di!vK*-BuLXH0$n3c;GR^VCym{ithJHEOg-ia_*P&
zfMy1{4#BoT(wmGyRWhN$)?I*nw7(nBA9-Q+w;1oB?z{^Tpd-~uHd-XAK6wr
zzE2=++aT$Yn0kl_4Yn>$zXguHk|rCfC=x;>CYZ7(O!!b{0ihMQMfl9)gNLq
z=9r%S$o4k@S?o6mw1x3_kPFWNc>Bd8^ZR&kdHXAKdHbVqL^ChJS^Yf{ypn7PdHWyW
zK*8JhVg5jFp2wUNebPY6_yY)d`zbhmFgjt3BqfTulpnnPSAEH=(Y%CKq4V+f^H6Si
z`)eQ=7qavTxec-9?SE$4z8}4%}((PDGr|+aHIL@v;sFI6^5pSQ%G{WtQWt|+ApMfLEp5E$#!Pd<7
zYB(Sp?8w01m|xi0)79D2f%MMKfzGzhuFk<-tG9Kww|9h&E;IeR`W%)25~cFFdB0fc?$~2=SgvZB7zyoy<65ca36A*;B
zc_R+8c%Q^$Xe7k5-Z1&TnaI*1^WTEQ264lXMDs>(At;C&#vsU|KQa+vIG8>l=VCX7
z@b=CJq_a8Ucze8!f}e7{J#@PVJ1!io$@9|Tc>D0ijg7^1RN5R|IVfT7j_hq^=1J_
zEKL`faZ>Gp%g1cqo@U0u;?ucwfxP{#5Dj_zt!%Hn{h1g5d3zdzX5bsgi1h8*(CORz
z3jJIv@Z#&+--kgQ5&HJBb|01P_w4F1_punRQ+&$-QQh6B(P*cBKL7&$fVzAn4;Fj@
zaRh!}xRT>wTNJTO-=Kq+Fu6U=>w^2|0(omb;bGL5;~yf%l8#P5M@Cq
zRM-A1=&w*+`v-&G!+quI+J7z5AErDQUoK}q70RuJ=-MyCx57en?OzGGMUnAwUKsAg
z7S*-?R%HH=491tMYyb9~{_NZmm4rje^Zp%jl_=bsuKk0Uj5(%-AKCtLb?twMK|P*F
z4!ZVBN9Nb@;Og3s_on8u_Mn0GW+g|p?F+DyL)B?$+pCov)wYjX$tgtJo?7g~v-ZA~
zoWiy3=U_g@4?dM^SmbLe-ktbpKT>)?w+jV@EqAN#7fS5?|Y~_5?K3H
zNtv^cw7sP!osFEz>aFJQ3=r>U)MFz7zhy^HX0WrjryAcTh%9SweQEl3G-hK=#E&*D
zz9|-a{g8HT^fKF8`vWExmy~aZCHjrWQ0;YrjLC*(p-uJ(;^m_s#mvm)IcI4j%0V=XC993!mnCLaXWibD!TGZYGa8q=w*!XiWTs
zzr41Nrm%IMhD||3{_vLvxx<^b-=mEjK1(Z+CYG9*HAeZRv0AhS0jRPpfGi9PICG+c5}Rr3HuS
zki=z|WveFI7^mKZD#VlnHDSWR;O(RD(00EYus8142KvT5kT!B2!~qpzBj>-s>6~r{
z0kmVvARXn23$>9$quiBw`rB61r$`+y_RmGH#9t`>TJd*^Mt24E&uad8MY9qW{D$+nH>z`IE;`IPt#j6?E)jinS1|017ahpxiv$A)E14V5Nr9`ok)r=BQcuK->r3$w13y7A_y
z1G^IAy>Z?%xOS|M#^hg6KXWsFn%~t$cCzNv(<;4el0%0fvQ
z`~9)x%h4LPBH~6ZF!?r0CW@bBE>-+RU$P&C#c#vUzF5{#x}svCKdUfn=0+=#bC;!TRTD&C=Zmm-(EQSJf7hZTRO
z_?Y4oihof2v*JG#UrROI|HtS`;KzI*g@UCZi5;`_{T
zU0}$@2v^CL$~q8hV`VYoGFgp_AT65_kCVwL881_C*-VgrNKTXzq|4>=xN;`Rb&xqq
z&Otm`?uTTB{0QkOysEsZ@*L!+2^W}8m*1dvhI|g?Gi4!4W=T7K=SNFBWGapKwJKx(
zbhb30|2gt9#B=2-NX|2MPUjonX$#~clq{5f^mB~d0-0mwz3AaMxeUE6k`E)Uc3hX^
zx^R6suFG*<&K(v$w^*H!QMGE`wi
zC~ri(OfE;E$79%5nW}{;w7k%S3;4~u#K6AstI0VHPWT8K|itg$L6zQ?&{{!
z=JCz*o0m4nn~Rz!HK&`)n&&l7Y+l$LYo5|v(mbXa!culR+erEWJW0i3WmVWId;rb$
zbAQtux`Q>rd6Z0~e}mJGoUv}1NWYdMsj@GyE|vZ;+oj4rVG7ghjAUX3o2L>b$a#5<
z`VBSWmzeL-e@$|N%uAP-#?#Z&<13)aJJ%~MT~ivzlV5Q{;^{S|rKKCn;qIn%d8t4=
zRgS{aQs4g#3ra*blru4=3jNjMnXIxFoEbDNI|&;Gh=4j&QxMhLQN$
za9kJ23&(XiuFG*01`m8u}(H*SOuwr_18(bqzXuUB=6STf><3
zdpR;(E;z2sab1q<^0^(ihS8q~XRpg=ZK{;30hMEd)9Z3v7cYd5!;#_T{v}~z%k9-R
zE^BnQ>7BhUw}#Q_b>YU~^tzm0m(%NVdRg$$AJfZsj
zbaUj}dk6dad)qzlq~niYQMqtke`Z_d*&Tho1D%7t{kx8-^uHW=j_Yz5HF(#LTy271$3zzrmqF5K@7i`gI3HdVO
zq?ABIutNLI+B7>>2wbu=WW$-~&=ba@`NGvp@J&XhWo%#s0&^JsZJ`mB^cA+C~g
zl+Tt|qSYMPf_Sd{9wqbSH;|k!yU})m>_CaN-Sr4$j+K8y+vAMYu0@9Nsuns-u915X
z*UCwV>x}iU#j+BT^+MMaON^bc200FWE|s@qY>o1M#LMJUh?`^*xpm}mT+OC`WS;Sc7_-9NJRyopU8df=;
z?B~k3mst8ZiX_TbF_%b>VO^q(7S)h@1-iw$#&5AMmHr0nQe_`Ch3Qvf8e@sXI!dMz
zmB^+4ff~6qZY-!_S4JIGJ~FPAg)=_}L3)bkuVeg$o?I3$r=>NzE5Q%SE4s+LJU)RX
zMV;OiejR#Sh;@rIuz)e9Yar1>eE4;flex;VD$a$GTt``iRgb9^RXF3!&)|=wI9yt}
zsbYd~d1WeGURjcFdF7bg<&~v&dF5EUys|8Jd1bmr)=sr6E*DJQP(DE>7Bx?~Xetch
zB{`^4e@wB8TVIADj5h<#E;EjqlELass`cVjp6MlvihL_0I4J^!-9)VJI&TImDG|s=
zQ`jkLY+qCqhS-gWK
zzXaZ#Jep3$fG#bTWV{?9K3*o5mnWsDyfP*joPE6={pxZ#uY*o&F4MoO?{LzZ+jQ1h
zgS+}dHx4|5jb3J3YkxomK@-#GiRgsJUYeuIDw-XX&uV44xim~id+&}mtnCcwkCt_r
z%#Q9bpLMvf86R4Z-?vqvo6g!`CNz@8S>H
z&*bfwN{CCGb+o9$W_TW7>=mQks^d&XI^$em9weI4Ja4^#AYSYZ>9J*5Zzp(!7*#wZ
z-*>~n(S;$72bgGxn-x!CN!+Y_isotNA`HfsTA0PN51&TE5cg=5Bn)xmF*BN<5N42y
z!-NJ~@cD%!oftzLKG}
znc^D7^@^t|Zd81=Vyogd#a_joimz9^T=8nfYZYmbnfv{;BA*wT=gS-MR>eCM?^3*1
z@d3q$6@RAqnBo(Pe^C6h;y)B$P{gyL*8xil-@V
zRD6|Ui(-f3cE$4*FHn4=;@cE2QGBoB2NXZ7c)j9h6u+RzS82}c?TX(}{I=qE6~C|e
zW5q`mA6I-z@sEmsReVlS@Sx586f2e~mMczET&UQf_!`B_6+fhSo#N*ezpVJ5ir-Y^
zi#YfDfZ~r7A65L7;_npyr1%d-{NVg?E2b4m7qH)>iMT~H5W%T7DW0Tg7#EcDRfuxt
zl?jNKS}%roBL0?Hj;;(|rDzQ0;8rn3^CR*LN=KnJ`R)QW{T*F3z7xe=SbWAo`^Iq4X+s+Lm$rf#gID+XgccXn#{8{qeuC9Ut4W4gdEsdinhMj
zW17H+n}0Nk;_0{+z=z-AOVV>r2``U)e0T%OMczQ#Qm%$z+_2vX*^Tm~Ouz+IB#)c6
z^cS0wS0G&?&mbNn7a=YcQmJEQ6XI+>d?`xC%SN=CApZ)ISLh0lk_`88$jGd&?G_!SME=
z-yVXtem*?6em*?8e%@)|?rhwCQ7~zlL&uZrm&@Q&N}ey7N1}yA|G~>~ty5{?|t1mqYTNA7t~a2~)J{6W!i~NTk%{)z8k&B
zTsiIrjw{D$2m*K)6BZ!meG;e2gyA@K@{()=hQb8Ok$tcMmyQYfxbi;RIV9|UPeeM(
zk-i=OBHj(Ty>aC?K&B9`oT`@`vki8??I?)ucWi{43cnq2R)1Sh@0>Df$1|`x5v%%6jej=bV$AG|lOfF0`fP1X^04CrO(&
zNmo)?E68eDR7|tAjbt-PD`ino6c<*xxWeTMDk^S>h{#1i?MWbxwyUeO{Kl}{GY
zi->&B^UnXBnR9Z|oODgg`~H&mdH0!lXU;6o{O9?{OQzsh09Sr5n@I8tC@j4WMfte$
zYLr{9{L5$38bB+|F{6P6F`p%WBke(->MEW4{x$=Tom9h#WSgxF}%)ph8LDP^cUxx;kE58I?
z3gF7m#yBJ6%K0KDupRG0_t+<}?t$&N668O{;$bbW1o>nxr6_d_8pcR^pFAbQ`hY8+
zi2a7#g{TK}{yww-JN|Qa3b^vyOkrv*W)xg`Gg~I(^N>re#ZctRc{jv>ZXs7*kQq69
zI9XT)15f0Gcz{?c}TJD9{Suc$UDZ&
ze9g%|h3yM6_!i&cr}_a^$#+)UY+|0pnU9Psw}*840|P48vYwPma3_atw|ucU<|K)t>wTJ~`rt?zr;z;%wl!^6(7r^PbE*
zt~|5@cU*aBSMIoS|JO1CuDrG(G%HWdbfkzY2u~vE}>_YG}6Hw=CZ}TfPE&A!Ru5agxDZ>UbHBAv~aKL=vfvgP-pcBUMTl38*Q)-#(epNsNrwwzq+9Qg-Y9w>ZqV=c=+
zf^;@p{w=hbFMNTW5nh6;z>P&)1p6Q%gZsV
z$Q_D?AjMT_MJaL`qk|&nJDnJHcbcbkvTrV1u9oG>mQxtUvgL0_bF$@pS-}A2eS~Z|
zdpfp!L~MESP@*fGeH#W@mKX0yqANvs9cY=39Vxmph#_xt40(I&KnLvV)0uT`%>&ID
zyeP1Fqr}tEy*}eRnnR23o=pEhbL*KIh>Q-PVNai5*wM}JJ(1qj(cjV1(b+MudBui~
zwzl@}(3I2(u~2JbG#HrgK!!Z}o@$h`oyYX_O>A%wPP;S
zuKZURFU^58*zva2uAD*{^$@hBHDroztu
zp7X!w{O{pM;r#D8|9g8iSsUf{_BgfdeAb&yS)$o?^NbwBjxlW>A#od+nnv|`wx*oz
z%$j?;*Qc|lO=Vo{&h%$*Q)g#eC~#t44~!m_Y$uGplZ3HH6ZguyW*cI`m)d^GV4Z6|
zt%f1y@oVKU#5{;cM}pDxi0V?K&hVgkI-q?tzyIg=xmy6hEzajpFr+UsdFDE!*Fsc)Q}=iuWl#p!l%j
zS_>AJ86lqMuagAajke{M5AH!1=u~d;pNX$=GE>S#G@d(9Z
z6i-wcm*9>tA{=O|vFc#+~IidQOrR`FWJFDc%rc$4C-igzg9qjHd@516|Yw`IvXgz
zN%P-Vyi<`ppmuKlU?c8Ax9
ze}=W-lBna&^AzX@^UrhFa{P1sY&ZyQ_(8V~w(d9-*fi^IN4tG&qevY&%II=G1JfNY
zhs!O&KbOt?8TgNm_b|pg4`nvkx(*aD&FyC3NAa&j$Whkue?ZZ;I|8TfeB2qAfkpKK
zOlU*9d|W2Sj7+O{IojQYGU`QOD$RC`2Xb36UJy<|CAZZEj>C{^7do{6y@vX_bQpHN
zUFgoV3RMjSerZ0)DwOK?1zClD5)F5RRp?smhM_eSe5=rF(Ppx|9kI0veG2KJtwL`?
zt+fiJ^L%DH@=>mlkYl{MfzHT|I&Mw+um$z%*FBx-8rZP0
zs|C2Ov!{6=16TAb`g_(5pr9G9;8)PPsjffMmCmfUf5*e}^Z14Mrv>P`jorrjGin9u
ztU}3osf#*$sF;Zy^=|pr9G%CR;F-Y>gB#J1%{1;7a&gCKCv2PEaCC<{4F#v65Ir88
z-f$)Ey%KdNXWr%&k1csysZ5MdlF2ePwvSAc=`xEqc3HtbyRk6tz4%77GM4r9%4a~m
zJ=8|AtfxZO$FrUb{rkvp#Jxa6!Cb=mZ0|G_oL%S*`0>#GaZj}i&D9(JI)2{Vo|_d7
z4~o3g8-_o4Xeg+YzVz_E
z`6l@W#DQJtKIHS#y+<{JbF{XhC1bIXGcUx?^Y=*bt$+=o-ta?c54~Y3-@-=pUCc=_
zb$?+adKRH5@lN!D-tbgR6Kq63&zA9$G8lfsM)U`M%a5b5^m8c6r#Czsno8fFi}7Yc(%NPk~uENV3b_*TN?C{ztb)SxsD<7zdE$U8
zkDZDJs-O^iKWZ#j9?$2SFMb3TS>A(jMx-~K7>6E#L%tSvm(NX8mn=8d%E{CkOd~{w
zPh!htd?s?Kk02V7Am@Ek4na;LeJFz5C)x87Hv#Wnak9d0
zMBvL;ByU6<^FD~UNM1{ox_zLJx=CJp-ZjuNs^39o_En!DmkfZ%T1t
zK8*~em%tl>(PXoW$HhqSZ&z%=UcrkyKYZTP*r84@!SnWXUYrt*+>i8tMEr{4Hxz%M
zc(>wD6dzQ4Oz|m2tCv8TLykw&IO3~{e2vC@iDF8zLXjqR^sBds2xCmzxDt<2JVud^
zLc7)f-iG%&|9keNuE=LVhF!sjx8pdl!7lem6wrRRQ7d{uRGg1?!};I425kz_N%$--
zW#sT}u*+>jL3Ft6p9vyFeivww}%c4&L$AQ-gno
z8}PfHW_Sxf&pQ6+`ro??H#_-kz3|cwk0P#@&meA)gVAP*d&kujdw1OIz9>>p35?RYQhk!xk^Wcl}57x>@%k}0(Q_uj^q$@nB3u&Eh{hV;Kz
z5He8gh$|O
z&oSct%|_71H{h=e-Zu2Nm}K|HE>`!4Zs&M}I
z`l6D?J4v;|e?oB_IiD?~&uYx`sXPqZqbbaLt^zcLH_+pjvmM8i1Gs``F=xc*6<=0-
zRgoVeupagk2FnyDC{9(Jsd#|mL5kIiixrnCu2MWo@okDHE1s^{q}Z-_rs8`Q-=}z<
z;)fJJrg)j+Rf?Zi{DR_}l_NJA8rZM@#V1JM(~9&e!#qvlh1P6x6P|6uYbI*U5|ge50Uho?Ko$_pA($cg0Sms$CuRB
z8kXFTc0N}=$p0Pgzv{Q#jKYH0^7o_R&}{h!G1_o!`3kH}O4cGCC)2P>`PlNCvAL6kFNLhq
ziqDo0R$6%gOSEkHO=v$;YEUvu&cu3Vv*l$d&t}WFpk$8x1}&}9%0`sTlRk`-&6Zz@
zHuL2=#2KN?Rh8U@xLS@vTqAsOZQ1hYk*<}0BDP8^gW2*~sI_eQkFcedE&nB!Yn4_i
zu_ife`5#dovgJpjfo03PP_t9m@_%tHrku(JOL;b1{xuZFrlCHUEq@VZV9O7|M#5fv
zo;m0&Mc!r#Q+%frTZEdx|6Vp*PLdtm`C7iviN{y5Qx03s`yB=to`*^+1+nGq>DclS
zvE|PH-rlaX;_Swq-MArGjUI1(z@w6Ht@rj2Rh2B7*S^E@nZees+NRF7zP4b)IvTpV
zyey;tZL=GHlla;j#Fj_gh&r|$uO6Dr*Cq>twl^n;riJT27V6u*0n_
z`Dt^}GFS}YKs=s>L_a2=YJ1BjI9I;NRki1ld1{SMvex{lT@OR?eKJKLT)?OF%-%b
zQk%f`VLy)N{O|2e{`Z#DFBk#WwYZ^Psj=ZTg=>5R;z63ioj5oHP2m|hx{OumOGxCm
z3Z-cyG!$s93DdbVnF}-&E@G}I@g5wOunJZGd*5Npc*ztHI?zzK*K|ly!KWar&@ZFm
z&{m<;GR|iex)!|DSi15GG!)LqIt}fA?_q52B)Jo9Cd&X~>woWcq%H5|YbekLafT$Y
zG5Z=_;F)p)N@fY|IJ2!nYf+wU6`I8Q%#mW0A1J@Y$aCc?r02;ek?m!Bfe
z$m58sgvN!{LM7)K`8#536*?Is)XHqcRzu-pETvAaMqDpnN8BJQ(SC{iC(=vhci7Tp
z@)Xj`(XtvY6pR%whrNRl5IdoC#7;IULvK)bM0-f%~HlcXUG@9Rr8VVHmMecoQJjnmv
zZKlv#g*LNgGCmLcICTn^I;6bt!)VBl)%ZhE|9f|%XefDM)?qZ~e~;6Ez%LW9pHJ`-
z#l`-m6#LHk-^=HJZv+|&IR;hzbZzIGqeVqeN4bAKM>_5_(s9knz9Ty$m%C@H4(E`M
z(dQ*OXYtMkCFEx
zE|Yg*(PM?G!`XVnv>F{RjTm`?T!NMpWdYI^GFWf;Ike2y8$JLnr^_=~`V0~D&DIIq`2fn(@;AhlLLvSACsZ22cj<_HD(^XUygg*FGv*UJ3vg!0HWCA7W^|;lHAG
zN9YZ2!Z;)2%4x$JC@6HWyQKb(d4c~u>J5V(Ki1EcvM!&u)G}sSMGT6?p7N4X7DSD#*Xgw8Q=3FT6Fhh`Ujd@&&>4p^$eh6PoH1d(cRh6-H!C8j{c68j?RvO
z%_}x^w6(Q|CdRFOn|lX(0*hl`bak<}Rp*ap1&k|5G!LCa?r1N3ju*Gy-Bgu1pq+>H
z!Z!k5-2RT+dIoUxw1uwzqA#a*va*6*2OfRSDA)1i(c_^Z>)f;?$kDIsx~|TxpQ#49
zsjUv3&bEe!didro$4b0V3*AAlc;Vd1JL<5*mZs;e>TBJQKB>L8r@sT|<;@4BeYd%|
zm!OftP#OxnQyWcoyr9$~fom6ry}&15KfQ4|t{e{#jw^RuIiEFg9K4CSa_5^bJiVKg
z<+B}E9%>%&dci9pG1oWWFHw<3xea#ya((md8_@t5gT{6|$CYQ#pS|O_2XnMnaOL$i
zHA_ZhSFWUadU(6?NkiC`H-lyk?8*&Sejy0Np}BJP%~t?du4==|mHz`fEA-80xblyH
zjm*cDSD;*EfIOyh<+q?DF4rPXNGa&cV)>Ej>vQFGNSDeM#AD=i#AQP3;;}+~*=(-d
zR~ufAktfJTw45jzr1Np*520^1SH2%wP8Z)dADQ%gT={y8nUx^g2M+A)YP1
zZ@!_p^2gEUVEH8a7RHs&Maz6#c`w$jPR>VMFP9^>T={<>ZMpKhksg{We-gF1TzM?w
zn=i(X`>kDhJfCmAxbe;RZj3V`t{leXC$f*EUdCjE1o_c^F5-nRk>!Pt62rz@dB_a~!d{@DMZXrSb6BOncle1m6F*!?o
ziD7??yvF3^UM#h=vIrD&<)qaW4P{u+f!=ETOcPT~O>9{i$!CmYc;`y-$>@D6u{tFa
zWKOE0ES8#)S~GQmjGu}N&TOx&Y-L#t7oO6%#8NBE%Fr7WHbxPQGNuBBWo166&4MzK
z)fG&Pt;AxhvHWr@C}m0SeR1VURmq{#Y|-3lt1BkR#9~K~_cvE08*K1+Er+j_
z1d8#t=Hn%jh*coO#>BV+HA`YRf;@fLf_kMr(wQ!!o(VKQ<}%GK9V_~K
z)(xPb8BECvQh;^+nJ(*%Z+$v*JV@~47y7tv-9|@{H+8(PtLv-*&k^Lif*=oA_iZA?
zoxwP#O&#&sQ{o;eBRq)Xjd&5Hd3$X@P5YbI-P6?E-__c?F^6Z)p_qBXTNHG4(!!1x
z=WPYUDDcDA@BHwA2gSZ{ytuc=^5U1_MxFcbQ;OFpeo^s8Me|ua+TE)8A1mIk_?Y5T
zidz)_q{zp8F6UK6icBzHqL@;wP^5`n5gtGn5kYD-C?2I~{5zq19FIS=+gA|}wO$dZ
z5o)ip9E&h`h2kV49$fd)yjRt~xoe=g1vt>>;|7}=XvckI6)jA>s+RtKuZjg#`7U+N
zb{x|g1k2~{3O>9Y$Ab-axksWP%7gY|f1i(blTnUC!VnqcrOns!KpRM={L^NDcDxOd
zG^;-gCWQ9xHrRG;D2Oiig$af6;rC*^v>gm+$IIozy#o30XD}Z4j3C(YK7o?x`i;kU
zoCnSe-?yWi$zKn&eUS7hut4o48*Cljl10bcCo&$nAv+%XvJdrO7;eB$n1?yRcIG*+yE&cK2!8R{a+3(l!I+avAQye{}uQk@-V1SieV*#;)%L_yH%4eEXNn
z#_1~v^U*Gi!YL@ht~TTGyu)Q;ydWHl$(SAF!ntLiXuBG$)RsK$s_SbOHjIc5-(H=S
zLH_r~VKa@=${v0_8$fA5#r6ez9q@dTfYH!&9|t(?PLQG!1>D6OQhgJ3;Qt&~t{
z#fVx+@+uS-q_jdY{GpXrK7|DqrnJ(Dbs8s?Sfzaa_wK{yPLdnZX0ohBY?W4CL^@k(
z}VN@mGLSkG*wmANR-R$BQhO6JHv(DFdx!8lhwhLU;mex$RNR`^NR
zeEA{bj68t2N}fbqE$>8JBfQvJrIk{QP%HZ&w$|f=l~xv_y;WLy3|nfIR(KGukV_G-
zl*Je!M``6>s0fu--hl>IX(h^tC-O1k3B!nwSZQUDyo#EPtGtTvfGSEIip`19;5(34
zsX;}I?`Q%>e4@{YpN}%|1<$MZP?bCS-^iri>k
zgnq$HHe>}&He~uJ7t+!h5Pzn&E<2m+o6pjx<{inIL0e{bx4O!%B*_OookkqgaW0$%
zxw9aT{#5n|3v#={_A`uOtjGC$GL-E&@6(*^I3@vM7x>@nr^hXF3`K|x7l(+?-sJxH
z+)SKKgx$sdMC?31|FgVaai!uBipMIRtoRPaW<~Nf?BAofN%0)TOBAnE{H!AR4EFny
zA|Lyhze({{MLsaF{2s;o6(3Z5RPhPLrxl-7d|vTo#a9*IP=x)28NW<%g5p%gnTiJ}
z9;8^UxL9$S;wr_X6yK(Jvf}BAO^WS`XDYr|@qLQtDSk-tV~Uq4UZwbX#V;t{ptz^`
z-`m+7`J2Z7o;e#ht{gw}AmArq!uD|Gyr$WpbcFN27vXxhW;^cu@A*d#uVqoLe2>*x
zsjpd7KLW1Y`QO9K80UX)u~5FdPR>JIFP9*0kf}JAE|F`HUMjcaJiSbQi1c#d?cNIc
zAmWuW5d^Vi$Em!s%1izp6^0#eK>yfEG`PH|4`p7g3(*xOEna*AYD?LKnj~Z9plX5_
zUx9SlJ24LJ#aS_XMPpgx_{IYp7dOTliyJ33rW(r|=QK`ioYz>?xKCqgtZ4vn;Fpj{jqXqV(O&`#zWXqQ?8?J?FsyDZm0+cU5A
zv1Z}RKa+9(_nM6}w7}?YQ%@)SVlx41EgNvEBbNV&zA`Z*
z>ImWV24i#LvNCpc{NGb+S8Y>gTVGo+eH{&5U8-KMgE|Z6J=4P3`QP&o@#gmarUmtj
z7S=3j2!9FwL7nsCEs&cXP28)0i{Qu3|DN-|cPjZwJOrPi*s9o}*rT{n@f^hq6faV|
zMDa?+&njN4_$9>~6>n0!Rq+nRdlc_id{FUG#U~V>R(w|RdBv9%UsZfVkss%AJIfR&
zDy9|ZE1s-K6DGF5RFO7X%wMhO{O?82B!koZC>B$nrHveIg=sXQ5;5E1xyyt_iWXSM
zP$*Z(_b9dx`*FNi?7|{-^O45x^cwNcuomxNXm5>I9LA;*Ple_k&T?RMyo1o@lPI&n
z)*Xien`YhZXh(Z%8*Cl5prgzE%s78JTy6>e?Q+jR+V(-xdl=)L$Aku3*MU6K+-`;w
zFu*Gja+G!aA5gUIj=;O8e0HW>1{T!|Frf|YI9E2<Rpa@ccF|nu$amr?LtpL
zCAZZEJ6^6`=zm~dF0qY(wjJz3>*_|pbuDgaP&3lubrKqV1LCdw-y4TD8OAE~5lkSg
zLbG)eXlMkI7e+cW4mVY3&ItgpB6$eN+;@RMcLQUbj(08s}
zfWGsDWKy=GJ5@uN^1mFiqw{KmpWBUy
zW8Mc57s+d>a-3C!=UV*BRyAJ-DJgnYRn=L4)o2nGN@(Sv;A}Er6n2G(f+a4%2{jpQ
zfq=81ROG1lxR+zq)smSnnmW3AJ3CrIY4&t`&I{j8^THQ$V|xqrXnznp%|3L5
zG~-A-@U1!A_lan?VS8!Ed?wq@PSn|n+T+XoMuH0lbE8yg*sgGaTqK{(hO!goox*71
zDx=Sd{u3ouP{UrJF>J2rymxbUqMr9G=K(wXc|~U@>d(h*xM$|P(4`OYUd5j&KBV|-
z#ita1ulSteUldwHD
zdEhn?&&9v(gQWL6RHT{EVC!-<73LRcC(7TAPl@^i+VMVtY;^r-H_7!GPE%nr#`~78
z8^Ml8QZYK-;gRu39@*_>U-q#a_Kz`MrJ*rUh`>7j=V~fEgPWdwT=#w29$*5#H1^V(
zCUCh7_uxOee#b`U56NKt9zhzrKH$!0V>}*{HgMe-i1t`y{sb-;h5R;zJUEv-9{*e>
z#tQ;9J!S_ve;j6Wx$}2nrMBd02kyLK@$Tf#U&Bfn?)+ESTHcA;5GpEs9~%tr{1l$%
zlW}vlmSQRcfIBz(3ITVn8p9uF%XkToRcH)TdKeC~W6N@mHKSkL{W2V+|9oEN@qMTIRWnIpV#9w>KVX6H&5
zO0v20&tZf^!n)N7
zz4Fx?uY3(M3$;s(Z@#7SBW&q1xgWL5CCZ)ivTV8YEvSXYFnQxpQNgzvJ(~waq1^d8
zj58vQ;n=^p7E?~;f~EX)c9+y^*h4TM&F0QuL_=`rhhWRVol|2tiao8J~n)>ZgbtcfO7@$!kqap$TaVbB4IFnKo`FMd
z&~fL5=@C2b+&^Xoo*
zb0dHsFHyU5W8y2x4}+g9NR61x`_O8{AHf3isSzKGdppaWuf`cGC7p=JNt8Rk0v83#
zo%6+awi>a|oj-?O*>>j-V2PGHzXP>1g+ltXno+*s2jz_PugB)ZNOuQn#M#_=
zFY3XhzY{I;aOZr1k;|Q%&nA+owKyU|SAFx4OYzQu+&L`^82IE6s1X-rcg~*9?)=ub
zK%l~N+&Pb-9m1VQtza!F<9KxIzt1`E>+-U{Mo{N{jz=FckG|$)pVBr{xBZe9!*l2(
zleXBqxbr~_9NgWRiO+hKus1mNvnOrm#BaxGU^woa_ZPUs7!BMxez~;Qb9U#>?tD+>
z&M)JWB)ES=VF0hu{1+8(RQ!%&t`EPTX}PmIr$};WjRKkARj}^iIPD&pXK>OXqjz!z8_jn7vJ*yIn?H}JU<6xrsXBXmEv2T
zpN3us$U4NcW$TvbkE6}O@@4cb%<_C0TIRDn@5Q>+$@z%u<#NQ<^87!LwwC92BR#a`
z`ID&4wLDj~VqT^d=+iuh73Eb%FGe+Kr3mLaOQZDmwYT-P_Xh@wpjC2R`q`$ACU-P>-#}WaTt|}|eswgeKRc?t
zxv6_&7lr1-6I*{*b7yDQ#?HaUs&EMAsPgu!NLuj*mji06gkCTQHf-!_3DwwJ
z+9MjwIqJ)Mt3->r0~^ZDoVN&0qs6~T+8#S|&SOD#=FXR&_cZ2;T#bXrtD8zP^iu~;sfh?g$0?WB5;uVUMh(k9Napvs{Zdg=n*U9#lyo+AQ&i76`dw
zbjz#FLZj8Rt}DTAN3J%@q{w(<(9Vu`S)>p9zlw@Nv{`0jyh5~D#^QHEp4$eye!1E#
z)Q+*^ku9?8$G+@SqXSTgdK!MCHn5KWKTx#o9s%7{h&Ib#(Jqa?HgLHN_uxNz94v~=
zACkfP`ug?lZA}#E3CUB#<~4{`(FlL^P!X7b?PnBVad1YY+DPx};)!slEpZAKe
z7{jyRVT;dI{`m
zq{}GgCo9fStW=zwNgNwYO|s-_$?Q=T)`#bal1E
zmv7aolipURv04)&WE4#;YW@gr!HIuPT4Fp8#*>&m9SLdK!H9d6-lWy?A^
zx^rTRD4wN3B{)spH+Nb
z@nywV72i-y;Ng(_txR#EVp`F0U5@Lby(Bq#+CuT4JpFR~;}8nML1^>IAQ#phhq7q9
z+tH5pk~Y{n+T-!8+Nc$u8RsvD%jKH}yWBI7wtd+2VT^Yk6B=w?2l7l?`>zu)z$=kg
z7_8&}Ku)_O@R}l@ofwyaMfCzqXhXX~?7A*TySvbXHf%60GuyF~xUPm8$8|Zb>uWf1
zR|!q4tECZfjr;`h0+|hNZ=w7F=~{UOvGudng&#(poQJqxEYPK
zGWj9W%jJF?zANN|h*t{TU|OwEnw+lklD|iV(F$!qfBo9I4`p7g3(*xtOyg_k38*b)
zlegi2%p4R>@Zu|wE_)}&;n&Wrn7yL0tZ{tffsKnBV~xd)lNwWv<&AS1CpOM&ENa}R
zv9xhaBN|KjaqJ_h2l30s*Upt#E2x9c_H%#J9EQX9&2!i?p85l(0l70wVd`CM;_SK{
z*X8WG`Zo7EyRImG6`BA!yDm#c`9wf#S8Y>gTVGp1|8_KVby@qXRjsWXZ6-^x(TcyVAb)&MKd>>gZnA<7v9NrKPWZQ}o-?=Dz0c
z^{~^@2Av(>3U5)3;Om|Ord#2slbv5xJ+kM06xGu+at?!0ZSO>mc$jehXu4^mGbM6~PCoDH_
zRbT6d^hxc#J^dX6J$;)GN-tPgwVz
z9~+g^a$J``AJ;1<#YZk4FE=SVuFF54xNjJpUDwXB>sq*=!Es%V>vCL|SFide=SF5w@3bmb_UYFy#4FB!)x(QVhYu(sZDU5@K=
zT$kgz9M|Qzu7UPe7#5^6>$-a~9o;lhM|x97e@9D4XUD+i6&pI*+S)@EGRJlGIlx_n>uG~Wyu%J#ns#8DEM$v+LpVL7hL>2>kYsjgqRxNZbo*Wx7$)eLOym=7Fr?2-OA
zP8^BH-MlPbbVG$HPWU|PJm{@W_0Io}H>UTfjW|3LoGV@}*zxe|a)F!hb
z8Bg%5h@yDOBWPcgOuUE2p2_&B%t`Sz29o`RqQtw=tEi}Cx{+5({5xC5OHx!>N|xN>
zx4Z;}rPraTL{_u))Z%F<5&mR6nTv9fbFmsl@<|lOhSUDPTxvapDDWRy_ILV-7yc~{^C&(3OIZ+lPT_N{jb0^8o
zXfs(hAf6)6pygDdo0WY~2Zy3E7cHmD(^%pRc^$R;%DpI`Da%nZOFn@0+)qA)G1Kx7
z#Fau9!~4rx^g2Mg5zm(YMadkYtKtLY5%ira7ocRGd<5x(k2Ti=3ZmQ0X2sS1oVBeiDg
z1R0N_qz;akDW!3VrB;@eq5aY_E*_jdAmow)6Okdz
z?Q$L`ozVeI@kp)J7cm;n|y5?wq6rZrkT7cbPr=-@|
z*5$1^dX<@OJ1fS>Gu(%}TT!j6KeSA4b@FQd@!#Cu-?X59(ZZS~4dL%{d#FkC{PG5Z
zctz)?#+GM2&+vX>H2Kw}y<8Z=`x=(Ta5obTgTGNVw?{#f!M+EgPjVcOH?3iadHhN#
z3^8N17tK!yGf2g}Nu~#%i#U%Hi?F`oT~4bvd%(+g%fYpzuTEndh{)Im0*!4T(D?Gi
z?cx4xhgGI+PZ7%N6;~=Ap?Iv~$%^k#Y*yT$*rT{f@f^iV6t7hLtm3tbUsAkL@g~Jv
z74J~INAZ5e2NfSxd_wVQ#b*_tSA1FVRmC?HaieIqzf5t0;#9?%iU%kjq*$%ESaF%+
zD#fD|-==u7;^~S_itUPLD!y0oeTwHPen|0SikB%~rTBTpFDTxi_zlII6>n3#Q}JHK
zpD8}1_-n;Ur~HbQE=DIoTYd$5vPhni7Yo5}Q^{w&&LfmHPC(*{DHPL4>WsKE&Y&~V?kBEvqV*)YIU7Gt(_hHaN`~65h&P&gYF4k#ENFU<1cs
zI1>LjRJ=y~Gkg*I`!i@a8ENivUa5FqKL!7`50c)^X!9Bq8f+cU$u`ZZZ(;zR*KM$M
zZ77H?cR4N=JkGdWF3&FaT%>IuB)vbQBF%&bTXz=n(ed7n@pxQwJTMx;c$Xn<`ylC!
z#YTb)34*Qr1WKagwP8H27sun()~?_6NZUS0di!C#?=qpm*72GX9j`Mo9S;zk$DB5;^#Y*M#VR4_f1DG%gKk~Gu30yA2J@}8V-#}#kkPOz3
zv?g|aFTjLF7>~!K4O}+{qCFOwU(4m9koN+-+u(A!f4EGH7liXM8MA|2IJfK*ZFeD7
zYD=DW;MnUIkBDQhQ5PD+bL_|Z2TC4}{XJNay_+u=TWD}t%!5=U<_J1)KPkfv$<0UU)+Q6}Y!Ed=4g{7av0g{hnFGIP=
z09K<&-j9YcxgRBQxfyXnN^wXP%VVbR*%&P;bx4=W7Q|!Zbi`#sdUdSKM{GIvwOFTd
zG65yyWjRKkARj}^iIPFOLU@^(f1I!5^d(ob%--U>53}33vsm^g}6o@M7+SfiC8GlBV8;1L~J?s4Oq82
zISX;Ud=znm%tGxF`3%xaR;^l3oFm*gygG&Dj>yoKES(hxo$`qy!#~>iqSFvR>9!D;<9uYY7
z{KPu%pm^5fufr$SNu%?c3PyWqVqHmk$w#aYCeq_Rk)Ft*+#RuwDaKCJfc+Q*-Y8ny
z-duCu?8LfHPei#qN22o{KZ9u)=)mg(*ygru?C5Ok=w6@c>}Xlv+Ui^G_760-o|%Dx
znKS1#YJ*usWlcaf8{Tq3b~bzkV`@V~Mw1Oc#3d8l(wW_NWbSwEN{tp0Jul(y$n$}w
z{uZ;FyEk?rlTXK_>KjwH_qJ=|~T2-eJeB_8C~
z^)9Hx%f?NnU|oCjz{b9iAn)!O=n7gYRgAYfb!VO(l(srTo$q#o`PfN>I`76DpU&sZ
z=u;c>yjKmwF5%PhV4G*F4a?d5+ikNz|+{e|%8d|8%8e;X{J
zat{ik$H8fl`9m^Tzg!+Yjq!L)+Fmz&J7sx-kou^>FoyN&Dl;pEj=j-uFLZgJqvKH|ac?d11%5z9t9^JQ9e*jCgw(2xim?^xZ
z%@V3fWZSAwMR~TZ`WBSTkw2p4f%0?oohy7jI8WY>bhfSfwP-V6zKJ*^cOb5kpChi8
zlM&Yl9hzBNbzXpLC5dqs35_}yOE1>EPR>VMFP9^3kb}`?iTnrBOXU~X(q(ct(#z#Z
zv|k~YB3>zTFoNaLpF}Nq^uM7Z;L+o}LR(w)&8V?F`c`b!-;Hrb#G}Xf>LuXOPh|JN
zK>d4WZLER%i)g3@>dK?nVJ~m7uc$sPc4$x
zR{d>kskZ9Rp&co8PCo;w+rU=65K5gL7obx${?%4}Ym|BpalV(@s`IL9NpJt!fgL@(
zt$Ha<*T=l^#`J4_y9$gl0$Tl>XuL<*s~?b%{YPr89<`md1XS0i_NH~6J0r;xqbw#*pN18iIYz$-cpO0T$|xTvu%!
z|7}P3rX-hKA4F^ShqU(YCEV?A!IA6conxUc{;H#<%fZhe{E#E(OQxMfuH%BwXBfw?
z^TsFoG{-!j+{3U-_;viM9lwre3-Ae!U-#!>PqkOyR(|~fK3ih{|Cge(SI>9tcRYJ|
zW)6A8xhUlM6AXq4L`%a$q%e7bUjf}^uH8v|R&;BUJ
zE5u&?Z@2|0glFG}e0OC1xLk&N@E_eDXJP&9dkQ3j^~>ei8!#S^NgM3`CE_#~gf=c0
zg~Rde7h*DI2ff1IM=sC)QLNOKJngFMYZugxjAySalxOeF&$Cw!QiU-V>r{owwOF^d
z=DrR6I7VFted$z^8O2I@d)?@sBp?S)I96Oh3SL5}yI37de^)zy+f1neYc7D0Xz%%KH
zn09t_OnaylV^m=ZWZH|fRbh$^)BcsrR}Re2v~%CsFvx&C>D`RFJ%VXZ$ecuC);7@X
zmKJgpdpfh;{2dRw^y3%epZ4kN9K}A+ff;W{Lsyr+0n@h~+a>_B=5YTlfIShA;jV8FjjB6)n;~cu6#<6XcvDAL
zZ)Zn)ThqEMlXCqQAXrB~AAXbI=fjT@{QRQGk(EQI`VEGr+wDpR)cT-j@V1WKW8ZGq
z%+c+8Al*)ec_^-(cMMJ&#=mFU9NvTD;RPI7NMovLoCabWpv9bVh
zwi?V7l#G{sFv0}sL(7R$igbm19h;f02J;KFoGOoDb*vTpYiK`ReuX8@kUyYyUm@LV
z)nLft?k8<%la^l~t`rKT?JtWk{sHn9#IuEj@ErLyS{^93q3>Mby8){Pa|_xWESI70
zAx4K}zI+}nGx9aWRdO5RYH37VBmCrSfy_qBh4KfaYvmQhRt=^L>sBY{A+DE85I4wF
z)Gm>0kX|acV@sFG50PFj_hTKb8VqIJtQGs?s9ohHe~)To#omDass_`CGOGr|w0Lpu
zxKcKu_4k-LD4gKMS0G*XPK-kcLVqQPuU9TA)@GILd{=Ks`
zN-PaRB4=@EzU^ltpYgZ%gkJet*1@)$#FEc4wKh{M#5?M^HR;0^)Tb9LtXfc2lg@M*
zW(8;r!!yk-9V_~K)(xPbxvzD@3NE3pKhtGdU2waO*zNMNt?2h!VmB|1xS*@4tGT1w
zYwjKhk36FeVMy&=t@^!vWUv3j%{zuu`KC~bJ@Xiw{?ViE?F7Adl8N+a;$;0>1V4@i
z)@wE&`H&bzG4pg3_86?sT^3fF_IMzR8l|Jm@T0i5!lRJUBH(isH3|4kM4V1Uqj{R=
zCwwfgQ>3{I^M@-Qqj-|y>56L=*DH1_n%f}s|FGuyjLY$^Q2eywHHz0OepT^Xinl1<
zu6VcNeTok#KCJk-;(seXqxdJq7Zv}m__|^YH{D#nQbjtpVt%sX48=;txr!OZTE!)b
zhbkVSc#PtSil-``q1dX}q1dCiQSltb3luL>yhQOz#m_2UtN10w8x?O-yjAfI#d{R*
zSA0*vmKthOvr7=I)*~ILcUkAeb|rV@sZaC
zTSxu|)9p2C#af)YsF%X?6rKnJ?uQ(r?Zc)Aq0J|m&|vG1L*AxYbvxRT+q1#ek)w<*
z_cJi<;W?7a<=L0ZX8sKP+dfEo4`aOZn9yMBI*@0Y+s$wS26%-Bj|SH9e?ZZ;I|8Tf
zeB2qAfkpKKOlU*9Lb$HW(e5tvAg_n1G}|#A$Zf@VK{x@G+*TXxcI4WX{s-pe659x9
z+kxv^yudJ9el#4{wRlPGcG;DBWAFM-j<3N2^c#MHP2Lv$2CDaf`HJc{T#BN6I><9n
zZhZ}Y90zzz?m$UgZa{2(4gS>h_4ON8B3&x~7x5TrMqDOQtJ2k&;%xnf8XQCuN+R>)8+%glC6Vt&$xN&$
zc(I5iaszU_=~Mj%HbThDy1hB{8&+ZShtO}(%PMvmy$u$@uC#H^weg}j%Ipq6cm
zgu}P7+|h4XTDq++2c3w6BO<}y4$x6#z)`6Yq3;UsO+rLk7Rond%wiyS4Cy!m5r-Y)
zW^nH$9@m^4`UKoTO38NDk1_&s^s6D~*zoq#A+4QE>i(?j>h!AjK&w)x;lP_shEbs5
zV2&zs03)$0<#Rpl?CKSrU8z4GQ}NKsd6}trfZ{=l)ryN1mnp7NJWBCxiYF_cuGpmL
zd=C2a{7ya>V!kg?EYz-)0*vhUBgLWYN)2C%c7M@!yUVV07Jp}W_+6riN8nxSbI_b6
zoLwoVJqY+InouZLOkR_HxbGOq727oPIK)iIwJTkU(j946Iuf6QN9Z~c?Dn=H9p#h@
zwJUuY1VWkvX|UsMt6gaYeh)j+uJk~R_g%YkK)Zh1YFGMS7_Sh!($~OI=i|otuFtLm
zSL;n+S6V-qUyt(ceyz1D1=qgNuN~g5G@n+oH+JMq`y=Ey3sOp+j-x$PN}hsaA%|(d
z4n_Hxc5=wsO#4v!4MQmL&
zO3D9=zQZx?-^9p;G3~y7!(gWULace6{2StW`66Pgl>A+!ty1!%NDr-){J*H(5lnj@
z#u=GX@~0Y$k?`;Xad>q^P0>{xwLE<8n3P}`VFfvi#vsB
z=kBoq?=ypi@I^1)kbVR4=x5r;6iY%Xiv;IDOLY`r-0Ns|N3%Pcz3$9_9vlrc`yl!f
z?skHAAiGf5!JbDrC!<-=!BOu6O`9Md63Sxu7P8$vP0jsXt-Tw=qsP25%46Fe`t>v)
zMTCMIE$t0q?>rqFvVJ*Bg4~`>vu{-^nYRn0$yOLNTO>qpW_aI%`_V{<8SAyMAZD!C
zqIrIi8it+8vvW-g&~NB(cD@L`r!iOLU7uBaUh!qcR~6q-On?Ak`!dA|ijHUZ=jAD#
zkKZdkr}!7eR}^1U6y>o?6w4JW6sIfBQ`}zt2FJ7aZ|EQB8)$Cvss`H68t|&F@Uos`A|=Ii4Lq{~+MdHDP;r_UP3Fhqej1JUdMS3*p%d)k?kz>`5W|4PVE~9ii()
zu-n^)bd+Z=R4bW=uxSpY!H$>9vlptBJOP*9LU{HZ`g-sx8T{|gWrPHa40br?HA(J*Gt&-
zwBENNR7O^weG@N3$#^SzL(Ab1w1Y>&4=@*aBqV7Hp51&H6L=)N!*ob~7Trr}y`7I|
zpNn#l0jx%m{5u-P6!
zdG;k3!D=~>n9k+dWA8=-)k%(R#_qN{$?<6zy{r+@8vKvVpbAP|LGmh&Qj+-aCbh$A<%rMe-c*G7`--$NM#x`pKWV<^lvV`sB$Gj^8n-EhQ=
zUB}96#$N8lQcEj~KtxwgT3ykA4`|{CdaLn!P2?E37aPX961$$1wbIxnp~A$PsS|`M
z6Uk6zqBNh%#F$)_i88A)G1jU~l;^5Uq^ji5X;@Fgmv0NX&WrlCkn4esdzN|oz8KBl
zJ={Bf2vfc*YrC{Pie;xgyUcMcJG5K(E>(>|j}sBMYd$Buc>zO^;mFIctV
z)2cVsWxA@nd)D<mnk^DC$-ak5qiC;%SOT=@9iaL1I5^yS_~Gcrf18
zw(B@MI8GhY9t0fXChQ7My&K1c4R*OlqJX?+qgGrEvg2~JqgF2t8AFEfo1|0lZ~GwW
zeHm>E;ncr?3&(NnpuvvOhJ19n^C1wm56ZY)E|1q6;<@;@eUSA2f{HW~8f;xIr%qdV
za<&|gZ=mgXmmzKYAW2KXf;jcJV?3@8$K(Bm9q)RiqvP$5@e1M8so8ADBfn(F`<9N!
z@46Ts#(2{Vqv7YdEdKvM(YE_@fwt>oah^$|uMJ!-!#((q?vJ*}{2>{v-y=w4*Y^TU
zn2+)1+YHdo1revUAe_eKqHqdIsQJR>a{q9d7%vECVKQb1xp2H(ofv9LZ^_fHx_(hj
z!-zQbMM}F5Z@WH_k5jKK+Vv%x4%Ufz275W1RrkFQ
z?pW*fD61azK3IrO%wA}{4pzM#^InL_dOlWNT@D&?7~f<)!m7s_F>>I2Fxz@v3HG%(
zc0jPJPK>c$e_=ciEamNAOYqL@1TRs{>E%Dqv3xZaSDl!6ai|j$hZDlaIYT=kH2paS!XOLw
zV(;519{m>VQe2TJo#E(pCtAI+qqEIX>22+;y`keeBLY$%yf-j5*;%>5jo1gh>wxQ<
zfcaKefI+@>LvvrSoO~V%N1z`Q47yE5>?5Ps_cX7B&WPO^vDYtJShFNzZ?Ae+NA@+h
zhMo`FdIoy?dfGhisKX9hnx3}`z6#POwfFY)cMSCOZ9Yid8{mr1TeP8gcHS^Jo*k2b
zusu9G=dmE3-T5GNJUjRl^2Uy5_vay(XW!jE2rb{f8?|Db4?=TB4kPlC4BNxEM<0&C
zOqh^s!(OOX%(uaPd%dhy7~>V96>}EWuMocdHyE!Ft(Z5kQiW*6
zqzmNR&yUO>lEL=o^6iZU^6i}k^6eKF$hTjPmD<7y*I@Sn`1XbMBjDSe4?-MZ&IjRQ
z>B2AC`5?rNi}OL)*IEq=){O5)&)TzARaIyGu}QXvHdM(?7dq8
z-1#7MJ_zljg+b?o(DP^uM*GfN6mM6&Tk$@{2NWMxd|dIr6`xW3lj4hte^-26F@`%T
zF0WK^oZ@7~8H$yPa}_g+wTep=4^=!u(fJ_s=hyilY=`KE^Fi2%-yOqRa7nb~24!P-
zAIo()AB2V3mhL(qgo_r{jezS~+^}$w-+Xx6QYA&R^cs>LeGs1sD
z*?@S8__n3Il
zEaN~S@j6#7K%05;5u^{2sBP&DXfxj^24v)3q^pDuUaN&}5NhQ2h!==&TPhf#R>mV<
zB!^<0#WGkKc_G>_5nmbkF>K8;@s*KDxUP^-AzmpNjF6+)@Gn#p6@8*8*@*t}lh8mF
z8{!wB#ws=>@+meXjABC{&NL%ZY>53F3kiG>W}BJ*(5y}B1RfPdSri;+^FgDhmXc@SoxFmRFTDWGd?8*NEplf8%NH1H)*ju~lD@d;PP
zPrNejya@I-wKVs)dpY)PZPxu$cMqt5;K_eCafx|I9Y-lTO0mB=3KQPoBu{CH^P~4}>d~b~*e-?~QzJ7Oj6x`D+L%Gj(5S_T@
z@X$$NKv^#iPKgu|UKpAJNB5sSaM&c|xQ)0;(4FsM@SbIpDOlIuJg~7Ze2voGGtd>Z
zRQ3$7Q|it|{i&qBN5>^!eWo4;uvf*p^fmrb+$v*1@KifDtaYePYFxmzZL
zc8|O+pqsIS%+*!61r=%3*^%P&SwG%K*!8;}X}b7(+O8as+re-T{-gV2Y=L&3|HOFn
z%?N&Ex0i_1R1oIj2Tog{kAwB(@SY%~LwrH<$aqiuL)p?^W!t!o|Jl@3`;n
z&?t7?_efm(St7;p-094E^LKoII&=I&`~%mm+t}SY(9zSKfvGT&W%Mx;%^OYMj_&mt
zU$hr3x_dJH1I?{xX7CB_06O;c`Gp=@X*Vnat;TYGoNZuM>M
zbv*Z*l;<97keWq<+uy3s__cP`Hg&f3wFQSxM?+VaHE{Lm^fgDX9@yO5u7!EWqWy90
zLZ8;xmrf&Rz6ZTZgD)<-vic4oCqHUUX&v|NT>F{l5XXJ<88Z4r#{6#JzMWq`?`b|w
zfD?FD@p;9U6`fx{e||=*_ORo=N6dZWSMRuQ{Jetz7R3a|eLL=(oPVySu;ae{-^U2J
z?*=vGHVpW%e)<}0^Wp8jm-{bCa_qi)kD?DVYxP}Rf?u>@zJG&6^ggR3o}kea80@>q
zISwHud?xF1{q(7na0>51pi4|!TX5u56i!};qM`lt`BvZL&4*^bKZ4QnG2c5+QTPEY
z(K6q6VDHWpisa9d_hCJ=neVA6&t|^2pk$8x5iPBsJ~|(@e)^(T-@8{)m}Zi|GeUG7GIIX42GUznHGgjYYM{M;y0!3l+*13NAB8tM`!6^p3HLGua
zsgRfXejBz!neXx!(P*&CzEm>{XGX2Q$DQTL#jy%nc#l8Z6WD!IU6{g5e0e&d!;?$>
zTI9CV{(G>!cS-1%FPYCTUumvizA@G>UzzpGH#XNVU-{5}`S4SYC4Gl|fw#bM#)Y79
z;ztjI{;H!{O=9or{S?iRa1SUeD4+w=Du^L;k}!}FDCpq
zDBV3x&HY`iy&H3l*|Vi|`358WDLH!Fe_9!eALq@2(+u|Sm$t_?obyZ6
zu~FWd&G-`-FKq_{+VOI2#^*)G8-sS7BaVAnqz{tbYp5v1X1oF8u|Ma9Y^WXYdZg_-
zAnB3Yq#3LYwl3FZyfHE!-&))8a(VMRF{-9Q~
zwYf(!SU*ZsVAuBoOh{wA`8ETz+e@^^BCC((a#1*(%{aeVn9U9v?0C7n`Ds|GEw&NR
zwyUmRTvIy|oALT3Dz7p;Z@z^S0h(%&fqD3rW-5<~%HE^ifhn=fd5N(ZzYr(ap>4*E
zA#g!9<704Ogf`>FI2yp5M{UMGhoXGU`FbxyG4cfY7+Ox04AK=c*k=4Gw45qYoALe7
za=P4$>6#(0pmtvwY%_ii#!Smgh%3dn89xoZ4v=+-XUmi5JG9OC<7jiRd>MTYkwR?7
zY3{sG2HT9Ei*>7$ixJn$)rcF!w;BIB(o4m+8GiujfTVnLy;89
z-SDi(GpX-@kIj6M6sA-pMf*xVk(9v>_Ts*Sy+n?DO18tjH?2s@H!#(E3=Lj{QhT>U)H0D0%I;w`LPQi2jBH8ApG^*uHCH
zr*HY5HKnR!JZ0quzb-1Iy^{#3t{+qX9j{n9aAZ!o+&3P<{|K0|lc{LcD
zd}+PnO2s1-k5xQb@g0iIiW?Mr6gMfJqj-tpm5QHLBuByJeo660MLwdj{8mL8J28Kc
z;{A#bDn6?CgyPeR&OY3qw{L)~;QaA{nRuJxXtfU?DgS*Np5VA${6w30pW-hRA6ERW
z;4!1qL@;wP^6eDd2E{9k>{qKF>xG^H5+jo5tIQv6P*fsC|)u=y}
z;C$cpJKuLI;6T&4#ZV2lTuOI)PbhWKvJOu9=y%ImC2#ELY|FqGVl^f#)7{hEo@sAx
z>8LhjOZBF@OjmVx&$?dgMbXaY09_Ua)KwOvm+k)0_hcCHPR8$xRJ7R+#$8qCwQgwc
z3-%T?Vf;Q(pNWQEtqIzg>~5oG^Sl^naK7&bnz%FT+e0Pg&faFL0-{qkSZXACAYc-M
zJ66-fd-^+|pS1a)wC_oFRB@}p!wC{G!-j+C;WH6&IuVWLX}(&qPH~0e;flv7
zo}_rX;#$S^irtF+iXT?|gyI#7pH{p^k7I%0o>2Uq;&X~GC>ov;kEtWl
zWbSM4RCjhA-RpX+YrE!_mcI5)QEiImzUJ=r&i5U5gV%_EhPB{y$QAQEMSh6?Ja;X}
zKMtWF9E3KX402)JaVU$nyB+N)>u7_mdn*c}%l!<9X)cG$<=NLR_Y9-ayQXxkluQ+Gb@jLX2HdI2W1pD6Ua8!L*l}Hs>vCKd=m|quIIb)D-0Zlnh9>s~
z{?7RV-*H{pGPTj)o#VQ8r$aW!bvdr<|Ficd@O4ym`}lnClH4ZE?UHWk#tq#eYujvH
zQ)r=8khOpcZUPRMn+T+M}e
zfF@`2Ud7#tA6C3vagX9Piq|RLsCbKF$aT5n8FF3z`GzSR9wsb6Oil<-@g}(6mTCrI
z?a1ZWG;3-10*C<{Y#sTVAmLJ$^
za$O&Lar<1x`OjG?axncL#`|2x`M}6jd$kRvAK6g$aQ(cLFc;$FSoh3
zx^{C{r&DRBq)T@u9r|reWzfsWb0_WW>E4nuQO1uk`d;Dp>~avcoNlSKAU>9S5>|~9-6Ak$Fw-H38)=I6V3xu
zFb{sLIERxhoqB8^<@!Z>(vIHs&=>YD_j3HO_0C*toDU(m1VgOk+VK
zjHT!eY$M4Ba5{x5Un$lKI(&28++Q_^?x4drkCw6IZ!iqVon;D>XVN76hB5T(!ZTIK
zb%m3V2MGxObGQ92FPHIn?S4*|Ho=PZbZYJD*AFsPqRe|(*Kaw!eA;K6U`%}eWM_YC
zb0@w9?AX%X-j*_U?nAyi5sLrR@AbuxKhrXHbzCAKhiS-1HoJ=Lo&yp3b%k7)$8LpO
z7w(VJd=z5Nb1$>ZhG<$XeI9UU69`ey3&JgonlEI0gYX+h#|gh-#9c7BtFx5DYE|q|
z>`~mV7;;_ic!l3E`sa~ssgUamzhNAY0|Td)w5!mG_*RtPYubR*iV2VpOSAhlzU|zt
zbp&e%uB)Lw+tf?ZQSQ-xet$aRHWm*K-gt_x~>JSWsQ)q1>3e~U@(
zrx}FpnaA*`J}(*ib#c_aF%P+};5|OmA=l+Nug5r$n+f&0+;LcdJ1~w%x#AMV2F2Bi
z>l9zFc#`7jiXqqKj$^3T)#p^S_H=c%uA|N0DZ3!gplhBxvu{V
z*Hv3x7jj)8*A;SIA=edhT}oQGekk2NO*?uzn+G~N+nZW_#rdw@v}dZ2>k7H9kn0M$
zF3UoNTo;Kq-@DN}mp1ozwf1iJ9sja@3CO|ozxoYl1`W08;cL%#`Q&6KDu&wh?s$aS
z^zJx>dR^`~gnC`+gc_(=6T)v8!*3XQAXL`XE~y;>*Hu$rqvo3m-nQZ~mZXYJdEEWpb|K~#nCjdiy~mz`FTmoC;NviSlRFbFW?hIY8fU?PlbRRuV{yJG
zj>PhRW4;)RlaGodV%wOLyju(;b`v7;HZ+Sw^5>cl&f?dZFU|6&@w>A`{sXS%Cs3I9
z9~9-w23k+eD?y1Y=K`e~O%J)z^OE#cnwp@huJWSq=@|64$ajBG{{BYTb
zR&%5k@mwiDpY!BpSk9N9pzQ*=0yYcfBBU3|Bd|F_Za~{3<*TqMle-a@%a0IO$P$;;c2v5*1>YIaQfmUG7IriS%-dVgpVL7VsJ>xp0$DWUV_&p;la{8Vz9>XG6OgRdD#OEMtEcpzY;w#4<_9V$aVTkaR
zF8xv8v+B#)zItmqi#V#$2g#fsi-3X>OL-SL&<4_KE-euH(1qPtCDvIWB!
ziN#uInTQ>MToGw(nH-akp^O2|9Jw;t%)%Mm(KO(%V_d5vQ)9)n8-K1N(_#}?y9hO0
zdo)_;M3XZy0Y+r5Q&_mFFp7CvqeUoNRvK9zZz!F#p|~EkvH8vh{5s=POigroVM8JF
zc@tz_vKWnKBsWf-AmgXv*P{JE+%XZ8XmV9yAxxJQvWcL{m|_$b7NQ{T78HnVC}vGz
zDV9-*g^gXxr5J+^#WOL>Z&8J;F0n-mN;VWvkcoMX)6Oly&nE6f6V^5|^_HWs3ggh;
zE5mjNvuffTjctzyzO%r9a}*L>|$_I;3BR=9ChA-IC8*U;e0o_t>(-d7l)GuVTCSBNIY6xTs&o3
zaePc(beF_sVMK6_vybG~d9JBxOZWDs&3(!8BPO*N3SKo6_e%q&AM@eu);G&al6|)oawu`4n4wy8FEncj82U?mO@CcnGR7
z%eQ0+zTHF|ix%5C6O1cRuc|q`!bDZeN07@cfxn@%F>uIR%2xXuR{m
z4Q3!j&7G=W5H$>CFwZZJ{19~}nHC%a4$Q;|V*j?L)tQSaln39U7_D*6!D)Co{}qP$LVmEt6mM6&Tk$@{2NZv-_*2Cv6rWanR`GeomlXNoGM9%tLxbiC3;79}pQ<=Z
zagO35#Y)8*#pQ}?6pvLrUhx#gH!3zMwkw{kxJ~gK#S0YQsrY`yOB63tyh8CR#m^~z
zN%1DduPc5_@gBwRDgIFLQN_m<`LN3I`kmq*6<<*Nhoay%n|Aq%MT*6W(-jvgE>(Q9
z;%>!{D_*1cMa7#GZ&kcgk-|b;?gNUCC_b+El;ZCd|E&0uB7U&$dMol_p8XXo9!A6|
zVkr^t7dXG9@r6}9O_9H1+VSz7$mgvHo{0FI$~?L>c&XwfB2E>YUy}7Bnj>_eedj<$
zma{-bu9Js$_Oy0(^bhoBolw;8q_2C+AhXVn?shvXY5zdbanWywr>8C$y;4ucSIdvF
z47&k`bDAz*@Zy9+#st!3w6mce392~RVC&YQ0Edjzs1@g9f4?1elac2xXWzWKY{b89
zgQW8j*!+zN4YqCz@;1$?i_pQbYD2Jftw;x#`%fI4JPx^BF3&EP=W5#qN#`L{q?piP
z>&`(w*xy)OTx@?}FTDOPM%uPv7tfG
zFlb+9LW8aQ6!O9T<_7xX)!6oTJ<@E$YaheS=x+*sqc*UP|0E%UcHhHFWt(U9J8B0o
z;SaD&X_~<0GTep#;QEyX#t%tv{T@OZyS^7-0&c5vnzywcb}6hduk}0+ak<<-TqgSS
z!WkHhIbO~mTeb<>t-wk>nZ*v=c+JugapMg+bK~pX10|gskM<(3*g2L
zBPj{a7@fEdMd{plDVHbpC>Pm@)riQ4VHgz>_%Zo5%HvXm11e8`V%lDb@`St@=`r$K
z#0BzJ#D&sj&Al0y06awb~M
zk+&e8EB{8xJb50L^W|Q&T_BgBWTEUrdXYR1n-V7XW#=wXRWKy0=CF2kDF$~B1Vf!u45G`A%B$f@!5F1H>sA%zT2~y3IQ-%^QaHE-&BN+YI%{tv!7M
zDSg@1+}YXG(be18(cad?7gzqo9Qs=HmkWnZo--E?{kTAXyee}avj6LKn|L3?@B{QWE8k5s
z=JxVGlSBVKF7>%^=;XXpXm5i(cJ4w!aDSW{7(XPv^~>bY%g`T>NgM3`AlhS*b!Tw7
zC>)MM--*GPV><)d{&?=fA?JlQtkjcU&bI@HUbpx_a_IRP9Qrt{vEk5vgGBKD%jeL4
zhz$XU{uYc6h(eliR!hrSavIdJIbqMwm*=r5vUmqQ0}
z&WV4NI0rv|vsoL#V$q;crTg&ex?Z{FSB;}W*}!PmUM#Q%9@NC%(U-;11+@I+x^fd=@+hm-}
zN0qPnDf&`s|Ib#GNqP7Cly^scSC^%@-C2c;$+
z75Tu<{OyW&Dc-Lba_Bf4gdDnm!bS>wj0qu!9&+d*hweE0fkSVo8VQHqP_2~v@ER>=
zWbs3H4!=9U1aE&bnDoi`T^psAKOhlg(!qg$mvp1#-2m`;^y7Rz
zwOobrgd7ihtJKnqbfIw0^Re=J#MT>q6FMFzRVc}()N(&Icarc!zR7Yb;wkc5SWcD4
zk+w{_tJLxbEO7=T7|5jGh}v0l6iQ~xyRn|>N-gtHp03mqMW6HJZ?K#%ccAS8;b$=m
zr4MP#q`OKjUxH1Ud;@X0d=GJj@FH9(&4{bycZjQH71m*~0M|z
z1e3lTRTCW78+|+a85xuQFSK4Ur5rJs^sQ{}x}bwe=W7md=PJ)Ko^{A!%fOkhX3mpm
zd8;W*?!XF1`EkM~BmEMkKub#rzXbr3elJ^iO!_xqiX6Xc0F!RM-%G^iAXoGZmP#g_
zegg~z_}`mo3+9&iw0Qz8aBe`+=oWG*$b*baX}n+p;);miJZO0YtL9?!BX>+6
z?H=iwOkx{!YC;(oBizy-%D4o@rbiXEZhw&aYN&tzQ|xvLhcusVHxlpjm>eaX`dXjm
z=ZhU9&Fr~HQwa+yS369>=Jw`+?R|lFoIL}+v%l+KPPhEpv(NR~xAwIz@tyb&K{kD@
z`_>7nWA2Y)$nOz!eA@e)s_T~SM^c^7FhlvJ^Ijp;bip7X?2BJI$1xX87hKLq%&GGR
zn%pFP^N69Qi#rZe`D}*q2sK^YaX8SLE+ggCzs<)^>@Pmd6Mv-mnBvbB`DoAjL*FkQ
zXM>Pa$63t}_(_|vFPwVt`4@+h2^$dGzFEL?XfA%~UxZ(9E`I6PfIZ2@Fa49?TqyNm
zgI%Xq6pX=tqgDj{$jL3EnYnJ92efTy`ZrXhn9yMBGX2u&M?M}l^mFI<*#0g?+O|Q`
zp_X(me(Chn&c!dC4#8h##~SRiGPPaK4D^Q~_tx)vq}hhoK89bQzg+y%|B0KPT>R2!
z;yjZwJ-ZRdh2bvz2log4zU}xS>8)R;U-}C4SH=!B*zG0SW06%`xm*+u=a>FI48|Po
zi(vc9^h+PWNxkSEk`;|l=
z3iIEILn2?+pnGVYPe6&3a#=DSVop@#|52g`{v2I*q?A~rLfL8mVERCxreV;S^+
zz<#>?2uqw{^iXCR-}PCt5GAvv4eNQBw817N`~;&^_%YVuvK0N#k)sgLmEWOcp3qZz
zzR^`*Am^gQGUzwM<_Nh2ZI3j{>1A>SEXyUF<1d`!FP!5~`7`fJ_aTJ0Ee%7iVnmAD
zq11NB(Y|tyHmg3xYgkAm_%jR@w?oBkk2B_Z`Or|@9!=aU@0x9hdS80GC4=>|`E=xm
z!T!q-r49t62@=%1Mjf9YBe-3~qma=L;Bysq1o%uuG}_iMTB!L-#acy5EYfbR;_DSp
zR(zx4CdDm^-HQE+?^gVv;-!ioQ~adj)ry~2R5enmbj(*7~U
zUnu@s@%M_)De{v_+S4I~7{%iSk#dUbyT&=iH@%4%)
zDW0x)mSU@7hhmT7cE$4)FI0T5;%>zcD_*X+NAViP>lANPyhZVL#k&>nQ+z=2$BI8y
zd_wVQ#b*_tSA0qFWyLrikT`yYiW3!6ie-wYD85&bYNBj+nc|g-S1a<7i}gmQ1Nb$~
ze@l@Po2)lJ#z1~3%=}Lkf2C;nP?Y~k^Z3b(TwB^#aqj5e++&rVn_F7?+IIv=$mYK0
z?k(+5kZx;l*}kP|Xj$l2ssfGU6zh+n_s%dbe}DoF*h~{j5z`J&w`((!u@~!REhFW`nJJ0}5=Kb+^H8
znl%d4y$^&bSOLsuy5F8|-r7x;_NEJJ14Dmhq?Lc8teAw-x<);Y5rxx77x_9hqF$
zr!g+Otr5`Lf$LgaI|8n&rhXrFj4{VwnvOACm0S&mUm}5x@q+IwsyfExdBA)97dC&8
zjxi4dxQtRX7`zvKKL_a;^9+=ej`2k>jLJz^%)aRuZ^Al_lT}!y@mX|?Z^h=O^Ioow
z@#AP^d9T4b#y6sNmegY1W(#F<({+p~Hk7WxFab-SCx3vY^&E9|jQh}!^&E9|jQNpA
znGw$|7oKb@wX-wmQZSV!76H
zbOCy>o};Q`Y_8&w4@MG=XdgQc203_+mZMMWIXZG3<7d!Xb&Pq9%%)@PJCRbnI7;Sl
zZOMIDLsW3a7Wk7kFc&L2o;gp0flMoM#<_X#I>t)r8XaRwPt$Xh3RMi~a<87FvGZO%lKR5>HD=05&)KbYYjdBsPMdpo)OeZyoTq4}3-#7!Z=s>{XxH{m
zR}tCUMV!C1t!H~nr|-7uz8~4q+1ciMZ<+(j-+gq{3>iu9z&dmoN%zTRD1TAj!Hp))
zGWfjc-e2-I$qk3X9Dq1?xjZQz{JE|4i!(ea(D0KNNe%W*ac{YCZc?gD<=CgjQildohOOM{XF<~7X*B`TZ^
zD6oCAjsl&z_=|=*#vCoj`2hZdTsHkr$z9X`l*}l{ocYh-KRC{zjxh#A$HX3s%pW)%
z@R8B)H5Sb{q
zI>ry1wqHVdLN+2jM*fJnKz1T7lr32FSUDZB^&R~c%E!qHlvob^BPg*t#$UtcPLfYz
z=~jJV6Vg-Vr-&_w&X4k^%iplX8InNTnZj4lvt&6+W(z<0KTO_(@|64waj8(KKb=D#
zho#RGI_b`rZ=&r2`7~@63g78i4*f>7JyJdkn=-i>ak=orjSAsqxKfToTqS%pSuMxF
zazYzV5Onu?EXzl4353sqXzHqHs8>?eH
zlXa0~6}Bu&*=1M97{oahH$at7Ccl0JqSH!#4I5O@2^keV*bJyIJVY~3eZdHeB$BNd
zQK&B*L(4>r&htgPVNMR6;uj2PwpR|FcA<{({^iiaxd8oXxb`=Pj!&KO`LN%A$2nbH
zI|qE$b2wk!EKZXna@jq^8Fc&Vg9KH5)99G{FSt&@`Ps-sHn|$PL6cf1jYaO-(e5&s
zG`Dt!ovcdF`cuW3TK|wT*-=iUd-SZ?_Do8<->0+>5UFkl`jBSOLpkH7S0KP}iu=yT
z9w9~^!vC?gvNPh`S6+xoy9mH!9lyyH{UsRZQ{QCyYj~#J>DsG#^0XimCnzF45R)_B!Y}OxbO$aMM~Z+0N+RbH!MuV
z(|ptu^b`iMPKQ)Dr_aT2!*@=nXbAL-177JT(oFS?7jlJ#{=k+|C-pwGSNgSBQbJCJ
zy`35G9Ha}S1OCnGMBwdgV_TM&hUg`Iu?E>LUb_-<}(w0%r-79?^)?u*(
zz0wz>pBlLsOR1GlA+D3_5!Xu@#;`%YiS#mYz0!Yy^a^XlAa?IP;=kWr_;6a)Qf_NHe{
zyHL+Kz^HG;fMxMYPeRW)IdSiL#>qlg&-er*XPlfkR^^OMKC7BB_l^zt@W)#)f56yv
z{P=Qos~JmPv`^ysbK+y>#tUlVQkjZGa4KAz&YB$h%Elql9?lRrDty%UPOZ0v)OwTu
z=EQw%YM-hX%E=7TSBvQfNEzE*XpY}`Z*W$&$KbAMNB?{Hf|m{&%OwKlb5Vg47H8j@d$m@
z-ElZrcy_wTnfC>XLuniTUhDs?_@W|Z9@)N7aiStWgJ(Hi`G`jl@esS32nXAv6*)N+
z^UaDA_#jiuZ?r~%
zx>lrdXgZDfXIPJo$c1PBH~LGN7H(vhbq=z@{>}*WSAaUZ9Ty{Q+pve(*hrT?WzMh5
z^i|)A{W3(}^aZ+Qlv8Zug|+x
z-P~U_hwk8TK982MPCw#^{3BTeidA@K!oO6uZ13o7s{~n5-rdvPUf$l^;&X9ZT3gGj
z7gtnQR8@9%v>@kHR8*$@RkF|tsu!YDb_SQXimm3{XPw_hKaFeGl+4YD9Hm2T<51f;
z)Hb$1pF`RY+HU0NB5Unhh4ar1cLl2qUaP#<9S3^ixzVH(;@%>-aj0$VI3MF}5+2C-
z!71@-#m_79!%~*>^*Zr3#XA-6RlHyEA;rfOf1&tm#osGFr}(1czZ64lV|ScGZDWiB
zpF2jvKZe@IhC|}hjt%4rLv7i`%sv;
z9!1%78J445bwDqvr|oNmx!ab8Z#OU~S`qXj!rHssr^cl2PZDR^}temm|1z^M4(NmP_#A`~viWtP$-!WRg
z%<&0su80eaBp1^pRzwjF5MvWq7b`m36eiC`x1hrQAL|my@31aWbfYOuc4E8XMY^7r
ziP%!)irxh~dXat}Wemvf)r*vN0c~Tx1e(Kk*%`JehGC16C?l^H8_c-HUB)fXXWTYU
zogif0@_p7Vk&Sg5lgYXjSk|r3vTkEDS+}AJSzTg@xCJE}iYLg#yvAwgmcS1??nD!o
zp;O`FacJ+AVY`D_t8H9|ZO`IG8i5xnh8ljMdz@H2ZY7T$QxbDxk*Yme{X{wbHVpC;
zjX9q~-RSiboix2TE_ubNh~V^QpL0h)mzc#*X+)G_=o0GF(1xNe2h*HRQ&$?cqjE=W
zc~@n3&*omsQQL!Lpsizv?>*MPwWn_&r5XyGJA0aag#=eu!&Oc&Oh7JqOg7;zievnw$sE4{o#stMHTxY=6t|d*KZGCOtVqZ;)G1Hr4`?hV~dhzI}f9?2)
z+8;$oJ02Xg;~?MA;L{545=Ij*S!8cn3wTvL*w$g`wn~jyC<`g*@JHYQYok0rm;y+2GJ{3Y~$mBj3s~WXSa4#I84?6fx~U
zBbbnB$2tbm0X$C*XGj0L%;g5J8g{v_Q#*hO^@y|igdT%(yxwsd@z3yfTq3ghgr0^v
zyRNj`gB8u@6S_6S?qgUvem-o2?V}9^!R01!QJ{|?eJ(i;+$Q4r__uA4bbf@26cZY3
z-A?3#{Y?w>N2ej%-z7-fHtgchsBq~|=KQ)3A|32+A^PL`Wcq|&9cY831H!_&jtLER
zS$mKV_E#0?k5^^8ethr7HdXj%xB>m8Kx^8-I{x3PXzd=vr9PWa=)GzOFyT+IOKFAji3j_Kru&4})Ys*#y-+nGo}9CeVz9m7^W?w907743
z8^#A@Vn1_|_jLn_O9&oMUV+^MnFVvfiCLcfhpy#E&^#xeoGg1(HltNGp8N|a&&HE?
zV$oyeOvLFt`5KgD)3%}t*Ja44Sq1uQY0Cx1OkX3Kl9p6NXKe3Ym2VQ*kt3$uZK;U+>W?hcp9D(4;cd@55ay+^e>vMF;UDz}*rT*&KTiubPL*#qRCP!9mU7o$8YSI5<^2QAt!J0__Vo<3w+{65xrH6woIo1s9Uc80EghX5
z1G`pk?PzOj?{)?;j9Yz%v9)hk??8_~_@hX>*mt4}@aL8yJUDpsjq9_p{by&4c6C=%
zS93?V)7(Aa&kNVug}=}j>h0`kZ)>8Pysu^+a^(;^;Q1Bj&K>3u
z+uYtfu)WVern-9u{GoOCsQDS4eXe&zw)VAR*Vv=!6(|(jrtCNrQs~>YDCK_e;y$4S
zbrgb6EWA?-xpE8w!U5sRaRnsD5OU?APVwjP)I=`%ONuuseqHffiU$i<{zX0!VtZ~<
z{F-9Ol@Fz#upMWEkSjMQUyX3cn=o3q@^}3QxboGyjRd>BZAb^X*|7m`c5htyBe;O4
z*pUX?UnW;RGtl4OxbnZEzg)QTGW3@VSI+N?bK%OD2Kw6@SN_!;x$=i`lamWq{ukJ#
z?BD@;Kg4i1{)78tMPU4p9Fi-alp|N(m?KxdDMzmSIIPrDTyYKdH~?3^q;@1+c|(=b
z>BIY!AD4|QU*CHyS0PQEcrw;z7X8ZqfJE@_)91^dG~8l*CodU^SRZqecO*K3U-`w%
zMdExt1zBR{%gx2crgV=_`j#~<>e?(=gafa+dMNv
z-+cK#+AfeQVY5))iu580`jvC0zcMq^U%8p-ufojnS1HXXuQD?RTE2W7dRSuS7F;Uy
z;jNLue&rN9uzdN?u%(tS{~7F8%EgFRnOO@n`0^M`eRbkZSdit*`Emac>cr)!vVP?w
z=gav4nm6BHI!XS&sPdWdQVb<>>#$|fuVKwjnZgCbeVinDv=_x2OXz;@^W}V@f!teR
zJjk#74pV6P@;B2``SRbPSMufb8erg=bZ_d!vHxDuY7NOd1A0%
zd4MlZ4CPzSePF{N-|~d>dDM+=-|~VyiA!k&vjdI9yS%?+OLu!)DvirKc-Zqn1atp3
zCv-SJ;11^-PjT7iLx4CB(ulPOnlRs}lhc`TRJz?C(=<*yEn`=DZ)CZ(Y1!<(2-78m
zj5%L8=-UoEOzu$b=ISFXXW^$Y`&5$e2@eDP5LnbckBu
zQqQN9p*VBiDU4>$oIZBAU)A8JSTGv>&G{IKhXQjKoXy{SZrk7&$+*rNd+Ju;QQGL5
z^0}P)ru07}PA6hV9!`W2{peWE2O6T$AqK9~{Beq>D85OtS#hgkkKzu+^AvY0epvBx
zMfwGDdDkfNfslEAKuo+vkq>^%->rC`;sc65R{W{r6N*nOKCAe=qVYLLe=lo3&L=PA
z3l%3Q8XaPk&(i!H#YKvhiZzPM71t;pt9ZQPDT;4YY*K7jJX>*_;yH>JD85ti{fd_;
zUZ!}3;#G={9i>ny3yWva{FX8&(r=T#
z<_i^#&pA$#JP)zl{62w~YJL(Ck66<*KO!BFtUAQoaXJWjbPT5#aEO|)FFZQ0b2iwk
z$m>vG`)1t={O96x{%IUfx%ix4jbkbopYtoQLb>qh^y%htIGoSWI2smK_6$1^Kd@rMfm-EN!t)?f4sH?`#Ukv
zABNmpzb|VWUIQ5@G?9zX`A=~DJj`ukVlJ2e_bQq~ME`_c%4UG}c;U4yxPE5@_6L&Q
z`epi@&%{ZiEYP3bULsCoURV#iDirdXZ~No^<}z_8d0{68gTDnEY=1m=1?{$?lc%f^
z(At4Vuc;XkkG?o(9(|L0prmWFVA+uk0yg~)e!gKs8mA5w0hd$H)M|ms%6-@((C5^(
z@EP`BvM^zlTZ|9}rt@Q==Za2eVz{DT%Ikzu>ymgoa>}Wnh}Ez&{*`i-B&gN$ZWu=8
zztCegPMzwr!*S{>(PdILAs#0USeI-*=(%gPJc}h-PMx<}v!oIwvxPz;>6|(*fa#pN
z>x2GlSXv+S%V3ku2b~x1G9wUDE_~r#A@?G-S}l(tZ8`P7AiYGQ=x5)wT2kmCgHwMF
zo9A=tZ-jy6)VokK1gB08^_6q#&!Dw8<6ko8;NjEl8XJ-@B+?H!k?xbd2d(G1J%n5bUytonCu#LKAN1a)ZQH@*g}!lZ
zx_AA)s<>=iyJ28gukSC-!3w?6LvB6o*VEwT_~u}9SEnq#cJ
zz8-eDaO+>iahMCY{$;FaF5LR(a9KN+E2_b6ZyWMKE;r~C&28Y-keI3G@_(pEq1*=B
zUnaLsA7+jVx$wPl>ky;OiCaGt{c(MU(pOK
zVR<%ioEh%Me{g?v2F4FbZ~Zd4^{O1X^)qwi)-S?f@V8)t-M^XK`uSL?r>qgs+JRfI
zTRH-6J)GkY2Us}AUpU7fneuRsKguchW7@Vs&Sc>nfA}uHyS=B|BMuC$8_w|;&hZz{
z@n>o3eWh+~KOtpHU+0jr_0F|CAPx=6b~N#^fyW0tciSgww{);}HlL3CFjzag(62-)
zO0VzWtcob(^CMpSx;~8Pj?Y!}IW|7VK;vT!qlH>tsaUH>mloQuReZhT$%=1O+@!cg
zv0JfU@!g8_A7g))Dt=7ylZsa>eqNE!rnJ9V@ixUf74KENU-2Qu#}t2|_-n=AD;kdz
z^!uXb|D_nt@#l^=CtBjTKcM(y#h)rZq4>1ovx?6vzNGlFVw^l9`YTkNsF+eLQ#?iS
zy^0qrUZ!}Z;?;^q-x~dLvMKg&G&_Lb()@Q6?^iUw#;B*zChdQv_&Y_zhoYRnO#1$g
z$hS9~<1d`!59HPhfzvt;f5Q_EDDwRh!#bS0v-zc7fI85ey~YSp8|-rNBmEHU?tndc
zJzND0cSbG}hqA}-BI%rnO3-3n;QBFSa$TQ>o6~N$%EZMwf$u`H|
zIT+zgzfs>))QBl~o}#B?IN?l64PIz57$sxRVRRz)mhUi{hu=HAPj7ZDjo;`eP?T+s
zzr#>2vIVOV5!Y{&dIvGN3FUT{XUGevwR8Lh{YKA2pDFn@;!<(_MqiIs
zbL5SP=L&Tk=1I_R^g@)R`;C4UZI6^({6^_ryI2PMjh>HntCfoo*U6QL?Hqq!MB2{r
zcR$kUbNr>SCf0BCx2PR7#~(c?bMPB2H-~$C9nSb;--3Q#v379*8hhHsXR)U=?P3Tq
zEXSZ?n!kTx#iC0v80$(Nx09DkJbK<*4fBOCl!<*mhsCaQ?
zjGL^Vy9e_D7O1K*a<63ezw59bqgSC}%CzG6n7rsNXf!MgX8;`N04sUy8#bnnhLXRl
zQ<*C7GP7?1jdF8&b4$m{{+`VPC}{3$-MW$w)V2NPU8(Xd_U{BJ6`!ye|5PmAyuG`X
z{gy-1naHxX=7Hv5e!r+1TgoR?Fz)pgTg|ueOFZ_&Wc@GSsl40LnO<9)o~`q;hDuAz
z9dIFrpejo6yMEt4H%)&bEn^Rly@@fT&EXg-7kBG;52M4das8S!H`!2+;h4VWR$uj=
zKb-osAI^RyAO|^ZZ*9&{zi@vl=_{pj&+Yw9)pbi3S2fi8ZS+@=Zr|230D<{7xS$+;
z^s>~#H8}OBPHyk*>FBNy~o4~Y8Z`vqkQ(|Gb_h2o8M@*
zW5IBxh`6oPTQFQH&~T+d!7-09Z=8YZ$@#%C00^caA1up_vBMvnn#^ca9OT5j|hkYA&D
zqsM@}(PID_JqF+#wchA4AaC>-fJTo2X!IC>Mvnn#^caBe)OJRX0ePdx0K81gjUEH?
zS83kpF(7aB7=T8P0r+*TH+l@n8$AY~(PID_JqDoBV*nbTQQ(u>&gd~9Z}b>|FKD^Z
zV?f^MF#wGo1JLL(0F534a5|qIfkux3xK#5-j{$k3#{m4emS3ZoscU?zmfxvpI8wBu
zN+0|GiK5YCK;Gyv0F534(C9G$jn631=rI6|9s|(mF#wGo1JLL(0MqmsKujIYXIh}q
zV*naG1|Yd8a<4}y;sN(S&jE-lL+CS#VfO+KRTJnZ$MYn1oe8=6jM9$hVjFOXnULu-
zO5f64d`5HCV;IRCfE#t42zGmM9Z&O7%vF!!57^igJJMkL%k&w|RgYmTeh>M@MOXEcSu;5DD;As(~Yc=Yo@
zw9iGI4R-w4#{M=~H?$r@L-pbV$)m?IcywNzji&Kmkl-5w8+;!9NuHk*xo8@z@WQL1
zY21cAG*!%BK<6$qk6>r4g+fcH
z_N)}2nh&ABP>$ZL{=!>fHZmTaH;ijDkm(kAz2WOykj!3wiY5?0`X5&$4u{T$^FgBXEDS$Gvo%)77LCNM?YV4vPlsv(qWILIjW{j7DI
zK5u7zSC^f=Z%u3KcALq{(;vjM0&YCTC&atAcQvI=OW5CqDGR%{ce?W(rfqttb==Ic
zYBDbz{j+pSdw`tIa!URWa_ipi@!v3ItU$=4M{!RH8Y~cakLia)f=91xLFImXh2t(YTSi02B0bmz%Su$(UsqwNB5
z)r{YRbUK@UJ#5N^7vysJKH>`Dhd!0kg1AbaL2T8G6IjX;nTpt|84qUD8(?qQbiT~D
zZ2D7J?n?P6;#IN~Jy@@F($DZpC$;Uf=|MH)3(;fbSJYr%+Z!?8Sqh@>@YCJXLbPAmk#?fQ3Bil`FR)$V69q+ZOlO^2kd;&C{;>g{{&Zaupko{|IbcJJwP3p=_yJG$GE-qF$D(bCb`
zF|cdp){eHec3%P{bXpIc*4t8awDu@RX6);*oSoK3Hfi8%Sm1c$TA!mQ=Nvk%r~7;V
zhn?2Fqx`@V>wJzGY7Rl(FNFT-7zBi9ni?ka^c?p?)OeBw^OH;qJSLd?;+*``aX&Fq
zUY$45h
zNWy^lZ^c8%KOJX-kXQH5s4h3k{J!w&!DnC`GA6tZG0)RB@En?pfBFsZ56(r?_!=-M
zbUn4fE^8|aY?^hS1RwKeYZRz!LwXGU8}ZK&^e5jNul_gmmohEf$Sy0>Kb`*M^nWH#
z&+$Psa~-+_Xxkv^P>LWI|8(-qTrc*=`wQFO)kp{XI}-hU6=gQqx=jD{O@aQXePa8g
zZ#&!Y+Q;w<^q0$gfiGjF4s)BBn0@g7UPV)gD24M%%4UFEF2mjU5AF~8f7|gx(px{$
znAr8b023O~UzyDSxl9J4JrgU;LrvoyBl3R^HH||}<51JslDMI!ap?9u
zm}K?UctW@5QN_Im9v|>b17Ctb2sMozhtIauIrzLHpG}#+S@AZ-I~Dn?$@=>hA5si8
zjooqCgNIa(&ozqIDc-1fi{kBycPoaP#uzs|riPlv7z2b{xk7SCIE1{g6sZ>iq>Qa2
ze}lu)B|UBH9}Ti1a+)0R6s5gi=bn#K*a4I}X(t*>`Uuhj59
zq${%ckT!nh4$1Hzor&?D^?qDBsh^I+#tXh0!*8&+pvG_x4m>#7ZDUUIZZVM9O^C$X
z&@2+kFT?(V1Zy#Zwp45QM9R*;rO
zd0dh>mh$AMrtP&TPso`_kCERYE|9k&E)?qNj+HkdE)sgMCFNYi<772T#>*P?JVCC2
zd{2Vq%$k)*J
zNck#k%H(du<-*rY6-ExAQnn&pB@~CRmg8Z$Sd!>riOfR0RMw%N8u=)eQY)WDTqpmF
zxL#JnzCpf&^fI9c)N*+m=@s$}>{rT_h*!xn^sri{BHbuFIm3Un5T?HWXcG*q8pC^G
zHiZ9ZIjXGx=)16#k*P7nut-;pAvzb0T~*^KiR;FaFJUVpQgjYGmE_+rT97pUHmaz~
z;O3^XE|NTsma(EYFc(XXV_mH1-KH>k0X75F*dweg2H~dHGq>Dp)
zF>*zV(Leo1KZ7y`*!%vYA44J6jX#uet&U8M71K`rM|ngnLd_ifqtRe*VtB2=j`||v(d{d0bc|C&2^pVs
zQkqC7rUhzhY3>i|Fr+(sZtd8%&GSEd<#G(6x2P+597-I+$@cnda^k0|dGLLX5K
z0>Zxdh;kf<_YpO>A?CS1f`@-T`_uQ0J|{%_ix8(13-N$N#LnY0KFjMALmyFhJVGB)
zcN|_VA5p7eZ032x@p%It>Uf;qqWDck&St}Me(XsMHH;ysk8cLd+2GJ{5p`zZ+ys8Y
zd$UCTH5jn#O(;c7JCF({WZJQgVFCWhj}B*72Aj;~2A_THayO_Qz=UOpv-yaUCJOSj
zAA*lwHXqTAu(RvR4zI$BX7dr`n$n&
z>_&E3pF%dcevN_tFy!9$UXL`}@EXW)H~O1xNDMd6I{uTM4B9<`>t;3|(eJ1ozzsMb
zrED6=ab~y+|H1VO`q*Msz4haJKkWKmfC(w|$79k4t`h^%9*fK$$K|4MI3LkY48|Nb
z&|v$^^bw`c?vvICXzk!5T3>end2{D0cSJLIbA0IQ^5&#hv0J?0^X89W2*I0g!3cp|
zY-UdKK4&0dNXbb2Bs2qWJ`+0#y!jQhjOCBV(E#53Tdw5?P?)$9Md`eGDHkY2G0=HD}IKaTQ*9EY^!&3lk8G>rLJc^y{3&IZUI_c*CUiRH~d2usVG
z--^whB%g)NWT9L56vHe}m8XzS=gleNJVRbaKQrZPsGTJZD48wiV?7U(3(%+K&1a%K
zoj3nGO6CdWiss9`XuCi@h?0dusa(sOUyB}&l>dQEncRf9T<$_#AwNW1DQ6(Al3yaO
zmX)wvEc_T_i4>t9tGnn$gN;qtY{T;9&f(g6ehc{8DPr!62a%qZ!(3+H(_kRo1aX}MC@?n
ziXOxYkvHf45(BSSp6)^x-kf$JZ(g{eI5PE?qxcr)X#8j4&10a)V|(SzS9`oUQm;kc
z+)_VT2y`<;q`_MHP2
zS#Enn-rPR{BLzyqgawF0-aO>ZL*9HJdGq?Js+tk;=5@8M`SAYcOSAZ!-;tlen$N&5
z+IXA)8HwQim(Q9%ZWzY+4wqW&Wlr+0H;}l95Q(3T(*aoXIfk{2e}R^(IlIhA%HO
ze0jOy%PS01UMYN6QDu1dYH5V!V#Aj&5i;~kr5^p%$Zjm9RwxToCtpHbFRRe1L2gHS
znfwY{x?Fya^a?43{Yu%5c$MM)Eo=S)YQdTpz|{9P|1T`UvgSL{BnQ^~JoGa%)_ew9
zcvN{en|prc=9@UruRO`RNb>bOI{pvolc&tbIz{>R=G2l$Q3}?49c?_;{9UFnc|I(_
zn%~bl&)fV~Qbg8edL@O>cU<
z?jB@4K5q!}eDADzf6Ia7%$0JqTh_9qh4i`Ai}krb&Q{mb
z=^fO@Pq;QcTjymtkmo#yVq1e2{@_+G>CkUCSG$7<{Q11~?A
zK0ifYMs;lIZf{GO`j9ry81$uqw=x;iyt&7It#gX|Qi(r_*U-#<<|U;)4TOC8;;M$g
zjD-5GFa6CxTh9PQ;M?H2cJ$H9QVZAgwQfzF+}_*M-vL$lU5irHiz})ts?5#TP<%OW
z6GA_8_eN=7_;QY8E`H{?f`@!L#)^FE(~8e3KCk$a;>(I=P8ismZ+n3g_|ydq{mk8Q
zc(we@N2*0k=Qi%Q`xSqp$l2go{#(V@${c@NJ8(7#`EvZq{eYjg3H!pA2OoWLNSUw!
zvF)1$B!Y7BGk+gmspjHmz6bos-`KGRyR0q9+cc{_hLt-?Z3wom73rW~^LY3TlQw5bQ4%=&t~E93#GuxETMo4U*1FsK~|7ybAs0;%7b<6cII>Y_QA9
z^fM3otz*c&^}8NvwyDw%ZbN^$_?bTj#wiy+^S{9^rF|1PE(~|!KRAB$gSYzwNpJl!
z{miG~JXXdIG}!GW+GCMbYhjl{;c$NDZ5WI>+84q0HvwrJa$YzQEA^z8^X)3@s}?UA
z5ntYrGheR+WBC)wOiF@;W8xa5^TCUuWNKasN~Dy_6AELC^kFq3
zaw&?VavFM!$v07MS@VZYTe8jxc>~g8bxy
z(DMZO2rMVckw_QIcd)sWWDjiY9Dl!q2l%eXoWn8<*t->AYNq@Wh`s{7u13^{}(EJ*8C(a!m{RFsL6pf-+_Kc
z#+pw-i`7&9iwl;b4mS5#bH365PkszW5Vd5vncti`rxVa+q=_`|+2C+jRT{H^8;e_6S6?hG3Sap&QLem#8y
zW)d;W)r>Ar^GwdXE#%BA`$L83SFR9k4|A8D-S3>a?LKrluW$18cHF`CJ*M4!4&1pN
zPQ1Kha+L7rYkfwaZz;`Z9^QL_&ArvNP_Wuz3O2Vl4{Yyq6|>9>&7OfS&(if9=UCL9
zeXdv9+Sj_oAGt%2IbZ9(R`Omv`JZ28yg#jT1xiaQkf-9P);t@vTZ
z%N636|AAMuE{DBiAkx8i+@4=Davk?ve<_k`lpiq9%OuNZRZ?l^r5kEI;1
zdlbK?_(R1<6%Q5;J=gjCe#d7`Z1-OkIY&J6F+Pz3_xF5$3whk(!IsZkk$jgcV;+k#
z<(Dc>B7)PJruh-+X=n90$Jrp{&@q~Rz#(k{Ndj`T*ySb+rRhSxl5NbhGLUw`M_?Q}
zCTu`#`(^>pp}BDAS7LwX!l4f}pWl{@<jW{k0ci}&{y{87o
z4@qzR9zq(&XfMEoGW5q|(gwS|M0+fFI
zvhmnOPBgi!G_pM2P&#QtaXqvbWAmL2IJd?p$h>56VKg}-IesdxTyvem!c~P)oK5p%
z5>2iuEQEvgvclzs4TS>pL@^2r3sDev3&x0SC}vGTDf+8K$AwF|EMu^tcqUKp=2pd=
z3hW8ZJugtfC+hSgj>tcfMR=nmJX7Fb_Ug2XdHu>=k1Q+eP*G8t_E!lL$JyMmv%Rex
z&;AvVXLlSt?U#eesMu=GeU{$n?Q3uAYw!0sfHX(w{own&?}{OIP03b-^Z5<*c)QA_
zvT8zs5Yk)5hk1W`IA<_I?qDBMq^;`;>XBhV%^y05g9;oxCBJ3HFjn)sE0e{#`5%s7I5%F(SqWXM{3<_cNb4Ar7RSFp<9waPmp4>UbH
znz&c@7Qv0f`TXGT#@i%31b$NSYQ@hh(l;!e&(CqT<4%v`aGv6Yitkn2t@vTZ%N4`<
z{M>OfKE)WnhxteW{HY>cnwU3yDDY33H#{YuJ1Y8jbqzGP00;V9+-g=Z=P=0#t7
zXGL3k%l0iz9o?IIP-W81EiHZRJAx!+b6<1!7TlbxL1#yIyG^5Sr=qo|tE(M)VHImm
zKE9%PV4$y~W%~f^M-XPf7KcC@XBTXa%`~ADG41f&Wx`M#V6I#tIVARH1N#f-^K+a5
zj04BTa%}7HNSTd0y8t%W7arHu2D@Cit`EWP4zwk&2U^Z>XXAl5q`iHMq;n!F$+_EL
z_f;m>^=bGu?Y2fhYX`2YreOqJSIs`o=LcQl%=!F`uPEp9`vX>r+iHXL4vppOe15(B
zF(+bg!GI2$&+m0;<EhDo^P7kAbcF?XKEJ=g()x&oOCh|A@Bh%1C2Y*Y$A{;v|AQ0;tv`B=&lnS$8*ihdMpo<5&n
zJ?!m#em}#Gwe$Hsh~-*e(Ix1?`ik=9(I8*ZGhi@6U(u1z=SNRg)g|`l^BXjY-xsjn
za1`Yve$n?}wbqv0hb@E$sm|xOj=9YF{OHUJf6^VW2O0K=OO1UST_Be}pWmBlsq^_g
zgGJF-^qVMSfW7Z4nnjnGcA+kDKw;r%3|JOl(cyK8U-R?%*+=2gM=xgKc}B!CX1a-P
zZ9ZhB6;z|x?#qyW?DeUt{mwt8kMb)c9@noiqS79rVuTcI$DvMf$U}zSqUmqaMh6ec
zXO*FRM0w9Pnt00KGot%6i51ik#m!PML>)ME1wzz#t@s7eG;bk3j|QLGnCDZgANIvZ
zl;fC-k0>tZW-UWq;!tPdP}L>oltJ|6yjAgAid5KRIX~?r^0A%x+SOUW*&y^0^-sV^
zf#WbCSKhZw+wlC$K;GA;na3e!!Un{)Zx)2}`MKAji!;WBmsq$TdBKj^2T(#zw^3_?
zx(K|g(iMq5qo2XQZG)r}&gaKbaL2?Ri_9Oe`TXju>P9x7-#+RRXU^s~7Dt28B_4V<
zzo!iC7&nunC1U)H9jv+eL|qb`oDR|o$79IAnjb-CG8X?lMiQ*~beA>1-!w>&3{QL(
zMd`Z4b2-|w1m#wjn8FNEX+f))d<*4PVd2N7?PpP*kkgPJV{{D)WEawfvK5OSD`y}s
zl16lylqXR>PFAAC>Jndu601x6ZEW`>`7|si%jt-xNGsy0@^i$~vxU0u(#wPj%*%z&>MP`juwNE&)c`p@1(%g5
z)iX{j`87rh74I~VJP(@zp8R2&c?t_gJS359!-)E``B5Dk_d7Tg!J6~#hXKue);x>C
z0_{Rw;s9&T&pWcP=ELg}b2h)%h%Rv^i`?JrkyHDdGRFtapnZI&Ja>vW-wDr~Q))*~
zXY)WuXM0nt{}pjpud}a&x#b_N=W!@ReBeYC?AVjK4}Jq5&guu5;o)V8?eK*X3;RW4
zA(SU>dIcg2r?@Y5?6GK^i~X~AOM5`C=kODn73mYAU$nbEs)5+{Nch?Dq#0A5kJo>1IezoO0Pe+vec{V_F17)OmFE^fiZ<_;<-S
zM)K$3XX|^O|H6=v@pRAg8(1g_x&ebjKMA`Cmyns1M8MaaEVb1oUdX*Fi(z9~
z^S%3;Uxh^^WFzeDY<@eDE|gZRB9ziu?(dQ{_dZr%68I5^;Ua|9~aVkObP!G&Ayz#MeBEKIe(+YyK1Txj;UG-WCeK
zptr1f?!M;7U>z1q(ARu1`l*piu#{TagSbw{()Ms<}nP4&zc8)&G~i55UlxfR84T=boU;60s0vkYd#AtR!=EMA8;`5
zWpj@;|27M~+5E<{E|OHQ@?)9v=Isl3l}9NQy=lr(Y?~;0fMzaLj&X;;Nr?ba@eKpX
zRv3ddS6_3gV;8+2W@OE&8^ut7|GnuF(=MP(ya?uV*v^q`dJa>JoM1i5d|
zv4ebN;=ICM=i2gX=bu1fVpxxbwU>V-LdE<>VRTROSCA)hsZ2#8IRC9pCrB*MYzdS7
z&8H8oaFI#sxA~<0f0|?uN%aFqs{5a*hctRfqle-b;IXEuyejpA~}HHyb79gtiq@fYe7
z;{Xfwi9>y2QsJRKF}%af1Yv``#GEv7VrUhI`ox>7YY$nO5KFX&`XK*FeUNOvolUPy
zCS;WAgM|9Te4o(Pv%RI${{X{%akQhev(1-aHrg{ao+~f;*Ts&vQ(Y0~HLb1N{T41o
zYk#PrK5?i|9C#eSGfMF3gU>8@Y6*m>d7|+PLVe;;pZIh9m
z+lKAfU#L%fDCrYdFB!>PTs8Hz^||_umbs*8n%}6C%J3NFr}eWg!fS*d;V>gBYJ=}1
z`a4{9BZ>HF{OKoR^dp4M!dDC=1_+V(>(C0mrInx};VSyyw2bA?0WAf;)Bn%4yby(n
zFQX`3XQ7nKlNBfzIUlPLk@vtbDz8VYn0y!IahU)I&OG_KX?r!w6VinA82JO@0(l4G
zLg~Vy$I4lVizKK{d=yH?%Ubk2K|Te`iBf}fvGB#!B;jtrI(Dq2V0ybsB({H(a9dU(x7jdN=i?~W2MO-Z>!g8_j=f6bwV#%r#
zUyh~J%I6W+$=4Cr%WT**$bCpJle@5`%jFrQSIC1{u2m;4MGsb;m>zua7<~rSzQ^b>
zFt9ocU8ottW3(Jq)?@U&SjxyeMxVe!R!-S~KB5cI*ppm17n$hU*o-wLUquW*(tlvI
zpttY^vyRCV-Q098Fp@lyCb6QEn2RMRvMyHCW(t#SSOSQ#$5@w0-pjf~(Kk(DvJ2Y{
zkI^->OvGxCE4l*iD?&5C+3NL4%<1eRgcj+Y<2Tr
z#)mZK#3EIDvigK_{B3~9yVo_&32gs4#G}_Ibkg+Vxa1Y5B7)PKea?OLJVEUmgl?Y$
z?X3eneW~)z-96Y1?izhcn%xw{P3#
zZRsmhR@ivbhIFCh;Ly6ixz?^FO`UChZQhbP>btt^yk#yqwo&!1L*6mu9sQXELwyDF
zbTX74G4B#WpHSWs@pfpuo6tDw(EGy=QQWQvLljfPvIU+K%-wD-KA}8W()T6QBM$Wy
z4tAeVexgd>&1)152a5bHn&A`rollaJj)JU%OlqZMJVDouTv}dfoP9K=2yTj
zg~H){LeIot%w+=&w!ciD(DhiUr>qgs+QBEZrphJ0O*}a5meej?YU*q1HIW)#Ut!V^
zJUN-}xFcpL^TuIKX1xnP&)*=yBgF=vCnuE&p8PEsACQTi%y~RHe|tVpPNow)`KM?Z
z%b$T`!RN_$qcHI~6lLSdm!e!`0ILxZvg}c5LdP+=1LbiUg99p09x-iQp8RyA$H-HN
z3*=nHh0=~ikClyxEl)mxEg2`vP%>UtpyvtlQCLota-@spUTp3pxd}Ftg(rb2!k^Yu
zc@F7mX77~9VX&Mo|A#f1Aq8kVQ|>|SELn?^+4455=V9_bl&9p+h)d-#lpii6mM1JrQ{XcfKKvpuA-VA3f5O3O
z`Bz>iNT3ii`S5#DkwUo*b~`fpaK75L{q2npe;WPe!iSGXe_Ws8_;5PQ=E8@Quebf}
zjSs&Dzt@r+`0#Jy5}ykn{!7@U?BD@8&J1_sKX@FZ0^^6Iw?8uZaL&I~#tt;t{XxX(
z%L`?&OQCQ$KK!^G`Eb5Zc*^TNjSsJF7zrQVP^Fal@O=1j+4%7Fy~lDjTJd}EIPn?S
zP~$uPXC#96UOp$TzT-yHH4!sxqvWkdN6--FZws9GTbT2F$G^ghf#*B^BbrEpSD-Au
z<278PG~e;h!Z0dlqg6KF@h_u%IN$NJ&}CBIj(D65n6#!U^7|Bo?GAXe<5u-
z@xi|1KSb>;Ir0Bz?@Hj~s_OOpXC}$CX{JlMZ%pV;v+vzgpq3&Cr4~@ZG+W!)Y$R!E
zL4Ak|Dil;iM4t8uA_&T^=tE=`L>{05`Vd7B5K-CWu_y}f`_BEJd+$sp&7`FzZSVOd
z=YN*}IrrQ%ckc4tZ@z;uOc%;0Cv(TC-kxP)CD_=r7nLB3
z@W*4J@1SmI^T&;*a6ved34^>3;@#sQ-W{Edt-T>dkdmmdpaIvfZ|iL6bpSn^U)6e(91j_T5ClAn&cms-c{Yj?L}$IHP&1hxW8L
zw6(QwZgYOpkTiXPazz8@sy<+l<5JJ3l>V@C-YE=a4mqFm?Q^U@g<{;o-~rkfA|cUKxcAi?J
zHH>yfYZ%sO4Z|+i`ju*p)-cMA)-bHm8iqAm!>~qc7}jVF!=9q;jMgynMr#<>Xbr;}
ztzlTBH4JOChGC7?Fzh$Ay}{3sH(JB6Mr#<>Xbr;}tzp=os{egzf2sC2YJacxDYeh3
zeNpYJYTr~Ve4<0YIcoFN=Bu5ocCOk=wPxKJv?GI$?G1hoOZ0+ygP+4*qj{3pSbmFI
zvu+>q20w=-v5oals^vpH^DnA>P3^zcM)_Qd`dqbR)J{@6UF{*XI9)8G#cAL$wI{1>
zP@5J<$7zJ;A+|T)PuMSNek?5>u_kIhRNS+zy|Mny
zP%#UN)13|i939i?1{|U$5Gvpq9Uqkmm1?cAeuXGt+B`AC($9Y-u-B6#)epvm#fZ~s
z4X5Jh|Apf%6J9y#sF~pC7h^z#2W_zX(ToB=ZcE-ak3-_r+#l`-Z7PobTT~=aZiDSF
z6-W2;qIqSs{hf!jZNol@d-J+xgRMIo1^)4o$IS5zgrn!-`|~~98LaJ(*A{<&$NKui
zl)K}*M%(Zj$nf9jFB4w*W4L}E|AJq_W?(rl40qz+KfV)vp9hle
z_#Q?YAAJ{$2~%;>;4x`~-CtUq#@uiO{7O;CYrgG|pEtK@k9j(8#bofiV1wllFBm&L;Mcx5s>mZ_z*mV{ZSUWtn+5(B>PHZVrQ5JSs%t`Ji57&Ws#WSnLBzc
zC$N4(HlbPRi>W(2^ApfjI!ygyln;cduSWlIgOppId0#!2d+>=Q^UV2GOXit7nEIcv
zMXSg1Q}jGd7Nf-S%>8;S4$s`L$I_Q)elFTtp1EI-B@>>xqsQXsne)_@4pVn{=8hhV
z!!vjESa?WUo;exZDVTZ^&pgWa+!j;+1RC~(sS`upbv+h`XI_Lpu!7%d_y{~qojh|7
zQ%_4SSLGEYmv>>n5&qPmVf<{ibwpSq|3-1sq<`|R#nof^0m_h5Jr<>$8$Ff+v?Qj^
zyB-Ff1$Kt1)6chpA5RW5*e)aoD5icG_B{=z9>ofN(NXC!b*|C}OnubwZ+Q0#Q_+p{
z5#R&Wz|X=4-1xbh$zkEBeFa-D31{yTw%+W=)-6aE;OU8?4d(9{VC2V?ol<34o3i{IKi!%ZPXM{CtD(iJ
zzr3frp{X|n7`wi;y{oOYrMaG~XL=Af+k(~azNd5Yo*a*p_w;z2e5HekJMSEvP53{&
z+WKm@!vI@v?cP-1(OKWn)85pz*?S4o-{b{E^durW9u@n=)_JEe)UkE%UdOw`;f>5t
z#@0EnnPTg>Uon`(V6gRh=%1KksoDTrcjhC&)}49SSFm-njvtQW`}oue`zy7i%Q0`*
zU$BOo4*Qap@5k6WP6q+Dj?zCuQw$j-p6Wjf5M$V7r`q$m#KJaQtn~JT!fQkglZLs~NV(VOYkMlw-
zd}r8t9N2Xx*gDs><9G(b)(bMk)|-9(Vanb8O~uw9$Pin9F+*&f8Y>BG&j!vj!=3o|
ze;!;X&(0r`?)Xx%_0kNn^^-Eh*3ZFY@Vj7x{d`lg^^amuPg^Hg>sL}+URq<2bSD}J
zTMyRp!vPko;}@*sN2EMh$1hmNZ%dWO$|jmq)$1+5)zQ-F$x}B5>-g!SkA{<7#6t%Y
zR@Bki;Vh|DV#tprTdIrNOFBB&ca=DlZ5R6LZEoG-;XRJ>vI4Wo(15=Tl8H5dmTwtmEgNDtIDZ;O6*anf2{$p%QcANj~YA(@;-$6PKASa^yPnyi>Bi
zb!$s=5#aseChxT4om5heL5KL?(9%<1R#RDCx}er;qo=B5V86Mu7e7F0#?#(mhb>IZ
zUEbZaF>zc=S7%Qv);#c}LxvI_>wA2_b2sQOzR;J;%%>wS^yM<=dX-2SZnJ;JQO4&-
zy!LfCjOdQfRm4RN#~9XdjNvp_%S+T&tK||y^gmoJe@w~zacV!HcAeS{YCF{SsQt8B
z^2gZzi)t@a`*pRKs{M{yKAY12`)Y4id%N0u)ZVZ5A+?XH{e#+P)c#fN%W7X&%b&Dz
zI}tq8(GF8fniBKl)bgjm%onJgqqazGh1vybm#JN$_PuIXt35&O$!eR_wyNz^yIJk&
zYCoa&EVbL!p0D;IwL8>aruHhe*Qvcp?Ja8WRC}-52h~2J_A#|js(n`N^J-sF`wz8m
ztIZ8M%uPPGV~Do`xp}%Y+Wnz
zOmn{(jztHr`cCVt$d`@?sU9VZUdX@f-#{Pew-^C>~?8=(;E5${BA=TaXn0>
z*^g1M+*kDHhGS95eYL^%mx^`$7v^QVb%M2iz`Dw-9hl3+17TfQ$4^}b=8?`!$0H4Q
ztvnGs;A$}#-ssNti8E!2hI2>)^a!K*fTb+^RC%L)^@$zcXdzsa^@$zc=xr!Z)+cs&
zqkZ*>xq{yaIT~@Eti}Xe-e@^WGSep}voe`C>gW?Yyixve!RizHd80emCnjYvS)bU?
z8{K_hJG1v67`otu(C+idYd84nQwvRrsk2f0m1g6yTMt7o5
zd@A}GlomtQ1hjDVi9f>TN&3X#jjAZ|aMWeh;Zs;K$tJu+#qf~ujQb>V@kvZ$>
z6DwIXS)X_oy38x!R}y4VN>eeQ*-pu#^z-Qx&x896whKu*vgiSzPkb2mJq=kjb@4vE
zfMR;VBE^q^xLL+5{&`q=uXG}13Ka=
z&*!lIG#GfpHk5El|1+U;JBa~m7>c}5KHKt{l=GO57n<&_gwOebUU8sTd^rvr>S-9g
z1z4lE0Q(~?H+l=m8@&ZsqqhM2ORfKnTEhuNxzSsIHF^uMFKWHfTR`6EEx;PR1z4lE
z0BiIXV2$1a>|{Koaa=}k0oLd(z#6>;SfjT9`!)45dJD)Ky#?57wA|<|AWykO_V+Wj
z532pO+ILH@_z->%@f1s#EDX?%-{pRF7651w$7B6FptFEylYk3~nREjVRTDDBcZo%^
zjfFUg@A4dM0}d?{Qn{eDD9uE#nCthQ0W5@^M}Fk&o9FH0@o&e9WN0vY#VgrBgYBak
zc|Q)!7h^mQxm|A0Za0++`VcA-sJFrPm&ygDzOe0YXI#)%&|fB8&;9AAyfoRt*Xtugw@AuT6)KN4r)g
z=_=%4B-6Iy>-jhmJW_1%loamA1VTxnk(Ys3l;27yDa?l-6o`#-aX5=#Hz+XV>mG8-kMq!c}mme0d;j1(Z9FT7}v
z6@qKyWF6x1@;E#v$a6?rt>S!mPL|(di&Nw+)J~OKP&-X1v_D-=#W)X=kD||n{0VV^
zOhEa;auiz4kPjlBDKDdBmiz^tv*mx#c8+`oC3EHDNL#I9zB8CFJK$3&S0gSG3Lh2A
z{~#_AzThmC#}JnpMdxz)2htT1LqC;LgMO;yV;EbtY)4!pUq@UkhrnlnkSn=R9>AV1
zk_V7pEWd;Q5;+&~QkjJwtggb#s0BX$8Y(=k;v?Z;brrUu#^U2U(JJ1Aeg=h)M{?1^
z#m7I)<`RDsbBFc&eqcru=h}8^U+6r`S=w*kUCNI?h1(^lyv{)7a%_N-J9O4SoVc-dNl)kc-b7J*
z1GrjCi1t+X6t!Du9C`|Ym_mE#0Ab=7!>fI=Va
zw8wd)OL65rM9~efa&wExXIuX>8}ocR_rhLT+Yg^Nv4H?953uqB1uN$xIgu;~
z%5X@A>a=dG52NMvg2)PODrWvDDiSES!EP%RGoR_}Z)ceKKhR$$n0Y1o<9G(b%tzq+
zl?i4}y$IXi&M@D5Q*GkIee;K;`+1~d=7Z5DPT<2DkG^;w;^#|D
zp2q+VB{yuuWXyDP-m#R*DStl(^>i9PVCL18gTc%flqm&$U{3i-X)tq){oqO1lN99q
zO$^N-=fA=}`|rYld0)-baWv+MzsCw+5RH@fBeux-?~zVM&VPk1PLbEp&s4b%wbNuSN~X&uj58TI=jAUMIp+e2
zvxM?Pv*k9log=5AWUh20os68H51&H01aXmEhqzd7LtG*&5tj-t%oaI+9_b4C7vf6c
z`-^nQ`E=A;Si?c<}2{i*b{|hQSs0$DRQoFG4d9E^ju4alX`vEI^H`NSq9p6L61I;!tau
z#1{|1(G@vg&i1kBBviS`Iqz*4cuwA#A~F4Zip2BaK7;K-a)2V|e2bO_Igf!$9vki{
z66@P^d|EkOA(bSKjc}5*pvqsNAiIK@;s`Lu{SKOP(K>m7H?c-h9!?pnk{n|JOk
z0GKs=be0qpXGT6Jh8Pgd11S9f7q!^CQ2IVVG(Uj#h}RzOA@oFS1HyT-XoPtS@@^2$
z`@rhWdmdKbDXz{NhJb_4yCdEi@yXT;5u=ph&+}>43z5)R(*jQv=Ds*14mv(?;s=Al
z)p-+5oUv4`(IrNHh31b^yGE^9^AGh6n%}6lQ|%VDr>otr_I$M$spaD!w|kjd604Z!
zV;}8JYDu7C{!X>`s(n!HBWfR0`=r`u)jqHG6}A6R`?lIFOfdV;RXbYk1hv!D&QLo~
zZHd|{wTsj)SG!W}(Q4PI{eaqfwJmBlsXayQscJu__LFKqr}jLx7pT2h?KjmPXt=u3
zCC2A?AD=H_jV>{)(Itj8y2P-5)%w4yB{`1%Z>imnaCMvw0$d$mb2s3tVZ!d<>i&md
z95N;xiP-kd0-i%N!PT$L5Ldqp2udcnI;osIKigo()QkdRs&!i7U!#xL3p6v=jZ|Fy
zbyOs@4UO$D6<6mPeZ0C62j~3Q{?7BYK{7M}ppOHWGUxSoHq!p_aSc3+gA*sU{axy7
zgJkFs^mii@8tnLZZSnWF&ez}0aP`O0UnaQv+Zp2O37l6Fc5txV4+dV#{Nv-AdUpPh
zboVzESFb~Vh3r6s-CtUJEV8PN+eP6(xH{kK%+$VUY=5b^`c@3;=`?=8)oUvTfvX3)
z#5lkLUE)BO7lB7QhKZZhnBcz7TPre5^lyGUp3{F0u1FYw|I_gL$F7M(y|2-mLa^wfCsKU+qI`
z16^Wg{&wI1<~#VqW
zSl=1abVFlfcgq$(2HDWv(6IqG=jzbb+RGpL10}~
zwY5q)9hgJ9*a1beoMUh<^k^o8>aM>{Quw3eaC}Ys91iTiAwgW!2FnNDxQAMbBssNugk&-enrZNRW(u7e&d+3v;xc`CmchYtGFr`$O^9d881y+y-hk(9;l*^0
zPy%MId>ZL_@;H1BksqS%eEA-H3gyR$i-fP6isiS6OQZpDsqlnaCP%}wTyoGug^WjB
zDSRnVC11f-s^!~=Yvc!rYo!+c3*>I37s~Ijr;FrSq!-Im@LwVqAYLjJ=wX>mK)OzN
zat41i3RjOmN(F1nA3XzZ8SqCxg{=%udEwvac=7l{5l4tt*G(dY7F5zx*^|WIz!X7t
z!Mv~y$B%Y$MgTh;Ujfg^wHTx;!tg#eipEFMEt>an_7sh8fd`}GI&;0N_x#6z1bYD9_?{izhM
zPG06d4a(>zu~`^m9~CKHy~-$zt|xZT+TPXH+SJh7idEBAzHe>fu(Fzjvm_5h7tG>d
zuts2@s3A~ea6yG&T{Qb0*gL@EAk-L=X>&cTr<~%g3Pl}bJ82?)Ex
z5#>A%%n>zbw?T76OVKwuaukoF4LG9CJOmt3XCB@yonpcdJRUDo`(3p+sO6$GtiN5Y
z)hWJT^L%V)Jr((A|E%^v(OxiTgZ+ad8hW>I-$I-d0mUTY&HiU!98xB%LQFp!79x?3
zBf0|RfZ;=R_-FV+KOE7usPp$nuq_=&lz^Gv?;>C;E7`FITi1lVf4dXG`6GNnPN$zE
zdOGs94U(ZJ&|iWH4Yux7;ES2}R{?&9X5>u-ys;O0{?7K5Ar
z6A9jn+Th{l6b}GyZeYk*)MymDip7M1`{3r+V=g`1oVo=-*uROwG`M*Ix0i&Qe;bYw
z*@RZL_j%P1CJa7&~UajCqH*y85n&_jjH
zL~Ip{`{L&BfxpGg|AIZWxcST2?h?5a@lsii9<1(y;^yXeKH;;&u{yMmu7`ug>?3
z+atI+mv2}){#cAC87zSN?zf63p#6it%V(7UH|O)M|EZ06KB0SIZ{X&*aR_j8OgVAVXVpHh_7$~(
zwt_Q1``Y?`gd_O52Do{sxVL31_{Yr+y%0}m>;YAo1;uF|BLdtU-+C_q<1k?kV&bR(
zA57?vS51tPZ7fz!KbvMlg(gA-x@_Mp4{&p5e$P#r7vK>AZjL#*1ONL8ZeCG4IKH_;
z>jU%6)2;J&TTTjUJ_p}AgPOmEg#Z4_L(QKt2xHcnynMu>A7xImYw-a93;!x};VdHu
z70#JKMsGCh2lR~Q@SP0U<`0+#F`|pH9Vkj>n-`;>kQAcavdyoAV?;X9Dr%V6mTmrk
zY5PyO$K)8KE!(^s>0D{Rrbn37{_><1K5_XS%125y$}QXcT$EV0`5&;mW943Wj*~MG
zkC$^0Pmp0KPe#rEj*(0;eC(<67<{J5`%yC8(2)<4Gtj4Ho7bQ`88shF8%rY;!>69c<(B${)stJbZjS>%#F9use|#kUnnwY}7~o
z8zXa|^2iNHzJJnh-~fL43c9;&^DmgfI3?|Yn%~blmu-HBDU6?t83o(Cou0AiEadVI
z#|DU+6Ch_mGY>T<#b6W)_(f5+xdGBo3(3UjXdd_TP%{JnXmo(86(5Fu?+-PP_Qy64
zgKd5cQ1ftLRXG4Mi#MTLyd@LemyrAC%71pJo!xxLiRQS>^9HOx%$#=#0oNRp
zfUrB5Ip;AGt~u^I0?Zt96=3F}(7viid>)?wfsKDf?bp?sAI_uvD$N^0Ao4e9{tmSP
z*Sw*r7caPbT5&cAFms-I-2hO^{4cW$W$bXFfGU1y47B@YaaLxN$=kE?|)Bkz&
zx6WTG*L+W`^XEWh&J5c5OXZq#oxi6X7ZY1QaLuc#2ZNa}C{sz7fid$FodYFFqa}3k
zojGaN`J0UKOgj@VvtCAm_oFrd^S(DiTruYf7>lFFvNq$33zU(_HURYba0h^XHgn;u
zR_4MvTw4zS`giCV%^5><5*RyjvCELoF*+*A>-^0}xkxvL5f)ywBGQN+qw*7!Tjcy<
z)0W6{Ox}m|F!>|m;c^P%TsaBb93e*`&XbccjJW&<;*nB@l2Nh{J&%?z!*h(xM>=1)
ztl?Ps34F#GMVIlyweBX!zffY4^J(y$EYD+$Q$)~qs{8`A(_|$|rVE!bJV-u+@`SvE
zxInm!?ZI+9TFsDV#4{y|K4%G+f}1UWK-)QT5q###7m>Ee`E_VJUwBC_6e6=l@(aYp
z@(08vvL11%ynwh&mcg@JMxciZnS!`djzm9I@>y)9TE2?7My^0yD@)+NKz@kyLU|H<
zx=6U}=wf*h{!8SWh?hz&da%g(|DhJhIbR!i$T_8QEOLGhnq+{SZ$UqUMb2B<#zoHW
z#fE^DzX#I?p806jh2wk?5cxia<1)+ZSP_lK=oZcUBKTPa-wf)>k@waYGtU$APZ*K25x{<7^HQRQ+%d
z=jWNoaJ$`oTi;byjdS7_Q?S0Jp?7n)_xi7+v)2=hQP>y+@9Isbx$T>}o1pD&kDdJx
zPe0sw!Q}o-z5)CyGAY7kfL9M+Kp;E)f!S4>WRY1+bXEd#GoV~_pP*{Qmv{62x!tO6?{PncrY!G1TIE#1zaEl4MgQ@$Ue{txT
zunMv5n*}_FW`e1IH$zOlzcv0+F?Fu-_aP2IgB?>7^26|7r{%<~39AgG-|`0fOK2M!
z+g~cC?#F~VKWJvIL#dehL;yYxRLb7G{yvYie|*Gnt=6B_LJ
zQZecqekc5u2~X79kie}9{Op9hle_#Q$Ur=>0!
z6BeVtLYslL`%7z&MOJU*c2PKxe#>Vu88g^GgY7RBQ}4x~p0ZA`)(@C^jS87(q~8*(
z@rMH}SmQ5P`Ga{+-hePt0D}hGZnv
zgE%a2#`ExoNqDBfzc~EV68!wSsH3x^rKkn^&%qjh!5V+tx`H+S{D`YZ_B8q*@1#0N
zT1;?Hi-h>!mpGu*@}{QE?LMf|1+FO7la#TbodaA2+S;wXooI7tDrI8=zQm_UsQe_$O$rdT20pV&5R$Nqvf{`RXi{ub=bHU6Mg
zoVv!J;f`{Rzc+B85f`<=vPIoB{yys92WH7Mmo!Q$q(>UnHU6%pr@O}AZ|EYi9VpC5
ztC&A@h)641rPC_D5#OmDhA$Fy4=w;TE+AWw2FP)(ZeudX}F^UYZV{xYy4SoVgRk;RF3Gz2A7Mp
zOKJ-NN3a_`Ml+z>fRKSwahJ!FGvMPM#3JptXLr{7J7T$6c+!Oon>IFd
zyI(H+ZobOR1dLHrGf&p@k)1ZsU9h?fI2!~UQJmGh0F1+gOmScG@z{pvUk2j7HqAT^ITKbPwtcf8
z&?$|R>p^GM*awqn!@u%(s>n^0#
zDo$PDkLm(OtN2AE(xc{oGYDhWCwO^?MftOKNG%j&Vu6KU$Xqz<1I&eU4k0ob&H6q)
zqdAkw){EslVj9E+$?-@J
zGdc&uWgF7DvJsmeAtxfvlcUgOT%JPtNLhjst5tjfN~~7#FR;5~jcV^WX@dWF;ZJlX
z7)9ZU@;cI!j85=m`3JT*MMyTBY7`o#$r_YQ7s?tPBxj*KA#WirkZP1CqvoTq^;t3u
z<+J5}^f^aJR-bFsAgtoT^=La^2nZJnFTF+bJH*BESHvaKjJQ<(iMUKw!n0f^qK68Z
zgSb+7nyiv9V=LA2EyOi)BjQ?F1pftc7t#xbs?3Yz8Kf7>@8Q2h&O^LZ4o45m$Yl)G
z$-htw#f2QWdWs8tabZ#O)8LkY;=-BeXRwM3o7u)yT(}7vQm7pG_%zmq<40h3BGgk>
zt>W7;G8ZbR$_Bvk@wlu+sHSoJq-Wp`9R~ATnP~hhI0H3*m~O7(f)Nvm#hWpsAe4TX
z4PsF$X5;<`haymOu5iqNW*%zJTcuGb;1@-;is`4QIrSLkp=JjD(I_1=b-ZDwMo2Iv
zA2r&SshZ_5RkJ;&>e>mTg>2OvkF6R@$5tJd%2pk2*{ZpgtvVu=t(sRX%O+U@>zqle
z@<+>1)JJl-Y3V)7PaepiP@w2dDBoY>!
z&tc&{rB$4YeD`?B_W+o=MR#@yAm6)k#C;_c?BKh)TbjFDdIE9cy(p<*=bq@MAKN6e
zwBF&J`dz9+NsuuPH;0z$Uo+AG;iWE;Y_es^*?kK&58!f04CreI_j7de-UsRAcL6RB
zB#Y~JL1JNz^CriBHv{4>FZR3v3$%*)Z0mn!V;(7TkIFw9C#mob(V&^)PikSym#m@0^2h1@1*E!jcUzcKM
zx(Y*2tGKd!Q0x0GC{-DTfid%AiH8DMa(?eHH#9LcA#_;mj+{}UNuiWg{^Iyv8|3^M
zB>Z<_z`Tv1Yc%IsK#!Jv9?NRwH6RvkA|5H(<=6}W^#5QkoOLpD;hb6co&!Lq=r92E
zNkk_lb`EmNH$Rqc6S60v1n?q)l*7j&=j3rm&k6Dp(i4SH+$3@M=KqH+
zPLUYePL;b*K1~*(WV(DD<4oq8Pe*w&a-NGmXUWU(oGlNb?Ht(-pSkjBq%Csp@Xfys
zpF-g~ha$NPaj`svxI{jPxK#d#xJ=%IF_a761XajL#FavlMwOh0tyIen#5Hma;#w(#
z{{p!c>4owL_H>avf%IZ|3jRyv0>n$D5IrmtAhJNt-$X5t^M51bA?K^%V3G4PP?G_2
z{xS43SmeBmZCvEsNP&gpM*{)}az2rD;rLSQPUJfnjtiHsWQDt)->Ilaj{4aVibp$I
z#emBnq?-emqb?L`o+PlSxXze(6P$sZzn|@6QA*9^J&YP6=e);ZpcsP7Hzzipf}GPY
z&?@%v&AC{Bg|s<==0$lllr6_bvxlc!
ziR};Rb^o%4XG@lpB*I~w{|-;aNG!Z;F_S$BsRx|%J;gb)+vX+8%8Sd2OLvN;^BykX
zpYvvnw?n*v^+F`Xr)DoiLR1FyLIhG^Y=Nf;b1$3;mX4F$ps{pPPKZ60stx$(&U^$|
zx-$>^3YN}?cOJ+0sr{AON7X*Amc%&v{ax+rYWG8p;s8s>In5tmK997&zoXD!CK|=_(BIXjCnvJ~
zeIunmzveNf+#Mg=vJJ0&48K8tnP?Qh3cxlKjpDI5&m>IGPQ-a(xC8(G{iTMooj)Yq
z@e#VjVbld8~tzqIyPWc5037li|96rX{~n85}bY=5a5#cdeWQ`QOA`jymH
zRt{#}zd)lH2Uws{9B3313J)}j?W$m~Mb6V?i6c4@DlRTb`YVA;DCGaWHBLc5_KJY=
z6>l`>K8yEdfZkfyT_Qp6K4NP(Ph_&nd){`kz6F?CIz1tcUm{d&y4Cl&0xT<}QiPW~MrJKJ-_
z&{|E-jw;Xw**CO7h7$Jbdwjq%jd?lk76lr`fkttlQH*DJfC6U`kAyu}?FDN8Q|+Z{
zuT*=T+8?UDRqfqs1C3($G-DE&7842(6UP9)VnU!%>|k!>5?XwR6Y~%z=woJvoXFO-
zBFnVJ&W;7R^{Vf*&N}}0ruePEvN!3lGj0Q$aaULXJKzTy`
ziMT*2P=2tiL#r9mfp{jEhh&UqqkOjf0&V9ASB;u0XCggMo`laKax>b_mz&XBq5K?i
zk?`eGvG8XaB|`DsQsL{QGC3BW4ajlSIxj^nk
zdZGLgd%8&eg7ji}0{%T$Q9%aB7JqueI
z6k{~<95%9K{3>)Gmb}x@JaRV1zI+lDH^3u(6H^4{=zp_596#2{9n7tS;+A{rk~rD@V<+clNp^lBEI7BNGRHQba*E4|*}tiv_VM0AsKh!P;G?Ob
zw-spQ%J;2J99CAN)SpCAy8!}V*SB>x^cG>=xg|ZF>w8hq0JhK)q9N5iMeT{A4fgLC
z&^?bS$3JPG>o<2avEQN|s0zcfthu4L!Jpp~a>RB&9kgZ$Q$yFTb{3%b4>(X(aKDYa
zDMY+>^{Ql*lk*26Y78Xwc9-secHa+e}DQ4??D~0$~ycrkdv2=6M8)A{Qd2~
z4!vPoIFYT}nBsRK2FGpNVEvj=;NNZx7X==NshrS{qRh5oAN*-=f(Z?_ZY%Qs{wDhR
z^K(MagP(1~E?z``={TWhr}Q@${qZ`+@$vow%}oAMSbu-~9$kep8*JSU6!^zi>g$hJ
zW!oQtMz-NKkl}miuK?ds8(7DG0$qN;2Qa8~xb{8j2V=rZ@Jnc#hTCPh6aW74QG?lj
z9!R?5dl+ea^j$C}jKWEy&}LvcCI(u2EHb|sehCx~#0fnKlQEMGG}!)9aq=TDsHd$H
ztn~vR`K8^&B6dOF8+=vRtvKlcz027-roxsWG
z!w)$58O(*V_;rJ%!W4Wwz{$Tt&uGp_91Fn7iDbg_(uEeBnj9P_9N?B)1?g7Gkm`vIcRfP~xb}yiF*Ve;{2UG4xX@yydKtPh)J=aslER
zxeRfw90H#O@_nQi$^+P&MZ$&b7R&G8zeLVOyi|(NgI&q*Wz+&Ee+?BLPJSF5EKa@+
zH5uUKJ?Lj}IC(x=EE|6UH!OMU+1v%ke}KZsEDYkXNjG7CfQ&E3qyjb1rdv2(gTly_
zsCRL43Qz+Xr$RJv@-8-t#=GDFWc;VBb8&J?TO;=Y;~71gp0Q{Fa(Opk8^p5jpH&%Ndqf%p
ze+bJaxDv*@goUrwg&v)cHf>+)yXu=O0wQjYgR~oo4R0|;>id>^-w<>Br-*CQrPBSP
z1Vr3H5pnyVAsbIgnQdpv-_z|ELU1HP8d`el%W5jiOBd97ZIWo>_B0pZo@vWZrDd2;zAmP6U^RV*27+f*yKX~bg
zMYl00*>z|P1pET#!daV`3+K#5pTNq^%h+hnR05H)9R7R&o|m9`>3$uPWp$reg;k-$=GWai$JCI%|Phn3N$x}!#mY1>JC2}d^rE(~Guvj_Y1OO{H
zt4V~<4#(=yK0^H(#mXau*DY2arF`^ox~#>2ZV{?RhoUQx9&rZx85C9yfZX8g5`P7g
z0UZ23^adRK2q$M=zJ%jPq3^6)F&q~aKN1_t;@gU~lO940NW6dzqj`oX5RHEt&H%`N
z#qq@Ax3afb-aV!;z8=#EBDuc%DMl_Y7Y+o-Nf%(?>3nC>!}Rkl+Q%#647LkNIwE=B
zMf#%7B7IpY6!U#|(Y~Dld8c+D50hO>qHP7Pj)1ra=X`NL4a$@!>=X9RQ8n~qODvpJOR*fsvtDd7H-
zqe_k%?Rd3@Q;rYvVCLaOJ{{`~rySOB%3)V%`B7@usQsYY2DKa2cBsTy4JEgJ^M@Ae;~eakf@1
zxogaGfhJnwO!S+pmJe5acSX)9%gy%^_KTVyON$4piJE^0xa7Em1sFM|(+xN@O&}t`
z>l8jJ6Zm}W57w^`g-n|VV_5pJoelQtaU=?C8`dqx|4FuUU)_6<#wj^ehku4o;dna(
ze&kH!P;jy8U^0B`D
zaOk`Jorkn-!#@6u{&+pJ!PcFP0{^_sM1LI5KwNSz&-Fdq8LaIul}lde>yKY?yT8|H
z8(#Yu2!Kw?ang+0AOBOis~;Lm~W1QOIk(?T?=~w~7ATKrT7I3pUvPc<%E1aV^28trM*EE2*t2
zFB=R-zM#C+aUWQ7Wu0@NB(2rQA%s^6kn-F3RWgAK?zwn*zZxt+x_=HwaKxX4vFN!g
z#bOw{lD!N)0t`Qgp5d&IFc;35gHH{x`IWprs1%FDE<#QnbtBKala
zVtE3w)nMUrxmJTE4?R@KRK%6?Ui3K_4VIVSzeFxUyi^vT2aA`d)nNHB94xndJDOO$
zJS!buo@Mazv-rt>IXs&{`phMDxpkxJX4h5KMe4Ha#@5B_^6F;Qjj5Yk7p|LFH>_@W
z9h@EE6^~H~HKnLXr+TPXWlIeWCO$2TI>}
zq4Ptr?`gQ@QDEfJQGKCvZ_U0@!@t2xm=mVLIG+GMJq`RQY`}e=yA^Z&8MUtf=_TRp
zOn~%0kEqQKyb|E(fhLO!i5-Ca^Zf}wUwe2mm%g>Oz1<2mJHH|r9FD&Ba7X{eKSzNO
zbihA%&lkky_YXiFmw!Ae_KT_WR$-`P>fX(ccZ-8z<2jPZh8Knsrp|fI6jR3yi@_uY
zgQ?F$|HKqa)drZlGamt_?##o!hN+VP$K&}|Y9CemxLS*;zohwptBvAOmhE!Yj!`>F
z?R2$=(BgElj21xRVQNoS+n|>C)VqwW<8%;U>-ZSlU@<{L2D}#FqcR~=Y@N8Z|B={U
zPmV;n?VBAQfq!xzZLoEz*!qn)-ZIf?p$u{+*!tzTtht~gHg31ujIv{OzWP+`8Ejx~9AZ$H>{xZSVn|=LZ%H8p$
zV(a&#zf5#mUdRwzr>;r@+p~f5%y1|E{hvphZ~l;U$Crw&m!iK+u=SJRmkG9h4kjZL
zZ2hAc)YBZe274R;Td!2G+(71i(@sfsr9(Rp*6zar7OdSDtldYXJXpKWF2~k~K^Cmt
z2VPu9uy&tM7sM!q^aQ#ge$j_&7iBV>)*3fU&?z}ry(yHA_gP=oUfaruHhe*Qvcp?Ja8WRC}-52h~2J_A#|js(n`N^J-sF`wz8mtIZ<5hwqPZpAE>y;64_MBR|)+q3b;Oe2EDSw(fn%+cc|ghTlZ>p|N$uDE-_0
zD)>Ca*tlKNdF*yc<+E*&4A$=BBp?9ms#;)BE+-lY>#C})bwIDgz&z5$>3F2!l(qYe
z&H~r&)9NfxQ`zb)IBWO)7;Wdv
zjqoXyI}sNNUosWTlZdU(0$(eY$!d6(3xAeTA=41=p3cHT^k8|T>2wyN^>DDf(Q|QJ
zWWXCe1N%ED-e@F&7Op0-N-pSvefMFT9)*?LLY&fJI6@>lDca3Q?0cN+l`=bm{R%{|AM9Rl_gJ$fl4?i00GJ
zr%5~yH8b#!Mh7Tw^f2su8s2E?+I{-l5=<{e7s6Rxq1u@{qTy)vrE)A%yRwwuRoL>-
zRbUuDF+Xcqc4V7m$y~FXpM44rG#EmGc5#3~?m7l(zevQ~YWFz!xOR<0&h!IXdjxn4
zG>bbF=p8_VVeJvi&2owMIM|Q07&bPz$TW}cK#QS!+dN(5b*H>h-n9)SoRZJOUf}4w
zFcf*ByvgPBI!Bt0C)(#%EjUp5+#hHZ2O7mjcL4{y(OrPO0S6LwHjM59tkGS7HM$G1
z_i6nv)f(LelpBsHtkGS7HM$G1Mt1@BRrP;UtrGM@)wjqU=h
z(OrNwx(l#Iq7Rlx1^vFM_6oJvsQrQ3o7MhI?fq(htCkP&?B~yF`3pnlUsG#1qR1PL
zD6HX#!Wxb!tl@~l8jdJz5=RuEo8gGU8jdKe;fTUoj_4u$KH>ov543xGEkB$M0*)xA
z-3>TIP1seAC~;r^RRf2R38@@Wa!E7ch<*Vay-YZwJAjj9!V%?Kek*lMG45nf9*Y9FSt*%sT|SAQISBo4Yt2jjwsjOWf;NRamUw@c#cYjkkqPL;HOgN%X0(m;fZWNZ=8
z&3kydk44*=lkD@cGZ0$%9CP8U4>1?cnTlzG&;k{PftybxC>hH!s<0BH3Q&ye)+OWS
z1)LNqL%G!_z8H=XS%;3J!o$hx6aU(@{T9k&@_wX;$?j$Ul*`dJB#|@n5mUDUyS&OqB;v
zJ55%gWV(D7<2*<{jq-&29dUuoMR~G5aTtBhk~iTwTYitWbL2w!%#}|fZS{$7K->9p
zEqn^)R>Vc}0ODey+);@%BQBM{Auf{@@GO_%=%GS*QLPld2CI_KU@O(~6~s02ZN#;*
z2>uJ?2S_iJKVVN6$#0NeEYHJ#iSWz4RI1T~#m)bTTIdt!z|~#LFY+NcSbgG;qlv}M
zccM?+i+%=$n?rA51KYUz#5@526IXrWk*q@wyOVVThT|gSOIZ<(563+LM2SDa`oE*-
zgh}RRB^uubXMp8*)6LZ<=F30i8ZnIk%Rh`pIGztdF7JFq1j{Kk#eilWSkC(-e)oM~
zIsJV4#Pd))1OI504lM60s<7Yb6Z3a*y9Ack8L(WA4RCUYVd%&ySOka?lTDo+TU_wu
z9o8oH6A4Za>QE9%
z6^EBYZKb;yJK^EJp^rg+z-E}y`inGeRG?0z$I~;_nJ;|ANa4w!Kv4`H1uxn_D*{poxPq!
zvP$yu+q3C3cXyh)o3QGl{ba}p_Pzz~DYc=ey{T(+Dw#NWF}wgD?`iGr4DfM0KN1P>
zLL}+=jL(;R68FMhS;G%skN_XYg9Gq^XEF7(e5j&*MXk{#M*eNhXYr{D`CPT5)fx>2
zluy(A47KyrmZ+^#yGZSFwJX>#*yt52&qI+oE=p+Edh?s`g`QKdJU}YR^-9f!d4J
zepBtfijSYi2S3a^5eeF_tNoT*L;FMd^_n-j#K_;J`TNuw4F#0{M)Oar{j1u)t2MgB
z@FO6^?d7O7y2QvEU1HdSSdIr#qe~2+$>}ExOgVI#9MJ`I0J(q{)7Ja
zo`G<2!K7t^izj^j@oH@MHx(BrVK@_A;(GxyWrBndAeO@@5I0V^YFh{z);=s
zrQ+f-oPT&s+F(BqTAaq*Pzk>T3J1c)-;c?d>9%r?b!Jm>alWT`I*lK2@dY)5!NnJp
zWsHlTm?)*l0EMAM)rbqYK`BMKh{G!XJRBo(
z40?>pT`0G#^52@a=c7C(A3}PV{2B3Z`8eWSX~1zgLRKTrlU3+4E^UZMN-;`CNgZ}@
zw0sSoW26k}eBrC@u|gi|I9Z2yyzmP)L7qd}qT@5*Iaz*-El!baw4Exqpmv&BrEj{B
zWq**IgYtyDhPXf`z%!Xu{xV8t$zR|(TmA=a=g4PJGFJ#TTQ%aF(00C%OJ68gBQBC#
z5Ely>%q7B~1(nKUh|A9%sS(r9r$#&*?g{*(
zQ97Xf08k@dgMCi}l*d3Gj}4dAp(v%Vo!bI@I-VGDY(!V+ilQrK#}Ze}24o%^KH?N#
zJ}r9ge|jA0+iVWf_~5QZJhWNn&N_ct!$)UHL2+hObK)<7B5|Nd>;iFtBC&-e_cO%Y
z1&md>V{i!i0jx~C_HYlB=L&QCF3a3K1e~8R3=&4~gZ(!rbJX|8W&g}GOn>YC@qQuT
zn)Bv}H%3G;ybv*~@c8q5lJ!C)G}g4h(}cMv&WLM{1CCh4V7TV<=#OXcQnf~p82J^N
zKT0icGwEm6_=9cG{6@8%YPYC8UF~+Y=c~O)Eh$6n?=rP~G-UodwPuY!6~Mm)~mX|6f(TVn8d%-!2u
zbDRwVOdZqi2A)e9b_Y}UKLaad5jqlm+P>L8&!L%c&A$sw^Rqxk2Ex=YgHI-yIw7eO
zH~RbzsS2ykl=g0PUp05p(p|SWL
zI8Z5bUVmpJ?H}L!eHb_~Qrq99zBWjP=AgeDnb2Uz$7_qfKfk{5&M@`I&|fB8^M7Gb
znPBQuaXv}d!NGDr7dlfgbS*
zcs`|0@5ySL)V8YaRJ&R2>1scr_AIsA)t;~RBDFiz271KKJU>i)6Z1`K6YU?>KBv~K
z&xUe?Q{pi-RNS+zy|A#u&#=#L110bBUZ`cfpryX9Z)ojoNdq*p(i~dRCoPt
zlENJwhA~h39KN7WAi;gL0o>6a1J|>p(P+*?$U$I%KlKOC?!(MUHiZsA3_Xn|oV6N_
z!5tlqD>DQZzDmz%P6A(ixKI;4_FbftxubKrJz0Qqk!=`8*eLx*WHow>%1=?AC2?@U
zvV}luj$DB9n4E<4FnJE~aQP3!xpD%wIYL$<&XdE@Wn4BO9w{?XGD?=C=h1R8JjX~m
z()n^bc6Y3N8$RQNx)9^#b$CvYr;)bY(V6g^EKgvIQ)DFCPL&^`cAC*7m@eC}LkG!r
zlqckM#05s};9xl!t!Bt3#53h}w4G&i5oXIhXgfy;&CeB5G3UwS@Hs?&h_>^E@<)Y6
zU!ln8D-;`jg%Vkd@=~L+P$oyiv)t%3R2Y4QN-0M_RYp^x+Gr}&7&V1jDMYIULS2D{
zLJf&UMmJ)y{09C@sPWUnj+)=&{@VKK#!NGDzdr{L5ca#U%=up-Q
zY;wdY*y5nLqmh@hq(~aCY{kk;_7}
zcNi8ar@U3Mx?4g8G0i+E_$M2#46qCYj_)yYfRDx;vX8
zZg|*X3lnpfcQ
zHpq_)_@T}`Ou(ZW=OfTsaOUADosZ|#QvH$hv!}F(4Pt@*FXQtd?041Ppq8u8u>5wl
zKU4dlS_;X$I=4i
znyC3f;j;v6i__dh>>u>d&=kxG4mUH0Fh=`;)&_ipCKMp19{>dt9K204Fsx&kgMVVM
z1NjxgCw062hhMv0LMFCvBtr}FpN=280_A|_cznmpPwIkF8pj8
z_VFhAOUDoWd`f@huX0@En-bnZGn2mr*56+o-=k|$W`nK!1`7P+TkPu(Q||V6HPUQT
zihqWmpugz`#c=Yh
zne)aY9cJ!d#ZNKwm(iVvnfq7q%MdgF6hHYdhi4P%pSh$iw{BG3?7FJDNL_Z_*t&RK
zUfry^F?Dn6!gUkthSd$P!?)yj7~RtGCvd}(cPg7ZKzZay6dgK=BF%j;^9giwR`CN$
z{vPIB%-pwhU*tH{^n;n-X%1$KnKyDPikahA?*=pHeG>z(SFYYd8qA!20cM`NDnC5o
zrbGD#X7@1jWd|l^ZlUYJgXKp!XuI=cY`=(XPm9OyY-n!X5`wI;rv=)2YJ2NkNfaGZj(^zo>o<2a^|p3)6k#T4Sw>EVKX2HwtsNVR96BsKIy#GbdK;QH
z6#>2JMZ?Z+r?9nyYz(BgwDz<%wzjqQZd*fmiP$g^??0I9YC=v
zRAROjuy&ie_FZ-2{TxP5K4d+`Y3C63P8Lo+z|8gSPasd+u_2M}Rf$eaOHX}SO=WrM
zf?7|9*|}b+l88O-0?gd^@Qhojhe|DIRkxKmic^?C$r22nC&c~
z*wAcw96isGufb=od<<#JGN)?ueBnj8Q0_onB)>#lEKeXVkqwAT&L0w3mibmR
z$$(|P8w$nBC;vV+vFI%1^6tY1$TBCBfB{?GDPm4P-%@^jDR>Cmh2#Kb
znXkaUr%@;lyDamlpJlGE@iEKfnTNqMKPFhwF9|oN#%4!LrvuC;FYmWYjB_wN_W*XD
z3V`<{b5^T*y~VJ$_B1uLdD+JGW!0fRfck!do?9#^fX%x+fYm6*?nAKo8ht6%x}l?`
zInlJSp^0uF5xb_X}-x!48;Cqk=GVEbkr0ijH|=3fBU
zHxsV;4&Wr2aLq5o;5Zf=?3kKR;O91T{k%~qBbR$;xcL+4F99DLY=5Vsz~7&LeY)YO
z;~cTybMbH6AW1|bBd$5ulVkgVxaI^kuQ44vk=<4**SyZxAEw+L-_=O7jpdNvf&Mb#
znm+-EHWRKne^8P@|2EiT=MEJ3=kEyL=Yga!l
zwey#Xo1ch5J(b1}T=UumgTl=-U*GTlI1xBvoZpK$`YfS?@62)5_xk|85m_MuyMVIa
zL^SP8oM3;29Y{gX36001StKz61^-{}6JSOi$
zdYJqX@o+f>aju+%ZH|zm5L>?aI&?fz=AmSiEJV+v<;(CKBlD5Ymm9FVV`T??#>x8;
zkC*4*IYEApv_;RS!E>@agDp-GE{8c)u0!oKnTwL?vI*lnNIrw|guH~fKq$q3upEz8
zGo%^uO!*f|X3695oGrJZ?Hr++&0Oh5+M?&zq3wJ*A3lY03F0ET4so&EhPXslA}$qP
zn9F1tJj>;Iq$}iKh%3e6n|~G~ua>VOu8}Jc*UEI%E|4E0y-@DJo-UF{kzOpnz;>6&
znTVGfMH!2pQ#gHjX!u`H;i2bCF;t75x1%NrJK{9V;
z8&{3xN;8D`doX?AnGa)KI6fcS0Zv}aTr?hIT{O>#1x4d0VU!W-^sF1d2yG*W!^t6;
zM{a>*zTCJ(XCfE>DQbwGlUmNebF%#B$OaZp;g9cl
z^5+*NyD2mwnoqav(?S!Yqq!I|Tz3yMuM96-(O5AZ+l|L0b7%!G(lWftPNvrZl%b4uCiKk7%HzTugHy*&;fu?i4yNX(kOTOp(g5(@Do$bNz
zyi6!-uWxT??Fcn=_};BFwL_Z7kXM^KH#g!fi@U~Iy#rRec>`nH9@lqmsdBs5_cMcJ
zho`;(YCgr=w*QA54vV&_y`sLYxx3ljXlreIdq`=t&Pam=`8xC?;PmOoX+JP$7Pqvu
zHMhG{xT_2C9q!@sJQB^%RNPMASulJ*#J>-BUJkk6EA!>soAhyWI~AjseMl`I`2CtVymCJ;p
zw!)9NE^rDL=Uj`lZG&Wpf(Fkpp~2Q|K;EWVbp{^D4^bZ)Ti1lNf4l#SgVN&3w0w@I
zP1RPp5)}!Q+hF@k#k-$Ce-=OI{Mi1^McTGuA3sM0Knpk6y3eD;KfafIMGH;ad*4`eGvAu{;H@m*W5dc)bwc
zX1tIYhFmBu`kY6!w;&8WxM1w6{8|9O(b+(PaT)Q@Wg^Sj9xd>=LaT7ZQ;8XDF;ge&F_2w$HQ|qdj*KIqq$d!=-gPnT6diye3D>%K)n346{a?di?Y(jj7k6Mn
z2ky3$M2OVm#s^@mv*2g{tH%aw?>V;wP8_Vg7Yd!t+af&leNpX&YQL`bQnlYvOCA^f
zzpwUYwYRIiNA3M;`K(C)N7ep8?K5iss`h2IudC%xOW7`hJ1SZ(@I*UOEyXLD=TCBJ
z3)Ie0Tcox^?E)Ly3@70v=&9(QSBb>VSUL41lQAPM05;$z!
z(4UTQ7r*J*auQORk_(-(&bcDY}Pgh5n#Knwsgeia@5klSR*51opM|d3uGgA7~
z5xyI{o6PHc9p91(@)BBEUgu1}D3isnBYYidr^%rh+jOB~ZSvZCvrwL_is0x7zX8wL
z!i%ZZ5%%*sowfJA2cJUuG2$Y*4{@>l7IBI22m7VM7fE*Qy&P<%LdGMuyw0y+IgrDF<4$_1$wZ&PQFZnDuTIghtCej>d-!VA{_eVbq=Qsd7XfATwdph
z!RrV=g3+bZ5eBLAN_4CO36alWEQe3}3ATp{)e&C7T&j-n$4y~;3;Z+J5&jSxsgCe%
z*eZFQH=v9G$G}ci5$G4_2)|=G!UyQud%kDlePYqQR1Vz61{WMXa52X~K)B1(nl&7~
zA+CgQ#PZ&4T|VaMJIxf`o6zGsu^gX03n`A9^p&oy_dZ*v-urN!e6aT3mg-HXxs%q^
z-BjUC*?!0eb&u}7P6Xw1N`E|1-me9E2$%$f-Qj_99y8&A;>sWJKrvV3`#r1nd9|;o
z4fGJ4`MDJjdz`1As=ZI`yRCQ^El*8ScTa3&4OU?O;X7Gg#uldtiH1|<4%AMQl_;4m6nZ#F&O&)Y-a=d;hoC$eF^^&EvxJM&&X!-I
z?HsuXK6B-hNLwX@>(O?;To0c@BVJo1zd*WJ{(!hdPDETPFCZ?HmGCT=5$K^prXaS6
z`IoVkYWWu88o3d1t(3rjf!u}kLZM>vB6$Ys#quP!yF|`Myj1u~%_8RiLM;$;%3^p*
z2z+T_5%Z6uCP@h)Jz{<)`WdVe!e+K{l@QEJ{BZneTqJ;vk7Hdpz8Jd`q1LgZBMg|F
zdIu0i7!S7yr7e!1#1{;x_@puM(=ql4glWB%_a0^oR|(;E)Fao783md2I5vt!sb-zG
z4tq+(oOeMCXtqvLo9hOXh|JCp?Q#?I}iXDz4q*
z;o5sfP1x?xfs2~^XP~xzXsoyAACn)}B!yJv1^h16p(NxOk{ymRfuC_|@bFR(9c*rC
z>hh##O|6F(?hD|#3;!kU`#Yeo;CAevz5`iIA&?WU-v#)5jq`HHeoz0Oy)S{UtE$#N
zEBD^yX1YzA(z$R8oq%R+nkI#|DN|dQBZ_d|F@TiVA_xs_M?myucyxsG7e@l^uZcOv@ok+KN#77nPmj48Pr_;W<
zO>r{MLww5CDUxq}iTwyW-W+`%4d7r**c0A7`t6HT%7kp*-1!mC&70GCM5Xo_!5)un
zzY5Neu-||8qK|Mp3H&NdJU_zA8^<^QUUQ@GhGF;f@2&Gslng(@6<@l$=&0m3i^`6y
zz_^HtuW_0?>rJ?j1A+{P{tzNr9Qt=47;@;p;w?Iv$h12DJToOpqhN68C!^Nuur?
z`8x8)V|5-wn+xP`Xn&#n0CgA1`_S5Axe#&7q33UPehjvuUZPg#^=N0AT!ytY$_^}-
z%jd9ck|kJUvwR)#74k#u>0$B^;)k3009VT8sI^Lbt8;h}@LGhbIdJIox*l@qQLA(M
zj>&^VKOgOkmqQ<9oq$9CirECqp;xf1Ak~cB0YAQ)sd!3f-HY0n)2Fj~6Fv??zBgg`
zUATueeBvDa?s=Uv1&D&L8c21Z9yoNhI;T(T@;5+?9Qw0ZCqo7Pa!qQqH{nTeQvi3u
zlv56!{)DMCK7{qWoSq$~8P5(ey8fjhL!A4zz`CM|#fb>pOSE
z=fI6|sN>DMI@5dGFR|mz)scyRJv0W_2Q+s)S0~6+e9j5+K1rVQD<#UEPqps{K)x=l
zNhRM_@Lq8oy7tSSaOmvMd^mKxWjGEUeMQdHap-?hkg)X!V;G1~)c;@1BzKL;yIp4(2H!;a?=bPBNn;m5y=4Ci0
zhM!{Rn|O0wqqmt}ihKG7dwV+CMtTPNJvWD(n?o+|IplI^4Vqdf*i>>aC1q>rda|R=
zH?i|g9MI#h90TWxWWOBwe89H_*^n^AJeqohA!fdgqG^6rh9Tyah6%*X{BPmtsSXzM
z`>_D4!KaYnXZT%3o`&B<#92fL@%xNv<0Ak_#W~X}6^~LpPVp4Q*D0Q%xJ9vFaai%~
zitkpuLh%EN&Ns2&-yQh)WWV<)4k&I_e6!+3ikB!}s(7X1hZJ`x-k|tt#hVmwQT&?X
z9g24=-lIr|jNGmV6(3f7Lh&iZXB3}Pd|r_w_*lPGaf)JEkw!u+->B$(6JtzS^_o*o
zsBRk>8R}`@I)aHt#t~*i7F{3QVdyU+8qm!q%)^p$mgmTpV;MufTp>9mTZi@7p7TxY
zc_Z2{mSZ~_x9(ir+4+#eu?V=XPRQlMb-jeXiJQkW57)A$<@IS3c5g3Q>yx4x_M%>T
zaBYT-D4oU6eGi^!k0U}>)CPDa{vY&QXe0V0Qm_#{lXsM4yq75{yxBnVorJ*8!Xhw|
zuo3+)O2&&00y_m8(W{V3eh%?meijZ#zQ|j!83jW3Krv}Wi*fl5@)I%{&+$U}rKx*8
z@{`hvc(ME*%My7jmZj2%b(YELSXw^|JVhqS3glGCQD}Lxd<2qHWEtX>au;@Ys(b-5
z`$;#J)8y}voGwozZv8AQg5)fD7Hga>Q&4w~+==Sw--Tp)jkvH_CyQj8Xs$_y;6pM?)$EsgR?ESJlzST;#LAuk7B(m<^5Q$l4WSY`dLVzW!Q-R8wH__=<6Y1{VZIBl00lgFTq;IWg{AU7%N#h
zZ39;<<>#S#>;i22nwiE)hot_2E`q;>+s%fhHu$MoTuVV}H3VTfx}K?cY6{EZ<>#8r
z)VXLjwh1MHx#-U*mQ3A6v1Iw}C`YOf`wbgWdRWFey$q@H*I-q&5&a1A7*H*=5&aD^
zE0DnpMQubW=R6Zf{45-XzR6)DI)ZH|RKuL7=Z1Xw>`okI4d<(*GxUN6^yMLf{+dwb4
zz}~Lbj&N49zCkYs+2c$^Uw#wO{LMl)o$SvpADj|kshnGd;0k#W+$wB3d3~n0W9MF>
zZ(CFAL^Tt&7lNA?ZQqy|jW1qN`_SkY3*QnZ5;sYXFbvUm7{0FHT{99!bCqNo!w~bb
zxytCCvprg%gkewYLb;{+*oE>vgIh_y)9|5K7(Nte_)wtXL-EahAmy;h2NRLMTyd4+
z(Tc|_Zd81|Vw)mA)mVQ(ahoE?urdEq#VZv*q_{)z2E|V+-lRx-AJ+ex;vI^2E8e4c
zzv6?64=X;Q_>|%^iq0po->>_MPvRZ;n&Wx!8AZ-J!}NbEI-kVDUiC=Vxg*uNzB*nR
zhM_MP*SiGw3~)6W9CP%kfm6_gW3i;14P*IMI0gbx0eCGc_%=KuNYv5(kxw7C&HMMM
z_($8@0hwHOp}hA-oG;{mjnW<-N6I~VC_
zdvhY~@u_I{<1)l;9X9bS3Mv`VV9VZ(bhN!CXpjAnZ5Mhy@@yS8L07AMZrEVU_-u)`
zN4r(q9-qo~`#y&_>(t`U@I|yY57ed&EaU&b6|LO;cy8w6w(n9ofC+zwTw3D`G>2SGQ&XKfOE3(0txtqU;(ktJgYSy?Md!-@fsHa;`H!);=vkDlC`F4OlkG{wQshFCo4{zKK0OOn4(YTz-i4
z+FAVOVN0^O^53F3yaf@=qZ%#z7@V
z&NS|y3M^OtZ{&e1KNLF&c6=Et1zdTj$xL-ZB(?@60atz}#R9JUQ*0vO%Ga=xa^;Uh
zj$Aq4mKc!SC09;4$CW#-ym~B8#Cx49w|tM|#XH+Z+N#hEH2ED)S8Zo}`waA;rzf&)W-W>0@_Pk$HU+j@q3+IxC?Mz*i)?&<98>JNz2
zj-l;?`w}m1PYW99O?*Cl)4Cii{#ili`vdb|Q8u`nbkfJ+?t!6^bWVHT&4aC-m!|;mW%5hbb6L4I)^P%u@Ts-8I_cb31yPLo7Mt&J$zZ_T2cWbY@eRxc+
z9Cri9m4|oukPBRdOx`E$6QUt1gt&d~ke6iKn2!M|7kz3dA>lc$JmlUTSB{fJ!>fQR
zU%G4*KkjGvEO{1J-dwA6`tI$@kN1@-nReyt2G_D{Gi=L?aD^Ja{FjJi@#QqY4f*o>
z4aI0}%SlLrFFzFRfiJ(1se%NxRPaBX##Ii!oL09XU(P2}UVQm~LNF$$p~YN$`PInJ
z#g~(6Et6BRESL4zjFj|ZIZ2ixCl_B%W%pE}s%Sqs150aL{v_g=eEB0-qvgwKdN5ZG
zN6!928|X~F`~c)<^5xGVXMxb+&_ekh>MoM^B4@Gu2jZE0`Ntu%M81q=mE4JCwcLkg
zjc{;Kt^68G%a_xG?oz41vO#E~u}ntWmLCFnYg_&U?5VXa|2gDW%6qX~B~@r4i!Xl`
z1tDL43Ir@)z8xib@a5ySEeA<%v?~Eg{$;ZXmKiVPnN*Nkj@^lo;@&uo4-t^$N1!0q
zj_ge{@5M6Y%hk4g5W=w&Ar$cCnYQI-Ohmw!pTH)RFDKSqxvlb4t;&`VEF^E%qw#KYSSWeV4Z7$GiDXTjB2f!w#1x=$@59Ks2!_g
z&tI+V`KFCN^=xQX=XAJVFQaig9p0p~&G~fonvRaGeGx~_83cDm!g8?VoTyI;@x4Hw
zkD{-K&-U7Sdwqv8U7fA;E)xzoQPo72sv;bK;+HSYDv!<$nPUiwvn~%iEEvJlHr&@S
zxYY|zo~T~Lo#irW<5taz#7m5RpZ9QA1z$nCj7kspLi8=G^Wu{j4Cn{(hDT7I|UJ&MNW
z9OVyc`eDT<6rWOjM$y=uL!L?*t`8GF8!T0vtTk>AagE|y#S;`a
zD!xv!Rk2I)EXA`G&rv*I@nXeyDPE>{mEzTk*D4ww9s6f^bRf;txWBh58k=*Z@6_~n
z6@R4o6UARB{#x-##Xl(iMe!es!Y?|sTclX7SgANmaj{~9qM3;X^)A!&`xQT|Xy#Nx
z`KL8~v!XHRLjJcjeYfHRie^4Pls~FzGoK&Q&uaQ#ipCc)@{KQIpz%cvG`@&|`{TQo
z`<3B~7^I=`MGQ2)h=FaC1JZ7jK8R}+$;DE?#rqKR&GiYqLeo=;_{5r_X|H;Cd*4V~
zJ8)#k$8H;=iMdz3TOJ)R8;(aucLo8cs0n+*qes7p?Nj7fv})Vt3J%9VmoMUMoAZz2
ze9Fh>oNgWRu{pmQ8?>4mpuuiaC(?K%crBX07!L)Whr6>m|6jD1);a{+Ubf9S=ijsK
z;nX+JS@zRqkvfQaG>qkQ%?8`vyO9yyzIAAi^>=4;UXJVMM%x(Bw#R2nw7m_H_R!_Q
z_I*z4)B+j)8|~#|bN(Qnp9lC=%#!Qn|1L$7iN!x5m$nHYcHaa(%c9%&+DQK)8f@Qv
zh~v-?no3yA!A)a{O#tow5^);~!aB&+B9qU2+a8Y(*NOImKwreX7HqKX@!l1c>qaAw
zS|Om7gU$Ie-nsym9cS90?~j}cIUFrdmiI$)
zic}$9DWh%B{{+eD6171;0Ftxh$5`WRDM8&i!dI=ivKTqm2K}ALPs^XMoF~2w`fE|^
zAlZ!Nd>L(neje&t8}y$+<`DS;>K-cj*r2b2WW79v^ET54{R(V(qg;#Sa=8ghYlHp`
z#H|hbBZz0(pz|?pId!@`hrgEJV)p`0J+=x0%BjctP+~dt_)Kg;NedSAb5cr{d$Jcl
z8u79V(9XDQ(7~w>v5uskL1(}-%csmHq}KVVOl$KhO2$(qEQ^<`wfP&dm5FAQ1nl{b
zkVw$GP{+(aV54Aa{&m(!mS2ZFq`J_JaMGfN=T%6RzX?@Hr1O=BftP+jr2iP1%)qV5
zI%%O?WFo(6lpKOTD&->5M^D@r_b2X4WKrz5f5f@9hft$#FC2Q3ckE#G-FHD$}mMr>U<`wO_h<
zF9m_#dA42WF+*(~BaTfUY260LJXu6_KwDEq38z-uOvdJ}wvnwvq0g%RfswvI(&xrW
zdN-bRUXa@{)PZ3G_QuUMIW|4KEd3KcOX<=%FoGdLou0S$$Rk&z7q1!W=uV%~H8?Qb
zgE2ze4^G$BSJze7?vhLA`@ux#(!)2L@V$nwFB6$dXTRplrQ=59xODUvInO5)pHg&O
zy5BFaG%nrD>xbjL6CW%*?sqBvK+za{A^#ywKc+}CJIX(&Nb-p3BE^(qr6SGs$bmNy
zK^QhE((aAvQx(ZWz04dsZUc@($6*M9<^ISU@)>|bWdezlXs~kRD;YQ6(7-1Aqu;;w
zIdZJZ0ZdqjCD{-gY}Pa&(9hW%I-OF_G(?8qAlu_V+i%OmAfWQ$(5Wa(`%RgpecQMLspxqy
z)_i{19C{k<@tm~5?k^FyuOJ)`xqLYEx1ck4E!be&%jVEIpWmZa2x#TNp)X(RQ|4yr
zGv;G+=x#ngoM3J~KR2HrIq(~CHvk8Ibp|881}6v@@fCa-Nyh1yYP>}DWLc1^ERCgR
zrz)o7$)#50xce2wC6-!MS_&s6D@qS5Z7vnuij$SdEG&dC=tR2`jN9fKh?Mkg5Uy#bqLN<-JnCb>K)B@>pJYCJ2Ki+4Al
zA125&oz)eRiM@kuU5=+!T0F|0h9{%*6S8mk37JSdEM5eH;O6u5ybqu^XzTo8MSj~d
z{YgcBn=<_+#oH9Wp?H_#_Z9C|{F&mf6dzOko#NAqe^vaKVhpcoTwk#wr;lQKKgHRK
z^Ar~;Rw*u3Y*t*Yc(meiiYF_crg*wyhhmT7fZ|rgH!EJGc!}bridQOrNO6ba4T_&u
zyh-sE#jh#ep?J6AJ&N}$KB)Mx;uDHbDL$k4oZ|C}Za%*V2iZ2%*1rYw^Hq0twQt?h
zN^f&E4*OuQx?`ZPuglHnN3M!?xHyG^a4lY*`O77_Zd=jKuZ+Vu?~MWBG{2t=zslpI=jR
zeL4)gIT=l+gr~?PsYgyOp9^>4
zEXthE&$kcdgDlhM!sFO)Yae3n{4zl~Jpe167M
zbRPDUrlRyp#egrcsM5oQD
zOcWQ!w!`tl;{2xd8#R!zyUp-0{R0>u9WXM^Y}A>J!oRJuDw(c0{J9z$ZB5{=b77hcqE({aVHk7tV{Kn>%=CTdV^=`s%eCMm!`6~W6
zPMlYwuj0?~lM@#*ogxx%Q>4c|rteWSJ{FKRJ{Ew+#{$s!SO6Ly3qa#z0cdWCM!^Z*$H{)XgXnZUHjgJK&ZLCJwhr;%Z*EI9dl))<$jnM_{waD$U
z{6+AwfG?E@H`~*{dBBpfZSCztUE89iy#pP+J;QML6sZxgxkFvO%IFUDZy6;vHp?5<
z+dS0P2P$~YDJN97jf@QSv~L{&O`LC-4ME-qE&bS#RS}2W1j86021>z%Y&o{UK$|$;
zCwC{8Z6C_^qE8LG-fa8OCdlREW8pnG-ud`g7|*9bimOLW{Zl6kmz_Tz-n9ocVfmu=P_s7H3WeNtu3%ea`$z)Xn6~qx1TG
z4W)C10~_|2bFiJ6eu}3fKhsaK?^EHokhFe^-vOCieu_Ey?h^SdmR0gKEUV>vSXw{D
z4!)}$XYTtc_BnIkPqELL{~X(I{S+@i3)ZJX0>=nG6`nBwPg3WOJNI9U@U6+O{4m7KD9&h_U$0?^8P9>yG{0EG
z5W^5A*5G$4-?{SQ&T;=DN8q?~$DQx1+_~{j3}V@E7r+nma}xM5MdP0s>6>Nd_LM+f_xk7@gU+h7laL5
zFEV$>oe$>8oxc$q^=Qy~cpiW|UpksE_t|kj-(Lp)iI+F!&7J?89g$^k4r1`Yndqs(
zwI?EKy%HDg&MR>;p5SK-nDG3)64R16^h(SVO}!EqkL8tk31s%nEAi=AXPJ;Q&Gbrq
z2y*iCO8i?$j_sA0kD>8sa}8(xXug)MJ1^ZhNCPa0^5({tHUicqPBZCI$@puDueMwqU2|mAH&bQT0k(eh%6huUFzTS!WEd#56Sr
zgMKL113$#{J)GMs@zE#=?91<_ScWU&L<^2y*G!}8&-O~Z07a>1ahyn-{|PH%;EhYlUWAQTx9uZa(pab#BjinTrp4RqG3I5@kODF
zhfUKb3*9^ReO9)kZ)t09
z=TK)rHX5(Oqj>MmR~7GV?rAR$-@WOmkU|H2-s*U7$9wy)Ue0FRe^rW^_fGrT#5W}W
z!_MZ!jCGeyu{`9x`NEYK?~VJHAiiDITV{Mscm;35pvPU#Hlr*rj-u;@OJlD4wr)vEsWFFH^iq@oL3u6<;m9
zxA7&6}tGi8)+M7(N?e_ho}s}mUSW?UGGkul$PfuqMAu(
z+l22xK^kQ?*!Hq{?eCyH%geHVYZtJj(ucIIzUi+t!?b{Wv{bRKEMK-L#t}ELn
z{GmvD=<;Cu$ceK~t=4}B4njUYgLmY~Ywv_yTH7YDUl{JdKYBcV6Y0NQ@!Aiey(Ojv
ze_{8RXwOBKl;M7qM&|B#?In5g+JD3LJ?gL0EbV&1Yd19eG`3m#EViHF$Ni<{wVlsk
zoM6spu=5!V&f575c0PmqoX_Av=QG&(4Bpb;)tRR1dE5-GS_!`pD`ZOm)5vtW^BElW
zeUwSJo#Y&L?2A^%6Ny`md_I6mF$(1%D`vb_21%6j>nIE{qoj|fOTz?W#-=#xA_aMd
z=frC8DP(-#^1F&YaQRI{oJEAtVold5HY%=EJWBC6#Zwetr+9|q7R7$WVa2yAa@;f5
zdxfI&8SM9m^BL^-!$$IqI6p2?e6QkFiq|M!ulOm&n-ssI_;tl^D}G<`K1B}D<$4}b
zG(Iwr{-dUOWsL_X$qbAY6_|!A_*e>!B-6|B;KtDUIhs7&f4geQbm6TTojWavz1o(xp}iXyw3l
zHL6jjpu7e{+3TZheXSm0kGq>L@2trB^d7W^3;*X8#c=imZU
zGH5yli%xJ@>?<2={}ChI>b-!RPxm^iMBCe$_3f@Q7H^>&@i2e(%*k0ZWR
zc;Pq5p*U3?*X6h_$90)WsNG!f&aTVZbve7PDDl?R+8FRI!!PQDOm;19RPC!{RITH>
z9M|QzE}zT!G(M8a`Q4=G=7RV8!`XHDYzn!lXt3Oh%C1z;RuU>vCL|lQnY?q^I0ll=u8Z&X
z_FIqfxc4+&dIcetQA&M0-fSWvmN6=X$HoD$8uxy~CQHA^?RgPI%MDJuWK5r*pb#+a~uVza}hv!8-a-d;+lT_iG
zsJh#{Y1^-(!J)3sp{{T~O$^X!ZEwT0s1)#L6t!~@c^%i4F>kd!O*#ig28RYZJ#X!iN3KXOUNh9uoj#>&aA3G+WMF9f!RfmC>bmM$
z&)Ic3yDn$f<#S2SuFLNS=da5rTIK=xbpqQ26P#U_?*a@J-)byUh8f7iZVy?7Ey?m*;Iaj}B+owY6vHESQkB
zZX4)r8|mroYVGi?%G!HIS{>Kb)gQ2Z9YfAHeb^bDT^)nrSHAJ76pqM(bz*0GZ>DfK
z)XfMl4@$|HWTqO=@^X#aYOU*Q?Q84l_uBeL!gI8v4`z^NHone*t?j*C;fHstKjC38
zU1CRf+fcApkQB>;#JR&AZKyfiV|Xkh7oFeF#LXgT%gw`x+k@k}9M@G}+Z-8g>9{V(
zb&;#M4KG*3Zz$fS_rw-qVBC%4y864)Rhzf<4EMD6^!AKwU)kN$+3C2h
zs3BMAP{_^0I1-X-B)+VzlYc#R^et`e?HuY1vU{5P`aERwN+*
z2kE!Gt1oD`cd!i{UH8DyNLnS^dV5=Y`UZP@x;k4ogRl+vDEoS1PCFxGta5`Zk>dgY)~o
zqOq44V}aBPJR0B97~FT$i)!YISy9&aNxw;Uhf~+!#h@*Y#%QvMy4*MDbEZ
z$94JK*4LHWa$J{x1IhNo<+v`tUmVxv_rqj>9mmR?vAM3gI_I0-ab1qx`tcpmNz)A%W++f>l#pdt*wgAuFL1Pu2)XWaa}%Fk-eOa44g8aToW$Eg
zGQNQ+DSW?yWG|s0!9!nAP!uy0q`zHv*_Xk7P5xY(+ejfN9G~!
zNd@vnHgMpYvCL|vCL|8k#!??xHdSK5JXV(?^IwSYR(Kcal
z{<@sME@#)}b6$??3hxWKVvg%_To=ux_ymE?QV=$j?J?KYwA|Tsode1}CP$)Y<8lq`
zy%O>m^j3v(v#|-g1o=r>ig>Z?#Ii(A#j;e^z=*6&>aZ-Al{h3RIRnc{G7UKuG6OA4
zmLW(^kz&Lv?g0ma+>@AlGEh@#Ag`xcBcFT^0VZ}SmSJY9Hn#QQz)G)
zi;=UxbYeRXkWR>?pG{B=35
z3$F`daCTjucRjj;_B)?cbpE>h{%~U$on2RWr`UbWab1q<+B;lVeQl%Tx*XTV!Q<6(
zE0#6Vf@Q6I2g^E{4_2&R9!Gqs`~}MfITUxRWzq*8u2Ig%a=BcJWs^)tX|sG7@fC6#
zn7hN|cEk^tyCJ_)-iqZanF7{rweUo4k)NS-jhFm25(NeCE=V?^ery#4E-xT0=f(Q4
zxWdH6i*xX4F-1M^g8I_$w$VpNEweIIatQ>bNe)bvdrfab1q_#Osz4J@fDOz#*2~iWU&`Z%_&93e6O^0RcR~*Ca)ZME9Mm(mS~=agWJrs9tcM8GaYg5$az*X6h_$8|Zb%Q8LAuFG*<
zj_U%qmHDFJ{B=35>oh2|$@QJC*rC{?=(sMwe;n84xGsKU9gGje|BQTW;W9DdL@aHb
z8Mi^s`Rm#nV;Jkz>%32RIp6ed45PE_GFD!W>ng|G4Z^!H{!-JvwWqhU2H$>F{R917
zRb6fEJylyeI%}1DZh6}8ymVFHNcYyhcA(j-
zD)jNn;epK~$Y>kt=w8V+G!9qwrK`5s-$}#is*~#R2X5ZHwZDVyR$+gM%4Ue>SoK-bAG%$jS14DjhPk(Pue;4B0dWL)2dwP3Dwy*5&>Fn$Z
z_o`!P`{2kxu#?=rrq*TNE>9M-0p`?!cz80^m|d^g)>ze7(?76z(4I;55RUM$1qK%W
zA#PpM(XqA9%RB}Aqv?ev7(5YF(l%x~((CAM8w$1^=aOG1dfvEs7}cP~bd_(=;`e#j
zy}>bI$7LjJZ~NC%N8i%c-p--UpvQZf`ug-*)x+Z-)tqhMCeXRG-akUE#|*V~WL|g6
zyTXBXy@PFCwq0Mct+&^|?7BKzc@2h_zJJEn1>5AO!&`x$cK*7Yzb$-wj2T~aj_Yzy|gv*EUBsRcZN5eztR91e%3T&s%%skt@=R*Fckz
zKBa4LV7LdWhV2Kd^21wmC|>^Cs8{l29-@iHja4Ujg=Ix26w8$ORM}6a$7aY(nI-#Y
z8eTz`-xM~)y{DhIabhf^lNTgFP~A2%GSt()b;NO9yp=kxi@o4Km!eObmyqjfs&`zMU#v
z^ojjUexkv^VvIqZ?%i?o>nkoudxyk+RN*~XY?~V~|rJosgU?w?lG@Y(l(J
zeu3ScD&K_6esT_$(B1hhb2P4nEXd1meY_m2Jbc;_Xe0gh%Z*KQ
zJoO)F3+}xhVOcWuN0uea|HoveF2#Nq#N%hNdNRHWsfsqVFNenEI^;3X)s|c{xs93o
zb0*Cx$l!$%>+q`Ll@wco)FI3{&#R74rp$7rmNDmCuO?o}oMVt`!9VdJ61DNl4*)um
zeiQz&-hp$FHYEMx3Tq=1=DXiVmkVJnsH_pqfav9!pt}v%MvOa?ePpNqIfbx
zoQ~3pLmz0HrcW07K`ROUpq1wGgI1R92d&)tK}%UbXp^%2pjA}M>Y3Ix+M=23D<{j8
z!j>85&BPg*;C`ylG~G?_ar8?f!xIWR8M}|W%Z7Mig=~yhOpRYJ8+LdFUXsVTKsMlp
z5JYhbA&gb0L~t(K(t?889r1#S#IRSla0i+#M6-1Zc6h}FIEE21tk_5`pAV@ilwxek
zRIE6jNO*;m#%g257w(9AQ)0;rcIaJNw*p(3Yc+FF&0mqf&0HnVWE&_Hni#JHjlJ~cnP!lu}>!@5vydFS~;z9W@Tk!av^dG=T%OdS{W;s
zL~<%}V%?G`j?GRdO6MkuVrNz-Dq=IziQ*av&YxbHkiyCW+}Xui!q`!}!`(fbM_SwZ
z2Dai!XAAda2ybiamj11+!)+s*Ip`18DQEYbeRk0Di#xD4%g}|kHRBrJd-D2`?Soxz
zm@mhK@B71iyL+~D2Pc|gj6+i|lMKzbI6AexH&eJVGr2rS^0dlKHJ+7G*wk9r*V@TW;soJt&HRld@w4weu
zS>R22f(NUKj+OSQvKM`nZ(ILJIHcZm-79yfuQ{tiD?qlDSF2%DH&sID~@qERL72l6~CZ(tK!!c?^OJ*;*S)6qDTsb{q$?aCl&vo_!q^0C<@-_DPN>mu2`u!
zOL4JcgW?+$FID`YqT#U7-sd%ai{kBycPf%p;d<{?{9na~6@Q~hl7({5D*j6`PObp?
zrHY*JkLj6;`zszo#O-1=5%$PODxR#kNwGt5i{e(r?TUu5K>P2~^rea)R=ig6zlf0g
zg5vF(|4qfaH2=q%Hbfk@>p{)Om%G{CDn*h>-2SzSU5f8f{DR{575N2PfR9Jsk5~_z
zV$j%OBhC9$0d9Bng~xKQdU$)^NLxE_WXQ*E8yo357q+Q%|KnA+4-b3Q%&5+NC#xRn
z>aFhVqG@YS|KC0vW@*bdBNbim
z2JA!&^0;2E&#w1B5Vv&@^_JkoO*5jwmXYaHNTBM`xeIn8x-zsc-d`_|spWh5e
z;2J#^e;ZiF|5p{Q+~EK(yx~(|_Z7k;(U!$@sH99v`kVa$0&bkhu_fHrV!9Cn~oS+xNH?
z0$RD6=B4%Hu}5xP)~w>Y*U^}b$7RuA*6ZtNF1-23isB#bjCnU7dBkhi#E)w^Vn$2s
zxScZw*A}e%=My`Rkqhx6eSzow5gQ-qZKh#s=Y9ca%AXP8*$UzQal$UZ}Fvl?9qz0GGR882Fj>kWFFM<^o6tC3my0J3uFZQg)GCwT9_>dqI8bj
ziPE`pDz;&N;cLVJatrd)G7pmT69kX(i3e3^^73xqEM3yscak$e_1i{%|?
z=U|zP{W?S*K?{e0$DBlLcr>6E<%+&^fn*BTE?ZfiTxW5`+A!g-vd`o+klMNa
zZ^f8(#LRDF^Psf3o#h3obI{dD9YV2!)Cnw$ms9Bk6;3nD;^pr!nW_JSJ%ZBaNtPv3
ze`Q&++`P^tQ}06;K!wvm$z+_Wvx+*1Q-yOI@)#E5pP|CxUBldgjS7ci3y^aV{&Azi
zp`N7{scPl~Dx8%_HRGS)izHMyRQ;TaH1|BNDjeorh%`^)wfM^312
zp&Ddypt~`zoWAbHMse;0x|xV@4y8>pF=&)Fv*!2_K41!X3>k1pakTN?JLs*OzYeOM
zf`TNJHX3Ku)zIH0OR$O=v#>CYAS*+g6EF3s&RG~Qd47~WCv14scH~m(@Z7dxlu~E0
z_Xx`NWu;Cj^*H6RGt;WknFo!|xxPjR3ZJd%bV1?X)9bAB3GKb@q17pJcImHmov){|
z%rIH?SApBsy{pg3@nPK^>M7a9V`_OaR2(n2jwc|vUyyERlb%}6lPkMVwRHA6bLt&l
z23b0&P~G)1I=!HF?PXT)n78M#^gDbdnaKJbzWt~1_XFPx!!Qx`J>-_~iDf=xa_M{K
zcji+0;C_yf#GhQW;by^~7@ZH0916Kvqw~S1(1A=th+jR-H##5SDor1)c)a39MWge9
zT$`r56^+gZ`P(#YbUsLv6Jz^VDt<`O=zNfWgQktn2kDzMZFD|J8=VjE4$Z$?(dc}T
zf4`=U&Ijp-HT{I*Q;N?hKBs7OK9DzG(mzA({!sBJioaBRO!4=M&nW&~QSe31c9M#d6sIZ9Rh+L#-w~8wM#LBXu|$x?
zCn}nmW|2Na)BTFZiW>PBYWi)8M(2a}-lypgDv~K+yPr|Ki3mBP^8wzi`QKMGIv?c!
zLemc`K2AhFxlnHJLd7~obG;+qP&mMgG~ZA*NdK><`58=IGVi5q$J}3lS7;j4s#k#T
zQSC(Ld-xT)N$~zvpsItYw?e^w*dwD=ziMJ$Ujln2HVDF
zWJK3XT}TV^xL&T$uJ=C>w{;NpPREX?8PQ*4kL`1vk<-%aMCQRkt*~z=XUWaL_T}nl=zbc;<9E4n+0wjqKi}fP
z$7R85j#nMW=N!5J2iLS5(c-lv2iIokcNSx3jeh5OM0m#75bAgS#(Q}(aWVP{%(r=R
zNa4|tgVyE-mKA`FBosB`FhRfbeM(|<0In(Mcg!O}l6-QO-i@qG{mx-rpPYz%tKazs
z1Y`0RG#od&53Aq#o2mO}h$m$`;#R+N4dSITf>oDECzj>X0hyE(;uN1G>ycyiJ70mM
z)$crn-JL3TKyp9fMLEsrT&7D5`I-8i1X`Fa)PT&9`yn}3+OTc=%V)8j2gs+8pH}_O
zQOM8K@618n1#rqL7l8&j8Er0;k76y2@_8(m%T6qtmhQ6Bo8_hK#M)9+MZ>wNtVG&vWsy06KB
z!sZ89XQ;k8m}Ld2*J96Ng3Uc;+Cr4a_#(1#S{0+;M)Wl^AAtZgI0Vje6+${K%i9?kVFAMZLd?f4G92;eo9Kt0jJh5zn$3Zz>yx7;>U^oui
zEK%)^8Jsf-kC}*gpo}tfs86jCy;F*D2@Q
zv2L3;y3NtskxS7NeFktVZ6}$Bdzp6+vi1Q*Pi17-PEld(Oi4&=el^DIype-?Vsj7Q
zqtQB?u`Za%&YyiRI%vRBn=fc4zTx&gn}=_FS{@zpV7J&z$ma&^gp)YFoC9`pC{Kp7
zlqWBEw!Xcq_OYkaOR3=5=qph-ZS>W6(ZL?!sDunXPDa9R@?ILSW1DA>Ot@+Jw9B}S
z{agE5Gv)#u?!!EReOr6|5mp&p_R3V`n3+)R;d%wSGJpBCI()+zOQ*xKiLBGX<^^FQ
z>Tt+a;LX;2s^rq)6_
z8vPA0Lw^HO(dci0Mt=i5gY5#1{sw6DH^2)u-{^0UHY^<4Gx{5(js6B`^fy4GzX2Nk
z4djge259s*$T#{MpwZtT-{^0UHe?;p=x>luJ~JQv%{x@?HpLA64L%)tUm8Y7
zReyuGWT(GDheraR2@H$yC!deg$poJx)&#)HEz!7P6A-6dlo`NfVZ!lP+B(c=!9O4U
z&1-N%F(%&459Z$1@2HRe?{^m1i
zkLNbq+m-(2OthDe{^qM_&+1#)-(;JZz5#!`4Tu_j(7lXkuw~aG9o^q=McN}lW!t+6
zan`BDpJ4;8(R}nb*P@Yp^fx;pmo_c?3$B;pPW+?W_q|B}S$zxl_W}HIjt&A$cnIzB
zoV3C2FVUWhEGq+Ll}0A@H@tUoy*xf#r#hxhPljLyZT=fN0-PmOWzCkUSj!xtslj-B
ztW83j*2miSQFoDi6s;|m3lO)uoY6kk={BZdN*1J+J!!pyyS`k`?F6ZAU2z{)*37cwlIlPCBq06B*
z&iYt;7uGU9UCv)o`*5R+fiCAQtRCocj9pdWO^s?X=yF!`yo;9~$5h}=?OcXJukv{Uhq8Spo!vo~^B^k+x}5Kz7E&Dk1znEu)|QMfN2=lih*Out
z7dZyLaAfFmaG{%PCT_;+P^=L-yas(;&M%O23{poiC(z~4Ug0(PTX$<5+x(8?zdl?Q}Vrx}2}F
z-^{HZ9i##02#$d7aIM7XbBqQhUN$38?(jKNP`KgB_{mqsabr(rq;XoAu)B7Ay$?lI
z(kuB08!`dwFCFwgQT2(1b)Q%WEl^=e8MHuQx}+?lxNJs7u~)2WBDQ5)hgygAq4y~)
z^P|btpI8X}P+_uM+t!R^iS8SAJX5r6My6K|>gucO
zs%vZf8)?Q=x<~nX+LvDqW#0DrW|PZz9A7^svL1?@2ESPRU|&}K)I`)vk^911y7}zN
zrI*S*wg?X(1oK`F0ta-o8B?&ku|)@~T&?0N#iJFESKO%hdc`)yZp8t`ZHjMJyj1Z@
zMK`v{KQ3-;k>3wvjV&^|De#y^HwF9zKJht5#^|PiMmGgCx+x%?y|Dbdia%ETnW7zQ
z^rWU~PD**Bn*ti$6!4WgwuqcNbxO+>*D9W_c!}a;ipSsvMEM~_ep0{WV~cQ0bGj*X
zd?fI>z_18^-s?etnLxTL8mt`k0E`<-1W36kU0|PvywBS@h)C*z#kX$vD|n-P!dLe}AgZb9DebW?N-m4=)Rw&`r$)H~4--xJv0u5?p%
zXphfl8*F=g&PBKHgJ_7yhwYW&&wgh52K;RuM7^WX-o1=yuw~aG9c}NUk@j$#3fj8~
zan|AUn_)Uul8n|?xXOzx81D7U8_A(R(^ZVRs$oa%cd`u*9_Zvvk
zml%{z$D#tp5yfywFpkKKIEokjm8oRWXMM>bR4=+1msF9gq4e~^$;gp;T$fZJUt|MT
zUm)ioJ0^6F8W)ZcO2}i#FO-{2-Aj<46uO`*mYrCZ$f;PC${MV!Oz1MQTvnpVl$?R(
zB$H7SWc54Kytb~fVkB?{R8r|gr*j=<#CkG
zkx!v?t}I5*{?du10oQVA=h75oS1fDd}pv*%NZ0gx$D3r>Uc}nAld$spe)c3FcqnDbSRW
zY7SDIn`LufujkLGR0Gkf{(=5+5z)a}9S#r5x)}X~)YdiJTDQERzP7n3oJ+>ns%FV|
z4vaug*a<7{Bad8>Uc6?gqdR>{*Wkc#4-|*n4^I1}_=Mt>@%|WuSnx&dXN{hNgkMKt
z7(E9GCiRE}Gbc%O&JdLGdl9ZQeJ&Tx87>z{lQ-Hu&mux-v8HPjX^X>hzLFDil0;blA^J9#`b(e(|0M-K#beT?_lE3
z6n~}onBwmgpH`#^73Ke>NOuHG7c0`lkLmpsXDiNAT%=f~xKy!OakV1Njo8j{iYF_c
zrg*wyhhmT7fZ|rgH!EJGc!}bridQOrNO6ba4T_&uyh-sE#jh#ep?J6AJ&N}$KB)Mx
z;uDHbDL$k4oFbGxX1^2oK;r(FDo#;MD=tyosCbE@nd=kvuF|xd=Ncz!9$_|Q(DlI`
z#^(>his()g=3z-WeBGLmEyps3MfmexvO76)NVX25hAaGwU0I}z{0$DP*MdL886dct
z&^UEY_+k&ZslySEw#RWD|A{;sY}tv(uyK~rEq#=uv}GhbqU-%2I3n&B*9#ggSnuhG
z+d7DP_oBV?8PQV|)#uH1eHHu~Lcn#=kIuz6x1EbV*=oFkz|+Oe!PGcMTq5~iZHrDkr1vFA%@MlCyE!Y{C=cD{sPV7=A`
zy9Mo7e>yr}LZ%IN7XFLg!1MvG{K0OMsW1TTns0?8L6b79KV8
zKJ08bU&1j=WzUyDYigKmUkv%(%$M*+O6q(GoMnMF*mR!AFctp{8*JVo%-zD+U{h=X
zat^{julW+_`bXzWcn#`oV7H4`E6;AA(&)*os|GE~8|gur}a<6znjc)Hs`eiRC`v8)wX!
zt;0zWibfkLV*<#RU}9^_g}5oKUqTz@eQoB09Hz?MZ2>j3XEg9W=NM<*8Z#Sqz-CQE
zi)A+fLcjV4a}yv8^lwRL@us|D-2@1^sABUrJeG|z-$o|7jWXZp{XiBa3=`Q#nf;o-
zjWV7*2;^+YCzcaIdKg|CXn1X);kEH;b0EthRI75!6`hT;-*3i$4*F{@zFpam2Pqo=
zIY`%NdYPi}pM(50nqI4Tg5pNS*C{$1Wxrp?vQehXTlV`{^B+7zW{8&
zKgu51r{VD`2QXnBmigEyACCuXJ~qm9nK9XJJleL=Gb3@Xm`*!>#E1qfw;5@2_AQ#<
ziJf4a)Ht7c+z;Y^;BV_7>g|smPcx#ymSx*0e+=#M9f9qU9J1|Qfw--MsJ9C3RWhQ%
zmR*W;bo;)D_P9N4&oGHVrfFD--E7E^_=dk@p^HY$RgIeAD7TV)E
zX@gxC5x4Ll{1I~b*eIuQ&<+l2h1)(Ed01}{?!)#y9;8A!=xyqk`)V4q+`ZnWRz-Gi
zqx>-*e2{Yu26X;|vYj#SQ16G{y1}({W{}}GXC`{V%z;pduHac?L#VTP9y5CmYn<`vauwDL*sgR^1r}T%&%A5nCn(LEI
z$hUJK?1W%U-i%stc@p_{4ut1TT^dp+D3$tYo>dukx
zpmeUBfo<4dZbaz;auf2?vKZ@{XY8#rbv6f~?gF7>yoK@;)LkTBL42{i3vsKn`8irR
zRPIM>OXN{3tK=BuRLkEGuaP%nSt~`TRVQa7zg`v~zEm2pY>=bS&NBHp*3u}qV7XlG
z!m>$DL9J%_3F0f{S?uXy@;Af}mnR^-`26O8>JH~Xcqgj|esjKohQm1!YFSp0YQ>(#IAw#*fp8x-(w_qX
ziW<62f@-D(MOuZLv!f(!2N+#o+hN9vj
zY#Vhpbco2noAoYqHWXU`k%REhYYqfD+S$b%2;0yOZ(>$w!^_G`(0P*1fp8_#moe{V
z?1IjLa5K`M!9S|A0bMUnXOpS3xr_Z~9vO%r;B4U&#LR(E5xB|WW4TZ^;PI5SQJg!u
zgmcV+z^P%@!1GN(g=|!RHo6v%x1~6WIgfR`0xQThxj{wl$qiUHqv>4Q8lI{)jMCOr
zct1edKA^3M&SX$r80(fq(SeE5*tB$_xDK9V=IcZTu|3ev?4xrR1T!#jI)+!n%mq30
z9>bY>kBKs2wN>N!%x-94OZvNYO-IMpzE`WdX1sbDH=jYqnbOqS;Lk+h&+l-|P+P}H
zmO!KD<}+9tP9VLf^BHXP^^5k3Hr{T+)?ek*Q}0qg!}pJguAd3NcKJ>hhKa17VZY|D
zpTQFnfgF(2&*=OH;CP;5e*m9Rd`|IsMf%cad8r~fM5dj7#_tCjfwDh-t@xzk9~A$h
z_zy+FcPr)hbbjjb`j9d68(_U=egokD>UKP=__!iJ!?}HCegojE#fJ>}O6p%0D%L3)
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
Date: Thu, 4 Aug 2022 14:49:45 -0700
Subject: [PATCH 0766/2403] Add supervisor.runtime.autoreload

This replaces supervisor.enable_autoreload() and
supervisor.disable_autoreload(). It also allows user code to get
the current autoreload state.

Replaces #5352 and part of #5414
---
 shared-bindings/supervisor/Runtime.c  | 27 ++++++++++++++++++++++++++-
 shared-bindings/supervisor/__init__.c | 23 -----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 55217ec97a..bbfcb05b51 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -33,6 +33,8 @@
 #include "shared-bindings/supervisor/RunReason.h"
 #include "shared-bindings/supervisor/Runtime.h"
 
+#include "supervisor/shared/reload.h"
+
 #if (CIRCUITPY_USB)
 #include "tusb.h"
 #endif
@@ -105,7 +107,7 @@ void supervisor_set_run_reason(supervisor_run_reason_t run_reason) {
 }
 
 //|     run_reason: RunReason
-//|     """Returns why CircuitPython started running this particular time."""
+//|     """Why CircuitPython started running this particular time."""
 //|
 STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) {
     return cp_enum_find(&supervisor_run_reason_type, _run_reason);
@@ -115,11 +117,34 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_run_reason_obj, supervisor_runt
 MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj,
     (mp_obj_t)&supervisor_runtime_get_run_reason_obj);
 
+//|     autoreload: bool
+//|     """Whether CircuitPython may autoreload based on workflow writes to the filesystem."""
+//|
+STATIC mp_obj_t supervisor_runtime_get_autoreload(mp_obj_t self) {
+    return mp_obj_new_bool(autoreload_is_enabled());
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_autoreload_obj, supervisor_runtime_get_autoreload);
+
+STATIC mp_obj_t supervisor_runtime_set_autoreload(mp_obj_t self, mp_obj_t state_in) {
+    if (mp_obj_is_true(state_in)) {
+        autoreload_enable();
+    } else {
+        autoreload_disable();
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_autoreload_obj, supervisor_runtime_set_autoreload);
+
+MP_PROPERTY_GETSET(supervisor_runtime_autoreload_obj,
+    (mp_obj_t)&supervisor_runtime_get_autoreload_obj,
+    (mp_obj_t)&supervisor_runtime_set_autoreload_obj);
+
 STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_usb_connected), MP_ROM_PTR(&supervisor_runtime_usb_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_connected), MP_ROM_PTR(&supervisor_runtime_serial_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_bytes_available), MP_ROM_PTR(&supervisor_runtime_serial_bytes_available_obj) },
     { MP_ROM_QSTR(MP_QSTR_run_reason), MP_ROM_PTR(&supervisor_runtime_run_reason_obj) },
+    { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_runtime_locals_dict, supervisor_runtime_locals_dict_table);
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index cad8ccdeec..c74b3751c0 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -53,27 +53,6 @@
 //| This object is the sole instance of `supervisor.Runtime`."""
 //|
 
-//| def enable_autoreload() -> None:
-//|     """Enable autoreload based on USB file write activity."""
-//|     ...
-//|
-STATIC mp_obj_t supervisor_enable_autoreload(void) {
-    autoreload_enable();
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(supervisor_enable_autoreload_obj, supervisor_enable_autoreload);
-
-//| def disable_autoreload() -> None:
-//|     """Disable autoreload based on USB file write activity until
-//|     `enable_autoreload` is called."""
-//|     ...
-//|
-STATIC mp_obj_t supervisor_disable_autoreload(void) {
-    autoreload_disable();
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(supervisor_disable_autoreload_obj, supervisor_disable_autoreload);
-
 //| def set_rgb_status_brightness(brightness: int) -> None:
 //|     """Set brightness of status RGB LED from 0-255. This will take effect
 //|        after the current code finishes and the status LED is used to show
@@ -312,8 +291,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin
 
 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) },
-    { MP_ROM_QSTR(MP_QSTR_disable_autoreload),  MP_ROM_PTR(&supervisor_disable_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_rgb_status_brightness),  MP_ROM_PTR(&supervisor_set_rgb_status_brightness_obj) },
     { MP_ROM_QSTR(MP_QSTR_runtime),  MP_ROM_PTR(&common_hal_supervisor_runtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_reload),  MP_ROM_PTR(&supervisor_reload_obj) },

From 167108a91fb56f8a6b46bb2c42a3e4d5a6929f37 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 4 Aug 2022 14:53:49 -0700
Subject: [PATCH 0767/2403] Fix builds with displayio but not terminalio

---
 supervisor/shared/display.h    | 8 +++++---
 supervisor/supervisor.mk       | 5 ++---
 tools/gen_display_resources.py | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h
index 7979bc30ab..a7e28a8f75 100644
--- a/supervisor/shared/display.h
+++ b/supervisor/shared/display.h
@@ -29,10 +29,11 @@
 
 #include 
 
+#include "shared-bindings/displayio/TileGrid.h"
+
 #if CIRCUITPY_TERMINALIO
 
 #include "shared-bindings/displayio/Bitmap.h"
-#include "shared-bindings/displayio/TileGrid.h"
 #include "shared-bindings/fontio/BuiltinFont.h"
 #include "shared-bindings/terminalio/Terminal.h"
 
@@ -42,14 +43,15 @@
 extern const fontio_builtinfont_t supervisor_terminal_font;
 
 // These will change so they must live in RAM.
-extern displayio_tilegrid_t supervisor_blinka_sprite;
 extern displayio_bitmap_t supervisor_terminal_font_bitmap;
 extern displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid;
 extern displayio_tilegrid_t supervisor_terminal_title_bar_text_grid;
 extern terminalio_terminal_obj_t supervisor_terminal;
-
 #endif
 
+// Always shown.
+extern displayio_tilegrid_t supervisor_blinka_sprite;
+
 void supervisor_start_terminal(uint16_t width_px, uint16_t height_px);
 void supervisor_stop_terminal(void);
 
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 912b5c5f37..cac5ac3911 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -184,9 +184,8 @@ ifeq ($(CIRCUITPY_DISPLAYIO), 1)
   SRC_SUPERVISOR += \
     supervisor/shared/display.c
 
-  ifeq ($(CIRCUITPY_TERMINALIO), 1)
-    SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o
-  endif
+  # Include the display resources because it includes the Blinka logo as well.
+  SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o
 endif
 
 # Preserve double quotes in these values by single-quoting them.
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index e5e543b79c..5da6062823 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -104,6 +104,7 @@ c_file = args.output_c_file
 c_file.write(
     """\
 
+#include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/Palette.h"
 #include "supervisor/shared/display.h"
 
@@ -266,6 +267,7 @@ displayio_tilegrid_t supervisor_blinka_sprite = {{
 
 c_file.write(
     """\
+#if CIRCUITPY_TERMINALIO
 _displayio_color_t terminal_colors[2] = {
     {
         .rgb888 = 0x000000,
@@ -414,5 +416,7 @@ terminalio_terminal_obj_t supervisor_terminal = {
     .scroll_area = NULL,
     .title_bar = NULL
 };
+
+#endif
 """
 )

From 9b9f8de0ba45daa6353c3dd4b043efc15201d7a0 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Thu, 4 Aug 2022 19:34:12 -0500
Subject: [PATCH 0768/2403] Changed error handling to use new routine

---
 shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index 7a44679d28..b8325f28c3 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -89,9 +89,7 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
 
     busio_spi_obj_t *spi = args[ARG_spi].u_obj;
 
-    if (!mp_obj_is_type(args[ARG_chip_select].u_obj, &digitalio_digitalinout_type)) {
-        mp_raise_TypeError_varg(translate("unsupported %q type"), digitalio_digitalinout_type.name);
-    }
+    mp_arg_validate_type(args[ARG_chip_select].u_obj, &digitalio_digitalinout_type, MP_QSTR_chip_select);
 
     common_hal_adafruit_bus_device_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_cs_active_value].u_bool, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
         args[ARG_phase].u_int, args[ARG_extra_clocks].u_int);

From 98fbaa8ff9cadd60ce2a4626318d16aeeed059db Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 00:58:57 -0400
Subject: [PATCH 0769/2403] Sorts ascending without mouse click

---
 .../shared/web_workflow/static/directory.html |   4 +-
 .../shared/web_workflow/static/directory.js   | 118 +++---------------
 2 files changed, 17 insertions(+), 105 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 6e2b833d6f..a1b4dd9f4c 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -10,9 +10,9 @@
 
     
    
     
-    
+    
     
-        
+        
    TypeSizeModified
    TypeSizePathModified
    
         
     
    
     
    
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 34aa1e7f70..a9da6a0fb0 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -7,101 +7,30 @@
  *   Desc:   Adds sorting to a HTML data table that implements ARIA Authoring Practices
  */
 
-'use strict';
+// 'use strict';
+
+var columnIndex = 2;
+const sortEvent = new Event('sort');
 
 class SortableTable {
   constructor(tableNode) {
     this.tableNode = tableNode;
 
     this.columnHeaders = tableNode.querySelectorAll('thead th');
-
-    this.sortColumns = [];
-
-    for (var i = 0; i < this.columnHeaders.length; i++) {
-      var ch = this.columnHeaders[i];
-      var buttonNode = ch.querySelector('button');
-      if (buttonNode) {
-        this.sortColumns.push(i);
-        buttonNode.setAttribute('data-column-index', i);
-        buttonNode.addEventListener('click', this.handleClick.bind(this));
-      }
-    }
-
-    this.optionCheckbox = document.querySelector(
-      'input[type="checkbox"][value="show-unsorted-icon"]'
-    );
-
-    if (this.optionCheckbox) {
-      this.optionCheckbox.addEventListener(
-        'change',
-        this.handleOptionChange.bind(this)
-      );
-      if (this.optionCheckbox.checked) {
-        this.tableNode.classList.add('show-unsorted-icon');
-      }
-    }
   }
 
   setColumnHeaderSort(columnIndex) {
-    if (typeof columnIndex === 'string') {
-      columnIndex = parseInt(columnIndex);
-    }
-
-    for (var i = 0; i < this.columnHeaders.length; i++) {
-      var ch = this.columnHeaders[i];
-      var buttonNode = ch.querySelector('button');
-      if (i === columnIndex) {
-        var value = ch.getAttribute('aria-sort');
-        if (value === 'descending') {
-          ch.setAttribute('aria-sort', 'ascending');
-          this.sortColumn(
-            columnIndex,
-            'ascending',
-            ch.classList.contains('num')
-          );
-        } else {
-          ch.setAttribute('aria-sort', 'descending');
-          this.sortColumn(
-            columnIndex,
-            'descending',
-            ch.classList.contains('num')
-          );
-        }
-      } else {
-        if (ch.hasAttribute('aria-sort') && buttonNode) {
-          ch.removeAttribute('aria-sort');
-        }
-      }
-    }
+      var ch = this.columnHeaders[columnIndex];
+      this.sortColumn(columnIndex);
   }
 
-  sortColumn(columnIndex, sortValue, isNumber) {
+  sortColumn(columnIndex) {
     function compareValues(a, b) {
-      if (sortValue === 'ascending') {
         if (a.value === b.value) {
           return 0;
         } else {
-          if (isNumber) {
-            return a.value - b.value;
-          } else {
-            return a.value < b.value ? -1 : 1;
-          }
+          return a.value < b.value ? -1 : 1;
         }
-      } else {
-        if (a.value === b.value) {
-          return 0;
-        } else {
-          if (isNumber) {
-            return b.value - a.value;
-          } else {
-            return a.value > b.value ? -1 : 1;
-          }
-        }
-      }
-    }
-
-    if (typeof isNumber !== 'boolean') {
-      isNumber = false;
     }
 
     var tbodyNode = this.tableNode.querySelector('tbody');
@@ -119,9 +48,6 @@ class SortableTable {
       var data = {};
       data.index = index;
       data.value = dataCell.textContent.toLowerCase().trim();
-      if (isNumber) {
-        data.value = parseFloat(data.value);
-      }
       dataCells.push(data);
       rowNode = rowNode.nextElementSibling;
       index += 1;
@@ -142,30 +68,14 @@ class SortableTable {
 
   /* EVENT HANDLERS */
 
-  handleClick(event) {
-    var tgt = event.currentTarget;
-    this.setColumnHeaderSort(tgt.getAttribute('data-column-index'));
-  }
-
-  handleOptionChange(event) {
-    var tgt = event.currentTarget;
-
-    if (tgt.checked) {
-      this.tableNode.classList.add('show-unsorted-icon');
-    } else {
-      this.tableNode.classList.remove('show-unsorted-icon');
-    }
+  handleSort(event) {
+    this.setColumnHeaderSort(tgt.getAttribute(columnIndex));
   }
 }
 
-// Initialize sortable table buttons
-window.addEventListener('load', function () {
-  var sortableTables = document.querySelectorAll('table.sortable');
-  for (var i = 0; i < sortableTables.length; i++) {
-    new SortableTable(sortableTables[i]);
-  }
-});
-
+var sortable_directory = document.querySelector('table.sortable');
+const sd_class = {sortable_dir: new SortableTable(sortable_directory)};
+sortable_directory.addEventListener('sort', function () { sd_class["sortable_dir"].setColumnHeaderSort(columnIndex); } );
 
 let new_directory_name = document.getElementById("name");
 let files = document.getElementById("files");
@@ -271,6 +181,8 @@ async function refresh_list() {
     }
     var tbody = document.querySelector("tbody");
     tbody.replaceChildren(...new_children);
+
+    sortable_directory.dispatchEvent(sortEvent);
 }
 
 async function find_devices() {

From 9eb32f4dd1e832d6893c5a4a1cde86f3438d2384 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 01:23:01 -0400
Subject: [PATCH 0770/2403] Ascending sort without mouse click

---
 supervisor/shared/web_workflow/static/directory.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index a1b4dd9f4c..7328cba78a 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -10,7 +10,7 @@
 
     
     
    
     
-    
+    
     

From 85d959b953c1487e739c277118008063f98de6fe Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 01:42:59 -0400
Subject: [PATCH 0771/2403] A little bit more cleanup....

---
 supervisor/shared/web_workflow/static/directory.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index a9da6a0fb0..7b6e1c781c 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -15,16 +15,9 @@ const sortEvent = new Event('sort');
 class SortableTable {
   constructor(tableNode) {
     this.tableNode = tableNode;
-
-    this.columnHeaders = tableNode.querySelectorAll('thead th');
   }
 
   setColumnHeaderSort(columnIndex) {
-      var ch = this.columnHeaders[columnIndex];
-      this.sortColumn(columnIndex);
-  }
-
-  sortColumn(columnIndex) {
     function compareValues(a, b) {
         if (a.value === b.value) {
           return 0;

From ed6f9eac04b77d98f46e49797624c83371efb76e Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 02:06:45 -0400
Subject: [PATCH 0772/2403] Unnecessary handler removed

---
 supervisor/shared/web_workflow/static/directory.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 7b6e1c781c..3a65b5694e 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -58,12 +58,6 @@ class SortableTable {
       tbodyNode.appendChild(rowNodes[dataCells[i].index]);
     }
   }
-
-  /* EVENT HANDLERS */
-
-  handleSort(event) {
-    this.setColumnHeaderSort(tgt.getAttribute(columnIndex));
-  }
 }
 
 var sortable_directory = document.querySelector('table.sortable');

From 7f600422b067339022017e6f883835fa71ffd4be Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 4 Aug 2022 13:29:22 +0000
Subject: [PATCH 0773/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (997 of 997 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 3ddb5d65a8..f56153ccfb 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: 2022-07-24 22:22+0000\n"
+"PO-Revision-Date: 2022-08-05 14:18+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -3860,7 +3860,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 msgid "pressing BOOT button at start up.\n"
-msgstr ""
+msgstr "pressionando o botão BOOT na inicialização.\n"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
@@ -3868,7 +3868,7 @@ msgstr "pressionando o botão SW38 na inicialização.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "pressing VOLUME button at start up.\n"
-msgstr ""
+msgstr "pressionando o botão VOLUME na inicialização.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h

From d61f9eee7f934f140361397cf5242e3090269614 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 3 Aug 2022 13:32:51 +0000
Subject: [PATCH 0774/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index e5ae4df26e..82a66f44da 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: 2022-07-21 20:15+0000\n"
+"PO-Revision-Date: 2022-08-05 14:18+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -3819,7 +3819,7 @@ msgstr "pow() med 3 argument kräver heltal"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 msgid "pressing BOOT button at start up.\n"
-msgstr ""
+msgstr "genom att trycka på BOOT-knappen vid start.\n"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
@@ -3827,7 +3827,7 @@ msgstr "genom att trycka på SW38-knappen vid start.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "pressing VOLUME button at start up.\n"
-msgstr ""
+msgstr "genom att trycka på VOLUME-knappen vid start.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h

From 1e741f53fad417553c12e023df311208c1c8fe94 Mon Sep 17 00:00:00 2001
From: River Wang 
Date: Wed, 3 Aug 2022 16:45:04 +0000
Subject: [PATCH 0775/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 93.4% (932 of 997 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index b98cab412f..dca177c139 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,15 +7,15 @@ 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: 2022-04-23 21:13+0000\n"
-"Last-Translator: hexthat \n"
+"PO-Revision-Date: 2022-08-05 14:18+0000\n"
+"Last-Translator: River Wang \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -634,9 +634,9 @@ msgid "Buffer must be a multiple of 512 bytes"
 msgstr "Huǎnchōngqū bìxū shì 512 zìjié de bèishù"
 
 #: shared-bindings/_bleio/PacketBuffer.c
-#, fuzzy, c-format
+#, 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ǎnchōngqū tàiduǎn , mùqián zhǐyǒu %d zìjié"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
@@ -742,15 +742,15 @@ msgstr "tōng guò USB kě jiàn shí wú fǎ chóng xīn ān zhuāng '/'."
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
+msgstr "wúfǎ chóngxīn qǐdòng dào yǐdǎo chéngxù, yīnwéi yǐdǎo chéngxù bù cúnzài."
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
-msgstr "wú fǎ shè zhì tào jiē zì xuǎn xiàng"
+msgstr "wúfǎ shèzhì tàojiēzì xuǎnxiàng"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Cannot set value when direction is input."
-msgstr "Dāng fāngxiàng xiàng nèi shí, bùnéng shèzhì gāi zhí."
+msgstr "Dāng fāngxiàng wéi shūrù shí, bùnéng shèzhì zhí."
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c

From 3f49d77036d0ef213eb15b54a8e6efefe80a3ebd Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 5 Aug 2022 09:59:10 -0500
Subject: [PATCH 0776/2403] Improve esp32-s3-eye board definition

---
 .../boards/espressif_esp32s3_eye/board.c      |  2 +-
 .../espressif_esp32s3_eye/mpconfigboard.h     |  2 +-
 .../boards/espressif_esp32s3_eye/pins.c       | 27 ++++++++++---------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index 7829a4be94..4edf8b5c08 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = common_hal_board_create_spi(1);
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
index d32704c8bf..43ade4f6c8 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.h
@@ -40,8 +40,8 @@
 
 #define CIRCUITPY_BOARD_SPI         (2)
 #define CIRCUITPY_BOARD_SPI_PIN     { \
-        {.clock = &pin_GPIO39, .mosi = &pin_GPIO40, .miso = &pin_GPIO38}, \
         {.clock = &pin_GPIO21, .mosi = &pin_GPIO47, .miso = NULL}, \
+        {.clock = &pin_GPIO39, .mosi = &pin_GPIO40, .miso = &pin_GPIO38}, \
 }
 
 #define DEFAULT_RESERVED_PSRAM      (1048576)
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/pins.c b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
index 7ebda4309d..defa4e9c52 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/pins.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
@@ -1,5 +1,6 @@
 #include "py/objtuple.h"
 #include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
 
 STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
     {&mp_type_tuple},
@@ -32,24 +33,24 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_GPIO21) }, // LCD
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO38) },
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO39) },
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO40) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO1), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI1), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCK1), MP_ROM_PTR(&pin_GPIO39) },
+
     { MP_ROM_QSTR(MP_QSTR_MIC_SCK), MP_ROM_PTR(&pin_GPIO41) },
     { MP_ROM_QSTR(MP_QSTR_MIC_WS), MP_ROM_PTR(&pin_GPIO42) },
-    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO43) }, // LCD
-    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO44) }, // LCD
-    // { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, // LCD -- unused?
-    // { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, // LCD -- unused?
-    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO47) }, // LCD
-    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO48) }, // LCD
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) }, // LCD
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
 
-    // TODO
-    // { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From db9a9a1571b4c10cca979af66b6fb59563cbcc46 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 5 Aug 2022 21:06:53 +0200
Subject: [PATCH 0777/2403] 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             | 26 +++++++++++++-------------
 locale/cs.po             | 26 +++++++++++++-------------
 locale/de_DE.po          | 26 +++++++++++++-------------
 locale/el.po             | 26 +++++++++++++-------------
 locale/en_GB.po          | 26 +++++++++++++-------------
 locale/es.po             | 26 +++++++++++++-------------
 locale/fil.po            | 26 +++++++++++++-------------
 locale/fr.po             | 26 +++++++++++++-------------
 locale/hi.po             | 26 +++++++++++++-------------
 locale/it_IT.po          | 26 +++++++++++++-------------
 locale/ja.po             | 26 +++++++++++++-------------
 locale/ko.po             | 26 +++++++++++++-------------
 locale/nl.po             | 26 +++++++++++++-------------
 locale/pl.po             | 26 +++++++++++++-------------
 locale/pt_BR.po          | 26 +++++++++++++-------------
 locale/ru.po             | 26 +++++++++++++-------------
 locale/sv.po             | 26 +++++++++++++-------------
 locale/tr.po             | 26 +++++++++++++-------------
 locale/zh_Latn_pinyin.po | 29 +++++++++++++++--------------
 19 files changed, 249 insertions(+), 248 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index c0f9237a9d..d632f3c0bc 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -215,7 +215,7 @@ msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s kesalahan 0x%x"
@@ -653,7 +653,7 @@ msgstr "Blok CBC harus merupakan kelipatan 16 byte"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1032,7 +1032,7 @@ msgstr "Fungsinya membutuhkan kunci"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumen tidak valid"
@@ -1233,7 +1233,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Pin-pin tidak valid"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1265,7 +1265,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1620,15 +1620,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Waktu habis"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
@@ -1810,7 +1810,7 @@ msgstr "sistem file (filesystem) bersifat Read-only"
 msgid "Read-only object"
 msgstr "Objek Read-only"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1826,7 +1826,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "Mode AES yang diminta tidak didukung"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2252,7 +2252,7 @@ msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
 msgid "Value length > max_length"
 msgstr "Panjang nilai > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 02405a1bd0..8afa8a333d 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -216,7 +216,7 @@ msgstr "%q, %q, a %q musí mít všechny shodnou délku"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s chyba 0x%x"
@@ -654,7 +654,7 @@ msgstr "Bloky CBC musí být násobky 16 bajtů"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "Disk CIRCUITPY nelze nalézt nebo vytvořit."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1032,7 +1032,7 @@ msgstr "Funkce vyžaduje zámek"
 msgid "GNSS init"
 msgstr "Inicializace GNSS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Základní chyba"
 
@@ -1203,7 +1203,7 @@ msgstr "Chybné BSSID"
 msgid "Invalid MAC address"
 msgstr "Chybná MAC adresa"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Neplatný argument"
@@ -1233,7 +1233,7 @@ msgstr "Chybná multicastová MAC adresa"
 msgid "Invalid pins"
 msgstr "Neplatné piny"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Chybná velikost"
 
@@ -1241,7 +1241,7 @@ msgstr "Chybná velikost"
 msgid "Invalid socket for TLS"
 msgstr "Chybný soket pro TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Chybný stav"
 
@@ -1265,7 +1265,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC adresa byla chybná"
 
@@ -1616,15 +1616,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1801,7 +1801,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1817,7 +1817,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2239,7 +2239,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0dc5be2557..639dd9cdcc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -218,7 +218,7 @@ msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s Fehler 0x%x"
@@ -656,7 +656,7 @@ msgstr "CBC-Blöcke müssen ein Vielfaches von 16 Bytes sein"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY-Laufwerk konnte nicht gefunden oder erzeugt werden."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC oder Checksumme ungültig"
 
@@ -1041,7 +1041,7 @@ msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Generischer Fehler"
 
@@ -1216,7 +1216,7 @@ msgstr "Ungültige BSSID"
 msgid "Invalid MAC address"
 msgstr "Ungültige MAC-Adresse"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
@@ -1246,7 +1246,7 @@ msgstr "Ungültige Multicast-MAC-Adresse"
 msgid "Invalid pins"
 msgstr "Ungültige Pins"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
@@ -1254,7 +1254,7 @@ msgstr "Ungültige Größe"
 msgid "Invalid socket for TLS"
 msgstr "Ungültiges Socket für TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Ungültiger Zustand"
 
@@ -1278,7 +1278,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC Adresse war ungültig"
 
@@ -1635,15 +1635,15 @@ msgstr "Nur eine Farbe kann transparent sein zu einer Zeit"
 msgid "Operation not permitted"
 msgstr "Operation nicht erlaubt"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Vorgang oder Funktion wird nicht unterstützt"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Zeit für Vorgang abgelaufen"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Kein Speicher mehr verfügbar"
 
@@ -1824,7 +1824,7 @@ msgstr "Schreibgeschützte Dateisystem"
 msgid "Read-only object"
 msgstr "Schreibgeschützte Objekt"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Erhaltene Antwort ist ungültig"
 
@@ -1840,7 +1840,7 @@ msgstr "RemoteTransmissionRequests limitiert auf 8 Bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Der angeforderte AES-Modus wird nicht unterstützt"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Angefragte Ressource nicht gefunden"
 
@@ -2279,7 +2279,7 @@ msgstr "Wert Länge != Erforderliche feste Länge"
 msgid "Value length > max_length"
 msgstr "Länge des Wertes > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "Version ist ungültig"
 
diff --git a/locale/el.po b/locale/el.po
index be14e4289c..b334e53d9c 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -209,7 +209,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1188,7 +1188,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -1218,7 +1218,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1226,7 +1226,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1600,15 +1600,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1783,7 +1783,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1799,7 +1799,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2221,7 +2221,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index eb462b4dad..f3eacd2c1c 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -219,7 +219,7 @@ msgstr "%q, %q, and %q must all be the same length"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s error 0x%x"
@@ -657,7 +657,7 @@ msgstr "CBC blocks must be multiples of 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC or checksum was invalid"
 
@@ -1033,7 +1033,7 @@ msgstr "Function requires lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Generic Failure"
 
@@ -1204,7 +1204,7 @@ msgstr "Invalid BSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Invalid argument"
@@ -1234,7 +1234,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Invalid pins"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Invalid size"
 
@@ -1242,7 +1242,7 @@ msgstr "Invalid size"
 msgid "Invalid socket for TLS"
 msgstr "Invalid socket for TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Invalid state"
 
@@ -1266,7 +1266,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC address was invalid"
 
@@ -1620,15 +1620,15 @@ msgstr "Only one colour can be transparent at a time"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operation or feature not supported"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Operation timed out"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Out of memory"
 
@@ -1807,7 +1807,7 @@ msgstr "Read-only filesystem"
 msgid "Read-only object"
 msgstr "Read-only object"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Received response was invalid"
 
@@ -1823,7 +1823,7 @@ msgstr "RemoteTransmissionRequests limited to 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Requested AES mode is unsupported"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Requested resource not found"
 
@@ -2254,7 +2254,7 @@ msgstr "Value length != required fixed length"
 msgid "Value length > max_length"
 msgstr "Value length > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "Version was invalid"
 
diff --git a/locale/es.po b/locale/es.po
index ea5c7abbfc..fbfdbf920c 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s error 0x%x"
@@ -659,7 +659,7 @@ msgstr "Los bloques CBC deben ser múltiplos de 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC o suma de comprobación inválida"
 
@@ -1041,7 +1041,7 @@ msgstr "La función requiere lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Fallo Genérico"
 
@@ -1219,7 +1219,7 @@ msgstr "BSSID inválido"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumento inválido"
@@ -1249,7 +1249,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "pines inválidos"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Tamaño incorrecto"
 
@@ -1257,7 +1257,7 @@ msgstr "Tamaño incorrecto"
 msgid "Invalid socket for TLS"
 msgstr "socket invalido para TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Estado invalido"
 
@@ -1281,7 +1281,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "La dirección MAC es incorrecta"
 
@@ -1641,15 +1641,15 @@ msgstr "Solo un color puede ser transparente a la vez"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operación no característica no soportada"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Tiempo de espera agotado"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Memoria agotada"
 
@@ -1832,7 +1832,7 @@ msgstr "Sistema de archivos de solo-Lectura"
 msgid "Read-only object"
 msgstr "Objeto de solo-lectura"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "La respuesta recibida es invalida"
 
@@ -1848,7 +1848,7 @@ msgstr "RemoteTransmissionRequests limitado a 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "El modo AES solicitado no es compatible"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Recurso solicitado no encontrado"
 
@@ -2283,7 +2283,7 @@ msgstr "Tamaño del valor != del tamaño fijo requerido"
 msgid "Value length > max_length"
 msgstr "Tamaño de valor > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "La versión era invalida"
 
diff --git a/locale/fil.po b/locale/fil.po
index 2ce57b913a..753101c7a6 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -652,7 +652,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1030,7 +1030,7 @@ msgstr "Function nangangailangan ng lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1201,7 +1201,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Maling argumento"
@@ -1231,7 +1231,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Mali ang pins"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1263,7 +1263,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1616,15 +1616,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1801,7 +1801,7 @@ msgstr "Basahin-lamang mode"
 msgid "Read-only object"
 msgstr "Basahin-lamang"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1817,7 +1817,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2241,7 +2241,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/fr.po b/locale/fr.po
index ff498bf168..74b931612d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -221,7 +221,7 @@ msgstr "%q, %q, et %q doivent tous être de la même longueur"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s erreur 0x%x"
@@ -663,7 +663,7 @@ msgstr "Les blocs CBC doivent être des multiples de 16 octets"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "L’appareil CIRCUITPY ne peut pas être trouvé ou créé."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC ou somme de contrôle invalide"
 
@@ -1060,7 +1060,7 @@ msgstr "La fonction nécessite un verrou ('lock')"
 msgid "GNSS init"
 msgstr "Initialisation GNSS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Échec génerique"
 
@@ -1242,7 +1242,7 @@ msgstr "BSSID invalide"
 msgid "Invalid MAC address"
 msgstr "Adresse MAC invalide"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Paramètre invalide"
@@ -1272,7 +1272,7 @@ msgstr "Adresse MAC multicast invalide"
 msgid "Invalid pins"
 msgstr "Broches invalides"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Taille invalide"
 
@@ -1280,7 +1280,7 @@ msgstr "Taille invalide"
 msgid "Invalid socket for TLS"
 msgstr "Socket non valide pour TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "État invalide"
 
@@ -1304,7 +1304,7 @@ msgstr "Ce calque est déjà dans un groupe"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Le calque doit être une sous-classe de Group ou TileGrid"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "Adresse physique (MAC) invalide"
 
@@ -1664,15 +1664,15 @@ msgstr "Une seule couleur peut être transparente à la fois"
 msgid "Operation not permitted"
 msgstr "Cette opération n'est pas permise"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Opération ou fonction non supportée"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Timeout de l'opération"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Hors de mémoire"
 
@@ -1856,7 +1856,7 @@ msgstr "Système de fichier en lecture seule"
 msgid "Read-only object"
 msgstr "Objet en lecture seule"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Réponse reçue invalide"
 
@@ -1872,7 +1872,7 @@ msgstr "RemoteTransmissionRequests limité à 8 octets"
 msgid "Requested AES mode is unsupported"
 msgstr "Le mode AES demandé n'est pas supporté"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Resource demandée non trouvée"
 
@@ -2311,7 +2311,7 @@ msgstr "Longueur de valeur != Longueur fixe requise"
 msgid "Value length > max_length"
 msgstr "Longueur de la valeur > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "Version est invalide"
 
diff --git a/locale/hi.po b/locale/hi.po
index 76817fd84f..5d72c19c74 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -209,7 +209,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1188,7 +1188,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -1218,7 +1218,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1226,7 +1226,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1600,15 +1600,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1783,7 +1783,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1799,7 +1799,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2221,7 +2221,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 168b23e23d..4580d6d063 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s errore 0x%x"
@@ -658,7 +658,7 @@ msgstr "I blocchi CBC devono essere multipli di 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC o controllo totale è risultato non valido"
 
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1206,7 +1206,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argomento non valido"
@@ -1236,7 +1236,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Pin non validi"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1244,7 +1244,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1268,7 +1268,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1623,15 +1623,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1811,7 +1811,7 @@ msgstr "Filesystem in sola lettura"
 msgid "Read-only object"
 msgstr "Sola lettura"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1827,7 +1827,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2251,7 +2251,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/ja.po b/locale/ja.po
index 844b3bd2d5..1173bc4f5e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -214,7 +214,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -652,7 +652,7 @@ msgstr "CBCブロックは16バイトの整数倍でなければなりません"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1028,7 +1028,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr "不正なBSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "不正な引数"
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "ピンが不正"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1613,15 +1613,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1796,7 +1796,7 @@ msgstr "読み込み専用のファイルシステム"
 msgid "Read-only object"
 msgstr "読み込み専用のオブジェクト"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1812,7 +1812,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "要求のAESモードは非対応"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 4334a2dbc1..249ec7968a 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -210,7 +210,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -648,7 +648,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1022,7 +1022,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1191,7 +1191,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "핀이 유효하지 않습니다"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1253,7 +1253,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1603,15 +1603,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1786,7 +1786,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1802,7 +1802,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index b4e9e6c484..123b63f93e 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -650,7 +650,7 @@ msgstr "CBC blocks moeten meervouden van 16 bytes zijn"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1028,7 +1028,7 @@ msgstr "Functie vereist lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr "Ongeldig BSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ongeldig argument"
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Ongeldige pinnen"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1617,15 +1617,15 @@ msgstr "Er kan maar één kleur per keer transparant zijn"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1807,7 +1807,7 @@ msgstr "Alleen-lezen bestandssysteem"
 msgid "Read-only object"
 msgstr "Alleen-lezen object"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1823,7 +1823,7 @@ msgstr "RemoteTransmissionRequests is beperkt tot 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Gevraagde AES modus is niet ondersteund"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2247,7 +2247,7 @@ msgstr "Waarde lengte != vereist vaste lengte"
 msgid "Value length > max_length"
 msgstr "Waarde length > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/pl.po b/locale/pl.po
index afadb604d0..078eae9130 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -214,7 +214,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -652,7 +652,7 @@ msgstr "Bloki CBC muszą być wielokrotnościami 16 bajtów"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1028,7 +1028,7 @@ msgstr "Funkcja wymaga blokady"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Zły argument"
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr "Złe nóżki"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Nieprawidłowy rozmiar"
 
@@ -1237,7 +1237,7 @@ msgstr "Nieprawidłowy rozmiar"
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Nieprawidłowy stan"
 
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1611,15 +1611,15 @@ msgstr "W danym momencie przezroczysty może być tylko jeden kolor"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
@@ -1794,7 +1794,7 @@ msgstr "System plików tylko do odczytu"
 msgid "Read-only object"
 msgstr "Obiekt tylko do odczytu"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Otrzymana odpowiedź była nieprawidłowa"
 
@@ -1810,7 +1810,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "Żądany tryb AES nie jest obsługiwany"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Nie znaleziono żądanego zasobu"
 
@@ -2232,7 +2232,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index f56153ccfb..da59c341bf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -218,7 +218,7 @@ msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s erro 0x%x"
@@ -665,7 +665,7 @@ msgstr "Os blocos CBC devem ter múltiplos de 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "A unidade CIRCUITPY não pôde ser encontrada nem criada."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC ou checksum inválido"
 
@@ -1050,7 +1050,7 @@ msgstr "A função requer bloqueio"
 msgid "GNSS init"
 msgstr "Inicialização do GNSS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Falha Genérica"
 
@@ -1227,7 +1227,7 @@ msgstr "BSSID Inválido"
 msgid "Invalid MAC address"
 msgstr "Endereço MAC inválido"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumento inválido"
@@ -1257,7 +1257,7 @@ msgstr "Endereço MAC multicast inválido"
 msgid "Invalid pins"
 msgstr "Pinos inválidos"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
@@ -1265,7 +1265,7 @@ msgstr "Tamanho inválido"
 msgid "Invalid socket for TLS"
 msgstr "Soquete inválido para o TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Estado inválido"
 
@@ -1289,7 +1289,7 @@ msgstr "Camada já está num grupo"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "A camada deve ser uma subclasse Group ou TileGrid"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "Endereço MAC inválido"
 
@@ -1646,15 +1646,15 @@ msgstr "Apenas uma cor pode ser transparente de cada vez"
 msgid "Operation not permitted"
 msgstr "A operação não é permitida"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "A operação ou o recurso não é suportado"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "A operação expirou"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Sem memória"
 
@@ -1839,7 +1839,7 @@ msgstr "Sistema de arquivos somente leitura"
 msgid "Read-only object"
 msgstr "Objeto de leitura apenas"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "A resposta recebida foi inválida"
 
@@ -1855,7 +1855,7 @@ msgstr "As requisições de transmissões remotas é limitada a 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "O modo AES solicitado não é compatível"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "O recurso solicitado não foi encontrado"
 
@@ -2293,7 +2293,7 @@ msgstr "Comprimento do valor != comprimento fixo necessário"
 msgid "Value length > max_length"
 msgstr "O comprimento do valor é > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "A versão era inválida"
 
diff --git a/locale/ru.po b/locale/ru.po
index d4e434ad67..e210413ea7 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -217,7 +217,7 @@ msgstr "%q, %q, и %q должны быть одной длинны"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s ошибка 0x%x"
@@ -659,7 +659,7 @@ msgstr "Блоки CBC должны быть кратны 16 байтам"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC или контрольная сумма неправильная"
 
@@ -1048,7 +1048,7 @@ msgstr "Функция требует блокировки"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Общий сбой"
 
@@ -1224,7 +1224,7 @@ msgstr "Неверный BSSID"
 msgid "Invalid MAC address"
 msgstr "Неверный MAC-адрес"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
@@ -1254,7 +1254,7 @@ msgstr "Неверный MAC-адрес multicast"
 msgid "Invalid pins"
 msgstr "Недопустимые пины"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Неверный размер"
 
@@ -1262,7 +1262,7 @@ msgstr "Неверный размер"
 msgid "Invalid socket for TLS"
 msgstr "Неверный сокет для TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Неверное состояние"
 
@@ -1286,7 +1286,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC адрес был недействительным"
 
@@ -1642,15 +1642,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1830,7 +1830,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1846,7 +1846,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2270,7 +2270,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 82a66f44da..7162cfc2fe 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -217,7 +217,7 @@ msgstr "%q, %q och %q måste vara lika långa"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s fel 0x%x"
@@ -655,7 +655,7 @@ msgstr "CBC-block måste vara multiplar om 16 byte"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY-enheten kunde inte hittas eller skapas."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC eller checksumma var ogiltig"
 
@@ -1035,7 +1035,7 @@ msgstr "Funktionen kräver lås"
 msgid "GNSS init"
 msgstr "GNSS start"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "Allmänt fel"
 
@@ -1208,7 +1208,7 @@ msgstr "Ogiltig BSSID"
 msgid "Invalid MAC address"
 msgstr "Ogiltig MAC-adress"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
@@ -1238,7 +1238,7 @@ msgstr "Ogiltig MAC-adress för multicast"
 msgid "Invalid pins"
 msgstr "Ogiltiga pinnar"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
@@ -1246,7 +1246,7 @@ msgstr "Ogiltig storlek"
 msgid "Invalid socket for TLS"
 msgstr "Ogiltig socket för TLS"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "Ogiltigt tillstånd"
 
@@ -1270,7 +1270,7 @@ msgstr "Layer är redan med i en grupp"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Layer måste vara en underklass av Group eller TileGrid"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC-adressen var ogiltig"
 
@@ -1626,15 +1626,15 @@ msgstr "Bara en färg kan vara genomskinlig i taget"
 msgid "Operation not permitted"
 msgstr "Åtgärden inte tillåten"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operation eller funktion stöds inte"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "Åtgärden orsakade timeout"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Slut på minne"
 
@@ -1816,7 +1816,7 @@ msgstr "Skrivskyddat filsystem"
 msgid "Read-only object"
 msgstr "Skrivskyddat objekt"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Mottaget svar var ogiltigt"
 
@@ -1832,7 +1832,7 @@ msgstr "RemoteTransmissionRequests begränsad till 8 byte"
 msgid "Requested AES mode is unsupported"
 msgstr "Det begärda AES-läget stöds inte"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "Begärd resurs hittades inte"
 
@@ -2266,7 +2266,7 @@ msgstr "Värdets längde ! = krävd fast längd"
 msgid "Value length > max_length"
 msgstr "Värdets längd > max_length"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "Versionen var ogiltig"
 
diff --git a/locale/tr.po b/locale/tr.po
index f8d52779ef..c928635c18 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -221,7 +221,7 @@ msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s hatası 0x%x"
@@ -662,7 +662,7 @@ msgstr "CBC blokları 16 baytın katları şeklinde olmalı"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY sürücüsü bulunamadı veya oluşturulamadı"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1036,7 +1036,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1205,7 +1205,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -1235,7 +1235,7 @@ msgstr ""
 msgid "Invalid pins"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1243,7 +1243,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1267,7 +1267,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1617,15 +1617,15 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1803,7 +1803,7 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1819,7 +1819,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2241,7 +2241,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index dca177c139..32dbf06460 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -220,7 +220,7 @@ msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s cuò wù 0x%x"
@@ -662,7 +662,7 @@ msgstr "CBC kuài bìxū shì 16 zìjié de bèishù"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "zhǎo bú dào huò chuàng jiàn CIRCUITPY qū dòng qì."
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC huò jiàoyàn hé wúxiào"
 
@@ -742,7 +742,8 @@ msgstr "tōng guò USB kě jiàn shí wú fǎ chóng xīn ān zhuāng '/'."
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr "wúfǎ chóngxīn qǐdòng dào yǐdǎo chéngxù, yīnwéi yǐdǎo chéngxù bù cúnzài."
+msgstr ""
+"wúfǎ chóngxīn qǐdòng dào yǐdǎo chéngxù, yīnwéi yǐdǎo chéngxù bù cúnzài."
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -1046,7 +1047,7 @@ msgstr "Hánshù xūyào suǒdìng"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
 msgstr "tōng yòng gù zhàng"
 
@@ -1222,7 +1223,7 @@ msgstr "Wúxiào de BSSID"
 msgid "Invalid MAC address"
 msgstr "wú xiào de MAC dì zhǐ"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Wúxiào de cānshù"
@@ -1252,7 +1253,7 @@ msgstr "wú xiào de duō bō MAC dì zhǐ"
 msgid "Invalid pins"
 msgstr "Wúxiào de yǐn jiǎo"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "dà xiǎo wú xiào"
 
@@ -1260,7 +1261,7 @@ msgstr "dà xiǎo wú xiào"
 msgid "Invalid socket for TLS"
 msgstr "TLS de chā zuò wú xiào"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
 msgstr "wú xiào zhuàng tài"
 
@@ -1284,7 +1285,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
 msgstr "MAC dì zhǐ wú xiào"
 
@@ -1640,15 +1641,15 @@ msgstr "Yīcì zhǐ néng yǒuyī zhǒng yánsè shì tòumíng de"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "bù zhī chí cāo zuò huò gōng néng"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation timed out"
 msgstr "cāo zuò yǐ fēn shí"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "nèi cún bù zú"
 
@@ -1828,7 +1829,7 @@ msgstr "Zhǐ dú wénjiàn xìtǒng"
 msgid "Read-only object"
 msgstr "Zhǐ dú duìxiàng"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "shōu dào de xiǎng yìng wú xiào"
 
@@ -1844,7 +1845,7 @@ msgstr "RemoteTransmissionRequests xiànzhì wèi 8 gè zì jié"
 msgid "Requested AES mode is unsupported"
 msgstr "Qǐngqiú de AES móshì bù shòu zhīchí"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Requested resource not found"
 msgstr "wèi zhǎo dào qǐng qiú de zī yuán"
 
@@ -2277,7 +2278,7 @@ msgstr "Zhí chángdù != Suǒ xū de gùdìng chángdù"
 msgid "Value length > max_length"
 msgstr "Zhí chángdù > zuìdà chángdù"
 
-#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Version was invalid"
 msgstr "bǎn běn wú xiào"
 

From 5e58fc11678a9163b0df8e999774886277e6e833 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 6 Aug 2022 00:59:15 +0200
Subject: [PATCH 0778/2403] 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             | 16 ++++++++++++++++
 locale/de_DE.po          | 16 ++++++++++++++++
 locale/el.po             | 16 ++++++++++++++++
 locale/en_GB.po          | 16 ++++++++++++++++
 locale/es.po             | 16 ++++++++++++++++
 locale/fil.po            | 16 ++++++++++++++++
 locale/fr.po             | 16 ++++++++++++++++
 locale/hi.po             | 16 ++++++++++++++++
 locale/it_IT.po          | 16 ++++++++++++++++
 locale/ja.po             | 16 ++++++++++++++++
 locale/ko.po             | 16 ++++++++++++++++
 locale/nl.po             | 16 ++++++++++++++++
 locale/pl.po             | 16 ++++++++++++++++
 locale/pt_BR.po          | 16 ++++++++++++++++
 locale/ru.po             | 16 ++++++++++++++++
 locale/sv.po             | 16 ++++++++++++++++
 locale/tr.po             | 16 ++++++++++++++++
 locale/zh_Latn_pinyin.po | 16 ++++++++++++++++
 19 files changed, 304 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index d632f3c0bc..c58e3e5532 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -876,6 +876,10 @@ msgstr "Tampilan harus memiliki ruang warna 16 bit."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Rotasi tampilan harus dalam kelipatan 90 derajat"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Mode kendara tidak digunakan saat arah input."
@@ -1551,6 +1555,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Parity ganjil tidak didukung"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1814,6 +1826,10 @@ msgstr "Objek Read-only"
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Segarkan terlalu cepat"
diff --git a/locale/cs.po b/locale/cs.po
index 8afa8a333d..4916a78c97 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -874,6 +874,10 @@ msgstr "Displej musí mít 16bitový barevný prostor."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Otočení displeje musí být po 90 stupních"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1551,6 +1555,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1805,6 +1817,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 639dd9cdcc..853406c8b3 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -880,6 +880,10 @@ msgstr "Display muss einen 16 Bit Farbraum haben."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode wird nicht verwendet, wenn die Richtung input ist."
@@ -1566,6 +1570,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Eine ungerade Parität wird nicht unterstützt"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1828,6 +1840,10 @@ msgstr "Schreibgeschützte Objekt"
 msgid "Received response was invalid"
 msgstr "Erhaltene Antwort ist ungültig"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Zu früh neu geladen"
diff --git a/locale/el.po b/locale/el.po
index b334e53d9c..892eb0a935 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -863,6 +863,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1535,6 +1539,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1787,6 +1799,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index f3eacd2c1c..d981a5fba9 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -877,6 +877,10 @@ msgstr "Display must have a 16 bit colourspace."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Display rotation must be in 90 degree increments"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode not used when direction is input."
@@ -1552,6 +1556,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Odd parity is not supported"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1811,6 +1823,10 @@ msgstr "Read-only object"
 msgid "Received response was invalid"
 msgstr "Received response was invalid"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Refresh too soon"
diff --git a/locale/es.po b/locale/es.po
index fbfdbf920c..bd70f95beb 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -884,6 +884,10 @@ msgstr "La pantalla debe tener un espacio de color de 16 bits."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Rotación de display debe ser en incrementos de 90 grados"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Modo Drive no se usa cuando la dirección es input."
@@ -1572,6 +1576,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Paridad impar no soportada"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1836,6 +1848,10 @@ msgstr "Objeto de solo-lectura"
 msgid "Received response was invalid"
 msgstr "La respuesta recibida es invalida"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Refresco demasiado pronto"
diff --git a/locale/fil.po b/locale/fil.po
index 753101c7a6..1a2ac694e4 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -874,6 +874,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode ay hindi ginagamit kapag ang direksyon ay input."
@@ -1551,6 +1555,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Odd na parity ay hindi supportado"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1805,6 +1817,10 @@ msgstr "Basahin-lamang"
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 74b931612d..84b145315b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -896,6 +896,10 @@ msgstr "L'affichage doit avoir un espace colorimétrique de 16 bits."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "La rotation d'affichage doit se faire par incréments de 90 degrés"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1595,6 +1599,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Parité impaire non supportée"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1860,6 +1872,10 @@ msgstr "Objet en lecture seule"
 msgid "Received response was invalid"
 msgstr "Réponse reçue invalide"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Rafraîchissement trop tôt"
diff --git a/locale/hi.po b/locale/hi.po
index 5d72c19c74..e8aedf1c8a 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -863,6 +863,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1535,6 +1539,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1787,6 +1799,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 4580d6d063..c86e14d912 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -879,6 +879,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1558,6 +1562,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "operazione I2C non supportata"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1815,6 +1827,10 @@ msgstr "Sola lettura"
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 1173bc4f5e..17f5d3b84d 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -872,6 +872,10 @@ msgstr "ディスプレイは16ビット色空間を持たなければなりま
 msgid "Display rotation must be in 90 degree increments"
 msgstr "ディスプレイの回転は90度の倍数でなければなりません"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "方向がinputのときドライブモードは使われません"
@@ -1548,6 +1552,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "奇数パリティには対応していません"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1800,6 +1812,10 @@ msgstr "読み込み専用のオブジェクト"
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "リフレッシュが早すぎます"
diff --git a/locale/ko.po b/locale/ko.po
index 249ec7968a..27ce6030d6 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -866,6 +866,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1538,6 +1542,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1790,6 +1802,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 123b63f93e..795ef4542b 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -871,6 +871,10 @@ msgstr "Beeldscherm moet een 16bit kleurruimte hebben."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Beeldscherm rotatie moet in stappen van 90 graden"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drive modus niet gebruikt als de richting input is."
@@ -1548,6 +1552,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Oneven pariteit is niet ondersteund"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1811,6 +1823,10 @@ msgstr "Alleen-lezen object"
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Verversing te snel"
diff --git a/locale/pl.po b/locale/pl.po
index 078eae9130..a49b8bdd52 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -872,6 +872,10 @@ msgstr "Wyświetlacz musi mieć 16-bitową przestrzeń kolorów."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Wyświetlacz można obracać co 90 stopni"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Tryb sterowania nieużywany w trybie wejścia."
@@ -1546,6 +1550,14 @@ msgstr "Obiekt został zwolniony i nie można go już używać. Utwórz nowy obi
 msgid "Odd parity is not supported"
 msgstr "Nieparzysta parzystość nie jest wspierana"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1798,6 +1810,10 @@ msgstr "Obiekt tylko do odczytu"
 msgid "Received response was invalid"
 msgstr "Otrzymana odpowiedź była nieprawidłowa"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Zbyt wczesne odświeżenie"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index da59c341bf..8c21e0df30 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -890,6 +890,10 @@ msgstr "O monitor deve ter um espaço de cores com 16 bits."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "A rotação da tela deve estar em incrementos de 90 graus"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "O modo do controlador não é usado quando a direção for inserida."
@@ -1577,6 +1581,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "A paridade ímpar não é compatível"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1843,6 +1855,10 @@ msgstr "Objeto de leitura apenas"
 msgid "Received response was invalid"
 msgstr "A resposta recebida foi inválida"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "A recarga foi cedo demais"
diff --git a/locale/ru.po b/locale/ru.po
index e210413ea7..ba339d07db 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -888,6 +888,10 @@ msgstr "Дисплей должен иметь 16-битное цветовое
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Поворот дисплея должен осуществляться с шагом 90 градусов"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode не используется, когда направление является входным."
@@ -1575,6 +1579,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1834,6 +1846,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 7162cfc2fe..e684791bf0 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -877,6 +877,10 @@ msgstr "Displayen måste ha en 16-bitars färgrymd."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Displayens rotation måste vara i steg om 90 grader"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Drivläge används inte när riktning är input."
@@ -1558,6 +1562,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Udda paritet stöds inte"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1820,6 +1832,10 @@ msgstr "Skrivskyddat objekt"
 msgid "Received response was invalid"
 msgstr "Mottaget svar var ogiltigt"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Uppdaterad för tidigt"
diff --git a/locale/tr.po b/locale/tr.po
index c928635c18..e2b1718a7b 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -880,6 +880,10 @@ msgstr ""
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr ""
@@ -1552,6 +1556,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1807,6 +1819,10 @@ msgstr ""
 msgid "Received response was invalid"
 msgstr ""
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 32dbf06460..142941392e 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -887,6 +887,10 @@ msgstr "Xiǎnshì bìxū jùyǒu 16 wèi yánsè kōngjiān."
 msgid "Display rotation must be in 90 degree increments"
 msgstr "Xiǎnshì xuánzhuǎn bìxū 90 dù jiā xīn"
 
+#: main.c
+msgid "Done"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
 msgstr "Fāngxiàng shūrù shí qūdòng móshì méiyǒu shǐyòng."
@@ -1572,6 +1576,14 @@ msgstr ""
 msgid "Odd parity is not supported"
 msgstr "Bù zhīchí jīshù"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Off"
+msgstr ""
+
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Ok"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "Only 8 or 16 bit mono with "
@@ -1833,6 +1845,10 @@ msgstr "Zhǐ dú duìxiàng"
 msgid "Received response was invalid"
 msgstr "shōu dào de xiǎng yìng wú xiào"
 
+#: supervisor/shared/bluetooth/bluetooth.c
+msgid "Reconnecting"
+msgstr ""
+
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
 msgstr "Shuāxīn tài kuàile"

From b7d3ee174abffb9bda2b7438ea7c663113baee83 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 21:49:18 -0400
Subject: [PATCH 0779/2403] Move sort from table class to async function

---
 .../shared/web_workflow/static/directory.html |   2 +-
 .../shared/web_workflow/static/directory.js   | 127 ++++++++----------
 2 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 7328cba78a..b88e74684b 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -11,7 +11,7 @@
     
     
    
     
     
-    
    
         
    TypeSizePathModified
    
         
    
+    
    
         
    TypeSizePathModified
    
         
     
    
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 3a65b5694e..9158bfbc87 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -1,68 +1,6 @@
-/*
- *   This content is licensed according to the W3C Software License at
- *   https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
- *
- *   File:   sortable-table.js
- *
- *   Desc:   Adds sorting to a HTML data table that implements ARIA Authoring Practices
- */
-
-// 'use strict';
-
-var columnIndex = 2;
-const sortEvent = new Event('sort');
-
-class SortableTable {
-  constructor(tableNode) {
-    this.tableNode = tableNode;
-  }
-
-  setColumnHeaderSort(columnIndex) {
-    function compareValues(a, b) {
-        if (a.value === b.value) {
-          return 0;
-        } else {
-          return a.value < b.value ? -1 : 1;
-        }
-    }
-
-    var tbodyNode = this.tableNode.querySelector('tbody');
-    var rowNodes = [];
-    var dataCells = [];
-
-    var rowNode = tbodyNode.firstElementChild;
-
-    var index = 0;
-    while (rowNode) {
-      rowNodes.push(rowNode);
-      var rowCells = rowNode.querySelectorAll('th, td');
-      var dataCell = rowCells[columnIndex];
-
-      var data = {};
-      data.index = index;
-      data.value = dataCell.textContent.toLowerCase().trim();
-      dataCells.push(data);
-      rowNode = rowNode.nextElementSibling;
-      index += 1;
-    }
-
-    dataCells.sort(compareValues);
-
-    // remove rows
-    while (tbodyNode.firstChild) {
-      tbodyNode.removeChild(tbodyNode.lastChild);
-    }
-
-    // add sorted rows
-    for (var i = 0; i < dataCells.length; i += 1) {
-      tbodyNode.appendChild(rowNodes[dataCells[i].index]);
-    }
-  }
-}
-
-var sortable_directory = document.querySelector('table.sortable');
-const sd_class = {sortable_dir: new SortableTable(sortable_directory)};
-sortable_directory.addEventListener('sort', function () { sd_class["sortable_dir"].setColumnHeaderSort(columnIndex); } );
+// var sort_column = undefined;
+// (document.querySelectorAll("th")).forEach((element, indx) => { if (element.textContent == "Path") {sort_column = indx} } );
+var sort_column = 2;
 
 let new_directory_name = document.getElementById("name");
 let files = document.getElementById("files");
@@ -72,6 +10,15 @@ var current_path;
 var editable = undefined;
 
 async function refresh_list() {
+
+    function compareValues(a, b) {
+        if (a.value === b.value) {
+          return 0;
+        } else {
+          return a.value < b.value ? -1 : 1;
+        }
+    }
+
     current_path = window.location.hash.substr(1);
     if (current_path == "") {
         current_path = "/";
@@ -109,6 +56,10 @@ async function refresh_list() {
         }
     }
 
+    var dirCells = [];
+    var dataCells = [];
+    var index = 0;
+
     if (window.location.path != "/fs/") {
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
@@ -119,6 +70,15 @@ async function refresh_list() {
         path.textContent = "..";
         // Remove the delete button
         td[4].replaceChildren();
+
+        var dataCell = td[sort_column];
+
+        var sortdata = {};
+        sortdata.value = dataCell.textContent.toLowerCase().trim();
+        sortdata.index = index;
+        dirCells.push(sortdata);
+        index += 1;
+
         new_children.push(clone);
     }
 
@@ -126,6 +86,8 @@ async function refresh_list() {
         // Clone the new row and insert it into the table
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
+        var dataCell = td[sort_column];
+
         var icon = "⬇";
         var file_path = current_path + f.name;
         let api_url = new URL("/fs" + file_path, url_base);
@@ -158,18 +120,45 @@ async function refresh_list() {
         delete_button.disabled = !editable;
         delete_button.onclick = del;
 
-        if (editable) {
+        if (editable && !f.directory) {
             edit_url = new URL(edit_url, url_base);
             let edit_link = clone.querySelector(".edit_link");
             edit_link.href = edit_url
         }
 
+        var dataCell = td[sort_column];
+
+        var sortdata = {};
+        sortdata.value = dataCell.textContent.toLowerCase().trim();
+        sortdata.index = index;
+        if (!f.directory) {
+            dataCells.push(sortdata);
+            index += 1;
+        } else {
+            dirCells.push(sortdata);
+            index += 1;
+        }
+
         new_children.push(clone);
     }
-    var tbody = document.querySelector("tbody");
-    tbody.replaceChildren(...new_children);
 
-    sortable_directory.dispatchEvent(sortEvent);
+    dirCells.sort(compareValues);
+    dataCells.sort(compareValues);
+
+    var tbody = document.querySelector("tbody");
+
+    // remove rows
+    while (tbody.firstChild) {
+      tbody.removeChild(tbody.lastChild);
+    }
+
+    // add sorted rows
+    for (var i = 0; i < dirCells.length; i += 1) {
+      tbody.appendChild(new_children[dirCells[i].index]);
+    }
+    for (var i = 0; i < dataCells.length; i += 1) {
+      tbody.appendChild(new_children[dataCells[i].index]);
+    }
 }
 
 async function find_devices() {

From 02167898f7a1c85fb7d0787d7bdbe5eea92577a4 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 22:05:32 -0400
Subject: [PATCH 0780/2403] minor cleanup

---
 directory.js | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)
 create mode 100644 directory.js

diff --git a/directory.js b/directory.js
new file mode 100644
index 0000000000..a822d4a239
--- /dev/null
+++ b/directory.js
@@ -0,0 +1,253 @@
+// var sort_column = undefined;
+// (document.querySelectorAll("th")).forEach((element, indx) => { if (element.textContent == "Path") {sort_column = indx} } );
+var sort_column = 2;
+
+let new_directory_name = document.getElementById("name");
+let files = document.getElementById("files");
+
+var url_base = window.location;
+var current_path;
+var editable = undefined;
+
+async function refresh_list() {
+
+    function compareValues(a, b) {
+        if (a.value === b.value) {
+          return 0;
+        } else {
+          return a.value < b.value ? -1 : 1;
+        }
+    }
+
+    current_path = window.location.hash.substr(1);
+    if (current_path == "") {
+        current_path = "/";
+    }
+    // Do the fetch first because the browser will prompt for credentials.
+    const response = await fetch(new URL("/fs" + current_path, url_base),
+        {
+            headers: {
+                "Accept": "application/json"
+            },
+            credentials: "include"
+        }
+    );
+    const data = await response.json();
+    var new_children = [];
+    var title = document.querySelector("title");
+    title.textContent = current_path;
+    var path = document.querySelector("#path");
+    path.textContent = current_path;
+    var template = document.querySelector('#row');
+
+    if (editable === undefined) {
+        const status = await fetch(new URL("/fs/", url_base),
+            {
+                method: "OPTIONS",
+                credentials: "include"
+            }
+        );
+        editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE");
+        new_directory_name.disabled = !editable;
+        files.disabled = !editable;
+        if (!editable) {
+            let usbwarning = document.querySelector("#usbwarning");
+            usbwarning.style.display = "block";
+        }
+    }
+
+    var dirCells = [];
+    var dataCells = [];
+    var index = 0;
+
+    if (window.location.path != "/fs/") {
+        var clone = template.content.cloneNode(true);
+        var td = clone.querySelectorAll("td");
+        td[0].textContent = "🗀";
+        var path = clone.querySelector("a");
+        let parent = new URL("..", "file://" + current_path);
+        path.href = "#" + parent.pathname;
+        path.textContent = "..";
+        // Remove the delete button
+        td[4].replaceChildren();
+
+        var sortdata = {};
+        sortdata.value = "..";
+        sortdata.index = index;
+        dirCells.push(sortdata);
+        index += 1;
+
+        new_children.push(clone);
+    }
+
+    for (const f of data) {
+        // Clone the new row and insert it into the table
+        var clone = template.content.cloneNode(true);
+        var td = clone.querySelectorAll("td");
+        var icon = "⬇";
+        var file_path = current_path + f.name;
+        let api_url = new URL("/fs" + file_path, url_base);
+        let edit_url = "/edit/#" + file_path;
+        if (f.directory) {
+            file_path = "#" + file_path + "/";
+            api_url += "/";
+        } else {
+            file_path = api_url;
+        }
+
+        if (f.directory) {
+            icon = "🗀";
+        } else if(f.name.endsWith(".txt") ||
+                  f.name.endsWith(".py") ||
+                  f.name.endsWith(".js") ||
+                  f.name.endsWith(".json")) {
+            icon = "🖹";
+        } else if (f.name.endsWith(".html")) {
+            icon = "🌐";
+        }
+        td[0].textContent = icon;
+        td[1].textContent = f.file_size;
+        var path = clone.querySelector("a");
+        path.href = file_path;
+        path.textContent = f.name;
+        td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString();
+        var delete_button = clone.querySelector("button.delete");
+        delete_button.value = api_url;
+        delete_button.disabled = !editable;
+        delete_button.onclick = del;
+
+        if (editable && !f.directory) {
+            edit_url = new URL(edit_url, url_base);
+            let edit_link = clone.querySelector(".edit_link");
+            edit_link.href = edit_url
+        }
+
+        var dataCell = td[sort_column];
+
+        var sortdata = {};
+        sortdata.value = dataCell.textContent.toLowerCase().trim();
+        sortdata.index = index;
+        if (!f.directory) {
+            dataCells.push(sortdata);
+            index += 1;
+        } else {
+            dirCells.push(sortdata);
+            index += 1;
+        }
+
+        new_children.push(clone);
+    }
+
+    dirCells.sort(compareValues);
+    dataCells.sort(compareValues);
+
+    var tbody = document.querySelector("tbody");
+
+    // remove rows
+    while (tbody.firstChild) {
+      tbody.removeChild(tbody.lastChild);
+    }
+
+    // add sorted rows
+    for (var i = 0; i < dirCells.length; i += 1) {
+      tbody.appendChild(new_children[dirCells[i].index]);
+    }
+    for (var i = 0; i < dataCells.length; i += 1) {
+      tbody.appendChild(new_children[dataCells[i].index]);
+    }
+}
+
+async function find_devices() {
+    const version_response = await fetch("/cp/version.json");
+    if (version_response.ok) {
+        url_base = new URL("/", window.location).href;
+    } else {
+        // TODO: Remove this when we've settled things. It is only used when this file isn't hosted
+        // by a CP device.
+        const response = await fetch("http://circuitpython.local/cp/devices.json");
+        let url = new URL("/", response.url);
+        url_base = url.href;
+        const data = await response.json();
+    }
+    refresh_list();
+}
+
+async function mkdir(e) {
+    const response = await fetch(
+        new URL("/fs" + current_path + new_directory_name.value + "/", url_base),
+        {
+            method: "PUT",
+            headers: {
+                'X-Timestamp': Date.now()
+            }
+        }
+    );
+    if (response.ok) {
+        refresh_list();
+        new_directory_name.value = "";
+        mkdir_button.disabled = true;
+    }
+}
+
+async function upload(e) {
+    for (const file of files.files) {
+        let file_path = new URL("/fs" + current_path + file.name, url_base);
+        const response = await fetch(file_path,
+            {
+                method: "PUT",
+                headers: {
+                    'Content-Type': 'application/octet-stream',
+                    'X-Timestamp': file.lastModified
+                },
+                body: file
+            }
+        )
+        if (response.ok) {
+            refresh_list();
+            files.value = "";
+            upload_button.disabled = true;
+        }
+    }
+}
+
+async function del(e) {
+    let fn = new URL(e.target.value);
+    var prompt = "Delete " + fn.pathname.substr(3);
+    if (e.target.value.endsWith("/")) {
+        prompt += " and all of its contents?";
+    } else {
+        prompt += "?";
+    }
+    if (confirm(prompt)) {
+        const response = await fetch(e.target.value,
+            {
+                method: "DELETE"
+            }
+        )
+        if (response.ok) {
+            refresh_list();
+        }
+    }
+}
+
+find_devices();
+
+let mkdir_button = document.getElementById("mkdir");
+mkdir_button.onclick = mkdir;
+
+let upload_button = document.getElementById("upload");
+upload_button.onclick = upload;
+
+upload_button.disabled = files.files.length == 0;
+
+files.onchange = () => {
+    upload_button.disabled = files.files.length == 0;
+}
+
+mkdir_button.disabled = new_directory_name.value.length == 0;
+
+new_directory_name.oninput = () => {
+    mkdir_button.disabled = new_directory_name.value.length == 0;
+}
+
+window.onhashchange = refresh_list;

From 52bd028dac555cb0409288dcc9c1afd98f8c9545 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 22:06:52 -0400
Subject: [PATCH 0781/2403] Posted to wrong directory :/

---
 directory.js | 253 ---------------------------------------------------
 1 file changed, 253 deletions(-)
 delete mode 100644 directory.js

diff --git a/directory.js b/directory.js
deleted file mode 100644
index a822d4a239..0000000000
--- a/directory.js
+++ /dev/null
@@ -1,253 +0,0 @@
-// var sort_column = undefined;
-// (document.querySelectorAll("th")).forEach((element, indx) => { if (element.textContent == "Path") {sort_column = indx} } );
-var sort_column = 2;
-
-let new_directory_name = document.getElementById("name");
-let files = document.getElementById("files");
-
-var url_base = window.location;
-var current_path;
-var editable = undefined;
-
-async function refresh_list() {
-
-    function compareValues(a, b) {
-        if (a.value === b.value) {
-          return 0;
-        } else {
-          return a.value < b.value ? -1 : 1;
-        }
-    }
-
-    current_path = window.location.hash.substr(1);
-    if (current_path == "") {
-        current_path = "/";
-    }
-    // Do the fetch first because the browser will prompt for credentials.
-    const response = await fetch(new URL("/fs" + current_path, url_base),
-        {
-            headers: {
-                "Accept": "application/json"
-            },
-            credentials: "include"
-        }
-    );
-    const data = await response.json();
-    var new_children = [];
-    var title = document.querySelector("title");
-    title.textContent = current_path;
-    var path = document.querySelector("#path");
-    path.textContent = current_path;
-    var template = document.querySelector('#row');
-
-    if (editable === undefined) {
-        const status = await fetch(new URL("/fs/", url_base),
-            {
-                method: "OPTIONS",
-                credentials: "include"
-            }
-        );
-        editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE");
-        new_directory_name.disabled = !editable;
-        files.disabled = !editable;
-        if (!editable) {
-            let usbwarning = document.querySelector("#usbwarning");
-            usbwarning.style.display = "block";
-        }
-    }
-
-    var dirCells = [];
-    var dataCells = [];
-    var index = 0;
-
-    if (window.location.path != "/fs/") {
-        var clone = template.content.cloneNode(true);
-        var td = clone.querySelectorAll("td");
-        td[0].textContent = "🗀";
-        var path = clone.querySelector("a");
-        let parent = new URL("..", "file://" + current_path);
-        path.href = "#" + parent.pathname;
-        path.textContent = "..";
-        // Remove the delete button
-        td[4].replaceChildren();
-
-        var sortdata = {};
-        sortdata.value = "..";
-        sortdata.index = index;
-        dirCells.push(sortdata);
-        index += 1;
-
-        new_children.push(clone);
-    }
-
-    for (const f of data) {
-        // Clone the new row and insert it into the table
-        var clone = template.content.cloneNode(true);
-        var td = clone.querySelectorAll("td");
-        var icon = "⬇";
-        var file_path = current_path + f.name;
-        let api_url = new URL("/fs" + file_path, url_base);
-        let edit_url = "/edit/#" + file_path;
-        if (f.directory) {
-            file_path = "#" + file_path + "/";
-            api_url += "/";
-        } else {
-            file_path = api_url;
-        }
-
-        if (f.directory) {
-            icon = "🗀";
-        } else if(f.name.endsWith(".txt") ||
-                  f.name.endsWith(".py") ||
-                  f.name.endsWith(".js") ||
-                  f.name.endsWith(".json")) {
-            icon = "🖹";
-        } else if (f.name.endsWith(".html")) {
-            icon = "🌐";
-        }
-        td[0].textContent = icon;
-        td[1].textContent = f.file_size;
-        var path = clone.querySelector("a");
-        path.href = file_path;
-        path.textContent = f.name;
-        td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString();
-        var delete_button = clone.querySelector("button.delete");
-        delete_button.value = api_url;
-        delete_button.disabled = !editable;
-        delete_button.onclick = del;
-
-        if (editable && !f.directory) {
-            edit_url = new URL(edit_url, url_base);
-            let edit_link = clone.querySelector(".edit_link");
-            edit_link.href = edit_url
-        }
-
-        var dataCell = td[sort_column];
-
-        var sortdata = {};
-        sortdata.value = dataCell.textContent.toLowerCase().trim();
-        sortdata.index = index;
-        if (!f.directory) {
-            dataCells.push(sortdata);
-            index += 1;
-        } else {
-            dirCells.push(sortdata);
-            index += 1;
-        }
-
-        new_children.push(clone);
-    }
-
-    dirCells.sort(compareValues);
-    dataCells.sort(compareValues);
-
-    var tbody = document.querySelector("tbody");
-
-    // remove rows
-    while (tbody.firstChild) {
-      tbody.removeChild(tbody.lastChild);
-    }
-
-    // add sorted rows
-    for (var i = 0; i < dirCells.length; i += 1) {
-      tbody.appendChild(new_children[dirCells[i].index]);
-    }
-    for (var i = 0; i < dataCells.length; i += 1) {
-      tbody.appendChild(new_children[dataCells[i].index]);
-    }
-}
-
-async function find_devices() {
-    const version_response = await fetch("/cp/version.json");
-    if (version_response.ok) {
-        url_base = new URL("/", window.location).href;
-    } else {
-        // TODO: Remove this when we've settled things. It is only used when this file isn't hosted
-        // by a CP device.
-        const response = await fetch("http://circuitpython.local/cp/devices.json");
-        let url = new URL("/", response.url);
-        url_base = url.href;
-        const data = await response.json();
-    }
-    refresh_list();
-}
-
-async function mkdir(e) {
-    const response = await fetch(
-        new URL("/fs" + current_path + new_directory_name.value + "/", url_base),
-        {
-            method: "PUT",
-            headers: {
-                'X-Timestamp': Date.now()
-            }
-        }
-    );
-    if (response.ok) {
-        refresh_list();
-        new_directory_name.value = "";
-        mkdir_button.disabled = true;
-    }
-}
-
-async function upload(e) {
-    for (const file of files.files) {
-        let file_path = new URL("/fs" + current_path + file.name, url_base);
-        const response = await fetch(file_path,
-            {
-                method: "PUT",
-                headers: {
-                    'Content-Type': 'application/octet-stream',
-                    'X-Timestamp': file.lastModified
-                },
-                body: file
-            }
-        )
-        if (response.ok) {
-            refresh_list();
-            files.value = "";
-            upload_button.disabled = true;
-        }
-    }
-}
-
-async function del(e) {
-    let fn = new URL(e.target.value);
-    var prompt = "Delete " + fn.pathname.substr(3);
-    if (e.target.value.endsWith("/")) {
-        prompt += " and all of its contents?";
-    } else {
-        prompt += "?";
-    }
-    if (confirm(prompt)) {
-        const response = await fetch(e.target.value,
-            {
-                method: "DELETE"
-            }
-        )
-        if (response.ok) {
-            refresh_list();
-        }
-    }
-}
-
-find_devices();
-
-let mkdir_button = document.getElementById("mkdir");
-mkdir_button.onclick = mkdir;
-
-let upload_button = document.getElementById("upload");
-upload_button.onclick = upload;
-
-upload_button.disabled = files.files.length == 0;
-
-files.onchange = () => {
-    upload_button.disabled = files.files.length == 0;
-}
-
-mkdir_button.disabled = new_directory_name.value.length == 0;
-
-new_directory_name.oninput = () => {
-    mkdir_button.disabled = new_directory_name.value.length == 0;
-}
-
-window.onhashchange = refresh_list;

From 328fe4d2eac23cad79d328fee3dbe6bbda273c12 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 22:07:22 -0400
Subject: [PATCH 0782/2403] minor cleanup

---
 supervisor/shared/web_workflow/static/directory.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 9158bfbc87..a822d4a239 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -71,10 +71,8 @@ async function refresh_list() {
         // Remove the delete button
         td[4].replaceChildren();
 
-        var dataCell = td[sort_column];
-
         var sortdata = {};
-        sortdata.value = dataCell.textContent.toLowerCase().trim();
+        sortdata.value = "..";
         sortdata.index = index;
         dirCells.push(sortdata);
         index += 1;
@@ -86,8 +84,6 @@ async function refresh_list() {
         // Clone the new row and insert it into the table
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
-        var dataCell = td[sort_column];
-
         var icon = "⬇";
         var file_path = current_path + f.name;
         let api_url = new URL("/fs" + file_path, url_base);

From a87dcf201bb165ac97b908ed9c2b17ede26ab9a7 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 5 Aug 2022 22:35:57 -0400
Subject: [PATCH 0783/2403] Don't need a variable to identify 'Path' column

---
 supervisor/shared/web_workflow/static/directory.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index a822d4a239..a565100e12 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -1,7 +1,3 @@
-// var sort_column = undefined;
-// (document.querySelectorAll("th")).forEach((element, indx) => { if (element.textContent == "Path") {sort_column = indx} } );
-var sort_column = 2;
-
 let new_directory_name = document.getElementById("name");
 let files = document.getElementById("files");
 
@@ -122,7 +118,7 @@ async function refresh_list() {
             edit_link.href = edit_url
         }
 
-        var dataCell = td[sort_column];
+        var dataCell = td[2];
 
         var sortdata = {};
         sortdata.value = dataCell.textContent.toLowerCase().trim();

From 552f6af4a13527fc91943431226c5fb592cbe785 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sat, 6 Aug 2022 15:50:22 -0400
Subject: [PATCH 0784/2403] clean up

---
 ports/espressif/esp-idf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index d51f7d8821..ddb7ddbcb6 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit d51f7d882187afa4b39c2613fd0fe2ac2fea1145
+Subproject commit ddb7ddbcb613a582e0a91eda8b1d2510dd0a2d83

From f69939c49cee8b1bce827cd5a87848a9127460d8 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sat, 6 Aug 2022 16:22:50 -0400
Subject: [PATCH 0785/2403] First Commit for AnalogFastIn

---
 ports/raspberrypi/common-hal/analogio/AnalogFastIn.c | 1 +
 ports/raspberrypi/common-hal/analogio/AnalogFastIn.h | 1 +
 shared-bindings/analogio/AnalogFastIn.c              | 1 +
 shared-bindings/analogio/AnalogFastIn.h              | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
 create mode 100644 ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
 create mode 100644 shared-bindings/analogio/AnalogFastIn.c
 create mode 100644 shared-bindings/analogio/AnalogFastIn.h

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
new file mode 100644
index 0000000000..d916a669dd
--- /dev/null
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -0,0 +1 @@
+/* AnalogFastIn.c */
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
new file mode 100644
index 0000000000..e99192dfac
--- /dev/null
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
@@ -0,0 +1 @@
+/* AnalogFastIn.h */
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
new file mode 100644
index 0000000000..d916a669dd
--- /dev/null
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -0,0 +1 @@
+/* AnalogFastIn.c */
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
new file mode 100644
index 0000000000..e99192dfac
--- /dev/null
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -0,0 +1 @@
+/* AnalogFastIn.h */

From f39058edc4898921b7a6e6cf4e7f5e2ddfa5ed33 Mon Sep 17 00:00:00 2001
From: paul 
Date: Sat, 6 Aug 2022 22:22:20 -0400
Subject: [PATCH 0786/2403] Added Bee S3 board

---
 .../boards/smartbeedesigns_bee_s3/board.c     | 48 +++++++++++
 .../smartbeedesigns_bee_s3/mpconfigboard.h    | 41 ++++++++++
 .../smartbeedesigns_bee_s3/mpconfigboard.mk   | 20 +++++
 .../boards/smartbeedesigns_bee_s3/pins.c      | 79 +++++++++++++++++++
 .../boards/smartbeedesigns_bee_s3/sdkconfig   |  6 ++
 5 files changed, 194 insertions(+)
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_s3/board.c
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_s3/sdkconfig

diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
new file mode 100644
index 0000000000..ff9418ec86
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.h b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.h
new file mode 100644
index 0000000000..1a17770fb7
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.h
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Bee-S3"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO48)
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO36)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO37)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO39)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO38)
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
new file mode 100644
index 0000000000..dee105df1b
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303A
+USB_PID = 0x8111
+USB_PRODUCT = "Bee-S3"
+USB_MANUFACTURER = "Smart Bee Designs"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
new file mode 100644
index 0000000000..189899fa49
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
@@ -0,0 +1,79 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44)},
+    { MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/sdkconfig b/ports/espressif/boards/smartbeedesigns_bee_s3/sdkconfig
new file mode 100644
index 0000000000..b7bb11fdd5
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/sdkconfig
@@ -0,0 +1,6 @@
+# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="smartbeedesigns_bee_s3"
+# end of LWIP

From 843ccb71c04093b509e2c1f59f5f038d207bc911 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 6 Aug 2022 00:04:08 +0000
Subject: [PATCH 0787/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1001 of 1001 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8c21e0df30..40c5ec8c71 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: 2022-08-05 14:18+0000\n"
+"PO-Revision-Date: 2022-08-07 15:16+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -892,7 +892,7 @@ msgstr "A rotação da tela deve estar em incrementos de 90 graus"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Feito"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -1583,11 +1583,11 @@ msgstr "A paridade ímpar não é compatível"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Desligado"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1857,7 +1857,7 @@ msgstr "A resposta recebida foi inválida"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Reconectando"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"

From 9571bab8f8011dbcabc6215836929d42f297000d Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 6 Aug 2022 14:58:58 +0000
Subject: [PATCH 0788/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1001 of 1001 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index e684791bf0..33680a2354 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: 2022-08-05 14:18+0000\n"
+"PO-Revision-Date: 2022-08-07 15:16+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -879,7 +879,7 @@ msgstr "Displayens rotation måste vara i steg om 90 grader"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -1564,11 +1564,11 @@ msgstr "Udda paritet stöds inte"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Av"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1834,7 +1834,7 @@ msgstr "Mottaget svar var ogiltigt"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Återansluter"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"

From a6eadd625940dca75b5ab04049ab57e1b8c31bed Mon Sep 17 00:00:00 2001
From: paul 
Date: Sun, 7 Aug 2022 11:59:43 -0400
Subject: [PATCH 0789/2403] Added Bee Motion S3 board

---
 .../smartbeedesigns_bee_motion_s3/board.c     |  48 +++++++++
 .../mpconfigboard.h                           |  41 +++++++
 .../mpconfigboard.mk                          |  20 ++++
 .../smartbeedesigns_bee_motion_s3/pins.c      | 102 ++++++++++++++++++
 .../smartbeedesigns_bee_motion_s3/sdkconfig   |   6 ++
 5 files changed, 217 insertions(+)
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
 create mode 100644 ports/espressif/boards/smartbeedesigns_bee_motion_s3/sdkconfig

diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
new file mode 100644
index 0000000000..ff9418ec86
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.h b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.h
new file mode 100644
index 0000000000..11e2449e9b
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.h
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Bee-Motion-S3"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO48)
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO36)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO37)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO17)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16)
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
new file mode 100644
index 0000000000..67a0ab21e8
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303A
+USB_PID = 0x8114
+USB_PRODUCT = "Bee-Motion-S3"
+USB_MANUFACTURER = "Smart Bee Designs"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
new file mode 100644
index 0000000000..ea68c98a88
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
@@ -0,0 +1,102 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+     { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44)},
+    { MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_BOOT_BTN), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_LIGHT_SENSOR), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_PIR), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_PIR_SENSOR), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_), MP_ROM_PTR(&pin_GPIO34) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/sdkconfig b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/sdkconfig
new file mode 100644
index 0000000000..84cf45aa83
--- /dev/null
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/sdkconfig
@@ -0,0 +1,6 @@
+# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="smartbeedesigns_bee_motion_s3"
+# end of LWIP

From 029b6b6fbe5afc0429e8420cf55577758f1318f5 Mon Sep 17 00:00:00 2001
From: lady ada 
Date: Sun, 7 Aug 2022 14:12:40 -0400
Subject: [PATCH 0790/2403] add default display

---
 ports/espressif/boards/hardkernel_odroid_go/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/hardkernel_odroid_go/pins.c b/ports/espressif/boards/hardkernel_odroid_go/pins.c
index c7152bf365..bfcc667204 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/pins.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/pins.c
@@ -53,5 +53,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_EXT4), MP_ROM_PTR(&pin_GPIO15) },
 
     { 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_module_globals_table);

From 2cd9222e5eeed7887fa44a01d70fd2295e736f88 Mon Sep 17 00:00:00 2001
From: lady ada 
Date: Sun, 7 Aug 2022 14:32:29 -0400
Subject: [PATCH 0791/2403] add includes

---
 ports/espressif/boards/hardkernel_odroid_go/pins.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/boards/hardkernel_odroid_go/pins.c b/ports/espressif/boards/hardkernel_odroid_go/pins.c
index bfcc667204..40f4fcdc34 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/pins.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/pins.c
@@ -1,4 +1,6 @@
+#include "py/objtuple.h"
 #include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
 
 // Pin names from: https://wiki.odroid.com/odroid_go/odroid_go
 

From f00eac7e6ea4039c64763a1439903621f68da8e2 Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Mon, 8 Aug 2022 04:20:17 +0000
Subject: [PATCH 0792/2403] Translated using Weblate (French)

Currently translated at 99.5% (996 of 1001 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index 84b145315b..564314bc5a 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-19 23:15+0000\n"
+"PO-Revision-Date: 2022-08-08 04:20+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -898,7 +898,7 @@ msgstr "La rotation d'affichage doit se faire par incréments de 90 degrés"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "OK"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -1601,11 +1601,11 @@ msgstr "Parité impaire non supportée"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Inactif"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1874,7 +1874,7 @@ msgstr "Réponse reçue invalide"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Reconnexion"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
@@ -3899,7 +3899,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 msgid "pressing BOOT button at start up.\n"
-msgstr ""
+msgstr "presser le bouton BOOT au démarrage.\n"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
@@ -3907,7 +3907,7 @@ msgstr "presser le bouton SW38 au démarrage.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "pressing VOLUME button at start up.\n"
-msgstr ""
+msgstr "presser le bouton VOLUME au démarrage.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h

From 86f4014f834e4c33449cb35a7b7fb0bae8071790 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 8 Aug 2022 13:52:05 -0700
Subject: [PATCH 0793/2403] Add exception filename to title bar

Add the exception filename after the line number and change the
line number so it is in that file. It used to always be code.py.

Fixes #6702
---
 main.c                  | 3 ++-
 shared/runtime/pyexec.c | 4 +++-
 shared/runtime/pyexec.h | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index f17731950f..bbc73d560c 100644
--- a/main.c
+++ b/main.c
@@ -213,8 +213,9 @@ void supervisor_execution_status(void) {
     if (_current_executing_filename != NULL) {
         serial_write(_current_executing_filename);
     } else if ((_exec_result.return_code & PYEXEC_EXCEPTION) != 0 &&
+               _exec_result.exception_line > 0 &&
                exception != NULL) {
-        mp_printf(&mp_plat_print, "@%d %q", _exec_result.exception_line, exception->base.type->name);
+        mp_printf(&mp_plat_print, "@%d %s %q", _exec_result.exception_line, _exec_result.exception_filename, exception->base.type->name);
     } else {
         serial_write_compressed(translate("Done"));
     }
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index b1f94db5e5..72714b9a2b 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -199,7 +199,9 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
                 size_t n, *values;
                 mp_obj_exception_get_traceback(return_value, &n, &values);
                 if (values != NULL) {
-                    result->exception_line = values[n - 2];
+                    result->exception_line = values[1];
+                    result->exception_filename[sizeof(result->exception_filename) - 1] = '\0';
+                    strncpy(result->exception_filename, qstr_str(values[0]), sizeof(result->exception_filename) - 1);
                 }
             }
         }
diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
index d31a7fe816..411426eaaa 100644
--- a/shared/runtime/pyexec.h
+++ b/shared/runtime/pyexec.h
@@ -37,6 +37,9 @@ typedef struct {
     int return_code;
     mp_obj_t exception;
     int exception_line;
+    // Only store the first 32 characters of the filename. It is very unlikely that they can all be
+    // seen.
+    char exception_filename[33];
 } pyexec_result_t;
 
 extern pyexec_mode_kind_t pyexec_mode_kind;

From 3c1c477c5b0a895b16a3ee9fff14a6961e4f66ff Mon Sep 17 00:00:00 2001
From: Danny Staple 
Date: Mon, 8 Aug 2022 22:14:55 +0100
Subject: [PATCH 0794/2403] Improve docs for rp2Pio Statemachine frequency

This frequency can be set to 0 for the system (133mhz) clock speed.
---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index f8ced08177..be87a47ec5 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -97,7 +97,7 @@
 //|         """Construct a StateMachine object on the given pins with the given program.
 //|
 //|         :param ReadableBuffer program: the program to run with the state machine
-//|         :param int frequency: the target clock frequency of the state machine. Actual may be less.
+//|         :param int frequency: the target clock frequency of the state machine. Actual may be less. Use 0 for system clock speed.
 //|         :param ReadableBuffer init: a program to run once at start up. This is run after program
 //|              is started so instructions may be intermingled
 //|         :param ~microcontroller.Pin first_out_pin: the first pin to use with the OUT instruction

From 401c269758e3e39cc2e3bc3a88876abf7b445904 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 8 Aug 2022 14:29:45 -0700
Subject: [PATCH 0795/2403] Request a title bar update on USB cdc connect

This ensures that the USB serial connection gets a copy of the
latest title bar.

Fixes #6703
---
 supervisor/shared/usb/usb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index a1885448de..8f571c8e10 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -31,6 +31,7 @@
 #include "supervisor/port.h"
 #include "supervisor/serial.h"
 #include "supervisor/usb.h"
+#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/workflow.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/readline/readline.h"
@@ -242,6 +243,9 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
         if (coding.bit_rate == 1200) {
             reset_to_bootloader();
         }
+    } else {
+        // We are connected, let's request a title bar update.
+        supervisor_title_bar_request_update(true);
     }
 }
 

From 7877f4d08a4f58818ababd9ff699b6abb31730a7 Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Mon, 8 Aug 2022 04:21:06 +0000
Subject: [PATCH 0796/2403] Translated using Weblate (French)

Currently translated at 99.6% (997 of 1001 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index 564314bc5a..7ca525f341 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-08-08 04:20+0000\n"
+"PO-Revision-Date: 2022-08-09 04:22+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr "%q, %q, et %q doivent tous être de la même longueur"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format

From 15ad24ba624f9ce2346112b90d23fd40f0fd27ac Mon Sep 17 00:00:00 2001
From: paul 
Date: Tue, 9 Aug 2022 04:32:21 -0400
Subject: [PATCH 0797/2403] ran pre-commit.

---
 ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c | 2 +-
 ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c  | 1 +
 ports/espressif/boards/smartbeedesigns_bee_s3/board.c        | 2 +-
 ports/espressif/boards/smartbeedesigns_bee_s3/pins.c         | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
index ff9418ec86..0432485111 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
@@ -33,7 +33,7 @@ void board_init(void) {
     #ifdef DEBUG
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
-    #endif
+    #endif /* DEBUG */
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
index ea68c98a88..66bd7c2c27 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
@@ -100,3 +100,4 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
+
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
index ff9418ec86..0432485111 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
@@ -33,7 +33,7 @@ void board_init(void) {
     #ifdef DEBUG
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
-    #endif
+    #endif /* DEBUG */
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
index 189899fa49..210507f893 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
@@ -77,3 +77,4 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
+

From 10275001accc67a49dde333990922feb825b9865 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 9 Aug 2022 07:26:18 -0400
Subject: [PATCH 0798/2403] enable web workflow on Feather HUZZAH32

---
 .../boards/adafruit_feather_huzzah32/mpconfigboard.mk          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index 2ed08856f9..267217b375 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -10,9 +10,6 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
-CIRCUITPY_STATUS_BAR = 0
-CIRCUITPY_WEB_WORKFLOW = 0
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB

From 5ce3778d75c015d26f33b1e666fd4faf42981142 Mon Sep 17 00:00:00 2001
From: takayoshiotake 
Date: Thu, 16 Jun 2022 20:10:48 +0900
Subject: [PATCH 0799/2403] Add custom board: Octave RP2040

---
 .../takayoshiotake_octave_rp2040/board.c      | 40 +++++++++++++++++
 .../mpconfigboard.h                           |  5 +++
 .../mpconfigboard.mk                          |  9 ++++
 .../pico-sdk-configboard.h                    |  4 ++
 .../takayoshiotake_octave_rp2040/pins.c       | 45 +++++++++++++++++++
 5 files changed, 103 insertions(+)
 create mode 100644 ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
 create mode 100644 ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c

diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.h
new file mode 100644
index 0000000000..901ae068dd
--- /dev/null
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "takayoshiotake Octave RP2040"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO12)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO11)
diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.mk
new file mode 100644
index 0000000000..6a7234809c
--- /dev/null
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x1209
+USB_PID = 0x8CAE
+USB_PRODUCT = "Octave RP2040"
+USB_MANUFACTURER = "takayoshiotake"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c
new file mode 100644
index 0000000000..4218f9cdea
--- /dev/null
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c
@@ -0,0 +1,45 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO29), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_ADC0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_ADC1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_ADC2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_ADC3), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIX), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIX_POWER), MP_ROM_PTR(&pin_GPIO11) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f87e34b9edd97af33f480de7c260a90f4d76f2c5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 8 Aug 2022 09:34:40 -0500
Subject: [PATCH 0800/2403] add shutter button

---
 ports/espressif/boards/espressif_esp32_eye/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/espressif_esp32_eye/pins.c b/ports/espressif/boards/espressif_esp32_eye/pins.c
index 2b640681c9..1824ba1cc0 100644
--- a/ports/espressif/boards/espressif_esp32_eye/pins.c
+++ b/ports/espressif/boards/espressif_esp32_eye/pins.c
@@ -24,6 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO32) },
 
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO15) },
 
     { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_LED_WHITE), MP_ROM_PTR(&pin_GPIO22) },

From ec839d6f9044e1009efcd5d1d18d2dd26520a9db Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 9 Aug 2022 10:52:22 -0500
Subject: [PATCH 0801/2403] these items should not have been disabled

---
 ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
index a23b6ef6a8..4bd091d723 100644
--- a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
@@ -6,9 +6,6 @@ IDF_TARGET = esp32
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_STATUS_BAR = 0
-CIRCUITPY_WEB_WORKFLOW = 0
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB

From 5a85b8ab95e7c5eab7a35b789e7cdc625debca6c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 9 Aug 2022 11:41:31 -0500
Subject: [PATCH 0802/2403] improve docstrings based on my best sleuthing

---
 .../espressif/bindings/esp32_camera/Camera.c  | 62 +++++++++++--------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 665c120a70..9a7b79a3ed 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -65,6 +65,18 @@
 //|
 //|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
 //|
+//|
+//|         ..  IMPORTANT:
+//|             Not all supported sensors have all
+//|             of the properties listed below. For instance, the
+//|             OV5640 supports `denoise`, but the
+//|             OV2640 does not. The underlying esp32-camera
+//|             library does not provide a reliable API to check
+//|             which settings are supported. CircuitPython makes
+//|             a best effort to determine when an unsupported
+//|             property is set and will raise an exception in
+//|             that case.
+//|
 //|         :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
 //|         :param pixel_clock: The pixel clock output from the camera module
 //|         :param vsync: The vertical sync pulse output from the camera module
@@ -230,7 +242,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, e
 //|         grab_mode: Optional[GrabMode] = None,
 //|         framebuffer_count: Optional[int] = None,
 //|     ) -> None:
-//|         """Set the frame size and pixel format
+//|         """Change multiple related camera settings simultaneously
 //|
 //|         Because these settings interact in complex ways, and take longer than
 //|         the other properties to set, they are set together in a single function call.
@@ -304,7 +316,7 @@ MP_PROPERTY_GETTER(esp32_camera_camera_frame_size_obj,
     (mp_obj_t)&esp32_camera_camera_get_frame_size_obj);
 
 //|     contrast: int
-//|     """Access the contrast property of the camera sensor"""
+//|     """The sensor contrast.  Positive values increase contrast, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_contrast(const mp_obj_t self_in) {
@@ -326,7 +338,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_contrast_obj,
     (mp_obj_t)&esp32_camera_camera_set_contrast_obj);
 
 //|     brightness: int
-//|     """Access the brightness property of the camera sensor"""
+//|     """The sensor brightness.  Positive values increase brightness, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_brightness(const mp_obj_t self_in) {
@@ -348,7 +360,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_brightness_obj,
     (mp_obj_t)&esp32_camera_camera_set_brightness_obj);
 
 //|     saturation: int
-//|     """Access the saturation property of the camera sensor"""
+//|     """The sensor saturation.  Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_saturation(const mp_obj_t self_in) {
@@ -370,7 +382,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_saturation_obj,
     (mp_obj_t)&esp32_camera_camera_set_saturation_obj);
 
 //|     sharpness: int
-//|     """Access the sharpness property of the camera sensor"""
+//|     """The sensor sharpness.  Positive values increase sharpness (more defined edges), negative values lower it (softer edges).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_sharpness(const mp_obj_t self_in) {
@@ -392,7 +404,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_sharpness_obj,
     (mp_obj_t)&esp32_camera_camera_set_sharpness_obj);
 
 //|     denoise: int
-//|     """Access the denoise property of the camera sensor"""
+//|     """The sensor 'denoise' setting.  Any camera sensor has inherent 'noise', especially in low brightness environments. Software algorithms can decrease noise at the expense of fine detail.  A larger value increases the amount of software noise removal.  The total range is device-specific but the value is often from 0 to 10."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_denoise(const mp_obj_t self_in) {
@@ -414,7 +426,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_denoise_obj,
     (mp_obj_t)&esp32_camera_camera_set_denoise_obj);
 
 //|     gain_ceiling: GainCeiling
-//|     """Access the gain ceiling property of the camera sensor"""
+//|     """The sensor 'gain ceiling' setting. "Gain" is an analog multiplier applied to the raw sensor data.  The 'ceiling' is the maximum gain value that the sensor will use. A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_gain_ceiling(const mp_obj_t self_in) {
@@ -436,7 +448,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_gain_ceiling_obj,
     (mp_obj_t)&esp32_camera_camera_set_gain_ceiling_obj);
 
 //|     quality: int
-//|     """Access the quality property of the camera sensor"""
+//|     """The 'quality' setting when capturing JPEG images.  This is similar to the quality setting when exporting a jpeg image from photo editing software.  Typical values range from 5 to 40, with higher numbers leading to larger image sizes and better overall image quality. However, when the quality is set to a high number, the total size of the JPEG data can exceed the size of an internal buffer, causing image capture to fail."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_quality(const mp_obj_t self_in) {
@@ -458,7 +470,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_quality_obj,
     (mp_obj_t)&esp32_camera_camera_set_quality_obj);
 
 //|     colorbar: bool
-//|     """Access the colorbar property of the camera sensor"""
+//|     """When `True`, a test pattern image is captured and the real sensor data is not used."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_colorbar(const mp_obj_t self_in) {
@@ -480,7 +492,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_colorbar_obj,
     (mp_obj_t)&esp32_camera_camera_set_colorbar_obj);
 
 //|     whitebal: bool
-//|     """Access the whitebal property of the camera sensor"""
+//|     """When `True`, the camera attempts to automatically control white balance.  When `False`, the `wb_mode` setting is used instead."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_whitebal(const mp_obj_t self_in) {
@@ -502,7 +514,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_whitebal_obj,
     (mp_obj_t)&esp32_camera_camera_set_whitebal_obj);
 
 //|     gain_ctrl: bool
-//|     """Access the gain_ctrl property of the camera sensor"""
+//|     """When `True`, the camera attempts to automatically control the sensor gain, up to the value in the `gain_ceiling` property.  When `False`, the `agc_gain` setting is used instead."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_gain_ctrl(const mp_obj_t self_in) {
@@ -524,7 +536,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_gain_ctrl_obj,
     (mp_obj_t)&esp32_camera_camera_set_gain_ctrl_obj);
 
 //|     exposure_ctrl: bool
-//|     """Access the exposure_ctrl property of the camera sensor"""
+//|     """When `True` the camera attempts to automatically control the exposure. When `False`, the `aec_value` setting is used instead."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_exposure_ctrl(const mp_obj_t self_in) {
@@ -546,7 +558,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_exposure_ctrl_obj,
     (mp_obj_t)&esp32_camera_camera_set_exposure_ctrl_obj);
 
 //|     hmirror: bool
-//|     """Access the hmirror property of the camera sensor"""
+//|     """When `true` the camera image is mirrored left-to-right"""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_hmirror(const mp_obj_t self_in) {
@@ -568,7 +580,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_hmirror_obj,
     (mp_obj_t)&esp32_camera_camera_set_hmirror_obj);
 
 //|     vflip: bool
-//|     """Access the vflip property of the camera sensor"""
+//|     """When `True` the camera image is flipped top-to-bottom"""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_vflip(const mp_obj_t self_in) {
@@ -590,7 +602,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_vflip_obj,
     (mp_obj_t)&esp32_camera_camera_set_vflip_obj);
 
 //|     aec2: bool
-//|     """Access the aec2 property of the camera sensor"""
+//|     """When `True` the sensor's "night mode" is enabled, extending the range of automatic gain control."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_aec2(const mp_obj_t self_in) {
@@ -634,7 +646,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_awb_gain_obj,
     (mp_obj_t)&esp32_camera_camera_set_awb_gain_obj);
 
 //|     agc_gain: int
-//|     """Access the agc_gain property of the camera sensor"""
+//|     """Access the gain level of the sensor. Higher values produce brighter images.  Typical settings range from 0 to 30. """
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_agc_gain(const mp_obj_t self_in) {
@@ -656,7 +668,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_agc_gain_obj,
     (mp_obj_t)&esp32_camera_camera_set_agc_gain_obj);
 
 //|     aec_value: int
-//|     """Access the aec_value property of the camera sensor"""
+//|     """Access the exposure value of the camera.  Higher values produce brighter images.  Typical settings range from 0 to 1200."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_aec_value(const mp_obj_t self_in) {
@@ -678,7 +690,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_aec_value_obj,
     (mp_obj_t)&esp32_camera_camera_set_aec_value_obj);
 
 //|     special_effect: int
-//|     """Access the special_effect property of the camera sensor"""
+//|     """Enable a "special effect". Zero is no special effect.  On OV5640, special effects range from 0 to 6 inclusive and select various color modes."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_special_effect(const mp_obj_t self_in) {
@@ -700,7 +712,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_special_effect_obj,
     (mp_obj_t)&esp32_camera_camera_set_special_effect_obj);
 
 //|     wb_mode: int
-//|     """Access the wb_mode property of the camera sensor"""
+//|     """The white balance mode.  0 is automatic white balance.  Typical values range from 0 to 4 inclusive."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_wb_mode(const mp_obj_t self_in) {
@@ -722,7 +734,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_wb_mode_obj,
     (mp_obj_t)&esp32_camera_camera_set_wb_mode_obj);
 
 //|     ae_level: int
-//|     """Access the ae_level property of the camera sensor"""
+//|     """The exposure offset for automatic exposure.  Typical values range from -2 to +2."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_ae_level(const mp_obj_t self_in) {
@@ -744,7 +756,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_ae_level_obj,
     (mp_obj_t)&esp32_camera_camera_set_ae_level_obj);
 
 //|     dcw: bool
-//|     """Access the dcw property of the camera sensor"""
+//|     """When `True` an advanced white balance mode is selected."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_dcw(const mp_obj_t self_in) {
@@ -766,7 +778,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_dcw_obj,
     (mp_obj_t)&esp32_camera_camera_set_dcw_obj);
 
 //|     bpc: bool
-//|     """Access the bpc property of the camera sensor"""
+//|     """When `True`, "black point compensation" is enabled. This can make black parts of the image darker."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_bpc(const mp_obj_t self_in) {
@@ -788,7 +800,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_bpc_obj,
     (mp_obj_t)&esp32_camera_camera_set_bpc_obj);
 
 //|     wpc: bool
-//|     """Access the wpc property of the camera sensor"""
+//|     """When `True`, "white point compensation" is enabled.  This can make white parts of the image whiter."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_wpc(const mp_obj_t self_in) {
@@ -810,7 +822,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_wpc_obj,
     (mp_obj_t)&esp32_camera_camera_set_wpc_obj);
 
 //|     raw_gma: bool
-//|     """Access the raw_gma property of the camera sensor"""
+//|     """When `True`, raw gamma mode is enabled."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_raw_gma(const mp_obj_t self_in) {
@@ -832,7 +844,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_raw_gma_obj,
     (mp_obj_t)&esp32_camera_camera_set_raw_gma_obj);
 
 //|     lenc: bool
-//|     """Access the lenc property of the camera sensor"""
+//|     """Enable "lens correction". This can help compensate for light fall-off at the edge of the sensor area."""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_lenc(const mp_obj_t self_in) {

From 84807cd6eb9dd9632288a61aec58356ad57d9ffc Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 9 Aug 2022 13:06:18 -0400
Subject: [PATCH 0803/2403] Change I2C terminology from "peripheral" to
 "target"

---
 docs/porting.rst                              |   2 +-
 locale/circuitpython.pot                      |  16 +-
 .../boards/pewpew_lcd/mpconfigboard.mk        |   2 +-
 .../boards/pewpew_m4/mpconfigboard.mk         |   2 +-
 .../boards/ugame10/mpconfigboard.mk           |   2 +-
 .../mpconfigboard.mk                          |   2 +-
 .../boards/winterbloom_sol/mpconfigboard.mk   |   2 +-
 .../common-hal/i2cperipheral/__init__.c       |   1 -
 .../I2CPeripheral.c => i2ctarget/I2CTarget.c} |  34 +--
 .../I2CPeripheral.h => i2ctarget/I2CTarget.h} |   8 +-
 .../common-hal/i2ctarget/__init__.c           |   1 +
 ports/atmel-samd/mpconfigport.mk              |   2 +-
 ports/broadcom/mpconfigport.mk                |   2 +-
 ports/cxd56/mpconfigport.mk                   |   2 +-
 .../common-hal/i2cperipheral/__init__.c       |   1 -
 .../I2CPeripheral.c => i2ctarget/I2CTarget.c} |  26 +--
 .../I2CPeripheral.h => i2ctarget/I2CTarget.h} |   8 +-
 .../espressif/common-hal/i2ctarget/__init__.c |   1 +
 ports/espressif/mpconfigport.mk               |   2 +-
 ports/litex/mpconfigport.mk                   |   2 +-
 ports/mimxrt10xx/mpconfigport.mk              |   2 +-
 ports/nrf/mpconfigport.mk                     |   2 +-
 ports/raspberrypi/mpconfigport.mk             |   2 +-
 ports/stm/boards/swan_r5/mpconfigboard.mk     |   2 +-
 ports/stm/mpconfigport.mk                     |   8 +-
 py/circuitpy_defns.mk                         |   8 +-
 py/circuitpy_mpconfig.mk                      |   4 +-
 .../I2CPeripheral.c => i2ctarget/I2CTarget.c} | 214 +++++++++---------
 .../I2CPeripheral.h => i2ctarget/I2CTarget.h} |  32 +--
 .../{i2cperipheral => i2ctarget}/__init__.c   |  35 +--
 30 files changed, 217 insertions(+), 210 deletions(-)
 delete mode 100644 ports/atmel-samd/common-hal/i2cperipheral/__init__.c
 rename ports/atmel-samd/common-hal/{i2cperipheral/I2CPeripheral.c => i2ctarget/I2CTarget.c} (83%)
 rename ports/atmel-samd/common-hal/{i2cperipheral/I2CPeripheral.h => i2ctarget/I2CTarget.h} (85%)
 create mode 100644 ports/atmel-samd/common-hal/i2ctarget/__init__.c
 delete mode 100644 ports/espressif/common-hal/i2cperipheral/__init__.c
 rename ports/espressif/common-hal/{i2cperipheral/I2CPeripheral.c => i2ctarget/I2CTarget.c} (75%)
 rename ports/espressif/common-hal/{i2cperipheral/I2CPeripheral.h => i2ctarget/I2CTarget.h} (85%)
 create mode 100644 ports/espressif/common-hal/i2ctarget/__init__.c
 rename shared-bindings/{i2cperipheral/I2CPeripheral.c => i2ctarget/I2CTarget.c} (51%)
 rename shared-bindings/{i2cperipheral/I2CPeripheral.h => i2ctarget/I2CTarget.h} (54%)
 rename shared-bindings/{i2cperipheral => i2ctarget}/__init__.c (73%)

diff --git a/docs/porting.rst b/docs/porting.rst
index 07a2b1e9c4..f4ed2ab4cc 100644
--- a/docs/porting.rst
+++ b/docs/porting.rst
@@ -71,7 +71,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
     CIRCUITPY_SDCARDIO = 0
     CIRCUITPY_FRAMEBUFFERIO = 0
     CIRCUITPY_FREQUENCYIO = 0
-    CIRCUITPY_I2CPERIPHERAL = 0
+    CIRCUITPY_I2CTARGET = 0
     # Requires SPI, PulseIO (stub ok):
     CIRCUITPY_DISPLAYIO = 0
 
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 549a7b54ed..d74d00efd7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -398,12 +398,14 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr ""
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1589,7 +1591,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2319,11 +2321,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2515,7 +2517,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
index 2bf4992e25..94d0530ce2 100644
--- a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
@@ -33,7 +33,7 @@ CIRCUITPY_BLEIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 06346b43de..bcf3e132d3 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -18,7 +18,7 @@ CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITBANG_APA102 = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PIXELBUF = 0
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index f942490f29..7eb0ec8412 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -22,7 +22,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PIXELBUF = 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 5bf70a9668..00b9b64a33 100644
--- a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -23,7 +23,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_KEYPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
index 653d2e6ed5..17638a0ebd 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -22,7 +22,7 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_KEYPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
diff --git a/ports/atmel-samd/common-hal/i2cperipheral/__init__.c b/ports/atmel-samd/common-hal/i2cperipheral/__init__.c
deleted file mode 100644
index c67511c536..0000000000
--- a/ports/atmel-samd/common-hal/i2cperipheral/__init__.c
+++ /dev/null
@@ -1 +0,0 @@
-// No i2cperipheral module functions.
diff --git a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c b/ports/atmel-samd/common-hal/i2ctarget/I2CTarget.c
similarity index 83%
rename from ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c
rename to ports/atmel-samd/common-hal/i2ctarget/I2CTarget.c
index ae118c1909..a687143281 100644
--- a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c
+++ b/ports/atmel-samd/common-hal/i2ctarget/I2CTarget.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/i2cperipheral/I2CPeripheral.h"
+#include "shared-bindings/i2ctarget/I2CTarget.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "common-hal/busio/I2C.h"
 
@@ -36,7 +36,7 @@
 #include "hal/include/hal_gpio.h"
 #include "peripherals/samd/sercom.h"
 
-void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_peripheral_obj_t *self,
+void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
     uint8_t *addresses, unsigned int num_addresses, bool smbus) {
     uint8_t sercom_index;
@@ -100,12 +100,12 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe
     sercom->I2CS.CTRLA.bit.ENABLE = 1;
 }
 
-bool common_hal_i2cperipheral_i2c_peripheral_deinited(i2cperipheral_i2c_peripheral_obj_t *self) {
+bool common_hal_i2ctarget_i2c_target_deinited(i2ctarget_i2c_target_obj_t *self) {
     return self->sda_pin == NO_PIN;
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral_obj_t *self) {
-    if (common_hal_i2cperipheral_i2c_peripheral_deinited(self)) {
+void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self) {
+    if (common_hal_i2ctarget_i2c_target_deinited(self)) {
         return;
     }
 
@@ -117,7 +117,7 @@ void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral
     self->scl_pin = NO_PIN;
 }
 
-static int i2c_peripheral_check_error(i2cperipheral_i2c_peripheral_obj_t *self, bool raise) {
+static int i2c_target_check_error(i2ctarget_i2c_target_obj_t *self, bool raise) {
     if (!self->sercom->I2CS.INTFLAG.bit.ERROR) {
         return 0;
     }
@@ -136,8 +136,8 @@ static int i2c_peripheral_check_error(i2cperipheral_i2c_peripheral_obj_t *self,
     return -err;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart) {
-    int err = i2c_peripheral_check_error(self, false);
+int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart) {
+    int err = i2c_target_check_error(self, false);
     if (err) {
         return err;
     }
@@ -154,22 +154,22 @@ int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_perip
 
     for (unsigned int i = 0; i < self->num_addresses; i++) {
         if (*address == self->addresses[i]) {
-            common_hal_i2cperipheral_i2c_peripheral_ack(self, true);
+            common_hal_i2ctarget_i2c_target_ack(self, true);
             return 1;
         }
     }
 
     // This should clear AMATCH, but it doesn't...
-    common_hal_i2cperipheral_i2c_peripheral_ack(self, false);
+    common_hal_i2ctarget_i2c_target_ack(self, false);
     return 0;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_read_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *data) {
+int common_hal_i2ctarget_i2c_target_read_byte(i2ctarget_i2c_target_obj_t *self, uint8_t *data) {
     for (int t = 0; t < 100 && !self->sercom->I2CS.INTFLAG.reg; t++) {
         mp_hal_delay_us(10);
     }
 
-    i2c_peripheral_check_error(self, true);
+    i2c_target_check_error(self, true);
 
     if (!self->sercom->I2CS.INTFLAG.bit.DRDY ||
         self->sercom->I2CS.INTFLAG.bit.PREC ||
@@ -181,12 +181,12 @@ int common_hal_i2cperipheral_i2c_peripheral_read_byte(i2cperipheral_i2c_peripher
     return 1;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_write_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t data) {
+int common_hal_i2ctarget_i2c_target_write_byte(i2ctarget_i2c_target_obj_t *self, uint8_t data) {
     for (int t = 0; !self->sercom->I2CS.INTFLAG.reg && t < 100; t++) {
         mp_hal_delay_us(10);
     }
 
-    i2c_peripheral_check_error(self, true);
+    i2c_target_check_error(self, true);
 
     if (self->sercom->I2CS.INTFLAG.bit.PREC) {
         return 0;
@@ -208,12 +208,12 @@ int common_hal_i2cperipheral_i2c_peripheral_write_byte(i2cperipheral_i2c_periphe
     return 1;
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_ack(i2cperipheral_i2c_peripheral_obj_t *self, bool ack) {
+void common_hal_i2ctarget_i2c_target_ack(i2ctarget_i2c_target_obj_t *self, bool ack) {
     self->sercom->I2CS.CTRLB.bit.ACKACT = !ack;
     self->sercom->I2CS.CTRLB.bit.CMD = 0x03;
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_close(i2cperipheral_i2c_peripheral_obj_t *self) {
+void common_hal_i2ctarget_i2c_target_close(i2ctarget_i2c_target_obj_t *self) {
     for (int t = 0; !self->sercom->I2CS.INTFLAG.reg && t < 100; t++) {
         mp_hal_delay_us(10);
     }
@@ -223,7 +223,7 @@ void common_hal_i2cperipheral_i2c_peripheral_close(i2cperipheral_i2c_peripheral_
     }
 
     if (!self->sercom->I2CS.STATUS.bit.DIR) {
-        common_hal_i2cperipheral_i2c_peripheral_ack(self, false);
+        common_hal_i2ctarget_i2c_target_ack(self, false);
     } else {
         int i = 0;
         while (self->sercom->I2CS.INTFLAG.reg == SERCOM_I2CS_INTFLAG_DRDY) {
diff --git a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.h b/ports/atmel-samd/common-hal/i2ctarget/I2CTarget.h
similarity index 85%
rename from ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.h
rename to ports/atmel-samd/common-hal/i2ctarget/I2CTarget.h
index 03ae3a2885..894961ab7b 100644
--- a/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.h
+++ b/ports/atmel-samd/common-hal/i2ctarget/I2CTarget.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_TARGET_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_TARGET_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "py/obj.h"
@@ -40,6 +40,6 @@ typedef struct {
     uint8_t scl_pin;
     uint8_t sda_pin;
     bool writing;
-} i2cperipheral_i2c_peripheral_obj_t;
+} i2ctarget_i2c_target_obj_t;
 
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_TARGET_H
diff --git a/ports/atmel-samd/common-hal/i2ctarget/__init__.c b/ports/atmel-samd/common-hal/i2ctarget/__init__.c
new file mode 100644
index 0000000000..4ec26465ad
--- /dev/null
+++ b/ports/atmel-samd/common-hal/i2ctarget/__init__.c
@@ -0,0 +1 @@
+// No i2ctarget module functions.
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 56cde4964b..a03fc1d320 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -38,7 +38,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
 CIRCUITPY_GETPASS ?= 0
 CIRCUITPY_GIFIO ?= 0
-CIRCUITPY_I2CPERIPHERAL ?= 0
+CIRCUITPY_I2CTARGET ?= 0
 CIRCUITPY_JSON ?= 0
 CIRCUITPY_KEYPAD ?= 0
 CIRCUITPY_MSGPACK ?= 0
diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index d0c6acf408..839ef00514 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -9,7 +9,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PULSEIO = 0
diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index 2f0cd90c7f..cb54233a07 100644
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@@ -15,7 +15,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GNSS = 1
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
diff --git a/ports/espressif/common-hal/i2cperipheral/__init__.c b/ports/espressif/common-hal/i2cperipheral/__init__.c
deleted file mode 100644
index c67511c536..0000000000
--- a/ports/espressif/common-hal/i2cperipheral/__init__.c
+++ /dev/null
@@ -1 +0,0 @@
-// No i2cperipheral module functions.
diff --git a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c b/ports/espressif/common-hal/i2ctarget/I2CTarget.c
similarity index 75%
rename from ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
rename to ports/espressif/common-hal/i2ctarget/I2CTarget.c
index 6bd71cc797..6fde048676 100644
--- a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+++ b/ports/espressif/common-hal/i2ctarget/I2CTarget.c
@@ -24,15 +24,15 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/i2cperipheral/I2CPeripheral.h"
+#include "shared-bindings/i2ctarget/I2CTarget.h"
 
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
-#include "common-hal/i2cperipheral/I2CPeripheral.h"
+#include "common-hal/i2ctarget/I2CTarget.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_peripheral_obj_t *self,
+void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
     uint8_t *addresses, unsigned int num_addresses, bool smbus) {
     // Pins 45 and 46 are "strapping" pins that impact start up behavior. They usually need to
@@ -54,7 +54,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe
     self->i2c_num = peripherals_i2c_get_free_num();
 
     if (self->i2c_num == I2C_NUM_MAX) {
-        mp_raise_ValueError(translate("All I2C peripherals are in use"));
+        mp_raise_ValueError(translate("All I2C targets are in use"));
     }
 
     const i2c_config_t i2c_conf = {
@@ -73,7 +73,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe
         if (err == ESP_FAIL) {
             mp_raise_OSError(MP_EIO);
         } else {
-            mp_arg_error_invalid(MP_QSTR_I2CPeripheral);
+            mp_arg_error_invalid(MP_QSTR_I2CTarget);
         }
     }
 
@@ -81,12 +81,12 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe
     claim_pin(scl);
 }
 
-bool common_hal_i2cperipheral_i2c_peripheral_deinited(i2cperipheral_i2c_peripheral_obj_t *self) {
+bool common_hal_i2ctarget_i2c_target_deinited(i2ctarget_i2c_target_obj_t *self) {
     return self->sda_pin == NULL;
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral_obj_t *self) {
-    if (common_hal_i2cperipheral_i2c_peripheral_deinited(self)) {
+void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self) {
+    if (common_hal_i2ctarget_i2c_target_deinited(self)) {
         return;
     }
 
@@ -98,7 +98,7 @@ void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral
     self->scl_pin = NULL;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_peripheral_obj_t *self,
+int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *self,
     uint8_t *address, bool *is_read, bool *is_restart) {
     *address = self->addresses[0];
     *is_read = true;
@@ -106,21 +106,21 @@ int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_perip
     return 1;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_read_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *data) {
+int common_hal_i2ctarget_i2c_target_read_byte(i2ctarget_i2c_target_obj_t *self, uint8_t *data) {
     i2c_slave_read_buffer(self->i2c_num, data, 128, 0);
     return 1;
 }
 
-int common_hal_i2cperipheral_i2c_peripheral_write_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t data) {
+int common_hal_i2ctarget_i2c_target_write_byte(i2ctarget_i2c_target_obj_t *self, uint8_t data) {
     i2c_reset_tx_fifo(self->i2c_num);
     i2c_slave_write_buffer(self->i2c_num, &data, 128, 0);
     return 1;
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_ack(i2cperipheral_i2c_peripheral_obj_t *self, bool ack) {
+void common_hal_i2ctarget_i2c_target_ack(i2ctarget_i2c_target_obj_t *self, bool ack) {
 
 }
 
-void common_hal_i2cperipheral_i2c_peripheral_close(i2cperipheral_i2c_peripheral_obj_t *self) {
+void common_hal_i2ctarget_i2c_target_close(i2ctarget_i2c_target_obj_t *self) {
 
 }
diff --git a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.h b/ports/espressif/common-hal/i2ctarget/I2CTarget.h
similarity index 85%
rename from ports/espressif/common-hal/i2cperipheral/I2CPeripheral.h
rename to ports/espressif/common-hal/i2ctarget/I2CTarget.h
index d3b324b39a..422bd720eb 100644
--- a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.h
+++ b/ports/espressif/common-hal/i2ctarget/I2CTarget.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
+#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_TARGET_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_TARGET_H
 
 #include "py/obj.h"
 #include "peripherals/i2c.h"
@@ -38,6 +38,6 @@ typedef struct {
     uint8_t num_addresses;
     const mcu_pin_obj_t *scl_pin;
     const mcu_pin_obj_t *sda_pin;
-} i2cperipheral_i2c_peripheral_obj_t;
+} i2ctarget_i2c_target_obj_t;
 
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BUSIO_I2C_TARGET_H
diff --git a/ports/espressif/common-hal/i2ctarget/__init__.c b/ports/espressif/common-hal/i2ctarget/__init__.c
new file mode 100644
index 0000000000..4ec26465ad
--- /dev/null
+++ b/ports/espressif/common-hal/i2ctarget/__init__.c
@@ -0,0 +1 @@
+// No i2ctarget module functions.
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f390cbb21a..5512b0df7d 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -21,7 +21,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
 CIRCUITPY_HASHLIB ?= 1
 CIRCUITPY_IMAGECAPTURE ?= 1
-CIRCUITPY_I2CPERIPHERAL ?= 1
+CIRCUITPY_I2CTARGET ?= 1
 CIRCUITPY_RGBMATRIX ?= 1
 CIRCUITPY_ROTARYIO ?= 1
 CIRCUITPY_NVM ?= 1
diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk
index 2e342db47d..d8dc4eef1e 100644
--- a/ports/litex/mpconfigport.mk
+++ b/ports/litex/mpconfigport.mk
@@ -18,7 +18,7 @@ CIRCUITPY_BUSIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_PULSEIO = 0
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 5ffec18cfb..cee2d9a698 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -14,7 +14,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PULSEIO = 0
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index c1d3dce6e5..04c4f3bce6 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -27,7 +27,7 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BLEIO ?= 1
 
 # No I2CPeripheral implementation
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 
 CIRCUITPY_RTC ?= 1
 
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 65e39ee99d..1c4de50c00 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -20,7 +20,7 @@ CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 # Things that need to be implemented.
 # Use PWM interally
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NVM = 1
 # Use PIO interally
 CIRCUITPY_PULSEIO ?= 1
diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk
index ee17f65f7c..2ebaa9c23f 100644
--- a/ports/stm/boards/swan_r5/mpconfigboard.mk
+++ b/ports/stm/boards/swan_r5/mpconfigboard.mk
@@ -42,7 +42,7 @@ CIRCUITPY_PWMIO = 1
 CIRCUITPY_AUDIOPWMIO = 1
 CIRCUITPY_CANIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_I2CTARGET = 0
 # Requires SPI, PulseIO (stub ok):
 CIRCUITPY_DISPLAYIO = 0
 
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 9705dcd0a0..cb578e76e2 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -24,7 +24,7 @@ ifeq ($(MCU_SERIES),F4)
         CIRCUITPY_AUDIOBUSIO ?= 0
         CIRCUITPY_COUNTIO ?= 0
         CIRCUITPY_FREQUENCYIO ?= 0
-        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_I2CTARGET ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
         CIRCUITPY_RTC ?= 1
@@ -39,7 +39,7 @@ ifeq ($(MCU_SERIES),H7)
         CIRCUITPY_AUDIOIO ?= 0
         CIRCUITPY_COUNTIO ?= 0
         CIRCUITPY_FREQUENCYIO ?= 0
-        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_I2CTARGET ?= 0
         CIRCUITPY_NEOPIXEL_WRITE ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_PULSEIO ?= 0
@@ -58,7 +58,7 @@ ifeq ($(MCU_SERIES),F7)
         CIRCUITPY_AUDIOIO ?= 0
         CIRCUITPY_COUNTIO ?= 0
         CIRCUITPY_FREQUENCYIO ?= 0
-        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_I2CTARGET ?= 0
         CIRCUITPY_NEOPIXEL_WRITE ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
@@ -75,7 +75,7 @@ ifeq ($(MCU_SERIES),L4)
         CIRCUITPY_AUDIOIO ?= 0
         CIRCUITPY_COUNTIO ?= 0
         CIRCUITPY_FREQUENCYIO ?= 0
-        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_I2CTARGET ?= 0
         CIRCUITPY_NEOPIXEL_WRITE ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index af49c876ba..f22a96853e 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -210,8 +210,8 @@ endif
 ifeq ($(CIRCUITPY_HASHLIB),1)
 SRC_PATTERNS += hashlib/%
 endif
-ifeq ($(CIRCUITPY_I2CPERIPHERAL),1)
-SRC_PATTERNS += i2cperipheral/%
+ifeq ($(CIRCUITPY_I2CTARGET),1)
+SRC_PATTERNS += i2ctarget/%
 endif
 ifeq ($(CIRCUITPY_IMAGECAPTURE),1)
 SRC_PATTERNS += imagecapture/%
@@ -424,8 +424,8 @@ SRC_COMMON_HAL_ALL = \
 	gnss/SatelliteSystem.c \
 	hashlib/__init__.c \
 	hashlib/Hash.c \
-	i2cperipheral/I2CPeripheral.c \
-	i2cperipheral/__init__.c \
+	i2ctarget/I2CTarget.c \
+	i2ctarget/__init__.c \
 	microcontroller/Pin.c \
 	microcontroller/Processor.c \
 	microcontroller/__init__.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 6b6f629e18..94065c810c 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -242,8 +242,8 @@ CFLAGS += -DCIRCUITPY_GNSS=$(CIRCUITPY_GNSS)
 CIRCUITPY_HASHLIB ?= $(CIRCUITPY_WEB_WORKFLOW)
 CFLAGS += -DCIRCUITPY_HASHLIB=$(CIRCUITPY_HASHLIB)
 
-CIRCUITPY_I2CPERIPHERAL ?= $(CIRCUITPY_FULL_BUILD)
-CFLAGS += -DCIRCUITPY_I2CPERIPHERAL=$(CIRCUITPY_I2CPERIPHERAL)
+CIRCUITPY_I2CTARGET ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_I2CTARGET=$(CIRCUITPY_I2CTARGET)
 
 CIRCUITPY_IMAGECAPTURE ?= 0
 CFLAGS += -DCIRCUITPY_IMAGECAPTURE=$(CIRCUITPY_IMAGECAPTURE)
diff --git a/shared-bindings/i2cperipheral/I2CPeripheral.c b/shared-bindings/i2ctarget/I2CTarget.c
similarity index 51%
rename from shared-bindings/i2cperipheral/I2CPeripheral.c
rename to shared-bindings/i2ctarget/I2CTarget.c
index b63e8a891b..1680585ba5 100644
--- a/shared-bindings/i2cperipheral/I2CPeripheral.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -25,7 +25,7 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/i2cperipheral/I2CPeripheral.h"
+#include "shared-bindings/i2ctarget/I2CTarget.h"
 #include "shared-bindings/time/__init__.h"
 #include "shared-bindings/util.h"
 
@@ -39,33 +39,33 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 
-STATIC mp_obj_t mp_obj_new_i2cperipheral_i2c_peripheral_request(i2cperipheral_i2c_peripheral_obj_t *peripheral, uint8_t address, bool is_read, bool is_restart) {
-    i2cperipheral_i2c_peripheral_request_obj_t *self = m_new_obj(i2cperipheral_i2c_peripheral_request_obj_t);
-    self->base.type = &i2cperipheral_i2c_peripheral_request_type;
-    self->peripheral = peripheral;
+STATIC mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj_t *target, uint8_t address, bool is_read, bool is_restart) {
+    i2ctarget_i2c_target_request_obj_t *self = m_new_obj(i2ctarget_i2c_target_request_obj_t);
+    self->base.type = &i2ctarget_i2c_target_request_type;
+    self->target = target;
     self->address = address;
     self->is_read = is_read;
     self->is_restart = is_restart;
     return (mp_obj_t)self;
 }
 
-//| class I2CPeripheral:
-//|     """Two wire serial protocol peripheral"""
+//| class I2CTarget:
+//|     """Two wire serial protocol target"""
 //|
 //|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, addresses: Sequence[int], smbus: bool = False) -> None:
 //|         """I2C is a two-wire protocol for communicating between devices.
-//|         This implements the peripheral (sensor, secondary) side.
+//|         This implements the target (peripheral, sensor, secondary) side.
 //|
 //|         :param ~microcontroller.Pin scl: The clock pin
 //|         :param ~microcontroller.Pin sda: The data pin
-//|         :param addresses: The I2C addresses to respond to (how many is hw dependent).
+//|         :param addresses: The I2C addresses to respond to (how many is hardware dependent).
 //|         :type addresses: list[int]
 //|         :param bool smbus: Use SMBUS timings if the hardware supports it"""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    i2cperipheral_i2c_peripheral_obj_t *self = m_new_obj(i2cperipheral_i2c_peripheral_obj_t);
-    self->base.type = &i2cperipheral_i2c_peripheral_type;
+STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    i2ctarget_i2c_target_obj_t *self = m_new_obj(i2ctarget_i2c_target_obj_t);
+    self->base.type = &i2ctarget_i2c_target_type;
     enum { ARG_scl, ARG_sda, ARG_addresses, ARG_smbus };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -99,7 +99,7 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_make_new(const mp_obj_type_t *type,
         mp_raise_ValueError(translate("addresses is empty"));
     }
 
-    common_hal_i2cperipheral_i2c_peripheral_construct(self, scl, sda, addresses, i, args[ARG_smbus].u_bool);
+    common_hal_i2ctarget_i2c_target_construct(self, scl, sda, addresses, i, args[ARG_smbus].u_bool);
     return (mp_obj_t)self;
 }
 
@@ -107,15 +107,15 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_make_new(const mp_obj_type_t *type,
 //|         """Releases control of the underlying hardware so other classes can use it."""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_obj_deinit(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_type));
-    i2cperipheral_i2c_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_i2cperipheral_i2c_peripheral_deinit(self);
+STATIC mp_obj_t i2ctarget_i2c_target_obj_deinit(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_type));
+    i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_i2ctarget_i2c_target_deinit(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(i2cperipheral_i2c_peripheral_deinit_obj, i2cperipheral_i2c_peripheral_obj_deinit);
+MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_deinit_obj, i2ctarget_i2c_target_obj_deinit);
 
-//|     def __enter__(self) -> I2CPeripheral:
+//|     def __enter__(self) -> I2CTarget:
 //|         """No-op used in Context Managers."""
 //|         ...
 //|
@@ -126,25 +126,25 @@ MP_DEFINE_CONST_FUN_OBJ_1(i2cperipheral_i2c_peripheral_deinit_obj, i2cperipheral
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_obj___exit__(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &i2cperipheral_i2c_peripheral_type));
-    i2cperipheral_i2c_peripheral_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    common_hal_i2cperipheral_i2c_peripheral_deinit(self);
+STATIC mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_type));
+    i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    common_hal_i2ctarget_i2c_target_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2cperipheral_i2c_peripheral___exit___obj, 4, 4, i2cperipheral_i2c_peripheral_obj___exit__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, 4, i2ctarget_i2c_target_obj___exit__);
 
-//|     def request(self, timeout: float = -1) -> I2CPeripheralRequest:
+//|     def request(self, timeout: float = -1) -> I2CTargetRequest:
 //|         """Wait for an I2C request.
 //|
 //|         :param float timeout: Timeout in seconds. Zero means wait forever, a negative value means check once
-//|         :return: I2C Slave Request or None if timeout=-1 and there's no request
-//|         :rtype: ~i2cperipheral.I2CPeripheralRequest"""
+//|         :return: I2CTargetRequest or None if timeout=-1 and there's no request
+//|         :rtype: ~i2ctarget.I2CTargetRequest"""
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    mp_check_self(mp_obj_is_type(pos_args[0], &i2cperipheral_i2c_peripheral_type));
-    i2cperipheral_i2c_peripheral_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    if (common_hal_i2cperipheral_i2c_peripheral_deinited(self)) {
+STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_type));
+    i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    if (common_hal_i2ctarget_i2c_target_deinited(self)) {
         raise_deinited_error();
     }
     enum { ARG_timeout };
@@ -181,7 +181,7 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request(size_t n_args, const mp_obj
             return mp_const_none;
         }
 
-        int status = common_hal_i2cperipheral_i2c_peripheral_is_addressed(self, &address, &is_read, &is_restart);
+        int status = common_hal_i2ctarget_i2c_target_is_addressed(self, &address, &is_read, &is_restart);
         if (status < 0) {
             // On error try one more time before bailing out
             if (last_error) {
@@ -199,7 +199,7 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request(size_t n_args, const mp_obj
             continue;
         }
 
-        return mp_obj_new_i2cperipheral_i2c_peripheral_request(self, address, is_read, is_restart);
+        return mp_obj_new_i2ctarget_i2c_target_request(self, address, is_read, is_restart);
     } while (forever || common_hal_time_monotonic_ms() < timeout_end);
 
     if (timeout_ms > 0) {
@@ -207,42 +207,42 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request(size_t n_args, const mp_obj
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(i2cperipheral_i2c_peripheral_request_obj, 1, i2cperipheral_i2c_peripheral_request);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_obj, 1, i2ctarget_i2c_target_request);
 
-STATIC const mp_rom_map_elem_t i2cperipheral_i2c_peripheral_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_deinit_obj) },
+STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&i2ctarget_i2c_target_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2cperipheral_i2c_peripheral___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_request), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2ctarget_i2c_target___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_request), MP_ROM_PTR(&i2ctarget_i2c_target_request_obj) },
 
 };
 
-STATIC MP_DEFINE_CONST_DICT(i2cperipheral_i2c_peripheral_locals_dict, i2cperipheral_i2c_peripheral_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_locals_dict, i2ctarget_i2c_target_locals_dict_table);
 
-const mp_obj_type_t i2cperipheral_i2c_peripheral_type = {
+const mp_obj_type_t i2ctarget_i2c_target_type = {
     { &mp_type_type },
-    .name = MP_QSTR_I2CPeripheral,
-    .make_new = i2cperipheral_i2c_peripheral_make_new,
-    .locals_dict = (mp_obj_dict_t *)&i2cperipheral_i2c_peripheral_locals_dict,
+    .name = MP_QSTR_I2CTarget,
+    .make_new = i2ctarget_i2c_target_make_new,
+    .locals_dict = (mp_obj_dict_t *)&i2ctarget_i2c_target_locals_dict,
 };
 
-//| class I2CPeripheralRequest:
+//| class I2CTargetRequest:
 //|
-//|     def __init__(self, peripheral: i2cperipheral.I2CPeripheral, address: int, is_read: bool, is_restart: bool) -> None:
+//|     def __init__(self, target: i2ctarget.I2CTarget, address: int, is_read: bool, is_restart: bool) -> None:
 //|         """Information about an I2C transfer request
-//|         This cannot be instantiated directly, but is returned by :py:meth:`I2CPeripheral.request`.
+//|         This cannot be instantiated directly, but is returned by :py:meth:`I2CTarget.request`.
 //|
-//|         :param peripheral: The I2CPeripheral object receiving this request
+//|         :param target: The I2CTarget object receiving this request
 //|         :param address: I2C address
-//|         :param is_read: True if the main peripheral is requesting data
+//|         :param is_read: True if the main target is requesting data
 //|         :param is_restart: Repeated Start Condition"""
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t i2ctarget_i2c_target_request_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, 4, 4, false);
-    return mp_obj_new_i2cperipheral_i2c_peripheral_request(args[0], mp_obj_get_int(args[1]), mp_obj_is_true(args[2]), mp_obj_is_true(args[3]));
+    return mp_obj_new_i2ctarget_i2c_target_request(args[0], mp_obj_get_int(args[1]), mp_obj_is_true(args[2]), mp_obj_is_true(args[3]));
 }
 
-//|     def __enter__(self) -> I2CPeripheralRequest:
+//|     def __enter__(self) -> I2CTargetRequest:
 //|         """No-op used in Context Managers."""
 //|         ...
 //|
@@ -252,56 +252,56 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_make_new(const mp_obj_type_
 //|         """Close the request."""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_obj___exit__(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    common_hal_i2cperipheral_i2c_peripheral_close(self->peripheral);
+STATIC mp_obj_t i2ctarget_i2c_target_request_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    common_hal_i2ctarget_i2c_target_close(self->target);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2cperipheral_i2c_peripheral_request___exit___obj, 4, 4, i2cperipheral_i2c_peripheral_request_obj___exit__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request___exit___obj, 4, 4, i2ctarget_i2c_target_request_obj___exit__);
 
 //|     address: int
 //|     """The I2C address of the request."""
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_get_address(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t i2ctarget_i2c_target_request_get_address(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(self->address);
 }
-MP_DEFINE_CONST_PROP_GET(i2cperipheral_i2c_peripheral_request_address_obj, i2cperipheral_i2c_peripheral_request_get_address);
+MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_address_obj, i2ctarget_i2c_target_request_get_address);
 
 //|     is_read: bool
-//|     """The I2C main controller is reading from this peripheral."""
+//|     """The I2C main controller is reading from this target."""
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_get_is_read(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_read(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(self->is_read);
 }
-MP_DEFINE_CONST_PROP_GET(i2cperipheral_i2c_peripheral_request_is_read_obj, i2cperipheral_i2c_peripheral_request_get_is_read);
+MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_read_obj, i2ctarget_i2c_target_request_get_is_read);
 
 //|     is_restart: bool
 //|     """Is Repeated Start Condition."""
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_get_is_restart(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_restart(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(self->is_restart);
 }
-MP_DEFINE_CONST_PROP_GET(i2cperipheral_i2c_peripheral_request_is_restart_obj, i2cperipheral_i2c_peripheral_request_get_is_restart);
+MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_restart_obj, i2ctarget_i2c_target_request_get_is_restart);
 
 //|     def read(self, n: int = -1, ack: bool = True) -> bytearray:
 //|         """Read data.
-//|         If ack=False, the caller is responsible for calling :py:meth:`I2CPeripheralRequest.ack`.
+//|         If ack=False, the caller is responsible for calling :py:meth:`I2CTargetRequest.ack`.
 //|
 //|         :param n: Number of bytes to read (negative means all)
 //|         :param ack: Whether or not to send an ACK after the n'th byte
 //|         :return: Bytes read"""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    mp_check_self(mp_obj_is_type(pos_args[0], &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+STATIC mp_obj_t i2ctarget_i2c_target_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     enum { ARG_n, ARG_ack };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_n,          MP_ARG_INT, {.u_int = -1} },
@@ -330,7 +330,7 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_read(size_t n_args, const m
         }
 
         uint8_t data;
-        int num = common_hal_i2cperipheral_i2c_peripheral_read_byte(self->peripheral, &data);
+        int num = common_hal_i2ctarget_i2c_target_read_byte(self->target, &data);
         if (num == 0) {
             break;
         }
@@ -339,16 +339,16 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_read(size_t n_args, const m
         buffer[i++] = data;
         if (i == n) {
             if (ack) {
-                common_hal_i2cperipheral_i2c_peripheral_ack(self->peripheral, true);
+                common_hal_i2ctarget_i2c_target_ack(self->target, true);
             }
             break;
         }
-        common_hal_i2cperipheral_i2c_peripheral_ack(self->peripheral, true);
+        common_hal_i2ctarget_i2c_target_ack(self->target, true);
     }
 
     return mp_obj_new_bytearray(i, buffer);
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(i2cperipheral_i2c_peripheral_request_read_obj, 1, i2cperipheral_i2c_peripheral_request_read);
+MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_read_obj, 1, i2ctarget_i2c_target_request_read);
 
 //|     def write(self, buffer: ReadableBuffer) -> int:
 //|         """Write the data contained in buffer.
@@ -357,9 +357,9 @@ MP_DEFINE_CONST_FUN_OBJ_KW(i2cperipheral_i2c_peripheral_request_read_obj, 1, i2c
 //|         :return: Number of bytes written"""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_write(mp_obj_t self_in, mp_obj_t buf_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t i2ctarget_i2c_target_request_write(mp_obj_t self_in, mp_obj_t buf_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (!self->is_read) {
         mp_raise_OSError(MP_EACCES);
@@ -374,7 +374,7 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_write(mp_obj_t self_in, mp_
             break;
         }
 
-        int num = common_hal_i2cperipheral_i2c_peripheral_write_byte(self->peripheral, ((uint8_t *)(bufinfo.buf))[i]);
+        int num = common_hal_i2ctarget_i2c_target_write_byte(self->target, ((uint8_t *)(bufinfo.buf))[i]);
         if (num == 0) {
             return mp_obj_new_int(i);
         }
@@ -382,55 +382,55 @@ STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_write(mp_obj_t self_in, mp_
 
     return mp_obj_new_int(bufinfo.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2cperipheral_i2c_peripheral_request_write_obj, i2cperipheral_i2c_peripheral_request_write);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarget_i2c_target_request_write);
 
 //|     def ack(self, ack: bool = True) -> None:
 //|         """Acknowledge or Not Acknowledge last byte received.
-//|         Use together with :py:meth:`I2CPeripheralRequest.read` ack=False.
+//|         Use together with :py:meth:`I2CTargetRequest.read` ack=False.
 //|
 //|         :param ack: Whether to send an ACK or NACK"""
 //|         ...
 //|
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_ack(uint n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+STATIC mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *args) {
+    mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     bool ack = (n_args == 1) ? true : mp_obj_is_true(args[1]);
 
     if (self->is_read) {
         mp_raise_OSError(MP_EACCES);
     }
 
-    common_hal_i2cperipheral_i2c_peripheral_ack(self->peripheral, ack);
+    common_hal_i2ctarget_i2c_target_ack(self->target, ack);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2cperipheral_i2c_peripheral_request_ack_obj, 1, 2, i2cperipheral_i2c_peripheral_request_ack);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request_ack_obj, 1, 2, i2ctarget_i2c_target_request_ack);
 
-STATIC mp_obj_t i2cperipheral_i2c_peripheral_request_close(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &i2cperipheral_i2c_peripheral_request_type));
-    i2cperipheral_i2c_peripheral_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t i2ctarget_i2c_target_request_close(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
+    i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    common_hal_i2cperipheral_i2c_peripheral_close(self->peripheral);
+    common_hal_i2ctarget_i2c_target_close(self->target);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(i2cperipheral_i2c_peripheral_request_close_obj, i2cperipheral_i2c_peripheral_request_close);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_request_close_obj, i2ctarget_i2c_target_request_close);
 
-STATIC const mp_rom_map_elem_t i2cperipheral_i2c_peripheral_request_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_request_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_address_obj) },
-    { MP_ROM_QSTR(MP_QSTR_is_read), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_is_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_is_restart), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_is_restart_obj) },
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ack), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_ack_obj) },
-    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_request_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2ctarget_i2c_target_request___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&i2ctarget_i2c_target_request_address_obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_read), MP_ROM_PTR(&i2ctarget_i2c_target_request_is_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_restart), MP_ROM_PTR(&i2ctarget_i2c_target_request_is_restart_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&i2ctarget_i2c_target_request_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&i2ctarget_i2c_target_request_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ack), MP_ROM_PTR(&i2ctarget_i2c_target_request_ack_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&i2ctarget_i2c_target_request_close_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(i2cperipheral_i2c_peripheral_request_locals_dict, i2cperipheral_i2c_peripheral_request_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_request_locals_dict, i2ctarget_i2c_target_request_locals_dict_table);
 
-const mp_obj_type_t i2cperipheral_i2c_peripheral_request_type = {
+const mp_obj_type_t i2ctarget_i2c_target_request_type = {
     { &mp_type_type },
-    .name = MP_QSTR_I2CPeripheralRequest,
-    .make_new = i2cperipheral_i2c_peripheral_request_make_new,
-    .locals_dict = (mp_obj_dict_t *)&i2cperipheral_i2c_peripheral_request_locals_dict,
+    .name = MP_QSTR_I2CTargetRequest,
+    .make_new = i2ctarget_i2c_target_request_make_new,
+    .locals_dict = (mp_obj_dict_t *)&i2ctarget_i2c_target_request_locals_dict,
 };
diff --git a/shared-bindings/i2cperipheral/I2CPeripheral.h b/shared-bindings/i2ctarget/I2CTarget.h
similarity index 54%
rename from shared-bindings/i2cperipheral/I2CPeripheral.h
rename to shared-bindings/i2ctarget/I2CTarget.h
index d3db1b96c9..e9c9714dee 100644
--- a/shared-bindings/i2cperipheral/I2CPeripheral.h
+++ b/shared-bindings/i2ctarget/I2CTarget.h
@@ -24,37 +24,37 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_SLAVE_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_SLAVE_H
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_TARGET_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_TARGET_H
 
 #include "py/obj.h"
 
 #include "common-hal/microcontroller/Pin.h"
-#include "common-hal/i2cperipheral/I2CPeripheral.h"
+#include "common-hal/i2ctarget/I2CTarget.h"
 
 typedef struct {
     mp_obj_base_t base;
-    i2cperipheral_i2c_peripheral_obj_t *peripheral;
+    i2ctarget_i2c_target_obj_t *target;
     uint16_t address;
     bool is_read;
     bool is_restart;
-} i2cperipheral_i2c_peripheral_request_obj_t;
+} i2ctarget_i2c_target_request_obj_t;
 
-extern const mp_obj_type_t i2cperipheral_i2c_peripheral_request_type;
+extern const mp_obj_type_t i2ctarget_i2c_target_request_type;
 
-extern const mp_obj_type_t i2cperipheral_i2c_peripheral_type;
+extern const mp_obj_type_t i2ctarget_i2c_target_type;
 
-extern void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_peripheral_obj_t *self,
+extern void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
     uint8_t *addresses, unsigned int num_addresses, bool smbus);
-extern void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral_obj_t *self);
-extern bool common_hal_i2cperipheral_i2c_peripheral_deinited(i2cperipheral_i2c_peripheral_obj_t *self);
+extern void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self);
+extern bool common_hal_i2ctarget_i2c_target_deinited(i2ctarget_i2c_target_obj_t *self);
 
-extern int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_peripheral_obj_t *self,
+extern int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *self,
     uint8_t *address, bool *is_read, bool *is_restart);
-extern int common_hal_i2cperipheral_i2c_peripheral_read_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *data);
-extern int common_hal_i2cperipheral_i2c_peripheral_write_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t data);
-extern void common_hal_i2cperipheral_i2c_peripheral_ack(i2cperipheral_i2c_peripheral_obj_t *self, bool ack);
-extern void common_hal_i2cperipheral_i2c_peripheral_close(i2cperipheral_i2c_peripheral_obj_t *self);
+extern int common_hal_i2ctarget_i2c_target_read_byte(i2ctarget_i2c_target_obj_t *self, uint8_t *data);
+extern int common_hal_i2ctarget_i2c_target_write_byte(i2ctarget_i2c_target_obj_t *self, uint8_t data);
+extern void common_hal_i2ctarget_i2c_target_ack(i2ctarget_i2c_target_obj_t *self, bool ack);
+extern void common_hal_i2ctarget_i2c_target_close(i2ctarget_i2c_target_obj_t *self);
 
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_SLAVE_H
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_TARGET_H
diff --git a/shared-bindings/i2cperipheral/__init__.c b/shared-bindings/i2ctarget/__init__.c
similarity index 73%
rename from shared-bindings/i2cperipheral/__init__.c
rename to shared-bindings/i2ctarget/__init__.c
index fde7002daf..70c4707597 100644
--- a/shared-bindings/i2cperipheral/__init__.c
+++ b/shared-bindings/i2ctarget/__init__.c
@@ -30,24 +30,24 @@
 #include "py/runtime.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
-// #include "shared-bindings/i2cperipheral/__init__.h"
-#include "shared-bindings/i2cperipheral/I2CPeripheral.h"
+// #include "shared-bindings/i2ctarget/__init__.h"
+#include "shared-bindings/i2ctarget/I2CTarget.h"
 
 #include "py/runtime.h"
 
-//| """Two wire serial protocol peripheral
+//| """Two wire serial protocol target
 //|
-//| The `i2cperipheral` module contains classes to support an I2C peripheral.
+//| The `i2ctarget` module contains classes to support an I2C target.
 //|
-//| Example emulating a peripheral with 2 addresses (read and write)::
+//| Example emulating a target with 2 addresses (read and write)::
 //|
 //|   import board
-//|   from i2cperipheral import I2CPeripheral
+//|   from i2ctarget import I2CTarget
 //|
 //|   regs = [0] * 16
 //|   index = 0
 //|
-//|   with I2CPeripheral(board.SCL, board.SDA, (0x40, 0x41)) as device:
+//|   with I2CTarget(board.SCL, board.SDA, (0x40, 0x41)) as device:
 //|       while True:
 //|           r = device.request()
 //|           if not r:
@@ -84,7 +84,7 @@
 //|   0xaa
 //|
 //| .. warning::
-//|    I2CPeripheral makes use of clock stretching in order to slow down
+//|    I2CTarget makes use of clock stretching in order to slow down
 //|    the host.
 //|    Make sure the I2C host supports this.
 //|
@@ -93,16 +93,21 @@
 //|    Since the RPi firmware uses the hw i2c, it's not possible to emulate a HAT eeprom."""
 //|
 
-STATIC const mp_rom_map_elem_t i2cperipheral_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2cperipheral) },
-    { MP_ROM_QSTR(MP_QSTR_I2CPeripheral), MP_ROM_PTR(&i2cperipheral_i2c_peripheral_type) },
+STATIC const mp_rom_map_elem_t i2ctarget_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2ctarget) },
+    { MP_ROM_QSTR(MP_QSTR_I2CTarget), MP_ROM_PTR(&i2ctarget_i2c_target_type) },
+    // TODO: Remove for CircuitPython 9.0.0
+    { MP_ROM_QSTR(MP_QSTR_I2CPeripheral), MP_ROM_PTR(&i2ctarget_i2c_target_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(i2cperipheral_module_globals, i2cperipheral_module_globals_table);
+STATIC MP_DEFINE_CONST_DICT(i2ctarget_module_globals, i2ctarget_module_globals_table);
 
-const mp_obj_module_t i2cperipheral_module = {
+const mp_obj_module_t i2ctarget_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&i2cperipheral_module_globals,
+    .globals = (mp_obj_dict_t *)&i2ctarget_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_i2cperipheral, i2cperipheral_module, CIRCUITPY_I2CPERIPHERAL);
+MP_REGISTER_MODULE(MP_QSTR_i2ctarget, i2ctarget_module, CIRCUITPY_I2CTARGET);
+
+// TODO: Remove for CircuitPython 9.0.0
+MP_REGISTER_MODULE(MP_QSTR_i2cperipheral, i2ctarget_module, CIRCUITPY_I2CTARGET);

From c74746f05286bfbfb050adf51e0d7735d8250921 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 9 Aug 2022 11:47:58 -0500
Subject: [PATCH 0804/2403] Cross references in documentation always help

---
 ports/espressif/bindings/esp32_camera/Camera.c      | 5 +++--
 ports/espressif/bindings/esp32_camera/__init__.c    | 5 +++++
 shared-bindings/imagecapture/ParallelImageCapture.c | 2 ++
 shared-bindings/imagecapture/__init__.c             | 8 ++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 9a7b79a3ed..3cd5d93682 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -66,7 +66,8 @@
 //|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
 //|
 //|
-//|         ..  IMPORTANT:
+//|         .. important::
+//|
 //|             Not all supported sensors have all
 //|             of the properties listed below. For instance, the
 //|             OV5640 supports `denoise`, but the
@@ -558,7 +559,7 @@ MP_PROPERTY_GETSET(esp32_camera_camera_exposure_ctrl_obj,
     (mp_obj_t)&esp32_camera_camera_set_exposure_ctrl_obj);
 
 //|     hmirror: bool
-//|     """When `true` the camera image is mirrored left-to-right"""
+//|     """When `True` the camera image is mirrored left-to-right"""
 //|
 
 STATIC mp_obj_t esp32_camera_camera_get_hmirror(const mp_obj_t self_in) {
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index 69d8071cb2..f1ee4b6891 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -39,6 +39,11 @@
 //|
 //| This library enables access to any camera sensor supported by the library,
 //| including OV5640 and OV2640.
+//|
+//| .. seealso::
+//|
+//|     Non-Espressif microcontrollers use the `imagecapture` module together with wrapper libraries such as `adafruit_ov5640 `_.
+//|
 //| """
 
 //| class GrabMode:
diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c
index 7f90f0923b..bbe96026bf 100644
--- a/shared-bindings/imagecapture/ParallelImageCapture.c
+++ b/shared-bindings/imagecapture/ParallelImageCapture.c
@@ -47,6 +47,8 @@
 //|     ) -> None:
 //|         """Create a parallel image capture object
 //|
+//|         This object is usually used with a camera-specific wrapper library such as `adafruit_ov5640 `_.
+//|
 //|         :param List[microcontroller.Pin] data_pins: The data pins.
 //|         :param microcontroller.Pin clock: The pixel clock input.
 //|         :param microcontroller.Pin vsync: The vertical sync input, which has a negative-going pulse at the beginning of each frame.
diff --git a/shared-bindings/imagecapture/__init__.c b/shared-bindings/imagecapture/__init__.c
index 0e5092aee8..fdd4424114 100644
--- a/shared-bindings/imagecapture/__init__.c
+++ b/shared-bindings/imagecapture/__init__.c
@@ -31,9 +31,13 @@
 
 #include "shared-bindings/imagecapture/ParallelImageCapture.h"
 
-//| """Support for "Parallel capture" interfaces"""
+//| """Support for "Parallel capture" interfaces
 //|
-
+//| .. seealso::
+//|
+//|     Espressif microcontrollers use the `esp32_camera` module together.
+//|
+//| """
 STATIC const mp_rom_map_elem_t imagecapture_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_imagecapture) },
     { MP_ROM_QSTR(MP_QSTR_ParallelImageCapture), MP_ROM_PTR(&imagecapture_parallelimagecapture_type) },

From f3ca15265ea511af2d5701e6dc9b60f3cc4a5586 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 10:42:20 -0700
Subject: [PATCH 0805/2403] Change to line@filename

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

diff --git a/main.c b/main.c
index bbc73d560c..12de1b6c0e 100644
--- a/main.c
+++ b/main.c
@@ -215,7 +215,7 @@ void supervisor_execution_status(void) {
     } else if ((_exec_result.return_code & PYEXEC_EXCEPTION) != 0 &&
                _exec_result.exception_line > 0 &&
                exception != NULL) {
-        mp_printf(&mp_plat_print, "@%d %s %q", _exec_result.exception_line, _exec_result.exception_filename, exception->base.type->name);
+        mp_printf(&mp_plat_print, "%d@%s %q", _exec_result.exception_line, _exec_result.exception_filename, exception->base.type->name);
     } else {
         serial_write_compressed(translate("Done"));
     }

From ce1273be7aac73cd275d8e2eae5c6da0e9f5c990 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 10:42:56 -0700
Subject: [PATCH 0806/2403] Pull Feather S2 TFT LED down on reset

---
 .../boards/adafruit_feather_esp32s2_tft/board.c      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index aab7fbc608..ea21bcc0f9 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -144,6 +144,18 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
         gpio_set_level(21, true);
         return true;
     }
+    // Pull LED down on reset rather than the default up
+    if (pin_number == 13) {
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_DISABLE,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
+        return true;
+    }
     return false;
 }
 

From 9b5e00fcc5710f850626384665dfebe4dbdc2d18 Mon Sep 17 00:00:00 2001
From: Dan Ellis 
Date: Tue, 12 Jul 2022 09:48:38 -0400
Subject: [PATCH 0807/2403] py/formatfloat: Format all whole-number floats
 exactly.

Formerly, py/formatfloat would print whole numbers inaccurately with
nonzero digits beyond the decimal place.  This resulted from its strategy
of successive scaling of the argument by 0.1 which cannot be exactly
represented in floating point.  The change in this commit avoids scaling
until the value is smaller than 1, so all whole numbers print with zero
fractional part.

Fixes issue #4212.

Signed-off-by: Dan Ellis dan.ellis@gmail.com
---
 py/formatfloat.c                            | 156 +++++++++++++-------
 tests/float/float_format_ftoe.py            |   4 +
 tests/float/float_format_ftoe.py.exp        |   1 +
 tests/float/float_format_ints.py            |  31 ++++
 tests/float/float_format_ints_doubleprec.py |  15 ++
 tests/run-tests.py                          |   1 +
 tools/tinytest-codegen.py                   |   1 +
 7 files changed, 154 insertions(+), 55 deletions(-)
 create mode 100644 tests/float/float_format_ftoe.py
 create mode 100644 tests/float/float_format_ftoe.py.exp
 create mode 100644 tests/float/float_format_ints.py
 create mode 100644 tests/float/float_format_ints_doubleprec.py

diff --git a/py/formatfloat.c b/py/formatfloat.c
index 06775167c0..d75cfc6658 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/mpconfig.h"
+#include "py/misc.h"
 #if MICROPY_FLOAT_IMPL != MICROPY_FLOAT_IMPL_NONE
 
 #include 
@@ -96,7 +97,16 @@ static inline int fp_isless1(float x) {
 #define fp_iszero(x) (x == 0)
 #define fp_isless1(x) (x < 1.0)
 
-#endif
+#endif // MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT/DOUBLE
+
+static inline int fp_ge_eps(FPTYPE x, FPTYPE y) {
+    mp_float_union_t fb_y = {y};
+    // Back off 2 eps.
+    // This is valid for almost all values, but in practice
+    // it's only used when y = 1eX for X>=0.
+    fb_y.i -= 2;
+    return x >= fb_y.f;
+}
 
 static const FPTYPE g_pos_pow[] = {
     #if FPDECEXP > 32
@@ -173,6 +183,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
     int num_digits = 0;
     const FPTYPE *pos_pow = g_pos_pow;
     const FPTYPE *neg_pow = g_neg_pow;
+    int signed_e = 0;
 
     if (fp_iszero(f)) {
         e = 0;
@@ -192,31 +203,24 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
         }
     } else if (fp_isless1(f)) {
-        // We need to figure out what an integer digit will be used
-        // in case 'f' is used (or we revert other format to it below).
-        // As we just tested number to be <1, this is obviously 0,
-        // but we can round it up to 1 below.
-        char first_dig = '0';
-        if (f >= FPROUND_TO_ONE) {
-            first_dig = '1';
-        }
-
+        FPTYPE f_mod = f;
         // Build negative exponent
         for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
-            if (*neg_pow > f) {
+            if (*neg_pow > f_mod) {
                 e += e1;
-                f *= *pos_pow;
+                f_mod *= *pos_pow;
             }
         }
+
         char e_sign_char = '-';
-        if (fp_isless1(f) && f >= FPROUND_TO_ONE) {
-            f = FPCONST(1.0);
+        if (fp_isless1(f_mod) && f_mod >= FPROUND_TO_ONE) {
+            f_mod = FPCONST(1.0);
             if (e == 0) {
                 e_sign_char = '+';
             }
-        } else if (fp_isless1(f)) {
+        } else if (fp_isless1(f_mod)) {
             e++;
-            f *= FPCONST(10.0);
+            f_mod *= FPCONST(10.0);
         }
 
         // If the user specified 'g' format, and e is <= 4, then we'll switch
@@ -224,8 +228,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
 
         if (fmt == 'f' || (fmt == 'g' && e <= 4)) {
             fmt = 'f';
-            dec = -1;
-            *s++ = first_dig;
+            dec = 0;
 
             if (org_fmt == 'g') {
                 prec += (e - 1);
@@ -237,13 +240,8 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
 
             num_digits = prec;
-            if (num_digits) {
-                *s++ = '.';
-                while (--e && num_digits) {
-                    *s++ = '0';
-                    num_digits--;
-                }
-            }
+            signed_e = 0;
+            ++num_digits;
         } else {
             // For e & g formats, we'll be printing the exponent, so set the
             // sign.
@@ -256,22 +254,29 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
                     prec++;
                 }
             }
+            signed_e = -e;
         }
     } else {
-        // Build positive exponent
-        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
-            if (*pos_pow <= f) {
+        // Build positive exponent.
+        // We don't modify f at this point to avoid innaccuracies from
+        // scaling it.  Instead, we find the product of powers of 10
+        // that is not greater than it, and use that to start the
+        // mantissa.
+        FPTYPE u_base = FPCONST(1.0);
+        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++) {
+            FPTYPE next_u = u_base * *pos_pow;
+            // fp_ge_eps performs "f >= (next_u - 2eps)" so that if, for
+            // numerical reasons, f is very close to a power of ten but
+            // not strictly equal, we still treat it as that power of 10.
+            // The comparison was failing for maybe 10% of 1eX values, but
+            // although rounding fixed many of them, there were still some
+            // rendering as 9.99999998e(X-1).
+            if (fp_ge_eps(f, next_u)) {
+                u_base = next_u;
                 e += e1;
-                f *= *neg_pow;
             }
         }
 
-        // It can be that f was right on the edge of an entry in pos_pow needs to be reduced
-        if ((int)f >= 10) {
-            e += 1;
-            f *= FPCONST(0.1);
-        }
-
         // If the user specified fixed format (fmt == 'f') and e makes the
         // number too big to fit into the available buffer, then we'll
         // switch to the 'e' format.
@@ -310,15 +315,15 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         } else {
             e_sign = '+';
         }
+        signed_e = e;
     }
     if (prec < 0) {
         // This can happen when the prec is trimmed to prevent buffer overflow
         prec = 0;
     }
 
-    // We now have num.f as a floating point number between >= 1 and < 10
-    // (or equal to zero), and e contains the absolute value of the power of
-    // 10 exponent. and (dec + 1) == the number of dgits before the decimal.
+    // At this point e contains the absolute value of the power of 10 exponent.
+    // (dec + 1) == the number of dgits before the decimal.
 
     // For e, prec is # digits after the decimal
     // For f, prec is # digits after the decimal
@@ -336,25 +341,63 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         num_digits = prec;
     }
 
-    // Print the digits of the mantissa
-    for (int i = 0; i < num_digits; ++i, --dec) {
-        int32_t d = (int32_t)f;
-        if (d < 0) {
-            *s++ = '0';
-        } else {
-            *s++ = '0' + d;
+    if (signed_e < 0) {
+        // The algorithm below treats numbers smaller than 1 by scaling them
+        // repeatedly by 10 to bring the new digit to the top.  Our input number
+        // was smaller than 1, so scale it up to be 1 <= f < 10.
+        FPTYPE u_base = FPCONST(1.0);
+        const FPTYPE *pow_u = g_pos_pow;
+        for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
+            if (m & e) {
+                u_base *= *pow_u;
+            }
         }
-        if (dec == 0 && prec > 0) {
-            *s++ = '.';
-        }
-        f -= (FPTYPE)d;
-        f *= FPCONST(10.0);
+        f *= u_base;
     }
 
-    // Round
-    // If we print non-exponential format (i.e. 'f'), but a digit we're going
-    // to round by (e) is too far away, then there's nothing to round.
-    if ((org_fmt != 'f' || e <= num_digits) && f >= FPCONST(5.0)) {
+    int d = 0;
+    int num_digits_left = num_digits;
+    for (int digit_index = signed_e; num_digits_left >= 0; --digit_index) {
+        FPTYPE u_base = FPCONST(1.0);
+        if (digit_index > 0) {
+            // Generate 10^digit_index for positive digit_index.
+            const FPTYPE *pow_u = g_pos_pow;
+            int target_index = digit_index;
+            for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
+                if (m & target_index) {
+                    u_base *= *pow_u;
+                }
+            }
+        }
+        for (d = 0; d < 9; ++d) {
+            // This is essentially "if (f < u_base)", but with 2eps margin
+            // so that if f is just a tiny bit smaller, we treat it as
+            // equal (and accept the additional digit value).
+            if (!fp_ge_eps(f, u_base)) {
+                break;
+            }
+            f -= u_base;
+        }
+        // We calculate one more digit than we display, to use in rounding
+        // below.  So only emit the digit if it's one that we display.
+        if (num_digits_left > 0) {
+            // Emit this number (the leading digit).
+            *s++ = '0' + d;
+            if (dec == 0 && prec > 0) {
+                *s++ = '.';
+            }
+        }
+        --dec;
+        --num_digits_left;
+        if (digit_index <= 0) {
+            // Once we get below 1.0, we scale up f instead of calculting
+            // negative powers of 10 in u_base.  This provides better
+            // renditions of exact decimals like 1/16 etc.
+            f *= FPCONST(10.0);
+        }
+    }
+    // Rounding.  If the next digit to print is >= 5, round up.
+    if (d >= 5) {
         char *rs = s;
         rs--;
         while (1) {
@@ -394,7 +437,10 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
                 }
             } else {
                 // Need at extra digit at the end to make room for the leading '1'
-                s++;
+                // but if we're at the buffer size limit, just drop the final digit.
+                if ((size_t)(s + 1 - buf) < buf_size) {
+                    s++;
+                }
             }
             char *ss = s;
             while (ss > rs) {
diff --git a/tests/float/float_format_ftoe.py b/tests/float/float_format_ftoe.py
new file mode 100644
index 0000000000..bc4e5a4a53
--- /dev/null
+++ b/tests/float/float_format_ftoe.py
@@ -0,0 +1,4 @@
+# check a case where rounding was suppressed inappropriately when "f" was
+# promoted to "e" for large numbers.
+v = 8.888e32
+print("%.2f" % v)  # '%.2f' format with e32 becomes '%.2e', expect 8.89e+32.
diff --git a/tests/float/float_format_ftoe.py.exp b/tests/float/float_format_ftoe.py.exp
new file mode 100644
index 0000000000..f8b1deb3ec
--- /dev/null
+++ b/tests/float/float_format_ftoe.py.exp
@@ -0,0 +1 @@
+8.89e+32
diff --git a/tests/float/float_format_ints.py b/tests/float/float_format_ints.py
new file mode 100644
index 0000000000..0bf4baf12d
--- /dev/null
+++ b/tests/float/float_format_ints.py
@@ -0,0 +1,31 @@
+# Test that integers format to exact values.
+
+for b in [13, 123, 457, 23456]:
+    for r in range(1, 10):
+        e_fmt = "{:." + str(r) + "e}"
+        f_fmt = "{:." + str(r) + "f}"
+        g_fmt = "{:." + str(r) + "g}"
+        for e in range(0, 5):
+            f = b * (10**e)
+            title = str(b) + " x 10^" + str(e)
+            print(title, "with format", e_fmt, "gives", e_fmt.format(f))
+            print(title, "with format", f_fmt, "gives", f_fmt.format(f))
+            print(title, "with format", g_fmt, "gives", g_fmt.format(f))
+
+# Check that powers of 10 (that fit in float32) format correctly.
+for i in range(31):
+    # It works to 12 digits on all platforms *except* qemu-arm, where
+    # 10^11 comes out as 10000000820 or something.
+    print("{:.7g}".format(float("1e" + str(i))))
+
+# 16777215 is 2^24 - 1, the largest integer that can be completely held
+# in a float32.
+print("{:f}".format(16777215))
+# 4294967040 = 16777215 * 128 is the largest integer that is exactly
+# represented by a float32 and that will also fit within a (signed) int32.
+# The upper bound of our integer-handling code is actually double this,
+# but that constant might cause trouble on systems using 32 bit ints.
+print("{:f}".format(2147483520))
+# Very large positive integers can be a test for precision and resolution.
+# This is a weird way to represent 1e38 (largest power of 10 for float32).
+print("{:.6e}".format(float("9" * 30 + "e8")))
diff --git a/tests/float/float_format_ints_doubleprec.py b/tests/float/float_format_ints_doubleprec.py
new file mode 100644
index 0000000000..57899d6d65
--- /dev/null
+++ b/tests/float/float_format_ints_doubleprec.py
@@ -0,0 +1,15 @@
+# Test formatting of very large ints.
+# Relies on double-precision floats.
+
+import array
+import sys
+
+# Challenging way to express 1e200 and 1e100.
+print("{:.12e}".format(float("9" * 400 + "e-200")))
+print("{:.12e}".format(float("9" * 400 + "e-300")))
+
+# These correspond to the binary representation of 1e200 in float64s:
+v1 = 0x54B249AD2594C37D  # 1e100
+v2 = 0x6974E718D7D7625A  # 1e200
+print("{:.12e}".format(array.array("d", v1.to_bytes(8, sys.byteorder))[0]))
+print("{:.12e}".format(array.array("d", v2.to_bytes(8, sys.byteorder))[0]))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a6d08aabb3..751b70886a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -426,6 +426,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if upy_float_precision < 64:
         skip_tests.add("float/float_divmod.py")  # tested by float/float_divmod_relaxed.py instead
         skip_tests.add("float/float2int_doubleprec_intbig.py")
+        skip_tests.add("float/float_format_ints_doubleprec.py")
         skip_tests.add("float/float_parse_doubleprec.py")
 
     if not has_complex:
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index 5c14bf2d5b..79b03f1383 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -100,6 +100,7 @@ exclude_tests = (
     "float/float_divmod.py",
     # requires double precision floating point to work
     "float/float2int_doubleprec_intbig.py",
+    "float/float_format_ints_doubleprec.py",
     "float/float_parse_doubleprec.py",
     # inline asm FP tests (require Cortex-M4)
     "inlineasm/asmfpaddsub.py",

From 556d01a68521b2ea75dfd7ed9207b5434f6fa696 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 10:44:57 -0700
Subject: [PATCH 0808/2403] Remove extra newline at end of file

---
 ports/espressif/boards/smartbeedesigns_bee_s3/pins.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
index 210507f893..189899fa49 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c
@@ -77,4 +77,3 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
-

From b3b27a1d804d11571d25c39a86b6078dcb69c802 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 10:45:47 -0700
Subject: [PATCH 0809/2403] Remove extra leading spaces

---
 .../boards/smartbeedesigns_bee_motion_s3/pins.c   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
index 66bd7c2c27..e6c02d59d5 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
@@ -28,31 +28,31 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
 
-     { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
 
     { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
@@ -100,4 +100,3 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
-

From 4021b44a394159eb3c5f915d4ce7c219658ad3f4 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 9 Aug 2022 15:00:01 -0400
Subject: [PATCH 0810/2403] increase main task stack size from 8kB to 16kB

---
 .../esp-idf-config/sdkconfig-esp32.defaults        | 14 +++-----------
 ports/espressif/esp-idf-config/sdkconfig.defaults  |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index c60941afdf..62e35a32e2 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -463,7 +463,6 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
@@ -1104,17 +1103,10 @@ CONFIG_ESP32S2_PANIC_PRINT_HALT=y
 # CONFIG_ESP32S2_PANIC_GDBSTUB is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_MAIN_TASK_STACK_SIZE=8192
 # CONFIG_CONSOLE_UART_DEFAULT is not set
-CONFIG_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_UART_NONE is not set
-CONFIG_CONSOLE_UART=y
-CONFIG_CONSOLE_UART_CUSTOM_NUM_0=y
-# CONFIG_CONSOLE_UART_CUSTOM_NUM_1 is not set
-CONFIG_CONSOLE_UART_NUM=0
-CONFIG_CONSOLE_UART_TX_GPIO=8
-CONFIG_CONSOLE_UART_RX_GPIO=7
-CONFIG_CONSOLE_UART_BAUDRATE=115200
+# CONFIG_CONSOLE_UART_CUSTOM is not set
+CONFIG_ESP_CONSOLE_UART_NONE=y
+CONFIG_CONSOLE_UART_NUM=-1
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
 CONFIG_INT_WDT_CHECK_CPU1=y
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index f30e8c1109..21ac590698 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -294,7 +294,7 @@ CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y
 CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300

From 5fe90ec204ad037f2dadd892e6f073cd404f540d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 12:54:58 -0700
Subject: [PATCH 0811/2403] Add register library topic to design guide

---
 docs/design_guide.rst | 63 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index fdb8f9b019..61ba0ed5b3 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -494,6 +494,39 @@ backticks  ``:class:`~adafruit_motor.servo.Servo```. You must also add the refer
 
     "adafruit_motor": ("https://circuitpython.readthedocs.io/projects/motor/en/latest/", None,),
 
+Use ``adafruit_register`` when possible
+--------------------------------------------------------------------------------
+`Register `_ is
+a foundational library that manages packing and unpacking data from device
+registers. When possible, use it for unpacking and packing registers. This
+ensures the packing code is shared amongst all registers. Furthermore, it
+simplifies device definitions by making them declarative (only data.)
+
+*Do not* add all registers from a datasheet upfront. Instead, only add the ones
+necessary for the functionality the driver exposes. Adding them all will lead to
+unnecessary file size and API clutter. See `this video about outside-in design
+from @tannewt `_.
+
+I2C Example
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+
+  from adafruit_register import i2c_bit
+  from adafruit_bus_device import i2c_device
+
+  class HelloWorldDevice:
+      """Device with two bits to control when the words 'hello' and 'world' are lit."""
+
+      hello = i2c_bit.RWBit(0x0, 0x0)
+      """Bit to indicate if hello is lit."""
+
+      world = i2c_bit.RWBit(0x1, 0x0)
+      """Bit to indicate if world is lit."""
+
+      def __init__(self, i2c, device_address=0x0):
+          self.i2c_device = i2c_device.I2CDevice(i2c, device_address)
+
 Use BusDevice
 --------------------------------------------------------------------------------
 
@@ -668,8 +701,24 @@ when using ``const()``, keep in mind these general guide lines:
 
 - Always use via an import, ex: ``from micropython import const``
 - Limit use to global (module level) variables only.
-- If user will not need access to variable, prefix name with a leading
-  underscore, ex: ``_SOME_CONST``.
+- Only used when the user will not need access to variable and prefix name with
+  a leading underscore, ex: ``_SOME_CONST``.
+
+Example
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+
+  from adafruit_bus_device import i2c_device
+  from micropython import const
+
+  _DEFAULT_I2C_ADDR = const(0x42)
+
+  class Widget:
+      """A generic widget."""
+
+      def __init__(self, i2c, address=_DEFAULT_I2C_ADDR):
+          self.i2c_device = i2c_device.I2CDevice(i2c, address)
 
 Libraries Examples
 ------------------
@@ -751,6 +800,16 @@ properties.
 | ``sound_level``       | float                 | non-unit-specific sound level (monotonic but not actual decibels)       |
 +-----------------------+-----------------------+-------------------------------------------------------------------------+
 
+Driver constant naming
+--------------------------------------------------------------------------------
+
+When adding variables for constant values for a driver. Do not include the
+device's name in the variable name. For example, in ``adafruit_fancy123.py``,
+variables should not start with ``FANCY123_``. Adding this prefix increases RAM
+usage and .mpy file size because variable names are preserved. User code should
+refer to these constants as ``adafruit_fancy123.HELLO_WORLD`` for clarity.
+``adafruit_fancy123.FANCY123_HELLO_WORLD`` would be overly verbose.
+
 Adding native modules
 --------------------------------------------------------------------------------
 

From 34b22eac2a7dec2b243253df548672e77fc4b934 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 9 Aug 2022 16:10:17 -0400
Subject: [PATCH 0812/2403] restore rainbowio and onewireio to a number of
 boards

---
 ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk       | 2 --
 ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk   | 2 --
 .../circuitplayground_express_crickit/mpconfigboard.mk      | 1 -
 .../circuitplayground_express_displayio/mpconfigboard.mk    | 1 -
 .../boards/feather_m0_supersized/mpconfigboard.mk           | 2 --
 ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk  | 4 ++--
 ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk       | 1 -
 .../boards/sparkfun_redboard_turbo/mpconfigboard.mk         | 2 --
 ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk | 2 --
 ports/stm/boards/pyb_nano_v2/mpconfigboard.mk               | 6 ------
 ports/stm/boards/thunderpack_v12/mpconfigboard.mk           | 1 -
 11 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index a347b70a63..cf64b05bcf 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -11,5 +11,3 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
index f0857ce6d2..1a8cddfda7 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index 975d892b9a..c108a90250 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -15,7 +15,6 @@ LONGINT_IMPL = NONE
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_KEYPAD = 0
-CIRCUITPY_ONEWIREIO = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
index 4338fe3e1e..cc125e1ffb 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@@ -12,7 +12,6 @@ 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_ONEWIREIO = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
index 9636c195dc..811336885b 100644
--- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk
index 7a67048e0b..d0ff1fa05c 100644
--- a/ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk
@@ -22,8 +22,8 @@ CIRCUITPY_RTC = 0
 CIRCUITPY_MATH = 0
 #CIRCUITPY_RANDOM = 0
 CIRCUITPY_ONEWIREIO = 0
-#CIRCUITPY_NEOPIXEL_WRITE = 1 # Needed fo RGB LEDs
-#CIRCUITPY_RAINBOWIO = 1  # Needed fo RGB LEDs
+CIRCUITPY_NEOPIXEL_WRITE = 1 # Needed for RGB LEDs
+CIRCUITPY_RAINBOWIO = 1  # Needed for RGB LEDs
 # These are used in a keyboard or computer input device.
 CIRCUITPY_ROTARYIO = 1
 CIRCUITPY_KEYPAD = 1
diff --git a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
index 0fc15cb321..37c869e972 100644
--- a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
@@ -11,5 +11,4 @@ LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
 # There are many pin definitions on this board; it doesn't quite fit on very large translations.
-CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_USB_MIDI = 0
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
index 7b97822bda..70ece9b9fc 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk
index d65be3f800..1088ca1e8d 100644
--- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
index 3ba45e0c5b..c8b548c50f 100644
--- a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
+++ b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
@@ -16,10 +16,4 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_GIFIO = 0
-CIRCUITPY_KEYPAD = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
index f7905f6945..526415ca30 100644
--- a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
@@ -14,7 +14,6 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
 CIRCUITPY_NVM = 1
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_ZLIB = 0
 
 MCU_SERIES = F4

From 7a152794cddacfe3c6498fa57375a2fbfb499da7 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 9 Aug 2022 22:12:31 +0200
Subject: [PATCH 0813/2403] 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             | 16 +++++++++-------
 locale/de_DE.po          | 16 +++++++++-------
 locale/el.po             | 16 +++++++++-------
 locale/en_GB.po          | 16 +++++++++-------
 locale/es.po             | 16 +++++++++-------
 locale/fil.po            | 16 +++++++++-------
 locale/fr.po             | 16 +++++++++-------
 locale/hi.po             | 16 +++++++++-------
 locale/it_IT.po          | 16 +++++++++-------
 locale/ja.po             | 16 +++++++++-------
 locale/ko.po             | 16 +++++++++-------
 locale/nl.po             | 16 +++++++++-------
 locale/pl.po             | 16 +++++++++-------
 locale/pt_BR.po          | 16 +++++++++-------
 locale/ru.po             | 16 +++++++++-------
 locale/sv.po             | 16 +++++++++-------
 locale/tr.po             | 16 +++++++++-------
 locale/zh_Latn_pinyin.po | 16 +++++++++-------
 19 files changed, 171 insertions(+), 133 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index c58e3e5532..71de78550d 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -404,12 +404,14 @@ msgstr "Alamat harus sepanjang %d byte"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Semua perangkat I2C sedang digunakan"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1609,7 +1611,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2350,11 +2352,11 @@ msgstr "__new__ arg harus berupa user-type"
 msgid "a bytes-like object is required"
 msgstr "sebuah objek menyerupai byte (bytes-like) dibutuhkan"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "alamat di luar batas"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "alamatnya kosong"
 
@@ -2546,7 +2548,7 @@ msgstr "tidak dapat menetapkan ke ekspresi"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 4916a78c97..85f603f266 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -405,12 +405,14 @@ msgstr "Adresa musí být %d bajtů dlouhá"
 msgid "All CAN peripherals are in use"
 msgstr "Všechny CAN periferie jsou používány"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Všechny I2C periferie jsou používány"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1605,7 +1607,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2337,11 +2339,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2533,7 +2535,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 853406c8b3..2cfe77fb4f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -407,12 +407,14 @@ msgstr "Die Adresse muss %d Bytes lang sein"
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-Schnittstellen sind in Benutzung"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1624,7 +1626,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Nur eine Adresse ist erlaubt"
 
@@ -2389,11 +2391,11 @@ msgstr "__new__ arg muss user-type sein"
 msgid "a bytes-like object is required"
 msgstr "ein Byte-ähnliches Objekt ist erforderlich"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "Adresse außerhalb der Grenzen"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses ist leer"
 
@@ -2587,7 +2589,7 @@ msgstr "kann keinem Ausdruck zuweisen"
 msgid "can't cancel self"
 msgstr "kann self nicht abbrechen"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kann %q nicht zu %q konvertieren"
diff --git a/locale/el.po b/locale/el.po
index 892eb0a935..435e52843f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -398,12 +398,14 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr ""
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1589,7 +1591,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2319,11 +2321,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2515,7 +2517,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index d981a5fba9..772ea39286 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -408,12 +408,14 @@ msgstr "Address must be %d bytes long"
 msgid "All CAN peripherals are in use"
 msgstr "All CAN peripherals are in use"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "All I2C peripherals are in use"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1609,7 +1611,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Only one TouchAlarm can be set in deep sleep."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2353,11 +2355,11 @@ msgstr "__new__ arg must be a user-type"
 msgid "a bytes-like object is required"
 msgstr "a bytes-like object is required"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "address out of bounds"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses is empty"
 
@@ -2549,7 +2551,7 @@ msgstr "Can't assign to expression"
 msgid "can't cancel self"
 msgstr "can't cancel self"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Can't convert %q to %q"
diff --git a/locale/es.po b/locale/es.po
index bd70f95beb..f3c3d4a05f 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -407,12 +407,14 @@ msgstr "La dirección debe tener %d bytes de largo"
 msgid "All CAN peripherals are in use"
 msgstr "Todos los periféricos CAN están en uso"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Todos los periféricos I2C están siendo usados"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1630,7 +1632,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2386,11 +2388,11 @@ msgstr "__new__ arg debe ser un user-type"
 msgid "a bytes-like object is required"
 msgstr "se requiere un objeto bytes-like"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "address fuera de límites"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses esta vacío"
 
@@ -2582,7 +2584,7 @@ msgstr "no se puede asignar a la expresión"
 msgid "can't cancel self"
 msgstr "no se puede cancelar a si mismo"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "no puede convertir %q a %q"
diff --git a/locale/fil.po b/locale/fil.po
index 1a2ac694e4..61ef1154d4 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -401,12 +401,14 @@ msgstr "ang palette ay dapat 32 bytes ang haba"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Lahat ng I2C peripherals ginagamit"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1605,7 +1607,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2339,11 +2341,11 @@ msgstr "__new__ arg ay dapat na user-type"
 msgid "a bytes-like object is required"
 msgstr "a bytes-like object ay kailangan"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "wala sa sakop ang address"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "walang laman ang address"
 
@@ -2537,7 +2539,7 @@ msgstr "hindi ma i-assign sa expression"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 7ca525f341..53d24ca647 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -410,12 +410,14 @@ msgstr "L'adresse doit être longue de %d octets"
 msgid "All CAN peripherals are in use"
 msgstr "Tous les périphériques CAN sont utilisés"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tous les périphériques I2C sont utilisés"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1653,7 +1655,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Seulement une adresse est autorisée"
 
@@ -2420,11 +2422,11 @@ msgstr "l'argument __new__ doit être d'un type défini par l'utilisateur"
 msgid "a bytes-like object is required"
 msgstr "un objet 'bytes-like' est requis"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "adresse hors limites"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adresses vides"
 
@@ -2617,7 +2619,7 @@ msgstr "ne peut pas assigner à une expression"
 msgid "can't cancel self"
 msgstr "ne peut pas s'annuler soi-même"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "impossible de convertir %q en %q"
diff --git a/locale/hi.po b/locale/hi.po
index e8aedf1c8a..ce7af5e395 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -398,12 +398,14 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr ""
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1589,7 +1591,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2319,11 +2321,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2515,7 +2517,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index c86e14d912..b66302a7d5 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -407,12 +407,14 @@ msgstr "L'indirizzo deve essere lungo %d byte"
 msgid "All CAN peripherals are in use"
 msgstr "Tutte le periferiche CAN sono in uso"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tutte le periferiche I2C sono in uso"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1612,7 +1614,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2349,11 +2351,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr "un oggetto byte-like è richiesto"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "indirizzo fuori limite"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "gli indirizzi sono vuoti"
 
@@ -2549,7 +2551,7 @@ msgstr "impossibile assegnare all'espressione"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 17f5d3b84d..ab1c44436e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -403,12 +403,14 @@ msgstr "アドレスは、%dバイト長でなければなりません"
 msgid "All CAN peripherals are in use"
 msgstr "全てのCAN周辺機器が使用中"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "全てのI2C周辺機器が使用中"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1602,7 +1604,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2333,11 +2335,11 @@ msgstr "__new__の引数はユーザ型でなければなりません"
 msgid "a bytes-like object is required"
 msgstr "bytes-likeオブジェクトが必要"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "アドレスが範囲外"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2529,7 +2531,7 @@ msgstr "式には代入できません"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "%qを%qに変換できません"
diff --git a/locale/ko.po b/locale/ko.po
index 27ce6030d6..4b04853025 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -399,12 +399,14 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "사용중인 모든 I2C주변 기기"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1592,7 +1594,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2323,11 +2325,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2519,7 +2521,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 795ef4542b..7bc2b83306 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -401,12 +401,14 @@ msgstr "Adres moet %d bytes lang zijn"
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-peripherals zijn in gebruik"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Alle I2C peripherals zijn in gebruik"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1606,7 +1608,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2349,11 +2351,11 @@ msgstr "__new__ arg moet een user-type zijn"
 msgid "a bytes-like object is required"
 msgstr "een bytes-achtig object is vereist"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "adres buiten bereik"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adressen zijn leeg"
 
@@ -2546,7 +2548,7 @@ msgstr "kan niet toewijzen aan expressie"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan %q niet naar %q converteren"
diff --git a/locale/pl.po b/locale/pl.po
index a49b8bdd52..5491c99000 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -403,12 +403,14 @@ msgstr "Adres musi mieć %d bajtów"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Wszystkie peryferia I2C w użyciu"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1600,7 +1602,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2330,11 +2332,11 @@ msgstr "Argument __new__ musi być typu użytkownika"
 msgid "a bytes-like object is required"
 msgstr "wymagany obiekt typu bytes"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "adres poza zakresem"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adres jest pusty"
 
@@ -2526,7 +2528,7 @@ msgstr "przypisanie do wyrażenia"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "nie można dokonać konwersji %q na %q"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 40c5ec8c71..aec1672406 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -411,12 +411,14 @@ msgstr "O endereço deve ter %d bytes de comprimento"
 msgid "All CAN peripherals are in use"
 msgstr "Todos os periféricos CAN estão em uso"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Todos os periféricos I2C estão em uso"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1635,7 +1637,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Apenas um endereço é permitido"
 
@@ -2402,11 +2404,11 @@ msgstr "O argumento __new__ deve ser um tipo usuário"
 msgid "a bytes-like object is required"
 msgstr "é necessário objetos tipo bytes"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "endereço fora dos limites"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "os endereços estão vazios"
 
@@ -2598,7 +2600,7 @@ msgstr "a expressão não pode ser atribuída"
 msgid "can't cancel self"
 msgstr "não é possível cancelar a si mesmo"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "não é possível converter %q para %q"
diff --git a/locale/ru.po b/locale/ru.po
index ba339d07db..14e9626974 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -406,12 +406,14 @@ msgstr "Адрес должен быть длиной %d байт"
 msgid "All CAN peripherals are in use"
 msgstr "Все периферийные устройства CAN уже используются"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Все периферийные устройства I2C уже используются"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1631,7 +1633,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2368,11 +2370,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2564,7 +2566,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 33680a2354..056b8e9e49 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -406,12 +406,14 @@ msgstr "Adressen måste vara %d byte lång"
 msgid "All CAN peripherals are in use"
 msgstr "All I2C-kringutrustning används"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "All I2C-kringutrustning används"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1615,7 +1617,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Endast en adress är tillåten"
 
@@ -2372,11 +2374,11 @@ msgstr "__new__ arg måste vara en användartyp"
 msgid "a bytes-like object is required"
 msgstr "ett bytesliknande objekt krävs"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "adress utanför gränsen"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adresserna är tomma"
 
@@ -2568,7 +2570,7 @@ msgstr "kan inte tilldela uttryck"
 msgid "can't cancel self"
 msgstr "kan inte avbryta sig själv"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan inte konvertera %q till %q"
diff --git a/locale/tr.po b/locale/tr.po
index e2b1718a7b..ee4de16123 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -412,12 +412,14 @@ msgstr "Adres %d byte uzunluğunda olmalıdır"
 msgid "All CAN peripherals are in use"
 msgstr "Tüm CAN çevre birimleri kullanımda"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tüm I2C çevre birimleri kullanımda"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1606,7 +1608,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2339,11 +2341,11 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr ""
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
 
@@ -2535,7 +2537,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 142941392e..10d7a96cf7 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -409,12 +409,14 @@ msgstr "dìzhǐ chángdù bìxū shì %d zìjié"
 msgid "All CAN peripherals are in use"
 msgstr "suǒyǒu CAN wàishè dōu zài shǐyòng zhōng"
 
-#: ports/espressif/common-hal/busio/I2C.c
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "suǒyǒu I2C wàishè dōu zài shǐyòng zhōng"
 
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+msgid "All I2C targets are in use"
+msgstr ""
+
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1630,7 +1632,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mián."
 
-#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "zhǐ yǔn xǔ yí gè dì zhǐ"
 
@@ -2384,11 +2386,11 @@ msgstr "__new__ cānshù bìxū shì yònghù lèixíng"
 msgid "a bytes-like object is required"
 msgstr "xūyào yīgè zì jié lèi duìxiàng"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "address out of bounds"
 msgstr "dìzhǐ chāochū biānjiè"
 
-#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "dìzhǐ wèi kōng"
 
@@ -2580,7 +2582,7 @@ msgstr "bùnéng fēnpèi dào biǎodá shì"
 msgid "can't cancel self"
 msgstr "bù néng qǔ xiāo zì wǒ"
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
 #: shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Wúfǎ jiāng %q zhuǎnhuàn wèi %q"

From 51b65cbea5c1d8b680e94c7d8c7a924a606cd664 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 13:57:03 -0700
Subject: [PATCH 0814/2403] Read websocket in background to look for ctrl-c

Otherwise busy Python code that isn't reading input characters
won't be interruptible.

Fixes #6707
---
 supervisor/shared/web_workflow/web_workflow.c |  2 ++
 supervisor/shared/web_workflow/websocket.c    | 34 +++++++++++++++----
 supervisor/shared/web_workflow/websocket.h    |  1 +
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index bc76112ed3..91184ca018 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1350,6 +1350,8 @@ void supervisor_web_workflow_background(void) {
         // Close the active socket if it is no longer connected.
         common_hal_socketpool_socket_close(&active);
     }
+
+    websocket_background();
 }
 
 void supervisor_stop_web_workflow(void) {
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 5a42eefb35..bb5f5b43d0 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -26,6 +26,9 @@
 
 #include "supervisor/shared/web_workflow/websocket.h"
 
+#include "py/ringbuf.h"
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
 #include "supervisor/shared/title_bar.h"
 
 // TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
@@ -43,6 +46,11 @@ typedef struct {
     size_t payload_remaining;
 } _websocket;
 
+// Buffer the incoming serial data in the background so that we can look for the
+// interrupt character.
+STATIC ringbuf_t _incoming_ringbuf;
+STATIC uint8_t _buf[16];
+
 static _websocket cp_serial;
 
 static const char *TAG = "CP websocket";
@@ -50,6 +58,8 @@ static const char *TAG = "CP websocket";
 void websocket_init(void) {
     cp_serial.socket.num = -1;
     cp_serial.socket.connected = false;
+
+    ringbuf_init(&_incoming_ringbuf, _buf, sizeof(_buf) - 1);
 }
 
 void websocket_handoff(socketpool_socket_obj_t *socket) {
@@ -193,16 +203,16 @@ bool websocket_available(void) {
     if (!websocket_connected()) {
         return false;
     }
-    _read_next_frame_header();
-    return cp_serial.payload_remaining > 0 && cp_serial.frame_index >= cp_serial.frame_len;
+    websocket_background();
+    return ringbuf_num_filled(&_incoming_ringbuf) > 0;
 }
 
 char websocket_read_char(void) {
-    uint8_t c;
-    if (!_read_next_payload_byte(&c)) {
-        c = -1;
+    websocket_background();
+    if (ringbuf_num_filled(&_incoming_ringbuf) > 0) {
+        return ringbuf_get(&_incoming_ringbuf);
     }
-    return c;
+    return -1;
 }
 
 static void _websocket_send(_websocket *ws, const char *text, size_t len) {
@@ -246,3 +256,15 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
 void websocket_write(const char *text, size_t len) {
     _websocket_send(&cp_serial, text, len);
 }
+
+void websocket_background(void) {
+    uint8_t c;
+    while (ringbuf_num_empty(&_incoming_ringbuf) > 0 &&
+           _read_next_payload_byte(&c)) {
+        if (c == mp_interrupt_char) {
+            mp_sched_keyboard_interrupt();
+            continue;
+        }
+        ringbuf_put(&_incoming_ringbuf, c);
+    }
+}
diff --git a/supervisor/shared/web_workflow/websocket.h b/supervisor/shared/web_workflow/websocket.h
index c5c5114586..c3db2bf05c 100644
--- a/supervisor/shared/web_workflow/websocket.h
+++ b/supervisor/shared/web_workflow/websocket.h
@@ -35,4 +35,5 @@ void websocket_handoff(socketpool_socket_obj_t *socket);
 bool websocket_connected(void);
 bool websocket_available(void);
 char websocket_read_char(void);
+void websocket_background(void);
 void websocket_write(const char *text, size_t len);

From c8a5149560cb7fddd0795d28dcaf23881b834d28 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 9 Aug 2022 17:13:18 -0400
Subject: [PATCH 0815/2403] Sort json data rather than index of table data

---
 .../shared/web_workflow/static/directory.js   | 49 +++----------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index a565100e12..1438e5c546 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -8,10 +8,11 @@ var editable = undefined;
 async function refresh_list() {
 
     function compareValues(a, b) {
-        if (a.value === b.value) {
+        if (a.directory == b.directory && a.name.toLowerCase() === b.name.toLowerCase()) {
           return 0;
         } else {
-          return a.value < b.value ? -1 : 1;
+          return a.directory.toString().substring(3,4)+a.name.toLowerCase() < 
+            b.directory.toString().substring(3,4)+b.name.toLowerCase() ? -1 : 1;
         }
     }
 
@@ -52,10 +53,6 @@ async function refresh_list() {
         }
     }
 
-    var dirCells = [];
-    var dataCells = [];
-    var index = 0;
-
     if (window.location.path != "/fs/") {
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
@@ -66,16 +63,11 @@ async function refresh_list() {
         path.textContent = "..";
         // Remove the delete button
         td[4].replaceChildren();
-
-        var sortdata = {};
-        sortdata.value = "..";
-        sortdata.index = index;
-        dirCells.push(sortdata);
-        index += 1;
-
         new_children.push(clone);
     }
 
+    data.sort(compareValues);
+
     for (const f of data) {
         // Clone the new row and insert it into the table
         var clone = template.content.cloneNode(true);
@@ -118,39 +110,10 @@ async function refresh_list() {
             edit_link.href = edit_url
         }
 
-        var dataCell = td[2];
-
-        var sortdata = {};
-        sortdata.value = dataCell.textContent.toLowerCase().trim();
-        sortdata.index = index;
-        if (!f.directory) {
-            dataCells.push(sortdata);
-            index += 1;
-        } else {
-            dirCells.push(sortdata);
-            index += 1;
-        }
-
         new_children.push(clone);
     }
-
-    dirCells.sort(compareValues);
-    dataCells.sort(compareValues);
-
     var tbody = document.querySelector("tbody");
-
-    // remove rows
-    while (tbody.firstChild) {
-      tbody.removeChild(tbody.lastChild);
-    }
-
-    // add sorted rows
-    for (var i = 0; i < dirCells.length; i += 1) {
-      tbody.appendChild(new_children[dirCells[i].index]);
-    }
-    for (var i = 0; i < dataCells.length; i += 1) {
-      tbody.appendChild(new_children[dataCells[i].index]);
-    }
+    tbody.replaceChildren(...new_children);
 }
 
 async function find_devices() {

From 7a072479743dcbc561fb6c94d436dc5132f2a4bc Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 14:37:52 -0700
Subject: [PATCH 0816/2403] Remove all kwarg from ScanEntry.matches

Fixes #3007
---
 shared-bindings/_bleio/ScanEntry.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c
index d9434f39cf..a5009088a5 100644
--- a/shared-bindings/_bleio/ScanEntry.c
+++ b/shared-bindings/_bleio/ScanEntry.c
@@ -48,25 +48,22 @@
 //|     def matches(self, prefixes: ScanEntry, *, match_all: bool = True) -> bool:
 //|         """Returns True if the ScanEntry matches all prefixes when ``match_all`` is True. This is stricter
 //|         than the scan filtering which accepts any advertisements that match any of the prefixes
-//|         where ``match_all`` is False.
-//|
-//|         ``all`` also works for ``match_all`` but will be removed in CircuitPython 8."""
+//|         where ``match_all`` is False."""
 //|         ...
 //|
 STATIC mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
-    enum { ARG_prefixes, ARG_all, ARG_match_all };
+    enum { ARG_prefixes, ARG_match_all };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_prefixes, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_all, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
         { MP_QSTR_match_all, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
     };
 
     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);
 
-    bool match_all = args[ARG_all].u_bool && args[ARG_match_all].u_bool;
+    bool match_all = args[ARG_match_all].u_bool;
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_prefixes].u_obj, &bufinfo, MP_BUFFER_READ);

From 35f3773e94b476d5f6c1e98284809846cd721708 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 14:55:13 -0700
Subject: [PATCH 0817/2403] Remove PWMOut parameter to PulseOut

Fixes #3264
---
 shared-bindings/onewireio/OneWire.c |  3 ---
 shared-bindings/pulseio/PulseOut.c  | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/shared-bindings/onewireio/OneWire.c b/shared-bindings/onewireio/OneWire.c
index a167c86cc8..6ce5b659e7 100644
--- a/shared-bindings/onewireio/OneWire.c
+++ b/shared-bindings/onewireio/OneWire.c
@@ -42,9 +42,6 @@
 //|
 //|           :param ~microcontroller.Pin pin: Pin connected to the OneWire bus
 //|
-//|           .. note:: The OneWire class is available on `busio` and `bitbangio` in CircuitPython
-//|                     7.x for backwards compatibility but will be removed in CircuitPython 8.0.0.
-//|
 //|           Read a short series of pulses::
 //|
 //|             import onewireio
diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c
index 3de2176ffc..f812043e13 100644
--- a/shared-bindings/pulseio/PulseOut.c
+++ b/shared-bindings/pulseio/PulseOut.c
@@ -48,9 +48,6 @@
 //|         :param int frequency: Carrier signal frequency in Hertz
 //|         :param int duty_cycle: 16-bit duty cycle of carrier frequency (0 - 65536)
 //|
-//|         For backwards compatibility, ``pin`` may be a PWMOut object used as the carrier. This
-//|         compatibility will be removed in CircuitPython 8.0.0.
-//|
 //|         Send a short series of pulses::
 //|
 //|           import array
@@ -82,14 +79,6 @@ STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_ar
     const mcu_pin_obj_t *pin = args[ARG_pin].u_obj;
     mp_int_t frequency = args[ARG_frequency].u_int;
     mp_int_t duty_cycle = args[ARG_duty_cycle].u_int;
-    if (mp_obj_is_type(args[ARG_pin].u_obj, &pwmio_pwmout_type)) {
-        pwmio_pwmout_obj_t *pwmout = args[ARG_pin].u_obj;
-        duty_cycle = common_hal_pwmio_pwmout_get_duty_cycle(pwmout);
-        frequency = common_hal_pwmio_pwmout_get_frequency(pwmout);
-        pin = common_hal_pwmio_pwmout_get_pin(pwmout);
-        // Deinit the pin so we can use it.
-        common_hal_pwmio_pwmout_deinit(pwmout);
-    }
     validate_obj_is_free_pin(MP_OBJ_FROM_PTR(pin));
     pulseio_pulseout_obj_t *self = m_new_obj(pulseio_pulseout_obj_t);
     self->base.type = &pulseio_pulseout_type;

From e0fb308972baa81c5f94fc8203a65226bcf65d8e Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 9 Aug 2022 16:36:57 -0700
Subject: [PATCH 0818/2403] Decode percent encoded file paths and set charset

Also, fix multiple file uploads from directory browser.

Fixes #6646
---
 .../shared/web_workflow/static/directory.js   |  4 +-
 supervisor/shared/web_workflow/web_workflow.c | 38 +++++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 91389343d6..b6ea1b09bb 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -149,10 +149,10 @@ async function upload(e) {
         )
         if (response.ok) {
             refresh_list();
-            files.value = "";
-            upload_button.disabled = true;
         }
     }
+    files.value = "";
+    upload_button.disabled = true;
 }
 
 async function del(e) {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index bc76112ed3..e644a40f14 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -659,13 +659,13 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
     mp_printf(&_socket_print, "Content-Length: %d\r\n", total_length);
     // TODO: Make this a table to save space.
     if (_endswith(filename, ".txt") || _endswith(filename, ".py")) {
-        _send_str(socket, "Content-Type: text/plain\r\n");
+        _send_strs(socket, "Content-Type: text/plain", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".js")) {
-        _send_str(socket, "Content-Type: text/javascript\r\n");
+        _send_strs(socket, "Content-Type: text/javascript", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".html")) {
-        _send_str(socket, "Content-Type: text/html\r\n");
+        _send_strs(socket, "Content-Type: text/html", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".json")) {
-        _send_str(socket, "Content-Type: application/json\r\n");
+        _send_strs(socket, "Content-Type: application/json", ";charset=UTF-8\r\n", NULL);
     } else {
         _send_str(socket, "Content-Type: application/octet-stream\r\n");
     }
@@ -966,6 +966,16 @@ static void _reply_websocket_upgrade(socketpool_socket_obj_t *socket, _request *
     // socket is now closed and "disconnected".
 }
 
+static uint8_t _hex2nibble(char h) {
+    if ('0' <= h && h <= '9') {
+        return h - '0';
+    } else if ('A' <= h && h <= 'F') {
+        return h - 'A' + 0xa;
+    }
+    // Shouldn't usually use lower case.
+    return h - 'a' + 0xa;
+}
+
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         _reply_redirect(socket, request, request->path);
@@ -983,6 +993,26 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 _reply_forbidden(socket, request);
             }
         } else {
+            // Decode any percent encoded bytes so that we're left with UTF-8.
+            // We only do this on /fs/ paths and after redirect so that any
+            // path echoing we do stays encoded.
+            size_t o = 0;
+            size_t i = 0;
+            while (i < strlen(request->path)) {
+                if (request->path[i] == '%') {
+                    request->path[o] = _hex2nibble(request->path[i + 1]) << 4 | _hex2nibble(request->path[i + 2]);
+                    i += 3;
+                } else {
+                    if (i != o) {
+                        request->path[o] = request->path[i];
+                    }
+                    i += 1;
+                }
+                o += 1;
+            }
+            if (o < i) {
+                request->path[o] = '\0';
+            }
             char *path = request->path + 3;
             size_t pathlen = strlen(path);
             FATFS *fs = filesystem_circuitpy();

From adec68863c0d74bc8fbf8962ef6a349595a37f79 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 10 Aug 2022 01:50:35 +0200
Subject: [PATCH 0819/2403] 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/ru.po             | 6 +++++-
 locale/sv.po             | 6 +++++-
 locale/tr.po             | 6 +++++-
 locale/zh_Latn_pinyin.po | 6 +++++-
 19 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 71de78550d..ba3fc8e0b0 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -3285,6 +3285,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr "micropython decorator tidak valid"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3540,7 +3544,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 85f603f266..4e114549e5 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -3272,6 +3272,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3527,7 +3531,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 2cfe77fb4f..2ce09bd00f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3338,6 +3338,10 @@ msgstr "ungültiger Hostname"
 msgid "invalid micropython decorator"
 msgstr "ungültiger micropython decorator"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "ungültiger Schritt (step)"
@@ -3599,7 +3603,7 @@ msgstr "kein Reset Pin verfügbar"
 msgid "no response from SD card"
 msgstr "keine Antwort von der SD-Karte"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "kein solches Attribut"
 
diff --git a/locale/el.po b/locale/el.po
index 435e52843f..84f75edf1e 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -3254,6 +3254,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3509,7 +3513,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 772ea39286..4c1dcfb22a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -3291,6 +3291,10 @@ msgstr "invalid hostname"
 msgid "invalid micropython decorator"
 msgstr "invalid micropython decorator"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "invalid step"
@@ -3546,7 +3550,7 @@ msgstr "no reset pin available"
 msgid "no response from SD card"
 msgstr "no response from SD card"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "no such attribute"
 
diff --git a/locale/es.po b/locale/es.po
index f3c3d4a05f..f2d7c65570 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -3328,6 +3328,10 @@ msgstr "hostname inválido"
 msgid "invalid micropython decorator"
 msgstr "decorador de micropython inválido"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "paso inválido"
@@ -3587,7 +3591,7 @@ msgstr "no hay pin de reinicio disponible"
 msgid "no response from SD card"
 msgstr "no hay respuesta de la tarjeta SD"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "no hay tal atributo"
 
diff --git a/locale/fil.po b/locale/fil.po
index 61ef1154d4..3f59a2b674 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -3287,6 +3287,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr "mali ang micropython decorator"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "mali ang step"
@@ -3546,7 +3550,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "walang ganoon na attribute"
 
diff --git a/locale/fr.po b/locale/fr.po
index 53d24ca647..95c03542cb 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -3370,6 +3370,10 @@ msgstr "hostname incorrect"
 msgid "invalid micropython decorator"
 msgstr "décorateur micropython invalide"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "pas invalide"
@@ -3630,7 +3634,7 @@ msgstr "pas de broche de réinitialisation disponible"
 msgid "no response from SD card"
 msgstr "pas de réponse de la carte SD"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "pas de tel attribut"
 
diff --git a/locale/hi.po b/locale/hi.po
index ce7af5e395..44db3cbb48 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -3254,6 +3254,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3509,7 +3513,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b66302a7d5..0d3619b91e 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -3295,6 +3295,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr "decoratore non valido in micropython"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "step non valida"
@@ -3555,7 +3559,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "attributo inesistente"
 
diff --git a/locale/ja.po b/locale/ja.po
index ab1c44436e..5377492685 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -3273,6 +3273,10 @@ msgstr "不正なホスト名"
 msgid "invalid micropython decorator"
 msgstr "不正なmicropythonデコレータ"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "不正なステップ"
@@ -3528,7 +3532,7 @@ msgstr "利用可能なリセットピンがありません"
 msgid "no response from SD card"
 msgstr "SDカードからの応答がありません"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "指定の属性はありません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 4b04853025..ad4c0a9fdc 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -3258,6 +3258,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "단계(step)가 유효하지 않습니다"
@@ -3513,7 +3517,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 7bc2b83306..dafe2449f8 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -3288,6 +3288,10 @@ msgstr "onjuiste hostnaam"
 msgid "invalid micropython decorator"
 msgstr "ongeldige micropython decorator"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "ongeldige stap"
@@ -3546,7 +3550,7 @@ msgstr "geen reset pin beschikbaar"
 msgid "no response from SD card"
 msgstr "geen antwoord van SD kaart"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "niet zo'n attribuut"
 
diff --git a/locale/pl.po b/locale/pl.po
index 5491c99000..9662f16597 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -3266,6 +3266,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr "zły dekorator micropythona"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "zły krok"
@@ -3521,7 +3525,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "nie ma takiego atrybutu"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index aec1672406..2cb3003b4a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -3347,6 +3347,10 @@ msgstr "o nome do host é inválido"
 msgid "invalid micropython decorator"
 msgstr "o decorador micropython é inválido"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "passo inválido"
@@ -3607,7 +3611,7 @@ msgstr "nenhum pino de redefinição está disponível"
 msgid "no response from SD card"
 msgstr "não houve resposta do cartão SD"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "não há tal atributo"
 
diff --git a/locale/ru.po b/locale/ru.po
index 14e9626974..6e2d65cc81 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -3303,6 +3303,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3558,7 +3562,7 @@ msgstr "нет доступного контакта сброса"
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 056b8e9e49..20724e40bf 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -3312,6 +3312,10 @@ msgstr "Ogiltigt värdnamn"
 msgid "invalid micropython decorator"
 msgstr "ogiltig mikropython-dekorator"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "ogiltigt steg"
@@ -3570,7 +3574,7 @@ msgstr "ingen reset-pinne tillgänglig"
 msgid "no response from SD card"
 msgstr "inget svar från SD-kort"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "inget sådant attribut"
 
diff --git a/locale/tr.po b/locale/tr.po
index ee4de16123..987ef716b6 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -3274,6 +3274,10 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr ""
@@ -3529,7 +3533,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 10d7a96cf7..2edd1eef17 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -3325,6 +3325,10 @@ msgstr "wú xiào zhǔ jī míng"
 msgid "invalid micropython decorator"
 msgstr "wúxiào de MicroPython zhuāngshì qì"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid "invalid setting"
+msgstr ""
+
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
 msgstr "wúxiào bùzhòu"
@@ -3581,7 +3585,7 @@ msgstr "Méiyǒu kěyòng de fùwèi yǐn jiǎo"
 msgid "no response from SD card"
 msgstr "SD kǎ wú huíyīng"
 
-#: py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "méiyǒu cǐ shǔxìng"
 

From 9f4e8efd2e7542033b1476724ff3ea049703f4d9 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 4 Aug 2022 18:39:21 +0200
Subject: [PATCH 0820/2403] new icons for web workflow with actual emojis

---
 supervisor/shared/web_workflow/static/directory.html | 4 ++--
 supervisor/shared/web_workflow/static/directory.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index b88e74684b..5551410d73 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -9,7 +9,7 @@
 
 
     
     
    
-    
+    
     
     
@@ -18,5 +18,5 @@
     
    
-    +🗀 
+    +📁 
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 91389343d6..5992e90512 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -46,7 +46,7 @@ async function refresh_list() {
     if (window.location.path != "/fs/") {
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
-        td[0].textContent = "🗀";
+        td[0].textContent = "📁";
         var path = clone.querySelector("a");
         let parent = new URL("..", "file://" + current_path);
         path.href = "#" + parent.pathname;
@@ -60,7 +60,7 @@ async function refresh_list() {
         // Clone the new row and insert it into the table
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
-        var icon = "⬇";
+        var icon = "⬇️";
         var file_path = current_path + f.name;
         let api_url = new URL("/fs" + file_path, url_base);
         let edit_url = "/edit/#" + file_path;
@@ -72,12 +72,12 @@ async function refresh_list() {
         }
 
         if (f.directory) {
-            icon = "🗀";
+            icon = "📁";
         } else if(f.name.endsWith(".txt") ||
                   f.name.endsWith(".py") ||
                   f.name.endsWith(".js") ||
                   f.name.endsWith(".json")) {
-            icon = "🖹";
+            icon = "📄";
         } else if (f.name.endsWith(".html")) {
             icon = "🌐";
         }

From 41bcd7b260998d6545957a6575a868562a04d375 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 9 Aug 2022 22:24:57 -0400
Subject: [PATCH 0821/2403] Remove support for auto-brightness

---
 .../boards/hallowing_m0_express/board.c       |  3 +-
 .../boards/hallowing_m4_express/board.c       |  3 +-
 ports/atmel-samd/boards/monster_m4sk/board.c  |  3 +-
 ports/atmel-samd/boards/pewpew_lcd/board.c    |  1 -
 ports/atmel-samd/boards/pewpew_m4/board.c     |  3 +-
 ports/atmel-samd/boards/pybadge/board.c       |  3 +-
 ports/atmel-samd/boards/pygamer/board.c       |  3 +-
 ports/atmel-samd/boards/pyportal/board.c      |  3 +-
 .../atmel-samd/boards/pyportal_titano/board.c |  3 +-
 .../boards/seeeduino_wio_terminal/board.c     |  3 +-
 ports/atmel-samd/boards/ugame10/board.c       |  1 -
 .../boards/adafruit_esp32s2_camera/board.c    |  3 +-
 .../adafruit_feather_esp32s2_tft/board.c      |  7 +--
 .../board.c                                   |  3 +-
 .../adafruit_feather_esp32s3_tft/board.c      |  3 +-
 .../boards/adafruit_funhouse/board.c          |  3 +-
 .../boards/espressif_esp32s3_box/board.c      |  3 +-
 .../boards/espressif_esp32s3_box_lite/board.c |  3 +-
 .../espressif_esp32s3_usb_otg_n8/board.c      |  3 +-
 .../boards/hardkernel_odroid_go/board.c       |  3 +-
 ports/espressif/boards/hexky_s2/board.c       |  3 +-
 ports/espressif/boards/hiibot_iots2/board.c   |  3 +-
 .../boards/lilygo_ttgo_t8_s2_st7789/board.c   |  3 +-
 .../boards/morpheans_morphesp-240/board.c     |  3 +-
 .../nrf/boards/clue_nrf52840_express/board.c  |  3 +-
 ports/nrf/boards/hiibot_bluefi/board.c        |  3 +-
 .../makerdiary_nrf52840_m2_devkit/board.c     |  3 +-
 ports/nrf/boards/ohs2020_badge/board.c        |  3 +-
 .../boards/adafruit_macropad_rp2040/board.c   |  1 -
 .../boards/pimoroni_picosystem/board.c        |  3 +-
 ports/stm/boards/meowbit_v121/board.c         |  3 +-
 shared-bindings/displayio/Display.c           | 43 ++-----------------
 shared-bindings/displayio/Display.h           |  5 +--
 shared-bindings/displayio/OnDiskBitmap.c      |  1 -
 .../framebufferio/FramebufferDisplay.c        | 34 +--------------
 .../framebufferio/FramebufferDisplay.h        |  3 --
 shared-module/displayio/Display.c             | 39 ++---------------
 shared-module/displayio/Display.h             |  3 --
 .../framebufferio/FramebufferDisplay.c        | 14 ------
 .../framebufferio/FramebufferDisplay.h        |  6 ---
 40 files changed, 39 insertions(+), 200 deletions(-)

diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index 5a6b43e475..102701a295 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -104,8 +104,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PA00,
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c
index d17835d0f8..add1844fcb 100644
--- a/ports/atmel-samd/boards/hallowing_m4_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m4_express/board.c
@@ -84,8 +84,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PB14,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c
index e42721dee7..dd8244e003 100644
--- a/ports/atmel-samd/boards/monster_m4sk/board.c
+++ b/ports/atmel-samd/boards/monster_m4sk/board.c
@@ -85,8 +85,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PA23,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c
index 7f5cac5241..10c657aee8 100644
--- a/ports/atmel-samd/boards/pewpew_lcd/board.c
+++ b/ports/atmel-samd/boards/pewpew_lcd/board.c
@@ -84,7 +84,6 @@ void board_init(void) {
         NULL, // &pin_PA17, // brightness pin
         NO_BRIGHTNESS_COMMAND,
         0.0f, // brightness
-        false, // auto_brightness
         false, // single_byte_bounds
         true, // data as commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
index 331056fb9f..0dc8c9f4c5 100644
--- a/ports/atmel-samd/boards/pewpew_m4/board.c
+++ b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -137,8 +137,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         NULL,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         false, // auto_refresh
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index 17b7b180ed..9160b0260c 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -105,8 +105,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PA01,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
index a9041de305..e324999a87 100644
--- a/ports/atmel-samd/boards/pygamer/board.c
+++ b/ports/atmel-samd/boards/pygamer/board.c
@@ -107,8 +107,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PA01,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index 8176d363c9..676461c7f5 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -94,8 +94,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PB31, // Backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/pyportal_titano/board.c b/ports/atmel-samd/boards/pyportal_titano/board.c
index fcf8c5f44d..635025396d 100644
--- a/ports/atmel-samd/boards/pyportal_titano/board.c
+++ b/ports/atmel-samd/boards/pyportal_titano/board.c
@@ -111,8 +111,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PB31, // Backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
index 4a25ed64ec..ac357401f5 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
@@ -102,8 +102,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PC05,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c
index 53bc613088..371a1cabb3 100644
--- a/ports/atmel-samd/boards/ugame10/board.c
+++ b/ports/atmel-samd/boards/ugame10/board.c
@@ -105,7 +105,6 @@ void board_init(void) {
         NULL,
         NO_BRIGHTNESS_COMMAND,
         1.0f, // brightness
-        false, // auto_brightness
         false, // single_byte_bounds
         false, // data as commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
index 23a2eb7a34..8e7c62ed37 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
@@ -89,8 +89,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO38,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index aab7fbc608..63ad8e44fd 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -95,7 +95,7 @@ void board_init(void) {
     display->base.type = &displayio_display_type;
 
     // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
+///    pwmout_reset();
 
     common_hal_displayio_display_construct(
         display,
@@ -118,8 +118,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO45,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
@@ -128,8 +127,6 @@ void board_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
index 04b6a46779..bd64046296 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
@@ -94,8 +94,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO7,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
index aab7fbc608..eca89b6291 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -118,8 +118,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO45,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c
index 8b4adc5fa9..742d629a2c 100644
--- a/ports/espressif/boards/adafruit_funhouse/board.c
+++ b/ports/espressif/boards/adafruit_funhouse/board.c
@@ -97,8 +97,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO21,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/espressif_esp32s3_box/board.c b/ports/espressif/boards/espressif_esp32s3_box/board.c
index 7eb4c6b20c..e9f4bb2a66 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box/board.c
@@ -80,8 +80,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO45,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
index 71659f4b0e..48f69d63b2 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -81,8 +81,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO45,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
index f278c7ddbc..c2bfec465d 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
@@ -108,8 +108,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO9,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
index 2249adeacd..c161fa9e59 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/board.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -100,8 +100,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO14,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/espressif/boards/hexky_s2/board.c b/ports/espressif/boards/hexky_s2/board.c
index 584253488b..a4a2f02e60 100644
--- a/ports/espressif/boards/hexky_s2/board.c
+++ b/ports/espressif/boards/hexky_s2/board.c
@@ -112,8 +112,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO45,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c
index e65401deda..245d0206ac 100644
--- a/ports/espressif/boards/hiibot_iots2/board.c
+++ b/ports/espressif/boards/hiibot_iots2/board.c
@@ -117,8 +117,7 @@ static void display_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO38,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
index 8f0d01fe79..24d847744d 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
@@ -117,8 +117,7 @@ static void display_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO33,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c
index 54e83eaaab..7deff5998c 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/board.c
+++ b/ports/espressif/boards/morpheans_morphesp-240/board.c
@@ -198,8 +198,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         NULL,           // There is no backlight pin, defined for now.
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        true,           // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh
diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c
index 18757cdc06..5079aa9433 100644
--- a/ports/nrf/boards/clue_nrf52840_express/board.c
+++ b/ports/nrf/boards/clue_nrf52840_express/board.c
@@ -84,8 +84,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_P1_05,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c
index 6ee4292e70..50f235280d 100644
--- a/ports/nrf/boards/hiibot_bluefi/board.c
+++ b/ports/nrf/boards/hiibot_bluefi/board.c
@@ -85,8 +85,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_P1_13,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
index db65ecbbd2..1513b2182d 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
@@ -85,8 +85,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_P0_20,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c
index 14f1467c79..a4704e26c3 100644
--- a/ports/nrf/boards/ohs2020_badge/board.c
+++ b/ports/nrf/boards/ohs2020_badge/board.c
@@ -84,8 +84,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_P0_02, // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
index 7aa9feee1b..49ace5e72a 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -97,7 +97,6 @@ void board_init(void) {
         NULL,
         0x81,
         1.0f, // brightness
-        false, // auto_brightness
         true, // single_byte_bounds
         true, // data as commands
         true, // auto_refresh
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
index 0a07f3b0dd..ebfa38446a 100644
--- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -101,8 +101,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO12,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index 95d9139998..5c959b4fad 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -104,8 +104,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_PB03,
         NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        false, // auto_brightness
+        1.0f, // brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 070793415d..b01de20cf8 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, 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:
+//|     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, backlight_pin: Optional[microcontroller.Pin] = None, brightness_command: Optional[int] = None, brightness: float = 1.0, 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
@@ -102,8 +102,7 @@
 //|         :param int write_ram_command: Command used to write pixels values into the update region. Ignored if data_as_commands is set.
 //|         :param microcontroller.Pin backlight_pin: Pin connected to the display's backlight
 //|         :param int brightness_command: Command to set display brightness. Usually available in OLED controllers.
-//|         :param float brightness: Initial display brightness. This value is ignored if auto_brightness is True.
-//|         :param bool auto_brightness: If True, brightness is controlled via an ambient light sensor or other mechanism.
+//|         :param float brightness: Initial display brightness.
 //|         :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 auto_refresh: Automatically refresh the screen
@@ -122,7 +121,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
            ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word,
            ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command,
            ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command,
-           ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands,
+           ARG_brightness, ARG_single_byte_bounds, ARG_data_as_commands,
            ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high,
            ARG_SH1107_addressing, ARG_backlight_pwm_frequency };
     static const mp_arg_t allowed_args[] = {
@@ -146,7 +145,6 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
         { MP_QSTR_backlight_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
         { MP_QSTR_brightness_command, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = NO_BRIGHTNESS_COMMAND} },
         { MP_QSTR_brightness, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
-        { MP_QSTR_auto_brightness, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_single_byte_bounds, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_data_as_commands, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_auto_refresh, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
@@ -196,7 +194,6 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
         MP_OBJ_TO_PTR(backlight_pin),
         args[ARG_brightness_command].u_int,
         brightness,
-        args[ARG_auto_brightness].u_bool,
         args[ARG_single_byte_bounds].u_bool,
         args[ARG_data_as_commands].u_bool,
         args[ARG_auto_refresh].u_bool,
@@ -311,9 +308,7 @@ MP_PROPERTY_GETSET(displayio_display_auto_refresh_obj,
     (mp_obj_t)&displayio_display_set_auto_refresh_obj);
 
 //|     brightness: float
-//|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When
-//|     `auto_brightness` is True, the value of `brightness` will change automatically.
-//|     If `brightness` is set, `auto_brightness` will be disabled and will be set to False."""
+//|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness."""
 //|
 STATIC mp_obj_t displayio_display_obj_get_brightness(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
@@ -327,7 +322,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_brightness_obj, displayio_displa
 
 STATIC mp_obj_t displayio_display_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) {
     displayio_display_obj_t *self = native_display(self_in);
-    common_hal_displayio_display_set_auto_brightness(self, false);
     mp_float_t brightness = mp_obj_get_float(brightness_obj);
     if (brightness < 0 || brightness > 1.0) {
         mp_raise_ValueError(translate("Brightness must be 0-1.0"));
@@ -344,34 +338,6 @@ MP_PROPERTY_GETSET(displayio_display_brightness_obj,
     (mp_obj_t)&displayio_display_get_brightness_obj,
     (mp_obj_t)&displayio_display_set_brightness_obj);
 
-//|     auto_brightness: bool
-//|     """True when the display brightness is adjusted automatically, based on an ambient
-//|     light sensor or other method. Note that some displays may have this set to True by default,
-//|     but not actually implement automatic brightness adjustment. `auto_brightness` is set to False
-//|     if `brightness` is set manually."""
-//|
-STATIC mp_obj_t displayio_display_obj_get_auto_brightness(mp_obj_t self_in) {
-    displayio_display_obj_t *self = native_display(self_in);
-    return mp_obj_new_bool(common_hal_displayio_display_get_auto_brightness(self));
-}
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_auto_brightness_obj, displayio_display_obj_get_auto_brightness);
-
-STATIC mp_obj_t displayio_display_obj_set_auto_brightness(mp_obj_t self_in, mp_obj_t auto_brightness) {
-    displayio_display_obj_t *self = native_display(self_in);
-
-    common_hal_displayio_display_set_auto_brightness(self, mp_obj_is_true(auto_brightness));
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_brightness_obj, displayio_display_obj_set_auto_brightness);
-
-MP_PROPERTY_GETSET(displayio_display_auto_brightness_obj,
-    (mp_obj_t)&displayio_display_get_auto_brightness_obj,
-    (mp_obj_t)&displayio_display_set_auto_brightness_obj);
-
-
-
-
 //|     width: int
 //|     """Gets the width of the board"""
 //|
@@ -509,7 +475,6 @@ STATIC const mp_rom_map_elem_t displayio_display_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_auto_refresh), MP_ROM_PTR(&displayio_display_auto_refresh_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&displayio_display_brightness_obj) },
-    { MP_ROM_QSTR(MP_QSTR_auto_brightness), MP_ROM_PTR(&displayio_display_auto_brightness_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_display_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_display_height_obj) },
diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h
index adc8623a69..35ba0d479a 100644
--- a/shared-bindings/displayio/Display.h
+++ b/shared-bindings/displayio/Display.h
@@ -42,7 +42,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
     bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
     uint8_t set_column_command, uint8_t set_row_command, uint8_t write_ram_command,
     uint8_t *init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t *backlight_pin, uint16_t brightness_command,
-    mp_float_t brightness, bool auto_brightness,
+    mp_float_t brightness,
     bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second,
     bool backlight_on_high, bool SH1107_addressing, uint16_t backlight_pwm_frequency);
 
@@ -59,9 +59,6 @@ uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t *self);
 uint16_t common_hal_displayio_display_get_rotation(displayio_display_obj_t *self);
 void common_hal_displayio_display_set_rotation(displayio_display_obj_t *self, int rotation);
 
-bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t *self);
-void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t *self, bool auto_brightness);
-
 bool common_hal_displayio_display_get_dither(displayio_display_obj_t *self);
 void common_hal_displayio_display_set_dither(displayio_display_obj_t *self, bool dither);
 
diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index 02c370c3c4..f71c3cfe82 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -48,7 +48,6 @@
 //|       import time
 //|       import pulseio
 //|
-//|       board.DISPLAY.auto_brightness = False
 //|       board.DISPLAY.brightness = 0
 //|       splash = displayio.Group()
 //|       board.DISPLAY.show(splash)
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index e999ac9bc1..00adef62a6 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -173,9 +173,7 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj,
     (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_refresh_obj);
 
 //|     brightness: float
-//|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When
-//|     `auto_brightness` is True, the value of `brightness` will change automatically.
-//|     If `brightness` is set, `auto_brightness` will be disabled and will be set to False."""
+//|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness."""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -189,7 +187,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_brightness_obj, f
 
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
-    common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, false);
     mp_float_t brightness = mp_obj_get_float(brightness_obj);
     if (brightness < 0.0f || brightness > 1.0f) {
         mp_raise_ValueError(translate("Brightness must be 0-1.0"));
@@ -206,34 +203,6 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj,
     (mp_obj_t)&framebufferio_framebufferdisplay_get_brightness_obj,
     (mp_obj_t)&framebufferio_framebufferdisplay_set_brightness_obj);
 
-//|     auto_brightness: bool
-//|     """True when the display brightness is adjusted automatically, based on an ambient
-//|     light sensor or other method. Note that some displays may have this set to True by default,
-//|     but not actually implement automatic brightness adjustment. `auto_brightness` is set to False
-//|     if `brightness` is set manually."""
-//|
-STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_brightness(mp_obj_t self_in) {
-    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
-    return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_get_auto_brightness(self));
-}
-MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_auto_brightness_obj, framebufferio_framebufferdisplay_obj_get_auto_brightness);
-
-STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_brightness(mp_obj_t self_in, mp_obj_t auto_brightness) {
-    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
-
-    bool ok = common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, mp_obj_is_true(auto_brightness));
-    if (!ok) {
-        mp_raise_RuntimeError(translate("Brightness not adjustable"));
-    }
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_brightness_obj, framebufferio_framebufferdisplay_obj_set_auto_brightness);
-
-MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_brightness_obj,
-    (mp_obj_t)&framebufferio_framebufferdisplay_get_auto_brightness_obj,
-    (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_brightness_obj);
-
 //|     width: int
 //|     """Gets the width of the framebuffer"""
 //|
@@ -374,7 +343,6 @@ STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_tabl
     { MP_ROM_QSTR(MP_QSTR_auto_refresh), MP_ROM_PTR(&framebufferio_framebufferdisplay_auto_refresh_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&framebufferio_framebufferdisplay_brightness_obj) },
-    { MP_ROM_QSTR(MP_QSTR_auto_brightness), MP_ROM_PTR(&framebufferio_framebufferdisplay_auto_brightness_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&framebufferio_framebufferdisplay_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&framebufferio_framebufferdisplay_height_obj) },
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index 8b262cf727..7c63587df7 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -55,9 +55,6 @@ uint16_t common_hal_framebufferio_framebufferdisplay_get_height(framebufferio_fr
 uint16_t common_hal_framebufferio_framebufferdisplay_get_rotation(framebufferio_framebufferdisplay_obj_t *self);
 void common_hal_framebufferio_framebufferdisplay_set_rotation(framebufferio_framebufferdisplay_obj_t *self, int rotation);
 
-bool common_hal_framebufferio_framebufferdisplay_get_auto_brightness(framebufferio_framebufferdisplay_obj_t *self);
-bool common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t *self, bool auto_brightness);
-
 mp_float_t common_hal_framebufferio_framebufferdisplay_get_brightness(framebufferio_framebufferdisplay_obj_t *self);
 bool common_hal_framebufferio_framebufferdisplay_set_brightness(framebufferio_framebufferdisplay_obj_t *self, mp_float_t brightness);
 
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 9523d068ac..59aa843aca 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -51,7 +51,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
     uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word, uint8_t set_column_command,
     uint8_t set_row_command, uint8_t write_ram_command,
     uint8_t *init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t *backlight_pin,
-    uint16_t brightness_command, mp_float_t brightness, bool auto_brightness,
+    uint16_t brightness_command, mp_float_t brightness,
     bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second,
     bool backlight_on_high, bool SH1107_addressing, uint16_t backlight_pwm_frequency) {
 
@@ -70,7 +70,6 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
     self->set_row_command = set_row_command;
     self->write_ram_command = write_ram_command;
     self->brightness_command = brightness_command;
-    self->auto_brightness = auto_brightness;
     self->first_manual_refresh = !auto_refresh;
     self->data_as_commands = data_as_commands;
     self->backlight_on_high = backlight_on_high;
@@ -132,12 +131,8 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
         common_hal_never_reset_pin(backlight_pin);
         #endif
     }
-    if (!self->auto_brightness && (self->backlight_inout.base.type != &mp_type_NoneType ||
-                                   brightness_command != NO_BRIGHTNESS_COMMAND)) {
-        common_hal_displayio_display_set_brightness(self, brightness);
-    } else {
-        self->current_brightness = -1.0;
-    }
+
+    common_hal_displayio_display_set_brightness(self, brightness);
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
@@ -157,20 +152,11 @@ uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t *self)
     return displayio_display_core_get_height(&self->core);
 }
 
-bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t *self) {
-    return self->auto_brightness;
-}
-
-void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t *self, bool auto_brightness) {
-    self->auto_brightness = auto_brightness;
-}
-
 mp_float_t common_hal_displayio_display_get_brightness(displayio_display_obj_t *self) {
     return self->current_brightness;
 }
 
 bool common_hal_displayio_display_set_brightness(displayio_display_obj_t *self, mp_float_t brightness) {
-    self->updating_backlight = true;
     if (!self->backlight_on_high) {
         brightness = 1.0 - brightness;
     }
@@ -209,7 +195,6 @@ bool common_hal_displayio_display_set_brightness(displayio_display_obj_t *self,
         }
 
     }
-    self->updating_backlight = false;
     if (ok) {
         self->current_brightness = brightness;
     }
@@ -413,23 +398,8 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self
     self->auto_refresh = auto_refresh;
 }
 
-STATIC void _update_backlight(displayio_display_obj_t *self) {
-    if (!self->auto_brightness || self->updating_backlight) {
-        return;
-    }
-    if (supervisor_ticks_ms64() - self->last_backlight_refresh < 100) {
-        return;
-    }
-    // TODO(tannewt): Fade the backlight based on its existing value and a target value. The target
-    // should account for ambient light when possible.
-    common_hal_displayio_display_set_brightness(self, 1.0);
-
-    self->last_backlight_refresh = supervisor_ticks_ms64();
-}
-
 void displayio_display_background(displayio_display_obj_t *self) {
-    _update_backlight(self);
-
+    common_hal_displayio_display_set_brightness(self, 1.0);
     if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) {
         _refresh_display(self);
     }
@@ -452,7 +422,6 @@ void release_display(displayio_display_obj_t *self) {
 
 void reset_display(displayio_display_obj_t *self) {
     common_hal_displayio_display_set_auto_refresh(self, true);
-    self->auto_brightness = true;
     common_hal_displayio_display_show(self, NULL);
 }
 
diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
index a0049f00c0..f513a9d462 100644
--- a/shared-module/displayio/Display.h
+++ b/shared-module/displayio/Display.h
@@ -45,7 +45,6 @@ typedef struct {
         pwmio_pwmout_obj_t backlight_pwm;
         #endif
     };
-    uint64_t last_backlight_refresh;
     uint64_t last_refresh_call;
     mp_float_t current_brightness;
     uint16_t brightness_command;
@@ -57,8 +56,6 @@ typedef struct {
     bool auto_refresh;
     bool first_manual_refresh;
     bool data_as_commands;
-    bool auto_brightness;
-    bool updating_backlight;
     bool backlight_on_high;
     // new quirk for sh1107
     bool SH1107_addressing;
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 6f9d9ec6ad..e2e7d11106 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -113,20 +113,6 @@ uint16_t common_hal_framebufferio_framebufferdisplay_get_height(framebufferio_fr
     return displayio_display_core_get_height(&self->core);
 }
 
-bool common_hal_framebufferio_framebufferdisplay_get_auto_brightness(framebufferio_framebufferdisplay_obj_t *self) {
-    if (self->framebuffer_protocol->get_auto_brightness) {
-        return self->framebuffer_protocol->get_auto_brightness(self->framebuffer);
-    }
-    return true;
-}
-
-bool common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t *self, bool auto_brightness) {
-    if (self->framebuffer_protocol->set_auto_brightness) {
-        return self->framebuffer_protocol->set_auto_brightness(self->framebuffer, auto_brightness);
-    }
-    return false;
-}
-
 mp_float_t common_hal_framebufferio_framebufferdisplay_get_brightness(framebufferio_framebufferdisplay_obj_t *self) {
     if (self->framebuffer_protocol->get_brightness) {
         return self->framebuffer_protocol->get_brightness(self->framebuffer);
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
index b6138e2202..b53461aad5 100644
--- a/shared-module/framebufferio/FramebufferDisplay.h
+++ b/shared-module/framebufferio/FramebufferDisplay.h
@@ -43,7 +43,6 @@ typedef struct {
     mp_obj_t framebuffer;
     const struct _framebuffer_p_t *framebuffer_protocol;
     mp_buffer_info_t bufinfo;
-    uint64_t last_backlight_refresh;
     uint64_t last_refresh_call;
     uint16_t native_frames_per_second;
     uint16_t native_ms_per_frame;
@@ -61,10 +60,8 @@ void framebufferio_framebufferdisplay_collect_ptrs(framebufferio_framebufferdisp
 
 mp_obj_t common_hal_framebufferio_framebufferdisplay_get_framebuffer(framebufferio_framebufferdisplay_obj_t *self);
 
-typedef bool (*framebuffer_get_auto_brightness_fun)(mp_obj_t);
 typedef bool (*framebuffer_get_reverse_pixels_in_byte_fun)(mp_obj_t);
 typedef bool (*framebuffer_get_reverse_pixels_in_word_fun)(mp_obj_t);
-typedef bool (*framebuffer_set_auto_brightness_fun)(mp_obj_t, bool);
 typedef bool (*framebuffer_set_brightness_fun)(mp_obj_t, mp_float_t);
 typedef int (*framebuffer_get_bytes_per_cell_fun)(mp_obj_t);
 typedef int (*framebuffer_get_color_depth_fun)(mp_obj_t);
@@ -105,9 +102,6 @@ typedef struct _framebuffer_p_t {
     framebuffer_get_brightness_fun get_brightness;
     framebuffer_set_brightness_fun set_brightness;
 
-    // Optional -- default is no automatic brightness control
-    framebuffer_get_auto_brightness_fun get_auto_brightness;
-    framebuffer_set_auto_brightness_fun set_auto_brightness;
 } framebuffer_p_t;
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_FRAMEBUFFERDISPLAY_H

From 76f03a2bee0a7d8a35fd68eb3bed1ceda3530cbd Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 8 Aug 2022 14:28:30 -0500
Subject: [PATCH 0822/2403] Make keypad select/poll'able for better async

This allows a small wrapper class to be written
```py
class AsyncEventQueue:
    def __init__(self, events):
        self._events = events

    async def __await__(self):
        yield asyncio.core._io_queue.queue_read(self._events)
        return self._events.get()

    def __enter__(self):
        return self

    def __exit__(self, exc_type, exc_value, traceback):
        pass

```
and used to just "await" the next event:
```py
async def key_task():
    print("waiting for keypresses")
    with keypad.KeyMatrix([board.D4], [board.D5]) as keys, AsyncEventQueue(keys.events) as ev:
        while True:
            print(await ev)
```

Because checking the empty status of the EventQueue does not enter
CircuitPython bytecode, it's assumed (but not measured) that this is
more efficient than an equivalent loop with an `await async.sleep(0)`
yield and introduces less latency than any non-zero sleep value.
---
 shared-bindings/keypad/EventQueue.c | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 8e45f7ad1d..ed182033dc 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -24,8 +24,11 @@
  * THE SOFTWARE.
  */
 
+#include "py/ioctl.h"
+#include "py/mperrno.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/EventQueue.h"
 
@@ -141,12 +144,41 @@ STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table);
 
+#if MICROPY_PY_USELECT
+STATIC mp_uint_t eventqueue_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    switch (request) {
+        case MP_STREAM_POLL: {
+            mp_uint_t flags = arg;
+            mp_uint_t ret = 0;
+            if ((flags & MP_IOCTL_POLL_RD) && common_hal_keypad_eventqueue_get_length(self)) {
+                ret |= MP_IOCTL_POLL_RD;
+            }
+            return ret;
+        }
+        default:
+            *errcode = MP_EINVAL;
+            return MP_STREAM_ERROR;
+    }
+}
+
+STATIC const mp_stream_p_t eventqueue_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
+    .ioctl = eventqueue_ioctl,
+};
+#endif
+
+
 const mp_obj_type_t keypad_eventqueue_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_EventQueue,
     MP_TYPE_EXTENDED_FIELDS(
         .unary_op = keypad_eventqueue_unary_op,
+        #if MICROPY_PY_USELECT
+        .protocol = &eventqueue_p,
+        #endif
         ),
     .locals_dict = (mp_obj_t)&keypad_eventqueue_locals_dict,
 };

From f5f77937d0086df65ddd837647fa761b18431514 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 10 Aug 2022 07:17:48 +0000
Subject: [PATCH 0823/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 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 2cb3003b4a..231750f4c6 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: 2022-08-07 15:16+0000\n"
+"PO-Revision-Date: 2022-08-10 07:18+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -417,7 +417,7 @@ msgstr "Todos os periféricos I2C estão em uso"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "Todos os alvos I2C já estão em uso"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -3349,7 +3349,7 @@ msgstr "o decorador micropython é inválido"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "configuração inválida"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"

From 198c8fea1160a6846f4e15133bd7b9b5411d0144 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 10 Aug 2022 08:43:08 -0400
Subject: [PATCH 0824/2403] merge from upstream and fix espressif_esp32s3_eye

---
 ports/espressif/boards/espressif_esp32s3_eye/board.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index 4edf8b5c08..230d8b40b6 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -111,8 +111,7 @@ void board_init(void) {
         sizeof(display_init_sequence),
         &pin_GPIO48,    // backlight pin
         NO_BRIGHTNESS_COMMAND,
-        1.0f,           // brightness (ignored)
-        false,          // auto_brightness
+        1.0f,           // brightness
         false,          // single_byte_bounds
         false,          // data_as_commands
         true,           // auto_refresh

From 9e0c580d3df6ae0d038c7ff940308a89917d8c59 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Wed, 10 Aug 2022 09:42:24 -0400
Subject: [PATCH 0825/2403] AnalogFastIn

---
 .../common-hal/analogio/AnalogFastIn.c        | 170 +++++++++++++++++-
 .../common-hal/analogio/AnalogFastIn.h        |  72 +++++++-
 py/circuitpy_defns.mk                         |   1 +
 shared-bindings/analogio/AnalogFastIn.c       | 163 ++++++++++++++++-
 shared-bindings/analogio/AnalogFastIn.h       |  40 ++++-
 shared-bindings/analogio/__init__.c           |   2 +
 6 files changed, 444 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
index d916a669dd..4acda3d4d5 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -1 +1,169 @@
-/* AnalogFastIn.c */
+/*
+ * 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 "common-hal/analogio/AnalogFastIn.h"
+#include "shared-bindings/analogio/AnalogFastIn.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+#include "supervisor/shared/translate/translate.h"
+
+#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
+#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
+
+//     /sdk/src/rp2_common/hardware_dma/include/hardware/dma.h
+
+// ports/raspberrypi/
+#include "sdk/src/common/pico_stdlib/include/pico/stdlib.h"
+
+
+#define ADC_FIRST_PIN_NUMBER 26
+#define ADC_PIN_COUNT 4
+// Channel 0 is GPIO26
+#define CAPTURE_CHANNEL 0
+#define CAPTURE_DEPTH 1000
+uint8_t capture_buf[CAPTURE_DEPTH];
+
+// ADC unit8 or int8 ??? ---> unint16
+//
+// uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
+//    adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+//    uint16_t value = adc_read();
+//
+//    // Stretch 12-bit ADC reading to 16-bit range
+//    return (value << 4) | (value >> 8);
+// }
+/*
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t number;
+} mcu_pin_obj_t;
+*/
+
+//    self->pin = pin;
+//    self->buffer = buffer;
+//    self->len = len;
+//    //self->bits_per_sample = bytes_per_sample * 8;
+//    self->samples_signed = samples_signed;
+//    self->sample_rate = sample_rate;
+
+void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
+
+    // Set pin and channel
+    self->pin = pin;
+    self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
+
+    // Checks on chan value here
+
+    // Set buffer and length
+    self->buffer = buffer;
+    self->len = len;
+
+    // checks on length here
+
+
+    // uint8_t bytes_per_sample
+    // Set sample rate
+    // self->bits_per_sample = bytes_per_sample * 8;
+    self->sample_rate = sample_rate;
+
+    // Standard IO Init
+    stdio_init_all();
+
+    // Init GPIO for analogue use: hi-Z, no pulls, disable digital input buffer.
+    adc_init();
+    adc_gpio_init(pin->number);
+    adc_select_input(self->chan); // chan = pin - 26 ??
+    // adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+    adc_fifo_setup(
+        true,    // Write each completed conversion to the sample FIFO
+        true,    // Enable DMA data request (DREQ)
+        1,       // DREQ (and IRQ) asserted when at least 1 sample present
+        false,   // We won't see the ERR bit because of 8 bit reads; disable. // ??
+        true     // Shift each sample to 8 bits when pushing to FIFO // ??
+        );
+
+    // Divisor of 0 -> full speed. Free-running capture with the divider is
+    // equivalent to pressing the ADC_CS_START_ONCE button once per `div + 1`
+    // cycles (div not necessarily an integer). Each conversion takes 96
+    // cycles, so in general you want a divider of 0 (hold down the button
+    // continuously) or > 95 (take samples less frequently than 96 cycle
+    // intervals). This is all timed by the 48 MHz ADC clock.
+    // sample rate determines divisor, not zero.
+    adc_set_clkdiv(0);
+
+    // sleep_ms(1000);
+    // Set up the DMA to start transferring data as soon as it appears in FIFO
+    uint dma_chan = dma_claim_unused_channel(true);
+    self->dma_chan = dma_chan;
+    dma_channel_config cfg = dma_channel_get_default_config(dma_chan);
+
+    // Reading from constant address, writing to incrementing byte addresses
+    channel_config_set_transfer_data_size(&cfg, DMA_SIZE_8);
+    channel_config_set_read_increment(&cfg, false);
+    channel_config_set_write_increment(&cfg, true);
+
+    // Pace transfers based on availability of ADC samples
+    channel_config_set_dreq(&cfg, DREQ_ADC);
+
+    dma_channel_configure(dma_chan, &cfg,
+        capture_buf,    // dst
+        &adc_hw->fifo,  // src
+        self->len,      // CAPTURE_DEPTH,  // transfer count
+        true            // start immediately
+        );
+}
+
+
+bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self) {
+    return self->pin == NULL;
+}
+
+void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self) {
+    if (common_hal_analogio_analogfastin_deinited(self)) {
+        return;
+    }
+
+    reset_pin_number(self->pin->number);
+    self->pin = NULL;
+}
+
+// ================================================================
+// capture()
+// make this a bool so that later we can perform integrity checking
+// ================================================================
+bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self) {
+    // uint16_t value = adc_read();
+    // Stretch 12-bit ADC reading to 16-bit range
+    // return (value << 4) | (value >> 8);
+    adc_run(true);
+    // Once DMA finishes, stop any new conversions from starting, and clean up
+    // the FIFO in case the ADC was still mid-conversion.
+    dma_channel_wait_for_finish_blocking(self->dma_chan);
+    // printf("Capture finished\n");
+    adc_run(false);
+    adc_fifo_drain();
+    return true;
+}
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
index e99192dfac..2853b4fe07 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
@@ -1 +1,71 @@
-/* AnalogFastIn.h */
+/*
+ * 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_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+// We can extend the struct without impact to existing code
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+    uint8_t *buffer;
+    uint32_t len;
+    uint8_t bytes_per_sample;
+    bool samples_signed;
+    uint32_t sample_rate;
+    uint8_t chan;
+    uint dma_chan;
+    // data_size       = DMA_SIZE_8;  //                                  - default DMA_SIZE_8
+    // data_size       = DMA_SIZE_16;  //                                 - default DMA_SIZE_16
+    // Either 12 bits in 16 or 12 over 2 bytes or truncate 12 to 8 in 8
+    // Either B or H, default array.array("h", [0]*length) "h"==short (16 bits signed)
+} analogio_analogfastin_obj_t;
+
+// void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate)
+/*
+void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self,
+    const mcu_pin_obj_t *pin,
+    uint8_t *buffer,
+    uint32_t len,
+    uint8_t bytes_per_sample,
+    bool samples_signed,
+    uint32_t sample_rate) {
+    self->pin = pin;
+    self->buffer = buffer;
+    self->len = len;
+    //self->bits_per_sample = bytes_per_sample * 8;
+    self->samples_signed = samples_signed;
+    self->sample_rate = sample_rate;
+}
+*/
+
+void analogfastin_init(void);
+
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index af49c876ba..a0eb743dc7 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -390,6 +390,7 @@ SRC_COMMON_HAL_ALL = \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
 	analogio/AnalogIn.c \
+	analogio/AnalogFastIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
 	audiobusio/I2SOut.c \
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
index d916a669dd..d32e648af3 100644
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -1 +1,162 @@
-/* AnalogFastIn.c */
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: 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.
+ */
+
+#include 
+
+#include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
+#include "py/mphal.h"
+#include "py/nlr.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/analogio/AnalogFastIn.h"
+#include "shared-bindings/util.h"
+
+// pin, buffer, rate
+
+
+
+STATIC mp_obj_t analogio_analogfastin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_pin, ARG_buffer, ARG_sample_rate };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 8000} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Validate Pin
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+
+    // Buffer Pointer defined and allocated by user
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+
+    // signed or unsigned, byte per sample
+    bool signed_samples = bufinfo.typecode == 'b' || bufinfo.typecode == 'h';
+    uint8_t bytes_per_sample = 1;
+
+    // Bytes Per Sample
+    if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
+        bytes_per_sample = 2;
+    } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError(translate("sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or 'B'"));
+    }
+
+    // Validate sample rate here
+    uint32_t sample_rate = args[ARG_sample_rate].u_int;
+
+    // Create local object
+    analogio_analogfastin_obj_t *self = m_new_obj(analogio_analogfastin_obj_t);
+    self->base.type = &analogio_analogfastin_type;
+
+    // Call local intereface in ports/common-hal/analogio
+    common_hal_analogio_analogfastin_construct(self,
+        pin,
+        ((uint8_t *)bufinfo.buf),
+        bufinfo.len,
+        bytes_per_sample,
+        signed_samples,
+        sample_rate
+        );
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Turn off the AnalogFastIn and release the pin for other use."""
+//|         ...
+//|
+STATIC mp_obj_t analogio_analogfastin_deinit(mp_obj_t self_in) {
+    analogio_analogfastin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_analogio_analogfastin_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogfastin_deinit_obj, analogio_analogfastin_deinit);
+
+STATIC void check_for_deinit(analogio_analogfastin_obj_t *self) {
+    if (common_hal_analogio_analogfastin_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+//|     def __enter__(self) -> AnalogFastIn:
+//|         """No-op used by Context Managers."""
+//|         ...
+//|
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
+STATIC mp_obj_t analogio_analogfastin___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_analogio_analogfastin_deinit(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogfastin___exit___obj, 4, 4, analogio_analogfastin___exit__);
+
+//|     value: int
+//|     """The value on the analog pin between 0 and 65535 inclusive (16-bit). (read-only)
+//|
+//|     Even if the underlying analog to digital converter (ADC) is lower
+//|     resolution, the value is 16-bit."""
+//|
+STATIC mp_obj_t analogio_analogfastin_obj_capture(mp_obj_t self_in) {
+    analogio_analogfastin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_analogio_analogfastin_capture(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogfastin_capture_obj, analogio_analogfastin_obj_capture);
+
+// MP_PROPERTY_GETTER(analogio_analogfastin_value_obj,
+//    (mp_obj_t)&analogio_analogfastin_get_value_obj);
+
+//|     reference_voltage: float
+//|     """The maximum voltage measurable (also known as the reference voltage) as a
+//|     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
+//|     at ends of the analog range."""
+//|
+
+STATIC const mp_rom_map_elem_t analogio_analogfastin_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&analogio_analogfastin_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&analogio_analogfastin___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_capture),            MP_ROM_PTR(&analogio_analogfastin_capture_obj)},
+
+};
+
+STATIC MP_DEFINE_CONST_DICT(analogio_analogfastin_locals_dict, analogio_analogfastin_locals_dict_table);
+
+const mp_obj_type_t analogio_analogfastin_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_AnalogFastIn,
+    .make_new = analogio_analogfastin_make_new,
+    .locals_dict = (mp_obj_t)&analogio_analogfastin_locals_dict,
+};
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
index e99192dfac..8e6f2070b6 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -1 +1,39 @@
-/* AnalogFastIn.h */
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: 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_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/analogio/AnalogFastIn.h"
+
+extern const mp_obj_type_t analogio_analogfastin_type;
+
+void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
+void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self);
+bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self);
+bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self);
+#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H__
diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index eb956d0eb7..0033b2a66d 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/analogio/__init__.h"
 #include "shared-bindings/analogio/AnalogIn.h"
+#include "shared-bindings/analogio/AnalogFastIn.h"
 #include "shared-bindings/analogio/AnalogOut.h"
 
 //| """Analog hardware support
@@ -70,6 +71,7 @@
 STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogio) },
     { MP_ROM_QSTR(MP_QSTR_AnalogIn),   MP_ROM_PTR(&analogio_analogin_type) },
+    { MP_ROM_QSTR(MP_QSTR_AnalogFastIn),   MP_ROM_PTR(&analogio_analogfastin_type) },
     { MP_ROM_QSTR(MP_QSTR_AnalogOut),   MP_ROM_PTR(&analogio_analogout_type) },
 };
 

From 0b286b7e7e3348d1d4941d79e28949a27ffc8a5c Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 10 Aug 2022 10:44:06 -0400
Subject: [PATCH 0826/2403] does pre-commit not like split lines?

---
 supervisor/shared/web_workflow/static/directory.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 1438e5c546..296b434ea2 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -11,8 +11,7 @@ async function refresh_list() {
         if (a.directory == b.directory && a.name.toLowerCase() === b.name.toLowerCase()) {
           return 0;
         } else {
-          return a.directory.toString().substring(3,4)+a.name.toLowerCase() < 
-            b.directory.toString().substring(3,4)+b.name.toLowerCase() ? -1 : 1;
+          return a.directory.toString().substring(3,4)+a.name.toLowerCase() < b.directory.toString().substring(3,4)+b.name.toLowerCase() ? -1 : 1;
         }
     }
 

From af64faae1e01d777d1cbc593f8b84732a0d305b1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 10 Aug 2022 12:06:43 -0400
Subject: [PATCH 0827/2403] switch back one I2C message

---
 ports/espressif/common-hal/i2ctarget/I2CTarget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/i2ctarget/I2CTarget.c b/ports/espressif/common-hal/i2ctarget/I2CTarget.c
index 6fde048676..ad0d09967a 100644
--- a/ports/espressif/common-hal/i2ctarget/I2CTarget.c
+++ b/ports/espressif/common-hal/i2ctarget/I2CTarget.c
@@ -54,7 +54,7 @@ void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
     self->i2c_num = peripherals_i2c_get_free_num();
 
     if (self->i2c_num == I2C_NUM_MAX) {
-        mp_raise_ValueError(translate("All I2C targets are in use"));
+        mp_raise_ValueError(translate("All I2C peripherals are in use"));
     }
 
     const i2c_config_t i2c_conf = {

From 86f9d98a5d14cccea9b52cd7639bad2caee4e284 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 Aug 2022 11:12:54 -0500
Subject: [PATCH 0828/2403] fix documentation of framebuffer_count

---
 ports/espressif/bindings/esp32_camera/Camera.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 3cd5d93682..08bf48bc9b 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -57,7 +57,7 @@
 //|         pixel_format: PixelFormat=PixelFormat.RGB565,
 //|         frame_size: FrameSize=FrameSize.QQVGA,
 //|         jpeg_quality: int=15,
-//|         double_buffered: bool = True,
+//|         framebuffer_count: int = 1,
 //|         grab_mode: GrabMode = GrabMode.WHEN_EMPTY,
 //|     ) -> None:
 //|         """

From 5168f6ec1f52aa1506b585850c6b9cb748d7259c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 Aug 2022 11:13:26 -0500
Subject: [PATCH 0829/2403] Add support for RGB565 images in qrio

Most cameras produce RGB565_SWAPPED data
---
 shared-bindings/qrio/PixelPolicy.c | 10 ++++++++++
 shared-bindings/qrio/PixelPolicy.h |  2 +-
 shared-module/qrio/QRDecoder.c     | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/qrio/PixelPolicy.c b/shared-bindings/qrio/PixelPolicy.c
index 6887081b24..656045556b 100644
--- a/shared-bindings/qrio/PixelPolicy.c
+++ b/shared-bindings/qrio/PixelPolicy.c
@@ -39,13 +39,23 @@
 //|     ODD_BYTES: PixelPolicy
 //|     """The input buffer to `QRDecoder.decode` consists of greyscale values in positions 1, 3, …, and ignored bytes in positions 0, 2, ….  This can decode directly from YUV images where the odd bytes hold the Y (luminance) data"""
 //|
+//|     RGB565_SWAPPED: PixelPolicy
+//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in byte-swapped order.  The green component is used."""
+//|
+//|     RGB565: PixelPolicy
+//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values.  The green component is used."""
+//|
 
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, EVERY_BYTE, QRIO_EVERY_BYTE);
+MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, RGB565, QRIO_RGB565);
+MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, RGB565_SWAPPED, QRIO_RGB565_SWAPPED);
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, EVEN_BYTES, QRIO_EVEN_BYTES);
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, ODD_BYTES, QRIO_EVEN_BYTES);
 
 MAKE_ENUM_MAP(qrio_pixel_policy) {
     MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, EVERY_BYTE),
+    MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, RGB565),
+    MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, RGB565_SWAPPED),
     MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, EVEN_BYTES),
     MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, ODD_BYTES),
 };
diff --git a/shared-bindings/qrio/PixelPolicy.h b/shared-bindings/qrio/PixelPolicy.h
index 8be5dde1cc..36c1d271fd 100644
--- a/shared-bindings/qrio/PixelPolicy.h
+++ b/shared-bindings/qrio/PixelPolicy.h
@@ -33,7 +33,7 @@
 extern const mp_obj_type_t qrio_pixel_policy_type;
 
 typedef enum {
-    QRIO_EVERY_BYTE, QRIO_EVEN_BYTES, QRIO_ODD_BYTES
+    QRIO_EVERY_BYTE, QRIO_EVEN_BYTES, QRIO_ODD_BYTES, QRIO_RGB565, QRIO_RGB565_SWAPPED
 } qrio_pixel_policy_t;
 
 extern const cp_enum_obj_t qrio_pixel_policy_EVERY_BYTE_obj;
diff --git a/shared-module/qrio/QRDecoder.c b/shared-module/qrio/QRDecoder.c
index 26a609f215..f7b25362e4 100644
--- a/shared-module/qrio/QRDecoder.c
+++ b/shared-module/qrio/QRDecoder.c
@@ -104,6 +104,20 @@ mp_obj_t shared_module_qrio_qrdecoder_decode(qrdecoder_qrdecoder_obj_t *self, co
     uint8_t *src = bufinfo->buf;
 
     switch (policy) {
+        case QRIO_RGB565: {
+            uint16_t *src16 = bufinfo->buf;
+            for (int i = 0; i < width * height; i++) {
+                framebuffer[i] = (src16[i] >> 3) & 0xfc;
+            }
+            break;
+        }
+        case QRIO_RGB565_SWAPPED: {
+            uint16_t *src16 = bufinfo->buf;
+            for (int i = 0; i < width * height; i++) {
+                framebuffer[i] = (__builtin_bswap16(src16[i]) >> 3) & 0xfc;
+            }
+            break;
+        }
         case QRIO_EVERY_BYTE:
             memcpy(framebuffer, src, width * height);
             break;
@@ -116,6 +130,7 @@ mp_obj_t shared_module_qrio_qrdecoder_decode(qrdecoder_qrdecoder_obj_t *self, co
             for (int i = 0; i < width * height; i++) {
                 framebuffer[i] = src[2 * i];
             }
+            break;
     }
     quirc_end(self->quirc);
 

From 3c3b7cb1e779945966d8d74dc64b865bc30a40df Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 Aug 2022 11:14:33 -0500
Subject: [PATCH 0830/2403] whitespace in docstrings

---
 shared-bindings/qrio/PixelPolicy.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/qrio/PixelPolicy.c b/shared-bindings/qrio/PixelPolicy.c
index 656045556b..deb164d02d 100644
--- a/shared-bindings/qrio/PixelPolicy.c
+++ b/shared-bindings/qrio/PixelPolicy.c
@@ -34,16 +34,16 @@
 //|     """The input buffer to `QRDecoder.decode` consists of greyscale values in every byte"""
 //|
 //|     EVEN_BYTES: PixelPolicy
-//|     """The input buffer to `QRDecoder.decode` consists of greyscale values in positions 0, 2, …, and ignored bytes in positions 1, 3, ….  This can decode directly from YUV images where the even bytes hold the Y (luminance) data."""
+//|     """The input buffer to `QRDecoder.decode` consists of greyscale values in positions 0, 2, …, and ignored bytes in positions 1, 3, …. This can decode directly from YUV images where the even bytes hold the Y (luminance) data."""
 //|
 //|     ODD_BYTES: PixelPolicy
-//|     """The input buffer to `QRDecoder.decode` consists of greyscale values in positions 1, 3, …, and ignored bytes in positions 0, 2, ….  This can decode directly from YUV images where the odd bytes hold the Y (luminance) data"""
+//|     """The input buffer to `QRDecoder.decode` consists of greyscale values in positions 1, 3, …, and ignored bytes in positions 0, 2, …. This can decode directly from YUV images where the odd bytes hold the Y (luminance) data"""
 //|
 //|     RGB565_SWAPPED: PixelPolicy
-//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in byte-swapped order.  The green component is used."""
+//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in byte-swapped order. Most cameras produce data in byte-swapped order. The green component is used."""
 //|
 //|     RGB565: PixelPolicy
-//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values.  The green component is used."""
+//|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in native order. The green component is used."""
 //|
 
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, EVERY_BYTE, QRIO_EVERY_BYTE);

From 412d6fee566f2401cd6affc04fa6bb5de611a5c0 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Wed, 10 Aug 2022 19:55:00 +0200
Subject: [PATCH 0831/2403] Bump circuitpython-stage to 1.3.5

---
 frozen/circuitpython-stage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index f993d5fac6..9a8338b3bd 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit f993d5fac69f3a0cfa33988268666c462b72c0ec
+Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac

From 0b098f5013d72afb235d9ca6816288acbcdeab54 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 10 Aug 2022 11:31:52 -0700
Subject: [PATCH 0832/2403] Retry send if only some bytes sent

Fixes #6654 and fixes #6689
---
 supervisor/shared/web_workflow/web_workflow.c | 32 ++++++++++++-------
 supervisor/shared/web_workflow/web_workflow.h |  5 +++
 supervisor/shared/web_workflow/websocket.c    | 28 +++++++---------
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 770b0276fd..0510e5760c 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -37,6 +37,7 @@
 #include "shared/timeutils/timeutils.h"
 #include "supervisor/fatfs_port.h"
 #include "supervisor/filesystem.h"
+#include "supervisor/port.h"
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
@@ -323,22 +324,31 @@ void supervisor_start_web_workflow(void) {
     #endif
 }
 
-static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
+void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
+    int total_sent = 0;
     int sent = -EAGAIN;
-    while (sent == -EAGAIN && common_hal_socketpool_socket_get_connected(socket)) {
-        sent = socketpool_socket_send(socket, buf, len);
+    while ((sent == -EAGAIN || (sent > 0 && total_sent < len)) &&
+           common_hal_socketpool_socket_get_connected(socket)) {
+        sent = socketpool_socket_send(socket, buf + total_sent, len - total_sent);
+        if (sent > 0) {
+            total_sent += sent;
+            if (total_sent < len) {
+                // Yield so that network code can run.
+                port_idle_until_interrupt();
+            }
+        }
     }
-    if (sent < len) {
+    if (total_sent < len) {
         ESP_LOGE(TAG, "short send %d %d", sent, len);
     }
 }
 
 STATIC void _print_raw(void *env, const char *str, size_t len) {
-    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, (size_t)len);
+    web_workflow_send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, (size_t)len);
 }
 
 static void _send_str(socketpool_socket_obj_t *socket, const char *str) {
-    _send_raw(socket, (const uint8_t *)str, strlen(str));
+    web_workflow_send_raw(socket, (const uint8_t *)str, strlen(str));
 }
 
 // The last argument must be NULL! Otherwise, it won't stop.
@@ -357,15 +367,15 @@ static void _send_strs(socketpool_socket_obj_t *socket, ...) {
 static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) {
     mp_print_t _socket_print = {socket, _print_raw};
     mp_printf(&_socket_print, "%X\r\n", strlen(chunk));
-    _send_raw(socket, (const uint8_t *)chunk, strlen(chunk));
-    _send_raw(socket, (const uint8_t *)"\r\n", 2);
+    web_workflow_send_raw(socket, (const uint8_t *)chunk, strlen(chunk));
+    web_workflow_send_raw(socket, (const uint8_t *)"\r\n", 2);
 }
 
 STATIC void _print_chunk(void *env, const char *str, size_t len) {
     mp_print_t _socket_print = {env, _print_raw};
     mp_printf(&_socket_print, "%X\r\n", len);
-    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, len);
-    _send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)"\r\n", 2);
+    web_workflow_send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)str, len);
+    web_workflow_send_raw((socketpool_socket_obj_t *)env, (const uint8_t *)"\r\n", 2);
 }
 
 // A bit of a misnomer because it sends all arguments as one chunk.
@@ -938,7 +948,7 @@ static void _reply_static(socketpool_socket_obj_t *socket, _request *request, co
         "Content-Length: ", encoded_len, "\r\n",
         "Content-Type: ", content_type, "\r\n",
         "\r\n", NULL);
-    _send_raw(socket, response, response_len);
+    web_workflow_send_raw(socket, response, response_len);
 }
 
 #define _REPLY_STATIC(socket, request, filename) _reply_static(socket, request, filename, filename##_length, filename##_content_type)
diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h
index a325b0667e..166219c876 100644
--- a/supervisor/shared/web_workflow/web_workflow.h
+++ b/supervisor/shared/web_workflow/web_workflow.h
@@ -28,6 +28,8 @@
 
 #include 
 
+#include "shared-bindings/socketpool/Socket.h"
+
 // This background function should be called repeatedly. It cannot be done based
 // on events.
 void supervisor_web_workflow_background(void);
@@ -35,3 +37,6 @@ bool supervisor_web_workflow_status_dirty(void);
 void supervisor_web_workflow_status(void);
 void supervisor_start_web_workflow(void);
 void supervisor_stop_web_workflow(void);
+
+// To share with websocket.
+void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len);
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index bb5f5b43d0..d05ab5af40 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -30,6 +30,7 @@
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
 #include "supervisor/shared/title_bar.h"
+#include "supervisor/shared/web_workflow/web_workflow.h"
 
 // TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
 #include "esp_log.h"
@@ -91,16 +92,6 @@ static bool _read_byte(uint8_t *c) {
     return true;
 }
 
-static void _send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
-    int sent = -EAGAIN;
-    while (sent == -EAGAIN) {
-        sent = socketpool_socket_send(socket, buf, len);
-    }
-    if (sent < len) {
-        ESP_LOGE(TAG, "short send on %d err %d len %d", socket->num, sent, len);
-    }
-}
-
 static void _read_next_frame_header(void) {
     uint8_t h;
     if (cp_serial.frame_index == 0 && _read_byte(&h)) {
@@ -159,14 +150,14 @@ static void _read_next_frame_header(void) {
                 ESP_LOGE(TAG, "CLOSE or PING has long payload");
             }
             frame_header[1] = cp_serial.payload_remaining;
-            _send_raw(&cp_serial.socket, (const uint8_t *)frame_header, 2);
+            web_workflow_send_raw(&cp_serial.socket, (const uint8_t *)frame_header, 2);
         }
 
         if (cp_serial.payload_remaining > 0 && _read_byte(&h)) {
             // Send the payload back to the client.
             cp_serial.frame_index++;
             cp_serial.payload_remaining--;
-            _send_raw(&cp_serial.socket, &h, 1);
+            web_workflow_send_raw(&cp_serial.socket, &h, 1);
         }
 
         if (cp_serial.payload_remaining == 0) {
@@ -231,23 +222,23 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
         payload_len = 127;
     }
     frame_header[1] = payload_len;
-    _send_raw(&ws->socket, (const uint8_t *)frame_header, 2);
+    web_workflow_send_raw(&ws->socket, (const uint8_t *)frame_header, 2);
     uint8_t extended_len[4];
     if (payload_len == 126) {
         extended_len[0] = (len >> 8) & 0xff;
         extended_len[1] = len & 0xff;
-        _send_raw(&ws->socket, extended_len, 2);
+        web_workflow_send_raw(&ws->socket, extended_len, 2);
     } else if (payload_len == 127) {
         uint32_t zero = 0;
         // 64 bits where top four bytes are zero.
-        _send_raw(&ws->socket, (const uint8_t *)&zero, 4);
+        web_workflow_send_raw(&ws->socket, (const uint8_t *)&zero, 4);
         extended_len[0] = (len >> 24) & 0xff;
         extended_len[1] = (len >> 16) & 0xff;
         extended_len[2] = (len >> 8) & 0xff;
         extended_len[3] = len & 0xff;
-        _send_raw(&ws->socket, extended_len, 4);
+        web_workflow_send_raw(&ws->socket, extended_len, 4);
     }
-    _send_raw(&ws->socket, (const uint8_t *)text, len);
+    web_workflow_send_raw(&ws->socket, (const uint8_t *)text, len);
     char copy[len];
     memcpy(copy, text, len);
     copy[len] = '\0';
@@ -258,6 +249,9 @@ void websocket_write(const char *text, size_t len) {
 }
 
 void websocket_background(void) {
+    if (!websocket_connected()) {
+        return;
+    }
     uint8_t c;
     while (ringbuf_num_empty(&_incoming_ringbuf) > 0 &&
            _read_next_payload_byte(&c)) {

From 92231e88ca95ed92c98f62ee3cd301e57519ec90 Mon Sep 17 00:00:00 2001
From: Hanns Holger Rutz 
Date: Wed, 10 Aug 2022 21:49:18 +0200
Subject: [PATCH 0833/2403] Touchin.c - fix clean up in constructor before
 exception is thrown

When the constructor value reading times out, an exception is thrown, but the digital pin is not de-initialised. Make sure to run the clean up, so user could catch the exception and retry using the same pin.
---
 shared-module/touchio/TouchIn.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-module/touchio/TouchIn.c b/shared-module/touchio/TouchIn.c
index 840c14571d..35dd56a6e4 100644
--- a/shared-module/touchio/TouchIn.c
+++ b/shared-module/touchio/TouchIn.c
@@ -78,6 +78,7 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, const mcu
 
     uint16_t raw_reading = get_raw_reading(self);
     if (raw_reading == TIMEOUT_TICKS) {
+        common_hal_touchio_touchin_deinit(self);
         mp_raise_ValueError(translate("No pulldown on pin; 1Mohm recommended"));
     }
     self->threshold = raw_reading * 1.05 + 100;

From f9d724c09e5190c1bbfb6b39b6ff4aa8a649a421 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 10 Aug 2022 15:24:08 -0700
Subject: [PATCH 0834/2403] Fix retries after successful connection.

We may have set retries to 0 to enforce a timeout but the connect
succeeded. When it succeeds, we want to allow retries later in
case we lose signal briefly. (The callback will do this too but
the connect function will override it after.)

Also, remove extra code from websocket that is leftover from
debugging.
---
 ports/espressif/common-hal/wifi/Radio.c    | 3 +++
 supervisor/shared/web_workflow/websocket.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 545af1d6cb..8616501ba2 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -336,6 +336,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
             return WIFI_RADIO_ERROR_NO_AP_FOUND;
         }
         return self->last_disconnect_reason;
+    } else {
+        // We're connected, allow us to retry if we get disconnected.
+        self->retries_left = self->starting_retries;
     }
     return WIFI_RADIO_ERROR_NONE;
 }
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index bb5f5b43d0..79f1a63d7e 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -248,9 +248,6 @@ static void _websocket_send(_websocket *ws, const char *text, size_t len) {
         _send_raw(&ws->socket, extended_len, 4);
     }
     _send_raw(&ws->socket, (const uint8_t *)text, len);
-    char copy[len];
-    memcpy(copy, text, len);
-    copy[len] = '\0';
 }
 
 void websocket_write(const char *text, size_t len) {

From 9c6c8b5d628fce2cfec9588ef2e6f06722ff0468 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 10 Aug 2022 16:31:50 -0700
Subject: [PATCH 0835/2403] Don't build boards for docs changes

---
 tools/ci_set_matrix.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 03aa362632..90cf04cea6 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -96,8 +96,8 @@ def set_boards_to_build(build_all):
             if p in IGNORE:
                 continue
 
-            # Boards don't run tests so ignore those as well.
-            if p.startswith("tests"):
+            # Boards don't run tests or docs so ignore those as well.
+            if p.startswith("tests") or p.startswith("docs"):
                 continue
 
             # As a (nearly) last resort, for some certain files, we compute the settings from the

From 11b434c8bf5063890900233214fffef9bc1d5716 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 10 Aug 2022 16:32:45 +0000
Subject: [PATCH 0836/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 20724e40bf..7d70a696fc 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: 2022-08-07 15:16+0000\n"
+"PO-Revision-Date: 2022-08-11 17:18+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -412,7 +412,7 @@ msgstr "All I2C-kringutrustning används"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "Alla I2C-mål används"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -3314,7 +3314,7 @@ msgstr "ogiltig mikropython-dekorator"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "ogiltig inställning"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"

From 553367105f24d159fd8070e8ce053cf6cfc70c44 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 Aug 2022 11:01:16 -0700
Subject: [PATCH 0837/2403] Add examples of non-applicable cases and SPI link

---
 docs/design_guide.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index 61ba0ed5b3..6da73b2fdb 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -497,10 +497,16 @@ backticks  ``:class:`~adafruit_motor.servo.Servo```. You must also add the refer
 Use ``adafruit_register`` when possible
 --------------------------------------------------------------------------------
 `Register `_ is
-a foundational library that manages packing and unpacking data from device
-registers. When possible, use it for unpacking and packing registers. This
-ensures the packing code is shared amongst all registers. Furthermore, it
-simplifies device definitions by making them declarative (only data.)
+a foundational library that manages packing and unpacking data from I2C device
+registers. There is also `Register SPI `_
+for SPI devices. When possible, use one of these libraries for unpacking and
+packing registers. This ensures the packing code is shared amongst all
+registers (even across drivers). Furthermore, it simplifies device definitions
+by making them declarative (only data.)
+
+Values with non-consecutive bits in a register or that represent FIFO endpoints
+may not map well to existing register classes. In unique cases like these, it is
+ok to read and write the register directly.
 
 *Do not* add all registers from a datasheet upfront. Instead, only add the ones
 necessary for the functionality the driver exposes. Adding them all will lead to

From f1053fb963f272e3d3bfdfa56aa623956c458cec Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 Aug 2022 11:25:34 -0700
Subject: [PATCH 0838/2403] Introduce port_yield()

This allows the web workflow send code to yield briefly when
waiting for more room to send in a socket. Waiting for an "interrupt"
could wait forever because the select task only waits for read and
error. Adding wait on write is tricky because much of the time we
don't care if the sockets are ready to write. Using yield avoids
this trickiness.
---
 ports/espressif/supervisor/port.c             | 10 +++++++---
 supervisor/port.h                             |  5 +++++
 supervisor/shared/port.c                      |  3 +++
 supervisor/shared/web_workflow/web_workflow.c |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 1bb8999274..3106f4b991 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -345,9 +345,6 @@ void reset_port(void) {
 
     reset_all_pins();
 
-    // A larger delay so the idle task can run and do any IDF cleanup needed.
-    vTaskDelay(4);
-
     #if CIRCUITPY_ANALOGIO
     analogout_reset();
     #endif
@@ -402,6 +399,9 @@ void reset_port(void) {
     #if CIRCUITPY_WATCHDOG
     watchdog_reset();
     #endif
+
+    // Yield so the idle task can run and do any IDF cleanup needed.
+    port_yield();
 }
 
 void reset_to_bootloader(void) {
@@ -492,6 +492,10 @@ void port_wake_main_task_from_isr() {
     }
 }
 
+void port_yield() {
+    vTaskDelay(4);
+}
+
 void sleep_timer_cb(void *arg) {
     port_wake_main_task();
 }
diff --git a/supervisor/port.h b/supervisor/port.h
index 0d6862fae8..554baca2a4 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -109,6 +109,11 @@ void port_wake_main_task(void);
 // default weak implementation is provided that does nothing.
 void port_wake_main_task_from_isr(void);
 
+// Some ports may use real RTOS tasks besides the background task framework of
+// CircuitPython. Calling this will yield to other tasks and then return to the
+// CircuitPython task when others are done.
+void port_yield(void);
+
 // Some ports need special handling just after completing boot.py execution.
 // This function is called once while boot.py's VM is still valid, and
 // then a second time after the VM is finalized.
diff --git a/supervisor/shared/port.c b/supervisor/shared/port.c
index 5d4eeea093..e78e6a931a 100644
--- a/supervisor/shared/port.c
+++ b/supervisor/shared/port.c
@@ -31,3 +31,6 @@ MP_WEAK void port_wake_main_task(void) {
 
 MP_WEAK void port_wake_main_task_from_isr(void) {
 }
+
+MP_WEAK void port_yield(void) {
+}
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 0510e5760c..1144d41bdc 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -334,7 +334,7 @@ void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf,
             total_sent += sent;
             if (total_sent < len) {
                 // Yield so that network code can run.
-                port_idle_until_interrupt();
+                port_yield();
             }
         }
     }

From 3dc0290e561ed4254c35a2090c3ebc811a4017cd Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 Aug 2022 12:23:25 -0700
Subject: [PATCH 0839/2403] Don't reload or enter repl when autoreloading

A keypress while we waited for autoreload used to enter repl. Now
it won't.

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

diff --git a/main.c b/main.c
index 12de1b6c0e..de2a28271c 100644
--- a/main.c
+++ b/main.c
@@ -543,7 +543,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
         }
 
         // If interrupted by keyboard, return
-        if (serial_connected() && serial_bytes_available()) {
+        if (serial_connected() && serial_bytes_available() && !autoreload_pending()) {
             // Skip REPL if reload was requested.
             skip_repl = serial_read() == CHAR_CTRL_D;
             if (skip_repl) {

From df1435ae9434c843dd2fabd49b510843b45ff9fa Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 Aug 2022 14:41:20 -0700
Subject: [PATCH 0840/2403] Audit all boards with LED pins defined

Add them as MICROPY_HW_LED_STATUS so that we can share reset code
for them. They aren't actually used for the status if another RGB
option is available. (But maybe they should be.)

Fixes #6717
---
 .../adafruit_esp32s2_camera/mpconfigboard.h     |  2 ++
 .../boards/adafruit_feather_esp32_v2/board.c    | 12 ------------
 .../adafruit_feather_esp32_v2/mpconfigboard.h   |  2 ++
 .../adafruit_feather_esp32s2/mpconfigboard.h    |  2 ++
 .../boards/adafruit_feather_esp32s2_tft/board.c | 12 ------------
 .../mpconfigboard.h                             |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../boards/adafruit_funhouse/mpconfigboard.h    |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../adafruit_metro_esp32s2/mpconfigboard.h      |  2 ++
 .../boards/beetle-esp32-c3/mpconfigboard.h      |  2 +-
 .../boards/crumpspace_crumps2/mpconfigboard.h   |  4 ++++
 .../mpconfigboard.h                             |  3 ++-
 .../electroniccats_bastwifi/mpconfigboard.h     |  2 ++
 .../boards/espressif_esp32_eye/board.c          | 15 +++++++++++++++
 .../boards/espressif_esp32_eye/mpconfigboard.h  |  2 ++
 .../boards/espressif_esp32s3_eye/pins.c         |  1 -
 .../boards/gravitech_cucumber_m/mpconfigboard.h |  3 +++
 .../gravitech_cucumber_ms/mpconfigboard.h       |  3 +++
 .../boards/gravitech_cucumber_r/mpconfigboard.h |  3 +++
 .../gravitech_cucumber_rs/mpconfigboard.h       |  3 +++
 ports/espressif/boards/hexky_s2/mpconfigboard.h |  2 +-
 .../espressif/boards/lilygo_ttgo_t-01c3/board.c | 16 ----------------
 .../boards/lilygo_ttgo_t-oi-plus/board.c        | 16 ----------------
 .../boards/lolin_s2_mini/mpconfigboard.h        |  2 ++
 .../boards/lolin_s2_pico/mpconfigboard.h        |  2 ++
 .../boards/microdev_micro_c3/mpconfigboard.h    |  4 +++-
 .../espressif/boards/microdev_micro_s2/board.c  | 11 -----------
 .../boards/microdev_micro_s2/mpconfigboard.h    |  4 +++-
 .../odt_pixelwing_esp32_s2/mpconfigboard.h      |  2 ++
 .../unexpectedmaker_feathers2/mpconfigboard.h   |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../mpconfigboard.h                             |  2 ++
 .../unexpectedmaker_feathers3/mpconfigboard.h   |  2 ++
 .../waveshare_esp32s2_pico/mpconfigboard.h      |  2 +-
 .../espressif/common-hal/microcontroller/Pin.c  | 17 ++++++++++++++---
 39 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
index 793b675784..ae0507fa8b 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
 #define MICROPY_HW_NEOPIXEL_COUNT (6)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
index a76c5da36c..a13c3be4e6 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
@@ -49,17 +49,5 @@ void board_deinit(void) {
 }
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    // Pull LED down on reset rather than the default up
-    if (pin_number == 13) {
-        gpio_config_t cfg = {
-            .pin_bit_mask = BIT64(pin_number),
-            .mode = GPIO_MODE_DISABLE,
-            .pull_up_en = false,
-            .pull_down_en = true,
-            .intr_type = GPIO_INTR_DISABLE,
-        };
-        gpio_config(&cfg);
-        return true;
-    }
     return false;
 }
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
index 104fbfc86d..fc478ef005 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO0)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO2)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define CIRCUITPY_BOARD_I2C         (1)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO20, .sda = &pin_GPIO22}}
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
index 0be1357939..4e7da01b5a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index 68505d37d7..63ad8e44fd 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -141,18 +141,6 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
         gpio_set_level(21, true);
         return true;
     }
-    // Pull LED down on reset rather than the default up
-    if (pin_number == 13) {
-        gpio_config_t cfg = {
-            .pin_bit_mask = BIT64(pin_number),
-            .mode = GPIO_MODE_DISABLE,
-            .pull_up_en = false,
-            .pull_down_en = true,
-            .intr_type = GPIO_INTR_DISABLE,
-        };
-        gpio_config(&cfg);
-        return true;
-    }
     return false;
 }
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
index bafb280014..e9eb3326ea 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO34)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
index 6cbe314f42..b4034568c0 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h
index da623f73be..ecaa13a344 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.h
index b6477c766b..e089c5c251 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h
index f2bf81d3d2..0bc80a884e 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO34)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
 
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.h b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
index a6f46af978..2b2438432e 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
@@ -33,6 +33,8 @@
 #define MICROPY_HW_APA102_SCK (&pin_GPIO15)
 #define MICROPY_HW_APA102_COUNT (5)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO37)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO33)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO34)
 
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
index 9f08ca330c..2892110f6e 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
@@ -34,6 +34,8 @@
 #define CIRCUITPY_STATUS_LED_POWER_INVERTED (1)
 #define MICROPY_HW_NEOPIXEL_COUNT (4)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
index 3d9250bec1..698dc20764 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
@@ -31,6 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO42)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
index 3db8a44463..3b1caff2e9 100644
--- a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
 
 // Status LED
-#define MICROPY_HW_NEOPIXEL         (&pin_GPIO10)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO10)
 
 #define CIRCUITPY_BOARD_I2C         (1)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO9, .sda = &pin_GPIO8}}
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
index ca5d782036..ad0b899c1e 100644
--- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
+++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
@@ -28,3 +28,7 @@
 
 #define MICROPY_HW_BOARD_NAME       "CrumpS2"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_APA102_MOSI (&pin_GPIO40)
+#define MICROPY_HW_APA102_SCK (&pin_GPIO45)
+#define MICROPY_HW_APA102_COUNT (1)
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
index 478a06c70a..28ffad1f37 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
@@ -30,7 +30,8 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S3"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO46)
-#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO13)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
index 229af1c865..bf8c1efa60 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
@@ -28,3 +28,5 @@
 
 #define MICROPY_HW_BOARD_NAME       "BastWiFi"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO14)
diff --git a/ports/espressif/boards/espressif_esp32_eye/board.c b/ports/espressif/boards/espressif_esp32_eye/board.c
index d66ab9e5f1..38efb9e901 100644
--- a/ports/espressif/boards/espressif_esp32_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32_eye/board.c
@@ -44,3 +44,18 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Pull LEDs down on reset rather than the default up
+    if (pin_number == 21 || pin_number == 22) {
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_DISABLE,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
index 63a6f2307e..accf539428 100644
--- a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.h
@@ -29,6 +29,8 @@
 #define MICROPY_HW_BOARD_NAME       "Espressif ESP32-EYE"
 #define MICROPY_HW_MCU_NAME         "ESP32"
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO21)
+
 #define CIRCUITPY_BOARD_I2C         (1)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO23, .sda = &pin_GPIO18}}
 
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/pins.c b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
index defa4e9c52..4b4da0b199 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/pins.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/pins.c
@@ -46,7 +46,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO48) },
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h
index a20ea362f2..fba644553f 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h
@@ -31,5 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
 #define DEFAULT_UART_BUS_TX (&pin_GPIO43)
 #define DEFAULT_UART_BUS_RX (&pin_GPIO44)
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
index 17719c6f40..1fa96a84a6 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
@@ -31,6 +31,9 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO40)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO41)
 
diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
index 53409cf263..07d65735a6 100644
--- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
+++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
@@ -31,5 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
 #define DEFAULT_UART_BUS_TX (&pin_GPIO43)
 #define DEFAULT_UART_BUS_RX (&pin_GPIO44)
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
index ee19f54ca5..1e91421574 100644
--- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
+++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
@@ -31,6 +31,9 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO40)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO41)
 
diff --git a/ports/espressif/boards/hexky_s2/mpconfigboard.h b/ports/espressif/boards/hexky_s2/mpconfigboard.h
index 31dd096beb..f49901332f 100644
--- a/ports/espressif/boards/hexky_s2/mpconfigboard.h
+++ b/ports/espressif/boards/hexky_s2/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO40)
-#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO39)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO39)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c b/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
index deeb8041ea..66246c6f77 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
@@ -15,22 +15,6 @@ bool board_requests_safe_mode(void) {
     return false;
 }
 
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    // Pull LED down on reset rather than the default up
-    if (pin_number == MICROPY_HW_LED_STATUS->number) {
-        gpio_config_t cfg = {
-            .pin_bit_mask = BIT64(pin_number),
-            .mode = GPIO_MODE_DISABLE,
-            .pull_up_en = false,
-            .pull_down_en = true,
-            .intr_type = GPIO_INTR_DISABLE,
-        };
-        gpio_config(&cfg);
-        return true;
-    }
-    return false;
-}
-
 void reset_board(void) {
 }
 
diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
index deeb8041ea..66246c6f77 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
@@ -15,22 +15,6 @@ bool board_requests_safe_mode(void) {
     return false;
 }
 
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    // Pull LED down on reset rather than the default up
-    if (pin_number == MICROPY_HW_LED_STATUS->number) {
-        gpio_config_t cfg = {
-            .pin_bit_mask = BIT64(pin_number),
-            .mode = GPIO_MODE_DISABLE,
-            .pull_up_en = false,
-            .pull_down_en = true,
-            .intr_type = GPIO_INTR_DISABLE,
-        };
-        gpio_config(&cfg);
-        return true;
-    }
-    return false;
-}
-
 void reset_board(void) {
 }
 
diff --git a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.h b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
index c490cd8ceb..e943e70184 100644
--- a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
@@ -29,6 +29,8 @@
 #define MICROPY_HW_BOARD_NAME       "S2Mini"
 #define MICROPY_HW_MCU_NAME         "ESP32S2-S2FN4R2" // from Wemos MP
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO15)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO35) // no I2C labels on S2 Mini, def from Wemos MP
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33) // no I2C labels on S2 Mini, def from Wemos MP
 
diff --git a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.h b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
index 19c41f84e4..a33e6ea4d0 100644
--- a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
@@ -29,6 +29,8 @@
 #define MICROPY_HW_BOARD_NAME       "S2Pico"
 #define MICROPY_HW_MCU_NAME         "ESP32S2-S2FN4R2" // from Wemos MP
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO10)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9) // JST SH Connector Pin 3 NOT STEMMA QT / Feather pinout
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // JST SH Connector Pin 2 NOT STEMMA QT / Feather pinout
 
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
index f5bc8faf0b..6e2bf9d7b8 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
@@ -28,10 +28,12 @@
 #define MICROPY_HW_BOARD_NAME       "MicroDev microC3"
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
 
-// Status LED
+// Status LEDs
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO7)
 #define MICROPY_HW_NEOPIXEL_COUNT   (2)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO8)
+
 // Default bus pins
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO4)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO5)
diff --git a/ports/espressif/boards/microdev_micro_s2/board.c b/ports/espressif/boards/microdev_micro_s2/board.c
index 0a2b17e001..f6983f05a4 100644
--- a/ports/espressif/boards/microdev_micro_s2/board.c
+++ b/ports/espressif/boards/microdev_micro_s2/board.c
@@ -42,17 +42,6 @@ bool board_requests_safe_mode(void) {
     return false;
 }
 
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    // Pin 21 is a high side LED so pull it down to prevent lighting the LED.
-    if (pin_number == 21) {
-        gpio_reset_pin(21);
-        gpio_pullup_dis(21);
-        gpio_pulldown_en(21);
-        return true;
-    }
-    return false;
-}
-
 void reset_board(void) {
 }
 
diff --git a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.h b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
index c9354cabcc..c692c5e664 100644
--- a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
+++ b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
@@ -28,9 +28,11 @@
 #define MICROPY_HW_BOARD_NAME       "MicroDev microS2"
 #define MICROPY_HW_MCU_NAME         "ESP32-S2"
 
-// Status LED
+// Status LEDs
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO33)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO21)
+
 // Default bus pins
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO1)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h
index 9d7a480228..5d6ad95e1b 100644
--- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h
+++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h
@@ -31,5 +31,7 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO21)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
index d10ab94223..ebea0f447b 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -32,6 +32,8 @@
 // #define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
 // #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
index af61a67fbb..aeaf23d248 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO40)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO39)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
index a2fadd85ea..1b11b37d66 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -32,6 +32,8 @@
 // #define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
 // #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO38)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
index a341cf0464..67054b8664 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
@@ -32,6 +32,8 @@
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO40)
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO39)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
index ed9cbffa60..6a10db6061 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
@@ -29,4 +29,4 @@
 #define MICROPY_HW_BOARD_NAME       "Waveshare ESP32-S2-Pico"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO9)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO9)
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 8a09c98d74..127505f0e9 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -130,15 +130,26 @@ STATIC void _reset_pin(gpio_num_t pin_number) {
         return;
     }
 
-    gpio_reset_pin(pin_number);
+    bool pull_down = false;
+
+    // Special case the status LED pin.
+    #if defined(MICROPY_HW_LED_STATUS) && (!defined(MICROPY_HW_LED_STATUS_INVERTED) || !MICROPY_HW_LED_STATUS_INVERTED)
+    pull_down = pull_down || pin_number == MICROPY_HW_LED_STATUS->number;
+    #endif
 
     #ifdef DOUBLE_TAP_PIN
     // Pull the double tap pin down so that resets come back to CircuitPython.
-    if (pin_number == DOUBLE_TAP_PIN->number) {
+    pull_down = pull_down || pin_number == DOUBLE_TAP_PIN->number;
+    #endif
+
+    // This will pull the pin up. For pins needing pull down it shouldn't be a
+    // problem for a moment.
+    gpio_reset_pin(pin_number);
+
+    if (pull_down) {
         gpio_pullup_dis(pin_number);
         gpio_pulldown_en(pin_number);
     }
-    #endif
 }
 
 // Mark pin as free and return it to a quiescent state.

From c3c1e307c47b38a5d3797f27a5c6497b1069c46f Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 11 Aug 2022 17:50:30 -0400
Subject: [PATCH 0841/2403] Sample Rate Enhancements

---
 locale/circuitpython.pot                      |  5 ++
 .../common-hal/analogio/AnalogFastIn.c        | 80 +++++++++----------
 .../common-hal/analogio/AnalogFastIn.h        |  4 +-
 shared-bindings/analogio/AnalogFastIn.c       | 14 ++--
 shared-bindings/analogio/AnalogFastIn.h       |  2 +-
 5 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index c69ea7bdfa..a2e2826cd1 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3863,6 +3863,11 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
+#: shared-bindings/analogio/AnalogFastIn.c
+msgid "sample rate must be 1.0-500000.0 per second"
+msgstr ""
+
+#: shared-bindings/analogio/AnalogFastIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid ""
 "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
index 4acda3d4d5..1d08956bd4 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -29,16 +29,12 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
-
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 #include "src/rp2_common/hardware_dma/include/hardware/dma.h"
-
 //     /sdk/src/rp2_common/hardware_dma/include/hardware/dma.h
-
-// ports/raspberrypi/
+//     ports/raspberrypi/
 #include "sdk/src/common/pico_stdlib/include/pico/stdlib.h"
 
-
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 // Channel 0 is GPIO26
@@ -46,30 +42,7 @@
 #define CAPTURE_DEPTH 1000
 uint8_t capture_buf[CAPTURE_DEPTH];
 
-// ADC unit8 or int8 ??? ---> unint16
-//
-// uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
-//    adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
-//    uint16_t value = adc_read();
-//
-//    // Stretch 12-bit ADC reading to 16-bit range
-//    return (value << 4) | (value >> 8);
-// }
-/*
-typedef struct {
-    mp_obj_base_t base;
-    uint8_t number;
-} mcu_pin_obj_t;
-*/
-
-//    self->pin = pin;
-//    self->buffer = buffer;
-//    self->len = len;
-//    //self->bits_per_sample = bytes_per_sample * 8;
-//    self->samples_signed = samples_signed;
-//    self->sample_rate = sample_rate;
-
-void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
+void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate) {
 
     // Set pin and channel
     self->pin = pin;
@@ -83,7 +56,6 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
 
     // checks on length here
 
-
     // uint8_t bytes_per_sample
     // Set sample rate
     // self->bits_per_sample = bytes_per_sample * 8;
@@ -102,7 +74,7 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
         true,    // Enable DMA data request (DREQ)
         1,       // DREQ (and IRQ) asserted when at least 1 sample present
         false,   // We won't see the ERR bit because of 8 bit reads; disable. // ??
-        true     // Shift each sample to 8 bits when pushing to FIFO // ??
+        false    // Shift each sample to 8 bits when pushing to FIFO // ??
         );
 
     // Divisor of 0 -> full speed. Free-running capture with the divider is
@@ -112,28 +84,28 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
     // continuously) or > 95 (take samples less frequently than 96 cycle
     // intervals). This is all timed by the 48 MHz ADC clock.
     // sample rate determines divisor, not zero.
-    adc_set_clkdiv(0);
+
+    adc_set_clkdiv(48000000.0 / self->sample_rate);
 
     // sleep_ms(1000);
     // Set up the DMA to start transferring data as soon as it appears in FIFO
     uint dma_chan = dma_claim_unused_channel(true);
     self->dma_chan = dma_chan;
-    dma_channel_config cfg = dma_channel_get_default_config(dma_chan);
+
+    // Set Config
+    self->cfg = dma_channel_get_default_config(dma_chan);
 
     // Reading from constant address, writing to incrementing byte addresses
-    channel_config_set_transfer_data_size(&cfg, DMA_SIZE_8);
-    channel_config_set_read_increment(&cfg, false);
-    channel_config_set_write_increment(&cfg, true);
+    channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_16);
+    channel_config_set_read_increment(&(self->cfg), false);
+    channel_config_set_write_increment(&(self->cfg), true);
 
     // Pace transfers based on availability of ADC samples
-    channel_config_set_dreq(&cfg, DREQ_ADC);
+    channel_config_set_dreq(&(self->cfg), DREQ_ADC);
 
-    dma_channel_configure(dma_chan, &cfg,
-        capture_buf,    // dst
-        &adc_hw->fifo,  // src
-        self->len,      // CAPTURE_DEPTH,  // transfer count
-        true            // start immediately
-        );
+    // clear any previous activity
+    adc_fifo_drain();
+    adc_run(false);
 }
 
 
@@ -146,8 +118,12 @@ void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self)
         return;
     }
 
+    // Release ADC Pin
     reset_pin_number(self->pin->number);
     self->pin = NULL;
+
+    // Release DMA Channel
+    dma_channel_unclaim(self->dma_chan);
 }
 
 // ================================================================
@@ -155,15 +131,31 @@ void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self)
 // make this a bool so that later we can perform integrity checking
 // ================================================================
 bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self) {
+
+
+    // CONSIDER THESE ISSUES
     // uint16_t value = adc_read();
     // Stretch 12-bit ADC reading to 16-bit range
     // return (value << 4) | (value >> 8);
+
+    uint32_t cdl = self->len / 2 - 1;
+    dma_channel_configure(self->dma_chan, &(self->cfg),
+        self->buffer,   // dst
+        &adc_hw->fifo,  // src
+        cdl,            // CAPTURE_DEPTH,  // transfer count
+        true            // start immediately
+        );
+
+    // Start the ADC
     adc_run(true);
+
     // Once DMA finishes, stop any new conversions from starting, and clean up
     // the FIFO in case the ADC was still mid-conversion.
     dma_channel_wait_for_finish_blocking(self->dma_chan);
-    // printf("Capture finished\n");
+
+    //  Clean up
     adc_run(false);
     adc_fifo_drain();
+
     return true;
 }
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
index 2853b4fe07..3b8b8f0da9 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
@@ -28,6 +28,7 @@
 #define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
 
 #include "common-hal/microcontroller/Pin.h"
+#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
 
 #include "py/obj.h"
 
@@ -39,9 +40,10 @@ typedef struct {
     uint32_t len;
     uint8_t bytes_per_sample;
     bool samples_signed;
-    uint32_t sample_rate;
+    mp_float_t sample_rate;
     uint8_t chan;
     uint dma_chan;
+    dma_channel_config cfg;
     // data_size       = DMA_SIZE_8;  //                                  - default DMA_SIZE_8
     // data_size       = DMA_SIZE_16;  //                                 - default DMA_SIZE_16
     // Either 12 bits in 16 or 12 over 2 bytes or truncate 12 to 8 in 8
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
index d32e648af3..4fda809e0b 100644
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -37,15 +37,18 @@
 #include "shared-bindings/util.h"
 
 // pin, buffer, rate
-
-
+STATIC void validate_rate(mp_float_t rate) {
+    if (rate < (mp_float_t)1.0f || rate > (mp_float_t)500000.0f) {
+        mp_raise_ValueError(translate("sample rate must be 1.0-500000.0 per second"));
+    }
+}
 
 STATIC mp_obj_t analogio_analogfastin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 8000} },
+        { MP_QSTR_sample_rate, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -69,7 +72,8 @@ STATIC mp_obj_t analogio_analogfastin_make_new(const mp_obj_type_t *type, size_t
     }
 
     // Validate sample rate here
-    uint32_t sample_rate = args[ARG_sample_rate].u_int;
+    mp_float_t sample_rate = mp_obj_get_float(args[ARG_sample_rate].u_obj);
+    validate_rate(sample_rate);
 
     // Create local object
     analogio_analogfastin_obj_t *self = m_new_obj(analogio_analogfastin_obj_t);
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
index 8e6f2070b6..816eaa0d42 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t analogio_analogfastin_type;
 
-void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
+void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate);
 void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self);
 bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self);
 bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self);

From 35aa8e440f66e40b9dab17c32f296b367e943788 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 11 Aug 2022 18:02:05 -0400
Subject: [PATCH 0842/2403] Fixing commits after non rebase

---
 frozen/circuitpython-stage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 9a8338b3bd..f993d5fac6 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac
+Subproject commit f993d5fac69f3a0cfa33988268666c462b72c0ec

From 06f22cb59c493371c8a394680916e76f9fedf604 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 Aug 2022 08:25:27 -0500
Subject: [PATCH 0843/2403] When reading data from a file into a str, check if
 it's utf-8

Otherwise, weird stuff can happen down the line when it is print()ed,
especially as it can break the webrepl of circuitpython.
---
 py/stream.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/py/stream.c b/py/stream.c
index 27609043fc..e7e77341bd 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -31,6 +31,7 @@
 #include "py/objstr.h"
 #include "py/stream.h"
 #include "py/runtime.h"
+#include "py/unicode.h"
 #include "supervisor/shared/translate/translate.h"
 
 // This file defines generic Python stream read/write methods which
@@ -43,6 +44,13 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in);
 
 #define STREAM_CONTENT_TYPE(stream) (((stream)->is_text) ? &mp_type_str : &mp_type_bytes)
 
+static mp_obj_t mp_obj_new_str_from_vstr_check(const mp_obj_type_t *type, vstr_t *vstr) {
+    if (type == &mp_type_str && !utf8_check((void *)vstr->buf, vstr->len)) {
+        mp_raise_msg(&mp_type_UnicodeError, NULL);
+    }
+    return mp_obj_new_str_from_vstr(type, vstr);
+}
+
 // Returns error condition in *errcode, if non-zero, return value is number of bytes written
 // before error condition occurred. If *errcode == 0, returns total bytes written (which will
 // be equal to input size).
@@ -201,8 +209,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
                 }
             }
         }
-
-        return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+        return mp_obj_new_str_from_vstr_check(&mp_type_str, &vstr);
     }
     #endif
 
@@ -223,7 +230,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
         mp_raise_OSError(error);
     } else {
         vstr.len = out_sz;
-        return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+        return mp_obj_new_str_from_vstr_check(STREAM_CONTENT_TYPE(stream_p), &vstr);
     }
 }
 
@@ -364,7 +371,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
     }
 
     vstr.len = total_size;
-    return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+    return mp_obj_new_str_from_vstr_check(STREAM_CONTENT_TYPE(stream_p), &vstr);
 }
 
 // Unbuffered, inefficient implementation of readline() for raw I/O files.
@@ -417,7 +424,7 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)
         }
     }
 
-    return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+    return mp_obj_new_str_from_vstr_check(STREAM_CONTENT_TYPE(stream_p), &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj, 1, 2, stream_unbuffered_readline);
 

From 606c75ab62491c6620c6f75c9f5b88157b9736d6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 Aug 2022 08:34:33 -0500
Subject: [PATCH 0844/2403] test must read data in binary mode

---
 tests/extmod/qrio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/extmod/qrio.py b/tests/extmod/qrio.py
index 5e9ed4c12a..53c83706f8 100644
--- a/tests/extmod/qrio.py
+++ b/tests/extmod/qrio.py
@@ -5,7 +5,7 @@ except:
     raise SystemExit
 
 loc = __file__.rsplit("/", 1)[0]
-with open(f"{loc}/data/qr.pgm") as f:
+with open(f"{loc}/data/qr.pgm", "rb") as f:
     content = f.read()[-320 * 240 :]
 
 decoder = qrio.QRDecoder(320, 240)

From 81c7ba899d90aa06b752398b6eb7eca72b09f5d4 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Fri, 12 Aug 2022 13:57:45 -0400
Subject: [PATCH 0845/2403] Copyright Update/Acknowledgements

---
 .../common-hal/analogio/AnalogFastIn.c        |  4 ++-
 .../common-hal/analogio/AnalogFastIn.h        | 26 +++----------------
 shared-bindings/analogio/AnalogFastIn.c       |  3 ++-
 shared-bindings/analogio/AnalogFastIn.h       |  3 ++-
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
index 1d08956bd4..d1145bb4fb 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
+ * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
index 3b8b8f0da9..87508949e6 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
+ * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -44,30 +46,8 @@ typedef struct {
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
-    // data_size       = DMA_SIZE_8;  //                                  - default DMA_SIZE_8
-    // data_size       = DMA_SIZE_16;  //                                 - default DMA_SIZE_16
-    // Either 12 bits in 16 or 12 over 2 bytes or truncate 12 to 8 in 8
-    // Either B or H, default array.array("h", [0]*length) "h"==short (16 bits signed)
 } analogio_analogfastin_obj_t;
 
-// void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate)
-/*
-void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self,
-    const mcu_pin_obj_t *pin,
-    uint8_t *buffer,
-    uint32_t len,
-    uint8_t bytes_per_sample,
-    bool samples_signed,
-    uint32_t sample_rate) {
-    self->pin = pin;
-    self->buffer = buffer;
-    self->len = len;
-    //self->bits_per_sample = bytes_per_sample * 8;
-    self->samples_signed = samples_signed;
-    self->sample_rate = sample_rate;
-}
-*/
-
 void analogfastin_init(void);
 
 #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
index 4fda809e0b..602abf67ed 100644
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * Taken from AnalogIn by 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
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
index 816eaa0d42..04ab0644f1 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * Taken from AnalogIn by 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

From 8cd12b2478f8bf95a18794f46618a47b2a53ac50 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Fri, 12 Aug 2022 16:01:58 -0400
Subject: [PATCH 0846/2403] Copyright Change

---
 ports/raspberrypi/common-hal/analogio/AnalogFastIn.c | 2 +-
 ports/raspberrypi/common-hal/analogio/AnalogFastIn.h | 2 +-
 shared-bindings/analogio/AnalogFastIn.c              | 2 +-
 shared-bindings/analogio/AnalogFastIn.h              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
index d1145bb4fb..68ca742cdd 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
  * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
  * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
  *
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
index 87508949e6..343579fb47 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
  * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
  * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
  *
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
index 602abf67ed..3eb6ce5d1d 100644
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
  * Taken from AnalogIn by Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
index 04ab0644f1..e2b83647c7 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
  * Taken from AnalogIn by Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

From 1ae2a2154e2ac29bfb725839c95344d5d5b96509 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 13 Aug 2022 17:00:43 -0500
Subject: [PATCH 0847/2403] Initial i2ctaret commit

---
 .../common-hal/i2ctarget/I2CTarget.c          | 155 ++++++++++++++++++
 .../common-hal/i2ctarget/I2CTarget.h          |  46 ++++++
 .../common-hal/i2ctarget/__init__.c           |   1 +
 ports/raspberrypi/mpconfigport.mk             |   2 +-
 4 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 create mode 100644 ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h
 create mode 100644 ports/raspberrypi/common-hal/i2ctarget/__init__.c

diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
new file mode 100644
index 0000000000..70e0dd4639
--- /dev/null
+++ b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -0,0 +1,155 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Mark Komus, Ken Stillson, im-redactd
+ *
+ * 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/i2ctarget/I2CTarget.h"
+
+#include "common-hal/busio/I2C.h"
+
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "shared-bindings/busio/I2C.h"
+#include "py/runtime.h"
+
+#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+
+STATIC i2c_inst_t *i2c[2] = {i2c0, i2c1};
+
+#define NO_PIN 0xff
+
+void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
+    uint8_t *addresses, unsigned int num_addresses, bool smbus) {
+    self->peripheral = NULL;
+
+    // I2C pins have a regular pattern. SCL is always odd and SDA is even. They match up in pairs
+    // so we can divide by two to get the instance. This pattern repeats.
+    size_t scl_instance = (scl->number / 2) % 2;
+    size_t sda_instance = (sda->number / 2) % 2;
+    if (scl->number % 2 == 1 && sda->number % 2 == 0 && scl_instance == sda_instance) {
+        self->peripheral = i2c[sda_instance];
+    }
+
+    if (self->peripheral == NULL) {
+        raise_ValueError_invalid_pins();
+    }
+
+    if ((i2c_get_hw(self->peripheral)->enable & I2C_IC_ENABLE_ENABLE_BITS) != 0) {
+        mp_raise_ValueError(translate("I2C peripheral in use"));
+    }
+
+    if (num_addresses > 1) {
+        mp_raise_ValueError(translate("Only one address is allowed"));
+    }
+
+    self->addresses = addresses;
+    self->num_addresses = num_addresses;
+    self->scl_pin = scl->number;
+    self->sda_pin = sda->number;
+
+    // Have to specify a baudrate even if the i2c target does not use it
+    const uint32_t frequency = 400000;
+    i2c_init(self->peripheral, frequency);
+
+    gpio_set_function(sda->number, GPIO_FUNC_I2C);
+    gpio_set_function(scl->number, GPIO_FUNC_I2C);
+
+    gpio_set_pulls(sda->number, true, false);
+    gpio_set_pulls(scl->number, true, false);
+
+    self->peripheral->hw->intr_mask |= I2C_IC_INTR_MASK_M_RESTART_DET_BITS;
+    i2c_set_slave_mode(self->peripheral, true, self->addresses[0]);
+
+    return;
+}
+
+bool common_hal_i2ctarget_i2c_target_deinited(i2ctarget_i2c_target_obj_t *self) {
+    return self->sda_pin == NO_PIN;
+}
+
+void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self) {
+    if (common_hal_i2ctarget_i2c_target_deinited(self)) {
+        return;
+    }
+
+    i2c_deinit(self->peripheral);
+
+    reset_pin_number(self->sda_pin);
+    reset_pin_number(self->scl_pin);
+    self->sda_pin = NO_PIN;
+    self->scl_pin = NO_PIN;
+
+    return;
+}
+
+static int i2c_peripheral_check_error(i2ctarget_i2c_target_obj_t *self, bool raise) {
+    return 0;
+}
+
+int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart) {
+    if (!((self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_RX_FULL_BITS) || (self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_RD_REQ_BITS))) {
+        return 0;
+    }
+
+    *address = self->peripheral->hw->sar;
+    *is_read = !(self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_RX_FULL_BITS);
+    *is_restart = ((self->peripheral->hw->raw_intr_stat & I2C_IC_RAW_INTR_STAT_RD_REQ_RESET) != 0);
+
+    common_hal_i2ctarget_i2c_target_ack(self, true);
+    return 1;
+}
+
+int common_hal_i2ctarget_i2c_target_read_byte(i2ctarget_i2c_target_obj_t *self, uint8_t *data) {
+    if (self->peripheral->hw->status & I2C_IC_STATUS_RFNE_BITS) {
+        *data = (uint8_t)self->peripheral->hw->data_cmd;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+int common_hal_i2ctarget_i2c_target_write_byte(i2ctarget_i2c_target_obj_t *self, uint8_t data) {
+    if (self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_TX_ABRT_BITS) {
+        self->peripheral->hw->clr_tx_abrt;
+    }
+
+    const size_t IC_TX_BUFFER_DEPTH = 16;
+    size_t space = IC_TX_BUFFER_DEPTH - self->peripheral->hw->txflr;
+
+    if (space > 0) {
+        self->peripheral->hw->data_cmd = data;
+        self->peripheral->hw->clr_rd_req;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+void common_hal_i2ctarget_i2c_target_ack(i2ctarget_i2c_target_obj_t *self, bool ack) {
+    return;
+}
+
+void common_hal_i2ctarget_i2c_target_close(i2ctarget_i2c_target_obj_t *self) {
+    return;
+}
diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h
new file mode 100644
index 0000000000..b47c51fbbb
--- /dev/null
+++ b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Mark Komus, Ken Stillson, im-redactd
+ *
+ * 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_RPI_COMMON_HAL_I2C_TARGET_H
+#define MICROPY_INCLUDED_RPI_COMMON_HAL_I2C_TARGET_H
+
+#include "py/obj.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
+
+typedef struct {
+    mp_obj_base_t base;
+
+    uint8_t *addresses;
+    unsigned int num_addresses;
+
+    i2c_inst_t *peripheral;
+
+    uint8_t scl_pin;
+    uint8_t sda_pin;
+} i2ctarget_i2c_target_obj_t;
+
+#endif MICROPY_INCLUDED_RPI_COMMON_HAL_BUSIO_I2C_TARGET_H
diff --git a/ports/raspberrypi/common-hal/i2ctarget/__init__.c b/ports/raspberrypi/common-hal/i2ctarget/__init__.c
new file mode 100644
index 0000000000..4ec26465ad
--- /dev/null
+++ b/ports/raspberrypi/common-hal/i2ctarget/__init__.c
@@ -0,0 +1 @@
+// No i2ctarget module functions.
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 1c4de50c00..ac11bafcb6 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -20,7 +20,7 @@ CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 # Things that need to be implemented.
 # Use PWM interally
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_I2CTARGET = 1
 CIRCUITPY_NVM = 1
 # Use PIO interally
 CIRCUITPY_PULSEIO ?= 1

From 7584363f660690d989b053583e0c0a98a4d38bb5 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 13 Aug 2022 17:41:45 -0500
Subject: [PATCH 0848/2403] Forgot an include

---
 ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
index 70e0dd4639..43cb43a9f9 100644
--- a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
+++ b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -31,6 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "shared-bindings/busio/I2C.h"
+#include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"

From 2f2ccdddbf0527a1696aa2a43847d89e5f0a20d3 Mon Sep 17 00:00:00 2001
From: lady ada 
Date: Sat, 13 Aug 2022 23:41:35 -0400
Subject: [PATCH 0849/2403] pycam rev b pins

---
 .../boards/adafruit_esp32s2_camera/board.c          |  8 ++++----
 .../boards/adafruit_esp32s2_camera/mpconfigboard.h  |  4 ++--
 .../espressif/boards/adafruit_esp32s2_camera/pins.c | 13 ++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
index 8e7c62ed37..afc1ad081c 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
@@ -56,9 +56,9 @@ void board_init(void) {
     bus->base.type = &displayio_fourwire_type;
     common_hal_displayio_fourwire_construct(bus,
         spi,
-        &pin_GPIO39, // TFT_DC Command or data
-        &pin_GPIO40, // TFT_CS Chip select
-        &pin_GPIO41, // TFT_RESET Reset
+        &pin_GPIO40, // TFT_DC Command or data
+        &pin_GPIO39, // TFT_CS Chip select
+        &pin_GPIO38, // TFT_RESET Reset
         40000000, // Baudrate
         0, // Polarity
         0); // Phase
@@ -87,7 +87,7 @@ void board_init(void) {
         MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
         display_init_sequence,
         sizeof(display_init_sequence),
-        &pin_GPIO38,  // backlight pin
+        &pin_GPIO41,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
         1.0f, // brightness
         false, // single_byte_bounds
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
index ae0507fa8b..64ab1b966d 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
@@ -30,9 +30,9 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
-#define MICROPY_HW_NEOPIXEL_COUNT (6)
+#define MICROPY_HW_NEOPIXEL_COUNT (1)
 
-#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO1)
 
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/pins.c b/ports/espressif/boards/adafruit_esp32s2_camera/pins.c
index 688a555b02..5de2d800aa 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/pins.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/pins.c
@@ -24,13 +24,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO38) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO39) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO40) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO38) },
 
-    { MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_CARD_POWER), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_IRQ), MP_ROM_PTR(&pin_GPIO3) },
 
@@ -39,7 +38,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO45) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO1) },
 
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },

From 86dd4c53aa4797357207214820eee021dbd938e0 Mon Sep 17 00:00:00 2001
From: Can Kocyigit 
Date: Sat, 13 Aug 2022 11:52:04 +0000
Subject: [PATCH 0850/2403] Translated using Weblate (German)

Currently translated at 99.9% (1002 of 1003 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 125 ++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 2ce09bd00f..1db73613e8 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-05-20 19:25+0000\n"
-"Last-Translator: Fabian Affolter \n"
+"PO-Revision-Date: 2022-08-14 12:14+0000\n"
+"Last-Translator: Can Kocyigit \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.13-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -82,7 +82,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -90,7 +90,7 @@ msgstr "%q und %q enthalten doppelte Pins"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q und %q müssen unterschiedlich sein"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
@@ -114,11 +114,11 @@ msgstr "%q Indizes müssen Integer sein, nicht %s"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q Initialisierung ist gescheitert"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q länge muss %d betragen"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
@@ -126,11 +126,11 @@ msgstr "%q Länge muss %d-%d sein"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q länge muss kleiner oder gleich %d sein"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q länge muss größer oder gleich %d sein"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
@@ -138,7 +138,7 @@ msgstr "%q Länge muss >= 1 sein"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q muss %d entsprechen"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
@@ -170,7 +170,7 @@ msgstr "%q muss ein String sein"
 
 #: py/argcheck.c
 msgid "%q must be an int"
-msgstr ""
+msgstr "%q muss vom Typ Integer sein"
 
 #: py/argcheck.c
 msgid "%q must be of type %q"
@@ -216,7 +216,7 @@ msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
@@ -413,7 +413,7 @@ msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "Alle I2C-Ziele sind in Verwendung"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -668,7 +668,7 @@ msgstr "Rufe super().__init__() vor dem Zugriff auf ein natives Objekt auf."
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "Kamera Initialiserung"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
@@ -736,7 +736,7 @@ msgstr "'/' kann nicht wiedereingehängt werden, wenn per USB sichtbar."
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
+msgstr "Kann nicht in den Bootloader resetten, weil keiner vorhanden ist"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -757,7 +757,7 @@ msgstr "Slice kann keine sub-klasse sein"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "Kann nicht ohne MISO und MOSI Pins transferieren"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
@@ -765,8 +765,9 @@ msgstr ""
 "Die Frequenz eines bereits verwendeten Timers kann nicht variiert werden"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
+#, fuzzy
 msgid "Cannot wake on pin edge, only level"
-msgstr ""
+msgstr "Kann nicht durch \"Pin edge\" geweckt werden nur durch \"level\""
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -884,7 +885,7 @@ msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Fertig"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -959,7 +960,7 @@ msgstr "Mutex konnte nicht akquiriert werden. Status: 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
-msgstr ""
+msgstr "Allokieren des %q Buffers ist fehlgeschlagen"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
@@ -1045,7 +1046,7 @@ msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "GNSS Initialisierung"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1080,7 +1081,7 @@ msgstr "Lese/Schreibe-operation an geschlossener Datei"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "I2C Initialisierungsfehler"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 msgid "I2C peripheral in use"
@@ -1195,7 +1196,7 @@ msgstr "Interner Fehler #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Der Interne WatchDog Timer ist abgelaufen."
 
 #: py/argcheck.c
 msgid "Invalid %q"
@@ -1278,11 +1279,11 @@ msgstr "LHS des Schlüsselwortarguments muss eine id sein"
 
 #: shared-module/displayio/Group.c
 msgid "Layer already in a group"
-msgstr ""
+msgstr "Ebene ist bereits in der Gruppe"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "Ebene muss eine Gruppe oder eine TileGrid Subklasse sein"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
@@ -1317,7 +1318,7 @@ msgstr "Fehlender MISO- oder MOSI-Pin"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "MISO oder MOSI Pin fehlt"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1415,7 +1416,7 @@ msgstr "Kein I2C-Gerät an Adresse: 0x%x"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "Keine IP"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1424,7 +1425,7 @@ msgstr "Kein MISO-Pin"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "Miso Pin fehlt"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1433,7 +1434,7 @@ msgstr "Kein MOSI-Pin"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "MOSI Pin fehlt"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
@@ -1574,11 +1575,11 @@ msgstr "Eine ungerade Parität wird nicht unterstützt"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Aus"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1634,7 +1635,7 @@ msgstr "Nur eine Adresse ist erlaubt"
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set"
-msgstr ""
+msgstr "Nur ein alarm.time Alarm kann gesetzt werden"
 
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1684,7 +1685,7 @@ msgstr "Die PWM-Frequenz ist nicht schreibbar, wenn variable_Frequenz = False."
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "PWM restart"
-msgstr ""
+msgstr "PWM Neustart"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "PWM slice already in use"
@@ -1810,7 +1811,7 @@ msgstr "RNG Init-Fehler"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
-msgstr ""
+msgstr "RS485"
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -1844,7 +1845,7 @@ msgstr "Erhaltene Antwort ist ungültig"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Wiederherstellung der Verbindungen"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
@@ -1876,7 +1877,7 @@ msgstr "SD-Card CSD-Format nicht unterstützt"
 
 #: ports/cxd56/common-hal/sdioio/SDCard.c
 msgid "SDCard init"
-msgstr ""
+msgstr "SDCard Initialisierung"
 
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
@@ -1894,7 +1895,7 @@ msgstr "SPI-Konfiguration fehlgeschlagen"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI init error"
-msgstr ""
+msgstr "SPI Initialisierungsfehler"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -1902,7 +1903,7 @@ msgstr "SPI-Peripheriegeräte wird bereits verwendet"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI re-init"
-msgstr ""
+msgstr "SPI wird erneut initialisiert"
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "Scale dimensions must divide by 3"
@@ -2075,7 +2076,7 @@ msgstr "Zum beenden, resette bitte das board ohne "
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
-msgstr ""
+msgstr "Zu viele Kanäle im Beispiel"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
@@ -2110,20 +2111,20 @@ msgstr "Tuple- oder struct_time-Argument erforderlich"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART de-init"
-msgstr ""
+msgstr "UART wird de-initialisiert"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "UART init"
-msgstr ""
+msgstr "UART Initialisierung"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr ""
+msgstr "UART wird wieder Initialisiert"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
-msgstr ""
+msgstr "UART wird geschrieben"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
@@ -2277,7 +2278,7 @@ msgstr "Nicht unterstütztes Format"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Hash Algorithmus wird nicht unterstützt"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2349,7 +2350,7 @@ msgstr ""
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "Wi-Fi: "
-msgstr ""
+msgstr "Wi-Fi: "
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -2446,7 +2447,7 @@ msgstr "Array- und Indexlänge müssen gleich sein"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "Das Array hat zu viele Dimensionen"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2565,7 +2566,7 @@ msgstr "Kalibrierung ist Schreibgeschützt"
 #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c
 #: shared-module/vectorio/Rectangle.c
 msgid "can only have one parent"
-msgstr ""
+msgstr "kann nur ein Elternteil haben"
 
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
@@ -2745,7 +2746,7 @@ msgstr "Umwandlung (cast)"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "channel re-init"
-msgstr ""
+msgstr "Kanal wird erneut initialisiert"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
@@ -2827,7 +2828,7 @@ msgstr "Convolve Argumente dürfen nicht leer sein"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "Korrupte Datei"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2924,7 +2925,7 @@ msgstr "leer"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "Leere Datei"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3199,7 +3200,7 @@ msgstr "Indizes müssen Integer, Slices oder Boolesche Listen sein"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "init I2C"
-msgstr ""
+msgstr "initialisiere I2C"
 
 #: extmod/ulab/code/scipy/optimize/optimize.c
 msgid "initial values must be iterable"
@@ -3248,7 +3249,7 @@ msgstr "Eingabematrix ist singulär"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "Eingabe muss 1- oder 2-d sein"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3340,7 +3341,7 @@ msgstr "ungültiger micropython decorator"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "Invalide Einstellung"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
@@ -3470,7 +3471,7 @@ msgstr "max_length muss 0-%d sein, wenn fixed_length %s ist"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "Maximale Anzahl an Dimensionen ist "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3717,7 +3718,7 @@ msgstr "String mit ungerader Länge"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "off"
-msgstr ""
+msgstr "aus"
 
 #: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
@@ -3874,15 +3875,15 @@ msgstr "pow() mit 3 Argumenten erfordert Integer"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 msgid "pressing BOOT button at start up.\n"
-msgstr ""
+msgstr "BOOT Taste wird beim Starten gedrückt.\n"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "SW38 Taste wird beim Starten gedrückt.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "pressing VOLUME button at start up.\n"
-msgstr ""
+msgstr "VOLUME Taste wird beim Starten gedrückt.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
@@ -4153,7 +4154,7 @@ msgstr "Zeitlimit beim warten auf v2 Karte"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr ""
+msgstr "Timer wird neu initialisiert"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"
@@ -4329,11 +4330,11 @@ msgstr "nicht unterstützte Typen für %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols ist zu hoch/groß"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "usecols muss definiert sein"
 
 #: py/objint.c
 #, c-format
@@ -4378,7 +4379,7 @@ msgstr "falsche Achse gewählt"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "Falsches dtype"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4396,7 +4397,7 @@ msgstr "falsche Länge des Array von Bedingungen"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "Falsche Länge des Index Arrays"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From 787bfd5b6eab91107980a3a9b90d3201ba7d5002 Mon Sep 17 00:00:00 2001
From: Can Kocyigit 
Date: Sat, 13 Aug 2022 11:57:16 +0000
Subject: [PATCH 0851/2403] Translated using Weblate (Turkish)

Currently translated at 12.1% (122 of 1003 strings)

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

diff --git a/locale/tr.po b/locale/tr.po
index 987ef716b6..bc0d4175a6 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-04-19 17:07+0000\n"
-"Last-Translator: Siyabend Ürün \n"
+"PO-Revision-Date: 2022-08-14 12:14+0000\n"
+"Last-Translator: Can Kocyigit \n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "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.12-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -86,7 +86,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -94,7 +94,7 @@ msgstr "%q ve %q yinelenen pinler içeriyor"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q ve %q farklı olmalılar"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"

From 4542c801b04a773b0a3daa9bff2e319d0c45fb07 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sun, 14 Aug 2022 13:03:33 -0400
Subject: [PATCH 0852/2403] Tidying up loose endson draft PR

---
 .../common-hal/analogio/AnalogFastIn.c        |  7 ++--
 ports/raspberrypi/mpconfigport.mk             |  3 ++
 py/circuitpy_defns.mk                         |  2 ++
 shared-bindings/analogio/AnalogFastIn.c       | 32 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
index 68ca742cdd..bc72e940d1 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
@@ -39,15 +39,12 @@
 
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
-// Channel 0 is GPIO26
-#define CAPTURE_CHANNEL 0
-#define CAPTURE_DEPTH 1000
-uint8_t capture_buf[CAPTURE_DEPTH];
 
 void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate) {
 
     // Set pin and channel
     self->pin = pin;
+    claim_pin(pin);
     self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
 
     // Checks on chan value here
@@ -70,6 +67,7 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
     adc_init();
     adc_gpio_init(pin->number);
     adc_select_input(self->chan); // chan = pin - 26 ??
+
     // adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
     adc_fifo_setup(
         true,    // Write each completed conversion to the sample FIFO
@@ -108,6 +106,7 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
     // clear any previous activity
     adc_fifo_drain();
     adc_run(false);
+
 }
 
 
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 1c4de50c00..1ef4fa45ff 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -26,6 +26,9 @@ CIRCUITPY_NVM = 1
 CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
+# Use of analogio
+CIRCUITPYTHON_ANALOGFASTIN = 1
+
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO ?= 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 7ee6c17588..5c5f05ca3a 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -390,7 +390,9 @@ SRC_COMMON_HAL_ALL = \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
 	analogio/AnalogIn.c \
+#ifdef CIRCUITPYTHON_ANALOGFASTIN
 	analogio/AnalogFastIn.c \
+#endif
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
 	audiobusio/I2SOut.c \
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
index 3eb6ce5d1d..e489fa497e 100644
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ b/shared-bindings/analogio/AnalogFastIn.c
@@ -37,7 +37,37 @@
 #include "shared-bindings/analogio/AnalogFastIn.h"
 #include "shared-bindings/util.h"
 
-// pin, buffer, rate
+
+
+//| class AnalogFastIn:
+//|     """Read analog voltage levels quickly using DMA Capture"""
+//|
+//|     def __init__(self, pin: microcontroller.Pin, buffer: ReadableBuffer, *, sample_rate: int = 500000) -> None:
+//|         """Use the AnalogFastIn on the given pin. Fill the given buffer from ADC read values at the supplied
+///         sample_rate.
+///
+//|         :param ~microcontroller.Pin pin: the pin to read from"""
+//|         :param ~circuitpython_typing.WriteableBuffer buffer: A buffer for samples
+//|         :param int sample_rate: The desired playback sample rate
+///
+//|     Usage::
+///
+//|       import board
+//|       import analogio
+//|       import array
+///
+//|       length = 1000
+//|       mybuffer = array.array("H", [0] * length)
+//|       fadc = analogio.AnalogFastIn(board.GP26, mybuffer)
+//|       fadc.capture()
+//|       fadc.deinit()
+//|       for i in range(length):
+//|           print(i, mybuffer[i])
+///
+///       (Future) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
+///       """
+//|         ...
+///
 STATIC void validate_rate(mp_float_t rate) {
     if (rate < (mp_float_t)1.0f || rate > (mp_float_t)500000.0f) {
         mp_raise_ValueError(translate("sample rate must be 1.0-500000.0 per second"));

From b2c6bcdf6d421295936f569786d191eb26d3c8e1 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sun, 14 Aug 2022 14:22:22 -0400
Subject: [PATCH 0853/2403] Fixing py/circuitpy_defns.mk

---
 py/circuitpy_defns.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 5c5f05ca3a..5fc6b1fa16 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -390,9 +390,6 @@ SRC_COMMON_HAL_ALL = \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
 	analogio/AnalogIn.c \
-#ifdef CIRCUITPYTHON_ANALOGFASTIN
-	analogio/AnalogFastIn.c \
-#endif
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
 	audiobusio/I2SOut.c \
@@ -482,6 +479,13 @@ SRC_C += \
 
 endif
 
+ifeq ($(CIRCUITPYTHON_ANALOGFASTIN),1)
+# Needed for AnalogFastIn
+SRC_COMMON_HAL_ALL += \
+	analogio/AnalogFastIn.c \
+
+endif
+
 
 SRC_COMMON_HAL = $(filter $(SRC_PATTERNS), $(SRC_COMMON_HAL_ALL))
 

From c53c1c0927601209fec40fbb5ed77f086a9fd7ca Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sun, 14 Aug 2022 18:49:59 -0400
Subject: [PATCH 0854/2403] Adding py/circuitpy_mpconfig.mk

---
 py/circuitpy_mpconfig.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 90bf0ce9e8..f391128fd3 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -65,6 +65,9 @@ CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
+CIRCUITPY_ANALOGFASTIN ?= 0
+CFLAGS += -DCIRCUITPY_ANALOGFASTIN=$(CIRCUITPY_ANALOGFASTIN)
+
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ATEXIT=$(CIRCUITPY_ATEXIT)
 

From 3a45a8eae6882e2efb1b27ea1132037c84cb2fbb Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Mon, 15 Aug 2022 07:52:34 -0400
Subject: [PATCH 0855/2403] Adding ifdef in __init__.c

---
 shared-bindings/analogio/__init__.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index 0033b2a66d..c4cca3c51d 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -32,9 +32,12 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/analogio/__init__.h"
 #include "shared-bindings/analogio/AnalogIn.h"
-#include "shared-bindings/analogio/AnalogFastIn.h"
 #include "shared-bindings/analogio/AnalogOut.h"
 
+#ifdef CIRCUITPY_ANALOGFASTIN
+#include "shared-bindings/analogio/AnalogFastIn.h"
+#endif
+
 //| """Analog hardware support
 //|
 //| The `analogio` module contains classes to provide access to analog IO
@@ -71,8 +74,10 @@
 STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogio) },
     { MP_ROM_QSTR(MP_QSTR_AnalogIn),   MP_ROM_PTR(&analogio_analogin_type) },
-    { MP_ROM_QSTR(MP_QSTR_AnalogFastIn),   MP_ROM_PTR(&analogio_analogfastin_type) },
     { MP_ROM_QSTR(MP_QSTR_AnalogOut),   MP_ROM_PTR(&analogio_analogout_type) },
+    #ifdef CIRCUITPY_ANALOGFASTIN
+    { MP_ROM_QSTR(MP_QSTR_AnalogFastIn),   MP_ROM_PTR(&analogio_analogfastin_type) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(analogio_module_globals, analogio_module_globals_table);

From 1836a14fc6ced2847fdc424619a8f3d0825e4598 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Mon, 15 Aug 2022 10:23:16 -0400
Subject: [PATCH 0856/2403] Adding ifdef in AnalogFastIn.h

---
 shared-bindings/analogio/AnalogFastIn.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h
index e2b83647c7..072f56b976 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/analogio/AnalogFastIn.h
@@ -29,6 +29,7 @@
 #define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H
 
 #include "common-hal/microcontroller/Pin.h"
+#ifdef CIRCUITPY_ANALOGFASTIN
 #include "common-hal/analogio/AnalogFastIn.h"
 
 extern const mp_obj_type_t analogio_analogfastin_type;
@@ -37,4 +38,5 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
 void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self);
 bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self);
 bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self);
+#endif
 #endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H__

From 528da05f54fdf2d7d54d9c04944a529c24575df5 Mon Sep 17 00:00:00 2001
From: Martin 
Date: Mon, 15 Aug 2022 16:46:14 +0200
Subject: [PATCH 0857/2403] Add Waveshare ESP32-S2-Pico-LCD

---
 .../waveshare_esp32_s2_pico_lcd/board.c       | 153 ++++++++++++++++++
 .../mpconfigboard.h                           |  40 +++++
 .../mpconfigboard.mk                          |  18 +++
 .../boards/waveshare_esp32_s2_pico_lcd/pins.c |  79 +++++++++
 .../waveshare_esp32_s2_pico_lcd/sdkconfig     |  37 +++++
 5 files changed, 327 insertions(+)
 create mode 100644 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
 create mode 100644 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.h
 create mode 100644 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c
 create mode 100644 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/sdkconfig

diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
new file mode 100644
index 0000000000..a265a2061b
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -0,0 +1,153 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+
+#define DELAY 0x80
+
+
+// display init sequence according to Adafruit_CircuitPython_ST7735R
+// https://github.com/adafruit/Adafruit_CircuitPython_ST7735R
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 0x96,
+    // SLPOUT and Delay
+    0x11, 0 | DELAY, 0xFF,
+    0xB1, 0x03, 0x01, 0x2C, 0x2D,      // _FRMCTR1
+    0xB3, 0x06, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,     // _FRMCTR3
+    0xB4, 0x01, 0x07, // _INVCTR line inversion
+    0xC0, 0x03, 0xA2, 0x02, 0x84, // _PWCTR1 GVDD = 4.7V, 1.0uA
+    0xC1, 0x01, 0xC5, // _PWCTR2 VGH=14.7V, VGL=-7.35V
+    0xC2, 0x02, 0x0A, 0x00, // _PWCTR3 Opamp current small, Boost frequency
+    0xC3, 0x02, 0x8A, 0x2A,
+    0xC4, 0x02, 0x8A, 0xEE,
+    0xC5, 0x01, 0x0E, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
+    0x20, 0x00, // _INVOFF
+    0x36, 0x01, 0x18, // _MADCTL bottom to top refresh
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // fix on VTL
+    0x3A, 0x01, 0x05, // COLMOD - 16bit color
+    0xE0, 0x10, 0x02, 0x1C, 0x07, 0x12, 0x37, 0x32, 0x29, 0x2D, 0x29, 0x25, 0x2B, 0x39, 0x00, 0x01, 0x03, 0x10, // _GMCTRP1 Gamma
+    0xE1, 0x10, 0x03, 0x1D, 0x07, 0x06, 0x2E, 0x2C, 0x29, 0x2D, 0x2E, 0x2E, 0x37, 0x3F, 0x00, 0x00, 0x02, 0x10, // _GMCTRN1
+    0x13, 0 | DELAY, 0x0A, // _NORON
+    0x29, 0 | DELAY, 0x64, // _DISPON
+    // 0x36, 0x01, 0xC0,  // _MADCTL Default rotation plus BGR encoding
+    0x36, 0x01, 0xC8,      // _MADCTL Default rotation plus RGB encoding
+    0x21, 0x00,      // _INVON
+};
+
+static void display_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO10,    // CLK
+        &pin_GPIO11,    // MOSI
+        NULL,           // MISO not connected
+        false);         // Not half-duplex
+
+    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_GPIO18,    // DC
+        &pin_GPIO9,     // CS
+        &pin_GPIO21,    // RST
+        40000000,       // baudrate
+        0,              // polarity
+        0               // phase
+        );
+
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+
+    // workaround as board_init() is called before reset_port() in main.c
+    pwmout_reset();
+
+    common_hal_displayio_display_construct(
+        display,
+        bus,
+        160,            // width (after rotation)
+        80,            // height (after rotation)
+        26,             // column start
+        1,             // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO45,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+    common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
+}
+
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+
+    // Display
+    display_init();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.h b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.h
new file mode 100644
index 0000000000..f9cf2aa384
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.h
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Waveshare ESP32-S2-Pico-LCD"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO40)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO10)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO12)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
new file mode 100644
index 0000000000..6e005bfdd7
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
@@ -0,0 +1,18 @@
+USB_VID = 0x303a
+USB_PID = 0x810c
+
+USB_PRODUCT = "ESP32-S2-Pico-LCD"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+IDF_TARGET = esp32s2
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c
new file mode 100644
index 0000000000..ac1e983202
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c
@@ -0,0 +1,79 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_USB_IN), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_GP35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_GP36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_GP37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_GP38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_GP39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GP40), MP_ROM_PTR(&pin_GPIO40) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GP41), MP_ROM_PTR(&pin_GPIO41) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP42), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_GP43), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_GP44), MP_ROM_PTR(&pin_GPIO44) },
+
+    // 0.96 inch LCD ST7735s
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO18) },
+
+    { 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_module_globals_table);
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/sdkconfig b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/sdkconfig
new file mode 100644
index 0000000000..836fd46764
--- /dev/null
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="waveshare"
+# end of LWIP

From 85b0be83bfbcea1baf5ddd8e9185fb7238c3c195 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 16 Aug 2022 13:51:40 -0700
Subject: [PATCH 0858/2403] Add file and directory renaming

Internally this is done with a MOVE HTTP verb. It is modeled after
WebDAV MOVE but not exact to keep the Destination header shorter
and have more consistent response codes.

Fixes #6647
---
 docs/workflows.md                             | 41 ++++++++-
 .../shared/web_workflow/static/directory.html |  4 +-
 .../shared/web_workflow/static/directory.js   | 61 +++++++++++---
 .../shared/web_workflow/static/style.css      |  4 +
 .../shared/web_workflow/static/welcome.js     |  2 +-
 supervisor/shared/web_workflow/web_workflow.c | 83 +++++++++++++++----
 6 files changed, 160 insertions(+), 35 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 345379b9f8..7938c441f2 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -202,6 +202,24 @@ Example:
 curl -v -u :passw0rd -X PUT -L --location-trusted http://circuitpython.local/fs/lib/hello/world/
 ```
 
+##### Move
+Moves the directory at the given path to ``X-Destination``. Also known as rename.
+
+The custom `X-Destination` header stores the destination path of the directory.
+
+* `201 Created` - Directory renamed
+* `401 Unauthorized` - Incorrect password
+* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set
+* `404 Not Found` - Source directory not found or destination path is missing
+* `409 Conflict` - USB is active and preventing file system modification
+* `412 Precondition Failed` - The destination path is already in use
+
+Example:
+
+```sh
+curl -v -u :passw0rd -X MOVE -H "X-Destination: /fs/lib/hello2/" -L --location-trusted http://circuitpython.local/fs/lib/hello/
+```
+
 ##### DELETE
 Deletes the directory and all of its contents.
 
@@ -214,7 +232,7 @@ Deletes the directory and all of its contents.
 Example:
 
 ```sh
-curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world/
+curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello2/world/
 ```
 
 
@@ -270,6 +288,25 @@ curl -v -u :passw0rd -L --location-trusted http://circuitpython.local/fs/lib/hel
 ```
 
 
+##### Move
+Moves the file at the given path to the ``X-Destination``. Also known as rename.
+
+The custom `X-Destination` header stores the destination path of the file.
+
+* `201 Created` - File renamed
+* `401 Unauthorized` - Incorrect password
+* `403 Forbidden` - No `CIRCUITPY_WEB_API_PASSWORD` set
+* `404 Not Found` - Source file not found or destination path is missing
+* `409 Conflict` - USB is active and preventing file system modification
+* `412 Precondition Failed` - The destination path is already in use
+
+Example:
+
+```sh
+curl -v -u :passw0rd -X MOVE -H "X-Destination: /fs/lib/hello/world2.txt" -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt
+```
+
+
 ##### DELETE
 Deletes the file.
 
@@ -283,7 +320,7 @@ Deletes the file.
 Example:
 
 ```sh
-curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world.txt
+curl -v -u :passw0rd -X DELETE -L --location-trusted http://circuitpython.local/fs/lib/hello/world2.txt
 ```
 
 ### `/cp/`
diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 5551410d73..447932b49b 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -10,9 +10,9 @@
 
     
     
    
     
-    
+    
     
    
         
    TypeSizePathModified
    
     
     
 
    
-        
+        
    TypeSizePathModified
    TypeSizePathModified
    
         
     
    
     
    
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 981d95f68c..ebbd077af8 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -5,15 +5,19 @@ var url_base = window.location;
 var current_path;
 var editable = undefined;
 
+function compareValues(a, b) {
+    if (a.directory == b.directory && a.name.toLowerCase() === b.name.toLowerCase()) {
+      return 0;
+    } else if (a.directory != b.directory) {
+      return a.directory < b.directory ? 1 : -1;
+    } else {
+      return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
+    }
+}
+
 async function refresh_list() {
 
-    function compareValues(a, b) {
-        if (a.directory == b.directory && a.name.toLowerCase() === b.name.toLowerCase()) {
-          return 0;
-        } else {
-          return a.directory.toString().substring(3,4)+a.name.toLowerCase() < b.directory.toString().substring(3,4)+b.name.toLowerCase() ? -1 : 1;
-        }
-    }
+
 
     current_path = window.location.hash.substr(1);
     if (current_path == "") {
@@ -52,7 +56,7 @@ async function refresh_list() {
         }
     }
 
-    if (window.location.path != "/fs/") {
+    if (current_path != "/") {
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
         td[0].textContent = "📁";
@@ -62,6 +66,8 @@ async function refresh_list() {
         path.textContent = "..";
         // Remove the delete button
         td[4].replaceChildren();
+        td[5].replaceChildren();
+        td[6].replaceChildren();
         new_children.push(clone);
     }
 
@@ -82,6 +88,7 @@ async function refresh_list() {
             file_path = api_url;
         }
 
+        var text_file = false;
         if (f.directory) {
             icon = "📁";
         } else if(f.name.endsWith(".txt") ||
@@ -89,24 +96,37 @@ async function refresh_list() {
                   f.name.endsWith(".js") ||
                   f.name.endsWith(".json")) {
             icon = "📄";
+            text_file = true;
         } else if (f.name.endsWith(".html")) {
             icon = "🌐";
+            text_file = true;
         }
         td[0].textContent = icon;
         td[1].textContent = f.file_size;
-        var path = clone.querySelector("a");
+        var path = clone.querySelector("a.path");
         path.href = file_path;
         path.textContent = f.name;
-        td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString();
+        let modtime = clone.querySelector("td.modtime");
+        modtime.textContent = (new Date(f.modified_ns / 1000000)).toLocaleString();
         var delete_button = clone.querySelector("button.delete");
         delete_button.value = api_url;
         delete_button.disabled = !editable;
         delete_button.onclick = del;
 
-        if (editable && !f.directory) {
+
+        var rename_button = clone.querySelector("button.rename");
+        rename_button.value = api_url;
+        rename_button.disabled = !editable;
+        rename_button.onclick = rename;
+
+        let edit_link = clone.querySelector(".edit_link");
+        if (text_file && editable && !f.directory) {
             edit_url = new URL(edit_url, url_base);
-            let edit_link = clone.querySelector(".edit_link");
             edit_link.href = edit_url
+        } else if (f.directory) {
+            edit_link.style = "display: none;";
+        } else {
+            edit_link.querySelector("button").disabled = true;
         }
 
         new_children.push(clone);
@@ -188,6 +208,23 @@ async function del(e) {
     }
 }
 
+async function rename(e) {
+    let fn = new URL(e.target.value);
+    var new_fn = prompt("Rename to ", fn.pathname.substr(3));
+    let new_uri = new URL("/fs" + new_fn, fn);
+    const response = await fetch(e.target.value,
+        {
+            method: "MOVE",
+            headers: {
+                'X-Destination': new_uri.pathname,
+            },
+        }
+    )
+    if (response.ok) {
+        refresh_list();
+    }
+}
+
 find_devices();
 
 let mkdir_button = document.getElementById("mkdir");
diff --git a/supervisor/shared/web_workflow/static/style.css b/supervisor/shared/web_workflow/static/style.css
index 17564af4fd..ab9dde7fb8 100644
--- a/supervisor/shared/web_workflow/static/style.css
+++ b/supervisor/shared/web_workflow/static/style.css
@@ -17,3 +17,7 @@ body {
     margin: 0;
     font-size: 0.7em;
 }
+
+:disabled {
+    filter: saturate(0%);
+}
diff --git a/supervisor/shared/web_workflow/static/welcome.js b/supervisor/shared/web_workflow/static/welcome.js
index d53950d37c..e32d6924b5 100644
--- a/supervisor/shared/web_workflow/static/welcome.js
+++ b/supervisor/shared/web_workflow/static/welcome.js
@@ -1,7 +1,7 @@
 var url_base = window.location;
 var current_path;
 
-var mdns_works = window.location.hostname.endsWith(".local");
+var mdns_works = url_base.hostname.endsWith(".local");
 
 async function find_devices() {
     var version_response = await fetch("/cp/version.json");
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 1144d41bdc..677a413d85 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -78,8 +78,9 @@ typedef struct {
     enum request_state state;
     char method[8];
     char path[256];
+    char destination[256];
     char header_key[64];
-    char header_value[64];
+    char header_value[256];
     // We store the origin so we can reply back with it.
     char origin[64];
     size_t content_length;
@@ -553,6 +554,15 @@ static void _reply_conflict(socketpool_socket_obj_t *socket, _request *request)
     _send_str(socket, "\r\nUSB storage active.");
 }
 
+
+static void _reply_precondition_failed(socketpool_socket_obj_t *socket, _request *request) {
+    _send_strs(socket,
+        "HTTP/1.1 412 Precondition Failed\r\n",
+        "Content-Length: 0\r\n", NULL);
+    _cors_header(socket, request);
+    _send_str(socket, "\r\n");
+}
+
 static void _reply_payload_too_large(socketpool_socket_obj_t *socket, _request *request) {
     _send_strs(socket,
         "HTTP/1.1 413 Payload Too Large\r\n",
@@ -986,6 +996,28 @@ static uint8_t _hex2nibble(char h) {
     return h - 'a' + 0xa;
 }
 
+// Decode percent encoding in place. Only do this once on a string!
+static void _decode_percents(char *str) {
+    size_t o = 0;
+    size_t i = 0;
+    size_t startlen = strlen(str);
+    while (i < startlen) {
+        if (str[i] == '%') {
+            str[o] = _hex2nibble(str[i + 1]) << 4 | _hex2nibble(str[i + 2]);
+            i += 3;
+        } else {
+            if (i != o) {
+                str[o] = str[i];
+            }
+            i += 1;
+        }
+        o += 1;
+    }
+    if (o < i) {
+        str[o] = '\0';
+    }
+}
+
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         _reply_redirect(socket, request, request->path);
@@ -1006,23 +1038,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             // Decode any percent encoded bytes so that we're left with UTF-8.
             // We only do this on /fs/ paths and after redirect so that any
             // path echoing we do stays encoded.
-            size_t o = 0;
-            size_t i = 0;
-            while (i < strlen(request->path)) {
-                if (request->path[i] == '%') {
-                    request->path[o] = _hex2nibble(request->path[i + 1]) << 4 | _hex2nibble(request->path[i + 2]);
-                    i += 3;
-                } else {
-                    if (i != o) {
-                        request->path[o] = request->path[i];
-                    }
-                    i += 1;
-                }
-                o += 1;
-            }
-            if (o < i) {
-                request->path[o] = '\0';
-            }
+            _decode_percents(request->path);
+
             char *path = request->path + 3;
             size_t pathlen = strlen(path);
             FATFS *fs = filesystem_circuitpy();
@@ -1066,6 +1083,34 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     _reply_no_content(socket, request);
                     return true;
                 }
+            } else if (strcasecmp(request->method, "MOVE") == 0) {
+                if (_usb_active()) {
+                    _reply_conflict(socket, request);
+                    return false;
+                }
+
+                _decode_percents(request->destination);
+                char *destination = request->destination + 3;
+                size_t destinationlen = strlen(destination);
+                if (destination[destinationlen - 1] == '/' && destinationlen > 1) {
+                    destination[destinationlen - 1] = '\0';
+                }
+
+                FRESULT result = f_rename(fs, path, destination);
+                #if CIRCUITPY_USB_MSC
+                usb_msc_unlock();
+                #endif
+                if (result == FR_EXIST) { // File exists and won't be overwritten.
+                    _reply_precondition_failed(socket, request);
+                } else if (result == FR_NO_PATH || result == FR_NO_FILE) { // Missing higher directories or target file.
+                    _reply_missing(socket, request);
+                } else if (result != FR_OK) {
+                    ESP_LOGE(TAG, "move error %d %s", result, path);
+                    _reply_server_error(socket, request);
+                } else {
+                    _reply_created(socket, request);
+                    return true;
+                }
             } else if (directory) {
                 if (strcasecmp(request->method, "GET") == 0) {
                     FF_DIR dir;
@@ -1318,6 +1363,8 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                     } else if (strcasecmp(request->header_key, "Sec-WebSocket-Key") == 0 &&
                                strlen(request->header_value) == 24) {
                         strcpy(request->websocket_key, request->header_value);
+                    } else if (strcasecmp(request->header_key, "X-Destination") == 0) {
+                        strcpy(request->destination, request->header_value);
                     }
                     ESP_LOGI(TAG, "Header %s %s", request->header_key, request->header_value);
                 } else if (request->offset > sizeof(request->header_value) - 1) {

From b6e24230cf716f5ccd0f0d38f24a05719f2c2b80 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 16 Aug 2022 14:40:32 -0700
Subject: [PATCH 0859/2403] Add uploading a directory and its contents

This only works for one top level directory at a time.
---
 .../shared/web_workflow/static/directory.html |  4 ++-
 .../shared/web_workflow/static/directory.js   | 27 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 5551410d73..8ac3353bcc 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -16,7 +16,9 @@
         
     
     
    
-    
+    
+    
+    
     
    
     +📁 
 
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 981d95f68c..7ea4841280 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -1,5 +1,6 @@
 let new_directory_name = document.getElementById("name");
 let files = document.getElementById("files");
+let dirs = document.getElementById("dirs");
 
 var url_base = window.location;
 var current_path;
@@ -148,8 +149,21 @@ async function mkdir(e) {
 }
 
 async function upload(e) {
-    for (const file of files.files) {
-        let file_path = new URL("/fs" + current_path + file.name, url_base);
+    let made_dirs = new Set();
+    for (const file of [...files.files, ...dirs.files]) {
+        let file_name = file.name;
+        if (file.webkitRelativePath) {
+            file_name = file.webkitRelativePath;
+            let components = file_name.split("/");
+            components.pop();
+            let parent_dir = components.join("/");
+            if (!made_dirs.has(parent_dir)) {
+                new_directory_name.value = parent_dir;
+                await mkdir(null);
+                made_dirs.add(parent_dir);
+            }
+        }
+        let file_path = new URL("/fs" + current_path + file_name, url_base);
         const response = await fetch(file_path,
             {
                 method: "PUT",
@@ -165,6 +179,7 @@ async function upload(e) {
         }
     }
     files.value = "";
+    dirs.value = "";
     upload_button.disabled = true;
 }
 
@@ -196,10 +211,14 @@ mkdir_button.onclick = mkdir;
 let upload_button = document.getElementById("upload");
 upload_button.onclick = upload;
 
-upload_button.disabled = files.files.length == 0;
+upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
 
 files.onchange = () => {
-    upload_button.disabled = files.files.length == 0;
+    upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
+}
+
+dirs.onchange = () => {
+    upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
 }
 
 mkdir_button.disabled = new_directory_name.value.length == 0;

From 525eb711c1f5b4e13c951aeae6ce123bd8f53393 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 16 Aug 2022 15:44:58 -0700
Subject: [PATCH 0860/2403] Add /code/ for online editing

---
 supervisor/shared/web_workflow/static/code.html | 12 ++++++++++++
 supervisor/shared/web_workflow/static/edit.html |  2 +-
 supervisor/shared/web_workflow/web_workflow.c   |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 supervisor/shared/web_workflow/static/code.html

diff --git a/supervisor/shared/web_workflow/static/code.html b/supervisor/shared/web_workflow/static/code.html
new file mode 100644
index 0000000000..e70266e2ed
--- /dev/null
+++ b/supervisor/shared/web_workflow/static/code.html
@@ -0,0 +1,12 @@
+
+
+    
+        
+        
+        Online Code Editor
+    
+
+    
+        
+    
+
diff --git a/supervisor/shared/web_workflow/static/edit.html b/supervisor/shared/web_workflow/static/edit.html
index e11b094d2c..85408ed2b5 100644
--- a/supervisor/shared/web_workflow/static/edit.html
+++ b/supervisor/shared/web_workflow/static/edit.html
@@ -2,7 +2,7 @@
 
 
     
-    Code Edit
+    Offline Code Edit
     
     
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 1144d41bdc..ec0ecb2775 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -926,6 +926,7 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
 
 #define STATIC_FILE(filename) extern uint32_t filename##_length; extern uint8_t filename[]; extern const char *filename##_content_type;
 
+STATIC_FILE(code_html);
 STATIC_FILE(directory_html);
 STATIC_FILE(directory_js);
 STATIC_FILE(welcome_html);
@@ -1143,6 +1144,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else {
             _REPLY_STATIC(socket, request, edit_html);
         }
+    } else if (strcmp(request->path, "/code/") == 0) {
+        _REPLY_STATIC(socket, request, code_html);
     } else if (strncmp(request->path, "/cp/", 4) == 0) {
         const char *path = request->path + 3;
         if (strcasecmp(request->method, "OPTIONS") == 0) {

From e5703490340a93c016b35f6af7ca0aa04ffbc2fe Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 16 Aug 2022 16:02:55 -0700
Subject: [PATCH 0861/2403] Edit .env and ignore canceled renames

---
 supervisor/shared/web_workflow/static/directory.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index ebbd077af8..46acd82829 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -92,6 +92,7 @@ async function refresh_list() {
         if (f.directory) {
             icon = "📁";
         } else if(f.name.endsWith(".txt") ||
+                  f.name.endsWith(".env") ||
                   f.name.endsWith(".py") ||
                   f.name.endsWith(".js") ||
                   f.name.endsWith(".json")) {
@@ -211,6 +212,9 @@ async function del(e) {
 async function rename(e) {
     let fn = new URL(e.target.value);
     var new_fn = prompt("Rename to ", fn.pathname.substr(3));
+    if (new_fn === null) {
+        return;
+    }
     let new_uri = new URL("/fs" + new_fn, fn);
     const response = await fetch(e.target.value,
         {

From 3493be7757d0468d2972c172c09d069b0ef60ae4 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 16 Aug 2022 17:03:09 -0700
Subject: [PATCH 0862/2403] Fix recursive delete, add upload labels and
 progress

---
 supervisor/shared/web_workflow/static/directory.html | 5 +++--
 supervisor/shared/web_workflow/static/directory.js   | 5 +++++
 supervisor/shared/web_workflow/web_workflow.c        | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 8ac3353bcc..011d56fa61 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -16,9 +16,10 @@
         
     
     
    
-    
-    
+    
+    
     
+    
     
    
     +📁 
 
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 7ea4841280..0047435016 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -149,7 +149,10 @@ async function mkdir(e) {
 }
 
 async function upload(e) {
+    let progress = document.querySelector("progress");
     let made_dirs = new Set();
+    progress.max = files.files.length + dirs.files.length;
+    progress.value = 0;
     for (const file of [...files.files, ...dirs.files]) {
         let file_name = file.name;
         if (file.webkitRelativePath) {
@@ -177,9 +180,11 @@ async function upload(e) {
         if (response.ok) {
             refresh_list();
         }
+        progress.value += 1;
     }
     files.value = "";
     dirs.value = "";
+    progress.value = 0;
     upload_button.disabled = true;
 }
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 1144d41bdc..7dbe6dbf92 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -766,14 +766,21 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
 // Copied from ble file_transfer.c. We should share it.
 STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) {
     FF_DIR dir;
-    FRESULT res = f_opendir(fs, &dir, path);
     FILINFO file_info;
     // Check the stack since we're putting paths on it.
     if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
         return FR_INT_ERR;
     }
+    FRESULT res = FR_OK;
     while (res == FR_OK) {
+        res = f_opendir(fs, &dir, path);
+        if (res != FR_OK) {
+            break;
+        }
         res = f_readdir(&dir, &file_info);
+        // We close and reopen the directory every time since we're deleting
+        // entries and it may invalidate the directory handle.
+        f_closedir(&dir);
         if (res != FR_OK || file_info.fname[0] == '\0') {
             break;
         }

From 2bc8d73776434bb2f15113014299a9fffa547109 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 16 Aug 2022 19:58:35 -0400
Subject: [PATCH 0863/2403] Fix ESP32 touch; rework common code a bit

---
 ports/espressif/common-hal/touchio/TouchIn.c | 24 +++------------
 ports/espressif/peripherals/touch.c          | 32 ++++++++++++++------
 ports/espressif/peripherals/touch.h          |  1 +
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/ports/espressif/common-hal/touchio/TouchIn.c b/ports/espressif/common-hal/touchio/TouchIn.c
index 523245f359..c2ef0d6e18 100644
--- a/ports/espressif/common-hal/touchio/TouchIn.c
+++ b/ports/espressif/common-hal/touchio/TouchIn.c
@@ -30,22 +30,9 @@
 #include "peripherals/touch.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
-    #if defined(CONFIG_IDF_TARGET_ESP32)
-    uint16_t touch_value;
-    #else
-    uint32_t touch_value;
-    #endif;
-    touch_pad_read_raw_data(self->pin->touch_channel, &touch_value);
-    if (touch_value > UINT16_MAX) {
-        return UINT16_MAX;
-    }
-    return (uint16_t)touch_value;
-}
-
 void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self,
     const mcu_pin_obj_t *pin) {
-    if (pin->touch_channel == TOUCH_PAD_MAX) {
+    if (pin->touch_channel == NO_TOUCH_CHANNEL) {
         raise_ValueError_invalid_pin();
     }
     claim_pin(pin);
@@ -53,15 +40,12 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self,
     // initialize touchpad
     peripherals_touch_init(pin->touch_channel);
 
-    // wait for touch data to reset
-    mp_hal_delay_ms(10);
-
     // Set a "touched" threshold not too far above the initial value.
     // For simple finger touch, the values may vary as much as a factor of two,
     // but for touches using fruit or other objects, the difference is much less.
 
     self->pin = pin;
-    self->threshold = get_raw_reading(self) + 100;
+    self->threshold = common_hal_touchio_touchin_get_raw_value(self) + 100;
 }
 
 bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t *self) {
@@ -77,11 +61,11 @@ void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t *self) {
 }
 
 bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {
-    return get_raw_reading(self) > self->threshold;
+    return common_hal_touchio_touchin_get_raw_value(self) > self->threshold;
 }
 
 uint16_t common_hal_touchio_touchin_get_raw_value(touchio_touchin_obj_t *self) {
-    return get_raw_reading(self);
+    return peripherals_touch_read(self->pin->touch_channel);
 }
 
 uint16_t common_hal_touchio_touchin_get_threshold(touchio_touchin_obj_t *self) {
diff --git a/ports/espressif/peripherals/touch.c b/ports/espressif/peripherals/touch.c
index e656bbddf1..9cf718b501 100644
--- a/ports/espressif/peripherals/touch.c
+++ b/ports/espressif/peripherals/touch.c
@@ -43,7 +43,7 @@ void peripherals_touch_never_reset(const bool enable) {
 void peripherals_touch_init(const touch_pad_t touchpad) {
     if (!touch_inited) {
         touch_pad_init();
-        touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+        touch_pad_set_fsm_mode(TOUCH_FSM_MODE_SW);
     }
     // touch_pad_config() must be done before touch_pad_fsm_start() the first time.
     // Otherwise the calibration is wrong and we get maximum raw values if there is
@@ -52,13 +52,27 @@ void peripherals_touch_init(const touch_pad_t touchpad) {
     touch_pad_config(touchpad, 0);
     #else
     touch_pad_config(touchpad);
+    touch_pad_fsm_start();
+    #endif
+    touch_inited = true;
+}
+
+uint16_t peripherals_touch_read(touch_pad_t touchpad) {
+    #if defined(CONFIG_IDF_TARGET_ESP32)
+    uint16_t touch_value;
+    touch_pad_read(touchpad, &touch_value);
+    // ESP32 touch_pad_read() returns a lower value when a pin is touched instead of a higher value.
+    // Flip the values around to be consistent with TouchIn assumptions.
+    return UINT16_MAX - touch_value;
+    #else
+    uint32_t touch_value;
+    touch_pad_sw_start();
+    while (!touch_pad_meas_is_done()) {
+    }
+    touch_pad_read_raw_data(touchpad, &touch_value);
+    if (touch_value > UINT16_MAX) {
+        return UINT16_MAX;
+    }
+    return (uint16_t)touch_value;
     #endif
-    if (!touch_inited) {
-        #if defined(CONFIG_IDF_TARGET_ESP32)
-        touch_pad_sw_start();
-        #else
-        touch_pad_fsm_start();
-        #endif
-        touch_inited = true;
-    }
 }
diff --git a/ports/espressif/peripherals/touch.h b/ports/espressif/peripherals/touch.h
index c7cd1f6be1..5feba4410a 100644
--- a/ports/espressif/peripherals/touch.h
+++ b/ports/espressif/peripherals/touch.h
@@ -29,6 +29,7 @@
 
 #include "driver/touch_pad.h"
 
+extern uint16_t peripherals_touch_read(touch_pad_t touchpad);
 extern void peripherals_touch_reset(void);
 extern void peripherals_touch_never_reset(const bool enable);
 extern void peripherals_touch_init(const touch_pad_t touchpad);

From 9a5f00a093bf7741b42fe02006fd979ceebd1b42 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 17 Aug 2022 11:31:11 -0700
Subject: [PATCH 0864/2403] Remove upload button and fix mkdir parents

---
 supervisor/shared/bluetooth/file_transfer.c   | 39 +------------
 .../shared/web_workflow/static/directory.html |  1 -
 .../shared/web_workflow/static/directory.js   | 24 ++++----
 supervisor/shared/web_workflow/web_workflow.c | 46 +--------------
 supervisor/shared/workflow.c                  | 58 +++++++++++++++++++
 supervisor/shared/workflow.h                  |  6 ++
 6 files changed, 80 insertions(+), 94 deletions(-)

diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c
index 216cf3d567..159c639e4d 100644
--- a/supervisor/shared/bluetooth/file_transfer.c
+++ b/supervisor/shared/bluetooth/file_transfer.c
@@ -47,11 +47,11 @@
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/bluetooth/file_transfer.h"
 #include "supervisor/shared/bluetooth/file_transfer_protocol.h"
+#include "supervisor/shared/workflow.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"
 
 #include "py/mpstate.h"
-#include "py/stackctrl.h"
 
 STATIC bleio_service_obj_t supervisor_ble_service;
 STATIC bleio_uuid_obj_t supervisor_ble_service_uuid;
@@ -387,39 +387,6 @@ STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
     return WRITE_DATA;
 }
 
-STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) {
-    FF_DIR dir;
-    FRESULT res = f_opendir(fs, &dir, path);
-    FILINFO file_info;
-    // Check the stack since we're putting paths on it.
-    if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
-        return FR_INT_ERR;
-    }
-    while (res == FR_OK) {
-        res = f_readdir(&dir, &file_info);
-        if (res != FR_OK || file_info.fname[0] == '\0') {
-            break;
-        }
-        size_t pathlen = strlen(path);
-        size_t fnlen = strlen(file_info.fname);
-        TCHAR full_path[pathlen + 1 + fnlen];
-        memcpy(full_path, path, pathlen);
-        full_path[pathlen] = '/';
-        size_t full_pathlen = pathlen + 1 + fnlen;
-        memcpy(full_path + pathlen + 1, file_info.fname, fnlen);
-        full_path[full_pathlen] = '\0';
-        if ((file_info.fattrib & AM_DIR) != 0) {
-            res = _delete_directory_contents(fs, full_path);
-        }
-        if (res != FR_OK) {
-            break;
-        }
-        res = f_unlink(fs, full_path);
-    }
-    f_closedir(&dir);
-    return res;
-}
-
 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 = sizeof(struct delete_command);
@@ -446,7 +413,7 @@ STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
     FRESULT result = f_stat(fs, path, &file);
     if (result == FR_OK) {
         if ((file.fattrib & AM_DIR) != 0) {
-            result = _delete_directory_contents(fs, path);
+            result = supervisor_workflow_delete_directory_contents(fs, path);
         }
         if (result == FR_OK) {
             result = f_unlink(fs, path);
@@ -503,7 +470,7 @@ STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
     DWORD fattime;
     response.truncated_time = truncate_time(command->modification_time, &fattime);
     override_fattime(fattime);
-    FRESULT result = f_mkdir(fs, path);
+    FRESULT result = supervisor_workflow_mkdir_parents(fs, path);
     override_fattime(0);
     #if CIRCUITPY_USB_MSC
     usb_msc_unlock();
diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 011d56fa61..ebe4b03010 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -18,7 +18,6 @@
     
    
     
     
-    
     
     
    
     +📁 
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index 0047435016..06ce7274b3 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -6,6 +6,11 @@ var url_base = window.location;
 var current_path;
 var editable = undefined;
 
+function set_upload_enabled(enabled) {
+    files.disabled = !enabled;
+    dirs.disabled = !enabled;
+}
+
 async function refresh_list() {
 
     function compareValues(a, b) {
@@ -46,7 +51,7 @@ async function refresh_list() {
         );
         editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE");
         new_directory_name.disabled = !editable;
-        files.disabled = !editable;
+        set_upload_enabled(editable);
         if (!editable) {
             let usbwarning = document.querySelector("#usbwarning");
             usbwarning.style.display = "block";
@@ -149,6 +154,7 @@ async function mkdir(e) {
 }
 
 async function upload(e) {
+    set_upload_enabled(false);
     let progress = document.querySelector("progress");
     let made_dirs = new Set();
     progress.max = files.files.length + dirs.files.length;
@@ -185,7 +191,7 @@ async function upload(e) {
     files.value = "";
     dirs.value = "";
     progress.value = 0;
-    upload_button.disabled = true;
+    set_upload_enabled(true);
 }
 
 async function del(e) {
@@ -213,18 +219,8 @@ find_devices();
 let mkdir_button = document.getElementById("mkdir");
 mkdir_button.onclick = mkdir;
 
-let upload_button = document.getElementById("upload");
-upload_button.onclick = upload;
-
-upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
-
-files.onchange = () => {
-    upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
-}
-
-dirs.onchange = () => {
-    upload_button.disabled = files.files.length == 0 && dirs.files.length == 0;
-}
+files.onchange = upload;
+dirs.onchange = upload;
 
 mkdir_button.disabled = new_directory_name.value.length == 0;
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 7dbe6dbf92..bfc899a3fd 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -42,6 +42,7 @@
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
 #include "supervisor/shared/web_workflow/websocket.h"
+#include "supervisor/shared/workflow.h"
 #include "supervisor/usb.h"
 
 #include "shared-bindings/hashlib/__init__.h"
@@ -763,47 +764,6 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _send_chunk(socket, "");
 }
 
-// Copied from ble file_transfer.c. We should share it.
-STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) {
-    FF_DIR dir;
-    FILINFO file_info;
-    // Check the stack since we're putting paths on it.
-    if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
-        return FR_INT_ERR;
-    }
-    FRESULT res = FR_OK;
-    while (res == FR_OK) {
-        res = f_opendir(fs, &dir, path);
-        if (res != FR_OK) {
-            break;
-        }
-        res = f_readdir(&dir, &file_info);
-        // We close and reopen the directory every time since we're deleting
-        // entries and it may invalidate the directory handle.
-        f_closedir(&dir);
-        if (res != FR_OK || file_info.fname[0] == '\0') {
-            break;
-        }
-        size_t pathlen = strlen(path);
-        size_t fnlen = strlen(file_info.fname);
-        TCHAR full_path[pathlen + 1 + fnlen];
-        memcpy(full_path, path, pathlen);
-        full_path[pathlen] = '/';
-        size_t full_pathlen = pathlen + 1 + fnlen;
-        memcpy(full_path + pathlen + 1, file_info.fname, fnlen);
-        full_path[full_pathlen] = '\0';
-        if ((file_info.fattrib & AM_DIR) != 0) {
-            res = _delete_directory_contents(fs, full_path);
-        }
-        if (res != FR_OK) {
-            break;
-        }
-        res = f_unlink(fs, full_path);
-    }
-    f_closedir(&dir);
-    return res;
-}
-
 // FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution.
 // This function truncates the time the time to a resolution storable by FATFS and fills in the
 // FATFS encoded version into fattime.
@@ -1054,7 +1014,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 FRESULT result = f_stat(fs, path, &file);
                 if (result == FR_OK) {
                     if ((file.fattrib & AM_DIR) != 0) {
-                        result = _delete_directory_contents(fs, path);
+                        result = supervisor_workflow_delete_directory_contents(fs, path);
                     }
                     if (result == FR_OK) {
                         result = f_unlink(fs, path);
@@ -1105,7 +1065,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                         truncate_time(request->timestamp_ms * 1000000, &fattime);
                         override_fattime(fattime);
                     }
-                    FRESULT result = f_mkdir(fs, path);
+                    FRESULT result = supervisor_workflow_mkdir_parents(fs, path);
                     override_fattime(0);
                     #if CIRCUITPY_USB_MSC
                     usb_msc_unlock();
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 7b14c663c4..40a095720c 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -26,6 +26,7 @@
 
 #include 
 #include "py/mpconfig.h"
+#include "py/stackctrl.h"
 #include "supervisor/background_callback.h"
 #include "supervisor/workflow.h"
 #include "supervisor/serial.h"
@@ -115,3 +116,60 @@ void supervisor_workflow_start(void) {
     supervisor_start_web_workflow();
     #endif
 }
+
+FRESULT supervisor_workflow_mkdir_parents(FATFS *fs, char *path) {
+    FRESULT result = FR_OK;
+    // Make parent directories.
+    for (size_t j = 1; j < strlen(path); j++) {
+        if (path[j] == '/') {
+            path[j] = '\0';
+            result = f_mkdir(fs, path);
+            path[j] = '/';
+            if (result != FR_OK && result != FR_EXIST) {
+                return result;
+            }
+        }
+    }
+    // Make the target directory.
+    return f_mkdir(fs, path);
+}
+
+FRESULT supervisor_workflow_delete_directory_contents(FATFS *fs, const TCHAR *path) {
+    FF_DIR dir;
+    FILINFO file_info;
+    // Check the stack since we're putting paths on it.
+    if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
+        return FR_INT_ERR;
+    }
+    FRESULT res = FR_OK;
+    while (res == FR_OK) {
+        res = f_opendir(fs, &dir, path);
+        if (res != FR_OK) {
+            break;
+        }
+        res = f_readdir(&dir, &file_info);
+        // We close and reopen the directory every time since we're deleting
+        // entries and it may invalidate the directory handle.
+        f_closedir(&dir);
+        if (res != FR_OK || file_info.fname[0] == '\0') {
+            break;
+        }
+        size_t pathlen = strlen(path);
+        size_t fnlen = strlen(file_info.fname);
+        TCHAR full_path[pathlen + 1 + fnlen];
+        memcpy(full_path, path, pathlen);
+        full_path[pathlen] = '/';
+        size_t full_pathlen = pathlen + 1 + fnlen;
+        memcpy(full_path + pathlen + 1, file_info.fname, fnlen);
+        full_path[full_pathlen] = '\0';
+        if ((file_info.fattrib & AM_DIR) != 0) {
+            res = supervisor_workflow_delete_directory_contents(fs, full_path);
+        }
+        if (res != FR_OK) {
+            break;
+        }
+        res = f_unlink(fs, full_path);
+    }
+    f_closedir(&dir);
+    return res;
+}
diff --git a/supervisor/shared/workflow.h b/supervisor/shared/workflow.h
index b3c817fb8b..df483e0ebc 100644
--- a/supervisor/shared/workflow.h
+++ b/supervisor/shared/workflow.h
@@ -26,4 +26,10 @@
 
 #pragma once
 
+#include "lib/oofatfs/ff.h"
+
 extern bool supervisor_workflow_connecting(void);
+
+// File system helpers for workflow code.
+FRESULT supervisor_workflow_mkdir_parents(FATFS *fs, char *path);
+FRESULT supervisor_workflow_delete_directory_contents(FATFS *fs, const TCHAR *path);

From 23f2b62196075739dd14e40de2338757df4e3962 Mon Sep 17 00:00:00 2001
From: arturo182 
Date: Wed, 17 Aug 2022 20:40:59 +0200
Subject: [PATCH 0865/2403] Add the Solder Party BBQ20KBD board

---
 .../boards/solderparty_bbq20kbd/board.c       | 40 ++++++++++++++++++
 .../solderparty_bbq20kbd/mpconfigboard.h      |  7 ++++
 .../solderparty_bbq20kbd/mpconfigboard.mk     | 13 ++++++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/solderparty_bbq20kbd/pins.c        | 41 +++++++++++++++++++
 5 files changed, 102 insertions(+)
 create mode 100644 ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
 create mode 100644 ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/solderparty_bbq20kbd/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c

diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c b/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.h b/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.h
new file mode 100644
index 0000000000..4f5f2c1106
--- /dev/null
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.h
@@ -0,0 +1,7 @@
+#define MICROPY_HW_BOARD_NAME "BBQ20KBD"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO23)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO18)
+
+#define DEFAULT_UART_BUS_TX (&pin_GPIO20)
diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.mk
new file mode 100644
index 0000000000..3f3acc46be
--- /dev/null
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/mpconfigboard.mk
@@ -0,0 +1,13 @@
+USB_VID = 0x1209
+USB_PID = 0xB182
+USB_PRODUCT = "BBQ20 Keyboard"
+USB_MANUFACTURER = "Solder Party"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q16C"
+
+CIRCUITPY__EVE = 1
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/pico-sdk-configboard.h b/ports/raspberrypi/boards/solderparty_bbq20kbd/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c b/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c
new file mode 100644
index 0000000000..c5eab180a0
--- /dev/null
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c
@@ -0,0 +1,41 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_PERIPHERAL_SDA), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_PERIPHERAL_SCL), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_ROW1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_ROW2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_ROW3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_ROW4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_ROW5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_ROW6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_ROW7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_COL3), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_COL4), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_COL5), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_COL6), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_TP_RESET), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_TP_MOTION), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_TP_SHUTDOWN), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From b7a2a3d72499f122599861c8077867a5e74c8512 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 17 Aug 2022 13:52:13 -0700
Subject: [PATCH 0866/2403] Fix arm builds

---
 supervisor/shared/workflow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 40a095720c..a3fd287bb0 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -26,6 +26,7 @@
 
 #include 
 #include "py/mpconfig.h"
+#include "py/mpstate.h"
 #include "py/stackctrl.h"
 #include "supervisor/background_callback.h"
 #include "supervisor/workflow.h"

From 79628a7c418d589f0082b4c9fc37971fb80760a7 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Wed, 17 Aug 2022 13:57:20 -0700
Subject: [PATCH 0867/2403] Add offline message to web workflow /code/ page

---
 supervisor/shared/web_workflow/static/code.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/supervisor/shared/web_workflow/static/code.html b/supervisor/shared/web_workflow/static/code.html
index e70266e2ed..afb707538a 100644
--- a/supervisor/shared/web_workflow/static/code.html
+++ b/supervisor/shared/web_workflow/static/code.html
@@ -3,10 +3,12 @@
     
         
         
+        
         Online Code Editor
     
 
     
         
+        
    Uh oh! It looks like you may be offline. You can go to the file browser if you'd like to work with files without connecting to the internet.
    
     
 

From 704ecc34fbc1373fd7727811f104281d3355bd55 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 17 Aug 2022 15:44:07 -0700
Subject: [PATCH 0868/2403] Guard against workflow background happening early

Fixes #6756 because the ringbuf size is zero and the empty check
does % which leads to division by zero error.
---
 supervisor/shared/web_workflow/websocket.c | 2 +-
 supervisor/shared/workflow.c               | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index ef3015a8b7..4b9e4796cd 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -78,7 +78,7 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
 }
 
 bool websocket_connected(void) {
-    return !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
+    return _incoming_ringbuf.size > 0 && !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
 }
 
 static bool _read_byte(uint8_t *c) {
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 7b14c663c4..3e80879fe5 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -46,6 +46,8 @@
 #endif
 static background_callback_t workflow_background_cb;
 
+static bool workflow_started = false;
+
 static void workflow_background(void *data) {
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_web_workflow_background();
@@ -68,6 +70,9 @@ void supervisor_workflow_reset(void) {
 }
 
 void supervisor_workflow_request_background(void) {
+    if (!workflow_started) {
+        return;
+    }
     background_callback_add_core(&workflow_background_cb);
 }
 
@@ -114,4 +119,6 @@ void supervisor_workflow_start(void) {
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_start_web_workflow();
     #endif
+
+    workflow_started = true;
 }

From 2664d3766d53c55e3c8d571925fc015554816326 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 17 Aug 2022 16:41:06 -0400
Subject: [PATCH 0869/2403] matrixportal: remove BLEIO HCI to make room to
 freeze portalbase

---
 ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
index e502f6b569..4fc7026e6f 100644
--- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
@@ -13,15 +13,16 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_LTO_PARTITION = one
 
 CIRCUITPY_AESIO = 0
+CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_GIFIO = 0
-CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_PS2IO = 0
 CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_SHARPDISPLAY = 0
-CIRCUITPY_ZLIB=0
+CIRCUITPY_ZLIB = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

From 29cbe5a94f515b1a24cae057245ea025fb31908a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 18 Aug 2022 08:01:32 -0400
Subject: [PATCH 0870/2403] update frozen libraries for 8.0.0-beta.0

---
 frozen/Adafruit_CircuitPython_APDS9960                      | 2 +-
 frozen/Adafruit_CircuitPython_BLE                           | 2 +-
 frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +-
 frozen/Adafruit_CircuitPython_BusDevice                     | 2 +-
 frozen/Adafruit_CircuitPython_CircuitPlayground             | 2 +-
 frozen/Adafruit_CircuitPython_Crickit                       | 2 +-
 frozen/Adafruit_CircuitPython_DRV2605                       | 2 +-
 frozen/Adafruit_CircuitPython_DS3231                        | 2 +-
 frozen/Adafruit_CircuitPython_Display_Shapes                | 2 +-
 frozen/Adafruit_CircuitPython_Display_Text                  | 2 +-
 frozen/Adafruit_CircuitPython_DotStar                       | 2 +-
 frozen/Adafruit_CircuitPython_ESP32SPI                      | 2 +-
 frozen/Adafruit_CircuitPython_FakeRequests                  | 2 +-
 frozen/Adafruit_CircuitPython_FocalTouch                    | 2 +-
 frozen/Adafruit_CircuitPython_HID                           | 2 +-
 frozen/Adafruit_CircuitPython_IRRemote                      | 2 +-
 frozen/Adafruit_CircuitPython_IS31FL3731                    | 2 +-
 frozen/Adafruit_CircuitPython_LC709203F                     | 2 +-
 frozen/Adafruit_CircuitPython_LIS3DH                        | 2 +-
 frozen/Adafruit_CircuitPython_LSM6DS                        | 2 +-
 frozen/Adafruit_CircuitPython_MIDI                          | 2 +-
 frozen/Adafruit_CircuitPython_Motor                         | 2 +-
 frozen/Adafruit_CircuitPython_NeoPixel                      | 2 +-
 frozen/Adafruit_CircuitPython_PortalBase                    | 2 +-
 frozen/Adafruit_CircuitPython_ProgressBar                   | 2 +-
 frozen/Adafruit_CircuitPython_RFM69                         | 2 +-
 frozen/Adafruit_CircuitPython_RFM9x                         | 2 +-
 frozen/Adafruit_CircuitPython_Register                      | 2 +-
 frozen/Adafruit_CircuitPython_Requests                      | 2 +-
 frozen/Adafruit_CircuitPython_SD                            | 2 +-
 frozen/Adafruit_CircuitPython_ST7789                        | 2 +-
 frozen/Adafruit_CircuitPython_SimpleIO                      | 2 +-
 frozen/Adafruit_CircuitPython_SimpleMath                    | 2 +-
 frozen/Adafruit_CircuitPython_Thermistor                    | 2 +-
 frozen/Adafruit_CircuitPython_Ticks                         | 2 +-
 frozen/Adafruit_CircuitPython_asyncio                       | 2 +-
 frozen/Adafruit_CircuitPython_seesaw                        | 2 +-
 frozen/mixgo_cp_lib                                         | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
index 13856be616..f91ffb1a3e 160000
--- a/frozen/Adafruit_CircuitPython_APDS9960
+++ b/frozen/Adafruit_CircuitPython_APDS9960
@@ -1 +1 @@
-Subproject commit 13856be616eee2eb84280b7c4914951c1ddbfd36
+Subproject commit f91ffb1a3e77802349f233964e0faed9708a04fe
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
index 7d9635ba1d..5c1a51f8ad 160000
--- a/frozen/Adafruit_CircuitPython_BLE
+++ b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit 7d9635ba1dda31ce45b84519c4da76ff86d0debe
+Subproject commit 5c1a51f8ad505e90a6c1b58c4d7926c59dd627d6
diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
index e5cf8206c0..810232a6df 160000
--- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
+++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
@@ -1 +1 @@
-Subproject commit e5cf8206c0173228252ae74367cab85b0531488e
+Subproject commit 810232a6df1c5342b9c89268893025bca2645a0f
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
index 9addf6a26f..5f6ac40707 160000
--- a/frozen/Adafruit_CircuitPython_BusDevice
+++ b/frozen/Adafruit_CircuitPython_BusDevice
@@ -1 +1 @@
-Subproject commit 9addf6a26fef3a32c78d574c66452b6210eca5c5
+Subproject commit 5f6ac407074c61806c9bf0b78987e1c0ed234dd0
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
index 843def7dae..f5351add4b 160000
--- a/frozen/Adafruit_CircuitPython_CircuitPlayground
+++ b/frozen/Adafruit_CircuitPython_CircuitPlayground
@@ -1 +1 @@
-Subproject commit 843def7daee741c8fb04fe21c3c7b98f22862471
+Subproject commit f5351add4bfc2aae1ba8f9078f4a734a0893e8ba
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
index 0a045871d3..62113618a0 160000
--- a/frozen/Adafruit_CircuitPython_Crickit
+++ b/frozen/Adafruit_CircuitPython_Crickit
@@ -1 +1 @@
-Subproject commit 0a045871d3da681d1c9c9578f09174bfc6d84f1d
+Subproject commit 62113618a07dd4f33310e8454bd59915b376e3cb
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
index 6a429bcd0e..f7bc753d37 160000
--- a/frozen/Adafruit_CircuitPython_DRV2605
+++ b/frozen/Adafruit_CircuitPython_DRV2605
@@ -1 +1 @@
-Subproject commit 6a429bcd0e6b22ee181197ce0477ae70f5adb80d
+Subproject commit f7bc753d37b840d0c1dcbdd977a97d1f68fac306
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
index 22931594bc..f70254c588 160000
--- a/frozen/Adafruit_CircuitPython_DS3231
+++ b/frozen/Adafruit_CircuitPython_DS3231
@@ -1 +1 @@
-Subproject commit 22931594bc52ab259eaf313d26219a507703c315
+Subproject commit f70254c588e4be37d92960c8067905ac57243aa2
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
index cdef09114d..bcd9e5c085 160000
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit cdef09114d2b43d2e461d066a5b56697ab567abc
+Subproject commit bcd9e5c085081175f2dc1b2ce1eba75cfe4be062
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index bb9cb75e15..c82b8138e1 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit bb9cb75e15b4bfce3063a94b40dfad2375d5605e
+Subproject commit c82b8138e13f4e3d580081929fb34afdb56f59fc
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
index f9469d26ed..1b39a6990c 160000
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@@ -1 +1 @@
-Subproject commit f9469d26ed9eb95d43982de88c035ac3862dd258
+Subproject commit 1b39a6990c7d18a1c883b5721f2e49cd5fbfc64e
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
index f3d504be1d..9cca65bd52 160000
--- a/frozen/Adafruit_CircuitPython_ESP32SPI
+++ b/frozen/Adafruit_CircuitPython_ESP32SPI
@@ -1 +1 @@
-Subproject commit f3d504be1dc82cc4a8e4ea9b38bd5c2ce74d59ba
+Subproject commit 9cca65bd52f1b0be672fa8c1ea74b278366851a9
diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests
index 2ea025b1b6..3198742a78 160000
--- a/frozen/Adafruit_CircuitPython_FakeRequests
+++ b/frozen/Adafruit_CircuitPython_FakeRequests
@@ -1 +1 @@
-Subproject commit 2ea025b1b68b0be95a0514732d4bc623f313fd75
+Subproject commit 3198742a78996db3118e0e4db3d142e37b7f58a1
diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch
index b637c47423..04608edb68 160000
--- a/frozen/Adafruit_CircuitPython_FocalTouch
+++ b/frozen/Adafruit_CircuitPython_FocalTouch
@@ -1 +1 @@
-Subproject commit b637c47423eb85233ba614424aadadace37fcfb1
+Subproject commit 04608edb68bc72c015de570b6edf6cc598920acc
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
index 47cc914748..49a4f9c73e 160000
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@@ -1 +1 @@
-Subproject commit 47cc91474823677218239b5b37901590755cac4c
+Subproject commit 49a4f9c73e62700220cad657fac441055cbf0416
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
index a2491a806b..9464b4cad1 160000
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@@ -1 +1 @@
-Subproject commit a2491a806b636f66caf670527c49b864923f125c
+Subproject commit 9464b4cad1f252807cd431a39984182bdd7a0cce
diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731
index b4a0461889..8e2069de65 160000
--- a/frozen/Adafruit_CircuitPython_IS31FL3731
+++ b/frozen/Adafruit_CircuitPython_IS31FL3731
@@ -1 +1 @@
-Subproject commit b4a0461889ead5da69f4ed6d0118276b01613981
+Subproject commit 8e2069de65e1b2002ca375e9046ba6e608052c87
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
index 72367f37cd..80f1d250f4 160000
--- a/frozen/Adafruit_CircuitPython_LC709203F
+++ b/frozen/Adafruit_CircuitPython_LC709203F
@@ -1 +1 @@
-Subproject commit 72367f37cd221c7af7822ba3a9cd21cd3cd70292
+Subproject commit 80f1d250f4caef3e81760dc7df56bd250210f29b
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index a06c8a116e..0a26239184 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit a06c8a116e5767a8481b9018239fe729e01760a6
+Subproject commit 0a262391849fa75671c999e9374bf6b160771246
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
index 5acf8a850d..87f8b1ddff 160000
--- a/frozen/Adafruit_CircuitPython_LSM6DS
+++ b/frozen/Adafruit_CircuitPython_LSM6DS
@@ -1 +1 @@
-Subproject commit 5acf8a850d98789a79fe37836b2ac7b623d95913
+Subproject commit 87f8b1ddff699b98e7b58d1c969c0c3633661a08
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
index d3f9adce6e..1107fe1520 160000
--- a/frozen/Adafruit_CircuitPython_MIDI
+++ b/frozen/Adafruit_CircuitPython_MIDI
@@ -1 +1 @@
-Subproject commit d3f9adce6e48d37222ef171a280cfa3122faf15b
+Subproject commit 1107fe1520406c20bc561535d72df9ac6ae4d172
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
index df61e7b0be..b0aca1110b 160000
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit df61e7b0be9dc0c6a1bbe60f526fbdc01b6c2819
+Subproject commit b0aca1110b4446bc7952d66233b559256cd4377d
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
index 015eb1ccd5..a4e11ce3a7 160000
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit 015eb1ccd5eb5364d8e1cf20358e7dcda9f12efc
+Subproject commit a4e11ce3a7f5886c706da5778baf1dd653172c94
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
index 217af2bc7d..b9201eb175 160000
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit 217af2bc7de658ff2f6380a066d99a149e69693e
+Subproject commit b9201eb175823b82d56168b0b539847093866090
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
index 1c39469bac..0af8820605 160000
--- a/frozen/Adafruit_CircuitPython_ProgressBar
+++ b/frozen/Adafruit_CircuitPython_ProgressBar
@@ -1 +1 @@
-Subproject commit 1c39469bac98eea022af695ac42e5096dae6130c
+Subproject commit 0af8820605c0858f50f3242fbd1ce3a576bec819
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
index 74ea48f7a5..2fc2bfb8f5 160000
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit 74ea48f7a5d85591f5af804cacb57e9cfaab46c6
+Subproject commit 2fc2bfb8f52afc2ec1f31e8d860358547b2f8a9a
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
index 13cdb9912b..6b018cbeb6 160000
--- a/frozen/Adafruit_CircuitPython_RFM9x
+++ b/frozen/Adafruit_CircuitPython_RFM9x
@@ -1 +1 @@
-Subproject commit 13cdb9912ba31f6e267f1afb9f71fddf5b1c139c
+Subproject commit 6b018cbeb60d6a30088c866a9b1bc46166209735
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
index d1e8ac7ad9..9c71a86d54 160000
--- a/frozen/Adafruit_CircuitPython_Register
+++ b/frozen/Adafruit_CircuitPython_Register
@@ -1 +1 @@
-Subproject commit d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7
+Subproject commit 9c71a86d54015260bd40ad4bc8d0258c930bcc64
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index b168b28fc5..9ad59c3bc5 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit b168b28fc58973cf20269cc87a655d7812659fd0
+Subproject commit 9ad59c3bc5e2fdc341779ccbbe2d78560c5d681f
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
index 332143d4ca..ab504a86af 160000
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit 332143d4ca5762d2d351ceb170c0b4e37dd42793
+Subproject commit ab504a86afb583bbe9008884bc01b33f0654a0dd
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
index 995959d5dc..4a094ea8e0 160000
--- a/frozen/Adafruit_CircuitPython_ST7789
+++ b/frozen/Adafruit_CircuitPython_ST7789
@@ -1 +1 @@
-Subproject commit 995959d5dca23fbe49590700d1aa26a96dca1df7
+Subproject commit 4a094ea8e0ca902e7c61822060e149d73fa18ce5
diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO
index d238fe99e2..60d9df0ca0 160000
--- a/frozen/Adafruit_CircuitPython_SimpleIO
+++ b/frozen/Adafruit_CircuitPython_SimpleIO
@@ -1 +1 @@
-Subproject commit d238fe99e24ea4cdb472f1d8a9c99dd189b0aeca
+Subproject commit 60d9df0ca09b5005ea0c03b94daae854983d79bd
diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath
index 632655b8f5..1156062b06 160000
--- a/frozen/Adafruit_CircuitPython_SimpleMath
+++ b/frozen/Adafruit_CircuitPython_SimpleMath
@@ -1 +1 @@
-Subproject commit 632655b8f5f6f62e3b4d0b6161213634e0ae74e9
+Subproject commit 1156062b06771afd37da54d0b690a84ef611a78b
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
index 3816a4f4c9..79ff12be05 160000
--- a/frozen/Adafruit_CircuitPython_Thermistor
+++ b/frozen/Adafruit_CircuitPython_Thermistor
@@ -1 +1 @@
-Subproject commit 3816a4f4c997b03d4a7ebfe35a617d1e50124b04
+Subproject commit 79ff12be057ff5975e52ad273e087d74deb147ab
diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks
index 6757c5b37c..704cac4af3 160000
--- a/frozen/Adafruit_CircuitPython_Ticks
+++ b/frozen/Adafruit_CircuitPython_Ticks
@@ -1 +1 @@
-Subproject commit 6757c5b37cf26458448930042cb0a41f8ad0a5ef
+Subproject commit 704cac4af3dccf8e452e69eb8f9f22fe8db26f83
diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio
index c496cfb576..339e037bf6 160000
--- a/frozen/Adafruit_CircuitPython_asyncio
+++ b/frozen/Adafruit_CircuitPython_asyncio
@@ -1 +1 @@
-Subproject commit c496cfb5768cd506d61100284fdab94dd439ec3b
+Subproject commit 339e037bf6cf30e03fab6fa5b1b9f669821f7685
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
index 148345d232..73b78e2424 160000
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@@ -1 +1 @@
-Subproject commit 148345d232c83133de3649fb70b471f11501b3d2
+Subproject commit 73b78e242424b865785d5e66ccef949bdacf7214
diff --git a/frozen/mixgo_cp_lib b/frozen/mixgo_cp_lib
index 4ba6956d49..d5e3e809d7 160000
--- a/frozen/mixgo_cp_lib
+++ b/frozen/mixgo_cp_lib
@@ -1 +1 @@
-Subproject commit 4ba6956d49752f2d0cdc73903b86a34c225934ef
+Subproject commit d5e3e809d7aa938b233b49526c55bfd2e314272c

From 0c87d0b40d7c49f1949c416ff16b7462f19e5ad2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 18 Aug 2022 10:23:37 -0400
Subject: [PATCH 0871/2403] matrixportal: remove ulab instead of bleio HCI

---
 ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
index 4fc7026e6f..1f77c11931 100644
--- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
@@ -13,13 +13,10 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_LTO_PARTITION = one
 
 CIRCUITPY_AESIO = 0
-CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
-CIRCUITPY_PS2IO = 0
-CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_SHARPDISPLAY = 0
-CIRCUITPY_ZLIB = 0
+CIRCUITPY_ULAB = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests

From 2c2ee9f0f42b5503bcdbc105fecf3f60ca871622 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 18 Aug 2022 14:42:52 -0400
Subject: [PATCH 0872/2403] update frozen HID

---
 frozen/Adafruit_CircuitPython_HID | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
index 49a4f9c73e..4d68643dcd 160000
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@@ -1 +1 @@
-Subproject commit 49a4f9c73e62700220cad657fac441055cbf0416
+Subproject commit 4d68643dcd779e63b4eada09fa84b1ad43c83362

From f91af513b7349c10733f8779e6913cca18fb10db Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 18 Aug 2022 16:23:17 -0400
Subject: [PATCH 0873/2403] Introduced odule adcbuffer / removed
 analogio/AnalogFastIn

---
 locale/circuitpython.pot                      |  14 +-
 .../BufferedInput.c}                          |  53 ++---
 .../BufferedInput.h}                          |  21 +-
 .../common-hal/adcbuffer/__init__.c           |   1 +
 ports/raspberrypi/mpconfigport.mk             |   4 +-
 py/circuitpy_defns.mk                         |   9 +-
 py/circuitpy_mpconfig.mk                      |   4 +-
 shared-bindings/adcbuffer/BufferdInput.c      | 197 ++++++++++++++++++
 .../BufferdInput.h}                           |  24 +--
 shared-bindings/adcbuffer/__init__.c          |  84 ++++++++
 shared-bindings/adcbuffer/__init__.h          |  34 +++
 shared-bindings/analogio/AnalogFastIn.c       | 197 ------------------
 shared-bindings/analogio/__init__.c           |   7 -
 13 files changed, 387 insertions(+), 262 deletions(-)
 rename ports/raspberrypi/common-hal/{analogio/AnalogFastIn.c => adcbuffer/BufferedInput.c} (74%)
 rename ports/raspberrypi/common-hal/{analogio/AnalogFastIn.h => adcbuffer/BufferedInput.h} (71%)
 create mode 100644 ports/raspberrypi/common-hal/adcbuffer/__init__.c
 create mode 100644 shared-bindings/adcbuffer/BufferdInput.c
 rename shared-bindings/{analogio/AnalogFastIn.h => adcbuffer/BufferdInput.h} (61%)
 create mode 100644 shared-bindings/adcbuffer/__init__.c
 create mode 100644 shared-bindings/adcbuffer/__init__.h
 delete mode 100644 shared-bindings/analogio/AnalogFastIn.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index a2e2826cd1..3f97fb8b1d 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -398,12 +398,10 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
-msgid "All I2C peripherals are in use"
-msgstr ""
-
+#: ports/espressif/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
+#: ports/nrf/common-hal/busio/I2C.c
+msgid "All I2C peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/countio/Counter.c
@@ -1061,6 +1059,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1592,6 +1591,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -3863,11 +3863,11 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/analogio/AnalogFastIn.c
+#: shared-bindings/adcbuffer/BufferdInput.c
 msgid "sample rate must be 1.0-500000.0 per second"
 msgstr ""
 
-#: shared-bindings/analogio/AnalogFastIn.c
+#: shared-bindings/adcbuffer/BufferdInput.c
 #: shared-bindings/audiocore/RawSample.c
 msgid ""
 "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
similarity index 74%
rename from ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
rename to ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index bc72e940d1..1f187bcc26 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -4,8 +4,13 @@
  * The MIT License (MIT)
  *
  * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
- * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
+ *                         Copyright (c) 2013, 2014 Damien P. George
+ *                         Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
+ * https://github.com/raspberrypi/pico-examples/blob/master/adc/dma_capture/dma_capture.c
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,38 +31,47 @@
  * THE SOFTWARE.
  */
 
-#include "common-hal/analogio/AnalogFastIn.h"
-#include "shared-bindings/analogio/AnalogFastIn.h"
+#include "common-hal/adcbuffer/Bufferedinput.h"
+#include "shared-bindings/adcbuffer/Bufferedinput.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 #include "src/rp2_common/hardware_dma/include/hardware/dma.h"
-//     /sdk/src/rp2_common/hardware_dma/include/hardware/dma.h
-//     ports/raspberrypi/
-#include "sdk/src/common/pico_stdlib/include/pico/stdlib.h"
+#include "src/common/pico_stdlib/include/pico/stdlib.h"
 
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 
-void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate) {
+void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate) {
 
     // Set pin and channel
     self->pin = pin;
     claim_pin(pin);
+
+    // validate pin number
+    if (pin->number < ADC_FIRST_PIN_NUMBER) {
+        and(pin->number >= ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT) {
+            raise_ValueError_invalid_pins();
+        }
+    }
+    // TODO: find a wat to accept ADC4 for temperature
     self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
 
-    // Checks on chan value here
+    // TODO: Checks on chan value here
 
     // Set buffer and length
     self->buffer = buffer;
     self->len = len;
 
-    // checks on length here
+    // TODO: checks on length here
 
     // uint8_t bytes_per_sample
     // Set sample rate
     // self->bits_per_sample = bytes_per_sample * 8;
+    // TODO: Possibly check Rate values here, already u_int
+    // NOTE: Anything over 500000 for RP2040 will not
+    // exceed DMA conversion sampling rate.
     self->sample_rate = sample_rate;
 
     // Standard IO Init
@@ -110,12 +124,12 @@ void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *sel
 }
 
 
-bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self) {
+bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self) {
     return self->pin == NULL;
 }
 
-void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self) {
-    if (common_hal_analogio_analogfastin_deinited(self)) {
+void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self) {
+    if (common_hal_adcbuffer_bufferedinput_deinited(self)) {
         return;
     }
 
@@ -127,19 +141,10 @@ void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self)
     dma_channel_unclaim(self->dma_chan);
 }
 
-// ================================================================
-// capture()
-// make this a bool so that later we can perform integrity checking
-// ================================================================
-bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self) {
+bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
 
+    // uint32_t cdl = self->len / 2 - 1;
 
-    // CONSIDER THESE ISSUES
-    // uint16_t value = adc_read();
-    // Stretch 12-bit ADC reading to 16-bit range
-    // return (value << 4) | (value >> 8);
-
-    uint32_t cdl = self->len / 2 - 1;
     dma_channel_configure(self->dma_chan, &(self->cfg),
         self->buffer,   // dst
         &adc_hw->fifo,  // src
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
similarity index 71%
rename from ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
rename to ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
index 343579fb47..7fd8f50653 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
@@ -4,8 +4,13 @@
  * The MIT License (MIT)
  *
  * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries
- * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd.
+ *                         Copyright (c) 2013, 2014 Damien P. George
+ *                         Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
+ * https://github.com/raspberrypi/pico-examples/blob/master/adc/dma_capture/dma_capture.c
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,15 +31,15 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_dma/include/hardware/dma.h"
 
 #include "py/obj.h"
 
-// We can extend the struct without impact to existing code
+//  This is the adcbuffer object
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -46,8 +51,8 @@ typedef struct {
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
-} analogio_analogfastin_obj_t;
+} adcbuffer_bufferedinput_obj_t;
 
-void analogfastin_init(void);
+void bufferedinput_init(void);
 
-#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
diff --git a/ports/raspberrypi/common-hal/adcbuffer/__init__.c b/ports/raspberrypi/common-hal/adcbuffer/__init__.c
new file mode 100644
index 0000000000..eea58c77d6
--- /dev/null
+++ b/ports/raspberrypi/common-hal/adcbuffer/__init__.c
@@ -0,0 +1 @@
+// No analogio module functions.
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 3d275b04cb..ba6869169f 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -26,8 +26,8 @@ CIRCUITPY_NVM = 1
 CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
-# Use of analogio
-CIRCUITPYTHON_ANALOGFASTIN = 1
+# Use of adcbuffer
+CIRCUITPYTHON_ADCBUFFER = 1
 
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 5fc6b1fa16..b23016c7a7 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -102,6 +102,9 @@ endif
 ###
 # Select which builtin modules to compile and include.
 
+ifeq ($(CIRCUITPY_ADCBUFFER),1)
+SRC_PATTERNS += adcbuffer/%
+endif
 ifeq ($(CIRCUITPY_AESIO),1)
 SRC_PATTERNS += aesio/%
 endif
@@ -479,10 +482,10 @@ SRC_C += \
 
 endif
 
-ifeq ($(CIRCUITPYTHON_ANALOGFASTIN),1)
-# Needed for AnalogFastIn
+ifeq ($(CIRCUITPYTHON_ADCBUFFER),1)
+# Needed for ADCBUFFER
 SRC_COMMON_HAL_ALL += \
-	analogio/AnalogFastIn.c \
+		adcbuffer/BufferedInput.c \
 
 endif
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index f391128fd3..1d4a5765f8 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -65,8 +65,8 @@ CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
-CIRCUITPY_ANALOGFASTIN ?= 0
-CFLAGS += -DCIRCUITPY_ANALOGFASTIN=$(CIRCUITPY_ANALOGFASTIN)
+CIRCUITPY_ADCBUFFER ?= 0
+CFLAGS += -DCIRCUITPY_ADCBUFFER=$(CIRCUITPY_ADCBUFFER)
 
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ATEXIT=$(CIRCUITPY_ATEXIT)
diff --git a/shared-bindings/adcbuffer/BufferdInput.c b/shared-bindings/adcbuffer/BufferdInput.c
new file mode 100644
index 0000000000..e47f5e5d7d
--- /dev/null
+++ b/shared-bindings/adcbuffer/BufferdInput.c
@@ -0,0 +1,197 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
+ *
+ * TODO: Based on analogio/AnalogIn.c from Scott Shaw
+ *
+ * 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 
+#include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
+#include "py/mphal.h"
+#include "py/nlr.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/adcbuffer/BufferedInput.h"
+#include "shared-bindings/util.h"
+
+/// class BufferedInput:
+///     """Input analog voltage level to supplied buffer using DMA Capture"""
+///
+///     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
+///         """Use the BufferedInput on the given pin. Fill the given buffer from ADC read values at the supplied
+///         sample_rate.
+///
+///         :param ~microcontroller.Pin pin: the pin to read from"""
+///         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
+///         :param ~int sample_rate: rate: The desired playback sample rate
+///
+///     Usage::
+///
+///       import board
+///       import adcbuffer
+///       import array
+///
+///       length = 1000
+///       mybuffer = array.array("H", [0] * length)
+///       rate = 500000
+///       adcbuf = adcbuffer.BufferedInput(board.GP26, mybuffer, rate)
+///       adcbuf.readmultiple()
+///       adcbuf.deinit()
+///       for i in range(length):
+///           print(i, mybuffer[i])
+///
+///       (TODO) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
+///       (TODO) Provide mechanism to read CPU Temperature
+///       """
+///         ...
+///
+STATIC void validate_rate(mp_float_t rate) {
+    if (rate < (mp_float_t)1.0f || rate > (mp_float_t)500000.0f) {
+        mp_raise_ValueError(translate("sample rate must be 1.0-500000.0 per second"));
+    }
+}
+
+STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_pin, ARG_buffer, ARG_sample_rate };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_sample_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_int = 500000} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Validate Pin
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+
+    // Buffer Pointer defined and allocated by user
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+
+    // signed or unsigned, byte per sample
+    bool signed_samples = bufinfo.typecode == 'b' || bufinfo.typecode == 'h';
+    uint8_t bytes_per_sample = 1;
+
+    // Bytes Per Sample
+    if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
+        bytes_per_sample = 2;
+    } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError(translate("sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or 'B'"));
+    }
+
+    // Validate sample rate here
+    mp_float_t sample_rate = mp_obj_get_float(args[ARG_sample_rate].u_obj);
+    validate_rate(sample_rate);
+
+    // Create local object
+    adcbuffer_bufferedinput_obj_t *self = m_new_obj(adcbuffer_bufferedinput_obj_t);
+    self->base.type = &adcbuffer_bufferedinput_type;
+
+    // Call local intereface in ports/common-hal/adcbuffer
+    common_hal_adcbuffer_bufferedinput_construct(self,
+        pin,
+        ((uint8_t *)bufinfo.buf),
+        bufinfo.len,
+        bytes_per_sample,
+        signed_samples,
+        sample_rate
+        );
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+///     def deinit(self) -> None:
+///         """Turn off the BufferedInput and release the pin for other use."""
+///         ...
+///
+STATIC mp_obj_t adcbuffer_bufferedinput_deinit(mp_obj_t self_in) {
+    adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_adcbuffer_bufferedinput_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_deinit_obj, adcbuffer_bufferedinput_deinit);
+
+STATIC void check_for_deinit(adcbuffer_bufferedinput_obj_t *self) {
+    if (common_hal_adcbuffer_bufferedinput_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+///     def __enter__(self) -> BufferedInput:
+///         """No-op used by Context Managers."""
+///         ...
+///
+///  Provided by context manager helper.
+///
+///     def __exit__(self) -> None:
+///         """Automatically deinitializes the hardware when exiting a context. See
+///         :ref:`lifetime-and-contextmanagers` for more info."""
+///         ...
+///
+STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_adcbuffer_bufferedinput_deinit(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj, 4, 4, adcbuffer_bufferedinput___exit__);
+
+///     value: int
+///     """The value on the analog pin between 0 and 65535 inclusive (16-bit). (read-only)
+///
+///     Even if the underlying analog to digital converter (ADC) is lower
+///     resolution, the value is 16-bit."""
+///
+STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
+    adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_adcbuffer_bufferedinput_readmultiple(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_readmultiple_obj, adcbuffer_bufferedinput_obj_readmultiple);
+
+/// MP_PROPERTY_GETTER(adcbuffer_bufferedinput_value_obj,
+///    (mp_obj_t)&adcbuffer_bufferedinput_get_value_obj);
+///
+///     reference_voltage: float
+///     """The maximum voltage measurable (also known as the reference voltage) as a
+///     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
+///     at ends of the analog range."""
+///
+
+STATIC const mp_rom_map_elem_t adcbuffer_bufferedinput_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&adcbuffer_bufferedinput_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&adcbuffer_bufferedinput___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_readmultiple),       MP_ROM_PTR(&adcbuffer_bufferedinput_readmultiple_obj)},
+
+};
+
+STATIC MP_DEFINE_CONST_DICT(adcbuffer_bufferedinput_locals_dict, adcbuffer_bufferedinput_locals_dict_table);
+
+const mp_obj_type_t adcbuffer_bufferedinput_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_BufferedInput,
+    .make_new = adcbuffer_bufferedinput_make_new,
+    .locals_dict = (mp_obj_t)&adcbuffer_bufferedinput_locals_dict,
+};
diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/adcbuffer/BufferdInput.h
similarity index 61%
rename from shared-bindings/analogio/AnalogFastIn.h
rename to shared-bindings/adcbuffer/BufferdInput.h
index 072f56b976..24012eadfb 100644
--- a/shared-bindings/analogio/AnalogFastIn.h
+++ b/shared-bindings/adcbuffer/BufferdInput.h
@@ -4,7 +4,6 @@
  * The MIT License (MIT)
  *
  * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- * Taken from AnalogIn by 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
@@ -25,18 +24,19 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H
 
 #include "common-hal/microcontroller/Pin.h"
-#ifdef CIRCUITPY_ANALOGFASTIN
-#include "common-hal/analogio/AnalogFastIn.h"
+#include "common-hal/adcbuffer/Bufferedinput.h"
 
-extern const mp_obj_type_t analogio_analogfastin_type;
+// #ifdef CIRCUITPY_BUFFEREDINPUT #endif
 
-void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate);
-void common_hal_analogio_analogfastin_deinit(analogio_analogfastin_obj_t *self);
-bool common_hal_analogio_analogfastin_deinited(analogio_analogfastin_obj_t *self);
-bool common_hal_analogio_analogfastin_capture(analogio_analogfastin_obj_t *self);
-#endif
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGFASTIN_H__
+extern const mp_obj_type_t adcbuffer_bufferedinput_type;
+
+void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate);
+void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self);
+bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self);
+bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self);
+
+#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H__
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/adcbuffer/__init__.c
new file mode 100644
index 0000000000..3f81153500
--- /dev/null
+++ b/shared-bindings/adcbuffer/__init__.c
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
+ *
+ * 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 
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/adcbuffer/__init__.h"
+#include "shared-bindings/adcbuffer/BufferedInput.h"
+
+// #ifdef CIRCUITPY_BUFFEREDINPUT#endif
+
+//| """Analog buffered hardware support
+//|
+//| The `adcbuffer` module contains classes to provide access to analog-to-digital
+//| conversion and digital-to-analog (DAC) for multiple value transfer.
+//|
+//| All classes change hardware state and should be deinitialized when they
+//| are no longer needed if the program continues after use. To do so, either
+//| call :py:meth:`!deinit` or use a context manager. See
+//| :ref:`lifetime-and-contextmanagers` for more info.
+//|
+//| For example::
+//|
+//|   import adcbuffer
+///   import array
+//|   from board import *
+//|
+///   length = 5000000
+///   mybuffer = array.array("H", [0] * length)
+//|   adcbuf_obj = adcbuffer.BufferdInPut(GP26, mybuffer, length)
+//|   adcbuffer.readmultiple()
+//|   print(*mybuffer)
+//|   adcbuf_obj.deinit()
+//|
+//| This example will initialize the the device, read and fill
+//| :py:data:`~adcbuffer.BufferdInPut` to mybuffer and then
+//| :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
+//| because CircuitPython will do it automatically after the program finishes.
+//|
+//| TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
+//| Learn guide `_
+//|
+//| TODO: For more information on using `adcbuffer`, see `this additional Learn guide
+//| `_
+//| """
+//|
+
+STATIC const mp_rom_map_elem_t adcbuffer_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adcbuffer) },
+    { MP_ROM_QSTR(MP_QSTR_Bufferedinput),   MP_ROM_PTR(&adcbuffer_bufferedinput_type) },
+    // #ifdef CIRCUITPY_BUFFEREDINPUT    #endif
+};
+
+STATIC MP_DEFINE_CONST_DICT(adcbuffer_module_globals, adcbuffer_module_globals_table);
+
+const mp_obj_module_t adcbuffer_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&adcbuffer_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_adcbuffer, adcbuffer_module, CIRCUITPY_ADCBUFFER);
diff --git a/shared-bindings/adcbuffer/__init__.h b/shared-bindings/adcbuffer/__init__.h
new file mode 100644
index 0000000000..c271d71273
--- /dev/null
+++ b/shared-bindings/adcbuffer/__init__.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
+ *
+ * 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_ADCBUFFER___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER___INIT___H
+
+#include "py/obj.h"
+
+// Nothing now.
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER___INIT___H
diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c
deleted file mode 100644
index e489fa497e..0000000000
--- a/shared-bindings/analogio/AnalogFastIn.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- * Taken from AnalogIn by 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 
-
-#include "shared/runtime/context_manager_helpers.h"
-#include "py/binary.h"
-#include "py/mphal.h"
-#include "py/nlr.h"
-#include "py/objproperty.h"
-#include "py/runtime.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/analogio/AnalogFastIn.h"
-#include "shared-bindings/util.h"
-
-
-
-//| class AnalogFastIn:
-//|     """Read analog voltage levels quickly using DMA Capture"""
-//|
-//|     def __init__(self, pin: microcontroller.Pin, buffer: ReadableBuffer, *, sample_rate: int = 500000) -> None:
-//|         """Use the AnalogFastIn on the given pin. Fill the given buffer from ADC read values at the supplied
-///         sample_rate.
-///
-//|         :param ~microcontroller.Pin pin: the pin to read from"""
-//|         :param ~circuitpython_typing.WriteableBuffer buffer: A buffer for samples
-//|         :param int sample_rate: The desired playback sample rate
-///
-//|     Usage::
-///
-//|       import board
-//|       import analogio
-//|       import array
-///
-//|       length = 1000
-//|       mybuffer = array.array("H", [0] * length)
-//|       fadc = analogio.AnalogFastIn(board.GP26, mybuffer)
-//|       fadc.capture()
-//|       fadc.deinit()
-//|       for i in range(length):
-//|           print(i, mybuffer[i])
-///
-///       (Future) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
-///       """
-//|         ...
-///
-STATIC void validate_rate(mp_float_t rate) {
-    if (rate < (mp_float_t)1.0f || rate > (mp_float_t)500000.0f) {
-        mp_raise_ValueError(translate("sample rate must be 1.0-500000.0 per second"));
-    }
-}
-
-STATIC mp_obj_t analogio_analogfastin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_pin, ARG_buffer, ARG_sample_rate };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_sample_rate, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // Validate Pin
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
-
-    // Buffer Pointer defined and allocated by user
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
-
-    // signed or unsigned, byte per sample
-    bool signed_samples = bufinfo.typecode == 'b' || bufinfo.typecode == 'h';
-    uint8_t bytes_per_sample = 1;
-
-    // Bytes Per Sample
-    if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
-        bytes_per_sample = 2;
-    } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError(translate("sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or 'B'"));
-    }
-
-    // Validate sample rate here
-    mp_float_t sample_rate = mp_obj_get_float(args[ARG_sample_rate].u_obj);
-    validate_rate(sample_rate);
-
-    // Create local object
-    analogio_analogfastin_obj_t *self = m_new_obj(analogio_analogfastin_obj_t);
-    self->base.type = &analogio_analogfastin_type;
-
-    // Call local intereface in ports/common-hal/analogio
-    common_hal_analogio_analogfastin_construct(self,
-        pin,
-        ((uint8_t *)bufinfo.buf),
-        bufinfo.len,
-        bytes_per_sample,
-        signed_samples,
-        sample_rate
-        );
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-//|     def deinit(self) -> None:
-//|         """Turn off the AnalogFastIn and release the pin for other use."""
-//|         ...
-//|
-STATIC mp_obj_t analogio_analogfastin_deinit(mp_obj_t self_in) {
-    analogio_analogfastin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_analogio_analogfastin_deinit(self);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogfastin_deinit_obj, analogio_analogfastin_deinit);
-
-STATIC void check_for_deinit(analogio_analogfastin_obj_t *self) {
-    if (common_hal_analogio_analogfastin_deinited(self)) {
-        raise_deinited_error();
-    }
-}
-//|     def __enter__(self) -> AnalogFastIn:
-//|         """No-op used by Context Managers."""
-//|         ...
-//|
-//  Provided by context manager helper.
-
-//|     def __exit__(self) -> None:
-//|         """Automatically deinitializes the hardware when exiting a context. See
-//|         :ref:`lifetime-and-contextmanagers` for more info."""
-//|         ...
-//|
-STATIC mp_obj_t analogio_analogfastin___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    common_hal_analogio_analogfastin_deinit(args[0]);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogfastin___exit___obj, 4, 4, analogio_analogfastin___exit__);
-
-//|     value: int
-//|     """The value on the analog pin between 0 and 65535 inclusive (16-bit). (read-only)
-//|
-//|     Even if the underlying analog to digital converter (ADC) is lower
-//|     resolution, the value is 16-bit."""
-//|
-STATIC mp_obj_t analogio_analogfastin_obj_capture(mp_obj_t self_in) {
-    analogio_analogfastin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_analogio_analogfastin_capture(self));
-}
-MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogfastin_capture_obj, analogio_analogfastin_obj_capture);
-
-// MP_PROPERTY_GETTER(analogio_analogfastin_value_obj,
-//    (mp_obj_t)&analogio_analogfastin_get_value_obj);
-
-//|     reference_voltage: float
-//|     """The maximum voltage measurable (also known as the reference voltage) as a
-//|     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
-//|     at ends of the analog range."""
-//|
-
-STATIC const mp_rom_map_elem_t analogio_analogfastin_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&analogio_analogfastin_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&analogio_analogfastin___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_capture),            MP_ROM_PTR(&analogio_analogfastin_capture_obj)},
-
-};
-
-STATIC MP_DEFINE_CONST_DICT(analogio_analogfastin_locals_dict, analogio_analogfastin_locals_dict_table);
-
-const mp_obj_type_t analogio_analogfastin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_AnalogFastIn,
-    .make_new = analogio_analogfastin_make_new,
-    .locals_dict = (mp_obj_t)&analogio_analogfastin_locals_dict,
-};
diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index c4cca3c51d..eb956d0eb7 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -34,10 +34,6 @@
 #include "shared-bindings/analogio/AnalogIn.h"
 #include "shared-bindings/analogio/AnalogOut.h"
 
-#ifdef CIRCUITPY_ANALOGFASTIN
-#include "shared-bindings/analogio/AnalogFastIn.h"
-#endif
-
 //| """Analog hardware support
 //|
 //| The `analogio` module contains classes to provide access to analog IO
@@ -75,9 +71,6 @@ STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogio) },
     { MP_ROM_QSTR(MP_QSTR_AnalogIn),   MP_ROM_PTR(&analogio_analogin_type) },
     { MP_ROM_QSTR(MP_QSTR_AnalogOut),   MP_ROM_PTR(&analogio_analogout_type) },
-    #ifdef CIRCUITPY_ANALOGFASTIN
-    { MP_ROM_QSTR(MP_QSTR_AnalogFastIn),   MP_ROM_PTR(&analogio_analogfastin_type) },
-    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(analogio_module_globals, analogio_module_globals_table);

From d3c3c9eac4b517df363ff5e2c5369500469ec2c5 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 18 Aug 2022 19:10:16 -0400
Subject: [PATCH 0874/2403] Tidy a few things

---
 .../common-hal/adcbuffer/BufferedInput.c      |  4 +-
 .../common-hal/adcbuffer/__init__.c           |  2 +-
 py/circuitpy_defns.mk                         | 11 +--
 py/circuitpy_mpconfig.mk                      |  2 +-
 shared-bindings/adcbuffer/BufferdInput.h      |  2 +-
 shared-bindings/adcbuffer/__init__.c          | 68 +++++++++----------
 6 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index 1f187bcc26..d4ae246089 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -31,8 +31,8 @@
  * THE SOFTWARE.
  */
 
-#include "common-hal/adcbuffer/Bufferedinput.h"
-#include "shared-bindings/adcbuffer/Bufferedinput.h"
+#include "common-hal/adcbuffer/BufferedInput.h"
+#include "shared-bindings/adcbuffer/BufferedInput.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
diff --git a/ports/raspberrypi/common-hal/adcbuffer/__init__.c b/ports/raspberrypi/common-hal/adcbuffer/__init__.c
index eea58c77d6..3473642698 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/__init__.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/__init__.c
@@ -1 +1 @@
-// No analogio module functions.
+// No adcbuffer module functions.
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index b23016c7a7..515b5bf04c 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -387,6 +387,7 @@ SRC_COMMON_HAL_ALL = \
 	_bleio/__init__.c \
 	_pew/PewPew.c \
 	_pew/__init__.c \
+	adcbuffer/BufferedInput.c \
 	alarm/SleepMemory.c \
 	alarm/__init__.c \
 	alarm/pin/PinAlarm.c \
@@ -482,12 +483,12 @@ SRC_C += \
 
 endif
 
-ifeq ($(CIRCUITPYTHON_ADCBUFFER),1)
+#ifeq ($(CIRCUITPYTHON_ADCBUFFER),1)
 # Needed for ADCBUFFER
-SRC_COMMON_HAL_ALL += \
-		adcbuffer/BufferedInput.c \
-
-endif
+#SRC_COMMON_HAL_ALL += \
+#		adcbuffer/BufferedInput.c \
+#
+#endif
 
 
 SRC_COMMON_HAL = $(filter $(SRC_PATTERNS), $(SRC_COMMON_HAL_ALL))
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 1d4a5765f8..8738966a43 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -65,7 +65,7 @@ CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
-CIRCUITPY_ADCBUFFER ?= 0
+CIRCUITPY_ADCBUFFER ?= 1
 CFLAGS += -DCIRCUITPY_ADCBUFFER=$(CIRCUITPY_ADCBUFFER)
 
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
diff --git a/shared-bindings/adcbuffer/BufferdInput.h b/shared-bindings/adcbuffer/BufferdInput.h
index 24012eadfb..593eee493c 100644
--- a/shared-bindings/adcbuffer/BufferdInput.h
+++ b/shared-bindings/adcbuffer/BufferdInput.h
@@ -28,7 +28,7 @@
 #define MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "common-hal/adcbuffer/Bufferedinput.h"
+#include "common-hal/adcbuffer/BufferedInput.h"
 
 // #ifdef CIRCUITPY_BUFFEREDINPUT #endif
 
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/adcbuffer/__init__.c
index 3f81153500..34b87125ce 100644
--- a/shared-bindings/adcbuffer/__init__.c
+++ b/shared-bindings/adcbuffer/__init__.c
@@ -30,47 +30,47 @@
 #include "shared-bindings/adcbuffer/__init__.h"
 #include "shared-bindings/adcbuffer/BufferedInput.h"
 
-// #ifdef CIRCUITPY_BUFFEREDINPUT#endif
+/// #ifdef CIRCUITPY_BUFFEREDINPUT#endif
 
-//| """Analog buffered hardware support
-//|
-//| The `adcbuffer` module contains classes to provide access to analog-to-digital
-//| conversion and digital-to-analog (DAC) for multiple value transfer.
-//|
-//| All classes change hardware state and should be deinitialized when they
-//| are no longer needed if the program continues after use. To do so, either
-//| call :py:meth:`!deinit` or use a context manager. See
-//| :ref:`lifetime-and-contextmanagers` for more info.
-//|
-//| For example::
-//|
-//|   import adcbuffer
+/// """Analog buffered hardware support
+///
+/// The `adcbuffer` module contains classes to provide access to analog-to-digital
+/// conversion and digital-to-analog (DAC) for multiple value transfer.
+///
+/// All classes change hardware state and should be deinitialized when they
+/// are no longer needed if the program continues after use. To do so, either
+/// call :py:meth:`!deinit` or use a context manager. See
+/// :ref:`lifetime-and-contextmanagers` for more info.
+///
+/// For example::
+///
+///   import adcbuffer
 ///   import array
-//|   from board import *
-//|
+///   from board import *
+///
 ///   length = 5000000
 ///   mybuffer = array.array("H", [0] * length)
-//|   adcbuf_obj = adcbuffer.BufferdInPut(GP26, mybuffer, length)
-//|   adcbuffer.readmultiple()
-//|   print(*mybuffer)
-//|   adcbuf_obj.deinit()
-//|
-//| This example will initialize the the device, read and fill
-//| :py:data:`~adcbuffer.BufferdInPut` to mybuffer and then
-//| :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
-//| because CircuitPython will do it automatically after the program finishes.
-//|
-//| TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
-//| Learn guide `_
-//|
-//| TODO: For more information on using `adcbuffer`, see `this additional Learn guide
-//| `_
-//| """
-//|
+///   adcbuf_obj = adcbuffer.BufferedInPut(GP26, mybuffer, length)
+///   adcbuffer.readmultiple()
+///   print(*mybuffer)
+///   adcbuf_obj.deinit()
+///
+/// This example will initialize the the device, read and fill
+/// :py:data:`~adcbuffer.BufferedInPut` to mybuffer and then
+/// :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
+/// because CircuitPython will do it automatically after the program finishes.
+///
+/// TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
+/// Learn guide `_
+///
+/// TODO: For more information on using `adcbuffer`, see `this additional Learn guide
+/// `_
+/// """
+///
 
 STATIC const mp_rom_map_elem_t adcbuffer_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adcbuffer) },
-    { MP_ROM_QSTR(MP_QSTR_Bufferedinput),   MP_ROM_PTR(&adcbuffer_bufferedinput_type) },
+    { MP_ROM_QSTR(MP_QSTR_BufferedInput),   MP_ROM_PTR(&adcbuffer_bufferedinput_type) },
     // #ifdef CIRCUITPY_BUFFEREDINPUT    #endif
 };
 

From 68671399d16a0cd2f185df6ca9242642e286ec8e Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Fri, 19 Aug 2022 10:51:13 -0400
Subject: [PATCH 0875/2403] More formating

---
 ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c   | 9 ++++-----
 .../adcbuffer/{BufferdInput.c => BufferedInput.c}        | 0
 .../adcbuffer/{BufferdInput.h => BufferedInput.h}        | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename shared-bindings/adcbuffer/{BufferdInput.c => BufferedInput.c} (100%)
 rename shared-bindings/adcbuffer/{BufferdInput.h => BufferedInput.h} (100%)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index d4ae246089..1e37e640f3 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -50,11 +50,10 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     claim_pin(pin);
 
     // validate pin number
-    if (pin->number < ADC_FIRST_PIN_NUMBER) {
-        and(pin->number >= ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT) {
-            raise_ValueError_invalid_pins();
-        }
+    if (pin->number < ADC_FIRST_PIN_NUMBER && pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
+        raise_ValueError_invalid_pins();
     }
+
     // TODO: find a wat to accept ADC4 for temperature
     self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
 
@@ -123,7 +122,6 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
 
 }
 
-
 bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self) {
     return self->pin == NULL;
 }
@@ -144,6 +142,7 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
 bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
 
     // uint32_t cdl = self->len / 2 - 1;
+    uint32_t cdl = self->len;
 
     dma_channel_configure(self->dma_chan, &(self->cfg),
         self->buffer,   // dst
diff --git a/shared-bindings/adcbuffer/BufferdInput.c b/shared-bindings/adcbuffer/BufferedInput.c
similarity index 100%
rename from shared-bindings/adcbuffer/BufferdInput.c
rename to shared-bindings/adcbuffer/BufferedInput.c
diff --git a/shared-bindings/adcbuffer/BufferdInput.h b/shared-bindings/adcbuffer/BufferedInput.h
similarity index 100%
rename from shared-bindings/adcbuffer/BufferdInput.h
rename to shared-bindings/adcbuffer/BufferedInput.h

From 61591ac136cd8c1160aabe9ed0ad674eeb0c56ef Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Fri, 19 Aug 2022 13:17:37 -0400
Subject: [PATCH 0876/2403]  adding __init.c to circuitpy_defs.mk

---
 py/circuitpy_defns.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 515b5bf04c..b295647da6 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -388,6 +388,7 @@ SRC_COMMON_HAL_ALL = \
 	_pew/PewPew.c \
 	_pew/__init__.c \
 	adcbuffer/BufferedInput.c \
+	adcbuffer/__init__.c \
 	alarm/SleepMemory.c \
 	alarm/__init__.c \
 	alarm/pin/PinAlarm.c \

From 802cff2286bccab39daf532b67ae1ab6bc1276ff Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 19 Aug 2022 11:20:47 -0700
Subject: [PATCH 0877/2403] Fix scroll area shift with scale > 1

Fixes #6775
---
 supervisor/shared/display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index fdd0a0341a..336819e10c 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -67,7 +67,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     bool reset_tiles = false;
     uint16_t width_in_tiles = width_px / scroll_area->tile_width;
     // determine scale based on width
-    if (width_in_tiles < 80) {
+    if (width_in_tiles <= 80) {
         scale = 1;
     }
 
@@ -133,7 +133,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         #else
         scroll_area->y = title_bar->tile_height;
         #endif
-        int16_t extra_height = (scroll_area->pixel_height + scroll_area->y) - height_px;
+        int16_t extra_height = (scroll_area->pixel_height + scroll_area->y) - (height_px / scale);
         // Subtract extra height so that the bottom line fully shows. The top line will be under the
         // title bar and Blinka logo.
         scroll_area->y -= extra_height;

From f134f86291e717abf50341853e93609b1284942e Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Fri, 19 Aug 2022 15:13:38 -0500
Subject: [PATCH 0878/2403] Two small fixes, remove hardcoded height and
 non-scale issues

---
 shared-bindings/is31fl3741/IS31FL3741.h | 2 +-
 shared-module/is31fl3741/FrameBuffer.c  | 9 +++++----
 shared-module/is31fl3741/IS31FL3741.c   | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/shared-bindings/is31fl3741/IS31FL3741.h b/shared-bindings/is31fl3741/IS31FL3741.h
index 2b81b01617..62302a3ac2 100644
--- a/shared-bindings/is31fl3741/IS31FL3741.h
+++ b/shared-bindings/is31fl3741/IS31FL3741.h
@@ -46,4 +46,4 @@ void common_hal_is31fl3741_send_reset(is31fl3741_IS31FL3741_obj_t *self);
 void common_hal_is31fl3741_set_current(is31fl3741_IS31FL3741_obj_t *self, uint8_t current);
 uint8_t common_hal_is31fl3741_get_current(is31fl3741_IS31FL3741_obj_t *self);
 void common_hal_is31fl3741_set_led(is31fl3741_IS31FL3741_obj_t *self, uint16_t led, uint8_t level, uint8_t page);
-void common_hal_is31fl3741_draw_pixel(is31fl3741_IS31FL3741_obj_t *self, int16_t x, int16_t y, uint32_t color, uint16_t *mapping);
+void common_hal_is31fl3741_draw_pixel(is31fl3741_IS31FL3741_obj_t *self, int16_t x, int16_t y, uint32_t color, uint16_t *mapping, uint8_t display_height);
diff --git a/shared-module/is31fl3741/FrameBuffer.c b/shared-module/is31fl3741/FrameBuffer.c
index 400f6f843d..d795c0d5e7 100644
--- a/shared-module/is31fl3741/FrameBuffer.c
+++ b/shared-module/is31fl3741/FrameBuffer.c
@@ -141,8 +141,7 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel
     if (!self->paused) {
         common_hal_is31fl3741_begin_transaction(self->is31fl3741);
 
-        uint8_t dirty_row_flags = 0xFF; // only supports 8 rows gotta fix
-
+        uint8_t dirty_row_flags = 0xFF;
         if (self->scale) {
             // Based on the Arduino IS31FL3741 driver code
             // dirtyrows flag current not implemented for scaled displays
@@ -173,7 +172,7 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel
                     } else {
                         color = (rsum << 16) + (gsum << 8) + bsum;
                     }
-                    common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping);
+                    common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->height);
                 }
             }
         } else {
@@ -194,9 +193,11 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel
                             color = *buffer;
                         }
 
-                        common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping);
+                        common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->height);
                         buffer++;
                     }
+                } else {
+                    buffer += self->width; // row did not have to be redrawn, skip it in the buffer
                 }
             }
         }
diff --git a/shared-module/is31fl3741/IS31FL3741.c b/shared-module/is31fl3741/IS31FL3741.c
index bb92b5b32c..08598743b7 100644
--- a/shared-module/is31fl3741/IS31FL3741.c
+++ b/shared-module/is31fl3741/IS31FL3741.c
@@ -148,16 +148,17 @@ void common_hal_is31fl3741_set_led(is31fl3741_IS31FL3741_obj_t *self, uint16_t l
     common_hal_busio_i2c_write(self->i2c, self->device_address, cmd, 2);
 }
 
-void common_hal_is31fl3741_draw_pixel(is31fl3741_IS31FL3741_obj_t *self, int16_t x, int16_t y, uint32_t color, uint16_t *mapping) {
+void common_hal_is31fl3741_draw_pixel(is31fl3741_IS31FL3741_obj_t *self, int16_t x, int16_t y, uint32_t color, uint16_t *mapping, uint8_t display_height) {
     uint8_t r = color >> 16 & 0xFF;
     uint8_t g = color >> 8 & 0xFF;
     uint8_t b = color & 0xFF;
 
-    int16_t x1 = (x * 5 + y) * 3;
+    int16_t x1 = (x * display_height + y) * 3;
     uint16_t ridx = mapping[x1 + 2];
     if (ridx != 65535) {
         uint16_t gidx = mapping[x1 + 1];
         uint16_t bidx = mapping[x1 + 0];
+
         common_hal_is31fl3741_set_led(self, ridx, r, 0);
         common_hal_is31fl3741_set_led(self, gidx, g, 0);
         common_hal_is31fl3741_set_led(self, bidx, b, 0);

From ffc7e2b0c26a93580f1015d55b8225043df1a35c Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Fri, 19 Aug 2022 21:27:08 +0000
Subject: [PATCH 0879/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 99.1% (994 of 1003 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 2edd1eef17..e0f94ef47d 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,8 +7,8 @@ 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: 2022-08-05 14:18+0000\n"
-"Last-Translator: River Wang \n"
+"PO-Revision-Date: 2022-08-19 23:08+0000\n"
+"Last-Translator: hexthat \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -93,7 +93,7 @@ msgstr "%q hé %q bāo hán chóng fù yǐn jiǎo"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q hé %q bìxū bùtóng"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
@@ -117,11 +117,11 @@ msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q chūshǐhuà shībài"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q de chángdù bìxū shì %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
@@ -129,19 +129,19 @@ msgstr "%q cháng dù bì xū wéi %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q chángdù bìxū <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q chángdù bìxū >= %d"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
-msgstr "%q cháng dù bì xū >= 1"
+msgstr "%q cháng dù bìxū >= 1"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q bìxū %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
@@ -149,19 +149,19 @@ msgstr "%q bì xū wéi %d-%d"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "sāng %q wèi True shí, %q bìxū wèi 1"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
-msgstr "%q bì xū <= %d"
+msgstr "%q bìxū <= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr "%q bì xū >= %d"
+msgstr "%q bìxū >= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= 0"
-msgstr "%q Bìxū > = 0"
+msgstr "%q bìxū > = 0"
 
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
@@ -169,11 +169,11 @@ msgstr "%q bìxū >= 1"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr "%q bì xū shì yí gè zì fú chuàn"
+msgstr "%q bìxū shì yí gè zì fú chuàn"
 
 #: py/argcheck.c
 msgid "%q must be an int"
-msgstr ""
+msgstr "%q bìxū shì zhěng xíng"
 
 #: py/argcheck.c
 msgid "%q must be of type %q"
@@ -218,7 +218,7 @@ msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
@@ -415,7 +415,7 @@ msgstr "suǒyǒu I2C wàishè dōu zài shǐyòng zhōng"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "suǒyǒu I2C mùbiāo dōu zài shǐyòng zhōng"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -561,23 +561,20 @@ msgid "Below minimum frame rate"
 msgstr "dīyú zuìdī zhēnlǜ"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
-#, fuzzy
 msgid "Bit clock and word select must be sequential pins"
-msgstr "wèi shí zhōng hé dān cí xuǎn zé bì xū shì shùn xù yǐn jiǎo"
+msgstr "wèi shízhōng hé zì xuǎnzé bìxū shì liánxù de yǐn jiǎo"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
-#, fuzzy
 msgid "Bit clock and word select must share a clock unit"
-msgstr "Bǐtè shízhōng hé dānzì xuǎnzé bìxū gòngxiǎng shízhōng dānwèi"
+msgstr "wèi shízhōng hé zì xuǎnzé bìxū gòngxiǎng yīgè shízhōng dānyuán"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Bit depth must be multiple of 8."
 msgstr "wèi shēndù bìxū shì 8 de zhěngshùbèi."
 
 #: shared-bindings/bitmaptools/__init__.c
-#, fuzzy
 msgid "Bitmap size and bits per value must match"
-msgstr "wèitú dàxiǎo hé měigè zhí de wèi bìxū pǐpèi"
+msgstr "wèi tú dàxiǎo hé měi gè zhí de wèi shù bìxū pǐpèi"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first device (interface #0)."
@@ -674,7 +671,7 @@ msgstr "Zài fǎngwèn yuánshēn dùixiàng zhīqián diàoyòng super().__init
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "xiàngjī chūshǐhuà"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 #, fuzzy
@@ -766,7 +763,7 @@ msgstr "Wúfǎ zi fēnlèi"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "méiyǒu MOSI hé MISO yǐn jiǎo wúfǎ chuánshū"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
@@ -774,7 +771,7 @@ msgstr "Wúfǎ gēnggǎi yǐ zài shǐyòng de jìshí qì shàng de pínlǜ"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
-msgstr ""
+msgstr "wúfǎ zài yǐn jiǎo biānyuán huànxǐng, zhǐ néng diàn píng"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -891,7 +888,7 @@ msgstr "Xiǎnshì xuánzhuǎn bìxū 90 dù jiā xīn"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "zuò"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -965,7 +962,7 @@ msgstr "Wúfǎ huòdé mutex, err 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
-msgstr ""
+msgstr "wèi néng fēnpèi %q huǎnchōng qū"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
@@ -1051,7 +1048,7 @@ msgstr "Hánshù xūyào suǒdìng"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "GNSS chūshǐhuà"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1086,7 +1083,7 @@ msgstr "Wénjiàn shàng de I/ O cāozuò"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "I2C qǐdòng cuòwù"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 msgid "I2C peripheral in use"
@@ -1202,7 +1199,7 @@ msgstr "nèi bù cuò wù #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 
 #: py/argcheck.c
 msgid "Invalid %q"
@@ -1285,11 +1282,11 @@ msgstr "Guānjiàn zì arg de LHS bìxū shì id"
 
 #: shared-module/displayio/Group.c
 msgid "Layer already in a group"
-msgstr ""
+msgstr "tú céng yǐ zài zǔ zhōng"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "tú céng bìxū shì zǔ huò píng pū wǎng gé zi lèi"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
@@ -1311,11 +1308,11 @@ msgstr "Màikèfēng qǐdòng yánchí bìxū zài 0.0 Dào 1.0 De fànwéi nèi
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched data size"
-msgstr ""
+msgstr "shùjù dàxiǎo bù pǐpèi"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched swap flag"
-msgstr ""
+msgstr "jiāohuàn biāozhì bù pǐpèi"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI Pin"
@@ -1323,7 +1320,7 @@ msgstr "Quēshǎo MISO huò MOSI yǐn jiǎo"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "quēshǎo MISO huò MOSI yǐn jiǎo"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1388,7 +1385,7 @@ msgstr "Míngchēng tài zhǎng"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "New bitmap must be same size as old bitmap"
-msgstr ""
+msgstr "xīn wèi tú de dàxiǎo bìxū yǔ jiù wèi tú xiāngtóng"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 msgid "Nimble out of memory"
@@ -1422,7 +1419,7 @@ msgstr "dì zhǐ: 0x%x shí méi yǒu I2C qì jiàn"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "wú IP"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1431,7 +1428,7 @@ msgstr "Méiyǒu MISO yǐn jiǎo"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "wú MISO pin"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1440,7 +1437,7 @@ msgstr "Méiyǒu MOSI yǐn jiǎo"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "wú MOSI pin"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
@@ -1526,7 +1523,7 @@ msgstr "Shèbèi shàng méiyǒu kònggé"
 
 #: py/moduerrno.c
 msgid "No such device"
-msgstr ""
+msgstr "wú cǐ shèbèi"
 
 #: py/moduerrno.c
 msgid "No such file/directory"
@@ -1580,11 +1577,11 @@ msgstr "Bù zhīchí jīshù"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "guānbì"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "hái hǎo"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1640,7 +1637,7 @@ msgstr "zhǐ yǔn xǔ yí gè dì zhǐ"
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set"
-msgstr ""
+msgstr "zhǐ néng shèzhì yīgè nào líng shíjiān nào líng"
 
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1653,7 +1650,7 @@ msgstr "Yīcì zhǐ néng yǒuyī zhǒng yánsè shì tòumíng de"
 
 #: py/moduerrno.c
 msgid "Operation not permitted"
-msgstr ""
+msgstr "bù yǔnxǔ cāozuò"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
@@ -1690,7 +1687,7 @@ msgstr "Dāng biànliàng_pínlǜ shì False zài jiànzhú shí PWM pínlǜ bù
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "PWM restart"
-msgstr ""
+msgstr "PWM chóngqǐ"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "PWM slice already in use"
@@ -1849,7 +1846,7 @@ msgstr "shōu dào de xiǎng yìng wú xiào"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "chóngxīn liánjiē"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
@@ -1881,7 +1878,7 @@ msgstr "Bù zhīchí SD kǎ CSD géshì"
 
 #: ports/cxd56/common-hal/sdioio/SDCard.c
 msgid "SDCard init"
-msgstr ""
+msgstr "SDCard chūshǐhuà"
 
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
@@ -1899,7 +1896,7 @@ msgstr "SPI pèi zhì shī bài"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI init error"
-msgstr ""
+msgstr "SPI chūshǐhuà cuòwù"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -1907,7 +1904,7 @@ msgstr "SPI wài shè zhèng zài shǐ yòng zhōng"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI re-init"
-msgstr ""
+msgstr "SPI chóngxīn qǐdòng"
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "Scale dimensions must divide by 3"
@@ -2076,7 +2073,7 @@ msgstr "Yào tuìchū, qǐng chóng zhì bǎnkuài ér bùyòng "
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
-msgstr ""
+msgstr "yàngběn zhōng de tōngdào tài duō"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
@@ -2111,20 +2108,20 @@ msgstr "Xūyào Tuple huò struct_time cānshù"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART de-init"
-msgstr ""
+msgstr "UART qù chūshǐhuà"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "UART init"
-msgstr ""
+msgstr "UART chūshǐhuà"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr ""
+msgstr "UART chóngxīn qǐdòng"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
-msgstr ""
+msgstr "UART xiě rù"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
@@ -2276,7 +2273,7 @@ msgstr "Bù zhīchí de géshì"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "bù zhīchí de hā xī suànfǎ"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2441,7 +2438,7 @@ msgstr "shù zǔ hé suǒ yǐn cháng dù bì xū xiāng děng"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "shùzǔ yǒu tài duō wéidù"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2560,7 +2557,7 @@ msgstr "jiàozhǔn zhǐ dú dào"
 #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c
 #: shared-module/vectorio/Rectangle.c
 msgid "can only have one parent"
-msgstr ""
+msgstr "zhǐ néng yǒu yīgè fù xiàng"
 
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
@@ -2733,7 +2730,7 @@ msgstr "tóuyǐng"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "channel re-init"
-msgstr ""
+msgstr "tōngdào chóngxīn chūshǐhuà"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
@@ -2816,7 +2813,7 @@ msgstr "juàn jī cān shǔ bùnéng wéi kōng"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "wénjiàn sǔnhuài"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2913,7 +2910,7 @@ msgstr "kòngxián"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "kōng de wénjiàn"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3186,7 +3183,7 @@ msgstr "suǒyǐn bìxū shì zhěngshù, qiēpiàn huò bù'ěr zhí lièbiǎo"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "init I2C"
-msgstr ""
+msgstr "chūshǐhuà I2C"
 
 #: extmod/ulab/code/scipy/optimize/optimize.c
 msgid "initial values must be iterable"
@@ -3235,7 +3232,7 @@ msgstr "shūrù jǔzhèn shì qíyì de"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "shūrù bìxū shì 1- huò 2-d"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3327,7 +3324,7 @@ msgstr "wúxiào de MicroPython zhuāngshì qì"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "shèzhì wúxiào"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
@@ -3452,7 +3449,7 @@ msgstr "dāng fixed_length de zhí wéi %s shí, max_length bì xū wéi 0-%d"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "zuìdà wéi shù shì "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3698,7 +3695,7 @@ msgstr "jīshù zìfú chuàn"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "off"
-msgstr ""
+msgstr "guānbì"
 
 #: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
@@ -3851,15 +3848,15 @@ msgstr "pow() yǒu 3 cānshù xūyào zhěngshù"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
 msgid "pressing BOOT button at start up.\n"
-msgstr ""
+msgstr "zài qǐdòng shí àn BOOT ànniǔ.\n"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "pressing VOLUME button at start up.\n"
-msgstr ""
+msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
@@ -4132,7 +4129,7 @@ msgstr "děngdài v2 kǎ chāoshí"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr ""
+msgstr "dìngshí qì chóngxīn chūshǐhuà"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"
@@ -4306,11 +4303,11 @@ msgstr "%q bù zhīchí de lèixíng: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "Usecols tài gāo"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "bìxū zhǐdìng usecols guānjiàn zì"
 
 #: py/objint.c
 #, c-format
@@ -4355,7 +4352,7 @@ msgstr "zhǐ dìng de zhóu cuò wù"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "cuòwù de shùjù lèixíng"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4373,7 +4370,7 @@ msgstr "tiáo jiàn shù zǔ de cháng dù cuò wù"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "suǒyǐn shùzǔ de chángdù cuòwù"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From de6929d2bbfabf4bfe813bc002b233048e0967bf Mon Sep 17 00:00:00 2001
From: River Wang 
Date: Fri, 19 Aug 2022 00:15:24 +0000
Subject: [PATCH 0880/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 99.1% (994 of 1003 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index e0f94ef47d..9308032a43 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
 "PO-Revision-Date: 2022-08-19 23:08+0000\n"
-"Last-Translator: hexthat \n"
+"Last-Translator: River Wang \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -758,6 +758,7 @@ msgid "Cannot specify RTS or CTS in RS485 mode"
 msgstr "wú fǎ zài RS485 mó shì xià zhǐ dìng RTS huò CTS"
 
 #: py/objslice.c
+#, fuzzy
 msgid "Cannot subclass slice"
 msgstr "Wúfǎ zi fēnlèi"
 
@@ -804,10 +805,12 @@ msgid ""
 msgstr "Liánjiē yǐ duàn kāi, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xīn de liánjiē."
 
 #: py/persistentcode.c
+#, fuzzy
 msgid "Corrupt .mpy file"
 msgstr "Fǔbài de .mpy wénjiàn"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c
+#, fuzzy
 msgid "Could not retrieve clock"
 msgstr "Wúfǎ huòqǔ shízhōng"
 

From 0b3c74283af2e79f2193d0b605ecec72a5044a89 Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Fri, 19 Aug 2022 23:09:49 +0000
Subject: [PATCH 0881/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 9308032a43..b0988669b3 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,8 +7,8 @@ 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: 2022-08-19 23:08+0000\n"
-"Last-Translator: River Wang \n"
+"PO-Revision-Date: 2022-08-20 14:09+0000\n"
+"Last-Translator: hexthat \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -484,9 +484,8 @@ msgid "Already advertising."
 msgstr "Mùqián zhèngzài guǎngbō."
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
-#, fuzzy
 msgid "Already have all-matches listener"
-msgstr "yǐjīng yǒu all-matches jiāntīngqì"
+msgstr "yǐjīng yǒu all-matches jiāntīng qì"
 
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -674,21 +673,19 @@ msgid "Camera init"
 msgstr "xiàngjī chūshǐhuà"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
-#, fuzzy
 msgid "Can only alarm on RTC IO from deep sleep."
-msgstr "zhǐ néng zài RTC IO shàng cóng shēndù shuìmián zhōng bào jǐng."
+msgstr "Zhǐ néng cóng shēndù shuìmián zhōng duì RTC IO jìnxíng bàojǐng."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
-#, fuzzy
 msgid "Can only alarm on one low pin while others alarm high from deep sleep."
 msgstr ""
-"Zhǐ néng zài yīgè dī diàn píng yǐn jiǎo shàng fāchū jǐngbào, ér qítā yǐn "
-"jiǎo cóng shēndù shuìmián zhōng fāchū gāo diàn píng jǐngbào."
+"Zhǐ néng zài yīgè dī yǐn jiǎo shàng bàojǐng, ér qítā yǐn jiǎo cóng shēndù "
+"shuìmián zhōng fāchū gāo diàn píng bàojǐng."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
-#, fuzzy
 msgid "Can only alarm on two low pins from deep sleep."
-msgstr "zhǐ néng cóng shēn dù shuì mián zhōng bào jǐng liǎng gè dī yǐn jiǎo."
+msgstr ""
+"Zhǐ néng cóng shēndù shuìmián zhōng de liǎng gè dī yǐn jiǎo shàng bàojǐng."
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Characteristic.c
@@ -741,8 +738,7 @@ msgstr "tōng guò USB kě jiàn shí wú fǎ chóng xīn ān zhuāng '/'."
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
-"wúfǎ chóngxīn qǐdòng dào yǐdǎo chéngxù, yīnwéi yǐdǎo chéngxù bù cúnzài."
+msgstr "wúfǎ chóngxīn qǐdòng dào yǐdǎo chéngxù, yīnwéi yǐdǎo chéngxù bù cúnzài"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -758,9 +754,8 @@ msgid "Cannot specify RTS or CTS in RS485 mode"
 msgstr "wú fǎ zài RS485 mó shì xià zhǐ dìng RTS huò CTS"
 
 #: py/objslice.c
-#, fuzzy
 msgid "Cannot subclass slice"
-msgstr "Wúfǎ zi fēnlèi"
+msgstr "bùnéng zi lèi huà qiēpiàn"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
@@ -805,14 +800,12 @@ msgid ""
 msgstr "Liánjiē yǐ duàn kāi, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xīn de liánjiē."
 
 #: py/persistentcode.c
-#, fuzzy
 msgid "Corrupt .mpy file"
-msgstr "Fǔbài de .mpy wénjiàn"
+msgstr "sǔnhuài de .mpy wénjiàn"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c
-#, fuzzy
 msgid "Could not retrieve clock"
-msgstr "Wúfǎ huòqǔ shízhōng"
+msgstr "wúfǎ jiǎnsuǒ shízhōng"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
@@ -1815,7 +1808,7 @@ msgstr "RNG chūshǐhuà cuòwù"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
-msgstr ""
+msgstr "RS485"
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -2344,7 +2337,7 @@ msgstr ""
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "Wi-Fi: "
-msgstr ""
+msgstr "Wi-Fi: "
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -3448,7 +3441,7 @@ msgstr "jǔzhèn bùshì zhèngdìng de"
 #: ports/nrf/common-hal/_bleio/Descriptor.c
 #, c-format
 msgid "max_length must be 0-%d when fixed_length is %s"
-msgstr "dāng fixed_length de zhí wéi %s shí, max_length bì xū wéi 0-%d"
+msgstr "max_length bìxū shì 0-%d, dāng fixed_length shì %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "

From dfd6fa2114853327320db89235888506aa6ecb17 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 21 Aug 2022 03:32:02 +0200
Subject: [PATCH 0882/2403] add serial number to version.json, UID like in
 boot_out.txt

---
 supervisor/shared/web_workflow/web_workflow.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 5d1cbe1c76..3f942b91d3 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -49,6 +49,7 @@
 #include "shared-bindings/hashlib/Hash.h"
 #include "shared-bindings/mdns/RemoteService.h"
 #include "shared-bindings/mdns/Server.h"
+#include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/socketpool/__init__.h"
 #include "shared-bindings/socketpool/Socket.h"
 #include "shared-bindings/socketpool/SocketPool.h"
@@ -768,8 +769,17 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
         "\"creator_id\": %u, "
         "\"creation_id\": %u, "
         "\"hostname\": \"%s\", "
-        "\"port\": %d, "
-        "\"ip\": \"%s\"}", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
+        "\"port\": %d, ", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
+    #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
+    uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
+    common_hal_mcu_processor_get_uid(raw_id);
+    mp_printf(&_socket_print, "\"UID\": \"");
+    for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
+        mp_printf(&_socket_print, "%02X", raw_id[i]);
+    }
+    mp_printf(&_socket_print, "\", ");
+    #endif
+    mp_printf(&_socket_print, "\"ip\": \"%s\"}", _our_ip_encoded);
     // Empty chunk signals the end of the response.
     _send_chunk(socket, "");
 }

From f5655dd48cf367a907ae9d2700746ad5cedbf497 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sun, 21 Aug 2022 11:44:40 -0400
Subject: [PATCH 0883/2403] Fixing Build errors/ DMA Xfer Rate

---
 .../common-hal/adcbuffer/BufferedInput.c      | 26 ++++++++++++-------
 .../common-hal/adcbuffer/BufferedInput.h      |  2 +-
 py/circuitpy_mpconfig.mk                      |  2 +-
 shared-bindings/adcbuffer/BufferedInput.c     | 11 ++------
 shared-bindings/adcbuffer/BufferedInput.h     |  2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index 1e37e640f3..50e043f58a 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -43,7 +43,7 @@
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 
-void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate) {
+void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
 
     // Set pin and channel
     self->pin = pin;
@@ -65,9 +65,10 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
 
     // TODO: checks on length here
 
-    // uint8_t bytes_per_sample
     // Set sample rate
-    // self->bits_per_sample = bytes_per_sample * 8;
+    // NOTE: bits_per_sample = bytes_per_sample * 8;
+    self->bytes_per_sample = bytes_per_sample;
+
     // TODO: Possibly check Rate values here, already u_int
     // NOTE: Anything over 500000 for RP2040 will not
     // exceed DMA conversion sampling rate.
@@ -86,8 +87,8 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
         true,    // Write each completed conversion to the sample FIFO
         true,    // Enable DMA data request (DREQ)
         1,       // DREQ (and IRQ) asserted when at least 1 sample present
-        false,   // We won't see the ERR bit because of 8 bit reads; disable. // ??
-        false    // Shift each sample to 8 bits when pushing to FIFO // ??
+        true,    // We will see the ERR bit because of 12 bit reads; enabled.
+        false    // Do not shift each sample to 8 bits when pushing to FIFO
         );
 
     // Divisor of 0 -> full speed. Free-running capture with the divider is
@@ -98,7 +99,7 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     // intervals). This is all timed by the 48 MHz ADC clock.
     // sample rate determines divisor, not zero.
 
-    adc_set_clkdiv(48000000.0 / self->sample_rate);
+    adc_set_clkdiv((float)48000000.0 / (float)self->sample_rate);
 
     // sleep_ms(1000);
     // Set up the DMA to start transferring data as soon as it appears in FIFO
@@ -109,7 +110,11 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     self->cfg = dma_channel_get_default_config(dma_chan);
 
     // Reading from constant address, writing to incrementing byte addresses
-    channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_16);
+    if (self->bytes_per_sample == 1) {
+        channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_8);
+    } else if (self->bytes_per_sample == 2) {
+        channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_16);
+    }
     channel_config_set_read_increment(&(self->cfg), false);
     channel_config_set_write_increment(&(self->cfg), true);
 
@@ -141,13 +146,14 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
 
 bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
 
-    // uint32_t cdl = self->len / 2 - 1;
-    uint32_t cdl = self->len;
+    // uint32_t cdl = self->len/2 + 1;
+    // uint32_t cdl = 3*self->len/4; //BAD
+    uint32_t cdl = self->len * self->bytes_per_sample;
 
     dma_channel_configure(self->dma_chan, &(self->cfg),
         self->buffer,   // dst
         &adc_hw->fifo,  // src
-        cdl,            // CAPTURE_DEPTH,  // transfer count
+        cdl,            // transfer count
         true            // start immediately
         );
 
diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
index 7fd8f50653..292fecc8a4 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
@@ -47,7 +47,7 @@ typedef struct {
     uint32_t len;
     uint8_t bytes_per_sample;
     bool samples_signed;
-    mp_float_t sample_rate;
+    uint32_t sample_rate;
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 8738966a43..1d4a5765f8 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -65,7 +65,7 @@ CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
-CIRCUITPY_ADCBUFFER ?= 1
+CIRCUITPY_ADCBUFFER ?= 0
 CFLAGS += -DCIRCUITPY_ADCBUFFER=$(CIRCUITPY_ADCBUFFER)
 
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index e47f5e5d7d..67647e680d 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -68,18 +68,12 @@
 ///       """
 ///         ...
 ///
-STATIC void validate_rate(mp_float_t rate) {
-    if (rate < (mp_float_t)1.0f || rate > (mp_float_t)500000.0f) {
-        mp_raise_ValueError(translate("sample rate must be 1.0-500000.0 per second"));
-    }
-}
-
 STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_sample_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_int = 500000} },
+        { MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -103,8 +97,7 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
     }
 
     // Validate sample rate here
-    mp_float_t sample_rate = mp_obj_get_float(args[ARG_sample_rate].u_obj);
-    validate_rate(sample_rate);
+    uint32_t sample_rate = (uint32_t)mp_arg_validate_int_range(args[ARG_sample_rate].u_int, 1, 500000, MP_QSTR_sample_rate);
 
     // Create local object
     adcbuffer_bufferedinput_obj_t *self = m_new_obj(adcbuffer_bufferedinput_obj_t);
diff --git a/shared-bindings/adcbuffer/BufferedInput.h b/shared-bindings/adcbuffer/BufferedInput.h
index 593eee493c..8cd88fed21 100644
--- a/shared-bindings/adcbuffer/BufferedInput.h
+++ b/shared-bindings/adcbuffer/BufferedInput.h
@@ -34,7 +34,7 @@
 
 extern const mp_obj_type_t adcbuffer_bufferedinput_type;
 
-void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, mp_float_t sample_rate);
+void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
 void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self);
 bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self);
 bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self);

From fc21b30762d28a138d63e305d058bf6a33814dc3 Mon Sep 17 00:00:00 2001
From: root 
Date: Sun, 21 Aug 2022 15:09:27 -0500
Subject: [PATCH 0884/2403] Make rotaryio object long-lived

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

diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index 0fe22be262..fe1b0b171b 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -74,7 +74,8 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type,
     const mcu_pin_obj_t *pin_a = validate_obj_is_free_pin(args[ARG_pin_a].u_obj);
     const mcu_pin_obj_t *pin_b = validate_obj_is_free_pin(args[ARG_pin_b].u_obj);
 
-    rotaryio_incrementalencoder_obj_t *self = m_new_obj(rotaryio_incrementalencoder_obj_t);
+    // Make long-lived because some implementations use a pointer to the object as interrupt-handler data.
+    rotaryio_incrementalencoder_obj_t *self = m_new_ll_obj(rotaryio_incrementalencoder_obj_t);
     self->base.type = &rotaryio_incrementalencoder_type;
 
     common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b);

From e23b621d69a0aad69689d6e06037c63b7b9ec81d Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Mon, 22 Aug 2022 18:55:55 -0400
Subject: [PATCH 0885/2403] Fixing 8 bit and 12 bit conversion

---
 .../common-hal/adcbuffer/BufferedInput.c      | 32 +++++++++++--------
 ports/raspberrypi/mpconfigport.mk             |  4 +--
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index 50e043f58a..2f558ef256 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -31,6 +31,7 @@
  * THE SOFTWARE.
  */
 
+#include 
 #include "common-hal/adcbuffer/BufferedInput.h"
 #include "shared-bindings/adcbuffer/BufferedInput.h"
 #include "shared-bindings/microcontroller/Pin.h"
@@ -46,6 +47,7 @@
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
 
     // Set pin and channel
+
     self->pin = pin;
     claim_pin(pin);
 
@@ -82,13 +84,23 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     adc_gpio_init(pin->number);
     adc_select_input(self->chan); // chan = pin - 26 ??
 
+    // self->bytes_per_sample == 1
+    uint dma_size = DMA_SIZE_8;
+    bool show_error_bit = false;
+    bool shift_sample_8_bits = true;
+    if (self->bytes_per_sample == 2) {
+        dma_size = DMA_SIZE_16;
+        show_error_bit = true;
+        shift_sample_8_bits = false;
+    }
+
     // adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
     adc_fifo_setup(
-        true,    // Write each completed conversion to the sample FIFO
-        true,    // Enable DMA data request (DREQ)
-        1,       // DREQ (and IRQ) asserted when at least 1 sample present
-        true,    // We will see the ERR bit because of 12 bit reads; enabled.
-        false    // Do not shift each sample to 8 bits when pushing to FIFO
+        true,               // Write each completed conversion to the sample FIFO
+        true,               // Enable DMA data request (DREQ)
+        1,                  // DREQ (and IRQ) asserted when at least 1 sample present
+        show_error_bit,     // See the ERR bit on 8 bit bit reads
+        shift_sample_8_bits // Shift each sample to 8 bits when pushing to FIFO
         );
 
     // Divisor of 0 -> full speed. Free-running capture with the divider is
@@ -110,11 +122,7 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     self->cfg = dma_channel_get_default_config(dma_chan);
 
     // Reading from constant address, writing to incrementing byte addresses
-    if (self->bytes_per_sample == 1) {
-        channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_8);
-    } else if (self->bytes_per_sample == 2) {
-        channel_config_set_transfer_data_size(&(self->cfg), DMA_SIZE_16);
-    }
+    channel_config_set_transfer_data_size(&(self->cfg), dma_size);
     channel_config_set_read_increment(&(self->cfg), false);
     channel_config_set_write_increment(&(self->cfg), true);
 
@@ -146,9 +154,7 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
 
 bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
 
-    // uint32_t cdl = self->len/2 + 1;
-    // uint32_t cdl = 3*self->len/4; //BAD
-    uint32_t cdl = self->len * self->bytes_per_sample;
+    uint32_t cdl = self->len / self->bytes_per_sample;
 
     dma_channel_configure(self->dma_chan, &(self->cfg),
         self->buffer,   // dst
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index ba6869169f..3e55aa2c38 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -27,8 +27,8 @@ CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
 # Use of adcbuffer
-CIRCUITPYTHON_ADCBUFFER = 1
-
+#CIRCUITPYTHON_ADCBUFFER = 1
+CIRCUITPY_ADCBUFFER = 1
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO ?= 1

From e920c977d4519c4a0d6fdc301f959a359b0439d8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 23 Aug 2022 14:57:26 -0500
Subject: [PATCH 0886/2403] hashlib: fix the 'digest_size' property

Closes: #6796
---
 shared-bindings/hashlib/Hash.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c
index e27b71ef78..896526983a 100644
--- a/shared-bindings/hashlib/Hash.c
+++ b/shared-bindings/hashlib/Hash.c
@@ -39,12 +39,13 @@
 //|     digest_size: int
 //|     """Digest size in bytes"""
 //|
-STATIC mp_obj_t hashlib_hash_get_digest_size(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_hash_digest_size_get(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
     hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_hashlib_hash_get_digest_size(self));
 }
-MP_PROPERTY_GETTER(hashlib_hash_digest_size_obj, hashlib_hash_get_digest_size);
+MP_DEFINE_CONST_FUN_OBJ_1(hashlib_hash_digest_size_get_obj, hashlib_hash_digest_size_get);
+MP_PROPERTY_GETTER(hashlib_hash_digest_size_obj, (mp_obj_t)&hashlib_hash_digest_size_get_obj);
 
 //|     def update(self, data: ReadableBuffer) -> None:
 //|         """Update the hash with the given bytes.

From 3daebb36c3bccff2e490b37519ee12eddeeca759 Mon Sep 17 00:00:00 2001
From: root 
Date: Tue, 23 Aug 2022 15:17:54 -0500
Subject: [PATCH 0887/2403] Fix handling of zero-length pulseout pulse

---
 ports/nrf/common-hal/pulseio/PulseOut.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/nrf/common-hal/pulseio/PulseOut.c b/ports/nrf/common-hal/pulseio/PulseOut.c
index 2f822b4184..2945ac7022 100644
--- a/ports/nrf/common-hal/pulseio/PulseOut.c
+++ b/ports/nrf/common-hal/pulseio/PulseOut.c
@@ -74,6 +74,11 @@ static void pulseout_event_handler(nrf_timer_event_t event_type, void *p_context
     nrfx_timer_pause(timer);
 
     pulse_array_index++;
+    // Ignore a zero-length pulse
+    while (pulse_array[pulse_array_index] == 0 &&
+           pulse_array_index < pulse_array_length) {
+        pulse_array_index++;
+    }
 
     // No more pulses. Turn off output and don't restart.
     if (pulse_array_index >= pulse_array_length) {

From c00a630f50dd105b43ff40073fcd788f71901fdf Mon Sep 17 00:00:00 2001
From: DavePutz 
Date: Tue, 23 Aug 2022 15:58:27 -0500
Subject: [PATCH 0888/2403] Update PulseOut.c

reorder the tests for zero-length
---
 ports/nrf/common-hal/pulseio/PulseOut.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/common-hal/pulseio/PulseOut.c b/ports/nrf/common-hal/pulseio/PulseOut.c
index 2945ac7022..c2d59ffdba 100644
--- a/ports/nrf/common-hal/pulseio/PulseOut.c
+++ b/ports/nrf/common-hal/pulseio/PulseOut.c
@@ -75,8 +75,8 @@ static void pulseout_event_handler(nrf_timer_event_t event_type, void *p_context
 
     pulse_array_index++;
     // Ignore a zero-length pulse
-    while (pulse_array[pulse_array_index] == 0 &&
-           pulse_array_index < pulse_array_length) {
+    while (pulse_array_index < pulse_array_length &&
+           pulse_array[pulse_array_index] == 0) {
         pulse_array_index++;
     }
 

From aab5fac67b7ef963bac2c9404c7dba584229611e Mon Sep 17 00:00:00 2001
From: Maxim Kulkin 
Date: Mon, 15 Aug 2022 20:46:28 -0400
Subject: [PATCH 0889/2403] shared-module/usb_hid: Fix behavior of
 Device.get_last_received_report()

Documentation states that get_last_received_report() function should
return None if there was no report received previously, otherwise it
should return report. Moreover, same report should be returned only
once. That makes it possible to reliably process incoming OUT/Feature
reports.

This patch adds an array that stores flags if report with particular
ID was received and updates get_last_received_report() to match its
documentation.
---
 shared-module/usb_hid/Device.c | 7 +++++++
 shared-module/usb_hid/Device.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c
index f92c93baa3..680bb83893 100644
--- a/shared-module/usb_hid/Device.c
+++ b/shared-module/usb_hid/Device.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include 
 #include 
 
 #include "py/gc.h"
@@ -241,6 +242,10 @@ void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t *
 mp_obj_t common_hal_usb_hid_device_get_last_received_report(usb_hid_device_obj_t *self, uint8_t report_id) {
     // report_id has already been validated for this device.
     size_t id_idx = get_report_id_idx(self, report_id);
+    if (!self->out_report_buffers_updated[id_idx]) {
+        return mp_const_none;
+    }
+    self->out_report_buffers_updated[id_idx] = false;
     return mp_obj_new_bytes(self->out_report_buffers[id_idx], self->out_report_lengths[id_idx]);
 }
 
@@ -258,6 +263,7 @@ void usb_hid_device_create_report_buffers(usb_hid_device_obj_t *self) {
             ? gc_alloc(self->out_report_lengths[i], false, true /*long-lived*/)
             : NULL;
     }
+    memset(self->out_report_buffers_updated, 0, sizeof(self->out_report_buffers_updated));
 }
 
 
@@ -304,6 +310,7 @@ void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t rep
             hid_device->out_report_buffers[id_idx] &&
             hid_device->out_report_lengths[id_idx] >= bufsize) {
             memcpy(hid_device->out_report_buffers[id_idx], buffer, bufsize);
+            hid_device->out_report_buffers_updated[id_idx] = true;
         }
     }
 }
diff --git a/shared-module/usb_hid/Device.h b/shared-module/usb_hid/Device.h
index f265712be4..06729f3c7d 100644
--- a/shared-module/usb_hid/Device.h
+++ b/shared-module/usb_hid/Device.h
@@ -38,6 +38,7 @@ typedef struct  {
     const uint8_t *report_descriptor;
     uint8_t *in_report_buffers[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint8_t *out_report_buffers[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR];
+    uint8_t out_report_buffers_updated[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint16_t report_descriptor_length;
     uint8_t report_ids[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint8_t in_report_lengths[CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR];

From fa5fcb612d38af2674e4eca4208c7fc659bbd6fc Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 24 Aug 2022 08:56:48 -0400
Subject: [PATCH 0890/2403] remove usb_hid.Device.last_received_report

---
 shared-bindings/usb_hid/Device.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index f0074f9cac..70800ec8c1 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -219,25 +219,6 @@ STATIC mp_obj_t usb_hid_device_get_last_received_report(size_t n_args, const mp_
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_get_last_received_report_obj, 1, usb_hid_device_get_last_received_report);
 
-//|     last_received_report: bytes
-//|     """The HID OUT report as a `bytes` (read-only). `None` if nothing received.
-//|     Same as `get_last_received_report()` with no argument.
-//|
-//|     Deprecated: will be removed in CircutPython 8.0.0. Use `get_last_received_report()` instead.
-//|     """
-//|
-STATIC mp_obj_t usb_hid_device_obj_get_last_received_report_property(mp_obj_t self_in) {
-    usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    // Get the sole report_id, if there is one.
-    const uint8_t report_id = common_hal_usb_hid_device_validate_report_id(self, -1);
-    return common_hal_usb_hid_device_get_last_received_report(self, report_id);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_last_received_report_property_obj, usb_hid_device_obj_get_last_received_report_property);
-
-MP_PROPERTY_GETTER(usb_hid_device_last_received_report_obj,
-    (mp_obj_t)&usb_hid_device_get_last_received_report_property_obj);
-
 //|     usage_page: int
 //|     """The device usage page identifier, which designates a category of device. (read-only)"""
 //|
@@ -269,7 +250,6 @@ MP_PROPERTY_GETTER(usb_hid_device_usage_obj,
 STATIC const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send_report),              MP_ROM_PTR(&usb_hid_device_send_report_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_last_received_report), MP_ROM_PTR(&usb_hid_device_get_last_received_report_obj) },
-    { MP_ROM_QSTR(MP_QSTR_last_received_report),     MP_ROM_PTR(&usb_hid_device_last_received_report_obj) },
     { MP_ROM_QSTR(MP_QSTR_usage_page),               MP_ROM_PTR(&usb_hid_device_usage_page_obj) },
     { MP_ROM_QSTR(MP_QSTR_usage),                    MP_ROM_PTR(&usb_hid_device_usage_obj) },
 

From 6fd08483e28c8eee82137e86c52b97308e1a3828 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Wed, 24 Aug 2022 17:41:51 -0400
Subject: [PATCH 0891/2403] Tidying code for PR/ Minor Issues

---
 .../common-hal/adcbuffer/BufferedInput.c      |  26 ++--
 ports/raspberrypi/mpconfigport.mk             |   2 +-
 py/circuitpy_defns.mk                         |   8 --
 shared-bindings/adcbuffer/BufferedInput.c     | 112 ++++++++----------
 shared-bindings/adcbuffer/BufferedInput.h     |   2 -
 shared-bindings/adcbuffer/__init__.c          |  72 ++++++-----
 6 files changed, 95 insertions(+), 127 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index 2f558ef256..50f2dc5d1a 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -46,34 +46,24 @@
 
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
 
-    // Set pin and channel
-
-    self->pin = pin;
-    claim_pin(pin);
-
-    // validate pin number
+    // Make sure pin number is in range for ADC
     if (pin->number < ADC_FIRST_PIN_NUMBER && pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
         raise_ValueError_invalid_pins();
     }
 
-    // TODO: find a wat to accept ADC4 for temperature
-    self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
+    // Set pin and channel
+    self->pin = pin;
+    claim_pin(pin);
 
-    // TODO: Checks on chan value here
+    // TODO: find a way to accept ADC4 for temperature
+    self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
 
     // Set buffer and length
     self->buffer = buffer;
     self->len = len;
 
-    // TODO: checks on length here
-
-    // Set sample rate
-    // NOTE: bits_per_sample = bytes_per_sample * 8;
+    // Set sample rate - used in readmultiple
     self->bytes_per_sample = bytes_per_sample;
-
-    // TODO: Possibly check Rate values here, already u_int
-    // NOTE: Anything over 500000 for RP2040 will not
-    // exceed DMA conversion sampling rate.
     self->sample_rate = sample_rate;
 
     // Standard IO Init
@@ -111,9 +101,9 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     // intervals). This is all timed by the 48 MHz ADC clock.
     // sample rate determines divisor, not zero.
 
+    // sample_rate is forced to be >= 1 in shared-bindings
     adc_set_clkdiv((float)48000000.0 / (float)self->sample_rate);
 
-    // sleep_ms(1000);
     // Set up the DMA to start transferring data as soon as it appears in FIFO
     uint dma_chan = dma_claim_unused_channel(true);
     self->dma_chan = dma_chan;
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 3e55aa2c38..d33f3640c7 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -27,8 +27,8 @@ CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
 # Use of adcbuffer
-#CIRCUITPYTHON_ADCBUFFER = 1
 CIRCUITPY_ADCBUFFER = 1
+
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO ?= 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index b295647da6..43a6932f57 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -484,14 +484,6 @@ SRC_C += \
 
 endif
 
-#ifeq ($(CIRCUITPYTHON_ADCBUFFER),1)
-# Needed for ADCBUFFER
-#SRC_COMMON_HAL_ALL += \
-#		adcbuffer/BufferedInput.c \
-#
-#endif
-
-
 SRC_COMMON_HAL = $(filter $(SRC_PATTERNS), $(SRC_COMMON_HAL_ALL))
 
 # These don't have corresponding files in each port but are still located in
diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index 67647e680d..99da047e53 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -37,37 +37,37 @@
 #include "shared-bindings/adcbuffer/BufferedInput.h"
 #include "shared-bindings/util.h"
 
-/// class BufferedInput:
-///     """Input analog voltage level to supplied buffer using DMA Capture"""
-///
-///     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
-///         """Use the BufferedInput on the given pin. Fill the given buffer from ADC read values at the supplied
-///         sample_rate.
-///
-///         :param ~microcontroller.Pin pin: the pin to read from"""
-///         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
-///         :param ~int sample_rate: rate: The desired playback sample rate
-///
-///     Usage::
-///
-///       import board
-///       import adcbuffer
-///       import array
-///
-///       length = 1000
-///       mybuffer = array.array("H", [0] * length)
-///       rate = 500000
-///       adcbuf = adcbuffer.BufferedInput(board.GP26, mybuffer, rate)
-///       adcbuf.readmultiple()
-///       adcbuf.deinit()
-///       for i in range(length):
-///           print(i, mybuffer[i])
-///
-///       (TODO) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
-///       (TODO) Provide mechanism to read CPU Temperature
-///       """
-///         ...
-///
+//| class BufferedInput:
+//|     """Input analog voltage level to supplied buffer using DMA Capture"""
+//|
+//|     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
+//|         """Use the BufferedInput on the given pin. Fill the given buffer from ADC read values at the supplied
+//|         sample_rate.
+//|
+//|         :param ~microcontroller.Pin pin: the pin to read from"""
+//|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
+//|         :param ~int sample_rate: rate: The desired playback sample rate
+//|
+//|     Usage::
+//|
+//|       import board
+//|       import adcbuffer
+//|       import array
+//|
+//|       length = 1000
+//|       mybuffer = array.array("H", [0] * length)
+//|       rate = 500000
+//|       adcbuf = adcbuffer.BufferedInput(board.GP26, mybuffer, rate)
+//|       adcbuf.readmultiple()
+//|       adcbuf.deinit()
+//|       for i in range(length):
+//|           print(i, mybuffer[i])
+//|
+//|       (TODO) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
+//|       (TODO) Provide mechanism to read CPU Temperature
+//|       """
+//|         ...
+//|
 STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
@@ -116,10 +116,10 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
     return MP_OBJ_FROM_PTR(self);
 }
 
-///     def deinit(self) -> None:
-///         """Turn off the BufferedInput and release the pin for other use."""
-///         ...
-///
+//|     def deinit(self) -> None:
+//|         """Turn off the BufferedInput and release the pin for other use."""
+//|         ...
+//|
 STATIC mp_obj_t adcbuffer_bufferedinput_deinit(mp_obj_t self_in) {
     adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_adcbuffer_bufferedinput_deinit(self);
@@ -132,17 +132,14 @@ STATIC void check_for_deinit(adcbuffer_bufferedinput_obj_t *self) {
         raise_deinited_error();
     }
 }
-///     def __enter__(self) -> BufferedInput:
-///         """No-op used by Context Managers."""
-///         ...
-///
-///  Provided by context manager helper.
-///
-///     def __exit__(self) -> None:
-///         """Automatically deinitializes the hardware when exiting a context. See
-///         :ref:`lifetime-and-contextmanagers` for more info."""
-///         ...
-///
+
+//|  Provided by context manager helper.
+//|
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
 STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_adcbuffer_bufferedinput_deinit(args[0]);
@@ -150,12 +147,14 @@ STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj, 4, 4, adcbuffer_bufferedinput___exit__);
 
-///     value: int
-///     """The value on the analog pin between 0 and 65535 inclusive (16-bit). (read-only)
-///
-///     Even if the underlying analog to digital converter (ADC) is lower
-///     resolution, the value is 16-bit."""
-///
+//|     value: --> None
+//|     """Fills the supplied buffer with ADC values using DMA transfer.
+//|     If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
+//|     If buffer is 16-bit, then values are not shifted and error bit is present.
+//|     Number of transfers is always the number of samples which is the array
+//|     byte length divided by the byte_per_sample. """
+//|     ...
+//|
 STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
     adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -163,15 +162,6 @@ STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_readmultiple_obj, adcbuffer_bufferedinput_obj_readmultiple);
 
-/// MP_PROPERTY_GETTER(adcbuffer_bufferedinput_value_obj,
-///    (mp_obj_t)&adcbuffer_bufferedinput_get_value_obj);
-///
-///     reference_voltage: float
-///     """The maximum voltage measurable (also known as the reference voltage) as a
-///     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
-///     at ends of the analog range."""
-///
-
 STATIC const mp_rom_map_elem_t adcbuffer_bufferedinput_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&adcbuffer_bufferedinput_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
diff --git a/shared-bindings/adcbuffer/BufferedInput.h b/shared-bindings/adcbuffer/BufferedInput.h
index 8cd88fed21..42b9f94558 100644
--- a/shared-bindings/adcbuffer/BufferedInput.h
+++ b/shared-bindings/adcbuffer/BufferedInput.h
@@ -30,8 +30,6 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/adcbuffer/BufferedInput.h"
 
-// #ifdef CIRCUITPY_BUFFEREDINPUT #endif
-
 extern const mp_obj_type_t adcbuffer_bufferedinput_type;
 
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/adcbuffer/__init__.c
index 34b87125ce..4d5fefc26e 100644
--- a/shared-bindings/adcbuffer/__init__.c
+++ b/shared-bindings/adcbuffer/__init__.c
@@ -30,43 +30,41 @@
 #include "shared-bindings/adcbuffer/__init__.h"
 #include "shared-bindings/adcbuffer/BufferedInput.h"
 
-/// #ifdef CIRCUITPY_BUFFEREDINPUT#endif
-
-/// """Analog buffered hardware support
-///
-/// The `adcbuffer` module contains classes to provide access to analog-to-digital
-/// conversion and digital-to-analog (DAC) for multiple value transfer.
-///
-/// All classes change hardware state and should be deinitialized when they
-/// are no longer needed if the program continues after use. To do so, either
-/// call :py:meth:`!deinit` or use a context manager. See
-/// :ref:`lifetime-and-contextmanagers` for more info.
-///
-/// For example::
-///
-///   import adcbuffer
-///   import array
-///   from board import *
-///
-///   length = 5000000
-///   mybuffer = array.array("H", [0] * length)
-///   adcbuf_obj = adcbuffer.BufferedInPut(GP26, mybuffer, length)
-///   adcbuffer.readmultiple()
-///   print(*mybuffer)
-///   adcbuf_obj.deinit()
-///
-/// This example will initialize the the device, read and fill
-/// :py:data:`~adcbuffer.BufferedInPut` to mybuffer and then
-/// :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
-/// because CircuitPython will do it automatically after the program finishes.
-///
-/// TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
-/// Learn guide `_
-///
-/// TODO: For more information on using `adcbuffer`, see `this additional Learn guide
-/// `_
-/// """
-///
+//| """Analog buffered hardware support
+//|
+//| The `adcbuffer` module contains classes to provide access to analog-to-digital
+//| conversion and digital-to-analog (DAC) for multiple value transfer.
+//|
+//| All classes change hardware state and should be deinitialized when they
+//| are no longer needed if the program continues after use. To do so, either
+//| call :py:meth:`!deinit` or use a context manager. See
+//| :ref:`lifetime-and-contextmanagers` for more info.
+//|
+//| For example::
+//|
+//|   import adcbuffer
+//|   import array
+//|   from board import *
+//|
+//|   length = 5000000
+//|   mybuffer = array.array("H", [0] * length)
+//|   adcbuf_obj = adcbuffer.BufferedInput(GP26, mybuffer, length)
+//|   adcbuffer.readmultiple()
+//|   print(*mybuffer)
+//|   adcbuf_obj.deinit()
+//|
+//| This example will initialize the the device, read and fill
+//| :py:data:`~adcbuffer.BufferedInPut` to mybuffer and then
+//| :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
+//| because CircuitPython will do it automatically after the program finishes.
+//|
+//| TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
+//| Learn guide `_
+//|
+//| TODO: For more information on using `adcbuffer`, see `this additional Learn guide
+//| `_
+//| """
+//|
 
 STATIC const mp_rom_map_elem_t adcbuffer_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adcbuffer) },

From 1ae4d881fd97dd7f03872a883df755181f32d197 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Wed, 24 Aug 2022 14:50:42 -0700
Subject: [PATCH 0892/2403] Allow Move/Rename to be called from localhost

---
 docs/workflows.md                             | 2 +-
 supervisor/shared/web_workflow/web_workflow.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 7938c441f2..576bfbdb5b 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -138,7 +138,7 @@ root will be returned.
 When requested with the `OPTIONS` method, the server will respond with CORS related headers. Most
 aren't needed for API use. They are there for the web browser.
 
-* `Access-Control-Allow-Methods` - Varies with USB state. `GET, OPTIONS` when USB is active. `GET, OPTIONS, PUT, DELETE` otherwise.
+* `Access-Control-Allow-Methods` - Varies with USB state. `GET, OPTIONS` when USB is active. `GET, OPTIONS, PUT, DELETE, MOVE` otherwise.
 
 Example:
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 3f942b91d3..5d6429aaa3 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -511,10 +511,10 @@ static void _reply_access_control(socketpool_socket_obj_t *socket, _request *req
         "HTTP/1.1 204 No Content\r\n",
         "Content-Length: 0\r\n",
         "Access-Control-Expose-Headers: Access-Control-Allow-Methods\r\n",
-        "Access-Control-Allow-Headers: X-Timestamp, Content-Type, Authorization\r\n",
+        "Access-Control-Allow-Headers: X-Timestamp, X-Destination, Content-Type, Authorization\r\n",
         "Access-Control-Allow-Methods:GET, OPTIONS", NULL);
     if (!_usb_active()) {
-        _send_str(socket, ", PUT, DELETE");
+        _send_str(socket, ", PUT, DELETE, MOVE");
         #if CIRCUITPY_USB_MSC
         usb_msc_unlock();
         #endif

From 76ce46a530c708212e1fbe9cbfbf6e20bfae1bc5 Mon Sep 17 00:00:00 2001
From: Maxim Kulkin 
Date: Wed, 24 Aug 2022 17:59:09 -0400
Subject: [PATCH 0893/2403] shared-bindings/usb_hid: Fix docs for
 Device.get_last_received_report()

Update documentation for Device.get_last_received_report() fixing
type signature and adding note on "consume" behavior.
---
 shared-bindings/usb_hid/Device.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index f0074f9cac..fbb78a482e 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -191,10 +191,11 @@ STATIC mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_ar
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_send_report_obj, 1, usb_hid_device_send_report);
 
-//|     def get_last_received_report(self, report_id: Optional[int] = None) -> bytes:
+//|     def get_last_received_report(self, report_id: Optional[int] = None) -> Optional[bytes]:
 //|         """Get the last received HID OUT or feature report for the given report ID.
 //|         The report ID may be omitted if there is no report ID, or only one report ID.
-//|         Return `None` if nothing received.
+//|         Return `None` if nothing received. After returning a report, subsequent calls
+//|         will return `None` until next report is received.
 //|         """
 //|         ...
 //|

From c395e0d217139c45a0e29ac19c0121ba0ec60c04 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Wed, 24 Aug 2022 20:48:32 -0400
Subject: [PATCH 0894/2403] Fix type annotation in
 adafruit_bus_device.SPIDevice.__init__()

---
 shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index b8325f28c3..2f34a60e86 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -41,7 +41,7 @@
 //| class SPIDevice:
 //|     """SPI Device Manager"""
 //|
-//|     def __init__(self, spi: busio.SPI, chip_select: microcontroller.Pin, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, extra_clocks : int = 0) -> None:
+//|     def __init__(self, spi: busio.SPI, chip_select: digitalio.DigitalInOut, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, extra_clocks : int = 0) -> None:
 //|
 //|         """
 //|         Represents a single SPI device and manages locking the bus and the device address.

From 532ae2a39dfb10ad3fe9b56c0f12fcbb9fac52dc Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 25 Aug 2022 11:57:07 -0400
Subject: [PATCH 0895/2403] Fixing Document issues

---
 shared-bindings/adcbuffer/BufferedInput.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index 99da047e53..f84a5c6069 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -63,10 +63,10 @@
 //|       for i in range(length):
 //|           print(i, mybuffer[i])
 //|
-//|       (TODO) The reference voltage varies by platform so use ``reference_voltage`` to read the configured setting.
-//|       (TODO) Provide mechanism to read CPU Temperature
-//|       """
-//|         ...
+//|       (TODO) The reference voltage varies by platform so use
+//|       ``reference_voltage`` to read the configured setting.
+//|       (TODO) Provide mechanism to read CPU Temperature."""
+//|       ...
 //|
 STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
@@ -152,7 +152,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj,
 //|     If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
 //|     If buffer is 16-bit, then values are not shifted and error bit is present.
 //|     Number of transfers is always the number of samples which is the array
-//|     byte length divided by the byte_per_sample. """
+//|     byte length divided by the bytes_per_sample."""
 //|     ...
 //|
 STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {

From 7cd969e23675061415d9da3e7f2b85968f01f32b Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Thu, 25 Aug 2022 17:09:50 -0400
Subject: [PATCH 0896/2403] Fixing document triple quotes

---
 shared-bindings/adcbuffer/BufferedInput.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index f84a5c6069..25e1b75cd7 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -44,7 +44,7 @@
 //|         """Use the BufferedInput on the given pin. Fill the given buffer from ADC read values at the supplied
 //|         sample_rate.
 //|
-//|         :param ~microcontroller.Pin pin: the pin to read from"""
+//|         :param ~microcontroller.Pin pin: the pin to read from
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
 //|         :param ~int sample_rate: rate: The desired playback sample rate
 //|
@@ -147,13 +147,12 @@ STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj, 4, 4, adcbuffer_bufferedinput___exit__);
 
-//|     value: --> None
-//|     """Fills the supplied buffer with ADC values using DMA transfer.
+//|     value: None
+//|         """Fills the supplied buffer with ADC values using DMA transfer.
 //|     If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
 //|     If buffer is 16-bit, then values are not shifted and error bit is present.
 //|     Number of transfers is always the number of samples which is the array
 //|     byte length divided by the bytes_per_sample."""
-//|     ...
 //|
 STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
     adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);

From 8ed6a6135ab6020696cc24ec60eaf4407b48d9a1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 23 Aug 2022 11:34:03 -0500
Subject: [PATCH 0897/2403] Disable camera on boards without psram

---
 .../adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk    | 1 +
 .../boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk     | 1 +
 .../espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk  | 1 +
 .../boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk        | 1 +
 ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk  | 1 +
 .../boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk       | 1 +
 .../boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk       | 1 +
 .../boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk       | 1 +
 .../boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk         | 1 +
 ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk  | 1 +
 ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk   | 1 +
 ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk     | 1 +
 ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk    | 1 +
 .../boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk        | 1 +
 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk          | 1 +
 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk           | 1 +
 ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk   | 1 +
 .../espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk | 1 +
 .../boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk        | 1 +
 ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk   | 1 +
 .../espressif/boards/targett_module_clip_wroom/mpconfigboard.mk  | 1 +
 21 files changed, 21 insertions(+)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
index 43c286ae3b..65f13f5b02 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
@@ -19,3 +19,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
index 37979eed6f..a11683b0fe 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index 267217b375..c0052158b3 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -13,3 +13,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
index 49ec368c49..e31f7bd226 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
@@ -20,3 +20,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
index df377b2b6c..d36385d6c8 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -17,3 +17,4 @@ CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
index 7d7ef438f6..cac986b43c 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
index 8e7b09dbc9..ee3aadf421 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
index d6b401ac87..4df2a97e48 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
index 3197d78a31..c6d7ea1a7a 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index 5e09be7b2e..d59926f2a6 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index dc777ecd95..01e85bc35b 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index 04f23bf4bb..03c81eefbe 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
index 77861c0228..169596b1dd 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
index 1d5e3ec719..38af491bec 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index b6d165b82d..6da83550be 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -21,3 +21,4 @@ CIRCUITPY_ESP32_CAMERA = 0
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index 5d6fc8368f..da38010805 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -21,3 +21,4 @@ CIRCUITPY_ESP32_CAMERA = 0
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
index 79dd73f58a..2cb2ad0118 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
+++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index d1b4b1b453..d9c808adbc 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
index 67a0ab21e8..9a23741804 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
@@ -18,3 +18,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
index dee105df1b..99435c69c8 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
@@ -18,3 +18,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index 2345469304..a06829b7c6 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -15,3 +15,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0

From 9f22e75e5e48a9223720e0d5b9fdc381f05e6a63 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 23 Aug 2022 11:34:16 -0500
Subject: [PATCH 0898/2403] error if camera is configured but no psram

---
 ports/espressif/common-hal/esp32_camera/Camera.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index af1d20542a..772d4159a0 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -34,6 +34,10 @@
 
 #include "esp32-camera/driver/private_include/cam_hal.h"
 
+#if !CONFIG_SPIRAM
+#error esp32_camera only works on boards configured with spiram, disable it in mpconfigboard.mk
+#endif
+
 static void maybe_claim_pin(const mcu_pin_obj_t *pin) {
     if (pin) {
         claim_pin(pin);

From dc27fb967d4817eae6ab685fc497ea01529fb0f3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 23 Aug 2022 11:34:22 -0500
Subject: [PATCH 0899/2403] error at runtime if no psram actually reserved

---
 locale/circuitpython.pot                         | 16 +++++++++++-----
 ports/espressif/bindings/esp32_camera/Camera.c   |  2 +-
 ports/espressif/common-hal/esp32_camera/Camera.c |  5 +++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index c69ea7bdfa..3b7e6227fa 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -398,12 +398,10 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
-msgid "All I2C peripherals are in use"
-msgstr ""
-
+#: ports/espressif/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
+#: ports/nrf/common-hal/busio/I2C.c
+msgid "All I2C peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/countio/Counter.c
@@ -1061,6 +1059,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1592,6 +1591,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2873,6 +2873,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 08bf48bc9b..4474f3024f 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -63,7 +63,7 @@
 //|         """
 //|         Configure and initialize a camera with the given properties
 //|
-//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError, this probably indicates the setting is too small and should be increased.
+//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
 //|
 //|
 //|         .. important::
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 772d4159a0..a2420c5543 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -61,6 +61,11 @@ void common_hal_esp32_camera_camera_construct(
     mp_int_t framebuffer_count,
     camera_grab_mode_t grab_mode) {
 
+    if (common_hal_espidf_get_reserved_psram() == 0) {
+        mp_raise_msg(&mp_type_MemoryError, translate(
+            "esp32_camera.Camera requires reserved PSRAM to be configured. "
+            "See the documentation for instructions.");
+    }
     for (int i = 0; i < 8; i++) {
         claim_pin_number(data_pins[i]);
     }

From ebd58155f2a6c4513bfff6cd617ff4067c0901bf Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 25 Aug 2022 13:55:43 -0500
Subject: [PATCH 0900/2403] bump pico-sdk to 1.4.0

---
 ports/raspberrypi/sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
index 426e46126b..2e6142b15b 160000
--- a/ports/raspberrypi/sdk
+++ b/ports/raspberrypi/sdk
@@ -1 +1 @@
-Subproject commit 426e46126b5a1efaea4544cdb71ab81b61983034
+Subproject commit 2e6142b15b8a75c1227dd3edbe839193b2bf9041

From 0a0c03c3d2a3c83e4b8e9327f53f1a3d1ac71a93 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Fri, 26 Aug 2022 17:07:44 +0200
Subject: [PATCH 0901/2403] Fix ugame.py for the ugame10 board

It was still trying to use the gamepad module, and there was a typo
---
 frozen/circuitpython-stage                       | 2 +-
 ports/atmel-samd/boards/ugame10/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 9a8338b3bd..4124dfbdaa 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac
+Subproject commit 4124dfbdaadce1966f457d7d6c6984e9832999bf
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index 7eb0ec8412..d129429ad6 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -15,7 +15,7 @@ CIRCUITPY_MATH = 1
 CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_KEYPPAD = 1
+CIRCUITPY_KEYPAD = 1
 
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_AUDIOBUSIO = 0

From 62548db6fb455a48aad1a50d83b2f49b8930d403 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 27 Aug 2022 10:58:27 +0530
Subject: [PATCH 0902/2403] update formatting of LICENSE and clean-up

---
 LICENSE                        | 76 +++---------------------------
 LICENSE_MicroPython            | 85 ++++++++++++++++++++++++++++++++++
 license.rst => docs/LICENSE.md | 15 +++---
 docs/index.rst                 |  2 +-
 4 files changed, 99 insertions(+), 79 deletions(-)
 create mode 100644 LICENSE_MicroPython
 rename license.rst => docs/LICENSE.md (78%)

diff --git a/LICENSE b/LICENSE
index 2b9a64b89a..5b8797814f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2013-2022 Damien P. George
+Copyright (c) 2013-2022 Damien P. George and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,77 +9,13 @@ 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 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.
-
---------------------------------------------------------------------------------
-
-Unless specified otherwise (see below), the above license and copyright applies
-to all files in this repository.
-
-Individual files may include additional copyright holders.
-
-The various ports of MicroPython may include third-party software that is
-licensed under different terms. These licenses are summarised in the tree
-below, please refer to these files and directories for further license and
-copyright information. Note that (L)GPL-licensed code listed below is only
-used during the build process and is not part of the compiled source code.
-
-/ (MIT)
-    /drivers
-        /cc3000 (BSD-3-clause)
-        /cc3100 (BSD-3-clause)
-        /wiznet5k (BSD-3-clause)
-    /lib
-        /asf4 (Apache-2.0)
-        /axtls (BSD-3-clause)
-            /config
-                /scripts
-                    /config (GPL-2.0-or-later)
-                /Rules.mak (GPL-2.0)
-        /berkeley-db-1xx (BSD-4-clause)
-        /btstack (See btstack/LICENSE)
-        /cmsis (BSD-3-clause)
-        /crypto-algorithms (NONE)
-        /libhydrogen (ISC)
-        /littlefs (BSD-3-clause)
-        /lwip (BSD-3-clause)
-        /mynewt-nimble (Apache-2.0)
-        /nrfx (BSD-3-clause)
-        /nxp_driver (BSD-3-Clause)
-        /oofatfs (BSD-1-clause)
-        /pico-sdk (BSD-3-clause)
-        /re15 (BSD-3-clause)
-        /stm32lib (BSD-3-clause)
-        /tinytest (BSD-3-clause)
-        /tinyusb (MIT)
-        /uzlib (Zlib)
-    /logo (uses OFL-1.1)
-    /ports
-        /cc3200
-            /hal (BSD-3-clause)
-            /simplelink (BSD-3-clause)
-            /FreeRTOS (GPL-2.0 with FreeRTOS exception)
-        /stm32
-            /usbd*.c (MCD-ST Liberty SW License Agreement V2)
-            /stm32_it.* (MIT + BSD-3-clause)
-            /system_stm32*.c (MIT + BSD-3-clause)
-            /boards
-                /startup_stm32*.s (BSD-3-clause)
-                /*/stm32*.h (BSD-3-clause)
-            /usbdev (MCD-ST Liberty SW License Agreement V2)
-            /usbhost (MCD-ST Liberty SW License Agreement V2)
-        /teensy
-            /core (PJRC.COM)
-        /zephyr
-            /src (Apache-2.0)
-    /tools
-        /dfu.py (LGPL-3.0-only)
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LICENSE_MicroPython b/LICENSE_MicroPython
new file mode 100644
index 0000000000..2b9a64b89a
--- /dev/null
+++ b/LICENSE_MicroPython
@@ -0,0 +1,85 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 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.
+
+--------------------------------------------------------------------------------
+
+Unless specified otherwise (see below), the above license and copyright applies
+to all files in this repository.
+
+Individual files may include additional copyright holders.
+
+The various ports of MicroPython may include third-party software that is
+licensed under different terms. These licenses are summarised in the tree
+below, please refer to these files and directories for further license and
+copyright information. Note that (L)GPL-licensed code listed below is only
+used during the build process and is not part of the compiled source code.
+
+/ (MIT)
+    /drivers
+        /cc3000 (BSD-3-clause)
+        /cc3100 (BSD-3-clause)
+        /wiznet5k (BSD-3-clause)
+    /lib
+        /asf4 (Apache-2.0)
+        /axtls (BSD-3-clause)
+            /config
+                /scripts
+                    /config (GPL-2.0-or-later)
+                /Rules.mak (GPL-2.0)
+        /berkeley-db-1xx (BSD-4-clause)
+        /btstack (See btstack/LICENSE)
+        /cmsis (BSD-3-clause)
+        /crypto-algorithms (NONE)
+        /libhydrogen (ISC)
+        /littlefs (BSD-3-clause)
+        /lwip (BSD-3-clause)
+        /mynewt-nimble (Apache-2.0)
+        /nrfx (BSD-3-clause)
+        /nxp_driver (BSD-3-Clause)
+        /oofatfs (BSD-1-clause)
+        /pico-sdk (BSD-3-clause)
+        /re15 (BSD-3-clause)
+        /stm32lib (BSD-3-clause)
+        /tinytest (BSD-3-clause)
+        /tinyusb (MIT)
+        /uzlib (Zlib)
+    /logo (uses OFL-1.1)
+    /ports
+        /cc3200
+            /hal (BSD-3-clause)
+            /simplelink (BSD-3-clause)
+            /FreeRTOS (GPL-2.0 with FreeRTOS exception)
+        /stm32
+            /usbd*.c (MCD-ST Liberty SW License Agreement V2)
+            /stm32_it.* (MIT + BSD-3-clause)
+            /system_stm32*.c (MIT + BSD-3-clause)
+            /boards
+                /startup_stm32*.s (BSD-3-clause)
+                /*/stm32*.h (BSD-3-clause)
+            /usbdev (MCD-ST Liberty SW License Agreement V2)
+            /usbhost (MCD-ST Liberty SW License Agreement V2)
+        /teensy
+            /core (PJRC.COM)
+        /zephyr
+            /src (Apache-2.0)
+    /tools
+        /dfu.py (LGPL-3.0-only)
diff --git a/license.rst b/docs/LICENSE.md
similarity index 78%
rename from license.rst
rename to docs/LICENSE.md
index 7e97341cda..a63dd7c965 100644
--- a/license.rst
+++ b/docs/LICENSE.md
@@ -1,9 +1,8 @@
-MicroPython & CircuitPython license information
-===============================================
+# MicroPython & CircuitPython License
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2013-2017 Damien P. George, and others
+Copyright (c) 2013-2022 Damien P. George and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -12,13 +11,13 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/docs/index.rst b/docs/index.rst
index a200a5238b..abc0236995 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -48,7 +48,7 @@ Full Table of Contents
    ../CONTRIBUTING
    ../BUILDING
    ../CODE_OF_CONDUCT
-   ../license.rst
+   ../docs/LICENSE
    ../WEBUSB_README
 
 Indices and tables

From 04af01a672879f58623c3696abb5f68842b03311 Mon Sep 17 00:00:00 2001
From: Lee Atkinson 
Date: Sat, 27 Aug 2022 14:47:12 -0400
Subject: [PATCH 0903/2403] Pin Validation fixed/readmultiple return fixed

---
 ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c | 7 ++-----
 shared-bindings/adcbuffer/BufferedInput.c              | 3 ++-
 shared-bindings/adcbuffer/BufferedInput.h              | 2 +-
 shared-bindings/adcbuffer/__init__.c                   | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index 50f2dc5d1a..b42bed2c0c 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -47,7 +47,7 @@
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
 
     // Make sure pin number is in range for ADC
-    if (pin->number < ADC_FIRST_PIN_NUMBER && pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
+    if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
         raise_ValueError_invalid_pins();
     }
 
@@ -122,7 +122,6 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     // clear any previous activity
     adc_fifo_drain();
     adc_run(false);
-
 }
 
 bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self) {
@@ -142,7 +141,7 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
     dma_channel_unclaim(self->dma_chan);
 }
 
-bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
+void common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
 
     uint32_t cdl = self->len / self->bytes_per_sample;
 
@@ -163,6 +162,4 @@ bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj
     //  Clean up
     adc_run(false);
     adc_fifo_drain();
-
-    return true;
 }
diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index 25e1b75cd7..da7cb9525a 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -157,7 +157,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj,
 STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
     adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_adcbuffer_bufferedinput_readmultiple(self));
+    common_hal_adcbuffer_bufferedinput_readmultiple(self);
+    return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_readmultiple_obj, adcbuffer_bufferedinput_obj_readmultiple);
 
diff --git a/shared-bindings/adcbuffer/BufferedInput.h b/shared-bindings/adcbuffer/BufferedInput.h
index 42b9f94558..25411a3d7c 100644
--- a/shared-bindings/adcbuffer/BufferedInput.h
+++ b/shared-bindings/adcbuffer/BufferedInput.h
@@ -35,6 +35,6 @@ extern const mp_obj_type_t adcbuffer_bufferedinput_type;
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
 void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self);
 bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self);
-bool common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self);
+void common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self);
 
 #endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H__
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/adcbuffer/__init__.c
index 4d5fefc26e..447f01ea15 100644
--- a/shared-bindings/adcbuffer/__init__.c
+++ b/shared-bindings/adcbuffer/__init__.c
@@ -69,7 +69,6 @@
 STATIC const mp_rom_map_elem_t adcbuffer_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adcbuffer) },
     { MP_ROM_QSTR(MP_QSTR_BufferedInput),   MP_ROM_PTR(&adcbuffer_bufferedinput_type) },
-    // #ifdef CIRCUITPY_BUFFEREDINPUT    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(adcbuffer_module_globals, adcbuffer_module_globals_table);

From cb202ea34437c1dd79313a48d86c1cb9612f7d81 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 27 Aug 2022 21:32:39 -0500
Subject: [PATCH 0904/2403] Check uniqueness of creatorid:creationid

Turns out we already have one duplicate, so I 'endorsed' it, but probably
one should be reassigned.

Closes: #8628
---
 tools/ci_check_duplicate_usb_vid_pid.py | 29 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 060bc8ea17..f46295f240 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -56,9 +56,12 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
     "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2"],
+    "0x70010001:0x00100001": ["ai_thinker_esp32-c3s", "ai_thinker_esp32-c3s-2m"],
 }
 
-cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker")
+cli_parser = argparse.ArgumentParser(
+    description="USB VID/PID and Creator/Creation ID Duplicate Checker"
+)
 
 
 def configboard_files():
@@ -71,29 +74,38 @@ def configboard_files():
     return working_dir.glob("ports/**/boards/**/mpconfigboard.mk")
 
 
+VID_PATTERN = re.compile(r"^USB_VID\s*=\s*(.*)", flags=re.M)
+PID_PATTERN = re.compile(r"^USB_PID\s*=\s*(.*)", flags=re.M)
+CREATOR_PATTERN = re.compile(r"^CIRCUITPY_CREATOR_ID\s*=\s*(.*)", flags=re.M)
+CREATION_PATTERN = re.compile(r"^CIRCUITPY_CREATION_ID\s*=\s*(.*)", flags=re.M)
+
+
 def check_vid_pid(files, clusterlist):
     """Compiles a list of USB VID & PID values for all boards, and checks
     for duplicates. Exits with ``sys.exit()`` (non-zero exit code)
     if duplicates are found, and lists the duplicates.
     """
 
-    vid_pattern = re.compile(r"^USB_VID\s*=\s*(.*)", flags=re.M)
-    pid_pattern = re.compile(r"^USB_PID\s*=\s*(.*)", flags=re.M)
     usb_pattern = re.compile(r"^CIRCUITPY_USB\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3)$", flags=re.M)
 
     usb_ids = defaultdict(set)
     for board_config in files:
         src_text = board_config.read_text()
 
-        usb_vid = vid_pattern.search(src_text)
-        usb_pid = pid_pattern.search(src_text)
+        usb_vid = VID_PATTERN.search(src_text)
+        usb_pid = PID_PATTERN.search(src_text)
+        creator = CREATOR_PATTERN.search(src_text)
+        creation = CREATION_PATTERN.search(src_text)
         non_usb = usb_pattern.search(src_text)
         board_name = board_config.parts[-2]
 
         if usb_vid and usb_pid:
             id_group = f"0x{int(usb_vid.group(1), 16):04X}:0x{int(usb_pid.group(1), 16):04X}"
         elif non_usb:
-            continue
+            if creator is None or creation is None:
+                print(f"{board_name=} {creator=} {creation=}", file=sys.stderr)
+                continue
+            id_group = f"0x{int(creator.group(1), 16):08X}:0x{int(creation.group(1), 16):08X}"
         else:
             raise SystemExit(f"Could not find expected settings in {board_config}")
 
@@ -117,18 +129,19 @@ def check_vid_pid(files, clusterlist):
         duplicate_message = (
             f"Duplicate VID/PID usage found!\n{duplicates}\n"
             f"If you are open source maker, then you can request a PID from http://pid.codes\n"
+            f"For boards without native USB, you can request a Creator ID from https://github.com/creationid/creators/\n"
             f"Otherwise, companies should pay the USB-IF for a vendor ID: https://www.usb.org/getting-vendor-id"
         )
         sys.exit(duplicate_message)
 
     else:
-        print("No USB PID duplicates found.")
+        print("No unexpected ID duplicates found.")
 
 
 if __name__ == "__main__":
     arguments = cli_parser.parse_args()
 
-    print("Running USB VID/PID Duplicate Checker...")
+    print("Running USB VID/PID and Creator/Creation ID Duplicate Checker...")
 
     board_files = configboard_files()
     check_vid_pid(board_files, DEFAULT_CLUSTERLIST)

From d476de1a04efab6d84eca688a9b752f6dc8b3a34 Mon Sep 17 00:00:00 2001
From: Rohan Shah <57906961+rshah713@users.noreply.github.com>
Date: Sun, 28 Aug 2022 10:44:18 -0400
Subject: [PATCH 0905/2403] Fix typos and grammar in design_guide

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

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index 6da73b2fdb..97aca0d589 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -141,7 +141,7 @@ statement will ensure hardware isn't enabled longer than needed.
 Verify your device
 --------------------------------------------------------------------------------
 
-Whenever possible, make sure device you are talking to is the device you expect.
+Whenever possible, make sure the device you are talking to is the device you expect.
 If not, raise a RuntimeError. Beware that I2C addresses can be identical on
 different devices so read registers you know to make sure they match your
 expectation. Validating this upfront will help catch mistakes.
@@ -188,7 +188,7 @@ Design for compatibility with CPython
 
 CircuitPython is aimed to be one's first experience with code.  It will be the
 first step into the world of hardware and software. To ease one's exploration
-out from this first step, make sure that functionality shared with CPython shares
+out from this first step, make sure that the functionality shared with CPython shares
 the same API. It doesn't need to be the full API it can be a subset. However, do
 not add non-CPython APIs to the same modules. Instead, use separate non-CPython
 modules to add extra functionality. By distinguishing API boundaries at modules
@@ -202,7 +202,7 @@ interchangeably with the CPython name. This is confusing. Instead, think up a
 new name that is related to the extra functionality you are adding.
 
 For example, storage mounting and unmounting related functions were moved from
-``uos`` into a new `storage` module. Terminal related functions were moved into
+``uos`` into a new `storage` module. Terminal-related functions were moved into
 `multiterminal`. These names better match their functionality and do not
 conflict with CPython names. Make sure to check that you don't conflict with
 CPython libraries too. That way we can port the API to CPython in the future.
@@ -213,7 +213,7 @@ Example
 When adding extra functionality to CircuitPython to mimic what a normal
 operating system would do, either copy an existing CPython API (for example file
 writing) or create a separate module to achieve what you want. For example,
-mounting and unmount drives is not a part of CPython so it should be done in a
+mounting and unmounting drives is not a part of CPython so it should be done in a
 module, such as a new ``storage`` module, that is only available in CircuitPython.
 That way when someone moves the code to CPython they know what parts need to be
 adapted.

From ceada2655a251f2274418272efc0477beb789613 Mon Sep 17 00:00:00 2001
From: Rohan Shah <57906961+rshah713@users.noreply.github.com>
Date: Sun, 28 Aug 2022 10:59:23 -0400
Subject: [PATCH 0906/2403] Remove article for general functionality

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

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index 97aca0d589..b68398827d 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -188,7 +188,7 @@ Design for compatibility with CPython
 
 CircuitPython is aimed to be one's first experience with code.  It will be the
 first step into the world of hardware and software. To ease one's exploration
-out from this first step, make sure that the functionality shared with CPython shares
+out from this first step, make sure that functionality shared with CPython shares
 the same API. It doesn't need to be the full API it can be a subset. However, do
 not add non-CPython APIs to the same modules. Instead, use separate non-CPython
 modules to add extra functionality. By distinguishing API boundaries at modules

From 09dd2294f6268154f483c62d29ea894a2ea5d456 Mon Sep 17 00:00:00 2001
From: root 
Date: Sun, 28 Aug 2022 12:00:48 -0500
Subject: [PATCH 0907/2403] Make Pulsein long-lived

---
 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 1769f5c7a8..c0660c36ff 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -87,7 +87,7 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
 
-    pulseio_pulsein_obj_t *self = m_new_obj(pulseio_pulsein_obj_t);
+    pulseio_pulsein_obj_t *self = m_new_ll_obj(pulseio_pulsein_obj_t);
     self->base.type = &pulseio_pulsein_type;
 
     common_hal_pulseio_pulsein_construct(self, pin, args[ARG_maxlen].u_int,

From 44a5ca2f851940551be5bde4170ecc84a47d3569 Mon Sep 17 00:00:00 2001
From: root 
Date: Sun, 28 Aug 2022 12:07:26 -0500
Subject: [PATCH 0908/2403] Make pulsein object long-lived

---
 shared-bindings/pulseio/PulseIn.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index c0660c36ff..a966160e2b 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -87,6 +87,7 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
 
+    // Make object long-lived to avoid moving between imports
     pulseio_pulsein_obj_t *self = m_new_ll_obj(pulseio_pulsein_obj_t);
     self->base.type = &pulseio_pulsein_type;
 

From 2c6f57be5eeb962dc8e9f86d7d52683870fd54c7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 28 Aug 2022 16:46:50 -0500
Subject: [PATCH 0909/2403] Update
 ports/espressif/common-hal/esp32_camera/Camera.c

Co-authored-by: Mark <56205165+gamblor21@users.noreply.github.com>
---
 ports/espressif/common-hal/esp32_camera/Camera.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index a2420c5543..97300a639c 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -64,7 +64,7 @@ void common_hal_esp32_camera_camera_construct(
     if (common_hal_espidf_get_reserved_psram() == 0) {
         mp_raise_msg(&mp_type_MemoryError, translate(
             "esp32_camera.Camera requires reserved PSRAM to be configured. "
-            "See the documentation for instructions.");
+            "See the documentation for instructions."));
     }
     for (int i = 0; i < 8; i++) {
         claim_pin_number(data_pins[i]);

From 72fe1a95f61f73d4bf7188b47e9c91f64d5c9533 Mon Sep 17 00:00:00 2001
From: Maxime Leroy 
Date: Sun, 28 Aug 2022 16:42:59 +0000
Subject: [PATCH 0910/2403] Translated using Weblate (French)

Currently translated at 99.6% (999 of 1003 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index 95c03542cb..9fd65d8698 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-08-09 04:22+0000\n"
+"PO-Revision-Date: 2022-08-29 18:20+0000\n"
 "Last-Translator: Maxime Leroy \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.14-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: main.c
 msgid ""
@@ -416,7 +416,7 @@ msgstr "Tous les périphériques I2C sont utilisés"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "Toutes les cibles I2C sont utilisées"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -3372,7 +3372,7 @@ msgstr "décorateur micropython invalide"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "réglage invalide"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"

From 6ec5ae1d866e1beacd8af34a617dbbda954973db Mon Sep 17 00:00:00 2001
From: Boran Roni 
Date: Sun, 28 Aug 2022 17:42:11 +0000
Subject: [PATCH 0911/2403] Translated using Weblate (Turkish)

Currently translated at 13.1% (132 of 1003 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/tr/
---
 locale/tr.po | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/locale/tr.po b/locale/tr.po
index bc0d4175a6..343588a49b 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-08-14 12:14+0000\n"
-"Last-Translator: Can Kocyigit \n"
+"PO-Revision-Date: 2022-08-29 18:20+0000\n"
+"Last-Translator: Boran Roni \n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "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.14-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: main.c
 msgid ""
@@ -118,11 +118,11 @@ msgstr "%q indeksleri integer olmalı, %s değil"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q init başarısız oldu"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q boyutu %d olmalıdır"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
@@ -130,11 +130,11 @@ msgstr "%q boyutları %d-%d olmalıdır"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q boyutu <= %d olmalıdır"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q boyutu >= %d olmalıdır"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
@@ -142,7 +142,7 @@ msgstr "%q boyutu >=1 olmalıdır"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q, %d olmalıdır"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
@@ -150,7 +150,7 @@ msgstr "%q, %d-%d olmalıdır"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "%q 1 olmalı, %q True olduğu zaman"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
@@ -174,7 +174,7 @@ msgstr "%q bir string olmalıdır"
 
 #: py/argcheck.c
 msgid "%q must be an int"
-msgstr ""
+msgstr "%q bir tam sayı olmalıdır"
 
 #: py/argcheck.c
 msgid "%q must be of type %q"
@@ -219,7 +219,7 @@ msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
@@ -316,7 +316,6 @@ msgid "'%s' object isn't subscriptable"
 msgstr "'%s' nesnesi subscriptable özelliğe sahip değil"
 
 #: py/objstr.c
-#, fuzzy
 msgid "'=' alignment not allowed in string format specifier"
 msgstr "'=' hizalamasına string biçiminde izin verilmez"
 
@@ -418,7 +417,7 @@ msgstr "Tüm I2C çevre birimleri kullanımda"
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 msgid "All I2C targets are in use"
-msgstr ""
+msgstr "Tüm I2C hedefleri kullanımda"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c

From f5286b4e7997ba4fa57bab79793e957814dcc57a Mon Sep 17 00:00:00 2001
From: thetazero 
Date: Mon, 29 Aug 2022 13:01:11 -0700
Subject: [PATCH 0912/2403] Improve os.stat docs

---
 shared-bindings/os/__init__.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 4c249c368e..a9d7a1f70e 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -166,6 +166,20 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
 //| def stat(path: str) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|     """Get the status of a file or directory.
 //|
+//|        Returns a tuple with the status of a file or directory in the following order,
+//|        
+//|
+//|        * ``st_mode`` -- File type, regular or directory
+//|        * ``st_ino``  -- Unpopulated
+//|        * ``st_dev`` -- Unpopulated 
+//|        * ``st_nlink`` -- Unpopulated 
+//|        * ``st_uid`` -- Unpopulated 
+//|        * ``st_gid`` -- Unpopulated 
+//|        * ``st_size`` -- Size of the file in bytes
+//|        * ``st_atime`` -- Time of most recent access expressed in seconds
+//|        * ``st_mtime`` -- Time of most recent content modification expressed in seconds.
+//|        * ``st_ctime`` -- Time of most recent content modification expressed in seconds.
+//|
 //|     .. note:: On builds without long integers, the number of seconds
 //|        for contemporary dates will not fit in a small integer.
 //|        So the time fields return 946684800,

From 8f0223573f8c8ebc18c9e5c19388aaa34bede26b Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 30 Aug 2022 10:52:54 +0200
Subject: [PATCH 0913/2403] remove alias to pewpew13

---
 docs/shared_bindings_matrix.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index daa8d9f8b8..c4bf105898 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -40,7 +40,6 @@ ALIASES_BY_BOARD = {
     "pybadge": ["edgebadge"],
     "pyportal": ["pyportal_pynt"],
     "gemma_m0": ["gemma_m0_pycon2018"],
-    "pewpew10": ["pewpew13"],
 }
 
 ALIASES_BRAND_NAMES = {
@@ -54,8 +53,6 @@ ALIASES_BRAND_NAMES = {
         "Adafruit PyPortal Pynt",
     "gemma_m0_pycon2018":
         "Adafruit Gemma M0 PyCon 2018",
-    "pewpew13":
-        "PewPew 13",
 }
 
 ADDITIONAL_MODULES = {

From 92c77013bfa220462444b7eb77a40138ea24555b Mon Sep 17 00:00:00 2001
From: thetazero 
Date: Tue, 30 Aug 2022 10:37:48 -0400
Subject: [PATCH 0914/2403] Lint

---
 shared-bindings/os/__init__.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index a9d7a1f70e..3a49e776bc 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -166,15 +166,15 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
 //| def stat(path: str) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|     """Get the status of a file or directory.
 //|
-//|        Returns a tuple with the status of a file or directory in the following order,
-//|        
+//|        Returns a tuple with the status of a file or directory in the following order:
+//|
 //|
 //|        * ``st_mode`` -- File type, regular or directory
 //|        * ``st_ino``  -- Unpopulated
-//|        * ``st_dev`` -- Unpopulated 
-//|        * ``st_nlink`` -- Unpopulated 
-//|        * ``st_uid`` -- Unpopulated 
-//|        * ``st_gid`` -- Unpopulated 
+//|        * ``st_dev`` -- Unpopulated
+//|        * ``st_nlink`` -- Unpopulated
+//|        * ``st_uid`` -- Unpopulated
+//|        * ``st_gid`` -- Unpopulated
 //|        * ``st_size`` -- Size of the file in bytes
 //|        * ``st_atime`` -- Time of most recent access expressed in seconds
 //|        * ``st_mtime`` -- Time of most recent content modification expressed in seconds.

From bf9f329a6196982700512e3f5f9a7c4c765ff9b2 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Tue, 30 Aug 2022 11:12:47 -0400
Subject: [PATCH 0915/2403] Fix UART.readline docstring

---
 shared-bindings/busio/UART.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index baa7f2cdba..2d14fec07f 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -222,8 +222,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 
 //|     def readline(self) -> bytes:
 //|         """Read a line, ending in a newline character, or
-//|            return None if a timeout occurs sooner, or
-//|            return everything readable if no newline is found and timeout=0
+//|         return ``None`` if a timeout occurs sooner, or
+//|         return everything readable if no newline is found and
+//|         ``timeout=0``
 //|
 //|         :return: the line read
 //|         :rtype: bytes or None"""

From 0d8dab73810faf4a65f79073eca0f46cc781cfaa Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Tue, 30 Aug 2022 11:18:06 -0400
Subject: [PATCH 0916/2403] Update write() function definition

---
 shared-bindings/busio/UART.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 2d14fec07f..60f2b407fe 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -231,7 +231,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 //|         ...
 //|
 
-//|     def write(self, buf: WriteableBuffer) -> Optional[int]:
+//|     def write(self, buf: ReadableBuffer) -> Optional[int]:
 //|         """Write the buffer of bytes to the bus.
 //|
 //|       *New in CircuitPython 4.0:* ``buf`` must be bytes, not a string.

From eebd7f86a2bd986ee4a703dcd26e7636ab72941f Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 30 Aug 2022 17:41:50 +0200
Subject: [PATCH 0917/2403] 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             | 16 +++++++++++-----
 locale/de_DE.po          | 19 ++++++++++++++-----
 locale/el.po             | 16 +++++++++++-----
 locale/en_GB.po          | 16 +++++++++++-----
 locale/es.po             | 16 +++++++++++-----
 locale/fil.po            | 16 +++++++++++-----
 locale/fr.po             | 19 ++++++++++++++-----
 locale/hi.po             | 16 +++++++++++-----
 locale/it_IT.po          | 16 +++++++++++-----
 locale/ja.po             | 16 +++++++++++-----
 locale/ko.po             | 16 +++++++++++-----
 locale/nl.po             | 16 +++++++++++-----
 locale/pl.po             | 16 +++++++++++-----
 locale/pt_BR.po          | 19 ++++++++++++++-----
 locale/ru.po             | 16 +++++++++++-----
 locale/sv.po             | 19 ++++++++++++++-----
 locale/tr.po             | 19 ++++++++++++++-----
 locale/zh_Latn_pinyin.po | 19 ++++++++++++++-----
 19 files changed, 227 insertions(+), 95 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index ba3fc8e0b0..a581d8c6ef 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -404,14 +404,12 @@ msgstr "Alamat harus sepanjang %d byte"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Semua perangkat I2C sedang digunakan"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1074,6 +1072,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1612,6 +1611,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2904,6 +2904,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 4e114549e5..bb71e7c771 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -405,14 +405,12 @@ msgstr "Adresa musí být %d bajtů dlouhá"
 msgid "All CAN peripherals are in use"
 msgstr "Všechny CAN periferie jsou používány"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Všechny I2C periferie jsou používány"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1074,6 +1072,7 @@ msgid "I2C init error"
 msgstr "Chyba inicializace I2C"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "Periférie I2C je používána"
 
@@ -1608,6 +1607,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2891,6 +2891,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1db73613e8..3ccb37967a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -407,14 +407,12 @@ msgstr "Die Adresse muss %d Bytes lang sein"
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-Schnittstellen sind in Benutzung"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "Alle I2C-Ziele sind in Verwendung"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1084,6 +1082,7 @@ msgid "I2C init error"
 msgstr "I2C Initialisierungsfehler"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "I2C Peripherie in Verwendung"
 
@@ -1628,6 +1627,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Nur eine Adresse ist erlaubt"
 
@@ -2956,6 +2956,12 @@ msgstr "epoch_time wird auf diesem Board nicht unterstützt"
 msgid "error = 0x%08lX"
 msgstr "Fehler = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "Exceptions müssen von BaseException abgeleitet sein"
@@ -4443,6 +4449,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "All I2C targets are in use"
+#~ msgstr "Alle I2C-Ziele sind in Verwendung"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Wifi Initialisierung ist fehlgeschlagen"
 
diff --git a/locale/el.po b/locale/el.po
index 84f75edf1e..c85903c33f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -398,12 +398,10 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
-msgid "All I2C peripherals are in use"
-msgstr ""
-
+#: ports/espressif/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
+#: ports/nrf/common-hal/busio/I2C.c
+msgid "All I2C peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/countio/Counter.c
@@ -1061,6 +1059,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1592,6 +1591,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2873,6 +2873,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 4c1dcfb22a..0db0dae666 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -408,14 +408,12 @@ msgstr "Address must be %d bytes long"
 msgid "All CAN peripherals are in use"
 msgstr "All CAN peripherals are in use"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "All I2C peripherals are in use"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1075,6 +1073,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "I2C peripheral in use"
 
@@ -1612,6 +1611,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Only one TouchAlarm can be set in deep sleep."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2910,6 +2910,12 @@ msgstr "epoch_time not supported on this board"
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "exceptions must derive from BaseException"
diff --git a/locale/es.po b/locale/es.po
index f2d7c65570..df27182161 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -407,14 +407,12 @@ msgstr "La dirección debe tener %d bytes de largo"
 msgid "All CAN peripherals are in use"
 msgstr "Todos los periféricos CAN están en uso"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Todos los periféricos I2C están siendo usados"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1083,6 +1081,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "Dispositivo I2C en uso"
 
@@ -1633,6 +1632,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2947,6 +2947,12 @@ msgstr "epoch_time no esta soportado en esta tarjeta"
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "las excepciones deben derivar de BaseException"
diff --git a/locale/fil.po b/locale/fil.po
index 3f59a2b674..397c947350 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -401,14 +401,12 @@ msgstr "ang palette ay dapat 32 bytes ang haba"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Lahat ng I2C peripherals ginagamit"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1072,6 +1070,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1608,6 +1607,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2905,6 +2905,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "ang mga exceptions ay dapat makuha mula sa BaseException"
diff --git a/locale/fr.po b/locale/fr.po
index 9fd65d8698..23c25852e2 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -410,14 +410,12 @@ msgstr "L'adresse doit être longue de %d octets"
 msgid "All CAN peripherals are in use"
 msgstr "Tous les périphériques CAN sont utilisés"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tous les périphériques I2C sont utilisés"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "Toutes les cibles I2C sont utilisées"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1103,6 +1101,7 @@ msgid "I2C init error"
 msgstr "Erreur d'initialisation I2C"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "périphérique I2C utilisé"
 
@@ -1656,6 +1655,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Seulement une adresse est autorisée"
 
@@ -2987,6 +2987,12 @@ msgstr "epoch_time n'est pas supporté sur ce panneau"
 msgid "error = 0x%08lX"
 msgstr "erreur = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "les exceptions doivent dériver de 'BaseException'"
@@ -4471,6 +4477,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 "All I2C targets are in use"
+#~ msgstr "Toutes les cibles I2C sont utilisées"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Echec de l'initialisation du Wifi"
 
diff --git a/locale/hi.po b/locale/hi.po
index 44db3cbb48..ca90780a5d 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -398,12 +398,10 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
-msgid "All I2C peripherals are in use"
-msgstr ""
-
+#: ports/espressif/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
+#: ports/nrf/common-hal/busio/I2C.c
+msgid "All I2C peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/countio/Counter.c
@@ -1061,6 +1059,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1592,6 +1591,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2873,6 +2873,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0d3619b91e..109319772e 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -407,14 +407,12 @@ msgstr "L'indirizzo deve essere lungo %d byte"
 msgid "All CAN peripherals are in use"
 msgstr "Tutte le periferiche CAN sono in uso"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tutte le periferiche I2C sono in uso"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1077,6 +1075,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1615,6 +1614,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2913,6 +2913,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "errore = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "le eccezioni devono derivare da BaseException"
diff --git a/locale/ja.po b/locale/ja.po
index 5377492685..89686499f4 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -403,14 +403,12 @@ msgstr "アドレスは、%dバイト長でなければなりません"
 msgid "All CAN peripherals are in use"
 msgstr "全てのCAN周辺機器が使用中"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "全てのI2C周辺機器が使用中"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1070,6 +1068,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1605,6 +1604,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2891,6 +2891,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "error = 0x1%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "例外はBaseExceptionから派生していなければなりません"
diff --git a/locale/ko.po b/locale/ko.po
index ad4c0a9fdc..ede912e6a9 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -399,14 +399,12 @@ msgstr ""
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "사용중인 모든 I2C주변 기기"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1064,6 +1062,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1595,6 +1594,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2877,6 +2877,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index dafe2449f8..61889ed310 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -401,14 +401,12 @@ msgstr "Adres moet %d bytes lang zijn"
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-peripherals zijn in gebruik"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Alle I2C peripherals zijn in gebruik"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1070,6 +1068,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1609,6 +1608,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2906,6 +2906,12 @@ msgstr "epoch_time niet ondersteund op dit bord"
 msgid "error = 0x%08lX"
 msgstr "fout = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "uitzonderingen moeten afleiden van BaseException"
diff --git a/locale/pl.po b/locale/pl.po
index 9662f16597..77bacda839 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -403,14 +403,12 @@ msgstr "Adres musi mieć %d bajtów"
 msgid "All CAN peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Wszystkie peryferia I2C w użyciu"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1070,6 +1068,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1603,6 +1602,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2885,6 +2885,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "błąd = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "wyjątki muszą dziedziczyć po BaseException"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 231750f4c6..22ba777587 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -411,14 +411,12 @@ msgstr "O endereço deve ter %d bytes de comprimento"
 msgid "All CAN peripherals are in use"
 msgstr "Todos os periféricos CAN estão em uso"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Todos os periféricos I2C estão em uso"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "Todos os alvos I2C já estão em uso"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1092,6 +1090,7 @@ msgid "I2C init error"
 msgstr "Erro de inicialização do I2C"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "Periférico I2C em uso"
 
@@ -1638,6 +1637,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Apenas um endereço é permitido"
 
@@ -2965,6 +2965,12 @@ msgstr "O epoch_time não é compatível com esta placa"
 msgid "error = 0x%08lX"
 msgstr "erro = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "as exceções devem derivar a partir do BaseException"
@@ -4447,6 +4453,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 "All I2C targets are in use"
+#~ msgstr "Todos os alvos I2C já estão em uso"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Houve uma falha ao iniciar o wifi"
 
diff --git a/locale/ru.po b/locale/ru.po
index 6e2d65cc81..3dd834385c 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -406,14 +406,12 @@ msgstr "Адрес должен быть длиной %d байт"
 msgid "All CAN peripherals are in use"
 msgstr "Все периферийные устройства CAN уже используются"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Все периферийные устройства I2C уже используются"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr ""
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1090,6 +1088,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "Периферийное устройство I2C уже используется"
 
@@ -1634,6 +1633,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2922,6 +2922,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 7d70a696fc..c21af224cc 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -406,14 +406,12 @@ msgstr "Adressen måste vara %d byte lång"
 msgid "All CAN peripherals are in use"
 msgstr "All I2C-kringutrustning används"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "All I2C-kringutrustning används"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "Alla I2C-mål används"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1077,6 +1075,7 @@ msgid "I2C init error"
 msgstr "I2C-initieringsfel"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "I2C-enhet används redan"
 
@@ -1618,6 +1617,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "Endast en adress är tillåten"
 
@@ -2931,6 +2931,12 @@ msgstr "epoch_time stöds inte av detta kort"
 msgid "error = 0x%08lX"
 msgstr "fel = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "exceptions måste ärvas från BaseException"
@@ -4406,6 +4412,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 "All I2C targets are in use"
+#~ msgstr "Alla I2C-mål används"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Kunde inte initiera WiFi"
 
diff --git a/locale/tr.po b/locale/tr.po
index 343588a49b..c6cbfef3ee 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -411,14 +411,12 @@ msgstr "Adres %d byte uzunluğunda olmalıdır"
 msgid "All CAN peripherals are in use"
 msgstr "Tüm CAN çevre birimleri kullanımda"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "Tüm I2C çevre birimleri kullanımda"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "Tüm I2C hedefleri kullanımda"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1077,6 +1075,7 @@ msgid "I2C init error"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr ""
 
@@ -1608,6 +1607,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr ""
 
@@ -2892,6 +2892,12 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
@@ -4361,6 +4367,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "All I2C targets are in use"
+#~ msgstr "Tüm I2C hedefleri kullanımda"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q, boyutu 2 olan bir tuple olmalıdır"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index b0988669b3..f175c017f0 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -409,14 +409,12 @@ msgstr "dìzhǐ chángdù bìxū shì %d zìjié"
 msgid "All CAN peripherals are in use"
 msgstr "suǒyǒu CAN wàishè dōu zài shǐyòng zhōng"
 
-#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/busio/I2C.c
+#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr "suǒyǒu I2C wàishè dōu zài shǐyòng zhōng"
 
-#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
-msgid "All I2C targets are in use"
-msgstr "suǒyǒu I2C mùbiāo dōu zài shǐyòng zhōng"
-
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1082,6 +1080,7 @@ msgid "I2C init error"
 msgstr "I2C qǐdòng cuòwù"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
 msgstr "I2C wài shè zhèng zài shǐ yòng zhōng"
 
@@ -1626,6 +1625,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mián."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
+#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
 msgstr "zhǐ yǔn xǔ yí gè dì zhǐ"
 
@@ -2937,6 +2937,12 @@ msgstr "epoch_time bǎn bù zhī chí cǐ bǎn běn"
 msgid "error = 0x%08lX"
 msgstr "cuòwù = 0x%08lX"
 
+#: ports/espressif/common-hal/esp32_camera/Camera.c
+msgid ""
+"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr "lìwài bìxū láizì BaseException"
@@ -4412,6 +4418,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 "All I2C targets are in use"
+#~ msgstr "suǒyǒu I2C mùbiāo dōu zài shǐyòng zhōng"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Wúfǎ chūshǐhuà wifi"
 

From 1a40757cddd67a9c9789e913bc7094c06af7e57c Mon Sep 17 00:00:00 2001
From: thetazero 
Date: Tue, 30 Aug 2022 11:48:17 -0400
Subject: [PATCH 0918/2403] Change unpopulated to always 0

---
 shared-bindings/os/__init__.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 3a49e776bc..407fa02558 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -170,11 +170,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
 //|
 //|
 //|        * ``st_mode`` -- File type, regular or directory
-//|        * ``st_ino``  -- Unpopulated
-//|        * ``st_dev`` -- Unpopulated
-//|        * ``st_nlink`` -- Unpopulated
-//|        * ``st_uid`` -- Unpopulated
-//|        * ``st_gid`` -- Unpopulated
+//|        * ``st_ino``  -- Set to 0
+//|        * ``st_dev`` -- Set to 0
+//|        * ``st_nlink`` -- Set to 0
+//|        * ``st_uid`` -- Set to 0
+//|        * ``st_gid`` -- Set to 0
 //|        * ``st_size`` -- Size of the file in bytes
 //|        * ``st_atime`` -- Time of most recent access expressed in seconds
 //|        * ``st_mtime`` -- Time of most recent content modification expressed in seconds.

From 52080e24ebf80f4e91bd0ec1177ceadc4505dffb Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 28 Aug 2022 21:55:13 -0400
Subject: [PATCH 0919/2403] status bar control

---
 main.c                                        |  52 ++++++--
 ports/espressif/common-hal/wifi/__init__.c    |   9 +-
 py/circuitpy_defns.mk                         |  36 ++---
 shared-bindings/supervisor/StatusBar.c        | 126 ++++++++++++++++++
 shared-bindings/supervisor/StatusBar.h        |  42 ++++++
 shared-bindings/supervisor/__init__.c         |  10 ++
 shared-bindings/supervisor/__init__.h         |   2 +
 shared-bindings/terminalio/Terminal.c         |  14 +-
 shared-bindings/terminalio/Terminal.h         |   2 +-
 shared-module/supervisor/StatusBar.c          |  74 ++++++++++
 shared-module/supervisor/StatusBar.h          |  42 ++++++
 shared-module/supervisor/__init__.c           |  39 ++++++
 shared-module/terminalio/Terminal.c           |  59 +++++---
 shared-module/terminalio/Terminal.h           |   8 +-
 supervisor/shared/bluetooth/bluetooth.c       |  22 ++-
 supervisor/shared/display.c                   |  55 ++++----
 supervisor/shared/display.h                   |   2 +-
 supervisor/shared/serial.c                    |  16 +++
 .../shared/{title_bar.c => status_bar.c}      |  73 +++++-----
 .../shared/{title_bar.h => status_bar.h}      |  12 +-
 supervisor/shared/usb/usb.c                   |   9 +-
 supervisor/shared/web_workflow/web_workflow.c |   8 +-
 supervisor/shared/web_workflow/websocket.c    |   9 +-
 supervisor/supervisor.mk                      |   7 +-
 tools/gen_display_resources.py                |   4 +-
 25 files changed, 597 insertions(+), 135 deletions(-)
 create mode 100644 shared-bindings/supervisor/StatusBar.c
 create mode 100644 shared-bindings/supervisor/StatusBar.h
 create mode 100644 shared-module/supervisor/StatusBar.c
 create mode 100644 shared-module/supervisor/StatusBar.h
 create mode 100644 shared-module/supervisor/__init__.c
 rename supervisor/shared/{title_bar.c => status_bar.c} (66%)
 rename supervisor/shared/{title_bar.h => status_bar.h} (85%)

diff --git a/main.c b/main.c
index de2a28271c..4c3bae6948 100644
--- a/main.c
+++ b/main.c
@@ -57,7 +57,6 @@
 #include "supervisor/shared/stack.h"
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/tick.h"
-#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/traceback.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/workflow.h"
@@ -106,6 +105,10 @@
 #include "shared-bindings/socketpool/__init__.h"
 #endif
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.h"
+#endif
+
 #if CIRCUITPY_USB_HID
 #include "shared-module/usb_hid/__init__.h"
 #endif
@@ -208,6 +211,7 @@ STATIC const char *_current_executing_filename = NULL;
 
 STATIC pyexec_result_t _exec_result = {0, MP_OBJ_NULL, 0};
 
+#if CIRCUITPY_STATUS_BAR
 void supervisor_execution_status(void) {
     mp_obj_exception_t *exception = MP_OBJ_TO_PTR(_exec_result.exception);
     if (_current_executing_filename != NULL) {
@@ -220,6 +224,7 @@ void supervisor_execution_status(void) {
         serial_write_compressed(translate("Done"));
     }
 }
+#endif
 
 #define STRING_LIST(...) {__VA_ARGS__, ""}
 
@@ -245,13 +250,23 @@ STATIC bool maybe_run_list(const char *const *filenames) {
     }
     mp_hal_stdout_tx_str(_current_executing_filename);
     serial_write_compressed(translate(" output:\n"));
-    supervisor_title_bar_update();
+
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_update();
+    #endif
+
     pyexec_file(_current_executing_filename, &_exec_result);
+
     #if CIRCUITPY_ATEXIT
     shared_module_atexit_execute(&_exec_result);
     #endif
+
     _current_executing_filename = NULL;
-    supervisor_title_bar_update();
+
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_update();
+    #endif
+
     return true;
 }
 
@@ -749,8 +764,10 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     if (ok_to_run) {
         #ifdef CIRCUITPY_BOOT_OUTPUT_FILE
-        // Turn off title bar updates when writing out to boot_out.txt.
-        supervisor_title_bar_suspend();
+        #if CIRCUITPY_STATUS_BAR
+        // Turn off status bar updates when writing out to boot_out.txt.
+        supervisor_status_bar_suspend();
+        #endif
         vstr_t boot_text;
         vstr_init(&boot_text, 512);
         boot_output = &boot_text;
@@ -778,7 +795,9 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         FATFS *fs = &vfs->fatfs;
 
         boot_output = NULL;
-        supervisor_title_bar_resume();
+        #if CIRCUITPY_STATUS_BAR
+        supervisor_status_bar_resume();
+        #endif
         bool write_boot_output = true;
         FIL boot_output_file;
         if (f_open(fs, &boot_output_file, CIRCUITPY_BOOT_OUTPUT_FILE, FA_READ) == FR_OK) {
@@ -854,15 +873,23 @@ STATIC int run_repl(bool first_run) {
     status_led_deinit();
     #endif
     if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
-        supervisor_title_bar_suspend();
+        #if CIRCUITPY_STATUS_BAR
+        supervisor_status_bar_suspend();
+        #endif
         exit_code = pyexec_raw_repl();
-        supervisor_title_bar_resume();
+        #if CIRCUITPY_STATUS_BAR
+        supervisor_status_bar_resume();
+        #endif
     } else {
         _current_executing_filename = "REPL";
-        supervisor_title_bar_update();
+        #if CIRCUITPY_STATUS_BAR
+        supervisor_status_bar_update();
+        #endif
         exit_code = pyexec_friendly_repl();
         _current_executing_filename = NULL;
-        supervisor_title_bar_update();
+        #if CIRCUITPY_STATUS_BAR
+        supervisor_status_bar_update();
+        #endif
     }
     #if CIRCUITPY_ATEXIT
     pyexec_result_t result;
@@ -959,7 +986,10 @@ int __attribute__((used)) main(void) {
     run_boot_py(safe_mode);
 
     supervisor_workflow_start();
-    supervisor_title_bar_start();
+
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_start();
+    #endif
 
     // Boot script is finished, so now go into REPL or run code.py.
     int exit_code = PYEXEC_FORCED_EXIT;
diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index ca0533525d..42ea078810 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -44,9 +44,12 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 #include "components/log/include/esp_log.h"
 
 #include "supervisor/port.h"
-#include "supervisor/shared/title_bar.h"
 #include "supervisor/workflow.h"
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.h"
+#endif
+
 #include "esp_ipc.h"
 
 #ifdef CONFIG_IDF_TARGET_ESP32
@@ -56,7 +59,9 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 static const char *TAG = "CP wifi";
 
 STATIC void schedule_background_on_cp_core(void *arg) {
-    supervisor_title_bar_request_update(false);
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_request_update(false);
+    #endif
 
     // CircuitPython's VM is run in a separate FreeRTOS task from wifi callbacks. So, we have to
     // notify the main task every time in case it's waiting for us.
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index f22a96853e..a9be64428e 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -101,6 +101,7 @@ endif
 
 ###
 # Select which builtin modules to compile and include.
+# Keep alphabetical.
 
 ifeq ($(CIRCUITPY_AESIO),1)
 SRC_PATTERNS += aesio/%
@@ -175,11 +176,8 @@ endif
 ifeq ($(CIRCUITPY_DOTENV),1)
 SRC_PATTERNS += dotenv/%
 endif
-ifeq ($(CIRCUITPY_PARALLELDISPLAY),1)
-SRC_PATTERNS += paralleldisplay/%
-endif
-ifeq ($(CIRCUITPY_VECTORIO),1)
-SRC_PATTERNS += vectorio/%
+ifeq ($(CIRCUITPY__EVE),1)
+SRC_PATTERNS += _eve/%
 endif
 ifeq ($(CIRCUITPY_FLOPPYIO),1)
 SRC_PATTERNS += floppyio/%
@@ -187,17 +185,12 @@ 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
-
 ifeq ($(CIRCUITPY_FUTURE),1)
 SRC_PATTERNS += __future__/%
 endif
-
 ifeq ($(CIRCUITPY_GETPASS),1)
 SRC_PATTERNS += getpass/%
 endif
@@ -237,6 +230,9 @@ endif
 ifeq ($(CIRCUITPY_MDNS),1)
 SRC_PATTERNS += mdns/%
 endif
+ifeq ($(CIRCUITPY_MSGPACK),1)
+SRC_PATTERNS += msgpack/%
+endif
 ifeq ($(CIRCUITPY_NEOPIXEL_WRITE),1)
 SRC_PATTERNS += neopixel_write/%
 endif
@@ -252,6 +248,12 @@ endif
 ifeq ($(CIRCUITPY_DUALBANK),1)
 SRC_PATTERNS += dualbank/%
 endif
+ifeq ($(CIRCUITPY_PARALLELDISPLAY),1)
+SRC_PATTERNS += paralleldisplay/%
+endif
+ifeq ($(CIRCUITPY_PEW),1)
+SRC_PATTERNS += _pew/%
+endif
 ifeq ($(CIRCUITPY_PIXELBUF),1)
 SRC_PATTERNS += adafruit_pixelbuf/%
 endif
@@ -351,8 +353,8 @@ endif
 ifeq ($(CIRCUITPY_USTACK),1)
 SRC_PATTERNS += ustack/%
 endif
-ifeq ($(CIRCUITPY_ZLIB),1)
-SRC_PATTERNS += zlib/%
+ifeq ($(CIRCUITPY_VECTORIO),1)
+SRC_PATTERNS += vectorio/%
 endif
 ifeq ($(CIRCUITPY_VIDEOCORE),1)
 SRC_PATTERNS += videocore/%
@@ -363,11 +365,8 @@ endif
 ifeq ($(CIRCUITPY_WIFI),1)
 SRC_PATTERNS += wifi/%
 endif
-ifeq ($(CIRCUITPY_PEW),1)
-SRC_PATTERNS += _pew/%
-endif
-ifeq ($(CIRCUITPY_MSGPACK),1)
-SRC_PATTERNS += msgpack/%
+ifeq ($(CIRCUITPY_ZLIB),1)
+SRC_PATTERNS += zlib/%
 endif
 
 # All possible sources are listed here, and are filtered by SRC_PATTERNS in SRC_COMMON_HAL
@@ -511,6 +510,7 @@ $(filter $(SRC_PATTERNS), \
 	qrio/PixelPolicy.c \
 	qrio/QRInfo.c \
 	supervisor/RunReason.c \
+	supervisor/StatusBar.c \
 	wifi/AuthMode.c \
 	wifi/Packet.c \
 )
@@ -611,6 +611,8 @@ SRC_SHARED_MODULE_ALL = \
 	socket/__init__.c \
 	storage/__init__.c \
 	struct/__init__.c \
+	supervisor/__init__.c \
+	supervisor/StatusBar.c \
 	synthio/MidiTrack.c \
 	synthio/__init__.c \
 	terminalio/Terminal.c \
diff --git a/shared-bindings/supervisor/StatusBar.c b/shared-bindings/supervisor/StatusBar.c
new file mode 100644
index 0000000000..3ee9ae9de4
--- /dev/null
+++ b/shared-bindings/supervisor/StatusBar.c
@@ -0,0 +1,126 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 by 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 
+#include "py/obj.h"
+#include "py/enum.h"
+#include "py/runtime.h"
+#include "py/objproperty.h"
+#include "shared-bindings/supervisor/StatusBar.h"
+
+//| class StatusBar:
+//|     """Current status of runtime objects.
+//|
+//|     Usage::
+//|
+//|        import supervisor
+//|
+//|        supervisor.status_bar.console = False
+//|     """
+//|
+
+//|     def __init__(self) -> None:
+//|         """You cannot create an instance of `supervisor.StatusBar`.
+//|         Use `supervisor.status_bar` to access the sole instance available."""
+//|         ...
+//|
+
+//|     console: bool
+//|     """Whether status bar information is sent over the console (REPL) serial connection,
+//|     using OSC terminal escape codes that change the terminal's title. Default is ``True``.
+//|     If set to ``False``, status bar will be cleared and then disabled.
+//|     May be set in ``boot.py`` or later.
+//|     """
+//|
+STATIC mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) {
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(shared_module_supervisor_status_bar_get_console(self));
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_status_bar_get_console_obj, supervisor_status_bar_get_console);
+
+STATIC mp_obj_t supervisor_status_bar_set_console(mp_obj_t self_in, mp_obj_t state_in) {
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    shared_module_supervisor_status_bar_set_console(self, mp_obj_is_true(state_in));
+    return mp_const_none;
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_status_bar_set_console_obj, supervisor_status_bar_set_console);
+
+MP_PROPERTY_GETSET(supervisor_status_bar_console_obj,
+    (mp_obj_t)&supervisor_status_bar_get_console_obj,
+    (mp_obj_t)&supervisor_status_bar_set_console_obj);
+
+//|     display: bool
+//|     """Whether status bar information is displayed on the top line of the display.
+//|     Default is ``True``. If set to ``False``, status bar will be cleared and then disabled.
+//|     May be set in ``boot.py`` or later. Not available if `terminalio` is not available.
+//|     """
+//|
+STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) {
+    #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO
+    supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(shared_module_supervisor_status_bar_get_display(self));
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_status_bar_get_display_obj, supervisor_status_bar_get_display);
+
+STATIC mp_obj_t supervisor_status_bar_set_display(mp_obj_t self_in, mp_obj_t state_in) {
+    #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO
+    supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    shared_module_supervisor_status_bar_set_display(self, mp_obj_is_true(state_in));
+    return mp_const_none;
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_status_bar_set_display_obj, supervisor_status_bar_set_display);
+
+MP_PROPERTY_GETSET(supervisor_status_bar_display_obj,
+    (mp_obj_t)&supervisor_status_bar_get_display_obj,
+    (mp_obj_t)&supervisor_status_bar_set_display_obj);
+
+
+STATIC const mp_rom_map_elem_t supervisor_status_bar_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_console), MP_ROM_PTR(&supervisor_status_bar_console_obj) },
+    { MP_ROM_QSTR(MP_QSTR_display), MP_ROM_PTR(&supervisor_status_bar_display_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(supervisor_status_bar_locals_dict, supervisor_status_bar_locals_dict_table);
+
+const mp_obj_type_t supervisor_status_bar_type = {
+    .base = { &mp_type_type },
+    .name = MP_QSTR_Status_Bar,
+    .locals_dict = (mp_obj_dict_t *)&supervisor_status_bar_locals_dict,
+};
diff --git a/shared-bindings/supervisor/StatusBar.h b/shared-bindings/supervisor/StatusBar.h
new file mode 100644
index 0000000000..12b337ea84
--- /dev/null
+++ b/shared-bindings/supervisor/StatusBar.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 by 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_STATUS_BAR_STATUS_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_STATUS_BAR_STATUS_H
+
+#include 
+#include "py/obj.h"
+#include "shared-module/supervisor/StatusBar.h"
+
+extern const mp_obj_type_t supervisor_status_bar_type;
+
+bool shared_module_supervisor_status_bar_get_console(supervisor_status_bar_obj_t *self);
+void shared_module_supervisor_status_bar_set_console(supervisor_status_bar_obj_t *self, bool enabled);
+
+bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t *self);
+void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled);
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_SUPERVISOR_STATUS_BAR_H
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index c74b3751c0..01ac4984f1 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -43,6 +43,7 @@
 #include "shared-bindings/supervisor/__init__.h"
 #include "shared-bindings/time/__init__.h"
 #include "shared-bindings/supervisor/Runtime.h"
+#include "shared-bindings/supervisor/StatusBar.h"
 
 //| """Supervisor settings"""
 //|
@@ -53,6 +54,14 @@
 //| This object is the sole instance of `supervisor.Runtime`."""
 //|
 
+//| status_bar: StatusBar
+//| """The status bar, shown on an attached display, and also sent to
+//| an attached terminal via OSC escape codes over the REPL serial connection.
+//| The status bar reports the current IP or BLE connection, what file is running,
+//| the last exception name and location, and firmware version information.
+//| This object is the sole instance of `supervisor.StatusBar`."""
+//|
+
 //| def set_rgb_status_brightness(brightness: int) -> None:
 //|     """Set brightness of status RGB LED from 0-255. This will take effect
 //|        after the current code finishes and the status LED is used to show
@@ -301,6 +310,7 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_get_previous_traceback),  MP_ROM_PTR(&supervisor_get_previous_traceback_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_ble_workflow),  MP_ROM_PTR(&supervisor_disable_ble_workflow_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_terminal),  MP_ROM_PTR(&supervisor_reset_terminal_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status_bar),  MP_ROM_PTR(&shared_module_supervisor_status_bar_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_module_globals, supervisor_module_globals_table);
diff --git a/shared-bindings/supervisor/__init__.h b/shared-bindings/supervisor/__init__.h
index 40a1e73932..4b4dc4fc57 100644
--- a/shared-bindings/supervisor/__init__.h
+++ b/shared-bindings/supervisor/__init__.h
@@ -31,8 +31,10 @@
 #include "py/obj.h"
 
 #include "common-hal/supervisor/Runtime.h"
+#include "shared-module/supervisor/StatusBar.h"
 
 extern const super_runtime_obj_t common_hal_supervisor_runtime_obj;
+extern supervisor_status_bar_obj_t shared_module_supervisor_status_bar_obj;
 extern mp_obj_t supervisor_ticks_ms(void);
 
 
diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 605ee2727f..948741a4f0 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -56,26 +56,26 @@
 //|        * ``ESC [ nnnn ; mmmm H`` - Move the cursor to mmmm, nnnn.
 //|     """
 //|
-//|     def __init__(self, scroll_area: displayio.TileGrid, font: fontio.BuiltinFont, *, title_bar: displayio.TileGrid = None) -> None:
+//|     def __init__(self, scroll_area: displayio.TileGrid, font: fontio.BuiltinFont, *, status_bar: displayio.TileGrid = None) -> None:
 //|         """Terminal manages tile indices and cursor position based on VT100 commands. The font should be
 //|         a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap."""
 //|         ...
 //|
 
 STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_scroll_area, ARG_font, ARG_title_bar };
+    enum { ARG_scroll_area, ARG_font, ARG_status_bar };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_scroll_area, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_font, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_title_bar, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } },
+        { MP_QSTR_status_bar, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     displayio_tilegrid_t *scroll_area = mp_arg_validate_type(args[ARG_scroll_area].u_obj, &displayio_tilegrid_type, MP_QSTR_scroll_area);
-    displayio_tilegrid_t *title_bar = NULL;
-    if (args[ARG_title_bar].u_obj != mp_const_none) {
-        title_bar = mp_arg_validate_type(args[ARG_title_bar].u_obj, &displayio_tilegrid_type, MP_QSTR_title_bar);
+    displayio_tilegrid_t *status_bar = NULL;
+    if (args[ARG_status_bar].u_obj != mp_const_none) {
+        status_bar = mp_arg_validate_type(args[ARG_status_bar].u_obj, &displayio_tilegrid_type, MP_QSTR_status_bar);
     }
 
     fontio_builtinfont_t *font = mp_arg_validate_type(args[ARG_font].u_obj, &fontio_builtinfont_type, MP_QSTR_font);
@@ -83,7 +83,7 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
     terminalio_terminal_obj_t *self = m_new_obj(terminalio_terminal_obj_t);
     self->base.type = &terminalio_terminal_type;
 
-    common_hal_terminalio_terminal_construct(self, scroll_area, font, title_bar);
+    common_hal_terminalio_terminal_construct(self, scroll_area, font, status_bar);
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/shared-bindings/terminalio/Terminal.h b/shared-bindings/terminalio/Terminal.h
index 64609b49b1..fda1c29bdd 100644
--- a/shared-bindings/terminalio/Terminal.h
+++ b/shared-bindings/terminalio/Terminal.h
@@ -34,7 +34,7 @@
 extern const mp_obj_type_t terminalio_terminal_type;
 
 extern void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self,
-    displayio_tilegrid_t *scroll_area, const fontio_builtinfont_t *font, displayio_tilegrid_t *title_bar);
+    displayio_tilegrid_t *scroll_area, const fontio_builtinfont_t *font, displayio_tilegrid_t *status_bar);
 
 // Write characters. len is in characters NOT bytes!
 extern size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self,
diff --git a/shared-module/supervisor/StatusBar.c b/shared-module/supervisor/StatusBar.c
new file mode 100644
index 0000000000..cb0882fd44
--- /dev/null
+++ b/shared-module/supervisor/StatusBar.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 
+#include "py/obj.h"
+#include "shared-bindings/supervisor/StatusBar.h"
+#include "shared-bindings/supervisor/__init__.h"
+#include "supervisor/shared/display.h"
+#include "supervisor/shared/status_bar.h"
+
+#if CIRCUITPY_TERMINALIO
+#include "shared-module/terminalio/Terminal.h"
+#endif
+
+bool shared_module_supervisor_status_bar_get_console(supervisor_status_bar_obj_t *self) {
+    return self->console;
+}
+
+void shared_module_supervisor_status_bar_set_console(supervisor_status_bar_obj_t *self, bool enabled) {
+    // Clear before changing state. If disabling, will remain cleared.
+    supervisor_status_bar_clear();
+
+    self->console = enabled;
+
+    // Update may be ignored.
+    supervisor_status_bar_update();
+}
+
+bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t *self) {
+    return self->display;
+}
+
+#if CIRCUITPY_TERMINALIO
+void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled) {
+    terminalio_terminal_clear_status_bar(&supervisor_terminal);
+    // Clear before changing state. If disabling, will remain cleared.
+
+    self->display = enabled;
+
+    // Update may be ignored.
+    supervisor_status_bar_update();
+}
+#endif
+
+bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *self) {
+    return self->update_in_progress;
+}
+
+void supervisor_status_bar_set_update_in_progress(supervisor_status_bar_obj_t *self, bool update_in_progress) {
+    self->update_in_progress = update_in_progress;
+}
diff --git a/shared-module/supervisor/StatusBar.h b/shared-module/supervisor/StatusBar.h
new file mode 100644
index 0000000000..88bf965864
--- /dev/null
+++ b/shared-module/supervisor/StatusBar.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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_SUPERVISOR_STATUS_BAR_H
+#define MICROPY_INCLUDED_SHARED_MODULE_SUPERVISOR_STATUS_BAR_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    bool console;
+    bool display;
+    bool update_in_progress;
+} supervisor_status_bar_obj_t;
+
+extern bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *self);
+extern void supervisor_status_bar_set_update_in_progress(supervisor_status_bar_obj_t *self, bool in_progress);
+
+#endif // MICROPY_INCLUDED_SHARED_MODULE_SUPERVISOR_STATUS_BAR_H
diff --git a/shared-module/supervisor/__init__.c b/shared-module/supervisor/__init__.c
new file mode 100644
index 0000000000..7921eec46a
--- /dev/null
+++ b/shared-module/supervisor/__init__.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 
+#include "py/obj.h"
+#include "shared-bindings/supervisor/StatusBar.h"
+#include "shared-bindings/supervisor/__init__.h"
+
+// The singleton supervisor.StatusBar object, bound to supervisor.status_bar
+supervisor_status_bar_obj_t shared_module_supervisor_status_bar_obj = {
+    .base = {
+        .type = &supervisor_status_bar_type,
+    },
+    .console = true,
+    .display = true,
+};
diff --git a/shared-module/terminalio/Terminal.c b/shared-module/terminalio/Terminal.c
index d45495d14a..b49f48c4e6 100644
--- a/shared-module/terminalio/Terminal.c
+++ b/shared-module/terminalio/Terminal.c
@@ -30,20 +30,31 @@
 #include "shared-bindings/displayio/TileGrid.h"
 #include "shared-bindings/terminalio/Terminal.h"
 
+#if CIRCUITPY_STATUS_BAR
+#include "shared-bindings/supervisor/__init__.h"
+#include "shared-bindings/supervisor/StatusBar.h"
+#endif
+
+void terminalio_terminal_clear_status_bar(terminalio_terminal_obj_t *self) {
+    if (self->status_bar) {
+        common_hal_displayio_tilegrid_set_all_tiles(self->status_bar, 0);
+    }
+}
+
 void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self,
     displayio_tilegrid_t *scroll_area, const fontio_builtinfont_t *font,
-    displayio_tilegrid_t *title_bar) {
+    displayio_tilegrid_t *status_bar) {
     self->cursor_x = 0;
     self->cursor_y = 0;
     self->font = font;
     self->scroll_area = scroll_area;
-    self->title_bar = title_bar;
-    self->title_x = 0;
-    self->title_y = 0;
+    self->status_bar = status_bar;
+    self->status_x = 0;
+    self->status_y = 0;
     self->first_row = 0;
     common_hal_displayio_tilegrid_set_all_tiles(self->scroll_area, 0);
-    if (self->title_bar) {
-        common_hal_displayio_tilegrid_set_all_tiles(self->title_bar, 0);
+    if (self->status_bar) {
+        common_hal_displayio_tilegrid_set_all_tiles(self->status_bar, 0);
     }
 
     common_hal_displayio_tilegrid_set_top_left(self->scroll_area, 0, 1);
@@ -54,6 +65,14 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
     if (self->scroll_area == NULL) {
         return len;
     }
+
+    #if CIRCUITPY_STATUS_BAR
+    // Skip the status bar OSC sequence if it's disabled for the display.
+    const bool status_bar_write_ok =
+        shared_module_supervisor_status_bar_get_display(&shared_module_supervisor_status_bar_obj) ||
+        !supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj);
+    #endif
+
     const byte *i = data;
     uint16_t start_y = self->cursor_y;
     while (i < data + len) {
@@ -62,21 +81,27 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
         if (self->in_osc_command) {
             if (c == 0x1b && i[0] == '\\') {
                 self->in_osc_command = false;
-                self->title_x = 0;
-                self->title_y = 0;
+                self->status_x = 0;
+                self->status_y = 0;
                 i += 1;
-            } else if (self->osc_command == 0 && self->title_bar != NULL && self->title_y < self->title_bar->height_in_tiles) {
+            } else if (
+                #if CIRCUITPY_STATUS_BAR
+                status_bar_write_ok &&
+                #endif
+                self->osc_command == 0 &&
+                self->status_bar != NULL &&
+                self->status_y < self->status_bar->height_in_tiles) {
                 uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c);
                 if (tile_index != 0xff) {
                     // Clear the tile grid before we start putting new info.
-                    if (self->title_x == 0 && self->title_y == 0) {
-                        common_hal_displayio_tilegrid_set_all_tiles(self->title_bar, 0);
+                    if (self->status_x == 0 && self->status_y == 0) {
+                        common_hal_displayio_tilegrid_set_all_tiles(self->status_bar, 0);
                     }
-                    common_hal_displayio_tilegrid_set_tile(self->title_bar, self->title_x, self->title_y, tile_index);
-                    self->title_x++;
-                    if (self->title_x >= self->title_bar->width_in_tiles) {
-                        self->title_y++;
-                        self->title_x %= self->title_bar->width_in_tiles;
+                    common_hal_displayio_tilegrid_set_tile(self->status_bar, self->status_x, self->status_y, tile_index);
+                    self->status_x++;
+                    if (self->status_x >= self->status_bar->width_in_tiles) {
+                        self->status_y++;
+                        self->status_x %= self->status_bar->width_in_tiles;
                     }
                 }
             }
@@ -98,7 +123,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                     self->cursor_x--;
                 }
             } else if (c == 0x1b) {
-                // Handle commands of the form \x1b.####D where . is ignored.
+                // Handle commands of the form [ESC]. where . is not yet known.
                 uint16_t n = 0;
                 uint8_t j = 1;
                 for (; j < 6; j++) {
diff --git a/shared-module/terminalio/Terminal.h b/shared-module/terminalio/Terminal.h
index 2e628f5df6..7f0545c6be 100644
--- a/shared-module/terminalio/Terminal.h
+++ b/shared-module/terminalio/Terminal.h
@@ -40,12 +40,14 @@ typedef struct  {
     uint16_t cursor_x;
     uint16_t cursor_y;
     displayio_tilegrid_t *scroll_area;
-    displayio_tilegrid_t *title_bar;
-    uint16_t title_x;
-    uint16_t title_y;
+    displayio_tilegrid_t *status_bar;
+    uint16_t status_x;
+    uint16_t status_y;
     uint16_t first_row;
     uint16_t osc_command;
     bool in_osc_command;
 } terminalio_terminal_obj_t;
 
+extern void terminalio_terminal_clear_status_bar(terminalio_terminal_obj_t *self);
+
 #endif /* SHARED_MODULE_TERMINALIO_TERMINAL_H */
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index a007219e4d..472d2fa7d5 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -42,7 +42,6 @@
 #include "supervisor/serial.h"
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/tick.h"
-#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/translate/translate.h"
 
 #include "py/mpstate.h"
@@ -57,6 +56,10 @@
 #include "bluetooth/ble_drv.h"
 #endif
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.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, 0xec,  // 3-5 TX power level -20
@@ -94,16 +97,21 @@ STATIC bool ble_started = false;
 STATIC uint8_t workflow_state = WORKFLOW_UNSET;
 STATIC bool was_connected = false;
 
+#if CIRCUITPY_STATUS_BAR
 // To detect when the title bar changes.
 STATIC bool _last_connected = false;
 STATIC bool _last_advertising = false;
+#endif
 
+#if CIRCUITPY_STATUS_BAR
 // Title bar status
 bool supervisor_bluetooth_status_dirty(void) {
     return _last_advertising != advertising ||
            _last_connected != was_connected;
 }
+#endif
 
+#if CIRCUITPY_STATUS_BAR
 void supervisor_bluetooth_status(void) {
     serial_write("BLE:");
     if (advertising) {
@@ -123,6 +131,7 @@ void supervisor_bluetooth_status(void) {
     _last_connected = was_connected;
     _last_advertising = advertising;
 }
+#endif
 
 STATIC void supervisor_bluetooth_start_advertising(void) {
     if (workflow_state != WORKFLOW_ENABLED) {
@@ -273,9 +282,13 @@ void supervisor_bluetooth_background(void) {
         supervisor_bluetooth_file_transfer_disconnected();
         #endif
     }
+
+    #if CIRCUITPY_STATUS_BAR
     if (was_connected != is_connected) {
-        supervisor_title_bar_request_update(false);
+        supervisor_status_bar_request_update(false);
     }
+    #endif
+
     was_connected = is_connected;
     if (!is_connected) {
         supervisor_bluetooth_start_advertising();
@@ -312,7 +325,10 @@ void supervisor_start_bluetooth(void) {
 
     // Kick off advertisements
     supervisor_bluetooth_background();
-    supervisor_title_bar_request_update(false);
+
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_request_update(false);
+    #endif
 
     #endif
 }
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 336819e10c..f573a92271 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -34,7 +34,6 @@
 #include "shared-bindings/displayio/Palette.h"
 #include "shared-bindings/displayio/TileGrid.h"
 #include "supervisor/memory.h"
-#include "supervisor/shared/title_bar.h"
 
 #if CIRCUITPY_RGBMATRIX
 #include "shared-module/displayio/__init__.h"
@@ -46,6 +45,10 @@
 #include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
 #endif
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.h"
+#endif
+
 #if CIRCUITPY_REPL_LOGO
 extern uint32_t blinka_bitmap_data[];
 extern displayio_bitmap_t blinka_bitmap;
@@ -63,7 +66,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
 
     #if CIRCUITPY_TERMINALIO
     displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid;
-    displayio_tilegrid_t *title_bar = &supervisor_terminal_title_bar_text_grid;
+    displayio_tilegrid_t *status_bar = &supervisor_terminal_status_bar_text_grid;
     bool reset_tiles = false;
     uint16_t width_in_tiles = width_px / scroll_area->tile_width;
     // determine scale based on width
@@ -104,21 +107,21 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         uint8_t *tiles = (uint8_t *)tilegrid_tiles->ptr;
 
         #if CIRCUITPY_REPL_LOGO
-        title_bar->x = supervisor_blinka_sprite.pixel_width + 1;
-        // Align the title bar to the bottom of the logo.
-        title_bar->y = supervisor_blinka_sprite.pixel_height - title_bar->tile_height;
+        status_bar->x = supervisor_blinka_sprite.pixel_width + 1;
+        // Align the status bar to the bottom of the logo.
+        status_bar->y = supervisor_blinka_sprite.pixel_height - status_bar->tile_height;
         #else
-        title_bar->x = 0;
-        title_bar->y = 0;
+        status_bar->x = 0;
+        status_bar->y = 0;
         #endif
-        title_bar->top_left_y = 0;
-        title_bar->width_in_tiles = width_in_tiles;
-        title_bar->height_in_tiles = 1;
+        status_bar->top_left_y = 0;
+        status_bar->width_in_tiles = width_in_tiles;
+        status_bar->height_in_tiles = 1;
         assert(width_in_tiles > 0);
-        title_bar->pixel_width = width_in_tiles * title_bar->tile_width;
-        title_bar->pixel_height = title_bar->tile_height;
-        title_bar->tiles = tiles;
-        title_bar->full_change = true;
+        status_bar->pixel_width = width_in_tiles * status_bar->tile_width;
+        status_bar->pixel_height = status_bar->tile_height;
+        status_bar->tiles = tiles;
+        status_bar->full_change = true;
 
         scroll_area->x = 0;
         scroll_area->top_left_y = 0;
@@ -131,7 +134,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         #if CIRCUITPY_REPL_LOGO
         scroll_area->y = blinka_bitmap.height;
         #else
-        scroll_area->y = title_bar->tile_height;
+        scroll_area->y = status_bar->tile_height;
         #endif
         int16_t extra_height = (scroll_area->pixel_height + scroll_area->y) - (height_px / scale);
         // Subtract extra height so that the bottom line fully shows. The top line will be under the
@@ -140,9 +143,11 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         scroll_area->tiles = tiles + width_in_tiles;
         scroll_area->full_change = true;
 
-        common_hal_terminalio_terminal_construct(&supervisor_terminal, scroll_area, &supervisor_terminal_font, title_bar);
-        // Update the title bar since we just cleared the terminal.
-        supervisor_title_bar_update();
+        common_hal_terminalio_terminal_construct(&supervisor_terminal, scroll_area, &supervisor_terminal_font, status_bar);
+        #if CIRCUITPY_STATUS_BAR
+        // Update the status bar since we just cleared the terminal.
+        supervisor_status_bar_update();
+        #endif
     }
     #endif
 
@@ -155,9 +160,9 @@ void supervisor_stop_terminal(void) {
         free_memory(tilegrid_tiles);
         tilegrid_tiles = NULL;
         supervisor_terminal_scroll_area_text_grid.tiles = NULL;
-        supervisor_terminal_title_bar_text_grid.tiles = NULL;
+        supervisor_terminal_status_bar_text_grid.tiles = NULL;
         supervisor_terminal.scroll_area = NULL;
-        supervisor_terminal.title_bar = NULL;
+        supervisor_terminal.status_bar = NULL;
     }
     #endif
 }
@@ -165,13 +170,13 @@ void supervisor_stop_terminal(void) {
 void supervisor_display_move_memory(void) {
     #if CIRCUITPY_TERMINALIO
     displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid;
-    displayio_tilegrid_t *title_bar = &supervisor_terminal_title_bar_text_grid;
+    displayio_tilegrid_t *status_bar = &supervisor_terminal_status_bar_text_grid;
     if (tilegrid_tiles != NULL) {
-        title_bar->tiles = (uint8_t *)tilegrid_tiles->ptr;
+        status_bar->tiles = (uint8_t *)tilegrid_tiles->ptr;
         scroll_area->tiles = (uint8_t *)tilegrid_tiles->ptr + scroll_area->width_in_tiles;
     } else {
         scroll_area->tiles = NULL;
-        title_bar->tiles = NULL;
+        status_bar->tiles = NULL;
     }
     #endif
 
@@ -195,7 +200,7 @@ void supervisor_display_move_memory(void) {
 
 #if CIRCUITPY_TERMINALIO
 #if CIRCUITPY_REPL_LOGO
-mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_blinka_sprite, &supervisor_terminal_title_bar_text_grid, };
+mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_blinka_sprite, &supervisor_terminal_status_bar_text_grid, };
 mp_obj_list_t splash_children = {
     .base = {.type = &mp_type_list },
     .alloc = 3,
@@ -203,7 +208,7 @@ mp_obj_list_t splash_children = {
     .items = members,
 };
 #else
-mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_terminal_title_bar_text_grid,};
+mp_obj_t members[] = { &supervisor_terminal_scroll_area_text_grid, &supervisor_terminal_status_bar_text_grid,};
 mp_obj_list_t splash_children = {
     .base = {.type = &mp_type_list },
     .alloc = 2,
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h
index a7e28a8f75..fcaab10818 100644
--- a/supervisor/shared/display.h
+++ b/supervisor/shared/display.h
@@ -45,7 +45,7 @@ extern const fontio_builtinfont_t supervisor_terminal_font;
 // These will change so they must live in RAM.
 extern displayio_bitmap_t supervisor_terminal_font_bitmap;
 extern displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid;
-extern displayio_tilegrid_t supervisor_terminal_title_bar_text_grid;
+extern displayio_tilegrid_t supervisor_terminal_status_bar_text_grid;
 extern terminalio_terminal_obj_t supervisor_terminal;
 #endif
 
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 974dd12b32..094c532781 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -41,6 +41,11 @@
 #include "supervisor/shared/bluetooth/serial.h"
 #endif
 
+#if CIRCUITPY_STATUS_BAR
+#include "shared-bindings/supervisor/__init__.h"
+#include "shared-bindings/supervisor/StatusBar.h"
+#endif
+
 #if CIRCUITPY_USB
 #include "tusb.h"
 #endif
@@ -276,11 +281,22 @@ void serial_write_substring(const char *text, uint32_t length) {
     if (length == 0) {
         return;
     }
+
     #if CIRCUITPY_TERMINALIO
     int errcode;
+    // We might be writing
+    // If the status bar is disabled for the display, common_hal_terminalio_terminal_write() will not write it.
     common_hal_terminalio_terminal_write(&supervisor_terminal, (const uint8_t *)text, length, &errcode);
     #endif
 
+    #if CIRCUITPY_STATUS_BAR
+    // If the status bar is disabled for the console, skip writing out the OSC sequence.
+    if (supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj) &&
+        !shared_module_supervisor_status_bar_get_console(&shared_module_supervisor_status_bar_obj)) {
+        return;
+    }
+    #endif
+
     #if CIRCUITPY_USB_VENDOR
     if (tud_vendor_connected()) {
         tud_vendor_write(text, length);
diff --git a/supervisor/shared/title_bar.c b/supervisor/shared/status_bar.c
similarity index 66%
rename from supervisor/shared/title_bar.c
rename to supervisor/shared/status_bar.c
index 9326a1f9ed..2adc065e04 100644
--- a/supervisor/shared/title_bar.c
+++ b/supervisor/shared/status_bar.c
@@ -27,9 +27,15 @@
 #include 
 #include "genhdr/mpversion.h"
 #include "py/mpconfig.h"
+#include "shared-bindings/supervisor/__init__.h"
+#include "shared-bindings/supervisor/StatusBar.h"
 #include "supervisor/background_callback.h"
 #include "supervisor/serial.h"
-#include "supervisor/shared/title_bar.h"
+#include "supervisor/shared/status_bar.h"
+
+#if CIRCUITPY_TERMINALIO
+#include "shared-module/terminalio/Terminal.h"
+#endif
 
 #if CIRCUITPY_WEB_WORKFLOW
 #include "supervisor/shared/web_workflow/web_workflow.h"
@@ -39,46 +45,56 @@
 #include "supervisor/shared/bluetooth/bluetooth.h"
 #endif
 
-static background_callback_t title_bar_background_cb;
+static background_callback_t status_bar_background_cb;
 
 static bool _forced_dirty = false;
 static bool _suspended = false;
 
+// Clear if possible, but give up if we can't do it now.
+void supervisor_status_bar_clear(void) {
+    if (!_suspended) {
+        supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, true);
+        serial_write("\x1b" "]0;" "\x1b" "\\");
+        supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, false);
+    }
+}
 
-void supervisor_title_bar_update(void) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
+void supervisor_status_bar_update(void) {
     if (_suspended) {
-        supervisor_title_bar_request_update(true);
+        supervisor_status_bar_request_update(true);
         return;
     }
     _forced_dirty = false;
+
+    supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, true);
+
     // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
     // doesn't get terminated after two following characters and the value is invalid.
     // This is the OSC command to set the title and the icon text. It can be up to 255 characters
     // but some may be cut off.
     serial_write("\x1b" "]0;");
     serial_write("🐍");
+
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_web_workflow_status();
     serial_write(" | ");
     #endif
+
     #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
     supervisor_bluetooth_status();
     serial_write(" | ");
     #endif
+
     supervisor_execution_status();
     serial_write(" | ");
     serial_write(MICROPY_GIT_TAG);
     // Send string terminator
     serial_write("\x1b" "\\");
+
+    supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, false);
 }
 
-static void title_bar_background(void *data) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
+static void status_bar_background(void *data) {
     if (_suspended) {
         return;
     }
@@ -92,42 +108,29 @@ static void title_bar_background(void *data) {
     dirty = dirty || supervisor_bluetooth_status_dirty();
     #endif
 
-    if (!dirty) {
-        return;
+    if (dirty) {
+        supervisor_status_bar_update();
     }
-    supervisor_title_bar_update();
 }
 
-void supervisor_title_bar_start(void) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
-    title_bar_background_cb.fun = title_bar_background;
-    title_bar_background_cb.data = NULL;
-    supervisor_title_bar_request_update(true);
+void supervisor_status_bar_start(void) {
+    status_bar_background_cb.fun = status_bar_background;
+    status_bar_background_cb.data = NULL;
+    supervisor_status_bar_request_update(true);
 }
 
-void supervisor_title_bar_request_update(bool force_dirty) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
+void supervisor_status_bar_request_update(bool force_dirty) {
     if (force_dirty) {
         _forced_dirty = true;
     }
-    background_callback_add_core(&title_bar_background_cb);
+    background_callback_add_core(&status_bar_background_cb);
 }
 
-void supervisor_title_bar_suspend(void) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
+void supervisor_status_bar_suspend(void) {
     _suspended = true;
 }
 
-void supervisor_title_bar_resume(void) {
-    #if !CIRCUITPY_STATUS_BAR
-    return;
-    #endif
+void supervisor_status_bar_resume(void) {
     _suspended = false;
-    supervisor_title_bar_request_update(false);
+    supervisor_status_bar_request_update(false);
 }
diff --git a/supervisor/shared/title_bar.h b/supervisor/shared/status_bar.h
similarity index 85%
rename from supervisor/shared/title_bar.h
rename to supervisor/shared/status_bar.h
index 092b5add32..db2c442276 100644
--- a/supervisor/shared/title_bar.h
+++ b/supervisor/shared/status_bar.h
@@ -28,17 +28,19 @@
 
 #include 
 
-void supervisor_title_bar_start(void);
-void supervisor_title_bar_suspend(void);
-void supervisor_title_bar_resume(void);
+void supervisor_status_bar_start(void);
+void supervisor_status_bar_suspend(void);
+void supervisor_status_bar_resume(void);
+
+void supervisor_status_bar_clear(void);
 
 // Update the title bar immediately. Useful from main.c where we know state has changed and the code
 // will only be run once.
-void supervisor_title_bar_update(void);
+void supervisor_status_bar_update(void);
 
 // Use this if requesting from the background, as code is executing or if the status may not have
 // changed.
-void supervisor_title_bar_request_update(bool force_dirty);
+void supervisor_status_bar_request_update(bool force_dirty);
 
 // Provided by main.c
 void supervisor_execution_status(void);
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 8f571c8e10..7aae3b9b09 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -31,11 +31,14 @@
 #include "supervisor/port.h"
 #include "supervisor/serial.h"
 #include "supervisor/usb.h"
-#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/workflow.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/readline/readline.h"
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.h"
+#endif
+
 #if CIRCUITPY_STORAGE
 #include "shared-module/storage/__init__.h"
 #endif
@@ -244,8 +247,10 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
             reset_to_bootloader();
         }
     } else {
+        #if CIRCUITPY_STATUS_BAR
         // We are connected, let's request a title bar update.
-        supervisor_title_bar_request_update(true);
+        supervisor_status_bar_request_update(true);
+        #endif
     }
 }
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 5d6429aaa3..e09c87f624 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -102,10 +102,12 @@ typedef struct {
 
 static wifi_radio_error_t _wifi_status = WIFI_RADIO_ERROR_NONE;
 
-// Store last status state to compute dirty.
+#if CIRCUITPY_STATUS_BAR
+// Store various last states to compute if status bar needs an update.
 static bool _last_enabled = false;
 static uint32_t _last_ip = 0;
 static wifi_radio_error_t _last_wifi_status = WIFI_RADIO_ERROR_NONE;
+#endif
 
 static mdns_server_obj_t mdns;
 static uint32_t web_api_port = 80;
@@ -193,12 +195,15 @@ STATIC void _update_encoded_ip(void) {
     }
 }
 
+#if CIRCUITPY_STATUS_BAR
 bool supervisor_web_workflow_status_dirty(void) {
     return common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj) != _last_enabled ||
            _encoded_ip != _last_ip ||
            _last_wifi_status != _wifi_status;
 }
+#endif
 
+#if CIRCUITPY_STATUS_BAR
 void supervisor_web_workflow_status(void) {
     _last_enabled = common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj);
     if (_last_enabled) {
@@ -231,6 +236,7 @@ void supervisor_web_workflow_status(void) {
         serial_write_compressed(translate("off"));
     }
 }
+#endif
 
 void supervisor_start_web_workflow(void) {
     #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 4b9e4796cd..3901c4eefe 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -29,9 +29,12 @@
 #include "py/ringbuf.h"
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
-#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
 
+#if CIRCUITPY_STATUS_BAR
+#include "supervisor/shared/status_bar.h"
+#endif
+
 // TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
 #include "esp_log.h"
 
@@ -73,8 +76,10 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
     socket->connected = false;
     socket->num = -1;
 
+    #if CIRCUITPY_STATUS_BAR
     // Send the title bar for the new client.
-    supervisor_title_bar_request_update(true);
+    supervisor_status_bar_request_update(true);
+    #endif
 }
 
 bool websocket_connected(void) {
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index cbfaae507e..a8deb9606d 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -15,7 +15,6 @@ SRC_SUPERVISOR = \
 	supervisor/shared/stack.c \
 	supervisor/shared/status_leds.c \
 	supervisor/shared/tick.c \
-	supervisor/shared/title_bar.c \
 	supervisor/shared/traceback.c \
 	supervisor/shared/translate/translate.c \
 	supervisor/shared/workflow.c \
@@ -98,6 +97,12 @@ ifneq ($(wildcard supervisor/serial.c),)
   SRC_SUPERVISOR += supervisor/serial.c
 endif
 
+ifeq ($(CIRCUITPY_STATUS_BAR),1)
+  SRC_SUPERVISOR += \
+    supervisor/shared/status_bar.c \
+
+endif
+
 ifeq ($(CIRCUITPY_USB),1)
   SRC_SUPERVISOR += \
     lib/tinyusb/src/class/cdc/cdc_device.c \
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index 5da6062823..e5ce775e4a 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -324,7 +324,7 @@ displayio_tilegrid_t supervisor_terminal_scroll_area_text_grid = {{
 
 c_file.write(
     """\
-displayio_tilegrid_t supervisor_terminal_title_bar_text_grid = {{
+displayio_tilegrid_t supervisor_terminal_status_bar_text_grid = {{
     .base = {{ .type = &displayio_tilegrid_type }},
     .bitmap = (displayio_bitmap_t*) &supervisor_terminal_font_bitmap,
     .pixel_shader = &supervisor_terminal_color,
@@ -414,7 +414,7 @@ terminalio_terminal_obj_t supervisor_terminal = {
     .cursor_x = 0,
     .cursor_y = 0,
     .scroll_area = NULL,
-    .title_bar = NULL
+    .status_bar = NULL
 };
 
 #endif

From 2fa671c0f8a2984bd6301735524fc62f207f8133 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 30 Aug 2022 22:33:29 -0400
Subject: [PATCH 0920/2403] avoid status bar updates immediately after hard
 restart

---
 main.c                                 |  4 ++++
 shared-bindings/supervisor/StatusBar.c |  5 +++--
 shared-module/supervisor/StatusBar.c   | 13 +++++++++----
 shared-module/supervisor/StatusBar.h   |  1 +
 shared-module/supervisor/__init__.c    |  2 --
 supervisor/shared/display.c            |  6 ++----
 supervisor/shared/status_bar.c         |  7 +++++++
 supervisor/shared/status_bar.h         |  2 ++
 8 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/main.c b/main.c
index 4c3bae6948..804b229861 100644
--- a/main.c
+++ b/main.c
@@ -937,6 +937,10 @@ int __attribute__((used)) main(void) {
 
     stack_init();
 
+    #if CIRCUITPY_STATUS_BAR
+    supervisor_status_bar_init();
+    #endif
+
     #if CIRCUITPY_BLEIO
     // Early init so that a reset press can cause BLE public advertising.
     supervisor_bluetooth_init();
diff --git a/shared-bindings/supervisor/StatusBar.c b/shared-bindings/supervisor/StatusBar.c
index 3ee9ae9de4..ad6bfb401c 100644
--- a/shared-bindings/supervisor/StatusBar.c
+++ b/shared-bindings/supervisor/StatusBar.c
@@ -52,7 +52,7 @@
 //|     """Whether status bar information is sent over the console (REPL) serial connection,
 //|     using OSC terminal escape codes that change the terminal's title. Default is ``True``.
 //|     If set to ``False``, status bar will be cleared and then disabled.
-//|     May be set in ``boot.py`` or later.
+//|     May be set in ``boot.py`` or later. Persists across soft restarts.
 //|     """
 //|
 STATIC mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) {
@@ -83,7 +83,8 @@ MP_PROPERTY_GETSET(supervisor_status_bar_console_obj,
 //|     display: bool
 //|     """Whether status bar information is displayed on the top line of the display.
 //|     Default is ``True``. If set to ``False``, status bar will be cleared and then disabled.
-//|     May be set in ``boot.py`` or later. Not available if `terminalio` is not available.
+//|     May be set in ``boot.py`` or later.  Persists across soft restarts.
+//|     Not available if `terminalio` is not available.
 //|     """
 //|
 STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) {
diff --git a/shared-module/supervisor/StatusBar.c b/shared-module/supervisor/StatusBar.c
index cb0882fd44..2b2dda9ecf 100644
--- a/shared-module/supervisor/StatusBar.c
+++ b/shared-module/supervisor/StatusBar.c
@@ -40,8 +40,10 @@ bool shared_module_supervisor_status_bar_get_console(supervisor_status_bar_obj_t
 }
 
 void shared_module_supervisor_status_bar_set_console(supervisor_status_bar_obj_t *self, bool enabled) {
-    // Clear before changing state. If disabling, will remain cleared.
-    supervisor_status_bar_clear();
+    if (self->written) {
+        // Clear before changing state. If disabling, will remain cleared.
+        supervisor_status_bar_clear();
+    }
 
     self->console = enabled;
 
@@ -55,8 +57,10 @@ bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t
 
 #if CIRCUITPY_TERMINALIO
 void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled) {
-    terminalio_terminal_clear_status_bar(&supervisor_terminal);
-    // Clear before changing state. If disabling, will remain cleared.
+    if (self->written) {
+        // Clear before changing state. If disabling, will remain cleared.
+        terminalio_terminal_clear_status_bar(&supervisor_terminal);
+    }
 
     self->display = enabled;
 
@@ -70,5 +74,6 @@ bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *s
 }
 
 void supervisor_status_bar_set_update_in_progress(supervisor_status_bar_obj_t *self, bool update_in_progress) {
+    self->written = true;
     self->update_in_progress = update_in_progress;
 }
diff --git a/shared-module/supervisor/StatusBar.h b/shared-module/supervisor/StatusBar.h
index 88bf965864..bc80d7825f 100644
--- a/shared-module/supervisor/StatusBar.h
+++ b/shared-module/supervisor/StatusBar.h
@@ -34,6 +34,7 @@ typedef struct {
     bool console;
     bool display;
     bool update_in_progress;
+    bool written;
 } supervisor_status_bar_obj_t;
 
 extern bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *self);
diff --git a/shared-module/supervisor/__init__.c b/shared-module/supervisor/__init__.c
index 7921eec46a..05e23e26e7 100644
--- a/shared-module/supervisor/__init__.c
+++ b/shared-module/supervisor/__init__.c
@@ -34,6 +34,4 @@ supervisor_status_bar_obj_t shared_module_supervisor_status_bar_obj = {
     .base = {
         .type = &supervisor_status_bar_type,
     },
-    .console = true,
-    .display = true,
 };
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index f573a92271..8ed2f5c17e 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -144,10 +144,8 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         scroll_area->full_change = true;
 
         common_hal_terminalio_terminal_construct(&supervisor_terminal, scroll_area, &supervisor_terminal_font, status_bar);
-        #if CIRCUITPY_STATUS_BAR
-        // Update the status bar since we just cleared the terminal.
-        supervisor_status_bar_update();
-        #endif
+
+        // Do not update status bar until after boot.py has run, in case it is disabled.
     }
     #endif
 
diff --git a/supervisor/shared/status_bar.c b/supervisor/shared/status_bar.c
index 2adc065e04..0607696d3e 100644
--- a/supervisor/shared/status_bar.c
+++ b/supervisor/shared/status_bar.c
@@ -50,6 +50,13 @@ static background_callback_t status_bar_background_cb;
 static bool _forced_dirty = false;
 static bool _suspended = false;
 
+void supervisor_status_bar_init(void) {
+    shared_module_supervisor_status_bar_obj.console = true;
+    shared_module_supervisor_status_bar_obj.display = true;
+    shared_module_supervisor_status_bar_obj.update_in_progress = false;
+    shared_module_supervisor_status_bar_obj.written = false;
+}
+
 // Clear if possible, but give up if we can't do it now.
 void supervisor_status_bar_clear(void) {
     if (!_suspended) {
diff --git a/supervisor/shared/status_bar.h b/supervisor/shared/status_bar.h
index db2c442276..062012b545 100644
--- a/supervisor/shared/status_bar.h
+++ b/supervisor/shared/status_bar.h
@@ -28,6 +28,8 @@
 
 #include 
 
+void supervisor_status_bar_init(void);
+
 void supervisor_status_bar_start(void);
 void supervisor_status_bar_suspend(void);
 void supervisor_status_bar_resume(void);

From 8be2d650c7b2967e40c5bbe97a7ca928a7ce2e20 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Thu, 1 Sep 2022 12:26:33 -0700
Subject: [PATCH 0921/2403] Add info and link for Web Workflow /code/ page

---
 docs/workflows.md                                  | 6 ++++++
 supervisor/shared/web_workflow/static/welcome.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 576bfbdb5b..3f18937904 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -405,6 +405,12 @@ curl -v -L http://circuitpython.local/cp/version.json
 }
 ```
 
+#### `/code/`
+
+The `/code/` page returns a small static html page that will pull in and load the full code editor from 
+[code.circuitpython.org](https://code.circuitpython.org) for a full code editor experience. Because most
+of the resources reside online instead of the device, an active internet connection is required.
+
 ### Static files
 
 * `/favicon.ico` - Blinka
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index 3ed978cfe7..e773bb6a2e 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -12,7 +12,7 @@
 
     
     Welcome!
    
 
-    
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
    
+    
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the full code editor for a more enriching experience which requires an active internet connection. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
    
 
     
    Device Info:
    
 

From 8e0c6930dd3d7c91e86db84487291661de84961c Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Thu, 1 Sep 2022 13:32:49 -0700
Subject: [PATCH 0922/2403] Fix trailing whitespace

---
 docs/workflows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 3f18937904..26f5179b51 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -407,7 +407,7 @@ curl -v -L http://circuitpython.local/cp/version.json
 
 #### `/code/`
 
-The `/code/` page returns a small static html page that will pull in and load the full code editor from 
+The `/code/` page returns a small static html page that will pull in and load the full code editor from
 [code.circuitpython.org](https://code.circuitpython.org) for a full code editor experience. Because most
 of the resources reside online instead of the device, an active internet connection is required.
 

From 2c42a48962d5e674294139e7d91b4726a80aca90 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 1 Sep 2022 19:10:16 -0400
Subject: [PATCH 0923/2403] Clear stale exception in _exec_result; more
 status_bar fixups

---
 main.c                               |  4 +++-
 shared-module/supervisor/StatusBar.c | 10 ++++++++++
 supervisor/shared/status_bar.c       | 19 ++++++++++---------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/main.c b/main.c
index 804b229861..30c28babf9 100644
--- a/main.c
+++ b/main.c
@@ -458,6 +458,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
         cleanup_after_vm(heap, _exec_result.exception);
+        _exec_result.exception = NULL;
 
         // 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
@@ -841,6 +842,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     port_post_boot_py(true);
 
     cleanup_after_vm(heap, _exec_result.exception);
+    _exec_result.exception = NULL;
 
     port_post_boot_py(false);
 
@@ -992,7 +994,7 @@ int __attribute__((used)) main(void) {
     supervisor_workflow_start();
 
     #if CIRCUITPY_STATUS_BAR
-    supervisor_status_bar_start();
+    supervisor_status_bar_request_update(true);
     #endif
 
     // Boot script is finished, so now go into REPL or run code.py.
diff --git a/shared-module/supervisor/StatusBar.c b/shared-module/supervisor/StatusBar.c
index 2b2dda9ecf..0cc0552fcd 100644
--- a/shared-module/supervisor/StatusBar.c
+++ b/shared-module/supervisor/StatusBar.c
@@ -40,6 +40,11 @@ bool shared_module_supervisor_status_bar_get_console(supervisor_status_bar_obj_t
 }
 
 void shared_module_supervisor_status_bar_set_console(supervisor_status_bar_obj_t *self, bool enabled) {
+    if (self->console == enabled) {
+        // Do nothing if not changing the state.
+        return;
+    }
+
     if (self->written) {
         // Clear before changing state. If disabling, will remain cleared.
         supervisor_status_bar_clear();
@@ -57,6 +62,11 @@ bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t
 
 #if CIRCUITPY_TERMINALIO
 void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled) {
+    if (self->display == enabled) {
+        // Do nothing if not changing the state.
+        return;
+    }
+
     if (self->written) {
         // Clear before changing state. If disabling, will remain cleared.
         terminalio_terminal_clear_status_bar(&supervisor_terminal);
diff --git a/supervisor/shared/status_bar.c b/supervisor/shared/status_bar.c
index 0607696d3e..066a8d3d10 100644
--- a/supervisor/shared/status_bar.c
+++ b/supervisor/shared/status_bar.c
@@ -50,13 +50,6 @@ static background_callback_t status_bar_background_cb;
 static bool _forced_dirty = false;
 static bool _suspended = false;
 
-void supervisor_status_bar_init(void) {
-    shared_module_supervisor_status_bar_obj.console = true;
-    shared_module_supervisor_status_bar_obj.display = true;
-    shared_module_supervisor_status_bar_obj.update_in_progress = false;
-    shared_module_supervisor_status_bar_obj.written = false;
-}
-
 // Clear if possible, but give up if we can't do it now.
 void supervisor_status_bar_clear(void) {
     if (!_suspended) {
@@ -121,8 +114,6 @@ static void status_bar_background(void *data) {
 }
 
 void supervisor_status_bar_start(void) {
-    status_bar_background_cb.fun = status_bar_background;
-    status_bar_background_cb.data = NULL;
     supervisor_status_bar_request_update(true);
 }
 
@@ -141,3 +132,13 @@ void supervisor_status_bar_resume(void) {
     _suspended = false;
     supervisor_status_bar_request_update(false);
 }
+
+void supervisor_status_bar_init(void) {
+    status_bar_background_cb.fun = status_bar_background;
+    status_bar_background_cb.data = NULL;
+
+    shared_module_supervisor_status_bar_obj.console = true;
+    shared_module_supervisor_status_bar_obj.display = true;
+    shared_module_supervisor_status_bar_obj.update_in_progress = false;
+    shared_module_supervisor_status_bar_obj.written = false;
+}

From 85f0206fa435b8e4bbb85af95892afcec40dc232 Mon Sep 17 00:00:00 2001
From: Alec Delaney 
Date: Thu, 1 Sep 2022 19:44:08 -0400
Subject: [PATCH 0924/2403] Document socketpool.SocketPool.__init__()

---
 shared-bindings/socketpool/SocketPool.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 447d2d7d78..a758511546 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -38,11 +38,20 @@
 
 //| class SocketPool:
 //|     """A pool of socket resources available for the given radio. Only one
-//|        SocketPool can be created for each radio.
+//|     SocketPool can be created for each radio.
 //|
-//|        SocketPool should be used in place of CPython's socket which provides
-//|        a pool of sockets provided by the underlying OS."""
+//|     SocketPool should be used in place of CPython's socket which provides
+//|     a pool of sockets provided by the underlying OS.
+//|     """
 //|
+//|     def __init__(self, radio: wifi.Radio) -> None:
+//|         """Create a new SocketPool object for the provided radio
+//|
+//|         :param wifi.Radio radio: The (connected) network hardware to associate
+//|             with this SocketPool; currently, this will always be the object
+//|             returned by :py:attr:`wifi.radio`
+//|         """
+//|         ...
 
 STATIC mp_obj_t socketpool_socketpool_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);

From 3a18d285a23f76f3edc15933a02b22df0601869e Mon Sep 17 00:00:00 2001
From: wemos 
Date: Sat, 3 Sep 2022 11:06:51 +0800
Subject: [PATCH 0925/2403] Add LOLIN S3 ESP32-S3 board.

---
 ports/espressif/boards/lolin_s3/board.c       |  47 +++++++
 .../espressif/boards/lolin_s3/mpconfigboard.h |  41 ++++++
 .../boards/lolin_s3/mpconfigboard.mk          |  20 +++
 ports/espressif/boards/lolin_s3/pins.c        | 123 ++++++++++++++++++
 ports/espressif/boards/lolin_s3/sdkconfig     |  48 +++++++
 5 files changed, 279 insertions(+)
 create mode 100644 ports/espressif/boards/lolin_s3/board.c
 create mode 100644 ports/espressif/boards/lolin_s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lolin_s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lolin_s3/pins.c
 create mode 100644 ports/espressif/boards/lolin_s3/sdkconfig

diff --git a/ports/espressif/boards/lolin_s3/board.c b/ports/espressif/boards/lolin_s3/board.c
new file mode 100644
index 0000000000..545302366e
--- /dev/null
+++ b/ports/espressif/boards/lolin_s3/board.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+    reset_board();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.h b/ports/espressif/boards/lolin_s3/mpconfigboard.h
new file mode 100644
index 0000000000..9dc1b8f6a9
--- /dev/null
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.h
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "LOLIN S3 16MB Flash 8MB PSRAM"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO38)
+
+// #define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO12)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO13)
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.mk b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
new file mode 100644
index 0000000000..2daa5b3ed5
--- /dev/null
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303a
+USB_PID = 0x8117
+USB_PRODUCT = "LOLIN S3 16MB Flash 8MB PSRAM"
+USB_MANUFACTURER = "WEMOS"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+OPTIMIZATION_FLAGS = -Os
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/lolin_s3/pins.c b/ports/espressif/boards/lolin_s3/pins.c
new file mode 100644
index 0000000000..cc88572b6e
--- /dev/null
+++ b/ports/espressif/boards/lolin_s3/pins.c
@@ -0,0 +1,123 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_A16), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_A17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lolin_s3/sdkconfig b/ports/espressif/boards/lolin_s3/sdkconfig
new file mode 100644
index 0000000000..23d005edd9
--- /dev/null
+++ b/ports/espressif/boards/lolin_s3/sdkconfig
@@ -0,0 +1,48 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=8388608
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+# CONFIG_DEFAULT_PSRAM_CLK_IO=30
+# CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MODE_OCT=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN-S3"
+# end of LWIP
+
+# end of Component config

From a3e17189a4898f16d2fb1f89edf5bee06109f511 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 3 Sep 2022 20:39:08 -0500
Subject: [PATCH 0926/2403] rp2pio: fix occasional bug when not using OUT pins

a NULL first pin object is used to indicate that there are zero
of some kind of pin associated with the StateMachine. However,
mask_and_rotate wasn't checking for zero. It actually read data from
near address 0x0 and (in my case) got a nonzero mask, which then
caused a program with GPIO11 and GPIO12 as input with pull-up and no
out pins to erroneously encounter the error "pull masks conflict with
direction masks"
---
 ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index 9e8d5feebc..78703351d7 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -369,6 +369,9 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
 }
 
 static uint32_t mask_and_rotate(const mcu_pin_obj_t *first_pin, uint32_t bit_count, uint32_t value) {
+    if (!first_pin) {
+        return 0;
+    }
     value = value & ((1 << bit_count) - 1);
     uint32_t shift = first_pin->number;
     return value << shift | value >> (32 - shift);

From e1891038c8c354d1771388c1f83c5fcd4dee53e1 Mon Sep 17 00:00:00 2001
From: bill88t 
Date: Sun, 4 Sep 2022 16:59:56 +0300
Subject: [PATCH 0927/2403] Forgor the one IO pin and sda-scl

---
 ports/espressif/boards/waveshare_esp32s2_pico/pins.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
index 1b7a8d705c..64c0c545b8 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
@@ -5,6 +5,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO9) },
+
     { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
@@ -15,8 +17,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
 
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO9) },
-
     { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
@@ -33,9 +33,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP37), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_GP38), MP_ROM_PTR(&pin_GPIO38) },
 
-    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_GP39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_41), MP_ROM_PTR(&pin_GPIO41) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO40) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+
     { MP_ROM_QSTR(MP_QSTR_GP42), MP_ROM_PTR(&pin_GPIO42) },
     { MP_ROM_QSTR(MP_QSTR_GP43), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_GP44), MP_ROM_PTR(&pin_GPIO44) }

From ca7fb6dede183d467c99fc0cb80eab4aac40823d Mon Sep 17 00:00:00 2001
From: bill88t 
Date: Sun, 4 Sep 2022 18:05:50 +0300
Subject: [PATCH 0928/2403] removal of sda-scl and add "GP" to 40,41

---
 ports/espressif/boards/waveshare_esp32s2_pico/pins.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
index 64c0c545b8..04054344ae 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c
@@ -34,11 +34,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP38), MP_ROM_PTR(&pin_GPIO38) },
 
     { MP_ROM_QSTR(MP_QSTR_GP39), MP_ROM_PTR(&pin_GPIO39) },
-
-    { MP_ROM_QSTR(MP_QSTR_40), MP_ROM_PTR(&pin_GPIO40) },
-    { MP_ROM_QSTR(MP_QSTR_41), MP_ROM_PTR(&pin_GPIO41) },
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO40) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GP40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GP41), MP_ROM_PTR(&pin_GPIO41) },
 
     { MP_ROM_QSTR(MP_QSTR_GP42), MP_ROM_PTR(&pin_GPIO42) },
     { MP_ROM_QSTR(MP_QSTR_GP43), MP_ROM_PTR(&pin_GPIO43) },

From d7a1db5b87d484631016ec40e44b5847b7dc3de1 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Sun, 4 Sep 2022 15:57:59 -0400
Subject: [PATCH 0929/2403] Changes per review

---
 .../common-hal/adcbuffer/BufferedInput.c      | 11 ++++-
 shared-bindings/adcbuffer/BufferedInput.c     | 41 ++++++++++---------
 shared-bindings/adcbuffer/BufferedInput.h     |  2 +-
 shared-bindings/adcbuffer/__init__.c          | 10 ++---
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
index b42bed2c0c..1050cf7e57 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
@@ -62,7 +62,7 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     self->buffer = buffer;
     self->len = len;
 
-    // Set sample rate - used in readmultiple
+    // Set sample rate - used in read
     self->bytes_per_sample = bytes_per_sample;
     self->sample_rate = sample_rate;
 
@@ -74,6 +74,13 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     adc_gpio_init(pin->number);
     adc_select_input(self->chan); // chan = pin - 26 ??
 
+    // RP2040 Implementation Detail
+    // Fills the supplied buffer with ADC values using DMA transfer.
+    // If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
+    // If buffer is 16-bit, then values are not shifted and error bit is present.
+    // Number of transfers is always the number of samples which is the array
+    // byte length divided by the bytes_per_sample.
+    
     // self->bytes_per_sample == 1
     uint dma_size = DMA_SIZE_8;
     bool show_error_bit = false;
@@ -141,7 +148,7 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
     dma_channel_unclaim(self->dma_chan);
 }
 
-void common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self) {
+void common_hal_adcbuffer_bufferedinput_read(adcbuffer_bufferedinput_obj_t *self) {
 
     uint32_t cdl = self->len / self->bytes_per_sample;
 
diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/adcbuffer/BufferedInput.c
index da7cb9525a..3941d1b5b7 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/adcbuffer/BufferedInput.c
@@ -38,15 +38,19 @@
 #include "shared-bindings/util.h"
 
 //| class BufferedInput:
-//|     """Input analog voltage level to supplied buffer using DMA Capture"""
+//|     """Capture multiple analog voltage levels to the supplied buffer"""
 //|
 //|     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
-//|         """Use the BufferedInput on the given pin. Fill the given buffer from ADC read values at the supplied
-//|         sample_rate.
+//|         """Create a `BufferedInput` on the given pin. ADC values will be read
+//|            into the given buffer at the supplied sample_rate. Depending on the
+//|            buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
+//|            16-bit half-words and are signed or unsigned.
+//|            The ADC most significant bits of the ADC are kept. Please see:
+//|            `https://docs.circuitpython.org/en/latest/docs/library/array.html`
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
-//|         :param ~int sample_rate: rate: The desired playback sample rate
+//|         :param ~int sample_rate: rate: sampling frequency, in samples per second
 //|
 //|     Usage::
 //|
@@ -58,7 +62,7 @@
 //|       mybuffer = array.array("H", [0] * length)
 //|       rate = 500000
 //|       adcbuf = adcbuffer.BufferedInput(board.GP26, mybuffer, rate)
-//|       adcbuf.readmultiple()
+//|       adcbuf.read()
 //|       adcbuf.deinit()
 //|       for i in range(length):
 //|           print(i, mybuffer[i])
@@ -93,7 +97,7 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
         bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError(translate("sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or 'B'"));
+      mp_raise_ValueError_varg(translate("%q must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
     }
 
     // Validate sample rate here
@@ -117,7 +121,7 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
 }
 
 //|     def deinit(self) -> None:
-//|         """Turn off the BufferedInput and release the pin for other use."""
+//|         """Shut down the `BufferedInput` and release the pin for other use."""
 //|         ...
 //|
 STATIC mp_obj_t adcbuffer_bufferedinput_deinit(mp_obj_t self_in) {
@@ -147,26 +151,23 @@ STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj, 4, 4, adcbuffer_bufferedinput___exit__);
 
-//|     value: None
-//|         """Fills the supplied buffer with ADC values using DMA transfer.
-//|     If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
-//|     If buffer is 16-bit, then values are not shifted and error bit is present.
-//|     Number of transfers is always the number of samples which is the array
-//|     byte length divided by the bytes_per_sample."""
+//|     
+//|     def read(self) -> None:
+//|         """Fills the provided buffer with ADC voltage values."""
 //|
-STATIC mp_obj_t adcbuffer_bufferedinput_obj_readmultiple(mp_obj_t self_in) {
+STATIC mp_obj_t adcbuffer_bufferedinput_obj_read(mp_obj_t self_in) {
     adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    common_hal_adcbuffer_bufferedinput_readmultiple(self);
+    common_hal_adcbuffer_bufferedinput_read(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_readmultiple_obj, adcbuffer_bufferedinput_obj_readmultiple);
+MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_read_obj, adcbuffer_bufferedinput_obj_read);
 
 STATIC const mp_rom_map_elem_t adcbuffer_bufferedinput_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&adcbuffer_bufferedinput_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&adcbuffer_bufferedinput___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_readmultiple),       MP_ROM_PTR(&adcbuffer_bufferedinput_readmultiple_obj)},
+    { MP_ROM_QSTR(MP_QSTR_deinit),     MP_ROM_PTR(&adcbuffer_bufferedinput_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),  MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),   MP_ROM_PTR(&adcbuffer_bufferedinput___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_read),       MP_ROM_PTR(&adcbuffer_bufferedinput_read_obj)},
 
 };
 
diff --git a/shared-bindings/adcbuffer/BufferedInput.h b/shared-bindings/adcbuffer/BufferedInput.h
index 25411a3d7c..8529dc24d1 100644
--- a/shared-bindings/adcbuffer/BufferedInput.h
+++ b/shared-bindings/adcbuffer/BufferedInput.h
@@ -35,6 +35,6 @@ extern const mp_obj_type_t adcbuffer_bufferedinput_type;
 void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
 void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self);
 bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self);
-void common_hal_adcbuffer_bufferedinput_readmultiple(adcbuffer_bufferedinput_obj_t *self);
+void common_hal_adcbuffer_bufferedinput_read(adcbuffer_bufferedinput_obj_t *self);
 
 #endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H__
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/adcbuffer/__init__.c
index 447f01ea15..e88287a4b2 100644
--- a/shared-bindings/adcbuffer/__init__.c
+++ b/shared-bindings/adcbuffer/__init__.c
@@ -48,15 +48,13 @@
 //|
 //|   length = 5000000
 //|   mybuffer = array.array("H", [0] * length)
-//|   adcbuf_obj = adcbuffer.BufferedInput(GP26, mybuffer, length)
-//|   adcbuffer.readmultiple()
+//|   adc_in = adcbuffer.BufferedInput(GP26, mybuffer, length)
+//|   adcbuffer.read()
 //|   print(*mybuffer)
-//|   adcbuf_obj.deinit()
+//|   adc_in.deinit()
 //|
 //| This example will initialize the the device, read and fill
-//| :py:data:`~adcbuffer.BufferedInPut` to mybuffer and then
-//| :py:meth:`~adcbuffer.BufferedInPut.deinit` the hardware. The last step is optional
-//| because CircuitPython will do it automatically after the program finishes.
+//| :py:data:`~adcbuffer.BufferedInPut` to mybuffer
 //|
 //| TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
 //| Learn guide `_

From ab8eb346eea0ada8c1651212a9a4990f56a214ba Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sun, 4 Sep 2022 03:20:54 +0000
Subject: [PATCH 0930/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 22ba777587..e58d7395dc 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: 2022-08-10 07:18+0000\n"
+"PO-Revision-Date: 2022-09-05 04:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.14-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: main.c
 msgid ""
@@ -2970,6 +2970,8 @@ msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"esp32_camera.Camera requer que uma reserva PSRAM seja configurada. Consulte "
+"a documentação para obter mais informações."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"

From a1856ea3e92186a7791fd5f9bd724ef608fe08cc Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Mon, 5 Sep 2022 12:11:49 -0400
Subject: [PATCH 0931/2403] Renaming module from adcbuffer to analogbufio

---
 .../common-hal/adcbuffer/__init__.c           |  1 -
 .../BufferedIn.c}                             | 14 ++--
 .../BufferedIn.h}                             | 12 ++--
 .../common-hal/analogbufio/__init__.c         |  1 +
 ports/raspberrypi/mpconfigport.mk             |  4 +-
 py/circuitpy_defns.mk                         | 10 +--
 py/circuitpy_mpconfig.mk                      |  6 +-
 .../BufferedIn.c}                             | 68 +++++++++----------
 .../BufferedIn.h}                             | 18 ++---
 .../{adcbuffer => analogbufio}/__init__.c     | 38 +++++------
 .../{adcbuffer => analogbufio}/__init__.h     |  6 +-
 11 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 ports/raspberrypi/common-hal/adcbuffer/__init__.c
 rename ports/raspberrypi/common-hal/{adcbuffer/BufferedInput.c => analogbufio/BufferedIn.c} (90%)
 rename ports/raspberrypi/common-hal/{adcbuffer/BufferedInput.h => analogbufio/BufferedIn.h} (86%)
 create mode 100644 ports/raspberrypi/common-hal/analogbufio/__init__.c
 rename shared-bindings/{adcbuffer/BufferedInput.c => analogbufio/BufferedIn.c} (68%)
 rename shared-bindings/{adcbuffer/BufferedInput.h => analogbufio/BufferedIn.h} (62%)
 rename shared-bindings/{adcbuffer => analogbufio}/__init__.c (64%)
 rename shared-bindings/{adcbuffer => analogbufio}/__init__.h (87%)

diff --git a/ports/raspberrypi/common-hal/adcbuffer/__init__.c b/ports/raspberrypi/common-hal/adcbuffer/__init__.c
deleted file mode 100644
index 3473642698..0000000000
--- a/ports/raspberrypi/common-hal/adcbuffer/__init__.c
+++ /dev/null
@@ -1 +0,0 @@
-// No adcbuffer module functions.
diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
similarity index 90%
rename from ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
rename to ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index 1050cf7e57..7ca37934aa 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -32,8 +32,8 @@
  */
 
 #include 
-#include "common-hal/adcbuffer/BufferedInput.h"
-#include "shared-bindings/adcbuffer/BufferedInput.h"
+#include "common-hal/analogbufio/BufferedIn.h"
+#include "shared-bindings/analogbufio/BufferedIn.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
@@ -44,7 +44,7 @@
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 
-void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
+void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
 
     // Make sure pin number is in range for ADC
     if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
@@ -131,12 +131,12 @@ void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t
     adc_run(false);
 }
 
-bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self) {
+bool common_hal_analogbufio_bufferedin_deinited(analogbufio_bufferedin_obj_t *self) {
     return self->pin == NULL;
 }
 
-void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self) {
-    if (common_hal_adcbuffer_bufferedinput_deinited(self)) {
+void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self) {
+    if (common_hal_analogbufio_bufferedin_deinited(self)) {
         return;
     }
 
@@ -148,7 +148,7 @@ void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *se
     dma_channel_unclaim(self->dma_chan);
 }
 
-void common_hal_adcbuffer_bufferedinput_read(adcbuffer_bufferedinput_obj_t *self) {
+void common_hal_analogbufio_bufferedin_read(analogbufio_bufferedin_obj_t *self) {
 
     uint32_t cdl = self->len / self->bytes_per_sample;
 
diff --git a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
similarity index 86%
rename from ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
rename to ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
index 292fecc8a4..71077e4432 100644
--- a/ports/raspberrypi/common-hal/adcbuffer/BufferedInput.h
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
@@ -31,15 +31,15 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_dma/include/hardware/dma.h"
 
 #include "py/obj.h"
 
-//  This is the adcbuffer object
+//  This is the analogbufio object
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -51,8 +51,8 @@ typedef struct {
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
-} adcbuffer_bufferedinput_obj_t;
+} analogbuf_bufferedin_obj_t;
 
-void bufferedinput_init(void);
+void bufferedin_init(void);
 
-#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ADCBUFFER_BUFFEREDINPUT_H
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
diff --git a/ports/raspberrypi/common-hal/analogbufio/__init__.c b/ports/raspberrypi/common-hal/analogbufio/__init__.c
new file mode 100644
index 0000000000..b6c74b985b
--- /dev/null
+++ b/ports/raspberrypi/common-hal/analogbufio/__init__.c
@@ -0,0 +1 @@
+// No analogbufio module functions.
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index d33f3640c7..fa1f0c153d 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -26,8 +26,8 @@ CIRCUITPY_NVM = 1
 CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
-# Use of adcbuffer
-CIRCUITPY_ADCBUFFER = 1
+# Use of analogbufio
+CIRCUITPY_ANALOGBUFIO = 1
 
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 43a6932f57..4d5d6c78d3 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -102,15 +102,15 @@ endif
 ###
 # Select which builtin modules to compile and include.
 
-ifeq ($(CIRCUITPY_ADCBUFFER),1)
-SRC_PATTERNS += adcbuffer/%
-endif
 ifeq ($(CIRCUITPY_AESIO),1)
 SRC_PATTERNS += aesio/%
 endif
 ifeq ($(CIRCUITPY_ALARM),1)
 SRC_PATTERNS += alarm/%
 endif
+ifeq ($(CIRCUITPY_ANALOGBUFIO),1)
+SRC_PATTERNS += analogbufio/%
+endif
 ifeq ($(CIRCUITPY_ANALOGIO),1)
 SRC_PATTERNS += analogio/%
 endif
@@ -387,13 +387,13 @@ SRC_COMMON_HAL_ALL = \
 	_bleio/__init__.c \
 	_pew/PewPew.c \
 	_pew/__init__.c \
-	adcbuffer/BufferedInput.c \
-	adcbuffer/__init__.c \
 	alarm/SleepMemory.c \
 	alarm/__init__.c \
 	alarm/pin/PinAlarm.c \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
+	analogbufio/BufferedIn.c \
+	analogbufio/__init__.c \
 	analogio/AnalogIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 1d4a5765f8..a227738519 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -62,12 +62,12 @@ CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO)
 CIRCUITPY_ALARM ?= 0
 CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
 
+CIRCUITPY_ANALOGBUFIO ?= 0
+CFLAGS += -DCIRCUITPY_ANALOGBUFIO=$(CIRCUITPY_ANALOGBUFIO)
+
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
-CIRCUITPY_ADCBUFFER ?= 0
-CFLAGS += -DCIRCUITPY_ADCBUFFER=$(CIRCUITPY_ADCBUFFER)
-
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ATEXIT=$(CIRCUITPY_ATEXIT)
 
diff --git a/shared-bindings/adcbuffer/BufferedInput.c b/shared-bindings/analogbufio/BufferedIn.c
similarity index 68%
rename from shared-bindings/adcbuffer/BufferedInput.c
rename to shared-bindings/analogbufio/BufferedIn.c
index 3941d1b5b7..7c5b195994 100644
--- a/shared-bindings/adcbuffer/BufferedInput.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -34,14 +34,14 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/adcbuffer/BufferedInput.h"
+#include "shared-bindings/analogbufio/BufferedIn.h"
 #include "shared-bindings/util.h"
 
-//| class BufferedInput:
+//| class BufferedIn:
 //|     """Capture multiple analog voltage levels to the supplied buffer"""
 //|
 //|     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
-//|         """Create a `BufferedInput` on the given pin. ADC values will be read
+//|         """Create a `BufferedIn` on the given pin. ADC values will be read
 //|            into the given buffer at the supplied sample_rate. Depending on the
 //|            buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
 //|            16-bit half-words and are signed or unsigned.
@@ -55,13 +55,13 @@
 //|     Usage::
 //|
 //|       import board
-//|       import adcbuffer
+//|       import analogbufio
 //|       import array
 //|
 //|       length = 1000
-//|       mybuffer = array.array("H", [0] * length)
+//|       mybuffer = array.array("H", 0x0000 for i in range(length))
 //|       rate = 500000
-//|       adcbuf = adcbuffer.BufferedInput(board.GP26, mybuffer, rate)
+//|       adcbuf = analogbufio.BufferedIn(board.GP26, mybuffer, rate)
 //|       adcbuf.read()
 //|       adcbuf.deinit()
 //|       for i in range(length):
@@ -72,7 +72,7 @@
 //|       (TODO) Provide mechanism to read CPU Temperature."""
 //|       ...
 //|
-STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
@@ -104,11 +104,11 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
     uint32_t sample_rate = (uint32_t)mp_arg_validate_int_range(args[ARG_sample_rate].u_int, 1, 500000, MP_QSTR_sample_rate);
 
     // Create local object
-    adcbuffer_bufferedinput_obj_t *self = m_new_obj(adcbuffer_bufferedinput_obj_t);
-    self->base.type = &adcbuffer_bufferedinput_type;
+    analogbufio_bufferedin_obj_t *self = m_new_obj(analogbufio_bufferedin_obj_t);
+    self->base.type = &analogbufio_bufferedin_type;
 
-    // Call local intereface in ports/common-hal/adcbuffer
-    common_hal_adcbuffer_bufferedinput_construct(self,
+    // Call local intereface in ports/common-hal/analogbufio
+    common_hal_analogbufio_bufferedin_construct(self,
         pin,
         ((uint8_t *)bufinfo.buf),
         bufinfo.len,
@@ -121,18 +121,18 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
 }
 
 //|     def deinit(self) -> None:
-//|         """Shut down the `BufferedInput` and release the pin for other use."""
+//|         """Shut down the `BufferedIn` and release the pin for other use."""
 //|         ...
 //|
-STATIC mp_obj_t adcbuffer_bufferedinput_deinit(mp_obj_t self_in) {
-    adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_adcbuffer_bufferedinput_deinit(self);
+STATIC mp_obj_t analogbufio_bufferedin_deinit(mp_obj_t self_in) {
+    analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_analogbufio_bufferedin_deinit(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_deinit_obj, adcbuffer_bufferedinput_deinit);
+MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_deinit_obj, analogbufio_bufferedin_deinit);
 
-STATIC void check_for_deinit(adcbuffer_bufferedinput_obj_t *self) {
-    if (common_hal_adcbuffer_bufferedinput_deinited(self)) {
+STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) {
+    if (common_hal_analogbufio_bufferedin_deinited(self)) {
         raise_deinited_error();
     }
 }
@@ -144,38 +144,38 @@ STATIC void check_for_deinit(adcbuffer_bufferedinput_obj_t *self) {
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
 //|
-STATIC mp_obj_t adcbuffer_bufferedinput___exit__(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
-    common_hal_adcbuffer_bufferedinput_deinit(args[0]);
+    common_hal_analogbufio_bufferedin_deinit(args[0]);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adcbuffer_bufferedinput___exit___obj, 4, 4, adcbuffer_bufferedinput___exit__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, 4, 4, analogbufio_bufferedin___exit__);
 
 //|     
 //|     def read(self) -> None:
 //|         """Fills the provided buffer with ADC voltage values."""
 //|
-STATIC mp_obj_t adcbuffer_bufferedinput_obj_read(mp_obj_t self_in) {
-    adcbuffer_bufferedinput_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t analogbufio_bufferedin_obj_read(mp_obj_t self_in) {
+    analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    common_hal_adcbuffer_bufferedinput_read(self);
+    common_hal_analogbufio_bufferedin_read(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(adcbuffer_bufferedinput_read_obj, adcbuffer_bufferedinput_obj_read);
+MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_read_obj, analogbufio_bufferedin_obj_read);
 
-STATIC const mp_rom_map_elem_t adcbuffer_bufferedinput_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),     MP_ROM_PTR(&adcbuffer_bufferedinput_deinit_obj) },
+STATIC const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),     MP_ROM_PTR(&analogbufio_bufferedin_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__),  MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),   MP_ROM_PTR(&adcbuffer_bufferedinput___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_read),       MP_ROM_PTR(&adcbuffer_bufferedinput_read_obj)},
+    { MP_ROM_QSTR(MP_QSTR___exit__),   MP_ROM_PTR(&analogbufio_bufferedin___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_read),       MP_ROM_PTR(&analogbufio_bufferedin_read_obj)},
 
 };
 
-STATIC MP_DEFINE_CONST_DICT(adcbuffer_bufferedinput_locals_dict, adcbuffer_bufferedinput_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(analogbufio_bufferedin_locals_dict, analogbufio_bufferedin_locals_dict_table);
 
-const mp_obj_type_t adcbuffer_bufferedinput_type = {
+const mp_obj_type_t analogbufio_bufferedin_type = {
     { &mp_type_type },
-    .name = MP_QSTR_BufferedInput,
-    .make_new = adcbuffer_bufferedinput_make_new,
-    .locals_dict = (mp_obj_t)&adcbuffer_bufferedinput_locals_dict,
+    .name = MP_QSTR_BufferedIn,
+    .make_new = analogbufio_bufferedin_make_new,
+    .locals_dict = (mp_obj_t)&analogbufio_bufferedin_locals_dict,
 };
diff --git a/shared-bindings/adcbuffer/BufferedInput.h b/shared-bindings/analogbufio/BufferedIn.h
similarity index 62%
rename from shared-bindings/adcbuffer/BufferedInput.h
rename to shared-bindings/analogbufio/BufferedIn.h
index 8529dc24d1..7d59720cb4 100644
--- a/shared-bindings/adcbuffer/BufferedInput.h
+++ b/shared-bindings/analogbufio/BufferedIn.h
@@ -24,17 +24,17 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO_BUFFEREDIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO_BUFFEREDIN_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "common-hal/adcbuffer/BufferedInput.h"
+#include "common-hal/analogbufio/BufferedIn.h"
 
-extern const mp_obj_type_t adcbuffer_bufferedinput_type;
+extern const mp_obj_type_t analogbufio_bufferedin_type;
 
-void common_hal_adcbuffer_bufferedinput_construct(adcbuffer_bufferedinput_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
-void common_hal_adcbuffer_bufferedinput_deinit(adcbuffer_bufferedinput_obj_t *self);
-bool common_hal_adcbuffer_bufferedinput_deinited(adcbuffer_bufferedinput_obj_t *self);
-void common_hal_adcbuffer_bufferedinput_read(adcbuffer_bufferedinput_obj_t *self);
+void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
+void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self);
+bool common_hal_analogbufio_bufferedin_deinited(analogbufio_bufferedin_obj_t *self);
+void common_hal_analogbufio_bufferedin_read(analogbufio_bufferedin_obj_t *self);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER_BUFFEREDINPUT_H__
+#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO_BUFFEREDIN_H__
diff --git a/shared-bindings/adcbuffer/__init__.c b/shared-bindings/analogbufio/__init__.c
similarity index 64%
rename from shared-bindings/adcbuffer/__init__.c
rename to shared-bindings/analogbufio/__init__.c
index e88287a4b2..b47fe4b897 100644
--- a/shared-bindings/adcbuffer/__init__.c
+++ b/shared-bindings/analogbufio/__init__.c
@@ -27,12 +27,12 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/adcbuffer/__init__.h"
-#include "shared-bindings/adcbuffer/BufferedInput.h"
+#include "shared-bindings/analogbufio/__init__.h"
+#include "shared-bindings/analogbufio/BufferedIn.h"
 
-//| """Analog buffered hardware support
+//| """Analog Buffered IO Hardware Support
 //|
-//| The `adcbuffer` module contains classes to provide access to analog-to-digital
+//| The `analogbufio` module contains classes to provide access to analog-to-digital
 //| conversion and digital-to-analog (DAC) for multiple value transfer.
 //|
 //| All classes change hardware state and should be deinitialized when they
@@ -42,38 +42,38 @@
 //|
 //| For example::
 //|
-//|   import adcbuffer
+//|   import analogbufio
 //|   import array
 //|   from board import *
 //|
 //|   length = 5000000
-//|   mybuffer = array.array("H", [0] * length)
-//|   adc_in = adcbuffer.BufferedInput(GP26, mybuffer, length)
-//|   adcbuffer.read()
+//|   mybuffer = array.array("H", 0x0000 for i in range(length))
+//|   adc_in = analogbufio.BufferedIn(GP26, mybuffer, length)
+//|   analogbufio.read()
 //|   print(*mybuffer)
 //|   adc_in.deinit()
 //|
 //| This example will initialize the the device, read and fill
-//| :py:data:`~adcbuffer.BufferedInPut` to mybuffer
+//| :py:data:`~analogbufio.BufferedIn` to mybuffer
 //|
-//| TODO: For the essentials of `adcbuffer`, see the `CircuitPython Essentials
-//| Learn guide `_
+//| TODO: For the essentials of `analogbufio`, see the `CircuitPython Essentials
+//| Learn guide `_
 //|
-//| TODO: For more information on using `adcbuffer`, see `this additional Learn guide
+//| TODO: For more information on using `analogbufio`, see `this additional Learn guide
 //| `_
 //| """
 //|
 
-STATIC const mp_rom_map_elem_t adcbuffer_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adcbuffer) },
-    { MP_ROM_QSTR(MP_QSTR_BufferedInput),   MP_ROM_PTR(&adcbuffer_bufferedinput_type) },
+STATIC const mp_rom_map_elem_t analogbufio_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogbufio) },
+    { MP_ROM_QSTR(MP_QSTR_BufferedIn),   MP_ROM_PTR(&analogbufio_bufferedin_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(adcbuffer_module_globals, adcbuffer_module_globals_table);
+STATIC MP_DEFINE_CONST_DICT(analogbufio_module_globals, analogbufio_module_globals_table);
 
-const mp_obj_module_t adcbuffer_module = {
+const mp_obj_module_t analogbufio_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&adcbuffer_module_globals,
+    .globals = (mp_obj_dict_t *)&analogbufio_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_adcbuffer, adcbuffer_module, CIRCUITPY_ADCBUFFER);
+MP_REGISTER_MODULE(MP_QSTR_analogbufio, analogbufio_module, CIRCUITPY_ANALOGBUFIO);
diff --git a/shared-bindings/adcbuffer/__init__.h b/shared-bindings/analogbufio/__init__.h
similarity index 87%
rename from shared-bindings/adcbuffer/__init__.h
rename to shared-bindings/analogbufio/__init__.h
index c271d71273..d66dd4e8d6 100644
--- a/shared-bindings/adcbuffer/__init__.h
+++ b/shared-bindings/analogbufio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER___INIT___H
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ADCBUFFER___INIT___H
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO___INIT___H

From 5498b3ac918272b308f941bbf2c51bc90deaabf1 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Mon, 5 Sep 2022 14:22:08 -0400
Subject: [PATCH 0932/2403] fix to analogbufio BufferedIn.h

---
 ports/raspberrypi/common-hal/analogbufio/BufferedIn.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
index 71077e4432..b38bfc8738 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
@@ -51,7 +51,7 @@ typedef struct {
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
-} analogbuf_bufferedin_obj_t;
+} analogbufio_bufferedin_obj_t;
 
 void bufferedin_init(void);
 

From 9a937e6ea351f826e7809f94ed4d66af350d312d Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Tue, 6 Sep 2022 09:37:21 +0200
Subject: [PATCH 0933/2403] Added challenger_rp2040_wifi_ble board.

---
 .../boards/challenger_rp2040_wifi_ble/board.c | 40 ++++++++++
 .../mpconfigboard.h                           | 10 +++
 .../mpconfigboard.mk                          | 11 +++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/challenger_rp2040_wifi_ble/pins.c  | 78 +++++++++++++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_wifi_ble/board.c
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c

diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/board.c b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.h b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.h
new file mode 100644
index 0000000000..76c0748079
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Challenger RP2040 WiFi/BLE"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_UART_BUS_TX   (&pin_GPIO16)
+#define DEFAULT_UART_BUS_RX   (&pin_GPIO17)
+#define DEFAULT_I2C_BUS_SDA   (&pin_GPIO0)
+#define DEFAULT_I2C_BUS_SCL   (&pin_GPIO1)
+#define DEFAULT_SPI_BUS_SCK   (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO  (&pin_GPIO20)
diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.mk
new file mode 100644
index 0000000000..5b1502fdd0
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x2e8a
+USB_PID = 0x102c
+USB_PRODUCT = "Challenger RP2040 WiFi/BLE"
+USB_MANUFACTURER = "Invector Labs"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pico-sdk-configboard.h b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c
new file mode 100644
index 0000000000..57d7ecc698
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c
@@ -0,0 +1,78 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_WIFI_MODE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_WIFI_RESET), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f69f5173520bdc84aa82f32f978692a7e3a2503e Mon Sep 17 00:00:00 2001
From: Pepijn de Vos 
Date: Tue, 6 Sep 2022 19:32:15 +0200
Subject: [PATCH 0934/2403] allow writing empty color frame

---
 shared-module/displayio/EPaperDisplay.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index b1e998048e..0010d88d12 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -275,7 +275,7 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
     uint32_t mask[mask_length];
 
     uint8_t passes = 1;
-    if (self->core.colorspace.tricolor || self->grayscale) {
+    if (self->write_color_ram_command != NO_COMMAND) {
         passes = 2;
     }
     for (uint8_t pass = 0; pass < passes; pass++) {
@@ -318,11 +318,14 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
             if (pass == 1) {
                 if (self->grayscale) { // 4-color grayscale
                     self->core.colorspace.grayscale_bit = 6;
-                } else { // Tri-color
+                    displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
+                } else if (self->core.colorspace.tricolor) {
                     self->core.colorspace.grayscale = false;
+                    displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
                 }
+            } else {
+                displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
             }
-            displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
 
             // Invert it all.
             if ((pass == 1 && self->color_bits_inverted) ||

From 25078a24a3a1dd53f9c7a96386b9b995e4d67a75 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Tue, 6 Sep 2022 18:58:57 -0400
Subject: [PATCH 0935/2403] Attempt to fix Build-Docs and Pre-Commit

---
 .../common-hal/analogbufio/BufferedIn.c       |  2 +-
 shared-bindings/analogbufio/BufferedIn.c      | 82 ++++++++++---------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index 7ca37934aa..bd3ad8e93a 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -80,7 +80,7 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     // If buffer is 16-bit, then values are not shifted and error bit is present.
     // Number of transfers is always the number of samples which is the array
     // byte length divided by the bytes_per_sample.
-    
+
     // self->bytes_per_sample == 1
     uint dma_size = DMA_SIZE_8;
     bool show_error_bit = false;
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 7c5b195994..1d452a4200 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -38,46 +38,47 @@
 #include "shared-bindings/util.h"
 
 //| class BufferedIn:
-//|     """Capture multiple analog voltage levels to the supplied buffer"""
+//|     """Capture multiple analog voltage levels to the supplied buffer
 //|
+//|     Usage::
+//|
+//|         import board
+//|         import analogbufio
+//|         import array
+//|
+//|         length = 1000
+//|         mybuffer = array.array("H", 0x0000 for i in range(length))
+//|         rate = 500000
+//|         adcbuf = analogbufio.BufferedIn(board.GP26, mybuffer, rate)
+//|         adcbuf.read()
+//|         adcbuf.deinit()
+//|         for i in range(length):
+//|             print(i, mybuffer[i])
+//|
+//|         (TODO) The reference voltage varies by platform so use
+//|         ``reference_voltage`` to read the configured setting.
+//|         (TODO) Provide mechanism to read CPU Temperature."""
+//|
+
 //|     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
 //|         """Create a `BufferedIn` on the given pin. ADC values will be read
 //|            into the given buffer at the supplied sample_rate. Depending on the
 //|            buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
 //|            16-bit half-words and are signed or unsigned.
-//|            The ADC most significant bits of the ADC are kept. Please see:
-//|            `https://docs.circuitpython.org/en/latest/docs/library/array.html`
+//|            The ADC most significant bits of the ADC are kept. (See
+//|            https://docs.circuitpython.org/en/latest/docs/library/array.html)
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
-//|         :param ~int sample_rate: rate: sampling frequency, in samples per second
-//|
-//|     Usage::
-//|
-//|       import board
-//|       import analogbufio
-//|       import array
-//|
-//|       length = 1000
-//|       mybuffer = array.array("H", 0x0000 for i in range(length))
-//|       rate = 500000
-//|       adcbuf = analogbufio.BufferedIn(board.GP26, mybuffer, rate)
-//|       adcbuf.read()
-//|       adcbuf.deinit()
-//|       for i in range(length):
-//|           print(i, mybuffer[i])
-//|
-//|       (TODO) The reference voltage varies by platform so use
-//|       ``reference_voltage`` to read the configured setting.
-//|       (TODO) Provide mechanism to read CPU Temperature."""
-//|       ...
+//|         :param ~int sample_rate: rate: sampling frequency, in samples per second"""
+//|         ...
 //|
 STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
+	{ MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
+	{ MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
+	{ MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -95,7 +96,7 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
 
     // Bytes Per Sample
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
-        bytes_per_sample = 2;
+	bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
       mp_raise_ValueError_varg(translate("%q must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
     }
@@ -109,13 +110,13 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
 
     // Call local intereface in ports/common-hal/analogbufio
     common_hal_analogbufio_bufferedin_construct(self,
-        pin,
-        ((uint8_t *)bufinfo.buf),
-        bufinfo.len,
-        bytes_per_sample,
-        signed_samples,
-        sample_rate
-        );
+	pin,
+	((uint8_t *)bufinfo.buf),
+	bufinfo.len,
+	bytes_per_sample,
+	signed_samples,
+	sample_rate
+	);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -133,12 +134,15 @@ MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_deinit_obj, analogbufio_buffere
 
 STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) {
     if (common_hal_analogbufio_bufferedin_deinited(self)) {
-        raise_deinited_error();
+	raise_deinited_error();
     }
 }
-
-//|  Provided by context manager helper.
+//|     def __enter__(self) -> AnalogIn:
+//|         """No-op used by Context Managers."""
+//|         ...
 //|
+//  Provided by context manager helper.
+
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
@@ -151,9 +155,9 @@ STATIC mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *a
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, 4, 4, analogbufio_bufferedin___exit__);
 
-//|     
 //|     def read(self) -> None:
 //|         """Fills the provided buffer with ADC voltage values."""
+//|         ...
 //|
 STATIC mp_obj_t analogbufio_bufferedin_obj_read(mp_obj_t self_in) {
     analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);

From 51dab921ea9e1e7d598b36ae32f3ad1b61c1a0c5 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Tue, 6 Sep 2022 19:09:00 -0400
Subject: [PATCH 0936/2403] Bad object reference

---
 shared-bindings/analogbufio/BufferedIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 1d452a4200..e18aaaa23a 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -137,7 +137,7 @@ STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) {
 	raise_deinited_error();
     }
 }
-//|     def __enter__(self) -> AnalogIn:
+//|     def __enter__(self) -> BufferedIn:
 //|         """No-op used by Context Managers."""
 //|         ...
 //|

From a87d3bd89e1edcba1bb458fcd8d72f2a19799106 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Tue, 6 Sep 2022 19:40:20 -0400
Subject: [PATCH 0937/2403] Bad quotes

---
 shared-bindings/analogbufio/BufferedIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index e18aaaa23a..05529ed64c 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -98,7 +98,7 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
 	bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-      mp_raise_ValueError_varg(translate("%q must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
+      mp_raise_ValueError_varg(translate("%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
     }
 
     // Validate sample rate here

From 97bd322ff80ee263871cafea8cd0e1ab4e753c4c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 6 Sep 2022 21:16:45 -0500
Subject: [PATCH 0938/2403] Use current ubuntu for pre-commit

This means that the OS version of uncrustify can be used, rather than
the pybricks one.
---
 .github/workflows/pre-commit.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 52e2d2b714..28f8ccb6f1 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2.2.0
     - name: Set up Python 3
@@ -23,7 +23,6 @@ jobs:
         python-version: "3.x"
     - name: Install deps
       run: |
-        sudo apt-add-repository -y -u ppa:pybricks/ppa
         sudo apt-get install -y gettext uncrustify
         pip3 install black polib pyyaml
     - name: Populate selected submodules

From 6c4f352533d7ee796b6db3f56569395fb9f21e5c Mon Sep 17 00:00:00 2001
From: Seon Rozenblum 
Date: Wed, 7 Sep 2022 19:51:45 +1000
Subject: [PATCH 0939/2403] Fixed incorrect IO naming for ProS3 and FeatherS3

---
 ports/espressif/boards/unexpectedmaker_feathers3/pins.c | 2 +-
 ports/espressif/boards/unexpectedmaker_pros3/pins.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/pins.c b/ports/espressif/boards/unexpectedmaker_feathers3/pins.c
index 43fdc3c579..9a2fde5a0c 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers3/pins.c
+++ b/ports/espressif/boards/unexpectedmaker_feathers3/pins.c
@@ -110,7 +110,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor
 
     { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO39) }, // Second LDO Enable control
-    { MP_ROM_QSTR(MP_QSTR_I39), MP_ROM_PTR(&pin_GPIO39) }, // Second LDO Enable control
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, // Second LDO Enable control
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
diff --git a/ports/espressif/boards/unexpectedmaker_pros3/pins.c b/ports/espressif/boards/unexpectedmaker_pros3/pins.c
index bc0ca026f3..8c7e050ded 100644
--- a/ports/espressif/boards/unexpectedmaker_pros3/pins.c
+++ b/ports/espressif/boards/unexpectedmaker_pros3/pins.c
@@ -130,7 +130,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
 
     { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO17) }, // Second LDO Enable control
-    { MP_ROM_QSTR(MP_QSTR_I17), MP_ROM_PTR(&pin_GPIO17) }, // Second LDO Enable control
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, // Second LDO Enable control
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

From c1f57c6ceb326ab069ae82506a4fbfab265cec67 Mon Sep 17 00:00:00 2001
From: latkinso42 
Date: Wed, 7 Sep 2022 18:53:35 -0400
Subject: [PATCH 0940/2403] Pushing for resolution

---
 locale/circuitpython.pot                      |  9 +++---
 .../common-hal/analogbufio/BufferedIn.c       |  2 +-
 shared-bindings/analogbufio/BufferedIn.c      | 28 +++++++++----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 4193094968..e799b131e6 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -76,6 +76,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -3869,11 +3873,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/adcbuffer/BufferdInput.c
-msgid "sample rate must be 1.0-500000.0 per second"
-msgstr ""
-
-#: shared-bindings/adcbuffer/BufferdInput.c
 #: shared-bindings/audiocore/RawSample.c
 msgid ""
 "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index bd3ad8e93a..f5f9dbde33 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -96,7 +96,7 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
         true,               // Write each completed conversion to the sample FIFO
         true,               // Enable DMA data request (DREQ)
         1,                  // DREQ (and IRQ) asserted when at least 1 sample present
-        show_error_bit,     // See the ERR bit on 8 bit bit reads
+        show_error_bit,     // See the ERR bit
         shift_sample_8_bits // Shift each sample to 8 bits when pushing to FIFO
         );
 
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 05529ed64c..a0a0f27161 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -76,9 +76,9 @@
 STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
-	{ MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
-	{ MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-	{ MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
+        { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -86,7 +86,7 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
     // Validate Pin
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
 
-    // Buffer Pointer defined and allocated by user
+    // Buffer defined and allocated by user
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
 
@@ -96,9 +96,9 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
 
     // Bytes Per Sample
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
-	bytes_per_sample = 2;
+        bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-      mp_raise_ValueError_varg(translate("%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
+        mp_raise_ValueError_varg(translate("%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
     }
 
     // Validate sample rate here
@@ -110,13 +110,13 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
 
     // Call local intereface in ports/common-hal/analogbufio
     common_hal_analogbufio_bufferedin_construct(self,
-	pin,
-	((uint8_t *)bufinfo.buf),
-	bufinfo.len,
-	bytes_per_sample,
-	signed_samples,
-	sample_rate
-	);
+        pin,
+        ((uint8_t *)bufinfo.buf),
+        bufinfo.len,
+        bytes_per_sample,
+        signed_samples,
+        sample_rate
+        );
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -134,7 +134,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_deinit_obj, analogbufio_buffere
 
 STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) {
     if (common_hal_analogbufio_bufferedin_deinited(self)) {
-	raise_deinited_error();
+        raise_deinited_error();
     }
 }
 //|     def __enter__(self) -> BufferedIn:

From 4cb69a51d5a51d27d92f2be24e248da1f14c87e8 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 7 Sep 2022 23:41:38 -0400
Subject: [PATCH 0941/2403] Use MP_WEAK for default board.c routines

---
 .../atmel-samd/boards/8086_commander/board.c  | 13 +-----
 .../boards/adafruit_neokey_trinkey_m0/board.c | 16 +-------
 .../adafruit_proxlight_trinkey_m0/board.c     | 11 +----
 .../boards/adafruit_rotary_trinkey_m0/board.c | 16 +-------
 .../boards/adafruit_slide_trinkey_m0/board.c  | 10 +----
 .../boards/aloriumtech_evo_m51/board.c        | 10 +----
 .../atmel-samd/boards/arduino_mkr1300/board.c | 15 +------
 .../atmel-samd/boards/arduino_mkrzero/board.c | 15 +------
 .../boards/arduino_nano_33_iot/board.c        | 15 +------
 ports/atmel-samd/boards/arduino_zero/board.c  | 15 +------
 .../boards/bast_pro_mini_m0/board.c           | 13 +-----
 .../boards/bdmicro_vina_d21/board.c           | 10 +----
 .../boards/bdmicro_vina_d51/board.c           | 13 +-----
 .../boards/bdmicro_vina_d51_pcb7/board.c      | 10 +----
 ports/atmel-samd/boards/blm_badge/board.c     | 15 +------
 .../boards/capablerobot_usbhub/board.c        | 13 +-----
 .../atmel-samd/boards/catwan_usbstick/board.c | 13 +-----
 .../boards/circuitbrains_basic_m0/board.c     | 15 +------
 .../boards/circuitbrains_deluxe_m4/board.c    | 15 +------
 .../boards/circuitplayground_express/board.c  |  6 +--
 .../circuitplayground_express_crickit/board.c |  6 +--
 .../board.c                                   |  6 +--
 ports/atmel-samd/boards/cp32-m4/board.c       | 15 +------
 ports/atmel-samd/boards/cp_sapling_m0/board.c | 16 +-------
 .../boards/cp_sapling_m0_revb/board.c         | 16 +-------
 .../boards/cp_sapling_m0_spiflash/board.c     | 16 +-------
 .../boards/cytron_maker_zero_samd21/board.c   | 15 +------
 .../atmel-samd/boards/datalore_ip_m4/board.c  | 15 +------
 .../atmel-samd/boards/datum_distance/board.c  | 13 +-----
 ports/atmel-samd/boards/datum_imu/board.c     | 13 +-----
 ports/atmel-samd/boards/datum_light/board.c   | 13 +-----
 ports/atmel-samd/boards/datum_weather/board.c | 13 +-----
 ports/atmel-samd/boards/dynalora_usb/board.c  | 13 +-----
 .../boards/dynossat_edu_eps/board.c           | 13 +-----
 .../boards/dynossat_edu_obc/board.c           | 13 +-----
 .../boards/escornabot_makech/board.c          | 13 +-----
 .../boards/feather_m0_adalogger/board.c       | 13 +-----
 .../boards/feather_m0_basic/board.c           | 13 +-----
 .../boards/feather_m0_express/board.c         | 13 +-----
 .../boards/feather_m0_express_crickit/board.c | 13 +-----
 .../boards/feather_m0_rfm69/board.c           | 13 +-----
 .../boards/feather_m0_rfm9x/board.c           | 13 +-----
 .../boards/feather_m0_supersized/board.c      | 13 +-----
 .../atmel-samd/boards/feather_m4_can/board.c  | 14 +------
 .../boards/feather_m4_express/board.c         | 14 +------
 ports/atmel-samd/boards/fluff_m0/board.c      | 13 +-----
 ports/atmel-samd/boards/gemma_m0/board.c      | 13 +-----
 .../boards/grandcentral_m4_express/board.c    | 15 +------
 .../boards/hallowing_m0_express/board.c       | 10 +----
 .../boards/hallowing_m4_express/board.c       | 10 +----
 ports/atmel-samd/boards/huntercat_nfc/board.c | 13 +-----
 .../boards/itsybitsy_m0_express/board.c       | 13 +-----
 .../boards/itsybitsy_m4_express/board.c       | 15 +------
 .../atmel-samd/boards/kicksat-sprite/board.c  | 16 +-------
 .../boards/loc_ber_m4_base_board/board.c      | 15 +------
 .../atmel-samd/boards/matrixportal_m4/board.c | 15 +------
 ports/atmel-samd/boards/meowmeow/board.c      | 13 +-----
 .../boards/metro_m0_express/board.c           | 10 +----
 .../boards/metro_m4_airlift_lite/board.c      | 13 +-----
 .../boards/metro_m4_express/board.c           | 15 +------
 ports/atmel-samd/boards/mini_sam_m4/board.c   | 13 +-----
 ports/atmel-samd/boards/monster_m4sk/board.c  | 10 +----
 .../atmel-samd/boards/ndgarage_ndbit6/board.c | 15 +------
 .../boards/ndgarage_ndbit6_v2/board.c         | 15 +------
 .../boards/neopixel_trinkey_m0/board.c        | 10 +----
 ports/atmel-samd/boards/nfc_copy_cat/board.c  | 13 +-----
 ports/atmel-samd/boards/openbook_m4/board.c   | 10 +----
 ports/atmel-samd/boards/pewpew10/board.c      | 13 +-----
 ports/atmel-samd/boards/pewpew_lcd/board.c    | 10 +----
 ports/atmel-samd/boards/pewpew_m4/board.c     | 10 +----
 ports/atmel-samd/boards/picoplanet/board.c    | 13 +-----
 ports/atmel-samd/boards/pybadge/board.c       |  7 +---
 ports/atmel-samd/boards/pycubed/board.c       | 10 +----
 ports/atmel-samd/boards/pycubed_mram/board.c  | 10 +----
 .../boards/pycubed_mram_v05/board.c           | 10 +----
 ports/atmel-samd/boards/pycubed_v05/board.c   | 10 +----
 ports/atmel-samd/boards/pygamer/board.c       |  7 +---
 ports/atmel-samd/boards/pyportal/board.c      | 10 +----
 .../atmel-samd/boards/pyportal_titano/board.c | 10 +----
 ports/atmel-samd/boards/pyruler/board.c       | 13 +-----
 ports/atmel-samd/boards/qtpy_m0/board.c       | 13 +-----
 .../boards/qtpy_m0_haxpress/board.c           | 13 +-----
 ports/atmel-samd/boards/robohatmm1_m4/board.c | 15 +------
 ports/atmel-samd/boards/sam32/board.c         | 10 +----
 .../atmel-samd/boards/same54_xplained/board.c | 15 +------
 .../boards/seeeduino_wio_terminal/board.c     |  9 +----
 .../atmel-samd/boards/seeeduino_xiao/board.c  | 15 +------
 .../boards/seeeduino_xiao_kb/board.c          | 15 +------
 ports/atmel-samd/boards/sensebox_mcu/board.c  | 15 +------
 ports/atmel-samd/boards/serpente/board.c      | 13 +-----
 ports/atmel-samd/boards/shirtty/board.c       | 13 +-----
 .../boards/silicognition-m4-shim/board.c      | 16 ++------
 ports/atmel-samd/boards/snekboard/board.c     | 13 +-----
 .../boards/sparkfun_lumidrive/board.c         | 13 +-----
 .../sparkfun_qwiic_micro_no_flash/board.c     | 13 +-----
 .../sparkfun_qwiic_micro_with_flash/board.c   | 13 +-----
 .../boards/sparkfun_redboard_turbo/board.c    | 13 +-----
 .../boards/sparkfun_samd21_dev/board.c        | 13 +-----
 .../boards/sparkfun_samd21_mini/board.c       | 15 +------
 .../boards/sparkfun_samd51_micromod/board.c   | 15 +------
 .../boards/sparkfun_samd51_thing_plus/board.c | 14 +------
 .../boards/stackrduino_m0_pro/board.c         | 13 +-----
 .../boards/stringcar_m0_express/board.c       | 13 +-----
 .../boards/trellis_m4_express/board.c         | 10 +----
 ports/atmel-samd/boards/trinket_m0/board.c    | 13 +-----
 .../boards/trinket_m0_haxpress/board.c        | 13 +-----
 ports/atmel-samd/boards/uartlogger2/board.c   | 15 +------
 ports/atmel-samd/boards/uchip/board.c         | 10 +----
 ports/atmel-samd/boards/ugame10/board.c       | 10 +----
 .../winterbloom_big_honking_button/board.c    | 13 +-----
 .../atmel-samd/boards/winterbloom_sol/board.c | 14 +------
 ports/atmel-samd/boards/xinabox_cc03/board.c  | 15 +------
 ports/atmel-samd/boards/xinabox_cs11/board.c  | 13 +-----
 .../boards/diodes_delight_piunora/board.c     | 10 +----
 ports/broadcom/boards/raspberrypi_cm4/board.c | 10 +----
 .../broadcom/boards/raspberrypi_cm4io/board.c | 10 +----
 .../broadcom/boards/raspberrypi_pi4b/board.c  | 10 +----
 .../broadcom/boards/raspberrypi_zero/board.c  | 10 +----
 .../boards/raspberrypi_zero2w/board.c         | 10 +----
 .../boards/raspberrypi_zero_w/board.c         | 10 +----
 ports/cxd56/boards/spresense/board.c          | 13 +-----
 .../boards/adafruit_esp32s2_camera/board.c    |  9 +----
 .../boards/adafruit_feather_esp32_v2/board.c  |  9 +----
 .../boards/adafruit_feather_esp32s2/board.c   |  7 +---
 .../adafruit_feather_esp32s2_tft/board.c      | 11 +----
 .../board.c                                   | 11 +----
 .../board.c                                   |  7 +---
 .../adafruit_feather_esp32s3_nopsram/board.c  |  7 +---
 .../adafruit_feather_esp32s3_tft/board.c      | 11 +----
 .../boards/adafruit_feather_huzzah32/board.c  | 18 +--------
 .../boards/adafruit_funhouse/board.c          |  9 +----
 .../adafruit_magtag_2.9_grayscale/board.c     | 10 +----
 .../boards/adafruit_metro_esp32s2/board.c     | 16 +-------
 .../boards/adafruit_qtpy_esp32_pico/board.c   |  6 +--
 .../boards/adafruit_qtpy_esp32c3/board.c      | 21 +---------
 .../boards/adafruit_qtpy_esp32s2/board.c      | 16 +-------
 .../adafruit_qtpy_esp32s3_nopsram/board.c     | 11 +----
 .../boards/ai_thinker_esp32-c3s-2m/board.c    | 10 +----
 .../boards/ai_thinker_esp32-c3s/board.c       | 10 +----
 .../boards/ai_thinker_esp_12k_nodemcu/board.c | 11 +----
 ports/espressif/boards/artisense_rd00/board.c | 11 -----
 .../boards/atmegazero_esp32s2/board.c         | 11 +----
 .../espressif/boards/beetle-esp32-c3/board.c  | 20 +---------
 .../boards/crumpspace_crumps2/board.c         | 11 +----
 .../cytron_maker_feather_aiot_s3/board.c      |  7 +---
 .../boards/electroniccats_bastwifi/board.c    | 11 +----
 .../boards/espressif_esp32_eye/board.c        | 11 +----
 .../espressif_esp32c3_devkitm_1_n4/board.c    | 12 +-----
 .../espressif_esp32s2_devkitc_1_n4/board.c    | 11 +----
 .../espressif_esp32s2_devkitc_1_n4r2/board.c  | 11 +----
 .../boards/espressif_esp32s3_box/board.c      | 11 +----
 .../boards/espressif_esp32s3_box_lite/board.c | 11 +----
 .../espressif_esp32s3_devkitc_1_n8/board.c    | 11 +----
 .../espressif_esp32s3_devkitc_1_n8r2/board.c  | 11 +----
 .../espressif_esp32s3_devkitc_1_n8r8/board.c  | 11 +----
 .../espressif_esp32s3_devkitm_1_n8/board.c    | 11 +----
 .../boards/espressif_esp32s3_eye/board.c      | 11 +----
 .../espressif_esp32s3_usb_otg_n8/board.c      | 11 +----
 .../boards/espressif_hmi_devkit_1/board.c     | 11 +----
 .../boards/espressif_kaluga_1.3/board.c       | 11 +----
 .../boards/espressif_kaluga_1/board.c         | 11 +----
 .../boards/espressif_saola_1_wroom/board.c    | 11 +----
 .../boards/espressif_saola_1_wrover/board.c   | 11 +----
 .../boards/franzininho_wifi_wroom/board.c     | 11 +----
 .../boards/franzininho_wifi_wrover/board.c    | 11 +----
 .../boards/gravitech_cucumber_m/board.c       | 10 +----
 .../boards/gravitech_cucumber_ms/board.c      | 10 +----
 .../boards/gravitech_cucumber_r/board.c       | 10 +----
 .../boards/gravitech_cucumber_rs/board.c      | 10 +----
 .../boards/hardkernel_odroid_go/board.c       | 12 +-----
 ports/espressif/boards/hexky_s2/board.c       | 11 +----
 ports/espressif/boards/hiibot_iots2/board.c   | 10 +----
 .../boards/lilygo_ttgo_t-01c3/board.c         | 10 +----
 .../boards/lilygo_ttgo_t-oi-plus/board.c      | 36 ++++++++++++-----
 .../lilygo_ttgo_t8_esp32_s2_wroom/board.c     | 10 +----
 .../boards/lilygo_ttgo_t8_s2/board.c          | 10 +----
 .../boards/lilygo_ttgo_t8_s2_st7789/board.c   | 11 +----
 ports/espressif/boards/lolin_c3_mini/board.c  | 20 +---------
 ports/espressif/boards/lolin_s2_mini/board.c  | 11 +----
 ports/espressif/boards/lolin_s2_pico/board.c  | 11 +----
 ports/espressif/boards/lolin_s3/board.c       | 20 +---------
 .../boards/microdev_micro_c3/board.c          | 12 +-----
 .../boards/microdev_micro_s2/board.c          | 10 +----
 .../espressif/boards/mixgo_ce_serial/board.c  | 11 +----
 ports/espressif/boards/mixgo_ce_udisk/board.c | 11 +----
 .../boards/morpheans_morphesp-240/board.c     | 10 +----
 .../boards/muselab_nanoesp32_s2_wroom/board.c | 11 +----
 .../muselab_nanoesp32_s2_wrover/board.c       | 11 +----
 .../boards/odt_pixelwing_esp32_s2/board.c     | 16 +-------
 .../boards/seeed_xiao_esp32c3/board.c         | 40 +++++++++++++------
 .../smartbeedesigns_bee_motion_s3/board.c     | 11 +----
 .../boards/smartbeedesigns_bee_s3/board.c     | 11 +----
 .../boards/targett_module_clip_wroom/board.c  | 11 +----
 .../boards/targett_module_clip_wrover/board.c | 11 +----
 .../boards/unexpectedmaker_feathers2/board.c  | 11 +----
 .../unexpectedmaker_feathers2_neo/board.c     | 11 +----
 .../board.c                                   | 11 +----
 .../boards/unexpectedmaker_feathers3/board.c  | 11 +----
 .../boards/unexpectedmaker_pros3/board.c      | 11 -----
 .../boards/unexpectedmaker_tinys2/board.c     | 11 +----
 .../boards/unexpectedmaker_tinys3/board.c     | 11 +----
 .../waveshare_esp32_s2_pico_lcd/board.c       | 11 +----
 .../boards/waveshare_esp32s2_pico/board.c     | 11 +----
 ports/litex/boards/fomu/board.c               | 11 -----
 .../mimxrt10xx/boards/feather_m7_1011/board.c | 10 -----
 .../boards/feather_mimxrt1011/board.c         | 10 +----
 .../boards/feather_mimxrt1062/board.c         | 10 +----
 ports/mimxrt10xx/boards/imxrt1010_evk/board.c | 10 +----
 ports/mimxrt10xx/boards/imxrt1020_evk/board.c | 10 +----
 ports/mimxrt10xx/boards/imxrt1060_evk/board.c | 10 -----
 ports/mimxrt10xx/boards/metro_m7_1011/board.c | 10 +----
 .../boards/sparkfun_teensy_micromod/board.c   | 10 +----
 ports/mimxrt10xx/boards/teensy40/board.c      | 10 +----
 ports/mimxrt10xx/boards/teensy41/board.c      | 10 -----
 ports/nrf/boards/ADM_B_NRF52840_1/board.c     | 14 +------
 .../boards/Seeed_XIAO_nRF52840_Sense/board.c  | 14 +------
 ports/nrf/boards/TG-Watch/board.c             | 14 +------
 .../adafruit_led_glasses_nrf52840/board.c     | 14 +------
 ports/nrf/boards/aramcon2_badge/board.c       | 15 +------
 ports/nrf/boards/aramcon_badge_2019/board.c   | 15 +------
 ports/nrf/boards/arduino_nano_33_ble/board.c  | 11 -----
 ports/nrf/boards/bastble/board.c              | 17 +-------
 .../bless_dev_board_multi_sensor/board.c      | 40 +++++++++++++------
 ports/nrf/boards/bluemicro833/board.c         |  8 +---
 ports/nrf/boards/bluemicro840/board.c         | 14 +------
 ports/nrf/boards/challenger_840/board.c       | 14 +------
 .../circuitplayground_bluefruit/board.c       |  6 +--
 .../nrf/boards/clue_nrf52840_express/board.c  | 11 -----
 ports/nrf/boards/electronut_labs_blip/board.c | 14 +------
 .../nrf/boards/electronut_labs_papyr/board.c  | 14 +------
 .../boards/feather_bluefruit_sense/board.c    | 14 +------
 .../boards/feather_nrf52840_express/board.c   | 14 +------
 ports/nrf/boards/hiibot_bluefi/board.c        | 10 -----
 ports/nrf/boards/ikigaisense_vita/board.c     | 14 +------
 .../boards/itsybitsy_nrf52840_express/board.c | 14 +------
 .../boards/makerdiary_m60_keyboard/board.c    | 13 +-----
 .../makerdiary_nrf52840_m2_devkit/board.c     | 10 -----
 .../boards/makerdiary_nrf52840_mdk/board.c    | 14 +------
 .../board.c                                   | 14 +------
 .../nrf/boards/metro_nrf52840_express/board.c | 14 +------
 ports/nrf/boards/microbit_v2/board.c          | 14 +------
 ports/nrf/boards/nice_nano/board.c            | 14 +------
 ports/nrf/boards/ohs2020_badge/board.c        | 10 -----
 ports/nrf/boards/particle_argon/board.c       | 14 +------
 ports/nrf/boards/particle_boron/board.c       | 14 +------
 ports/nrf/boards/particle_xenon/board.c       | 14 +------
 ports/nrf/boards/pca10056/board.c             | 14 +------
 ports/nrf/boards/pca10059/board.c             | 14 +------
 ports/nrf/boards/pca10100/board.c             | 14 +------
 ports/nrf/boards/pitaya_go/board.c            | 14 +------
 ports/nrf/boards/raytac_mdbt50q-db-40/board.c | 14 +------
 ports/nrf/boards/raytac_mdbt50q-rx/board.c    | 14 +------
 ports/nrf/boards/simmel/board.c               | 14 +------
 .../boards/sparkfun_nrf52840_micromod/board.c | 14 +------
 .../nrf/boards/sparkfun_nrf52840_mini/board.c | 14 +------
 .../nrf/boards/ssci_isp1807_dev_board/board.c | 14 +------
 .../boards/ssci_isp1807_micro_board/board.c   | 14 +------
 ports/nrf/boards/teknikio_bluebird/board.c    | 14 +------
 .../tinkeringtech_scoutmakes_azul/board.c     | 14 +------
 ports/nrf/boards/warmbit_bluepixel/board.c    | 14 +------
 ports/nrf/supervisor/port.c                   |  6 ---
 .../boards/adafruit_feather_rp2040/board.c    | 16 +-------
 .../boards/adafruit_itsybitsy_rp2040/board.c  | 13 +-----
 .../boards/adafruit_kb2040/board.c            | 16 +-------
 .../boards/adafruit_macropad_rp2040/board.c   |  7 +---
 .../boards/adafruit_qt2040_trinkey/board.c    | 13 +-----
 .../boards/adafruit_qtpy_rp2040/board.c       | 13 +-----
 .../arduino_nano_rp2040_connect/board.c       | 13 +-----
 .../boards/bwshockley_figpi/board.c           | 13 +-----
 .../boards/challenger_nb_rp2040_wifi/board.c  | 13 +-----
 .../boards/challenger_rp2040_lora/board.c     | 13 +-----
 .../boards/challenger_rp2040_lte/board.c      | 13 +-----
 .../boards/challenger_rp2040_subghz/board.c   | 13 +-----
 .../boards/challenger_rp2040_wifi/board.c     | 13 +-----
 .../boards/cytron_maker_nano_rp2040/board.c   | 13 +-----
 .../boards/cytron_maker_pi_rp2040/board.c     | 13 +-----
 .../boards/elecfreaks_picoed/board.c          | 13 +-----
 .../boards/electrolama_minik/board.c          | 13 +-----
 .../jpconstantineau_encoderpad_rp2040/board.c | 10 +----
 .../boards/jpconstantineau_pykey18/board.c    | 10 +----
 .../boards/jpconstantineau_pykey44/board.c    | 10 +----
 .../boards/jpconstantineau_pykey60/board.c    | 10 +----
 .../boards/jpconstantineau_pykey87/board.c    | 10 +----
 .../boards/melopero_shake_rp2040/board.c      | 13 +-----
 .../raspberrypi/boards/odt_bread_2040/board.c | 13 +-----
 .../boards/odt_cast_away_rp2040/board.c       | 13 +-----
 .../boards/pimoroni_badger2040/board.c        |  9 +----
 .../boards/pimoroni_interstate75/board.c      | 13 +-----
 .../boards/pimoroni_keybow2040/board.c        | 13 +-----
 .../boards/pimoroni_motor2040/board.c         | 13 +-----
 .../boards/pimoroni_pga2040/board.c           | 13 +-----
 .../boards/pimoroni_picolipo_16mb/board.c     | 13 +-----
 .../boards/pimoroni_picolipo_4mb/board.c      | 13 +-----
 .../boards/pimoroni_picosystem/board.c        | 10 +----
 .../boards/pimoroni_plasma2040/board.c        | 13 +-----
 .../boards/pimoroni_servo2040/board.c         | 13 +-----
 .../boards/pimoroni_tiny2040/board.c          | 13 +-----
 .../boards/pimoroni_tiny2040_2mb/board.c      | 13 +-----
 .../boards/raspberry_pi_pico/board.c          | 13 +-----
 .../boards/seeeduino_xiao_rp2040/board.c      | 13 +-----
 .../boards/silicognition_rp2040_shim/board.c  | 16 +-------
 .../boards/solderparty_bbq20kbd/board.c       | 13 +-----
 .../boards/solderparty_rp2040_stamp/board.c   | 13 +-----
 .../boards/sparkfun_micromod_rp2040/board.c   | 16 +-------
 .../boards/sparkfun_pro_micro_rp2040/board.c  | 16 +-------
 .../boards/sparkfun_thing_plus_rp2040/board.c | 16 +-------
 .../takayoshiotake_octave_rp2040/board.c      | 13 +-----
 .../boards/waveshare_rp2040_zero/board.c      | 13 +-----
 .../boards/weact_studio_pico/board.c          | 13 +-----
 .../boards/wiznet_w5100s_evb_pico/board.c     | 13 +-----
 .../boards/wiznet_w5500_evb_pico/board.c      | 13 +-----
 .../boards/zrichard_rp2.65-f/board.c          | 10 +----
 ports/stm/boards/espruino_pico/board.c        | 15 +------
 ports/stm/boards/espruino_wifi/board.c        | 14 +------
 .../boards/feather_stm32f405_express/board.c  | 15 +------
 ports/stm/boards/meowbit_v121/board.c         | 11 +----
 ports/stm/boards/nucleo_f746zg/board.c        | 14 +------
 ports/stm/boards/nucleo_f767zi/board.c        | 14 +------
 ports/stm/boards/nucleo_h743zi_2/board.c      | 14 +------
 ports/stm/boards/openmv_h7/board.c            | 14 +------
 ports/stm/boards/pyb_nano_v2/board.c          | 15 +------
 ports/stm/boards/pyboard_v11/board.c          | 14 +------
 .../sparkfun_stm32f405_micromod/board.c       | 14 +------
 .../stm/boards/stm32f411ce_blackpill/board.c  | 15 +------
 .../stm32f411ce_blackpill_with_flash/board.c  | 15 +------
 .../stm/boards/stm32f411ve_discovery/board.c  | 14 +------
 .../stm/boards/stm32f412zg_discovery/board.c  | 14 +------
 ports/stm/boards/stm32f4_discovery/board.c    | 14 +------
 ports/stm/boards/stm32f746g_discovery/board.c | 11 +----
 ports/stm/boards/swan_r5/board.c              |  7 +---
 ports/stm/boards/thunderpack_v11/board.c      | 14 +------
 ports/stm/boards/thunderpack_v12/board.c      | 14 +------
 supervisor/shared/board.c                     | 18 +++++++++
 333 files changed, 433 insertions(+), 3768 deletions(-)

diff --git a/ports/atmel-samd/boards/8086_commander/board.c b/ports/atmel-samd/boards/8086_commander/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/8086_commander/board.c
+++ b/ports/atmel-samd/boards/8086_commander/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c
index ba0cf06ebc..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c
+++ b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
-#include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c
index 8804c3c324..e0f8bda171 100644
--- a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c
+++ b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c
@@ -27,18 +27,9 @@
 #include "supervisor/board.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
 
 void reset_board(void) {
     board_reset_user_neopixels(&pin_PA15, 2);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c
index ba0cf06ebc..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c
+++ b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
-#include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c
index 0c829a4a55..0d885160e9 100644
--- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c
@@ -29,16 +29,8 @@
 #include "supervisor/shared/board.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     board_reset_user_neopixels(&pin_PA04, 2);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/aloriumtech_evo_m51/board.c b/ports/atmel-samd/boards/aloriumtech_evo_m51/board.c
index 1c79675305..80e8b909a7 100644
--- a/ports/atmel-samd/boards/aloriumtech_evo_m51/board.c
+++ b/ports/atmel-samd/boards/aloriumtech_evo_m51/board.c
@@ -50,12 +50,4 @@ void board_init(void) {
     }
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/arduino_mkr1300/board.c b/ports/atmel-samd/boards/arduino_mkr1300/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/board.c
+++ b/ports/atmel-samd/boards/arduino_mkr1300/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/board.c b/ports/atmel-samd/boards/arduino_mkrzero/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/board.c
+++ b/ports/atmel-samd/boards/arduino_mkrzero/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/board.c b/ports/atmel-samd/boards/arduino_nano_33_iot/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/board.c
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/arduino_zero/board.c b/ports/atmel-samd/boards/arduino_zero/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/arduino_zero/board.c
+++ b/ports/atmel-samd/boards/arduino_zero/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/bast_pro_mini_m0/board.c b/ports/atmel-samd/boards/bast_pro_mini_m0/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/bast_pro_mini_m0/board.c
+++ b/ports/atmel-samd/boards/bast_pro_mini_m0/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/board.c b/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
index 5725a67dcc..f56275c016 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
+++ b/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
@@ -39,12 +39,4 @@ void board_init(void) {
     // port_pin_set_output_level(MICROPY_HW_LED_RX, true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d51/board.c b/ports/atmel-samd/boards/bdmicro_vina_d51/board.c
index e0a7487bd2..1bba99ac06 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d51/board.c
+++ b/ports/atmel-samd/boards/bdmicro_vina_d51/board.c
@@ -28,15 +28,4 @@
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/board.c b/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/board.c
index 5725a67dcc..f56275c016 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/board.c
+++ b/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/board.c
@@ -39,12 +39,4 @@ void board_init(void) {
     // port_pin_set_output_level(MICROPY_HW_LED_RX, true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/blm_badge/board.c b/ports/atmel-samd/boards/blm_badge/board.c
index 40e66b947e..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/blm_badge/board.c
+++ b/ports/atmel-samd/boards/blm_badge/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-    board_reset_user_neopixels(&pin_PA05, 10);
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/capablerobot_usbhub/board.c b/ports/atmel-samd/boards/capablerobot_usbhub/board.c
index d421db8b25..711b2cf766 100644
--- a/ports/atmel-samd/boards/capablerobot_usbhub/board.c
+++ b/ports/atmel-samd/boards/capablerobot_usbhub/board.c
@@ -29,15 +29,4 @@
 #include "hal/include/hal_gpio.h"
 #include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/catwan_usbstick/board.c b/ports/atmel-samd/boards/catwan_usbstick/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/catwan_usbstick/board.c
+++ b/ports/atmel-samd/boards/catwan_usbstick/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/board.c b/ports/atmel-samd/boards/circuitbrains_basic_m0/board.c
index 1e5a53751a..a28d51be4f 100755
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/board.c
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/board.c
@@ -26,18 +26,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/board.c b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/board.c
index 1e5a53751a..a28d51be4f 100755
--- a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/board.c
+++ b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/board.c
@@ -26,18 +26,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/circuitplayground_express/board.c b/ports/atmel-samd/boards/circuitplayground_express/board.c
index 113db13085..bda4f7520b 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/board.c
+++ b/ports/atmel-samd/boards/circuitplayground_express/board.c
@@ -31,9 +31,6 @@
 #include "supervisor/shared/board.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
 // Check the status of the two buttons on CircuitPlayground Express. If both are
 // pressed, then boot into user safe mode.
 bool board_requests_safe_mode(void) {
@@ -55,5 +52,4 @@ void reset_board(void) {
     board_reset_user_neopixels(&pin_PB23, 10);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/board.c b/ports/atmel-samd/boards/circuitplayground_express_crickit/board.c
index d419813df3..bd9eba93cc 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/board.c
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/board.c
@@ -31,9 +31,6 @@
 #include "hal/include/hal_gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
 // Check the status of the two buttons on CircuitPlayground Express. If both are
 // pressed, then boot into user safe mode.
 bool board_requests_safe_mode(void) {
@@ -55,5 +52,4 @@ void reset_board(void) {
     board_reset_user_neopixels(&pin_PB23, 10);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c b/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c
index d419813df3..bd9eba93cc 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c
@@ -31,9 +31,6 @@
 #include "hal/include/hal_gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
 // Check the status of the two buttons on CircuitPlayground Express. If both are
 // pressed, then boot into user safe mode.
 bool board_requests_safe_mode(void) {
@@ -55,5 +52,4 @@ void reset_board(void) {
     board_reset_user_neopixels(&pin_PB23, 10);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/cp32-m4/board.c b/ports/atmel-samd/boards/cp32-m4/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/cp32-m4/board.c
+++ b/ports/atmel-samd/boards/cp32-m4/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/cp_sapling_m0/board.c b/ports/atmel-samd/boards/cp_sapling_m0/board.c
index ba0cf06ebc..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/cp_sapling_m0/board.c
+++ b/ports/atmel-samd/boards/cp_sapling_m0/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
-#include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/cp_sapling_m0_revb/board.c b/ports/atmel-samd/boards/cp_sapling_m0_revb/board.c
index ba0cf06ebc..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/cp_sapling_m0_revb/board.c
+++ b/ports/atmel-samd/boards/cp_sapling_m0_revb/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
-#include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/board.c b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/board.c
index ba0cf06ebc..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/board.c
+++ b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
-#include "supervisor/shared/board.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c
+++ b/ports/atmel-samd/boards/cytron_maker_zero_samd21/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/board.c b/ports/atmel-samd/boards/datalore_ip_m4/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/datalore_ip_m4/board.c
+++ b/ports/atmel-samd/boards/datalore_ip_m4/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/datum_distance/board.c b/ports/atmel-samd/boards/datum_distance/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/datum_distance/board.c
+++ b/ports/atmel-samd/boards/datum_distance/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/datum_imu/board.c b/ports/atmel-samd/boards/datum_imu/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/datum_imu/board.c
+++ b/ports/atmel-samd/boards/datum_imu/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/datum_light/board.c b/ports/atmel-samd/boards/datum_light/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/datum_light/board.c
+++ b/ports/atmel-samd/boards/datum_light/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/datum_weather/board.c b/ports/atmel-samd/boards/datum_weather/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/datum_weather/board.c
+++ b/ports/atmel-samd/boards/datum_weather/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/dynalora_usb/board.c b/ports/atmel-samd/boards/dynalora_usb/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/dynalora_usb/board.c
+++ b/ports/atmel-samd/boards/dynalora_usb/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/dynossat_edu_eps/board.c b/ports/atmel-samd/boards/dynossat_edu_eps/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/dynossat_edu_eps/board.c
+++ b/ports/atmel-samd/boards/dynossat_edu_eps/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/dynossat_edu_obc/board.c b/ports/atmel-samd/boards/dynossat_edu_obc/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/dynossat_edu_obc/board.c
+++ b/ports/atmel-samd/boards/dynossat_edu_obc/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/escornabot_makech/board.c b/ports/atmel-samd/boards/escornabot_makech/board.c
index bfc3bade9d..a3c19899e8 100644
--- a/ports/atmel-samd/boards/escornabot_makech/board.c
+++ b/ports/atmel-samd/boards/escornabot_makech/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/board.c b/ports/atmel-samd/boards/feather_m0_adalogger/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/board.c
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_basic/board.c b/ports/atmel-samd/boards/feather_m0_basic/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/board.c
+++ b/ports/atmel-samd/boards/feather_m0_basic/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_express/board.c b/ports/atmel-samd/boards/feather_m0_express/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_express/board.c
+++ b/ports/atmel-samd/boards/feather_m0_express/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/board.c b/ports/atmel-samd/boards/feather_m0_express_crickit/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/board.c
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/board.c b/ports/atmel-samd/boards/feather_m0_rfm69/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/board.c
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/board.c b/ports/atmel-samd/boards/feather_m0_rfm9x/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/board.c
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/board.c b/ports/atmel-samd/boards/feather_m0_supersized/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m0_supersized/board.c
+++ b/ports/atmel-samd/boards/feather_m0_supersized/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m4_can/board.c b/ports/atmel-samd/boards/feather_m4_can/board.c
index 289d68af29..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m4_can/board.c
+++ b/ports/atmel-samd/boards/feather_m4_can/board.c
@@ -25,17 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/feather_m4_express/board.c b/ports/atmel-samd/boards/feather_m4_express/board.c
index 289d68af29..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/feather_m4_express/board.c
+++ b/ports/atmel-samd/boards/feather_m4_express/board.c
@@ -25,17 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/fluff_m0/board.c b/ports/atmel-samd/boards/fluff_m0/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/fluff_m0/board.c
+++ b/ports/atmel-samd/boards/fluff_m0/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/gemma_m0/board.c b/ports/atmel-samd/boards/gemma_m0/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/gemma_m0/board.c
+++ b/ports/atmel-samd/boards/gemma_m0/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/board.c b/ports/atmel-samd/boards/grandcentral_m4_express/board.c
index f72884ffe8..7180deb278 100644
--- a/ports/atmel-samd/boards/grandcentral_m4_express/board.c
+++ b/ports/atmel-samd/boards/grandcentral_m4_express/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index 102701a295..701dc4a8ec 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -114,12 +114,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c
index add1844fcb..5003c904bc 100644
--- a/ports/atmel-samd/boards/hallowing_m4_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m4_express/board.c
@@ -94,12 +94,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/huntercat_nfc/board.c b/ports/atmel-samd/boards/huntercat_nfc/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/huntercat_nfc/board.c
+++ b/ports/atmel-samd/boards/huntercat_nfc/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/board.c b/ports/atmel-samd/boards/itsybitsy_m0_express/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0_express/board.c
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/board.c b/ports/atmel-samd/boards/itsybitsy_m4_express/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/itsybitsy_m4_express/board.c
+++ b/ports/atmel-samd/boards/itsybitsy_m4_express/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/kicksat-sprite/board.c b/ports/atmel-samd/boards/kicksat-sprite/board.c
index df7bd70dad..b22d8ae366 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/board.c
+++ b/ports/atmel-samd/boards/kicksat-sprite/board.c
@@ -25,20 +25,6 @@
  */
 
 
-#include 
-
 #include "supervisor/board.h"
-#include "py/mpconfig.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/loc_ber_m4_base_board/board.c b/ports/atmel-samd/boards/loc_ber_m4_base_board/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/loc_ber_m4_base_board/board.c
+++ b/ports/atmel-samd/boards/loc_ber_m4_base_board/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/matrixportal_m4/board.c b/ports/atmel-samd/boards/matrixportal_m4/board.c
index 1d9b33a40c..65d7297ed9 100644
--- a/ports/atmel-samd/boards/matrixportal_m4/board.c
+++ b/ports/atmel-samd/boards/matrixportal_m4/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/meowmeow/board.c b/ports/atmel-samd/boards/meowmeow/board.c
index bfc3bade9d..a3c19899e8 100644
--- a/ports/atmel-samd/boards/meowmeow/board.c
+++ b/ports/atmel-samd/boards/meowmeow/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/metro_m0_express/board.c b/ports/atmel-samd/boards/metro_m0_express/board.c
index 5725a67dcc..f56275c016 100644
--- a/ports/atmel-samd/boards/metro_m0_express/board.c
+++ b/ports/atmel-samd/boards/metro_m0_express/board.c
@@ -39,12 +39,4 @@ void board_init(void) {
     // port_pin_set_output_level(MICROPY_HW_LED_RX, true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/board.c b/ports/atmel-samd/boards/metro_m4_airlift_lite/board.c
index e0a7487bd2..1bba99ac06 100644
--- a/ports/atmel-samd/boards/metro_m4_airlift_lite/board.c
+++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/board.c
@@ -28,15 +28,4 @@
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/metro_m4_express/board.c b/ports/atmel-samd/boards/metro_m4_express/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/metro_m4_express/board.c
+++ b/ports/atmel-samd/boards/metro_m4_express/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/mini_sam_m4/board.c b/ports/atmel-samd/boards/mini_sam_m4/board.c
index e0a7487bd2..1bba99ac06 100644
--- a/ports/atmel-samd/boards/mini_sam_m4/board.c
+++ b/ports/atmel-samd/boards/mini_sam_m4/board.c
@@ -28,15 +28,4 @@
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c
index dd8244e003..76c96bba82 100644
--- a/ports/atmel-samd/boards/monster_m4sk/board.c
+++ b/ports/atmel-samd/boards/monster_m4sk/board.c
@@ -95,12 +95,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/ndgarage_ndbit6/board.c b/ports/atmel-samd/boards/ndgarage_ndbit6/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/ndgarage_ndbit6/board.c
+++ b/ports/atmel-samd/boards/ndgarage_ndbit6/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/ndgarage_ndbit6_v2/board.c b/ports/atmel-samd/boards/ndgarage_ndbit6_v2/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/ndgarage_ndbit6_v2/board.c
+++ b/ports/atmel-samd/boards/ndgarage_ndbit6_v2/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/neopixel_trinkey_m0/board.c b/ports/atmel-samd/boards/neopixel_trinkey_m0/board.c
index f97d38a1a7..ed54817129 100644
--- a/ports/atmel-samd/boards/neopixel_trinkey_m0/board.c
+++ b/ports/atmel-samd/boards/neopixel_trinkey_m0/board.c
@@ -29,16 +29,8 @@
 #include "supervisor/shared/board.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     board_reset_user_neopixels(&pin_PA05, 4);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/nfc_copy_cat/board.c b/ports/atmel-samd/boards/nfc_copy_cat/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/nfc_copy_cat/board.c
+++ b/ports/atmel-samd/boards/nfc_copy_cat/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
index 40512b9416..30537dd3f4 100644
--- a/ports/atmel-samd/boards/openbook_m4/board.c
+++ b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -102,12 +102,4 @@ void board_init(void) {
         false); // two_byte_sequence_length
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pewpew10/board.c b/ports/atmel-samd/boards/pewpew10/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/pewpew10/board.c
+++ b/ports/atmel-samd/boards/pewpew10/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c
index 10c657aee8..f4060571bf 100644
--- a/ports/atmel-samd/boards/pewpew_lcd/board.c
+++ b/ports/atmel-samd/boards/pewpew_lcd/board.c
@@ -93,12 +93,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
index 0dc8c9f4c5..c36388f933 100644
--- a/ports/atmel-samd/boards/pewpew_m4/board.c
+++ b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -147,12 +147,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/picoplanet/board.c b/ports/atmel-samd/boards/picoplanet/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/picoplanet/board.c
+++ b/ports/atmel-samd/boards/picoplanet/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index 9160b0260c..a1cb3a0714 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -115,13 +115,8 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     board_reset_user_neopixels(&pin_PA15, 5);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pycubed/board.c b/ports/atmel-samd/boards/pycubed/board.c
index 41e4655102..f0e84103e2 100644
--- a/ports/atmel-samd/boards/pycubed/board.c
+++ b/ports/atmel-samd/boards/pycubed/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     common_hal_pwmio_pwmout_never_reset(&pwm);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pycubed_mram/board.c b/ports/atmel-samd/boards/pycubed_mram/board.c
index 41e4655102..f0e84103e2 100644
--- a/ports/atmel-samd/boards/pycubed_mram/board.c
+++ b/ports/atmel-samd/boards/pycubed_mram/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     common_hal_pwmio_pwmout_never_reset(&pwm);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pycubed_mram_v05/board.c b/ports/atmel-samd/boards/pycubed_mram_v05/board.c
index 41e4655102..f0e84103e2 100644
--- a/ports/atmel-samd/boards/pycubed_mram_v05/board.c
+++ b/ports/atmel-samd/boards/pycubed_mram_v05/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     common_hal_pwmio_pwmout_never_reset(&pwm);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pycubed_v05/board.c b/ports/atmel-samd/boards/pycubed_v05/board.c
index 41e4655102..f0e84103e2 100644
--- a/ports/atmel-samd/boards/pycubed_v05/board.c
+++ b/ports/atmel-samd/boards/pycubed_v05/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     common_hal_pwmio_pwmout_never_reset(&pwm);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
index e324999a87..8ff34f24c5 100644
--- a/ports/atmel-samd/boards/pygamer/board.c
+++ b/ports/atmel-samd/boards/pygamer/board.c
@@ -117,13 +117,8 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     board_reset_user_neopixels(&pin_PA15, 5);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index 676461c7f5..e304f6f24b 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -104,12 +104,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pyportal_titano/board.c b/ports/atmel-samd/boards/pyportal_titano/board.c
index 635025396d..939a2dcc70 100644
--- a/ports/atmel-samd/boards/pyportal_titano/board.c
+++ b/ports/atmel-samd/boards/pyportal_titano/board.c
@@ -121,12 +121,4 @@ void board_init(void) {
         500); // backlight_pwm_frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/pyruler/board.c b/ports/atmel-samd/boards/pyruler/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/pyruler/board.c
+++ b/ports/atmel-samd/boards/pyruler/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/qtpy_m0/board.c b/ports/atmel-samd/boards/qtpy_m0/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/qtpy_m0/board.c
+++ b/ports/atmel-samd/boards/qtpy_m0/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/board.c b/ports/atmel-samd/boards/qtpy_m0_haxpress/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/qtpy_m0_haxpress/board.c
+++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/robohatmm1_m4/board.c b/ports/atmel-samd/boards/robohatmm1_m4/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/robohatmm1_m4/board.c
+++ b/ports/atmel-samd/boards/robohatmm1_m4/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sam32/board.c b/ports/atmel-samd/boards/sam32/board.c
index c6d8c45b1f..106159ae4d 100644
--- a/ports/atmel-samd/boards/sam32/board.c
+++ b/ports/atmel-samd/boards/sam32/board.c
@@ -34,13 +34,6 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/neopixel_write/__init__.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     uint8_t zeroes[96];
     memset(zeroes, 0, 96);
@@ -51,5 +44,4 @@ void reset_board(void) {
     common_hal_digitalio_digitalinout_deinit(&neopixel);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/same54_xplained/board.c b/ports/atmel-samd/boards/same54_xplained/board.c
index f72884ffe8..7180deb278 100644
--- a/ports/atmel-samd/boards/same54_xplained/board.c
+++ b/ports/atmel-samd/boards/same54_xplained/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
index ac357401f5..2eddb41fd6 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
@@ -133,13 +133,6 @@ void board_init(void) {
     reset_pin_number(pin_PA18.number);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
 void board_deinit(void) {
     common_hal_displayio_release_displays();
     common_hal_digitalio_digitalinout_deinit(&CTR_5V);
@@ -150,3 +143,5 @@ void board_deinit(void) {
     // Pin state is kept during BACKUP sleep.
     gpio_set_pin_direction(pin_PA18.number, GPIO_DIRECTION_OUT);
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/seeeduino_xiao/board.c b/ports/atmel-samd/boards/seeeduino_xiao/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/seeeduino_xiao/board.c
+++ b/ports/atmel-samd/boards/seeeduino_xiao/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/seeeduino_xiao_kb/board.c b/ports/atmel-samd/boards/seeeduino_xiao_kb/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/seeeduino_xiao_kb/board.c
+++ b/ports/atmel-samd/boards/seeeduino_xiao_kb/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sensebox_mcu/board.c b/ports/atmel-samd/boards/sensebox_mcu/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sensebox_mcu/board.c
+++ b/ports/atmel-samd/boards/sensebox_mcu/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/serpente/board.c b/ports/atmel-samd/boards/serpente/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/serpente/board.c
+++ b/ports/atmel-samd/boards/serpente/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/shirtty/board.c b/ports/atmel-samd/boards/shirtty/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/shirtty/board.c
+++ b/ports/atmel-samd/boards/shirtty/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/silicognition-m4-shim/board.c b/ports/atmel-samd/boards/silicognition-m4-shim/board.c
index 289d68af29..f888faa2af 100644
--- a/ports/atmel-samd/boards/silicognition-m4-shim/board.c
+++ b/ports/atmel-samd/boards/silicognition-m4-shim/board.c
@@ -25,17 +25,7 @@
  */
 
 #include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
+
 #include "mpconfigboard.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/atmel-samd/boards/snekboard/board.c b/ports/atmel-samd/boards/snekboard/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/snekboard/board.c
+++ b/ports/atmel-samd/boards/snekboard/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/board.c b/ports/atmel-samd/boards/sparkfun_lumidrive/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_lumidrive/board.c
+++ b/ports/atmel-samd/boards/sparkfun_lumidrive/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/board.c b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/board.c
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/board.c b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/board.c
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/board.c b/ports/atmel-samd/boards/sparkfun_redboard_turbo/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/board.c
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_dev/board.c b/ports/atmel-samd/boards/sparkfun_samd21_dev/board.c
index e0a7487bd2..1bba99ac06 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_dev/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd21_dev/board.c
@@ -28,15 +28,4 @@
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_mini/board.c b/ports/atmel-samd/boards/sparkfun_samd21_mini/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
index 9e862b3c01..b079679d33 100644
--- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
@@ -30,19 +30,6 @@
 #include "hal/include/hal_gpio.h"
 #include "supervisor/shared/external_flash/external_flash.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
-
 void external_flash_setup(void) {
     // Do not reset the external flash write-protect and hold pins high
     never_reset_pin_number(PIN_PB22);
@@ -59,3 +46,5 @@ void external_flash_setup(void) {
     gpio_set_pin_direction(PIN_PB23, GPIO_DIRECTION_OUT);
     gpio_set_pin_level(PIN_PB23, true);
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/board.c b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/board.c
index 289d68af29..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/board.c
@@ -25,17 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/board.c b/ports/atmel-samd/boards/stackrduino_m0_pro/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/stackrduino_m0_pro/board.c
+++ b/ports/atmel-samd/boards/stackrduino_m0_pro/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/stringcar_m0_express/board.c b/ports/atmel-samd/boards/stringcar_m0_express/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/stringcar_m0_express/board.c
+++ b/ports/atmel-samd/boards/stringcar_m0_express/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/trellis_m4_express/board.c b/ports/atmel-samd/boards/trellis_m4_express/board.c
index 3f735e4550..e0455e9344 100644
--- a/ports/atmel-samd/boards/trellis_m4_express/board.c
+++ b/ports/atmel-samd/boards/trellis_m4_express/board.c
@@ -33,13 +33,6 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/neopixel_write/__init__.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     uint8_t zeroes[96];
     memset(zeroes, 0, 96);
@@ -50,5 +43,4 @@ void reset_board(void) {
     common_hal_digitalio_digitalinout_deinit(&neopixel);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/trinket_m0/board.c b/ports/atmel-samd/boards/trinket_m0/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/trinket_m0/board.c
+++ b/ports/atmel-samd/boards/trinket_m0/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/board.c b/ports/atmel-samd/boards/trinket_m0_haxpress/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/board.c
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/uartlogger2/board.c b/ports/atmel-samd/boards/uartlogger2/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/uartlogger2/board.c
+++ b/ports/atmel-samd/boards/uartlogger2/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/uchip/board.c b/ports/atmel-samd/boards/uchip/board.c
index e739776ed1..66469e12ce 100644
--- a/ports/atmel-samd/boards/uchip/board.c
+++ b/ports/atmel-samd/boards/uchip/board.c
@@ -42,12 +42,4 @@ void board_init(void) {
     never_reset_pin_number(PIN_PA27);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c
index 371a1cabb3..90cf9dff20 100644
--- a/ports/atmel-samd/boards/ugame10/board.c
+++ b/ports/atmel-samd/boards/ugame10/board.c
@@ -114,12 +114,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/board.c b/ports/atmel-samd/boards/winterbloom_big_honking_button/board.c
index 9f91617a17..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/winterbloom_big_honking_button/board.c
+++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/winterbloom_sol/board.c b/ports/atmel-samd/boards/winterbloom_sol/board.c
index 289d68af29..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/board.c
+++ b/ports/atmel-samd/boards/winterbloom_sol/board.c
@@ -25,17 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/xinabox_cc03/board.c b/ports/atmel-samd/boards/xinabox_cc03/board.c
index e0a7487bd2..fb1ce4fb83 100644
--- a/ports/atmel-samd/boards/xinabox_cc03/board.c
+++ b/ports/atmel-samd/boards/xinabox_cc03/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/xinabox_cs11/board.c b/ports/atmel-samd/boards/xinabox_cs11/board.c
index e0a7487bd2..1bba99ac06 100644
--- a/ports/atmel-samd/boards/xinabox_cs11/board.c
+++ b/ports/atmel-samd/boards/xinabox_cs11/board.c
@@ -28,15 +28,4 @@
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/diodes_delight_piunora/board.c b/ports/broadcom/boards/diodes_delight_piunora/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/board.c
+++ b/ports/broadcom/boards/diodes_delight_piunora/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_cm4/board.c b/ports/broadcom/boards/raspberrypi_cm4/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_cm4/board.c
+++ b/ports/broadcom/boards/raspberrypi_cm4/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_cm4io/board.c b/ports/broadcom/boards/raspberrypi_cm4io/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_cm4io/board.c
+++ b/ports/broadcom/boards/raspberrypi_cm4io/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_pi4b/board.c b/ports/broadcom/boards/raspberrypi_pi4b/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_pi4b/board.c
+++ b/ports/broadcom/boards/raspberrypi_pi4b/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_zero/board.c b/ports/broadcom/boards/raspberrypi_zero/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_zero/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_zero2w/board.c b/ports/broadcom/boards/raspberrypi_zero2w/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_zero2w/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero2w/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/broadcom/boards/raspberrypi_zero_w/board.c b/ports/broadcom/boards/raspberrypi_zero_w/board.c
index 80bea7f8b6..e272a8cc3d 100644
--- a/ports/broadcom/boards/raspberrypi_zero_w/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero_w/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
         true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/cxd56/boards/spresense/board.c b/ports/cxd56/boards/spresense/board.c
index fba263c569..b397789c3e 100644
--- a/ports/cxd56/boards/spresense/board.c
+++ b/ports/cxd56/boards/spresense/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
index afc1ad081c..dc0a9711ee 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
@@ -99,13 +99,8 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
 void board_deinit(void) {
     common_hal_displayio_release_displays();
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
index a13c3be4e6..22d51ef334 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
@@ -35,19 +35,14 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on NeoPixel and I2C power by default.
     gpio_set_direction(2, GPIO_MODE_DEF_OUTPUT);
     gpio_set_level(2, true);
 }
 
-void board_deinit(void) {
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/board.c b/ports/espressif/boards/adafruit_feather_esp32s2/board.c
index f9e88c097e..f701d18442 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2/board.c
@@ -35,10 +35,6 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on I2C power by default.
 
@@ -53,5 +49,4 @@ void reset_board(void) {
     gpio_set_level(7, !restlevel);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index 63ad8e44fd..a553afdff7 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -129,10 +129,6 @@ void board_init(void) {
         );
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
@@ -144,9 +140,6 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-void reset_board(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
 
-void board_deinit(void) {
-    // TODO: Should we turn off the display when asleep?
-}
+// TODO: Should we turn off the display when asleep, in board_deinit()?
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
index bd64046296..e0edec2fa2 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
@@ -105,13 +105,4 @@ void board_init(void) {
         */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
index d4d55c2e23..983d62a911 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
@@ -35,10 +35,6 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on I2C power by default.
 
@@ -46,5 +42,4 @@ void reset_board(void) {
     gpio_set_level(7, true);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
index d4d55c2e23..983d62a911 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
@@ -35,10 +35,6 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on I2C power by default.
 
@@ -46,5 +42,4 @@ void reset_board(void) {
     gpio_set_level(7, true);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
index eca89b6291..3ba482f207 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -131,10 +131,6 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
@@ -146,9 +142,6 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-void reset_board(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
 
-void board_deinit(void) {
-    // TODO: Should we turn off the display when asleep?
-}
+// TODO: Should we turn off the display when asleep, in board_deinit() ?
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/board.c b/ports/espressif/boards/adafruit_feather_huzzah32/board.c
index c5e2797b00..164430c88c 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/board.c
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/board.c
@@ -25,21 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
-#include "components/hal/include/hal/gpio_hal.h"
-#include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c
index 742d629a2c..40f7194690 100644
--- a/ports/espressif/boards/adafruit_funhouse/board.c
+++ b/ports/espressif/boards/adafruit_funhouse/board.c
@@ -107,13 +107,8 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
 void board_deinit(void) {
     common_hal_displayio_release_displays();
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
index 3eee2f119b..0c85922524 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -164,14 +164,6 @@ void board_init(void) {
         false);  // two_byte_sequence_length
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Pin 16 is speaker enable and it's pulled down on the board. We don't want
     // to pull it high because then we'll compete with the external pull down.
@@ -209,3 +201,5 @@ void board_deinit(void) {
     }
     common_hal_displayio_release_displays();
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/board.c b/ports/espressif/boards/adafruit_metro_esp32s2/board.c
index 6772768da5..164430c88c 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/board.c
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
index 0eca2f0969..b714fd41f0 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
@@ -35,10 +35,6 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on NeoPixel power by default.
     gpio_set_direction(8, GPIO_MODE_DEF_OUTPUT);
@@ -50,3 +46,5 @@ void board_deinit(void) {
     gpio_set_direction(8, GPIO_MODE_DEF_OUTPUT);
     gpio_set_level(8, false);
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/board.c b/ports/espressif/boards/adafruit_qtpy_esp32c3/board.c
index 7a9ff98fcb..e29b6b93e7 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/board.c
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/board.c
@@ -25,25 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/board.h"
 
-#include "components/driver/include/driver/gpio.h"
-#include "soc/usb_serial_jtag_struct.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/board.c b/ports/espressif/boards/adafruit_qtpy_esp32s2/board.c
index 6772768da5..164430c88c 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s2/board.c
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c
index ff9418ec86..3b1f5efd87 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
index 7dd29fd6f6..2e09e7d9a4 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
@@ -43,10 +43,6 @@ void board_init(void) {
     USB_SERIAL_JTAG.conf0.dp_pullup = 0;
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Pull LEDs down on reset rather than the default up
     if (pin_number == 3 || pin_number == 4 || pin_number == 5 || pin_number == 18 || pin_number == 19) {
@@ -63,8 +59,4 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
index 7dd29fd6f6..2e09e7d9a4 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
@@ -43,10 +43,6 @@ void board_init(void) {
     USB_SERIAL_JTAG.conf0.dp_pullup = 0;
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Pull LEDs down on reset rather than the default up
     if (pin_number == 3 || pin_number == 4 || pin_number == 5 || pin_number == 18 || pin_number == 19) {
@@ -63,8 +59,4 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c
+++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/artisense_rd00/board.c b/ports/espressif/boards/artisense_rd00/board.c
index ea363f6b54..fb3f6befc9 100644
--- a/ports/espressif/boards/artisense_rd00/board.c
+++ b/ports/espressif/boards/artisense_rd00/board.c
@@ -39,14 +39,3 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO15);
     common_hal_never_reset_pin(&pin_GPIO16);
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/espressif/boards/atmegazero_esp32s2/board.c b/ports/espressif/boards/atmegazero_esp32s2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/atmegazero_esp32s2/board.c
+++ b/ports/espressif/boards/atmegazero_esp32s2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/beetle-esp32-c3/board.c b/ports/espressif/boards/beetle-esp32-c3/board.c
index 8bca964dc7..164430c88c 100644
--- a/ports/espressif/boards/beetle-esp32-c3/board.c
+++ b/ports/espressif/boards/beetle-esp32-c3/board.c
@@ -24,24 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/board.h"
 
-#include "components/driver/include/driver/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/crumpspace_crumps2/board.c b/ports/espressif/boards/crumpspace_crumps2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/crumpspace_crumps2/board.c
+++ b/ports/espressif/boards/crumpspace_crumps2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index 5c71b80fc0..d066ea8686 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -35,15 +35,10 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // Turn on VP by default.
     gpio_set_direction(38, GPIO_MODE_DEF_OUTPUT);
     gpio_set_level(38, true);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/electroniccats_bastwifi/board.c b/ports/espressif/boards/electroniccats_bastwifi/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/board.c
+++ b/ports/espressif/boards/electroniccats_bastwifi/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32_eye/board.c b/ports/espressif/boards/espressif_esp32_eye/board.c
index 38efb9e901..1c09fb1316 100644
--- a/ports/espressif/boards/espressif_esp32_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32_eye/board.c
@@ -35,15 +35,6 @@ void board_init(void) {
     reset_board();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Pull LEDs down on reset rather than the default up
     if (pin_number == 21 || pin_number == 22) {
@@ -59,3 +50,5 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     }
     return false;
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c
index e3b71f4832..b155ed7a7b 100644
--- a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c
+++ b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c
@@ -35,14 +35,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-#if CIRCUITPY_ALARM
-void board_deinit(void) {
-}
-#endif
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/board.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/board.c
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/board.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/board.c
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_box/board.c b/ports/espressif/boards/espressif_esp32s3_box/board.c
index e9f4bb2a66..75c0ede92d 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box/board.c
@@ -96,13 +96,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
index 48f69d63b2..23c67d06b6 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -97,13 +97,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c
index ff9418ec86..3b1f5efd87 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c
index ff9418ec86..3b1f5efd87 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c
index ff9418ec86..3b1f5efd87 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/board.c b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/board.c
index ff9418ec86..3b1f5efd87 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index 230d8b40b6..bdc87ad2a1 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -125,13 +125,4 @@ void board_init(void) {
     // Debug UART
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
index c2bfec465d..685e7cf156 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
@@ -133,13 +133,4 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/board.c b/ports/espressif/boards/espressif_hmi_devkit_1/board.c
index 93aa1c0436..b44ba7fad2 100644
--- a/ports/espressif/boards/espressif_hmi_devkit_1/board.c
+++ b/ports/espressif/boards/espressif_hmi_devkit_1/board.c
@@ -34,13 +34,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO44);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/board.c b/ports/espressif/boards/espressif_kaluga_1.3/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/board.c
+++ b/ports/espressif/boards/espressif_kaluga_1.3/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_kaluga_1/board.c b/ports/espressif/boards/espressif_kaluga_1/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_kaluga_1/board.c
+++ b/ports/espressif/boards/espressif_kaluga_1/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/board.c b/ports/espressif/boards/espressif_saola_1_wroom/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/board.c
+++ b/ports/espressif/boards/espressif_saola_1_wroom/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_saola_1_wrover/board.c b/ports/espressif/boards/espressif_saola_1_wrover/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_saola_1_wrover/board.c
+++ b/ports/espressif/boards/espressif_saola_1_wrover/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/board.c b/ports/espressif/boards/franzininho_wifi_wroom/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/board.c
+++ b/ports/espressif/boards/franzininho_wifi_wroom/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/franzininho_wifi_wrover/board.c b/ports/espressif/boards/franzininho_wifi_wrover/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/franzininho_wifi_wrover/board.c
+++ b/ports/espressif/boards/franzininho_wifi_wrover/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/gravitech_cucumber_m/board.c b/ports/espressif/boards/gravitech_cucumber_m/board.c
index 16a6af0742..b3c8cb4191 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/board.c
+++ b/ports/espressif/boards/gravitech_cucumber_m/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/board.c b/ports/espressif/boards/gravitech_cucumber_ms/board.c
index 16a6af0742..b3c8cb4191 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/board.c
+++ b/ports/espressif/boards/gravitech_cucumber_ms/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/gravitech_cucumber_r/board.c b/ports/espressif/boards/gravitech_cucumber_r/board.c
index 16a6af0742..b3c8cb4191 100644
--- a/ports/espressif/boards/gravitech_cucumber_r/board.c
+++ b/ports/espressif/boards/gravitech_cucumber_r/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/board.c b/ports/espressif/boards/gravitech_cucumber_rs/board.c
index 16a6af0742..b3c8cb4191 100644
--- a/ports/espressif/boards/gravitech_cucumber_rs/board.c
+++ b/ports/espressif/boards/gravitech_cucumber_rs/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
index c161fa9e59..609572977e 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/board.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -110,16 +110,6 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Pull LED down on reset rather than the default up
     if (pin_number == 2) {
@@ -135,3 +125,5 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     }
     return false;
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/hexky_s2/board.c b/ports/espressif/boards/hexky_s2/board.c
index a4a2f02e60..9c8298652d 100644
--- a/ports/espressif/boards/hexky_s2/board.c
+++ b/ports/espressif/boards/hexky_s2/board.c
@@ -125,10 +125,6 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
@@ -140,9 +136,6 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
-void reset_board(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
 
-void board_deinit(void) {
-    // TODO: Should we turn off the display when asleep?
-}
+// TODO: Should we turn off the display when asleep, in board_deinit()?
diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c
index 245d0206ac..287d1ae9d1 100644
--- a/ports/espressif/boards/hiibot_iots2/board.c
+++ b/ports/espressif/boards/hiibot_iots2/board.c
@@ -154,12 +154,4 @@ void board_init(void) {
     display_init();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c b/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
index 66246c6f77..67b05e5cd2 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t-01c3/board.c
@@ -11,12 +11,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
index 66246c6f77..7bcdcdba25 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/board.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft 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/Pin.h"
 #include "supervisor/board.h"
 
@@ -11,12 +37,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/board.c b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/board.c
index d522720629..6597b51c5f 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2/board.c
index d522720629..6597b51c5f 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/board.c
@@ -36,12 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
index 24d847744d..8df93b3374 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
@@ -141,13 +141,4 @@ void board_init(void) {
     display_init();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
index 8bca964dc7..164430c88c 100644
--- a/ports/espressif/boards/lolin_c3_mini/board.c
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -24,24 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/board.h"
 
-#include "components/driver/include/driver/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lolin_s2_mini/board.c b/ports/espressif/boards/lolin_s2_mini/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/lolin_s2_mini/board.c
+++ b/ports/espressif/boards/lolin_s2_mini/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lolin_s2_pico/board.c b/ports/espressif/boards/lolin_s2_pico/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/lolin_s2_pico/board.c
+++ b/ports/espressif/boards/lolin_s2_pico/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lolin_s3/board.c b/ports/espressif/boards/lolin_s3/board.c
index 545302366e..164430c88c 100644
--- a/ports/espressif/boards/lolin_s3/board.c
+++ b/ports/espressif/boards/lolin_s3/board.c
@@ -25,23 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
-#include "components/hal/include/hal/gpio_hal.h"
-#include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-    reset_board();
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/microdev_micro_c3/board.c b/ports/espressif/boards/microdev_micro_c3/board.c
index e3b71f4832..b155ed7a7b 100644
--- a/ports/espressif/boards/microdev_micro_c3/board.c
+++ b/ports/espressif/boards/microdev_micro_c3/board.c
@@ -35,14 +35,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-#if CIRCUITPY_ALARM
-void board_deinit(void) {
-}
-#endif
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/microdev_micro_s2/board.c b/ports/espressif/boards/microdev_micro_s2/board.c
index f6983f05a4..65bb19aced 100644
--- a/ports/espressif/boards/microdev_micro_s2/board.c
+++ b/ports/espressif/boards/microdev_micro_s2/board.c
@@ -38,12 +38,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/mixgo_ce_serial/board.c b/ports/espressif/boards/mixgo_ce_serial/board.c
index 32cb1749ca..e6ffb553b1 100644
--- a/ports/espressif/boards/mixgo_ce_serial/board.c
+++ b/ports/espressif/boards/mixgo_ce_serial/board.c
@@ -59,13 +59,4 @@ void board_init(void) {
 
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/mixgo_ce_udisk/board.c b/ports/espressif/boards/mixgo_ce_udisk/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/board.c
+++ b/ports/espressif/boards/mixgo_ce_udisk/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c
index 7deff5998c..fd2f225c11 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/board.c
+++ b/ports/espressif/boards/morpheans_morphesp-240/board.c
@@ -209,14 +209,8 @@ void board_init(void) {
         );
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
 void board_deinit(void) {
     common_hal_displayio_release_displays();
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/board.c b/ports/espressif/boards/odt_pixelwing_esp32_s2/board.c
index 6772768da5..164430c88c 100644
--- a/ports/espressif/boards/odt_pixelwing_esp32_s2/board.c
+++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/board.c
@@ -25,19 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/board.c b/ports/espressif/boards/seeed_xiao_esp32c3/board.c
index f5fd5702c3..7bcdcdba25 100644
--- a/ports/espressif/boards/seeed_xiao_esp32c3/board.c
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/board.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft 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/Pin.h"
 #include "supervisor/board.h"
 
@@ -11,16 +37,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/board.c b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/targett_module_clip_wroom/board.c b/ports/espressif/boards/targett_module_clip_wroom/board.c
index 66aea4bdd5..ce5a770920 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/board.c
+++ b/ports/espressif/boards/targett_module_clip_wroom/board.c
@@ -40,13 +40,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO16);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/targett_module_clip_wrover/board.c b/ports/espressif/boards/targett_module_clip_wrover/board.c
index 66aea4bdd5..ce5a770920 100644
--- a/ports/espressif/boards/targett_module_clip_wrover/board.c
+++ b/ports/espressif/boards/targett_module_clip_wrover/board.c
@@ -40,13 +40,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO16);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/board.c b/ports/espressif/boards/unexpectedmaker_feathers2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2/board.c
+++ b/ports/espressif/boards/unexpectedmaker_feathers2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c b/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/board.c b/ports/espressif/boards/unexpectedmaker_feathers3/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers3/board.c
+++ b/ports/espressif/boards/unexpectedmaker_feathers3/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_pros3/board.c b/ports/espressif/boards/unexpectedmaker_pros3/board.c
index 0432485111..8fd94f6c8b 100644
--- a/ports/espressif/boards/unexpectedmaker_pros3/board.c
+++ b/ports/espressif/boards/unexpectedmaker_pros3/board.c
@@ -35,14 +35,3 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO44);
     #endif /* DEBUG */
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/board.c b/ports/espressif/boards/unexpectedmaker_tinys2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_tinys2/board.c
+++ b/ports/espressif/boards/unexpectedmaker_tinys2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/unexpectedmaker_tinys3/board.c b/ports/espressif/boards/unexpectedmaker_tinys3/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/unexpectedmaker_tinys3/board.c
+++ b/ports/espressif/boards/unexpectedmaker_tinys3/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
index a265a2061b..6e1d92d05b 100644
--- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -141,13 +141,4 @@ void board_init(void) {
     display_init();
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/board.c b/ports/espressif/boards/waveshare_esp32s2_pico/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/board.c
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/litex/boards/fomu/board.c b/ports/litex/boards/fomu/board.c
index e5bff42b1a..43fc74fd42 100644
--- a/ports/litex/boards/fomu/board.c
+++ b/ports/litex/boards/fomu/board.c
@@ -66,14 +66,3 @@ void board_init(void) {
     ledda_write(3, LEDDPWRG);   // Green
     ledda_write(98, LEDDPWRB);  // Blue
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/board.c b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
index e6c41681ba..fa37b8ebfd 100644
--- a/ports/mimxrt10xx/boards/feather_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
@@ -44,13 +44,3 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_07);
     common_hal_never_reset_pin(&pin_GPIO_SD_06);
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
index e6c41681ba..1514503834 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_06);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
index 8cefabc937..df3d502d80 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
@@ -44,12 +44,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
index eefbcc6deb..5a4cbcfc66 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -47,12 +47,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_13);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
index 42ab6bbd8c..a9eea2d14e 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -48,12 +48,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_AD_B1_12);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
index d85b615f0f..12e75738f8 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
@@ -53,13 +53,3 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);
     common_hal_never_reset_pin(&pin_GPIO_AD_B0_03);
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/board.c b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
index e6c41681ba..1514503834 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
@@ -45,12 +45,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_06);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
index 1a1dc7e5ec..55cd826de2 100644
--- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
+++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
@@ -53,12 +53,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy40/board.c b/ports/mimxrt10xx/boards/teensy40/board.c
index 1a1dc7e5ec..55cd826de2 100644
--- a/ports/mimxrt10xx/boards/teensy40/board.c
+++ b/ports/mimxrt10xx/boards/teensy40/board.c
@@ -53,12 +53,4 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy41/board.c b/ports/mimxrt10xx/boards/teensy41/board.c
index 1a1dc7e5ec..628befd02b 100644
--- a/ports/mimxrt10xx/boards/teensy41/board.c
+++ b/ports/mimxrt10xx/boards/teensy41/board.c
@@ -52,13 +52,3 @@ void board_init(void) {
     // Data strobe needs protection despite being grounded
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/board.c b/ports/nrf/boards/ADM_B_NRF52840_1/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/ADM_B_NRF52840_1/board.c
+++ b/ports/nrf/boards/ADM_B_NRF52840_1/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c
+++ b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/TG-Watch/board.c b/ports/nrf/boards/TG-Watch/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/TG-Watch/board.c
+++ b/ports/nrf/boards/TG-Watch/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c b/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c
+++ b/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/aramcon2_badge/board.c b/ports/nrf/boards/aramcon2_badge/board.c
index 6eb1789284..f8424734fb 100644
--- a/ports/nrf/boards/aramcon2_badge/board.c
+++ b/ports/nrf/boards/aramcon2_badge/board.c
@@ -26,18 +26,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/aramcon_badge_2019/board.c b/ports/nrf/boards/aramcon_badge_2019/board.c
index 2ac061613a..32d1ca9483 100644
--- a/ports/nrf/boards/aramcon_badge_2019/board.c
+++ b/ports/nrf/boards/aramcon_badge_2019/board.c
@@ -26,18 +26,5 @@
  */
 
 #include "supervisor/board.h"
-#include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/arduino_nano_33_ble/board.c b/ports/nrf/boards/arduino_nano_33_ble/board.c
index 2f2c5e8388..0b6aa8f0db 100644
--- a/ports/nrf/boards/arduino_nano_33_ble/board.c
+++ b/ports/nrf/boards/arduino_nano_33_ble/board.c
@@ -53,14 +53,3 @@ void board_init(void) {
     // digitalWrite(PIN_ENABLE_SENSORS_3V3, HIGH);
     // digitalWrite(PIN_ENABLE_I2C_PULLUP, HIGH);
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/nrf/boards/bastble/board.c b/ports/nrf/boards/bastble/board.c
index bcf952c89f..fb1ce4fb83 100644
--- a/ports/nrf/boards/bastble/board.c
+++ b/ports/nrf/boards/bastble/board.c
@@ -25,20 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "nrf.h"
-#include "nrf_rtc.h"
 
-void board_init(void) {
-
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/board.c b/ports/nrf/boards/bless_dev_board_multi_sensor/board.c
index 5b0bdf1e1c..fb1ce4fb83 100644
--- a/ports/nrf/boards/bless_dev_board_multi_sensor/board.c
+++ b/ports/nrf/boards/bless_dev_board_multi_sensor/board.c
@@ -1,15 +1,29 @@
+/*
+ * 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) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/bluemicro833/board.c b/ports/nrf/boards/bluemicro833/board.c
index 104cea6274..c96bc6a996 100644
--- a/ports/nrf/boards/bluemicro833/board.c
+++ b/ports/nrf/boards/bluemicro833/board.c
@@ -56,10 +56,4 @@ void board_deinit(void) {
     nrf_gpio_pin_write(POWER_SWITCH_PIN->number, false);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/bluemicro840/board.c b/ports/nrf/boards/bluemicro840/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/bluemicro840/board.c
+++ b/ports/nrf/boards/bluemicro840/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nrf/boards/challenger_840/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/challenger_840/board.c
+++ b/ports/nrf/boards/challenger_840/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/circuitplayground_bluefruit/board.c b/ports/nrf/boards/circuitplayground_bluefruit/board.c
index 938d92aff1..412b249844 100644
--- a/ports/nrf/boards/circuitplayground_bluefruit/board.c
+++ b/ports/nrf/boards/circuitplayground_bluefruit/board.c
@@ -54,10 +54,8 @@ void board_deinit(void) {
     nrf_gpio_pin_write(POWER_SWITCH_PIN->number, true);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     board_reset_user_neopixels(&pin_P0_13, 10);
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c
index 5079aa9433..92ea3fefeb 100644
--- a/ports/nrf/boards/clue_nrf52840_express/board.c
+++ b/ports/nrf/boards/clue_nrf52840_express/board.c
@@ -93,14 +93,3 @@ void board_init(void) {
         false, // not SH1107
         50000); // backlight pwm frequency
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-    common_hal_displayio_release_displays();
-}
diff --git a/ports/nrf/boards/electronut_labs_blip/board.c b/ports/nrf/boards/electronut_labs_blip/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/electronut_labs_blip/board.c
+++ b/ports/nrf/boards/electronut_labs_blip/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/electronut_labs_papyr/board.c b/ports/nrf/boards/electronut_labs_papyr/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/electronut_labs_papyr/board.c
+++ b/ports/nrf/boards/electronut_labs_papyr/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/feather_bluefruit_sense/board.c b/ports/nrf/boards/feather_bluefruit_sense/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/feather_bluefruit_sense/board.c
+++ b/ports/nrf/boards/feather_bluefruit_sense/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/feather_nrf52840_express/board.c b/ports/nrf/boards/feather_nrf52840_express/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/feather_nrf52840_express/board.c
+++ b/ports/nrf/boards/feather_nrf52840_express/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c
index 50f235280d..e5fc4279f8 100644
--- a/ports/nrf/boards/hiibot_bluefi/board.c
+++ b/ports/nrf/boards/hiibot_bluefi/board.c
@@ -94,13 +94,3 @@ void board_init(void) {
         false, // SH1107_addressing
         50000); // backlight pwm frequency
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/nrf/boards/ikigaisense_vita/board.c b/ports/nrf/boards/ikigaisense_vita/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/ikigaisense_vita/board.c
+++ b/ports/nrf/boards/ikigaisense_vita/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/board.c b/ports/nrf/boards/itsybitsy_nrf52840_express/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/itsybitsy_nrf52840_express/board.c
+++ b/ports/nrf/boards/itsybitsy_nrf52840_express/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/board.c b/ports/nrf/boards/makerdiary_m60_keyboard/board.c
index b4070e72dc..8074c895dc 100644
--- a/ports/nrf/boards/makerdiary_m60_keyboard/board.c
+++ b/ports/nrf/boards/makerdiary_m60_keyboard/board.c
@@ -26,16 +26,5 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
index 1513b2182d..ce4241c9da 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
@@ -94,13 +94,3 @@ void board_init(void) {
         false, // SH1107_addressing
         50000); // backlight pwm frequency
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c b/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/metro_nrf52840_express/board.c b/ports/nrf/boards/metro_nrf52840_express/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/metro_nrf52840_express/board.c
+++ b/ports/nrf/boards/metro_nrf52840_express/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/microbit_v2/board.c b/ports/nrf/boards/microbit_v2/board.c
index b87b342823..331653173e 100644
--- a/ports/nrf/boards/microbit_v2/board.c
+++ b/ports/nrf/boards/microbit_v2/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/nice_nano/board.c b/ports/nrf/boards/nice_nano/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/nice_nano/board.c
+++ b/ports/nrf/boards/nice_nano/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c
index a4704e26c3..30c066d91e 100644
--- a/ports/nrf/boards/ohs2020_badge/board.c
+++ b/ports/nrf/boards/ohs2020_badge/board.c
@@ -93,13 +93,3 @@ void board_init(void) {
         false, // SH1107_addressing
         50000); // backlight pwm frequency
 }
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
diff --git a/ports/nrf/boards/particle_argon/board.c b/ports/nrf/boards/particle_argon/board.c
index 0aee79f590..7180deb278 100644
--- a/ports/nrf/boards/particle_argon/board.c
+++ b/ports/nrf/boards/particle_argon/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/particle_boron/board.c b/ports/nrf/boards/particle_boron/board.c
index 0aee79f590..7180deb278 100644
--- a/ports/nrf/boards/particle_boron/board.c
+++ b/ports/nrf/boards/particle_boron/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/particle_xenon/board.c b/ports/nrf/boards/particle_xenon/board.c
index 0aee79f590..7180deb278 100644
--- a/ports/nrf/boards/particle_xenon/board.c
+++ b/ports/nrf/boards/particle_xenon/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/pca10056/board.c b/ports/nrf/boards/pca10056/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/pca10056/board.c
+++ b/ports/nrf/boards/pca10056/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/pca10059/board.c b/ports/nrf/boards/pca10059/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/pca10059/board.c
+++ b/ports/nrf/boards/pca10059/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/pca10100/board.c b/ports/nrf/boards/pca10100/board.c
index 0aee79f590..7180deb278 100644
--- a/ports/nrf/boards/pca10100/board.c
+++ b/ports/nrf/boards/pca10100/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/pitaya_go/board.c b/ports/nrf/boards/pitaya_go/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/pitaya_go/board.c
+++ b/ports/nrf/boards/pitaya_go/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/board.c b/ports/nrf/boards/raytac_mdbt50q-db-40/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/raytac_mdbt50q-db-40/board.c
+++ b/ports/nrf/boards/raytac_mdbt50q-db-40/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/board.c b/ports/nrf/boards/raytac_mdbt50q-rx/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/raytac_mdbt50q-rx/board.c
+++ b/ports/nrf/boards/raytac_mdbt50q-rx/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/simmel/board.c b/ports/nrf/boards/simmel/board.c
index 0aee79f590..7180deb278 100644
--- a/ports/nrf/boards/simmel/board.c
+++ b/ports/nrf/boards/simmel/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c b/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c
+++ b/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/board.c b/ports/nrf/boards/sparkfun_nrf52840_mini/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/sparkfun_nrf52840_mini/board.c
+++ b/ports/nrf/boards/sparkfun_nrf52840_mini/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/board.c b/ports/nrf/boards/ssci_isp1807_dev_board/board.c
index 8d8e531d47..c8bd7e0b35 100644
--- a/ports/nrf/boards/ssci_isp1807_dev_board/board.c
+++ b/ports/nrf/boards/ssci_isp1807_dev_board/board.c
@@ -28,16 +28,4 @@
 #include "nrf.h"
 #include "nrf_rtc.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/board.c b/ports/nrf/boards/ssci_isp1807_micro_board/board.c
index 8d8e531d47..c8bd7e0b35 100644
--- a/ports/nrf/boards/ssci_isp1807_micro_board/board.c
+++ b/ports/nrf/boards/ssci_isp1807_micro_board/board.c
@@ -28,16 +28,4 @@
 #include "nrf.h"
 #include "nrf_rtc.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/teknikio_bluebird/board.c b/ports/nrf/boards/teknikio_bluebird/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/teknikio_bluebird/board.c
+++ b/ports/nrf/boards/teknikio_bluebird/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c b/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c
+++ b/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/warmbit_bluepixel/board.c b/ports/nrf/boards/warmbit_bluepixel/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/nrf/boards/warmbit_bluepixel/board.c
+++ b/ports/nrf/boards/warmbit_bluepixel/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 0d1f71e886..0ed1ecd547 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -404,9 +404,3 @@ void HardFault_Handler(void) {
         asm ("nop;");
     }
 }
-
-#if CIRCUITPY_ALARM
-// in case boards/xxx/board.c does not provide board_deinit()
-MP_WEAK void board_deinit(void) {
-}
-#endif
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_kb2040/board.c b/ports/raspberrypi/boards/adafruit_kb2040/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/adafruit_kb2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_kb2040/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
index 49ace5e72a..b5cef1639d 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -106,14 +106,9 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO19, 12);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
index eac54ce460..c94078ae60 100644
--- a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
+++ b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
@@ -29,15 +29,4 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
+++ b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/bwshockley_figpi/board.c b/ports/raspberrypi/boards/bwshockley_figpi/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/board.c
+++ b/ports/raspberrypi/boards/bwshockley_figpi/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/board.c b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/board.c
+++ b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/board.c b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c
index e8208ee5d3..b66ea0e27f 100644
--- a/ports/raspberrypi/boards/challenger_rp2040_lora/board.c
+++ b/ports/raspberrypi/boards/challenger_rp2040_lora/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_lte/board.c b/ports/raspberrypi/boards/challenger_rp2040_lte/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/challenger_rp2040_lte/board.c
+++ b/ports/raspberrypi/boards/challenger_rp2040_lte/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c b/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
index e8208ee5d3..b66ea0e27f 100644
--- a/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
+++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c b/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c
+++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c
index b583e7bf11..22f2970c9e 100644
--- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c
+++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
index b583e7bf11..22f2970c9e 100644
--- a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
+++ b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/board.c b/ports/raspberrypi/boards/elecfreaks_picoed/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/elecfreaks_picoed/board.c
+++ b/ports/raspberrypi/boards/elecfreaks_picoed/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/electrolama_minik/board.c b/ports/raspberrypi/boards/electrolama_minik/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/electrolama_minik/board.c
+++ b/ports/raspberrypi/boards/electrolama_minik/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
index 831bf96cdf..1c16e2fc4f 100644
--- a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
@@ -30,17 +30,9 @@
 #include "supervisor/shared/board.h"
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO15, 9);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
index e4e5a8bc57..4785f742ec 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
@@ -29,17 +29,9 @@
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO29, 62);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
index e4e5a8bc57..4785f742ec 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
@@ -29,17 +29,9 @@
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO29, 62);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c
index e4e5a8bc57..4785f742ec 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c
@@ -29,17 +29,9 @@
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO29, 62);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
index e4e5a8bc57..4785f742ec 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
@@ -29,17 +29,9 @@
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO29, 62);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/melopero_shake_rp2040/board.c b/ports/raspberrypi/boards/melopero_shake_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/melopero_shake_rp2040/board.c
+++ b/ports/raspberrypi/boards/melopero_shake_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/odt_bread_2040/board.c b/ports/raspberrypi/boards/odt_bread_2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/odt_bread_2040/board.c
+++ b/ports/raspberrypi/boards/odt_bread_2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/odt_cast_away_rp2040/board.c b/ports/raspberrypi/boards/odt_cast_away_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/odt_cast_away_rp2040/board.c
+++ b/ports/raspberrypi/boards/odt_cast_away_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
index 666bb5f62f..48ae66e7cb 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -320,13 +320,6 @@ void board_init(void) {
         false);  // two_byte_sequence_length
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
 void board_deinit(void) {
     displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
     if (display->base.type == &displayio_epaperdisplay_type) {
@@ -338,3 +331,5 @@ void board_deinit(void) {
     }
     common_hal_displayio_release_displays();
 }
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_interstate75/board.c b/ports/raspberrypi/boards/pimoroni_interstate75/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_interstate75/board.c
+++ b/ports/raspberrypi/boards/pimoroni_interstate75/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/board.c b/ports/raspberrypi/boards/pimoroni_motor2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_motor2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_motor2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/board.c b/ports/raspberrypi/boards/pimoroni_pga2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_pga2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_pga2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
index ebfa38446a..600089f129 100644
--- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -111,12 +111,4 @@ void board_init(void) {
         50000); // backlight pwm frequency
 }
 
-void board_deinit(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040/board.c b/ports/raspberrypi/boards/pimoroni_plasma2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_plasma2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/board.c b/ports/raspberrypi/boards/pimoroni_servo2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_servo2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_servo2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040/board.c b/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/board.c b/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/board.c b/ports/raspberrypi/boards/raspberry_pi_pico/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/board.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/seeeduino_xiao_rp2040/board.c b/ports/raspberrypi/boards/seeeduino_xiao_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/seeeduino_xiao_rp2040/board.c
+++ b/ports/raspberrypi/boards/seeeduino_xiao_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c b/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c
+++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c b/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
+++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/solderparty_rp2040_stamp/board.c b/ports/raspberrypi/boards/solderparty_rp2040_stamp/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/solderparty_rp2040_stamp/board.c
+++ b/ports/raspberrypi/boards/solderparty_rp2040_stamp/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
index eac54ce460..331653173e 100644
--- a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
@@ -26,18 +26,4 @@
 
 #include "supervisor/board.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
+++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_zero/board.c b/ports/raspberrypi/boards/waveshare_rp2040_zero/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/waveshare_rp2040_zero/board.c
+++ b/ports/raspberrypi/boards/waveshare_rp2040_zero/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/weact_studio_pico/board.c b/ports/raspberrypi/boards/weact_studio_pico/board.c
index e992ec063c..76973aee30 100644
--- a/ports/raspberrypi/boards/weact_studio_pico/board.c
+++ b/ports/raspberrypi/boards/weact_studio_pico/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c
+++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
index de6e424ed9..331653173e 100644
--- a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
+++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
index 635e767a8f..aa189002ba 100644
--- a/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
@@ -29,17 +29,9 @@
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO25, 62);
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/espruino_pico/board.c b/ports/stm/boards/espruino_pico/board.c
index 4286717446..fb1ce4fb83 100644
--- a/ports/stm/boards/espruino_pico/board.c
+++ b/ports/stm/boards/espruino_pico/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/espruino_wifi/board.c b/ports/stm/boards/espruino_wifi/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/espruino_wifi/board.c
+++ b/ports/stm/boards/espruino_wifi/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/feather_stm32f405_express/board.c b/ports/stm/boards/feather_stm32f405_express/board.c
index 4286717446..fb1ce4fb83 100644
--- a/ports/stm/boards/feather_stm32f405_express/board.c
+++ b/ports/stm/boards/feather_stm32f405_express/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index 5c959b4fad..e4d362bbfa 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -119,13 +119,4 @@ void board_init(void) {
     never_reset_pin_number(pin_PB08.port, pin_PB08.number);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/nucleo_f746zg/board.c b/ports/stm/boards/nucleo_f746zg/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/nucleo_f746zg/board.c
+++ b/ports/stm/boards/nucleo_f746zg/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/nucleo_f767zi/board.c b/ports/stm/boards/nucleo_f767zi/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/nucleo_f767zi/board.c
+++ b/ports/stm/boards/nucleo_f767zi/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/nucleo_h743zi_2/board.c b/ports/stm/boards/nucleo_h743zi_2/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/nucleo_h743zi_2/board.c
+++ b/ports/stm/boards/nucleo_h743zi_2/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/openmv_h7/board.c b/ports/stm/boards/openmv_h7/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/openmv_h7/board.c
+++ b/ports/stm/boards/openmv_h7/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/pyb_nano_v2/board.c b/ports/stm/boards/pyb_nano_v2/board.c
index 4286717446..fb1ce4fb83 100644
--- a/ports/stm/boards/pyb_nano_v2/board.c
+++ b/ports/stm/boards/pyb_nano_v2/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/pyboard_v11/board.c b/ports/stm/boards/pyboard_v11/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/pyboard_v11/board.c
+++ b/ports/stm/boards/pyboard_v11/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/sparkfun_stm32f405_micromod/board.c b/ports/stm/boards/sparkfun_stm32f405_micromod/board.c
index 4286717446..f081e7fa90 100644
--- a/ports/stm/boards/sparkfun_stm32f405_micromod/board.c
+++ b/ports/stm/boards/sparkfun_stm32f405_micromod/board.c
@@ -27,16 +27,4 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f411ce_blackpill/board.c b/ports/stm/boards/stm32f411ce_blackpill/board.c
index 4286717446..fb1ce4fb83 100644
--- a/ports/stm/boards/stm32f411ce_blackpill/board.c
+++ b/ports/stm/boards/stm32f411ce_blackpill/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f411ce_blackpill_with_flash/board.c b/ports/stm/boards/stm32f411ce_blackpill_with_flash/board.c
index 4286717446..fb1ce4fb83 100644
--- a/ports/stm/boards/stm32f411ce_blackpill_with_flash/board.c
+++ b/ports/stm/boards/stm32f411ce_blackpill_with_flash/board.c
@@ -25,18 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f411ve_discovery/board.c b/ports/stm/boards/stm32f411ve_discovery/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/stm32f411ve_discovery/board.c
+++ b/ports/stm/boards/stm32f411ve_discovery/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f412zg_discovery/board.c b/ports/stm/boards/stm32f412zg_discovery/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/stm32f412zg_discovery/board.c
+++ b/ports/stm/boards/stm32f412zg_discovery/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f4_discovery/board.c b/ports/stm/boards/stm32f4_discovery/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/stm32f4_discovery/board.c
+++ b/ports/stm/boards/stm32f4_discovery/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/stm32f746g_discovery/board.c b/ports/stm/boards/stm32f746g_discovery/board.c
index 8f35532627..56c90bd8c6 100644
--- a/ports/stm/boards/stm32f746g_discovery/board.c
+++ b/ports/stm/boards/stm32f746g_discovery/board.c
@@ -48,13 +48,4 @@ void board_init(void) {
     never_reset_pin_number(10, 3);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/swan_r5/board.c b/ports/stm/boards/swan_r5/board.c
index 4f29be35f8..602fd87537 100644
--- a/ports/stm/boards/swan_r5/board.c
+++ b/ports/stm/boards/swan_r5/board.c
@@ -88,13 +88,8 @@ void board_init(void) {
     HAL_GPIO_WritePin(GPIOE, GPIO_PIN_2, GPIO_PIN_RESET);
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
 void reset_board(void) {
     initialize_discharge_pin();
 }
 
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/thunderpack_v11/board.c b/ports/stm/boards/thunderpack_v11/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/thunderpack_v11/board.c
+++ b/ports/stm/boards/thunderpack_v11/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/boards/thunderpack_v12/board.c b/ports/stm/boards/thunderpack_v12/board.c
index b4070e72dc..fb1ce4fb83 100644
--- a/ports/stm/boards/thunderpack_v12/board.c
+++ b/ports/stm/boards/thunderpack_v12/board.c
@@ -26,16 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/supervisor/shared/board.c b/supervisor/shared/board.c
index 427c179242..2317540c1a 100644
--- a/supervisor/shared/board.c
+++ b/supervisor/shared/board.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "supervisor/board.h"
 #include "supervisor/shared/board.h"
 
 #if CIRCUITPY_DIGITALIO && CIRCUITPY_NEOPIXEL_WRITE
@@ -46,3 +47,20 @@ void board_reset_user_neopixels(const mcu_pin_obj_t *pin, size_t count) {
 }
 
 #endif
+
+// Do-nothing so not all boards need to provide this function.
+MP_WEAK bool board_requests_safe_mode(void) {
+    return false;
+}
+
+// Do-nothing so not all boards need to provide this function.
+MP_WEAK void board_init(void) {
+}
+
+// Do-nothing so not all boards need to provide this function.
+MP_WEAK void board_deinit(void) {
+}
+
+// Do-nothing so not all boards need to provide this function.
+MP_WEAK void reset_board(void) {
+}

From 2fbb3090e2ee380e89ad97d6e633e50eeb7db0a2 Mon Sep 17 00:00:00 2001
From: Kong Wai Weng 
Date: Fri, 9 Sep 2022 16:50:14 +0800
Subject: [PATCH 0942/2403] Changed the pins assignment.

---
 .../cytron_maker_feather_aiot_s3/board.c      |  4 +-
 .../mpconfigboard.h                           | 16 +++---
 .../cytron_maker_feather_aiot_s3/pins.c       | 55 +++++++++----------
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index d066ea8686..7ddb33fa45 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -37,8 +37,8 @@ void board_init(void) {
 
 void reset_board(void) {
     // Turn on VP by default.
-    gpio_set_direction(38, GPIO_MODE_DEF_OUTPUT);
-    gpio_set_level(38, true);
+    gpio_set_direction(11, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(11, true);
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
index 28ffad1f37..14512efd9d 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 Wai Weng for Cytron Technologies
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,16 +31,16 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO46)
 
-#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
 
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO6)
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO10)
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO5)
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO17)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO8)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO18)
 
-#define DEFAULT_UART_BUS_RX (&pin_GPIO11)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO4)
+#define DEFAULT_UART_BUS_RX (&pin_GPIO16)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO15)
 
-#define DOUBLE_TAP_PIN (&pin_GPIO17)
+#define DOUBLE_TAP_PIN (&pin_GPIO1)
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
index 92e8e7cfc1..b8ed298596 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
@@ -6,82 +6,77 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
 
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
 
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
 
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
 
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
 
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
 
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
 
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_VP_EN), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
 
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
 
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_VIN), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_VBATT), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
 
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
 
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
 
-    { MP_ROM_QSTR(MP_QSTR_VIN), MP_ROM_PTR(&pin_GPIO18) },
-    { MP_ROM_QSTR(MP_QSTR_VBATT), MP_ROM_PTR(&pin_GPIO18) },
-    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
 
     { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
-    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
-    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
-    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
-
-    { MP_ROM_QSTR(MP_QSTR_VP_EN), MP_ROM_PTR(&pin_GPIO38) },
     { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO39) },
     { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
-
     { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) },
 
-    { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) },
 
-    { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) },
-
-    { MP_ROM_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
 
     { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO46) },
 
+    { MP_ROM_QSTR(MP_QSTR_D47), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_D48), MP_ROM_PTR(&pin_GPIO48) },
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },

From e9b9cac2321654a8b62c1e6e798eee11b6d3c1b8 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Fri, 9 Sep 2022 15:11:35 -0700
Subject: [PATCH 0943/2403] Prevent folder from trying to move inside itself

---
 supervisor/shared/web_workflow/web_workflow.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index e09c87f624..3f2c924923 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1080,7 +1080,19 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     destination[destinationlen - 1] = '\0';
                 }
 
-                FRESULT result = f_rename(fs, path, destination);
+                // Check to see if we're moving a directory into itself.
+                FILINFO file;
+                FRESULT result = f_stat(fs, path, &file);
+                if (result == FR_OK) {
+                    if ((file.fattrib & AM_DIR) != 0 &&
+                        strlen(destination) > strlen(path) &&
+                        destination[strlen(path)] == '/' &&
+                        strncmp(path, destination, strlen(path)) == 0) {
+                        result = FR_NO_PATH;
+                    } else {
+                        result = f_rename(fs, path, destination);
+                    }
+                }
                 #if CIRCUITPY_USB_MSC
                 usb_msc_unlock();
                 #endif

From c5f014f2a650d1a1953fe86b92cdebed0b2e037b Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 9 Sep 2022 15:40:02 -0700
Subject: [PATCH 0944/2403] web workflow file system page

Fixes #6884
---
 supervisor/shared/web_workflow/static/directory.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index baa5d9e9af..a631fb5c38 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -9,7 +9,7 @@
 
 
     
     
    
-    
+    
     
     

From b50bafa22c337c3962791b0f1940270f5e73b7fc Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:31:11 -0700
Subject: [PATCH 0945/2403] Update
 supervisor/shared/web_workflow/static/directory.html

---
 supervisor/shared/web_workflow/static/directory.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index a631fb5c38..6fdbaf0bdf 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -9,7 +9,7 @@
 
     
    
-    
+    
    
         
    TypeSizePathModified
    
 
     
     
     
    

From c271a421bfef62cd54e034cb16ead574e00e52e9 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:34:11 -0700
Subject: [PATCH 0946/2403] Update
 supervisor/shared/web_workflow/static/directory.html

---
 supervisor/shared/web_workflow/static/directory.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
index 6fdbaf0bdf..cf9ff507f9 100644
--- a/supervisor/shared/web_workflow/static/directory.html
+++ b/supervisor/shared/web_workflow/static/directory.html
@@ -9,7 +9,7 @@
 
     
    
-    
+    
    
         
    TypeSizePathModified
    
 
     
     
     
    

From 8cd4b9fc0431716b83fc78ba39efab9c5d18d3bf Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 10 Sep 2022 12:34:25 +0530
Subject: [PATCH 0947/2403] fix espressif run modes

---
 ports/espressif/common-hal/microcontroller/__init__.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c
index 1014ce9532..68479dc46f 100644
--- a/ports/espressif/common-hal/microcontroller/__init__.c
+++ b/ports/espressif/common-hal/microcontroller/__init__.c
@@ -97,12 +97,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
             #endif
             break;
         case RUNMODE_NORMAL:
-            #if defined(CONFIG_IDF_TARGET_ESP32)
-            safe_mode_on_next_reset(NO_SAFE_MODE);
-            #else
             // revert back to normal boot
+            #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
             REG_WRITE(RTC_RESET_CAUSE_REG, 0);  // reset uf2
+            #endif
             REG_WRITE(RTC_CNTL_STORE0_REG, 0);  // reset safe mode
+            #if !defined(CONFIG_IDF_TARGET_ESP32)
             REG_WRITE(RTC_CNTL_OPTION1_REG, 0); // reset bootloader
             #endif
             break;
@@ -112,10 +112,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
             break;
         case RUNMODE_BOOTLOADER:
             // DFU download
-            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
+            #if defined(CONFIG_IDF_TARGET_ESP32)
             mp_arg_error_invalid(MP_QSTR_run_mode);
             #else
+            #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
             chip_usb_set_persist_flags(USBDC_BOOT_DFU);
+            #endif
             REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
             #endif
             break;

From ecb74aa65228019b4bd0dd9d72bc08a1ceff6d46 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:33:29 -0400
Subject: [PATCH 0948/2403] Remove CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/mpconfigport.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/broadcom/mpconfigport.h b/ports/broadcom/mpconfigport.h
index fc3966fc71..e77725cca3 100644
--- a/ports/broadcom/mpconfigport.h
+++ b/ports/broadcom/mpconfigport.h
@@ -60,7 +60,4 @@
 #define MICROPY_PORT_ROOT_POINTERS \
     CIRCUITPY_COMMON_ROOT_POINTERS
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
-
 #endif  // __INCLUDED_MPCONFIGPORT_H

From 0913e3a148cba1a63ca0958d863c901114e5748a Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:34:45 -0400
Subject: [PATCH 0949/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
index a3e318bb13..c6c7cfe22c 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
+++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO12)
+
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

From 7708f19ec82e3c5a99aab8216456f4be33bd358d Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:36:01 -0400
Subject: [PATCH 0950/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
index 9acfb32626..b0ebc091de 100644
--- a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

From a892af8d771150a6c0bf0948ef76fa12e0603871 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:36:41 -0400
Subject: [PATCH 0951/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
index 2980b0f9a5..fa8eb19ab0 100644
--- a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

From 72c479efe690ba547713123719874c187c6e6d2b Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:37:31 -0400
Subject: [PATCH 0952/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
index fa8eb19ab0..521c8fda25 100644
--- a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
@@ -5,5 +5,5 @@
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From fb4062d23fdb771f7a3b2bdf9ca7a8234b021dfc Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:38:16 -0400
Subject: [PATCH 0953/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
index c6c7cfe22c..6d81ddca10 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
+++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
@@ -5,5 +5,5 @@
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO12)
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From 29e0aba72fbb7de82e77200271a8f8b6cb88296e Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:39:03 -0400
Subject: [PATCH 0954/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
index b0ebc091de..832a0b887b 100644
--- a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
@@ -5,5 +5,5 @@
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From 1d03d73c13ab33fdc7a9397fd72455a0b57590f0 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:39:51 -0400
Subject: [PATCH 0955/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h
index 1141520e06..c1566e8fc0 100644
--- a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From 1bdf9fca40e9dafbaf33a07009379459e9207fb3 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:40:31 -0400
Subject: [PATCH 0956/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
index 11011268ae..b5b1d8437f 100644
--- a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
@@ -2,3 +2,6 @@
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From f4eb6185984f5283444b5aae7ba082e083fc7774 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:42:41 -0400
Subject: [PATCH 0957/2403] Define CIRCUITPY_CONSOLE_UART_TX/RX

---
 ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h
index 389868f882..4dc1372ae5 100644
--- a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From 38a0ca324ee2b1ca99831d2d9075d52201c58d5e Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 21:48:10 -0400
Subject: [PATCH 0958/2403] Uses different pins for RX/TX

---
 ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
index 6d81ddca10..12a68201fa 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
+++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
@@ -5,5 +5,5 @@
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO12)
 
-#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO4)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO5)

From 28756936d56729331733a17a2f750969a8713ece Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 23:17:02 -0400
Subject: [PATCH 0959/2403] Add HW_LED_STATUS pin to Zero 2W board

---
 ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
index b5b1d8437f..e65bf5c163 100644
--- a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
+++ b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
@@ -3,5 +3,7 @@
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO29)
+
 #define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
 #define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

From 14b604f48ccc92ae54ff8d61c758911d6a43ef0f Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 10 Sep 2022 23:18:25 -0400
Subject: [PATCH 0960/2403] Add LED pin definition to Zero 2W board

---
 ports/broadcom/boards/raspberrypi_zero2w/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/broadcom/boards/raspberrypi_zero2w/pins.c b/ports/broadcom/boards/raspberrypi_zero2w/pins.c
index bb6632b923..5e12613b3f 100644
--- a/ports/broadcom/boards/raspberrypi_zero2w/pins.c
+++ b/ports/broadcom/boards/raspberrypi_zero2w/pins.c
@@ -55,6 +55,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
     { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},

From 36221bd749da23cf29686c89d879b0618596b881 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sun, 11 Sep 2022 13:31:38 +0530
Subject: [PATCH 0961/2403] update board microdev_micro_c3

---
 .../boards/microdev_micro_c3/mpconfigboard.h  | 35 +++++-----
 .../boards/microdev_micro_c3/mpconfigboard.mk |  2 +-
 .../boards/microdev_micro_c3/sdkconfig        | 65 +++++++++++++++++++
 3 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
index 6e2bf9d7b8..97a18f3235 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
@@ -25,26 +25,31 @@
  */
 
 // Board setup
-#define MICROPY_HW_BOARD_NAME       "MicroDev microC3"
-#define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
+#define MICROPY_HW_BOARD_NAME           "MicroDev microC3"
+#define MICROPY_HW_MCU_NAME             "ESP32-C3FN4"
 
 // Status LEDs
-#define MICROPY_HW_NEOPIXEL         (&pin_GPIO7)
-#define MICROPY_HW_NEOPIXEL_COUNT   (2)
+#define MICROPY_HW_NEOPIXEL             (&pin_GPIO7)
+#define MICROPY_HW_NEOPIXEL_COUNT       (2)
 
-#define MICROPY_HW_LED_STATUS (&pin_GPIO8)
+#define MICROPY_HW_LED_STATUS           (&pin_GPIO8)
 
 // Default bus pins
-#define DEFAULT_I2C_BUS_SCL         (&pin_GPIO4)
-#define DEFAULT_I2C_BUS_SDA         (&pin_GPIO5)
+#define DEFAULT_I2C_BUS_SCL             (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA             (&pin_GPIO5)
 
-#define DEFAULT_SPI_BUS_SCK         (&pin_GPIO1)
-#define DEFAULT_SPI_BUS_MOSI        (&pin_GPIO2)
-#define DEFAULT_SPI_BUS_MISO        (&pin_GPIO3)
+#define DEFAULT_SPI_BUS_SCK             (&pin_GPIO1)
+#define DEFAULT_SPI_BUS_MOSI            (&pin_GPIO2)
+#define DEFAULT_SPI_BUS_MISO            (&pin_GPIO3)
 
-#define DEFAULT_UART_BUS_RX         (&pin_GPIO20)
-#define DEFAULT_UART_BUS_TX         (&pin_GPIO21)
+#define DEFAULT_UART_BUS_RX             (&pin_GPIO20)
+#define DEFAULT_UART_BUS_TX             (&pin_GPIO21)
 
-// Serial over UART
-#define CIRCUITPY_CONSOLE_UART_RX     DEFAULT_UART_BUS_RX
-#define CIRCUITPY_CONSOLE_UART_TX     DEFAULT_UART_BUS_TX
+// For REPL over built-in USB Serial
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG   (1)
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON           (&pin_GPIO9)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
index ce431624ae..646522db8d 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
@@ -5,6 +5,6 @@ IDF_TARGET = esp32c3
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/microdev_micro_c3/sdkconfig b/ports/espressif/boards/microdev_micro_c3/sdkconfig
index f6f038a77c..6674dbfb90 100644
--- a/ports/espressif/boards/microdev_micro_c3/sdkconfig
+++ b/ports/espressif/boards/microdev_micro_c3/sdkconfig
@@ -1,5 +1,70 @@
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
+# Bootloader config
+#
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
+CONFIG_BOOTLOADER_LOG_LEVEL=0
+# end of Bootloader config
+
+#
+# Serial flasher config
+#
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# end of Serial flasher config
+
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
+# end of Partition Table
+
+#
+# Compiler options
+#
+# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
+# end of Compiler options
+
+#
+# Component config
+#
+#
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
+#
+# ESP System Settings
+#
+# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
+# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
+# end of ESP System Settings
+
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="MicroDev-microC3"
 # end of LWIP
+
+#
+# SPI Flash driver
+#
+# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
+# end of SPI Flash driver
+
+# end of Component config
+
+#
+# Deprecated options for backward compatibility
+#
+# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
+CONFIG_LOG_BOOTLOADER_LEVEL=0
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
+# end of Deprecated options for backward compatibility

From 56112e00a104c531ee10c4d94d8d8c7bc4123f8e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 11 Sep 2022 08:09:14 -0500
Subject: [PATCH 0962/2403] Give fontio its own enable

.. the default is intended to be the equivalent of the original,
implementing `DISPLAYIO && TERMINALIO`.

This is a possible alternative to #6889, if I understand the intent.
---
 py/circuitpy_defns.mk             | 3 +++
 py/circuitpy_mpconfig.mk          | 5 +++++
 shared-bindings/fontio/__init__.c | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index a9be64428e..a7b51a879f 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -323,6 +323,9 @@ endif
 ifeq ($(CIRCUITPY_TERMINALIO),1)
 SRC_PATTERNS += terminalio/% fontio/%
 endif
+ifeq ($(CIRCUITPY_FONTIO),1)
+SRC_PATTERNS += fontio/%
+endif
 ifeq ($(CIRCUITPY_TIME),1)
 SRC_PATTERNS += time/%
 endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 90bf0ce9e8..ad41efee6b 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -390,6 +390,11 @@ CFLAGS += -DCIRCUITPY_SYNTHIO=$(CIRCUITPY_SYNTHIO)
 CIRCUITPY_TERMINALIO ?= $(CIRCUITPY_DISPLAYIO)
 CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 
+ifeq ($(CIRCUITPY_DISPLAYIO),1)
+CIRCUITPY_FONTIO ?= $(CIRCUITPY_TERMINALIO)
+endif
+CFLAGS += -DCIRCUITPY_FONTIO=$(CIRCUITPY_FONTIO)
+
 CIRCUITPY_TIME ?= 1
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c
index ea1b8a628b..d4048dbeff 100644
--- a/shared-bindings/fontio/__init__.c
+++ b/shared-bindings/fontio/__init__.c
@@ -57,4 +57,4 @@ const mp_obj_module_t fontio_module = {
     .globals = (mp_obj_dict_t *)&fontio_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_fontio, fontio_module, CIRCUITPY_DISPLAYIO && CIRCUITPY_TERMINALIO);
+MP_REGISTER_MODULE(MP_QSTR_fontio, fontio_module, CIRCUITPY_FONTIO);

From 863a8bce03765ea0fc2a5c7a04fb796531bce5bf Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 11 Sep 2022 20:34:53 -0500
Subject: [PATCH 0963/2403] Fix with PWM for brightness slowing devices down

---
 shared-module/displayio/Display.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 59aa843aca..9fd55fe19d 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -399,7 +399,6 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self
 }
 
 void displayio_display_background(displayio_display_obj_t *self) {
-    common_hal_displayio_display_set_brightness(self, 1.0);
     if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) {
         _refresh_display(self);
     }

From aaa2be120071e2b1bba03147691da47d2af1ddae Mon Sep 17 00:00:00 2001
From: Kong Wai Weng 
Date: Mon, 12 Sep 2022 18:19:33 +0800
Subject: [PATCH 0964/2403] Set the default pin state for GPIOs to pull down.

---
 .../cytron_maker_feather_aiot_s3/board.c      | 41 +++++++++++++++++++
 .../mpconfigboard.h                           |  1 +
 2 files changed, 42 insertions(+)

diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index 7ddb33fa45..67f2c8d17a 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -35,6 +35,47 @@ void board_init(void) {
     reset_board();
 }
 
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // For GPIOs used in Maker Feather AIoT S3, set the default state to pull down
+    // as most of them are connected to active high LED.
+    switch (pin_number) {
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+        case 12:
+        case 14:
+        case 15:
+        case 16:
+        case 17:
+        case 18:
+        case 21:
+        case 38:
+        case 39:
+        case 40:
+        case 41:
+        case 42:
+        case 47:
+        case 48:
+            gpio_reset_pin(pin_number);
+            gpio_pullup_dis(pin_number);
+            gpio_pulldown_en(pin_number);
+            return true;
+            
+        // Do not pull up/down as this is the battery voltage monitoring pin.
+        case 13:
+            gpio_reset_pin(pin_number);
+            gpio_pullup_dis(pin_number);
+            gpio_pulldown_dis(pin_number);
+            return true;
+    }
+    
+    return false;
+}
+
 void reset_board(void) {
     // Turn on VP by default.
     gpio_set_direction(11, GPIO_MODE_DEF_OUTPUT);
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
index 14512efd9d..39c1edc5bd 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.h
@@ -30,6 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S3"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO46)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO11)
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO2)
 

From 0ae015e4d9da9a938b5c960f02475b553431ca91 Mon Sep 17 00:00:00 2001
From: Kong Wai Weng 
Date: Mon, 12 Sep 2022 18:25:27 +0800
Subject: [PATCH 0965/2403] Removed whitespaces.

---
 ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index 67f2c8d17a..f86996eb12 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -64,7 +64,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
             gpio_pullup_dis(pin_number);
             gpio_pulldown_en(pin_number);
             return true;
-            
+
         // Do not pull up/down as this is the battery voltage monitoring pin.
         case 13:
             gpio_reset_pin(pin_number);
@@ -72,7 +72,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
             gpio_pulldown_dis(pin_number);
             return true;
     }
-    
+
     return false;
 }
 

From c157f1cb3973f11995b30a424f2459b1a089e7a6 Mon Sep 17 00:00:00 2001
From: Kong Wai Weng 
Date: Mon, 12 Sep 2022 18:56:15 +0800
Subject: [PATCH 0966/2403] Cast pin_number to int8_t so that it can be used
 with switch-case.

---
 ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index f86996eb12..1f9ef3c4e7 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -38,7 +38,7 @@ void board_init(void) {
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // For GPIOs used in Maker Feather AIoT S3, set the default state to pull down
     // as most of them are connected to active high LED.
-    switch (pin_number) {
+    switch ((int8_t)pin_number) {
         case 4:
         case 5:
         case 6:

From d0d10179c28ec1287fa6fd31b6dd88dc1e3b9c05 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 12 Sep 2022 17:03:45 -0400
Subject: [PATCH 0967/2403] fix logic in pwmout_reset()

---
 .../espressif/boards/adafruit_feather_esp32s3_tft/board.c | 8 ++------
 ports/espressif/common-hal/pwmio/PWMOut.c                 | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
index 3ba482f207..94d6b4a18d 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -71,12 +71,6 @@ uint8_t display_init_sequence[] = {
 
 
 void board_init(void) {
-    // THIS SHOULD BE HANDLED BY espressif_board_reset_pin_number(), but it is not working.
-    // TEMPORARY FIX UNTIL IT'S DIAGNOSED.
-    common_hal_never_reset_pin(&pin_GPIO21);
-    gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-    gpio_set_level(21, true);
-
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
@@ -95,7 +89,9 @@ void board_init(void) {
     display->base.type = &displayio_display_type;
 
     // workaround as board_init() is called before reset_port() in main.c
+    #if CIRCUITPY_PWMIO
     pwmout_reset();
+    #endif
 
     common_hal_displayio_display_construct(
         display,
diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c
index b96c154be6..d83ce6590a 100644
--- a/ports/espressif/common-hal/pwmio/PWMOut.c
+++ b/ports/espressif/common-hal/pwmio/PWMOut.c
@@ -55,18 +55,14 @@ STATIC uint32_t calculate_duty_cycle(uint32_t frequency) {
 
 void pwmout_reset(void) {
     for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
-        if (reserved_channels[i] != INDEX_EMPTY) {
+        if (reserved_channels[i] != INDEX_EMPTY && !never_reset_chan[i]) {
             ledc_stop(LEDC_LOW_SPEED_MODE, i, 0);
-        }
-        if (!never_reset_chan[i]) {
             reserved_channels[i] = INDEX_EMPTY;
         }
     }
     for (size_t i = 0; i < LEDC_TIMER_MAX; i++) {
-        if (reserved_timer_freq[i]) {
+        if (reserved_timer_freq[i] && !never_reset_tim[i]) {
             ledc_timer_rst(LEDC_LOW_SPEED_MODE, i);
-        }
-        if (!never_reset_tim[i]) {
             reserved_timer_freq[i] = 0;
             varfreq_timers[i] = false;
         }

From 5a1223fea8f165114da877337ec9aa6fb69bfa95 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Mon, 12 Sep 2022 20:07:37 -0400
Subject: [PATCH 0968/2403] Add info for rotaryio

---
 shared-bindings/rotaryio/__init__.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-bindings/rotaryio/__init__.c b/shared-bindings/rotaryio/__init__.c
index 43a884e9a1..fbfa9afaa2 100644
--- a/shared-bindings/rotaryio/__init__.c
+++ b/shared-bindings/rotaryio/__init__.c
@@ -39,6 +39,9 @@
 //| `Wikipedia's Rotary Encoder page `_ for more
 //| background.
 //|
+//| For more information on working with rotary encoders using this library, see
+//| `this Learn Guide `_.
+//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See

From fcdb988fa11443199807a913da1e692bbd2ba737 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Mon, 12 Sep 2022 20:36:51 -0400
Subject: [PATCH 0969/2403] Add information for audioio

---
 shared-bindings/audioio/__init__.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c
index 9f8411f484..f03ffd612a 100644
--- a/shared-bindings/audioio/__init__.c
+++ b/shared-bindings/audioio/__init__.c
@@ -42,6 +42,10 @@
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info.
 //|
+//| For more information on working with this module, refer to the
+//| `CircuitPython Essentials Learn Guide
+//| `_.
+//|
 //| Since CircuitPython 5, `RawSample` and `WaveFile` are moved
 //| to :mod:`audiocore`, and `Mixer` is moved to :mod:`audiomixer`.
 //|

From a7c7d1428a4e57e36de4d6b0a6d653073cbaa16a Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Mon, 12 Sep 2022 20:46:29 -0400
Subject: [PATCH 0970/2403] Add information for countio

---
 shared-bindings/countio/__init__.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/countio/__init__.c b/shared-bindings/countio/__init__.c
index d72ed9fd25..307966c202 100644
--- a/shared-bindings/countio/__init__.c
+++ b/shared-bindings/countio/__init__.c
@@ -13,6 +13,10 @@
 //|
 //| The `countio` module contains logic to read and count edge transistions
 //|
+//| For more information on the applications of counting edges, see
+//| `this Learn Guide on sequential circuits
+//| `_.
+//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See

From b90a3160d4a872a003c98515835830064208730d Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Mon, 12 Sep 2022 21:09:07 -0400
Subject: [PATCH 0971/2403] Add information on canio

---
 shared-bindings/canio/__init__.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
index ef1b90df97..ecef7ebde6 100644
--- a/shared-bindings/canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -54,6 +54,9 @@
 //| Other implementations of the CAN device may exist (for instance, attached
 //| via an SPI bus).  If so their constructor arguments may differ, but
 //| otherwise we encourage implementors to follow the API that the core uses.
+//|
+//| For more information on working with this module, refer to
+//| `this Learn Guide on using it `_.
 //| """
 //|
 

From 129e38096ecfe82173b049d68b72cbba291f2460 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Mon, 12 Sep 2022 21:15:07 -0400
Subject: [PATCH 0972/2403] Add information to aesio

---
 shared-bindings/aesio/__init__.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/aesio/__init__.c b/shared-bindings/aesio/__init__.c
index 716d20393e..f3e1d7dd17 100644
--- a/shared-bindings/aesio/__init__.c
+++ b/shared-bindings/aesio/__init__.c
@@ -34,7 +34,11 @@
 //| """AES encryption routines
 //|
 //| The `AES` module contains classes used to implement encryption
-//| and decryption. It aims to be low overhead in terms of memory."""
+//| and decryption. It aims to be low overhead in terms of memory.
+//|
+//| For more information on AES, refer to `the Wikipedia entry
+//| `_.
+//| """
 
 
 STATIC const mp_obj_tuple_t mp_aes_key_size_obj = {

From 14adfb16dd38ad81f4420bfe927258eafaf453be Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 12 Sep 2022 21:32:09 -0400
Subject: [PATCH 0973/2403] avoid pwmout_reset() workaround by reordering in
 main(); remove unnecessary never-resets

---
 main.c                                                     | 6 +++---
 ports/espressif/boards/adafruit_esp32s2_camera/board.c     | 3 ---
 .../espressif/boards/adafruit_feather_esp32s3_tft/board.c  | 7 -------
 ports/espressif/boards/adafruit_funhouse/board.c           | 3 ---
 ports/espressif/boards/espressif_esp32s3_eye/board.c       | 6 ------
 ports/espressif/boards/hexky_s2/board.c                    | 5 -----
 ports/espressif/boards/hiibot_iots2/board.c                | 5 -----
 ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c    | 5 -----
 ports/espressif/boards/morpheans_morphesp-240/board.c      | 3 ---
 ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c | 5 -----
 ports/espressif/esp32-camera                               | 2 +-
 11 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/main.c b/main.c
index 30c28babf9..04e8777b9a 100644
--- a/main.c
+++ b/main.c
@@ -967,15 +967,15 @@ int __attribute__((used)) main(void) {
         safe_mode = NO_CIRCUITPY;
     }
 
-    // displays init after filesystem, since they could share the flash SPI
-    board_init();
-
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     // Port-independent devices, like CIRCUITPY_BLEIO_HCI.
     reset_devices();
     reset_board();
 
+    // displays init after filesystem, since they could share the flash SPI
+    board_init();
+
     // This is first time we are running CircuitPython after a reset or power-up.
     supervisor_set_run_reason(RUN_REASON_STARTUP);
 
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
index dc0a9711ee..280f2b14b8 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
@@ -63,9 +63,6 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
index 94d6b4a18d..7e28aafb8e 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -88,11 +88,6 @@ void board_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    #if CIRCUITPY_PWMIO
-    pwmout_reset();
-    #endif
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -123,8 +118,6 @@ void board_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c
index 40f7194690..d89a4db268 100644
--- a/ports/espressif/boards/adafruit_funhouse/board.c
+++ b/ports/espressif/boards/adafruit_funhouse/board.c
@@ -71,9 +71,6 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index bdc87ad2a1..be129c6a30 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -87,9 +87,6 @@ void board_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -120,9 +117,6 @@ void board_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO48); // backlight pin
-    // Debug UART
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/hexky_s2/board.c b/ports/espressif/boards/hexky_s2/board.c
index 9c8298652d..e4f8f48855 100644
--- a/ports/espressif/boards/hexky_s2/board.c
+++ b/ports/espressif/boards/hexky_s2/board.c
@@ -88,9 +88,6 @@ void board_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -121,8 +118,6 @@ void board_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c
index 287d1ae9d1..c9cf7afb92 100644
--- a/ports/espressif/boards/hiibot_iots2/board.c
+++ b/ports/espressif/boards/hiibot_iots2/board.c
@@ -93,9 +93,6 @@ static void display_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -126,8 +123,6 @@ static void display_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO38); // backlight pin
 }
 
 void board_init(void) {
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
index 8df93b3374..6c0a54c99c 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
@@ -93,9 +93,6 @@ static void display_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -126,8 +123,6 @@ static void display_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO33); // backlight pin
 }
 
 void board_init(void) {
diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c
index fd2f225c11..30e0a04aad 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/board.c
+++ b/ports/espressif/boards/morpheans_morphesp-240/board.c
@@ -172,9 +172,6 @@ void board_init(void) {
         0               // phase
         );
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
index 6e1d92d05b..070e3418da 100644
--- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -92,9 +92,6 @@ static void display_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -125,8 +122,6 @@ static void display_init(void) {
         false,          // SH1107_addressing
         50000           // backlight pwm frequency
         );
-
-    common_hal_never_reset_pin(&pin_GPIO45); // backlight pin
 }
 
 
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 28804391c0..7613e49686 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 28804391c002f6a3ea5ce6a55aee3b191be3ecde
+Subproject commit 7613e4968664c1f8f6788b9ec114373d34acbb3d

From 9e13e8e991f0c1731e041a2824ef6fc3701367e0 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams 
Date: Tue, 13 Sep 2022 08:42:35 -0700
Subject: [PATCH 0974/2403] Moved folder moving inside itself checks into
 f_rename

---
 extmod/vfs_fat.c                              | 19 +++----------------
 lib/oofatfs/ff.c                              | 15 +++++++++++++++
 supervisor/shared/web_workflow/web_workflow.c | 14 +-------------
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index d19a53a9ef..64a3ce05f6 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -225,22 +225,7 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     const char *old_path = mp_obj_str_get_str(path_in);
     const char *new_path = mp_obj_str_get_str(path_out);
 
-    // Check to see if we're moving a directory into itself. This occurs when we're moving a
-    // directory where the old path is a prefix of the new and the next character is a "/" and thus
-    // preserves the original directory name.
-    FILINFO fno;
-    FRESULT res = f_stat(&self->fatfs, old_path, &fno);
-    if (res != FR_OK) {
-        mp_raise_OSError_fresult(res);
-    }
-    if ((fno.fattrib & AM_DIR) != 0 &&
-        strlen(new_path) > strlen(old_path) &&
-        new_path[strlen(old_path)] == '/' &&
-        strncmp(old_path, new_path, strlen(old_path)) == 0) {
-        mp_raise_OSError(MP_EINVAL);
-    }
-
-    res = f_rename(&self->fatfs, old_path, new_path);
+    FRESULT res = f_rename(&self->fatfs, old_path, new_path);
     if (res == FR_EXIST) {
         // if new_path exists then try removing it (but only if it's a file)
         fat_vfs_remove_internal(vfs_in, path_out, 0); // 0 == file attribute
@@ -249,6 +234,8 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     }
     if (res == FR_OK) {
         return mp_const_none;
+    } else if (res == FR_NO_PATH) {
+        mp_raise_OSError(MP_EINVAL);
     } else {
         mp_raise_OSError_fresult(res);
     }
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index 6188aead2d..d6fc7ebcc2 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -4816,6 +4816,21 @@ FRESULT f_rename (
     DEF_NAMBUF
 
 
+    // Check to see if we're moving a directory into itself. This occurs when we're moving a
+    // directory where the old path is a prefix of the new and the next character is a "/" and thus
+    // preserves the original directory name.
+    FILINFO fno;
+    res = f_stat(fs, path_old, &fno);
+    if (res != FR_OK) {
+        return res;
+    }
+    if ((fno.fattrib & AM_DIR) != 0 &&
+        strlen(path_new) > strlen(path_old) &&
+        path_new[strlen(path_old)] == '/' &&
+        strncmp(path_old, path_new, strlen(path_old)) == 0) {
+        return FR_NO_PATH;
+    }
+
     res = find_volume(fs, FA_WRITE);    /* Get logical drive of the old object */
     if (res == FR_OK) {
         djo.obj.fs = fs;
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 3f2c924923..e09c87f624 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1080,19 +1080,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     destination[destinationlen - 1] = '\0';
                 }
 
-                // Check to see if we're moving a directory into itself.
-                FILINFO file;
-                FRESULT result = f_stat(fs, path, &file);
-                if (result == FR_OK) {
-                    if ((file.fattrib & AM_DIR) != 0 &&
-                        strlen(destination) > strlen(path) &&
-                        destination[strlen(path)] == '/' &&
-                        strncmp(path, destination, strlen(path)) == 0) {
-                        result = FR_NO_PATH;
-                    } else {
-                        result = f_rename(fs, path, destination);
-                    }
-                }
+                FRESULT result = f_rename(fs, path, destination);
                 #if CIRCUITPY_USB_MSC
                 usb_msc_unlock();
                 #endif

From 2b25a5d574b809282258840769a896e3707b43d1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 13 Sep 2022 13:16:37 -0400
Subject: [PATCH 0975/2403] update esp32-camera

---
 ports/espressif/esp32-camera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 7613e49686..54c3f61c86 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 7613e4968664c1f8f6788b9ec114373d34acbb3d
+Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2

From 6f4cc611ed1d0456d49908c3fedb00c3821712d9 Mon Sep 17 00:00:00 2001
From: Wind-stormger 
Date: Wed, 14 Sep 2022 10:21:23 +0800
Subject: [PATCH 0976/2403] Add BananaPi BPI-Bit-S2 .

Adds support for the BananaPi BPI-Bit-S2 Boards.
Based on esp32s2 chip.
With 25 ws2812 LEDs, 1 buzzer, 2 photosensitive sensors, 1 thermosensitive sensor,
2 buttons on the front, 1 reset button and 1 boot button on the back.
---
 ports/espressif/boards/bpi_bit_s2/board.c     |  38 +++++++
 .../boards/bpi_bit_s2/mpconfigboard.h         |  42 +++++++
 .../boards/bpi_bit_s2/mpconfigboard.mk        |  20 ++++
 ports/espressif/boards/bpi_bit_s2/pins.c      | 105 ++++++++++++++++++
 ports/espressif/boards/bpi_bit_s2/sdkconfig   |  37 ++++++
 5 files changed, 242 insertions(+)
 create mode 100644 ports/espressif/boards/bpi_bit_s2/board.c
 create mode 100644 ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
 create mode 100644 ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/bpi_bit_s2/pins.c
 create mode 100644 ports/espressif/boards/bpi_bit_s2/sdkconfig

diff --git a/ports/espressif/boards/bpi_bit_s2/board.c b/ports/espressif/boards/bpi_bit_s2/board.c
new file mode 100644
index 0000000000..22cdb31898
--- /dev/null
+++ b/ports/espressif/boards/bpi_bit_s2/board.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
new file mode 100644
index 0000000000..5225325454
--- /dev/null
+++ b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "BPI-Bit-S2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+// #define MICROPY_HW_NEOPIXEL  (&pin_GPIO18)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO16)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO15)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
diff --git a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
new file mode 100644
index 0000000000..c80a18acd0
--- /dev/null
+++ b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303A
+USB_PID = 0x80E6
+USB_PRODUCT = "BPI-Bit-S2"
+USB_MANUFACTURER = "BananaPi"
+
+IDF_TARGET = esp32s2
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/bpi_bit_s2/pins.c b/ports/espressif/boards/bpi_bit_s2/pins.c
new file mode 100644
index 0000000000..4b14bbd79e
--- /dev/null
+++ b/ports/espressif/boards/bpi_bit_s2/pins.c
@@ -0,0 +1,105 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_LUM1), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_LUM2), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_TEMPERATURE), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/bpi_bit_s2/sdkconfig b/ports/espressif/boards/bpi_bit_s2/sdkconfig
new file mode 100644
index 0000000000..91758051d3
--- /dev/null
+++ b/ports/espressif/boards/bpi_bit_s2/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="BPI-BIT-S2"
+# end of LWIP

From 56c5f1eedfe2216147c95a6a8ecc9461276763ac Mon Sep 17 00:00:00 2001
From: Wind-stormger 
Date: Thu, 15 Sep 2022 14:18:24 +0800
Subject: [PATCH 0977/2403] Add BananaPi BPI-Leaf-S3.

Based on esp32s3, all available pins are drawn.
2M PSRAM, 8M FLASH.
A JST SH 4-pin Connector can be used for STEMMA QT / Qwiic.
A MX 1.25mm 2-Pin Connector Lithium battery power supply.
A WS2812 LED.
---
 ports/espressif/boards/bpi_leaf_s3/board.c    | 39 +++++++++++
 .../boards/bpi_leaf_s3/mpconfigboard.h        | 42 ++++++++++++
 .../boards/bpi_leaf_s3/mpconfigboard.mk       | 20 ++++++
 ports/espressif/boards/bpi_leaf_s3/pins.c     | 68 +++++++++++++++++++
 ports/espressif/boards/bpi_leaf_s3/sdkconfig  | 47 +++++++++++++
 5 files changed, 216 insertions(+)
 create mode 100644 ports/espressif/boards/bpi_leaf_s3/board.c
 create mode 100644 ports/espressif/boards/bpi_leaf_s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/bpi_leaf_s3/pins.c
 create mode 100644 ports/espressif/boards/bpi_leaf_s3/sdkconfig

diff --git a/ports/espressif/boards/bpi_leaf_s3/board.c b/ports/espressif/boards/bpi_leaf_s3/board.c
new file mode 100644
index 0000000000..3b1f5efd87
--- /dev/null
+++ b/ports/espressif/boards/bpi_leaf_s3/board.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.h b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.h
new file mode 100644
index 0000000000..fd6aae04ea
--- /dev/null
+++ b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.h
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "BPI-Leaf-S3"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO48)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO16)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO15)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
diff --git a/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
new file mode 100644
index 0000000000..f817930832
--- /dev/null
+++ b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303A
+USB_PID = 0x80E0
+USB_PRODUCT = "BPI-Leaf-S3"
+USB_MANUFACTURER = "BananaPi"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=8MB
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/bpi_leaf_s3/pins.c b/ports/espressif/boards/bpi_leaf_s3/pins.c
new file mode 100644
index 0000000000..bf193e88aa
--- /dev/null
+++ b/ports/espressif/boards/bpi_leaf_s3/pins.c
@@ -0,0 +1,68 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    // { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/bpi_leaf_s3/sdkconfig b/ports/espressif/boards/bpi_leaf_s3/sdkconfig
new file mode 100644
index 0000000000..e9c767ea85
--- /dev/null
+++ b/ports/espressif/boards/bpi_leaf_s3/sdkconfig
@@ -0,0 +1,47 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="BPI-Leaf-S3"
+# end of LWIP
+
+# end of Component config

From 1cc4d63c528287dfe20d6bf4449ee6dbadda7fb2 Mon Sep 17 00:00:00 2001
From: TimonPeng 
Date: Fri, 16 Sep 2022 00:02:17 +0800
Subject: [PATCH 0978/2403] Fix bindings typing

---
 shared-bindings/bitmaptools/__init__.c | 2 +-
 shared-bindings/usb/core/Device.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 6c00ca44a9..9339db8f66 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -267,7 +267,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_rotozoom_obj, 0, bitmaptools_obj_rotozoom
 // requires at least 2 arguments (destination bitmap and source bitmap)
 
 //|
-//| def alphablend(dest_bitmap: displayio.Bitmap , source_bitmap_1: displayio.Bitmap, source_bitmap_2: displayio.Bitmap, colorspace: displayio.Colorspace, factor1: float=.5, factor2: float=None) -> None:
+//| def alphablend(dest_bitmap: displayio.Bitmap , source_bitmap_1: displayio.Bitmap, source_bitmap_2: displayio.Bitmap, colorspace: displayio.Colorspace, factor1: float=.5, factor2: Optional[float]=None) -> None:
 //|     """Alpha blend the two source bitmaps into the destination.
 //|
 //|     It is permitted for the destination bitmap to be one of the two
diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c
index 3a9e9bb421..2ade459d5f 100644
--- a/shared-bindings/usb/core/Device.c
+++ b/shared-bindings/usb/core/Device.c
@@ -187,7 +187,7 @@ STATIC mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_read_obj, 2, usb_core_device_read);
 
 //|     def ctrl_transfer(self, bmRequestType, bRequest, wValue=0, wIndex=0,
-//|                       data_or_wLength: array.array = None, timeout = None) -> int:
+//|                       data_or_wLength: Optional[array.array] = None, timeout = None) -> int:
 //|         """Do a control transfer on the endpoint 0. The parameters bmRequestType,
 //|            bRequest, wValue and wIndex are the same of the USB Standard Control
 //|            Request format.

From 60f43b1703485f1a38fe556fb4ac372c70fee3ae Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 12 Sep 2022 09:48:41 -0400
Subject: [PATCH 0979/2403] allow preserving pin state during deep sleep

---
 locale/circuitpython.pot                      | 13 ++--
 ports/atmel-samd/common-hal/alarm/__init__.c  |  5 +-
 .../boards/adafruit_feather_esp32_v2/board.c  | 17 +++---
 .../espressif/common-hal/alarm/SleepMemory.c  |  3 +-
 ports/espressif/common-hal/alarm/__init__.c   | 12 +++-
 .../common-hal/digitalio/DigitalInOut.c       | 17 +++++-
 .../common-hal/digitalio/DigitalInOut.h       |  2 +
 .../common-hal/esp32_camera/Camera.c          |  2 -
 .../common-hal/microcontroller/Pin.c          | 61 ++++++++++++++-----
 .../common-hal/microcontroller/Pin.h          | 25 +++++---
 ports/nrf/common-hal/alarm/__init__.c         |  5 +-
 ports/raspberrypi/common-hal/alarm/__init__.c |  5 +-
 ports/stm/common-hal/alarm/__init__.c         |  5 +-
 ports/stm/supervisor/port.c                   |  1 +
 shared-bindings/alarm/__init__.c              | 61 +++++++++++++++----
 shared-bindings/alarm/__init__.h              |  3 +-
 shared-bindings/dualbank/__init__.c           |  2 +-
 shared/runtime/pyexec.c                       | 12 ++--
 18 files changed, 186 insertions(+), 65 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 3b7e6227fa..fd6df1cafe 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -66,13 +66,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -902,13 +905,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3798,6 +3802,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/ports/atmel-samd/common-hal/alarm/__init__.c b/ports/atmel-samd/common-hal/alarm/__init__.c
index 405bf9d573..8f66b3a90c 100644
--- a/ports/atmel-samd/common-hal/alarm/__init__.c
+++ b/ports/atmel-samd/common-hal/alarm/__init__.c
@@ -142,7 +142,10 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
     return wake_alarm;
 }
 
-void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t **preserve_dios) {
+    if (n_dios > 0) {
+        mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_preserve_dios);
+    }
     _setup_sleep_alarms(true, n_alarms, alarms);
 }
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
index 22d51ef334..78341beb3b 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/board.c
@@ -31,17 +31,14 @@
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-    reset_board();
-}
-
-void reset_board(void) {
-    // Turn on NeoPixel and I2C power by default.
-    gpio_set_direction(2, GPIO_MODE_DEF_OUTPUT);
-    gpio_set_level(2, true);
-}
-
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    if (pin_number == 2) {
+        // Turn on NeoPixel and I2C power by default.
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
+        return true;
+    }
+
     return false;
 }
 
diff --git a/ports/espressif/common-hal/alarm/SleepMemory.c b/ports/espressif/common-hal/alarm/SleepMemory.c
index 764125ddb2..d375fdc778 100644
--- a/ports/espressif/common-hal/alarm/SleepMemory.c
+++ b/ports/espressif/common-hal/alarm/SleepMemory.c
@@ -31,7 +31,6 @@
 #include "common-hal/alarm/SleepMemory.h"
 #include "shared-bindings/alarm/SleepMemory.h"
 
-#include "esp_log.h"
 #include "esp_sleep.h"
 
 // Data storage for singleton instance of SleepMemory.
@@ -39,7 +38,7 @@
 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
+    // ESP-IDF build system takes care of doing esp_sleep_pd_config() or the equivalent with
     // 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
 }
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index d65ab0bbb2..a47930850d 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -39,12 +39,15 @@
 #include "shared-bindings/wifi/__init__.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
+#include "common-hal/digitalio/DigitalInOut.h"
+
 #include "supervisor/port.h"
 #include "supervisor/shared/workflow.h"
 
 #include "esp_sleep.h"
 
 #include "soc/rtc_cntl_reg.h"
+#include "components/driver/include/driver/gpio.h"
 #include "components/driver/include/driver/uart.h"
 
 // Singleton instance of SleepMemory.
@@ -158,7 +161,8 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
     return wake_alarm;
 }
 
-void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t *preserve_dios[]) {
+    digitalio_digitalinout_preserve_for_deep_sleep(n_dios, preserve_dios);
     _setup_sleep_alarms(true, n_alarms, alarms);
 }
 
@@ -166,6 +170,12 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
     alarm_pin_pinalarm_prepare_for_deep_sleep();
     alarm_touch_touchalarm_prepare_for_deep_sleep();
 
+    // We no longer need to remember the pin preservations, since any pin resets are all done.
+    clear_pin_preservations();
+
+    // Allow pin holds to work during deep sleep.
+    gpio_deep_sleep_hold_en();
+
     // The ESP-IDF caches the deep sleep settings and applies them before sleep.
     // We don't need to worry about resetting them in the interim.
     esp_deep_sleep_start();
diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c
index a3e8f41147..63c8ec1a41 100644
--- a/ports/espressif/common-hal/digitalio/DigitalInOut.c
+++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c
@@ -32,6 +32,20 @@
 
 #include "components/hal/include/hal/gpio_hal.h"
 
+STATIC bool _pin_is_input(uint8_t pin_number) {
+    const uint32_t iomux = READ_PERI_REG(GPIO_PIN_MUX_REG[pin_number]);
+    return (iomux & FUN_IE) != 0;
+}
+
+void digitalio_digitalinout_preserve_for_deep_sleep(size_t n_dios, digitalio_digitalinout_obj_t *preserve_dios[]) {
+    // Mark the pin states of the given DigitalInOuts for preservation during deep sleep
+    for (size_t i = 0; i < n_dios; i++) {
+        if (!common_hal_digitalio_digitalinout_deinited(preserve_dios[i])) {
+            preserve_pin_number(preserve_dios[i]->pin->number);
+        }
+    }
+}
+
 void common_hal_digitalio_digitalinout_never_reset(
     digitalio_digitalinout_obj_t *self) {
     never_reset_pin_number(self->pin->number);
@@ -83,8 +97,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
     digitalio_digitalinout_obj_t *self) {
-    uint32_t iomux = READ_PERI_REG(GPIO_PIN_MUX_REG[self->pin->number]);
-    if ((iomux & FUN_IE) != 0) {
+    if (_pin_is_input(self->pin->number)) {
         return DIRECTION_INPUT;
     }
     return DIRECTION_OUTPUT;
diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.h b/ports/espressif/common-hal/digitalio/DigitalInOut.h
index 2d42e79809..793d2a0986 100644
--- a/ports/espressif/common-hal/digitalio/DigitalInOut.h
+++ b/ports/espressif/common-hal/digitalio/DigitalInOut.h
@@ -36,4 +36,6 @@ typedef struct {
     bool output_value;
 } digitalio_digitalinout_obj_t;
 
+extern void digitalio_digitalinout_preserve_for_deep_sleep(size_t n_dios, digitalio_digitalinout_obj_t *preserve_dios[]);
+
 #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 97300a639c..5ee112a911 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -191,8 +191,6 @@ framesize_t common_hal_esp32_camera_camera_get_frame_size(esp32_camera_camera_ob
     return self->camera_config.frame_size;
 }
 
-#include "esp_log.h"
-
 void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 127505f0e9..adc1e8b918 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -33,14 +33,13 @@
 #include "components/driver/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 
-STATIC uint64_t never_reset_pins;
-STATIC uint64_t in_use;
+STATIC uint64_t _never_reset_pin_mask;
+STATIC uint64_t _preserved_pin_mask;
+STATIC uint64_t _in_use_pin_mask;
 
-// 64-bit pin mask for a single bit
-#define PIN_BIT(pin_number) (((uint64_t)1) << pin_number)
-
-// Bit mask of all pins that should never ever be reset.
+// Bit mask of all pins that should never EVER be reset.
 // Typically these are SPI flash and PSRAM control pins, and communication pins.
+// "Reset forbidden" is stronger than "never reset" below, which may only be temporary.
 static const uint64_t pin_mask_reset_forbidden =
     #if defined(CONFIG_IDF_TARGET_ESP32)
     // Never ever reset serial pins for bootloader and possibly USB-serial converter.
@@ -105,7 +104,7 @@ void never_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
-    never_reset_pins |= PIN_BIT(pin_number);
+    _never_reset_pin_mask |= PIN_BIT(pin_number);
 }
 
 void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
@@ -119,12 +118,29 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     return false;
 }
 
+STATIC bool _reset_forbidden(gpio_num_t pin_number) {
+    return pin_mask_reset_forbidden & PIN_BIT(pin_number);
+}
+
+STATIC bool _never_reset(gpio_num_t pin_number) {
+    return _never_reset_pin_mask & PIN_BIT(pin_number);
+}
+
+STATIC bool _preserved_pin(gpio_num_t pin_number) {
+    return _preserved_pin_mask & PIN_BIT(pin_number);
+}
+
 STATIC void _reset_pin(gpio_num_t pin_number) {
     // Never ever reset pins used for flash, RAM, and basic communication.
-    if (pin_mask_reset_forbidden & PIN_BIT(pin_number)) {
+    if (_reset_forbidden(pin_number)) {
         return;
     }
 
+    // Disable any existing hold on this pin,
+    if (GPIO_IS_VALID_OUTPUT_GPIO(pin_number)) {
+        gpio_hold_dis(pin_number);
+    }
+
     // Give the board a chance to reset the pin in a particular way.
     if (espressif_board_reset_pin_number(pin_number)) {
         return;
@@ -152,6 +168,18 @@ STATIC void _reset_pin(gpio_num_t pin_number) {
     }
 }
 
+void preserve_pin_number(gpio_num_t pin_number) {
+    if (GPIO_IS_VALID_OUTPUT_GPIO(pin_number)) {
+        gpio_hold_en(pin_number);
+        _preserved_pin_mask |= PIN_BIT(pin_number);
+    }
+}
+
+void clear_pin_preservations(void) {
+    _preserved_pin_mask = 0;
+}
+
+
 // Mark pin as free and return it to a quiescent state.
 void reset_pin_number(gpio_num_t pin_number) {
     // Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
@@ -159,8 +187,8 @@ void reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
-    never_reset_pins &= ~PIN_BIT(pin_number);
-    in_use &= ~PIN_BIT(pin_number);
+    _never_reset_pin_mask &= ~PIN_BIT(pin_number);
+    _in_use_pin_mask &= ~PIN_BIT(pin_number);
 
     _reset_pin(pin_number);
 }
@@ -177,15 +205,20 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
 }
 
 void reset_all_pins(void) {
+    // Undo deep sleep holds in case we woke up from deep sleep.
+    // We still need to unhold individual pins, which is done by _reset_pin.
+    gpio_deep_sleep_hold_dis();
+
     for (uint8_t i = 0; i < GPIO_PIN_COUNT; i++) {
         uint32_t iomux_address = GPIO_PIN_MUX_REG[i];
         if (iomux_address == 0 ||
-            (never_reset_pins & PIN_BIT(i))) {
+            _never_reset(i) ||
+            _preserved_pin(i)) {
             continue;
         }
         _reset_pin(i);
     }
-    in_use = never_reset_pins;
+    _in_use_pin_mask = _never_reset_pin_mask;
 }
 
 void claim_pin_number(gpio_num_t pin_number) {
@@ -194,7 +227,7 @@ void claim_pin_number(gpio_num_t pin_number) {
     if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
         return;
     }
-    in_use |= PIN_BIT(pin_number);
+    _in_use_pin_mask |= PIN_BIT(pin_number);
 }
 
 void claim_pin(const mcu_pin_obj_t *pin) {
@@ -206,7 +239,7 @@ void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) {
 }
 
 bool pin_number_is_free(gpio_num_t pin_number) {
-    return !(in_use & PIN_BIT(pin_number));
+    return !(_in_use_pin_mask & PIN_BIT(pin_number));
 }
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
diff --git a/ports/espressif/common-hal/microcontroller/Pin.h b/ports/espressif/common-hal/microcontroller/Pin.h
index e74346ef65..55927fe068 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.h
+++ b/ports/espressif/common-hal/microcontroller/Pin.h
@@ -31,21 +31,28 @@
 
 #include "peripherals/pins.h"
 
-void reset_all_pins(void);
+// 64-bit pin mask for a single bit
+#define PIN_BIT(pin_number) (((uint64_t)1) << pin_number)
+
+extern void common_hal_reset_pin(const mcu_pin_obj_t *pin);
+extern void common_hal_never_reset_pin(const mcu_pin_obj_t *pin);
+
+extern void reset_all_pins(void);
 // reset_pin_number takes the pin number instead of the pointer so that objects don't
 // need to store a full pointer.
-void reset_pin_number(gpio_num_t pin_number);
-void common_hal_reset_pin(const mcu_pin_obj_t *pin);
-void common_hal_never_reset_pin(const mcu_pin_obj_t *pin);
-void claim_pin(const mcu_pin_obj_t *pin);
-void claim_pin_number(gpio_num_t pin_number);
-bool pin_number_is_free(gpio_num_t pin_number);
-void never_reset_pin_number(gpio_num_t pin_number);
+extern void reset_pin_number(gpio_num_t pin_number);
+extern void claim_pin(const mcu_pin_obj_t *pin);
+extern void claim_pin_number(gpio_num_t pin_number);
+extern bool pin_number_is_free(gpio_num_t pin_number);
+extern void never_reset_pin_number(gpio_num_t pin_number);
+
+extern void preserve_pin_number(gpio_num_t pin_number);
+extern void clear_pin_preservations(void);
 
 // Allow the board to reset a pin in a board-specific way. This can be used
 // for LEDs or enable pins to put them in a state beside the default pull-up.
 // Return true to indicate that the pin was reset. Returning false will lead to
 // the port-default reset behavior.
-bool espressif_board_reset_pin_number(gpio_num_t pin_number);
+extern bool espressif_board_reset_pin_number(gpio_num_t pin_number);
 
 #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c
index 043be0b319..75f616c805 100644
--- a/ports/nrf/common-hal/alarm/__init__.c
+++ b/ports/nrf/common-hal/alarm/__init__.c
@@ -247,7 +247,10 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
     return wake_alarm;
 }
 
-void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t **preserve_dios) {
+    if (n_dios > 0) {
+        mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_preserve_dios);
+    }
     _setup_sleep_alarms(true, n_alarms, alarms);
 }
 
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
index 0d6734568b..31fa58aab3 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -194,7 +194,10 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
     return wake_alarm;
 }
 
-void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t **preserve_dios) {
+    if (n_dios > 0) {
+        mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_preserve_dios);
+    }
     _setup_sleep_alarms(true, n_alarms, alarms);
 }
 
diff --git a/ports/stm/common-hal/alarm/__init__.c b/ports/stm/common-hal/alarm/__init__.c
index 466c2d5199..26099b0503 100644
--- a/ports/stm/common-hal/alarm/__init__.c
+++ b/ports/stm/common-hal/alarm/__init__.c
@@ -144,7 +144,10 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
     return wake_alarm;
 }
 
-void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t **preserve_dios) {
+    if (n_dios > 0) {
+        mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_preserve_dios);
+    }
     _setup_sleep_alarms(true, n_alarms, alarms);
 }
 
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index b15d81611e..c3f1fee190 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -244,6 +244,7 @@ void SysTick_Handler(void) {
 
 void reset_port(void) {
     reset_all_pins();
+
     #if CIRCUITPY_RTC
     rtc_reset();
     #endif
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 7fd14b7641..3b81dd479f 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/supervisor/Runtime.h"
 #include "shared-bindings/time/__init__.h"
 #include "supervisor/shared/workflow.h"
@@ -80,7 +81,7 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
             mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type)) {
             continue;
         }
-        mp_raise_TypeError_varg(translate("Expected an alarm"));
+        mp_raise_TypeError_varg(translate("Expected an %q"), MP_QSTR_Alarm);
     }
 }
 
@@ -112,7 +113,7 @@ STATIC mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *ar
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OBJ_FUN_ARGS_MAX, alarm_light_sleep_until_alarms);
 
-//| def exit_and_deep_sleep_until_alarms(*alarms: circuitpython_typing.Alarm) -> None:
+//| def exit_and_deep_sleep_until_alarms(*alarms: circuitpython_typing.Alarm, preserve_dios: Sequence[digitalio.DigitalInOut] = ()) -> None:
 //|     """Exit the program and go into a deep sleep, until awakened by one of the alarms.
 //|     This function does not return.
 //|
@@ -126,6 +127,22 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|
 //|     If no alarms are specified, the microcontroller will deep sleep until reset.
 //|
+//|     :param circuitpython_typing.Alarm alarms: the alarms that can wake the microcontroller.
+//|     :param Sequence[digitalio.DigitalInOut] preserve_dios: A sequence of `DigitalInOut` objects
+//|       whose state should be preserved during deep sleep.
+//|       If a `DigitalInOut` in the sequence is set to be an output,
+//|       its current `DigitalInOut.value` (``True`` or ``False``)
+//|       will be preserved during the deep sleep.
+//|       If a `DigitalInOut` in the sequence is set to be an input,
+//|       its current `DigitalInOut.pull` value (``DOWN``, ``UP``, or ``None``)
+//|       will be preserved during deep sleep.
+//|
+//|     Preserving `DigitalInOut` states during deep sleep can be used to ensure that
+//|     external or on-board devices are powered or unpowered during sleep, among other purposes.
+//|
+//|     On some microcontrollers, some pins cannot remain in their original state for hardware reasons.
+//|
+//|
 //|     **If CircuitPython is connected to a host computer via USB or BLE
 //|     the first time a deep sleep is requested,
 //|     the connection will be maintained and the system will not go into deep sleep.**
@@ -136,28 +153,50 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|     the next deep sleep will still be a true deep sleep. You must do a hard reset
 //|     or power-cycle to exit a true deep sleep loop.
 //|
-//|     Here is skeletal example that deep-sleeps and restarts every 60 seconds:
+//|     Here is a skeletal example:
 //|
 //|     .. code-block:: python
 //|
 //|         import alarm
 //|         import time
+//|         import board
 //|
 //|         print("Waking up")
 //|
-//|         # Set an alarm for 60 seconds from now.
+//|         # Create an alarm for 60 seconds from now, and also a pin alarm.
 //|         time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 60)
+//|         pin_alarm = alarm.pin.PinAlarm(board.D7, False)
 //|
-//|         # Deep sleep until the alarm goes off. Then restart the program.
-//|         alarm.exit_and_deep_sleep_until_alarms(time_alarm)
+//|         # Deep sleep until one of the alarm goes off. Then restart the program.
+//|         alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm)
 //|     """
 //|     ...
 //|
-STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *args) {
-    validate_objs_are_alarms(n_args, args);
+STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_preserve_dios };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_preserve_dios, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple} },
+    };
 
-    // Validate the alarms and set them.
-    common_hal_alarm_set_deep_sleep_alarms(n_args, args);
+    // args will contain only the value for preserve_dios. The *alarms args are in pos_args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(0, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    validate_objs_are_alarms(n_args, pos_args);
+
+    mp_obj_t preserve_dios = args[ARG_preserve_dios].u_obj;
+    const size_t num_dios = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(preserve_dios));
+    digitalio_digitalinout_obj_t *dios_array[num_dios];
+
+    for (mp_uint_t i = 0; i < num_dios; i++) {
+        mp_obj_t dio = mp_obj_subscr(preserve_dios, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
+        if (!mp_obj_is_type(dio, &digitalio_digitalinout_type)) {
+            mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_DigitalInOut);
+        }
+        dios_array[i] = MP_OBJ_TO_PTR(dio);
+    }
+
+    common_hal_alarm_set_deep_sleep_alarms(n_args, pos_args, num_dios, dios_array);
 
     // Raise an exception, which will be processed in main.c.
     mp_raise_type_arg(&mp_type_DeepSleepRequest, NULL);
@@ -165,7 +204,7 @@ STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_o
     // Doesn't get here.
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_exit_and_deep_sleep_until_alarms_obj, 1, MP_OBJ_FUN_ARGS_MAX, alarm_exit_and_deep_sleep_until_alarms);
+MP_DEFINE_CONST_FUN_OBJ_KW(alarm_exit_and_deep_sleep_until_alarms_obj, 0, alarm_exit_and_deep_sleep_until_alarms);
 
 STATIC const mp_map_elem_t alarm_pin_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pin) },
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
index eb67917dce..ea86e44f2f 100644
--- a/shared-bindings/alarm/__init__.h
+++ b/shared-bindings/alarm/__init__.h
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 
 #include "common-hal/alarm/__init__.h"
+#include "common-hal/digitalio/DigitalInOut.h"
 
 // Light sleep fully self-contained and does not exit user code. It will return
 // the same alarm object that was orignally passed in, unlike deep sleep, which
@@ -42,7 +43,7 @@ extern mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const
 // supervisor will idle using `port_wait_for_interrupt`. After each call, it will
 // call alarm_woken_from_sleep to see if we've been woken by an alarm and if so,
 // it will exit idle as if deep sleep was exited
-extern void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms);
+extern void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms, size_t n_dios, digitalio_digitalinout_obj_t **preserve_dios);
 
 extern NORETURN void common_hal_alarm_enter_deep_sleep(void);
 
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index f907c91e0e..fa4c2af691 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -56,7 +56,7 @@
 //| ...
 //|
 
-//| def flash(*buffer: ReadableBuffer, offset: int=0) -> None:
+//| def flash(buffer: ReadableBuffer, offset: int=0) -> None:
 //|     """Writes one of two app partitions at the given offset.
 //|
 //|     This can be called multiple times when flashing the firmware
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 72714b9a2b..87219d18f5 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -168,17 +168,21 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         }
 
         // check for SystemExit
-        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type((mp_obj_t)nlr.ret_val)), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
+
+        // nlr.ret_val is an exception object.
+        mp_obj_t exception_obj = (mp_obj_t)nlr.ret_val;
+
+        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(exception_obj)), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
             // at the moment, the value of SystemExit is unused
             ret = pyexec_system_exit;
         #if CIRCUITPY_ALARM
-        } else if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type((mp_obj_t)nlr.ret_val)), &mp_type_DeepSleepRequest)) {
+        } else if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(exception_obj)), MP_OBJ_FROM_PTR(&mp_type_DeepSleepRequest))) {
             ret = PYEXEC_DEEP_SLEEP;
         #endif
-        } else if ((mp_obj_t)nlr.ret_val == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
+        } else if (exception_obj == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
             ret = PYEXEC_RELOAD;
         } else {
-            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+            mp_obj_print_exception(&mp_plat_print, exception_obj);
             ret = PYEXEC_EXCEPTION;
         }
 

From 3abfd212ecb9c92ef4a04dfc352f8b850e795f66 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Sep 2022 19:40:02 -0400
Subject: [PATCH 0980/2403] nrf: return None when UART.read() reads nothing

---
 ports/nrf/common-hal/busio/UART.c | 5 +++++
 shared-bindings/busio/UART.c      | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index 04c502a4bd..ae8389fd9e 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -337,6 +337,11 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
 
     NVIC_EnableIRQ(nrfx_get_irq_number(self->uarte->p_reg));
 
+    if (rx_bytes == 0) {
+        *errcode = EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+
     return rx_bytes;
 }
 
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 60f2b407fe..d849d63ae8 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -200,10 +200,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 // These are standard stream methods. Code is in py/stream.c.
 //
 //|     def read(self, nbytes: Optional[int] = None) -> Optional[bytes]:
-//|         """Read characters.  If ``nbytes`` is specified then read at most that many
+//|         """Read bytes.  If ``nbytes`` is specified then read at most that many
 //|         bytes. Otherwise, read everything that arrives until the connection
 //|         times out. Providing the number of bytes expected is highly recommended
-//|         because it will be faster.
+//|         because it will be faster. If no bytes are read, return ``None``.
+//|
+//|         .. note:: When no bytes are read due to a timeout, this function returns ``None``.
+//|           This matches the behavior of `io.RawIOBase.read` in Python 3, but
+//|           differs from pyserial which returns ``b''`` in that situation.
 //|
 //|         :return: Data read
 //|         :rtype: bytes or None"""

From 4df8a51982ed90eab72b5e5e365ae9ac0e36527c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Sep 2022 20:06:47 -0400
Subject: [PATCH 0981/2403] Remove unneeded workaround for Feather ESP32-S2 TFT

---
 ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index a553afdff7..9a57765ef0 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -71,12 +71,6 @@ uint8_t display_init_sequence[] = {
 
 
 void board_init(void) {
-    // THIS SHOULD BE HANDLED BY espressif_board_reset_pin_number(), but it is not working.
-    // TEMPORARY FIX UNTIL IT'S DIAGNOSED.
-    common_hal_never_reset_pin(&pin_GPIO21);
-    gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-    gpio_set_level(21, true);
-
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
     bus->base.type = &displayio_fourwire_type;

From 82694b726584b90e269962467ce609c4229c05c9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Sep 2022 20:31:08 -0400
Subject: [PATCH 0982/2403] remove extraneous copyrights

---
 ports/raspberrypi/common-hal/analogbufio/BufferedIn.c | 5 -----
 ports/raspberrypi/common-hal/analogbufio/BufferedIn.h | 2 --
 2 files changed, 7 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index f5f9dbde33..951c07af03 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -4,8 +4,6 @@
  * The MIT License (MIT)
  *
  * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- *                         Copyright (c) 2013, 2014 Damien P. George
- *                         Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -66,9 +64,6 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     self->bytes_per_sample = bytes_per_sample;
     self->sample_rate = sample_rate;
 
-    // Standard IO Init
-    stdio_init_all();
-
     // Init GPIO for analogue use: hi-Z, no pulls, disable digital input buffer.
     adc_init();
     adc_gpio_init(pin->number);
diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
index b38bfc8738..8b183a1d70 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
@@ -4,8 +4,6 @@
  * The MIT License (MIT)
  *
  * SPDX-FileCopyrightText: Copyright (c) 2022 Lee Atkinson, MeanStride Technology, Inc.
- *                         Copyright (c) 2013, 2014 Damien P. George
- *                         Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *

From 0ab4f12dc4bc81b5dfb26cae3942c4f4b231f83b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Sep 2022 20:36:29 -0400
Subject: [PATCH 0983/2403] fix some submodules commit skew

---
 frozen/circuitpython-stage   | 2 +-
 ports/espressif/esp-idf      | 2 +-
 ports/espressif/esp32-camera | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 9a8338b3bd..4124dfbdaa 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac
+Subproject commit 4124dfbdaadce1966f457d7d6c6984e9832999bf
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index ddb7ddbcb6..d51f7d8821 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit ddb7ddbcb613a582e0a91eda8b1d2510dd0a2d83
+Subproject commit d51f7d882187afa4b39c2613fd0fe2ac2fea1145
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 28804391c0..54c3f61c86 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 28804391c002f6a3ea5ce6a55aee3b191be3ecde
+Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2

From 7540ae87d4e10ce99a40e6fd9748d1c06a3bac98 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 16 Sep 2022 14:22:20 +0200
Subject: [PATCH 0984/2403] 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             | 13 +++++++++----
 locale/cs.po             | 13 +++++++++----
 locale/de_DE.po          | 18 +++++++++++++-----
 locale/el.po             | 13 +++++++++----
 locale/en_GB.po          | 18 +++++++++++++-----
 locale/es.po             | 18 +++++++++++++-----
 locale/fil.po            | 13 +++++++++----
 locale/fr.po             | 18 +++++++++++++-----
 locale/hi.po             | 13 +++++++++----
 locale/it_IT.po          | 13 +++++++++----
 locale/ja.po             | 13 +++++++++----
 locale/ko.po             | 13 +++++++++----
 locale/nl.po             | 18 +++++++++++++-----
 locale/pl.po             | 13 +++++++++----
 locale/pt_BR.po          | 18 +++++++++++++-----
 locale/ru.po             | 18 +++++++++++++-----
 locale/sv.po             | 18 +++++++++++++-----
 locale/tr.po             | 13 +++++++++----
 locale/zh_Latn_pinyin.po | 18 +++++++++++++-----
 19 files changed, 207 insertions(+), 85 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index a581d8c6ef..2c6455215a 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -72,13 +72,16 @@ msgid ""
 msgstr ""
 "%d pin alamat, %d rgb pin dan %d ubin menunjukkan ketinggian %d, bukan %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -915,13 +918,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Diharapkan %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3830,6 +3834,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index bb71e7c771..487cbb2def 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -73,13 +73,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -913,13 +916,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Očekává se %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3816,6 +3820,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3ccb37967a..68fe15f5bb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -74,13 +74,16 @@ msgstr ""
 "%d Adress-Pins, %d RGB-Pins und %d Kacheln indizieren eine Höhe von %d, "
 "nicht %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -920,14 +923,15 @@ msgstr "Error: Bind Fehler"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Erwartet ein(e) %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Alarm erwartet"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3894,6 +3898,7 @@ msgstr "VOLUME Taste wird beim Starten gedrückt.\n"
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "Drücken der Boot-Taste beim Start.\n"
@@ -4449,6 +4454,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Expected an alarm"
+#~ msgstr "Alarm erwartet"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "Alle I2C-Ziele sind in Verwendung"
 
diff --git a/locale/el.po b/locale/el.po
index c85903c33f..f39aa0d674 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -66,13 +66,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -902,13 +905,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3798,6 +3802,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 0db0dae666..81829b25cc 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -76,13 +76,16 @@ msgid ""
 msgstr ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -916,14 +919,15 @@ msgstr "Error: Failure to bind"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Expected a %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Expected an alarm"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3835,6 +3839,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "pressing boot button at start up.\n"
@@ -4387,6 +4392,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 "Expected an alarm"
+#~ msgstr "Expected an alarm"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Failed to init WiFi"
 
diff --git a/locale/es.po b/locale/es.po
index df27182161..f9e9940f7c 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -75,13 +75,16 @@ msgstr ""
 "%d pines de dirección, %d pines rgb y %d tiles indican una altura de %d, y "
 "no de %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -923,14 +926,15 @@ msgstr "Error: fallo al vincular"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Se espera un %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Un objecto alarm era esperado"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3879,6 +3883,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "presionando botón de arranque al inicio.\n"
@@ -4432,6 +4437,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 "Expected an alarm"
+#~ msgstr "Un objecto alarm era esperado"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Fallo al inicializar wifi"
 
diff --git a/locale/fil.po b/locale/fil.po
index 397c947350..d31c061e39 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -67,13 +67,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -913,13 +916,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Umasa ng %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3837,6 +3841,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 23c25852e2..3fbf929d49 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -78,13 +78,16 @@ msgstr ""
 "%d broches d'adresse, %d broches RGB et %d pour tile indique une hauteur de "
 "%d, et non %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -936,14 +939,15 @@ msgstr "Erreur : Impossible de lier"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Attendu un %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Une alarme était prévue"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3924,6 +3928,7 @@ msgstr "presser le bouton VOLUME au démarrage.\n"
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "bouton boot appuyé lors du démarrage.\n"
@@ -4477,6 +4482,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 "Expected an alarm"
+#~ msgstr "Une alarme était prévue"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "Toutes les cibles I2C sont utilisées"
 
diff --git a/locale/hi.po b/locale/hi.po
index ca90780a5d..45b4ae346b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -66,13 +66,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -902,13 +905,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3798,6 +3802,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 109319772e..95b543638f 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -73,13 +73,16 @@ msgid ""
 msgstr ""
 "%d pin indirizzo, %d pin rgb e %d tessere indicano l'altezza di %d, non %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -918,13 +921,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Atteso un %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3850,6 +3854,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 89686499f4..5cfb2e6d67 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -71,13 +71,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -911,13 +914,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%qが必要"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3819,6 +3823,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index ede912e6a9..74dde7a983 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -67,13 +67,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -905,13 +908,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%q 이 예상되었습니다."
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3802,6 +3806,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 61889ed310..4641a172b1 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -69,13 +69,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -910,14 +913,15 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Verwacht een %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Verwachtte een alarm"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3835,6 +3839,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "druk bootknop in bij opstarten.\n"
@@ -4387,6 +4392,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 "Expected an alarm"
+#~ msgstr "Verwachtte een alarm"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Kon WiFi niet initialiseren"
 
diff --git a/locale/pl.po b/locale/pl.po
index 77bacda839..b1d008b7be 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -71,13 +71,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -911,13 +914,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Oczekiwano %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3811,6 +3815,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e58d7395dc..b256342ee5 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -75,13 +75,16 @@ msgstr ""
 "%d pinos de endereço, %d pinos rgb e %d blocos indicam uma altura com %d, "
 "não %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -929,14 +932,15 @@ msgstr "Erro: Falha na vinculação"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Esperado um"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Um alarme era esperado"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3903,6 +3907,7 @@ msgstr "pressionando o botão VOLUME na inicialização.\n"
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "pressionando o botão de boot na inicialização.\n"
@@ -4455,6 +4460,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 "Expected an alarm"
+#~ msgstr "Um alarme era esperado"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "Todos os alvos I2C já estão em uso"
 
diff --git a/locale/ru.po b/locale/ru.po
index 3dd834385c..181af42d77 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -74,13 +74,16 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr "%d адресные пины, %d rgb пины и %d плитки указывают высоту %d а не %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -927,14 +930,15 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Ожидалось(ся) %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Ожидался сигнал"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3847,6 +3851,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
@@ -4397,6 +4402,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "Expected an alarm"
+#~ msgstr "Ожидался сигнал"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Не удалось инициировать wifi"
 
diff --git a/locale/sv.po b/locale/sv.po
index c21af224cc..5a34dc619e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -74,13 +74,16 @@ msgid ""
 msgstr ""
 "%d adresspinnar, %d rgb-pinnar och %d brickor anger en höjd på %d, inte %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -916,14 +919,15 @@ msgstr "Fel: Bind misslyckades"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Förväntade %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "Förväntade ett larm"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3860,6 +3864,7 @@ msgstr "genom att trycka på VOLUME-knappen vid start.\n"
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "trycka på startknappen vid start.\n"
@@ -4412,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 "Expected an alarm"
+#~ msgstr "Förväntade ett larm"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "Alla I2C-mål används"
 
diff --git a/locale/tr.po b/locale/tr.po
index c6cbfef3ee..009279a010 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -78,13 +78,16 @@ msgstr ""
 "%d adres pinleri, %d RGB pinleri ve %d döşemeleri %d'nin yüksekliği "
 "gösterir, %d'nin değil"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -918,13 +921,14 @@ 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
+msgid "Expected an %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -3817,6 +3821,7 @@ msgstr ""
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index f175c017f0..fb01e7282b 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -77,13 +77,16 @@ msgstr ""
 "%d de zhǐ yǐn jiǎo, %d rgb yǐn jiǎo hé %d qiē piàn biǎo shì %d de gāo dù, ér "
 "bù shì %d"
 
+#: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
 #: ports/espressif/common-hal/rtc/RTC.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
-#: ports/mimxrt10xx/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
 #: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
-#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/rtc/RTC.c
+#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
+#: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -919,14 +922,15 @@ msgstr "cuò wù: bǎng dìng shī bài"
 
 #: 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/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Yùqí %q"
 
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an alarm"
-msgstr "yù qī yǒu jǐng bào"
+msgid "Expected an %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -3863,6 +3867,7 @@ msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
 msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
@@ -4418,6 +4423,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 "Expected an alarm"
+#~ msgstr "yù qī yǒu jǐng bào"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "suǒyǒu I2C mùbiāo dōu zài shǐyòng zhōng"
 

From 593a1f2bc0c20d4b81933923cd358e91ada8a6af Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 16 Sep 2022 14:32:39 +0200
Subject: [PATCH 0985/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 2c6455215a..c79990fc9a 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -85,6 +85,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q dan %q berisi pin duplikat"
diff --git a/locale/cs.po b/locale/cs.po
index 487cbb2def..6f10103a35 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -86,6 +86,10 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d"
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q a %q obsahují duplicitní piny"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 68fe15f5bb..566145c15c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -87,6 +87,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q und %q enthalten doppelte Pins"
diff --git a/locale/el.po b/locale/el.po
index f39aa0d674..50366c8d8a 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -79,6 +79,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 81829b25cc..db372a4fc4 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -89,6 +89,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q and %q contain duplicate pins"
diff --git a/locale/es.po b/locale/es.po
index f9e9940f7c..f79e7c060a 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -88,6 +88,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/fil.po b/locale/fil.po
index d31c061e39..58b74e62cf 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -80,6 +80,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 3fbf929d49..aaa835e358 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -91,6 +91,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q et %q contiennent des broches en double"
diff --git a/locale/hi.po b/locale/hi.po
index 45b4ae346b..2d338e1f49 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -79,6 +79,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 95b543638f..d2335ce6d0 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -86,6 +86,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 5cfb2e6d67..b44537d22e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -84,6 +84,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 74dde7a983..dce4a9c251 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -80,6 +80,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 4641a172b1..34bbd3f9e2 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -82,6 +82,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index b1d008b7be..ce71fd2314 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -84,6 +84,10 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b256342ee5..779143c4ea 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -88,6 +88,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q e %q contêm pinos duplicados"
diff --git a/locale/ru.po b/locale/ru.po
index 181af42d77..a1243d9a7e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -87,6 +87,10 @@ msgstr "%d адресные пины, %d rgb пины и %d плитки ука
 msgid "%q"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q и %q содержат пины-дупликаты"
diff --git a/locale/sv.po b/locale/sv.po
index 5a34dc619e..6ff618f17e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -87,6 +87,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q och %q innehåller duplicerade pinnar"
diff --git a/locale/tr.po b/locale/tr.po
index 009279a010..1514a45ed8 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -91,6 +91,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q ve %q yinelenen pinler içeriyor"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index fb01e7282b..289b04f3b1 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -90,6 +90,10 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q hé %q bāo hán chóng fù yǐn jiǎo"

From 6f8fe1b3e13ce67613115f16d79fec4e0690addb Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 16 Sep 2022 09:34:25 -0400
Subject: [PATCH 0986/2403] touch up analogbufio ValueError msg; consolidate
 with another message

---
 locale/circuitpython.pot                 | 15 +++++----------
 shared-bindings/analogbufio/BufferedIn.c |  2 +-
 shared-bindings/audiocore/RawSample.c    |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 30971fd9b1..52f1bdb5ad 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -79,10 +79,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -163,6 +159,11 @@ msgstr ""
 msgid "%q must be >= 1"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3878,12 +3879,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index a0a0f27161..12a8d90e61 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -98,7 +98,7 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
         bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError_varg(translate("%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"), MP_QSTR_buffer);
+        mp_raise_ValueError_varg(translate("%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"), MP_QSTR_buffer);
     }
 
     // Validate sample rate here
diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c
index 02d4bbaa2f..85ad752bab 100644
--- a/shared-bindings/audiocore/RawSample.c
+++ b/shared-bindings/audiocore/RawSample.c
@@ -88,7 +88,7 @@ STATIC mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_a
     if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
         bytes_per_sample = 2;
     } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError(translate("sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or 'B'"));
+        mp_raise_ValueError_varg(translate("%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"), MP_QSTR_buffer);
     }
     common_hal_audioio_rawsample_construct(self, ((uint8_t *)bufinfo.buf), bufinfo.len,
         bytes_per_sample, signed_samples, args[ARG_channel_count].u_int,

From f11ef4cc4e1d3fa2f07f6124575f534fc8ef8238 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 16 Sep 2022 10:24:41 -0500
Subject: [PATCH 0987/2403] makeversionhdr should be unforgiving

Recently(?) github started making it the default to only copy a single
branch (e.g., main) and NO TAGS into new forks.

This makes the step of the build process that determines the CircuitPython
version not work, because tags are expected to be present. When tags are
not present, the version number is only a git hash. The version number
ends up being 0.0.0.

This causes problems with libraries that check for CircuitPython version
to determine compatibility, among other things.

We'll do other things to improve the situation, such as document it.
But it'd also be good if the build stopped when this detectable condition
occurs.
---
 py/makeversionhdr.py | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index e4ddf9fa1e..6576c3abbb 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -59,29 +59,25 @@ def get_version_info_from_git():
     return git_tag, git_hash, ver
 
 
-def get_version_info_from_docs_conf():
-    with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "conf.py")) as f:
-        for line in f:
-            if line.startswith("version = release = '"):
-                ver = line.strip().split(" = ")[2].strip("'")
-                git_tag = "v" + ver
-                ver = ver.split(".")
-                if len(ver) == 2:
-                    ver.append("0")
-                return git_tag, "", ver
-    return None
+def cannot_determine_version():
+    raise SystemExit(
+        """Cannot determine version.
+
+CircuitPython must be built from a git clone with tags.
+If you cloned from a fork, fetch the tags from adafruit/circuitpython as follows:
+
+    git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD"""
+    )
 
 
 def make_version_header(filename):
-    # Get version info using git, with fallback to docs/conf.py
+    # Get version info using git (required)
     info = get_version_info_from_git()
     if info is None:
-        info = get_version_info_from_docs_conf()
-
+        cannot_determine_version()
     git_tag, git_hash, ver = info
     if len(ver) < 3:
-        ver = ("0", "0", "0")
-        version_string = git_hash
+        cannot_determine_version()
     else:
         version_string = ".".join(ver)
 

From bdb4793b3e18638ffda289fcd58671a8fad442b2 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Fri, 16 Sep 2022 13:01:04 +0000
Subject: [PATCH 0988/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 6ff618f17e..330ba910a1 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: 2022-08-11 17:18+0000\n"
+"PO-Revision-Date: 2022-09-16 16:46+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.14-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: main.c
 msgid ""
@@ -90,6 +90,7 @@ msgstr "%q"
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
 msgstr ""
+"%q ``måste`` vara en bytearray eller matris av typen 'h', 'H', 'b' eller 'B'"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -931,7 +932,7 @@ msgstr "Förväntade %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
-msgstr ""
+msgstr "Förväntade en %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -2944,6 +2945,8 @@ msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"esp32_camera.Camera kräver reserverad PSRAM att konfigureras. Se "
+"dokumentationen för instruktioner."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"

From e069c6deadd66cc84ba96af2905fc0a7f6feb8fd Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 16 Sep 2022 18:46:34 +0200
Subject: [PATCH 0989/2403] 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             | 15 +++++----------
 locale/cs.po             | 15 +++++----------
 locale/de_DE.po          | 24 ++++++++++++------------
 locale/el.po             | 15 +++++----------
 locale/en_GB.po          | 24 ++++++++++++------------
 locale/es.po             | 24 ++++++++++++------------
 locale/fil.po            | 24 ++++++++++++------------
 locale/fr.po             | 24 ++++++++++++------------
 locale/hi.po             | 15 +++++----------
 locale/it_IT.po          | 24 ++++++++++++------------
 locale/ja.po             | 22 +++++++++++-----------
 locale/ko.po             | 15 +++++----------
 locale/nl.po             | 24 ++++++++++++------------
 locale/pl.po             | 23 ++++++++++++-----------
 locale/pt_BR.po          | 24 ++++++++++++------------
 locale/ru.po             | 15 +++++----------
 locale/sv.po             | 30 +++++++++++++++++-------------
 locale/tr.po             | 15 +++++----------
 locale/zh_Latn_pinyin.po | 24 ++++++++++++------------
 19 files changed, 183 insertions(+), 213 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index c79990fc9a..d7044bf74e 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -85,10 +85,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q dan %q berisi pin duplikat"
@@ -169,6 +165,11 @@ msgstr "%q harus >= 0"
 msgid "%q must be >= 1"
 msgstr "%q harus >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q harus berupa string"
@@ -3910,12 +3911,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/cs.po b/locale/cs.po
index 6f10103a35..27f426e658 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -86,10 +86,6 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d"
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q a %q obsahují duplicitní piny"
@@ -170,6 +166,11 @@ msgstr "%q musí být >= 0"
 msgid "%q must be >= 1"
 msgstr "%q musí být > = 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q musí být string"
@@ -3896,12 +3897,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 566145c15c..4e109a41cf 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -87,10 +87,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q und %q enthalten doppelte Pins"
@@ -171,6 +167,11 @@ msgstr "%q muss >= 0 sein"
 msgid "%q must be >= 1"
 msgstr "%q muss >= 1 sein"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q muss ein String sein"
@@ -3974,14 +3975,6 @@ msgstr "Roll-Argument muss ein ndarray sein"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source buffer muss ein Bytearray oder ein Array vom Typ 'h', 'H', 'b' "
-"oder 'B' sein"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4458,6 +4451,13 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source buffer muss ein Bytearray oder ein Array vom Typ 'h', 'H', "
+#~ "'b' oder 'B' sein"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Alarm erwartet"
 
diff --git a/locale/el.po b/locale/el.po
index 50366c8d8a..05c36779f8 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -79,10 +79,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -163,6 +159,11 @@ msgstr ""
 msgid "%q must be >= 1"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3878,12 +3879,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index db372a4fc4..92b83cd7aa 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -89,10 +89,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q and %q contain duplicate pins"
@@ -173,6 +169,11 @@ msgstr "%q must be >= 0"
 msgid "%q must be >= 1"
 msgstr "%q must be >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q must be a string"
@@ -3915,14 +3916,6 @@ msgstr "roll argument must be an ndarray"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4396,6 +4389,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Expected an alarm"
 
diff --git a/locale/es.po b/locale/es.po
index f79e7c060a..3ef0d2f6e9 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -88,10 +88,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -172,6 +168,11 @@ msgstr "%q debe ser >= 0"
 msgid "%q must be >= 1"
 msgstr "%q debe ser >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q debe ser una cadena"
@@ -3959,14 +3960,6 @@ msgstr "Argumento enrolado tiene que ser un ndarray"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source buffer debe ser un bytearray o un array de tipo 'h', 'H', 'b' "
-"o'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4441,6 +4434,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source buffer debe ser un bytearray o un array de tipo 'h', 'H', "
+#~ "'b' o'B'"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Un objecto alarm era esperado"
 
diff --git a/locale/fil.po b/locale/fil.po
index 58b74e62cf..63f5990a0a 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -80,10 +80,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -165,6 +161,11 @@ msgstr ""
 msgid "%q must be >= 1"
 msgstr "aarehas na haba dapat ang buffer slices"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3917,14 +3918,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"ang sample_source buffer ay dapat na isang bytearray o array ng uri na 'h', "
-"'H', 'b' o'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4401,6 +4394,13 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "ang sample_source buffer ay dapat na isang bytearray o array ng uri na "
+#~ "'h', 'H', 'b' o'B'"
+
 #, fuzzy
 #~ msgid "%q should be an int"
 #~ msgstr "y ay dapat int"
diff --git a/locale/fr.po b/locale/fr.po
index aaa835e358..9c7ce445ae 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -91,10 +91,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q et %q contiennent des broches en double"
@@ -175,6 +171,11 @@ msgstr "%q doit être >= 0"
 msgid "%q must be >= 1"
 msgstr "%q doit être >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q doit être une chaîne de caractères"
@@ -4004,14 +4005,6 @@ msgstr "paramêtre roll doit être un ndarray"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None, n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"tampon sample_source doit être un bytearray ou une matrice de type 'h', 'H', "
-"'b' ou 'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4486,6 +4479,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "tampon sample_source doit être un bytearray ou une matrice de type 'h', "
+#~ "'H', 'b' ou 'B'"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Une alarme était prévue"
 
diff --git a/locale/hi.po b/locale/hi.po
index 2d338e1f49..65d430d860 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -79,10 +79,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -163,6 +159,11 @@ msgstr ""
 msgid "%q must be >= 1"
 msgstr ""
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3878,12 +3879,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index d2335ce6d0..c2f0018256 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -86,10 +86,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -171,6 +167,11 @@ msgstr "%q deve essere >= 0"
 msgid "%q must be >= 1"
 msgstr "slice del buffer devono essere della stessa lunghezza"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3930,14 +3931,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"il buffer sample_source deve essere un bytearray o un array di tipo 'h', "
-"'H', 'b' o 'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4414,6 +4407,13 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "il buffer sample_source deve essere un bytearray o un array di tipo 'h', "
+#~ "'H', 'b' o 'B'"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q deve essere una tupla di lunghezza 2"
 
diff --git a/locale/ja.po b/locale/ja.po
index b44537d22e..495c7ca978 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -84,10 +84,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -168,6 +164,11 @@ msgstr "%qは0以上でなければなりません"
 msgid "%q must be >= 1"
 msgstr "%qは1以上でなければなりません"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3899,13 +3900,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source バッファには bytearray または 'h','H','b','B'型のarrayが必要"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4379,6 +4373,12 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source バッファには bytearray または 'h','H','b','B'型のarrayが必要"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%qは長さ2のタプルでなければなりません"
 
diff --git a/locale/ko.po b/locale/ko.po
index dce4a9c251..aa3d738f01 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -80,10 +80,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -164,6 +160,11 @@ msgstr ""
 msgid "%q must be >= 1"
 msgstr "%q 는 >=1이어야합니다"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3882,12 +3883,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/nl.po b/locale/nl.po
index 34bbd3f9e2..76577117fa 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -82,10 +82,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -166,6 +162,11 @@ msgstr "%q moet >= 0 zijn"
 msgid "%q must be >= 1"
 msgstr "%q moet >= 1 zijn"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3915,14 +3916,6 @@ msgstr "roll argument moet een ndarray zijn"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source buffer moet een bytearray of array van type 'h', 'H', 'b' of "
-"'B' zijn"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4396,6 +4389,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source buffer moet een bytearray of array van type 'h', 'H', 'b' "
+#~ "of 'B' zijn"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Verwachtte een alarm"
 
diff --git a/locale/pl.po b/locale/pl.po
index ce71fd2314..bdda99d827 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -84,10 +84,6 @@ msgstr ""
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -168,6 +164,11 @@ msgstr "%q musi być >= 0"
 msgid "%q must be >= 1"
 msgstr "%q musi być >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr ""
@@ -3891,13 +3892,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"bufor sample_source musi być bytearray lub tablicą typu 'h', 'H', 'b' lub 'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4371,6 +4365,13 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "bufor sample_source musi być bytearray lub tablicą typu 'h', 'H', 'b' lub "
+#~ "'B'"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q musi być krotką o długości 2"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 779143c4ea..605b3fdc74 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -88,10 +88,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q e %q contêm pinos duplicados"
@@ -172,6 +168,11 @@ msgstr "%q deve ser >= 0"
 msgid "%q must be >= 1"
 msgstr "%q deve ser >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q deve ser uma string"
@@ -3983,14 +3984,6 @@ msgstr "argumento de enrolar deve ser um ndarray"
 msgid "rsplit(None,n)"
 msgstr "rsplit(Nenhum,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"O buffer sample_source deve ser um bytearray ou matriz do tipo 'h', 'H', 'b' "
-"ou 'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4464,6 +4457,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "O buffer sample_source deve ser um bytearray ou matriz do tipo 'h', 'H', "
+#~ "'b' ou 'B'"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Um alarme era esperado"
 
diff --git a/locale/ru.po b/locale/ru.po
index a1243d9a7e..7ee166c7ed 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -87,10 +87,6 @@ msgstr "%d адресные пины, %d rgb пины и %d плитки ука
 msgid "%q"
 msgstr ""
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q и %q содержат пины-дупликаты"
@@ -171,6 +167,11 @@ msgstr "%q должен быть >= 0"
 msgid "%q must be >= 1"
 msgstr "%q должен быть >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q должен быть строкой"
@@ -3927,12 +3928,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/sv.po b/locale/sv.po
index 330ba910a1..e5826aab11 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -87,11 +87,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-"%q ``måste`` vara en bytearray eller matris av typen 'h', 'H', 'b' eller 'B'"
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q och %q innehåller duplicerade pinnar"
@@ -172,6 +167,11 @@ msgstr "%q måste vara >= 0"
 msgid "%q must be >= 1"
 msgstr "%q måste vara >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q måste vara en sträng"
@@ -3943,14 +3943,6 @@ msgstr "argumentet roll måste vara en ndarray"
 msgid "rsplit(None,n)"
 msgstr "rsplit(None,n)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"sample_source buffert måste vara en bytearray eller matris av typ 'h', 'H', "
-"'b' eller 'B'"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4424,6 +4416,18 @@ 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`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
+#~ msgstr ""
+#~ "%q ``måste`` vara en bytearray eller matris av typen 'h', 'H', 'b' eller "
+#~ "'B'"
+
+#~ msgid ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "sample_source buffert måste vara en bytearray eller matris av typ 'h', "
+#~ "'H', 'b' eller 'B'"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Förväntade ett larm"
 
diff --git a/locale/tr.po b/locale/tr.po
index 1514a45ed8..bd1c3e73eb 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -91,10 +91,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q ve %q yinelenen pinler içeriyor"
@@ -175,6 +171,11 @@ msgstr "%q >= 0 olmalıdır"
 msgid "%q must be >= 1"
 msgstr "%q >= 1 olmalıdır"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q bir string olmalıdır"
@@ -3897,12 +3898,6 @@ msgstr ""
 msgid "rsplit(None,n)"
 msgstr ""
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 289b04f3b1..ddb1dbd821 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -90,10 +90,6 @@ msgstr ""
 msgid "%q"
 msgstr "%q"
 
-#: shared-bindings/analogbufio/BufferedIn.c
-msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
-msgstr ""
-
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr "%q hé %q bāo hán chóng fù yǐn jiǎo"
@@ -174,6 +170,11 @@ msgstr "%q bìxū > = 0"
 msgid "%q must be >= 1"
 msgstr "%q bìxū >= 1"
 
+#: shared-bindings/analogbufio/BufferedIn.c
+#: shared-bindings/audiocore/RawSample.c
+msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be a string"
 msgstr "%q bìxū shì yí gè zì fú chuàn"
@@ -3943,14 +3944,6 @@ msgstr "gǔn dòng cān shù bì xū shì ndarray"
 msgid "rsplit(None,n)"
 msgstr "Rchāifēn(wú,N)"
 
-#: shared-bindings/audiocore/RawSample.c
-msgid ""
-"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
-"'B'"
-msgstr ""
-"yàngběn yuán_yuán huǎnchōng qū bìxū shì zì yǎnlèi huò lèixíng 'h', 'H', 'b' "
-"huò 'B' de shùzǔ"
-
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
 msgid "sampling rate out of range"
@@ -4427,6 +4420,13 @@ 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 ""
+#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
+#~ "or 'B'"
+#~ msgstr ""
+#~ "yàngběn yuán_yuán huǎnchōng qū bìxū shì zì yǎnlèi huò lèixíng 'h', 'H', "
+#~ "'b' huò 'B' de shùzǔ"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "yù qī yǒu jǐng bào"
 

From 5f65a887a1780299c1dc09ff20c334f0953cc8be Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Fri, 16 Sep 2022 17:48:18 +0000
Subject: [PATCH 0990/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index e5826aab11..03c918a6be 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: 2022-09-16 16:46+0000\n"
+"PO-Revision-Date: 2022-09-16 18:51+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -171,6 +171,8 @@ msgstr "%q måste vara >= 1"
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
+"%q måste vara en bytearray eller en array av typen \"h\", \"H\", \"b\" eller "
+"\"B\""
 
 #: py/argcheck.c
 msgid "%q must be a string"

From b2ffda219a06cb87b2b0fda29db64d5965f81321 Mon Sep 17 00:00:00 2001
From: Paul Price <56952812+strid3r21@users.noreply.github.com>
Date: Sat, 17 Sep 2022 16:53:24 -0400
Subject: [PATCH 0991/2403] updated a pin definition

---
 ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
index e6c02d59d5..7696986472 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c
@@ -93,7 +93,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LIGHT_SENSOR), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_PIR), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_PIR_SENSOR), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO34) },
 
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },

From 268b3f0dde2bd6d77c286bd4c962a3a6594884bf Mon Sep 17 00:00:00 2001
From: Seon Rozenblum 
Date: Sun, 18 Sep 2022 09:49:30 +1000
Subject: [PATCH 0992/2403] Added support for Unexpected Maker TinyPICO (V2/V3)
 and TinyPICO Nano boards using ESP32-PICO-D4

---
 .../boards/unexpectedmaker_tinypico/board.c   |  52 ++++++++
 .../unexpectedmaker_tinypico/mpconfigboard.h  |  43 +++++++
 .../unexpectedmaker_tinypico/mpconfigboard.mk |  15 +++
 .../boards/unexpectedmaker_tinypico/pins.c    |  84 +++++++++++++
 .../boards/unexpectedmaker_tinypico/sdkconfig |  20 +++
 .../unexpectedmaker_tinypico_nano/board.c     |  46 +++++++
 .../mpconfigboard.h                           |  43 +++++++
 .../mpconfigboard.mk                          |  15 +++
 .../unexpectedmaker_tinypico_nano/pins.c      | 117 ++++++++++++++++++
 .../unexpectedmaker_tinypico_nano/sdkconfig   |  20 +++
 10 files changed, 455 insertions(+)
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico/board.c
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico/pins.c
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico/sdkconfig
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c
 create mode 100644 ports/espressif/boards/unexpectedmaker_tinypico_nano/sdkconfig

diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/board.c b/ports/espressif/boards/unexpectedmaker_tinypico/board.c
new file mode 100644
index 0000000000..e59af9528d
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/board.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+    reset_board();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+    // Turn on APA102 power by default
+    gpio_set_direction(13, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(13, true);
+}
+
+void board_deinit(void) {
+    // Turn off APA102 power
+    gpio_set_direction(13, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(13, false);
+}
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
new file mode 100644
index 0000000000..a12ccb0c18
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "TinyPICO"
+#define MICROPY_HW_MCU_NAME         "ESP32-PICO-D4"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+// #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+// #define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
new file mode 100644
index 0000000000..c3569378ce
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
@@ -0,0 +1,15 @@
+CIRCUITPY_CREATOR_ID =  0xB0B00000
+CIRCUITPY_CREATION_ID = 0x00000001
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/pins.c b/ports/espressif/boards/unexpectedmaker_tinypico/pins.c
new file mode 100644
index 0000000000..b4843960ae
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/pins.c
@@ -0,0 +1,84 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A27), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_SDO), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_SDI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
+
+    // Battery voltage sense pin
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO35) },
+
+    // 5V present sense pin
+    { MP_ROM_QSTR(MP_QSTR_VBUS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO2) }, // APA102
+    { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO12) }, // APA102
+    { MP_ROM_QSTR(MP_QSTR_APA102_PWR), MP_ROM_PTR(&pin_GPIO13) }, // APA102
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/sdkconfig b/ports/espressif/boards/unexpectedmaker_tinypico/sdkconfig
new file mode 100644
index 0000000000..2d4d0d4ecc
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/sdkconfig
@@ -0,0 +1,20 @@
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+# CONFIG_SPIRAM_SIZE is not set
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+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_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c b/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
new file mode 100644
index 0000000000..d66ab9e5f1
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+    reset_board();
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
new file mode 100644
index 0000000000..3cc64859ce
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "TinyPICO Nano"
+#define MICROPY_HW_MCU_NAME         "ESP32-PICO-D4"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+// #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+// #define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
new file mode 100644
index 0000000000..2b36b66245
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
@@ -0,0 +1,15 @@
+CIRCUITPY_CREATOR_ID =  0xB0B00000
+CIRCUITPY_CREATION_ID = 0x00000002
+
+IDF_TARGET = esp32
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c b/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c
new file mode 100644
index 0000000000..61f65a089b
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c
@@ -0,0 +1,117 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_SDI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_SDO), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A27), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_A34), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_A35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_A36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_A37), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_A38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_A39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/sdkconfig b/ports/espressif/boards/unexpectedmaker_tinypico_nano/sdkconfig
new file mode 100644
index 0000000000..2d4d0d4ecc
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/sdkconfig
@@ -0,0 +1,20 @@
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+# CONFIG_SPIRAM_SIZE is not set
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+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_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y

From 745d83adac60727dee4b041b219531b67f4a0257 Mon Sep 17 00:00:00 2001
From: Florin Maticu 
Date: Sun, 18 Sep 2022 16:51:12 +0200
Subject: [PATCH 0993/2403] DFU mode implementation for STM32F4 MCU.

---
 .../stm/common-hal/microcontroller/__init__.c | 14 ++++++--
 ports/stm/supervisor/port.c                   | 32 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/ports/stm/common-hal/microcontroller/__init__.c b/ports/stm/common-hal/microcontroller/__init__.c
index 3bb850f5d3..c399951f54 100644
--- a/ports/stm/common-hal/microcontroller/__init__.c
+++ b/ports/stm/common-hal/microcontroller/__init__.c
@@ -36,7 +36,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
-
+#include "supervisor/port.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/shared/safe_mode.h"
 
@@ -73,15 +73,25 @@ void common_hal_mcu_enable_interrupts(void) {
     __enable_irq();
 }
 
+static bool next_reset_to_bootloader = false;
+
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     if (runmode == RUNMODE_SAFE_MODE) {
         safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
     }
+    if (runmode == RUNMODE_BOOTLOADER) {
+        next_reset_to_bootloader = true;
+    }
 }
 
 void common_hal_mcu_reset(void) {
     filesystem_flush(); // TODO: implement as part of flash improvements
-    NVIC_SystemReset();
+
+    if (next_reset_to_bootloader) {
+        reset_to_bootloader();
+    } else {
+        NVIC_SystemReset();
+    }
 }
 
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index c3f1fee190..7f31f3c7e5 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -276,7 +276,39 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+
+/*
+From STM AN2606:
+Before jumping to bootloader user must:
+• Disable all peripheral clocks
+• Disable used PLL
+• Disable interrupts
+• Clear pending interrupts
+System memory boot mode can be exited by getting out from bootloader activation
+condition and generating hardware reset or using Go command to execute user code
+*/
+    HAL_RCC_DeInit();
+    HAL_DeInit();
+
+    // disable all interupts
+    __disable_irq();
+
+    // Clear all pending interrupts
+    for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / NVIC->ICPR[0]); ++i) {
+        NVIC->ICPR[i] = 0xFFFFFFFF;
+    }
+    // information about jump addresses has been taken from STM AN2606.
+    #if defined(STM32F4)
+    __set_MSP(*((uint32_t *)0x1FFF0000));
+    ((void (*)(void)) * ((uint32_t *)0x1FFF0004))();
+    #else
+    // DFU mode for STM32 variant note implemented.
     NVIC_SystemReset();
+    #endif
+
+    while (true) {
+        asm ("nop;");
+    }
 }
 
 void reset_cpu(void) {

From 5a21c30ab24b3caa1928fc35eedee94acd7d5598 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Sun, 18 Sep 2022 18:43:27 -0700
Subject: [PATCH 0994/2403] Added utime() to the os librady

---
 extmod/vfs_fat.c              | 22 ++++++++++++++++++++++
 shared-bindings/os/__init__.c | 12 ++++++++++++
 shared-bindings/os/__init__.h |  1 +
 shared-module/os/__init__.c   |  7 +++++++
 4 files changed, 42 insertions(+)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index d19a53a9ef..6d5bfbe205 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -415,6 +415,27 @@ STATIC mp_obj_t vfs_fat_umount(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_umount_obj, vfs_fat_umount);
 
+STATIC mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t time_in) {
+    mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = mp_obj_str_get_str(path_in);
+    const int time = mp_obj_get_int(time_in);
+
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_epoch_to_struct_time(time, &tm);
+
+    FILINFO fno;
+    fno.fdate = (WORD)(((tm.tm_year - 1980) * 512U) | tm.tm_mon * 32U | tm.tm_mday);
+    fno.ftime = (WORD)(tm.tm_hour * 2048U | tm.tm_min * 32U | tm.tm_sec / 2U);
+
+    FRESULT res = f_utime(&self->fatfs, path, &fno);
+    if (res != FR_OK) {
+        mp_raise_OSError_fresult(res);
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_utime_obj, vfs_fat_utime);
+
 #if MICROPY_FATFS_USE_LABEL
 STATIC mp_obj_t vfs_fat_getlabel(mp_obj_t self_in) {
     fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
@@ -466,6 +487,7 @@ STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&fat_vfs_statvfs_obj) },
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&vfs_fat_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&fat_vfs_umount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&fat_vfs_utime_obj) },
     #if MICROPY_FATFS_USE_LABEL
     { MP_ROM_QSTR(MP_QSTR_label), MP_ROM_PTR(&fat_vfs_label_obj) },
     #endif
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 407fa02558..54e33b3835 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -247,6 +247,17 @@ STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
+//| def utime(path: str, time: int) -> None:
+//|     """Change the timestamp of a file."""
+//|     ...
+//|
+STATIC mp_obj_t os_utime(mp_obj_t path_in, mp_obj_t time_in) {
+    const char *path = mp_obj_str_get_str(path_in);
+    common_hal_os_utime(path, time_in);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(os_utime_obj, os_utime);
+
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
@@ -263,6 +274,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_stat_obj) },
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&os_statvfs_obj) },
     { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&os_remove_obj) }, // unlink aliases to remove
+    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&os_utime_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&os_sync_obj) },
 
diff --git a/shared-bindings/os/__init__.h b/shared-bindings/os/__init__.h
index 5a27f309b4..749d74baa2 100644
--- a/shared-bindings/os/__init__.h
+++ b/shared-bindings/os/__init__.h
@@ -45,6 +45,7 @@ void common_hal_os_rename(const char *old_path, const char *new_path);
 void common_hal_os_rmdir(const char *path);
 mp_obj_t common_hal_os_stat(const char *path);
 mp_obj_t common_hal_os_statvfs(const char *path);
+void common_hal_os_utime(const char *path, mp_obj_t time);
 
 // Returns true if data was correctly sourced from a true random number generator.
 bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length);
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index 35933ebaf6..e7d49c1a6b 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -226,3 +226,10 @@ mp_obj_t common_hal_os_statvfs(const char *path) {
     }
     return mp_vfs_proxy_call(vfs, MP_QSTR_statvfs, 1, &path_out);
 }
+
+void common_hal_os_utime(const char *path, mp_obj_t time) {
+    mp_obj_t args[2];
+    mp_vfs_mount_t *vfs = lookup_path(path, &args[0]);
+    args[1] = time;
+    mp_vfs_proxy_call(vfs, MP_QSTR_utime, 2, args);
+}

From 3fdc02baa2b432449ec2b39162576f493c06954a Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sun, 18 Sep 2022 21:05:47 +0000
Subject: [PATCH 0995/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 605b3fdc74..c78044a1bf 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: 2022-09-05 04:21+0000\n"
+"PO-Revision-Date: 2022-09-19 21:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.14.1-dev\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: main.c
 msgid ""
@@ -171,7 +171,7 @@ msgstr "%q deve ser >= 1"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -945,7 +945,7 @@ msgstr "Esperado um"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
-msgstr ""
+msgstr "Esperava-se um(a) %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c

From c567b43441eb023c1111ccf5dcd82270ff0b09b9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 20 Sep 2022 14:32:38 -0400
Subject: [PATCH 0996/2403] add CIRCUITPY_USB_IDENTIFICATION to turn off on
 smallest builds

---
 ports/atmel-samd/mpconfigport.mk      | 5 ++---
 py/circuitpy_mpconfig.mk              | 3 +++
 shared-bindings/supervisor/__init__.c | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index a03fc1d320..e6f5759f1c 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -51,12 +51,11 @@ CIRCUITPY_ULAB = 0
 CIRCUITPY_VECTORIO = 0
 CIRCUITPY_ZLIB = 0
 
-# TODO: In CircuitPython 8.0, turn this back on, after `busio.OneWire` is removed.
-# We'd like a smoother transition, but we can't afford the space to have both
-# `busio.OneWire` and `onewireio.OneWire` present on these tiny builds.
+# Turn off a few more things that don't fit in 192kB
 
 ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
 CIRCUITPY_ONEWIREIO ?= 0
+CIRCUITPY_USB_IDENTIFICATION ?= 0
 endif
 
 MICROPY_PY_ASYNC_AWAIT = 0
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 0f4269c522..38bd031047 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -447,6 +447,9 @@ CFLAGS += -DCIRCUITPY_USB_HID_ENABLED_DEFAULT=$(CIRCUITPY_USB_HID_ENABLED_DEFAUL
 CIRCUITPY_USB_HOST ?= 0
 CFLAGS += -DCIRCUITPY_USB_HOST=$(CIRCUITPY_USB_HOST)
 
+CIRCUITPY_USB_IDENTIFICATION ?= $(CIRCUITPY_USB)
+CFLAGS += -DCIRCUITPY_USB_IDENTIFICATION=$(CIRCUITPY_USB_IDENTIFICATION)
+
 # MIDI is available by default, but is not turned on if there are fewer than 8 endpoints.
 CIRCUITPY_USB_MIDI ?= $(CIRCUITPY_USB)
 CFLAGS += -DCIRCUITPY_USB_MIDI=$(CIRCUITPY_USB_MIDI)
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 2a669eb3ad..0feb5055db 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -39,7 +39,7 @@
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/workflow.h"
 
-#if CIRCUITPY_USB
+#if CIRCUITPY_USB_IDENTIFICATION
 #include "supervisor/usb.h"
 #endif
 
@@ -315,7 +315,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin
 //|     ...
 //|
 STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_IDENTIFICATION
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_manufacturer, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
         { MP_QSTR_product, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },

From daf415d9c7e3e249d926637e0110e2bd230a70d0 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 20 Sep 2022 20:08:16 -0400
Subject: [PATCH 0997/2403] squeeze the usb identification code

---
 supervisor/shared/usb/usb.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 7837faaf3b..3e64a79a7d 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -122,7 +122,9 @@ void usb_set_defaults(void) {
     #endif
 };
 
+#if CIRCUITPY_USB_IDENTIFICATION
 supervisor_allocation *usb_identification_allocation;
+#endif
 
 // Some dynamic USB data must be saved after boot.py. How much is needed?
 size_t usb_boot_py_data_size(void) {
@@ -137,16 +139,21 @@ size_t usb_boot_py_data_size(void) {
 
 // Fill in the data to save.
 void usb_get_boot_py_data(uint8_t *temp_storage, size_t temp_storage_size) {
+    #if CIRCUITPY_USB_IDENTIFICATION
     if (usb_identification_allocation) {
         memcpy(temp_storage, usb_identification_allocation->ptr, sizeof(usb_identification_t));
         free_memory(usb_identification_allocation);
+    #else
+    if (false) {
+        // Nothing
+        #endif
     } else {
-        usb_identification_t defaults = {
-            .vid = USB_VID,
-            .pid = USB_PID,
-            .manufacturer_name = USB_MANUFACTURER,
-            .product_name = USB_PRODUCT,
-        };
+        usb_identification_t defaults;
+        // This compiles to less code than using a struct initializer.
+        defaults.vid = USB_VID;
+        defaults.pid = USB_PID;
+        strcpy(defaults.manufacturer_name, USB_MANUFACTURER);
+        strcpy(defaults.product_name, USB_PRODUCT);
         memcpy(temp_storage, &defaults, sizeof(defaults));
     }
 

From 9aca092900cceacee8f4fd853bc9144e5f1de1b0 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 20 Sep 2022 20:09:30 -0400
Subject: [PATCH 0998/2403] squeeze the usb identification code; manufacturer
 was being copied to product

---
 shared-bindings/supervisor/__init__.c | 4 ++--
 supervisor/shared/usb/usb.c           | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 0feb5055db..40f8461af4 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -348,7 +348,7 @@ STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t
         memcpy(identification->manufacturer_name, info.buf, info.len);
         identification->manufacturer_name[info.len] = 0;
     } else {
-        memcpy(identification->manufacturer_name, USB_MANUFACTURER, sizeof(USB_MANUFACTURER));
+        strcpy(identification->manufacturer_name, USB_MANUFACTURER);
     }
 
     if (args.product.u_obj != mp_const_none) {
@@ -357,7 +357,7 @@ STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t
         memcpy(identification->product_name, info.buf, info.len);
         identification->product_name[info.len] = 0;
     } else {
-        memcpy(identification->product_name, USB_MANUFACTURER, sizeof(USB_MANUFACTURER));
+        strcpy(identification->product_name, USB_PRODUCT);
     }
 
     return mp_const_none;
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 3e64a79a7d..a51c6c2659 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -143,11 +143,12 @@ void usb_get_boot_py_data(uint8_t *temp_storage, size_t temp_storage_size) {
     if (usb_identification_allocation) {
         memcpy(temp_storage, usb_identification_allocation->ptr, sizeof(usb_identification_t));
         free_memory(usb_identification_allocation);
+    }
     #else
     if (false) {
-        // Nothing
-        #endif
-    } else {
+    }
+    #endif
+    else {
         usb_identification_t defaults;
         // This compiles to less code than using a struct initializer.
         defaults.vid = USB_VID;

From 21551a82e39e08297fff922d9596bc9e3bea6552 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Tue, 20 Sep 2022 20:56:17 +0200
Subject: [PATCH 0999/2403] Change to allow WaveFile and MP3Decoder to accept a
 file path

---
 shared-bindings/audiocore/WaveFile.c  | 15 ++++++++++++---
 shared-bindings/audiomp3/MP3Decoder.c | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index b1c51a9746..161be859bd 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -69,15 +69,24 @@
 //|           a.play(wav)
 //|           while a.playing:
 //|             pass
-//|           print("stopped")"""
+//|           print("stopped")
+//|
+//|         Support was added for taking a filename as parameter, instead of an opened file,
+//|         and opening the file internally.
+//|         """
 //|         ...
 //|
 STATIC mp_obj_t audioio_wavefile_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, 2, false);
+    mp_obj_t arg = args[0];
+
+    if (mp_obj_is_str(arg)) {
+        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
+    }
 
     audioio_wavefile_obj_t *self = m_new_obj(audioio_wavefile_obj_t);
     self->base.type = &audioio_wavefile_type;
-    if (!mp_obj_is_type(args[0], &mp_type_fileio)) {
+    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
         mp_raise_TypeError(translate("file must be a file opened in byte mode"));
     }
     uint8_t *buffer = NULL;
@@ -88,7 +97,7 @@ STATIC mp_obj_t audioio_wavefile_make_new(const mp_obj_type_t *type, size_t n_ar
         buffer = bufinfo.buf;
         buffer_size = mp_arg_validate_length_range(bufinfo.len, 8, 1024, MP_QSTR_buffer);
     }
-    common_hal_audioio_wavefile_construct(self, MP_OBJ_TO_PTR(args[0]),
+    common_hal_audioio_wavefile_construct(self, MP_OBJ_TO_PTR(arg),
         buffer, buffer_size);
 
     return MP_OBJ_FROM_PTR(self);
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 8251b26c73..2381c8f2cb 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -85,15 +85,25 @@
 //|           a.play(mp3)
 //|           while a.playing:
 //|             pass
-//|           print("stopped")"""
+//|           print("stopped")
+//|
+//|         Support was added for taking a filename as parameter, instead of an opened file,
+//|         and opening the file internally.
+//|         """
 //|         ...
 //|
+
 STATIC mp_obj_t audiomp3_mp3file_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, 2, false);
+    mp_obj_t arg = args[0];
+
+    if (mp_obj_is_str(arg)) {
+        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
+    }
 
     audiomp3_mp3file_obj_t *self = m_new_obj(audiomp3_mp3file_obj_t);
     self->base.type = &audiomp3_mp3file_type;
-    if (!mp_obj_is_type(args[0], &mp_type_fileio)) {
+    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
         mp_raise_TypeError(translate("file must be a file opened in byte mode"));
     }
     uint8_t *buffer = NULL;
@@ -104,7 +114,7 @@ STATIC mp_obj_t audiomp3_mp3file_make_new(const mp_obj_type_t *type, size_t n_ar
         buffer = bufinfo.buf;
         buffer_size = bufinfo.len;
     }
-    common_hal_audiomp3_mp3file_construct(self, MP_OBJ_TO_PTR(args[0]),
+    common_hal_audiomp3_mp3file_construct(self, MP_OBJ_TO_PTR(arg),
         buffer, buffer_size);
 
     return MP_OBJ_FROM_PTR(self);

From 129c5de6709caadba1801669ea211808b1ae74a2 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Tue, 20 Sep 2022 23:46:55 +0200
Subject: [PATCH 1000/2403] Made requested changes in the documentation

---
 shared-bindings/audiocore/WaveFile.c  | 12 ++++--------
 shared-bindings/audiomp3/MP3Decoder.c | 11 ++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 161be859bd..75fb2342b8 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -40,16 +40,15 @@
 //|     be 8 bit unsigned or 16 bit signed. If a buffer is provided, it will be used instead of allocating
 //|     an internal buffer, which can prevent memory fragmentation."""
 //|
-//|     def __init__(self, file: typing.BinaryIO, buffer: WriteableBuffer) -> None:
+//|     def __init__(self, file: Union(typing.BinaryIO, str), buffer: WriteableBuffer) -> None:
 //|         """Load a .wav file for playback with `audioio.AudioOut` or `audiobusio.I2SOut`.
 //|
-//|         :param typing.BinaryIO file: Already opened wave file
+//|         :param Union(typing.BinaryIO, str) file: The name of a wave file (preferred) or an already opened wave file
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: Optional pre-allocated buffer,
 //|           that will be split in half and used for double-buffering of the data.
 //|           The buffer must be 8 to 1024 bytes long.
 //|           If not provided, two 256 byte buffers are initially allocated internally.
 //|
-//|
 //|         Playing a wave file from flash::
 //|
 //|           import board
@@ -61,8 +60,8 @@
 //|           speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 //|           speaker_enable.switch_to_output(value=True)
 //|
-//|           data = open("cplay-5.1-16bit-16khz.wav", "rb")
-//|           wav = audiocore.WaveFile(data)
+//|           wav = audiocore.WaveFile("cplay-5.1-16bit-16khz.wav")  # preferred use
+//|           # wav = audiocore.WaveFile(open("cplay-5.1-16bit-16khz.wav", "rb"))
 //|           a = audioio.AudioOut(board.A0)
 //|
 //|           print("playing")
@@ -70,9 +69,6 @@
 //|           while a.playing:
 //|             pass
 //|           print("stopped")
-//|
-//|         Support was added for taking a filename as parameter, instead of an opened file,
-//|         and opening the file internally.
 //|         """
 //|         ...
 //|
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 2381c8f2cb..09551c3495 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -44,11 +44,11 @@
 //|         https://learn.adafruit.com/Memory-saving-tips-for-CircuitPython/reducing-memory-fragmentation
 //|     """
 //|
-//|     def __init__(self, file: typing.BinaryIO, buffer: WriteableBuffer) -> None:
+//|     def __init__(self, file: Union(typing.BinaryIO, str), buffer: WriteableBuffer) -> None:
 //|
 //|         """Load a .mp3 file for playback with `audioio.AudioOut` or `audiobusio.I2SOut`.
 //|
-//|         :param typing.BinaryIO file: Already opened mp3 file
+//|         :param Union(typing.BinaryIO, str) file: The name of a mp3 file (preferred) or an already opened mp3 file
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: Optional pre-allocated buffer, that will be split in half and used for double-buffering of the data. If not provided, two buffers are allocated internally.  The specific buffer size required depends on the mp3 file.
 //|
 //|         Playback of mp3 audio is CPU intensive, and the
@@ -77,8 +77,8 @@
 //|           speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 //|           speaker_enable.switch_to_output(value=True)
 //|
-//|           data = open("cplay-16bit-16khz-64kbps.mp3", "rb")
-//|           mp3 = audiomp3.MP3Decoder(data)
+//|           mp3 = audiomp3.MP3Decoder("cplay-16bit-16khz-64kbps.mp3")  # preferred use
+//|           # mp3 = audiomp3.MP3Decoder(open("cplay-16bit-16khz-64kbps.mp3", "rb"))
 //|           a = audioio.AudioOut(board.A0)
 //|
 //|           print("playing")
@@ -86,9 +86,6 @@
 //|           while a.playing:
 //|             pass
 //|           print("stopped")
-//|
-//|         Support was added for taking a filename as parameter, instead of an opened file,
-//|         and opening the file internally.
 //|         """
 //|         ...
 //|

From bb40b5c98e9acf855cc10e10ad7c11e3b26b96b0 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Wed, 21 Sep 2022 00:36:46 +0200
Subject: [PATCH 1001/2403] Correction

---
 shared-bindings/audiocore/WaveFile.c  | 4 ++--
 shared-bindings/audiomp3/MP3Decoder.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 75fb2342b8..0f069bfe51 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -40,10 +40,10 @@
 //|     be 8 bit unsigned or 16 bit signed. If a buffer is provided, it will be used instead of allocating
 //|     an internal buffer, which can prevent memory fragmentation."""
 //|
-//|     def __init__(self, file: Union(typing.BinaryIO, str), buffer: WriteableBuffer) -> None:
+//|     def __init__(self, file: Union[str, typing.BinaryIO], buffer: WriteableBuffer) -> None:
 //|         """Load a .wav file for playback with `audioio.AudioOut` or `audiobusio.I2SOut`.
 //|
-//|         :param Union(typing.BinaryIO, str) file: The name of a wave file (preferred) or an already opened wave file
+//|         :param Union[str, typing.BinaryIO] file: The name of a wave file (preferred) or an already opened wave file
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: Optional pre-allocated buffer,
 //|           that will be split in half and used for double-buffering of the data.
 //|           The buffer must be 8 to 1024 bytes long.
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 09551c3495..a7fe365bdf 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -44,11 +44,11 @@
 //|         https://learn.adafruit.com/Memory-saving-tips-for-CircuitPython/reducing-memory-fragmentation
 //|     """
 //|
-//|     def __init__(self, file: Union(typing.BinaryIO, str), buffer: WriteableBuffer) -> None:
+//|     def __init__(self, file: Union[str, typing.BinaryIO], buffer: WriteableBuffer) -> None:
 //|
 //|         """Load a .mp3 file for playback with `audioio.AudioOut` or `audiobusio.I2SOut`.
 //|
-//|         :param Union(typing.BinaryIO, str) file: The name of a mp3 file (preferred) or an already opened mp3 file
+//|         :param Union[str, typing.BinaryIO] file: The name of a mp3 file (preferred) or an already opened mp3 file
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: Optional pre-allocated buffer, that will be split in half and used for double-buffering of the data. If not provided, two buffers are allocated internally.  The specific buffer size required depends on the mp3 file.
 //|
 //|         Playback of mp3 audio is CPU intensive, and the

From 9c5abb6d7abba342bec2ebf55c0e00cfe202e949 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Wed, 21 Sep 2022 12:52:17 +0200
Subject: [PATCH 1002/2403] Change the examples in documentation

---
 shared-bindings/audiocore/WaveFile.c  | 3 +--
 shared-bindings/audiomp3/MP3Decoder.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 0f069bfe51..8de1a3970f 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -60,8 +60,7 @@
 //|           speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 //|           speaker_enable.switch_to_output(value=True)
 //|
-//|           wav = audiocore.WaveFile("cplay-5.1-16bit-16khz.wav")  # preferred use
-//|           # wav = audiocore.WaveFile(open("cplay-5.1-16bit-16khz.wav", "rb"))
+//|           wav = audiocore.WaveFile("cplay-5.1-16bit-16khz.wav")
 //|           a = audioio.AudioOut(board.A0)
 //|
 //|           print("playing")
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index a7fe365bdf..f1b5a29cd5 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -77,8 +77,7 @@
 //|           speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 //|           speaker_enable.switch_to_output(value=True)
 //|
-//|           mp3 = audiomp3.MP3Decoder("cplay-16bit-16khz-64kbps.mp3")  # preferred use
-//|           # mp3 = audiomp3.MP3Decoder(open("cplay-16bit-16khz-64kbps.mp3", "rb"))
+//|           mp3 = audiomp3.MP3Decoder("cplay-16bit-16khz-64kbps.mp3")
 //|           a = audioio.AudioOut(board.A0)
 //|
 //|           print("playing")

From ea15a9118ad50dabc29934d7b08261ee2da51128 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 16 Sep 2022 18:46:02 -0400
Subject: [PATCH 1003/2403] ringbuf cleanup

---
 .../common-hal/_bleio/CharacteristicBuffer.c  |   1 +
 .../ble_hci/common-hal/_bleio/PacketBuffer.c  |   5 +-
 ports/broadcom/common-hal/busio/UART.c        |   5 +-
 ports/broadcom/common-hal/busio/UART.h        |   4 +-
 .../common-hal/_bleio/CharacteristicBuffer.c  |   7 +-
 .../common-hal/_bleio/PacketBuffer.c          |  13 +-
 .../common-hal/_bleio/CharacteristicBuffer.c  |   6 +-
 ports/nrf/common-hal/_bleio/PacketBuffer.c    |  11 +-
 ports/nrf/common-hal/busio/UART.c             |  22 ++--
 ports/nrf/common-hal/busio/UART.h             |   1 -
 ports/raspberrypi/common-hal/busio/UART.c     |  44 ++++---
 ports/stm/common-hal/busio/UART.c             |  11 +-
 ports/unix/coverage.c                         |  24 ++--
 py/ringbuf.c                                  | 120 +++++++-----------
 py/ringbuf.h                                  |  23 ++--
 15 files changed, 136 insertions(+), 161 deletions(-)

diff --git a/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c b/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c
index 0d87f03ae3..5c8c659e36 100644
--- a/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c
+++ b/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c
@@ -93,6 +93,7 @@ bool common_hal_bleio_characteristic_buffer_deinited(bleio_characteristic_buffer
 void common_hal_bleio_characteristic_buffer_deinit(bleio_characteristic_buffer_obj_t *self) {
     if (!common_hal_bleio_characteristic_buffer_deinited(self)) {
         bleio_characteristic_clear_observer(self->characteristic);
+        ringbuf_deinit(&self->ringbuf);
     }
 }
 
diff --git a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
index 7380d7ed4f..b690909029 100644
--- a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
+++ b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
@@ -37,13 +37,13 @@
 #include "supervisor/shared/tick.h"
 
 STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) {
-    if (len + sizeof(uint16_t) > ringbuf_capacity(&self->ringbuf)) {
+    if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) {
         // This shouldn't happen.
         return;
     }
     // Push all the data onto the ring buffer.
     // Make room for the new value by dropping the oldest packets first.
-    while (ringbuf_capacity(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
+    while (ringbuf_size(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
         uint16_t packet_length;
         ringbuf_get_n(&self->ringbuf, (uint8_t *)&packet_length, sizeof(uint16_t));
         for (uint16_t i = 0; i < packet_length; i++) {
@@ -264,5 +264,6 @@ 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) {
     if (!common_hal_bleio_packet_buffer_deinited(self)) {
         bleio_characteristic_clear_observer(self->characteristic);
+        ringbuf_deinit(&self->ringbuf);
     }
 }
diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c
index 52d1b7a418..6d97b42c76 100644
--- a/ports/broadcom/common-hal/busio/UART.c
+++ b/ports/broadcom/common-hal/busio/UART.c
@@ -208,7 +208,9 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     self->sigint_enabled = sigint_enabled;
 
     if (rx != NULL) {
+        // Use the provided buffer when given.
         if (receiver_buffer != NULL) {
+            ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
             self->ringbuf = (ringbuf_t) { receiver_buffer, receiver_buffer_size };
         } else {
             // Initially allocate the UART's buffer in the long-lived part of the
@@ -217,7 +219,6 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             // self->buffer, so do it manually.  (However, as long as internal
             // pointers like this are NOT moved, allocating the buffer
             // in the long-lived pool is not strictly necessary)
-            // (This is a macro.)
             if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
                 m_malloc_fail(receiver_buffer_size);
             }
@@ -337,7 +338,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
         pl011->CR = 0;
     }
     active_uart[self->uart_id] = NULL;
-    ringbuf_free(&self->ringbuf);
+    ringbuf_deinit(&self->ringbuf);
     uart_status[self->uart_id] = STATUS_FREE;
     common_hal_reset_pin(self->tx_pin);
     common_hal_reset_pin(self->rx_pin);
diff --git a/ports/broadcom/common-hal/busio/UART.h b/ports/broadcom/common-hal/busio/UART.h
index 0590bc28b6..57926ca58b 100644
--- a/ports/broadcom/common-hal/busio/UART.h
+++ b/ports/broadcom/common-hal/busio/UART.h
@@ -36,11 +36,11 @@ typedef struct {
     const mcu_pin_obj_t *rx_pin;
     const mcu_pin_obj_t *cts_pin;
     const mcu_pin_obj_t *rts_pin;
-    uint8_t uart_id;
     uint32_t baudrate;
     uint32_t timeout_ms;
-    bool sigint_enabled;
     ringbuf_t ringbuf;
+    bool sigint_enabled;
+    uint8_t uart_id;
 } busio_uart_obj_t;
 
 extern void reset_uart(void);
diff --git a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
index fc3d0bbf06..48be3abd67 100644
--- a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
@@ -72,11 +72,7 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     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;
+    ringbuf_init(&self->ringbuf, buffer, buffer_size);
 
     if (static_handler_entry != NULL) {
         ble_event_add_handler_entry((ble_event_handler_entry_t *)static_handler_entry, characteristic_buffer_on_ble_evt, self);
@@ -131,6 +127,7 @@ void common_hal_bleio_characteristic_buffer_deinit(bleio_characteristic_buffer_o
     if (!common_hal_bleio_characteristic_buffer_deinited(self)) {
         ble_event_remove_handler(characteristic_buffer_on_ble_evt, self);
         self->characteristic = NULL;
+        ringbuf_deinit(&self->ringbuf);
     }
 }
 
diff --git a/ports/espressif/common-hal/_bleio/PacketBuffer.c b/ports/espressif/common-hal/_bleio/PacketBuffer.c
index 4e65bf309c..3b3e51df61 100644
--- a/ports/espressif/common-hal/_bleio/PacketBuffer.c
+++ b/ports/espressif/common-hal/_bleio/PacketBuffer.c
@@ -42,13 +42,13 @@
 
 STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, const struct os_mbuf *mbuf) {
     size_t len = OS_MBUF_PKTLEN(mbuf);
-    if (len + sizeof(uint16_t) > ringbuf_capacity(&self->ringbuf)) {
+    if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) {
         // This shouldn't happen but can if our buffer size was much smaller than
         // the writes the client actually makes.
         return;
     }
     // Make room for the new value by dropping the oldest packets first.
-    while (ringbuf_capacity(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
+    while (ringbuf_size(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
         uint16_t packet_length;
         ringbuf_get_n(&self->ringbuf, (uint8_t *)&packet_length, sizeof(uint16_t));
         for (uint16_t i = 0; i < packet_length; i++) {
@@ -164,10 +164,7 @@ void _common_hal_bleio_packet_buffer_construct(
     }
 
     if (incoming) {
-        self->ringbuf.buf = (uint8_t *)incoming_buffer;
-        self->ringbuf.size = incoming_buffer_size;
-        self->ringbuf.iget = 0;
-        self->ringbuf.iput = 0;
+        ringbuf_init(&self->ringbuf, (uint8_t *)incoming_buffer, incoming_buffer_size);
     }
 
     self->packet_queued = false;
@@ -219,8 +216,7 @@ void common_hal_bleio_packet_buffer_construct(
     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);
+        ringbuf_init(&self->ringbuf, (uint8_t *)incoming_buffer, incoming_buffer_size);
     }
 
     uint32_t *outgoing1 = NULL;
@@ -414,5 +410,6 @@ 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) {
     if (!common_hal_bleio_packet_buffer_deinited(self)) {
         ble_event_remove_handler(packet_buffer_on_ble_client_evt, self);
+        ringbuf_deinit(&self->ringbuf);
     }
 }
diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
index 5772616ee5..d13ffa1a94 100644
--- a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
@@ -90,10 +90,7 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     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;
+    ringbuf_init(&self->ringbuf, buffer, buffer_size);
 
     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);
@@ -159,6 +156,7 @@ void common_hal_bleio_characteristic_buffer_deinit(bleio_characteristic_buffer_o
     if (!common_hal_bleio_characteristic_buffer_deinited(self)) {
         ble_drv_remove_event_handler(characteristic_buffer_on_ble_evt, self);
         self->characteristic = NULL;
+        ringbuf_deinit(&self->ringbuf);
     }
 }
 
diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nrf/common-hal/_bleio/PacketBuffer.c
index 38dcdd9041..52402a93f1 100644
--- a/ports/nrf/common-hal/_bleio/PacketBuffer.c
+++ b/ports/nrf/common-hal/_bleio/PacketBuffer.c
@@ -43,7 +43,7 @@
 #include "supervisor/shared/bluetooth/serial.h"
 
 STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) {
-    if (len + sizeof(uint16_t) > ringbuf_capacity(&self->ringbuf)) {
+    if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) {
         // This shouldn't happen but can if our buffer size was much smaller than
         // the writes the client actually makes.
         return;
@@ -52,7 +52,7 @@ STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uin
     uint8_t is_nested_critical_region;
     sd_nvic_critical_region_enter(&is_nested_critical_region);
     // Make room for the new value by dropping the oldest packets first.
-    while (ringbuf_capacity(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
+    while (ringbuf_size(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
         uint16_t packet_length;
         ringbuf_get_n(&self->ringbuf, (uint8_t *)&packet_length, sizeof(uint16_t));
         for (uint16_t i = 0; i < packet_length; i++) {
@@ -233,10 +233,7 @@ void _common_hal_bleio_packet_buffer_construct(
     }
 
     if (incoming) {
-        self->ringbuf.buf = (uint8_t *)incoming_buffer;
-        self->ringbuf.size = incoming_buffer_size;
-        self->ringbuf.iget = 0;
-        self->ringbuf.iput = 0;
+        ringbuf_init(&self->ringbuf, (uint8_t *)incoming_buffer, incoming_buffer_size);
     }
 
     self->packet_queued = false;
@@ -502,7 +499,9 @@ 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) {
+
     if (!common_hal_bleio_packet_buffer_deinited(self)) {
         ble_drv_remove_event_handler(packet_buffer_on_ble_client_evt, self);
+        ringbuf_deinit(&self->ringbuf);
     }
 }
diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index ae8389fd9e..df4a485999 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -213,24 +213,20 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
 
     // Init buffer for rx
     if (rx != NULL) {
-        self->allocated_ringbuf = true;
         // Use the provided buffer when given.
         if (receiver_buffer != NULL) {
-            self->ringbuf.buf = receiver_buffer;
-            self->ringbuf.size = receiver_buffer_size - 1;
-            self->ringbuf.iput = 0;
-            self->ringbuf.iget = 0;
-            self->allocated_ringbuf = false;
+            ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
+        } else {
             // Initially allocate the UART's buffer in the long-lived part of the
             // heap.  UARTs are generally long-lived objects, but the "make long-
             // lived" machinery is incapable of moving internal pointers like
             // self->buffer, so do it manually.  (However, as long as internal
             // pointers like this are NOT moved, allocating the buffer
             // in the long-lived pool is not strictly necessary)
-            // (This is a macro.)
-        } else if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
-            nrfx_uarte_uninit(self->uarte);
-            m_malloc_fail(receiver_buffer_size);
+            if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
+                nrfx_uarte_uninit(self->uarte);
+                m_malloc_fail(receiver_buffer_size);
+            }
         }
 
         self->rx_pin_number = rx->number;
@@ -282,9 +278,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
         self->rx_pin_number = NO_PIN;
         self->rts_pin_number = NO_PIN;
         self->cts_pin_number = NO_PIN;
-        if (self->allocated_ringbuf) {
-            ringbuf_free(&self->ringbuf);
-        }
+        ringbuf_deinit(&self->ringbuf);
 
         for (size_t i = 0; i < MP_ARRAY_SIZE(nrfx_uartes); i++) {
             if (self->uarte == &nrfx_uartes[i]) {
@@ -305,7 +299,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
 
     // check removed to reduce code size
     /*
-    if (len > ringbuf_capacity(&self->ringbuf)) {
+    if (len > ringbuf_size(&self->ringbuf)) {
         mp_raise_ValueError(translate("Reading >receiver_buffer_size bytes is not supported"));
     }
     */
diff --git a/ports/nrf/common-hal/busio/UART.h b/ports/nrf/common-hal/busio/UART.h
index 140f8d0c0a..2eaf584403 100644
--- a/ports/nrf/common-hal/busio/UART.h
+++ b/ports/nrf/common-hal/busio/UART.h
@@ -44,7 +44,6 @@ typedef struct {
     ringbuf_t ringbuf;
     uint8_t rx_char;    // EasyDMA buf
     bool rx_paused;     // set by irq if no space in rbuf
-    bool allocated_ringbuf;
 
     uint8_t tx_pin_number;
     uint8_t rx_pin_number;
diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
index c06bb21903..4212249ec9 100644
--- a/ports/raspberrypi/common-hal/busio/UART.c
+++ b/ports/raspberrypi/common-hal/busio/UART.c
@@ -155,27 +155,33 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     uart_set_hw_flow(self->uart, (cts != NULL), (rts != NULL));
 
     if (rx != NULL) {
-        // Initially allocate the UART's buffer in the long-lived part of the
-        // heap. UARTs are generally long-lived objects, but the "make long-
-        // lived" machinery is incapable of moving internal pointers like
-        // self->buffer, so do it manually.  (However, as long as internal
-        // pointers like this are NOT moved, allocating the buffer
-        // in the long-lived pool is not strictly necessary)
-        // (This is a macro.)
-        if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
-            m_malloc_fail(receiver_buffer_size);
-        }
-        active_uarts[uart_id] = self;
-        if (uart_id == 1) {
-            self->uart_irq_id = UART1_IRQ;
-            irq_set_exclusive_handler(self->uart_irq_id, uart1_callback);
+        // Use the provided buffer when given.
+        if (receiver_buffer != NULL) {
+            ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
         } else {
-            self->uart_irq_id = UART0_IRQ;
-            irq_set_exclusive_handler(self->uart_irq_id, uart0_callback);
+            // Initially allocate the UART's buffer in the long-lived part of the
+            // heap. UARTs are generally long-lived objects, but the "make long-
+            // lived" machinery is incapable of moving internal pointers like
+            // self->buffer, so do it manually.  (However, as long as internal
+            // pointers like this are NOT moved, allocating the buffer
+            // in the long-lived pool is not strictly necessary)
+            if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
+                uart_deinit(self->uart);
+                m_malloc_fail(receiver_buffer_size);
+            }
         }
-        irq_set_enabled(self->uart_irq_id, true);
-        uart_set_irq_enables(self->uart, true /* rx has data */, false /* tx needs data */);
     }
+
+    active_uarts[uart_id] = self;
+    if (uart_id == 1) {
+        self->uart_irq_id = UART1_IRQ;
+        irq_set_exclusive_handler(self->uart_irq_id, uart1_callback);
+    } else {
+        self->uart_irq_id = UART0_IRQ;
+        irq_set_exclusive_handler(self->uart_irq_id, uart0_callback);
+    }
+    irq_set_enabled(self->uart_irq_id, true);
+    uart_set_irq_enables(self->uart, true /* rx has data */, false /* tx needs data */);
 }
 
 bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
@@ -187,7 +193,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
         return;
     }
     uart_deinit(self->uart);
-    ringbuf_free(&self->ringbuf);
+    ringbuf_deinit(&self->ringbuf);
     active_uarts[self->uart_id] = NULL;
     uart_status[self->uart_id] = STATUS_FREE;
     reset_pin_number(self->tx_pin);
diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c
index 171e915dd9..48894db5f9 100644
--- a/ports/stm/common-hal/busio/UART.c
+++ b/ports/stm/common-hal/busio/UART.c
@@ -214,9 +214,16 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
 
     // Init buffer for rx and claim pins
     if (self->rx != NULL) {
+        // Use the provided buffer when given.
         if (receiver_buffer != NULL) {
-            self->ringbuf = (ringbuf_t) { receiver_buffer, receiver_buffer_size };
+            ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
         } else {
+            // Initially allocate the UART's buffer in the long-lived part of the
+            // heap. UARTs are generally long-lived objects, but the "make long-
+            // lived" machinery is incapable of moving internal pointers like
+            // self->buffer, so do it manually.  (However, as long as internal
+            // pointers like this are NOT moved, allocating the buffer
+            // in the long-lived pool is not strictly necessary)
             if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
                 m_malloc_fail(receiver_buffer_size);
             }
@@ -281,7 +288,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
         self->rx = NULL;
     }
 
-    ringbuf_free(&self->ringbuf);
+    ringbuf_deinit(&self->ringbuf);
 }
 
 size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 179181dc83..0e4c6dbd48 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -526,7 +526,9 @@ STATIC mp_obj_t extra_coverage(void) {
 
     // ringbuf
     {
-        byte buf[100];
+        #define RINGBUF_SIZE 99
+
+        byte buf[RINGBUF_SIZE];
         ringbuf_t ringbuf;
         ringbuf_init(&ringbuf, &buf[0], sizeof(buf));
 
@@ -546,7 +548,7 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%d %d\n", ringbuf_num_empty(&ringbuf), ringbuf_num_filled(&ringbuf));
 
         // Two-byte put with full ringbuf.
-        for (int i = 0; i < 99; ++i) {
+        for (int i = 0; i < RINGBUF_SIZE; ++i) {
             ringbuf_put(&ringbuf, i);
         }
         mp_printf(&mp_plat_print, "%d %d\n", ringbuf_num_empty(&ringbuf), ringbuf_num_filled(&ringbuf));
@@ -558,16 +560,15 @@ STATIC mp_obj_t extra_coverage(void) {
         ringbuf_get(&ringbuf);
         mp_printf(&mp_plat_print, "%d %d\n", ringbuf_num_empty(&ringbuf), ringbuf_num_filled(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_put16(&ringbuf, 0xcc99));
-        for (int i = 0; i < 97; ++i) {
+        for (int i = 0; i < RINGBUF_SIZE - 2; ++i) {
             ringbuf_get(&ringbuf);
         }
         mp_printf(&mp_plat_print, "%04x\n", ringbuf_get16(&ringbuf));
         mp_printf(&mp_plat_print, "%d %d\n", ringbuf_num_empty(&ringbuf), ringbuf_num_filled(&ringbuf));
 
         // Two-byte put with wrap around on first byte:
-        ringbuf.iput = 0;
-        ringbuf.iget = 0;
-        for (int i = 0; i < 99; ++i) {
+        ringbuf_clear(&ringbuf);
+        for (int i = 0; i < RINGBUF_SIZE; ++i) {
             ringbuf_put(&ringbuf, i);
             ringbuf_get(&ringbuf);
         }
@@ -575,9 +576,8 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%04x\n", ringbuf_get16(&ringbuf));
 
         // Two-byte put with wrap around on second byte:
-        ringbuf.iput = 0;
-        ringbuf.iget = 0;
-        for (int i = 0; i < 98; ++i) {
+        ringbuf_clear(&ringbuf);
+        for (int i = 0; i < RINGBUF_SIZE - 1; ++i) {
             ringbuf_put(&ringbuf, i);
             ringbuf_get(&ringbuf);
         }
@@ -585,13 +585,11 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%04x\n", ringbuf_get16(&ringbuf));
 
         // Two-byte get from empty ringbuf.
-        ringbuf.iput = 0;
-        ringbuf.iget = 0;
+        ringbuf_clear(&ringbuf);
         mp_printf(&mp_plat_print, "%d\n", ringbuf_get16(&ringbuf));
 
         // Two-byte get from ringbuf with one byte available.
-        ringbuf.iput = 0;
-        ringbuf.iget = 0;
+        ringbuf_clear(&ringbuf);
         ringbuf_put(&ringbuf, 0xaa);
         mp_printf(&mp_plat_print, "%d\n", ringbuf_get16(&ringbuf));
     }
diff --git a/py/ringbuf.c b/py/ringbuf.c
index fe47b50068..8a4cb33cbc 100644
--- a/py/ringbuf.c
+++ b/py/ringbuf.c
@@ -27,86 +27,85 @@
 
 #include "ringbuf.h"
 
-bool ringbuf_init(ringbuf_t *r, uint8_t *buf, size_t capacity) {
+bool ringbuf_init(ringbuf_t *r, uint8_t *buf, size_t size) {
     r->buf = buf;
-    r->size = capacity;
-    r->iget = r->iput = 0;
+    r->size = size;
+    r->used = 0;
+    r->next_read = 0;
+    r->next_write = 0;
     return r->buf != NULL;
 }
 
-// Dynamic initialization. This should be accessible from a root pointer.
-// capacity is the number of bytes the ring buffer can hold. The actual
-// size of the buffer is one greater than that, due to how the buffer
-// handles empty and full statuses.
-bool ringbuf_alloc(ringbuf_t *r, size_t capacity, bool long_lived) {
-    r->buf = gc_alloc(capacity + 1, false, long_lived);
-    r->size = capacity + 1;
-    r->iget = r->iput = 0;
-    return r->buf != NULL;
+// Dynamic initialization. This should be accessible from a root pointer..
+bool ringbuf_alloc(ringbuf_t *r, size_t size, bool long_lived) {
+    bool result = ringbuf_init(r, gc_alloc(size, false, long_lived), size);
+    return result;
 }
 
-void ringbuf_free(ringbuf_t *r) {
-    // Free buf by letting gc take care of it. If the VM has finished already,
+void ringbuf_deinit(ringbuf_t *r) {
+    // Free buf by doing nothing and letting gc take care of it. If the VM has finished already,
     // this will be safe.
     r->buf = (uint8_t *)NULL;
     r->size = 0;
     ringbuf_clear(r);
 }
 
-size_t ringbuf_capacity(ringbuf_t *r) {
-    return r->size - 1;
+size_t ringbuf_size(ringbuf_t *r) {
+    return r->size;
 }
 
-// Returns -1 if buffer is empty, else returns byte fetched.
+// Return -1 if buffer is empty, else return byte fetched.
 int ringbuf_get(ringbuf_t *r) {
-    if (r->iget == r->iput) {
+    if (r->used < 1) {
         return -1;
     }
-    uint8_t v = r->buf[r->iget++];
-    if (r->iget >= r->size) {
-        r->iget = 0;
+    uint8_t v = r->buf[r->next_read];
+    r->next_read++;
+    if (r->next_read >= r->size) {
+        r->next_read = 0;
     }
+    r->used--;
     return v;
 }
 
 int ringbuf_get16(ringbuf_t *r) {
-    int v = ringbuf_peek16(r);
-    if (v == -1) {
-        return v;
-    }
-    r->iget += 2;
-    if (r->iget >= r->size) {
-        r->iget -= r->size;
-    }
-    return v;
-}
-
-// Returns -1 if no room in buffer, else returns 0.
-int ringbuf_put(ringbuf_t *r, uint8_t v) {
-    uint32_t iput_new = r->iput + 1;
-    if (iput_new >= r->size) {
-        iput_new = 0;
-    }
-    if (iput_new == r->iget) {
+    if (r->used < 2) {
         return -1;
     }
-    r->buf[r->iput] = v;
-    r->iput = iput_new;
+
+    int high_byte = ringbuf_get(r);
+    int low_byte = ringbuf_get(r);
+    return (high_byte << 8) | low_byte;
+}
+
+// Return -1 if no room in buffer, else return 0.
+int ringbuf_put(ringbuf_t *r, uint8_t v) {
+    if (r->used >= r->size) {
+        return -1;
+    }
+    r->buf[r->next_write] = v;
+    r->next_write++;
+    if (r->next_write >= r->size) {
+        r->next_write = 0;
+    }
+    r->used++;
     return 0;
 }
 
 void ringbuf_clear(ringbuf_t *r) {
-    r->iput = r->iget = 0;
+    r->next_write = 0;
+    r->next_read = 0;
+    r->used = 0;
 }
 
 // Number of free slots that can be written.
 size_t ringbuf_num_empty(ringbuf_t *r) {
-    return (r->size + r->iget - r->iput - 1) % r->size;
+    return r->size - r->used;
 }
 
 // Number of bytes available to read.
 size_t ringbuf_num_filled(ringbuf_t *r) {
-    return (r->size + r->iput - r->iget) % r->size;
+    return r->used;
 }
 
 // If the ring buffer fills up, not all bytes will be written.
@@ -134,37 +133,12 @@ size_t ringbuf_get_n(ringbuf_t *r, uint8_t *buf, size_t bufsize) {
     return bufsize;
 }
 
-int ringbuf_peek16(ringbuf_t *r) {
-    if (r->iget == r->iput) {
-        return -1;
-    }
-    uint32_t iget_a = r->iget + 1;
-    if (iget_a == r->size) {
-        iget_a = 0;
-    }
-    if (iget_a == r->iput) {
-        return -1;
-    }
-    return (r->buf[r->iget] << 8) | (r->buf[iget_a]);
-}
-
 int ringbuf_put16(ringbuf_t *r, uint16_t v) {
-    uint32_t iput_a = r->iput + 1;
-    if (iput_a == r->size) {
-        iput_a = 0;
-    }
-    if (iput_a == r->iget) {
+    if (r->size - r->used < 2) {
         return -1;
     }
-    uint32_t iput_b = iput_a + 1;
-    if (iput_b == r->size) {
-        iput_b = 0;
-    }
-    if (iput_b == r->iget) {
-        return -1;
-    }
-    r->buf[r->iput] = (v >> 8) & 0xff;
-    r->buf[iput_a] = v & 0xff;
-    r->iput = iput_b;
+
+    ringbuf_put(r, (v >> 8) & 0xff);
+    ringbuf_put(r, v & 0xff);
     return 0;
 }
diff --git a/py/ringbuf.h b/py/ringbuf.h
index d868eff1e4..2725bedcca 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -33,19 +33,23 @@
 
 typedef struct _ringbuf_t {
     uint8_t *buf;
-    // Allocated size; capacity is one less. Don't reference this directly.
     uint32_t size;
-    uint32_t iget;
-    uint32_t iput;
+    uint32_t used;
+    uint32_t next_read;
+    uint32_t next_write;
 } ringbuf_t;
 
-// Note that the capacity of the buffer is N-1!
-
-// For static initialization use ringbuf_init()
+// For static initialization with an existing buffer, use ringbuf_init().
 bool ringbuf_init(ringbuf_t *r, uint8_t *buf, size_t capacity);
+
+// For allocation of a buffer on the heap, use ringbuf_alloc().
 bool ringbuf_alloc(ringbuf_t *r, size_t capacity, bool long_lived);
-void ringbuf_free(ringbuf_t *r);
-size_t ringbuf_capacity(ringbuf_t *r);
+
+// Mark ringbuf as no longer in use, and allow any heap storage to be freed by gc.
+void ringbuf_deinit(ringbuf_t *r);
+
+// Note: Ringbuf operations are not atomic.
+size_t ringbuf_size(ringbuf_t *r);
 int ringbuf_get(ringbuf_t *r);
 int ringbuf_put(ringbuf_t *r, uint8_t v);
 void ringbuf_clear(ringbuf_t *r);
@@ -54,9 +58,8 @@ size_t ringbuf_num_filled(ringbuf_t *r);
 size_t ringbuf_put_n(ringbuf_t *r, const uint8_t *buf, size_t bufsize);
 size_t ringbuf_get_n(ringbuf_t *r, uint8_t *buf, size_t bufsize);
 
-// Note: big-endian. No-op if not enough room available for both bytes.
+// Note: big-endian. Return -1 if can't read or write two bytes.
 int ringbuf_get16(ringbuf_t *r);
-int ringbuf_peek16(ringbuf_t *r);
 int ringbuf_put16(ringbuf_t *r, uint16_t v);
 
 #endif // MICROPY_INCLUDED_PY_RINGBUF_H

From 71d649613fe1915428cfa10200ea89a4501c3ae5 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Thu, 22 Sep 2022 00:56:44 -0700
Subject: [PATCH 1004/2403] Updated utime() to take a 2-tuple instead of a
 plain int

---
 extmod/vfs_fat.c              | 13 +++++++++----
 shared-bindings/os/__init__.c |  6 +++---
 shared-bindings/os/__init__.h |  2 +-
 shared-module/os/__init__.c   |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 6d5bfbe205..3a1bdb29c5 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -415,18 +415,23 @@ STATIC mp_obj_t vfs_fat_umount(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_umount_obj, vfs_fat_umount);
 
-STATIC mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t time_in) {
+STATIC mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t times_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path = mp_obj_str_get_str(path_in);
-    const int time = mp_obj_get_int(time_in);
+    if (!mp_obj_is_tuple_compatible(times_in)) {
+        mp_raise_type_arg(&mp_type_TypeError, times_in);
+    }
 
+    mp_obj_t *times;
+    mp_obj_get_array_fixed_n(times_in, 2, ×);
+    const int atime = mp_obj_get_int(times[0]);
+    const int mtime = mp_obj_get_int(times[1]);
     timeutils_struct_time_t tm;
-    timeutils_seconds_since_epoch_to_struct_time(time, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(atime, &tm);
 
     FILINFO fno;
     fno.fdate = (WORD)(((tm.tm_year - 1980) * 512U) | tm.tm_mon * 32U | tm.tm_mday);
     fno.ftime = (WORD)(tm.tm_hour * 2048U | tm.tm_min * 32U | tm.tm_sec / 2U);
-
     FRESULT res = f_utime(&self->fatfs, path, &fno);
     if (res != FR_OK) {
         mp_raise_OSError_fresult(res);
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 54e33b3835..684b0d1735 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -247,13 +247,13 @@ STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
-//| def utime(path: str, time: int) -> None:
+//| def utime(path: str, times: Tuple[int, int]) -> None:
 //|     """Change the timestamp of a file."""
 //|     ...
 //|
-STATIC mp_obj_t os_utime(mp_obj_t path_in, mp_obj_t time_in) {
+STATIC mp_obj_t os_utime(mp_obj_t path_in, mp_obj_t times_in) {
     const char *path = mp_obj_str_get_str(path_in);
-    common_hal_os_utime(path, time_in);
+    common_hal_os_utime(path, times_in);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(os_utime_obj, os_utime);
diff --git a/shared-bindings/os/__init__.h b/shared-bindings/os/__init__.h
index 749d74baa2..00d8c28a50 100644
--- a/shared-bindings/os/__init__.h
+++ b/shared-bindings/os/__init__.h
@@ -45,7 +45,7 @@ void common_hal_os_rename(const char *old_path, const char *new_path);
 void common_hal_os_rmdir(const char *path);
 mp_obj_t common_hal_os_stat(const char *path);
 mp_obj_t common_hal_os_statvfs(const char *path);
-void common_hal_os_utime(const char *path, mp_obj_t time);
+void common_hal_os_utime(const char *path, mp_obj_t times);
 
 // Returns true if data was correctly sourced from a true random number generator.
 bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length);
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index e7d49c1a6b..200fcb2f61 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -227,9 +227,9 @@ mp_obj_t common_hal_os_statvfs(const char *path) {
     return mp_vfs_proxy_call(vfs, MP_QSTR_statvfs, 1, &path_out);
 }
 
-void common_hal_os_utime(const char *path, mp_obj_t time) {
+void common_hal_os_utime(const char *path, mp_obj_t times) {
     mp_obj_t args[2];
     mp_vfs_mount_t *vfs = lookup_path(path, &args[0]);
-    args[1] = time;
+    args[1] = times;
     mp_vfs_proxy_call(vfs, MP_QSTR_utime, 2, args);
 }

From 267ec1dc4fd1299ce63156a1ba57fb7f903e64b7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Jun 2022 08:25:20 -0500
Subject: [PATCH 1005/2403] unify some 'must/should be an int' messages

---
 locale/circuitpython.pot                   | 23 +---------------------
 shared-bindings/displayio/ColorConverter.c |  5 +----
 shared-bindings/displayio/Palette.c        | 17 ++++------------
 shared-bindings/displayio/Shape.c          | 15 +++-----------
 shared-bindings/i2ctarget/I2CTarget.c      |  5 +----
 5 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 52f1bdb5ad..52f72e8bee 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2526,8 +2526,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2714,10 +2713,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2869,10 +2864,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3739,10 +3730,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3980,10 +3967,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4328,10 +4311,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 7b33b1ec8f..f3fd9a2ab9 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -72,10 +72,7 @@ STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, siz
 STATIC mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t color;
-    if (!mp_obj_get_int_maybe(color_obj, &color)) {
-        mp_raise_ValueError(translate("color should be an int"));
-    }
+    mp_int_t color = mp_arg_validate_type_int(color_obj, MP_QSTR_color);
     _displayio_colorspace_t colorspace;
     colorspace.depth = 16;
     uint32_t output_color;
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 89460bfc03..5724c9bc87 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -156,11 +156,8 @@ STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t val
 STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t palette_index;
-    if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
-        mp_raise_ValueError(translate("palette_index should be an int"));
-    }
-    palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
+    mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index);
+    mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
 
     common_hal_displayio_palette_make_transparent(self, palette_index);
     return mp_const_none;
@@ -173,10 +170,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_transparent_obj, displayio_pale
 STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t palette_index;
-    if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
-        mp_raise_ValueError(translate("palette_index should be an int"));
-    }
+    mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index);
     palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
 
     common_hal_displayio_palette_make_opaque(self, palette_index);
@@ -191,10 +185,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_opaque_obj, displayio_palette_o
 STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t palette_index;
-    if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
-        mp_raise_ValueError(translate("palette_index should be an int"));
-    }
+    mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index);
     palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
 
     return mp_obj_new_bool(common_hal_displayio_palette_is_transparent(self, palette_index));
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index 30a51dadce..d5e907ac38 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -80,18 +80,9 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
 STATIC mp_obj_t displayio_shape_obj_set_boundary(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     displayio_shape_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t y;
-    if (!mp_obj_get_int_maybe(args[1], &y)) {
-        mp_raise_ValueError(translate("y should be an int"));
-    }
-    mp_int_t start_x;
-    if (!mp_obj_get_int_maybe(args[2], &start_x)) {
-        mp_raise_ValueError(translate("start_x should be an int"));
-    }
-    mp_int_t end_x;
-    if (!mp_obj_get_int_maybe(args[3], &end_x)) {
-        mp_raise_ValueError(translate("end_x should be an int"));
-    }
+    mp_int_t y = mp_arg_validate_type_int(args[1], MP_ARG_y);
+    mp_int_t start_x = mp_arg_validate_type_int(args[1], MP_ARG_start_x);
+    mp_int_t end_x = mp_arg_validate_type_int(args[1], MP_ARG_end_x);
     common_hal_displayio_shape_set_boundary(self, y, start_x, end_x);
 
     return mp_const_none;
diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 1680585ba5..f094788140 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -85,10 +85,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t
     uint8_t *addresses = NULL;
     unsigned int i = 0;
     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        mp_int_t value;
-        if (!mp_obj_get_int_maybe(item, &value)) {
-            mp_raise_TypeError_varg(translate("can't convert %q to %q"), MP_QSTR_address, MP_QSTR_int);
-        }
+        mp_int_t value = mp_arg_validate_type_int(item, MP_QSTR_address);
         if (value < 0x00 || value > 0x7f) {
             mp_raise_ValueError(translate("address out of bounds"));
         }

From ef35ca1d3ebe4f1835e32e52fbd81225485ae057 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Jun 2022 08:36:22 -0500
Subject: [PATCH 1006/2403] vectorio: Simplify argument checking of x/y values

---
 locale/circuitpython.pot             |  1 -
 shared-bindings/displayio/Shape.c    |  6 +++---
 shared-module/vectorio/Polygon.c     | 26 ++++++++------------------
 shared-module/vectorio/VectorShape.c |  8 ++------
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 52f72e8bee..9e50e4c94b 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -4181,7 +4181,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index d5e907ac38..4bec17608c 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -80,9 +80,9 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
 STATIC mp_obj_t displayio_shape_obj_set_boundary(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     displayio_shape_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t y = mp_arg_validate_type_int(args[1], MP_ARG_y);
-    mp_int_t start_x = mp_arg_validate_type_int(args[1], MP_ARG_start_x);
-    mp_int_t end_x = mp_arg_validate_type_int(args[1], MP_ARG_end_x);
+    mp_int_t y = mp_arg_validate_type_int(args[1], MP_QSTR_y);
+    mp_int_t start_x = mp_arg_validate_type_int(args[1], MP_QSTR_start_x);
+    mp_int_t end_x = mp_arg_validate_type_int(args[1], MP_QSTR_end_x);
     common_hal_displayio_shape_set_boundary(self, y, start_x, end_x);
 
     return mp_const_none;
diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
index 24eb1c501d..e24893af01 100644
--- a/shared-module/vectorio/Polygon.c
+++ b/shared-module/vectorio/Polygon.c
@@ -14,7 +14,8 @@
 
 
 // Converts a list of points tuples to a flat list of ints for speedier internal use.
-// Also validates the points.
+// Also validates the points. If this fails due to invalid types or values, the
+// content of the points is undefined.
 static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple_list) {
     size_t len = 0;
     mp_obj_t *items;
@@ -26,12 +27,8 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
     }
 
     if (self->len < 2 * len) {
-        if (self->points_list != NULL) {
-            VECTORIO_POLYGON_DEBUG("free(%d), ", sizeof(self->points_list));
-            gc_free(self->points_list);
-        }
-        self->points_list = gc_alloc(2 * len * sizeof(uint16_t), false, false);
-        VECTORIO_POLYGON_DEBUG("alloc(%p, %d)", self->points_list, 2 * len * sizeof(uint16_t));
+        self->points_list = gc_realloc(self->points_list, 2 * len * sizeof(uint16_t), true);
+        VECTORIO_POLYGON_DEBUG("realloc(%d) -> %p", self->points_list, 2 * len * sizeof(uint16_t));
     }
     self->len = 2 * len;
 
@@ -42,17 +39,10 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
 
         mp_arg_validate_length(tuple_len, 2, MP_QSTR_point);
 
-        mp_int_t x;
-        mp_int_t y;
-        if (!mp_obj_get_int_maybe(tuple_items[ 0 ], &x)
-            || !mp_obj_get_int_maybe(tuple_items[ 1 ], &y)
-            || x < SHRT_MIN || x > SHRT_MAX || y < SHRT_MIN || y > SHRT_MAX
-            ) {
-            gc_free(self->points_list);
-            self->points_list = NULL;
-            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
-            self->len = 0;
-        }
+        mp_int_t x = mp_arg_validate_type_int(tuple_items[0], MP_QSTR_x);
+        mp_arg_validate_int_range(x, SHRT_MIN, SHRT_MAX, MP_QSTR_x);
+        mp_int_t y = mp_arg_validate_type_int(tuple_items[1], MP_QSTR_y);
+        mp_arg_validate_int_range(y, SHRT_MIN, SHRT_MAX, MP_QSTR_y);
         self->points_list[2 * i    ] = (int16_t)x;
         self->points_list[2 * i + 1] = (int16_t)y;
     }
diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c
index f72cd5cc97..d9c13f54cc 100644
--- a/shared-module/vectorio/VectorShape.c
+++ b/shared-module/vectorio/VectorShape.c
@@ -277,12 +277,8 @@ void common_hal_vectorio_vector_shape_set_location(vectorio_vector_shape_t *self
     mp_obj_tuple_get(xy, &tuple_len, &tuple_items);
     mp_arg_validate_length(tuple_len, 2, MP_QSTR_location);
 
-    mp_int_t x;
-    mp_int_t y;
-    if (!mp_obj_get_int_maybe(tuple_items[ 0 ], &x)
-        || !mp_obj_get_int_maybe(tuple_items[ 1 ], &y)) {
-        mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
-    }
+    mp_int_t x = mp_arg_validate_type_int(tuple_items[0], MP_QSTR_x);
+    mp_int_t y = mp_arg_validate_type_int(tuple_items[0], MP_QSTR_y);
     bool dirty = false;
     if (self->x != x) {
         check_bounds_and_set_x(self, x);

From f7221d5895bfad2ea0d351c67f1d56c7406ba382 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Jun 2022 08:53:29 -0500
Subject: [PATCH 1007/2403] simplify logic in _clobber_points_list

---
 shared-module/vectorio/Polygon.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
index e24893af01..5d1e0d3e58 100644
--- a/shared-module/vectorio/Polygon.c
+++ b/shared-module/vectorio/Polygon.c
@@ -15,7 +15,7 @@
 
 // Converts a list of points tuples to a flat list of ints for speedier internal use.
 // Also validates the points. If this fails due to invalid types or values, the
-// content of the points is undefined.
+// number of points is 0 and the points_list is NULL.
 static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple_list) {
     size_t len = 0;
     mp_obj_t *items;
@@ -26,11 +26,12 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
         mp_raise_TypeError(translate("Polygon needs at least 3 points"));
     }
 
-    if (self->len < 2 * len) {
-        self->points_list = gc_realloc(self->points_list, 2 * len * sizeof(uint16_t), true);
-        VECTORIO_POLYGON_DEBUG("realloc(%d) -> %p", self->points_list, 2 * len * sizeof(uint16_t));
-    }
-    self->len = 2 * len;
+    int16_t *points_list = gc_realloc(self->points_list, 2 * len * sizeof(uint16_t), true);
+    VECTORIO_POLYGON_DEBUG("realloc(%p, %d) -> %p", self->points_list, 2 * len * sizeof(uint16_t), points_list);
+
+    // In case the validation calls below fail, set these values temporarily
+    self->points_list = NULL;
+    self->len = 0;
 
     for (uint16_t i = 0; i < len; ++i) {
         size_t tuple_len = 0;
@@ -43,9 +44,12 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
         mp_arg_validate_int_range(x, SHRT_MIN, SHRT_MAX, MP_QSTR_x);
         mp_int_t y = mp_arg_validate_type_int(tuple_items[1], MP_QSTR_y);
         mp_arg_validate_int_range(y, SHRT_MIN, SHRT_MAX, MP_QSTR_y);
-        self->points_list[2 * i    ] = (int16_t)x;
-        self->points_list[2 * i + 1] = (int16_t)y;
+        points_list[2 * i    ] = (int16_t)x;
+        points_list[2 * i + 1] = (int16_t)y;
     }
+
+    self->points_list = points_list;
+    self->len = 2 * len;
 }
 
 

From 18cb25e95c19c10fb368c353bda6ff345de69809 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Jun 2022 11:44:48 -0500
Subject: [PATCH 1008/2403] Re-use another message

---
 py/argcheck.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index cabfaeeaae..c28c577088 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -189,7 +189,7 @@ mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t
         ? default_for_null
         : mp_obj_get_float(float_in);
     if (f <= (mp_float_t)0.0) {
-        mp_raise_ValueError_varg(translate("%q must be >= 0"), arg_name);
+        mp_raise_ValueError_varg(translate("%q must be >= %d"), arg_name, 0);
     }
     return f;
 }

From 8227903b617cd6aa38012b31803a1c4dfb280858 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Jun 2022 11:45:02 -0500
Subject: [PATCH 1009/2403] Use validation functions

---
 shared-bindings/audiobusio/PDMIn.c   | 6 ++----
 shared-bindings/vectorio/Circle.c    | 4 +---
 shared-bindings/vectorio/Rectangle.c | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index 29752a442c..9df78ea449 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -188,10 +188,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4,
 STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) {
     audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_obj);
     check_for_deinit(self);
-    if (!mp_obj_is_small_int(destination_length) || MP_OBJ_SMALL_INT_VALUE(destination_length) < 0) {
-        mp_raise_TypeError(translate("destination_length must be an int >= 0"));
-    }
-    uint32_t length = MP_OBJ_SMALL_INT_VALUE(destination_length);
+    uint32_t length = mp_arg_validate_type_int(destination_length, MP_QSTR_length);
+    mp_arg_validate_length_min(length, 0, MP_QSTR_length);
 
     mp_buffer_info_t bufinfo;
     if (mp_obj_is_type(destination, &mp_type_fileio)) {
diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index f955cd2afe..cce4f54e9d 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -34,9 +34,7 @@ static mp_obj_t vectorio_circle_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_int_t radius = args[ARG_radius].u_int;
-    if (radius < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_radius);
-    }
+    mp_arg_validate_int_min(radius, 1, MP_QSTR_radius);
 
     vectorio_circle_t *self = m_new_obj(vectorio_circle_t);
     self->base.type = &vectorio_circle_type;
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index 34b9e1eabe..13c68161b3 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -34,13 +34,9 @@ static mp_obj_t vectorio_rectangle_make_new(const mp_obj_type_t *type, size_t n_
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_int_t width = args[ARG_width].u_int;
-    if (width < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_width);
-    }
+    mp_arg_validate_int_min(width, 1, MP_QSTR_width);
     mp_int_t height = args[ARG_height].u_int;
-    if (height < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_height);
-    }
+    mp_arg_validate_int_min(height, 1, MP_QSTR_height);
 
     vectorio_rectangle_t *self = m_new_obj(vectorio_rectangle_t);
     self->base.type = &vectorio_rectangle_type;

From 72a045e427db6cfdab1cd9f508aa00a9846fb38c Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Thu, 22 Sep 2022 09:06:02 -0700
Subject: [PATCH 1010/2403] Fixed unused variable warning

---
 extmod/vfs_fat.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 3a1bdb29c5..b4f6c22506 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -422,12 +422,15 @@ STATIC mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t times_
         mp_raise_type_arg(&mp_type_TypeError, times_in);
     }
 
-    mp_obj_t *times;
-    mp_obj_get_array_fixed_n(times_in, 2, ×);
-    const int atime = mp_obj_get_int(times[0]);
-    const int mtime = mp_obj_get_int(times[1]);
+    mp_obj_t *otimes;
+    mp_obj_get_array_fixed_n(times_in, 2, &otimes);
+
+    // Validate that both elements of the tuple are int and discard the second one
+    int time[2];
+    time[0] = mp_obj_get_int(otimes[0]);
+    time[1] = mp_obj_get_int(otimes[1]);
     timeutils_struct_time_t tm;
-    timeutils_seconds_since_epoch_to_struct_time(atime, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(time[0], &tm);
 
     FILINFO fno;
     fno.fdate = (WORD)(((tm.tm_year - 1980) * 512U) | tm.tm_mon * 32U | tm.tm_mday);

From 4f75d09e86d0876f8bba20bd06265359f06224f5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 22 Sep 2022 08:35:51 -0500
Subject: [PATCH 1011/2403] Get rid of an unneeded message

---
 shared-bindings/i2ctarget/I2CTarget.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index f094788140..81ddbe0ab8 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -85,10 +85,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t
     uint8_t *addresses = NULL;
     unsigned int i = 0;
     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        mp_int_t value = mp_arg_validate_type_int(item, MP_QSTR_address);
-        if (value < 0x00 || value > 0x7f) {
-            mp_raise_ValueError(translate("address out of bounds"));
-        }
+        mp_uint_t value = mp_arg_validate_int_range(mp_obj_get_int(item), 0x00, 0x7f, MP_QSTR_address);
         addresses = m_renew(uint8_t, addresses, i, i + 1);
         addresses[i++] = value;
     }

From a769beed3f2efe9fa9badf13194218334f849e48 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 22 Sep 2022 16:23:38 -0500
Subject: [PATCH 1012/2403] Use new unique ID for this board

---
 .../espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk | 4 ++--
 tools/ci_check_duplicate_usb_vid_pid.py                       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
index 125666b599..913f65f95c 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID = 0x70010001
-CIRCUITPY_CREATION_ID = 0x00100001
+CIRCUITPY_CREATOR_ID = 0x000C303B
+CIRCUITPY_CREATION_ID = 0x00320001
 
 IDF_TARGET = esp32c3
 
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index f46295f240..87c68cfdc0 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -56,7 +56,6 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
     "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2"],
-    "0x70010001:0x00100001": ["ai_thinker_esp32-c3s", "ai_thinker_esp32-c3s-2m"],
 }
 
 cli_parser = argparse.ArgumentParser(

From 5bbbca4d44b7bcf1b7bbc1499f6b51e8e11b5dd1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 22 Sep 2022 17:03:05 -0500
Subject: [PATCH 1013/2403] lock and unlock i2c bus around any ops that might
 access it

---
 .../espressif/bindings/esp32_camera/Camera.c  |  2 +-
 .../espressif/bindings/esp32_camera/Camera.h  |  2 +-
 .../common-hal/esp32_camera/Camera.c          | 32 +++++++++++++++++--
 .../common-hal/esp32_camera/Camera.h          |  2 ++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 4474f3024f..2f09970251 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -125,7 +125,7 @@ STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n
     const mcu_pin_obj_t *pixel_clock_pin = validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj);
     const mcu_pin_obj_t *vsync_pin = validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj);
     const mcu_pin_obj_t *href_pin = validate_obj_is_free_pin(args[ARG_href_pin].u_obj);
-    const busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
+    busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
     const mcu_pin_obj_t *external_clock_pin = validate_obj_is_free_pin(args[ARG_external_clock_pin].u_obj);
     const mcu_pin_obj_t *powerdown_pin = validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj);
     const mcu_pin_obj_t *reset_pin = validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj);
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/esp32_camera/Camera.h
index 146cd0da05..f190808531 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.h
+++ b/ports/espressif/bindings/esp32_camera/Camera.h
@@ -45,7 +45,7 @@ extern void common_hal_esp32_camera_camera_construct(
     const mcu_pin_obj_t *href_pin,
     const mcu_pin_obj_t *powerdown_pin,
     const mcu_pin_obj_t *reset_pin,
-    const busio_i2c_obj_t *i2c,
+    busio_i2c_obj_t *i2c,
     mp_int_t external_clock_frequency,
     pixformat_t pixel_format,
     framesize_t frame_size,
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 5ee112a911..65d2d0fbc6 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -24,12 +24,15 @@
  * THE SOFTWARE.
  */
 
+#include "py/mperrno.h"
 #include "py/runtime.h"
 
 #include "bindings/esp32_camera/Camera.h"
 #include "bindings/espidf/__init__.h"
 #include "common-hal/esp32_camera/Camera.h"
+#include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
 #include "common-hal/microcontroller/Pin.h"
 
 #include "esp32-camera/driver/private_include/cam_hal.h"
@@ -38,6 +41,19 @@
 #error esp32_camera only works on boards configured with spiram, disable it in mpconfigboard.mk
 #endif
 
+static void i2c_lock(esp32_camera_camera_obj_t *self) {
+    if (common_hal_busio_i2c_deinited(self->i2c)) {
+        raise_deinited_error();
+    }
+    if (!common_hal_busio_i2c_try_lock(self->i2c)) {
+        mp_raise_OSError(MP_EWOULDBLOCK);
+    }
+}
+
+static void i2c_unlock(esp32_camera_camera_obj_t *self) {
+    common_hal_busio_i2c_unlock(self->i2c);
+}
+
 static void maybe_claim_pin(const mcu_pin_obj_t *pin) {
     if (pin) {
         claim_pin(pin);
@@ -53,7 +69,7 @@ void common_hal_esp32_camera_camera_construct(
     const mcu_pin_obj_t *href_pin,
     const mcu_pin_obj_t *powerdown_pin,
     const mcu_pin_obj_t *reset_pin,
-    const busio_i2c_obj_t *i2c,
+    busio_i2c_obj_t *i2c,
     mp_int_t external_clock_frequency,
     pixformat_t pixel_format,
     framesize_t frame_size,
@@ -78,6 +94,8 @@ void common_hal_esp32_camera_camera_construct(
 
     common_hal_pwmio_pwmout_construct(&self->pwm, external_clock_pin, 1, external_clock_frequency, true);
 
+    self->i2c = i2c;
+
     self->camera_config.pin_pwdn = common_hal_mcu_pin_number(powerdown_pin);
     self->camera_config.pin_reset = common_hal_mcu_pin_number(reset_pin);
     self->camera_config.pin_xclk = common_hal_mcu_pin_number(external_clock_pin);
@@ -112,7 +130,11 @@ void common_hal_esp32_camera_camera_construct(
 
     self->camera_config.sccb_i2c_port = i2c->i2c_num;
 
-    CHECK_ESP_RESULT(esp_camera_init(&self->camera_config));
+    i2c_lock(self);
+    esp_err_t result = esp_camera_init(&self->camera_config);
+    i2c_unlock(self);
+
+    CHECK_ESP_RESULT(result);
 }
 
 extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *self) {
@@ -165,7 +187,9 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
 
 #define SENSOR_GET(type, name, status_field_name, setter_function_name) \
     type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self) { \
+        i2c_lock(self); \
         sensor_t *sensor = esp_camera_sensor_get(); \
+        i2c_unlock(self); \
         if (!sensor->setter_function_name) { \
             mp_raise_AttributeError(translate("no such attribute")); \
         } \
@@ -174,7 +198,9 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
 
 #define SENSOR_SET(type, name, setter_function_name) \
     void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value) { \
+        i2c_lock(self); \
         sensor_t *sensor = esp_camera_sensor_get(); \
+        i2c_unlock(self); \
         if (!sensor->setter_function_name) { \
             mp_raise_AttributeError(translate("no such attribute")); \
         } \
@@ -203,6 +229,7 @@ void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self,
         frame_size = sensor_info->max_size;
     }
 
+    i2c_lock(self);
     cam_deinit();
     self->camera_config.pixel_format = pixel_format;
     self->camera_config.frame_size = frame_size;
@@ -212,6 +239,7 @@ void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self,
     sensor->set_framesize(sensor, self->camera_config.frame_size);
     cam_init(&self->camera_config);
     cam_config(&self->camera_config, frame_size, sensor_info->pid);
+    i2c_unlock(self);
     cam_start();
 }
 
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.h b/ports/espressif/common-hal/esp32_camera/Camera.h
index 9c21f81b16..4f34fa54cd 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.h
+++ b/ports/espressif/common-hal/esp32_camera/Camera.h
@@ -29,10 +29,12 @@
 #include "py/obj.h"
 #include "esp_camera.h"
 #include "shared-bindings/pwmio/PWMOut.h"
+#include "common-hal/busio/I2C.h"
 
 typedef struct esp32_camera_camera_obj {
     mp_obj_base_t base;
     camera_config_t camera_config;
     camera_fb_t *buffer_to_return;
     pwmio_pwmout_obj_t pwm;
+    busio_i2c_obj_t *i2c;
 } esp32_camera_obj_t;

From 52a2c5f6dcfb4a556211fe5777fad76277682576 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 23 Sep 2022 08:27:05 -0500
Subject: [PATCH 1014/2403] Update ulab to 5.1.1

Closes: #6692
---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index 346c936e14..57de23c1fb 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 346c936e14c6ea3a8d3d65cb1fa46202dc92999d
+Subproject commit 57de23c1fb434ba99aaafe1d00bd77d5cdf5d66b

From f12136af7fd8fdc48c59276f8c7532634aba9066 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 23 Sep 2022 08:54:00 -0500
Subject: [PATCH 1015/2403] esp32-camera: sync doc with code.

Closes: #6836
---
 ports/espressif/bindings/esp32_camera/Camera.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 2f09970251..1186afc90f 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -46,9 +46,9 @@
 //|         self,
 //|         *,
 //|         data_pins: List[microcontroller.Pin],
-//|         pixel_clock: microcontroller.Pin,
-//|         vsync: microcontroller.Pin,
-//|         href: microcontroller.Pin,
+//|         pixel_clock_pin: microcontroller.Pin,
+//|         vsync_pin: microcontroller.Pin,
+//|         href_pin: microcontroller.Pin,
 //|         i2c: busio.I2C,
 //|         external_clock_pin: microcontroller.Pin,
 //|         external_clock_frequency: int,
@@ -79,12 +79,12 @@
 //|             that case.
 //|
 //|         :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
-//|         :param pixel_clock: The pixel clock output from the camera module
-//|         :param vsync: The vertical sync pulse output from the camera module
-//|         :param href: The horizontal reference output from the camera module
+//|         :param pixel_clock_pin: The pixel clock output from the camera module
+//|         :param vsync_pin: The vertical sync pulse output from the camera module
+//|         :param href_pin: The horizontal reference output from the camera module
 //|         :param i2c: The I2C bus connected to the camera module
-//|         :param external_clock_frequency: The frequency generated on the external clock pin
 //|         :param external_clock_pin: The pin on which to generate the external clock
+//|         :param external_clock_frequency: The frequency generated on the external clock pin
 //|         :param powerdown_pin: The powerdown input to the camera module
 //|         :param reset_pin: The reset input to the camera module
 //|         :param pixel_format: The pixel format of the captured image

From 714da7bc283913d836ec6ec8a65c20540926fcff Mon Sep 17 00:00:00 2001
From: Alvaro Figueroa 
Date: Wed, 21 Sep 2022 17:56:56 +0000
Subject: [PATCH 1016/2403] Translated using Weblate (Spanish)

Currently translated at 86.5% (868 of 1003 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 3ef0d2f6e9..0d981d2d7c 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-08-23 14:19+0000\n"
-"Last-Translator: Jeff Epler \n"
+"PO-Revision-Date: 2022-09-23 17:20+0000\n"
+"Last-Translator: Alvaro Figueroa \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "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.8.1-dev\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: main.c
 msgid ""
@@ -31,6 +31,8 @@ msgid ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
+"\n"
+"Código detenido por la auto-recarga. Recargando pronto.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -85,20 +87,21 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
+#, fuzzy
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
-msgstr ""
+msgstr "%q y %q contienen pines duplicados"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q y %q deben ser diferentes"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
-msgstr ""
+msgstr "%q contiene pines duplicados"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 msgid "%q failure: %d"
@@ -118,31 +121,31 @@ msgstr "%q indices deben ser enteros, no %s"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q inicializado fallido"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q tamaño debe ser %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
-msgstr ""
+msgstr "%q tamaño debe ser %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q tamaño debe ser <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q tamaño debe ser >= %d"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
-msgstr ""
+msgstr "%q tamaño debe ser >= 1"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q debe ser %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
@@ -150,11 +153,11 @@ msgstr "%q debe ser %d-%d"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "%q debe ser 1 cuando %q es True"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
-msgstr ""
+msgstr "%q debe ser <= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"

From a7406ec0989d2dfc836718b6172b6a3cb57b27fa Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Fri, 23 Sep 2022 19:20:44 +0200
Subject: [PATCH 1017/2403] Support for opening a file by name in MP3Decoder

---
 locale/circuitpython.pot              |  4 ++++
 shared-bindings/audiomp3/MP3Decoder.c | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 52f1bdb5ad..98fe415ce6 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2942,6 +2942,10 @@ msgstr ""
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
+#: shared-bindings/audiomp3/MP3Decoder.c
+msgid "file path must be provided as input"
+msgstr ""
+
 #: shared-bindings/traceback/__init__.c
 msgid "file write is not available"
 msgstr ""
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index f1b5a29cd5..5e2273add5 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -172,6 +172,26 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file);
 
+//|     def open_file(self, str) -> None:
+//|         """Takes in the name of a mp3 file, opens it, and replaces the old playback file."""
+//|         ...
+//|
+STATIC mp_obj_t audiomp3_mp3file_obj_open_file(mp_obj_t self_in, mp_obj_t path) {
+    audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t file;
+    check_for_deinit(self);
+    if (!mp_obj_is_str(path)) {
+        mp_raise_TypeError(translate("file path must be provided as input"));
+    }
+    file = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), path, MP_ROM_QSTR(MP_QSTR_rb));
+    if (!mp_obj_is_type(file, &mp_type_fileio)) {
+        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
+    }
+    common_hal_audiomp3_mp3file_set_file(self, file);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_open_file_obj, audiomp3_mp3file_obj_open_file);
+
 MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj,
     (mp_obj_t)&audiomp3_mp3file_get_file_obj,
     (mp_obj_t)&audiomp3_mp3file_set_file_obj);
@@ -256,6 +276,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj,
 
 STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = {
     // Methods
+    { MP_ROM_QSTR(MP_QSTR_open_file), MP_ROM_PTR(&audiomp3_mp3file_open_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiomp3_mp3file_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiomp3_mp3file___exit___obj) },

From c19bceaeaa6abbfaa438e1de2f34a593a96942a8 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 22 Sep 2022 16:01:51 +0000
Subject: [PATCH 1018/2403] Translated using Weblate (Greek)

Currently translated at 2.5% (26 of 1003 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/el/
---
 locale/el.po | 60 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/locale/el.po b/locale/el.po
index 05c36779f8..8205801d3a 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -8,19 +8,23 @@ 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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2022-09-23 17:20+0000\n"
+"Last-Translator: Bill Sideris \n"
 "Language-Team: none\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "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.14.1\n"
 
 #: main.c
 msgid ""
 "\n"
 "Code done running.\n"
 msgstr ""
+"\n"
+"Η εκτέλεση του κώδικα ολοκληρώθηκε.\n"
 
 #: main.c
 msgid ""
@@ -34,14 +38,18 @@ msgid ""
 "Please file an issue with the contents of your CIRCUITPY drive at \n"
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
+"\n"
+"Παρακαλώ δημιουγήστε ενα πρόβλημα με τα περιεχόμενα του CIRCUITPY δίσκου "
+"στο\n"
+"https://github.com/adafruit/circuitpython/issues\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
-msgstr ""
+msgstr "  Αρχείο \"%q\""
 
 #: py/obj.c
 msgid "  File \"%q\", line %d"
-msgstr ""
+msgstr "  Αρχείο \"%q\", γραμμή %d"
 
 #: py/builtinhelp.c
 msgid " is of type %q\n"
@@ -53,7 +61,7 @@ msgstr ""
 
 #: main.c
 msgid " output:\n"
-msgstr ""
+msgstr " έξοδος:\n"
 
 #: py/objstr.c
 #, c-format
@@ -325,7 +333,7 @@ msgstr ""
 
 #: py/compile.c
 msgid "'await' outside function"
-msgstr ""
+msgstr "'await' εκτός συνάρτησης"
 
 #: py/compile.c
 msgid "'await', 'async for' or 'async with' outside async function"
@@ -337,15 +345,15 @@ msgstr ""
 
 #: py/compile.c
 msgid "'continue' outside loop"
-msgstr ""
+msgstr "'continue' εκτός επανάληψης"
 
 #: py/objgenerator.c
 msgid "'coroutine' object is not an iterator"
-msgstr ""
+msgstr "'coroutine' αντικείμενο δεν μπορεί να χρησιμοποιηθεί σαν επαναλήπτης"
 
 #: py/compile.c
 msgid "'data' requires at least 2 arguments"
-msgstr ""
+msgstr "'data' απαιτεί τουλάχιστον 2 παραμέτρους"
 
 #: py/compile.c
 msgid "'data' requires integer arguments"
@@ -373,15 +381,15 @@ msgstr ""
 
 #: py/obj.c
 msgid ", in %q\n"
-msgstr ""
+msgstr ", στο %q\n"
 
 #: py/objcomplex.c
 msgid "0.0 to a complex power"
-msgstr ""
+msgstr "0.0 σε μία σύνθετη δύναμη"
 
 #: py/modbuiltins.c
 msgid "3-arg pow() not supported"
-msgstr ""
+msgstr "pow() με 3 παραμέτρους δεν υποστηρίζεται"
 
 #: shared-module/msgpack/__init__.c
 msgid "64 bit types"
@@ -391,66 +399,66 @@ msgstr ""
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "A hardware interrupt channel is already in use"
-msgstr ""
+msgstr "Ένα κανάλι interrupt υλικού είναι ήδη σε χρήση"
 
 #: ports/espressif/common-hal/analogio/AnalogIn.c
 msgid "ADC2 is being used by WiFi"
-msgstr ""
+msgstr "Το ADC2 χρησιμοποιείται απο το WIFI"
 
 #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
-msgstr ""
+msgstr "Η διεύθυνση πρέπει να είναι %d bytes μεγάλη"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
-msgstr ""
+msgstr "Όλα τα περιφεριακά CAN είναι σε χρήση"
 
 #: ports/espressif/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
-msgstr ""
+msgstr "Όλα τα I2C περιφεριακά ειναι σε χρήση"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
 #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
 msgid "All PCNT units in use"
-msgstr ""
+msgstr "Όλες οι μονάδες PCNT είναι σε χρήση"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
 msgid "All RX FIFOs in use"
-msgstr ""
+msgstr "Όλα τα RX FIFOs είναι σε χρήση"
 
 #: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 msgid "All SPI peripherals are in use"
-msgstr ""
+msgstr "Όλα τα SPI περιφεριακά είναι σε χρήση"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
-msgstr ""
+msgstr "Όλα τα UART περιφεριακά ειναι σε χρήση"
 
 #: ports/nrf/common-hal/countio/Counter.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All channels in use"
-msgstr ""
+msgstr "Όλα τα κανάλια είναι σε χρήση"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "All event channels in use"
-msgstr ""
+msgstr "Όλα τα κανάλια γεγονότων είναι σε χρήση"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
-msgstr ""
+msgstr "Όλες οι μηχανές κατάστασης είναι σε χρήση"
 
 #: ports/atmel-samd/audio_dma.c
 msgid "All sync event channels in use"
-msgstr ""
+msgstr "Όλα τα κανάλια γεγονότων συγχρονισμού είναι σε χρήση"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
@@ -535,7 +543,7 @@ msgstr ""
 
 #: main.c
 msgid "Auto-reload is off.\n"
-msgstr ""
+msgstr "Η αυτόματη επαναφόρτωση είναι απενεργοποιημένη.\n"
 
 #: main.c
 msgid ""

From 2dbcd760fc9e253d2f91904e2ff31d472f427697 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 25 Sep 2022 04:53:54 +0200
Subject: [PATCH 1019/2403] usb_cdc.Serial.readinto has no nbytes parameter

---
 shared-bindings/usb_cdc/Serial.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c
index 8a74380be3..47e91b5721 100644
--- a/shared-bindings/usb_cdc/Serial.c
+++ b/shared-bindings/usb_cdc/Serial.c
@@ -54,11 +54,12 @@
 //|         ...
 //|
 //|     def readinto(self, buf: WriteableBuffer) -> int:
-//|         """Read bytes into the ``buf``.  If ``nbytes`` is specified then read at most
-//|         that many bytes, subject to `timeout`.  Otherwise, read at most ``len(buf)`` bytes.
+//|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes. If `timeout`
+//|         is > 0 or ``None``, keep waiting until the timeout expires or ``len(buf)``
+//|         bytes are available.
 //|
 //|         :return: number of bytes read and stored into ``buf``
-//|         :rtype: bytes"""
+//|         :rtype: int"""
 //|         ...
 //|
 //|     def readline(self, size: int = -1) -> Optional[bytes]:

From e5f2f0be25519a2729a3aa16350ef27522383a60 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 25 Sep 2022 00:00:37 -0400
Subject: [PATCH 1020/2403] simplify suppressing status bar writes

---
 supervisor/shared/serial.c | 55 +++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 094c532781..6a336c5826 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -71,6 +71,12 @@ byte console_uart_rx_buf[64];
 bool tud_vendor_connected(void);
 #endif
 
+// Set to true to temporarily discard writes to the console only.
+static bool _console_write_disabled;
+
+// Set to true to temporarily discard writes to the display terminal only.
+static bool _display_write_disabled;
+
 #if CIRCUITPY_CONSOLE_UART
 STATIC void console_uart_print_strn(void *env, const char *str, size_t len) {
     (void)env;
@@ -277,6 +283,12 @@ bool serial_bytes_available(void) {
     return false;
 }
 
+#if CIRCUITPY_STATUS_BAR
+// Detect when USB is down when the status bar write starts. If USB comes up in the middle of writing
+// the status bar, we want to the skip the rest so so junk doesn't get written out.
+static bool ignore_rest_of_status_bar_update = false;
+#endif
+
 void serial_write_substring(const char *text, uint32_t length) {
     if (length == 0) {
         return;
@@ -284,15 +296,23 @@ void serial_write_substring(const char *text, uint32_t length) {
 
     #if CIRCUITPY_TERMINALIO
     int errcode;
-    // We might be writing
     // If the status bar is disabled for the display, common_hal_terminalio_terminal_write() will not write it.
     common_hal_terminalio_terminal_write(&supervisor_terminal, (const uint8_t *)text, length, &errcode);
     #endif
 
     #if CIRCUITPY_STATUS_BAR
     // If the status bar is disabled for the console, skip writing out the OSC sequence.
-    if (supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj) &&
-        !shared_module_supervisor_status_bar_get_console(&shared_module_supervisor_status_bar_obj)) {
+    if (supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj)) {
+        if (!shared_module_supervisor_status_bar_get_console(&shared_module_supervisor_status_bar_obj)) {
+            // Console status bar disabled, so just return.
+            return;
+        }
+    } else {
+        // Status bar update is not in progress, so clear this history flag (will get cleared repeatedly).
+        ignore_rest_of_status_bar_update = false;
+    }
+
+    if (ignore_rest_of_status_bar_update) {
         return;
     }
     #endif
@@ -325,14 +345,23 @@ void serial_write_substring(const char *text, uint32_t length) {
 
     #if CIRCUITPY_USB
     uint32_t count = 0;
-    while (count < length && tud_cdc_connected()) {
-        count += tud_cdc_write(text + count, length - count);
-        // If we're in an interrupt, then don't wait for more room. Queue up what we can.
-        if (cpu_interrupt_active()) {
-            break;
+    if (tud_cdc_connected()) {
+        while (count < length) {
+            count += tud_cdc_write(text + count, length - count);
+            // If we're in an interrupt, then don't wait for more room. Queue up what we can.
+            if (cpu_interrupt_active()) {
+                break;
+            }
+            usb_background();
         }
-        usb_background();
     }
+    #if CIRCUITPY_STATUS_BAR
+    else {
+        // USB was not connected for the first part of the status bar update. Ignore the rest
+        // so we don't send the remaining part of the OSC sequence if USB comes up later.
+        ignore_rest_of_status_bar_update = true;
+    }
+    #endif
     #endif
 
     port_serial_write_substring(text, length);
@@ -341,3 +370,11 @@ void serial_write_substring(const char *text, uint32_t length) {
 void serial_write(const char *text) {
     serial_write_substring(text, strlen(text));
 }
+
+void serial_console_write_disable(bool disabled) {
+    _serial_console_write_disabled = disabled;
+}
+
+void serial_display_write_disable(bool disabled) {
+    _serial_display_write_disabled = disabled;
+}

From 5346b89b08400d84f895f723f23ea7fd98967cc6 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 25 Sep 2022 07:18:18 +0200
Subject: [PATCH 1021/2403] don't use @property in docs, just document as a
 property

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 12 +++++-------
 shared-bindings/sdioio/SDCard.c                  | 14 +++++---------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index be87a47ec5..97668bf303 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -521,9 +521,8 @@ STATIC mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in)
 }
 MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_background_write_obj, rp2pio_statemachine_obj_stop_background_write);
 
-//|     @property
-//|     def writing(self) -> bool:
-//|         """Returns True if a background write is in progress"""
+//|     writing: bool
+//|     """Returns True if a background write is in progress"""
 //|
 STATIC mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -539,11 +538,10 @@ const mp_obj_property_t rp2pio_statemachine_writing_obj = {
 };
 
 
-//|     @property
-//|     def pending(self) -> int:
-//|         """Returns the number of pending buffers for background writing.
+//|     pending: int
+//|     """Returns the number of pending buffers for background writing.
 //|
-//|         If the number is 0, then a `StateMachine.background_write` call will not block."""
+//|     If the number is 0, then a `StateMachine.background_write` call will not block."""
 //|
 STATIC mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c
index dbeb50ddf3..d3929c9372 100644
--- a/shared-bindings/sdioio/SDCard.c
+++ b/shared-bindings/sdioio/SDCard.c
@@ -201,11 +201,9 @@ STATIC mp_obj_t sdioio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block
 
 MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_writeblocks_obj, sdioio_sdcard_writeblocks);
 
-//|     @property
-//|     def frequency(self) -> int:
-//|         """The actual SDIO bus frequency. This may not match the frequency
-//|         requested due to internal limitations."""
-//|         ...
+//|     frequency: int
+//|     """The actual SDIO bus frequency. This may not match the frequency
+//|     requested due to internal limitations."""
 //|
 STATIC mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) {
     sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -217,10 +215,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_frequency_obj, sdioio_sdcard_obj_get
 MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj,
     (mp_obj_t)&sdioio_sdcard_get_frequency_obj);
 
-//|     @property
-//|     def width(self) -> int:
-//|         """The actual SDIO bus width, in bits"""
-//|         ...
+//|     width:int
+//|     """The actual SDIO bus width, in bits"""
 //|
 STATIC mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) {
     sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);

From ee6bd09438263a5e3e8ed2cb1326dfde1657f780 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Sun, 25 Sep 2022 10:42:49 +0200
Subject: [PATCH 1022/2403] Rename method, and remove redundant checks

---
 locale/circuitpython.pot              |  4 ----
 shared-bindings/audiomp3/MP3Decoder.c | 19 +++++++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 98fe415ce6..52f1bdb5ad 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2942,10 +2942,6 @@ msgstr ""
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
-#: shared-bindings/audiomp3/MP3Decoder.c
-msgid "file path must be provided as input"
-msgstr ""
-
 #: shared-bindings/traceback/__init__.c
 msgid "file write is not available"
 msgstr ""
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 5e2273add5..583cfbdc99 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -172,25 +172,20 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file);
 
-//|     def open_file(self, str) -> None:
+//|     def open(self, str) -> None:
 //|         """Takes in the name of a mp3 file, opens it, and replaces the old playback file."""
 //|         ...
 //|
-STATIC mp_obj_t audiomp3_mp3file_obj_open_file(mp_obj_t self_in, mp_obj_t path) {
+STATIC mp_obj_t audiomp3_mp3file_obj_open(mp_obj_t self_in, mp_obj_t path) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t file;
     check_for_deinit(self);
-    if (!mp_obj_is_str(path)) {
-        mp_raise_TypeError(translate("file path must be provided as input"));
-    }
-    file = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), path, MP_ROM_QSTR(MP_QSTR_rb));
-    if (!mp_obj_is_type(file, &mp_type_fileio)) {
-        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
-    }
+
+    mp_obj_t file = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), path, MP_ROM_QSTR(MP_QSTR_rb));
+
     common_hal_audiomp3_mp3file_set_file(self, file);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_open_file_obj, audiomp3_mp3file_obj_open_file);
+MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_open_obj, audiomp3_mp3file_obj_open);
 
 MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj,
     (mp_obj_t)&audiomp3_mp3file_get_file_obj,
@@ -276,7 +271,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj,
 
 STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = {
     // Methods
-    { MP_ROM_QSTR(MP_QSTR_open_file), MP_ROM_PTR(&audiomp3_mp3file_open_file_obj) },
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&audiomp3_mp3file_open_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiomp3_mp3file_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiomp3_mp3file___exit___obj) },

From d7ea1c39c68fd934dc4226622f96708e0c4f0f34 Mon Sep 17 00:00:00 2001
From: snkYmkrct 
Date: Sun, 25 Sep 2022 13:34:50 +0200
Subject: [PATCH 1023/2403] Minor update to MP3Decoder documentation

---
 shared-bindings/audiomp3/MP3Decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 583cfbdc99..5795fb8730 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -172,7 +172,7 @@ STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file);
 
-//|     def open(self, str) -> None:
+//|     def open(self, filepath: str) -> None:
 //|         """Takes in the name of a mp3 file, opens it, and replaces the old playback file."""
 //|         ...
 //|

From e25c195b789c5273adf028980fc1d371557f5e8f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 25 Sep 2022 09:12:23 -0400
Subject: [PATCH 1024/2403] fix broadcom UART ringbuf init

---
 ports/broadcom/common-hal/busio/UART.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c
index 6d97b42c76..9f51f15acb 100644
--- a/ports/broadcom/common-hal/busio/UART.c
+++ b/ports/broadcom/common-hal/busio/UART.c
@@ -211,7 +211,6 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         // Use the provided buffer when given.
         if (receiver_buffer != NULL) {
             ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
-            self->ringbuf = (ringbuf_t) { receiver_buffer, receiver_buffer_size };
         } else {
             // Initially allocate the UART's buffer in the long-lived part of the
             // heap. UARTs are generally long-lived objects, but the "make long-

From 2c35e5e284c5bd2b180e787ec0adf4ff366accfd Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 25 Sep 2022 16:10:11 +0200
Subject: [PATCH 1025/2403] avoid problematic sphinx version number for rtd
 theme

---
 requirements-doc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-doc.txt b/requirements-doc.txt
index 40ab2ad4ac..43e99fa32f 100644
--- a/requirements-doc.txt
+++ b/requirements-doc.txt
@@ -9,7 +9,7 @@ setuptools>=45
 setuptools_scm
 
 # For sphinx
-sphinx>=4.0.0
+sphinx!=5.2.0.post0
 sphinx-autoapi
 sphinx-rtd-theme
 sphinxcontrib-svg2pdfconverter

From 645cb6c2a591c49b9473b6fd182e5acd51b11a68 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 25 Sep 2022 12:22:50 -0500
Subject: [PATCH 1026/2403] pin python version for doc building

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84224a1c1a..02985212f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -220,7 +220,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v2
       with:
-        python-version: "3.x"
+        python-version: "3.10.6"
     - name: Install dependencies
       run: |
         sudo apt-get update

From 77c1c695b03217418ba56ad1ad246b2841370bad Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sun, 25 Sep 2022 23:56:04 +0200
Subject: [PATCH 1027/2403] 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             | 27 ++++---------------------
 locale/cs.po             | 24 +---------------------
 locale/de_DE.po          | 39 +++++++++++++++---------------------
 locale/el.po             | 24 +---------------------
 locale/en_GB.po          | 39 +++++++++++++++---------------------
 locale/es.po             | 39 +++++++++++++++---------------------
 locale/fil.po            | 43 +++++++++++++++++-----------------------
 locale/fr.po             | 39 +++++++++++++++---------------------
 locale/hi.po             | 24 +---------------------
 locale/it_IT.po          | 43 +++++++++++++++++-----------------------
 locale/ja.po             | 33 ++++++++++--------------------
 locale/ko.po             | 24 +---------------------
 locale/nl.po             | 39 +++++++++++++++---------------------
 locale/pl.po             | 39 +++++++++++++++---------------------
 locale/pt_BR.po          | 39 +++++++++++++++---------------------
 locale/ru.po             | 24 +---------------------
 locale/sv.po             | 39 +++++++++++++++---------------------
 locale/tr.po             | 24 +---------------------
 locale/zh_Latn_pinyin.po | 39 +++++++++++++++---------------------
 19 files changed, 200 insertions(+), 441 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index d7044bf74e..5c7b21a0eb 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2557,8 +2557,7 @@ msgstr "tidak dapat menetapkan ke ekspresi"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2745,10 +2744,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2900,10 +2895,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3771,10 +3762,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -4012,10 +3999,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4230,7 +4213,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4360,10 +4342,6 @@ msgstr "nilai x di luar batas"
 msgid "xTaskCreate failed"
 msgstr "xTaskCreate gagal"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y harus menjadi int"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "Nilai y di luar batas"
@@ -4384,6 +4362,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "y should be an int"
+#~ msgstr "y harus menjadi int"
+
 #~ msgid "%q must be a tuple of length 2"
 #~ msgstr "%q harus berupa tuple dengan panjang 2"
 
diff --git a/locale/cs.po b/locale/cs.po
index 27f426e658..ae9a8ed7b2 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2544,8 +2544,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2732,10 +2731,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2887,10 +2882,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3757,10 +3748,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3998,10 +3985,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4216,7 +4199,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4346,10 +4328,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4e109a41cf..e173ee6c3c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2599,8 +2599,7 @@ msgstr "kann keinem Ausdruck zuweisen"
 msgid "can't cancel self"
 msgstr "kann self nicht abbrechen"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kann %q nicht zu %q konvertieren"
 
@@ -2795,10 +2794,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "Farbe muss zwischen 0x000000 und 0xffffff liegen"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "Farbe sollte ein int sein"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "Vergleich von int und uint"
@@ -2952,10 +2947,6 @@ msgstr "leere Sequenz"
 msgid "end of format while looking for conversion specifier"
 msgstr "Ende des Formats wärend der Suche nach einem conversion specifier"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x sollte ein int sein"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time wird auf diesem Board nicht unterstützt"
@@ -3835,10 +3826,6 @@ msgstr "pack erwartete %d Artikel zum Packen (erhalten %d)"
 msgid "palette must be 32 bytes long"
 msgstr "Die Palette muss 32 Byte lang sein"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index sollte ein int sein"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "Die Parameter müssen Register der Reihenfolge a2 bis a5 sein"
@@ -4076,10 +4063,6 @@ msgstr "source_bitmap muss value_count von 8 haben"
 msgid "start/end indices"
 msgstr "start/end Indizes"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x sollte ein int sein"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "Schritt (step) darf nicht Null sein"
@@ -4297,7 +4280,6 @@ msgid "unreadable attribute"
 msgstr "nicht lesbares Attribut"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "Nicht unterstützter %q-Typ"
 
@@ -4427,10 +4409,6 @@ msgstr "x Wert außerhalb der Grenzen"
 msgid "xTaskCreate failed"
 msgstr "xTaskCreate fehlgeschlagen"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y sollte ein int sein"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y Wert außerhalb der Grenzen"
@@ -4451,6 +4429,21 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "color should be an int"
+#~ msgstr "Farbe sollte ein int sein"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x sollte ein int sein"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index sollte ein int sein"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x sollte ein int sein"
+
+#~ msgid "y should be an int"
+#~ msgstr "y sollte ein int sein"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/el.po b/locale/el.po
index 8205801d3a..f996a90a23 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2534,8 +2534,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2722,10 +2721,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2877,10 +2872,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3747,10 +3738,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3988,10 +3975,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4206,7 +4189,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4336,10 +4318,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 92b83cd7aa..b525de6ff6 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2560,8 +2560,7 @@ msgstr "Can't assign to expression"
 msgid "can't cancel self"
 msgstr "can't cancel self"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Can't convert %q to %q"
 
@@ -2750,10 +2749,6 @@ msgstr "colour buffer must be a bytearray or array of type 'b' or 'B'"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "colour must be between 0x000000 and 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "colour should be an int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "comparison of int and uint"
@@ -2906,10 +2901,6 @@ msgstr "empty sequence"
 msgid "end of format while looking for conversion specifier"
 msgstr "end of format while looking for conversion specifier"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x should be an int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time not supported on this board"
@@ -3776,10 +3767,6 @@ msgstr "pack expected %d items for packing (got %d)"
 msgid "palette must be 32 bytes long"
 msgstr "palette must be 32 bytes long"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index should be an int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "parameters must be registers in sequence a2 to a5"
@@ -4017,10 +4004,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/end indices"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x should be an int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step must be non-zero"
@@ -4235,7 +4218,6 @@ msgid "unreadable attribute"
 msgstr "unreadable attribute"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "unsupported %q type"
 
@@ -4365,10 +4347,6 @@ msgstr "x value out of bounds"
 msgid "xTaskCreate failed"
 msgstr "xTaskCreate failed"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y should be an int"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y value out of bounds"
@@ -4389,6 +4367,21 @@ 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 "color should be an int"
+#~ msgstr "colour should be an int"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x should be an int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index should be an int"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x should be an int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y should be an int"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/es.po b/locale/es.po
index 0d981d2d7c..42ea8aecb9 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2596,8 +2596,7 @@ msgstr "no se puede asignar a la expresión"
 msgid "can't cancel self"
 msgstr "no se puede cancelar a si mismo"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "no puede convertir %q a %q"
 
@@ -2789,10 +2788,6 @@ msgstr "color buffer deberia ser un bytearray o array de tipo 'b' o 'B'"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "color debe estar entre 0x000000 y 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "color deberia ser un int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "comparación entre int y uint"
@@ -2946,10 +2941,6 @@ msgstr "secuencia vacía"
 msgid "end of format while looking for conversion specifier"
 msgstr "el final del formato mientras se busca el especificador de conversión"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x debe ser un int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time no esta soportado en esta tarjeta"
@@ -3823,10 +3814,6 @@ msgstr "pack espera %d items para empaquetado (se recibió %d)"
 msgid "palette must be 32 bytes long"
 msgstr "palette debe ser 32 bytes de largo"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index deberia ser un int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "los parámetros deben ser registros en secuencia de a2 a a5"
@@ -4064,10 +4051,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "índices inicio/final"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x deberia ser un int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "paso debe ser numero no cero"
@@ -4283,7 +4266,6 @@ msgid "unreadable attribute"
 msgstr "atributo no legible"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "tipo de %q no soportado"
 
@@ -4413,10 +4395,6 @@ msgstr "valor x fuera de límites"
 msgid "xTaskCreate failed"
 msgstr "fallo en xTaskCreate"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y deberia ser un int"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "valor y fuera de límites"
@@ -4437,6 +4415,21 @@ 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 "color should be an int"
+#~ msgstr "color deberia ser un int"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x debe ser un int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index deberia ser un int"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x deberia ser un int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y deberia ser un int"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/fil.po b/locale/fil.po
index 63f5990a0a..11fdd354d9 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2548,8 +2548,7 @@ msgstr "hindi ma i-assign sa expression"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2741,10 +2740,6 @@ msgstr "ang color buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "color ay dapat mula sa 0x000000 hangang 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "color ay dapat na int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2900,11 +2895,6 @@ msgstr "walang laman ang sequence"
 msgid "end of format while looking for conversion specifier"
 msgstr "sa huli ng format habang naghahanap sa conversion specifier"
 
-#: shared-bindings/displayio/Shape.c
-#, fuzzy
-msgid "end_x should be an int"
-msgstr "y ay dapat int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3777,10 +3767,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr "ang palette ay dapat 32 bytes ang haba"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index ay dapat na int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "ang mga parameter ay dapat na nagrerehistro sa sequence a2 hanggang a5"
@@ -4019,11 +4005,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/end indeks"
 
-#: shared-bindings/displayio/Shape.c
-#, fuzzy
-msgid "start_x should be an int"
-msgstr "y ay dapat int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step ay dapat hindi zero"
@@ -4238,7 +4219,6 @@ msgid "unreadable attribute"
 msgstr "hindi mabasa ang attribute"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "Hindi supportadong tipo ng %q"
 
@@ -4369,10 +4349,6 @@ msgstr "wala sa sakop ang address"
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y ay dapat int"
-
 #: shared-module/displayio/Shape.c
 #, fuzzy
 msgid "y value out of bounds"
@@ -4394,6 +4370,23 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "color should be an int"
+#~ msgstr "color ay dapat na int"
+
+#, fuzzy
+#~ msgid "end_x should be an int"
+#~ msgstr "y ay dapat int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index ay dapat na int"
+
+#, fuzzy
+#~ msgid "start_x should be an int"
+#~ msgstr "y ay dapat int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y ay dapat int"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/fr.po b/locale/fr.po
index 9c7ce445ae..b3205f0ac5 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2628,8 +2628,7 @@ msgstr "ne peut pas assigner à une expression"
 msgid "can't cancel self"
 msgstr "ne peut pas s'annuler soi-même"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "impossible de convertir %q en %q"
 
@@ -2825,10 +2824,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "la couleur doit être entre 0x000000 et 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "la couleur doit être un entier 'int'"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "comparaison entre int et uint"
@@ -2983,10 +2978,6 @@ msgstr "séquence vide"
 msgid "end of format while looking for conversion specifier"
 msgstr "fin de format en cherchant une spécification de conversion"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x doit être un entier 'int'"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time n'est pas supporté sur ce panneau"
@@ -3864,10 +3855,6 @@ msgstr "pack attend %d element(s) (%d reçu)"
 msgid "palette must be 32 bytes long"
 msgstr "la palette doit être longue de 32 octets"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index devrait être un entier 'int'"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "les paramètres doivent être des registres dans la séquence a2 à a5"
@@ -4106,10 +4093,6 @@ msgstr "source_bitmap doit avoir une value_count de 8"
 msgid "start/end indices"
 msgstr "indices de début/fin"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "'start_x' doit être un entier 'int'"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "le pas 'step' doit être non nul"
@@ -4325,7 +4308,6 @@ msgid "unreadable attribute"
 msgstr "attribut illisible"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "type %q non pris on charge"
 
@@ -4455,10 +4437,6 @@ msgstr "valeur x hors limites"
 msgid "xTaskCreate failed"
 msgstr "Échec de xTaskCreate"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "'y' doit être un entier 'int'"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "valeur y hors limites"
@@ -4479,6 +4457,21 @@ 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 "color should be an int"
+#~ msgstr "la couleur doit être un entier 'int'"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x doit être un entier 'int'"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index devrait être un entier 'int'"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "'start_x' doit être un entier 'int'"
+
+#~ msgid "y should be an int"
+#~ msgstr "'y' doit être un entier 'int'"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/hi.po b/locale/hi.po
index 65d430d860..c96d057c7b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2526,8 +2526,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2714,10 +2713,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2869,10 +2864,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3739,10 +3730,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3980,10 +3967,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4198,7 +4181,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4328,10 +4310,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index c2f0018256..c2be65716b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2560,8 +2560,7 @@ msgstr "impossibile assegnare all'espressione"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2750,10 +2749,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "il colore deve essere compreso tra 0x000000 e 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "il colore deve essere un int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2908,11 +2903,6 @@ msgstr "sequenza vuota"
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-#, fuzzy
-msgid "end_x should be an int"
-msgstr "y dovrebbe essere un int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3789,10 +3779,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr "la palette deve essere lunga 32 byte"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index deve essere un int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "parametri devono essere i registri in sequenza da a2 a a5"
@@ -4032,11 +4018,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-#, fuzzy
-msgid "start_x should be an int"
-msgstr "y dovrebbe essere un int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step deve essere non zero"
@@ -4251,7 +4232,6 @@ msgid "unreadable attribute"
 msgstr "attributo non leggibile"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "tipo di %q non supportato"
 
@@ -4382,10 +4362,6 @@ msgstr "indirizzo fuori limite"
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y dovrebbe essere un int"
-
 #: shared-module/displayio/Shape.c
 #, fuzzy
 msgid "y value out of bounds"
@@ -4407,6 +4383,23 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "color should be an int"
+#~ msgstr "il colore deve essere un int"
+
+#, fuzzy
+#~ msgid "end_x should be an int"
+#~ msgstr "y dovrebbe essere un int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index deve essere un int"
+
+#, fuzzy
+#~ msgid "start_x should be an int"
+#~ msgstr "y dovrebbe essere un int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y dovrebbe essere un int"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/ja.po b/locale/ja.po
index 495c7ca978..d7ec845e23 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2540,8 +2540,7 @@ msgstr "式には代入できません"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "%qを%qに変換できません"
 
@@ -2730,10 +2729,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "色は0x000000から0xffffffでなければなりません"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2887,10 +2882,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_xは整数でなければなりません"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3758,10 +3749,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr "パレットの長さは32バイトでなければなりません"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_indexには整数が必要"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -4001,10 +3988,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "stepは非ゼロ値でなければなりません"
@@ -4219,7 +4202,6 @@ msgid "unreadable attribute"
 msgstr "読み込み不可能な属性"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "非対応の型 %q"
 
@@ -4349,10 +4331,6 @@ msgstr "xが範囲外"
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "yは整数でなければなりません"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "yが範囲外"
@@ -4373,6 +4351,15 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "end_x should be an int"
+#~ msgstr "end_xは整数でなければなりません"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_indexには整数が必要"
+
+#~ msgid "y should be an int"
+#~ msgstr "yは整数でなければなりません"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/ko.po b/locale/ko.po
index aa3d738f01..669ae1a551 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2530,8 +2530,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2718,10 +2717,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2873,10 +2868,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3743,10 +3734,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3984,10 +3971,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4202,7 +4185,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4332,10 +4314,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 76577117fa..e888fc2d66 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2557,8 +2557,7 @@ msgstr "kan niet toewijzen aan expressie"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan %q niet naar %q converteren"
 
@@ -2745,10 +2744,6 @@ msgstr "kleurbuffer moet een bytearray of array van type 'b' of 'B' zijn"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "kleur moet tussen 0x000000 en 0xffffff liggen"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "kleur moet een int zijn"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2902,10 +2897,6 @@ msgstr "lege sequentie"
 msgid "end of format while looking for conversion specifier"
 msgstr "einde van format terwijl zoekend naar conversie-specifier"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x moet een int zijn"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time niet ondersteund op dit bord"
@@ -3776,10 +3767,6 @@ msgstr "pack verwachtte %d elementen (ontving %d)"
 msgid "palette must be 32 bytes long"
 msgstr "palette moet 32 bytes lang zijn"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index moet een int zijn"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "parameters moeten registers zijn in de volgorde a2 tot a5"
@@ -4017,10 +4004,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/stop indices"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x moet een int zijn"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step mag geen nul zijn"
@@ -4235,7 +4218,6 @@ msgid "unreadable attribute"
 msgstr "onleesbaar attribuut"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "niet ondersteund %q type"
 
@@ -4365,10 +4347,6 @@ msgstr "x-waarde buiten bereik"
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y moet een int zijn"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y-waarde buiten bereik"
@@ -4389,6 +4367,21 @@ 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 "color should be an int"
+#~ msgstr "kleur moet een int zijn"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x moet een int zijn"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index moet een int zijn"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x moet een int zijn"
+
+#~ msgid "y should be an int"
+#~ msgstr "y moet een int zijn"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/pl.po b/locale/pl.po
index bdda99d827..b01fd67829 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2537,8 +2537,7 @@ msgstr "przypisanie do wyrażenia"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "nie można dokonać konwersji %q na %q"
 
@@ -2725,10 +2724,6 @@ msgstr "bufor kolorów musi być bytearray lub tablicą typu 'b' lub 'B'"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "kolor musi być pomiędzy 0x000000 a 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "kolor powinien być liczbą całkowitą"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2881,10 +2876,6 @@ msgstr "pusta sekwencja"
 msgid "end of format while looking for conversion specifier"
 msgstr "koniec formatu przy szukaniu specyfikacji konwersji"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x powinien być całkowity"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3751,10 +3742,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr "paleta musi mieć 32 bajty długości"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index powinien być całkowity"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "parametry muszą być rejestrami w kolejności a2 do a5"
@@ -3993,10 +3980,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "początkowe/końcowe indeksy"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x powinien być całkowity"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step nie może być zerowe"
@@ -4211,7 +4194,6 @@ msgid "unreadable attribute"
 msgstr "nieczytelny atrybut"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "zły typ %q"
 
@@ -4341,10 +4323,6 @@ msgstr "x poza zakresem"
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y powinno być całkowite"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y poza zakresem"
@@ -4365,6 +4343,21 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "color should be an int"
+#~ msgstr "kolor powinien być liczbą całkowitą"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x powinien być całkowity"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index powinien być całkowity"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x powinien być całkowity"
+
+#~ msgid "y should be an int"
+#~ msgstr "y powinno być całkowite"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c78044a1bf..9d5a97b28b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2609,8 +2609,7 @@ msgstr "a expressão não pode ser atribuída"
 msgid "can't cancel self"
 msgstr "não é possível cancelar a si mesmo"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "não é possível converter %q para %q"
 
@@ -2803,10 +2802,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "cor deve estar entre 0x000000 e 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "cor deve ser um int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "comparação de int e uint"
@@ -2961,10 +2956,6 @@ msgstr "seqüência vazia"
 msgid "end of format while looking for conversion specifier"
 msgstr "final de formato enquanto procura pelo especificador de conversão"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "end_x deve ser um int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "O epoch_time não é compatível com esta placa"
@@ -3844,10 +3835,6 @@ msgstr "o pacote previa %d itens para a empacotamento (obteve %d)"
 msgid "palette must be 32 bytes long"
 msgstr "a paleta deve ter 32 bytes de comprimento"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index deve ser um int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "os parâmetros devem ser registradores na sequência a2 até a5"
@@ -4085,10 +4072,6 @@ msgstr "o source_bitmap deve ter o value_count de 8"
 msgid "start/end indices"
 msgstr "os índices de início/fim"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x deve ser um int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "o passo deve ser diferente de zero"
@@ -4303,7 +4286,6 @@ msgid "unreadable attribute"
 msgstr "atributo ilegível"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "tipo %q não suportado"
 
@@ -4433,10 +4415,6 @@ msgstr "o valor x está fora dos limites"
 msgid "xTaskCreate failed"
 msgstr "o xTaskCreate falhou"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y deve ser um int"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "o valor y está fora dos limites"
@@ -4457,6 +4435,21 @@ 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 "color should be an int"
+#~ msgstr "cor deve ser um int"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "end_x deve ser um int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index deve ser um int"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x deve ser um int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y deve ser um int"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
diff --git a/locale/ru.po b/locale/ru.po
index 7ee166c7ed..51480c87ed 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2575,8 +2575,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2763,10 +2762,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2918,10 +2913,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3788,10 +3779,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -4029,10 +4016,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4247,7 +4230,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4377,10 +4359,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 03c918a6be..783229f591 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2581,8 +2581,7 @@ msgstr "kan inte tilldela uttryck"
 msgid "can't cancel self"
 msgstr "kan inte avbryta sig själv"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan inte konvertera %q till %q"
 
@@ -2771,10 +2770,6 @@ msgstr "färgbuffert måste vara en bytearray eller matris av typ 'b' eller 'B'"
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "färg måste vara mellan 0x000000 och 0xffffff"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "color ska vara en int"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "jämförelse av int och uint"
@@ -2929,10 +2924,6 @@ msgstr "tom sekvens"
 msgid "end of format while looking for conversion specifier"
 msgstr "slut på format vid sökning efter konverteringsspecificerare"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "color ska vara en int"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time stöds inte av detta kort"
@@ -3804,10 +3795,6 @@ msgstr "pack förväntade %d stycken för packning (fick %d)"
 msgid "palette must be 32 bytes long"
 msgstr "palette måste vara 32 bytes lång"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "palette_index ska vara en int"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "parametrarna måste registreras i följd a2-a5"
@@ -4046,10 +4033,6 @@ msgstr "source_bitmap måste ha value_count av 8"
 msgid "start/end indices"
 msgstr "start-/slutindex"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "start_x ska vara en int"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "step måste vara icke-noll"
@@ -4264,7 +4247,6 @@ msgid "unreadable attribute"
 msgstr "attribut kan inte läsas"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "typ %q stöds inte"
 
@@ -4394,10 +4376,6 @@ msgstr "x-värde utanför intervall"
 msgid "xTaskCreate failed"
 msgstr "xTaskCreate misslyckades"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y ska vara en int"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y-värde utanför intervall"
@@ -4418,6 +4396,21 @@ 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 "color should be an int"
+#~ msgstr "color ska vara en int"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "color ska vara en int"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "palette_index ska vara en int"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "start_x ska vara en int"
+
+#~ msgid "y should be an int"
+#~ msgstr "y ska vara en int"
+
 #~ msgid "%q ``must`` be a bytearray or array of type 'h', 'H', 'b' or 'B'"
 #~ msgstr ""
 #~ "%q ``måste`` vara en bytearray eller matris av typen 'h', 'H', 'b' eller "
diff --git a/locale/tr.po b/locale/tr.po
index bd1c3e73eb..65cc6e85f6 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2545,8 +2545,7 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2733,10 +2732,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr ""
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr ""
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr ""
@@ -2888,10 +2883,6 @@ msgstr ""
 msgid "end of format while looking for conversion specifier"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr ""
@@ -3758,10 +3749,6 @@ msgstr ""
 msgid "palette must be 32 bytes long"
 msgstr ""
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr ""
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr ""
@@ -3999,10 +3986,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr ""
@@ -4217,7 +4200,6 @@ msgid "unreadable attribute"
 msgstr ""
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 
@@ -4347,10 +4329,6 @@ msgstr ""
 msgid "xTaskCreate failed"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr ""
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index ddb1dbd821..3645f90d63 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2584,8 +2584,7 @@ msgstr "bùnéng fēnpèi dào biǎodá shì"
 msgid "can't cancel self"
 msgstr "bù néng qǔ xiāo zì wǒ"
 
-#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
-#: shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Wúfǎ jiāng %q zhuǎnhuàn wèi %q"
 
@@ -2776,10 +2775,6 @@ msgstr ""
 msgid "color must be between 0x000000 and 0xffffff"
 msgstr "yánsè bìxū jiè yú 0x000000 hé 0xffffff zhī jiān"
 
-#: shared-bindings/displayio/ColorConverter.c
-msgid "color should be an int"
-msgstr "yánsè yīng wèi zhěngshù"
-
 #: py/emitnative.c
 msgid "comparison of int and uint"
 msgstr "yīn tè hé wū yīn tè de bǐ jiào"
@@ -2933,10 +2928,6 @@ msgstr "kōng xùliè"
 msgid "end of format while looking for conversion specifier"
 msgstr "xúnzhǎo zhuǎnhuàn biāozhù géshì de jiéshù"
 
-#: shared-bindings/displayio/Shape.c
-msgid "end_x should be an int"
-msgstr "jiéwěi_x yīnggāi shì yīgè zhěngshù"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
 msgstr "epoch_time bǎn bù zhī chí cǐ bǎn běn"
@@ -3804,10 +3795,6 @@ msgstr "bāo zhuāng yù qī de %d bāo zhuāng xiàng mù (dé dào %d)"
 msgid "palette must be 32 bytes long"
 msgstr "yánsè bìxū shì 32 gè zì jié"
 
-#: shared-bindings/displayio/Palette.c
-msgid "palette_index should be an int"
-msgstr "yánsè suǒyǐn yīnggāi shì yīgè zhěngshù"
-
 #: py/emitinlinextensa.c
 msgid "parameters must be registers in sequence a2 to a5"
 msgstr "cānshù bìxū shì xùliè a2 zhì a5 de dēngjì shù"
@@ -4048,10 +4035,6 @@ msgstr "yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū
 msgid "start/end indices"
 msgstr "kāishǐ/jiéshù zhǐshù"
 
-#: shared-bindings/displayio/Shape.c
-msgid "start_x should be an int"
-msgstr "kāishǐ_x yīnggāi shì yīgè zhěngshù"
-
 #: shared-bindings/random/__init__.c
 msgid "step must be non-zero"
 msgstr "bùzhòu bìxū shìfēi líng"
@@ -4266,7 +4249,6 @@ msgid "unreadable attribute"
 msgstr "bùkě dú shǔxìng"
 
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
-#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr "bù zhīchí %q lèixíng"
 
@@ -4396,10 +4378,6 @@ msgstr "x zhí chāochū biānjiè"
 msgid "xTaskCreate failed"
 msgstr "xTaskCreate shī bài"
 
-#: shared-bindings/displayio/Shape.c
-msgid "y should be an int"
-msgstr "y yīnggāi shì yīgè zhěngshù"
-
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
 msgstr "y zhí chāochū biānjiè"
@@ -4420,6 +4398,21 @@ 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 "color should be an int"
+#~ msgstr "yánsè yīng wèi zhěngshù"
+
+#~ msgid "end_x should be an int"
+#~ msgstr "jiéwěi_x yīnggāi shì yīgè zhěngshù"
+
+#~ msgid "palette_index should be an int"
+#~ msgstr "yánsè suǒyǐn yīnggāi shì yīgè zhěngshù"
+
+#~ msgid "start_x should be an int"
+#~ msgstr "kāishǐ_x yīnggāi shì yīgè zhěngshù"
+
+#~ msgid "y should be an int"
+#~ msgstr "y yīnggāi shì yīgè zhěngshù"
+
 #~ msgid ""
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"

From 8754a6ec53a03b648dee608a5d2d936fcf515717 Mon Sep 17 00:00:00 2001
From: Florin Maticu 
Date: Sat, 19 Mar 2022 11:46:16 +0100
Subject: [PATCH 1028/2403] Add circuitpython support for STM Nucleo-F446RE.

---
 ports/stm/boards/STM32F446_fs.ld              |  26 ++++
 ports/stm/boards/nucleo_f446re/board.c        |  40 ++++++
 .../stm/boards/nucleo_f446re/mpconfigboard.h  |  55 ++++++++
 .../stm/boards/nucleo_f446re/mpconfigboard.mk |  35 +++++
 ports/stm/boards/nucleo_f446re/pins.c         |  78 +++++++++++
 ports/stm/peripherals/periph.h                |   7 +
 ports/stm/peripherals/pins.h                  |   3 +
 ports/stm/peripherals/stm32f4/clocks.c        |   9 +-
 .../peripherals/stm32f4/stm32f446xx/clocks.h  |  66 +++++++++
 .../peripherals/stm32f4/stm32f446xx/gpio.c    |  47 +++++++
 .../peripherals/stm32f4/stm32f446xx/periph.c  | 129 ++++++++++++++++++
 .../peripherals/stm32f4/stm32f446xx/periph.h  |  57 ++++++++
 .../peripherals/stm32f4/stm32f446xx/pins.c    |  88 ++++++++++++
 .../peripherals/stm32f4/stm32f446xx/pins.h    |  90 ++++++++++++
 ports/stm/supervisor/internal_flash.h         |   6 +
 15 files changed, 733 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm/boards/STM32F446_fs.ld
 create mode 100644 ports/stm/boards/nucleo_f446re/board.c
 create mode 100644 ports/stm/boards/nucleo_f446re/mpconfigboard.h
 create mode 100644 ports/stm/boards/nucleo_f446re/mpconfigboard.mk
 create mode 100644 ports/stm/boards/nucleo_f446re/pins.c
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
 create mode 100644 ports/stm/peripherals/stm32f4/stm32f446xx/pins.h

diff --git a/ports/stm/boards/STM32F446_fs.ld b/ports/stm/boards/STM32F446_fs.ld
new file mode 100644
index 0000000000..76735cbdc2
--- /dev/null
+++ b/ports/stm/boards/STM32F446_fs.ld
@@ -0,0 +1,26 @@
+/*
+    GNU linker script for STM32F446 with filesystem
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
+    FLASH_ISR (rx)      : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_FS (rx)       : ORIGIN = 0x08004000, LENGTH = 48K /* sectors 1,2,3 are 16K */
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x08010000, LENGTH = 448K /* sector 4 is 64K, sectors 5,6,7 are 128K */
+    RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 128K
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 24K;
+_minimum_heap_size = 16K;
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
diff --git a/ports/stm/boards/nucleo_f446re/board.c b/ports/stm/boards/nucleo_f446re/board.c
new file mode 100644
index 0000000000..31329a8d3b
--- /dev/null
+++ b/ports/stm/boards/nucleo_f446re/board.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.h b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
new file mode 100644
index 0000000000..eb67015c4e
--- /dev/null
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME "NUCLEO F446RE"
+#define MICROPY_HW_MCU_NAME "STM32F446xx"
+
+#define FLASH_SIZE (0x80000u)     // 512K
+#define FLASH_PAGE_SIZE (0x4000u) // 16K
+
+#define HSE_VALUE ((uint32_t)8000000u)
+#define BOARD_HSE_SOURCE (RCC_HSE_ON)
+// The schematic has a 32k crystal that isn't fitted. Uncommented the line below if you add it.
+// #define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
+// #define LSE_VALUE  ((uint32_t)32000U)
+#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
+
+// USART3 + USB FTDI
+// #define CIRCUITPY_CONSOLE_UART_TX (&pin_PC10)
+// #define CIRCUITPY_CONSOLE_UART_RX (&pin_PC11)
+
+// USART2 + ST link
+// #define CIRCUITPY_CONSOLE_UART_TX (&pin_PA02)
+// #define CIRCUITPY_CONSOLE_UART_RX (&pin_PA03)
+
+// Status LEDs
+#define MICROPY_HW_LED_STATUS (&pin_PA05)
+
+#define MICROPY_FATFS_EXFAT 0
+
+#define BOARD_NO_VBUS_SENSE (1)
diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.mk b/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
new file mode 100644
index 0000000000..3730729c95
--- /dev/null
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
@@ -0,0 +1,35 @@
+USB_VID = 0x239A
+USB_PID = 0x809F
+USB_PRODUCT = "NUCLEO-F446RE - CPy"
+USB_MANUFACTURER = "STMicroelectronics"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+
+MCU_SERIES = F4
+MCU_VARIANT = STM32F446xx
+MCU_PACKAGE = LQFP64
+
+LD_COMMON = boards/common_default.ld
+LD_FILE = boards/STM32F446_fs.ld
+
+# Too big for the flash
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_BITMAPTOOLS = 0
+CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_VECTORIO = 0
+CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_RAINBOWIO = 0
+CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_JSON = 0
+# Requires neopixel_write or SPI (dotstar)
+CIRCUITPY_PIXELBUF = 0
+# No requirements, but takes extra flash
+CIRCUITPY_ULAB = 0
+CIRCUITPY_GAMEPADSHIFT  = 0
+CIRCUITPY_BITBANGIO = 0
+CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_SDCARDIO = 0
+CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_KEYPAD = 0
diff --git a/ports/stm/boards/nucleo_f446re/pins.c b/ports/stm/boards/nucleo_f446re/pins.c
new file mode 100644
index 0000000000..ac5a457d07
--- /dev/null
+++ b/ports/stm/boards/nucleo_f446re/pins.c
@@ -0,0 +1,78 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    {MP_ROM_QSTR(MP_QSTR_ID), MP_ROM_PTR(&board_module_id_obj)},
+    {MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA03)},
+    {MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02)},
+    {MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA10)},
+    {MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB03)},
+    {MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PB05)},
+    {MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PB04)},
+    {MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PB10)},
+    {MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA08)},
+    {MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA09)},
+    {MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PC07)},
+    {MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PB06)},
+    {MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA07)},
+    {MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA06)},
+    {MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA05)},
+    {MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB09)},
+    {MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PB08)},
+    {MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA00)},
+    {MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA01)},
+    {MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA04)},
+    {MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB00)},
+    {MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PC01)},
+    {MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PC00)},
+    {MP_ROM_QSTR(MP_QSTR_PA0), MP_ROM_PTR(&pin_PA00)},
+    {MP_ROM_QSTR(MP_QSTR_PA1), MP_ROM_PTR(&pin_PA01)},
+    {MP_ROM_QSTR(MP_QSTR_PA2), MP_ROM_PTR(&pin_PA02)},
+    {MP_ROM_QSTR(MP_QSTR_PA3), MP_ROM_PTR(&pin_PA03)},
+    {MP_ROM_QSTR(MP_QSTR_PA4), MP_ROM_PTR(&pin_PA04)},
+    {MP_ROM_QSTR(MP_QSTR_PA5), MP_ROM_PTR(&pin_PA05)},
+    {MP_ROM_QSTR(MP_QSTR_PA6), MP_ROM_PTR(&pin_PA06)},
+    {MP_ROM_QSTR(MP_QSTR_PA7), MP_ROM_PTR(&pin_PA07)},
+    {MP_ROM_QSTR(MP_QSTR_PA8), MP_ROM_PTR(&pin_PA08)},
+    {MP_ROM_QSTR(MP_QSTR_PA9), MP_ROM_PTR(&pin_PA09)},
+    {MP_ROM_QSTR(MP_QSTR_PA10), MP_ROM_PTR(&pin_PA10)},
+    {MP_ROM_QSTR(MP_QSTR_PA11), MP_ROM_PTR(&pin_PA11)},
+    {MP_ROM_QSTR(MP_QSTR_PA12), MP_ROM_PTR(&pin_PA12)},
+    {MP_ROM_QSTR(MP_QSTR_PA15), MP_ROM_PTR(&pin_PA15)},
+    {MP_ROM_QSTR(MP_QSTR_PB0), MP_ROM_PTR(&pin_PB00)},
+    {MP_ROM_QSTR(MP_QSTR_PB1), MP_ROM_PTR(&pin_PB01)},
+    {MP_ROM_QSTR(MP_QSTR_PB2), MP_ROM_PTR(&pin_PB02)},
+    {MP_ROM_QSTR(MP_QSTR_PB3), MP_ROM_PTR(&pin_PB03)},
+    {MP_ROM_QSTR(MP_QSTR_PB4), MP_ROM_PTR(&pin_PB04)},
+    {MP_ROM_QSTR(MP_QSTR_PB5), MP_ROM_PTR(&pin_PB05)},
+    {MP_ROM_QSTR(MP_QSTR_PB6), MP_ROM_PTR(&pin_PB06)},
+    {MP_ROM_QSTR(MP_QSTR_PB7), MP_ROM_PTR(&pin_PB07)},
+    {MP_ROM_QSTR(MP_QSTR_PB8), MP_ROM_PTR(&pin_PB08)},
+    {MP_ROM_QSTR(MP_QSTR_PB9), MP_ROM_PTR(&pin_PB09)},
+    {MP_ROM_QSTR(MP_QSTR_PB10), MP_ROM_PTR(&pin_PB10)},
+    {MP_ROM_QSTR(MP_QSTR_PB12), MP_ROM_PTR(&pin_PB12)},
+    {MP_ROM_QSTR(MP_QSTR_PB13), MP_ROM_PTR(&pin_PB13)},
+    {MP_ROM_QSTR(MP_QSTR_PB14), MP_ROM_PTR(&pin_PB14)},
+    {MP_ROM_QSTR(MP_QSTR_PB15), MP_ROM_PTR(&pin_PB15)},
+    {MP_ROM_QSTR(MP_QSTR_PC0), MP_ROM_PTR(&pin_PC00)},
+    {MP_ROM_QSTR(MP_QSTR_PC1), MP_ROM_PTR(&pin_PC01)},
+    {MP_ROM_QSTR(MP_QSTR_PC2), MP_ROM_PTR(&pin_PC02)},
+    {MP_ROM_QSTR(MP_QSTR_PC3), MP_ROM_PTR(&pin_PC03)},
+    {MP_ROM_QSTR(MP_QSTR_PC4), MP_ROM_PTR(&pin_PC04)},
+    {MP_ROM_QSTR(MP_QSTR_PC5), MP_ROM_PTR(&pin_PC05)},
+    {MP_ROM_QSTR(MP_QSTR_PC6), MP_ROM_PTR(&pin_PC06)},
+    {MP_ROM_QSTR(MP_QSTR_PC7), MP_ROM_PTR(&pin_PC07)},
+    {MP_ROM_QSTR(MP_QSTR_PC8), MP_ROM_PTR(&pin_PC08)},
+    {MP_ROM_QSTR(MP_QSTR_PC9), MP_ROM_PTR(&pin_PC09)},
+    {MP_ROM_QSTR(MP_QSTR_PC10), MP_ROM_PTR(&pin_PC10)},
+    {MP_ROM_QSTR(MP_QSTR_PC11), MP_ROM_PTR(&pin_PC11)},
+    {MP_ROM_QSTR(MP_QSTR_PC12), MP_ROM_PTR(&pin_PC12)},
+    {MP_ROM_QSTR(MP_QSTR_PC13), MP_ROM_PTR(&pin_PC13)},
+    {MP_ROM_QSTR(MP_QSTR_PC14), MP_ROM_PTR(&pin_PC14)},
+    {MP_ROM_QSTR(MP_QSTR_PC15), MP_ROM_PTR(&pin_PC15)},
+    {MP_ROM_QSTR(MP_QSTR_PD2), MP_ROM_PTR(&pin_PD02)},
+    {MP_ROM_QSTR(MP_QSTR_PH0), MP_ROM_PTR(&pin_PH00)},
+    {MP_ROM_QSTR(MP_QSTR_PH1), MP_ROM_PTR(&pin_PH01)},
+    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA05)},
+    {MP_ROM_QSTR(MP_QSTR_SW), MP_ROM_PTR(&pin_PC13)},
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/stm/peripherals/periph.h b/ports/stm/peripherals/periph.h
index caf4ca1324..1049aeb084 100644
--- a/ports/stm/peripherals/periph.h
+++ b/ports/stm/peripherals/periph.h
@@ -119,6 +119,13 @@ typedef struct {
 #include "stm32f4/stm32f407xx/periph.h"
 #endif
 
+#ifdef STM32F446xx
+#define HAS_DAC 0
+#define HAS_TRNG 0
+#define HAS_BASIC_TIM 0
+#include "stm32f4/stm32f446xx/periph.h"
+#endif
+
 // F7 Series
 
 #ifdef STM32F746xx
diff --git a/ports/stm/peripherals/pins.h b/ports/stm/peripherals/pins.h
index 37aa2d8feb..a53b05aa1d 100644
--- a/ports/stm/peripherals/pins.h
+++ b/ports/stm/peripherals/pins.h
@@ -97,6 +97,9 @@ extern const mp_obj_type_t mcu_pin_type;
 #ifdef STM32F407xx
 #include "stm32f4/stm32f407xx/pins.h"
 #endif
+#ifdef STM32F446xx
+#include "stm32f4/stm32f446xx/pins.h"
+#endif
 
 // F7 Series
 #ifdef STM32F746xx
diff --git a/ports/stm/peripherals/stm32f4/clocks.c b/ports/stm/peripherals/stm32f4/clocks.c
index f3434a944b..a2f8344901 100644
--- a/ports/stm/peripherals/stm32f4/clocks.c
+++ b/ports/stm/peripherals/stm32f4/clocks.c
@@ -47,11 +47,14 @@
 #ifdef STM32F407xx
 #include "stm32f4/stm32f407xx/clocks.h"
 #endif
+#ifdef STM32F446xx
+#include "stm32f4/stm32f446xx/clocks.h"
+#endif
 
 void stm32_peripherals_clocks_init(void) {
-    RCC_ClkInitTypeDef RCC_ClkInitStruct;
-    RCC_OscInitTypeDef RCC_OscInitStruct;
-    RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
+    RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+    RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+    RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
 
     // Set voltage scaling in accordance with system clock speed
     __HAL_RCC_PWR_CLK_ENABLE();
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h b/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
new file mode 100644
index 0000000000..fc724fc056
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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 "stm32f4xx_hal.h"
+
+// Chip:                STM32F446xC/xV
+// Line Type:           Access Line
+// Speed:               168MHz (max 180MHz)
+
+// Defaults:
+#ifndef CPY_CLK_VSCALE
+#define CPY_CLK_VSCALE (PWR_REGULATOR_VOLTAGE_SCALE1)
+#endif
+#ifndef CPY_CLK_PLLM
+#define CPY_CLK_PLLM (8)
+#endif
+#ifndef CPY_CLK_PLLN
+#define CPY_CLK_PLLN (336)
+#endif
+#ifndef CPY_CLK_PLLP
+#define CPY_CLK_PLLP (RCC_PLLP_DIV2)
+#endif
+#ifndef CPY_CLK_PLLQ
+#define CPY_CLK_PLLQ (7)
+#endif
+#ifndef CPY_CLK_AHBDIV
+#define CPY_CLK_AHBDIV (RCC_SYSCLK_DIV1)
+#endif
+#ifndef CPY_CLK_APB1DIV
+#define CPY_CLK_APB1DIV (RCC_HCLK_DIV4)
+#endif
+#ifndef CPY_CLK_APB2DIV
+#define CPY_CLK_APB2DIV (RCC_HCLK_DIV2)
+#endif
+#ifndef CPY_CLK_FLASH_LATENCY
+#define CPY_CLK_FLASH_LATENCY (FLASH_LATENCY_5)
+#endif
+#ifndef CPY_CLK_USB_USES_AUDIOPLL
+#define CPY_CLK_USB_USES_AUDIOPLL (0)
+#endif
+#ifndef BOARD_HSE_SOURCE
+#define BOARD_HSE_SOURCE (RCC_HSE_ON)
+#endif
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c b/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
new file mode 100644
index 0000000000..c31c785bf2
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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 "peripherals/gpio.h"
+#include "stm32f4xx_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void stm32_peripherals_gpio_init(void) {
+    // * GPIO Ports Clock Enable */
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOH_CLK_ENABLE();
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+
+    // Never reset pins
+    never_reset_pin_number(2, 13); // PC13 anti tamp
+    never_reset_pin_number(2, 14); // PC14 OSC32_IN
+    never_reset_pin_number(2, 15); // PC15 OSC32_OUT
+    never_reset_pin_number(0, 13); // PA13 SWDIO
+    never_reset_pin_number(0, 14); // PA14 SWCLK
+}
+
+void stm32f4_peripherals_status_led(uint8_t led, uint8_t state) {
+}
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
new file mode 100644
index 0000000000..666b2be2c2
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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/mphal.h"
+#include "peripherals/pins.h"
+#include "peripherals/periph.h"
+
+// I2C
+I2C_TypeDef *mcu_i2c_banks[3] = {I2C1, I2C2, I2C3};
+
+const mcu_periph_obj_t mcu_i2c_sda_list[3] = {
+    PERIPH(1, 4, &pin_PB07),
+    PERIPH(2, 4, &pin_PB03),
+    PERIPH(3, 4, &pin_PB04),
+};
+
+const mcu_periph_obj_t mcu_i2c_scl_list[3] = {
+    PERIPH(1, 4, &pin_PB06),
+    PERIPH(2, 4, &pin_PB10),
+    PERIPH(3, 4, &pin_PA08),
+};
+
+// SPI
+SPI_TypeDef *mcu_spi_banks[3] = {SPI1, SPI2, SPI3};
+
+const mcu_periph_obj_t mcu_spi_sck_list[3] = {
+    PERIPH(1, 5, &pin_PA05),
+    PERIPH(2, 5, &pin_PB13),
+    PERIPH(3, 6, &pin_PB03),
+};
+
+const mcu_periph_obj_t mcu_spi_mosi_list[3] = {
+    PERIPH(1, 5, &pin_PA07),
+    PERIPH(2, 5, &pin_PB15),
+    PERIPH(3, 6, &pin_PB05),
+
+};
+
+const mcu_periph_obj_t mcu_spi_miso_list[3] = {
+    PERIPH(1, 5, &pin_PA06),
+    PERIPH(2, 5, &pin_PB14),
+    PERIPH(3, 6, &pin_PB04),
+};
+
+const mcu_periph_obj_t mcu_spi_nss_list[3] = {
+    PERIPH(1, 5, &pin_PA04),
+    PERIPH(2, 5, &pin_PB12),
+    PERIPH(3, 6, &pin_PA15),
+};
+
+USART_TypeDef *mcu_uart_banks[MAX_UART] = {USART1, USART2, USART3, NULL, NULL, NULL};
+bool mcu_uart_has_usart[MAX_UART] = {false, false, false, true, true, false};
+
+const mcu_periph_obj_t mcu_uart_tx_list[3] = {
+    PERIPH(1, 7, &pin_PB06),
+    PERIPH(2, 7, &pin_PA02),
+    PERIPH(3, 7, &pin_PC10),
+
+};
+
+const mcu_periph_obj_t mcu_uart_rx_list[3] = {
+    PERIPH(1, 7, &pin_PB07),
+    PERIPH(2, 7, &pin_PA03),
+    PERIPH(3, 7, &pin_PC11),
+};
+
+// Timers
+TIM_TypeDef *mcu_tim_banks[14] = {TIM1, TIM2, TIM3, TIM4, TIM5, NULL, NULL, NULL, TIM9, TIM10,
+                                  TIM11, NULL, NULL, NULL};
+
+const mcu_tim_pin_obj_t mcu_tim_pin_list[34] = {
+    TIM(2, 1, 1, &pin_PA00),
+    TIM(5, 2, 1, &pin_PA00),
+    TIM(2, 1, 2, &pin_PA01),
+    TIM(5, 2, 2, &pin_PA01),
+    TIM(2, 1, 3, &pin_PA02),
+    TIM(5, 2, 3, &pin_PA02),
+    TIM(2, 1, 4, &pin_PA03),
+    TIM(5, 2, 4, &pin_PA03),
+    TIM(9, 3, 1, &pin_PA02),
+    TIM(9, 3, 2, &pin_PA03),
+    TIM(3, 2, 1, &pin_PA06),
+    TIM(3, 2, 2, &pin_PA07),
+    TIM(1, 1, 1, &pin_PA08),
+    TIM(1, 1, 2, &pin_PA09),
+    TIM(1, 1, 3, &pin_PA10),
+    TIM(1, 1, 4, &pin_PA11),
+    TIM(2, 1, 1, &pin_PA15),
+    TIM(3, 2, 3, &pin_PB00),
+    TIM(3, 2, 4, &pin_PB01),
+    TIM(2, 1, 2, &pin_PB03),
+    TIM(3, 2, 1, &pin_PB04),
+    TIM(3, 2, 2, &pin_PB05),
+    TIM(4, 2, 1, &pin_PB06),
+    TIM(4, 2, 2, &pin_PB07),
+    TIM(4, 2, 3, &pin_PB08),
+    TIM(10, 2, 1, &pin_PB08),
+    TIM(4, 2, 4, &pin_PB09),
+    TIM(11, 2, 1, &pin_PB09),
+    TIM(2, 1, 3, &pin_PB10),
+    TIM(3, 2, 1, &pin_PC06),
+    TIM(3, 2, 2, &pin_PC07),
+    TIM(3, 2, 3, &pin_PC08),
+    TIM(3, 2, 4, &pin_PC09),
+};
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
new file mode 100644
index 0000000000..31ee9be4d4
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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_STM32_PERIPHERALS_STM32F446RE_PERIPH_H
+#define MICROPY_INCLUDED_STM32_PERIPHERALS_STM32F446RE_PERIPH_H
+
+// I2C
+extern I2C_TypeDef *mcu_i2c_banks[3];
+
+extern const mcu_periph_obj_t mcu_i2c_sda_list[3];
+extern const mcu_periph_obj_t mcu_i2c_scl_list[3];
+
+// SPI
+extern SPI_TypeDef *mcu_spi_banks[3];
+
+extern const mcu_periph_obj_t mcu_spi_sck_list[3];
+extern const mcu_periph_obj_t mcu_spi_mosi_list[3];
+extern const mcu_periph_obj_t mcu_spi_miso_list[3];
+extern const mcu_periph_obj_t mcu_spi_nss_list[3];
+
+// UART
+extern USART_TypeDef *mcu_uart_banks[MAX_UART];
+extern bool mcu_uart_has_usart[MAX_UART];
+
+extern const mcu_periph_obj_t mcu_uart_tx_list[3];
+extern const mcu_periph_obj_t mcu_uart_rx_list[3];
+
+// Timers
+#define TIM_BANK_ARRAY_LEN 14
+#define TIM_PIN_ARRAY_LEN 34
+extern TIM_TypeDef *mcu_tim_banks[TIM_BANK_ARRAY_LEN];
+extern const mcu_tim_pin_obj_t mcu_tim_pin_list[TIM_PIN_ARRAY_LEN];
+
+#endif // MICROPY_INCLUDED_STM32_PERIPHERALS_STM32F446RE_PERIPH_H
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
new file mode 100644
index 0000000000..23299cb6e8
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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/mphal.h"
+#include "peripherals/pins.h"
+
+const mcu_pin_obj_t pin_PC13 = PIN(2, 13, NO_ADC); // anti-tamp
+const mcu_pin_obj_t pin_PC14 = PIN(2, 14, NO_ADC); // OSC32_IN
+const mcu_pin_obj_t pin_PC15 = PIN(2, 15, NO_ADC); // OSC32_OUT
+const mcu_pin_obj_t pin_PC00 = PIN(2, 0, ADC_INPUT(ADC_1, 10));
+const mcu_pin_obj_t pin_PC01 = PIN(2, 1, ADC_INPUT(ADC_1, 11));
+const mcu_pin_obj_t pin_PC02 = PIN(2, 2, ADC_INPUT(ADC_1, 12));
+const mcu_pin_obj_t pin_PC03 = PIN(2, 3, ADC_INPUT(ADC_1, 13));
+
+const mcu_pin_obj_t pin_PA00 = PIN(0, 0, ADC_INPUT(ADC_1, 0));
+const mcu_pin_obj_t pin_PA01 = PIN(0, 1, ADC_INPUT(ADC_1, 1));
+const mcu_pin_obj_t pin_PA02 = PIN(0, 2, ADC_INPUT(ADC_1, 2));
+const mcu_pin_obj_t pin_PA03 = PIN(0, 3, ADC_INPUT(ADC_1, 3));
+const mcu_pin_obj_t pin_PA04 = PIN(0, 4, ADC_INPUT(ADC_1, 4));
+const mcu_pin_obj_t pin_PA05 = PIN(0, 5, ADC_INPUT(ADC_1, 5));
+const mcu_pin_obj_t pin_PA06 = PIN(0, 6, ADC_INPUT(ADC_1, 6));
+const mcu_pin_obj_t pin_PA07 = PIN(0, 7, ADC_INPUT(ADC_1, 7));
+
+const mcu_pin_obj_t pin_PC04 = PIN(2, 4, ADC_INPUT(ADC_1, 14));
+const mcu_pin_obj_t pin_PC05 = PIN(2, 5, ADC_INPUT(ADC_1, 15));
+const mcu_pin_obj_t pin_PB00 = PIN(1, 0, ADC_INPUT(ADC_1, 8));
+const mcu_pin_obj_t pin_PB01 = PIN(1, 1, ADC_INPUT(ADC_1, 9));
+const mcu_pin_obj_t pin_PB02 = PIN(1, 2, NO_ADC);
+
+const mcu_pin_obj_t pin_PB10 = PIN(1, 10, NO_ADC);
+const mcu_pin_obj_t pin_PB12 = PIN(1, 12, NO_ADC);
+const mcu_pin_obj_t pin_PB13 = PIN(1, 13, NO_ADC);
+const mcu_pin_obj_t pin_PB14 = PIN(1, 14, NO_ADC);
+const mcu_pin_obj_t pin_PB15 = PIN(1, 15, NO_ADC);
+
+const mcu_pin_obj_t pin_PC06 = PIN(2, 6, NO_ADC);
+const mcu_pin_obj_t pin_PC07 = PIN(2, 7, NO_ADC);
+const mcu_pin_obj_t pin_PC08 = PIN(2, 8, NO_ADC);
+const mcu_pin_obj_t pin_PC09 = PIN(2, 9, NO_ADC);
+const mcu_pin_obj_t pin_PA08 = PIN(0, 8, NO_ADC);
+const mcu_pin_obj_t pin_PA09 = PIN(0, 9, NO_ADC);
+
+const mcu_pin_obj_t pin_PA10 = PIN(0, 10, NO_ADC);
+const mcu_pin_obj_t pin_PA11 = PIN(0, 11, NO_ADC);
+const mcu_pin_obj_t pin_PA12 = PIN(0, 12, NO_ADC);
+const mcu_pin_obj_t pin_PA13 = PIN(0, 13, NO_ADC); // SWDIO
+const mcu_pin_obj_t pin_PA14 = PIN(0, 14, NO_ADC); // SWCLK
+const mcu_pin_obj_t pin_PA15 = PIN(0, 15, NO_ADC); // JTDI
+const mcu_pin_obj_t pin_PC10 = PIN(2, 10, NO_ADC);
+const mcu_pin_obj_t pin_PC11 = PIN(2, 11, NO_ADC);
+const mcu_pin_obj_t pin_PC12 = PIN(2, 12, NO_ADC);
+
+const mcu_pin_obj_t pin_PB03 = PIN(1, 3, NO_ADC);
+const mcu_pin_obj_t pin_PB04 = PIN(1, 4, NO_ADC);
+const mcu_pin_obj_t pin_PB05 = PIN(1, 5, NO_ADC);
+const mcu_pin_obj_t pin_PB06 = PIN(1, 6, NO_ADC);
+
+const mcu_pin_obj_t pin_PB07 = PIN(1, 7, NO_ADC);
+const mcu_pin_obj_t pin_PB08 = PIN(1, 8, NO_ADC);
+const mcu_pin_obj_t pin_PB09 = PIN(1, 9, NO_ADC);
+const mcu_pin_obj_t pin_PD02 = PIN(5, 2, NO_ADC);
+
+const mcu_pin_obj_t pin_PH00 = PIN(7, 0, NO_ADC);
+const mcu_pin_obj_t pin_PH01 = PIN(7, 1, NO_ADC);
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h
new file mode 100644
index 0000000000..629dda4623
--- /dev/null
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 flom84 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_STM32_PERIPHERALS_STM32F446RE_PINS_H
+#define MICROPY_INCLUDED_STM32_PERIPHERALS_STM32F446RE_PINS_H
+
+// Pins in datasheet order: DocID026289 Rev 7 page 38. LQFP64 only
+
+extern const mcu_pin_obj_t pin_PC13;
+extern const mcu_pin_obj_t pin_PC14;
+extern const mcu_pin_obj_t pin_PC15;
+extern const mcu_pin_obj_t pin_PC00;
+extern const mcu_pin_obj_t pin_PC01;
+extern const mcu_pin_obj_t pin_PC02;
+extern const mcu_pin_obj_t pin_PC03;
+
+extern const mcu_pin_obj_t pin_PA00;
+extern const mcu_pin_obj_t pin_PA01;
+extern const mcu_pin_obj_t pin_PA02;
+extern const mcu_pin_obj_t pin_PA03;
+extern const mcu_pin_obj_t pin_PA04;
+extern const mcu_pin_obj_t pin_PA05;
+extern const mcu_pin_obj_t pin_PA06;
+extern const mcu_pin_obj_t pin_PA07;
+
+extern const mcu_pin_obj_t pin_PC04;
+extern const mcu_pin_obj_t pin_PC05;
+extern const mcu_pin_obj_t pin_PB00;
+extern const mcu_pin_obj_t pin_PB01;
+extern const mcu_pin_obj_t pin_PB02;
+
+extern const mcu_pin_obj_t pin_PB10;
+extern const mcu_pin_obj_t pin_PB12;
+extern const mcu_pin_obj_t pin_PB13;
+extern const mcu_pin_obj_t pin_PB14;
+extern const mcu_pin_obj_t pin_PB15;
+
+extern const mcu_pin_obj_t pin_PC06;
+extern const mcu_pin_obj_t pin_PC07;
+extern const mcu_pin_obj_t pin_PC08;
+extern const mcu_pin_obj_t pin_PC09;
+extern const mcu_pin_obj_t pin_PA08;
+extern const mcu_pin_obj_t pin_PA09;
+
+extern const mcu_pin_obj_t pin_PA10;
+extern const mcu_pin_obj_t pin_PA11;
+extern const mcu_pin_obj_t pin_PA12;
+extern const mcu_pin_obj_t pin_PA13;
+extern const mcu_pin_obj_t pin_PA14;
+extern const mcu_pin_obj_t pin_PA15;
+extern const mcu_pin_obj_t pin_PC10;
+extern const mcu_pin_obj_t pin_PC11;
+extern const mcu_pin_obj_t pin_PC12;
+
+extern const mcu_pin_obj_t pin_PB03;
+extern const mcu_pin_obj_t pin_PB04;
+extern const mcu_pin_obj_t pin_PB05;
+extern const mcu_pin_obj_t pin_PB06;
+
+extern const mcu_pin_obj_t pin_PB07;
+extern const mcu_pin_obj_t pin_PB08;
+extern const mcu_pin_obj_t pin_PB09;
+extern const mcu_pin_obj_t pin_PD02;
+extern const mcu_pin_obj_t pin_PH00;
+extern const mcu_pin_obj_t pin_PH01;
+
+#endif // MICROPY_INCLUDED_STM32F4_PERIPHERALS_STM32F446RE_PINS_H
diff --git a/ports/stm/supervisor/internal_flash.h b/ports/stm/supervisor/internal_flash.h
index 98c55d30e8..809c263666 100644
--- a/ports/stm/supervisor/internal_flash.h
+++ b/ports/stm/supervisor/internal_flash.h
@@ -77,6 +77,12 @@
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
 #endif
 
+#ifdef STM32F446xx
+#define STM32_FLASH_SIZE 0x80000 // 512KiB
+#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 // 48KiB
+#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
+#endif
+
 /* Note this applies to STM32F769xG only, STM32F746xE has 512KB */
 #ifdef STM32F746xx
 #define STM32_FLASH_SIZE 0x100000 // 1MB

From 2bd2406d134ecd06042bc542f1eb54dba71636fd Mon Sep 17 00:00:00 2001
From: flom84 
Date: Mon, 26 Sep 2022 19:39:07 +0200
Subject: [PATCH 1029/2403] Update license info and remove redundant board
 functions.

---
 ports/stm/boards/nucleo_f446re/board.c            | 15 ++-------------
 .../stm/peripherals/stm32f4/stm32f446xx/clocks.h  |  2 +-
 ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c  |  2 +-
 .../stm/peripherals/stm32f4/stm32f446xx/periph.c  |  2 +-
 .../stm/peripherals/stm32f4/stm32f446xx/periph.h  |  2 +-
 ports/stm/peripherals/stm32f4/stm32f446xx/pins.c  |  2 +-
 ports/stm/peripherals/stm32f4/stm32f446xx/pins.h  |  2 +-
 7 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ports/stm/boards/nucleo_f446re/board.c b/ports/stm/boards/nucleo_f446re/board.c
index 31329a8d3b..b75dda3061 100644
--- a/ports/stm/boards/nucleo_f446re/board.c
+++ b/ports/stm/boards/nucleo_f446re/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h b/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
index fc724fc056..2cd4b59c75 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/clocks.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c b/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
index c31c785bf2..624eb319f4 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/gpio.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
index 666b2be2c2..5287a8bdf0 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
index 31ee9be4d4..d34be9d156 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/periph.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
index 23299cb6e8..17176ea72f 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h
index 629dda4623..c56412a258 100644
--- a/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h
+++ b/ports/stm/peripherals/stm32f4/stm32f446xx/pins.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * 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 e626502fd2a0d77b4a5147477c05e6104d271bbd Mon Sep 17 00:00:00 2001
From: flom84 
Date: Mon, 26 Sep 2022 19:45:33 +0200
Subject: [PATCH 1030/2403] Add USB VID and PID from STM.

---
 ports/stm/boards/nucleo_f446re/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.mk b/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
index 3730729c95..0887578166 100644
--- a/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x239A
-USB_PID = 0x809F
+USB_VID = 0x0483
+USB_PID = 0x572A
 USB_PRODUCT = "NUCLEO-F446RE - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
 

From 96a83ecbfe4752be13f40fae2b984e501adcb131 Mon Sep 17 00:00:00 2001
From: flom_84 <3575408+flom84@users.noreply.github.com>
Date: Mon, 26 Sep 2022 19:58:33 +0200
Subject: [PATCH 1031/2403] Update mpconfigboard.h

---
 ports/stm/boards/nucleo_f446re/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.h b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
index eb67015c4e..f0155f4624 100644
--- a/ports/stm/boards/nucleo_f446re/mpconfigboard.h
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 flom84 for Adafruit Industries
+ * Copyright (c) 2022 flom84
  *
  * 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 62aa7dfcdb955bffa6320b71e09a092afb3b70a9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 08:20:44 -0500
Subject: [PATCH 1032/2403] Revert "pin python version for doc building"

This reverts commit 645cb6c2a591c49b9473b6fd182e5acd51b11a68.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02985212f3..84224a1c1a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -220,7 +220,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v2
       with:
-        python-version: "3.10.6"
+        python-version: "3.x"
     - name: Install dependencies
       run: |
         sudo apt-get update

From da4f2db1df0c77b6bc93f5a847496922786191e2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 09:08:41 -0500
Subject: [PATCH 1033/2403] Add missing type annotations

These are treated as warnings by extract_pyi, so they don't stop
the build process.
---
 shared-bindings/hashlib/__init__.c  |  2 +-
 shared-bindings/usb/core/Device.c   | 12 ++++++------
 shared-bindings/usb/core/__init__.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/shared-bindings/hashlib/__init__.c b/shared-bindings/hashlib/__init__.c
index 4b5be0165b..d5efa21361 100644
--- a/shared-bindings/hashlib/__init__.c
+++ b/shared-bindings/hashlib/__init__.c
@@ -38,7 +38,7 @@
 //| |see_cpython_module| :mod:`cpython:hashlib`.
 //| """
 //|
-//| def new(name, data=b"") -> hashlib.Hash:
+//| def new(name: str, data: bytes=b"") -> hashlib.Hash:
 //|     """Returns a Hash object setup for the named algorithm. Raises ValueError when the named
 //|        algorithm is unsupported.
 //|
diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c
index 2ade459d5f..bf4df6b88b 100644
--- a/shared-bindings/usb/core/Device.c
+++ b/shared-bindings/usb/core/Device.c
@@ -130,7 +130,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_manufacturer_obj, usb_core_device_
 MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj,
     (mp_obj_t)&usb_core_device_get_manufacturer_obj);
 
-//|     def write(self, endpoint: int, data: ReadableBuffer, timeout = None) -> int:
+//|     def write(self, endpoint: int, data: ReadableBuffer, timeout:Optional[int] = None) -> int:
 //|         """Write data to a specific endpoint on the device.
 //|
 //|            :param int endpoint: the bEndpointAddress you want to communicate with.
@@ -159,7 +159,7 @@ STATIC mp_obj_t usb_core_device_write(size_t n_args, const mp_obj_t *pos_args, m
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_write_obj, 2, usb_core_device_write);
 
 
-//|     def read(self, endpoint: int, size_or_buffer: array.array, timeout = None) -> int:
+//|     def read(self, endpoint: int, size_or_buffer: array.array, timeout:Optional[int] = None) -> int:
 //|         """Read data from the endpoint.
 //|
 //|            :param int endpoint: the bEndpointAddress you want to communicate with.
@@ -186,8 +186,8 @@ STATIC mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_read_obj, 2, usb_core_device_read);
 
-//|     def ctrl_transfer(self, bmRequestType, bRequest, wValue=0, wIndex=0,
-//|                       data_or_wLength: Optional[array.array] = None, timeout = None) -> int:
+//|     def ctrl_transfer(self, bmRequestType:int, bRequest:int, wValue:int=0, wIndex:int=0,
+//|                       data_or_wLength: Optional[array.array] = None, timeout:Optional[int] = None) -> int:
 //|         """Do a control transfer on the endpoint 0. The parameters bmRequestType,
 //|            bRequest, wValue and wIndex are the same of the USB Standard Control
 //|            Request format.
@@ -254,7 +254,7 @@ STATIC mp_obj_t usb_core_device_is_kernel_driver_active(mp_obj_t self_in, mp_obj
 }
 MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_is_kernel_driver_active_obj, usb_core_device_is_kernel_driver_active);
 
-//|     def detach_kernel_driver(self, interface: int):
+//|     def detach_kernel_driver(self, interface: int) -> None:
 //|         """Stop CircuitPython from using the interface. If successful, you
 //|            will then be able to perform I/O. CircuitPython will automatically
 //|            re-start using the interface on reload.
@@ -271,7 +271,7 @@ STATIC mp_obj_t usb_core_device_detach_kernel_driver(mp_obj_t self_in, mp_obj_t
 }
 MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_detach_kernel_driver_obj, usb_core_device_detach_kernel_driver);
 
-//|     def attach_kernel_driver(self, interface: int):
+//|     def attach_kernel_driver(self, interface: int) -> None:
 //|         """Allow CircuitPython to use the interface if it wants to.
 //|
 //|            :param int interface: the device interface number to allow CircuitPython to use
diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c
index 0e0d409ede..a5de83f784 100644
--- a/shared-bindings/usb/core/__init__.c
+++ b/shared-bindings/usb/core/__init__.c
@@ -64,7 +64,7 @@ NORETURN void mp_raise_usb_core_USBTimeoutError(void) {
 }
 
 
-//| def find(find_all=False, *, idVendor=None, idProduct=None):
+//| def find(find_all:bool=False, *, idVendor:Optional[int]=None, idProduct:Optional[int]=None) -> Device:
 //|    """Find the first device that matches the given requirements or, if
 //|       find_all is True, return a generator of all matching devices.
 //|

From 0cd37376a09860976f55ef59e40d073f4f6a2593 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 27 Sep 2022 15:14:40 -0400
Subject: [PATCH 1034/2403] finish status bar internal simplification

---
 shared-module/supervisor/StatusBar.c | 15 +++++----
 shared-module/supervisor/StatusBar.h |  7 ++--
 shared-module/terminalio/Terminal.c  | 10 ------
 supervisor/serial.h                  |  4 +++
 supervisor/shared/serial.c           | 50 +++++++---------------------
 supervisor/shared/status_bar.c       | 42 ++++++++++++++++++-----
 6 files changed, 60 insertions(+), 68 deletions(-)

diff --git a/shared-module/supervisor/StatusBar.c b/shared-module/supervisor/StatusBar.c
index 0cc0552fcd..9b6fe9b849 100644
--- a/shared-module/supervisor/StatusBar.c
+++ b/shared-module/supervisor/StatusBar.c
@@ -45,7 +45,7 @@ void shared_module_supervisor_status_bar_set_console(supervisor_status_bar_obj_t
         return;
     }
 
-    if (self->written) {
+    if (self->updated) {
         // Clear before changing state. If disabling, will remain cleared.
         supervisor_status_bar_clear();
     }
@@ -67,7 +67,7 @@ void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t
         return;
     }
 
-    if (self->written) {
+    if (self->updated) {
         // Clear before changing state. If disabling, will remain cleared.
         terminalio_terminal_clear_status_bar(&supervisor_terminal);
     }
@@ -79,11 +79,12 @@ void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t
 }
 #endif
 
-bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *self) {
-    return self->update_in_progress;
+void shared_module_supervisor_status_bar_init(supervisor_status_bar_obj_t *self) {
+    self->console = true;
+    self->display = true;
+    self->updated = false;
 }
 
-void supervisor_status_bar_set_update_in_progress(supervisor_status_bar_obj_t *self, bool update_in_progress) {
-    self->written = true;
-    self->update_in_progress = update_in_progress;
+void shared_module_supervisor_status_bar_updated(supervisor_status_bar_obj_t *self) {
+    self->updated = true;
 }
diff --git a/shared-module/supervisor/StatusBar.h b/shared-module/supervisor/StatusBar.h
index bc80d7825f..a1254addc4 100644
--- a/shared-module/supervisor/StatusBar.h
+++ b/shared-module/supervisor/StatusBar.h
@@ -33,11 +33,10 @@ typedef struct {
     mp_obj_base_t base;
     bool console;
     bool display;
-    bool update_in_progress;
-    bool written;
+    bool updated;
 } supervisor_status_bar_obj_t;
 
-extern bool supervisor_status_bar_get_update_in_progress(supervisor_status_bar_obj_t *self);
-extern void supervisor_status_bar_set_update_in_progress(supervisor_status_bar_obj_t *self, bool in_progress);
+extern void shared_module_supervisor_status_bar_init(supervisor_status_bar_obj_t *self);
+extern void shared_module_supervisor_status_bar_updated(supervisor_status_bar_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_SUPERVISOR_STATUS_BAR_H
diff --git a/shared-module/terminalio/Terminal.c b/shared-module/terminalio/Terminal.c
index b49f48c4e6..a19768a622 100644
--- a/shared-module/terminalio/Terminal.c
+++ b/shared-module/terminalio/Terminal.c
@@ -66,13 +66,6 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
         return len;
     }
 
-    #if CIRCUITPY_STATUS_BAR
-    // Skip the status bar OSC sequence if it's disabled for the display.
-    const bool status_bar_write_ok =
-        shared_module_supervisor_status_bar_get_display(&shared_module_supervisor_status_bar_obj) ||
-        !supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj);
-    #endif
-
     const byte *i = data;
     uint16_t start_y = self->cursor_y;
     while (i < data + len) {
@@ -85,9 +78,6 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                 self->status_y = 0;
                 i += 1;
             } else if (
-                #if CIRCUITPY_STATUS_BAR
-                status_bar_write_ok &&
-                #endif
                 self->osc_command == 0 &&
                 self->status_bar != NULL &&
                 self->status_y < self->status_bar->height_in_tiles) {
diff --git a/supervisor/serial.h b/supervisor/serial.h
index 997a2bc38f..2e30998f3b 100644
--- a/supervisor/serial.h
+++ b/supervisor/serial.h
@@ -49,6 +49,10 @@ char serial_read(void);
 bool serial_bytes_available(void);
 bool serial_connected(void);
 
+// Used for temporarily suppressing output to the console or display.
+bool serial_console_write_disable(bool disabled);
+bool serial_display_write_disable(bool disabled);
+
 // These have no-op versions that are weak and the port can override. They work
 // in tandem with the cross-port mechanics like USB and BLE.
 void port_serial_early_init(void);
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 6a336c5826..0326f15437 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -41,11 +41,6 @@
 #include "supervisor/shared/bluetooth/serial.h"
 #endif
 
-#if CIRCUITPY_STATUS_BAR
-#include "shared-bindings/supervisor/__init__.h"
-#include "shared-bindings/supervisor/StatusBar.h"
-#endif
-
 #if CIRCUITPY_USB
 #include "tusb.h"
 #endif
@@ -72,10 +67,10 @@ bool tud_vendor_connected(void);
 #endif
 
 // Set to true to temporarily discard writes to the console only.
-static bool _console_write_disabled;
+static bool _serial_console_write_disabled;
 
 // Set to true to temporarily discard writes to the display terminal only.
-static bool _display_write_disabled;
+static bool _serial_display_write_disabled;
 
 #if CIRCUITPY_CONSOLE_UART
 STATIC void console_uart_print_strn(void *env, const char *str, size_t len) {
@@ -283,12 +278,6 @@ bool serial_bytes_available(void) {
     return false;
 }
 
-#if CIRCUITPY_STATUS_BAR
-// Detect when USB is down when the status bar write starts. If USB comes up in the middle of writing
-// the status bar, we want to the skip the rest so so junk doesn't get written out.
-static bool ignore_rest_of_status_bar_update = false;
-#endif
-
 void serial_write_substring(const char *text, uint32_t length) {
     if (length == 0) {
         return;
@@ -296,26 +285,14 @@ void serial_write_substring(const char *text, uint32_t length) {
 
     #if CIRCUITPY_TERMINALIO
     int errcode;
-    // If the status bar is disabled for the display, common_hal_terminalio_terminal_write() will not write it.
-    common_hal_terminalio_terminal_write(&supervisor_terminal, (const uint8_t *)text, length, &errcode);
+    if (!_serial_display_write_disabled) {
+        common_hal_terminalio_terminal_write(&supervisor_terminal, (const uint8_t *)text, length, &errcode);
+    }
     #endif
 
-    #if CIRCUITPY_STATUS_BAR
-    // If the status bar is disabled for the console, skip writing out the OSC sequence.
-    if (supervisor_status_bar_get_update_in_progress(&shared_module_supervisor_status_bar_obj)) {
-        if (!shared_module_supervisor_status_bar_get_console(&shared_module_supervisor_status_bar_obj)) {
-            // Console status bar disabled, so just return.
-            return;
-        }
-    } else {
-        // Status bar update is not in progress, so clear this history flag (will get cleared repeatedly).
-        ignore_rest_of_status_bar_update = false;
-    }
-
-    if (ignore_rest_of_status_bar_update) {
+    if (_serial_console_write_disabled) {
         return;
     }
-    #endif
 
     #if CIRCUITPY_USB_VENDOR
     if (tud_vendor_connected()) {
@@ -355,13 +332,6 @@ void serial_write_substring(const char *text, uint32_t length) {
             usb_background();
         }
     }
-    #if CIRCUITPY_STATUS_BAR
-    else {
-        // USB was not connected for the first part of the status bar update. Ignore the rest
-        // so we don't send the remaining part of the OSC sequence if USB comes up later.
-        ignore_rest_of_status_bar_update = true;
-    }
-    #endif
     #endif
 
     port_serial_write_substring(text, length);
@@ -371,10 +341,14 @@ void serial_write(const char *text) {
     serial_write_substring(text, strlen(text));
 }
 
-void serial_console_write_disable(bool disabled) {
+bool serial_console_write_disable(bool disabled) {
+    bool now = _serial_console_write_disabled;
     _serial_console_write_disabled = disabled;
+    return now;
 }
 
-void serial_display_write_disable(bool disabled) {
+bool serial_display_write_disable(bool disabled) {
+    bool now = _serial_display_write_disabled;
     _serial_display_write_disabled = disabled;
+    return now;
 }
diff --git a/supervisor/shared/status_bar.c b/supervisor/shared/status_bar.c
index 066a8d3d10..4f5fa06464 100644
--- a/supervisor/shared/status_bar.c
+++ b/supervisor/shared/status_bar.c
@@ -53,9 +53,7 @@ static bool _suspended = false;
 // Clear if possible, but give up if we can't do it now.
 void supervisor_status_bar_clear(void) {
     if (!_suspended) {
-        supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, true);
         serial_write("\x1b" "]0;" "\x1b" "\\");
-        supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, false);
     }
 }
 
@@ -66,9 +64,31 @@ void supervisor_status_bar_update(void) {
     }
     _forced_dirty = false;
 
-    supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, true);
+    shared_module_supervisor_status_bar_updated(&shared_module_supervisor_status_bar_obj);
 
-    // Neighboring "" "" are concatenated by the compiler. Without this separation, the hex code
+    // Disable status bar console writes if supervisor.status_bar.console is False.
+    // Also disable if there is no serial connection now. This avoids sending part
+    // of the status bar update if the serial connection comes up during the update.
+    bool disable_console_writes =
+        !shared_module_supervisor_status_bar_get_console(&shared_module_supervisor_status_bar_obj) ||
+        !serial_connected();
+
+    // Disable status bar display writes if supervisor.status_bar.display is False.
+    bool disable_display_writes =
+        !shared_module_supervisor_status_bar_get_display(&shared_module_supervisor_status_bar_obj);
+
+    // Suppress writes to console and/or display if status bar is not enabled for either or both.
+    bool prev_console_disable;
+    bool prev_display_disable;
+
+    if (disable_console_writes) {
+        prev_console_disable = serial_console_write_disable(true);
+    }
+    if (disable_display_writes) {
+        prev_display_disable = serial_display_write_disable(true);
+    }
+
+    // Neighboring "..." "..." are concatenated by the compiler. Without this separation, the hex code
     // doesn't get terminated after two following characters and the value is invalid.
     // This is the OSC command to set the title and the icon text. It can be up to 255 characters
     // but some may be cut off.
@@ -91,7 +111,14 @@ void supervisor_status_bar_update(void) {
     // Send string terminator
     serial_write("\x1b" "\\");
 
-    supervisor_status_bar_set_update_in_progress(&shared_module_supervisor_status_bar_obj, false);
+    // Restore writes to console and/or display.
+    if (disable_console_writes) {
+        serial_console_write_disable(prev_console_disable);
+    }
+    if (disable_display_writes) {
+        serial_display_write_disable(prev_display_disable);
+    }
+
 }
 
 static void status_bar_background(void *data) {
@@ -137,8 +164,5 @@ void supervisor_status_bar_init(void) {
     status_bar_background_cb.fun = status_bar_background;
     status_bar_background_cb.data = NULL;
 
-    shared_module_supervisor_status_bar_obj.console = true;
-    shared_module_supervisor_status_bar_obj.display = true;
-    shared_module_supervisor_status_bar_obj.update_in_progress = false;
-    shared_module_supervisor_status_bar_obj.written = false;
+    shared_module_supervisor_status_bar_init(&shared_module_supervisor_status_bar_obj);
 }

From 9c4c7241d074dd952af0660a03f090780624d8ed Mon Sep 17 00:00:00 2001
From: Kattni Rembor 
Date: Tue, 27 Sep 2022 15:24:07 -0400
Subject: [PATCH 1035/2403] Update pin order to match silk.

---
 .../boards/grandcentral_m4_express/pins.c       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
index b6ce037649..318fe58e2f 100644
--- a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
+++ b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
@@ -58,18 +58,19 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PB01) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB01) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_PB16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB16) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_PB17) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_PB16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PB17) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_PC22) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_PB17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PC22) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_PC23) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_PC22) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PC23) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PB12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_PC23) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_PB12) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PB13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PB12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_PB13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PB13) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PB20) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB20) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_PB21) },
@@ -77,10 +78,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_PD12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_PA15) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_PC17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PC17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_PC16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PC16) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_PA12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_DEN1), MP_ROM_PTR(&pin_PA12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_PA13) },
@@ -117,12 +120,14 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D13), MP_ROM_PTR(&pin_PC15) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_PC14) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D12), MP_ROM_PTR(&pin_PC14) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_PC11) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_PC10) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_PC06) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D47), MP_ROM_PTR(&pin_PC07) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D48), MP_ROM_PTR(&pin_PC04) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D49), MP_ROM_PTR(&pin_PC05) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D50), MP_ROM_PTR(&pin_PD11) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PD11) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D51), MP_ROM_PTR(&pin_PD08) },

From ea5e4b20b0d0457edf39cfdf4b7782256498b8dd Mon Sep 17 00:00:00 2001
From: Kattni Rembor 
Date: Tue, 27 Sep 2022 15:50:30 -0400
Subject: [PATCH 1036/2403] Add more spacing for aliased pins.

---
 .../boards/grandcentral_m4_express/pins.c     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
index 318fe58e2f..7641a9b630 100644
--- a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
+++ b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
@@ -60,19 +60,25 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TX3), MP_ROM_PTR(&pin_PB16) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PB17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_RX3), MP_ROM_PTR(&pin_PB17) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PC22) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_PC22) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PC23) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_PC23) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_PB12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PB12) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_PB13) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PB13) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PB20) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB20) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_PB21) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB21) },
 
@@ -81,43 +87,61 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_PC17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PC17) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_PC16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PC16) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_PA12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_DEN1), MP_ROM_PTR(&pin_PA12) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_PA13) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_DEN2), MP_ROM_PTR(&pin_PA13) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_PA14) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_CLK), MP_ROM_PTR(&pin_PA14) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_PB19) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_XCLK), MP_ROM_PTR(&pin_PB19) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_PA23) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D7), MP_ROM_PTR(&pin_PA23) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_PA22) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D6), MP_ROM_PTR(&pin_PA22) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_PA21) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D5), MP_ROM_PTR(&pin_PA21) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_PA20) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D4), MP_ROM_PTR(&pin_PA20) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_PA19) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D3), MP_ROM_PTR(&pin_PA19) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_PA18) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D2), MP_ROM_PTR(&pin_PA18) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_PA17) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D1), MP_ROM_PTR(&pin_PA17) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_PA16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D0), MP_ROM_PTR(&pin_PA16) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_PB15) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D9), MP_ROM_PTR(&pin_PB15) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_PB14) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D8), MP_ROM_PTR(&pin_PB14) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_PC13) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D11), MP_ROM_PTR(&pin_PC13) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_PC12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D10), MP_ROM_PTR(&pin_PC12) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_PC15) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D13), MP_ROM_PTR(&pin_PC15) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_PC14) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PCC_D12), MP_ROM_PTR(&pin_PC14) },
 
@@ -130,10 +154,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D50), MP_ROM_PTR(&pin_PD11) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PD11) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D51), MP_ROM_PTR(&pin_PD08) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PD08) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D52), MP_ROM_PTR(&pin_PD09) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PD09) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_D53), MP_ROM_PTR(&pin_PD10) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PD10) },
 

From c415c135170ff1be2d78ba09c7e69137a1665686 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 14:45:15 -0500
Subject: [PATCH 1037/2403] mend broken doc block

Since black_bindings.py will pass each contiguous
"//|"-block to black independently, they must each be a fully
formed Python item.
---
 shared-bindings/bitbangio/I2C.c        | 2 +-
 shared-bindings/busio/I2C.c            | 2 +-
 shared-bindings/frequencyio/__init__.c | 1 -
 shared-bindings/ps2io/__init__.c       | 2 --
 shared-bindings/pwmio/__init__.c       | 1 -
 shared-bindings/storage/__init__.c     | 3 +--
 shared-bindings/supervisor/__init__.c  | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index 9c0555dd5a..e89defd8e7 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -288,7 +288,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_wr
 //|         If ``in_start`` or ``in_end`` is provided, then the input buffer will be sliced
 //|         as if ``in_buffer[in_start:in_end]`` were passed,
 //|         The number of bytes read will be the length of ``out_buffer[in_start:in_end]``.
-
+//|
 //|         :param int address: 7-bit device address
 //|         :param ~circuitpython_typing.ReadableBuffer out_buffer: buffer containing the bytes to write
 //|         :param ~circuitpython_typing.WriteableBuffer in_buffer: buffer to write into
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index b3afd9801d..354e1b4a82 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -289,7 +289,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto);
 //|         If ``in_start`` or ``in_end`` is provided, then the input buffer will be sliced
 //|         as if ``in_buffer[in_start:in_end]`` were passed,
 //|         The number of bytes read will be the length of ``out_buffer[in_start:in_end]``.
-
+//|
 //|         :param int address: 7-bit device address
 //|         :param ~circuitpython_typing.ReadableBuffer out_buffer: buffer containing the bytes to write
 //|         :param ~circuitpython_typing.WriteableBuffer in_buffer: buffer to write into
diff --git a/shared-bindings/frequencyio/__init__.c b/shared-bindings/frequencyio/__init__.c
index ffbb7af771..6ddac9cc83 100644
--- a/shared-bindings/frequencyio/__init__.c
+++ b/shared-bindings/frequencyio/__init__.c
@@ -38,7 +38,6 @@
 //| .. warning:: This module is not available in SAMD21 builds. See the
 //|   :ref:`module-support-matrix` for more info.
 //|
-
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/ps2io/__init__.c b/shared-bindings/ps2io/__init__.c
index 517816dbcf..d0c438aebc 100644
--- a/shared-bindings/ps2io/__init__.c
+++ b/shared-bindings/ps2io/__init__.c
@@ -37,11 +37,9 @@
 //|
 //| The `ps2io` module contains classes to provide PS/2 communication.
 //|
-
 //| .. warning:: This module is not available in some SAMD21 builds. See the
 //|   :ref:`module-support-matrix` for more info.
 //|
-
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/pwmio/__init__.c b/shared-bindings/pwmio/__init__.c
index 90aff45819..d56eb1eae8 100644
--- a/shared-bindings/pwmio/__init__.c
+++ b/shared-bindings/pwmio/__init__.c
@@ -37,7 +37,6 @@
 //|
 //| The `pwmio` module contains classes to provide access to basic pulse IO.
 //|
-
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index baf91a35c1..b820eea34c 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -41,13 +41,12 @@
 //| unmounting which is typically handled by the operating system hosting Python.
 //| CircuitPython does not have an OS, so this module provides this functionality
 //| directly.
-
+//|
 //| For more information regarding using the `storage` module, refer to the `CircuitPython
 //| Essentials Learn guide
 //| `_.
 //| """
 //|
-
 //| def mount(filesystem: VfsFat, mount_path: str, *, readonly: bool = False) -> None:
 //|     """Mounts the given filesystem object at the given path.
 //|
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 40f8461af4..8f6a62153d 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -309,7 +309,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin
 //|     characters. Any omitted arguments will be left at their default values.
 //|
 //|     This method must be called in boot.py to have any effect.
-
+//|
 //|     Not available on boards without native USB support.
 //|     """
 //|     ...

From 4e96667d50c0c40402d6186a66121b85cabea90f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 12:31:26 -0500
Subject: [PATCH 1038/2403] Manual fix for oddball cases

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 3 +--
 shared-bindings/_eve/__init__.c                  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 97668bf303..6570ab8694 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -313,9 +313,8 @@ STATIC void check_for_deinit(rp2pio_statemachine_obj_t *self) {
 
 //|     def restart(self) -> None:
 //|         """Resets this state machine, runs any init and enables the clock."""
-// TODO: "and any others given. They must share an underlying PIO. An exception will be raised otherwise.""
 //|         ...
-//|
+// TODO: "and any others given. They must share an underlying PIO. An exception will be raised otherwise.""
 STATIC mp_obj_t rp2pio_statemachine_restart(mp_obj_t self_obj) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj);
     check_for_deinit(self);
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index 13e51cb882..3ba97c152d 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -40,10 +40,10 @@
 //| contains methods for constructing EVE command
 //| buffers and appending basic graphics commands."""
 //|
-
 //| class _EVE:
+//|     def __init__(self) -> None:
+//|         """Create an _EVE object"""
 //|
-
 typedef struct _mp_obj__EVE_t {
     mp_obj_base_t base;
     common_hal__eve_t _eve;

From 6a20aef38246e6440b9ae76889dd3fa99826b4c8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 11:09:49 -0500
Subject: [PATCH 1039/2403] new script to blacken docstrings in bindings

---
 tools/black_bindings.py | 69 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100755 tools/black_bindings.py

diff --git a/tools/black_bindings.py b/tools/black_bindings.py
new file mode 100755
index 0000000000..c1e6b3b271
--- /dev/null
+++ b/tools/black_bindings.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+from concurrent.futures import ThreadPoolExecutor
+import os
+import re
+import subprocess
+import sys
+
+
+def transform(fn, s):
+    lines = s.rstrip().split("\n")
+    lines = [line.removeprefix("//| ").removeprefix("//|") for line in lines]
+    while lines and not lines[0]:
+        del lines[0]
+
+    s = "\n".join(lines) + "\n"
+    if s[0] == " ":
+        prefix = "if 0:\n"
+    else:
+        prefix = ""
+    s = prefix + s
+    try:
+        # Line length is 95 so that with "//| " the max is 99
+        result = subprocess.run(
+            ["black", "--pyi", "-l95", "-q", "-"],
+            input=s,
+            check=True,
+            stdout=subprocess.PIPE,
+            encoding="utf-8",
+        )
+    except subprocess.CalledProcessError as e:
+        print(f"{fn}:0: Failed to process block:\n{s}")
+        raise
+
+    result = result.stdout[len(prefix) :].strip("\n")
+    result = (result.rstrip()).split("\n")
+    return "\n".join("//| " + line if line else "//|" for line in result) + "\n"
+
+
+def process_one_file(fn):
+    with open(fn, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    old_end = 0
+
+    parts = []
+    for m in re.finditer("(?m)((?:^//\|.*\n)(?:^//\|.*\n)*)", content):
+        parts.append(content[old_end : m.start()])
+        parts.append(transform(fn, m.group()))
+        old_end = m.end()
+    parts.append(content[old_end:])
+    newcontent = "".join(parts)
+
+    if newcontent != content:
+        with open(fn, "w", encoding="utf-8") as f:
+            f.write(newcontent)
+
+
+if __name__ == "__main__":
+    # Use a thread pool because most processing is inside black!
+    executor = ThreadPoolExecutor(max_workers=os.cpu_count())
+    futures = [executor.submit(process_one_file, fn) for fn in sys.argv[1:]]
+    status = 0
+    for f in futures:
+        try:
+            f.result()
+        except Exception as e:
+            status = 1
+    executor.shutdown()
+    raise SystemExit(status)

From b2cc8d2aadb0b45e64c7a423016680f5c782aafa Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 15:21:42 -0500
Subject: [PATCH 1040/2403] run black_bindings across all bindings

---
 ports/atmel-samd/bindings/samd/Clock.c        |   9 +-
 ports/atmel-samd/bindings/samd/__init__.c     |   1 -
 .../broadcom/bindings/videocore/Framebuffer.c |   4 -
 ports/broadcom/bindings/videocore/__init__.c  |   1 -
 .../espressif/bindings/esp32_camera/Camera.c  |  49 +---
 .../bindings/esp32_camera/__init__.c          |   4 -
 ports/espressif/bindings/espidf/__init__.c    |   6 +-
 .../bindings/rp2pio/StateMachine.c            | 135 ++++++-----
 ports/raspberrypi/bindings/rp2pio/__init__.c  |   2 -
 shared-bindings/_bleio/Adapter.c              |  48 ++--
 shared-bindings/_bleio/Address.c              |   7 -
 shared-bindings/_bleio/Attribute.c            |   2 -
 shared-bindings/_bleio/Characteristic.c       |  30 ++-
 shared-bindings/_bleio/CharacteristicBuffer.c |  11 +-
 shared-bindings/_bleio/Connection.c           |  13 +-
 shared-bindings/_bleio/Descriptor.c           |  17 +-
 shared-bindings/_bleio/PacketBuffer.c         |  13 +-
 shared-bindings/_bleio/ScanEntry.c            |   8 -
 shared-bindings/_bleio/ScanResults.c          |   4 -
 shared-bindings/_bleio/Service.c              |   5 -
 shared-bindings/_bleio/UUID.c                 |   6 -
 shared-bindings/_bleio/__init__.c             |   8 +-
 shared-bindings/_eve/__init__.c               |  58 +----
 shared-bindings/_pew/PewPew.c                 |   1 -
 shared-bindings/_pew/__init__.c               |   1 -
 shared-bindings/_stage/Layer.c                |  12 +-
 shared-bindings/_stage/Text.c                 |  11 +-
 shared-bindings/_stage/__init__.c             |  13 +-
 .../adafruit_bus_device/__init__.c            |   1 -
 .../i2c_device/I2CDevice.c                    |  23 +-
 .../spi_device/SPIDevice.c                    |  14 +-
 shared-bindings/adafruit_pixelbuf/PixelBuf.c  |  44 ++--
 shared-bindings/aesio/aes.c                   |  51 +++--
 shared-bindings/alarm/SleepMemory.c           |   5 -
 shared-bindings/alarm/__init__.c              |  12 +-
 shared-bindings/alarm/pin/PinAlarm.c          |   7 +-
 shared-bindings/alarm/time/TimeAlarm.c        |   6 +-
 shared-bindings/alarm/touch/TouchAlarm.c      |   2 -
 shared-bindings/analogbufio/BufferedIn.c      |  10 +-
 shared-bindings/analogbufio/__init__.c        |   1 -
 shared-bindings/analogio/AnalogIn.c           |   7 -
 shared-bindings/analogio/AnalogOut.c          |   5 -
 shared-bindings/analogio/__init__.c           |   1 -
 shared-bindings/atexit/__init__.c             |  25 +-
 shared-bindings/audiobusio/I2SOut.c           |  19 +-
 shared-bindings/audiobusio/PDMIn.c            |  57 ++---
 shared-bindings/audiobusio/__init__.c         |   1 -
 shared-bindings/audiocore/RawSample.c         |   9 +-
 shared-bindings/audiocore/WaveFile.c          |   6 -
 shared-bindings/audiocore/__init__.c          |   1 -
 shared-bindings/audioio/AudioOut.c            |  18 +-
 shared-bindings/audioio/__init__.c            |   1 -
 shared-bindings/audiomixer/Mixer.c            |  22 +-
 shared-bindings/audiomixer/MixerVoice.c       |   5 -
 shared-bindings/audiomixer/__init__.c         |   1 -
 shared-bindings/audiomp3/MP3Decoder.c         |  11 -
 shared-bindings/audiomp3/__init__.c           |   1 -
 shared-bindings/audiopwmio/PWMAudioOut.c      |  17 +-
 shared-bindings/audiopwmio/__init__.c         |   1 -
 shared-bindings/bitbangio/I2C.c               |  39 ++--
 shared-bindings/bitbangio/SPI.c               |  41 ++--
 shared-bindings/bitbangio/__init__.c          |   1 -
 shared-bindings/bitmaptools/__init__.c        | 214 ++++++++++--------
 shared-bindings/bitops/__init__.c             |   8 +-
 shared-bindings/board/__init__.c              |   3 -
 shared-bindings/busio/I2C.c                   |  39 ++--
 shared-bindings/busio/SPI.c                   |  43 ++--
 shared-bindings/busio/UART.c                  |  33 ++-
 shared-bindings/busio/__init__.c              |   1 -
 shared-bindings/camera/Camera.c               |   4 -
 shared-bindings/camera/ImageFormat.c          |   2 -
 shared-bindings/camera/__init__.c             |   1 -
 shared-bindings/canio/CAN.c                   |  43 ++--
 shared-bindings/canio/Listener.c              |  20 +-
 shared-bindings/canio/Match.c                 |   6 -
 shared-bindings/canio/Message.c               |   4 -
 .../canio/RemoteTransmissionRequest.c         |   4 -
 shared-bindings/canio/__init__.c              |   2 -
 shared-bindings/countio/Counter.c             |  19 +-
 shared-bindings/countio/Edge.c                |   2 -
 shared-bindings/countio/__init__.c            |   1 -
 shared-bindings/digitalio/DigitalInOut.c      |  14 +-
 shared-bindings/digitalio/Direction.c         |   2 -
 shared-bindings/digitalio/DriveMode.c         |   2 -
 shared-bindings/digitalio/Pull.c              |   2 -
 shared-bindings/displayio/Bitmap.c            |  42 ++--
 shared-bindings/displayio/ColorConverter.c    |   9 +-
 shared-bindings/displayio/Colorspace.c        |   1 -
 shared-bindings/displayio/Display.c           |  53 +++--
 shared-bindings/displayio/EPaperDisplay.c     |  60 ++---
 shared-bindings/displayio/FourWire.c          |  19 +-
 shared-bindings/displayio/Group.c             |  54 +++--
 shared-bindings/displayio/I2CDisplay.c        |  11 +-
 shared-bindings/displayio/OnDiskBitmap.c      |   6 +-
 shared-bindings/displayio/Palette.c           |  21 +-
 shared-bindings/displayio/Shape.c             |   6 +-
 shared-bindings/displayio/TileGrid.c          |  34 ++-
 shared-bindings/displayio/__init__.c          |   2 -
 shared-bindings/dotenv/__init__.c             |  10 +-
 shared-bindings/dualbank/__init__.c           |   5 +-
 shared-bindings/floppyio/__init__.c           |  11 +-
 shared-bindings/fontio/BuiltinFont.c          |   9 +-
 shared-bindings/fontio/Glyph.c                |  21 +-
 shared-bindings/fontio/__init__.c             |   1 -
 .../framebufferio/FramebufferDisplay.c        |  25 +-
 shared-bindings/framebufferio/__init__.c      |   1 -
 shared-bindings/frequencyio/FrequencyIn.c     |   9 -
 shared-bindings/frequencyio/__init__.c        |   1 -
 shared-bindings/getpass/__init__.c            |   4 +-
 shared-bindings/gifio/GifWriter.c             |  13 +-
 shared-bindings/gifio/__init__.c              |   1 -
 shared-bindings/gnss/GNSS.c                   |   9 -
 shared-bindings/gnss/PositionFix.c            |   2 -
 shared-bindings/gnss/SatelliteSystem.c        |   2 -
 shared-bindings/gnss/__init__.c               |   1 -
 shared-bindings/hashlib/Hash.c                |   6 +-
 shared-bindings/hashlib/__init__.c            |   3 +-
 shared-bindings/i2ctarget/I2CTarget.c         |  27 +--
 shared-bindings/i2ctarget/__init__.c          |   1 -
 .../imagecapture/ParallelImageCapture.c       |  12 +-
 shared-bindings/ipaddress/IPv4Address.c       |   8 +-
 shared-bindings/ipaddress/__init__.c          |   2 -
 shared-bindings/is31fl3741/FrameBuffer.c      |  19 +-
 shared-bindings/is31fl3741/IS31FL3741.c       |   6 -
 shared-bindings/keypad/Event.c                |  12 +-
 shared-bindings/keypad/EventQueue.c           |  10 +-
 shared-bindings/keypad/KeyMatrix.c            |  17 +-
 shared-bindings/keypad/Keys.c                 |  16 +-
 shared-bindings/keypad/ShiftRegisterKeys.c    |  19 +-
 shared-bindings/keypad/__init__.c             |   1 -
 shared-bindings/math/__init__.c               |  16 --
 shared-bindings/mdns/RemoteService.c          |   9 -
 shared-bindings/mdns/Server.c                 |  16 +-
 shared-bindings/mdns/__init__.c               |   1 -
 .../memorymonitor/AllocationAlarm.c           |  17 +-
 .../memorymonitor/AllocationSize.c            |   7 -
 shared-bindings/memorymonitor/__init__.c      |   2 +-
 shared-bindings/microcontroller/Pin.c         |   2 -
 shared-bindings/microcontroller/Processor.c   |   7 -
 shared-bindings/microcontroller/ResetReason.c |   1 -
 shared-bindings/microcontroller/RunMode.c     |   2 -
 shared-bindings/microcontroller/__init__.c    |  10 -
 shared-bindings/msgpack/ExtType.c             |   4 +-
 shared-bindings/msgpack/__init__.c            |  17 +-
 shared-bindings/multiterminal/__init__.c      |   5 -
 shared-bindings/nvm/ByteArray.c               |   9 +-
 shared-bindings/nvm/__init__.c                |   1 -
 shared-bindings/onewireio/OneWire.c           |  27 +--
 shared-bindings/onewireio/__init__.c          |   1 -
 shared-bindings/os/__init__.c                 |  17 +-
 shared-bindings/paralleldisplay/ParallelBus.c |  15 +-
 shared-bindings/ps2io/Ps2.c                   |   9 -
 shared-bindings/ps2io/__init__.c              |   1 -
 shared-bindings/pulseio/PulseIn.c             |  21 +-
 shared-bindings/pulseio/PulseOut.c            |  13 +-
 shared-bindings/pulseio/__init__.c            |   1 -
 shared-bindings/pwmio/PWMOut.c                |  15 +-
 shared-bindings/pwmio/__init__.c              |   1 -
 shared-bindings/qrio/PixelPolicy.c            |   1 -
 shared-bindings/qrio/QRDecoder.c              |   8 +-
 shared-bindings/qrio/__init__.c               |   1 -
 shared-bindings/rainbowio/__init__.c          |   1 -
 shared-bindings/random/__init__.c             |   9 +-
 shared-bindings/rgbmatrix/RGBMatrix.c         |  32 +--
 shared-bindings/rgbmatrix/__init__.c          |   1 -
 shared-bindings/rotaryio/IncrementalEncoder.c |  10 +-
 shared-bindings/rotaryio/__init__.c           |   1 -
 shared-bindings/rtc/RTC.c                     |   3 -
 shared-bindings/rtc/__init__.c                |   2 -
 shared-bindings/sdcardio/SDCard.c             |   8 +-
 shared-bindings/sdioio/SDCard.c               |  18 +-
 shared-bindings/sharpdisplay/__init__.c       |   1 -
 shared-bindings/socketpool/Socket.c           |  21 +-
 shared-bindings/socketpool/SocketPool.c       |  12 +-
 shared-bindings/socketpool/__init__.c         |   1 -
 shared-bindings/ssl/SSLContext.c              |  21 +-
 shared-bindings/ssl/SSLSocket.c               |  19 +-
 shared-bindings/ssl/__init__.c                |   2 -
 shared-bindings/storage/__init__.c            |  40 ++--
 shared-bindings/struct/__init__.c             |   6 -
 shared-bindings/supervisor/RunReason.c        |   1 -
 shared-bindings/supervisor/Runtime.c          |   7 -
 shared-bindings/supervisor/StatusBar.c        |   4 -
 shared-bindings/supervisor/__init__.c         |  34 +--
 shared-bindings/synthio/MidiTrack.c           |   9 +-
 shared-bindings/synthio/__init__.c            |   1 -
 shared-bindings/terminalio/Terminal.c         |  34 +--
 shared-bindings/terminalio/__init__.c         |   1 -
 shared-bindings/time/__init__.c               |   7 -
 shared-bindings/touchio/TouchIn.c             |   8 -
 shared-bindings/touchio/__init__.c            |   1 -
 shared-bindings/traceback/__init__.c          |  22 +-
 shared-bindings/uheap/__init__.c              |   2 -
 shared-bindings/usb/__init__.c                |   1 -
 shared-bindings/usb/core/Device.c             |  87 ++++---
 shared-bindings/usb/core/__init__.c           |  17 +-
 shared-bindings/usb_cdc/Serial.c              |  14 --
 shared-bindings/usb_cdc/__init__.c            |   2 -
 shared-bindings/usb_hid/Device.c              |  17 +-
 shared-bindings/usb_hid/__init__.c            |   5 -
 shared-bindings/usb_host/Port.c               |  12 +-
 shared-bindings/usb_host/__init__.c           |   1 -
 shared-bindings/usb_midi/PortIn.c             |   3 -
 shared-bindings/usb_midi/PortOut.c            |   2 -
 shared-bindings/usb_midi/__init__.c           |   3 -
 shared-bindings/ustack/__init__.c             |   4 -
 shared-bindings/vectorio/Circle.c             |  35 +--
 shared-bindings/vectorio/Polygon.c            |  22 +-
 shared-bindings/vectorio/Rectangle.c          |  40 ++--
 shared-bindings/vectorio/__init__.c           |   1 -
 shared-bindings/watchdog/WatchDogMode.c       |   2 -
 shared-bindings/watchdog/WatchDogTimer.c      |  12 +-
 shared-bindings/wifi/AuthMode.c               |   1 -
 shared-bindings/wifi/Monitor.c                |   8 -
 shared-bindings/wifi/Network.c                |  12 +-
 shared-bindings/wifi/Packet.c                 |   1 -
 shared-bindings/wifi/Radio.c                  | 114 +++++-----
 shared-bindings/wifi/ScannedNetworks.c        |   6 +-
 shared-bindings/wifi/__init__.c               |   1 -
 shared-bindings/zlib/__init__.c               |   6 +-
 220 files changed, 1282 insertions(+), 1758 deletions(-)

diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c
index 7c405d464d..354f0e0630 100644
--- a/ports/atmel-samd/bindings/samd/Clock.c
+++ b/ports/atmel-samd/bindings/samd/Clock.c
@@ -33,9 +33,8 @@
 //| class Clock:
 //|     """Identifies a clock on the microcontroller.
 //|
-//|        They are fixed by the hardware so they cannot be constructed on demand. Instead, use
-//|        ``samd.clock`` to reference the desired clock."""
-//|
+//|     They are fixed by the hardware so they cannot be constructed on demand. Instead, use
+//|     ``samd.clock`` to reference the desired clock."""
 
 STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -45,7 +44,6 @@ STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print
 
 //|     enabled: bool
 //|     """Is the clock enabled? (read-only)"""
-//|
 STATIC mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(clock_get_enabled(self->type, self->index));
@@ -58,7 +56,6 @@ MP_PROPERTY_GETTER(samd_clock_enabled_obj,
 
 //|     parent: Union[Clock, None]
 //|     """Clock parent. (read-only)"""
-//|
 STATIC mp_obj_t samd_clock_get_parent(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint8_t p_type, p_index;
@@ -83,7 +80,6 @@ MP_PROPERTY_GETTER(samd_clock_parent_obj,
 
 //|     frequency: int
 //|     """Clock frequency in Herz. (read-only)"""
-//|
 STATIC mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int_from_uint(clock_get_frequency(self->type, self->index));
@@ -96,7 +92,6 @@ MP_PROPERTY_GETTER(samd_clock_frequency_obj,
 
 //|     calibration: int
 //|     """Clock calibration. Not all clocks can be calibrated."""
-//|
 STATIC mp_obj_t samd_clock_get_calibration(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int_from_uint(clock_get_calibration(self->type, self->index));
diff --git a/ports/atmel-samd/bindings/samd/__init__.c b/ports/atmel-samd/bindings/samd/__init__.c
index b5c618108d..29d12357d1 100644
--- a/ports/atmel-samd/bindings/samd/__init__.c
+++ b/ports/atmel-samd/bindings/samd/__init__.c
@@ -40,7 +40,6 @@
 //|   :platform: SAMD21
 //|
 //| References to clocks as named by the microcontroller"""
-//|
 const mp_obj_module_t samd_clock_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&samd_clock_globals,
diff --git a/ports/broadcom/bindings/videocore/Framebuffer.c b/ports/broadcom/bindings/videocore/Framebuffer.c
index 4be55ee291..d03be1fa57 100644
--- a/ports/broadcom/bindings/videocore/Framebuffer.c
+++ b/ports/broadcom/bindings/videocore/Framebuffer.c
@@ -46,7 +46,6 @@
 //|
 //|         A Framebuffer is often used in conjunction with a
 //|         `framebufferio.FramebufferDisplay`."""
-//|
 
 STATIC mp_obj_t videocore_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_width, ARG_height, };
@@ -72,7 +71,6 @@ STATIC mp_obj_t videocore_framebuffer_make_new(const mp_obj_type_t *type, size_t
 //|         rgbmatrix instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
-//|
 STATIC mp_obj_t videocore_framebuffer_deinit(mp_obj_t self_in) {
     videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in;
     common_hal_videocore_framebuffer_deinit(self);
@@ -89,7 +87,6 @@ static void check_for_deinit(videocore_framebuffer_obj_t *self) {
 
 //|     width: int
 //|     """The width of the display, in pixels"""
-//|
 STATIC mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) {
     videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in;
     check_for_deinit(self);
@@ -101,7 +98,6 @@ MP_PROPERTY_GETTER(videocore_framebuffer_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
-//|
 STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) {
     videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/ports/broadcom/bindings/videocore/__init__.c b/ports/broadcom/bindings/videocore/__init__.c
index 94a483adb5..9ec345dae7 100644
--- a/ports/broadcom/bindings/videocore/__init__.c
+++ b/ports/broadcom/bindings/videocore/__init__.c
@@ -32,7 +32,6 @@
 #include "bindings/videocore/Framebuffer.h"
 
 //| """Low-level routines for interacting with the Broadcom VideoCore GPU"""
-//|
 
 STATIC const mp_rom_map_elem_t videocore_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_videocore) },
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 1186afc90f..c34fa7ae66 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -54,9 +54,9 @@
 //|         external_clock_frequency: int,
 //|         powerdown_pin: Optional[microcontroller.Pin] = None,
 //|         reset_pin: Optional[microcontroller.Pin] = None,
-//|         pixel_format: PixelFormat=PixelFormat.RGB565,
-//|         frame_size: FrameSize=FrameSize.QQVGA,
-//|         jpeg_quality: int=15,
+//|         pixel_format: PixelFormat = PixelFormat.RGB565,
+//|         frame_size: FrameSize = FrameSize.QQVGA,
+//|         jpeg_quality: int = 15,
 //|         framebuffer_count: int = 1,
 //|         grab_mode: GrabMode = GrabMode.WHEN_EMPTY,
 //|     ) -> None:
@@ -93,7 +93,6 @@
 //|         :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered)
 //|         :param grab_mode: When to grab a new frame
 //|         """
-//|
 STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -161,7 +160,6 @@ STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n
 //|     def deinit(self) -> None:
 //|         """Deinitialises the camera and releases all memory resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t esp32_camera_camera_deinit(mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_esp32_camera_camera_deinit(self);
@@ -178,14 +176,12 @@ STATIC void check_for_deinit(esp32_camera_camera_obj_t *self) {
 //|     def __enter__(self) -> Camera:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t esp32_camera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     return esp32_camera_camera_deinit(args[0]);
@@ -205,14 +201,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, es
 MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
     (mp_obj_t)&esp32_camera_camera_frame_available_get_obj);
 
-//|     def take(self, timeout: Optional[float]=0.25) -> Optional[displayio.Bitmap | ReadableBuffer]:
+//|     def take(
+//|         self, timeout: Optional[float] = 0.25
+//|     ) -> Optional[displayio.Bitmap | ReadableBuffer]:
 //|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
 //|
 //|         In the case of timeout, `None` is returned.
 //|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a read-only `memoryview`.
 //|         Otherwise, the returned value is a read-only `displayio.Bitmap`.
 //|         """
-//|
 STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]);
@@ -249,7 +246,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, e
 //|         the other properties to set, they are set together in a single function call.
 //|
 //|         If an argument is unspecified or None, then the setting is unchanged."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -318,7 +314,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_frame_size_obj,
 
 //|     contrast: int
 //|     """The sensor contrast.  Positive values increase contrast, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_contrast(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -340,7 +335,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_contrast_obj,
 
 //|     brightness: int
 //|     """The sensor brightness.  Positive values increase brightness, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_brightness(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -362,7 +356,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_brightness_obj,
 
 //|     saturation: int
 //|     """The sensor saturation.  Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_saturation(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -384,7 +377,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_saturation_obj,
 
 //|     sharpness: int
 //|     """The sensor sharpness.  Positive values increase sharpness (more defined edges), negative values lower it (softer edges).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_sharpness(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -406,7 +398,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_sharpness_obj,
 
 //|     denoise: int
 //|     """The sensor 'denoise' setting.  Any camera sensor has inherent 'noise', especially in low brightness environments. Software algorithms can decrease noise at the expense of fine detail.  A larger value increases the amount of software noise removal.  The total range is device-specific but the value is often from 0 to 10."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_denoise(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -428,7 +419,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_denoise_obj,
 
 //|     gain_ceiling: GainCeiling
 //|     """The sensor 'gain ceiling' setting. "Gain" is an analog multiplier applied to the raw sensor data.  The 'ceiling' is the maximum gain value that the sensor will use. A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_gain_ceiling(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -450,7 +440,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_gain_ceiling_obj,
 
 //|     quality: int
 //|     """The 'quality' setting when capturing JPEG images.  This is similar to the quality setting when exporting a jpeg image from photo editing software.  Typical values range from 5 to 40, with higher numbers leading to larger image sizes and better overall image quality. However, when the quality is set to a high number, the total size of the JPEG data can exceed the size of an internal buffer, causing image capture to fail."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_quality(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -472,7 +461,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_quality_obj,
 
 //|     colorbar: bool
 //|     """When `True`, a test pattern image is captured and the real sensor data is not used."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_colorbar(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -494,7 +482,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_colorbar_obj,
 
 //|     whitebal: bool
 //|     """When `True`, the camera attempts to automatically control white balance.  When `False`, the `wb_mode` setting is used instead."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_whitebal(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -516,7 +503,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_whitebal_obj,
 
 //|     gain_ctrl: bool
 //|     """When `True`, the camera attempts to automatically control the sensor gain, up to the value in the `gain_ceiling` property.  When `False`, the `agc_gain` setting is used instead."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_gain_ctrl(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -538,7 +524,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_gain_ctrl_obj,
 
 //|     exposure_ctrl: bool
 //|     """When `True` the camera attempts to automatically control the exposure. When `False`, the `aec_value` setting is used instead."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_exposure_ctrl(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -560,7 +545,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_exposure_ctrl_obj,
 
 //|     hmirror: bool
 //|     """When `True` the camera image is mirrored left-to-right"""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_hmirror(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -582,7 +566,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_hmirror_obj,
 
 //|     vflip: bool
 //|     """When `True` the camera image is flipped top-to-bottom"""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_vflip(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -604,7 +587,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_vflip_obj,
 
 //|     aec2: bool
 //|     """When `True` the sensor's "night mode" is enabled, extending the range of automatic gain control."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_aec2(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -626,7 +608,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_aec2_obj,
 
 //|     awb_gain: bool
 //|     """Access the awb_gain property of the camera sensor"""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_awb_gain(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -648,7 +629,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_awb_gain_obj,
 
 //|     agc_gain: int
 //|     """Access the gain level of the sensor. Higher values produce brighter images.  Typical settings range from 0 to 30. """
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_agc_gain(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -670,7 +650,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_agc_gain_obj,
 
 //|     aec_value: int
 //|     """Access the exposure value of the camera.  Higher values produce brighter images.  Typical settings range from 0 to 1200."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_aec_value(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -692,7 +671,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_aec_value_obj,
 
 //|     special_effect: int
 //|     """Enable a "special effect". Zero is no special effect.  On OV5640, special effects range from 0 to 6 inclusive and select various color modes."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_special_effect(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -714,7 +692,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_special_effect_obj,
 
 //|     wb_mode: int
 //|     """The white balance mode.  0 is automatic white balance.  Typical values range from 0 to 4 inclusive."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_wb_mode(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -736,7 +713,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_wb_mode_obj,
 
 //|     ae_level: int
 //|     """The exposure offset for automatic exposure.  Typical values range from -2 to +2."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_ae_level(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -758,7 +734,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_ae_level_obj,
 
 //|     dcw: bool
 //|     """When `True` an advanced white balance mode is selected."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_dcw(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -780,7 +755,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_dcw_obj,
 
 //|     bpc: bool
 //|     """When `True`, "black point compensation" is enabled. This can make black parts of the image darker."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_bpc(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -802,7 +776,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_bpc_obj,
 
 //|     wpc: bool
 //|     """When `True`, "white point compensation" is enabled.  This can make white parts of the image whiter."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_wpc(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -824,7 +797,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_wpc_obj,
 
 //|     raw_gma: bool
 //|     """When `True`, raw gamma mode is enabled."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_raw_gma(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -846,7 +818,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_raw_gma_obj,
 
 //|     lenc: bool
 //|     """Enable "lens correction". This can help compensate for light fall-off at the edge of the sensor area."""
-//|
 
 STATIC mp_obj_t esp32_camera_camera_get_lenc(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -868,7 +839,6 @@ MP_PROPERTY_GETSET(esp32_camera_camera_lenc_obj,
 
 //|     max_frame_size: FrameSize
 //|     """The maximum frame size that can be captured"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_max_frame_size(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -882,7 +852,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_max_frame_size_obj,
 
 //|     address: int
 //|     """The I2C (SCCB) address of the sensor"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_address(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -896,7 +865,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_address_obj,
 
 //|     sensor_name: str
 //|     """The name of the sensor"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_sensor_name(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -911,7 +879,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_sensor_name_obj,
 
 //|     supports_jpeg: bool
 //|     """True if the sensor can capture images in JPEG format"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_supports_jpeg(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -924,7 +891,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_supports_jpeg_obj,
 
 //|     height: int
 //|     """The height of the image being captured"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_height(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -937,7 +903,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_height_obj,
 
 //|     width: int
 //|     """The width of the image being captured"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_width(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -950,7 +915,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_width_obj,
 
 //|     grab_mode: GrabMode
 //|     """The grab mode of the camera"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_grab_mode(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -964,7 +928,6 @@ MP_PROPERTY_GETTER(esp32_camera_camera_grab_mode_obj,
 
 //|     framebuffer_count: int
 //|     """True if double buffering is used"""
-//|
 STATIC mp_obj_t esp32_camera_camera_get_framebuffer_count(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index f1ee4b6891..a4fcaabad3 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -54,7 +54,6 @@
 //|
 //|     LATEST: GrabMode
 //|     """Except when 1 frame buffer is used, queue will always contain the last ``fb_count`` frames"""
-//|
 
 MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);
 MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, LATEST, CAMERA_GRAB_LATEST);
@@ -83,7 +82,6 @@ camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
 //|
 //|     JPEG: PixelFormat
 //|     """A compressed format"""
-//|
 
 MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, RGB565, PIXFORMAT_RGB565);
 MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, GRAYSCALE, PIXFORMAT_GRAYSCALE);
@@ -171,7 +169,6 @@ pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
 //|
 //|     QSXGA: FrameSize
 //|     """2560x1920"""
-//|
 
 MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R96X96, FRAMESIZE_96X96);
 MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R240X240, FRAMESIZE_240X240);
@@ -240,7 +237,6 @@ framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
 //|     GAIN_32X: GainCeiling
 //|     GAIN_64X: GainCeiling
 //|     GAIN_128X: GainCeiling
-//|
 
 MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_2X, GAINCEILING_2X);
 MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_4X, GAINCEILING_4X);
diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index c73e494f6c..499121852d 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -41,7 +41,6 @@
 //| def heap_caps_get_total_size() -> int:
 //|     """Return the total size of the ESP-IDF, which includes the CircuitPython heap."""
 //|     ...
-//|
 
 STATIC mp_obj_t espidf_heap_caps_get_total_size(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_total_size(MALLOC_CAP_8BIT));
@@ -51,7 +50,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_total_size_obj, espidf_heap_caps_
 //| def heap_caps_get_free_size() -> int:
 //|     """Return total free memory in the ESP-IDF heap."""
 //|     ...
-//|
 
 STATIC mp_obj_t espidf_heap_caps_get_free_size(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_free_size(MALLOC_CAP_8BIT));
@@ -61,7 +59,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_free_size_obj, espidf_heap_caps_g
 //| def heap_caps_get_largest_free_block() -> int:
 //|     """Return the size of largest free memory block in the ESP-IDF heap."""
 //|     ...
-//|
 
 STATIC mp_obj_t espidf_heap_caps_get_largest_free_block(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
@@ -103,10 +100,11 @@ const mp_obj_type_t mp_type_espidf_IDFError = {
 
 
 //| import builtins
+//|
 //| class MemoryError(builtins.MemoryError):
 //|     """Raised when an ESP IDF memory allocation fails."""
-//|     ...
 //|
+//|     ...
 NORETURN void mp_raise_espidf_MemoryError(void) {
     nlr_raise(mp_obj_new_exception(&mp_type_espidf_MemoryError));
 }
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 6570ab8694..9e5ded5288 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -57,42 +57,43 @@
 //|     in either PIO. State machines with the same program will be placed in the
 //|     same PIO if possible."""
 //|
-//|     def __init__(self,
-//|                  program: ReadableBuffer,
-//|                  frequency: int,
-//|                  *,
-//|                  init: Optional[ReadableBuffer] = None,
-//|                  first_out_pin: Optional[microcontroller.Pin] = None,
-//|                  out_pin_count: int = 1,
-//|                  initial_out_pin_state: int = 0,
-//|                  initial_out_pin_direction: int = 0xffffffff,
-//|                  first_in_pin: Optional[microcontroller.Pin] = None,
-//|                  in_pin_count: int = 1,
-//|                  pull_in_pin_up: int = 0,
-//|                  pull_in_pin_down: int = 0,
-//|                  first_set_pin: Optional[microcontroller.Pin] = None,
-//|                  set_pin_count: int = 1,
-//|                  initial_set_pin_state: int = 0,
-//|                  initial_set_pin_direction: int = 0x1f,
-//|                  first_sideset_pin: Optional[microcontroller.Pin] = None,
-//|                  sideset_pin_count: int = 1,
-//|                  initial_sideset_pin_state: int = 0,
-//|                  initial_sideset_pin_direction: int = 0x1f,
-//|                  sideset_enable: bool = False,
-//|                  jmp_pin: Optional[microcontroller.Pin] = None,
-//|                  jmp_pin_pull: Optional[digitalio.Pull] = None,
-//|                  exclusive_pin_use: bool = True,
-//|                  auto_pull: bool = False,
-//|                  pull_threshold: int = 32,
-//|                  out_shift_right: bool = True,
-//|                  wait_for_txstall: bool = True,
-//|                  auto_push: bool = False,
-//|                  push_threshold: int = 32,
-//|                  in_shift_right: bool = True,
-//|                  user_interruptible: bool = True,
-//|                  wrap_target: int = 0,
-//|                  wrap: int = -1,
-//|                 ) -> None:
+//|     def __init__(
+//|         self,
+//|         program: ReadableBuffer,
+//|         frequency: int,
+//|         *,
+//|         init: Optional[ReadableBuffer] = None,
+//|         first_out_pin: Optional[microcontroller.Pin] = None,
+//|         out_pin_count: int = 1,
+//|         initial_out_pin_state: int = 0,
+//|         initial_out_pin_direction: int = 0xFFFFFFFF,
+//|         first_in_pin: Optional[microcontroller.Pin] = None,
+//|         in_pin_count: int = 1,
+//|         pull_in_pin_up: int = 0,
+//|         pull_in_pin_down: int = 0,
+//|         first_set_pin: Optional[microcontroller.Pin] = None,
+//|         set_pin_count: int = 1,
+//|         initial_set_pin_state: int = 0,
+//|         initial_set_pin_direction: int = 0x1F,
+//|         first_sideset_pin: Optional[microcontroller.Pin] = None,
+//|         sideset_pin_count: int = 1,
+//|         initial_sideset_pin_state: int = 0,
+//|         initial_sideset_pin_direction: int = 0x1F,
+//|         sideset_enable: bool = False,
+//|         jmp_pin: Optional[microcontroller.Pin] = None,
+//|         jmp_pin_pull: Optional[digitalio.Pull] = None,
+//|         exclusive_pin_use: bool = True,
+//|         auto_pull: bool = False,
+//|         pull_threshold: int = 32,
+//|         out_shift_right: bool = True,
+//|         wait_for_txstall: bool = True,
+//|         auto_push: bool = False,
+//|         push_threshold: int = 32,
+//|         in_shift_right: bool = True,
+//|         user_interruptible: bool = True,
+//|         wrap_target: int = 0,
+//|         wrap: int = -1,
+//|     ) -> None:
 //|
 //|         """Construct a StateMachine object on the given pins with the given program.
 //|
@@ -148,7 +149,6 @@
 //|             last instruction of the program.
 //|         """
 //|         ...
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     rp2pio_statemachine_obj_t *self = m_new_obj(rp2pio_statemachine_obj_t);
@@ -278,7 +278,6 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n
 //|     def deinit(self) -> None:
 //|         """Turn off the state machine and release its resources."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_deinit(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_rp2pio_statemachine_deinit(self);
@@ -290,13 +289,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_deinit_obj, rp2pio_statemachine_ob
 //|         """No-op used by Context Managers.
 //|         Provided by context manager helper."""
 //|         ...
-//|
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_rp2pio_statemachine_deinit(args[0]);
@@ -327,12 +324,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_restart_obj, rp2pio_statemachine_r
 
 //|     def run(self, instructions: ReadableBuffer) -> None:
 //|         """Runs all given instructions. They will likely be interleaved with
-//|            in-memory instructions. Make sure this doesn't wait for input!
+//|         in-memory instructions. Make sure this doesn't wait for input!
 //|
-//|            This can be used to output internal state to the RX FIFO and then
-//|            read with `readinto`."""
+//|         This can be used to output internal state to the RX FIFO and then
+//|         read with `readinto`."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_obj) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj);
     check_for_deinit(self);
@@ -348,7 +344,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_run_obj, rp2pio_statemachine_run);
 //|     def stop(self) -> None:
 //|         """Stops the state machine clock. Use `restart` to enable it."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj);
     check_for_deinit(self);
@@ -358,7 +353,14 @@ STATIC mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop);
 
-//|     def write(self, buffer: ReadableBuffer, *, start: int = 0, end: Optional[int] = None, swap: bool = False) -> None:
+//|     def write(
+//|         self,
+//|         buffer: ReadableBuffer,
+//|         *,
+//|         start: int = 0,
+//|         end: Optional[int] = None,
+//|         swap: bool = False
+//|     ) -> None:
 //|         """Write the data contained in ``buffer`` to the state machine. If the buffer is empty, nothing happens.
 //|
 //|         Writes to the FIFO will match the input buffer's element size. For example, bytearray elements
@@ -373,7 +375,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop
 //|         :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``
 //|         :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order"""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end, ARG_swap };
     static const mp_arg_t allowed_args[] = {
@@ -413,7 +414,13 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write);
 
-//|     def background_write(self, once: Optional[ReadableBuffer]=None, *, loop: Optional[ReadableBuffer]=None, swap: bool=False) -> None:
+//|     def background_write(
+//|         self,
+//|         once: Optional[ReadableBuffer] = None,
+//|         *,
+//|         loop: Optional[ReadableBuffer] = None,
+//|         swap: bool = False
+//|     ) -> None:
 //|         """Write data to the TX fifo in the background, with optional looping.
 //|
 //|         First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have.
@@ -450,7 +457,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine
 //|         :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order
 //|         """
 //|         ...
-//|
 
 STATIC void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_bytes) {
     if (obj != mp_const_none) {
@@ -506,7 +512,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_background_write_obj, 1, rp2pio_s
 //|         """Immediately stop a background write, if one is in progress.  Any
 //|         DMA in progress is halted, but items already in the TX FIFO are not
 //|         affected."""
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     bool ok = common_hal_rp2pio_statemachine_stop_background_write(self);
@@ -522,7 +527,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_background_write_obj, rp2pio_
 
 //|     writing: bool
 //|     """Returns True if a background write is in progress"""
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_rp2pio_statemachine_get_writing(self));
@@ -541,7 +545,6 @@ const mp_obj_property_t rp2pio_statemachine_writing_obj = {
 //|     """Returns the number of pending buffers for background writing.
 //|
 //|     If the number is 0, then a `StateMachine.background_write` call will not block."""
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_rp2pio_statemachine_get_pending(self));
@@ -555,7 +558,14 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = {
               MP_ROM_NONE},
 };
 
-//|     def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: Optional[int] = None, swap: bool=False) -> None:
+//|     def readinto(
+//|         self,
+//|         buffer: WriteableBuffer,
+//|         *,
+//|         start: int = 0,
+//|         end: Optional[int] = None,
+//|         swap: bool = False
+//|     ) -> None:
 //|         """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer
 //|         includes any data added to the fifo even if it was added before this was called.
 //|
@@ -572,7 +582,6 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = {
 //|         :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)``
 //|         :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order"""
 //|         ...
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end, ARG_swap };
@@ -611,7 +620,16 @@ STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemachine_readinto);
 
-//|     def write_readinto(self, buffer_out: ReadableBuffer, buffer_in: WriteableBuffer, *, out_start: int = 0, out_end: Optional[int] = None, in_start: int = 0, in_end: Optional[int] = None) -> None:
+//|     def write_readinto(
+//|         self,
+//|         buffer_out: ReadableBuffer,
+//|         buffer_in: WriteableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: Optional[int] = None,
+//|         in_start: int = 0,
+//|         in_end: Optional[int] = None
+//|     ) -> None:
 //|         """Write out the data in ``buffer_out`` while simultaneously reading data into ``buffer_in``.
 //|         The lengths of the slices defined by ``buffer_out[out_start:out_end]`` and ``buffer_in[in_start:in_end]``
 //|         may be different. The function will return once both are filled.
@@ -632,7 +650,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach
 //|         :param bool swap_out: For 2- and 4-byte elements, swap (reverse) the byte order for the buffer being transmitted (written)
 //|         :param bool swap_in: For 2- and 4-rx elements, swap (reverse) the byte order for the buffer being received (read)"""
 //|         ...
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer_out, ARG_buffer_in, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end, ARG_swap_out, ARG_swap_in };
@@ -694,7 +711,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_readinto_obj, 2, rp2pio_sta
 //|     def clear_rxfifo(self) -> None:
 //|         """Clears any unread bytes in the rxfifo."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_clear_rxfifo(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_rp2pio_statemachine_clear_rxfifo(self);
@@ -705,7 +721,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_rxfifo_obj, rp2pio_statemach
 //|     def clear_txstall(self) -> None:
 //|         """Clears the txstall flag."""
 //|         ...
-//|
 STATIC mp_obj_t rp2pio_statemachine_obj_clear_txstall(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_rp2pio_statemachine_clear_txstall(self);
@@ -717,7 +732,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_txstall_obj, rp2pio_statemac
 //|     frequency: int
 //|     """The actual state machine frequency. This may not match the frequency requested
 //|     due to internal limitations."""
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_obj_get_frequency(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -742,7 +756,6 @@ MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj,
 //|     txstall: bool
 //|     """True when the state machine has stalled due to a full TX FIFO since the last
 //|        `clear_txstall` call."""
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_obj_get_txstall(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -762,7 +775,6 @@ const mp_obj_property_t rp2pio_statemachine_txstall_obj = {
 //|     rxstall: bool
 //|     """True when the state machine has stalled due to a full RX FIFO since the last
 //|        `clear_rxfifo` call."""
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -776,7 +788,6 @@ MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj,
 
 //|     in_waiting: int
 //|     """The number of words available to readinto"""
-//|
 
 STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c
index 941ede2e12..5a53443dc8 100644
--- a/ports/raspberrypi/bindings/rp2pio/__init__.c
+++ b/ports/raspberrypi/bindings/rp2pio/__init__.c
@@ -38,12 +38,10 @@
 //|     Learn guide `_.
 //|
 //| """
-//|
 
 //| def pins_are_sequential(pins: List[microcontroller.Pin]) -> bool:
 //|     """Return True if the pins have sequential GPIO numbers, False otherwise"""
 //|     ...
-//|
 STATIC mp_obj_t rp2pio_pins_are_sequential(const mp_obj_t pins) {
     size_t len;
     mp_obj_t *items;
diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c
index 53bd6be3c2..d7d76ac9d7 100644
--- a/shared-bindings/_bleio/Adapter.c
+++ b/shared-bindings/_bleio/Adapter.c
@@ -62,9 +62,10 @@
 //|     The Adapter can do both parts of this process: it can scan for other device
 //|     advertisements and it can advertise its own data. Furthermore, Adapters can accept incoming
 //|     connections and also initiate connections."""
-//|
 
-//|     def __init__(self, *, uart: busio.UART, rts: digitalio.DigitalInOut, cts: digitalio.DigitalInOut) -> None:
+//|     def __init__(
+//|         self, *, uart: busio.UART, rts: digitalio.DigitalInOut, cts: digitalio.DigitalInOut
+//|     ) -> None:
 //|         """On boards that do not have native BLE, you can use an HCI co-processor.
 //|         Pass the uart and pins used to communicate with the co-processor, such as an Adafruit AirLift.
 //|         The co-processor must have been reset and put into BLE mode beforehand
@@ -80,7 +81,6 @@
 //|         Use `_bleio.adapter` to access the sole instance already available.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_adapter_obj_t *self = common_hal_bleio_allocate_adapter_or_raise();
@@ -110,10 +110,8 @@ STATIC mp_obj_t bleio_adapter_make_new(const mp_obj_type_t *type, size_t n_args,
     #endif // CIRCUITPY_BLEIO_HCI
 }
 
-//|
 //|     enabled: bool
 //|     """State of the BLE adapter."""
-//|
 STATIC mp_obj_t bleio_adapter_get_enabled(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_bleio_adapter_get_enabled(self));
 }
@@ -134,7 +132,6 @@ MP_PROPERTY_GETSET(bleio_adapter_enabled_obj,
 
 //|     address: Address
 //|     """MAC address of the BLE adapter."""
-//|
 STATIC mp_obj_t bleio_adapter_get_address(mp_obj_t self) {
     return MP_OBJ_FROM_PTR(common_hal_bleio_adapter_get_address(self));
 
@@ -157,7 +154,6 @@ MP_PROPERTY_GETSET(bleio_adapter_address_obj,
 //|     """name of the BLE adapter used once connected.
 //|     The name is "CIRCUITPY" + the last four hex digits of ``adapter.address``,
 //|     to make it easy to distinguish multiple CircuitPython boards."""
-//|
 STATIC mp_obj_t _bleio_adapter_get_name(mp_obj_t self) {
     return MP_OBJ_FROM_PTR(common_hal_bleio_adapter_get_name(self));
 }
@@ -174,10 +170,18 @@ MP_PROPERTY_GETSET(bleio_adapter_name_obj,
     (mp_obj_t)&bleio_adapter_get_name_obj,
     (mp_obj_t)&bleio_adapter_set_name_obj);
 
-//|     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:
+//|     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.
 //|
@@ -196,7 +200,6 @@ MP_PROPERTY_GETSET(bleio_adapter_name_obj,
 //|         :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]);
 
@@ -259,7 +262,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_advertising_obj, 1, bleio_
 //|     def stop_advertising(self) -> None:
 //|         """Stop sending advertising packets."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_stop_advertising(mp_obj_t self_in) {
     bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -269,7 +271,18 @@ STATIC mp_obj_t bleio_adapter_stop_advertising(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_advertising_obj, bleio_adapter_stop_advertising);
 
-//|     def start_scan(self, prefixes: ReadableBuffer = b"", *, buffer_size: int = 512, extended: bool = False, timeout: Optional[float] = None, interval: float = 0.1, window: float = 0.1, minimum_rssi: int = -80, active: bool = True) -> Iterable[ScanEntry]:
+//|     def start_scan(
+//|         self,
+//|         prefixes: ReadableBuffer = b"",
+//|         *,
+//|         buffer_size: int = 512,
+//|         extended: bool = False,
+//|         timeout: Optional[float] = None,
+//|         interval: float = 0.1,
+//|         window: float = 0.1,
+//|         minimum_rssi: int = -80,
+//|         active: bool = True
+//|     ) -> Iterable[ScanEntry]:
 //|         """Starts a BLE scan and returns an iterator of results. Advertisements and scan responses are
 //|         filtered and returned separately.
 //|
@@ -288,7 +301,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_advertising_obj, bleio_adapt
 //|         :returns: an iterable of `_bleio.ScanEntry` objects
 //|         :rtype: iterable"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_start_scan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_prefixes, ARG_buffer_size, ARG_extended, ARG_timeout, ARG_interval, ARG_window, ARG_minimum_rssi, ARG_active };
     static const mp_arg_t allowed_args[] = {
@@ -352,7 +364,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_scan_obj, 1, bleio_adapter
 //|     def stop_scan(self) -> None:
 //|         """Stop the current scan."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_stop_scan(mp_obj_t self_in) {
     bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -364,7 +375,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_scan_obj, bleio_adapter_stop
 
 //|     advertising: bool
 //|     """True when the adapter is currently advertising. (read-only)"""
-//|
 STATIC mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_bleio_adapter_get_advertising(self));
 
@@ -377,7 +387,6 @@ MP_PROPERTY_GETTER(bleio_adapter_advertising_obj,
 //|     connected: bool
 //|     """True when the adapter is connected to another device regardless of who initiated the
 //|     connection. (read-only)"""
-//|
 STATIC mp_obj_t bleio_adapter_get_connected(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_bleio_adapter_get_connected(self));
 
@@ -390,7 +399,6 @@ MP_PROPERTY_GETTER(bleio_adapter_connected_obj,
 //|     connections: Tuple[Connection]
 //|     """Tuple of active connections including those initiated through
 //|     :py:meth:`_bleio.Adapter.connect`. (read-only)"""
-//|
 STATIC mp_obj_t bleio_adapter_get_connections(mp_obj_t self) {
     return common_hal_bleio_adapter_get_connections(self);
 }
@@ -405,7 +413,6 @@ MP_PROPERTY_GETTER(bleio_adapter_connections_obj,
 //|         :param Address address: The address of the peripheral to connect to
 //|         :param float/int timeout: Try to connect for timeout seconds."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_connect(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]);
 
@@ -428,7 +435,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_connect_obj, 1, bleio_adapter_co
 //|     def erase_bonding(self) -> None:
 //|         """Erase all bonding information stored in flash memory."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_adapter_erase_bonding(mp_obj_t self_in) {
     bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c
index 26aeec3036..d4af6f9005 100644
--- a/shared-bindings/_bleio/Address.c
+++ b/shared-bindings/_bleio/Address.c
@@ -36,7 +36,6 @@
 
 //| class Address:
 //|     """Encapsulates the address of a BLE device."""
-//|
 
 //|     def __init__(self, address: ReadableBuffer, address_type: int) -> None:
 //|         """Create a new Address object encapsulating the address value.
@@ -46,7 +45,6 @@
 //|         :param int address_type: one of the integer values: `PUBLIC`, `RANDOM_STATIC`,
 //|           `RANDOM_PRIVATE_RESOLVABLE`, or `RANDOM_PRIVATE_NON_RESOLVABLE`."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_address, ARG_address_type };
     static const mp_arg_t allowed_args[] = {
@@ -93,7 +91,6 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args,
 //|       
    
 //|       >>> _bleio.adapter.address.address_bytes
 //|       b'5\\xa8\\xed\\xf5\\x1d\\xc8'"""
-//|
 STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) {
     bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -109,7 +106,6 @@ MP_PROPERTY_GETTER(bleio_address_address_bytes_obj,
 //|
 //|     One of the integer values: `PUBLIC`, `RANDOM_STATIC`, `RANDOM_PRIVATE_RESOLVABLE`,
 //|     or `RANDOM_PRIVATE_NON_RESOLVABLE`."""
-//|
 STATIC mp_obj_t bleio_address_get_type(mp_obj_t self_in) {
     bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -123,7 +119,6 @@ MP_PROPERTY_GETTER(bleio_address_type_obj,
 //|     def __eq__(self, other: object) -> bool:
 //|         """Two Address objects are equal if their addresses and address types are equal."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     switch (op) {
         // Two Addresses are equal if their address bytes and address_type are equal
@@ -149,7 +144,6 @@ STATIC mp_obj_t bleio_address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_o
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Address data."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_address_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     switch (op) {
         // Two Addresses are equal if their address bytes and address_type are equal
@@ -191,7 +185,6 @@ STATIC void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 //|
 //|     RANDOM_PRIVATE_NON_RESOLVABLE: int
 //|     """A randomly generated address that changes on every connection."""
-//|
 STATIC const mp_rom_map_elem_t bleio_address_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_address_bytes),                 MP_ROM_PTR(&bleio_address_address_bytes_obj) },
     { MP_ROM_QSTR(MP_QSTR_type),                          MP_ROM_PTR(&bleio_address_type_obj) },
diff --git a/shared-bindings/_bleio/Attribute.c b/shared-bindings/_bleio/Attribute.c
index d639f2a421..7d15f4d3df 100644
--- a/shared-bindings/_bleio/Attribute.c
+++ b/shared-bindings/_bleio/Attribute.c
@@ -39,7 +39,6 @@
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of :py:class:`~_bleio.Attribute`."""
 //|         ...
-//|
 
 STATIC const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = {
 
@@ -63,7 +62,6 @@ STATIC const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = {
 //|
 //|     SIGNED_WITH_MITM: int
 //|     """security_mode: authenticated data signing, without man-in-the-middle protection"""
-//|
     { MP_ROM_QSTR(MP_QSTR_NO_ACCESS),              MP_ROM_INT(SECURITY_MODE_NO_ACCESS) },
     { MP_ROM_QSTR(MP_QSTR_OPEN),                   MP_ROM_INT(SECURITY_MODE_OPEN) },
     { MP_ROM_QSTR(MP_QSTR_ENCRYPT_NO_MITM),        MP_ROM_INT(SECURITY_MODE_ENC_NO_MITM) },
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index 6f72d96056..439630c1c5 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -35,7 +35,7 @@
 
 //| class Characteristic:
 //|     """Stores information about a BLE service characteristic and allows reading
-//|        and writing of the characteristic's value."""
+//|     and writing of the characteristic's value."""
 //|
 //|     def __init__(self) -> None:
 //|         """There is no regular constructor for a Characteristic. A new local Characteristic can be created
@@ -43,13 +43,20 @@
 //|         Remote Characteristic objects are created by `Connection.discover_remote_services()`
 //|         as part of remote Services."""
 //|         ...
-//|
 
-//|     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:
+//|     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
@@ -73,7 +80,6 @@
 //|
 //|         :return: the new Characteristic."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // class is arg[0], which we can ignore.
 
@@ -157,7 +163,6 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_characteristic_add_to_service_obj,
 //|     """An int bitmask representing which properties are set, specified as bitwise or'ing of
 //|     of these possible values.
 //|     `BROADCAST`, `INDICATE`, `NOTIFY`, `READ`, `WRITE`, `WRITE_NO_RESPONSE`."""
-//|
 STATIC mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -172,7 +177,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_properties_obj,
 //|     """The UUID of this characteristic. (read-only)
 //|
 //|     Will be ``None`` if the 128-bit UUID for this characteristic is not known."""
-//|
 STATIC mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -186,7 +190,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj,
 
 //|     value: bytearray
 //|     """The value of this characteristic."""
-//|
 STATIC mp_obj_t bleio_characteristic_get_value(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -214,7 +217,6 @@ MP_PROPERTY_GETSET(bleio_characteristic_value_obj,
 
 //|     max_length: int
 //|     """The max length of this characteristic."""
-//|
 STATIC mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -227,7 +229,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj,
 
 //|     descriptors: Descriptor
 //|     """A tuple of :py:class:`Descriptor` objects related to this characteristic. (read-only)"""
-//|
 STATIC mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // Return list as a tuple so user won't be able to change it.
@@ -241,7 +242,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj,
 
 //|     service: Service
 //|     """The Service this Characteristic is a part of."""
-//|
 STATIC mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -258,7 +258,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_service_obj,
 //|         :param bool notify: True if Characteristic should receive notifications of remote writes
 //|         :param float indicate: True if Characteristic should receive indications of remote writes"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_characteristic_set_cccd(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -302,7 +301,6 @@ STATIC const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = {
 //|
 //|     WRITE_NO_RESPONSE: int
 //|     """property: clients may write this characteristic; no response will be sent back"""
-//|
     { MP_ROM_QSTR(MP_QSTR_BROADCAST),         MP_ROM_INT(CHAR_PROP_BROADCAST) },
     { MP_ROM_QSTR(MP_QSTR_INDICATE),          MP_ROM_INT(CHAR_PROP_INDICATE) },
     { MP_ROM_QSTR(MP_QSTR_NOTIFY),            MP_ROM_INT(CHAR_PROP_NOTIFY) },
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index aea77fb633..ebd1bbb3cf 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -44,7 +44,9 @@ STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self
 //| class CharacteristicBuffer:
 //|     """Accumulates a Characteristic's incoming values in a FIFO buffer."""
 //|
-//|     def __init__(self, characteristic: Characteristic, *, timeout: int = 1, buffer_size: int = 64) -> None:
+//|     def __init__(
+//|         self, characteristic: Characteristic, *, timeout: int = 1, buffer_size: int = 64
+//|     ) -> None:
 //|
 //|         """Monitor the given Characteristic. Each time a new value is written to the Characteristic
 //|         add the newly-written bytes to a FIFO buffer.
@@ -56,7 +58,6 @@ STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self
 //|         :param int buffer_size: Size of ring buffer that stores incoming data coming from client.
 //|           Must be >= 1."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_characteristic, ARG_timeout, ARG_buffer_size, };
     static const mp_arg_t allowed_args[] = {
@@ -99,21 +100,18 @@ STATIC void check_for_deinit(bleio_characteristic_buffer_obj_t *self) {
 //|         :return: Data read
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 //|     def readinto(self, buf: WriteableBuffer) -> Optional[int]:
 //|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes.
 //|
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int or None (on a non-blocking error)"""
 //|         ...
-//|
 //|     def readline(self) -> bytes:
 //|         """Read a line, ending in a newline character.
 //|
 //|         :return: the line read
 //|         :rtype: int or None"""
 //|         ...
-//|
 
 // These three methods are used by the shared stream methods.
 STATIC mp_uint_t bleio_characteristic_buffer_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
@@ -159,7 +157,6 @@ STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t r
 
 //|     in_waiting: int
 //|     """The number of bytes in the input buffer, available to be read"""
-//|
 STATIC mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) {
     bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -173,7 +170,6 @@ MP_PROPERTY_GETTER(bleio_characteristic_buffer_in_waiting_obj,
 //|     def reset_input_buffer(self) -> None:
 //|         """Discard any unread characters in the input buffer."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_characteristic_buffer_obj_reset_input_buffer(mp_obj_t self_in) {
     bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -185,7 +181,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_reset_input_buffer_
 //|     def deinit(self) -> None:
 //|         """Disable permanently."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_characteristic_buffer_deinit(mp_obj_t self_in) {
     bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_bleio_characteristic_buffer_deinit(self);
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
index 7a85ccddc2..be8a38ceaf 100644
--- a/shared-bindings/_bleio/Connection.c
+++ b/shared-bindings/_bleio/Connection.c
@@ -59,7 +59,6 @@
 //|            raise Exception("'InterestingPeripheral' not found")
 //|
 //|        connection = _bleio.adapter.connect(my_entry.address, timeout=10)"""
-//|
 
 void bleio_connection_ensure_connected(bleio_connection_obj_t *self) {
     if (!common_hal_bleio_connection_get_connected(self)) {
@@ -72,11 +71,9 @@ void bleio_connection_ensure_connected(bleio_connection_obj_t *self) {
 //|         Connections may also be made when another device initiates a connection. To use a Connection
 //|         created by a peer, read the `Adapter.connections` property."""
 //|         ...
-//|
 //|     def disconnect(self) -> None:
 //|         """Disconnects from the remote peripheral. Does nothing if already disconnected."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_connection_disconnect(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // common_hal_bleio_connection_disconnect() does nothing if already disconnected.
@@ -89,7 +86,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_disconnect_obj, bleio_connecti
 //|     def pair(self, *, bond: bool = True) -> None:
 //|         """Pair to the peer to improve security."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_connection_pair(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -108,7 +104,9 @@ STATIC mp_obj_t bleio_connection_pair(mp_uint_t n_args, const mp_obj_t *pos_args
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_pair_obj, 1, bleio_connection_pair);
 
-//|     def discover_remote_services(self, service_uuids_whitelist: Optional[Iterable[UUID]] = None) -> Tuple[Service, ...]:
+//|     def discover_remote_services(
+//|         self, service_uuids_whitelist: Optional[Iterable[UUID]] = None
+//|     ) -> Tuple[Service, ...]:
 //|         """Do BLE discovery for all services or for the given service UUIDS,
 //|         to find their handles and characteristics, and return the discovered services.
 //|         `Connection.connected` must be True.
@@ -131,7 +129,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_pair_obj, 1, bleio_connection
 //|
 //|         :return: A tuple of `_bleio.Service` objects provided by the remote peripheral."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_connection_discover_remote_services(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -153,7 +150,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_discover_remote_services_obj,
 
 //|     connected: bool
 //|     """True if connected to the remote peer."""
-//|
 STATIC mp_obj_t bleio_connection_get_connected(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -167,7 +163,6 @@ MP_PROPERTY_GETTER(bleio_connection_connected_obj,
 
 //|     paired: bool
 //|     """True if paired to the remote peer."""
-//|
 STATIC mp_obj_t bleio_connection_get_paired(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -188,7 +183,6 @@ MP_PROPERTY_GETTER(bleio_connection_paired_obj,
 //|
 //|     Apple has additional guidelines that dictate should be a multiple of 15ms except if HID is
 //|     available. When HID is available Apple devices may accept 11.25ms intervals."""
-//|
 STATIC mp_obj_t bleio_connection_get_connection_interval(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -205,7 +199,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, b
 //|     which must be sent in a single packet.
 //|     But for a regular characteristic read or write, may be sent in multiple packets,
 //|     so this limit does not apply."""
-//|
 STATIC mp_obj_t bleio_connection_get_max_packet_length(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c
index 0e662655c4..07ba744f97 100644
--- a/shared-bindings/_bleio/Descriptor.c
+++ b/shared-bindings/_bleio/Descriptor.c
@@ -44,9 +44,18 @@
 //|         and attached to a Characteristic by calling `add_to_characteristic()`.
 //|         Remote Descriptor objects are created by `Connection.discover_remote_services()`
 //|         as part of remote Characteristics in the remote Services that are discovered."""
-//|
 //|     @classmethod
-//|     def add_to_characteristic(cls, characteristic: Characteristic, uuid: UUID, *, read_perm: int = Attribute.OPEN, write_perm: int = Attribute.OPEN, max_length: int = 20, fixed_length: bool = False, initial_value: ReadableBuffer = b'') -> Descriptor:
+//|     def add_to_characteristic(
+//|         cls,
+//|         characteristic: Characteristic,
+//|         uuid: UUID,
+//|         *,
+//|         read_perm: int = Attribute.OPEN,
+//|         write_perm: int = Attribute.OPEN,
+//|         max_length: int = 20,
+//|         fixed_length: bool = False,
+//|         initial_value: ReadableBuffer = b""
+//|     ) -> Descriptor:
 //|         """Create a new Descriptor object, and add it to this Service.
 //|
 //|         :param Characteristic characteristic: The characteristic that will hold this descriptor
@@ -65,7 +74,6 @@
 //|
 //|         :return: the new Descriptor."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // class is arg[0], which we can ignore.
 
@@ -133,7 +141,6 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_descriptor_add_to_characteristic_ob
 
 //|     uuid: UUID
 //|     """The descriptor uuid. (read-only)"""
-//|
 STATIC mp_obj_t bleio_descriptor_get_uuid(mp_obj_t self_in) {
     bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -147,7 +154,6 @@ MP_PROPERTY_GETTER(bleio_descriptor_uuid_obj,
 
 //|     characteristic: Characteristic
 //|     """The Characteristic this Descriptor is a part of."""
-//|
 STATIC mp_obj_t bleio_descriptor_get_characteristic(mp_obj_t self_in) {
     bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -160,7 +166,6 @@ MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj,
 
 //|     value: bytearray
 //|     """The value of this descriptor."""
-//|
 STATIC mp_obj_t bleio_descriptor_get_value(mp_obj_t self_in) {
     bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c
index 30eb8dd8c7..949ab99439 100644
--- a/shared-bindings/_bleio/PacketBuffer.c
+++ b/shared-bindings/_bleio/PacketBuffer.c
@@ -44,7 +44,13 @@
 //|     When we're the server, we ignore all connections besides the first to subscribe to
 //|     notifications."""
 //|
-//|     def __init__(self, characteristic: Characteristic, *, buffer_size: int, max_packet_size: Optional[int] = None) -> None:
+//|     def __init__(
+//|         self,
+//|         characteristic: Characteristic,
+//|         *,
+//|         buffer_size: int,
+//|         max_packet_size: Optional[int] = None
+//|     ) -> None:
 //|         """Monitor the given Characteristic. Each time a new value is written to the Characteristic
 //|         add the newly-written bytes to a FIFO buffer.
 //|
@@ -59,7 +65,6 @@
 //|         :param int max_packet_size: Maximum size of packets. Overrides value from the characteristic.
 //|           (Remote characteristics may not have the correct length.)"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_characteristic, ARG_buffer_size, ARG_max_packet_size };
     static const mp_arg_t allowed_args[] = {
@@ -101,7 +106,6 @@ STATIC void check_for_deinit(bleio_packet_buffer_obj_t *self) {
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_packet_buffer_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -127,7 +131,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_
 //|         :return: number of bytes written. May include header bytes when packet is empty.
 //|         :rtype: int"""
 //|         ...
-//|
 // TODO: Add a kwarg `merge=False` to dictate whether subsequent writes are merged into a pending
 // one.
 STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -182,7 +185,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_bu
 
 //|     incoming_packet_length: int
 //|     """Maximum length in bytes of a packet we are reading."""
-//|
 STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -199,7 +201,6 @@ MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj,
 
 //|     outgoing_packet_length: int
 //|     """Maximum length in bytes of a packet we are writing."""
-//|
 STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c
index a5009088a5..749cae6123 100644
--- a/shared-bindings/_bleio/ScanEntry.c
+++ b/shared-bindings/_bleio/ScanEntry.c
@@ -39,18 +39,15 @@
 //|     """Encapsulates information about a device that was received during scanning. It can be
 //|     advertisement or scan response data. This object may only be created by a `_bleio.ScanResults`:
 //|     it has no user-visible constructor."""
-//|
 
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `_bleio.Adapter.start_scan`."""
 //|         ...
-//|
 //|     def matches(self, prefixes: ScanEntry, *, match_all: bool = True) -> bool:
 //|         """Returns True if the ScanEntry matches all prefixes when ``match_all`` is True. This is stricter
 //|         than the scan filtering which accepts any advertisements that match any of the prefixes
 //|         where ``match_all`` is False."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -73,7 +70,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_scanentry_matches_obj, 1, bleio_scanentr
 
 //|     address: Address
 //|     """The address of the device (read-only), of type `_bleio.Address`."""
-//|
 STATIC mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_bleio_scanentry_get_address(self);
@@ -85,7 +81,6 @@ MP_PROPERTY_GETTER(bleio_scanentry_address_obj,
 
 //|     advertisement_bytes: bytes
 //|     """All the advertisement data present in the packet, returned as a ``bytes`` object. (read-only)"""
-//|
 STATIC mp_obj_t scanentry_get_advertisement_bytes(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_bleio_scanentry_get_advertisement_bytes(self);
@@ -97,7 +92,6 @@ MP_PROPERTY_GETTER(bleio_scanentry_advertisement_bytes_obj,
 
 //|     rssi: int
 //|     """The signal strength of the device at the time of the scan, in integer dBm. (read-only)"""
-//|
 STATIC mp_obj_t scanentry_get_rssi(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_bleio_scanentry_get_rssi(self));
@@ -109,7 +103,6 @@ MP_PROPERTY_GETTER(bleio_scanentry_rssi_obj,
 
 //|     connectable: bool
 //|     """True if the device can be connected to. (read-only)"""
-//|
 STATIC mp_obj_t scanentry_get_connectable(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_bleio_scanentry_get_connectable(self));
@@ -121,7 +114,6 @@ MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj,
 
 //|     scan_response: bool
 //|     """True if the entry was a scan response. (read-only)"""
-//|
 STATIC mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_bleio_scanentry_get_scan_response(self));
diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c
index bee6cfa89c..f0408b8cbc 100644
--- a/shared-bindings/_bleio/ScanResults.c
+++ b/shared-bindings/_bleio/ScanResults.c
@@ -35,7 +35,6 @@
 //| class ScanResults:
 //|     """Iterates over advertising data received while scanning. This object is always created
 //|     by a `_bleio.Adapter`: it has no user-visible constructor."""
-//|
 STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &bleio_scanresults_type));
     bleio_scanresults_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -49,16 +48,13 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `_bleio.Adapter.start_scan`."""
 //|         ...
-//|
 //|     def __iter__(self) -> Iterator[ScanEntry]:
 //|         """Returns itself since it is the iterator."""
 //|         ...
-//|
 //|     def __next__(self) -> ScanEntry:
 //|         """Returns the next `_bleio.ScanEntry`. Blocks if none have been received and scanning is still
 //|         active. Raises `StopIteration` if scanning is finished and no other results are available."""
 //|         ...
-//|
 
 const mp_obj_type_t bleio_scanresults_type = {
     { &mp_type_type },
diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c
index ddbdecdf79..7bb7cd8505 100644
--- a/shared-bindings/_bleio/Service.c
+++ b/shared-bindings/_bleio/Service.c
@@ -47,7 +47,6 @@
 //|
 //|         :return: the new Service"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_uuid, ARG_secondary };
     static const mp_arg_t allowed_args[] = {
@@ -73,7 +72,6 @@ STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     characteristics: Tuple[Characteristic, ...]
 //|     """A tuple of :py:class:`Characteristic` designating the characteristics that are offered by
 //|     this service. (read-only)"""
-//|
 STATIC mp_obj_t bleio_service_get_characteristics(mp_obj_t self_in) {
     bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_bleio_service_get_characteristics(self));
@@ -85,7 +83,6 @@ MP_PROPERTY_GETTER(bleio_service_characteristics_obj,
 
 //|     remote: bool
 //|     """True if this is a service provided by a remote device. (read-only)"""
-//|
 STATIC mp_obj_t bleio_service_get_remote(mp_obj_t self_in) {
     bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -98,7 +95,6 @@ MP_PROPERTY_GETTER(bleio_service_remote_obj,
 
 //|     secondary: bool
 //|     """True if this is a secondary service. (read-only)"""
-//|
 STATIC mp_obj_t bleio_service_get_secondary(mp_obj_t self_in) {
     bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -113,7 +109,6 @@ MP_PROPERTY_GETTER(bleio_service_secondary_obj,
 //|     """The UUID of this service. (read-only)
 //|
 //|     Will be ``None`` if the 128-bit UUID for this service is not known."""
-//|
 STATIC mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) {
     bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c
index 599a89a581..1e095e82e4 100644
--- a/shared-bindings/_bleio/UUID.c
+++ b/shared-bindings/_bleio/UUID.c
@@ -50,7 +50,6 @@
 //|         :param value: The uuid value to encapsulate
 //|         :type value: int, ~circuitpython_typing.ReadableBuffer or str"""
 //|         ...
-//|
 STATIC mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
@@ -124,7 +123,6 @@ STATIC mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, si
 //|     """The 16-bit part of the UUID. (read-only)
 //|
 //|     :type: int"""
-//|
 STATIC mp_obj_t bleio_uuid_get_uuid16(mp_obj_t self_in) {
     bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_uuid_get_uuid16(self));
@@ -140,7 +138,6 @@ MP_PROPERTY_GETTER(bleio_uuid_uuid16_obj,
 //|     Raises AttributeError if this is a 16-bit UUID. (read-only)
 //|
 //|     :type: bytes"""
-//|
 STATIC mp_obj_t bleio_uuid_get_uuid128(mp_obj_t self_in) {
     bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -162,7 +159,6 @@ MP_PROPERTY_GETTER(bleio_uuid_uuid128_obj,
 //|     16-bit Bluetooth SIG assigned UUID. (read-only) 32-bit UUIDs are not currently supported.
 //|
 //|     :type: int"""
-//|
 STATIC mp_obj_t bleio_uuid_get_size(mp_obj_t self_in) {
     bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_uuid_get_size(self));
@@ -177,7 +173,6 @@ MP_PROPERTY_GETTER(bleio_uuid_size_obj,
 //|     def pack_into(self, buffer: WriteableBuffer, offset: int = 0) -> None:
 //|         """Packs the UUID into the given buffer at the given offset."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_uuid_pack_into(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -239,7 +234,6 @@ STATIC mp_obj_t bleio_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     def __eq__(self, other: object) -> bool:
 //|         """Two UUID objects are equal if their values match and they are both 128-bit or both 16-bit."""
 //|         ...
-//|
 STATIC mp_obj_t bleio_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     switch (op) {
         // Two UUID's are equal if their uuid16 values match or their uuid128 values match.
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index 72d96846aa..bcddeac734 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -54,15 +54,14 @@
 //| CircuitPython library instead, which builds on `_bleio`, and
 //| provides higher-level convenience functionality, including predefined beacons, clients,
 //| servers."""
-//|
 
 //| adapter: Adapter
 //| """BLE Adapter used to manage device discovery and connections.
 //| This object is the sole instance of `_bleio.Adapter`."""
-//|
 
 //| class BluetoothError(Exception):
 //|     """Catchall exception for Bluetooth related errors."""
+//|
 //|     ...
 MP_DEFINE_BLEIO_EXCEPTION(BluetoothError, Exception)
 NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...) {
@@ -76,8 +75,8 @@ NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...)
 //| class RoleError(BluetoothError):
 //|     """Raised when a resource is used as the mismatched role. For example, if a local CCCD is
 //|     attempted to be set but they can only be set when remote."""
-//|     ...
 //|
+//|     ...
 MP_DEFINE_BLEIO_EXCEPTION(RoleError, bleio_BluetoothError)
 NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_bleio_RoleError, msg);
@@ -85,8 +84,8 @@ NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) {
 
 //| class SecurityError(BluetoothError):
 //|     """Raised when a security related error occurs."""
-//|     ...
 //|
+//|     ...
 MP_DEFINE_BLEIO_EXCEPTION(SecurityError, bleio_BluetoothError)
 NORETURN void mp_raise_bleio_SecurityError(const compressed_string_t *fmt, ...) {
     va_list argptr;
@@ -116,7 +115,6 @@ STATIC mp_obj_dict_t bleio_module_globals;
 //|     """Set the adapter to use for BLE, such as when using an HCI adapter.
 //|     Raises `NotImplementedError` when the adapter is a singleton and cannot be set."""
 //|     ...
-//|
 mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj) {
     #if CIRCUITPY_BLEIO_HCI
     if (adapter_obj != mp_const_none && !mp_obj_is_type(adapter_obj, &bleio_adapter_type)) {
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index 3ba97c152d..9cc140410d 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -43,7 +43,6 @@
 //| class _EVE:
 //|     def __init__(self) -> None:
 //|         """Create an _EVE object"""
-//|
 typedef struct _mp_obj__EVE_t {
     mp_obj_base_t base;
     common_hal__eve_t _eve;
@@ -54,9 +53,7 @@ STATIC const mp_obj_type_t _EVE_type;
 #define EVEHAL(s) \
     (&((mp_obj__EVE_t *)mp_obj_cast_to_native_base((s), &_EVE_type))->_eve)
 
-//|     def register(self, o: object) -> None:
-//|         ...
-//|
+//|     def register(self, o: object) -> None: ...
 STATIC mp_obj_t _register(mp_obj_t self, mp_obj_t o) {
     common_hal__eve_t *eve = EVEHAL(self);
     mp_load_method(o, MP_QSTR_write, eve->dest);
@@ -69,7 +66,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(register_obj, _register);
 //|
 //|         :param int width: The width of the grid in tiles, or 1 for sprites."""
 //|         ...
-//|
 STATIC mp_obj_t _flush(mp_obj_t self) {
     common_hal__eve_flush(EVEHAL(self));
     return mp_const_none;
@@ -81,7 +77,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(flush_obj, _flush);
 //|
 //|         :param ~circuitpython_typing.ReadableBuffer b: The bytes to add"""
 //|         ...
-//|
 STATIC mp_obj_t _cc(mp_obj_t self, mp_obj_t b) {
     mp_buffer_info_t buffer_info;
     mp_get_buffer_raise(b, &buffer_info, MP_BUFFER_READ);
@@ -100,7 +95,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t func = mp_obj_get_int_truncated(a0);
@@ -117,7 +111,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc);
 //|
 //|         Valid primitives are ``BITMAPS``, ``POINTS``, ``LINES``, ``LINE_STRIP``, ``EDGE_STRIP_R``, ``EDGE_STRIP_L``, ``EDGE_STRIP_A``, ``EDGE_STRIP_B`` and ``RECTS``."""
 //|         ...
-//|
 
 STATIC mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) {
     uint32_t prim = mp_obj_get_int_truncated(a0);
@@ -131,7 +124,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(begin_obj, _begin);
 //|
 //|         :param int format: bitmap pixel format."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmapextformat(mp_obj_t self, mp_obj_t a0) {
     uint32_t fmt = mp_obj_get_int_truncated(a0);
@@ -147,7 +139,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) {
     uint32_t handle = mp_obj_get_int_truncated(a0);
@@ -162,7 +153,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaphandle_obj, _bitmaphandle);
 //|         :param int linestride: high part of bitmap line stride, in bytes. Range 0-7
 //|         :param int height: high part of bitmap height, in lines. Range 0-3"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaplayouth(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t linestride = mp_obj_get_int_truncated(a0);
@@ -179,7 +169,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaplayouth_obj, _bitmaplayouth);
 //|         :param int linestride: bitmap line stride, in bytes. Range 0-1023
 //|         :param int height: bitmap height, in lines. Range 0-511"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaplayout(size_t n_args, const mp_obj_t *args) {
     uint32_t format = mp_obj_get_int_truncated(args[1]);
@@ -196,7 +185,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaplayout_obj, 4, 4, _bitmaplayout
 //|         :param int width: high part of drawn bitmap width, in pixels. Range 0-3
 //|         :param int height: high part of drawn bitmap height, in pixels. Range 0-3"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmapsizeh(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t width = mp_obj_get_int_truncated(a0);
@@ -215,7 +203,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmapsizeh_obj, _bitmapsizeh);
 //|         :param int width: drawn bitmap width, in pixels. Range 0-511
 //|         :param int height: drawn bitmap height, in pixels. Range 0-511"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) {
     uint32_t filter = mp_obj_get_int_truncated(args[1]);
@@ -233,7 +220,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize);
 //|
 //|         :param int addr: Bitmap start address, pixel-aligned. May be in SRAM or flash. Range 0-16777215"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) {
     uint32_t addr = mp_obj_get_int_truncated(a0);
@@ -250,7 +236,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapsource_obj, _bitmapsource);
 //|         :param int b: blue component source channel. Range 0-7
 //|         :param int a: alpha component source channel. Range 0-7"""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) {
     uint32_t r = mp_obj_get_int_truncated(args[1]);
@@ -272,7 +257,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizz
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t p = mp_obj_get_int_truncated(a0);
@@ -292,7 +276,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t p = mp_obj_get_int_truncated(a0);
@@ -309,7 +292,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) {
     uint32_t v = mp_obj_get_int_truncated(a0);
@@ -328,7 +310,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t p = mp_obj_get_int_truncated(a0);
@@ -348,7 +329,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t p = mp_obj_get_int_truncated(a0);
@@ -365,7 +345,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) {
     uint32_t v = mp_obj_get_int_truncated(a0);
@@ -382,7 +361,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t src = mp_obj_get_int_truncated(a0);
@@ -397,7 +375,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(blendfunc_obj, _blendfunc);
 //|
 //|         :param int dest: display list address. Range 0-65535"""
 //|         ...
-//|
 
 STATIC mp_obj_t _call(mp_obj_t self, mp_obj_t a0) {
     uint32_t dest = mp_obj_get_int_truncated(a0);
@@ -413,7 +390,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) {
     uint32_t cell = mp_obj_get_int_truncated(a0);
@@ -429,7 +405,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) {
     uint32_t alpha = mp_obj_get_int_truncated(a0);
@@ -447,7 +422,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) {
     uint32_t red = mp_obj_get_int_truncated(args[1]);
@@ -465,7 +439,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clearcolorrgb_obj, 4, 4, _clearcolorr
 //|         :param int s: clear stencil buffer. Range 0-1
 //|         :param int t: clear tag buffer. Range 0-1"""
 //|         ...
-//|
 
 STATIC mp_obj_t _clear(size_t n_args, const mp_obj_t *args) {
     uint32_t c = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 1;
@@ -483,7 +456,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) {
     uint32_t s = mp_obj_get_int_truncated(a0);
@@ -498,7 +470,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil);
 //|         :param int s: value used when the tag buffer is cleared. Range 0-255. The initial value is 0
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
-//|
 
 STATIC mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) {
     uint32_t s = mp_obj_get_int_truncated(a0);
@@ -514,7 +485,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) {
     uint32_t alpha = mp_obj_get_int_truncated(a0);
@@ -533,7 +503,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) {
     uint32_t r = mp_obj_get_int_truncated(args[1]);
@@ -554,7 +523,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) {
     uint32_t red = mp_obj_get_int_truncated(args[1]);
@@ -581,7 +549,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display);
 //|
 //|         :meth:`Vertex2ii` and :meth:`Vertex2f` calls are ignored until the next :meth:`Begin`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _end(mp_obj_t self) {
 
@@ -595,7 +562,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(end_obj, _end);
 //|
 //|         :param int dest: display list address. Range 0-65535"""
 //|         ...
-//|
 
 STATIC mp_obj_t _jump(mp_obj_t self, mp_obj_t a0) {
     uint32_t dest = mp_obj_get_int_truncated(a0);
@@ -609,7 +575,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(jump_obj, _jump);
 //|
 //|         :param int m: macro register to read. Range 0-1"""
 //|         ...
-//|
 
 STATIC mp_obj_t _macro(mp_obj_t self, mp_obj_t a0) {
     uint32_t m = mp_obj_get_int_truncated(a0);
@@ -621,7 +586,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(macro_obj, _macro);
 //|     def Nop(self) -> None:
 //|         """No operation"""
 //|         ...
-//|
 
 STATIC mp_obj_t _nop(mp_obj_t self) {
 
@@ -637,7 +601,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) {
     uint32_t addr = mp_obj_get_int_truncated(a0);
@@ -649,7 +612,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(palettesource_obj, _palettesource);
 //|     def RestoreContext(self) -> None:
 //|         """Restore the current graphics context from the context stack"""
 //|         ...
-//|
 
 STATIC mp_obj_t _restorecontext(mp_obj_t self) {
 
@@ -661,7 +623,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(restorecontext_obj, _restorecontext);
 //|     def Return(self) -> None:
 //|         """Return from a previous call command"""
 //|         ...
-//|
 
 STATIC mp_obj_t _return(mp_obj_t self) {
 
@@ -673,7 +634,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(return_obj, _return);
 //|     def SaveContext(self) -> None:
 //|         """Push the current graphics context on the context stack"""
 //|         ...
-//|
 
 STATIC mp_obj_t _savecontext(mp_obj_t self) {
 
@@ -690,7 +650,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t width = mp_obj_get_int_truncated(a0);
@@ -708,7 +667,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t x = mp_obj_get_int_truncated(a0);
@@ -727,7 +685,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) {
     uint32_t func = mp_obj_get_int_truncated(args[1]);
@@ -745,7 +702,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) {
     uint32_t mask = mp_obj_get_int_truncated(a0);
@@ -762,7 +718,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask);
 //|
 //|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     uint32_t sfail = mp_obj_get_int_truncated(a0);
@@ -779,7 +734,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) {
     uint32_t mask = mp_obj_get_int_truncated(a0);
@@ -795,7 +749,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) {
     uint32_t s = mp_obj_get_int_truncated(a0);
@@ -819,7 +772,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertexformat_obj, _vertexformat);
 //|
 //|         This method is an alternative to :meth:`Vertex2f`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _vertex2ii(size_t n_args, const mp_obj_t *args) {
     uint32_t x = mp_obj_get_int_truncated(args[1]);
@@ -892,7 +844,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii);
 //|         :param float x: pixel x-coordinate
 //|         :param float y: pixel y-coordinate"""
 //|         ...
-//|
 STATIC mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     mp_float_t x = mp_obj_get_float(a0);
     mp_float_t y = mp_obj_get_float(a1);
@@ -908,7 +859,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) {
     mp_float_t width = mp_obj_get_float(a0);
@@ -924,7 +874,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) {
     mp_float_t size = mp_obj_get_float(a0);
@@ -940,7 +889,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 STATIC mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) {
     mp_float_t x = mp_obj_get_float(a0);
@@ -956,7 +904,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 
 STATIC mp_obj_t _vertextranslatey(mp_obj_t self, mp_obj_t a0) {
@@ -973,7 +920,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey);
 //|
 //|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|         ...
-//|
 
 // }
 
@@ -989,7 +935,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey);
 //|         This method is used by the ``eve`` module to efficiently add
 //|         commands to the FIFO."""
 //|         ...
-//|
 
 STATIC mp_obj_t _cmd0(mp_obj_t self, mp_obj_t n) {
     uint32_t code = 0xffffff00 | mp_obj_get_int_truncated(n);
@@ -1011,7 +956,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0);
 //|         This method is used by the ``eve`` module to efficiently add
 //|         commands to the FIFO."""
 //|         ...
-//|
 STATIC mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) {
     mp_obj_t self = args[0];
     mp_obj_t num = args[1];
diff --git a/shared-bindings/_pew/PewPew.c b/shared-bindings/_pew/PewPew.c
index 1a4356c719..8593679973 100644
--- a/shared-bindings/_pew/PewPew.c
+++ b/shared-bindings/_pew/PewPew.c
@@ -61,7 +61,6 @@
 //|         is connected to the common side of all buttons (the other sides of the
 //|         buttons are connected to rows of the matrix)."""
 //|         ...
-//|
 STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer, ARG_rows, ARG_cols, ARG_buttons };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/_pew/__init__.c b/shared-bindings/_pew/__init__.c
index e338869d18..13b9715bbd 100644
--- a/shared-bindings/_pew/__init__.c
+++ b/shared-bindings/_pew/__init__.c
@@ -49,7 +49,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_ticks_obj, get_ticks);
 
 
 //| """LED matrix driver"""
-//|
 STATIC const mp_rom_map_elem_t pew_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pew) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PewPew),  MP_ROM_PTR(&pewpew_type)},
diff --git a/shared-bindings/_stage/Layer.c b/shared-bindings/_stage/Layer.c
index 9e64a252db..d81075b704 100644
--- a/shared-bindings/_stage/Layer.c
+++ b/shared-bindings/_stage/Layer.c
@@ -33,7 +33,14 @@
 //| class Layer:
 //|     """Keep information about a single layer of graphics"""
 //|
-//|     def __init__(self, width: int, height: int, graphic: ReadableBuffer, palette: ReadableBuffer, grid: ReadableBuffer) -> None:
+//|     def __init__(
+//|         self,
+//|         width: int,
+//|         height: int,
+//|         graphic: ReadableBuffer,
+//|         palette: ReadableBuffer,
+//|         grid: ReadableBuffer,
+//|     ) -> None:
 //|         """Keep internal information about a layer of graphics (either a
 //|         ``Grid`` or a ``Sprite``) in a format suitable for fast rendering
 //|         with the ``render()`` function.
@@ -47,7 +54,6 @@
 //|         This class is intended for internal use in the ``stage`` library and
 //|         it shouldn't be used on its own."""
 //|         ...
-//|
 STATIC mp_obj_t layer_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, 4, 5, false);
@@ -91,7 +97,6 @@ STATIC mp_obj_t layer_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def move(self, x: int, y: int) -> None:
 //|         """Set the offset of the layer to the specified values."""
 //|         ...
-//|
 STATIC mp_obj_t layer_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     layer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     self->x = mp_obj_get_int(x_in);
@@ -104,7 +109,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(layer_move_obj, layer_move);
 //|         """Set the animation frame of the sprite, and optionally rotation its
 //|         graphic."""
 //|         ...
-//|
 STATIC mp_obj_t layer_frame(mp_obj_t self_in, mp_obj_t frame_in,
     mp_obj_t rotation_in) {
     layer_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/_stage/Text.c b/shared-bindings/_stage/Text.c
index 48747bfd67..4e9ce4e58b 100644
--- a/shared-bindings/_stage/Text.c
+++ b/shared-bindings/_stage/Text.c
@@ -33,7 +33,14 @@
 //| class Text:
 //|     """Keep information about a single grid of text"""
 //|
-//|     def __init__(self, width: int, height: int, font: ReadableBuffer, palette: ReadableBuffer, chars: ReadableBuffer) -> None:
+//|     def __init__(
+//|         self,
+//|         width: int,
+//|         height: int,
+//|         font: ReadableBuffer,
+//|         palette: ReadableBuffer,
+//|         chars: ReadableBuffer,
+//|     ) -> None:
 //|         """Keep internal information about a grid of text
 //|         in a format suitable for fast rendering
 //|         with the ``render()`` function.
@@ -47,7 +54,6 @@
 //|         This class is intended for internal use in the ``stage`` library and
 //|         it shouldn't be used on its own."""
 //|         ...
-//|
 STATIC mp_obj_t text_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, 5, 5, false);
@@ -85,7 +91,6 @@ STATIC mp_obj_t text_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def move(self, x: int, y: int) -> None:
 //|         """Set the offset of the text to the specified values."""
 //|         ...
-//|
 STATIC mp_obj_t text_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     text_obj_t *self = MP_OBJ_TO_PTR(self_in);
     self->x = mp_obj_get_int(x_in);
diff --git a/shared-bindings/_stage/__init__.c b/shared-bindings/_stage/__init__.c
index ebaa06898e..275eabd5a1 100644
--- a/shared-bindings/_stage/__init__.c
+++ b/shared-bindings/_stage/__init__.c
@@ -39,7 +39,17 @@
 //| The `_stage` module contains native code to speed-up the ```stage`` Library
 //| `_."""
 //|
-//| def render(x0: int, y0: int, x1: int, y1: int, layers: List[Layer], buffer: WriteableBuffer, display: displayio.Display, scale: int, background: int) -> None:
+//| def render(
+//|     x0: int,
+//|     y0: int,
+//|     x1: int,
+//|     y1: int,
+//|     layers: List[Layer],
+//|     buffer: WriteableBuffer,
+//|     display: displayio.Display,
+//|     scale: int,
+//|     background: int,
+//| ) -> None:
 //|     """Render and send to the display a fragment of the screen.
 //|
 //|     :param int x0: Left edge of the fragment.
@@ -59,7 +69,6 @@
 //|
 //|     This function is intended for internal use in the ``stage`` library
 //|     and all the necessary checks are performed there."""
-//|
 STATIC mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) {
     uint16_t x0 = mp_obj_get_int(args[0]);
     uint16_t y0 = mp_obj_get_int(args[1]);
diff --git a/shared-bindings/adafruit_bus_device/__init__.c b/shared-bindings/adafruit_bus_device/__init__.c
index be2378b154..410c6fb2f2 100644
--- a/shared-bindings/adafruit_bus_device/__init__.c
+++ b/shared-bindings/adafruit_bus_device/__init__.c
@@ -63,7 +63,6 @@ const mp_obj_module_t adafruit_bus_device_spi_device_module = {
 //| For example, they manage locking the bus to prevent other concurrent access. For SPI
 //| devices, it manages the chip select and protocol changes such as mode. For I2C, it
 //| manages the device address."""
-//|
 STATIC const mp_rom_map_elem_t adafruit_bus_device_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_bus_device) },
     { MP_ROM_QSTR(MP_QSTR_i2c_device),   MP_ROM_PTR(&adafruit_bus_device_i2c_device_module) },
diff --git a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
index 3ae5fc2a2f..2d8df31989 100644
--- a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -64,9 +64,8 @@
 //|                 # A second transaction
 //|                 with device:
 //|                     device.write(bytes_read)
-//|     """
+//|         """
 //|     ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     adafruit_bus_device_i2cdevice_obj_t *self = m_new_obj(adafruit_bus_device_i2cdevice_obj_t);
     self->base.type = &adafruit_bus_device_i2cdevice_type;
@@ -92,7 +91,6 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type
 //|     def __enter__(self) -> I2CDevice:
 //|         """Context manager entry to lock bus."""
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___enter__(mp_obj_t self_in) {
     adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_adafruit_bus_device_i2cdevice_lock(self);
@@ -103,7 +101,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_i2cdevice___enter___obj, ad
 //|     def __exit__(self) -> None:
 //|         """Automatically unlocks the bus on exit."""
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
     common_hal_adafruit_bus_device_i2cdevice_unlock(MP_OBJ_TO_PTR(args[0]));
     return mp_const_none;
@@ -111,7 +108,9 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit___obj, 4, 4, adafruit_bus_device_i2cdevice_obj___exit__);
 
 //|     import sys
-//|     def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
+//|     def readinto(
+//|         self, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize
+//|     ) -> None:
 //|         """Read into ``buffer`` from the device.
 //|
 //|         If ``start`` or ``end`` is provided, then the buffer will be sliced
@@ -123,7 +122,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit_
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -170,7 +168,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 1,
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -205,7 +202,16 @@ MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 1, adafruit_
 
 
 //|     import sys
-//|     def write_then_readinto(self, out_buffer: ReadableBuffer, in_buffer: WriteableBuffer, *, out_start: int = 0, out_end: int = sys.maxsize, in_start: int = 0, in_end: int = sys.maxsize) -> None:
+//|     def write_then_readinto(
+//|         self,
+//|         out_buffer: ReadableBuffer,
+//|         in_buffer: WriteableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: int = sys.maxsize,
+//|         in_start: int = 0,
+//|         in_end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write the bytes from ``out_buffer`` to the device, then immediately
 //|         reads into ``in_buffer`` from the device.
 //|
@@ -225,7 +231,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 1, adafruit_
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index 2f34a60e86..7b2b283ed4 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -41,7 +41,16 @@
 //| class SPIDevice:
 //|     """SPI Device Manager"""
 //|
-//|     def __init__(self, spi: busio.SPI, chip_select: digitalio.DigitalInOut, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, extra_clocks : int = 0) -> None:
+//|     def __init__(
+//|         self,
+//|         spi: busio.SPI,
+//|         chip_select: digitalio.DigitalInOut,
+//|         *,
+//|         baudrate: int = 100000,
+//|         polarity: int = 0,
+//|         phase: int = 0,
+//|         extra_clocks: int = 0
+//|     ) -> None:
 //|
 //|         """
 //|         Represents a single SPI device and manages locking the bus and the device address.
@@ -70,7 +79,6 @@
 //|                 with device as spi:
 //|                     spi.write(bytes_read)"""
 //|     ...
-//|
 STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     adafruit_bus_device_spidevice_obj_t *self = m_new_obj(adafruit_bus_device_spidevice_obj_t);
     self->base.type = &adafruit_bus_device_spidevice_type;
@@ -108,7 +116,6 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
 //|     def __enter__(self) -> busio.SPI:
 //|         """Starts a SPI transaction by configuring the SPI and asserting chip select."""
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_spidevice_obj___enter__(mp_obj_t self_in) {
     adafruit_bus_device_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_adafruit_bus_device_spidevice_enter(self);
@@ -120,7 +127,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, ad
 //|         """Ends a SPI transaction by deasserting chip select. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t adafruit_bus_device_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
     common_hal_adafruit_bus_device_spidevice_exit(MP_OBJ_TO_PTR(args[0]));
     return mp_const_none;
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index 8f1ea4eac2..967fb79355 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -53,7 +53,16 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t
 //| class PixelBuf:
 //|     """A fast RGB[W] pixel buffer for LED and similar devices."""
 //|
-//|     def __init__(self, size: int, *, byteorder: str = "BGR", brightness: float = 0, auto_write: bool = False, header: ReadableBuffer = b"", trailer: ReadableBuffer = b"") -> None:
+//|     def __init__(
+//|         self,
+//|         size: int,
+//|         *,
+//|         byteorder: str = "BGR",
+//|         brightness: float = 0,
+//|         auto_write: bool = False,
+//|         header: ReadableBuffer = b"",
+//|         trailer: ReadableBuffer = b""
+//|     ) -> None:
 //|         """Create a PixelBuf object of the specified size, byteorder, and bits per pixel.
 //|
 //|         When brightness is less than 1.0, a second buffer will be used to store the color values
@@ -71,7 +80,6 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t
 //|         :param ~circuitpython_typing.ReadableBuffer header: Sequence of bytes to always send before pixel values.
 //|         :param ~circuitpython_typing.ReadableBuffer trailer: Sequence of bytes to always send after pixel values."""
 //|         ...
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_size, ARG_byteorder, ARG_brightness, ARG_auto_write, ARG_header, ARG_trailer };
     static const mp_arg_t allowed_args[] = {
@@ -159,7 +167,6 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t
 
 //|     bpp: int
 //|     """The number of bytes per pixel in the buffer (read-only)"""
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_adafruit_pixelbuf_pixelbuf_get_bpp(self_in));
 }
@@ -174,7 +181,6 @@ MP_PROPERTY_GETTER(pixelbuf_pixelbuf_bpp_obj,
 //|
 //|     When brightness is less than 1.0, a second buffer will be used to store the color values
 //|     before they are adjusted for brightness."""
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_brightness(mp_obj_t self_in) {
     return mp_obj_new_float(common_hal_adafruit_pixelbuf_pixelbuf_get_brightness(self_in));
 }
@@ -199,7 +205,6 @@ MP_PROPERTY_GETSET(pixelbuf_pixelbuf_brightness_obj,
 
 //|     auto_write: bool
 //|     """Whether to automatically write the pixels after each update."""
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_auto_write(mp_obj_t self_in) {
     return mp_obj_new_bool(common_hal_adafruit_pixelbuf_pixelbuf_get_auto_write(self_in));
 }
@@ -218,7 +223,6 @@ MP_PROPERTY_GETSET(pixelbuf_pixelbuf_auto_write_obj,
 
 //|     byteorder: str
 //|     """byteorder string for the buffer (read-only)"""
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) {
     return common_hal_adafruit_pixelbuf_pixelbuf_get_byteorder_string(self_in);
 }
@@ -242,7 +246,6 @@ STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|         """Transmits the color data to the pixels so that they are shown. This is done automatically
 //|         when `auto_write` is True."""
 //|         ...
-//|
 
 STATIC mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) {
     common_hal_adafruit_pixelbuf_pixelbuf_show(self_in);
@@ -250,10 +253,11 @@ STATIC mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_show_obj, pixelbuf_pixelbuf_show);
 
-//|     def fill(self, color: Union[int, Tuple[int, int, int], Tuple[int, int, int, float]]) -> None:
+//|     def fill(
+//|         self, color: Union[int, Tuple[int, int, int], Tuple[int, int, int, float]]
+//|     ) -> None:
 //|         """Fills the given pixelbuf with the given color."""
 //|         ...
-//|
 
 STATIC mp_obj_t pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t value) {
     common_hal_adafruit_pixelbuf_pixelbuf_fill(self_in, value);
@@ -263,27 +267,35 @@ STATIC mp_obj_t pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t value) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_fill);
 
 //|     @overload
-//|     def __getitem__(self, index: slice) -> Union[Tuple[Tuple[int, int, int], ...], Tuple[Tuple[int, int, int, float], ...]]: ...
+//|     def __getitem__(
+//|         self, index: slice
+//|     ) -> Union[Tuple[Tuple[int, int, int], ...], Tuple[Tuple[int, int, int, float], ...]]: ...
 //|     @overload
-//|     def __getitem__(self, index: int) -> Union[Tuple[int, int, int], Tuple[int, int, int, float]]:
+//|     def __getitem__(
+//|         self, index: int
+//|     ) -> Union[Tuple[int, int, int], Tuple[int, int, int, float]]:
 //|         """Returns the pixel value at the given index as a tuple of (Red, Green, Blue[, White]) values
 //|         between 0 and 255.  When in PWM (DotStar) mode, the 4th tuple value is a float of the pixel
 //|         intensity from 0-1.0."""
 //|         ...
-//|
 //|     @overload
-//|     def __setitem__(self, index: slice, value: Tuple[Union[int, Tuple[float, ...], List[float]], ...]) -> None: ...
+//|     def __setitem__(
+//|         self, index: slice, value: Tuple[Union[int, Tuple[float, ...], List[float]], ...]
+//|     ) -> None: ...
 //|     @overload
-//|     def __setitem__(self, index: slice, value: List[Union[int, Tuple[float, ...], List[float]]]) -> None: ...
+//|     def __setitem__(
+//|         self, index: slice, value: List[Union[int, Tuple[float, ...], List[float]]]
+//|     ) -> None: ...
 //|     @overload
-//|     def __setitem__(self, index: int, value: Union[int, Tuple[float, ...], List[float]]) -> None:
+//|     def __setitem__(
+//|         self, index: int, value: Union[int, Tuple[float, ...], List[float]]
+//|     ) -> None:
 //|         """Sets the pixel value at the given index.  Value can either be a tuple or integer.  Tuples are
 //|         The individual (Red, Green, Blue[, White]) values between 0 and 255.  If given an integer, the
 //|         red, green and blue values are packed into the lower three bytes (0xRRGGBB).
 //|         For RGBW byteorders, if given only RGB values either as an int or as a tuple, the white value
 //|         is used instead when the red, green, and blue values are the same."""
 //|         ...
-//|
 STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 27d52d8566..991eb69f37 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -16,29 +16,34 @@
 //| class AES:
 //|     """Encrypt and decrypt AES streams"""
 //|
-//|     def __init__(self, key: ReadableBuffer, mode: int = 0, iv: Optional[ReadableBuffer] = None, segment_size: int = 8) -> None:
+//|     def __init__(
+//|         self,
+//|         key: ReadableBuffer,
+//|         mode: int = 0,
+//|         iv: Optional[ReadableBuffer] = None,
+//|         segment_size: int = 8,
+//|     ) -> None:
 //|         """Create a new AES state with the given key.
 //|
-//|            :param ~circuitpython_typing.ReadableBuffer key: A 16-, 24-, or 32-byte key
-//|            :param int mode: AES mode to use.  One of: `MODE_ECB`, `MODE_CBC`, or
-//|                             `MODE_CTR`
-//|            :param ~circuitpython_typing.ReadableBuffer iv: Initialization vector to use for CBC or CTR mode
+//|         :param ~circuitpython_typing.ReadableBuffer key: A 16-, 24-, or 32-byte key
+//|         :param int mode: AES mode to use.  One of: `MODE_ECB`, `MODE_CBC`, or
+//|                          `MODE_CTR`
+//|         :param ~circuitpython_typing.ReadableBuffer iv: Initialization vector to use for CBC or CTR mode
 //|
-//|            Additional arguments are supported for legacy reasons.
+//|         Additional arguments are supported for legacy reasons.
 //|
-//|            Encrypting a string::
+//|         Encrypting a string::
 //|
-//|              import aesio
-//|              from binascii import hexlify
+//|           import aesio
+//|           from binascii import hexlify
 //|
-//|              key = b'Sixteen byte key'
-//|              inp = b'CircuitPython!!!' # Note: 16-bytes long
-//|              outp = bytearray(len(inp))
-//|              cipher = aesio.AES(key, aesio.MODE_ECB)
-//|              cipher.encrypt_into(inp, outp)
-//|              hexlify(outp)"""
+//|           key = b'Sixteen byte key'
+//|           inp = b'CircuitPython!!!' # Note: 16-bytes long
+//|           outp = bytearray(len(inp))
+//|           cipher = aesio.AES(key, aesio.MODE_ECB)
+//|           cipher.encrypt_into(inp, outp)
+//|           hexlify(outp)"""
 //|         ...
-//|
 
 STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     size_t n_kw, const mp_obj_t *all_args) {
@@ -155,11 +160,10 @@ STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length,
 //|     def encrypt_into(self, src: ReadableBuffer, dest: WriteableBuffer) -> None:
 //|         """Encrypt the buffer from ``src`` into ``dest``.
 //|
-//|            For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
-//|            buffers must be a multiple of 16 bytes, and must be equal length.  For
-//|            CTX mode, there are no restrictions."""
+//|         For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
+//|         buffers must be a multiple of 16 bytes, and must be equal length.  For
+//|         CTX mode, there are no restrictions."""
 //|         ...
-//|
 STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
     mp_obj_t dest) {
     if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
@@ -185,11 +189,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj,
 
 //|     def decrypt_into(self, src: ReadableBuffer, dest: WriteableBuffer) -> None:
 //|         """Decrypt the buffer from ``src`` into ``dest``.
-//|            For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
-//|            buffers must be a multiple of 16 bytes, and must be equal length.  For
-//|            CTX mode, there are no restrictions."""
+//|         For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
+//|         buffers must be a multiple of 16 bytes, and must be equal length.  For
+//|         CTX mode, there are no restrictions."""
 //|         ...
-//|
 STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
     mp_obj_t dest) {
     if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c
index b4e68c964c..7010e4601e 100644
--- a/shared-bindings/alarm/SleepMemory.c
+++ b/shared-bindings/alarm/SleepMemory.c
@@ -52,17 +52,14 @@
 //|     def __init__(self) -> None:
 //|         """Not used. Access the sole instance through `alarm.sleep_memory`."""
 //|         ...
-//|
 //|     def __bool__(self) -> bool:
 //|         """``sleep_memory`` is ``True`` if its length is greater than zero.
 //|         This is an easy way to check for its existence.
 //|         """
 //|         ...
-//|
 //|     def __len__(self) -> int:
 //|         """Return the length. This is used by (`len`)"""
 //|         ...
-//|
 STATIC mp_obj_t alarm_sleep_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     alarm_sleep_memory_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint16_t len = common_hal_alarm_sleep_memory_get_length(self);
@@ -87,14 +84,12 @@ STATIC MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_l
 //|     def __getitem__(self, index: int) -> int:
 //|         """Returns the value at the given index."""
 //|         ...
-//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
 //|     def __setitem__(self, index: int, value: int) -> None:
 //|         """Set the value at the given index."""
 //|         ...
-//|
 STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 3b81dd479f..9b992f7432 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -64,13 +64,11 @@
 //| sleep_memory: SleepMemory
 //| """Memory that persists during deep sleep.
 //| This object is the sole instance of `alarm.SleepMemory`."""
-//|
 
 //| wake_alarm: Optional[circuitpython_typing.Alarm]
 //| """The most recently triggered alarm. If CircuitPython was sleeping, the alarm that woke it from sleep.
 //| If no alarm occured since the last hard reset or soft restart, value is ``None``.
 //| """
-//|
 
 // wake_alarm is implemented as a dictionary entry, so there's no code here.
 
@@ -85,7 +83,9 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
     }
 }
 
-//| def light_sleep_until_alarms(*alarms: circuitpython_typing.Alarm) -> circuitpython_typing.Alarm:
+//| def light_sleep_until_alarms(
+//|     *alarms: circuitpython_typing.Alarm,
+//| ) -> circuitpython_typing.Alarm:
 //|     """Go into a light sleep until awakened one of the alarms. The alarm causing the wake-up
 //|     is returned, and is also available as `alarm.wake_alarm`.
 //|
@@ -99,7 +99,6 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
 //|     it may be necessary to disconnect from the host.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_const_none;
@@ -113,7 +112,9 @@ STATIC mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *ar
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OBJ_FUN_ARGS_MAX, alarm_light_sleep_until_alarms);
 
-//| def exit_and_deep_sleep_until_alarms(*alarms: circuitpython_typing.Alarm, preserve_dios: Sequence[digitalio.DigitalInOut] = ()) -> None:
+//| def exit_and_deep_sleep_until_alarms(
+//|     *alarms: circuitpython_typing.Alarm, preserve_dios: Sequence[digitalio.DigitalInOut] = ()
+//| ) -> None:
 //|     """Exit the program and go into a deep sleep, until awakened by one of the alarms.
 //|     This function does not return.
 //|
@@ -171,7 +172,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|         alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm)
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_preserve_dios };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c
index 06ad77c56d..fb2cf05cf9 100644
--- a/shared-bindings/alarm/pin/PinAlarm.c
+++ b/shared-bindings/alarm/pin/PinAlarm.c
@@ -38,7 +38,9 @@
 //| class PinAlarm:
 //|     """Trigger an alarm when a pin changes state."""
 //|
-//|     def __init__(self, pin: microcontroller.Pin, value: bool, edge: bool = False, pull: bool = False) -> None:
+//|     def __init__(
+//|         self, pin: microcontroller.Pin, value: bool, edge: bool = False, pull: bool = False
+//|     ) -> None:
 //|         """Create an alarm triggered by a `microcontroller.Pin` level. The alarm is not active
 //|         until it is passed to an `alarm`-enabling function, such as `alarm.light_sleep_until_alarms()` or
 //|         `alarm.exit_and_deep_sleep_until_alarms()`.
@@ -59,7 +61,6 @@
 //|           pulls it high.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     alarm_pin_pinalarm_obj_t *self = m_new_obj(alarm_pin_pinalarm_obj_t);
     self->base.type = &alarm_pin_pinalarm_type;
@@ -86,7 +87,6 @@ STATIC mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t
 
 //|     pin: microcontroller.Pin
 //|     """The trigger pin."""
-//|
 STATIC mp_obj_t alarm_pin_pinalarm_obj_get_pin(mp_obj_t self_in) {
     alarm_pin_pinalarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const mcu_pin_obj_t *pin = common_hal_alarm_pin_pinalarm_get_pin(self);
@@ -102,7 +102,6 @@ MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj,
 
 //|     value: bool
 //|     """The value on which to trigger."""
-//|
 STATIC mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) {
     alarm_pin_pinalarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_alarm_pin_pinalarm_get_value(self));
diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c
index 0b77913c9b..71b6354e34 100644
--- a/shared-bindings/alarm/time/TimeAlarm.c
+++ b/shared-bindings/alarm/time/TimeAlarm.c
@@ -44,7 +44,9 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //| class TimeAlarm:
 //|     """Trigger an alarm when the specified time is reached."""
 //|
-//|     def __init__(self, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None) -> None:
+//|     def __init__(
+//|         self, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None
+//|     ) -> None:
 //|         """Create an alarm that will be triggered when `time.monotonic()` would equal
 //|         ``monotonic_time``, or when `time.time()` would equal ``epoch_time``.
 //|         Only one of the two arguments can be given.
@@ -56,7 +58,6 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //|         immediately.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     alarm_time_timealarm_obj_t *self = m_new_obj(alarm_time_timealarm_obj_t);
@@ -116,7 +117,6 @@ STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type,
 //|        The time may be given as ``epoch_time`` in the constructor, but it is returned
 //|        by this property only as a `time.monotonic()` time.
 //|        """
-//|
 STATIC mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) {
     alarm_time_timealarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_alarm_time_timealarm_get_monotonic_time(self));
diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c
index ce5074f7c0..d9c0fe3060 100644
--- a/shared-bindings/alarm/touch/TouchAlarm.c
+++ b/shared-bindings/alarm/touch/TouchAlarm.c
@@ -41,7 +41,6 @@
 //|           may be limited due to hardware restrictions, particularly for deep-sleep alarms.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     alarm_touch_touchalarm_obj_t *self = m_new_obj(alarm_touch_touchalarm_obj_t);
@@ -64,7 +63,6 @@ STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type,
 
 //|     pin: microcontroller.Pin
 //|     """The trigger pin."""
-//|
 STATIC mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) {
     alarm_touch_touchalarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(self->pin);
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 12a8d90e61..1baee1a644 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -58,9 +58,10 @@
 //|         (TODO) The reference voltage varies by platform so use
 //|         ``reference_voltage`` to read the configured setting.
 //|         (TODO) Provide mechanism to read CPU Temperature."""
-//|
 
-//|     def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
+//|     def __init__(
+//|         self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000
+//|     ) -> None:
 //|         """Create a `BufferedIn` on the given pin. ADC values will be read
 //|            into the given buffer at the supplied sample_rate. Depending on the
 //|            buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
@@ -72,7 +73,6 @@
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
 //|         :param ~int sample_rate: rate: sampling frequency, in samples per second"""
 //|         ...
-//|
 STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_buffer, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
@@ -124,7 +124,6 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
 //|     def deinit(self) -> None:
 //|         """Shut down the `BufferedIn` and release the pin for other use."""
 //|         ...
-//|
 STATIC mp_obj_t analogbufio_bufferedin_deinit(mp_obj_t self_in) {
     analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_analogbufio_bufferedin_deinit(self);
@@ -140,14 +139,12 @@ STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) {
 //|     def __enter__(self) -> BufferedIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_analogbufio_bufferedin_deinit(args[0]);
@@ -158,7 +155,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj,
 //|     def read(self) -> None:
 //|         """Fills the provided buffer with ADC voltage values."""
 //|         ...
-//|
 STATIC mp_obj_t analogbufio_bufferedin_obj_read(mp_obj_t self_in) {
     analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/analogbufio/__init__.c b/shared-bindings/analogbufio/__init__.c
index b47fe4b897..49463d6334 100644
--- a/shared-bindings/analogbufio/__init__.c
+++ b/shared-bindings/analogbufio/__init__.c
@@ -62,7 +62,6 @@
 //| TODO: For more information on using `analogbufio`, see `this additional Learn guide
 //| `_
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t analogbufio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogbufio) },
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index f2c888f727..e5b408c0db 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -46,7 +46,6 @@
 //|
 //|        adc = analogio.AnalogIn(A1)
 //|        val = adc.value"""
-//|
 
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Use the AnalogIn on the given pin. The reference voltage varies by
@@ -54,7 +53,6 @@
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from"""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type,
     mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check number of arguments
@@ -73,7 +71,6 @@ STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type,
 //|     def deinit(self) -> None:
 //|         """Turn off the AnalogIn and release the pin for other use."""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogin_deinit(mp_obj_t self_in) {
     analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_analogio_analogin_deinit(self);
@@ -89,14 +86,12 @@ STATIC void check_for_deinit(analogio_analogin_obj_t *self) {
 //|     def __enter__(self) -> AnalogIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogin___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_analogio_analogin_deinit(args[0]);
@@ -109,7 +104,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogin___exit___obj, 4, 4,
 //|
 //|     Even if the underlying analog to digital converter (ADC) is lower
 //|     resolution, the value is 16-bit."""
-//|
 STATIC mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) {
     analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -124,7 +118,6 @@ MP_PROPERTY_GETTER(analogio_analogin_value_obj,
 //|     """The maximum voltage measurable (also known as the reference voltage) as a
 //|     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
 //|     at ends of the analog range."""
-//|
 STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) {
     analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index 41c9b053eb..79f5dac55f 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -52,7 +52,6 @@
 //|
 //|         :param ~microcontroller.Pin pin: the pin to output to"""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
@@ -69,7 +68,6 @@ STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t
 //|     def deinit(self) -> None:
 //|         """Turn off the AnalogOut and release the pin for other use."""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogout_deinit(mp_obj_t self_in) {
     analogio_analogout_obj_t *self = self_in;
 
@@ -82,14 +80,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogout_deinit_obj, analogio_analogo
 //|     def __enter__(self) -> AnalogOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t analogio_analogout___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_analogio_analogout_deinit(args[0]);
@@ -102,7 +98,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4
 //|
 //|     Even if the underlying digital to analog converter (DAC) is lower
 //|     resolution, the value is 16-bit."""
-//|
 STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t value) {
     analogio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_analogio_analogout_deinited(self)) {
diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index eb956d0eb7..2e7ccf7115 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -65,7 +65,6 @@
 //| For more information on using `analogio`, see `this additional Learn guide
 //| `_
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogio) },
diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c
index dd27adaa98..3536212c5e 100644
--- a/shared-bindings/atexit/__init__.c
+++ b/shared-bindings/atexit/__init__.c
@@ -37,26 +37,26 @@
 //| |see_cpython_module| :mod:`cpython:atexit`.
 //| """
 //| ...
-//|
 
-//| def register(func: Callable[..., Any], *args: Optional[Any], **kwargs: Optional[Any]) -> Callable[..., Any]:
+//| def register(
+//|     func: Callable[..., Any], *args: Optional[Any], **kwargs: Optional[Any]
+//| ) -> Callable[..., Any]:
 //|
 //|     """Register func as a function to be executed at termination.
 //|
-//|        Any optional arguments that are to be passed to func must be passed as arguments to `register()`.
-//|        It is possible to register the same function and arguments more than once.
+//|     Any optional arguments that are to be passed to func must be passed as arguments to `register()`.
+//|     It is possible to register the same function and arguments more than once.
 //|
-//|        At normal program termination (for instance, if `sys.exit()` is called or the vm execution completes),
-//|        all functions registered are called in last in, first out order.
+//|     At normal program termination (for instance, if `sys.exit()` is called or the vm execution completes),
+//|     all functions registered are called in last in, first out order.
 //|
-//|        If an exception is raised during execution of the exit handler,
-//|        a traceback is printed (unless `SystemExit` is raised) and the execution stops.
+//|     If an exception is raised during execution of the exit handler,
+//|     a traceback is printed (unless `SystemExit` is raised) and the execution stops.
 //|
-//|        This function returns func, which makes it possible to use it as a decorator.
+//|     This function returns func, which makes it possible to use it as a decorator.
 //|
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t atexit_register(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     shared_module_atexit_register(pos_args[0], (n_args - 1), ((n_args > 1) ? &pos_args[1] : NULL), kw_args);
     return pos_args[0];
@@ -67,12 +67,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register);
 //|
 //|     """Remove func from the list of functions to be run at termination.
 //|
-//|        `unregister()` silently does nothing if func was not previously registered. If func has been registered more than once,
-//|        every occurrence of that function in the atexit call stack will be removed.
+//|     `unregister()` silently does nothing if func was not previously registered. If func has been registered more than once,
+//|     every occurrence of that function in the atexit call stack will be removed.
 //|
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t atexit_unregister(const mp_obj_t self_in) {
     shared_module_atexit_unregister(&self_in);
     return mp_const_none;
diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index 7c660abc4a..7eb928279c 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -38,7 +38,14 @@
 //| class I2SOut:
 //|     """Output an I2S audio signal"""
 //|
-//|     def __init__(self, bit_clock: microcontroller.Pin, word_select: microcontroller.Pin, data: microcontroller.Pin, *, left_justified: bool) -> None:
+//|     def __init__(
+//|         self,
+//|         bit_clock: microcontroller.Pin,
+//|         word_select: microcontroller.Pin,
+//|         data: microcontroller.Pin,
+//|         *,
+//|         left_justified: bool
+//|     ) -> None:
 //|         """Create a I2SOut object associated with the given pins.
 //|
 //|         :param ~microcontroller.Pin bit_clock: The bit clock (or serial clock) pin
@@ -88,7 +95,6 @@
 //|             pass
 //|           print("stopped")"""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_I2SOUT
     mp_raise_NotImplementedError(translate("I2SOut not available"));
@@ -121,7 +127,6 @@ STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_a
 //|     def deinit(self) -> None:
 //|         """Deinitialises the I2SOut and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_deinit(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audiobusio_i2sout_deinit(self);
@@ -138,14 +143,12 @@ STATIC void check_for_deinit(audiobusio_i2sout_obj_t *self) {
 //|     def __enter__(self) -> I2SOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audiobusio_i2sout_deinit(args[0]);
@@ -162,7 +165,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_i2sout___exit___obj, 4, 4,
 //|
 //|         The sample itself should consist of 8 bit or 16 bit samples."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_loop };
     static const mp_arg_t allowed_args[] = {
@@ -184,7 +186,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiobusio_i2sout_play_obj, 1, audiobusio_i2sout_obj_
 //|     def stop(self) -> None:
 //|         """Stops playback."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_stop(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -195,7 +196,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_stop_obj, audiobusio_i2sout_obj_stop
 
 //|     playing: bool
 //|     """True when the audio sample is being output. (read-only)"""
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -209,7 +209,6 @@ MP_PROPERTY_GETTER(audiobusio_i2sout_playing_obj,
 //|     def pause(self) -> None:
 //|         """Stops playback temporarily while remembering the position. Use `resume` to resume playback."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_pause(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -225,7 +224,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_pause_obj, audiobusio_i2sout_obj_pau
 //|     def resume(self) -> None:
 //|         """Resumes sample playback after :py:func:`pause`."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -240,7 +238,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_re
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
-//|
 STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index 9df78ea449..d2a176a41a 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -39,7 +39,17 @@
 //| class PDMIn:
 //|     """Record an input PDM audio stream"""
 //|
-//|     def __init__(self, clock_pin: microcontroller.Pin, data_pin: microcontroller.Pin, *, sample_rate: int = 16000, bit_depth: int = 8, mono: bool = True, oversample: int = 64, startup_delay: float = 0.11) -> None:
+//|     def __init__(
+//|         self,
+//|         clock_pin: microcontroller.Pin,
+//|         data_pin: microcontroller.Pin,
+//|         *,
+//|         sample_rate: int = 16000,
+//|         bit_depth: int = 8,
+//|         mono: bool = True,
+//|         oversample: int = 64,
+//|         startup_delay: float = 0.11
+//|     ) -> None:
 //|         """Create a PDMIn object associated with the given pins. This allows you to
 //|         record audio signals from the given pins. Individual ports may put further
 //|         restrictions on the recording parameters. The overall sample rate is
@@ -56,33 +66,31 @@
 //|         :param float startup_delay: seconds to wait after starting microphone clock
 //|          to allow microphone to turn on. Most require only 0.01s; some require 0.1s. Longer is safer.
 //|          Must be in range 0.0-1.0 seconds."""
-//|
 
-//|         """Record 8-bit unsigned samples to buffer::
+//|     """Record 8-bit unsigned samples to buffer::
 //|
-//|           import audiobusio
-//|           import board
+//|       import audiobusio
+//|       import board
 //|
-//|           # Prep a buffer to record into
-//|           b = bytearray(200)
-//|           with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000) as mic:
-//|               mic.record(b, len(b))
+//|       # Prep a buffer to record into
+//|       b = bytearray(200)
+//|       with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000) as mic:
+//|           mic.record(b, len(b))
 //|
-//|         Record 16-bit unsigned samples to buffer::
+//|     Record 16-bit unsigned samples to buffer::
 //|
-//|           import audiobusio
-//|           import board
-//|
-//|           # Prep a buffer to record into. The array interface doesn't allow for
-//|           # constructing with a set size so we append to it until we have the size
-//|           # we want.
-//|           b = array.array("H")
-//|           for i in range(200):
-//|               b.append(0)
-//|           with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000, bit_depth=16) as mic:
-//|               mic.record(b, len(b))"""
-//|         ...
+//|       import audiobusio
+//|       import board
 //|
+//|       # Prep a buffer to record into. The array interface doesn't allow for
+//|       # constructing with a set size so we append to it until we have the size
+//|       # we want.
+//|       b = array.array("H")
+//|       for i in range(200):
+//|           b.append(0)
+//|       with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000, bit_depth=16) as mic:
+//|           mic.record(b, len(b))"""
+//|     ...
 STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_PDMIN
     mp_raise_NotImplementedError(translate("PDMIn not available"));
@@ -142,7 +150,6 @@ STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     def deinit(self) -> None:
 //|         """Deinitialises the PDMIn and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_pdmin_deinit(mp_obj_t self_in) {
     audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audiobusio_pdmin_deinit(self);
@@ -158,13 +165,11 @@ STATIC void check_for_deinit(audiobusio_pdmin_obj_t *self) {
 //|     def __enter__(self) -> PDMIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_pdmin_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audiobusio_pdmin_deinit(args[0]);
@@ -184,7 +189,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4,
 //|         :return: The number of samples recorded. If this is less than ``destination_length``,
 //|           some samples were missed due to processing time."""
 //|         ...
-//|
 STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) {
     audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_obj);
     check_for_deinit(self);
@@ -216,7 +220,6 @@ MP_DEFINE_CONST_FUN_OBJ_3(audiobusio_pdmin_record_obj, audiobusio_pdmin_obj_reco
 //|     sample_rate: int
 //|     """The actual sample_rate of the recording. This may not match the constructed
 //|     sample rate due to internal clock limitations."""
-//|
 STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) {
     audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiobusio/__init__.c b/shared-bindings/audiobusio/__init__.c
index 34ce9ef696..937028ee1f 100644
--- a/shared-bindings/audiobusio/__init__.c
+++ b/shared-bindings/audiobusio/__init__.c
@@ -44,7 +44,6 @@
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed. To do so, either call :py:meth:`!deinit` or use a
 //| context manager."""
-//|
 
 STATIC const mp_rom_map_elem_t audiobusio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiobusio) },
diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c
index 85ad752bab..03b7d2d3ae 100644
--- a/shared-bindings/audiocore/RawSample.c
+++ b/shared-bindings/audiocore/RawSample.c
@@ -37,7 +37,9 @@
 //| class RawSample:
 //|     """A raw audio sample buffer in memory"""
 //|
-//|     def __init__(self, buffer: ReadableBuffer, *, channel_count: int = 1, sample_rate: int = 8000) -> None:
+//|     def __init__(
+//|         self, buffer: ReadableBuffer, *, channel_count: int = 1, sample_rate: int = 8000
+//|     ) -> None:
 //|         """Create a RawSample based on the given buffer of signed values. If channel_count is more than
 //|         1 then each channel's samples should alternate. In other words, for a two channel buffer, the
 //|         first sample will be for channel 1, the second sample will be for channel two, the third for
@@ -68,7 +70,6 @@
 //|           time.sleep(1)
 //|           dac.stop()"""
 //|         ...
-//|
 STATIC mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer, ARG_channel_count, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
@@ -100,7 +101,6 @@ STATIC mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_a
 //|     def deinit(self) -> None:
 //|         """Deinitialises the RawSample and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_rawsample_deinit(mp_obj_t self_in) {
     audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audioio_rawsample_deinit(self);
@@ -117,14 +117,12 @@ STATIC void check_for_deinit(audioio_rawsample_obj_t *self) {
 //|     def __enter__(self) -> RawSample:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_rawsample_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audioio_rawsample_deinit(args[0]);
@@ -137,7 +135,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4,
 //|     When the sample is looped, this can change the pitch output without changing the underlying
 //|     sample. This will not change the sample rate of any active playback. Call ``play`` again to
 //|     change it."""
-//|
 STATIC mp_obj_t audioio_rawsample_obj_get_sample_rate(mp_obj_t self_in) {
     audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 8de1a3970f..91567820a4 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -70,7 +70,6 @@
 //|           print("stopped")
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t audioio_wavefile_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, 2, false);
     mp_obj_t arg = args[0];
@@ -117,14 +116,12 @@ STATIC void check_for_deinit(audioio_wavefile_obj_t *self) {
 //|     def __enter__(self) -> WaveFile:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_wavefile_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audioio_wavefile_deinit(args[0]);
@@ -136,7 +133,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_wavefile___exit___obj, 4, 4,
 //|     """32 bit value that dictates how quickly samples are loaded into the DAC
 //|     in Hertz (cycles per second). When the sample is looped, this can change
 //|     the pitch output without changing the underlying sample."""
-//|
 STATIC mp_obj_t audioio_wavefile_obj_get_sample_rate(mp_obj_t self_in) {
     audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -158,7 +154,6 @@ MP_PROPERTY_GETSET(audioio_wavefile_sample_rate_obj,
 
 //|     bits_per_sample: int
 //|     """Bits per sample. (read only)"""
-//|
 STATIC mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) {
     audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -170,7 +165,6 @@ MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj,
     (mp_obj_t)&audioio_wavefile_get_bits_per_sample_obj);
 //|     channel_count: int
 //|     """Number of audio channels. (read only)"""
-//|
 STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) {
     audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c
index f03c64ccf8..2e3b479cf6 100644
--- a/shared-bindings/audiocore/__init__.c
+++ b/shared-bindings/audiocore/__init__.c
@@ -36,7 +36,6 @@
 // #include "shared-bindings/audiomixer/Mixer.h"
 
 //| """Support for audio samples"""
-//|
 
 STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiocore) },
diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c
index 75ba7b5ec5..5df1656f8f 100644
--- a/shared-bindings/audioio/AudioOut.c
+++ b/shared-bindings/audioio/AudioOut.c
@@ -39,7 +39,13 @@
 //| class AudioOut:
 //|     """Output an analog audio signal"""
 //|
-//|     def __init__(self, left_channel: microcontroller.Pin, *, right_channel: Optional[microcontroller.Pin] = None, quiescent_value: int = 0x8000) -> None:
+//|     def __init__(
+//|         self,
+//|         left_channel: microcontroller.Pin,
+//|         *,
+//|         right_channel: Optional[microcontroller.Pin] = None,
+//|         quiescent_value: int = 0x8000
+//|     ) -> None:
 //|         """Create a AudioOut object associated with the given pin(s). This allows you to
 //|         play audio signals out on the given pin(s).
 //|
@@ -89,7 +95,6 @@
 //|             pass
 //|           print("stopped")"""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_left_channel, ARG_right_channel, ARG_quiescent_value };
     static const mp_arg_t allowed_args[] = {
@@ -114,7 +119,6 @@ STATIC mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     def deinit(self) -> None:
 //|         """Deinitialises the AudioOut and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_deinit(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audioio_audioout_deinit(self);
@@ -130,14 +134,12 @@ STATIC void check_for_deinit(audioio_audioout_obj_t *self) {
 //|     def __enter__(self) -> AudioOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audioio_audioout_deinit(args[0]);
@@ -156,7 +158,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_audioout___exit___obj, 4, 4,
 //|         resolution will use the highest order bits to output. For example, the SAMD21 has a 10 bit
 //|         DAC that ignores the lowest 6 bits when playing 16 bit samples."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_loop };
     static const mp_arg_t allowed_args[] = {
@@ -178,7 +179,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_audioout_play_obj, 1, audioio_audioout_obj_pl
 //|     def stop(self) -> None:
 //|         """Stops playback and resets to the start of the sample."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_obj_stop(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -189,7 +189,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_stop_obj, audioio_audioout_obj_stop);
 
 //|     playing: bool
 //|     """True when an audio sample is being output even if `paused`. (read-only)"""
-//|
 STATIC mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -203,7 +202,6 @@ MP_PROPERTY_GETTER(audioio_audioout_playing_obj,
 //|     def pause(self) -> None:
 //|         """Stops playback temporarily while remembering the position. Use `resume` to resume playback."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_obj_pause(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -219,7 +217,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_pause_obj, audioio_audioout_obj_pause
 //|     def resume(self) -> None:
 //|         """Resumes sample playback after :py:func:`pause`."""
 //|         ...
-//|
 STATIC mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -234,7 +231,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resu
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
-//|
 STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c
index f03ffd612a..b76b534a7d 100644
--- a/shared-bindings/audioio/__init__.c
+++ b/shared-bindings/audioio/__init__.c
@@ -52,7 +52,6 @@
 //| For compatibility with CircuitPython 4.x, some builds allow the items in
 //| `audiocore` to be imported from `audioio`.  This will be removed for all
 //| boards in a future build of CircuitPython."""
-//|
 
 STATIC const mp_rom_map_elem_t audioio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audioio) },
diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c
index 47dbd94f19..f6a52c2809 100644
--- a/shared-bindings/audiomixer/Mixer.c
+++ b/shared-bindings/audiomixer/Mixer.c
@@ -41,7 +41,15 @@
 //| class Mixer:
 //|     """Mixes one or more audio samples together into one sample."""
 //|
-//|     def __init__(self, voice_count: int = 2, buffer_size: int = 1024, channel_count: int = 2, bits_per_sample: int = 16, samples_signed: bool = True, sample_rate: int = 8000) -> None:
+//|     def __init__(
+//|         self,
+//|         voice_count: int = 2,
+//|         buffer_size: int = 1024,
+//|         channel_count: int = 2,
+//|         bits_per_sample: int = 16,
+//|         samples_signed: bool = True,
+//|         sample_rate: int = 8000,
+//|     ) -> None:
 //|         """Create a Mixer object that can mix multiple channels with the same sample rate.
 //|         Samples are accessed and controlled with the mixer's `audiomixer.MixerVoice` objects.
 //|
@@ -77,7 +85,6 @@
 //|             time.sleep(1)
 //|           print("stopped")"""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_voice_count, ARG_buffer_size, ARG_channel_count, ARG_bits_per_sample, ARG_samples_signed, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
@@ -114,7 +121,6 @@ STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     def deinit(self) -> None:
 //|         """Deinitialises the Mixer and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixer_deinit(mp_obj_t self_in) {
     audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audiomixer_mixer_deinit(self);
@@ -131,14 +137,12 @@ STATIC void check_for_deinit(audiomixer_mixer_obj_t *self) {
 //|     def __enter__(self) -> Mixer:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixer_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audiomixer_mixer_deinit(args[0]);
@@ -148,7 +152,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomixer_mixer___exit___obj, 4, 4,
 
 //|     playing: bool
 //|     """True when any voice is being output. (read-only)"""
-//|
 STATIC mp_obj_t audiomixer_mixer_obj_get_playing(mp_obj_t self_in) {
     audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -161,7 +164,6 @@ MP_PROPERTY_GETTER(audiomixer_mixer_playing_obj,
 
 //|     sample_rate: int
 //|     """32 bit value that dictates how quickly samples are played in Hertz (cycles per second)."""
-//|
 STATIC mp_obj_t audiomixer_mixer_obj_get_sample_rate(mp_obj_t self_in) {
     audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -189,7 +191,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_get_voice_obj, audiomixer_mixer_obj_g
 MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj,
     (mp_obj_t)&audiomixer_mixer_get_voice_obj);
 
-//|     def play(self, sample: circuitpython_typing.AudioSample, *, voice: int = 0, loop: bool = False) -> None:
+//|     def play(
+//|         self, sample: circuitpython_typing.AudioSample, *, voice: int = 0, loop: bool = False
+//|     ) -> None:
 //|         """Plays the sample once when loop=False and continuously when loop=True.
 //|         Does not block. Use `playing` to block.
 //|
@@ -197,7 +201,6 @@ MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj,
 //|
 //|         The sample must match the Mixer's encoding settings given in the constructor."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixer_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_voice, ARG_loop };
     static const mp_arg_t allowed_args[] = {
@@ -225,7 +228,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixer_play_obj, 1, audiomixer_mixer_obj_pl
 //|     def stop_voice(self, voice: int = 0) -> None:
 //|         """Stops playback of the sample on the given voice."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_voice };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index f7bf16fb49..c5accc2d87 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -45,7 +45,6 @@
 //|     def __init__(self) -> None:
 //|         """MixerVoice instance object(s) created by `audiomixer.Mixer`."""
 //|         ...
-//|
 // TODO: support mono or stereo voices
 STATIC mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
@@ -65,7 +64,6 @@ STATIC mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t
 //|
 //|         The sample must match the `audiomixer.Mixer`'s encoding settings given in the constructor."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixervoice_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_loop };
     static const mp_arg_t allowed_args[] = {
@@ -85,7 +83,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_play_obj, 1, audiomixer_mixervo
 //|     def stop(self) -> None:
 //|         """Stops playback of the sample on this voice."""
 //|         ...
-//|
 STATIC mp_obj_t audiomixer_mixervoice_obj_stop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_voice };
     static const mp_arg_t allowed_args[] = {
@@ -103,7 +100,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_stop_obj, 1, audiomixer_mixervo
 
 //|     level: float
 //|     """The volume level of a voice, as a floating point number between 0 and 1."""
-//|
 STATIC mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) {
     return mp_obj_new_float(common_hal_audiomixer_mixervoice_get_level(self_in));
 }
@@ -136,7 +132,6 @@ MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
 
 //|     playing: bool
 //|     """True when this voice is being output. (read-only)"""
-//|
 
 STATIC mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) {
     audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c
index a29d4f18ef..8292be9e95 100644
--- a/shared-bindings/audiomixer/__init__.c
+++ b/shared-bindings/audiomixer/__init__.c
@@ -33,7 +33,6 @@
 #include "shared-bindings/audiomixer/Mixer.h"
 
 //| """Support for audio mixing"""
-//|
 
 STATIC const mp_rom_map_elem_t audiomixer_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiomixer) },
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 5795fb8730..bd80ad45f7 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -87,7 +87,6 @@
 //|           print("stopped")
 //|         """
 //|         ...
-//|
 
 STATIC mp_obj_t audiomp3_mp3file_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, 2, false);
@@ -119,7 +118,6 @@ STATIC mp_obj_t audiomp3_mp3file_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     def deinit(self) -> None:
 //|         """Deinitialises the MP3 and releases all memory resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audiomp3_mp3file_deinit(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audiomp3_mp3file_deinit(self);
@@ -136,14 +134,12 @@ STATIC void check_for_deinit(audiomp3_mp3file_obj_t *self) {
 //|     def __enter__(self) -> MP3Decoder:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_audiomp3_mp3file_deinit(args[0]);
@@ -153,7 +149,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomp3_mp3file___exit___obj, 4, 4,
 
 //|     file: typing.BinaryIO
 //|     """File to play back."""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_file(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -175,7 +170,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_se
 //|     def open(self, filepath: str) -> None:
 //|         """Takes in the name of a mp3 file, opens it, and replaces the old playback file."""
 //|         ...
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_open(mp_obj_t self_in, mp_obj_t path) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -197,7 +191,6 @@ MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj,
 //|     """32 bit value that dictates how quickly samples are loaded into the DAC
 //|     in Hertz (cycles per second). When the sample is looped, this can change
 //|     the pitch output without changing the underlying sample."""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_sample_rate(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -219,7 +212,6 @@ MP_PROPERTY_GETSET(audiomp3_mp3file_sample_rate_obj,
 
 //|     bits_per_sample: int
 //|     """Bits per sample. (read only)"""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_bits_per_sample(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -232,7 +224,6 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_bits_per_sample_obj,
 
 //|     channel_count: int
 //|     """Number of audio channels. (read only)"""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_channel_count(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -245,7 +236,6 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_channel_count_obj,
 
 //|     rms_level: float
 //|     """The RMS audio level of a recently played moment of audio. (read only)"""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -258,7 +248,6 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj,
 
 //|     samples_decoded: int
 //|     """The number of audio samples decoded from the current file. (read only)"""
-//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c
index 13f02b1ea9..948910c45e 100644
--- a/shared-bindings/audiomp3/__init__.c
+++ b/shared-bindings/audiomp3/__init__.c
@@ -37,7 +37,6 @@
 //| see `this CircuitPython Essentials Learn guide page
 //| `_.
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t audiomp3_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiomp3) },
diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index f4f3675750..b50e1e8e9c 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -39,7 +39,13 @@
 //| class PWMAudioOut:
 //|     """Output an analog audio signal by varying the PWM duty cycle."""
 //|
-//|     def __init__(self, left_channel: microcontroller.Pin, *, right_channel: Optional[microcontroller.Pin] = None, quiescent_value: int = 0x8000) -> None:
+//|     def __init__(
+//|         self,
+//|         left_channel: microcontroller.Pin,
+//|         *,
+//|         right_channel: Optional[microcontroller.Pin] = None,
+//|         quiescent_value: int = 0x8000
+//|     ) -> None:
 //|         """Create a PWMAudioOut object associated with the given pin(s). This allows you to
 //|         play audio signals out on the given pin(s).  In contrast to mod:`audioio`,
 //|         the pin(s) specified are digital pins, and are driven with a device-dependent PWM
@@ -92,7 +98,6 @@
 //|             pass
 //|           print("stopped")"""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_left_channel, ARG_right_channel, ARG_quiescent_value };
     static const mp_arg_t allowed_args[] = {
@@ -117,7 +122,6 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_
 //|     def deinit(self) -> None:
 //|         """Deinitialises the PWMAudioOut and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_deinit(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_audiopwmio_pwmaudioout_deinit(self);
@@ -133,7 +137,6 @@ STATIC void check_for_deinit(audiopwmio_pwmaudioout_obj_t *self) {
 //|     def __enter__(self) -> PWMAudioOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
@@ -157,7 +160,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiopwmio_pwmaudioout___exit___obj,
 //|         The sample itself should consist of 16 bit samples. Microcontrollers with a lower output
 //|         resolution will use the highest order bits to output."""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_loop };
     static const mp_arg_t allowed_args[] = {
@@ -179,7 +181,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiopwmio_pwmaudioout_play_obj, 1, audiopwmio_pwmaud
 //|     def stop(self) -> None:
 //|         """Stops playback and resets to the start of the sample."""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_stop(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -190,7 +191,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_stop_obj, audiopwmio_pwmaudioou
 
 //|     playing: bool
 //|     """True when an audio sample is being output even if `paused`. (read-only)"""
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_playing(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -204,7 +204,6 @@ MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_playing_obj,
 //|     def pause(self) -> None:
 //|         """Stops playback temporarily while remembering the position. Use `resume` to resume playback."""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_pause(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -220,7 +219,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_pause_obj, audiopwmio_pwmaudioo
 //|     def resume(self) -> None:
 //|         """Resumes sample playback after :py:func:`pause`."""
 //|         ...
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_resume(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -235,7 +233,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_resume_obj, audiopwmio_pwmaudio
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
-//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiopwmio/__init__.c b/shared-bindings/audiopwmio/__init__.c
index 41a756e8b6..441bca2132 100644
--- a/shared-bindings/audiopwmio/__init__.c
+++ b/shared-bindings/audiopwmio/__init__.c
@@ -44,7 +44,6 @@
 //|
 //| Since CircuitPython 5, `Mixer`, `RawSample` and `WaveFile` are moved
 //| to :mod:`audiocore`."""
-//|
 
 STATIC const mp_rom_map_elem_t audiopwmio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiopwmio) },
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index e89defd8e7..1f1bb78421 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -40,7 +40,14 @@
 //| class I2C:
 //|     """Two wire serial protocol"""
 //|
-//|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, *, frequency: int = 400000, timeout: int = 255) -> None:
+//|     def __init__(
+//|         self,
+//|         scl: microcontroller.Pin,
+//|         sda: microcontroller.Pin,
+//|         *,
+//|         frequency: int = 400000,
+//|         timeout: int = 255
+//|     ) -> None:
 //|         """I2C is a two-wire protocol for communicating between devices.  At the
 //|         physical level it consists of 2 wires: SCL and SDA, the clock and data
 //|         lines respectively.
@@ -58,7 +65,6 @@
 //|         :param int frequency: The clock frequency of the bus
 //|         :param int timeout: The maximum clock stretching timeout in microseconds"""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_scl, ARG_sda, ARG_frequency, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
@@ -82,7 +88,6 @@ STATIC mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def deinit(self) -> None:
 //|         """Releases control of the underlying hardware so other classes can use it."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_obj_deinit(mp_obj_t self_in) {
     bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     shared_module_bitbangio_i2c_deinit(self);
@@ -99,14 +104,12 @@ STATIC void check_for_deinit(bitbangio_i2c_obj_t *self) {
 //|     def __enter__(self) -> I2C:
 //|         """No-op used in Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware on context exit. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     shared_module_bitbangio_i2c_deinit(args[0]);
@@ -125,7 +128,6 @@ static void check_lock(bitbangio_i2c_obj_t *self) {
 //|         those that respond.  A device responds if it pulls the SDA line low after
 //|         its address (including a read bit) is sent on the bus."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_scan(mp_obj_t self_in) {
     bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -145,7 +147,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_scan_obj, bitbangio_i2c_scan);
 //|     def try_lock(self) -> bool:
 //|         """Attempts to grab the I2C lock. Returns True on success."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_obj_try_lock(mp_obj_t self_in) {
     bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -156,7 +157,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_try_lock_obj, bitbangio_i2c_obj_try_lock
 //|     def unlock(self) -> None:
 //|         """Releases the I2C lock."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_obj_unlock(mp_obj_t self_in) {
     bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -166,7 +166,9 @@ STATIC mp_obj_t bitbangio_i2c_obj_unlock(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_unlock_obj, bitbangio_i2c_obj_unlock);
 
 //|     import sys
-//|     def readfrom_into(self, address: int, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
+//|     def readfrom_into(
+//|         self, address: int, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize
+//|     ) -> None:
 //|         """Read into ``buffer`` from the device selected by ``address``.
 //|         The number of bytes read will be the length of ``buffer``.
 //|         At least one byte must be read.
@@ -180,7 +182,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_unlock_obj, bitbangio_i2c_obj_unlock);
 //|         :param int start: Index to start writing at
 //|         :param int end: Index to write up to but not include"""
 //|         ...
-//|
 // Shared arg parsing for readfrom_into and writeto_then_readfrom.
 STATIC void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end) {
     mp_buffer_info_t bufinfo;
@@ -217,7 +218,9 @@ STATIC mp_obj_t bitbangio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_a
 MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_readfrom_into_obj, 1, bitbangio_i2c_readfrom_into);
 
 //|     import sys
-//|     def writeto(self, address: int, buffer: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
+//|     def writeto(
+//|         self, address: int, buffer: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write the bytes from ``buffer`` to the device selected by ``address`` and then transmits a
 //|         stop bit. Use `writeto_then_readfrom` when needing a write, no stop and repeated start
 //|         before a read.
@@ -235,7 +238,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_readfrom_into_obj, 1, bitbangio_i2c_rea
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
 //|         """
 //|         ...
-//|
 // Shared arg parsing for writeto and writeto_then_readfrom.
 STATIC void writeto(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end, bool stop) {
     // get the buffer to write the data from
@@ -276,7 +278,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_wr
 
 
 //|     import sys
-//|     def writeto_then_readfrom(self, address: int, out_buffer: ReadableBuffer, in_buffer: ReadableBuffer, *, out_start: int = 0, out_end: int = sys.maxsize, in_start: int = 0, in_end: int = sys.maxsize) -> None:
+//|     def writeto_then_readfrom(
+//|         self,
+//|         address: int,
+//|         out_buffer: ReadableBuffer,
+//|         in_buffer: ReadableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: int = sys.maxsize,
+//|         in_start: int = 0,
+//|         in_end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write the bytes from ``out_buffer`` to the device selected by ``address``, generate no stop
 //|         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.
@@ -298,7 +310,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_wr
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c
index 103dd9fbaa..e197a8f87a 100644
--- a/shared-bindings/bitbangio/SPI.c
+++ b/shared-bindings/bitbangio/SPI.c
@@ -51,7 +51,12 @@
 //|     multiple secondaries can share the `!clock`, `!MOSI` and `!MISO` lines
 //|     and therefore the hardware.)"""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, MOSI: Optional[microcontroller.Pin] = None, MISO: Optional[microcontroller.Pin] = None) -> None:
+//|     def __init__(
+//|         self,
+//|         clock: microcontroller.Pin,
+//|         MOSI: Optional[microcontroller.Pin] = None,
+//|         MISO: Optional[microcontroller.Pin] = None,
+//|     ) -> None:
 //|         """Construct an SPI object on the given pins.
 //|
 //|         .. seealso:: Using this class directly requires careful lock management.
@@ -67,7 +72,6 @@
 //|         :param ~microcontroller.Pin MOSI: the Main Out Selected In pin.
 //|         :param ~microcontroller.Pin MISO: the Main In Selected Out pin."""
 //|         ...
-//|
 
 // TODO(tannewt): Support LSB SPI.
 STATIC mp_obj_t bitbangio_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -93,7 +97,6 @@ STATIC mp_obj_t bitbangio_spi_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def deinit(self) -> None:
 //|         """Turn off the SPI bus."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_obj_deinit(mp_obj_t self_in) {
     bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     shared_module_bitbangio_spi_deinit(self);
@@ -110,14 +113,12 @@ STATIC void check_for_deinit(bitbangio_spi_obj_t *self) {
 //|     def __enter__(self) -> SPI:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     shared_module_bitbangio_spi_deinit(args[0]);
@@ -132,7 +133,9 @@ static void check_lock(bitbangio_spi_obj_t *self) {
     }
 }
 
-//|     def configure(self, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, bits: int = 8) -> None:
+//|     def configure(
+//|         self, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, bits: int = 8
+//|     ) -> None:
 //|         """Configures the SPI bus. Only valid when locked.
 //|
 //|         :param int baudrate: the clock rate in Hertz
@@ -141,7 +144,6 @@ static void check_lock(bitbangio_spi_obj_t *self) {
 //|           or second (1). Rising or falling depends on clock polarity.
 //|         :param int bits: the number of bits per word"""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits };
     static const mp_arg_t allowed_args[] = {
@@ -172,7 +174,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_configure_obj, 1, bitbangio_spi_configu
 //|         :return: True when lock has been grabbed
 //|         :rtype: bool"""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_obj_try_lock(mp_obj_t self_in) {
     bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -183,7 +184,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_try_lock_obj, bitbangio_spi_obj_try_lock
 //|     def unlock(self) -> None:
 //|         """Releases the SPI lock."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_obj_unlock(mp_obj_t self_in) {
     bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -196,7 +196,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_unlock_obj, bitbangio_spi_obj_unlock);
 //|         """Write the data contained in ``buf``. Requires the SPI being locked.
 //|         If the buffer is empty, nothing happens."""
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -230,7 +229,14 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_write_obj, 1, bitbangio_spi_write);
 
 
 //|     import sys
-//|     def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize, write_value: int = 0) -> None:
+//|     def readinto(
+//|         self,
+//|         buffer: WriteableBuffer,
+//|         *,
+//|         start: int = 0,
+//|         end: int = sys.maxsize,
+//|         write_value: int = 0
+//|     ) -> None:
 //|         """Read into ``buffer`` while writing ``write_value`` for each byte read.
 //|         The SPI object must be locked.
 //|         If the number of bytes to read is 0, nothing happens.
@@ -245,7 +251,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_write_obj, 1, bitbangio_spi_write);
 //|         :param int write_value: value to write while reading
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end, ARG_write_value };
     static const mp_arg_t allowed_args[] = {
@@ -279,7 +284,16 @@ STATIC mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *pos_args,
 MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_readinto_obj, 1, bitbangio_spi_readinto);
 
 //|     import sys
-//|     def write_readinto(self, out_buffer: ReadableBuffer, in_buffer: WriteableBuffer, *, out_start: int = 0, out_end: int = sys.maxsize, in_start: int = 0, in_end: int = sys.maxsize) -> None:
+//|     def write_readinto(
+//|         self,
+//|         out_buffer: ReadableBuffer,
+//|         in_buffer: WriteableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: int = sys.maxsize,
+//|         in_start: int = 0,
+//|         in_end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write out the data in ``out_buffer`` while simultaneously reading data into ``in_buffer``.
 //|         The SPI object must be locked.
 //|
@@ -303,7 +317,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_readinto_obj, 1, bitbangio_spi_readinto
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitbangio/__init__.c b/shared-bindings/bitbangio/__init__.c
index 43117db494..1b13003e89 100644
--- a/shared-bindings/bitbangio/__init__.c
+++ b/shared-bindings/bitbangio/__init__.c
@@ -66,7 +66,6 @@
 //| :py:meth:`~bitbangio.I2C.scan` and then :py:meth:`~bitbangio.I2C.deinit` the
 //| hardware. The last step is optional because CircuitPython automatically
 //| resets hardware after a program finishes."""
-//|
 
 STATIC const mp_rom_map_elem_t bitbangio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitbangio) },
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 9339db8f66..c0cec516da 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -50,7 +50,6 @@
 //|     `_
 //|     for information about using the :py:mod:`displayio` module.
 //| """
-//|
 
 STATIC int16_t validate_point(mp_obj_t point, int16_t default_value) {
     // Checks if point is None and returns default_value, otherwise decodes integer value
@@ -126,46 +125,54 @@ STATIC void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tupl
 
 }
 
-//|
 //| def rotozoom(
-//|        dest_bitmap: displayio.Bitmap, source_bitmap: displayio.Bitmap,
-//|        *,
-//|        ox: int, oy: int, dest_clip0: Tuple[int, int], dest_clip1: Tuple[int, int],
-//|        px: int, py: int, source_clip0: Tuple[int, int], source_clip1: Tuple[int, int],
-//|        angle: float, scale: float, skip_index: int) -> None:
-//|      """Inserts the source bitmap region into the destination bitmap with rotation
-//|      (angle), scale and clipping (both on source and destination bitmaps).
-//|
-//|      :param bitmap dest_bitmap: Destination bitmap that will be copied into
-//|      :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied
-//|      :param int ox: Horizontal pixel location in destination bitmap where source bitmap
-//|             point (px,py) is placed. Defaults to None which causes it to use the horizontal
-//|             midway point of the destination bitmap.
-//|      :param int oy: Vertical pixel location in destination bitmap where source bitmap
-//|             point (px,py) is placed. Defaults to None which causes it to use the vertical
-//|             midway point of the destination bitmap.
-//|      :param Tuple[int,int] dest_clip0: First corner of rectangular destination clipping
-//|             region that constrains region of writing into destination bitmap
-//|      :param Tuple[int,int] dest_clip1: Second corner of rectangular destination clipping
-//|             region that constrains region of writing into destination bitmap
-//|      :param int px: Horizontal pixel location in source bitmap that is placed into the
-//|             destination bitmap at (ox,oy). Defaults to None which causes it to use the
-//|             horizontal midway point in the source bitmap.
-//|      :param int py: Vertical pixel location in source bitmap that is placed into the
-//|             destination bitmap at (ox,oy). Defaults to None which causes it to use the
-//|             vertical midway point in the source bitmap.
-//|      :param Tuple[int,int] source_clip0: First corner of rectangular source clipping
-//|             region that constrains region of reading from the source bitmap
-//|      :param Tuple[int,int] source_clip1: Second corner of rectangular source clipping
-//|             region that constrains region of reading from the source bitmap
-//|      :param float angle: Angle of rotation, in radians (positive is clockwise direction).
-//|             Defaults to None which gets treated as 0.0 radians or no rotation.
-//|      :param float scale: Scaling factor. Defaults to None which gets treated as 1.0 or same
-//|             as original source size.
-//|      :param int skip_index: Bitmap palette index in the source that will not be copied,
-//|             set to None to copy all pixels"""
-//|      ...
+//|     dest_bitmap: displayio.Bitmap,
+//|     source_bitmap: displayio.Bitmap,
+//|     *,
+//|     ox: int,
+//|     oy: int,
+//|     dest_clip0: Tuple[int, int],
+//|     dest_clip1: Tuple[int, int],
+//|     px: int,
+//|     py: int,
+//|     source_clip0: Tuple[int, int],
+//|     source_clip1: Tuple[int, int],
+//|     angle: float,
+//|     scale: float,
+//|     skip_index: int
+//| ) -> None:
+//|     """Inserts the source bitmap region into the destination bitmap with rotation
+//|     (angle), scale and clipping (both on source and destination bitmaps).
 //|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be copied into
+//|     :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied
+//|     :param int ox: Horizontal pixel location in destination bitmap where source bitmap
+//|            point (px,py) is placed. Defaults to None which causes it to use the horizontal
+//|            midway point of the destination bitmap.
+//|     :param int oy: Vertical pixel location in destination bitmap where source bitmap
+//|            point (px,py) is placed. Defaults to None which causes it to use the vertical
+//|            midway point of the destination bitmap.
+//|     :param Tuple[int,int] dest_clip0: First corner of rectangular destination clipping
+//|            region that constrains region of writing into destination bitmap
+//|     :param Tuple[int,int] dest_clip1: Second corner of rectangular destination clipping
+//|            region that constrains region of writing into destination bitmap
+//|     :param int px: Horizontal pixel location in source bitmap that is placed into the
+//|            destination bitmap at (ox,oy). Defaults to None which causes it to use the
+//|            horizontal midway point in the source bitmap.
+//|     :param int py: Vertical pixel location in source bitmap that is placed into the
+//|            destination bitmap at (ox,oy). Defaults to None which causes it to use the
+//|            vertical midway point in the source bitmap.
+//|     :param Tuple[int,int] source_clip0: First corner of rectangular source clipping
+//|            region that constrains region of reading from the source bitmap
+//|     :param Tuple[int,int] source_clip1: Second corner of rectangular source clipping
+//|            region that constrains region of reading from the source bitmap
+//|     :param float angle: Angle of rotation, in radians (positive is clockwise direction).
+//|            Defaults to None which gets treated as 0.0 radians or no rotation.
+//|     :param float scale: Scaling factor. Defaults to None which gets treated as 1.0 or same
+//|            as original source size.
+//|     :param int skip_index: Bitmap palette index in the source that will not be copied,
+//|            set to None to copy all pixels"""
+//|     ...
 STATIC mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_source_bitmap,
           ARG_ox, ARG_oy, ARG_dest_clip0, ARG_dest_clip1,
@@ -266,8 +273,14 @@ STATIC mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_rotozoom_obj, 0, bitmaptools_obj_rotozoom);
 // requires at least 2 arguments (destination bitmap and source bitmap)
 
-//|
-//| def alphablend(dest_bitmap: displayio.Bitmap , source_bitmap_1: displayio.Bitmap, source_bitmap_2: displayio.Bitmap, colorspace: displayio.Colorspace, factor1: float=.5, factor2: Optional[float]=None) -> None:
+//| def alphablend(
+//|     dest_bitmap: displayio.Bitmap,
+//|     source_bitmap_1: displayio.Bitmap,
+//|     source_bitmap_2: displayio.Bitmap,
+//|     colorspace: displayio.Colorspace,
+//|     factor1: float = 0.5,
+//|     factor2: Optional[float] = None,
+//| ) -> None:
 //|     """Alpha blend the two source bitmaps into the destination.
 //|
 //|     It is permitted for the destination bitmap to be one of the two
@@ -282,7 +295,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_rotozoom_obj, 0, bitmaptools_obj_rotozoom
 //|
 //|     For the L8 colorspace, the bitmaps must have a bits-per-value of 8.
 //|     For the RGB colorspaces, they must have a bits-per-value of 16."""
-//|
 
 STATIC mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_source_bitmap_1, ARG_source_bitmap_2, ARG_colorspace, ARG_factor_1, ARG_factor_2};
@@ -343,24 +355,20 @@ STATIC mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args,
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_alphablend_obj, 0, bitmaptools_alphablend);
 
-//|
 //| def fill_region(
-//|        dest_bitmap: displayio.Bitmap,
-//|        x1: int, y1: int,
-//|        x2: int, y2: int,
-//|        value: int) -> None:
-//|      """Draws the color value into the destination bitmap within the
-//|      rectangular region bounded by (x1,y1) and (x2,y2), exclusive.
-//|
-//|      :param bitmap dest_bitmap: Destination bitmap that will be written into
-//|      :param int x1: x-pixel position of the first corner of the rectangular fill region
-//|      :param int y1: y-pixel position of the first corner of the rectangular fill region
-//|      :param int x2: x-pixel position of the second corner of the rectangular fill region (exclusive)
-//|      :param int y2: y-pixel position of the second corner of the rectangular fill region (exclusive)
-//|      :param int value: Bitmap palette index that will be written into the rectangular
-//|             fill region in the destination bitmap"""
-//|      ...
+//|     dest_bitmap: displayio.Bitmap, x1: int, y1: int, x2: int, y2: int, value: int
+//| ) -> None:
+//|     """Draws the color value into the destination bitmap within the
+//|     rectangular region bounded by (x1,y1) and (x2,y2), exclusive.
 //|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be written into
+//|     :param int x1: x-pixel position of the first corner of the rectangular fill region
+//|     :param int y1: y-pixel position of the first corner of the rectangular fill region
+//|     :param int x2: x-pixel position of the second corner of the rectangular fill region (exclusive)
+//|     :param int y2: y-pixel position of the second corner of the rectangular fill region (exclusive)
+//|     :param int value: Bitmap palette index that will be written into the rectangular
+//|            fill region in the destination bitmap"""
+//|     ...
 STATIC mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
 
@@ -395,24 +403,25 @@ STATIC mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_a
 }
 
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_fill_region_obj, 0, bitmaptools_obj_fill_region);
-//|
 //| def boundary_fill(
-//|        dest_bitmap: displayio.Bitmap,
-//|        x: int, y: int,
-//|        fill_color_value: int, replaced_color_value: int) -> None:
-//|      """Draws the color value into the destination bitmap enclosed
-//|      area of pixels of the background_value color. Like "Paint Bucket"
-//|      fill tool.
-//|
-//|      :param bitmap dest_bitmap: Destination bitmap that will be written into
-//|      :param int x: x-pixel position of the first pixel to check and fill if needed
-//|      :param int y: y-pixel position of the first pixel to check and fill if needed
-//|      :param int fill_color_value: Bitmap palette index that will be written into the
-//|             enclosed area in the destination bitmap
-//|      :param int replaced_color_value: Bitmap palette index that will filled with the
-//|             value color in the enclosed area in the destination bitmap"""
-//|      ...
+//|     dest_bitmap: displayio.Bitmap,
+//|     x: int,
+//|     y: int,
+//|     fill_color_value: int,
+//|     replaced_color_value: int,
+//| ) -> None:
+//|     """Draws the color value into the destination bitmap enclosed
+//|     area of pixels of the background_value color. Like "Paint Bucket"
+//|     fill tool.
 //|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be written into
+//|     :param int x: x-pixel position of the first pixel to check and fill if needed
+//|     :param int y: y-pixel position of the first pixel to check and fill if needed
+//|     :param int fill_color_value: Bitmap palette index that will be written into the
+//|            enclosed area in the destination bitmap
+//|     :param int replaced_color_value: Bitmap palette index that will filled with the
+//|            value color in the enclosed area in the destination bitmap"""
+//|     ...
 STATIC mp_obj_t bitmaptools_obj_boundary_fill(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_fill_color_value, ARG_replaced_color_value};
 
@@ -459,23 +468,19 @@ STATIC mp_obj_t bitmaptools_obj_boundary_fill(size_t n_args, const mp_obj_t *pos
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_boundary_fill_obj, 0, bitmaptools_obj_boundary_fill);
 // requires all 6 arguments
 
-//|
 //| def draw_line(
-//|        dest_bitmap: displayio.Bitmap,
-//|        x1: int, y1: int,
-//|        x2: int, y2: int,
-//|        value: int) -> None:
-//|      """Draws a line into a bitmap specified two endpoints (x1,y1) and (x2,y2).
-//|
-//|      :param bitmap dest_bitmap: Destination bitmap that will be written into
-//|      :param int x1: x-pixel position of the line's first endpoint
-//|      :param int y1: y-pixel position of the line's first endpoint
-//|      :param int x2: x-pixel position of the line's second endpoint
-//|      :param int y2: y-pixel position of the line's second endpoint
-//|      :param int value: Bitmap palette index that will be written into the
-//|             line in the destination bitmap"""
-//|      ...
+//|     dest_bitmap: displayio.Bitmap, x1: int, y1: int, x2: int, y2: int, value: int
+//| ) -> None:
+//|     """Draws a line into a bitmap specified two endpoints (x1,y1) and (x2,y2).
 //|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be written into
+//|     :param int x1: x-pixel position of the line's first endpoint
+//|     :param int y1: y-pixel position of the line's first endpoint
+//|     :param int x2: x-pixel position of the line's second endpoint
+//|     :param int y2: y-pixel position of the line's second endpoint
+//|     :param int value: Bitmap palette index that will be written into the
+//|            line in the destination bitmap"""
+//|     ...
 STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
 
@@ -519,7 +524,15 @@ STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_arg
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_line);
 // requires all 6 arguments
 
-//| def arrayblit(bitmap: displayio.Bitmap, data: ReadableBuffer, x1: int=0, y1: int=0, x2: Optional[int]=None, y2: Optional[int]=None, skip_index:Optional[int]=None) -> None:
+//| def arrayblit(
+//|     bitmap: displayio.Bitmap,
+//|     data: ReadableBuffer,
+//|     x1: int = 0,
+//|     y1: int = 0,
+//|     x2: Optional[int] = None,
+//|     y2: Optional[int] = None,
+//|     skip_index: Optional[int] = None,
+//| ) -> None:
 //|     """Inserts pixels from ``data`` into the rectangle of width×height pixels with the upper left corner at ``(x,y)``
 //|
 //|     The values from ``data`` are taken modulo the number of color values
@@ -547,7 +560,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_li
 //|             set to None to copy all pixels
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t bitmaptools_arrayblit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bitmap, ARG_data, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_index };
     static const mp_arg_t allowed_args[] = {
@@ -593,7 +605,15 @@ STATIC mp_obj_t bitmaptools_arrayblit(size_t n_args, const mp_obj_t *pos_args, m
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_arrayblit_obj, 0, bitmaptools_arrayblit);
 
 
-//| def readinto(bitmap: displayio.Bitmap, file: typing.BinaryIO, bits_per_pixel: int, element_size: int = 1, reverse_pixels_in_element: bool = False, swap_bytes_in_element: bool = False, reverse_rows: bool = False) -> None:
+//| def readinto(
+//|     bitmap: displayio.Bitmap,
+//|     file: typing.BinaryIO,
+//|     bits_per_pixel: int,
+//|     element_size: int = 1,
+//|     reverse_pixels_in_element: bool = False,
+//|     swap_bytes_in_element: bool = False,
+//|     reverse_rows: bool = False,
+//| ) -> None:
 //|     """Reads from a binary file into a bitmap.
 //|
 //|     The file must be positioned so that it consists of ``bitmap.height`` rows of pixel data, where each row is the smallest multiple of ``element_size`` bytes that can hold ``bitmap.width`` pixels.
@@ -612,7 +632,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_arrayblit_obj, 0, bitmaptools_arrayblit);
 //|     :param bool reverse_rows: Reverse the direction of the row loading (required for some bitmap images).
 //|     """
 //|     ...
-//|
 
 STATIC mp_obj_t bitmaptools_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bitmap, ARG_file, ARG_bits_per_pixel, ARG_element_size, ARG_reverse_pixels_in_element, ARG_swap_bytes_in_element, ARG_reverse_rows };
@@ -674,7 +693,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_readinto_obj, 0, bitmaptools_readinto);
 //|
 //|     FloydStenberg: "DitherAlgorithm"
 //|     """The Floyd-Stenberg dither"""
-//|
 MAKE_ENUM_VALUE(bitmaptools_dither_algorithm_type, dither_algorithm, Atkinson, DITHER_ALGORITHM_ATKINSON);
 MAKE_ENUM_VALUE(bitmaptools_dither_algorithm_type, dither_algorithm, FloydStenberg, DITHER_ALGORITHM_FLOYD_STENBERG);
 
@@ -688,7 +706,12 @@ MAKE_PRINTER(bitmaptools, bitmaptools_dither_algorithm);
 
 MAKE_ENUM_TYPE(bitmaptools, DitherAlgorithm, bitmaptools_dither_algorithm);
 
-//| def dither(dest_bitmap: displayio.Bitmap, source_bitmapp: displayio.Bitmap, source_colorspace: displayio.Colorspace, algorithm: DitherAlgorithm=DitherAlgorithm.Atkinson) -> None:
+//| def dither(
+//|     dest_bitmap: displayio.Bitmap,
+//|     source_bitmapp: displayio.Bitmap,
+//|     source_colorspace: displayio.Colorspace,
+//|     algorithm: DitherAlgorithm = DitherAlgorithm.Atkinson,
+//| ) -> None:
 //|     """Convert the input image into a 2-level output image using the given dither algorithm.
 //|
 //|     :param bitmap dest_bitmap: Destination bitmap.  It must have a value_count of 2 or 65536.  The stored values are 0 and the maximum pixel value.
@@ -697,7 +720,6 @@ MAKE_ENUM_TYPE(bitmaptools, DitherAlgorithm, bitmaptools_dither_algorithm);
 //|     :param algorithm: The dither algorithm to use, one of the `DitherAlgorithm` values.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_dest_bitmap, ARG_source_bitmap, ARG_source_colorspace, ARG_algorithm };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c
index 0b6b98a8d1..132b83bbc3 100644
--- a/shared-bindings/bitops/__init__.c
+++ b/shared-bindings/bitops/__init__.c
@@ -30,11 +30,11 @@
 #include "shared-bindings/bitops/__init__.h"
 
 //| """Routines for low-level manipulation of binary data"""
-//|
-//|
 
-//| def bit_transpose(input: ReadableBuffer, output: WriteableBuffer, width:int = 8) -> WriteableBuffer:
-//|     """"Transpose" a buffer by assembling each output byte with bits taken from each of ``width`` different input bytes.
+//| def bit_transpose(
+//|     input: ReadableBuffer, output: WriteableBuffer, width: int = 8
+//| ) -> WriteableBuffer:
+//|     """ "Transpose" a buffer by assembling each output byte with bits taken from each of ``width`` different input bytes.
 //|
 //|     This can be useful to convert a sequence of pixel values into a single
 //|     stream of bytes suitable for sending via a parallel conversion method.
diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index e4003d4f6b..2ea8b3a0c4 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -63,7 +63,6 @@
 //|     """Returns the `busio.I2C` object for the board's designated I2C bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.I2C`."""
 //|     ...
-//|
 #if CIRCUITPY_BOARD_I2C
 STATIC mp_obj_t board_i2c_0(void) {
     return common_hal_board_create_i2c(0);
@@ -80,7 +79,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c_0);
 //|     """Returns the `busio.SPI` object for the board's designated SPI bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.SPI`."""
 //|     ...
-//|
 #if CIRCUITPY_BOARD_SPI
 STATIC mp_obj_t board_spi_0(void) {
     return common_hal_board_create_spi(0);
@@ -97,7 +95,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi_0);
 //|     """Returns the `busio.UART` object for the board's designated UART bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.UART`."""
 //|     ...
-//|
 #if CIRCUITPY_BOARD_UART
 STATIC mp_obj_t board_uart_0(void) {
     return common_hal_board_create_uart(0);
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 354e1b4a82..03939b4c04 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -39,7 +39,14 @@
 //| class I2C:
 //|     """Two wire serial protocol"""
 //|
-//|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, *, frequency: int = 100000, timeout: int = 255) -> None:
+//|     def __init__(
+//|         self,
+//|         scl: microcontroller.Pin,
+//|         sda: microcontroller.Pin,
+//|         *,
+//|         frequency: int = 100000,
+//|         timeout: int = 255
+//|     ) -> None:
 //|
 //|         """I2C is a two-wire protocol for communicating between devices.  At the
 //|         physical level it consists of 2 wires: SCL and SDA, the clock and data
@@ -60,7 +67,6 @@
 //|             :class:`bitbangio.I2C`; ignored for :class:`busio.I2C`)
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     busio_i2c_obj_t *self = m_new_obj(busio_i2c_obj_t);
     self->base.type = &busio_i2c_type;
@@ -84,7 +90,6 @@ STATIC mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
 //|     def deinit(self) -> None:
 //|         """Releases control of the underlying hardware so other classes can use it."""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_obj_deinit(mp_obj_t self_in) {
     busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_busio_i2c_deinit(self);
@@ -101,14 +106,12 @@ STATIC void check_for_deinit(busio_i2c_obj_t *self) {
 //|     def __enter__(self) -> I2C:
 //|         """No-op used in Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware on context exit. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_busio_i2c_deinit(MP_OBJ_TO_PTR(args[0]));
@@ -130,7 +133,6 @@ static void check_lock(busio_i2c_obj_t *self) {
 //|         :return: List of device ids on the I2C bus
 //|         :rtype: list"""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_scan(mp_obj_t self_in) {
     busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -153,7 +155,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_scan_obj, busio_i2c_scan);
 //|         :return: True when lock has been grabbed
 //|         :rtype: bool"""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_obj_try_lock(mp_obj_t self_in) {
     busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -164,7 +165,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_try_lock_obj, busio_i2c_obj_try_lock);
 //|     def unlock(self) -> None:
 //|         """Releases the I2C lock."""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_obj_unlock(mp_obj_t self_in) {
     busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -174,7 +174,9 @@ STATIC mp_obj_t busio_i2c_obj_unlock(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_unlock_obj, busio_i2c_obj_unlock);
 
 //|     import sys
-//|     def readfrom_into(self, address: int, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
+//|     def readfrom_into(
+//|         self, address: int, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize
+//|     ) -> None:
 //|         """Read into ``buffer`` from the device selected by ``address``.
 //|         At least one byte must be read.
 //|
@@ -187,7 +189,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_unlock_obj, busio_i2c_obj_unlock);
 //|         :param int start: beginning of buffer slice
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``"""
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -223,7 +224,9 @@ STATIC mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args,
 MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_readfrom_into_obj, 1, busio_i2c_readfrom_into);
 
 //|     import sys
-//|     def writeto(self, address: int, buffer: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
+//|     def writeto(
+//|         self, address: int, buffer: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write the bytes from ``buffer`` to the device selected by ``address`` and
 //|         then transmit a stop bit.
 //|
@@ -240,7 +243,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_readfrom_into_obj, 1, busio_i2c_readfrom_in
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_buffer, ARG_start, ARG_end };
     static const mp_arg_t allowed_args[] = {
@@ -277,7 +279,17 @@ STATIC mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_ma
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto);
 
 //|     import sys
-//|     def writeto_then_readfrom(self, address: int, out_buffer: ReadableBuffer, in_buffer: WriteableBuffer, *, out_start: int = 0, out_end: int = sys.maxsize, in_start: int = 0, in_end: int = sys.maxsize) -> None:
+//|     def writeto_then_readfrom(
+//|         self,
+//|         address: int,
+//|         out_buffer: ReadableBuffer,
+//|         in_buffer: WriteableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: int = sys.maxsize,
+//|         in_start: int = 0,
+//|         in_end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write the bytes from ``out_buffer`` to the device selected by ``address``, generate no stop
 //|         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.
@@ -299,7 +311,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto);
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index eb89746d05..cd67c27438 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -53,7 +53,13 @@
 //|     multiple secondaries can share the `!clock`, `!MOSI` and `!MISO` lines
 //|     and therefore the hardware.)"""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, MOSI: Optional[microcontroller.Pin] = None, MISO: Optional[microcontroller.Pin] = None, half_duplex: bool = False) -> None:
+//|     def __init__(
+//|         self,
+//|         clock: microcontroller.Pin,
+//|         MOSI: Optional[microcontroller.Pin] = None,
+//|         MISO: Optional[microcontroller.Pin] = None,
+//|         half_duplex: bool = False,
+//|     ) -> None:
 //|
 //|         """Construct an SPI object on the given pins.
 //|
@@ -77,7 +83,6 @@
 //|         :param ~microcontroller.Pin MISO: the Main In Selected Out pin.
 //|         :param bool half_duplex: True when MOSI is used for bidirectional data. False when SPI is full-duplex or simplex."""
 //|         ...
-//|
 
 
 // TODO(tannewt): Support LSB SPI.
@@ -114,7 +119,6 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
 //|     def deinit(self) -> None:
 //|         """Turn off the SPI bus."""
 //|         ...
-//|
 STATIC mp_obj_t busio_spi_obj_deinit(mp_obj_t self_in) {
     busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_busio_spi_deinit(self);
@@ -126,13 +130,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_deinit_obj, busio_spi_obj_deinit);
 //|         """No-op used by Context Managers.
 //|         Provided by context manager helper."""
 //|         ...
-//|
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t busio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_busio_spi_deinit(MP_OBJ_TO_PTR(args[0]));
@@ -153,7 +155,9 @@ STATIC void check_for_deinit(busio_spi_obj_t *self) {
     }
 }
 
-//|     def configure(self, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, bits: int = 8) -> None:
+//|     def configure(
+//|         self, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, bits: int = 8
+//|     ) -> None:
 //|         """Configures the SPI bus. The SPI object must be locked.
 //|
 //|         :param int baudrate: the desired clock rate in Hertz. The actual clock rate may be higher or lower
@@ -175,7 +179,6 @@ STATIC void check_for_deinit(busio_spi_obj_t *self) {
 //|           Two SPI objects may be created, except on the Circuit Playground Bluefruit,
 //|           which allows only one (to allow for an additional I2C object)."""
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits };
@@ -209,7 +212,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_configure_obj, 1, busio_spi_configure);
 //|         :return: True when lock has been grabbed
 //|         :rtype: bool"""
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_obj_try_lock(mp_obj_t self_in) {
     busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -220,7 +222,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_try_lock_obj, busio_spi_obj_try_lock);
 //|     def unlock(self) -> None:
 //|         """Releases the SPI lock."""
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_obj_unlock(mp_obj_t self_in) {
     busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -244,7 +245,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_unlock_obj, busio_spi_obj_unlock);
 //|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
 //|         """
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
@@ -279,7 +279,14 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_obj, 1, busio_spi_write);
 
 
 //|     import sys
-//|     def readinto(self, buffer: WriteableBuffer, *, start: int = 0, end: int = sys.maxsize, write_value: int = 0) -> None:
+//|     def readinto(
+//|         self,
+//|         buffer: WriteableBuffer,
+//|         *,
+//|         start: int = 0,
+//|         end: int = sys.maxsize,
+//|         write_value: int = 0
+//|     ) -> None:
 //|         """Read into ``buffer`` while writing ``write_value`` for each byte read.
 //|         The SPI object must be locked.
 //|         If the number of bytes to read is 0, nothing happens.
@@ -296,7 +303,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_obj, 1, busio_spi_write);
 //|         :param int write_value: value to write while reading
 //|         """
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end, ARG_write_value };
@@ -331,7 +337,16 @@ STATIC mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_m
 MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_readinto_obj, 1, busio_spi_readinto);
 
 //|     import sys
-//|     def write_readinto(self, out_buffer: ReadableBuffer, in_buffer: WriteableBuffer, *, out_start: int = 0, out_end: int = sys.maxsize, in_start: int = 0, in_end: int = sys.maxsize) -> None:
+//|     def write_readinto(
+//|         self,
+//|         out_buffer: ReadableBuffer,
+//|         in_buffer: WriteableBuffer,
+//|         *,
+//|         out_start: int = 0,
+//|         out_end: int = sys.maxsize,
+//|         in_start: int = 0,
+//|         in_end: int = sys.maxsize
+//|     ) -> None:
 //|         """Write out the data in ``out_buffer`` while simultaneously reading data into ``in_buffer``.
 //|         The SPI object must be locked.
 //|
@@ -355,7 +370,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_readinto_obj, 1, busio_spi_readinto);
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
-//|
 
 STATIC mp_obj_t busio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
@@ -407,7 +421,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_readinto_obj, 1, busio_spi_write_read
 //|     frequency: int
 //|     """The actual SPI bus frequency. This may not match the frequency requested
 //|     due to internal limitations."""
-//|
 
 STATIC mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) {
     busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index d849d63ae8..f034b342c8 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -45,7 +45,19 @@
 
 //| class UART:
 //|     """A bidirectional serial protocol"""
-//|     def __init__(self, tx: microcontroller.Pin, rx: microcontroller.Pin, *, baudrate: int = 9600, bits: int = 8, parity: Optional[Parity] = None, stop: int = 1, timeout: float = 1, receiver_buffer_size: int = 64) -> None:
+//|
+//|     def __init__(
+//|         self,
+//|         tx: microcontroller.Pin,
+//|         rx: microcontroller.Pin,
+//|         *,
+//|         baudrate: int = 9600,
+//|         bits: int = 8,
+//|         parity: Optional[Parity] = None,
+//|         stop: int = 1,
+//|         timeout: float = 1,
+//|         receiver_buffer_size: int = 64
+//|     ) -> None:
 //|         """A common bidirectional serial protocol that uses an an agreed upon speed
 //|         rather than a shared clock line.
 //|
@@ -70,7 +82,6 @@
 //|            RS485 specifications intermittently.
 //|         """
 //|         ...
-//|
 typedef struct {
     mp_obj_base_t base;
 } busio_uart_parity_obj_t;
@@ -165,7 +176,6 @@ STATIC busio_uart_obj_t *native_uart(mp_obj_t uart_obj) {
 //|     def deinit(self) -> None:
 //|         """Deinitialises the UART and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t busio_uart_obj_deinit(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     common_hal_busio_uart_deinit(self);
@@ -182,14 +192,12 @@ STATIC void check_for_deinit(busio_uart_obj_t *self) {
 //|     def __enter__(self) -> UART:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t busio_uart_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_busio_uart_deinit(MP_OBJ_TO_PTR(args[0]));
@@ -212,7 +220,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 //|         :return: Data read
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 
 //|     def readinto(self, buf: WriteableBuffer) -> Optional[int]:
 //|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes.
@@ -222,7 +229,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 //|
 //|         *New in CircuitPython 4.0:* No length parameter is permitted."""
 //|         ...
-//|
 
 //|     def readline(self) -> bytes:
 //|         """Read a line, ending in a newline character, or
@@ -233,17 +239,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 //|         :return: the line read
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 
 //|     def write(self, buf: ReadableBuffer) -> Optional[int]:
 //|         """Write the buffer of bytes to the bus.
 //|
-//|       *New in CircuitPython 4.0:* ``buf`` must be bytes, not a string.
+//|         *New in CircuitPython 4.0:* ``buf`` must be bytes, not a string.
 //|
-//|         :return: the number of bytes written
-//|         :rtype: int or None"""
+//|           :return: the number of bytes written
+//|           :rtype: int or None"""
 //|         ...
-//|
 
 // These three methods are used by the shared stream methods.
 STATIC mp_uint_t busio_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
@@ -290,7 +294,6 @@ STATIC mp_uint_t busio_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t
 
 //|     baudrate: int
 //|     """The current baudrate."""
-//|
 STATIC mp_obj_t busio_uart_obj_get_baudrate(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
@@ -313,7 +316,6 @@ MP_PROPERTY_GETSET(busio_uart_baudrate_obj,
 
 //|     in_waiting: int
 //|     """The number of bytes in the input buffer, available to be read"""
-//|
 STATIC mp_obj_t busio_uart_obj_get_in_waiting(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
@@ -326,7 +328,6 @@ MP_PROPERTY_GETTER(busio_uart_in_waiting_obj,
 
 //|     timeout: float
 //|     """The current timeout, in seconds (float)."""
-//|
 STATIC mp_obj_t busio_uart_obj_get_timeout(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
@@ -352,7 +353,6 @@ MP_PROPERTY_GETSET(busio_uart_timeout_obj,
 //|     def reset_input_buffer(self) -> None:
 //|         """Discard any unread characters in the input buffer."""
 //|         ...
-//|
 STATIC mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
@@ -370,7 +370,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_o
 //|
 //|     EVEN: int
 //|     """Total number of ones should be even."""
-//|
 const mp_obj_type_t busio_uart_parity_type;
 
 const busio_uart_parity_obj_t busio_uart_parity_odd_obj = {
diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c
index 969c10e938..4d62c8333e 100644
--- a/shared-bindings/busio/__init__.c
+++ b/shared-bindings/busio/__init__.c
@@ -78,7 +78,6 @@
 //| Tutorial for UART:
 //| https://learn.adafruit.com/circuitpython-essentials/circuitpython-uart-serial
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t busio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_busio) },
diff --git a/shared-bindings/camera/Camera.c b/shared-bindings/camera/Camera.c
index f7bc9eec6a..e878ad21cf 100644
--- a/shared-bindings/camera/Camera.c
+++ b/shared-bindings/camera/Camera.c
@@ -55,12 +55,10 @@
 //|         size = cam.take_picture(buffer, width=1920, height=1080, format=camera.ImageFormat.JPG)
 //|         file.write(buffer, size)
 //|         file.close()"""
-//|
 
 //|     def __init__(self) -> None:
 //|         """Initialize camera."""
 //|         ...
-//|
 STATIC mp_obj_t camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     camera_obj_t *self = m_new_obj(camera_obj_t);
     self->base.type = &camera_type;
@@ -74,7 +72,6 @@ STATIC mp_obj_t camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 //|     def deinit(self) -> None:
 //|         """De-initialize camera."""
 //|         ...
-//|
 STATIC mp_obj_t camera_obj_deinit(mp_obj_t self_in) {
     camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_camera_deinit(self);
@@ -95,7 +92,6 @@ STATIC void check_for_deinit(camera_obj_t *self) {
 //|         :return: the number of bytes written into buf
 //|         :rtype: int"""
 //|         ...
-//|
 STATIC mp_obj_t camera_obj_take_picture(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_width, ARG_height, ARG_format };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/camera/ImageFormat.c b/shared-bindings/camera/ImageFormat.c
index 3ff687b7bf..56ead66d21 100644
--- a/shared-bindings/camera/ImageFormat.c
+++ b/shared-bindings/camera/ImageFormat.c
@@ -31,13 +31,11 @@
 //|
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define the image format."""
-//|
 //|     JPG: ImageFormat
 //|     """JPG format."""
 //|
 //|     RGB565: ImageFormat
 //|     """RGB565 format."""
-//|
 
 const camera_imageformat_obj_t camera_imageformat_jpg_obj = {
     { &camera_imageformat_type },
diff --git a/shared-bindings/camera/__init__.c b/shared-bindings/camera/__init__.c
index 12cebae7db..e4ee263f58 100644
--- a/shared-bindings/camera/__init__.c
+++ b/shared-bindings/camera/__init__.c
@@ -33,7 +33,6 @@
 //| """Support for camera input
 //|
 //| The `camera` module contains classes to control the camera and take pictures."""
-//|
 STATIC const mp_rom_map_elem_t camera_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_camera) },
     { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&camera_type) },
diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c
index e8aec7f0a1..6ee1453038 100644
--- a/shared-bindings/canio/CAN.c
+++ b/shared-bindings/canio/CAN.c
@@ -37,19 +37,19 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 
-//|
 //| class CAN:
 //|     """CAN bus protocol"""
 //|
-//|     def __init__(self,
-//|             tx: microcontroller.Pin,
-//|             rx: microcontroller.Pin,
-//|             *,
-//|             baudrate: int = 250000,
-//|             loopback: bool = False,
-//|             silent: bool = False,
-//|             auto_restart: bool = False,
-//|         ) -> None:
+//|     def __init__(
+//|         self,
+//|         tx: microcontroller.Pin,
+//|         rx: microcontroller.Pin,
+//|         *,
+//|         baudrate: int = 250000,
+//|         loopback: bool = False,
+//|         silent: bool = False,
+//|         auto_restart: bool = False,
+//|     ) -> None:
 //|         """A common shared-bus protocol.  The rx and tx pins are generally
 //|         connected to a transceiver which controls the H and L pins on a
 //|         shared bus.
@@ -62,7 +62,6 @@
 //|         :param bool auto_restart: If True, will restart communications after entering bus-off state
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_tx, ARG_rx, ARG_baudrate, ARG_loopback, ARG_silent, ARG_auto_restart, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -96,7 +95,6 @@ STATIC mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
 //|     auto_restart: bool
 //|     """If True, will restart communications after entering bus-off state"""
-//|
 STATIC mp_obj_t canio_can_auto_restart_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -119,7 +117,6 @@ MP_PROPERTY_GETSET(canio_can_auto_restart_obj,
 
 //|     baudrate: int
 //|     """The baud rate (read-only)"""
-//|
 STATIC mp_obj_t canio_can_baudrate_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -132,7 +129,6 @@ MP_PROPERTY_GETTER(canio_can_baudrate_obj,
 
 //|     transmit_error_count: int
 //|     """The number of transmit errors (read-only).  Increased for a detected transmission error, decreased for successful transmission.  Limited to the range from 0 to 255 inclusive.  Also called TEC."""
-//|
 STATIC mp_obj_t canio_can_transmit_error_count_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -145,7 +141,6 @@ MP_PROPERTY_GETTER(canio_can_transmit_error_count_obj,
 
 //|     receive_error_count: int
 //|     """The number of receive errors (read-only).  Increased for a detected reception error, decreased for successful reception.  Limited to the range from 0 to 255 inclusive.  Also called REC."""
-//|
 STATIC mp_obj_t canio_can_receive_error_count_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -173,7 +168,6 @@ MP_PROPERTY_GETTER(canio_can_state_obj,
 //|     def restart(self) -> None:
 //|         """If the device is in the bus off state, restart it."""
 //|         ...
-//|
 STATIC mp_obj_t canio_can_restart(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -182,7 +176,9 @@ STATIC mp_obj_t canio_can_restart(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_restart_obj, canio_can_restart);
 
-//|     def listen(self, matches: Optional[Sequence[Match]]=None, *, timeout: float=10) -> Listener:
+//|     def listen(
+//|         self, matches: Optional[Sequence[Match]] = None, *, timeout: float = 10
+//|     ) -> Listener:
 //|         """Start receiving messages that match any one of the filters.
 //|
 //|         Creating a listener is an expensive operation and can interfere with reception of messages by other listeners.
@@ -214,7 +210,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_restart_obj, canio_can_restart);
 //|         standard address with mask or an extended address with mask.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t canio_can_listen(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     common_hal_canio_can_check_for_deinit(self);
@@ -256,7 +251,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(canio_can_listen_obj, 1, canio_can_listen);
 //|     loopback: bool
 //|     """True if the device was created in loopback mode, False
 //|     otherwise (read-only)"""
-//|
 STATIC mp_obj_t canio_can_loopback_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -273,7 +267,6 @@ MP_PROPERTY_GETTER(canio_can_loopback_obj,
 //|         If the message could not be sent due to a full fifo or a bus error condition, RuntimeError is raised.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t canio_can_send(mp_obj_t self_in, mp_obj_t message_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -291,7 +284,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(canio_can_send_obj, canio_can_send);
 //|     silent: bool
 //|     """True if the device was created in silent mode, False
 //|     otherwise (read-only)"""
-//|
 STATIC mp_obj_t canio_can_silent_get(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -306,7 +298,6 @@ MP_PROPERTY_GETTER(canio_can_silent_obj,
 //|     def deinit(self) -> None:
 //|         """Deinitialize this object, freeing its hardware resources"""
 //|         ...
-//|
 STATIC mp_obj_t canio_can_deinit(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_deinit(self);
@@ -317,7 +308,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_deinit_obj, canio_can_deinit);
 //|     def __enter__(self) -> CAN:
 //|         """Returns self, to allow the object to be used in a `with` statement for resource control"""
 //|         ...
-//|
 STATIC mp_obj_t canio_can_enter(mp_obj_t self_in) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_can_check_for_deinit(self);
@@ -325,7 +315,12 @@ STATIC mp_obj_t canio_can_enter(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_enter_obj, canio_can_enter);
 
-//|     def __exit__(self, unused1: Optional[Type[BaseException]], unused2: Optional[BaseException], unused3: Optional[TracebackType]) -> None:
+//|     def __exit__(
+//|         self,
+//|         unused1: Optional[Type[BaseException]],
+//|         unused2: Optional[BaseException],
+//|         unused3: Optional[TracebackType],
+//|     ) -> None:
 //|         """Calls deinit()"""
 //|         ...
 STATIC mp_obj_t canio_can_exit(size_t num_args, const mp_obj_t args[]) {
diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c
index e59801d4e4..ea804f6614 100644
--- a/shared-bindings/canio/Listener.c
+++ b/shared-bindings/canio/Listener.c
@@ -41,15 +41,13 @@
 //|     the `in_waiting` method to check for an available message, a
 //|     listener can be used as an iterable, yielding messages until no
 //|     message arrives within ``self.timeout`` seconds."""
-//|
 
-//|     def receive(self) -> Optional[Union[RemoteTransmissionRequest,Message]]:
+//|     def receive(self) -> Optional[Union[RemoteTransmissionRequest, Message]]:
 //|         """Reads a message, after waiting up to ``self.timeout`` seconds
 //|
 //|         If no message is received in time, `None` is returned.  Otherwise,
 //|         a `Message` or `RemoteTransmissionRequest` is returned."""
 //|         ...
-//|
 STATIC mp_obj_t canio_listener_receive(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_check_for_deinit(self);
@@ -68,7 +66,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_receive_obj, canio_listener_rece
 //|         """Returns the number of messages (including remote
 //|         transmission requests) waiting"""
 //|         ...
-//|
 STATIC mp_obj_t canio_listener_in_waiting(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_check_for_deinit(self);
@@ -82,8 +79,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_i
 //|         This method exists so that `Listener` can be used as an
 //|         iterable"""
 //|         ...
-//|
-//|     def __next__(self) -> Union[RemoteTransmissionRequest,Message]:
+//|     def __next__(self) -> Union[RemoteTransmissionRequest, Message]:
 //|         """Reads a message, after waiting up to self.timeout seconds
 //|
 //|         If no message is received in time, raises StopIteration.  Otherwise,
@@ -92,7 +88,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_i
 //|         This method enables the `Listener` to be used as an
 //|         iterable, for instance in a for-loop."""
 //|         ...
-//|
 STATIC mp_obj_t canio_iternext(mp_obj_t self_in) {
     mp_obj_t result = canio_listener_receive(self_in);
     if (result == mp_const_none) {
@@ -104,7 +99,6 @@ STATIC mp_obj_t canio_iternext(mp_obj_t self_in) {
 //|     def deinit(self) -> None:
 //|         """Deinitialize this object, freeing its hardware resources"""
 //|         ...
-//|
 STATIC mp_obj_t canio_listener_deinit(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_deinit(self);
@@ -115,7 +109,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_deinit_obj, canio_listener_deini
 //|     def __enter__(self) -> CAN:
 //|         """Returns self, to allow the object to be used in a `with` statement for resource control"""
 //|         ...
-//|
 STATIC mp_obj_t canio_listener_enter(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_check_for_deinit(self);
@@ -123,7 +116,12 @@ STATIC mp_obj_t canio_listener_enter(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_enter_obj, canio_listener_enter);
 
-//|     def __exit__(self, unused1: Optional[Type[BaseException]], unused2: Optional[BaseException], unused3: Optional[TracebackType]) -> None:
+//|     def __exit__(
+//|         self,
+//|         unused1: Optional[Type[BaseException]],
+//|         unused2: Optional[BaseException],
+//|         unused3: Optional[TracebackType],
+//|     ) -> None:
 //|         """Calls deinit()"""
 //|         ...
 STATIC mp_obj_t canio_listener_exit(size_t num_args, const mp_obj_t args[]) {
@@ -134,7 +132,7 @@ STATIC mp_obj_t canio_listener_exit(size_t num_args, const mp_obj_t args[]) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_listener_exit_obj, 4, 4, canio_listener_exit);
 
 
-//|     timeout : float
+//|     timeout: float
 STATIC mp_obj_t canio_listener_timeout_get(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_check_for_deinit(self);
diff --git a/shared-bindings/canio/Match.c b/shared-bindings/canio/Match.c
index 52262b0a6c..097807b7ce 100644
--- a/shared-bindings/canio/Match.c
+++ b/shared-bindings/canio/Match.c
@@ -32,7 +32,6 @@
 //| class Match:
 //|     """Describe CAN bus messages to match"""
 //|
-//|
 //|     def __init__(self, id: int, *, mask: Optional[int] = None, extended: bool = False) -> None:
 //|         """Construct a Match with the given properties.
 //|
@@ -40,7 +39,6 @@
 //|         the nonzero bits in mask. Otherwise, it matches exactly the given id.
 //|         If extended is true then only extended ids are matched, otherwise
 //|         only standard ids are matched."""
-//|
 
 STATIC mp_obj_t canio_match_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_id, ARG_mask, ARG_extended, NUM_ARGS };
@@ -74,7 +72,6 @@ STATIC mp_obj_t canio_match_make_new(const mp_obj_type_t *type, size_t n_args, s
 
 //|     id: int
 //|     """The id to match"""
-//|
 
 STATIC mp_obj_t canio_match_id_get(mp_obj_t self_in) {
     canio_match_obj_t *self = self_in;
@@ -85,10 +82,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_match_id_get_obj, canio_match_id_get);
 MP_PROPERTY_GETTER(canio_match_id_obj,
     (mp_obj_t)&canio_match_id_get_obj);
 
-//|
 //|     mask: int
 //|     """The optional mask of ids to match"""
-//|
 
 STATIC mp_obj_t canio_match_mask_get(mp_obj_t self_in) {
     canio_match_obj_t *self = self_in;
@@ -101,7 +96,6 @@ MP_PROPERTY_GETTER(canio_match_mask_obj,
 
 //|     extended: bool
 //|     """True to match extended ids, False to match standard ides"""
-//|
 
 STATIC mp_obj_t canio_match_extended_get(mp_obj_t self_in) {
     canio_match_obj_t *self = self_in;
diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c
index 28c445316a..21032da796 100644
--- a/shared-bindings/canio/Message.c
+++ b/shared-bindings/canio/Message.c
@@ -41,7 +41,6 @@
 //|         In CAN, messages can have a length from 0 to 8 bytes.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_id, ARG_data, ARG_extended, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -67,7 +66,6 @@ STATIC mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args,
 
 //|     id: int
 //|     """The numeric ID of the message"""
-//|
 STATIC mp_obj_t canio_message_id_get(const mp_obj_t self_in) {
     canio_message_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(common_hal_canio_message_get_id(self));
@@ -87,7 +85,6 @@ MP_PROPERTY_GETSET(canio_message_id_obj,
 
 //|     data: bytes
 //|     """The content of the message"""
-//|
 STATIC mp_obj_t canio_message_data_get(const mp_obj_t self_in) {
     canio_message_obj_t *self = self_in;
     return mp_obj_new_bytes((const byte *)common_hal_canio_message_get_data(self), common_hal_canio_message_get_length(self));
@@ -114,7 +111,6 @@ MP_PROPERTY_GETSET(canio_message_data_obj,
 
 //|     extended: bool
 //|     """True if the message's id is an extended id"""
-//|
 STATIC mp_obj_t canio_message_extended_get(const mp_obj_t self_in) {
     canio_message_obj_t *self = self_in;
     return mp_obj_new_bool(common_hal_canio_message_get_extended(self));
diff --git a/shared-bindings/canio/RemoteTransmissionRequest.c b/shared-bindings/canio/RemoteTransmissionRequest.c
index 58ac3aa2de..bad65456df 100644
--- a/shared-bindings/canio/RemoteTransmissionRequest.c
+++ b/shared-bindings/canio/RemoteTransmissionRequest.c
@@ -41,7 +41,6 @@
 //|         In CAN, messages can have a length from 0 to 8 bytes.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t canio_remote_transmission_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_id, ARG_length, ARG_extended, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -68,7 +67,6 @@ STATIC mp_obj_t canio_remote_transmission_request_make_new(const mp_obj_type_t *
 
 //|     id: int
 //|     """The numeric ID of the message"""
-//|
 STATIC mp_obj_t canio_remote_transmission_request_id_get(const mp_obj_t self_in) {
     canio_remote_transmission_request_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(common_hal_canio_remote_transmission_request_get_id(self));
@@ -88,7 +86,6 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_id_obj,
 
 //|     extended: bool
 //|     """True if the message's id is an extended id"""
-//|
 STATIC mp_obj_t canio_remote_transmission_request_extended_get(const mp_obj_t self_in) {
     canio_remote_transmission_request_obj_t *self = self_in;
     return mp_obj_new_bool(common_hal_canio_remote_transmission_request_get_extended(self));
@@ -109,7 +106,6 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj,
 
 //|     length: int
 //|     """The length of the requested message."""
-//|
 STATIC mp_obj_t canio_remote_transmission_request_length_get(const mp_obj_t self_in) {
     canio_remote_transmission_request_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(common_hal_canio_remote_transmission_request_get_length(self));
diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
index ecef7ebde6..9f5141e41d 100644
--- a/shared-bindings/canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -58,7 +58,6 @@
 //| For more information on working with this module, refer to
 //| `this Learn Guide on using it `_.
 //| """
-//|
 
 #include "py/obj.h"
 #include "py/enum.h"
@@ -97,7 +96,6 @@ MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, BUS_OFF, BUS_STATE_OFF);
 //|     """The bus has turned off due to the number of errors that have
 //|     occurred recently.  It must be restarted before it will send or receive
 //|     packets.  This device will neither send or acknowledge packets on the bus."""
-//|
 MAKE_ENUM_MAP(canio_bus_state) {
     MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_ACTIVE),
     MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_PASSIVE),
diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c
index 79ac3e75da..e001b222b4 100644
--- a/shared-bindings/countio/Counter.c
+++ b/shared-bindings/countio/Counter.c
@@ -11,10 +11,15 @@
 #include "shared-bindings/util.h"
 
 //| class Counter:
-//|     """Count the number of rising- and/or falling-edge transitions on a given pin.
-//|     """
+//|     """Count the number of rising- and/or falling-edge transitions on a given pin."""
 //|
-//|     def __init__(self, pin: microcontroller.Pin, *, edge: Edge = Edge.FALL, pull: Optional[digitalio.Pull] = None) -> None:
+//|     def __init__(
+//|         self,
+//|         pin: microcontroller.Pin,
+//|         *,
+//|         edge: Edge = Edge.FALL,
+//|         pull: Optional[digitalio.Pull] = None
+//|     ) -> None:
 //|         """Create a Counter object associated with the given pin that counts
 //|         rising- and/or falling-edge transitions. At least one of ``rise`` and ``fall`` must be True.
 //|         The default is to count only falling edges, and is for historical backward compatibility.
@@ -38,7 +43,6 @@
 //|                 print(pin_counter.count)
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_edge, ARG_pull };
     static const mp_arg_t allowed_args[] = {
@@ -63,7 +67,6 @@ STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_arg
 
 //|     def deinit(self) -> None:
 //|         """Deinitializes the Counter and releases any hardware resources for reuse."""
-//|
 STATIC mp_obj_t countio_counter_deinit(mp_obj_t self_in) {
     countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_countio_counter_deinit(self);
@@ -79,13 +82,11 @@ STATIC void check_for_deinit(countio_counter_obj_t *self) {
 
 //|     def __enter__(self) -> Counter:
 //|         """No-op used by Context Managers."""
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
-//|            :ref:`lifetime-and-contextmanagers` for more info."""
-//|
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
 STATIC mp_obj_t countio_counter_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_countio_counter_deinit(args[0]);
@@ -96,7 +97,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(countio_counter___exit___obj, 4, 4, c
 
 //|     count: int
 //|     """The current count in terms of pulses."""
-//|
 STATIC mp_obj_t countio_counter_obj_get_count(mp_obj_t self_in) {
     countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -120,7 +120,6 @@ MP_PROPERTY_GETSET(countio_counter_count_obj,
 
 //|     def reset(self) -> None:
 //|         """Resets the count back to 0."""
-//|
 STATIC mp_obj_t countio_counter_reset(mp_obj_t self_in) {
     countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/countio/Edge.c b/shared-bindings/countio/Edge.c
index 980b3a3705..04c5116924 100644
--- a/shared-bindings/countio/Edge.c
+++ b/shared-bindings/countio/Edge.c
@@ -40,7 +40,6 @@ MAKE_ENUM_VALUE(countio_edge_type, edge, RISE_AND_FALL, EDGE_RISE_AND_FALL);
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define which signal transitions to count."""
 //|         ...
-//|
 //|     RISE: Edge
 //|     """Count the rising edges."""
 //|
@@ -49,7 +48,6 @@ MAKE_ENUM_VALUE(countio_edge_type, edge, RISE_AND_FALL, EDGE_RISE_AND_FALL);
 //|
 //|     RISE_AND_FALL: Edge
 //|     """Count the rising and falling edges."""
-//|
 MAKE_ENUM_MAP(countio_edge) {
     MAKE_ENUM_MAP_ENTRY(edge, RISE),
     MAKE_ENUM_MAP_ENTRY(edge, FALL),
diff --git a/shared-bindings/countio/__init__.c b/shared-bindings/countio/__init__.c
index 307966c202..25e9c7d630 100644
--- a/shared-bindings/countio/__init__.c
+++ b/shared-bindings/countio/__init__.c
@@ -21,7 +21,6 @@
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info."""
-//|
 
 STATIC const mp_rom_map_elem_t countio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_countio) },
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index ae72b5cb55..e791ee7c52 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -57,7 +57,6 @@
 //|
 //|         :param ~microcontroller.Pin pin: The pin to control"""
 //|         ...
-//|
 STATIC mp_obj_t digitalio_digitalinout_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);
@@ -74,7 +73,6 @@ STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type,
 //|     def deinit(self) -> None:
 //|         """Turn off the DigitalInOut and release the pin for other use."""
 //|         ...
-//|
 STATIC mp_obj_t digitalio_digitalinout_obj_deinit(mp_obj_t self_in) {
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_digitalio_digitalinout_deinit(self);
@@ -85,14 +83,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_deinit_obj, digitalio_digitalin
 //|     def __enter__(self) -> DigitalInOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t digitalio_digitalinout_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_digitalio_digitalinout_deinit(MP_OBJ_TO_PTR(args[0]));
@@ -106,7 +102,9 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
     }
 }
 
-//|     def switch_to_output(self, value: bool = False, drive_mode: DriveMode = DriveMode.PUSH_PULL) -> None:
+//|     def switch_to_output(
+//|         self, value: bool = False, drive_mode: DriveMode = DriveMode.PUSH_PULL
+//|     ) -> None:
 //|         """Set the drive mode and value and then switch to writing out digital
 //|         values.
 //|
@@ -114,7 +112,6 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
 //|         :param ~digitalio.DriveMode drive_mode: drive mode for the output
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t digitalio_digitalinout_switch_to_output(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_value, ARG_drive_mode };
     static const mp_arg_t allowed_args[] = {
@@ -155,7 +152,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_output_obj, 1, digit
 //|           switch.pull = digitalio.Pull.UP
 //|           print(switch.value)"""
 //|         ...
-//|
 STATIC mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_pull };
     static const mp_arg_t allowed_args[] = {
@@ -178,7 +174,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_input_obj, 1, digita
 //|     :py:meth:`switch_to_input` or :py:meth:`switch_to_output` method. If
 //|     you want to set pull, value or drive mode prior to switching, then use
 //|     those methods instead."""
-//|
 typedef struct {
     mp_obj_base_t base;
 } digitalio_digitalio_direction_obj_t;
@@ -219,7 +214,6 @@ MP_PROPERTY_GETSET(digitalio_digitalio_direction_obj,
 
 //|     value: bool
 //|     """The digital logic level of the pin."""
-//|
 STATIC mp_obj_t digitalio_digitalinout_obj_get_value(mp_obj_t self_in) {
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -249,7 +243,6 @@ MP_PROPERTY_GETSET(digitalio_digitalinout_value_obj,
 //|
 //|     - `digitalio.DriveMode.PUSH_PULL`
 //|     - `digitalio.DriveMode.OPEN_DRAIN`"""
-//|
 STATIC mp_obj_t digitalio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) {
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -293,7 +286,6 @@ MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj,
 //|     - `None`
 //|
 //|     :raises AttributeError: if `direction` is :py:data:`~digitalio.Direction.OUTPUT`."""
-//|
 STATIC mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) {
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c
index 0ed18f8edc..80797825f4 100644
--- a/shared-bindings/digitalio/Direction.c
+++ b/shared-bindings/digitalio/Direction.c
@@ -45,13 +45,11 @@
 //|         """Enum-like class to define which direction the digital values are
 //|         going."""
 //|         ...
-//|
 //|     INPUT: Direction
 //|     """Read digital data in"""
 //|
 //|     OUTPUT: Direction
 //|     """Write digital data out"""
-//|
 const mp_obj_type_t digitalio_direction_type;
 
 const digitalio_direction_obj_t digitalio_direction_input_obj = {
diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c
index c7c3400411..ef0a4831b0 100644
--- a/shared-bindings/digitalio/DriveMode.c
+++ b/shared-bindings/digitalio/DriveMode.c
@@ -33,14 +33,12 @@
 //|         """Enum-like class to define the drive mode used when outputting
 //|         digital values."""
 //|         ...
-//|
 //|     PUSH_PULL: DriveMode
 //|     """Output both high and low digital values"""
 //|
 //|     OPEN_DRAIN: DriveMode
 //|     """Output low digital values but go into high z for digital high. This is
 //|     useful for i2c and other protocols that share a digital line."""
-//|
 const mp_obj_type_t digitalio_drive_mode_type;
 
 const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj = {
diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c
index 364be05de0..f1787a1050 100644
--- a/shared-bindings/digitalio/Pull.c
+++ b/shared-bindings/digitalio/Pull.c
@@ -35,7 +35,6 @@
 //|         """Enum-like class to define the pull value, if any, used while reading
 //|         digital values in."""
 //|         ...
-//|
 //|     UP: Pull
 //|     """When the input line isn't being driven the pull up can pull the state
 //|     of the line high so it reads as true."""
@@ -43,7 +42,6 @@
 //|     DOWN: Pull
 //|     """When the input line isn't being driven the pull down can pull the
 //|     state of the line low so it reads as false."""
-//|
 const mp_obj_type_t digitalio_pull_type;
 
 const digitalio_pull_obj_t digitalio_pull_up_obj = {
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index ef5727261c..52c6988369 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -39,18 +39,17 @@
 //| class Bitmap:
 //|     """Stores values of a certain size in a 2D array
 //|
-//| Bitmaps can be treated as read-only buffers. If the number of bits in a pixel is 8, 16, or 32; and the number of bytes
-//| per row is a multiple of 4, then the resulting memoryview will correspond directly with the bitmap's contents. Otherwise,
-//| the bitmap data is packed into the memoryview with unspecified padding.
+//|     Bitmaps can be treated as read-only buffers. If the number of bits in a pixel is 8, 16, or 32; and the number of bytes
+//|     per row is a multiple of 4, then the resulting memoryview will correspond directly with the bitmap's contents. Otherwise,
+//|     the bitmap data is packed into the memoryview with unspecified padding.
 //|
-//| A Bitmap can be treated as a buffer, allowing its content to be
-//| viewed and modified using e.g., with ``ulab.numpy.frombuffer``,
-//| but the `displayio.Bitmap.dirty` method must be used to inform
-//| displayio when a bitmap was modified through the buffer interface.
+//|     A Bitmap can be treated as a buffer, allowing its content to be
+//|     viewed and modified using e.g., with ``ulab.numpy.frombuffer``,
+//|     but the `displayio.Bitmap.dirty` method must be used to inform
+//|     displayio when a bitmap was modified through the buffer interface.
 //|
-//| `bitmaptools.arrayblit` can also be useful to move data efficiently
-//| into a Bitmap.
-//| """
+//|     `bitmaptools.arrayblit` can also be useful to move data efficiently
+//|     into a Bitmap."""
 //|
 //|     def __init__(self, width: int, height: int, value_count: int) -> None:
 //|         """Create a Bitmap object with the given fixed size. Each pixel stores a value that is used to
@@ -61,7 +60,6 @@
 //|         :param int height: The number of values high
 //|         :param int value_count: The number of possible pixel values."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
     uint32_t width = mp_obj_get_int(all_args[0]);
@@ -88,7 +86,6 @@ STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_ar
 }
 //|     width: int
 //|     """Width of the bitmap. (read only)"""
-//|
 STATIC mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -102,7 +99,6 @@ MP_PROPERTY_GETTER(displayio_bitmap_width_obj,
 
 //|     height: int
 //|     """Height of the bitmap. (read only)"""
-//|
 STATIC mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -122,7 +118,6 @@ MP_PROPERTY_GETTER(displayio_bitmap_height_obj,
 //|
 //|           print(bitmap[0,1])"""
 //|         ...
-//|
 //|     def __setitem__(self, index: Union[Tuple[int, int], int], value: int) -> None:
 //|         """Sets the value at the given index. The index can either be an x,y tuple or an int equal
 //|         to ``y * width + x``.
@@ -131,7 +126,6 @@ MP_PROPERTY_GETTER(displayio_bitmap_height_obj,
 //|
 //|           bitmap[0,1] = 3"""
 //|         ...
-//|
 STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     if (value_obj == mp_const_none) {
         // delete item
@@ -177,7 +171,18 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     return mp_const_none;
 }
 
-//|     def blit(self, x: int, y: int, source_bitmap: Bitmap, *, x1: int, y1: int, x2: int, y2: int, skip_index: int) -> None:
+//|     def blit(
+//|         self,
+//|         x: int,
+//|         y: int,
+//|         source_bitmap: Bitmap,
+//|         *,
+//|         x1: int,
+//|         y1: int,
+//|         x2: int,
+//|         y2: int,
+//|         skip_index: int
+//|     ) -> None:
 //|         """Inserts the source_bitmap region defined by rectangular boundaries
 //|                     (x1,y1) and (x2,y2) into the bitmap at the specified (x,y) location.
 //|
@@ -193,7 +198,6 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
 //|         :param int skip_index: bitmap palette index in the source that will not be copied,
 //|                                set to None to copy all pixels"""
 //|         ...
-//|
 STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_x, ARG_y, ARG_source, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_index};
     static const mp_arg_t allowed_args[] = {
@@ -282,7 +286,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_blit_obj, 1, displayio_bitmap_obj_bl
 //|     def fill(self, value: int) -> None:
 //|         """Fills the bitmap with the supplied palette index value."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -296,7 +299,7 @@ STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj)
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill);
 
-//|     def dirty(self, x1: int=0, y1: int=0, x2: int=-1, y2:int = -1) -> None:
+//|     def dirty(self, x1: int = 0, y1: int = 0, x2: int = -1, y2: int = -1) -> None:
 //|         """Inform displayio of bitmap updates done via the buffer
 //|         protocol.
 //|
@@ -315,7 +318,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill);
 //|         notified of the "dirty rectangle" that encloses all modified
 //|         pixels."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     enum { ARG_x1, ARG_y1, ARG_x2, ARG_y2 };
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index f3fd9a2ab9..b03a8ff336 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -39,13 +39,14 @@
 //| class ColorConverter:
 //|     """Converts one color format to another."""
 //|
-//|     def __init__(self, *, input_colorspace: Colorspace=Colorspace.RGB888, dither: bool = False) -> None:
+//|     def __init__(
+//|         self, *, input_colorspace: Colorspace = Colorspace.RGB888, dither: bool = False
+//|     ) -> None:
 //|         """Create a ColorConverter object to convert color formats.
 //|
 //|         :param Colorspace colorspace: The source colorspace, one of the Colorspace constants
 //|         :param bool dither: Adds random noise to dither the output image"""
 //|         ...
-//|
 
 STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_dither, ARG_input_colorspace };
@@ -68,7 +69,6 @@ STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, siz
 //|     def convert(self, color: int) -> int:
 //|         """Converts the given color to RGB565 according to the Colorspace"""
 //|         ...
-//|
 STATIC mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -84,7 +84,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_convert_obj, displayio_colorc
 //|     dither: bool
 //|     """When `True` the ColorConverter dithers the output by adding random noise when
 //|     truncating to display bitdepth"""
-//|
 STATIC mp_obj_t displayio_colorconverter_obj_get_dither(mp_obj_t self_in) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_displayio_colorconverter_get_dither(self));
@@ -109,7 +108,6 @@ MP_PROPERTY_GETSET(displayio_colorconverter_dither_obj,
 //|         raise an Exception if there is already a selected transparent index.
 //|
 //|         :param int color: The color to be transparent"""
-//|
 STATIC mp_obj_t displayio_colorconverter_make_transparent(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -123,7 +121,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, display
 //|         """Make the ColorConverter be opaque and have no transparent pixels.
 //|
 //|         :param int color: [IGNORED] Use any value"""
-//|
 STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/displayio/Colorspace.c b/shared-bindings/displayio/Colorspace.c
index 3692dc29bc..265c68b1e1 100644
--- a/shared-bindings/displayio/Colorspace.c
+++ b/shared-bindings/displayio/Colorspace.c
@@ -58,7 +58,6 @@ MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, L8, DISPLAYIO_C
 //|
 //|     RGB555_SWAPPED: Colorspace
 //|     """The swapped 15-bit colorspace.  First, the high and low 8 bits of the number are swapped, then they are interpreted as for RGB555"""
-//|
 MAKE_ENUM_MAP(displayio_colorspace) {
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB888),
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB565),
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index b01de20cf8..f128b4070c 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -39,11 +39,9 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/translate/translate.h"
 
-//| _DisplayBus = Union['FourWire', 'paralleldisplay.ParallelBus', 'I2CDisplay']
+//| _DisplayBus = Union["FourWire", "paralleldisplay.ParallelBus", "I2CDisplay"]
 //| """:py:class:`FourWire`, :py:class:`paralleldisplay.ParallelBus` or :py:class:`I2CDisplay`"""
-//|
 
-//|
 //| class Display:
 //|     """Manage updating a display over a display bus
 //|
@@ -54,7 +52,34 @@
 //|     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, backlight_pin: Optional[microcontroller.Pin] = None, brightness_command: Optional[int] = None, brightness: float = 1.0, 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:
+//|     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,
+//|         backlight_pin: Optional[microcontroller.Pin] = None,
+//|         brightness_command: Optional[int] = None,
+//|         brightness: float = 1.0,
+//|         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
@@ -113,7 +138,6 @@
 //|         :param int backlight_pwm_frequency: The frequency to use to drive the PWM for backlight brightness control. Default is 50000.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_args,
     size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart,
@@ -219,7 +243,6 @@ static displayio_display_obj_t *native_display(mp_obj_t display_obj) {
 //|
 //|         :param Group group: The group to show."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     displayio_display_obj_t *self = native_display(self_in);
     displayio_group_t *group = NULL;
@@ -235,7 +258,12 @@ STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in)
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_show_obj, displayio_display_obj_show);
 
-//|     def refresh(self, *, target_frames_per_second: Optional[int] = None, minimum_frames_per_second: int = 0) -> bool:
+//|     def refresh(
+//|         self,
+//|         *,
+//|         target_frames_per_second: Optional[int] = None,
+//|         minimum_frames_per_second: int = 0
+//|     ) -> bool:
 //|         """When auto_refresh is off, and :py:attr:`target_frames_per_second` is not `None` this waits
 //|         for the target frame rate and then refreshes the display,
 //|         returning `True`. If the call has taken too long since the last refresh call for the given
@@ -255,7 +283,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_show_obj, displayio_display_obj_show
 //|             achieve. Set to `None` for immediate refresh.
 //|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_display_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
     static const mp_arg_t allowed_args[] = {
@@ -287,7 +314,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_display_refresh_obj, 1, displayio_display_o
 
 //|     auto_refresh: bool
 //|     """True when the display is refreshed automatically."""
-//|
 STATIC mp_obj_t displayio_display_obj_get_auto_refresh(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return mp_obj_new_bool(common_hal_displayio_display_get_auto_refresh(self));
@@ -309,7 +335,6 @@ MP_PROPERTY_GETSET(displayio_display_auto_refresh_obj,
 
 //|     brightness: float
 //|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness."""
-//|
 STATIC mp_obj_t displayio_display_obj_get_brightness(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     mp_float_t brightness = common_hal_displayio_display_get_brightness(self);
@@ -340,7 +365,6 @@ MP_PROPERTY_GETSET(displayio_display_brightness_obj,
 
 //|     width: int
 //|     """Gets the width of the board"""
-//|
 STATIC mp_obj_t displayio_display_obj_get_width(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_width(self));
@@ -352,7 +376,6 @@ MP_PROPERTY_GETTER(displayio_display_width_obj,
 
 //|     height: int
 //|     """Gets the height of the board"""
-//|
 STATIC mp_obj_t displayio_display_obj_get_height(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_height(self));
@@ -364,7 +387,6 @@ MP_PROPERTY_GETTER(displayio_display_height_obj,
 
 //|     rotation: int
 //|     """The rotation of the display as an int in degrees."""
-//|
 STATIC mp_obj_t displayio_display_obj_get_rotation(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_rotation(self));
@@ -384,8 +406,6 @@ MP_PROPERTY_GETSET(displayio_display_rotation_obj,
 
 //|     bus: _DisplayBus
 //|     """The bus being used by the display"""
-//|
-//|
 STATIC mp_obj_t displayio_display_obj_get_bus(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return common_hal_displayio_display_get_bus(self);
@@ -397,8 +417,6 @@ MP_PROPERTY_GETTER(displayio_display_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the display."""
-//|
-//|
 STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return common_hal_displayio_display_get_root_group(self);
@@ -415,7 +433,6 @@ MP_PROPERTY_GETTER(displayio_display_root_group_obj,
 //|         :param int y: The top edge of the area
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data"""
 //|         ...
-//|
 STATIC mp_obj_t displayio_display_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_y, ARG_buffer };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 81863b2a7a..8cb16c3c28 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -49,21 +49,37 @@
 //|     Most people should not use this class directly. Use a specific display driver instead that will
 //|     contain the startup and shutdown sequences at minimum."""
 //|
-//|     def __init__(self, display_bus: _DisplayBus,
-//|                  start_sequence: ReadableBuffer, stop_sequence: ReadableBuffer, *,
-//|                  width: int, height: int, ram_width: int, ram_height: int,
-//|                  colstart: int = 0, rowstart: int = 0, rotation: int = 0,
-//|                  set_column_window_command: Optional[int] = None,
-//|                  set_row_window_command: Optional[int] = None,
-//|                  set_current_column_command: Optional[int] = None,
-//|                  set_current_row_command: Optional[int] = None,
-//|                  write_black_ram_command: int, black_bits_inverted: bool = False,
-//|                  write_color_ram_command: Optional[int] = None,
-//|                  color_bits_inverted: bool = False, highlight_color: int = 0x000000,
-//|                  refresh_display_command: int, refresh_time: float = 40,
-//|                  busy_pin: Optional[microcontroller.Pin] = None, busy_state: bool = True,
-//|                  seconds_per_frame: float = 180, always_toggle_chip_select: bool = False,
-//|                  grayscale: bool = False, two_byte_sequence_length: bool = False) -> None:
+//|     def __init__(
+//|         self,
+//|         display_bus: _DisplayBus,
+//|         start_sequence: ReadableBuffer,
+//|         stop_sequence: ReadableBuffer,
+//|         *,
+//|         width: int,
+//|         height: int,
+//|         ram_width: int,
+//|         ram_height: int,
+//|         colstart: int = 0,
+//|         rowstart: int = 0,
+//|         rotation: int = 0,
+//|         set_column_window_command: Optional[int] = None,
+//|         set_row_window_command: Optional[int] = None,
+//|         set_current_column_command: Optional[int] = None,
+//|         set_current_row_command: Optional[int] = None,
+//|         write_black_ram_command: int,
+//|         black_bits_inverted: bool = False,
+//|         write_color_ram_command: Optional[int] = None,
+//|         color_bits_inverted: bool = False,
+//|         highlight_color: int = 0x000000,
+//|         refresh_display_command: int,
+//|         refresh_time: float = 40,
+//|         busy_pin: Optional[microcontroller.Pin] = None,
+//|         busy_state: bool = True,
+//|         seconds_per_frame: float = 180,
+//|         always_toggle_chip_select: bool = False,
+//|         grayscale: bool = False,
+//|         two_byte_sequence_length: bool = False
+//|     ) -> None:
 //|         """Create a EPaperDisplay object on the given display bus (`displayio.FourWire` or `paralleldisplay.ParallelBus`).
 //|
 //|         The ``start_sequence`` and ``stop_sequence`` are bitpacked to minimize the ram impact. Every
@@ -103,7 +119,6 @@
 //|         :param bool grayscale: When true, the color ram is the low bit of 2-bit grayscale
 //|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length"""
 //|         ...
-//|
 STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_display_bus, ARG_start_sequence, ARG_stop_sequence, ARG_width, ARG_height,
            ARG_ram_width, ARG_ram_height, ARG_colstart, ARG_rowstart, ARG_rotation,
@@ -203,7 +218,6 @@ static displayio_epaperdisplay_obj_t *native_display(mp_obj_t display_obj) {
 //|
 //|         :param Group group: The group to show."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     displayio_group_t *group = NULL;
@@ -219,10 +233,11 @@ STATIC mp_obj_t displayio_epaperdisplay_obj_show(mp_obj_t self_in, mp_obj_t grou
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_epaperdisplay_show_obj, displayio_epaperdisplay_obj_show);
 
-//|     def update_refresh_mode(self, start_sequence: ReadableBuffer, seconds_per_frame: float = 180) -> None:
+//|     def update_refresh_mode(
+//|         self, start_sequence: ReadableBuffer, seconds_per_frame: float = 180
+//|     ) -> None:
 //|         """Updates the ``start_sequence`` and ``seconds_per_frame`` parameters to enable
 //|         varying the refresh mode of the display."""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_update_refresh_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_start_sequence, ARG_seconds_per_frame };
     static const mp_arg_t allowed_args[] = {
@@ -248,7 +263,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_epaperdisplay_update_refresh_mode_obj, 1, d
 //|         """Refreshes the display immediately or raises an exception if too soon. Use
 //|         ``time.sleep(display.time_to_refresh)`` to sleep until a refresh can occur."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_refresh(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     bool ok = common_hal_displayio_epaperdisplay_refresh(self);
@@ -261,7 +275,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_refresh_obj, displayio_epaperd
 
 //|     time_to_refresh: float
 //|     """Time, in fractional seconds, until the ePaper display can be refreshed."""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return mp_obj_new_float(common_hal_displayio_epaperdisplay_get_time_to_refresh(self) / 1000.0);
@@ -274,7 +287,6 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_time_to_refresh_obj,
 //|     busy: bool
 //|     """True when the display is refreshing. This uses the ``busy_pin`` when available or the
 //|        ``refresh_time`` otherwise."""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_busy(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return mp_obj_new_bool(common_hal_displayio_epaperdisplay_get_busy(self));
@@ -286,7 +298,6 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_busy_obj,
 
 //|     width: int
 //|     """Gets the width of the display in pixels"""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_width(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_epaperdisplay_get_width(self));
@@ -298,7 +309,6 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_width_obj,
 
 //|     height: int
 //|     """Gets the height of the display in pixels"""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_height(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_epaperdisplay_get_height(self));
@@ -310,7 +320,6 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_height_obj,
 
 //|     rotation: int
 //|     """The rotation of the display as an int in degrees."""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_rotation(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_epaperdisplay_get_rotation(self));
@@ -330,7 +339,6 @@ MP_PROPERTY_GETSET(displayio_epaperdisplay_rotation_obj,
 
 //|     bus: _DisplayBus
 //|     """The bus being used by the display"""
-//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_bus(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return common_hal_displayio_epaperdisplay_get_bus(self);
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 7e72169230..1db9a09868 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -43,7 +43,17 @@
 //|     """Manage updating a display over SPI four wire protocol in the background while Python code runs.
 //|     It doesn't handle display initialization."""
 //|
-//|     def __init__(self, spi_bus: busio.SPI, *, command: Optional[microcontroller.Pin], chip_select: microcontroller.Pin, reset: Optional[microcontroller.Pin] = None, baudrate: int = 24000000, polarity: int = 0, phase: int = 0) -> None:
+//|     def __init__(
+//|         self,
+//|         spi_bus: busio.SPI,
+//|         *,
+//|         command: Optional[microcontroller.Pin],
+//|         chip_select: microcontroller.Pin,
+//|         reset: Optional[microcontroller.Pin] = None,
+//|         baudrate: int = 24000000,
+//|         polarity: int = 0,
+//|         phase: int = 0
+//|     ) -> None:
 //|         """Create a FourWire object associated with the given pins.
 //|
 //|         The SPI bus and pins are then in use by the display until `displayio.release_displays()` is
@@ -65,7 +75,6 @@
 //|         :param int phase: the edge of the clock that data is captured. First (0)
 //|             or second (1). Rising or falling depends on clock polarity."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_spi_bus, ARG_command, ARG_chip_select, ARG_reset, ARG_baudrate, ARG_polarity, ARG_phase };
     static const mp_arg_t allowed_args[] = {
@@ -101,7 +110,6 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
 //|         """Performs a hardware reset via the reset pin. Raises an exception if called when no reset pin
 //|         is available."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_fourwire_obj_reset(mp_obj_t self_in) {
     displayio_fourwire_obj_t *self = self_in;
 
@@ -112,11 +120,12 @@ STATIC mp_obj_t displayio_fourwire_obj_reset(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(displayio_fourwire_reset_obj, displayio_fourwire_obj_reset);
 
-//|     def send(self, command: int, data: ReadableBuffer, *, toggle_every_byte: bool = False) -> None:
+//|     def send(
+//|         self, command: int, data: ReadableBuffer, *, toggle_every_byte: bool = False
+//|     ) -> None:
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_command, ARG_data, ARG_toggle_every_byte };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 4a57b4a5f1..574d366690 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -46,7 +46,6 @@
 //|         :param int x: Initial x position within the parent.
 //|         :param int y: Initial y position within the parent."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_scale, ARG_x, ARG_y };
     static const mp_arg_t allowed_args[] = {
@@ -79,7 +78,6 @@ displayio_group_t *native_group(mp_obj_t group_obj) {
 //|     hidden: bool
 //|     """True when the Group and all of it's layers are not visible. When False, the Group's layers
 //|     are visible if they haven't been hidden."""
-//|
 STATIC mp_obj_t displayio_group_obj_get_hidden(mp_obj_t self_in) {
     displayio_group_t *self = native_group(self_in);
     return mp_obj_new_bool(common_hal_displayio_group_get_hidden(self));
@@ -101,7 +99,6 @@ MP_PROPERTY_GETSET(displayio_group_hidden_obj,
 //|     scale: int
 //|     """Scales each pixel within the Group in both directions. For example, when scale=2 each pixel
 //|     will be represented by 2x2 pixels."""
-//|
 STATIC mp_obj_t displayio_group_obj_get_scale(mp_obj_t self_in) {
     displayio_group_t *self = native_group(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_scale(self));
@@ -124,7 +121,6 @@ MP_PROPERTY_GETSET(displayio_group_scale_obj,
 
 //|     x: int
 //|     """X position of the Group in the parent."""
-//|
 STATIC mp_obj_t displayio_group_obj_get_x(mp_obj_t self_in) {
     displayio_group_t *self = native_group(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_x(self));
@@ -146,7 +142,6 @@ MP_PROPERTY_GETSET(displayio_group_x_obj,
 
 //|     y: int
 //|     """Y position of the Group in the parent."""
-//|
 STATIC mp_obj_t displayio_group_obj_get_y(mp_obj_t self_in) {
     displayio_group_t *self = native_group(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_y(self));
@@ -166,10 +161,12 @@ MP_PROPERTY_GETSET(displayio_group_y_obj,
     (mp_obj_t)&displayio_group_get_y_obj,
     (mp_obj_t)&displayio_group_set_y_obj);
 
-//|     def append(self, layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> None:
+//|     def append(
+//|         self,
+//|         layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> None:
 //|         """Append a layer to the group. It will be drawn above other layers."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_append(mp_obj_t self_in, mp_obj_t layer) {
     displayio_group_t *self = native_group(self_in);
     common_hal_displayio_group_insert(self, common_hal_displayio_group_get_len(self), layer);
@@ -177,10 +174,13 @@ STATIC mp_obj_t displayio_group_obj_append(mp_obj_t self_in, mp_obj_t layer) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_append_obj, displayio_group_obj_append);
 
-//|     def insert(self, index: int, layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> None:
+//|     def insert(
+//|         self,
+//|         index: int,
+//|         layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> None:
 //|         """Insert a layer into the group."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t layer) {
     displayio_group_t *self = native_group(self_in);
     if ((size_t)MP_OBJ_SMALL_INT_VALUE(index_obj) == common_hal_displayio_group_get_len(self)) {
@@ -193,10 +193,12 @@ STATIC mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj,
 MP_DEFINE_CONST_FUN_OBJ_3(displayio_group_insert_obj, displayio_group_obj_insert);
 
 
-//|     def index(self, layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> int:
+//|     def index(
+//|         self,
+//|         layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> int:
 //|         """Returns the index of the first copy of layer. Raises ValueError if not found."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_index(mp_obj_t self_in, mp_obj_t layer) {
     displayio_group_t *self = native_group(self_in);
     mp_int_t index = common_hal_displayio_group_index(self, layer);
@@ -207,10 +209,11 @@ STATIC mp_obj_t displayio_group_obj_index(mp_obj_t self_in, mp_obj_t layer) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_index_obj, displayio_group_obj_index);
 
-//|     def pop(self, i: int = -1) -> Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]:
+//|     def pop(
+//|         self, i: int = -1
+//|     ) -> Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]:
 //|         """Remove the ith item and return it."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_i };
     static const mp_arg_t allowed_args[] = {
@@ -230,10 +233,12 @@ STATIC mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args,
 MP_DEFINE_CONST_FUN_OBJ_KW(displayio_group_pop_obj, 1, displayio_group_obj_pop);
 
 
-//|     def remove(self, layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> None:
+//|     def remove(
+//|         self,
+//|         layer: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> None:
 //|         """Remove the first copy of layer. Raises ValueError if it is not present."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_remove(mp_obj_t self_in, mp_obj_t layer) {
     mp_obj_t index = displayio_group_obj_index(self_in, layer);
     displayio_group_t *self = native_group(self_in);
@@ -243,13 +248,10 @@ STATIC mp_obj_t displayio_group_obj_remove(mp_obj_t self_in, mp_obj_t layer) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_remove_obj, displayio_group_obj_remove);
 
-//|     def __bool__(self) -> bool:
-//|         ...
-//|
+//|     def __bool__(self) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Returns the number of layers in a Group"""
 //|         ...
-//|
 STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     displayio_group_t *self = native_group(self_in);
     uint16_t len = common_hal_displayio_group_get_len(self);
@@ -263,22 +265,26 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-//|     def __getitem__(self, index: int) -> Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]:
+//|     def __getitem__(
+//|         self, index: int
+//|     ) -> Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]:
 //|         """Returns the value at the given index.
 //|
 //|         This allows you to::
 //|
 //|           print(group[0])"""
 //|         ...
-//|
-//|     def __setitem__(self, index: int, value: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]) -> None:
+//|     def __setitem__(
+//|         self,
+//|         index: int,
+//|         value: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> None:
 //|         """Sets the value at the given index.
 //|
 //|         This allows you to::
 //|
 //|           group[0] = sprite"""
 //|         ...
-//|
 //|     def __delitem__(self, index: int) -> None:
 //|         """Deletes the value at the given index.
 //|
@@ -286,7 +292,6 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|
 //|           del group[0]"""
 //|         ...
-//|
 STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     displayio_group_t *self = native_group(self_in);
 
@@ -310,7 +315,6 @@ STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t valu
 //|     def sort(self, key: function, reverse: bool) -> None:
 //|         """Sort the members of the group."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_group_t *self = native_group(pos_args[0]);
     mp_obj_t *args = m_new(mp_obj_t, n_args);
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index 86138d8a36..8417e20eb7 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -43,7 +43,13 @@
 //|     """Manage updating a display over I2C in the background while Python code runs.
 //|     It doesn't handle display initialization."""
 //|
-//|     def __init__(self, i2c_bus: busio.I2C, *, device_address: int, reset: Optional[microcontroller.Pin] = None) -> None:
+//|     def __init__(
+//|         self,
+//|         i2c_bus: busio.I2C,
+//|         *,
+//|         device_address: int,
+//|         reset: Optional[microcontroller.Pin] = None
+//|     ) -> None:
 //|         """Create a I2CDisplay object associated with the given I2C bus and reset pin.
 //|
 //|         The I2C bus and pins are then in use by the display until `displayio.release_displays()` is
@@ -55,7 +61,6 @@
 //|         :param int device_address: The I2C address of the device
 //|         :param microcontroller.Pin reset: Reset pin. When None only software reset can be used"""
 //|         ...
-//|
 STATIC mp_obj_t displayio_i2cdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_i2c_bus, ARG_device_address, ARG_reset };
     static const mp_arg_t allowed_args[] = {
@@ -81,7 +86,6 @@ STATIC mp_obj_t displayio_i2cdisplay_make_new(const mp_obj_type_t *type, size_t
 //|         """Performs a hardware reset via the reset pin. Raises an exception if called when no reset pin
 //|         is available."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_i2cdisplay_obj_reset(mp_obj_t self_in) {
     displayio_i2cdisplay_obj_t *self = self_in;
 
@@ -96,7 +100,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_i2cdisplay_reset_obj, displayio_i2cdisplay_o
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_i2cdisplay_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) {
     mp_int_t command_int = mp_obj_get_int(command_obj);
     mp_arg_validate_int_range(command_int, 0, 255, MP_QSTR_command);
diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index f71c3cfe82..9a1ff0ba75 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -67,7 +67,7 @@
 //|       while True:
 //|           pass"""
 //|
-//|     def __init__(self, file: Union[str,typing.BinaryIO]) -> None:
+//|     def __init__(self, file: Union[str, typing.BinaryIO]) -> None:
 //|         """Create an OnDiskBitmap object with the given file.
 //|
 //|         :param file file: The name of the bitmap file.  For backwards compatibility, a file opened in binary mode may also be passed.
@@ -78,7 +78,6 @@
 //|         of CircuitPython will remove the ability to pass in an opened file.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
     mp_obj_t arg = all_args[0];
@@ -99,7 +98,6 @@ STATIC mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_
 
 //|     width: int
 //|     """Width of the bitmap. (read only)"""
-//|
 STATIC mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) {
     displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -113,7 +111,6 @@ MP_PROPERTY_GETTER(displayio_ondiskbitmap_width_obj,
 
 //|     height: int
 //|     """Height of the bitmap. (read only)"""
-//|
 STATIC mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) {
     displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -129,7 +126,6 @@ MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj,
 //|     """The image's pixel_shader.  The type depends on the underlying
 //|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
 //|     transparent pixel or, for palette shaded images, to update the palette.)"""
-//|
 STATIC mp_obj_t displayio_ondiskbitmap_obj_get_pixel_shader(mp_obj_t self_in) {
     displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_displayio_ondiskbitmap_get_pixel_shader(self);
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 5724c9bc87..9c696ed916 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -45,7 +45,6 @@
 //|
 //|         :param int color_count: The number of colors in the Palette"""
 //|         ...
-//|
 // TODO(tannewt): Add support for other color formats.
 // TODO(tannewt): Add support for 8-bit alpha blending.
 //|
@@ -64,13 +63,10 @@ STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_a
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|     def __bool__(self) -> bool:
-//|         ...
-//|
+//|     def __bool__(self) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Returns the number of colors in a Palette"""
 //|         ...
-//|
 STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
@@ -86,8 +82,9 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     def __getitem__(self, index: int) -> Optional[int]:
 //|         r"""Return the pixel color at the given index as an integer."""
 //|         ...
-//|
-//|     def __setitem__(self, index: int, value: Union[int, ReadableBuffer, Tuple[int, int, int]]) -> None:
+//|     def __setitem__(
+//|         self, index: int, value: Union[int, ReadableBuffer, Tuple[int, int, int]]
+//|     ) -> None:
 //|         r"""Sets the pixel color at the given index. The index should be an integer in the range 0 to color_count-1.
 //|
 //|         The value argument represents a color, and can be from 0x000000 to 0xFFFFFF (to represent an RGB value).
@@ -102,7 +99,6 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|           palette[3] = bytearray(b'\x00\x00\xFF')   # set using a bytearay of 3 or 4 bytes
 //|           palette[4] = (10, 20, 30)                 # set using a tuple of 3 integers"""
 //|         ...
-//|
 STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
@@ -150,9 +146,7 @@ STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t val
     return mp_const_none;
 }
 
-//|     def make_transparent(self, palette_index: int) -> None:
-//|         ...
-//|
+//|     def make_transparent(self, palette_index: int) -> None: ...
 STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -164,9 +158,7 @@ STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_transparent_obj, displayio_palette_obj_make_transparent);
 
-//|     def make_opaque(self, palette_index: int) -> None:
-//|         ...
-//|
+//|     def make_opaque(self, palette_index: int) -> None: ...
 STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -181,7 +173,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_opaque_obj, displayio_palette_o
 //|     def is_transparent(self, palette_index: int) -> bool:
 //|         """Returns `True` if the palette index is transparent.  Returns `False` if opaque."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index 4bec17608c..690ffb6066 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -37,7 +37,9 @@
 //| class Shape:
 //|     """Represents a shape made by defining boundaries that may be mirrored."""
 //|
-//|     def __init__(self, width: int, height: int, *, mirror_x: bool = False, mirror_y: bool = False) -> None:
+//|     def __init__(
+//|         self, width: int, height: int, *, mirror_x: bool = False, mirror_y: bool = False
+//|     ) -> None:
 //|         """Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the
 //|         column boundaries of the shape on each row. Each row's boundary defaults to the full row.
 //|
@@ -46,7 +48,6 @@
 //|         :param bool mirror_x: When true the left boundary is mirrored to the right.
 //|         :param bool mirror_y: When true the top boundary is mirrored to the bottom."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_width, ARG_height, ARG_mirror_x, ARG_mirror_y };
     static const mp_arg_t allowed_args[] = {
@@ -76,7 +77,6 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
 //|     def set_boundary(self, y: int, start_x: int, end_x: int) -> None:
 //|         """Loads pre-packed data into the given row."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_shape_obj_set_boundary(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     displayio_shape_t *self = MP_OBJ_TO_PTR(args[0]);
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index d84ff5f20f..a434a8359d 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -48,7 +48,19 @@
 //|
 //|     A single tile grid is also known as a Sprite."""
 //|
-//|     def __init__(self, bitmap: Union[Bitmap, OnDiskBitmap, Shape], *, pixel_shader: Union[ColorConverter, Palette], width: int = 1, height: int = 1, tile_width: Optional[int] = None, tile_height: Optional[int] = None, default_tile: int = 0, x: int = 0, y: int = 0) -> None:
+//|     def __init__(
+//|         self,
+//|         bitmap: Union[Bitmap, OnDiskBitmap, Shape],
+//|         *,
+//|         pixel_shader: Union[ColorConverter, Palette],
+//|         width: int = 1,
+//|         height: int = 1,
+//|         tile_width: Optional[int] = None,
+//|         tile_height: Optional[int] = None,
+//|         default_tile: int = 0,
+//|         x: int = 0,
+//|         y: int = 0
+//|     ) -> None:
 //|         """Create a TileGrid object. The bitmap is source for 2d pixels. The pixel_shader is used to
 //|         convert the value and its location to a display native pixel color. This may be a simple color
 //|         palette lookup, a gradient, a pattern or a color transformer.
@@ -66,7 +78,6 @@
 //|         :param int default_tile: Default tile index to show.
 //|         :param int x: Initial x position of the left edge within the parent.
 //|         :param int y: Initial y position of the top edge within the parent."""
-//|
 STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_bitmap, ARG_pixel_shader, ARG_width, ARG_height, ARG_tile_width, ARG_tile_height, ARG_default_tile, ARG_x, ARG_y };
     static const mp_arg_t allowed_args[] = {
@@ -146,7 +157,6 @@ static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) {
 
 //|     hidden: bool
 //|     """True when the TileGrid is hidden. This may be False even when a part of a hidden Group."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_hidden(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return mp_obj_new_bool(common_hal_displayio_tilegrid_get_hidden(self));
@@ -167,7 +177,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_hidden_obj,
 
 //|     x: int
 //|     """X position of the left edge in the parent."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_x(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_x(self));
@@ -189,7 +198,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_x_obj,
 
 //|     y: int
 //|     """Y position of the top edge in the parent."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_y(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_y(self));
@@ -211,7 +219,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_y_obj,
 
 //|     width: int
 //|     """Width of the tilegrid in tiles."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_width(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_width(self));
@@ -223,7 +230,6 @@ MP_PROPERTY_GETTER(displayio_tilegrid_width_obj,
 
 //|     height: int
 //|     """Height of the tilegrid in tiles."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_height(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_height(self));
@@ -235,7 +241,6 @@ MP_PROPERTY_GETTER(displayio_tilegrid_height_obj,
 
 //|     tile_width: int
 //|     """Width of a single tile in pixels."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_tile_width(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_tile_width(self));
@@ -247,7 +252,6 @@ MP_PROPERTY_GETTER(displayio_tilegrid_tile_width_obj,
 
 //|     tile_height: int
 //|     """Height of a single tile in pixels."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_tile_height(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_tile_height(self));
@@ -259,7 +263,6 @@ MP_PROPERTY_GETTER(displayio_tilegrid_tile_height_obj,
 
 //|     flip_x: bool
 //|     """If true, the left edge rendered will be the right edge of the right-most tile."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_flip_x(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return mp_obj_new_bool(common_hal_displayio_tilegrid_get_flip_x(self));
@@ -280,7 +283,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_flip_x_obj,
 
 //|     flip_y: bool
 //|     """If true, the top edge rendered will be the bottom edge of the bottom-most tile."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_flip_y(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return mp_obj_new_bool(common_hal_displayio_tilegrid_get_flip_y(self));
@@ -303,7 +305,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_flip_y_obj,
 //|     transpose_xy: bool
 //|     """If true, the TileGrid's axis will be swapped. When combined with mirroring, any 90 degree
 //|     rotation can be achieved along with the corresponding mirrored version."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_transpose_xy(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return mp_obj_new_bool(common_hal_displayio_tilegrid_get_transpose_xy(self));
@@ -324,8 +325,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj,
 
 //|     def contains(self, touch_tuple: tuple) -> bool:
 //|         """Returns True if the first two values in ``touch_tuple`` represent an x,y coordinate
-//|            inside the tilegrid rectangle bounds."""
-//|
+//|         inside the tilegrid rectangle bounds."""
 STATIC mp_obj_t displayio_tilegrid_obj_contains(mp_obj_t self_in, mp_obj_t touch_tuple) {
     displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -342,7 +342,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_contains_obj, displayio_tilegrid_ob
 
 //|     pixel_shader: Union[ColorConverter, Palette]
 //|     """The pixel shader of the tilegrid."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_pixel_shader(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return common_hal_displayio_tilegrid_get_pixel_shader(self);
@@ -365,9 +364,8 @@ MP_PROPERTY_GETSET(displayio_tilegrid_pixel_shader_obj,
     (mp_obj_t)&displayio_tilegrid_get_pixel_shader_obj,
     (mp_obj_t)&displayio_tilegrid_set_pixel_shader_obj);
 
-//|     bitmap: Union[Bitmap,OnDiskBitmap,Shape]
+//|     bitmap: Union[Bitmap, OnDiskBitmap, Shape]
 //|     """The bitmap of the tilegrid."""
-//|
 STATIC mp_obj_t displayio_tilegrid_obj_get_bitmap(mp_obj_t self_in) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
     return common_hal_displayio_tilegrid_get_bitmap(self);
@@ -436,7 +434,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj,
 //|
 //|           print(grid[0])"""
 //|         ...
-//|
 //|     def __setitem__(self, index: Union[Tuple[int, int], int], value: int) -> None:
 //|         """Sets the tile index at the given index. The index can either be an x,y tuple or an int equal
 //|         to ``y * width + x``.
@@ -449,7 +446,6 @@ MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj,
 //|
 //|           grid[0,0] = 10"""
 //|         ...
-//|
 STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
 
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 2e52f12e84..1a62338148 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -55,7 +55,6 @@
 //| refer to `this Learn guide
 //| `_.
 //| """
-//|
 
 //| import paralleldisplay
 
@@ -67,7 +66,6 @@
 //|     Use this once in your code.py if you initialize a display. Place it right before the
 //|     initialization so the display is active as long as possible."""
 //|     ...
-//|
 STATIC mp_obj_t displayio_release_displays(void) {
     common_hal_displayio_release_displays();
     return mp_const_none;
diff --git a/shared-bindings/dotenv/__init__.c b/shared-bindings/dotenv/__init__.c
index 89f6fe6792..e6f34dcf82 100644
--- a/shared-bindings/dotenv/__init__.c
+++ b/shared-bindings/dotenv/__init__.c
@@ -65,11 +65,10 @@
 
 //| def get_key(dotenv_path: str, key_to_get: str) -> Optional[str]:
 //|     """Get the value for the given key from the given .env file. If the key occurs multiple
-//|        times in the file, then the last value will be returned.
+//|     times in the file, then the last value will be returned.
 //|
-//|        Returns None if the key isn't found or doesn't have a value."""
+//|     Returns None if the key isn't found or doesn't have a value."""
 //|     ...
-//|
 STATIC mp_obj_t _dotenv_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
     return common_hal_dotenv_get_key(mp_obj_str_get_str(path_in),
         mp_obj_str_get_str(key_to_get_in));
@@ -78,11 +77,10 @@ MP_DEFINE_CONST_FUN_OBJ_2(dotenv_get_key_obj, _dotenv_get_key);
 
 //| def load_dotenv() -> None:
 //|     """Does nothing in CircuitPython because os.getenv will automatically read .env when
-//|        available.
+//|     available.
 //|
-//|        Present in CircuitPython so CPython-compatible code can use it without error."""
+//|     Present in CircuitPython so CPython-compatible code can use it without error."""
 //|     ...
-//|
 STATIC mp_obj_t dotenv_load_dotenv(void) {
     return mp_const_none;
 }
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index fa4c2af691..6a69480172 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -54,16 +54,14 @@
 //|     dualbank.switch()
 //| """
 //| ...
-//|
 
-//| def flash(buffer: ReadableBuffer, offset: int=0) -> None:
+//| def flash(buffer: ReadableBuffer, offset: int = 0) -> None:
 //|     """Writes one of two app partitions at the given offset.
 //|
 //|     This can be called multiple times when flashing the firmware
 //|     in small chunks.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_offset };
     static const mp_arg_t allowed_args[] = {
@@ -93,7 +91,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash);
 //|     just switched over to.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t dualbank_switch(void) {
     common_hal_dualbank_switch();
     return mp_const_none;
diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c
index a6b041c4a0..a74a30c068 100644
--- a/shared-bindings/floppyio/__init__.c
+++ b/shared-bindings/floppyio/__init__.c
@@ -34,7 +34,9 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-//| def flux_readinto(buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut) -> int:
+//| def flux_readinto(
+//|     buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut
+//| ) -> int:
 //|     """Read flux transition information into the buffer.
 //|
 //|     The function returns when the buffer has filled, or when the index input
@@ -48,7 +50,6 @@
 //|     :return: The actual number of bytes of read
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_data, ARG_index };
     static const mp_arg_t allowed_args[] = {
@@ -68,7 +69,9 @@ STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args,
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto);
 
-//| def mfm_readinto(buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut) -> int:
+//| def mfm_readinto(
+//|     buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut
+//| ) -> int:
 //|     """Read mfm blocks into the buffer.
 //|
 //|     The track is assumed to consist of 512-byte sectors.
@@ -83,7 +86,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto
 //|     :return: The actual number of sectors read
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_data, ARG_index };
     static const mp_arg_t allowed_args[] = {
@@ -109,7 +111,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_mfm_readinto_obj, 0, floppyio_mfm_readinto);
 
 //| samplerate: int
 //| """The approximate sample rate in Hz used by flux_readinto."""
-//|
 
 STATIC const mp_rom_map_elem_t floppyio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_floppyio) },
diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c
index 02d3373797..b20ed271c3 100644
--- a/shared-bindings/fontio/BuiltinFont.c
+++ b/shared-bindings/fontio/BuiltinFont.c
@@ -36,10 +36,11 @@
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
 
-//| from typing_extensions import Protocol # for compat with python < 3.8
+//| from typing_extensions import Protocol  # for compat with python < 3.8
 //|
 //| class FontProtocol(Protocol):
 //|     """A protocol shared by `BuiltinFont` and classes in ``adafruit_bitmap_font``"""
+//|
 //|     def get_bounding_box(self) -> Union[Tuple[int, int], Tuple[int, int, int, int]]:
 //|         """Retrieve the maximum bounding box of any glyph in the font.
 //|
@@ -47,13 +48,11 @@
 //|         The two element version is ``(width, height)``, in which
 //|         ``x_offset`` and ``y_offset`` are assumed to be zero."""
 //|         pass
-//|
 //|     def get_glyph(self, codepoint: int) -> Optional[Glyph]:
 //|         """Retrieve the Glyph for a given code point
 //|
 //|         If the code point is not present in the font, `None` is returned."""
 //|         pass
-//|
 
 //| class BuiltinFont:
 //|     """A font built into CircuitPython"""
@@ -63,13 +62,11 @@
 //|         `Adafruit_CircuitPython_Bitmap_Font `_
 //|         library for dynamically loaded fonts."""
 //|         ...
-//|
 
 //|     bitmap: displayio.Bitmap
 //|     """Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use
 //|     `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and
 //|     `terminalio.Terminal`."""
-//|
 STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_fontio_builtinfont_get_bitmap(self);
@@ -82,7 +79,6 @@ MP_PROPERTY_GETTER(fontio_builtinfont_bitmap_obj,
 //|     def get_bounding_box(self) -> Tuple[int, int]:
 //|         """Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height."""
 //|         ...
-//|
 STATIC mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -94,7 +90,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builti
 //|     def get_glyph(self, codepoint: int) -> Glyph:
 //|         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""
 //|         ...
-//|
 STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/fontio/Glyph.c b/shared-bindings/fontio/Glyph.c
index 92be6daeb0..ee2eb90945 100644
--- a/shared-bindings/fontio/Glyph.c
+++ b/shared-bindings/fontio/Glyph.c
@@ -31,15 +31,17 @@
 //| class Glyph:
 //|     """Storage of glyph info"""
 //|
-//|     def __init__(self,
-//|                  bitmap: displayio.Bitmap,
-//|                  tile_index: int,
-//|                  width: int,
-//|                  height: int,
-//|                  dx: int,
-//|                  dy: int,
-//|                  shift_x: int,
-//|                  shift_y: int) -> None:
+//|     def __init__(
+//|         self,
+//|         bitmap: displayio.Bitmap,
+//|         tile_index: int,
+//|         width: int,
+//|         height: int,
+//|         dx: int,
+//|         dy: int,
+//|         shift_x: int,
+//|         shift_y: int,
+//|     ) -> None:
 //|         """Named tuple used to capture a single glyph and its attributes.
 //|
 //|         :param bitmap: the bitmap including the glyph
@@ -51,7 +53,6 @@
 //|         :param shift_x: the x difference to the next glyph
 //|         :param shift_y: the y difference to the next glyph"""
 //|         ...
-//|
 const mp_obj_namedtuple_type_t fontio_glyph_type = {
     .base = {
         .base = {
diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c
index d4048dbeff..24e1eb1e3b 100644
--- a/shared-bindings/fontio/__init__.c
+++ b/shared-bindings/fontio/__init__.c
@@ -42,7 +42,6 @@
 //|     `this Learn guide `_
 //|
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fontio) },
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 00adef62a6..045e1f1c78 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -47,14 +47,19 @@
 //|     objects in CircuitPython, Display objects live until `displayio.release_displays()`
 //|     is called. This is done so that CircuitPython can use the display itself."""
 //|
-//|     def __init__(self, framebuffer: circuitpython_typing.FrameBuffer, *, rotation: int = 0, auto_refresh: bool = True) -> None:
+//|     def __init__(
+//|         self,
+//|         framebuffer: circuitpython_typing.FrameBuffer,
+//|         *,
+//|         rotation: int = 0,
+//|         auto_refresh: bool = True
+//|     ) -> None:
 //|         """Create a Display object with the given framebuffer (a buffer, array, ulab.array, etc)
 //|
 //|         :param ~circuitpython_typing.FrameBuffer framebuffer: The framebuffer that the display is connected to
 //|         :param bool auto_refresh: Automatically refresh the screen
 //|         :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)"""
 //|         ...
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_framebuffer, ARG_rotation, ARG_auto_refresh, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -99,7 +104,6 @@ static framebufferio_framebufferdisplay_obj_t *native_display(mp_obj_t display_o
 //|
 //|         :param Group group: The group to show."""
 //|         ...
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     displayio_group_t *group = NULL;
@@ -115,7 +119,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_o
 }
 MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebufferio_framebufferdisplay_obj_show);
 
-//|     def refresh(self, *, target_frames_per_second: int = 60, minimum_frames_per_second: int = 1) -> bool:
+//|     def refresh(
+//|         self, *, target_frames_per_second: int = 60, minimum_frames_per_second: int = 1
+//|     ) -> bool:
 //|         """When auto refresh is off, waits for the target frame rate and then refreshes the display,
 //|         returning True. If the call has taken too long since the last refresh call for the given
 //|         target frame rate, then the refresh returns False immediately without updating the screen to
@@ -130,7 +136,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebuffer
 //|         :param int target_frames_per_second: How many times a second `refresh` should be called and the screen updated.
 //|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second."""
 //|         ...
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
     static const mp_arg_t allowed_args[] = {
@@ -152,7 +157,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_refresh_obj, 1, fram
 
 //|     auto_refresh: bool
 //|     """True when the display is refreshed automatically."""
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_refresh(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_get_auto_refresh(self));
@@ -174,7 +178,6 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj,
 
 //|     brightness: float
 //|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness."""
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     mp_float_t brightness = common_hal_framebufferio_framebufferdisplay_get_brightness(self);
@@ -205,7 +208,6 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj,
 
 //|     width: int
 //|     """Gets the width of the framebuffer"""
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_width(self));
@@ -217,7 +219,6 @@ MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_width_obj,
 
 //|     height: int
 //|     """Gets the height of the framebuffer"""
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_height(self));
@@ -229,7 +230,6 @@ MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_height_obj,
 
 //|     rotation: int
 //|     """The rotation of the display as an int in degrees."""
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_rotation(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_rotation(self));
@@ -249,8 +249,6 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_rotation_obj,
 
 //|     framebuffer: circuitpython_typing.FrameBuffer
 //|     """The framebuffer being used by the display"""
-//|
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return common_hal_framebufferio_framebufferdisplay_get_framebuffer(self);
@@ -267,7 +265,6 @@ MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj,
 //|         :param int y: The top edge of the area
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data"""
 //|         ...
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_y, ARG_buffer };
     static const mp_arg_t allowed_args[] = {
@@ -324,8 +321,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra
 
 //|     root_group: displayio.Group
 //|     """The root group on the display."""
-//|
-//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return common_hal_framebufferio_framebufferdisplay_get_root_group(self);
diff --git a/shared-bindings/framebufferio/__init__.c b/shared-bindings/framebufferio/__init__.c
index 5d95ef41f5..324442268e 100644
--- a/shared-bindings/framebufferio/__init__.c
+++ b/shared-bindings/framebufferio/__init__.c
@@ -35,7 +35,6 @@
 //| It is used in conjunction with classes from `displayio` to actually
 //| place items on the display; and classes like `RGBMatrix` to actually
 //| drive the display."""
-//|
 
 #if CIRCUITPY_FRAMEBUFFERIO
 static const mp_rom_map_elem_t framebufferio_module_globals_table[] = {
diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c
index b72627b19f..79147d2efd 100644
--- a/shared-bindings/frequencyio/FrequencyIn.c
+++ b/shared-bindings/frequencyio/FrequencyIn.c
@@ -70,7 +70,6 @@
 //|               # as the value.
 //|               frequency.clear()"""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, true);
 
@@ -96,7 +95,6 @@ STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size
 //|     def deinit(self) -> None:
 //|         """Deinitialises the FrequencyIn and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_deinit(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_frequencyio_frequencyin_deinit(self);
@@ -113,14 +111,12 @@ STATIC void check_for_deinit(frequencyio_frequencyin_obj_t *self) {
 //|     def __enter__(self) -> FrequencyIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_frequencyio_frequencyin_deinit(args[0]);
@@ -131,7 +127,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(frequencyio_frequencyin___exit___obj,
 //|     def pause(self) -> None:
 //|         """Pause frequency capture."""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_obj_pause(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -144,7 +139,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_pause_obj, frequencyio_frequen
 //|     def resume(self) -> None:
 //|         """Resumes frequency capture."""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_obj_resume(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -157,7 +151,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_resume_obj, frequencyio_freque
 //|     def clear(self) -> None:
 //|         """Clears the last detected frequency capture value."""
 //|         ...
-//|
 
 STATIC mp_obj_t frequencyio_frequencyin_obj_clear(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -175,7 +168,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_clear_obj, frequencyio_frequen
 //|
 //|     .. note:: When setting a new ``capture_period``, all previous capture information is
 //|               cleared with a call to ``clear()``."""
-//|
 STATIC mp_obj_t frequencyio_frequencyin_obj_get_capture_period(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -200,7 +192,6 @@ MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj,
 //|     def __get__(self, index: int) -> int:
 //|         """Returns the value of the last frequency captured."""
 //|         ...
-//|
 STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/frequencyio/__init__.c b/shared-bindings/frequencyio/__init__.c
index 6ddac9cc83..18022c7f6e 100644
--- a/shared-bindings/frequencyio/__init__.c
+++ b/shared-bindings/frequencyio/__init__.c
@@ -58,7 +58,6 @@
 //| CircuitPython will automatically turn off FrequencyIn capture when it resets all
 //| hardware after program completion. Use ``deinit()`` or a ``with`` statement
 //| to do it yourself."""
-//|
 
 STATIC const mp_rom_map_elem_t frequencyio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_frequencyio) },
diff --git a/shared-bindings/getpass/__init__.c b/shared-bindings/getpass/__init__.c
index 7c2de89b34..4eb9be7c4c 100644
--- a/shared-bindings/getpass/__init__.c
+++ b/shared-bindings/getpass/__init__.c
@@ -33,9 +33,8 @@
 //|
 //| """
 //| ...
-//|
 
-//| def getpass(prompt: Optional[str] = 'Password: ', stream: Optional[io.FileIO] = None) -> str:
+//| def getpass(prompt: Optional[str] = "Password: ", stream: Optional[io.FileIO] = None) -> str:
 //|
 //|     """Prompt the user without echoing.
 //|
@@ -44,7 +43,6 @@
 //|
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t getpass_getpass(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_prompt, ARG_stream };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/gifio/GifWriter.c b/shared-bindings/gifio/GifWriter.c
index 11dd43becd..6b7d9c5e4b 100644
--- a/shared-bindings/gifio/GifWriter.c
+++ b/shared-bindings/gifio/GifWriter.c
@@ -34,7 +34,15 @@
 #include "shared/runtime/context_manager_helpers.h"
 
 //| class GifWriter:
-//|     def __init__(self, file: Union[typing.BinaryIO, str], width:int, height:int, colorspace: displayio.Colorspace, loop:bool=True, dither:bool=False) -> None:
+//|     def __init__(
+//|         self,
+//|         file: Union[typing.BinaryIO, str],
+//|         width: int,
+//|         height: int,
+//|         colorspace: displayio.Colorspace,
+//|         loop: bool = True,
+//|         dither: bool = False,
+//|     ) -> None:
 //|         """Construct a GifWriter object
 //|
 //|         :param file: Either a file open in bytes mode, or the name of a file to open in bytes mode.
@@ -45,7 +53,6 @@
 //|         :param dither: If True, and the image is in color, a simple ordered dither is applied.
 //|         """
 //|         ...
-//|
 static mp_obj_t gifio_gifwriter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_file, ARG_width, ARG_height, ARG_colorspace, ARG_loop, ARG_dither };
     static const mp_arg_t allowed_args[] = {
@@ -91,7 +98,6 @@ static mp_obj_t gifio_gifwriter_make_new(const mp_obj_type_t *type, size_t n_arg
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 static mp_obj_t gifio_gifwriter___exit__(size_t n_args, const mp_obj_t *args) {
     gifio_gifwriter_t *self = MP_OBJ_TO_PTR(args[0]);
     shared_module_gifio_gifwriter_deinit(self);
@@ -102,7 +108,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_gifwriter___exit___obj, 4, 4, gifio_gi
 //|     def deinit(self) -> None:
 //|         """Close the underlying file."""
 //|         ...
-//|
 static mp_obj_t gifio_gifwriter_deinit(mp_obj_t self_in) {
     gifio_gifwriter_t *self = MP_OBJ_TO_PTR(self_in);
     shared_module_gifio_gifwriter_deinit(self);
diff --git a/shared-bindings/gifio/__init__.c b/shared-bindings/gifio/__init__.c
index 317eebce9b..6bd5765966 100644
--- a/shared-bindings/gifio/__init__.c
+++ b/shared-bindings/gifio/__init__.c
@@ -31,7 +31,6 @@
 
 //| """Access GIF-format images
 //| """
-//|
 STATIC const mp_rom_map_elem_t gifio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gifio) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_GifWriter),  MP_ROM_PTR(&gifio_gifwriter_type)},
diff --git a/shared-bindings/gnss/GNSS.c b/shared-bindings/gnss/GNSS.c
index 0bd800bdc6..04c246ffc2 100644
--- a/shared-bindings/gnss/GNSS.c
+++ b/shared-bindings/gnss/GNSS.c
@@ -29,14 +29,12 @@
 //|                     continue
 //|                 print("Latitude: {0:.6f} degrees".format(nav.latitude))
 //|                 print("Longitude: {0:.6f} degrees".format(nav.longitude))"""
-//|
 
 //|     def __init__(self, system: Union[SatelliteSystem, List[SatelliteSystem]]) -> None:
 //|         """Turn on the GNSS.
 //|
 //|         :param system: satellite system to use"""
 //|         ...
-//|
 STATIC mp_obj_t gnss_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     gnss_obj_t *self = m_new_obj(gnss_obj_t);
     self->base.type = &gnss_type;
@@ -71,7 +69,6 @@ STATIC mp_obj_t gnss_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 //|     def deinit(self) -> None:
 //|         """Turn off the GNSS."""
 //|         ...
-//|
 STATIC mp_obj_t gnss_obj_deinit(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_gnss_deinit(self);
@@ -88,7 +85,6 @@ STATIC void check_for_deinit(gnss_obj_t *self) {
 //|     def update(self) -> None:
 //|         """Update GNSS positioning information."""
 //|         ...
-//|
 STATIC mp_obj_t gnss_obj_update(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -100,7 +96,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(gnss_update_obj, gnss_obj_update);
 
 //|     latitude: float
 //|     """Latitude of current position in degrees (float)."""
-//|
 STATIC mp_obj_t gnss_obj_get_latitude(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -113,7 +108,6 @@ MP_PROPERTY_GETTER(gnss_latitude_obj,
 
 //|     longitude: float
 //|     """Longitude of current position in degrees (float)."""
-//|
 STATIC mp_obj_t gnss_obj_get_longitude(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -126,7 +120,6 @@ MP_PROPERTY_GETTER(gnss_longitude_obj,
 
 //|     altitude: float
 //|     """Altitude of current position in meters (float)."""
-//|
 STATIC mp_obj_t gnss_obj_get_altitude(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -139,7 +132,6 @@ MP_PROPERTY_GETTER(gnss_altitude_obj,
 
 //|     timestamp: time.struct_time
 //|     """Time when the position data was updated."""
-//|
 STATIC mp_obj_t gnss_obj_get_timestamp(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -154,7 +146,6 @@ MP_PROPERTY_GETTER(gnss_timestamp_obj,
 
 //|     fix: PositionFix
 //|     """Fix mode."""
-//|
 STATIC mp_obj_t gnss_obj_get_fix(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/gnss/PositionFix.c b/shared-bindings/gnss/PositionFix.c
index e60611d705..871723d100 100644
--- a/shared-bindings/gnss/PositionFix.c
+++ b/shared-bindings/gnss/PositionFix.c
@@ -9,7 +9,6 @@
 //|
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define the position fix mode."""
-//|
 //|     INVALID: PositionFix
 //|     """No measurement."""
 //|
@@ -18,7 +17,6 @@
 //|
 //|     FIX_3D: PositionFix
 //|     """3D fix."""
-//|
 const mp_obj_type_t gnss_positionfix_type;
 
 const gnss_positionfix_obj_t gnss_positionfix_invalid_obj = {
diff --git a/shared-bindings/gnss/SatelliteSystem.c b/shared-bindings/gnss/SatelliteSystem.c
index edac03ddb6..9a760b6437 100644
--- a/shared-bindings/gnss/SatelliteSystem.c
+++ b/shared-bindings/gnss/SatelliteSystem.c
@@ -9,7 +9,6 @@
 //|
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define the satellite system type."""
-//|
 //|     GPS: SatelliteSystem
 //|     """Global Positioning System."""
 //|
@@ -24,7 +23,6 @@
 //|
 //|     QZSS_L1S: SatelliteSystem
 //|     """Quasi-Zenith Satellite System L1S."""
-//|
 const mp_obj_type_t gnss_satellitesystem_type;
 
 const gnss_satellitesystem_obj_t gnss_satellitesystem_gps_obj = {
diff --git a/shared-bindings/gnss/__init__.c b/shared-bindings/gnss/__init__.c
index ab6cbf56cf..6029e1a54e 100644
--- a/shared-bindings/gnss/__init__.c
+++ b/shared-bindings/gnss/__init__.c
@@ -13,7 +13,6 @@
 //| """Global Navigation Satellite System
 //|
 //| The `gnss` module contains classes to control the GNSS and acquire positioning information."""
-//|
 STATIC const mp_rom_map_elem_t gnss_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gnss) },
     { MP_ROM_QSTR(MP_QSTR_GNSS), MP_ROM_PTR(&gnss_type) },
diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c
index 896526983a..ef11580c76 100644
--- a/shared-bindings/hashlib/Hash.c
+++ b/shared-bindings/hashlib/Hash.c
@@ -33,12 +33,10 @@
 
 //| class Hash:
 //|     """In progress hash algorithm. This object is always created by a `hashlib.new()`. It has no
-//|        user-visible constructor."""
-//|
+//|     user-visible constructor."""
 
 //|     digest_size: int
 //|     """Digest size in bytes"""
-//|
 STATIC mp_obj_t hashlib_hash_digest_size_get(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
     hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -52,7 +50,6 @@ MP_PROPERTY_GETTER(hashlib_hash_digest_size_obj, (mp_obj_t)&hashlib_hash_digest_
 //|
 //|         :param ~circuitpython_typing.ReadableBuffer data: Update the hash from data in this buffer"""
 //|         ...
-//|
 mp_obj_t hashlib_hash_update(mp_obj_t self_in, mp_obj_t buf_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
     hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -68,7 +65,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_hash_update_obj, hashlib_hash_update);
 //|     def digest(self) -> bytes:
 //|         """Returns the current digest as bytes() with a length of `hashlib.Hash.digest_size`."""
 //|         ...
-//|
 STATIC mp_obj_t hashlib_hash_digest(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
     hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/hashlib/__init__.c b/shared-bindings/hashlib/__init__.c
index d5efa21361..08c43787f3 100644
--- a/shared-bindings/hashlib/__init__.c
+++ b/shared-bindings/hashlib/__init__.c
@@ -38,14 +38,13 @@
 //| |see_cpython_module| :mod:`cpython:hashlib`.
 //| """
 //|
-//| def new(name: str, data: bytes=b"") -> hashlib.Hash:
+//| def new(name: str, data: bytes = b"") -> hashlib.Hash:
 //|     """Returns a Hash object setup for the named algorithm. Raises ValueError when the named
 //|        algorithm is unsupported.
 //|
 //|     :return: a hash object for the given algorithm
 //|     :rtype: hashlib.Hash"""
 //|     ...
-//|
 STATIC mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_name, ARG_data };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 81ddbe0ab8..1a336dc810 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -52,7 +52,13 @@ STATIC mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj
 //| class I2CTarget:
 //|     """Two wire serial protocol target"""
 //|
-//|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, addresses: Sequence[int], smbus: bool = False) -> None:
+//|     def __init__(
+//|         self,
+//|         scl: microcontroller.Pin,
+//|         sda: microcontroller.Pin,
+//|         addresses: Sequence[int],
+//|         smbus: bool = False,
+//|     ) -> None:
 //|         """I2C is a two-wire protocol for communicating between devices.
 //|         This implements the target (peripheral, sensor, secondary) side.
 //|
@@ -62,7 +68,6 @@ STATIC mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj
 //|         :type addresses: list[int]
 //|         :param bool smbus: Use SMBUS timings if the hardware supports it"""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     i2ctarget_i2c_target_obj_t *self = m_new_obj(i2ctarget_i2c_target_obj_t);
     self->base.type = &i2ctarget_i2c_target_type;
@@ -100,7 +105,6 @@ STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t
 //|     def deinit(self) -> None:
 //|         """Releases control of the underlying hardware so other classes can use it."""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_obj_deinit(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_type));
     i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -112,14 +116,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_deinit_obj, i2ctarget_i2c_target_
 //|     def __enter__(self) -> I2CTarget:
 //|         """No-op used in Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware on context exit. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_type));
     i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -134,7 +136,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4,
 //|         :param float timeout: Timeout in seconds. Zero means wait forever, a negative value means check once
 //|         :return: I2CTargetRequest or None if timeout=-1 and there's no request
 //|         :rtype: ~i2ctarget.I2CTargetRequest"""
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_type));
     i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -221,8 +222,9 @@ const mp_obj_type_t i2ctarget_i2c_target_type = {
 };
 
 //| class I2CTargetRequest:
-//|
-//|     def __init__(self, target: i2ctarget.I2CTarget, address: int, is_read: bool, is_restart: bool) -> None:
+//|     def __init__(
+//|         self, target: i2ctarget.I2CTarget, address: int, is_read: bool, is_restart: bool
+//|     ) -> None:
 //|         """Information about an I2C transfer request
 //|         This cannot be instantiated directly, but is returned by :py:meth:`I2CTarget.request`.
 //|
@@ -230,7 +232,6 @@ const mp_obj_type_t i2ctarget_i2c_target_type = {
 //|         :param address: I2C address
 //|         :param is_read: True if the main target is requesting data
 //|         :param is_restart: Repeated Start Condition"""
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_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, 4, 4, false);
     return mp_obj_new_i2ctarget_i2c_target_request(args[0], mp_obj_get_int(args[1]), mp_obj_is_true(args[2]), mp_obj_is_true(args[3]));
@@ -239,13 +240,11 @@ STATIC mp_obj_t i2ctarget_i2c_target_request_make_new(const mp_obj_type_t *type,
 //|     def __enter__(self) -> I2CTargetRequest:
 //|         """No-op used in Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Close the request."""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_obj___exit__(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -256,7 +255,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request___exit__
 
 //|     address: int
 //|     """The I2C address of the request."""
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_get_address(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -266,7 +264,6 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_address_obj, i2ctarget_i2c
 
 //|     is_read: bool
 //|     """The I2C main controller is reading from this target."""
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_read(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -276,7 +273,6 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_read_obj, i2ctarget_i2c
 
 //|     is_restart: bool
 //|     """Is Repeated Start Condition."""
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_restart(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -292,7 +288,6 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_restart_obj, i2ctarget_
 //|         :param ack: Whether or not to send an ACK after the n'th byte
 //|         :return: Bytes read"""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -350,7 +345,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_read_obj, 1, i2ctarget_i
 //|         :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer
 //|         :return: Number of bytes written"""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_write(mp_obj_t self_in, mp_obj_t buf_in) {
     mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -384,7 +378,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarg
 //|
 //|         :param ack: Whether to send an ACK or NACK"""
 //|         ...
-//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
diff --git a/shared-bindings/i2ctarget/__init__.c b/shared-bindings/i2ctarget/__init__.c
index 70c4707597..0fa7e50dd6 100644
--- a/shared-bindings/i2ctarget/__init__.c
+++ b/shared-bindings/i2ctarget/__init__.c
@@ -91,7 +91,6 @@
 //|    Raspberry Pi in particular does not support this with its I2C hw block.
 //|    This can be worked around by using the ``i2c-gpio`` bit banging driver.
 //|    Since the RPi firmware uses the hw i2c, it's not possible to emulate a HAT eeprom."""
-//|
 
 STATIC const mp_rom_map_elem_t i2ctarget_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2ctarget) },
diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c
index bbe96026bf..483830ac3f 100644
--- a/shared-bindings/imagecapture/ParallelImageCapture.c
+++ b/shared-bindings/imagecapture/ParallelImageCapture.c
@@ -55,7 +55,6 @@
 //|         :param microcontroller.Pin href: The horizontal reference input, which is high whenever the camera is transmitting valid pixel information.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_data_pins, ARG_clock, ARG_vsync, ARG_href,
            NUM_ARGS };
@@ -90,7 +89,6 @@ STATIC mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t *
 //|
 //|         This will stop a continuous-mode capture, if one is in progress."""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_capture(mp_obj_t self_in, mp_obj_t buffer) {
     imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in;
     common_hal_imagecapture_parallelimagecapture_singleshot_capture(self, buffer);
@@ -99,7 +97,9 @@ STATIC mp_obj_t imagecapture_parallelimagecapture_capture(mp_obj_t self_in, mp_o
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(imagecapture_parallelimagecapture_capture_obj, imagecapture_parallelimagecapture_capture);
 
-//|     def continuous_capture_start(self, buffer1: WriteableBuffer, buffer2: WriteableBuffer, /) -> None:
+//|     def continuous_capture_start(
+//|         self, buffer1: WriteableBuffer, buffer2: WriteableBuffer, /
+//|     ) -> None:
 //|         """Begin capturing into the given buffers in the background.
 //|
 //|         Call `continuous_capture_get_frame` to get the next available
@@ -109,7 +109,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(imagecapture_parallelimagecapture_capture_obj,
 //|         `ParallelImageCapture` object keeps references to ``buffer1`` and
 //|         ``buffer2``, so the objects will not be garbage collected."""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_start(mp_obj_t self_in, mp_obj_t buffer1, mp_obj_t buffer2) {
     imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in;
     common_hal_imagecapture_parallelimagecapture_continuous_capture_start(self, buffer1, buffer2);
@@ -121,7 +120,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(imagecapture_parallelimagecapture_continuous_ca
 //|     def continuous_capture_get_frame(self) -> WriteableBuffer:
 //|         """Return the next available frame, one of the two buffers passed to `continuous_capture_start`"""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_get_frame(mp_obj_t self_in) {
     imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in;
     return common_hal_imagecapture_parallelimagecapture_continuous_capture_get_frame(self);
@@ -137,7 +135,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_ca
 //|         references to the buffers passed to `continuous_capture_start`,
 //|         potentially allowing the objects to be garbage collected."""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_stop(mp_obj_t self_in) {
     imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in;
     common_hal_imagecapture_parallelimagecapture_continuous_capture_stop(self);
@@ -152,7 +149,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_ca
 //|     def deinit(self) -> None:
 //|         """Deinitialize this instance"""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture_deinit(mp_obj_t self_in) {
     imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in;
     common_hal_imagecapture_parallelimagecapture_deinit(self);
@@ -164,14 +160,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_deinit_obj, i
 //|     def __enter__(self) -> ParallelImageCapture:
 //|         """No-op used in Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware on context exit. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t imagecapture_parallelimagecapture___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_imagecapture_parallelimagecapture_deinit(args[0]);
diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c
index 23204329d3..c8f09af962 100644
--- a/shared-bindings/ipaddress/IPv4Address.c
+++ b/shared-bindings/ipaddress/IPv4Address.c
@@ -37,14 +37,12 @@
 
 //| class IPv4Address:
 //|     """Encapsulates an IPv4 address."""
-//|
 
 //|     def __init__(self, address: Union[int, str, bytes]) -> None:
 //|         """Create a new IPv4Address object encapsulating the address value.
 //|
-//|            The value itself can either be bytes or a string formatted address."""
+//|         The value itself can either be bytes or a string formatted address."""
 //|         ...
-//|
 STATIC mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_address };
     static const mp_arg_t allowed_args[] = {
@@ -88,7 +86,6 @@ STATIC mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t
 
 //|     packed: bytes
 //|     """The bytes that make up the address (read-only)."""
-//|
 STATIC mp_obj_t ipaddress_ipv4address_get_packed(mp_obj_t self_in) {
     ipaddress_ipv4address_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -101,7 +98,6 @@ MP_PROPERTY_GETTER(ipaddress_ipv4address_packed_obj,
 
 //|     version: int
 //|     """4 for IPv4, 6 for IPv6"""
-//|
 STATIC mp_obj_t ipaddress_ipv4address_get_version(mp_obj_t self_in) {
     ipaddress_ipv4address_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t buf_info;
@@ -122,7 +118,6 @@ MP_PROPERTY_GETTER(ipaddress_ipv4address_version_obj,
 //|     def __eq__(self, other: object) -> bool:
 //|         """Two Address objects are equal if their addresses and address types are equal."""
 //|         ...
-//|
 STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     switch (op) {
         // Two Addresses are equal if their address bytes and address_type are equal
@@ -146,7 +141,6 @@ STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the IPv4Address data."""
 //|         ...
-//|
 STATIC mp_obj_t ipaddress_ipv4address_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     switch (op) {
         // Two Addresses are equal if their address bytes and address_type are equal
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
index 6da5a52299..c7966bf4a9 100644
--- a/shared-bindings/ipaddress/__init__.c
+++ b/shared-bindings/ipaddress/__init__.c
@@ -35,7 +35,6 @@
 //| The `ipaddress` module provides types for IP addresses. It is a subset of CPython's ipaddress
 //| module.
 //| """
-//|
 
 
 bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t *ip_out) {
@@ -79,7 +78,6 @@ bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t
 //| def ip_address(obj: Union[int, str]) -> IPv4Address:
 //|     """Return a corresponding IP address object or raise ValueError if not possible."""
 //|     ...
-//|
 
 STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) {
     uint32_t value;
diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c
index e1a87e8ee0..2eeb5164c6 100644
--- a/shared-bindings/is31fl3741/FrameBuffer.c
+++ b/shared-bindings/is31fl3741/FrameBuffer.c
@@ -40,8 +40,17 @@
 //| class IS31FL3741_FrameBuffer:
 //|     """Creates an in-memory framebuffer for a IS31FL3741 device."""
 //|
-//|     def __init__(self, is31: is31fl3741.IS31FL3741, width: int, height: int, mapping: Tuple[int, ...], *,
-//|         framebuffer: Optional[WriteableBuffer] = None, scale: bool = False, gamma: bool = False) -> None:
+//|     def __init__(
+//|         self,
+//|         is31: is31fl3741.IS31FL3741,
+//|         width: int,
+//|         height: int,
+//|         mapping: Tuple[int, ...],
+//|         *,
+//|         framebuffer: Optional[WriteableBuffer] = None,
+//|         scale: bool = False,
+//|         gamma: bool = False
+//|     ) -> None:
 //|         """Create a IS31FL3741_FrameBuffer object with the given attributes.
 //|
 //|         The framebuffer is in "RGB888" format using 4 bytes per pixel.
@@ -62,7 +71,6 @@
 //|         :param bool scale: if True display is scaled down by 3 when displayed
 //|         :param bool gamma: if True apply gamma correction to all LEDs"""
 //|         ...
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_is31, ARG_width, ARG_height, ARG_mapping, ARG_framebuffer, ARG_scale, ARG_gamma };
     static const mp_arg_t allowed_args[] = {
@@ -123,7 +131,6 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_make_new(const mp_obj_type_t *type, size_
 //|         IS31FL3741 instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_deinit(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     common_hal_is31fl3741_FrameBuffer_deinit(self);
@@ -140,7 +147,6 @@ static void check_for_deinit(is31fl3741_FrameBuffer_obj_t *self) {
 //|     brightness: float
 //|     """In the current implementation, 0.0 turns the display off entirely
 //|     and any other value up to 1.0 turns the display on fully."""
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_get_brightness(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     check_for_deinit(self);
@@ -174,7 +180,6 @@ MP_PROPERTY_GETSET(is31fl3741_FrameBuffer_brightness_obj,
 //|         """Transmits the color data in the buffer to the pixels so that
 //|         they are shown."""
 //|         ...
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_refresh(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     check_for_deinit(self);
@@ -185,7 +190,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_FrameBuffer_refresh_obj, is31fl3741_FrameBu
 
 //|     width: int
 //|     """The width of the display, in pixels"""
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_get_width(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     check_for_deinit(self);
@@ -197,7 +201,6 @@ MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
-//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_get_height(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/shared-bindings/is31fl3741/IS31FL3741.c b/shared-bindings/is31fl3741/IS31FL3741.c
index 46a7f8ac86..e41b940ba5 100644
--- a/shared-bindings/is31fl3741/IS31FL3741.c
+++ b/shared-bindings/is31fl3741/IS31FL3741.c
@@ -46,7 +46,6 @@
 //|         :param ~busio.I2C i2c: I2C bus the IS31FL3741 is on
 //|         :param int addr: device address"""
 //|         ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_i2c, ARG_addr };
     static const mp_arg_t allowed_args[] = {
@@ -74,7 +73,6 @@ STATIC mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t
 //|         IS31FL3741 instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_deinit(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = (is31fl3741_IS31FL3741_obj_t *)self_in;
     common_hal_is31fl3741_IS31FL3741_deinit(self);
@@ -85,7 +83,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_deinit_obj, is31fl3741_IS
 //| def reset(self) -> None:
 //|     """Resets the IS31FL3741 chip."""
 //|     ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_reset(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_is31fl3741_send_reset(self);
@@ -96,7 +93,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_reset_obj, is31fl3741_IS31FL3741
 //| def enable(self) -> None:
 //|     """Enables the IS31FL3741 chip."""
 //|     ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_enable(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_is31fl3741_send_enable(self);
@@ -109,7 +105,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_enable_obj, is31fl3741_IS31FL374
 //|
 //|     :param int current: global current value 0x00 to 0xFF"""
 //|     ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_set_global_current(mp_obj_t self_in, mp_obj_t value) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t current = mp_obj_get_int(value);
@@ -127,7 +122,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(is31fl3741_IS31FL3741_set_global_current_obj, is31fl37
 //|       the routine will automatically write to page 1 or 3 (instead
 //|       of 0 or 2)"""
 //|     ...
-//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_set_led(size_t n_args, const mp_obj_t *args) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_int_t led = mp_obj_get_int(args[1]);
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 380b6b5b41..0dfa8a2371 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -33,7 +33,10 @@
 
 //| class Event:
 //|     """A key transition event."""
-//|     def __init__(self, key_number: int=0, pressed: bool=True, timestamp:Optional[int]=None) -> None:
+//|
+//|     def __init__(
+//|         self, key_number: int = 0, pressed: bool = True, timestamp: Optional[int] = None
+//|     ) -> None:
 //|         """Create a key transition event, which reports a key-pressed or key-released transition.
 //|
 //|         :param int key_number: The key number.
@@ -41,7 +44,6 @@
 //|         :param int timestamp: The time in milliseconds that the keypress occurred in the `supervisor.ticks_ms` time system.  If specified as None, the current value of `supervisor.ticks_ms` is used.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     keypad_event_obj_t *self = m_new_obj(keypad_event_obj_t);
     self->base.type = &keypad_event_type;
@@ -69,7 +71,6 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args,
 
 //|     key_number: int
 //|     """The key number."""
-//|
 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_number(self));
@@ -83,7 +84,6 @@ MP_PROPERTY_GETTER(keypad_event_key_number_obj,
 //|     """``True`` if the event represents a key down (pressed) transition.
 //|     The opposite of `released`.
 //|     """
-//|
 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));
@@ -97,7 +97,6 @@ MP_PROPERTY_GETTER(keypad_event_pressed_obj,
 //|     """``True`` if the event represents a key up (released) transition.
 //|     The opposite of `pressed`.
 //|     """
-//|
 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));
@@ -109,7 +108,6 @@ MP_PROPERTY_GETTER(keypad_event_released_obj,
 
 //|     timestamp: int
 //|     """The timestamp."""
-//|
 STATIC mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_keypad_event_get_timestamp(self);
@@ -126,7 +124,6 @@ MP_PROPERTY_GETTER(keypad_event_timestamp_obj,
 //|         Note that this does not compare the event timestamps.
 //|         """
 //|         ...
-//|
 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:
@@ -153,7 +150,6 @@ STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_ob
 //|
 //|         Note that as events with different timestamps compare equal, they also hash to the same value."""
 //|         ...
-//|
 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_in);
     switch (op) {
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index ed182033dc..17eafe5468 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -38,6 +38,7 @@
 //|     You cannot create an instance of `EventQueue` directly. Each scanner creates an
 //|     instance when it is created.
 //|     """
+//|
 //|     ...
 
 //|     def get(self) -> Optional[Event]:
@@ -52,7 +53,6 @@
 //|         :rtype: Optional[Event]
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t keypad_eventqueue_get(mp_obj_t self_in) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -75,7 +75,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_obj, keypad_eventqueue_get);
 //|         :rtype: bool
 //|         """
 //|         ...
-//|
 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);
 
@@ -86,10 +85,8 @@ 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. Also sets `overflowed` to ``False``.
-//|         """
+//|         """Clear any queued key transition events. Also sets `overflowed` to ``False``."""
 //|         ...
-//|
 STATIC mp_obj_t keypad_eventqueue_clear(mp_obj_t self_in) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -103,11 +100,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_clear_obj, keypad_eventqueue_clear);
 //|         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);
@@ -125,7 +120,6 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     """``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) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_keypad_eventqueue_get_overflowed(self));
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 9e65471a2b..bf9dc4a6eb 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -37,7 +37,14 @@
 //| class KeyMatrix:
 //|     """Manage a 2D matrix of keys with row and column pins."""
 //|
-//|     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:
+//|     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 external pull-ups or pull-downs on the matrix:
@@ -112,7 +119,6 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     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);
@@ -123,14 +129,12 @@ 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]);
@@ -150,12 +154,10 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
 //|         a new key-pressed event to occur.
 //|         """
 //|         ...
-//|
 
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
-//|
 
 //|     def key_number_to_row_column(self, key_number: int) -> Tuple[int]:
 //|         """Return the row and column for the given key number.
@@ -166,7 +168,6 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
 //|         :rtype: Tuple[int]
 //|         """
 //|         ...
-//|
 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);
@@ -193,7 +194,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_key_number_to_row_column_obj, keypad_
 //|         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);
@@ -212,7 +212,6 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
-//|
 
 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) },
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 6ac705eba6..df27ea54f1 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -37,7 +37,15 @@
 //| class Keys:
 //|     """Manage a set of independent keys."""
 //|
-//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, value_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.
@@ -103,7 +111,6 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s
 //|     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);
 
@@ -115,14 +122,12 @@ 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]);
@@ -137,17 +142,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypa
 //|         a new key-pressed event to occur.
 //|         """
 //|         ...
-//|
 
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
-//|
 
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
-//|
 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) },
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 14ab87436b..08be1393d5 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -37,7 +37,18 @@
 //| 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, key_count: 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.
@@ -107,7 +118,6 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
 //|     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);
 
@@ -119,14 +129,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_deinit_obj, keypad_shiftregis
 //|     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]);
@@ -140,17 +148,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj
 //|         a new key-pressed event to occur.
 //|         """
 //|         ...
-//|
 
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
-//|
 
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
-//|
 
 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) },
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
index 3822b8ea53..7dd76c1947 100644
--- a/shared-bindings/keypad/__init__.c
+++ b/shared-bindings/keypad/__init__.c
@@ -90,7 +90,6 @@ const mp_obj_property_t keypad_generic_events_obj = {
 //| For more information about working with the `keypad` module in CircuitPython,
 //| see `this Learn guide `_.
 //| """
-//|
 
 STATIC mp_rom_map_elem_t keypad_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),          MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c
index f5fb45cb4d..6c5052d1b5 100644
--- a/shared-bindings/math/__init__.c
+++ b/shared-bindings/math/__init__.c
@@ -45,7 +45,6 @@
 //|
 //| |see_cpython_module| :mod:`cpython:math`.
 //| """
-//|
 
 STATIC NORETURN void math_error(void) {
     mp_raise_ValueError(translate("math domain error"));
@@ -87,7 +86,6 @@ STATIC NORETURN void math_error(void) {
 //|
 //| pi: float
 //| """the ratio of a circle's circumference to its diameter"""
-//|
 
 //| def acos(x: float) -> float:
 //|     """Return the inverse cosine of ``x``."""
@@ -191,7 +189,6 @@ STATIC NORETURN void math_error(void) {
 //| def trunc(x: float) -> int:
 //|     """Return an integer, being ``x`` rounded towards 0."""
 //|     ...
-//|
 MATH_FUN_1_ERRCOND(sqrt, sqrt, (x < (mp_float_t)0.0))
 
 MATH_FUN_2(pow, pow)
@@ -204,7 +201,6 @@ MATH_FUN_1(exp, exp)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(expm1, expm1)
 
 //| def log2(x: float) -> float:
@@ -213,7 +209,6 @@ MATH_FUN_1(expm1, expm1)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1_ERRCOND(log2, log2, (x <= (mp_float_t)0.0))
 
 //| def log10(x: float) -> float:
@@ -222,7 +217,6 @@ MATH_FUN_1_ERRCOND(log2, log2, (x <= (mp_float_t)0.0))
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1_ERRCOND(log10, log10, (x <= (mp_float_t)0.0))
 
 //| def cosh(x: float) -> float:
@@ -231,7 +225,6 @@ MATH_FUN_1_ERRCOND(log10, log10, (x <= (mp_float_t)0.0))
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(cosh, cosh)
 
 //| def sinh(x: float) -> float:
@@ -240,7 +233,6 @@ MATH_FUN_1(cosh, cosh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(sinh, sinh)
 
 //| def tanh(x: float) -> float:
@@ -249,7 +241,6 @@ MATH_FUN_1(sinh, sinh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(tanh, tanh)
 
 //| def acosh(x: float) -> float:
@@ -258,7 +249,6 @@ MATH_FUN_1(tanh, tanh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(acosh, acosh)
 
 //| def asinh(x: float) -> float:
@@ -267,7 +257,6 @@ MATH_FUN_1(acosh, acosh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(asinh, asinh)
 
 //| def atanh(x: float) -> float:
@@ -276,7 +265,6 @@ MATH_FUN_1(asinh, asinh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(atanh, atanh)
 #endif
 
@@ -321,7 +309,6 @@ MATH_FUN_2(ldexp, ldexp)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(erf, erf)
 
 //| def erfc(x: float) -> float:
@@ -330,7 +317,6 @@ MATH_FUN_1(erf, erf)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(erfc, erfc)
 
 //| def gamma(x: float) -> float:
@@ -339,7 +325,6 @@ MATH_FUN_1(erfc, erfc)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(gamma, tgamma)
 
 //| def lgamma(x: float) -> float:
@@ -348,7 +333,6 @@ MATH_FUN_1(gamma, tgamma)
 //|     May not be available on some boards.
 //|     """
 //|     ...
-//|
 MATH_FUN_1(lgamma, lgamma)
 #endif
 // TODO: factorial, fsum
diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c
index 49eda58557..26def06a50 100644
--- a/shared-bindings/mdns/RemoteService.c
+++ b/shared-bindings/mdns/RemoteService.c
@@ -35,16 +35,13 @@
 //| class RemoteService:
 //|     """Encapsulates information about a remote service that was found during a search. This
 //|     object may only be created by a `mdns.Server`. It has no user-visible constructor."""
-//|
 
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `mdns.Server.find`."""
 //|         ...
-//|
 
 //|     hostname: str
 //|     """The hostname of the device (read-only),."""
-//|
 STATIC mp_obj_t mdns_remoteservice_get_hostname(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const char *hostname = common_hal_mdns_remoteservice_get_hostname(self);
@@ -57,7 +54,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_hostname_obj,
 
 //|     instance_name: str
 //|     """The human readable instance name for the service. (read-only)"""
-//|
 STATIC mp_obj_t remoteservice_get_instance_name(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const char *instance_name = common_hal_mdns_remoteservice_get_instance_name(self);
@@ -70,7 +66,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_instance_name_obj,
 
 //|     service_type: str
 //|     """The service type string such as ``_http``. (read-only)"""
-//|
 STATIC mp_obj_t remoteservice_get_service_type(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const char *service_type = common_hal_mdns_remoteservice_get_service_type(self);
@@ -83,7 +78,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_service_type_obj,
 
 //|     protocol: str
 //|     """The protocol string such as ``_tcp``. (read-only)"""
-//|
 STATIC mp_obj_t remoteservice_get_protocol(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const char *protocol = common_hal_mdns_remoteservice_get_protocol(self);
@@ -96,7 +90,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_protocol_obj,
 
 //|     port: int
 //|     """Port number used for the service. (read-only)"""
-//|
 STATIC mp_obj_t remoteservice_get_port(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_mdns_remoteservice_get_port(self));
@@ -108,7 +101,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_port_obj,
 
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the remote service. None if no A records are found."""
-//|
 STATIC mp_obj_t _mdns_remoteservice_get_ipv4_address(mp_obj_t self) {
     return common_hal_mdns_remoteservice_get_ipv4_address(self);
 
@@ -121,7 +113,6 @@ MP_PROPERTY_GETTER(mdns_remoteservice_ipv4_address_obj,
 //|     def __del__(self) -> None:
 //|         """Deletes the RemoteService object."""
 //|         ...
-//|
 STATIC mp_obj_t mdns_remoteservice_obj_deinit(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_mdns_remoteservice_deinit(self);
diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index bcf761d72a..ab5f792cbc 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -35,8 +35,7 @@
 
 //| class Server:
 //|     """The MDNS Server responds to queries for this device's information and allows for querying
-//|        other devices."""
-//|
+//|     other devices."""
 
 //|     def __init__(self, network_interface: wifi.Radio) -> None:
 //|         """
@@ -44,7 +43,6 @@
 //|         may already be using it.) Only native interfaces are currently supported.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_network_interface };
     static const mp_arg_t allowed_args[] = {
@@ -64,7 +62,6 @@ STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, s
 //|     def deinit(self) -> None:
 //|         """Stops the server"""
 //|         ...
-//|
 STATIC mp_obj_t mdns_server_obj_deinit(mp_obj_t self_in) {
     mdns_server_obj_t *self = (mdns_server_obj_t *)self_in;
     common_hal_mdns_server_deinit(self);
@@ -78,12 +75,10 @@ STATIC void check_for_deinit(mdns_server_obj_t *self) {
     }
 }
 
-//|
 //|     hostname: str
 //|     """Hostname resolvable as ``.local`` in addition to ``circuitpython.local``. Make
 //|        sure this is unique across all devices on the network. It defaults to ``cpy-######``
 //|        where ``######`` is the hex digits of the last three bytes of the mac address."""
-//|
 STATIC mp_obj_t mdns_server_get_hostname(mp_obj_t self) {
     check_for_deinit(self);
     const char *hostname = common_hal_mdns_server_get_hostname(self);
@@ -105,7 +100,6 @@ MP_PROPERTY_GETSET(mdns_server_hostname_obj,
 
 //|     instance_name: str
 //|     """Human readable name to describe the device."""
-//|
 STATIC mp_obj_t mdns_server_get_instance_name(mp_obj_t self) {
     check_for_deinit(self);
     const char *instance_name = common_hal_mdns_server_get_instance_name(self);
@@ -125,7 +119,9 @@ MP_PROPERTY_GETSET(mdns_server_instance_name_obj,
     (mp_obj_t)&mdns_server_set_instance_name_obj);
 
 
-//|     def find(self, service_type: str, protocol: str, *, timeout: float = 1) -> Tuple[RemoteService]:
+//|     def find(
+//|         self, service_type: str, protocol: str, *, timeout: float = 1
+//|     ) -> Tuple[RemoteService]:
 //|         """Find all locally available remote services with the given service type and protocol.
 //|
 //|         This doesn't allow for direct hostname lookup. To do that, use
@@ -135,7 +131,6 @@ MP_PROPERTY_GETSET(mdns_server_instance_name_obj,
 //|         :param str protocol: The service protocol such as "_tcp"
 //|         :param float/int timeout: Time to wait for responses"""
 //|         ...
-//|
 STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     check_for_deinit(self);
@@ -158,7 +153,7 @@ STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 
-//|     def advertise_service(self, *,  service_type: str, protocol: str, port: int) -> None:
+//|     def advertise_service(self, *, service_type: str, protocol: str, port: int) -> None:
 //|         """Respond to queries for the given service with the given port.
 //|
 //|         ``service_type`` and ``protocol`` can only occur on one port. Any call after the first
@@ -168,7 +163,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 //|         :param str protocol: The service protocol such as "_tcp"
 //|         :param int port: The port used by the service"""
 //|         ...
-//|
 STATIC mp_obj_t mdns_server_advertise_service(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     check_for_deinit(self);
diff --git a/shared-bindings/mdns/__init__.c b/shared-bindings/mdns/__init__.c
index 9752a3b7ff..73bd71c65c 100644
--- a/shared-bindings/mdns/__init__.c
+++ b/shared-bindings/mdns/__init__.c
@@ -38,7 +38,6 @@
 //| Basic use provides hostname resolution under the .local TLD. This module
 //| also supports DNS Service Discovery that allows for discovering other hosts
 //| that provide a desired service."""
-//|
 
 STATIC const mp_rom_map_elem_t mdns_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),             MP_ROM_QSTR(MP_QSTR_mdns) },
diff --git a/shared-bindings/memorymonitor/AllocationAlarm.c b/shared-bindings/memorymonitor/AllocationAlarm.c
index 45e7019912..4fcf2d1214 100644
--- a/shared-bindings/memorymonitor/AllocationAlarm.c
+++ b/shared-bindings/memorymonitor/AllocationAlarm.c
@@ -34,7 +34,6 @@
 #include "supervisor/shared/translate/translate.h"
 
 //| class AllocationAlarm:
-//|
 //|     def __init__(self, *, minimum_block_count: int = 1) -> None:
 //|         """Throw an exception when an allocation of ``minimum_block_count`` or more blocks
 //|            occurs while active.
@@ -55,7 +54,6 @@
 //|
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) {
     enum { ARG_minimum_block_count };
     static const mp_arg_t allowed_args[] = {
@@ -78,16 +76,15 @@ STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type
 
 //|     def ignore(self, count: int) -> AllocationAlarm:
 //|         """Sets the number of applicable allocations to ignore before raising the exception.
-//|            Automatically set back to zero at context exit.
+//|         Automatically set back to zero at context exit.
 //|
-//|            Use it within a ``with`` block::
+//|         Use it within a ``with`` block::
 //|
-//|              # Will not alarm because the bytearray allocation will be ignored.
-//|              with aa.ignore(2):
-//|                  x = bytearray(20)
-//|            """
+//|           # Will not alarm because the bytearray allocation will be ignored.
+//|           with aa.ignore(2):
+//|               x = bytearray(20)
+//|         """
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationalarm_obj_ignore(mp_obj_t self_in, mp_obj_t count_obj) {
     mp_int_t count = mp_obj_get_int(count_obj);
     mp_arg_validate_int_min(count, 0, MP_QSTR_count);
@@ -100,7 +97,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(memorymonitor_allocationalarm_ignore_obj, memorymonito
 //|     def __enter__(self) -> AllocationAlarm:
 //|         """Enables the alarm."""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationalarm_obj___enter__(mp_obj_t self_in) {
     common_hal_memorymonitor_allocationalarm_resume(self_in);
     return self_in;
@@ -111,7 +107,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationalarm___enter___obj, memorymon
 //|         """Automatically disables the allocation alarm when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationalarm_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_memorymonitor_allocationalarm_set_ignore(args[0], 0);
diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c
index ed8252b67a..73c149cd19 100644
--- a/shared-bindings/memorymonitor/AllocationSize.c
+++ b/shared-bindings/memorymonitor/AllocationSize.c
@@ -34,7 +34,6 @@
 #include "supervisor/shared/translate/translate.h"
 
 //| class AllocationSize:
-//|
 //|     def __init__(self) -> None:
 //|         """Tracks the number of allocations in power of two buckets.
 //|
@@ -62,7 +61,6 @@
 //|
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) {
     memorymonitor_allocationsize_obj_t *self = m_new_obj(memorymonitor_allocationsize_obj_t);
     self->base.type = &memorymonitor_allocationsize_type;
@@ -75,7 +73,6 @@ STATIC mp_obj_t memorymonitor_allocationsize_make_new(const mp_obj_type_t *type,
 //|     def __enter__(self) -> AllocationSize:
 //|         """Clears counts and resumes tracking."""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_obj___enter__(mp_obj_t self_in) {
     common_hal_memorymonitor_allocationsize_clear(self_in);
     common_hal_memorymonitor_allocationsize_resume(self_in);
@@ -87,7 +84,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationsize___enter___obj, memorymoni
 //|         """Automatically pauses allocation tracking when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_memorymonitor_allocationsize_pause(args[0]);
@@ -97,7 +93,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(memorymonitor_allocationsize___exit__
 
 //|     bytes_per_block: int
 //|     """Number of bytes per block"""
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_obj_get_bytes_per_block(mp_obj_t self_in) {
     memorymonitor_allocationsize_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -116,7 +111,6 @@ MP_PROPERTY_GETTER(memorymonitor_allocationsize_bytes_per_block_obj,
 //|           mm = memorymonitor.AllocationSize()
 //|           print(len(mm))"""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     memorymonitor_allocationsize_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint16_t len = common_hal_memorymonitor_allocationsize_get_len(self);
@@ -138,7 +132,6 @@ STATIC mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t
 //|           mm = memorymonitor.AllocationSize()
 //|           print(mm[0])"""
 //|         ...
-//|
 STATIC mp_obj_t memorymonitor_allocationsize_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     if (value == mp_const_none) {
         // delete item
diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c
index 64a3a6a77f..41a0f410ba 100644
--- a/shared-bindings/memorymonitor/__init__.c
+++ b/shared-bindings/memorymonitor/__init__.c
@@ -34,10 +34,10 @@
 #include "shared-bindings/memorymonitor/AllocationSize.h"
 
 //| """Memory monitoring helpers"""
-//|
 
 //| class AllocationError(Exception):
 //|     """Catchall exception for allocation related errors."""
+//|
 //|     ...
 MP_DEFINE_MEMORYMONITOR_EXCEPTION(AllocationError, Exception)
 
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index 840f468e2a..fdd1070377 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -41,12 +41,10 @@
 //|         hardware so they cannot be constructed on demand. Instead, use
 //|         :mod:`board` or :mod:`microcontroller.pin` to reference the desired pin."""
 //|         ...
-//|
 
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Pin."""
 //|         ...
-//|
 // Provided by mp_generic_unary_op().
 
 static void get_pin_name(const mcu_pin_obj_t *self, qstr *package, qstr *module, qstr *name) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 067d6b0097..06be50847e 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -57,17 +57,14 @@
 //|
 //|        print(microcontroller.cpus[0].temperature)
 //|        print(microcontroller.cpus[1].frequency)"""
-//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `microcontroller.Processor`.
 //|         Use `microcontroller.cpu` to access the sole instance available."""
 //|         ...
-//|
 
 //|     frequency: int
 //|     """The CPU operating frequency in Hertz. (read-only)"""
-//|
 
 STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) {
     #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY
@@ -94,7 +91,6 @@ MP_PROPERTY_GETSET(mcu_processor_frequency_obj,
 
 //|     reset_reason: microcontroller.ResetReason
 //|     """The reason the microcontroller started up from reset state."""
-//|
 STATIC mp_obj_t mcu_processor_get_reset_reason(mp_obj_t self) {
     return cp_enum_find(&mcu_reset_reason_type, common_hal_mcu_processor_get_reset_reason());
 }
@@ -108,7 +104,6 @@ MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj,
 //|     """The on-chip temperature, in Celsius, as a float. (read-only)
 //|
 //|     Is `None` if the temperature is not available."""
-//|
 STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) {
     float temperature = common_hal_mcu_processor_get_temperature();
     return isnan(temperature) ? mp_const_none : mp_obj_new_float(temperature);
@@ -121,7 +116,6 @@ MP_PROPERTY_GETTER(mcu_processor_temperature_obj,
 
 //|     uid: bytearray
 //|     """The unique id (aka serial number) of the chip as a `bytearray`. (read-only)"""
-//|
 STATIC mp_obj_t mcu_processor_get_uid(mp_obj_t self) {
     uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
     common_hal_mcu_processor_get_uid(raw_id);
@@ -137,7 +131,6 @@ MP_PROPERTY_GETTER(mcu_processor_uid_obj,
 //|     """The input voltage to the microcontroller, as a float. (read-only)
 //|
 //|     Is `None` if the voltage is not available."""
-//|
 STATIC mp_obj_t mcu_processor_get_voltage(mp_obj_t self) {
     float voltage = common_hal_mcu_processor_get_voltage();
     return isnan(voltage) ? mp_const_none : mp_obj_new_float(voltage);
diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c
index 905c19f83f..8bb7352c90 100644
--- a/shared-bindings/microcontroller/ResetReason.c
+++ b/shared-bindings/microcontroller/ResetReason.c
@@ -64,7 +64,6 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESCUE_DEBUG, RESET_REASON_
 //|
 //|     RESCUE_DEBUG: object
 //|     """The microntroller was reset by the rescue debug port."""
-//|
 MAKE_ENUM_MAP(mcu_reset_reason) {
     MAKE_ENUM_MAP_ENTRY(reset_reason, POWER_ON),
     MAKE_ENUM_MAP_ENTRY(reset_reason, BROWNOUT),
diff --git a/shared-bindings/microcontroller/RunMode.c b/shared-bindings/microcontroller/RunMode.c
index 477168dda0..4c6c1ceb83 100644
--- a/shared-bindings/microcontroller/RunMode.c
+++ b/shared-bindings/microcontroller/RunMode.c
@@ -32,7 +32,6 @@
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define the run mode of the microcontroller and
 //|         CircuitPython."""
-//|
 //|     NORMAL: RunMode
 //|     """Run CircuitPython as normal.
 //|
@@ -53,7 +52,6 @@
 //|     """Run the default bootloader.
 //|
 //|     :type microcontroller.RunMode:"""
-//|
 const mp_obj_type_t mcu_runmode_type;
 
 const mcu_runmode_obj_t mcu_runmode_uf2_obj = {
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 46382dc3e6..f772d32f20 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -49,19 +49,16 @@
 //|
 //| from nvm import ByteArray
 //| from watchdog import WatchDogTimer
-//|
 
 //| cpu: Processor
 //| """CPU information and control, such as ``cpu.temperature`` and ``cpu.frequency``
 //| (clock frequency).
 //| This object is an instance of `microcontroller.Processor`."""
-//|
 
 //| cpus: Processor
 //| """CPU information and control, such as ``cpus[0].temperature`` and ``cpus[1].frequency``
 //| (clock frequency) on chips with more than 1 cpu. The index selects which cpu.
 //| This object is an instance of `microcontroller.Processor`."""
-//|
 
 //| def delay_us(delay: int) -> None:
 //|     """Dedicated delay method used for very short delays. **Do not** do long delays
@@ -71,7 +68,6 @@
 //|     processing while you are waiting, explore a different avenue such as using
 //|     `time.sleep()`."""
 //|     ...
-//|
 STATIC mp_obj_t mcu_delay_us(mp_obj_t delay_obj) {
     uint32_t delay = mp_obj_get_int(delay_obj);
 
@@ -84,7 +80,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_delay_us_obj, mcu_delay_us);
 //| def disable_interrupts() -> None:
 //|     """Disable all interrupts. Be very careful, this can stall everything."""
 //|     ...
-//|
 STATIC mp_obj_t mcu_disable_interrupts(void) {
     common_hal_mcu_disable_interrupts();
     return mp_const_none;
@@ -94,7 +89,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_disable_interrupts_obj, mcu_disable_interru
 //| def enable_interrupts() -> None:
 //|     """Enable the interrupts that were enabled at the last disable."""
 //|     ...
-//|
 STATIC mp_obj_t mcu_enable_interrupts(void) {
     common_hal_mcu_enable_interrupts();
     return mp_const_none;
@@ -107,7 +101,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_enable_interrupts_obj, mcu_enable_interrupt
 //|
 //|     :param ~microcontroller.RunMode run_mode: The next run mode"""
 //|     ...
-//|
 STATIC mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) {
     mcu_runmode_t run_mode;
     if (run_mode_obj == MP_OBJ_FROM_PTR(&mcu_runmode_uf2_obj)) {
@@ -134,7 +127,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_on_next_reset_obj, mcu_on_next_reset);
 //|       host computer. Be very careful when calling this! Make sure the device
 //|       "Safely removed" on Windows or "ejected" on Mac OSX and Linux."""
 //|     ...
-//|
 STATIC mp_obj_t mcu_reset(void) {
     common_hal_mcu_reset();
     // We won't actually get here because we're resetting.
@@ -147,12 +139,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset);
 //| This object is the sole instance of `nvm.ByteArray` when available or ``None`` otherwise.
 //|
 //| :type: nvm.ByteArray or None"""
-//|
 
 //| watchdog: Optional[WatchDogTimer]
 //| """Available watchdog timer.
 //| This object is the sole instance of `watchdog.WatchDogTimer` when available or ``None`` otherwise."""
-//|
 
 const mp_obj_module_t mcu_pin_module = {
     .base = { &mp_type_module },
diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c
index 94c699d469..baaa954ca2 100644
--- a/shared-bindings/msgpack/ExtType.c
+++ b/shared-bindings/msgpack/ExtType.c
@@ -31,11 +31,11 @@
 
 //| class ExtType:
 //|     """ExtType represents ext type in msgpack."""
+//|
 //|     def __init__(self, code: int, data: bytes) -> None:
 //|         """Constructor
 //|         :param int code: type code in range 0~127.
 //|         :param bytes data: representation."""
-//|
 STATIC mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mod_msgpack_extype_obj_t *self = m_new_obj(mod_msgpack_extype_obj_t);
     self->base.type = &mod_msgpack_exttype_type;
@@ -60,7 +60,6 @@ STATIC mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n
 //|     code: int
 //|     """The type code, in range 0~127."""
 //|     ...
-//|
 STATIC mp_obj_t mod_msgpack_exttype_get_code(mp_obj_t self_in) {
     mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->code);
@@ -85,7 +84,6 @@ MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj,
 //|     data: bytes
 //|     """Data."""
 //|     ...
-//|
 STATIC mp_obj_t mod_msgpack_exttype_get_data(mp_obj_t self_in) {
     mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return self->data;
diff --git a/shared-bindings/msgpack/__init__.c b/shared-bindings/msgpack/__init__.c
index e13fb28819..62cf20770e 100644
--- a/shared-bindings/msgpack/__init__.c
+++ b/shared-bindings/msgpack/__init__.c
@@ -84,9 +84,13 @@
 //|    print(f"{data} -> {buffer.getvalue()} -> {decoded}")
 //|
 //| """
-//|
 
-//| def pack(obj: object, stream: circuitpython_typing.ByteStream, *, default: Union[Callable[[object], None], None] = None) -> None:
+//| def pack(
+//|     obj: object,
+//|     stream: circuitpython_typing.ByteStream,
+//|     *,
+//|     default: Union[Callable[[object], None], None] = None
+//| ) -> None:
 //|     """Output object to stream in msgpack format.
 //|
 //|     :param object obj: Object to convert to msgpack format.
@@ -96,7 +100,6 @@
 //|           a representation in msgpack format.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t mod_msgpack_pack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_obj, ARG_buffer, ARG_default };
     STATIC const mp_arg_t allowed_args[] = {
@@ -118,7 +121,12 @@ STATIC mp_obj_t mod_msgpack_pack(size_t n_args, const mp_obj_t *pos_args, mp_map
 MP_DEFINE_CONST_FUN_OBJ_KW(mod_msgpack_pack_obj, 0, mod_msgpack_pack);
 
 
-//| def unpack(stream: circuitpython_typing.ByteStream, *, ext_hook: Union[Callable[[int, bytes], object], None] = None, use_list: bool=True) -> object:
+//| def unpack(
+//|     stream: circuitpython_typing.ByteStream,
+//|     *,
+//|     ext_hook: Union[Callable[[int, bytes], object], None] = None,
+//|     use_list: bool = True
+//| ) -> object:
 //|     """Unpack and return one object from stream.
 //|
 //|     :param ~circuitpython_typing.ByteStream stream: stream to read from
@@ -129,7 +137,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mod_msgpack_pack_obj, 0, mod_msgpack_pack);
 //|     :return object: object read from stream.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t mod_msgpack_unpack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_ext_hook, ARG_use_list };
     STATIC const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/multiterminal/__init__.c b/shared-bindings/multiterminal/__init__.c
index 8726e9a655..91f21da328 100644
--- a/shared-bindings/multiterminal/__init__.c
+++ b/shared-bindings/multiterminal/__init__.c
@@ -35,12 +35,10 @@
 //| The `multiterminal` module allows you to configure an additional serial
 //| terminal source. Incoming characters are accepted from both the internal
 //| serial connection and the optional secondary connection."""
-//|
 
 //| def get_secondary_terminal() -> Optional[typing.BinaryIO]:
 //|     """Returns the current secondary terminal."""
 //|     ...
-//|
 STATIC mp_obj_t multiterminal_obj_get_secondary_terminal() {
     return common_hal_multiterminal_get_secondary_terminal();
 }
@@ -53,7 +51,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(multiterminal_get_secondary_terminal_obj, multitermina
 //|
 //|     :param stream stream: secondary stream"""
 //|     ...
-//|
 STATIC mp_obj_t multiterminal_obj_set_secondary_terminal(mp_obj_t secondary_terminal) {
     mp_obj_t write_m[3];
     mp_load_method_maybe(secondary_terminal, MP_QSTR_write, write_m);
@@ -71,7 +68,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(multiterminal_set_secondary_terminal_obj, multitermina
 //| def clear_secondary_terminal() -> None:
 //|     """Clears the secondary terminal."""
 //|     ...
-//|
 STATIC mp_obj_t multiterminal_obj_clear_secondary_terminal() {
     common_hal_multiterminal_clear_secondary_terminal();
     return mp_const_none;
@@ -83,7 +79,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(multiterminal_clear_secondary_terminal_obj, multitermi
 //|     the OS when more data is available on the socket to read. This is useful
 //|     as a callback for lwip sockets."""
 //|     ...
-//|
 // TODO(tannewt): This is a funny API. Replace it with a direct call into the OS
 // by the lwip object.
 STATIC mp_obj_t multiterminal_obj_schedule_secondary_terminal_read(mp_obj_t socket) {
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
index 936e3bcee5..480f05cb02 100644
--- a/shared-bindings/nvm/ByteArray.c
+++ b/shared-bindings/nvm/ByteArray.c
@@ -43,20 +43,15 @@
 //|        import microcontroller
 //|        microcontroller.nvm[0:3] = b"\xcc\x10\x00"
 //|     """
-//|
 
 //|     def __init__(self) -> None:
 //|         """Not currently dynamically supported. Access the sole instance through `microcontroller.nvm`."""
 //|         ...
-//|
 
-//|     def __bool__(self) -> bool:
-//|         ...
-//|
+//|     def __bool__(self) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Return the length. This is used by (`len`)"""
 //|         ...
-//|
 STATIC mp_obj_t nvm_bytearray_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     nvm_bytearray_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint16_t len = common_hal_nvm_bytearray_get_length(self);
@@ -81,14 +76,12 @@ STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict
 //|     def __getitem__(self, index: int) -> int:
 //|         """Returns the value at the given index."""
 //|         ...
-//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
 //|     def __setitem__(self, index: int, value: int) -> None:
 //|         """Set the value at the given index."""
 //|         ...
-//|
 STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/nvm/__init__.c b/shared-bindings/nvm/__init__.c
index dffc4cda89..1c628eaf66 100644
--- a/shared-bindings/nvm/__init__.c
+++ b/shared-bindings/nvm/__init__.c
@@ -39,7 +39,6 @@
 //| Note that this module can't be imported and used directly. The sole
 //| instance of :class:`ByteArray` is available at
 //| :attr:`microcontroller.nvm`."""
-//|
 STATIC const mp_rom_map_elem_t nvm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nvm) },
     { MP_ROM_QSTR(MP_QSTR_ByteArray),   MP_ROM_PTR(&nvm_bytearray_type) },
diff --git a/shared-bindings/onewireio/OneWire.c b/shared-bindings/onewireio/OneWire.c
index 6ce5b659e7..be8e07a56b 100644
--- a/shared-bindings/onewireio/OneWire.c
+++ b/shared-bindings/onewireio/OneWire.c
@@ -38,22 +38,21 @@
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Create a OneWire object associated with the given pin.
 //|
-//|           The object implements the lowest level timing-sensitive bits of the protocol.
+//|         The object implements the lowest level timing-sensitive bits of the protocol.
 //|
-//|           :param ~microcontroller.Pin pin: Pin connected to the OneWire bus
+//|         :param ~microcontroller.Pin pin: Pin connected to the OneWire bus
 //|
-//|           Read a short series of pulses::
+//|         Read a short series of pulses::
 //|
-//|             import onewireio
-//|             import board
+//|           import onewireio
+//|           import board
 //|
-//|             onewire = onewireio.OneWire(board.D7)
-//|             onewire.reset()
-//|             onewire.write_bit(True)
-//|             onewire.write_bit(False)
-//|             print(onewire.read_bit())"""
+//|           onewire = onewireio.OneWire(board.D7)
+//|           onewire.reset()
+//|           onewire.write_bit(True)
+//|           onewire.write_bit(False)
+//|           print(onewire.read_bit())"""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin };
     static const mp_arg_t allowed_args[] = {
@@ -73,7 +72,6 @@ STATIC mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_a
 //|     def deinit(self) -> None:
 //|         """Deinitialize the OneWire bus and release any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_deinit(mp_obj_t self_in) {
     onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_onewireio_onewire_deinit(self);
@@ -90,14 +88,12 @@ STATIC void check_for_deinit(onewireio_onewire_obj_t *self) {
 //|     def __enter__(self) -> OneWire:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_onewireio_onewire_deinit(args[0]);
@@ -111,7 +107,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(onewireio_onewire___exit___obj, 4, 4,
 //|         :returns: False when at least one device is present
 //|         :rtype: bool"""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_obj_reset(mp_obj_t self_in) {
     onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -126,7 +121,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_reset_obj, onewireio_onewire_obj_res
 //|         :returns: bit state read
 //|         :rtype: bool"""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_obj_read_bit(mp_obj_t self_in) {
     onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -138,7 +132,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_read_bit_obj, onewireio_onewire_obj_
 //|     def write_bit(self, value: bool) -> None:
 //|         """Write out a bit based on value."""
 //|         ...
-//|
 STATIC mp_obj_t onewireio_onewire_obj_write_bit(mp_obj_t self_in, mp_obj_t bool_obj) {
     onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/onewireio/__init__.c b/shared-bindings/onewireio/__init__.c
index 45d78b250a..81b2d605d7 100644
--- a/shared-bindings/onewireio/__init__.c
+++ b/shared-bindings/onewireio/__init__.c
@@ -38,7 +38,6 @@
 //| """Low-level bit primitives for Maxim (formerly Dallas Semi) one-wire protocol.
 //|
 //|    Protocol definition is here: https://www.maximintegrated.com/en/app-notes/index.mvp/id/126"""
-//|
 
 STATIC const mp_rom_map_elem_t onewireio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_onewireio) },
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 407fa02558..7cf9d0e45b 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -58,7 +58,6 @@
 //|     release: str
 //|     version: str
 //|     machine: str
-//|
 STATIC mp_obj_t os_uname(void) {
     return common_hal_os_uname();
 }
@@ -67,7 +66,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 //| def chdir(path: str) -> None:
 //|     """Change current directory."""
 //|     ...
-//|
 STATIC mp_obj_t os_chdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_chdir(path);
@@ -78,7 +76,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_chdir_obj, os_chdir);
 //| def getcwd() -> str:
 //|     """Get the current directory."""
 //|     ...
-//|
 STATIC mp_obj_t os_getcwd(void) {
     return common_hal_os_getcwd();
 }
@@ -87,9 +84,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd);
 //| def getenv(key: str, default: Optional[str] = None) -> Optional[str]:
 //|     """Get the environment variable value for the given key or return ``default``.
 //|
-//|        This may load values from disk so cache the result instead of calling this often."""
+//|     This may load values from disk so cache the result instead of calling this often."""
 //|     ...
-//|
 STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_key, ARG_default };
     static const mp_arg_t allowed_args[] = {
@@ -106,7 +102,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv);
 //| def listdir(dir: str) -> str:
 //|     """With no argument, list the current directory.  Otherwise list the given directory."""
 //|     ...
-//|
 STATIC mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) {
     const char *path;
     if (n_args == 1) {
@@ -121,7 +116,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_listdir_obj, 0, 1, os_listdir);
 //| def mkdir(path: str) -> None:
 //|     """Create a new directory."""
 //|     ...
-//|
 STATIC mp_obj_t os_mkdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_mkdir(path);
@@ -132,7 +126,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir);
 //| def remove(path: str) -> None:
 //|     """Remove a file."""
 //|     ...
-//|
 STATIC mp_obj_t os_remove(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_remove(path);
@@ -143,7 +136,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove);
 //| def rmdir(path: str) -> None:
 //|     """Remove a directory."""
 //|     ...
-//|
 STATIC mp_obj_t os_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     const char *old_path = mp_obj_str_get_str(old_path_in);
     const char *new_path = mp_obj_str_get_str(new_path_in);
@@ -155,7 +147,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename);
 //| def rename(old_path: str, new_path: str) -> str:
 //|     """Rename a file."""
 //|     ...
-//|
 STATIC mp_obj_t os_rmdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_rmdir(path);
@@ -185,7 +176,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
 //|        So the time fields return 946684800,
 //|        which is the number of seconds corresponding to 1999-12-31."""
 //|     ...
-//|
 STATIC mp_obj_t os_stat(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     return common_hal_os_stat(path);
@@ -212,7 +202,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_stat_obj, os_stat);
 //|     and the ``f_flags`` parameter may return ``0`` as they can be unavailable
 //|     in a port-specific implementation."""
 //|     ...
-//|
 STATIC mp_obj_t os_statvfs(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     return common_hal_os_statvfs(path);
@@ -222,7 +211,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_statvfs_obj, os_statvfs);
 //| def sync() -> None:
 //|     """Sync all filesystems."""
 //|     ...
-//|
 STATIC mp_obj_t os_sync(void) {
     for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
         // this assumes that vfs->obj is fs_user_mount_t with block device functions
@@ -236,7 +224,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
 //|     """Returns a string of *size* random bytes based on a hardware True Random
 //|     Number Generator. When not available, it will raise a NotImplementedError."""
 //|     ...
-//|
 STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
     mp_int_t size = mp_obj_get_int(size_in);
     mp_obj_str_t *result = MP_OBJ_TO_PTR(mp_obj_new_bytes_of_zeros(size));
@@ -268,10 +255,8 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
 
-//|
 //| sep: str
 //| """Separator used to delineate path components such as folder and file names."""
-//|
     { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
 };
 
diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c
index a8b37fa956..2e751df9d8 100644
--- a/shared-bindings/paralleldisplay/ParallelBus.c
+++ b/shared-bindings/paralleldisplay/ParallelBus.c
@@ -42,7 +42,17 @@
 //|     protocol may be refered to as 8080-I Series Parallel Interface in datasheets. It doesn't handle
 //|     display initialization."""
 //|
-//|     def __init__(self, *, data0: microcontroller.Pin, command: microcontroller.Pin, chip_select: microcontroller.Pin, write: microcontroller.Pin, read: Optional[microcontroller.Pin], reset: Optional[microcontroller.Pin] = None, frequency: int = 30_000_000) -> None:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         data0: microcontroller.Pin,
+//|         command: microcontroller.Pin,
+//|         chip_select: microcontroller.Pin,
+//|         write: microcontroller.Pin,
+//|         read: Optional[microcontroller.Pin],
+//|         reset: Optional[microcontroller.Pin] = None,
+//|         frequency: int = 30_000_000,
+//|     ) -> None:
 //|         """Create a ParallelBus object associated with the given pins. The bus is inferred from data0
 //|         by implying the next 7 additional pins on a given GPIO port.
 //|
@@ -60,7 +70,6 @@
 //|         :param microcontroller.Pin reset: Reset pin, optional
 //|         :param int frequency: The communication frequency in Hz for the display on the bus"""
 //|         ...
-//|
 STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_data0, ARG_data_pins, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset, ARG_frequency };
     static const mp_arg_t allowed_args[] = {
@@ -108,7 +117,6 @@ STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type,
 //|         """Performs a hardware reset via the reset pin. Raises an exception if called when no reset pin
 //|         is available."""
 //|         ...
-//|
 
 STATIC mp_obj_t paralleldisplay_parallelbus_obj_reset(mp_obj_t self_in) {
     paralleldisplay_parallelbus_obj_t *self = self_in;
@@ -124,7 +132,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(paralleldisplay_parallelbus_reset_obj, paralleldisplay
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
-//|
 STATIC mp_obj_t paralleldisplay_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) {
     mp_int_t command_int = mp_arg_validate_int_range(mp_obj_get_int(command_obj), 0, 255, MP_QSTR_command);
 
diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c
index d84e788de5..5386d73d6b 100644
--- a/shared-bindings/ps2io/Ps2.c
+++ b/shared-bindings/ps2io/Ps2.c
@@ -66,7 +66,6 @@
 //|           print(kbd.sendcmd(0xed))
 //|           print(kbd.sendcmd(0x01))"""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_data_pin, ARG_clock_pin };
     static const mp_arg_t allowed_args[] = {
@@ -90,7 +89,6 @@ STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, siz
 //|     def deinit(self) -> None:
 //|         """Deinitialises the Ps2 and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_deinit(mp_obj_t self_in) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_ps2io_ps2_deinit(self);
@@ -107,14 +105,12 @@ STATIC void check_for_deinit(ps2io_ps2_obj_t *self) {
 //|     def __enter__(self) -> Ps2:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_obj___exit__(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &ps2io_ps2_type));
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -127,7 +123,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ps2io_ps2___exit___obj, 4, 4, ps2io_p
 //|         """Removes and returns the oldest received byte. When buffer
 //|         is empty, raises an IndexError exception."""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_obj_popleft(mp_obj_t self_in) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -152,7 +147,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_popleft_obj, ps2io_ps2_obj_popleft);
 //|
 //|         :param int byte: byte value of the command"""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_obj_sendcmd(mp_obj_t self_in, mp_obj_t ob) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -194,7 +188,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(ps2io_ps2_sendcmd_obj, ps2io_ps2_obj_sendcmd);
 //|
 //|         0x2000: device didn't send a response byte in time"""
 //|         ...
-//|
 STATIC mp_obj_t ps2io_ps2_obj_clear_errors(mp_obj_t self_in) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -204,12 +197,10 @@ STATIC mp_obj_t ps2io_ps2_obj_clear_errors(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_clear_errors_obj, ps2io_ps2_obj_clear_errors);
 
 //|     def __bool__(self) -> bool: ...
-//|
 //|     def __len__(self) -> int:
 //|         """Returns the number of received bytes in buffer, available
 //|         to :py:func:`popleft()`."""
 //|         ...
-//|
 STATIC mp_obj_t ps2_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/ps2io/__init__.c b/shared-bindings/ps2io/__init__.c
index d0c438aebc..6857744036 100644
--- a/shared-bindings/ps2io/__init__.c
+++ b/shared-bindings/ps2io/__init__.c
@@ -44,7 +44,6 @@
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info."""
-//|
 
 STATIC const mp_rom_map_elem_t ps2io_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ps2io) },
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index a966160e2b..f3f593e9a7 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -37,10 +37,12 @@
 
 //| class PulseIn:
 //|     """Measure a series of active and idle pulses. This is commonly used in infrared receivers
-//|        and low cost temperature sensors (DHT). The pulsed signal consists of timed active and
-//|        idle periods. Unlike PWM, there is no set duration for active and idle pairs."""
+//|     and low cost temperature sensors (DHT). The pulsed signal consists of timed active and
+//|     idle periods. Unlike PWM, there is no set duration for active and idle pairs."""
 //|
-//|     def __init__(self, pin: microcontroller.Pin, maxlen: int = 2, *, idle_state: bool = False) -> None:
+//|     def __init__(
+//|         self, pin: microcontroller.Pin, maxlen: int = 2, *, idle_state: bool = False
+//|     ) -> None:
 //|         """Create a PulseIn object associated with the given pin. The object acts as
 //|         a read-only sequence of pulse lengths with a given max length. When it is
 //|         active, new pulse lengths are added to the end of the list. When there is
@@ -75,7 +77,6 @@
 //|           # Resume with an 80 microsecond active pulse
 //|           pulses.resume(80)"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_maxlen, ARG_idle_state };
     static const mp_arg_t allowed_args[] = {
@@ -100,7 +101,6 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg
 //|     def deinit(self) -> None:
 //|         """Deinitialises the PulseIn and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_deinit(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_pulseio_pulsein_deinit(self);
@@ -117,14 +117,12 @@ STATIC void check_for_deinit(pulseio_pulsein_obj_t *self) {
 //|     def __enter__(self) -> PulseIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_pulseio_pulsein_deinit(args[0]);
@@ -135,7 +133,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulsein___exit___obj, 4, 4, p
 //|     def pause(self) -> None:
 //|         """Pause pulse capture"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_pause(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -155,7 +152,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_pause_obj, pulseio_pulsein_obj_pause);
 //|
 //|         :param int trigger_duration: trigger pulse duration in microseconds"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_resume(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_trigger_duration };
     static const mp_arg_t allowed_args[] = {
@@ -175,7 +171,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pulseio_pulsein_resume_obj, 1, pulseio_pulsein_obj_re
 //|     def clear(self) -> None:
 //|         """Clears all captured pulses"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_clear(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -188,7 +183,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_clear_obj, pulseio_pulsein_obj_clear);
 //|     def popleft(self) -> int:
 //|         """Removes and returns the oldest read pulse."""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_popleft(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -200,7 +194,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_popleft_obj, pulseio_pulsein_obj_pople
 //|     maxlen: int
 //|     """The maximum length of the PulseIn. When len() is equal to maxlen,
 //|     it is unclear which pulses are active and which are idle."""
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_get_maxlen(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -215,7 +208,6 @@ MP_PROPERTY_GETTER(pulseio_pulsein_maxlen_obj,
 //|     paused: bool
 //|     """True when pulse capture is paused as a result of :py:func:`pause` or an error during capture
 //|     such as a signal that is too fast."""
-//|
 STATIC mp_obj_t pulseio_pulsein_obj_get_paused(mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -228,7 +220,6 @@ MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj,
     (mp_obj_t)&pulseio_pulsein_get_paused_obj);
 
 //|     def __bool__(self) -> bool: ...
-//|
 //|     def __len__(self) -> int:
 //|         """Returns the number of pulse durations currently stored.
 //|
@@ -237,7 +228,6 @@ MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj,
 //|           pulses = pulseio.PulseIn(pin)
 //|           print(len(pulses))"""
 //|         ...
-//|
 STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -260,7 +250,6 @@ STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|           pulses = pulseio.PulseIn(pin)
 //|           print(pulses[0])"""
 //|         ...
-//|
 STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     if (value == mp_const_none) {
         // delete item
diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c
index f812043e13..73bce9cd77 100644
--- a/shared-bindings/pulseio/PulseOut.c
+++ b/shared-bindings/pulseio/PulseOut.c
@@ -38,10 +38,12 @@
 
 //| class PulseOut:
 //|     """Pulse PWM "carrier" output on and off. This is commonly used in infrared remotes. The
-//|        pulsed signal consists of timed on and off periods. Unlike PWM, there is no set duration
-//|        for on and off pairs."""
+//|     pulsed signal consists of timed on and off periods. Unlike PWM, there is no set duration
+//|     for on and off pairs."""
 //|
-//|     def __init__(self, pin: microcontroller.Pin, *, frequency: int = 38000, duty_cycle: int = 1 << 15) -> None:
+//|     def __init__(
+//|         self, pin: microcontroller.Pin, *, frequency: int = 38000, duty_cycle: int = 1 << 15
+//|     ) -> None:
 //|         """Create a PulseOut object associated with the given pin.
 //|
 //|         :param ~microcontroller.Pin pin: Signal output pin
@@ -65,7 +67,6 @@
 //|           pulses[0] = 200
 //|           pulse.send(pulses)"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin, ARG_frequency, ARG_duty_cycle};
     static const mp_arg_t allowed_args[] = {
@@ -89,7 +90,6 @@ STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_ar
 //|     def deinit(self) -> None:
 //|         """Deinitialises the PulseOut and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulseout_deinit(mp_obj_t self_in) {
     pulseio_pulseout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_pulseio_pulseout_deinit(self);
@@ -100,14 +100,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulseout_deinit_obj, pulseio_pulseout_d
 //|     def __enter__(self) -> PulseOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulseout_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_pulseio_pulseout_deinit(args[0]);
@@ -125,7 +123,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4,
 //|
 //|         :param array.array pulses: pulse durations in microseconds"""
 //|         ...
-//|
 STATIC mp_obj_t pulseio_pulseout_obj_send(mp_obj_t self_in, mp_obj_t pulses) {
     pulseio_pulseout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_pulseio_pulseout_deinited(self)) {
diff --git a/shared-bindings/pulseio/__init__.c b/shared-bindings/pulseio/__init__.c
index 0dba6ffad6..c062cedd11 100644
--- a/shared-bindings/pulseio/__init__.c
+++ b/shared-bindings/pulseio/__init__.c
@@ -44,7 +44,6 @@
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info."""
-//|
 
 STATIC const mp_rom_map_elem_t pulseio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pulseio) },
diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c
index 4acb2a6a8a..e046388fde 100644
--- a/shared-bindings/pwmio/PWMOut.c
+++ b/shared-bindings/pwmio/PWMOut.c
@@ -71,7 +71,14 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) {
 //| class PWMOut:
 //|     """Output a Pulse Width Modulated signal on a given pin."""
 //|
-//|     def __init__(self, pin: microcontroller.Pin, *, duty_cycle: int = 0, frequency: int = 500, variable_frequency: bool = False) -> None:
+//|     def __init__(
+//|         self,
+//|         pin: microcontroller.Pin,
+//|         *,
+//|         duty_cycle: int = 0,
+//|         frequency: int = 500,
+//|         variable_frequency: bool = False
+//|     ) -> None:
 //|         """Create a PWM object associated with the given pin. This allows you to
 //|         write PWM signals out on the given pin. Frequency is fixed after init
 //|         unless ``variable_frequency`` is True.
@@ -129,7 +136,6 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) {
 //|           pwm.frequency = 880
 //|           time.sleep(0.1)"""
 //|         ...
-//|
 STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     enum { ARG_pin, ARG_duty_cycle, ARG_frequency, ARG_variable_frequency };
     static const mp_arg_t allowed_args[] = {
@@ -159,7 +165,6 @@ STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def deinit(self) -> None:
 //|         """Deinitialises the PWMOut and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t pwmio_pwmout_deinit(mp_obj_t self_in) {
     pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_pwmio_pwmout_deinit(self);
@@ -176,14 +181,12 @@ STATIC void check_for_deinit(pwmio_pwmout_obj_t *self) {
 //|     def __enter__(self) -> PWMOut:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t pwmio_pwmout_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_pwmio_pwmout_deinit(args[0]);
@@ -200,7 +203,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pwmio_pwmout___exit___obj, 4, 4, pwmi
 //|     representation for duty cycle might have less than 16 bits of resolution.
 //|     Reading this property will return the value from the internal representation,
 //|     so it may differ from the value set."""
-//|
 STATIC mp_obj_t pwmio_pwmout_obj_get_duty_cycle(mp_obj_t self_in) {
     pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -233,7 +235,6 @@ MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj,
 //|     changes. In these cases, the duty cycle is automatically recalculated
 //|     from the original duty cycle value. This should happen without any need
 //|     to manually re-set the duty cycle."""
-//|
 STATIC mp_obj_t pwmio_pwmout_obj_get_frequency(mp_obj_t self_in) {
     pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/pwmio/__init__.c b/shared-bindings/pwmio/__init__.c
index d56eb1eae8..6aeaf9c3c8 100644
--- a/shared-bindings/pwmio/__init__.c
+++ b/shared-bindings/pwmio/__init__.c
@@ -61,7 +61,6 @@
 //| For the essentials of `pwmio`, see the `CircuitPython Essentials
 //| Learn guide `_.
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t pwmio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pwmio) },
diff --git a/shared-bindings/qrio/PixelPolicy.c b/shared-bindings/qrio/PixelPolicy.c
index deb164d02d..545b868a8c 100644
--- a/shared-bindings/qrio/PixelPolicy.c
+++ b/shared-bindings/qrio/PixelPolicy.c
@@ -44,7 +44,6 @@
 //|
 //|     RGB565: PixelPolicy
 //|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in native order. The green component is used."""
-//|
 
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, EVERY_BYTE, QRIO_EVERY_BYTE);
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, RGB565, QRIO_RGB565);
diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c
index d2d4785ed8..2d366d1c53 100644
--- a/shared-bindings/qrio/QRDecoder.c
+++ b/shared-bindings/qrio/QRDecoder.c
@@ -33,7 +33,6 @@
 #include "py/enum.h"
 
 //| class QRDecoder:
-//|
 //|     def __init__(self, width: int, height: int) -> None:
 //|         """Construct a QRDecoder object
 //|
@@ -58,9 +57,10 @@ STATIC mp_obj_t qrio_qrdecoder_make_new(const mp_obj_type_t *type, size_t n_args
     return self;
 }
 
-//|     def decode(self, buffer: ReadableBuffer, pixel_policy: PixelPolicy = PixelPolicy.EVERY_BYTE) -> List[QRInfo]:
+//|     def decode(
+//|         self, buffer: ReadableBuffer, pixel_policy: PixelPolicy = PixelPolicy.EVERY_BYTE
+//|     ) -> List[QRInfo]:
 //|         """Decode zero or more QR codes from the given image.  The size of the buffer must be at least ``length``×``width`` bytes for `EVERY_BYTE`, and 2×``length``×``width`` bytes for `EVEN_BYTES` or `ODD_BYTES`."""
-//|
 STATIC mp_obj_t qrio_qrdecoder_decode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -92,7 +92,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(qrio_qrdecoder_decode_obj, 1, qrio_qrdecoder_decode);
 
 //|     width: int
 //|     """The width of image the decoder expects"""
-//|
 STATIC mp_obj_t qrio_qrdecoder_get_width(mp_obj_t self_in) {
     qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(shared_module_qrio_qrdecoder_get_width(self));
@@ -113,7 +112,6 @@ MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj,
 
 //|     height: int
 //|     """The height of image the decoder expects"""
-//|
 STATIC mp_obj_t qrio_qrdecoder_get_height(mp_obj_t self_in) {
     qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(shared_module_qrio_qrdecoder_get_height(self));
diff --git a/shared-bindings/qrio/__init__.c b/shared-bindings/qrio/__init__.c
index 04c86fd1ee..18c74b9a88 100644
--- a/shared-bindings/qrio/__init__.c
+++ b/shared-bindings/qrio/__init__.c
@@ -40,7 +40,6 @@
 //| .. note:: This module only handles decoding QR codes.  If you are looking
 //|     to generate a QR code, use the
 //|     `adafruit_miniqr library `_"""
-//|
 
 STATIC const mp_rom_map_elem_t qrio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_qrio) },
diff --git a/shared-bindings/rainbowio/__init__.c b/shared-bindings/rainbowio/__init__.c
index 0dfdcd3a45..ba2e95fcf4 100644
--- a/shared-bindings/rainbowio/__init__.c
+++ b/shared-bindings/rainbowio/__init__.c
@@ -35,7 +35,6 @@
 //|     """C implementation of the common colorwheel() function found in many examples.
 //|     Returns the colorwheel RGB value as an integer value for n (usable in neopixel and dotstar)."""
 //|     ...
-//|
 STATIC mp_obj_t rainbowio_colorwheel(mp_obj_t n) {
     mp_float_t f = mp_obj_get_float(n);
     return MP_OBJ_NEW_SMALL_INT(colorwheel(f));
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index eee574d29e..891791bb56 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -45,14 +45,13 @@
 //|   bytes from `os.urandom` directly for true randomness."""
 //|
 //| from typing import TypeVar
-//| _T = TypeVar('_T')
 //|
+//| _T = TypeVar("_T")
 
 //| def seed(seed: int) -> None:
 //|     """Sets the starting seed of the random  number generation. Further calls to
 //|     `random` will return deterministic results afterwards."""
 //|     ...
-//|
 STATIC mp_obj_t random_seed(mp_obj_t seed_in) {
     mp_uint_t seed = mp_obj_get_int_truncated(seed_in);
     shared_modules_random_seed(seed);
@@ -63,7 +62,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_seed_obj, random_seed);
 //| def getrandbits(k: int) -> int:
 //|     """Returns an integer with *k* random bits."""
 //|     ...
-//|
 STATIC mp_obj_t random_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
     if (n > 32 || n == 0) {
@@ -81,7 +79,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits);
 //| def randrange(start: int, stop: int, step: int) -> int:
 //|     """Returns a randomly selected integer from ``range(start[, stop[, step]])``."""
 //|     ...
-//|
 STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) {
     mp_int_t start = 0;
     mp_int_t stop = mp_obj_get_int(args[0]);
@@ -124,7 +121,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(random_randrange_obj, 1, 3, random_ra
 //|     """Returns a randomly selected integer between a and b inclusive. Equivalent
 //|     to ``randrange(a, b + 1, 1)``"""
 //|     ...
-//|
 STATIC mp_obj_t random_randint(mp_obj_t a_in, mp_obj_t b_in) {
     mp_int_t a = mp_obj_get_int(a_in);
     mp_int_t b = mp_obj_get_int(b_in);
@@ -139,7 +135,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(random_randint_obj, random_randint);
 //|     """Returns a randomly selected element from the given sequence. Raises
 //|     IndexError when the sequence is empty."""
 //|     ...
-//|
 STATIC mp_obj_t random_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len == 0) {
@@ -152,7 +147,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice);
 //| def random() -> float:
 //|     """Returns a random float between 0 and 1.0."""
 //|     ...
-//|
 STATIC mp_obj_t random_random(void) {
     return mp_obj_new_float(shared_modules_random_random());
 }
@@ -162,7 +156,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(random_random_obj, random_random);
 //|     """Returns a random float between a and b. It may or may not be inclusive
 //|     depending on float rounding."""
 //|     ...
-//|
 STATIC mp_obj_t random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
     mp_float_t a = mp_obj_get_float(a_in);
     mp_float_t b = mp_obj_get_float(b_in);
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index fc9f438766..d3a23be5b3 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -40,7 +40,6 @@
 
 //| class RGBMatrix:
 //|     """Displays an in-memory framebuffer to a HUB75-style RGB LED matrix."""
-//|
 
 extern Protomatter_core *_PM_protoPtr;
 
@@ -132,15 +131,22 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
     }
 }
 
-//|     def __init__(self, *, width: int, bit_depth: int,
-//|                  rgb_pins: Sequence[digitalio.DigitalInOut],
-//|                  addr_pins: Sequence[digitalio.DigitalInOut],
-//|                  clock_pin: digitalio.DigitalInOut,
-//|                  latch_pin: digitalio.DigitalInOut,
-//|                  output_enable_pin: digitalio.DigitalInOut,
-//|                  doublebuffer: bool = True,
-//|                  framebuffer: Optional[WriteableBuffer] = None,
-//|                  height: int = 0, tile: int = 1, serpentine: bool = True) -> None:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         width: int,
+//|         bit_depth: int,
+//|         rgb_pins: Sequence[digitalio.DigitalInOut],
+//|         addr_pins: Sequence[digitalio.DigitalInOut],
+//|         clock_pin: digitalio.DigitalInOut,
+//|         latch_pin: digitalio.DigitalInOut,
+//|         output_enable_pin: digitalio.DigitalInOut,
+//|         doublebuffer: bool = True,
+//|         framebuffer: Optional[WriteableBuffer] = None,
+//|         height: int = 0,
+//|         tile: int = 1,
+//|         serpentine: bool = True
+//|     ) -> None:
 //|         """Create a RGBMatrix object with the given attributes.  The height of
 //|         the display is determined by the number of rgb and address pins and the number of tiles:
 //|         ``len(rgb_pins) // 3 * 2 ** len(address_pins) * abs(tile)``.  With 6 RGB pins, 4
@@ -176,7 +182,6 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
 //|
 //|         A RGBMatrix is often used in conjunction with a
 //|         `framebufferio.FramebufferDisplay`."""
-//|
 
 STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_width, ARG_bit_depth, ARG_rgb_list, ARG_addr_list,
@@ -259,7 +264,6 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
 //|         rgbmatrix instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
-//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_deinit(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     common_hal_rgbmatrix_rgbmatrix_deinit(self);
@@ -277,7 +281,6 @@ static void check_for_deinit(rgbmatrix_rgbmatrix_obj_t *self) {
 //|     brightness: float
 //|     """In the current implementation, 0.0 turns the display off entirely
 //|     and any other value up to 1.0 turns the display on fully."""
-//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_brightness(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     check_for_deinit(self);
@@ -306,7 +309,6 @@ MP_PROPERTY_GETSET(rgbmatrix_rgbmatrix_brightness_obj,
 //|         """Transmits the color data in the buffer to the pixels so that
 //|         they are shown."""
 //|         ...
-//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_refresh(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     check_for_deinit(self);
@@ -317,7 +319,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_refresh_obj, rgbmatrix_rgbmatrix_r
 
 //|     width: int
 //|     """The width of the display, in pixels"""
-//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     check_for_deinit(self);
@@ -329,7 +330,6 @@ MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
-//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/shared-bindings/rgbmatrix/__init__.c b/shared-bindings/rgbmatrix/__init__.c
index a7da7089f5..1e9099adb6 100644
--- a/shared-bindings/rgbmatrix/__init__.c
+++ b/shared-bindings/rgbmatrix/__init__.c
@@ -32,7 +32,6 @@
 #include "shared-bindings/rgbmatrix/RGBMatrix.h"
 
 //| """Low-level routines for bitbanged LED matrices"""
-//|
 
 STATIC const mp_rom_map_elem_t rgbmatrix_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rgbmatrix) },
diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index fe1b0b171b..a103ddd4e3 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -37,7 +37,9 @@
 //| class IncrementalEncoder:
 //|     """IncrementalEncoder determines the relative rotational position based on two series of pulses."""
 //|
-//|     def __init__(self, pin_a: microcontroller.Pin, pin_b: microcontroller.Pin, divisor: int = 4) -> None:
+//|     def __init__(
+//|         self, pin_a: microcontroller.Pin, pin_b: microcontroller.Pin, divisor: int = 4
+//|     ) -> None:
 //|         """Create an IncrementalEncoder object associated with the given pins. It tracks the positional
 //|         state of an incremental rotary encoder (also known as a quadrature encoder.) Position is
 //|         relative to the position when the object is contructed.
@@ -60,7 +62,6 @@
 //|                   print(position)
 //|               last_position = position"""
 //|         ...
-//|
 STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pin_a, ARG_pin_b, ARG_divisor };
     static const mp_arg_t allowed_args[] = {
@@ -87,7 +88,6 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type,
 //|     def deinit(self) -> None:
 //|         """Deinitializes the IncrementalEncoder and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t rotaryio_incrementalencoder_deinit(mp_obj_t self_in) {
     rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_rotaryio_incrementalencoder_deinit(self);
@@ -104,14 +104,12 @@ STATIC void check_for_deinit(rotaryio_incrementalencoder_obj_t *self) {
 //|     def __enter__(self) -> IncrementalEncoder:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t rotaryio_incrementalencoder_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_rotaryio_incrementalencoder_deinit(args[0]);
@@ -124,7 +122,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rotaryio_incrementalencoder___exit___
 //|     """The divisor of the quadrature signal.  Use 1 for encoders without
 //|     detents, or encoders with 4 detents per cycle.  Use 2 for encoders with 2
 //|     detents per cycle.  Use 4 for encoders with 1 detent per cycle."""
-//|
 STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_divisor(mp_obj_t self_in) {
     rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -149,7 +146,6 @@ MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj,
 //|     position: int
 //|     """The current position in terms of pulses. The number of pulses per rotation is defined by the
 //|     specific hardware and by the divisor."""
-//|
 STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_position(mp_obj_t self_in) {
     rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/rotaryio/__init__.c b/shared-bindings/rotaryio/__init__.c
index fbfa9afaa2..e549ecc75e 100644
--- a/shared-bindings/rotaryio/__init__.c
+++ b/shared-bindings/rotaryio/__init__.c
@@ -46,7 +46,6 @@
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info."""
-//|
 
 STATIC const mp_rom_map_elem_t rotaryio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rotaryio) },
diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c
index 9e75576487..e4096c3460 100644
--- a/shared-bindings/rtc/RTC.c
+++ b/shared-bindings/rtc/RTC.c
@@ -44,7 +44,6 @@ const rtc_rtc_obj_t rtc_rtc_obj = {{&rtc_rtc_type}};
 //|     def __init__(self) -> None:
 //|         """This class represents the onboard Real Time Clock. It is a singleton and will always return the same instance."""
 //|         ...
-//|
 STATIC mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // No arguments
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
@@ -71,7 +70,6 @@ STATIC mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_
 //|       current_time = r.datetime
 //|       print(current_time)
 //|       # struct_time(tm_year=2019, tm_month=5, ...)"""
-//|
 STATIC mp_obj_t rtc_rtc_obj_get_datetime(mp_obj_t self_in) {
     timeutils_struct_time_t tm;
     common_hal_rtc_get_time(&tm);
@@ -102,7 +100,6 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj,
 //|
 //|       r = rtc.RTC()
 //|       r.calibration = 1"""
-//|
 STATIC mp_obj_t rtc_rtc_obj_get_calibration(mp_obj_t self_in) {
     int calibration = common_hal_rtc_get_calibration();
     return mp_obj_new_int(calibration);
diff --git a/shared-bindings/rtc/__init__.c b/shared-bindings/rtc/__init__.c
index 0220745c0f..3060ec386f 100644
--- a/shared-bindings/rtc/__init__.c
+++ b/shared-bindings/rtc/__init__.c
@@ -36,7 +36,6 @@
 //| The `rtc` module provides support for a Real Time Clock. You can access and manage the
 //| RTC using :class:`rtc.RTC`. It also backs the :func:`time.time` and :func:`time.localtime`
 //| functions using the onboard RTC if present."""
-//|
 
 void rtc_reset(void) {
     MP_STATE_VM(rtc_time_source) = (mp_obj_t)&rtc_rtc_obj;
@@ -66,7 +65,6 @@ mp_obj_t rtc_get_time_source_time(void) {
 //|       r = RTC()
 //|       rtc.set_time_source(r)"""
 //|     ...
-//|
 STATIC mp_obj_t rtc_set_time_source(mp_obj_t time_source) {
     MP_STATE_VM(rtc_time_source) = time_source;
 
diff --git a/shared-bindings/sdcardio/SDCard.c b/shared-bindings/sdcardio/SDCard.c
index 5afca798f6..f95a783136 100644
--- a/shared-bindings/sdcardio/SDCard.c
+++ b/shared-bindings/sdcardio/SDCard.c
@@ -44,7 +44,9 @@
 //|     `busio.SPI`, not `bitbangio.SPI`.  Usually an SDCard object is used
 //|     with ``storage.VfsFat`` to allow file I/O to an SD card."""
 //|
-//|     def __init__(self, bus: busio.SPI, cs: microcontroller.Pin, baudrate: int = 8000000) -> None:
+//|     def __init__(
+//|         self, bus: busio.SPI, cs: microcontroller.Pin, baudrate: int = 8000000
+//|     ) -> None:
 //|         """Construct an SPI SD Card object with the given properties
 //|
 //|         :param busio.SPI spi: The SPI bus
@@ -105,7 +107,6 @@ STATIC mp_obj_t sdcardio_sdcard_make_new(const mp_obj_type_t *type, size_t n_arg
 //|         Due to technical limitations, this is a function and not a property.
 //|
 //|         :return: The number of 512-byte blocks, as a number"""
-//|
 STATIC mp_obj_t sdcardio_sdcard_count(mp_obj_t self_in) {
     sdcardio_sdcard_obj_t *self = (sdcardio_sdcard_obj_t *)self_in;
     return mp_obj_new_int_from_ull(common_hal_sdcardio_sdcard_get_blockcount(self));
@@ -116,7 +117,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_count_obj, sdcardio_sdcard_count);
 //|         """Disable permanently.
 //|
 //|         :return: None"""
-//|
 STATIC mp_obj_t sdcardio_sdcard_deinit(mp_obj_t self_in) {
     sdcardio_sdcard_obj_t *self = (sdcardio_sdcard_obj_t *)self_in;
     common_hal_sdcardio_sdcard_deinit(self);
@@ -133,7 +133,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_deinit_obj, sdcardio_sdcard_deinit);
 //|         :param ~circuitpython_typing.WriteableBuffer buf: The buffer to write into.  Length must be multiple of 512.
 //|
 //|         :return: None"""
-//|
 
 STATIC mp_obj_t sdcardio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) {
     uint32_t start_block = mp_obj_get_int(start_block_in);
@@ -174,7 +173,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_sync_obj, sdcardio_sdcard_sync);
 //|         :param ~circuitpython_typing.ReadableBuffer buf: The buffer to read from.  Length must be multiple of 512.
 //|
 //|         :return: None"""
-//|
 
 STATIC mp_obj_t sdcardio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) {
     uint32_t start_block = mp_obj_get_int(start_block_in);
diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c
index d3929c9372..563d8f1dfd 100644
--- a/shared-bindings/sdioio/SDCard.c
+++ b/shared-bindings/sdioio/SDCard.c
@@ -49,7 +49,13 @@
 //|     25MHz.  Usually an SDCard object is used with ``storage.VfsFat``
 //|     to allow file I/O to an SD card."""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, command: microcontroller.Pin, data: Sequence[microcontroller.Pin], frequency: int) -> None:
+//|     def __init__(
+//|         self,
+//|         clock: microcontroller.Pin,
+//|         command: microcontroller.Pin,
+//|         data: Sequence[microcontroller.Pin],
+//|         frequency: int,
+//|     ) -> None:
 //|         """Construct an SDIO SD Card object with the given properties
 //|
 //|         :param ~microcontroller.Pin clock: the pin to use for the clock.
@@ -76,7 +82,6 @@
 //|             storage.mount(vfs, '/sd')
 //|             os.listdir('/sd')"""
 //|         ...
-//|
 
 STATIC mp_obj_t sdioio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     sdioio_sdcard_obj_t *self = m_new_obj(sdioio_sdcard_obj_t);
@@ -116,7 +121,6 @@ STATIC void check_for_deinit(sdioio_sdcard_obj_t *self) {
 //|         :param int width: the number of data lines to use.  Must be 1 or 4 and must also not exceed the number of data lines at construction
 //|
 //|         .. note:: Leaving a value unspecified or 0 means the current setting is kept"""
-//|
 STATIC mp_obj_t sdioio_sdcard_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_frequency, ARG_width, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -148,7 +152,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(sdioio_sdcard_configure_obj, 1, sdioio_sdcard_configu
 //|         Due to technical limitations, this is a function and not a property.
 //|
 //|         :return: The number of 512-byte blocks, as a number"""
-//|
 STATIC mp_obj_t sdioio_sdcard_count(mp_obj_t self_in) {
     sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -186,7 +189,6 @@ MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_readblocks_obj, sdioio_sdcard_readblocks
 //|         :param ~circuitpython_typing.ReadableBuffer buf: The buffer to read from.  Length must be multiple of 512.
 //|
 //|         :return: None"""
-//|
 STATIC mp_obj_t sdioio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) {
     uint32_t start_block = mp_obj_get_int(start_block_in);
     mp_buffer_info_t bufinfo;
@@ -204,7 +206,6 @@ MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_writeblocks_obj, sdioio_sdcard_writebloc
 //|     frequency: int
 //|     """The actual SDIO bus frequency. This may not match the frequency
 //|     requested due to internal limitations."""
-//|
 STATIC mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) {
     sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -215,9 +216,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_get_frequency_obj, sdioio_sdcard_obj_get
 MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj,
     (mp_obj_t)&sdioio_sdcard_get_frequency_obj);
 
-//|     width:int
+//|     width: int
 //|     """The actual SDIO bus width, in bits"""
-//|
 STATIC mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) {
     sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -243,13 +243,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_deinit_obj, sdioio_sdcard_obj_deinit);
 //|         """No-op used by Context Managers.
 //|         Provided by context manager helper."""
 //|         ...
-//|
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t sdioio_sdcard_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_sdioio_sdcard_deinit(args[0]);
diff --git a/shared-bindings/sharpdisplay/__init__.c b/shared-bindings/sharpdisplay/__init__.c
index a7e0bff77d..4726e6ea1c 100644
--- a/shared-bindings/sharpdisplay/__init__.c
+++ b/shared-bindings/sharpdisplay/__init__.c
@@ -36,7 +36,6 @@
 //| For more information about working with Sharp Memory Displays,
 //| see `this Learn guide `_.
 //| """
-//|
 STATIC const mp_rom_map_elem_t sharpdisplay_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sharpdisplay) },
     { MP_ROM_QSTR(MP_QSTR_SharpMemoryFramebuffer), MP_ROM_PTR(&sharpdisplay_framebuffer_type) },
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 716ff673ee..0d8ed79a41 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -40,29 +40,25 @@
 
 //| class Socket:
 //|     """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
-//|        `SocketPool.socket()`.
-//|
-//|        Provides a subset of CPython's `socket.socket` API. It only implements the versions of
-//|        recv that do not allocate bytes objects."""
+//|     `SocketPool.socket()`.
 //|
+//|     Provides a subset of CPython's `socket.socket` API. It only implements the versions of
+//|     recv that do not allocate bytes objects."""
 
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
 //|         ...
-//|
 // Provided by mp_generic_unary_op().
 
 //|     def __enter__(self) -> Socket:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically closes the Socket when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_socketpool_socket_close(args[0]);
@@ -74,7 +70,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket___exit___obj, 4, 4,
 //|         """Accept a connection on a listening socket of type SOCK_STREAM,
 //|         creating a new socket of type SOCK_STREAM.
 //|         Returns a tuple of (new_socket, remote_address)"""
-//|
 STATIC mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint8_t ip[4];
@@ -94,7 +89,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, _socketpool_socke
 //|
 //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -119,7 +113,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_bind_obj, socketpool_socket_b
 
 //|     def close(self) -> None:
 //|         """Closes this Socket and makes its resources available to its SocketPool."""
-//|
 STATIC mp_obj_t _socketpool_socket_close(mp_obj_t self_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_socketpool_socket_close(self);
@@ -132,7 +125,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, _socketpool_socket
 //|
 //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -157,7 +149,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_connect_obj, socketpool_socke
 //|
 //|         :param ~int backlog: length of backlog queue for waiting connections"""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -177,7 +168,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_listen_obj, socketpool_socket
 //|
 //|         :param object buffer: buffer to read into"""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t bufinfo;
@@ -207,7 +197,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool
 //|         :param bytearray buffer: buffer to receive into
 //|         :param int bufsize: optionally, a maximum number of bytes to read."""
 //|         ...
-//|
 STATIC mp_obj_t _socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (common_hal_socketpool_socket_get_closed(self)) {
@@ -246,7 +235,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3
 //|
 //|         :param ~bytes bytes: some bytes to send"""
 //|         ...
-//|
 STATIC mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_socketpool_socket_get_closed(self)) {
@@ -273,7 +261,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_
 //|         :param ~bytes bytes: some bytes to send
 //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -302,7 +289,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket
 //|
 //|         :param ~bool flag: False means non-blocking, True means block indefinitely."""
 //|         ...
-//|
 // method socket.setblocking(flag)
 STATIC mp_obj_t socketpool_socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -354,7 +340,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_setblocking_obj, socketpool_s
 //|
 //|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely."""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t timeout_ms;
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index a758511546..f23095ec34 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -81,7 +81,6 @@ STATIC mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t
 //|         in CPython are not supported.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socketpool_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_family, ARG_type };
     static const mp_arg_t allowed_args[] = {
@@ -100,14 +99,21 @@ STATIC mp_obj_t socketpool_socketpool_socket(size_t n_args, const mp_obj_t *pos_
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_socket_obj, 1, socketpool_socketpool_socket);
 
-//|     def getaddrinfo(self, host: str, port: int, family: int = 0, type: int = 0, proto: int = 0, flags: int = 0) -> Tuple[int, int, int, str, Tuple[str, int]]:
+//|     def getaddrinfo(
+//|         self,
+//|         host: str,
+//|         port: int,
+//|         family: int = 0,
+//|         type: int = 0,
+//|         proto: int = 0,
+//|         flags: int = 0,
+//|     ) -> Tuple[int, int, int, str, Tuple[str, int]]:
 //|         """Gets the address information for a hostname and port
 //|
 //|         Returns the appropriate family, socket type, socket protocol and
 //|         address information to call socket.socket() and socket.connect() with,
 //|         as a tuple."""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_host, ARG_port, ARG_family, ARG_type, ARG_proto, ARG_flags };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/socketpool/__init__.c b/shared-bindings/socketpool/__init__.c
index fee81f2820..48cc00245f 100644
--- a/shared-bindings/socketpool/__init__.c
+++ b/shared-bindings/socketpool/__init__.c
@@ -39,7 +39,6 @@
 //| For more information about the `socket` module, see the CPython documentation:
 //| https://docs.python.org/3/library/socket.html
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t socketpool_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socketpool) },
diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c
index 5dfa5e599f..bd9cc7a694 100644
--- a/shared-bindings/ssl/SSLContext.c
+++ b/shared-bindings/ssl/SSLContext.c
@@ -37,9 +37,8 @@
 
 //| class SSLContext:
 //|     """Settings related to SSL that can be applied to a socket by wrapping it.
-//|        This is useful to provide SSL certificates to specific connections
-//|        rather than all of them."""
-//|
+//|     This is useful to provide SSL certificates to specific connections
+//|     rather than all of them."""
 
 STATIC mp_obj_t ssl_sslcontext_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, 0, 1, false);
@@ -54,8 +53,7 @@ STATIC mp_obj_t ssl_sslcontext_make_new(const mp_obj_type_t *type, size_t n_args
 
 //|     def load_verify_locations(self, cadata: Optional[str] = None) -> None:
 //|         """Load a set of certification authority (CA) certificates used to validate
-//|            other peers' certificates."""
-//|
+//|         other peers' certificates."""
 
 STATIC mp_obj_t ssl_sslcontext_load_verify_locations(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_cadata };
@@ -76,7 +74,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_verify_locations_obj, 1, s
 
 //|     def set_default_verify_paths(self) -> None:
 //|         """Load a set of default certification authority (CA) certificates."""
-//|
 
 STATIC mp_obj_t ssl_sslcontext_set_default_verify_paths(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     ssl_sslcontext_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -88,7 +85,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_set_default_verify_paths_obj, 1
 
 //|     check_hostname: bool
 //|     """Whether to match the peer certificate's hostname."""
-//|
 
 STATIC mp_obj_t ssl_sslcontext_get_check_hostname(mp_obj_t self_in) {
     ssl_sslcontext_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -109,10 +105,15 @@ MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj,
     (mp_obj_t)&ssl_sslcontext_get_check_hostname_obj,
     (mp_obj_t)&ssl_sslcontext_set_check_hostname_obj);
 
-//|     def wrap_socket(self, sock: socketpool.Socket, *, server_side: bool = False, server_hostname: Optional[str] = None) -> ssl.SSLSocket:
+//|     def wrap_socket(
+//|         self,
+//|         sock: socketpool.Socket,
+//|         *,
+//|         server_side: bool = False,
+//|         server_hostname: Optional[str] = None
+//|     ) -> ssl.SSLSocket:
 //|         """Wraps the socket into a socket-compatible class that handles SSL negotiation.
-//|            The socket must be of type SOCK_STREAM."""
-//|
+//|         The socket must be of type SOCK_STREAM."""
 
 STATIC mp_obj_t ssl_sslcontext_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sock, ARG_server_side, ARG_server_hostname };
diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c
index 630ab28c68..be12aa59ab 100644
--- a/shared-bindings/ssl/SSLSocket.c
+++ b/shared-bindings/ssl/SSLSocket.c
@@ -39,29 +39,25 @@
 
 //| class SSLSocket:
 //|     """Implements TLS security on a subset of `socketpool.Socket` functions. Cannot be created
-//|        directly. Instead, call `wrap_socket` on an existing socket object.
-//|
-//|        Provides a subset of CPython's `ssl.SSLSocket` API. It only implements the versions of
-//|        recv that do not allocate bytes objects."""
+//|     directly. Instead, call `wrap_socket` on an existing socket object.
 //|
+//|     Provides a subset of CPython's `ssl.SSLSocket` API. It only implements the versions of
+//|     recv that do not allocate bytes objects."""
 
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
 //|         ...
-//|
 // Provided by mp_generic_unary_op().
 
 //|     def __enter__(self) -> SSLSocket:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically closes the Socket when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_ssl_sslsocket_close(args[0]);
@@ -73,7 +69,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket___exit___obj, 4, 4, ssl
 //|         """Accept a connection on a listening socket of type SOCK_STREAM,
 //|         creating a new socket of type SOCK_STREAM.
 //|         Returns a tuple of (new_socket, remote_address)"""
-//|
 STATIC mp_obj_t ssl_sslsocket_accept(mp_obj_t self_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint8_t ip[4];
@@ -93,7 +88,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_accept_obj, ssl_sslsocket_accept)
 //|
 //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -118,7 +112,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_bind_obj, ssl_sslsocket_bind);
 
 //|     def close(self) -> None:
 //|         """Closes this Socket"""
-//|
 STATIC mp_obj_t ssl_sslsocket_close(mp_obj_t self_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_ssl_sslsocket_close(self);
@@ -131,7 +124,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_close_obj, ssl_sslsocket_close);
 //|
 //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -156,7 +148,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_connect_obj, ssl_sslsocket_connec
 //|
 //|         :param ~int backlog: length of backlog queue for waiting connetions"""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -180,7 +171,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_listen_obj, ssl_sslsocket_listen)
 //|         :param bytearray buffer: buffer to receive into
 //|         :param int bufsize: optionally, a maximum number of bytes to read."""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_recv_into(size_t n_args, const mp_obj_t *args) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (common_hal_ssl_sslsocket_get_closed(self)) {
@@ -219,7 +209,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_recv_into_obj, 2, 3, ss
 //|
 //|         :param ~bytes bytes: some bytes to send"""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_ssl_sslsocket_get_closed(self)) {
@@ -252,7 +241,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_send_obj, ssl_sslsocket_send);
 //|
 //|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely."""
 //|         ...
-//|
 STATIC mp_obj_t ssl_sslsocket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t timeout_ms;
@@ -275,7 +263,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_set
 //|
 //|         :param ~bool flag: False means non-blocking, True means block indefinitely."""
 //|         ...
-//|
 // method socket.setblocking(flag)
 STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c
index 6967860054..141a845a56 100644
--- a/shared-bindings/ssl/__init__.c
+++ b/shared-bindings/ssl/__init__.c
@@ -36,12 +36,10 @@
 //|
 //| |see_cpython_module| :mod:`cpython:ssl`.
 //| """
-//|
 
 //| def create_default_context() -> ssl.SSLContext:
 //|     """Return the default SSLContext."""
 //|     ...
-//|
 
 STATIC mp_obj_t ssl_create_default_context(void) {
     ssl_sslcontext_obj_t *s = m_new_obj(ssl_sslcontext_obj_t);
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index b820eea34c..966d658308 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -57,7 +57,6 @@
 //|     :param bool readonly: True when the filesystem should be readonly to CircuitPython.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t storage_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_filesystem, ARG_mount_path, ARG_readonly };
     static const mp_arg_t allowed_args[] = {
@@ -94,7 +93,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_mount_obj, 0, storage_mount);
 //|
 //|     This is the CircuitPython analog to the UNIX ``umount`` command."""
 //|     ...
-//|
 STATIC mp_obj_t storage_umount(mp_obj_t mnt_in) {
     if (mp_obj_is_str(mnt_in)) {
         common_hal_storage_umount_path(mp_obj_str_get_str(mnt_in));
@@ -106,17 +104,21 @@ STATIC mp_obj_t storage_umount(mp_obj_t mnt_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(storage_umount_obj, storage_umount);
 
-//| def remount(mount_path: str, readonly: bool = False, *, disable_concurrent_write_protection: bool = False) -> None:
+//| def remount(
+//|     mount_path: str,
+//|     readonly: bool = False,
+//|     *,
+//|     disable_concurrent_write_protection: bool = False
+//| ) -> None:
 //|     """Remounts the given path with new parameters.
 //|
-//|       :param str mount_path: The path to remount.
-//|       :param bool readonly: True when the filesystem should be readonly to CircuitPython.
-//|       :param bool disable_concurrent_write_protection: When True, the check that makes sure the
-//|         underlying filesystem data is written by one computer is disabled. Disabling the protection
-//|         allows CircuitPython and a host to write to the same filesystem with the risk that the
-//|         filesystem will be corrupted."""
+//|     :param str mount_path: The path to remount.
+//|     :param bool readonly: True when the filesystem should be readonly to CircuitPython.
+//|     :param bool disable_concurrent_write_protection: When True, the check that makes sure the
+//|       underlying filesystem data is written by one computer is disabled. Disabling the protection
+//|       allows CircuitPython and a host to write to the same filesystem with the risk that the
+//|       filesystem will be corrupted."""
 //|     ...
-//|
 STATIC mp_obj_t storage_remount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mount_path, ARG_readonly, ARG_disable_concurrent_write_protection };
     static const mp_arg_t allowed_args[] = {
@@ -139,7 +141,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_remount_obj, 0, storage_remount);
 //| def getmount(mount_path: str) -> VfsFat:
 //|     """Retrieves the mount object associated with the mount path"""
 //|     ...
-//|
 STATIC mp_obj_t storage_getmount(const mp_obj_t mnt_in) {
     return common_hal_storage_getmount(mp_obj_str_get_str(mnt_in));
 }
@@ -158,7 +159,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 //|     .. warning:: All the data on ``CIRCUITPY`` will be lost, and
 //|          CircuitPython will restart on certain boards."""
 //|     ...
-//|
 
 STATIC mp_obj_t storage_erase_filesystem(void) {
     common_hal_storage_erase_filesystem();
@@ -171,7 +171,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_erase_filesystem_obj, storage_erase_filesystem
 //|     By default, the device is enabled and ``CIRCUITPY`` is visible.
 //|     Can be called in ``boot.py``, before USB is connected."""
 //|     ...
-//|
 STATIC mp_obj_t storage_disable_usb_drive(void) {
     #if CIRCUITPY_USB_MSC
     if (!common_hal_storage_disable_usb_drive()) {
@@ -196,7 +195,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_disable_usb_drive_obj, storage_disable_usb_dri
 //|     not enough endpoints are available.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t storage_enable_usb_drive(void) {
     #if CIRCUITPY_USB_MSC
     if (!common_hal_storage_enable_usb_drive()) {
@@ -225,7 +223,6 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|         """Create a new VfsFat filesystem around the given block device.
 //|
 //|         :param block_device: Block device the the filesystem lives on"""
-//|
 //|     label: str
 //|     """The filesystem label, up to 11 case-insensitive bytes.  Note that
 //|     this property can only be set when the device is writable by the
@@ -235,40 +232,33 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     def mkfs(self) -> None:
 //|         """Format the block device, deleting any data that may have been there"""
 //|         ...
-//|
 //|     def open(self, path: str, mode: str) -> None:
 //|         """Like builtin ``open()``"""
 //|         ...
-//|
-//|     def ilistdir(self, path: str) -> Iterator[Union[Tuple[AnyStr, int, int, int], Tuple[AnyStr, int, int]]]:
+//|     def ilistdir(
+//|         self, path: str
+//|     ) -> Iterator[Union[Tuple[AnyStr, int, int, int], Tuple[AnyStr, int, int]]]:
 //|         """Return an iterator whose values describe files and folders within
 //|         ``path``"""
 //|         ...
-//|
 //|     def mkdir(self, path: str) -> None:
 //|         """Like `os.mkdir`"""
 //|         ...
-//|
 //|     def rmdir(self, path: str) -> None:
 //|         """Like `os.rmdir`"""
 //|         ...
-//|
 //|     def stat(self, path: str) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.stat`"""
 //|         ...
-//|
 //|     def statvfs(self, path: int) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.statvfs`"""
 //|         ...
-//|
 //|     def mount(self, readonly: bool, mkfs: VfsFat) -> None:
 //|         """Don't call this directly, call `storage.mount`."""
 //|         ...
-//|
 //|     def umount(self) -> None:
 //|         """Don't call this directly, call `storage.umount`."""
 //|         ...
-//|
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
 };
 
diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c
index 5b63a15f15..1bc46cb9b0 100644
--- a/shared-bindings/struct/__init__.c
+++ b/shared-bindings/struct/__init__.c
@@ -46,13 +46,11 @@
 //|
 //| Supported format codes: *b*, *B*, *x*, *h*, *H*, *i*, *I*, *l*, *L*, *q*, *Q*,
 //| *s*, *P*, *f*, *d* (the latter 2 depending on the floating-point support)."""
-//|
 
 
 //| def calcsize(fmt: str) -> int:
 //|     """Return the number of bytes needed to store the given fmt."""
 //|     ...
-//|
 
 STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
 
@@ -64,7 +62,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize);
 //|     """Pack the values according to the format string fmt.
 //|     The return value is a bytes object encoding the values."""
 //|     ...
-//|
 
 STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
     mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
@@ -82,7 +79,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, str
 //|     """Pack the values according to the format string fmt into a buffer
 //|     starting at offset. offset may be negative to count from the end of buffer."""
 //|     ...
-//|
 
 STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -109,7 +105,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX
 //|     is a tuple of the unpacked values. The buffer size must match the size
 //|     required by the format."""
 //|     ...
-//|
 
 STATIC mp_obj_t struct_unpack(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -128,7 +123,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_obj, 2, 3, struct_unpack);
 //|     a tuple of the unpacked values. The buffer size must be at least as big
 //|     as the size required by the form."""
 //|     ...
-//|
 
 STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_format, ARG_buffer, ARG_offset };
diff --git a/shared-bindings/supervisor/RunReason.c b/shared-bindings/supervisor/RunReason.c
index a2a5fe13ef..9f8189e7b5 100644
--- a/shared-bindings/supervisor/RunReason.c
+++ b/shared-bindings/supervisor/RunReason.c
@@ -48,7 +48,6 @@ MAKE_ENUM_VALUE(supervisor_run_reason_type, run_reason, REPL_RELOAD, RUN_REASON_
 //|
 //|     REPL_RELOAD: object
 //|     """CircuitPython started due to the user typing CTRL-D in the REPL."""
-//|
 MAKE_ENUM_MAP(supervisor_run_reason) {
     MAKE_ENUM_MAP_ENTRY(run_reason, STARTUP),
     MAKE_ENUM_MAP_ENTRY(run_reason, AUTO_RELOAD),
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index bbfcb05b51..5356c3c3c7 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -51,17 +51,14 @@ STATIC supervisor_run_reason_t _run_reason;
 //|        import supervisor
 //|        if supervisor.runtime.serial_connected:
 //|            print("Hello World!")"""
-//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `supervisor.Runtime`.
 //|         Use `supervisor.runtime` to access the sole instance available."""
 //|         ...
-//|
 
 //|     usb_connected: bool
 //|     """Returns the USB enumeration status (read-only)."""
-//|
 STATIC mp_obj_t supervisor_runtime_get_usb_connected(mp_obj_t self) {
     #if CIRCUITPY_USB
     return mp_obj_new_bool(tud_ready());
@@ -76,7 +73,6 @@ MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj,
 
 //|     serial_connected: bool
 //|     """Returns the USB serial communication status (read-only)."""
-//|
 STATIC mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_supervisor_runtime_get_serial_connected());
 }
@@ -89,7 +85,6 @@ MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj,
 //|     """Returns the whether any bytes are available to read
 //|     on the USB serial input.  Allows for polling to see whether
 //|     to call the built-in input() or wait. (read-only)"""
-//|
 STATIC mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_supervisor_runtime_get_serial_bytes_available());
 }
@@ -108,7 +103,6 @@ void supervisor_set_run_reason(supervisor_run_reason_t run_reason) {
 
 //|     run_reason: RunReason
 //|     """Why CircuitPython started running this particular time."""
-//|
 STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) {
     return cp_enum_find(&supervisor_run_reason_type, _run_reason);
 }
@@ -119,7 +113,6 @@ MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj,
 
 //|     autoreload: bool
 //|     """Whether CircuitPython may autoreload based on workflow writes to the filesystem."""
-//|
 STATIC mp_obj_t supervisor_runtime_get_autoreload(mp_obj_t self) {
     return mp_obj_new_bool(autoreload_is_enabled());
 }
diff --git a/shared-bindings/supervisor/StatusBar.c b/shared-bindings/supervisor/StatusBar.c
index ad6bfb401c..0a1f871ab9 100644
--- a/shared-bindings/supervisor/StatusBar.c
+++ b/shared-bindings/supervisor/StatusBar.c
@@ -40,13 +40,11 @@
 //|
 //|        supervisor.status_bar.console = False
 //|     """
-//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `supervisor.StatusBar`.
 //|         Use `supervisor.status_bar` to access the sole instance available."""
 //|         ...
-//|
 
 //|     console: bool
 //|     """Whether status bar information is sent over the console (REPL) serial connection,
@@ -54,7 +52,6 @@
 //|     If set to ``False``, status bar will be cleared and then disabled.
 //|     May be set in ``boot.py`` or later. Persists across soft restarts.
 //|     """
-//|
 STATIC mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) {
     #if CIRCUITPY_STATUS_BAR
     supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -86,7 +83,6 @@ MP_PROPERTY_GETSET(supervisor_status_bar_console_obj,
 //|     May be set in ``boot.py`` or later.  Persists across soft restarts.
 //|     Not available if `terminalio` is not available.
 //|     """
-//|
 STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) {
     #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO
     supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 8f6a62153d..8e2d90a417 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -50,13 +50,11 @@
 #include "shared-bindings/supervisor/StatusBar.h"
 
 //| """Supervisor settings"""
-//|
 
 //| runtime: Runtime
 //| """Runtime information, such as ``runtime.serial_connected``
 //| (USB serial connection status).
 //| This object is the sole instance of `supervisor.Runtime`."""
-//|
 
 //| status_bar: StatusBar
 //| """The status bar, shown on an attached display, and also sent to
@@ -64,14 +62,12 @@
 //| The status bar reports the current IP or BLE connection, what file is running,
 //| the last exception name and location, and firmware version information.
 //| This object is the sole instance of `supervisor.StatusBar`."""
-//|
 
 //| def set_rgb_status_brightness(brightness: int) -> None:
 //|     """Set brightness of status RGB LED from 0-255. This will take effect
-//|        after the current code finishes and the status LED is used to show
-//|        the finish state."""
+//|     after the current code finishes and the status LED is used to show
+//|     the finish state."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_set_rgb_status_brightness(mp_obj_t lvl) {
     // This must be int. If cast to uint8_t first, will never raise a ValueError.
     int brightness_int = mp_obj_get_int(lvl);
@@ -84,7 +80,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_rgb_status_brightness_obj, supervisor_s
 //| def reload() -> None:
 //|     """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL)."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_reload(void) {
     reload_initiate(RUN_REASON_SUPERVISOR_RELOAD);
     return mp_const_none;
@@ -94,7 +89,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload);
 //| def set_next_stack_limit(size: int) -> None:
 //|     """Set the size of the stack for the next vm run. If its too large, the default will be used."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_set_next_stack_limit(mp_obj_t size_obj) {
     mp_int_t size = mp_obj_get_int(size_obj);
 
@@ -106,7 +100,15 @@ 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:
+//| 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',
@@ -138,7 +140,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_next_stack_limit_obj, supervisor_set_ne
 //|     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} },
@@ -254,7 +255,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_ticks_ms_obj, supervisor_ticks_ms);
 //|
 //|     Only code (main or boot) runs are considered, not REPL runs."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_get_previous_traceback(void) {
     if (prev_traceback_allocation) {
         size_t len = strlen((const char *)prev_traceback_allocation->ptr);
@@ -274,9 +274,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_get_previous_traceback_obj, supervisor_get_
 
 //| def disable_ble_workflow() -> None:
 //|     """Disable ble workflow until a reset. This prevents BLE advertising outside of the VM and
-//|        the services used for it."""
+//|     the services used for it."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_disable_ble_workflow(void) {
     #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
     mp_raise_NotImplementedError(NULL);
@@ -290,7 +289,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_disable_ble_workflow_obj, supervisor_disabl
 //| def reset_terminal(x_pixels: int, y_pixels: int) -> None:
 //|     """Reset the CircuitPython serial terminal with new dimensions."""
 //|     ...
-//|
 STATIC mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels) {
     #if CIRCUITPY_DISPLAYIO
     supervisor_stop_terminal();
@@ -302,7 +300,12 @@ STATIC mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels)
 }
 MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_terminal);
 
-//| def set_usb_identification(manufacturer: Optional[str] = None, product: Optional[str] = None, vid: int = -1, pid: int = -1) -> None:
+//| def set_usb_identification(
+//|     manufacturer: Optional[str] = None,
+//|     product: Optional[str] = None,
+//|     vid: int = -1,
+//|     pid: int = -1,
+//| ) -> None:
 //|     """Override identification constants in the USB Device Descriptor.
 //|
 //|     If passed, `manufacturer` and `product` must be ASCII strings (or buffers) of at most 126
@@ -313,7 +316,6 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin
 //|     Not available on boards without native USB support.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     #if CIRCUITPY_USB_IDENTIFICATION
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index e27ff903c6..d713336192 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -37,7 +37,9 @@
 //| class MidiTrack:
 //|     """Simple square-wave MIDI synth"""
 //|
-//|     def __init__(self, buffer: ReadableBuffer, tempo: int, *, sample_rate: int = 11025) -> None:
+//|     def __init__(
+//|         self, buffer: ReadableBuffer, tempo: int, *, sample_rate: int = 11025
+//|     ) -> None:
 //|         """Create a MidiTrack from the given stream of MIDI events. Only "Note On" and "Note Off" events
 //|         are supported; channel numbers and key velocities are ignored. Up to two notes may be on at the
 //|         same time.
@@ -62,7 +64,6 @@
 //|             pass
 //|           print("stopped")"""
 //|         ...
-//|
 STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer, ARG_tempo, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
@@ -90,7 +91,6 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
 //|     def deinit(self) -> None:
 //|         """Deinitialises the MidiTrack and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t synthio_miditrack_deinit(mp_obj_t self_in) {
     synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_synthio_miditrack_deinit(self);
@@ -107,14 +107,12 @@ STATIC void check_for_deinit(synthio_miditrack_obj_t *self) {
 //|     def __enter__(self) -> MidiTrack:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t synthio_miditrack_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_synthio_miditrack_deinit(args[0]);
@@ -124,7 +122,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_miditrack___exit___obj, 4, 4,
 
 //|     sample_rate: Optional[int]
 //|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
-//|
 STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) {
     synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 106a073535..763c5de777 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -60,7 +60,6 @@
 //|             pass
 //|           print("stopped")"""
 //|     ...
-//|
 STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_file, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 948741a4f0..7426b2b57d 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -40,27 +40,32 @@
 //| class Terminal:
 //|     """Display a character stream with a TileGrid
 //|
-//|        ASCII control:
-//|        * ``\\r`` - Move cursor to column 1
-//|        * ``\\n`` - Move cursor down a row
-//|        * ``\\b`` - Move cursor left one if possible
+//|     ASCII control:
+//|     * ``\\r`` - Move cursor to column 1
+//|     * ``\\n`` - Move cursor down a row
+//|     * ``\\b`` - Move cursor left one if possible
 //|
-//|        OSC control sequences:
-//|        * ``ESC ] 0;  ESC \\`` - Set title bar to 
-//|        * ``ESC ] ####;  ESC \\`` - Ignored
+//|     OSC control sequences:
+//|     * ``ESC ] 0;  ESC \\`` - Set title bar to 
+//|     * ``ESC ] ####;  ESC \\`` - Ignored
 //|
-//|        VT100 control sequences:
-//|        * ``ESC [ K`` - Clear the remainder of the line
-//|        * ``ESC [ #### D`` - Move the cursor to the left by ####
-//|        * ``ESC [ 2 J`` - Erase the entire display
-//|        * ``ESC [ nnnn ; mmmm H`` - Move the cursor to mmmm, nnnn.
+//|     VT100 control sequences:
+//|     * ``ESC [ K`` - Clear the remainder of the line
+//|     * ``ESC [ #### D`` - Move the cursor to the left by ####
+//|     * ``ESC [ 2 J`` - Erase the entire display
+//|     * ``ESC [ nnnn ; mmmm H`` - Move the cursor to mmmm, nnnn.
 //|     """
 //|
-//|     def __init__(self, scroll_area: displayio.TileGrid, font: fontio.BuiltinFont, *, status_bar: displayio.TileGrid = None) -> None:
+//|     def __init__(
+//|         self,
+//|         scroll_area: displayio.TileGrid,
+//|         font: fontio.BuiltinFont,
+//|         *,
+//|         status_bar: displayio.TileGrid = None
+//|     ) -> None:
 //|         """Terminal manages tile indices and cursor position based on VT100 commands. The font should be
 //|         a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap."""
 //|         ...
-//|
 
 STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_scroll_area, ARG_font, ARG_status_bar };
@@ -95,7 +100,6 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
 //|         :return: the number of bytes written
 //|         :rtype: int or None"""
 //|         ...
-//|
 STATIC mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const byte *buf = buf_in;
diff --git a/shared-bindings/terminalio/__init__.c b/shared-bindings/terminalio/__init__.c
index 5fd1a2751a..a5980a8b9b 100644
--- a/shared-bindings/terminalio/__init__.c
+++ b/shared-bindings/terminalio/__init__.c
@@ -47,7 +47,6 @@
 //|
 //| FONT: fontio.BuiltinFont
 //| """The built in font"""
-//|
 STATIC const mp_rom_map_elem_t terminalio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_terminalio) },
     { MP_ROM_QSTR(MP_QSTR_Terminal),   MP_OBJ_FROM_PTR(&terminalio_terminal_type) },
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 096c80d382..af3ac0f941 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -62,7 +62,6 @@
 //|     :return: the current monotonic time
 //|     :rtype: float"""
 //|     ...
-//|
 STATIC mp_obj_t time_monotonic(void) {
     uint64_t ticks_ms = common_hal_time_monotonic_ms();
     return mp_obj_new_float(uint64_to_float(ticks_ms) / 1000.0f);
@@ -74,7 +73,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_obj, time_monotonic);
 //|
 //|     :param float seconds: the time to sleep in fractional seconds"""
 //|     ...
-//|
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t seconds = mp_obj_get_float(seconds_o);
@@ -119,7 +117,6 @@ STATIC mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, s
 //|           * ``tm_yday``: the day of the year, range [1, 366], -1 indicates not known
 //|           * ``tm_isdst``: 1 when in daylight savings, 0 when not, -1 if unknown."""
 //|         ...
-//|
 const mp_obj_namedtuple_type_t struct_time_type_obj = {
     .base = {
         .base = {
@@ -218,7 +215,6 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //|     :return: the current time
 //|     :rtype: int"""
 //|     ...
-//|
 STATIC mp_obj_t time_time(void) {
     timeutils_struct_time_t tm;
     struct_time_to_tm(rtc_get_time_source_time(), &tm);
@@ -235,7 +231,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 //|     :return: the current time
 //|     :rtype: int"""
 //|     ...
-//|
 STATIC mp_obj_t time_monotonic_ns(void) {
     uint64_t time64 = common_hal_time_monotonic_ns();
     return mp_obj_new_int_from_ll((long long)time64);
@@ -251,7 +246,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_ns_obj, time_monotonic_ns);
 //|     :return: the current time
 //|     :rtype: time.struct_time"""
 //|     ...
-//|
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0 || args[0] == mp_const_none) {
         return rtc_get_time_source_time();
@@ -288,7 +282,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
 //|     :return: seconds
 //|     :rtype: int"""
 //|     ...
-//|
 STATIC mp_obj_t time_mktime(mp_obj_t t) {
     mp_obj_t *elem;
     size_t len;
diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 729cf94d5d..5b87d0a485 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -50,14 +50,12 @@
 //|        while True:
 //|            if touch.value:
 //|                print("touched!")"""
-//|
 
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Use the TouchIn on the given pin.
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from"""
 //|         ...
-//|
 STATIC mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check number of arguments
@@ -76,7 +74,6 @@ STATIC mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type,
 //|     def deinit(self) -> None:
 //|         """Deinitialises the TouchIn and releases any hardware resources for reuse."""
 //|         ...
-//|
 STATIC mp_obj_t touchio_touchin_deinit(mp_obj_t self_in) {
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_touchio_touchin_deinit(self);
@@ -93,14 +90,12 @@ STATIC void check_for_deinit(touchio_touchin_obj_t *self) {
 //|     def __enter__(self) -> TouchIn:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t touchio_touchin_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_touchio_touchin_deinit(args[0]);
@@ -112,7 +107,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(touchio_touchin___exit___obj, 4, 4, t
 //|     """Whether the touch pad is being touched or not. (read-only)
 //|
 //|     True when `raw_value` > `threshold`."""
-//|
 STATIC mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) {
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -126,7 +120,6 @@ MP_PROPERTY_GETTER(touchio_touchin_value_obj,
 
 //|     raw_value: int
 //|     """The raw touch measurement as an `int`. (read-only)"""
-//|
 STATIC mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) {
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -152,7 +145,6 @@ MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj,
 //|
 //|       touch = touchio.TouchIn(board.A1)
 //|       touch.threshold = 7300"""
-//|
 STATIC mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) {
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/touchio/__init__.c b/shared-bindings/touchio/__init__.c
index 2d6bf5f31c..8501315ca7 100644
--- a/shared-bindings/touchio/__init__.c
+++ b/shared-bindings/touchio/__init__.c
@@ -58,7 +58,6 @@
 //|
 //| This example will initialize the the device, and print the
 //| :py:data:`~touchio.TouchIn.value`."""
-//|
 
 STATIC const mp_rom_map_elem_t touchio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_touchio) },
diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index 880fe08e85..59e0ed1e97 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -37,7 +37,6 @@
 //| |see_cpython_module| :mod:`cpython:traceback`.
 //| """
 //| ...
-//|
 
 STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj_t tb_obj, mp_obj_t limit_obj) {
     if (!mp_obj_is_exception_instance(value)) {
@@ -64,8 +63,13 @@ STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj
     exc->traceback = trace_backup;
 }
 
-//| def format_exception(etype: Type[BaseException], value: BaseException, tb: TracebackType,
-//|                     limit: Optional[int] = None, chain: Optional[bool] = True) -> None:
+//| def format_exception(
+//|     etype: Type[BaseException],
+//|     value: BaseException,
+//|     tb: TracebackType,
+//|     limit: Optional[int] = None,
+//|     chain: Optional[bool] = True,
+//| ) -> None:
 //|     """Format a stack trace and the exception information.
 //|
 //|     The arguments have the same meaning as the corresponding arguments
@@ -85,7 +89,6 @@ STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj
 //|
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_chain };
     static const mp_arg_t allowed_args[] = {
@@ -108,8 +111,14 @@ STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_ar
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_format_exception);
 
-//| def print_exception(etype: Type[BaseException], value: BaseException, tb: TracebackType,
-//|                     limit: Optional[int] = None, file: Optional[io.FileIO] = None, chain: Optional[bool] = True) -> None:
+//| def print_exception(
+//|     etype: Type[BaseException],
+//|     value: BaseException,
+//|     tb: TracebackType,
+//|     limit: Optional[int] = None,
+//|     file: Optional[io.FileIO] = None,
+//|     chain: Optional[bool] = True,
+//| ) -> None:
 //|
 //|     """Prints exception information and stack trace entries.
 //|
@@ -126,7 +135,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f
 //|
 //|     """
 //|     ...
-//|
 
 STATIC mp_obj_t traceback_print_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c
index 40aa869225..a346379763 100644
--- a/shared-bindings/uheap/__init__.c
+++ b/shared-bindings/uheap/__init__.c
@@ -32,13 +32,11 @@
 #include "shared-bindings/uheap/__init__.h"
 
 //| """Heap size analysis"""
-//|
 
 //| def info(object: object) -> int:
 //|     """Prints memory debugging info for the given object and returns the
 //|     estimated size."""
 //|     ...
-//|
 STATIC mp_obj_t uheap_info(mp_obj_t obj) {
     uint32_t size = shared_module_uheap_info(obj);
 
diff --git a/shared-bindings/usb/__init__.c b/shared-bindings/usb/__init__.c
index bae72da1f7..443d5cf788 100644
--- a/shared-bindings/usb/__init__.c
+++ b/shared-bindings/usb/__init__.c
@@ -35,7 +35,6 @@
 //|
 //| The `usb` is a subset of PyUSB that allows you to communicate to USB devices.
 //| """
-//|
 
 STATIC mp_rom_map_elem_t usb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_OBJ_NEW_QSTR(MP_QSTR_usb) },
diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c
index bf4df6b88b..80a8c2a24d 100644
--- a/shared-bindings/usb/core/Device.c
+++ b/shared-bindings/usb/core/Device.c
@@ -62,17 +62,14 @@
 #include "py/runtime.h"
 
 //| class Device:
-//|
 //|     def __init__(self) -> None:
 //|         """User code cannot create Device objects. Instead, get them from
-//|            `usb.core.find`.
+//|         `usb.core.find`.
 //|         """
 //|         ...
-//|
 
 //|     idVendor: int
 //|     """The USB vendor ID of the device"""
-//|
 STATIC mp_obj_t usb_core_device_obj_get_idVendor(mp_obj_t self_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_core_device_get_idVendor(self));
@@ -84,7 +81,6 @@ MP_PROPERTY_GETTER(usb_core_device_idVendor_obj,
 
 //|     idProduct: int
 //|     """The USB product ID of the device"""
-//|
 STATIC mp_obj_t usb_core_device_obj_get_idProduct(mp_obj_t self_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_core_device_get_idProduct(self));
@@ -96,7 +92,6 @@ MP_PROPERTY_GETTER(usb_core_device_idProduct_obj,
 
 //|     serial_number: str
 //|     """The USB device's serial number string."""
-//|
 STATIC mp_obj_t usb_core_device_obj_get_serial_number(mp_obj_t self_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_usb_core_device_get_serial_number(self);
@@ -108,7 +103,6 @@ MP_PROPERTY_GETTER(usb_core_device_serial_number_obj,
 
 //|     product: str
 //|     """The USB device's product string."""
-//|
 STATIC mp_obj_t usb_core_device_obj_get_product(mp_obj_t self_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_usb_core_device_get_product(self);
@@ -120,7 +114,6 @@ MP_PROPERTY_GETTER(usb_core_device_product_obj,
 
 //|     manufacturer: str
 //|     """The USB device's manufacturer string."""
-//|
 STATIC mp_obj_t usb_core_device_obj_get_manufacturer(mp_obj_t self_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_usb_core_device_get_manufacturer(self);
@@ -130,16 +123,15 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_core_device_get_manufacturer_obj, usb_core_device_
 MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj,
     (mp_obj_t)&usb_core_device_get_manufacturer_obj);
 
-//|     def write(self, endpoint: int, data: ReadableBuffer, timeout:Optional[int] = None) -> int:
+//|     def write(self, endpoint: int, data: ReadableBuffer, timeout: Optional[int] = None) -> int:
 //|         """Write data to a specific endpoint on the device.
 //|
-//|            :param int endpoint: the bEndpointAddress you want to communicate with.
-//|            :param ReadableBuffer data: the data to send
-//|            :param int timeout: Time to wait specified in milliseconds. (Different from most CircuitPython!)
-//|            :returns: the number of bytes written
+//|         :param int endpoint: the bEndpointAddress you want to communicate with.
+//|         :param ReadableBuffer data: the data to send
+//|         :param int timeout: Time to wait specified in milliseconds. (Different from most CircuitPython!)
+//|         :returns: the number of bytes written
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_core_device_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_endpoint, ARG_data, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
@@ -159,13 +151,15 @@ STATIC mp_obj_t usb_core_device_write(size_t n_args, const mp_obj_t *pos_args, m
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_write_obj, 2, usb_core_device_write);
 
 
-//|     def read(self, endpoint: int, size_or_buffer: array.array, timeout:Optional[int] = None) -> int:
+//|     def read(
+//|         self, endpoint: int, size_or_buffer: array.array, timeout: Optional[int] = None
+//|     ) -> int:
 //|         """Read data from the endpoint.
 //|
-//|            :param int endpoint: the bEndpointAddress you want to communicate with.
-//|            :param array.array size_or_buffer: the array to read data into. PyUSB also allows size but CircuitPython only support array to force deliberate memory use.
-//|            :param int timeout: Time to wait specified in milliseconds. (Different from most CircuitPython!)
-//|            :returns: the number of bytes read
+//|         :param int endpoint: the bEndpointAddress you want to communicate with.
+//|         :param array.array size_or_buffer: the array to read data into. PyUSB also allows size but CircuitPython only support array to force deliberate memory use.
+//|         :param int timeout: Time to wait specified in milliseconds. (Different from most CircuitPython!)
+//|         :returns: the number of bytes read
 //|         """
 //|         ...
 STATIC mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -186,27 +180,33 @@ STATIC mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_read_obj, 2, usb_core_device_read);
 
-//|     def ctrl_transfer(self, bmRequestType:int, bRequest:int, wValue:int=0, wIndex:int=0,
-//|                       data_or_wLength: Optional[array.array] = None, timeout:Optional[int] = None) -> int:
+//|     def ctrl_transfer(
+//|         self,
+//|         bmRequestType: int,
+//|         bRequest: int,
+//|         wValue: int = 0,
+//|         wIndex: int = 0,
+//|         data_or_wLength: Optional[array.array] = None,
+//|         timeout: Optional[int] = None,
+//|     ) -> int:
 //|         """Do a control transfer on the endpoint 0. The parameters bmRequestType,
-//|            bRequest, wValue and wIndex are the same of the USB Standard Control
-//|            Request format.
+//|         bRequest, wValue and wIndex are the same of the USB Standard Control
+//|         Request format.
 //|
-//|            Control requests may or may not have a data payload to write/read.
-//|            In cases which it has, the direction bit of the bmRequestType
-//|            field is used to infer the desired request direction.
+//|         Control requests may or may not have a data payload to write/read.
+//|         In cases which it has, the direction bit of the bmRequestType
+//|         field is used to infer the desired request direction.
 //|
-//|            For host to device requests (OUT), data_or_wLength parameter is
-//|            the data payload to send, and it must be a sequence type convertible
-//|            to an array object. In this case, the return value is the number
-//|            of bytes written in the data payload.
+//|         For host to device requests (OUT), data_or_wLength parameter is
+//|         the data payload to send, and it must be a sequence type convertible
+//|         to an array object. In this case, the return value is the number
+//|         of bytes written in the data payload.
 //|
-//|            For device to host requests (IN), data_or_wLength is an array
-//|            object which the data will be read to, and the return value is the
-//|            number of bytes read.
-//|            """
+//|         For device to host requests (IN), data_or_wLength is an array
+//|         object which the data will be read to, and the return value is the
+//|         number of bytes read.
+//|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_core_device_ctrl_transfer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bmRequestType, ARG_bRequest, ARG_wValue, ARG_wIndex, ARG_data_or_wLength, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
@@ -240,12 +240,11 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_ctrl_transfer_obj, 2, usb_core_device
 
 //|     def is_kernel_driver_active(self, interface: int) -> bool:
 //|         """Determine if CircuitPython is using the interface. If it is, the
-//|            object will be unable to perform I/O.
+//|         object will be unable to perform I/O.
 //|
-//|            :param int interface: the device interface number to check
-//|             """
+//|         :param int interface: the device interface number to check
+//|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_core_device_is_kernel_driver_active(mp_obj_t self_in, mp_obj_t interface_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t interface = mp_obj_get_int(interface_in);
@@ -256,13 +255,12 @@ MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_is_kernel_driver_active_obj, usb_core_
 
 //|     def detach_kernel_driver(self, interface: int) -> None:
 //|         """Stop CircuitPython from using the interface. If successful, you
-//|            will then be able to perform I/O. CircuitPython will automatically
-//|            re-start using the interface on reload.
+//|         will then be able to perform I/O. CircuitPython will automatically
+//|         re-start using the interface on reload.
 //|
-//|            :param int interface: the device interface number to stop CircuitPython on
+//|         :param int interface: the device interface number to stop CircuitPython on
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_core_device_detach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t interface = mp_obj_get_int(interface_in);
@@ -274,10 +272,9 @@ MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_detach_kernel_driver_obj, usb_core_dev
 //|     def attach_kernel_driver(self, interface: int) -> None:
 //|         """Allow CircuitPython to use the interface if it wants to.
 //|
-//|            :param int interface: the device interface number to allow CircuitPython to use
+//|         :param int interface: the device interface number to allow CircuitPython to use
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_core_device_attach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t interface = mp_obj_get_int(interface_in);
diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c
index a5de83f784..eec0bd29aa 100644
--- a/shared-bindings/usb/core/__init__.c
+++ b/shared-bindings/usb/core/__init__.c
@@ -40,10 +40,10 @@
 //|
 //| This is a subset of the PyUSB core module.
 //| """
-//|
 
 //| class USBError(OSError):
 //|     """Catchall exception for USB related errors."""
+//|
 //|     ...
 MP_DEFINE_USB_CORE_EXCEPTION(USBError, OSError)
 NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...) {
@@ -56,21 +56,22 @@ NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...) {
 
 //| class USBTimeoutError(USBError):
 //|     """Raised when a USB transfer times out."""
-//|     ...
 //|
+//|     ...
 MP_DEFINE_USB_CORE_EXCEPTION(USBTimeoutError, usb_core_USBError)
 NORETURN void mp_raise_usb_core_USBTimeoutError(void) {
     mp_raise_type(&mp_type_usb_core_USBTimeoutError);
 }
 
 
-//| def find(find_all:bool=False, *, idVendor:Optional[int]=None, idProduct:Optional[int]=None) -> Device:
-//|    """Find the first device that matches the given requirements or, if
-//|       find_all is True, return a generator of all matching devices.
-//|
-//|       Returns None if no device matches.
-//|    """
+//| def find(
+//|     find_all: bool = False, *, idVendor: Optional[int] = None, idProduct: Optional[int] = None
+//| ) -> Device:
+//|     """Find the first device that matches the given requirements or, if
+//|     find_all is True, return a generator of all matching devices.
 //|
+//|     Returns None if no device matches.
+//|     """
 typedef struct {
     mp_obj_base_t base;
     mp_int_t vid;
diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c
index 47e91b5721..a01b535112 100644
--- a/shared-bindings/usb_cdc/Serial.c
+++ b/shared-bindings/usb_cdc/Serial.c
@@ -42,7 +42,6 @@
 //|         """You cannot create an instance of `usb_cdc.Serial`.
 //|         The available instances are in the ``usb_cdc.serials`` tuple."""
 //|         ...
-//|
 //|     def read(self, size: int = 1) -> bytes:
 //|         """Read at most ``size`` bytes. If ``size`` exceeds the internal buffer size
 //|         only the bytes in the buffer will be read. If `timeout` is > 0 or ``None``,
@@ -52,7 +51,6 @@
 //|         :return: Data read
 //|         :rtype: bytes"""
 //|         ...
-//|
 //|     def readinto(self, buf: WriteableBuffer) -> int:
 //|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes. If `timeout`
 //|         is > 0 or ``None``, keep waiting until the timeout expires or ``len(buf)``
@@ -61,7 +59,6 @@
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int"""
 //|         ...
-//|
 //|     def readline(self, size: int = -1) -> Optional[bytes]:
 //|         r"""Read a line ending in a newline character ("\\n"), including the newline.
 //|         Return everything readable if no newline is found and ``timeout`` is 0.
@@ -74,7 +71,6 @@
 //|         :return: the line read
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 //|     def readlines(self) -> List[Optional[bytes]]:
 //|         """Read multiple lines as a list, using `readline()`.
 //|
@@ -84,18 +80,15 @@
 //|         :return: a list of the line read
 //|         :rtype: list"""
 //|         ...
-//|
 //|     def write(self, buf: ReadableBuffer) -> int:
 //|         """Write as many bytes as possible from the buffer of bytes.
 //|
 //|         :return: the number of bytes written
 //|         :rtype: int"""
 //|         ...
-//|
 //|     def flush(self) -> None:
 //|         """Force out any unwritten bytes, waiting until they are written."""
 //|         ...
-//|
 
 // These three methods are used by the shared stream methods.
 STATIC mp_uint_t usb_cdc_serial_read_stream(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
@@ -151,7 +144,6 @@ STATIC mp_uint_t usb_cdc_serial_ioctl_stream(mp_obj_t self_in, mp_uint_t request
 //|       Most terminal programs and ``pyserial`` assert DTR when opening a serial connection.
 //|       However, the C# ``SerialPort`` API does not. You must set ``SerialPort.DtrEnable``.
 //|     """
-//|
 STATIC mp_obj_t usb_cdc_serial_get_connected(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_usb_cdc_serial_get_connected(self));
@@ -163,7 +155,6 @@ MP_PROPERTY_GETTER(usb_cdc_serial_connected_obj,
 
 //|     in_waiting: int
 //|     """Returns the number of bytes waiting to be read on the USB serial input. (read-only)"""
-//|
 STATIC mp_obj_t usb_cdc_serial_get_in_waiting(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_usb_cdc_serial_get_in_waiting(self));
@@ -175,7 +166,6 @@ MP_PROPERTY_GETTER(usb_cdc_serial_in_waiting_obj,
 
 //|     out_waiting: int
 //|     """Returns the number of bytes waiting to be written on the USB serial output. (read-only)"""
-//|
 STATIC mp_obj_t usb_cdc_serial_get_out_waiting(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_usb_cdc_serial_get_out_waiting(self));
@@ -188,7 +178,6 @@ MP_PROPERTY_GETTER(usb_cdc_serial_out_waiting_obj,
 //|     def reset_input_buffer(self) -> None:
 //|         """Clears any unread bytes."""
 //|         ...
-//|
 STATIC mp_obj_t usb_cdc_serial_reset_input_buffer(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_usb_cdc_serial_reset_input_buffer(self);
@@ -199,7 +188,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_reset_input_buffer_obj, usb_cdc_serial_
 //|     def reset_output_buffer(self) -> None:
 //|         """Clears any unwritten bytes."""
 //|         ...
-//|
 STATIC mp_obj_t usb_cdc_serial_reset_output_buffer(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_usb_cdc_serial_reset_output_buffer(self);
@@ -210,7 +198,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_reset_output_buffer_obj, usb_cdc_serial
 //|     timeout: Optional[float]
 //|     """The initial value of `timeout` is ``None``. If ``None``, wait indefinitely to satisfy
 //|     the conditions of a read operation. If 0, do not wait. If > 0, wait only ``timeout`` seconds."""
-//|
 STATIC mp_obj_t usb_cdc_serial_get_timeout(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_float_t timeout = common_hal_usb_cdc_serial_get_timeout(self);
@@ -234,7 +221,6 @@ MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj,
 //|     """The initial value of `write_timeout` is ``None``. If ``None``, wait indefinitely to finish
 //|     writing all the bytes passed to ``write()``.If 0, do not wait.
 //|     If > 0, wait only ``write_timeout`` seconds."""
-//|
 STATIC mp_obj_t usb_cdc_serial_get_write_timeout(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_float_t write_timeout = common_hal_usb_cdc_serial_get_write_timeout(self);
diff --git a/shared-bindings/usb_cdc/__init__.c b/shared-bindings/usb_cdc/__init__.c
index e23e289309..86f0788694 100644
--- a/shared-bindings/usb_cdc/__init__.c
+++ b/shared-bindings/usb_cdc/__init__.c
@@ -68,7 +68,6 @@
 //|     Can be called in ``boot.py``, before USB is connected.
 //|     Equivalent to ``usb_cdc.enable(console=False, data=False)``."""
 //|     ...
-//|
 STATIC mp_obj_t usb_cdc_disable(void) {
     if (!common_hal_usb_cdc_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -91,7 +90,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_cdc_disable_obj, usb_cdc_disable);
 //|     not enough endpoints are available.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t usb_cdc_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_console, ARG_data };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index a41a540f7e..94b378583d 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -32,7 +32,16 @@
 //| class Device:
 //|     """HID Device specification"""
 //|
-//|     def __init__(self, *, report_descriptor: ReadableBuffer, usage_page: int, usage: int, report_ids: Sequence[int], in_report_lengths: Sequence[int], out_report_lengths: Sequence[int]) -> None:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         report_descriptor: ReadableBuffer,
+//|         usage_page: int,
+//|         usage: int,
+//|         report_ids: Sequence[int],
+//|         in_report_lengths: Sequence[int],
+//|         out_report_lengths: Sequence[int]
+//|     ) -> None:
 //|         """Create a description of a USB HID device. The actual device is created when you
 //|         pass a `Device` to `usb_hid.enable()`.
 //|
@@ -66,7 +75,6 @@
 //|             )
 //|         """
 //|         ...
-//|
 //|     KEYBOARD: Device
 //|     """Standard keyboard device supporting keycodes 0x00-0xDD, modifiers 0xE-0xE7, and five LED indicators.
 //|     Uses Report ID 1 for its IN and OUT reports.
@@ -81,7 +89,6 @@
 //|     CONSUMER_CONTROL: Device
 //|     """Consumer Control device supporting sent values from 1-652, with no rollover.
 //|     Uses Report ID 3 for its IN report."""
-//|
 
 STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     usb_hid_device_obj_t *self = m_new_obj(usb_hid_device_obj_t);
@@ -163,7 +170,6 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
 //|         Otherwise you must specify which report id to use when sending the report.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -198,7 +204,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_send_report_obj, 1, usb_hid_device_sen
 //|         will return `None` until next report is received.
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_hid_device_get_last_received_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
@@ -222,7 +227,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_get_last_received_report_obj, 1, usb_h
 
 //|     usage_page: int
 //|     """The device usage page identifier, which designates a category of device. (read-only)"""
-//|
 STATIC mp_obj_t usb_hid_device_obj_get_usage_page(mp_obj_t self_in) {
     usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_device_get_usage_page(self));
@@ -237,7 +241,6 @@ MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj,
 //|
 //|     For example, Keyboard is 0x06 within the generic desktop usage page 0x01.
 //|     Mouse is 0x02 within the same usage page."""
-//|
 STATIC mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) {
     usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_device_get_usage(self));
diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c
index dcdf6933f7..23a15e6b8b 100644
--- a/shared-bindings/usb_hid/__init__.c
+++ b/shared-bindings/usb_hid/__init__.c
@@ -36,7 +36,6 @@
 //| """USB Human Interface Device
 //|
 //| The `usb_hid` module allows you to output data as a HID device."""
-//|
 
 //| devices: Tuple[Device, ...]
 //| """Tuple of all active HID device interfaces.
@@ -48,7 +47,6 @@
 //| containing a `Device` that describes the boot device chosen (keyboard or mouse).
 //| The request for a boot device overrides any other HID devices.
 //| """
-//|
 
 //| def disable() -> None:
 //|     """Do not present any USB HID devices to the host computer.
@@ -58,7 +56,6 @@
 //|     it is disabled by default. You must turn off another USB device such
 //|     as `usb_cdc` or `storage` to free up endpoints for use by `usb_hid`.
 //|     """
-//|
 STATIC mp_obj_t usb_hid_disable(void) {
     if (!common_hal_usb_hid_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -110,7 +107,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_hid_disable_obj, usb_hid_disable);
 //|     will enter safe mode to report this error.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t usb_hid_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_devices, ARG_boot_device };
     static const mp_arg_t allowed_args[] = {
@@ -154,7 +150,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_enable_obj, 1, usb_hid_enable);
 //|       if you are using those devices.
 //|     :rtype int:
 //|     """
-//|
 STATIC mp_obj_t usb_hid_get_boot_device(void) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_get_boot_device());
 }
diff --git a/shared-bindings/usb_host/Port.c b/shared-bindings/usb_host/Port.c
index 8f54246584..5fcc67381e 100644
--- a/shared-bindings/usb_host/Port.c
+++ b/shared-bindings/usb_host/Port.c
@@ -35,14 +35,13 @@
 //|
 //|     def __init__(self, dp: microcontroller.Pin, dm: microcontroller.Pin) -> None:
 //|         """Create a USB host port on the given pins. Access attached devices
-//|            through the `usb` module. Keep this object referenced while
-//|            interacting with devices, otherwise they will be disconnected.
+//|         through the `usb` module. Keep this object referenced while
+//|         interacting with devices, otherwise they will be disconnected.
 //|
-//|            :param ~microcontroller.Pin dp: The data plus pin
-//|            :param ~microcontroller.Pin dm: The data minus pin
+//|         :param ~microcontroller.Pin dp: The data plus pin
+//|         :param ~microcontroller.Pin dm: The data minus pin
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check number of arguments
@@ -61,7 +60,6 @@ STATIC mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type,
 //|     def deinit(self) -> None:
 //|         """Turn off the USB host port and release the pins for other use."""
 //|         ...
-//|
 STATIC mp_obj_t usb_host_port_obj_deinit(mp_obj_t self_in) {
     usb_host_port_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_usb_host_port_deinit(self);
@@ -72,14 +70,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_host_port_deinit_obj, usb_host_port_obj_deinit);
 //|     def __enter__(self) -> Port:
 //|         """No-op used by Context Managers."""
 //|         ...
-//|
 //  Provided by context manager helper.
 
 //|     def __exit__(self) -> None:
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
-//|
 STATIC mp_obj_t usb_host_port_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_usb_host_port_deinit(MP_OBJ_TO_PTR(args[0]));
diff --git a/shared-bindings/usb_host/__init__.c b/shared-bindings/usb_host/__init__.c
index c689a2521a..5c884b3ec2 100644
--- a/shared-bindings/usb_host/__init__.c
+++ b/shared-bindings/usb_host/__init__.c
@@ -36,7 +36,6 @@
 //| The `usb_host` module allows you to manage USB host ports. To communicate
 //| with devices use the `usb` module that is a subset of PyUSB's API.
 //| """
-//|
 
 STATIC mp_map_elem_t usb_host_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_OBJ_NEW_QSTR(MP_QSTR_usb_host) },
diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c
index 273fa77b35..ae01d6040f 100644
--- a/shared-bindings/usb_midi/PortIn.c
+++ b/shared-bindings/usb_midi/PortIn.c
@@ -44,7 +44,6 @@
 //|         PortIn objects are constructed for every corresponding entry in the USB
 //|         descriptor and added to the ``usb_midi.ports`` tuple."""
 //|         ...
-//|
 
 // These are standard stream methods. Code is in py/stream.c.
 //
@@ -57,7 +56,6 @@
 //|         :return: Data read
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 //|     def readinto(self, buf: WriteableBuffer, nbytes: Optional[int] = None) -> Optional[bytes]:
 //|         """Read bytes into the ``buf``.  If ``nbytes`` is specified then read at most
 //|         that many bytes.  Otherwise, read at most ``len(buf)`` bytes.
@@ -65,7 +63,6 @@
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: bytes or None"""
 //|         ...
-//|
 
 // These three methods are used by the shared stream methods.
 STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c
index d5652be5d4..447a2bcadb 100644
--- a/shared-bindings/usb_midi/PortOut.c
+++ b/shared-bindings/usb_midi/PortOut.c
@@ -43,7 +43,6 @@
 //|
 //|         PortOut objects are constructed for every corresponding entry in the USB
 //|         descriptor and added to the ``usb_midi.ports`` tuple."""
-//|
 
 // These are standard stream methods. Code is in py/stream.c.
 //
@@ -53,7 +52,6 @@
 //|         :return: the number of bytes written
 //|         :rtype: int or None"""
 //|         ...
-//|
 
 STATIC mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c
index d3d5cf2626..fa065f5ae7 100644
--- a/shared-bindings/usb_midi/__init__.c
+++ b/shared-bindings/usb_midi/__init__.c
@@ -42,7 +42,6 @@
 //|
 //| ports: Tuple[Union[PortIn, PortOut], ...]
 //| """Tuple of all MIDI ports. Each item is ether `PortIn` or `PortOut`."""
-//|
 
 //| def disable() -> None:
 //|     """Disable presenting a USB MIDI device to the host.
@@ -50,7 +49,6 @@
 //|     including ESP32-S2 and certain STM boards, it is disabled by default.
 //|     Can be called in ``boot.py``, before USB is connected."""
 //|     ...
-//|
 STATIC mp_obj_t usb_midi_disable(void) {
     if (!common_hal_usb_midi_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -70,7 +68,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_midi_disable_obj, usb_midi_disable);
 //|     not enough endpoints are available.
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t usb_midi_enable(void) {
     if (!common_hal_usb_midi_enable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c
index 17bdcbb1c0..2674116202 100644
--- a/shared-bindings/ustack/__init__.c
+++ b/shared-bindings/ustack/__init__.c
@@ -35,13 +35,11 @@
 
 
 //| """Stack information and analysis"""
-//|
 
 #if MICROPY_MAX_STACK_USAGE
 //| def max_stack_usage() -> int:
 //|     """Return the maximum excursion of the stack so far."""
 //|     ...
-//|
 STATIC mp_obj_t max_stack_usage(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_max_stack_usage());
 }
@@ -54,7 +52,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage);
 //|     Same as in micropython.mem_info(), but returns a value instead
 //|     of just printing it."""
 //|     ...
-//|
 STATIC mp_obj_t stack_size(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_size());
 }
@@ -64,7 +61,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(stack_size_obj, stack_size);
 //|     """Return how much stack is currently in use.
 //|     Same as micropython.stack_use(); duplicated here for convenience."""
 //|     ...
-//|
 STATIC mp_obj_t stack_usage(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_usage());
 }
diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index cce4f54e9d..1b2c59a3f6 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -11,16 +11,20 @@
 #include "supervisor/shared/translate/translate.h"
 
 //| class Circle:
-//|
-//|     def __init__(self, pixel_shader: Union[displayio.ColorConverter, displayio.Palette], radius: int, x: int, y: int) -> None:
+//|     def __init__(
+//|         self,
+//|         pixel_shader: Union[displayio.ColorConverter, displayio.Palette],
+//|         radius: int,
+//|         x: int,
+//|         y: int,
+//|     ) -> None:
 //|         """Circle is positioned on screen by its center point.
 //|
-//|            :param Union[~displayio.ColorConverter,~displayio.Palette] pixel_shader: The pixel shader that produces colors from values
-//|            :param int radius: The radius of the circle in pixels
-//|            :param int x: Initial x position of the axis.
-//|            :param int y: Initial y position of the axis.
-//|            :param int color_index: Initial color_index to use when selecting color from the palette."""
-//|
+//|         :param Union[~displayio.ColorConverter,~displayio.Palette] pixel_shader: The pixel shader that produces colors from values
+//|         :param int radius: The radius of the circle in pixels
+//|         :param int x: Initial x position of the axis.
+//|         :param int y: Initial y position of the axis.
+//|         :param int color_index: Initial color_index to use when selecting color from the palette."""
 static mp_obj_t vectorio_circle_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_radius, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
@@ -58,9 +62,8 @@ STATIC const vectorio_draw_protocol_t circle_draw_protocol = {
 };
 
 
-//|     radius : int
+//|     radius: int
 //|     """The radius of the circle in pixels."""
-//|
 STATIC mp_obj_t vectorio_circle_obj_get_radius(mp_obj_t self_in) {
     vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_circle_get_radius(self));
@@ -78,9 +81,8 @@ MP_PROPERTY_GETSET(vectorio_circle_radius_obj,
     (mp_obj_t)&vectorio_circle_get_radius_obj,
     (mp_obj_t)&vectorio_circle_set_radius_obj);
 
-//|     color_index : int
+//|     color_index: int
 //|     """The color_index of the circle as 0 based index of the palette."""
-//|
 STATIC mp_obj_t vectorio_circle_obj_get_color_index(mp_obj_t self_in) {
     vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_circle_get_color_index(self));
@@ -101,18 +103,17 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj,
 
 // Documentation for properties inherited from VectorShape.
 
-//|     x : int
+//|     x: int
 //|     """X position of the center point of the circle in the parent."""
 //|
-//|     y : int
+//|     y: int
 //|     """Y position of the center point of the circle in the parent."""
 //|
-//|     location : Tuple[int,int]
+//|     location: Tuple[int, int]
 //|     """(X,Y) position of the center point of the circle in the parent."""
 //|
-//|     pixel_shader : Union[displayio.ColorConverter,displayio.Palette]
+//|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the circle."""
-//|
 
 STATIC const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index 60a4582e5a..a80ad55b4b 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -17,7 +17,13 @@
 
 
 //| class Polygon:
-//|     def __init__(self, pixel_shader: Union[displayio.ColorConverter, displayio.Palette], points: List[Tuple[int, int]], x: int, y: int) -> None:
+//|     def __init__(
+//|         self,
+//|         pixel_shader: Union[displayio.ColorConverter, displayio.Palette],
+//|         points: List[Tuple[int, int]],
+//|         x: int,
+//|         y: int,
+//|     ) -> None:
 //|         """Represents a closed shape by ordered vertices. The path will be treated as
 //|         'closed', the last point will connect to the first point.
 //|
@@ -27,7 +33,6 @@
 //|         :param int x: Initial screen x position of the 0,0 origin in the points list.
 //|         :param int y: Initial screen y position of the 0,0 origin in the points list.
 //|         :param int color_index: Initial color_index to use when selecting color from the palette."""
-//|
 static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_points_list, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
@@ -67,7 +72,6 @@ STATIC const vectorio_draw_protocol_t polygon_draw_protocol = {
 
 //|     points: List[Tuple[int, int]]
 //|     """Vertices for the polygon."""
-//|
 STATIC mp_obj_t vectorio_polygon_obj_get_points(mp_obj_t self_in) {
     vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_vectorio_polygon_get_points(self);
@@ -86,9 +90,8 @@ MP_PROPERTY_GETSET(vectorio_polygon_points_obj,
     (mp_obj_t)&vectorio_polygon_get_points_obj,
     (mp_obj_t)&vectorio_polygon_set_points_obj);
 
-//|     color_index : int
+//|     color_index: int
 //|     """The color_index of the polygon as 0 based index of the palette."""
-//|
 STATIC mp_obj_t vectorio_polygon_obj_get_color_index(mp_obj_t self_in) {
     vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_polygon_get_color_index(self));
@@ -109,18 +112,17 @@ MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj,
 
 // Documentation for properties inherited from VectorShape.
 
-//|     x : int
+//|     x: int
 //|     """X position of the 0,0 origin in the points list."""
 //|
-//|     y : int
+//|     y: int
 //|     """Y position of the 0,0 origin in the points list."""
 //|
-//|     location : Tuple[int,int]
+//|     location: Tuple[int, int]
 //|     """(X,Y) position of the 0,0 origin in the points list."""
 //|
-//|     pixel_shader : Union[displayio.ColorConverter,displayio.Palette]
+//|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the polygon."""
-//|
 
 STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index 13c68161b3..0944cce7b9 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -10,16 +10,22 @@
 #include "supervisor/shared/translate/translate.h"
 
 //| class Rectangle:
-//|     def __init__(self, pixel_shader: Union[displayio.ColorConverter, displayio.Palette], width: int, height: int, x: int, y: int) -> None:
+//|     def __init__(
+//|         self,
+//|         pixel_shader: Union[displayio.ColorConverter, displayio.Palette],
+//|         width: int,
+//|         height: int,
+//|         x: int,
+//|         y: int,
+//|     ) -> None:
 //|         """Represents a rectangle by defining its bounds
 //|
-//|            :param Union[~displayio.ColorConverter,~displayio.Palette] pixel_shader: The pixel shader that produces colors from values
-//|            :param int width: The number of pixels wide
-//|            :param int height: The number of pixels high
-//|            :param int x: Initial x position of the top left corner.
-//|            :param int y: Initial y position of the top left corner.
-//|            :param int color_index: Initial color_index to use when selecting color from the palette."""
-//|
+//|         :param Union[~displayio.ColorConverter,~displayio.Palette] pixel_shader: The pixel shader that produces colors from values
+//|         :param int width: The number of pixels wide
+//|         :param int height: The number of pixels high
+//|         :param int x: Initial x position of the top left corner.
+//|         :param int y: Initial y position of the top left corner.
+//|         :param int color_index: Initial color_index to use when selecting color from the palette."""
 static mp_obj_t vectorio_rectangle_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_width, ARG_height, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
@@ -59,9 +65,8 @@ STATIC const vectorio_draw_protocol_t rectangle_draw_protocol = {
     .draw_protocol_impl = &vectorio_vector_shape_draw_protocol_impl
 };
 
-//|     width : int
+//|     width: int
 //|     """The width of the rectangle in pixels."""
-//|
 STATIC mp_obj_t vectorio_rectangle_obj_get_width(mp_obj_t self_in) {
     vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_rectangle_get_width(self));
@@ -82,9 +87,8 @@ const mp_obj_property_t vectorio_rectangle_width_obj = {
               MP_ROM_NONE},
 };
 
-//|     height : int
+//|     height: int
 //|     """The height of the rectangle in pixels."""
-//|
 STATIC mp_obj_t vectorio_rectangle_obj_get_height(mp_obj_t self_in) {
     vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_rectangle_get_height(self));
@@ -105,9 +109,8 @@ const mp_obj_property_t vectorio_rectangle_height_obj = {
               MP_ROM_NONE},
 };
 
-//|     color_index : int
+//|     color_index: int
 //|     """The color_index of the rectangle in 1 based index of the palette."""
-//|
 STATIC mp_obj_t vectorio_rectangle_obj_get_color_index(mp_obj_t self_in) {
     vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(common_hal_vectorio_rectangle_get_color_index(self));
@@ -130,18 +133,17 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = {
 
 // Documentation for properties inherited from VectorShape.
 
-//|     x : int
+//|     x: int
 //|     """X position of the top left corner of the rectangle in the parent."""
 //|
-//|     y : int
+//|     y: int
 //|     """Y position of the top left corner of the rectangle in the parent."""
 //|
-//|     location : Tuple[int,int]
+//|     location: Tuple[int, int]
 //|     """(X,Y) position of the top left corner of the rectangle in the parent."""
 //|
-//|     pixel_shader : Union[displayio.ColorConverter,displayio.Palette]
+//|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the rectangle."""
-//|
 
 STATIC const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/vectorio/__init__.c b/shared-bindings/vectorio/__init__.c
index 6e39f26591..7ad77da681 100644
--- a/shared-bindings/vectorio/__init__.c
+++ b/shared-bindings/vectorio/__init__.c
@@ -30,7 +30,6 @@
 //|     group.append(polygon)
 //|
 //| """
-//|
 
 STATIC const mp_rom_map_elem_t vectorio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_vectorio) },
diff --git a/shared-bindings/watchdog/WatchDogMode.c b/shared-bindings/watchdog/WatchDogMode.c
index beea4d0512..610a99340a 100644
--- a/shared-bindings/watchdog/WatchDogMode.c
+++ b/shared-bindings/watchdog/WatchDogMode.c
@@ -31,7 +31,6 @@
 //|
 //|     def __init__(self) -> None:
 //|         """Enum-like class to define the run mode of the watchdog timer."""
-//|
 //|     RAISE: WatchDogMode
 //|     """Raise an exception when the WatchDogTimer expires.
 //|
@@ -41,7 +40,6 @@
 //|     """Reset the system if the WatchDogTimer expires.
 //|
 //|     :type WatchDogMode:"""
-//|
 const mp_obj_type_t watchdog_watchdogmode_type;
 
 const watchdog_watchdogmode_obj_t watchdog_watchdogmode_raise_obj = {
diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c
index e00b288080..1c6fac1f80 100644
--- a/shared-bindings/watchdog/WatchDogTimer.c
+++ b/shared-bindings/watchdog/WatchDogTimer.c
@@ -42,23 +42,20 @@
 
 //| class WatchDogTimer:
 //|     """Timer that is used to detect code lock ups and automatically reset the microcontroller
-//|        when one is detected.
+//|     when one is detected.
 //|
-//|        A lock up is detected when the watchdog hasn't been fed after a given duration. So, make
-//|        sure to call `feed` within the timeout.
+//|     A lock up is detected when the watchdog hasn't been fed after a given duration. So, make
+//|     sure to call `feed` within the timeout.
 //|     """
-//|
 
 //|     def __init__(self) -> None:
 //|         """Not currently dynamically supported. Access the sole instance through `microcontroller.watchdog`."""
 //|         ...
-//|
 
 //|     def feed(self) -> None:
 //|         """Feed the watchdog timer. This must be called regularly, otherwise
 //|         the timer will expire."""
 //|         ...
-//|
 STATIC mp_obj_t watchdog_watchdogtimer_feed(mp_obj_t self_in) {
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     watchdog_watchdogmode_t current_mode = common_hal_watchdog_get_mode(self);
@@ -76,7 +73,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watch
 //|         """Stop the watchdog timer. This may raise an error if the watchdog
 //|         timer cannot be disabled on this platform."""
 //|         ...
-//|
 STATIC mp_obj_t watchdog_watchdogtimer_deinit(mp_obj_t self_in) {
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_watchdog_deinit(self);
@@ -87,7 +83,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_deinit_obj, watchdog_wat
 //|     timeout: float
 //|     """The maximum number of seconds that can elapse between calls
 //|     to feed()"""
-//|
 STATIC mp_obj_t watchdog_watchdogtimer_obj_get_timeout(mp_obj_t self_in) {
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_watchdog_get_timeout(self));
@@ -125,7 +120,6 @@ MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj,
 //|
 //|
 //|     Once set, the WatchDogTimer will perform the specified action if the timer expires."""
-//|
 STATIC mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) {
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return watchdog_watchdogmode_type_to_obj(common_hal_watchdog_get_mode(self));
diff --git a/shared-bindings/wifi/AuthMode.c b/shared-bindings/wifi/AuthMode.c
index 528fcd4143..6228144d80 100644
--- a/shared-bindings/wifi/AuthMode.c
+++ b/shared-bindings/wifi/AuthMode.c
@@ -59,7 +59,6 @@ MAKE_ENUM_VALUE(wifi_authmode_type, authmode, ENTERPRISE, AUTHMODE_ENTERPRISE);
 //|
 //|     ENTERPRISE: object
 //|     """Each user has a unique credential."""
-//|
 MAKE_ENUM_MAP(wifi_authmode) {
     MAKE_ENUM_MAP_ENTRY(authmode, OPEN),
     MAKE_ENUM_MAP_ENTRY(authmode, WEP),
diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c
index 235ec534aa..aef39c6d95 100644
--- a/shared-bindings/wifi/Monitor.c
+++ b/shared-bindings/wifi/Monitor.c
@@ -34,7 +34,6 @@
 
 //| class Monitor:
 //|     """For monitoring WiFi packets."""
-//|
 
 //| def __init__(self, channel: Optional[int] = 1, queue: Optional[int] = 128) -> None:
 //|     """Initialize `wifi.Monitor` singleton.
@@ -44,7 +43,6 @@
 //|
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_channel, ARG_queue };
     static const mp_arg_t allowed_args[] = {
@@ -71,7 +69,6 @@ STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args,
 
 //| channel: int
 //| """The WiFi channel to scan."""
-//|
 STATIC mp_obj_t wifi_monitor_obj_get_channel(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_channel(self_in);
 }
@@ -93,7 +90,6 @@ MP_PROPERTY_GETSET(wifi_monitor_channel_obj,
 
 //| queue: int
 //| """The queue size for buffering the packet."""
-//|
 STATIC mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_queue(self_in);
 }
@@ -105,7 +101,6 @@ MP_PROPERTY_GETTER(wifi_monitor_queue_obj,
 //| def deinit(self) -> None:
 //|     """De-initialize `wifi.Monitor` singleton."""
 //|     ...
-//|
 STATIC mp_obj_t wifi_monitor_obj_deinit(mp_obj_t self_in) {
     common_hal_wifi_monitor_deinit(self_in);
     return mp_const_none;
@@ -115,7 +110,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_deinit_obj, wifi_monitor_obj_deini
 //| def lost(self) -> int:
 //|     """Returns the packet loss count. The counter resets after each poll."""
 //|     ...
-//|
 STATIC mp_obj_t wifi_monitor_obj_get_lost(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_lost(self_in);
 }
@@ -124,7 +118,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost);
 //| def queued(self) -> int:
 //|     """Returns the packet queued count."""
 //|     ...
-//|
 STATIC mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {
         return mp_obj_new_int_from_uint(0);
@@ -136,7 +129,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_queued_obj, wifi_monitor_obj_get_queued);
 //| def packet(self) -> dict:
 //|     """Returns the monitor packet."""
 //|     ...
-//|
 STATIC mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {
         raise_deinited_error();
diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c
index 9a457b9499..0a10083a55 100644
--- a/shared-bindings/wifi/Network.c
+++ b/shared-bindings/wifi/Network.c
@@ -31,19 +31,14 @@
 #include "shared-bindings/wifi/Network.h"
 
 //| class Network:
-//|     """A wifi network provided by a nearby access point.
-//|
-//|     """
-//|
+//|     """A wifi network provided by a nearby access point."""
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `wifi.Network`. They are returned by `wifi.Radio.start_scanning_networks`."""
 //|         ...
-//|
 
 //|     ssid: str
 //|     """String id of the network"""
-//|
 STATIC mp_obj_t wifi_network_get_ssid(mp_obj_t self) {
     return common_hal_wifi_network_get_ssid(self);
 
@@ -56,7 +51,6 @@ MP_PROPERTY_GETTER(wifi_network_ssid_obj,
 
 //|     bssid: bytes
 //|     """BSSID of the network (usually the AP's MAC address)"""
-//|
 STATIC mp_obj_t wifi_network_get_bssid(mp_obj_t self) {
     return common_hal_wifi_network_get_bssid(self);
 
@@ -69,7 +63,6 @@ MP_PROPERTY_GETTER(wifi_network_bssid_obj,
 
 //|     rssi: int
 //|     """Signal strength of the network"""
-//|
 STATIC mp_obj_t wifi_network_get_rssi(mp_obj_t self) {
     return common_hal_wifi_network_get_rssi(self);
 
@@ -82,7 +75,6 @@ MP_PROPERTY_GETTER(wifi_network_rssi_obj,
 
 //|     channel: int
 //|     """Channel number the network is operating on"""
-//|
 STATIC mp_obj_t wifi_network_get_channel(mp_obj_t self) {
     return common_hal_wifi_network_get_channel(self);
 
@@ -94,7 +86,6 @@ MP_PROPERTY_GETTER(wifi_network_channel_obj,
 
 //|     country: str
 //|     """String id of the country code"""
-//|
 STATIC mp_obj_t wifi_network_get_country(mp_obj_t self) {
     return common_hal_wifi_network_get_country(self);
 
@@ -106,7 +97,6 @@ MP_PROPERTY_GETTER(wifi_network_country_obj,
 
 //|     authmode: str
 //|     """String id of the authmode"""
-//|
 STATIC mp_obj_t wifi_network_get_authmode(mp_obj_t self) {
     return common_hal_wifi_network_get_authmode(self);
 
diff --git a/shared-bindings/wifi/Packet.c b/shared-bindings/wifi/Packet.c
index d21c8b0639..e9dfb8558f 100644
--- a/shared-bindings/wifi/Packet.c
+++ b/shared-bindings/wifi/Packet.c
@@ -47,7 +47,6 @@ MAKE_ENUM_VALUE(wifi_packet_type, packet, RSSI, PACKET_RSSI);
 //|
 //|     RSSI: object
 //|     """The packet's rssi."""
-//|
 MAKE_ENUM_MAP(wifi_packet) {
     MAKE_ENUM_MAP_ENTRY(packet, CH),
     MAKE_ENUM_MAP_ENTRY(packet, LEN),
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index bcd998d806..f8c374cda7 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -38,23 +38,20 @@
 //| class Radio:
 //|     """Native wifi radio.
 //|
-//|        This class manages the station and access point functionality of the native
-//|        Wifi radio.
+//|     This class manages the station and access point functionality of the native
+//|     Wifi radio.
 //|
 //|     """
-//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `wifi.Radio`.
 //|         Use `wifi.radio` to access the sole instance available."""
 //|         ...
-//|
 
 //|     enabled: bool
 //|     """``True`` when the wifi radio is enabled.
 //|     If you set the value to ``False``, any open sockets will be closed.
 //|     """
-//|
 STATIC mp_obj_t wifi_radio_get_enabled(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_wifi_radio_get_enabled(self));
 }
@@ -76,7 +73,6 @@ MP_PROPERTY_GETSET(wifi_radio_enabled_obj,
 //|     hostname: Union[str | ReadableBuffer]
 //|     """Hostname for wifi interface. When the hostname is altered after interface started/connected
 //|        the changes would only be reflected once the interface restarts/reconnects."""
-//|
 STATIC mp_obj_t wifi_radio_get_hostname(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_wifi_radio_get_hostname(self);
@@ -112,7 +108,6 @@ MP_PROPERTY_GETSET(wifi_radio_hostname_obj,
 //|     mac_address: ReadableBuffer
 //|     """MAC address for the station. When the address is altered after interface is connected
 //|        the changes would only be reflected once the interface reconnects."""
-//|
 STATIC mp_obj_t wifi_radio_get_mac_address(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address(self));
@@ -140,7 +135,6 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_obj,
 
 //|     tx_power: float
 //|     """Wifi transmission power, in dBm."""
-//|
 STATIC mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_wifi_radio_get_tx_power(self));
@@ -162,7 +156,6 @@ MP_PROPERTY_GETSET(wifi_radio_tx_power_obj,
 //|     mac_address_ap: ReadableBuffer
 //|     """MAC address for the AP. When the address is altered after interface is started
 //|        the changes would only be reflected once the interface restarts."""
-//|
 STATIC mp_obj_t wifi_radio_get_mac_address_ap(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address_ap(self));
@@ -188,10 +181,11 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj,
     (mp_obj_t)&wifi_radio_get_mac_address_ap_obj,
     (mp_obj_t)&wifi_radio_set_mac_address_ap_obj);
 
-//|     def start_scanning_networks(self, *, start_channel: int = 1, stop_channel: int = 11) -> Iterable[Network]:
+//|     def start_scanning_networks(
+//|         self, *, start_channel: int = 1, stop_channel: int = 11
+//|     ) -> Iterable[Network]:
 //|         """Scans for available wifi networks over the given channel range. Make sure the channels are allowed in your country."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_start_scanning_networks(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -202,7 +196,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_scanning_networks_obj, wifi_ra
 //|     def stop_scanning_networks(self) -> None:
 //|         """Stop scanning for Wifi networks and free any resources used to do it."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_stop_scanning_networks(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -215,7 +208,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_rad
 //|     def start_station(self) -> None:
 //|         """Starts a Station."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_start_station(mp_obj_t self) {
     common_hal_wifi_radio_start_station(self);
     return mp_const_none;
@@ -225,34 +217,34 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_station_obj, wifi_radio_start_station
 //|     def stop_station(self) -> None:
 //|         """Stops the Station."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_stop_station(mp_obj_t self) {
     common_hal_wifi_radio_stop_station(self);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 
-//|     def start_ap(self,
-//|                  ssid: Union[str | ReadableBuffer],
-//|                  password: Union[str | ReadableBuffer] = "",
-//|                  *,
-//|                  channel: Optional[int] = 1,
-//|                  authmode: Optional[AuthMode],
-//|                  max_connections: Optional[int] = 4) -> None:
+//|     def start_ap(
+//|         self,
+//|         ssid: Union[str | ReadableBuffer],
+//|         password: Union[str | ReadableBuffer] = "",
+//|         *,
+//|         channel: Optional[int] = 1,
+//|         authmode: Optional[AuthMode],
+//|         max_connections: Optional[int] = 4
+//|     ) -> None:
 //|         """Starts an Access Point with the specified ssid and password.
 //|
-//|            If ``channel`` is given, the access point will use that channel unless
-//|            a station is already operating on a different channel.
+//|         If ``channel`` is given, the access point will use that channel unless
+//|         a station is already operating on a different channel.
 //|
-//|            If ``authmode`` is given, the access point will use that Authentication
-//|            mode. If a password is given, ``authmode`` must not be ``OPEN``.
-//|            If ``authmode`` isn't given, ``OPEN`` will be used when password isn't provided,
-//|            otherwise ``WPA_WPA2_PSK``.
+//|         If ``authmode`` is given, the access point will use that Authentication
+//|         mode. If a password is given, ``authmode`` must not be ``OPEN``.
+//|         If ``authmode`` isn't given, ``OPEN`` will be used when password isn't provided,
+//|         otherwise ``WPA_WPA2_PSK``.
 //|
-//|            If ``max_connections`` is given, the access point will allow up to
-//|            that number of stations to connect."""
+//|         If ``max_connections`` is given, the access point will allow up to
+//|         that number of stations to connect."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_password, ARG_channel, ARG_authmode, ARG_max_connections };
     static const mp_arg_t allowed_args[] = {
@@ -302,34 +294,34 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_a
 //|     def stop_ap(self) -> None:
 //|         """Stops the Access Point."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_stop_ap(mp_obj_t self) {
     common_hal_wifi_radio_stop_ap(self);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_ap_obj, wifi_radio_stop_ap);
 
-//|     def connect(self,
-//|                 ssid: Union[str | ReadableBuffer],
-//|                 password: Union[str | ReadableBuffer] = "",
-//|                 *,
-//|                 channel: Optional[int] = 0,
-//|                 bssid: Optional[Union[str | ReadableBuffer]] = "",
-//|                 timeout: Optional[float] = None) -> None:
+//|     def connect(
+//|         self,
+//|         ssid: Union[str | ReadableBuffer],
+//|         password: Union[str | ReadableBuffer] = "",
+//|         *,
+//|         channel: Optional[int] = 0,
+//|         bssid: Optional[Union[str | ReadableBuffer]] = "",
+//|         timeout: Optional[float] = None
+//|     ) -> None:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
-//|            automatically once one connection succeeds.
+//|         automatically once one connection succeeds.
 //|
-//|            By default, this will scan all channels and connect to the access point (AP) with the
-//|            given ``ssid`` and greatest signal strength (rssi).
+//|         By default, this will scan all channels and connect to the access point (AP) with the
+//|         given ``ssid`` and greatest signal strength (rssi).
 //|
-//|            If ``channel`` is given, the scan will begin with the given channel and connect to
-//|            the first AP with the given ``ssid``. This can speed up the connection time
-//|            significantly because a full scan doesn't occur.
+//|         If ``channel`` is given, the scan will begin with the given channel and connect to
+//|         the first AP with the given ``ssid``. This can speed up the connection time
+//|         significantly because a full scan doesn't occur.
 //|
-//|            If ``bssid`` is given, the scan will start at the first channel or the one given and
-//|            connect to the AP with the given ``bssid`` and ``ssid``."""
+//|         If ``bssid`` is given, the scan will start at the first channel or the one given and
+//|         connect to the AP with the given ``bssid`` and ``ssid``."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_password, ARG_channel, ARG_bssid, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
@@ -388,7 +380,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect)
 
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station gateway when connected to an access point. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_gateway(self);
 
@@ -400,7 +391,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj,
 
 //|     ipv4_gateway_ap: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the access point gateway, when enabled. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_gateway_ap(self);
 
@@ -412,7 +402,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj,
 
 //|     ipv4_subnet: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station subnet when connected to an access point. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_subnet(self);
 
@@ -424,7 +413,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj,
 
 //|     ipv4_subnet_ap: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the access point subnet, when enabled. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_subnet_ap(self);
 
@@ -434,9 +422,16 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4
 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj);
 
-//|     def set_ipv4_address(self, *, ipv4: ipaddress.IPv4Address, netmask: ipaddress.IPv4Address, gateway: ipaddress.IPv4Address, ipv4_dns: Optional[ipaddress.IPv4Address]) -> None:
+//|     def set_ipv4_address(
+//|         self,
+//|         *,
+//|         ipv4: ipaddress.IPv4Address,
+//|         netmask: ipaddress.IPv4Address,
+//|         gateway: ipaddress.IPv4Address,
+//|         ipv4_dns: Optional[ipaddress.IPv4Address]
+//|     ) -> None:
 //|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
-//|            Setting the address manually will stop the DHCP client."""
+//|         Setting the address manually will stop the DHCP client."""
 //|         ...
 STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
@@ -458,7 +453,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio
 
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station when connected to an access point. None otherwise."""
-//|
 STATIC mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_address(self);
 
@@ -470,7 +464,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj,
 
 //|     ipv4_address_ap: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the access point, when enabled. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_address_ap(self);
 
@@ -482,7 +475,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj,
 
 //|     ipv4_dns: ipaddress.IPv4Address
 //|     """IP v4 Address of the DNS server to be used."""
-//|
 STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_dns(self);
 
@@ -502,7 +494,6 @@ MP_PROPERTY_GETSET(wifi_radio_ipv4_dns_obj,
 
 //|     ap_info: Optional[Network]
 //|     """Network object containing BSSID, SSID, authmode, channel, country and RSSI when connected to an access point. None otherwise."""
-//|
 STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
     return common_hal_wifi_radio_get_ap_info(self);
 
@@ -512,7 +503,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info);
 //|     def start_dhcp(self) -> None:
 //|         """Starts the DHCP client."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) {
     common_hal_wifi_radio_start_dhcp_client(self);
     return mp_const_none;
@@ -522,7 +512,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhc
 //|     def stop_dhcp(self) -> None:
 //|         """Stops the DHCP client. Needed to assign a static IP address."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) {
     common_hal_wifi_radio_stop_dhcp_client(self);
     return mp_const_none;
@@ -532,11 +521,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_client_obj, wifi_radio_stop_dhcp_
 MP_PROPERTY_GETTER(wifi_radio_ap_info_obj,
     (mp_obj_t)&wifi_radio_get_ap_info_obj);
 
-//|     def ping(self, ip: ipaddress.IPv4Address, *, timeout: Optional[float] = 0.5) -> Optional[float]:
+//|     def ping(
+//|         self, ip: ipaddress.IPv4Address, *, timeout: Optional[float] = 0.5
+//|     ) -> Optional[float]:
 //|         """Ping an IP to test connectivity. Returns echo time in seconds.
-//|            Returns None when it times out."""
+//|         Returns None when it times out."""
 //|         ...
-//|
 STATIC mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ip, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c
index 0706d8f396..f6dc7830da 100644
--- a/shared-bindings/wifi/ScannedNetworks.c
+++ b/shared-bindings/wifi/ScannedNetworks.c
@@ -35,7 +35,6 @@
 //| class ScannedNetworks:
 //|     """Iterates over all `wifi.Network` objects found while scanning. This object is always created
 //|     by a `wifi.Radio`: it has no user-visible constructor."""
-//|
 STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &wifi_scannednetworks_type));
     wifi_scannednetworks_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -50,16 +49,13 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `wifi.Radio.start_scanning_networks`."""
 //|         ...
-//|
 //|     def __iter__(self) -> Iterator[Network]:
 //|         """Returns itself since it is the iterator."""
 //|         ...
-//|
 //|     def __next__(self) -> Network:
 //|         """Returns the next `wifi.Network`.
-//|            Raises `StopIteration` if scanning is finished and no other results are available."""
+//|         Raises `StopIteration` if scanning is finished and no other results are available."""
 //|         ...
-//|
 
 const mp_obj_type_t wifi_scannednetworks_type = {
     { &mp_type_type },
diff --git a/shared-bindings/wifi/__init__.c b/shared-bindings/wifi/__init__.c
index f5bfd3a362..f7b66c68ca 100644
--- a/shared-bindings/wifi/__init__.c
+++ b/shared-bindings/wifi/__init__.c
@@ -38,7 +38,6 @@
 //| radio: Radio
 //| """Wifi radio used to manage both station and AP modes.
 //| This object is the sole instance of `wifi.Radio`."""
-//|
 
 // Called when wifi is imported.
 STATIC mp_obj_t wifi___init__(void) {
diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c
index e3858d008d..137c5d7c11 100644
--- a/shared-bindings/zlib/__init__.c
+++ b/shared-bindings/zlib/__init__.c
@@ -46,9 +46,10 @@
 //| The `zlib` module allows limited functionality similar to the CPython zlib library.
 //| This module allows to decompress binary data compressed with DEFLATE algorithm
 //| (commonly used in zlib library and gzip archiver). Compression is not yet implemented."""
-//|
 
-//| def zlib_decompress(data: bytes, wbits: Optional[int] = 0, bufsize: Optional[int] = 0) -> bytes:
+//| def zlib_decompress(
+//|     data: bytes, wbits: Optional[int] = 0, bufsize: Optional[int] = 0
+//| ) -> bytes:
 //|     """Return decompressed *data* as bytes. *wbits* is DEFLATE dictionary window
 //|     size used during compression (8-15, the dictionary size is power of 2 of
 //|     that value). Additionally, if value is positive, *data* is assumed to be
@@ -69,7 +70,6 @@
 //|     :param int bufsize: ignored for compatibility with CPython only
 //|     """
 //|     ...
-//|
 STATIC mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) {
     bool is_zlib = true;
     if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) {

From 3a0d2375815c0a50ecd2eb28d15a772bfad48022 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 27 Sep 2022 11:54:35 -0500
Subject: [PATCH 1041/2403] Run black_bindings during pre-commit

---
 tools/codeformat.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index edefbc8ddc..9858330cd8 100644
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -214,8 +214,13 @@ def main():
             if os.path.splitext(file)[1].lower() in exts:
                 yield file
 
+    def bindings_files():
+        for file in lang_files(C_EXTS):
+            if file.startswith("shared-bindings/") or "/bindings/" in file:
+                yield file
+
     # Run tool on N files at a time (to avoid making the command line too long).
-    def batch(cmd, files, N=200):
+    def batch(cmd, files, N=200, check=False):
         while True:
             file_args = list(itertools.islice(files, N))
             if not file_args:
@@ -223,7 +228,10 @@ def main():
             if args.dry_run:
                 print(" ".join(cmd + file_args))
             else:
-                subprocess.call(cmd + file_args)
+                if check:
+                    subprocess.check_call(cmd + file_args)
+                else:
+                    subprocess.run(cmd + file_args)
 
     # Format C files with uncrustify.
     if format_c:
@@ -234,6 +242,10 @@ def main():
         batch(command, lang_files(C_EXTS))
         for file in lang_files(C_EXTS):
             fixup_c(file)
+        # Format bindings with black_bindings
+        if format_py:
+            command = ["python3", "tools/black_bindings.py"]
+            batch(command, bindings_files(), check=True)
 
     # Format Python files with black.
     if format_py:

From 77fcb8a5a3c7bb8163c4ed8f739410af268a237d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 22 Sep 2022 12:18:16 -0500
Subject: [PATCH 1042/2403] disable rainbowio on this arduino_nano_33_iot

The gpio changes took away enough code space that it doesn't fit.
---
 ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
index f289aad065..de9819a895 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@@ -11,3 +11,4 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+CIRCUITPY_RAINBOWIO = 0

From 9caa65cf28956344023b28a3c4e94f57419eb289 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 25 Aug 2022 13:59:52 -0500
Subject: [PATCH 1043/2403] allow a board to override link.ld

---
 ports/raspberrypi/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 67de654255..9f7d7dfc93 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -276,12 +276,13 @@ SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_M
 
 all: $(BUILD)/firmware.uf2
 
-$(BUILD)/firmware.elf: $(OBJ) link.ld
+LINK_LD := $(firstword $(wildcard boards/$(BOARD)/link.ld link.ld))
+$(BUILD)/firmware.elf: $(OBJ) $(LINK_LD)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)echo $(PICO_LDFLAGS) > $(BUILD)/firmware.ldflags
-	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,link.ld -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py link.ld
+	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,$(LINK_LD) -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LINK_LD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"

From 22b04aef22cadd5ba02f5f723588e07c780fbea8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 25 Aug 2022 14:04:47 -0500
Subject: [PATCH 1044/2403] Reindent a block

---
 ports/raspberrypi/Makefile | 97 +++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 9f7d7dfc93..09824f7c43 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -57,54 +57,55 @@ CROSS_COMPILE = arm-none-eabi-
 
 HAL_DIR=hal/$(MCU_SERIES)
 
-INC += -I. \
-       -I../.. \
-       -I../lib/mp-readline \
-       -I../shared/timeutils \
-       -Iboards/$(BOARD) \
-       -Iboards/ \
-       -isystem sdk/ \
-       -isystem sdk/src/common/pico_base/include/ \
-       -isystem sdk/src/common/pico_binary_info/include/ \
-       -isystem sdk/src/common/pico_stdlib/include/ \
-       -isystem sdk/src/common/pico_sync/include/ \
-       -isystem sdk/src/common/pico_time/include/ \
-       -isystem sdk/src/common/pico_util/include/ \
-       -isystem sdk/src/rp2040/hardware_regs/include/ \
-       -isystem sdk/src/rp2040/hardware_structs/include/ \
-       -isystem sdk/src/rp2_common/hardware_adc/include/ \
-       -isystem sdk/src/rp2_common/hardware_base/include/ \
-       -isystem sdk/src/rp2_common/hardware_claim/include/ \
-       -isystem sdk/src/rp2_common/hardware_clocks/include/ \
-       -isystem sdk/src/rp2_common/hardware_divider/include/ \
-       -isystem sdk/src/rp2_common/hardware_dma/include/ \
-       -isystem sdk/src/rp2_common/hardware_flash/include/ \
-       -isystem sdk/src/rp2_common/hardware_gpio/include/ \
-       -isystem sdk/src/rp2_common/hardware_irq/include/ \
-       -isystem sdk/src/rp2_common/hardware_i2c/include/ \
-       -isystem sdk/src/rp2_common/hardware_pio/include/ \
-       -isystem sdk/src/rp2_common/hardware_pll/include/ \
-       -isystem sdk/src/rp2_common/hardware_resets/include/ \
-       -isystem sdk/src/rp2_common/hardware_rtc/include/ \
-       -isystem sdk/src/rp2_common/hardware_spi/include/ \
-       -isystem sdk/src/rp2_common/hardware_sync/include/ \
-       -isystem sdk/src/rp2_common/hardware_timer/include/ \
-       -isystem sdk/src/rp2_common/hardware_uart/include/ \
-       -isystem sdk/src/rp2_common/hardware_watchdog/include/ \
-       -isystem sdk/src/rp2_common/hardware_xosc/include/ \
-       -isystem sdk/src/rp2_common/pico_multicore/include/ \
-       -isystem sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include/ \
-       -isystem sdk/src/rp2_common/pico_stdio/include/ \
-       -isystem sdk/src/rp2_common/pico_printf/include/ \
-       -isystem sdk/src/rp2_common/pico_float/include/ \
-       -isystem sdk/src/rp2_common/pico_platform/include/ \
-       -isystem sdk/src/rp2_common/pico_runtime/printf/include/ \
-       -isystem sdk/src/rp2_common/pico_bootrom/include/ \
-       -isystem sdk/src/rp2_common/pico_unique_id/include/ \
-       -Isdk_config \
-       -I../../lib/tinyusb/src \
-       -I../../supervisor/shared/usb \
-       -I$(BUILD)
+INC += \
+	-I. \
+        -I../.. \
+        -I../lib/mp-readline \
+        -I../shared/timeutils \
+        -Iboards/$(BOARD) \
+        -Iboards/ \
+        -isystem sdk/ \
+        -isystem sdk/src/common/pico_base/include/ \
+        -isystem sdk/src/common/pico_binary_info/include/ \
+        -isystem sdk/src/common/pico_stdlib/include/ \
+        -isystem sdk/src/common/pico_sync/include/ \
+        -isystem sdk/src/common/pico_time/include/ \
+        -isystem sdk/src/common/pico_util/include/ \
+        -isystem sdk/src/rp2040/hardware_regs/include/ \
+        -isystem sdk/src/rp2040/hardware_structs/include/ \
+        -isystem sdk/src/rp2_common/hardware_adc/include/ \
+        -isystem sdk/src/rp2_common/hardware_base/include/ \
+        -isystem sdk/src/rp2_common/hardware_claim/include/ \
+        -isystem sdk/src/rp2_common/hardware_clocks/include/ \
+        -isystem sdk/src/rp2_common/hardware_divider/include/ \
+        -isystem sdk/src/rp2_common/hardware_dma/include/ \
+        -isystem sdk/src/rp2_common/hardware_flash/include/ \
+        -isystem sdk/src/rp2_common/hardware_gpio/include/ \
+        -isystem sdk/src/rp2_common/hardware_irq/include/ \
+        -isystem sdk/src/rp2_common/hardware_i2c/include/ \
+        -isystem sdk/src/rp2_common/hardware_pio/include/ \
+        -isystem sdk/src/rp2_common/hardware_pll/include/ \
+        -isystem sdk/src/rp2_common/hardware_resets/include/ \
+        -isystem sdk/src/rp2_common/hardware_rtc/include/ \
+        -isystem sdk/src/rp2_common/hardware_spi/include/ \
+        -isystem sdk/src/rp2_common/hardware_sync/include/ \
+        -isystem sdk/src/rp2_common/hardware_timer/include/ \
+        -isystem sdk/src/rp2_common/hardware_uart/include/ \
+        -isystem sdk/src/rp2_common/hardware_watchdog/include/ \
+        -isystem sdk/src/rp2_common/hardware_xosc/include/ \
+        -isystem sdk/src/rp2_common/pico_multicore/include/ \
+        -isystem sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include/ \
+        -isystem sdk/src/rp2_common/pico_stdio/include/ \
+        -isystem sdk/src/rp2_common/pico_printf/include/ \
+        -isystem sdk/src/rp2_common/pico_float/include/ \
+        -isystem sdk/src/rp2_common/pico_platform/include/ \
+        -isystem sdk/src/rp2_common/pico_runtime/printf/include/ \
+        -isystem sdk/src/rp2_common/pico_bootrom/include/ \
+        -isystem sdk/src/rp2_common/pico_unique_id/include/ \
+        -Isdk_config \
+        -I../../lib/tinyusb/src \
+        -I../../supervisor/shared/usb \
+        -I$(BUILD)
 
 # Pico specific configuration
 CFLAGS += -DRASPBERRYPI -DPICO_ON_DEVICE=1 -DPICO_NO_BINARY_INFO=0 -DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=0 -DPICO_DIVIDER_CALL_IDIV0=0 -DPICO_DIVIDER_CALL_LDIV0=0 -DPICO_DIVIDER_HARDWARE=1 -DPICO_DOUBLE_ROM=1 -DPICO_FLOAT_ROM=1 -DPICO_MULTICORE=1 -DPICO_BITS_IN_RAM=0 -DPICO_DIVIDER_IN_RAM=0 -DPICO_DOUBLE_PROPAGATE_NANS=0 -DPICO_DOUBLE_IN_RAM=0 -DPICO_MEM_IN_RAM=0 -DPICO_FLOAT_IN_RAM=0 -DPICO_FLOAT_PROPAGATE_NANS=1 -DPICO_NO_FLASH=0 -DPICO_COPY_TO_RAM=0 -DPICO_DISABLE_SHARED_IRQ_HANDLERS=0 -DPICO_NO_BI_BOOTSEL_VIA_DOUBLE_RESET=0

From 346fff2e7cdaa985f64fd1e7848ed05fbc24a884 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 25 Aug 2022 14:01:14 -0500
Subject: [PATCH 1045/2403] cyw43 basic gpio support, hwaddr in boot_out

---
 locale/circuitpython.pot                      |   7 +-
 main.c                                        |   1 +
 .../common-hal/digitalio/DigitalInOut.c       |   6 +-
 .../common-hal/digitalio/DigitalInOut.c       |   6 +-
 .../cxd56/common-hal/digitalio/DigitalInOut.c |   6 +-
 .../common-hal/digitalio/DigitalInOut.c       |   6 +-
 .../litex/common-hal/digitalio/DigitalInOut.c |   6 +-
 .../common-hal/digitalio/DigitalInOut.c       |   6 +-
 ports/nrf/common-hal/digitalio/DigitalInOut.c |   6 +-
 ports/raspberrypi/Makefile                    |  74 ++++-
 ports/raspberrypi/bindings/cyw43/__init__.c   |  70 +++++
 ports/raspberrypi/bindings/cyw43/__init__.h   |  34 ++
 .../boards/raspberry_pi_pico_w/board.c        |  40 +++
 .../boards/raspberry_pi_pico_w/link.ld        | 293 ++++++++++++++++++
 .../raspberry_pi_pico_w/mpconfigboard.h       |   5 +
 .../raspberry_pi_pico_w/mpconfigboard.mk      |  20 ++
 .../pico-sdk-configboard.h                    |   1 +
 .../boards/raspberry_pi_pico_w/pins.c         |  54 ++++
 .../common-hal/digitalio/DigitalInOut.c       |  58 +++-
 .../common-hal/microcontroller/Pin.c          |  36 +++
 .../common-hal/microcontroller/Pin.h          |   3 +
 .../common-hal/microcontroller/__init__.c     |   5 +
 ports/raspberrypi/peripherals/pins.c          |  11 +
 ports/raspberrypi/peripherals/pins.h          |   6 +
 ports/raspberrypi/supervisor/port.c           |  39 +++
 ports/stm/common-hal/digitalio/DigitalInOut.c |   6 +-
 py/circuitpy_defns.mk                         |   3 +
 py/circuitpy_mpconfig.h                       |   9 +
 py/circuitpy_mpconfig.mk                      |   3 +
 shared-bindings/digitalio/DigitalInOut.c      |  35 ++-
 shared-bindings/digitalio/DigitalInOut.h      |  12 +-
 shared-bindings/microcontroller/Pin.c         |   4 +-
 shared-bindings/microcontroller/Pin.h         |   2 +
 supervisor/port.h                             |   4 +
 supervisor/shared/port.c                      |   3 +
 35 files changed, 848 insertions(+), 32 deletions(-)
 create mode 100644 ports/raspberrypi/bindings/cyw43/__init__.c
 create mode 100644 ports/raspberrypi/bindings/cyw43/__init__.h
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 52f1bdb5ad..01db150b3f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -95,6 +95,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr ""
@@ -916,6 +917,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1177,7 +1182,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
diff --git a/main.c b/main.c
index 04e8777b9a..d8542bcb57 100644
--- a/main.c
+++ b/main.c
@@ -784,6 +784,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
             mp_printf(&mp_plat_print, "%02X", raw_id[i]);
         }
         mp_printf(&mp_plat_print, "\n");
+        port_boot_info();
         #endif
 
         bool found_boot = maybe_run_list(boot_py_filenames);
diff --git a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
index 8358ac4d87..dc770a2de3 100644
--- a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
+++ b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
@@ -66,11 +66,12 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->output = false;
     // This also sets direction to input.
     common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -151,7 +152,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     enum gpio_pull_mode asf_pull = GPIO_PULL_OFF;
     switch (pull) {
@@ -168,6 +169,7 @@ void common_hal_digitalio_digitalinout_set_pull(
     // Must set pull after setting direction.
     gpio_set_pin_direction(self->pin->number, GPIO_DIRECTION_IN);
     gpio_set_pin_pull_mode(self->pin->number, asf_pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/broadcom/common-hal/digitalio/DigitalInOut.c b/ports/broadcom/common-hal/digitalio/DigitalInOut.c
index d8ac3472de..0dd74a8412 100644
--- a/ports/broadcom/common-hal/digitalio/DigitalInOut.c
+++ b/ports/broadcom/common-hal/digitalio/DigitalInOut.c
@@ -63,11 +63,12 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->output = false;
     // This also sets direction to input.
     common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -134,7 +135,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     const uint8_t pin = self->pin->number;
     BP_PULL_Enum bp_pull = BP_PULL_NONE;
@@ -144,6 +145,7 @@ void common_hal_digitalio_digitalinout_set_pull(
         bp_pull = BP_PULL_DOWN;
     }
     gpio_set_pull(pin, bp_pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/cxd56/common-hal/digitalio/DigitalInOut.c b/ports/cxd56/common-hal/digitalio/DigitalInOut.c
index cfb39301df..c1f247d0a9 100644
--- a/ports/cxd56/common-hal/digitalio/DigitalInOut.c
+++ b/ports/cxd56/common-hal/digitalio/DigitalInOut.c
@@ -64,11 +64,12 @@ bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *se
     return self->pin == NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->input = true;
     self->pull = pull;
     board_gpio_write(self->pin->number, -1);
     board_gpio_config(self->pin->number, 0, true, true, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {
@@ -124,10 +125,11 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitali
     return self->open_drain ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
 }
 
-void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->pull = pull;
     board_gpio_write(self->pin->number, -1);
     board_gpio_config(self->pin->number, 0, true, true, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t *self) {
diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c
index 63c8ec1a41..61671dadb9 100644
--- a/ports/espressif/common-hal/digitalio/DigitalInOut.c
+++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c
@@ -82,10 +82,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     common_hal_digitalio_digitalinout_set_pull(self, pull);
     gpio_set_direction(self->pin->number, GPIO_MODE_INPUT);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -140,7 +141,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     return DRIVE_MODE_PUSH_PULL;
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     gpio_num_t number = self->pin->number;
     gpio_pullup_dis(number);
@@ -150,6 +151,7 @@ void common_hal_digitalio_digitalinout_set_pull(
     } else if (pull == PULL_DOWN) {
         gpio_pulldown_en(number);
     }
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/litex/common-hal/digitalio/DigitalInOut.c b/ports/litex/common-hal/digitalio/DigitalInOut.c
index a48d698fcb..7545722967 100644
--- a/ports/litex/common-hal/digitalio/DigitalInOut.c
+++ b/ports/litex/common-hal/digitalio/DigitalInOut.c
@@ -58,10 +58,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     (void)pull;
     touch_oe_write(touch_oe_read() & ~(1 << self->pin->number));
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -111,10 +112,11 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     (void)self;
     (void)pull;
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
index dde7b3badd..7639204bc6 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -88,12 +88,13 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->output = false;
 
     // This also sets direction to input.
     common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -150,7 +151,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     self->pull = pull;
 
@@ -158,6 +159,7 @@ void common_hal_digitalio_digitalinout_set_pull(
 
     const gpio_pin_config_t config = { kGPIO_DigitalInput, 0, kGPIO_NoIntmode };
     GPIO_PinInit(self->pin->gpio, self->pin->number, &config);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nrf/common-hal/digitalio/DigitalInOut.c
index 95e488f3b7..a6440228f1 100644
--- a/ports/nrf/common-hal/digitalio/DigitalInOut.c
+++ b/ports/nrf/common-hal/digitalio/DigitalInOut.c
@@ -59,10 +59,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     nrf_gpio_cfg_input(self->pin->number, NRF_GPIO_PIN_NOPULL);
     common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -120,7 +121,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
     nrf_gpio_pin_pull_t hal_pull = NRF_GPIO_PIN_NOPULL;
 
@@ -137,6 +138,7 @@ void common_hal_digitalio_digitalinout_set_pull(
     }
 
     nrf_gpio_cfg_input(self->pin->number, hal_pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 09824f7c43..313005932c 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -57,6 +57,71 @@ CROSS_COMPILE = arm-none-eabi-
 
 HAL_DIR=hal/$(MCU_SERIES)
 
+ifeq ($(CIRCUITPY_CYW43),1)
+INC_CYW43 := \
+	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
+	-isystem sdk/lib/cyw43-driver/src \
+	-isystem sdk/lib/cyw43-driver/firmware \
+
+CFLAGS_CYW43 := -DCYW43_LWIP=0 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25
+SRC_SDK_CYW43 := \
+	lib/cyw43-driver/src/cyw43_ctrl.c \
+	lib/cyw43-driver/src/cyw43_ll.c \
+	lib/cyw43-driver/src/cyw43_lwip.c \
+	lib/cyw43-driver/src/cyw43_stats.c \
+	src/common/pico_sync/sem.c \
+	src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
+	src/rp2_common/pico_cyw43_arch/cyw43_arch_threadsafe_background.c \
+	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
+
+SRC_CYW43 := $(wildcard bindings/cyw43/*.c)
+
+PIOASM = $(BUILD)/sdk/pioasm/pioasm
+.PHONY: PioasmBuild
+PioasmBuild: $(PIOASM)
+$(PIOASM):
+	$(Q)cmake -S sdk -B $(BUILD)/sdk
+	$(Q)make -C $(BUILD)/sdk PioasmBuild
+
+$(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
+	$(Q)$(PIOASM) -o c-sdk $< $@
+$(BUILD)/sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus_pio_spi.pio.h
+
+CYW43_FIRMWARE_BIN = 43439A0-7.95.49.00.combined
+
+$(BUILD)/cyw43_resource.o: sdk/lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
+	$(Q)$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
+		--readonly-text \
+		--rename-section .data=.big_const,contents,alloc,load,readonly,data \
+		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start=fw_43439A0_7_95_49_00_start \
+		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size=fw_43439A0_7_95_49_00_size \
+		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
+		$< $@
+OBJ_CYW43 := $(BUILD)/cyw43_resource.o
+# need to do the equivalent of this in cmake
+###     # cyw43_resource.o contains the WiFi and BT firmware as a binary blob
+###     add_custom_command(
+###             OUTPUT ${CYW43_FIRMWARE_OBJ}
+###             DEPENDS ${PICO_CYW43_DRIVER_PATH}/firmware/${CYW43_FIRMWARE_BIN}
+###             WORKING_DIRECTORY ${PICO_CYW43_DRIVER_PATH}/firmware
+###             COMMAND ${CMAKE_OBJCOPY} -I binary -O elf32-littlearm -B arm
+###             --readonly-text
+###             --rename-section .data=${RESOURCE_SECNAME},${RESOURCE_SECFLAGS}
+###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_start=${CYW43_FIRMWARE_PRETTY}_start
+###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_end=${CYW43_FIRMWARE_PRETTY}_end
+###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_size=${CYW43_FIRMWARE_PRETTY}_size
+###             ${CYW43_FIRMWARE_BIN} ${CYW43_FIRMWARE_OBJ}
+###     )
+###
+else
+$(error y u no y fi)
+INC_CYW43 :=
+CFLAGS_CYW43 :=
+SRC_SDK_CYW43 :=
+SRC_CYW43 :=
+OBJ_CYW43 :=
+endif
+
 INC += \
 	-I. \
         -I../.. \
@@ -102,6 +167,7 @@ INC += \
         -isystem sdk/src/rp2_common/pico_runtime/printf/include/ \
         -isystem sdk/src/rp2_common/pico_bootrom/include/ \
         -isystem sdk/src/rp2_common/pico_unique_id/include/ \
+	$(INC_CYW43) \
         -Isdk_config \
         -I../../lib/tinyusb/src \
         -I../../supervisor/shared/usb \
@@ -116,6 +182,9 @@ CFLAGS += -DTUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1 -DCFG_TUSB_MCU=OPT_MCU_R
 # option to override default optimization level, set in boards/$(BOARD)/mpconfigboard.mk
 CFLAGS += $(OPTIMIZATION_FLAGS)
 
+# flags specific to wifi / cyw43
+
+CFLAGS += $(CFLAGS_CYW43)
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
   CFLAGS += -ggdb3 -O3
@@ -133,7 +202,7 @@ endif
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
 DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-function -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
 
-CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
+CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes -Wno-error=unused-result
 
 CFLAGS += \
   -march=armv6-m \
@@ -186,6 +255,7 @@ SRC_SDK := \
 	src/rp2_common/pico_runtime/runtime.c \
 	src/rp2_common/pico_stdio/stdio.c \
 	src/rp2_common/pico_unique_id/unique_id.c \
+	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
 $(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes -Wno-undef
@@ -205,6 +275,7 @@ SRC_C += \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/dcd_rp2040.c \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/rp2040_usb.c \
 	mphalport.c \
+	$(SRC_CYW43) \
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
@@ -244,6 +315,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/boot2_padded_checksummed.o
+OBJ += $(OBJ_CYW43)
 
 $(BUILD)/boot2_padded_checksummed.o: $(BUILD)/boot2_padded_checksummed.S
 	$(STEPECHO) "CC $<"
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
new file mode 100644
index 0000000000..2d5479a5d2
--- /dev/null
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ * Copyright (c) 2016 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+
+#include "shared-bindings/board/__init__.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "bindings/cyw43/__init__.h"
+
+const mp_obj_type_t cyw43_pin_type = {
+    { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    .name = MP_QSTR_CywPin,
+    .print = shared_bindings_microcontroller_pin_print,
+    MP_TYPE_EXTENDED_FIELDS(
+        .unary_op = mp_generic_unary_op,
+        )
+};
+
+const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj) {
+    if (!mp_obj_is_type(obj, &mcu_pin_type) && !mp_obj_is_type(obj, &cyw43_pin_type)) {
+        mp_raise_TypeError_varg(translate("Expected a %q or %q"), mcu_pin_type.name, cyw43_pin_type.name);
+    }
+    return MP_OBJ_TO_PTR(obj);
+}
+
+const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin_including_cyw43(obj);
+    assert_pin_free(pin);
+    return pin;
+}
+
+STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
+    { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table);
+
+const mp_obj_module_t cyw43_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&cyw43_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_cyw43, cyw43_module, CIRCUITPY_CYW43);
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
new file mode 100644
index 0000000000..5dcdfba52b
--- /dev/null
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ * Copyright (c) 2016 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t cyw43_pin_type;
+const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj);
+const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
new file mode 100644
index 0000000000..de6e424ed9
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
@@ -0,0 +1,40 @@
+/*
+ * 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 "supervisor/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
new file mode 100644
index 0000000000..7d0a44ce51
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
@@ -0,0 +1,293 @@
+/* Based on GCC ARM embedded samples.
+   Defines the following symbols for use by code:
+    __exidx_start
+    __exidx_end
+    __etext
+    __data_start__
+    __preinit_array_start
+    __preinit_array_end
+    __init_array_start
+    __init_array_end
+    __fini_array_start
+    __fini_array_end
+    __data_end__
+    __bss_start__
+    __bss_end__
+    __end__
+    end
+    __HeapLimit
+    __StackLimit
+    __StackTop
+    __stack (== StackTop)
+*/
+
+MEMORY
+{
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1788k
+    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
+    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
+    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
+}
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
+       and checksummed. It is usually built by the boot_stage2 target
+       in the Pico SDK
+    */
+
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH_FIRMWARE
+
+    .boot2 : {
+        __boot2_start__ = .;
+        KEEP (*(.boot2))
+        __boot2_end__ = .;
+    } > FLASH_FIRMWARE
+
+    ASSERT(__boot2_end__ - __boot2_start__ == 256,
+        "ERROR: Pico second stage bootloader must be 256 bytes in size")
+
+    /* The second stage will always enter the image at the start of .text.
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol if present, otherwise defaults to start of .text.
+       This can be used to transfer control back to the bootrom on debugger
+       launches only, to perform proper flash setup.
+    */
+
+    .text : {
+        __logical_binary_start = .;
+        KEEP (*(.vectors))
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.reset))
+        /* TODO revisit this now memset/memcpy/float in ROM */
+        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
+         * FLASH ... we will include any thing excluded here in .data below by default */
+        *(.init)
+
+        __property_getter_start = .;
+        *(.property_getter)
+        __property_getter_end = .;
+        __property_getset_start = .;
+        *(.property_getset)
+        __property_getset_end = .;
+
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
+        *(.fini)
+        /* Pull all c'tors into .text */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+        /* Followed by destructors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        . = ALIGN(4);
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH_FIRMWARE
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH_FIRMWARE
+    __exidx_end = .;
+
+    /* Machine inspectable binary information */
+    . = ALIGN(4);
+    __binary_info_start = .;
+    .binary_info :
+    {
+        KEEP(*(.binary_info.keep.*))
+        *(.binary_info.*)
+    } > FLASH_FIRMWARE
+    __binary_info_end = .;
+    . = ALIGN(4);
+
+    /* End of .text-like segments */
+    __etext = .;
+
+   .ram_vector_table (COPY): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .data : {
+        __data_start__ = .;
+        *(vtable)
+
+        *(.time_critical*)
+
+        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+        *(.text*)
+        . = ALIGN(4);
+        *(.rodata*)
+        . = ALIGN(4);
+
+        *(.data*)
+
+        . = ALIGN(4);
+        *(.after_data.*)
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__mutex_array_start = .);
+        KEEP(*(SORT(.mutex_array.*)))
+        KEEP(*(.mutex_array))
+        PROVIDE_HIDDEN (__mutex_array_end = .);
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(SORT(.preinit_array.*)))
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        *(SORT(.fini_array.*))
+        *(.fini_array)
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+        /* All data end */
+        __data_end__ = .;
+    } > RAM AT> FLASH_FIRMWARE
+
+    .itcm :
+    {
+        . = ALIGN(4);
+        *(.itcm.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_itcm_destination = ADDR(.itcm);
+    _ld_itcm_flash_copy = LOADADDR(.itcm);
+    _ld_itcm_size = SIZEOF(.itcm);
+
+    .dtcm_data :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_data.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_dtcm_data_destination = ADDR(.dtcm_data);
+    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
+    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
+
+    .dtcm_bss :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_bss.*)
+
+        . = ALIGN(4);
+    } > RAM AT> RAM
+    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
+    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
+
+    .uninitialized_data (COPY): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > RAM
+
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH_FIRMWARE
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        *(.scratch_y.*)
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH_FIRMWARE
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
+    .bss  : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (COPY):
+    {
+        __end__ = .;
+        end = __end__;
+        *(.heap*)
+        __HeapLimit = .;
+    } > RAM
+
+    /* .stack*_dummy section doesn't contains any symbols. It is only
+     * used for linker to calculate size of stack sections, and assign
+     * values to stack symbols later
+     *
+     * stack1 section may be empty/missing if platform_launch_core1 is not used */
+
+    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
+     * stack is not used then all of SCRATCH_X is free.
+     */
+    .stack1_dummy (COPY):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (COPY):
+    {
+        *(.stack*)
+    } > SCRATCH_Y
+
+    .flash_end : {
+        __flash_binary_end = .;
+    } > FLASH_FIRMWARE
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
+    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
+    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
+    PROVIDE(__stack = __StackTop);
+
+    /* Check if data + heap + stack exceeds RAM limit */
+    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
+    /* todo assert on extra code */
+}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
new file mode 100644
index 0000000000..58a291b18b
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico W"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
new file mode 100644
index 0000000000..0b3ce5ef00
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x239A
+USB_PID = 0x8120
+USB_PRODUCT = "Pico W"
+USB_MANUFACTURER = "Raspberry Pi"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+
+CIRCUITPY_CYW43 = 1
+CIRCUITPY_SSL = 0
+CIRCUITPY_HASHLIB = 0
+CIRCUITPY_WEB_WORKFLOW = 0
+CIRCUITPY_MDNS = 0
+CIRCUITPY_SOCKETPOOL = 0
+
+CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pico-sdk-configboard.h b/ports/raspberrypi/boards/raspberry_pi_pico_w/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
new file mode 100644
index 0000000000..fb3570cc8a
--- /dev/null
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
@@ -0,0 +1,54 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
+    { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index ef431d8506..1702254f9f 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -31,11 +31,18 @@
 #include "py/mphal.h"
 
 #include "common-hal/microcontroller/Pin.h"
+#include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "supervisor/shared/translate/translate.h"
 
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 
+#if CIRCUITPY_CYW43
+#include "pico/cyw43_arch.h"
+#include "bindings/cyw43/__init__.h"
+#define IS_CYW(self) ((self)->pin->base.type == &cyw43_pin_type)
+#endif
+
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) {
     claim_pin(pin);
@@ -61,20 +68,31 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     if (common_hal_digitalio_digitalinout_deinited(self)) {
         return;
     }
-    reset_pin_number(self->pin->number);
+    common_hal_reset_pin(self->pin);
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
-    self->output = false;
     // This also sets direction to input.
-    common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
     digitalio_digitalinout_obj_t *self, bool value,
     digitalio_drive_mode_t drive_mode) {
+
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        if (drive_mode != DRIVE_MODE_PUSH_PULL) {
+            return DIGITALINOUT_INVALID_DRIVE_MODE;
+        }
+        cyw43_arch_gpio_put(self->pin->number, value);
+        self->output = true;
+        self->open_drain = false;
+        return DIGITALINOUT_OK;
+    }
+    #endif
     const uint8_t pin = self->pin->number;
     gpio_disable_pulls(pin);
 
@@ -99,6 +117,12 @@ digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
 void common_hal_digitalio_digitalinout_set_value(
     digitalio_digitalinout_obj_t *self, bool value) {
     const uint8_t pin = self->pin->number;
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        cyw43_arch_gpio_put(pin, value);
+        return;
+    }
+    #endif
     if (self->open_drain && value) {
         // If true and open-drain, set the direction -before- setting
         // the pin value, to to avoid a high glitch on the pin before
@@ -122,6 +146,13 @@ bool common_hal_digitalio_digitalinout_get_value(
 digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
     digitalio_digitalinout_obj_t *self,
     digitalio_drive_mode_t drive_mode) {
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        if (drive_mode != DRIVE_MODE_PUSH_PULL) {
+            return DIGITALINOUT_INVALID_DRIVE_MODE;
+        }
+    }
+    #endif
     const uint8_t pin = self->pin->number;
     bool value = common_hal_digitalio_digitalinout_get_value(self);
     self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
@@ -142,11 +173,23 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        if (pull != PULL_NONE) {
+            return DIGITALINOUT_INVALID_PULL;
+        }
+        cyw43_arch_gpio_get(self->pin->number);
+        self->output = false;
+        return DIGITALINOUT_OK;
+    }
+    #endif
     const uint8_t pin = self->pin->number;
     gpio_set_pulls(pin, pull == PULL_UP, pull == PULL_DOWN);
     gpio_set_dir(pin, GPIO_IN);
+    self->output = false;
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
@@ -170,6 +213,11 @@ bool common_hal_digitalio_has_reg_op(digitalinout_reg_op_t op) {
 }
 
 volatile uint32_t *common_hal_digitalio_digitalinout_get_reg(digitalio_digitalinout_obj_t *self, digitalinout_reg_op_t op, uint32_t *mask) {
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        return NULL;
+    }
+    #endif
     const uint8_t pin = self->pin->number;
 
     *mask = 1u << pin;
diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c
index d40c1f43b5..59adb5395f 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Pin.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Pin.c
@@ -28,11 +28,19 @@
 
 #include "common-hal/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "bindings/cyw43/__init__.h"
 
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 
+#if CIRCUITPY_CYW43
+#include "pico/cyw43_arch.h"
+#endif
+
 STATIC uint32_t never_reset_pins;
 
+bool cyw_ever_init;
+static uint32_t cyw_pin_claimed;
+
 void reset_all_pins(void) {
     for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
         if ((never_reset_pins & (1 << i)) != 0) {
@@ -40,6 +48,14 @@ void reset_all_pins(void) {
         }
         reset_pin_number(i);
     }
+    #if CIRCUITPY_CYW43
+    if (cyw_ever_init) {
+        for (size_t i = 0; i < 1; i++) {
+            cyw43_arch_gpio_put(i, 0);
+        }
+    }
+    cyw_pin_claimed = 0;
+    #endif
 }
 
 void never_reset_pin_number(uint8_t pin_number) {
@@ -66,15 +82,30 @@ void reset_pin_number(uint8_t pin_number) {
     hw_set_bits(&padsbank0_hw->io[pin_number], PADS_BANK0_GPIO0_OD_BITS);
 }
 
+void reset_pin_number_cyw(uint8_t pin_no) {
+    cyw_pin_claimed &= ~(1 << pin_no);
+}
+
 void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
     never_reset_pin_number(pin->number);
 }
 
 void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
+    #if CIRCUITPY_CYW43
+    if (pin->base.type == &cyw43_pin_type) {
+        reset_pin_number_cyw(pin->number);
+        return;
+    }
+    #endif
     reset_pin_number(pin->number);
 }
 
 void claim_pin(const mcu_pin_obj_t *pin) {
+    #if CIRCUITPY_CYW43
+    if (pin->base.type == &cyw43_pin_type) {
+        cyw_pin_claimed |= (1 << pin->number);
+    }
+    #endif
     // Nothing to do because all changes will set the GPIO settings.
 }
 
@@ -89,6 +120,11 @@ bool pin_number_is_free(uint8_t pin_number) {
 }
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
+    #if CIRCUITPY_CYW43
+    if (pin->base.type == &cyw43_pin_type) {
+        return !(cyw_pin_claimed & (1 << pin->number));
+    }
+    #endif
     return pin_number_is_free(pin->number);
 }
 
diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.h b/ports/raspberrypi/common-hal/microcontroller/Pin.h
index 3e2287dc5d..5042dd7d66 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Pin.h
+++ b/ports/raspberrypi/common-hal/microcontroller/Pin.h
@@ -34,10 +34,13 @@
 
 #include "peripherals/pins.h"
 
+extern bool cyw_ever_init;
+
 void reset_all_pins(void);
 // reset_pin_number takes the pin number instead of the pointer so that objects don't
 // need to store a full pointer.
 void reset_pin_number(uint8_t pin_number);
+void reset_pin_number_cyw(uint8_t pin_number);
 void never_reset_pin_number(uint8_t pin_number);
 void claim_pin(const mcu_pin_obj_t *pin);
 bool pin_number_is_free(uint8_t pin_number);
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index 3b656edc07..5e79fbd0ce 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -175,10 +175,15 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO22), MP_ROM_PTR(&pin_GPIO22) },
     { MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) },
     { MP_ROM_QSTR(MP_QSTR_GPIO24), MP_ROM_PTR(&pin_GPIO24) },
+    #if !defined(IGNORE_GPIO25)
     { MP_ROM_QSTR(MP_QSTR_GPIO25), MP_ROM_PTR(&pin_GPIO25) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_GPIO26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GPIO27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GPIO28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GPIO29), MP_ROM_PTR(&pin_GPIO29) },
+    #if CIRCUITPY_CYW43
+    { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
+    #endif
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
diff --git a/ports/raspberrypi/peripherals/pins.c b/ports/raspberrypi/peripherals/pins.c
index 1b5fe91cac..e6a197f3be 100644
--- a/ports/raspberrypi/peripherals/pins.c
+++ b/ports/raspberrypi/peripherals/pins.c
@@ -27,6 +27,7 @@
 #include "pins.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
+#include "bindings/cyw43/__init__.h"
 
 // This macro is used to simplify pin definition in boards//pins.c
 #define PIN(p_number) \
@@ -34,6 +35,11 @@
         { &mcu_pin_type }, \
         .number = p_number \
     }
+#define CYW_PIN(p_number) \
+    const mcu_pin_obj_t pin_CYW##p_number = { \
+        { &cyw43_pin_type }, \
+        .number = p_number \
+    }
 
 PIN(0);
 PIN(1);
@@ -60,8 +66,13 @@ PIN(21);
 PIN(22);
 PIN(23);
 PIN(24);
+#if !defined(IGNORE_GPIO25)
 PIN(25);
+#endif
 PIN(26);
 PIN(27);
 PIN(28);
 PIN(29);
+#if CIRCUITPY_CYW43
+CYW_PIN(0);
+#endif
diff --git a/ports/raspberrypi/peripherals/pins.h b/ports/raspberrypi/peripherals/pins.h
index 99ab9cfe48..0a01b3959e 100644
--- a/ports/raspberrypi/peripherals/pins.h
+++ b/ports/raspberrypi/peripherals/pins.h
@@ -62,10 +62,16 @@ extern const mcu_pin_obj_t pin_GPIO21;
 extern const mcu_pin_obj_t pin_GPIO22;
 extern const mcu_pin_obj_t pin_GPIO23;
 extern const mcu_pin_obj_t pin_GPIO24;
+#if !defined(IGNORE_GPIO25)
 extern const mcu_pin_obj_t pin_GPIO25;
+#endif
 extern const mcu_pin_obj_t pin_GPIO26;
 extern const mcu_pin_obj_t pin_GPIO27;
 extern const mcu_pin_obj_t pin_GPIO28;
 extern const mcu_pin_obj_t pin_GPIO29;
 
+#if CIRCUITPY_CYW43
+extern const mcu_pin_obj_t pin_CYW0;
+#endif
+
 #endif  // MICROPY_INCLUDED_RASPBERRYPI_PERIPHERALS_PINS_H
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 5041250c0a..2e1fed7a25 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -53,12 +53,17 @@
 #include "src/rp2_common/hardware_uart/include/hardware/uart.h"
 #include "src/rp2_common/hardware_sync/include/hardware/sync.h"
 #include "src/rp2_common/hardware_timer/include/hardware/timer.h"
+#if CIRCUITPY_CYW43
+#include "pico/cyw43_arch.h"
+#endif
 #include "src/common/pico_time/include/pico/time.h"
 #include "src/common/pico_binary_info/include/pico/binary_info.h"
 
 #include "pico/bootrom.h"
 #include "hardware/watchdog.h"
 
+#include "supervisor/serial.h"
+
 extern volatile bool mp_msc_enabled;
 
 STATIC void _tick_callback(uint alarm_num);
@@ -122,6 +127,24 @@ safe_mode_t port_init(void) {
 
     // Check brownout.
 
+    #if CIRCUITPY_CYW43
+    never_reset_pin_number(23);
+    never_reset_pin_number(24);
+    never_reset_pin_number(25);
+    never_reset_pin_number(29);
+    if (cyw43_arch_init()) {
+        serial_write("WiFi init failed\n");
+        return -1;
+    } else {
+        cyw_ever_init = true;
+        for (int i = 3; i--;) {
+            cyw43_arch_gpio_put(0, 1);
+            sleep_ms(100);
+            cyw43_arch_gpio_put(0, 0);
+            sleep_ms(100);
+        }
+    }
+    #endif
     if (board_requests_safe_mode()) {
         return USER_SAFE_MODE;
     }
@@ -261,3 +284,19 @@ __attribute__((used)) void HardFault_Handler(void) {
         asm ("nop;");
     }
 }
+
+void port_yield() {
+    #if CIRCUITPY_CYW43
+    cyw43_arch_poll();
+    #endif
+}
+
+void port_boot_info(void) {
+    #if CIRCUITPY_CYW43
+    mp_printf(&mp_plat_print, "MAC");
+    for (int i = 0; i < 6; i++) {
+        mp_printf(&mp_plat_print, ":%02X", cyw43_state.mac[i]);
+    }
+    mp_printf(&mp_plat_print, "\n");
+    #endif
+}
diff --git a/ports/stm/common-hal/digitalio/DigitalInOut.c b/ports/stm/common-hal/digitalio/DigitalInOut.c
index 3a0e27943b..58f81b43b6 100644
--- a/ports/stm/common-hal/digitalio/DigitalInOut.c
+++ b/ports/stm/common-hal/digitalio/DigitalInOut.c
@@ -77,7 +77,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
     self->pin = NULL;
 }
 
-void common_hal_digitalio_digitalinout_switch_to_input(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
 
     GPIO_InitTypeDef GPIO_InitStruct = {0};
@@ -88,6 +88,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     HAL_GPIO_Init(pin_port(self->pin->port), &GPIO_InitStruct);
 
     common_hal_digitalio_digitalinout_set_pull(self, pull);
+    return DIGITALINOUT_OK;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -138,7 +139,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
            == LL_GPIO_OUTPUT_OPENDRAIN ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
 }
 
-void common_hal_digitalio_digitalinout_set_pull(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
     digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
 
     switch (pull) {
@@ -154,6 +155,7 @@ void common_hal_digitalio_digitalinout_set_pull(
         default:
             break;
     }
+    return DIGITALINOUT_OK;
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 80377f1a65..b5c8047f99 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -170,6 +170,9 @@ endif
 ifeq ($(CIRCUITPY_COUNTIO),1)
 SRC_PATTERNS += countio/%
 endif
+ifeq ($(CIRCUITPY_CYW43),1)
+SRC_PATTERNS += cyw43/%
+endif
 ifeq ($(CIRCUITPY_DIGITALIO),1)
 SRC_PATTERNS += digitalio/%
 endif
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index acdf08e6a4..7c497c6106 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -588,6 +588,15 @@ void supervisor_run_background_tasks_if_tick(void);
 #define MICROPY_WRAP_MP_EXECUTE_BYTECODE PLACE_IN_ITCM
 #endif
 
+#ifndef CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (0)
+#endif
+
+#ifndef CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (0)
+#endif
+
+
 #define MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE (CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE)
 
 #endif  // __INCLUDED_MPCONFIG_CIRCUITPY_H
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 0f4269c522..6bff102dd4 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -159,6 +159,9 @@ CFLAGS += -DCIRCUITPY_CAMERA=$(CIRCUITPY_CAMERA)
 CIRCUITPY_CANIO ?= 0
 CFLAGS += -DCIRCUITPY_CANIO=$(CIRCUITPY_CANIO)
 
+CIRCUITPY_CYW43 ?= 0
+CFLAGS += -DCIRCUITPY_CYW43=$(CIRCUITPY_CYW43)
+
 CIRCUITPY_DIGITALIO ?= 1
 CFLAGS += -DCIRCUITPY_DIGITALIO=$(CIRCUITPY_DIGITALIO)
 
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index ae72b5cb55..c4a1f853b5 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -43,6 +43,29 @@
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
 
+#if CIRCUITPY_CYW43
+#include "bindings/cyw43/__init__.h"
+#endif
+
+STATIC void check_result(digitalinout_result_t result) {
+    switch (result) {
+        case DIGITALINOUT_OK:
+            return;
+        case DIGITALINOUT_PIN_BUSY:
+            mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_Pin);
+        case DIGITALINOUT_INPUT_ONLY:
+            mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_direction);
+        #if CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
+        case DIGITALINOUT_INVALID_PULL:
+            mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_pull);
+        #endif
+        #if CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE
+        case DIGITALINOUT_INVALID_DRIVE_MODE:
+            mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_drive_mode);
+        #endif
+    }
+}
+
 //| class DigitalInOut:
 //|     """Digital input and output
 //|
@@ -65,7 +88,11 @@ STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type,
     digitalio_digitalinout_obj_t *self = m_new_obj(digitalio_digitalinout_obj_t);
     self->base.type = &digitalio_digitalinout_type;
 
+    #if CIRCUITPY_CYW43
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin_including_cyw43(args[0]);
+    #else
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
+    #endif
     common_hal_digitalio_digitalinout_construct(self, pin);
 
     return MP_OBJ_FROM_PTR(self);
@@ -166,7 +193,7 @@ STATIC mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_o
     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);
 
-    common_hal_digitalio_digitalinout_switch_to_input(self, validate_pull(args[ARG_pull].u_rom_obj, MP_QSTR_pull));
+    check_result(common_hal_digitalio_digitalinout_switch_to_input(self, validate_pull(args[ARG_pull].u_rom_obj, MP_QSTR_pull)));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_input_obj, 1, digitalio_digitalinout_switch_to_input);
@@ -200,7 +227,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
     if (value == MP_ROM_PTR(&digitalio_direction_input_obj)) {
-        common_hal_digitalio_digitalinout_switch_to_input(self, PULL_NONE);
+        check_result(common_hal_digitalio_digitalinout_switch_to_input(self, PULL_NONE));
     } else if (value == MP_ROM_PTR(&digitalio_direction_output_obj)) {
         digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(self, false, DRIVE_MODE_PUSH_PULL);
         if (result == DIGITALINOUT_INPUT_ONLY) {
@@ -276,7 +303,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_o
     if (drive_mode == MP_ROM_PTR(&digitalio_drive_mode_open_drain_obj)) {
         c_drive_mode = DRIVE_MODE_OPEN_DRAIN;
     }
-    common_hal_digitalio_digitalinout_set_drive_mode(self, c_drive_mode);
+    check_result(common_hal_digitalio_digitalinout_set_drive_mode(self, c_drive_mode));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_drive_mode_obj, digitalio_digitalinout_obj_set_drive_mode);
@@ -319,7 +346,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t p
         return mp_const_none;
     }
 
-    common_hal_digitalio_digitalinout_set_pull(self, validate_pull(pull_obj, MP_QSTR_pull));
+    check_result(common_hal_digitalio_digitalinout_set_pull(self, validate_pull(pull_obj, MP_QSTR_pull)));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_pull_obj, digitalio_digitalinout_obj_set_pull);
diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h
index b6edbc63aa..9a751e93bb 100644
--- a/shared-bindings/digitalio/DigitalInOut.h
+++ b/shared-bindings/digitalio/DigitalInOut.h
@@ -38,7 +38,13 @@ extern const mp_obj_type_t digitalio_digitalinout_type;
 typedef enum {
     DIGITALINOUT_OK,
     DIGITALINOUT_PIN_BUSY,
-    DIGITALINOUT_INPUT_ONLY
+    DIGITALINOUT_INPUT_ONLY,
+    #if CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
+    DIGITALINOUT_INVALID_PULL,
+    #endif
+    #if CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE
+    DIGITALINOUT_INVALID_DRIVE_MODE,
+    #endif
 } digitalinout_result_t;
 
 typedef enum {
@@ -52,14 +58,14 @@ typedef enum {
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin);
 void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self);
 bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *self);
-void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull);
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull);
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode);
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(digitalio_digitalinout_obj_t *self);
 void common_hal_digitalio_digitalinout_set_value(digitalio_digitalinout_obj_t *self, bool value);
 bool common_hal_digitalio_digitalinout_get_value(digitalio_digitalinout_obj_t *self);
 digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode);
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitalio_digitalinout_obj_t *self);
-void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull);
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull);
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t *self);
 void common_hal_digitalio_digitalinout_never_reset(digitalio_digitalinout_obj_t *self);
 digitalio_digitalinout_obj_t *assert_digitalinout(mp_obj_t obj);
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index 840f468e2a..1bf41e1e61 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -70,7 +70,7 @@ static void get_pin_name(const mcu_pin_obj_t *self, qstr *package, qstr *module,
     }
 }
 
-STATIC void mcu_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+void shared_bindings_microcontroller_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mcu_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     qstr package = MP_QSTR_Pin;
     qstr module;
@@ -88,7 +88,7 @@ const mp_obj_type_t mcu_pin_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_Pin,
-    .print = mcu_pin_print,
+    .print = shared_bindings_microcontroller_pin_print,
     MP_TYPE_EXTENDED_FIELDS(
         .unary_op = mp_generic_unary_op,
         )
diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h
index 12ff422a4a..b41b3c308a 100644
--- a/shared-bindings/microcontroller/Pin.h
+++ b/shared-bindings/microcontroller/Pin.h
@@ -55,6 +55,8 @@ void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin);
 void common_hal_mcu_pin_claim_number(uint8_t pin_no);
 void common_hal_mcu_pin_reset_number(uint8_t pin_no);
 
+void shared_bindings_microcontroller_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+
 #define COMMON_HAL_MCU_NO_PIN ((uint8_t)0xff)
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H
diff --git a/supervisor/port.h b/supervisor/port.h
index 554baca2a4..2fb24385c1 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -120,4 +120,8 @@ void port_yield(void);
 // A default weak implementation is provided that does nothing.
 void port_post_boot_py(bool heap_valid);
 
+// Some ports want to add information to boot_out.txt.
+// A default weak implementation is provided that does nothing.
+void port_boot_info(void);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_PORT_H
diff --git a/supervisor/shared/port.c b/supervisor/shared/port.c
index e78e6a931a..4070cf254e 100644
--- a/supervisor/shared/port.c
+++ b/supervisor/shared/port.c
@@ -34,3 +34,6 @@ MP_WEAK void port_wake_main_task_from_isr(void) {
 
 MP_WEAK void port_yield(void) {
 }
+
+MP_WEAK void port_boot_info(void) {
+}

From 6c3cdceb45677d0914d2411fe7e2f245ce465c5a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 31 Aug 2022 10:13:39 -0500
Subject: [PATCH 1046/2403] Implement scan, connect, ping

My pings go out, and then they come back

```py
import os
import wifi
import ipaddress

wifi.radio.connect(os.getenv('WIFI_SSID'), os.getenv('WIFI_PASSWORD'))
ipv4 = ipaddress.ip_address("8.8.4.4")
print("Ping google.com: %f ms" % (wifi.radio.ping(ipv4)*1000))
```
---
 frozen/circuitpython-stage                    |   2 +-
 locale/circuitpython.pot                      |  19 +-
 mpy-cross/Makefile                            |   2 +
 ports/espressif/esp32-camera                  |   2 +-
 ports/raspberrypi/Makefile                    |  22 +-
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   1 +
 ports/raspberrypi/common-hal/wifi/Monitor.c   |  74 ++++
 ports/raspberrypi/common-hal/wifi/Monitor.h   |  40 ++
 ports/raspberrypi/common-hal/wifi/Network.c   |  81 ++++
 ports/raspberrypi/common-hal/wifi/Network.h   |  36 ++
 ports/raspberrypi/common-hal/wifi/Radio.c     | 311 ++++++++++++++
 ports/raspberrypi/common-hal/wifi/Radio.h     |  39 ++
 .../common-hal/wifi/ScannedNetworks.c         | 120 ++++++
 .../common-hal/wifi/ScannedNetworks.h         |  42 ++
 ports/raspberrypi/common-hal/wifi/__init__.c  | 124 ++++++
 ports/raspberrypi/common-hal/wifi/__init__.h  |  37 ++
 ports/raspberrypi/lwip_inc/arch/sys_arch.h    |   1 +
 ports/raspberrypi/lwip_inc/lwipopts.h         |  92 +++++
 ports/raspberrypi/lwip_src/ping.c             | 390 ++++++++++++++++++
 ports/raspberrypi/lwip_src/ping.h             |  25 ++
 ports/raspberrypi/mpconfigport.h              |   8 +
 ports/raspberrypi/supervisor/port.c           |  15 +-
 py/objgenerator.c                             |   3 +-
 shared-bindings/wifi/Monitor.h                |   2 +-
 shared-bindings/wifi/Network.h                |   2 +-
 shared-bindings/wifi/Radio.c                  |   2 +-
 shared-bindings/wifi/Radio.h                  |   2 +-
 tools/codeformat.py                           |   2 +
 tools/describe                                |   2 +-
 29 files changed, 1472 insertions(+), 26 deletions(-)
 create mode 100644 ports/raspberrypi/common-hal/wifi/Monitor.c
 create mode 100644 ports/raspberrypi/common-hal/wifi/Monitor.h
 create mode 100644 ports/raspberrypi/common-hal/wifi/Network.c
 create mode 100644 ports/raspberrypi/common-hal/wifi/Network.h
 create mode 100644 ports/raspberrypi/common-hal/wifi/Radio.c
 create mode 100644 ports/raspberrypi/common-hal/wifi/Radio.h
 create mode 100644 ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
 create mode 100644 ports/raspberrypi/common-hal/wifi/ScannedNetworks.h
 create mode 100644 ports/raspberrypi/common-hal/wifi/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/wifi/__init__.h
 create mode 100644 ports/raspberrypi/lwip_inc/arch/sys_arch.h
 create mode 100644 ports/raspberrypi/lwip_inc/lwipopts.h
 create mode 100644 ports/raspberrypi/lwip_src/ping.c
 create mode 100644 ports/raspberrypi/lwip_src/ping.h

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 4124dfbdaa..9a8338b3bd 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 4124dfbdaadce1966f457d7d6c6984e9832999bf
+Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 01db150b3f..c38548a90f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -303,7 +303,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -489,6 +489,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -2208,6 +2209,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4137,14 +4143,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4276,9 +4278,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 6e4d7ef316..4858cb25c7 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -20,3 +20,5 @@ override undefine PROG
 endif
 
 include mpy-cross.mk
+CFLAGS += -g
+STRIP = :
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 54c3f61c86..28804391c0 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2
+Subproject commit 28804391c002f6a3ea5ce6a55aee3b191be3ecde
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 313005932c..bdfdb9a9b7 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -59,20 +59,30 @@ HAL_DIR=hal/$(MCU_SERIES)
 
 ifeq ($(CIRCUITPY_CYW43),1)
 INC_CYW43 := \
-	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
-	-isystem sdk/lib/cyw43-driver/src \
 	-isystem sdk/lib/cyw43-driver/firmware \
+	-isystem sdk/lib/cyw43-driver/src \
+	-isystem sdk/lib/lwip/src/include \
+	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
+	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=0 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25
+CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25
 SRC_SDK_CYW43 := \
 	lib/cyw43-driver/src/cyw43_ctrl.c \
 	lib/cyw43-driver/src/cyw43_ll.c \
 	lib/cyw43-driver/src/cyw43_lwip.c \
 	lib/cyw43-driver/src/cyw43_stats.c \
 	src/common/pico_sync/sem.c \
+	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch_threadsafe_background.c \
-	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
+	src/rp2_common/pico_lwip/nosys.c \
+	src/rp2_common/pico_lwip/random.c \
+
+SRC_LWIP := \
+	$(wildcard sdk/lib/lwip/src/core/*.c) \
+	$(wildcard sdk/lib/lwip/src/core/ipv4/*.c) \
+	sdk/lib/lwip/src/netif/ethernet.c \
+	$(wildcard lwip_src/*.c) \
 
 SRC_CYW43 := $(wildcard bindings/cyw43/*.c)
 
@@ -114,16 +124,17 @@ OBJ_CYW43 := $(BUILD)/cyw43_resource.o
 ###     )
 ###
 else
-$(error y u no y fi)
 INC_CYW43 :=
 CFLAGS_CYW43 :=
 SRC_SDK_CYW43 :=
 SRC_CYW43 :=
 OBJ_CYW43 :=
+SRC_LWIP :=
 endif
 
 INC += \
 	-I. \
+	-Ilwip_inc \
         -I../.. \
         -I../lib/mp-readline \
         -I../shared/timeutils \
@@ -276,6 +287,7 @@ SRC_C += \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/rp2040_usb.c \
 	mphalport.c \
 	$(SRC_CYW43) \
+	$(SRC_LWIP) \
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 0b3ce5ef00..7acd728bcc 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -16,5 +16,6 @@ CIRCUITPY_HASHLIB = 0
 CIRCUITPY_WEB_WORKFLOW = 0
 CIRCUITPY_MDNS = 0
 CIRCUITPY_SOCKETPOOL = 0
+CIRCUITPY_WIFI = 1
 
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
diff --git a/ports/raspberrypi/common-hal/wifi/Monitor.c b/ports/raspberrypi/common-hal/wifi/Monitor.c
new file mode 100644
index 0000000000..f288cd1ea1
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Monitor.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 
+
+#include "py/mpstate.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/wifi/Monitor.h"
+#include "shared-bindings/wifi/Packet.h"
+
+
+#define MONITOR_PAYLOAD_FCS_LEN     (4)
+#define MONITOR_QUEUE_TIMEOUT_TICK  (0)
+
+typedef struct {
+} monitor_packet_t;
+
+void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel, size_t queue) {
+    mp_raise_NotImplementedError(translate("wifi.Monitor not available"));
+}
+
+bool common_hal_wifi_monitor_deinited(void) {
+    return true;
+}
+
+void common_hal_wifi_monitor_deinit(wifi_monitor_obj_t *self) {
+}
+
+void common_hal_wifi_monitor_set_channel(wifi_monitor_obj_t *self, uint8_t channel) {
+}
+
+mp_obj_t common_hal_wifi_monitor_get_channel(wifi_monitor_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(0);
+}
+
+mp_obj_t common_hal_wifi_monitor_get_queue(wifi_monitor_obj_t *self) {
+    return mp_obj_new_int_from_uint(0);
+}
+
+mp_obj_t common_hal_wifi_monitor_get_lost(wifi_monitor_obj_t *self) {
+    return mp_obj_new_int_from_uint(0);
+}
+
+mp_obj_t common_hal_wifi_monitor_get_queued(wifi_monitor_obj_t *self) {
+    return mp_obj_new_int_from_uint(0);
+}
+
+mp_obj_t common_hal_wifi_monitor_get_packet(wifi_monitor_obj_t *self) {
+    return mp_const_none;
+}
diff --git a/ports/raspberrypi/common-hal/wifi/Monitor.h b/ports/raspberrypi/common-hal/wifi/Monitor.h
new file mode 100644
index 0000000000..14ee685bbd
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Monitor.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 microDev
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WIFI_MONITOR_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WIFI_MONITOR_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t channel;
+    size_t lost;
+    size_t queue_length;
+} wifi_monitor_obj_t;
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WIFI_MONITOR_H
diff --git a/ports/raspberrypi/common-hal/wifi/Network.c b/ports/raspberrypi/common-hal/wifi/Network.c
new file mode 100644
index 0000000000..8db42e962c
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Network.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "shared-bindings/wifi/Network.h"
+#include "shared-bindings/wifi/AuthMode.h"
+
+mp_obj_t common_hal_wifi_network_get_ssid(wifi_network_obj_t *self) {
+    const char *cstr = (const char *)self->record.ssid;
+    return mp_obj_new_str(cstr, self->record.ssid_len);
+}
+
+#define MAC_ADDRESS_LENGTH 6
+
+mp_obj_t common_hal_wifi_network_get_bssid(wifi_network_obj_t *self) {
+    return mp_obj_new_bytes(self->record.bssid, MAC_ADDRESS_LENGTH);
+}
+
+mp_obj_t common_hal_wifi_network_get_rssi(wifi_network_obj_t *self) {
+    return mp_obj_new_int(self->record.rssi);
+}
+
+mp_obj_t common_hal_wifi_network_get_channel(wifi_network_obj_t *self) {
+    return mp_obj_new_int(self->record.channel);
+}
+
+mp_obj_t common_hal_wifi_network_get_country(wifi_network_obj_t *self) {
+    return (mp_obj_t)MP_QSTR_;
+}
+
+mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
+    uint8_t authmode_mask = 0;
+    if (self->record.auth_mode == 0) {
+        authmode_mask = (1 << AUTHMODE_OPEN);
+    }
+    if (self->record.auth_mode & 1) {
+        authmode_mask |= (1 << AUTHMODE_PSK);
+    }
+    ;
+    if (self->record.auth_mode & 2) {
+        authmode_mask |= (1 << AUTHMODE_WPA);
+    }
+    ;
+    if (self->record.auth_mode & 4) {
+        authmode_mask |= (1 << AUTHMODE_WPA2);
+    }
+    ;
+    mp_obj_t authmode_list = mp_obj_new_list(0, NULL);
+    if (authmode_mask != 0) {
+        for (uint8_t i = 0; i < 8; i++) {
+            if ((authmode_mask >> i) & 1) {
+                mp_obj_list_append(authmode_list, cp_enum_find(&wifi_authmode_type, i));
+            }
+        }
+    }
+    return authmode_list;
+}
diff --git a/ports/raspberrypi/common-hal/wifi/Network.h b/ports/raspberrypi/common-hal/wifi/Network.h
new file mode 100644
index 0000000000..8e4e7bd310
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Network.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "pico/cyw43_arch.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    cyw43_ev_scan_result_t record;
+} wifi_network_obj_t;
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
new file mode 100644
index 0000000000..f614d3185f
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -0,0 +1,311 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/port.h"
+#include "shared-bindings/wifi/Radio.h"
+#include "shared-bindings/wifi/Network.h"
+
+#include 
+#include 
+
+#include "common-hal/wifi/__init__.h"
+#include "shared/runtime/interrupt_char.h"
+#include "py/gc.h"
+#include "py/runtime.h"
+#include "shared-bindings/ipaddress/IPv4Address.h"
+#include "shared-bindings/wifi/ScannedNetworks.h"
+#include "shared-bindings/wifi/AuthMode.h"
+#include "shared-bindings/time/__init__.h"
+#include "shared-module/ipaddress/__init__.h"
+
+#if CIRCUITPY_MDNS
+#include "components/mdns/include/mdns.h"
+#endif
+
+#include "lwip/dns.h"
+#include "lwip/icmp.h"
+#include "lwip/raw.h"
+#include "lwip_src/ping.h"
+
+#ifndef PING_ID
+#define PING_ID        0xAFAF
+#endif
+
+#define MAC_ADDRESS_LENGTH 6
+
+#define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
+#define NETIF_AP (&cyw43_state.netif[CYW43_ITF_AP])
+
+NORETURN static void ro_attribute(int attr) {
+    mp_raise_msg_varg(&mp_type_AttributeError, MP_ERROR_TEXT("'%s' object has no attribute '%q'"), "Radio", attr);
+}
+
+bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self) {
+    return true;
+}
+
+void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
+    if (!enabled) {
+        ro_attribute(MP_QSTR_enabled);
+    }
+}
+
+mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
+    if (!NETIF_STA->hostname) {
+        return mp_const_none;
+    }
+    return mp_obj_new_str(NETIF_STA->hostname, strlen(NETIF_STA->hostname));
+}
+
+void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
+    ro_attribute(MP_QSTR_hostname);
+}
+
+mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
+    return mp_obj_new_bytes(cyw43_state.mac, MAC_ADDRESS_LENGTH);
+}
+
+void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t *mac) {
+    ro_attribute(MP_QSTR_mac_address);
+}
+
+mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
+    return MICROPY_FLOAT_CONST(0.);
+}
+
+void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t tx_power) {
+    ro_attribute(MP_QSTR_tx_power);
+
+}
+
+mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {
+    return common_hal_wifi_radio_get_mac_address(self);
+}
+
+void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint8_t *mac) {
+    ro_attribute(MP_QSTR_mac_address_ap);
+}
+
+mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self) {
+    if (self->current_scan) {
+        mp_raise_RuntimeError(translate("Already scanning for wifi networks"));
+    }
+    if (!common_hal_wifi_radio_get_enabled(self)) {
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
+    }
+    wifi_scannednetworks_obj_t *scan = m_new_obj(wifi_scannednetworks_obj_t);
+    scan->base.type = &wifi_scannednetworks_type;
+    mp_obj_t args[] = { mp_const_empty_tuple, MP_OBJ_NEW_SMALL_INT(16) };
+    scan->results = mp_type_deque.make_new(&mp_type_deque, 2, 0, args);
+    self->current_scan = scan;
+    wifi_scannednetworks_start_scan(scan);
+    return scan;
+}
+
+void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
+    self->current_scan = NULL;
+}
+
+void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
+    cyw43_arch_enable_sta_mode();
+}
+
+void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
+}
+
+void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
+}
+
+wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
+    if (!common_hal_wifi_radio_get_enabled(self)) {
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
+    }
+    unsigned timeout_ms = timeout <= 0 ? 8000 : (unsigned)MAX(0, MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000));
+    // TODO use connect_async so we can service bg tasks & check for ctrl-c during
+    // connect
+    int result = cyw43_arch_wifi_connect_timeout_ms((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK, timeout_ms);
+    switch (result) {
+        case 0:
+            return WIFI_RADIO_ERROR_NONE;
+        // case CYW43_LINK_DOWN:
+        // case CYW43_LINK_JOIN:
+        // case CYW43_LINK_NOIP:
+        // case CYW43_LINK_UP:
+        case CYW43_LINK_FAIL:
+            return WIFI_RADIO_ERROR_CONNECTION_FAIL;
+        case CYW43_LINK_NONET:
+            return WIFI_RADIO_ERROR_NO_AP_FOUND;
+        case CYW43_LINK_BADAUTH:
+            return WIFI_RADIO_ERROR_AUTH_FAIL;
+
+        default:
+            return WIFI_RADIO_ERROR_UNSPECIFIED;
+    }
+}
+
+mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_STA)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_STA->gw.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_gateway_ap(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_AP)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_AP->gw.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_STA)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_STA->netmask.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_AP)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_AP->netmask.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_STA)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_STA->ip_addr.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self) {
+    if (!netif_is_up(NETIF_AP)) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(NETIF_AP->ip_addr.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) {
+    uint32_t addr = dns_getserver(0)->addr;
+    if (!netif_is_up(NETIF_STA) || addr == 0) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(addr);
+}
+
+void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dns_addr) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
+}
+
+void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+volatile bool ping_received;
+
+static u8_t
+ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
+    struct icmp_echo_hdr *iecho;
+    LWIP_ASSERT("p != NULL", p != NULL);
+
+    if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
+        pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
+        iecho = (struct icmp_echo_hdr *)p->payload;
+
+        if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
+            ip_addr_debug_print(PING_DEBUG, addr);
+            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
+
+            /* do some ping result processing */
+            ping_received = true;
+            pbuf_free(p);
+            return 1; /* eat the packet */
+        }
+        /* not eaten, restore original packet */
+        pbuf_add_header(p, PBUF_IP_HLEN);
+    }
+    return 0; /* don't eat the packet */
+}
+
+mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
+    ip_addr_t ping_addr;
+    ipaddress_ipaddress_to_lwip(ip_address, &ping_addr);
+
+    struct raw_pcb *ping_pcb;
+    MICROPY_PY_LWIP_ENTER();
+    ping_pcb = raw_new(IP_PROTO_ICMP);
+    if (!ping_pcb) {
+        MICROPY_PY_LWIP_EXIT();
+        return -1;
+    }
+    raw_recv(ping_pcb, ping_recv, NULL);
+    raw_bind(ping_pcb, IP_ADDR_ANY);
+    MICROPY_PY_LWIP_EXIT();
+
+    ping_received = false;
+    ping_send(ping_pcb, &ping_addr);
+    size_t timeout_ms = (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
+    uint64_t start = port_get_raw_ticks(NULL);
+    uint64_t deadline = start + timeout_ms;
+    while (port_get_raw_ticks(NULL) < deadline && !ping_received) {
+        RUN_BACKGROUND_TASKS;
+        if (mp_hal_is_interrupted()) {
+            break;
+        }
+    }
+    mp_int_t result = -1;
+    if (ping_received) {
+        uint64_t now = port_get_raw_ticks(NULL);
+        result = now - start;
+    }
+
+    MICROPY_PY_LWIP_ENTER();
+    raw_remove(ping_pcb);
+    MICROPY_PY_LWIP_EXIT();
+
+    return result;
+}
+
+void common_hal_wifi_radio_gc_collect(wifi_radio_obj_t *self) {
+    // Only bother to scan the actual object references.
+    gc_collect_ptr(self->current_scan);
+}
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.h b/ports/raspberrypi/common-hal/wifi/Radio.h
new file mode 100644
index 0000000000..e919c5d718
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/Radio.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "shared-bindings/wifi/ScannedNetworks.h"
+#include "shared-bindings/wifi/Network.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    wifi_scannednetworks_obj_t *current_scan;
+} wifi_radio_obj_t;
+
+extern void common_hal_wifi_radio_gc_collect(wifi_radio_obj_t *self);
diff --git a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
new file mode 100644
index 0000000000..fd180da3b1
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
@@ -0,0 +1,120 @@
+/*
+ * 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 
+
+#include "shared/runtime/interrupt_char.h"
+#include "py/gc.h"
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "common-hal/wifi/__init__.h"
+#include "shared-bindings/wifi/__init__.h"
+#include "shared-bindings/wifi/Network.h"
+#include "shared-bindings/wifi/Radio.h"
+#include "shared-bindings/wifi/ScannedNetworks.h"
+
+#define NUM_SCAN (16)
+static cyw43_ev_scan_result_t scan_results[NUM_SCAN];
+static uint8_t scan_put, scan_get;
+static bool scan_full;
+
+
+static void scan_result_clear() {
+    scan_put = scan_get = 0;
+    scan_full = false;
+}
+
+static void scan_result_put(const cyw43_ev_scan_result_t *result) {
+    if (!scan_full) {
+        scan_results[scan_put] = *result;
+        scan_put = (scan_put + 1) % NUM_SCAN;
+        scan_full = (scan_put == scan_get);
+    }
+}
+
+static bool scan_result_available() {
+    return scan_full || (scan_get != scan_put);
+}
+
+static cyw43_ev_scan_result_t *scan_result_get(cyw43_ev_scan_result_t *result) {
+    if (!scan_result_available()) {
+        return NULL;
+    }
+
+    *result = scan_results[scan_get];
+    scan_get = (scan_get + 1) % NUM_SCAN;
+    scan_full = false;
+    return result;
+}
+
+// Note: It's not OK to allocate memory in here, we can be called at a bad time
+// which messes up the gc allocator
+static int scan_result(void *env, const cyw43_ev_scan_result_t *result) {
+    wifi_scannednetworks_obj_t *self = common_hal_wifi_radio_obj.current_scan;
+    // scan ended or something
+    if (!self) {
+        return 0;
+    }
+
+    scan_result_put(result);
+
+    return 0;
+}
+
+mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self) {
+    // no results available, wait for some
+    while (!scan_result_available(self) && cyw43_wifi_scan_active(&cyw43_state)) {
+        RUN_BACKGROUND_TASKS;
+        if (mp_hal_is_interrupted()) {
+            return mp_const_none;
+        }
+        cyw43_arch_poll();
+    }
+
+    if (!scan_result_available(self)) {
+        common_hal_wifi_radio_obj.current_scan = NULL;
+        return mp_const_none;
+    }
+
+
+    wifi_network_obj_t *entry = m_new_obj(wifi_network_obj_t);
+    entry->base.type = &wifi_network_type;
+    scan_result_get(&entry->record);
+
+    return MP_OBJ_FROM_PTR(entry);
+}
+
+void wifi_scannednetworks_deinit(wifi_scannednetworks_obj_t *self) {
+    // there's actually no way to stop an ongoing scan in cyw43!
+    common_hal_wifi_radio_obj.current_scan = NULL;
+}
+
+void wifi_scannednetworks_start_scan(wifi_scannednetworks_obj_t *self) {
+    cyw43_wifi_scan_options_t scan_options = {0};
+    CHECK_CYW_RESULT(cyw43_wifi_scan(&cyw43_state, &scan_options, NULL, scan_result));
+}
diff --git a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.h b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.h
new file mode 100644
index 0000000000..eae783ca4e
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.h
@@ -0,0 +1,42 @@
+/*
+ * 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
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include 
+
+#include "py/obj.h"
+#include "cyw43.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t results;
+    bool done;
+} wifi_scannednetworks_obj_t;
+
+void wifi_scannednetworks_deinit(wifi_scannednetworks_obj_t *self);
+void wifi_scannednetworks_start_scan(wifi_scannednetworks_obj_t *self);
diff --git a/ports/raspberrypi/common-hal/wifi/__init__.c b/ports/raspberrypi/common-hal/wifi/__init__.c
new file mode 100644
index 0000000000..9a42320cf5
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/__init__.c
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "common-hal/wifi/__init__.h"
+#include "shared-bindings/wifi/__init__.h"
+
+#include "shared-bindings/ipaddress/IPv4Address.h"
+#include "shared-bindings/wifi/Monitor.h"
+#include "shared-bindings/wifi/Radio.h"
+
+#include "py/mperrno.h"
+#include "py/mpstate.h"
+#include "py/runtime.h"
+
+wifi_radio_obj_t common_hal_wifi_radio_obj;
+
+#include "supervisor/port.h"
+#include "supervisor/shared/status_bar.h"
+#include "supervisor/workflow.h"
+
+static bool wifi_inited;
+static bool wifi_ever_inited;
+static bool wifi_user_initiated;
+
+void common_hal_wifi_init(bool user_initiated) {
+    wifi_radio_obj_t *self = &common_hal_wifi_radio_obj;
+
+    if (wifi_inited) {
+        if (user_initiated && !wifi_user_initiated) {
+            common_hal_wifi_radio_set_enabled(self, true);
+        }
+        return;
+    }
+    wifi_inited = true;
+    wifi_user_initiated = user_initiated;
+    common_hal_wifi_radio_obj.base.type = &wifi_radio_type;
+    common_hal_wifi_radio_obj.current_scan = NULL;
+
+    if (!wifi_ever_inited) {
+    }
+    wifi_ever_inited = true;
+
+    // set station mode to avoid the default SoftAP
+    common_hal_wifi_radio_start_station(self);
+    // start wifi
+    common_hal_wifi_radio_set_enabled(self, true);
+}
+
+void wifi_user_reset(void) {
+    if (wifi_user_initiated) {
+        // wifi_reset();
+        wifi_user_initiated = false;
+    }
+}
+
+void wifi_reset(void) {
+    if (!wifi_inited) {
+        return;
+    }
+    common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
+    wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
+    common_hal_wifi_radio_obj.current_scan = NULL;
+    // common_hal_wifi_radio_set_enabled(radio, false);
+    supervisor_workflow_request_background();
+}
+
+void common_hal_wifi_gc_collect(void) {
+    common_hal_wifi_radio_gc_collect(&common_hal_wifi_radio_obj);
+}
+
+void raise_cyw_error(int err) {
+    int mp_errno;
+    switch (err) {
+        case -CYW43_EIO:
+            mp_errno = MP_EIO;
+            break;
+        case -CYW43_EPERM:
+            mp_errno = MP_EPERM;
+            break;
+        case -CYW43_EINVAL:
+            mp_errno = MP_EINVAL;
+            break;
+        case -CYW43_ETIMEDOUT:
+            mp_errno = MP_ETIMEDOUT;
+            break;
+        default:
+            mp_raise_OSError_msg_varg(translate("Unkown error code %d"), err);
+    }
+    mp_raise_OSError(mp_errno);
+}
+
+void ipaddress_ipaddress_to_lwip(mp_obj_t ip_address, ip_addr_t *lwip_ip_address) {
+    if (!mp_obj_is_type(ip_address, &ipaddress_ipv4address_type)) {
+        mp_raise_ValueError(translate("Only IPv4 addresses supported"));
+    }
+    mp_obj_t packed = common_hal_ipaddress_ipv4address_get_packed(ip_address);
+    size_t len;
+    const char *bytes = mp_obj_str_get_data(packed, &len);
+
+    IP_ADDR4(lwip_ip_address, bytes[0], bytes[1], bytes[2], bytes[3]);
+}
diff --git a/ports/raspberrypi/common-hal/wifi/__init__.h b/ports/raspberrypi/common-hal/wifi/__init__.h
new file mode 100644
index 0000000000..d34d631089
--- /dev/null
+++ b/ports/raspberrypi/common-hal/wifi/__init__.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+#include "py/mpconfig.h"
+#include "lwip/ip_addr.h"
+
+void wifi_reset(void);
+NORETURN void raise_cyw_error(int err);
+#define CHECK_CYW_RESULT(x) do { int res = (x); if (res != 0) raise_cyw_error(res); } while (0)
+
+void ipaddress_ipaddress_to_lwip(mp_obj_t ip_address, ip_addr_t *lwip_ip_address);
diff --git a/ports/raspberrypi/lwip_inc/arch/sys_arch.h b/ports/raspberrypi/lwip_inc/arch/sys_arch.h
new file mode 100644
index 0000000000..8b1a393741
--- /dev/null
+++ b/ports/raspberrypi/lwip_inc/arch/sys_arch.h
@@ -0,0 +1 @@
+// empty
diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
new file mode 100644
index 0000000000..993e675d6b
--- /dev/null
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -0,0 +1,92 @@
+#ifndef _LWIPOPTS_EXAMPLE_COMMONH_H
+#define _LWIPOPTS_EXAMPLE_COMMONH_H
+
+
+// Common settings used in most of the pico_w examples
+// (see https://www.nongnu.org/lwip/2_1_x/group__lwip__opts.html for details)
+
+// allow override in some examples
+#ifndef NO_SYS
+#define NO_SYS                      1
+#endif
+// allow override in some examples
+#ifndef LWIP_SOCKET
+#define LWIP_SOCKET                 0
+#endif
+#if PICO_CYW43_ARCH_POLL
+#define MEM_LIBC_MALLOC             1
+#else
+// MEM_LIBC_MALLOC is incompatible with non polling versions
+#define MEM_LIBC_MALLOC             0
+#endif
+#define MEM_ALIGNMENT               4
+#define MEM_SIZE                    4000
+#define MEMP_NUM_TCP_SEG            32
+#define MEMP_NUM_ARP_QUEUE          10
+#define PBUF_POOL_SIZE              24
+#define LWIP_ARP                    1
+#define LWIP_ETHERNET               1
+#define LWIP_ICMP                   1
+#define LWIP_RAW                    1
+#define TCP_WND                     (8 * TCP_MSS)
+#define TCP_MSS                     1460
+#define TCP_SND_BUF                 (8 * TCP_MSS)
+#define TCP_SND_QUEUELEN            ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS))
+#define LWIP_NETIF_STATUS_CALLBACK  1
+#define LWIP_NETIF_LINK_CALLBACK    1
+#define LWIP_NETIF_HOSTNAME         1
+#define LWIP_NETCONN                0
+#define MEM_STATS                   0
+#define SYS_STATS                   0
+#define MEMP_STATS                  0
+#define LINK_STATS                  0
+// #define ETH_PAD_SIZE                2
+#define LWIP_CHKSUM_ALGORITHM       3
+#define LWIP_DHCP                   1
+#define LWIP_IPV4                   1
+#define LWIP_TCP                    1
+#define LWIP_UDP                    1
+#define LWIP_DNS                    1
+#define LWIP_TCP_KEEPALIVE          1
+#define LWIP_NETIF_TX_SINGLE_PBUF   1
+#define DHCP_DOES_ARP_CHECK         0
+#define LWIP_DHCP_DOES_ACD_CHECK    0
+
+#ifndef NDEBUG
+#define LWIP_DEBUG                  1
+#define LWIP_STATS                  1
+#define LWIP_STATS_DISPLAY          1
+#endif
+
+#define ETHARP_DEBUG                LWIP_DBG_OFF
+#define NETIF_DEBUG                 LWIP_DBG_OFF
+#define PBUF_DEBUG                  LWIP_DBG_OFF
+#define API_LIB_DEBUG               LWIP_DBG_OFF
+#define API_MSG_DEBUG               LWIP_DBG_OFF
+#define SOCKETS_DEBUG               LWIP_DBG_OFF
+#define ICMP_DEBUG                  LWIP_DBG_OFF
+#define INET_DEBUG                  LWIP_DBG_OFF
+#define IP_DEBUG                    LWIP_DBG_OFF
+#define IP_REASS_DEBUG              LWIP_DBG_OFF
+#define RAW_DEBUG                   LWIP_DBG_OFF
+#define MEM_DEBUG                   LWIP_DBG_OFF
+#define MEMP_DEBUG                  LWIP_DBG_OFF
+#define SYS_DEBUG                   LWIP_DBG_OFF
+#define TCP_DEBUG                   LWIP_DBG_OFF
+#define TCP_INPUT_DEBUG             LWIP_DBG_OFF
+#define TCP_OUTPUT_DEBUG            LWIP_DBG_OFF
+#define TCP_RTO_DEBUG               LWIP_DBG_OFF
+#define TCP_CWND_DEBUG              LWIP_DBG_OFF
+#define TCP_WND_DEBUG               LWIP_DBG_OFF
+#define TCP_FR_DEBUG                LWIP_DBG_OFF
+#define TCP_QLEN_DEBUG              LWIP_DBG_OFF
+#define TCP_RST_DEBUG               LWIP_DBG_OFF
+#define UDP_DEBUG                   LWIP_DBG_OFF
+#define TCPIP_DEBUG                 LWIP_DBG_OFF
+#define PPP_DEBUG                   LWIP_DBG_OFF
+#define SLIP_DEBUG                  LWIP_DBG_OFF
+#define DHCP_DEBUG                  LWIP_DBG_OFF
+
+#define LWIP_TIMEVAL_PRIVATE 0
+
+#endif /* __LWIPOPTS_H__ */
diff --git a/ports/raspberrypi/lwip_src/ping.c b/ports/raspberrypi/lwip_src/ping.c
new file mode 100644
index 0000000000..d5173cab96
--- /dev/null
+++ b/ports/raspberrypi/lwip_src/ping.c
@@ -0,0 +1,390 @@
+/**
+ * @file
+ * Ping sender module
+ *
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+/**
+ * This is an example of a "ping" sender (with raw API and socket API).
+ * It can be used as a start point to maintain opened a network connection, or
+ * like a network "watchdog" for your device.
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
+
+#include "ping.h"
+
+#include "lwip/mem.h"
+#include "lwip/raw.h"
+#include "lwip/icmp.h"
+#include "lwip/netif.h"
+#include "lwip/sys.h"
+#include "lwip/timeouts.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/prot/ip4.h"
+
+#if PING_USE_SOCKETS
+#include "lwip/sockets.h"
+#include "lwip/inet.h"
+#include 
+#endif /* PING_USE_SOCKETS */
+
+
+/**
+ * PING_DEBUG: Enable debugging for PING.
+ */
+#ifndef PING_DEBUG
+#define PING_DEBUG     LWIP_DBG_ON
+#endif
+
+/** ping receive timeout - in milliseconds */
+#ifndef PING_RCV_TIMEO
+#define PING_RCV_TIMEO 1000
+#endif
+
+/** ping delay - in milliseconds */
+#ifndef PING_DELAY
+#define PING_DELAY     1000
+#endif
+
+/** ping identifier - must fit on a u16_t */
+#ifndef PING_ID
+#define PING_ID        0xAFAF
+#endif
+
+/** ping additional data size to include in the packet */
+#ifndef PING_DATA_SIZE
+#define PING_DATA_SIZE 32
+#endif
+
+/** ping result action - no default action */
+#ifndef PING_RESULT
+#define PING_RESULT(ping_ok)
+#endif
+
+/* ping variables */
+static const ip_addr_t *ping_target;
+u16_t ping_seq_num;
+#ifdef LWIP_DEBUG
+static u32_t ping_time;
+#endif /* LWIP_DEBUG */
+#if !PING_USE_SOCKETS
+static struct raw_pcb *ping_pcb;
+#endif /* PING_USE_SOCKETS */
+
+/** Prepare a echo ICMP request */
+void
+ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len) {
+    size_t i;
+    size_t data_len = len - sizeof(struct icmp_echo_hdr);
+
+    ICMPH_TYPE_SET(iecho, ICMP_ECHO);
+    ICMPH_CODE_SET(iecho, 0);
+    iecho->chksum = 0;
+    iecho->id = PING_ID;
+    iecho->seqno = lwip_htons(++ping_seq_num);
+
+    /* fill the additional data buffer with some data */
+    for (i = 0; i < data_len; i++) {
+        ((char *)iecho)[sizeof(struct icmp_echo_hdr) + i] = (char)i;
+    }
+
+    iecho->chksum = inet_chksum(iecho, len);
+}
+
+#if PING_USE_SOCKETS
+
+/* Ping using the socket ip */
+err_t
+ping_send(int s, const ip_addr_t *addr) {
+    int err;
+    struct icmp_echo_hdr *iecho;
+    struct sockaddr_storage to;
+    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
+    LWIP_ASSERT("ping_size is too big", ping_size <= 0xffff);
+
+    #if LWIP_IPV6
+    if (IP_IS_V6(addr) && !ip6_addr_isipv4mappedipv6(ip_2_ip6(addr))) {
+        /* todo: support ICMP6 echo */
+        return ERR_VAL;
+    }
+    #endif /* LWIP_IPV6 */
+
+    iecho = (struct icmp_echo_hdr *)mem_malloc((mem_size_t)ping_size);
+    if (!iecho) {
+        return ERR_MEM;
+    }
+
+    ping_prepare_echo(iecho, (u16_t)ping_size);
+
+    #if LWIP_IPV4
+    if (IP_IS_V4(addr)) {
+        struct sockaddr_in *to4 = (struct sockaddr_in *)&to;
+        to4->sin_len = sizeof(*to4);
+        to4->sin_family = AF_INET;
+        inet_addr_from_ip4addr(&to4->sin_addr, ip_2_ip4(addr));
+    }
+    #endif /* LWIP_IPV4 */
+
+    #if LWIP_IPV6
+    if (IP_IS_V6(addr)) {
+        struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to;
+        to6->sin6_len = sizeof(*to6);
+        to6->sin6_family = AF_INET6;
+        inet6_addr_from_ip6addr(&to6->sin6_addr, ip_2_ip6(addr));
+    }
+    #endif /* LWIP_IPV6 */
+
+    err = lwip_sendto(s, iecho, ping_size, 0, (struct sockaddr *)&to, sizeof(to));
+
+    mem_free(iecho);
+
+    return err ? ERR_OK : ERR_VAL;
+}
+
+static void
+ping_recv(int s) {
+    char buf[64];
+    int len;
+    struct sockaddr_storage from;
+    int fromlen = sizeof(from);
+
+    while ((len = lwip_recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr *)&from, (socklen_t *)&fromlen)) > 0) {
+        if (len >= (int)(sizeof(struct ip_hdr) + sizeof(struct icmp_echo_hdr))) {
+            ip_addr_t fromaddr;
+            memset(&fromaddr, 0, sizeof(fromaddr));
+
+            #if LWIP_IPV4
+            if (from.ss_family == AF_INET) {
+                struct sockaddr_in *from4 = (struct sockaddr_in *)&from;
+                inet_addr_to_ip4addr(ip_2_ip4(&fromaddr), &from4->sin_addr);
+                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V4);
+            }
+            #endif /* LWIP_IPV4 */
+
+            #if LWIP_IPV6
+            if (from.ss_family == AF_INET6) {
+                struct sockaddr_in6 *from6 = (struct sockaddr_in6 *)&from;
+                inet6_addr_to_ip6addr(ip_2_ip6(&fromaddr), &from6->sin6_addr);
+                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V6);
+            }
+            #endif /* LWIP_IPV6 */
+
+            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
+            ip_addr_debug_print_val(PING_DEBUG, fromaddr);
+            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
+
+            /* todo: support ICMP6 echo */
+            #if LWIP_IPV4
+            if (IP_IS_V4_VAL(fromaddr)) {
+                struct ip_hdr *iphdr;
+                struct icmp_echo_hdr *iecho;
+
+                iphdr = (struct ip_hdr *)buf;
+                iecho = (struct icmp_echo_hdr *)(buf + (IPH_HL(iphdr) * 4));
+                if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
+                    /* do some ping result processing */
+                    PING_RESULT((ICMPH_TYPE(iecho) == ICMP_ER));
+                    return;
+                } else {
+                    LWIP_DEBUGF(PING_DEBUG, ("ping: drop\n"));
+                }
+            }
+            #endif /* LWIP_IPV4 */
+        }
+        fromlen = sizeof(from);
+    }
+
+    if (len == 0) {
+        LWIP_DEBUGF(PING_DEBUG, ("ping: recv - %"U32_F " ms - timeout\n", (sys_now() - ping_time)));
+    }
+
+    /* do some ping result processing */
+    PING_RESULT(0);
+}
+
+static void
+ping_thread(void *arg) {
+    int s;
+    int ret;
+
+    #if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
+    int timeout = PING_RCV_TIMEO;
+    #else
+    struct timeval timeout;
+    timeout.tv_sec = PING_RCV_TIMEO / 1000;
+    timeout.tv_usec = (PING_RCV_TIMEO % 1000) * 1000;
+    #endif
+    LWIP_UNUSED_ARG(arg);
+
+    #if LWIP_IPV6
+    if (IP_IS_V4(ping_target) || ip6_addr_isipv4mappedipv6(ip_2_ip6(ping_target))) {
+        s = lwip_socket(AF_INET6, SOCK_RAW, IP_PROTO_ICMP);
+    } else {
+        s = lwip_socket(AF_INET6, SOCK_RAW, IP6_NEXTH_ICMP6);
+    }
+    #else
+    s = lwip_socket(AF_INET,  SOCK_RAW, IP_PROTO_ICMP);
+    #endif
+    if (s < 0) {
+        return;
+    }
+
+    ret = lwip_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+    LWIP_ASSERT("setting receive timeout failed", ret == 0);
+    LWIP_UNUSED_ARG(ret);
+
+    while (1) {
+        if (ping_send(s, ping_target) == ERR_OK) {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+            ip_addr_debug_print(PING_DEBUG, ping_target);
+            LWIP_DEBUGF(PING_DEBUG, ("\n"));
+
+            #ifdef LWIP_DEBUG
+            ping_time = sys_now();
+            #endif /* LWIP_DEBUG */
+            ping_recv(s);
+        } else {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+            ip_addr_debug_print(PING_DEBUG, ping_target);
+            LWIP_DEBUGF(PING_DEBUG, (" - error\n"));
+        }
+        sys_msleep(PING_DELAY);
+    }
+}
+
+#else /* PING_USE_SOCKETS */
+
+/* Ping using the raw ip */
+static u8_t
+ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
+    struct icmp_echo_hdr *iecho;
+    LWIP_UNUSED_ARG(arg);
+    LWIP_UNUSED_ARG(pcb);
+    LWIP_UNUSED_ARG(addr);
+    LWIP_ASSERT("p != NULL", p != NULL);
+
+    if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
+        pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
+        iecho = (struct icmp_echo_hdr *)p->payload;
+
+        if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
+            ip_addr_debug_print(PING_DEBUG, addr);
+            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
+
+            /* do some ping result processing */
+            PING_RESULT(1);
+            pbuf_free(p);
+            return 1; /* eat the packet */
+        }
+        /* not eaten, restore original packet */
+        pbuf_add_header(p, PBUF_IP_HLEN);
+    }
+
+    return 0; /* don't eat the packet */
+}
+
+int
+ping_send(struct raw_pcb *raw, const ip_addr_t *addr) {
+    struct pbuf *p;
+    struct icmp_echo_hdr *iecho;
+    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
+
+    LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+    ip_addr_debug_print(PING_DEBUG, addr);
+    LWIP_DEBUGF(PING_DEBUG, ("\n"));
+    LWIP_ASSERT("ping_size <= 0xffff", ping_size <= 0xffff);
+
+    p = pbuf_alloc(PBUF_IP, (u16_t)ping_size, PBUF_RAM);
+    if (!p) {
+        return 0;
+    }
+    if ((p->len == p->tot_len) && (p->next == NULL)) {
+        iecho = (struct icmp_echo_hdr *)p->payload;
+
+        ping_prepare_echo(iecho, (u16_t)ping_size);
+
+        raw_sendto(raw, p, addr);
+        #ifdef LWIP_DEBUG
+        ping_time = sys_now();
+        #endif /* LWIP_DEBUG */
+    }
+    pbuf_free(p);
+    return 1;
+}
+
+static void
+ping_timeout(void *arg) {
+    struct raw_pcb *pcb = (struct raw_pcb *)arg;
+
+    LWIP_ASSERT("ping_timeout: no pcb given!", pcb != NULL);
+
+    ping_send(pcb, ping_target);
+
+    sys_timeout(PING_DELAY, ping_timeout, pcb);
+}
+
+static void
+ping_raw_init(void) {
+    if (ping_pcb) {
+        return;
+    }
+    ping_pcb = raw_new(IP_PROTO_ICMP);
+    LWIP_ASSERT("ping_pcb != NULL", ping_pcb != NULL);
+
+    raw_recv(ping_pcb, ping_recv, NULL);
+    raw_bind(ping_pcb, IP_ADDR_ANY);
+    sys_timeout(PING_DELAY, ping_timeout, ping_pcb);
+}
+
+static void
+ping_send_now(void) {
+    LWIP_ASSERT("ping_pcb != NULL", ping_pcb != NULL);
+    ping_send(ping_pcb, ping_target);
+}
+
+#endif /* PING_USE_SOCKETS */
+
+void
+ping_init(const ip_addr_t *ping_addr) {
+    ping_target = ping_addr;
+
+    #if PING_USE_SOCKETS
+    sys_thread_new("ping_thread", ping_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
+    #else /* PING_USE_SOCKETS */
+    ping_raw_init();
+    #endif /* PING_USE_SOCKETS */
+}
+
+#endif /* LWIP_RAW */
diff --git a/ports/raspberrypi/lwip_src/ping.h b/ports/raspberrypi/lwip_src/ping.h
new file mode 100644
index 0000000000..abbae9d086
--- /dev/null
+++ b/ports/raspberrypi/lwip_src/ping.h
@@ -0,0 +1,25 @@
+#ifndef LWIP_PING_H
+#define LWIP_PING_H
+
+#include "lwip/raw.h"
+#include "lwip/ip_addr.h"
+#include "lwip/prot/icmp.h"
+
+/**
+ * PING_USE_SOCKETS: Set to 1 to use sockets, otherwise the raw api is used
+ */
+#ifndef PING_USE_SOCKETS
+#define PING_USE_SOCKETS    LWIP_SOCKET
+#endif
+
+void ping_init(const ip_addr_t *ping_addr);
+void ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len);
+
+extern u16_t ping_seq_num;
+#if !PING_USE_SOCKETS
+void ping_set_target(const ip_addr_t *ping_addr);
+int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
+// u8_t ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr);
+#endif /* !PING_USE_SOCKETS */
+
+#endif /* LWIP_PING_H */
diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h
index fd09d8a9ac..9bc97f6a78 100644
--- a/ports/raspberrypi/mpconfigport.h
+++ b/ports/raspberrypi/mpconfigport.h
@@ -49,4 +49,12 @@
     mp_obj_t background_pio[NUM_DMA_CHANNELS]; \
     CIRCUITPY_COMMON_ROOT_POINTERS;
 
+#if CIRCUITPY_CYW43
+#include "pico/cyw43_arch.h"
+#undef _L // interferes with ulab, indirectly defined in ctype.h, is ulab bug to use identifier _L
+#define MICROPY_PY_LWIP_ENTER   cyw43_arch_lwip_begin
+#define MICROPY_PY_LWIP_REENTER MICROPY_PY_LWIP_ENTER
+#define MICROPY_PY_LWIP_EXIT    cyw43_arch_lwip_end
+#endif
+
 #endif  // __INCLUDED_MPCONFIGPORT_H
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 2e1fed7a25..94e57c2028 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -41,6 +41,10 @@
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
+#if CIRCUITPY_WIFI
+#include "common-hal/wifi/__init__.h"
+#endif
+
 #include "common-hal/rtc/RTC.h"
 #include "common-hal/busio/UART.h"
 
@@ -134,15 +138,8 @@ safe_mode_t port_init(void) {
     never_reset_pin_number(29);
     if (cyw43_arch_init()) {
         serial_write("WiFi init failed\n");
-        return -1;
     } else {
         cyw_ever_init = true;
-        for (int i = 3; i--;) {
-            cyw43_arch_gpio_put(0, 1);
-            sleep_ms(100);
-            cyw43_arch_gpio_put(0, 0);
-            sleep_ms(100);
-        }
     }
     #endif
     if (board_requests_safe_mode()) {
@@ -182,6 +179,10 @@ void reset_port(void) {
     audio_dma_reset();
     #endif
 
+    #if CIRCUITPY_WIFI
+    wifi_reset();
+    #endif
+
     reset_all_pins();
 }
 
diff --git a/py/objgenerator.c b/py/objgenerator.c
index b18101cfa1..c9af11fbb5 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -330,7 +330,8 @@ STATIC mp_obj_t gen_instance_await(mp_obj_t self_in) {
     if (!self->coroutine_generator) {
         // Pretend like a generator does not have this coroutine behavior.
         // Pay no attention to the dir() behind the curtain
-        mp_raise_AttributeError(MP_ERROR_TEXT("type object 'generator' has no attribute '__await__'"));
+        mp_raise_msg_varg(&mp_type_AttributeError, MP_ERROR_TEXT("type object '%q' has no attribute '%q'"),
+            MP_QSTR_generator, MP_QSTR___await__);
     }
     // You can directly call send on a coroutine generator or you can __await__ then send on the return of that.
     return self;
diff --git a/shared-bindings/wifi/Monitor.h b/shared-bindings/wifi/Monitor.h
index 38c52a05e7..b828616ddb 100644
--- a/shared-bindings/wifi/Monitor.h
+++ b/shared-bindings/wifi/Monitor.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/wifi/Monitor.h"
 
-const mp_obj_type_t wifi_monitor_type;
+extern const mp_obj_type_t wifi_monitor_type;
 
 void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self,
     uint8_t channel, size_t queue);
diff --git a/shared-bindings/wifi/Network.h b/shared-bindings/wifi/Network.h
index 0f07e7b555..574d690f37 100644
--- a/shared-bindings/wifi/Network.h
+++ b/shared-bindings/wifi/Network.h
@@ -33,7 +33,7 @@
 
 #include "py/objstr.h"
 
-const mp_obj_type_t wifi_network_type;
+extern const mp_obj_type_t wifi_network_type;
 
 extern mp_obj_t common_hal_wifi_network_get_ssid(wifi_network_obj_t *self);
 extern mp_obj_t common_hal_wifi_network_get_bssid(wifi_network_obj_t *self);
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index bcd998d806..aecb1b561f 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -89,7 +89,7 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in)
 
     mp_arg_validate_length_range(hostname.len, 1, 253, MP_QSTR_hostname);
 
-    #ifndef CONFIG_IDF_TARGET_ESP32C3
+    #if 0 // ndef CONFIG_IDF_TARGET_ESP32C3
     regex_t regex; // validate hostname according to RFC 1123
     regcomp(®ex,"^(([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])$", REG_EXTENDED | REG_ICASE | REG_NOSUB);
     if (regexec(®ex, hostname.buf, 0, NULL, 0)) {
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 312e9e5395..479ce1a1b3 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -33,7 +33,7 @@
 
 #include "py/objstr.h"
 
-const mp_obj_type_t wifi_radio_type;
+extern const mp_obj_type_t wifi_radio_type;
 
 typedef enum {
     // 0 is circuitpython-specific; 1-53 are IEEE; 200+ are Espressif
diff --git a/tools/codeformat.py b/tools/codeformat.py
index edefbc8ddc..3965e838a2 100644
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -67,6 +67,8 @@ EXCLUSIONS = [
     "tests/**/repl_*.py",
     # needs careful attention before applying automatic formatting
     "tests/basics/*.py",
+    # don't reindent this third-party code we vendored in
+    "ports/raspberrypi/lwip_src",
 ]
 
 # None of the standard Python path matching routines implement the matching
diff --git a/tools/describe b/tools/describe
index 7fd624abe3..e20c2ffa44 100755
--- a/tools/describe
+++ b/tools/describe
@@ -1,3 +1,3 @@
 #!/bin/sh
 # Add any supplied arguments.
-git describe --first-parent --dirty --tags --always --match "[1-9].*" "$@"
+git describe --first-parent --dirty --tags --match "[1-9].*" "$@"

From a7a1bd788001eca4e71fd49b4ae2a2d6e75071a9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 17 Sep 2022 09:01:31 -0500
Subject: [PATCH 1047/2403] Implement DNS resolution

```
>>> s = socketpool.SocketPool(wifi.radio)
>>> s.getaddrinfo("google.com", 80)
[(0, 0, 0, '', ('142.250.81.206', 80))]
```
---
 ports/raspberrypi/Makefile                    |   1 +
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   2 +-
 .../common-hal/socketpool/Socket.c            | 165 ++++++++++++++++++
 .../common-hal/socketpool/Socket.h            |  77 ++++++++
 .../common-hal/socketpool/SocketPool.c        |  97 ++++++++++
 .../common-hal/socketpool/SocketPool.h        |  33 ++++
 .../common-hal/socketpool/__init__.c          |  33 ++++
 .../common-hal/socketpool/__init__.h          |  27 +++
 ports/raspberrypi/common-hal/wifi/Radio.c     |  14 +-
 ports/raspberrypi/lwip_inc/lwipopts.h         |   2 +
 ports/raspberrypi/mpconfigport.h              |   5 +-
 shared-bindings/socketpool/Socket.c           |   2 +-
 12 files changed, 446 insertions(+), 12 deletions(-)
 create mode 100644 ports/raspberrypi/common-hal/socketpool/Socket.c
 create mode 100644 ports/raspberrypi/common-hal/socketpool/Socket.h
 create mode 100644 ports/raspberrypi/common-hal/socketpool/SocketPool.c
 create mode 100644 ports/raspberrypi/common-hal/socketpool/SocketPool.h
 create mode 100644 ports/raspberrypi/common-hal/socketpool/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/socketpool/__init__.h

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index bdfdb9a9b7..28659e9cb2 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -79,6 +79,7 @@ SRC_SDK_CYW43 := \
 	src/rp2_common/pico_lwip/random.c \
 
 SRC_LWIP := \
+	shared/netutils/netutils.c \
 	$(wildcard sdk/lib/lwip/src/core/*.c) \
 	$(wildcard sdk/lib/lwip/src/core/ipv4/*.c) \
 	sdk/lib/lwip/src/netif/ethernet.c \
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 7acd728bcc..2b114b3954 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -15,7 +15,7 @@ CIRCUITPY_SSL = 0
 CIRCUITPY_HASHLIB = 0
 CIRCUITPY_WEB_WORKFLOW = 0
 CIRCUITPY_MDNS = 0
-CIRCUITPY_SOCKETPOOL = 0
+CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
new file mode 100644
index 0000000000..a1b77533a2
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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/socketpool/Socket.h"
+
+#include "shared/runtime/interrupt_char.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "shared-bindings/socketpool/SocketPool.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/workflow.h"
+
+#include "lwip/err.h"
+#include "lwip/sys.h"
+#include "lwip/netdb.h"
+
+#define MAX_SOCKETS (8)
+
+STATIC mp_obj_t open_socket_objs[MAX_SOCKETS];
+STATIC bool user_socket[MAX_SOCKETS];
+
+void socket_user_reset(void) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
+        if (open_socket_objs[i] && user_socket[i]) {
+            // shut 'er down
+        }
+    }
+}
+
+// The writes below send an event to the socket select task so that it redoes the
+// select with the new open socket set.
+
+STATIC bool register_open_socket(mp_obj_t obj) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
+        if (!open_socket_objs[i]) {
+            open_socket_objs[i] = obj;
+            user_socket[i] = false;
+            return true;
+        }
+    }
+    return false;
+}
+
+STATIC void unregister_open_socket(mp_obj_t obj) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
+        if (open_socket_objs[i] == obj) {
+            open_socket_objs[i] = NULL;
+            user_socket[i] = false;
+        }
+    }
+}
+
+STATIC void mark_user_socket(mp_obj_t obj) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
+        if (open_socket_objs[i] == obj) {
+            user_socket[i] = true;
+            return;
+        }
+    }
+}
+
+bool socketpool_socket(socketpool_socketpool_obj_t *self,
+    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
+    socketpool_socket_obj_t *sock) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
+    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
+    uint8_t *ip, uint32_t *port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
+    const char *host, size_t hostlen, uint32_t port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void socketpool_socket_close(socketpool_socket_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
+    const char *host, size_t hostlen, uint32_t port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *self,
+    uint8_t *buf, uint32_t len, uint8_t *ip, uint32_t *port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
+    const uint8_t *buf, uint32_t len) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
+    const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms) {
+    mp_raise_NotImplementedError(NULL);
+}
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.h b/ports/raspberrypi/common-hal/socketpool/Socket.h
new file mode 100644
index 0000000000..f582b77a9b
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.h
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2019 Damien P. George
+ * Copyright (c) 2015 Galen Hazelwood
+ * Copyright (c) 2015-2017 Paul Sokolovsky
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "common-hal/socketpool/SocketPool.h"
+
+typedef struct _lwip_socket_obj_t {
+    mp_obj_base_t base;
+
+    volatile union {
+        struct tcp_pcb *tcp;
+        struct udp_pcb *udp;
+        struct raw_pcb *raw;
+    } pcb;
+    volatile union {
+        struct pbuf *pbuf;
+        struct {
+            uint8_t alloc;
+            uint8_t iget;
+            uint8_t iput;
+            union {
+                struct tcp_pcb *item; // if alloc == 0
+                struct tcp_pcb **array; // if alloc != 0
+            } tcp;
+        } connection;
+    } incoming;
+    mp_obj_t callback;
+    byte peer[4];
+    mp_uint_t peer_port;
+    mp_uint_t timeout;
+    uint16_t recv_offset;
+
+    uint8_t domain;
+    uint8_t type;
+
+    #define STATE_NEW 0
+    #define STATE_LISTENING 1
+    #define STATE_CONNECTING 2
+    #define STATE_CONNECTED 3
+    #define STATE_PEER_CLOSED 4
+    #define STATE_ACTIVE_UDP 5
+    // Negative value is lwIP error
+    int8_t state;
+
+    socketpool_socketpool_obj_t *pool;
+} socketpool_socket_obj_t;
+
+void socket_user_reset(void);
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
new file mode 100644
index 0000000000..723b753064
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
@@ -0,0 +1,97 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/socketpool/SocketPool.h"
+#include "common-hal/socketpool/Socket.h"
+#include "shared/runtime/interrupt_char.h"
+#include "py/runtime.h"
+#include "shared-bindings/wifi/__init__.h"
+
+#include "lwip/dns.h"
+#include "lwip/inet.h"
+
+void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *self, mp_obj_t radio) {
+    if (radio != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) {
+        mp_raise_ValueError(translate("SocketPool can only be used with wifi.radio"));
+    }
+}
+
+// common_hal_socketpool_socket is in socketpool/Socket.c to centralize open socket tracking.
+
+typedef struct _getaddrinfo_state_t {
+    volatile int status;
+    volatile ip_addr_t ipaddr;
+} getaddrinfo_state_t;
+
+STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void *arg) {
+    getaddrinfo_state_t *state = arg;
+    if (ipaddr != NULL) {
+        state->status = 1;
+        state->ipaddr = *ipaddr;
+    } else {
+        // error
+        state->status = -2;
+    }
+}
+
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
+    const char *host) {
+
+    getaddrinfo_state_t state;
+    state.status = 0;
+
+    MICROPY_PY_LWIP_ENTER
+    err_t ret = dns_gethostbyname(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state);
+    MICROPY_PY_LWIP_EXIT
+
+    switch (ret) {
+        case ERR_OK:
+            // cached
+            state.status = 1;
+            break;
+        case ERR_INPROGRESS:
+            while (state.status == 0) {
+                RUN_BACKGROUND_TASKS;
+                if (mp_hal_is_interrupted()) {
+                    break;
+                }
+            }
+            break;
+        default:
+            state.status = ret;
+    }
+
+    if (state.status < 0) {
+        // TODO: CPython raises gaierror, we raise with native lwIP negative error
+        // values, to differentiate from normal errno's at least in such way.
+        mp_raise_OSError(state.status);
+    }
+
+    char ip_str[IP4ADDR_STRLEN_MAX];
+    inet_ntoa_r(state.ipaddr, ip_str, IP4ADDR_STRLEN_MAX);
+    mp_obj_t ip_obj = mp_obj_new_str(ip_str, strlen(ip_str));
+    return ip_obj;
+}
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.h b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
new file mode 100644
index 0000000000..ea0679b5eb
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+} socketpool_socketpool_obj_t;
diff --git a/ports/raspberrypi/common-hal/socketpool/__init__.c b/ports/raspberrypi/common-hal/socketpool/__init__.c
new file mode 100644
index 0000000000..595977d24f
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/__init__.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/socketpool/__init__.h"
+
+#include "common-hal/socketpool/Socket.h"
+
+void socketpool_user_reset(void) {
+    socket_user_reset();
+}
diff --git a/ports/raspberrypi/common-hal/socketpool/__init__.h b/ports/raspberrypi/common-hal/socketpool/__init__.h
new file mode 100644
index 0000000000..32f1fe1dcb
--- /dev/null
+++ b/ports/raspberrypi/common-hal/socketpool/__init__.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index f614d3185f..7d9dcbee23 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -271,17 +271,17 @@ mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address,
     ipaddress_ipaddress_to_lwip(ip_address, &ping_addr);
 
     struct raw_pcb *ping_pcb;
-    MICROPY_PY_LWIP_ENTER();
-    ping_pcb = raw_new(IP_PROTO_ICMP);
+    MICROPY_PY_LWIP_ENTER
+        ping_pcb = raw_new(IP_PROTO_ICMP);
     if (!ping_pcb) {
-        MICROPY_PY_LWIP_EXIT();
+        MICROPY_PY_LWIP_EXIT
         return -1;
     }
     raw_recv(ping_pcb, ping_recv, NULL);
     raw_bind(ping_pcb, IP_ADDR_ANY);
-    MICROPY_PY_LWIP_EXIT();
+    MICROPY_PY_LWIP_EXIT
 
-    ping_received = false;
+        ping_received = false;
     ping_send(ping_pcb, &ping_addr);
     size_t timeout_ms = (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
     uint64_t start = port_get_raw_ticks(NULL);
@@ -298,9 +298,9 @@ mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address,
         result = now - start;
     }
 
-    MICROPY_PY_LWIP_ENTER();
+    MICROPY_PY_LWIP_ENTER;
     raw_remove(ping_pcb);
-    MICROPY_PY_LWIP_EXIT();
+    MICROPY_PY_LWIP_EXIT;
 
     return result;
 }
diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 993e675d6b..ac4dd1564b 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -89,4 +89,6 @@
 
 #define LWIP_TIMEVAL_PRIVATE 0
 
+#define LWIP_NO_CTYPE_H 1
+
 #endif /* __LWIPOPTS_H__ */
diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h
index 9bc97f6a78..7f2b75a81b 100644
--- a/ports/raspberrypi/mpconfigport.h
+++ b/ports/raspberrypi/mpconfigport.h
@@ -51,10 +51,9 @@
 
 #if CIRCUITPY_CYW43
 #include "pico/cyw43_arch.h"
-#undef _L // interferes with ulab, indirectly defined in ctype.h, is ulab bug to use identifier _L
-#define MICROPY_PY_LWIP_ENTER   cyw43_arch_lwip_begin
+#define MICROPY_PY_LWIP_ENTER   cyw43_arch_lwip_begin();
 #define MICROPY_PY_LWIP_REENTER MICROPY_PY_LWIP_ENTER
-#define MICROPY_PY_LWIP_EXIT    cyw43_arch_lwip_end
+#define MICROPY_PY_LWIP_EXIT    cyw43_arch_lwip_end();
 #endif
 
 #endif  // __INCLUDED_MPCONFIGPORT_H
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 716ff673ee..304ba22e33 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -184,7 +184,7 @@ STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_
     mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_WRITE);
 
     byte ip[4];
-    mp_uint_t port;
+    uint32_t port;
     mp_int_t ret = common_hal_socketpool_socket_recvfrom_into(self,
         (byte *)bufinfo.buf, bufinfo.len, ip, &port);
     mp_obj_t tuple_contents[2];

From ff7731491e420781712822d10befe95e0c0fb9ca Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 21 Sep 2022 15:11:52 -0500
Subject: [PATCH 1048/2403] Implement enough of socketpool to do ntp and
 non-https requests

---
 .gitmodules                                   |   6 +
 ports/raspberrypi/Makefile                    |  41 +-
 .../common-hal/socketpool/Socket.c            | 912 +++++++++++++++++-
 .../common-hal/socketpool/SocketPool.c        |  19 +-
 .../common-hal/socketpool/SocketPool.h        |   2 +
 ports/raspberrypi/lib/cyw43-driver            |   1 +
 ports/raspberrypi/lib/lwip                    |   1 +
 ports/raspberrypi/pioasm/CMakeLists.txt       |   8 +
 shared-bindings/digitalio/DigitalInOut.c      |  10 +-
 9 files changed, 937 insertions(+), 63 deletions(-)
 create mode 160000 ports/raspberrypi/lib/cyw43-driver
 create mode 160000 ports/raspberrypi/lib/lwip
 create mode 100644 ports/raspberrypi/pioasm/CMakeLists.txt

diff --git a/.gitmodules b/.gitmodules
index e0d0a262ca..875b03dab8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -310,3 +310,9 @@
 [submodule "ports/espressif/esp32-camera"]
 	path = ports/espressif/esp32-camera
 	url = https://github.com/adafruit/esp32-camera/
+[submodule "ports/raspberrypi/lib/cyw43-driver"]
+	path = ports/raspberrypi/lib/cyw43-driver
+	url = https://github.com/georgerobotics/cyw43-driver.git
+[submodule "ports/raspberrypi/lib/lwip"]
+	path = ports/raspberrypi/lib/lwip
+	url = https://github.com/lwip-tcpip/lwip.git
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 28659e9cb2..cf3967fee4 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -59,18 +59,14 @@ HAL_DIR=hal/$(MCU_SERIES)
 
 ifeq ($(CIRCUITPY_CYW43),1)
 INC_CYW43 := \
-	-isystem sdk/lib/cyw43-driver/firmware \
-	-isystem sdk/lib/cyw43-driver/src \
-	-isystem sdk/lib/lwip/src/include \
+	-isystem lib/cyw43-driver/firmware \
+	-isystem lib/cyw43-driver/src \
+	-isystem lib/lwip/src/include \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25
+CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DCYW43_LOGIC_DEBUG=0
 SRC_SDK_CYW43 := \
-	lib/cyw43-driver/src/cyw43_ctrl.c \
-	lib/cyw43-driver/src/cyw43_ll.c \
-	lib/cyw43-driver/src/cyw43_lwip.c \
-	lib/cyw43-driver/src/cyw43_stats.c \
 	src/common/pico_sync/sem.c \
 	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
@@ -80,19 +76,24 @@ SRC_SDK_CYW43 := \
 
 SRC_LWIP := \
 	shared/netutils/netutils.c \
-	$(wildcard sdk/lib/lwip/src/core/*.c) \
-	$(wildcard sdk/lib/lwip/src/core/ipv4/*.c) \
-	sdk/lib/lwip/src/netif/ethernet.c \
+	$(wildcard lib/lwip/src/core/*.c) \
+	$(wildcard lib/lwip/src/core/ipv4/*.c) \
+	lib/lwip/src/netif/ethernet.c \
 	$(wildcard lwip_src/*.c) \
 
-SRC_CYW43 := $(wildcard bindings/cyw43/*.c)
+SRC_CYW43 := \
+	$(wildcard bindings/cyw43/*.c) \
+	lib/cyw43-driver/src/cyw43_stats.c \
+	lib/cyw43-driver/src/cyw43_ctrl.c \
+	lib/cyw43-driver/src/cyw43_ll.c \
+	lib/cyw43-driver/src/cyw43_lwip.c \
 
-PIOASM = $(BUILD)/sdk/pioasm/pioasm
+PIOASM = $(BUILD)/pioasm/pioasm/pioasm
 .PHONY: PioasmBuild
 PioasmBuild: $(PIOASM)
 $(PIOASM):
-	$(Q)cmake -S sdk -B $(BUILD)/sdk
-	$(Q)make -C $(BUILD)/sdk PioasmBuild
+	$(Q)cmake -S pioasm -B $(BUILD)/pioasm
+	$(Q)$(MAKE) -C $(BUILD)/pioasm PioasmBuild
 
 $(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
 	$(Q)$(PIOASM) -o c-sdk $< $@
@@ -100,13 +101,13 @@ $(BUILD)/sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus
 
 CYW43_FIRMWARE_BIN = 43439A0-7.95.49.00.combined
 
-$(BUILD)/cyw43_resource.o: sdk/lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
+$(BUILD)/cyw43_resource.o: lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
 	$(Q)$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
 		--readonly-text \
 		--rename-section .data=.big_const,contents,alloc,load,readonly,data \
-		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start=fw_43439A0_7_95_49_00_start \
-		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size=fw_43439A0_7_95_49_00_size \
-		--redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
+		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start=fw_43439A0_7_95_49_00_start \
+		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size=fw_43439A0_7_95_49_00_size \
+		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
 		$< $@
 OBJ_CYW43 := $(BUILD)/cyw43_resource.o
 # need to do the equivalent of this in cmake
@@ -270,7 +271,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes -Wno-undef
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef
 
 SRC_C += \
 	boards/$(BOARD)/board.c \
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index a1b77533a2..05c8212d69 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -3,7 +3,11 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2013-2019 Damien P. George
+ * Copyright (c) 2015 Galen Hazelwood
+ * Copyright (c) 2015-2017 Paul Sokolovsky
  * Copyright (c) 2020 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,27 +30,582 @@
 
 #include "shared-bindings/socketpool/Socket.h"
 
-#include "shared/runtime/interrupt_char.h"
+#include "py/gc.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "shared-bindings/socketpool/SocketPool.h"
+#include "shared/runtime/interrupt_char.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/workflow.h"
 
+#include "lwip/dns.h"
 #include "lwip/err.h"
-#include "lwip/sys.h"
+#include "lwip/igmp.h"
+#include "lwip/init.h"
 #include "lwip/netdb.h"
+#include "lwip/priv/tcp_priv.h"
+#include "lwip/raw.h"
+#include "lwip/sys.h"
+#include "lwip/tcp.h"
+#include "lwip/timeouts.h"
+#include "lwip/udp.h"
+
+#define MICROPY_PY_LWIP_SOCK_RAW (1)
+
+#if 0 // print debugging info
+#define DEBUG_printf DEBUG_printf
+#else // don't print debugging info
+#define DEBUG_printf(...) (void)0
+#endif
+
+// Timeout between closing a TCP socket and doing a tcp_abort on that
+// socket, if the connection isn't closed cleanly in that time.
+#define MICROPY_PY_LWIP_TCP_CLOSE_TIMEOUT_MS (10000)
+
+// All socket options should be globally distinct,
+// because we ignore option levels for efficiency.
+#define IP_ADD_MEMBERSHIP 0x400
+#define IP_DROP_MEMBERSHIP 0x401
+
+/******************************************************************************/
+// Table to convert lwIP err_t codes to socket errno codes, from the lwIP
+// socket API.
+
+// Extension to lwIP error codes
+// Matches lwIP 2.0.3
+#undef _ERR_BADF
+#define _ERR_BADF -17
+static const int error_lookup_table[] = {
+    0,                /* ERR_OK          0      No error, everything OK  */
+    MP_ENOMEM,        /* ERR_MEM        -1      Out of memory error      */
+    MP_ENOBUFS,       /* ERR_BUF        -2      Buffer error             */
+    MP_EWOULDBLOCK,   /* ERR_TIMEOUT    -3      Timeout                  */
+    MP_EHOSTUNREACH,  /* ERR_RTE        -4      Routing problem          */
+    MP_EINPROGRESS,   /* ERR_INPROGRESS -5      Operation in progress    */
+    MP_EINVAL,        /* ERR_VAL        -6      Illegal value            */
+    MP_EWOULDBLOCK,   /* ERR_WOULDBLOCK -7      Operation would block    */
+    MP_EADDRINUSE,    /* ERR_USE        -8      Address in use           */
+    MP_EALREADY,      /* ERR_ALREADY    -9      Already connecting       */
+    MP_EALREADY,      /* ERR_ISCONN     -10     Conn already established */
+    MP_ENOTCONN,      /* ERR_CONN       -11     Not connected            */
+    -1,               /* ERR_IF         -12     Low-level netif error    */
+    MP_ECONNABORTED,  /* ERR_ABRT       -13     Connection aborted       */
+    MP_ECONNRESET,    /* ERR_RST        -14     Connection reset         */
+    MP_ENOTCONN,      /* ERR_CLSD       -15     Connection closed        */
+    MP_EIO,           /* ERR_ARG        -16     Illegal argument.        */
+    MP_EBADF,         /* _ERR_BADF      -17     Closed socket (null pcb) */
+};
+
+/*******************************************************************************/
+// The socket object provided by lwip.socket.
+
+#define MOD_NETWORK_AF_INET (SOCKETPOOL_AF_INET)
+#define MOD_NETWORK_AF_INET6 (SOCKETPOOL_AF_INET6)
+
+#define MOD_NETWORK_SOCK_STREAM (SOCKETPOOL_SOCK_STREAM)
+#define MOD_NETWORK_SOCK_DGRAM (SOCKETPOOL_SOCK_DGRAM)
+#define MOD_NETWORK_SOCK_RAW (SOCKETPOOL_SOCK_RAW)
 
 #define MAX_SOCKETS (8)
 
-STATIC mp_obj_t open_socket_objs[MAX_SOCKETS];
+static inline void poll_sockets(void) {
+    #ifdef MICROPY_EVENT_POLL_HOOK
+    MICROPY_EVENT_POLL_HOOK;
+    #else
+    mp_hal_delay_ms(1);
+    #endif
+}
+
+STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(socketpool_socket_obj_t *socket) {
+    if (socket->incoming.connection.alloc == 0) {
+        return &socket->incoming.connection.tcp.item;
+    } else {
+        return &socket->incoming.connection.tcp.array[0];
+    }
+}
+
+STATIC void lwip_socket_free_incoming(socketpool_socket_obj_t *socket) {
+    bool socket_is_listener =
+        socket->type == MOD_NETWORK_SOCK_STREAM
+        && socket->pcb.tcp->state == LISTEN;
+
+    if (!socket_is_listener) {
+        if (socket->incoming.pbuf != NULL) {
+            pbuf_free(socket->incoming.pbuf);
+            socket->incoming.pbuf = NULL;
+        }
+    } else {
+        uint8_t alloc = socket->incoming.connection.alloc;
+        struct tcp_pcb *volatile *tcp_array = lwip_socket_incoming_array(socket);
+        for (uint8_t i = 0; i < alloc; ++i) {
+            // Deregister callback and abort
+            if (tcp_array[i] != NULL) {
+                tcp_poll(tcp_array[i], NULL, 0);
+                tcp_abort(tcp_array[i]);
+                tcp_array[i] = NULL;
+            }
+        }
+    }
+}
+
+/*******************************************************************************/
+// Callback functions for the lwIP raw API.
+
+static inline void exec_user_callback(socketpool_socket_obj_t *socket) {
+    #if 0
+    if (socket->callback != MP_OBJ_NULL) {
+        // Schedule the user callback to execute outside the lwIP context
+        mp_sched_schedule(socket->callback, MP_OBJ_FROM_PTR(socket));
+    }
+    #endif
+}
+
+#if MICROPY_PY_LWIP_SOCK_RAW
+// Callback for incoming raw packets.
+#if LWIP_VERSION_MAJOR < 2
+STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *addr)
+#else
+STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
+#endif
+{
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+
+    if (socket->incoming.pbuf != NULL) {
+        pbuf_free(p);
+    } else {
+        socket->incoming.pbuf = p;
+        memcpy(&socket->peer, addr, sizeof(socket->peer));
+    }
+    return 1; // we ate the packet
+}
+#endif
+
+// Callback for incoming UDP packets. We simply stash the packet and the source address,
+// in case we need it for recvfrom.
+#if LWIP_VERSION_MAJOR < 2
+STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
+#else
+STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
+#endif
+{
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+
+    if (socket->incoming.pbuf != NULL) {
+        // That's why they call it "unreliable". No room in the inn, drop the packet.
+        pbuf_free(p);
+    } else {
+        socket->incoming.pbuf = p;
+        socket->peer_port = (mp_uint_t)port;
+        memcpy(&socket->peer, addr, sizeof(socket->peer));
+    }
+}
+
+// Callback for general tcp errors.
+STATIC void _lwip_tcp_error(void *arg, err_t err) {
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+
+    // Free any incoming buffers or connections that are stored
+    lwip_socket_free_incoming(socket);
+    // Pass the error code back via the connection variable.
+    socket->state = err;
+    // If we got here, the lwIP stack either has deallocated or will deallocate the pcb.
+    socket->pcb.tcp = NULL;
+}
+
+// Callback for tcp connection requests. Error code err is unused. (See tcp.h)
+STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+
+    socket->state = STATE_CONNECTED;
+    return ERR_OK;
+}
+
+// Handle errors (eg connection aborted) on TCP PCBs that have been put on the
+// accept queue but are not yet actually accepted.
+STATIC void _lwip_tcp_err_unaccepted(void *arg, err_t err) {
+    struct tcp_pcb *pcb = (struct tcp_pcb *)arg;
+
+    // The ->connected entry is repurposed to store the parent socket; this is safe
+    // because it's only ever used by lwIP if tcp_connect is called on the TCP PCB.
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)pcb->connected;
+
+    // Array is not volatile because thiss callback is executed within the lwIP context
+    uint8_t alloc = socket->incoming.connection.alloc;
+    struct tcp_pcb **tcp_array = (struct tcp_pcb **)lwip_socket_incoming_array(socket);
+
+    // Search for PCB on the accept queue of the parent socket
+    struct tcp_pcb **shift_down = NULL;
+    uint8_t i = socket->incoming.connection.iget;
+    do {
+        if (shift_down == NULL) {
+            if (tcp_array[i] == pcb) {
+                shift_down = &tcp_array[i];
+            }
+        } else {
+            *shift_down = tcp_array[i];
+            shift_down = &tcp_array[i];
+        }
+        if (++i >= alloc) {
+            i = 0;
+        }
+    } while (i != socket->incoming.connection.iput);
+
+    // PCB found in queue, remove it
+    if (shift_down != NULL) {
+        *shift_down = NULL;
+        socket->incoming.connection.iput = shift_down - tcp_array;
+    }
+}
+
+// By default, a child socket of listen socket is created with recv
+// handler which discards incoming pbuf's. We don't want to do that,
+// so set this handler which requests lwIP to keep pbuf's and deliver
+// them later. We cannot cache pbufs in child socket on Python side,
+// until it is created in accept().
+STATIC err_t _lwip_tcp_recv_unaccepted(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) {
+    return ERR_BUF;
+}
+
+// Callback for incoming tcp connections.
+STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
+    // err can be ERR_MEM to notify us that there was no memory for an incoming connection
+    if (err != ERR_OK) {
+        return ERR_OK;
+    }
+
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+    tcp_recv(newpcb, _lwip_tcp_recv_unaccepted);
+
+    // Search for an empty slot to store the new connection
+    struct tcp_pcb *volatile *slot = &lwip_socket_incoming_array(socket)[socket->incoming.connection.iput];
+    if (*slot == NULL) {
+        // Have an empty slot to store waiting connection
+        *slot = newpcb;
+        if (++socket->incoming.connection.iput >= socket->incoming.connection.alloc) {
+            socket->incoming.connection.iput = 0;
+        }
+
+        // Schedule user accept callback
+        exec_user_callback(socket);
+
+        // Set the error callback to handle the case of a dropped connection before we
+        // have a chance to take it off the accept queue.
+        // The ->connected entry is repurposed to store the parent socket; this is safe
+        // because it's only ever used by lwIP if tcp_connect is called on the TCP PCB.
+        newpcb->connected = (void *)socket;
+        tcp_arg(newpcb, newpcb);
+        tcp_err(newpcb, _lwip_tcp_err_unaccepted);
+
+        return ERR_OK;
+    }
+
+    DEBUG_printf("_lwip_tcp_accept: No room to queue pcb waiting for accept\n");
+    return ERR_BUF;
+}
+
+// Callback for inbound tcp packets.
+STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) {
+    socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg;
+
+    if (p == NULL) {
+        // Other side has closed connection.
+        DEBUG_printf("_lwip_tcp_recv[%p]: other side closed connection\n", socket);
+        socket->state = STATE_PEER_CLOSED;
+        exec_user_callback(socket);
+        return ERR_OK;
+    }
+
+    if (socket->incoming.pbuf == NULL) {
+        socket->incoming.pbuf = p;
+    } else {
+        #ifdef SOCKET_SINGLE_PBUF
+        return ERR_BUF;
+        #else
+        pbuf_cat(socket->incoming.pbuf, p);
+        #endif
+    }
+
+    exec_user_callback(socket);
+
+    return ERR_OK;
+}
+
+/*******************************************************************************/
+// Functions for socket send/receive operations. Socket send/recv and friends call
+// these to do the work.
+
+// Helper function for send/sendto to handle raw/UDP packets.
+STATIC mp_uint_t lwip_raw_udp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *dest, uint32_t port, int *_errno) {
+    if (len > 0xffff) {
+        // Any packet that big is probably going to fail the pbuf_alloc anyway, but may as well try
+        len = 0xffff;
+    }
+
+    MICROPY_PY_LWIP_ENTER
+
+    // FIXME: maybe PBUF_ROM?
+    struct pbuf *p = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM);
+    if (p == NULL) {
+        MICROPY_PY_LWIP_EXIT
+        *_errno = MP_ENOMEM;
+        return -1;
+    }
+
+    memcpy(p->payload, buf, len);
+
+    err_t err;
+    if (dest == NULL) {
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        if (socket->type == MOD_NETWORK_SOCK_RAW) {
+            err = raw_send(socket->pcb.raw, p);
+        } else
+        #endif
+        {
+            err = udp_send(socket->pcb.udp, p);
+        }
+    } else {
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        if (socket->type == MOD_NETWORK_SOCK_RAW) {
+            err = raw_sendto(socket->pcb.raw, p, dest);
+        } else
+        #endif
+        {
+            err = udp_sendto(socket->pcb.udp, p, dest, port);
+        }
+    }
+
+    pbuf_free(p);
+
+    MICROPY_PY_LWIP_EXIT
+
+    // udp_sendto can return 1 on occasion for ESP8266 port.  It's not known why
+    // but it seems that the send actually goes through without error in this case.
+    // So we treat such cases as a success until further investigation.
+    if (err != ERR_OK && err != 1) {
+        *_errno = error_lookup_table[-err];
+        return -1;
+    }
+
+    return len;
+}
+
+// Helper function for recv/recvfrom to handle raw/UDP packets
+STATIC mp_uint_t lwip_raw_udp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, uint32_t *port, int *_errno) {
+
+    if (socket->incoming.pbuf == NULL) {
+        if (socket->timeout == 0) {
+            // Non-blocking socket.
+            *_errno = MP_EAGAIN;
+            return -1;
+        }
+
+        // Wait for data to arrive on UDP socket.
+        mp_uint_t start = mp_hal_ticks_ms();
+        while (socket->incoming.pbuf == NULL) {
+            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+                *_errno = MP_ETIMEDOUT;
+                return -1;
+            }
+            poll_sockets();
+        }
+    }
+
+    if (ip != NULL) {
+        memcpy(ip, &socket->peer, sizeof(socket->peer));
+        *port = socket->peer_port;
+    }
+
+    struct pbuf *p = socket->incoming.pbuf;
+
+    MICROPY_PY_LWIP_ENTER
+
+    u16_t result = pbuf_copy_partial(p, buf, ((p->tot_len > len) ? len : p->tot_len), 0);
+    pbuf_free(p);
+    socket->incoming.pbuf = NULL;
+
+    MICROPY_PY_LWIP_EXIT
+
+    return (mp_uint_t)result;
+}
+
+// For use in stream virtual methods
+#define STREAM_ERROR_CHECK(socket) \
+    if (socket->state < 0) { \
+        *_errno = error_lookup_table[-socket->state]; \
+        return MP_STREAM_ERROR; \
+    } \
+    assert(socket->pcb.tcp);
+
+// Version of above for use when lock is held
+#define STREAM_ERROR_CHECK_WITH_LOCK(socket) \
+    if (socket->state < 0) { \
+        *_errno = error_lookup_table[-socket->state]; \
+        MICROPY_PY_LWIP_EXIT \
+        return MP_STREAM_ERROR; \
+    } \
+    assert(socket->pcb.tcp);
+
+
+// Helper function for send/sendto to handle TCP packets
+STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
+    // Check for any pending errors
+    STREAM_ERROR_CHECK(socket);
+
+    MICROPY_PY_LWIP_ENTER
+
+    u16_t available = tcp_sndbuf(socket->pcb.tcp);
+
+    if (available == 0) {
+        // Non-blocking socket
+        if (socket->timeout == 0) {
+            MICROPY_PY_LWIP_EXIT
+            *_errno = MP_EAGAIN;
+            return MP_STREAM_ERROR;
+        }
+
+        mp_uint_t start = mp_hal_ticks_ms();
+        // Assume that STATE_PEER_CLOSED may mean half-closed connection, where peer closed it
+        // sending direction, but not receiving. Consequently, check for both STATE_CONNECTED
+        // and STATE_PEER_CLOSED as normal conditions and still waiting for buffers to be sent.
+        // If peer fully closed socket, we would have socket->state set to ERR_RST (connection
+        // reset) by error callback.
+        // Avoid sending too small packets, so wait until at least 16 bytes available
+        while (socket->state >= STATE_CONNECTED && (available = tcp_sndbuf(socket->pcb.tcp)) < 16) {
+            MICROPY_PY_LWIP_EXIT
+            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+                *_errno = MP_ETIMEDOUT;
+                return MP_STREAM_ERROR;
+            }
+            poll_sockets();
+            MICROPY_PY_LWIP_REENTER
+        }
+
+        // While we waited, something could happen
+        STREAM_ERROR_CHECK_WITH_LOCK(socket);
+    }
+
+    u16_t write_len = MIN(available, len);
+
+    // If tcp_write returns ERR_MEM then there's currently not enough memory to
+    // queue the write, so wait and keep trying until it succeeds (with 10s limit).
+    // Note: if the socket is non-blocking then this code will actually block until
+    // there's enough memory to do the write, but by this stage we have already
+    // committed to being able to write the data.
+    err_t err;
+    for (int i = 0; i < 200; ++i) {
+        err = tcp_write(socket->pcb.tcp, buf, write_len, TCP_WRITE_FLAG_COPY);
+        if (err != ERR_MEM) {
+            break;
+        }
+        err = tcp_output(socket->pcb.tcp);
+        if (err != ERR_OK) {
+            break;
+        }
+        MICROPY_PY_LWIP_EXIT
+        mp_hal_delay_ms(50);
+        MICROPY_PY_LWIP_REENTER
+    }
+
+    // If the output buffer is getting full then send the data to the lower layers
+    if (err == ERR_OK && tcp_sndbuf(socket->pcb.tcp) < TCP_SND_BUF / 4) {
+        err = tcp_output(socket->pcb.tcp);
+    }
+
+    MICROPY_PY_LWIP_EXIT
+
+    if (err != ERR_OK) {
+        *_errno = error_lookup_table[-err];
+        return MP_STREAM_ERROR;
+    }
+
+    return write_len;
+}
+
+// Helper function for recv/recvfrom to handle TCP packets
+STATIC mp_uint_t lwip_tcp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+    // Check for any pending errors
+    STREAM_ERROR_CHECK(socket);
+
+    if (socket->incoming.pbuf == NULL) {
+
+        // Non-blocking socket
+        if (socket->timeout == 0) {
+            if (socket->state == STATE_PEER_CLOSED) {
+                return 0;
+            }
+            *_errno = MP_EAGAIN;
+            return -1;
+        }
+
+        mp_uint_t start = mp_hal_ticks_ms();
+        while (socket->state == STATE_CONNECTED && socket->incoming.pbuf == NULL) {
+            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+                *_errno = MP_ETIMEDOUT;
+                return -1;
+            }
+            poll_sockets();
+        }
+
+        if (socket->state == STATE_PEER_CLOSED) {
+            if (socket->incoming.pbuf == NULL) {
+                // socket closed and no data left in buffer
+                return 0;
+            }
+        } else if (socket->state != STATE_CONNECTED) {
+            if (socket->state >= STATE_NEW) {
+                *_errno = MP_ENOTCONN;
+            } else {
+                *_errno = error_lookup_table[-socket->state];
+            }
+            return -1;
+        }
+    }
+
+    MICROPY_PY_LWIP_ENTER
+
+    assert(socket->pcb.tcp != NULL);
+
+    struct pbuf *p = socket->incoming.pbuf;
+
+    mp_uint_t remaining = p->len - socket->recv_offset;
+    if (len > remaining) {
+        len = remaining;
+    }
+
+    memcpy(buf, (byte *)p->payload + socket->recv_offset, len);
+
+    remaining -= len;
+    if (remaining == 0) {
+        socket->incoming.pbuf = p->next;
+        // If we don't ref here, free() will free the entire chain,
+        // if we ref, it does what we need: frees 1st buf, and decrements
+        // next buf's refcount back to 1.
+        pbuf_ref(p->next);
+        pbuf_free(p);
+        socket->recv_offset = 0;
+    } else {
+        socket->recv_offset += len;
+    }
+    tcp_recved(socket->pcb.tcp, len);
+
+    MICROPY_PY_LWIP_EXIT
+
+    return len;
+}
+
+
+STATIC socketpool_socket_obj_t *open_socket_objs[MAX_SOCKETS];
 STATIC bool user_socket[MAX_SOCKETS];
 
 void socket_user_reset(void) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
         if (open_socket_objs[i] && user_socket[i]) {
-            // shut 'er down
+            socketpool_socket_close(open_socket_objs[i]);
+            open_socket_objs[i] = NULL;
+            user_socket[i] = false;
         }
     }
 }
@@ -54,48 +613,131 @@ void socket_user_reset(void) {
 // The writes below send an event to the socket select task so that it redoes the
 // select with the new open socket set.
 
-STATIC bool register_open_socket(mp_obj_t obj) {
+STATIC bool register_open_socket(socketpool_socket_obj_t *obj) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
         if (!open_socket_objs[i]) {
             open_socket_objs[i] = obj;
+            DEBUG_printf("register_open_socket(%p) -> %d\n", obj, i);
             user_socket[i] = false;
             return true;
         }
     }
+    DEBUG_printf("register_open_socket(%p) fails due to full table\n", obj);
     return false;
 }
 
-STATIC void unregister_open_socket(mp_obj_t obj) {
+STATIC void unregister_open_socket(socketpool_socket_obj_t *obj) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
         if (open_socket_objs[i] == obj) {
+            DEBUG_printf("unregister_open_socket(%p) clears %d\n", obj, i);
             open_socket_objs[i] = NULL;
             user_socket[i] = false;
+            return;
         }
     }
+    DEBUG_printf("unregister_open_socket(%p) fails due to missing entry\n", obj);
 }
 
-STATIC void mark_user_socket(mp_obj_t obj) {
+STATIC void mark_user_socket(socketpool_socket_obj_t *obj) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) {
         if (open_socket_objs[i] == obj) {
+            DEBUG_printf("mark_user_socket(%p) -> %d\n", obj, i);
             user_socket[i] = true;
             return;
         }
     }
+    DEBUG_printf("mark_user_socket(%p) fails due to missing entry\n", obj);
 }
 
 bool socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
-    socketpool_socket_obj_t *sock) {
-    mp_raise_NotImplementedError(NULL);
+    socketpool_socket_obj_t *socket) {
+
+    if (!register_open_socket(socket)) {
+        DEBUG_printf("collecting garbage to open socket\n");
+        gc_collect();
+        if (!register_open_socket(socket)) {
+            return false;
+        }
+    }
+
+    socket->timeout = -1;
+    socket->recv_offset = 0;
+    socket->domain = SOCKETPOOL_AF_INET;
+    socket->type = type;
+    socket->callback = MP_OBJ_NULL;
+    socket->state = STATE_NEW;
+
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM:
+            socket->pcb.tcp = tcp_new();
+            socket->incoming.connection.alloc = 0;
+            socket->incoming.connection.tcp.item = NULL;
+            break;
+        case SOCKETPOOL_SOCK_DGRAM:
+            socket->pcb.udp = udp_new();
+            socket->incoming.pbuf = NULL;
+            break;
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW: {
+            socket->pcb.raw = raw_new(0);
+            break;
+        }
+        #endif
+        default:
+            return false;
+    }
+
+    if (socket->pcb.tcp == NULL) {
+        return false;
+    }
+
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM: {
+            // Register the socket object as our callback argument.
+            tcp_arg(socket->pcb.tcp, (void *)socket);
+            // Register our error callback.
+            tcp_err(socket->pcb.tcp, _lwip_tcp_error);
+            break;
+        }
+        case MOD_NETWORK_SOCK_DGRAM: {
+            socket->state = STATE_ACTIVE_UDP;
+            // Register our receive callback now. Since UDP sockets don't require binding or connection
+            // before use, there's no other good time to do it.
+            udp_recv(socket->pcb.udp, _lwip_udp_incoming, (void *)socket);
+            break;
+        }
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case MOD_NETWORK_SOCK_RAW: {
+            // Register our receive callback now. Since raw sockets don't require binding or connection
+            // before use, there's no other good time to do it.
+            raw_recv(socket->pcb.raw, _lwip_raw_incoming, (void *)socket);
+            break;
+        }
+        #endif
+    }
+    return true;
 }
 
 socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type) {
-    mp_raise_NotImplementedError(NULL);
+    if (family != SOCKETPOOL_AF_INET) {
+        mp_raise_NotImplementedError(translate("Only IPv4 sockets supported"));
+    }
+
+    // we must allocate sockets long-lived because we depend on their object-identity
+    socketpool_socket_obj_t *socket = m_new_ll_obj_with_finaliser(socketpool_socket_obj_t);
+    socket->base.type = &socketpool_socket_type;
+
+    if (!socketpool_socket(self, family, type, socket)) {
+        mp_raise_RuntimeError(translate("Out of sockets"));
+    }
+    mark_user_socket(socket);
+    return socket;
 }
 
 int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
-    mp_raise_NotImplementedError(NULL);
+    return -MP_EBADF;
 }
 
 socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
@@ -108,58 +750,264 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
     mp_raise_NotImplementedError(NULL);
 }
 
-void socketpool_socket_close(socketpool_socket_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+STATIC err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) {
+    // Connection has not been cleanly closed so just abort it to free up memory
+    tcp_poll(pcb, NULL, 0);
+    tcp_abort(pcb);
+    return ERR_OK;
 }
 
-void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+void socketpool_socket_close(socketpool_socket_obj_t *socket) {
+    unregister_open_socket(socket);
+    MICROPY_PY_LWIP_ENTER
+    if (socket->pcb.tcp == NULL) { // already closed
+        MICROPY_PY_LWIP_EXIT
+        return;
+    }
+    lwip_socket_free_incoming(socket);
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            // Deregister callback (pcb.tcp is set to NULL below so must deregister now)
+            tcp_arg(socket->pcb.tcp, NULL);
+            tcp_err(socket->pcb.tcp, NULL);
+            tcp_recv(socket->pcb.tcp, NULL);
+
+            if (socket->pcb.tcp->state != LISTEN) {
+                // Schedule a callback to abort the connection if it's not cleanly closed after
+                // the given timeout.  The callback must be set before calling tcp_close since
+                // the latter may free the pcb; if it doesn't then the callback will be active.
+                tcp_poll(socket->pcb.tcp, _lwip_tcp_close_poll, MICROPY_PY_LWIP_TCP_CLOSE_TIMEOUT_MS / 500);
+            }
+            if (tcp_close(socket->pcb.tcp) != ERR_OK) {
+                DEBUG_printf("lwip_close: had to call tcp_abort()\n");
+                tcp_abort(socket->pcb.tcp);
+            }
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+            udp_recv(socket->pcb.udp, NULL, NULL);
+            udp_remove(socket->pcb.udp);
+            break;
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+            raw_recv(socket->pcb.raw, NULL, NULL);
+            raw_remove(socket->pcb.raw);
+            break;
+        #endif
+    }
+
+    socket->pcb.tcp = NULL;
+    socket->state = _ERR_BADF;
+    MICROPY_PY_LWIP_EXIT
 }
 
-void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
+void common_hal_socketpool_socket_close(socketpool_socket_obj_t *socket) {
+    socketpool_socket_close(socket);
+}
+
+void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *socket,
     const char *host, size_t hostlen, uint32_t port) {
-    mp_raise_NotImplementedError(NULL);
+
+    if (socket->pcb.tcp == NULL) {
+        mp_raise_OSError(MP_EBADF);
+    }
+
+    // get address
+    ip_addr_t dest;
+    int error = socketpool_resolve_host(socket->pool, host, &dest);
+    if (error != 0) {
+        mp_raise_OSError(EHOSTUNREACH);
+    }
+
+    err_t err = ERR_ARG;
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM: {
+            if (socket->state != STATE_NEW) {
+                if (socket->state == STATE_CONNECTED) {
+                    mp_raise_OSError(MP_EISCONN);
+                } else {
+                    mp_raise_OSError(MP_EALREADY);
+                }
+            }
+
+            // Register our receive callback.
+            MICROPY_PY_LWIP_ENTER
+            tcp_recv(socket->pcb.tcp, _lwip_tcp_recv);
+            socket->state = STATE_CONNECTING;
+            err = tcp_connect(socket->pcb.tcp, &dest, port, _lwip_tcp_connected);
+            if (err != ERR_OK) {
+                MICROPY_PY_LWIP_EXIT
+                socket->state = STATE_NEW;
+                mp_raise_OSError(error_lookup_table[-err]);
+            }
+            socket->peer_port = (mp_uint_t)port;
+            memcpy(socket->peer, &dest, sizeof(socket->peer));
+            MICROPY_PY_LWIP_EXIT
+
+            // And now we wait...
+            if (socket->timeout != -1) {
+                for (mp_uint_t retries = socket->timeout / 100; retries--;) {
+                    mp_hal_delay_ms(100);
+                    if (socket->state != STATE_CONNECTING) {
+                        break;
+                    }
+                }
+                if (socket->state == STATE_CONNECTING) {
+                    mp_raise_OSError(MP_EINPROGRESS);
+                }
+            } else {
+                while (socket->state == STATE_CONNECTING) {
+                    poll_sockets();
+                }
+            }
+            if (socket->state == STATE_CONNECTED) {
+                err = ERR_OK;
+            } else {
+                err = socket->state;
+            }
+            break;
+        }
+        case MOD_NETWORK_SOCK_DGRAM: {
+            err = udp_connect(socket->pcb.udp, &dest, port);
+            break;
+        }
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case MOD_NETWORK_SOCK_RAW: {
+            err = raw_connect(socket->pcb.raw, &dest);
+            break;
+        }
+        #endif
+    }
+
+    if (err != ERR_OK) {
+        mp_raise_OSError(error_lookup_table[-err]);
+    }
 }
 
-bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t *socket) {
+    return !socket->pcb.tcp;
 }
 
-bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *socket) {
+    return socket->state == STATE_CONNECTED;
 }
 
 bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) {
     mp_raise_NotImplementedError(NULL);
 }
 
-mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *self,
+mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *socket,
     uint8_t *buf, uint32_t len, uint8_t *ip, uint32_t *port) {
-    mp_raise_NotImplementedError(NULL);
+    int _errno;
+
+    mp_uint_t ret = 0;
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            memcpy(ip, &socket->peer, sizeof(socket->peer));
+            *port = (mp_uint_t)socket->peer_port;
+            ret = lwip_tcp_receive(socket, (byte *)buf, len, &_errno);
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+        #endif
+            ret = lwip_raw_udp_receive(socket, (byte *)buf, len, ip, port, &_errno);
+            break;
+    }
+    if (ret == -1) {
+        mp_raise_OSError(_errno);
+    }
+
+    return ret;
 }
 
-int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
+int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
     const uint8_t *buf, uint32_t len) {
-    mp_raise_NotImplementedError(NULL);
+    mp_uint_t ret = 0;
+    int _errno = 0;
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            ret = lwip_tcp_receive(socket, (byte *)buf, len, &_errno);
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+        #endif
+            ret = lwip_raw_udp_receive(socket, (byte *)buf, len, NULL, NULL, &_errno);
+            break;
+    }
+    return ret;
 }
 
 mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
-    mp_raise_NotImplementedError(NULL);
+    int received = socketpool_socket_recv_into(self, buf, len);
+    if (received < 0) {
+        mp_raise_OSError(received);
+    }
+    return received;
 }
 
-int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
-    mp_raise_NotImplementedError(NULL);
+int socketpool_socket_send(socketpool_socket_obj_t *socket, const uint8_t *buf, uint32_t len) {
+    mp_uint_t ret = 0;
+    int _errno = 0;
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            ret = lwip_tcp_send(socket, buf, len, &_errno);
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+        #endif
+            ret = lwip_raw_udp_send(socket, buf, len, NULL, 0, &_errno);
+            break;
+    }
+    if (ret == -1) {
+        return -_errno;
+    }
+    return ret;
 }
 
 mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
-    mp_raise_NotImplementedError(NULL);
+    int sent = socketpool_socket_send(self, buf, len);
+
+    if (sent < 0) {
+        mp_raise_OSError(-sent);
+    }
+    return sent;
 }
 
-mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
+mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *socket,
     const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len) {
-    mp_raise_NotImplementedError(NULL);
+    int _errno;
+    ip_addr_t ip;
+    int error = socketpool_resolve_host(socket->pool, host, &ip);
+    if (error != 0) {
+        mp_raise_OSError(EHOSTUNREACH);
+    }
+
+    mp_uint_t ret = 0;
+    switch (socket->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            ret = lwip_tcp_send(socket, buf, len, &_errno);
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+        #endif
+            ret = lwip_raw_udp_send(socket, buf, len, &ip, port, &_errno);
+            break;
+    }
+    if (ret == -1) {
+        mp_raise_OSError(_errno);
+    }
+
+    return ret;
 }
 
 void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms) {
-    mp_raise_NotImplementedError(NULL);
+    self->timeout = timeout_ms;
 }
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
index 723b753064..d2f403c852 100644
--- a/ports/raspberrypi/common-hal/socketpool/SocketPool.c
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
@@ -57,8 +57,7 @@ STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void
     }
 }
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
-    const char *host) {
+int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) {
 
     getaddrinfo_state_t state;
     state.status = 0;
@@ -85,13 +84,27 @@ mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_ob
     }
 
     if (state.status < 0) {
+        return state.status;
         // TODO: CPython raises gaierror, we raise with native lwIP negative error
         // values, to differentiate from normal errno's at least in such way.
         mp_raise_OSError(state.status);
     }
 
+    *addr = state.ipaddr;
+    return 0;
+}
+
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
+    const char *host) {
+
+    ip_addr_t addr;
+    int result = socketpool_resolve_host(self, host, &addr);
+    if (result < 0) {
+        mp_raise_OSError(-result);
+    }
+
     char ip_str[IP4ADDR_STRLEN_MAX];
-    inet_ntoa_r(state.ipaddr, ip_str, IP4ADDR_STRLEN_MAX);
+    inet_ntoa_r(addr, ip_str, IP4ADDR_STRLEN_MAX);
     mp_obj_t ip_obj = mp_obj_new_str(ip_str, strlen(ip_str));
     return ip_obj;
 }
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.h b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
index ea0679b5eb..3d498d9a49 100644
--- a/ports/raspberrypi/common-hal/socketpool/SocketPool.h
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
@@ -31,3 +31,5 @@
 typedef struct {
     mp_obj_base_t base;
 } socketpool_socketpool_obj_t;
+
+int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr);
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
new file mode 160000
index 0000000000..195dfcc10b
--- /dev/null
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -0,0 +1 @@
+Subproject commit 195dfcc10bb6f379e3dea45147590db2203d3c7b
diff --git a/ports/raspberrypi/lib/lwip b/ports/raspberrypi/lib/lwip
new file mode 160000
index 0000000000..239918ccc1
--- /dev/null
+++ b/ports/raspberrypi/lib/lwip
@@ -0,0 +1 @@
+Subproject commit 239918ccc173cb2c2a62f41a40fd893f57faf1d6
diff --git a/ports/raspberrypi/pioasm/CMakeLists.txt b/ports/raspberrypi/pioasm/CMakeLists.txt
new file mode 100644
index 0000000000..1923068bae
--- /dev/null
+++ b/ports/raspberrypi/pioasm/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.12)
+project(pioasm)
+set(PICO_TINYUSB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib/tinyusb)
+include(../sdk/pico_sdk_init.cmake)
+pico_sdk_init()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PICO_SDK_PATH}/tools)
+find_package(Pioasm REQUIRED)
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index c4a1f853b5..8ede649cd7 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -158,10 +158,7 @@ STATIC mp_obj_t digitalio_digitalinout_switch_to_output(size_t n_args, const mp_
         drive_mode = DRIVE_MODE_OPEN_DRAIN;
     }
     // do the transfer
-    digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(self, args[ARG_value].u_bool, drive_mode);
-    if (result == DIGITALINOUT_INPUT_ONLY) {
-        mp_raise_NotImplementedError(translate("Pin is input only"));
-    }
+    check_result(common_hal_digitalio_digitalinout_switch_to_output(self, args[ARG_value].u_bool, drive_mode));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_output_obj, 1, digitalio_digitalinout_switch_to_output);
@@ -229,10 +226,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob
     if (value == MP_ROM_PTR(&digitalio_direction_input_obj)) {
         check_result(common_hal_digitalio_digitalinout_switch_to_input(self, PULL_NONE));
     } else if (value == MP_ROM_PTR(&digitalio_direction_output_obj)) {
-        digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(self, false, DRIVE_MODE_PUSH_PULL);
-        if (result == DIGITALINOUT_INPUT_ONLY) {
-            mp_raise_NotImplementedError(translate("Pin is input only"));
-        }
+        check_result(common_hal_digitalio_digitalinout_switch_to_output(self, false, DRIVE_MODE_PUSH_PULL));
     } else {
         mp_arg_error_invalid(MP_QSTR_direction);
     }

From 4380292848d52c16597fce54bac4c290b03580dd Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:10:57 -0500
Subject: [PATCH 1049/2403] comment why not actually reset wifi

---
 ports/raspberrypi/common-hal/wifi/__init__.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/common-hal/wifi/__init__.c b/ports/raspberrypi/common-hal/wifi/__init__.c
index 9a42320cf5..73486c516f 100644
--- a/ports/raspberrypi/common-hal/wifi/__init__.c
+++ b/ports/raspberrypi/common-hal/wifi/__init__.c
@@ -80,6 +80,7 @@ void wifi_reset(void) {
     if (!wifi_inited) {
         return;
     }
+    // the cyw43 wifi chip is not reset due to https://github.com/raspberrypi/pico-sdk/issues/980
     common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
     wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
     common_hal_wifi_radio_obj.current_scan = NULL;

From bc63f9370a726be5d583a0a66a05f95d1eba239e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:15:30 -0500
Subject: [PATCH 1050/2403] comment why it's this way

---
 shared-bindings/digitalio/DigitalInOut.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index 8ede649cd7..839bee2c0d 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -89,6 +89,9 @@ STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type,
     self->base.type = &digitalio_digitalinout_type;
 
     #if CIRCUITPY_CYW43
+    // The GPIO pin attached to the CYW43 co-processor can only be used for
+    // DigitalInOut, not for other purposes like PWM. That's why this check
+    // is here, and it's not rolled into validate_obj_is_free_pin.
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin_including_cyw43(args[0]);
     #else
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);

From e100981d9039d2f4681d86ae1303524b3bb0ecfa Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:16:58 -0500
Subject: [PATCH 1051/2403] revert CFLAGS change

---
 ports/raspberrypi/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index cf3967fee4..18a2a69fd6 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -215,7 +215,7 @@ endif
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
 DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-function -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
 
-CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes -Wno-error=unused-result
+CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
 CFLAGS += \
   -march=armv6-m \

From edf1efd728708133a34cabb26e0e0fff931ad3c1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:17:27 -0500
Subject: [PATCH 1052/2403] Add CYW43 guards to more things

---
 .../raspberrypi/common-hal/microcontroller/Pin.c | 16 ++++++++--------
 .../raspberrypi/common-hal/microcontroller/Pin.h |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c
index 59adb5395f..d1cfcfe2b1 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Pin.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Pin.c
@@ -28,19 +28,23 @@
 
 #include "common-hal/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "bindings/cyw43/__init__.h"
 
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 
 #if CIRCUITPY_CYW43
+#include "bindings/cyw43/__init__.h"
 #include "pico/cyw43_arch.h"
-#endif
-
-STATIC uint32_t never_reset_pins;
 
 bool cyw_ever_init;
 static uint32_t cyw_pin_claimed;
 
+void reset_pin_number_cyw(uint8_t pin_no) {
+    cyw_pin_claimed &= ~(1 << pin_no);
+}
+#endif
+
+STATIC uint32_t never_reset_pins;
+
 void reset_all_pins(void) {
     for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
         if ((never_reset_pins & (1 << i)) != 0) {
@@ -82,10 +86,6 @@ void reset_pin_number(uint8_t pin_number) {
     hw_set_bits(&padsbank0_hw->io[pin_number], PADS_BANK0_GPIO0_OD_BITS);
 }
 
-void reset_pin_number_cyw(uint8_t pin_no) {
-    cyw_pin_claimed &= ~(1 << pin_no);
-}
-
 void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
     never_reset_pin_number(pin->number);
 }
diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.h b/ports/raspberrypi/common-hal/microcontroller/Pin.h
index 5042dd7d66..1c400fe48e 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Pin.h
+++ b/ports/raspberrypi/common-hal/microcontroller/Pin.h
@@ -34,15 +34,17 @@
 
 #include "peripherals/pins.h"
 
-extern bool cyw_ever_init;
-
 void reset_all_pins(void);
 // reset_pin_number takes the pin number instead of the pointer so that objects don't
 // need to store a full pointer.
 void reset_pin_number(uint8_t pin_number);
-void reset_pin_number_cyw(uint8_t pin_number);
 void never_reset_pin_number(uint8_t pin_number);
 void claim_pin(const mcu_pin_obj_t *pin);
 bool pin_number_is_free(uint8_t pin_number);
 
+#if CIRCUITPY_CYW43
+extern bool cyw_ever_init;
+void reset_pin_number_cyw(uint8_t pin_number);
+#endif
+
 #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_MICROCONTROLLER_PIN_H

From 6189156a0b42cf127b064616c2d3fec29f7be258 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:17:35 -0500
Subject: [PATCH 1053/2403] Add missing NotImplementedErrors

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 7d9dcbee23..7981b0952e 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -141,6 +141,7 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
 }
 
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
 }
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
@@ -229,6 +230,7 @@ void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dn
 }
 
 void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
 }
 
 void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {

From 09d4fbc5573a797bba6f87d8bbe7c316d0b57969 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:17:46 -0500
Subject: [PATCH 1054/2403] Remove FIXME

this was verbatim-copied from micropython
---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 05c8212d69..95f79c5880 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -346,7 +346,6 @@ STATIC mp_uint_t lwip_raw_udp_send(socketpool_socket_obj_t *socket, const byte *
 
     MICROPY_PY_LWIP_ENTER
 
-    // FIXME: maybe PBUF_ROM?
     struct pbuf *p = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM);
     if (p == NULL) {
         MICROPY_PY_LWIP_EXIT

From 3d76aa00f53ebea79191e6eb29272be5c58dc680 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:18:36 -0500
Subject: [PATCH 1055/2403] implementations not needed

---
 .../boards/raspberry_pi_pico_w/board.c        | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
index de6e424ed9..e69de29bb2 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
@@ -1,40 +0,0 @@
-/*
- * 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 "supervisor/board.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}

From dbd7ce9fdcd9203b76ecd4ef693787b6a25fc291 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:35:46 -0500
Subject: [PATCH 1056/2403] restore checking hostname format on esp32 where it
 was checked before

---
 shared-bindings/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index aecb1b561f..3238025622 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -89,7 +89,7 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in)
 
     mp_arg_validate_length_range(hostname.len, 1, 253, MP_QSTR_hostname);
 
-    #if 0 // ndef CONFIG_IDF_TARGET_ESP32C3
+    #if !(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(RASPBERRYPI))
     regex_t regex; // validate hostname according to RFC 1123
     regcomp(®ex,"^(([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])$", REG_EXTENDED | REG_ICASE | REG_NOSUB);
     if (regexec(®ex, hostname.buf, 0, NULL, 0)) {

From 72bce51ce31fe8d1fadd72094009696a3458fc37 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 14:48:54 -0500
Subject: [PATCH 1057/2403] restore submodule commits

---
 frozen/circuitpython-stage   | 2 +-
 ports/espressif/esp32-camera | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 9a8338b3bd..4124dfbdaa 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 9a8338b3bdaeac9eeb5b74d147107c67db33fdac
+Subproject commit 4124dfbdaadce1966f457d7d6c6984e9832999bf
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 28804391c0..54c3f61c86 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 28804391c002f6a3ea5ce6a55aee3b191be3ecde
+Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2

From d59774d7508e40f5ef73e6515b1ea9df0c7e8354 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 15:11:55 -0500
Subject: [PATCH 1058/2403] don't use regcomp to check hostname validity

---
 shared-bindings/wifi/Radio.c | 45 ++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 3238025622..7463cdc77e 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -27,7 +27,6 @@
 #include "shared-bindings/wifi/__init__.h"
 #include "shared-bindings/wifi/AuthMode.h"
 
-#include 
 #include 
 
 #include "py/runtime.h"
@@ -35,6 +34,43 @@
 
 #define MAC_ADDRESS_LENGTH 6
 
+STATIC bool hostname_valid(const char *ptr, size_t len) {
+    #if 0 // validated by mp_arg_validate_length_range
+    if (len == 0 || len > 253) {
+        // at most 253 characters long
+        return false;
+    }
+    #endif
+    int partlen = 0;
+    while (len) {
+        char c = *ptr++;
+        len--;
+        if (c == '.') {
+            if (partlen == 0 || partlen > 63) {
+                return false;
+            }
+            partlen = 0;
+            continue;
+        }
+        partlen++;
+        if (c == '-') {
+            if (partlen == 1) {
+                return false; // part cannot begin with a dash
+            }
+            continue;
+        } else if (
+            (c >= 'a' && c <= 'z') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c >= '0' && c <= '9')) {
+            continue;
+        }
+        return false;
+    }
+    // check length of last part
+    return !(partlen > 63);
+}
+
+
 //| class Radio:
 //|     """Native wifi radio.
 //|
@@ -89,14 +125,9 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in)
 
     mp_arg_validate_length_range(hostname.len, 1, 253, MP_QSTR_hostname);
 
-    #if !(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(RASPBERRYPI))
-    regex_t regex; // validate hostname according to RFC 1123
-    regcomp(®ex,"^(([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]{0,61}[a-z0-9])$", REG_EXTENDED | REG_ICASE | REG_NOSUB);
-    if (regexec(®ex, hostname.buf, 0, NULL, 0)) {
+    if (!hostname_valid(hostname.buf, hostname.len)) {
         mp_raise_ValueError(translate("invalid hostname"));
     }
-    regfree(®ex);
-    #endif
 
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_wifi_radio_set_hostname(self, hostname.buf);

From 2dd6df9d93cff1b496fa95ee3dbd3ef8b35980ee Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 15:19:06 -0500
Subject: [PATCH 1059/2403] better to explain why this file has no useful
 content

---
 .../boards/raspberry_pi_pico_w/board.c        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
index e69de29bb2..331653173e 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

From 6049728ed24085570ea830c4a390263e549197f3 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 29 Sep 2022 00:09:41 +0200
Subject: [PATCH 1060/2403] 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             | 26 +++++++++++++++++++-------
 locale/cs.po             | 26 +++++++++++++++++++-------
 locale/de_DE.po          | 29 ++++++++++++++++++++++-------
 locale/el.po             | 26 +++++++++++++++++++-------
 locale/en_GB.po          | 29 ++++++++++++++++++++++-------
 locale/es.po             | 29 ++++++++++++++++++++++-------
 locale/fil.po            | 26 +++++++++++++++++++-------
 locale/fr.po             | 29 ++++++++++++++++++++++-------
 locale/hi.po             | 26 +++++++++++++++++++-------
 locale/it_IT.po          | 26 +++++++++++++++++++-------
 locale/ja.po             | 26 +++++++++++++++++++-------
 locale/ko.po             | 26 +++++++++++++++++++-------
 locale/nl.po             | 29 ++++++++++++++++++++++-------
 locale/pl.po             | 26 +++++++++++++++++++-------
 locale/pt_BR.po          | 30 +++++++++++++++++++++++-------
 locale/ru.po             | 26 +++++++++++++++++++-------
 locale/sv.po             | 29 ++++++++++++++++++++++-------
 locale/tr.po             | 26 +++++++++++++++++++-------
 locale/zh_Latn_pinyin.po | 29 ++++++++++++++++++++++-------
 19 files changed, 386 insertions(+), 133 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 5c7b21a0eb..ccb2c9802a 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -101,6 +101,7 @@ msgstr "%q berisi pin duplikat"
 msgid "%q failure: %d"
 msgstr "%q gagal: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q sedang digunakan"
@@ -308,7 +309,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Objek '%s' tidak memiliki atribut '%q'"
 
@@ -494,6 +495,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -929,6 +931,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Diharapkan %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1192,7 +1198,7 @@ msgstr "Kesalahan internal #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2232,6 +2238,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4147,14 +4158,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4285,9 +4292,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi tidak diaktifkan"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "jendela harus <= interval"
diff --git a/locale/cs.po b/locale/cs.po
index ae9a8ed7b2..05fed491c6 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -102,6 +102,7 @@ msgstr "%q obsahuje duplicitní piny"
 msgid "%q failure: %d"
 msgstr "%q: selhání %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q se právě používá"
@@ -309,7 +310,7 @@ msgstr "'%s' objekt nepodporuje přiřazení položky"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' objekt nepodporuje smazání položky"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' objekt nemá žádný atribut '%q'"
 
@@ -495,6 +496,7 @@ msgid "Already running"
 msgstr "Již běží"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Již skenuje wifi sítě"
 
@@ -927,6 +929,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Očekává se %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1192,7 +1198,7 @@ msgstr "Vnitřní chyba #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2221,6 +2227,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4133,14 +4144,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4271,9 +4278,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e173ee6c3c..d277065abc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -103,6 +103,7 @@ msgstr "%q enthält doppelte Pins"
 msgid "%q failure: %d"
 msgstr "%q Fehler: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q in Benutzung"
@@ -311,7 +312,7 @@ msgstr "'%s' Objekt unterstützt keine Element-Zuordnung"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' Objekt unterstützt keine Löschung von Elementen"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' Objekt hat kein Attribut '%q'"
 
@@ -497,6 +498,7 @@ msgid "Already running"
 msgstr "Läuft bereits"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Sucht bereits nach Wifi-Netzwerken"
 
@@ -934,6 +936,10 @@ msgstr "Error: Bind Fehler"
 msgid "Expected a %q"
 msgstr "Erwartet ein(e) %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1206,7 +1212,7 @@ msgstr "Interner Fehler #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Der Interne WatchDog Timer ist abgelaufen."
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ungültiger %q"
 
@@ -2258,6 +2264,11 @@ msgstr "Unbekannter Systemfirmware Fehler: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Unbekannter System-Firmware-Fehler: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4212,14 +4223,10 @@ msgstr "Typ '%q' ist kein akzeptierter Basis-Typ"
 msgid "type is not an acceptable base type"
 msgstr "Typ ist kein akzeptierter Basis-Typ"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "Typ vom Objekt '%q' hat kein Attribut '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "Das Typ-Objekt 'generator' hat kein Attribut '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "Typ akzeptiert 1 oder 3 Argumente"
@@ -4352,9 +4359,14 @@ msgid "width must be greater than zero"
 msgstr "Breite muss größer als 0 sein"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi ist nicht aktiviert"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "Fenster muss <= Intervall sein"
@@ -4429,6 +4441,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "type object 'generator' has no attribute '__await__'"
+#~ msgstr "Das Typ-Objekt 'generator' hat kein Attribut '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "Farbe sollte ein int sein"
 
diff --git a/locale/el.po b/locale/el.po
index f996a90a23..d0356d5deb 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -103,6 +103,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr ""
@@ -310,7 +311,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -496,6 +497,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -924,6 +926,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1185,7 +1191,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2211,6 +2217,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4123,14 +4134,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4261,9 +4268,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index b525de6ff6..3192c4591d 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -105,6 +105,7 @@ msgstr "%q contains duplicate pins"
 msgid "%q failure: %d"
 msgstr "%q failure: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q in use"
@@ -312,7 +313,7 @@ msgstr "'%s' object doesn't support item assignment"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' object doesn't support item deletion"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object has no attribute '%q'"
 
@@ -498,6 +499,7 @@ msgid "Already running"
 msgstr "Already running"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Already scanning for WiFi networks"
 
@@ -930,6 +932,10 @@ msgstr "Error: Failure to bind"
 msgid "Expected a %q"
 msgstr "Expected a %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1193,7 +1199,7 @@ msgstr "Internal error #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Invalid %q"
 
@@ -2234,6 +2240,11 @@ msgstr "Unknown system firmware error: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4152,14 +4163,10 @@ msgstr "type '%q' is not an acceptable base type"
 msgid "type is not an acceptable base type"
 msgstr "type is not an acceptable base type"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "type object '%q' has no attribute '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "type object 'generator' has no attribute '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "type takes 1 or 3 arguments"
@@ -4290,9 +4297,14 @@ msgid "width must be greater than zero"
 msgstr "width must be greater than zero"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "WiFi is not enabled"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "window must be <= interval"
@@ -4367,6 +4379,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "type object 'generator' has no attribute '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "colour should be an int"
 
diff --git a/locale/es.po b/locale/es.po
index 42ea8aecb9..237caa7254 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -107,6 +107,7 @@ msgstr "%q contiene pines duplicados"
 msgid "%q failure: %d"
 msgstr "%q fallo: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q está siendo utilizado"
@@ -314,7 +315,7 @@ msgstr "'%s' el objeto no tiene capacidad de asignación de item"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' el objeto no tiene capacidad de borrado de item"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "objeto '%s' no tiene atributo '%q'"
 
@@ -502,6 +503,7 @@ msgid "Already running"
 msgstr "Ya está en ejecución"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Ya se están buscando redes wifi"
 
@@ -940,6 +942,10 @@ msgstr "Error: fallo al vincular"
 msgid "Expected a %q"
 msgstr "Se espera un %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1211,7 +1217,7 @@ msgstr "Error interno #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q inválido"
 
@@ -2266,6 +2272,11 @@ msgstr "Error desconocido en el firmware sistema: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4200,14 +4211,10 @@ msgstr "type '%q' no es un tipo de base aceptable"
 msgid "type is not an acceptable base type"
 msgstr "type no es un tipo de base aceptable"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "objeto de tipo '%q' no tiene atributo '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "objeto tipo 'generator' no tiene un atributo '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "type acepta 1 ó 3 argumentos"
@@ -4338,9 +4345,14 @@ msgid "width must be greater than zero"
 msgstr "el ancho debe ser mayor que cero"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi no esta habilitado"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "la ventana debe ser <= intervalo"
@@ -4415,6 +4427,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "objeto tipo 'generator' no tiene un atributo '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "color deberia ser un int"
 
diff --git a/locale/fil.po b/locale/fil.po
index 11fdd354d9..b1a499e70b 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -96,6 +96,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q ay ginagamit"
@@ -305,7 +306,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object ay walang attribute '%q'"
 
@@ -492,6 +493,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -927,6 +929,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Umasa ng %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1190,7 +1196,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2222,6 +2228,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4153,14 +4164,10 @@ msgstr "hindi maari ang type na '%q' para sa base type"
 msgid "type is not an acceptable base type"
 msgstr "hindi puede ang type para sa base type"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "type object '%q' ay walang attribute '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "type kumuhuha ng 1 o 3 arguments"
@@ -4291,9 +4298,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index b3205f0ac5..58d84ac81f 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -107,6 +107,7 @@ msgstr "%q contient des broches en double"
 msgid "%q failure: %d"
 msgstr "Échec de %q : %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q en cours d'utilisation"
@@ -314,7 +315,7 @@ msgstr "l'objet %s ne supporte pas l'assignation d'éléments"
 msgid "'%s' object doesn't support item deletion"
 msgstr "L'objet '%s' ne prend pas en charge la suppression d'éléments"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "l'objet '%s' n'a pas d'attribut '%q'"
 
@@ -500,6 +501,7 @@ msgid "Already running"
 msgstr "Déjà en cours d'exécution"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Déjà à la recherche des réseaux wifi"
 
@@ -950,6 +952,10 @@ msgstr "Erreur : Impossible de lier"
 msgid "Expected a %q"
 msgstr "Attendu un %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1231,7 +1237,7 @@ msgstr "Erreur interne #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Le minuteur du watchdog interne a expiré."
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q invalide"
 
@@ -2290,6 +2296,11 @@ msgstr "Faute inconnue du logiciel systême : %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Erreur du firmware système inconnue : %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4242,14 +4253,10 @@ msgstr "le type '%q' n'est pas un type de base accepté"
 msgid "type is not an acceptable base type"
 msgstr "le type n'est pas un type de base accepté"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "l'objet de type '%q' n'a pas d'attribut '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "le type 'generator' n'a pas d'attribut '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "le type prend 1 ou 3 arguments"
@@ -4380,9 +4387,14 @@ msgid "width must be greater than zero"
 msgstr "width doit être plus que zero"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi n’est pas activé"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "la fenêtre (window) doit être <= intervalle (interval)"
@@ -4457,6 +4469,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "le type 'generator' n'a pas d'attribut '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "la couleur doit être un entier 'int'"
 
diff --git a/locale/hi.po b/locale/hi.po
index c96d057c7b..229ae16a80 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -95,6 +95,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -488,6 +489,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -916,6 +918,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1177,7 +1183,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2203,6 +2209,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4115,14 +4126,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4253,9 +4260,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index c2be65716b..24c45ca0cd 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -102,6 +102,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fallito: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q in uso"
@@ -310,7 +311,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "l'oggetto '%s' non ha l'attributo '%q'"
 
@@ -498,6 +499,7 @@ msgid "Already running"
 msgstr "Già in funzione"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Già in ricerca di collegamenti WiFi"
 
@@ -932,6 +934,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Atteso un %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1195,7 +1201,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2232,6 +2238,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4166,14 +4177,10 @@ msgstr "il tipo '%q' non è un tipo di base accettabile"
 msgid "type is not an acceptable base type"
 msgstr "il tipo non è un tipo di base accettabile"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "l'oggetto di tipo '%q' non ha l'attributo '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "tipo prende 1 o 3 argomenti"
@@ -4304,9 +4311,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index d7ec845e23..9d09e42002 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q 失敗: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%qは使用中"
@@ -307,7 +308,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -493,6 +494,7 @@ msgid "Already running"
 msgstr "すでに実行中"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -925,6 +927,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "%qが必要"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1188,7 +1194,7 @@ msgstr "内部エラー #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "不正な %q"
 
@@ -2217,6 +2223,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4136,14 +4147,10 @@ msgstr "型'%q'はベース型として使えません"
 msgid "type is not an acceptable base type"
 msgstr "この型はベース型にできません"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "typeは1つか3つの引数をとります"
@@ -4274,9 +4281,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "windowはinterval以下でなければなりません"
diff --git a/locale/ko.po b/locale/ko.po
index 669ae1a551..9966fe44d9 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -96,6 +96,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q 사용 중입니다"
@@ -303,7 +304,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -489,6 +490,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -919,6 +921,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "%q 이 예상되었습니다."
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1180,7 +1186,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2207,6 +2213,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4119,14 +4130,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4257,9 +4264,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index e888fc2d66..f2e699e55b 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -98,6 +98,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fout: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q in gebruik"
@@ -305,7 +306,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object heeft geen attribuut '%q'"
 
@@ -491,6 +492,7 @@ msgid "Already running"
 msgstr "Wordt al uitgevoerd"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Zoekt al naar WiFi netwerken"
 
@@ -924,6 +926,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Verwacht een %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1188,7 +1194,7 @@ msgstr "Interne fout #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ongeldige %q"
 
@@ -2227,6 +2233,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4152,14 +4163,10 @@ msgstr "type '%q' is geen aanvaardbaar basistype"
 msgid "type is not an acceptable base type"
 msgstr "type is geen aanvaardbaar basistype"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "objecttype '%q' heeft geen attribuut '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "het type object 'generator' heeft geen attribuut '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "type accepteert 1 of 3 argumenten"
@@ -4290,9 +4297,14 @@ msgid "width must be greater than zero"
 msgstr "breedte moet groter dan nul zijn"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "window moet <= interval zijn"
@@ -4367,6 +4379,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "het type object 'generator' heeft geen attribuut '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "kleur moet een int zijn"
 
diff --git a/locale/pl.po b/locale/pl.po
index b01fd67829..a6d09cc31e 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q niepowodzenie: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q w użyciu"
@@ -307,7 +308,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' obiekt nie ma atrybutu '%q'"
 
@@ -493,6 +494,7 @@ msgid "Already running"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr ""
 
@@ -925,6 +927,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr "Oczekiwano %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1188,7 +1194,7 @@ msgstr "Błąd wewnętrzny #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Nieprawidłowe %q"
 
@@ -2214,6 +2220,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4128,14 +4139,10 @@ msgstr "typ '%q' nie może być bazowy"
 msgid "type is not an acceptable base type"
 msgstr "typ nie może być bazowy"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "typ '%q' nie ma atrybutu '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "type wymaga 1 lub 3 argumentów"
@@ -4266,9 +4273,14 @@ msgid "width must be greater than zero"
 msgstr "szerokość musi być większa niż zero"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9d5a97b28b..4657581bc9 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -104,6 +104,7 @@ msgstr "%q contém pinos duplicados"
 msgid "%q failure: %d"
 msgstr "%q falha: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q em uso"
@@ -311,7 +312,7 @@ msgstr "O objeto '%s' não suporta a atribuição dos itens"
 msgid "'%s' object doesn't support item deletion"
 msgstr "O objeto '%s' não é compatível com exclusão do item"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "O objeto '%s' não possui o atributo '%q'"
 
@@ -501,6 +502,7 @@ msgid "Already running"
 msgstr "Já está em execução"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Já está em busca das redes de wifi"
 
@@ -943,6 +945,10 @@ msgstr "Erro: Falha na vinculação"
 msgid "Expected a %q"
 msgstr "Esperado um"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr "Esperava-se um(a) %q"
@@ -1216,7 +1222,7 @@ msgstr "Erro interno #%d"
 msgid "Internal watchdog timer expired."
 msgstr "O temporizador do watchdog interno expirou."
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q Inválido"
 
@@ -2273,6 +2279,11 @@ msgstr "Erro desconhecido do firmware: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Ocorreu um erro desconhecido no firmware do sistema: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4220,14 +4231,10 @@ msgstr "o tipo '%q' não é um tipo base aceitável"
 msgid "type is not an acceptable base type"
 msgstr "tipo não é um tipo base aceitável"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "o objeto tipo '%q' não possuí atributo '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "o tipo do objeto 'generator' não possui qualquer atributo '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "o tipo usa 1 ou 3 argumentos"
@@ -4358,9 +4365,14 @@ msgid "width must be greater than zero"
 msgstr "a largura deve ser maior que zero"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "o wifi não está ativo"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "a janela deve ser <= intervalo"
@@ -4435,6 +4447,10 @@ 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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr ""
+#~ "o tipo do objeto 'generator' não possui qualquer atributo '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "cor deve ser um int"
 
diff --git a/locale/ru.po b/locale/ru.po
index 51480c87ed..d62a419cbe 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -103,6 +103,7 @@ msgstr "%q содержит пины-дупликаты"
 msgid "%q failure: %d"
 msgstr "%q сбой: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q используется"
@@ -310,7 +311,7 @@ msgstr "Объект '%s' не поддерживает присвоение э
 msgid "'%s' object doesn't support item deletion"
 msgstr "Объект '%s' не поддерживает удаление элементов"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Объект '%s' не имеет атрибута '%q'"
 
@@ -496,6 +497,7 @@ msgid "Already running"
 msgstr "Уже запущен"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Поиск сетей wifi уже происходит"
 
@@ -941,6 +943,10 @@ msgstr "Ошибка: Сбой привязки"
 msgid "Expected a %q"
 msgstr "Ожидалось(ся) %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1213,7 +1219,7 @@ msgstr "Внутренняя ошибка #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Недопустимый %q"
 
@@ -2252,6 +2258,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4164,14 +4175,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4302,9 +4309,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 783229f591..d103924e57 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -103,6 +103,7 @@ msgstr "%q innehåller dubblettstift"
 msgid "%q failure: %d"
 msgstr "%q-fel: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q används redan"
@@ -312,7 +313,7 @@ msgstr "Objektet '%s' stöder inte tilldelning"
 msgid "'%s' object doesn't support item deletion"
 msgstr "Objektet '%s' stöder inte borttagning"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Objektet '%s' har inget attribut '%q'"
 
@@ -498,6 +499,7 @@ msgid "Already running"
 msgstr "Kör redan"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Skannar redan efter wifi-nätverk"
 
@@ -932,6 +934,10 @@ msgstr "Fel: Bind misslyckades"
 msgid "Expected a %q"
 msgstr "Förväntade %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr "Förväntade en %q"
@@ -1199,7 +1205,7 @@ msgstr "Internt fel #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Intern watchdog-timer har löpt ut."
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ogiltig %q"
 
@@ -2248,6 +2254,11 @@ msgstr "Okänt systemfirmwarefel: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Okänt fel i systemets firmware: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4181,14 +4192,10 @@ msgstr "typ '%q' är inte en acceptabel bastyp"
 msgid "type is not an acceptable base type"
 msgstr "typ är inte en acceptabel bastyp"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "typobjektet '%q' har inget attribut '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "typobjekt 'generator' har inget attribut '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "typen tar 1 eller 3 argument"
@@ -4319,9 +4326,14 @@ msgid "width must be greater than zero"
 msgstr "width måste vara större än noll"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi är inte aktiverat"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "window måste vara <= interval"
@@ -4396,6 +4408,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "typobjekt 'generator' har inget attribut '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "color ska vara en int"
 
diff --git a/locale/tr.po b/locale/tr.po
index 65cc6e85f6..f46d76a4cb 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -107,6 +107,7 @@ msgstr "%q yinelenen pinler içeriyor"
 msgid "%q failure: %d"
 msgstr "%q hata: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q kullanımda"
@@ -314,7 +315,7 @@ msgstr "'%s' nesnesi, öğe atamasını desteklemiyor"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' nesnesi, öğe silmeyi desteklemiyor"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' nesnesinin '%q' özelliği yok"
 
@@ -501,6 +502,7 @@ msgid "Already running"
 msgstr "Halihazırda çalışıyor"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Halihazırda wifi ağları için tarama yapılıyor"
 
@@ -932,6 +934,10 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1193,7 +1199,7 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -2222,6 +2228,11 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4134,14 +4145,10 @@ msgstr ""
 msgid "type is not an acceptable base type"
 msgstr ""
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr ""
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr ""
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr ""
@@ -4272,9 +4279,14 @@ msgid "width must be greater than zero"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 3645f90d63..b4ea1ec04e 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -106,6 +106,7 @@ msgstr "%q bāo hán chóng fù de yǐn jiǎo"
 msgid "%q failure: %d"
 msgstr "%q Shībài: %d"
 
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
 msgstr "%q zhèngzài bèi shǐyòng"
@@ -313,7 +314,7 @@ msgstr "'%s' duìxiàng bù zhīchí yuánsù fùzhí"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' duìxiàng bù zhīchí yuánsù shānchú"
 
-#: py/runtime.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' duìxiàng méiyǒu shǔxìng '%q'"
 
@@ -499,6 +500,7 @@ msgid "Already running"
 msgstr "yǐjīng zài yùnxíng"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "yǐjīng zài sǎomiáo WIFI wǎngluò"
 
@@ -933,6 +935,10 @@ msgstr "cuò wù: bǎng dìng shī bài"
 msgid "Expected a %q"
 msgstr "Yùqí %q"
 
+#: ports/raspberrypi/bindings/cyw43/__init__.c
+msgid "Expected a %q or %q"
+msgstr ""
+
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
 msgstr ""
@@ -1205,7 +1211,7 @@ msgstr "nèi bù cuò wù #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "wú xiào %q"
 
@@ -2251,6 +2257,11 @@ msgstr "wèi zhī xì tǒng gù jiàn cuò wù: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "wèi zhī de xì tǒng gù jiàn cuò wù: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unkown error code %d"
+msgstr ""
+
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4183,14 +4194,10 @@ msgstr "lèixíng '%q' bùshì kě jiēshòu de jīchǔ lèixíng"
 msgid "type is not an acceptable base type"
 msgstr "lèixíng bùshì kě jiēshòu de jīchǔ lèixíng"
 
-#: py/runtime.c
+#: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
 msgstr "lèixíng duìxiàng '%q' méiyǒu shǔxìng '%q'"
 
-#: py/objgenerator.c
-msgid "type object 'generator' has no attribute '__await__'"
-msgstr "lèi xíng duì xiàng 'generator' méi yǒu shǔ xìng '__await__'"
-
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
 msgstr "lèixíng wèi 1 huò 3 gè cānshù"
@@ -4321,9 +4328,14 @@ msgid "width must be greater than zero"
 msgstr "kuāndù bìxū dàyú líng"
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wèi qǐ yòng WIFI"
 
+#: ports/raspberrypi/common-hal/wifi/Monitor.c
+msgid "wifi.Monitor not available"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr "Chuāngkǒu bìxū shì <= jiàngé"
@@ -4398,6 +4410,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 "type object 'generator' has no attribute '__await__'"
+#~ msgstr "lèi xíng duì xiàng 'generator' méi yǒu shǔ xìng '__await__'"
+
 #~ msgid "color should be an int"
 #~ msgstr "yánsè yīng wèi zhěngshù"
 

From c6d31638414fc1d0a038d1094bb7e2bf3471822c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 16:37:31 -0500
Subject: [PATCH 1061/2403] remove comment about something the Makefile does
 now

---
 ports/raspberrypi/Makefile | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 18a2a69fd6..059ad79126 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -110,21 +110,6 @@ $(BUILD)/cyw43_resource.o: lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
 		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
 		$< $@
 OBJ_CYW43 := $(BUILD)/cyw43_resource.o
-# need to do the equivalent of this in cmake
-###     # cyw43_resource.o contains the WiFi and BT firmware as a binary blob
-###     add_custom_command(
-###             OUTPUT ${CYW43_FIRMWARE_OBJ}
-###             DEPENDS ${PICO_CYW43_DRIVER_PATH}/firmware/${CYW43_FIRMWARE_BIN}
-###             WORKING_DIRECTORY ${PICO_CYW43_DRIVER_PATH}/firmware
-###             COMMAND ${CMAKE_OBJCOPY} -I binary -O elf32-littlearm -B arm
-###             --readonly-text
-###             --rename-section .data=${RESOURCE_SECNAME},${RESOURCE_SECFLAGS}
-###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_start=${CYW43_FIRMWARE_PRETTY}_start
-###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_end=${CYW43_FIRMWARE_PRETTY}_end
-###             --redefine-sym _binary_${CYW43_FIRMWARE_BIN_}_size=${CYW43_FIRMWARE_PRETTY}_size
-###             ${CYW43_FIRMWARE_BIN} ${CYW43_FIRMWARE_OBJ}
-###     )
-###
 else
 INC_CYW43 :=
 CFLAGS_CYW43 :=

From 71a00157ba358aa8382a13e8a155b5169990b1b9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 09:08:45 -0500
Subject: [PATCH 1062/2403] Add hostname setting

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 5 ++++-
 ports/raspberrypi/common-hal/wifi/Radio.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 7981b0952e..d2f5b77347 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -81,7 +81,10 @@ mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
-    ro_attribute(MP_QSTR_hostname);
+    self->hostname = mp_obj_new_str(hostname, strlen(hostname));
+    hostname = mp_obj_str_get_str(self->hostname);
+    netif_set_hostname(NETIF_STA, hostname);
+    netif_set_hostname(NETIF_AP, hostname);
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.h b/ports/raspberrypi/common-hal/wifi/Radio.h
index e919c5d718..5e40e64ec6 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.h
+++ b/ports/raspberrypi/common-hal/wifi/Radio.h
@@ -33,6 +33,7 @@
 
 typedef struct {
     mp_obj_base_t base;
+    mp_obj_t hostname;
     wifi_scannednetworks_obj_t *current_scan;
 } wifi_radio_obj_t;
 

From 56f9f0d13622f818ee99e324de22ae568290a400 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 09:09:14 -0500
Subject: [PATCH 1063/2403] add tx power get/set

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 24 ++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index d2f5b77347..f4c22f789a 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -59,6 +59,17 @@
 #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
 #define NETIF_AP (&cyw43_state.netif[CYW43_ITF_AP])
 
+static inline uint32_t nw_get_le32(const uint8_t *buf) {
+    return buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24;
+}
+
+static inline void nw_put_le32(uint8_t *buf, uint32_t x) {
+    buf[0] = x;
+    buf[1] = x >> 8;
+    buf[2] = x >> 16;
+    buf[3] = x >> 24;
+}
+
 NORETURN static void ro_attribute(int attr) {
     mp_raise_msg_varg(&mp_type_AttributeError, MP_ERROR_TEXT("'%s' object has no attribute '%q'"), "Radio", attr);
 }
@@ -96,12 +107,19 @@ void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t
 }
 
 mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self) {
-    return MICROPY_FLOAT_CONST(0.);
+    uint8_t buf[13];
+    memcpy(buf, "qtxpower\x00\x00\x00\x00\x00", 13);
+    cyw43_ioctl(&cyw43_state, CYW43_IOCTL_GET_VAR, 13, buf, CYW43_ITF_STA);
+    return nw_get_le32(buf) * MICROPY_FLOAT_CONST(0.25);
 }
 
 void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t tx_power) {
-    ro_attribute(MP_QSTR_tx_power);
-
+    mp_int_t dbm_times_four = (int)(4 * tx_power);
+    uint8_t buf[9 + 4];
+    memcpy(buf, "qtxpower\x00", 9);
+    nw_put_le32(buf + 9, dbm_times_four);
+    cyw43_ioctl(&cyw43_state, CYW43_IOCTL_SET_VAR, 9 + 4, buf, CYW43_ITF_STA);
+    cyw43_ioctl(&cyw43_state, CYW43_IOCTL_SET_VAR, 9 + 4, buf, CYW43_ITF_AP);
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {

From 91f1266db59096b6f20d1cb00f782e535b386c12 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 09:09:36 -0500
Subject: [PATCH 1064/2403] Document CywPin

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 2d5479a5d2..3a7dc8f80b 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -32,6 +32,13 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/cyw43/__init__.h"
 
+//| class CywPin:
+//|     """A class that represents a GPIO pin attached to the wifi chip.
+//|
+//|     Cannot be constructed at runtime, but may be the type of a pin object
+//|     in `board`. A `CywPin` can be used as a DigitalInOut, but not with other
+//|     peripherals such as `PWMOut`."""
+//|
 const mp_obj_type_t cyw43_pin_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,

From 12ea04ca707af18e815557c116caa00bd2cb5445 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 09:09:52 -0500
Subject: [PATCH 1065/2403] Add cyw43.set_power_management

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 3a7dc8f80b..2fcda50af5 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -49,6 +49,23 @@ const mp_obj_type_t cyw43_pin_type = {
         )
 };
 
+//| def set_power_management(/, value:int) -> None:
+//|     """Set the power management register
+//|
+//|     According to Raspberry Pi documentation, the value 0xa11140
+//|     increases responsiveness at the cost of higher power usage.
+//|
+//|     Besides this value, there appears to be no other public documentation
+//|     of the values that can be used.
+//|     """
+//|
+STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
+    mp_int_t value = mp_obj_get_int(value_in);
+    cyw43_wifi_pm(&cyw43_state, value);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(cyw43_set_power_management_obj, cyw43_set_power_management);
+
 const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj) {
     if (!mp_obj_is_type(obj, &mcu_pin_type) && !mp_obj_is_type(obj, &cyw43_pin_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q or %q"), mcu_pin_type.name, cyw43_pin_type.name);
@@ -65,6 +82,7 @@ const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
 STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
     { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
+    { MP_ROM_QSTR(MP_QSTR_set_power_management), MP_ROM_QSTR(MP_QSTR_set_power_management) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table);

From 74cdf42ece76a3a93b9306fe6974a9c10425331e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 10:01:53 -0500
Subject: [PATCH 1066/2403] pico w: implement bind, listen, accept

this works with some simple tcp & udp echo service code
---
 .../common-hal/socketpool/Socket.c            | 146 +++++++++++++++++-
 1 file changed, 140 insertions(+), 6 deletions(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 95f79c5880..fb777a3f04 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -37,6 +37,7 @@
 #include "py/stream.h"
 #include "shared-bindings/socketpool/SocketPool.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/netutils/netutils.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/workflow.h"
@@ -115,6 +116,10 @@ static inline void poll_sockets(void) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     MICROPY_EVENT_POLL_HOOK;
     #else
+    RUN_BACKGROUND_TASKS;
+    if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+        mp_handle_pending(true);
+    }
     mp_hal_delay_ms(1);
     #endif
 }
@@ -739,14 +744,117 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     return -MP_EBADF;
 }
 
-socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
+socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *socket,
     uint8_t *ip, uint32_t *port) {
-    mp_raise_NotImplementedError(NULL);
+    if (socket->type != MOD_NETWORK_SOCK_STREAM) {
+        mp_raise_OSError(MP_EOPNOTSUPP);
+    }
+
+    // Create new socket object, do it here because we must not raise an out-of-memory
+    // exception when the LWIP concurrency lock is held
+    socketpool_socket_obj_t *socket2 = m_new_ll_obj_with_finaliser(socketpool_socket_obj_t);
+    socket2->base.type = &socketpool_socket_type;
+
+    MICROPY_PY_LWIP_ENTER
+
+    if (socket->pcb.tcp == NULL) {
+        MICROPY_PY_LWIP_EXIT
+        m_del_obj(socketpool_socket_obj_t, socket2);
+        mp_raise_OSError(MP_EBADF);
+    }
+
+    // I need to do this because "tcp_accepted", later, is a macro.
+    struct tcp_pcb *listener = socket->pcb.tcp;
+    if (listener->state != LISTEN) {
+        MICROPY_PY_LWIP_EXIT
+        m_del_obj(socketpool_socket_obj_t, socket2);
+        mp_raise_OSError(MP_EINVAL);
+    }
+
+    // accept incoming connection
+    struct tcp_pcb *volatile *incoming_connection = &lwip_socket_incoming_array(socket)[socket->incoming.connection.iget];
+    if (*incoming_connection == NULL) {
+        if (socket->timeout == 0) {
+            MICROPY_PY_LWIP_EXIT
+            m_del_obj(socketpool_socket_obj_t, socket2);
+            mp_raise_OSError(MP_EAGAIN);
+        } else if (socket->timeout != -1) {
+            mp_uint_t retries = socket->timeout / 100;
+            while (*incoming_connection == NULL) {
+                MICROPY_PY_LWIP_EXIT
+                if (retries-- == 0) {
+                    m_del_obj(socketpool_socket_obj_t, socket2);
+                    mp_raise_OSError(MP_ETIMEDOUT);
+                }
+                mp_hal_delay_ms(100);
+                MICROPY_PY_LWIP_REENTER
+            }
+        } else {
+            while (*incoming_connection == NULL) {
+                MICROPY_PY_LWIP_EXIT
+                poll_sockets();
+                MICROPY_PY_LWIP_REENTER
+            }
+        }
+    }
+
+    // We get a new pcb handle...
+    socket2->pcb.tcp = *incoming_connection;
+    if (++socket->incoming.connection.iget >= socket->incoming.connection.alloc) {
+        socket->incoming.connection.iget = 0;
+    }
+    *incoming_connection = NULL;
+
+    // ...and set up the new socket for it.
+    socket2->domain = MOD_NETWORK_AF_INET;
+    socket2->type = MOD_NETWORK_SOCK_STREAM;
+    socket2->incoming.pbuf = NULL;
+    socket2->timeout = socket->timeout;
+    socket2->state = STATE_CONNECTED;
+    socket2->recv_offset = 0;
+    socket2->callback = MP_OBJ_NULL;
+    tcp_arg(socket2->pcb.tcp, (void *)socket2);
+    tcp_err(socket2->pcb.tcp, _lwip_tcp_error);
+    tcp_recv(socket2->pcb.tcp, _lwip_tcp_recv);
+
+    tcp_accepted(listener);
+
+    MICROPY_PY_LWIP_EXIT
+
+    // output values
+    memcpy(ip, &(socket2->pcb.tcp->remote_ip), NETUTILS_IPV4ADDR_BUFSIZE);
+    *port = (mp_uint_t)socket2->pcb.tcp->remote_port;
+    return MP_OBJ_FROM_PTR(socket2);
 }
 
-bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
+bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
     const char *host, size_t hostlen, uint32_t port) {
-    mp_raise_NotImplementedError(NULL);
+    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
+
+    // get address
+    ip_addr_t bind_addr;
+    int error = socketpool_resolve_host(socket->pool, host, &bind_addr);
+    if (error != 0) {
+        mp_raise_OSError(EHOSTUNREACH);
+    }
+
+    err_t err = ERR_ARG;
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM: {
+            err = tcp_bind(socket->pcb.tcp, &bind_addr, port);
+            break;
+        }
+        case MOD_NETWORK_SOCK_DGRAM: {
+            err = udp_bind(socket->pcb.udp, &bind_addr, port);
+            break;
+        }
+    }
+
+    if (err != ERR_OK) {
+        mp_raise_OSError(error_lookup_table[-err]);
+    }
+
+    return mp_const_none;
 }
 
 STATIC err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) {
@@ -891,8 +999,34 @@ bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *socket)
     return socket->state == STATE_CONNECTED;
 }
 
-bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) {
-    mp_raise_NotImplementedError(NULL);
+bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *socket, int backlog) {
+    if (socket->type != MOD_NETWORK_SOCK_STREAM) {
+        mp_raise_OSError(MP_EOPNOTSUPP);
+    }
+
+    struct tcp_pcb *new_pcb = tcp_listen_with_backlog(socket->pcb.tcp, (u8_t)backlog);
+    if (new_pcb == NULL) {
+        mp_raise_OSError(MP_ENOMEM);
+    }
+    socket->pcb.tcp = new_pcb;
+
+    // Allocate memory for the backlog of connections
+    if (backlog <= 1) {
+        socket->incoming.connection.alloc = 0;
+        socket->incoming.connection.tcp.item = NULL;
+    } else {
+        socket->incoming.connection.alloc = backlog;
+        socket->incoming.connection.tcp.array = m_new0(struct tcp_pcb *, backlog);
+    }
+    socket->incoming.connection.iget = 0;
+    socket->incoming.connection.iput = 0;
+
+    tcp_accept(new_pcb, _lwip_tcp_accept);
+
+    // Socket is no longer considered "new" for purposes of polling
+    socket->state = STATE_LISTENING;
+
+    return mp_const_none;
 }
 
 mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *socket,

From 72b06021c08a0cd40abdaf6ecc7820b381884b22 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 10:27:13 -0500
Subject: [PATCH 1067/2403] fix doc formatting

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 2fcda50af5..0856139569 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -38,7 +38,6 @@
 //|     Cannot be constructed at runtime, but may be the type of a pin object
 //|     in `board`. A `CywPin` can be used as a DigitalInOut, but not with other
 //|     peripherals such as `PWMOut`."""
-//|
 const mp_obj_type_t cyw43_pin_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,
@@ -49,7 +48,7 @@ const mp_obj_type_t cyw43_pin_type = {
         )
 };
 
-//| def set_power_management(/, value:int) -> None:
+//| def set_power_management(value: int) -> None:
 //|     """Set the power management register
 //|
 //|     According to Raspberry Pi documentation, the value 0xa11140
@@ -58,7 +57,6 @@ const mp_obj_type_t cyw43_pin_type = {
 //|     Besides this value, there appears to be no other public documentation
 //|     of the values that can be used.
 //|     """
-//|
 STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
     mp_int_t value = mp_obj_get_int(value_in);
     cyw43_wifi_pm(&cyw43_state, value);

From a3bcfd6911f622b019d2f24e023b650f23d76e37 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 10:54:06 -0500
Subject: [PATCH 1068/2403] Add pin_CYW1 for SMPS_MODE

---
 ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c     | 4 ++--
 ports/raspberrypi/common-hal/microcontroller/__init__.c | 1 +
 ports/raspberrypi/peripherals/pins.c                    | 1 +
 ports/raspberrypi/peripherals/pins.h                    | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
index fb3570cc8a..86a6bacc5d 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
@@ -27,8 +27,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
 
-    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
-    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_CYW1) },
 
     { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
     { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index 5e79fbd0ce..1c9cfed196 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -184,6 +184,7 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO29), MP_ROM_PTR(&pin_GPIO29) },
     #if CIRCUITPY_CYW43
     { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
+    { MP_ROM_QSTR(MP_QSTR_CYW1), MP_ROM_PTR(&pin_CYW1) },
     #endif
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
diff --git a/ports/raspberrypi/peripherals/pins.c b/ports/raspberrypi/peripherals/pins.c
index e6a197f3be..d607add143 100644
--- a/ports/raspberrypi/peripherals/pins.c
+++ b/ports/raspberrypi/peripherals/pins.c
@@ -75,4 +75,5 @@ PIN(28);
 PIN(29);
 #if CIRCUITPY_CYW43
 CYW_PIN(0);
+CYW_PIN(1);
 #endif
diff --git a/ports/raspberrypi/peripherals/pins.h b/ports/raspberrypi/peripherals/pins.h
index 0a01b3959e..0c7021f808 100644
--- a/ports/raspberrypi/peripherals/pins.h
+++ b/ports/raspberrypi/peripherals/pins.h
@@ -72,6 +72,7 @@ extern const mcu_pin_obj_t pin_GPIO29;
 
 #if CIRCUITPY_CYW43
 extern const mcu_pin_obj_t pin_CYW0;
+extern const mcu_pin_obj_t pin_CYW1;
 #endif
 
 #endif  // MICROPY_INCLUDED_RASPBERRYPI_PERIPHERALS_PINS_H

From 510bd11f58ea6b933076c7565d2ca7abbb6ceaea Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 11:05:31 -0500
Subject: [PATCH 1069/2403] Enable reading back value of cyw43 pin

Now, `led.value = not led.value` works as a way to toggle the LED state.

Closes: #6959
---
 ports/raspberrypi/common-hal/digitalio/DigitalInOut.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index 1702254f9f..66efe3af92 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -140,6 +140,11 @@ void common_hal_digitalio_digitalinout_set_value(
 
 bool common_hal_digitalio_digitalinout_get_value(
     digitalio_digitalinout_obj_t *self) {
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        return cyw43_arch_gpio_get(self->pin->number);
+    }
+    #endif
     return gpio_get(self->pin->number);
 }
 

From 3609c29b270aabeae854c6d60073ade802b19775 Mon Sep 17 00:00:00 2001
From: flom84 
Date: Sun, 25 Sep 2022 19:49:46 +0200
Subject: [PATCH 1070/2403] Update STM DFU mode software implementation.

 - fix for sizeof array calculation.

 - follow ARM recommendation to turn off interruptions with NVIC.
---
 ports/stm/supervisor/port.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 7f31f3c7e5..b7ff229d36 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -290,13 +290,22 @@ condition and generating hardware reset or using Go command to execute user code
     HAL_RCC_DeInit();
     HAL_DeInit();
 
-    // disable all interupts
-    __disable_irq();
+    // Disable all pending interrupts using NVIC
+    for (uint8_t i = 0; i < (sizeof(NVIC->ICER) / sizeof(NVIC->ICER[0])); ++i) {
+        NVIC->ICER[i] = 0xFFFFFFFF;
+    }
 
-    // Clear all pending interrupts
-    for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / NVIC->ICPR[0]); ++i) {
+    // if it is necessary to ensure an interrupt will not be triggered after disabling it in the NVIC,
+    // add a DSB instruction and then an ISB instruction. (ARM Cortex™-M Programming Guide to
+    // Memory Barrier Instructions, 4.6 Disabling Interrupts using NVIC)
+    __DSB();
+    __ISB();
+
+    // Clear all pending interrupts using NVIC
+    for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / sizeof(NVIC->ICPR[0])); ++i) {
         NVIC->ICPR[i] = 0xFFFFFFFF;
     }
+
     // information about jump addresses has been taken from STM AN2606.
     #if defined(STM32F4)
     __set_MSP(*((uint32_t *)0x1FFF0000));

From 7af8a23ddfeeb3a1363251bc40fb34b312a6536f Mon Sep 17 00:00:00 2001
From: flom84 
Date: Thu, 29 Sep 2022 22:10:21 +0200
Subject: [PATCH 1071/2403] Use macro for computing size of array.

---
 ports/stm/supervisor/port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index b7ff229d36..896d58b013 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -291,7 +291,7 @@ condition and generating hardware reset or using Go command to execute user code
     HAL_DeInit();
 
     // Disable all pending interrupts using NVIC
-    for (uint8_t i = 0; i < (sizeof(NVIC->ICER) / sizeof(NVIC->ICER[0])); ++i) {
+    for (uint8_t i = 0; i < MP_ARRAY_SIZE(NVIC->ICER); ++i) {
         NVIC->ICER[i] = 0xFFFFFFFF;
     }
 
@@ -302,7 +302,7 @@ condition and generating hardware reset or using Go command to execute user code
     __ISB();
 
     // Clear all pending interrupts using NVIC
-    for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / sizeof(NVIC->ICPR[0])); ++i) {
+    for (uint8_t i = 0; i < MP_ARRAY_SIZE(NVIC->ICPR); ++i) {
         NVIC->ICPR[i] = 0xFFFFFFFF;
     }
 

From 9d1b12066da38760740eb5a167e28b61c0e9d79f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 29 Sep 2022 20:06:40 -0400
Subject: [PATCH 1072/2403] Espressif: do not hold pins during deep sleep if
 not necessary

---
 .../espressif/boards/adafruit_feather_esp32s2_tft/board.c  | 7 ++-----
 ports/espressif/common-hal/alarm/__init__.c                | 3 ---
 ports/espressif/common-hal/microcontroller/Pin.c           | 6 ++++++
 shared-bindings/alarm/__init__.c                           | 6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index 9a57765ef0..c5b47a2f95 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -88,9 +88,6 @@ void board_init(void) {
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
 
-    // workaround as board_init() is called before reset_port() in main.c
-///    pwmout_reset();
-
     common_hal_displayio_display_construct(
         display,
         bus,
@@ -127,8 +124,8 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
         // Turn on TFT and I2C
-        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(21, true);
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
         return true;
     }
     return false;
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index a47930850d..11c740b717 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -173,9 +173,6 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
     // We no longer need to remember the pin preservations, since any pin resets are all done.
     clear_pin_preservations();
 
-    // Allow pin holds to work during deep sleep.
-    gpio_deep_sleep_hold_en();
-
     // The ESP-IDF caches the deep sleep settings and applies them before sleep.
     // We don't need to worry about resetting them in the interim.
     esp_deep_sleep_start();
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index adc1e8b918..12081c7e40 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -173,6 +173,12 @@ void preserve_pin_number(gpio_num_t pin_number) {
         gpio_hold_en(pin_number);
         _preserved_pin_mask |= PIN_BIT(pin_number);
     }
+    if (_preserved_pin_mask) {
+        // Allow pin holds to work during deep sleep. This increases power consumption noticeably
+        // during deep sleep, so enable holds only if we actually are holding some pins.
+        // 270uA or so extra current is consumed even with no pins held.
+        gpio_deep_sleep_hold_en();
+    }
 }
 
 void clear_pin_preservations(void) {
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 9b992f7432..517c1b7e61 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -143,6 +143,12 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|
 //|     On some microcontrollers, some pins cannot remain in their original state for hardware reasons.
 //|
+//|     .. note::
+//|       On Espressif chips, preserving pin settings during deep sleep may consume extra current.
+//|       On ESP32, this was measured to be 250 uA or more.
+//|       Consider not preserving pins unless you need to.
+//|       Measure power consumption carefully both with no pins preserved and with the pins you might want to
+//|       preserve to achieve the lowest consumption.
 //|
 //|     **If CircuitPython is connected to a host computer via USB or BLE
 //|     the first time a deep sleep is requested,

From 4de9487820fb10586e839c07e6ccda205a06e2db Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 19:26:12 -0500
Subject: [PATCH 1073/2403] It turns out you CAN have too many GPIO

---
 ports/raspberrypi/Makefile                              | 2 +-
 ports/raspberrypi/common-hal/microcontroller/__init__.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 059ad79126..6d7b3f717a 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -65,7 +65,7 @@ INC_CYW43 := \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DCYW43_LOGIC_DEBUG=0
+CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DCYW43_LOGIC_DEBUG=0
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
 	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index 1c9cfed196..c957d15eac 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -173,7 +173,9 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO20), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_GPIO21), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_GPIO22), MP_ROM_PTR(&pin_GPIO22) },
+    #if !defined(IGNORE_GPIO23)
     { MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_GPIO24), MP_ROM_PTR(&pin_GPIO24) },
     #if !defined(IGNORE_GPIO25)
     { MP_ROM_QSTR(MP_QSTR_GPIO25), MP_ROM_PTR(&pin_GPIO25) },

From 325cbb156490022b264581acb1fe6f5abaef0fc9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 21:37:23 -0500
Subject: [PATCH 1074/2403] exclude files from doc build

---
 conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf.py b/conf.py
index ad35596d7a..90f58979d9 100644
--- a/conf.py
+++ b/conf.py
@@ -213,6 +213,7 @@ exclude_patterns = ["**/build*",
                     "ports/nrf/peripherals",
                     "ports/nrf/usb",
                     "ports/raspberrypi/sdk",
+                    "ports/raspberrypi/lib",
                     "ports/stm/st_driver",
                     "ports/stm/packages",
                     "ports/stm/peripherals",

From 3281e14be1f1810ee3dc397f9cd0293a516bfb06 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 21:37:34 -0500
Subject: [PATCH 1075/2403] fix reference to board module

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 0856139569..a334873b99 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -36,7 +36,7 @@
 //|     """A class that represents a GPIO pin attached to the wifi chip.
 //|
 //|     Cannot be constructed at runtime, but may be the type of a pin object
-//|     in `board`. A `CywPin` can be used as a DigitalInOut, but not with other
+//|     in :py:mod:`board`. A `CywPin` can be used as a DigitalInOut, but not with other
 //|     peripherals such as `PWMOut`."""
 const mp_obj_type_t cyw43_pin_type = {
     { &mp_type_type },

From 83a138cfbc7f31636af6c1f0354999f87f8f09c8 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 28 Sep 2022 22:28:29 +0000
Subject: [PATCH 1076/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4657581bc9..198a024bad 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: 2022-09-19 21:21+0000\n"
+"PO-Revision-Date: 2022-09-30 08:18+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -947,7 +947,7 @@ msgstr "Esperado um"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "Era esperado um %q ou %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
@@ -2282,7 +2282,7 @@ msgstr "Ocorreu um erro desconhecido no firmware do sistema: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "Código de erro desconhecido %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
@@ -4371,7 +4371,7 @@ msgstr "o wifi não está ativo"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "O wifi.Monitor não está disponível"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"

From 7107995efdcd23222355c0495441e0c503d3c8a3 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 29 Sep 2022 08:15:36 +0000
Subject: [PATCH 1077/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index d103924e57..5fbf047833 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: 2022-09-16 18:51+0000\n"
+"PO-Revision-Date: 2022-09-30 08:18+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.14.1-dev\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: main.c
 msgid ""
@@ -936,7 +936,7 @@ msgstr "Förväntade %q"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "Förväntade %q eller %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
@@ -2257,7 +2257,7 @@ msgstr "Okänt fel i systemets firmware: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "Okänd felkod %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
@@ -4332,7 +4332,7 @@ msgstr "wifi är inte aktiverat"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor är inte tillgänglig"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"

From 84c7ac4a812a394f7196f1af5ffa954f0b457f98 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 07:56:59 -0500
Subject: [PATCH 1078/2403] Make cyw43.set_power_management() be a function as
 intended

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index a334873b99..e6974090c8 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -80,7 +80,7 @@ const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
 STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
     { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
-    { MP_ROM_QSTR(MP_QSTR_set_power_management), MP_ROM_QSTR(MP_QSTR_set_power_management) },
+    { MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table);

From 09128891068543f89633b4610c10f7707be91c14 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 10:05:11 -0500
Subject: [PATCH 1079/2403] raspberrypi: statically allocate storage for
 hostname

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 8 ++++----
 ports/raspberrypi/common-hal/wifi/Radio.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index f4c22f789a..9ed69d6000 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -92,10 +92,10 @@ mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
-    self->hostname = mp_obj_new_str(hostname, strlen(hostname));
-    hostname = mp_obj_str_get_str(self->hostname);
-    netif_set_hostname(NETIF_STA, hostname);
-    netif_set_hostname(NETIF_AP, hostname);
+    assert(strlen(hostname) < MP_ARRAY_SIZE(self->hostname));
+    memcpy(self->hostname, hostname, strlen(hostname));
+    netif_set_hostname(NETIF_STA, self->hostname);
+    netif_set_hostname(NETIF_AP, self->hostname);
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.h b/ports/raspberrypi/common-hal/wifi/Radio.h
index 5e40e64ec6..0dc18c8957 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.h
+++ b/ports/raspberrypi/common-hal/wifi/Radio.h
@@ -33,7 +33,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    mp_obj_t hostname;
+    char hostname[254]; // hostname max is 253 chars, + 1 for trailing NUL
     wifi_scannednetworks_obj_t *current_scan;
 } wifi_radio_obj_t;
 

From 63c9d9234fcdc04b09c2723c209370dbd2ea371f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 30 Sep 2022 11:15:32 -0400
Subject: [PATCH 1080/2403] update frozen libraries for 8.0.0-beta.1

---
 frozen/Adafruit_CircuitPython_APDS9960                      | 2 +-
 frozen/Adafruit_CircuitPython_BLE                           | 2 +-
 frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +-
 frozen/Adafruit_CircuitPython_BusDevice                     | 2 +-
 frozen/Adafruit_CircuitPython_CircuitPlayground             | 2 +-
 frozen/Adafruit_CircuitPython_Crickit                       | 2 +-
 frozen/Adafruit_CircuitPython_DRV2605                       | 2 +-
 frozen/Adafruit_CircuitPython_DS3231                        | 2 +-
 frozen/Adafruit_CircuitPython_Display_Shapes                | 2 +-
 frozen/Adafruit_CircuitPython_Display_Text                  | 2 +-
 frozen/Adafruit_CircuitPython_DotStar                       | 2 +-
 frozen/Adafruit_CircuitPython_ESP32SPI                      | 2 +-
 frozen/Adafruit_CircuitPython_FakeRequests                  | 2 +-
 frozen/Adafruit_CircuitPython_FocalTouch                    | 2 +-
 frozen/Adafruit_CircuitPython_HID                           | 2 +-
 frozen/Adafruit_CircuitPython_IRRemote                      | 2 +-
 frozen/Adafruit_CircuitPython_IS31FL3731                    | 2 +-
 frozen/Adafruit_CircuitPython_LC709203F                     | 2 +-
 frozen/Adafruit_CircuitPython_LIS3DH                        | 2 +-
 frozen/Adafruit_CircuitPython_LSM6DS                        | 2 +-
 frozen/Adafruit_CircuitPython_MIDI                          | 2 +-
 frozen/Adafruit_CircuitPython_Motor                         | 2 +-
 frozen/Adafruit_CircuitPython_NeoPixel                      | 2 +-
 frozen/Adafruit_CircuitPython_PortalBase                    | 2 +-
 frozen/Adafruit_CircuitPython_ProgressBar                   | 2 +-
 frozen/Adafruit_CircuitPython_RFM69                         | 2 +-
 frozen/Adafruit_CircuitPython_RFM9x                         | 2 +-
 frozen/Adafruit_CircuitPython_Register                      | 2 +-
 frozen/Adafruit_CircuitPython_Requests                      | 2 +-
 frozen/Adafruit_CircuitPython_SD                            | 2 +-
 frozen/Adafruit_CircuitPython_ST7789                        | 2 +-
 frozen/Adafruit_CircuitPython_SimpleIO                      | 2 +-
 frozen/Adafruit_CircuitPython_SimpleMath                    | 2 +-
 frozen/Adafruit_CircuitPython_Thermistor                    | 2 +-
 frozen/Adafruit_CircuitPython_Ticks                         | 2 +-
 frozen/Adafruit_CircuitPython_asyncio                       | 2 +-
 frozen/Adafruit_CircuitPython_seesaw                        | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
index f91ffb1a3e..ba05423ed9 160000
--- a/frozen/Adafruit_CircuitPython_APDS9960
+++ b/frozen/Adafruit_CircuitPython_APDS9960
@@ -1 +1 @@
-Subproject commit f91ffb1a3e77802349f233964e0faed9708a04fe
+Subproject commit ba05423ed9aae09ce293603b519a4ac644ef0dab
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
index 5c1a51f8ad..4fd499e397 160000
--- a/frozen/Adafruit_CircuitPython_BLE
+++ b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit 5c1a51f8ad505e90a6c1b58c4d7926c59dd627d6
+Subproject commit 4fd499e39720f8ce970cceeb97c2a85c485f7335
diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
index 810232a6df..b06b47037a 160000
--- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
+++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
@@ -1 +1 @@
-Subproject commit 810232a6df1c5342b9c89268893025bca2645a0f
+Subproject commit b06b47037aed97475b1676b104d1f4b05c3f5e86
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
index 5f6ac40707..9ace770b04 160000
--- a/frozen/Adafruit_CircuitPython_BusDevice
+++ b/frozen/Adafruit_CircuitPython_BusDevice
@@ -1 +1 @@
-Subproject commit 5f6ac407074c61806c9bf0b78987e1c0ed234dd0
+Subproject commit 9ace770b048be9ab0da4a154af279dbb643bbdb0
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
index f5351add4b..47f848f13f 160000
--- a/frozen/Adafruit_CircuitPython_CircuitPlayground
+++ b/frozen/Adafruit_CircuitPython_CircuitPlayground
@@ -1 +1 @@
-Subproject commit f5351add4bfc2aae1ba8f9078f4a734a0893e8ba
+Subproject commit 47f848f13f75d2f62d16407edaaf6dd0ec1fc3cc
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
index 62113618a0..a37c7cc836 160000
--- a/frozen/Adafruit_CircuitPython_Crickit
+++ b/frozen/Adafruit_CircuitPython_Crickit
@@ -1 +1 @@
-Subproject commit 62113618a07dd4f33310e8454bd59915b376e3cb
+Subproject commit a37c7cc83685f2ff84a171a519207567a75d0947
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
index f7bc753d37..4a4619a524 160000
--- a/frozen/Adafruit_CircuitPython_DRV2605
+++ b/frozen/Adafruit_CircuitPython_DRV2605
@@ -1 +1 @@
-Subproject commit f7bc753d37b840d0c1dcbdd977a97d1f68fac306
+Subproject commit 4a4619a524918f2705c05ca4959385937afa9a7c
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
index f70254c588..726270f510 160000
--- a/frozen/Adafruit_CircuitPython_DS3231
+++ b/frozen/Adafruit_CircuitPython_DS3231
@@ -1 +1 @@
-Subproject commit f70254c588e4be37d92960c8067905ac57243aa2
+Subproject commit 726270f5103d9d94810eb8b52041b7521afafc5c
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
index bcd9e5c085..288a4f553d 160000
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit bcd9e5c085081175f2dc1b2ce1eba75cfe4be062
+Subproject commit 288a4f553d2f616331b5a042568c97b5bb0e44a7
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index c82b8138e1..41f06c33ef 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit c82b8138e13f4e3d580081929fb34afdb56f59fc
+Subproject commit 41f06c33ef7a029210416ac61319698f5768e83e
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
index 1b39a6990c..d645fc2ade 160000
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@@ -1 +1 @@
-Subproject commit 1b39a6990c7d18a1c883b5721f2e49cd5fbfc64e
+Subproject commit d645fc2aded3606e5b0c17689e9f29e7e56bb612
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
index 9cca65bd52..ee6bfcf9e6 160000
--- a/frozen/Adafruit_CircuitPython_ESP32SPI
+++ b/frozen/Adafruit_CircuitPython_ESP32SPI
@@ -1 +1 @@
-Subproject commit 9cca65bd52f1b0be672fa8c1ea74b278366851a9
+Subproject commit ee6bfcf9e676eb435c8890db37f07719984a60a1
diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests
index 3198742a78..8eedf860be 160000
--- a/frozen/Adafruit_CircuitPython_FakeRequests
+++ b/frozen/Adafruit_CircuitPython_FakeRequests
@@ -1 +1 @@
-Subproject commit 3198742a78996db3118e0e4db3d142e37b7f58a1
+Subproject commit 8eedf860beca0d32219189b72ea6fc8eea7e66db
diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch
index 04608edb68..3d7d404a1c 160000
--- a/frozen/Adafruit_CircuitPython_FocalTouch
+++ b/frozen/Adafruit_CircuitPython_FocalTouch
@@ -1 +1 @@
-Subproject commit 04608edb68bc72c015de570b6edf6cc598920acc
+Subproject commit 3d7d404a1cafc02f6c3391b100157490132e5c5f
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
index 4d68643dcd..93c7e0ed55 160000
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@@ -1 +1 @@
-Subproject commit 4d68643dcd779e63b4eada09fa84b1ad43c83362
+Subproject commit 93c7e0ed55e7ed011908ac9a1c0f8228f0f4323b
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
index 9464b4cad1..992b601e24 160000
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@@ -1 +1 @@
-Subproject commit 9464b4cad1f252807cd431a39984182bdd7a0cce
+Subproject commit 992b601e2469f30e95ec35c9859b4aa2cd917504
diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731
index 8e2069de65..794488d1de 160000
--- a/frozen/Adafruit_CircuitPython_IS31FL3731
+++ b/frozen/Adafruit_CircuitPython_IS31FL3731
@@ -1 +1 @@
-Subproject commit 8e2069de65e1b2002ca375e9046ba6e608052c87
+Subproject commit 794488d1de3d17d1a08887c4a651cfac2c5a1524
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
index 80f1d250f4..1919916dcf 160000
--- a/frozen/Adafruit_CircuitPython_LC709203F
+++ b/frozen/Adafruit_CircuitPython_LC709203F
@@ -1 +1 @@
-Subproject commit 80f1d250f4caef3e81760dc7df56bd250210f29b
+Subproject commit 1919916dcf57e0879832b9c274c5fb77712d7775
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index 0a26239184..18eaddb96a 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 0a262391849fa75671c999e9374bf6b160771246
+Subproject commit 18eaddb96aa6599901ef2ff0e140e89a2de8c5d0
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
index 87f8b1ddff..c8e82b96c6 160000
--- a/frozen/Adafruit_CircuitPython_LSM6DS
+++ b/frozen/Adafruit_CircuitPython_LSM6DS
@@ -1 +1 @@
-Subproject commit 87f8b1ddff699b98e7b58d1c969c0c3633661a08
+Subproject commit c8e82b96c68041a11a52f3053d0d2733ae2d1a49
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
index 1107fe1520..b6891e7341 160000
--- a/frozen/Adafruit_CircuitPython_MIDI
+++ b/frozen/Adafruit_CircuitPython_MIDI
@@ -1 +1 @@
-Subproject commit 1107fe1520406c20bc561535d72df9ac6ae4d172
+Subproject commit b6891e734183f978e7b3d0a363140e98635c0a04
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
index b0aca1110b..31c819f377 160000
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit b0aca1110b4446bc7952d66233b559256cd4377d
+Subproject commit 31c819f377cf71f61cfb84eae159f1f948980db7
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
index a4e11ce3a7..1064fdee5a 160000
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit a4e11ce3a7f5886c706da5778baf1dd653172c94
+Subproject commit 1064fdee5a1421f528af452be5e45ae95ef2b89a
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
index b9201eb175..7eeea1aaf6 160000
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit b9201eb175823b82d56168b0b539847093866090
+Subproject commit 7eeea1aaf6bb5fa0deb080a1dc1aa3cd103f9aad
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
index 0af8820605..cad34af526 160000
--- a/frozen/Adafruit_CircuitPython_ProgressBar
+++ b/frozen/Adafruit_CircuitPython_ProgressBar
@@ -1 +1 @@
-Subproject commit 0af8820605c0858f50f3242fbd1ce3a576bec819
+Subproject commit cad34af5267aca3665fdaf1ea5a0eee921d13f06
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
index 2fc2bfb8f5..a815f364ba 160000
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit 2fc2bfb8f52afc2ec1f31e8d860358547b2f8a9a
+Subproject commit a815f364badc0dac3fe49e7d8206d00ce95894e1
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
index 6b018cbeb6..df4c73a5e7 160000
--- a/frozen/Adafruit_CircuitPython_RFM9x
+++ b/frozen/Adafruit_CircuitPython_RFM9x
@@ -1 +1 @@
-Subproject commit 6b018cbeb60d6a30088c866a9b1bc46166209735
+Subproject commit df4c73a5e719f17fae0309e811ff17627cd0f268
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
index 9c71a86d54..f611d5e31c 160000
--- a/frozen/Adafruit_CircuitPython_Register
+++ b/frozen/Adafruit_CircuitPython_Register
@@ -1 +1 @@
-Subproject commit 9c71a86d54015260bd40ad4bc8d0258c930bcc64
+Subproject commit f611d5e31c9735a3c3ac43185e35dcd5f659e3aa
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index 9ad59c3bc5..a5d56f3e48 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit 9ad59c3bc5e2fdc341779ccbbe2d78560c5d681f
+Subproject commit a5d56f3e4866c8dbb343e03500355a42c46e557a
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
index ab504a86af..c59df6b8c3 160000
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit ab504a86afb583bbe9008884bc01b33f0654a0dd
+Subproject commit c59df6b8c3d8006c290b63e95996e49e8e7124c0
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
index 4a094ea8e0..9ff56ce53f 160000
--- a/frozen/Adafruit_CircuitPython_ST7789
+++ b/frozen/Adafruit_CircuitPython_ST7789
@@ -1 +1 @@
-Subproject commit 4a094ea8e0ca902e7c61822060e149d73fa18ce5
+Subproject commit 9ff56ce53f05e23ff678965ba54af89b24b1199a
diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO
index 60d9df0ca0..0a8fcbfc92 160000
--- a/frozen/Adafruit_CircuitPython_SimpleIO
+++ b/frozen/Adafruit_CircuitPython_SimpleIO
@@ -1 +1 @@
-Subproject commit 60d9df0ca09b5005ea0c03b94daae854983d79bd
+Subproject commit 0a8fcbfc92060eb298ea52d5e88587b37347a0be
diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath
index 1156062b06..dc605bb229 160000
--- a/frozen/Adafruit_CircuitPython_SimpleMath
+++ b/frozen/Adafruit_CircuitPython_SimpleMath
@@ -1 +1 @@
-Subproject commit 1156062b06771afd37da54d0b690a84ef611a78b
+Subproject commit dc605bb22914d77d80c5342cbb4c10f773aede95
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
index 79ff12be05..43a4f15d60 160000
--- a/frozen/Adafruit_CircuitPython_Thermistor
+++ b/frozen/Adafruit_CircuitPython_Thermistor
@@ -1 +1 @@
-Subproject commit 79ff12be057ff5975e52ad273e087d74deb147ab
+Subproject commit 43a4f15d604919d6e143e975a85abf7b96a4061d
diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks
index 704cac4af3..5436a0f27f 160000
--- a/frozen/Adafruit_CircuitPython_Ticks
+++ b/frozen/Adafruit_CircuitPython_Ticks
@@ -1 +1 @@
-Subproject commit 704cac4af3dccf8e452e69eb8f9f22fe8db26f83
+Subproject commit 5436a0f27f33b364035ce499c020b274d77a25b7
diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio
index 339e037bf6..3e8c50eb22 160000
--- a/frozen/Adafruit_CircuitPython_asyncio
+++ b/frozen/Adafruit_CircuitPython_asyncio
@@ -1 +1 @@
-Subproject commit 339e037bf6cf30e03fab6fa5b1b9f669821f7685
+Subproject commit 3e8c50eb2230de7b8a20dedac33334b5dbdee21e
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
index 73b78e2424..6234787515 160000
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@@ -1 +1 @@
-Subproject commit 73b78e242424b865785d5e66ccef949bdacf7214
+Subproject commit 6234787515e2f0ece40b6408722ff0b42824038e

From 907c5d387f4ca509a647105b30f689850e6baeb0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 19:22:32 -0500
Subject: [PATCH 1081/2403] Tweak black_bindings

Originally, black_bindings found each contiguous "//|" block and sent
it to black independently. This was slower than it needed to be.

Instead, swap the comment prefix: when running black, take off
"//|" prefixes and put "##|" prefixes on all un-prefixed lines.
Then, after black is run, do the opposite operation

This more than doubles the overall speed of "pre-commit run --all",
from 3m20s to 55s CPU time on my local machine (32.5s to under 10s
"elapsed" time)

It also causes a small amount of churn in the bindings, because
black now sees enough context to know whether one 'def' follows another
or ends the 'def's in a 'class'. In the latter case, it adds an extra
newline, which becomes a "//|" line.

I'm less sure why a trailing comma was omitted before down in
rp2pio/StateMachine.c but let's roll with it.
---
 ports/atmel-samd/bindings/samd/Clock.c        |   2 +
 .../broadcom/bindings/videocore/Framebuffer.c |   1 +
 .../espressif/bindings/esp32_camera/Camera.c  |   1 +
 .../bindings/esp32_camera/__init__.c          |   4 +
 ports/espressif/bindings/espidf/__init__.c    |   7 +
 ports/raspberrypi/bindings/cyw43/__init__.c   |   2 +
 .../bindings/rp2pio/StateMachine.c            |   9 +-
 ports/raspberrypi/bindings/rp2pio/__init__.c  |   1 +
 shared-bindings/_bleio/Adapter.c              |   2 +
 shared-bindings/_bleio/Address.c              |   2 +
 shared-bindings/_bleio/Attribute.c            |   1 +
 shared-bindings/_bleio/Characteristic.c       |   1 +
 shared-bindings/_bleio/CharacteristicBuffer.c |   1 +
 shared-bindings/_bleio/Connection.c           |   2 +
 shared-bindings/_bleio/Descriptor.c           |   1 +
 shared-bindings/_bleio/PacketBuffer.c         |   1 +
 shared-bindings/_bleio/ScanEntry.c            |   2 +
 shared-bindings/_bleio/ScanResults.c          |   2 +
 shared-bindings/_bleio/Service.c              |   1 +
 shared-bindings/_bleio/UUID.c                 |   1 +
 shared-bindings/_bleio/__init__.c             |   4 +
 shared-bindings/_eve/__init__.c               |   1 +
 shared-bindings/_pew/PewPew.c                 |   1 +
 shared-bindings/_stage/Layer.c                |   1 +
 shared-bindings/_stage/Text.c                 |   1 +
 shared-bindings/_stage/__init__.c             |   1 +
 .../i2c_device/I2CDevice.c                    |   1 +
 .../spi_device/SPIDevice.c                    |   1 +
 shared-bindings/adafruit_pixelbuf/PixelBuf.c  |   1 +
 shared-bindings/aesio/aes.c                   |   1 +
 shared-bindings/alarm/SleepMemory.c           |   2 +
 shared-bindings/alarm/__init__.c              |   2 +
 shared-bindings/alarm/pin/PinAlarm.c          |   1 +
 shared-bindings/alarm/time/TimeAlarm.c        |   1 +
 shared-bindings/alarm/touch/TouchAlarm.c      |   1 +
 shared-bindings/analogbufio/BufferedIn.c      |   2 +
 shared-bindings/analogio/AnalogIn.c           |   2 +
 shared-bindings/analogio/AnalogOut.c          |   1 +
 shared-bindings/atexit/__init__.c             |   2 +
 shared-bindings/audiobusio/I2SOut.c           |   1 +
 shared-bindings/audiobusio/PDMIn.c            |   1 +
 shared-bindings/audiocore/RawSample.c         |   1 +
 shared-bindings/audiocore/WaveFile.c          |   1 +
 shared-bindings/audioio/AudioOut.c            |   1 +
 shared-bindings/audiomixer/Mixer.c            |   1 +
 shared-bindings/audiomixer/MixerVoice.c       |   1 +
 shared-bindings/audiomp3/MP3Decoder.c         |   1 +
 shared-bindings/audiopwmio/PWMAudioOut.c      |   1 +
 shared-bindings/bitbangio/I2C.c               |   1 +
 shared-bindings/bitbangio/SPI.c               |   1 +
 shared-bindings/bitmaptools/__init__.c        |   9 ++
 shared-bindings/bitops/__init__.c             |   1 +
 shared-bindings/board/__init__.c              |   3 +
 shared-bindings/busio/I2C.c                   |   1 +
 shared-bindings/busio/SPI.c                   |   1 +
 shared-bindings/busio/UART.c                  |   2 +
 shared-bindings/camera/Camera.c               |   2 +
 shared-bindings/camera/ImageFormat.c          |   1 +
 shared-bindings/canio/CAN.c                   |   1 +
 shared-bindings/canio/Listener.c              |   2 +
 shared-bindings/canio/Match.c                 |   1 +
 shared-bindings/canio/Message.c               |   1 +
 .../canio/RemoteTransmissionRequest.c         |   1 +
 shared-bindings/canio/__init__.c              |   1 +
 shared-bindings/countio/Counter.c             |   1 +
 shared-bindings/countio/Edge.c                |   1 +
 shared-bindings/digitalio/DigitalInOut.c      |   1 +
 shared-bindings/digitalio/Direction.c         |   1 +
 shared-bindings/digitalio/DriveMode.c         |   1 +
 shared-bindings/digitalio/Pull.c              |   1 +
 shared-bindings/displayio/Bitmap.c            |   1 +
 shared-bindings/displayio/ColorConverter.c    |   1 +
 shared-bindings/displayio/Colorspace.c        |   1 +
 shared-bindings/displayio/Display.c           |   1 +
 shared-bindings/displayio/EPaperDisplay.c     |   1 +
 shared-bindings/displayio/FourWire.c          |   1 +
 shared-bindings/displayio/Group.c             |   1 +
 shared-bindings/displayio/I2CDisplay.c        |   1 +
 shared-bindings/displayio/OnDiskBitmap.c      |   1 +
 shared-bindings/displayio/Palette.c           |   1 +
 shared-bindings/displayio/Shape.c             |   1 +
 shared-bindings/displayio/TileGrid.c          |   1 +
 shared-bindings/displayio/__init__.c          |   2 +
 shared-bindings/dotenv/__init__.c             |   3 +
 shared-bindings/dualbank/__init__.c           |   2 +
 shared-bindings/floppyio/__init__.c           |   2 +
 shared-bindings/fontio/BuiltinFont.c          |   2 +
 shared-bindings/fontio/Glyph.c                |   1 +
 .../framebufferio/FramebufferDisplay.c        |   1 +
 shared-bindings/frequencyio/FrequencyIn.c     |   1 +
 shared-bindings/getpass/__init__.c            |   1 +
 shared-bindings/gifio/GifWriter.c             |   1 +
 shared-bindings/gnss/GNSS.c                   |   2 +
 shared-bindings/gnss/PositionFix.c            |   1 +
 shared-bindings/gnss/SatelliteSystem.c        |   1 +
 shared-bindings/hashlib/Hash.c                |   2 +
 shared-bindings/hashlib/__init__.c            |   1 +
 shared-bindings/i2ctarget/I2CTarget.c         |   2 +
 .../imagecapture/ParallelImageCapture.c       |   1 +
 shared-bindings/ipaddress/IPv4Address.c       |   2 +
 shared-bindings/ipaddress/__init__.c          |   1 +
 shared-bindings/is31fl3741/FrameBuffer.c      |   1 +
 shared-bindings/is31fl3741/IS31FL3741.c       |   6 +
 shared-bindings/keypad/Event.c                |   1 +
 shared-bindings/keypad/EventQueue.c           |   1 +
 shared-bindings/keypad/KeyMatrix.c            |   1 +
 shared-bindings/keypad/Keys.c                 |   1 +
 shared-bindings/keypad/ShiftRegisterKeys.c    |   1 +
 shared-bindings/math/__init__.c               |  14 ++
 shared-bindings/mdns/RemoteService.c          |   2 +
 shared-bindings/mdns/Server.c                 |   2 +
 .../memorymonitor/AllocationAlarm.c           |   1 +
 .../memorymonitor/AllocationSize.c            |   1 +
 shared-bindings/memorymonitor/__init__.c      |   1 +
 shared-bindings/microcontroller/Pin.c         |   1 +
 shared-bindings/microcontroller/Processor.c   |   2 +
 shared-bindings/microcontroller/ResetReason.c |   1 +
 shared-bindings/microcontroller/RunMode.c     |   1 +
 shared-bindings/microcontroller/__init__.c    |   6 +
 shared-bindings/msgpack/ExtType.c             |   1 +
 shared-bindings/msgpack/__init__.c            |   2 +
 shared-bindings/multiterminal/__init__.c      |   4 +
 shared-bindings/neopixel_write/__init__.c     |   1 +
 shared-bindings/nvm/ByteArray.c               |   1 +
 shared-bindings/onewireio/OneWire.c           |   1 +
 shared-bindings/os/__init__.c                 |  14 ++
 shared-bindings/paralleldisplay/ParallelBus.c |   1 +
 shared-bindings/ps2io/Ps2.c                   |   1 +
 shared-bindings/pulseio/PulseIn.c             |   1 +
 shared-bindings/pulseio/PulseOut.c            |   1 +
 shared-bindings/pwmio/PWMOut.c                |   1 +
 shared-bindings/qrio/PixelPolicy.c            |   1 +
 shared-bindings/qrio/QRDecoder.c              |   1 +
 shared-bindings/qrio/QRInfo.c                 |   1 +
 shared-bindings/rainbowio/__init__.c          |   1 +
 shared-bindings/random/__init__.c             |   7 +
 shared-bindings/rgbmatrix/RGBMatrix.c         |   2 +
 shared-bindings/rotaryio/IncrementalEncoder.c |   1 +
 shared-bindings/rtc/RTC.c                     |   1 +
 shared-bindings/rtc/__init__.c                |   1 +
 shared-bindings/sdcardio/SDCard.c             |   1 +
 shared-bindings/sdioio/SDCard.c               |   1 +
 shared-bindings/socketpool/Socket.c           |   2 +
 shared-bindings/socketpool/SocketPool.c       |   1 +
 shared-bindings/ssl/SSLContext.c              |   2 +
 shared-bindings/ssl/SSLSocket.c               |   2 +
 shared-bindings/ssl/__init__.c                |   1 +
 shared-bindings/storage/__init__.c            |   8 ++
 shared-bindings/struct/__init__.c             |   5 +
 shared-bindings/supervisor/RunReason.c        |   1 +
 shared-bindings/supervisor/Runtime.c          |   2 +
 shared-bindings/supervisor/StatusBar.c        |   2 +
 shared-bindings/supervisor/__init__.c         |   9 ++
 shared-bindings/synthio/MidiTrack.c           |   1 +
 shared-bindings/synthio/__init__.c            |   1 +
 shared-bindings/terminalio/Terminal.c         |   1 +
 shared-bindings/time/__init__.c               |   7 +
 shared-bindings/touchio/TouchIn.c             |   2 +
 shared-bindings/traceback/__init__.c          |   2 +
 shared-bindings/uheap/__init__.c              |   1 +
 shared-bindings/usb/core/Device.c             |   1 +
 shared-bindings/usb/core/__init__.c           |   3 +
 shared-bindings/usb_cdc/Serial.c              |   1 +
 shared-bindings/usb_cdc/__init__.c            |   2 +
 shared-bindings/usb_hid/Device.c              |   1 +
 shared-bindings/usb_hid/__init__.c            |   3 +
 shared-bindings/usb_host/Port.c               |   1 +
 shared-bindings/usb_midi/PortIn.c             |   1 +
 shared-bindings/usb_midi/PortOut.c            |   1 +
 shared-bindings/usb_midi/__init__.c           |   2 +
 shared-bindings/ustack/__init__.c             |   3 +
 shared-bindings/vectorio/Circle.c             |   1 +
 shared-bindings/vectorio/Polygon.c            |   1 +
 shared-bindings/vectorio/Rectangle.c          |   1 +
 shared-bindings/watchdog/WatchDogMode.c       |   1 +
 shared-bindings/watchdog/WatchDogTimer.c      |   2 +
 shared-bindings/watchdog/__init__.c           |   1 +
 shared-bindings/wifi/AuthMode.c               |   1 +
 shared-bindings/wifi/Monitor.c                |   6 +
 shared-bindings/wifi/Network.c                |   2 +
 shared-bindings/wifi/Packet.c                 |   1 +
 shared-bindings/wifi/Radio.c                  |   2 +
 shared-bindings/wifi/ScannedNetworks.c        |   2 +
 shared-bindings/zlib/__init__.c               |   1 +
 tools/black_bindings.py                       | 126 +++++++++++++-----
 185 files changed, 427 insertions(+), 37 deletions(-)

diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c
index 354f0e0630..00c1959ccf 100644
--- a/ports/atmel-samd/bindings/samd/Clock.c
+++ b/ports/atmel-samd/bindings/samd/Clock.c
@@ -35,6 +35,7 @@
 //|
 //|     They are fixed by the hardware so they cannot be constructed on demand. Instead, use
 //|     ``samd.clock`` to reference the desired clock."""
+//|
 
 STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -92,6 +93,7 @@ MP_PROPERTY_GETTER(samd_clock_frequency_obj,
 
 //|     calibration: int
 //|     """Clock calibration. Not all clocks can be calibrated."""
+//|
 STATIC mp_obj_t samd_clock_get_calibration(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int_from_uint(clock_get_calibration(self->type, self->index));
diff --git a/ports/broadcom/bindings/videocore/Framebuffer.c b/ports/broadcom/bindings/videocore/Framebuffer.c
index d03be1fa57..39c5e71467 100644
--- a/ports/broadcom/bindings/videocore/Framebuffer.c
+++ b/ports/broadcom/bindings/videocore/Framebuffer.c
@@ -98,6 +98,7 @@ MP_PROPERTY_GETTER(videocore_framebuffer_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
+//|
 STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) {
     videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index c34fa7ae66..a770ea8ff7 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -928,6 +928,7 @@ MP_PROPERTY_GETTER(esp32_camera_camera_grab_mode_obj,
 
 //|     framebuffer_count: int
 //|     """True if double buffering is used"""
+//|
 STATIC mp_obj_t esp32_camera_camera_get_framebuffer_count(const mp_obj_t self_in) {
     esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index a4fcaabad3..f1ee4b6891 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -54,6 +54,7 @@
 //|
 //|     LATEST: GrabMode
 //|     """Except when 1 frame buffer is used, queue will always contain the last ``fb_count`` frames"""
+//|
 
 MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);
 MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, LATEST, CAMERA_GRAB_LATEST);
@@ -82,6 +83,7 @@ camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
 //|
 //|     JPEG: PixelFormat
 //|     """A compressed format"""
+//|
 
 MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, RGB565, PIXFORMAT_RGB565);
 MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, GRAYSCALE, PIXFORMAT_GRAYSCALE);
@@ -169,6 +171,7 @@ pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
 //|
 //|     QSXGA: FrameSize
 //|     """2560x1920"""
+//|
 
 MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R96X96, FRAMESIZE_96X96);
 MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R240X240, FRAMESIZE_240X240);
@@ -237,6 +240,7 @@ framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
 //|     GAIN_32X: GainCeiling
 //|     GAIN_64X: GainCeiling
 //|     GAIN_128X: GainCeiling
+//|
 
 MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_2X, GAINCEILING_2X);
 MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_4X, GAINCEILING_4X);
diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index 499121852d..c42a9e549d 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -41,6 +41,7 @@
 //| def heap_caps_get_total_size() -> int:
 //|     """Return the total size of the ESP-IDF, which includes the CircuitPython heap."""
 //|     ...
+//|
 
 STATIC mp_obj_t espidf_heap_caps_get_total_size(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_total_size(MALLOC_CAP_8BIT));
@@ -50,6 +51,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_total_size_obj, espidf_heap_caps_
 //| def heap_caps_get_free_size() -> int:
 //|     """Return total free memory in the ESP-IDF heap."""
 //|     ...
+//|
 
 STATIC mp_obj_t espidf_heap_caps_get_free_size(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_free_size(MALLOC_CAP_8BIT));
@@ -59,6 +61,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_free_size_obj, espidf_heap_caps_g
 //| def heap_caps_get_largest_free_block() -> int:
 //|     """Return the size of largest free memory block in the ESP-IDF heap."""
 //|     ...
+//|
 
 STATIC mp_obj_t espidf_heap_caps_get_largest_free_block(void) {
     return MP_OBJ_NEW_SMALL_INT(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
@@ -70,6 +73,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_largest_free_block_obj, espidf_he
 //|
 //|     This is necessary when upgrading from CircuitPython 6.3.0 or earlier to CircuitPython 7.0.0, because the
 //|     layout of data in nvs has changed. The old data will be lost when you perform this operation."""
+//|
 STATIC mp_obj_t espidf_erase_nvs(void) {
     ESP_ERROR_CHECK(nvs_flash_deinit());
     ESP_ERROR_CHECK(nvs_flash_erase());
@@ -105,6 +109,7 @@ const mp_obj_type_t mp_type_espidf_IDFError = {
 //|     """Raised when an ESP IDF memory allocation fails."""
 //|
 //|     ...
+//|
 NORETURN void mp_raise_espidf_MemoryError(void) {
     nlr_raise(mp_obj_new_exception(&mp_type_espidf_MemoryError));
 }
@@ -120,6 +125,7 @@ const mp_obj_type_t mp_type_espidf_MemoryError = {
 
 //| def get_total_psram() -> int:
 //|     """Returns the number of bytes of psram detected, or 0 if psram is not present or not configured"""
+//|
 STATIC mp_obj_t espidf_get_total_psram(void) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_total_psram());
 }
@@ -127,6 +133,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_get_total_psram_obj, espidf_get_total_psram);
 
 //| def get_reserved_psram() -> int:
 //|     """Returns number of bytes of psram reserved for use by esp-idf, either a board-specific default value or the value defined in ``/.env``."""
+//|
 STATIC mp_obj_t espidf_get_reserved_psram(void) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_reserved_psram());
 }
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index e6974090c8..cdd600bddc 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -38,6 +38,7 @@
 //|     Cannot be constructed at runtime, but may be the type of a pin object
 //|     in :py:mod:`board`. A `CywPin` can be used as a DigitalInOut, but not with other
 //|     peripherals such as `PWMOut`."""
+//|
 const mp_obj_type_t cyw43_pin_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,
@@ -57,6 +58,7 @@ const mp_obj_type_t cyw43_pin_type = {
 //|     Besides this value, there appears to be no other public documentation
 //|     of the values that can be used.
 //|     """
+//|
 STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
     mp_int_t value = mp_obj_get_int(value_in);
     cyw43_wifi_pm(&cyw43_state, value);
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 9e5ded5288..7e90c6aea1 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -359,7 +359,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop
 //|         *,
 //|         start: int = 0,
 //|         end: Optional[int] = None,
-//|         swap: bool = False
+//|         swap: bool = False,
 //|     ) -> None:
 //|         """Write the data contained in ``buffer`` to the state machine. If the buffer is empty, nothing happens.
 //|
@@ -419,7 +419,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine
 //|         once: Optional[ReadableBuffer] = None,
 //|         *,
 //|         loop: Optional[ReadableBuffer] = None,
-//|         swap: bool = False
+//|         swap: bool = False,
 //|     ) -> None:
 //|         """Write data to the TX fifo in the background, with optional looping.
 //|
@@ -564,7 +564,7 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = {
 //|         *,
 //|         start: int = 0,
 //|         end: Optional[int] = None,
-//|         swap: bool = False
+//|         swap: bool = False,
 //|     ) -> None:
 //|         """Read into ``buffer``. If the number of bytes to read is 0, nothing happens. The buffer
 //|         includes any data added to the fifo even if it was added before this was called.
@@ -628,7 +628,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach
 //|         out_start: int = 0,
 //|         out_end: Optional[int] = None,
 //|         in_start: int = 0,
-//|         in_end: Optional[int] = None
+//|         in_end: Optional[int] = None,
 //|     ) -> None:
 //|         """Write out the data in ``buffer_out`` while simultaneously reading data into ``buffer_in``.
 //|         The lengths of the slices defined by ``buffer_out[out_start:out_end]`` and ``buffer_in[in_start:in_end]``
@@ -788,6 +788,7 @@ MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj,
 
 //|     in_waiting: int
 //|     """The number of words available to readinto"""
+//|
 
 STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) {
     rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c
index 5a53443dc8..6256d4d898 100644
--- a/ports/raspberrypi/bindings/rp2pio/__init__.c
+++ b/ports/raspberrypi/bindings/rp2pio/__init__.c
@@ -42,6 +42,7 @@
 //| def pins_are_sequential(pins: List[microcontroller.Pin]) -> bool:
 //|     """Return True if the pins have sequential GPIO numbers, False otherwise"""
 //|     ...
+//|
 STATIC mp_obj_t rp2pio_pins_are_sequential(const mp_obj_t pins) {
     size_t len;
     mp_obj_t *items;
diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c
index d7d76ac9d7..a45f17ca2c 100644
--- a/shared-bindings/_bleio/Adapter.c
+++ b/shared-bindings/_bleio/Adapter.c
@@ -62,6 +62,7 @@
 //|     The Adapter can do both parts of this process: it can scan for other device
 //|     advertisements and it can advertise its own data. Furthermore, Adapters can accept incoming
 //|     connections and also initiate connections."""
+//|
 
 //|     def __init__(
 //|         self, *, uart: busio.UART, rts: digitalio.DigitalInOut, cts: digitalio.DigitalInOut
@@ -435,6 +436,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_connect_obj, 1, bleio_adapter_co
 //|     def erase_bonding(self) -> None:
 //|         """Erase all bonding information stored in flash memory."""
 //|         ...
+//|
 STATIC mp_obj_t bleio_adapter_erase_bonding(mp_obj_t self_in) {
     bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c
index d4af6f9005..236ca9e39e 100644
--- a/shared-bindings/_bleio/Address.c
+++ b/shared-bindings/_bleio/Address.c
@@ -36,6 +36,7 @@
 
 //| class Address:
 //|     """Encapsulates the address of a BLE device."""
+//|
 
 //|     def __init__(self, address: ReadableBuffer, address_type: int) -> None:
 //|         """Create a new Address object encapsulating the address value.
@@ -185,6 +186,7 @@ STATIC void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 //|
 //|     RANDOM_PRIVATE_NON_RESOLVABLE: int
 //|     """A randomly generated address that changes on every connection."""
+//|
 STATIC const mp_rom_map_elem_t bleio_address_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_address_bytes),                 MP_ROM_PTR(&bleio_address_address_bytes_obj) },
     { MP_ROM_QSTR(MP_QSTR_type),                          MP_ROM_PTR(&bleio_address_type_obj) },
diff --git a/shared-bindings/_bleio/Attribute.c b/shared-bindings/_bleio/Attribute.c
index 7d15f4d3df..176198d450 100644
--- a/shared-bindings/_bleio/Attribute.c
+++ b/shared-bindings/_bleio/Attribute.c
@@ -62,6 +62,7 @@ STATIC const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = {
 //|
 //|     SIGNED_WITH_MITM: int
 //|     """security_mode: authenticated data signing, without man-in-the-middle protection"""
+//|
     { MP_ROM_QSTR(MP_QSTR_NO_ACCESS),              MP_ROM_INT(SECURITY_MODE_NO_ACCESS) },
     { MP_ROM_QSTR(MP_QSTR_OPEN),                   MP_ROM_INT(SECURITY_MODE_OPEN) },
     { MP_ROM_QSTR(MP_QSTR_ENCRYPT_NO_MITM),        MP_ROM_INT(SECURITY_MODE_ENC_NO_MITM) },
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index 439630c1c5..8a93915a8f 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -301,6 +301,7 @@ STATIC const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = {
 //|
 //|     WRITE_NO_RESPONSE: int
 //|     """property: clients may write this characteristic; no response will be sent back"""
+//|
     { MP_ROM_QSTR(MP_QSTR_BROADCAST),         MP_ROM_INT(CHAR_PROP_BROADCAST) },
     { MP_ROM_QSTR(MP_QSTR_INDICATE),          MP_ROM_INT(CHAR_PROP_INDICATE) },
     { MP_ROM_QSTR(MP_QSTR_NOTIFY),            MP_ROM_INT(CHAR_PROP_NOTIFY) },
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index ebd1bbb3cf..9b44114a99 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -181,6 +181,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_reset_input_buffer_
 //|     def deinit(self) -> None:
 //|         """Disable permanently."""
 //|         ...
+//|
 STATIC mp_obj_t bleio_characteristic_buffer_deinit(mp_obj_t self_in) {
     bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_bleio_characteristic_buffer_deinit(self);
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
index be8a38ceaf..f76ecc8167 100644
--- a/shared-bindings/_bleio/Connection.c
+++ b/shared-bindings/_bleio/Connection.c
@@ -59,6 +59,7 @@
 //|            raise Exception("'InterestingPeripheral' not found")
 //|
 //|        connection = _bleio.adapter.connect(my_entry.address, timeout=10)"""
+//|
 
 void bleio_connection_ensure_connected(bleio_connection_obj_t *self) {
     if (!common_hal_bleio_connection_get_connected(self)) {
@@ -199,6 +200,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, b
 //|     which must be sent in a single packet.
 //|     But for a regular characteristic read or write, may be sent in multiple packets,
 //|     so this limit does not apply."""
+//|
 STATIC mp_obj_t bleio_connection_get_max_packet_length(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c
index 07ba744f97..9ebe95432e 100644
--- a/shared-bindings/_bleio/Descriptor.c
+++ b/shared-bindings/_bleio/Descriptor.c
@@ -166,6 +166,7 @@ MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj,
 
 //|     value: bytearray
 //|     """The value of this descriptor."""
+//|
 STATIC mp_obj_t bleio_descriptor_get_value(mp_obj_t self_in) {
     bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c
index 949ab99439..8c6b017c9c 100644
--- a/shared-bindings/_bleio/PacketBuffer.c
+++ b/shared-bindings/_bleio/PacketBuffer.c
@@ -201,6 +201,7 @@ MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj,
 
 //|     outgoing_packet_length: int
 //|     """Maximum length in bytes of a packet we are writing."""
+//|
 STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c
index 749cae6123..83966d1719 100644
--- a/shared-bindings/_bleio/ScanEntry.c
+++ b/shared-bindings/_bleio/ScanEntry.c
@@ -39,6 +39,7 @@
 //|     """Encapsulates information about a device that was received during scanning. It can be
 //|     advertisement or scan response data. This object may only be created by a `_bleio.ScanResults`:
 //|     it has no user-visible constructor."""
+//|
 
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `_bleio.Adapter.start_scan`."""
@@ -114,6 +115,7 @@ MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj,
 
 //|     scan_response: bool
 //|     """True if the entry was a scan response. (read-only)"""
+//|
 STATIC mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_bleio_scanentry_get_scan_response(self));
diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c
index f0408b8cbc..b0f37d9fe5 100644
--- a/shared-bindings/_bleio/ScanResults.c
+++ b/shared-bindings/_bleio/ScanResults.c
@@ -35,6 +35,7 @@
 //| class ScanResults:
 //|     """Iterates over advertising data received while scanning. This object is always created
 //|     by a `_bleio.Adapter`: it has no user-visible constructor."""
+//|
 STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &bleio_scanresults_type));
     bleio_scanresults_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -55,6 +56,7 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
 //|         """Returns the next `_bleio.ScanEntry`. Blocks if none have been received and scanning is still
 //|         active. Raises `StopIteration` if scanning is finished and no other results are available."""
 //|         ...
+//|
 
 const mp_obj_type_t bleio_scanresults_type = {
     { &mp_type_type },
diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c
index 7bb7cd8505..7b357882f0 100644
--- a/shared-bindings/_bleio/Service.c
+++ b/shared-bindings/_bleio/Service.c
@@ -109,6 +109,7 @@ MP_PROPERTY_GETTER(bleio_service_secondary_obj,
 //|     """The UUID of this service. (read-only)
 //|
 //|     Will be ``None`` if the 128-bit UUID for this service is not known."""
+//|
 STATIC mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) {
     bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c
index 1e095e82e4..922b1ac5fb 100644
--- a/shared-bindings/_bleio/UUID.c
+++ b/shared-bindings/_bleio/UUID.c
@@ -234,6 +234,7 @@ STATIC mp_obj_t bleio_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     def __eq__(self, other: object) -> bool:
 //|         """Two UUID objects are equal if their values match and they are both 128-bit or both 16-bit."""
 //|         ...
+//|
 STATIC mp_obj_t bleio_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     switch (op) {
         // Two UUID's are equal if their uuid16 values match or their uuid128 values match.
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index bcddeac734..1ec2a2758a 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -63,6 +63,7 @@
 //|     """Catchall exception for Bluetooth related errors."""
 //|
 //|     ...
+//|
 MP_DEFINE_BLEIO_EXCEPTION(BluetoothError, Exception)
 NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...) {
     va_list argptr;
@@ -77,6 +78,7 @@ NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...)
 //|     attempted to be set but they can only be set when remote."""
 //|
 //|     ...
+//|
 MP_DEFINE_BLEIO_EXCEPTION(RoleError, bleio_BluetoothError)
 NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_bleio_RoleError, msg);
@@ -86,6 +88,7 @@ NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) {
 //|     """Raised when a security related error occurs."""
 //|
 //|     ...
+//|
 MP_DEFINE_BLEIO_EXCEPTION(SecurityError, bleio_BluetoothError)
 NORETURN void mp_raise_bleio_SecurityError(const compressed_string_t *fmt, ...) {
     va_list argptr;
@@ -115,6 +118,7 @@ STATIC mp_obj_dict_t bleio_module_globals;
 //|     """Set the adapter to use for BLE, such as when using an HCI adapter.
 //|     Raises `NotImplementedError` when the adapter is a singleton and cannot be set."""
 //|     ...
+//|
 mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj) {
     #if CIRCUITPY_BLEIO_HCI
     if (adapter_obj != mp_const_none && !mp_obj_is_type(adapter_obj, &bleio_adapter_type)) {
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index 9cc140410d..bd0cf9b4ea 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -956,6 +956,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0);
 //|         This method is used by the ``eve`` module to efficiently add
 //|         commands to the FIFO."""
 //|         ...
+//|
 STATIC mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) {
     mp_obj_t self = args[0];
     mp_obj_t num = args[1];
diff --git a/shared-bindings/_pew/PewPew.c b/shared-bindings/_pew/PewPew.c
index 8593679973..1a4356c719 100644
--- a/shared-bindings/_pew/PewPew.c
+++ b/shared-bindings/_pew/PewPew.c
@@ -61,6 +61,7 @@
 //|         is connected to the common side of all buttons (the other sides of the
 //|         buttons are connected to rows of the matrix)."""
 //|         ...
+//|
 STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer, ARG_rows, ARG_cols, ARG_buttons };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/_stage/Layer.c b/shared-bindings/_stage/Layer.c
index d81075b704..81d76321f0 100644
--- a/shared-bindings/_stage/Layer.c
+++ b/shared-bindings/_stage/Layer.c
@@ -109,6 +109,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(layer_move_obj, layer_move);
 //|         """Set the animation frame of the sprite, and optionally rotation its
 //|         graphic."""
 //|         ...
+//|
 STATIC mp_obj_t layer_frame(mp_obj_t self_in, mp_obj_t frame_in,
     mp_obj_t rotation_in) {
     layer_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/_stage/Text.c b/shared-bindings/_stage/Text.c
index 4e9ce4e58b..c735669861 100644
--- a/shared-bindings/_stage/Text.c
+++ b/shared-bindings/_stage/Text.c
@@ -91,6 +91,7 @@ STATIC mp_obj_t text_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def move(self, x: int, y: int) -> None:
 //|         """Set the offset of the text to the specified values."""
 //|         ...
+//|
 STATIC mp_obj_t text_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     text_obj_t *self = MP_OBJ_TO_PTR(self_in);
     self->x = mp_obj_get_int(x_in);
diff --git a/shared-bindings/_stage/__init__.c b/shared-bindings/_stage/__init__.c
index 275eabd5a1..b2542f9df4 100644
--- a/shared-bindings/_stage/__init__.c
+++ b/shared-bindings/_stage/__init__.c
@@ -69,6 +69,7 @@
 //|
 //|     This function is intended for internal use in the ``stage`` library
 //|     and all the necessary checks are performed there."""
+//|
 STATIC mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) {
     uint16_t x0 = mp_obj_get_int(args[0]);
     uint16_t y0 = mp_obj_get_int(args[1]);
diff --git a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
index 2d8df31989..d2b7f0c6ce 100644
--- a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -231,6 +231,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 1, adafruit_
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index 7b2b283ed4..afb11856e2 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -127,6 +127,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, ad
 //|         """Ends a SPI transaction by deasserting chip select. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
+//|
 STATIC mp_obj_t adafruit_bus_device_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
     common_hal_adafruit_bus_device_spidevice_exit(MP_OBJ_TO_PTR(args[0]));
     return mp_const_none;
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index 967fb79355..6203f672ad 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -296,6 +296,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_f
 //|         For RGBW byteorders, if given only RGB values either as an int or as a tuple, the white value
 //|         is used instead when the red, green, and blue values are the same."""
 //|         ...
+//|
 STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 991eb69f37..9170b63799 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -193,6 +193,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj,
 //|         buffers must be a multiple of 16 bytes, and must be equal length.  For
 //|         CTX mode, there are no restrictions."""
 //|         ...
+//|
 STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
     mp_obj_t dest) {
     if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c
index 7010e4601e..318f2b772d 100644
--- a/shared-bindings/alarm/SleepMemory.c
+++ b/shared-bindings/alarm/SleepMemory.c
@@ -48,6 +48,7 @@
 //|        alarm.sleep_memory[0] = True
 //|        alarm.sleep_memory[1] = 12
 //|     """
+//|
 
 //|     def __init__(self) -> None:
 //|         """Not used. Access the sole instance through `alarm.sleep_memory`."""
@@ -90,6 +91,7 @@ STATIC MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_l
 //|     def __setitem__(self, index: int, value: int) -> None:
 //|         """Set the value at the given index."""
 //|         ...
+//|
 STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 9b992f7432..96cb7758cb 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -99,6 +99,7 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
 //|     it may be necessary to disconnect from the host.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_const_none;
@@ -172,6 +173,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|         alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm)
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_preserve_dios };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c
index fb2cf05cf9..6e8bc5341e 100644
--- a/shared-bindings/alarm/pin/PinAlarm.c
+++ b/shared-bindings/alarm/pin/PinAlarm.c
@@ -102,6 +102,7 @@ MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj,
 
 //|     value: bool
 //|     """The value on which to trigger."""
+//|
 STATIC mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) {
     alarm_pin_pinalarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_alarm_pin_pinalarm_get_value(self));
diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c
index 71b6354e34..7bd0a309b9 100644
--- a/shared-bindings/alarm/time/TimeAlarm.c
+++ b/shared-bindings/alarm/time/TimeAlarm.c
@@ -117,6 +117,7 @@ STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type,
 //|        The time may be given as ``epoch_time`` in the constructor, but it is returned
 //|        by this property only as a `time.monotonic()` time.
 //|        """
+//|
 STATIC mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) {
     alarm_time_timealarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_alarm_time_timealarm_get_monotonic_time(self));
diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c
index d9c0fe3060..03f9ea4757 100644
--- a/shared-bindings/alarm/touch/TouchAlarm.c
+++ b/shared-bindings/alarm/touch/TouchAlarm.c
@@ -63,6 +63,7 @@ STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type,
 
 //|     pin: microcontroller.Pin
 //|     """The trigger pin."""
+//|
 STATIC mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) {
     alarm_touch_touchalarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(self->pin);
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 1baee1a644..8bdc1b0ea8 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -58,6 +58,7 @@
 //|         (TODO) The reference voltage varies by platform so use
 //|         ``reference_voltage`` to read the configured setting.
 //|         (TODO) Provide mechanism to read CPU Temperature."""
+//|
 
 //|     def __init__(
 //|         self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000
@@ -155,6 +156,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj,
 //|     def read(self) -> None:
 //|         """Fills the provided buffer with ADC voltage values."""
 //|         ...
+//|
 STATIC mp_obj_t analogbufio_bufferedin_obj_read(mp_obj_t self_in) {
     analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index e5b408c0db..5bacc74073 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -46,6 +46,7 @@
 //|
 //|        adc = analogio.AnalogIn(A1)
 //|        val = adc.value"""
+//|
 
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Use the AnalogIn on the given pin. The reference voltage varies by
@@ -118,6 +119,7 @@ MP_PROPERTY_GETTER(analogio_analogin_value_obj,
 //|     """The maximum voltage measurable (also known as the reference voltage) as a
 //|     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
 //|     at ends of the analog range."""
+//|
 STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) {
     analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index 79f5dac55f..fa33944164 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -98,6 +98,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4
 //|
 //|     Even if the underlying digital to analog converter (DAC) is lower
 //|     resolution, the value is 16-bit."""
+//|
 STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t value) {
     analogio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_analogio_analogout_deinited(self)) {
diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c
index 3536212c5e..914cac582b 100644
--- a/shared-bindings/atexit/__init__.c
+++ b/shared-bindings/atexit/__init__.c
@@ -57,6 +57,7 @@
 //|
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t atexit_register(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     shared_module_atexit_register(pos_args[0], (n_args - 1), ((n_args > 1) ? &pos_args[1] : NULL), kw_args);
     return pos_args[0];
@@ -72,6 +73,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register);
 //|
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t atexit_unregister(const mp_obj_t self_in) {
     shared_module_atexit_unregister(&self_in);
     return mp_const_none;
diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index 7eb928279c..b570191da9 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -238,6 +238,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_re
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
+//|
 STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) {
     audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index d2a176a41a..c44a640d6f 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -220,6 +220,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(audiobusio_pdmin_record_obj, audiobusio_pdmin_obj_reco
 //|     sample_rate: int
 //|     """The actual sample_rate of the recording. This may not match the constructed
 //|     sample rate due to internal clock limitations."""
+//|
 STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) {
     audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c
index 03b7d2d3ae..d185476f03 100644
--- a/shared-bindings/audiocore/RawSample.c
+++ b/shared-bindings/audiocore/RawSample.c
@@ -135,6 +135,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4,
 //|     When the sample is looped, this can change the pitch output without changing the underlying
 //|     sample. This will not change the sample rate of any active playback. Call ``play`` again to
 //|     change it."""
+//|
 STATIC mp_obj_t audioio_rawsample_obj_get_sample_rate(mp_obj_t self_in) {
     audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 91567820a4..36204fa2b2 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -165,6 +165,7 @@ MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj,
     (mp_obj_t)&audioio_wavefile_get_bits_per_sample_obj);
 //|     channel_count: int
 //|     """Number of audio channels. (read only)"""
+//|
 STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) {
     audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c
index 5df1656f8f..a569097480 100644
--- a/shared-bindings/audioio/AudioOut.c
+++ b/shared-bindings/audioio/AudioOut.c
@@ -231,6 +231,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resu
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
+//|
 STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) {
     audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c
index f6a52c2809..58c618fc11 100644
--- a/shared-bindings/audiomixer/Mixer.c
+++ b/shared-bindings/audiomixer/Mixer.c
@@ -228,6 +228,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixer_play_obj, 1, audiomixer_mixer_obj_pl
 //|     def stop_voice(self, voice: int = 0) -> None:
 //|         """Stops playback of the sample on the given voice."""
 //|         ...
+//|
 STATIC mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_voice };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index c5accc2d87..0bdef1f4cd 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -132,6 +132,7 @@ MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
 
 //|     playing: bool
 //|     """True when this voice is being output. (read-only)"""
+//|
 
 STATIC mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) {
     audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index bd80ad45f7..4a8805b294 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -248,6 +248,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj,
 
 //|     samples_decoded: int
 //|     """The number of audio samples decoded from the current file. (read only)"""
+//|
 STATIC mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) {
     audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index b50e1e8e9c..2e17bbda8c 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -233,6 +233,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_resume_obj, audiopwmio_pwmaudio
 
 //|     paused: bool
 //|     """True when playback is paused. (read-only)"""
+//|
 STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) {
     audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index 1f1bb78421..19c27740e3 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -310,6 +310,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_wr
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t bitbangio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c
index e197a8f87a..1b7c877bda 100644
--- a/shared-bindings/bitbangio/SPI.c
+++ b/shared-bindings/bitbangio/SPI.c
@@ -317,6 +317,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_readinto_obj, 1, bitbangio_spi_readinto
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index c0cec516da..dd62b515fe 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -173,6 +173,7 @@ STATIC void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tupl
 //|     :param int skip_index: Bitmap palette index in the source that will not be copied,
 //|            set to None to copy all pixels"""
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_source_bitmap,
           ARG_ox, ARG_oy, ARG_dest_clip0, ARG_dest_clip1,
@@ -295,6 +296,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_rotozoom_obj, 0, bitmaptools_obj_rotozoom
 //|
 //|     For the L8 colorspace, the bitmaps must have a bits-per-value of 8.
 //|     For the RGB colorspaces, they must have a bits-per-value of 16."""
+//|
 
 STATIC mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_source_bitmap_1, ARG_source_bitmap_2, ARG_colorspace, ARG_factor_1, ARG_factor_2};
@@ -369,6 +371,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_alphablend_obj, 0, bitmaptools_alphablend
 //|     :param int value: Bitmap palette index that will be written into the rectangular
 //|            fill region in the destination bitmap"""
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
 
@@ -422,6 +425,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_fill_region_obj, 0, bitmaptools_obj_fill_
 //|     :param int replaced_color_value: Bitmap palette index that will filled with the
 //|            value color in the enclosed area in the destination bitmap"""
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_obj_boundary_fill(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_fill_color_value, ARG_replaced_color_value};
 
@@ -481,6 +485,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_boundary_fill_obj, 0, bitmaptools_obj_bou
 //|     :param int value: Bitmap palette index that will be written into the
 //|            line in the destination bitmap"""
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
 
@@ -560,6 +565,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_li
 //|             set to None to copy all pixels
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_arrayblit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bitmap, ARG_data, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_index };
     static const mp_arg_t allowed_args[] = {
@@ -632,6 +638,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_arrayblit_obj, 0, bitmaptools_arrayblit);
 //|     :param bool reverse_rows: Reverse the direction of the row loading (required for some bitmap images).
 //|     """
 //|     ...
+//|
 
 STATIC mp_obj_t bitmaptools_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bitmap, ARG_file, ARG_bits_per_pixel, ARG_element_size, ARG_reverse_pixels_in_element, ARG_swap_bytes_in_element, ARG_reverse_rows };
@@ -693,6 +700,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_readinto_obj, 0, bitmaptools_readinto);
 //|
 //|     FloydStenberg: "DitherAlgorithm"
 //|     """The Floyd-Stenberg dither"""
+//|
 MAKE_ENUM_VALUE(bitmaptools_dither_algorithm_type, dither_algorithm, Atkinson, DITHER_ALGORITHM_ATKINSON);
 MAKE_ENUM_VALUE(bitmaptools_dither_algorithm_type, dither_algorithm, FloydStenberg, DITHER_ALGORITHM_FLOYD_STENBERG);
 
@@ -720,6 +728,7 @@ MAKE_ENUM_TYPE(bitmaptools, DitherAlgorithm, bitmaptools_dither_algorithm);
 //|     :param algorithm: The dither algorithm to use, one of the `DitherAlgorithm` values.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_dest_bitmap, ARG_source_bitmap, ARG_source_colorspace, ARG_algorithm };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c
index 132b83bbc3..ea4e70ae3a 100644
--- a/shared-bindings/bitops/__init__.c
+++ b/shared-bindings/bitops/__init__.c
@@ -53,6 +53,7 @@
 //|
 //|     Returns the output buffer."""
 //|     ...
+//|
 
 STATIC mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_input, ARG_output, ARG_width };
diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index 2ea8b3a0c4..e4003d4f6b 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -63,6 +63,7 @@
 //|     """Returns the `busio.I2C` object for the board's designated I2C bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.I2C`."""
 //|     ...
+//|
 #if CIRCUITPY_BOARD_I2C
 STATIC mp_obj_t board_i2c_0(void) {
     return common_hal_board_create_i2c(0);
@@ -79,6 +80,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c_0);
 //|     """Returns the `busio.SPI` object for the board's designated SPI bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.SPI`."""
 //|     ...
+//|
 #if CIRCUITPY_BOARD_SPI
 STATIC mp_obj_t board_spi_0(void) {
     return common_hal_board_create_spi(0);
@@ -95,6 +97,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi_0);
 //|     """Returns the `busio.UART` object for the board's designated UART bus(es).
 //|     The object created is a singleton, and uses the default parameter values for `busio.UART`."""
 //|     ...
+//|
 #if CIRCUITPY_BOARD_UART
 STATIC mp_obj_t board_uart_0(void) {
     return common_hal_board_create_uart(0);
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 03939b4c04..71ac0e3995 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -311,6 +311,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto);
 //|         :param int in_end: end of ``in_buffer slice``; if not specified, use ``len(in_buffer)``
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index cd67c27438..4826797ee2 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -421,6 +421,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_readinto_obj, 1, busio_spi_write_read
 //|     frequency: int
 //|     """The actual SPI bus frequency. This may not match the frequency requested
 //|     due to internal limitations."""
+//|
 
 STATIC mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) {
     busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index f034b342c8..a65984c3fb 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -353,6 +353,7 @@ MP_PROPERTY_GETSET(busio_uart_timeout_obj,
 //|     def reset_input_buffer(self) -> None:
 //|         """Discard any unread characters in the input buffer."""
 //|         ...
+//|
 STATIC mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) {
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
@@ -370,6 +371,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_o
 //|
 //|     EVEN: int
 //|     """Total number of ones should be even."""
+//|
 const mp_obj_type_t busio_uart_parity_type;
 
 const busio_uart_parity_obj_t busio_uart_parity_odd_obj = {
diff --git a/shared-bindings/camera/Camera.c b/shared-bindings/camera/Camera.c
index e878ad21cf..4f6023c9fd 100644
--- a/shared-bindings/camera/Camera.c
+++ b/shared-bindings/camera/Camera.c
@@ -55,6 +55,7 @@
 //|         size = cam.take_picture(buffer, width=1920, height=1080, format=camera.ImageFormat.JPG)
 //|         file.write(buffer, size)
 //|         file.close()"""
+//|
 
 //|     def __init__(self) -> None:
 //|         """Initialize camera."""
@@ -92,6 +93,7 @@ STATIC void check_for_deinit(camera_obj_t *self) {
 //|         :return: the number of bytes written into buf
 //|         :rtype: int"""
 //|         ...
+//|
 STATIC mp_obj_t camera_obj_take_picture(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_width, ARG_height, ARG_format };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/camera/ImageFormat.c b/shared-bindings/camera/ImageFormat.c
index 56ead66d21..1a0c3c88d6 100644
--- a/shared-bindings/camera/ImageFormat.c
+++ b/shared-bindings/camera/ImageFormat.c
@@ -36,6 +36,7 @@
 //|
 //|     RGB565: ImageFormat
 //|     """RGB565 format."""
+//|
 
 const camera_imageformat_obj_t camera_imageformat_jpg_obj = {
     { &camera_imageformat_type },
diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c
index 6ee1453038..b2e85c0244 100644
--- a/shared-bindings/canio/CAN.c
+++ b/shared-bindings/canio/CAN.c
@@ -323,6 +323,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_enter_obj, canio_can_enter);
 //|     ) -> None:
 //|         """Calls deinit()"""
 //|         ...
+//|
 STATIC mp_obj_t canio_can_exit(size_t num_args, const mp_obj_t args[]) {
     canio_can_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     common_hal_canio_can_deinit(self);
diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c
index ea804f6614..e10f7fde6f 100644
--- a/shared-bindings/canio/Listener.c
+++ b/shared-bindings/canio/Listener.c
@@ -41,6 +41,7 @@
 //|     the `in_waiting` method to check for an available message, a
 //|     listener can be used as an iterable, yielding messages until no
 //|     message arrives within ``self.timeout`` seconds."""
+//|
 
 //|     def receive(self) -> Optional[Union[RemoteTransmissionRequest, Message]]:
 //|         """Reads a message, after waiting up to ``self.timeout`` seconds
@@ -133,6 +134,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_listener_exit_obj, 4, 4, canio_
 
 
 //|     timeout: float
+//|
 STATIC mp_obj_t canio_listener_timeout_get(mp_obj_t self_in) {
     canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_canio_listener_check_for_deinit(self);
diff --git a/shared-bindings/canio/Match.c b/shared-bindings/canio/Match.c
index 097807b7ce..06729f9c54 100644
--- a/shared-bindings/canio/Match.c
+++ b/shared-bindings/canio/Match.c
@@ -96,6 +96,7 @@ MP_PROPERTY_GETTER(canio_match_mask_obj,
 
 //|     extended: bool
 //|     """True to match extended ids, False to match standard ides"""
+//|
 
 STATIC mp_obj_t canio_match_extended_get(mp_obj_t self_in) {
     canio_match_obj_t *self = self_in;
diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c
index 21032da796..c3857256bd 100644
--- a/shared-bindings/canio/Message.c
+++ b/shared-bindings/canio/Message.c
@@ -111,6 +111,7 @@ MP_PROPERTY_GETSET(canio_message_data_obj,
 
 //|     extended: bool
 //|     """True if the message's id is an extended id"""
+//|
 STATIC mp_obj_t canio_message_extended_get(const mp_obj_t self_in) {
     canio_message_obj_t *self = self_in;
     return mp_obj_new_bool(common_hal_canio_message_get_extended(self));
diff --git a/shared-bindings/canio/RemoteTransmissionRequest.c b/shared-bindings/canio/RemoteTransmissionRequest.c
index bad65456df..1efc401909 100644
--- a/shared-bindings/canio/RemoteTransmissionRequest.c
+++ b/shared-bindings/canio/RemoteTransmissionRequest.c
@@ -106,6 +106,7 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj,
 
 //|     length: int
 //|     """The length of the requested message."""
+//|
 STATIC mp_obj_t canio_remote_transmission_request_length_get(const mp_obj_t self_in) {
     canio_remote_transmission_request_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(common_hal_canio_remote_transmission_request_get_length(self));
diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
index 9f5141e41d..0416e5cb39 100644
--- a/shared-bindings/canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -96,6 +96,7 @@ MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, BUS_OFF, BUS_STATE_OFF);
 //|     """The bus has turned off due to the number of errors that have
 //|     occurred recently.  It must be restarted before it will send or receive
 //|     packets.  This device will neither send or acknowledge packets on the bus."""
+//|
 MAKE_ENUM_MAP(canio_bus_state) {
     MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_ACTIVE),
     MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_PASSIVE),
diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c
index e001b222b4..eed676a17e 100644
--- a/shared-bindings/countio/Counter.c
+++ b/shared-bindings/countio/Counter.c
@@ -120,6 +120,7 @@ MP_PROPERTY_GETSET(countio_counter_count_obj,
 
 //|     def reset(self) -> None:
 //|         """Resets the count back to 0."""
+//|
 STATIC mp_obj_t countio_counter_reset(mp_obj_t self_in) {
     countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/countio/Edge.c b/shared-bindings/countio/Edge.c
index 04c5116924..104b75a5be 100644
--- a/shared-bindings/countio/Edge.c
+++ b/shared-bindings/countio/Edge.c
@@ -48,6 +48,7 @@ MAKE_ENUM_VALUE(countio_edge_type, edge, RISE_AND_FALL, EDGE_RISE_AND_FALL);
 //|
 //|     RISE_AND_FALL: Edge
 //|     """Count the rising and falling edges."""
+//|
 MAKE_ENUM_MAP(countio_edge) {
     MAKE_ENUM_MAP_ENTRY(edge, RISE),
     MAKE_ENUM_MAP_ENTRY(edge, FALL),
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index 09f71555c6..e42036bb1a 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -310,6 +310,7 @@ MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj,
 //|     - `None`
 //|
 //|     :raises AttributeError: if `direction` is :py:data:`~digitalio.Direction.OUTPUT`."""
+//|
 STATIC mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) {
     digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c
index 80797825f4..78552e025c 100644
--- a/shared-bindings/digitalio/Direction.c
+++ b/shared-bindings/digitalio/Direction.c
@@ -50,6 +50,7 @@
 //|
 //|     OUTPUT: Direction
 //|     """Write digital data out"""
+//|
 const mp_obj_type_t digitalio_direction_type;
 
 const digitalio_direction_obj_t digitalio_direction_input_obj = {
diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c
index ef0a4831b0..1ebf51daea 100644
--- a/shared-bindings/digitalio/DriveMode.c
+++ b/shared-bindings/digitalio/DriveMode.c
@@ -39,6 +39,7 @@
 //|     OPEN_DRAIN: DriveMode
 //|     """Output low digital values but go into high z for digital high. This is
 //|     useful for i2c and other protocols that share a digital line."""
+//|
 const mp_obj_type_t digitalio_drive_mode_type;
 
 const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj = {
diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c
index f1787a1050..5934ddb9c2 100644
--- a/shared-bindings/digitalio/Pull.c
+++ b/shared-bindings/digitalio/Pull.c
@@ -42,6 +42,7 @@
 //|     DOWN: Pull
 //|     """When the input line isn't being driven the pull down can pull the
 //|     state of the line low so it reads as false."""
+//|
 const mp_obj_type_t digitalio_pull_type;
 
 const digitalio_pull_obj_t digitalio_pull_up_obj = {
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 52c6988369..65551f4e0d 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -318,6 +318,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill);
 //|         notified of the "dirty rectangle" that encloses all modified
 //|         pixels."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     enum { ARG_x1, ARG_y1, ARG_x2, ARG_y2 };
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index b03a8ff336..997174f28b 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -121,6 +121,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, display
 //|         """Make the ColorConverter be opaque and have no transparent pixels.
 //|
 //|         :param int color: [IGNORED] Use any value"""
+//|
 STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/displayio/Colorspace.c b/shared-bindings/displayio/Colorspace.c
index 265c68b1e1..3692dc29bc 100644
--- a/shared-bindings/displayio/Colorspace.c
+++ b/shared-bindings/displayio/Colorspace.c
@@ -58,6 +58,7 @@ MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, L8, DISPLAYIO_C
 //|
 //|     RGB555_SWAPPED: Colorspace
 //|     """The swapped 15-bit colorspace.  First, the high and low 8 bits of the number are swapped, then they are interpreted as for RGB555"""
+//|
 MAKE_ENUM_MAP(displayio_colorspace) {
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB888),
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB565),
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index f128b4070c..512969eb20 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -433,6 +433,7 @@ MP_PROPERTY_GETTER(displayio_display_root_group_obj,
 //|         :param int y: The top edge of the area
 //|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data"""
 //|         ...
+//|
 STATIC mp_obj_t displayio_display_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_y, ARG_buffer };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 8cb16c3c28..7b77b42fa4 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -339,6 +339,7 @@ MP_PROPERTY_GETSET(displayio_epaperdisplay_rotation_obj,
 
 //|     bus: _DisplayBus
 //|     """The bus being used by the display"""
+//|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_bus(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
     return common_hal_displayio_epaperdisplay_get_bus(self);
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 1db9a09868..edcf2ade0e 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -126,6 +126,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_fourwire_reset_obj, displayio_fourwire_obj_r
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_command, ARG_data, ARG_toggle_every_byte };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 574d366690..3e4569b271 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -315,6 +315,7 @@ STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t valu
 //|     def sort(self, key: function, reverse: bool) -> None:
 //|         """Sort the members of the group."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_group_t *self = native_group(pos_args[0]);
     mp_obj_t *args = m_new(mp_obj_t, n_args);
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index 8417e20eb7..2374e58e4a 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -100,6 +100,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_i2cdisplay_reset_obj, displayio_i2cdisplay_o
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_i2cdisplay_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) {
     mp_int_t command_int = mp_obj_get_int(command_obj);
     mp_arg_validate_int_range(command_int, 0, 255, MP_QSTR_command);
diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index 9a1ff0ba75..a53196ef05 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -126,6 +126,7 @@ MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj,
 //|     """The image's pixel_shader.  The type depends on the underlying
 //|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
 //|     transparent pixel or, for palette shaded images, to update the palette.)"""
+//|
 STATIC mp_obj_t displayio_ondiskbitmap_obj_get_pixel_shader(mp_obj_t self_in) {
     displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_displayio_ondiskbitmap_get_pixel_shader(self);
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 9c696ed916..aa24dc262f 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -173,6 +173,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_opaque_obj, displayio_palette_o
 //|     def is_transparent(self, palette_index: int) -> bool:
 //|         """Returns `True` if the palette index is transparent.  Returns `False` if opaque."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) {
     displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index 690ffb6066..c8b3959837 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -77,6 +77,7 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
 //|     def set_boundary(self, y: int, start_x: int, end_x: int) -> None:
 //|         """Loads pre-packed data into the given row."""
 //|         ...
+//|
 STATIC mp_obj_t displayio_shape_obj_set_boundary(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     displayio_shape_t *self = MP_OBJ_TO_PTR(args[0]);
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index a434a8359d..f2e16985c3 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -446,6 +446,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj,
 //|
 //|           grid[0,0] = 10"""
 //|         ...
+//|
 STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
 
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 1a62338148..80fcde6e49 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -57,6 +57,7 @@
 //| """
 
 //| import paralleldisplay
+//|
 
 //| def release_displays() -> None:
 //|     """Releases any actively used displays so their busses and pins can be used again. This will also
@@ -66,6 +67,7 @@
 //|     Use this once in your code.py if you initialize a display. Place it right before the
 //|     initialization so the display is active as long as possible."""
 //|     ...
+//|
 STATIC mp_obj_t displayio_release_displays(void) {
     common_hal_displayio_release_displays();
     return mp_const_none;
diff --git a/shared-bindings/dotenv/__init__.c b/shared-bindings/dotenv/__init__.c
index e6f34dcf82..0aed49cefb 100644
--- a/shared-bindings/dotenv/__init__.c
+++ b/shared-bindings/dotenv/__init__.c
@@ -62,6 +62,7 @@
 //| """
 //|
 //| import typing
+//|
 
 //| def get_key(dotenv_path: str, key_to_get: str) -> Optional[str]:
 //|     """Get the value for the given key from the given .env file. If the key occurs multiple
@@ -69,6 +70,7 @@
 //|
 //|     Returns None if the key isn't found or doesn't have a value."""
 //|     ...
+//|
 STATIC mp_obj_t _dotenv_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
     return common_hal_dotenv_get_key(mp_obj_str_get_str(path_in),
         mp_obj_str_get_str(key_to_get_in));
@@ -81,6 +83,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(dotenv_get_key_obj, _dotenv_get_key);
 //|
 //|     Present in CircuitPython so CPython-compatible code can use it without error."""
 //|     ...
+//|
 STATIC mp_obj_t dotenv_load_dotenv(void) {
     return mp_const_none;
 }
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index 6a69480172..83933e889d 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -62,6 +62,7 @@
 //|     in small chunks.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_offset };
     static const mp_arg_t allowed_args[] = {
@@ -91,6 +92,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash);
 //|     just switched over to.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t dualbank_switch(void) {
     common_hal_dualbank_switch();
     return mp_const_none;
diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c
index a74a30c068..b114ab46dc 100644
--- a/shared-bindings/floppyio/__init__.c
+++ b/shared-bindings/floppyio/__init__.c
@@ -50,6 +50,7 @@
 //|     :return: The actual number of bytes of read
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_data, ARG_index };
     static const mp_arg_t allowed_args[] = {
@@ -86,6 +87,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto
 //|     :return: The actual number of sectors read
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_data, ARG_index };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c
index b20ed271c3..cf28b6f223 100644
--- a/shared-bindings/fontio/BuiltinFont.c
+++ b/shared-bindings/fontio/BuiltinFont.c
@@ -53,6 +53,7 @@
 //|
 //|         If the code point is not present in the font, `None` is returned."""
 //|         pass
+//|
 
 //| class BuiltinFont:
 //|     """A font built into CircuitPython"""
@@ -90,6 +91,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builti
 //|     def get_glyph(self, codepoint: int) -> Glyph:
 //|         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""
 //|         ...
+//|
 STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-bindings/fontio/Glyph.c b/shared-bindings/fontio/Glyph.c
index ee2eb90945..9fd49cfb1a 100644
--- a/shared-bindings/fontio/Glyph.c
+++ b/shared-bindings/fontio/Glyph.c
@@ -53,6 +53,7 @@
 //|         :param shift_x: the x difference to the next glyph
 //|         :param shift_y: the y difference to the next glyph"""
 //|         ...
+//|
 const mp_obj_namedtuple_type_t fontio_glyph_type = {
     .base = {
         .base = {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 045e1f1c78..20e555eef9 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -321,6 +321,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra
 
 //|     root_group: displayio.Group
 //|     """The root group on the display."""
+//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return common_hal_framebufferio_framebufferdisplay_get_root_group(self);
diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c
index 79147d2efd..3138f543e7 100644
--- a/shared-bindings/frequencyio/FrequencyIn.c
+++ b/shared-bindings/frequencyio/FrequencyIn.c
@@ -192,6 +192,7 @@ MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj,
 //|     def __get__(self, index: int) -> int:
 //|         """Returns the value of the last frequency captured."""
 //|         ...
+//|
 STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/getpass/__init__.c b/shared-bindings/getpass/__init__.c
index 4eb9be7c4c..340b8fd7c6 100644
--- a/shared-bindings/getpass/__init__.c
+++ b/shared-bindings/getpass/__init__.c
@@ -43,6 +43,7 @@
 //|
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t getpass_getpass(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_prompt, ARG_stream };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/gifio/GifWriter.c b/shared-bindings/gifio/GifWriter.c
index 6b7d9c5e4b..57c38b554e 100644
--- a/shared-bindings/gifio/GifWriter.c
+++ b/shared-bindings/gifio/GifWriter.c
@@ -122,6 +122,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_gifwriter_deinit_obj, gifio_gifwriter_deinit);
 //|         :param delay: The frame delay in seconds.  The GIF format rounds this to the nearest 1/100 second, and the largest permitted value is 655 seconds.
 //|         """
 //|         ...
+//|
 static mp_obj_t gifio_gifwriter_add_frame(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_bitmap, ARG_delay };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/gnss/GNSS.c b/shared-bindings/gnss/GNSS.c
index 04c246ffc2..d3c9547787 100644
--- a/shared-bindings/gnss/GNSS.c
+++ b/shared-bindings/gnss/GNSS.c
@@ -29,6 +29,7 @@
 //|                     continue
 //|                 print("Latitude: {0:.6f} degrees".format(nav.latitude))
 //|                 print("Longitude: {0:.6f} degrees".format(nav.longitude))"""
+//|
 
 //|     def __init__(self, system: Union[SatelliteSystem, List[SatelliteSystem]]) -> None:
 //|         """Turn on the GNSS.
@@ -146,6 +147,7 @@ MP_PROPERTY_GETTER(gnss_timestamp_obj,
 
 //|     fix: PositionFix
 //|     """Fix mode."""
+//|
 STATIC mp_obj_t gnss_obj_get_fix(mp_obj_t self_in) {
     gnss_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/gnss/PositionFix.c b/shared-bindings/gnss/PositionFix.c
index 871723d100..35d4971b66 100644
--- a/shared-bindings/gnss/PositionFix.c
+++ b/shared-bindings/gnss/PositionFix.c
@@ -17,6 +17,7 @@
 //|
 //|     FIX_3D: PositionFix
 //|     """3D fix."""
+//|
 const mp_obj_type_t gnss_positionfix_type;
 
 const gnss_positionfix_obj_t gnss_positionfix_invalid_obj = {
diff --git a/shared-bindings/gnss/SatelliteSystem.c b/shared-bindings/gnss/SatelliteSystem.c
index 9a760b6437..4bf0d6cf4b 100644
--- a/shared-bindings/gnss/SatelliteSystem.c
+++ b/shared-bindings/gnss/SatelliteSystem.c
@@ -23,6 +23,7 @@
 //|
 //|     QZSS_L1S: SatelliteSystem
 //|     """Quasi-Zenith Satellite System L1S."""
+//|
 const mp_obj_type_t gnss_satellitesystem_type;
 
 const gnss_satellitesystem_obj_t gnss_satellitesystem_gps_obj = {
diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c
index ef11580c76..f385885b4d 100644
--- a/shared-bindings/hashlib/Hash.c
+++ b/shared-bindings/hashlib/Hash.c
@@ -34,6 +34,7 @@
 //| class Hash:
 //|     """In progress hash algorithm. This object is always created by a `hashlib.new()`. It has no
 //|     user-visible constructor."""
+//|
 
 //|     digest_size: int
 //|     """Digest size in bytes"""
@@ -65,6 +66,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_hash_update_obj, hashlib_hash_update);
 //|     def digest(self) -> bytes:
 //|         """Returns the current digest as bytes() with a length of `hashlib.Hash.digest_size`."""
 //|         ...
+//|
 STATIC mp_obj_t hashlib_hash_digest(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
     hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/hashlib/__init__.c b/shared-bindings/hashlib/__init__.c
index 08c43787f3..424159f84c 100644
--- a/shared-bindings/hashlib/__init__.c
+++ b/shared-bindings/hashlib/__init__.c
@@ -45,6 +45,7 @@
 //|     :return: a hash object for the given algorithm
 //|     :rtype: hashlib.Hash"""
 //|     ...
+//|
 STATIC mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_name, ARG_data };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 1a336dc810..3513dee29b 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -136,6 +136,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4,
 //|         :param float timeout: Timeout in seconds. Zero means wait forever, a negative value means check once
 //|         :return: I2CTargetRequest or None if timeout=-1 and there's no request
 //|         :rtype: ~i2ctarget.I2CTargetRequest"""
+//|
 STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_type));
     i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -378,6 +379,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarg
 //|
 //|         :param ack: Whether to send an ACK or NACK"""
 //|         ...
+//|
 STATIC mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type));
     i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]);
diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c
index 483830ac3f..b6352514bf 100644
--- a/shared-bindings/imagecapture/ParallelImageCapture.c
+++ b/shared-bindings/imagecapture/ParallelImageCapture.c
@@ -166,6 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_deinit_obj, i
 //|         """Automatically deinitializes the hardware on context exit. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
+//|
 STATIC mp_obj_t imagecapture_parallelimagecapture___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_imagecapture_parallelimagecapture_deinit(args[0]);
diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c
index c8f09af962..b9a2363e09 100644
--- a/shared-bindings/ipaddress/IPv4Address.c
+++ b/shared-bindings/ipaddress/IPv4Address.c
@@ -37,6 +37,7 @@
 
 //| class IPv4Address:
 //|     """Encapsulates an IPv4 address."""
+//|
 
 //|     def __init__(self, address: Union[int, str, bytes]) -> None:
 //|         """Create a new IPv4Address object encapsulating the address value.
@@ -141,6 +142,7 @@ STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the IPv4Address data."""
 //|         ...
+//|
 STATIC mp_obj_t ipaddress_ipv4address_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     switch (op) {
         // Two Addresses are equal if their address bytes and address_type are equal
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
index c7966bf4a9..fb4c8bf38d 100644
--- a/shared-bindings/ipaddress/__init__.c
+++ b/shared-bindings/ipaddress/__init__.c
@@ -78,6 +78,7 @@ bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t
 //| def ip_address(obj: Union[int, str]) -> IPv4Address:
 //|     """Return a corresponding IP address object or raise ValueError if not possible."""
 //|     ...
+//|
 
 STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) {
     uint32_t value;
diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c
index 2eeb5164c6..f907a1dcd3 100644
--- a/shared-bindings/is31fl3741/FrameBuffer.c
+++ b/shared-bindings/is31fl3741/FrameBuffer.c
@@ -201,6 +201,7 @@ MP_PROPERTY_GETTER(is31fl3741_FrameBuffer_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
+//|
 STATIC mp_obj_t is31fl3741_FrameBuffer_get_height(mp_obj_t self_in) {
     is31fl3741_FrameBuffer_obj_t *self = (is31fl3741_FrameBuffer_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/shared-bindings/is31fl3741/IS31FL3741.c b/shared-bindings/is31fl3741/IS31FL3741.c
index e41b940ba5..706e3deb2b 100644
--- a/shared-bindings/is31fl3741/IS31FL3741.c
+++ b/shared-bindings/is31fl3741/IS31FL3741.c
@@ -73,6 +73,7 @@ STATIC mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t
 //|         IS31FL3741 instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_deinit(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = (is31fl3741_IS31FL3741_obj_t *)self_in;
     common_hal_is31fl3741_IS31FL3741_deinit(self);
@@ -83,6 +84,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_deinit_obj, is31fl3741_IS
 //| def reset(self) -> None:
 //|     """Resets the IS31FL3741 chip."""
 //|     ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_reset(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_is31fl3741_send_reset(self);
@@ -93,6 +95,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_reset_obj, is31fl3741_IS31FL3741
 //| def enable(self) -> None:
 //|     """Enables the IS31FL3741 chip."""
 //|     ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_enable(mp_obj_t self_in) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_is31fl3741_send_enable(self);
@@ -105,6 +108,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_enable_obj, is31fl3741_IS31FL374
 //|
 //|     :param int current: global current value 0x00 to 0xFF"""
 //|     ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_set_global_current(mp_obj_t self_in, mp_obj_t value) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t current = mp_obj_get_int(value);
@@ -122,6 +126,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(is31fl3741_IS31FL3741_set_global_current_obj, is31fl37
 //|       the routine will automatically write to page 1 or 3 (instead
 //|       of 0 or 2)"""
 //|     ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_set_led(size_t n_args, const mp_obj_t *args) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_int_t led = mp_obj_get_int(args[1]);
@@ -138,6 +143,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(is31fl3741_IS31FL3741_set_led_obj, 4, 4, is3
 //|     :param ~Tuple[int, ...] mapping: map the pixels in the buffer to the order addressed by the driver chip
 //|     :param ~_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order"""
 //|     ...
+//|
 STATIC mp_obj_t is31fl3741_IS31FL3741_write(mp_obj_t self_in, mp_obj_t mapping, mp_obj_t buffer) {
     is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!mp_obj_is_tuple_compatible(mapping)) {
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 0dfa8a2371..56a5815636 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -150,6 +150,7 @@ STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_ob
 //|
 //|         Note that as events with different timestamps compare equal, they also hash to the same value."""
 //|         ...
+//|
 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_in);
     switch (op) {
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 17eafe5468..615c051188 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -120,6 +120,7 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     """``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) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_keypad_eventqueue_get_overflowed(self));
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index bf9dc4a6eb..28a68602ab 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -212,6 +212,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
+//|
 
 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) },
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index df27ea54f1..3a9eb84cf3 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -150,6 +150,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypa
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
+//|
 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) },
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 08be1393d5..0703a78b66 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -156,6 +156,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
+//|
 
 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) },
diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c
index 6c5052d1b5..58405564db 100644
--- a/shared-bindings/math/__init__.c
+++ b/shared-bindings/math/__init__.c
@@ -189,6 +189,7 @@ STATIC NORETURN void math_error(void) {
 //| def trunc(x: float) -> int:
 //|     """Return an integer, being ``x`` rounded towards 0."""
 //|     ...
+//|
 MATH_FUN_1_ERRCOND(sqrt, sqrt, (x < (mp_float_t)0.0))
 
 MATH_FUN_2(pow, pow)
@@ -201,6 +202,7 @@ MATH_FUN_1(exp, exp)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(expm1, expm1)
 
 //| def log2(x: float) -> float:
@@ -209,6 +211,7 @@ MATH_FUN_1(expm1, expm1)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1_ERRCOND(log2, log2, (x <= (mp_float_t)0.0))
 
 //| def log10(x: float) -> float:
@@ -217,6 +220,7 @@ MATH_FUN_1_ERRCOND(log2, log2, (x <= (mp_float_t)0.0))
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1_ERRCOND(log10, log10, (x <= (mp_float_t)0.0))
 
 //| def cosh(x: float) -> float:
@@ -225,6 +229,7 @@ MATH_FUN_1_ERRCOND(log10, log10, (x <= (mp_float_t)0.0))
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(cosh, cosh)
 
 //| def sinh(x: float) -> float:
@@ -233,6 +238,7 @@ MATH_FUN_1(cosh, cosh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(sinh, sinh)
 
 //| def tanh(x: float) -> float:
@@ -241,6 +247,7 @@ MATH_FUN_1(sinh, sinh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(tanh, tanh)
 
 //| def acosh(x: float) -> float:
@@ -249,6 +256,7 @@ MATH_FUN_1(tanh, tanh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(acosh, acosh)
 
 //| def asinh(x: float) -> float:
@@ -257,6 +265,7 @@ MATH_FUN_1(acosh, acosh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(asinh, asinh)
 
 //| def atanh(x: float) -> float:
@@ -265,6 +274,7 @@ MATH_FUN_1(asinh, asinh)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(atanh, atanh)
 #endif
 
@@ -309,6 +319,7 @@ MATH_FUN_2(ldexp, ldexp)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(erf, erf)
 
 //| def erfc(x: float) -> float:
@@ -317,6 +328,7 @@ MATH_FUN_1(erf, erf)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(erfc, erfc)
 
 //| def gamma(x: float) -> float:
@@ -325,6 +337,7 @@ MATH_FUN_1(erfc, erfc)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(gamma, tgamma)
 
 //| def lgamma(x: float) -> float:
@@ -333,6 +346,7 @@ MATH_FUN_1(gamma, tgamma)
 //|     May not be available on some boards.
 //|     """
 //|     ...
+//|
 MATH_FUN_1(lgamma, lgamma)
 #endif
 // TODO: factorial, fsum
diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c
index 26def06a50..c1d7b25783 100644
--- a/shared-bindings/mdns/RemoteService.c
+++ b/shared-bindings/mdns/RemoteService.c
@@ -35,6 +35,7 @@
 //| class RemoteService:
 //|     """Encapsulates information about a remote service that was found during a search. This
 //|     object may only be created by a `mdns.Server`. It has no user-visible constructor."""
+//|
 
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `mdns.Server.find`."""
@@ -113,6 +114,7 @@ MP_PROPERTY_GETTER(mdns_remoteservice_ipv4_address_obj,
 //|     def __del__(self) -> None:
 //|         """Deletes the RemoteService object."""
 //|         ...
+//|
 STATIC mp_obj_t mdns_remoteservice_obj_deinit(mp_obj_t self_in) {
     mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_mdns_remoteservice_deinit(self);
diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index ab5f792cbc..aab7f7e350 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -36,6 +36,7 @@
 //| class Server:
 //|     """The MDNS Server responds to queries for this device's information and allows for querying
 //|     other devices."""
+//|
 
 //|     def __init__(self, network_interface: wifi.Radio) -> None:
 //|         """
@@ -163,6 +164,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 //|         :param str protocol: The service protocol such as "_tcp"
 //|         :param int port: The port used by the service"""
 //|         ...
+//|
 STATIC mp_obj_t mdns_server_advertise_service(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     check_for_deinit(self);
diff --git a/shared-bindings/memorymonitor/AllocationAlarm.c b/shared-bindings/memorymonitor/AllocationAlarm.c
index 4fcf2d1214..e279fa6854 100644
--- a/shared-bindings/memorymonitor/AllocationAlarm.c
+++ b/shared-bindings/memorymonitor/AllocationAlarm.c
@@ -107,6 +107,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationalarm___enter___obj, memorymon
 //|         """Automatically disables the allocation alarm when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
+//|
 STATIC mp_obj_t memorymonitor_allocationalarm_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_memorymonitor_allocationalarm_set_ignore(args[0], 0);
diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c
index 73c149cd19..dd3a1e03cf 100644
--- a/shared-bindings/memorymonitor/AllocationSize.c
+++ b/shared-bindings/memorymonitor/AllocationSize.c
@@ -132,6 +132,7 @@ STATIC mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t
 //|           mm = memorymonitor.AllocationSize()
 //|           print(mm[0])"""
 //|         ...
+//|
 STATIC mp_obj_t memorymonitor_allocationsize_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     if (value == mp_const_none) {
         // delete item
diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c
index 41a0f410ba..12c91cd150 100644
--- a/shared-bindings/memorymonitor/__init__.c
+++ b/shared-bindings/memorymonitor/__init__.c
@@ -39,6 +39,7 @@
 //|     """Catchall exception for allocation related errors."""
 //|
 //|     ...
+//|
 MP_DEFINE_MEMORYMONITOR_EXCEPTION(AllocationError, Exception)
 
 NORETURN void mp_raise_memorymonitor_AllocationError(const compressed_string_t *fmt, ...) {
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index 0213f415f4..42076aa90e 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -45,6 +45,7 @@
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Pin."""
 //|         ...
+//|
 // Provided by mp_generic_unary_op().
 
 static void get_pin_name(const mcu_pin_obj_t *self, qstr *package, qstr *module, qstr *name) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 06be50847e..47c400aee3 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -57,6 +57,7 @@
 //|
 //|        print(microcontroller.cpus[0].temperature)
 //|        print(microcontroller.cpus[1].frequency)"""
+//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `microcontroller.Processor`.
@@ -131,6 +132,7 @@ MP_PROPERTY_GETTER(mcu_processor_uid_obj,
 //|     """The input voltage to the microcontroller, as a float. (read-only)
 //|
 //|     Is `None` if the voltage is not available."""
+//|
 STATIC mp_obj_t mcu_processor_get_voltage(mp_obj_t self) {
     float voltage = common_hal_mcu_processor_get_voltage();
     return isnan(voltage) ? mp_const_none : mp_obj_new_float(voltage);
diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c
index 8bb7352c90..905c19f83f 100644
--- a/shared-bindings/microcontroller/ResetReason.c
+++ b/shared-bindings/microcontroller/ResetReason.c
@@ -64,6 +64,7 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESCUE_DEBUG, RESET_REASON_
 //|
 //|     RESCUE_DEBUG: object
 //|     """The microntroller was reset by the rescue debug port."""
+//|
 MAKE_ENUM_MAP(mcu_reset_reason) {
     MAKE_ENUM_MAP_ENTRY(reset_reason, POWER_ON),
     MAKE_ENUM_MAP_ENTRY(reset_reason, BROWNOUT),
diff --git a/shared-bindings/microcontroller/RunMode.c b/shared-bindings/microcontroller/RunMode.c
index 4c6c1ceb83..b29670576b 100644
--- a/shared-bindings/microcontroller/RunMode.c
+++ b/shared-bindings/microcontroller/RunMode.c
@@ -52,6 +52,7 @@
 //|     """Run the default bootloader.
 //|
 //|     :type microcontroller.RunMode:"""
+//|
 const mp_obj_type_t mcu_runmode_type;
 
 const mcu_runmode_obj_t mcu_runmode_uf2_obj = {
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index f772d32f20..5716f7270e 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -49,6 +49,7 @@
 //|
 //| from nvm import ByteArray
 //| from watchdog import WatchDogTimer
+//|
 
 //| cpu: Processor
 //| """CPU information and control, such as ``cpu.temperature`` and ``cpu.frequency``
@@ -68,6 +69,7 @@
 //|     processing while you are waiting, explore a different avenue such as using
 //|     `time.sleep()`."""
 //|     ...
+//|
 STATIC mp_obj_t mcu_delay_us(mp_obj_t delay_obj) {
     uint32_t delay = mp_obj_get_int(delay_obj);
 
@@ -80,6 +82,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_delay_us_obj, mcu_delay_us);
 //| def disable_interrupts() -> None:
 //|     """Disable all interrupts. Be very careful, this can stall everything."""
 //|     ...
+//|
 STATIC mp_obj_t mcu_disable_interrupts(void) {
     common_hal_mcu_disable_interrupts();
     return mp_const_none;
@@ -89,6 +92,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_disable_interrupts_obj, mcu_disable_interru
 //| def enable_interrupts() -> None:
 //|     """Enable the interrupts that were enabled at the last disable."""
 //|     ...
+//|
 STATIC mp_obj_t mcu_enable_interrupts(void) {
     common_hal_mcu_enable_interrupts();
     return mp_const_none;
@@ -101,6 +105,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_enable_interrupts_obj, mcu_enable_interrupt
 //|
 //|     :param ~microcontroller.RunMode run_mode: The next run mode"""
 //|     ...
+//|
 STATIC mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) {
     mcu_runmode_t run_mode;
     if (run_mode_obj == MP_OBJ_FROM_PTR(&mcu_runmode_uf2_obj)) {
@@ -127,6 +132,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_on_next_reset_obj, mcu_on_next_reset);
 //|       host computer. Be very careful when calling this! Make sure the device
 //|       "Safely removed" on Windows or "ejected" on Mac OSX and Linux."""
 //|     ...
+//|
 STATIC mp_obj_t mcu_reset(void) {
     common_hal_mcu_reset();
     // We won't actually get here because we're resetting.
diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c
index baaa954ca2..7bfe3bd8bd 100644
--- a/shared-bindings/msgpack/ExtType.c
+++ b/shared-bindings/msgpack/ExtType.c
@@ -84,6 +84,7 @@ MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj,
 //|     data: bytes
 //|     """Data."""
 //|     ...
+//|
 STATIC mp_obj_t mod_msgpack_exttype_get_data(mp_obj_t self_in) {
     mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return self->data;
diff --git a/shared-bindings/msgpack/__init__.c b/shared-bindings/msgpack/__init__.c
index 62cf20770e..d505e3a6d8 100644
--- a/shared-bindings/msgpack/__init__.c
+++ b/shared-bindings/msgpack/__init__.c
@@ -100,6 +100,7 @@
 //|           a representation in msgpack format.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t mod_msgpack_pack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_obj, ARG_buffer, ARG_default };
     STATIC const mp_arg_t allowed_args[] = {
@@ -137,6 +138,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mod_msgpack_pack_obj, 0, mod_msgpack_pack);
 //|     :return object: object read from stream.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t mod_msgpack_unpack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_ext_hook, ARG_use_list };
     STATIC const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/multiterminal/__init__.c b/shared-bindings/multiterminal/__init__.c
index 91f21da328..27ed085c5a 100644
--- a/shared-bindings/multiterminal/__init__.c
+++ b/shared-bindings/multiterminal/__init__.c
@@ -39,6 +39,7 @@
 //| def get_secondary_terminal() -> Optional[typing.BinaryIO]:
 //|     """Returns the current secondary terminal."""
 //|     ...
+//|
 STATIC mp_obj_t multiterminal_obj_get_secondary_terminal() {
     return common_hal_multiterminal_get_secondary_terminal();
 }
@@ -51,6 +52,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(multiterminal_get_secondary_terminal_obj, multitermina
 //|
 //|     :param stream stream: secondary stream"""
 //|     ...
+//|
 STATIC mp_obj_t multiterminal_obj_set_secondary_terminal(mp_obj_t secondary_terminal) {
     mp_obj_t write_m[3];
     mp_load_method_maybe(secondary_terminal, MP_QSTR_write, write_m);
@@ -68,6 +70,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(multiterminal_set_secondary_terminal_obj, multitermina
 //| def clear_secondary_terminal() -> None:
 //|     """Clears the secondary terminal."""
 //|     ...
+//|
 STATIC mp_obj_t multiterminal_obj_clear_secondary_terminal() {
     common_hal_multiterminal_clear_secondary_terminal();
     return mp_const_none;
@@ -79,6 +82,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(multiterminal_clear_secondary_terminal_obj, multitermi
 //|     the OS when more data is available on the socket to read. This is useful
 //|     as a callback for lwip sockets."""
 //|     ...
+//|
 // TODO(tannewt): This is a funny API. Replace it with a direct call into the OS
 // by the lwip object.
 STATIC mp_obj_t multiterminal_obj_schedule_secondary_terminal_read(mp_obj_t socket) {
diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c
index e45e970179..3a35fa8243 100644
--- a/shared-bindings/neopixel_write/__init__.c
+++ b/shared-bindings/neopixel_write/__init__.c
@@ -111,6 +111,7 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
 //|     :param ~digitalio.DigitalInOut digitalinout: the DigitalInOut to output with
 //|     :param ~circuitpython_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order"""
 //|     ...
+//|
 STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) {
     if (!mp_obj_is_type(digitalinout_obj, &digitalio_digitalinout_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q"), digitalio_digitalinout_type.name);
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
index 480f05cb02..e7c3fc37e8 100644
--- a/shared-bindings/nvm/ByteArray.c
+++ b/shared-bindings/nvm/ByteArray.c
@@ -82,6 +82,7 @@ STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict
 //|     def __setitem__(self, index: int, value: int) -> None:
 //|         """Set the value at the given index."""
 //|         ...
+//|
 STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
diff --git a/shared-bindings/onewireio/OneWire.c b/shared-bindings/onewireio/OneWire.c
index be8e07a56b..4a0140ac5d 100644
--- a/shared-bindings/onewireio/OneWire.c
+++ b/shared-bindings/onewireio/OneWire.c
@@ -132,6 +132,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_read_bit_obj, onewireio_onewire_obj_
 //|     def write_bit(self, value: bool) -> None:
 //|         """Write out a bit based on value."""
 //|         ...
+//|
 STATIC mp_obj_t onewireio_onewire_obj_write_bit(mp_obj_t self_in, mp_obj_t bool_obj) {
     onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 7cf9d0e45b..1ccefaf0b2 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -44,6 +44,7 @@
 //| """
 //|
 //| import typing
+//|
 
 //| def uname() -> _Uname:
 //|     """Returns a named tuple of operating specific and CircuitPython port
@@ -58,6 +59,7 @@
 //|     release: str
 //|     version: str
 //|     machine: str
+//|
 STATIC mp_obj_t os_uname(void) {
     return common_hal_os_uname();
 }
@@ -66,6 +68,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 //| def chdir(path: str) -> None:
 //|     """Change current directory."""
 //|     ...
+//|
 STATIC mp_obj_t os_chdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_chdir(path);
@@ -76,6 +79,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_chdir_obj, os_chdir);
 //| def getcwd() -> str:
 //|     """Get the current directory."""
 //|     ...
+//|
 STATIC mp_obj_t os_getcwd(void) {
     return common_hal_os_getcwd();
 }
@@ -86,6 +90,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd);
 //|
 //|     This may load values from disk so cache the result instead of calling this often."""
 //|     ...
+//|
 STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_key, ARG_default };
     static const mp_arg_t allowed_args[] = {
@@ -102,6 +107,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv);
 //| def listdir(dir: str) -> str:
 //|     """With no argument, list the current directory.  Otherwise list the given directory."""
 //|     ...
+//|
 STATIC mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) {
     const char *path;
     if (n_args == 1) {
@@ -116,6 +122,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_listdir_obj, 0, 1, os_listdir);
 //| def mkdir(path: str) -> None:
 //|     """Create a new directory."""
 //|     ...
+//|
 STATIC mp_obj_t os_mkdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_mkdir(path);
@@ -126,6 +133,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir);
 //| def remove(path: str) -> None:
 //|     """Remove a file."""
 //|     ...
+//|
 STATIC mp_obj_t os_remove(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_remove(path);
@@ -136,6 +144,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove);
 //| def rmdir(path: str) -> None:
 //|     """Remove a directory."""
 //|     ...
+//|
 STATIC mp_obj_t os_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     const char *old_path = mp_obj_str_get_str(old_path_in);
     const char *new_path = mp_obj_str_get_str(new_path_in);
@@ -147,6 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename);
 //| def rename(old_path: str, new_path: str) -> str:
 //|     """Rename a file."""
 //|     ...
+//|
 STATIC mp_obj_t os_rmdir(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     common_hal_os_rmdir(path);
@@ -176,6 +186,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
 //|        So the time fields return 946684800,
 //|        which is the number of seconds corresponding to 1999-12-31."""
 //|     ...
+//|
 STATIC mp_obj_t os_stat(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     return common_hal_os_stat(path);
@@ -202,6 +213,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_stat_obj, os_stat);
 //|     and the ``f_flags`` parameter may return ``0`` as they can be unavailable
 //|     in a port-specific implementation."""
 //|     ...
+//|
 STATIC mp_obj_t os_statvfs(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
     return common_hal_os_statvfs(path);
@@ -211,6 +223,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_statvfs_obj, os_statvfs);
 //| def sync() -> None:
 //|     """Sync all filesystems."""
 //|     ...
+//|
 STATIC mp_obj_t os_sync(void) {
     for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
         // this assumes that vfs->obj is fs_user_mount_t with block device functions
@@ -224,6 +237,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
 //|     """Returns a string of *size* random bytes based on a hardware True Random
 //|     Number Generator. When not available, it will raise a NotImplementedError."""
 //|     ...
+//|
 STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
     mp_int_t size = mp_obj_get_int(size_in);
     mp_obj_str_t *result = MP_OBJ_TO_PTR(mp_obj_new_bytes_of_zeros(size));
diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c
index 2e751df9d8..2f18624f1a 100644
--- a/shared-bindings/paralleldisplay/ParallelBus.c
+++ b/shared-bindings/paralleldisplay/ParallelBus.c
@@ -132,6 +132,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(paralleldisplay_parallelbus_reset_obj, paralleldisplay
 //|         """Sends the given command value followed by the full set of data. Display state, such as
 //|         vertical scroll, set via ``send`` may or may not be reset once the code is done."""
 //|         ...
+//|
 STATIC mp_obj_t paralleldisplay_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) {
     mp_int_t command_int = mp_arg_validate_int_range(mp_obj_get_int(command_obj), 0, 255, MP_QSTR_command);
 
diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c
index 5386d73d6b..5aeb3af51e 100644
--- a/shared-bindings/ps2io/Ps2.c
+++ b/shared-bindings/ps2io/Ps2.c
@@ -201,6 +201,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_clear_errors_obj, ps2io_ps2_obj_clear_errors
 //|         """Returns the number of received bytes in buffer, available
 //|         to :py:func:`popleft()`."""
 //|         ...
+//|
 STATIC mp_obj_t ps2_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index f3f593e9a7..6d1830c4f2 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -250,6 +250,7 @@ STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|           pulses = pulseio.PulseIn(pin)
 //|           print(pulses[0])"""
 //|         ...
+//|
 STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     if (value == mp_const_none) {
         // delete item
diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c
index 73bce9cd77..758d3c2e77 100644
--- a/shared-bindings/pulseio/PulseOut.c
+++ b/shared-bindings/pulseio/PulseOut.c
@@ -123,6 +123,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4,
 //|
 //|         :param array.array pulses: pulse durations in microseconds"""
 //|         ...
+//|
 STATIC mp_obj_t pulseio_pulseout_obj_send(mp_obj_t self_in, mp_obj_t pulses) {
     pulseio_pulseout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (common_hal_pulseio_pulseout_deinited(self)) {
diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c
index e046388fde..92eea1d1e0 100644
--- a/shared-bindings/pwmio/PWMOut.c
+++ b/shared-bindings/pwmio/PWMOut.c
@@ -235,6 +235,7 @@ MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj,
 //|     changes. In these cases, the duty cycle is automatically recalculated
 //|     from the original duty cycle value. This should happen without any need
 //|     to manually re-set the duty cycle."""
+//|
 STATIC mp_obj_t pwmio_pwmout_obj_get_frequency(mp_obj_t self_in) {
     pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/qrio/PixelPolicy.c b/shared-bindings/qrio/PixelPolicy.c
index 545b868a8c..deb164d02d 100644
--- a/shared-bindings/qrio/PixelPolicy.c
+++ b/shared-bindings/qrio/PixelPolicy.c
@@ -44,6 +44,7 @@
 //|
 //|     RGB565: PixelPolicy
 //|     """The input buffer to `QRDecoder.decode` consists of RGB565 values in native order. The green component is used."""
+//|
 
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, EVERY_BYTE, QRIO_EVERY_BYTE);
 MAKE_ENUM_VALUE(qrio_pixel_policy_type, qrio_pixel_policy, RGB565, QRIO_RGB565);
diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c
index 2d366d1c53..5ff65578e4 100644
--- a/shared-bindings/qrio/QRDecoder.c
+++ b/shared-bindings/qrio/QRDecoder.c
@@ -112,6 +112,7 @@ MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj,
 
 //|     height: int
 //|     """The height of image the decoder expects"""
+//|
 STATIC mp_obj_t qrio_qrdecoder_get_height(mp_obj_t self_in) {
     qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(shared_module_qrio_qrdecoder_get_height(self));
diff --git a/shared-bindings/qrio/QRInfo.c b/shared-bindings/qrio/QRInfo.c
index 8eb03874ef..d53e638f81 100644
--- a/shared-bindings/qrio/QRInfo.c
+++ b/shared-bindings/qrio/QRInfo.c
@@ -37,6 +37,7 @@
 //|
 //|     data_type: Union[str, int]
 //|     """The encoding of the payload as a string (if a standard encoding) or int (if not standard)"""
+//|
 
 const mp_obj_namedtuple_type_t qrio_qrinfo_type_obj = {
     .base = {
diff --git a/shared-bindings/rainbowio/__init__.c b/shared-bindings/rainbowio/__init__.c
index ba2e95fcf4..0dfdcd3a45 100644
--- a/shared-bindings/rainbowio/__init__.c
+++ b/shared-bindings/rainbowio/__init__.c
@@ -35,6 +35,7 @@
 //|     """C implementation of the common colorwheel() function found in many examples.
 //|     Returns the colorwheel RGB value as an integer value for n (usable in neopixel and dotstar)."""
 //|     ...
+//|
 STATIC mp_obj_t rainbowio_colorwheel(mp_obj_t n) {
     mp_float_t f = mp_obj_get_float(n);
     return MP_OBJ_NEW_SMALL_INT(colorwheel(f));
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index 891791bb56..29c6a0e74b 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -52,6 +52,7 @@
 //|     """Sets the starting seed of the random  number generation. Further calls to
 //|     `random` will return deterministic results afterwards."""
 //|     ...
+//|
 STATIC mp_obj_t random_seed(mp_obj_t seed_in) {
     mp_uint_t seed = mp_obj_get_int_truncated(seed_in);
     shared_modules_random_seed(seed);
@@ -62,6 +63,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_seed_obj, random_seed);
 //| def getrandbits(k: int) -> int:
 //|     """Returns an integer with *k* random bits."""
 //|     ...
+//|
 STATIC mp_obj_t random_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
     if (n > 32 || n == 0) {
@@ -79,6 +81,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits);
 //| def randrange(start: int, stop: int, step: int) -> int:
 //|     """Returns a randomly selected integer from ``range(start[, stop[, step]])``."""
 //|     ...
+//|
 STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) {
     mp_int_t start = 0;
     mp_int_t stop = mp_obj_get_int(args[0]);
@@ -121,6 +124,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(random_randrange_obj, 1, 3, random_ra
 //|     """Returns a randomly selected integer between a and b inclusive. Equivalent
 //|     to ``randrange(a, b + 1, 1)``"""
 //|     ...
+//|
 STATIC mp_obj_t random_randint(mp_obj_t a_in, mp_obj_t b_in) {
     mp_int_t a = mp_obj_get_int(a_in);
     mp_int_t b = mp_obj_get_int(b_in);
@@ -135,6 +139,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(random_randint_obj, random_randint);
 //|     """Returns a randomly selected element from the given sequence. Raises
 //|     IndexError when the sequence is empty."""
 //|     ...
+//|
 STATIC mp_obj_t random_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len == 0) {
@@ -147,6 +152,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice);
 //| def random() -> float:
 //|     """Returns a random float between 0 and 1.0."""
 //|     ...
+//|
 STATIC mp_obj_t random_random(void) {
     return mp_obj_new_float(shared_modules_random_random());
 }
@@ -156,6 +162,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(random_random_obj, random_random);
 //|     """Returns a random float between a and b. It may or may not be inclusive
 //|     depending on float rounding."""
 //|     ...
+//|
 STATIC mp_obj_t random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
     mp_float_t a = mp_obj_get_float(a_in);
     mp_float_t b = mp_obj_get_float(b_in);
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index d3a23be5b3..456f0cfbb1 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -40,6 +40,7 @@
 
 //| class RGBMatrix:
 //|     """Displays an in-memory framebuffer to a HUB75-style RGB LED matrix."""
+//|
 
 extern Protomatter_core *_PM_protoPtr;
 
@@ -330,6 +331,7 @@ MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj,
 
 //|     height: int
 //|     """The height of the display, in pixels"""
+//|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) {
     rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in;
     check_for_deinit(self);
diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index a103ddd4e3..e05ffb9e43 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -146,6 +146,7 @@ MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj,
 //|     position: int
 //|     """The current position in terms of pulses. The number of pulses per rotation is defined by the
 //|     specific hardware and by the divisor."""
+//|
 STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_position(mp_obj_t self_in) {
     rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c
index e4096c3460..8e2d9e5e09 100644
--- a/shared-bindings/rtc/RTC.c
+++ b/shared-bindings/rtc/RTC.c
@@ -100,6 +100,7 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj,
 //|
 //|       r = rtc.RTC()
 //|       r.calibration = 1"""
+//|
 STATIC mp_obj_t rtc_rtc_obj_get_calibration(mp_obj_t self_in) {
     int calibration = common_hal_rtc_get_calibration();
     return mp_obj_new_int(calibration);
diff --git a/shared-bindings/rtc/__init__.c b/shared-bindings/rtc/__init__.c
index 3060ec386f..64adfe7d9e 100644
--- a/shared-bindings/rtc/__init__.c
+++ b/shared-bindings/rtc/__init__.c
@@ -65,6 +65,7 @@ mp_obj_t rtc_get_time_source_time(void) {
 //|       r = RTC()
 //|       rtc.set_time_source(r)"""
 //|     ...
+//|
 STATIC mp_obj_t rtc_set_time_source(mp_obj_t time_source) {
     MP_STATE_VM(rtc_time_source) = time_source;
 
diff --git a/shared-bindings/sdcardio/SDCard.c b/shared-bindings/sdcardio/SDCard.c
index f95a783136..a71541c548 100644
--- a/shared-bindings/sdcardio/SDCard.c
+++ b/shared-bindings/sdcardio/SDCard.c
@@ -173,6 +173,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_sync_obj, sdcardio_sdcard_sync);
 //|         :param ~circuitpython_typing.ReadableBuffer buf: The buffer to read from.  Length must be multiple of 512.
 //|
 //|         :return: None"""
+//|
 
 STATIC mp_obj_t sdcardio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) {
     uint32_t start_block = mp_obj_get_int(start_block_in);
diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c
index 563d8f1dfd..7e57330fc4 100644
--- a/shared-bindings/sdioio/SDCard.c
+++ b/shared-bindings/sdioio/SDCard.c
@@ -248,6 +248,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_deinit_obj, sdioio_sdcard_obj_deinit);
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
+//|
 STATIC mp_obj_t sdioio_sdcard_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_sdioio_sdcard_deinit(args[0]);
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 9f0d513b75..7f0d870771 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -44,6 +44,7 @@
 //|
 //|     Provides a subset of CPython's `socket.socket` API. It only implements the versions of
 //|     recv that do not allocate bytes objects."""
+//|
 
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
@@ -340,6 +341,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_setblocking_obj, socketpool_s
 //|
 //|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely."""
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t timeout_ms;
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index f23095ec34..e500784f1f 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -114,6 +114,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_socket_obj, 1, socketpool_socke
 //|         address information to call socket.socket() and socket.connect() with,
 //|         as a tuple."""
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_host, ARG_port, ARG_family, ARG_type, ARG_proto, ARG_flags };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c
index bd9cc7a694..f0eb0e8c58 100644
--- a/shared-bindings/ssl/SSLContext.c
+++ b/shared-bindings/ssl/SSLContext.c
@@ -39,6 +39,7 @@
 //|     """Settings related to SSL that can be applied to a socket by wrapping it.
 //|     This is useful to provide SSL certificates to specific connections
 //|     rather than all of them."""
+//|
 
 STATIC mp_obj_t ssl_sslcontext_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, 0, 1, false);
@@ -114,6 +115,7 @@ MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj,
 //|     ) -> ssl.SSLSocket:
 //|         """Wraps the socket into a socket-compatible class that handles SSL negotiation.
 //|         The socket must be of type SOCK_STREAM."""
+//|
 
 STATIC mp_obj_t ssl_sslcontext_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sock, ARG_server_side, ARG_server_hostname };
diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c
index be12aa59ab..d6f4ad051c 100644
--- a/shared-bindings/ssl/SSLSocket.c
+++ b/shared-bindings/ssl/SSLSocket.c
@@ -43,6 +43,7 @@
 //|
 //|     Provides a subset of CPython's `ssl.SSLSocket` API. It only implements the versions of
 //|     recv that do not allocate bytes objects."""
+//|
 
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
@@ -263,6 +264,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_set
 //|
 //|         :param ~bool flag: False means non-blocking, True means block indefinitely."""
 //|         ...
+//|
 // method socket.setblocking(flag)
 STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c
index 141a845a56..9204c92790 100644
--- a/shared-bindings/ssl/__init__.c
+++ b/shared-bindings/ssl/__init__.c
@@ -40,6 +40,7 @@
 //| def create_default_context() -> ssl.SSLContext:
 //|     """Return the default SSLContext."""
 //|     ...
+//|
 
 STATIC mp_obj_t ssl_create_default_context(void) {
     ssl_sslcontext_obj_t *s = m_new_obj(ssl_sslcontext_obj_t);
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 966d658308..3661b61973 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -57,6 +57,7 @@
 //|     :param bool readonly: True when the filesystem should be readonly to CircuitPython.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t storage_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_filesystem, ARG_mount_path, ARG_readonly };
     static const mp_arg_t allowed_args[] = {
@@ -93,6 +94,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_mount_obj, 0, storage_mount);
 //|
 //|     This is the CircuitPython analog to the UNIX ``umount`` command."""
 //|     ...
+//|
 STATIC mp_obj_t storage_umount(mp_obj_t mnt_in) {
     if (mp_obj_is_str(mnt_in)) {
         common_hal_storage_umount_path(mp_obj_str_get_str(mnt_in));
@@ -119,6 +121,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_umount_obj, storage_umount);
 //|       allows CircuitPython and a host to write to the same filesystem with the risk that the
 //|       filesystem will be corrupted."""
 //|     ...
+//|
 STATIC mp_obj_t storage_remount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mount_path, ARG_readonly, ARG_disable_concurrent_write_protection };
     static const mp_arg_t allowed_args[] = {
@@ -141,6 +144,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_remount_obj, 0, storage_remount);
 //| def getmount(mount_path: str) -> VfsFat:
 //|     """Retrieves the mount object associated with the mount path"""
 //|     ...
+//|
 STATIC mp_obj_t storage_getmount(const mp_obj_t mnt_in) {
     return common_hal_storage_getmount(mp_obj_str_get_str(mnt_in));
 }
@@ -159,6 +163,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 //|     .. warning:: All the data on ``CIRCUITPY`` will be lost, and
 //|          CircuitPython will restart on certain boards."""
 //|     ...
+//|
 
 STATIC mp_obj_t storage_erase_filesystem(void) {
     common_hal_storage_erase_filesystem();
@@ -171,6 +176,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_erase_filesystem_obj, storage_erase_filesystem
 //|     By default, the device is enabled and ``CIRCUITPY`` is visible.
 //|     Can be called in ``boot.py``, before USB is connected."""
 //|     ...
+//|
 STATIC mp_obj_t storage_disable_usb_drive(void) {
     #if CIRCUITPY_USB_MSC
     if (!common_hal_storage_disable_usb_drive()) {
@@ -195,6 +201,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_disable_usb_drive_obj, storage_disable_usb_dri
 //|     not enough endpoints are available.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t storage_enable_usb_drive(void) {
     #if CIRCUITPY_USB_MSC
     if (!common_hal_storage_enable_usb_drive()) {
@@ -259,6 +266,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     def umount(self) -> None:
 //|         """Don't call this directly, call `storage.umount`."""
 //|         ...
+//|
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
 };
 
diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c
index 1bc46cb9b0..59bc78005d 100644
--- a/shared-bindings/struct/__init__.c
+++ b/shared-bindings/struct/__init__.c
@@ -51,6 +51,7 @@
 //| def calcsize(fmt: str) -> int:
 //|     """Return the number of bytes needed to store the given fmt."""
 //|     ...
+//|
 
 STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
 
@@ -62,6 +63,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize);
 //|     """Pack the values according to the format string fmt.
 //|     The return value is a bytes object encoding the values."""
 //|     ...
+//|
 
 STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
     mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
@@ -79,6 +81,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, str
 //|     """Pack the values according to the format string fmt into a buffer
 //|     starting at offset. offset may be negative to count from the end of buffer."""
 //|     ...
+//|
 
 STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -105,6 +108,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX
 //|     is a tuple of the unpacked values. The buffer size must match the size
 //|     required by the format."""
 //|     ...
+//|
 
 STATIC mp_obj_t struct_unpack(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -123,6 +127,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_obj, 2, 3, struct_unpack);
 //|     a tuple of the unpacked values. The buffer size must be at least as big
 //|     as the size required by the form."""
 //|     ...
+//|
 
 STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_format, ARG_buffer, ARG_offset };
diff --git a/shared-bindings/supervisor/RunReason.c b/shared-bindings/supervisor/RunReason.c
index 9f8189e7b5..a2a5fe13ef 100644
--- a/shared-bindings/supervisor/RunReason.c
+++ b/shared-bindings/supervisor/RunReason.c
@@ -48,6 +48,7 @@ MAKE_ENUM_VALUE(supervisor_run_reason_type, run_reason, REPL_RELOAD, RUN_REASON_
 //|
 //|     REPL_RELOAD: object
 //|     """CircuitPython started due to the user typing CTRL-D in the REPL."""
+//|
 MAKE_ENUM_MAP(supervisor_run_reason) {
     MAKE_ENUM_MAP_ENTRY(run_reason, STARTUP),
     MAKE_ENUM_MAP_ENTRY(run_reason, AUTO_RELOAD),
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 5356c3c3c7..fa9431f25a 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -51,6 +51,7 @@ STATIC supervisor_run_reason_t _run_reason;
 //|        import supervisor
 //|        if supervisor.runtime.serial_connected:
 //|            print("Hello World!")"""
+//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `supervisor.Runtime`.
@@ -113,6 +114,7 @@ MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj,
 
 //|     autoreload: bool
 //|     """Whether CircuitPython may autoreload based on workflow writes to the filesystem."""
+//|
 STATIC mp_obj_t supervisor_runtime_get_autoreload(mp_obj_t self) {
     return mp_obj_new_bool(autoreload_is_enabled());
 }
diff --git a/shared-bindings/supervisor/StatusBar.c b/shared-bindings/supervisor/StatusBar.c
index 0a1f871ab9..8db1906f5e 100644
--- a/shared-bindings/supervisor/StatusBar.c
+++ b/shared-bindings/supervisor/StatusBar.c
@@ -40,6 +40,7 @@
 //|
 //|        supervisor.status_bar.console = False
 //|     """
+//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `supervisor.StatusBar`.
@@ -83,6 +84,7 @@ MP_PROPERTY_GETSET(supervisor_status_bar_console_obj,
 //|     May be set in ``boot.py`` or later.  Persists across soft restarts.
 //|     Not available if `terminalio` is not available.
 //|     """
+//|
 STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) {
     #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO
     supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 8e2d90a417..3dc3bff848 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -68,6 +68,7 @@
 //|     after the current code finishes and the status LED is used to show
 //|     the finish state."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_set_rgb_status_brightness(mp_obj_t lvl) {
     // This must be int. If cast to uint8_t first, will never raise a ValueError.
     int brightness_int = mp_obj_get_int(lvl);
@@ -80,6 +81,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_rgb_status_brightness_obj, supervisor_s
 //| def reload() -> None:
 //|     """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL)."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_reload(void) {
     reload_initiate(RUN_REASON_SUPERVISOR_RELOAD);
     return mp_const_none;
@@ -89,6 +91,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload);
 //| def set_next_stack_limit(size: int) -> None:
 //|     """Set the size of the stack for the next vm run. If its too large, the default will be used."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_set_next_stack_limit(mp_obj_t size_obj) {
     mp_int_t size = mp_obj_get_int(size_obj);
 
@@ -140,6 +143,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_next_stack_limit_obj, supervisor_set_ne
 //|     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} },
@@ -240,6 +244,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_next_code_file_obj, 0, supervisor_set_
 //|
 //|     """
 //|     ...
+//|
 mp_obj_t supervisor_ticks_ms(void) {
     uint64_t ticks_ms = common_hal_time_monotonic_ms();
     return mp_obj_new_int((ticks_ms + 0x1fff0000) % (1 << 29));
@@ -255,6 +260,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_ticks_ms_obj, supervisor_ticks_ms);
 //|
 //|     Only code (main or boot) runs are considered, not REPL runs."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_get_previous_traceback(void) {
     if (prev_traceback_allocation) {
         size_t len = strlen((const char *)prev_traceback_allocation->ptr);
@@ -276,6 +282,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_get_previous_traceback_obj, supervisor_get_
 //|     """Disable ble workflow until a reset. This prevents BLE advertising outside of the VM and
 //|     the services used for it."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_disable_ble_workflow(void) {
     #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
     mp_raise_NotImplementedError(NULL);
@@ -289,6 +296,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_disable_ble_workflow_obj, supervisor_disabl
 //| def reset_terminal(x_pixels: int, y_pixels: int) -> None:
 //|     """Reset the CircuitPython serial terminal with new dimensions."""
 //|     ...
+//|
 STATIC mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels) {
     #if CIRCUITPY_DISPLAYIO
     supervisor_stop_terminal();
@@ -316,6 +324,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin
 //|     Not available on boards without native USB support.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     #if CIRCUITPY_USB_IDENTIFICATION
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index d713336192..b987337eaa 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -122,6 +122,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_miditrack___exit___obj, 4, 4,
 
 //|     sample_rate: Optional[int]
 //|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
+//|
 STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) {
     synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 763c5de777..106a073535 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -60,6 +60,7 @@
 //|             pass
 //|           print("stopped")"""
 //|     ...
+//|
 STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_file, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 7426b2b57d..a666a79461 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -100,6 +100,7 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
 //|         :return: the number of bytes written
 //|         :rtype: int or None"""
 //|         ...
+//|
 STATIC mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const byte *buf = buf_in;
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index af3ac0f941..096c80d382 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -62,6 +62,7 @@
 //|     :return: the current monotonic time
 //|     :rtype: float"""
 //|     ...
+//|
 STATIC mp_obj_t time_monotonic(void) {
     uint64_t ticks_ms = common_hal_time_monotonic_ms();
     return mp_obj_new_float(uint64_to_float(ticks_ms) / 1000.0f);
@@ -73,6 +74,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_obj, time_monotonic);
 //|
 //|     :param float seconds: the time to sleep in fractional seconds"""
 //|     ...
+//|
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t seconds = mp_obj_get_float(seconds_o);
@@ -117,6 +119,7 @@ STATIC mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, s
 //|           * ``tm_yday``: the day of the year, range [1, 366], -1 indicates not known
 //|           * ``tm_isdst``: 1 when in daylight savings, 0 when not, -1 if unknown."""
 //|         ...
+//|
 const mp_obj_namedtuple_type_t struct_time_type_obj = {
     .base = {
         .base = {
@@ -215,6 +218,7 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //|     :return: the current time
 //|     :rtype: int"""
 //|     ...
+//|
 STATIC mp_obj_t time_time(void) {
     timeutils_struct_time_t tm;
     struct_time_to_tm(rtc_get_time_source_time(), &tm);
@@ -231,6 +235,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 //|     :return: the current time
 //|     :rtype: int"""
 //|     ...
+//|
 STATIC mp_obj_t time_monotonic_ns(void) {
     uint64_t time64 = common_hal_time_monotonic_ns();
     return mp_obj_new_int_from_ll((long long)time64);
@@ -246,6 +251,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_ns_obj, time_monotonic_ns);
 //|     :return: the current time
 //|     :rtype: time.struct_time"""
 //|     ...
+//|
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0 || args[0] == mp_const_none) {
         return rtc_get_time_source_time();
@@ -282,6 +288,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
 //|     :return: seconds
 //|     :rtype: int"""
 //|     ...
+//|
 STATIC mp_obj_t time_mktime(mp_obj_t t) {
     mp_obj_t *elem;
     size_t len;
diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 5b87d0a485..63da84e885 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -50,6 +50,7 @@
 //|        while True:
 //|            if touch.value:
 //|                print("touched!")"""
+//|
 
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Use the TouchIn on the given pin.
@@ -145,6 +146,7 @@ MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj,
 //|
 //|       touch = touchio.TouchIn(board.A1)
 //|       touch.threshold = 7300"""
+//|
 STATIC mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) {
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index 59e0ed1e97..566ac57218 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -89,6 +89,7 @@ STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj
 //|
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_chain };
     static const mp_arg_t allowed_args[] = {
@@ -135,6 +136,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f
 //|
 //|     """
 //|     ...
+//|
 
 STATIC mp_obj_t traceback_print_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c
index a346379763..376be78ef1 100644
--- a/shared-bindings/uheap/__init__.c
+++ b/shared-bindings/uheap/__init__.c
@@ -37,6 +37,7 @@
 //|     """Prints memory debugging info for the given object and returns the
 //|     estimated size."""
 //|     ...
+//|
 STATIC mp_obj_t uheap_info(mp_obj_t obj) {
     uint32_t size = shared_module_uheap_info(obj);
 
diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c
index 80a8c2a24d..40bb01dc08 100644
--- a/shared-bindings/usb/core/Device.c
+++ b/shared-bindings/usb/core/Device.c
@@ -275,6 +275,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_detach_kernel_driver_obj, usb_core_dev
 //|         :param int interface: the device interface number to allow CircuitPython to use
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t usb_core_device_attach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) {
     usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t interface = mp_obj_get_int(interface_in);
diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c
index eec0bd29aa..84d202945a 100644
--- a/shared-bindings/usb/core/__init__.c
+++ b/shared-bindings/usb/core/__init__.c
@@ -45,6 +45,7 @@
 //|     """Catchall exception for USB related errors."""
 //|
 //|     ...
+//|
 MP_DEFINE_USB_CORE_EXCEPTION(USBError, OSError)
 NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...) {
     va_list argptr;
@@ -58,6 +59,7 @@ NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...) {
 //|     """Raised when a USB transfer times out."""
 //|
 //|     ...
+//|
 MP_DEFINE_USB_CORE_EXCEPTION(USBTimeoutError, usb_core_USBError)
 NORETURN void mp_raise_usb_core_USBTimeoutError(void) {
     mp_raise_type(&mp_type_usb_core_USBTimeoutError);
@@ -72,6 +74,7 @@ NORETURN void mp_raise_usb_core_USBTimeoutError(void) {
 //|
 //|     Returns None if no device matches.
 //|     """
+//|
 typedef struct {
     mp_obj_base_t base;
     mp_int_t vid;
diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c
index a01b535112..df96debe7f 100644
--- a/shared-bindings/usb_cdc/Serial.c
+++ b/shared-bindings/usb_cdc/Serial.c
@@ -221,6 +221,7 @@ MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj,
 //|     """The initial value of `write_timeout` is ``None``. If ``None``, wait indefinitely to finish
 //|     writing all the bytes passed to ``write()``.If 0, do not wait.
 //|     If > 0, wait only ``write_timeout`` seconds."""
+//|
 STATIC mp_obj_t usb_cdc_serial_get_write_timeout(mp_obj_t self_in) {
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_float_t write_timeout = common_hal_usb_cdc_serial_get_write_timeout(self);
diff --git a/shared-bindings/usb_cdc/__init__.c b/shared-bindings/usb_cdc/__init__.c
index 86f0788694..e23e289309 100644
--- a/shared-bindings/usb_cdc/__init__.c
+++ b/shared-bindings/usb_cdc/__init__.c
@@ -68,6 +68,7 @@
 //|     Can be called in ``boot.py``, before USB is connected.
 //|     Equivalent to ``usb_cdc.enable(console=False, data=False)``."""
 //|     ...
+//|
 STATIC mp_obj_t usb_cdc_disable(void) {
     if (!common_hal_usb_cdc_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -90,6 +91,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_cdc_disable_obj, usb_cdc_disable);
 //|     not enough endpoints are available.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t usb_cdc_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_console, ARG_data };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index 94b378583d..97196144be 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -241,6 +241,7 @@ MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj,
 //|
 //|     For example, Keyboard is 0x06 within the generic desktop usage page 0x01.
 //|     Mouse is 0x02 within the same usage page."""
+//|
 STATIC mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) {
     usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_device_get_usage(self));
diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c
index 23a15e6b8b..1c51502455 100644
--- a/shared-bindings/usb_hid/__init__.c
+++ b/shared-bindings/usb_hid/__init__.c
@@ -56,6 +56,7 @@
 //|     it is disabled by default. You must turn off another USB device such
 //|     as `usb_cdc` or `storage` to free up endpoints for use by `usb_hid`.
 //|     """
+//|
 STATIC mp_obj_t usb_hid_disable(void) {
     if (!common_hal_usb_hid_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -107,6 +108,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_hid_disable_obj, usb_hid_disable);
 //|     will enter safe mode to report this error.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t usb_hid_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_devices, ARG_boot_device };
     static const mp_arg_t allowed_args[] = {
@@ -150,6 +152,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_enable_obj, 1, usb_hid_enable);
 //|       if you are using those devices.
 //|     :rtype int:
 //|     """
+//|
 STATIC mp_obj_t usb_hid_get_boot_device(void) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_get_boot_device());
 }
diff --git a/shared-bindings/usb_host/Port.c b/shared-bindings/usb_host/Port.c
index 5fcc67381e..7fb79e75a5 100644
--- a/shared-bindings/usb_host/Port.c
+++ b/shared-bindings/usb_host/Port.c
@@ -76,6 +76,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_host_port_deinit_obj, usb_host_port_obj_deinit);
 //|         """Automatically deinitializes the hardware when exiting a context. See
 //|         :ref:`lifetime-and-contextmanagers` for more info."""
 //|         ...
+//|
 STATIC mp_obj_t usb_host_port_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     common_hal_usb_host_port_deinit(MP_OBJ_TO_PTR(args[0]));
diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c
index ae01d6040f..b63843e8dd 100644
--- a/shared-bindings/usb_midi/PortIn.c
+++ b/shared-bindings/usb_midi/PortIn.c
@@ -63,6 +63,7 @@
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: bytes or None"""
 //|         ...
+//|
 
 // These three methods are used by the shared stream methods.
 STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c
index 447a2bcadb..5888045b79 100644
--- a/shared-bindings/usb_midi/PortOut.c
+++ b/shared-bindings/usb_midi/PortOut.c
@@ -52,6 +52,7 @@
 //|         :return: the number of bytes written
 //|         :rtype: int or None"""
 //|         ...
+//|
 
 STATIC mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c
index fa065f5ae7..982cd144da 100644
--- a/shared-bindings/usb_midi/__init__.c
+++ b/shared-bindings/usb_midi/__init__.c
@@ -49,6 +49,7 @@
 //|     including ESP32-S2 and certain STM boards, it is disabled by default.
 //|     Can be called in ``boot.py``, before USB is connected."""
 //|     ...
+//|
 STATIC mp_obj_t usb_midi_disable(void) {
     if (!common_hal_usb_midi_disable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
@@ -68,6 +69,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_midi_disable_obj, usb_midi_disable);
 //|     not enough endpoints are available.
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t usb_midi_enable(void) {
     if (!common_hal_usb_midi_enable()) {
         mp_raise_RuntimeError(translate("Cannot change USB devices now"));
diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c
index 2674116202..b42fb2a614 100644
--- a/shared-bindings/ustack/__init__.c
+++ b/shared-bindings/ustack/__init__.c
@@ -40,6 +40,7 @@
 //| def max_stack_usage() -> int:
 //|     """Return the maximum excursion of the stack so far."""
 //|     ...
+//|
 STATIC mp_obj_t max_stack_usage(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_max_stack_usage());
 }
@@ -52,6 +53,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage);
 //|     Same as in micropython.mem_info(), but returns a value instead
 //|     of just printing it."""
 //|     ...
+//|
 STATIC mp_obj_t stack_size(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_size());
 }
@@ -61,6 +63,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(stack_size_obj, stack_size);
 //|     """Return how much stack is currently in use.
 //|     Same as micropython.stack_use(); duplicated here for convenience."""
 //|     ...
+//|
 STATIC mp_obj_t stack_usage(void) {
     return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_usage());
 }
diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index 1b2c59a3f6..91b0d3ae34 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -114,6 +114,7 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj,
 //|
 //|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the circle."""
+//|
 
 STATIC const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index a80ad55b4b..f4f07c66a0 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -123,6 +123,7 @@ MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj,
 //|
 //|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the polygon."""
+//|
 
 STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index 0944cce7b9..5c163a7693 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -144,6 +144,7 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = {
 //|
 //|     pixel_shader: Union[displayio.ColorConverter, displayio.Palette]
 //|     """The pixel shader of the rectangle."""
+//|
 
 STATIC const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = {
     // Functions
diff --git a/shared-bindings/watchdog/WatchDogMode.c b/shared-bindings/watchdog/WatchDogMode.c
index 610a99340a..b9ee82e186 100644
--- a/shared-bindings/watchdog/WatchDogMode.c
+++ b/shared-bindings/watchdog/WatchDogMode.c
@@ -40,6 +40,7 @@
 //|     """Reset the system if the WatchDogTimer expires.
 //|
 //|     :type WatchDogMode:"""
+//|
 const mp_obj_type_t watchdog_watchdogmode_type;
 
 const watchdog_watchdogmode_obj_t watchdog_watchdogmode_raise_obj = {
diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c
index 1c6fac1f80..1d47e88b9f 100644
--- a/shared-bindings/watchdog/WatchDogTimer.c
+++ b/shared-bindings/watchdog/WatchDogTimer.c
@@ -47,6 +47,7 @@
 //|     A lock up is detected when the watchdog hasn't been fed after a given duration. So, make
 //|     sure to call `feed` within the timeout.
 //|     """
+//|
 
 //|     def __init__(self) -> None:
 //|         """Not currently dynamically supported. Access the sole instance through `microcontroller.watchdog`."""
@@ -120,6 +121,7 @@ MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj,
 //|
 //|
 //|     Once set, the WatchDogTimer will perform the specified action if the timer expires."""
+//|
 STATIC mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) {
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return watchdog_watchdogmode_type_to_obj(common_hal_watchdog_get_mode(self));
diff --git a/shared-bindings/watchdog/__init__.c b/shared-bindings/watchdog/__init__.c
index a0e357e2ac..df55ab7c16 100644
--- a/shared-bindings/watchdog/__init__.c
+++ b/shared-bindings/watchdog/__init__.c
@@ -76,6 +76,7 @@
 //|
 //|         print("Exited loop")
 //|     """
+//|
 
 const mp_obj_type_t mp_type_WatchDogTimeout = {
     { &mp_type_type },
diff --git a/shared-bindings/wifi/AuthMode.c b/shared-bindings/wifi/AuthMode.c
index 6228144d80..528fcd4143 100644
--- a/shared-bindings/wifi/AuthMode.c
+++ b/shared-bindings/wifi/AuthMode.c
@@ -59,6 +59,7 @@ MAKE_ENUM_VALUE(wifi_authmode_type, authmode, ENTERPRISE, AUTHMODE_ENTERPRISE);
 //|
 //|     ENTERPRISE: object
 //|     """Each user has a unique credential."""
+//|
 MAKE_ENUM_MAP(wifi_authmode) {
     MAKE_ENUM_MAP_ENTRY(authmode, OPEN),
     MAKE_ENUM_MAP_ENTRY(authmode, WEP),
diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c
index aef39c6d95..bd688d357d 100644
--- a/shared-bindings/wifi/Monitor.c
+++ b/shared-bindings/wifi/Monitor.c
@@ -34,6 +34,7 @@
 
 //| class Monitor:
 //|     """For monitoring WiFi packets."""
+//|
 
 //| def __init__(self, channel: Optional[int] = 1, queue: Optional[int] = 128) -> None:
 //|     """Initialize `wifi.Monitor` singleton.
@@ -43,6 +44,7 @@
 //|
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_channel, ARG_queue };
     static const mp_arg_t allowed_args[] = {
@@ -101,6 +103,7 @@ MP_PROPERTY_GETTER(wifi_monitor_queue_obj,
 //| def deinit(self) -> None:
 //|     """De-initialize `wifi.Monitor` singleton."""
 //|     ...
+//|
 STATIC mp_obj_t wifi_monitor_obj_deinit(mp_obj_t self_in) {
     common_hal_wifi_monitor_deinit(self_in);
     return mp_const_none;
@@ -110,6 +113,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_deinit_obj, wifi_monitor_obj_deini
 //| def lost(self) -> int:
 //|     """Returns the packet loss count. The counter resets after each poll."""
 //|     ...
+//|
 STATIC mp_obj_t wifi_monitor_obj_get_lost(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_lost(self_in);
 }
@@ -118,6 +122,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost);
 //| def queued(self) -> int:
 //|     """Returns the packet queued count."""
 //|     ...
+//|
 STATIC mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {
         return mp_obj_new_int_from_uint(0);
@@ -129,6 +134,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_queued_obj, wifi_monitor_obj_get_queued);
 //| def packet(self) -> dict:
 //|     """Returns the monitor packet."""
 //|     ...
+//|
 STATIC mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {
         raise_deinited_error();
diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c
index 0a10083a55..387b1f587d 100644
--- a/shared-bindings/wifi/Network.c
+++ b/shared-bindings/wifi/Network.c
@@ -32,6 +32,7 @@
 
 //| class Network:
 //|     """A wifi network provided by a nearby access point."""
+//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `wifi.Network`. They are returned by `wifi.Radio.start_scanning_networks`."""
@@ -97,6 +98,7 @@ MP_PROPERTY_GETTER(wifi_network_country_obj,
 
 //|     authmode: str
 //|     """String id of the authmode"""
+//|
 STATIC mp_obj_t wifi_network_get_authmode(mp_obj_t self) {
     return common_hal_wifi_network_get_authmode(self);
 
diff --git a/shared-bindings/wifi/Packet.c b/shared-bindings/wifi/Packet.c
index e9dfb8558f..d21c8b0639 100644
--- a/shared-bindings/wifi/Packet.c
+++ b/shared-bindings/wifi/Packet.c
@@ -47,6 +47,7 @@ MAKE_ENUM_VALUE(wifi_packet_type, packet, RSSI, PACKET_RSSI);
 //|
 //|     RSSI: object
 //|     """The packet's rssi."""
+//|
 MAKE_ENUM_MAP(wifi_packet) {
     MAKE_ENUM_MAP_ENTRY(packet, CH),
     MAKE_ENUM_MAP_ENTRY(packet, LEN),
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 964fc2a0ad..abe04ce24a 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -78,6 +78,7 @@ STATIC bool hostname_valid(const char *ptr, size_t len) {
 //|     Wifi radio.
 //|
 //|     """
+//|
 
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `wifi.Radio`.
@@ -558,6 +559,7 @@ MP_PROPERTY_GETTER(wifi_radio_ap_info_obj,
 //|         """Ping an IP to test connectivity. Returns echo time in seconds.
 //|         Returns None when it times out."""
 //|         ...
+//|
 STATIC mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ip, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c
index f6dc7830da..a893213719 100644
--- a/shared-bindings/wifi/ScannedNetworks.c
+++ b/shared-bindings/wifi/ScannedNetworks.c
@@ -35,6 +35,7 @@
 //| class ScannedNetworks:
 //|     """Iterates over all `wifi.Network` objects found while scanning. This object is always created
 //|     by a `wifi.Radio`: it has no user-visible constructor."""
+//|
 STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &wifi_scannednetworks_type));
     wifi_scannednetworks_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -56,6 +57,7 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
 //|         """Returns the next `wifi.Network`.
 //|         Raises `StopIteration` if scanning is finished and no other results are available."""
 //|         ...
+//|
 
 const mp_obj_type_t wifi_scannednetworks_type = {
     { &mp_type_type },
diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c
index 137c5d7c11..d9c2a01810 100644
--- a/shared-bindings/zlib/__init__.c
+++ b/shared-bindings/zlib/__init__.c
@@ -70,6 +70,7 @@
 //|     :param int bufsize: ignored for compatibility with CPython only
 //|     """
 //|     ...
+//|
 STATIC mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) {
     bool is_zlib = true;
     if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) {
diff --git a/tools/black_bindings.py b/tools/black_bindings.py
index c1e6b3b271..1c6fa3cfe8 100755
--- a/tools/black_bindings.py
+++ b/tools/black_bindings.py
@@ -1,58 +1,117 @@
 #!/usr/bin/python3
-from concurrent.futures import ThreadPoolExecutor
 import os
 import re
 import subprocess
 import sys
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass
+from enum import Enum, auto
+
+MARK_C_IN_PY = "##| "
+MARK_PY_IN_C = "//| "
 
 
-def transform(fn, s):
-    lines = s.rstrip().split("\n")
-    lines = [line.removeprefix("//| ").removeprefix("//|") for line in lines]
-    while lines and not lines[0]:
-        del lines[0]
+class Mode(Enum):
+    C = auto()
+    PY = auto()
 
-    s = "\n".join(lines) + "\n"
-    if s[0] == " ":
-        prefix = "if 0:\n"
+
+@dataclass(frozen=True)
+class LineWithMode:
+    data: str
+    mode: Mode
+
+
+class OutputWriter:
+    def __init__(self):
+        self.content = []
+
+    def write(self, line):
+        self.content.append(line.rstrip())
+
+    def getcontent(self):
+        return "\n".join(self.content)
+
+
+class PythonOutputWriter(OutputWriter):
+    def write(self, line):
+        if isinstance(line, str):
+            super().write(line)
+        elif line.mode == Mode.PY:
+            super().write(line.data)
+        else:  # line mode is C
+            super().write(MARK_C_IN_PY + line.data)
+
+
+class COutputWriter(OutputWriter):
+    def write(self, line):
+        if isinstance(line, str):
+            super().write(line)
+        elif line.mode == Mode.PY:
+            super().write(MARK_PY_IN_C + line.data)
+        else:  # line mode is C
+            super().write(line.data)
+
+
+def parse_line(line, defmode, mark, smark, markmode):
+    sline = line.strip()
+    if sline == smark or sline.startswith(mark):
+        return LineWithMode(sline[len(mark) :], markmode)
     else:
-        prefix = ""
-    s = prefix + s
+        return LineWithMode(line, defmode)
+
+
+def parse_lines(lines, defmode, mark, markmode):
+    smark = mark.strip()
+    return [parse_line(line, defmode, mark, smark, markmode) for line in lines]
+
+
+def swap_comment_markers(content, input_mode):
+    lines = content.rstrip().split("\n")
+
+    if input_mode == Mode.C:
+        parsed = parse_lines(lines, Mode.C, MARK_PY_IN_C, Mode.PY)
+        writer = PythonOutputWriter()
+    else:
+        parsed = parse_lines(lines, Mode.PY, MARK_C_IN_PY, Mode.C)
+        writer = COutputWriter()
+
+    for line in parsed:
+        writer.write(line)
+
+    newcontent = writer.getcontent() + "\n"
+
+    return newcontent
+
+
+def process_one_file(fn):
+    with open(fn, "r", encoding="utf-8") as f:
+        c_content = f.read()
+
+    if not "\n//| " in c_content:
+        return
+
+    py_content = swap_comment_markers(c_content, Mode.C)
+
     try:
         # Line length is 95 so that with "//| " the max is 99
         result = subprocess.run(
             ["black", "--pyi", "-l95", "-q", "-"],
-            input=s,
+            input=py_content,
             check=True,
             stdout=subprocess.PIPE,
             encoding="utf-8",
         )
     except subprocess.CalledProcessError as e:
-        print(f"{fn}:0: Failed to process block:\n{s}")
+        print(f"{fn}:0: Failed to process file ")
         raise
 
-    result = result.stdout[len(prefix) :].strip("\n")
-    result = (result.rstrip()).split("\n")
-    return "\n".join("//| " + line if line else "//|" for line in result) + "\n"
+    new_py_content = result.stdout
+    new_c_content = swap_comment_markers(new_py_content, Mode.PY)
 
-
-def process_one_file(fn):
-    with open(fn, "r", encoding="utf-8") as f:
-        content = f.read()
-
-    old_end = 0
-
-    parts = []
-    for m in re.finditer("(?m)((?:^//\|.*\n)(?:^//\|.*\n)*)", content):
-        parts.append(content[old_end : m.start()])
-        parts.append(transform(fn, m.group()))
-        old_end = m.end()
-    parts.append(content[old_end:])
-    newcontent = "".join(parts)
-
-    if newcontent != content:
+    if new_c_content != c_content:
         with open(fn, "w", encoding="utf-8") as f:
-            f.write(newcontent)
+            f.write(new_c_content)
 
 
 if __name__ == "__main__":
@@ -64,6 +123,7 @@ if __name__ == "__main__":
         try:
             f.result()
         except Exception as e:
+            print(e)
             status = 1
     executor.shutdown()
     raise SystemExit(status)

From 2c9c6fc80ef1dc1f4fe02831e0c49b66ddbd95ff Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 08:00:32 -0500
Subject: [PATCH 1082/2403] Remove unused static functions

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c    | 7 -------
 ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c  | 4 ----
 ports/raspberrypi/common-hal/wifi/ScannedNetworks.c | 5 -----
 ports/raspberrypi/lwip_src/ping.c                   | 6 ------
 4 files changed, 22 deletions(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 9e5ded5288..c1f56fbc65 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -831,10 +831,3 @@ const mp_obj_type_t rp2pio_statemachine_type = {
     .make_new = rp2pio_statemachine_make_new,
     .locals_dict = (mp_obj_dict_t *)&rp2pio_statemachine_locals_dict,
 };
-
-static rp2pio_statemachine_obj_t *validate_obj_is_statemachine(mp_obj_t obj) {
-    if (!mp_obj_is_type(obj, &rp2pio_statemachine_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), rp2pio_statemachine_type.name);
-    }
-    return MP_OBJ_TO_PTR(obj);
-}
diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
index 43cb43a9f9..fc9bf55327 100644
--- a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
+++ b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -104,10 +104,6 @@ void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self) {
     return;
 }
 
-static int i2c_peripheral_check_error(i2ctarget_i2c_target_obj_t *self, bool raise) {
-    return 0;
-}
-
 int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart) {
     if (!((self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_RX_FULL_BITS) || (self->peripheral->hw->raw_intr_stat & I2C_IC_INTR_STAT_R_RD_REQ_BITS))) {
         return 0;
diff --git a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
index fd180da3b1..3488fc0eb5 100644
--- a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
+++ b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
@@ -44,11 +44,6 @@ static uint8_t scan_put, scan_get;
 static bool scan_full;
 
 
-static void scan_result_clear() {
-    scan_put = scan_get = 0;
-    scan_full = false;
-}
-
 static void scan_result_put(const cyw43_ev_scan_result_t *result) {
     if (!scan_full) {
         scan_results[scan_put] = *result;
diff --git a/ports/raspberrypi/lwip_src/ping.c b/ports/raspberrypi/lwip_src/ping.c
index d5173cab96..e59b4d6662 100644
--- a/ports/raspberrypi/lwip_src/ping.c
+++ b/ports/raspberrypi/lwip_src/ping.c
@@ -368,12 +368,6 @@ ping_raw_init(void) {
     sys_timeout(PING_DELAY, ping_timeout, ping_pcb);
 }
 
-static void
-ping_send_now(void) {
-    LWIP_ASSERT("ping_pcb != NULL", ping_pcb != NULL);
-    ping_send(ping_pcb, ping_target);
-}
-
 #endif /* PING_USE_SOCKETS */
 
 void

From c6eef3931f82837f3ab98288b6d5cf21d22d7fc3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 08:00:40 -0500
Subject: [PATCH 1083/2403] Enable warning for unused static functions

---
 ports/raspberrypi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 6d7b3f717a..455672d617 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -198,7 +198,7 @@ else
 endif
 
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
-DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-function -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
+DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
 
 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
@@ -256,7 +256,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function
 
 SRC_C += \
 	boards/$(BOARD)/board.c \

From 37620d4eb052a32e6449df1fb016b1cab39c4790 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 08:15:17 -0500
Subject: [PATCH 1084/2403] Fix several classes of compiler diagnostic & make
 fatal

 * -Wno-nested-externs
 * -Wno-strict-prototypes
 * -Wno-double-promotion
 * -Wno-sign-compare
---
 ports/raspberrypi/Makefile                       |  4 ++--
 ports/raspberrypi/common-hal/busio/I2C.c         |  4 ++--
 .../raspberrypi/common-hal/rp2pio/StateMachine.c |  4 ++--
 ports/raspberrypi/common-hal/rp2pio/__init__.c   |  2 +-
 ports/raspberrypi/common-hal/socketpool/Socket.c | 16 ++++++++--------
 .../common-hal/wifi/ScannedNetworks.c            |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 455672d617..55093eaeea 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -198,7 +198,7 @@ else
 endif
 
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
-DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
+DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align
 
 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
@@ -256,7 +256,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare
 
 SRC_C += \
 	boards/$(BOARD)/board.c \
diff --git a/ports/raspberrypi/common-hal/busio/I2C.c b/ports/raspberrypi/common-hal/busio/I2C.c
index 6b15bee512..c68499591c 100644
--- a/ports/raspberrypi/common-hal/busio/I2C.c
+++ b/ports/raspberrypi/common-hal/busio/I2C.c
@@ -190,7 +190,7 @@ STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
         return status;
     }
 
-    int result = i2c_write_timeout_us(self->peripheral, addr, data, len, !transmit_stop_bit, BUS_TIMEOUT_US);
+    size_t result = i2c_write_timeout_us(self->peripheral, addr, data, len, !transmit_stop_bit, BUS_TIMEOUT_US);
     if (result == len) {
         return 0;
     }
@@ -211,7 +211,7 @@ uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
 
 uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t addr,
     uint8_t *data, size_t len) {
-    int result = i2c_read_timeout_us(self->peripheral, addr, data, len, false, BUS_TIMEOUT_US);
+    size_t result = i2c_read_timeout_us(self->peripheral, addr, data, len, false, BUS_TIMEOUT_US);
     if (result == len) {
         return 0;
     }
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index 78703351d7..d24e9b2b7c 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -71,7 +71,7 @@ STATIC void *_interrupt_arg[NUM_PIOS][NUM_PIO_STATE_MACHINES];
 STATIC void rp2pio_statemachine_interrupt_handler(void);
 
 static void rp2pio_statemachine_set_pull(uint32_t pull_pin_up, uint32_t pull_pin_down, uint32_t pins_we_use) {
-    for (int i = 0; i < TOTAL_GPIO_COUNT; i++) {
+    for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
         bool used = pins_we_use & (1 << i);
         if (used) {
             bool pull_up = pull_pin_up & (1 << i);
@@ -231,7 +231,7 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
         program_offset = 32;
     }
 
-    int state_machine = -1;
+    size_t state_machine = NUM_PIO_STATE_MACHINES;
     if (pio_index < NUM_PIOS) {
         PIO pio = pio_instances[pio_index];
         for (size_t i = 0; i < NUM_PIOS; i++) {
diff --git a/ports/raspberrypi/common-hal/rp2pio/__init__.c b/ports/raspberrypi/common-hal/rp2pio/__init__.c
index 8b8101fbe5..61a77e021c 100644
--- a/ports/raspberrypi/common-hal/rp2pio/__init__.c
+++ b/ports/raspberrypi/common-hal/rp2pio/__init__.c
@@ -33,7 +33,7 @@ bool common_hal_rp2pio_pins_are_sequential(size_t len, mp_obj_t *items) {
         return true;
     }
     const mcu_pin_obj_t *last_pin = validate_obj_is_pin(items[0]);
-    for (int i = 1; i < len; i++) {
+    for (size_t i = 1; i < len; i++) {
         const mcu_pin_obj_t *pin = validate_obj_is_pin(items[i]);
         if (pin->number != last_pin->number + 1) {
             return false;
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index fb777a3f04..6ea2dc2c3c 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -409,7 +409,7 @@ STATIC mp_uint_t lwip_raw_udp_receive(socketpool_socket_obj_t *socket, byte *buf
         // Wait for data to arrive on UDP socket.
         mp_uint_t start = mp_hal_ticks_ms();
         while (socket->incoming.pbuf == NULL) {
-            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+            if (socket->timeout != (unsigned)-1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
                 return -1;
             }
@@ -479,7 +479,7 @@ STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf,
         // Avoid sending too small packets, so wait until at least 16 bytes available
         while (socket->state >= STATE_CONNECTED && (available = tcp_sndbuf(socket->pcb.tcp)) < 16) {
             MICROPY_PY_LWIP_EXIT
-            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+            if (socket->timeout != (unsigned)-1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
                 return MP_STREAM_ERROR;
             }
@@ -546,7 +546,7 @@ STATIC mp_uint_t lwip_tcp_receive(socketpool_socket_obj_t *socket, byte *buf, mp
 
         mp_uint_t start = mp_hal_ticks_ms();
         while (socket->state == STATE_CONNECTED && socket->incoming.pbuf == NULL) {
-            if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
+            if (socket->timeout != (unsigned)-1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
                 return -1;
             }
@@ -778,7 +778,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
             MICROPY_PY_LWIP_EXIT
             m_del_obj(socketpool_socket_obj_t, socket2);
             mp_raise_OSError(MP_EAGAIN);
-        } else if (socket->timeout != -1) {
+        } else if (socket->timeout != (unsigned)-1) {
             mp_uint_t retries = socket->timeout / 100;
             while (*incoming_connection == NULL) {
                 MICROPY_PY_LWIP_EXIT
@@ -952,7 +952,7 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *socket,
             MICROPY_PY_LWIP_EXIT
 
             // And now we wait...
-            if (socket->timeout != -1) {
+            if (socket->timeout != (unsigned)-1) {
                 for (mp_uint_t retries = socket->timeout / 100; retries--;) {
                     mp_hal_delay_ms(100);
                     if (socket->state != STATE_CONNECTING) {
@@ -1048,7 +1048,7 @@ mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *so
             ret = lwip_raw_udp_receive(socket, (byte *)buf, len, ip, port, &_errno);
             break;
     }
-    if (ret == -1) {
+    if (ret == (unsigned)-1) {
         mp_raise_OSError(_errno);
     }
 
@@ -1097,7 +1097,7 @@ int socketpool_socket_send(socketpool_socket_obj_t *socket, const uint8_t *buf,
             ret = lwip_raw_udp_send(socket, buf, len, NULL, 0, &_errno);
             break;
     }
-    if (ret == -1) {
+    if (ret == (unsigned)-1) {
         return -_errno;
     }
     return ret;
@@ -1134,7 +1134,7 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *socket,
             ret = lwip_raw_udp_send(socket, buf, len, &ip, port, &_errno);
             break;
     }
-    if (ret == -1) {
+    if (ret == (unsigned)-1) {
         mp_raise_OSError(_errno);
     }
 
diff --git a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
index 3488fc0eb5..97299e2f74 100644
--- a/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
+++ b/ports/raspberrypi/common-hal/wifi/ScannedNetworks.c
@@ -52,7 +52,7 @@ static void scan_result_put(const cyw43_ev_scan_result_t *result) {
     }
 }
 
-static bool scan_result_available() {
+static bool scan_result_available(void) {
     return scan_full || (scan_get != scan_put);
 }
 
@@ -83,7 +83,7 @@ static int scan_result(void *env, const cyw43_ev_scan_result_t *result) {
 
 mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self) {
     // no results available, wait for some
-    while (!scan_result_available(self) && cyw43_wifi_scan_active(&cyw43_state)) {
+    while (!scan_result_available() && cyw43_wifi_scan_active(&cyw43_state)) {
         RUN_BACKGROUND_TASKS;
         if (mp_hal_is_interrupted()) {
             return mp_const_none;
@@ -91,7 +91,7 @@ mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self)
         cyw43_arch_poll();
     }
 
-    if (!scan_result_available(self)) {
+    if (!scan_result_available()) {
         common_hal_wifi_radio_obj.current_scan = NULL;
         return mp_const_none;
     }

From afc1c0e3bb4262cd8ee0ba2c902550a656c4d1af Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 08:20:33 -0500
Subject: [PATCH 1085/2403] Fix unused variable diagnostics, make it a fatal
 error

---
 ports/raspberrypi/Makefile                             |  4 ++--
 ports/raspberrypi/bindings/rp2pio/StateMachine.c       | 10 ++++------
 ports/raspberrypi/common-hal/countio/Counter.c         |  1 -
 ports/raspberrypi/common-hal/digitalio/DigitalInOut.c  |  1 -
 .../common-hal/imagecapture/ParallelImageCapture.c     |  5 -----
 ports/raspberrypi/common-hal/rp2pio/StateMachine.c     |  2 +-
 ports/raspberrypi/common-hal/socketpool/Socket.c       |  1 -
 ports/raspberrypi/common-hal/wifi/__init__.c           |  1 -
 8 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 55093eaeea..45845646a7 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -198,7 +198,7 @@ else
 endif
 
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
-DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align
+DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-strict-overflow -Wno-cast-align
 
 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
@@ -256,7 +256,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable
 
 SRC_C += \
 	boards/$(BOARD)/board.c \
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index c1f56fbc65..0f8b2d9647 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -259,10 +259,10 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n
         bufinfo.buf, bufinfo.len / 2,
         args[ARG_frequency].u_int,
         init_bufinfo.buf, init_bufinfo.len / 2,
-        first_out_pin, args[ARG_out_pin_count].u_int, args[ARG_initial_out_pin_state].u_int, args[ARG_initial_out_pin_direction].u_int,
-        first_in_pin, args[ARG_in_pin_count].u_int, args[ARG_pull_in_pin_up].u_int, args[ARG_pull_in_pin_down].u_int,
-        first_set_pin, args[ARG_set_pin_count].u_int, args[ARG_initial_set_pin_state].u_int, args[ARG_initial_set_pin_direction].u_int,
-        first_sideset_pin, args[ARG_sideset_pin_count].u_int, args[ARG_initial_sideset_pin_state].u_int, args[ARG_initial_sideset_pin_direction].u_int,
+        first_out_pin, out_pin_count, args[ARG_initial_out_pin_state].u_int, args[ARG_initial_out_pin_direction].u_int,
+        first_in_pin, in_pin_count, args[ARG_pull_in_pin_up].u_int, args[ARG_pull_in_pin_down].u_int,
+        first_set_pin, set_pin_count, args[ARG_initial_set_pin_state].u_int, args[ARG_initial_set_pin_direction].u_int,
+        first_sideset_pin, sideset_pin_count, args[ARG_initial_sideset_pin_state].u_int, args[ARG_initial_sideset_pin_direction].u_int,
         args[ARG_sideset_enable].u_bool,
         jmp_pin, jmp_pin_pull,
         0,
@@ -397,7 +397,6 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg
         return mp_const_none;
     }
 
-    uint8_t *original_pointer = bufinfo.buf;
     int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     if (stride_in_bytes > 4) {
         mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));
@@ -606,7 +605,6 @@ STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_
         return mp_const_none;
     }
 
-    uint8_t *original_pointer = bufinfo.buf;
     int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     if (stride_in_bytes > 4) {
         mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));
diff --git a/ports/raspberrypi/common-hal/countio/Counter.c b/ports/raspberrypi/common-hal/countio/Counter.c
index 44db126656..b51d182c3a 100644
--- a/ports/raspberrypi/common-hal/countio/Counter.c
+++ b/ports/raspberrypi/common-hal/countio/Counter.c
@@ -31,7 +31,6 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self,
         mp_raise_RuntimeError(translate("PWM slice already in use"));
     }
 
-    uint8_t ab_channel = pwm_gpio_to_channel(self->pin);
     if (!pwmio_claim_slice_ab_channels(self->slice_num)) {
         mp_raise_RuntimeError(translate("PWM slice channel A already in use"));
     }
diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index 66efe3af92..bbb521ffc5 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -158,7 +158,6 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         }
     }
     #endif
-    const uint8_t pin = self->pin->number;
     bool value = common_hal_digitalio_digitalinout_get_value(self);
     self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
     // True is implemented differently between modes so reset the value to make
diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
index 3c5c57eea5..7ad6acbaff 100644
--- a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
+++ b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
@@ -120,11 +120,6 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle
         true, 32, true,  // in settings
         false, // Not user-interruptible.
         2, 5); // wrap settings
-
-
-    PIO pio = self->state_machine.pio;
-    uint8_t pio_index = pio_get_index(pio);
-    uint sm = self->state_machine.state_machine;
 }
 
 void common_hal_imagecapture_parallelimagecapture_deinit(imagecapture_parallelimagecapture_obj_t *self) {
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index d24e9b2b7c..d58e9779e6 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -871,7 +871,7 @@ bool common_hal_rp2pio_statemachine_get_txstall(rp2pio_statemachine_obj_t *self)
 }
 
 void common_hal_rp2pio_statemachine_clear_txstall(rp2pio_statemachine_obj_t *self) {
-    uint8_t level = pio_sm_get_rx_fifo_level(self->pio, self->state_machine);
+    (void)pio_sm_get_rx_fifo_level(self->pio, self->state_machine);
     uint32_t stall_mask = 1 << (PIO_FDEBUG_TXSTALL_LSB + self->state_machine);
     self->pio->fdebug = stall_mask;
 }
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 6ea2dc2c3c..99b19ad694 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -829,7 +829,6 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
 
 bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
     const char *host, size_t hostlen, uint32_t port) {
-    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
 
     // get address
     ip_addr_t bind_addr;
diff --git a/ports/raspberrypi/common-hal/wifi/__init__.c b/ports/raspberrypi/common-hal/wifi/__init__.c
index 73486c516f..e5a646f88f 100644
--- a/ports/raspberrypi/common-hal/wifi/__init__.c
+++ b/ports/raspberrypi/common-hal/wifi/__init__.c
@@ -82,7 +82,6 @@ void wifi_reset(void) {
     }
     // the cyw43 wifi chip is not reset due to https://github.com/raspberrypi/pico-sdk/issues/980
     common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
-    wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
     common_hal_wifi_radio_obj.current_scan = NULL;
     // common_hal_wifi_radio_set_enabled(radio, false);
     supervisor_workflow_request_background();

From c02602ace1c879820deea4654c6db40ecf589944 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 08:21:50 -0500
Subject: [PATCH 1086/2403] Enable strict-overflow diagnostic

---
 ports/raspberrypi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 45845646a7..17c7eb477c 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -198,7 +198,7 @@ else
 endif
 
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
-DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-strict-overflow -Wno-cast-align
+DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-cast-align
 
 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
@@ -256,7 +256,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow
 
 SRC_C += \
 	boards/$(BOARD)/board.c \

From f64be33d4b7af2d2ab9e5459cef28247a7bd6012 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 30 Sep 2022 23:24:59 +0530
Subject: [PATCH 1087/2403] add esp32 in readme port status

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 66ad78f6eb..32c8cb212c 100644
--- a/README.rst
+++ b/README.rst
@@ -218,7 +218,7 @@ Supported         Support status
 ================  ============================================================
 atmel-samd        ``SAMD21`` stable | ``SAMD51`` stable
 cxd56             stable
-espressif         ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
+espressif         ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
 litex             alpha
 mimxrt10xx        alpha
 nrf               stable

From 7eaeca4eb31beb7655b977d6077cb9a88d42683b Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 30 Sep 2022 23:26:24 +0530
Subject: [PATCH 1088/2403] update espressif port's .gitignore

---
 ports/espressif/.gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/.gitignore b/ports/espressif/.gitignore
index 2e3080a40d..51c080bb7f 100644
--- a/ports/espressif/.gitignore
+++ b/ports/espressif/.gitignore
@@ -1,2 +1,5 @@
-build*/
-sdkconfig.old
+# idf.py menuconfig
+sdkconfig*
+
+# lock files for examples and components
+dependencies.lock

From 943b992bfcd026089168c18622124675f1658811 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 14:17:46 -0500
Subject: [PATCH 1089/2403] Improve cyw43.set_power_management documentation

.. and provide 4 preset values
---
 ports/raspberrypi/bindings/cyw43/__init__.c | 41 ++++++++++++++++++---
 ports/raspberrypi/bindings/cyw43/__init__.h | 16 ++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index cdd600bddc..2957a428c4 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -31,7 +31,6 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/cyw43/__init__.h"
-
 //| class CywPin:
 //|     """A class that represents a GPIO pin attached to the wifi chip.
 //|
@@ -49,14 +48,42 @@ const mp_obj_type_t cyw43_pin_type = {
         )
 };
 
+//| PM_STANDARD: int
+//| """The standard power management mode"""
+//| PM_AGGRESSIVE: int
+//| """Aggressive power management mode for optimial power usage at the cost of performance"""
+//| PM_PERFORMANCE: int
+//| """Performance power management mode where more power is used to increase performance"""
+//| PM_DISABLED: int
+//| """Disable power management and always use highest power mode"""
+//|
 //| def set_power_management(value: int) -> None:
 //|     """Set the power management register
 //|
-//|     According to Raspberry Pi documentation, the value 0xa11140
-//|     increases responsiveness at the cost of higher power usage.
+//|     For transmitter power, see ``wifi.Radio.txpower``.
+//|     This controls software power saving features inside the cyw43 chip.
+//|     it does not control transmitter power.
 //|
-//|     Besides this value, there appears to be no other public documentation
-//|     of the values that can be used.
+//|     The value is interpreted as a 24-bit hexadecimal number of the form
+//|     ``0x00adbrrm``.
+//|
+//|     The low 4 bits, ``m``, are the power management mode:
+//|      * 0: disabled
+//|      * 1: aggressive power saving which reduces wifi throughput
+//|      * 2: Power saving with High througput
+//|
+//|     The next 8 bits, ``r``, specify "the maximum time to wait before going back to sleep" for power management mode 2. The units of ``r`` are 10ms.
+//|
+//|     The next 4 bits, ``b``, are the "wake period is measured in beacon periods".
+//|
+//|     The next 4 bits, ``d``, specify the "wake interval measured in DTIMs. If this is set to 0, the wake interval is measured in beacon periods".
+//|
+//|     The top 4 bits, ``a``, specifies the "wake interval sent to the access point"
+//|
+//|     Several ``PM_`` constants gathered from various sources are included
+//|     in this module.  According to Raspberry Pi documentation, the value 0xa11140
+//|     (called `cyw43.PM_DISABLED` here) increases responsiveness at the cost of higher power
+//|     usage.
 //|     """
 //|
 STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
@@ -83,6 +110,10 @@ STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
     { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
     { MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj },
+    { MP_ROM_QSTR(MP_QSTR_PM_STANDARD), MP_ROM_INT(PM_STANDARD) },
+    { MP_ROM_QSTR(MP_QSTR_PM_AGGRESSIVE), MP_ROM_INT(PM_AGGRESSIVE) },
+    { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },
+    { MP_ROM_QSTR(MP_QSTR_PM_DISABLED), MP_ROM_INT(PM_DISABLED) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table);
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
index 5dcdfba52b..dc1651392d 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.h
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -32,3 +32,19 @@
 extern const mp_obj_type_t cyw43_pin_type;
 const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj);
 const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
+
+#define CONSTANT_CYW43_PM_VALUE(pm_mode, pm2_sleep_ret_ms, li_beacon_period, li_dtim_period, li_assoc) \
+    (li_assoc << 20 | /* listen interval sent to ap */ \
+        li_dtim_period << 16 | \
+        li_beacon_period << 12 | \
+        (pm2_sleep_ret_ms / 10) << 4 | /* cyw43_ll_wifi_pm multiplies this by 10 */ \
+        pm_mode /* CYW43_PM2_POWERSAVE_MODE etc */)
+
+// CYW43_DEFAULT_PM (except a compile-time constant)
+#define PM_STANDARD CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 200, 1, 1, 10)
+// CYW43_AGGRESSIVE_PM (except a compile-time constant)
+#define PM_AGGRESSIVE CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 2000, 1, 1, 10)
+// CYW43_PERFORMANCE_PM (except a compile-time constant)
+#define PM_PERFORMANCE CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 20, 1, 1, 1)
+// The 0xa11140 magic value
+#define PM_DISABLED CONSTANT_CYW43_PM_VALUE(CYW43_NO_POWERSAVE_MODE, 200, 1, 1, 10)

From d3e85d165e1f28005c4404f02c6c05dcd713fdde Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 30 Sep 2022 14:21:37 -0500
Subject: [PATCH 1090/2403] Set cyw43 power management as needed, default to
 disabled

.. the value actually needs to be enforced each time the STA or AP
is enabled, because internally there's a call to cyw43_wifi_pm with the
library's defaut power management value, not ours.

Add a getter, though it only returns our idea of what the power
management register is set to, it doesn't read out from the actual
hardware, sadly.
---
 ports/raspberrypi/bindings/cyw43/__init__.c | 22 +++++++++++++++++++--
 ports/raspberrypi/bindings/cyw43/__init__.h |  3 +++
 ports/raspberrypi/common-hal/wifi/Radio.c   |  4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 2957a428c4..207a3d8545 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -31,6 +31,14 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/cyw43/__init__.h"
+
+
+static int power_management_value = PM_DISABLED;
+
+void bindings_cyw43_wifi_enforce_pm() {
+    cyw43_wifi_pm(&cyw43_state, power_management_value);
+}
+
 //| class CywPin:
 //|     """A class that represents a GPIO pin attached to the wifi chip.
 //|
@@ -55,7 +63,7 @@ const mp_obj_type_t cyw43_pin_type = {
 //| PM_PERFORMANCE: int
 //| """Performance power management mode where more power is used to increase performance"""
 //| PM_DISABLED: int
-//| """Disable power management and always use highest power mode"""
+//| """Disable power management and always use highest power mode. CircuitPython sets this value at reset time, because it provides the best reliability."""
 //|
 //| def set_power_management(value: int) -> None:
 //|     """Set the power management register
@@ -88,11 +96,20 @@ const mp_obj_type_t cyw43_pin_type = {
 //|
 STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
     mp_int_t value = mp_obj_get_int(value_in);
-    cyw43_wifi_pm(&cyw43_state, value);
+    power_management_value = value;
+    bindings_cyw43_wifi_enforce_pm();
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(cyw43_set_power_management_obj, cyw43_set_power_management);
 
+//| def get_power_management() -> int:
+//|     """Retrieve the power management register"""
+//|
+STATIC mp_obj_t cyw43_get_power_management() {
+    return mp_obj_new_int(power_management_value);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(cyw43_get_power_management_obj, cyw43_get_power_management);
+
 const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj) {
     if (!mp_obj_is_type(obj, &mcu_pin_type) && !mp_obj_is_type(obj, &cyw43_pin_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q or %q"), mcu_pin_type.name, cyw43_pin_type.name);
@@ -110,6 +127,7 @@ STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
     { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
     { MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj },
+    { MP_ROM_QSTR(MP_QSTR_get_power_management), &cyw43_get_power_management_obj },
     { MP_ROM_QSTR(MP_QSTR_PM_STANDARD), MP_ROM_INT(PM_STANDARD) },
     { MP_ROM_QSTR(MP_QSTR_PM_AGGRESSIVE), MP_ROM_INT(PM_AGGRESSIVE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
index dc1651392d..c543f7b9e1 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.h
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -28,6 +28,7 @@
 #pragma once
 
 #include "py/obj.h"
+#include "common-hal/microcontroller/Pin.h"
 
 extern const mp_obj_type_t cyw43_pin_type;
 const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj);
@@ -48,3 +49,5 @@ const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
 #define PM_PERFORMANCE CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 20, 1, 1, 1)
 // The 0xa11140 magic value
 #define PM_DISABLED CONSTANT_CYW43_PM_VALUE(CYW43_NO_POWERSAVE_MODE, 200, 1, 1, 10)
+
+extern void bindings_cyw43_wifi_enforce_pm(void);
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 9ed69d6000..23414491d6 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -35,6 +35,7 @@
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"
 #include "py/runtime.h"
+#include "bindings/cyw43/__init__.h"
 #include "shared-bindings/ipaddress/IPv4Address.h"
 #include "shared-bindings/wifi/ScannedNetworks.h"
 #include "shared-bindings/wifi/AuthMode.h"
@@ -152,6 +153,7 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
 
 void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
     cyw43_arch_enable_sta_mode();
+    bindings_cyw43_wifi_enforce_pm();
 }
 
 void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
@@ -159,6 +161,7 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
 
 void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
     mp_raise_NotImplementedError(NULL);
+    bindings_cyw43_wifi_enforce_pm();
 }
 
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
@@ -173,6 +176,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     // TODO use connect_async so we can service bg tasks & check for ctrl-c during
     // connect
     int result = cyw43_arch_wifi_connect_timeout_ms((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK, timeout_ms);
+    bindings_cyw43_wifi_enforce_pm();
     switch (result) {
         case 0:
             return WIFI_RADIO_ERROR_NONE;

From 40c2de833dd0c85bd94db22240b72ee30a5c5c76 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Oct 2022 10:08:33 -0500
Subject: [PATCH 1091/2403] doc improvements

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 207a3d8545..89a1e9be2a 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -59,11 +59,11 @@ const mp_obj_type_t cyw43_pin_type = {
 //| PM_STANDARD: int
 //| """The standard power management mode"""
 //| PM_AGGRESSIVE: int
-//| """Aggressive power management mode for optimial power usage at the cost of performance"""
+//| """Aggressive power management mode for optimal power usage at the cost of performance"""
 //| PM_PERFORMANCE: int
 //| """Performance power management mode where more power is used to increase performance"""
 //| PM_DISABLED: int
-//| """Disable power management and always use highest power mode. CircuitPython sets this value at reset time, because it provides the best reliability."""
+//| """Disable power management and always use highest power mode. CircuitPython sets this value at reset time, because it provides the best connectivity reliability."""
 //|
 //| def set_power_management(value: int) -> None:
 //|     """Set the power management register
@@ -78,7 +78,7 @@ const mp_obj_type_t cyw43_pin_type = {
 //|     The low 4 bits, ``m``, are the power management mode:
 //|      * 0: disabled
 //|      * 1: aggressive power saving which reduces wifi throughput
-//|      * 2: Power saving with High througput
+//|      * 2: Power saving with high througput
 //|
 //|     The next 8 bits, ``r``, specify "the maximum time to wait before going back to sleep" for power management mode 2. The units of ``r`` are 10ms.
 //|

From 7bb90dbf45637770ed583ca7c1a12ab848e90a74 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 1 Oct 2022 11:52:36 -0400
Subject: [PATCH 1092/2403] remove redundant port/*/.gitignore; cleanup others

---
 ports/atmel-samd/.gitignore  | 1 -
 ports/cxd56/.gitignore       | 1 -
 ports/litex/.gitignore       | 1 -
 ports/mimxrt10xx/.gitignore  | 1 -
 ports/nrf/.gitignore         | 9 +--------
 ports/raspberrypi/.gitignore | 1 -
 ports/stm/.gitignore         | 6 ------
 ports/unix/.gitignore        | 1 -
 8 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 ports/atmel-samd/.gitignore
 delete mode 100644 ports/cxd56/.gitignore
 delete mode 100644 ports/litex/.gitignore
 delete mode 100644 ports/mimxrt10xx/.gitignore
 delete mode 100644 ports/raspberrypi/.gitignore

diff --git a/ports/atmel-samd/.gitignore b/ports/atmel-samd/.gitignore
deleted file mode 100644
index 414487d53e..0000000000
--- a/ports/atmel-samd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/cxd56/.gitignore b/ports/cxd56/.gitignore
deleted file mode 100644
index 414487d53e..0000000000
--- a/ports/cxd56/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/litex/.gitignore b/ports/litex/.gitignore
deleted file mode 100644
index 414487d53e..0000000000
--- a/ports/litex/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/mimxrt10xx/.gitignore b/ports/mimxrt10xx/.gitignore
deleted file mode 100644
index 414487d53e..0000000000
--- a/ports/mimxrt10xx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/nrf/.gitignore b/ports/nrf/.gitignore
index cda23c7a90..91dce2841a 100644
--- a/ports/nrf/.gitignore
+++ b/ports/nrf/.gitignore
@@ -1,9 +1,2 @@
-# Old Nordic soft devices that don't allow redistribution
-#########################################################
-drivers/bluetooth/s132_nrf52_2.0.1/
-
+# Softdevice .hex files that should be preserved
 !drivers/bluetooth/*/*.hex
-
-# Build files
-#####################
-build-*/
diff --git a/ports/raspberrypi/.gitignore b/ports/raspberrypi/.gitignore
deleted file mode 100644
index 414487d53e..0000000000
--- a/ports/raspberrypi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/stm/.gitignore b/ports/stm/.gitignore
index 5d645392ca..ade7a0d09d 100644
--- a/ports/stm/.gitignore
+++ b/ports/stm/.gitignore
@@ -1,9 +1,3 @@
-# Build files
-#####################
-build-*/
-
 # Reference files
 #####################
 ref/
-
-.gdb_history
diff --git a/ports/unix/.gitignore b/ports/unix/.gitignore
index 6745218688..3ca8f6cb27 100644
--- a/ports/unix/.gitignore
+++ b/ports/unix/.gitignore
@@ -1,4 +1,3 @@
 micropython
 micropython-*
-*.py
 *.gcov

From 17ed2a68986591be562c15fa5def63bfd1abf169 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 1 Oct 2022 10:41:33 +0530
Subject: [PATCH 1093/2403] implement certain supervisor functions as
 properties

- disable_ble_workflow
- set_next_stack_limit
- set_rgb_status_brightness
---
 shared-bindings/supervisor/Runtime.c    | 84 +++++++++++++++++++++++++
 shared-bindings/supervisor/__init__.c   | 51 ---------------
 supervisor/shared/bluetooth/bluetooth.c | 10 ++-
 supervisor/shared/bluetooth/bluetooth.h |  1 +
 supervisor/shared/stack.c               |  4 ++
 supervisor/shared/stack.h               |  1 +
 supervisor/shared/status_leds.c         |  8 +++
 supervisor/shared/status_leds.h         |  1 +
 8 files changed, 108 insertions(+), 52 deletions(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index fa9431f25a..1fbafb5641 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -34,6 +34,9 @@
 #include "shared-bindings/supervisor/Runtime.h"
 
 #include "supervisor/shared/reload.h"
+#include "supervisor/shared/stack.h"
+#include "supervisor/shared/status_leds.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 
 #if (CIRCUITPY_USB)
 #include "tusb.h"
@@ -134,12 +137,93 @@ MP_PROPERTY_GETSET(supervisor_runtime_autoreload_obj,
     (mp_obj_t)&supervisor_runtime_get_autoreload_obj,
     (mp_obj_t)&supervisor_runtime_set_autoreload_obj);
 
+//|     ble_workflow: bool
+//|     """Enable/Disable ble workflow until a reset. This prevents BLE advertising outside of the VM and
+//|     the services used for it."""
+//|
+STATIC mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) {
+    #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE
+    return mp_obj_new_bool(supervisor_bluetooth_workflow_is_enabled());
+    #else
+    return mp_const_false;
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_ble_workflow_obj, supervisor_runtime_get_ble_workflow);
+
+STATIC mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) {
+    #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE
+    if (mp_obj_is_true(state_in)) {
+        supervisor_bluetooth_enable_workflow();
+    } else {
+        supervisor_bluetooth_disable_workflow();
+    }
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_ble_workflow_obj, supervisor_runtime_set_ble_workflow);
+
+MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
+    (mp_obj_t)&supervisor_runtime_get_ble_workflow_obj,
+    (mp_obj_t)&supervisor_runtime_set_ble_workflow_obj);
+
+//|     next_stack_limit: int
+//|     """The size of the stack for the next vm run. If its too large, the default will be used."""
+//|
+STATIC mp_obj_t supervisor_runtime_get_next_stack_limit(mp_obj_t self) {
+    return mp_obj_new_int(get_next_stack_size());
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_next_stack_limit_obj, supervisor_runtime_get_next_stack_limit);
+
+STATIC mp_obj_t supervisor_runtime_set_next_stack_limit(mp_obj_t self, mp_obj_t size_obj) {
+    mp_int_t size = mp_obj_get_int(size_obj);
+    mp_arg_validate_int_min(size, 256, MP_QSTR_size);
+    set_next_stack_size(size);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_next_stack_limit_obj, supervisor_runtime_set_next_stack_limit);
+
+MP_PROPERTY_GETSET(supervisor_runtime_next_stack_limit_obj,
+    (mp_obj_t)&supervisor_runtime_get_next_stack_limit_obj,
+    (mp_obj_t)&supervisor_runtime_set_next_stack_limit_obj);
+
+//|     rgb_status_brightness: int
+//|     """Set brightness of status RGB LED from 0-255. This will take effect
+//|     after the current code finishes and the status LED is used to show
+//|     the finish state."""
+//|
+STATIC mp_obj_t supervisor_runtime_get_rgb_status_brightness(mp_obj_t self) {
+    return MP_OBJ_NEW_SMALL_INT(get_status_brightness());
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_rgb_status_brightness_obj, supervisor_runtime_get_rgb_status_brightness);
+
+STATIC mp_obj_t supervisor_runtime_set_rgb_status_brightness(mp_obj_t self, mp_obj_t lvl) {
+    #if CIRCUITPY_STATUS_LED
+    // This must be int. If cast to uint8_t first, will never raise a ValueError.
+    int brightness_int = mp_obj_get_int(lvl);
+    mp_arg_validate_int_range(brightness_int, 0, 255, MP_QSTR_brightness);
+    set_status_brightness((uint8_t)brightness_int);
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_rgb_status_brightness_obj, supervisor_runtime_set_rgb_status_brightness);
+
+MP_PROPERTY_GETSET(supervisor_runtime_rgb_status_brightness_obj,
+    (mp_obj_t)&supervisor_runtime_get_rgb_status_brightness_obj,
+    (mp_obj_t)&supervisor_runtime_set_rgb_status_brightness_obj);
+
 STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_usb_connected), MP_ROM_PTR(&supervisor_runtime_usb_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_connected), MP_ROM_PTR(&supervisor_runtime_serial_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_bytes_available), MP_ROM_PTR(&supervisor_runtime_serial_bytes_available_obj) },
     { MP_ROM_QSTR(MP_QSTR_run_reason), MP_ROM_PTR(&supervisor_runtime_run_reason_obj) },
     { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ble_workflow),  MP_ROM_PTR(&supervisor_runtime_ble_workflow_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_stack_limit),  MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rgb_status_brightness),  MP_ROM_PTR(&supervisor_runtime_rgb_status_brightness_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_runtime_locals_dict, supervisor_runtime_locals_dict_table);
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 3dc3bff848..b61d05d636 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -30,11 +30,8 @@
 #include "py/objstr.h"
 
 #include "shared/runtime/interrupt_char.h"
-#include "supervisor/shared/bluetooth/bluetooth.h"
 #include "supervisor/shared/display.h"
-#include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/reload.h"
-#include "supervisor/shared/stack.h"
 #include "supervisor/shared/traceback.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/workflow.h"
@@ -63,21 +60,6 @@
 //| the last exception name and location, and firmware version information.
 //| This object is the sole instance of `supervisor.StatusBar`."""
 
-//| def set_rgb_status_brightness(brightness: int) -> None:
-//|     """Set brightness of status RGB LED from 0-255. This will take effect
-//|     after the current code finishes and the status LED is used to show
-//|     the finish state."""
-//|     ...
-//|
-STATIC mp_obj_t supervisor_set_rgb_status_brightness(mp_obj_t lvl) {
-    // This must be int. If cast to uint8_t first, will never raise a ValueError.
-    int brightness_int = mp_obj_get_int(lvl);
-    mp_arg_validate_int_range(brightness_int, 0, 255, MP_QSTR_brightness);
-    set_status_brightness((uint8_t)brightness_int);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_rgb_status_brightness_obj, supervisor_set_rgb_status_brightness);
-
 //| def reload() -> None:
 //|     """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL)."""
 //|     ...
@@ -88,21 +70,6 @@ STATIC mp_obj_t supervisor_reload(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload);
 
-//| def set_next_stack_limit(size: int) -> None:
-//|     """Set the size of the stack for the next vm run. If its too large, the default will be used."""
-//|     ...
-//|
-STATIC mp_obj_t supervisor_set_next_stack_limit(mp_obj_t size_obj) {
-    mp_int_t size = mp_obj_get_int(size_obj);
-
-    mp_arg_validate_int_min(size, 256, MP_QSTR_size);
-
-    set_next_stack_size(size);
-
-    return mp_const_none;
-}
-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],
 //|     *,
@@ -278,21 +245,6 @@ STATIC mp_obj_t supervisor_get_previous_traceback(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(supervisor_get_previous_traceback_obj, supervisor_get_previous_traceback);
 
-//| def disable_ble_workflow() -> None:
-//|     """Disable ble workflow until a reset. This prevents BLE advertising outside of the VM and
-//|     the services used for it."""
-//|     ...
-//|
-STATIC mp_obj_t supervisor_disable_ble_workflow(void) {
-    #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
-    mp_raise_NotImplementedError(NULL);
-    #else
-    supervisor_bluetooth_disable_workflow();
-    #endif
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(supervisor_disable_ble_workflow_obj, supervisor_disable_ble_workflow);
-
 //| def reset_terminal(x_pixels: int, y_pixels: int) -> None:
 //|     """Reset the CircuitPython serial terminal with new dimensions."""
 //|     ...
@@ -380,15 +332,12 @@ MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_usb_identification_obj, 0, supervisor_
 
 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_set_rgb_status_brightness),  MP_ROM_PTR(&supervisor_set_rgb_status_brightness_obj) },
     { MP_ROM_QSTR(MP_QSTR_runtime),  MP_ROM_PTR(&common_hal_supervisor_runtime_obj) },
     { 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) },
     { MP_ROM_QSTR(MP_QSTR_ticks_ms),  MP_ROM_PTR(&supervisor_ticks_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_previous_traceback),  MP_ROM_PTR(&supervisor_get_previous_traceback_obj) },
-    { MP_ROM_QSTR(MP_QSTR_disable_ble_workflow),  MP_ROM_PTR(&supervisor_disable_ble_workflow_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_terminal),  MP_ROM_PTR(&supervisor_reset_terminal_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_usb_identification),  MP_ROM_PTR(&supervisor_set_usb_identification_obj) },
     { MP_ROM_QSTR(MP_QSTR_status_bar),  MP_ROM_PTR(&shared_module_supervisor_status_bar_obj) },
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index 472d2fa7d5..6fe5d570b8 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -354,7 +354,6 @@ void supervisor_bluetooth_enable_workflow(void) {
     if (workflow_state == WORKFLOW_DISABLED) {
         return;
     }
-
     workflow_state = WORKFLOW_ENABLED;
     #endif
 }
@@ -364,3 +363,12 @@ void supervisor_bluetooth_disable_workflow(void) {
     workflow_state = WORKFLOW_DISABLED;
     #endif
 }
+
+bool supervisor_bluetooth_workflow_is_enabled(void) {
+    #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
+    if (workflow_state == 1) {
+        return true;
+    }
+    #endif
+    return false;
+}
diff --git a/supervisor/shared/bluetooth/bluetooth.h b/supervisor/shared/bluetooth/bluetooth.h
index 231fde3c54..0028c8da33 100644
--- a/supervisor/shared/bluetooth/bluetooth.h
+++ b/supervisor/shared/bluetooth/bluetooth.h
@@ -37,6 +37,7 @@ void supervisor_stop_bluetooth(void);
 // Enable only works if it hasn't been set yet.
 void supervisor_bluetooth_enable_workflow(void);
 void supervisor_bluetooth_disable_workflow(void);
+bool supervisor_bluetooth_workflow_is_enabled(void);
 
 // Title bar status
 bool supervisor_bluetooth_status_dirty(void);
diff --git a/supervisor/shared/stack.c b/supervisor/shared/stack.c
index d2188e016d..fa8d019fea 100644
--- a/supervisor/shared/stack.c
+++ b/supervisor/shared/stack.c
@@ -107,6 +107,10 @@ void set_next_stack_size(uint32_t size) {
     next_stack_size = size;
 }
 
+uint32_t get_next_stack_size(void) {
+    return next_stack_size;
+}
+
 uint32_t get_current_stack_size(void) {
     return current_stack_size;
 }
diff --git a/supervisor/shared/stack.h b/supervisor/shared/stack.h
index 98cc5a1685..4acda57354 100644
--- a/supervisor/shared/stack.h
+++ b/supervisor/shared/stack.h
@@ -38,6 +38,7 @@ uint32_t *stack_get_bottom(void);
 size_t stack_get_length(void);
 // Next/current requested stack size.
 void set_next_stack_size(uint32_t size);
+uint32_t get_next_stack_size(void);
 uint32_t get_current_stack_size(void);
 bool stack_ok(void);
 
diff --git a/supervisor/shared/status_leds.c b/supervisor/shared/status_leds.c
index 07ff9634e9..315e64a9a0 100644
--- a/supervisor/shared/status_leds.c
+++ b/supervisor/shared/status_leds.c
@@ -330,6 +330,14 @@ void set_status_brightness(uint8_t level) {
     #endif
 }
 
+uint8_t get_status_brightness(void) {
+    #if CIRCUITPY_STATUS_LED
+    return rgb_status_brightness;
+    #else
+    return 0;
+    #endif
+}
+
 void init_rxtx_leds(void) {
     #if CIRCUITPY_DIGITALIO && defined(MICROPY_HW_LED_RX)
     common_hal_digitalio_digitalinout_construct(&rx_led, MICROPY_HW_LED_RX);
diff --git a/supervisor/shared/status_leds.h b/supervisor/shared/status_leds.h
index 99aa0277d6..d065b96d4a 100644
--- a/supervisor/shared/status_leds.h
+++ b/supervisor/shared/status_leds.h
@@ -53,6 +53,7 @@ void new_status_color(uint32_t rgb);
 
 uint32_t color_brightness(uint32_t color, uint8_t brightness);
 void set_status_brightness(uint8_t level);
+uint8_t get_status_brightness(void);
 
 void init_rxtx_leds(void);
 void deinit_rxtx_leds(void);

From 6f5ffd80e1346b71dd92eab2aa4b3489a492703a Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Sat, 1 Oct 2022 21:34:12 +0100
Subject: [PATCH 1094/2403] I did not make changes in ports-broadcom-firmware

I made a fresh fork of circuitpython. Using Github Desktop app, created a local clone of this fork. Then Desktop app confronted me we a change in ports\broadcom\firmware -Subproject commit .nr.... and +Subproject commit same nr-dirty.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2fdfe207a2..8f5238ec53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ TAGS
 
 # Uncrustify formatting
 *.uncrustify
+ports/broadcom/firmware

From d66eeaab26ca3cf1e86d5317a277e23a8b78741d Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Sat, 1 Oct 2022 21:56:07 +0100
Subject: [PATCH 1095/2403] Update I2CTarget.c

Modification of the doc text of function request().

1) The timout parameter is a keyword-only argument; so Added '*,' in the function signature;
2) for parameter timeout an integer is expected, not a float.
---
 shared-bindings/i2ctarget/I2CTarget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 3513dee29b..3e0c123738 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -130,7 +130,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, 4, i2ctarget_i2c_target_obj___exit__);
 
-//|     def request(self, timeout: float = -1) -> I2CTargetRequest:
+//|     def request(self, *, timeout: int = -1) -> I2CTargetRequest:
 //|         """Wait for an I2C request.
 //|
 //|         :param float timeout: Timeout in seconds. Zero means wait forever, a negative value means check once

From 041766351c1bc650a57edf4d0d17a388b77e179c Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Sat, 1 Oct 2022 22:23:17 +0100
Subject: [PATCH 1096/2403] Update I2CTarget.c

Correction in function request() doc function signature.
(after speaking with @jepler on Discord).

(@jepler: 'Circuitpython always has floats enabled')
---
 shared-bindings/i2ctarget/I2CTarget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 3e0c123738..17da952118 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -130,7 +130,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, 4, i2ctarget_i2c_target_obj___exit__);
 
-//|     def request(self, *, timeout: int = -1) -> I2CTargetRequest:
+//|     def request(self, *, timeout: float = -1) -> I2CTargetRequest:
 //|         """Wait for an I2C request.
 //|
 //|         :param float timeout: Timeout in seconds. Zero means wait forever, a negative value means check once

From db28605adddcee1b745da16be417e52c0b07c323 Mon Sep 17 00:00:00 2001
From: Jonathan Myers <67796928+electronerdian@users.noreply.github.com>
Date: Sun, 2 Oct 2022 18:20:27 -0700
Subject: [PATCH 1097/2403] Fix mask for minutes field when computing
 modified_ns

---
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index e09c87f624..3f0b9ad8f7 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -660,7 +660,7 @@ static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *req
             (file_info.fdate >> 5) & 0xf,
             file_info.fdate & 0x1f,
             file_info.ftime >> 11,
-            (file_info.ftime >> 5) & 0x1f,
+            (file_info.ftime >> 5) & 0x3f,
             (file_info.ftime & 0x1f) * 2);
 
         // Manually append zeros to make the time nanoseconds. Support for printing 64 bit numbers

From 89e0601a3987dcd26b655e3dad4b378cac828a2f Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Mon, 3 Oct 2022 13:09:40 +0100
Subject: [PATCH 1098/2403] Update I2CTarget.c

Correction of the timeout value range needed to set the timeout to 'forever'.
The line 162 checks timeout for a value of 0 while the function definition defaults timeout to -1. In the current version of the code timeout is only checked for a value of 0 or in the 'else if' part for a value of > 0. So, values of <0 will not be taken in to account.  That is the reason of my modification.
---
 shared-bindings/i2ctarget/I2CTarget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 17da952118..4dc5b775f4 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -159,7 +159,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_
 
     bool forever = false;
     uint64_t timeout_end = 0;
-    if (timeout_ms == 0) {
+    if (timeout_ms <= 0) {
         forever = true;
     } else if (timeout_ms > 0) {
         timeout_end = common_hal_time_monotonic_ms() + timeout_ms;

From 1e98f9125f033e5b7734814874471f576ef5f5ad Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Mon, 3 Oct 2022 13:25:12 +0100
Subject: [PATCH 1099/2403] Update .gitisnore

Removed the -# Uncrustify formatting for file
ports/broadcom/firmware

I don't know how it came into there. I didn't put it.
It is not my intention to change anything else than this branch to make 2 changes in  shared_bindings/I2CTarget module
---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f5238ec53..5cf0886570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,4 @@ TAGS
 .venv
 .env
 
-# Uncrustify formatting
-*.uncrustify
-ports/broadcom/firmware
+

From a5d7dbd1163f5b5b68049e622dbfd155e3549498 Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Mon, 3 Oct 2022 13:29:29 +0100
Subject: [PATCH 1100/2403] Update .gitignore

I made an error. I deleted too much at the end of this file. Correction made. It is now (the Uncrustify formatting) as in branch 'main'
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5cf0886570..6e4a3faffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,4 +88,6 @@ TAGS
 .venv
 .env
 
+# Uncrustify formatting
+*.uncrustify
 

From a599e66c339cb6a509d189548aefa4137e7e2ffa Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Sun, 2 Oct 2022 11:18:14 +0000
Subject: [PATCH 1101/2403] Translated using Weblate (Greek)

Currently translated at 8.2% (82 of 1000 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/el/
---
 locale/el.po | 118 +++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/locale/el.po b/locale/el.po
index d0356d5deb..d6f5f7949e 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -8,7 +8,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: 2022-09-23 17:20+0000\n"
+"PO-Revision-Date: 2022-10-03 13:20+0000\n"
 "Last-Translator: Bill Sideris \n"
 "Language-Team: none\n"
 "Language: el\n"
@@ -31,6 +31,9 @@ msgid ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
+"\n"
+"Ο κώδικας σταμάτησε λόγω της αυτόματης επαναφόρτωσης. Η επαναφόρτωση θα "
+"γίνει σύντομα.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -53,11 +56,11 @@ msgstr "  Αρχείο \"%q\", γραμμή %d"
 
 #: py/builtinhelp.c
 msgid " is of type %q\n"
-msgstr ""
+msgstr " είναι τύπου %q\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " δεν βρέθηκε.\n"
 
 #: main.c
 msgid " output:\n"
@@ -66,13 +69,14 @@ msgstr " έξοδος:\n"
 #: py/objstr.c
 #, c-format
 msgid "%%c requires int or char"
-msgstr ""
+msgstr "%%c απαιτεί int ή char"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
+"%d pin διεύθυνσης, %d rgb ping και %d πλακίδια αναδεικνύουν ύψος %d, όχι %d"
 
 #: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
@@ -85,117 +89,117 @@ msgstr ""
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
-msgstr ""
+msgstr "%q και %q περιέχουν διπλότυπα pins"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q και %q πρεπει να είναι διαφορετικά"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
-msgstr ""
+msgstr "%q περιέχει διπλότυπα pins"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 msgid "%q failure: %d"
-msgstr ""
+msgstr "%q αποτυχία: %d"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
-msgstr ""
+msgstr "%q είναι σε χρήση"
 
 #: py/obj.c py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
-msgstr ""
+msgstr "%q δείκτης εκτός εμβέλειας"
 
 #: py/obj.c
 msgid "%q indices must be integers, not %s"
-msgstr ""
+msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι %s"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q εκκίνηση απέτυχε"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q μήκος πρέπει να είναι %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
-msgstr ""
+msgstr "%q μήκος πρέπει να είναι %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q μήκος πρέπει να είναι <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q μήκος πρέπει να είναι >= %d"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
-msgstr ""
+msgstr "%q μήκος πρέπει να είναι >= 1"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q πρέπει να είναι %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr ""
+msgstr "%q πρέπει να είναι %d-%d"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "%q πρέπει να είναι 1 όταν %q είναι True"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
-msgstr ""
+msgstr "%q πρέπει να είναι <= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "%q πρέπει να είναι >= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= 0"
-msgstr ""
+msgstr "%q πρέπει να είναι >= 0"
 
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
-msgstr ""
+msgstr "%q πρέπει να είναι >= 1"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr ""
+msgstr "%q πρέπει να είναι string"
 
 #: py/argcheck.c
 msgid "%q must be an int"
-msgstr ""
+msgstr "%q πρέπει να είναι int"
 
 #: py/argcheck.c
 msgid "%q must be of type %q"
-msgstr ""
+msgstr "%q πρέπει να είναι τύπου %q"
 
 #: shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
-msgstr ""
+msgstr "%q πρέπει να είναι τύπου %q ή None"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
-msgstr ""
+msgstr "%q πρέπει να είναι δύναμη του 2"
 
 #: shared-bindings/wifi/Monitor.c
 msgid "%q out of bounds"
-msgstr ""
+msgstr "%q εκτός ορίων"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
@@ -204,92 +208,92 @@ msgstr ""
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
-msgstr ""
+msgstr "%q εκτός εμβέλειας"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
 msgid "%q pin invalid"
-msgstr ""
+msgstr "%q άκυρο pin"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q with a report ID of 0 must be of length 1"
-msgstr ""
+msgstr "%q με ID αναφοράς 0 πρέπει να έχει μήκος 1"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
-msgstr ""
+msgstr "%q() παίρνει %d ορίσματα θέσεως αλλά %d δόθηκαν"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q, %q, and %q must all be the same length"
-msgstr ""
+msgstr "%q, %q, και %q πρέπει να είναι όλα του ιδίου μήκους"
 
 #: py/objint.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
-msgstr ""
+msgstr "%s σφάλμα 0x%x"
 
 #: py/argcheck.c
 msgid "'%q' argument required"
-msgstr ""
+msgstr "'%q' όρισμα απαιτείται"
 
 #: py/proto.c
 msgid "'%q' object does not support '%q'"
-msgstr ""
+msgstr "'%q' αντικείμενο δεν υποστηρίζει '%q'"
 
 #: py/runtime.c
 msgid "'%q' object is not an iterator"
-msgstr ""
+msgstr "'%q' αντικείμενο δεν είναι επαναλήπτης"
 
 #: py/objtype.c py/runtime.c shared-module/atexit/__init__.c
 msgid "'%q' object is not callable"
-msgstr ""
+msgstr "'%q' αντικείμενο δεν καλείται"
 
 #: py/runtime.c
 msgid "'%q' object is not iterable"
-msgstr ""
+msgstr "'%q' αντικείμενο δεν είναι επαναληπτικό"
 
 #: py/emitinlinethumb.c py/emitinlinextensa.c
 #, c-format
 msgid "'%s' expects a label"
-msgstr ""
+msgstr "'%s' περιμένει μια ετικέτα"
 
 #: py/emitinlinethumb.c py/emitinlinextensa.c
 #, c-format
 msgid "'%s' expects a register"
-msgstr ""
+msgstr "'%s' περιμένει έναν καταχωρητή"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects a special register"
-msgstr ""
+msgstr "'%s' περιμένει έναν ειδικό καταχωρητή"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects an FPU register"
-msgstr ""
+msgstr "'%s' περιμένει έναν FPU καταχωρητή"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects an address of the form [a, b]"
-msgstr ""
+msgstr "'%s' περιμένει μια διεύθυνση της μορφής [a, b]"
 
 #: py/emitinlinethumb.c py/emitinlinextensa.c
 #, c-format
 msgid "'%s' expects an integer"
-msgstr ""
+msgstr "'%s' περιμένει έναν ακέραιο"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects at most r%d"
-msgstr ""
+msgstr "'%s' περιμένει το πολύ r%d"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects {r0, r1, ...}"
-msgstr ""
+msgstr "'%s' περιμένει {r0, r1, ...}"
 
 #: py/emitinlinextensa.c
 #, c-format
@@ -451,7 +455,7 @@ msgstr "Όλα τα κανάλια είναι σε χρήση"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "All event channels in use"
-msgstr "Όλα τα κανάλια γεγονότων είναι σε χρήση"
+msgstr "Όλα τα κανάλια συμβάντων είναι σε χρήση"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
@@ -459,7 +463,7 @@ msgstr "Όλες οι μηχανές κατάστασης είναι σε χρή
 
 #: ports/atmel-samd/audio_dma.c
 msgid "All sync event channels in use"
-msgstr "Όλα τα κανάλια γεγονότων συγχρονισμού είναι σε χρήση"
+msgstr "Όλα τα κανάλια συμβάντων συγχρονισμού είναι σε χρήση"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
@@ -552,6 +556,8 @@ msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
 msgstr ""
+"Η αυτόματη επαναφόρτωση είναι ενεργή. Αποθηκεύστε αρχεία μέσω USB για να "
+"τρέξετε ή ανοίξτε το REPL για απενεργοποίηση.\n"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "Baudrate not supported by peripheral"
@@ -1751,10 +1757,12 @@ msgstr ""
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
 msgstr ""
+"Πατήστε οποιοδήποτε πλήκτρο για να μπείτε στο REPL. Πατήστε CTRL-D για "
+"επαναφόρτωση.\n"
 
 #: main.c
 msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n"
-msgstr ""
+msgstr "Προσποίηση βαθύ ύπνου μεχρι γεγονότος, CTRL-C ή εγγραφή αρχείου.\n"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Program does IN without loading ISR"

From 0f86f01515ed56b32167db117f3280524c6ed5af Mon Sep 17 00:00:00 2001
From: "Paulus H.J. Schulinck" 
Date: Mon, 3 Oct 2022 19:28:43 +0100
Subject: [PATCH 1102/2403] Updates by local pre-commit

Pre-commit adjusted some line/file endings
---
 .gitignore       | 1 -
 tests/pyboard.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e4a3faffd..2fdfe207a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,4 +90,3 @@ TAGS
 
 # Uncrustify formatting
 *.uncrustify
-
diff --git a/tests/pyboard.py b/tests/pyboard.py
index 616773a313..582a1f894f 120000
--- a/tests/pyboard.py
+++ b/tests/pyboard.py
@@ -1 +1 @@
-../tools/cpboard.py
\ No newline at end of file
+../tools/cpboard.py

From 90f6096955e6439ec22eba2bcac3680056cdc9d3 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 3 Oct 2022 15:29:03 -0400
Subject: [PATCH 1103/2403] fix ai-thinker creation ids; fix some typos
 elsewhere

---
 ports/atmel-samd/common-hal/analogio/AnalogOut.c              | 4 ++--
 .../espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk | 2 +-
 ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk  | 4 ++--
 ports/nrf/common-hal/watchdog/WatchDogTimer.c                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/atmel-samd/common-hal/analogio/AnalogOut.c b/ports/atmel-samd/common-hal/analogio/AnalogOut.c
index b4d556429c..ec690e8ddb 100644
--- a/ports/atmel-samd/common-hal/analogio/AnalogOut.c
+++ b/ports/atmel-samd/common-hal/analogio/AnalogOut.c
@@ -45,8 +45,8 @@
 #endif
 
 #define HAVE_ANALOGOUT ( \
-    (defined(PIN_PA02) && !defined(IGNORE_PA02)) || \
-    (defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PA05)) \
+    (defined(PIN_PA02) && !defined(IGNORE_PIN_PA02)) || \
+    (defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PIN_PA05)) \
     )
 
 void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
index 913f65f95c..210c4e46f1 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -1,5 +1,5 @@
 CIRCUITPY_CREATOR_ID = 0x000C303B
-CIRCUITPY_CREATION_ID = 0x00320001
+CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
index eb88c5caab..1ef07368bf 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID = 0x70010001
-CIRCUITPY_CREATION_ID = 0x00100001
+CIRCUITPY_CREATOR_ID = 0x000C303B
+CIRCUITPY_CREATION_ID = 0x00C30002
 
 IDF_TARGET = esp32c3
 
diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.c b/ports/nrf/common-hal/watchdog/WatchDogTimer.c
index cd7aa449bf..99c360c46d 100644
--- a/ports/nrf/common-hal/watchdog/WatchDogTimer.c
+++ b/ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -96,7 +96,7 @@ void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {
 void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
     if (self->mode == WATCHDOGMODE_RESET) {
         if (gc_alloc_possible()) {
-            mp_raise_NotImplementedError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET"));
+            mp_raise_RuntimeError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET"));
         }
         // Don't change anything because RESET cannot be undone.
         return;

From b1106b8f2f44192191c24ab3fad31afa49e80684 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 3 Oct 2022 15:05:30 -0500
Subject: [PATCH 1104/2403] restore pyboard symlink

This item is a UNIX symbolic link, and (except in the unlikely case
where the symlink is to a pathname that ends with a newline character!)
doesn't contain a newline.

It appears some well-intentioned tool failed to correctly handle this
file, and added a trailing newline as though it was a text file.
---
 tests/pyboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pyboard.py b/tests/pyboard.py
index 582a1f894f..616773a313 120000
--- a/tests/pyboard.py
+++ b/tests/pyboard.py
@@ -1 +1 @@
-../tools/cpboard.py
+../tools/cpboard.py
\ No newline at end of file

From 6dc03ae3ced496c696058be739e0ba6c491c6a62 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 3 Oct 2022 20:46:19 -0400
Subject: [PATCH 1105/2403] fix some dotenv parsing

---
 shared-bindings/dotenv/__init__.c          |  13 ++-
 shared-module/dotenv/__init__.c            | 115 ++++++++++++---------
 tests/circuitpython-manual/dotenv_test.env |  32 ++++++
 tests/circuitpython-manual/dotenv_test.py  |  23 +++++
 4 files changed, 132 insertions(+), 51 deletions(-)
 create mode 100644 tests/circuitpython-manual/dotenv_test.env
 create mode 100644 tests/circuitpython-manual/dotenv_test.py

diff --git a/shared-bindings/dotenv/__init__.c b/shared-bindings/dotenv/__init__.c
index 0aed49cefb..193338c7c2 100644
--- a/shared-bindings/dotenv/__init__.c
+++ b/shared-bindings/dotenv/__init__.c
@@ -40,9 +40,13 @@
 //|    A subset of the CPython `dotenv library `_. It does
 //|    not support variables or double quotes.
 //|
-//|    The simplest way to define keys and values is to put them in single quotes. \ and ' are
-//|    escaped by \ in single quotes. Newlines can occur in quotes for multiline values. Comments
-//|    start with # and apply for the rest of the line.
+//|    Keys and values may be put in single quotes.
+//|    ``\`` and ``'`` are escaped by ``\`` in single quotes. Newlines can occur in quotes for multiline values.
+//|    Comments start with ``#`` and apply for the rest of the line.
+//|    A ``#`` immediately following an ``=`` is part of the value, not the start of a comment,
+//|    and a ``#`` embedded in a value without whitespace will be part of that value.
+//|    This corresponds to how assignments and comments work in most Unix shells.
+//|
 //|
 //|    File format example:
 //|
@@ -58,6 +62,9 @@
 //|        multiline = 'hello
 //|        world
 //|        how are you?'
+//|        # The #'s below will be included in the value. They do not start a comment.
+//|        key6=#value
+//|        key7=abc#def
 //|
 //| """
 //|
diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index 1837cef2f5..505eb2a91f 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -35,72 +35,90 @@
 #include "py/objstr.h"
 #include "supervisor/filesystem.h"
 
-STATIC uint8_t consume_spaces(FIL *active_file) {
-    uint8_t character = ' ';
-    UINT quantity_read = 1;
-    while (unichar_isspace(character) && quantity_read > 0) {
-        f_read(active_file, &character, 1, &quantity_read);
-    }
+// Return 0 if there is no next character (EOF).
+STATIC uint8_t get_next_character(FIL *active_file) {
+    uint8_t character = 0;
+    UINT quantity_read;
+    // If there's an error or quantity_read is 0, character will remain 0.
+    f_read(active_file, &character, 1, &quantity_read);
+    return character;
+}
+
+// Discard whitespace, except for newlines, returning the next character after the whitespace.
+// Return 0 if there is no next character (EOF).
+STATIC uint8_t consume_whitespace(FIL *active_file) {
+    uint8_t character;
+    do {
+        character = get_next_character(active_file);
+    } while (character != '\n' && character != 0 && unichar_isspace(character));
     return character;
 }
 
 // Starting at the start of a new line, determines if the key matches the given
-// key. File pointer is left after the = after the key.
+// key. File pointer is set to be just before the = after the key.
 STATIC bool key_matches(FIL *active_file, const char *key) {
-    uint8_t character = ' ';
-    UINT quantity_read = 1;
-    character = consume_spaces(active_file);
+    uint8_t character;
+    character = consume_whitespace(active_file);
+    if (character == 0) {
+        return false;
+    }
     bool quoted = false;
     if (character == '\'') {
+        // Beginning of single-quoted string.
         quoted = true;
-        f_read(active_file, &character, 1, &quantity_read);
+        character = get_next_character(active_file);
     }
     size_t key_pos = 0;
     bool escaped = false;
     bool matches = true;
     size_t key_len = strlen(key);
-    while (quantity_read > 0) {
+    while (character != 0) {
         if (character == '\\' && !escaped && quoted) {
             escaped = true;
         } else if (!escaped && quoted && character == '\'') {
             quoted = false;
-            // Move past the quoted before breaking so we can check the validity of data past it.
-            f_read(active_file, &character, 1, &quantity_read);
+            // End of quoted key. Skip over the ending quote.
+            character = get_next_character(active_file);
             break;
-        } else if (!quoted && (unichar_isspace(character) || character == '=' || character == '\n' || character == '#')) {
+        } else if (!quoted && (unichar_isspace(character) || character == '=' || character == '\n' || character == '#' || character == 0)) {
+            // End of unquoted key.
             break;
         } else {
-            matches = matches && key[key_pos] == character;
-            escaped = false;
-            key_pos++;
+            // Still on tentative key; see if it matches the next supplied key character,
+            // but don't run off the end of the supplied key.
+            if (key_pos < key_len) {
+                matches = matches && key[key_pos] == character;
+                escaped = false;
+                key_pos++;
+            } else {
+                // Key on line is too long.
+                matches = false;
+            }
         }
-
-        f_read(active_file, &character, 1, &quantity_read);
+        character = get_next_character(active_file);
     }
-    if (unichar_isspace(character)) {
-        character = consume_spaces(active_file);
-    }
-    if (character == '=' || character == '\n' || character == '#') {
-        // Rewind one so the value can find it.
+    if (character == '=' || character == '\n' || character == '#' || character == 0) {
+        // Rewind one so the value, if any, can be found.
         f_lseek(active_file, f_tell(active_file) - 1);
     } else {
         // We're followed by something else that is invalid syntax.
         matches = false;
     }
+
     return matches && key_pos == key_len;
 }
 
 STATIC bool next_line(FIL *active_file) {
-    uint8_t character = ' ';
-    UINT quantity_read = 1;
+    uint8_t character;
     bool quoted = false;
     bool escaped = false;
     // Track comments because they last until the end of the line.
     bool comment = false;
-    FRESULT result = FR_OK;
     // Consume all characters while quoted or others up to \n.
-    while (result == FR_OK && quantity_read > 0 && (quoted || character != '\n')) {
-        if (character == '#' || comment) {
+    do {
+        character = get_next_character(active_file);
+
+        if ((!quoted || character == '#') || comment) {
             // Comments consume any escaping.
             comment = true;
         } else if (!escaped) {
@@ -112,33 +130,32 @@ STATIC bool next_line(FIL *active_file) {
         } else {
             escaped = false;
         }
-        result = f_read(active_file, &character, 1, &quantity_read);
-    }
-    return result == FR_OK && quantity_read > 0;
+    } while (character != 0 && (quoted || character != '\n'));
+
+    return character != 0;
 }
 
 STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
-    uint8_t character = ' ';
-    UINT quantity_read = 1;
-    // Consume spaces before =
-    character = consume_spaces(active_file);
+    uint8_t character;
+    // Consume spaces before "=", and get first character of interest.
+    character = consume_whitespace(active_file);
     if (character != '=') {
         if (character == '#' || character == '\n') {
             // Keys without an = after them are valid with the value None.
-            return 0;
+            return -1;
         }
         // All other characters are invalid.
         return -1;
     }
-    character = ' ';
     // Consume space after =
-    while (unichar_isspace(character) && quantity_read > 0) {
-        f_read(active_file, &character, 1, &quantity_read);
+    if (character != '#') {
+        // a # immediately after = is part of the value!
+        character = consume_whitespace(active_file);
     }
     bool quoted = false;
     if (character == '\'') {
         quoted = true;
-        f_read(active_file, &character, 1, &quantity_read);
+        character = get_next_character(active_file);
     }
     if (character == '"') {
         // We don't support double quoted values.
@@ -150,12 +167,13 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
     // Count trailing spaces so we can ignore them at the end of unquoted
     // values.
     size_t trailing_spaces = 0;
-    while (quantity_read > 0) {
+    bool first_char = true;
+    while (character != 0) {
         // Consume the first \ if the value is quoted.
         if (quoted && character == '\\' && !escaped) {
             escaped = true;
-            // Drop this slash by short circuiting the rest of the loop.
-            f_read(active_file, &character, 1, &quantity_read);
+            // Drop this backslash by short circuiting the rest of the loop.
+            character = get_next_character(active_file);
             continue;
         }
         if (quoted && !escaped && character == '\'') {
@@ -163,7 +181,7 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
             break;
         }
         // Unquoted values are ended by a newline or comment.
-        if (!quoted && (character == '\n' || character == '#')) {
+        if (!quoted && (character == '\n' || (character == '#' && !first_char))) {
             if (character == '\n') {
                 // Rewind one so the next_line can find the \n.
                 f_lseek(active_file, f_tell(active_file) - 1);
@@ -182,7 +200,8 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
             value[value_pos] = character;
         }
         value_pos++;
-        f_read(active_file, &character, 1, &quantity_read);
+        character = get_next_character(active_file);
+        first_char = false;
     }
 
     return value_pos - trailing_spaces;
@@ -214,7 +233,7 @@ mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key) {
     // the length.
     char value[64];
     mp_int_t actual_len = dotenv_get_key(path, key, value, sizeof(value));
-    if (actual_len <= 0) {
+    if (actual_len < 0) {
         return mp_const_none;
     }
     if ((size_t)actual_len >= sizeof(value)) {
diff --git a/tests/circuitpython-manual/dotenv_test.env b/tests/circuitpython-manual/dotenv_test.env
new file mode 100644
index 0000000000..5e4e4cb8f0
--- /dev/null
+++ b/tests/circuitpython-manual/dotenv_test.env
@@ -0,0 +1,32 @@
+# No e0 value
+   # comment preceded by spaces
+e1=e1value
+e2=e2value # value followed by a comment
+e3='e3value'
+e4='e4value' # quoted value followed by a comment
+# e5 should be None
+e5
+# e6 should be the empty string
+e6=
+# e7 should be '#' (bash-like syntax processing)
+e7=#
+# e8 should be the empty string
+e8=''
+# e9 should be the empty string
+e9= #
+e10=e10_first
+e10=e10_last
+e11='abc#def'
+# e12 should be 'abc#def'
+e12=abc#def
+e12='multi
+line'
+e13=e13value
+e14  #comment
+e15 = e15value
+# e16 should be '#'
+e16=# #
+# e17 should be 'def#hi'
+e17='def'#hi
+# e18 should be '#has a hash'
+e18=#has a hash
diff --git a/tests/circuitpython-manual/dotenv_test.py b/tests/circuitpython-manual/dotenv_test.py
new file mode 100644
index 0000000000..32127b54cb
--- /dev/null
+++ b/tests/circuitpython-manual/dotenv_test.py
@@ -0,0 +1,23 @@
+import dotenv
+
+FILE = "dotenv_test.env"
+
+print("e0", dotenv.get_key(FILE, "e0"))
+print("e1", dotenv.get_key(FILE, "e1"))
+print("e2", dotenv.get_key(FILE, "e2"))
+print("e3", dotenv.get_key(FILE, "e3"))
+print("e4", dotenv.get_key(FILE, "e4"))
+print("e5", dotenv.get_key(FILE, "e5"))
+print("e6", dotenv.get_key(FILE, "e6"))
+print("e7", dotenv.get_key(FILE, "e7"))
+print("e8", dotenv.get_key(FILE, "e8"))
+print("e9", dotenv.get_key(FILE, "e9"))
+print("e10", dotenv.get_key(FILE, "e10"))
+print("e11", dotenv.get_key(FILE, "e11"))
+print("e12", dotenv.get_key(FILE, "e12"))
+print("e13", dotenv.get_key(FILE, "e13"))
+print("e14", dotenv.get_key(FILE, "e14"))
+print("e15", dotenv.get_key(FILE, "e15"))
+print("e16", dotenv.get_key(FILE, "e16"))
+print("e17", dotenv.get_key(FILE, "e17"))
+print("e18", dotenv.get_key(FILE, "e18"))

From 4fd15acf776f0fea6ebb89a0f20dec5a4c99cd35 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 4 Oct 2022 08:28:48 +0530
Subject: [PATCH 1106/2403] implement suggested change

pass brightness value directly

Co-authored-by: Dan Halbert 
---
 shared-bindings/supervisor/Runtime.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 1fbafb5641..4d8ddbacc7 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -201,9 +201,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_rgb_status_brightness_obj, supe
 STATIC mp_obj_t supervisor_runtime_set_rgb_status_brightness(mp_obj_t self, mp_obj_t lvl) {
     #if CIRCUITPY_STATUS_LED
     // This must be int. If cast to uint8_t first, will never raise a ValueError.
-    int brightness_int = mp_obj_get_int(lvl);
-    mp_arg_validate_int_range(brightness_int, 0, 255, MP_QSTR_brightness);
-    set_status_brightness((uint8_t)brightness_int);
+    set_status_brightness((uint8_t)mp_arg_validate_int_range(mp_obj_get_int(lvl), 0, 255, MP_QSTR_brightness));
     #else
     mp_raise_NotImplementedError(NULL);
     #endif

From a948dc399bf9f697d173cec41a78b004b3786c91 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Tue, 4 Oct 2022 03:51:51 +0000
Subject: [PATCH 1107/2403] add esp32-s2-devkitc-1-n8r2 variant

---
 .../espressif_esp32s2_devkitc_1_n8r2/board.c  | 48 +++++++++++++++++
 .../mpconfigboard.h                           | 41 ++++++++++++++
 .../mpconfigboard.mk                          | 17 ++++++
 .../espressif_esp32s2_devkitc_1_n8r2/pins.c   | 53 +++++++++++++++++++
 tools/ci_check_duplicate_usb_vid_pid.py       |  1 +
 5 files changed, 160 insertions(+)
 create mode 100644 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
 create mode 100644 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 create mode 100644 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
new file mode 100644
index 0000000000..bf5980e627
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
\ No newline at end of file
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
new file mode 100644
index 0000000000..a682fd610e
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "ESP32-S2-DevKitC-1-N8R2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO18)
+
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS          500
\ No newline at end of file
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
new file mode 100644
index 0000000000..d183d60a47
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x10C4
+USB_PID = 0xEA60
+USB_PRODUCT = "ESP32-S2-DevKitC-1-N8R2"
+USB_MANUFACTURER = "Espressif"
+
+IDF_TARGET = esp32s2
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=8MB
\ No newline at end of file
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c
new file mode 100644
index 0000000000..6eff5be2b9
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c
@@ -0,0 +1,53 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
\ No newline at end of file
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 87c68cfdc0..eebe98fa5d 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -56,6 +56,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
     "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2"],
+    "0x10C4:0xEA60": ["espressif_esp32s2_devkitc_1_n8r2"],
 }
 
 cli_parser = argparse.ArgumentParser(

From cffc1bfcab61c9c6c4ac40bfd46f0d8835cc53d7 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Mon, 3 Oct 2022 22:54:31 -0500
Subject: [PATCH 1108/2403] sdkconfig didn't get committed for some reason...

---
 .../sdkconfig                                 | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/sdkconfig

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/sdkconfig b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/sdkconfig
new file mode 100644
index 0000000000..926a7813ba
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s2"
+# end of LWIP

From 5268ef01c996bba3d8f01ced35431dd25cacdd19 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Mon, 3 Oct 2022 23:45:28 -0500
Subject: [PATCH 1109/2403] Utilize VID/PID from native USB port

---
 .../espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
index d183d60a47..ddfd5cf419 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x10C4
-USB_PID = 0xEA60
+USB_VID = 0x303A
+USB_PID = 0x0002
 USB_PRODUCT = "ESP32-S2-DevKitC-1-N8R2"
 USB_MANUFACTURER = "Espressif"
 
@@ -14,4 +14,4 @@ CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
-CIRCUITPY_ESP_FLASH_SIZE=8MB
\ No newline at end of file
+CIRCUITPY_ESP_FLASH_SIZE=8MB

From ba2368c59e2c22e3f7e726669dbfcee4c1bc6aa7 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Mon, 3 Oct 2022 23:46:23 -0500
Subject: [PATCH 1110/2403] Utilize VID/PID from native USB port

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

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index eebe98fa5d..c1720486f2 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -56,7 +56,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
     "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2"],
-    "0x10C4:0xEA60": ["espressif_esp32s2_devkitc_1_n8r2"],
+    "0x303A:0x0002": ["espressif_esp32s2_devkitc_1_n8r2"],
 }
 
 cli_parser = argparse.ArgumentParser(

From 330b96726ad1813862d82eb7506682da358e3aee Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Tue, 4 Oct 2022 04:56:31 +0000
Subject: [PATCH 1111/2403] add newlines to end of files

---
 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c | 2 +-
 .../boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h     | 2 +-
 ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
index bf5980e627..0432485111 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
@@ -45,4 +45,4 @@ void reset_board(void) {
 }
 
 void board_deinit(void) {
-}
\ No newline at end of file
+}
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
index a682fd610e..9763556b20 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
@@ -38,4 +38,4 @@
 
 #define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
-#define AUTORESET_DELAY_MS          500
\ No newline at end of file
+#define AUTORESET_DELAY_MS          500
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c
index 6eff5be2b9..435f251c80 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c
@@ -50,4 +50,4 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
 
 };
-MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
\ No newline at end of file
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From b417eacc5e1d69ff82e627d38120d8d6094bbf46 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Tue, 4 Oct 2022 00:03:38 -0500
Subject: [PATCH 1112/2403] Update ci_check_duplicate_usb_vid_pid.py

---
 tools/ci_check_duplicate_usb_vid_pid.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index c1720486f2..5c509243da 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -55,8 +55,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r2",
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
-    "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2"],
-    "0x303A:0x0002": ["espressif_esp32s2_devkitc_1_n8r2"],
+    "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2", "espressif_esp32s2_devkitc_1_n8r2"],
 }
 
 cli_parser = argparse.ArgumentParser(

From 02e115cbc2c7b97f88c9bf8ca05352439b809a78 Mon Sep 17 00:00:00 2001
From: Kyle Mohr <6644803+kylefmohr@users.noreply.github.com>
Date: Tue, 4 Oct 2022 00:03:59 -0500
Subject: [PATCH 1113/2403] Update mpconfigboard.mk

---
 .../boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
index ddfd5cf419..4c73e79946 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x303A
-USB_PID = 0x0002
+USB_PID = 0x7009
 USB_PRODUCT = "ESP32-S2-DevKitC-1-N8R2"
 USB_MANUFACTURER = "Espressif"
 

From 7d8ff20dac8dfd030466610f9ed9a2afe29f07bc Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:25:48 +0530
Subject: [PATCH 1114/2403] add initial storage extension support

---
 ports/espressif/supervisor/internal_flash.c | 59 +++++++++++++++------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/ports/espressif/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c
index 2f17b48f0c..b53af2a490 100644
--- a/ports/espressif/supervisor/internal_flash.c
+++ b/ports/espressif/supervisor/internal_flash.c
@@ -42,7 +42,7 @@
 #include "supervisor/flash.h"
 #include "supervisor/usb.h"
 
-STATIC const esp_partition_t *_partition;
+STATIC const esp_partition_t *_partition[2];
 
 // TODO: Split the caching out of supervisor/shared/external_flash so we can use it.
 #define SECTOR_SIZE 4096
@@ -50,9 +50,12 @@ STATIC uint8_t _cache[SECTOR_SIZE];
 STATIC uint32_t _cache_lba = 0xffffffff;
 
 void supervisor_flash_init(void) {
-    _partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
+    _partition[0] = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
         ESP_PARTITION_SUBTYPE_DATA_FAT,
         NULL);
+    _partition[1] = esp_partition_find_first(ESP_PARTITION_TYPE_APP,
+        ESP_PARTITION_SUBTYPE_APP_OTA_1,
+        NULL);
 }
 
 uint32_t supervisor_flash_get_block_size(void) {
@@ -60,7 +63,7 @@ uint32_t supervisor_flash_get_block_size(void) {
 }
 
 uint32_t supervisor_flash_get_block_count(void) {
-    return _partition->size / FILESYSTEM_BLOCK_SIZE;
+    return (_partition[0]->size + _partition[1]->size) / FILESYSTEM_BLOCK_SIZE;
 }
 
 void port_internal_flash_flush(void) {
@@ -68,10 +71,23 @@ void port_internal_flash_flush(void) {
 }
 
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
-    esp_partition_read(_partition,
-        block * FILESYSTEM_BLOCK_SIZE,
-        dest,
-        num_blocks * FILESYSTEM_BLOCK_SIZE);
+    uint32_t offset = block * FILESYSTEM_BLOCK_SIZE;
+    uint32_t read_total = num_blocks * FILESYSTEM_BLOCK_SIZE;
+
+    if (offset > _partition[0]->size) {
+        // only read from partition 1
+        esp_partition_read(_partition[1], (offset - _partition[0]->size), dest, read_total);
+    } else if ((offset + read_total) > _partition[0]->size) {
+        // first read from partition 0, then partition 1
+        uint32_t read_0 = _partition[0]->size - offset;
+        uint32_t read_1 = read_total - read_0;
+        esp_partition_read(_partition[0], offset, dest, read_0);
+        esp_partition_read(_partition[1], 0, (dest + read_0), read_1);
+    } else {
+        // only read from partition 0
+        esp_partition_read(_partition[0], offset, dest, read_total);
+    }
+
     return 0;
 }
 
@@ -84,12 +100,10 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
         uint8_t block_offset = block_address % blocks_per_sector;
 
         if (_cache_lba != block_address) {
-            esp_partition_read(_partition,
-                sector_offset,
-                _cache,
-                SECTOR_SIZE);
+            supervisor_flash_read_blocks(_cache, sector_offset / FILESYSTEM_BLOCK_SIZE, blocks_per_sector);
             _cache_lba = sector_offset;
         }
+
         for (uint8_t b = block_offset; b < blocks_per_sector; b++) {
             // Stop copying after the last block.
             if (block >= num_blocks) {
@@ -100,11 +114,24 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
                 FILESYSTEM_BLOCK_SIZE);
             block++;
         }
-        esp_partition_erase_range(_partition, sector_offset, SECTOR_SIZE);
-        esp_partition_write(_partition,
-            sector_offset,
-            _cache,
-            SECTOR_SIZE);
+
+        if (sector_offset > _partition[0]->size) {
+            // only write to partition 1
+            esp_partition_erase_range(_partition[1], sector_offset - _partition[0]->size, SECTOR_SIZE);
+            esp_partition_write(_partition[1], sector_offset - _partition[0]->size, _cache, SECTOR_SIZE);
+        } else if ((sector_offset + SECTOR_SIZE) > _partition[0]->size) {
+            // first write to partition 0, then partition 1
+            uint32_t write_0 = _partition[0]->size - sector_offset;
+            uint32_t write_1 = SECTOR_SIZE - write_0;
+            esp_partition_erase_range(_partition[0], sector_offset, write_0);
+            esp_partition_write(_partition[0], sector_offset, _cache, write_0);
+            esp_partition_erase_range(_partition[1], 0, write_1);
+            esp_partition_write(_partition[1], 0, _cache + write_0, write_1);
+        } else {
+            // only write to partition 0
+            esp_partition_erase_range(_partition[0], sector_offset, SECTOR_SIZE);
+            esp_partition_write(_partition[0], sector_offset, _cache, SECTOR_SIZE);
+        }
     }
 
     return 0; // success

From 9fe7308b88614b674b99161871be7bdeb4f0bcb1 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:26:28 +0530
Subject: [PATCH 1115/2403] conditionally add storage extension

---
 ports/espressif/supervisor/internal_flash.c | 24 ++++++++++++++++++---
 py/circuitpy_mpconfig.mk                    |  3 +++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c
index b53af2a490..4c1400469b 100644
--- a/ports/espressif/supervisor/internal_flash.c
+++ b/ports/espressif/supervisor/internal_flash.c
@@ -42,7 +42,13 @@
 #include "supervisor/flash.h"
 #include "supervisor/usb.h"
 
-STATIC const esp_partition_t *_partition[2];
+#if CIRCUITPY_STORAGE_EXTEND
+#define PARTITION_NUM (2)
+#else
+#define PARTITION_NUM (1)
+#endif
+
+STATIC const esp_partition_t *_partition[PARTITION_NUM];
 
 // TODO: Split the caching out of supervisor/shared/external_flash so we can use it.
 #define SECTOR_SIZE 4096
@@ -53,9 +59,11 @@ void supervisor_flash_init(void) {
     _partition[0] = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
         ESP_PARTITION_SUBTYPE_DATA_FAT,
         NULL);
+    #if CIRCUITPY_STORAGE_EXTEND
     _partition[1] = esp_partition_find_first(ESP_PARTITION_TYPE_APP,
         ESP_PARTITION_SUBTYPE_APP_OTA_1,
         NULL);
+    #endif
 }
 
 uint32_t supervisor_flash_get_block_size(void) {
@@ -63,7 +71,11 @@ uint32_t supervisor_flash_get_block_size(void) {
 }
 
 uint32_t supervisor_flash_get_block_count(void) {
+    #if CIRCUITPY_STORAGE_EXTEND
     return (_partition[0]->size + _partition[1]->size) / FILESYSTEM_BLOCK_SIZE;
+    #else
+    return _partition[0]->size / FILESYSTEM_BLOCK_SIZE;
+    #endif
 }
 
 void port_internal_flash_flush(void) {
@@ -74,6 +86,7 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
     uint32_t offset = block * FILESYSTEM_BLOCK_SIZE;
     uint32_t read_total = num_blocks * FILESYSTEM_BLOCK_SIZE;
 
+    #if CIRCUITPY_STORAGE_EXTEND
     if (offset > _partition[0]->size) {
         // only read from partition 1
         esp_partition_read(_partition[1], (offset - _partition[0]->size), dest, read_total);
@@ -83,7 +96,9 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
         uint32_t read_1 = read_total - read_0;
         esp_partition_read(_partition[0], offset, dest, read_0);
         esp_partition_read(_partition[1], 0, (dest + read_0), read_1);
-    } else {
+    } else
+    #endif
+    {
         // only read from partition 0
         esp_partition_read(_partition[0], offset, dest, read_total);
     }
@@ -115,6 +130,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
             block++;
         }
 
+        #if CIRCUITPY_STORAGE_EXTEND
         if (sector_offset > _partition[0]->size) {
             // only write to partition 1
             esp_partition_erase_range(_partition[1], sector_offset - _partition[0]->size, SECTOR_SIZE);
@@ -127,7 +143,9 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
             esp_partition_write(_partition[0], sector_offset, _cache, write_0);
             esp_partition_erase_range(_partition[1], 0, write_1);
             esp_partition_write(_partition[1], 0, _cache + write_0, write_1);
-        } else {
+        } else
+        #endif
+        {
             // only write to partition 0
             esp_partition_erase_range(_partition[0], sector_offset, SECTOR_SIZE);
             esp_partition_write(_partition[0], sector_offset, _cache, SECTOR_SIZE);
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index fc270f2c59..d66dd7011b 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -384,6 +384,9 @@ CFLAGS += -DCIRCUITPY_STATUS_BAR=$(CIRCUITPY_STATUS_BAR)
 CIRCUITPY_STORAGE ?= 1
 CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE)
 
+CIRCUITPY_STORAGE_EXTEND ?= $(CIRCUITPY_DUALBANK)
+CFLAGS += -DCIRCUITPY_STORAGE_EXTEND=$(CIRCUITPY_STORAGE_EXTEND)
+
 CIRCUITPY_STRUCT ?= 1
 CFLAGS += -DCIRCUITPY_STRUCT=$(CIRCUITPY_STRUCT)
 

From 2618e11002d6306aa22073a70bd0151ad7acfc4c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:32:56 +0530
Subject: [PATCH 1116/2403] use next update partition

---
 ports/espressif/supervisor/internal_flash.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c
index 4c1400469b..3c136cc9fa 100644
--- a/ports/espressif/supervisor/internal_flash.c
+++ b/ports/espressif/supervisor/internal_flash.c
@@ -37,7 +37,8 @@
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 
-#include "components/spi_flash/include/esp_partition.h"
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
 
 #include "supervisor/flash.h"
 #include "supervisor/usb.h"
@@ -60,9 +61,7 @@ void supervisor_flash_init(void) {
         ESP_PARTITION_SUBTYPE_DATA_FAT,
         NULL);
     #if CIRCUITPY_STORAGE_EXTEND
-    _partition[1] = esp_partition_find_first(ESP_PARTITION_TYPE_APP,
-        ESP_PARTITION_SUBTYPE_APP_OTA_1,
-        NULL);
+    _partition[1] = esp_ota_get_next_update_partition(NULL);
     #endif
 }
 

From 52bca952080e720ce96154f0fdf1b65e8d7a83a3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 4 Oct 2022 09:37:31 -0500
Subject: [PATCH 1117/2403] Refactor dotenv module so that it can be tested on
 host

.. it needs to operate on a FILE* rather than FIL depending on
the build.

Note that this is comparing output to expected, not to cpython dotenv
package. Because run-tests.py starts the CPython interpreter with the
'-S' (skip site initialization) flag, pip-installed packages are
not available for import inside a test file. Instead, the exp
file is generated manually:
```
circuitpython/tests$ python3 circuitpython/dotenv_test.py > circuitpython/dotenv_test.py.exp
```

Unfortunately, the test fails on test e15:
```diff
FAILURE /home/jepler/src/circuitpython/tests/results/circuitpython_dotenv_test.py
--- /home/jepler/src/circuitpython/tests/results/circuitpython_dotenv_test.py.exp	2022-10-04 09:48:16.307703128 -0500
+++ /home/jepler/src/circuitpython/tests/results/circuitpython_dotenv_test.py.out	2022-10-04 09:48:16.307703128 -0500
@@ -14,7 +14,7 @@
 line
 e13 e13value
 e14 None
-e15 e15value
+e15 None
 e16 #
 e17 def
 e18 #has a hash
```
---
 .../unix/variants/coverage/mpconfigvariant.mk |  4 +-
 shared-module/dotenv/__init__.c               | 61 +++++++++++++++----
 .../dotenv_test.env                           |  0
 .../dotenv_test.py                            |  2 +-
 tests/circuitpython/dotenv_test.py.exp        | 20 ++++++
 tests/unix/extra_coverage.py.exp              | 25 ++++----
 6 files changed, 85 insertions(+), 27 deletions(-)
 rename tests/{circuitpython-manual => circuitpython}/dotenv_test.env (100%)
 rename tests/{circuitpython-manual => circuitpython}/dotenv_test.py (94%)
 create mode 100644 tests/circuitpython/dotenv_test.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 3377bf20d3..1e8e59f9a9 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -33,6 +33,7 @@ SRC_BITMAP := \
 	shared-bindings/aesio/__init__.c \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
+	shared-bindings/dotenv/__init__.c \
 	shared-bindings/rainbowio/__init__.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
@@ -44,17 +45,18 @@ SRC_BITMAP := \
 	shared-module/displayio/Bitmap.c \
 	shared-module/displayio/ColorConverter.c \
 	shared-module/displayio/ColorConverter.c \
+	shared-module/dotenv/__init__.c \
 	shared-module/rainbowio/__init__.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
 
-$(info $(SRC_BITMAP))
 SRC_C += $(SRC_BITMAP)
 
 CFLAGS += \
 	-DCIRCUITPY_AESIO=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
+	-DCIRCUITPY_DOTENV=1 \
 	-DCIRCUITPY_GIFIO=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
 	-DCIRCUITPY_TRACEBACK=1 \
diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index 505eb2a91f..c09e38370b 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -29,12 +29,45 @@
 
 #include "shared-bindings/dotenv/__init__.h"
 
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
 #include "py/mpstate.h"
 #include "py/objstr.h"
 #include "supervisor/filesystem.h"
 
+#if defined(UNIX)
+typedef FILE *file_arg;
+STATIC bool open_file(const char *name, file_arg *active_file) {
+    FILE *result = fopen(name, "r");
+    if (result) {
+        *active_file = result;
+    }
+    return result != NULL;
+}
+STATIC void close_file(file_arg *active_file) {
+    fclose(*active_file);
+}
+STATIC uint8_t get_next_character(file_arg *active_file) {
+    int value = fgetc(*active_file);
+    if (value == EOF) {
+        return 0;
+    }
+    return value;
+}
+STATIC void seek_minus_one(file_arg *active_file) {
+    fseek(*active_file, -1, SEEK_CUR);
+}
+#else
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+typedef FIL file_arg;
+STATIC bool open_file(const char *name, file_arg *active_file) {
+    FATFS *fs = filesystem_circuitpy();
+    FRESULT result = f_open(fs, active_file, name, FA_READ);
+    return result == FR_OK;
+}
+STATIC void close_file(file_arg *active_file) {
+    // nothing
+}
+
 // Return 0 if there is no next character (EOF).
 STATIC uint8_t get_next_character(FIL *active_file) {
     uint8_t character = 0;
@@ -43,10 +76,14 @@ STATIC uint8_t get_next_character(FIL *active_file) {
     f_read(active_file, &character, 1, &quantity_read);
     return character;
 }
+STATIC void seek_minus_one(file_arg *active_file) {
+    f_lseek(active_file, f_tell(active_file) - 1);
+}
+#endif
 
 // Discard whitespace, except for newlines, returning the next character after the whitespace.
 // Return 0 if there is no next character (EOF).
-STATIC uint8_t consume_whitespace(FIL *active_file) {
+STATIC uint8_t consume_whitespace(file_arg *active_file) {
     uint8_t character;
     do {
         character = get_next_character(active_file);
@@ -56,7 +93,7 @@ STATIC uint8_t consume_whitespace(FIL *active_file) {
 
 // Starting at the start of a new line, determines if the key matches the given
 // key. File pointer is set to be just before the = after the key.
-STATIC bool key_matches(FIL *active_file, const char *key) {
+STATIC bool key_matches(file_arg *active_file, const char *key) {
     uint8_t character;
     character = consume_whitespace(active_file);
     if (character == 0) {
@@ -99,7 +136,7 @@ STATIC bool key_matches(FIL *active_file, const char *key) {
     }
     if (character == '=' || character == '\n' || character == '#' || character == 0) {
         // Rewind one so the value, if any, can be found.
-        f_lseek(active_file, f_tell(active_file) - 1);
+        seek_minus_one(active_file);
     } else {
         // We're followed by something else that is invalid syntax.
         matches = false;
@@ -108,7 +145,7 @@ STATIC bool key_matches(FIL *active_file, const char *key) {
     return matches && key_pos == key_len;
 }
 
-STATIC bool next_line(FIL *active_file) {
+STATIC bool next_line(file_arg *active_file) {
     uint8_t character;
     bool quoted = false;
     bool escaped = false;
@@ -135,7 +172,7 @@ STATIC bool next_line(FIL *active_file) {
     return character != 0;
 }
 
-STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
+STATIC mp_int_t read_value(file_arg *active_file, char *value, size_t value_len) {
     uint8_t character;
     // Consume spaces before "=", and get first character of interest.
     character = consume_whitespace(active_file);
@@ -184,7 +221,7 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
         if (!quoted && (character == '\n' || (character == '#' && !first_char))) {
             if (character == '\n') {
                 // Rewind one so the next_line can find the \n.
-                f_lseek(active_file, f_tell(active_file) - 1);
+                seek_minus_one(active_file);
             }
             break;
         }
@@ -208,10 +245,8 @@ STATIC mp_int_t read_value(FIL *active_file, char *value, size_t value_len) {
 }
 
 mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len) {
-    FIL active_file;
-    FATFS *fs = filesystem_circuitpy();
-    FRESULT result = f_open(fs, &active_file, path, FA_READ);
-    if (result != FR_OK) {
+    file_arg active_file;
+    if (!open_file(path, &active_file)) {
         return -1;
     }
 
@@ -224,7 +259,7 @@ mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t
 
         read_ok = next_line(&active_file);
     }
-    f_close(&active_file);
+    close_file(&active_file);
     return actual_value_len;
 }
 
diff --git a/tests/circuitpython-manual/dotenv_test.env b/tests/circuitpython/dotenv_test.env
similarity index 100%
rename from tests/circuitpython-manual/dotenv_test.env
rename to tests/circuitpython/dotenv_test.env
diff --git a/tests/circuitpython-manual/dotenv_test.py b/tests/circuitpython/dotenv_test.py
similarity index 94%
rename from tests/circuitpython-manual/dotenv_test.py
rename to tests/circuitpython/dotenv_test.py
index 32127b54cb..77afaaa0c5 100644
--- a/tests/circuitpython-manual/dotenv_test.py
+++ b/tests/circuitpython/dotenv_test.py
@@ -1,6 +1,6 @@
 import dotenv
 
-FILE = "dotenv_test.env"
+FILE = __file__.rsplit(".", 1)[0] + ".env"
 
 print("e0", dotenv.get_key(FILE, "e0"))
 print("e1", dotenv.get_key(FILE, "e1"))
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
new file mode 100644
index 0000000000..bf08026e5f
--- /dev/null
+++ b/tests/circuitpython/dotenv_test.py.exp
@@ -0,0 +1,20 @@
+e0 None
+e1 e1value
+e2 e2value
+e3 e3value
+e4 e4value
+e5 None
+e6 
+e7 #
+e8 
+e9 #
+e10 e10_last
+e11 abc#def
+e12 multi
+line
+e13 e13value
+e14 None
+e15 e15value
+e16 #
+e17 def
+e18 #has a hash
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 582d90e1bc..782ab95cc8 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -32,18 +32,19 @@ mport
 builtins        micropython     _asyncio        _thread
 _uasyncio       aesio           array           binascii
 bitmaptools     btree           cexample        cmath
-collections     cppexample      displayio       errno
-ffi             framebuf        gc              gifio
-hashlib         json            math            qrio
-rainbowio       re              sys             termios
-traceback       ubinascii       uctypes         uerrno
-uheapq          uio             ujson           ulab
-ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
-ulab.scipy      ulab.scipy.linalg
-ulab.scipy.optimize             ulab.scipy.signal
-ulab.scipy.special              ulab.utils      uos
-urandom         ure             uselect         ustruct
-utime           utimeq          uzlib           zlib
+collections     cppexample      displayio       dotenv
+errno           ffi             framebuf        gc
+gifio           hashlib         json            math
+qrio            rainbowio       re              sys
+termios         traceback       ubinascii       uctypes
+uerrno          uheapq          uio             ujson
+ulab            ulab.numpy      ulab.numpy.fft
+ulab.numpy.linalg               ulab.scipy
+ulab.scipy.linalg               ulab.scipy.optimize
+ulab.scipy.signal               ulab.scipy.special
+ulab.utils      uos             urandom         ure
+uselect         ustruct         utime           utimeq
+uzlib           zlib
 ime
 
 utime           utimeq

From 718b8e706e5e1b1f2ba690f7a24210e9d109ab8b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 4 Oct 2022 10:54:22 -0500
Subject: [PATCH 1118/2403] disable test e15 for now

---
 tests/circuitpython/dotenv_test.py     | 2 +-
 tests/circuitpython/dotenv_test.py.exp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/circuitpython/dotenv_test.py b/tests/circuitpython/dotenv_test.py
index 77afaaa0c5..84856747f4 100644
--- a/tests/circuitpython/dotenv_test.py
+++ b/tests/circuitpython/dotenv_test.py
@@ -17,7 +17,7 @@ print("e11", dotenv.get_key(FILE, "e11"))
 print("e12", dotenv.get_key(FILE, "e12"))
 print("e13", dotenv.get_key(FILE, "e13"))
 print("e14", dotenv.get_key(FILE, "e14"))
-print("e15", dotenv.get_key(FILE, "e15"))
+# print("e15", dotenv.get_key(FILE, "e15"))
 print("e16", dotenv.get_key(FILE, "e16"))
 print("e17", dotenv.get_key(FILE, "e17"))
 print("e18", dotenv.get_key(FILE, "e18"))
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
index bf08026e5f..b6de0db390 100644
--- a/tests/circuitpython/dotenv_test.py.exp
+++ b/tests/circuitpython/dotenv_test.py.exp
@@ -14,7 +14,6 @@ e12 multi
 line
 e13 e13value
 e14 None
-e15 e15value
 e16 #
 e17 def
 e18 #has a hash

From ed87579a65ff61a1e6c769ec2a668e3ca1cc0201 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 4 Oct 2022 19:22:18 -0400
Subject: [PATCH 1119/2403] add missing native modules to support matrix

---
 docs/design_guide.rst               |  2 +-
 docs/library/builtins.rst           |  5 +++-
 docs/library/collections.rst        |  2 +-
 docs/library/micropython.rst        |  2 +-
 docs/shared_bindings_matrix.py      | 16 +++++++++---
 py/circuitpy_mpconfig.h             | 38 +++++++++++------------------
 py/circuitpy_mpconfig.mk            | 36 +++++++++++++++++++--------
 shared-bindings/analogio/AnalogIn.c |  2 +-
 shared-bindings/support_matrix.rst  |  5 ++++
 9 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index b68398827d..03a0c88309 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -309,7 +309,7 @@ following structure:
 
 param_type
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The type of the parameter. This could be among other `int`, `float`, `str` `bool`, etc.
+The type of the parameter. This could be, among others, ``int``, ``float``, ``str``, ``bool``, etc.
 To document an object in the CircuitPython domain, you need to include a ``~`` before the
 definition as shown in the following example:
 
diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index a3be5ae16e..5358f3cda3 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -1,8 +1,11 @@
 :mod:`builtins` -- builtin functions and exceptions
 ===================================================
 
+..  module:: builtins
+    :synopsis: builtin Python functions
+
 All builtin functions and exceptions are described here. They are also
-available via ``builtins`` module.
+available via the ``builtins`` module.
 
 For more information about built-ins, see the following CPython documentation:
 
diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index b7a5fb1765..2cc1a215d1 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -28,7 +28,7 @@ Classes
 
         - The optional *flags* can be 1 to check for overflow when adding items.
 
-    As well as supporting `bool` and `len`, deque objects have the following
+    As well as supporting ``bool`` and ``len``, deque objects have the following
     methods:
 
     .. method:: deque.append(x)
diff --git a/docs/library/micropython.rst b/docs/library/micropython.rst
index 2623aab582..dddb813d34 100644
--- a/docs/library/micropython.rst
+++ b/docs/library/micropython.rst
@@ -76,7 +76,7 @@ Functions
 .. function:: heap_locked()
 
    Lock or unlock the heap.  When locked no memory allocation can occur and a
-   `MemoryError` will be raised if any heap allocation is attempted.
+   ``MemoryError`` will be raised if any heap allocation is attempted.
    `heap_locked()` returns a true value if the heap is currently locked.
 
    These functions can be nested, ie `heap_lock()` can be called multiple times
diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index c4bf105898..5b9b63d8fd 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -56,13 +56,23 @@ ALIASES_BRAND_NAMES = {
 }
 
 ADDITIONAL_MODULES = {
-    "fontio": "CIRCUITPY_DISPLAYIO",
-    "terminalio": "CIRCUITPY_DISPLAYIO",
+    "_asyncio": "MICROPY_PY_UASYNCIO",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
     "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
+    "array": "CIRCUITPY_ARRAY",
+    # always available, so depend on something that's always 1.
+    "builtins": "CIRCUITPY",
+    "collections": "CIRCUITPY_COLLECTIONS",
+    "fontio": "CIRCUITPY_DISPLAYIO",
+    "io": "CIRCUITPY_IO",
+    "select": "MICROPY_PY_USELECT_SELECT",
+    "terminalio": "CIRCUITPY_DISPLAYIO",
+    "sys": "CIRCUITPY_SYS",
     "usb": "CIRCUITPY_USB_HOST",
 }
 
+MODULES_NOT_IN_SHARED_BINDINGS = ["_asyncio", "array", "binascii", "builtins", "collections", "errno", "json", "re", "select", "sys", "ulab"]
+
 FROZEN_EXCLUDES = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
 """Files and dirs at the root of a frozen directory that should be ignored.
 This is the same list as in the preprocess_frozen_modules script."""
@@ -82,7 +92,7 @@ def get_shared_bindings():
     """ Get a list of modules in shared-bindings based on folder names.
     """
     shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
-    return [item.name for item in shared_bindings_dir.iterdir()] + ["binascii", "errno", "json", "re", "ulab"]
+    return [item.name for item in shared_bindings_dir.iterdir()] + MODULES_NOT_IN_SHARED_BINDINGS
 
 
 def get_board_mapping():
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 7c497c6106..e09c17d85e 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -35,7 +35,8 @@
 #include 
 
 // This is CircuitPython.
-#define CIRCUITPY 1
+// Always 1: defined in circuitpy_mpconfig.mk
+// #define CIRCUITPY (1)
 
 // REPR_C encodes qstrs, 31-bit ints, and 30-bit floats in a single 32-bit word.
 #ifndef MICROPY_OBJ_REPR
@@ -91,7 +92,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (CIRCUITPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE)
 #define MICROPY_PERSISTENT_CODE_LOAD     (1)
 
-#define MICROPY_PY_ARRAY                 (1)
+#define MICROPY_PY_ARRAY                 (CIRCUITPY_ARRAY)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN    (1)
 #define MICROPY_PY_ATTRTUPLE             (1)
 
@@ -113,21 +114,30 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_PY_BUILTINS_STR_UNICODE  (1)
 
 #define MICROPY_PY_CMATH                 (0)
-#define MICROPY_PY_COLLECTIONS           (1)
+#define MICROPY_PY_COLLECTIONS           (CIRCUITPY_COLLECTIONS)
 #define MICROPY_PY_DESCRIPTORS           (1)
 #define MICROPY_PY_IO_FILEIO             (1)
 #define MICROPY_PY_GC                    (1)
 // Supplanted by shared-bindings/math
+#define MICROPY_PY_IO                    (CIRCUITPY_IO)
 #define MICROPY_PY_MATH                  (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO  (0)
 // Supplanted by shared-bindings/struct
 #define MICROPY_PY_STRUCT                (0)
-#define MICROPY_PY_SYS                   (1)
+#define MICROPY_PY_SYS                   (CIRCUITPY_SYS)
 #define MICROPY_PY_SYS_MAXSIZE           (1)
 #define MICROPY_PY_SYS_STDFILES          (1)
+// In extmod
+#define MICROPY_PY_UBINASCII             (CIRCUITPY_BINASCII)
+#define MICROPY_PY_UERRNO                (CIRCUITPY_ERRNO)
+// Uses about 80 bytes.
+#define MICROPY_PY_UERRNO_ERRORCODE      (CIRCUITPY_ERRNO)
 // Supplanted by shared-bindings/random
 #define MICROPY_PY_URANDOM               (0)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS   (0)
+// In extmod
+#define MICROPY_PY_UJSON                 (CIRCUITPY_JSON)
+#define MICROPY_PY_URE                   (CIRCUITPY_RE)
 #define MICROPY_PY___FILE__              (1)
 
 #define MICROPY_QSTR_BYTES_IN_HASH       (1)
@@ -349,26 +359,6 @@ typedef long mp_off_t;
 extern const struct _mp_obj_module_t nvm_module;
 #endif
 
-// Following modules are implemented in either extmod or py directory.
-
-#define MICROPY_PY_UBINASCII CIRCUITPY_BINASCII
-
-#define MICROPY_PY_UERRNO CIRCUITPY_ERRNO
-// Uses about 80 bytes.
-#define MICROPY_PY_UERRNO_ERRORCODE CIRCUITPY_ERRNO
-
-#define MICROPY_PY_URE CIRCUITPY_RE
-
-#if CIRCUITPY_JSON
-#define MICROPY_PY_UJSON (1)
-#define MICROPY_PY_IO (1)
-#else
-#ifndef MICROPY_PY_IO
-// We don't need MICROPY_PY_IO unless someone else wants it.
-#define MICROPY_PY_IO (0)
-#endif
-#endif
-
 #ifndef ULAB_SUPPORTS_COMPLEX
 #define ULAB_SUPPORTS_COMPLEX (0)
 #endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index fc270f2c59..96165997ce 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -26,6 +26,10 @@
 # Boards default to all modules enabled (with exceptions)
 # Manually disable by overriding in #mpconfigboard.mk
 
+# Always on. Present here to help generate documentation module support matrix for "builtins".
+CIRCUITPY = 1
+CFLAGS += -DCIRCUITPY=$(CIRCUITPY)
+
 # Smaller builds can be forced for resource constrained chips (typically SAMD21s
 # without external flash) by setting CIRCUITPY_FULL_BUILD=0. Avoid using this
 # for merely incomplete ports, as it changes settings in other files.
@@ -68,6 +72,9 @@ CFLAGS += -DCIRCUITPY_ANALOGBUFIO=$(CIRCUITPY_ANALOGBUFIO)
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
+CIRCUITPY_ARRAY ?= 1
+CFLAGS += -DCIRCUITPY_ARRAY=$(CIRCUITPY_ARRAY)
+
 CIRCUITPY_ATEXIT ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ATEXIT=$(CIRCUITPY_ATEXIT)
 
@@ -159,21 +166,18 @@ CFLAGS += -DCIRCUITPY_CAMERA=$(CIRCUITPY_CAMERA)
 CIRCUITPY_CANIO ?= 0
 CFLAGS += -DCIRCUITPY_CANIO=$(CIRCUITPY_CANIO)
 
+CIRCUITPY_COLLECTIONS ?= 1
+CFLAGS += -DCIRCUITPY_COLLECTIONS=$(CIRCUITPY_COLLECTIONS)
+
+CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 0
+CFLAGS += -DCIRCUITPY_COMPUTED_GOTO_SAVE_SPACE=$(CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE)
+
 CIRCUITPY_CYW43 ?= 0
 CFLAGS += -DCIRCUITPY_CYW43=$(CIRCUITPY_CYW43)
 
 CIRCUITPY_DIGITALIO ?= 1
 CFLAGS += -DCIRCUITPY_DIGITALIO=$(CIRCUITPY_DIGITALIO)
 
-CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 0
-CFLAGS += -DCIRCUITPY_COMPUTED_GOTO_SAVE_SPACE=$(CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE)
-
-CIRCUITPY_OPT_LOAD_ATTR_FAST_PATH ?= 1
-CFLAGS += -DCIRCUITPY_OPT_LOAD_ATTR_FAST_PATH=$(CIRCUITPY_OPT_LOAD_ATTR_FAST_PATH)
-
-CIRCUITPY_OPT_MAP_LOOKUP_CACHE ?= $(CIRCUITPY_FULL_BUILD)
-CFLAGS += -DCIRCUITPY_OPT_MAP_LOOKUP_CACHE=$(CIRCUITPY_OPT_MAP_LOOKUP_CACHE)
-
 CIRCUITPY_COUNTIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_COUNTIO=$(CIRCUITPY_COUNTIO)
 
@@ -257,6 +261,10 @@ CFLAGS += -DCIRCUITPY_I2CTARGET=$(CIRCUITPY_I2CTARGET)
 CIRCUITPY_IMAGECAPTURE ?= 0
 CFLAGS += -DCIRCUITPY_IMAGECAPTURE=$(CIRCUITPY_IMAGECAPTURE)
 
+# io - needed by JSON support
+CIRCUITPY_IO ?= $(CIRCUITPY_JSON)
+CFLAGS += -DCIRCUITPY_IO=$(CIRCUITPY_IO)
+
 CIRCUITPY_IPADDRESS ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)
 
@@ -293,6 +301,12 @@ CFLAGS += -DCIRCUITPY_NVM=$(CIRCUITPY_NVM)
 CIRCUITPY_ONEWIREIO ?= $(CIRCUITPY_BUSIO)
 CFLAGS += -DCIRCUITPY_ONEWIREIO=$(CIRCUITPY_ONEWIREIO)
 
+CIRCUITPY_OPT_LOAD_ATTR_FAST_PATH ?= 1
+CFLAGS += -DCIRCUITPY_OPT_LOAD_ATTR_FAST_PATH=$(CIRCUITPY_OPT_LOAD_ATTR_FAST_PATH)
+
+CIRCUITPY_OPT_MAP_LOOKUP_CACHE ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_OPT_MAP_LOOKUP_CACHE=$(CIRCUITPY_OPT_MAP_LOOKUP_CACHE)
+
 CIRCUITPY_OS ?= 1
 CFLAGS += -DCIRCUITPY_OS=$(CIRCUITPY_OS)
 
@@ -374,7 +388,6 @@ CFLAGS += -DCIRCUITPY_SOCKETPOOL=$(CIRCUITPY_SOCKETPOOL)
 CIRCUITPY_SSL ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_SSL=$(CIRCUITPY_SSL)
 
-# Currently always off.
 CIRCUITPY_STAGE ?= 0
 CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE)
 
@@ -393,6 +406,9 @@ CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR)
 CIRCUITPY_SYNTHIO ?= $(CIRCUITPY_AUDIOCORE)
 CFLAGS += -DCIRCUITPY_SYNTHIO=$(CIRCUITPY_SYNTHIO)
 
+CIRCUITPY_SYS ?= 1
+CFLAGS += -DCIRCUITPY_SYS=$(CIRCUITPY_SYS)
+
 CIRCUITPY_TERMINALIO ?= $(CIRCUITPY_DISPLAYIO)
 CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 5bacc74073..0ca0e09023 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -117,7 +117,7 @@ MP_PROPERTY_GETTER(analogio_analogin_value_obj,
 
 //|     reference_voltage: float
 //|     """The maximum voltage measurable (also known as the reference voltage) as a
-//|     `float` in Volts.  Note the ADC value may not scale to the actual voltage linearly
+//|     ``float`` in Volts.  Note the ADC value may not scale to the actual voltage linearly
 //|     at ends of the analog range."""
 //|
 STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) {
diff --git a/shared-bindings/support_matrix.rst b/shared-bindings/support_matrix.rst
index c54bfa94e1..3d5e544ea0 100644
--- a/shared-bindings/support_matrix.rst
+++ b/shared-bindings/support_matrix.rst
@@ -6,6 +6,11 @@ Module Support Matrix - Which Modules Are Available on Which Boards
 The following table lists the available built-in modules for each CircuitPython
 capable board, as well as each :term:`frozen module` included on it.
 
+You can filter this list by typing one or more module names or partial names into the search box.
+Only those boards that provide those modules will be listed.
+To exclude boards that provide a module, type a "-" in front of the module name.
+You can also type a regular expression as a filter.
+
 .. raw:: html
 
     
    (all)
    

From e064500411af38fa65c95dfc440ae084851669d3 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 4 Oct 2022 07:26:38 +0000
Subject: [PATCH 1120/2403] Translated using Weblate (Greek)

Currently translated at 18.5% (185 of 1000 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/el/
---
 locale/el.po | 210 +++++++++++++++++++++++++++------------------------
 1 file changed, 110 insertions(+), 100 deletions(-)

diff --git a/locale/el.po b/locale/el.po
index d6f5f7949e..e686dd9bfc 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -8,7 +8,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: 2022-10-03 13:20+0000\n"
+"PO-Revision-Date: 2022-10-05 12:23+0000\n"
 "Last-Translator: Bill Sideris \n"
 "Language-Team: none\n"
 "Language: el\n"
@@ -298,43 +298,43 @@ msgstr "'%s' περιμένει {r0, r1, ...}"
 #: py/emitinlinextensa.c
 #, c-format
 msgid "'%s' integer %d isn't within range %d..%d"
-msgstr ""
+msgstr "'%s' ακέραιος %d δεν είναι μέσα στο επιτρεπτό εύρος %d..%d"
 
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' integer 0x%x doesn't fit in mask 0x%x"
-msgstr ""
+msgstr "'%s' ακέραιος 0x%x δεν χωράει στην μάσκα 0x%x"
 
 #: py/obj.c
 #, c-format
 msgid "'%s' object doesn't support item assignment"
-msgstr ""
+msgstr "'%s' αντικείμενο δεν υποστηρίζει ορισμό πράγματος"
 
 #: py/obj.c
 #, c-format
 msgid "'%s' object doesn't support item deletion"
-msgstr ""
+msgstr "'%s' αντικείμενο δεν υποστηρίζει διαγραφή πράγματος"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
 msgid "'%s' object has no attribute '%q'"
-msgstr ""
+msgstr "'%s' αντικείμενο δεν έχει γνώρισμα '%q'"
 
 #: py/obj.c
 #, c-format
 msgid "'%s' object isn't subscriptable"
-msgstr ""
+msgstr "'%s' αντικείμενο δεν είναι subscriptable"
 
 #: py/objstr.c
 msgid "'=' alignment not allowed in string format specifier"
-msgstr ""
+msgstr "Ευθυγράμμιση του '=' δεν επιτρέπεται εντός προσδιοριστή string format"
 
 #: shared-module/struct/__init__.c
 msgid "'S' and 'O' are not supported format types"
-msgstr ""
+msgstr "'S' και 'O' δεν είναι υποστηριζόμενοι τύποι format"
 
 #: py/compile.c
 msgid "'align' requires 1 argument"
-msgstr ""
+msgstr "'align' απαιτεί τουλάχιστον ένα όρισμα"
 
 #: py/compile.c
 msgid "'await' outside function"
@@ -342,11 +342,11 @@ msgstr "'await' εκτός συνάρτησης"
 
 #: py/compile.c
 msgid "'await', 'async for' or 'async with' outside async function"
-msgstr ""
+msgstr "'await', 'async for' ή 'async with' εκτός ασύνχρονης συνάρτησης"
 
 #: py/compile.c
 msgid "'break' outside loop"
-msgstr ""
+msgstr "'break' εκτός επανάληψης"
 
 #: py/compile.c
 msgid "'continue' outside loop"
@@ -362,27 +362,27 @@ msgstr "'data' απαιτεί τουλάχιστον 2 παραμέτρους"
 
 #: py/compile.c
 msgid "'data' requires integer arguments"
-msgstr ""
+msgstr "'data' απαιτεί ακέραιες παραμέτρους"
 
 #: py/compile.c
 msgid "'label' requires 1 argument"
-msgstr ""
+msgstr "'label' απαιτεί ένα όρισμα"
 
 #: py/compile.c
 msgid "'return' outside function"
-msgstr ""
+msgstr "'return' εκτός συνάρτησης"
 
 #: py/compile.c
 msgid "'yield from' inside async function"
-msgstr ""
+msgstr "'yield from' εκτός ασύνχρονης συνάρτησης"
 
 #: py/compile.c
 msgid "'yield' outside function"
-msgstr ""
+msgstr "'yield' εκτός συνάρτησης"
 
 #: py/compile.c
 msgid "*x must be assignment target"
-msgstr ""
+msgstr "*x πρέπει να είναι στόχος ανάθεσης"
 
 #: py/obj.c
 msgid ", in %q\n"
@@ -397,8 +397,9 @@ msgid "3-arg pow() not supported"
 msgstr "pow() με 3 παραμέτρους δεν υποστηρίζεται"
 
 #: shared-module/msgpack/__init__.c
+#, fuzzy
 msgid "64 bit types"
-msgstr ""
+msgstr "64 bit τύποι"
 
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
@@ -467,7 +468,7 @@ msgstr "Όλα τα κανάλια συμβάντων συγχρονισμού 
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
-msgstr ""
+msgstr "Όλοι οι χρονιστές για αυτό το pin χρησιμοποιούνται ήδη"
 
 #: ports/atmel-samd/common-hal/_pew/PewPew.c
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -484,68 +485,68 @@ msgstr ""
 #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
 #: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
 msgid "All timers in use"
-msgstr ""
+msgstr "Όλοι οι χρονιστές βρίσκονται σε χρήση"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Already advertising."
-msgstr ""
+msgstr "Ήδη διαφημίζουμε."
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 msgid "Already have all-matches listener"
-msgstr ""
+msgstr "Ύπάρχει ήδη all-matches ακροατής"
 
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
-msgstr ""
+msgstr "Τρέχει ήδη"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
-msgstr ""
+msgstr "Ήδη γίνεται σάρωση για δίκτυα wifi"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
-msgstr ""
+msgstr "Και άλλο PWMAudioOut είναι σε χρήση"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseOut.c
 #: ports/cxd56/common-hal/pulseio/PulseOut.c
 msgid "Another send is already active"
-msgstr ""
+msgstr "Άλλη αποστολή είναι ήδη ενεργή"
 
 #: shared-bindings/pulseio/PulseOut.c
 msgid "Array must contain halfwords (type 'H')"
-msgstr ""
+msgstr "H παράταξη πρέπει να περιέχει halfwords (τύπου 'H')"
 
 #: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
-msgstr ""
+msgstr "Η τιμές της παράταξη πρέπει να είναι μονά bytes."
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "At most %d %q may be specified (not %d)"
-msgstr ""
+msgstr "Το πολύ %d %q μπορεί να είναι καθορισμένα (όχι %d)"
 
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
-msgstr ""
+msgstr "Προσπάθεια να δεσμευτούν %d blocks"
 
 #: supervisor/shared/safe_mode.c
 msgid "Attempted heap allocation when VM not running."
-msgstr ""
+msgstr "Προσπάθεια δέσμευσης heap όταν το VM δεν τρέχει."
 
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
-msgstr ""
+msgstr "Η μετατροπή ήχου δεν υποστηρίζεται"
 
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
-msgstr ""
+msgstr "AuthMode.OPEN δεν μπορεί να χρησιμοποιηθεί με κωδικό"
 
 #: shared-bindings/wifi/Radio.c supervisor/shared/web_workflow/web_workflow.c
 msgid "Authentication failure"
-msgstr ""
+msgstr "Αποτυχία αυθεντικοποίησης"
 
 #: main.c
 msgid "Auto-reload is off.\n"
@@ -561,93 +562,93 @@ msgstr ""
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "Baudrate not supported by peripheral"
-msgstr ""
+msgstr "Baudrate δεν υποστηρίζεται από την περιφεριακή συσκευή"
 
 #: shared-module/displayio/Display.c
 #: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Below minimum frame rate"
-msgstr ""
+msgstr "Χαμηλότερο από το ελάχιστο frame rate"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must be sequential pins"
-msgstr ""
+msgstr "Ρολόι bit και word select πρέπει να είναι διαδοχικά pins"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
-msgstr ""
+msgstr "Ρολόι bit και word select πρέπει να μοιράζονται μια μονάδα ρολογιού"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Bit depth must be multiple of 8."
-msgstr ""
+msgstr "Βάθος bit πρέπει να είναι πολλαπλάσιο του 8."
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Bitmap size and bits per value must match"
-msgstr ""
+msgstr "Το μέγεθος του bitmap και τα bits ανα τιμή πρέπει να ταιριάζουν"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first device (interface #0)."
-msgstr ""
+msgstr "Η συσκευή boot πρέπει να είναι η πρώτη συσκευή (interface #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
-msgstr ""
+msgstr "Και RX και TX απαιτούνται για έλεγχο flow"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
-msgstr ""
+msgstr "Και τα δύο pin πρέπει να υποστηρίζουν interrupts υλικού"
 
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 #: shared-bindings/is31fl3741/FrameBuffer.c
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "Brightness must be 0-1.0"
-msgstr ""
+msgstr "Η φωτινότητα πρέπει να είναι μεταξύ 0-1.0"
 
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Brightness not adjustable"
-msgstr ""
+msgstr "H φωτεινότητα δεν μπορεί να προσαρμοστεί"
 
 #: shared-bindings/_bleio/UUID.c
 #, c-format
 msgid "Buffer + offset too small %d %d %d"
-msgstr ""
+msgstr "Buffer + offset είναι πολύ μικρά %d %d %d"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
-msgstr ""
+msgstr "Στοιχεία του buffer πρέπει να είναι το πολύ 4 bytes"
 
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is not a bytearray."
-msgstr ""
+msgstr "Το buffer δεν είναι ένα bytearray."
 
 #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is too small"
-msgstr ""
+msgstr "Πολύ μικρό buffer"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
-msgstr ""
+msgstr "Το μήκος buffer %d είναι πολύ μεγάλο. Πρέπει ν α είναι λιγότερο απο %d"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
 msgid "Buffer length must be a multiple of 512"
-msgstr ""
+msgstr "Το μήκος buffer πρέπει να είναι πολλαπλάσιο του 512"
 
 #: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
 msgid "Buffer must be a multiple of 512 bytes"
-msgstr ""
+msgstr "Buffer πρέπει να είναι πολλαπλάσιο των 512 bytes"
 
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
-msgstr ""
+msgstr "Buffer πολύ μικρό κατα %d bytes"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
-msgstr ""
+msgstr "Τα Buffers πρέπει να είναι του ιδίου μεγέθους"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
@@ -655,218 +656,227 @@ msgstr ""
 #: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Bus pin %d is already in use"
-msgstr ""
+msgstr "Bus pin %d είναι ήδη σε χρήση"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
-msgstr ""
+msgstr "Byte buffer πρέπει να είναι 16 bytes."
 
 #: shared-bindings/aesio/aes.c
 msgid "CBC blocks must be multiples of 16 bytes"
-msgstr ""
+msgstr "CBC blocks πρέπει να είναι πολλαπλάσια του 16 bytes"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr ""
+msgstr "Ο CIRCUITPY δίσκος δεν μπόρεσε να βρεθεί ή να δημιουργηθεί."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
-msgstr ""
+msgstr "CRC ή checksum ήταν άκυρο"
 
 #: py/objtype.c
 msgid "Call super().__init__() before accessing native object."
-msgstr ""
+msgstr "Κλήση super().__init__() πρίν την πρόσβαση του τοπικού αντικειμένου."
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "Εκκίνηση κάμερας"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
-msgstr ""
+msgstr "Μόνο IO alarm ή RTC επιτρέπονται από βαθύ ύπνο."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on one low pin while others alarm high from deep sleep."
 msgstr ""
+"Μόνο ένα alarm από low pin ενώ τα άλλα alarm θα είναι απο high σε βαθύ ύπνο."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on two low pins from deep sleep."
-msgstr ""
+msgstr "Μπορεί να γίνει alarm μόνο σε δύο low pins σε βαθύ ύπνο."
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Characteristic.c
 msgid "Can't set CCCD on local Characteristic"
-msgstr ""
+msgstr "Δεν μπορεί να οριστεί CCCD σε τοπικό Characteristic"
 
 #: 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"
-msgstr ""
+msgstr "Δεν μπορούν να αλλάξουν οι USB συσκευές τώρα"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Cannot create a new Adapter; use _bleio.adapter;"
-msgstr ""
+msgstr "Δεν μπορεί να δημιουργηθεί νέο Adapter; χρησιμοποιείστε _bleio.adapter;"
 
 #: shared-bindings/displayio/Bitmap.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c
 msgid "Cannot delete values"
-msgstr ""
+msgstr "Δεν μπορούν να διαγραφούν οι τιμές"
 
 #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
 #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
 #: ports/nrf/common-hal/digitalio/DigitalInOut.c
 #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
 msgid "Cannot get pull while in output mode"
-msgstr ""
+msgstr "Δεν γίνεται να διαβαστεί το pull όσο είναι σε output mode"
 
 #: ports/nrf/common-hal/microcontroller/Processor.c
 msgid "Cannot get temperature"
-msgstr ""
+msgstr "Δεν μπορεί να διαβαστεί η θερμοκρασία"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Cannot have scan responses for extended, connectable advertisements."
 msgstr ""
+"Δεν μπορούμε να έχουμε απαντήσεις scan για εκτεταμένες, συνδεόμενες "
+"διαφημήσεις."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot pull on input-only pin."
-msgstr ""
+msgstr "Δεν γίνεται pull σε pin μόνο για εισόδο."
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Cannot record to a file"
-msgstr ""
+msgstr "Δεν μπορεί να γίνει καταγραφή σε αρχείο"
 
 #: shared-module/storage/__init__.c
 msgid "Cannot remount '/' when visible via USB."
-msgstr ""
+msgstr "Δεν μπορεί να γίνει remount του '/' όταν είναι ορατό μέσω USB."
 
 #: ports/atmel-samd/common-hal/microcontroller/__init__.c
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
 msgstr ""
+"Δεν μπορεί να γίνει επανεκκίνηση στον bootloader διότι δεν υπάρχει "
+"bootloader παρόν"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
-msgstr ""
+msgstr "Δεν μπορεί να γίνει ρύθμιση των επιλογών του socket"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Cannot set value when direction is input."
-msgstr ""
+msgstr "Δεν μπορεί να οριστεί τιμή οταν η κατεύθυνση είναι input."
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Cannot specify RTS or CTS in RS485 mode"
-msgstr ""
+msgstr "Δεν μπορεί να οριστεί RTS ή CTS σε RS485 mode"
 
 #: py/objslice.c
 msgid "Cannot subclass slice"
-msgstr ""
+msgstr "Δεν γίνεται υποκατηγορία ενός slice"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "Δεν μπορεί να γίνει μεταφορά χωρίς MOSI και MISO pins"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
 msgstr ""
+"Δεν μπορεί να γίνει δυναμική μεταβολή της συχνότητας σε έναν χρονιστή που "
+"είναι ήδη σε χρήση"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
-msgstr ""
+msgstr "Δεν γίνεται αφύπνηση σε pin edge, αλλά μόνο σε level"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
-msgstr ""
+msgstr "Δεν μπορεί να γίνει αφύπνηση σε pin edge. Μόνο level."
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
-msgstr ""
+msgstr "Δεν υποστηρίζονται εγγραφές στο CharacteristicBuffer"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython core code crashed hard. Whoops!\n"
-msgstr ""
+msgstr "Ο πυρήνας της CircuitPython κατέρευσε. Οουπς!\n"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
+msgstr "Η CircuitPython δεν μπορέσε να δεσμεύσει το heap."
 
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
-msgstr ""
+msgstr "Stretch ρολογιού πολύ μεγάλο"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Clock unit in use"
-msgstr ""
+msgstr "Μονάδα ρολογιού ήδη σε χρήση"
 
 #: shared-bindings/_bleio/Connection.c
 msgid ""
 "Connection has been disconnected and can no longer be used. Create a new "
 "connection."
 msgstr ""
+"Έχει γίνει αποσύνδεση και αυτή η συνδεση δεν μπορεί να χρησιμοποιηθεί. "
+"Δημιουργήστε μια νέα σύνδεση."
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
-msgstr ""
+msgstr "Κατεστραμένο .mpy αρχείο"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c
 msgid "Could not retrieve clock"
-msgstr ""
+msgstr "Δεν μπόρεσε να ανακληθεί το ρολόι"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
-msgstr ""
+msgstr "Δεν μπόρεσε να ρυθμιστεί η διεύθυνση"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
-msgstr ""
+msgstr "Δεν μπόρεσε να ξεκινήσει το PWM"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "Could not start interrupt, RX busy"
-msgstr ""
+msgstr "Δεν μπόρεσε να εκκινηθεί το interrupt, RX κατειλημμένο"
 
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Couldn't allocate decoder"
-msgstr ""
+msgstr "Δεν μπόρεσε να δεσμευτεί decoder"
 
 #: supervisor/shared/safe_mode.c
 msgid "Crash into the HardFault_Handler."
-msgstr ""
+msgstr "Κατέρευσε μέσα στο HardFault_Handler."
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
-msgstr ""
+msgstr "Σφάλμα εκκίνησης καναλιού DAC"
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Device Init Error"
-msgstr ""
+msgstr "Σφάλμα εκκίνησης συσκευής DAC"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "DAC already in use"
-msgstr ""
+msgstr "DAC είναι ήδη σε χρήση"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
 msgid "Data 0 pin must be byte aligned"
-msgstr ""
+msgstr "Το Data 0 pin πρέπει να είναι byte aligned"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Data chunk must follow fmt chunk"
-msgstr ""
+msgstr "Το data chunk πρέπει να ακολουθεί το fmt chunk"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data not supported with directed advertising"
-msgstr ""
+msgstr "Δεν υποστηρίζονται δεδομένα με κατευθυνόμενη διαφήμιση"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
-msgstr ""
+msgstr "Τα δεδομένα είναι πολύ μεγάλα για πακέτο διαφημίσεων"
 
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Deep sleep pins must use a rising edge with pulldown"
-msgstr ""
+msgstr "Τα pins βαθύ ύπνου πρέπει να χρησιμοποιούν rising edge με pulldown"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Destination capacity is smaller than destination_length."

From 2bd50673b6467e8b48b5858ee68d3081d7e5698d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 09:55:48 -0500
Subject: [PATCH 1121/2403] Finish adapting flash storage size

Before this, CIRCUITPY would start at 1MB anyway. This appeared to work
only because I hadn't checked the actual size of the CIRCUITPY drive,
and because until now the flash hadn't actually crossed that 1MB
boundary into CIRCUITPY storage.

WARNING: on pico_w, upgrading/downgrading CircuitPython across this commit
boundary will erase the CIRCUITPY filesystem. After this commit,
switching between pico and pico_w firmware will erase the CIRCUITPY
filesystem
---
 .../boards/raspberry_pi_pico_w/mpconfigboard.mk           | 2 ++
 ports/raspberrypi/supervisor/internal_flash.c             | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 2b114b3954..a8938b2623 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -19,3 +19,5 @@ CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+# Must be accompanied by a linker script change
+CFLAGS += -DRESERVED_FLASH='(1792 * 1024)'
diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c
index c128cb74b2..d2d80b40ad 100644
--- a/ports/raspberrypi/supervisor/internal_flash.c
+++ b/ports/raspberrypi/supervisor/internal_flash.c
@@ -46,7 +46,13 @@
 #include "src/rp2_common/hardware_flash/include/hardware/flash.h"
 #include "src/common/pico_binary_info/include/pico/binary_info.h"
 
+#if !defined(RESERVED_FLASH)
 #define RESERVED_FLASH (1 * 1024 * 1024)
+#endif
+
+#if !defined(TOTAL_FLASH_MINIMUM)
+#define TOTAL_FLASH_MINIMUM (2 * 1024 * 1024)
+#endif
 
 // TODO: Split the caching out of supervisor/shared/external_flash so we can use it.
 #define SECTOR_SIZE 4096
@@ -60,7 +66,7 @@ void supervisor_flash_init(void) {
         BINARY_INFO_MAKE_TAG('C', 'P'),
         "CircuitPython",
         RESERVED_FLASH,
-        (1 * 1024 * 1024), // This is a minimum. We can't set it dynamically.
+        TOTAL_FLASH_MINIMUM - RESERVED_FLASH, // This is a minimum. We can't set it dynamically.
         NULL,
         BINARY_INFO_BLOCK_DEV_FLAG_READ |
         BINARY_INFO_BLOCK_DEV_FLAG_WRITE |

From 1d25049a7a9e66fafc8b715d96a2f655e28e9fe9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Sep 2022 16:27:20 -0500
Subject: [PATCH 1122/2403] add mbedtls matching micropython @
 v1.19.1-451-gbdbc44474

---
 .gitmodules                             |   3 +
 .pre-commit-config.yaml                 |   2 +-
 lib/mbedtls                             |   1 +
 lib/mbedtls_errors/README.md            |  42 ++
 lib/mbedtls_errors/do-esp32.sh          |   7 +
 lib/mbedtls_errors/do-mp.sh             |   4 +
 lib/mbedtls_errors/do-test.sh           |   4 +
 lib/mbedtls_errors/error.fmt            | 165 ++++++
 lib/mbedtls_errors/generate_errors.diff |  22 +
 lib/mbedtls_errors/mp_mbedtls_errors.c  | 705 ++++++++++++++++++++++++
 lib/mbedtls_errors/tester.c             |  58 ++
 11 files changed, 1012 insertions(+), 1 deletion(-)
 create mode 160000 lib/mbedtls
 create mode 100644 lib/mbedtls_errors/README.md
 create mode 100755 lib/mbedtls_errors/do-esp32.sh
 create mode 100755 lib/mbedtls_errors/do-mp.sh
 create mode 100755 lib/mbedtls_errors/do-test.sh
 create mode 100644 lib/mbedtls_errors/error.fmt
 create mode 100644 lib/mbedtls_errors/generate_errors.diff
 create mode 100644 lib/mbedtls_errors/mp_mbedtls_errors.c
 create mode 100644 lib/mbedtls_errors/tester.c

diff --git a/.gitmodules b/.gitmodules
index 875b03dab8..91701637f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -316,3 +316,6 @@
 [submodule "ports/raspberrypi/lib/lwip"]
 	path = ports/raspberrypi/lib/lwip
 	url = https://github.com/lwip-tcpip/lwip.git
+[submodule "lib/mbedtls"]
+	path = lib/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bcf7f8da2b..1905b233cf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
     -   id: end-of-file-fixer
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
 -   repo: local
     hooks:
     -   id: translations
diff --git a/lib/mbedtls b/lib/mbedtls
new file mode 160000
index 0000000000..1bc2c9cb8b
--- /dev/null
+++ b/lib/mbedtls
@@ -0,0 +1 @@
+Subproject commit 1bc2c9cb8b8fe4659bd94b8ebba5a4c02029b7fa
diff --git a/lib/mbedtls_errors/README.md b/lib/mbedtls_errors/README.md
new file mode 100644
index 0000000000..0e13021eb1
--- /dev/null
+++ b/lib/mbedtls_errors/README.md
@@ -0,0 +1,42 @@
+MBEDTLS Error Strings for MicroPython
+=====================================
+
+This directory contains source code and tools to rework the Mbedtls error strings for
+micropython to use less space. In short, instead of storing and printing something like
+"SSL - Our own certificate(s) is/are too large to send in an SSL message" it prints
+the name of the error #define, which would be "MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE" in
+this case, and only stores `SSL_CERTIFICATE_TOO_LARGE` in flash. The exact Mbedtls error
+defines are used because they're easy to search for to find more detailed information.
+
+Mbedtls defines a specific format for error value #defines and
+includes a Perl script to gather all `MBEDTLS_ERR` defines from includes files together with
+english error text. From that the Perl script generates `mbedtls_strerror()`. The files in this
+directory modify this process to produce a more space efficient error lookup table with
+shorter error strings.
+
+The files are as follows:
+- `generate_errors.diff` - diff for original mbedtls perl script
+- `error.fmt` - modified code template for MicroPython
+- `mp_mbedtls_errors.c` - source file with `mbedtls_strerror` this is built using the include
+  files in `../mbedtls`
+- `do-mp.sh` - shell script to produce `mp_mbedtls_errors.c`
+- `tester.c` - simple C main to test `mp_mbedtls_errors.c` locally on a dev box
+- `do-test.sh` - shell script to produce `mp_mbedtls_errors.c` and compile the `tester` app
+- `do-esp32.sh` - shell script to produce `esp32_mbedtls_errors.c` -- see below
+
+In order not to store multiple copies of `mbedtls_errors.c`
+([https://github.com/micropython/micropython/pull/5819#discussion_r445528006](see))
+it is assumed that all ports use the same version of mbedtls with the same error #defines.
+This is true as of MP v1.13, and ESP-IDF versions 3.3.2 and 4.0.1. If anything changes in the
+future the `do-esp32.sh` script can be used to generate an esp32-specific version.
+
+### How-to
+
+- To build MicroPython all that is needed is to include the `mp_mbedtls_errors.c` into the build
+  (the Makefiles do this automatically). Note that Perl is not needed for routine MicroPython
+  builds.
+- When a new version of Mbedtls is pulled-in the `do-mp.sh` script should be run to
+  re-generate `mp_mbedtls_errors.c`.
+- The `tester` app should be run if changes to the string handling in `error.fmt` are made:
+  it tests that there is not an off-by-one error in the string copying/appending, etc.
+- To include `mbedtls_strerror` error strings define `MBEDTLS_ERROR_C` in the build.
diff --git a/lib/mbedtls_errors/do-esp32.sh b/lib/mbedtls_errors/do-esp32.sh
new file mode 100755
index 0000000000..6fd4682415
--- /dev/null
+++ b/lib/mbedtls_errors/do-esp32.sh
@@ -0,0 +1,7 @@
+#! /bin/bash -e
+# Generate esp32_mbedtls_errors.c for use in the Esp32 port, with the ESP-IDF version of mbedtls
+# The IDF_PATH env var must be set to the top-level dir of ESPIDF
+echo "IDF_PATH=$IDF_PATH"
+MBEDTLS=$IDF_PATH/components/mbedtls/mbedtls
+patch -o esp32_generate_errors.pl $MBEDTLS/scripts/generate_errors.pl 
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#define mbedtls_time_t   time_t
+#endif
+
+#if defined(MBEDTLS_ERROR_C)
+
+#include 
+
+HEADER_INCLUDED
+
+// Error code table type
+struct ssl_errs {
+    int16_t errnum;
+    const char *errstr;
+};
+
+// Table of high level error codes
+static const struct ssl_errs mbedtls_high_level_error_tab[] = {
+// BEGIN generated code
+HIGH_LEVEL_CODE_CHECKS
+// END generated code
+};
+
+static const struct ssl_errs mbedtls_low_level_error_tab[] = {
+// Low level error codes
+//
+// BEGIN generated code
+LOW_LEVEL_CODE_CHECKS
+// END generated code
+};
+
+static const char *mbedtls_err_prefix = "MBEDTLS_ERR_";
+#define MBEDTLS_ERR_PREFIX_LEN ( sizeof("MBEDTLS_ERR_")-1 )
+
+// copy error text into buffer, ensure null termination, return strlen of result
+static size_t mbedtls_err_to_str(int err, const struct ssl_errs tab[], int tab_len, char *buf, size_t buflen) {
+    if (buflen == 0) return 0;
+
+    // prefix for all error names
+    strncpy(buf, mbedtls_err_prefix, buflen);
+    if (buflen <= MBEDTLS_ERR_PREFIX_LEN+1) {
+        buf[buflen-1] = 0;
+        return buflen-1;
+    }
+
+    // append error name from table
+    for (int i = 0; i < tab_len; i++) {
+        if (tab[i].errnum == err) {
+            strncpy(buf+MBEDTLS_ERR_PREFIX_LEN, tab[i].errstr, buflen-MBEDTLS_ERR_PREFIX_LEN);
+            buf[buflen-1] = 0;
+            return strlen(buf);
+        }
+    }
+
+    mbedtls_snprintf(buf+MBEDTLS_ERR_PREFIX_LEN, buflen-MBEDTLS_ERR_PREFIX_LEN, "UNKNOWN (0x%04X)",
+            err);
+    return strlen(buf);
+}
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
+    int use_ret;
+
+    if (buflen == 0) return;
+
+    buf[buflen-1] = 0;
+
+    if (ret < 0) ret = -ret;
+
+    //
+    // High-level error codes
+    //
+    uint8_t got_hl = (ret & 0xFF80) != 0;
+    if (got_hl) {
+        use_ret = ret & 0xFF80;
+
+        // special case
+#if defined(MBEDTLS_SSL_TLS_C)
+        if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
+            strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
+            buf[buflen-1] = 0;
+            return;
+        }
+#endif
+
+        size_t len = mbedtls_err_to_str(use_ret, mbedtls_high_level_error_tab,
+                ARRAY_SIZE(mbedtls_high_level_error_tab), buf, buflen);
+
+        buf += len;
+        buflen -= len;
+        if (buflen == 0) return;
+    }
+
+    //
+    // Low-level error codes
+    //
+    use_ret = ret & ~0xFF80;
+
+    if (use_ret == 0) return;
+
+    // If high level code is present, make a concatenation between both error strings.
+    if (got_hl) {
+        if (buflen < 2) return;
+        *buf++ = '+';
+        buflen--;
+    }
+
+    mbedtls_err_to_str(use_ret, mbedtls_low_level_error_tab,
+            ARRAY_SIZE(mbedtls_low_level_error_tab), buf, buflen);
+}
+
+#else /* MBEDTLS_ERROR_C */
+
+#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+
+/*
+ * Provide an non-function in case MBEDTLS_ERROR_C is not defined
+ */
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    ((void) ret);
+
+    if( buflen > 0 )
+        buf[0] = '\0';
+}
+
+#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
+
+#endif /* MBEDTLS_ERROR_C */
diff --git a/lib/mbedtls_errors/generate_errors.diff b/lib/mbedtls_errors/generate_errors.diff
new file mode 100644
index 0000000000..ad24c372fa
--- /dev/null
+++ b/lib/mbedtls_errors/generate_errors.diff
@@ -0,0 +1,22 @@
+--- generate_errors_orig.pl	2020-06-20 08:40:38.819060379 -0700
++++ generate_errors.pl	2020-06-20 08:47:26.511163591 -0700
+@@ -162,16 +162,12 @@
+ 
+     if ($error_name eq "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE")
+     {
+-        ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
+-                          "${white_space}\{\n".
+-                          "${white_space}    mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n".
+-                          "${white_space}    return;\n".
+-                          "${white_space}}\n"
++        # no-op, this case is hard-coded in error.fmt
+     }
+     else
+     {
+-        ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
+-                          "${white_space}    mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n"
++         my $error_text = $error_name =~ s/^MBEDTLS_ERR_//r;
++         ${$code_check} .= "${white_space}{ -($error_name), \"$error_text\" },\n"
+     }
+ };
+ 
diff --git a/lib/mbedtls_errors/mp_mbedtls_errors.c b/lib/mbedtls_errors/mp_mbedtls_errors.c
new file mode 100644
index 0000000000..03a91f0dc9
--- /dev/null
+++ b/lib/mbedtls_errors/mp_mbedtls_errors.c
@@ -0,0 +1,705 @@
+/*
+ *  Error message information
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+#include "mbedtls/error.h"
+#include 
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#define mbedtls_time_t   time_t
+#endif
+
+#if defined(MBEDTLS_ERROR_C)
+
+#include 
+
+#if defined(MBEDTLS_AES_C)
+#include "mbedtls/aes.h"
+#endif
+
+#if defined(MBEDTLS_ARC4_C)
+#include "mbedtls/arc4.h"
+#endif
+
+#if defined(MBEDTLS_ARIA_C)
+#include "mbedtls/aria.h"
+#endif
+
+#if defined(MBEDTLS_BASE64_C)
+#include "mbedtls/base64.h"
+#endif
+
+#if defined(MBEDTLS_BIGNUM_C)
+#include "mbedtls/bignum.h"
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+#include "mbedtls/blowfish.h"
+#endif
+
+#if defined(MBEDTLS_CAMELLIA_C)
+#include "mbedtls/camellia.h"
+#endif
+
+#if defined(MBEDTLS_CCM_C)
+#include "mbedtls/ccm.h"
+#endif
+
+#if defined(MBEDTLS_CHACHA20_C)
+#include "mbedtls/chacha20.h"
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+#include "mbedtls/chachapoly.h"
+#endif
+
+#if defined(MBEDTLS_CIPHER_C)
+#include "mbedtls/cipher.h"
+#endif
+
+#if defined(MBEDTLS_CMAC_C)
+#include "mbedtls/cmac.h"
+#endif
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+#include "mbedtls/ctr_drbg.h"
+#endif
+
+#if defined(MBEDTLS_DES_C)
+#include "mbedtls/des.h"
+#endif
+
+#if defined(MBEDTLS_DHM_C)
+#include "mbedtls/dhm.h"
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+
+#if defined(MBEDTLS_ENTROPY_C)
+#include "mbedtls/entropy.h"
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+#include "mbedtls/gcm.h"
+#endif
+
+#if defined(MBEDTLS_HKDF_C)
+#include "mbedtls/hkdf.h"
+#endif
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+#include "mbedtls/hmac_drbg.h"
+#endif
+
+#if defined(MBEDTLS_MD_C)
+#include "mbedtls/md.h"
+#endif
+
+#if defined(MBEDTLS_MD2_C)
+#include "mbedtls/md2.h"
+#endif
+
+#if defined(MBEDTLS_MD4_C)
+#include "mbedtls/md4.h"
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+#include "mbedtls/md5.h"
+#endif
+
+#if defined(MBEDTLS_NET_C)
+#include "mbedtls/net_sockets.h"
+#endif
+
+#if defined(MBEDTLS_OID_C)
+#include "mbedtls/oid.h"
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C)
+#include "mbedtls/padlock.h"
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PK_C)
+#include "mbedtls/pk.h"
+#endif
+
+#if defined(MBEDTLS_PKCS12_C)
+#include "mbedtls/pkcs12.h"
+#endif
+
+#if defined(MBEDTLS_PKCS5_C)
+#include "mbedtls/pkcs5.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#endif
+
+#if defined(MBEDTLS_POLY1305_C)
+#include "mbedtls/poly1305.h"
+#endif
+
+#if defined(MBEDTLS_RIPEMD160_C)
+#include "mbedtls/ripemd160.h"
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+
+#if defined(MBEDTLS_SHA1_C)
+#include "mbedtls/sha1.h"
+#endif
+
+#if defined(MBEDTLS_SHA256_C)
+#include "mbedtls/sha256.h"
+#endif
+
+#if defined(MBEDTLS_SHA512_C)
+#include "mbedtls/sha512.h"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C)
+#include "mbedtls/ssl.h"
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+#include "mbedtls/threading.h"
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+#include "mbedtls/x509.h"
+#endif
+
+#if defined(MBEDTLS_XTEA_C)
+#include "mbedtls/xtea.h"
+#endif
+
+
+// Error code table type
+struct ssl_errs {
+    int16_t errnum;
+    const char *errstr;
+};
+
+// Table of high level error codes
+static const struct ssl_errs mbedtls_high_level_error_tab[] = {
+// BEGIN generated code
+#if defined(MBEDTLS_CIPHER_C)
+        { -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE), "CIPHER_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA), "CIPHER_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED), "CIPHER_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_CIPHER_INVALID_PADDING), "CIPHER_INVALID_PADDING" },
+        { -(MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED), "CIPHER_FULL_BLOCK_EXPECTED" },
+        { -(MBEDTLS_ERR_CIPHER_AUTH_FAILED), "CIPHER_AUTH_FAILED" },
+        { -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT), "CIPHER_INVALID_CONTEXT" },
+        { -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED), "CIPHER_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CIPHER_C */
+
+#if defined(MBEDTLS_DHM_C)
+        { -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA), "DHM_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED), "DHM_READ_PARAMS_FAILED" },
+        { -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED), "DHM_MAKE_PARAMS_FAILED" },
+        { -(MBEDTLS_ERR_DHM_READ_PUBLIC_FAILED), "DHM_READ_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_MAKE_PUBLIC_FAILED), "DHM_MAKE_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_CALC_SECRET_FAILED), "DHM_CALC_SECRET_FAILED" },
+        { -(MBEDTLS_ERR_DHM_INVALID_FORMAT), "DHM_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_DHM_ALLOC_FAILED), "DHM_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_FILE_IO_ERROR), "DHM_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED), "DHM_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED), "DHM_SET_GROUP_FAILED" },
+#endif /* MBEDTLS_DHM_C */
+
+#if defined(MBEDTLS_ECP_C)
+        { -(MBEDTLS_ERR_ECP_BAD_INPUT_DATA), "ECP_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL), "ECP_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE), "ECP_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_ECP_VERIFY_FAILED), "ECP_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_ECP_ALLOC_FAILED), "ECP_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_ECP_RANDOM_FAILED), "ECP_RANDOM_FAILED" },
+        { -(MBEDTLS_ERR_ECP_INVALID_KEY), "ECP_INVALID_KEY" },
+        { -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH), "ECP_SIG_LEN_MISMATCH" },
+        { -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED), "ECP_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_ECP_IN_PROGRESS), "ECP_IN_PROGRESS" },
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_MD_C)
+        { -(MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE), "MD_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_MD_BAD_INPUT_DATA), "MD_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_MD_ALLOC_FAILED), "MD_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_MD_FILE_IO_ERROR), "MD_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED), "MD_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD_C */
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+        { -(MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT), "PEM_NO_HEADER_FOOTER_PRESENT" },
+        { -(MBEDTLS_ERR_PEM_INVALID_DATA), "PEM_INVALID_DATA" },
+        { -(MBEDTLS_ERR_PEM_ALLOC_FAILED), "PEM_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PEM_INVALID_ENC_IV), "PEM_INVALID_ENC_IV" },
+        { -(MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG), "PEM_UNKNOWN_ENC_ALG" },
+        { -(MBEDTLS_ERR_PEM_PASSWORD_REQUIRED), "PEM_PASSWORD_REQUIRED" },
+        { -(MBEDTLS_ERR_PEM_PASSWORD_MISMATCH), "PEM_PASSWORD_MISMATCH" },
+        { -(MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE), "PEM_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PEM_BAD_INPUT_DATA), "PEM_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
+
+#if defined(MBEDTLS_PK_C)
+        { -(MBEDTLS_ERR_PK_ALLOC_FAILED), "PK_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PK_TYPE_MISMATCH), "PK_TYPE_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_BAD_INPUT_DATA), "PK_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PK_FILE_IO_ERROR), "PK_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_PK_KEY_INVALID_VERSION), "PK_KEY_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT), "PK_KEY_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PK_UNKNOWN_PK_ALG), "PK_UNKNOWN_PK_ALG" },
+        { -(MBEDTLS_ERR_PK_PASSWORD_REQUIRED), "PK_PASSWORD_REQUIRED" },
+        { -(MBEDTLS_ERR_PK_PASSWORD_MISMATCH), "PK_PASSWORD_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_INVALID_PUBKEY), "PK_INVALID_PUBKEY" },
+        { -(MBEDTLS_ERR_PK_INVALID_ALG), "PK_INVALID_ALG" },
+        { -(MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE), "PK_UNKNOWN_NAMED_CURVE" },
+        { -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE), "PK_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH), "PK_SIG_LEN_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED), "PK_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_PK_C */
+
+#if defined(MBEDTLS_PKCS12_C)
+        { -(MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA), "PKCS12_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE), "PKCS12_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT), "PKCS12_PBE_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH), "PKCS12_PASSWORD_MISMATCH" },
+#endif /* MBEDTLS_PKCS12_C */
+
+#if defined(MBEDTLS_PKCS5_C)
+        { -(MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA), "PKCS5_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS5_INVALID_FORMAT), "PKCS5_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE), "PKCS5_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH), "PKCS5_PASSWORD_MISMATCH" },
+#endif /* MBEDTLS_PKCS5_C */
+
+#if defined(MBEDTLS_RSA_C)
+        { -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA), "RSA_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_RSA_INVALID_PADDING), "RSA_INVALID_PADDING" },
+        { -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED), "RSA_KEY_GEN_FAILED" },
+        { -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED), "RSA_KEY_CHECK_FAILED" },
+        { -(MBEDTLS_ERR_RSA_PUBLIC_FAILED), "RSA_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_RSA_PRIVATE_FAILED), "RSA_PRIVATE_FAILED" },
+        { -(MBEDTLS_ERR_RSA_VERIFY_FAILED), "RSA_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE), "RSA_OUTPUT_TOO_LARGE" },
+        { -(MBEDTLS_ERR_RSA_RNG_FAILED), "RSA_RNG_FAILED" },
+        { -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION), "RSA_UNSUPPORTED_OPERATION" },
+        { -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED), "RSA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SSL_TLS_C)
+        { -(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE), "SSL_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_SSL_BAD_INPUT_DATA), "SSL_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_SSL_INVALID_MAC), "SSL_INVALID_MAC" },
+        { -(MBEDTLS_ERR_SSL_INVALID_RECORD), "SSL_INVALID_RECORD" },
+        { -(MBEDTLS_ERR_SSL_CONN_EOF), "SSL_CONN_EOF" },
+        { -(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER), "SSL_UNKNOWN_CIPHER" },
+        { -(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN), "SSL_NO_CIPHER_CHOSEN" },
+        { -(MBEDTLS_ERR_SSL_NO_RNG), "SSL_NO_RNG" },
+        { -(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE), "SSL_NO_CLIENT_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE), "SSL_CERTIFICATE_TOO_LARGE" },
+        { -(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED), "SSL_CERTIFICATE_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED), "SSL_PRIVATE_KEY_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED), "SSL_CA_CHAIN_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE), "SSL_UNEXPECTED_MESSAGE" },
+        { -(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED), "SSL_PEER_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY), "SSL_PEER_CLOSE_NOTIFY" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO), "SSL_BAD_HS_CLIENT_HELLO" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO), "SSL_BAD_HS_SERVER_HELLO" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE), "SSL_BAD_HS_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST), "SSL_BAD_HS_CERTIFICATE_REQUEST" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE), "SSL_BAD_HS_SERVER_KEY_EXCHANGE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE), "SSL_BAD_HS_SERVER_HELLO_DONE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY), "SSL_BAD_HS_CERTIFICATE_VERIFY" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC), "SSL_BAD_HS_CHANGE_CIPHER_SPEC" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_FINISHED), "SSL_BAD_HS_FINISHED" },
+        { -(MBEDTLS_ERR_SSL_ALLOC_FAILED), "SSL_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED), "SSL_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH), "SSL_HW_ACCEL_FALLTHROUGH" },
+        { -(MBEDTLS_ERR_SSL_COMPRESSION_FAILED), "SSL_COMPRESSION_FAILED" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION), "SSL_BAD_HS_PROTOCOL_VERSION" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET), "SSL_BAD_HS_NEW_SESSION_TICKET" },
+        { -(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED), "SSL_SESSION_TICKET_EXPIRED" },
+        { -(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH), "SSL_PK_TYPE_MISMATCH" },
+        { -(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY), "SSL_UNKNOWN_IDENTITY" },
+        { -(MBEDTLS_ERR_SSL_INTERNAL_ERROR), "SSL_INTERNAL_ERROR" },
+        { -(MBEDTLS_ERR_SSL_COUNTER_WRAPPING), "SSL_COUNTER_WRAPPING" },
+        { -(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO), "SSL_WAITING_SERVER_HELLO_RENEGO" },
+        { -(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED), "SSL_HELLO_VERIFY_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL), "SSL_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE), "SSL_NO_USABLE_CIPHERSUITE" },
+        { -(MBEDTLS_ERR_SSL_WANT_READ), "SSL_WANT_READ" },
+        { -(MBEDTLS_ERR_SSL_WANT_WRITE), "SSL_WANT_WRITE" },
+        { -(MBEDTLS_ERR_SSL_TIMEOUT), "SSL_TIMEOUT" },
+        { -(MBEDTLS_ERR_SSL_CLIENT_RECONNECT), "SSL_CLIENT_RECONNECT" },
+        { -(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD), "SSL_UNEXPECTED_RECORD" },
+        { -(MBEDTLS_ERR_SSL_NON_FATAL), "SSL_NON_FATAL" },
+        { -(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH), "SSL_INVALID_VERIFY_HASH" },
+        { -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING), "SSL_CONTINUE_PROCESSING" },
+        { -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS), "SSL_ASYNC_IN_PROGRESS" },
+        { -(MBEDTLS_ERR_SSL_EARLY_MESSAGE), "SSL_EARLY_MESSAGE" },
+        { -(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
+#endif /* MBEDTLS_SSL_TLS_C */
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+        { -(MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE), "X509_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_OID), "X509_UNKNOWN_OID" },
+        { -(MBEDTLS_ERR_X509_INVALID_FORMAT), "X509_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_X509_INVALID_VERSION), "X509_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_X509_INVALID_SERIAL), "X509_INVALID_SERIAL" },
+        { -(MBEDTLS_ERR_X509_INVALID_ALG), "X509_INVALID_ALG" },
+        { -(MBEDTLS_ERR_X509_INVALID_NAME), "X509_INVALID_NAME" },
+        { -(MBEDTLS_ERR_X509_INVALID_DATE), "X509_INVALID_DATE" },
+        { -(MBEDTLS_ERR_X509_INVALID_SIGNATURE), "X509_INVALID_SIGNATURE" },
+        { -(MBEDTLS_ERR_X509_INVALID_EXTENSIONS), "X509_INVALID_EXTENSIONS" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_VERSION), "X509_UNKNOWN_VERSION" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG), "X509_UNKNOWN_SIG_ALG" },
+        { -(MBEDTLS_ERR_X509_SIG_MISMATCH), "X509_SIG_MISMATCH" },
+        { -(MBEDTLS_ERR_X509_CERT_VERIFY_FAILED), "X509_CERT_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT), "X509_CERT_UNKNOWN_FORMAT" },
+        { -(MBEDTLS_ERR_X509_BAD_INPUT_DATA), "X509_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_X509_ALLOC_FAILED), "X509_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_X509_FILE_IO_ERROR), "X509_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_X509_BUFFER_TOO_SMALL), "X509_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_X509_FATAL_ERROR), "X509_FATAL_ERROR" },
+#endif /* MBEDTLS_X509_USE_C || MBEDTLS_X509_CREATE_C */
+// END generated code
+};
+
+static const struct ssl_errs mbedtls_low_level_error_tab[] = {
+// Low level error codes
+//
+// BEGIN generated code
+#if defined(MBEDTLS_AES_C)
+    { -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH), "AES_INVALID_KEY_LENGTH" },
+    { -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH), "AES_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_AES_BAD_INPUT_DATA), "AES_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE), "AES_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED), "AES_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_ARC4_C)
+    { -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED), "ARC4_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_ARC4_C */
+
+#if defined(MBEDTLS_ARIA_C)
+    { -(MBEDTLS_ERR_ARIA_BAD_INPUT_DATA), "ARIA_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH), "ARIA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE), "ARIA_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED), "ARIA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_ARIA_C */
+
+#if defined(MBEDTLS_ASN1_PARSE_C)
+    { -(MBEDTLS_ERR_ASN1_OUT_OF_DATA), "ASN1_OUT_OF_DATA" },
+    { -(MBEDTLS_ERR_ASN1_UNEXPECTED_TAG), "ASN1_UNEXPECTED_TAG" },
+    { -(MBEDTLS_ERR_ASN1_INVALID_LENGTH), "ASN1_INVALID_LENGTH" },
+    { -(MBEDTLS_ERR_ASN1_LENGTH_MISMATCH), "ASN1_LENGTH_MISMATCH" },
+    { -(MBEDTLS_ERR_ASN1_INVALID_DATA), "ASN1_INVALID_DATA" },
+    { -(MBEDTLS_ERR_ASN1_ALLOC_FAILED), "ASN1_ALLOC_FAILED" },
+    { -(MBEDTLS_ERR_ASN1_BUF_TOO_SMALL), "ASN1_BUF_TOO_SMALL" },
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
+#if defined(MBEDTLS_BASE64_C)
+    { -(MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL), "BASE64_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_BASE64_INVALID_CHARACTER), "BASE64_INVALID_CHARACTER" },
+#endif /* MBEDTLS_BASE64_C */
+
+#if defined(MBEDTLS_BIGNUM_C)
+    { -(MBEDTLS_ERR_MPI_FILE_IO_ERROR), "MPI_FILE_IO_ERROR" },
+    { -(MBEDTLS_ERR_MPI_BAD_INPUT_DATA), "MPI_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_MPI_INVALID_CHARACTER), "MPI_INVALID_CHARACTER" },
+    { -(MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL), "MPI_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_MPI_NEGATIVE_VALUE), "MPI_NEGATIVE_VALUE" },
+    { -(MBEDTLS_ERR_MPI_DIVISION_BY_ZERO), "MPI_DIVISION_BY_ZERO" },
+    { -(MBEDTLS_ERR_MPI_NOT_ACCEPTABLE), "MPI_NOT_ACCEPTABLE" },
+    { -(MBEDTLS_ERR_MPI_ALLOC_FAILED), "MPI_ALLOC_FAILED" },
+#endif /* MBEDTLS_BIGNUM_C */
+
+#if defined(MBEDTLS_BLOWFISH_C)
+    { -(MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA), "BLOWFISH_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH), "BLOWFISH_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED), "BLOWFISH_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_BLOWFISH_C */
+
+#if defined(MBEDTLS_CAMELLIA_C)
+    { -(MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA), "CAMELLIA_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH), "CAMELLIA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED), "CAMELLIA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CAMELLIA_C */
+
+#if defined(MBEDTLS_CCM_C)
+    { -(MBEDTLS_ERR_CCM_BAD_INPUT), "CCM_BAD_INPUT" },
+    { -(MBEDTLS_ERR_CCM_AUTH_FAILED), "CCM_AUTH_FAILED" },
+    { -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED), "CCM_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CCM_C */
+
+#if defined(MBEDTLS_CHACHA20_C)
+    { -(MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA), "CHACHA20_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_CHACHA20_FEATURE_UNAVAILABLE), "CHACHA20_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_CHACHA20_HW_ACCEL_FAILED), "CHACHA20_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CHACHA20_C */
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    { -(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE), "CHACHAPOLY_BAD_STATE" },
+    { -(MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED), "CHACHAPOLY_AUTH_FAILED" },
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+#if defined(MBEDTLS_CMAC_C)
+    { -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED), "CMAC_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CMAC_C */
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+    { -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED), "CTR_DRBG_ENTROPY_SOURCE_FAILED" },
+    { -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG), "CTR_DRBG_REQUEST_TOO_BIG" },
+    { -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG), "CTR_DRBG_INPUT_TOO_BIG" },
+    { -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR), "CTR_DRBG_FILE_IO_ERROR" },
+#endif /* MBEDTLS_CTR_DRBG_C */
+
+#if defined(MBEDTLS_DES_C)
+    { -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH), "DES_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED), "DES_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_ENTROPY_C)
+    { -(MBEDTLS_ERR_ENTROPY_SOURCE_FAILED), "ENTROPY_SOURCE_FAILED" },
+    { -(MBEDTLS_ERR_ENTROPY_MAX_SOURCES), "ENTROPY_MAX_SOURCES" },
+    { -(MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED), "ENTROPY_NO_SOURCES_DEFINED" },
+    { -(MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE), "ENTROPY_NO_STRONG_SOURCE" },
+    { -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR), "ENTROPY_FILE_IO_ERROR" },
+#endif /* MBEDTLS_ENTROPY_C */
+
+#if defined(MBEDTLS_GCM_C)
+    { -(MBEDTLS_ERR_GCM_AUTH_FAILED), "GCM_AUTH_FAILED" },
+    { -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED), "GCM_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_GCM_BAD_INPUT), "GCM_BAD_INPUT" },
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_HKDF_C)
+    { -(MBEDTLS_ERR_HKDF_BAD_INPUT_DATA), "HKDF_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_HKDF_C */
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+    { -(MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG), "HMAC_DRBG_REQUEST_TOO_BIG" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG), "HMAC_DRBG_INPUT_TOO_BIG" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR), "HMAC_DRBG_FILE_IO_ERROR" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED), "HMAC_DRBG_ENTROPY_SOURCE_FAILED" },
+#endif /* MBEDTLS_HMAC_DRBG_C */
+
+#if defined(MBEDTLS_MD2_C)
+    { -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED), "MD2_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD2_C */
+
+#if defined(MBEDTLS_MD4_C)
+    { -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED), "MD4_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD4_C */
+
+#if defined(MBEDTLS_MD5_C)
+    { -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED), "MD5_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD5_C */
+
+#if defined(MBEDTLS_NET_C)
+    { -(MBEDTLS_ERR_NET_SOCKET_FAILED), "NET_SOCKET_FAILED" },
+    { -(MBEDTLS_ERR_NET_CONNECT_FAILED), "NET_CONNECT_FAILED" },
+    { -(MBEDTLS_ERR_NET_BIND_FAILED), "NET_BIND_FAILED" },
+    { -(MBEDTLS_ERR_NET_LISTEN_FAILED), "NET_LISTEN_FAILED" },
+    { -(MBEDTLS_ERR_NET_ACCEPT_FAILED), "NET_ACCEPT_FAILED" },
+    { -(MBEDTLS_ERR_NET_RECV_FAILED), "NET_RECV_FAILED" },
+    { -(MBEDTLS_ERR_NET_SEND_FAILED), "NET_SEND_FAILED" },
+    { -(MBEDTLS_ERR_NET_CONN_RESET), "NET_CONN_RESET" },
+    { -(MBEDTLS_ERR_NET_UNKNOWN_HOST), "NET_UNKNOWN_HOST" },
+    { -(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL), "NET_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_NET_INVALID_CONTEXT), "NET_INVALID_CONTEXT" },
+    { -(MBEDTLS_ERR_NET_POLL_FAILED), "NET_POLL_FAILED" },
+    { -(MBEDTLS_ERR_NET_BAD_INPUT_DATA), "NET_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_NET_C */
+
+#if defined(MBEDTLS_OID_C)
+    { -(MBEDTLS_ERR_OID_NOT_FOUND), "OID_NOT_FOUND" },
+    { -(MBEDTLS_ERR_OID_BUF_TOO_SMALL), "OID_BUF_TOO_SMALL" },
+#endif /* MBEDTLS_OID_C */
+
+#if defined(MBEDTLS_PADLOCK_C)
+    { -(MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED), "PADLOCK_DATA_MISALIGNED" },
+#endif /* MBEDTLS_PADLOCK_C */
+
+#if defined(MBEDTLS_PLATFORM_C)
+    { -(MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED), "PLATFORM_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED), "PLATFORM_FEATURE_UNSUPPORTED" },
+#endif /* MBEDTLS_PLATFORM_C */
+
+#if defined(MBEDTLS_POLY1305_C)
+    { -(MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA), "POLY1305_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_POLY1305_FEATURE_UNAVAILABLE), "POLY1305_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_POLY1305_HW_ACCEL_FAILED), "POLY1305_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_POLY1305_C */
+
+#if defined(MBEDTLS_RIPEMD160_C)
+    { -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED), "RIPEMD160_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_RIPEMD160_C */
+
+#if defined(MBEDTLS_SHA1_C)
+    { -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED), "SHA1_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA1_BAD_INPUT_DATA), "SHA1_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA1_C */
+
+#if defined(MBEDTLS_SHA256_C)
+    { -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED), "SHA256_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA256_BAD_INPUT_DATA), "SHA256_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA256_C */
+
+#if defined(MBEDTLS_SHA512_C)
+    { -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED), "SHA512_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA512_BAD_INPUT_DATA), "SHA512_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA512_C */
+
+#if defined(MBEDTLS_THREADING_C)
+    { -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE), "THREADING_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_THREADING_BAD_INPUT_DATA), "THREADING_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_THREADING_MUTEX_ERROR), "THREADING_MUTEX_ERROR" },
+#endif /* MBEDTLS_THREADING_C */
+
+#if defined(MBEDTLS_XTEA_C)
+    { -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH), "XTEA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED), "XTEA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_XTEA_C */
+// END generated code
+};
+
+static const char *mbedtls_err_prefix = "MBEDTLS_ERR_";
+#define MBEDTLS_ERR_PREFIX_LEN ( sizeof("MBEDTLS_ERR_")-1 )
+
+// copy error text into buffer, ensure null termination, return strlen of result
+static size_t mbedtls_err_to_str(int err, const struct ssl_errs tab[], int tab_len, char *buf, size_t buflen) {
+    if (buflen == 0) return 0;
+
+    // prefix for all error names
+    strncpy(buf, mbedtls_err_prefix, buflen);
+    if (buflen <= MBEDTLS_ERR_PREFIX_LEN+1) {
+        buf[buflen-1] = 0;
+        return buflen-1;
+    }
+
+    // append error name from table
+    for (int i = 0; i < tab_len; i++) {
+        if (tab[i].errnum == err) {
+            strncpy(buf+MBEDTLS_ERR_PREFIX_LEN, tab[i].errstr, buflen-MBEDTLS_ERR_PREFIX_LEN);
+            buf[buflen-1] = 0;
+            return strlen(buf);
+        }
+    }
+
+    mbedtls_snprintf(buf+MBEDTLS_ERR_PREFIX_LEN, buflen-MBEDTLS_ERR_PREFIX_LEN, "UNKNOWN (0x%04X)",
+            err);
+    return strlen(buf);
+}
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
+    int use_ret;
+
+    if (buflen == 0) return;
+
+    buf[buflen-1] = 0;
+
+    if (ret < 0) ret = -ret;
+
+    //
+    // High-level error codes
+    //
+    uint8_t got_hl = (ret & 0xFF80) != 0;
+    if (got_hl) {
+        use_ret = ret & 0xFF80;
+
+        // special case
+#if defined(MBEDTLS_SSL_TLS_C)
+        if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
+            strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
+            buf[buflen-1] = 0;
+            return;
+        }
+#endif
+
+        size_t len = mbedtls_err_to_str(use_ret, mbedtls_high_level_error_tab,
+                ARRAY_SIZE(mbedtls_high_level_error_tab), buf, buflen);
+
+        buf += len;
+        buflen -= len;
+        if (buflen == 0) return;
+    }
+
+    //
+    // Low-level error codes
+    //
+    use_ret = ret & ~0xFF80;
+
+    if (use_ret == 0) return;
+
+    // If high level code is present, make a concatenation between both error strings.
+    if (got_hl) {
+        if (buflen < 2) return;
+        *buf++ = '+';
+        buflen--;
+    }
+
+    mbedtls_err_to_str(use_ret, mbedtls_low_level_error_tab,
+            ARRAY_SIZE(mbedtls_low_level_error_tab), buf, buflen);
+}
+
+#else /* MBEDTLS_ERROR_C */
+
+#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+
+/*
+ * Provide an non-function in case MBEDTLS_ERROR_C is not defined
+ */
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    ((void) ret);
+
+    if( buflen > 0 )
+        buf[0] = '\0';
+}
+
+#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
+
+#endif /* MBEDTLS_ERROR_C */
diff --git a/lib/mbedtls_errors/tester.c b/lib/mbedtls_errors/tester.c
new file mode 100644
index 0000000000..6f1c788f50
--- /dev/null
+++ b/lib/mbedtls_errors/tester.c
@@ -0,0 +1,58 @@
+#include "mbedtls/error.h"
+#include 
+#include 
+
+// test_code checks that the provided code results in the provided error string for any size
+// buffer. It calls mbedtls_strerror() to fill a buffer that is from 1 to 100 bytes in length
+// and then checks that the buffer contents is OK and that a few guard bytes before and after
+// the buffer were not overwritten.
+int test_code(int code, char *str) {
+    char buf[100];
+    int ok = 1;
+    int res;
+
+    // test zero-length buffer
+    memset(buf, -3, 100);
+    mbedtls_strerror(code, buf + 4, 0);
+    for (int i = 0; i < 10; i++) {
+        if (buf[i] != -3) {
+            printf("Error: guard overwritten buflen=0 i=%d buf[i]=%d\n", i, buf[i]);
+            ok = 0;
+        }
+    }
+
+    // test
+    for (size_t buflen = 1; buflen < 90; buflen++) {
+        memset(buf, -3, 100);
+        mbedtls_strerror(code, buf + 4, buflen);
+        for (int i = 0; i < 4; i++) {
+            if (buf[i] != -3) {
+                printf("Error: pre-guard overwritten buflen=%d i=%d buf[i]=%d\n", buflen, i, buf[i]);
+                ok = 0;
+            }
+        }
+        for (int i = 4 + buflen; i < 100; i++) {
+            if (buf[i] != -3) {
+                printf("Error: post-guard overwritten buflen=%d i=%d buf[i]=%d\n", buflen, i, buf[i]);
+                ok = 0;
+            }
+        }
+        char exp[100];
+        strncpy(exp, str, buflen);
+        exp[buflen - 1] = 0;
+        if (strcmp(buf + 4, exp) != 0) {
+            printf("Error: expected %s, got %s\n", exp, buf);
+            ok = 0;
+        }
+    }
+
+    printf("Test %x -> %s is %s\n", code, str, ok?"OK":"*** BAD ***");
+}
+
+int main() {
+    test_code(0x7200, "MBEDTLS_ERR_SSL_INVALID_RECORD");
+    test_code(0x7780, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE");
+    test_code(0x0074, "MBEDTLS_ERR_SHA256_BAD_INPUT_DATA");
+    test_code(0x6600 | 0x0074, "MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH+MBEDTLS_ERR_SHA256_BAD_INPUT_DATA");
+    test_code(103, "MBEDTLS_ERR_UNKNOWN (0x0067)");
+}

From dcb650c5130ae1e9fa0f951fbdfc8630e9844471 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 29 Sep 2022 09:08:28 -0500
Subject: [PATCH 1123/2403] pico w: add ssl module

Note: at this time, the ssl module on pico_w never verifies the server
certificate. This means it does not actually provide a higher security
level than regular socket / http protocols.
---
 locale/circuitpython.pot                      |  33 +-
 ports/espressif/common-hal/ssl/SSLSocket.c    |   2 +-
 ports/raspberrypi/Makefile                    |  82 +++++
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   3 +-
 ports/raspberrypi/common-hal/ssl/SSLContext.c |  52 +++
 ports/raspberrypi/common-hal/ssl/SSLContext.h |  35 ++
 ports/raspberrypi/common-hal/ssl/SSLSocket.c  | 329 ++++++++++++++++++
 ports/raspberrypi/common-hal/ssl/SSLSocket.h  |  54 +++
 ports/raspberrypi/common-hal/ssl/__init__.c   |  32 ++
 ports/raspberrypi/common-hal/ssl/__init__.h   |  27 ++
 ports/raspberrypi/mbedtls/mbedtls_config.h    | 115 ++++++
 ports/raspberrypi/mbedtls/mbedtls_port.c      |  51 +++
 py/circuitpy_mpconfig.h                       |   1 +
 py/circuitpy_mpconfig.mk                      |   4 +
 py/malloc.c                                   |  93 +++++
 py/misc.h                                     |   7 +
 py/mpstate.h                                  |   4 +
 shared-bindings/ssl/SSLSocket.h               |   2 +-
 tools/ci_fetch_deps.py                        |   1 +
 19 files changed, 905 insertions(+), 22 deletions(-)
 create mode 100644 ports/raspberrypi/common-hal/ssl/SSLContext.c
 create mode 100644 ports/raspberrypi/common-hal/ssl/SSLContext.h
 create mode 100644 ports/raspberrypi/common-hal/ssl/SSLSocket.c
 create mode 100644 ports/raspberrypi/common-hal/ssl/SSLSocket.h
 create mode 100644 ports/raspberrypi/common-hal/ssl/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/ssl/__init__.h
 create mode 100644 ports/raspberrypi/mbedtls/mbedtls_config.h
 create mode 100644 ports/raspberrypi/mbedtls/mbedtls_port.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index ff943c9767..fd9e514754 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -152,14 +152,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr ""
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -910,8 +902,7 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1243,6 +1234,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1569,10 +1561,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1642,6 +1636,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1696,7 +1691,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1916,6 +1910,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2341,10 +2336,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2814,10 +2805,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3241,6 +3228,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3267,6 +3258,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
diff --git a/ports/espressif/common-hal/ssl/SSLSocket.c b/ports/espressif/common-hal/ssl/SSLSocket.c
index 281e356d77..d106e16894 100644
--- a/ports/espressif/common-hal/ssl/SSLSocket.c
+++ b/ports/espressif/common-hal/ssl/SSLSocket.c
@@ -158,7 +158,7 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
 
         if (err == ESP_ERR_MBEDTLS_SSL_SETUP_FAILED) {
             mp_raise_espidf_MemoryError();
-        } else if (ESP_ERR_MBEDTLS_SSL_HANDSHAKE_FAILED) {
+        } else if (err == ESP_ERR_MBEDTLS_SSL_HANDSHAKE_FAILED) {
             mp_raise_OSError_msg_varg(translate("Failed SSL handshake"));
         } else {
             mp_raise_OSError_msg_varg(translate("Unhandled ESP TLS error %d %d %x %d"), esp_tls_code, flags, err, sent);
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 17c7eb477c..506b19a795 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -276,6 +276,88 @@ SRC_C += \
 	$(SRC_CYW43) \
 	$(SRC_LWIP) \
 
+ifeq ($(CIRCUITPY_SSL),1)
+CFLAGS += -isystem $(TOP)/mbedtls/include
+SRC_MBEDTLS := $(addprefix lib/mbedtls/library/, \
+        aes.c \
+        aesni.c \
+        arc4.c \
+        asn1parse.c \
+        asn1write.c \
+        base64.c \
+        bignum.c \
+        blowfish.c \
+        camellia.c \
+        ccm.c \
+        certs.c \
+        chacha20.c \
+        chachapoly.c \
+        cipher.c \
+        cipher_wrap.c \
+        cmac.c \
+        ctr_drbg.c \
+        debug.c \
+        des.c \
+        dhm.c \
+        ecdh.c \
+        ecdsa.c \
+        ecjpake.c \
+        ecp.c \
+        ecp_curves.c \
+        entropy.c \
+        entropy_poll.c \
+        gcm.c \
+        havege.c \
+        hmac_drbg.c \
+        md2.c \
+        md4.c \
+        md5.c \
+        md.c \
+        md_wrap.c \
+        oid.c \
+        padlock.c \
+        pem.c \
+        pk.c \
+        pkcs11.c \
+        pkcs12.c \
+        pkcs5.c \
+        pkparse.c \
+        pk_wrap.c \
+        pkwrite.c \
+        platform.c \
+        platform_util.c \
+        poly1305.c \
+        ripemd160.c \
+        rsa.c \
+        rsa_internal.c \
+        sha1.c \
+        sha256.c \
+        sha512.c \
+        ssl_cache.c \
+        ssl_ciphersuites.c \
+        ssl_cli.c \
+        ssl_cookie.c \
+        ssl_srv.c \
+        ssl_ticket.c \
+        ssl_tls.c \
+        timing.c \
+        x509.c \
+        x509_create.c \
+        x509_crl.c \
+        x509_crt.c \
+        x509_csr.c \
+        x509write_crt.c \
+        x509write_csr.c \
+        xtea.c \
+	)
+SRC_C += $(SRC_MBEDTLS) mbedtls/mbedtls_port.c
+CFLAGS += \
+	  -isystem $(TOP)/lib/mbedtls/include \
+	  -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' \
+
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_MBEDTLS))): CFLAGS += -Wno-suggest-attribute=format
+endif
+
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
                           $(addprefix common-hal/, $(SRC_COMMON_HAL))
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index a8938b2623..15c4261f83 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -11,7 +11,8 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 CIRCUITPY__EVE = 1
 
 CIRCUITPY_CYW43 = 1
-CIRCUITPY_SSL = 0
+CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_MBEDTLS = 1
 CIRCUITPY_HASHLIB = 0
 CIRCUITPY_WEB_WORKFLOW = 0
 CIRCUITPY_MDNS = 0
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.c b/ports/raspberrypi/common-hal/ssl/SSLContext.c
new file mode 100644
index 0000000000..90f26a3830
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/ssl/SSLContext.h"
+#include "shared-bindings/ssl/SSLSocket.h"
+#include "shared-bindings/socketpool/SocketPool.h"
+
+#include "py/runtime.h"
+#include "py/stream.h"
+
+void common_hal_ssl_sslcontext_construct(ssl_sslcontext_obj_t *self) {
+}
+
+void common_hal_ssl_sslcontext_load_verify_locations(ssl_sslcontext_obj_t *self,
+    const char *cadata) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self) {
+    return self->check_name;
+}
+
+void common_hal_ssl_sslcontext_set_check_hostname(ssl_sslcontext_obj_t *self, bool value) {
+    self->check_name = value;
+}
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.h b/ports/raspberrypi/common-hal/ssl/SSLContext.h
new file mode 100644
index 0000000000..dc8caba089
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    bool check_name;
+} ssl_sslcontext_obj_t;
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
new file mode 100644
index 0000000000..ab6ab04711
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -0,0 +1,329 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Linaro Ltd.
+ * Copyright (c) 2019 Paul Sokolovsky
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/ssl/SSLSocket.h"
+#include "shared-bindings/socketpool/Socket.h"
+#include "shared-bindings/ssl/SSLContext.h"
+#include "shared-bindings/socketpool/SocketPool.h"
+#include "shared-bindings/socketpool/Socket.h"
+
+#include "shared/runtime/interrupt_char.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "supervisor/shared/tick.h"
+
+#if defined(MBEDTLS_ERROR_C)
+#include "../../lib/mbedtls_errors/mp_mbedtls_errors.c"
+#endif
+
+#ifdef MBEDTLS_DEBUG_C
+#include "mbedtls/debug.h"
+STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
+    (void)ctx;
+    (void)level;
+    mp_printf(&mp_plat_print, "DBG:%s:%04d: %s\n", file, line, str);
+}
+#define DEBUG(fmt, ...) mp_printf(&mp_plat_print, "DBG:%s:%04d: " fmt "\n", __FILE__, __LINE__,##__VA_ARGS__)
+#else
+#define DEBUG(...) do {} while (0)
+#endif
+
+STATIC NORETURN void mbedtls_raise_error(int err) {
+    // _mbedtls_ssl_send and _mbedtls_ssl_recv (below) turn positive error codes from the
+    // underlying socket into negative codes to pass them through mbedtls. Here we turn them
+    // positive again so they get interpreted as the OSError they really are. The
+    // cut-off of -256 is a bit hacky, sigh.
+    if (err < 0 && err > -256) {
+        mp_raise_OSError(-err);
+    }
+
+    #if defined(MBEDTLS_ERROR_C)
+    // Including mbedtls_strerror takes about 1.5KB due to the error strings.
+    // MBEDTLS_ERROR_C is the define used by mbedtls to conditionally include mbedtls_strerror.
+    // It is set/unset in the MBEDTLS_CONFIG_FILE which is defined in the Makefile.
+
+    // Try to allocate memory for the message
+    #define ERR_STR_MAX 80  // mbedtls_strerror truncates if it doesn't fit
+    mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
+    byte *o_str_buf = m_new_maybe(byte, ERR_STR_MAX);
+    if (o_str == NULL || o_str_buf == NULL) {
+        mp_raise_OSError(err);
+    }
+
+    // print the error message into the allocated buffer
+    mbedtls_strerror(err, (char *)o_str_buf, ERR_STR_MAX);
+    size_t len = strlen((char *)o_str_buf);
+
+    // Put the exception object together
+    o_str->base.type = &mp_type_str;
+    o_str->data = o_str_buf;
+    o_str->len = len;
+    o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
+    // raise
+    mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(err), MP_OBJ_FROM_PTR(o_str)};
+    nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
+    #else
+    // mbedtls is compiled without error strings so we simply return the err number
+    mp_raise_OSError(err); // err is typically a large negative number
+    #endif
+}
+
+STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
+    mp_obj_t sock = *(mp_obj_t *)ctx;
+
+    // mp_uint_t out_sz = sock_stream->write(sock, buf, len, &err);
+    mp_int_t out_sz = common_hal_socketpool_socket_send(sock, buf, len);
+    DEBUG("socket_send() -> %d", out_sz);
+    if (out_sz < 0) {
+        int err = -out_sz;
+        DEBUG("sock_stream->write() -> %d nonblocking? %d", out_sz, mp_is_nonblocking_error(err));
+        if (mp_is_nonblocking_error(err)) {
+            return MBEDTLS_ERR_SSL_WANT_WRITE;
+        }
+        return -err; // convert an MP_ERRNO to something mbedtls passes through as error
+    } else {
+        return out_sz;
+    }
+}
+
+// _mbedtls_ssl_recv is called by mbedtls to receive bytes from the underlying socket
+STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
+    mp_obj_t sock = *(mp_obj_t *)ctx;
+
+    mp_int_t out_sz = common_hal_socketpool_socket_recv_into(sock, buf, len);
+    DEBUG("socket_recv() -> %d", out_sz);
+    if (out_sz < 0) {
+        int err = -out_sz;
+        if (mp_is_nonblocking_error(err)) {
+            return MBEDTLS_ERR_SSL_WANT_READ;
+        }
+        return -err;
+    } else {
+        return out_sz;
+    }
+}
+
+
+
+ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t *self,
+    socketpool_socket_obj_t *socket, bool server_side, const char *server_hostname) {
+
+    if (socket->type != SOCKETPOOL_SOCK_STREAM) {
+        mp_raise_RuntimeError(translate("Invalid socket for TLS"));
+    }
+
+    ssl_sslsocket_obj_t *o = m_new_obj_with_finaliser(ssl_sslsocket_obj_t);
+    o->base.type = &ssl_sslsocket_type;
+    o->ssl_context = self;
+    o->sock = socket;
+
+    mbedtls_ssl_init(&o->ssl);
+    mbedtls_ssl_config_init(&o->conf);
+    mbedtls_x509_crt_init(&o->cacert);
+    mbedtls_x509_crt_init(&o->cert);
+    mbedtls_pk_init(&o->pkey);
+    mbedtls_ctr_drbg_init(&o->ctr_drbg);
+    #ifdef MBEDTLS_DEBUG_C
+    // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
+    mbedtls_debug_set_threshold(4);
+    #endif
+
+    mbedtls_entropy_init(&o->entropy);
+    const byte seed[] = "upy";
+    int ret = mbedtls_ctr_drbg_seed(&o->ctr_drbg, mbedtls_entropy_func, &o->entropy, seed, sizeof(seed));
+    if (ret != 0) {
+        goto cleanup;
+    }
+
+    ret = mbedtls_ssl_config_defaults(&o->conf,
+        server_side ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT,
+        MBEDTLS_SSL_TRANSPORT_STREAM,
+        MBEDTLS_SSL_PRESET_DEFAULT);
+    if (ret != 0) {
+        goto cleanup;
+    }
+
+    // no certificate checking now
+    mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
+    mbedtls_ssl_conf_rng(&o->conf, mbedtls_ctr_drbg_random, &o->ctr_drbg);
+    #ifdef MBEDTLS_DEBUG_C
+    mbedtls_ssl_conf_dbg(&o->conf, mbedtls_debug, NULL);
+    #endif
+
+    ret = mbedtls_ssl_setup(&o->ssl, &o->conf);
+    if (ret != 0) {
+        goto cleanup;
+    }
+
+    if (server_hostname != NULL) {
+        ret = mbedtls_ssl_set_hostname(&o->ssl, server_hostname);
+        if (ret != 0) {
+            goto cleanup;
+        }
+    }
+
+    mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
+
+    return o;
+cleanup:
+    mbedtls_pk_free(&o->pkey);
+    mbedtls_x509_crt_free(&o->cert);
+    mbedtls_x509_crt_free(&o->cacert);
+    mbedtls_ssl_free(&o->ssl);
+    mbedtls_ssl_config_free(&o->conf);
+    mbedtls_ctr_drbg_free(&o->ctr_drbg);
+    mbedtls_entropy_free(&o->entropy);
+
+    if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
+        mp_raise_OSError(MP_ENOMEM);
+    } else if (ret == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
+    } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
+    } else {
+        mbedtls_raise_error(ret);
+    }
+}
+
+mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t *buf, uint32_t len) {
+    int ret = mbedtls_ssl_read(&self->ssl, buf, len);
+    DEBUG("recv_into mbedtls_ssl_read() -> %d\n", ret);
+    if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+        DEBUG("returning %d\n", 0);
+        // end of stream
+        return 0;
+    }
+    if (ret >= 0) {
+        DEBUG("returning %d\n", ret);
+        return ret;
+    }
+    if (ret == MBEDTLS_ERR_SSL_WANT_READ) {
+        ret = MP_EWOULDBLOCK;
+    } else if (ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
+        // If handshake is not finished, read attempt may end up in protocol
+        // wanting to write next handshake message. The same may happen with
+        // renegotation.
+        ret = MP_EWOULDBLOCK;
+    }
+    DEBUG("returning [error case] %d\n", -ret);
+    return -ret;
+}
+
+mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len) {
+    int ret = mbedtls_ssl_write(&self->ssl, buf, len);
+    DEBUG("send mbedtls_ssl_write() -> %d\n", ret);
+    if (ret >= 0) {
+        DEBUG("returning %d\n", ret);
+        return ret;
+    }
+    if (ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
+        ret = MP_EWOULDBLOCK;
+    } else if (ret == MBEDTLS_ERR_SSL_WANT_READ) {
+        // If handshake is not finished, write attempt may end up in protocol
+        // wanting to read next handshake message. The same may happen with
+        // renegotation.
+        ret = MP_EWOULDBLOCK;
+    }
+    DEBUG("returning [error case] %d\n", -ret);
+    return -ret;
+}
+
+bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
+    self->closed = true;
+    mbedtls_pk_free(&self->pkey);
+    mbedtls_x509_crt_free(&self->cert);
+    mbedtls_x509_crt_free(&self->cacert);
+    mbedtls_ssl_free(&self->ssl);
+    mbedtls_ssl_config_free(&self->conf);
+    mbedtls_ctr_drbg_free(&self->ctr_drbg);
+    mbedtls_entropy_free(&self->entropy);
+}
+
+void common_hal_ssl_sslsocket_connect(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
+    common_hal_socketpool_socket_connect(self->sock, host, hostlen, port);
+    int ret;
+    while ((ret = mbedtls_ssl_handshake(&self->ssl)) != 0) {
+        if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
+            goto cleanup;
+        }
+        RUN_BACKGROUND_TASKS;
+        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+            mp_handle_pending(true);
+        }
+        mp_hal_delay_ms(1);
+    }
+
+    return;
+
+cleanup:
+    self->closed = true;
+    mbedtls_pk_free(&self->pkey);
+    mbedtls_x509_crt_free(&self->cert);
+    mbedtls_x509_crt_free(&self->cacert);
+    mbedtls_ssl_free(&self->ssl);
+    mbedtls_ssl_config_free(&self->conf);
+    mbedtls_ctr_drbg_free(&self->ctr_drbg);
+    mbedtls_entropy_free(&self->entropy);
+
+    if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
+        mp_raise_OSError(MP_ENOMEM);
+    } else if (ret == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
+    } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
+    } else {
+        mbedtls_raise_error(ret);
+    }
+}
+
+bool common_hal_ssl_sslsocket_get_closed(ssl_sslsocket_obj_t *self) {
+    return self->closed;
+}
+
+bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self) {
+    return !self->closed;
+}
+
+bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+ssl_sslsocket_obj_t *common_hal_ssl_sslsocket_accept(ssl_sslsocket_obj_t *self, uint8_t *ip, uint32_t *port) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms) {
+    self->sock->timeout = timeout_ms;
+}
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.h b/ports/raspberrypi/common-hal/ssl/SSLSocket.h
new file mode 100644
index 0000000000..ad4f0f7092
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "common-hal/ssl/SSLContext.h"
+#include "common-hal/socketpool/Socket.h"
+
+#include "mbedtls/platform.h"
+#include "mbedtls/ssl.h"
+#include "mbedtls/x509_crt.h"
+#include "mbedtls/pk.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/ctr_drbg.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    socketpool_socket_obj_t *sock;
+    ssl_sslcontext_obj_t *ssl_context;
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+    mbedtls_ssl_context ssl;
+    mbedtls_ssl_config conf;
+    mbedtls_x509_crt cacert;
+    mbedtls_x509_crt cert;
+    mbedtls_pk_context pkey;
+    bool closed;
+} ssl_sslsocket_obj_t;
diff --git a/ports/raspberrypi/common-hal/ssl/__init__.c b/ports/raspberrypi/common-hal/ssl/__init__.c
new file mode 100644
index 0000000000..79cb360e85
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/__init__.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/ssl/__init__.h"
+#include "shared-bindings/ssl/SSLContext.h"
+
+void common_hal_ssl_create_default_context(ssl_sslcontext_obj_t *self) {
+}
diff --git a/ports/raspberrypi/common-hal/ssl/__init__.h b/ports/raspberrypi/common-hal/ssl/__init__.h
new file mode 100644
index 0000000000..0bfe0789ec
--- /dev/null
+++ b/ports/raspberrypi/common-hal/ssl/__init__.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
diff --git a/ports/raspberrypi/mbedtls/mbedtls_config.h b/ports/raspberrypi/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000..4fe4f8640e
--- /dev/null
+++ b/ports/raspberrypi/mbedtls/mbedtls_config.h
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 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_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// If you want to debug MBEDTLS uncomment the following and
+// Pass 3 to mbedtls_debug_set_threshold in socket_new
+// #define MBEDTLS_DEBUG_C
+
+// Set mbedtls configuration
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SSL_PROTO_TLS1
+#define MBEDTLS_SSL_PROTO_TLS1_1
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+// Use a smaller output buffer to reduce size of SSL context
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
+#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
+#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
+
+// Enable mbedtls modules
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_ECDH_C
+#define MBEDTLS_ECP_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_GCM_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+#define MBEDTLS_HAVE_TIME
+#undef MBEDTLS_HAVE_TIME_DATE
+
+// Memory allocation hooks
+#include 
+#include 
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
+#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+
+// Time hook
+#include 
+time_t rp2_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
+
+#include "mbedtls/check_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/raspberrypi/mbedtls/mbedtls_port.c b/ports/raspberrypi/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000..596d08ccd9
--- /dev/null
+++ b/ports/raspberrypi/mbedtls/mbedtls_port.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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 
+
+#if CIRCUITPY_SSL_MBEDTLS
+
+#include "mbedtls_config.h"
+#include "mbedtls/entropy_poll.h"
+
+#include "hardware/rtc.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/os/__init__.h"
+
+extern uint8_t rosc_random_u8(size_t cycles);
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
+    *olen = len;
+    common_hal_os_urandom(data, len);
+    return 0;
+}
+
+time_t rp2_rtctime_seconds(time_t *timer) {
+    datetime_t t;
+    rtc_get_datetime(&t);
+    return timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
+}
+
+#endif
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index e09c17d85e..6ae8275058 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -73,6 +73,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_ENABLE_DOC_STRING        (0)
 #define MICROPY_ENABLE_FINALISER         (1)
 #define MICROPY_ENABLE_GC                (1)
+#define MICROPY_TRACKED_ALLOC            (CIRCUITPY_SSL_MBEDTLS)
 #define MICROPY_ENABLE_SOURCE_LINE       (1)
 #define MICROPY_EPOCH_IS_1970            (1)
 #define MICROPY_ERROR_REPORTING          (MICROPY_ERROR_REPORTING_NORMAL)
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 96165997ce..2e7ac2e1d8 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -388,6 +388,10 @@ CFLAGS += -DCIRCUITPY_SOCKETPOOL=$(CIRCUITPY_SOCKETPOOL)
 CIRCUITPY_SSL ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_SSL=$(CIRCUITPY_SSL)
 
+CIRCUITPY_SSL_MBEDTLS ?= 0
+CFLAGS += -DCIRCUITPY_SSL_MBEDTLS=$(CIRCUITPY_SSL_MBEDTLS)
+
+# Currently always off.
 CIRCUITPY_STAGE ?= 0
 CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE)
 
diff --git a/py/malloc.c b/py/malloc.c
index 5c09a2d283..7200285687 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -207,6 +207,99 @@ void m_free(void *ptr) {
     #endif
 }
 
+#if MICROPY_TRACKED_ALLOC
+
+#define MICROPY_TRACKED_ALLOC_STORE_SIZE (!MICROPY_ENABLE_GC)
+
+typedef struct _m_tracked_node_t {
+    struct _m_tracked_node_t *prev;
+    struct _m_tracked_node_t *next;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    uintptr_t size;
+    #endif
+    uint8_t data[];
+} m_tracked_node_t;
+
+#if MICROPY_DEBUG_VERBOSE
+STATIC size_t m_tracked_count_links(size_t *nb) {
+    m_tracked_node_t *node = MP_STATE_VM(m_tracked_head);
+    size_t n = 0;
+    *nb = 0;
+    while (node != NULL) {
+        ++n;
+        #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+        *nb += node->size;
+        #else
+        *nb += gc_nbytes(node);
+        #endif
+        node = node->next;
+    }
+    return n;
+}
+#endif
+
+void *m_tracked_calloc(size_t nmemb, size_t size) {
+    m_tracked_node_t *node = m_malloc_maybe(sizeof(m_tracked_node_t) + nmemb * size, false);
+    if (node == NULL) {
+        return NULL;
+    }
+    #if MICROPY_DEBUG_VERBOSE
+    size_t nb;
+    size_t n = m_tracked_count_links(&nb);
+    DEBUG_printf("m_tracked_calloc(%u, %u) -> (%u;%u) %p\n", (int)nmemb, (int)size, (int)n, (int)nb, node);
+    #endif
+    if (MP_STATE_VM(m_tracked_head) != NULL) {
+        MP_STATE_VM(m_tracked_head)->prev = node;
+    }
+    node->prev = NULL;
+    node->next = MP_STATE_VM(m_tracked_head);
+    MP_STATE_VM(m_tracked_head) = node;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    node->size = nmemb * size;
+    #endif
+    #if !MICROPY_GC_CONSERVATIVE_CLEAR
+    memset(&node->data[0], 0, nmemb * size);
+    #endif
+    return &node->data[0];
+}
+
+void m_tracked_free(void *ptr_in) {
+    if (ptr_in == NULL) {
+        return;
+    }
+    m_tracked_node_t *node = (m_tracked_node_t *)((uint8_t *)ptr_in - sizeof(m_tracked_node_t));
+    #if MICROPY_DEBUG_VERBOSE
+    size_t data_bytes;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    data_bytes = node->size;
+    #else
+    data_bytes = gc_nbytes(node);
+    #endif
+    size_t nb;
+    size_t n = m_tracked_count_links(&nb);
+    DEBUG_printf("m_tracked_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", node, node->prev, node->next, (int)data_bytes, (int)n, (int)nb);
+    #endif
+    if (node->next != NULL) {
+        node->next->prev = node->prev;
+    }
+    if (node->prev != NULL) {
+        node->prev->next = node->next;
+    } else {
+        MP_STATE_VM(m_tracked_head) = node->next;
+    }
+    m_free(node
+        #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+        #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+        , node->size
+        #else
+        , gc_nbytes(node)
+        #endif
+        #endif
+        );
+}
+
+#endif
+
 #if MICROPY_MEM_STATS
 size_t m_get_total_bytes_allocated(void) {
     return MP_STATE_MEM(total_bytes_allocated);
diff --git a/py/misc.h b/py/misc.h
index 8f2d3a187a..1ced7c622e 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -112,6 +112,13 @@ void m_free(void *ptr);
 #endif
 NORETURN void m_malloc_fail(size_t num_bytes);
 
+#if MICROPY_TRACKED_ALLOC
+// These alloc/free functions track the pointers in a linked list so the GC does not reclaim
+// them.  They can be used by code that requires traditional C malloc/free semantics.
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr_in);
+#endif
+
 #if MICROPY_MEM_STATS
 size_t m_get_total_bytes_allocated(void);
 size_t m_get_current_bytes_allocated(void);
diff --git a/py/mpstate.h b/py/mpstate.h
index bfbc29d55a..cf1711b8ad 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -119,6 +119,10 @@ typedef struct _mp_state_vm_t {
 
     qstr_pool_t *last_pool;
 
+    #if MICROPY_TRACKED_ALLOC
+    struct _m_tracked_node_t *m_tracked_head;
+    #endif
+
     // non-heap memory for creating a traceback if we can't allocate RAM
     mp_obj_traceback_t mp_emergency_traceback_obj;
 
diff --git a/shared-bindings/ssl/SSLSocket.h b/shared-bindings/ssl/SSLSocket.h
index d6519340d9..0c303e44c7 100644
--- a/shared-bindings/ssl/SSLSocket.h
+++ b/shared-bindings/ssl/SSLSocket.h
@@ -38,7 +38,7 @@ void common_hal_ssl_sslsocket_connect(ssl_sslsocket_obj_t *self, const char *hos
 bool common_hal_ssl_sslsocket_get_closed(ssl_sslsocket_obj_t *self);
 bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self);
 bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog);
-mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len);
+mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t *buf, uint32_t len);
 mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len);
 void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms);
 
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 55985ffe15..0b44f07402 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -32,6 +32,7 @@ port_deps = {
     "raspberrypi": [
         "extmod/ulab/",
         "lib/adafruit_floppy/",
+        "lib/mbedtls/",
         "lib/mp3/",
         "lib/protomatter/",
         "lib/quirc/",

From 91079279da690e1e86b765ff8f7caea4709a2f53 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 5 Oct 2022 15:50:53 -0400
Subject: [PATCH 1124/2403] Allow spaces before = in dotenv

---
 shared-module/dotenv/__init__.c        |  2 +-
 tests/circuitpython/dotenv_test.env    | 51 +++++++++++---------------
 tests/circuitpython/dotenv_test.py     | 40 ++++++++++----------
 tests/circuitpython/dotenv_test.py.exp | 38 ++++++++++---------
 4 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index c09e38370b..24587247f0 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -137,7 +137,7 @@ STATIC bool key_matches(file_arg *active_file, const char *key) {
     if (character == '=' || character == '\n' || character == '#' || character == 0) {
         // Rewind one so the value, if any, can be found.
         seek_minus_one(active_file);
-    } else {
+    } else if (!unichar_isspace(character)) {
         // We're followed by something else that is invalid syntax.
         matches = false;
     }
diff --git a/tests/circuitpython/dotenv_test.env b/tests/circuitpython/dotenv_test.env
index 5e4e4cb8f0..7119774fa1 100644
--- a/tests/circuitpython/dotenv_test.env
+++ b/tests/circuitpython/dotenv_test.env
@@ -1,32 +1,23 @@
-# No e0 value
+# Key "notpresent" is not present
    # comment preceded by spaces
-e1=e1value
-e2=e2value # value followed by a comment
-e3='e3value'
-e4='e4value' # quoted value followed by a comment
-# e5 should be None
-e5
-# e6 should be the empty string
-e6=
-# e7 should be '#' (bash-like syntax processing)
-e7=#
-# e8 should be the empty string
-e8=''
-# e9 should be the empty string
-e9= #
-e10=e10_first
-e10=e10_last
-e11='abc#def'
-# e12 should be 'abc#def'
-e12=abc#def
-e12='multi
+plain_value=value
+value_with_comment=value # value followed by a comment
+quoted_value='value'
+quoted_value_with_comment='value' # quoted value followed by a comment
+should_be_none
+should_be_empty_string=
+should_be_hash=#
+quoted_should_be_empty_string=''
+duplicate_key=wrong
+duplicate_key=right
+value_with_hash=value#value
+quoted_value_with_hash='value#value'
+multi_line_value='multi
 line'
-e13=e13value
-e14  #comment
-e15 = e15value
-# e16 should be '#'
-e16=# #
-# e17 should be 'def#hi'
-e17='def'#hi
-# e18 should be '#has a hash'
-e18=#has a hash
+ space_before_key=value
+space_before_value= value
+space_before_hash_value= #value
+space_after_key =value
+space_after_key_before_value = value
+quoted_then_comment='value'#comment
+hash_with_spaces=#value value
diff --git a/tests/circuitpython/dotenv_test.py b/tests/circuitpython/dotenv_test.py
index 84856747f4..8445b98030 100644
--- a/tests/circuitpython/dotenv_test.py
+++ b/tests/circuitpython/dotenv_test.py
@@ -2,22 +2,24 @@ import dotenv
 
 FILE = __file__.rsplit(".", 1)[0] + ".env"
 
-print("e0", dotenv.get_key(FILE, "e0"))
-print("e1", dotenv.get_key(FILE, "e1"))
-print("e2", dotenv.get_key(FILE, "e2"))
-print("e3", dotenv.get_key(FILE, "e3"))
-print("e4", dotenv.get_key(FILE, "e4"))
-print("e5", dotenv.get_key(FILE, "e5"))
-print("e6", dotenv.get_key(FILE, "e6"))
-print("e7", dotenv.get_key(FILE, "e7"))
-print("e8", dotenv.get_key(FILE, "e8"))
-print("e9", dotenv.get_key(FILE, "e9"))
-print("e10", dotenv.get_key(FILE, "e10"))
-print("e11", dotenv.get_key(FILE, "e11"))
-print("e12", dotenv.get_key(FILE, "e12"))
-print("e13", dotenv.get_key(FILE, "e13"))
-print("e14", dotenv.get_key(FILE, "e14"))
-# print("e15", dotenv.get_key(FILE, "e15"))
-print("e16", dotenv.get_key(FILE, "e16"))
-print("e17", dotenv.get_key(FILE, "e17"))
-print("e18", dotenv.get_key(FILE, "e18"))
+print(f"notpresent={dotenv.get_key(FILE, 'notpresent')}")
+print(f"plain_value={dotenv.get_key(FILE, 'plain_value')}")
+print(f"value_with_comment={dotenv.get_key(FILE, 'value_with_comment')}")
+print(f"quoted_value={dotenv.get_key(FILE, 'quoted_value')}")
+print(f"quoted_value_with_comment={dotenv.get_key(FILE, 'quoted_value_with_comment')}")
+print(f"should_be_none={dotenv.get_key(FILE, 'should_be_none')}")
+print(f"should_be_empty_string={dotenv.get_key(FILE, 'should_be_empty_string')}")
+print(f"should_be_hash={dotenv.get_key(FILE, 'should_be_hash')}")
+print(f"quoted_should_be_empty_string={dotenv.get_key(FILE, 'quoted_should_be_empty_string')}")
+print(f"duplicate_key={dotenv.get_key(FILE, 'duplicate_key')}")
+### This is the a difference from CPython dotenv. The trailing #value is taken as a comment.
+print(f"value_with_hash={dotenv.get_key(FILE, 'value_with_hash')}")
+print(f"quoted_value_with_hash={dotenv.get_key(FILE, 'quoted_value_with_hash')}")
+print(f"multi_line_value={dotenv.get_key(FILE, 'multi_line_value')}")
+print(f"space_before_key={dotenv.get_key(FILE, 'space_before_key')}")
+print(f"space_before_value={dotenv.get_key(FILE, 'space_before_value')}")
+print(f"space_before_hash_value={dotenv.get_key(FILE, 'space_before_hash_value')}")
+print(f"space_after_key={dotenv.get_key(FILE, 'space_after_key')}")
+print(f"space_after_key_before_value={dotenv.get_key(FILE, 'space_after_key_before_value')}")
+print(f"quoted_then_comment={dotenv.get_key(FILE, 'quoted_then_comment')}")
+print(f"hash_with_spaces={dotenv.get_key(FILE, 'hash_with_spaces')}")
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
index b6de0db390..d1cde70182 100644
--- a/tests/circuitpython/dotenv_test.py.exp
+++ b/tests/circuitpython/dotenv_test.py.exp
@@ -1,19 +1,21 @@
-e0 None
-e1 e1value
-e2 e2value
-e3 e3value
-e4 e4value
-e5 None
-e6 
-e7 #
-e8 
-e9 #
-e10 e10_last
-e11 abc#def
-e12 multi
+notpresent=None
+plain_value=value
+value_with_comment=value
+quoted_value=value
+quoted_value_with_comment=value
+should_be_none=None
+should_be_empty_string=
+should_be_hash=#
+quoted_should_be_empty_string=
+duplicate_key=right
+value_with_hash=value
+quoted_value_with_hash=value#value
+multi_line_value=multi
 line
-e13 e13value
-e14 None
-e16 #
-e17 def
-e18 #has a hash
+space_before_key=value
+space_before_value=value
+space_before_hash_value=#value
+space_after_key=value
+space_after_key_before_value=value
+quoted_then_comment=value
+hash_with_spaces=#value value

From b1ce1d05d774a4893f6c2ff67acdb064df189a86 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:05:56 -0500
Subject: [PATCH 1125/2403] Copy from esp-idf@d51f7d8821

---
 tools/gen_crt_bundle.py | 227 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100755 tools/gen_crt_bundle.py

diff --git a/tools/gen_crt_bundle.py b/tools/gen_crt_bundle.py
new file mode 100755
index 0000000000..87e29e61fa
--- /dev/null
+++ b/tools/gen_crt_bundle.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python
+#
+# ESP32 x509 certificate bundle generation utility
+#
+# Converts PEM and DER certificates to a custom bundle format which stores just the
+# subject name and public key to reduce space
+#
+# The bundle will have the format: number of certificates; crt 1 subject name length; crt 1 public key length;
+# crt 1 subject name; crt 1 public key; crt 2...
+#
+# Copyright 2018-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.
+
+from __future__ import with_statement
+
+import argparse
+import csv
+import os
+import re
+import struct
+import sys
+from io import open
+
+try:
+    from cryptography import x509
+    from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import serialization
+except ImportError:
+    print('The cryptography package is not installed.'
+          'Please refer to the Get Started section of the ESP-IDF Programming Guide for '
+          'setting up the required packages.')
+    raise
+
+ca_bundle_bin_file = 'x509_crt_bundle'
+
+quiet = False
+
+
+def status(msg):
+    """ Print status message to stderr """
+    if not quiet:
+        critical(msg)
+
+
+def critical(msg):
+    """ Print critical message to stderr """
+    sys.stderr.write('gen_crt_bundle.py: ')
+    sys.stderr.write(msg)
+    sys.stderr.write('\n')
+
+
+class CertificateBundle:
+    def __init__(self):
+        self.certificates = []
+        self.compressed_crts = []
+
+        if os.path.isfile(ca_bundle_bin_file):
+            os.remove(ca_bundle_bin_file)
+
+    def add_from_path(self, crts_path):
+
+        found = False
+        for file_path in os.listdir(crts_path):
+            found |= self.add_from_file(os.path.join(crts_path, file_path))
+
+        if found is False:
+            raise InputError('No valid x509 certificates found in %s' % crts_path)
+
+    def add_from_file(self, file_path):
+        try:
+            if file_path.endswith('.pem'):
+                status('Parsing certificates from %s' % file_path)
+                with open(file_path, 'r', encoding='utf-8') as f:
+                    crt_str = f.read()
+                    self.add_from_pem(crt_str)
+                    return True
+
+            elif file_path.endswith('.der'):
+                status('Parsing certificates from %s' % file_path)
+                with open(file_path, 'rb') as f:
+                    crt_str = f.read()
+                    self.add_from_der(crt_str)
+                    return True
+
+        except ValueError:
+            critical('Invalid certificate in %s' % file_path)
+            raise InputError('Invalid certificate')
+
+        return False
+
+    def add_from_pem(self, crt_str):
+        """ A single PEM file may have multiple certificates """
+
+        crt = ''
+        count = 0
+        start = False
+
+        for strg in crt_str.splitlines(True):
+            if strg == '-----BEGIN CERTIFICATE-----\n' and start is False:
+                crt = ''
+                start = True
+            elif strg == '-----END CERTIFICATE-----\n' and start is True:
+                crt += strg + '\n'
+                start = False
+                self.certificates.append(x509.load_pem_x509_certificate(crt.encode(), default_backend()))
+                count += 1
+            if start is True:
+                crt += strg
+
+        if(count == 0):
+            raise InputError('No certificate found')
+
+        status('Successfully added %d certificates' % count)
+
+    def add_from_der(self, crt_str):
+        self.certificates.append(x509.load_der_x509_certificate(crt_str, default_backend()))
+        status('Successfully added 1 certificate')
+
+    def create_bundle(self):
+        # Sort certificates in order to do binary search when looking up certificates
+        self.certificates = sorted(self.certificates, key=lambda cert: cert.subject.public_bytes(default_backend()))
+
+        bundle = struct.pack('>H', len(self.certificates))
+
+        for crt in self.certificates:
+            """ Read the public key as DER format """
+            pub_key = crt.public_key()
+            pub_key_der = pub_key.public_bytes(serialization.Encoding.DER, serialization.PublicFormat.SubjectPublicKeyInfo)
+
+            """ Read the subject name as DER format """
+            sub_name_der = crt.subject.public_bytes(default_backend())
+
+            name_len = len(sub_name_der)
+            key_len = len(pub_key_der)
+            len_data = struct.pack('>HH', name_len, key_len)
+
+            bundle += len_data
+            bundle += sub_name_der
+            bundle += pub_key_der
+
+        return bundle
+
+    def add_with_filter(self, crts_path, filter_path):
+
+        filter_set = set()
+        with open(filter_path, 'r', encoding='utf-8') as f:
+            csv_reader = csv.reader(f, delimiter=',')
+
+            # Skip header
+            next(csv_reader)
+            for row in csv_reader:
+                filter_set.add(row[1])
+
+        status('Parsing certificates from %s' % crts_path)
+        crt_str = []
+        with open(crts_path, 'r', encoding='utf-8') as f:
+            crt_str = f.read()
+
+            # Split all certs into a list of (name, certificate string) tuples
+            pem_crts = re.findall(r'(^.+?)\n(=+\n[\s\S]+?END CERTIFICATE-----\n)', crt_str, re.MULTILINE)
+
+            filtered_crts = ''
+            for name, crt in pem_crts:
+                if name in filter_set:
+                    filtered_crts += crt
+
+        self.add_from_pem(filtered_crts)
+
+
+class InputError(RuntimeError):
+    def __init__(self, e):
+        super(InputError, self).__init__(e)
+
+
+def main():
+    global quiet
+
+    parser = argparse.ArgumentParser(description='ESP-IDF x509 certificate bundle utility')
+
+    parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true')
+    parser.add_argument('--input', '-i', nargs='+', required=True,
+                        help='Paths to the custom certificate folders or files to parse, parses all .pem or .der files')
+    parser.add_argument('--filter', '-f', help='Path to CSV-file where the second columns contains the name of the certificates \
+                        that should be included from cacrt_all.pem')
+
+    args = parser.parse_args()
+
+    quiet = args.quiet
+
+    bundle = CertificateBundle()
+
+    for path in args.input:
+        if os.path.isfile(path):
+            if os.path.basename(path) == 'cacrt_all.pem' and args.filter:
+                bundle.add_with_filter(path, args.filter)
+            else:
+                bundle.add_from_file(path)
+        elif os.path.isdir(path):
+            bundle.add_from_path(path)
+        else:
+            raise InputError('Invalid --input=%s, is neither file nor folder' % args.input)
+
+    status('Successfully added %d certificates in total' % len(bundle.certificates))
+
+    crt_bundle = bundle.create_bundle()
+
+    with open(ca_bundle_bin_file, 'wb') as f:
+        f.write(crt_bundle)
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except InputError as e:
+        print(e)
+        sys.exit(2)

From b47d1d777bb4376d0531fe46c2166a70966630fc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:06:23 -0500
Subject: [PATCH 1126/2403] black and fix doc typo

---
 tools/gen_crt_bundle.py | 126 ++++++++++++++++++++++++----------------
 1 file changed, 75 insertions(+), 51 deletions(-)

diff --git a/tools/gen_crt_bundle.py b/tools/gen_crt_bundle.py
index 87e29e61fa..94855a067c 100755
--- a/tools/gen_crt_bundle.py
+++ b/tools/gen_crt_bundle.py
@@ -14,7 +14,7 @@
 # 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
+#     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,
@@ -37,27 +37,29 @@ try:
     from cryptography.hazmat.backends import default_backend
     from cryptography.hazmat.primitives import serialization
 except ImportError:
-    print('The cryptography package is not installed.'
-          'Please refer to the Get Started section of the ESP-IDF Programming Guide for '
-          'setting up the required packages.')
+    print(
+        "The cryptography package is not installed."
+        "Please refer to the Get Started section of the ESP-IDF Programming Guide for "
+        "setting up the required packages."
+    )
     raise
 
-ca_bundle_bin_file = 'x509_crt_bundle'
+ca_bundle_bin_file = "x509_crt_bundle"
 
 quiet = False
 
 
 def status(msg):
-    """ Print status message to stderr """
+    """Print status message to stderr"""
     if not quiet:
         critical(msg)
 
 
 def critical(msg):
-    """ Print critical message to stderr """
-    sys.stderr.write('gen_crt_bundle.py: ')
+    """Print critical message to stderr"""
+    sys.stderr.write("gen_crt_bundle.py: ")
     sys.stderr.write(msg)
-    sys.stderr.write('\n')
+    sys.stderr.write("\n")
 
 
 class CertificateBundle:
@@ -75,75 +77,81 @@ class CertificateBundle:
             found |= self.add_from_file(os.path.join(crts_path, file_path))
 
         if found is False:
-            raise InputError('No valid x509 certificates found in %s' % crts_path)
+            raise InputError("No valid x509 certificates found in %s" % crts_path)
 
     def add_from_file(self, file_path):
         try:
-            if file_path.endswith('.pem'):
-                status('Parsing certificates from %s' % file_path)
-                with open(file_path, 'r', encoding='utf-8') as f:
+            if file_path.endswith(".pem"):
+                status("Parsing certificates from %s" % file_path)
+                with open(file_path, "r", encoding="utf-8") as f:
                     crt_str = f.read()
                     self.add_from_pem(crt_str)
                     return True
 
-            elif file_path.endswith('.der'):
-                status('Parsing certificates from %s' % file_path)
-                with open(file_path, 'rb') as f:
+            elif file_path.endswith(".der"):
+                status("Parsing certificates from %s" % file_path)
+                with open(file_path, "rb") as f:
                     crt_str = f.read()
                     self.add_from_der(crt_str)
                     return True
 
         except ValueError:
-            critical('Invalid certificate in %s' % file_path)
-            raise InputError('Invalid certificate')
+            critical("Invalid certificate in %s" % file_path)
+            raise InputError("Invalid certificate")
 
         return False
 
     def add_from_pem(self, crt_str):
-        """ A single PEM file may have multiple certificates """
+        """A single PEM file may have multiple certificates"""
 
-        crt = ''
+        crt = ""
         count = 0
         start = False
 
         for strg in crt_str.splitlines(True):
-            if strg == '-----BEGIN CERTIFICATE-----\n' and start is False:
-                crt = ''
+            if strg == "-----BEGIN CERTIFICATE-----\n" and start is False:
+                crt = ""
                 start = True
-            elif strg == '-----END CERTIFICATE-----\n' and start is True:
-                crt += strg + '\n'
+            elif strg == "-----END CERTIFICATE-----\n" and start is True:
+                crt += strg + "\n"
                 start = False
-                self.certificates.append(x509.load_pem_x509_certificate(crt.encode(), default_backend()))
+                self.certificates.append(
+                    x509.load_pem_x509_certificate(crt.encode(), default_backend())
+                )
                 count += 1
             if start is True:
                 crt += strg
 
-        if(count == 0):
-            raise InputError('No certificate found')
+        if count == 0:
+            raise InputError("No certificate found")
 
-        status('Successfully added %d certificates' % count)
+        status("Successfully added %d certificates" % count)
 
     def add_from_der(self, crt_str):
         self.certificates.append(x509.load_der_x509_certificate(crt_str, default_backend()))
-        status('Successfully added 1 certificate')
+        status("Successfully added 1 certificate")
 
     def create_bundle(self):
         # Sort certificates in order to do binary search when looking up certificates
-        self.certificates = sorted(self.certificates, key=lambda cert: cert.subject.public_bytes(default_backend()))
+        self.certificates = sorted(
+            self.certificates, key=lambda cert: cert.subject.public_bytes(default_backend())
+        )
 
-        bundle = struct.pack('>H', len(self.certificates))
+        bundle = struct.pack(">H", len(self.certificates))
 
         for crt in self.certificates:
-            """ Read the public key as DER format """
+            """Read the public key as DER format"""
             pub_key = crt.public_key()
-            pub_key_der = pub_key.public_bytes(serialization.Encoding.DER, serialization.PublicFormat.SubjectPublicKeyInfo)
+            pub_key_der = pub_key.public_bytes(
+                serialization.Encoding.DER, serialization.PublicFormat.SubjectPublicKeyInfo
+            )
 
             """ Read the subject name as DER format """
             sub_name_der = crt.subject.public_bytes(default_backend())
 
             name_len = len(sub_name_der)
             key_len = len(pub_key_der)
-            len_data = struct.pack('>HH', name_len, key_len)
+            len_data = struct.pack(">HH", name_len, key_len)
 
             bundle += len_data
             bundle += sub_name_der
@@ -154,23 +162,25 @@ class CertificateBundle:
     def add_with_filter(self, crts_path, filter_path):
 
         filter_set = set()
-        with open(filter_path, 'r', encoding='utf-8') as f:
-            csv_reader = csv.reader(f, delimiter=',')
+        with open(filter_path, "r", encoding="utf-8") as f:
+            csv_reader = csv.reader(f, delimiter=",")
 
             # Skip header
             next(csv_reader)
             for row in csv_reader:
                 filter_set.add(row[1])
 
-        status('Parsing certificates from %s' % crts_path)
+        status("Parsing certificates from %s" % crts_path)
         crt_str = []
-        with open(crts_path, 'r', encoding='utf-8') as f:
+        with open(crts_path, "r", encoding="utf-8") as f:
             crt_str = f.read()
 
             # Split all certs into a list of (name, certificate string) tuples
-            pem_crts = re.findall(r'(^.+?)\n(=+\n[\s\S]+?END CERTIFICATE-----\n)', crt_str, re.MULTILINE)
+            pem_crts = re.findall(
+                r"(^.+?)\n(=+\n[\s\S]+?END CERTIFICATE-----\n)", crt_str, re.MULTILINE
+            )
 
-            filtered_crts = ''
+            filtered_crts = ""
             for name, crt in pem_crts:
                 if name in filter_set:
                     filtered_crts += crt
@@ -186,13 +196,27 @@ class InputError(RuntimeError):
 def main():
     global quiet
 
-    parser = argparse.ArgumentParser(description='ESP-IDF x509 certificate bundle utility')
+    parser = argparse.ArgumentParser(description="ESP-IDF x509 certificate bundle utility")
 
-    parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true')
-    parser.add_argument('--input', '-i', nargs='+', required=True,
-                        help='Paths to the custom certificate folders or files to parse, parses all .pem or .der files')
-    parser.add_argument('--filter', '-f', help='Path to CSV-file where the second columns contains the name of the certificates \
-                        that should be included from cacrt_all.pem')
+    parser.add_argument(
+        "--quiet",
+        "-q",
+        help="Don't print non-critical status messages to stderr",
+        action="store_true",
+    )
+    parser.add_argument(
+        "--input",
+        "-i",
+        nargs="+",
+        required=True,
+        help="Paths to the custom certificate folders or files to parse, parses all .pem or .der files",
+    )
+    parser.add_argument(
+        "--filter",
+        "-f",
+        help="Path to CSV-file where the second columns contains the name of the certificates \
+                        that should be included from cacrt_all.pem",
+    )
 
     args = parser.parse_args()
 
@@ -202,24 +226,24 @@ def main():
 
     for path in args.input:
         if os.path.isfile(path):
-            if os.path.basename(path) == 'cacrt_all.pem' and args.filter:
+            if os.path.basename(path) == "cacrt_all.pem" and args.filter:
                 bundle.add_with_filter(path, args.filter)
             else:
                 bundle.add_from_file(path)
         elif os.path.isdir(path):
             bundle.add_from_path(path)
         else:
-            raise InputError('Invalid --input=%s, is neither file nor folder' % args.input)
+            raise InputError("Invalid --input=%s, is neither file nor folder" % args.input)
 
-    status('Successfully added %d certificates in total' % len(bundle.certificates))
+    status("Successfully added %d certificates in total" % len(bundle.certificates))
 
     crt_bundle = bundle.create_bundle()
 
-    with open(ca_bundle_bin_file, 'wb') as f:
+    with open(ca_bundle_bin_file, "wb") as f:
         f.write(crt_bundle)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     try:
         main()
     except InputError as e:

From 3667a0bf17699bad66214371efeb934f0ec70757 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:11:08 -0500
Subject: [PATCH 1127/2403] experimentally undo pin of typer & click

---
 requirements-dev.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index f65c13fa69..eff1b84ca5 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,12 +1,10 @@
 # For nvm.toml
 cascadetoml
 jinja2
-# Undo this pin when click and typer are again compatible.
-typer==0.4.0
+typer
 
 sh
-# Undo this pin when click and typer are again compatible.
-click==8.0.4
+click
 cpp-coveralls
 requests
 requests-cache

From 09023abcd20db835923702ddd949b5ac8e55446e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:31:54 -0500
Subject: [PATCH 1128/2403] Update espressif function prototype to match

---
 ports/espressif/common-hal/ssl/SSLSocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/ssl/SSLSocket.c b/ports/espressif/common-hal/ssl/SSLSocket.c
index d106e16894..2446ce3005 100644
--- a/ports/espressif/common-hal/ssl/SSLSocket.c
+++ b/ports/espressif/common-hal/ssl/SSLSocket.c
@@ -96,7 +96,7 @@ bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog) {
     return common_hal_socketpool_socket_listen(self->sock, backlog);
 }
 
-mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len) {
+mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t *buf, uint32_t len) {
     int received = 0;
     bool timed_out = false;
     int status = 0;

From 905a5957b9056968753f75464de4a9a2f8108a87 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:32:37 -0500
Subject: [PATCH 1129/2403] allow gen_crt_bundle to generate a .S file directly

.. this gets rid of one of the steps of converting it
---
 requirements-dev.txt    |  3 +++
 tools/gen_crt_bundle.py | 51 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index eff1b84ca5..0dcfad3956 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -26,6 +26,9 @@ pyelftools
 # for stubs and annotations
 adafruit-circuitpython-typing
 
+# for mbedtls certificate store
+cryptography
+
 # for web workflow minify
 minify_html
 jsmin
diff --git a/tools/gen_crt_bundle.py b/tools/gen_crt_bundle.py
index 94855a067c..eb314bf25e 100755
--- a/tools/gen_crt_bundle.py
+++ b/tools/gen_crt_bundle.py
@@ -30,6 +30,7 @@ import os
 import re
 import struct
 import sys
+import textwrap
 from io import open
 
 try:
@@ -217,6 +218,15 @@ def main():
         help="Path to CSV-file where the second columns contains the name of the certificates \
                         that should be included from cacrt_all.pem",
     )
+    parser.add_argument(
+        "--asm",
+        "-S",
+        action="store_true",
+        default=False,
+        help="Output an asm file for use with gas, rather than a binary file",
+    )
+    parser.add_argument("--symbol", help="The symbol to define", default="x509_crt_bundle")
+    parser.add_argument("--output", "-o", help="The output file", default=None)
 
     args = parser.parse_args()
 
@@ -239,8 +249,45 @@ def main():
 
     crt_bundle = bundle.create_bundle()
 
-    with open(ca_bundle_bin_file, "wb") as f:
-        f.write(crt_bundle)
+    if args.asm:
+        symbol = args.symbol
+        filename = args.output or (ca_bundle_bin_file + ".S")
+        with open(filename, "w") as f:
+            print(
+                textwrap.dedent(
+                    f"""\
+                // Generated from {" ".join(args.input)} with {len(bundle.certificates)} certificates
+                .data
+                .section .rodata.embedded
+
+                .global {symbol}
+                .global _binary_{symbol}_start
+                .global _binary_{symbol}_end
+                {symbol}:
+                _binary_{symbol}_start:
+                """
+                ),
+                file=f,
+            )
+            for i in range(0, len(crt_bundle), 16):
+                chunk = crt_bundle[i : i + 16]
+                formatted = ", ".join(f"0x{byte:02x}" for byte in chunk)
+                print(f".byte {formatted}", file=f)
+            print(
+                textwrap.dedent(
+                    f"""\
+                _binary_{symbol}_end:
+
+                {symbol}_length:
+                .word {len(crt_bundle)}
+            """
+                ),
+                file=f,
+            )
+    else:
+        filename = args.output or ca_bundle_bin_file
+        with open(filename, "wb") as f:
+            f.write(crt_bundle)
 
 
 if __name__ == "__main__":

From a64c1a11c507d44a4cf67b2f180160ec370a1bf9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:35:03 -0500
Subject: [PATCH 1130/2403] move nina-fw certificates so it can be shared with
 other ports

---
 .gitmodules                                             | 2 +-
 {ports/espressif => lib}/certificates/README.md         | 0
 {ports/espressif => lib}/certificates/nina-fw           | 0
 ports/espressif/esp-idf-config/sdkconfig-esp32.defaults | 2 +-
 ports/espressif/esp-idf-config/sdkconfig.defaults       | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {ports/espressif => lib}/certificates/README.md (100%)
 rename {ports/espressif => lib}/certificates/nina-fw (100%)

diff --git a/.gitmodules b/.gitmodules
index 91701637f1..0d521b5ff0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -148,7 +148,7 @@
 	url = https://github.com/adafruit/esp-idf.git
 	branch = circuitpython8
 [submodule "ports/espressif/certificates/nina-fw"]
-	path = ports/espressif/certificates/nina-fw
+	path = lib/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
 [submodule "frozen/Adafruit_CircuitPython_ST7789"]
 	path = frozen/Adafruit_CircuitPython_ST7789
diff --git a/ports/espressif/certificates/README.md b/lib/certificates/README.md
similarity index 100%
rename from ports/espressif/certificates/README.md
rename to lib/certificates/README.md
diff --git a/ports/espressif/certificates/nina-fw b/lib/certificates/nina-fw
similarity index 100%
rename from ports/espressif/certificates/nina-fw
rename to lib/certificates/nina-fw
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 62e35a32e2..57700c65ca 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -795,7 +795,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
 CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem"
+CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/nina-fw/data/roots.pem"
 # end of Certificate Bundle
 
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index 21ac590698..b183cd630d 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -572,7 +572,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
 CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem"
+CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/nina-fw/data/roots.pem"
 # end of Certificate Bundle
 
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y

From 944d3881581e17524feec9420921ab9722748f68 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 13:46:35 -0500
Subject: [PATCH 1131/2403] copy esp_crt_bundle.c from esp-idf@d51f7d8821

---
 ports/raspberrypi/mbedtls/esp_crt_bundle.c | 251 +++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 ports/raspberrypi/mbedtls/esp_crt_bundle.c

diff --git a/ports/raspberrypi/mbedtls/esp_crt_bundle.c b/ports/raspberrypi/mbedtls/esp_crt_bundle.c
new file mode 100644
index 0000000000..65e2fa925d
--- /dev/null
+++ b/ports/raspberrypi/mbedtls/esp_crt_bundle.c
@@ -0,0 +1,251 @@
+// Copyright 2018-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.
+
+
+#include 
+#include 
+#include "esp_crt_bundle.h"
+#include "esp_log.h"
+
+#define BUNDLE_HEADER_OFFSET 2
+#define CRT_HEADER_OFFSET 4
+
+static const char *TAG = "esp-x509-crt-bundle";
+
+/* a dummy certificate so that
+ * cacert_ptr passes non-NULL check during handshake */
+static mbedtls_x509_crt s_dummy_crt;
+
+
+extern const uint8_t x509_crt_imported_bundle_bin_start[] asm("_binary_x509_crt_bundle_start");
+extern const uint8_t x509_crt_imported_bundle_bin_end[]   asm("_binary_x509_crt_bundle_end");
+
+
+typedef struct crt_bundle_t {
+    const uint8_t **crts;
+    uint16_t num_certs;
+    size_t x509_crt_bundle_len;
+} crt_bundle_t;
+
+static crt_bundle_t s_crt_bundle;
+
+static int esp_crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len);
+
+
+static int esp_crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len)
+{
+    int ret = 0;
+    mbedtls_x509_crt parent;
+    const mbedtls_md_info_t *md_info;
+    unsigned char hash[MBEDTLS_MD_MAX_SIZE];
+
+    mbedtls_x509_crt_init(&parent);
+
+    if ( (ret = mbedtls_pk_parse_public_key(&parent.pk, pub_key_buf, pub_key_len) ) != 0) {
+        ESP_LOGE(TAG, "PK parse failed with error %X", ret);
+        goto cleanup;
+    }
+
+
+    // Fast check to avoid expensive computations when not necessary
+    if (!mbedtls_pk_can_do(&parent.pk, child->sig_pk)) {
+        ESP_LOGE(TAG, "Simple compare failed");
+        ret = -1;
+        goto cleanup;
+    }
+
+    md_info = mbedtls_md_info_from_type(child->sig_md);
+    if ( (ret = mbedtls_md( md_info, child->tbs.p, child->tbs.len, hash )) != 0 ) {
+        ESP_LOGE(TAG, "Internal mbedTLS error %X", ret);
+        goto cleanup;
+    }
+
+    if ( (ret = mbedtls_pk_verify_ext( child->sig_pk, child->sig_opts, &parent.pk,
+                                       child->sig_md, hash, mbedtls_md_get_size( md_info ),
+                                       child->sig.p, child->sig.len )) != 0 ) {
+
+        ESP_LOGE(TAG, "PK verify failed with error %X", ret);
+        goto cleanup;
+    }
+cleanup:
+    mbedtls_x509_crt_free(&parent);
+
+    return ret;
+}
+
+
+/* This callback is called for every certificate in the chain. If the chain
+ * is proper each intermediate certificate is validated through its parent
+ * in the x509_crt_verify_chain() function. So this callback should
+ * only verify the first untrusted link in the chain is signed by the
+ * root certificate in the trusted bundle
+*/
+int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_t *flags)
+{
+    mbedtls_x509_crt *child = crt;
+
+    /* It's OK for a trusted cert to have a weak signature hash alg.
+       as we already trust this certificate */
+    uint32_t flags_filtered = *flags & ~(MBEDTLS_X509_BADCERT_BAD_MD);
+
+    if (flags_filtered != MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
+        return 0;
+    }
+
+
+    if (s_crt_bundle.crts == NULL) {
+        ESP_LOGE(TAG, "No certificates in bundle");
+        return MBEDTLS_ERR_X509_FATAL_ERROR;
+    }
+
+    ESP_LOGD(TAG, "%d certificates in bundle", s_crt_bundle.num_certs);
+
+    size_t name_len = 0;
+    const uint8_t *crt_name;
+
+    bool crt_found = false;
+    int start = 0;
+    int end = s_crt_bundle.num_certs - 1;
+    int middle = (end - start) / 2;
+
+    /* Look for the certificate using binary search on subject name */
+    while (start <= end) {
+        name_len = s_crt_bundle.crts[middle][0] << 8 | s_crt_bundle.crts[middle][1];
+        crt_name = s_crt_bundle.crts[middle] + CRT_HEADER_OFFSET;
+
+        int cmp_res = memcmp(child->issuer_raw.p, crt_name, name_len );
+        if (cmp_res == 0) {
+            crt_found = true;
+            break;
+        } else if (cmp_res < 0) {
+            end = middle - 1;
+        } else {
+            start = middle + 1;
+        }
+        middle = (start + end) / 2;
+    }
+
+    int ret = MBEDTLS_ERR_X509_FATAL_ERROR;
+    if (crt_found) {
+        size_t key_len = s_crt_bundle.crts[middle][2] << 8 | s_crt_bundle.crts[middle][3];
+        ret = esp_crt_check_signature(child, s_crt_bundle.crts[middle] + CRT_HEADER_OFFSET + name_len, key_len);
+    }
+
+    if (ret == 0) {
+        ESP_LOGI(TAG, "Certificate validated");
+        *flags = 0;
+        return 0;
+    }
+
+    ESP_LOGE(TAG, "Failed to verify certificate");
+    return MBEDTLS_ERR_X509_FATAL_ERROR;
+}
+
+
+/* Initialize the bundle into an array so we can do binary search for certs,
+   the bundle generated by the python utility is already presorted by subject name
+ */
+static esp_err_t esp_crt_bundle_init(const uint8_t *x509_bundle, size_t bundle_size)
+{
+    if (bundle_size < BUNDLE_HEADER_OFFSET + CRT_HEADER_OFFSET) {
+        ESP_LOGE(TAG, "Invalid certificate bundle");
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    uint16_t num_certs = (x509_bundle[0] << 8) | x509_bundle[1];
+    if (num_certs > CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS) {
+        ESP_LOGE(TAG, "No. of certs in the certificate bundle = %d exceeds\n"
+                      "Max allowed certificates in the certificate bundle = %d\n"
+                      "Please update the menuconfig option with appropriate value", num_certs, CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS);
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    const uint8_t **crts = calloc(num_certs, sizeof(x509_bundle));
+    if (crts == NULL) {
+        ESP_LOGE(TAG, "Unable to allocate memory for bundle");
+        return ESP_ERR_NO_MEM;
+    }
+
+    const uint8_t *cur_crt;
+    /* This is the maximum region that is allowed to access */
+    const uint8_t *bundle_end = x509_bundle + bundle_size;
+    cur_crt = x509_bundle + BUNDLE_HEADER_OFFSET;
+
+    for (int i = 0; i < num_certs; i++) {
+        crts[i] = cur_crt;
+        if (cur_crt + CRT_HEADER_OFFSET > bundle_end) {
+            ESP_LOGE(TAG, "Invalid certificate bundle");
+            free(crts);
+            return ESP_ERR_INVALID_ARG;
+        }
+        size_t name_len = cur_crt[0] << 8 | cur_crt[1];
+        size_t key_len = cur_crt[2] << 8 | cur_crt[3];
+        cur_crt = cur_crt + CRT_HEADER_OFFSET + name_len + key_len;
+    }
+
+    if (cur_crt > bundle_end) {
+        ESP_LOGE(TAG, "Invalid certificate bundle");
+        free(crts);
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    /* The previous crt bundle is only updated when initialization of the
+     * current crt_bundle is successful */
+    /* Free previous crt_bundle */
+    free(s_crt_bundle.crts);
+    s_crt_bundle.num_certs = num_certs;
+    s_crt_bundle.crts = crts;
+    return ESP_OK;
+}
+
+esp_err_t esp_crt_bundle_attach(void *conf)
+{
+    esp_err_t ret = ESP_OK;
+    // If no bundle has been set by the user then use the bundle embedded in the binary
+    if (s_crt_bundle.crts == NULL) {
+        ret = esp_crt_bundle_init(x509_crt_imported_bundle_bin_start, x509_crt_imported_bundle_bin_end - x509_crt_imported_bundle_bin_start);
+    }
+
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "Failed to attach bundle");
+        return ret;
+    }
+
+    if (conf) {
+        /* point to a dummy certificate
+         * This is only required so that the
+         * cacert_ptr passes non-NULL check during handshake
+         */
+        mbedtls_ssl_config *ssl_conf = (mbedtls_ssl_config *)conf;
+        mbedtls_x509_crt_init(&s_dummy_crt);
+        mbedtls_ssl_conf_ca_chain(ssl_conf, &s_dummy_crt, NULL);
+        mbedtls_ssl_conf_verify(ssl_conf, esp_crt_verify_callback, NULL);
+    }
+
+    return ret;
+}
+
+void esp_crt_bundle_detach(mbedtls_ssl_config *conf)
+{
+    free(s_crt_bundle.crts);
+    s_crt_bundle.crts = NULL;
+    if (conf) {
+        mbedtls_ssl_conf_verify(conf, NULL, NULL);
+    }
+}
+
+esp_err_t esp_crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size)
+{
+    return esp_crt_bundle_init(x509_bundle, bundle_size);
+}

From fabfdcf6fe9e45b30014180c72d69c31c428323c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 14:32:30 -0500
Subject: [PATCH 1132/2403] More ssl work

---
 ports/raspberrypi/Makefile                    |  11 +-
 ports/raspberrypi/common-hal/ssl/SSLContext.c |  13 +-
 ports/raspberrypi/common-hal/ssl/SSLContext.h |   6 +-
 ports/raspberrypi/common-hal/ssl/SSLSocket.c  |  11 +-
 ports/raspberrypi/common-hal/ssl/__init__.c   |   7 +
 ports/raspberrypi/common-hal/ssl/__init__.h   |   2 +
 .../{esp_crt_bundle.c => crt_bundle.c}        | 128 +++++++++---------
 ports/raspberrypi/mbedtls/crt_bundle.h        |  21 +++
 ports/raspberrypi/supervisor/port.c           |   8 ++
 9 files changed, 138 insertions(+), 69 deletions(-)
 rename ports/raspberrypi/mbedtls/{esp_crt_bundle.c => crt_bundle.c} (59%)
 create mode 100644 ports/raspberrypi/mbedtls/crt_bundle.h

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 506b19a795..bee6650577 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -350,12 +350,17 @@ SRC_MBEDTLS := $(addprefix lib/mbedtls/library/, \
         x509write_csr.c \
         xtea.c \
 	)
-SRC_C += $(SRC_MBEDTLS) mbedtls/mbedtls_port.c
+SRC_C += $(SRC_MBEDTLS) mbedtls/mbedtls_port.c mbedtls/crt_bundle.c
 CFLAGS += \
 	  -isystem $(TOP)/lib/mbedtls/include \
 	  -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' \
 
+$(BUILD)/x509_crt_bundle.S: $(TOP)/lib/certificates/nina-fw/data/roots.pem $(TOP)/tools/gen_crt_bundle.py
+	$(Q)$(PYTHON) $(TOP)/tools/gen_crt_bundle.py -i $< -o $@ --asm
+OBJ_MBEDTLS := $(BUILD)/x509_crt_bundle.o
 $(patsubst %.c,$(BUILD)/%.o,$(SRC_MBEDTLS))): CFLAGS += -Wno-suggest-attribute=format
+else
+OBJ_MBEDTLS :=
 endif
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
@@ -396,9 +401,9 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/boot2_padded_checksummed.o
-OBJ += $(OBJ_CYW43)
+OBJ += $(OBJ_CYW43) $(OBJ_MBEDTLS)
 
-$(BUILD)/boot2_padded_checksummed.o: $(BUILD)/boot2_padded_checksummed.S
+$(BUILD)/%.o: $(BUILD)/%.S
 	$(STEPECHO) "CC $<"
 	$(Q)$(CC) $(CFLAGS) -c -o $@ $<
 
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.c b/ports/raspberrypi/common-hal/ssl/SSLContext.c
index 90f26a3830..22d26b2da3 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLContext.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.c
@@ -31,16 +31,27 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 
+#include "mbedtls/crt_bundle.h"
+
 void common_hal_ssl_sslcontext_construct(ssl_sslcontext_obj_t *self) {
+    common_hal_ssl_sslcontext_set_default_verify_paths(self);
 }
 
 void common_hal_ssl_sslcontext_load_verify_locations(ssl_sslcontext_obj_t *self,
     const char *cadata) {
     mp_raise_NotImplementedError(NULL);
+
+    // self->crt_bundle_attach = NULL;
+    // self->use_global_ca_store = false;
+    // self->cacert_buf = (const unsigned char *)cadata;
+    // self->cacert_bytes = strlen(cadata) + 1;
 }
 
 void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+    self->crt_bundle_attach = crt_bundle_attach;
+    self->use_global_ca_store = true;
+    self->cacert_buf = NULL;
+    self->cacert_bytes = 0;
 }
 
 bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self) {
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.h b/ports/raspberrypi/common-hal/ssl/SSLContext.h
index dc8caba089..33c683951b 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLContext.h
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.h
@@ -28,8 +28,12 @@
 #pragma once
 
 #include "py/obj.h"
+#include "mbedtls/ssl.h"
 
 typedef struct {
     mp_obj_base_t base;
-    bool check_name;
+    bool check_name, use_global_ca_store;
+    const unsigned char *cacert_buf;
+    size_t cacert_bytes;
+    int (*crt_bundle_attach)(mbedtls_ssl_config *conf);
 } ssl_sslcontext_obj_t;
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index ab6ab04711..53434f8b92 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -171,8 +171,15 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
         goto cleanup;
     }
 
-    // no certificate checking now
-    mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
+    if (self->crt_bundle_attach != NULL) {
+        mp_printf(&mp_plat_print, "attaching bundle\n");
+        mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_REQUIRED);
+        self->crt_bundle_attach(&o->conf);
+        // } else if(self->cacert_buf && self->cacert_bytes) { // TODO: user bundle
+    } else {
+        mp_printf(&mp_plat_print, "yolo\n");
+        mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
+    }
     mbedtls_ssl_conf_rng(&o->conf, mbedtls_ctr_drbg_random, &o->ctr_drbg);
     #ifdef MBEDTLS_DEBUG_C
     mbedtls_ssl_conf_dbg(&o->conf, mbedtls_debug, NULL);
diff --git a/ports/raspberrypi/common-hal/ssl/__init__.c b/ports/raspberrypi/common-hal/ssl/__init__.c
index 79cb360e85..a59898b957 100644
--- a/ports/raspberrypi/common-hal/ssl/__init__.c
+++ b/ports/raspberrypi/common-hal/ssl/__init__.c
@@ -25,8 +25,15 @@
  * THE SOFTWARE.
  */
 
+#include "common-hal/ssl/__init__.h"
 #include "shared-bindings/ssl/__init__.h"
 #include "shared-bindings/ssl/SSLContext.h"
+#include "mbedtls/crt_bundle.h"
 
 void common_hal_ssl_create_default_context(ssl_sslcontext_obj_t *self) {
+    common_hal_ssl_sslcontext_construct(self);
+}
+
+void ssl_reset(void) {
+    crt_bundle_detach(NULL);
 }
diff --git a/ports/raspberrypi/common-hal/ssl/__init__.h b/ports/raspberrypi/common-hal/ssl/__init__.h
index 0bfe0789ec..6f1757ee47 100644
--- a/ports/raspberrypi/common-hal/ssl/__init__.h
+++ b/ports/raspberrypi/common-hal/ssl/__init__.h
@@ -25,3 +25,5 @@
  */
 
 #pragma once
+
+void ssl_reset(void);
diff --git a/ports/raspberrypi/mbedtls/esp_crt_bundle.c b/ports/raspberrypi/mbedtls/crt_bundle.c
similarity index 59%
rename from ports/raspberrypi/mbedtls/esp_crt_bundle.c
rename to ports/raspberrypi/mbedtls/crt_bundle.c
index 65e2fa925d..7fce35872b 100644
--- a/ports/raspberrypi/mbedtls/esp_crt_bundle.c
+++ b/ports/raspberrypi/mbedtls/crt_bundle.c
@@ -1,4 +1,5 @@
 // Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2022 Jeff Epler for Adafruit Industries
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,24 +13,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#define BUNDLE_MAX_CERTS (200)
 
 #include 
-#include 
-#include "esp_crt_bundle.h"
-#include "esp_log.h"
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "mbedtls/x509_crt.h"
+#include "mbedtls/crt_bundle.h"
 
 #define BUNDLE_HEADER_OFFSET 2
 #define CRT_HEADER_OFFSET 4
 
-static const char *TAG = "esp-x509-crt-bundle";
-
 /* a dummy certificate so that
  * cacert_ptr passes non-NULL check during handshake */
 static mbedtls_x509_crt s_dummy_crt;
 
+#define TAG "x509-crt-bundle"
 
-extern const uint8_t x509_crt_imported_bundle_bin_start[] asm("_binary_x509_crt_bundle_start");
-extern const uint8_t x509_crt_imported_bundle_bin_end[]   asm("_binary_x509_crt_bundle_end");
+#define LOGE(tag, fmt, ...) mp_printf(&mp_plat_print, tag ":" fmt "\n",##__VA_ARGS__)
+#if 0
+#define LOGI(tag, fmt, ...) mp_printf(&mp_plat_print, tag ":" fmt "\n",##__VA_ARGS__)
+#define LOGD(tag, fmt, ...) mp_printf(&mp_plat_print, tag ":" fmt "\n",##__VA_ARGS__)
+#else
+#define LOGI(tag, fmt, ...) do {} while (0)
+#define LOGD(tag, fmt, ...) do {} while (0)
+#endif
+
+extern const uint8_t x509_crt_imported_bundle_bin_start[] asm ("_binary_x509_crt_bundle_start");
+extern const uint8_t x509_crt_imported_bundle_bin_end[]   asm ("_binary_x509_crt_bundle_end");
 
 
 typedef struct crt_bundle_t {
@@ -40,11 +52,10 @@ typedef struct crt_bundle_t {
 
 static crt_bundle_t s_crt_bundle;
 
-static int esp_crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len);
+static int crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len);
 
 
-static int esp_crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len)
-{
+static int crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_key_buf, size_t pub_key_len) {
     int ret = 0;
     mbedtls_x509_crt parent;
     const mbedtls_md_info_t *md_info;
@@ -52,30 +63,30 @@ static int esp_crt_check_signature(mbedtls_x509_crt *child, const uint8_t *pub_k
 
     mbedtls_x509_crt_init(&parent);
 
-    if ( (ret = mbedtls_pk_parse_public_key(&parent.pk, pub_key_buf, pub_key_len) ) != 0) {
-        ESP_LOGE(TAG, "PK parse failed with error %X", ret);
+    if ((ret = mbedtls_pk_parse_public_key(&parent.pk, pub_key_buf, pub_key_len)) != 0) {
+        LOGE(TAG, "PK parse failed with error %X", ret);
         goto cleanup;
     }
 
 
     // Fast check to avoid expensive computations when not necessary
     if (!mbedtls_pk_can_do(&parent.pk, child->sig_pk)) {
-        ESP_LOGE(TAG, "Simple compare failed");
+        LOGE(TAG, "Simple compare failed");
         ret = -1;
         goto cleanup;
     }
 
     md_info = mbedtls_md_info_from_type(child->sig_md);
-    if ( (ret = mbedtls_md( md_info, child->tbs.p, child->tbs.len, hash )) != 0 ) {
-        ESP_LOGE(TAG, "Internal mbedTLS error %X", ret);
+    if ((ret = mbedtls_md(md_info, child->tbs.p, child->tbs.len, hash)) != 0) {
+        LOGE(TAG, "Internal mbedTLS error %X", ret);
         goto cleanup;
     }
 
-    if ( (ret = mbedtls_pk_verify_ext( child->sig_pk, child->sig_opts, &parent.pk,
-                                       child->sig_md, hash, mbedtls_md_get_size( md_info ),
-                                       child->sig.p, child->sig.len )) != 0 ) {
+    if ((ret = mbedtls_pk_verify_ext(child->sig_pk, child->sig_opts, &parent.pk,
+        child->sig_md, hash, mbedtls_md_get_size(md_info),
+        child->sig.p, child->sig.len)) != 0) {
 
-        ESP_LOGE(TAG, "PK verify failed with error %X", ret);
+        LOGE(TAG, "PK verify failed with error %X", ret);
         goto cleanup;
     }
 cleanup:
@@ -91,8 +102,7 @@ cleanup:
  * only verify the first untrusted link in the chain is signed by the
  * root certificate in the trusted bundle
 */
-int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_t *flags)
-{
+static int crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_t *flags) {
     mbedtls_x509_crt *child = crt;
 
     /* It's OK for a trusted cert to have a weak signature hash alg.
@@ -105,11 +115,11 @@ int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_
 
 
     if (s_crt_bundle.crts == NULL) {
-        ESP_LOGE(TAG, "No certificates in bundle");
+        LOGE(TAG, "No certificates in bundle");
         return MBEDTLS_ERR_X509_FATAL_ERROR;
     }
 
-    ESP_LOGD(TAG, "%d certificates in bundle", s_crt_bundle.num_certs);
+    LOGD(TAG, "%d certificates in bundle", s_crt_bundle.num_certs);
 
     size_t name_len = 0;
     const uint8_t *crt_name;
@@ -124,7 +134,7 @@ int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_
         name_len = s_crt_bundle.crts[middle][0] << 8 | s_crt_bundle.crts[middle][1];
         crt_name = s_crt_bundle.crts[middle] + CRT_HEADER_OFFSET;
 
-        int cmp_res = memcmp(child->issuer_raw.p, crt_name, name_len );
+        int cmp_res = memcmp(child->issuer_raw.p, crt_name, name_len);
         if (cmp_res == 0) {
             crt_found = true;
             break;
@@ -139,16 +149,16 @@ int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_
     int ret = MBEDTLS_ERR_X509_FATAL_ERROR;
     if (crt_found) {
         size_t key_len = s_crt_bundle.crts[middle][2] << 8 | s_crt_bundle.crts[middle][3];
-        ret = esp_crt_check_signature(child, s_crt_bundle.crts[middle] + CRT_HEADER_OFFSET + name_len, key_len);
+        ret = crt_check_signature(child, s_crt_bundle.crts[middle] + CRT_HEADER_OFFSET + name_len, key_len);
     }
 
     if (ret == 0) {
-        ESP_LOGI(TAG, "Certificate validated");
+        LOGI(TAG, "Certificate validated");
         *flags = 0;
         return 0;
     }
 
-    ESP_LOGE(TAG, "Failed to verify certificate");
+    LOGE(TAG, "Failed to verify certificate");
     return MBEDTLS_ERR_X509_FATAL_ERROR;
 }
 
@@ -156,25 +166,24 @@ int esp_crt_verify_callback(void *buf, mbedtls_x509_crt *crt, int depth, uint32_
 /* Initialize the bundle into an array so we can do binary search for certs,
    the bundle generated by the python utility is already presorted by subject name
  */
-static esp_err_t esp_crt_bundle_init(const uint8_t *x509_bundle, size_t bundle_size)
-{
+static err_t crt_bundle_init(const uint8_t *x509_bundle, size_t bundle_size) {
     if (bundle_size < BUNDLE_HEADER_OFFSET + CRT_HEADER_OFFSET) {
-        ESP_LOGE(TAG, "Invalid certificate bundle");
-        return ESP_ERR_INVALID_ARG;
+        LOGE(TAG, "Invalid certificate bundle");
+        return -MP_EINVAL;
     }
 
     uint16_t num_certs = (x509_bundle[0] << 8) | x509_bundle[1];
-    if (num_certs > CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS) {
-        ESP_LOGE(TAG, "No. of certs in the certificate bundle = %d exceeds\n"
-                      "Max allowed certificates in the certificate bundle = %d\n"
-                      "Please update the menuconfig option with appropriate value", num_certs, CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS);
-        return ESP_ERR_INVALID_ARG;
+    if (num_certs > BUNDLE_MAX_CERTS) {
+        // No. of certs in the certificate bundle = %d exceeds\n"
+        // Max allowed certificates in the certificate bundle = %d\n"
+        // Please update the menuconfig option with appropriate value", num_certs, BUNDLE_MAX_CERTS
+        return -MP_E2BIG;
     }
 
-    const uint8_t **crts = calloc(num_certs, sizeof(x509_bundle));
+    const uint8_t **crts = m_tracked_calloc(num_certs, sizeof(x509_bundle));
     if (crts == NULL) {
-        ESP_LOGE(TAG, "Unable to allocate memory for bundle");
-        return ESP_ERR_NO_MEM;
+        LOGE(TAG, "Unable to allocate memory for bundle");
+        return -MP_ENOMEM;
     }
 
     const uint8_t *cur_crt;
@@ -185,9 +194,9 @@ static esp_err_t esp_crt_bundle_init(const uint8_t *x509_bundle, size_t bundle_s
     for (int i = 0; i < num_certs; i++) {
         crts[i] = cur_crt;
         if (cur_crt + CRT_HEADER_OFFSET > bundle_end) {
-            ESP_LOGE(TAG, "Invalid certificate bundle");
-            free(crts);
-            return ESP_ERR_INVALID_ARG;
+            LOGE(TAG, "Invalid certificate bundle");
+            m_tracked_free(crts);
+            return -MP_EINVAL;
         }
         size_t name_len = cur_crt[0] << 8 | cur_crt[1];
         size_t key_len = cur_crt[2] << 8 | cur_crt[3];
@@ -195,57 +204,52 @@ static esp_err_t esp_crt_bundle_init(const uint8_t *x509_bundle, size_t bundle_s
     }
 
     if (cur_crt > bundle_end) {
-        ESP_LOGE(TAG, "Invalid certificate bundle");
-        free(crts);
-        return ESP_ERR_INVALID_ARG;
+        LOGE(TAG, "Invalid certificate bundle");
+        m_tracked_free(crts);
+        return -MP_EINVAL;
     }
 
     /* The previous crt bundle is only updated when initialization of the
      * current crt_bundle is successful */
     /* Free previous crt_bundle */
-    free(s_crt_bundle.crts);
+    m_tracked_free(s_crt_bundle.crts);
     s_crt_bundle.num_certs = num_certs;
     s_crt_bundle.crts = crts;
-    return ESP_OK;
+    return 0;
 }
 
-esp_err_t esp_crt_bundle_attach(void *conf)
-{
-    esp_err_t ret = ESP_OK;
+int crt_bundle_attach(mbedtls_ssl_config *ssl_conf) {
+    int ret = 0;
     // If no bundle has been set by the user then use the bundle embedded in the binary
     if (s_crt_bundle.crts == NULL) {
-        ret = esp_crt_bundle_init(x509_crt_imported_bundle_bin_start, x509_crt_imported_bundle_bin_end - x509_crt_imported_bundle_bin_start);
+        ret = crt_bundle_init(x509_crt_imported_bundle_bin_start, x509_crt_imported_bundle_bin_end - x509_crt_imported_bundle_bin_start);
     }
 
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "Failed to attach bundle");
+    if (ret != 0) {
         return ret;
     }
 
-    if (conf) {
+    if (ssl_conf) {
         /* point to a dummy certificate
          * This is only required so that the
          * cacert_ptr passes non-NULL check during handshake
          */
-        mbedtls_ssl_config *ssl_conf = (mbedtls_ssl_config *)conf;
         mbedtls_x509_crt_init(&s_dummy_crt);
         mbedtls_ssl_conf_ca_chain(ssl_conf, &s_dummy_crt, NULL);
-        mbedtls_ssl_conf_verify(ssl_conf, esp_crt_verify_callback, NULL);
+        mbedtls_ssl_conf_verify(ssl_conf, crt_verify_callback, NULL);
     }
 
     return ret;
 }
 
-void esp_crt_bundle_detach(mbedtls_ssl_config *conf)
-{
-    free(s_crt_bundle.crts);
+void crt_bundle_detach(mbedtls_ssl_config *conf) {
+    m_tracked_free(s_crt_bundle.crts);
     s_crt_bundle.crts = NULL;
     if (conf) {
         mbedtls_ssl_conf_verify(conf, NULL, NULL);
     }
 }
 
-esp_err_t esp_crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size)
-{
-    return esp_crt_bundle_init(x509_bundle, bundle_size);
+int crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size) {
+    return crt_bundle_init(x509_bundle, bundle_size);
 }
diff --git a/ports/raspberrypi/mbedtls/crt_bundle.h b/ports/raspberrypi/mbedtls/crt_bundle.h
new file mode 100644
index 0000000000..b265ae4abe
--- /dev/null
+++ b/ports/raspberrypi/mbedtls/crt_bundle.h
@@ -0,0 +1,21 @@
+// Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2022 Jeff Epler for Adafruit Industries
+//
+// 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.
+
+#pragma once
+#include "mbedtls/ssl.h"
+
+int crt_bundle_attach(mbedtls_ssl_config *conf);
+void crt_bundle_detach(mbedtls_ssl_config *conf);
+int crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size);
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 94e57c2028..781d2b11d2 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -41,6 +41,10 @@
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
+#if CIRCUITPY_SSL
+#include "common-hal/ssl/__init__.h"
+#endif
+
 #if CIRCUITPY_WIFI
 #include "common-hal/wifi/__init__.h"
 #endif
@@ -179,6 +183,10 @@ void reset_port(void) {
     audio_dma_reset();
     #endif
 
+    #if CIRCUITPY_SSL
+    ssl_reset();
+    #endif
+
     #if CIRCUITPY_WIFI
     wifi_reset();
     #endif

From 14f2309b6f18086cc7adb4514eaf009a4ca843d4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 14:51:13 -0500
Subject: [PATCH 1133/2403] Enable more key exchange methods

This is intended (but not entirely verified) to match our esp32 builds.
It does fix accessing https://circuitpython.org, which failed before with
"MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE".

It still doesn't work on a personal website of mine with valid letsencrypt
certificate but I haven't verified whether it works on esp32s2 with CP.
That site only allows TLS 1.3, while this mbedtls only supports up to
1.2.
The version of mbedtls we adopted based on micropython's use has no
TLS 1.3 support, but the one in espressif esp-idf does.
---
 ports/raspberrypi/mbedtls/mbedtls_config.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/raspberrypi/mbedtls/mbedtls_config.h b/ports/raspberrypi/mbedtls/mbedtls_config.h
index 4fe4f8640e..8c953c7072 100644
--- a/ports/raspberrypi/mbedtls/mbedtls_config.h
+++ b/ports/raspberrypi/mbedtls/mbedtls_config.h
@@ -50,8 +50,16 @@
 #define MBEDTLS_ECP_DP_BP512R1_ENABLED
 #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
 #define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 #define MBEDTLS_NO_PLATFORM_ENTROPY
 #define MBEDTLS_PKCS1_V15
 #define MBEDTLS_SHA256_SMALLER
@@ -68,10 +76,12 @@
 // Enable mbedtls modules
 #define MBEDTLS_AES_C
 #define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_ASN1_WRITE_C
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
 #define MBEDTLS_ECDH_C
+#define MBEDTLS_ECDSA_C
 #define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
 #define MBEDTLS_ERROR_C
@@ -94,6 +104,7 @@
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
 #define MBEDTLS_HAVE_TIME
+#define MBEDTLS_DHM_C // needed by DHE_PSK
 #undef MBEDTLS_HAVE_TIME_DATE
 
 // Memory allocation hooks

From 4a9389d347d5b033dbc47875656a359bcbb5404f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 14:57:04 -0500
Subject: [PATCH 1134/2403] remove debug message

---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 53434f8b92..4d6148a390 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -172,12 +172,10 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
     }
 
     if (self->crt_bundle_attach != NULL) {
-        mp_printf(&mp_plat_print, "attaching bundle\n");
         mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_REQUIRED);
         self->crt_bundle_attach(&o->conf);
         // } else if(self->cacert_buf && self->cacert_bytes) { // TODO: user bundle
     } else {
-        mp_printf(&mp_plat_print, "yolo\n");
         mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
     }
     mbedtls_ssl_conf_rng(&o->conf, mbedtls_ctr_drbg_random, &o->ctr_drbg);

From 2dc283f57858dcb3819112241f8c50a3512d7a94 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 15:10:14 -0500
Subject: [PATCH 1135/2403] close underlying socket object when closing ssl
 socket

---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 4d6148a390..69ebcffb7e 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -267,6 +267,7 @@ bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host,
 
 void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
     self->closed = true;
+    common_hal_socketpool_socket_close(self->sock);
     mbedtls_pk_free(&self->pkey);
     mbedtls_x509_crt_free(&self->cert);
     mbedtls_x509_crt_free(&self->cacert);

From 3d91ea444a525032774f1e305478a0837af7d318 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 5 Oct 2022 17:37:33 -0400
Subject: [PATCH 1136/2403] run black on
 tools/ci_check_duplicate_usb_vid_pid.py

---
 tools/ci_check_duplicate_usb_vid_pid.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 5c509243da..a75bd2b3f8 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -55,7 +55,11 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8r2",
         "espressif_esp32s3_devkitc_1_n8r8",
     ],
-    "0x303A:0x7009": ["espressif_esp32s2_devkitc_1_n4", "espressif_esp32s2_devkitc_1_n4r2", "espressif_esp32s2_devkitc_1_n8r2"],
+    "0x303A:0x7009": [
+        "espressif_esp32s2_devkitc_1_n4",
+        "espressif_esp32s2_devkitc_1_n4r2",
+        "espressif_esp32s2_devkitc_1_n8r2",
+    ],
 }
 
 cli_parser = argparse.ArgumentParser(

From 27e66236574ac87599e31aba52a119a17c578569 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 18:15:09 -0500
Subject: [PATCH 1137/2403] Add unicode support to dotenv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Newly passing tests:
```
aa🐍bb=key with emoji
value_with_emoji=aa🐍bb
```
---
 shared-module/dotenv/__init__.c        | 2 +-
 tests/circuitpython/dotenv_test.env    | 2 ++
 tests/circuitpython/dotenv_test.py     | 2 ++
 tests/circuitpython/dotenv_test.py.exp | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index 24587247f0..be8f2353de 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -124,7 +124,7 @@ STATIC bool key_matches(file_arg *active_file, const char *key) {
             // Still on tentative key; see if it matches the next supplied key character,
             // but don't run off the end of the supplied key.
             if (key_pos < key_len) {
-                matches = matches && key[key_pos] == character;
+                matches = matches && (unsigned char)key[key_pos] == character;
                 escaped = false;
                 key_pos++;
             } else {
diff --git a/tests/circuitpython/dotenv_test.env b/tests/circuitpython/dotenv_test.env
index 7119774fa1..e3bc23d6ce 100644
--- a/tests/circuitpython/dotenv_test.env
+++ b/tests/circuitpython/dotenv_test.env
@@ -21,3 +21,5 @@ space_after_key =value
 space_after_key_before_value = value
 quoted_then_comment='value'#comment
 hash_with_spaces=#value value
+aa🐍bb=key with emoji
+value_with_emoji=aa🐍bb
diff --git a/tests/circuitpython/dotenv_test.py b/tests/circuitpython/dotenv_test.py
index 8445b98030..f217b72dbe 100644
--- a/tests/circuitpython/dotenv_test.py
+++ b/tests/circuitpython/dotenv_test.py
@@ -23,3 +23,5 @@ print(f"space_after_key={dotenv.get_key(FILE, 'space_after_key')}")
 print(f"space_after_key_before_value={dotenv.get_key(FILE, 'space_after_key_before_value')}")
 print(f"quoted_then_comment={dotenv.get_key(FILE, 'quoted_then_comment')}")
 print(f"hash_with_spaces={dotenv.get_key(FILE, 'hash_with_spaces')}")
+print(f"aa🐍bb={dotenv.get_key(FILE, 'aa🐍bb')}")
+print(f"value_with_emoji={dotenv.get_key(FILE, 'value_with_emoji')}")
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
index d1cde70182..d67d570999 100644
--- a/tests/circuitpython/dotenv_test.py.exp
+++ b/tests/circuitpython/dotenv_test.py.exp
@@ -19,3 +19,5 @@ space_after_key=value
 space_after_key_before_value=value
 quoted_then_comment=value
 hash_with_spaces=#value value
+aa🐍bb=key with emoji
+value_with_emoji=aa🐍bb

From d31acdef6c59d5dfaf5281b76c12c9a1b374526e Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Thu, 6 Oct 2022 02:19:48 +0200
Subject: [PATCH 1138/2403] we don't use AUTORESET_DELAY_MS

---
 .../boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
index 9763556b20..51fb60fe1a 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
@@ -37,5 +37,3 @@
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
 
 #define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
-#define AUTORESET_DELAY_MS          500

From 296960dd897ae89366af556780a425999dea4f59 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 5 Oct 2022 20:23:19 -0400
Subject: [PATCH 1139/2403] shorten board.c

---
 .../boards/espressif_esp32s2_devkitc_1_n8r2/board.c   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
index 0432485111..b3c8cb4191 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif /* DEBUG */
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

From b0ef35d50ba99c73789f86498d68a45172aa587f Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 5 Oct 2022 20:05:47 +0530
Subject: [PATCH 1140/2403] update storage extension implementation

---
 ports/espressif/supervisor/internal_flash.c | 143 +++++++++++++-------
 supervisor/flash.h                          |   4 +
 supervisor/shared/filesystem.c              |   6 +
 3 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/ports/espressif/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c
index 3c136cc9fa..d6e96732ba 100644
--- a/ports/espressif/supervisor/internal_flash.c
+++ b/ports/espressif/supervisor/internal_flash.c
@@ -24,6 +24,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "supervisor/internal_flash.h"
 
 #include 
@@ -32,31 +33,46 @@
 
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
+
 #include "py/mphal.h"
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "lib/oofatfs/ff.h"
 
 #include "esp_ota_ops.h"
 #include "esp_partition.h"
 
+#include "supervisor/filesystem.h"
 #include "supervisor/flash.h"
 #include "supervisor/usb.h"
 
-#if CIRCUITPY_STORAGE_EXTEND
-#define PARTITION_NUM (2)
-#else
-#define PARTITION_NUM (1)
-#endif
-
-STATIC const esp_partition_t *_partition[PARTITION_NUM];
+#define OP_READ     0
+#define OP_WRITE    1
 
 // TODO: Split the caching out of supervisor/shared/external_flash so we can use it.
 #define SECTOR_SIZE 4096
 STATIC uint8_t _cache[SECTOR_SIZE];
 STATIC uint32_t _cache_lba = 0xffffffff;
 
+#if CIRCUITPY_STORAGE_EXTEND
+#if FF_MAX_SS == FF_MIN_SS
+#define SECSIZE(fs) (FF_MIN_SS)
+#else
+#define SECSIZE(fs) ((fs)->ssize)
+#endif // FF_MAX_SS == FF_MIN_SS
+STATIC DWORD fatfs_bytes(void) {
+    FATFS *fatfs = filesystem_circuitpy();
+    return (fatfs->csize * SECSIZE(fatfs)) * (fatfs->n_fatent - 2);
+}
+STATIC bool storage_extended = true;
+STATIC const esp_partition_t *_partition[2];
+#else
+STATIC const esp_partition_t *_partition[1];
+#endif // CIRCUITPY_STORAGE_EXTEND
+
 void supervisor_flash_init(void) {
+    if (_partition[0] != NULL) {
+        return;
+    }
     _partition[0] = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
         ESP_PARTITION_SUBTYPE_DATA_FAT,
         NULL);
@@ -71,38 +87,60 @@ uint32_t supervisor_flash_get_block_size(void) {
 
 uint32_t supervisor_flash_get_block_count(void) {
     #if CIRCUITPY_STORAGE_EXTEND
-    return (_partition[0]->size + _partition[1]->size) / FILESYSTEM_BLOCK_SIZE;
+    return ((storage_extended) ? (_partition[0]->size + _partition[1]->size) : _partition[0]->size) / FILESYSTEM_BLOCK_SIZE;
     #else
     return _partition[0]->size / FILESYSTEM_BLOCK_SIZE;
     #endif
 }
 
 void port_internal_flash_flush(void) {
-
 }
 
-mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
-    uint32_t offset = block * FILESYSTEM_BLOCK_SIZE;
-    uint32_t read_total = num_blocks * FILESYSTEM_BLOCK_SIZE;
-
-    #if CIRCUITPY_STORAGE_EXTEND
-    if (offset > _partition[0]->size) {
-        // only read from partition 1
-        esp_partition_read(_partition[1], (offset - _partition[0]->size), dest, read_total);
-    } else if ((offset + read_total) > _partition[0]->size) {
-        // first read from partition 0, then partition 1
-        uint32_t read_0 = _partition[0]->size - offset;
-        uint32_t read_1 = read_total - read_0;
-        esp_partition_read(_partition[0], offset, dest, read_0);
-        esp_partition_read(_partition[1], 0, (dest + read_0), read_1);
-    } else
-    #endif
-    {
-        // only read from partition 0
-        esp_partition_read(_partition[0], offset, dest, read_total);
+STATIC void single_partition_rw(const esp_partition_t *partition, uint8_t *data,
+    const uint32_t offset, const uint32_t size_total, const bool op) {
+    if (op == OP_READ) {
+        esp_partition_read(partition, offset, data, size_total);
+    } else {
+        esp_partition_erase_range(partition, offset, size_total);
+        esp_partition_write(partition, offset, _cache, size_total);
     }
+}
 
-    return 0;
+#if CIRCUITPY_STORAGE_EXTEND
+STATIC void multi_partition_rw(uint8_t *data,
+    const uint32_t offset, const uint32_t size_total, const bool op) {
+    if (offset > _partition[0]->size) {
+        // only r/w partition 1
+        single_partition_rw(_partition[1], data, (offset - _partition[0]->size), size_total, op);
+    } else if ((offset + size_total) > _partition[0]->size) {
+        // first r/w partition 0, then partition 1
+        uint32_t size_0 = _partition[0]->size - offset;
+        uint32_t size_1 = size_total - size_0;
+        if (op == OP_READ) {
+            esp_partition_read(_partition[0], offset, data, size_0);
+            esp_partition_read(_partition[1], 0, (data + size_0), size_1);
+        } else {
+            esp_partition_erase_range(_partition[0], offset, size_0);
+            esp_partition_write(_partition[0], offset, _cache, size_0);
+            esp_partition_erase_range(_partition[1], 0, size_1);
+            esp_partition_write(_partition[1], 0, (_cache + size_0), size_1);
+        }
+    } else {
+        // only r/w partition 0
+        single_partition_rw(_partition[0], data, offset, size_total, op);
+    }
+}
+#endif
+
+mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
+    const uint32_t offset = block * FILESYSTEM_BLOCK_SIZE;
+    const uint32_t read_total = num_blocks * FILESYSTEM_BLOCK_SIZE;
+    #if CIRCUITPY_STORAGE_EXTEND
+    multi_partition_rw(dest, offset, read_total, OP_READ);
+    #else
+    single_partition_rw(_partition[0], dest, offset, read_total, OP_READ);
+    #endif
+    return 0; // success
 }
 
 mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32_t num_blocks) {
@@ -112,12 +150,10 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
         uint32_t block_address = lba + block;
         uint32_t sector_offset = block_address / blocks_per_sector * SECTOR_SIZE;
         uint8_t block_offset = block_address % blocks_per_sector;
-
         if (_cache_lba != block_address) {
             supervisor_flash_read_blocks(_cache, sector_offset / FILESYSTEM_BLOCK_SIZE, blocks_per_sector);
             _cache_lba = sector_offset;
         }
-
         for (uint8_t b = block_offset; b < blocks_per_sector; b++) {
             // Stop copying after the last block.
             if (block >= num_blocks) {
@@ -128,31 +164,34 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
                 FILESYSTEM_BLOCK_SIZE);
             block++;
         }
-
         #if CIRCUITPY_STORAGE_EXTEND
-        if (sector_offset > _partition[0]->size) {
-            // only write to partition 1
-            esp_partition_erase_range(_partition[1], sector_offset - _partition[0]->size, SECTOR_SIZE);
-            esp_partition_write(_partition[1], sector_offset - _partition[0]->size, _cache, SECTOR_SIZE);
-        } else if ((sector_offset + SECTOR_SIZE) > _partition[0]->size) {
-            // first write to partition 0, then partition 1
-            uint32_t write_0 = _partition[0]->size - sector_offset;
-            uint32_t write_1 = SECTOR_SIZE - write_0;
-            esp_partition_erase_range(_partition[0], sector_offset, write_0);
-            esp_partition_write(_partition[0], sector_offset, _cache, write_0);
-            esp_partition_erase_range(_partition[1], 0, write_1);
-            esp_partition_write(_partition[1], 0, _cache + write_0, write_1);
-        } else
+        multi_partition_rw(_cache, sector_offset, SECTOR_SIZE, OP_WRITE);
+        #else
+        single_partition_rw(_partition[0], _cache, sector_offset, SECTOR_SIZE, OP_READ);
         #endif
-        {
-            // only write to partition 0
-            esp_partition_erase_range(_partition[0], sector_offset, SECTOR_SIZE);
-            esp_partition_write(_partition[0], sector_offset, _cache, SECTOR_SIZE);
-        }
     }
-
     return 0; // success
 }
 
 void supervisor_flash_release_cache(void) {
 }
+
+void supervisor_flash_set_extended(bool extended) {
+    #if CIRCUITPY_STORAGE_EXTEND
+    storage_extended = extended;
+    #endif
+}
+
+bool supervisor_flash_get_extended(void) {
+    #if CIRCUITPY_STORAGE_EXTEND
+    return storage_extended;
+    #else
+    return false;
+    #endif
+}
+
+void supervisor_flash_update_extended(void) {
+    #if CIRCUITPY_STORAGE_EXTEND
+    storage_extended = (_partition[0]->size < fatfs_bytes());
+    #endif
+}
diff --git a/supervisor/flash.h b/supervisor/flash.h
index 21d76c9984..5154cb8598 100644
--- a/supervisor/flash.h
+++ b/supervisor/flash.h
@@ -50,4 +50,8 @@ void supervisor_flash_init_vfs(struct _fs_user_mount_t *vfs);
 void supervisor_flash_flush(void);
 void supervisor_flash_release_cache(void);
 
+void supervisor_flash_set_extended(bool extended);
+bool supervisor_flash_get_extended(void);
+void supervisor_flash_update_extended(void);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_FLASH_H
diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c
index 283849adc3..01aba0a9ac 100644
--- a/supervisor/shared/filesystem.c
+++ b/supervisor/shared/filesystem.c
@@ -143,16 +143,22 @@ bool filesystem_init(bool create_allowed, bool force_create) {
     } else if (res != FR_OK) {
         return false;
     }
+
     vfs->str = "/";
     vfs->len = 1;
     vfs->obj = MP_OBJ_FROM_PTR(vfs_fat);
     vfs->next = NULL;
+
     MP_STATE_VM(vfs_mount_table) = vfs;
 
     // The current directory is used as the boot up directory.
     // It is set to the internal flash filesystem by default.
     MP_STATE_PORT(vfs_cur) = vfs;
 
+    #if CIRCUITPY_STORAGE_EXTEND
+    supervisor_flash_update_extended();
+    #endif
+
     return true;
 }
 

From 4f753251db844e61bbf621f6d9288eaae33b667c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 6 Oct 2022 16:05:33 +0530
Subject: [PATCH 1141/2403] cleanup `mpconfigboard.mk` of espressif boards

- move `INTERNAL_FLASH_FILESYSTEM` to `mpconfigport.mk`
- move `LONGINT_IMPL` to `mpconfigport.mk`
- move `CFG_TUD_TASK_QUEUE_SZ` to `Makefile`
---
 ports/espressif/Makefile                                 | 9 +++++++--
 .../boards/adafruit_esp32s2_camera/mpconfigboard.mk      | 7 -------
 .../boards/adafruit_feather_esp32_v2/mpconfigboard.mk    | 7 -------
 .../boards/adafruit_feather_esp32s2/mpconfigboard.mk     | 7 -------
 .../boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk | 7 -------
 .../mpconfigboard.mk                                     | 7 -------
 .../mpconfigboard.mk                                     | 7 -------
 .../adafruit_feather_esp32s3_nopsram/mpconfigboard.mk    | 7 -------
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk | 7 -------
 .../boards/adafruit_feather_huzzah32/mpconfigboard.mk    | 7 -------
 .../espressif/boards/adafruit_funhouse/mpconfigboard.mk  | 7 -------
 .../adafruit_magtag_2.9_grayscale/mpconfigboard.mk       | 7 -------
 .../boards/adafruit_metro_esp32s2/mpconfigboard.mk       | 7 -------
 .../boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk     | 7 -------
 .../boards/adafruit_qtpy_esp32c3/mpconfigboard.mk        | 2 --
 .../boards/adafruit_qtpy_esp32s2/mpconfigboard.mk        | 7 -------
 .../adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk       | 7 -------
 .../boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk      | 2 --
 .../boards/ai_thinker_esp32-c3s/mpconfigboard.mk         | 2 --
 .../boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk   | 7 -------
 ports/espressif/boards/artisense_rd00/mpconfigboard.mk   | 7 -------
 .../espressif/boards/atmegazero_esp32s2/mpconfigboard.mk | 7 -------
 ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk  | 2 --
 ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk       | 7 -------
 ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk      | 7 -------
 .../espressif/boards/crumpspace_crumps2/mpconfigboard.mk | 7 -------
 .../boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk | 7 -------
 .../boards/electroniccats_bastwifi/mpconfigboard.mk      | 7 -------
 .../boards/espressif_esp32_eye/mpconfigboard.mk          | 3 ---
 .../espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk      | 2 --
 .../espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk      | 7 -------
 .../espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk    | 7 -------
 .../espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk    | 7 -------
 .../boards/espressif_esp32s3_box/mpconfigboard.mk        | 7 -------
 .../boards/espressif_esp32s3_box_lite/mpconfigboard.mk   | 7 -------
 .../espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk      | 7 -------
 .../espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk    | 7 -------
 .../espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk    | 7 -------
 .../espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk      | 7 -------
 .../boards/espressif_esp32s3_eye/mpconfigboard.mk        | 7 -------
 .../boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk | 7 -------
 .../boards/espressif_hmi_devkit_1/mpconfigboard.mk       | 7 -------
 .../boards/espressif_kaluga_1.3/mpconfigboard.mk         | 7 -------
 .../espressif/boards/espressif_kaluga_1/mpconfigboard.mk | 7 -------
 .../boards/espressif_saola_1_wroom/mpconfigboard.mk      | 7 -------
 .../boards/espressif_saola_1_wrover/mpconfigboard.mk     | 7 -------
 .../boards/franzininho_wifi_wroom/mpconfigboard.mk       | 7 -------
 .../boards/franzininho_wifi_wrover/mpconfigboard.mk      | 7 -------
 .../boards/gravitech_cucumber_m/mpconfigboard.mk         | 7 -------
 .../boards/gravitech_cucumber_ms/mpconfigboard.mk        | 7 -------
 .../boards/gravitech_cucumber_r/mpconfigboard.mk         | 7 -------
 .../boards/gravitech_cucumber_rs/mpconfigboard.mk        | 7 -------
 .../boards/hardkernel_odroid_go/mpconfigboard.mk         | 7 -------
 ports/espressif/boards/hexky_s2/mpconfigboard.mk         | 7 -------
 ports/espressif/boards/hiibot_iots2/mpconfigboard.mk     | 7 -------
 .../espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk | 2 --
 .../boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk        | 2 --
 .../lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk       | 7 -------
 .../espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk  | 7 -------
 .../boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk     | 7 -------
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk    | 2 --
 ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk    | 7 -------
 ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk    | 7 -------
 ports/espressif/boards/lolin_s3/mpconfigboard.mk         | 7 -------
 .../espressif/boards/microdev_micro_c3/mpconfigboard.mk  | 2 --
 .../espressif/boards/microdev_micro_s2/mpconfigboard.mk  | 6 ------
 ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk  | 7 -------
 ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk   | 7 -------
 .../boards/morpheans_morphesp-240/mpconfigboard.mk       | 7 -------
 .../boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk   | 7 -------
 .../boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk  | 7 -------
 .../boards/odt_pixelwing_esp32_s2/mpconfigboard.mk       | 7 -------
 .../espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk | 2 --
 .../smartbeedesigns_bee_motion_s3/mpconfigboard.mk       | 7 -------
 .../boards/smartbeedesigns_bee_s3/mpconfigboard.mk       | 7 -------
 .../boards/targett_module_clip_wroom/mpconfigboard.mk    | 7 -------
 .../boards/targett_module_clip_wrover/mpconfigboard.mk   | 7 -------
 .../boards/unexpectedmaker_feathers2/mpconfigboard.mk    | 7 -------
 .../unexpectedmaker_feathers2_neo/mpconfigboard.mk       | 7 -------
 .../mpconfigboard.mk                                     | 7 -------
 .../boards/unexpectedmaker_feathers3/mpconfigboard.mk    | 7 -------
 .../boards/unexpectedmaker_pros3/mpconfigboard.mk        | 7 -------
 .../boards/unexpectedmaker_tinypico/mpconfigboard.mk     | 7 -------
 .../unexpectedmaker_tinypico_nano/mpconfigboard.mk       | 7 -------
 .../boards/unexpectedmaker_tinys2/mpconfigboard.mk       | 7 -------
 .../boards/unexpectedmaker_tinys3/mpconfigboard.mk       | 7 -------
 .../boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk  | 7 -------
 .../boards/waveshare_esp32s2_pico/mpconfigboard.mk       | 7 -------
 ports/espressif/mpconfigport.mk                          | 3 +++
 89 files changed, 10 insertions(+), 556 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index af1788d01e..57462642ba 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -226,8 +226,12 @@ endif
 
 # TinyUSB defines
 ifeq ($(CIRCUITPY_USB),1)
+ifeq ($(IDF_TARGET),esp32s2)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S2
+else ifeq ($(IDF_TARGET),esp32s3)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
+endif
 CFLAGS += \
-	-DCFG_TUSB_MCU=OPT_MCU_ESP32S2 \
 	-DCFG_TUSB_OS=OPT_OS_FREERTOS \
 	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
@@ -235,7 +239,8 @@ CFLAGS += \
 	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
 	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
 	-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
-	-DCFG_TUD_VENDOR_TX_BUFSIZE=128
+	-DCFG_TUD_VENDOR_TX_BUFSIZE=128 \
+	-DCFG_TUD_TASK_QUEUE_SZ=32
 endif
 
 ######################################
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
index 6b351c772b..1823c1dd88 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
index 21a87a9456..38d689d08a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
index 6af258b3d0..3ba91e62fd 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
index 870c2aa3d0..4b559ff1ee 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
index 65f13f5b02..b07161cee3 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index b8bea2c02c..4ecf6aa969 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
index a11683b0fe..3c1cf0d609 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index 380423ba10..baff69b1ac 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index c0052158b3..221543547c 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320002
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index 4962806178..8b08c94022 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index 2df1532535..ee2bfdb069 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
index a0e7bfe6fc..8f139315c8 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
index 5b14bad0dc..de41053146 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320003
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
index 6ca93a9fd4..e2ce1e438d 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00c30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
index 44c33310cc..f1bd7652fe 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
index e31f7bd226..15dd51e5ff 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
index 210c4e46f1..3cec6831bc 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 2MB
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
index 1ef07368bf..3597166303 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30002
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
index de0fc66b9d..4ec2175eca 100644
--- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Ai-Thinker"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
index b617b33fac..1011143972 100644
--- a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
+++ b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Artisense"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
index 453591d3f8..53593be38b 100644
--- a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "ATMegaZero"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
index c76ee76120..b3fc9f5252 100644
--- a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -4,8 +4,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
index c80a18acd0..2c793ba5fb 100644
--- a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
index f817930832..e2cd188059 100644
--- a/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=8MB
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
index 5cd7682090..aca5950f9d 100644
--- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
+++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "CrumpSpace"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk
index 84ab3422e8..53e9750463 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Cytron"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
index d36385d6c8..67e88a1639 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "ElectronicCats"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_NEOPIXEL_WRITE = 0
 
 CIRCUITPY_ESP_FLASH_MODE = dio
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
index 4bd091d723..e29ca687c6 100644
--- a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
@@ -3,9 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk
index a652d71e8f..cd517e75b4 100644
--- a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
index cac986b43c..31e79b2425 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk
index 06947b1275..aef3ce0dc7 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
index 4c73e79946..883df304f4 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
index a641450c93..c635cdcb56 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
index de3d4cd0ed..2e63089b9c 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=16MB
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
index ee3aadf421..7ae39254b4 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk
index 698c1fff88..7d5afe9a9f 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk
index f9c6cd9c44..95fa2d0324 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
index 4df2a97e48..ac58db8aed 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
index bf9464353f..4711f28aaf 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_eye/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
index c6d7ea1a7a..dd8403f779 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
index bd8e6c6e31..60ff9fd5a1 100644
--- a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
index 0ff4eab64f..23578067ac 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
index 0ff4eab64f..23578067ac 100644
--- a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index d59926f2a6..4748b1c306 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
index 6185e40809..5156a5b6ce 100644
--- a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index 01e85bc35b..193a867fb2 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
index 4d5081dd7f..2a09bc99eb 100644
--- a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index 03c81eefbe..a7d4d9fb7c 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Gravitech"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
index 169596b1dd..bbcbfde29a 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Gravitech"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
index 5e4f6c4b98..d3e40f2df6 100644
--- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Gravitech"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
index 96b9dddf8b..e0b3f35d44 100644
--- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Gravitech"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
index 80cd6cd11c..ead48189fa 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320060
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/hexky_s2/mpconfigboard.mk b/ports/espressif/boards/hexky_s2/mpconfigboard.mk
index dbde2f77e4..043dec5824 100644
--- a/ports/espressif/boards/hexky_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/hexky_s2/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "FutureKeys"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
index b52c88cdc6..a60d894665 100644
--- a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
+++ b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "HiiBot"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk
index d40c9b6722..2ca19f332c 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk
index 2f66e69415..7a80145217 100644
--- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30002
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
index 38af491bec..b5cc1bae7c 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "LILYGO"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
index 781818f53e..e7d70c671a 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "LILYGO"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
index 4d6a586ff8..865dbe2661 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "LILYGO"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 28e4190adf..d1cd0129fd 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
index acedc2ad51..24f88d9abf 100644
--- a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Lolin"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk
index bd4aca0337..bf946a483f 100644
--- a/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s2_pico/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Lolin"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.mk b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
index 2daa5b3ed5..b0b146b03c 100644
--- a/ports/espressif/boards/lolin_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "WEMOS"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
index 646522db8d..94c64a8273 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x006d4333
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
index d551a5601c..e5a7f05462 100644
--- a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
@@ -5,12 +5,6 @@ USB_MANUFACTURER = "MicroDev"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index 6da83550be..490675e467 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index da38010805..5c6649ce6e 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
index 2cb2ad0118..abd2fc12e9 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
+++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "MORPHEANS"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index d9c808adbc..f2a622bc08 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Muselab"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
index 80557e1575..f008241e19 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Muselab"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
index d02872f445..44546fc09f 100644
--- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Oak Dev Tech"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
index 9e14c9ac7f..68722982ab 100644
--- a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
index 9a23741804..8a5fab0c1a 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Smart Bee Designs"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
index 99435c69c8..25a1db15ec 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Smart Bee Designs"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index a06829b7c6..3163320208 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Targett"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
index 80014bdf98..6ef620ac50 100644
--- a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Targett"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
index 10ddea75f1..1d48ea1076 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
index f42f8ca7cc..2b78e51635 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
index 10ddea75f1..1d48ea1076 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk
index eb6673b563..666185b6fd 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk
index 4413a8b641..bf6e7a5105 100644
--- a/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
index c3569378ce..e26981465b 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00000001
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
index 2b36b66245..f3d9ea4c92 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00000002
 
 IDF_TARGET = esp32
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
index 8b1cd8bb51..39a9c38b36 100644
--- a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk
index 9de950e632..716a45b5ca 100644
--- a/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "UnexpectedMaker"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
index 6e005bfdd7..e65760ec68 100644
--- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/mpconfigboard.mk
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Waveshare Electronics"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
index 3d4937bd93..70f4bf008f 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Waveshare Electronics"
 
 IDF_TARGET = esp32s2
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index c2949ccbab..9ac4408ef7 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -1,3 +1,6 @@
+# Use internal flash for CIRCUITPY drive
+INTERNAL_FLASH_FILESYSTEM = 1
+
 # Internal math library is substantially smaller than toolchain one
 INTERNAL_LIBM = 1
 

From ecd140213b7a505f95335a027769e027b190810f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Oct 2022 16:17:58 -0500
Subject: [PATCH 1142/2403] populate nina-fw submodule whe needed

---
 tools/ci_fetch_deps.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 0b44f07402..515c3b198f 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -25,7 +25,13 @@ port_deps = {
     ],
     "broadcom": ["extmod/ulab/", "lib/tinyusb/"],
     "cxd56": ["extmod/ulab/", "lib/tinyusb/"],
-    "espressif": ["extmod/ulab/", "lib/tinyusb/", "lib/protomatter/", "lib/quirc/"],
+    "espressif": [
+        "extmod/ulab/",
+        "lib/certificates/nina-fw/",
+        "lib/protomatter/",
+        "lib/quirc/",
+        "lib/tinyusb/",
+    ],
     "litex": ["extmod/ulab/", "lib/tinyusb/"],
     "mimxrt10xx": ["extmod/ulab/", "lib/tinyusb/", "data/nvm.toml/"],
     "nrf": ["extmod/ulab/", "lib/mp3/", "lib/protomatter/", "lib/tinyusb/", "data/nvm.toml/"],
@@ -34,6 +40,7 @@ port_deps = {
         "lib/adafruit_floppy/",
         "lib/mbedtls/",
         "lib/mp3/",
+        "lib/certificates/nina-fw/",
         "lib/protomatter/",
         "lib/quirc/",
         "lib/tinyusb/",

From e9376d0f8ffb590fae6164243cc995d572d5e1b9 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 6 Oct 2022 16:51:51 +0200
Subject: [PATCH 1143/2403] 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             | 48 +++++++++++++++++-------------------
 locale/cs.po             | 39 +++++++++++++++--------------
 locale/de_DE.po          | 51 +++++++++++++++++++-------------------
 locale/el.po             | 42 ++++++++++++++++---------------
 locale/en_GB.po          | 51 +++++++++++++++++++-------------------
 locale/es.po             | 51 +++++++++++++++++++-------------------
 locale/fil.po            | 50 ++++++++++++++++++-------------------
 locale/fr.po             | 51 +++++++++++++++++++-------------------
 locale/hi.po             | 33 +++++++++++--------------
 locale/it_IT.po          | 53 ++++++++++++++++++++--------------------
 locale/ja.po             | 51 +++++++++++++++++++-------------------
 locale/ko.po             | 42 +++++++++++++------------------
 locale/nl.po             | 52 ++++++++++++++++++++-------------------
 locale/pl.po             | 51 +++++++++++++++++++-------------------
 locale/pt_BR.po          | 51 +++++++++++++++++++-------------------
 locale/ru.po             | 39 +++++++++++++++--------------
 locale/sv.po             | 51 +++++++++++++++++++-------------------
 locale/tr.po             | 39 +++++++++++++++--------------
 locale/zh_Latn_pinyin.po | 51 +++++++++++++++++++-------------------
 19 files changed, 448 insertions(+), 448 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index ccb2c9802a..76b3c4327b 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -158,14 +158,6 @@ msgstr "%q harus <= %d"
 msgid "%q must be >= %d"
 msgstr "%q harus >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q harus >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q harus >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -923,8 +915,7 @@ msgstr "Error pada regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1258,6 +1249,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1585,10 +1577,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Hanya 8 atau 16 bit mono dengan "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Hanya alamat IPv4 yang didukung"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Hanysa socket IPv4 yang didukung"
 
@@ -1662,6 +1656,7 @@ msgid "Out of memory"
 msgstr "Kehabisan memori"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Kehabisan socket"
 
@@ -1718,7 +1713,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1945,6 +1939,7 @@ msgid "Slices not supported"
 msgstr "Potongan tidak didukung"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2372,10 +2367,6 @@ msgstr "__new__ arg harus berupa user-type"
 msgid "a bytes-like object is required"
 msgstr "sebuah objek menyerupai byte (bytes-like) dibutuhkan"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "alamat di luar batas"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "alamatnya kosong"
@@ -2845,10 +2836,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3272,6 +3259,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "cert tidak valid"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3298,6 +3289,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "key tidak valid"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "micropython decorator tidak valid"
@@ -4374,6 +4369,15 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q harus >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q harus >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "alamat di luar batas"
+
 #~ msgid "y should be an int"
 #~ msgstr "y harus menjadi int"
 
@@ -4772,12 +4776,6 @@ msgstr "Zi harus berbentuk (n_section, 2)"
 #~ msgid "Corrupt raw code"
 #~ msgstr "Kode raw rusak"
 
-#~ msgid "invalid cert"
-#~ msgstr "cert tidak valid"
-
-#~ msgid "invalid key"
-#~ msgstr "key tidak valid"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Fungsi Viper saat ini tidak mendukung lebih dari 4 argumen"
 
diff --git a/locale/cs.po b/locale/cs.po
index 05fed491c6..864a89019c 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -159,14 +159,6 @@ msgstr "%q musí být <= %d"
 msgid "%q must be >= %d"
 msgstr "%q musí být >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q musí být >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q musí být > = 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -921,8 +913,7 @@ msgstr "Chyba v regulárním výrazu"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1258,6 +1249,7 @@ msgid "Invalid size"
 msgstr "Chybná velikost"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Chybný soket pro TLS"
 
@@ -1585,10 +1577,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Pouze IPv4 adresy podporovány"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Pouze IPv4 sokety podporovány"
 
@@ -1658,6 +1652,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1712,7 +1707,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1934,6 +1928,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2359,10 +2354,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2832,10 +2823,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3259,6 +3246,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3285,6 +3276,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
@@ -4360,6 +4355,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q musí být >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q musí být > = 1"
+
 #~ msgid "Failed to init wifi"
 #~ msgstr "Chyba inicializace WiFi"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index d277065abc..26c0d9678f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -160,14 +160,6 @@ msgstr "%q muss <= %d sein"
 msgid "%q must be >= %d"
 msgstr "%q muss >= %d sein"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q muss >= 0 sein"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q muss >= 1 sein"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -928,8 +920,7 @@ msgstr "Fehler in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Bind Fehler"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1272,6 +1263,7 @@ msgid "Invalid size"
 msgstr "Ungültige Größe"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Ungültiges Socket für TLS"
 
@@ -1601,10 +1593,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Nur 8 oder 16 bit mono mit "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Nur IPv4-Adressen werden unterstützt"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Nur IPv4-Sockets werden unterstützt"
 
@@ -1678,6 +1672,7 @@ msgid "Out of memory"
 msgstr "Kein Speicher mehr verfügbar"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Keine Sockets mehr verfügbar"
 
@@ -1732,7 +1727,6 @@ msgid "Pin interrupt already in use"
 msgstr "Pin-Interrupt wird bereits verwendet"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Pin kann nur als Eingang verwendet werden"
 
@@ -1958,6 +1952,7 @@ msgid "Slices not supported"
 msgstr "Slices werden nicht unterstützt"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool kann nur mit wifi.radio verwendet werden"
 
@@ -2412,10 +2407,6 @@ msgstr "__new__ arg muss user-type sein"
 msgid "a bytes-like object is required"
 msgstr "ein Byte-ähnliches Objekt ist erforderlich"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "Adresse außerhalb der Grenzen"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses ist leer"
@@ -2897,10 +2888,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "Der Zielpuffer muss ein Array vom Typ 'H' für bit_depth = 16 sein"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length muss ein int >= 0 sein"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "Die Wörterbuch-Aktualisierungssequenz hat eine falsche Länge"
@@ -3326,6 +3313,10 @@ msgstr "ungültige Architektur"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr "ungültige Bits_pro_Pixel %d, muss 1, 2, 4, 8, 16, 24 oder 32 sein"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "ungültiges cert"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3352,6 +3343,10 @@ msgstr "ungültiger Formatbezeichner"
 msgid "invalid hostname"
 msgstr "ungültiger Hostname"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "ungültiger Schlüssel"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "ungültiger micropython decorator"
@@ -4441,6 +4436,18 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q muss >= 0 sein"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q muss >= 1 sein"
+
+#~ msgid "address out of bounds"
+#~ msgstr "Adresse außerhalb der Grenzen"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length muss ein int >= 0 sein"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "Das Typ-Objekt 'generator' hat kein Attribut '__await__'"
 
@@ -5084,12 +5091,6 @@ msgstr "zi muss die Form (n_section, 2) haben"
 #~ msgid "can only save bytecode"
 #~ msgstr "kann nur Bytecode speichern"
 
-#~ msgid "invalid cert"
-#~ msgstr "ungültiges cert"
-
-#~ msgid "invalid key"
-#~ msgstr "ungültiger Schlüssel"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Viper-Funktionen unterstützen derzeit nicht mehr als 4 Argumente"
 
diff --git a/locale/el.po b/locale/el.po
index e686dd9bfc..6f5d15f1a1 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -164,14 +164,6 @@ msgstr "%q πρέπει να είναι <= %d"
 msgid "%q must be >= %d"
 msgstr "%q πρέπει να είναι >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q πρέπει να είναι >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q πρέπει να είναι >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -707,7 +699,8 @@ msgstr "Δεν μπορούν να αλλάξουν οι USB συσκευές τ
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Cannot create a new Adapter; use _bleio.adapter;"
-msgstr "Δεν μπορεί να δημιουργηθεί νέο Adapter; χρησιμοποιείστε _bleio.adapter;"
+msgstr ""
+"Δεν μπορεί να δημιουργηθεί νέο Adapter; χρησιμοποιείστε _bleio.adapter;"
 
 #: shared-bindings/displayio/Bitmap.c
 #: shared-bindings/memorymonitor/AllocationSize.c
@@ -934,8 +927,7 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1267,6 +1259,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1593,10 +1586,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1666,6 +1661,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1720,7 +1716,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1942,6 +1937,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2367,10 +2363,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2840,10 +2832,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3267,6 +3255,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3293,6 +3285,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
@@ -4367,3 +4363,9 @@ msgstr ""
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
+
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q πρέπει να είναι >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q πρέπει να είναι >= 1"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 3192c4591d..142f8903a1 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -162,14 +162,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr "%q must be >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q must be >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q must be >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -924,8 +916,7 @@ msgstr "Error in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Failure to bind"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1259,6 +1250,7 @@ msgid "Invalid size"
 msgstr "Invalid size"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Invalid socket for TLS"
 
@@ -1586,10 +1578,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Only 8 or 16 bit mono with "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Only IPv4 addresses supported"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Only IPv4 sockets supported"
 
@@ -1662,6 +1656,7 @@ msgid "Out of memory"
 msgstr "Out of memory"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Out of sockets"
 
@@ -1717,7 +1712,6 @@ msgid "Pin interrupt already in use"
 msgstr "Pin interrupt already in use"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Pin is input only"
 
@@ -1940,6 +1934,7 @@ msgid "Slices not supported"
 msgstr "Slices not supported"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool can only be used with wifi.radio"
 
@@ -2375,10 +2370,6 @@ msgstr "__new__ arg must be a user-type"
 msgid "a bytes-like object is required"
 msgstr "a bytes-like object is required"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "address out of bounds"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses is empty"
@@ -2851,10 +2842,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "destination buffer must be an array of type 'H' for bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length must be an int >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "dict update sequence has wrong length"
@@ -3278,6 +3265,10 @@ msgstr "invalid architecture"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "invalid cert"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3304,6 +3295,10 @@ msgstr "invalid format specifier"
 msgid "invalid hostname"
 msgstr "invalid hostname"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "invalid key"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "invalid micropython decorator"
@@ -4379,6 +4374,18 @@ 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 "%q must be >= 0"
+#~ msgstr "%q must be >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q must be >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "address out of bounds"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length must be an int >= 0"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "type object 'generator' has no attribute '__await__'"
 
@@ -5044,12 +5051,6 @@ msgstr "zi must be of shape (n_section, 2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "Can only save bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "invalid cert"
-
-#~ msgid "invalid key"
-#~ msgstr "invalid key"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Viper functions don't currently support more than 4 arguments"
 
diff --git a/locale/es.po b/locale/es.po
index 237caa7254..587db6bc50 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -164,14 +164,6 @@ msgstr "%q debe ser <= %d"
 msgid "%q must be >= %d"
 msgstr "%q debe ser >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q debe ser >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q debe ser >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -934,8 +926,7 @@ msgstr "Error en regex"
 msgid "Error: Failure to bind"
 msgstr "Error: fallo al vincular"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1277,6 +1268,7 @@ msgid "Invalid size"
 msgstr "Tamaño incorrecto"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "socket invalido para TLS"
 
@@ -1609,10 +1601,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Solo mono de 8 ó 16 bit con "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Solo hay capacidad para direcciones IPv4"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Solo se admiten sockets IPv4"
 
@@ -1686,6 +1680,7 @@ msgid "Out of memory"
 msgstr "Memoria agotada"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Se acabaron los enchufes"
 
@@ -1742,7 +1737,6 @@ msgid "Pin interrupt already in use"
 msgstr "Interrupción de Pin ya está en uso"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "El pin es solo de entrada"
 
@@ -1969,6 +1963,7 @@ msgid "Slices not supported"
 msgstr "Rebanadas no soportadas"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool solo se puede usar con wifi.radio"
 
@@ -2411,10 +2406,6 @@ msgstr "__new__ arg debe ser un user-type"
 msgid "a bytes-like object is required"
 msgstr "se requiere un objeto bytes-like"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "address fuera de límites"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "addresses esta vacío"
@@ -2891,10 +2882,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "el buffer de destino debe ser un array de tipo 'H' para bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length debe ser un int >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "la secuencia de actualizacion del dict tiene una longitud incorrecta"
@@ -3318,6 +3305,10 @@ msgstr "arquitectura inválida"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "certificado inválido"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3344,6 +3335,10 @@ msgstr "especificador de formato inválido"
 msgid "invalid hostname"
 msgstr "hostname inválido"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "llave inválida"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "decorador de micropython inválido"
@@ -4427,6 +4422,18 @@ 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 be >= 0"
+#~ msgstr "%q debe ser >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q debe ser >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "address fuera de límites"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length debe ser un int >= 0"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "objeto tipo 'generator' no tiene un atributo '__await__'"
 
@@ -5107,12 +5114,6 @@ msgstr "zi debe ser una forma (n_section,2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "solo puede almacenar bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "certificado inválido"
-
-#~ msgid "invalid key"
-#~ msgstr "llave inválida"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "funciones Viper no soportan por el momento, más de 4 argumentos"
 
diff --git a/locale/fil.po b/locale/fil.po
index b1a499e70b..3f7ad408e4 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -153,15 +153,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr ""
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "aarehas na haba dapat ang buffer slices"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -921,8 +912,7 @@ msgstr "May pagkakamali sa REGEX"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1256,6 +1246,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1585,10 +1576,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Tanging 8 o 16 na bit mono na may "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1658,6 +1651,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1713,7 +1707,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1934,6 +1927,7 @@ msgid "Slices not supported"
 msgstr "Hindi suportado ang Slices"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2361,10 +2355,6 @@ msgstr "__new__ arg ay dapat na user-type"
 msgid "a bytes-like object is required"
 msgstr "a bytes-like object ay kailangan"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "wala sa sakop ang address"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "walang laman ang address"
@@ -2845,10 +2835,6 @@ msgstr ""
 "ang destination buffer ay dapat na isang array ng uri 'H' para sa bit_depth "
 "= 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "ang destination_length ay dapat na isang int >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "may mali sa haba ng dict update sequence"
@@ -3273,6 +3259,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "mali ang cert"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3299,6 +3289,10 @@ msgstr "mali ang format specifier"
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "mali ang key"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "mali ang micropython decorator"
@@ -4382,6 +4376,16 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "%q must be >= 1"
+#~ msgstr "aarehas na haba dapat ang buffer slices"
+
+#~ msgid "address out of bounds"
+#~ msgstr "wala sa sakop ang address"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "ang destination_length ay dapat na isang int >= 0"
+
 #~ msgid "color should be an int"
 #~ msgstr "color ay dapat na int"
 
@@ -4662,12 +4666,6 @@ msgstr ""
 #~ msgid "can only save bytecode"
 #~ msgstr "maaring i-save lamang ang bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "mali ang cert"
-
-#~ msgid "invalid key"
-#~ msgstr "mali ang key"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr ""
 #~ "Ang mga function ng Viper ay kasalukuyang hindi sumusuporta sa higit sa 4 "
diff --git a/locale/fr.po b/locale/fr.po
index 58d84ac81f..f2119d5af9 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -164,14 +164,6 @@ msgstr "%q doit être <= %d"
 msgid "%q must be >= %d"
 msgstr "%q doit être >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q doit être >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q doit être >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -944,8 +936,7 @@ msgstr "Erreur dans l'expression régulière"
 msgid "Error: Failure to bind"
 msgstr "Erreur : Impossible de lier"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1297,6 +1288,7 @@ msgid "Invalid size"
 msgstr "Taille invalide"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Socket non valide pour TLS"
 
@@ -1629,10 +1621,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Uniquement 8 ou 16 bit mono avec "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Seulement les adresses IPv4 sont supportées"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Seulement les sockets IPv4 sont supportés"
 
@@ -1706,6 +1700,7 @@ msgid "Out of memory"
 msgstr "Hors de mémoire"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Plus de sockets"
 
@@ -1762,7 +1757,6 @@ msgid "Pin interrupt already in use"
 msgstr "L'interruption de cette broche est déjà utilisée"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "La broche est entrée uniquement"
 
@@ -1989,6 +1983,7 @@ msgid "Slices not supported"
 msgstr "Tranches non supportées"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool ne s'utilise qu'avec wifi.radio"
 
@@ -2442,10 +2437,6 @@ msgstr "l'argument __new__ doit être d'un type défini par l'utilisateur"
 msgid "a bytes-like object is required"
 msgstr "un objet 'bytes-like' est requis"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "adresse hors limites"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adresses vides"
@@ -2928,10 +2919,6 @@ msgstr ""
 "le tampon de destination doit être une matrice de type 'H' pour bit_depth = "
 "16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length doit être un entier >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "la séquence de mise à jour de dict a une mauvaise longueur"
@@ -3357,6 +3344,10 @@ msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 "%d est invalide pour bits_per_pixel, doit être 1, 2, 4, 8, 16, 24, ou 32"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "certificat invalide"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3383,6 +3374,10 @@ msgstr "spécification de format invalide"
 msgid "invalid hostname"
 msgstr "hostname incorrect"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "clé invalide"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "décorateur micropython invalide"
@@ -4469,6 +4464,18 @@ 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 "%q must be >= 0"
+#~ msgstr "%q doit être >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q doit être >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "adresse hors limites"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length doit être un entier >= 0"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "le type 'generator' n'a pas d'attribut '__await__'"
 
@@ -5160,12 +5167,6 @@ msgstr "zi doit être de forme (n_section, 2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "ne peut sauvegarder que du bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "certificat invalide"
-
-#~ msgid "invalid key"
-#~ msgstr "clé invalide"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr ""
 #~ "les fonctions de Viper ne supportent pas plus de 4 arguments actuellement"
diff --git a/locale/hi.po b/locale/hi.po
index 229ae16a80..9e8fb9a4a8 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -152,14 +152,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr ""
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -910,8 +902,7 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1243,6 +1234,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1569,10 +1561,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1642,6 +1636,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1696,7 +1691,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1916,6 +1910,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2341,10 +2336,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2814,10 +2805,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3241,6 +3228,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3267,6 +3258,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 24c45ca0cd..56a6c2d6f5 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -159,15 +159,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q deve essere >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "slice del buffer devono essere della stessa lunghezza"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -926,8 +917,7 @@ msgstr "Errore nella regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1261,6 +1251,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1592,10 +1583,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1665,6 +1658,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1722,7 +1716,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1944,6 +1937,7 @@ msgid "Slices not supported"
 msgstr "Slice non supportate"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2371,10 +2365,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr "un oggetto byte-like è richiesto"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "indirizzo fuori limite"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "gli indirizzi sono vuoti"
@@ -2853,10 +2843,6 @@ msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 "il buffer di destinazione deve essere un array di tipo 'H' con bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length deve essere un int >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "sequanza di aggiornamento del dizionario ha la lunghezza errata"
@@ -3281,6 +3267,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "certificato non valido"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3307,6 +3297,10 @@ msgstr "specificatore di formato non valido"
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "chiave non valida"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "decoratore non valido in micropython"
@@ -4395,6 +4389,19 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q deve essere >= 0"
+
+#, fuzzy
+#~ msgid "%q must be >= 1"
+#~ msgstr "slice del buffer devono essere della stessa lunghezza"
+
+#~ msgid "address out of bounds"
+#~ msgstr "indirizzo fuori limite"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length deve essere un int >= 0"
+
 #~ msgid "color should be an int"
 #~ msgstr "il colore deve essere un int"
 
@@ -4695,12 +4702,6 @@ msgstr ""
 #~ msgid "can only save bytecode"
 #~ msgstr "È possibile salvare solo bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "certificato non valido"
-
-#~ msgid "invalid key"
-#~ msgstr "chiave non valida"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Le funzioni Viper non supportano più di 4 argomenti al momento"
 
diff --git a/locale/ja.po b/locale/ja.po
index 9d09e42002..c3e2aed206 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -157,14 +157,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%qは0以上でなければなりません"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%qは1以上でなければなりません"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -919,8 +911,7 @@ msgstr "正規表現にエラーがあります"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1254,6 +1245,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1582,10 +1574,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "8または16ビットの "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1655,6 +1649,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1709,7 +1704,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "ピンは入力専用"
 
@@ -1929,6 +1923,7 @@ msgid "Slices not supported"
 msgstr "スライスは対応していません"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2355,10 +2350,6 @@ msgstr "__new__の引数はユーザ型でなければなりません"
 msgid "a bytes-like object is required"
 msgstr "bytes-likeオブジェクトが必要"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "アドレスが範囲外"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2832,10 +2823,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "bit_depath = 16用のバッファはタイプ'H'のarrayでなければなりません"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "desitination_lengthは正の整数でなければなりません"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3260,6 +3247,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "不正な証明書"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3286,6 +3277,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr "不正なホスト名"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "不正な鍵"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "不正なmicropythonデコレータ"
@@ -4363,6 +4358,18 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%qは0以上でなければなりません"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%qは1以上でなければなりません"
+
+#~ msgid "address out of bounds"
+#~ msgstr "アドレスが範囲外"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "desitination_lengthは正の整数でなければなりません"
+
 #~ msgid "end_x should be an int"
 #~ msgstr "end_xは整数でなければなりません"
 
@@ -4802,12 +4809,6 @@ msgstr ""
 #~ msgid "Corrupt raw code"
 #~ msgstr "破損したraw code"
 
-#~ msgid "invalid cert"
-#~ msgstr "不正な証明書"
-
-#~ msgid "invalid key"
-#~ msgstr "不正な鍵"
-
 #~ msgid "parameter annotation must be an identifier"
 #~ msgstr "引数アノテーションは識別子でなければなりません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 9966fe44d9..3c9a63206d 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -153,14 +153,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr ""
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q 는 >=1이어야합니다"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -913,8 +905,7 @@ msgstr "Regex에 오류가 있습니다."
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1246,6 +1237,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1572,10 +1564,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1645,6 +1639,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1699,7 +1694,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1919,6 +1913,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2345,10 +2340,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2818,10 +2809,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3245,6 +3232,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "cert가 유효하지 않습니다"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3271,6 +3262,10 @@ msgstr "형식 지정자(format specifier)가 유효하지 않습니다"
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "키가 유효하지 않습니다"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
@@ -4346,6 +4341,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q 는 >=1이어야합니다"
+
 #~ msgid "%q should be an int"
 #~ msgstr "%q 는 정수(int) 여야합니다"
 
@@ -4401,12 +4399,6 @@ msgstr ""
 #~ msgid "invalid dupterm index"
 #~ msgstr "Dupterm index가 유효하지 않습니다"
 
-#~ msgid "invalid cert"
-#~ msgstr "cert가 유효하지 않습니다"
-
-#~ msgid "invalid key"
-#~ msgstr "키가 유효하지 않습니다"
-
 #~ msgid "bits must be 7, 8 or 9"
 #~ msgstr "비트(bits)는 7, 8 또는 9 여야합니다"
 
diff --git a/locale/nl.po b/locale/nl.po
index f2e699e55b..ac72ed29be 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -155,14 +155,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q moet >= 0 zijn"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q moet >= 1 zijn"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -918,8 +910,7 @@ msgstr "Fout in regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1254,6 +1245,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1582,10 +1574,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Alleen 8 of 16 bit mono met "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Alleen IPv4 adressen worden ondersteund"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Alleen IPv4-sockets ondersteund"
 
@@ -1659,6 +1653,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Geen sockets meer beschikbaar"
 
@@ -1715,7 +1710,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Pin kan alleen voor invoer gebruikt worden"
 
@@ -1940,6 +1934,7 @@ msgid "Slices not supported"
 msgstr "Slices niet ondersteund"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool kan alleen met wifi.radio gebruikt worden"
 
@@ -2371,10 +2366,6 @@ msgstr "__new__ arg moet een user-type zijn"
 msgid "a bytes-like object is required"
 msgstr "een bytes-achtig object is vereist"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "adres buiten bereik"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adressen zijn leeg"
@@ -2847,10 +2838,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "bestemming buffer moet een array van het type 'H' voor bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_lengte moest een int groter dan of gelijk zijn aan 0 zijn"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "dict update sequence heeft de verkeerde lengte"
@@ -3275,6 +3262,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "ongeldig certificaat"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3301,6 +3292,10 @@ msgstr "ongeldige formaatspecificatie"
 msgid "invalid hostname"
 msgstr "onjuiste hostnaam"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "ongeldige sleutel"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "ongeldige micropython decorator"
@@ -4379,6 +4374,19 @@ 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 "%q must be >= 0"
+#~ msgstr "%q moet >= 0 zijn"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q moet >= 1 zijn"
+
+#~ msgid "address out of bounds"
+#~ msgstr "adres buiten bereik"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr ""
+#~ "destination_lengte moest een int groter dan of gelijk zijn aan 0 zijn"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "het type object 'generator' heeft geen attribuut '__await__'"
 
@@ -4950,12 +4958,6 @@ msgstr "zi moet vorm (n_section, 2) hebben"
 #~ msgid "can only save bytecode"
 #~ msgstr "kan alleen byte-code opslaan"
 
-#~ msgid "invalid cert"
-#~ msgstr "ongeldig certificaat"
-
-#~ msgid "invalid key"
-#~ msgstr "ongeldige sleutel"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Viper-functies ondersteunen momenteel niet meer dan 4 argumenten"
 
diff --git a/locale/pl.po b/locale/pl.po
index a6d09cc31e..668adad804 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -157,14 +157,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q musi być >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q musi być >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -919,8 +911,7 @@ msgstr "Błąd w regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1254,6 +1245,7 @@ msgid "Invalid size"
 msgstr "Nieprawidłowy rozmiar"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1580,10 +1572,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Tylko 8 lub 16 bitów mono z "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1653,6 +1647,7 @@ msgid "Out of memory"
 msgstr "Brak pamięci"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1707,7 +1702,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1927,6 +1921,7 @@ msgid "Slices not supported"
 msgstr "Fragmenty nieobsługiwane"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2352,10 +2347,6 @@ msgstr "Argument __new__ musi być typu użytkownika"
 msgid "a bytes-like object is required"
 msgstr "wymagany obiekt typu bytes"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "adres poza zakresem"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adres jest pusty"
@@ -2826,10 +2817,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "bufor docelowy musi być tablicą typu 'H' dla bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length musi być nieujemną liczbą całkowitą"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "sekwencja ma złą długość"
@@ -3253,6 +3240,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "zły ceryfikat"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3279,6 +3270,10 @@ msgstr "zła specyfikacja formatu"
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "zły klucz"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "zły dekorator micropythona"
@@ -4355,6 +4350,18 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q musi być >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q musi być >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "adres poza zakresem"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length musi być nieujemną liczbą całkowitą"
+
 #~ msgid "color should be an int"
 #~ msgstr "kolor powinien być liczbą całkowitą"
 
@@ -4750,12 +4757,6 @@ msgstr ""
 #~ msgid "can only save bytecode"
 #~ msgstr "można zapisać tylko bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "zły ceryfikat"
-
-#~ msgid "invalid key"
-#~ msgstr "zły klucz"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Funkcje Viper nie obsługują obecnie więcej niż 4 argumentów"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 198a024bad..534bc350c7 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -161,14 +161,6 @@ msgstr "%q deve ser <= %d"
 msgid "%q must be >= %d"
 msgstr "o %q deve ser >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q deve ser >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q deve ser >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -937,8 +929,7 @@ msgstr "Erro no regex"
 msgid "Error: Failure to bind"
 msgstr "Erro: Falha na vinculação"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1282,6 +1273,7 @@ msgid "Invalid size"
 msgstr "Tamanho inválido"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Soquete inválido para o TLS"
 
@@ -1611,10 +1603,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Apenas mono com 8 ou 16 bits com "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Somente os endereços IPv4 são suportados"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Apenas soquetes IPv4 são suportados"
 
@@ -1688,6 +1682,7 @@ msgid "Out of memory"
 msgstr "Sem memória"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Sem soquetes"
 
@@ -1744,7 +1739,6 @@ msgid "Pin interrupt already in use"
 msgstr "A interrupção do pino já está em uso"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Apenas o pino de entrada"
 
@@ -1972,6 +1966,7 @@ msgid "Slices not supported"
 msgstr "Fatiamento não compatível"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "O SocketPool só pode ser usado com rádio wifi.radio"
 
@@ -2424,10 +2419,6 @@ msgstr "O argumento __new__ deve ser um tipo usuário"
 msgid "a bytes-like object is required"
 msgstr "é necessário objetos tipo bytes"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "endereço fora dos limites"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "os endereços estão vazios"
@@ -2906,10 +2897,6 @@ msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 "o buffer do destino deve ser uma matriz do tipo 'H' para bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length deve ser um int >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "sequência da atualização dict tem o comprimento errado"
@@ -3336,6 +3323,10 @@ msgstr "arquitetura inválida"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr "bits_per_pixel %d inválido, deve ser, 1, 2, 4, 8, 16, 24, ou 32"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "certificado inválido"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3362,6 +3353,10 @@ msgstr "o especificador do formato é inválido"
 msgid "invalid hostname"
 msgstr "o nome do host é inválido"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "chave inválida"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "o decorador micropython é inválido"
@@ -4447,6 +4442,18 @@ 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 be >= 0"
+#~ msgstr "%q deve ser >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q deve ser >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "endereço fora dos limites"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length deve ser um int >= 0"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr ""
 #~ "o tipo do objeto 'generator' não possui qualquer atributo '__await__'"
@@ -5176,12 +5183,6 @@ msgstr "zi deve estar na forma (n_section, 2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "apenas o bytecode pode ser salvo"
 
-#~ msgid "invalid cert"
-#~ msgstr "certificado inválido"
-
-#~ msgid "invalid key"
-#~ msgstr "chave inválida"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Atualmente, as funções do Viper não suportam mais de 4 argumentos"
 
diff --git a/locale/ru.po b/locale/ru.po
index d62a419cbe..1907d73037 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -160,14 +160,6 @@ msgstr "%q должен быть <= %d"
 msgid "%q must be >= %d"
 msgstr "%q должен быть >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q должен быть >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q должен быть >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -935,8 +927,7 @@ msgstr "Ошибка в регулярном выражении(regex)"
 msgid "Error: Failure to bind"
 msgstr "Ошибка: Сбой привязки"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1279,6 +1270,7 @@ msgid "Invalid size"
 msgstr "Неверный размер"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Неверный сокет для TLS"
 
@@ -1609,10 +1601,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Только 8- или 16-битное моно с "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Поддерживаются только адреса IPv4"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Поддерживаются только сокеты IPv4"
 
@@ -1684,6 +1678,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1738,7 +1733,6 @@ msgid "Pin interrupt already in use"
 msgstr "Прерывание пина уже используется"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Пин является только входом"
 
@@ -1963,6 +1957,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2390,10 +2385,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2863,10 +2854,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3290,6 +3277,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3316,6 +3307,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
@@ -4391,6 +4386,12 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q должен быть >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q должен быть >= 1"
+
 #~ msgid "Expected an alarm"
 #~ msgstr "Ожидался сигнал"
 
diff --git a/locale/sv.po b/locale/sv.po
index 5fbf047833..50c8291431 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -160,14 +160,6 @@ msgstr "%q måste vara <= %d"
 msgid "%q must be >= %d"
 msgstr "%q måste vara >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q måste vara >= 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q måste vara >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -926,8 +918,7 @@ msgstr "Fel i regex"
 msgid "Error: Failure to bind"
 msgstr "Fel: Bind misslyckades"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1265,6 +1256,7 @@ msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "Ogiltig socket för TLS"
 
@@ -1594,10 +1586,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Endast 8 eller 16 bitars mono med "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Endast IPv4-adresser stöds"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "Endast IPv4-socket stöds"
 
@@ -1670,6 +1664,7 @@ msgid "Out of memory"
 msgstr "Slut på minne"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Slut på sockets"
 
@@ -1726,7 +1721,6 @@ msgid "Pin interrupt already in use"
 msgstr "Pinnavbrott används redan"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Pinnen är enbart ingång"
 
@@ -1951,6 +1945,7 @@ msgid "Slices not supported"
 msgstr "Slice stöds inte"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool kan endast användas med wifi.radio"
 
@@ -2396,10 +2391,6 @@ msgstr "__new__ arg måste vara en användartyp"
 msgid "a bytes-like object is required"
 msgstr "ett bytesliknande objekt krävs"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "adress utanför gränsen"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "adresserna är tomma"
@@ -2874,10 +2865,6 @@ msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 "destinationsbufferten måste vara en matris av typen 'H' för bit_depth = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "destination_length måste vara ett heltal >= 0"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "uppdateringssekvensen för dict har fel längd"
@@ -3303,6 +3290,10 @@ msgstr "ogiltig arkitektur"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr "ogiltig bits_per_pixel %d, måste vara, 1, 2, 4, 8, 16, 24 eller 32"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "ogiltigt certifikat"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3329,6 +3320,10 @@ msgstr "ogiltig formatspecificerare"
 msgid "invalid hostname"
 msgstr "Ogiltigt värdnamn"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "ogiltig nyckel"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "ogiltig mikropython-dekorator"
@@ -4408,6 +4403,18 @@ 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 be >= 0"
+#~ msgstr "%q måste vara >= 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q måste vara >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "adress utanför gränsen"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "destination_length måste vara ett heltal >= 0"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "typobjekt 'generator' har inget attribut '__await__'"
 
@@ -5134,12 +5141,6 @@ msgstr "zi måste vara i formen (n_section, 2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "kan bara spara bytecode"
 
-#~ msgid "invalid cert"
-#~ msgstr "ogiltigt certifikat"
-
-#~ msgid "invalid key"
-#~ msgstr "ogiltig nyckel"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Viper-funktioner stöder för närvarande inte mer än fyra argument"
 
diff --git a/locale/tr.po b/locale/tr.po
index f46d76a4cb..be91ce7a61 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -164,14 +164,6 @@ msgstr "%q <= %d olmalıdır"
 msgid "%q must be >= %d"
 msgstr "%q >= %d olmalıdır"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q >= 0 olmalıdır"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q >= 1 olmalıdır"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -926,8 +918,7 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1259,6 +1250,7 @@ msgid "Invalid size"
 msgstr ""
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr ""
 
@@ -1585,10 +1577,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1658,6 +1652,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1712,7 +1707,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1935,6 +1929,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2360,10 +2355,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2833,10 +2824,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
@@ -3260,6 +3247,10 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3286,6 +3277,10 @@ msgstr ""
 msgid "invalid hostname"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr ""
@@ -4361,6 +4356,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be >= 0"
+#~ msgstr "%q >= 0 olmalıdır"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q >= 1 olmalıdır"
+
 #~ msgid "All I2C targets are in use"
 #~ msgstr "Tüm I2C hedefleri kullanımda"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index b4ea1ec04e..527a04ae45 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -163,14 +163,6 @@ msgstr "%q bìxū <= %d"
 msgid "%q must be >= %d"
 msgstr "%q bìxū >= %d"
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr "%q bìxū > = 0"
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr "%q bìxū >= 1"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -927,8 +919,7 @@ msgstr "Zhèngzé biǎodá shì cuòwù"
 msgid "Error: Failure to bind"
 msgstr "cuò wù: bǎng dìng shī bài"
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1271,6 +1262,7 @@ msgid "Invalid size"
 msgstr "dà xiǎo wú xiào"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
 msgstr "TLS de chā zuò wú xiào"
 
@@ -1599,10 +1591,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr "Zhǐyǒu 8 huò 16 wèi dānwèi "
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr "Jǐn zhīchí IPv4 dìzhǐ"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr "jǐn zhī chí IPv4 tào jiē zì"
 
@@ -1676,6 +1670,7 @@ msgid "Out of memory"
 msgstr "nèi cún bù zú"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "tào jiē zì wài"
 
@@ -1730,7 +1725,6 @@ msgid "Pin interrupt already in use"
 msgstr "yǐn jiǎo zhōng duàn yǐ zài shǐ yòng zhōng"
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr "Yǐn jiǎo jǐn shūrù"
 
@@ -1955,6 +1949,7 @@ msgid "Slices not supported"
 msgstr "Qiēpiàn bù shòu zhīchí"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool zhǐ néng yǔ wifi.Radio yīqǐ shǐyòng"
 
@@ -2399,10 +2394,6 @@ msgstr "__new__ cānshù bìxū shì yònghù lèixíng"
 msgid "a bytes-like object is required"
 msgstr "xūyào yīgè zì jié lèi duìxiàng"
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr "dìzhǐ chāochū biānjiè"
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr "dìzhǐ wèi kōng"
@@ -2878,10 +2869,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr "mùbiāo huǎnchōng qū bìxū shì wèi shēndù'H' lèixíng de shùzǔ = 16"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr "mùbiāo chángdù bìxū shì > = 0 de zhěngshù"
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr "yǔfǎ gēngxīn xùliè de chángdù cuòwù"
@@ -3305,6 +3292,10 @@ msgstr "wú xiào de jià gòu"
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr "wú xiào bits_per_pixel %d, bì xū shì, 1, 2, 4, 8, 16, 24, huò 32"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid cert"
+msgstr "zhèngshū wúxiào"
+
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
@@ -3331,6 +3322,10 @@ msgstr "wúxiào de géshì biāozhù"
 msgid "invalid hostname"
 msgstr "wú xiào zhǔ jī míng"
 
+#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
+msgid "invalid key"
+msgstr "wúxiào de mì yào"
+
 #: py/compile.c
 msgid "invalid micropython decorator"
 msgstr "wúxiào de MicroPython zhuāngshì qì"
@@ -4410,6 +4405,18 @@ 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 be >= 0"
+#~ msgstr "%q bìxū > = 0"
+
+#~ msgid "%q must be >= 1"
+#~ msgstr "%q bìxū >= 1"
+
+#~ msgid "address out of bounds"
+#~ msgstr "dìzhǐ chāochū biānjiè"
+
+#~ msgid "destination_length must be an int >= 0"
+#~ msgstr "mùbiāo chángdù bìxū shì > = 0 de zhěngshù"
+
 #~ msgid "type object 'generator' has no attribute '__await__'"
 #~ msgstr "lèi xíng duì xiàng 'generator' méi yǒu shǔ xìng '__await__'"
 
@@ -5114,12 +5121,6 @@ msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 #~ msgid "can only save bytecode"
 #~ msgstr "zhǐ néng bǎocún zì jié mǎ jìlù"
 
-#~ msgid "invalid cert"
-#~ msgstr "zhèngshū wúxiào"
-
-#~ msgid "invalid key"
-#~ msgstr "wúxiào de mì yào"
-
 #~ msgid "Viper functions don't currently support more than 4 arguments"
 #~ msgstr "Viper hánshù mùqián bù zhīchí chāoguò 4 gè cānshù"
 

From 6e2c24083a95acfca4624053736f94eff8e66807 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Oct 2022 10:12:22 -0500
Subject: [PATCH 1144/2403] switch flash split to leave 512kB for CIRCUITPY

---
 ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld          | 2 +-
 ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
index 7d0a44ce51..e87f0805eb 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1788k
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
     RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 15c4261f83..50c7f5a0a9 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -21,4 +21,4 @@ CIRCUITPY_WIFI = 1
 
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
 # Must be accompanied by a linker script change
-CFLAGS += -DRESERVED_FLASH='(1792 * 1024)'
+CFLAGS += -DRESERVED_FLASH='(1532 * 1024)'

From 07cd2ff0650a66eccebcab25a626fec5553d9133 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Oct 2022 11:20:48 -0500
Subject: [PATCH 1145/2403] restore 4kB gap pending resolution of #7011

---
 ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
index e87f0805eb..e46f5ad5d4 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1528k
     RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k

From 644d2936415f803e61f0b60fc4a90a7d46b19e4f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Oct 2022 11:52:25 -0500
Subject: [PATCH 1146/2403] Fix CIRCUITPY drive offset in flash correctly,
 accounting for NVM

.. and fix nvm to read/right the correct area.

.. putting a comment in link.ld to explain it all

Closes #7012
---
 .../boards/raspberry_pi_pico_w/link.ld        |  3 ++-
 .../raspberry_pi_pico_w/mpconfigboard.mk      |  2 +-
 ports/raspberrypi/link.ld                     |  1 +
 ports/raspberrypi/mpconfigport.h              | 12 ++++++++--
 ports/raspberrypi/supervisor/internal_flash.c | 22 ++++++++-----------
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
index e46f5ad5d4..2777b41720 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
@@ -23,7 +23,8 @@
 
 MEMORY
 {
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1528k
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
+    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
     RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 50c7f5a0a9..f075b03693 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -21,4 +21,4 @@ CIRCUITPY_WIFI = 1
 
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
 # Must be accompanied by a linker script change
-CFLAGS += -DRESERVED_FLASH='(1532 * 1024)'
+CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/link.ld b/ports/raspberrypi/link.ld
index c9480f84db..982c5e3a0c 100644
--- a/ports/raspberrypi/link.ld
+++ b/ports/raspberrypi/link.ld
@@ -24,6 +24,7 @@
 MEMORY
 {
     FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1020k
+    /* Followed by: 4kB of NVRAM and at least 1024kB of CIRCUITPY */
     RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h
index 7f2b75a81b..a2eb9a15ef 100644
--- a/ports/raspberrypi/mpconfigport.h
+++ b/ports/raspberrypi/mpconfigport.h
@@ -31,9 +31,17 @@
 
 #define MICROPY_PY_SYS_PLATFORM             "RP2040"
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE         (4 * 1024)
-#define CIRCUITPY_INTERNAL_NVM_START_ADDR   (0x100FF000)
+// Setting a non-default value also requires a non-default link.ld
+#ifndef CIRCUITPY_FIRMWARE_SIZE
+#define CIRCUITPY_FIRMWARE_SIZE (1020 * 1024)
+#endif
 
+#define CIRCUITPY_INTERNAL_NVM_SIZE         (4 * 1024)
+// This is the XIP address
+#define CIRCUITPY_INTERNAL_NVM_START_ADDR   (0x10000000 + CIRCUITPY_FIRMWARE_SIZE)
+
+// This is the flash linear address
+#define CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR (CIRCUITPY_FIRMWARE_SIZE + CIRCUITPY_INTERNAL_NVM_SIZE)
 #define CIRCUITPY_DEFAULT_STACK_SIZE        (24 * 1024)
 
 #define MICROPY_USE_INTERNAL_PRINTF         (1)
diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c
index d2d80b40ad..010528559d 100644
--- a/ports/raspberrypi/supervisor/internal_flash.c
+++ b/ports/raspberrypi/supervisor/internal_flash.c
@@ -46,10 +46,6 @@
 #include "src/rp2_common/hardware_flash/include/hardware/flash.h"
 #include "src/common/pico_binary_info/include/pico/binary_info.h"
 
-#if !defined(RESERVED_FLASH)
-#define RESERVED_FLASH (1 * 1024 * 1024)
-#endif
-
 #if !defined(TOTAL_FLASH_MINIMUM)
 #define TOTAL_FLASH_MINIMUM (2 * 1024 * 1024)
 #endif
@@ -65,8 +61,8 @@ void supervisor_flash_init(void) {
     bi_decl_if_func_used(bi_block_device(
         BINARY_INFO_MAKE_TAG('C', 'P'),
         "CircuitPython",
-        RESERVED_FLASH,
-        TOTAL_FLASH_MINIMUM - RESERVED_FLASH, // This is a minimum. We can't set it dynamically.
+        CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR,
+        TOTAL_FLASH_MINIMUM - CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR, // This is a minimum. We can't set it dynamically.
         NULL,
         BINARY_INFO_BLOCK_DEV_FLAG_READ |
         BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
@@ -92,7 +88,7 @@ uint32_t supervisor_flash_get_block_size(void) {
 }
 
 uint32_t supervisor_flash_get_block_count(void) {
-    return (_flash_size - RESERVED_FLASH) / FILESYSTEM_BLOCK_SIZE;
+    return (_flash_size - CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR) / FILESYSTEM_BLOCK_SIZE;
 }
 
 void port_internal_flash_flush(void) {
@@ -100,15 +96,15 @@ void port_internal_flash_flush(void) {
         return;
     }
     common_hal_mcu_disable_interrupts();
-    flash_range_erase(RESERVED_FLASH + _cache_lba, SECTOR_SIZE);
-    flash_range_program(RESERVED_FLASH + _cache_lba, _cache, SECTOR_SIZE);
+    flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, SECTOR_SIZE);
+    flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, _cache, SECTOR_SIZE);
     common_hal_mcu_enable_interrupts();
     _cache_lba = NO_CACHE;
 }
 
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
     memcpy(dest,
-        (void *)(XIP_BASE + RESERVED_FLASH + block * FILESYSTEM_BLOCK_SIZE),
+        (void *)(XIP_BASE + CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + block * FILESYSTEM_BLOCK_SIZE),
         num_blocks * FILESYSTEM_BLOCK_SIZE);
     return 0;
 }
@@ -123,7 +119,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
 
         if (_cache_lba != block_address) {
             memcpy(_cache,
-                (void *)(XIP_BASE + RESERVED_FLASH + sector_offset),
+                (void *)(XIP_BASE + CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset),
                 SECTOR_SIZE);
             _cache_lba = sector_offset;
         }
@@ -139,8 +135,8 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
         }
         // Make sure we don't have an interrupt while we do flash operations.
         common_hal_mcu_disable_interrupts();
-        flash_range_erase(RESERVED_FLASH + sector_offset, SECTOR_SIZE);
-        flash_range_program(RESERVED_FLASH + sector_offset, _cache, SECTOR_SIZE);
+        flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset, SECTOR_SIZE);
+        flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset, _cache, SECTOR_SIZE);
         common_hal_mcu_enable_interrupts();
     }
 

From f431b2459cb813d2cb4c0aca8297466bd32c5120 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Oct 2022 13:18:19 -0500
Subject: [PATCH 1147/2403] restore nvm module

---
 shared-bindings/nvm/__init__.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-bindings/nvm/__init__.c b/shared-bindings/nvm/__init__.c
index 1c628eaf66..0ecadd9880 100644
--- a/shared-bindings/nvm/__init__.c
+++ b/shared-bindings/nvm/__init__.c
@@ -50,3 +50,5 @@ const mp_obj_module_t nvm_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&nvm_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_nvm, nvm_module, CIRCUITPY_NVM);

From a673ee73c4319bddad6a2dd4ff5dc89605319c7f Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 7 Oct 2022 00:32:24 +0200
Subject: [PATCH 1148/2403] 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             | 5 +----
 locale/de_DE.po          | 8 ++++----
 locale/el.po             | 5 +----
 locale/en_GB.po          | 8 ++++----
 locale/es.po             | 8 ++++----
 locale/fil.po            | 8 ++++----
 locale/fr.po             | 8 ++++----
 locale/hi.po             | 5 +----
 locale/it_IT.po          | 8 ++++----
 locale/ja.po             | 8 ++++----
 locale/ko.po             | 5 +----
 locale/nl.po             | 8 ++++----
 locale/pl.po             | 8 ++++----
 locale/pt_BR.po          | 8 ++++----
 locale/ru.po             | 5 +----
 locale/sv.po             | 8 ++++----
 locale/tr.po             | 5 +----
 locale/zh_Latn_pinyin.po | 8 ++++----
 19 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 76b3c4327b..361bd234be 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1963,10 +1963,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Aliran tidak menemukan metode readinto() atau write()."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Berikan setidaknya satu pin UART"
@@ -3831,6 +3827,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4369,6 +4366,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "Aliran tidak menemukan metode readinto() atau write()."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q harus >= 0"
 
diff --git a/locale/cs.po b/locale/cs.po
index 864a89019c..d98d718842 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1952,10 +1952,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3817,6 +3813,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 26c0d9678f..6a85963efb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1976,10 +1976,6 @@ msgstr "Stereo links muss sich auf PWM-Kanal A befinden"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Stereo rechts muss sich auf PWM-Kanal B befinden"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Stream fehlt readinto() oder write() Methode."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Geben Sie mindestens einen UART-Pin an"
@@ -3895,6 +3891,7 @@ msgstr "VOLUME Taste wird beim Starten gedrückt.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4436,6 +4433,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "Stream fehlt readinto() oder write() Methode."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q muss >= 0 sein"
 
diff --git a/locale/el.po b/locale/el.po
index 6f5d15f1a1..eeb0c15b0f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1961,10 +1961,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3826,6 +3822,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 142f8903a1..ef1e24c050 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1958,10 +1958,6 @@ msgstr "Stereo left must be on PWM channel A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Stereo right must be on PWM channel B"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Stream missing readinto() or write() method."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Supply at least one UART pin"
@@ -3836,6 +3832,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4374,6 +4371,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 "Stream missing readinto() or write() method."
+#~ msgstr "Stream missing readinto() or write() method."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q must be >= 0"
 
diff --git a/locale/es.po b/locale/es.po
index 587db6bc50..c16da030a3 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1987,10 +1987,6 @@ msgstr "Estéreo izquierdo debe estar en el canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Estéreo derecho debe estar en el canal PWM B"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "A Stream le falta el método readinto() o write()."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Suministre al menos un pin UART"
@@ -3883,6 +3879,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4422,6 +4419,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 "Stream missing readinto() or write() method."
+#~ msgstr "A Stream le falta el método readinto() o write()."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q debe ser >= 0"
 
diff --git a/locale/fil.po b/locale/fil.po
index 3f7ad408e4..f32f8400c3 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1951,10 +1951,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Stream kulang ng readinto() o write() method."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3836,6 +3832,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4376,6 +4373,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "Stream kulang ng readinto() o write() method."
+
 #, fuzzy
 #~ msgid "%q must be >= 1"
 #~ msgstr "aarehas na haba dapat ang buffer slices"
diff --git a/locale/fr.po b/locale/fr.po
index f2119d5af9..be22f22d78 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2007,10 +2007,6 @@ msgstr "Canal stéréo gauche doit être sur le canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Canal stéréo droit doit être sur le canal PWM B"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Il manque une méthode readinto() ou write() au flux."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Fournissez au moins une broche UART"
@@ -3925,6 +3921,7 @@ msgstr "presser le bouton VOLUME au démarrage.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4464,6 +4461,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 "Stream missing readinto() or write() method."
+#~ msgstr "Il manque une méthode readinto() ou write() au flux."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q doit être >= 0"
 
diff --git a/locale/hi.po b/locale/hi.po
index 9e8fb9a4a8..53fb104e4c 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1934,10 +1934,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3799,6 +3795,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 56a6c2d6f5..95e0720d45 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1961,10 +1961,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Metodi mancanti readinto() o write() allo stream."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3849,6 +3845,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4389,6 +4386,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "Metodi mancanti readinto() o write() allo stream."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q deve essere >= 0"
 
diff --git a/locale/ja.po b/locale/ja.po
index c3e2aed206..824b9bdf1e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1947,10 +1947,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "ストリームにreadinto()またはwrite()メソッドがありません"
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "少なくとも1つのUARTピンが必要"
@@ -3820,6 +3816,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4358,6 +4355,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "ストリームにreadinto()またはwrite()メソッドがありません"
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%qは0以上でなければなりません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 3c9a63206d..1114d49092 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1937,10 +1937,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3803,6 +3799,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/nl.po b/locale/nl.po
index ac72ed29be..fc68fd1c87 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1958,10 +1958,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Stream mist readinto() of write() methode."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Geef op zijn minst 1 UART pin op"
@@ -3836,6 +3832,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4374,6 +4371,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 "Stream missing readinto() or write() method."
+#~ msgstr "Stream mist readinto() of write() methode."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q moet >= 0 zijn"
 
diff --git a/locale/pl.po b/locale/pl.po
index 668adad804..f36f087339 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1945,10 +1945,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Strumień nie ma metod readinto() lub write()."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Podaj co najmniej jeden pin UART"
@@ -3812,6 +3808,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4350,6 +4347,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Stream missing readinto() or write() method."
+#~ msgstr "Strumień nie ma metod readinto() lub write()."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q musi być >= 0"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 534bc350c7..810adda5e4 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1990,10 +1990,6 @@ msgstr "O estéreo à esquerda deve estar no canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "O estéreo à direita deve estar no canal PWM B"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Transmita o método ausente readinto() ou write()."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Forneça pelo menos um pino UART"
@@ -3904,6 +3900,7 @@ msgstr "pressionando o botão VOLUME na inicialização.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4442,6 +4439,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 "Stream missing readinto() or write() method."
+#~ msgstr "Transmita o método ausente readinto() ou write()."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q deve ser >= 0"
 
diff --git a/locale/ru.po b/locale/ru.po
index 1907d73037..3b00aef2ad 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1981,10 +1981,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Предоставьте хотяб один пин UART"
@@ -3848,6 +3844,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/sv.po b/locale/sv.po
index 50c8291431..8be7b40d6c 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1969,10 +1969,6 @@ msgstr "Vänster stereokanal måste använda PWM kanal A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Höger stereokanal måste använda PWM kanal B"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Stream saknar readinto() eller write() metod."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Ange minst en UART-pinne"
@@ -3865,6 +3861,7 @@ msgstr "genom att trycka på VOLUME-knappen vid start.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4403,6 +4400,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 "Stream missing readinto() or write() method."
+#~ msgstr "Stream saknar readinto() eller write() metod."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q måste vara >= 0"
 
diff --git a/locale/tr.po b/locale/tr.po
index be91ce7a61..0aa5284d36 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -1953,10 +1953,6 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr ""
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -3818,6 +3814,7 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 527a04ae45..c14aa43e49 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1973,10 +1973,6 @@ msgstr "lì tǐ shēng zuǒ bì xū shì zài PWM tōng dào A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "lì tǐ shēng yòu cè bì xū zài PWM tōng dào B shàng"
 
-#: shared-bindings/multiterminal/__init__.c
-msgid "Stream missing readinto() or write() method."
-msgstr "Liú quēshǎo readinto() huò write() fāngfǎ."
-
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Dìngyì zhìshǎo yīgè UART yǐn jiǎo"
@@ -3864,6 +3860,7 @@ msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
@@ -4405,6 +4402,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 "Stream missing readinto() or write() method."
+#~ msgstr "Liú quēshǎo readinto() huò write() fāngfǎ."
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q bìxū > = 0"
 

From 3a6382d1ea199eac25332b73867997e8658323db Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 7 Oct 2022 02:11:05 +0200
Subject: [PATCH 1149/2403] cyw43.CywPin should be the class, not a string

---
 ports/raspberrypi/bindings/cyw43/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 89a1e9be2a..66cc5fa1c4 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -125,7 +125,7 @@ const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
 
 STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) },
-    { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_QSTR(MP_QSTR_CywPin) },
+    { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_PTR(&cyw43_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj },
     { MP_ROM_QSTR(MP_QSTR_get_power_management), &cyw43_get_power_management_obj },
     { MP_ROM_QSTR(MP_QSTR_PM_STANDARD), MP_ROM_INT(PM_STANDARD) },

From f882571366282a17a89aea60e58265227a248d12 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 7 Oct 2022 08:04:08 -0500
Subject: [PATCH 1150/2403] pico w: pins improvements

Closes: #7017

 * Remove the 'GP23' alias for CYW1
 * Remove the 'CYW0' alias for CYW0
 * Switch VBUS_SENSE to CYW2, remove 'GP24' alias

Code that wants to use SMPS_MODE, VBUS_SENSE and LED while being
portable to the W and non-W variants should use those names, not alias
names.

 * Remove A3 / VOLTAGE_MONITOR

Right now this cannot be used. The ability to check the voltage monitor
should be added back in some fashion in the future.
---
 ports/raspberrypi/Makefile                             |  2 +-
 ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c    | 10 ++--------
 .../raspberrypi/common-hal/microcontroller/__init__.c  |  3 +++
 ports/raspberrypi/peripherals/pins.c                   |  5 +++++
 ports/raspberrypi/peripherals/pins.h                   |  1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index bee6650577..5095c4c1f8 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -65,7 +65,7 @@ INC_CYW43 := \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DCYW43_LOGIC_DEBUG=0
+CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
 	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
index 86a6bacc5d..b3c3c93d57 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
@@ -28,13 +28,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
 
     { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
-    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_CYW1) },
-
-    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
-    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
 
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
-    { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
 
     { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
@@ -47,8 +44,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
-    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index c957d15eac..1ccd14df1d 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -176,7 +176,9 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     #if !defined(IGNORE_GPIO23)
     { MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) },
     #endif
+    #if !defined(IGNORE_GPIO24)
     { MP_ROM_QSTR(MP_QSTR_GPIO24), MP_ROM_PTR(&pin_GPIO24) },
+    #endif
     #if !defined(IGNORE_GPIO25)
     { MP_ROM_QSTR(MP_QSTR_GPIO25), MP_ROM_PTR(&pin_GPIO25) },
     #endif
@@ -187,6 +189,7 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     #if CIRCUITPY_CYW43
     { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
     { MP_ROM_QSTR(MP_QSTR_CYW1), MP_ROM_PTR(&pin_CYW1) },
+    { MP_ROM_QSTR(MP_QSTR_CYW2), MP_ROM_PTR(&pin_CYW2) },
     #endif
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
diff --git a/ports/raspberrypi/peripherals/pins.c b/ports/raspberrypi/peripherals/pins.c
index d607add143..3b21d3f08c 100644
--- a/ports/raspberrypi/peripherals/pins.c
+++ b/ports/raspberrypi/peripherals/pins.c
@@ -64,8 +64,12 @@ PIN(19);
 PIN(20);
 PIN(21);
 PIN(22);
+#if !defined(IGNORE_GPIO23)
 PIN(23);
+#endif
+#if !defined(IGNORE_GPIO24)
 PIN(24);
+#endif
 #if !defined(IGNORE_GPIO25)
 PIN(25);
 #endif
@@ -76,4 +80,5 @@ PIN(29);
 #if CIRCUITPY_CYW43
 CYW_PIN(0);
 CYW_PIN(1);
+CYW_PIN(2);
 #endif
diff --git a/ports/raspberrypi/peripherals/pins.h b/ports/raspberrypi/peripherals/pins.h
index 0c7021f808..9ec74ed262 100644
--- a/ports/raspberrypi/peripherals/pins.h
+++ b/ports/raspberrypi/peripherals/pins.h
@@ -73,6 +73,7 @@ extern const mcu_pin_obj_t pin_GPIO29;
 #if CIRCUITPY_CYW43
 extern const mcu_pin_obj_t pin_CYW0;
 extern const mcu_pin_obj_t pin_CYW1;
+extern const mcu_pin_obj_t pin_CYW2;
 #endif
 
 #endif  // MICROPY_INCLUDED_RASPBERRYPI_PERIPHERALS_PINS_H

From 78b278e09172a3b1a2303a6a6e4d540256f3364c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 7 Oct 2022 10:39:30 -0400
Subject: [PATCH 1151/2403] disable rainbowio on arduino_zero

---
 ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index cf64b05bcf..0c2df96c5d 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -11,3 +11,5 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+
+CIRCUITPY_RAINBOWIO = 0

From ab1a7ebcd58a4621f2233eb554c8cf031f57c673 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Fri, 7 Oct 2022 11:13:45 -0400
Subject: [PATCH 1152/2403] Fixed nested unordered list rendering

Also changed to dashes just to remain stylistically similar to the other unordered lists.
---
 README.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index 32c8cb212c..d8a35fb98c 100644
--- a/README.rst
+++ b/README.rst
@@ -84,17 +84,19 @@ common set of requirements.
 
 If you'd like to use the term "CircuitPython" and Blinka for your product here is what we ask:
 
-* Your product is supported by the primary
+- Your product is supported by the primary
   `"adafruit/circuitpython" `_ repo. This way we can
   update any custom code as we update the CircuitPython internals.
-* Your product is listed on `circuitpython.org `__ (source
+- Your product is listed on `circuitpython.org `__ (source
   `here `_). This is to ensure that a user of your
   product can always download the latest version of CircuitPython from the standard place.
-* Your product supports at least one standard "`Workflow `__" for serial and file access:
-  * With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
-  * With file and serial access over Bluetooth Low Energy using the BLE Workflow.
-  * With file access over WiFi using the WiFi Workflow with serial access over USB and/or WebSocket.
-* Boards that do not support the USB Workflow should be clearly marked.
+- Your product supports at least one standard "`Workflow `__" for serial and file access:
+
+  - With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
+  - With file and serial access over Bluetooth Low Energy using the BLE Workflow.
+  - With file access over WiFi using the WiFi Workflow with serial access over USB and/or WebSocket.
+
+- Boards that do not support the USB Workflow should be clearly marked.
 
 If you choose not to meet these requirements, then we ask you call your version of CircuitPython
 something else (for example, SuperDuperPython) and not use the Blinka logo. You can say it is

From 21c0c4c1a6da3185e9ea94623e5dee380d8c0ff9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 7 Oct 2022 15:29:09 -0400
Subject: [PATCH 1153/2403] update esp-idf; allow start/stop channels in wifi
 scanning

---
 ports/espressif/common-hal/wifi/Radio.c       |  9 +++--
 .../common-hal/wifi/ScannedNetworks.c         | 33 ++++++++++++-------
 .../common-hal/wifi/ScannedNetworks.h         |  2 +-
 ports/espressif/common-hal/wifi/__init__.c    |  2 +-
 ports/espressif/esp-idf                       |  2 +-
 shared-bindings/wifi/Radio.c                  | 27 ++++++++++++---
 shared-bindings/wifi/Radio.h                  |  2 +-
 7 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 8616501ba2..27e2c8c610 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -165,7 +165,7 @@ void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint
     esp_wifi_set_mac(ESP_IF_WIFI_AP, mac);
 }
 
-mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self) {
+mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, uint8_t start_channel, uint8_t stop_channel) {
     if (self->current_scan != NULL) {
         mp_raise_RuntimeError(translate("Already scanning for wifi networks"));
     }
@@ -177,9 +177,12 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self) {
     wifi_scannednetworks_obj_t *scan = m_new_obj(wifi_scannednetworks_obj_t);
     scan->base.type = &wifi_scannednetworks_type;
     self->current_scan = scan;
-    scan->start_channel = 1;
-    scan->end_channel = 11;
+    scan->current_channel_index = 0;
+    scan->start_channel = start_channel;
+    scan->end_channel = stop_channel;
     scan->radio_event_group = self->event_group_handle;
+    scan->done = false;
+    scan->channel_scan_in_progress = false;
     wifi_scannednetworks_scan_next_channel(scan);
     return scan;
 }
diff --git a/ports/espressif/common-hal/wifi/ScannedNetworks.c b/ports/espressif/common-hal/wifi/ScannedNetworks.c
index 25c2da0473..50df9f8c95 100644
--- a/ports/espressif/common-hal/wifi/ScannedNetworks.c
+++ b/ports/espressif/common-hal/wifi/ScannedNetworks.c
@@ -72,7 +72,7 @@ mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self)
         return mp_const_none;
     }
     // If we are scanning, wait and then load them.
-    if (self->scanning) {
+    if (self->channel_scan_in_progress) {
         // We may have to scan more than one channel to get a result.
         while (!self->done) {
             if (!wifi_scannednetworks_wait_for_scan(self)) {
@@ -81,7 +81,7 @@ mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self)
             }
 
             esp_wifi_scan_get_ap_num(&self->total_results);
-            self->scanning = false;
+            self->channel_scan_in_progress = false;
             if (self->total_results > 0) {
                 break;
             }
@@ -112,7 +112,7 @@ mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self)
             }
         }
         esp_wifi_scan_get_ap_records(&self->total_results, self->results);
-        self->scanning = false;
+        self->channel_scan_in_progress = false;
     }
 
     wifi_network_obj_t *entry = m_new_obj(wifi_network_obj_t);
@@ -132,40 +132,49 @@ mp_obj_t common_hal_wifi_scannednetworks_next(wifi_scannednetworks_obj_t *self)
 }
 
 // We don't do a linear scan so that we look at a variety of spectrum up front.
-static uint8_t scan_pattern[] = {6, 1, 11, 3, 9, 13, 2, 4, 8, 12, 5, 7, 10, 14};
+static uint8_t scan_pattern[] = {6, 1, 11, 3, 9, 13, 2, 4, 8, 12, 5, 7, 10, 14, 0};
 
 void wifi_scannednetworks_scan_next_channel(wifi_scannednetworks_obj_t *self) {
-    uint8_t next_channel = sizeof(scan_pattern);
+    // There is no channel 0, so use that as a flag to indicate we've run out of channels to scan.
+    uint8_t next_channel = 0;
     while (self->current_channel_index < sizeof(scan_pattern)) {
         next_channel = scan_pattern[self->current_channel_index];
         self->current_channel_index++;
+        // Scan only channels that are in the specified range.
         if (self->start_channel <= next_channel && next_channel <= self->end_channel) {
             break;
         }
     }
     wifi_scan_config_t config = { 0 };
     config.channel = next_channel;
-    if (next_channel == sizeof(scan_pattern)) {
+    if (next_channel == 0) {
         wifi_scannednetworks_done(self);
     } else {
         esp_err_t result = esp_wifi_scan_start(&config, false);
         if (result != ESP_OK) {
             wifi_scannednetworks_done(self);
         } else {
-            self->scanning = true;
+            self->channel_scan_in_progress = true;
         }
     }
 }
 
 void wifi_scannednetworks_deinit(wifi_scannednetworks_obj_t *self) {
     // if a scan is active, make sure and clean up the idf's buffer of results.
-    if (self->scanning) {
+    if (self->channel_scan_in_progress) {
         esp_wifi_scan_stop();
         if (wifi_scannednetworks_wait_for_scan(self)) {
-            // Ignore the number of records since we're throwing them away.
-            uint16_t number = 0;
-            esp_wifi_scan_get_ap_records(&number, NULL);
-            self->scanning = false;
+            // Discard the scanned records, one at a time, to avoid memory leaks.
+            uint16_t number;
+            do {
+                number = 1;
+                wifi_ap_record_t record;
+                esp_wifi_scan_get_ap_records(&number, &record);
+            } while (number > 0);
+            // TODO: available in ESP-IDF v5.0; do instead of the above.
+            // Discard scan results.
+            // esp_wifi_clear_ap_list();
+            self->channel_scan_in_progress = false;
         }
     }
     wifi_scannednetworks_done(self);
diff --git a/ports/espressif/common-hal/wifi/ScannedNetworks.h b/ports/espressif/common-hal/wifi/ScannedNetworks.h
index f089f27e3f..0ad4b5e3dc 100644
--- a/ports/espressif/common-hal/wifi/ScannedNetworks.h
+++ b/ports/espressif/common-hal/wifi/ScannedNetworks.h
@@ -53,7 +53,7 @@ typedef struct {
     uint8_t end_channel; // Inclusive
 
     bool done;
-    bool scanning;
+    bool channel_scan_in_progress;
 } wifi_scannednetworks_obj_t;
 
 void wifi_scannednetworks_scan_next_channel(wifi_scannednetworks_obj_t *self);
diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index 42ea078810..cfcfaf024b 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -172,7 +172,7 @@ void common_hal_wifi_init(bool user_initiated) {
     // Even though we just called esp_netif_create_default_wifi_sta,
     //   station mode isn't actually ready for use until esp_wifi_set_mode()
     //   is called and the configuration is loaded via esp_wifi_set_config().
-    // Set both convienence flags to false so it's not forgotten.
+    // Set both convenience flags to false so it's not forgotten.
     self->sta_mode = 0;
     self->ap_mode = 0;
 
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index d51f7d8821..716d8531d7 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit d51f7d882187afa4b39c2613fd0fe2ac2fea1145
+Subproject commit 716d8531d71b122975e2966a24ec7613b87eb7b0
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index abe04ce24a..1af73a1db2 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -218,12 +218,31 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj,
 //|     ) -> Iterable[Network]:
 //|         """Scans for available wifi networks over the given channel range. Make sure the channels are allowed in your country."""
 //|         ...
-STATIC mp_obj_t wifi_radio_start_scanning_networks(mp_obj_t self_in) {
-    wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_start_channel, ARG_stop_channel };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+        { MP_QSTR_stop_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 11} },
+    };
 
-    return common_hal_wifi_radio_start_scanning_networks(self);
+    wifi_radio_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);
+
+    uint8_t start_channel =
+        (uint8_t)mp_arg_validate_int_range(args[ARG_start_channel].u_int, 1, 14, MP_QSTR_start_channel);
+    uint8_t stop_channel =
+        (uint8_t)mp_arg_validate_int_range(args[ARG_stop_channel].u_int, 1, 14, MP_QSTR_stop_channel);
+    // Swap if in reverse order, without complaining.
+    if (start_channel > stop_channel) {
+        uint8_t temp = stop_channel;
+        stop_channel = start_channel;
+        start_channel = temp;
+    }
+
+    return common_hal_wifi_radio_start_scanning_networks(self, start_channel, stop_channel);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_scanning_networks_obj, wifi_radio_start_scanning_networks);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_scanning_networks_obj, 1, wifi_radio_start_scanning_networks);
 
 //|     def stop_scanning_networks(self) -> None:
 //|         """Stop scanning for Wifi networks and free any resources used to do it."""
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 479ce1a1b3..370bdbd917 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -85,7 +85,7 @@ extern void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, con
 extern mp_float_t common_hal_wifi_radio_get_tx_power(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t power);
 
-extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, uint8_t start_channel, uint8_t stop_channel);
 extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self);

From 747dc7746de5c3b0759828b5b42516c717298c94 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 7 Oct 2022 16:22:17 -0400
Subject: [PATCH 1154/2403] handle scan channel bounds but note they do nothing
 for RP2040 CYW43

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 3 ++-
 shared-bindings/wifi/Radio.c              | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 23414491d6..a0654414de 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -131,7 +131,8 @@ void common_hal_wifi_radio_set_mac_address_ap(wifi_radio_obj_t *self, const uint
     ro_attribute(MP_QSTR_mac_address_ap);
 }
 
-mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self) {
+mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, uint8_t start_channel, uint8_t stop_channel) {
+    // channel bounds are ignored; not implemented in driver
     if (self->current_scan) {
         mp_raise_RuntimeError(translate("Already scanning for wifi networks"));
     }
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 1af73a1db2..57e953ec68 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -216,7 +216,12 @@ MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj,
 //|     def start_scanning_networks(
 //|         self, *, start_channel: int = 1, stop_channel: int = 11
 //|     ) -> Iterable[Network]:
-//|         """Scans for available wifi networks over the given channel range. Make sure the channels are allowed in your country."""
+//|         """Scans for available wifi networks over the given channel range. Make sure the channels are allowed in your country.
+//|
+//|         .. note::
+//|
+//|             In the raspberrypi port (RP2040 CYW43), ``start_channel`` and ``stop_channel`` are ignored.
+//|         """
 //|         ...
 STATIC mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_start_channel, ARG_stop_channel };

From b097c0736ac36c4277cd7cebca586dd8fc725dee Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 7 Oct 2022 22:35:53 -0400
Subject: [PATCH 1155/2403] shrink some small builds

---
 ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk     | 2 ++
 ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk | 2 ++
 ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk        | 2 ++
 ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk    | 5 +++--
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk           | 2 ++
 .../boards/sparkfun_redboard_turbo/mpconfigboard.mk          | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
index 261e30d7e5..5d02fe3824 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@@ -11,3 +11,5 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+
+CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
index f289aad065..7ef2af6ddb 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@@ -11,3 +11,5 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+
+CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index cf64b05bcf..0c2df96c5d 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -11,3 +11,5 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+
+CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index a1891f972e..aa9055a5e3 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -15,12 +15,13 @@ CIRCUITPY_FULL_BUILD = 0
 # A number of modules are removed for RFM69 to make room for frozen libraries.
 # Many I/O functions are not available.
 CIRCUITPY_ANALOGIO = 1
+CIRCUITPY_BUSDEVICE = 1
+CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
+CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_USB_HID = 0
-CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_BUSDEVICE = 1
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM69
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index bcf3e132d3..32be4805d7 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -20,11 +20,13 @@ CIRCUITPY_BITBANG_APA102 = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
+CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
index 70ece9b9fc..ef23e56022 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_RAINBOWIO = 0

From 86a0f9a861232678df0554398d45465515de1fe1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 9 Oct 2022 19:22:39 -0400
Subject: [PATCH 1156/2403] save about 112 bytes

---
 locale/circuitpython.pot                | 9 +++++++++
 main.c                                  | 6 +++---
 ports/atmel-samd/common-hal/busio/I2C.c | 2 --
 py/modbuiltins.c                        | 1 -
 py/obj.h                                | 1 -
 py/objexcept.c                          | 1 -
 py/persistentcode.c                     | 2 +-
 py/runtime.c                            | 4 ----
 py/runtime.h                            | 1 -
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 504e66a50d..b6e0c7468c 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -60,6 +60,11 @@ msgstr ""
 msgid "%%c requires int or char"
 msgstr ""
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2077,6 +2082,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/main.c b/main.c
index d8542bcb57..06ca1ba93b 100644
--- a/main.c
+++ b/main.c
@@ -779,9 +779,9 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
         uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
         common_hal_mcu_processor_get_uid(raw_id);
-        mp_printf(&mp_plat_print, "UID:");
-        for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
-            mp_printf(&mp_plat_print, "%02X", raw_id[i]);
+        mp_cprintf(&mp_plat_print, translate("UID:"));
+        for (size_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
+            mp_cprintf(&mp_plat_print, translate("%02X"), raw_id[i]);
         }
         mp_printf(&mp_plat_print, "\n");
         port_boot_info();
diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c
index d97fa227b2..902e696408 100644
--- a/ports/atmel-samd/common-hal/busio/I2C.c
+++ b/ports/atmel-samd/common-hal/busio/I2C.c
@@ -125,8 +125,6 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     // exact cutoff, but no frequency well under 100kHz is available)
     if ((frequency < 95000) ||
         (i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE)) {
-        reset_pin_number(sda->number);
-        reset_pin_number(scl->number);
         common_hal_busio_i2c_deinit(self);
         mp_arg_error_invalid(MP_QSTR_frequency);
     }
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 4e9fbfcd93..072ba8675f 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -759,7 +759,6 @@ STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_KeyError), MP_ROM_PTR(&mp_type_KeyError) },
     { MP_ROM_QSTR(MP_QSTR_LookupError), MP_ROM_PTR(&mp_type_LookupError) },
     { MP_ROM_QSTR(MP_QSTR_MemoryError), MP_ROM_PTR(&mp_type_MemoryError) },
-    { MP_ROM_QSTR(MP_QSTR_MpyError), MP_ROM_PTR(&mp_type_MpyError) },
     { MP_ROM_QSTR(MP_QSTR_NameError), MP_ROM_PTR(&mp_type_NameError) },
     { MP_ROM_QSTR(MP_QSTR_NotImplementedError), MP_ROM_PTR(&mp_type_NotImplementedError) },
     { MP_ROM_QSTR(MP_QSTR_OSError), MP_ROM_PTR(&mp_type_OSError) },
diff --git a/py/obj.h b/py/obj.h
index 8f38a4c7c0..7fa21f5e38 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -742,7 +742,6 @@ extern const mp_obj_type_t mp_type_ReloadException;
 extern const mp_obj_type_t mp_type_KeyError;
 extern const mp_obj_type_t mp_type_LookupError;
 extern const mp_obj_type_t mp_type_MemoryError;
-extern const mp_obj_type_t mp_type_MpyError;
 extern const mp_obj_type_t mp_type_NameError;
 extern const mp_obj_type_t mp_type_NotImplementedError;
 extern const mp_obj_type_t mp_type_OSError;
diff --git a/py/objexcept.c b/py/objexcept.c
index 230f9d11ba..12408c0d1f 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -347,7 +347,6 @@ MP_DEFINE_EXCEPTION(UnicodeError, ValueError)
 #if CIRCUITPY_ALARM
 MP_DEFINE_EXCEPTION(DeepSleepRequest, BaseException)
 #endif
-MP_DEFINE_EXCEPTION(MpyError, ValueError)
 /*
   MP_DEFINE_EXCEPTION(Warning, Exception)
     MP_DEFINE_EXCEPTION(DeprecationWarning, Warning)
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 787f724bf6..0431b30a29 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -582,7 +582,7 @@ mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader) {
         || MPY_FEATURE_DECODE_FLAGS(header[2]) != MPY_FEATURE_FLAGS
         || header[3] > mp_small_int_bits()
         || read_uint(reader, NULL) > QSTR_WINDOW_SIZE) {
-        mp_raise_MpyError(MP_ERROR_TEXT("Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info."));
+        mp_raise_ValueError(MP_ERROR_TEXT("Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info."));
     }
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
         byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
diff --git a/py/runtime.c b/py/runtime.c
index 7fcad7366a..e5b411b0d3 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1742,10 +1742,6 @@ NORETURN void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...) {
     va_end(argptr);
 }
 
-NORETURN void mp_raise_MpyError(const compressed_string_t *msg) {
-    mp_raise_msg(&mp_type_MpyError, msg);
-}
-
 NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
     nlr_raise(mp_obj_new_exception_arg1(exc_type, arg));
 }
diff --git a/py/runtime.h b/py/runtime.h
index a78969780b..923071f7ca 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -225,7 +225,6 @@ NORETURN void mp_raise_BrokenPipeError(void);
 NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg);
 NORETURN void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...);
 NORETURN void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...);
-NORETURN void mp_raise_MpyError(const compressed_string_t *msg);
 NORETURN void mp_raise_recursion_depth(void);
 #endif
 

From 6dcbb6108134b88b61efae97fa98278edb62aff1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 9 Oct 2022 20:27:39 -0400
Subject: [PATCH 1157/2403] fix test that used MpyError

---
 tests/micropython/import_mpy_invalid.py.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/micropython/import_mpy_invalid.py.exp b/tests/micropython/import_mpy_invalid.py.exp
index ebf72c293c..432287028e 100644
--- a/tests/micropython/import_mpy_invalid.py.exp
+++ b/tests/micropython/import_mpy_invalid.py.exp
@@ -1,4 +1,4 @@
 mod0 RuntimeError Corrupt .mpy file
 mod1 RuntimeError Corrupt .mpy file
-mod2 MpyError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info.
-mod3 MpyError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info.
+mod2 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info.
+mod3 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info.

From 3a5eb31b4ecb958671e53c0517c99b61f51942be Mon Sep 17 00:00:00 2001
From: Boran Roni 
Date: Mon, 10 Oct 2022 14:00:12 +0000
Subject: [PATCH 1158/2403] Translated using Weblate (Turkish)

Currently translated at 14.5% (145 of 997 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/tr/
---
 locale/tr.po | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/locale/tr.po b/locale/tr.po
index 0aa5284d36..60a4d83677 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-08-29 18:20+0000\n"
+"PO-Revision-Date: 2022-10-10 18:23+0000\n"
 "Last-Translator: Boran Roni \n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -15,7 +15,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.14.1-dev\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: main.c
 msgid ""
@@ -167,7 +167,7 @@ msgstr "%q >= %d olmalıdır"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q 'h', 'H', 'b' yada 'B' tipi bir bytearray /array olmalı"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -375,7 +375,7 @@ msgstr "fonksiyon dışında 'yield'"
 
 #: py/compile.c
 msgid "*x must be assignment target"
-msgstr ""
+msgstr "*x atama hedefi olmalıdır"
 
 #: py/obj.c
 msgid ", in %q\n"
@@ -486,7 +486,7 @@ msgstr "Halihazırda duyuruluyor."
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 msgid "Already have all-matches listener"
-msgstr ""
+msgstr "Tüm eşleşmelerle eşleşen dinleyiciniz var"
 
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -605,15 +605,15 @@ msgstr "Parlaklık ayarlanabilir değil"
 #: shared-bindings/_bleio/UUID.c
 #, c-format
 msgid "Buffer + offset too small %d %d %d"
-msgstr ""
+msgstr "Buffer + offset çok küçük %d %d %d"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
-msgstr ""
+msgstr "Buffer elementleri 4 bit olmak zorunda"
 
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is not a bytearray."
-msgstr "Arabellek bayt dizisi değil"
+msgstr "Buffer bir bytearray değil."
 
 #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -632,12 +632,12 @@ msgstr "Arabellek boyutu 512'nin katı olmalı"
 
 #: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
 msgid "Buffer must be a multiple of 512 bytes"
-msgstr ""
+msgstr "Buffer 512 bitin katı olmalı"
 
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
-msgstr ""
+msgstr "Buffer bitten %d daha az"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
@@ -653,7 +653,7 @@ msgstr "Veriyolu pini %d kullanımda"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
-msgstr ""
+msgstr "Bit buffer'ı 16bit olmalı."
 
 #: shared-bindings/aesio/aes.c
 msgid "CBC blocks must be multiples of 16 bytes"
@@ -661,11 +661,11 @@ msgstr "CBC blokları 16 baytın katları şeklinde olmalı"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr "CIRCUITPY sürücüsü bulunamadı veya oluşturulamadı"
+msgstr "CIRCUITPY sürücüsü bulunamadı veya oluşturulamadı."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
-msgstr ""
+msgstr "CRC yada checksum geçersiz"
 
 #: py/objtype.c
 msgid "Call super().__init__() before accessing native object."
@@ -712,15 +712,16 @@ msgstr "Değerler silinemez"
 #: ports/nrf/common-hal/digitalio/DigitalInOut.c
 #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
 msgid "Cannot get pull while in output mode"
-msgstr ""
+msgstr "Çıkış modundayken çekme alınamıyor"
 
 #: ports/nrf/common-hal/microcontroller/Processor.c
 msgid "Cannot get temperature"
-msgstr ""
+msgstr "Isı okunamadı"
 
 #: shared-bindings/_bleio/Adapter.c
+#, fuzzy
 msgid "Cannot have scan responses for extended, connectable advertisements."
-msgstr ""
+msgstr "Genişletilmiş, bağlanabilir reklamlar için tarama yanıtları yapılamaz."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot pull on input-only pin."
@@ -779,7 +780,7 @@ msgstr ""
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython core code crashed hard. Whoops!\n"
-msgstr ""
+msgstr "CircuitPython kor kodu patladı. Haydaaa!\n"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython was unable to allocate the heap."
@@ -791,17 +792,17 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Clock unit in use"
-msgstr ""
+msgstr "Saat ünitesi kullanımda"
 
 #: shared-bindings/_bleio/Connection.c
 msgid ""
 "Connection has been disconnected and can no longer be used. Create a new "
 "connection."
-msgstr ""
+msgstr "Bağlantı koparıldı ve tekrar kullanılamaz. Yeni bir bağlantı kurun."
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
-msgstr ""
+msgstr "Bozuk .mpy dosyası"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c
 msgid "Could not retrieve clock"
@@ -813,7 +814,7 @@ msgstr ""
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
-msgstr ""
+msgstr "PWM başlatılamadı"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "Could not start interrupt, RX busy"

From ab1de66dd37cffcac5220251283738431d8a7ecd Mon Sep 17 00:00:00 2001
From: Florin Maticu 
Date: Tue, 4 Oct 2022 23:55:05 +0200
Subject: [PATCH 1159/2403] Remove redundant header files.

---
 ports/stm/common-hal/alarm/pin/PinAlarm.c     | 2 --
 ports/stm/common-hal/alarm/time/TimeAlarm.c   | 1 -
 ports/stm/common-hal/analogio/AnalogOut.c     | 3 +++
 ports/stm/common-hal/busio/I2C.c              | 1 -
 ports/stm/common-hal/busio/SPI.c              | 3 ---
 ports/stm/common-hal/digitalio/DigitalInOut.c | 2 --
 ports/stm/common-hal/microcontroller/Pin.c    | 2 --
 ports/stm/common-hal/pulseio/PulseIn.c        | 1 -
 ports/stm/common-hal/pulseio/PulseOut.c       | 4 ----
 ports/stm/common-hal/pwmio/PWMOut.c           | 1 -
 ports/stm/common-hal/rtc/RTC.c                | 4 ----
 ports/stm/mphalport.c                         | 3 ---
 ports/stm/peripherals/exti.c                  | 7 ++-----
 ports/stm/peripherals/rtc.c                   | 3 ---
 ports/stm/peripherals/timers.c                | 1 -
 ports/stm/supervisor/internal_flash.c         | 5 -----
 ports/stm/supervisor/port.c                   | 1 -
 ports/stm/supervisor/usb.c                    | 2 --
 18 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.c b/ports/stm/common-hal/alarm/pin/PinAlarm.c
index 799922ae8f..0e5fa9e94d 100644
--- a/ports/stm/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/stm/common-hal/alarm/pin/PinAlarm.c
@@ -27,8 +27,6 @@
 #include "py/runtime.h"
 
 #include "shared-bindings/alarm/pin/PinAlarm.h"
-#include "shared-bindings/microcontroller/__init__.h"
-#include "shared-bindings/microcontroller/Pin.h"
 
 #include "peripherals/exti.h"
 
diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c
index 2eb8ee4a81..6d508cd8cc 100644
--- a/ports/stm/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c
@@ -28,7 +28,6 @@
 
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
-#include "supervisor/port.h"
 #include "peripherals/rtc.h"
 
 #include STM32_HAL_H
diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c
index 3c2860c9ad..4dd8783545 100644
--- a/ports/stm/common-hal/analogio/AnalogOut.c
+++ b/ports/stm/common-hal/analogio/AnalogOut.c
@@ -28,9 +28,12 @@
 #include 
 #include 
 
+
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
+
+
 #include "shared-bindings/analogio/AnalogOut.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/shared/translate/translate.h"
diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c
index 4faa5ca2ef..259d678f2b 100644
--- a/ports/stm/common-hal/busio/I2C.c
+++ b/ports/stm/common-hal/busio/I2C.c
@@ -30,7 +30,6 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/microcontroller/__init__.h"
 #include "supervisor/shared/translate/translate.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
index 7886e18a0c..89ec4b7cdc 100644
--- a/ports/stm/common-hal/busio/SPI.c
+++ b/ports/stm/common-hal/busio/SPI.c
@@ -28,11 +28,8 @@
 #include 
 
 #include "shared-bindings/busio/SPI.h"
-#include "py/mperrno.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/microcontroller/__init__.h"
-#include "supervisor/board.h"
 #include "supervisor/shared/translate/translate.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
diff --git a/ports/stm/common-hal/digitalio/DigitalInOut.c b/ports/stm/common-hal/digitalio/DigitalInOut.c
index 58f81b43b6..51b05907f7 100644
--- a/ports/stm/common-hal/digitalio/DigitalInOut.c
+++ b/ports/stm/common-hal/digitalio/DigitalInOut.c
@@ -27,8 +27,6 @@
 
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "py/runtime.h"
-#include "supervisor/shared/translate/translate.h"
 
 // The HAL is sparse on obtaining register information, so we use the LLs here.
 #if (CPY_STM32H7)
diff --git a/ports/stm/common-hal/microcontroller/Pin.c b/ports/stm/common-hal/microcontroller/Pin.c
index 9d6c8ec71a..7c4f4511e7 100644
--- a/ports/stm/common-hal/microcontroller/Pin.c
+++ b/ports/stm/common-hal/microcontroller/Pin.c
@@ -26,9 +26,7 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/digitalio/DigitalInOut.h"
 
-#include "py/mphal.h"
 #include "pins.h"
 
 #if defined(TFBGA216)
diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c
index 1c323ad711..4ed2600d55 100644
--- a/ports/stm/common-hal/pulseio/PulseIn.c
+++ b/ports/stm/common-hal/pulseio/PulseIn.c
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include "py/mpconfig.h"
-#include "py/gc.h"
 #include "py/runtime.h"
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
diff --git a/ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm/common-hal/pulseio/PulseOut.c
index 7725d8cdde..f558c8f776 100644
--- a/ports/stm/common-hal/pulseio/PulseOut.c
+++ b/ports/stm/common-hal/pulseio/PulseOut.c
@@ -29,14 +29,10 @@
 #include 
 
 #include "py/mpconfig.h"
-#include "py/gc.h"
-#include "py/runtime.h"
 #include "shared-bindings/pulseio/PulseOut.h"
 #include "shared-bindings/pwmio/PWMOut.h"
-#include "supervisor/shared/translate/translate.h"
 
 #include STM32_HAL_H
-#include "shared-bindings/microcontroller/Pin.h"
 #include "timers.h"
 
 // A single timer is shared amongst all PulseOut objects under the assumption that
diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c
index 45f00b901b..16d510b605 100644
--- a/ports/stm/common-hal/pwmio/PWMOut.c
+++ b/ports/stm/common-hal/pwmio/PWMOut.c
@@ -31,7 +31,6 @@
 #include "shared-bindings/pwmio/PWMOut.h"
 #include "supervisor/shared/translate/translate.h"
 
-#include "shared-bindings/microcontroller/__init__.h"
 #include STM32_HAL_H
 #include "shared-bindings/microcontroller/Pin.h"
 
diff --git a/ports/stm/common-hal/rtc/RTC.c b/ports/stm/common-hal/rtc/RTC.c
index 48c47fda8c..c9dc50d769 100644
--- a/ports/stm/common-hal/rtc/RTC.c
+++ b/ports/stm/common-hal/rtc/RTC.c
@@ -26,13 +26,9 @@
 
 #include 
 
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
-#include "shared-bindings/rtc/__init__.h"
-#include "common-hal/rtc/RTC.h"
 #include "shared-bindings/rtc/RTC.h"
-#include "supervisor/port.h"
 #include "supervisor/shared/translate/translate.h"
 #include "peripherals/rtc.h"
 
diff --git a/ports/stm/mphalport.c b/ports/stm/mphalport.c
index bb62b07987..647798f6d5 100644
--- a/ports/stm/mphalport.c
+++ b/ports/stm/mphalport.c
@@ -28,11 +28,8 @@
 #include 
 
 #include "py/mphal.h"
-#include "py/mpstate.h"
-#include "py/gc.h"
 
 #include "shared-bindings/microcontroller/__init__.h"
-#include "supervisor/shared/tick.h"
 
 void mp_hal_delay_us(mp_uint_t delay) {
     common_hal_mcu_delay_us(delay);
diff --git a/ports/stm/peripherals/exti.c b/ports/stm/peripherals/exti.c
index a161898491..a97de55531 100644
--- a/ports/stm/peripherals/exti.c
+++ b/ports/stm/peripherals/exti.c
@@ -26,9 +26,6 @@
 
 #include 
 #include "py/mpconfig.h"
-#include "py/gc.h"
-#include "py/obj.h"
-#include "py/runtime.h"
 
 #include "peripherals/exti.h"
 
@@ -128,7 +125,7 @@ void EXTI4_IRQHandler(void) {
 #endif
 void EXTI9_5_IRQHandler(void) {
     uint32_t pending = EXTI->PR;
-    for (uint i = 5; i <= 9; i++) {
+    for (uint8_t i = 5; i <= 9; i++) {
         if (pending & (1 << i)) {
             stm_exti_callback[i](i);
         }
@@ -137,7 +134,7 @@ void EXTI9_5_IRQHandler(void) {
 
 void EXTI15_10_IRQHandler(void) {
     uint32_t pending = EXTI->PR;
-    for (uint i = 10; i <= 15; i++) {
+    for (uint8_t i = 10; i <= 15; i++) {
         if (pending & (1 << i)) {
             stm_exti_callback[i](i);
         }
diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c
index bd65ccbf17..15f82ba78d 100644
--- a/ports/stm/peripherals/rtc.c
+++ b/ports/stm/peripherals/rtc.c
@@ -29,9 +29,6 @@
 #include STM32_HAL_H
 
 #include "py/mpconfig.h"
-#include "py/gc.h"
-#include "py/obj.h"
-#include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
 
 // Default period for ticks is 1/1024 second
diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c
index 371b8f414b..ed0f2ec38a 100644
--- a/ports/stm/peripherals/timers.c
+++ b/ports/stm/peripherals/timers.c
@@ -26,7 +26,6 @@
 #include "timers.h"
 
 #include "py/mpconfig.h"
-#include "py/gc.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c
index cd693d0c66..e0f4153cb1 100644
--- a/ports/stm/supervisor/internal_flash.c
+++ b/ports/stm/supervisor/internal_flash.c
@@ -29,12 +29,7 @@
 #include 
 #include 
 
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "py/mphal.h"
 #include "py/obj.h"
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"
 #include "supervisor/flash.h"
 #include "supervisor/shared/safe_mode.h"
 
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 896d58b013..97bd1c4982 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -29,7 +29,6 @@
 #include "supervisor/background_callback.h"
 #include "supervisor/board.h"
 #include "supervisor/port.h"
-#include "shared/timeutils/timeutils.h"
 
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
diff --git a/ports/stm/supervisor/usb.c b/ports/stm/supervisor/usb.c
index 168bacc569..cafa401bd4 100644
--- a/ports/stm/supervisor/usb.c
+++ b/ports/stm/supervisor/usb.c
@@ -27,9 +27,7 @@
 
 
 #include "supervisor/usb.h"
-#include "shared/runtime/interrupt_char.h"
 #include "shared/readline/readline.h"
-#include "lib/tinyusb/src/device/usbd.h"
 
 #include "py/mpconfig.h"
 

From 81d227de730dbcd3ea70df2b4be273e7e6aed1d7 Mon Sep 17 00:00:00 2001
From: flom84 
Date: Mon, 10 Oct 2022 20:55:44 +0200
Subject: [PATCH 1160/2403] Use types from circuitpython.

---
 ports/stm/peripherals/exti.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/stm/peripherals/exti.c b/ports/stm/peripherals/exti.c
index a97de55531..861e5de0a6 100644
--- a/ports/stm/peripherals/exti.c
+++ b/ports/stm/peripherals/exti.c
@@ -26,6 +26,7 @@
 
 #include 
 #include "py/mpconfig.h"
+#include "py/misc.h"
 
 #include "peripherals/exti.h"
 
@@ -125,7 +126,7 @@ void EXTI4_IRQHandler(void) {
 #endif
 void EXTI9_5_IRQHandler(void) {
     uint32_t pending = EXTI->PR;
-    for (uint8_t i = 5; i <= 9; i++) {
+    for (uint i = 5; i <= 9; i++) {
         if (pending & (1 << i)) {
             stm_exti_callback[i](i);
         }
@@ -134,7 +135,7 @@ void EXTI9_5_IRQHandler(void) {
 
 void EXTI15_10_IRQHandler(void) {
     uint32_t pending = EXTI->PR;
-    for (uint8_t i = 10; i <= 15; i++) {
+    for (uint i = 10; i <= 15; i++) {
         if (pending & (1 << i)) {
             stm_exti_callback[i](i);
         }

From 2ad5c11ca94ad600fee175fba798b8d2320d31ee Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Mon, 10 Oct 2022 21:13:35 +0200
Subject: [PATCH 1161/2403] 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             | 9 +++++++++
 locale/cs.po             | 9 +++++++++
 locale/de_DE.po          | 9 +++++++++
 locale/el.po             | 9 +++++++++
 locale/en_GB.po          | 9 +++++++++
 locale/es.po             | 9 +++++++++
 locale/fil.po            | 9 +++++++++
 locale/fr.po             | 9 +++++++++
 locale/hi.po             | 9 +++++++++
 locale/it_IT.po          | 9 +++++++++
 locale/ja.po             | 9 +++++++++
 locale/ko.po             | 9 +++++++++
 locale/nl.po             | 9 +++++++++
 locale/pl.po             | 9 +++++++++
 locale/pt_BR.po          | 9 +++++++++
 locale/ru.po             | 9 +++++++++
 locale/sv.po             | 9 +++++++++
 locale/tr.po             | 9 +++++++++
 locale/zh_Latn_pinyin.po | 9 +++++++++
 19 files changed, 171 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 361bd234be..2dae1a04b4 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -65,6 +65,11 @@ msgstr "output:\n"
 msgid "%%c requires int or char"
 msgstr "%%c harus int atau char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2106,6 +2111,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index d98d718842..9bb05d77d0 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -67,6 +67,11 @@ msgstr " výstup:\n"
 msgid "%%c requires int or char"
 msgstr "%%c vyžaduje int nebo char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2095,6 +2100,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6a85963efb..bec093fd7e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -66,6 +66,11 @@ msgstr " Ausgabe:\n"
 msgid "%%c requires int or char"
 msgstr "%%c erwartet Int oder Char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2132,6 +2137,10 @@ msgstr "UART wird wieder Initialisiert"
 msgid "UART write"
 msgstr "UART wird geschrieben"
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB beschäftigt"
diff --git a/locale/el.po b/locale/el.po
index eeb0c15b0f..d2ce8ed68d 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -71,6 +71,11 @@ msgstr " έξοδος:\n"
 msgid "%%c requires int or char"
 msgstr "%%c απαιτεί int ή char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2104,6 +2109,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index ef1e24c050..da587c2653 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -69,6 +69,11 @@ msgstr " output:\n"
 msgid "%%c requires int or char"
 msgstr "%%c requires int or char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2108,6 +2113,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB busy"
diff --git a/locale/es.po b/locale/es.po
index c16da030a3..2397b2947e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -69,6 +69,11 @@ msgstr " salida:\n"
 msgid "%%c requires int or char"
 msgstr "%%c requiere int o char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2140,6 +2145,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB ocupado"
diff --git a/locale/fil.po b/locale/fil.po
index f32f8400c3..49f5eaef2c 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -61,6 +61,11 @@ msgstr " output:\n"
 msgid "%%c requires int or char"
 msgstr "%%c nangangailangan ng int o char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2094,6 +2099,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index be22f22d78..40bc8ec33b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -70,6 +70,11 @@ msgstr " sortie :\n"
 msgid "%%c requires int or char"
 msgstr "%%c nécessite un chiffre entier 'int' ou un caractère 'char'"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2161,6 +2166,10 @@ msgstr "Ré-initialisation du UART"
 msgid "UART write"
 msgstr "Écriture UART"
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "L'USB est occupé"
diff --git a/locale/hi.po b/locale/hi.po
index 53fb104e4c..82915d1a7a 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -60,6 +60,11 @@ msgstr ""
 msgid "%%c requires int or char"
 msgstr ""
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2077,6 +2082,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 95e0720d45..acb4273138 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -66,6 +66,11 @@ msgstr " output:\n"
 msgid "%%c requires int or char"
 msgstr "%%c necessita di int o char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2104,6 +2109,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 824b9bdf1e..2db88128a2 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -65,6 +65,11 @@ msgstr " 出力:\n"
 msgid "%%c requires int or char"
 msgstr "%%c にはintまたはcharが必要"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2090,6 +2095,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 1114d49092..2a99cf8cd4 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -61,6 +61,11 @@ msgstr " 산출:\n"
 msgid "%%c requires int or char"
 msgstr "%%c 전수(int)또는 캐릭터(char)필요합니다"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2080,6 +2085,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index fc68fd1c87..4baa1d28bc 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -63,6 +63,11 @@ msgstr " uitvoer:\n"
 msgid "%%c requires int or char"
 msgstr "%%c vereist een int of char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2101,6 +2106,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index f36f087339..23c42ffe92 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -65,6 +65,11 @@ msgstr " wyjście:\n"
 msgid "%%c requires int or char"
 msgstr "%%c wymaga int lub char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2088,6 +2093,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 810adda5e4..0db7637c32 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -67,6 +67,11 @@ msgstr " saída:\n"
 msgid "%%c requires int or char"
 msgstr "%%c requer int ou char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2146,6 +2151,10 @@ msgstr "Reinicialização do UART"
 msgid "UART write"
 msgstr "Escrita UART"
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB ocupado"
diff --git a/locale/ru.po b/locale/ru.po
index 3b00aef2ad..93fcc2ba0b 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -68,6 +68,11 @@ msgstr " вывод:\n"
 msgid "%%c requires int or char"
 msgstr "%%c требует int или char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2126,6 +2131,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 8be7b40d6c..a2feec3e7a 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -67,6 +67,11 @@ msgstr " utdata:\n"
 msgid "%%c requires int or char"
 msgstr "%%c kräver int eller char"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2122,6 +2127,10 @@ msgstr "UART omstart"
 msgid "UART write"
 msgstr "UART-skrivning"
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB upptaget"
diff --git a/locale/tr.po b/locale/tr.po
index 60a4d83677..6380448b11 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -70,6 +70,11 @@ msgstr " çıktı:\n"
 msgid "%%c requires int or char"
 msgstr "%%c int veya char tipine ihtiyaç duyar"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2097,6 +2102,10 @@ msgstr ""
 msgid "UART write"
 msgstr ""
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index c14aa43e49..c99d3a9625 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -69,6 +69,11 @@ msgstr " shūchū:\n"
 msgid "%%c requires int or char"
 msgstr "%%c xūyào zhěngshù huòzhě zìfú"
 
+#: main.c
+#, c-format
+msgid "%02X"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2125,6 +2130,10 @@ msgstr "UART chóngxīn qǐdòng"
 msgid "UART write"
 msgstr "UART xiě rù"
 
+#: main.c
+msgid "UID:"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
 msgstr "USB fán máng"

From c98174eea5e6869f0a337db972c8202ef25702f5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 10 Oct 2022 14:51:16 -0500
Subject: [PATCH 1162/2403] Add support for SSL client certificate
 (load_cert_chain)

Tested with badssl.com:

 1. Get client certificates from https://badssl.com/download/
 2. Convert public portion with `openssl x509 -in badssl.com-client.pem -out CIRCUITPY/cert.pem`
 3. Convert private portion with `openssl rsa -in badssl.com-client.pem -out CIRCUITPY/privkey.pem` and the password `badssl.com`
 4. Put wifi settings in CIRCUITPY/.env
 5. Run the below Python script:

```py
import os
import wifi
import socketpool
import ssl
import adafruit_requests

TEXT_URL = "https://client.badssl.com/"
wifi.radio.connect(os.getenv('WIFI_SSID'), os.getenv('WIFI_PASSWORD'))

pool = socketpool.SocketPool(wifi.radio)
context = ssl.create_default_context()
requests = adafruit_requests.Session(pool, context)

print(f"Fetching from {TEXT_URL} without certificate (should fail)")
response = requests.get(TEXT_URL)
print(f"{response.status_code=}, should be 400 Bad Request")
input("hit enter to continue\r")

print("Loading client certificate")
context.load_cert_chain("/cert.pem", "privkey.pem")
requests = adafruit_requests.Session(pool, context)

print(f"Fetching from {TEXT_URL} with certificate (should succeed)")
response = requests.get(TEXT_URL)
print(f"{response.status_code=}, should be 200 OK")
```
---
 ports/espressif/common-hal/ssl/SSLContext.c   |  7 +++
 ports/raspberrypi/common-hal/ssl/SSLContext.c | 15 ++++---
 ports/raspberrypi/common-hal/ssl/SSLContext.h |  1 +
 ports/raspberrypi/common-hal/ssl/SSLSocket.c  | 15 +++++++
 ports/raspberrypi/mbedtls/mbedtls_config.h    |  2 +
 shared-bindings/ssl/SSLContext.c              | 43 +++++++++++++++++++
 shared-bindings/ssl/SSLContext.h              |  1 +
 7 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/ports/espressif/common-hal/ssl/SSLContext.c b/ports/espressif/common-hal/ssl/SSLContext.c
index 866024bf00..386986e6be 100644
--- a/ports/espressif/common-hal/ssl/SSLContext.c
+++ b/ports/espressif/common-hal/ssl/SSLContext.c
@@ -87,3 +87,10 @@ bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self) {
 void common_hal_ssl_sslcontext_set_check_hostname(ssl_sslcontext_obj_t *self, bool value) {
     self->ssl_config.skip_common_name = !value;
 }
+
+void common_hal_ssl_sslcontext_load_cert_chain(ssl_sslcontext_obj_t *self, mp_buffer_info_t *cert_buf, mp_buffer_info_t *key_buf) {
+    self->ssl_config.clientcert_buf = cert_buf->buf;
+    self->ssl_config.clientcert_bytes = cert_buf->len + 1;
+    self->ssl_config.clientkey_buf = key_buf->buf;
+    self->ssl_config.clientkey_bytes = key_buf->len + 1;
+}
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.c b/ports/raspberrypi/common-hal/ssl/SSLContext.c
index 22d26b2da3..da3bed5005 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLContext.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.c
@@ -39,12 +39,10 @@ void common_hal_ssl_sslcontext_construct(ssl_sslcontext_obj_t *self) {
 
 void common_hal_ssl_sslcontext_load_verify_locations(ssl_sslcontext_obj_t *self,
     const char *cadata) {
-    mp_raise_NotImplementedError(NULL);
-
-    // self->crt_bundle_attach = NULL;
-    // self->use_global_ca_store = false;
-    // self->cacert_buf = (const unsigned char *)cadata;
-    // self->cacert_bytes = strlen(cadata) + 1;
+    self->crt_bundle_attach = NULL;
+    self->use_global_ca_store = false;
+    self->cacert_buf = (const unsigned char *)cadata;
+    self->cacert_bytes = strlen(cadata) + 1;
 }
 
 void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *self) {
@@ -61,3 +59,8 @@ bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self) {
 void common_hal_ssl_sslcontext_set_check_hostname(ssl_sslcontext_obj_t *self, bool value) {
     self->check_name = value;
 }
+
+void common_hal_ssl_sslcontext_load_cert_chain(ssl_sslcontext_obj_t *self, mp_buffer_info_t *cert_buf, mp_buffer_info_t *key_buf) {
+    self->cert_buf = *cert_buf;
+    self->key_buf = *key_buf;
+}
diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.h b/ports/raspberrypi/common-hal/ssl/SSLContext.h
index 33c683951b..40840deeec 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLContext.h
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.h
@@ -36,4 +36,5 @@ typedef struct {
     const unsigned char *cacert_buf;
     size_t cacert_bytes;
     int (*crt_bundle_attach)(mbedtls_ssl_config *conf);
+    mp_buffer_info_t cert_buf, key_buf;
 } ssl_sslcontext_obj_t;
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 69ebcffb7e..72a5ba4fae 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -197,6 +197,21 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
 
     mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
 
+    if (self->cert_buf.buf != NULL) {
+        ret = mbedtls_pk_parse_key(&o->pkey, self->key_buf.buf, self->key_buf.len + 1, NULL, 0);
+        if (ret != 0) {
+            goto cleanup;
+        }
+        ret = mbedtls_x509_crt_parse(&o->cert, self->cert_buf.buf, self->cert_buf.len + 1);
+        if (ret != 0) {
+            goto cleanup;
+        }
+
+        ret = mbedtls_ssl_conf_own_cert(&o->conf, &o->cert, &o->pkey);
+        if (ret != 0) {
+            goto cleanup;
+        }
+    }
     return o;
 cleanup:
     mbedtls_pk_free(&o->pkey);
diff --git a/ports/raspberrypi/mbedtls/mbedtls_config.h b/ports/raspberrypi/mbedtls/mbedtls_config.h
index 8c953c7072..3791924a13 100644
--- a/ports/raspberrypi/mbedtls/mbedtls_config.h
+++ b/ports/raspberrypi/mbedtls/mbedtls_config.h
@@ -77,6 +77,7 @@
 #define MBEDTLS_AES_C
 #define MBEDTLS_ASN1_PARSE_C
 #define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_BASE64_C
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
@@ -90,6 +91,7 @@
 #define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
 #define MBEDTLS_PKCS5_C
+#define MBEDTLS_PEM_PARSE_C
 #define MBEDTLS_PK_C
 #define MBEDTLS_PK_PARSE_C
 #define MBEDTLS_PLATFORM_C
diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c
index f0eb0e8c58..ac5f7ad42d 100644
--- a/shared-bindings/ssl/SSLContext.c
+++ b/shared-bindings/ssl/SSLContext.c
@@ -27,6 +27,7 @@
 #include 
 #include 
 
+#include "extmod/vfs.h"
 #include "py/objtuple.h"
 #include "py/objlist.h"
 #include "py/objproperty.h"
@@ -52,6 +53,47 @@ STATIC mp_obj_t ssl_sslcontext_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(s);
 }
 
+//|     def load_cert_chain(self, certfile: str, keyfile: str) -> None:
+//|         """Load a private key and the corresponding certificate.
+//|
+//|         The certfile string must be the path to a single file in PEM format
+//|         containing the certificate as well as any number of CA certificates
+//|         needed to establish the certificate's authenticity.  The keyfile string
+//|         must point to a file containing the private key.
+//|         """
+
+STATIC void get_file_contents(mp_obj_t name_obj, mp_buffer_info_t *bufinfo) {
+    mp_obj_t file = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), name_obj, MP_OBJ_NEW_QSTR(MP_QSTR_rb));
+    mp_obj_t dest[2];
+    mp_load_method(file, MP_QSTR_read, dest);
+    mp_obj_t result = mp_call_method_n_kw(0, 0, dest);
+    mp_get_buffer_raise(result, bufinfo, MP_BUFFER_READ);
+}
+
+STATIC mp_obj_t ssl_sslcontext_load_cert_chain(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_certfile, ARG_keyfile };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_certfile, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_keyfile, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+    };
+    ssl_sslcontext_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);
+
+    mp_buffer_info_t cert_buf, key_buf;
+    get_file_contents(args[ARG_certfile].u_obj, &cert_buf);
+    if (args[ARG_keyfile].u_obj != mp_const_none) {
+        get_file_contents(args[ARG_keyfile].u_obj, &key_buf);
+    } else {
+        key_buf = cert_buf;
+    }
+
+    common_hal_ssl_sslcontext_load_cert_chain(self, &cert_buf, &key_buf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_cert_chain_obj, 1, ssl_sslcontext_load_cert_chain);
+
 //|     def load_verify_locations(self, cadata: Optional[str] = None) -> None:
 //|         """Load a set of certification authority (CA) certificates used to validate
 //|         other peers' certificates."""
@@ -146,6 +188,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_wrap_socket_obj, 1, ssl_sslcont
 
 STATIC const mp_rom_map_elem_t ssl_sslcontext_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_sslcontext_wrap_socket_obj) },
+    { MP_ROM_QSTR(MP_QSTR_load_cert_chain), MP_ROM_PTR(&ssl_sslcontext_load_cert_chain_obj) },
     { MP_ROM_QSTR(MP_QSTR_load_verify_locations), MP_ROM_PTR(&ssl_sslcontext_load_verify_locations_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_default_verify_paths), MP_ROM_PTR(&ssl_sslcontext_set_default_verify_paths_obj) },
     { MP_ROM_QSTR(MP_QSTR_check_hostname), MP_ROM_PTR(&ssl_sslcontext_check_hostname_obj) },
diff --git a/shared-bindings/ssl/SSLContext.h b/shared-bindings/ssl/SSLContext.h
index ef04f25d43..9f40badd85 100644
--- a/shared-bindings/ssl/SSLContext.h
+++ b/shared-bindings/ssl/SSLContext.h
@@ -46,5 +46,6 @@ void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *se
 
 bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self);
 void common_hal_ssl_sslcontext_set_check_hostname(ssl_sslcontext_obj_t *self, bool value);
+void common_hal_ssl_sslcontext_load_cert_chain(ssl_sslcontext_obj_t *self, mp_buffer_info_t *cert_buf, mp_buffer_info_t *key_buf);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SSL_SSLCONTEXT_H

From 0c8b261ec9d8d657176d782228e58dc7e1ade76a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 10 Oct 2022 15:53:56 -0500
Subject: [PATCH 1163/2403] picow: Add support of self-signed certificates.

## Testing self-signed certificates and `load_verify_locations`

Obtain the badssl "self-signed" certificate in the correct form:

```sh
openssl s_client -servername self-signed.badssl.com -connect untrusted-root.badssl.com:443 < /dev/null | openssl x509 > self-signed.pem
```

Copy it and the script to CIRCUITPY:
```python
import os
import wifi
import socketpool
import ssl
import adafruit_requests

TEXT_URL = "https://self-signed.badssl.com/"
if not wifi.radio.ipv4_address:
    wifi.radio.connect(os.getenv('WIFI_SSID'), os.getenv('WIFI_PASSWORD'))

pool = socketpool.SocketPool(wifi.radio)
context = ssl.create_default_context()
requests = adafruit_requests.Session(pool, context)

print(f"Fetching from {TEXT_URL} without certificate (should fail)")
try:
    response = requests.get(TEXT_URL)
except Exception as e:
    print(f"Failed: {e}")
else:
    print(f"{response.status_code=}, should have failed with exception")

print("Loading server certificate")
with open("/self-signed.pem", "rb") as certfile:
    context.load_verify_locations(cadata=certfile.read())
requests = adafruit_requests.Session(pool, context)

print(f"Fetching from {TEXT_URL} with certificate (should succeed)")
try:
    response = requests.get(TEXT_URL)
except Exception as e:
    print(f"Unexpected exception: {e}")
else:
    print(f"{response.status_code=}, should be 200 OK")
```
---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 72a5ba4fae..dd1f50d29a 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -174,7 +174,14 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
     if (self->crt_bundle_attach != NULL) {
         mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_REQUIRED);
         self->crt_bundle_attach(&o->conf);
-        // } else if(self->cacert_buf && self->cacert_bytes) { // TODO: user bundle
+    } else if (self->cacert_buf && self->cacert_bytes) {
+        ret = mbedtls_x509_crt_parse(&o->cacert, self->cacert_buf, self->cacert_bytes);
+        if (ret != 0) {
+            goto cleanup;
+        }
+        mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_REQUIRED);
+        mbedtls_ssl_conf_ca_chain(&o->conf, &o->cacert, NULL);
+
     } else {
         mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
     }

From e5139e2040dcbab4bcdd75321cbb721b16f8aba4 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 11 Oct 2022 10:45:22 +0530
Subject: [PATCH 1164/2403] update to newer actions

---
 .github/workflows/build.yml             | 56 ++++++++++++-------------
 .github/workflows/create_website_pr.yml |  4 +-
 .github/workflows/ports_windows.yml     |  2 +-
 .github/workflows/pre-commit.yml        | 10 ++---
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84224a1c1a..8338528c42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,12 +30,12 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - name: Get CP deps
@@ -92,25 +92,25 @@ jobs:
       working-directory: tests
     - name: Build mpy-cross.static-aarch64
       run: make -C mpy-cross -j2 -f Makefile.static-aarch64
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross.static-aarch64
         path: mpy-cross/mpy-cross.static-aarch64
     - name: Build mpy-cross.static-raspbian
       run: make -C mpy-cross -j2 -f Makefile.static-raspbian
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross.static-raspbian
         path: mpy-cross/mpy-cross.static-raspbian
     - name: Build mpy-cross.static
       run: make -C mpy-cross -j2 -f Makefile.static
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross.static-amd64-linux
         path: mpy-cross/mpy-cross.static
     - name: Build mpy-cross.static-mingw
       run: make -C mpy-cross -j2 -f Makefile.static-mingw
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross.static-x64-windows
         path: mpy-cross/mpy-cross.static.exe
@@ -149,12 +149,12 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - name: Get CP deps
@@ -174,19 +174,19 @@ jobs:
         msgfmt --version
     - name: Build mpy-cross
       run: make -C mpy-cross -j2
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-x64
         path: mpy-cross/mpy-cross
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j2 -f Makefile.m1 V=2
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-arm64
         path: mpy-cross/mpy-cross-arm64
     - name: Make universal binary
       run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-universal
         path: mpy-cross-macos-universal
@@ -207,7 +207,7 @@ jobs:
     needs: test
     if: ${{ needs.test.outputs.build-doc == 'True' }}
     steps:
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
@@ -218,7 +218,7 @@ jobs:
         tools/describe || git log --parents HEAD~4..
         echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - name: Install dependencies
@@ -229,20 +229,20 @@ jobs:
         pip install -r requirements-ci.txt -r requirements-doc.txt
     - name: Build and Validate Stubs
       run: make check-stubs -j2
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: stubs
         path: circuitpython-stubs/dist/*
     - name: Test Documentation Build (HTML)
       run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: docs
         path: _build/html
     - name: Test Documentation Build (LaTeX/PDF)
       run: |
         make latexpdf
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: docs
         path: _build/latex
@@ -276,10 +276,10 @@ jobs:
     if: ${{ needs.test.outputs.boards-arm != '[]' }}
     steps:
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
@@ -306,7 +306,7 @@ jobs:
       working-directory: tools
       env:
         BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
@@ -329,10 +329,10 @@ jobs:
     if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     steps:
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
@@ -358,7 +358,7 @@ jobs:
       working-directory: tools
       env:
         BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
@@ -385,7 +385,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
@@ -395,7 +395,7 @@ jobs:
       run: |
         tools/describe || git log --parents HEAD~4..
         echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Fetch IDF tool cache
       id: idf-cache
       with:
@@ -449,7 +449,7 @@ jobs:
         IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
         BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
@@ -471,10 +471,10 @@ jobs:
     if: ${{ needs.test.outputs.boards-aarch != '[]' }}
     steps:
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
@@ -514,7 +514,7 @@ jobs:
       working-directory: tools
       env:
         BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 2367b6c475..75de556c68 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -16,12 +16,12 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - name: Get CP deps
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index bc5f837745..6d38f3b853 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -71,7 +71,7 @@ jobs:
         which python; python --version; python -c "import cascadetoml"
         which python3; python3 --version; python3 -c "import cascadetoml"
 
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 28f8ccb6f1..a23dcd1d11 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -16,9 +16,9 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v3
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - name: Install deps
@@ -29,17 +29,17 @@ jobs:
       run: git submodule update --init extmod/ulab
     - name: Set PY
       run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.cache/pre-commit
         key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
-    - uses: pre-commit/action@v1.1.0
+    - uses: pre-commit/action@v3.0.0
     - name: Make patch
       if: failure()
       run: git diff > ~/pre-commit.patch
     - name: Upload patch
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: patch
         path: ~/pre-commit.patch

From e19abef57ea2f440a96f64239a004a0544d20a39 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 11 Oct 2022 13:09:24 -0400
Subject: [PATCH 1165/2403] forgot to add these!

---
 ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c  | 13 +------------
 .../boards/vcc_gnd_yd_rp2040/mpconfigboard.h        |  2 ++
 .../boards/vcc_gnd_yd_rp2040/mpconfigboard.mk       |  8 ++------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c
index e992ec063c..76973aee30 100644
--- a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c
+++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/board.c
@@ -26,15 +26,4 @@
 
 #include "supervisor/board.h"
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h
index 01d74410e9..83875289d5 100644
--- a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h
+++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "VCC-GND Studio YD RP2040"
 #define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO23)
diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk
index 5a478a49a1..a42b251903 100644
--- a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/mpconfigboard.mk
@@ -1,15 +1,11 @@
 USB_VID = 0x2E8A
-USB_PID = 0x000B
+USB_PID = 0x102E
 USB_PRODUCT = "YD-RP2040"
 USB_MANUFACTURER = "VCC-GND Studio"
 
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32JVxQ,W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
-
-# Include these Python libraries in firmware
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO

From 376df8ec7ecbd1ded4982df43d698a0874d897a2 Mon Sep 17 00:00:00 2001
From: Wind-stormger 
Date: Mon, 10 Oct 2022 18:11:20 +0800
Subject: [PATCH 1166/2403] Add BananaPi BPI-PicoW-S3 .

Adds support for the BananaPi BPI-PicoW-S3 Boards.
Based on esp32s3 chip.
With one WS2812 LED, one monochrome LED, one ceramic antenna.
Support double-reset to tinyUF2.
---
 ports/espressif/boards/bpi_picow_s3/board.c   | 39 +++++++++++++
 .../boards/bpi_picow_s3/mpconfigboard.h       | 37 ++++++++++++
 .../boards/bpi_picow_s3/mpconfigboard.mk      | 20 +++++++
 ports/espressif/boards/bpi_picow_s3/pins.c    | 58 +++++++++++++++++++
 ports/espressif/boards/bpi_picow_s3/sdkconfig | 47 +++++++++++++++
 5 files changed, 201 insertions(+)
 create mode 100644 ports/espressif/boards/bpi_picow_s3/board.c
 create mode 100644 ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/bpi_picow_s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/bpi_picow_s3/pins.c
 create mode 100644 ports/espressif/boards/bpi_picow_s3/sdkconfig

diff --git a/ports/espressif/boards/bpi_picow_s3/board.c b/ports/espressif/boards/bpi_picow_s3/board.c
new file mode 100644
index 0000000000..b3c8cb4191
--- /dev/null
+++ b/ports/espressif/boards/bpi_picow_s3/board.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
new file mode 100644
index 0000000000..f7e7fde31b
--- /dev/null
+++ b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "BPI-PicoW-S3"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
+
+#define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/bpi_picow_s3/mpconfigboard.mk b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.mk
new file mode 100644
index 0000000000..6d77a94b08
--- /dev/null
+++ b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.mk
@@ -0,0 +1,20 @@
+USB_VID = 0x303A
+USB_PID = 0x812C
+USB_PRODUCT = "BPI-PicoW-S3"
+USB_MANUFACTURER = "BananaPi"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/bpi_picow_s3/pins.c b/ports/espressif/boards/bpi_picow_s3/pins.c
new file mode 100644
index 0000000000..5e88a96b49
--- /dev/null
+++ b/ports/espressif/boards/bpi_picow_s3/pins.c
@@ -0,0 +1,58 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO46) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/bpi_picow_s3/sdkconfig b/ports/espressif/boards/bpi_picow_s3/sdkconfig
new file mode 100644
index 0000000000..04ab118924
--- /dev/null
+++ b/ports/espressif/boards/bpi_picow_s3/sdkconfig
@@ -0,0 +1,47 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="BPI-PicoW-S3"
+# end of LWIP
+
+# end of Component config

From 844cd17f0364736ab18b023a014d020427815d33 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 11 Oct 2022 20:29:52 -0400
Subject: [PATCH 1167/2403] delay first serial write by 50ms

---
 supervisor/shared/serial.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 0326f15437..5680d8afe0 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -28,6 +28,7 @@
 #include 
 
 #include "py/mpconfig.h"
+#include "py/mphal.h"
 
 #include "supervisor/shared/cpu.h"
 #include "supervisor/shared/display.h"
@@ -62,6 +63,13 @@ byte console_uart_rx_buf[64];
 #endif
 #endif
 
+#if CIRCUITPY_USB || CIRCUITPY_CONSOLE_UART
+// Flag to note whether this is the first write after connection.
+// Delay slightly on the first write to allow time for the host to set up things,
+// including turning off echo mode.
+static bool _first_write_done = false;
+#endif
+
 #if CIRCUITPY_USB_VENDOR
 bool tud_vendor_connected(void);
 #endif
@@ -144,6 +152,10 @@ void serial_early_init(void) {
 }
 
 void serial_init(void) {
+    #if CIRCUITPY_USB || CIRCUITPY_CONSOLE_UART
+    _first_write_done = false;
+    #endif
+
     port_serial_init();
 }
 
@@ -301,8 +313,11 @@ void serial_write_substring(const char *text, uint32_t length) {
     #endif
 
     #if CIRCUITPY_CONSOLE_UART
+    if (!_first_write_done) {
+        mp_hal_delay_ms(50);
+        _first_write_done = true;
+    }
     int uart_errcode;
-
     common_hal_busio_uart_write(&console_uart, (const uint8_t *)text, length, &uart_errcode);
     #endif
 
@@ -321,6 +336,11 @@ void serial_write_substring(const char *text, uint32_t length) {
     #endif
 
     #if CIRCUITPY_USB
+    // Delay the very first write
+    if (tud_cdc_connected() && !_first_write_done) {
+        mp_hal_delay_ms(50);
+        _first_write_done = true;
+    }
     uint32_t count = 0;
     if (tud_cdc_connected()) {
         while (count < length) {

From 62cbd3bcd8a6dae019d30a4557bc8d74210a70e6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:33:39 -0500
Subject: [PATCH 1168/2403] Pico w: socket: correctly track sockets generated
 by accept()

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 99b19ad694..4dd400522b 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -821,6 +821,16 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
 
     MICROPY_PY_LWIP_EXIT
 
+    DEBUG_printf("registering socket in socketpool_socket_accept()\n");
+    if (!register_open_socket(socket2)) {
+        DEBUG_printf("collecting garbage to open socket\n");
+        gc_collect();
+        if (!register_open_socket(socket2)) {
+            mp_raise_RuntimeError(translate("Out of sockets"));
+        }
+    }
+    mark_user_socket(socket2);
+
     // output values
     memcpy(ip, &(socket2->pcb.tcp->remote_ip), NETUTILS_IPV4ADDR_BUFSIZE);
     *port = (mp_uint_t)socket2->pcb.tcp->remote_port;

From ca9523b814b6467ddf7626fa9cfe24d3a60d6e37 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:34:25 -0500
Subject: [PATCH 1169/2403] Pico w: socket: Correctly return negative error
 code from recv_into

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 4dd400522b..952f4ea7d8 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -1080,6 +1080,9 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
             ret = lwip_raw_udp_receive(socket, (byte *)buf, len, NULL, NULL, &_errno);
             break;
     }
+    if (ret < 0) {
+        return -_errno;
+    }
     return ret;
 }
 

From b1f7940297464f65c703de2e7cc2c06965fd121a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:35:10 -0500
Subject: [PATCH 1170/2403] Pico W: Correctly treat empty cadata= as disabling
 host checking

---
 ports/raspberrypi/common-hal/ssl/SSLContext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLContext.c b/ports/raspberrypi/common-hal/ssl/SSLContext.c
index da3bed5005..67287128b0 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLContext.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLContext.c
@@ -42,7 +42,7 @@ void common_hal_ssl_sslcontext_load_verify_locations(ssl_sslcontext_obj_t *self,
     self->crt_bundle_attach = NULL;
     self->use_global_ca_store = false;
     self->cacert_buf = (const unsigned char *)cadata;
-    self->cacert_bytes = strlen(cadata) + 1;
+    self->cacert_bytes = *cadata ? strlen(cadata) + 1 : 0;
 }
 
 void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *self) {

From 7c849fdadb2dfedefa16a480ff3ee262240b18d9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:35:34 -0500
Subject: [PATCH 1171/2403] Pico W: ssl: Raise MemoryError for allocation
 errors

---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index dd1f50d29a..8712fbb378 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -230,7 +230,7 @@ cleanup:
     mbedtls_entropy_free(&o->entropy);
 
     if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
-        mp_raise_OSError(MP_ENOMEM);
+        mp_raise_type(&mp_type_MemoryError);
     } else if (ret == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
     } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
@@ -326,7 +326,7 @@ cleanup:
     mbedtls_entropy_free(&self->entropy);
 
     if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
-        mp_raise_OSError(MP_ENOMEM);
+        mp_raise_type(&mp_type_MemoryError);
     } else if (ret == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
     } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {

From 1641a7c0026c49816cc0f671227c68e004dc0d9d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:36:34 -0500
Subject: [PATCH 1172/2403] Pico W: ssl: Correctly handle errors in send/recv

The prefixed versions raise Python exceptions, the un-prefixed return
negative error values. We don't want to raise an exception from here,
it leaves the SSL stack in an undefined state.
---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 8712fbb378..ba91e084cd 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -100,7 +100,7 @@ STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
     // mp_uint_t out_sz = sock_stream->write(sock, buf, len, &err);
-    mp_int_t out_sz = common_hal_socketpool_socket_send(sock, buf, len);
+    mp_int_t out_sz = socketpool_socket_send(sock, buf, len);
     DEBUG("socket_send() -> %d", out_sz);
     if (out_sz < 0) {
         int err = -out_sz;
@@ -118,7 +118,7 @@ STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
 STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
-    mp_int_t out_sz = common_hal_socketpool_socket_recv_into(sock, buf, len);
+    mp_int_t out_sz = socketpool_socket_recv_into(sock, buf, len);
     DEBUG("socket_recv() -> %d", out_sz);
     if (out_sz < 0) {
         int err = -out_sz;

From 874ddd67bfd1f30c56cd1d448ba28b4d813066a2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 11:37:07 -0500
Subject: [PATCH 1173/2403] Pico W: ssl: factor out do_handshake

---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index ba91e084cd..1d42a4b710 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -299,8 +299,7 @@ void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
     mbedtls_entropy_free(&self->entropy);
 }
 
-void common_hal_ssl_sslsocket_connect(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
-    common_hal_socketpool_socket_connect(self->sock, host, hostlen, port);
+STATIC void do_handshake(ssl_sslsocket_obj_t *self) {
     int ret;
     while ((ret = mbedtls_ssl_handshake(&self->ssl)) != 0) {
         if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
@@ -336,6 +335,11 @@ cleanup:
     }
 }
 
+void common_hal_ssl_sslsocket_connect(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
+    common_hal_socketpool_socket_connect(self->sock, host, hostlen, port);
+    do_handshake(self);
+}
+
 bool common_hal_ssl_sslsocket_get_closed(ssl_sslsocket_obj_t *self) {
     return self->closed;
 }

From a31ad57225028c46d22e45473df99cf0c03ffd25 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 13:45:30 -0500
Subject: [PATCH 1174/2403] Use non-deprecated way to set build outputs

see https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
---
 tools/ci_set_matrix.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 90cf04cea6..0ae6010ac9 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -48,6 +48,14 @@ except json.decoder.JSONDecodeError as exc:
         raise
 
 
+def set_output(name, value):
+    if "GITHUB_OUTPUT" in os.environ:
+        with open(os.environ["GITHUB_OUTPUT"], "at") as f:
+            print(f"{name}={value}", file=f)
+    else:
+        print("Would set GitHub actions output {name} to '{value}'")
+
+
 def set_boards_to_build(build_all):
     # Get boards in json format
     boards_info_json = build_board_info.get_board_mapping()
@@ -161,7 +169,7 @@ def set_boards_to_build(build_all):
 
     # Set the step outputs for each architecture
     for arch in arch_to_boards:
-        print("::set-output name=boards-" + arch + "::" + json.dumps(sorted(arch_to_boards[arch])))
+        set_output(f"boards-{arch}", json.dumps(sorted(arch_to_boards[arch])))
 
 
 def set_docs_to_build(build_all):
@@ -177,7 +185,7 @@ def set_docs_to_build(build_all):
 
     # Set the step outputs
     print("Building docs:", doc_match)
-    print("::set-output name=build-doc::" + str(doc_match))
+    set_output(f"build-doc", doc_match)
 
 
 def check_changed_files():

From b251e78ac577bd44da4a1680cc083d6bde55c781 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 14:29:57 -0500
Subject: [PATCH 1175/2403] samd: size-optimize microcontroller temp calc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Perform most arithmetic with scaled integer values.
For my calibration values
```
const uint32_t NVMCTRL_TEMP_LOG[]={0xfc05511e, 0xcc7ac0f7};
```
the maximum difference between the old and new calculation is 0.50°C.
The difference is smallest (0.13°) at 25.87°C in the old scale.

This reduces mcu_processor_get_temperature from 568 bytes to 348 bytes
(-220 bytes)
---
 .../common-hal/microcontroller/Processor.c    | 85 ++++++++-----------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c
index 29d6612ad8..119b5631ad 100644
--- a/ports/atmel-samd/common-hal/microcontroller/Processor.c
+++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c
@@ -73,46 +73,26 @@
 #include "peripheral_clk_config.h"
 
 #define ADC_TEMP_SAMPLE_LENGTH 4
-#define INT1V_VALUE_FLOAT 1.0
-#define INT1V_DIVIDER_1000 1000.0
-#define ADC_12BIT_FULL_SCALE_VALUE_FLOAT 4095.0
+#define INT1V_VALUE_FLOAT MICROPY_FLOAT_CONST(1.0)
+#define INT1V_DIVIDER_1000 MICROPY_FLOAT_CONST(1000.0)
+#define ADC_12BIT_FULL_SCALE_VALUE_FLOAT MICROPY_FLOAT_CONST(4095.0)
 
 // channel argument (ignored in calls below)
 #define IGNORED_CHANNEL 0
 
-// Decimal to fraction conversion. (adapted from ASF sample).
-STATIC float convert_dec_to_frac(uint8_t val) {
-    float float_val = (float)val;
-    if (val < 10) {
-        return float_val / 10.0;
-    } else if (val < 100) {
-        return float_val / 100.0;
-    } else {
-        return float_val / 1000.0;
-    }
-}
 
 // Extract the production calibration data information from NVM (adapted from ASF sample),
 // then calculate the temperature
 #ifdef SAMD21
 STATIC float calculate_temperature(uint16_t raw_value) {
-    volatile uint32_t val1;    /* Temperature Log Row Content first 32 bits */
-    volatile uint32_t val2;    /* Temperature Log Row Content another 32 bits */
-    uint8_t room_temp_val_int; /* Integer part of room temperature in °C */
-    uint8_t room_temp_val_dec; /* Decimal part of room temperature in °C */
-    uint8_t hot_temp_val_int;  /* Integer part of hot temperature in °C */
-    uint8_t hot_temp_val_dec;  /* Decimal part of hot temperature in °C */
-    int8_t room_int1v_val;     /* internal 1V reference drift at room temperature */
-    int8_t hot_int1v_val;      /* internal 1V reference drift at hot temperature*/
-
-    float tempR;       // Production Room temperature
-    float tempH;       // Production Hot temperature
-    float INT1VR;      // Room temp 2's complement of the internal 1V reference value
-    float INT1VH;      // Hot temp 2's complement of the internal 1V reference value
-    uint16_t ADCR;     // Production Room temperature ADC value
-    uint16_t ADCH;     // Production Hot temperature ADC value
-    float VADCR;       // Room temperature ADC voltage
-    float VADCH;       // Hot temperature ADC voltage
+    uint32_t val1;    /* Temperature Log Row Content first 32 bits */
+    uint32_t val2;    /* Temperature Log Row Content another 32 bits */
+    int room_temp_val_int; /* Integer part of room temperature in °C */
+    int room_temp_val_dec; /* Decimal part of room temperature in °C */
+    int hot_temp_val_int;  /* Integer part of hot temperature in °C */
+    int hot_temp_val_dec;  /* Decimal part of hot temperature in °C */
+    int room_int1v_val;     /* internal 1V reference drift at room temperature */
+    int hot_int1v_val;      /* internal 1V reference drift at hot temperature*/
 
     uint32_t *temp_log_row_ptr = (uint32_t *)NVMCTRL_TEMP_LOG;
 
@@ -120,32 +100,31 @@ STATIC float calculate_temperature(uint16_t raw_value) {
     temp_log_row_ptr++;
     val2 = *temp_log_row_ptr;
 
-    room_temp_val_int = (uint8_t)((val1 & FUSES_ROOM_TEMP_VAL_INT_Msk) >> FUSES_ROOM_TEMP_VAL_INT_Pos);
-    room_temp_val_dec = (uint8_t)((val1 & FUSES_ROOM_TEMP_VAL_DEC_Msk) >> FUSES_ROOM_TEMP_VAL_DEC_Pos);
+    room_temp_val_int = ((val1 & FUSES_ROOM_TEMP_VAL_INT_Msk) >> FUSES_ROOM_TEMP_VAL_INT_Pos);
+    room_temp_val_dec = ((val1 & FUSES_ROOM_TEMP_VAL_DEC_Msk) >> FUSES_ROOM_TEMP_VAL_DEC_Pos);
 
-    hot_temp_val_int = (uint8_t)((val1 & FUSES_HOT_TEMP_VAL_INT_Msk) >> FUSES_HOT_TEMP_VAL_INT_Pos);
-    hot_temp_val_dec = (uint8_t)((val1 & FUSES_HOT_TEMP_VAL_DEC_Msk) >> FUSES_HOT_TEMP_VAL_DEC_Pos);
+    hot_temp_val_int = ((val1 & FUSES_HOT_TEMP_VAL_INT_Msk) >> FUSES_HOT_TEMP_VAL_INT_Pos);
+    hot_temp_val_dec = ((val1 & FUSES_HOT_TEMP_VAL_DEC_Msk) >> FUSES_HOT_TEMP_VAL_DEC_Pos);
 
+    // necessary casts: must interpret 8 bits as signed
     room_int1v_val = (int8_t)((val1 & FUSES_ROOM_INT1V_VAL_Msk) >> FUSES_ROOM_INT1V_VAL_Pos);
     hot_int1v_val = (int8_t)((val2 & FUSES_HOT_INT1V_VAL_Msk) >> FUSES_HOT_INT1V_VAL_Pos);
 
-    ADCR = (uint16_t)((val2 & FUSES_ROOM_ADC_VAL_Msk) >> FUSES_ROOM_ADC_VAL_Pos);
-    ADCH = (uint16_t)((val2 & FUSES_HOT_ADC_VAL_Msk) >> FUSES_HOT_ADC_VAL_Pos);
+    int ADCR = ((val2 & FUSES_ROOM_ADC_VAL_Msk) >> FUSES_ROOM_ADC_VAL_Pos);
+    int ADCH = ((val2 & FUSES_HOT_ADC_VAL_Msk) >> FUSES_HOT_ADC_VAL_Pos);
 
-    tempR = room_temp_val_int + convert_dec_to_frac(room_temp_val_dec);
-    tempH = hot_temp_val_int + convert_dec_to_frac(hot_temp_val_dec);
+    int tempR = 10 * room_temp_val_int + room_temp_val_dec;
+    int tempH = 10 * hot_temp_val_int + hot_temp_val_dec;
 
-    INT1VR = 1 - ((float)room_int1v_val / INT1V_DIVIDER_1000);
-    INT1VH = 1 - ((float)hot_int1v_val / INT1V_DIVIDER_1000);
+    int INT1VR = 1000 - room_int1v_val;
+    int INT1VH = 1000 - hot_int1v_val;
 
-    VADCR = ((float)ADCR * INT1VR) / ADC_12BIT_FULL_SCALE_VALUE_FLOAT;
-    VADCH = ((float)ADCH * INT1VH) / ADC_12BIT_FULL_SCALE_VALUE_FLOAT;
+    int VADCR = ADCR * INT1VR;
+    int VADCH = ADCH * INT1VH;
 
-    float VADC;      /* Voltage calculation using ADC result for Coarse Temp calculation */
-    float VADCM;     /* Voltage calculation using ADC result for Fine Temp calculation. */
-    float INT1VM;    /* Voltage calculation for reality INT1V value during the ADC conversion */
+    int INT1VM;    /* Voltage calculation for reality INT1V value during the ADC conversion */
 
-    VADC = ((float)raw_value * INT1V_VALUE_FLOAT) / ADC_12BIT_FULL_SCALE_VALUE_FLOAT;
+    int VADC = raw_value * 1000;
 
     // Hopefully compiler will remove common subepxressions here.
 
@@ -153,21 +132,25 @@ STATIC float calculate_temperature(uint16_t raw_value) {
     // 1b as mentioned in data sheet section "Temperature Sensor Characteristics"
     // of Electrical Characteristics. (adapted from ASF sample code).
     // Coarse Temp Calculation by assume INT1V=1V for this ADC conversion
-    float coarse_temp = tempR + (((tempH - tempR) / (VADCH - VADCR)) * (VADC - VADCR));
+    int coarse_temp = tempR + (tempH - tempR) * (VADC - VADCR) / (VADCH - VADCR);
 
     // Calculation to find the real INT1V value during the ADC conversion
     INT1VM = INT1VR + (((INT1VH - INT1VR) * (coarse_temp - tempR)) / (tempH - tempR));
 
-    VADCM = ((float)raw_value * INT1VM) / ADC_12BIT_FULL_SCALE_VALUE_FLOAT;
+    int VADCM = raw_value * INT1VM;
 
     // Fine Temp Calculation by replace INT1V=1V by INT1V = INT1Vm for ADC conversion
-    float fine_temp = tempR + (((tempH - tempR) / (VADCH - VADCR)) * (VADCM - VADCR));
+    float fine_temp = tempR + (((tempH - tempR) * (VADCM - VADCR)) / (VADCH - VADCR));
 
-    return fine_temp;
+    return fine_temp / 10;
 }
 #endif // SAMD21
 
 #ifdef SAM_D5X_E5X
+// Decimal to fraction conversion. (adapted from ASF sample).
+STATIC float convert_dec_to_frac(uint8_t val) {
+    return val / MICROPY_FLOAT_CONST(10.);
+}
 STATIC float calculate_temperature(uint16_t TP, uint16_t TC) {
     uint32_t TLI = (*(uint32_t *)FUSES_ROOM_TEMP_VAL_INT_ADDR & FUSES_ROOM_TEMP_VAL_INT_Msk) >> FUSES_ROOM_TEMP_VAL_INT_Pos;
     uint32_t TLD = (*(uint32_t *)FUSES_ROOM_TEMP_VAL_DEC_ADDR & FUSES_ROOM_TEMP_VAL_DEC_Msk) >> FUSES_ROOM_TEMP_VAL_DEC_Pos;

From 6ee45dde579d81028c6d323fc9fab0771384d0a4 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 12 Oct 2022 16:52:22 -0400
Subject: [PATCH 1176/2403] f_rename return value; add a test for rename dir
 inside itself

---
 extmod/vfs_fat.c                    | 2 --
 lib/oofatfs/ff.c                    | 2 +-
 tests/extmod/vfs_fat_fileio2.py     | 5 +++++
 tests/extmod/vfs_fat_fileio2.py.exp | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 64a3ce05f6..880eef7740 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -234,8 +234,6 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     }
     if (res == FR_OK) {
         return mp_const_none;
-    } else if (res == FR_NO_PATH) {
-        mp_raise_OSError(MP_EINVAL);
     } else {
         mp_raise_OSError_fresult(res);
     }
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index d6fc7ebcc2..e6afd57800 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -4828,7 +4828,7 @@ FRESULT f_rename (
         strlen(path_new) > strlen(path_old) &&
         path_new[strlen(path_old)] == '/' &&
         strncmp(path_old, path_new, strlen(path_old)) == 0) {
-        return FR_NO_PATH;
+        return FR_INVALID_NAME;
     }
 
     res = find_volume(fs, FA_WRITE);    /* Get logical drive of the old object */
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 297d75a481..7c75a6d044 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -70,6 +70,11 @@ try:
 except OSError as e:
     print(e.errno == uerrno.ENOENT)
 
+try:
+    vfs.rename("foo_dir", "foo_dir/inside_itself")
+except OSError as e:
+    print(e.errno == uerrno.EINVAL)
+
 # file in dir
 with open("foo_dir/file-in-dir.txt", "w+t") as f:
     f.write("data in file")
diff --git a/tests/extmod/vfs_fat_fileio2.py.exp b/tests/extmod/vfs_fat_fileio2.py.exp
index 2684053641..ed6e315328 100644
--- a/tests/extmod/vfs_fat_fileio2.py.exp
+++ b/tests/extmod/vfs_fat_fileio2.py.exp
@@ -1,6 +1,7 @@
 True
 True
 True
+True
 b'data in file'
 True
 [('sub_file.txt', 32768, 0, 11), ('file.txt', 32768, 0, 12)]

From a943167d69ad1abfeffc3796ddda148a3f96bcb7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 15:53:44 -0500
Subject: [PATCH 1177/2403] samd: Reduce a further 48 bytes for non-full builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Another reduction of -48 bytes can be had if the fine calculation
step is skipped. The worst difference compared to the old reference
code with my calibration values in the 0° to 60° was 2°C,
and the difference at 25°C is 1°C.

The final size decrease for non-full builds like Trinket M0 is 268
bytes.
---
 ports/atmel-samd/common-hal/microcontroller/Processor.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c
index 119b5631ad..e0642c158f 100644
--- a/ports/atmel-samd/common-hal/microcontroller/Processor.c
+++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c
@@ -122,8 +122,6 @@ STATIC float calculate_temperature(uint16_t raw_value) {
     int VADCR = ADCR * INT1VR;
     int VADCH = ADCH * INT1VH;
 
-    int INT1VM;    /* Voltage calculation for reality INT1V value during the ADC conversion */
-
     int VADC = raw_value * 1000;
 
     // Hopefully compiler will remove common subepxressions here.
@@ -134,7 +132,10 @@ STATIC float calculate_temperature(uint16_t raw_value) {
     // Coarse Temp Calculation by assume INT1V=1V for this ADC conversion
     int coarse_temp = tempR + (tempH - tempR) * (VADC - VADCR) / (VADCH - VADCR);
 
+    #if CIRCUITPY_FULL_BUILD
     // Calculation to find the real INT1V value during the ADC conversion
+    int INT1VM;    /* Voltage calculation for reality INT1V value during the ADC conversion */
+
     INT1VM = INT1VR + (((INT1VH - INT1VR) * (coarse_temp - tempR)) / (tempH - tempR));
 
     int VADCM = raw_value * INT1VM;
@@ -143,6 +144,9 @@ STATIC float calculate_temperature(uint16_t raw_value) {
     float fine_temp = tempR + (((tempH - tempR) * (VADCM - VADCR)) / (VADCH - VADCR));
 
     return fine_temp / 10;
+    #else
+    return coarse_temp / 10.;
+    #endif
 }
 #endif // SAMD21
 

From f7d39ceae449ebe0a56cdcc8eefdd7fee53c69bd Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 16:25:09 -0500
Subject: [PATCH 1178/2403] comment on the revised algorithm

---
 .../atmel-samd/common-hal/microcontroller/Processor.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c
index e0642c158f..d720399b98 100644
--- a/ports/atmel-samd/common-hal/microcontroller/Processor.c
+++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c
@@ -83,6 +83,17 @@
 
 // Extract the production calibration data information from NVM (adapted from ASF sample),
 // then calculate the temperature
+//
+// This code performs almost all operations with scaled integers.  For
+// instance, tempR is in units of 1/10°C, INT1VR is in units of 1mV, etc,
+// This is important to reduce the code size of the function. The effect on
+// precision is a ~.9°C difference vs the floating point algorithm on an
+// approximate 0..60°C range with a difference of ~.5°C at 25°C. When the fine
+// calculation step is skipped, the additional error approximately doubles.
+//
+// To save code size, rounding is neglected. However, trying to add back rounding
+// (by computing (a + b/2) / b instead of just a / b) actually didn't help
+// accuracy anyway.
 #ifdef SAMD21
 STATIC float calculate_temperature(uint16_t raw_value) {
     uint32_t val1;    /* Temperature Log Row Content first 32 bits */

From 728fea4ca4f31cbe1d7d18e767bec3b62c8fd147 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 6 Oct 2022 09:20:54 +0530
Subject: [PATCH 1179/2403] add storage extension python api

---
 locale/circuitpython.pot                      | 30 ++++++------------
 .../espressif/common-hal/dualbank/__init__.c  |  2 ++
 shared-bindings/dualbank/__init__.c           | 19 ++++++++++++
 shared-bindings/storage/__init__.c            | 31 ++++++++++++++++---
 shared-bindings/storage/__init__.h            |  2 +-
 shared-module/storage/__init__.c              |  5 ++-
 6 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index ff943c9767..0a1d61185f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -112,6 +112,10 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -152,14 +156,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be >= 0"
-msgstr ""
-
-#: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
-msgid "%q must be >= 1"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -214,7 +210,7 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -910,8 +906,7 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
@@ -1569,10 +1564,12 @@ msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/__init__.c
+#: ports/raspberrypi/common-hal/wifi/__init__.c
 msgid "Only IPv4 addresses supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Only IPv4 sockets supported"
 msgstr ""
 
@@ -1642,6 +1639,7 @@ msgid "Out of memory"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/raspberrypi/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr ""
 
@@ -1696,7 +1694,6 @@ msgid "Pin interrupt already in use"
 msgstr ""
 
 #: shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
-#: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pin is input only"
 msgstr ""
 
@@ -1916,6 +1913,7 @@ msgid "Slices not supported"
 msgstr ""
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
+#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr ""
 
@@ -2341,10 +2339,6 @@ msgstr ""
 msgid "a bytes-like object is required"
 msgstr ""
 
-#: shared-bindings/i2ctarget/I2CTarget.c
-msgid "address out of bounds"
-msgstr ""
-
 #: shared-bindings/i2ctarget/I2CTarget.c
 msgid "addresses is empty"
 msgstr ""
@@ -2814,10 +2808,6 @@ msgstr ""
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "destination_length must be an int >= 0"
-msgstr ""
-
 #: py/objdict.c
 msgid "dict update sequence has wrong length"
 msgstr ""
diff --git a/ports/espressif/common-hal/dualbank/__init__.c b/ports/espressif/common-hal/dualbank/__init__.c
index 91c7981dd9..29b15a3e30 100644
--- a/ports/espressif/common-hal/dualbank/__init__.c
+++ b/ports/espressif/common-hal/dualbank/__init__.c
@@ -32,6 +32,8 @@
 #include "esp_log.h"
 #include "esp_ota_ops.h"
 
+#include "supervisor/flash.h"
+
 static const esp_partition_t *update_partition = NULL;
 static esp_ota_handle_t update_handle = 0;
 
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index 83933e889d..d3f75a4153 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -26,6 +26,10 @@
 
 #include "shared-bindings/dualbank/__init__.h"
 
+#if CIRCUITPY_STORAGE_EXTEND
+#include "supervisor/flash.h"
+#endif
+
 //| """DUALBANK Module
 //|
 //| The `dualbank` module adds ability to update and switch
@@ -55,6 +59,14 @@
 //| """
 //| ...
 
+#if CIRCUITPY_STORAGE_EXTEND
+STATIC void raise_error_if_storage_extended(void) {
+    if (supervisor_flash_get_extended()) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, translate("%q is %q"), MP_QSTR_storage, MP_QSTR_extended);
+    }
+}
+#endif
+
 //| def flash(buffer: ReadableBuffer, offset: int = 0) -> None:
 //|     """Writes one of two app partitions at the given offset.
 //|
@@ -70,6 +82,10 @@ STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         { MP_QSTR_offset, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
     };
 
+    #if CIRCUITPY_STORAGE_EXTEND
+    raise_error_if_storage_extended();
+    #endif
+
     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);
 
@@ -94,6 +110,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash);
 //|     ...
 //|
 STATIC mp_obj_t dualbank_switch(void) {
+    #if CIRCUITPY_STORAGE_EXTEND
+    raise_error_if_storage_extended();
+    #endif
     common_hal_dualbank_switch();
     return mp_const_none;
 }
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 3661b61973..838395efb3 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -34,6 +34,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/storage/__init__.h"
 #include "supervisor/shared/translate/translate.h"
+#include "supervisor/flash.h"
 
 //| """Storage management
 //|
@@ -150,7 +151,7 @@ STATIC mp_obj_t storage_getmount(const mp_obj_t mnt_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 
-//| def erase_filesystem() -> None:
+//| def erase_filesystem(extended: Optional[bool] = None) -> None:
 //|     """Erase and re-create the ``CIRCUITPY`` filesystem.
 //|
 //|     On boards that present USB-visible ``CIRCUITPY`` drive (e.g., SAMD21 and SAMD51),
@@ -160,16 +161,38 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 //|     This function can be called from the REPL when ``CIRCUITPY``
 //|     has become corrupted.
 //|
+//|     :param bool extended: On boards that support ``dualbank`` module
+//|         and the ``extended`` parameter, the ``CIRCUITPY`` storage can be
+//|         extended by setting this to `True`. If this isn't provided or
+//|         set to `None` (default), the existing configuration will be used.
+//|
 //|     .. warning:: All the data on ``CIRCUITPY`` will be lost, and
 //|          CircuitPython will restart on certain boards."""
 //|     ...
 //|
 
-STATIC mp_obj_t storage_erase_filesystem(void) {
-    common_hal_storage_erase_filesystem();
+STATIC mp_obj_t storage_erase_filesystem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_extended };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_extended, MP_ARG_KW_ONLY | 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);
+
+    #if CIRCUITPY_STORAGE_EXTEND
+    bool extended = (args[ARG_extended].u_obj == mp_const_none) ? supervisor_flash_get_extended() : mp_obj_is_true(args[ARG_extended].u_obj);
+    common_hal_storage_erase_filesystem(extended);
+    #else
+    if (mp_obj_is_true(args[ARG_extended].u_obj)) {
+        mp_raise_NotImplementedError_varg(translate("%q=%q"), MP_QSTR_extended, MP_QSTR_True);
+    }
+    common_hal_storage_erase_filesystem(false);
+    #endif
+
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(storage_erase_filesystem_obj, storage_erase_filesystem);
+MP_DEFINE_CONST_FUN_OBJ_KW(storage_erase_filesystem_obj, 0, storage_erase_filesystem);
 
 //| def disable_usb_drive() -> None:
 //|     """Disable presenting ``CIRCUITPY`` as a USB mass storage device.
diff --git a/shared-bindings/storage/__init__.h b/shared-bindings/storage/__init__.h
index fbf492efab..ffe68c17c8 100644
--- a/shared-bindings/storage/__init__.h
+++ b/shared-bindings/storage/__init__.h
@@ -37,7 +37,7 @@ void common_hal_storage_umount_path(const char *path);
 void common_hal_storage_umount_object(mp_obj_t vfs_obj);
 void common_hal_storage_remount(const char *path, bool readonly, bool disable_concurrent_write_protection);
 mp_obj_t common_hal_storage_getmount(const char *path);
-void common_hal_storage_erase_filesystem(void);
+void common_hal_storage_erase_filesystem(bool extended);
 
 bool common_hal_storage_disable_usb_drive(void);
 bool common_hal_storage_enable_usb_drive(void);
diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c
index 8806b7c8c6..7b6eec7e1b 100644
--- a/shared-module/storage/__init__.c
+++ b/shared-module/storage/__init__.c
@@ -267,11 +267,14 @@ void common_hal_storage_remount(const char *mount_path, bool readonly, bool disa
     filesystem_set_internal_concurrent_write_protection(!disable_concurrent_write_protection);
 }
 
-void common_hal_storage_erase_filesystem(void) {
+void common_hal_storage_erase_filesystem(bool extended) {
     #if CIRCUITPY_USB
     usb_disconnect();
     #endif
     mp_hal_delay_ms(1000);
+    #if CIRCUITPY_STORAGE_EXTEND
+    supervisor_flash_set_extended(extended);
+    #endif
     (void)filesystem_init(false, true);  // Force a re-format. Ignore failure.
     common_hal_mcu_reset();
     // We won't actually get here, since we're resetting.

From cf875c04b74275791a9943cde3c2ea5fd1df1850 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Tue, 11 Oct 2022 13:32:18 +0000
Subject: [PATCH 1180/2403] Translated using Weblate (German)

Currently translated at 99.2% (992 of 999 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index bec093fd7e..ae3ec505fb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-08-14 12:14+0000\n"
-"Last-Translator: Can Kocyigit \n"
+"PO-Revision-Date: 2022-10-13 06:43+0000\n"
+"Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.14-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -934,7 +934,7 @@ msgstr "Erwartet ein(e) %q"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "Erwartete ein %q oder %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
@@ -2267,7 +2267,7 @@ msgstr "Unbekannter System-Firmware-Fehler: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "Unbekannter Fehlercode %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format

From 40d77b673806545293b7d38fd9b8eca886799efb Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 11 Oct 2022 13:51:38 +0000
Subject: [PATCH 1181/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 0db7637c32..d084df863e 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: 2022-09-30 08:18+0000\n"
+"PO-Revision-Date: 2022-10-13 06:43+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.14.1\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -70,7 +70,7 @@ msgstr "%%c requer int ou char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -2153,7 +2153,7 @@ msgstr "Escrita UART"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"

From 92864467c0512ea736789e8da3960313848d96f3 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 12 Oct 2022 08:35:35 +0000
Subject: [PATCH 1182/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (999 of 999 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 a2feec3e7a..bd9de4eba4 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: 2022-09-30 08:18+0000\n"
+"PO-Revision-Date: 2022-10-13 06:43+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.14.1\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -70,7 +70,7 @@ msgstr "%%c kräver int eller char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -2129,7 +2129,7 @@ msgstr "UART-skrivning"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"

From c6bbb0e4f6c356a17da0e43a17dd0eb491f27c14 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 08:44:31 -0500
Subject: [PATCH 1183/2403] test format_exception too

---
 tests/circuitpython/traceback_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/circuitpython/traceback_test.py b/tests/circuitpython/traceback_test.py
index 6ae73db6ae..6f51ceede8 100644
--- a/tests/circuitpython/traceback_test.py
+++ b/tests/circuitpython/traceback_test.py
@@ -21,7 +21,7 @@ except Exception as exc:
     print("\nLimit=0 Trace:")
     traceback.print_exception(None, exc, exc.__traceback__, limit=0)
     print("\nLimit=-1 Trace:")
-    traceback.print_exception(None, exc, exc.__traceback__, limit=-1)
+    print(traceback.format_exception(None, exc, exc.__traceback__, limit=-1), end="")
 
 
 class NonNativeException(Exception):

From fc991c262c4a9ce5023e8a3552c7cef3539b1e93 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 08:44:57 -0500
Subject: [PATCH 1184/2403] traceback: share more code between format & print
 exception

---
 shared-bindings/traceback/__init__.c | 76 ++++++++++++++--------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index 566ac57218..08744d8009 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -38,7 +38,42 @@
 //| """
 //| ...
 
-STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj_t tb_obj, mp_obj_t limit_obj) {
+STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *print, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_etype, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_value, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_tb,    MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_limit, MP_ARG_OBJ,  {.u_obj = mp_const_none} },
+        { MP_QSTR_file,  MP_ARG_OBJ,  {.u_obj = mp_const_none} },
+        { MP_QSTR_chain, 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 value = args[ARG_value].u_obj;
+    mp_obj_t tb_obj = args[ARG_tb].u_obj;
+    mp_obj_t limit_obj = args[ARG_limit].u_obj;
+
+    if (args[ARG_file].u_obj != mp_const_none) {
+        if (!is_print_exception) {
+            #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'"), MP_QSTR_file);
+            #endif
+
+        }
+        #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
+        mp_get_stream_raise(args[ARG_file].u_obj, MP_STREAM_OP_WRITE);
+        print->data = MP_OBJ_TO_PTR(args[ARG_file].u_obj);
+        print->print_strn = mp_stream_write_adaptor;
+        #else
+        mp_raise_NotImplementedError(translate("file write is not available"));
+        #endif
+    }
+
     if (!mp_obj_is_exception_instance(value)) {
         mp_raise_TypeError(translate("invalid exception"));
     }
@@ -91,22 +126,10 @@ STATIC void traceback_exception_common(mp_print_t *print, mp_obj_t value, mp_obj
 //|     ...
 //|
 STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_chain };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_etype, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_value, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_tb,    MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_limit, MP_ARG_OBJ,  {.u_obj = mp_const_none} },
-        { MP_QSTR_chain, 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_print_t print;
     vstr_t vstr;
     vstr_init_print(&vstr, 0, &print);
-    traceback_exception_common(&print, args[ARG_value].u_obj, args[ARG_tb].u_obj, args[ARG_limit].u_obj);
+    traceback_exception_common(false, &print, n_args, pos_args, kw_args);
     return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
 }
 
@@ -139,31 +162,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f
 //|
 
 STATIC mp_obj_t traceback_print_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_etype, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_value, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_tb,    MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_limit, MP_ARG_OBJ,  {.u_obj = mp_const_none} },
-        { MP_QSTR_file,  MP_ARG_OBJ,  {.u_obj = mp_const_none} },
-        { MP_QSTR_chain, 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_print_t print = mp_plat_print;
-    if (args[ARG_file].u_obj != mp_const_none) {
-        #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-        mp_get_stream_raise(args[ARG_file].u_obj, MP_STREAM_OP_WRITE);
-        print.data = MP_OBJ_TO_PTR(args[ARG_file].u_obj);
-        print.print_strn = mp_stream_write_adaptor;
-        #else
-        mp_raise_NotImplementedError(translate("file write is not available"));
-        #endif
-    }
-
-    traceback_exception_common(&print, args[ARG_value].u_obj, args[ARG_tb].u_obj, args[ARG_limit].u_obj);
+    traceback_exception_common(true, &print, n_args, pos_args, kw_args);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_print_exception_obj, 0, traceback_print_exception);

From 47759294e0ba9187ab6cf9a151d3ddb41a37e73a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 08:51:41 -0500
Subject: [PATCH 1185/2403] code changes for supporting 1-arg print_exception

---
 shared-bindings/traceback/__init__.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index 08744d8009..b2221a4c8e 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -39,11 +39,11 @@
 //| ...
 
 STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *print, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_etype, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
+    enum { ARG_exc, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_etype, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_value, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_tb,    MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_,      MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_value, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_tb,    MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_limit, MP_ARG_OBJ,  {.u_obj = mp_const_none} },
         { MP_QSTR_file,  MP_ARG_OBJ,  {.u_obj = mp_const_none} },
         { MP_QSTR_chain, MP_ARG_BOOL, {.u_bool = true} },
@@ -53,6 +53,9 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_obj_t value = args[ARG_value].u_obj;
+    if (value == MP_OBJ_NULL) {
+        value = args[ARG_exc].u_obj;
+    }
     mp_obj_t tb_obj = args[ARG_tb].u_obj;
     mp_obj_t limit_obj = args[ARG_limit].u_obj;
 
@@ -88,7 +91,9 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
     mp_obj_exception_t *exc = mp_obj_exception_get_native(value);
     mp_obj_traceback_t *trace_backup = exc->traceback;
 
-    if (tb_obj != mp_const_none && print_tb) {
+    if (tb_obj == MP_OBJ_NULL) {
+        /* Print the traceback's exception as is */
+    } else if (tb_obj != mp_const_none && print_tb) {
         exc->traceback = mp_arg_validate_type(tb_obj, &mp_type_traceback, MP_QSTR_tb);
     } else {
         exc->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;

From 448eb1b70b93c35b611aefdff486cd12f1fc7570 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 09:24:46 -0500
Subject: [PATCH 1186/2403] Document the 3.10-style calling pattern

---
 shared-bindings/traceback/__init__.c | 49 +++++++++++++++++++---------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index b2221a4c8e..bc5776db2b 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -104,14 +104,24 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 }
 
 //| def format_exception(
-//|     etype: Type[BaseException],
-//|     value: BaseException,
-//|     tb: TracebackType,
+//|     exc: BaseException | Type[BaseException],
+//|     /,
+//|     value: Optional[BaseException] = None,
+//|     tb: Optional[TracebackType] = None,
 //|     limit: Optional[int] = None,
 //|     chain: Optional[bool] = True,
-//| ) -> None:
+//| ) -> str:
 //|     """Format a stack trace and the exception information.
 //|
+//|     If the exception value is passed in ``exc``, then this exception value and its
+//|     associated traceback are used. This is compatible with CPython 3.10 and newer.
+//|
+//|     If the exception value is passed in ``value``, then any value passed in for
+//|     ``exc`` is ignored.  ``value`` is used as the exception value and the
+//|     traceback in the ``tb`` argument is used.  In this case, if ``tb`` is None,
+//|     no traceback will be shown. This is compatible with CPython 3.5 and
+//|     newer.
+//|
 //|     The arguments have the same meaning as the corresponding arguments
 //|     to print_exception().  The return value is a list of strings, each
 //|     ending in a newline and some containing internal newlines.  When
@@ -120,15 +130,13 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 //|
 //|     .. note:: Setting ``chain`` will have no effect as chained exceptions are not yet implemented.
 //|
-//|     :param Type[BaseException] etype: This is ignored and inferred from the type of ``value``.
-//|     :param BaseException value: The exception. Must be an instance of `BaseException`.
-//|     :param TracebackType tb: The traceback object. If `None`, the traceback will not be printed.
+//|     :param exc: The exception. Must be an instance of `BaseException`. Unused if value is specified.
+//|     :param value: If specified, is used in place of ``exc``.
+//|     :param TracebackType tb: When value is alsp specified, ``tb`` is used in place of the exception's own traceback. If `None`, the traceback will not be printed.
 //|     :param int limit: Print up to limit stack trace entries (starting from the caller’s frame) if limit is positive.
 //|                       Otherwise, print the last ``abs(limit)`` entries. If limit is omitted or None, all entries are printed.
 //|     :param bool chain: If `True` then chained exceptions will be printed (note: not yet implemented).
-//|
 //|     """
-//|     ...
 //|
 STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_print_t print;
@@ -141,21 +149,30 @@ STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_ar
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_format_exception);
 
 //| def print_exception(
-//|     etype: Type[BaseException],
-//|     value: BaseException,
-//|     tb: TracebackType,
+//|     exc: BaseException | Type[BaseException],
+//|     /,
+//|     value: Optional[BaseException] = None,
+//|     tb: Optional[TracebackType] = None,
 //|     limit: Optional[int] = None,
 //|     file: Optional[io.FileIO] = None,
 //|     chain: Optional[bool] = True,
 //| ) -> None:
-//|
 //|     """Prints exception information and stack trace entries.
 //|
+//|     If the exception value is passed in ``exc``, then this exception value and its
+//|     associated traceback are used. This is compatible with CPython 3.10 and newer.
+//|
+//|     If the exception value is passed in ``value``, then any value passed in for
+//|     ``exc`` is ignored.  ``value`` is used as the exception value and the
+//|     traceback in the ``tb`` argument is used.  In this case, if ``tb`` is None,
+//|     no traceback will be shown. This is compatible with CPython 3.5 and
+//|     newer.
+//|
 //|     .. note:: Setting ``chain`` will have no effect as chained exceptions are not yet implemented.
 //|
-//|     :param Type[BaseException] etype: This is ignored and inferred from the type of ``value``.
-//|     :param BaseException value: The exception. Must be an instance of `BaseException`.
-//|     :param TracebackType tb: The traceback object. If `None`, the traceback will not be printed.
+//|     :param exc: The exception. Must be an instance of `BaseException`. Unused if value is specified.
+//|     :param value: If specified, is used in place of ``exc``.
+//|     :param tb: When value is alsp specified, ``tb`` is used in place of the exception's own traceback. If `None`, the traceback will not be printed.
 //|     :param int limit: Print up to limit stack trace entries (starting from the caller’s frame) if limit is positive.
 //|                       Otherwise, print the last ``abs(limit)`` entries. If limit is omitted or None, all entries are printed.
 //|     :param io.FileIO file: If file is omitted or `None`, the output goes to `sys.stderr`; otherwise it should be an open

From 9ecb905061c1d5864009029098b485280015c937 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 09:24:56 -0500
Subject: [PATCH 1187/2403] Test new-style exception printing

---
 tests/circuitpython/traceback_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/circuitpython/traceback_test.py b/tests/circuitpython/traceback_test.py
index 6f51ceede8..5377f1dca4 100644
--- a/tests/circuitpython/traceback_test.py
+++ b/tests/circuitpython/traceback_test.py
@@ -15,7 +15,7 @@ except Exception as exc:
     print("\nNo Trace:")
     traceback.print_exception(None, exc, None)
     print("\nDefault Trace:")
-    traceback.print_exception(None, exc, exc.__traceback__)
+    traceback.print_exception(exc)
     print("\nLimit=1 Trace:")
     traceback.print_exception(None, exc, exc.__traceback__, limit=1)
     print("\nLimit=0 Trace:")

From febc7a8514f9efbff8394f808483757375aca2e4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 09:29:21 -0500
Subject: [PATCH 1188/2403] format_traceback: Return list, as documented, and
 compatible with CPython

---
 shared-bindings/traceback/__init__.c  | 5 +++--
 tests/circuitpython/traceback_test.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index bc5776db2b..eeb7bc458d 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -110,7 +110,7 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 //|     tb: Optional[TracebackType] = None,
 //|     limit: Optional[int] = None,
 //|     chain: Optional[bool] = True,
-//| ) -> str:
+//| ) -> List[str]:
 //|     """Format a stack trace and the exception information.
 //|
 //|     If the exception value is passed in ``exc``, then this exception value and its
@@ -143,7 +143,8 @@ STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_ar
     vstr_t vstr;
     vstr_init_print(&vstr, 0, &print);
     traceback_exception_common(false, &print, n_args, pos_args, kw_args);
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    mp_obj_t output = mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    return mp_obj_new_list(1, &output);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_format_exception);
diff --git a/tests/circuitpython/traceback_test.py b/tests/circuitpython/traceback_test.py
index 5377f1dca4..17c54c857a 100644
--- a/tests/circuitpython/traceback_test.py
+++ b/tests/circuitpython/traceback_test.py
@@ -21,7 +21,7 @@ except Exception as exc:
     print("\nLimit=0 Trace:")
     traceback.print_exception(None, exc, exc.__traceback__, limit=0)
     print("\nLimit=-1 Trace:")
-    print(traceback.format_exception(None, exc, exc.__traceback__, limit=-1), end="")
+    print("".join(traceback.format_exception(None, exc, exc.__traceback__, limit=-1)), end="")
 
 
 class NonNativeException(Exception):

From ead03cd96f15a6807a8e94dec59e719f5c26ad80 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 13 Oct 2022 11:47:10 -0400
Subject: [PATCH 1189/2403] add caveat in documentation

---
 shared-bindings/microcontroller/Processor.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 47c400aee3..5a4a2556e1 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -104,7 +104,11 @@ MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj,
 //|     temperature: Optional[float]
 //|     """The on-chip temperature, in Celsius, as a float. (read-only)
 //|
-//|     Is `None` if the temperature is not available."""
+//|     Is `None` if the temperature is not available.
+//|
+//|     .. note :: On small SAMD21 builds without external flash,
+//|       the reported temperature has reduced accuracy and precision, to save code space.
+//|     """
 STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) {
     float temperature = common_hal_mcu_processor_get_temperature();
     return isnan(temperature) ? mp_const_none : mp_obj_new_float(temperature);

From e768b9ebb36308d9743ab574b083a1662081649a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20B=C3=B8e?= 
Date: Thu, 13 Oct 2022 20:09:26 +0200
Subject: [PATCH 1190/2403] Return correct errno

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 952f4ea7d8..37c37445de 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -1080,7 +1080,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
             ret = lwip_raw_udp_receive(socket, (byte *)buf, len, NULL, NULL, &_errno);
             break;
     }
-    if (ret < 0) {
+    if (ret == (unsigned)-1) {
         return -_errno;
     }
     return ret;
@@ -1089,7 +1089,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
 mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
     int received = socketpool_socket_recv_into(self, buf, len);
     if (received < 0) {
-        mp_raise_OSError(received);
+        mp_raise_OSError(-received);
     }
     return received;
 }

From 55519670a8711653e7238f0a39eb7e53db9531e4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 16:25:08 -0500
Subject: [PATCH 1191/2403] Fix parsing long dotenv values

Values that exceeded the stack buffer of 64 bytes were incorrectly
handled.

A new test is added.
---
 shared-module/dotenv/__init__.c        | 16 ++++++++++++----
 tests/circuitpython/dotenv_test.env    | 12 ++++++++++++
 tests/circuitpython/dotenv_test.py     |  4 ++++
 tests/circuitpython/dotenv_test.py.exp | 12 ++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
index be8f2353de..ead7c6561b 100644
--- a/shared-module/dotenv/__init__.c
+++ b/shared-module/dotenv/__init__.c
@@ -29,6 +29,7 @@
 
 #include "shared-bindings/dotenv/__init__.h"
 
+#include "py/misc.h"
 #include "py/mpstate.h"
 #include "py/objstr.h"
 #include "supervisor/filesystem.h"
@@ -272,10 +273,17 @@ mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key) {
         return mp_const_none;
     }
     if ((size_t)actual_len >= sizeof(value)) {
-        mp_obj_str_t *str = MP_OBJ_TO_PTR(mp_obj_new_str_copy(&mp_type_str, NULL, actual_len + 1));
-        dotenv_get_key(path, key, (char *)str->data, actual_len + 1);
-        str->hash = qstr_compute_hash(str->data, actual_len);
-        return MP_OBJ_FROM_PTR(str);
+        byte *buf = m_new(byte, actual_len + 1);
+        dotenv_get_key(path, key, (char *)buf, actual_len);
+        buf[actual_len] = 0;
+
+        mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
+        o->base.type = &mp_type_str;
+        o->len = actual_len;
+        o->data = buf;
+        o->hash = qstr_compute_hash(buf, actual_len);
+
+        return MP_OBJ_FROM_PTR(o);
     }
     return mp_obj_new_str(value, actual_len);
 }
diff --git a/tests/circuitpython/dotenv_test.env b/tests/circuitpython/dotenv_test.env
index e3bc23d6ce..63753b0ea4 100644
--- a/tests/circuitpython/dotenv_test.env
+++ b/tests/circuitpython/dotenv_test.env
@@ -23,3 +23,15 @@ quoted_then_comment='value'#comment
 hash_with_spaces=#value value
 aa🐍bb=key with emoji
 value_with_emoji=aa🐍bb
+sz0=x
+sz1=xx
+sz2=xxxx
+sz3=xxxxxxxx
+sz4=xxxxxxxxxxxxxxxx
+sz5=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz6=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz7=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz8=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz9=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz10=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+sz11=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/tests/circuitpython/dotenv_test.py b/tests/circuitpython/dotenv_test.py
index f217b72dbe..109a3bf221 100644
--- a/tests/circuitpython/dotenv_test.py
+++ b/tests/circuitpython/dotenv_test.py
@@ -25,3 +25,7 @@ print(f"quoted_then_comment={dotenv.get_key(FILE, 'quoted_then_comment')}")
 print(f"hash_with_spaces={dotenv.get_key(FILE, 'hash_with_spaces')}")
 print(f"aa🐍bb={dotenv.get_key(FILE, 'aa🐍bb')}")
 print(f"value_with_emoji={dotenv.get_key(FILE, 'value_with_emoji')}")
+
+for i in range(12):
+    key = f"sz{i}"
+    print(f"len({key})={len(dotenv.get_key(FILE, key))}")
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
index d67d570999..e0ed5f1505 100644
--- a/tests/circuitpython/dotenv_test.py.exp
+++ b/tests/circuitpython/dotenv_test.py.exp
@@ -21,3 +21,15 @@ quoted_then_comment=value
 hash_with_spaces=#value value
 aa🐍bb=key with emoji
 value_with_emoji=aa🐍bb
+len(sz0)=1
+len(sz1)=2
+len(sz2)=4
+len(sz3)=8
+len(sz4)=16
+len(sz5)=32
+len(sz6)=64
+len(sz7)=128
+len(sz8)=256
+len(sz9)=512
+len(sz10)=1024
+len(sz11)=2048

From 0c5fd55c166a78cd7ee4f0e68f2ec8ca89fc182b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 20:09:48 -0500
Subject: [PATCH 1192/2403] picow: Turn off wifi co-processor regulator when
 entering deep sleep

This reduces power consumption during true deep sleep.

In my measurements with ppk2 and a program that _irrevocably_ entered
deep sleep (no time alarm or pin alarm), power usage as measured on a
ppk2 decreased from ~10mA to ~1mA.
---
 ports/raspberrypi/bindings/cyw43/__init__.c   | 6 ++++++
 ports/raspberrypi/bindings/cyw43/__init__.h   | 1 +
 ports/raspberrypi/common-hal/alarm/__init__.c | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 66cc5fa1c4..bf0cbc2e67 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -35,6 +35,12 @@
 
 static int power_management_value = PM_DISABLED;
 
+void cyw43_enter_deep_sleep(void) {
+#define WL_REG_ON 23
+    gpio_set_dir(WL_REG_ON, GPIO_OUT);
+    gpio_put(WL_REG_ON, false);
+}
+
 void bindings_cyw43_wifi_enforce_pm() {
     cyw43_wifi_pm(&cyw43_state, power_management_value);
 }
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
index c543f7b9e1..2520c6c2d1 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.h
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -51,3 +51,4 @@ const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
 #define PM_DISABLED CONSTANT_CYW43_PM_VALUE(CYW43_NO_POWERSAVE_MODE, 200, 1, 1, 10)
 
 extern void bindings_cyw43_wifi_enforce_pm(void);
+void cyw43_enter_deep_sleep(void);
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
index 31fa58aab3..9cfa390116 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -38,6 +38,10 @@
 
 #include "shared-bindings/microcontroller/__init__.h"
 
+#if CIRCUITPY_CYW43
+#include "bindings/cyw43/__init__.h"
+#endif
+
 #include "supervisor/port.h"
 #include "supervisor/shared/workflow.h"
 
@@ -204,6 +208,10 @@ 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) {
     bool timealarm_set = alarm_time_timealarm_is_set();
 
+    #if CIRCUITPY_CYW43
+    cyw43_enter_deep_sleep();
+    #endif
+
     // If there's a timealarm, just enter a very deep light sleep
     if (timealarm_set) {
         // Prune the clock for sleep

From 3b3fe44174b925f6cb5a7bff23150b89cd2b3973 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 13 Oct 2022 20:42:35 -0500
Subject: [PATCH 1193/2403] implement hashlib for picow

---
 .../raspberry_pi_pico_w/mpconfigboard.mk      |  2 +-
 ports/raspberrypi/common-hal/hashlib/Hash.c   | 57 +++++++++++++++++++
 ports/raspberrypi/common-hal/hashlib/Hash.h   | 38 +++++++++++++
 .../raspberrypi/common-hal/hashlib/__init__.c | 40 +++++++++++++
 .../raspberrypi/common-hal/hashlib/__init__.h |  0
 5 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 ports/raspberrypi/common-hal/hashlib/Hash.c
 create mode 100644 ports/raspberrypi/common-hal/hashlib/Hash.h
 create mode 100644 ports/raspberrypi/common-hal/hashlib/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/hashlib/__init__.h

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index f075b03693..9773755649 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -13,7 +13,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CYW43 = 1
 CIRCUITPY_SSL = 1
 CIRCUITPY_SSL_MBEDTLS = 1
-CIRCUITPY_HASHLIB = 0
+CIRCUITPY_HASHLIB = 1
 CIRCUITPY_WEB_WORKFLOW = 0
 CIRCUITPY_MDNS = 0
 CIRCUITPY_SOCKETPOOL = 1
diff --git a/ports/raspberrypi/common-hal/hashlib/Hash.c b/ports/raspberrypi/common-hal/hashlib/Hash.c
new file mode 100644
index 0000000000..046bd3f096
--- /dev/null
+++ b/ports/raspberrypi/common-hal/hashlib/Hash.c
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 "shared-bindings/hashlib/Hash.h"
+
+#include "mbedtls/ssl.h"
+
+void common_hal_hashlib_hash_update(hashlib_hash_obj_t *self, const uint8_t *data, size_t datalen) {
+    if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) {
+        mbedtls_sha1_update_ret(&self->sha1, data, datalen);
+        return;
+    }
+}
+
+void common_hal_hashlib_hash_digest(hashlib_hash_obj_t *self, uint8_t *data, size_t datalen) {
+    if (datalen < common_hal_hashlib_hash_get_digest_size(self)) {
+        return;
+    }
+    if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) {
+        // We copy the sha1 state so we can continue to update if needed or get
+        // the digest a second time.
+        mbedtls_sha1_context copy;
+        mbedtls_sha1_clone(©, &self->sha1);
+        mbedtls_sha1_finish_ret(&self->sha1, data);
+        mbedtls_sha1_clone(&self->sha1, ©);
+    }
+}
+
+size_t common_hal_hashlib_hash_get_digest_size(hashlib_hash_obj_t *self) {
+    if (self->hash_type == MBEDTLS_SSL_HASH_SHA1) {
+        return 20;
+    }
+    return 0;
+}
diff --git a/ports/raspberrypi/common-hal/hashlib/Hash.h b/ports/raspberrypi/common-hal/hashlib/Hash.h
new file mode 100644
index 0000000000..9792538e0a
--- /dev/null
+++ b/ports/raspberrypi/common-hal/hashlib/Hash.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "mbedtls/sha1.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    union {
+        mbedtls_sha1_context sha1;
+    };
+    // Of MBEDTLS_SSL_HASH_*
+    uint8_t hash_type;
+} hashlib_hash_obj_t;
diff --git a/ports/raspberrypi/common-hal/hashlib/__init__.c b/ports/raspberrypi/common-hal/hashlib/__init__.c
new file mode 100644
index 0000000000..1ad116ea6c
--- /dev/null
+++ b/ports/raspberrypi/common-hal/hashlib/__init__.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 "shared-bindings/hashlib/__init__.h"
+
+#include "mbedtls/ssl.h"
+
+
+bool common_hal_hashlib_new(hashlib_hash_obj_t *self, const char *algorithm) {
+    if (strcmp(algorithm, "sha1") == 0) {
+        self->hash_type = MBEDTLS_SSL_HASH_SHA1;
+        mbedtls_sha1_init(&self->sha1);
+        mbedtls_sha1_starts_ret(&self->sha1);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/raspberrypi/common-hal/hashlib/__init__.h b/ports/raspberrypi/common-hal/hashlib/__init__.h
new file mode 100644
index 0000000000..e69de29bb2

From 66b539d768e9eeb52924ee48783e909000d0d622 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 14 Oct 2022 11:33:10 +0530
Subject: [PATCH 1194/2403] fix espressif log level

---
 .../esp-idf-config/sdkconfig-debug.defaults     | 17 +++++++++++++++++
 .../esp-idf-config/sdkconfig-opt.defaults       | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
index 9d02c62445..e93b3d2825 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
@@ -5,6 +5,12 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 # end of Bootloader config
 
 # CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
@@ -60,6 +66,17 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
+#
+# Log output
+#
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+# end of Log output
+
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 #
 # Deprecated options for backward compatibility
diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
index e9b91113d5..1ccd6478fe 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
@@ -5,6 +5,12 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 # end of Bootloader config
 
 #
@@ -73,6 +79,17 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=1
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
+#
+# Log output
+#
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+# end of Log output
+
 #
 # LWIP
 #

From fc00a6675ea77d0deb566bfaade45071e8c66966 Mon Sep 17 00:00:00 2001
From: Kong Wai Weng 
Date: Fri, 14 Oct 2022 17:25:24 +0800
Subject: [PATCH 1195/2403] Added some pin definitions to match with the
 Arduino core.

---
 .../cytron_maker_feather_aiot_s3/pins.c       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
index b8ed298596..cca5f2617d 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c
@@ -3,35 +3,46 @@
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_LED_BUILTIN), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
 
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_T4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
 
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_T5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
 
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_T6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
 
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_T7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_T8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
 
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_T9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
 
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_T10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
 
     { MP_ROM_QSTR(MP_QSTR_VP_EN), MP_ROM_PTR(&pin_GPIO11) },
@@ -43,20 +54,27 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_VIN), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_VBATT), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
 
+    { MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_T14), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
 
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
 
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
 
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
 
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
 
     { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
@@ -71,6 +89,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
 
     { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_RGB_BUILTIN), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO46) },
 

From 91985cef7e9666d1f60ef6cef7f66c74896744d0 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 14 Oct 2022 11:26:37 -0400
Subject: [PATCH 1196/2403] don't build other ports due to common-hal changes

---
 tools/ci_set_matrix.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 0ae6010ac9..e165c23c27 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -53,7 +53,7 @@ def set_output(name, value):
         with open(os.environ["GITHUB_OUTPUT"], "at") as f:
             print(f"{name}={value}", file=f)
     else:
-        print("Would set GitHub actions output {name} to '{value}'")
+        print(f"Would set GitHub actions output {name} to '{value}'")
 
 
 def set_boards_to_build(build_all):
@@ -80,9 +80,7 @@ def set_boards_to_build(build_all):
         boards_to_build = set()
         board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
         port_pattern = re.compile(r"^ports/([^/]+)/")
-        module_pattern = re.compile(
-            r"^(ports/[^/]+/common-hal|shared-bindings|shared-module)/([^/]+)/"
-        )
+        module_pattern = re.compile(r"^(ports/[^/]+/shared-bindings|shared-module)/([^/]+)/")
         for p in changed_files:
             # See if it is board specific
             board_matches = board_pattern.search(p)

From 81154b4ee6f611f4b255f9756b45d17a5438d07d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:32:58 -0500
Subject: [PATCH 1197/2403] Revert "don't build other ports due to common-hal
 changes"

This reverts commit 91985cef7e9666d1f60ef6cef7f66c74896744d0.
---
 tools/ci_set_matrix.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index e165c23c27..0ae6010ac9 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -53,7 +53,7 @@ def set_output(name, value):
         with open(os.environ["GITHUB_OUTPUT"], "at") as f:
             print(f"{name}={value}", file=f)
     else:
-        print(f"Would set GitHub actions output {name} to '{value}'")
+        print("Would set GitHub actions output {name} to '{value}'")
 
 
 def set_boards_to_build(build_all):
@@ -80,7 +80,9 @@ def set_boards_to_build(build_all):
         boards_to_build = set()
         board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
         port_pattern = re.compile(r"^ports/([^/]+)/")
-        module_pattern = re.compile(r"^(ports/[^/]+/shared-bindings|shared-module)/([^/]+)/")
+        module_pattern = re.compile(
+            r"^(ports/[^/]+/common-hal|shared-bindings|shared-module)/([^/]+)/"
+        )
         for p in changed_files:
             # See if it is board specific
             board_matches = board_pattern.search(p)

From cab40630573dc9444590782f88471cb8cb0625a4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 09:23:35 -0500
Subject: [PATCH 1198/2403] Make it easier to locally test ci_set_matrix

Now you can e.g., `tools/ci_set_matrix.py ports/raspberrypi/mpconfigport.h`
and see what outputs would be set.
---
 docs/shared_bindings_matrix.py |  7 +++----
 tools/ci_set_matrix.py         | 28 ++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 5b9b63d8fd..196415ca2f 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -80,12 +80,11 @@ This is the same list as in the preprocess_frozen_modules script."""
 repository_urls = {}
 """Cache of repository URLs for frozen modules."""
 
+root_dir = pathlib.Path(__file__).resolve().parent.parent
+
 def get_circuitpython_root_dir():
     """ The path to the root './circuitpython' directory.
     """
-    file_path = pathlib.Path(__file__).resolve()
-    root_dir = file_path.parent.parent
-
     return root_dir
 
 def get_shared_bindings():
@@ -102,7 +101,7 @@ def get_board_mapping():
     """
     boards = {}
     for port in SUPPORTED_PORTS:
-        board_path = os.path.join("../ports", port, "boards")
+        board_path = root_dir / "ports" / port / "boards"
         for board_path in os.scandir(board_path):
             if board_path.is_dir():
                 board_files = os.listdir(board_path.path)
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 0ae6010ac9..198aca899b 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -19,6 +19,13 @@ import os
 import sys
 import json
 import yaml
+import pathlib
+
+tools_dir = pathlib.Path(__file__).resolve().parent
+top_dir = tools_dir.parent
+
+sys.path.insert(0, str(tools_dir / "adabot"))
+sys.path.insert(0, str(top_dir / "docs"))
 
 import build_board_info
 from shared_bindings_matrix import get_settings_from_makefile
@@ -40,12 +47,17 @@ IGNORE = [
     "tools/ci_check_duplicate_usb_vid_pid.py",
 ]
 
-changed_files = {}
-try:
-    changed_files = json.loads(os.environ["CHANGED_FILES"])
-except json.decoder.JSONDecodeError as exc:
-    if exc.msg != "Expecting value":
-        raise
+if len(sys.argv) > 1:
+    print("Using files list on commandline")
+    changed_files = sys.argv[1:]
+else:
+    c = os.environ["CHANGED_FILES"]
+    if c == "":
+        print("CHANGED_FILES is in environment, but value is empty")
+        changed_files = []
+    else:
+        print("Using files list in CHANGED_FILES")
+        changed_files = json.loads(os.environ["CHANGED_FILES"])
 
 
 def set_output(name, value):
@@ -53,7 +65,7 @@ def set_output(name, value):
         with open(os.environ["GITHUB_OUTPUT"], "at") as f:
             print(f"{name}={value}", file=f)
     else:
-        print("Would set GitHub actions output {name} to '{value}'")
+        print(f"Would set GitHub actions output {name} to '{value}'")
 
 
 def set_boards_to_build(build_all):
@@ -114,7 +126,7 @@ def set_boards_to_build(build_all):
                 for board in all_board_ids:
                     if board not in board_settings:
                         board_settings[board] = get_settings_from_makefile(
-                            "../ports/" + board_to_port[board], board
+                            str(top_dir / "ports" / board_to_port[board]), board
                         )
                     settings = board_settings[board]
 

From 25164030e228b36f47a6caabdd084c417c061c80 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:06:35 -0500
Subject: [PATCH 1199/2403] Don't recompute 'all_ports_all_boards'

This looks modestly expensive, and it's trivial to cache it.
---
 docs/shared_bindings_matrix.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 196415ca2f..761e3e29f2 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -27,6 +27,7 @@ import pathlib
 import re
 import subprocess
 import sys
+import functools
 
 from concurrent.futures import ThreadPoolExecutor
 
@@ -275,6 +276,7 @@ def lookup_setting(settings, key, default=''):
         key = value[2:-1]
     return value
 
+@functools.cache
 def all_ports_all_boards(ports=SUPPORTED_PORTS):
     for port in ports:
 

From ad130e87f0bb45cf3ab2d4d1a55fcbf66f9de8c2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:07:46 -0500
Subject: [PATCH 1200/2403] Parallelize finding board settings

This reduces the _elapsed_ time running the script from ~90s to ~15s
on my AMD Ryzen 7 5700U. The CPU time is still around 2 minutes.
---
 tools/ci_set_matrix.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 198aca899b..7cdc57cd52 100644
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -20,6 +20,7 @@ import sys
 import json
 import yaml
 import pathlib
+from concurrent.futures import ThreadPoolExecutor
 
 tools_dir = pathlib.Path(__file__).resolve().parent
 top_dir = tools_dir.parent
@@ -28,7 +29,11 @@ sys.path.insert(0, str(tools_dir / "adabot"))
 sys.path.insert(0, str(top_dir / "docs"))
 
 import build_board_info
-from shared_bindings_matrix import get_settings_from_makefile
+from shared_bindings_matrix import (
+    get_settings_from_makefile,
+    SUPPORTED_PORTS,
+    all_ports_all_boards,
+)
 
 PORT_TO_ARCH = {
     "atmel-samd": "arm",
@@ -86,6 +91,20 @@ def set_boards_to_build(build_all):
         port_to_boards[port].add(board_id)
         board_to_port[board_id] = port
 
+    def compute_board_settings():
+        if board_settings:
+            return
+
+        def get_settings(arg):
+            board = arg[1].name
+            return (
+                board,
+                get_settings_from_makefile(str(top_dir / "ports" / board_to_port[board]), board),
+            )
+
+        with ThreadPoolExecutor(max_workers=os.cpu_count()) as ex:
+            board_settings.update(ex.map(get_settings, all_ports_all_boards()))
+
     boards_to_build = all_board_ids
 
     if not build_all:
@@ -123,11 +142,8 @@ def set_boards_to_build(build_all):
             # As a (nearly) last resort, for some certain files, we compute the settings from the
             # makefile for each board and determine whether to build them that way.
             if p.startswith("frozen") or p.startswith("supervisor") or module_matches:
+                compute_board_settings()
                 for board in all_board_ids:
-                    if board not in board_settings:
-                        board_settings[board] = get_settings_from_makefile(
-                            str(top_dir / "ports" / board_to_port[board]), board
-                        )
                     settings = board_settings[board]
 
                     # Check frozen files to see if they are in each board.

From 3b600ac9b38fe0d6c67fadb4a5bd2f9cac3e53b9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:19:54 -0500
Subject: [PATCH 1201/2403] Potentially compute settings of fewer boards

.. when the file is within ports, just get the settings for boards
within the port
---
 tools/ci_set_matrix.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 tools/ci_set_matrix.py

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
old mode 100644
new mode 100755
index 7cdc57cd52..e65f3ed8b2
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -91,19 +91,19 @@ def set_boards_to_build(build_all):
         port_to_boards[port].add(board_id)
         board_to_port[board_id] = port
 
-    def compute_board_settings():
-        if board_settings:
+    def compute_board_settings(boards):
+        need = set(boards) - set(board_settings.keys())
+        if not need:
             return
 
-        def get_settings(arg):
-            board = arg[1].name
+        def get_settings(board):
             return (
                 board,
                 get_settings_from_makefile(str(top_dir / "ports" / board_to_port[board]), board),
             )
 
         with ThreadPoolExecutor(max_workers=os.cpu_count()) as ex:
-            board_settings.update(ex.map(get_settings, all_ports_all_boards()))
+            board_settings.update(ex.map(get_settings, need))
 
     boards_to_build = all_board_ids
 
@@ -142,8 +142,13 @@ def set_boards_to_build(build_all):
             # As a (nearly) last resort, for some certain files, we compute the settings from the
             # makefile for each board and determine whether to build them that way.
             if p.startswith("frozen") or p.startswith("supervisor") or module_matches:
-                compute_board_settings()
-                for board in all_board_ids:
+                if port_matches:
+                    port = port_matches.group(1)
+                    board_ids = port_to_boards[port]
+                else:
+                    board_ids = all_board_ids
+                compute_board_settings(board_ids)
+                for board in board_ids:
                     settings = board_settings[board]
 
                     # Check frozen files to see if they are in each board.

From 641a398a542fcc9047ad3fe462919769d2f3b095 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:23:47 -0500
Subject: [PATCH 1202/2403] only build subset of boards for bindings changes

---
 tools/ci_set_matrix.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index e65f3ed8b2..30d31ec37d 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -12,6 +12,13 @@ on the event that triggered run. Pull request runs will compare to the
 base branch while pushes will compare to the current ref. We override this
 for the adafruit/circuitpython repo so we build all docs/boards for pushes.
 
+When making changes to the script it is useful to manually test it.
+You can for instance run
+```shell
+tools/ci_set_matrix ports/raspberrypi/common-hal/socket/SSLSocket.c
+```
+and (at the time this comment was written) get a series of messages indicating
+that only the single board raspberry_pi_pico_w would be built.
 """
 
 import re
@@ -112,7 +119,7 @@ def set_boards_to_build(build_all):
         board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
         port_pattern = re.compile(r"^ports/([^/]+)/")
         module_pattern = re.compile(
-            r"^(ports/[^/]+/common-hal|shared-bindings|shared-module)/([^/]+)/"
+            r"^(ports/[^/]+/(?:common-hal|bindings)|shared-bindings|shared-module)/([^/]+)/"
         )
         for p in changed_files:
             # See if it is board specific

From d08b43f704e2ef6c373a37f7b7ef30beb498956d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 11:28:29 -0500
Subject: [PATCH 1203/2403] We refer to port multiple times, make it convenient

---
 tools/ci_set_matrix.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 30d31ec37d..f22840fad7 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -131,9 +131,9 @@ def set_boards_to_build(build_all):
 
             # See if it is port specific
             port_matches = port_pattern.search(p)
+            port = port_matches.group(1) if port_matches else None
             module_matches = module_pattern.search(p)
-            if port_matches and not module_matches:
-                port = port_matches.group(1)
+            if port and not module_matches:
                 if port != "unix":
                     boards_to_build.update(port_to_boards[port])
                 continue
@@ -149,8 +149,7 @@ def set_boards_to_build(build_all):
             # As a (nearly) last resort, for some certain files, we compute the settings from the
             # makefile for each board and determine whether to build them that way.
             if p.startswith("frozen") or p.startswith("supervisor") or module_matches:
-                if port_matches:
-                    port = port_matches.group(1)
+                if port:
                     board_ids = port_to_boards[port]
                 else:
                     board_ids = all_board_ids

From 068b7c4af81160c041a3b92067e2afff3623ae79 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 12:14:06 -0500
Subject: [PATCH 1204/2403] Use micropython #defines for stream polling
 operations

We adopted the file "py/ioctl.h" and the ioctl names beginning
with MP_IOCTL_POLL while micropython went with "py/stream.h" and
MP_STREAM_POLL.

Align with upstream.

Closes #6711
---
 extmod/moduselect.c                           |  2 +-
 py/ioctl.h                                    | 38 -------------------
 shared-bindings/_bleio/CharacteristicBuffer.c | 12 +++---
 shared-bindings/_bleio/PacketBuffer.c         |  2 +-
 shared-bindings/busio/UART.c                  | 12 +++---
 shared-bindings/keypad/EventQueue.c           |  6 +--
 shared-bindings/terminalio/Terminal.c         |  8 ++--
 shared-bindings/usb_cdc/Serial.c              | 12 +++---
 shared-bindings/usb_midi/PortIn.c             |  8 ++--
 shared-bindings/usb_midi/PortOut.c            |  8 ++--
 10 files changed, 35 insertions(+), 73 deletions(-)
 delete mode 100644 py/ioctl.h

diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index c8f5e57363..5744d2839c 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -9,7 +9,7 @@
 
 #include 
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/runtime.h"
 #include "py/obj.h"
 #include "py/objlist.h"
diff --git a/py/ioctl.h b/py/ioctl.h
deleted file mode 100644
index 8c84835cc1..0000000000
--- a/py/ioctl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: Copyright (c) 2013-2015 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_PY_IOCTL_H
-#define MICROPY_INCLUDED_PY_IOCTL_H
-
-#define MP_IOCTL_POLL (0x100 | 1)
-
-// These values are compatible with Linux, which are in turn
-// compatible with iBCS2 spec.
-#define MP_IOCTL_POLL_RD  (0x0001)
-#define MP_IOCTL_POLL_WR  (0x0004)
-#define MP_IOCTL_POLL_ERR (0x0008)
-#define MP_IOCTL_POLL_HUP (0x0010)
-
-#endif  // MICROPY_INCLUDED_PY_IOCTL_H
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index 9b44114a99..12853b3ac3 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/mperrno.h"
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -138,15 +138,15 @@ STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t r
     check_for_deinit(self);
     raise_error_if_not_connected(self);
     mp_uint_t ret;
-    if (request == MP_IOCTL_POLL) {
+    if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        if ((flags & MP_IOCTL_POLL_RD) && common_hal_bleio_characteristic_buffer_rx_characters_available(self) > 0) {
-            ret |= MP_IOCTL_POLL_RD;
+        if ((flags & MP_STREAM_POLL_RD) && common_hal_bleio_characteristic_buffer_rx_characters_available(self) > 0) {
+            ret |= MP_STREAM_POLL_RD;
         }
 // No writing provided.
-//        if ((flags & MP_IOCTL_POLL_WR) && common_hal_busio_uart_ready_to_tx(self)) {
-//            ret |= MP_IOCTL_POLL_WR;
+//        if ((flags & MP_STREAM_POLL_WR) && common_hal_busio_uart_ready_to_tx(self)) {
+//            ret |= MP_STREAM_POLL_WR;
 //        }
     } else {
         *errcode = MP_EINVAL;
diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c
index 8c6b017c9c..0ce74beff4 100644
--- a/shared-bindings/_bleio/PacketBuffer.c
+++ b/shared-bindings/_bleio/PacketBuffer.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/mperrno.h"
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/stream.h"
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index a65984c3fb..5663254897 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -33,7 +33,7 @@
 #include "shared/runtime/context_manager_helpers.h"
 #include "shared/runtime/interrupt_char.h"
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/objtype.h"
 #include "py/runtime.h"
@@ -276,14 +276,14 @@ STATIC mp_uint_t busio_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t
     busio_uart_obj_t *self = native_uart(self_in);
     check_for_deinit(self);
     mp_uint_t ret;
-    if (request == MP_IOCTL_POLL) {
+    if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        if ((flags & MP_IOCTL_POLL_RD) && common_hal_busio_uart_rx_characters_available(self) > 0) {
-            ret |= MP_IOCTL_POLL_RD;
+        if ((flags & MP_STREAM_POLL_RD) && common_hal_busio_uart_rx_characters_available(self) > 0) {
+            ret |= MP_STREAM_POLL_RD;
         }
-        if ((flags & MP_IOCTL_POLL_WR) && common_hal_busio_uart_ready_to_tx(self)) {
-            ret |= MP_IOCTL_POLL_WR;
+        if ((flags & MP_STREAM_POLL_WR) && common_hal_busio_uart_ready_to_tx(self)) {
+            ret |= MP_STREAM_POLL_WR;
         }
     } else {
         *errcode = MP_EINVAL;
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 615c051188..d09d5db129 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
@@ -147,8 +147,8 @@ STATIC mp_uint_t eventqueue_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t
         case MP_STREAM_POLL: {
             mp_uint_t flags = arg;
             mp_uint_t ret = 0;
-            if ((flags & MP_IOCTL_POLL_RD) && common_hal_keypad_eventqueue_get_length(self)) {
-                ret |= MP_IOCTL_POLL_RD;
+            if ((flags & MP_STREAM_POLL_RD) && common_hal_keypad_eventqueue_get_length(self)) {
+                ret |= MP_STREAM_POLL_RD;
             }
             return ret;
         }
diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index a666a79461..2dfe29035e 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -29,7 +29,7 @@
 #include "shared-bindings/terminalio/Terminal.h"
 #include "shared-bindings/util.h"
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
@@ -111,11 +111,11 @@ STATIC mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in,
 STATIC mp_uint_t terminalio_terminal_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
     terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
-    if (request == MP_IOCTL_POLL) {
+    if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        if ((flags & MP_IOCTL_POLL_WR) && common_hal_terminalio_terminal_ready_to_tx(self)) {
-            ret |= MP_IOCTL_POLL_WR;
+        if ((flags & MP_STREAM_POLL_WR) && common_hal_terminalio_terminal_ready_to_tx(self)) {
+            ret |= MP_STREAM_POLL_WR;
         }
     } else {
         *errcode = MP_EINVAL;
diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c
index df96debe7f..9fe6cafd5f 100644
--- a/shared-bindings/usb_cdc/Serial.c
+++ b/shared-bindings/usb_cdc/Serial.c
@@ -29,7 +29,7 @@
 #include "shared-bindings/usb_cdc/Serial.h"
 #include "shared-bindings/util.h"
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -114,14 +114,14 @@ STATIC mp_uint_t usb_cdc_serial_ioctl_stream(mp_obj_t self_in, mp_uint_t request
     usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret = 0;
     switch (request) {
-        case MP_IOCTL_POLL: {
+        case MP_STREAM_POLL: {
             mp_uint_t flags = arg;
             ret = 0;
-            if ((flags & MP_IOCTL_POLL_RD) && common_hal_usb_cdc_serial_get_in_waiting(self) > 0) {
-                ret |= MP_IOCTL_POLL_RD;
+            if ((flags & MP_STREAM_POLL_RD) && common_hal_usb_cdc_serial_get_in_waiting(self) > 0) {
+                ret |= MP_STREAM_POLL_RD;
             }
-            if ((flags & MP_IOCTL_POLL_WR) && common_hal_usb_cdc_serial_get_out_waiting(self) == 0) {
-                ret |= MP_IOCTL_POLL_WR;
+            if ((flags & MP_STREAM_POLL_WR) && common_hal_usb_cdc_serial_get_out_waiting(self) == 0) {
+                ret |= MP_STREAM_POLL_WR;
             }
             break;
         }
diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c
index b63843e8dd..ca07c8695a 100644
--- a/shared-bindings/usb_midi/PortIn.c
+++ b/shared-bindings/usb_midi/PortIn.c
@@ -29,7 +29,7 @@
 #include "shared-bindings/usb_midi/PortIn.h"
 #include "shared-bindings/util.h"
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -81,11 +81,11 @@ STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t
 STATIC mp_uint_t usb_midi_portin_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
     usb_midi_portin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
-    if (request == MP_IOCTL_POLL) {
+    if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        if ((flags & MP_IOCTL_POLL_RD) && common_hal_usb_midi_portin_bytes_available(self) > 0) {
-            ret |= MP_IOCTL_POLL_RD;
+        if ((flags & MP_STREAM_POLL_RD) && common_hal_usb_midi_portin_bytes_available(self) > 0) {
+            ret |= MP_STREAM_POLL_RD;
         }
     } else {
         *errcode = MP_EINVAL;
diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c
index 5888045b79..f1f61f948a 100644
--- a/shared-bindings/usb_midi/PortOut.c
+++ b/shared-bindings/usb_midi/PortOut.c
@@ -29,7 +29,7 @@
 #include "shared-bindings/usb_midi/PortOut.h"
 #include "shared-bindings/util.h"
 
-#include "py/ioctl.h"
+#include "py/stream.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -64,11 +64,11 @@ STATIC mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp
 STATIC mp_uint_t usb_midi_portout_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
     usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
-    if (request == MP_IOCTL_POLL) {
+    if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        if ((flags & MP_IOCTL_POLL_WR) && common_hal_usb_midi_portout_ready_to_tx(self)) {
-            ret |= MP_IOCTL_POLL_WR;
+        if ((flags & MP_STREAM_POLL_WR) && common_hal_usb_midi_portout_ready_to_tx(self)) {
+            ret |= MP_STREAM_POLL_WR;
         }
     } else {
         *errcode = MP_EINVAL;

From 798f6ec71f6b86fcb82e72b7efb4d06784ad0172 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 14:44:23 -0500
Subject: [PATCH 1205/2403] Switch tests to run on
 Adafruit_CircuitPython_asyncio (fails)

This also depends on https://github.com/adafruit/Adafruit_CircuitPython_Ticks/pull/8
otherwise adafruit_ticks is unimportable and the tests are just skipped.

Several of the tests fail, and one runs forever instead of terminating.

We should fix our asyncio until the tests patch, then incorporate this
change.
---
 tests/run-tests.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 751b70886a..15e9899e89 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -870,8 +870,14 @@ the last matching regex is used:
 
     if not args.keep_path:
         # clear search path to make sure tests use only builtin modules and those in extmod
-        os.environ["MICROPYPATH"] = os.pathsep + ".frozen" + os.pathsep + base_path("../extmod")
-
+        os.environ["MICROPYPATH"] = os.pathsep.join(
+            [
+                "",
+                ".frozen",
+                base_path("../frozen/Adafruit_CircuitPython_asyncio"),
+                base_path("../frozen/Adafruit_CircuitPython_Ticks"),
+            ]
+        )
     try:
         os.makedirs(args.result_dir, exist_ok=True)
         res = run_tests(pyb, tests, args, args.result_dir, args.jobs)

From 963a51487a3a37ae16e264adff4805fb0813c0af Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 14:44:34 -0500
Subject: [PATCH 1206/2403] unix Makefile: easy wait to print test failures as
 diffs

---
 ports/unix/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index c0d2bdfc63..4790e0eacf 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -309,6 +309,10 @@ test_full: $(PROG) $(TOP)/tests/run-tests.py
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
 	cat $(TOP)/tests/basics/0prelim.py | ./$(PROG) | grep -q 'abc'
 
+.PHONY: print-failures clean-failures
+print-failures clean-failures:
+	../../tests/run-tests.py --$@
+
 test_gcov: test_full
 	gcov -o $(BUILD)/py $(TOP)/py/*.c
 	gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c

From 4f190c9228dfeb7c42d6ff8e6a300653aae82cc9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 16:40:10 -0500
Subject: [PATCH 1207/2403] Handle tests that just won't stop

---
 tests/run-tests.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 15e9899e89..ed0cf18e45 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -183,7 +183,17 @@ def run_micropython(pyb, args, test_file, is_special=False):
 
             # run the actual test
             try:
-                output_mupy = subprocess.check_output(cmdlist, stderr=subprocess.STDOUT)
+                result = subprocess.run(
+                    cmdlist,
+                    stderr=subprocess.STDOUT,
+                    stdout=subprocess.PIPE,
+                    check=True,
+                    timeout=10,
+                )
+                output_mupy = result.stdout
+            except subprocess.TimeoutExpired as er:
+                had_crash = True
+                output_mupy = (er.output or b"") + b"TIMEOUT"
             except subprocess.CalledProcessError as er:
                 had_crash = True
                 output_mupy = er.output + b"CRASH"
@@ -869,7 +879,7 @@ the last matching regex is used:
         tests = args.files
 
     if not args.keep_path:
-        # clear search path to make sure tests use only builtin modules and those in extmod
+        # clear search path to make sure tests use only builtin modules and those that can be frozen
         os.environ["MICROPYPATH"] = os.pathsep.join(
             [
                 "",

From 6a8bc738ecf0e849cd1a973aeea3970262835231 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Oct 2022 17:07:27 -0500
Subject: [PATCH 1208/2403] Make it easy to test just a subset of tests

with e.g., 'make TEST_EXTRA="extmod/uasyncio*.py" test'
---
 ports/unix/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 4790e0eacf..5141beff4c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -296,9 +296,10 @@ include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full
 
+TEST_EXTRA ?=
 test: $(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py $(TEST_EXTRA)
 
 test_full: $(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))

From e7b25dbf7309a551ee1ac74fc5a4b0554b76f775 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 15 Oct 2022 13:20:10 +0530
Subject: [PATCH 1209/2403] improve `dualbank` errors

---
 locale/circuitpython.pot                       | 12 ++++++++++--
 ports/espressif/common-hal/dualbank/__init__.c | 13 +++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 17807450a9..6c5e5ee585 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1005,7 +1005,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4155,7 +4163,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
diff --git a/ports/espressif/common-hal/dualbank/__init__.c b/ports/espressif/common-hal/dualbank/__init__.c
index 29b15a3e30..9e3fb38627 100644
--- a/ports/espressif/common-hal/dualbank/__init__.c
+++ b/ports/espressif/common-hal/dualbank/__init__.c
@@ -32,8 +32,6 @@
 #include "esp_log.h"
 #include "esp_ota_ops.h"
 
-#include "supervisor/flash.h"
-
 static const esp_partition_t *update_partition = NULL;
 static esp_ota_handle_t update_handle = 0;
 
@@ -59,14 +57,13 @@ void common_hal_dualbank_flash(const void *buf, const size_t len, const size_t o
 
     if (update_partition == NULL) {
         update_partition = esp_ota_get_next_update_partition(NULL);
+        assert(update_partition != NULL);
 
         ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08x)",
             running->type, running->subtype, running->address);
 
         ESP_LOGI(TAG, "Writing partition type %d subtype %d (offset 0x%08x)\n",
             update_partition->type, update_partition->subtype, update_partition->address);
-
-        assert(update_partition != NULL);
     }
 
     if (update_handle == 0) {
@@ -88,14 +85,14 @@ void common_hal_dualbank_flash(const void *buf, const size_t len, const size_t o
             // check new version with running version
             if (memcmp(new_app_info.version, running_app_info.version, sizeof(new_app_info.version)) == 0) {
                 ESP_LOGW(TAG, "New version is the same as running version.");
-                task_fatal_error();
+                mp_raise_RuntimeError(translate("Firmware is duplicate"));
             }
 
             // check new version with last invalid partition
             if (last_invalid != NULL) {
                 if (memcmp(new_app_info.version, invalid_app_info.version, sizeof(new_app_info.version)) == 0) {
                     ESP_LOGW(TAG, "New version is the same as invalid version.");
-                    task_fatal_error();
+                    mp_raise_RuntimeError(translate("Firmware is invalid"));
                 }
             }
 
@@ -106,7 +103,7 @@ void common_hal_dualbank_flash(const void *buf, const size_t len, const size_t o
             }
         } else {
             ESP_LOGE(TAG, "received package is not fit len");
-            task_fatal_error();
+            mp_raise_RuntimeError(translate("Firmware is too big"));
         }
     }
 
@@ -130,7 +127,7 @@ void common_hal_dualbank_switch(void) {
     if (err != ESP_OK) {
         if (err == ESP_ERR_OTA_VALIDATE_FAILED) {
             ESP_LOGE(TAG, "Image validation failed, image is corrupted");
-            mp_raise_RuntimeError(translate("Firmware image is invalid"));
+            mp_raise_RuntimeError(translate("Firmware is invalid"));
         }
         ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err));
         task_fatal_error();

From e590d27bf8990f2163ee50e271bc5ce18ee3d956 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 15 Oct 2022 10:48:05 -0500
Subject: [PATCH 1210/2403] Use CircuitPython _TICKS_PERIOD

.. since Adafruit_CircuitPython_asyncio is hard-coded to this _TICKS_PERIOD
not the one that would otherwise be used on Unix

This fixes all the uasyncio test failures on Unix
---
 extmod/moduasyncio.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index c4c4d36ad8..19d9f2aef0 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -70,24 +70,13 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
 /******************************************************************************/
 // Ticks for task ordering in pairing heap
 
-#if !CIRCUITPY || (defined(__unix__) || defined(__APPLE__))
-STATIC mp_obj_t ticks(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
-}
-
-STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
-    mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);
-    mp_uint_t t1 = MP_OBJ_SMALL_INT_VALUE(t1_in);
-    mp_int_t diff = ((t1 - t0 + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1))
-        - MICROPY_PY_UTIME_TICKS_PERIOD / 2;
-    return diff;
-}
-#else
 #define _TICKS_PERIOD (1lu << 29)
 #define _TICKS_MAX (_TICKS_PERIOD - 1)
 #define _TICKS_HALFPERIOD (_TICKS_PERIOD >> 1)
 
-#define ticks() supervisor_ticks_ms()
+STATIC mp_obj_t ticks(void) {
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & _TICKS_MAX);
+}
 
 STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);
@@ -95,7 +84,6 @@ STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     mp_int_t diff = ((t1 - t0 + _TICKS_HALFPERIOD) & _TICKS_MAX) - _TICKS_HALFPERIOD;
     return diff;
 }
-#endif
 
 STATIC int task_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
     mp_obj_task_t *t1 = (mp_obj_task_t *)n1;

From d4b1d4d430e0c62ab316fa8ef8e710bedfbf55ef Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 15 Oct 2022 13:10:22 -0500
Subject: [PATCH 1211/2403] Fix GPIO state when initializing CYW43 pin

Closes: #7063
---
 ports/raspberrypi/common-hal/digitalio/DigitalInOut.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index bbb521ffc5..1490771661 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -50,6 +50,12 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     self->output = false;
     self->open_drain = false;
 
+    #if CIRCUITPY_CYW43
+    if (IS_CYW(self)) {
+        return DIGITALINOUT_OK;
+    }
+    #endif
+
     // Set to input. No output value.
     gpio_init(pin->number);
     return DIGITALINOUT_OK;

From 55169e0b4db968c037fdd2ef6a359fa3a485a7dd Mon Sep 17 00:00:00 2001
From: Jim Mussared 
Date: Tue, 19 Jul 2022 23:18:22 +1000
Subject: [PATCH 1212/2403] extmod/uasyncio/task.py: Fix crash when non-awaited
 task is awaited.

A task that has been sent to the loop's exception handler due to being
re-scheduled twice will then subsequently cause a `raise None` if it is
subsequently awaited. In the C version of task.py, this causes a segfault.

This makes the await succeed (via raising StopIteration instead).

Signed-off-by: Jim Mussared 
---
 extmod/moduasyncio.c                        |  9 ++++-
 extmod/uasyncio/task.py                     |  8 +++-
 tests/extmod/uasyncio_task_exception.py     | 42 +++++++++++++++++++++
 tests/extmod/uasyncio_task_exception.py.exp |  6 +++
 4 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 tests/extmod/uasyncio_task_exception.py
 create mode 100644 tests/extmod/uasyncio_task_exception.py.exp

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 19d9f2aef0..c7d1753e2f 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -290,8 +290,13 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     if (TASK_IS_DONE(self)) {
-        // Task finished, raise return value to caller so it can continue.
-        nlr_raise(self->data);
+        if (self->data == mp_const_none) {
+            // Task finished but has already been sent to the loop's exception handler.
+            mp_raise_StopIteration(MP_OBJ_NULL);
+        } else {
+            // Task finished, raise return value to caller so it can continue.
+            nlr_raise(self->data);
+        }
     } 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));
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index cd75a14a09..7a80b25208 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -141,8 +141,12 @@ class Task:
 
     def __next__(self):
         if not self.state:
-            # Task finished, raise return value to caller so it can continue.
-            raise self.data
+            if self.data is None:
+                # Task finished but has already been sent to the loop's exception handler.
+                raise StopIteration
+            else:
+                # Task finished, raise return value to caller so it can continue.
+                raise self.data
         else:
             # Put calling task on waiting queue.
             self.state.push_head(core.cur_task)
diff --git a/tests/extmod/uasyncio_task_exception.py b/tests/extmod/uasyncio_task_exception.py
new file mode 100644
index 0000000000..6bf99dc93c
--- /dev/null
+++ b/tests/extmod/uasyncio_task_exception.py
@@ -0,0 +1,42 @@
+# In MicroPython, a non-awaited task with a pending exception will raise to
+# the loop's exception handler the second time it is scheduled. This is
+# because without reference counting we have no way to know when the task is
+# truly "non awaited" -- i.e. we only know that it wasn't awaited in the time
+# it took to be re-scheduled.
+
+# If the task _is_ subsequently awaited, then the await should succeed without
+# raising.
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+def custom_handler(loop, context):
+    print("exception handler", type(context["exception"]).__name__)
+
+
+async def main():
+    loop = asyncio.get_event_loop()
+    loop.set_exception_handler(custom_handler)
+
+    async def task():
+        print("raise")
+        raise OSError
+
+    print("create")
+    t = asyncio.create_task(task())
+    print("sleep 1")
+    await asyncio.sleep(0)
+    print("sleep 2")
+    await asyncio.sleep(0)
+    print("await")
+    await t  # should not raise.
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_task_exception.py.exp b/tests/extmod/uasyncio_task_exception.py.exp
new file mode 100644
index 0000000000..44dae61e1c
--- /dev/null
+++ b/tests/extmod/uasyncio_task_exception.py.exp
@@ -0,0 +1,6 @@
+create
+sleep 1
+raise
+sleep 2
+exception handler OSError
+await

From e4953a4935b9855f83bcd82955f5cd944e1d0dc2 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Mon, 17 Oct 2022 01:55:36 +0200
Subject: [PATCH 1213/2403] 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             | 18 +++++++++++++++---
 locale/cs.po             | 23 +++++++++++++++++++----
 locale/de_DE.po          | 23 +++++++++++++++++++----
 locale/el.po             | 18 +++++++++++++++---
 locale/en_GB.po          | 23 +++++++++++++++++++----
 locale/es.po             | 23 +++++++++++++++++++----
 locale/fil.po            | 18 +++++++++++++++---
 locale/fr.po             | 23 +++++++++++++++++++----
 locale/hi.po             | 18 +++++++++++++++---
 locale/it_IT.po          | 18 +++++++++++++++---
 locale/ja.po             | 18 +++++++++++++++---
 locale/ko.po             | 18 +++++++++++++++---
 locale/nl.po             | 23 +++++++++++++++++++----
 locale/pl.po             | 18 +++++++++++++++---
 locale/pt_BR.po          | 23 +++++++++++++++++++----
 locale/ru.po             | 23 +++++++++++++++++++----
 locale/sv.po             | 23 +++++++++++++++++++----
 locale/tr.po             | 18 +++++++++++++++---
 locale/zh_Latn_pinyin.po | 23 +++++++++++++++++++----
 19 files changed, 325 insertions(+), 67 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 2dae1a04b4..ac2d087737 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -123,6 +123,10 @@ msgstr "indeks %q harus bilangan bulat, bukan %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -217,7 +221,7 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1014,7 +1018,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4183,7 +4195,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr "argumen keyword tidak diharapkan"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "keyword argumen '%q' tidak diharapkan"
 
diff --git a/locale/cs.po b/locale/cs.po
index 9bb05d77d0..0767c23c1c 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -124,6 +124,10 @@ msgstr "Indexy %q musí být celá čísla, nikoli %s"
 msgid "%q init failed"
 msgstr "Inicializace %q selhala"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "Délka %q musí být %d"
@@ -218,7 +222,7 @@ msgstr "%q() vyžaduje %d pozičních argumentů, ale %d jich bylo zadáno"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, a %q musí mít všechny shodnou délku"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1012,8 +1016,16 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Obraz firmwaru je nevalidní"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4169,7 +4181,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
@@ -4361,6 +4373,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Firmware image is invalid"
+#~ msgstr "Obraz firmwaru je nevalidní"
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q musí být >= 0"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index ae3ec505fb..eb3a0887d0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -125,6 +125,10 @@ msgstr "%q Indizes müssen Integer sein, nicht %s"
 msgid "%q init failed"
 msgstr "%q Initialisierung ist gescheitert"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "%q länge muss %d betragen"
@@ -220,7 +224,7 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1020,8 +1024,16 @@ msgid "Filters too complex"
 msgstr "Filter zu komplex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Firmware Image ist ungültig"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4250,7 +4262,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr "unerwartetes Schlüsselwort-Argument"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "unerwartetes Schlüsselwort-Argument '%q'"
 
@@ -4442,6 +4454,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Firmware image is invalid"
+#~ msgstr "Firmware Image ist ungültig"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Stream fehlt readinto() oder write() Methode."
 
diff --git a/locale/el.po b/locale/el.po
index d2ce8ed68d..45f112662e 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -129,6 +129,10 @@ msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι
 msgid "%q init failed"
 msgstr "%q εκκίνηση απέτυχε"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "%q μήκος πρέπει να είναι %d"
@@ -223,7 +227,7 @@ msgstr "%q() παίρνει %d ορίσματα θέσεως αλλά %d δόθ
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, και %q πρέπει να είναι όλα του ιδίου μήκους"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1026,7 +1030,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4178,7 +4190,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index da587c2653..f1e82d06fb 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -127,6 +127,10 @@ msgstr "%q indices must be integers, not %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -221,7 +225,7 @@ msgstr "%q() takes %d positional arguments but %d were given"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, and %q must all be the same length"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1015,8 +1019,16 @@ msgid "Filters too complex"
 msgstr "Filters too complex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4188,7 +4200,7 @@ msgstr "unexpected indent"
 msgid "unexpected keyword argument"
 msgstr "unexpected keyword argument"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "unexpected keyword argument '%q'"
 
@@ -4380,6 +4392,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 "Firmware image is invalid"
+#~ msgstr "Firmware image is invalid"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Stream missing readinto() or write() method."
 
diff --git a/locale/es.po b/locale/es.po
index 2397b2947e..26f45e3b2d 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -129,6 +129,10 @@ msgstr "%q indices deben ser enteros, no %s"
 msgid "%q init failed"
 msgstr "%q inicializado fallido"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "%q tamaño debe ser %d"
@@ -223,7 +227,7 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1025,8 +1029,16 @@ msgid "Filters too complex"
 msgstr "Filtros muy complejos"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "La imagen de firmware es inválida"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4236,7 +4248,7 @@ msgstr "sangría inesperada"
 msgid "unexpected keyword argument"
 msgstr "argumento por palabra clave inesperado"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "argumento por palabra clave inesperado '%q'"
 
@@ -4428,6 +4440,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 "Firmware image is invalid"
+#~ msgstr "La imagen de firmware es inválida"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "A Stream le falta el método readinto() o write()."
 
diff --git a/locale/fil.po b/locale/fil.po
index 49f5eaef2c..a0589ae969 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -118,6 +118,10 @@ msgstr "%q indeks ay dapat integers, hindi %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -213,7 +217,7 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1011,7 +1015,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4188,7 +4200,7 @@ msgstr "hindi inaasahang indent"
 msgid "unexpected keyword argument"
 msgstr "hindi inaasahang argumento ng keyword"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "hindi inaasahang argumento ng keyword na '%q'"
 
diff --git a/locale/fr.po b/locale/fr.po
index 40bc8ec33b..431d3fe19c 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -129,6 +129,10 @@ msgstr "les indices %q doivent être des entiers, pas %s"
 msgid "%q init failed"
 msgstr "échec de l'initialisation %q"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "La longeur de %q doit être %d"
@@ -223,7 +227,7 @@ msgstr "%q() prend %d paramètres positionnels mais %d ont été donnés"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, et %q doivent tous être de la même longueur"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1036,8 +1040,16 @@ msgid "Filters too complex"
 msgstr "Filtres trop complexe"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Image du microprogramme est invalide"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4278,7 +4290,7 @@ msgstr "indentation inattendue"
 msgid "unexpected keyword argument"
 msgstr "paramètre nommé inattendu"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "paramètre nommé '%q' inattendu"
 
@@ -4470,6 +4482,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 "Firmware image is invalid"
+#~ msgstr "Image du microprogramme est invalide"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Il manque une méthode readinto() ou write() au flux."
 
diff --git a/locale/hi.po b/locale/hi.po
index 82915d1a7a..df00d53ca4 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -117,6 +117,10 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -211,7 +215,7 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1001,7 +1005,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4151,7 +4163,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index acb4273138..d39cacf542 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -124,6 +124,10 @@ msgstr "gli indici %q devono essere interi, non %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -218,7 +222,7 @@ msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1016,7 +1020,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4201,7 +4213,7 @@ msgstr "indentazione inaspettata"
 msgid "unexpected keyword argument"
 msgstr "argomento nominato inaspettato"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "argomento nominato '%q' inaspettato"
 
diff --git a/locale/ja.po b/locale/ja.po
index 2db88128a2..b25175eeb9 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -122,6 +122,10 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -216,7 +220,7 @@ msgstr "%q() は %d 個の位置引数を取りますが、%d 個与えられま
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1010,7 +1014,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4172,7 +4184,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "キーワード引数'%q'は使えません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 2a99cf8cd4..387a529fd2 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -118,6 +118,10 @@ msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -212,7 +216,7 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1004,7 +1008,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4155,7 +4167,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 4baa1d28bc..3a5cf970d2 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -120,6 +120,10 @@ msgstr "%q indexen moeten integers zijn, niet %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -214,7 +218,7 @@ msgstr "%q() verwacht %d positionele argumenten maar kreeg %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1009,8 +1013,16 @@ msgid "Filters too complex"
 msgstr "Filters zijn te complex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Firmware image is ongeldig"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4188,7 +4200,7 @@ msgstr "onverwachte inspringing"
 msgid "unexpected keyword argument"
 msgstr "onverwacht trefwoordargument"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "onverwacht trefwoordargument '%q'"
 
@@ -4380,6 +4392,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 "Firmware image is invalid"
+#~ msgstr "Firmware image is ongeldig"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Stream mist readinto() of write() methode."
 
diff --git a/locale/pl.po b/locale/pl.po
index 23c42ffe92..7e2b581d91 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -122,6 +122,10 @@ msgstr "%q indeks musi być liczbą całkowitą, a nie %s"
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -216,7 +220,7 @@ msgstr "%q() bierze %d argumentów pozycyjnych, lecz podano %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1010,7 +1014,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4164,7 +4176,7 @@ msgstr "złe wcięcie"
 msgid "unexpected keyword argument"
 msgstr "zły argument nazwany"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "zły argument nazwany '%q'"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d084df863e..f987a560d9 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -126,6 +126,10 @@ msgstr "Os índices %q devem ser inteiros, e não %s"
 msgid "%q init failed"
 msgstr "a inicialização do %q falhou"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "O comprimento de %q deve ser %d"
@@ -220,7 +224,7 @@ msgstr "%q() recebe %d argumentos posicionais, porém %d foram informados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1028,8 +1032,16 @@ msgid "Filters too complex"
 msgstr "Os filtros são muito complexos"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "A imagem do firmware é invalida"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4256,7 +4268,7 @@ msgstr "recuo inesperado"
 msgid "unexpected keyword argument"
 msgstr "argumento inesperado da palavra-chave"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "argumento inesperado da palavra-chave '%q'"
 
@@ -4448,6 +4460,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 "Firmware image is invalid"
+#~ msgstr "A imagem do firmware é invalida"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Transmita o método ausente readinto() ou write()."
 
diff --git a/locale/ru.po b/locale/ru.po
index 93fcc2ba0b..6b8c286f2f 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -125,6 +125,10 @@ msgstr "Индексы %q должны быть целыми числами, а
 msgid "%q init failed"
 msgstr ""
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr ""
@@ -219,7 +223,7 @@ msgstr "%q() принимает %d позиционных аргументов,
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, и %q должны быть одной длинны"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr ""
 
@@ -1026,8 +1030,16 @@ msgid "Filters too complex"
 msgstr "Фильтры слишком сложные"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Образ прошивки неправильный"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4200,7 +4212,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
@@ -4392,6 +4404,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "Firmware image is invalid"
+#~ msgstr "Образ прошивки неправильный"
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q должен быть >= 0"
 
diff --git a/locale/sv.po b/locale/sv.po
index bd9de4eba4..3ffabf3c15 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -125,6 +125,10 @@ msgstr "Indexet %q måste vara ett heltal, inte %s"
 msgid "%q init failed"
 msgstr "%q init misslyckades"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "längden på %q måste vara %d"
@@ -221,7 +225,7 @@ msgstr "% q() tar %d positionsargument men %d gavs"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q och %q måste vara lika långa"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1017,8 +1021,16 @@ msgid "Filters too complex"
 msgstr "Filter för komplexa"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "Firmware-avbilden är ogiltig"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4217,7 +4229,7 @@ msgstr "oväntat indrag"
 msgid "unexpected keyword argument"
 msgstr "oväntat nyckelordsargument"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "oväntat nyckelordsargument '%q'"
 
@@ -4409,6 +4421,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 "Firmware image is invalid"
+#~ msgstr "Firmware-avbilden är ogiltig"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Stream saknar readinto() eller write() metod."
 
diff --git a/locale/tr.po b/locale/tr.po
index 6380448b11..a0bf2ed3c0 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -129,6 +129,10 @@ msgstr "%q indeksleri integer olmalı, %s değil"
 msgid "%q init failed"
 msgstr "%q init başarısız oldu"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "%q boyutu %d olmalıdır"
@@ -223,7 +227,7 @@ msgstr "%q(), %d konumsal argümanını alır ancak %d verildi"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1018,7 +1022,15 @@ msgid "Filters too complex"
 msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
 msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
@@ -4171,7 +4183,7 @@ msgstr ""
 msgid "unexpected keyword argument"
 msgstr ""
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index c99d3a9625..270ffe86d8 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -128,6 +128,10 @@ msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
 msgid "%q init failed"
 msgstr "%q chūshǐhuà shībài"
 
+#: shared-bindings/dualbank/__init__.c
+msgid "%q is %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q length must be %d"
 msgstr "%q de chángdù bìxū shì %d"
@@ -222,7 +226,7 @@ msgstr "%q() yāoqiú shūrù %d gè wèizhì cānshù, dàn mùqián shūrù le
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 
-#: py/objint.c
+#: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
 msgstr "%q=%q"
 
@@ -1018,8 +1022,16 @@ msgid "Filters too complex"
 msgstr "guò lǜ qì tài fù zá"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
-msgid "Firmware image is invalid"
-msgstr "gù jiàn yìng xiàng wú xiào"
+msgid "Firmware is duplicate"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is invalid"
+msgstr ""
+
+#: ports/espressif/common-hal/dualbank/__init__.c
+msgid "Firmware is too big"
+msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -4219,7 +4231,7 @@ msgstr "wèi yùliào de suō jìn"
 msgid "unexpected keyword argument"
 msgstr "yìwài de guānjiàn cí cānshù"
 
-#: py/bc.c py/objnamedtuple.c
+#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
 msgid "unexpected keyword argument '%q'"
 msgstr "yìwài de guānjiàn cí cānshù '%q'"
 
@@ -4411,6 +4423,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 "Firmware image is invalid"
+#~ msgstr "gù jiàn yìng xiàng wú xiào"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Liú quēshǎo readinto() huò write() fāngfǎ."
 

From f86377e0f1024cd4bf1a17fffc9d67e9d9d83ab9 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:42:41 +0530
Subject: [PATCH 1214/2403] fix `4MB-no-uf2` partition table

---
 ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
index 90bf05ce39..6dc2dcf2e9 100644
--- a/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
+++ b/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
@@ -3,5 +3,7 @@
 # bootloader.bin,,          0x1000, 32K
 # partition table,,         0x8000, 4K
 nvs,      data, nvs,      0x9000,  20K,
-app,      app,  factory, 0x10000,  2048K,
-user_fs,  data, fat,    0x210000,  1984K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+user_fs,  data, fat,    0x2d0000,  1216K,

From 5114ae7a31fd736d99cc8340466ad67b457667fc Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:44:08 +0530
Subject: [PATCH 1215/2403] fix `2MB-no-uf2` partition table

---
 ports/espressif/Makefile                                      | 4 ++++
 .../espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk | 2 ++
 ...itions-2MB-no-uf2.csv => partitions-2MB-no-ota-no-uf2.csv} | 0
 ...B-no-uf2.defaults => sdkconfig-2MB-no-ota-no-uf2.defaults} | 4 ++--
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename ports/espressif/esp-idf-config/{partitions-2MB-no-uf2.csv => partitions-2MB-no-ota-no-uf2.csv} (100%)
 rename ports/espressif/esp-idf-config/{sdkconfig-2MB-no-uf2.defaults => sdkconfig-2MB-no-ota-no-uf2.defaults} (92%)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 57462642ba..48a7c49759 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -336,12 +336,16 @@ $(BUILD)/esp-idf:
 
 TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 
+ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
+	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
+else
 UF2_BOOTLOADER ?= $(if $(filter $(IDF_TARGET),esp32s2 esp32s3),1)
 ifeq ($(UF2_BOOTLOADER), 1)
 	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else
 	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
 endif
+endif
 
 ifeq ($(DEBUG), 1)
 	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
index 3cec6831bc..054810a088 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -6,3 +6,5 @@ IDF_TARGET = esp32c3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 2MB
+
+CIRCUITPY_DUALBANK = 0
diff --git a/ports/espressif/esp-idf-config/partitions-2MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv
similarity index 100%
rename from ports/espressif/esp-idf-config/partitions-2MB-no-uf2.csv
rename to ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv
diff --git a/ports/espressif/esp-idf-config/sdkconfig-2MB-no-uf2.defaults b/ports/espressif/esp-idf-config/sdkconfig-2MB-no-ota-no-uf2.defaults
similarity index 92%
rename from ports/espressif/esp-idf-config/sdkconfig-2MB-no-uf2.defaults
rename to ports/espressif/esp-idf-config/sdkconfig-2MB-no-ota-no-uf2.defaults
index 7c4c4baddd..2d0b2ac5eb 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-2MB-no-uf2.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-2MB-no-ota-no-uf2.defaults
@@ -10,9 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 # end of Serial flasher config
 
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-2MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-2MB-no-ota-no-uf2.csv"
 #
 # Partition Table
 #
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-2MB-no-uf2.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-2MB-no-ota-no-uf2.csv"
 # end of Partition Table

From 434c6d56048a3a82012e0f75221db8205e772820 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:45:48 +0530
Subject: [PATCH 1216/2403] fix uf2 bootloader condition in makefile

---
 ports/espressif/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 48a7c49759..82d068f136 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -339,7 +339,7 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
 	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else
-UF2_BOOTLOADER ?= $(if $(filter $(IDF_TARGET),esp32s2 esp32s3),1)
+UF2_BOOTLOADER ?= $(CIRCUITPY_USB)
 ifeq ($(UF2_BOOTLOADER), 1)
 	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else

From 07dda44b20db65d5ed8049eda610030ee4ec34c2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 09:56:58 -0500
Subject: [PATCH 1217/2403] remove hashlib, zlib from micropython modules index

.. these have been converted to shared-bindings style
and have their own documentation now that better matches our
implementation.

Closes: #7034
---
 docs/library/hashlib.rst | 60 ----------------------------------------
 docs/library/index.rst   |  4 +--
 docs/library/zlib.rst    | 42 ----------------------------
 3 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 docs/library/hashlib.rst
 delete mode 100644 docs/library/zlib.rst

diff --git a/docs/library/hashlib.rst b/docs/library/hashlib.rst
deleted file mode 100644
index 061f9fd1e0..0000000000
--- a/docs/library/hashlib.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-:mod:`hashlib` -- hashing algorithms
-=====================================
-
-.. include:: ../templates/unsupported_in_circuitpython.inc
-
-.. module:: hashlib
-   :synopsis: hashing algorithms
-   :noindex:
-
-|see_cpython_module| :mod:`cpython:hashlib`.
-
-This module implements binary data hashing algorithms. The exact inventory
-of available algorithms depends on a board. Among the algorithms which may
-be implemented:
-
-* SHA256 - The current generation, modern hashing algorithm (of SHA2 series).
-  It is suitable for cryptographically-secure purposes. Included in the
-  MicroPython core and any board is recommended to provide this, unless
-  it has particular code size constraints.
-
-* SHA1 - A previous generation algorithm. Not recommended for new usages,
-  but SHA1 is a part of number of Internet standards and existing
-  applications, so boards targeting network connectivity and
-  interoperability will try to provide this.
-
-* MD5 - A legacy algorithm, not considered cryptographically secure. Only
-  selected boards, targeting interoperability with legacy applications,
-  will offer this.
-
-Constructors
-------------
-
-.. class:: hashlib.sha256([data])
-
-    Create an SHA256 hasher object and optionally feed ``data`` into it.
-
-.. class:: hashlib.sha1([data])
-
-    Create an SHA1 hasher object and optionally feed ``data`` into it.
-
-.. class:: hashlib.md5([data])
-
-    Create an MD5 hasher object and optionally feed ``data`` into it.
-
-Methods
--------
-
-.. method:: hash.update(data)
-
-   Feed more binary data into hash.
-
-.. method:: hash.digest()
-
-   Return hash for all data passed through hash, as a bytes object. After this
-   method is called, more data cannot be fed into the hash any longer.
-
-.. method:: hash.hexdigest()
-
-   This method is NOT implemented. Use ``binascii.hexlify(hash.digest())``
-   to achieve a similar effect.
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 5d8dd3118f..b71949c2dd 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -19,7 +19,7 @@ limited flash memory, usually on non-Express builds:
 ``binascii``, ``errno``, ``json``, ``re``.
 
 These libraries are not currently enabled in any CircuitPython build, but may be in the future:
-``ctypes``, ``hashlib``, ``zlib``.
+``ctypes``
 
 .. toctree::
    :maxdepth: 1
@@ -31,7 +31,6 @@ These libraries are not currently enabled in any CircuitPython build, but may be
    collections.rst
    errno.rst
    gc.rst
-   hashlib.rst
    io.rst
    json.rst
    re.rst
@@ -39,7 +38,6 @@ These libraries are not currently enabled in any CircuitPython build, but may be
    asyncio.rst
    ctypes.rst
    select.rst
-   zlib.rst
 
 Omitted functions in the ``string`` library
 -------------------------------------------
diff --git a/docs/library/zlib.rst b/docs/library/zlib.rst
deleted file mode 100644
index 514b787bc4..0000000000
--- a/docs/library/zlib.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-:mod:`zlib` -- zlib decompression
-=================================
-
-.. include:: ../templates/unsupported_in_circuitpython.inc
-
-.. module:: zlib
-   :synopsis: zlib decompression
-   :noindex:
-
-|see_cpython_module| :mod:`cpython:zlib`.
-
-This module allows to decompress binary data compressed with
-`DEFLATE algorithm `_
-(commonly used in zlib library and gzip archiver). Compression
-is not yet implemented.
-
-Functions
----------
-
-.. function:: decompress(data, wbits=0, bufsize=0, /)
-
-   Return decompressed *data* as bytes. *wbits* is DEFLATE dictionary window
-   size used during compression (8-15, the dictionary size is power of 2 of
-   that value). Additionally, if value is positive, *data* is assumed to be
-   zlib stream (with zlib header). Otherwise, if it's negative, it's assumed
-   to be raw DEFLATE stream. *bufsize* parameter is for compatibility with
-   CPython and is ignored.
-
-.. class:: DecompIO(stream, wbits=0, /)
-   :noindex:
-
-   Create a ``stream`` wrapper which allows transparent decompression of
-   compressed data in another *stream*. This allows to process compressed
-   streams with data larger than available heap size. In addition to
-   values described in :func:`decompress`, *wbits* may take values
-   24..31 (16 + 8..15), meaning that input stream has gzip header.
-
-   .. admonition:: Difference to CPython
-      :class: attention
-
-      This class is MicroPython extension. It's included on provisional
-      basis and may be changed considerably or removed in later versions.

From 47541afc7c5d973c6b0fdc7a8152266ac3b82588 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 10:08:50 -0500
Subject: [PATCH 1218/2403] picow: ask at a lower level if the interface is up

Closes: #7072

```
Adafruit CircuitPython 8.0.0-beta.2-9-g5192082e64-dirty on 2022-10-17; Raspberry Pi Pico W with rp2040
>>> import wifi
>>> print(wifi.radio.ipv4_address)
None
>>> import os
>>> wifi.radio.connect(os.getenv('WIFI_SSID'), os.getenv('WIFI_PASSWORD'))
>>> print(wifi.radio.ipv4_address)
10.0.2.94
```
---
 ports/raspberrypi/common-hal/wifi/Radio.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index a0654414de..98116d8f9a 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -202,42 +202,42 @@ mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_STA)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_STA->gw.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway_ap(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_AP)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_AP->gw.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_STA)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_STA->netmask.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_AP)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_AP->netmask.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_STA)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_STA->ip_addr.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self) {
-    if (!netif_is_up(NETIF_AP)) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_UP) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(NETIF_AP->ip_addr.addr);
@@ -245,7 +245,7 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self) {
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) {
     uint32_t addr = dns_getserver(0)->addr;
-    if (!netif_is_up(NETIF_STA) || addr == 0) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP || addr == 0) {
         return mp_const_none;
     }
     return common_hal_ipaddress_new_ipv4address(addr);

From bce024f59e5d73eeb743c1fe8114eaf8785a65b6 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 17 Oct 2022 18:17:14 +0300
Subject: [PATCH 1219/2403] Implement async wifi connection on picow

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 56 +++++++++++++++++------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index a0654414de..33a6bd80c3 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -173,24 +173,50 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
-    unsigned timeout_ms = timeout <= 0 ? 8000 : (unsigned)MAX(0, MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000));
-    // TODO use connect_async so we can service bg tasks & check for ctrl-c during
+
+    size_t timeout_ms = timeout <= 0 ? 8000 : (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
+    uint64_t start = port_get_raw_ticks(NULL);
+    uint64_t deadline = start + timeout_ms;
+
     // connect
-    int result = cyw43_arch_wifi_connect_timeout_ms((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK, timeout_ms);
-    bindings_cyw43_wifi_enforce_pm();
+    cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
+
+    while (port_get_raw_ticks(NULL) < deadline) {
+        RUN_BACKGROUND_TASKS;
+        if (mp_hal_is_interrupted()) {
+            break;
+        }
+
+        int result = cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA);
+
+        // While the async connection is running, it will return CYW43_LINK_JOIN.
+
+        int done = 0;
+        switch (result) {
+            case CYW43_LINK_UP:
+                done = 1;
+                break;
+            case (unsigned int)CYW43_LINK_FAIL:
+                return WIFI_RADIO_ERROR_CONNECTION_FAIL;
+            case (unsigned int)CYW43_LINK_NONET:
+                return WIFI_RADIO_ERROR_NO_AP_FOUND;
+            case (unsigned int)CYW43_LINK_BADAUTH:
+                return WIFI_RADIO_ERROR_AUTH_FAIL;
+        }
+
+        if (done == 1) {
+            break;
+        }
+    }
+
+    // Being here means we either timed out or got interrupted.
+    int result = cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA);
     switch (result) {
-        case 0:
+        case CYW43_LINK_UP:
+        case CYW43_LINK_JOIN:
+            // If CYW43_LINK_JOIN wasn't here, it wouldn't work even though we have ip.
+            bindings_cyw43_wifi_enforce_pm();
             return WIFI_RADIO_ERROR_NONE;
-        // case CYW43_LINK_DOWN:
-        // case CYW43_LINK_JOIN:
-        // case CYW43_LINK_NOIP:
-        // case CYW43_LINK_UP:
-        case CYW43_LINK_FAIL:
-            return WIFI_RADIO_ERROR_CONNECTION_FAIL;
-        case CYW43_LINK_NONET:
-            return WIFI_RADIO_ERROR_NO_AP_FOUND;
-        case CYW43_LINK_BADAUTH:
-            return WIFI_RADIO_ERROR_AUTH_FAIL;
 
         default:
             return WIFI_RADIO_ERROR_UNSPECIFIED;

From 47c373e67ea9e70b2e319a0bd63cb69cd7424dd4 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 17 Oct 2022 18:33:32 +0300
Subject: [PATCH 1220/2403] Use `cyw43_tcpip_link_status` instead

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 31 +++++------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 33a6bd80c3..8c0107c0d6 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -187,40 +187,23 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
             break;
         }
 
-        int result = cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA);
+        int result = cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA);
 
-        // While the async connection is running, it will return CYW43_LINK_JOIN.
-
-        int done = 0;
         switch (result) {
             case CYW43_LINK_UP:
-                done = 1;
-                break;
-            case (unsigned int)CYW43_LINK_FAIL:
+                bindings_cyw43_wifi_enforce_pm();
+                return WIFI_RADIO_ERROR_NONE;
+            case CYW43_LINK_FAIL:
                 return WIFI_RADIO_ERROR_CONNECTION_FAIL;
-            case (unsigned int)CYW43_LINK_NONET:
+            case CYW43_LINK_NONET:
                 return WIFI_RADIO_ERROR_NO_AP_FOUND;
-            case (unsigned int)CYW43_LINK_BADAUTH:
+            case CYW43_LINK_BADAUTH:
                 return WIFI_RADIO_ERROR_AUTH_FAIL;
         }
-
-        if (done == 1) {
-            break;
-        }
     }
 
     // Being here means we either timed out or got interrupted.
-    int result = cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA);
-    switch (result) {
-        case CYW43_LINK_UP:
-        case CYW43_LINK_JOIN:
-            // If CYW43_LINK_JOIN wasn't here, it wouldn't work even though we have ip.
-            bindings_cyw43_wifi_enforce_pm();
-            return WIFI_RADIO_ERROR_NONE;
-
-        default:
-            return WIFI_RADIO_ERROR_UNSPECIFIED;
-    }
+    return WIFI_RADIO_ERROR_UNSPECIFIED;
 }
 
 mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {

From fb91c2f436adb3187e4745d763d36be34a4c20ea Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Mon, 17 Oct 2022 22:03:06 +0530
Subject: [PATCH 1221/2403] cleanup `sdkconfig-esp32.defaults`

- remove log level: set by -opt or -debug sdkconfig
- remove lwip hostname: set by board specific sdkconfig
---
 .../esp-idf-config/sdkconfig-esp32.defaults   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 57700c65ca..483e0f9b87 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -598,29 +598,10 @@ CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
 # end of Heap memory debugging
 
-#
-# Log output
-#
-# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
-# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
-# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
-# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
-# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
-CONFIG_LOG_DEFAULT_LEVEL=3
-CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
-# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
-# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
-CONFIG_LOG_MAXIMUM_LEVEL=3
-CONFIG_LOG_COLORS=y
-CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
-# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
-# end of Log output
 
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-Feather-ESP32-V2"
 # CONFIG_LWIP_NETIF_API is not set
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y

From 6128f4e5afbfd2e85d35f381644269ee1350ec25 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 17:23:05 -0500
Subject: [PATCH 1222/2403] picow: add resolution of ".local" names

---
 ports/raspberrypi/lwip_inc/lwipopts.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index ac4dd1564b..09676f8d20 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -47,6 +47,7 @@
 #define LWIP_TCP                    1
 #define LWIP_UDP                    1
 #define LWIP_DNS                    1
+#define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
 #define LWIP_TCP_KEEPALIVE          1
 #define LWIP_NETIF_TX_SINGLE_PBUF   1
 #define DHCP_DOES_ARP_CHECK         0

From 1975742d9fd041d92eff0d077adbc3f1fc57a95d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 17:23:24 -0500
Subject: [PATCH 1223/2403] picow: fix formatting numbers in lwip debug output

---
 ports/raspberrypi/lwip_inc/lwipopts.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 09676f8d20..936a141602 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -92,4 +92,13 @@
 
 #define LWIP_NO_CTYPE_H 1
 
+#define X8_F  "02x"
+#define U16_F "u"
+#define U32_F "lu"
+#define S32_F "ld"
+#define X32_F "lx"
+
+#define S16_F "d"
+#define X16_F "x"
+#define SZT_F "u"
 #endif /* __LWIPOPTS_H__ */

From 861b22730e4506a87a0673eb9aa84134b0e30641 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 17:25:40 -0500
Subject: [PATCH 1224/2403] picow: if initial write fails, write at most 1 TCP
 MSS of data

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 37c37445de..1c1c95caf2 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -504,6 +504,11 @@ STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf,
         if (err != ERR_MEM) {
             break;
         }
+        if (err == ERR_MEM && write_len > TCP_MSS) {
+            // Try writing just one MSS worth of data
+            write_len = TCP_MSS;
+            continue;
+        }
         err = tcp_output(socket->pcb.tcp);
         if (err != ERR_OK) {
             break;

From 57756863ef3aee594744bee390ce21c1dee40b02 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 19:09:28 -0500
Subject: [PATCH 1225/2403] picow: depending on memory pressure, may only be
 able to write 1 MSS

Foamyguy discovered that trying to send >2920 bytes at once consistently
failed. I further discovered that sometimes trying to send >1460 bytes
would fail too.  By "fail", I mean that it would take a very long time
(around 200 * 50ms) before erroneously reporting that all bytes were
written.

In my testing, this change causes larger writes to successfully
send either 2920 or 1460 bytes (possibly after doing some 50ms waits
for a previous packet to clear).

The documentation of socket.send always stated that it COULD send fewer
bytes than requested, but adafruit_httpserver assumed that the number
of requested bytes were always sent, so after this change alone,
adafruit_httpserver will still not work properly.

Closes: #7077 (albeit fixes are needed in adafruit_httpserver too)
---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 1c1c95caf2..71a31379ad 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -505,8 +505,8 @@ STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf,
             break;
         }
         if (err == ERR_MEM && write_len > TCP_MSS) {
-            // Try writing just one MSS worth of data
-            write_len = TCP_MSS;
+            // Decreasing the amount sent to the next lower number of MSS
+            write_len = (write_len - 1) / TCP_MSS * TCP_MSS;
             continue;
         }
         err = tcp_output(socket->pcb.tcp);

From 508c80da8d5429678a613f5b8452684ec2505d50 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 19:11:21 -0500
Subject: [PATCH 1226/2403] socketpool: add sendall

The standard Python 'fix' for 'send()' returning prematurely is to
use the 'sendall()' method instead. However, this method was not
available.  adafruit_httpserver will probably need to code a version
of it for older versions or for Airlift, but when it's available
this code works (Tested on picow sending 8192 bytes) and may be more
efficient.

(implementing 'sendall' in python should take care to slice a memoryview
rather than the original buffer)
---
 shared-bindings/socketpool/Socket.c | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 7f0d870771..e154502707 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -255,6 +255,39 @@ STATIC mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_send);
 
+//|     def sendall(self, bytes: ReadableBuffer) -> None:
+//|         """Send some bytes to the connected remote address.
+//|         Suits sockets of type SOCK_STREAM
+//|
+//|         This calls send() repeatedly until all the data is sent or an error
+//|         occurs. If an error occurs, it's impossible to tell how much data
+//|         has been sent.
+//|
+//|         :param ~bytes bytes: some bytes to send"""
+//|         ...
+STATIC mp_obj_t _socketpool_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
+    socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (common_hal_socketpool_socket_get_closed(self)) {
+        // Bad file number.
+        mp_raise_OSError(MP_EBADF);
+    }
+    if (!common_hal_socketpool_socket_get_connected(self)) {
+        mp_raise_BrokenPipeError();
+    }
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
+    while (bufinfo.len > 0) {
+        mp_int_t ret = common_hal_socketpool_socket_send(self, bufinfo.buf, bufinfo.len);
+        if (ret == -1) {
+            mp_raise_BrokenPipeError();
+        }
+        bufinfo.len -= ret;
+        bufinfo.buf += ret;
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_sendall_obj, _socketpool_socket_sendall);
+
 //|     def sendto(self, bytes: ReadableBuffer, address: Tuple[str, int]) -> int:
 //|         """Send some bytes to a specific address.
 //|         Suits sockets of type SOCK_DGRAM
@@ -372,6 +405,7 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_recvfrom_into), MP_ROM_PTR(&socketpool_socket_recvfrom_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv_into), MP_ROM_PTR(&socketpool_socket_recv_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socketpool_socket_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendall), MP_ROM_PTR(&socketpool_socket_sendall_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socketpool_socket_setblocking_obj) },
     // { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socketpool_socket_setsockopt_obj) },

From 3b7feccd9b6f74d3cae583213e08fdf120cefbd3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 19:14:20 -0500
Subject: [PATCH 1227/2403] picow: Implement stop_station

Weirdly we have to stop the AP too (which we never started),
or cyw43_tcpip_link_status still reports that STA is connected.
As long as AP mode isn't implemented, this doesn't matter and
we can just do it.
---
 ports/raspberrypi/common-hal/wifi/Radio.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 98116d8f9a..7a15c7280b 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -158,6 +158,13 @@ void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
+    cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
+    // This is wrong, but without this call the state of ITF_STA is still
+    // reported as CYW43_LINK_JOIN (by wifi_link_status) and CYW43_LINK_UP
+    // (by tcpip_link_status). Until AP support is added, we can ignore the
+    // problem.
+    cyw43_wifi_leave(&cyw43_state, CYW43_ITF_AP);
+    bindings_cyw43_wifi_enforce_pm();
 }
 
 void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {

From 83d351d01abbdaaf2695b2910fd8b109395d4497 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Mon, 17 Oct 2022 10:48:19 +0000
Subject: [PATCH 1228/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index f987a560d9..7eb963ada5 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: 2022-10-13 06:43+0000\n"
+"PO-Revision-Date: 2022-10-18 11:12+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -128,7 +128,7 @@ msgstr "a inicialização do %q falhou"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q é %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
@@ -1033,15 +1033,15 @@ msgstr "Os filtros são muito complexos"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "O firmware está duplicado"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "O firmware é inválido"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "O firmware é muito grande"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"

From e93869ec42f24141846b7cd3c04c1ac1767ccb51 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Mon, 17 Oct 2022 06:51:00 +0000
Subject: [PATCH 1229/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 3ffabf3c15..d2ab21c5d9 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: 2022-10-13 06:43+0000\n"
+"PO-Revision-Date: 2022-10-18 11:12+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -127,7 +127,7 @@ msgstr "%q init misslyckades"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q är %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
@@ -1022,15 +1022,15 @@ msgstr "Filter för komplexa"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Firmware är en dubblett"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Firmware är ogiltig"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Firmware är för stor"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"

From de0dda989d650c85aa5251f55f9efdd1240342bd Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 19 Oct 2022 09:22:32 -0500
Subject: [PATCH 1230/2403] Ensure background tasks are serviced during a
 lengthy sendall

---
 shared-bindings/socketpool/Socket.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index e154502707..89b23125c5 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -37,6 +37,7 @@
 #include "py/mperrno.h"
 
 #include "shared/netutils/netutils.h"
+#include "shared/runtime/interrupt_char.h"
 
 //| class Socket:
 //|     """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
@@ -283,6 +284,13 @@ STATIC mp_obj_t _socketpool_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
         }
         bufinfo.len -= ret;
         bufinfo.buf += ret;
+        if (bufinfo.len > 0) {
+            RUN_BACKGROUND_TASKS;
+            // Allow user to break out of sendall with a KeyboardInterrupt.
+            if (mp_hal_is_interrupted()) {
+                return 0;
+            }
+        }
     }
     return mp_const_none;
 }

From f1b7bcbbecf84824d1991378853d21345b8b02f3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 19 Oct 2022 11:24:33 -0500
Subject: [PATCH 1231/2403] Run 'make update-frozen-modules'

---
 frozen/Adafruit_CircuitPython_Display_Shapes | 2 +-
 frozen/Adafruit_CircuitPython_Display_Text   | 2 +-
 frozen/Adafruit_CircuitPython_RFM69          | 2 +-
 frozen/Adafruit_CircuitPython_SD             | 2 +-
 frozen/Adafruit_CircuitPython_Ticks          | 2 +-
 frozen/Adafruit_CircuitPython_asyncio        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
index 288a4f553d..656be4d791 160000
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit 288a4f553d2f616331b5a042568c97b5bb0e44a7
+Subproject commit 656be4d79196b5f25ab9ebca731d448c5b3bdc17
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index 41f06c33ef..6cf9f3cf32 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit 41f06c33ef7a029210416ac61319698f5768e83e
+Subproject commit 6cf9f3cf32e0c176c861de6356813ea4d08034d6
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
index a815f364ba..96b4a05c8a 160000
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit a815f364badc0dac3fe49e7d8206d00ce95894e1
+Subproject commit 96b4a05c8a225ad7ddc392be7fb69efebe151981
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
index c59df6b8c3..bb2fc8c157 160000
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit c59df6b8c3d8006c290b63e95996e49e8e7124c0
+Subproject commit bb2fc8c157ee44869cde4cbc1ab20e6f31ac727f
diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks
index 5436a0f27f..7832bbb544 160000
--- a/frozen/Adafruit_CircuitPython_Ticks
+++ b/frozen/Adafruit_CircuitPython_Ticks
@@ -1 +1 @@
-Subproject commit 5436a0f27f33b364035ce499c020b274d77a25b7
+Subproject commit 7832bbb5449d55d8c7b731e4ff7490b801e94a9e
diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio
index 3e8c50eb22..fbdb77d712 160000
--- a/frozen/Adafruit_CircuitPython_asyncio
+++ b/frozen/Adafruit_CircuitPython_asyncio
@@ -1 +1 @@
-Subproject commit 3e8c50eb2230de7b8a20dedac33334b5dbdee21e
+Subproject commit fbdb77d7127e7d6a8d3574440b0f790c94a28cf8

From 8bef4282c0d2bdad0be838c41ef429c4fbd6a3fc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 19 Oct 2022 20:54:53 -0500
Subject: [PATCH 1232/2403] pico w: implement static configuration methods in
 wifi.Radio

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 498ec862b2..3e95ae5cd1 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -268,19 +268,30 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dns_addr) {
-    mp_raise_NotImplementedError(NULL);
+    ip4_addr_t addr;
+    ipaddress_ipaddress_to_lwip(ipv4_dns_addr, &addr);
+    dns_setserver(0, &addr);
 }
 
 void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+    dhcp_start(NETIF_STA);
 }
 
 void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+    dhcp_stop(NETIF_STA);
 }
 
 void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) {
-    mp_raise_NotImplementedError(NULL);
+    common_hal_wifi_radio_stop_dhcp_client(self);
+
+    ip4_addr_t ipv4_addr, netmask_addr, gateway_addr;
+    ipaddress_ipaddress_to_lwip(ipv4, &ipv4_addr);
+    ipaddress_ipaddress_to_lwip(netmask, &netmask_addr);
+    ipaddress_ipaddress_to_lwip(gateway, &gateway_addr);
+    netif_set_addr(NETIF_STA, &ipv4_addr, &netmask_addr, &gateway_addr);
+    if (ipv4_dns != MP_OBJ_NULL) {
+        common_hal_wifi_radio_set_ipv4_dns(self, ipv4_dns);
+    }
 }
 
 volatile bool ping_received;

From 576a1ac70066128f5b40f174b5884f416ced34de Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 19 Oct 2022 21:03:28 -0500
Subject: [PATCH 1233/2403] pico w: Disentangle "TOTAL_GPIO_COUNT", it's
 complicated

You might wonder how this fixes a problem with PulseIn, when the
changes aren't to any of those files! PulseIn is implemented in terms of
StateMachine, which had some assumptions about the relation between
the index of a pin object in mcu_pin_global_dict_table and its "pin
number". This was true, until some pins were removed from the
microcontroller module on Pico W.

Closes: #7078
---
 .../common-hal/alarm/pin/PinAlarm.c           |  2 +-
 .../common-hal/microcontroller/Pin.c          | 15 ++++++-------
 .../common-hal/microcontroller/__init__.c     | 12 ++++++++++-
 .../common-hal/microcontroller/__init__.h     |  5 ++---
 .../common-hal/rp2pio/StateMachine.c          | 21 ++++++++++++-------
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
index 53cbfca57b..28ea60d682 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -111,7 +111,7 @@ void alarm_pin_pinalarm_reset(void) {
     }
 
     // Reset pins and pin IRQs
-    for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
+    for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) {
         if (alarm_reserved_pins & (1 << i)) {
             gpio_set_irq_enabled(i, GPIO_IRQ_ALL_EVENTS, false);
             reset_pin_number(i);
diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c
index d1cfcfe2b1..f0a9a7c29c 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Pin.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Pin.c
@@ -46,7 +46,7 @@ void reset_pin_number_cyw(uint8_t pin_no) {
 STATIC uint32_t never_reset_pins;
 
 void reset_all_pins(void) {
-    for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
+    for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) {
         if ((never_reset_pins & (1 << i)) != 0) {
             continue;
         }
@@ -54,16 +54,17 @@ void reset_all_pins(void) {
     }
     #if CIRCUITPY_CYW43
     if (cyw_ever_init) {
-        for (size_t i = 0; i < 1; i++) {
-            cyw43_arch_gpio_put(i, 0);
-        }
+        // reset LED and SMPS_MODE to Low; don't touch VBUS_SENSE
+        // otherwise it is switched to output mode forever!
+        cyw43_arch_gpio_put(0, 0);
+        cyw43_arch_gpio_put(1, 0);
     }
     cyw_pin_claimed = 0;
     #endif
 }
 
 void never_reset_pin_number(uint8_t pin_number) {
-    if (pin_number >= TOTAL_GPIO_COUNT) {
+    if (pin_number >= NUM_BANK0_GPIOS) {
         return;
     }
 
@@ -71,7 +72,7 @@ void never_reset_pin_number(uint8_t pin_number) {
 }
 
 void reset_pin_number(uint8_t pin_number) {
-    if (pin_number >= TOTAL_GPIO_COUNT) {
+    if (pin_number >= NUM_BANK0_GPIOS) {
         return;
     }
 
@@ -110,7 +111,7 @@ void claim_pin(const mcu_pin_obj_t *pin) {
 }
 
 bool pin_number_is_free(uint8_t pin_number) {
-    if (pin_number >= TOTAL_GPIO_COUNT) {
+    if (pin_number >= NUM_BANK0_GPIOS) {
         return false;
     }
 
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index 1ccd14df1d..327799a6e7 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -149,7 +149,7 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = {
 #endif
 
 // This maps MCU pin names to pin objects.
-const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
+const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_GPIO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_GPIO2), MP_ROM_PTR(&pin_GPIO2) },
@@ -193,3 +193,13 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT] = {
     #endif
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
+
+const mcu_pin_obj_t *mcu_get_pin_by_number(int number) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(mcu_pin_global_dict_table); i++) {
+        mcu_pin_obj_t *obj = MP_OBJ_TO_PTR(mcu_pin_global_dict_table[i].value);
+        if (obj->base.type == &mcu_pin_type && obj->number == number) {
+            return obj;
+        }
+    }
+    return NULL;
+}
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.h b/ports/raspberrypi/common-hal/microcontroller/__init__.h
index cc509b6b12..1154bf5e35 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.h
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.h
@@ -28,9 +28,8 @@
 #define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_MICROCONTROLLER___INIT___H
 
 #include "src/rp2040/hardware_regs/include/hardware/platform_defs.h"
+#include "peripherals/pins.h"
 
-#define TOTAL_GPIO_COUNT NUM_BANK0_GPIOS
-
-extern const mp_rom_map_elem_t mcu_pin_global_dict_table[TOTAL_GPIO_COUNT];
+const mcu_pin_obj_t *mcu_get_pin_by_number(int);
 
 #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_MICROCONTROLLER___INIT___H
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index d58e9779e6..ecaee90cc2 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -48,7 +48,7 @@
 #define NO_DMA_CHANNEL (-1)
 
 // Count how many state machines are using each pin.
-STATIC uint8_t _pin_reference_count[TOTAL_GPIO_COUNT];
+STATIC uint8_t _pin_reference_count[NUM_BANK0_GPIOS];
 STATIC uint32_t _current_program_id[NUM_PIOS][NUM_PIO_STATE_MACHINES];
 STATIC uint8_t _current_program_offset[NUM_PIOS][NUM_PIO_STATE_MACHINES];
 STATIC uint8_t _current_program_len[NUM_PIOS][NUM_PIO_STATE_MACHINES];
@@ -71,7 +71,7 @@ STATIC void *_interrupt_arg[NUM_PIOS][NUM_PIO_STATE_MACHINES];
 STATIC void rp2pio_statemachine_interrupt_handler(void);
 
 static void rp2pio_statemachine_set_pull(uint32_t pull_pin_up, uint32_t pull_pin_down, uint32_t pins_we_use) {
-    for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
+    for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) {
         bool used = pins_we_use & (1 << i);
         if (used) {
             bool pull_up = pull_pin_up & (1 << i);
@@ -120,7 +120,7 @@ STATIC void _reset_statemachine(PIO pio, uint8_t sm, bool leave_pins) {
     }
 
     uint32_t pins = _current_sm_pins[pio_index][sm];
-    for (size_t pin_number = 0; pin_number < TOTAL_GPIO_COUNT; pin_number++) {
+    for (size_t pin_number = 0; pin_number < NUM_BANK0_GPIOS; pin_number++) {
         if ((pins & (1 << pin_number)) == 0) {
             continue;
         }
@@ -161,10 +161,14 @@ STATIC uint32_t _check_pins_free(const mcu_pin_obj_t *first_pin, uint8_t pin_cou
     if (first_pin != NULL) {
         for (size_t i = 0; i < pin_count; i++) {
             uint8_t pin_number = first_pin->number + i;
-            if (pin_number >= TOTAL_GPIO_COUNT) {
+            if (pin_number >= NUM_BANK0_GPIOS) {
                 mp_raise_ValueError(translate("Pin count too large"));
             }
-            const mcu_pin_obj_t *pin = mcu_pin_global_dict_table[pin_number].value;
+            const mcu_pin_obj_t *pin = mcu_get_pin_by_number(pin_number);
+            if (!pin) {
+                mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_Pin);
+            }
+
             if (exclusive_pin_use || _pin_reference_count[pin_number] == 0) {
                 assert_pin_free(pin);
             }
@@ -269,12 +273,15 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
     self->pull_pin_up = pull_pin_up;
     self->pull_pin_down = pull_pin_down;
 
-    for (size_t pin_number = 0; pin_number < TOTAL_GPIO_COUNT; pin_number++) {
+    for (size_t pin_number = 0; pin_number < NUM_BANK0_GPIOS; pin_number++) {
         if ((pins_we_use & (1 << pin_number)) == 0) {
             continue;
         }
+        const mcu_pin_obj_t *pin = mcu_get_pin_by_number(pin_number);
+        if (!pin) {
+            return false;
+        }
         _pin_reference_count[pin_number]++;
-        const mcu_pin_obj_t *pin = mcu_pin_global_dict_table[pin_number].value;
         // Also claim the pin at the top level when we're the first to grab it.
         if (_pin_reference_count[pin_number] == 1) {
             if (claim_pins) {

From 5232e3f6c3280724a6d242f9ebacd2d63e496d29 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 19 Oct 2022 20:35:48 +0530
Subject: [PATCH 1234/2403] add coproc module

---
 locale/circuitpython.pot                      |  17 +-
 ports/espressif/CMakeLists.txt                |   2 +-
 ports/espressif/Makefile                      |   5 +
 ports/espressif/common-hal/coproc/Coproc.c    |  52 +++++
 ports/espressif/common-hal/coproc/Coproc.h    |  40 ++++
 .../common-hal/coproc/CoprocMemory.c          |  52 +++++
 .../common-hal/coproc/CoprocMemory.h          |  38 ++++
 ports/espressif/common-hal/coproc/__init__.c  |  69 +++++++
 .../esp-idf-config/sdkconfig-esp32s2.defaults |   7 +-
 .../esp-idf-config/sdkconfig-esp32s3.defaults |   8 +-
 ports/espressif/mpconfigport.mk               |   3 +
 py/circuitpy_defns.mk                         |   6 +
 py/circuitpy_mpconfig.mk                      |   3 +
 shared-bindings/coproc/Coproc.c               | 110 +++++++++++
 shared-bindings/coproc/Coproc.h               |  40 ++++
 shared-bindings/coproc/CoprocMemory.c         | 184 ++++++++++++++++++
 shared-bindings/coproc/CoprocMemory.h         |  39 ++++
 shared-bindings/coproc/__init__.c             | 115 +++++++++++
 shared-bindings/coproc/__init__.h             |  37 ++++
 19 files changed, 815 insertions(+), 12 deletions(-)
 create mode 100644 ports/espressif/common-hal/coproc/Coproc.c
 create mode 100644 ports/espressif/common-hal/coproc/Coproc.h
 create mode 100644 ports/espressif/common-hal/coproc/CoprocMemory.c
 create mode 100644 ports/espressif/common-hal/coproc/CoprocMemory.h
 create mode 100644 ports/espressif/common-hal/coproc/__init__.c
 create mode 100644 shared-bindings/coproc/Coproc.c
 create mode 100644 shared-bindings/coproc/Coproc.h
 create mode 100644 shared-bindings/coproc/CoprocMemory.c
 create mode 100644 shared-bindings/coproc/CoprocMemory.h
 create mode 100644 shared-bindings/coproc/__init__.c
 create mode 100644 shared-bindings/coproc/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 6c5e5ee585..2208ff25b1 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -507,7 +507,8 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
 
@@ -913,6 +914,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1012,6 +1014,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1915,7 +1918,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2159,6 +2163,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2407,7 +2415,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3682,7 +3690,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
index d05af27539..ea4de9f343 100644
--- a/ports/espressif/CMakeLists.txt
+++ b/ports/espressif/CMakeLists.txt
@@ -6,7 +6,7 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 
 # The component list here determines what options we get in menuconfig and what the ninja file
 # can build.
-set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip wpa_supplicant freertos bt usb)
+set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip ulp wpa_supplicant freertos bt usb)
 
 if("${CIRCUITPY_ESP32_CAMERA}")
 message("Including esp32-camera")
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 82d068f136..ebf636bb39 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -135,6 +135,8 @@ INC += \
 	-isystem esp-idf/components/soc/include \
 	-isystem esp-idf/components/soc/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/spi_flash/include \
+	-isystem esp-idf/components/ulp/include \
+	-isystem esp-idf/components/ulp/ulp_riscv/include \
 	-isystem esp-idf/components/$(IDF_TARGET_ARCH)/include \
 	-isystem esp-idf/components/$(IDF_TARGET_ARCH)/$(IDF_TARGET)/include
 
@@ -399,6 +401,9 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 	BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
 	                esp-idf/components/bt/controller/lib_esp32c3_family/$(IDF_TARGET)/libbtdm_app.a
 endif
+ifneq ($(CIRCUITPY_COPROC),0)
+	ESP_IDF_COMPONENTS_LINK += ulp
+endif
 
 ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
 
diff --git a/ports/espressif/common-hal/coproc/Coproc.c b/ports/espressif/common-hal/coproc/Coproc.c
new file mode 100644
index 0000000000..1216b5dde3
--- /dev/null
+++ b/ports/espressif/common-hal/coproc/Coproc.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/coproc/Coproc.h"
+#include "shared-bindings/coproc/CoprocMemory.h"
+
+void common_hal_coproc_coproc_construct(coproc_coproc_obj_t *self,
+    const uint8_t *buf, const size_t buf_len, coproc_memory_obj_t *coproc_memory) {
+    // set CoprocMemory object
+    self->coproc_memory = coproc_memory;
+
+    // load buffer
+    self->buf_len = buf_len;
+    self->buf = (uint8_t *)m_malloc(self->buf_len, false);
+    memcpy(self->buf, buf, self->buf_len);
+}
+
+bool common_hal_coproc_coproc_deinited(coproc_coproc_obj_t *self) {
+    return self->buf == NULL;
+}
+
+void common_hal_coproc_coproc_deinit(coproc_coproc_obj_t *self) {
+    if (common_hal_coproc_coproc_deinited(self)) {
+        return;
+    }
+    m_free(self->buf);
+    self->buf = NULL;
+    self->coproc_memory = NULL;
+}
diff --git a/ports/espressif/common-hal/coproc/Coproc.h b/ports/espressif/common-hal/coproc/Coproc.h
new file mode 100644
index 0000000000..19082871cc
--- /dev/null
+++ b/ports/espressif/common-hal/coproc/Coproc.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
+
+#include "py/obj.h"
+#include "common-hal/coproc/CoprocMemory.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t *buf;
+    size_t buf_len;
+    coproc_memory_obj_t *coproc_memory;
+} coproc_coproc_obj_t;
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
diff --git a/ports/espressif/common-hal/coproc/CoprocMemory.c b/ports/espressif/common-hal/coproc/CoprocMemory.c
new file mode 100644
index 0000000000..ca9a82dbcf
--- /dev/null
+++ b/ports/espressif/common-hal/coproc/CoprocMemory.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/coproc/CoprocMemory.h"
+
+uint32_t common_hal_coproc_memory_get_length(coproc_memory_obj_t *self) {
+    return self->len;
+}
+
+bool common_hal_coproc_memory_set_bytes(coproc_memory_obj_t *self,
+    uint32_t start_index, const uint8_t *values, uint32_t len) {
+
+    if (start_index + len > self->len) {
+        return false;
+    }
+
+    memcpy((uint8_t *)(self->address + start_index), values, len);
+    return true;
+}
+
+void common_hal_coproc_memory_get_bytes(coproc_memory_obj_t *self,
+    uint32_t start_index, uint8_t *values, uint32_t len) {
+
+    if (start_index + len > self->len) {
+        return;
+    }
+
+    memcpy(values, (uint8_t *)(self->address + start_index), len);
+}
diff --git a/ports/espressif/common-hal/coproc/CoprocMemory.h b/ports/espressif/common-hal/coproc/CoprocMemory.h
new file mode 100644
index 0000000000..c4aa088394
--- /dev/null
+++ b/ports/espressif/common-hal/coproc/CoprocMemory.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint32_t address;
+    uint16_t len;
+} coproc_memory_obj_t;
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
diff --git a/ports/espressif/common-hal/coproc/__init__.c b/ports/espressif/common-hal/coproc/__init__.c
new file mode 100644
index 0000000000..3f53cca5d4
--- /dev/null
+++ b/ports/espressif/common-hal/coproc/__init__.c
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/coproc/__init__.h"
+
+#include "py/runtime.h"
+
+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#include "esp32s2/ulp.h"
+#include "esp32s2/ulp_riscv.h"
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+#include "esp32s3/ulp.h"
+#include "esp32s3/ulp_riscv.h"
+#endif
+
+// To-do idf v5.0: remove following include
+#include "soc/rtc_cntl_reg.h"
+
+void common_hal_coproc_run(coproc_coproc_obj_t *self) {
+    if (ulp_riscv_load_binary(self->buf, self->buf_len) != ESP_OK) {
+        mp_raise_RuntimeError(translate("Firmware is too big"));
+    }
+    m_free(self->buf);
+    self->buf = (uint8_t *)RTC_SLOW_MEM;
+    ulp_riscv_run();
+}
+
+void common_hal_coproc_halt(coproc_coproc_obj_t *self) {
+    self->buf = (uint8_t *)m_malloc(self->buf_len, false);
+    memcpy(self->buf, (uint8_t *)RTC_SLOW_MEM, self->buf_len);
+
+    // To-do idf v5.0: use following functions
+    // ulp_riscv_timer_stop();
+    // ulp_riscv_halt();
+
+    // stop the ulp timer
+    CLEAR_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
+    // suspends the ulp operation
+    SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE);
+    // Resets the processor
+    SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
+}
+
+mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self) {
+    return (self->coproc_memory) ? MP_OBJ_FROM_PTR(self->coproc_memory) : mp_const_none;
+}
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
index ac3e909dfc..d96a6c5366 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
@@ -41,8 +41,9 @@ CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y
 
 # CONFIG_ESP32S2_TRAX is not set
 CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
-# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set
-CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32S2_ULP_COPROC_ENABLED=y
+CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=4096
+CONFIG_ESP32S2_ULP_COPROC_RISCV=y
 CONFIG_ESP32S2_DEBUG_OCDAWARE=y
 # CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set
 CONFIG_ESP32S2_BROWNOUT_DET=y
@@ -65,7 +66,7 @@ CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y
 CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP32S2_NO_BLOBS is not set
 # CONFIG_ESP32S2_KEEP_USB_ALIVE is not set
-# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set
+CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y
 # CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set
 #
 # MAC Config
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
index ce0d9f8d62..30a71c6a44 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
@@ -67,8 +67,9 @@ CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32
 
 # CONFIG_ESP32S3_TRAX is not set
 CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0
-# CONFIG_ESP32S3_ULP_COPROC_ENABLED is not set
-CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32S3_ULP_COPROC_ENABLED=y
+CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=4096
+CONFIG_ESP32S3_ULP_COPROC_RISCV=y
 CONFIG_ESP32S3_BROWNOUT_DET=y
 CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y
 # CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set
@@ -88,7 +89,7 @@ CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
 # CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set
 CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
-# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set
+CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM=y
 # CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set
 # end of ESP32S3-Specific
 
@@ -218,4 +219,3 @@ CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
 # CONFIG_CAMERA_CONVERTER_ENABLED is not set
 # end of Camera configuration
 # end of Component config
-
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 9ac4408ef7..404f47cfe9 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -19,6 +19,7 @@ CIRCUITPY_AUDIOIO ?= 0
 CIRCUITPY_AUDIOMIXER ?= 1
 CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COUNTIO ?= 1
+CIRCUITPY_COPROC ?= 1
 CIRCUITPY_DUALBANK ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
@@ -38,6 +39,7 @@ CIRCUITPY_ESPIDF ?= 1
 ifeq ($(IDF_TARGET),esp32)
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_COPROC = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 # Protomatter needs to support ESP32.
 CIRCUITPY_RGBMATRIX = 0
@@ -52,6 +54,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO = 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_COUNTIO = 0
+CIRCUITPY_COPROC = 0
 CIRCUITPY_DUALBANK = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index b5c8047f99..21a3ec2e1e 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -167,6 +167,9 @@ endif
 ifeq ($(CIRCUITPY_CANIO),1)
 SRC_PATTERNS += canio/%
 endif
+ifeq ($(CIRCUITPY_COPROC),1)
+SRC_PATTERNS += coproc/%
+endif
 ifeq ($(CIRCUITPY_COUNTIO),1)
 SRC_PATTERNS += countio/%
 endif
@@ -419,6 +422,9 @@ SRC_COMMON_HAL_ALL = \
 	canio/CAN.c \
 	canio/Listener.c \
 	canio/__init__.c \
+	coproc/__init__.c \
+	coproc/Coproc.c \
+	coproc/CoprocMemory.c \
 	countio/Counter.c \
 	countio/__init__.c \
 	digitalio/DigitalInOut.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 09818956ea..fbf0b587b7 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -178,6 +178,9 @@ CFLAGS += -DCIRCUITPY_CYW43=$(CIRCUITPY_CYW43)
 CIRCUITPY_DIGITALIO ?= 1
 CFLAGS += -DCIRCUITPY_DIGITALIO=$(CIRCUITPY_DIGITALIO)
 
+CIRCUITPY_COPROC ?= 0
+CFLAGS += -DCIRCUITPY_COPROC=$(CIRCUITPY_COPROC)
+
 CIRCUITPY_COUNTIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_COUNTIO=$(CIRCUITPY_COUNTIO)
 
diff --git a/shared-bindings/coproc/Coproc.c b/shared-bindings/coproc/Coproc.c
new file mode 100644
index 0000000000..85595578c8
--- /dev/null
+++ b/shared-bindings/coproc/Coproc.c
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/runtime/context_manager_helpers.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/coproc/Coproc.h"
+#include "shared-bindings/coproc/CoprocMemory.h"
+
+STATIC coproc_memory_obj_t *get_coproc_memory_obj(mp_obj_t *self_in) {
+    if (!mp_obj_is_type(*self_in, &coproc_memory_type)) {
+        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_CoprocMemory);
+    }
+    return MP_OBJ_TO_PTR(*self_in);
+}
+
+//| class Coproc:
+//|     def __init__(self, buffer: ReadableBuffer, memory: CoprocMemory) -> None:
+//|         """Loads the program binary into memory.
+//|
+//|         :param buffer: The program binary to run on the core/co-processor
+//|         :param memory: The `CoprocMemory` object used to access shared memory"""
+STATIC mp_obj_t coproc_coproc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_buffer, ARG_memory };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_memory, MP_ARG_OBJ, { .u_obj = mp_const_none } },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    coproc_coproc_obj_t *self = m_new_obj(coproc_coproc_obj_t);
+    self->base.type = &coproc_coproc_type;
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+
+    coproc_memory_obj_t *coproc_memory = (args[ARG_memory].u_obj == mp_const_none) ? NULL : get_coproc_memory_obj(&args[ARG_memory].u_obj);
+
+    common_hal_coproc_coproc_construct(self, bufinfo.buf, bufinfo.len, coproc_memory);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Releases control of the underlying hardware so other classes can use it."""
+//|         ...
+STATIC mp_obj_t coproc_coproc_obj_deinit(mp_obj_t self_in) {
+    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_coproc_coproc_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(coproc_coproc_deinit_obj, coproc_coproc_obj_deinit);
+
+//|     def __enter__(self) -> Coproc:
+//|         """No-op used in Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Close the request."""
+//|         ...
+//|
+STATIC mp_obj_t coproc_coproc_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    mp_check_self(mp_obj_is_type(args[0], &coproc_coproc_type));
+    return coproc_coproc_obj_deinit(args[0]);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(coproc_coproc___exit___obj, 4, 4, coproc_coproc_obj___exit__);
+
+STATIC const mp_rom_map_elem_t coproc_coproc_locals_dict_table[] = {
+    // context managers
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&coproc_coproc___exit___obj) },
+
+    // functions
+    { MP_ROM_QSTR(MP_QSTR_deinit),  MP_ROM_PTR(&coproc_coproc_deinit_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(coproc_coproc_locals_dict, coproc_coproc_locals_dict_table);
+
+const mp_obj_type_t coproc_coproc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Coproc,
+    .make_new = coproc_coproc_make_new,
+    .locals_dict = (mp_obj_dict_t *)&coproc_coproc_locals_dict,
+};
diff --git a/shared-bindings/coproc/Coproc.h b/shared-bindings/coproc/Coproc.h
new file mode 100644
index 0000000000..fbf9bd9ae0
--- /dev/null
+++ b/shared-bindings/coproc/Coproc.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_COPROC_COPROC_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROC_H
+
+#include "common-hal/coproc/Coproc.h"
+
+extern const mp_obj_type_t coproc_coproc_type;
+
+extern void common_hal_coproc_coproc_construct(coproc_coproc_obj_t *self,
+    const uint8_t *buf, const size_t buf_len, coproc_memory_obj_t *coproc_memory);
+
+extern void common_hal_coproc_coproc_deinit(coproc_coproc_obj_t *self);
+extern bool common_hal_coproc_coproc_deinited(coproc_coproc_obj_t *self);
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROC_H
diff --git a/shared-bindings/coproc/CoprocMemory.c b/shared-bindings/coproc/CoprocMemory.c
new file mode 100644
index 0000000000..0d49a2f008
--- /dev/null
+++ b/shared-bindings/coproc/CoprocMemory.c
@@ -0,0 +1,184 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/binary.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "py/runtime0.h"
+
+#include "shared-bindings/coproc/CoprocMemory.h"
+#include "supervisor/shared/translate/translate.h"
+
+//| class CoprocMemory:
+//|     def __init__(self, address: int, length: int) -> None:
+//|         """Initialize coproc shared memory.
+//|
+//|         :param address: address of shared memory
+//|         :param length: length of shared memory"""
+STATIC mp_obj_t coproc_memory_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_address, ARG_length };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_length, MP_ARG_REQUIRED | MP_ARG_INT },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    coproc_memory_obj_t *self = m_new_obj(coproc_memory_obj_t);
+    self->base.type = &coproc_memory_type;
+    self->address = args[ARG_address].u_int;
+    self->len = args[ARG_length].u_int;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def __bool__(self) -> bool:
+//|         """``coproc_memory`` is ``True`` if its length is greater than zero.
+//|         This is an easy way to check for its existence.
+//|         """
+//|         ...
+//|     def __len__(self) -> int:
+//|         """Return the length. This is used by (`len`)"""
+//|         ...
+STATIC mp_obj_t coproc_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    coproc_memory_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint16_t len = common_hal_coproc_memory_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 coproc_memory_locals_dict_table[] = {
+};
+
+STATIC MP_DEFINE_CONST_DICT(coproc_memory_locals_dict, coproc_memory_locals_dict_table);
+
+//|     @overload
+//|     def __getitem__(self, index: slice) -> bytearray: ...
+//|     @overload
+//|     def __getitem__(self, index: int) -> int:
+//|         """Returns the value at the given index."""
+//|         ...
+//|     @overload
+//|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
+//|     @overload
+//|     def __setitem__(self, index: int, value: int) -> None:
+//|         """Set the value at the given index."""
+//|         ...
+//|
+STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
+    if (value == MP_OBJ_NULL) {
+        // delete item
+        // slice deletion
+        return MP_OBJ_NULL; // op not supported
+    } else {
+        coproc_memory_obj_t *self = MP_OBJ_TO_PTR(self_in);
+        if (0) {
+        #if MICROPY_PY_BUILTINS_SLICE
+        } else if (mp_obj_is_type(index_in, &mp_type_slice)) {
+            mp_bound_slice_t slice;
+            if (!mp_seq_get_fast_slice_indexes(common_hal_coproc_memory_get_length(self), index_in, &slice)) {
+                mp_raise_NotImplementedError(translate("only slices with step=1 (aka None) are supported"));
+            }
+            if (value != MP_OBJ_SENTINEL) {
+                #if MICROPY_PY_ARRAY_SLICE_ASSIGN
+                // Assign
+                size_t src_len = slice.stop - slice.start;
+                uint8_t *src_items;
+                if (mp_obj_is_type(value, &mp_type_array) ||
+                    mp_obj_is_type(value, &mp_type_bytearray) ||
+                    mp_obj_is_type(value, &mp_type_memoryview) ||
+                    mp_obj_is_type(value, &mp_type_bytes)) {
+                    mp_buffer_info_t bufinfo;
+                    mp_get_buffer_raise(value, &bufinfo, MP_BUFFER_READ);
+                    if (bufinfo.len != src_len) {
+                        mp_raise_ValueError(translate("Slice and value different lengths."));
+                    }
+                    src_len = bufinfo.len;
+                    src_items = bufinfo.buf;
+                    if (1 != mp_binary_get_size('@', bufinfo.typecode, NULL)) {
+                        mp_raise_ValueError(translate("Array values should be single bytes."));
+                    }
+                } else {
+                    mp_raise_NotImplementedError(translate("array/bytes required on right side"));
+                }
+
+                if (!common_hal_coproc_memory_set_bytes(self, slice.start, src_items, src_len)) {
+                    mp_raise_RuntimeError(translate("Unable to write"));
+                }
+                return mp_const_none;
+                #else
+                return MP_OBJ_NULL; // op not supported
+                #endif
+            } else {
+                // Read slice.
+                size_t len = slice.stop - slice.start;
+                uint8_t *items = m_new(uint8_t, len);
+                common_hal_coproc_memory_get_bytes(self, slice.start, items, len);
+                return mp_obj_new_bytearray_by_ref(len, items);
+            }
+        #endif
+        } else {
+            // Single index rather than slice.
+            size_t index = mp_get_index(self->base.type, common_hal_coproc_memory_get_length(self),
+                index_in, false);
+            if (value == MP_OBJ_SENTINEL) {
+                // load
+                uint8_t value_out;
+                common_hal_coproc_memory_get_bytes(self, index, &value_out, 1);
+                return MP_OBJ_NEW_SMALL_INT(value_out);
+            } else {
+                // store
+                mp_int_t byte_value = mp_obj_get_int(value);
+                mp_arg_validate_int_range(byte_value, 0, 255, MP_QSTR_bytes);
+
+                uint8_t short_value = byte_value;
+                if (!common_hal_coproc_memory_set_bytes(self, index, &short_value, 1)) {
+                    mp_raise_RuntimeError(translate("Unable to write"));
+                }
+                return mp_const_none;
+            }
+        }
+    }
+}
+
+const mp_obj_type_t coproc_memory_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_CoprocMemory,
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    .make_new = coproc_memory_make_new,
+    .locals_dict = (mp_obj_t)&coproc_memory_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .subscr = coproc_memory_subscr,
+        .unary_op = coproc_memory_unary_op,
+        ),
+};
diff --git a/shared-bindings/coproc/CoprocMemory.h b/shared-bindings/coproc/CoprocMemory.h
new file mode 100644
index 0000000000..fdbb2fa0fa
--- /dev/null
+++ b/shared-bindings/coproc/CoprocMemory.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_COPROC_COPROCMEMORY_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROCMEMORY_H
+
+#include "common-hal/coproc/CoprocMemory.h"
+
+extern const mp_obj_type_t coproc_memory_type;
+
+uint32_t common_hal_coproc_memory_get_length(coproc_memory_obj_t *self);
+
+bool common_hal_coproc_memory_set_bytes(coproc_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len);
+void common_hal_coproc_memory_get_bytes(coproc_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROCMEMORY_H
diff --git a/shared-bindings/coproc/__init__.c b/shared-bindings/coproc/__init__.c
new file mode 100644
index 0000000000..06b196d8be
--- /dev/null
+++ b/shared-bindings/coproc/__init__.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/util.h"
+#include "shared-bindings/coproc/__init__.h"
+#include "shared-bindings/coproc/Coproc.h"
+#include "shared-bindings/coproc/CoprocMemory.h"
+
+#include "py/runtime.h"
+
+//| """COPROC Module
+//|
+//| The `coproc` module adds ability to load and run
+//| programs on a co-processor or a different cpu core.
+//|
+//| .. code-block:: python
+//|
+//|     import coproc
+//|
+//|     shared_mem = coproc.CoprocMemory(address=0x500007fc, length=1024)
+//|
+//|     with open("program.bin", "rb") as f:
+//|         program = coproc.Coproc(buffer=f.read(), memory=shared_mem)
+//|
+//|     coproc.run(program)
+//|     print(coproc.memory(program)[0])
+//|     # coproc.halt(program)
+//| """
+//| ...
+//|
+
+STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
+    if (!mp_obj_is_type(*self_in, &coproc_coproc_type)) {
+        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_Coproc);
+    }
+    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(*self_in);
+    if (common_hal_coproc_coproc_deinited(self)) {
+        raise_deinited_error();
+    }
+    return self;
+}
+
+//| def run(*coproc: Coproc) -> None:
+//|     """Runs the loaded program."""
+//|     ...
+//|
+STATIC mp_obj_t coproc_run(mp_obj_t self_in) {
+    common_hal_coproc_run(get_coproc_obj(&self_in));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_run_obj, coproc_run);
+
+//| def halt(*coproc: Coproc) -> None:
+//|     """Halts the loaded program."""
+//|     ...
+//|
+STATIC mp_obj_t coproc_halt(mp_obj_t self_in) {
+    common_hal_coproc_halt(get_coproc_obj(&self_in));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_halt_obj, coproc_halt);
+
+//| def memory(*coproc: Coproc) -> CoprocMemory:
+//|     """Returns the shared memory as a bytearray."""
+//|     ...
+//|
+STATIC mp_obj_t coproc_memory(mp_obj_t self_in) {
+    return common_hal_coproc_memory(get_coproc_obj(&self_in));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_memory_obj, coproc_memory);
+
+STATIC const mp_rom_map_elem_t coproc_module_globals_table[] = {
+    // module name
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_coproc) },
+
+    // module functions
+    { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&coproc_run_obj) },
+    { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&coproc_halt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_memory), MP_ROM_PTR(&coproc_memory_obj) },
+
+    // module classes
+    { MP_ROM_QSTR(MP_QSTR_Coproc), MP_OBJ_FROM_PTR(&coproc_coproc_type) },
+    { MP_ROM_QSTR(MP_QSTR_CoprocMemory), MP_OBJ_FROM_PTR(&coproc_memory_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(coproc_module_globals, coproc_module_globals_table);
+
+const mp_obj_module_t coproc_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&coproc_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_coproc, coproc_module, CIRCUITPY_COPROC);
diff --git a/shared-bindings/coproc/__init__.h b/shared-bindings/coproc/__init__.h
new file mode 100644
index 0000000000..6f2b2a56ae
--- /dev/null
+++ b/shared-bindings/coproc/__init__.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_COPROC___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H
+
+#include "py/obj.h"
+#include "common-hal/coproc/Coproc.h"
+
+extern void common_hal_coproc_run(coproc_coproc_obj_t *self);
+extern void common_hal_coproc_halt(coproc_coproc_obj_t *self);
+extern mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H

From ea60926b158a26cb0b8b29be05a83328d7051383 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 20 Oct 2022 09:22:17 +0200
Subject: [PATCH 1235/2403] 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             | 17 +++++++++++++----
 locale/cs.po             | 17 +++++++++++++----
 locale/de_DE.po          | 17 +++++++++++++----
 locale/el.po             | 17 +++++++++++++----
 locale/en_GB.po          | 17 +++++++++++++----
 locale/es.po             | 17 +++++++++++++----
 locale/fil.po            | 17 +++++++++++++----
 locale/fr.po             | 17 +++++++++++++----
 locale/hi.po             | 17 +++++++++++++----
 locale/it_IT.po          | 17 +++++++++++++----
 locale/ja.po             | 17 +++++++++++++----
 locale/ko.po             | 17 +++++++++++++----
 locale/nl.po             | 17 +++++++++++++----
 locale/pl.po             | 17 +++++++++++++----
 locale/pt_BR.po          | 17 +++++++++++++----
 locale/ru.po             | 17 +++++++++++++----
 locale/sv.po             | 17 +++++++++++++----
 locale/tr.po             | 17 +++++++++++++----
 locale/zh_Latn_pinyin.po | 17 +++++++++++++----
 19 files changed, 247 insertions(+), 76 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index ac2d087737..5e5d89663e 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -513,7 +513,8 @@ msgstr "Send yang lain sudah aktif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array harus mengandung halfwords (ketik 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Nilai array harus berupa byte tunggal."
 
@@ -926,6 +927,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1025,6 +1027,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1944,7 +1947,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Potongan dan nilai panjangnya berbeda."
 
@@ -2188,6 +2192,10 @@ msgstr "Tidak dapat membaca data palet warna"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Tidak dapat menulis ke nvm."
@@ -2438,7 +2446,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "diperlukan array/byte di sisi kanan"
 
@@ -3714,7 +3722,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 0767c23c1c..9e7b260f1d 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -514,7 +514,8 @@ msgstr "Další odesílání je již aktivní"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Pole musí obsahovat poloviční slova (typ „H“)"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Hodnoty pole by měly být jednoduché bajty."
 
@@ -924,6 +925,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1023,6 +1025,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1933,7 +1936,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2177,6 +2181,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2425,7 +2433,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3700,7 +3708,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index eb3a0887d0..61943b7a43 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -516,7 +516,8 @@ msgstr "Ein anderer Sendevorgang ist schon aktiv"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array muss Halbwörter enthalten (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array-Werte sollten aus Einzelbytes bestehen."
 
@@ -931,6 +932,7 @@ msgstr "Error: Bind Fehler"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1031,6 +1033,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1957,7 +1960,8 @@ msgstr "Größe nicht unterstützt"
 msgid "Sleep Memory not available"
 msgstr "Sleep-Speicher nicht verfügbar"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice und Wert (value) haben unterschiedliche Längen."
 
@@ -2214,6 +2218,10 @@ msgstr "Konnte Farbpalettendaten nicht lesen"
 msgid "Unable to start mDNS query"
 msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Schreiben in nvm nicht möglich."
@@ -2478,7 +2486,7 @@ msgid "array has too many dimensions"
 msgstr "Das Array hat zu viele Dimensionen"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "Array/Bytes auf der rechten Seite erforderlich"
 
@@ -3775,7 +3783,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "nur eine sample_rate=16000 wird unterstützt"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 "Es werden nur Slices mit Schritt = 1 (auch bekannt als None) unterstützt"
diff --git a/locale/el.po b/locale/el.po
index 45f112662e..0cacf05e30 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -520,7 +520,8 @@ msgstr "Άλλη αποστολή είναι ήδη ενεργή"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "H παράταξη πρέπει να περιέχει halfwords (τύπου 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Η τιμές της παράταξη πρέπει να είναι μονά bytes."
 
@@ -938,6 +939,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1037,6 +1039,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1942,7 +1945,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2186,6 +2190,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2434,7 +2442,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3709,7 +3717,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index f1e82d06fb..f4cfa25760 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -517,7 +517,8 @@ msgstr "Another send is already active"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array must contain halfwords (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array values should be single bytes."
 
@@ -927,6 +928,7 @@ msgstr "Error: Failure to bind"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1026,6 +1028,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1939,7 +1942,8 @@ msgstr "Size not supported"
 msgid "Sleep Memory not available"
 msgstr "Sleep Memory not available"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice and value different lengths."
 
@@ -2190,6 +2194,10 @@ msgstr "Unable to read colour palette data"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Unable to write to nvm."
@@ -2441,7 +2449,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes required on right side"
 
@@ -3719,7 +3727,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "only sample_rate=16000 is supported"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "only slices with step=1 (aka None) are supported"
 
diff --git a/locale/es.po b/locale/es.po
index 26f45e3b2d..6461a996d4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -521,7 +521,8 @@ msgstr "Otro envío ya está activo"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "El array debe contener medias palabras (escriba 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Valores del array deben ser bytes individuales."
 
@@ -937,6 +938,7 @@ msgstr "Error: fallo al vincular"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1036,6 +1038,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1968,7 +1971,8 @@ msgstr "Sin capacidades para el tamaño"
 msgid "Sleep Memory not available"
 msgstr "Memoria de sueño no disponible"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice y value tienen tamaños diferentes."
 
@@ -2222,6 +2226,10 @@ msgstr "No se pudo leer los datos de la paleta de colores"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Imposible escribir en nvm."
@@ -2477,7 +2485,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes requeridos en el lado derecho"
 
@@ -3766,7 +3774,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "solo se admite sample_rate=16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "solo se admiten segmentos con step=1 (alias None)"
 
diff --git a/locale/fil.po b/locale/fil.po
index a0589ae969..7530e6b30d 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -510,7 +510,8 @@ msgstr "Isa pang send ay aktibo na"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "May halfwords (type 'H') dapat ang array"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array values ay dapat single bytes."
 
@@ -923,6 +924,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1022,6 +1024,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1932,7 +1935,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice at value iba't ibang haba."
 
@@ -2176,6 +2180,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Hindi ma i-sulat sa NVM."
@@ -2426,7 +2434,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes kinakailangan sa kanang bahagi"
 
@@ -3718,7 +3726,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "ang mga slices lamang na may hakbang = 1 (aka None) ang sinusuportahan"
 
diff --git a/locale/fr.po b/locale/fr.po
index 431d3fe19c..464062d17f 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -519,7 +519,8 @@ msgstr "Un autre envoi est déjà actif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "La matrice doit contenir des demi-mots (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Les valeurs de la matrice doivent être des octets singuliers."
 
@@ -947,6 +948,7 @@ msgstr "Erreur : Impossible de lier"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1047,6 +1049,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1988,7 +1991,8 @@ msgstr "Taille n'est pas supportée"
 msgid "Sleep Memory not available"
 msgstr "La mémoire de sommeil n'est pas disponible"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Tranche et valeur de tailles différentes."
 
@@ -2246,6 +2250,10 @@ msgstr "Impossible de lire les données de la palette de couleurs"
 msgid "Unable to start mDNS query"
 msgstr "Impossible de lancer la requête mDNS"
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Écriture impossible vers nvm."
@@ -2508,7 +2516,7 @@ msgid "array has too many dimensions"
 msgstr "la tableau à trop de dimensions"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "matrice/octets requis à la droite"
 
@@ -3806,7 +3814,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "seul sample_rate = 16000 est pris en charge"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "seules les tranches avec 'step=1' (cad None) sont supportées"
 
diff --git a/locale/hi.po b/locale/hi.po
index df00d53ca4..b95bdf0028 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -507,7 +507,8 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
 
@@ -913,6 +914,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1012,6 +1014,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1915,7 +1918,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2159,6 +2163,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2407,7 +2415,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3682,7 +3690,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index d39cacf542..a0e071c261 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -516,7 +516,8 @@ msgstr "Another send è gia activato"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array deve avere mezzoparole (typo 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "I valori dell'Array dovrebbero essere bytes singoli."
 
@@ -928,6 +929,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1027,6 +1029,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1942,7 +1945,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2186,6 +2190,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Imposibile scrivere su nvm."
@@ -2436,7 +2444,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3729,7 +3737,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "solo slice con step=1 (aka None) sono supportate"
 
diff --git a/locale/ja.po b/locale/ja.po
index b25175eeb9..de7b3fa86b 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -512,7 +512,8 @@ msgstr "他のsendがすでにアクティブ"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "array のタイプは16ビット ('H') でなければなりません"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Arrayの各値は1バイトでなければなりません"
 
@@ -922,6 +923,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1021,6 +1023,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1928,7 +1931,8 @@ msgstr "サイズは対応していません"
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "スライスと値の長さが一致しません"
 
@@ -2173,6 +2177,10 @@ msgstr "カラーパレットデータを読み込めません"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "nvmに書き込みできません"
@@ -2421,7 +2429,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "右辺にはarray/bytesが必要"
 
@@ -3701,7 +3709,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 387a529fd2..fa1d513657 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -508,7 +508,8 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
 
@@ -916,6 +917,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1015,6 +1017,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1918,7 +1921,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2163,6 +2167,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2411,7 +2419,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3686,7 +3694,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 3a5cf970d2..1375050d8f 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -510,7 +510,8 @@ msgstr "Een andere send is al actief"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array moet halfwords (type 'H') bevatten"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array waardes moet enkele bytes zijn."
 
@@ -921,6 +922,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1020,6 +1022,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1939,7 +1942,8 @@ msgstr "Afmeting niet ondersteund"
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice en waarde hebben verschillende lengtes."
 
@@ -2183,6 +2187,10 @@ msgstr "Niet in staat kleurenpalet data te lezen"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Niet in staat om naar nvm te schrijven."
@@ -2437,7 +2445,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes vereist aan de rechterkant"
 
@@ -3719,7 +3727,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "alleen sample_rate=16000 wordt ondersteund"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "alleen segmenten met step=1 (ook wel None) worden ondersteund"
 
diff --git a/locale/pl.po b/locale/pl.po
index 7e2b581d91..de5fad6cf4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -512,7 +512,8 @@ msgstr "Wysyłanie jest już w toku"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Tablica musi zawierać pół-słowa (typ 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Wartości powinny być bajtami."
 
@@ -922,6 +923,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1021,6 +1023,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1926,7 +1929,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Fragment i wartość są różnych długości."
 
@@ -2170,6 +2174,10 @@ msgstr "Nie można odczytać danych palety"
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Błąd zapisu do NVM."
@@ -2418,7 +2426,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "tablica/bytes wymagane po prawej stronie"
 
@@ -3694,7 +3702,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "obsługiwane jest tylko sample_rate=16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "tylko fragmenty ze step=1 (lub None) są wspierane"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 7eb963ada5..fb19bfc5ba 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -520,7 +520,8 @@ msgstr "Outro envio já está ativo"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array deve conter meias palavras (tipo 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Os valores das matrizes devem ser bytes simples."
 
@@ -940,6 +941,7 @@ msgstr "Erro: Falha na vinculação"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1039,6 +1041,7 @@ msgstr "O firmware está duplicado"
 msgid "Firmware is invalid"
 msgstr "O firmware é inválido"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "O firmware é muito grande"
@@ -1971,7 +1974,8 @@ msgstr "O tamanho não é suportado"
 msgid "Sleep Memory not available"
 msgstr "Sleep memory não está disponível"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Fatie e avalie os diferentes comprimentos."
 
@@ -2229,6 +2233,10 @@ msgstr "Não foi possível ler os dados da paleta de cores"
 msgid "Unable to start mDNS query"
 msgstr "Não é possível iniciar a consulta mDNS"
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Não é possível gravar no nvm."
@@ -2490,7 +2498,7 @@ msgid "array has too many dimensions"
 msgstr "a matriz possui muitas dimensões"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "matriz/bytes são necessários no lado direito"
 
@@ -3782,7 +3790,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "apenas sample_rate = 16000 é compatível"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 "apenas fatias com a etapa=1 (também conhecida como Nenhuma) são compatíveis"
diff --git a/locale/ru.po b/locale/ru.po
index 6b8c286f2f..49616ca9f4 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -515,7 +515,8 @@ msgstr "Другая передача уже активна"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Массив должен содержать полуслова (тип 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Значения массива должны быть однобайтовыми."
 
@@ -938,6 +939,7 @@ msgstr "Ошибка: Сбой привязки"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1037,6 +1039,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1962,7 +1965,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2208,6 +2212,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2456,7 +2464,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3731,7 +3739,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index d2ab21c5d9..c29c3c34c7 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -517,7 +517,8 @@ msgstr "En annan send är redan aktiv"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Matrisen måste innehålla halfwords (typ \"H\")"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Matrisvärden ska bestå av enstaka bytes."
 
@@ -929,6 +930,7 @@ msgstr "Fel: Bind misslyckades"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1028,6 +1030,7 @@ msgstr "Firmware är en dubblett"
 msgid "Firmware is invalid"
 msgstr "Firmware är ogiltig"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Firmware är för stor"
@@ -1950,7 +1953,8 @@ msgstr "Storleken stöds inte"
 msgid "Sleep Memory not available"
 msgstr "Sömnminne inte tillgängligt"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice och värde har olika längd."
 
@@ -2204,6 +2208,10 @@ msgstr "Det går inte att läsa färgpalettdata"
 msgid "Unable to start mDNS query"
 msgstr "Det gick inte att starta mDNS-frågan"
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Det gick inte att skriva till nvm."
@@ -2462,7 +2470,7 @@ msgid "array has too many dimensions"
 msgstr "array har för många dimensioner"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes krävs på höger sida"
 
@@ -3747,7 +3755,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "enbart sample_rate=16000 stöds"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "endast segment med steg=1 (aka Ingen) stöds"
 
diff --git a/locale/tr.po b/locale/tr.po
index a0bf2ed3c0..1df27d386d 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -520,7 +520,8 @@ msgstr "Başka bir gönderme zaten aktif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Dizi yarımsözcüklere sahip olmalıdır (tip 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Dizi değerleri tekil bytelar olmalıdır."
 
@@ -930,6 +931,7 @@ msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1029,6 +1031,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1935,7 +1938,8 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
 
@@ -2179,6 +2183,10 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr ""
@@ -2427,7 +2435,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3702,7 +3710,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 270ffe86d8..17e755b0c1 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -518,7 +518,8 @@ msgstr "Lìng yīgè fāsòng (send) yǐjīng zài gōngzuò"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Shùzǔ bìxū bāohán halfwords (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "shùzǔ de zhí yīnggāi shì dān'gè zìjié."
 
@@ -930,6 +931,7 @@ msgstr "cuò wù: bǎng dìng shī bài"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
 #: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
@@ -1029,6 +1031,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1954,7 +1957,8 @@ msgstr "bù zhī chí dà xiǎo"
 msgid "Sleep Memory not available"
 msgstr "shuì mián jì yì bù kě yòng"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Qiēpiàn hé zhí bùtóng chángdù."
 
@@ -2207,6 +2211,10 @@ msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
 msgid "Unable to start mDNS query"
 msgstr "wú fǎ qǐ dòng mDNS chá xún"
 
+#: shared-bindings/coproc/CoprocMemory.c
+msgid "Unable to write"
+msgstr ""
+
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
 msgstr "Wúfǎ xiě rù nvm."
@@ -2465,7 +2473,7 @@ msgid "array has too many dimensions"
 msgstr "shùzǔ yǒu tài duō wéidù"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/nvm/ByteArray.c
+#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "yòu cè xūyào shùzǔ/zì jié"
 
@@ -3747,7 +3755,8 @@ msgid "only sample_rate=16000 is supported"
 msgstr "Jǐn zhīchí cǎiyàng lǜ = 16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "jǐn zhīchí bù zhǎng = 1(jí wú) de qiēpiàn"
 

From b33a2b45dcab40f9b83c0c31469715401abfad7b Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:56:10 +0530
Subject: [PATCH 1236/2403] add coproc alarm

---
 locale/circuitpython.pot                      |  10 +-
 .../common-hal/alarm/coproc/CoprocAlarm.c     |   1 +
 .../common-hal/alarm/coproc/CoprocAlarm.h     |   1 +
 ports/espressif/common-hal/alarm/__init__.c   |  15 +++
 .../common-hal/alarm/coproc/CoprocAlarm.c     | 111 ++++++++++++++++++
 .../common-hal/alarm/coproc/CoprocAlarm.h     |  48 ++++++++
 .../common-hal/alarm/touch/TouchAlarm.c       |   2 +-
 ports/espressif/common-hal/coproc/__init__.c  |  13 +-
 .../nrf/common-hal/alarm/coproc/CoprocAlarm.c |   1 +
 .../nrf/common-hal/alarm/coproc/CoprocAlarm.h |   1 +
 .../common-hal/alarm/coproc/CoprocAlarm.c     |   1 +
 .../common-hal/alarm/coproc/CoprocAlarm.h     |   1 +
 .../stm/common-hal/alarm/coproc/CoprocAlarm.c |   1 +
 .../stm/common-hal/alarm/coproc/CoprocAlarm.h |   1 +
 py/circuitpy_defns.mk                         |   1 +
 shared-bindings/alarm/__init__.c              |  17 ++-
 shared-bindings/alarm/coproc/CoprocAlarm.c    |  87 ++++++++++++++
 shared-bindings/alarm/coproc/CoprocAlarm.h    |  34 ++++++
 shared-bindings/coproc/__init__.c             |   4 +-
 shared-bindings/coproc/__init__.h             |   1 +
 20 files changed, 339 insertions(+), 12 deletions(-)
 create mode 100644 ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.c
 create mode 100644 ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.h
 create mode 100644 ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 create mode 100644 ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
 create mode 100644 ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c
 create mode 100644 ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h
 create mode 100644 ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.h
 create mode 100644 ports/stm/common-hal/alarm/coproc/CoprocAlarm.c
 create mode 100644 ports/stm/common-hal/alarm/coproc/CoprocAlarm.h
 create mode 100644 shared-bindings/alarm/coproc/CoprocAlarm.c
 create mode 100644 shared-bindings/alarm/coproc/CoprocAlarm.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 2208ff25b1..5216c69d0f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -913,9 +914,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1615,8 +1616,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.c b/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.h b/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/atmel-samd/common-hal/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index 11c740b717..4183b7e61b 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -35,6 +35,7 @@
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
+#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
 
 #include "shared-bindings/wifi/__init__.h"
 #include "shared-bindings/microcontroller/__init__.h"
@@ -62,6 +63,7 @@ void alarm_reset(void) {
     alarm_pin_pinalarm_reset();
     alarm_time_timealarm_reset();
     alarm_touch_touchalarm_reset();
+    alarm_coproc_coprocalarm_reset();
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 }
 
@@ -76,6 +78,9 @@ STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(void) {
     if (alarm_touch_touchalarm_woke_this_cycle()) {
         return ESP_SLEEP_WAKEUP_TOUCHPAD;
     }
+    if (alarm_coproc_coprocalarm_woke_this_cycle()) {
+        return ESP_SLEEP_WAKEUP_ULP;
+    }
     // If waking from true deep sleep, modules will have lost their state,
     // so check the deep wakeup cause manually
     return esp_sleep_get_wakeup_cause();
@@ -104,6 +109,10 @@ mp_obj_t common_hal_alarm_create_wake_alarm(void) {
             return alarm_touch_touchalarm_create_wakeup_alarm();
         }
 
+        case ESP_SLEEP_WAKEUP_ULP: {
+            return alarm_coproc_coprocalarm_create_wakeup_alarm();
+        }
+
         case ESP_SLEEP_WAKEUP_UNDEFINED:
         default:
             // Not a deep sleep reset.
@@ -117,6 +126,7 @@ STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t
     alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms);
     alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms);
     alarm_touch_touchalarm_set_alarm(deep_sleep, n_alarms, alarms);
+    alarm_coproc_coprocalarm_set_alarm(deep_sleep, n_alarms, alarms);
 }
 
 mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj_t *alarms) {
@@ -143,6 +153,10 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
                     wake_alarm = alarm_touch_touchalarm_find_triggered_alarm(n_alarms,alarms);
                     break;
                 }
+                case ESP_SLEEP_WAKEUP_ULP: {
+                    wake_alarm = alarm_coproc_coprocalarm_find_triggered_alarm(n_alarms,alarms);
+                    break;
+                }
                 default:
                     // Should not reach this, if all light sleep types are covered correctly
                     break;
@@ -169,6 +183,7 @@ 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) {
     alarm_pin_pinalarm_prepare_for_deep_sleep();
     alarm_touch_touchalarm_prepare_for_deep_sleep();
+    alarm_coproc_coprocalarm_prepare_for_deep_sleep();
 
     // We no longer need to remember the pin preservations, since any pin resets are all done.
     clear_pin_preservations();
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..3e0cff1c4c
--- /dev/null
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/coproc/CoprocAlarm.h"
+#include "shared-bindings/coproc/__init__.h"
+
+#include "esp_sleep.h"
+
+#if CIRCUITPY_COPROC
+
+mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const 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_coproc_coprocalarm_type)) {
+            return alarms[i];
+        }
+    }
+    return mp_const_none;
+}
+
+mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void) {
+    // Create CoprocAlarm object.
+    alarm_coproc_coprocalarm_obj_t *alarm = m_new_obj(alarm_coproc_coprocalarm_obj_t);
+    alarm->base.type = &alarm_coproc_coprocalarm_type;
+    return alarm;
+}
+
+void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
+    bool coproc_alarm_set = false;
+    alarm_coproc_coprocalarm_obj_t *coproc_alarm = MP_OBJ_NULL;
+
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (mp_obj_is_type(alarms[i], &alarm_coproc_coprocalarm_type)) {
+            if (deep_sleep && coproc_alarm_set) {
+                mp_raise_ValueError_varg(translate("Only one %q can be set in deep sleep."), MP_QSTR_CoprocAlarm);
+            }
+            coproc_alarm = MP_OBJ_TO_PTR(alarms[i]);
+            coproc_alarm_set = true;
+        }
+    }
+
+    if (!coproc_alarm_set) {
+        return;
+    }
+
+    // load coproc program
+    common_hal_coproc_load(coproc_alarm->coproc);
+}
+
+void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
+    // start coproc program
+    common_hal_coproc_run(NULL);
+
+    // enable coproc wakeup
+    esp_sleep_enable_ulp_wakeup();
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_SLOW_MEM, ESP_PD_OPTION_ON);
+}
+
+bool alarm_coproc_coprocalarm_woke_this_cycle(void) {
+    return false;
+}
+
+void alarm_coproc_coprocalarm_reset(void) {
+}
+
+#else // CIRCUITPY_COPROC
+
+mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms) {
+    return mp_const_none;
+}
+
+mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void) {
+    return mp_const_none;
+}
+
+void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
+}
+
+void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
+}
+
+bool alarm_coproc_coprocalarm_woke_this_cycle(void) {
+    return false;
+}
+
+void alarm_coproc_coprocalarm_reset(void) {
+}
+
+#endif // CIRCUITPY_COPROC
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..d70e90265d
--- /dev/null
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
+#define MICROPY_INCLUDED_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "common-hal/coproc/Coproc.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    coproc_coproc_obj_t *coproc;
+} alarm_coproc_coprocalarm_obj_t;
+
+mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
+mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void);
+
+void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void);
+void alarm_coproc_coprocalarm_reset(void);
+void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
+bool alarm_coproc_coprocalarm_woke_this_cycle(void);
+
+#endif  // MICROPY_INCLUDED_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
index fc44c1dcc0..ad55e1e056 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
@@ -96,7 +96,7 @@ void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alar
     for (size_t i = 0; i < n_alarms; i++) {
         if (mp_obj_is_type(alarms[i], &alarm_touch_touchalarm_type)) {
             if (deep_sleep && touch_alarm_set) {
-                mp_raise_ValueError(translate("Only one TouchAlarm can be set in deep sleep."));
+                mp_raise_ValueError_varg(translate("Only one %q can be set in deep sleep."), MP_QSTR_TouchAlarm);
             }
             touch_alarm = MP_OBJ_TO_PTR(alarms[i]);
             touch_channel_mask |= 1 << touch_alarm->pin->number;
diff --git a/ports/espressif/common-hal/coproc/__init__.c b/ports/espressif/common-hal/coproc/__init__.c
index 3f53cca5d4..9fce6afcdf 100644
--- a/ports/espressif/common-hal/coproc/__init__.c
+++ b/ports/espressif/common-hal/coproc/__init__.c
@@ -40,11 +40,6 @@
 #include "soc/rtc_cntl_reg.h"
 
 void common_hal_coproc_run(coproc_coproc_obj_t *self) {
-    if (ulp_riscv_load_binary(self->buf, self->buf_len) != ESP_OK) {
-        mp_raise_RuntimeError(translate("Firmware is too big"));
-    }
-    m_free(self->buf);
-    self->buf = (uint8_t *)RTC_SLOW_MEM;
     ulp_riscv_run();
 }
 
@@ -64,6 +59,14 @@ void common_hal_coproc_halt(coproc_coproc_obj_t *self) {
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
 }
 
+void common_hal_coproc_load(coproc_coproc_obj_t *self) {
+    if (ulp_riscv_load_binary(self->buf, self->buf_len) != ESP_OK) {
+        mp_raise_RuntimeError(translate("Firmware is too big"));
+    }
+    m_free(self->buf);
+    self->buf = (uint8_t *)RTC_SLOW_MEM;
+}
+
 mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self) {
     return (self->coproc_memory) ? MP_OBJ_FROM_PTR(self->coproc_memory) : mp_const_none;
 }
diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c b/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h b/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.c b/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.h b/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/stm/common-hal/alarm/coproc/CoprocAlarm.c b/ports/stm/common-hal/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/stm/common-hal/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1 @@
+// empty file
diff --git a/ports/stm/common-hal/alarm/coproc/CoprocAlarm.h b/ports/stm/common-hal/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..4bd8276f34
--- /dev/null
+++ b/ports/stm/common-hal/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1 @@
+// empty file
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 21a3ec2e1e..ee51a58c58 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -400,6 +400,7 @@ SRC_COMMON_HAL_ALL = \
 	alarm/pin/PinAlarm.c \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
+	alarm/coproc/CoprocAlarm.c \
 	analogbufio/BufferedIn.c \
 	analogbufio/__init__.c \
 	analogio/AnalogIn.c \
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 2682d64e5b..0bd9f759d5 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
+#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/supervisor/Runtime.h"
 #include "shared-bindings/time/__init__.h"
@@ -76,7 +77,8 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
     for (size_t i = 0; i < n_args; i++) {
         if (mp_obj_is_type(objs[i], &alarm_pin_pinalarm_type) ||
             mp_obj_is_type(objs[i], &alarm_time_timealarm_type) ||
-            mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type)) {
+            mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type) ||
+            mp_obj_is_type(objs[i], &alarm_coproc_coprocalarm_type)) {
             continue;
         }
         mp_raise_TypeError_varg(translate("Expected an %q"), MP_QSTR_Alarm);
@@ -252,6 +254,18 @@ STATIC const mp_obj_module_t alarm_touch_module = {
     .globals = (mp_obj_dict_t *)&alarm_touch_globals,
 };
 
+STATIC const mp_map_elem_t alarm_coproc_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_coproc) },
+    { MP_ROM_QSTR(MP_QSTR_CoprocAlarm), MP_OBJ_FROM_PTR(&alarm_coproc_coprocalarm_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(alarm_coproc_globals, alarm_coproc_globals_table);
+
+STATIC const mp_obj_module_t alarm_coproc_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&alarm_coproc_globals,
+};
+
 // The module table is mutable because .wake_alarm is a mutable attribute.
 STATIC mp_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
@@ -266,6 +280,7 @@ STATIC mp_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pin), MP_OBJ_FROM_PTR(&alarm_pin_module) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_OBJ_FROM_PTR(&alarm_time_module) },
     { MP_ROM_QSTR(MP_QSTR_touch), MP_OBJ_FROM_PTR(&alarm_touch_module) },
+    { MP_ROM_QSTR(MP_QSTR_coproc), MP_OBJ_FROM_PTR(&alarm_coproc_module) },
 
     { MP_ROM_QSTR(MP_QSTR_SleepMemory),   MP_OBJ_FROM_PTR(&alarm_sleep_memory_type) },
     { MP_ROM_QSTR(MP_QSTR_sleep_memory),  MP_OBJ_FROM_PTR(&alarm_sleep_memory_obj) },
diff --git a/shared-bindings/alarm/coproc/CoprocAlarm.c b/shared-bindings/alarm/coproc/CoprocAlarm.c
new file mode 100644
index 0000000000..0b60282c2f
--- /dev/null
+++ b/shared-bindings/alarm/coproc/CoprocAlarm.c
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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"
+
+#if CIRCUITPY_COPROC
+#include "shared-bindings/util.h"
+#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
+#include "shared-bindings/coproc/Coproc.h"
+
+STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
+    if (!mp_obj_is_type(*self_in, &coproc_coproc_type)) {
+        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_Coproc);
+    }
+    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(*self_in);
+    if (common_hal_coproc_coproc_deinited(self)) {
+        raise_deinited_error();
+    }
+    return self;
+}
+#endif
+
+//| class CoprocAlarm:
+//|     """Trigger an alarm when another core or co-processor requests wake-up."""
+//|
+//|     def __init__(self, coproc: coproc.Coproc) -> None:
+//|         """Create an alarm that will be triggered when the co-processor requests wake-up.
+//|
+//|         The alarm is not active until it is passed to an `alarm`-enabling function, such as
+//|         `alarm.light_sleep_until_alarms()` or `alarm.exit_and_deep_sleep_until_alarms()`.
+//|
+//|         :param coproc.Coproc coproc: The coproc program to run.
+//|
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t alarm_coproc_coprocalarm_make_new(const mp_obj_type_t *type,
+    size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_coproc };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_coproc, MP_ARG_REQUIRED | MP_ARG_OBJ },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    #if CIRCUITPY_COPROC
+    // initialize CoprocAlarm object
+    alarm_coproc_coprocalarm_obj_t *self = m_new_obj(alarm_coproc_coprocalarm_obj_t);
+    self->base.type = &alarm_coproc_coprocalarm_type;
+    self->coproc = get_coproc_obj(&args[ARG_coproc].u_obj);
+    // return CoprocAlarm object
+    return MP_OBJ_FROM_PTR(self);
+    #else
+    mp_raise_NotImplementedError(NULL);
+    return mp_const_none;
+    #endif
+}
+
+const mp_obj_type_t alarm_coproc_coprocalarm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_CoprocAlarm,
+    .make_new = alarm_coproc_coprocalarm_make_new,
+};
diff --git a/shared-bindings/alarm/coproc/CoprocAlarm.h b/shared-bindings/alarm/coproc/CoprocAlarm.h
new file mode 100644
index 0000000000..8f3a85de56
--- /dev/null
+++ b/shared-bindings/alarm/coproc/CoprocAlarm.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
+
+#include "common-hal/alarm/coproc/CoprocAlarm.h"
+
+extern const mp_obj_type_t alarm_coproc_coprocalarm_type;
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
diff --git a/shared-bindings/coproc/__init__.c b/shared-bindings/coproc/__init__.c
index 06b196d8be..1709e9b203 100644
--- a/shared-bindings/coproc/__init__.c
+++ b/shared-bindings/coproc/__init__.c
@@ -68,7 +68,9 @@ STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
 //|     ...
 //|
 STATIC mp_obj_t coproc_run(mp_obj_t self_in) {
-    common_hal_coproc_run(get_coproc_obj(&self_in));
+    coproc_coproc_obj_t *self = get_coproc_obj(&self_in);
+    common_hal_coproc_load(self);
+    common_hal_coproc_run(self);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_run_obj, coproc_run);
diff --git a/shared-bindings/coproc/__init__.h b/shared-bindings/coproc/__init__.h
index 6f2b2a56ae..0609bf827b 100644
--- a/shared-bindings/coproc/__init__.h
+++ b/shared-bindings/coproc/__init__.h
@@ -32,6 +32,7 @@
 
 extern void common_hal_coproc_run(coproc_coproc_obj_t *self);
 extern void common_hal_coproc_halt(coproc_coproc_obj_t *self);
+extern void common_hal_coproc_load(coproc_coproc_obj_t *self);
 extern mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H

From 8cc536bb7fe87f626a43cfb3261fc72ae8a7ad59 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 21 Oct 2022 13:20:16 +0300
Subject: [PATCH 1237/2403] PicoW start_ap()

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 3e95ae5cd1..f05215a131 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -168,7 +168,10 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
-    mp_raise_NotImplementedError(NULL);
+    if (!common_hal_wifi_radio_get_enabled(self)) {
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
+    }
+    cyw43_arch_enable_ap_mode((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
     bindings_cyw43_wifi_enforce_pm();
 }
 

From 2285dd1838fba467f800ad6c114569fb07101909 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 21 Oct 2022 17:11:56 +0530
Subject: [PATCH 1238/2403] update espressif risc-v build configuration

- use optimization level O2
- explicitly state risc-v arch
---
 ports/espressif/Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index ebf636bb39..30c35f9caf 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -163,12 +163,9 @@ ifeq ($(DEBUG), 1)
   # CFLAGS += -fno-inline -fno-ipa-sra
 else
   CFLAGS += -DNDEBUG -ggdb3
-	ifeq ($(IDF_TARGET_ARCH),xtensa)
-	  OPTIMIZATION_FLAGS ?= -O2
-	else
-		# RISC-V is larger than xtensa so do -Os for it
-	  OPTIMIZATION_FLAGS ?= -Os
-	endif
+  OPTIMIZATION_FLAGS ?= -O2
+  # RISC-V is larger than xtensa
+  # Use -Os for RISC-V when it overflows
 endif
 
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
@@ -178,6 +175,8 @@ CFLAGS += $(INC) -Werror -Wall -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_D
 
 ifeq ($(IDF_TARGET_ARCH),xtensa)
 CFLAGS += -mlongcalls
+else ifeq ($(IDF_TARGET_ARCH),riscv)
+CFLAGS += -march=rv32imc
 endif
 
 LDFLAGS = $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority

From 5b2728bd65a9b6463dd33326d8400d57ef3b10f8 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 21 Oct 2022 17:13:19 +0530
Subject: [PATCH 1239/2403] reorganize espressif `mpconfigport.mk`

---
 ports/espressif/mpconfigport.mk | 77 ++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 404f47cfe9..241cbcd0df 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -7,77 +7,86 @@ INTERNAL_LIBM = 1
 # Longints can be implemented as mpz, as longlong, or not
 LONGINT_IMPL = MPZ
 
-# These modules are implemented in ports//common-hal:
+# Enable more features
 CIRCUITPY_FULL_BUILD ?= 1
+
+# These modules are implemented in ports//common-hal:
 CIRCUITPY_ALARM ?= 1
-CIRCUITPY_AUDIOCORE ?= 1
-CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_AUDIOBUSIO ?= 1
-CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
 CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
+CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
+CIRCUITPY_AUDIOCORE ?= 1
 CIRCUITPY_AUDIOIO ?= 0
 CIRCUITPY_AUDIOMIXER ?= 1
+CIRCUITPY_AUDIOMP3 ?= 0
+CIRCUITPY_BLEIO ?= 1
+CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_CANIO ?= 1
-CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_COPROC ?= 1
+CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
+CIRCUITPY_ESPIDF ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
 CIRCUITPY_HASHLIB ?= 1
-CIRCUITPY_IMAGECAPTURE ?= 0
 CIRCUITPY_I2CTARGET ?= 1
-CIRCUITPY_RGBMATRIX ?= 1
-CIRCUITPY_ROTARYIO ?= 1
+CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_NVM ?= 1
 CIRCUITPY_PS2IO ?= 1
+CIRCUITPY_RGBMATRIX ?= 1
+CIRCUITPY_ROTARYIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1
-CIRCUITPY_WIFI ?= 1
 CIRCUITPY_WATCHDOG ?= 1
+CIRCUITPY_WIFI ?= 1
 
-CIRCUITPY_ESPIDF ?= 1
-
+# Conditionally turn off modules/features
 ifeq ($(IDF_TARGET),esp32)
+# Modules
 CIRCUITPY_BLEIO = 0
-CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_COPROC = 0
 CIRCUITPY_PARALLELDISPLAY = 0
-# Protomatter needs to support ESP32.
 CIRCUITPY_RGBMATRIX = 0
+# Features
 CIRCUITPY_USB = 0
-CIRCUITPY_BUILD_EXTENSIONS ?= bin
-CIRCUITPY_ESP32_CAMERA ?= 1
 
 else ifeq ($(IDF_TARGET),esp32c3)
-CIRCUITPY_AESIO = 0
+# Modules
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BLEIO = 1
-CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_COUNTIO = 0
 CIRCUITPY_COPROC = 0
-CIRCUITPY_DUALBANK = 0
+CIRCUITPY_COUNTIO = 0
+CIRCUITPY_ESP32_CAMERA = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_PARALLELDISPLAY = 0
-CIRCUITPY_PS2IO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
+# Features
 CIRCUITPY_USB = 0
-CIRCUITPY_BUILD_EXTENSIONS ?= bin
-
-else ifeq ($(IDF_TARGET),esp32s3)
-CIRCUITPY_BLEIO = 1
-CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_PARALLELDISPLAY = 0
-CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
-CIRCUITPY_ESP32_CAMERA ?= 1
 
 else ifeq ($(IDF_TARGET),esp32s2)
-# No BLE on S2
+# Modules
 CIRCUITPY_BLEIO = 0
-CIRCUITPY_BLEIO_HCI = 0
+
+else ifeq ($(IDF_TARGET),esp32s3)
+# Modules
+CIRCUITPY_PARALLELDISPLAY = 0
+endif
+
+# No room for dualbank on boards with 2MB flash
+ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
+CIRCUITPY_DUALBANK = 0
+endif
+
+# Modules dependent on other modules
+CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESP32_CAMERA)
+CIRCUITPY_QRIO ?= $(CIRCUITPY_ESP32_CAMERA)
+
+# Features dependent on other features
+ifneq ($(CIRCUITPY_USB),0)
 CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
-CIRCUITPY_ESP32_CAMERA ?= 1
+else
+CIRCUITPY_BUILD_EXTENSIONS ?= bin
 endif
 
 # From ESP32-S2/S3 Technical Reference Manual:
@@ -91,7 +100,3 @@ endif
 # only if something else is turned off, such as HID.
 USB_NUM_ENDPOINT_PAIRS = 7
 USB_NUM_IN_ENDPOINTS = 5
-
-CIRCUITPY_ESP32_CAMERA ?= 0
-CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESP32_CAMERA)
-CIRCUITPY_QRIO ?= $(CIRCUITPY_ESP32_CAMERA)

From ceb54a7dae9229d61c680d723dc045ecbba28627 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 20 Oct 2022 14:31:03 +0000
Subject: [PATCH 1240/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 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 fb19bfc5ba..9c0b88c9b5 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: 2022-10-18 11:12+0000\n"
+"PO-Revision-Date: 2022-10-21 15:02+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.15-dev\n"
+"X-Generator: Weblate 4.14.2-dev\n"
 
 #: main.c
 msgid ""
@@ -2235,7 +2235,7 @@ msgstr "Não é possível iniciar a consulta mDNS"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "Não é possível escrever"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."

From 5f2d66abc60cce73f1b0b1ff605f4161c898f179 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 20 Oct 2022 07:24:03 +0000
Subject: [PATCH 1241/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index c29c3c34c7..ac89d18fa6 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: 2022-10-18 11:12+0000\n"
+"PO-Revision-Date: 2022-10-21 15:02+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.15-dev\n"
+"X-Generator: Weblate 4.14.2-dev\n"
 
 #: main.c
 msgid ""
@@ -2210,7 +2210,7 @@ msgstr "Det gick inte att starta mDNS-frågan"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "Kan inte skriva"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."

From b08d2ed9d7f4ef6e311ce40f38859950d165d755 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 21 Oct 2022 19:36:10 +0200
Subject: [PATCH 1242/2403] 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             | 10 ++++++----
 locale/cs.po             | 10 ++++++----
 locale/de_DE.po          | 15 ++++++++++-----
 locale/el.po             | 10 ++++++----
 locale/en_GB.po          | 15 ++++++++++-----
 locale/es.po             | 15 ++++++++++-----
 locale/fil.po            | 10 ++++++----
 locale/fr.po             | 15 ++++++++++-----
 locale/hi.po             | 10 ++++++----
 locale/it_IT.po          | 10 ++++++----
 locale/ja.po             | 10 ++++++----
 locale/ko.po             | 10 ++++++----
 locale/nl.po             | 10 ++++++----
 locale/pl.po             | 10 ++++++----
 locale/pt_BR.po          | 15 ++++++++++-----
 locale/ru.po             | 10 ++++++----
 locale/sv.po             | 15 ++++++++++-----
 locale/tr.po             | 10 ++++++----
 locale/zh_Latn_pinyin.po | 15 ++++++++++-----
 19 files changed, 142 insertions(+), 83 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 5e5d89663e..faf9fbc66b 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -106,6 +106,7 @@ msgstr "%q berisi pin duplikat"
 msgid "%q failure: %d"
 msgstr "%q gagal: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -926,9 +927,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Diharapkan %q"
@@ -1635,8 +1636,9 @@ msgstr ""
 "Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
 "didukung: %d bpp diberikan"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/cs.po b/locale/cs.po
index 9e7b260f1d..7d703fc76d 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -107,6 +107,7 @@ msgstr "%q obsahuje duplicitní piny"
 msgid "%q failure: %d"
 msgstr "%q: selhání %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -924,9 +925,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Očekává se %q"
@@ -1631,8 +1632,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 61943b7a43..fde15bd378 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -108,6 +108,7 @@ msgstr "%q enthält doppelte Pins"
 msgid "%q failure: %d"
 msgstr "%q Fehler: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -931,9 +932,9 @@ msgid "Error: Failure to bind"
 msgstr "Error: Bind Fehler"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Erwartet ein(e) %q"
@@ -1651,9 +1652,10 @@ msgstr ""
 "Nur monochrome, indizierte 4bpp oder 8bpp, und 16bpp oder größere BMPs "
 "unterstützt: %d bpp wurden gegeben"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4463,6 +4465,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Only one TouchAlarm can be set in deep sleep."
+#~ msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Firmware Image ist ungültig"
 
diff --git a/locale/el.po b/locale/el.po
index 0cacf05e30..60bfa27307 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -112,6 +112,7 @@ msgstr "%q περιέχει διπλότυπα pins"
 msgid "%q failure: %d"
 msgstr "%q αποτυχία: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -938,9 +939,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1640,8 +1641,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/en_GB.po b/locale/en_GB.po
index f4cfa25760..627c7106a2 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -110,6 +110,7 @@ msgstr "%q contains duplicate pins"
 msgid "%q failure: %d"
 msgstr "%q failure: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -927,9 +928,9 @@ msgid "Error: Failure to bind"
 msgstr "Error: Failure to bind"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Expected a %q"
@@ -1635,9 +1636,10 @@ msgstr ""
 "Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
 "%d bpp given"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4401,6 +4403,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 "Only one TouchAlarm can be set in deep sleep."
+#~ msgstr "Only one TouchAlarm can be set in deep sleep."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Firmware image is invalid"
 
diff --git a/locale/es.po b/locale/es.po
index 6461a996d4..21babb4e23 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -112,6 +112,7 @@ msgstr "%q contiene pines duplicados"
 msgid "%q failure: %d"
 msgstr "%q fallo: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -937,9 +938,9 @@ msgid "Error: Failure to bind"
 msgstr "Error: fallo al vincular"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Se espera un %q"
@@ -1659,9 +1660,10 @@ msgstr ""
 "Solo se admiten BMP monocromáticos, indexados de 4 bpp u 8 bpp y 16 bpp o "
 "más: %d bpp proporcionados"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4449,6 +4451,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 one TouchAlarm can be set in deep sleep."
+#~ msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "La imagen de firmware es inválida"
 
diff --git a/locale/fil.po b/locale/fil.po
index 7530e6b30d..20c2dd1aba 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -101,6 +101,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -923,9 +924,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Umasa ng %q"
@@ -1630,8 +1631,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/fr.po b/locale/fr.po
index 464062d17f..485b008e6d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -112,6 +112,7 @@ msgstr "%q contient des broches en double"
 msgid "%q failure: %d"
 msgstr "Échec de %q : %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -947,9 +948,9 @@ msgid "Error: Failure to bind"
 msgstr "Erreur : Impossible de lier"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Attendu un %q"
@@ -1679,9 +1680,10 @@ msgstr ""
 "Seulement les BMP monochromes, 4 bpp ou 8 bpp, ou 16 bpp et plus sont "
 "supportés: %d bpp fournis"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4491,6 +4493,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 "Only one TouchAlarm can be set in deep sleep."
+#~ msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Image du microprogramme est invalide"
 
diff --git a/locale/hi.po b/locale/hi.po
index b95bdf0028..e0024646b9 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -913,9 +914,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1615,8 +1616,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a0e071c261..8625d8a043 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -107,6 +107,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fallito: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -928,9 +929,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Atteso un %q"
@@ -1637,8 +1638,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/ja.po b/locale/ja.po
index de7b3fa86b..43ad83d1af 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -105,6 +105,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q 失敗: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -922,9 +923,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%qが必要"
@@ -1628,8 +1629,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/ko.po b/locale/ko.po
index fa1d513657..d342ff7f24 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -101,6 +101,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -916,9 +917,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%q 이 예상되었습니다."
@@ -1618,8 +1619,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/nl.po b/locale/nl.po
index 1375050d8f..bbb6c60c3f 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -103,6 +103,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fout: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -921,9 +922,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Verwacht een %q"
@@ -1632,8 +1633,9 @@ msgstr ""
 "Alleen monochrome en 4bpp of 8bpp, en 16bpp of grotere geïndiceerde BMP's "
 "zijn ondersteund: %d bpp is gegeven"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/pl.po b/locale/pl.po
index de5fad6cf4..e68f6c7882 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -105,6 +105,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q niepowodzenie: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -922,9 +923,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Oczekiwano %q"
@@ -1626,8 +1627,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9c0b88c9b5..71897ddaf3 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -109,6 +109,7 @@ msgstr "%q contém pinos duplicados"
 msgid "%q failure: %d"
 msgstr "%q falha: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -940,9 +941,9 @@ msgid "Error: Failure to bind"
 msgstr "Erro: Falha na vinculação"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Esperado um"
@@ -1661,9 +1662,10 @@ msgstr ""
 "São compatíveis apenas os BMPs monocromáticos, indexados em 4bpp ou 8bpp e "
 "16bpp ou superior: determinado %d bpp"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4469,6 +4471,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 one TouchAlarm can be set in deep sleep."
+#~ msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "A imagem do firmware é invalida"
 
diff --git a/locale/ru.po b/locale/ru.po
index 49616ca9f4..53861db3d0 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -108,6 +108,7 @@ msgstr "%q содержит пины-дупликаты"
 msgid "%q failure: %d"
 msgstr "%q сбой: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -938,9 +939,9 @@ msgid "Error: Failure to bind"
 msgstr "Ошибка: Сбой привязки"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Ожидалось(ся) %q"
@@ -1657,8 +1658,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/sv.po b/locale/sv.po
index ac89d18fa6..1e49a02d56 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -108,6 +108,7 @@ msgstr "%q innehåller dubblettstift"
 msgid "%q failure: %d"
 msgstr "%q-fel: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -929,9 +930,9 @@ msgid "Error: Failure to bind"
 msgstr "Fel: Bind misslyckades"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Förväntade %q"
@@ -1643,9 +1644,10 @@ msgstr ""
 "Endast monokrom, indexerad 4 bpp eller 8 bpp och 16 bpp eller högre BMP: er "
 "stöds: %d bpp angiven"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4430,6 +4432,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 one TouchAlarm can be set in deep sleep."
+#~ msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Firmware-avbilden är ogiltig"
 
diff --git a/locale/tr.po b/locale/tr.po
index 1df27d386d..9d3149490c 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -112,6 +112,7 @@ msgstr "%q yinelenen pinler içeriyor"
 msgid "%q failure: %d"
 msgstr "%q hata: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -930,9 +931,9 @@ msgid "Error: Failure to bind"
 msgstr ""
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1632,8 +1633,9 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
+msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 17e755b0c1..9e4d43c1cd 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -111,6 +111,7 @@ msgstr "%q bāo hán chóng fù de yǐn jiǎo"
 msgid "%q failure: %d"
 msgstr "%q Shībài: %d"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q in use"
@@ -930,9 +931,9 @@ msgid "Error: Failure to bind"
 msgstr "cuò wù: bǎng dìng shī bài"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/coproc/Coproc.c shared-bindings/coproc/__init__.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
+#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
+#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Yùqí %q"
@@ -1649,9 +1650,10 @@ msgstr ""
 "Jǐn zhīchí dān sè, suǒyǐn wéi 4bpp huò 8bpp yǐjí 16bpp huò gèng gāo de BMP: "
 "Gěi chū %d bpp"
 
+#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
-msgid "Only one TouchAlarm can be set in deep sleep."
-msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mián."
+msgid "Only one %q can be set in deep sleep."
+msgstr ""
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -4432,6 +4434,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 "Only one TouchAlarm can be set in deep sleep."
+#~ msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mián."
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "gù jiàn yìng xiàng wú xiào"
 

From 01c15a1d1b78773177ef630708f9cd5211f5c6ab Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 21 Oct 2022 12:50:27 -0400
Subject: [PATCH 1243/2403] catalog implementation limitations in documentation

---
 shared-bindings/alarm/SleepMemory.c         |  2 +
 shared-bindings/alarm/__init__.c            |  2 +
 shared-bindings/alarm/touch/TouchAlarm.c    |  2 +
 shared-bindings/analogio/AnalogOut.c        |  6 ++-
 shared-bindings/audiobusio/PDMIn.c          | 41 +++++++++++----------
 shared-bindings/busio/SPI.c                 |  5 ++-
 shared-bindings/busio/UART.c                |  7 ++--
 shared-bindings/countio/Edge.c              |  5 ++-
 shared-bindings/microcontroller/Processor.c |  2 +-
 shared-bindings/os/__init__.c               |  5 ++-
 shared-bindings/rtc/RTC.c                   |  3 ++
 shared-bindings/watchdog/WatchDogMode.c     |  2 +
 12 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c
index 318f2b772d..0304abfbcc 100644
--- a/shared-bindings/alarm/SleepMemory.c
+++ b/shared-bindings/alarm/SleepMemory.c
@@ -42,6 +42,8 @@
 //|     instance of :class:`SleepMemory` is available at
 //|     :attr:`alarm.sleep_memory`.
 //|
+//|     **Limitations:** Not supported on RP2040.
+//|
 //|     Usage::
 //|
 //|        import alarm
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 2682d64e5b..33e2c8b0b0 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -144,6 +144,8 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB
 //|
 //|     On some microcontrollers, some pins cannot remain in their original state for hardware reasons.
 //|
+//|     **Limitations:** ``preserve_dios`` is currently only available on Espressif.
+//|
 //|     .. note::
 //|       On Espressif chips, preserving pin settings during deep sleep may consume extra current.
 //|       On ESP32, this was measured to be 250 uA or more.
diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c
index 03f9ea4757..cce31e6ffe 100644
--- a/shared-bindings/alarm/touch/TouchAlarm.c
+++ b/shared-bindings/alarm/touch/TouchAlarm.c
@@ -39,6 +39,8 @@
 //|
 //|         :param microcontroller.Pin pin: The pin to monitor. On some ports, the choice of pin
 //|           may be limited due to hardware restrictions, particularly for deep-sleep alarms.
+//|
+//|         **Limitations:** Not available on SAMD, nRF, or RP2040.
 //|         """
 //|         ...
 STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type,
diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index fa33944164..c8a109aa23 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -50,7 +50,11 @@
 //|     def __init__(self, pin: microcontroller.Pin) -> None:
 //|         """Use the AnalogOut on the given pin.
 //|
-//|         :param ~microcontroller.Pin pin: the pin to output to"""
+//|         :param ~microcontroller.Pin pin: the pin to output to
+//|
+//|         **Limitations:** Not available on nRF, RP2040, Spresense: there is no on-chip DAC.
+//|          Espressif: available only on ESP32 and ESP32-S2; other chips do not have a DAC.
+//|         """
 //|         ...
 STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index c44a640d6f..db19ab6edd 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -65,31 +65,32 @@
 //|         :param int oversample: Number of single bit samples to decimate into a final sample. Must be divisible by 8
 //|         :param float startup_delay: seconds to wait after starting microphone clock
 //|          to allow microphone to turn on. Most require only 0.01s; some require 0.1s. Longer is safer.
-//|          Must be in range 0.0-1.0 seconds."""
-
-//|     """Record 8-bit unsigned samples to buffer::
+//|          Must be in range 0.0-1.0 seconds.
 //|
-//|       import audiobusio
-//|       import board
+//|         **Limitations:** On SAMD and RP2040, supports only 8 or 16 bit mono input, with 64x oversampling.
+//|         On nRF52840, supports only 16 bit mono input at 16 kHz; oversampling is fixed at 64x. Not provided
+//|         on nRF52833 for space reasons. Not available on Espressif.
 //|
-//|       # Prep a buffer to record into
-//|       b = bytearray(200)
-//|       with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000) as mic:
-//|           mic.record(b, len(b))
+//|         For example, to record 8-bit unsigned samples to a buffer::
 //|
-//|     Record 16-bit unsigned samples to buffer::
+//|           import audiobusio
+//|           import board
 //|
-//|       import audiobusio
-//|       import board
+//|           # Prep a buffer to record into
+//|           b = bytearray(200)
+//|           with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000) as mic:
+//|               mic.record(b, len(b))
 //|
-//|       # Prep a buffer to record into. The array interface doesn't allow for
-//|       # constructing with a set size so we append to it until we have the size
-//|       # we want.
-//|       b = array.array("H")
-//|       for i in range(200):
-//|           b.append(0)
-//|       with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000, bit_depth=16) as mic:
-//|           mic.record(b, len(b))"""
+//|         To record 16-bit unsigned samples to a buffer::
+//|
+//|           import audiobusio
+//|           import board
+//|
+//|           # Prep a buffer to record into.
+//|           b = array.array("H", [0] * 200)
+//|           with audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA, sample_rate=16000, bit_depth=16) as mic:
+//|               mic.record(b, len(b))
+//|         """
 //|     ...
 STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_PDMIN
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index 4826797ee2..badf80bf93 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -81,7 +81,10 @@
 //|         :param ~microcontroller.Pin clock: the pin to use for the clock.
 //|         :param ~microcontroller.Pin MOSI: the Main Out Selected In pin.
 //|         :param ~microcontroller.Pin MISO: the Main In Selected Out pin.
-//|         :param bool half_duplex: True when MOSI is used for bidirectional data. False when SPI is full-duplex or simplex."""
+//|         :param bool half_duplex: True when MOSI is used for bidirectional data. False when SPI is full-duplex or simplex.
+//|
+//|         **Limitations:** ``half_duplex`` is available only on STM; other chips do not have the hardware support.
+//|         """
 //|         ...
 
 
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 5663254897..eb4f15afe5 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -77,9 +77,10 @@
 //|         *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds.
 //|         The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds.
 //|
-//|         .. note:: RS485 support on i.MX and Raspberry Pi RP2040 is implemented in software.
-//|            The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet
-//|            RS485 specifications intermittently.
+//|         **Limitations:** RS485 is not supported on SAMD, nRF, Broadcom, Spresense, or STM.
+//|         On i.MX and Raspberry Pi RP2040 support is implemented in software:
+//|         The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet
+//|         RS485 specifications intermittently.
 //|         """
 //|         ...
 typedef struct {
diff --git a/shared-bindings/countio/Edge.c b/shared-bindings/countio/Edge.c
index 104b75a5be..ec96163b3e 100644
--- a/shared-bindings/countio/Edge.c
+++ b/shared-bindings/countio/Edge.c
@@ -47,7 +47,10 @@ MAKE_ENUM_VALUE(countio_edge_type, edge, RISE_AND_FALL, EDGE_RISE_AND_FALL);
 //|     """Count the falling edges."""
 //|
 //|     RISE_AND_FALL: Edge
-//|     """Count the rising and falling edges."""
+//|     """Count the rising and falling edges.
+//|
+//|     **Limitations:** ``RISE_AND_FALL`` is not available to RP2040 due to hardware limitations.
+//|     """
 //|
 MAKE_ENUM_MAP(countio_edge) {
     MAKE_ENUM_MAP_ENTRY(edge, RISE),
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 5a4a2556e1..16312c0c94 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -106,7 +106,7 @@ MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj,
 //|
 //|     Is `None` if the temperature is not available.
 //|
-//|     .. note :: On small SAMD21 builds without external flash,
+//|     **Limitations:** Not available on ESP32 or ESP32-S3. On small SAMD21 builds without external flash,
 //|       the reported temperature has reduced accuracy and precision, to save code space.
 //|     """
 STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) {
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 4049c04722..1260903203 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -235,7 +235,10 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
 
 //| def urandom(size: int) -> str:
 //|     """Returns a string of *size* random bytes based on a hardware True Random
-//|     Number Generator. When not available, it will raise a NotImplementedError."""
+//|     Number Generator. When not available, it will raise a NotImplementedError.
+//|
+//|     **Limitations:** Not yet available on nRF. Not available on SAMD21 due to lack of hardware.
+//|     """
 //|     ...
 //|
 STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c
index 8e2d9e5e09..bf2b0915c4 100644
--- a/shared-bindings/rtc/RTC.c
+++ b/shared-bindings/rtc/RTC.c
@@ -93,6 +93,9 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj,
 //|     """The RTC calibration value as an `int`.
 //|
 //|     A positive value speeds up the clock and a negative value slows it down.
+//|
+//|     **Limitations:** Calibration not supported on SAMD, nRF, RP240, Spresense, and STM.
+//|
 //|     Range and value is hardware specific, but one step is often approximately 1 ppm::
 //|
 //|       import rtc
diff --git a/shared-bindings/watchdog/WatchDogMode.c b/shared-bindings/watchdog/WatchDogMode.c
index b9ee82e186..c707054d27 100644
--- a/shared-bindings/watchdog/WatchDogMode.c
+++ b/shared-bindings/watchdog/WatchDogMode.c
@@ -34,6 +34,8 @@
 //|     RAISE: WatchDogMode
 //|     """Raise an exception when the WatchDogTimer expires.
 //|
+//|     **Limitations:** ``RAISE`` mode is not supported on SAMD or RP2040.
+//|
 //|     :type WatchDogMode:"""
 //|
 //|     RESET: WatchDogMode

From d147712522106322e80e34b42ffeb66a271ccefa Mon Sep 17 00:00:00 2001
From: askpatrickw 
Date: Fri, 22 Jul 2022 15:47:07 -0700
Subject: [PATCH 1244/2403] Add M5 Stamp C3 board

---
 .../espressif/boards/m5stack_stamp_c3/board.c | 29 +++++++++
 .../boards/m5stack_stamp_c3/mpconfigboard.h   | 42 +++++++++++++
 .../boards/m5stack_stamp_c3/mpconfigboard.mk  | 10 +++
 .../espressif/boards/m5stack_stamp_c3/pins.c  | 63 +++++++++++++++++++
 .../boards/m5stack_stamp_c3/sdkconfig         |  5 ++
 5 files changed, 149 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_stamp_c3/board.c
 create mode 100644 ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_stamp_c3/pins.c
 create mode 100644 ports/espressif/boards/m5stack_stamp_c3/sdkconfig

diff --git a/ports/espressif/boards/m5stack_stamp_c3/board.c b/ports/espressif/boards/m5stack_stamp_c3/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stamp_c3/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.h b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.h
new file mode 100644
index 0000000000..3e8be96d7d
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.h
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+// Board setup
+
+#define MICROPY_HW_BOARD_NAME       "M5STACK STAMP-C3"
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
+
+// Status LED
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO2)
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+// #define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
+
+// Serial over UART
+#define CIRCUITPY_CONSOLE_UART_RX               (&pin_GPIO20)
+#define CIRCUITPY_CONSOLE_UART_TX               (&pin_GPIO21)
diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
new file mode 100644
index 0000000000..a76db338f3
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00C30001
+
+IDF_TARGET = esp32c3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/m5stack_stamp_c3/pins.c b/ports/espressif/boards/m5stack_stamp_c3/pins.c
new file mode 100644
index 0000000000..96bc0c60ed
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stamp_c3/pins.c
@@ -0,0 +1,63 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // port A
+    { MP_ROM_QSTR(MP_QSTR_G0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_G1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+
+    // neopixel
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_G2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+
+    // button
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_G3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+
+    // GPIO
+    { MP_ROM_QSTR(MP_QSTR_G4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_G5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_G6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_G7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_G8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+
+    // USB JTAG pins
+    { MP_ROM_QSTR(MP_QSTR_G18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_G19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+
+    // UART
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_G20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_G21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_stamp_c3/sdkconfig b/ports/espressif/boards/m5stack_stamp_c3/sdkconfig
new file mode 100644
index 0000000000..34260aa7f2
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stamp_c3/sdkconfig
@@ -0,0 +1,5 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="m5stack-stamp-c3"
+# end of LWIP

From eb1b2f38a080e998e62807fb7ac8090b804fa186 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 21 Oct 2022 20:42:26 -0700
Subject: [PATCH 1245/2403] Fix USB issues caused by early usb_cdc.Serial read

Check for connected before calling read. Otherwise TinyUSB may
setup the read on the wrong endpoint.

Fixes #6018
`
---
 shared-module/usb_cdc/Serial.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared-module/usb_cdc/Serial.c b/shared-module/usb_cdc/Serial.c
index 7f1bc75a53..23bcc8722d 100644
--- a/shared-module/usb_cdc/Serial.c
+++ b/shared-module/usb_cdc/Serial.c
@@ -38,7 +38,10 @@ size_t common_hal_usb_cdc_serial_read(usb_cdc_serial_obj_t *self, uint8_t *data,
 
     // Read up to len bytes immediately.
     // The number of bytes read will not be larger than what is already in the TinyUSB FIFO.
-    uint32_t total_num_read = tud_cdc_n_read(self->idx, data, len);
+    uint32_t total_num_read = 0;
+    if (tud_cdc_n_connected(self->idx)) {
+        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.
@@ -65,7 +68,9 @@ size_t common_hal_usb_cdc_serial_read(usb_cdc_serial_obj_t *self, uint8_t *data,
             data += num_read;
 
             // Try to read another batch of bytes.
-            num_read = tud_cdc_n_read(self->idx, data, len);
+            if (tud_cdc_n_connected(self->idx)) {
+                num_read = tud_cdc_n_read(self->idx, data, len);
+            }
             total_num_read += num_read;
         }
     }

From 7a50beb67e92ba326177540a00e12081aeedfa54 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Sat, 22 Oct 2022 11:58:44 +0300
Subject: [PATCH 1246/2403] PicoW more ap work

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index f05215a131..9c2dea85c7 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -171,12 +171,17 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
+    // Is there a better way?
+    common_hal_wifi_radio_stop_station(self);
+
     cyw43_arch_enable_ap_mode((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
+    // TODO: Implement authmode check like in espressif
     bindings_cyw43_wifi_enforce_pm();
 }
 
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
-    mp_raise_NotImplementedError(NULL);
+    common_hal_wifi_radio_stop_station(self);
+    // I mean, since it already does both..
 }
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
@@ -188,8 +193,12 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     uint64_t start = port_get_raw_ticks(NULL);
     uint64_t deadline = start + timeout_ms;
 
+    // disconnect
+    common_hal_wifi_radio_stop_station(self);
+
     // connect
     cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
+    // TODO: Implement authmode check like in espressif
 
     while (port_get_raw_ticks(NULL) < deadline) {
         RUN_BACKGROUND_TASKS;

From 83b54d003dde20961bd627688b69362244538335 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 22 Oct 2022 19:05:48 +0530
Subject: [PATCH 1247/2403] implement more checks in coproc module

- check memory address range
- check firmware size at an earlier stage
---
 locale/circuitpython.pot                      |  4 +++-
 ports/espressif/common-hal/coproc/Coproc.c    | 21 +++++++++++++++++++
 .../esp-idf-config/sdkconfig-esp32s2.defaults |  2 +-
 .../esp-idf-config/sdkconfig-esp32s3.defaults |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5216c69d0f..dda2cbd02c 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -193,6 +193,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -485,6 +486,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1015,7 +1017,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/ports/espressif/common-hal/coproc/Coproc.c b/ports/espressif/common-hal/coproc/Coproc.c
index 1216b5dde3..c2115c1e94 100644
--- a/ports/espressif/common-hal/coproc/Coproc.c
+++ b/ports/espressif/common-hal/coproc/Coproc.c
@@ -27,12 +27,33 @@
 #include "shared-bindings/coproc/Coproc.h"
 #include "shared-bindings/coproc/CoprocMemory.h"
 
+#include "py/runtime.h"
+
+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#include "esp32s2/ulp.h"
+#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM)
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+#include "esp32s3/ulp.h"
+#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM)
+#endif
+
+#define RTC_SLOW_MEM_END ((uint32_t)RTC_SLOW_MEM + ULP_COPROC_RESERVE_MEM)
+
 void common_hal_coproc_coproc_construct(coproc_coproc_obj_t *self,
     const uint8_t *buf, const size_t buf_len, coproc_memory_obj_t *coproc_memory) {
     // set CoprocMemory object
+    if (coproc_memory != NULL) {
+        if (coproc_memory->address < ((uint32_t)RTC_SLOW_MEM + buf_len) ||
+            coproc_memory->address > (RTC_SLOW_MEM_END - coproc_memory->len)) {
+            mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_CoprocMemory);
+        }
+    }
     self->coproc_memory = coproc_memory;
 
     // load buffer
+    if (buf_len > ULP_COPROC_RESERVE_MEM) {
+        mp_raise_RuntimeError(translate("Firmware is too big"));
+    }
     self->buf_len = buf_len;
     self->buf = (uint8_t *)m_malloc(self->buf_len, false);
     memcpy(self->buf, buf, self->buf_len);
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
index d96a6c5366..bfd64ef90e 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
@@ -42,7 +42,7 @@ CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y
 # CONFIG_ESP32S2_TRAX is not set
 CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
 CONFIG_ESP32S2_ULP_COPROC_ENABLED=y
-CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=4096
+CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=8176
 CONFIG_ESP32S2_ULP_COPROC_RISCV=y
 CONFIG_ESP32S2_DEBUG_OCDAWARE=y
 # CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
index 30a71c6a44..f6fb80c752 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
@@ -68,7 +68,7 @@ CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32
 # CONFIG_ESP32S3_TRAX is not set
 CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0
 CONFIG_ESP32S3_ULP_COPROC_ENABLED=y
-CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=4096
+CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=8176
 CONFIG_ESP32S3_ULP_COPROC_RISCV=y
 CONFIG_ESP32S3_BROWNOUT_DET=y
 CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y

From 8f0a674a1b97c3682656322b0b45c85fb1c8e0d6 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 22 Oct 2022 19:08:49 +0530
Subject: [PATCH 1248/2403] coproc module enhancements

- add light and pretend-to-deep sleep support
- check coproc running status
---
 .../common-hal/alarm/coproc/CoprocAlarm.c     | 32 +++++++++++++++----
 ports/espressif/common-hal/coproc/__init__.c  | 18 +++++------
 shared-bindings/coproc/__init__.c             |  4 +--
 shared-bindings/coproc/__init__.h             |  1 -
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
index 3e0cff1c4c..aa49e13a2a 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
@@ -27,9 +27,16 @@
 #include "shared-bindings/alarm/coproc/CoprocAlarm.h"
 #include "shared-bindings/coproc/__init__.h"
 
+#if CIRCUITPY_COPROC
+
+#include "supervisor/port.h"
+
+#include "driver/rtc_cntl.h"
+#include "soc/rtc_cntl_reg.h"
+
 #include "esp_sleep.h"
 
-#if CIRCUITPY_COPROC
+static volatile bool woke_up = false;
 
 mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms) {
     for (size_t i = 0; i < n_alarms; i++) {
@@ -47,6 +54,13 @@ mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void) {
     return alarm;
 }
 
+// This is used to wake the main CircuitPython task.
+STATIC void coproc_interrupt(void *arg) {
+    (void)arg;
+    woke_up = true;
+    port_wake_main_task_from_isr();
+}
+
 void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
     bool coproc_alarm_set = false;
     alarm_coproc_coprocalarm_obj_t *coproc_alarm = MP_OBJ_NULL;
@@ -65,13 +79,18 @@ void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_al
         return;
     }
 
-    // load coproc program
-    common_hal_coproc_load(coproc_alarm->coproc);
+    // enable coproc interrupt
+    rtc_isr_register(&coproc_interrupt, NULL, RTC_CNTL_COCPU_INT_ST);
+    REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+
+    // start coproc program
+    common_hal_coproc_run(coproc_alarm->coproc);
 }
 
 void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
-    // start coproc program
-    common_hal_coproc_run(NULL);
+    // disbale coproc interrupt
+    rtc_isr_deregister(&coproc_interrupt, NULL);
+    REG_CLR_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
 
     // enable coproc wakeup
     esp_sleep_enable_ulp_wakeup();
@@ -79,10 +98,11 @@ void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
 }
 
 bool alarm_coproc_coprocalarm_woke_this_cycle(void) {
-    return false;
+    return woke_up;
 }
 
 void alarm_coproc_coprocalarm_reset(void) {
+    woke_up = false;
 }
 
 #else // CIRCUITPY_COPROC
diff --git a/ports/espressif/common-hal/coproc/__init__.c b/ports/espressif/common-hal/coproc/__init__.c
index 9fce6afcdf..e372bfa235 100644
--- a/ports/espressif/common-hal/coproc/__init__.c
+++ b/ports/espressif/common-hal/coproc/__init__.c
@@ -40,6 +40,14 @@
 #include "soc/rtc_cntl_reg.h"
 
 void common_hal_coproc_run(coproc_coproc_obj_t *self) {
+    if (GET_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN)) {
+        mp_raise_RuntimeError(translate("Already running"));
+    }
+
+    ulp_riscv_load_binary(self->buf, self->buf_len);
+    m_free(self->buf);
+    self->buf = (uint8_t *)RTC_SLOW_MEM;
+
     ulp_riscv_run();
 }
 
@@ -55,18 +63,10 @@ void common_hal_coproc_halt(coproc_coproc_obj_t *self) {
     CLEAR_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
     // suspends the ulp operation
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE);
-    // Resets the processor
+    // resets the processor
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
 }
 
-void common_hal_coproc_load(coproc_coproc_obj_t *self) {
-    if (ulp_riscv_load_binary(self->buf, self->buf_len) != ESP_OK) {
-        mp_raise_RuntimeError(translate("Firmware is too big"));
-    }
-    m_free(self->buf);
-    self->buf = (uint8_t *)RTC_SLOW_MEM;
-}
-
 mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self) {
     return (self->coproc_memory) ? MP_OBJ_FROM_PTR(self->coproc_memory) : mp_const_none;
 }
diff --git a/shared-bindings/coproc/__init__.c b/shared-bindings/coproc/__init__.c
index 1709e9b203..06b196d8be 100644
--- a/shared-bindings/coproc/__init__.c
+++ b/shared-bindings/coproc/__init__.c
@@ -68,9 +68,7 @@ STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
 //|     ...
 //|
 STATIC mp_obj_t coproc_run(mp_obj_t self_in) {
-    coproc_coproc_obj_t *self = get_coproc_obj(&self_in);
-    common_hal_coproc_load(self);
-    common_hal_coproc_run(self);
+    common_hal_coproc_run(get_coproc_obj(&self_in));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_run_obj, coproc_run);
diff --git a/shared-bindings/coproc/__init__.h b/shared-bindings/coproc/__init__.h
index 0609bf827b..6f2b2a56ae 100644
--- a/shared-bindings/coproc/__init__.h
+++ b/shared-bindings/coproc/__init__.h
@@ -32,7 +32,6 @@
 
 extern void common_hal_coproc_run(coproc_coproc_obj_t *self);
 extern void common_hal_coproc_halt(coproc_coproc_obj_t *self);
-extern void common_hal_coproc_load(coproc_coproc_obj_t *self);
 extern mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H

From 3c5bf4e852f72eaf87c739d58b98a67e8dbb74f5 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 22 Oct 2022 16:23:27 +0200
Subject: [PATCH 1249/2403] Update
 ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk

Co-authored-by: MicroDev <70126934+MicroDev1@users.noreply.github.com>
---
 ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
index a76db338f3..25a6f87428 100644
--- a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-
 CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB

From 3bd7075c559b82915c6295e1bcff6f1af8a3eebe Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 16 Oct 2022 18:43:03 -0500
Subject: [PATCH 1250/2403] we removed MpyError

---
 docs/library/builtins.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 5358f3cda3..3a675e7ec1 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -200,10 +200,6 @@ Exceptions
 
 .. exception:: MemoryError
 
-.. exception:: MpyError
-
-    Not a part of the CPython standard library
-
 .. exception:: NameError
 
 .. exception:: NotImplementedError

From 05252c87f42109baa0b7200c3d3f57377f23a3b9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 09:08:17 -0500
Subject: [PATCH 1251/2403] Don't crash when assigning attributes of the
 GeneratorExit const singleton

---
 py/objexcept.c                       |  3 +++
 tests/basics/gen_yield_from_close.py | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/py/objexcept.c b/py/objexcept.c
index 12408c0d1f..32dacbb17a 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -218,6 +218,9 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_exception_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] != MP_OBJ_NULL) {
         // store/delete attribute
+        if (self == &mp_const_GeneratorExit_obj) {
+            mp_raise_AttributeError(MP_ERROR_TEXT("can't set attribute"));
+        }
         if (attr == MP_QSTR___traceback__) {
             if (dest[1] == mp_const_none) {
                 self->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
diff --git a/tests/basics/gen_yield_from_close.py b/tests/basics/gen_yield_from_close.py
index e3e0116ff7..08e0d41beb 100644
--- a/tests/basics/gen_yield_from_close.py
+++ b/tests/basics/gen_yield_from_close.py
@@ -37,8 +37,12 @@ def gen4():
     yield -1
     try:
         print((yield from gen3()))
-    except GeneratorExit:
+    except GeneratorExit as e:
         print("delegating caught GeneratorExit")
+        try:
+            e.__traceback__ = None
+        except AttributeError:
+            pass # generated in micropython, not in python3
         raise
     yield 10
     yield 11
@@ -121,3 +125,20 @@ def gen9():
 g = gen9()
 print(next(g))
 g.close()
+
+# Test that, when chaining to a GeneratorExit exception generated internally,
+# no exception or crash occurs
+def gen10():
+    try:
+        yield 1/0
+    except Exception as e:
+        yield 1
+        yield 2
+        yield 3
+g = gen10()
+print(next(g))
+g.close()
+try:
+    print(next(g))
+except StopIteration:
+    print("StopIteration")

From 7c9d0452a80e53f8e535c7edda3397a514f1c9f4 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 22 Oct 2022 09:12:16 +0000
Subject: [PATCH 1252/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 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 71897ddaf3..7cd892d333 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: 2022-10-21 15:02+0000\n"
+"PO-Revision-Date: 2022-10-22 18:28+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -1665,7 +1665,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Apenas um %q pode ser colocado em hibernação profunda."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c

From b3c9cafeba04dd41defec5db9766465d5ad49133 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 22 Oct 2022 15:15:05 +0000
Subject: [PATCH 1253/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1003 of 1003 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 1e49a02d56..ad637d9b6c 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: 2022-10-21 15:02+0000\n"
+"PO-Revision-Date: 2022-10-22 18:28+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1647,7 +1647,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Endast en %q kan sättas i djup sömn."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c

From aa9e6148a2a732e31e3de840f98f7b27e0e4e967 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 22 Oct 2022 20:28:10 +0200
Subject: [PATCH 1254/2403] 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/ru.po             | 4 +++-
 locale/sv.po             | 4 +++-
 locale/tr.po             | 4 +++-
 locale/zh_Latn_pinyin.po | 4 +++-
 19 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index faf9fbc66b..9784f8fb1c 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -199,6 +199,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -491,6 +492,7 @@ msgstr "Sudah disebarkan."
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1028,7 +1030,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 7d703fc76d..9c911b504e 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -200,6 +200,7 @@ msgstr "%q je mimo hranice"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -492,6 +493,7 @@ msgstr "Již propagujeme."
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1026,7 +1028,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index fde15bd378..999f3e3bbb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -201,6 +201,7 @@ msgstr "%q außerhalb der Grenzen"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -494,6 +495,7 @@ msgstr "Bereits am Anbieten (advertising)."
 msgid "Already have all-matches listener"
 msgstr "All-Matchers-Listener bereits vorhanden"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1034,7 +1036,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index 60bfa27307..55f8535703 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -205,6 +205,7 @@ msgstr "%q εκτός ορίων"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -498,6 +499,7 @@ msgstr "Ήδη διαφημίζουμε."
 msgid "Already have all-matches listener"
 msgstr "Ύπάρχει ήδη all-matches ακροατής"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1040,7 +1042,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 627c7106a2..e9e74b6ac9 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -203,6 +203,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -495,6 +496,7 @@ msgstr "Already advertising."
 msgid "Already have all-matches listener"
 msgstr "Already have all-matches listener"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1029,7 +1031,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index 21babb4e23..56ed23fa30 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -205,6 +205,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -499,6 +500,7 @@ msgstr "Ya se encuentra publicando."
 msgid "Already have all-matches listener"
 msgstr "Ya se tiene un escucha de todas las coincidencias"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1039,7 +1041,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/fil.po b/locale/fil.po
index 20c2dd1aba..7c13b61711 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -194,6 +194,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -488,6 +489,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1025,7 +1027,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 485b008e6d..19278499dd 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -205,6 +205,7 @@ msgstr "%q est hors limites"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -497,6 +498,7 @@ msgstr "S'annonce déjà."
 msgid "Already have all-matches listener"
 msgstr "Il y a déjà un auditeur all-matches"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1050,7 +1052,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/hi.po b/locale/hi.po
index e0024646b9..b2a6d4e25a 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -193,6 +193,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -485,6 +486,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1015,7 +1017,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 8625d8a043..ec9b5a055d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -200,6 +200,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -494,6 +495,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr "Già in possesso di tutti i listener abbinati"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1030,7 +1032,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 43ad83d1af..5515942cf3 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -198,6 +198,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -490,6 +491,7 @@ msgstr "すでにアドバータイズ中"
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1024,7 +1026,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index d342ff7f24..f266fa6499 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -194,6 +194,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -486,6 +487,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1018,7 +1020,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index bbb6c60c3f..6ffae54cb5 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -196,6 +196,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -488,6 +489,7 @@ msgstr "Advertising is al bezig."
 msgid "Already have all-matches listener"
 msgstr "Heeft al een luisteraar voor 'all-matches'"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1023,7 +1025,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index e68f6c7882..197160d073 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -198,6 +198,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -490,6 +491,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1024,7 +1026,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 7cd892d333..99780d894b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -202,6 +202,7 @@ msgstr "%q fora dos limites"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -498,6 +499,7 @@ msgstr "Já está anunciando."
 msgid "Already have all-matches listener"
 msgstr "Já há um ouvinte com todas as correspondências"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1042,7 +1044,7 @@ msgstr "O firmware está duplicado"
 msgid "Firmware is invalid"
 msgstr "O firmware é inválido"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "O firmware é muito grande"
diff --git a/locale/ru.po b/locale/ru.po
index 53861db3d0..95584e73be 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -201,6 +201,7 @@ msgstr "%q за пределом"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -493,6 +494,7 @@ msgstr "Уже объявляемся (advertising)."
 msgid "Already have all-matches listener"
 msgstr "Уже есть универсальный слушатель"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1040,7 +1042,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index ad637d9b6c..3d42373ca9 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -203,6 +203,7 @@ msgstr "%q är utanför gränserna"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -495,6 +496,7 @@ msgstr "Annonserar redan."
 msgid "Already have all-matches listener"
 msgstr "Har redan lyssnare för all-matchningar"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1031,7 +1033,7 @@ msgstr "Firmware är en dubblett"
 msgid "Firmware is invalid"
 msgstr "Firmware är ogiltig"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Firmware är för stor"
diff --git a/locale/tr.po b/locale/tr.po
index 9d3149490c..64fa3ba5b3 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -205,6 +205,7 @@ msgstr "%q sınırların dışında"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -498,6 +499,7 @@ msgstr "Halihazırda duyuruluyor."
 msgid "Already have all-matches listener"
 msgstr "Tüm eşleşmelerle eşleşen dinleyiciniz var"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1032,7 +1034,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 9e4d43c1cd..52c96b9c0b 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -204,6 +204,7 @@ msgstr "%q chāo chū jiè xiàn"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -496,6 +497,7 @@ msgstr "Mùqián zhèngzài guǎngbō."
 msgid "Already have all-matches listener"
 msgstr "yǐjīng yǒu all-matches jiāntīng qì"
 
+#: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -1032,7 +1034,7 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""

From beab76c32570de701e9fd51325209f14345dca76 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Mon, 24 Oct 2022 18:38:30 +0000
Subject: [PATCH 1255/2403] Added M5Stack Core Fire board

---
 .../boards/m5stack_core_fire/board.c          | 118 ++++++++++++++++++
 .../boards/m5stack_core_fire/mpconfigboard.h  |  43 +++++++
 .../boards/m5stack_core_fire/mpconfigboard.mk |  12 ++
 .../espressif/boards/m5stack_core_fire/pins.c |  74 +++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_core_fire/board.c
 create mode 100644 ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_core_fire/pins.c

diff --git a/ports/espressif/boards/m5stack_core_fire/board.c b/ports/espressif/boards/m5stack_core_fire/board.c
new file mode 100644
index 0000000000..3863b57637
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_fire/board.c
@@ -0,0 +1,118 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+
+// display init sequence according to M5Gfx
+uint8_t display_init_sequence[] = {
+    0x01,0x80,0x80,             // Software reset then delay 0x80 (128ms)
+    0xC8,0x03,0xFF,0x93,0x42,   // Turn on the external command
+    0xC0,0x02,0x12, 0x12,       // Power Control 1
+    0xC1,0x01,0x03,             // Power Control 2
+    0xC5,0x01,0xF2,             // VCOM Control 1
+    0xB0,0x01,0xE0,             // RGB Interface SYNC Mode
+    0xF6,0x03,0x01, 0x00, 0x00, // Interface control
+    0XE0,0x0F,0x00,0x0C,0x11,0x04,0x11,0x08,0x37,0x89,0x4C,0x06,0x0C,0x0A,0x2E,0x34,0x0F,   // Positive Gamma Correction
+    0xE1,0x0F,0x00,0x0B,0x11,0x05,0x13,0x09,0x33,0x67,0x48,0x07,0x0E,0x0B,0x2E,0x33,0x0F,   // Negative Gamma Correction
+    0xB6,0x04,0x08,0x82,0x1D,0x04,  // Display Function Control
+    0x3A,0x01,0x55,             // COLMOD: Pixel Format Set 16 bit
+    0x21,0x00,                  // Display inversion ON
+    0x36,0x01,0x08,             // Memory Access Control: RGB order
+    0x11,0x80,0x78,             // Exit Sleep then delay 0x78 (120ms)
+    0x29,0x80,0x78,             // Display on then delay 0x78 (120ms)
+};
+
+void board_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO27,    // DC
+        &pin_GPIO14,    // CS
+        &pin_GPIO33,    // RST
+        40000000,       // 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
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO32,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        61,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Set speaker gpio to ground to prevent noise from the speaker
+    if (pin_number == 25) {
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, false);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
new file mode 100644
index 0000000000..b94be7f318
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Core Fire"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
new file mode 100644
index 0000000000..4816122523
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
@@ -0,0 +1,12 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320001
+
+IDF_TARGET = esp32
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/m5stack_core_fire/pins.c b/ports/espressif/boards/m5stack_core_fire/pins.c
new file mode 100644
index 0000000000..60d9497f20
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_fire/pins.c
@@ -0,0 +1,74 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+
+    // buttons
+    { MP_ROM_QSTR(MP_QSTR_BTN_A), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_BTN_B), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_BTN_C), MP_ROM_PTR(&pin_GPIO37) },
+
+    // sd card
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),MP_ROM_PTR(&pin_GPIO4) },
+
+    // tft
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO32) },
+
+    { 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_module_globals_table);

From 39171d7626309b5856d5481ea6c81908a3689907 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Mon, 24 Oct 2022 19:21:26 +0000
Subject: [PATCH 1256/2403] Removed unnecessary compiler flags

---
 ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
index 4816122523..7a66a977b1 100644
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
@@ -3,10 +3,7 @@ CIRCUITPY_CREATION_ID = 0x00320001
 
 IDF_TARGET = esp32
 
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
+CIRCUITPY_ESP32_CAMERA = 0

From 5fa67548ea58375800da855f2ffe7796d55f55b5 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Mon, 24 Oct 2022 20:03:06 +0000
Subject: [PATCH 1257/2403] Added missing sdkconfig file

---
 .../boards/m5stack_core_fire/sdkconfig        | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_core_fire/sdkconfig

diff --git a/ports/espressif/boards/m5stack_core_fire/sdkconfig b/ports/espressif/boards/m5stack_core_fire/sdkconfig
new file mode 100644
index 0000000000..d77fe64525
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_fire/sdkconfig
@@ -0,0 +1,58 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP32_REV_MIN_3=y
+
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+#CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+#
+# PSRAM clock and cs IO for ESP32
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+# end of PSRAM clock and cs IO for ESP32
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskCoreFire"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 5ea8b75e170dd80108c3f7b8bb5a7265aef64de1 Mon Sep 17 00:00:00 2001
From: Kattni Rembor 
Date: Mon, 24 Oct 2022 16:27:32 -0400
Subject: [PATCH 1258/2403] Add STEMMA_I2C() object to Picos for Cowbells.

---
 ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h   | 3 +++
 ports/raspberrypi/boards/raspberry_pi_pico/pins.c            | 2 ++
 ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h | 3 +++
 ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c          | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
index efb2fc3402..4714241999 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
@@ -1,2 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico"
 #define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico/pins.c
index 87ff27fa46..2d56b93757 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/pins.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/pins.c
@@ -50,5 +50,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
     { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
index 58a291b18b..e5d8660b2b 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
@@ -3,3 +3,6 @@
 
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
index b3c3c93d57..5a63e43a6d 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
@@ -44,5 +44,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From c8191e8830d34ca06b9567c4185758f3f5791859 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Tue, 25 Oct 2022 11:41:39 +0000
Subject: [PATCH 1259/2403] Better pins definitions

---
 .../boards/m5stack_core_fire/mpconfigboard.h  |  5 +-
 .../espressif/boards/m5stack_core_fire/pins.c | 91 ++++++++++++-------
 2 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
index b94be7f318..3000415754 100644
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
@@ -35,8 +35,9 @@
 #define CIRCUITPY_BOARD_SPI         (1)
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
 
-#define CIRCUITPY_BOARD_UART        (1)
-#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+// GPIO16 & GPIO17 are used for PSRAM
+// #define CIRCUITPY_BOARD_UART        (1)
+// #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_core_fire/pins.c b/ports/espressif/boards/m5stack_core_fire/pins.c
index 60d9497f20..3449e55f54 100644
--- a/ports/espressif/boards/m5stack_core_fire/pins.c
+++ b/ports/espressif/boards/m5stack_core_fire/pins.c
@@ -6,41 +6,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     // External pins are in silkscreen order, from top to bottom, left side, then right side
 
-    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
-
-    { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
-
-    { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
-
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
-
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
-
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO25) },
-    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
-    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO25) },
-
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO26) },
-    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO35) },
-    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
-
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO36) },
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
-
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
-
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
-    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO22) },
-    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
-
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
     { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
 
@@ -50,6 +15,62 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
 
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    // GPIO16 & GPIO17 are used for PSRAM
+    // { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16) },
+    // { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_LED_BAR), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_A35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_A36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_PORTB_IN), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_PORTB_OUT), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    // GPIO16 & GPIO17 are used for PSRAM
+    // { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17) },
+    // { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_A34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_MIC), MP_ROM_PTR(&pin_GPIO34) },
 
     // buttons
     { MP_ROM_QSTR(MP_QSTR_BTN_A), MP_ROM_PTR(&pin_GPIO39) },

From bd7f0e23d78f38693b961a8152cab08cba1da376 Mon Sep 17 00:00:00 2001
From: Petr Sedlacek 
Date: Thu, 20 Oct 2022 16:36:20 +0200
Subject: [PATCH 1260/2403] Adds support for the 42. Keebs Frood RP2040 board

https://github.com/piit79/Frood
---
 .../raspberrypi/boards/42keebs_frood/board.c  | 29 +++++++++++
 .../boards/42keebs_frood/mpconfigboard.h      | 12 +++++
 .../boards/42keebs_frood/mpconfigboard.mk     |  9 ++++
 .../42keebs_frood/pico-sdk-configboard.h      |  1 +
 ports/raspberrypi/boards/42keebs_frood/pins.c | 50 +++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 ports/raspberrypi/boards/42keebs_frood/board.c
 create mode 100644 ports/raspberrypi/boards/42keebs_frood/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/42keebs_frood/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/42keebs_frood/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/42keebs_frood/pins.c

diff --git a/ports/raspberrypi/boards/42keebs_frood/board.c b/ports/raspberrypi/boards/42keebs_frood/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/42keebs_frood/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.h b/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.h
new file mode 100644
index 0000000000..7f8bcda931
--- /dev/null
+++ b/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME "42. Keebs Frood"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO20)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.mk b/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.mk
new file mode 100644
index 0000000000..955d8d63f5
--- /dev/null
+++ b/ports/raspberrypi/boards/42keebs_frood/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x1209
+USB_PID = 0x4203
+USB_PRODUCT = "Frood"
+USB_MANUFACTURER = "42. Keebs"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "ZD25WQ16B"
diff --git a/ports/raspberrypi/boards/42keebs_frood/pico-sdk-configboard.h b/ports/raspberrypi/boards/42keebs_frood/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/42keebs_frood/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/42keebs_frood/pins.c b/ports/raspberrypi/boards/42keebs_frood/pins.c
new file mode 100644
index 0000000000..d5cf864768
--- /dev/null
+++ b/ports/raspberrypi/boards/42keebs_frood/pins.c
@@ -0,0 +1,50 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1),  MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2),  MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3),  MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23),  MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D20),  MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f997d0053d3decd2998ceb814232f3b41787b305 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 25 Oct 2022 10:09:16 -0500
Subject: [PATCH 1261/2403] Enable, use SOF_REUSEADDR

This is the lwip no-os version of SO_REUSEADDR, which is set on all
listening sockets in the espressif port; do so here as well,
it makes running servers easier. The "address in use" error does
not occur.
---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 2 ++
 ports/raspberrypi/common-hal/socketpool/Socket.h | 1 +
 ports/raspberrypi/lwip_inc/lwipopts.h            | 1 +
 3 files changed, 4 insertions(+)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 71a31379ad..a099ef9f79 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -852,6 +852,8 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
         mp_raise_OSError(EHOSTUNREACH);
     }
 
+    ip_set_option(socket->pcb.ip, SOF_REUSEADDR);
+
     err_t err = ERR_ARG;
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM: {
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.h b/ports/raspberrypi/common-hal/socketpool/Socket.h
index f582b77a9b..6e26087674 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.h
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.h
@@ -37,6 +37,7 @@ typedef struct _lwip_socket_obj_t {
     mp_obj_base_t base;
 
     volatile union {
+        struct tcp_pcb *ip;
         struct tcp_pcb *tcp;
         struct udp_pcb *udp;
         struct raw_pcb *raw;
diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 936a141602..0d4ecd3707 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -52,6 +52,7 @@
 #define LWIP_NETIF_TX_SINGLE_PBUF   1
 #define DHCP_DOES_ARP_CHECK         0
 #define LWIP_DHCP_DOES_ACD_CHECK    0
+#define SO_REUSE                    1
 
 #ifndef NDEBUG
 #define LWIP_DEBUG                  1

From f9983ff556fc3ab82dc8ce98a7a7e92fa2b19783 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Tue, 25 Oct 2022 16:42:14 +0000
Subject: [PATCH 1262/2403] Added M5Stack Core Basic board

---
 .../boards/m5stack_core_basic/board.c         | 118 ++++++++++++++++++
 .../boards/m5stack_core_basic/mpconfigboard.h |  43 +++++++
 .../m5stack_core_basic/mpconfigboard.mk       |   9 ++
 .../boards/m5stack_core_basic/pins.c          |  93 ++++++++++++++
 .../boards/m5stack_core_basic/sdkconfig       |  28 +++++
 5 files changed, 291 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_core_basic/board.c
 create mode 100644 ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_core_basic/pins.c
 create mode 100644 ports/espressif/boards/m5stack_core_basic/sdkconfig

diff --git a/ports/espressif/boards/m5stack_core_basic/board.c b/ports/espressif/boards/m5stack_core_basic/board.c
new file mode 100644
index 0000000000..3863b57637
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_basic/board.c
@@ -0,0 +1,118 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+
+// display init sequence according to M5Gfx
+uint8_t display_init_sequence[] = {
+    0x01,0x80,0x80,             // Software reset then delay 0x80 (128ms)
+    0xC8,0x03,0xFF,0x93,0x42,   // Turn on the external command
+    0xC0,0x02,0x12, 0x12,       // Power Control 1
+    0xC1,0x01,0x03,             // Power Control 2
+    0xC5,0x01,0xF2,             // VCOM Control 1
+    0xB0,0x01,0xE0,             // RGB Interface SYNC Mode
+    0xF6,0x03,0x01, 0x00, 0x00, // Interface control
+    0XE0,0x0F,0x00,0x0C,0x11,0x04,0x11,0x08,0x37,0x89,0x4C,0x06,0x0C,0x0A,0x2E,0x34,0x0F,   // Positive Gamma Correction
+    0xE1,0x0F,0x00,0x0B,0x11,0x05,0x13,0x09,0x33,0x67,0x48,0x07,0x0E,0x0B,0x2E,0x33,0x0F,   // Negative Gamma Correction
+    0xB6,0x04,0x08,0x82,0x1D,0x04,  // Display Function Control
+    0x3A,0x01,0x55,             // COLMOD: Pixel Format Set 16 bit
+    0x21,0x00,                  // Display inversion ON
+    0x36,0x01,0x08,             // Memory Access Control: RGB order
+    0x11,0x80,0x78,             // Exit Sleep then delay 0x78 (120ms)
+    0x29,0x80,0x78,             // Display on then delay 0x78 (120ms)
+};
+
+void board_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO27,    // DC
+        &pin_GPIO14,    // CS
+        &pin_GPIO33,    // RST
+        40000000,       // 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
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO32,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        61,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Set speaker gpio to ground to prevent noise from the speaker
+    if (pin_number == 25) {
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, false);
+        return true;
+    }
+    return false;
+}
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
new file mode 100644
index 0000000000..08281ec32d
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Core Basic"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
new file mode 100644
index 0000000000..1abf68428c
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/m5stack_core_basic/pins.c b/ports/espressif/boards/m5stack_core_basic/pins.c
new file mode 100644
index 0000000000..b985231bea
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_basic/pins.c
@@ -0,0 +1,93 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_PORTC_RX), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_A35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_A36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_PORTB_IN), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_PORTB_OUT), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_PORTC_TX), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_A34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+
+    // buttons
+    { MP_ROM_QSTR(MP_QSTR_BTN_A), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_BTN_B), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_BTN_C), MP_ROM_PTR(&pin_GPIO37) },
+
+    // sd card
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),MP_ROM_PTR(&pin_GPIO4) },
+
+    // tft
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO32) },
+
+    { 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_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_core_basic/sdkconfig b/ports/espressif/boards/m5stack_core_basic/sdkconfig
new file mode 100644
index 0000000000..2bb24fcc89
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core_basic/sdkconfig
@@ -0,0 +1,28 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP32_REV_MIN_3=y
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskCoreBasic"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From f6e2369bbdf9c6651705ca3ee20fa2618ed51825 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Tue, 25 Oct 2022 16:53:42 +0000
Subject: [PATCH 1263/2403] Removed not available UART in board

---
 ports/espressif/boards/m5stack_core_fire/pins.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_core_fire/pins.c b/ports/espressif/boards/m5stack_core_fire/pins.c
index 3449e55f54..f26f96ac8e 100644
--- a/ports/espressif/boards/m5stack_core_fire/pins.c
+++ b/ports/espressif/boards/m5stack_core_fire/pins.c
@@ -88,7 +88,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { 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)}
 };

From 0cf096dda16bdf933fb03be1b3c2813e290308f0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Oct 2022 07:46:05 -0500
Subject: [PATCH 1264/2403] pico w: implement sslsocket bind, listen, accept

---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 1d42a4b710..21e2a95c90 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -284,7 +284,7 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
 }
 
 bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
-    mp_raise_NotImplementedError(NULL);
+    return common_hal_socketpool_socket_bind(self->sock, host, hostlen, port);
 }
 
 void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
@@ -349,11 +349,14 @@ bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self) {
 }
 
 bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog) {
-    mp_raise_NotImplementedError(NULL);
+    return common_hal_socketpool_socket_listen(self->sock, backlog);
 }
 
 ssl_sslsocket_obj_t *common_hal_ssl_sslsocket_accept(ssl_sslsocket_obj_t *self, uint8_t *ip, uint32_t *port) {
-    mp_raise_NotImplementedError(NULL);
+    socketpool_socket_obj_t *sock = common_hal_socketpool_socket_accept(self->sock, ip, port);
+    ssl_sslsocket_obj_t *sslsock = common_hal_ssl_sslcontext_wrap_socket(self->ssl_context, sock, true, NULL);
+    do_handshake(sslsock);
+    return sslsock;
 }
 
 void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms) {

From 032bf63f2dc79c231221b2315779b16f9b9bcb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20B=C3=B8e?= 
Date: Tue, 25 Oct 2022 22:53:01 +0200
Subject: [PATCH 1265/2403] Raise error with positive code in recv_into for
 espressif

---
 ports/espressif/common-hal/socketpool/Socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index f6025d329c..53db7ab393 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -483,7 +483,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
 mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len) {
     int received = socketpool_socket_recv_into(self, buf, len);
     if (received < 0) {
-        mp_raise_OSError(received);
+        mp_raise_OSError(-received);
     }
     return received;
 }

From e49cd00d60c4d199b806c9ca0966d5b6b26a248a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 25 Oct 2022 20:41:08 -0400
Subject: [PATCH 1266/2403] fix debug UART pins on Metro ESP32-S2

---
 ports/espressif/boards/adafruit_metro_esp32s2/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/pins.c b/ports/espressif/boards/adafruit_metro_esp32s2/pins.c
index 0d2777b204..1f024f6e8e 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/pins.c
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/pins.c
@@ -60,8 +60,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO38) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO43) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

From 56d8b9451f44d65ef004579d9ce1c6d4dddb88f6 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 25 Oct 2022 20:42:08 -0400
Subject: [PATCH 1267/2403] don't wait for pulls in PinAlarm

---
 ports/espressif/common-hal/alarm/pin/PinAlarm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 62496ec4c6..bc89cc9ee7 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -215,6 +215,7 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
             if (esp_sleep_enable_ext1_wakeup(high_alarms, ESP_EXT1_WAKEUP_ANY_HIGH) != ESP_OK) {
                 mp_raise_ValueError(translate("Can only alarm on RTC IO from deep sleep."));
             }
+            esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
         }
         size_t low_pins[2];
         size_t j = 0;
@@ -231,6 +232,7 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
             if (esp_sleep_enable_ext1_wakeup(1ull << low_pins[1], ESP_EXT1_WAKEUP_ALL_LOW) != ESP_OK) {
                 mp_raise_ValueError(translate("Can only alarm on RTC IO from deep sleep."));
             }
+            esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
         }
         if (low_count > 0) {
             if (esp_sleep_enable_ext0_wakeup(low_pins[0], 0) != ESP_OK) {
@@ -273,16 +275,14 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
         PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[i], PIN_FUNC_GPIO);
         if (pull) {
             gpio_set_pull_mode(i, pull_mode);
-            size_t j = 0;
-            while (gpio_get_level(i) == false) {
-                j++;
-            }
         }
         never_reset_pin_number(i);
         // Sets interrupt type and wakeup bits.
         gpio_wakeup_enable(i, interrupt_mode);
         gpio_intr_enable(i);
     }
+    // Wait for any pulls to settle.
+    mp_hal_delay_ms(50);
 }
 
 

From 7545e02a8e9963e086387edcb4792e83596b645f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 26 Oct 2022 10:05:37 -0500
Subject: [PATCH 1268/2403] add feather rp2040 scorpio

---
 .../adafruit_feather_rp2040_scorpio/board.c   | 29 +++++++++++
 .../mpconfigboard.h                           | 14 ++++++
 .../mpconfigboard.mk                          |  9 ++++
 .../pico-sdk-configboard.h                    |  4 ++
 .../adafruit_feather_rp2040_scorpio/pins.c    | 48 +++++++++++++++++++
 5 files changed, 104 insertions(+)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
new file mode 100644
index 0000000000..94b6fcee7b
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 Scorpio"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO16)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.mk
new file mode 100644
index 0000000000..db06fd728b
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x8122
+USB_PRODUCT = "Feather RP2040 Scorpio"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c
new file mode 100644
index 0000000000..9bf3a71e25
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c
@@ -0,0 +1,48 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL0), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL2), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL3), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL4), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL6), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL7), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From fed77e918afda328a631f941f810a4059e265cbf Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 26 Oct 2022 12:16:26 -0400
Subject: [PATCH 1269/2403] Fix formatting of "Limitations:" in a couple of
 modules

When "Limitations:" is in the class docstring, it is sometimes taken
as a class attribute name because of the colon. When exactly is not clear, but
changing embedded colons or various indentations fixes the problem.
---
 shared-bindings/analogio/AnalogOut.c        | 5 +++--
 shared-bindings/microcontroller/Processor.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index c8a109aa23..de6811b5a3 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -39,6 +39,9 @@
 //| class AnalogOut:
 //|     """Output analog values (a specific voltage).
 //|
+//|     **Limitations:** Not available on nRF, RP2040, Spresense, as there is no on-chip DAC.
+//|     On Espressif, available only on ESP32 and ESP32-S2; other chips do not have a DAC.
+//|
 //|     Example usage::
 //|
 //|         import analogio
@@ -52,8 +55,6 @@
 //|
 //|         :param ~microcontroller.Pin pin: the pin to output to
 //|
-//|         **Limitations:** Not available on nRF, RP2040, Spresense: there is no on-chip DAC.
-//|          Espressif: available only on ESP32 and ESP32-S2; other chips do not have a DAC.
 //|         """
 //|         ...
 STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 16312c0c94..3b671d0c7b 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -107,7 +107,7 @@ MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj,
 //|     Is `None` if the temperature is not available.
 //|
 //|     **Limitations:** Not available on ESP32 or ESP32-S3. On small SAMD21 builds without external flash,
-//|       the reported temperature has reduced accuracy and precision, to save code space.
+//|     the reported temperature has reduced accuracy and precision, to save code space.
 //|     """
 STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) {
     float temperature = common_hal_mcu_processor_get_temperature();

From c52b5b64e57d1d8f88da4fc47f7d820d34f78baa Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 26 Oct 2022 12:32:09 -0400
Subject: [PATCH 1270/2403] add Characteristic.descriptors to locals dict

---
 shared-bindings/_bleio/Characteristic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index 8a93915a8f..e1c5fc3ad5 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -278,6 +278,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_characteristic_set_cccd_obj, 1, bleio_ch
 
 STATIC const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_add_to_service), MP_ROM_PTR(&bleio_characteristic_add_to_service_obj) },
+    { MP_ROM_QSTR(MP_QSTR_descriptors),    MP_ROM_PTR(&bleio_characteristic_descriptors_obj) },
     { MP_ROM_QSTR(MP_QSTR_properties),     MP_ROM_PTR(&bleio_characteristic_properties_obj) },
     { MP_ROM_QSTR(MP_QSTR_uuid),           MP_ROM_PTR(&bleio_characteristic_uuid_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),          MP_ROM_PTR(&bleio_characteristic_value_obj) },

From 30f07fbf22bfb7e19e27f062d1ab39ab83e7b067 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:19:15 +0530
Subject: [PATCH 1271/2403] schedule pr jobs based on commit specific changes

---
 .github/workflows/build.yml    |  27 ++--
 tools/ci_changes_per_commit.py | 227 +++++++++++++++++++++++++++++++++
 tools/ci_set_matrix.py         |  25 +++-
 3 files changed, 266 insertions(+), 13 deletions(-)
 create mode 100644 tools/ci_changes_per_commit.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8338528c42..c0ab361594 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,20 +125,29 @@ jobs:
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
-    - name: "Get changes"
+    - name: Get last commit with checks
+      id: get-last-commit-with-checks
       if: github.event_name == 'pull_request'
-      uses: dorny/paths-filter@v2
-      id: filter
+      working-directory: tools
+      env:
+        REPO: ${{ github.repository }}
+        PULL: ${{ github.event.number }}
+        GITHUB_TOKEN: ${{ github.token }}
+        EXCLUDE_COMMIT: ${{ github.event.after }}
+      run: python3 -u ci_changes_per_commit.py
+    - name: Get changes
+      id: get-changes
+      if: github.event_name == 'pull_request'
+      uses: tj-actions/changed-files@v34
       with:
-        list-files: json
-        filters: |
-          changed:
-            - '**'
-    - name: "Set matrix"
+        json: "true"
+        base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
+    - name: Set matrix
       id: set-matrix
       working-directory: tools
       env:
-        CHANGED_FILES: ${{ steps.filter.outputs.changed_files }}
+        CHANGED_FILES: ${{ toJSON(steps.get-changes.outputs.all_changed_and_modified_files) }}
+        LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.checkruns }}
       run: python3 -u ci_set_matrix.py
 
 
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
new file mode 100644
index 0000000000..dd957b2a56
--- /dev/null
+++ b/tools/ci_changes_per_commit.py
@@ -0,0 +1,227 @@
+#! /usr/bin/env python3
+
+# SPDX-FileCopyrightText: 2021 microDev
+#
+# SPDX-License-Identifier: MIT
+
+# GraphQL Query
+
+QUERY_COMMITS = """
+query ($owner: String!, $name: String!, $pullNumber: Int!, $commitsPerPage: Int!, $beforeCommit: String) {
+  repository(owner: $owner, name: $name) {
+    pullRequest(number: $pullNumber) {
+      commits(last: $commitsPerPage, before: $beforeCommit) {
+        totalCount
+        pageInfo {
+          startCursor
+          hasPreviousPage
+        }
+        nodes {
+          commit {
+            checkSuites(first: 3) {
+              nodes {
+                conclusion
+                workflowRun {
+                  workflow {
+                    name
+                  }
+                }
+                id
+              }
+              totalCount
+            }
+            oid
+          }
+        }
+      }
+    }
+  }
+}
+"""
+
+QUERY_CHECKRUNS = """
+query ($checkSuiteID: ID!,
+       $afterFailedRun: String, $afterIncompleteRun: String,
+       $includeFailedRuns: Boolean!, $includeIncompleteRuns: Boolean!) {
+  node(id: $checkSuiteID) {
+    ... on CheckSuite {
+      failedRuns: checkRuns(
+        first: 100
+        after: $afterFailedRun
+        filterBy: {checkType: LATEST, conclusions: [ACTION_REQUIRED, TIMED_OUT, CANCELLED, FAILURE, NEUTRAL, STARTUP_FAILURE]}
+      ) @include(if: $includeFailedRuns) {
+        nodes {
+          name
+        }
+        pageInfo {
+          endCursor
+          hasNextPage
+        }
+      }
+      incompleteRuns: checkRuns(
+        first: 100
+        after: $afterIncompleteRun
+        filterBy: {checkType: LATEST, statuses: [QUEUED, IN_PROGRESS, WAITING, PENDING, REQUESTED]}
+      ) @include(if: $includeIncompleteRuns) {
+        nodes {
+          name
+        }
+        pageInfo {
+          endCursor
+          hasNextPage
+        }
+      }
+    }
+  }
+}
+"""
+
+
+import os
+import re
+import json
+import requests
+
+
+query_variables_commits = {
+    "owner": "",
+    "name": "",
+    "pullNumber": int(os.environ["PULL"]),
+    "commitsPerPage": 20,
+    "beforeCommit": None,
+}
+
+
+query_variables_checkruns = {
+    "checkSuiteID": "",
+    "afterFailedRun": None,
+    "afterIncompleteRun": None,
+    "includeFailedRuns": True,
+    "includeIncompleteRuns": True,
+}
+
+
+headers = {"Authorization": f"Bearer {os.environ['GITHUB_TOKEN']}"}
+
+
+class Query:
+    def __init__(self, query, variables={}, headers={}):
+        self.query = query
+        self.variables = variables
+        self.headers = headers
+
+    def paginate(self, page_info, name):
+        has_page = (
+            page_info["hasNextPage"] if name.startswith("after") else page_info["hasPreviousPage"]
+        )
+        if has_page:
+            self.variables[name] = (
+                page_info["endCursor"] if name.startswith("after") else page_info["startCursor"]
+            )
+        return has_page
+
+    def fetch(self):
+        request = requests.post(
+            "https://api.github.com/graphql",
+            json={"query": self.query, "variables": self.variables},
+            headers=self.headers,
+        )
+        if request.status_code == 200:
+            return request.json()
+        else:
+            raise Exception("Query Failed: {}".format(request.status_code))
+
+
+def set_output(name, value):
+    if "GITHUB_OUTPUT" in os.environ:
+        with open(os.environ["GITHUB_OUTPUT"], "at") as f:
+            print(f"{name}={value}", file=f)
+    else:
+        print(f"Would set GitHub actions output {name} to '{value}'")
+
+
+def get_commit_and_checksuite(query_commits):
+    commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
+
+    if commits["totalCount"] > 0:
+        for commit in reversed(commits["nodes"]):
+            commit = commit["commit"]
+            commit_sha = commit["oid"]
+            if commit_sha == os.environ["EXCLUDE_COMMIT"]:
+                continue
+            checksuites = commit["checkSuites"]
+            if checksuites["totalCount"] > 0:
+                for checksuite in checksuites["nodes"]:
+                    if checksuite["workflowRun"]["workflow"]["name"] == "Build CI":
+                        return [
+                            commit_sha,
+                            checksuite["id"] if checksuite["conclusion"] != "SUCCESS" else None,
+                        ]
+        else:
+            if query_commits.paginate(commits["pageInfo"], "beforeCommit"):
+                return get_commit_and_checksuite(query_commits)
+
+    return [None, None]
+
+
+def append_runs_to_list(runs, list):
+    regex_matrix = re.compile("^build-[^ ]+")
+    regex_board = re.compile("\([^ ]+\)$")
+    for run in runs["nodes"]:
+        name = run["name"]
+        res_matrix = regex_matrix.search(name)
+        if res_matrix:
+            matrix = res_matrix.group()
+            if matrix not in list:
+                list[matrix] = []
+            list[matrix].append(regex_board.search(name).group()[1:-1])
+
+
+def get_bad_checkruns(query_checkruns, list={}):
+    checkruns = query_checkruns.fetch()["data"]["node"]
+    run_types = ["failed", "incomplete"]
+    paginate = False
+
+    for run_type in run_types:
+        run_type_camel = run_type.capitalize() + "Run"
+        run_type = run_type + "Runs"
+
+        append_runs_to_list(checkruns[run_type], list)
+
+        if query_checkruns.paginate(checkruns[run_type]["pageInfo"], "after" + run_type_camel):
+            query_checkruns.variables["include" + run_type_camel] = True
+            paginate = True
+
+    return get_bad_checkruns(query_checkruns, list) if paginate else list
+
+
+def main():
+    query_commits = Query(QUERY_COMMITS, query_variables_commits, headers)
+    query_commits.variables["owner"], query_commits.variables["name"] = os.environ["REPO"].split(
+        "/"
+    )
+
+    commit, checksuite = get_commit_and_checksuite(query_commits)
+
+    if checksuite is None:
+        if commit is None:
+            print("No checkSuites found -> Abort")
+        else:
+            set_output("commit", commit)
+        quit()
+
+    query_checkruns = Query(QUERY_CHECKRUNS, query_variables_checkruns, headers)
+    query_checkruns.variables["checkSuiteID"] = checksuite
+
+    checkruns = get_bad_checkruns(query_checkruns)
+
+    if len(checkruns) == 0:
+        print("No checkRuns found -> Abort")
+        quit()
+
+    set_output("commit", commit)
+    set_output("checkruns", json.dumps(checkruns))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index f22840fad7..081cf8d4fa 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -25,7 +25,6 @@ import re
 import os
 import sys
 import json
-import yaml
 import pathlib
 from concurrent.futures import ThreadPoolExecutor
 
@@ -62,6 +61,7 @@ IGNORE = [
 if len(sys.argv) > 1:
     print("Using files list on commandline")
     changed_files = sys.argv[1:]
+    last_failed_jobs = {}
 else:
     c = os.environ["CHANGED_FILES"]
     if c == "":
@@ -69,7 +69,14 @@ else:
         changed_files = []
     else:
         print("Using files list in CHANGED_FILES")
-        changed_files = json.loads(os.environ["CHANGED_FILES"])
+        changed_files = json.loads(c)
+
+    j = os.environ["LAST_FAILED_JOBS"]
+    if j == "":
+        print("LAST_FAILED_JOBS is in environment, but value is empty")
+        last_failed_jobs = {}
+    else:
+        last_failed_jobs = json.loads(j)
 
 
 def set_output(name, value):
@@ -196,7 +203,7 @@ def set_boards_to_build(build_all):
     # Split boards by architecture.
     print("Building boards:")
     arch_to_boards = {"aarch": [], "arm": [], "riscv": [], "espressif": []}
-    for board in sorted(boards_to_build):
+    for board in boards_to_build:
         print(" ", board)
         port = board_to_port.get(board)
         # A board can appear due to its _deletion_ (rare)
@@ -208,10 +215,20 @@ def set_boards_to_build(build_all):
 
     # Set the step outputs for each architecture
     for arch in arch_to_boards:
+        # Append previous failed jobs
+        if f"build-{arch}" in last_failed_jobs:
+            failed_boards = last_failed_jobs[f"build-{arch}"]
+            for board in failed_boards:
+                if not board in arch_to_boards[arch]:
+                    arch_to_boards[arch].append(board)
+        # Set Output
         set_output(f"boards-{arch}", json.dumps(sorted(arch_to_boards[arch])))
 
 
 def set_docs_to_build(build_all):
+    if "build-doc" in last_failed_jobs:
+        build_all = True
+
     doc_match = build_all
     if not build_all:
         doc_pattern = re.compile(
@@ -224,7 +241,7 @@ def set_docs_to_build(build_all):
 
     # Set the step outputs
     print("Building docs:", doc_match)
-    set_output(f"build-doc", doc_match)
+    set_output("build-doc", doc_match)
 
 
 def check_changed_files():

From be07722bbc2d2559f8ce7067b9e64686954cad3a Mon Sep 17 00:00:00 2001
From: CDario 
Date: Wed, 26 Oct 2022 19:57:23 +0000
Subject: [PATCH 1272/2403] Added board M5Stack Atom Lite

---
 .../boards/m5stack_atom_lite/board.c          | 38 ++++++++++++++
 .../boards/m5stack_atom_lite/mpconfigboard.h  | 43 ++++++++++++++++
 .../boards/m5stack_atom_lite/mpconfigboard.mk |  8 +++
 .../espressif/boards/m5stack_atom_lite/pins.c | 49 +++++++++++++++++++
 .../boards/m5stack_atom_lite/sdkconfig        | 27 ++++++++++
 5 files changed, 165 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_atom_lite/board.c
 create mode 100644 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_atom_lite/pins.c
 create mode 100644 ports/espressif/boards/m5stack_atom_lite/sdkconfig

diff --git a/ports/espressif/boards/m5stack_atom_lite/board.c b/ports/espressif/boards/m5stack_atom_lite/board.c
new file mode 100644
index 0000000000..66fa51c9fd
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_lite/board.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+void board_init(void) {
+}
+
+void reset_board(void) {
+}
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
new file mode 100644
index 0000000000..616a156cb2
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Atom Lite"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO27)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO25}, \
+                                     {.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
new file mode 100644
index 0000000000..70b348b4f1
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320003
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/m5stack_atom_lite/pins.c b/ports/espressif/boards/m5stack_atom_lite/pins.c
new file mode 100644
index 0000000000..495fb3a5a0
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_lite/pins.c
@@ -0,0 +1,49 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_atom_lite/sdkconfig b/ports/espressif/boards/m5stack_atom_lite/sdkconfig
new file mode 100644
index 0000000000..8a9fb07019
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_lite/sdkconfig
@@ -0,0 +1,27 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskAtomLite"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From cdbad53649cd3cee5f6e1fc3e042aac0bae53551 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Wed, 26 Oct 2022 20:06:27 +0000
Subject: [PATCH 1273/2403] Fixed wrong configuration in sdkconfig

---
 ports/espressif/boards/m5stack_core_basic/sdkconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_core_basic/sdkconfig b/ports/espressif/boards/m5stack_core_basic/sdkconfig
index 2bb24fcc89..a4cedd8e81 100644
--- a/ports/espressif/boards/m5stack_core_basic/sdkconfig
+++ b/ports/espressif/boards/m5stack_core_basic/sdkconfig
@@ -1,5 +1,5 @@
 CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
 CONFIG_ESP32_REV_MIN_3=y
 
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set

From 0e0c1067400cdd91ad5605f020df9e04ac3d3357 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Thu, 27 Oct 2022 01:06:38 +0200
Subject: [PATCH 1274/2403] Add Maker badge board

---
 .../adafruit_circuitpython_pr.md              |  13 +
 .../.github/workflows/build.yml               |  77 ++++
 .../.github/workflows/failure-help-text.yml   |  19 +
 .../.github/workflows/release.yml             |  88 ++++
 .../Adafruit_CircuitPython_SSD1680/.gitignore |  47 ++
 .../.pre-commit-config.yaml                   |  42 ++
 .../Adafruit_CircuitPython_SSD1680/.pylintrc  | 436 ++++++++++++++++++
 .../.readthedocs.yaml                         |  19 +
 .../CODE_OF_CONDUCT.md                        | 137 ++++++
 frozen/Adafruit_CircuitPython_SSD1680/LICENSE |  21 +
 .../LICENSES/CC-BY-4.0.txt                    | 324 +++++++++++++
 .../LICENSES/MIT.txt                          |  19 +
 .../LICENSES/Unlicense.txt                    |  20 +
 .../Adafruit_CircuitPython_SSD1680/README.rst | 138 ++++++
 .../README.rst.license                        |   3 +
 .../adafruit_ssd1680.py                       | 100 ++++
 .../docs/_static/favicon.ico                  | Bin 0 -> 4414 bytes
 .../docs/_static/favicon.ico.license          |   3 +
 .../docs/api.rst                              |   8 +
 .../docs/api.rst.license                      |   4 +
 .../docs/conf.py                              | 194 ++++++++
 .../docs/examples.rst                         |   8 +
 .../docs/examples.rst.license                 |   4 +
 .../docs/index.rst                            |  50 ++
 .../docs/index.rst.license                    |   4 +
 .../docs/requirements.txt                     |   5 +
 .../examples/display-ruler.bmp                | Bin 0 -> 360122 bytes
 .../examples/display-ruler.bmp.license        |   2 +
 .../examples/ssd1680_simpletest.py            |  60 +++
 .../optional_requirements.txt                 |   3 +
 .../pyproject.toml                            |  47 ++
 .../requirements.txt                          |   5 +
 .../adafruit_circuitpython_pr.md              |  13 +
 .../.github/workflows/build.yml               |  77 ++++
 .../.github/workflows/failure-help-text.yml   |  19 +
 .../.github/workflows/release.yml             |  88 ++++
 .../Adafruit_CircuitPython_UC8151D/.gitignore |  47 ++
 .../.pre-commit-config.yaml                   |  42 ++
 .../Adafruit_CircuitPython_UC8151D/.pylintrc  | 436 ++++++++++++++++++
 .../.readthedocs.yaml                         |  19 +
 .../CODE_OF_CONDUCT.md                        | 141 ++++++
 frozen/Adafruit_CircuitPython_UC8151D/LICENSE |  21 +
 .../LICENSES/CC-BY-4.0.txt                    | 324 +++++++++++++
 .../LICENSES/MIT.txt                          |  19 +
 .../LICENSES/Unlicense.txt                    |  20 +
 .../Adafruit_CircuitPython_UC8151D/README.rst | 149 ++++++
 .../README.rst.license                        |   3 +
 .../adafruit_uc8151d.py                       | 132 ++++++
 .../docs/_static/favicon.ico                  | Bin 0 -> 4414 bytes
 .../docs/_static/favicon.ico.license          |   3 +
 .../docs/api.rst                              |   8 +
 .../docs/api.rst.license                      |   4 +
 .../docs/conf.py                              | 195 ++++++++
 .../docs/examples.rst                         |   8 +
 .../docs/examples.rst.license                 |   4 +
 .../docs/index.rst                            |  51 ++
 .../docs/index.rst.license                    |   4 +
 .../docs/requirements.txt                     |   5 +
 .../examples/display-ruler.bmp                | Bin 0 -> 360122 bytes
 .../examples/display-ruler.bmp.license        |   2 +
 .../examples/uc8151d_grayscale_test.py        |  68 +++
 .../examples/uc8151d_simpletest.py            |  48 ++
 .../optional_requirements.txt                 |   3 +
 .../pyproject.toml                            |  50 ++
 .../requirements.txt                          |   6 +
 ports/espressif/boards/maker_badge/board.c    |  63 +++
 .../boards/maker_badge/mpconfigboard.h        |  55 +++
 .../boards/maker_badge/mpconfigboard.mk       |  29 ++
 ports/espressif/boards/maker_badge/pins.c     |  87 ++++
 69 files changed, 4143 insertions(+)
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.gitignore
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSE
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/README.rst
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/api.rst
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/api.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/conf.py
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/examples.rst
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/examples.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
 create mode 100644 frozen/Adafruit_CircuitPython_SSD1680/requirements.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.gitignore
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSE
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/README.rst
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/api.rst
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/api.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/conf.py
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/examples.rst
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/examples.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
 create mode 100644 frozen/Adafruit_CircuitPython_UC8151D/requirements.txt
 create mode 100644 ports/espressif/boards/maker_badge/board.c
 create mode 100644 ports/espressif/boards/maker_badge/mpconfigboard.h
 create mode 100644 ports/espressif/boards/maker_badge/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/maker_badge/pins.c

diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md b/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
new file mode 100644
index 0000000000..8de294e68a
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021 Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+Thank you for contributing! Before you submit a pull request, please read the following.
+
+Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://docs.circuitpython.org/en/latest/docs/design_guide.html
+
+If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs
+
+Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code
+
+Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
new file mode 100644
index 0000000000..cb2f60e36a
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
@@ -0,0 +1,77 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Build CI
+
+on: [pull_request, push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Translate Repo Name For Build Tools filename_prefix
+      id: repo-name
+      run: |
+        echo ::set-output name=repo-name::$(
+        echo ${{ github.repository }} |
+        awk -F '\/' '{ print tolower($2) }' |
+        tr '_' '-'
+        )
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.x"
+    - name: Versions
+      run: |
+        python3 --version
+    - name: Checkout Current Repo
+      uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: Checkout tools repo
+      uses: actions/checkout@v2
+      with:
+        repository: adafruit/actions-ci-circuitpython-libs
+        path: actions-ci
+    - name: Install dependencies
+      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
+      run: |
+        source actions-ci/install.sh
+    - name: Pip install Sphinx, pre-commit
+      run: |
+        pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
+    - name: Library version
+      run: git describe --dirty --always --tags
+    - name: Setup problem matchers
+      uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
+    - name: Pre-commit hooks
+      run: |
+        pre-commit run --all-files
+    - name: Build assets
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
+    - name: Archive bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: bundles
+        path: ${{ github.workspace }}/bundles/
+    - name: Build docs
+      working-directory: docs
+      run: sphinx-build -E -W -b html . _build/html
+    - name: Check For pyproject.toml
+      id: need-pypi
+      run: |
+        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
+    - name: Build Python package
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      run: |
+        pip install --upgrade build twine
+        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
+            sed -i -e "s/0.0.0+auto.0/1.2.3/" $file;
+        done;
+        python -m build
+        twine check dist/*
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
new file mode 100644
index 0000000000..0b1194f0cd
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Failure help text
+
+on:
+  workflow_run:
+    workflows: ["Build CI"]
+    types:
+      - completed
+
+jobs:
+  post-help:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
+    steps:
+    - name: Post comment to help
+      uses: adafruit/circuitpython-action-library-ci-failed@v1
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
new file mode 100644
index 0000000000..f3a0325ba3
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
@@ -0,0 +1,88 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Release Actions
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  upload-release-assets:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Translate Repo Name For Build Tools filename_prefix
+      id: repo-name
+      run: |
+        echo ::set-output name=repo-name::$(
+        echo ${{ github.repository }} |
+        awk -F '\/' '{ print tolower($2) }' |
+        tr '_' '-'
+        )
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.x"
+    - name: Versions
+      run: |
+        python3 --version
+    - name: Checkout Current Repo
+      uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: Checkout tools repo
+      uses: actions/checkout@v2
+      with:
+        repository: adafruit/actions-ci-circuitpython-libs
+        path: actions-ci
+    - name: Install deps
+      run: |
+        source actions-ci/install.sh
+    - name: Build assets
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
+    - name: Upload Release Assets
+      # the 'official' actions version does not yet support dynamically
+      # supplying asset names to upload. @csexton's version chosen based on
+      # discussion in the issue below, as its the simplest to implement and
+      # allows for selecting files with a pattern.
+      # https://github.com/actions/upload-release-asset/issues/4
+      #uses: actions/upload-release-asset@v1.0.1
+      uses: csexton/release-asset-action@master
+      with:
+        pattern: "bundles/*"
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  upload-pypi:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Check For pyproject.toml
+      id: need-pypi
+      run: |
+        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
+    - name: Set up Python
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade build twine
+    - name: Build and publish
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      env:
+        TWINE_USERNAME: ${{ secrets.pypi_username }}
+        TWINE_PASSWORD: ${{ secrets.pypi_password }}
+      run: |
+        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
+            sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file;
+        done;
+        python -m build
+        twine upload dist/*
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.gitignore b/frozen/Adafruit_CircuitPython_SSD1680/.gitignore
new file mode 100644
index 0000000000..544ec4a695
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.gitignore
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+# Do not include files and directories created by your personal work environment, such as the IDE
+# you use, except for those already listed here. Pull requests including changes to this file will
+# not be accepted.
+
+# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
+# including building Sphinx, testing with pip, and creating a virual environment, as well as the
+# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.
+
+# If you find that there are files being generated on your machine that should not be included in
+# your git commit, you should create a .gitignore_global file on your computer to include the
+# files created by your personal setup. To do so, follow the two steps below.
+
+# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
+# the files you want to exclude from git commits.
+
+# Second, configure Git to use the exclude file for all Git repositories by running the
+# following via commandline, replacing "path/to/your/" with the actual path to your newly created
+# .gitignore_global file:
+# git config --global core.excludesfile path/to/your/.gitignore_global
+
+# CircuitPython-specific files
+*.mpy
+
+# Python-specific files
+__pycache__
+*.pyc
+
+# Sphinx build-specific files
+_build
+
+# This file results from running `pip -e install .` in a local repository
+*.egg-info
+
+# Virtual environment-specific files
+.env
+
+# MacOS-specific files
+*.DS_Store
+
+# IDE-specific files
+.idea
+.vscode
+*~
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml b/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
new file mode 100644
index 0000000000..3343606412
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
+#
+# SPDX-License-Identifier: Unlicense
+
+repos:
+  - repo: https://github.com/python/black
+    rev: 22.3.0
+    hooks:
+      - id: black
+  - repo: https://github.com/fsfe/reuse-tool
+    rev: v0.14.0
+    hooks:
+      - id: reuse
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.2.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/pycqa/pylint
+    rev: v2.11.1
+    hooks:
+      - id: pylint
+        name: pylint (library code)
+        types: [python]
+        args:
+          - --disable=consider-using-f-string
+        exclude: "^(docs/|examples/|tests/|setup.py$)"
+      - id: pylint
+        name: pylint (example code)
+        description: Run pylint rules on "examples/*.py" files
+        types: [python]
+        files: "^examples/"
+        args:
+          - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
+      - id: pylint
+        name: pylint (test code)
+        description: Run pylint rules on "tests/*.py" files
+        types: [python]
+        files: "^tests/"
+        args:
+          - --disable=missing-docstring,consider-using-f-string,duplicate-code
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc b/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
new file mode 100644
index 0000000000..1f42e5de32
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
@@ -0,0 +1,436 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=
+
+# Add files or directories to the ignore-list. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the ignore-list. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint.
+jobs=1
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
+disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement,unspecified-encoding
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio).You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[SPELLING]
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+# notes=FIXME,XXX,TODO
+notes=FIXME,XXX
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=board
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,_cb
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,future.builtins
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+# expected-line-ending-format=
+expected-line-ending-format=LF
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )??$
+
+# Number of spaces of indent required inside a hanging  or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=12
+
+
+[BASIC]
+
+# Naming hint for argument names
+argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct argument names
+argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for attribute names
+attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct attribute names
+attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Naming hint for class attribute names
+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression matching correct class attribute names
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Naming hint for class names
+# class-name-hint=[A-Z_][a-zA-Z0-9]+$
+class-name-hint=[A-Z_][a-zA-Z0-9_]+$
+
+# Regular expression matching correct class names
+# class-rgx=[A-Z_][a-zA-Z0-9]+$
+class-rgx=[A-Z_][a-zA-Z0-9_]+$
+
+# Naming hint for constant names
+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression matching correct constant names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming hint for function names
+function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct function names
+function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Good variable names which should always be accepted, separated by a comma
+# good-names=i,j,k,ex,Run,_
+good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=no
+
+# Naming hint for inline iteration names
+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+
+# Regular expression matching correct inline iteration names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Naming hint for method names
+method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct method names
+method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for module names
+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression matching correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+property-classes=abc.abstractproperty
+
+# Naming hint for variable names
+variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct variable names
+variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+# max-attributes=7
+max-attributes=11
+
+# Maximum number of boolean expressions in a if statement
+max-bool-expr=5
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=1
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml b/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
new file mode 100644
index 0000000000..33c2a6108e
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3"
+
+python:
+  install:
+    - requirements: docs/requirements.txt
+    - requirements: requirements.txt
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md b/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..d885b3605a
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
@@ -0,0 +1,137 @@
+
+# Adafruit Community Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and leaders pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level or type of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+We are committed to providing a friendly, safe and welcoming environment for
+all.
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Be kind and courteous to others
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Collaborating with other community members
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and sexual attention or advances
+* The use of inappropriate images, including in a community member's avatar
+* The use of inappropriate language, including in a community member's nickname
+* Any spamming, flaming, baiting or other attention-stealing behavior
+* Excessive or unwelcome helping; answering outside the scope of the question
+  asked
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Promoting or spreading disinformation, lies, or conspiracy theories against
+  a person, group, organisation, project, or community
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate
+
+The goal of the standards and moderation guidelines outlined here is to build
+and maintain a respectful community. We ask that you don’t just aim to be
+"technically unimpeachable", but rather try to be your best self.
+
+We value many things beyond technical expertise, including collaboration and
+supporting others within our community. Providing a positive experience for
+other community members can have a much more significant impact than simply
+providing the correct answer.
+
+## Our Responsibilities
+
+Project leaders are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project leaders have the right and responsibility to remove, edit, or
+reject messages, comments, commits, code, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any community member for other behaviors that they deem
+inappropriate, threatening, offensive, or harmful.
+
+## Moderation
+
+Instances of behaviors that violate the Adafruit Community Code of Conduct
+may be reported by any member of the community. Community members are
+encouraged to report these situations, including situations they witness
+involving other community members.
+
+You may report in the following ways:
+
+In any situation, you may send an email to .
+
+On the Adafruit Discord, you may send an open message from any channel
+to all Community Moderators by tagging @community moderators. You may
+also send an open message from any channel, or a direct message to
+@kattni#1507, @tannewt#4653, @danh#1614, @cater#2442,
+@sommersoft#0222, @Mr. Certainly#0472 or @Andon#8175.
+
+Email and direct message reports will be kept confidential.
+
+In situations on Discord where the issue is particularly egregious, possibly
+illegal, requires immediate action, or violates the Discord terms of service,
+you should also report the message directly to Discord.
+
+These are the steps for upholding our community’s standards of conduct.
+
+1. Any member of the community may report any situation that violates the
+Adafruit Community Code of Conduct. All reports will be reviewed and
+investigated.
+2. If the behavior is an egregious violation, the community member who
+committed the violation may be banned immediately, without warning.
+3. Otherwise, moderators will first respond to such behavior with a warning.
+4. Moderators follow a soft "three strikes" policy - the community member may
+be given another chance, if they are receptive to the warning and change their
+behavior.
+5. If the community member is unreceptive or unreasonable when warned by a
+moderator, or the warning goes unheeded, they may be banned for a first or
+second offense. Repeated offenses will result in the community member being
+banned.
+
+## Scope
+
+This Code of Conduct and the enforcement policies listed above apply to all
+Adafruit Community venues. This includes but is not limited to any community
+spaces (both public and private), the entire Adafruit Discord server, and
+Adafruit GitHub repositories. Examples of Adafruit Community spaces include
+but are not limited to meet-ups, audio chats on the Adafruit Discord, or
+interaction at a conference.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. As a community
+member, you are representing our community, and are expected to behave
+accordingly.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant],
+version 1.4, available at
+,
+and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).
+
+For other projects adopting the Adafruit Community Code of
+Conduct, please contact the maintainers of those projects for enforcement.
+If you wish to use this code of conduct for your own project, consider
+explicitly mentioning your moderation policy or making a copy with your
+own moderation policy so as to avoid confusion.
+
+[Contributor Covenant]: https://www.contributor-covenant.org
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSE b/frozen/Adafruit_CircuitPython_SSD1680/LICENSE
new file mode 100644
index 0000000000..88160406de
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Melissa LeBlanc-Williams 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.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
new file mode 100644
index 0000000000..3f92dfc5fd
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
@@ -0,0 +1,324 @@
+Creative Commons Attribution 4.0 International Creative Commons Corporation
+("Creative Commons") is not a law firm and does not provide legal services
+or legal advice. Distribution of Creative Commons public licenses does not
+create a lawyer-client or other relationship. Creative Commons makes its licenses
+and related information available on an "as-is" basis. Creative Commons gives
+no warranties regarding its licenses, any material licensed under their terms
+and conditions, or any related information. Creative Commons disclaims all
+liability for damages resulting from their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions
+that creators and other rights holders may use to share original works of
+authorship and other material subject to copyright and certain other rights
+specified in the public license below. The following considerations are for
+informational purposes only, are not exhaustive, and do not form part of our
+licenses.
+
+Considerations for licensors: Our public licenses are intended for use by
+those authorized to give the public permission to use material in ways otherwise
+restricted by copyright and certain other rights. Our licenses are irrevocable.
+Licensors should read and understand the terms and conditions of the license
+they choose before applying it. Licensors should also secure all rights necessary
+before applying our licenses so that the public can reuse the material as
+expected. Licensors should clearly mark any material not subject to the license.
+This includes other CC-licensed material, or material used under an exception
+or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+
+Considerations for the public: By using one of our public licenses, a licensor
+grants the public permission to use the licensed material under specified
+terms and conditions. If the licensor's permission is not necessary for any
+reason–for example, because of any applicable exception or limitation to copyright–then
+that use is not regulated by the license. Our licenses grant only permissions
+under copyright and certain other rights that a licensor has authority to
+grant. Use of the licensed material may still be restricted for other reasons,
+including because others have copyright or other rights in the material. A
+licensor may make special requests, such as asking that all changes be marked
+or described. Although not required by our licenses, you are encouraged to
+respect those requests where reasonable. More considerations for the public
+: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution
+4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to
+be bound by the terms and conditions of this Creative Commons Attribution
+4.0 International Public License ("Public License"). To the extent this Public
+License may be interpreted as a contract, You are granted the Licensed Rights
+in consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the Licensor
+receives from making the Licensed Material available under these terms and
+conditions.
+
+Section 1 – Definitions.
+
+a. Adapted Material means material subject to Copyright and Similar Rights
+that is derived from or based upon the Licensed Material and in which the
+Licensed Material is translated, altered, arranged, transformed, or otherwise
+modified in a manner requiring permission under the Copyright and Similar
+Rights held by the Licensor. For purposes of this Public License, where the
+Licensed Material is a musical work, performance, or sound recording, Adapted
+Material is always produced where the Licensed Material is synched in timed
+relation with a moving image.
+
+b. Adapter's License means the license You apply to Your Copyright and Similar
+Rights in Your contributions to Adapted Material in accordance with the terms
+and conditions of this Public License.
+
+c. Copyright and Similar Rights means copyright and/or similar rights closely
+related to copyright including, without limitation, performance, broadcast,
+sound recording, and Sui Generis Database Rights, without regard to how the
+rights are labeled or categorized. For purposes of this Public License, the
+rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+d. Effective Technological Measures means those measures that, in the absence
+of proper authority, may not be circumvented under laws fulfilling obligations
+under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
+and/or similar international agreements.
+
+e. Exceptions and Limitations means fair use, fair dealing, and/or any other
+exception or limitation to Copyright and Similar Rights that applies to Your
+use of the Licensed Material.
+
+f. Licensed Material means the artistic or literary work, database, or other
+material to which the Licensor applied this Public License.
+
+g. Licensed Rights means the rights granted to You subject to the terms and
+conditions of this Public License, which are limited to all Copyright and
+Similar Rights that apply to Your use of the Licensed Material and that the
+Licensor has authority to license.
+
+h. Licensor means the individual(s) or entity(ies) granting rights under this
+Public License.
+
+i. Share means to provide material to the public by any means or process that
+requires permission under the Licensed Rights, such as reproduction, public
+display, public performance, distribution, dissemination, communication, or
+importation, and to make material available to the public including in ways
+that members of the public may access the material from a place and at a time
+individually chosen by them.
+
+j. Sui Generis Database Rights means rights other than copyright resulting
+from Directive 96/9/EC of the European Parliament and of the Council of 11
+March 1996 on the legal protection of databases, as amended and/or succeeded,
+as well as other essentially equivalent rights anywhere in the world.
+
+k. You means the individual or entity exercising the Licensed Rights under
+this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+   a. License grant.
+
+1. Subject to the terms and conditions of this Public License, the Licensor
+hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
+irrevocable license to exercise the Licensed Rights in the Licensed Material
+to:
+
+         A. reproduce and Share the Licensed Material, in whole or in part; and
+
+         B. produce, reproduce, and Share Adapted Material.
+
+2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
+and Limitations apply to Your use, this Public License does not apply, and
+You do not need to comply with its terms and conditions.
+
+      3. Term. The term of this Public License is specified in Section 6(a).
+
+4. Media and formats; technical modifications allowed. The Licensor authorizes
+You to exercise the Licensed Rights in all media and formats whether now known
+or hereafter created, and to make technical modifications necessary to do
+so. The Licensor waives and/or agrees not to assert any right or authority
+to forbid You from making technical modifications necessary to exercise the
+Licensed Rights, including technical modifications necessary to circumvent
+Effective Technological Measures. For purposes of this Public License, simply
+making modifications authorized by this Section 2(a)(4) never produces Adapted
+Material.
+
+      5. Downstream recipients.
+
+A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
+Material automatically receives an offer from the Licensor to exercise the
+Licensed Rights under the terms and conditions of this Public License.
+
+B. No downstream restrictions. You may not offer or impose any additional
+or different terms or conditions on, or apply any Effective Technological
+Measures to, the Licensed Material if doing so restricts exercise of the Licensed
+Rights by any recipient of the Licensed Material.
+
+6. No endorsement. Nothing in this Public License constitutes or may be construed
+as permission to assert or imply that You are, or that Your use of the Licensed
+Material is, connected with, or sponsored, endorsed, or granted official status
+by, the Licensor or others designated to receive attribution as provided in
+Section 3(a)(1)(A)(i).
+
+   b. Other rights.
+
+1. Moral rights, such as the right of integrity, are not licensed under this
+Public License, nor are publicity, privacy, and/or other similar personality
+rights; however, to the extent possible, the Licensor waives and/or agrees
+not to assert any such rights held by the Licensor to the limited extent necessary
+to allow You to exercise the Licensed Rights, but not otherwise.
+
+2. Patent and trademark rights are not licensed under this Public License.
+
+3. To the extent possible, the Licensor waives any right to collect royalties
+from You for the exercise of the Licensed Rights, whether directly or through
+a collecting society under any voluntary or waivable statutory or compulsory
+licensing scheme. In all other cases the Licensor expressly reserves any right
+to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following
+conditions.
+
+   a. Attribution.
+
+1. If You Share the Licensed Material (including in modified form), You must:
+
+A. retain the following if it is supplied by the Licensor with the Licensed
+Material:
+
+i. identification of the creator(s) of the Licensed Material and any others
+designated to receive attribution, in any reasonable manner requested by the
+Licensor (including by pseudonym if designated);
+
+            ii. a copyright notice;
+
+            iii. a notice that refers to this Public License;
+
+            iv. a notice that refers to the disclaimer of warranties;
+
+v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+B. indicate if You modified the Licensed Material and retain an indication
+of any previous modifications; and
+
+C. indicate the Licensed Material is licensed under this Public License, and
+include the text of, or the URI or hyperlink to, this Public License.
+
+2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner
+based on the medium, means, and context in which You Share the Licensed Material.
+For example, it may be reasonable to satisfy the conditions by providing a
+URI or hyperlink to a resource that includes the required information.
+
+3. If requested by the Licensor, You must remove any of the information required
+by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+4. If You Share Adapted Material You produce, the Adapter's License You apply
+must not prevent recipients of the Adapted Material from complying with this
+Public License.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to
+Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+reuse, reproduce, and Share all or a substantial portion of the contents of
+the database;
+
+b. if You include all or a substantial portion of the database contents in
+a database in which You have Sui Generis Database Rights, then the database
+in which You have Sui Generis Database Rights (but not its individual contents)
+is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or
+a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace
+Your obligations under this Public License where the Licensed Rights include
+other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+the Licensor offers the Licensed Material as-is and as-available, and makes
+no representations or warranties of any kind concerning the Licensed Material,
+whether express, implied, statutory, or other. This includes, without limitation,
+warranties of title, merchantability, fitness for a particular purpose, non-infringement,
+absence of latent or other defects, accuracy, or the presence or absence of
+errors, whether or not known or discoverable. Where disclaimers of warranties
+are not allowed in full or in part, this disclaimer may not apply to You.
+
+b. To the extent possible, in no event will the Licensor be liable to You
+on any legal theory (including, without limitation, negligence) or otherwise
+for any direct, special, indirect, incidental, consequential, punitive, exemplary,
+or other losses, costs, expenses, or damages arising out of this Public License
+or use of the Licensed Material, even if the Licensor has been advised of
+the possibility of such losses, costs, expenses, or damages. Where a limitation
+of liability is not allowed in full or in part, this limitation may not apply
+to You.
+
+c. The disclaimer of warranties and limitation of liability provided above
+shall be interpreted in a manner that, to the extent possible, most closely
+approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights
+licensed here. However, if You fail to comply with this Public License, then
+Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section
+6(a), it reinstates:
+
+1. automatically as of the date the violation is cured, provided it is cured
+within 30 days of Your discovery of the violation; or
+
+      2. upon express reinstatement by the Licensor.
+
+c. For the avoidance of doubt, this Section 6(b) does not affect any right
+the Licensor may have to seek remedies for Your violations of this Public
+License.
+
+d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+under separate terms or conditions or stop distributing the Licensed Material
+at any time; however, doing so will not terminate this Public License.
+
+   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or
+conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed
+Material not stated herein are separate from and independent of the terms
+and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not
+be interpreted to, reduce, limit, restrict, or impose conditions on any use
+of the Licensed Material that could lawfully be made without permission under
+this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed
+unenforceable, it shall be automatically reformed to the minimum extent necessary
+to make it enforceable. If the provision cannot be reformed, it shall be severed
+from this Public License without affecting the enforceability of the remaining
+terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure
+to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation
+upon, or waiver of, any privileges and immunities that apply to the Licensor
+or You, including from the legal processes of any jurisdiction or authority.
+
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative
+Commons may elect to apply one of its public licenses to material it publishes
+and in those instances will be considered the "Licensor." The text of the
+Creative Commons public licenses is dedicated to the public domain under the
+CC0 Public Domain Dedication. Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as otherwise
+permitted by the Creative Commons policies published at creativecommons.org/policies,
+Creative Commons does not authorize the use of the trademark "Creative Commons"
+or any other trademark or logo of Creative Commons without its prior written
+consent including, without limitation, in connection with any unauthorized
+modifications to any of its public licenses or any other arrangements, understandings,
+or agreements concerning use of licensed material. For the avoidance of doubt,
+this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
new file mode 100644
index 0000000000..204b93da48
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
@@ -0,0 +1,19 @@
+MIT License Copyright (c)  
+
+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 (including the next
+paragraph) 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/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
new file mode 100644
index 0000000000..24a8f90199
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
@@ -0,0 +1,20 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute
+this software, either in source code form or as a compiled binary, for any
+purpose, commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and
+to the detriment of our heirs and successors. We intend this dedication to
+be an overt act of relinquishment in perpetuity of all present and future
+rights to this software under copyright law.
+
+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
+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. For more information,
+please refer to 
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/README.rst b/frozen/Adafruit_CircuitPython_SSD1680/README.rst
new file mode 100644
index 0000000000..0ff9a3382d
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/README.rst
@@ -0,0 +1,138 @@
+Introduction
+============
+
+.. image:: https://readthedocs.org/projects/adafruit-circuitpython-ssd1680/badge/?version=latest
+    :target: https://docs.circuitpython.org/projects/ssd1680/en/latest/
+    :alt: Documentation Status
+
+
+.. image:: https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_Bundle/main/badges/adafruit_discord.svg
+    :target: https://adafru.it/discord
+    :alt: Discord
+
+
+.. image:: https://github.com/adafruit/Adafruit_CircuitPython_SSD1680/workflows/Build%20CI/badge.svg
+    :target: https://github.com/adafruit/Adafruit_CircuitPython_SSD1680/actions
+    :alt: Build Status
+
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/psf/black
+    :alt: Code Style: Black
+
+CircuitPython `displayio` driver for SSD1680-based ePaper displays
+
+Dependencies
+=============
+This driver depends on:
+
+* `Adafruit CircuitPython `_
+
+Please ensure all dependencies are available on the CircuitPython filesystem.
+This is easily achieved by downloading
+`the Adafruit library and driver bundle `_
+or individual libraries can be installed using
+`circup `_.
+
+* Adafruit 2.13" 250x122 Tri-Color eInk / ePaper Display with SRAM - SSD1680 Driver
+
+`Purchase the Breakout from the Adafruit shop `_
+
+* Adafruit 2.13" HD Tri-Color eInk / ePaper Display FeatherWing - 250x122 RW Panel with SSD1680
+
+`Purchase the FeatherWing from the Adafruit shop `_
+
+Installing from PyPI
+=====================
+
+On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
+PyPI `_. To install for current user:
+
+.. code-block:: shell
+
+    pip3 install adafruit-circuitpython-ssd1680
+
+To install system-wide (this may be required in some cases):
+
+.. code-block:: shell
+
+    sudo pip3 install adafruit-circuitpython-ssd1680
+
+To install in a virtual environment in your current project:
+
+.. code-block:: shell
+
+    mkdir project-name && cd project-name
+    python3 -m venv .venv
+    source .venv/bin/activate
+    pip3 install adafruit-circuitpython-ssd1680
+
+Usage Example
+=============
+
+.. code-block:: python
+
+    import time
+    import board
+    import displayio
+    import adafruit_ssd1680
+
+    displayio.release_displays()
+
+    # This pinout works on a Metro M4 and may need to be altered for other boards.
+    spi = board.SPI()  # Uses SCK and MOSI
+    epd_cs = board.D9
+    epd_dc = board.D10
+    epd_reset = board.D8    # Set to None for FeatherWing
+    epd_busy = board.D7    # Set to None for FeatherWing
+
+    display_bus = displayio.FourWire(
+        spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
+    )
+    time.sleep(1)
+
+    display = adafruit_ssd1680.SSD1680(
+        display_bus,
+        width=250,
+        height=122,
+        busy_pin=epd_busy,
+        highlight_color=0xFF0000,
+        rotation=270,
+    )
+
+    g = displayio.Group()
+
+    # CircuitPython 6 & 7 compatible
+    f = open("/display-ruler.bmp", "rb")
+    pic = displayio.OnDiskBitmap(f)
+    t = displayio.TileGrid(
+        pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter())
+    )
+
+    # # CircuitPython 7 compatible only
+    # pic = displayio.OnDiskBitmap("/display-ruler.bmp")
+    # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
+
+    g.append(t)
+
+    display.show(g)
+
+    display.refresh()
+    print("refreshed")
+
+    time.sleep(120)
+
+
+Documentation
+=============
+
+API documentation for this library can be found on `Read the Docs `_.
+
+For information on building library documentation, please check out `this guide `_.
+
+Contributing
+============
+
+Contributions are welcome! Please read our `Code of Conduct
+`_
+before contributing to help this project stay welcoming.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license b/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
new file mode 100644
index 0000000000..87eb036957
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py b/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
new file mode 100644
index 0000000000..490725fed6
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
@@ -0,0 +1,100 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""
+`adafruit_ssd1680`
+================================================================================
+
+CircuitPython `displayio` driver for SSD1680-based ePaper displays
+
+
+* Author(s): Melissa LeBlanc-Williams
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+* `Adafruit 2.13" Tri-Color eInk Display Breakout `_
+* `Adafruit 2.13" Tri-Color eInk Display FeatherWing `_
+
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://github.com/adafruit/circuitpython/releases
+
+"""
+
+import displayio
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1680.git"
+
+_START_SEQUENCE = (
+    b"\x12\x80\x14"  # soft reset and wait 20ms
+    b"\x11\x01\x03"  # Ram data entry mode
+    b"\x3C\x01\x05"  # border color
+    b"\x2c\x01\x36"  # Set vcom voltage
+    b"\x03\x01\x17"  # Set gate voltage
+    b"\x04\x03\x41\x00\x32"  # Set source voltage
+    b"\x4e\x01\x01"  # ram x count
+    b"\x4f\x02\x00\x00"  # ram y count
+    b"\x01\x03\x00\x00\x00"  # set display size
+    b"\x22\x01\xf4"  # display update mode
+)
+
+_STOP_SEQUENCE = b"\x10\x81\x01\x64"  # Deep Sleep
+# pylint: disable=too-few-public-methods
+class SSD1680(displayio.EPaperDisplay):
+    r"""SSD1680 driver
+
+    :param bus: The data bus the display is on
+    :param \**kwargs:
+        See below
+
+    :Keyword Arguments:
+        * *width* (``int``) --
+          Display width
+        * *height* (``int``) --
+          Display height
+        * *rotation* (``int``) --
+          Display rotation
+    """
+
+    def __init__(self, bus: displayio.Fourwire, **kwargs) -> None:
+        stop_sequence = bytearray(_STOP_SEQUENCE)
+        try:
+            bus.reset()
+        except RuntimeError:
+            # No reset pin defined, so no deep sleeping
+            stop_sequence = b""
+
+        start_sequence = bytearray(_START_SEQUENCE)
+        width = kwargs["width"]
+        height = kwargs["height"]
+        if "rotation" in kwargs and kwargs["rotation"] % 180 != 90:
+            width, height = height, width
+        start_sequence[29] = (width - 1) & 0xFF
+        start_sequence[30] = ((width - 1) >> 8) & 0xFF
+
+        super().__init__(
+            bus,
+            start_sequence,
+            stop_sequence,
+            **kwargs,
+            ram_width=250,
+            ram_height=296,
+            busy_state=True,
+            write_black_ram_command=0x24,
+            write_color_ram_command=0x26,
+            black_bits_inverted=False,
+            set_column_window_command=0x44,
+            set_row_window_command=0x45,
+            set_current_column_command=0x4E,
+            set_current_row_command=0x4F,
+            refresh_display_command=0x20,
+            colstart=1,
+            always_toggle_chip_select=True,
+        )
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico b/frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5aca98376a1f7e593ebd9cf41a808512c2135635
GIT binary patch
literal 4414
zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en
zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK
zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8
z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3
z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG
zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn
zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^>#
z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt
z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx
zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D
z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$
zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ
z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g
z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4
zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%%
z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH
zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI
zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2
z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y
zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV
zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv)
zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^
zXUM@xoV6yBFKfzvY20V&Lr0yC
+    Adafruit 2.13" HD Tri-Color eInk / ePaper Display FeatherWing 
+
+.. toctree::
+    :caption: Other Links
+
+    Download from GitHub 
+    Download Library Bundle 
+    CircuitPython Reference Documentation 
+    CircuitPython Support Forum 
+    Discord Chat 
+    Adafruit Learning System 
+    Adafruit Blog 
+    Adafruit Store 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license b/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
new file mode 100644
index 0000000000..52de478909
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+
+SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
new file mode 100644
index 0000000000..88e67331eb
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+sphinx>=4.0.0
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp b/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..726b5e026fd30b7e5baf5c23323d159b0eb5f65d
GIT binary patch
literal 360122
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
T`pMSbh(J1r2r{u6#p?e9C4JK7

literal 0
HcmV?d00001

diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license b/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
new file mode 100644
index 0000000000..a784acfa32
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
+# SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py b/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
new file mode 100644
index 0000000000..48a4d4d8bd
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
@@ -0,0 +1,60 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+"""Simple test script for 2.13" 250x122 tri-color display.
+Supported products:
+  * Adafruit 2.13" Tri-Color eInk Display Breakout
+    * https://www.adafruit.com/product/4947
+  * Adafruit 2.13" Tri-Color eInk Display FeatherWing
+    * https://www.adafruit.com/product/4814
+"""
+
+import time
+import board
+import displayio
+import adafruit_ssd1680
+
+displayio.release_displays()
+
+# This pinout works on a Metro M4 and may need to be altered for other boards.
+spi = board.SPI()  # Uses SCK and MOSI
+epd_cs = board.D9
+epd_dc = board.D10
+epd_reset = board.D8  # Set to None for FeatherWing
+epd_busy = board.D7  # Set to None for FeatherWing
+
+display_bus = displayio.FourWire(
+    spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
+)
+time.sleep(1)
+
+display = adafruit_ssd1680.SSD1680(
+    display_bus,
+    width=250,
+    height=122,
+    busy_pin=epd_busy,
+    highlight_color=0xFF0000,
+    rotation=270,
+)
+
+g = displayio.Group()
+
+with open("/display-ruler.bmp", "rb") as f:
+    pic = displayio.OnDiskBitmap(f)
+    # CircuitPython 6 & 7 compatible
+    t = displayio.TileGrid(
+        pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter())
+    )
+    # CircuitPython 7 compatible only
+    # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
+    g.append(t)
+
+    display.show(g)
+
+    display.refresh()
+
+    print("refreshed")
+
+    time.sleep(120)
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
new file mode 100644
index 0000000000..d4e27c4d74
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml b/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
new file mode 100644
index 0000000000..b36b2d7afb
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+[build-system]
+requires = [
+    "setuptools",
+    "wheel",
+    "setuptools-scm",
+]
+
+[project]
+name = "adafruit-circuitpython-ssd1680"
+description = "CircuitPython `displayio` drivers for SSD1680-based ePaper displays"
+version = "0.0.0+auto.0"
+readme = "README.rst"
+authors = [
+    {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}
+]
+urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1680"}
+keywords = [
+    "adafruit",
+    "blinka",
+    "circuitpython",
+    "micropython",
+    "ssd1680",
+    "displayio",
+    "epd",
+    "epaper",
+]
+license = {text = "MIT"}
+classifiers = [
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Embedded Systems",
+    "Topic :: System :: Hardware",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+]
+dynamic = ["dependencies", "optional-dependencies"]
+
+[tool.setuptools]
+py-modules = ["adafruit_ssd1680"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt
new file mode 100644
index 0000000000..7a984a4739
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+Adafruit-Blinka
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md b/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
new file mode 100644
index 0000000000..8de294e68a
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021 Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+Thank you for contributing! Before you submit a pull request, please read the following.
+
+Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://docs.circuitpython.org/en/latest/docs/design_guide.html
+
+If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs
+
+Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code
+
+Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
new file mode 100644
index 0000000000..cb2f60e36a
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
@@ -0,0 +1,77 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Build CI
+
+on: [pull_request, push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Translate Repo Name For Build Tools filename_prefix
+      id: repo-name
+      run: |
+        echo ::set-output name=repo-name::$(
+        echo ${{ github.repository }} |
+        awk -F '\/' '{ print tolower($2) }' |
+        tr '_' '-'
+        )
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.x"
+    - name: Versions
+      run: |
+        python3 --version
+    - name: Checkout Current Repo
+      uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: Checkout tools repo
+      uses: actions/checkout@v2
+      with:
+        repository: adafruit/actions-ci-circuitpython-libs
+        path: actions-ci
+    - name: Install dependencies
+      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
+      run: |
+        source actions-ci/install.sh
+    - name: Pip install Sphinx, pre-commit
+      run: |
+        pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
+    - name: Library version
+      run: git describe --dirty --always --tags
+    - name: Setup problem matchers
+      uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
+    - name: Pre-commit hooks
+      run: |
+        pre-commit run --all-files
+    - name: Build assets
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
+    - name: Archive bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: bundles
+        path: ${{ github.workspace }}/bundles/
+    - name: Build docs
+      working-directory: docs
+      run: sphinx-build -E -W -b html . _build/html
+    - name: Check For pyproject.toml
+      id: need-pypi
+      run: |
+        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
+    - name: Build Python package
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      run: |
+        pip install --upgrade build twine
+        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
+            sed -i -e "s/0.0.0+auto.0/1.2.3/" $file;
+        done;
+        python -m build
+        twine check dist/*
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
new file mode 100644
index 0000000000..0b1194f0cd
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Failure help text
+
+on:
+  workflow_run:
+    workflows: ["Build CI"]
+    types:
+      - completed
+
+jobs:
+  post-help:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
+    steps:
+    - name: Post comment to help
+      uses: adafruit/circuitpython-action-library-ci-failed@v1
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
new file mode 100644
index 0000000000..f3a0325ba3
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
@@ -0,0 +1,88 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+name: Release Actions
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  upload-release-assets:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Translate Repo Name For Build Tools filename_prefix
+      id: repo-name
+      run: |
+        echo ::set-output name=repo-name::$(
+        echo ${{ github.repository }} |
+        awk -F '\/' '{ print tolower($2) }' |
+        tr '_' '-'
+        )
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.x"
+    - name: Versions
+      run: |
+        python3 --version
+    - name: Checkout Current Repo
+      uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: Checkout tools repo
+      uses: actions/checkout@v2
+      with:
+        repository: adafruit/actions-ci-circuitpython-libs
+        path: actions-ci
+    - name: Install deps
+      run: |
+        source actions-ci/install.sh
+    - name: Build assets
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
+    - name: Upload Release Assets
+      # the 'official' actions version does not yet support dynamically
+      # supplying asset names to upload. @csexton's version chosen based on
+      # discussion in the issue below, as its the simplest to implement and
+      # allows for selecting files with a pattern.
+      # https://github.com/actions/upload-release-asset/issues/4
+      #uses: actions/upload-release-asset@v1.0.1
+      uses: csexton/release-asset-action@master
+      with:
+        pattern: "bundles/*"
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  upload-pypi:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Check For pyproject.toml
+      id: need-pypi
+      run: |
+        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
+    - name: Set up Python
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade build twine
+    - name: Build and publish
+      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
+      env:
+        TWINE_USERNAME: ${{ secrets.pypi_username }}
+        TWINE_PASSWORD: ${{ secrets.pypi_password }}
+      run: |
+        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
+            sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file;
+        done;
+        python -m build
+        twine upload dist/*
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.gitignore b/frozen/Adafruit_CircuitPython_UC8151D/.gitignore
new file mode 100644
index 0000000000..544ec4a695
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.gitignore
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+# Do not include files and directories created by your personal work environment, such as the IDE
+# you use, except for those already listed here. Pull requests including changes to this file will
+# not be accepted.
+
+# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
+# including building Sphinx, testing with pip, and creating a virual environment, as well as the
+# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.
+
+# If you find that there are files being generated on your machine that should not be included in
+# your git commit, you should create a .gitignore_global file on your computer to include the
+# files created by your personal setup. To do so, follow the two steps below.
+
+# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
+# the files you want to exclude from git commits.
+
+# Second, configure Git to use the exclude file for all Git repositories by running the
+# following via commandline, replacing "path/to/your/" with the actual path to your newly created
+# .gitignore_global file:
+# git config --global core.excludesfile path/to/your/.gitignore_global
+
+# CircuitPython-specific files
+*.mpy
+
+# Python-specific files
+__pycache__
+*.pyc
+
+# Sphinx build-specific files
+_build
+
+# This file results from running `pip -e install .` in a local repository
+*.egg-info
+
+# Virtual environment-specific files
+.env
+
+# MacOS-specific files
+*.DS_Store
+
+# IDE-specific files
+.idea
+.vscode
+*~
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml b/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
new file mode 100644
index 0000000000..3343606412
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
+#
+# SPDX-License-Identifier: Unlicense
+
+repos:
+  - repo: https://github.com/python/black
+    rev: 22.3.0
+    hooks:
+      - id: black
+  - repo: https://github.com/fsfe/reuse-tool
+    rev: v0.14.0
+    hooks:
+      - id: reuse
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.2.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/pycqa/pylint
+    rev: v2.11.1
+    hooks:
+      - id: pylint
+        name: pylint (library code)
+        types: [python]
+        args:
+          - --disable=consider-using-f-string
+        exclude: "^(docs/|examples/|tests/|setup.py$)"
+      - id: pylint
+        name: pylint (example code)
+        description: Run pylint rules on "examples/*.py" files
+        types: [python]
+        files: "^examples/"
+        args:
+          - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
+      - id: pylint
+        name: pylint (test code)
+        description: Run pylint rules on "tests/*.py" files
+        types: [python]
+        files: "^tests/"
+        args:
+          - --disable=missing-docstring,consider-using-f-string,duplicate-code
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc b/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
new file mode 100644
index 0000000000..1f42e5de32
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
@@ -0,0 +1,436 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=
+
+# Add files or directories to the ignore-list. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the ignore-list. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint.
+jobs=1
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
+disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement,unspecified-encoding
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio).You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[SPELLING]
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+# notes=FIXME,XXX,TODO
+notes=FIXME,XXX
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=board
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,_cb
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,future.builtins
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+# expected-line-ending-format=
+expected-line-ending-format=LF
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )??$
+
+# Number of spaces of indent required inside a hanging  or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=12
+
+
+[BASIC]
+
+# Naming hint for argument names
+argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct argument names
+argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for attribute names
+attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct attribute names
+attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Naming hint for class attribute names
+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression matching correct class attribute names
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Naming hint for class names
+# class-name-hint=[A-Z_][a-zA-Z0-9]+$
+class-name-hint=[A-Z_][a-zA-Z0-9_]+$
+
+# Regular expression matching correct class names
+# class-rgx=[A-Z_][a-zA-Z0-9]+$
+class-rgx=[A-Z_][a-zA-Z0-9_]+$
+
+# Naming hint for constant names
+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression matching correct constant names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming hint for function names
+function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct function names
+function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Good variable names which should always be accepted, separated by a comma
+# good-names=i,j,k,ex,Run,_
+good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=no
+
+# Naming hint for inline iteration names
+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+
+# Regular expression matching correct inline iteration names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Naming hint for method names
+method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct method names
+method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for module names
+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression matching correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+property-classes=abc.abstractproperty
+
+# Naming hint for variable names
+variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct variable names
+variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+# max-attributes=7
+max-attributes=11
+
+# Maximum number of boolean expressions in a if statement
+max-bool-expr=5
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=1
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml b/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
new file mode 100644
index 0000000000..33c2a6108e
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3"
+
+python:
+  install:
+    - requirements: docs/requirements.txt
+    - requirements: requirements.txt
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md b/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..01a7515796
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
@@ -0,0 +1,141 @@
+
+# Adafruit Community Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and leaders pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level or type of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+We are committed to providing a friendly, safe and welcoming environment for
+all.
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Be kind and courteous to others
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Collaborating with other community members
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and sexual attention or advances
+* The use of inappropriate images, including in a community member's avatar
+* The use of inappropriate language, including in a community member's nickname
+* Any spamming, flaming, baiting or other attention-stealing behavior
+* Excessive or unwelcome helping; answering outside the scope of the question
+  asked
+* Discussion or promotion of activities or projects that intend or pose a risk of
+  significant harm
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Promoting or spreading disinformation, lies, or conspiracy theories against
+  a person, group, organisation, project, or community
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate
+
+The goal of the standards and moderation guidelines outlined here is to build
+and maintain a respectful community. We ask that you don’t just aim to be
+"technically unimpeachable", but rather try to be your best self.
+
+We value many things beyond technical expertise, including collaboration and
+supporting others within our community. Providing a positive experience for
+other community members can have a much more significant impact than simply
+providing the correct answer.
+
+## Our Responsibilities
+
+Project leaders are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project leaders have the right and responsibility to remove, edit, or
+reject messages, comments, commits, code, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any community member for other behaviors that they deem
+inappropriate, threatening, offensive, or harmful.
+
+## Moderation
+
+Instances of behaviors that violate the Adafruit Community Code of Conduct
+may be reported by any member of the community. Community members are
+encouraged to report these situations, including situations they witness
+involving other community members.
+
+You may report in the following ways:
+
+In any situation, you may email .
+
+On the Adafruit Discord, you may send an open message from any channel
+to all Community Moderators by tagging @community moderators. You may
+also send an open message from any channel, or a direct message to
+any Community Moderator.
+
+Email and direct message reports will be kept confidential.
+
+In situations on Discord where the issue is particularly offensive, possibly
+illegal, requires immediate action, or violates the Discord terms of service,
+you should also report the message directly to [Discord](https://discord.com/safety).
+
+These are the steps for upholding our community’s standards of conduct.
+
+1. Any member of the community may report any situation that violates the
+   CircuitPython Community Code of Conduct. All reports will be reviewed and
+   investigated.
+2. If the behavior is a severe violation, the community member who
+   committed the violation may be banned immediately, without warning.
+3. Otherwise, moderators will first respond to such behavior with a warning.
+4. Moderators follow a soft "three strikes" policy - the community member may
+   be given another chance, if they are receptive to the warning and change their
+   behavior.
+5. If the community member is unreceptive or unreasonable when warned by a
+   moderator, or the warning goes unheeded, they may be banned for a first or
+   second offense. Repeated offenses will result in the community member being
+   banned.
+6. Disciplinary actions (warnings, bans, etc) for Code of Conduct violations apply
+   to the platform where the violation occurred. However, depending on the severity
+   of the violation, the disciplinary action may be applied across Adafruit's other
+   community platforms. For example, a severe violation on the Adafruit Discord
+   server may result in a ban on not only the Adafruit Discord server, but also on
+   the Adafruit GitHub organisation, Adafruit Forums, Adafruit Twitter, etc.
+
+## Scope
+
+This Code of Conduct and the enforcement policies listed above apply to all
+Adafruit Community venues. This includes but is not limited to any community
+spaces (both public and private), the entire Adafruit Discord server, and
+Adafruit GitHub repositories. Examples of Adafruit Community spaces include
+but are not limited to meet-ups, audio chats on the Adafruit Discord, or
+interaction at a conference.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. As a community
+member, you are representing our community, and are expected to behave
+accordingly.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/),
+version 1.4, available on [contributor-covenant.org](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html),
+and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).
+
+For other projects adopting the Adafruit Community Code of
+Conduct, please contact the maintainers of those projects for enforcement.
+If you wish to use this code of conduct for your own project, consider
+explicitly mentioning your moderation policy or making a copy with your
+own moderation policy so as to avoid confusion.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSE b/frozen/Adafruit_CircuitPython_UC8151D/LICENSE
new file mode 100644
index 0000000000..88160406de
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Melissa LeBlanc-Williams 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.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
new file mode 100644
index 0000000000..3f92dfc5fd
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
@@ -0,0 +1,324 @@
+Creative Commons Attribution 4.0 International Creative Commons Corporation
+("Creative Commons") is not a law firm and does not provide legal services
+or legal advice. Distribution of Creative Commons public licenses does not
+create a lawyer-client or other relationship. Creative Commons makes its licenses
+and related information available on an "as-is" basis. Creative Commons gives
+no warranties regarding its licenses, any material licensed under their terms
+and conditions, or any related information. Creative Commons disclaims all
+liability for damages resulting from their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions
+that creators and other rights holders may use to share original works of
+authorship and other material subject to copyright and certain other rights
+specified in the public license below. The following considerations are for
+informational purposes only, are not exhaustive, and do not form part of our
+licenses.
+
+Considerations for licensors: Our public licenses are intended for use by
+those authorized to give the public permission to use material in ways otherwise
+restricted by copyright and certain other rights. Our licenses are irrevocable.
+Licensors should read and understand the terms and conditions of the license
+they choose before applying it. Licensors should also secure all rights necessary
+before applying our licenses so that the public can reuse the material as
+expected. Licensors should clearly mark any material not subject to the license.
+This includes other CC-licensed material, or material used under an exception
+or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+
+Considerations for the public: By using one of our public licenses, a licensor
+grants the public permission to use the licensed material under specified
+terms and conditions. If the licensor's permission is not necessary for any
+reason–for example, because of any applicable exception or limitation to copyright–then
+that use is not regulated by the license. Our licenses grant only permissions
+under copyright and certain other rights that a licensor has authority to
+grant. Use of the licensed material may still be restricted for other reasons,
+including because others have copyright or other rights in the material. A
+licensor may make special requests, such as asking that all changes be marked
+or described. Although not required by our licenses, you are encouraged to
+respect those requests where reasonable. More considerations for the public
+: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution
+4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to
+be bound by the terms and conditions of this Creative Commons Attribution
+4.0 International Public License ("Public License"). To the extent this Public
+License may be interpreted as a contract, You are granted the Licensed Rights
+in consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the Licensor
+receives from making the Licensed Material available under these terms and
+conditions.
+
+Section 1 – Definitions.
+
+a. Adapted Material means material subject to Copyright and Similar Rights
+that is derived from or based upon the Licensed Material and in which the
+Licensed Material is translated, altered, arranged, transformed, or otherwise
+modified in a manner requiring permission under the Copyright and Similar
+Rights held by the Licensor. For purposes of this Public License, where the
+Licensed Material is a musical work, performance, or sound recording, Adapted
+Material is always produced where the Licensed Material is synched in timed
+relation with a moving image.
+
+b. Adapter's License means the license You apply to Your Copyright and Similar
+Rights in Your contributions to Adapted Material in accordance with the terms
+and conditions of this Public License.
+
+c. Copyright and Similar Rights means copyright and/or similar rights closely
+related to copyright including, without limitation, performance, broadcast,
+sound recording, and Sui Generis Database Rights, without regard to how the
+rights are labeled or categorized. For purposes of this Public License, the
+rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+d. Effective Technological Measures means those measures that, in the absence
+of proper authority, may not be circumvented under laws fulfilling obligations
+under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
+and/or similar international agreements.
+
+e. Exceptions and Limitations means fair use, fair dealing, and/or any other
+exception or limitation to Copyright and Similar Rights that applies to Your
+use of the Licensed Material.
+
+f. Licensed Material means the artistic or literary work, database, or other
+material to which the Licensor applied this Public License.
+
+g. Licensed Rights means the rights granted to You subject to the terms and
+conditions of this Public License, which are limited to all Copyright and
+Similar Rights that apply to Your use of the Licensed Material and that the
+Licensor has authority to license.
+
+h. Licensor means the individual(s) or entity(ies) granting rights under this
+Public License.
+
+i. Share means to provide material to the public by any means or process that
+requires permission under the Licensed Rights, such as reproduction, public
+display, public performance, distribution, dissemination, communication, or
+importation, and to make material available to the public including in ways
+that members of the public may access the material from a place and at a time
+individually chosen by them.
+
+j. Sui Generis Database Rights means rights other than copyright resulting
+from Directive 96/9/EC of the European Parliament and of the Council of 11
+March 1996 on the legal protection of databases, as amended and/or succeeded,
+as well as other essentially equivalent rights anywhere in the world.
+
+k. You means the individual or entity exercising the Licensed Rights under
+this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+   a. License grant.
+
+1. Subject to the terms and conditions of this Public License, the Licensor
+hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
+irrevocable license to exercise the Licensed Rights in the Licensed Material
+to:
+
+         A. reproduce and Share the Licensed Material, in whole or in part; and
+
+         B. produce, reproduce, and Share Adapted Material.
+
+2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
+and Limitations apply to Your use, this Public License does not apply, and
+You do not need to comply with its terms and conditions.
+
+      3. Term. The term of this Public License is specified in Section 6(a).
+
+4. Media and formats; technical modifications allowed. The Licensor authorizes
+You to exercise the Licensed Rights in all media and formats whether now known
+or hereafter created, and to make technical modifications necessary to do
+so. The Licensor waives and/or agrees not to assert any right or authority
+to forbid You from making technical modifications necessary to exercise the
+Licensed Rights, including technical modifications necessary to circumvent
+Effective Technological Measures. For purposes of this Public License, simply
+making modifications authorized by this Section 2(a)(4) never produces Adapted
+Material.
+
+      5. Downstream recipients.
+
+A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
+Material automatically receives an offer from the Licensor to exercise the
+Licensed Rights under the terms and conditions of this Public License.
+
+B. No downstream restrictions. You may not offer or impose any additional
+or different terms or conditions on, or apply any Effective Technological
+Measures to, the Licensed Material if doing so restricts exercise of the Licensed
+Rights by any recipient of the Licensed Material.
+
+6. No endorsement. Nothing in this Public License constitutes or may be construed
+as permission to assert or imply that You are, or that Your use of the Licensed
+Material is, connected with, or sponsored, endorsed, or granted official status
+by, the Licensor or others designated to receive attribution as provided in
+Section 3(a)(1)(A)(i).
+
+   b. Other rights.
+
+1. Moral rights, such as the right of integrity, are not licensed under this
+Public License, nor are publicity, privacy, and/or other similar personality
+rights; however, to the extent possible, the Licensor waives and/or agrees
+not to assert any such rights held by the Licensor to the limited extent necessary
+to allow You to exercise the Licensed Rights, but not otherwise.
+
+2. Patent and trademark rights are not licensed under this Public License.
+
+3. To the extent possible, the Licensor waives any right to collect royalties
+from You for the exercise of the Licensed Rights, whether directly or through
+a collecting society under any voluntary or waivable statutory or compulsory
+licensing scheme. In all other cases the Licensor expressly reserves any right
+to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following
+conditions.
+
+   a. Attribution.
+
+1. If You Share the Licensed Material (including in modified form), You must:
+
+A. retain the following if it is supplied by the Licensor with the Licensed
+Material:
+
+i. identification of the creator(s) of the Licensed Material and any others
+designated to receive attribution, in any reasonable manner requested by the
+Licensor (including by pseudonym if designated);
+
+            ii. a copyright notice;
+
+            iii. a notice that refers to this Public License;
+
+            iv. a notice that refers to the disclaimer of warranties;
+
+v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+B. indicate if You modified the Licensed Material and retain an indication
+of any previous modifications; and
+
+C. indicate the Licensed Material is licensed under this Public License, and
+include the text of, or the URI or hyperlink to, this Public License.
+
+2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner
+based on the medium, means, and context in which You Share the Licensed Material.
+For example, it may be reasonable to satisfy the conditions by providing a
+URI or hyperlink to a resource that includes the required information.
+
+3. If requested by the Licensor, You must remove any of the information required
+by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+4. If You Share Adapted Material You produce, the Adapter's License You apply
+must not prevent recipients of the Adapted Material from complying with this
+Public License.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to
+Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+reuse, reproduce, and Share all or a substantial portion of the contents of
+the database;
+
+b. if You include all or a substantial portion of the database contents in
+a database in which You have Sui Generis Database Rights, then the database
+in which You have Sui Generis Database Rights (but not its individual contents)
+is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or
+a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace
+Your obligations under this Public License where the Licensed Rights include
+other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+the Licensor offers the Licensed Material as-is and as-available, and makes
+no representations or warranties of any kind concerning the Licensed Material,
+whether express, implied, statutory, or other. This includes, without limitation,
+warranties of title, merchantability, fitness for a particular purpose, non-infringement,
+absence of latent or other defects, accuracy, or the presence or absence of
+errors, whether or not known or discoverable. Where disclaimers of warranties
+are not allowed in full or in part, this disclaimer may not apply to You.
+
+b. To the extent possible, in no event will the Licensor be liable to You
+on any legal theory (including, without limitation, negligence) or otherwise
+for any direct, special, indirect, incidental, consequential, punitive, exemplary,
+or other losses, costs, expenses, or damages arising out of this Public License
+or use of the Licensed Material, even if the Licensor has been advised of
+the possibility of such losses, costs, expenses, or damages. Where a limitation
+of liability is not allowed in full or in part, this limitation may not apply
+to You.
+
+c. The disclaimer of warranties and limitation of liability provided above
+shall be interpreted in a manner that, to the extent possible, most closely
+approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights
+licensed here. However, if You fail to comply with this Public License, then
+Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section
+6(a), it reinstates:
+
+1. automatically as of the date the violation is cured, provided it is cured
+within 30 days of Your discovery of the violation; or
+
+      2. upon express reinstatement by the Licensor.
+
+c. For the avoidance of doubt, this Section 6(b) does not affect any right
+the Licensor may have to seek remedies for Your violations of this Public
+License.
+
+d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+under separate terms or conditions or stop distributing the Licensed Material
+at any time; however, doing so will not terminate this Public License.
+
+   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or
+conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed
+Material not stated herein are separate from and independent of the terms
+and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not
+be interpreted to, reduce, limit, restrict, or impose conditions on any use
+of the Licensed Material that could lawfully be made without permission under
+this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed
+unenforceable, it shall be automatically reformed to the minimum extent necessary
+to make it enforceable. If the provision cannot be reformed, it shall be severed
+from this Public License without affecting the enforceability of the remaining
+terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure
+to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation
+upon, or waiver of, any privileges and immunities that apply to the Licensor
+or You, including from the legal processes of any jurisdiction or authority.
+
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative
+Commons may elect to apply one of its public licenses to material it publishes
+and in those instances will be considered the "Licensor." The text of the
+Creative Commons public licenses is dedicated to the public domain under the
+CC0 Public Domain Dedication. Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as otherwise
+permitted by the Creative Commons policies published at creativecommons.org/policies,
+Creative Commons does not authorize the use of the trademark "Creative Commons"
+or any other trademark or logo of Creative Commons without its prior written
+consent including, without limitation, in connection with any unauthorized
+modifications to any of its public licenses or any other arrangements, understandings,
+or agreements concerning use of licensed material. For the avoidance of doubt,
+this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
new file mode 100644
index 0000000000..204b93da48
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
@@ -0,0 +1,19 @@
+MIT License Copyright (c)  
+
+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 (including the next
+paragraph) 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/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
new file mode 100644
index 0000000000..24a8f90199
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
@@ -0,0 +1,20 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute
+this software, either in source code form or as a compiled binary, for any
+purpose, commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and
+to the detriment of our heirs and successors. We intend this dedication to
+be an overt act of relinquishment in perpetuity of all present and future
+rights to this software under copyright law.
+
+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
+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. For more information,
+please refer to 
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/README.rst b/frozen/Adafruit_CircuitPython_UC8151D/README.rst
new file mode 100644
index 0000000000..08efe2f99b
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/README.rst
@@ -0,0 +1,149 @@
+Introduction
+============
+
+
+.. image:: https://readthedocs.org/projects/adafruit-circuitpython-uc8151d/badge/?version=latest
+    :target: https://docs.circuitpython.org/projects/uc8151d/en/latest/
+    :alt: Documentation Status
+
+
+.. image:: https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_Bundle/main/badges/adafruit_discord.svg
+    :target: https://adafru.it/discord
+    :alt: Discord
+
+
+.. image:: https://github.com/adafruit/Adafruit_CircuitPython_UC8151D/workflows/Build%20CI/badge.svg
+    :target: https://github.com/adafruit/Adafruit_CircuitPython_UC8151D/actions
+    :alt: Build Status
+
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/psf/black
+    :alt: Code Style: Black
+
+CircuitPython `displayio` driver for US8151D-based ePaper displays
+
+
+Dependencies
+=============
+This driver depends on:
+
+* `Adafruit CircuitPython `_
+
+Please ensure all dependencies are available on the CircuitPython filesystem.
+This is easily achieved by downloading
+`the Adafruit library and driver bundle `_
+or individual libraries can be installed using
+`circup `_.
+
+Adafruit 2.9" Flexible 296x128 Monochrome eInk / ePaper Display
+
+`Purchase one from the Adafruit shop `_
+
+
+Installing from PyPI
+=====================
+
+On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
+PyPI `_.
+To install for current user:
+
+.. code-block:: shell
+
+    pip3 install adafruit-circuitpython-uc8151d
+
+To install system-wide (this may be required in some cases):
+
+.. code-block:: shell
+
+    sudo pip3 install adafruit-circuitpython-uc8151d
+
+To install in a virtual environment in your current project:
+
+.. code-block:: shell
+
+    mkdir project-name && cd project-name
+    python3 -m venv .venv
+    source .venv/bin/activate
+    pip3 install adafruit-circuitpython-uc8151d
+
+
+
+Installing to a Connected CircuitPython Device with Circup
+==========================================================
+
+Make sure that you have ``circup`` installed in your Python environment.
+Install it with the following command if necessary:
+
+.. code-block:: shell
+
+    pip3 install circup
+
+With ``circup`` installed and your CircuitPython device connected use the
+following command to install:
+
+.. code-block:: shell
+
+    circup install uc8151d
+
+Or the following command to update an existing version:
+
+.. code-block:: shell
+
+    circup update
+
+Usage Example
+=============
+
+.. code-block:: python
+
+    import time
+    import board
+    import displayio
+    import adafruit_uc8151d
+
+    displayio.release_displays()
+
+    # This pinout works on a Feather M4 and may need to be altered for other boards.
+    spi = board.SPI()  # Uses SCK and MOSI
+    epd_cs = board.D9
+    epd_dc = board.D10
+    epd_reset = board.D5
+    epd_busy = None
+
+    display_bus = displayio.FourWire(
+        spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
+    )
+    time.sleep(1)
+
+    display = adafruit_uc8151d.UC8151D(
+        display_bus, width=296, height=128, rotation=90, busy_pin=epd_busy
+    )
+
+    g = displayio.Group()
+
+    with open("/display-ruler.bmp", "rb") as f:
+        pic = displayio.OnDiskBitmap(f)
+        t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
+        g.append(t)
+
+        display.show(g)
+
+        display.refresh()
+
+        time.sleep(120)
+
+
+Documentation
+=============
+
+API documentation for this library can be found on `Read the Docs `_.
+
+For information on building library documentation, please check out `this guide `_.
+
+Contributing
+============
+
+Contributions are welcome! Please read our `Code of Conduct
+`_
+before contributing to help this project stay welcoming.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license b/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
new file mode 100644
index 0000000000..87eb036957
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py b/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
new file mode 100644
index 0000000000..1055d3d562
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
@@ -0,0 +1,132 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""
+`adafruit_uc8151d`
+================================================================================
+
+CircuitPython `displayio` driver for US8151D-based ePaper displays
+
+
+* Author(s): Melissa LeBlanc-Williams
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+* `Adafruit Flexible 2.9" Black and White `_
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://github.com/adafruit/circuitpython/releases
+
+"""
+
+import displayio
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_UC8151D.git"
+
+_START_SEQUENCE = (
+    # b"\x01\x05\x03\x00\x2b\x2b\x09"  # power setting
+    # b"\x06\x03\x17\x17\x17"  # booster soft start
+    b"\x04\x80\xc8"  # power on and wait 10 ms
+    b"\x00\x01\x1f"  # panel setting. Further filled in below.
+    b"\x50\x01\x97"  # CDI setting
+)
+
+_GRAYSCALE_START_SEQUENCE = (
+    b"\x04\x80\xc8"  # Power on
+    b"\x00\x01\xbf"  # Panel setting
+    b"\x50\x01\x97"  # CDI setting
+    # Common voltage
+    b"\x20\x2a"
+    b"\x00\x0A\x00\x00\x00\x01"
+    b"\x60\x14\x14\x00\x00\x01"
+    b"\x00\x14\x00\x00\x00\x01"
+    b"\x00\x13\x0A\x01\x00\x01"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    # White to White
+    b"\x21\x2a"
+    b"\x40\x0A\x00\x00\x00\x01"
+    b"\x90\x14\x14\x00\x00\x01"
+    b"\x10\x14\x0A\x00\x00\x01"
+    b"\xA0\x13\x01\x00\x00\x01"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    # Black to White
+    b"\x22\x2a"
+    b"\x40\x0A\x00\x00\x00\x01"
+    b"\x90\x14\x14\x00\x00\x01"
+    b"\x00\x14\x0A\x00\x00\x01"
+    b"\x99\x0B\x04\x04\x01\x01"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    # White to Black
+    b"\x23\x2a"
+    b"\x40\x0A\x00\x00\x00\x01"
+    b"\x90\x14\x14\x00\x00\x01"
+    b"\x00\x14\x0A\x00\x00\x01"
+    b"\x99\x0C\x01\x03\x04\x01"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    # Black to Black
+    b"\x24\x2a"
+    b"\x80\x0A\x00\x00\x00\x01"
+    b"\x90\x14\x14\x00\x00\x01"
+    b"\x20\x14\x0A\x00\x00\x01"
+    b"\x50\x13\x01\x00\x00\x01"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00"
+)
+
+
+_STOP_SEQUENCE = b"\x50\x01\xf7" b"\x07\x01\xA5"  # CDI setting  # Deep Sleep
+# pylint: disable=too-few-public-methods
+class UC8151D(displayio.EPaperDisplay):
+    r"""UC8151D driver
+
+    :param bus: The data bus the display is on
+    :param \**kwargs:
+        See below
+
+    :Keyword Arguments:
+        * *width* (``int``) --
+          Display width
+        * *height* (``int``) --
+          Display height
+        * *rotation* (``int``) --
+          Display rotation
+    """
+
+    def __init__(self, bus: displayio.FourWire, **kwargs) -> None:
+        if kwargs.get("grayscale", False):
+            start_sequence = bytearray(_GRAYSCALE_START_SEQUENCE)
+        else:
+            start_sequence = bytearray(_START_SEQUENCE)
+        width = kwargs["width"]
+        height = kwargs["height"]
+        if "rotation" in kwargs and kwargs["rotation"] % 180 != 0:
+            width, height = height, width
+
+        super().__init__(
+            bus,
+            start_sequence,
+            _STOP_SEQUENCE,
+            **kwargs,
+            ram_width=128,
+            ram_height=296,
+            busy_state=False,
+            write_black_ram_command=0x13,
+            write_color_ram_command=0x10,
+            refresh_display_command=0x12,
+        )
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico b/frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5aca98376a1f7e593ebd9cf41a808512c2135635
GIT binary patch
literal 4414
zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en
zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK
zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8
z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3
z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG
zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn
zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^>#
z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt
z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx
zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D
z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$
zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ
z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g
z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4
zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%%
z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH
zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI
zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2
z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y
zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV
zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv)
zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^
zXUM@xoV6yBFKfzvY20V&Lr0yC
+
+.. toctree::
+    :caption: Related Products
+
+Adafruit 2.9" Flexible 296x128 Monochrome eInk / ePaper Display 
+
+.. toctree::
+    :caption: Other Links
+
+    Download from GitHub 
+    Download Library Bundle 
+    CircuitPython Reference Documentation 
+    CircuitPython Support Forum 
+    Discord Chat 
+    Adafruit Learning System 
+    Adafruit Blog 
+    Adafruit Store 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license b/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
new file mode 100644
index 0000000000..52de478909
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+
+SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
new file mode 100644
index 0000000000..88e67331eb
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+sphinx>=4.0.0
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp b/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..726b5e026fd30b7e5baf5c23323d159b0eb5f65d
GIT binary patch
literal 360122
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
T`pMSbh(J1r2r{u6#p?e9C4JK7

literal 0
HcmV?d00001

diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license b/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
new file mode 100644
index 0000000000..a784acfa32
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
+# SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
new file mode 100644
index 0000000000..71b8316a87
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: 2022 Martin Refseth, written for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+"""Simple test script for 1.54" 152x152 grayscale display.
+
+Supported products:
+  * 1.54" Grayscale Display (GDEW0154T8D)
+  """
+# pylint: disable=no-member
+
+import time
+import board
+import displayio
+import busio
+import adafruit_uc8151d
+
+displayio.release_displays()
+
+# Pinout intended for use with a Raspberry Pi Pico
+clk = board.GP10
+si = board.GP11
+dc = board.GP8
+cs = board.GP9
+rst = board.GP12
+busy = board.GP13
+
+display_bus = displayio.FourWire(
+    busio.SPI(clk, si), command=dc, chip_select=cs, reset=rst, baudrate=1000000
+)
+
+time.sleep(1)
+
+display = adafruit_uc8151d.UC8151D(
+    display_bus, width=152, height=152, busy_pin=busy, rotation=180, grayscale=True
+)
+
+
+bitmap = displayio.Bitmap(152, 152, 4)
+
+# Draw Black
+for x in range(0, 152):
+    for y in range(0, 38):
+        bitmap[x, y] = 0
+# Draw Dark Gray
+for x in range(0, 152):
+    for y in range(38, 76):
+        bitmap[x, y] = 1
+# Draw Light Gray
+for x in range(0, 152):
+    for y in range(76, 114):
+        bitmap[x, y] = 2
+# Draw White
+for x in range(0, 152):
+    for y in range(114, 152):
+        bitmap[x, y] = 3
+
+palette = displayio.Palette(4)
+palette[0] = 0x000000  # Black
+palette[1] = 0x404040  # Dark Gray
+palette[2] = 0x808080  # Light Gray
+palette[3] = 0xFFFFFF  # White
+
+g = displayio.Group()
+t = displayio.TileGrid(bitmap, pixel_shader=palette)
+g.append(t)
+display.show(g)
+display.refresh()
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
new file mode 100644
index 0000000000..a6a068fc2d
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
@@ -0,0 +1,48 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+"""Simple test script for 2.9" 296x128 monochrome display.
+
+Supported products:
+  * Adafruit Flexible 2.9" Monochrome
+    * https://www.adafruit.com/product/4262
+  """
+# pylint: disable=no-member
+
+import time
+import board
+import displayio
+import adafruit_uc8151d
+
+displayio.release_displays()
+
+# This pinout works on a Feather M4 and may need to be altered for other boards.
+spi = board.SPI()  # Uses SCK and MOSI
+epd_cs = board.D9
+epd_dc = board.D10
+epd_reset = board.D5
+epd_busy = None
+
+display_bus = displayio.FourWire(
+    spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
+)
+time.sleep(1)
+
+display = adafruit_uc8151d.UC8151D(
+    display_bus, width=296, height=128, rotation=90, busy_pin=epd_busy
+)
+
+g = displayio.Group()
+
+with open("/display-ruler.bmp", "rb") as f:
+    pic = displayio.OnDiskBitmap(f)
+    t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
+    g.append(t)
+
+    display.show(g)
+
+    display.refresh()
+
+    time.sleep(120)
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
new file mode 100644
index 0000000000..d4e27c4d74
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml b/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
new file mode 100644
index 0000000000..4c3129c59f
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
@@ -0,0 +1,50 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+[build-system]
+requires = [
+    "setuptools",
+    "wheel",
+    "setuptools-scm",
+]
+
+[project]
+name = "adafruit-circuitpython-uc8151d"
+description = "CircuitPython `displayio` driver for US8151D-based ePaper displays"
+version = "0.0.0+auto.0"
+readme = "README.rst"
+authors = [
+    {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}
+]
+urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_UC8151D.git"}
+keywords = [
+    "adafruit",
+    "blinka",
+    "circuitpython",
+    "micropython",
+    "uc8151d",
+    "uc8151",
+    "us8151d",
+    "displayio",
+    "epd",
+    "epaper",
+    "flexible",
+]
+license = {text = "MIT"}
+classifiers = [
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Embedded Systems",
+    "Topic :: System :: Hardware",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+]
+dynamic = ["dependencies", "optional-dependencies"]
+
+[tool.setuptools]
+py-modules = ["adafruit_uc8151d"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt
new file mode 100644
index 0000000000..274b851a2d
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+Adafruit-Blinka
+adafruit-blinka-displayio
diff --git a/ports/espressif/boards/maker_badge/board.c b/ports/espressif/boards/maker_badge/board.c
new file mode 100644
index 0000000000..7f2b45c2c5
--- /dev/null
+++ b/ports/espressif/boards/maker_badge/board.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "supervisor/shared/board.h"
+
+#include "components/log/include/esp_log.h"
+
+#define DELAY 0x80
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+
+}
+
+//busio_spi_obj_t *spi = common_hal_board_create_spi();
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.h b/ports/espressif/boards/maker_badge/mpconfigboard.h
new file mode 100644
index 0000000000..3c4a993364
--- /dev/null
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.h
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Maker badge by Czech maker"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+#define MICROPY_HW_NEOPIXEL_COUNT (4)
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS 500
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_GPIO18     1
+#define IGNORE_PIN_GPIO19     1
+
+#define DOUBLE_TAP_PIN (&pin_GPIO38)
diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.mk b/ports/espressif/boards/maker_badge/mpconfigboard.mk
new file mode 100644
index 0000000000..6faba2aed3
--- /dev/null
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.mk
@@ -0,0 +1,29 @@
+USB_VID = 0x239A
+USB_PID = 0x2030
+USB_PRODUCT = "Maker badge"
+USB_MANUFACTURER = "Czech maker"
+
+IDF_TARGET = esp32s2
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP32_CAMERA = 0
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wroom
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_UC8151D
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SSD1680
diff --git a/ports/espressif/boards/maker_badge/pins.c b/ports/espressif/boards/maker_badge/pins.c
new file mode 100644
index 0000000000..f573b20be8
--- /dev/null
+++ b/ports/espressif/boards/maker_badge/pins.c
@@ -0,0 +1,87 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_CAP5), MP_ROM_PTR(&pin_GPIO1) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_CAP4), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_CAP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_CAP2), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_CAP1), MP_ROM_PTR(&pin_GPIO5) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER_INVERTED), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) },
+    
+    { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From d774f3d34f0c18028516f253c3c401c0c933e380 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Thu, 27 Oct 2022 15:02:44 +0200
Subject: [PATCH 1275/2403] Update board.c

Fix for CLI
---
 ports/espressif/boards/maker_badge/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/maker_badge/board.c b/ports/espressif/boards/maker_badge/board.c
index 7f2b45c2c5..4b244087f6 100644
--- a/ports/espressif/boards/maker_badge/board.c
+++ b/ports/espressif/boards/maker_badge/board.c
@@ -49,7 +49,7 @@ void board_init(void) {
 
 }
 
-//busio_spi_obj_t *spi = common_hal_board_create_spi();
+//  busio_spi_obj_t *spi = common_hal_board_create_spi();
 
 bool board_requests_safe_mode(void) {
     return false;

From 8a2e9de5a440b337df8b4c83fead7ce0e83651e9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 27 Oct 2022 12:27:12 -0500
Subject: [PATCH 1276/2403] Revert definition of _asyncio 'ticks()' to
 8.0.0-beta2

.. and explain why, because it wasn't clear to past-me.

Actually tested on a pico w :)

Closes: #7136
---
 extmod/moduasyncio.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index c7d1753e2f..8af32f21d9 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -73,10 +73,18 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
 #define _TICKS_PERIOD (1lu << 29)
 #define _TICKS_MAX (_TICKS_PERIOD - 1)
 #define _TICKS_HALFPERIOD (_TICKS_PERIOD >> 1)
-
+#if !CIRCUITPY || (defined(__unix__) || defined(__APPLE__))
 STATIC mp_obj_t ticks(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & _TICKS_MAX);
 }
+#else
+// We don't share the implementation above because our supervisor_ticks_ms
+// starts the epoch about 65 seconds before the first overflow (see
+// shared-bindings/supervisor/__init__.c). We assume/require that
+// supervisor.ticks_ms is picked as the ticks implementation under
+// CircuitPython for the Python-coded bits of asyncio.
+#define ticks() MP_OBJ_NEW_SMALL_INT(supervisor_ticks_ms())
+#endif
 
 STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);

From 26688fa82647af075df46446acacd4ed566b77dc Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 27 Oct 2022 14:45:29 -0400
Subject: [PATCH 1277/2403] correct SPIRAM settings for ESP32-S3-BOX

---
 .../espressif_esp32s3_box/mpconfigboard.mk    |  2 ++
 .../boards/espressif_esp32s3_box/sdkconfig    | 36 ++++---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
index c635cdcb56..7ffb076348 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -8,3 +8,5 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig
index 7fcf8ef297..ead0088da5 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig
+++ b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig
@@ -1,35 +1,11 @@
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_MODE_QUAD is not set
-CONFIG_SPIRAM_MODE_OCT=y
-CONFIG_SPIRAM_TYPE_AUTO=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=-1
-# end of SPI RAM config
-
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-#
-# PSRAM Clock and CS IO for ESP32S3
-#
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM Clock and CS IO for ESP32S3
-
-# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
-# CONFIG_SPIRAM_RODATA is not set
-CONFIG_SPIRAM_SPEED_80M=y
-# CONFIG_SPIRAM_SPEED_40M is not set
 CONFIG_SPIRAM=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+
 CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-# CONFIG_SPIRAM_USE_MEMMAP is not set
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-CONFIG_SPIRAM_USE_MALLOC=y
-CONFIG_SPIRAM_MEMTEST=y
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+CONFIG_SPIRAM_USE_MEMMAP=y
+
 #
 # LWIP
 #

From b0457ff3e062581966003818bef25a6fd8f342d2 Mon Sep 17 00:00:00 2001
From: Senuros 
Date: Thu, 27 Oct 2022 20:52:08 +0200
Subject: [PATCH 1278/2403] Adding more translation entries

Those might be the last translations that were still missing.
---
 locale/de_DE.po | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 999f3e3bbb..c5bd941171 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -128,7 +128,7 @@ msgstr "%q Initialisierung ist gescheitert"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q ist %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
@@ -173,7 +173,7 @@ msgstr "%q muss >= %d sein"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -1030,16 +1030,16 @@ msgstr "Filter zu komplex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Die Firmware ist doppelt vorhanden"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Die Firmware ist ungültig"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Die Firmware ist zu groß"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1657,7 +1657,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Nur ein %q kann im Deep-Sleep gesetzt werden."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -2224,7 +2224,7 @@ msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "Schreiben nicht möglich"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2987,7 +2987,8 @@ msgstr "Fehler = 0x%08lX"
 msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
-msgstr ""
+msgstr "esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu können. "
+"Sieh in der Dokumentation für eine Anleitung nach."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -4391,7 +4392,7 @@ msgstr "wifi ist nicht aktiviert"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor nicht verfügbar"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
@@ -4510,7 +4511,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
 #~ msgstr ""
-#~ "sample_source buffer muss ein Bytearray oder ein Array vom Typ 'h', 'H', "
+#~ "sample_source buffer muss ein Byte-Array oder ein Array vom Typ 'h', 'H', "
 #~ "'b' oder 'B' sein"
 
 #~ msgid "Expected an alarm"

From 9307b62ad54bcd27c493e8d63dc91059e6612b79 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 27 Oct 2022 22:42:04 -0400
Subject: [PATCH 1279/2403] wip

---
 main.c                                        | 42 +++++++++----------
 ports/atmel-samd/common-hal/alarm/__init__.c  | 17 +++++---
 .../common-hal/alarm/pin/PinAlarm.c           |  3 +-
 .../common-hal/alarm/pin/PinAlarm.h           |  2 +-
 .../common-hal/alarm/time/TimeAlarm.c         |  9 ++--
 .../common-hal/alarm/time/TimeAlarm.h         |  2 +-
 ports/atmel-samd/supervisor/port.c            |  4 ++
 ports/espressif/common-hal/alarm/__init__.c   | 19 ++++++---
 .../common-hal/alarm/coproc/CoprocAlarm.c     |  6 +--
 .../common-hal/alarm/coproc/CoprocAlarm.h     |  2 +-
 .../espressif/common-hal/alarm/pin/PinAlarm.c |  3 +-
 .../espressif/common-hal/alarm/pin/PinAlarm.h |  2 +-
 .../common-hal/alarm/time/TimeAlarm.c         |  9 ++--
 .../common-hal/alarm/time/TimeAlarm.h         |  2 +-
 .../common-hal/alarm/touch/TouchAlarm.c       |  3 +-
 .../common-hal/alarm/touch/TouchAlarm.h       |  2 +-
 ports/espressif/supervisor/port.c             |  8 ++++
 ports/nrf/common-hal/alarm/__init__.c         | 16 +++++--
 ports/nrf/common-hal/alarm/pin/PinAlarm.c     |  3 +-
 ports/nrf/common-hal/alarm/pin/PinAlarm.h     |  2 +-
 ports/nrf/common-hal/alarm/time/TimeAlarm.c   |  9 ++--
 ports/nrf/common-hal/alarm/time/TimeAlarm.h   |  2 +-
 ports/nrf/common-hal/alarm/touch/TouchAlarm.c |  2 +-
 ports/nrf/common-hal/alarm/touch/TouchAlarm.h |  2 +-
 ports/nrf/supervisor/port.c                   |  8 ++++
 ports/raspberrypi/common-hal/alarm/__init__.c | 13 ++++--
 .../common-hal/alarm/pin/PinAlarm.c           |  4 +-
 .../common-hal/alarm/pin/PinAlarm.h           |  2 +-
 .../common-hal/alarm/time/TimeAlarm.c         |  9 ++--
 .../common-hal/alarm/time/TimeAlarm.h         |  2 +-
 ports/raspberrypi/supervisor/port.c           |  8 ++++
 ports/stm/common-hal/alarm/__init__.c         | 13 ++++--
 ports/stm/common-hal/alarm/pin/PinAlarm.c     |  3 +-
 ports/stm/common-hal/alarm/pin/PinAlarm.h     |  2 +-
 ports/stm/common-hal/alarm/time/TimeAlarm.c   |  9 ++--
 ports/stm/common-hal/alarm/time/TimeAlarm.h   |  2 +-
 ports/stm/supervisor/port.c                   | 12 ++++--
 shared-bindings/alarm/__init__.h              |  2 +-
 38 files changed, 159 insertions(+), 101 deletions(-)

diff --git a/main.c b/main.c
index 06ca1ba93b..fea20d419b 100644
--- a/main.c
+++ b/main.c
@@ -132,7 +132,7 @@ static void reset_devices(void) {
     #endif
 }
 
-STATIC void start_mp(supervisor_allocation *heap, bool first_run) {
+STATIC void start_mp(supervisor_allocation *heap) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -176,14 +176,6 @@ STATIC void start_mp(supervisor_allocation *heap, bool first_run) {
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
 
     mp_obj_list_init((mp_obj_list_t *)mp_sys_argv, 0);
-
-    #if CIRCUITPY_ALARM
-    // Record which alarm woke us up, if any. An object may be created so the heap must be functional.
-    // There is no alarm if this is not the first time code.py or the REPL has been run.
-    shared_alarm_save_wake_alarm(first_run ? common_hal_alarm_create_wake_alarm() : mp_const_none);
-    // Reset alarm module only after we retrieved the wakeup alarm.
-    alarm_reset();
-    #endif
 }
 
 STATIC void stop_mp(void) {
@@ -373,7 +365,7 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) {
     }
 }
 
-STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_reset) {
+STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
     bool serial_connected_at_start = serial_connected();
     bool printed_safe_mode_message = false;
     #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
@@ -409,8 +401,8 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
         supervisor_allocation *heap = allocate_remaining_memory();
 
-        // Prepare the VM state. Includes an alarm check/reset for sleep.
-        start_mp(heap, first_run);
+        // Prepare the VM state.
+        start_mp(heap);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -853,12 +845,12 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     #endif
 }
 
-STATIC int run_repl(bool first_run) {
+STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap, first_run);
+    start_mp(heap);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -968,6 +960,12 @@ int __attribute__((used)) main(void) {
         safe_mode = NO_CIRCUITPY;
     }
 
+    #if CIRCUITPY_ALARM
+    // Record which alarm woke us up, if any.
+    // common_hal_alarm_record_wake_alarm() should return a static, non-heap object
+    shared_alarm_save_wake_alarm(common_hal_alarm_record_wake_alarm());
+    #endif
+
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     // Port-independent devices, like CIRCUITPY_BLEIO_HCI.
@@ -1001,20 +999,18 @@ int __attribute__((used)) main(void) {
     // Boot script is finished, so now go into REPL or run code.py.
     int exit_code = PYEXEC_FORCED_EXIT;
     bool skip_repl = true;
-    bool first_run = true;
-    bool simulate_reset;
+    bool simulate_reset = true;
     for (;;) {
-        simulate_reset = false;
         if (!skip_repl) {
-            exit_code = run_repl(first_run);
+            exit_code = run_repl();
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
-            if (!first_run) {
+            if (!simulate_reset) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
-                skip_repl = run_code_py(safe_mode, first_run, &simulate_reset);
+                skip_repl = run_code_py(safe_mode, &simulate_reset);
             } else {
                 skip_repl = false;
             }
@@ -1025,7 +1021,11 @@ int __attribute__((used)) main(void) {
         // Either the REPL or code.py has run and finished.
         // If code.py did a fake deep sleep, pretend that we are running code.py for
         // the first time after a hard reset. This will preserve any alarm information.
-        first_run = simulate_reset;
+        if (!simulate_reset) {
+            #if CIRCUITPY_ALARM
+            shared_alarm_save_wake_alarm(mp_const_none);
+            #endif
+        }
     }
     mp_deinit();
     return 0;
diff --git a/ports/atmel-samd/common-hal/alarm/__init__.c b/ports/atmel-samd/common-hal/alarm/__init__.c
index 8f66b3a90c..2edd3ece12 100644
--- a/ports/atmel-samd/common-hal/alarm/__init__.c
+++ b/ports/atmel-samd/common-hal/alarm/__init__.c
@@ -48,6 +48,13 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
+// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// This object lives across VM instantiations, so none of these objects can contain references to the heap.
+static union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} wake_alarm;
+
 void alarm_reset(void) {
     // Reset the alarm flag
     alarm_pin_pinalarm_reset();
@@ -57,7 +64,7 @@ void alarm_reset(void) {
 void alarm_get_wakeup_cause(void) {
     // Called from rtc_init, just before SWRST of RTC.  It is called
     // at an early stage of main(), to save TAMPID from SWRST.  Later,
-    // common_hal_alarm_create_wake_alarm is called to make a wakeup
+    // common_hal_alarm_record_wake_alarm is called to make a wakeup
     // alarm from the deep sleep.
 
     TAMPID = RTC->MODE0.TAMPID.reg;
@@ -67,7 +74,7 @@ bool common_hal_alarm_woken_from_sleep(void) {
     return alarm_pin_pinalarm_woke_this_cycle() || alarm_time_timealarm_woke_this_cycle();
 }
 
-mp_obj_t common_hal_alarm_create_wake_alarm(void) {
+mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     // Called from main.c on the first start up, just before alarm_reset.
     // Return a copy of wakeup alarm from deep sleep / fake deep sleep.
     // In case of fake sleep, status should be left in TimeAlarm/PinAlarm.
@@ -76,13 +83,13 @@ mp_obj_t common_hal_alarm_create_wake_alarm(void) {
     if (alarm_pin_pinalarm_woke_this_cycle()) {
         TAMPID = RTC->MODE0.TAMPID.reg;
         RTC->MODE0.TAMPID.reg = TAMPID;         // clear register
-        return alarm_pin_pinalarm_create_wakeup_alarm(TAMPID);
+        return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm, TAMPID);
     }
     if (alarm_time_timealarm_woke_this_cycle() || (true_deep && TAMPID == 0)) {
-        return alarm_time_timealarm_create_wakeup_alarm();
+        return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
     }
     if (true_deep) {
-        return alarm_pin_pinalarm_create_wakeup_alarm(TAMPID);
+        return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm, TAMPID);
     }
     return mp_const_none;
 }
diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
index 9289a66a87..a2c01f0a82 100644
--- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
@@ -128,12 +128,11 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(uint32_t TAMPID) {
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm, uint32_t TAMPID) {
     // Create tamper alarm that caused wakeup from deep sleep
 
     for (samd_tamper_pin_t *t = TAMPER_PINS; t->n >= 0; t++) {
         if (TAMPID & (1 << t->n)) {
-            alarm_pin_pinalarm_obj_t *alarm = m_new_obj(alarm_pin_pinalarm_obj_t);
             alarm->base.type = &alarm_pin_pinalarm_type;
             alarm->pin = t->pin;
             return alarm;
diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
index 57dc7d6c65..6f767bbffc 100644
--- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
@@ -39,7 +39,7 @@ typedef struct {
 } 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(uint32_t TAMPID);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm, uint32_t TAMPID);
 
 void pin_alarm_callback(uint8_t num);
 void alarm_pin_pinalarm_reset(void);
diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
index 3f116f07e3..9c7c89f2c7 100644
--- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
@@ -58,13 +58,12 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     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;
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+    alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     //       Or don't, most of the other ports don't have this either.
-    timer->monotonic_time = 0.0f;
-    return timer;
+    alarm->monotonic_time = 0.0f;
+    return alarm;
 }
 
 void time_alarm_callback(void) {
diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
index a6102dee6b..b8af80869c 100644
--- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
@@ -35,7 +35,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
 void time_alarm_callback(void);
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 424acece78..0fafbdb13c 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -385,6 +385,10 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    #if CIRCUITPY_ALARM
+    alarm_reset();
+    #endif
+
     #if CIRCUITPY_BUSIO
     reset_sercoms();
     #endif
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index 4183b7e61b..7faca8fc0c 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -58,6 +58,15 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
+// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// This object lives across VM instantiations, so none of these objects can contain references to the heap.
+static union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+    alarm_touch_touchalarm_obj_t touch_alarm;
+    alarm_coproc_coprocalarm_obj_t coproc_alarm;
+} wake_alarm;
+
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
     alarm_pin_pinalarm_reset();
@@ -90,27 +99,27 @@ bool common_hal_alarm_woken_from_sleep(void) {
     return _get_wakeup_cause() != ESP_SLEEP_WAKEUP_UNDEFINED;
 }
 
-mp_obj_t common_hal_alarm_create_wake_alarm(void) {
+mp_obj_t common_hal_alarm_record_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
     esp_sleep_wakeup_cause_t cause = _get_wakeup_cause();
     switch (cause) {
         case ESP_SLEEP_WAKEUP_TIMER: {
-            return alarm_time_timealarm_create_wakeup_alarm();
+            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
         }
 
         case ESP_SLEEP_WAKEUP_GPIO:
         case ESP_SLEEP_WAKEUP_EXT0:
         case ESP_SLEEP_WAKEUP_EXT1: {
-            return alarm_pin_pinalarm_create_wakeup_alarm();
+            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
         }
 
         case ESP_SLEEP_WAKEUP_TOUCHPAD: {
-            return alarm_touch_touchalarm_create_wakeup_alarm();
+            return alarm_touch_touchalarm_record_wakeup_alarm(&wake_alarm.touch_alarm);
         }
 
         case ESP_SLEEP_WAKEUP_ULP: {
-            return alarm_coproc_coprocalarm_create_wakeup_alarm();
+            return alarm_coproc_coprocalarm_record_wakeup_alarm(&wake_alarm.coproc_alarm);
         }
 
         case ESP_SLEEP_WAKEUP_UNDEFINED:
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
index aa49e13a2a..8c45cc208c 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
@@ -47,9 +47,7 @@ mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, co
     return mp_const_none;
 }
 
-mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void) {
-    // Create CoprocAlarm object.
-    alarm_coproc_coprocalarm_obj_t *alarm = m_new_obj(alarm_coproc_coprocalarm_obj_t);
+mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(alarm_coproc_coprocalarm_obj_t *alarm) {
     alarm->base.type = &alarm_coproc_coprocalarm_type;
     return alarm;
 }
@@ -111,7 +109,7 @@ mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, co
     return mp_const_none;
 }
 
-mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void) {
+mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(void) {
     return mp_const_none;
 }
 
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
index d70e90265d..2078d8325f 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
@@ -38,7 +38,7 @@ typedef struct {
 } alarm_coproc_coprocalarm_obj_t;
 
 mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_coproc_coprocalarm_create_wakeup_alarm(void);
+mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(void);
 
 void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void);
 void alarm_coproc_coprocalarm_reset(void);
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index bc89cc9ee7..3868e2f4a8 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -111,7 +111,7 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(void) {
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
     esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
 
     // Pin status will persist into a fake deep sleep
@@ -135,7 +135,6 @@ 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;
     alarm->pin = NULL;
     // Map the pin number back to a pin object.
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.h b/ports/espressif/common-hal/alarm/pin/PinAlarm.h
index cbc20b996c..d1d5d1e4f0 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.h
@@ -35,7 +35,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(void);
 
 void alarm_pin_pinalarm_prepare_for_deep_sleep(void);
 void alarm_pin_pinalarm_reset(void);
diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.c b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
index 973da33c67..f0daabc897 100644
--- a/ports/espressif/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
@@ -51,12 +51,11 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     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;
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+    alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
-    timer->monotonic_time = 0.0f;
-    return timer;
+    alarm->monotonic_time = 0.0f;
+    return alarm;
 }
 
 esp_timer_handle_t pretend_sleep_timer;
diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.h b/ports/espressif/common-hal/alarm/time/TimeAlarm.h
index 36986e06b2..edb4d0236f 100644
--- a/ports/espressif/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.h
@@ -33,7 +33,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
 
 void alarm_time_timealarm_reset(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
index ad55e1e056..35da811ad9 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
@@ -52,9 +52,8 @@ mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, cons
     return mp_const_none;
 }
 
-mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void) {
+mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm) {
     // Create TouchAlarm object.
-    alarm_touch_touchalarm_obj_t *alarm = m_new_obj(alarm_touch_touchalarm_obj_t);
     alarm->base.type = &alarm_touch_touchalarm_type;
     alarm->pin = NULL;
 
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.h b/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
index df2521c12a..c5cb8da3e9 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
@@ -36,7 +36,7 @@ typedef struct {
 } alarm_touch_touchalarm_obj_t;
 
 mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void);
+mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm);
 
 void alarm_touch_touchalarm_prepare_for_deep_sleep(void);
 void alarm_touch_touchalarm_reset(void);
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 3106f4b991..54e2026c7d 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -60,6 +60,10 @@
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
 
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+
 #if CIRCUITPY_COUNTIO || CIRCUITPY_ROTARYIO || CIRCUITPY_FREQUENCYIO
 #include "peripherals/pcnt.h"
 #endif
@@ -338,6 +342,10 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    #if CIRCUITPY_ALARM
+    alarm_reset();
+    #endif
+
     // TODO deinit for esp32-camera
     #if CIRCUITPY_ESP32_CAMERA
     esp_camera_deinit();
diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c
index 75f616c805..8501092c9d 100644
--- a/ports/nrf/common-hal/alarm/__init__.c
+++ b/ports/nrf/common-hal/alarm/__init__.c
@@ -56,6 +56,14 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
+// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// This object lives across VM instantiations, so none of these objects can contain references to the heap.
+static union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+    alarm_touch_touchalarm_obj_t touch_alarm;
+} wake_alarm;
+
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
     alarm_pin_pinalarm_reset();
@@ -115,19 +123,19 @@ bool common_hal_alarm_woken_from_sleep(void) {
            || cause == NRF_SLEEP_WAKEUP_TOUCHPAD;
 }
 
-mp_obj_t common_hal_alarm_create_wake_alarm(void) {
+mp_obj_t common_hal_alarm_record_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
     nrf_sleep_source_t cause = _get_wakeup_cause();
     switch (cause) {
         case NRF_SLEEP_WAKEUP_TIMER: {
-            return alarm_time_timealarm_create_wakeup_alarm();
+            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
         }
         case NRF_SLEEP_WAKEUP_TOUCHPAD: {
-            return alarm_touch_touchalarm_create_wakeup_alarm();
+            return alarm_touch_touchalarm_record_wakeup_alarm(&wake_alarm.touch_alarm);
         }
         case NRF_SLEEP_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_create_wakeup_alarm();
+            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
         }
         default:
             break;
diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.c b/ports/nrf/common-hal/alarm/pin/PinAlarm.c
index 9d0f8f4b88..b48f0b46a7 100644
--- a/ports/nrf/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/nrf/common-hal/alarm/pin/PinAlarm.c
@@ -101,8 +101,7 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
     alarm->base.type = &alarm_pin_pinalarm_type;
     alarm->pin = NULL;
     // Map the pin number back to a pin object.
diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.h b/ports/nrf/common-hal/alarm/pin/PinAlarm.h
index 87b7b9833c..3a16a50d8a 100644
--- a/ports/nrf/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/nrf/common-hal/alarm/pin/PinAlarm.h
@@ -35,7 +35,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.c b/ports/nrf/common-hal/alarm/time/TimeAlarm.c
index 03b91068f9..af1ce694ee 100644
--- a/ports/nrf/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/nrf/common-hal/alarm/time/TimeAlarm.c
@@ -49,12 +49,11 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     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;
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+    alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
-    timer->monotonic_time = 0.0f;
-    return timer;
+    alarm->monotonic_time = 0.0f;
+    return alarm;
 }
 
 bool alarm_time_timealarm_woke_this_cycle(void) {
diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.h b/ports/nrf/common-hal/alarm/time/TimeAlarm.h
index 734feb1c87..2af5121e10 100644
--- a/ports/nrf/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/nrf/common-hal/alarm/time/TimeAlarm.h
@@ -37,7 +37,7 @@ extern void port_disable_interrupt_after_ticks_ch(uint32_t channel);
 extern void port_interrupt_after_ticks_ch(uint32_t channel, uint32_t ticks);
 
 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);
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
 
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c b/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
index f8daf50f54..9bd2fefcce 100644
--- a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
@@ -39,7 +39,7 @@ mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, cons
     return mp_const_none;
 }
 
-mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void) {
+mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm) {
     return mp_const_none;
 }
 
diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h b/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
index 58ad8c20fe..d895414cd3 100644
--- a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
@@ -37,7 +37,7 @@ typedef struct {
 
 // Find the alarm object that caused us to wake up or create an equivalent one.
 mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void);
+mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(void);
 // Check for the wake up alarm from pretend deep sleep.
 void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
 void alarm_touch_touchalarm_prepare_for_deep_sleep(void);
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 0ed1ecd547..477829c2d2 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -64,6 +64,10 @@
 
 #include "lib/tinyusb/src/device/usbd.h"
 
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+
 #ifdef CIRCUITPY_AUDIOBUSIO
 #include "common-hal/audiobusio/I2SOut.h"
 #endif
@@ -212,6 +216,10 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    #if CIRCUITPY_ALARM
+    alarm_reset();
+    #endif
+
     #if CIRCUITPY_BUSIO
     i2c_reset();
     spi_reset();
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
index 9cfa390116..c184ab95d9 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -96,6 +96,13 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
+// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// This object lives across VM instantiations, so none of these objects can contain references to the heap.
+static union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} wake_alarm;
+
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
     alarm_pin_pinalarm_reset();
@@ -131,17 +138,17 @@ 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) {
+mp_obj_t common_hal_alarm_record_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();
+            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
         }
 
         case RP_SLEEP_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_create_wakeup_alarm();
+            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
         }
 
         case RP_SLEEP_WAKEUP_UNDEF:
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
index 28ea60d682..388cba3d8a 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -94,10 +94,10 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
     alarm->base.type = &alarm_pin_pinalarm_type;
     // TODO: how to obtain the correct pin from memory?
+    alarm->pin = NULL;
     return alarm;
 }
 
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
index d31ac6c878..1e576b9382 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
@@ -36,7 +36,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_light_reset(void);
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
index 16ac8fc31e..81eb78bcb1 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -58,12 +58,11 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     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;
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+    alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
-    timer->monotonic_time = 0.0f;
-    return timer;
+    alarm->monotonic_time = 0.0f;
+    return alarm;
 }
 
 bool alarm_time_timealarm_woke_this_cycle(void) {
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
index d5248551ae..4d5569a569 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
@@ -33,7 +33,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
 
 void alarm_time_timealarm_reset(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 781d2b11d2..d1eff62d56 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -41,6 +41,10 @@
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+
 #if CIRCUITPY_SSL
 #include "common-hal/ssl/__init__.h"
 #endif
@@ -154,6 +158,10 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    #if CIRCUITPY_ALARM
+    alarm_reset();
+    #endif
+
     #if CIRCUITPY_BUSIO
     reset_i2c();
     reset_spi();
diff --git a/ports/stm/common-hal/alarm/__init__.c b/ports/stm/common-hal/alarm/__init__.c
index 26099b0503..4763403842 100644
--- a/ports/stm/common-hal/alarm/__init__.c
+++ b/ports/stm/common-hal/alarm/__init__.c
@@ -47,6 +47,13 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
+// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// This object lives across VM instantiations, so none of these objects can contain references to the heap.
+static union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} wake_alarm;
+
 STATIC stm_sleep_source_t true_deep_wake_reason;
 
 void alarm_reset(void) {
@@ -81,16 +88,16 @@ bool common_hal_alarm_woken_from_sleep(void) {
     return alarm_get_wakeup_cause() != STM_WAKEUP_UNDEF;
 }
 
-mp_obj_t common_hal_alarm_create_wake_alarm(void) {
+mp_obj_t common_hal_alarm_record_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
     stm_sleep_source_t cause = alarm_get_wakeup_cause();
     switch (cause) {
         case STM_WAKEUP_RTC: {
-            return alarm_time_timealarm_create_wakeup_alarm();
+            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
         }
         case STM_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_create_wakeup_alarm();
+            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
         }
         case STM_WAKEUP_UNDEF:
         default:
diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.c b/ports/stm/common-hal/alarm/pin/PinAlarm.c
index 0e5fa9e94d..50bd06b59a 100644
--- a/ports/stm/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/stm/common-hal/alarm/pin/PinAlarm.c
@@ -100,8 +100,7 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
     alarm->base.type = &alarm_pin_pinalarm_type;
     // TODO: replace this if/when other WKUP pins are supported
     alarm->pin = &pin_PA00;
diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.h b/ports/stm/common-hal/alarm/pin/PinAlarm.h
index bc52849a53..1490944fdf 100644
--- a/ports/stm/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/stm/common-hal/alarm/pin/PinAlarm.h
@@ -38,7 +38,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c
index 6d508cd8cc..a1ebd3fa05 100644
--- a/ports/stm/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c
@@ -53,12 +53,11 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     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;
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+    alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
-    timer->monotonic_time = 0.0f;
-    return timer;
+    alarm->monotonic_time = 0.0f;
+    return alarm;
 }
 
 // This is run in the timer task. We use it to wake the main CircuitPython task.
diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.h b/ports/stm/common-hal/alarm/time/TimeAlarm.h
index 48531ebdf6..05e77a90be 100644
--- a/ports/stm/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/stm/common-hal/alarm/time/TimeAlarm.h
@@ -35,7 +35,7 @@ typedef struct {
 } 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);
+mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
 
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 97bd1c4982..adfce78cba 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -33,7 +33,10 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
-#ifdef CIRCUITPY_AUDIOPWMIO
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+#if CIRCUITPY_AUDIOPWMIO
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 #if CIRCUITPY_BUSIO
@@ -57,9 +60,6 @@
 #if CIRCUITPY_PULSEIO || CIRCUITPY_ALARM
 #include "peripherals/exti.h"
 #endif
-#if CIRCUITPY_ALARM
-#include "common-hal/alarm/__init__.h"
-#endif
 #if CIRCUITPY_RTC
 #include "shared-bindings/rtc/__init__.h"
 #endif
@@ -244,6 +244,10 @@ void SysTick_Handler(void) {
 void reset_port(void) {
     reset_all_pins();
 
+    #if CIRCUITPY_ALARM
+    alarm_reset();
+    #endif
+
     #if CIRCUITPY_RTC
     rtc_reset();
     #endif
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
index ea86e44f2f..82bfae4286 100644
--- a/shared-bindings/alarm/__init__.h
+++ b/shared-bindings/alarm/__init__.h
@@ -55,7 +55,7 @@ extern void common_hal_alarm_pretending_deep_sleep(void);
 extern mp_obj_t shared_alarm_get_wake_alarm(void);
 
 // Creates a new alarm object after exiting deep sleep (real or fake)
-extern mp_obj_t common_hal_alarm_create_wake_alarm(void);
+extern mp_obj_t common_hal_alarm_record_wake_alarm(void);
 
 // Saves alarm to global array
 void shared_alarm_save_wake_alarm(mp_obj_t alarm);

From b94447fde5fe3f0ee21fc68a7216fd4af67d3614 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 28 Oct 2022 05:00:54 +0000
Subject: [PATCH 1280/2403] Added safe mode button

---
 locale/circuitpython.pot                                 | 6 +++++-
 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index dda2cbd02c..dc80d88d87 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3844,6 +3844,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
index 616a156cb2..131ba0bf26 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -38,6 +38,12 @@
 #define CIRCUITPY_BOARD_SPI         (1)
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
 
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing central button at start up.\n")
+
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)

From b276ed7af9a441d315d931c13a04f4df1fc99bea Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 28 Oct 2022 05:32:09 +0000
Subject: [PATCH 1281/2403] Fixed copyright attribution

---
 ports/espressif/boards/m5stack_atom_lite/board.c         | 2 +-
 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/m5stack_atom_lite/board.c b/ports/espressif/boards/m5stack_atom_lite/board.c
index 66fa51c9fd..e9b7e9bfb3 100644
--- a/ports/espressif/boards/m5stack_atom_lite/board.c
+++ b/ports/espressif/boards/m5stack_atom_lite/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 Dario Cammi
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
index 131ba0bf26..5d136fa264 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Dan Halbert for Adafruit Industries
+ * Copyright (c) 2022 Dario Cammi
  *
  * 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 9a09c62eee4ea1a712f2bb12614795cc210934c2 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 28 Oct 2022 13:55:33 +0530
Subject: [PATCH 1282/2403] espressif add back `ESP32_CAMERA`

---
 ports/espressif/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 241cbcd0df..f1fa24a59b 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -25,6 +25,7 @@ CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COPROC ?= 1
 CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
+CIRCUITPY_ESP32_CAMERA ?= 1
 CIRCUITPY_ESPIDF ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1

From 27142d090b2a72d0e2fd170e32bab17bdcb16717 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 28 Oct 2022 11:08:30 +0000
Subject: [PATCH 1283/2403] Fixed copyright attribution

---
 ports/espressif/boards/m5stack_atom_lite/board.c         | 2 +-
 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/m5stack_atom_lite/board.c b/ports/espressif/boards/m5stack_atom_lite/board.c
index e9b7e9bfb3..3e64883633 100644
--- a/ports/espressif/boards/m5stack_atom_lite/board.c
+++ b/ports/espressif/boards/m5stack_atom_lite/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Dario Cammi
+ * Copyright (c) 2022 CDarius
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
index 5d136fa264..fdc79ec744 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Dario Cammi
+ * Copyright (c) 2022 CDarius
  *
  * 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 b815a4cc5e8c574d378a4d763fdff52dc659c1d9 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 28 Oct 2022 12:06:11 +0000
Subject: [PATCH 1284/2403] Added safe mode button and fix coyright attribution

---
 locale/circuitpython.pot                                  | 7 ++++++-
 ports/espressif/boards/m5stack_core_basic/board.c         | 2 +-
 ports/espressif/boards/m5stack_core_basic/mpconfigboard.h | 8 +++++++-
 ports/espressif/boards/m5stack_core_fire/board.c          | 2 +-
 ports/espressif/boards/m5stack_core_fire/mpconfigboard.h  | 8 +++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 mode change 100644 => 100755 ports/espressif/boards/m5stack_core_fire/board.c
 mode change 100644 => 100755 ports/espressif/boards/m5stack_core_fire/mpconfigboard.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index dda2cbd02c..ee3cbfc09f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3844,6 +3844,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/ports/espressif/boards/m5stack_core_basic/board.c b/ports/espressif/boards/m5stack_core_basic/board.c
index 3863b57637..2736bc758b 100644
--- a/ports/espressif/boards/m5stack_core_basic/board.c
+++ b/ports/espressif/boards/m5stack_core_basic/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 CDarius
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
old mode 100644
new mode 100755
index 08281ec32d..6ea8e508d4
--- a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Dan Halbert for Adafruit Industries
+ * Copyright (c) 2022 CDarius
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,12 @@
 #define CIRCUITPY_BOARD_UART        (1)
 #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
 
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing button A at start up.\n")
+
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_core_fire/board.c b/ports/espressif/boards/m5stack_core_fire/board.c
old mode 100644
new mode 100755
index 3863b57637..2736bc758b
--- a/ports/espressif/boards/m5stack_core_fire/board.c
+++ b/ports/espressif/boards/m5stack_core_fire/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2022 CDarius
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
old mode 100644
new mode 100755
index 3000415754..8c389a641d
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Dan Halbert for Adafruit Industries
+ * Copyright (c) 2022 CDarius
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,12 @@
 // #define CIRCUITPY_BOARD_UART        (1)
 // #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
 
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing button A at start up.\n")
+
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)

From 9c66320474f8d81ffb88a512cbd9a689efb6ece1 Mon Sep 17 00:00:00 2001
From: chukwon 
Date: Fri, 28 Oct 2022 21:40:35 +0800
Subject: [PATCH 1285/2403] fix and add lolin_s3 pins definition

---
 ports/espressif/boards/lolin_s3/pins.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/lolin_s3/pins.c b/ports/espressif/boards/lolin_s3/pins.c
index cc88572b6e..4bde24788a 100644
--- a/ports/espressif/boards/lolin_s3/pins.c
+++ b/ports/espressif/boards/lolin_s3/pins.c
@@ -81,9 +81,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A16), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
 
-    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_A17), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_A17), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
 
     { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
@@ -114,6 +114,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

From e83b96afcaab5052bb0f7f003c2d0edf4a39bc5a Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 28 Oct 2022 22:00:10 +0200
Subject: [PATCH 1286/2403] 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             |  7 ++++++-
 locale/cs.po             |  7 ++++++-
 locale/de_DE.po          | 15 +++++++++++----
 locale/el.po             |  7 ++++++-
 locale/en_GB.po          |  7 ++++++-
 locale/es.po             |  7 ++++++-
 locale/fil.po            |  7 ++++++-
 locale/fr.po             |  7 ++++++-
 locale/hi.po             |  7 ++++++-
 locale/it_IT.po          |  7 ++++++-
 locale/ja.po             |  7 ++++++-
 locale/ko.po             |  7 ++++++-
 locale/nl.po             |  7 ++++++-
 locale/pl.po             |  7 ++++++-
 locale/pt_BR.po          |  7 ++++++-
 locale/ru.po             |  7 ++++++-
 locale/sv.po             |  7 ++++++-
 locale/tr.po             |  7 ++++++-
 locale/zh_Latn_pinyin.po |  7 ++++++-
 19 files changed, 119 insertions(+), 22 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 9784f8fb1c..62189a8309 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2673,7 +2673,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3876,6 +3876,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 9c911b504e..d331cd0932 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2660,7 +2660,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3862,6 +3862,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c5bd941171..7ce418f552 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -173,7 +173,8 @@ msgstr "%q muss >= %d sein"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
+msgstr ""
+"%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -2717,7 +2718,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr "Kann Blockgröße von 512 nicht setzen"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "kann Attribut nicht setzen"
 
@@ -2987,8 +2988,9 @@ msgstr "Fehler = 0x%08lX"
 msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
-msgstr "esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu können. "
-"Sieh in der Dokumentation für eine Anleitung nach."
+msgstr ""
+"esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu "
+"können. Sieh in der Dokumentation für eine Anleitung nach."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3941,6 +3943,11 @@ msgstr "Drücken der Boot-Taste beim Start.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "Drücken Sie beim Start beide Tasten.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "Drücken der linken Taste beim Einschalten\n"
diff --git a/locale/el.po b/locale/el.po
index 55f8535703..5f9c88153f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2669,7 +2669,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3871,6 +3871,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index e9e74b6ac9..93053214c8 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2676,7 +2676,7 @@ msgstr "can't send non-None value to a just-started generator"
 msgid "can't set 512 block size"
 msgstr "can't set 512 block size"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "can't set attribute"
 
@@ -3881,6 +3881,11 @@ msgstr "pressing boot button at start up.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "pressing both buttons at start up.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "pressing the left button at start up\n"
diff --git a/locale/es.po b/locale/es.po
index 56ed23fa30..c7b12ff86b 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2713,7 +2713,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr "no se puede definir un tamaño de bloque de 512"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "no se puede asignar el atributo"
 
@@ -3928,6 +3928,11 @@ msgstr "presionando botón de arranque al inicio.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "presionando ambos botones al inicio.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "presione el botón izquierdo al arranque\n"
diff --git a/locale/fil.po b/locale/fil.po
index 7c13b61711..f11b7018da 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2664,7 +2664,7 @@ msgstr "hindi mapadala ang non-None value sa isang kaka umpisang generator"
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "hindi ma i-set ang attribute"
 
@@ -3881,6 +3881,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 19278499dd..885562a32d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2746,7 +2746,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr "impossible de définir une taille de bloc de 512"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "attribut non modifiable"
 
@@ -3970,6 +3970,11 @@ msgstr "bouton boot appuyé lors du démarrage.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "les deux boutons appuyés lors du démarrage.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "appuyer le bouton de gauche au démarage\n"
diff --git a/locale/hi.po b/locale/hi.po
index b2a6d4e25a..bdeb76c08c 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3844,6 +3844,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index ec9b5a055d..98018a7f5c 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2675,7 +2675,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "impossibile impostare attributo"
 
@@ -3894,6 +3894,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 5515942cf3..506de879a4 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2656,7 +2656,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3865,6 +3865,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index f266fa6499..fe5b81c864 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2646,7 +2646,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3848,6 +3848,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 6ffae54cb5..1f3cc3ff18 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2673,7 +2673,7 @@ msgstr "kan geen niet-'None' waarde naar een net gestartte generator sturen"
 msgid "can't set 512 block size"
 msgstr "kan geen 512 blokgrootte instellen"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "kan attribute niet instellen"
 
@@ -3881,6 +3881,11 @@ msgstr "druk bootknop in bij opstarten.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "druk beide knoppen in bij opstarten.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 197160d073..57d54dce23 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2653,7 +2653,7 @@ msgstr "świeżo stworzony generator może tylko przyjąć None"
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "nie można ustawić atrybutu"
 
@@ -3857,6 +3857,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 99780d894b..b1a17276a3 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2727,7 +2727,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr "não é possível definir o tamanho de 512 blocos"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "não é possível definir o atributo"
 
@@ -3949,6 +3949,11 @@ msgstr "pressionando o botão de boot na inicialização.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "pressionando ambos os botões durante a inicialização.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "pressionando o botão esquerdo durante a inicialização\n"
diff --git a/locale/ru.po b/locale/ru.po
index 95584e73be..e82169f771 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2691,7 +2691,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3893,6 +3893,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 3d42373ca9..23be78bc7e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2697,7 +2697,7 @@ msgstr "kan inte skicka icke-None värde till nystartad generator"
 msgid "can't set 512 block size"
 msgstr "kan inte sätta blockstorlek 512"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "kan inte att ange attribut"
 
@@ -3910,6 +3910,11 @@ msgstr "trycka på startknappen vid start.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "trycka båda knapparna vid uppstart.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "håll ner vänster knapp vid start\n"
diff --git a/locale/tr.po b/locale/tr.po
index 64fa3ba5b3..47779ff1f9 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2662,7 +2662,7 @@ msgstr ""
 msgid "can't set 512 block size"
 msgstr ""
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr ""
 
@@ -3864,6 +3864,11 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 52c96b9c0b..9c02f40da4 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2700,7 +2700,7 @@ msgstr "wúfǎ xiàng gānggāng qǐdòng de shēngchéng qì fāsòng fēi zhí
 msgid "can't set 512 block size"
 msgstr "wúfǎ shèzhì 512 kuài dàxiǎo"
 
-#: py/objnamedtuple.c
+#: py/objexcept.c py/objnamedtuple.c
 msgid "can't set attribute"
 msgstr "wúfǎ shèzhì shǔxìng"
 
@@ -3909,6 +3909,11 @@ msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "zài qǐdòng shí tóngshí àn xià liǎng gè ànniǔ.\n"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "pressing button A at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
 msgstr "qǐ dòng shí àn xià zuǒ àn niǔ\n"

From 7282bd9c9a7caa41aff0a7114345bf7b812b9bbb Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Sat, 29 Oct 2022 09:34:45 +0200
Subject: [PATCH 1287/2403] Removed boilerplate already handled by MP_WEAK
 definitions

Co-authored-by: Dan Halbert 
---
 ports/espressif/boards/m5stack_atom_lite/board.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/ports/espressif/boards/m5stack_atom_lite/board.c b/ports/espressif/boards/m5stack_atom_lite/board.c
index 3e64883633..c0d9676d86 100644
--- a/ports/espressif/boards/m5stack_atom_lite/board.c
+++ b/ports/espressif/boards/m5stack_atom_lite/board.c
@@ -25,14 +25,5 @@
  */
 
 #include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
-#include "components/hal/include/hal/gpio_hal.h"
-#include "common-hal/microcontroller/Pin.h"
 
-void board_init(void) {
-}
-
-void reset_board(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

From 2ffd16a10c80fea73a3e95b02dc50e4df11af22b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 29 Oct 2022 09:27:09 -0400
Subject: [PATCH 1288/2403] Update mpconfigboard.mk

---
 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
index 70b348b4f1..b58d3aa24e 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -6,3 +6,5 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_USB_CAMERA = 0

From a064b52ad767dc0300bed8fad0606d907f06183e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 29 Oct 2022 10:13:11 -0400
Subject: [PATCH 1290/2403] CIRCUITPY_ESP32_CAMERA, not CIRCUITPY_USB_CAMERA

---
 ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
index b58d3aa24e..6adf65d2bc 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -7,4 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_USB_CAMERA = 0
+CIRCUITPY_ESP32_CAMERA = 0

From 9ca057385abf903be474e43c39e33eec166af27d Mon Sep 17 00:00:00 2001
From: Jozsef Kiraly 
Date: Sat, 29 Oct 2022 18:52:43 +0100
Subject: [PATCH 1291/2403] feat: Add support for Waveshare RP2040-LCD-1.28

---
 .../boards/waveshare_rp2040_lcd_1_28/board.c  | 29 ++++++++
 .../waveshare_rp2040_lcd_1_28/mpconfigboard.h |  2 +
 .../mpconfigboard.mk                          | 17 +++++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/waveshare_rp2040_lcd_1_28/pins.c   | 70 +++++++++++++++++++
 5 files changed, 119 insertions(+)
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/board.c
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c

diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/board.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.h b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.h
new file mode 100644
index 0000000000..db90970b7f
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-LCD-1.28"
+#define MICROPY_HW_MCU_NAME "rp2040"
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
new file mode 100644
index 0000000000..cae5659ea9
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x2E8A
+USB_PID = 0x000A
+USB_PRODUCT = "Waveshare RP2040-LCD-1.28"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
+
+CIRCUITPY__EVE = 1
+
+# TODO: Add custom QMI8658 driver
+# FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython_qmi8658
+
+# TODO: Add custom GC9A01 driver
+# FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython_gc9a01
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pico-sdk-configboard.h b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c
new file mode 100644
index 0000000000..6dab18508b
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c
@@ -0,0 +1,70 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    
+    { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_DIN), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_IMU_INT1), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_IMU_INT2), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_BL), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_BAT_ADC), MP_ROM_PTR(&pin_GPIO29) }, // Battery voltage readout, 0.50 bias
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 2893ab355721a8eb6406cc4b56207611830990b6 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Fri, 28 Oct 2022 21:27:07 +0000
Subject: [PATCH 1292/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1004 of 1004 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 b1a17276a3..56555528a8 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: 2022-10-22 18:28+0000\n"
+"PO-Revision-Date: 2022-10-29 18:16+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -3952,7 +3952,7 @@ msgstr "pressionando ambos os botões durante a inicialização.\n"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
-msgstr ""
+msgstr "pressionando o botão A na inicialização.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"

From 16eb601caae8af2f336b1e9fb9f3bb1922916794 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 29 Oct 2022 00:19:22 +0000
Subject: [PATCH 1293/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 23be78bc7e..03d49a36ec 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: 2022-10-22 18:28+0000\n"
+"PO-Revision-Date: 2022-10-29 18:16+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -3900,7 +3900,7 @@ msgstr "genom att trycka på VOLUME-knappen vid start.\n"
 #: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
 #: supervisor/shared/safe_mode.c
 msgid "pressing boot button at start up.\n"
-msgstr "trycka på startknappen vid start.\n"
+msgstr "genom att trycka på startknappen vid start.\n"
 
 #: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -3908,16 +3908,16 @@ msgstr "trycka på startknappen vid start.\n"
 #: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "pressing both buttons at start up.\n"
-msgstr "trycka båda knapparna vid uppstart.\n"
+msgstr "genom att trycka båda knapparna vid uppstart.\n"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
-msgstr ""
+msgstr "genom att tryck på knappen A vid start.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "pressing the left button at start up\n"
-msgstr "håll ner vänster knapp vid start\n"
+msgstr "genom att håll ner vänster knapp vid start\n"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"

From ec7df0d17c1926ab6f3afbbb92a9bbed47329b47 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 29 Oct 2022 20:16:41 +0200
Subject: [PATCH 1294/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 62189a8309..5947e6698d 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -3876,6 +3876,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/cs.po b/locale/cs.po
index d331cd0932..d1db5450f2 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -3862,6 +3862,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7ce418f552..b5f9d29836 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3943,6 +3943,10 @@ msgstr "Drücken der Boot-Taste beim Start.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "Drücken Sie beim Start beide Tasten.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/el.po b/locale/el.po
index 5f9c88153f..202fcaf4c5 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -3871,6 +3871,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 93053214c8..6be6e327f5 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -3881,6 +3881,10 @@ msgstr "pressing boot button at start up.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "pressing both buttons at start up.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/es.po b/locale/es.po
index c7b12ff86b..0251226112 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -3928,6 +3928,10 @@ msgstr "presionando botón de arranque al inicio.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "presionando ambos botones al inicio.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/fil.po b/locale/fil.po
index f11b7018da..390ced89ac 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -3881,6 +3881,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/fr.po b/locale/fr.po
index 885562a32d..302afa03ae 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -3970,6 +3970,10 @@ msgstr "bouton boot appuyé lors du démarrage.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "les deux boutons appuyés lors du démarrage.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/hi.po b/locale/hi.po
index bdeb76c08c..78f93241b7 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -3844,6 +3844,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 98018a7f5c..bdfd83f211 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -3894,6 +3894,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/ja.po b/locale/ja.po
index 506de879a4..1b66c38ea9 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -3865,6 +3865,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/ko.po b/locale/ko.po
index fe5b81c864..9bca1c348b 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -3848,6 +3848,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/nl.po b/locale/nl.po
index 1f3cc3ff18..9c39c1a68a 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -3881,6 +3881,10 @@ msgstr "druk bootknop in bij opstarten.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "druk beide knoppen in bij opstarten.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/pl.po b/locale/pl.po
index 57d54dce23..dd91cd66fd 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -3857,6 +3857,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 56555528a8..94f13567da 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -3949,6 +3949,10 @@ msgstr "pressionando o botão de boot na inicialização.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "pressionando ambos os botões durante a inicialização.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/ru.po b/locale/ru.po
index e82169f771..8a3dcef040 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -3893,6 +3893,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/sv.po b/locale/sv.po
index 03d49a36ec..28cf8f6693 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -3910,6 +3910,10 @@ msgstr "genom att trycka på startknappen vid start.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "genom att trycka båda knapparna vid uppstart.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/tr.po b/locale/tr.po
index 47779ff1f9..ee72e1b336 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -3864,6 +3864,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 9c02f40da4..b713d93d40 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -3909,6 +3909,10 @@ msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
 msgid "pressing both buttons at start up.\n"
 msgstr "zài qǐdòng shí tóngshí àn xià liǎng gè ànniǔ.\n"
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "pressing central button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "pressing button A at start up.\n"

From 992e97d84b10a5bc6739ffa50ef749a0e987277c Mon Sep 17 00:00:00 2001
From: Jozsef Kiraly 
Date: Sat, 29 Oct 2022 20:00:37 +0100
Subject: [PATCH 1295/2403] fix: pre-commit

---
 ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c
index 6dab18508b..9153e8f78a 100644
--- a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c
@@ -12,7 +12,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
 

From ded134c346cd6c0f3c2823311163bb900b04bef5 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 29 Oct 2022 16:26:36 -0400
Subject: [PATCH 1296/2403] store wake_alarm in a static object

---
 main.c                                        | 21 ++++++++++---------
 .../atmel-samd/common-hal/alarm/SleepMemory.h |  5 +----
 ports/atmel-samd/common-hal/alarm/__init__.c  | 13 +++++-------
 ports/atmel-samd/common-hal/alarm/__init__.h  | 18 ++++++++++------
 .../common-hal/alarm/pin/PinAlarm.c           |  6 +++---
 .../common-hal/alarm/pin/PinAlarm.h           |  9 ++++----
 .../common-hal/alarm/time/TimeAlarm.c         |  6 ++++--
 .../common-hal/alarm/time/TimeAlarm.h         |  7 ++-----
 .../common-hal/alarm/touch/TouchAlarm.h       |  5 +----
 ports/atmel-samd/supervisor/port.c            |  4 ----
 .../espressif/common-hal/alarm/SleepMemory.h  |  5 +----
 ports/espressif/common-hal/alarm/__init__.c   | 17 ++++++---------
 ports/espressif/common-hal/alarm/__init__.h   | 19 ++++++++++++-----
 .../common-hal/alarm/coproc/CoprocAlarm.c     |  7 +++++--
 .../common-hal/alarm/coproc/CoprocAlarm.h     |  7 ++-----
 .../espressif/common-hal/alarm/pin/PinAlarm.c |  8 ++++---
 .../espressif/common-hal/alarm/pin/PinAlarm.h |  6 +++++-
 .../common-hal/alarm/time/TimeAlarm.c         |  5 ++++-
 .../common-hal/alarm/time/TimeAlarm.h         |  3 ++-
 .../common-hal/alarm/touch/TouchAlarm.c       |  6 ++++--
 .../common-hal/alarm/touch/TouchAlarm.h       |  7 ++-----
 ports/espressif/supervisor/port.c             |  8 -------
 ports/nrf/common-hal/alarm/SleepMemory.h      |  5 +----
 ports/nrf/common-hal/alarm/__init__.c         | 14 +++++--------
 ports/nrf/common-hal/alarm/__init__.h         | 15 +++++++++----
 ports/nrf/common-hal/alarm/pin/PinAlarm.c     |  7 ++++---
 ports/nrf/common-hal/alarm/pin/PinAlarm.h     |  6 +++++-
 ports/nrf/common-hal/alarm/time/TimeAlarm.c   |  6 ++++--
 ports/nrf/common-hal/alarm/time/TimeAlarm.h   |  3 ++-
 ports/nrf/common-hal/alarm/touch/TouchAlarm.c |  3 ++-
 ports/nrf/common-hal/alarm/touch/TouchAlarm.h |  7 ++-----
 ports/nrf/supervisor/port.c                   | 12 ++---------
 .../common-hal/alarm/SleepMemory.h            |  5 +----
 ports/raspberrypi/common-hal/alarm/__init__.c | 11 ++++------
 ports/raspberrypi/common-hal/alarm/__init__.h | 13 ++++++++----
 .../common-hal/alarm/pin/PinAlarm.c           |  6 ++++--
 .../common-hal/alarm/pin/PinAlarm.h           |  6 +++++-
 .../common-hal/alarm/time/TimeAlarm.c         |  5 ++++-
 .../common-hal/alarm/time/TimeAlarm.h         |  3 ++-
 .../common-hal/alarm/touch/TouchAlarm.h       |  5 +----
 ports/raspberrypi/supervisor/port.c           |  8 -------
 ports/stm/common-hal/alarm/SleepMemory.h      |  5 +----
 ports/stm/common-hal/alarm/__init__.c         | 11 ++++------
 ports/stm/common-hal/alarm/__init__.h         | 16 +++++++++-----
 ports/stm/common-hal/alarm/pin/PinAlarm.c     |  5 ++++-
 ports/stm/common-hal/alarm/pin/PinAlarm.h     |  9 ++++----
 ports/stm/common-hal/alarm/time/TimeAlarm.c   |  5 ++++-
 ports/stm/common-hal/alarm/time/TimeAlarm.h   |  7 ++-----
 ports/stm/common-hal/alarm/touch/TouchAlarm.h |  5 +----
 ports/stm/supervisor/port.c                   | 12 ++++-------
 50 files changed, 196 insertions(+), 211 deletions(-)

diff --git a/main.c b/main.c
index fea20d419b..10fdc65224 100644
--- a/main.c
+++ b/main.c
@@ -747,8 +747,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     supervisor_allocation *heap = allocate_remaining_memory();
 
-    // true means this is the first set of VM's after a hard reset.
-    start_mp(heap, true);
+    start_mp(heap);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -964,6 +963,9 @@ int __attribute__((used)) main(void) {
     // Record which alarm woke us up, if any.
     // common_hal_alarm_record_wake_alarm() should return a static, non-heap object
     shared_alarm_save_wake_alarm(common_hal_alarm_record_wake_alarm());
+    // Then reset the alarm system. It's not reset in reset_port(), because that's also called
+    // on VM teardown, which would clear any alarm setup.
+    alarm_reset();
     #endif
 
     // Reset everything and prep MicroPython to run boot.py.
@@ -1010,6 +1012,9 @@ int __attribute__((used)) main(void) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+                // If code.py did a fake deep sleep, pretend that we
+                // are running code.py for the first time after a hard
+                // reset. This will preserve any alarm information.
                 skip_repl = run_code_py(safe_mode, &simulate_reset);
             } else {
                 skip_repl = false;
@@ -1018,14 +1023,10 @@ int __attribute__((used)) main(void) {
             break;
         }
 
-        // Either the REPL or code.py has run and finished.
-        // If code.py did a fake deep sleep, pretend that we are running code.py for
-        // the first time after a hard reset. This will preserve any alarm information.
-        if (!simulate_reset) {
-            #if CIRCUITPY_ALARM
-            shared_alarm_save_wake_alarm(mp_const_none);
-            #endif
-        }
+        #if CIRCUITPY_ALARM
+        shared_alarm_save_wake_alarm(simulate_reset ? common_hal_alarm_record_wake_alarm() : mp_const_none);
+        alarm_reset();
+        #endif
     }
     mp_deinit();
     return 0;
diff --git a/ports/atmel-samd/common-hal/alarm/SleepMemory.h b/ports/atmel-samd/common-hal/alarm/SleepMemory.h
index 5fad5946e2..14848cd5a0 100644
--- a/ports/atmel-samd/common-hal/alarm/SleepMemory.h
+++ b/ports/atmel-samd/common-hal/alarm/SleepMemory.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_SLEEPMEMORY_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -34,5 +33,3 @@ typedef struct {
 } alarm_sleep_memory_obj_t;
 
 extern void alarm_sleep_memory_reset(void);
-
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/atmel-samd/common-hal/alarm/__init__.c b/ports/atmel-samd/common-hal/alarm/__init__.c
index 2edd3ece12..96d6d9694a 100644
--- a/ports/atmel-samd/common-hal/alarm/__init__.c
+++ b/ports/atmel-samd/common-hal/alarm/__init__.c
@@ -48,12 +48,9 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
-// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// Non-heap alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
 // This object lives across VM instantiations, so none of these objects can contain references to the heap.
-static union {
-    alarm_pin_pinalarm_obj_t pin_alarm;
-    alarm_time_timealarm_obj_t time_alarm;
-} wake_alarm;
+alarm_wake_alarm_union_t alarm_wake_alarm;
 
 void alarm_reset(void) {
     // Reset the alarm flag
@@ -83,13 +80,13 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     if (alarm_pin_pinalarm_woke_this_cycle()) {
         TAMPID = RTC->MODE0.TAMPID.reg;
         RTC->MODE0.TAMPID.reg = TAMPID;         // clear register
-        return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm, TAMPID);
+        return alarm_pin_pinalarm_record_wake_alarm(TAMPID);
     }
     if (alarm_time_timealarm_woke_this_cycle() || (true_deep && TAMPID == 0)) {
-        return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
+        return alarm_time_timealarm_record_wake_alarm();
     }
     if (true_deep) {
-        return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm, TAMPID);
+        return alarm_pin_pinalarm_record_wake_alarm(TAMPID);
     }
     return mp_const_none;
 }
diff --git a/ports/atmel-samd/common-hal/alarm/__init__.h b/ports/atmel-samd/common-hal/alarm/__init__.h
index 061775e568..3094811c27 100644
--- a/ports/atmel-samd/common-hal/alarm/__init__.h
+++ b/ports/atmel-samd/common-hal/alarm/__init__.h
@@ -24,10 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM__INIT__H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM__INIT__H
+#pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
+#include "common-hal/alarm/pin/PinAlarm.h"
+#include "common-hal/alarm/time/TimeAlarm.h"
 
 extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
 
@@ -53,8 +54,13 @@ typedef enum {
     SAMD_WAKEUP_RTC
 } samd_sleep_source_t;
 
-extern void alarm_set_wakeup_reason(samd_sleep_source_t reason);
-void alarm_get_wakeup_cause(void);
-extern void alarm_reset(void);
+typedef union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} alarm_wake_alarm_union_t;
 
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM__INIT__H
+extern alarm_wake_alarm_union_t alarm_wake_alarm;
+
+extern void alarm_set_wakeup_reason(samd_sleep_source_t reason);
+extern void alarm_get_wakeup_cause(void);
+extern void alarm_reset(void);
diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
index a2c01f0a82..dd2509b8c4 100644
--- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
@@ -31,9 +31,9 @@
 #include "hal/include/hal_gpio.h"
 // #include 
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/microcontroller/__init__.h"
-#include "shared-bindings/microcontroller/Pin.h"
 #include "common-hal/alarm/__init__.h"
 
 // This variable stores whether a PinAlarm woke in light sleep or fake deep sleep
@@ -128,8 +128,8 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm, uint32_t TAMPID) {
-    // Create tamper alarm that caused wakeup from deep sleep
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(uint32_t TAMPID) {
+    alarm_pin_pinalarm_obj_t *const alarm = &alarm_wake_alarm.pin_alarm;
 
     for (samd_tamper_pin_t *t = TAMPER_PINS; t->n >= 0; t++) {
         if (TAMPID & (1 << t->n)) {
diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
index 6f767bbffc..ee9ea07b71 100644
--- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h
@@ -24,12 +24,13 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_PINALARM_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_PINALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "py/objtuple.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -39,7 +40,7 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm, uint32_t TAMPID);
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(uint32_t TAMPID);
 
 void pin_alarm_callback(uint8_t num);
 void alarm_pin_pinalarm_reset(void);
@@ -47,5 +48,3 @@ void alarm_pin_pinalarm_deinit_alarms(size_t n_alarms, const mp_obj_t *alarms);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 void alarm_pin_pinalarm_prepare_for_deep_sleep(void);
 bool alarm_pin_pinalarm_woke_this_cycle(void);
-
-#endif  // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_PINALARM_H
diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
index 9c7c89f2c7..2ead87428b 100644
--- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
@@ -27,9 +27,9 @@
 #include "py/runtime.h"
 #include "hpl/pm/hpl_pm_base.h"
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
-#include "common-hal/alarm/__init__.h"
 #include "supervisor/port.h"
 
 STATIC volatile bool woke_up = false;
@@ -58,7 +58,9 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     return mp_const_none;
 }
 
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void) {
+    alarm_time_timealarm_obj_t *const alarm = &alarm_wake_alarm.time_alarm;
+
     alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     //       Or don't, most of the other ports don't have this either.
diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
index b8af80869c..ee517e0236 100644
--- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TIMEALARM_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TIMEALARM_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -35,12 +34,10 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void);
 void time_alarm_callback(void);
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 void alarm_time_timealarm_reset(void);
 
 void alarm_time_timealarm_prepare_for_deep_sleep(void);
-
-#endif  // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TIMEALARM_H
diff --git a/ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.h b/ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.h
index d7f0f8cf1d..59f202c69d 100644
--- a/ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.h
@@ -24,12 +24,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TOUCHALARM_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TOUCHALARM_H
+#pragma once
 
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
 } alarm_touch_touchalarm_obj_t;
-
-#endif  // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_TOUCHALARM_H
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 0fafbdb13c..424acece78 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -385,10 +385,6 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
-    #if CIRCUITPY_ALARM
-    alarm_reset();
-    #endif
-
     #if CIRCUITPY_BUSIO
     reset_sercoms();
     #endif
diff --git a/ports/espressif/common-hal/alarm/SleepMemory.h b/ports/espressif/common-hal/alarm/SleepMemory.h
index 37d6cd371f..626f748a67 100644
--- a/ports/espressif/common-hal/alarm/SleepMemory.h
+++ b/ports/espressif/common-hal/alarm/SleepMemory.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM_SLEEPMEMORY_H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -49,5 +48,3 @@ typedef struct {
 } alarm_sleep_memory_obj_t;
 
 extern void alarm_sleep_memory_reset(void);
-
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index 7faca8fc0c..02ce3e1082 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -58,14 +58,9 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
-// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// Non-heap alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
 // This object lives across VM instantiations, so none of these objects can contain references to the heap.
-static union {
-    alarm_pin_pinalarm_obj_t pin_alarm;
-    alarm_time_timealarm_obj_t time_alarm;
-    alarm_touch_touchalarm_obj_t touch_alarm;
-    alarm_coproc_coprocalarm_obj_t coproc_alarm;
-} wake_alarm;
+alarm_wake_alarm_union_t alarm_wake_alarm;
 
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
@@ -105,21 +100,21 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     esp_sleep_wakeup_cause_t cause = _get_wakeup_cause();
     switch (cause) {
         case ESP_SLEEP_WAKEUP_TIMER: {
-            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
+            return alarm_time_timealarm_record_wake_alarm();
         }
 
         case ESP_SLEEP_WAKEUP_GPIO:
         case ESP_SLEEP_WAKEUP_EXT0:
         case ESP_SLEEP_WAKEUP_EXT1: {
-            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
+            return alarm_pin_pinalarm_record_wake_alarm();
         }
 
         case ESP_SLEEP_WAKEUP_TOUCHPAD: {
-            return alarm_touch_touchalarm_record_wakeup_alarm(&wake_alarm.touch_alarm);
+            return alarm_touch_touchalarm_record_wake_alarm();
         }
 
         case ESP_SLEEP_WAKEUP_ULP: {
-            return alarm_coproc_coprocalarm_record_wakeup_alarm(&wake_alarm.coproc_alarm);
+            return alarm_coproc_coprocalarm_record_wake_alarm();
         }
 
         case ESP_SLEEP_WAKEUP_UNDEFINED:
diff --git a/ports/espressif/common-hal/alarm/__init__.h b/ports/espressif/common-hal/alarm/__init__.h
index ae7286db76..9f762f9c00 100644
--- a/ports/espressif/common-hal/alarm/__init__.h
+++ b/ports/espressif/common-hal/alarm/__init__.h
@@ -24,13 +24,22 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM__INIT__H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM__INIT__H
+#pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
+#include "common-hal/alarm/coproc/CoprocAlarm.h"
+#include "common-hal/alarm/pin/PinAlarm.h"
+#include "common-hal/alarm/time/TimeAlarm.h"
+#include "common-hal/alarm/touch/TouchAlarm.h"
 
-const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
+typedef union {
+    alarm_coproc_coprocalarm_obj_t coproc_alarm;
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+    alarm_touch_touchalarm_obj_t touch_alarm;
+} alarm_wake_alarm_union_t;
+
+extern alarm_wake_alarm_union_t alarm_wake_alarm;
+extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
 
 extern void alarm_reset(void);
-
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_ALARM__INIT__H
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
index 8c45cc208c..9ee187d27c 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/coproc/CoprocAlarm.h"
 #include "shared-bindings/coproc/__init__.h"
 
@@ -47,7 +48,9 @@ mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, co
     return mp_const_none;
 }
 
-mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(alarm_coproc_coprocalarm_obj_t *alarm) {
+mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void) {
+    alarm_coproc_coprocalarm_obj_t *const alarm = &alarm_wake_alarm.coproc_alarm;
+
     alarm->base.type = &alarm_coproc_coprocalarm_type;
     return alarm;
 }
@@ -109,7 +112,7 @@ mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, co
     return mp_const_none;
 }
 
-mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(void) {
+mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void) {
     return mp_const_none;
 }
 
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
index 2078d8325f..57a9bcdbff 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
+++ b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
-#define MICROPY_INCLUDED_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -38,11 +37,9 @@ typedef struct {
 } alarm_coproc_coprocalarm_obj_t;
 
 mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_coproc_coprocalarm_record_wakeup_alarm(void);
+mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void);
 
 void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void);
 void alarm_coproc_coprocalarm_reset(void);
 void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
 bool alarm_coproc_coprocalarm_woke_this_cycle(void);
-
-#endif  // MICROPY_INCLUDED_COMMON_HAL_ALARM_COPROC_COPROCALARM_H
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 3868e2f4a8..6db184a4dd 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -26,10 +26,10 @@
  */
 
 #include "py/runtime.h"
-
 #include "supervisor/port.h"
+
+#include "common-hal/alarm/__init__.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
-#include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
 #include "esp_sleep.h"
@@ -111,7 +111,7 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void) {
     esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
 
     // Pin status will persist into a fake deep sleep
@@ -135,6 +135,8 @@ mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm)
         }
     }
 
+    alarm_pin_pinalarm_obj_t *const alarm = &alarm_wake_alarm.pin_alarm;
+
     alarm->base.type = &alarm_pin_pinalarm_type;
     alarm->pin = NULL;
     // Map the pin number back to a pin object.
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.h b/ports/espressif/common-hal/alarm/pin/PinAlarm.h
index d1d5d1e4f0..309b27c2e9 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.h
@@ -24,9 +24,13 @@
  * THE SOFTWARE.
  */
 
+#pragma once
+
 #include "py/obj.h"
 #include "py/objtuple.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -35,7 +39,7 @@ typedef struct {
 } 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_record_wakeup_alarm(void);
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void);
 
 void alarm_pin_pinalarm_prepare_for_deep_sleep(void);
 void alarm_pin_pinalarm_reset(void);
diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.c b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
index f0daabc897..758e3c8f58 100644
--- a/ports/espressif/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.c
@@ -31,6 +31,7 @@
 
 #include "components/esp_timer/include/esp_timer.h"
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
 
@@ -51,7 +52,9 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     return mp_const_none;
 }
 
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void) {
+    alarm_time_timealarm_obj_t *const alarm = &alarm_wake_alarm.time_alarm;
+
     alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     alarm->monotonic_time = 0.0f;
diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.h b/ports/espressif/common-hal/alarm/time/TimeAlarm.h
index edb4d0236f..c679c3cd9f 100644
--- a/ports/espressif/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.h
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#pragma once
 
 #include "py/obj.h"
 
@@ -33,7 +34,7 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
+mp_obj_t alarm_time_timealarm_record_wake_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);
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
index 35da811ad9..232614ce32 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
@@ -52,8 +53,9 @@ mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, cons
     return mp_const_none;
 }
 
-mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm) {
-    // Create TouchAlarm object.
+mp_obj_t alarm_touch_touchalarm_record_wake_alarm(void) {
+    alarm_touch_touchalarm_obj_t *const alarm = &alarm_wake_alarm.touch_alarm;
+
     alarm->base.type = &alarm_touch_touchalarm_type;
     alarm->pin = NULL;
 
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.h b/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
index c5cb8da3e9..0f35063ee4 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
-#define MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "common-hal/microcontroller/Pin.h"
@@ -36,11 +35,9 @@ typedef struct {
 } alarm_touch_touchalarm_obj_t;
 
 mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm);
+mp_obj_t alarm_touch_touchalarm_record_wake_alarm(void);
 
 void alarm_touch_touchalarm_prepare_for_deep_sleep(void);
 void alarm_touch_touchalarm_reset(void);
 void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
 bool alarm_touch_touchalarm_woke_this_cycle(void);
-
-#endif  // MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 54e2026c7d..3106f4b991 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -60,10 +60,6 @@
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
 
-#if CIRCUITPY_ALARM
-#include "common-hal/alarm/__init__.h"
-#endif
-
 #if CIRCUITPY_COUNTIO || CIRCUITPY_ROTARYIO || CIRCUITPY_FREQUENCYIO
 #include "peripherals/pcnt.h"
 #endif
@@ -342,10 +338,6 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
-    #if CIRCUITPY_ALARM
-    alarm_reset();
-    #endif
-
     // TODO deinit for esp32-camera
     #if CIRCUITPY_ESP32_CAMERA
     esp_camera_deinit();
diff --git a/ports/nrf/common-hal/alarm/SleepMemory.h b/ports/nrf/common-hal/alarm/SleepMemory.h
index 8fd702ea83..bb50c36e89 100644
--- a/ports/nrf/common-hal/alarm/SleepMemory.h
+++ b/ports/nrf/common-hal/alarm/SleepMemory.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -37,5 +36,3 @@ typedef struct {
 
 extern void set_memory_retention(void);
 extern void alarm_sleep_memory_reset(void);
-
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c
index 8501092c9d..b3f9979ae0 100644
--- a/ports/nrf/common-hal/alarm/__init__.c
+++ b/ports/nrf/common-hal/alarm/__init__.c
@@ -56,13 +56,9 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
-// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// Non-heap alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
 // This object lives across VM instantiations, so none of these objects can contain references to the heap.
-static union {
-    alarm_pin_pinalarm_obj_t pin_alarm;
-    alarm_time_timealarm_obj_t time_alarm;
-    alarm_touch_touchalarm_obj_t touch_alarm;
-} wake_alarm;
+alarm_wake_alarm_union_t alarm_wake_alarm;
 
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
@@ -129,13 +125,13 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     nrf_sleep_source_t cause = _get_wakeup_cause();
     switch (cause) {
         case NRF_SLEEP_WAKEUP_TIMER: {
-            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
+            return alarm_time_timealarm_record_wake_alarm();
         }
         case NRF_SLEEP_WAKEUP_TOUCHPAD: {
-            return alarm_touch_touchalarm_record_wakeup_alarm(&wake_alarm.touch_alarm);
+            return alarm_touch_touchalarm_record_wake_alarm();
         }
         case NRF_SLEEP_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
+            return alarm_pin_pinalarm_record_wake_alarm();
         }
         default:
             break;
diff --git a/ports/nrf/common-hal/alarm/__init__.h b/ports/nrf/common-hal/alarm/__init__.h
index 47051dbd72..7c4634610d 100644
--- a/ports/nrf/common-hal/alarm/__init__.h
+++ b/ports/nrf/common-hal/alarm/__init__.h
@@ -25,10 +25,12 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM__INIT__H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM__INIT__H
+#pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
+#include "common-hal/alarm/pin/PinAlarm.h"
+#include "common-hal/alarm/time/TimeAlarm.h"
+#include "common-hal/alarm/touch/TouchAlarm.h"
 
 typedef enum {
     NRF_SLEEP_WAKEUP_UNDEFINED,
@@ -40,6 +42,13 @@ typedef enum {
     NRF_SLEEP_WAKEUP_ZZZ
 } nrf_sleep_source_t;
 
+typedef union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+    alarm_touch_touchalarm_obj_t touch_alarm;
+} alarm_wake_alarm_union_t;
+
+extern alarm_wake_alarm_union_t alarm_wake_alarm;
 extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
 
 enum {
@@ -52,5 +61,3 @@ extern uint8_t sleepmem_wakeup_event;
 extern uint8_t sleepmem_wakeup_pin;
 
 extern void alarm_reset(void);
-
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM__INIT__H
diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.c b/ports/nrf/common-hal/alarm/pin/PinAlarm.c
index b48f0b46a7..5bef48773e 100644
--- a/ports/nrf/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/nrf/common-hal/alarm/pin/PinAlarm.c
@@ -30,10 +30,9 @@
 #include 
 #include 
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/microcontroller/__init__.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "common-hal/alarm/__init__.h"
 
 #include "nrfx.h"
 #include "nrf_gpio.h"
@@ -101,7 +100,9 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void) {
+    alarm_pin_pinalarm_obj_t *const alarm = &alarm_wake_alarm.pin_alarm;
+
     alarm->base.type = &alarm_pin_pinalarm_type;
     alarm->pin = NULL;
     // Map the pin number back to a pin object.
diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.h b/ports/nrf/common-hal/alarm/pin/PinAlarm.h
index 3a16a50d8a..9181cb6094 100644
--- a/ports/nrf/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/nrf/common-hal/alarm/pin/PinAlarm.h
@@ -24,9 +24,13 @@
  * THE SOFTWARE.
  */
 
+#pragma once
+
 #include "py/obj.h"
 #include "py/objtuple.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -35,7 +39,7 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.c b/ports/nrf/common-hal/alarm/time/TimeAlarm.c
index af1ce694ee..a69e299bc2 100644
--- a/ports/nrf/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/nrf/common-hal/alarm/time/TimeAlarm.c
@@ -28,7 +28,7 @@
 #include "py/runtime.h"
 #include 
 
-#include "common-hal/alarm/__init__.h"
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
 
@@ -49,7 +49,9 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     return mp_const_none;
 }
 
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void) {
+    alarm_time_timealarm_obj_t *const alarm = &alarm_wake_alarm.time_alarm;
+
     alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     alarm->monotonic_time = 0.0f;
diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.h b/ports/nrf/common-hal/alarm/time/TimeAlarm.h
index 2af5121e10..c5f76c8003 100644
--- a/ports/nrf/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/nrf/common-hal/alarm/time/TimeAlarm.h
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#pragma once
 
 #include "py/obj.h"
 
@@ -37,7 +38,7 @@ extern void port_disable_interrupt_after_ticks_ch(uint32_t channel);
 extern void port_interrupt_after_ticks_ch(uint32_t channel, uint32_t ticks);
 
 mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void);
 
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c b/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
index 9bd2fefcce..5c1d489262 100644
--- a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/nrf/common-hal/alarm/touch/TouchAlarm.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
@@ -39,7 +40,7 @@ mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, cons
     return mp_const_none;
 }
 
-mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(alarm_touch_touchalarm_obj_t *alarm) {
+mp_obj_t alarm_touch_touchalarm_record_wake_alarm(void) {
     return mp_const_none;
 }
 
diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h b/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
index d895414cd3..31aa30117a 100644
--- a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/nrf/common-hal/alarm/touch/TouchAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
-#define MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "common-hal/microcontroller/Pin.h"
@@ -37,11 +36,9 @@ typedef struct {
 
 // Find the alarm object that caused us to wake up or create an equivalent one.
 mp_obj_t alarm_touch_touchalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_touch_touchalarm_record_wakeup_alarm(void);
+mp_obj_t alarm_touch_touchalarm_record_wake_alarm(void);
 // Check for the wake up alarm from pretend deep sleep.
 void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
 void alarm_touch_touchalarm_prepare_for_deep_sleep(void);
 bool alarm_touch_touchalarm_woke_this_cycle(void);
 void alarm_touch_touchalarm_reset(void);
-
-#endif  // MICROPY_INCLUDED_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 477829c2d2..e67f641900 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -64,15 +64,11 @@
 
 #include "lib/tinyusb/src/device/usbd.h"
 
-#if CIRCUITPY_ALARM
-#include "common-hal/alarm/__init__.h"
-#endif
-
-#ifdef CIRCUITPY_AUDIOBUSIO
+#if CIRCUITPY_AUDIOBUSIO
 #include "common-hal/audiobusio/I2SOut.h"
 #endif
 
-#ifdef CIRCUITPY_AUDIOPWMIO
+#if CIRCUITPY_AUDIOPWMIO
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 
@@ -216,10 +212,6 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
-    #if CIRCUITPY_ALARM
-    alarm_reset();
-    #endif
-
     #if CIRCUITPY_BUSIO
     i2c_reset();
     spi_reset();
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.h b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
index 59d0429c3b..14848cd5a0 100644
--- a/ports/raspberrypi/common-hal/alarm/SleepMemory.h
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -34,5 +33,3 @@ typedef struct {
 } 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
index c184ab95d9..656d15af5a 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -96,12 +96,9 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
-// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// Non-heap alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
 // This object lives across VM instantiations, so none of these objects can contain references to the heap.
-static union {
-    alarm_pin_pinalarm_obj_t pin_alarm;
-    alarm_time_timealarm_obj_t time_alarm;
-} wake_alarm;
+alarm_wake_alarm_union_t alarm_wake_alarm;
 
 void alarm_reset(void) {
     alarm_sleep_memory_reset();
@@ -144,11 +141,11 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     uint8_t cause = _get_wakeup_cause();
     switch (cause) {
         case RP_SLEEP_WAKEUP_RTC: {
-            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
+            return alarm_time_timealarm_record_wake_alarm();
         }
 
         case RP_SLEEP_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
+            return alarm_pin_pinalarm_record_wake_alarm();
         }
 
         case RP_SLEEP_WAKEUP_UNDEF:
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.h b/ports/raspberrypi/common-hal/alarm/__init__.h
index 3d5d86f8dc..284e3ddb4e 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.h
+++ b/ports/raspberrypi/common-hal/alarm/__init__.h
@@ -24,10 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM__INIT__H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM__INIT__H
+#pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
+#include "common-hal/alarm/pin/PinAlarm.h"
+#include "common-hal/alarm/time/TimeAlarm.h"
 
 #include "hardware/regs/clocks.h"
 
@@ -35,8 +36,12 @@
 #define RP_SLEEP_WAKEUP_GPIO    1
 #define RP_SLEEP_WAKEUP_RTC     2
 
+typedef union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} alarm_wake_alarm_union_t;
+
+extern alarm_wake_alarm_union_t alarm_wake_alarm;
 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
index 388cba3d8a..0af27cb44f 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -26,10 +26,10 @@
 
 #include "py/runtime.h"
 
+#include "shared-bindings/alarm/__init__.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"
@@ -94,7 +94,9 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void) {
+    alarm_pin_pinalarm_obj_t *const alarm = &alarm_wake_alarm.pin_alarm;
+
     alarm->base.type = &alarm_pin_pinalarm_type;
     // TODO: how to obtain the correct pin from memory?
     alarm->pin = NULL;
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
index 1e576b9382..9dcbf2b848 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
@@ -24,9 +24,13 @@
  * THE SOFTWARE.
  */
 
+#pragma once
+
 #include "py/obj.h"
 #include "py/objtuple.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -36,7 +40,7 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_light_reset(void);
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
index 81eb78bcb1..9bfe5cf262 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
 
@@ -58,7 +59,9 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     return mp_const_none;
 }
 
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void) {
+    alarm_time_timealarm_obj_t *const alarm = &alarm_wake_alarm.time_alarm;
+
     alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     alarm->monotonic_time = 0.0f;
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
index 4d5569a569..0b4c8bce06 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#pragma once
 
 #include "py/obj.h"
 
@@ -33,7 +34,7 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
+mp_obj_t alarm_time_timealarm_record_wake_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);
diff --git a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
index f631293511..6badde145f 100644
--- a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "common-hal/microcontroller/Pin.h"
@@ -34,5 +33,3 @@ 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/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index d1eff62d56..781d2b11d2 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -41,10 +41,6 @@
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
-#if CIRCUITPY_ALARM
-#include "common-hal/alarm/__init__.h"
-#endif
-
 #if CIRCUITPY_SSL
 #include "common-hal/ssl/__init__.h"
 #endif
@@ -158,10 +154,6 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
-    #if CIRCUITPY_ALARM
-    alarm_reset();
-    #endif
-
     #if CIRCUITPY_BUSIO
     reset_i2c();
     reset_spi();
diff --git a/ports/stm/common-hal/alarm/SleepMemory.h b/ports/stm/common-hal/alarm/SleepMemory.h
index 0e9fc54904..14848cd5a0 100644
--- a/ports/stm/common-hal/alarm/SleepMemory.h
+++ b/ports/stm/common-hal/alarm/SleepMemory.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_SLEEPMEMORY_H
-#define MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -34,5 +33,3 @@ typedef struct {
 } alarm_sleep_memory_obj_t;
 
 extern void alarm_sleep_memory_reset(void);
-
-#endif // MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/stm/common-hal/alarm/__init__.c b/ports/stm/common-hal/alarm/__init__.c
index 4763403842..78d50b41a8 100644
--- a/ports/stm/common-hal/alarm/__init__.c
+++ b/ports/stm/common-hal/alarm/__init__.c
@@ -47,12 +47,9 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
     },
 };
 
-// Static alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
+// Non-heap alarm object recording alarm (if any) that woke up CircuitPython after light or deep sleep.
 // This object lives across VM instantiations, so none of these objects can contain references to the heap.
-static union {
-    alarm_pin_pinalarm_obj_t pin_alarm;
-    alarm_time_timealarm_obj_t time_alarm;
-} wake_alarm;
+alarm_wake_alarm_union_t alarm_wake_alarm;
 
 STATIC stm_sleep_source_t true_deep_wake_reason;
 
@@ -94,10 +91,10 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
     stm_sleep_source_t cause = alarm_get_wakeup_cause();
     switch (cause) {
         case STM_WAKEUP_RTC: {
-            return alarm_time_timealarm_record_wakeup_alarm(&wake_alarm.time_alarm);
+            return alarm_time_timealarm_record_wake_alarm();
         }
         case STM_WAKEUP_GPIO: {
-            return alarm_pin_pinalarm_record_wakeup_alarm(&wake_alarm.pin_alarm);
+            return alarm_pin_pinalarm_record_wake_alarm();
         }
         case STM_WAKEUP_UNDEF:
         default:
diff --git a/ports/stm/common-hal/alarm/__init__.h b/ports/stm/common-hal/alarm/__init__.h
index 6c72364fc3..c87cb3b1eb 100644
--- a/ports/stm/common-hal/alarm/__init__.h
+++ b/ports/stm/common-hal/alarm/__init__.h
@@ -24,10 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM__INIT__H
-#define MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM__INIT__H
+#pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
+#include "common-hal/alarm/pin/PinAlarm.h"
+#include "common-hal/alarm/time/TimeAlarm.h"
 
 extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
 
@@ -37,10 +38,15 @@ typedef enum {
     STM_WAKEUP_RTC
 } stm_sleep_source_t;
 
+typedef union {
+    alarm_pin_pinalarm_obj_t pin_alarm;
+    alarm_time_timealarm_obj_t time_alarm;
+} alarm_wake_alarm_union_t;
+
+extern alarm_wake_alarm_union_t alarm_wake_alarm;
+
 #define STM_ALARM_FLAG      (RTC->BKP0R)
 
 extern void alarm_set_wakeup_reason(stm_sleep_source_t reason);
-stm_sleep_source_t alarm_get_wakeup_cause(void);
+extern stm_sleep_source_t alarm_get_wakeup_cause(void);
 extern void alarm_reset(void);
-
-#endif // MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM__INIT__H
diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.c b/ports/stm/common-hal/alarm/pin/PinAlarm.c
index 50bd06b59a..161bd9fea6 100644
--- a/ports/stm/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/stm/common-hal/alarm/pin/PinAlarm.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 
 #include "peripherals/exti.h"
@@ -100,7 +101,9 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
     return mp_const_none;
 }
 
-mp_obj_t alarm_pin_pinalarm_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm) {
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void) {
+    alarm_pin_pinalarm_obj_t *const alarm = &alarm_wake_alarm.pin_alarm;
+
     alarm->base.type = &alarm_pin_pinalarm_type;
     // TODO: replace this if/when other WKUP pins are supported
     alarm->pin = &pin_PA00;
diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.h b/ports/stm/common-hal/alarm/pin/PinAlarm.h
index 1490944fdf..77e0c6143e 100644
--- a/ports/stm/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/stm/common-hal/alarm/pin/PinAlarm.h
@@ -24,12 +24,13 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_PINALARM_H
-#define MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_PINALARM_H
+#pragma once
 
 #include "py/obj.h"
 #include "py/objtuple.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
@@ -38,11 +39,9 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_pin_pinalarm_obj_t *alarm);
+mp_obj_t alarm_pin_pinalarm_record_wake_alarm(void);
 
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 void alarm_pin_pinalarm_prepare_for_deep_sleep(void);
 bool alarm_pin_pinalarm_woke_this_cycle(void);
-
-#endif  // MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_PINALARM_H
diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c
index a1ebd3fa05..9ba6ed7658 100644
--- a/ports/stm/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 
+#include "shared-bindings/alarm/__init__.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
 #include "peripherals/rtc.h"
@@ -53,7 +54,9 @@ mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj
     return mp_const_none;
 }
 
-mp_obj_t alarm_time_timealarm_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm) {
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void) {
+    alarm_time_timealarm_obj_t *const alarm = &alarm_wake_alarm.time_alarm;
+
     alarm->base.type = &alarm_time_timealarm_type;
     // TODO: Set monotonic_time based on the RTC state.
     alarm->monotonic_time = 0.0f;
diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.h b/ports/stm/common-hal/alarm/time/TimeAlarm.h
index 05e77a90be..e3b9caadcd 100644
--- a/ports/stm/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/stm/common-hal/alarm/time/TimeAlarm.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TIMEALARM_H
-#define MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TIMEALARM_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -35,12 +34,10 @@ typedef struct {
 } 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_record_wakeup_alarm(alarm_time_timealarm_obj_t *alarm);
+mp_obj_t alarm_time_timealarm_record_wake_alarm(void);
 
 bool alarm_time_timealarm_woke_this_cycle(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 void alarm_time_timealarm_reset(void);
 
 void alarm_time_timealarm_prepare_for_deep_sleep(void);
-
-#endif  // MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TIMEALARM_H
diff --git a/ports/stm/common-hal/alarm/touch/TouchAlarm.h b/ports/stm/common-hal/alarm/touch/TouchAlarm.h
index 6c89353f93..59f202c69d 100644
--- a/ports/stm/common-hal/alarm/touch/TouchAlarm.h
+++ b/ports/stm/common-hal/alarm/touch/TouchAlarm.h
@@ -24,12 +24,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TOUCHALARM_H
-#define MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TOUCHALARM_H
+#pragma once
 
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
 } alarm_touch_touchalarm_obj_t;
-
-#endif  // MICROPY_INCLUDED_STM32_COMMON_HAL_ALARM_TOUCHALARM_H
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index adfce78cba..97bd1c4982 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -33,10 +33,7 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
-#if CIRCUITPY_ALARM
-#include "common-hal/alarm/__init__.h"
-#endif
-#if CIRCUITPY_AUDIOPWMIO
+#ifdef CIRCUITPY_AUDIOPWMIO
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 #if CIRCUITPY_BUSIO
@@ -60,6 +57,9 @@
 #if CIRCUITPY_PULSEIO || CIRCUITPY_ALARM
 #include "peripherals/exti.h"
 #endif
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
 #if CIRCUITPY_RTC
 #include "shared-bindings/rtc/__init__.h"
 #endif
@@ -244,10 +244,6 @@ void SysTick_Handler(void) {
 void reset_port(void) {
     reset_all_pins();
 
-    #if CIRCUITPY_ALARM
-    alarm_reset();
-    #endif
-
     #if CIRCUITPY_RTC
     rtc_reset();
     #endif

From 3f2e8feb5c0a0ecdcb5356b3c838141044a13104 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 29 Oct 2022 20:31:04 +0000
Subject: [PATCH 1297/2403] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 94f13567da..3f50364a68 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: 2022-10-29 18:16+0000\n"
+"PO-Revision-Date: 2022-10-29 22:00+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -3951,7 +3951,7 @@ msgstr "pressionando ambos os botões durante a inicialização.\n"
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "pressing central button at start up.\n"
-msgstr ""
+msgstr "pressionando o botão central na inicialização.\n"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h

From c6cfb031d083ec926a5541a70d46fe367e8587b8 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 29 Oct 2022 18:33:41 +0000
Subject: [PATCH 1298/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1005 of 1005 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 28cf8f6693..ae47e52f1f 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: 2022-10-29 18:16+0000\n"
+"PO-Revision-Date: 2022-10-29 22:00+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -3912,7 +3912,7 @@ msgstr "genom att trycka båda knapparna vid uppstart.\n"
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "pressing central button at start up.\n"
-msgstr ""
+msgstr "trycka på mittknappen vid start.\n"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h

From 5d7c58da5db472de09f9c38adbb63222d0687067 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Sun, 30 Oct 2022 01:52:09 +0200
Subject: [PATCH 1299/2403] Update pins.c

Attempt to fix build issue
---
 ports/espressif/boards/maker_badge/pins.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/maker_badge/pins.c b/ports/espressif/boards/maker_badge/pins.c
index f573b20be8..abecb7fef3 100644
--- a/ports/espressif/boards/maker_badge/pins.c
+++ b/ports/espressif/boards/maker_badge/pins.c
@@ -82,6 +82,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 934d2a7004a98879b9a1a39019b640db19fd17da Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 29 Oct 2022 05:30:22 +0200
Subject: [PATCH 1300/2403] remove duplicate press boot button, it's already
 the default

---
 ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h    | 3 ---
 .../boards/adafruit_qtpy_esp32_pico/mpconfigboard.h          | 3 ---
 ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h | 3 ---
 ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h       | 3 ---
 .../boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h  | 2 --
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.h         | 3 ---
 ports/espressif/boards/microdev_micro_c3/mpconfigboard.h     | 3 ---
 .../boards/unexpectedmaker_tinypico/mpconfigboard.h          | 5 -----
 .../boards/unexpectedmaker_tinypico_nano/mpconfigboard.h     | 5 -----
 9 files changed, 30 deletions(-)

diff --git a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
index bb99c412ae..1886f9e233 100644
--- a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
+++ b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
@@ -5,9 +5,6 @@
 
 #define CALIBRATE_CRYSTALLESS 1
 
-// Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA08)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA09)
 
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
index 42a575aa68..7f8288f17b 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
@@ -41,9 +41,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
 
-// Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
-
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
index 0cc6509647..32b0940881 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
@@ -44,7 +44,4 @@
 // For entering safe mode
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO9)
 
-// Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
 #define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
index 3b1caff2e9..2cdf48fad3 100644
--- a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
@@ -41,7 +41,4 @@
 #define CIRCUITPY_BOARD_UART        (1)
 #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
 
-// Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
 #define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
index 51fb60fe1a..4875dcc745 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
@@ -35,5 +35,3 @@
 
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
-
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 03e4d5d436..2a90d91845 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -45,7 +45,4 @@
 #define CIRCUITPY_BOARD_UART        (1)
 #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
 
-// Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
 #define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
index 97a18f3235..2153513306 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
@@ -50,6 +50,3 @@
 
 // For entering safe mode
 #define CIRCUITPY_BOOT_BUTTON           (&pin_GPIO9)
-
-// Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
index a12ccb0c18..2db308f623 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.h
@@ -33,11 +33,6 @@
 #define CIRCUITPY_BOARD_SPI         (1)
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
 
-// #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
-
-// Explanation of how a user got into safe mode
-// #define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
-
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
index 3cc64859ce..87c582b3bf 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.h
@@ -33,11 +33,6 @@
 #define CIRCUITPY_BOARD_SPI         (1)
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
 
-// #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
-
-// Explanation of how a user got into safe mode
-// #define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
-
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)

From 0aa41fa92efdcb095d26b1202dedeaaec4c3cc6f Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 29 Oct 2022 05:31:12 +0200
Subject: [PATCH 1301/2403] change BOARD_USER_SAFE_MODE_ACTION into a separate
 sentence

---
 locale/circuitpython.pot                      | 74 ++++++++-----------
 .../circuitplayground_express/mpconfigboard.h |  2 +-
 .../mpconfigboard.h                           |  2 +-
 .../mpconfigboard.h                           |  2 +-
 .../boards/meowmeow/mpconfigboard.h           |  2 +-
 .../adafruit_feather_esp32_v2/mpconfigboard.h |  2 +-
 .../hardkernel_odroid_go/mpconfigboard.h      |  2 +-
 .../boards/m5stack_atom_lite/mpconfigboard.h  |  2 +-
 .../boards/m5stack_core_basic/mpconfigboard.h |  2 +-
 .../boards/m5stack_core_fire/mpconfigboard.h  |  2 +-
 .../nrf/boards/aramcon2_badge/mpconfigboard.h |  2 +-
 supervisor/shared/safe_mode.c                 |  5 +-
 12 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 9537a28bdd..b880087884 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -583,6 +583,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -648,6 +655,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""
@@ -1975,18 +1987,34 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2047,7 +2075,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2345,10 +2373,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3815,46 +3839,8 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
+msgid "The central button was pressed at start up.\n"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
index 9020c243b1..33910221a0 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
index 5073c5e403..7f0e041f25 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
index 20cfc617a2..12fd30e005 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting.
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248)  // divisible by 8
diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
index 73853dab5d..ad6901230f 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
@@ -6,7 +6,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA01)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA00)
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
index fc478ef005..b7f2513217 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
@@ -47,7 +47,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO38)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing SW38 button at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("The SW38 button was pressed at start up.\n")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
index 423890f2e1..7de90b0ae8 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
@@ -35,7 +35,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing VOLUME button at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("The VOLUME button was pressed at start up.\n")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
index fdc79ec744..dfa12b53b0 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -42,7 +42,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing central button at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
index 6ea8e508d4..c974c64874 100755
--- a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
@@ -42,7 +42,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing button A at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
index 8c389a641d..f56a8fe901 100755
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
@@ -43,7 +43,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing button A at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h b/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
index 517ad7324b..af8e3c3507 100644
--- a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+++ b/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
@@ -52,7 +52,7 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_P0_29)
 
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing the left button at start up\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("The left button was pressed at start up.\n")
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index aefae1e48b..64391059d3 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -149,13 +149,12 @@ void print_safe_mode_message(safe_mode_t reason) {
             #ifdef BOARD_USER_SAFE_MODE_ACTION
             message = BOARD_USER_SAFE_MODE_ACTION;
             #elif defined(CIRCUITPY_BOOT_BUTTON)
-            message = translate("pressing boot button at start up.\n");
+            message = translate("The BOOT button was pressed at start up.\n");
             #endif
             if (message != NULL) {
                 // Output a user safe mode string if it's set.
-                serial_write_compressed(translate("You requested starting safe mode by "));
                 serial_write_compressed(message);
-                serial_write_compressed(translate("To exit, please reset the board without "));
+                message = translate("To exit, please reset the board without requesting safe mode.");
                 // The final piece is printed below.
             }
             break;

From ae8f415bd59db285f81d84935f0ab923f21bd024 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Sun, 30 Oct 2022 02:17:38 +0200
Subject: [PATCH 1302/2403] Update board.c

---
 ports/espressif/boards/maker_badge/board.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/espressif/boards/maker_badge/board.c b/ports/espressif/boards/maker_badge/board.c
index 4b244087f6..19dba31c57 100644
--- a/ports/espressif/boards/maker_badge/board.c
+++ b/ports/espressif/boards/maker_badge/board.c
@@ -49,8 +49,6 @@ void board_init(void) {
 
 }
 
-//  busio_spi_obj_t *spi = common_hal_board_create_spi();
-
 bool board_requests_safe_mode(void) {
     return false;
 }

From 8f82db5b22299c7a2fe16c80c54e7cc26594a2bd Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 30 Oct 2022 03:55:59 +0100
Subject: [PATCH 1303/2403] define out the safe mode message if none

---
 locale/circuitpython.pot      |  8 ++++----
 supervisor/shared/safe_mode.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b880087884..768daa8651 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2011,6 +2011,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
 msgstr ""
@@ -3839,10 +3843,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 64391059d3..d23b78d624 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -146,17 +146,17 @@ void print_safe_mode_message(safe_mode_t reason) {
 
     switch (reason) {
         case USER_SAFE_MODE:
-            #ifdef BOARD_USER_SAFE_MODE_ACTION
+            #if defined(BOARD_USER_SAFE_MODE_ACTION)
             message = BOARD_USER_SAFE_MODE_ACTION;
             #elif defined(CIRCUITPY_BOOT_BUTTON)
             message = translate("The BOOT button was pressed at start up.\n");
             #endif
-            if (message != NULL) {
-                // Output a user safe mode string if it's set.
-                serial_write_compressed(message);
-                message = translate("To exit, please reset the board without requesting safe mode.");
-                // The final piece is printed below.
-            }
+            #if defined(BOARD_USER_SAFE_MODE_ACTION) || defined(CIRCUITPY_BOOT_BUTTON)
+            // Output a user safe mode string if it's set.
+            serial_write_compressed(message);
+            message = translate("To exit, please reset the board without requesting safe mode.");
+            // The final piece is printed below.
+            #endif
             break;
         case MANUAL_SAFE_MODE:
             message = translate("You pressed the reset button during boot. Press again to exit safe mode.");

From 1d1cb1fe36d006a7dfe1d0749dff5edcd03fbb67 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sun, 30 Oct 2022 11:24:25 +0100
Subject: [PATCH 1304/2403] 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             |  88 ++++++++++++++----------------
 locale/cs.po             |  80 ++++++++++++----------------
 locale/de_DE.po          | 106 +++++++++++++++++++-----------------
 locale/el.po             |  80 ++++++++++++----------------
 locale/en_GB.po          |  97 ++++++++++++++++-----------------
 locale/es.po             |  97 ++++++++++++++++-----------------
 locale/fil.po            |  88 ++++++++++++++----------------
 locale/fr.po             | 106 +++++++++++++++++++-----------------
 locale/hi.po             |  80 ++++++++++++----------------
 locale/it_IT.po          |  88 ++++++++++++++----------------
 locale/ja.po             |  80 ++++++++++++----------------
 locale/ko.po             |  80 ++++++++++++----------------
 locale/nl.po             |  94 ++++++++++++++++----------------
 locale/pl.po             |  88 ++++++++++++++----------------
 locale/pt_BR.po          | 112 ++++++++++++++++++++++-----------------
 locale/ru.po             |  80 ++++++++++++----------------
 locale/sv.po             | 112 ++++++++++++++++++++++-----------------
 locale/tr.po             |  80 ++++++++++++----------------
 locale/zh_Latn_pinyin.po | 106 +++++++++++++++++++-----------------
 19 files changed, 837 insertions(+), 905 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 5947e6698d..6741923b7d 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -591,6 +591,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Kedua pin harus mendukung hardware interrut"
@@ -656,6 +663,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Pin bus %d sudah digunakan"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer harus 16 byte."
@@ -2004,18 +2016,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr "Waktu baca suhu habis"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2076,8 +2108,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Untuk keluar, silahkan reset board tanpa "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2376,10 +2408,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Anda mengajukan untuk memulai mode aman pada (safe mode) pada "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() harus mengembalikan None"
@@ -3847,48 +3875,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
@@ -4409,6 +4395,12 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "To exit, please reset the board without "
+#~ msgstr "Untuk keluar, silahkan reset board tanpa "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Anda mengajukan untuk memulai mode aman pada (safe mode) pada "
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Aliran tidak menemukan metode readinto() atau write()."
 
diff --git a/locale/cs.po b/locale/cs.po
index d1db5450f2..9159489fe5 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -592,6 +592,13 @@ msgstr "Bootovací zařízení musí být první (rozhraní #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "RX a TX jsou vyžadovány pro kontrolu toku"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Oba piny musí podporovat hardwarové přerušení"
@@ -657,6 +664,11 @@ msgstr "Buffery musí mít stejnou velikost"
 msgid "Bus pin %d is already in use"
 msgstr "Sběrnicový pin %d je již používán"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bajtový buffer musí být 16 bajtů."
@@ -1993,18 +2005,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2065,7 +2097,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2363,10 +2395,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3833,48 +3861,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index b5f9d29836..bb53013fac 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -595,6 +595,13 @@ msgstr "Boot-Gerät muss erstes Gerät sein (interface #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "Sowohl RX als auch TX sind zu Flusssteuerung erforderlich"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Beide Pins müssen Hardware-Interrupts unterstützen"
@@ -660,6 +667,11 @@ msgstr "Buffers müssen gleiche Größe haben"
 msgid "Bus pin %d is already in use"
 msgstr "Bus-Pin %d wird schon benutzt"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Der Puffer muss 16 Bytes lang sein."
@@ -2018,6 +2030,10 @@ msgstr "Systemeintrag muss auf gnss.SatelliteSystem lauten"
 msgid "Temperature read timed out"
 msgstr "Zeitüberschreitung beim Auslesen der Temperatur"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2026,6 +2042,14 @@ msgstr ""
 "Der Heap von CircuitPython wurde beschädigt, weil der Stack zu klein war.\n"
 "Vergrößern Sie den Stack, wenn Sie wissen, wie. Wenn nicht:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2034,6 +2058,14 @@ msgstr ""
 "Das Modul `microcontroller` wurde zum Booten in den abgesicherten Modus "
 "verwendet. Drücken Sie Reset, um den abgesicherten Modus zu verlassen."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Die Länge von rgb_pins muss 6, 12, 18, 24 oder 30 betragen"
@@ -2103,8 +2135,8 @@ msgstr ""
 "Zeitbeschränkung ist zu groß: Maximale Zeitbeschränkung ist %d Sekunden"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Zum beenden, resette bitte das board ohne "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2417,10 +2449,6 @@ msgstr ""
 "Du hast beim Booten die Reset-Taste gedrückt. Drücke sie erneut, um den "
 "abgesicherten Modus zu beenden."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Du hast das Starten im abgesicherten Modus ausgelöst durch "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() sollte None zurückgeben"
@@ -3914,48 +3942,6 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() mit 3 Argumenten erfordert Integer"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr "BOOT Taste wird beim Starten gedrückt.\n"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr "SW38 Taste wird beim Starten gedrückt.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr "VOLUME Taste wird beim Starten gedrückt.\n"
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "Drücken der Boot-Taste beim Start.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "Drücken Sie beim Start beide Tasten.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "Drücken der linken Taste beim Einschalten\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "Pull-Masken kollidieren mit Richtungsmasken"
@@ -4479,6 +4465,30 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "To exit, please reset the board without "
+#~ msgstr "Zum beenden, resette bitte das board ohne "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Du hast das Starten im abgesicherten Modus ausgelöst durch "
+
+#~ msgid "pressing BOOT button at start up.\n"
+#~ msgstr "BOOT Taste wird beim Starten gedrückt.\n"
+
+#~ msgid "pressing SW38 button at start up.\n"
+#~ msgstr "SW38 Taste wird beim Starten gedrückt.\n"
+
+#~ msgid "pressing VOLUME button at start up.\n"
+#~ msgstr "VOLUME Taste wird beim Starten gedrückt.\n"
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "Drücken der Boot-Taste beim Start.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "Drücken Sie beim Start beide Tasten.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "Drücken der linken Taste beim Einschalten\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
 
diff --git a/locale/el.po b/locale/el.po
index 202fcaf4c5..59e69f257f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -598,6 +598,13 @@ msgstr "Η συσκευή boot πρέπει να είναι η πρώτη συσ
 msgid "Both RX and TX required for flow control"
 msgstr "Και RX και TX απαιτούνται για έλεγχο flow"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Και τα δύο pin πρέπει να υποστηρίζουν interrupts υλικού"
@@ -663,6 +670,11 @@ msgstr "Τα Buffers πρέπει να είναι του ιδίου μεγέθο
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d είναι ήδη σε χρήση"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer πρέπει να είναι 16 bytes."
@@ -2002,18 +2014,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2074,7 +2106,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2372,10 +2404,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3842,48 +3870,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 6be6e327f5..7b111a211a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -595,6 +595,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "Both RX and TX required for flow control"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Both pins must support hardware interrupts"
@@ -660,6 +667,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d is already in use"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer must be 16 bytes."
@@ -1999,6 +2011,10 @@ msgstr "System entry must be gnss.SatelliteSystem"
 msgid "Temperature read timed out"
 msgstr "Temperature read timed out"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2007,6 +2023,14 @@ msgstr ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2015,6 +2039,14 @@ msgstr ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2078,8 +2110,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Timeout is too long: Maximum timeout length is %d seconds"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2379,10 +2411,6 @@ msgid ""
 msgstr ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "You requested starting safe mode by "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() should return None"
@@ -3852,48 +3880,6 @@ msgstr "pow() 3rd argument cannot be 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() with 3 arguments requires integers"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "pressing boot button at start up.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "pressing both buttons at start up.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "pressing the left button at start up\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "pull masks conflict with direction masks"
@@ -4414,6 +4400,21 @@ 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 "To exit, please reset the board without "
+#~ msgstr "To exit, please reset the board without "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "You requested starting safe mode by "
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "pressing boot button at start up.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "pressing both buttons at start up.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "pressing the left button at start up\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Only one TouchAlarm can be set in deep sleep."
 
diff --git a/locale/es.po b/locale/es.po
index 0251226112..5f3837732f 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -599,6 +599,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "Ambos RX y TX requeridos para control de flujo"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ambos pines deben soportar interrupciones por hardware"
@@ -665,6 +672,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d ya está siendo utilizado"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Búfer Byte debe de ser 16 bytes."
@@ -2028,6 +2040,10 @@ msgstr "La entrada del sistema debe ser gnss.SatelliteSystem"
 msgid "Temperature read timed out"
 msgstr "Lectura de temperatura expirada"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2036,6 +2052,14 @@ msgstr ""
 "El montículo de CircuitPython está corrupto porque la pila era muy pequeña.\n"
 "Aumente el tamaño de pila si sabe como. De lo contrario:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2044,6 +2068,14 @@ msgstr ""
 "El módulo de `microcontroller` se usó para un arranque en modo seguro. "
 "Presione reset para salir del modo seguro."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
@@ -2110,8 +2142,8 @@ msgstr ""
 "segundos"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Para salir, por favor reinicia la tarjeta sin "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2415,10 +2447,6 @@ msgstr ""
 "Has presionado el botón de reset durante el arranque. Presiones de nuevo "
 "para salir del modo seguro."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Solicitaste iniciar en modo seguro por "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() deberia devolver None"
@@ -3899,48 +3927,6 @@ msgstr "el 3er argumento de pow() no puede ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argumentos requiere enteros"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "presionando botón de arranque al inicio.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "presionando ambos botones al inicio.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "presione el botón izquierdo al arranque\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "máscara de pull en conflicto con máscara de dirección"
@@ -4462,6 +4448,21 @@ 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 "To exit, please reset the board without "
+#~ msgstr "Para salir, por favor reinicia la tarjeta sin "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Solicitaste iniciar en modo seguro por "
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "presionando botón de arranque al inicio.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "presionando ambos botones al inicio.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "presione el botón izquierdo al arranque\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
 
diff --git a/locale/fil.po b/locale/fil.po
index 390ced89ac..9391a5f697 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -588,6 +588,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ang parehong mga pin ay dapat na sumusuporta sa hardware interrupts"
@@ -653,6 +660,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Ginagamit na ang DAC"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 #, fuzzy
 msgid "Byte buffer must be 16 bytes."
@@ -1992,18 +2004,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2064,8 +2096,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Para lumabas, paki-reset ang board na wala ang "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2364,10 +2396,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Ikaw ang humiling sa safe mode sa pamamagitan ng "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() dapat magbalik na None"
@@ -3852,48 +3880,6 @@ msgstr "pow() 3rd argument ay hindi maaring 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() na may 3 argumento kailangan ng integers"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
@@ -4416,6 +4402,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "To exit, please reset the board without "
+#~ msgstr "Para lumabas, paki-reset ang board na wala ang "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Ikaw ang humiling sa safe mode sa pamamagitan ng "
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Stream kulang ng readinto() o write() method."
 
diff --git a/locale/fr.po b/locale/fr.po
index 302afa03ae..9eb7bba7bd 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -601,6 +601,13 @@ msgstr "L'appareil de démarrage doit être le premier (interface #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "RX et TX requis pour le contrôle de flux"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Les deux broches doivent supporter les interruptions matérielles"
@@ -666,6 +673,11 @@ msgstr "Les tampons doivent avoir la même taille"
 msgid "Bus pin %d is already in use"
 msgstr "La broche %d du bus est déjà utilisée"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Le tampon doit être de 16 octets."
@@ -2048,6 +2060,10 @@ msgstr "L'entrée du système doit être gnss.SatelliteSystem"
 msgid "Temperature read timed out"
 msgstr "Délais de lecture de température dépassée"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2056,6 +2072,14 @@ msgstr ""
 "La pile de CircuitPython est corrompue parce que la pile était trop petite.\n"
 "Augmentez la taille de la pile si vous savez comment. Sinon :"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2064,6 +2088,14 @@ msgstr ""
 "Le module `microcontroller` a été utilisé pour démarrer en mode sûr. Pressez "
 "reset pour quitter le mode sûr."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "La taille de rgb_pins doit être 6, 12, 18, 24 ou 30"
@@ -2131,8 +2163,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Le délai est trop long : le délai maximal est de %d secondes"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Pour quitter, SVP redémarrez la carte sans "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2446,10 +2478,6 @@ msgstr ""
 "Vous avez pressé le bouton reset pendant le démarrage. Pressez-le à nouveau "
 "pour sortir du mode sûr."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Vous avez demandé à démarrer en mode sans-échec par "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() doit retourner None"
@@ -3941,48 +3969,6 @@ msgstr "le 3e argument de pow() ne peut être 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() avec 3 arguments nécessite des entiers"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr "presser le bouton BOOT au démarrage.\n"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr "presser le bouton SW38 au démarrage.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr "presser le bouton VOLUME au démarrage.\n"
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "bouton boot appuyé lors du démarrage.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "les deux boutons appuyés lors du démarrage.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "appuyer le bouton de gauche au démarage\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "masque pull est en conflit avec les masques de direction"
@@ -4504,6 +4490,30 @@ 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 "To exit, please reset the board without "
+#~ msgstr "Pour quitter, SVP redémarrez la carte sans "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Vous avez demandé à démarrer en mode sans-échec par "
+
+#~ msgid "pressing BOOT button at start up.\n"
+#~ msgstr "presser le bouton BOOT au démarrage.\n"
+
+#~ msgid "pressing SW38 button at start up.\n"
+#~ msgstr "presser le bouton SW38 au démarrage.\n"
+
+#~ msgid "pressing VOLUME button at start up.\n"
+#~ msgstr "presser le bouton VOLUME au démarrage.\n"
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "bouton boot appuyé lors du démarrage.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "les deux boutons appuyés lors du démarrage.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "appuyer le bouton de gauche au démarage\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Seulement une TouchAlarm peu être réglée en sommeil profond."
 
diff --git a/locale/hi.po b/locale/hi.po
index 78f93241b7..cde333382b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -583,6 +583,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -648,6 +655,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""
@@ -1975,18 +1987,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2047,7 +2079,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2345,10 +2377,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3815,48 +3843,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index bdfd83f211..dc688a83a9 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -595,6 +595,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "Sia RX che TX richiedono il controllo del flow"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Entrambi i pin devono supportare gli interrupt hardware"
@@ -660,6 +667,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d è già in uso"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "I buffer byte devono essere di almeno 16 bytes."
@@ -2002,18 +2014,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2074,8 +2106,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Per uscire resettare la scheda senza "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2374,10 +2406,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "È stato richiesto l'avvio in modalità sicura da "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() deve ritornare None"
@@ -3865,48 +3893,6 @@ msgstr "il terzo argomento di pow() non può essere 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() con 3 argomenti richiede interi"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
@@ -4429,6 +4415,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "To exit, please reset the board without "
+#~ msgstr "Per uscire resettare la scheda senza "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "È stato richiesto l'avvio in modalità sicura da "
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Metodi mancanti readinto() o write() allo stream."
 
diff --git a/locale/ja.po b/locale/ja.po
index 1b66c38ea9..3d3b5ef16c 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -590,6 +590,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "フロー制御のためRXとTXの両方が必要"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "両方のピンにハードウェア割り込み対応が必要"
@@ -655,6 +662,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Busピン%dはすでに使用中"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "バッファは16バイトでなければなりません"
@@ -1988,18 +2000,38 @@ msgstr "system引数はgnss.SatelliteSystemでなければなりません"
 msgid "Temperature read timed out"
 msgstr "温度読み取りがタイムアウトしました"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2060,7 +2092,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "タイムアウトが長すぎです。最大のタイムアウト長は%d秒"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2359,10 +2391,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3836,48 +3864,6 @@ msgstr "pow()の3つ目の引数は0にできません"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow()の第3引数には整数が必要"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 9bca1c348b..88c8b4d3c6 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -586,6 +586,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -651,6 +658,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "잘못된 크기의 버퍼. 16 바이트 여야합니다."
@@ -1978,18 +1990,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2050,7 +2082,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2349,10 +2381,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3819,48 +3847,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 9c39c1a68a..69747fb971 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -588,6 +588,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "RX en TX zijn beide vereist voor stroomregeling"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Beide pinnen moeten hardware interrupts ondersteunen"
@@ -653,6 +660,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d al in gebruik"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer moet 16 bytes zijn."
@@ -1999,18 +2011,38 @@ msgstr "Systeem invoer moet gnss.SatelliteSystem zijn"
 msgid "Temperature read timed out"
 msgstr "Temperatuur lees time-out"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "De lengte van rgb_pins moet 6, 12, 18, 24 of 30 zijn"
@@ -2071,8 +2103,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Time-out is te lang. Maximale time-out lengte is %d seconden"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Om te beëindigen, reset het bord zonder "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2375,10 +2407,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Je hebt aangeven de veilige modus te starten door "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() zou None moeten retourneren"
@@ -3852,48 +3880,6 @@ msgstr "derde argument van pow() mag geen 0 zijn"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() met 3 argumenten vereist integers"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "druk bootknop in bij opstarten.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "druk beide knoppen in bij opstarten.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
@@ -4414,6 +4400,18 @@ 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 "To exit, please reset the board without "
+#~ msgstr "Om te beëindigen, reset het bord zonder "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Je hebt aangeven de veilige modus te starten door "
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "druk bootknop in bij opstarten.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "druk beide knoppen in bij opstarten.\n"
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Firmware image is ongeldig"
 
diff --git a/locale/pl.po b/locale/pl.po
index dd91cd66fd..200a3eda99 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -590,6 +590,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "Do kontroli przepływu wymagane są zarówno RX, jak i TX"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Obie nóżki muszą wspierać przerwania sprzętowe"
@@ -655,6 +662,11 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Nóżka magistrali %d jest w użyciu"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bufor musi mieć 16 bajtów."
@@ -1986,18 +1998,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2058,8 +2090,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "By wyjść, proszę zresetować płytkę bez "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2356,10 +2388,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Zażądano trybu bezpieczeństwa przez "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() powinien zwracać None"
@@ -3828,48 +3856,6 @@ msgstr "trzeci argument pow() nie może być 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "trzyargumentowe pow() wymaga liczb całkowitych"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
@@ -4390,6 +4376,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "To exit, please reset the board without "
+#~ msgstr "By wyjść, proszę zresetować płytkę bez "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Zażądano trybu bezpieczeństwa przez "
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "Strumień nie ma metod readinto() lub write()."
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 3f50364a68..9aea2605f2 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -603,6 +603,13 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr "Ambos os RX e TX são necessários para o controle do fluxo"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ambos os pinos devem suportar interrupções de hardware"
@@ -668,6 +675,11 @@ msgstr "Os buffers devem ter o mesmo tamanho"
 msgid "Bus pin %d is already in use"
 msgstr "O pino bus %d já está em uso"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "O buffer deve ter 16 bytes."
@@ -2031,6 +2043,10 @@ msgstr "A entrada no sistema deve ser gnss.SatelliteSystem"
 msgid "Temperature read timed out"
 msgstr "A leitura da temperatura expirou"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2040,6 +2056,14 @@ msgstr ""
 "corrompido pois a pilha era muito pequena.\n"
 "Aumente o tamanho da pilha se souber como. Senão:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2048,6 +2072,14 @@ msgstr ""
 "O módulo `microcontrolador` foi utilizado para iniciar em modo seguro. "
 "Pressione reset para encerrar do modo de segurança."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "O comprimento dos rgb_pins devem ser 6, 12, 18, 24, ou 30"
@@ -2116,8 +2148,8 @@ msgstr ""
 "segundos"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Para sair, por favor, reinicie a placa sem "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2428,10 +2460,6 @@ msgstr ""
 "Você pressionou o botão reset durante a inicialização. Pressione-o novamente "
 "para sair do modo de segurança."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Você solicitou o início do modo de segurança através do "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "O __init__() deve retornar Nenhum"
@@ -3920,48 +3948,6 @@ msgstr "O terceiro argumento pow() não pode ser 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "o pow() com 3 argumentos requer números inteiros"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr "pressionando o botão BOOT na inicialização.\n"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr "pressionando o botão SW38 na inicialização.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr "pressionando o botão VOLUME na inicialização.\n"
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "pressionando o botão de boot na inicialização.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "pressionando ambos os botões durante a inicialização.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr "pressionando o botão central na inicialização.\n"
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr "pressionando o botão A na inicialização.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "pressionando o botão esquerdo durante a inicialização\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "puxe as máscaras em conflito com as máscaras de direção"
@@ -4482,6 +4468,36 @@ 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 "To exit, please reset the board without "
+#~ msgstr "Para sair, por favor, reinicie a placa sem "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Você solicitou o início do modo de segurança através do "
+
+#~ msgid "pressing BOOT button at start up.\n"
+#~ msgstr "pressionando o botão BOOT na inicialização.\n"
+
+#~ msgid "pressing SW38 button at start up.\n"
+#~ msgstr "pressionando o botão SW38 na inicialização.\n"
+
+#~ msgid "pressing VOLUME button at start up.\n"
+#~ msgstr "pressionando o botão VOLUME na inicialização.\n"
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "pressionando o botão de boot na inicialização.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "pressionando ambos os botões durante a inicialização.\n"
+
+#~ msgid "pressing central button at start up.\n"
+#~ msgstr "pressionando o botão central na inicialização.\n"
+
+#~ msgid "pressing button A at start up.\n"
+#~ msgstr "pressionando o botão A na inicialização.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "pressionando o botão esquerdo durante a inicialização\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
 
diff --git a/locale/ru.po b/locale/ru.po
index 8a3dcef040..cb9f3616ec 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -597,6 +597,13 @@ msgstr "Загрузочное устройство должно быть пер
 msgid "Both RX and TX required for flow control"
 msgstr "Для управления потоком требуется как RX, так и TX"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Оба пина должны поддерживать аппаратные прерывания"
@@ -662,6 +669,11 @@ msgstr "Буферы должны быть одинакового размера
 msgid "Bus pin %d is already in use"
 msgstr "Пин шины %d уже используется"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Буфер байтов должен быть размером 16 байтам."
@@ -2022,18 +2034,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Длина rgb_pins должна быть 6, 12, 18, 24 или 30"
@@ -2096,7 +2128,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2394,10 +2426,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3864,48 +3892,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index ae47e52f1f..b1737876f1 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -595,6 +595,13 @@ msgstr "Startenheten måste vara den första enheten (gränssnitt #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "Både RX och TX krävs för handskakning"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Båda pinnarna måste stödja maskinvaruavbrott"
@@ -660,6 +667,11 @@ msgstr "Buffertarna måste ha samma storlek"
 msgid "Bus pin %d is already in use"
 msgstr "Busspinne %d används redan"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte-buffert måste vara 16 byte."
@@ -2010,6 +2022,10 @@ msgstr "Systeminträdet måste vara gnss. SatellitSystem"
 msgid "Temperature read timed out"
 msgstr "Temperaturavläsning tog för lång tid"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2018,6 +2034,14 @@ msgstr ""
 "CircuitPython-heapen blev korrupt eftersom stacken är för liten.\n"
 "Öka stackstorleken om du vet hur, eller om inte:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2026,6 +2050,14 @@ msgstr ""
 "Modulen `microcontroller` användes för att starta upp i felsäkert läge. "
 "Tryck på reset för att avsluta felsäkert läget."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Längden på rgb_pins vara 6, 12, 18, 24 eller 30"
@@ -2092,8 +2124,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Åtgärden tog för lång tid: Max väntetid är %d sekunder"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "För att avsluta, gör reset på kortet utan "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2400,10 +2432,6 @@ msgstr ""
 "Du tryckte på resetknappen under uppstarten. Tryck igen för att avsluta "
 "felsäkert läge."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Du begärt att starta i felsäkert läge genom att "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() ska returnera None"
@@ -3881,48 +3909,6 @@ msgstr "pow() 3: e argument kan inte vara 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() med 3 argument kräver heltal"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr "genom att trycka på BOOT-knappen vid start.\n"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr "genom att trycka på SW38-knappen vid start.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr "genom att trycka på VOLUME-knappen vid start.\n"
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "genom att trycka på startknappen vid start.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "genom att trycka båda knapparna vid uppstart.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr "trycka på mittknappen vid start.\n"
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr "genom att tryck på knappen A vid start.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "genom att håll ner vänster knapp vid start\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "pull-mask är i konflikt med riktnings-mask"
@@ -4443,6 +4429,36 @@ 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 "To exit, please reset the board without "
+#~ msgstr "För att avsluta, gör reset på kortet utan "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Du begärt att starta i felsäkert läge genom att "
+
+#~ msgid "pressing BOOT button at start up.\n"
+#~ msgstr "genom att trycka på BOOT-knappen vid start.\n"
+
+#~ msgid "pressing SW38 button at start up.\n"
+#~ msgstr "genom att trycka på SW38-knappen vid start.\n"
+
+#~ msgid "pressing VOLUME button at start up.\n"
+#~ msgstr "genom att trycka på VOLUME-knappen vid start.\n"
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "genom att trycka på startknappen vid start.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "genom att trycka båda knapparna vid uppstart.\n"
+
+#~ msgid "pressing central button at start up.\n"
+#~ msgstr "trycka på mittknappen vid start.\n"
+
+#~ msgid "pressing button A at start up.\n"
+#~ msgstr "genom att tryck på knappen A vid start.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "genom att håll ner vänster knapp vid start\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
 
diff --git a/locale/tr.po b/locale/tr.po
index ee72e1b336..ae8844521d 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -599,6 +599,13 @@ msgstr "Önyükleme cihazı ilk cihaz olmalı (arayüz #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "Hem RX hem de TX akış kontrolü için gerekli"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -664,6 +671,11 @@ msgstr "Arabellek boyutları aynı olmalı"
 msgid "Bus pin %d is already in use"
 msgstr "Veriyolu pini %d kullanımda"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bit buffer'ı 16bit olmalı."
@@ -1995,18 +2007,38 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2067,7 +2099,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
+msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2365,10 +2397,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr ""
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
@@ -3835,48 +3863,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index b713d93d40..6cf446c792 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -596,6 +596,13 @@ msgstr "yǐndǎo shèbèi bìxū shì dìyī tái shèbèi (interface #0)."
 msgid "Both RX and TX required for flow control"
 msgstr "RX hé TX dōu xū yào liúliàng kòngzhì"
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "Both buttons were pressed at start up.\n"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "liǎnggè yǐnjiǎo dōu bìxū zhīchí yìngjiàn zhōngduàn"
@@ -661,6 +668,11 @@ msgstr "huǎnchōng qū bìxū dàxiǎo xiāngtóng"
 msgid "Bus pin %d is already in use"
 msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng"
 
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+msgid "Button A was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Zìjié huǎnchōng qū bìxū shì 16 zìjié."
@@ -2014,6 +2026,10 @@ msgstr "Xìtǒng tiáomù bìxū shì gnss.SatelliteSystem"
 msgid "Temperature read timed out"
 msgstr "Wēndù dòu qǔ chāoshí"
 
+#: supervisor/shared/safe_mode.c
+msgid "The BOOT button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
@@ -2022,6 +2038,14 @@ 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:"
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "The SW38 button was pressed at start up.\n"
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "The VOLUME button was pressed at start up.\n"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2030,6 +2054,14 @@ msgstr ""
 "`wēi kòng zhì qì` mó kuài yòng yú qǐ dòng dào ān quán mó shì. àn chóng zhì "
 "tuì chū ān quán mó shì."
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "The left button was pressed at start up.\n"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Rgb_pins de chángdù bìxū wèi 6,12,18,24 huò 30"
@@ -2095,8 +2127,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Chāoshí shíjiān tài zhǎng: Zuìdà chāoshí shíjiān wèi%d miǎo"
 
 #: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr "Yào tuìchū, qǐng chóng zhì bǎnkuài ér bùyòng "
+msgid "To exit, please reset the board without requesting safe mode."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2403,10 +2435,6 @@ msgstr ""
 "zài qǐ dòng guò chéng zhōng, nín àn xià le chóng zhì àn niǔ. zài cì àn xià "
 "yǐ tuì chū ān quán mó shì."
 
-#: supervisor/shared/safe_mode.c
-msgid "You requested starting safe mode by "
-msgstr "Nín qǐngqiú qǐdòng ānquán móshì "
-
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() fǎnhuí not"
@@ -3880,48 +3908,6 @@ msgstr "pow() 3 cān shǔ bùnéng wéi 0"
 msgid "pow() with 3 arguments requires integers"
 msgstr "pow() yǒu 3 cānshù xūyào zhěngshù"
 
-#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
-msgid "pressing BOOT button at start up.\n"
-msgstr "zài qǐdòng shí àn BOOT ànniǔ.\n"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "pressing SW38 button at start up.\n"
-msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "pressing VOLUME button at start up.\n"
-msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
-
-#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
-#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
-#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
-#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
-#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
-#: supervisor/shared/safe_mode.c
-msgid "pressing boot button at start up.\n"
-msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
-
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "pressing both buttons at start up.\n"
-msgstr "zài qǐdòng shí tóngshí àn xià liǎng gè ànniǔ.\n"
-
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "pressing central button at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-msgid "pressing button A at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "pressing the left button at start up\n"
-msgstr "qǐ dòng shí àn xià zuǒ àn niǔ\n"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr "lā kǒu zhào yǔ fāng xiàng miàn mó chōng tū"
@@ -4445,6 +4431,30 @@ 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 "To exit, please reset the board without "
+#~ msgstr "Yào tuìchū, qǐng chóng zhì bǎnkuài ér bùyòng "
+
+#~ msgid "You requested starting safe mode by "
+#~ msgstr "Nín qǐngqiú qǐdòng ānquán móshì "
+
+#~ msgid "pressing BOOT button at start up.\n"
+#~ msgstr "zài qǐdòng shí àn BOOT ànniǔ.\n"
+
+#~ msgid "pressing SW38 button at start up.\n"
+#~ msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
+
+#~ msgid "pressing VOLUME button at start up.\n"
+#~ msgstr "zài qǐdòng shí àn SW38 ànniǔ.\n"
+
+#~ msgid "pressing boot button at start up.\n"
+#~ msgstr "Zài qǐdòng shí àn qǐdòng ànniǔ.\n"
+
+#~ msgid "pressing both buttons at start up.\n"
+#~ msgstr "zài qǐdòng shí tóngshí àn xià liǎng gè ànniǔ.\n"
+
+#~ msgid "pressing the left button at start up\n"
+#~ msgstr "qǐ dòng shí àn xià zuǒ àn niǔ\n"
+
 #~ msgid "Only one TouchAlarm can be set in deep sleep."
 #~ msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mián."
 

From 468709abcc4960bd69c6b2dc86fa9ac07fb3d92a Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Sun, 30 Oct 2022 18:51:46 +0100
Subject: [PATCH 1305/2403] Update pins.c

Hopefully last change nefore merge.
---
 ports/espressif/boards/maker_badge/pins.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/boards/maker_badge/pins.c b/ports/espressif/boards/maker_badge/pins.c
index abecb7fef3..f97eed60d5 100644
--- a/ports/espressif/boards/maker_badge/pins.c
+++ b/ports/espressif/boards/maker_badge/pins.c
@@ -7,7 +7,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_CAP5), MP_ROM_PTR(&pin_GPIO1) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_CAP4), MP_ROM_PTR(&pin_GPIO2) },
 
@@ -19,19 +19,19 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_CAP1), MP_ROM_PTR(&pin_GPIO5) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO6) },
 
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
@@ -58,7 +58,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
 
     { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
 
     { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
@@ -73,11 +73,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
 
     { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },

From 01ea436b5cf9d2c000bbc41bc704aa7c3ea96d1b Mon Sep 17 00:00:00 2001
From: test 
Date: Sun, 30 Oct 2022 21:16:36 +0000
Subject: [PATCH 1306/2403] Add translate file

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

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 768daa8651..ac6dd92211 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3843,6 +3843,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/maker_badge/mpconfigboard.h
+msgid "pressing boot button at start up.\n"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""

From 5a2d1ef49f6d4b8f69af8e959d82efecbd0cd228 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sun, 30 Oct 2022 12:27:19 +0000
Subject: [PATCH 1307/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index b1737876f1..598843479c 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: 2022-10-29 22:00+0000\n"
+"PO-Revision-Date: 2022-10-31 13:02+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -600,7 +600,7 @@ msgstr "Både RX och TX krävs för handskakning"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Båda knapparna trycktes ned vid start.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -670,7 +670,7 @@ msgstr "Busspinne %d används redan"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Knapp A trycktes ned vid start.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -2024,7 +2024,7 @@ msgstr "Temperaturavläsning tog för lång tid"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "BOOT-knappen trycktes ner vid start.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2036,11 +2036,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "SW38-knappen trycktes ned vid start.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "VOLUME-knappen trycktes ned vid start.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2052,11 +2052,11 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "Mittknappen trycktes in vid start.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "Den vänstra knappen trycktes ned vid start.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2125,7 +2125,7 @@ msgstr "Åtgärden tog för lång tid: Max väntetid är %d sekunder"
 
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
+msgstr "För att avsluta, återställ kortet utan att begära säkert läge."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"

From 3601bd1fb35d71215e350e2aa8750625245b872e Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Mon, 31 Oct 2022 21:38:54 +0100
Subject: [PATCH 1308/2403] Delete frozen/Adafruit_CircuitPython_SSD1680
 directory

---
 .../adafruit_circuitpython_pr.md              |  13 -
 .../.github/workflows/build.yml               |  77 ----
 .../.github/workflows/failure-help-text.yml   |  19 -
 .../.github/workflows/release.yml             |  88 ----
 .../Adafruit_CircuitPython_SSD1680/.gitignore |  47 --
 .../.pre-commit-config.yaml                   |  42 --
 .../Adafruit_CircuitPython_SSD1680/.pylintrc  | 436 ------------------
 .../.readthedocs.yaml                         |  19 -
 .../CODE_OF_CONDUCT.md                        | 137 ------
 frozen/Adafruit_CircuitPython_SSD1680/LICENSE |  21 -
 .../LICENSES/CC-BY-4.0.txt                    | 324 -------------
 .../LICENSES/MIT.txt                          |  19 -
 .../LICENSES/Unlicense.txt                    |  20 -
 .../Adafruit_CircuitPython_SSD1680/README.rst | 138 ------
 .../README.rst.license                        |   3 -
 .../adafruit_ssd1680.py                       | 100 ----
 .../docs/_static/favicon.ico                  | Bin 4414 -> 0 bytes
 .../docs/_static/favicon.ico.license          |   3 -
 .../docs/api.rst                              |   8 -
 .../docs/api.rst.license                      |   4 -
 .../docs/conf.py                              | 194 --------
 .../docs/examples.rst                         |   8 -
 .../docs/examples.rst.license                 |   4 -
 .../docs/index.rst                            |  50 --
 .../docs/index.rst.license                    |   4 -
 .../docs/requirements.txt                     |   5 -
 .../examples/display-ruler.bmp                | Bin 360122 -> 0 bytes
 .../examples/display-ruler.bmp.license        |   2 -
 .../examples/ssd1680_simpletest.py            |  60 ---
 .../optional_requirements.txt                 |   3 -
 .../pyproject.toml                            |  47 --
 .../requirements.txt                          |   5 -
 32 files changed, 1900 deletions(-)
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.gitignore
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSE
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/README.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/api.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/api.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/conf.py
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/examples.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/examples.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
 delete mode 100644 frozen/Adafruit_CircuitPython_SSD1680/requirements.txt

diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md b/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
deleted file mode 100644
index 8de294e68a..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-Thank you for contributing! Before you submit a pull request, please read the following.
-
-Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://docs.circuitpython.org/en/latest/docs/design_guide.html
-
-If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs
-
-Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code
-
-Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
deleted file mode 100644
index cb2f60e36a..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/build.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Build CI
-
-on: [pull_request, push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-    - name: Versions
-      run: |
-        python3 --version
-    - name: Checkout Current Repo
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Checkout tools repo
-      uses: actions/checkout@v2
-      with:
-        repository: adafruit/actions-ci-circuitpython-libs
-        path: actions-ci
-    - name: Install dependencies
-      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
-      run: |
-        source actions-ci/install.sh
-    - name: Pip install Sphinx, pre-commit
-      run: |
-        pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
-    - name: Library version
-      run: git describe --dirty --always --tags
-    - name: Setup problem matchers
-      uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
-    - name: Pre-commit hooks
-      run: |
-        pre-commit run --all-files
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
-    - name: Archive bundles
-      uses: actions/upload-artifact@v2
-      with:
-        name: bundles
-        path: ${{ github.workspace }}/bundles/
-    - name: Build docs
-      working-directory: docs
-      run: sphinx-build -E -W -b html . _build/html
-    - name: Check For pyproject.toml
-      id: need-pypi
-      run: |
-        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
-    - name: Build Python package
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      run: |
-        pip install --upgrade build twine
-        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
-            sed -i -e "s/0.0.0+auto.0/1.2.3/" $file;
-        done;
-        python -m build
-        twine check dist/*
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
deleted file mode 100644
index 0b1194f0cd..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/failure-help-text.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Failure help text
-
-on:
-  workflow_run:
-    workflows: ["Build CI"]
-    types:
-      - completed
-
-jobs:
-  post-help:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
-    steps:
-    - name: Post comment to help
-      uses: adafruit/circuitpython-action-library-ci-failed@v1
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml b/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
deleted file mode 100644
index f3a0325ba3..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.github/workflows/release.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Release Actions
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  upload-release-assets:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-    - name: Versions
-      run: |
-        python3 --version
-    - name: Checkout Current Repo
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Checkout tools repo
-      uses: actions/checkout@v2
-      with:
-        repository: adafruit/actions-ci-circuitpython-libs
-        path: actions-ci
-    - name: Install deps
-      run: |
-        source actions-ci/install.sh
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
-    - name: Upload Release Assets
-      # the 'official' actions version does not yet support dynamically
-      # supplying asset names to upload. @csexton's version chosen based on
-      # discussion in the issue below, as its the simplest to implement and
-      # allows for selecting files with a pattern.
-      # https://github.com/actions/upload-release-asset/issues/4
-      #uses: actions/upload-release-asset@v1.0.1
-      uses: csexton/release-asset-action@master
-      with:
-        pattern: "bundles/*"
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  upload-pypi:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Check For pyproject.toml
-      id: need-pypi
-      run: |
-        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
-    - name: Set up Python
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade build twine
-    - name: Build and publish
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      env:
-        TWINE_USERNAME: ${{ secrets.pypi_username }}
-        TWINE_PASSWORD: ${{ secrets.pypi_password }}
-      run: |
-        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
-            sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file;
-        done;
-        python -m build
-        twine upload dist/*
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.gitignore b/frozen/Adafruit_CircuitPython_SSD1680/.gitignore
deleted file mode 100644
index 544ec4a695..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.gitignore
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-# Do not include files and directories created by your personal work environment, such as the IDE
-# you use, except for those already listed here. Pull requests including changes to this file will
-# not be accepted.
-
-# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
-# including building Sphinx, testing with pip, and creating a virual environment, as well as the
-# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.
-
-# If you find that there are files being generated on your machine that should not be included in
-# your git commit, you should create a .gitignore_global file on your computer to include the
-# files created by your personal setup. To do so, follow the two steps below.
-
-# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
-# the files you want to exclude from git commits.
-
-# Second, configure Git to use the exclude file for all Git repositories by running the
-# following via commandline, replacing "path/to/your/" with the actual path to your newly created
-# .gitignore_global file:
-# git config --global core.excludesfile path/to/your/.gitignore_global
-
-# CircuitPython-specific files
-*.mpy
-
-# Python-specific files
-__pycache__
-*.pyc
-
-# Sphinx build-specific files
-_build
-
-# This file results from running `pip -e install .` in a local repository
-*.egg-info
-
-# Virtual environment-specific files
-.env
-
-# MacOS-specific files
-*.DS_Store
-
-# IDE-specific files
-.idea
-.vscode
-*~
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml b/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
deleted file mode 100644
index 3343606412..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.pre-commit-config.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
-#
-# SPDX-License-Identifier: Unlicense
-
-repos:
-  - repo: https://github.com/python/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-  - repo: https://github.com/fsfe/reuse-tool
-    rev: v0.14.0
-    hooks:
-      - id: reuse
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
-    hooks:
-      - id: check-yaml
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/pycqa/pylint
-    rev: v2.11.1
-    hooks:
-      - id: pylint
-        name: pylint (library code)
-        types: [python]
-        args:
-          - --disable=consider-using-f-string
-        exclude: "^(docs/|examples/|tests/|setup.py$)"
-      - id: pylint
-        name: pylint (example code)
-        description: Run pylint rules on "examples/*.py" files
-        types: [python]
-        files: "^examples/"
-        args:
-          - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
-      - id: pylint
-        name: pylint (test code)
-        description: Run pylint rules on "tests/*.py" files
-        types: [python]
-        files: "^tests/"
-        args:
-          - --disable=missing-docstring,consider-using-f-string,duplicate-code
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc b/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
deleted file mode 100644
index 1f42e5de32..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.pylintrc
+++ /dev/null
@@ -1,436 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-[MASTER]
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
-# Add files or directories to the ignore-list. They should be base names, not
-# paths.
-ignore=CVS
-
-# Add files or directories matching the regex patterns to the ignore-list. The
-# regex matches against base names, not paths.
-ignore-patterns=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Use multiple processes to speed up Pylint.
-jobs=1
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# Specify a configuration file.
-#rcfile=
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
-disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement,unspecified-encoding
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-enable=
-
-
-[REPORTS]
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-# Set the output format. Available formats are text, parseable, colorized, json
-# and msvs (visual studio).You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Activate the evaluation score.
-score=yes
-
-
-[REFACTORING]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
-
-
-[SPELLING]
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-# notes=FIXME,XXX,TODO
-notes=FIXME,XXX
-
-
-[TYPECHECK]
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# This flag controls whether pylint should warn about no-member and similar
-# checks whenever an opaque object is returned when inferring. The inference
-# can return multiple potential results while evaluating a Python object, but
-# some branches might not be evaluated, which results in partial inference. In
-# that case, it might be useful to still emit no-member and other checks for
-# the rest of the inferred objects.
-ignore-on-opaque-inference=yes
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=board
-
-# Show a hint with possible names when a member name was not found. The aspect
-# of finding the hint is based on edit distance.
-missing-member-hint=yes
-
-# The minimum edit distance a name should have in order to be considered a
-# similar match for a missing member name.
-missing-member-hint-distance=1
-
-# The total number of similar names that should be taken in consideration when
-# showing a hint for a missing member.
-missing-member-max-choices=1
-
-
-[VARIABLES]
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# Tells whether unused global variables should be treated as a violation.
-allow-global-unused-variables=yes
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*|^ignored_|^unused_
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,future.builtins
-
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-# expected-line-ending-format=
-expected-line-ending-format=LF
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )??$
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
-
-# Allow the body of a class to be on the same line as the declaration if body
-# contains single statement.
-single-line-class-stmt=no
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-
-[SIMILARITIES]
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=yes
-
-# Minimum lines number of a similarity.
-min-similarity-lines=12
-
-
-[BASIC]
-
-# Naming hint for argument names
-argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct argument names
-argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Naming hint for attribute names
-attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct attribute names
-attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Naming hint for class names
-# class-name-hint=[A-Z_][a-zA-Z0-9]+$
-class-name-hint=[A-Z_][a-zA-Z0-9_]+$
-
-# Regular expression matching correct class names
-# class-rgx=[A-Z_][a-zA-Z0-9]+$
-class-rgx=[A-Z_][a-zA-Z0-9_]+$
-
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-# Naming hint for function names
-function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct function names
-function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Good variable names which should always be accepted, separated by a comma
-# good-names=i,j,k,ex,Run,_
-good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Naming hint for method names
-method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct method names
-method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty
-
-# Naming hint for variable names
-variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct variable names
-variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-
-[IMPORTS]
-
-# Allow wildcard imports from modules that define __all__.
-allow-wildcard-with-all=no
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=optparse,tkinter.tix
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,_fields,_replace,_source,_make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of attributes for a class (see R0902).
-# max-attributes=7
-max-attributes=11
-
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=1
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml b/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
deleted file mode 100644
index 33c2a6108e..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/.readthedocs.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-build:
-  os: ubuntu-20.04
-  tools:
-    python: "3"
-
-python:
-  install:
-    - requirements: docs/requirements.txt
-    - requirements: requirements.txt
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md b/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
deleted file mode 100644
index d885b3605a..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,137 +0,0 @@
-
-# Adafruit Community Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and leaders pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level or type of
-experience, education, socio-economic status, nationality, personal appearance,
-race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-We are committed to providing a friendly, safe and welcoming environment for
-all.
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Be kind and courteous to others
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Collaborating with other community members
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and sexual attention or advances
-* The use of inappropriate images, including in a community member's avatar
-* The use of inappropriate language, including in a community member's nickname
-* Any spamming, flaming, baiting or other attention-stealing behavior
-* Excessive or unwelcome helping; answering outside the scope of the question
-  asked
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Promoting or spreading disinformation, lies, or conspiracy theories against
-  a person, group, organisation, project, or community
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate
-
-The goal of the standards and moderation guidelines outlined here is to build
-and maintain a respectful community. We ask that you don’t just aim to be
-"technically unimpeachable", but rather try to be your best self.
-
-We value many things beyond technical expertise, including collaboration and
-supporting others within our community. Providing a positive experience for
-other community members can have a much more significant impact than simply
-providing the correct answer.
-
-## Our Responsibilities
-
-Project leaders are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project leaders have the right and responsibility to remove, edit, or
-reject messages, comments, commits, code, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any community member for other behaviors that they deem
-inappropriate, threatening, offensive, or harmful.
-
-## Moderation
-
-Instances of behaviors that violate the Adafruit Community Code of Conduct
-may be reported by any member of the community. Community members are
-encouraged to report these situations, including situations they witness
-involving other community members.
-
-You may report in the following ways:
-
-In any situation, you may send an email to .
-
-On the Adafruit Discord, you may send an open message from any channel
-to all Community Moderators by tagging @community moderators. You may
-also send an open message from any channel, or a direct message to
-@kattni#1507, @tannewt#4653, @danh#1614, @cater#2442,
-@sommersoft#0222, @Mr. Certainly#0472 or @Andon#8175.
-
-Email and direct message reports will be kept confidential.
-
-In situations on Discord where the issue is particularly egregious, possibly
-illegal, requires immediate action, or violates the Discord terms of service,
-you should also report the message directly to Discord.
-
-These are the steps for upholding our community’s standards of conduct.
-
-1. Any member of the community may report any situation that violates the
-Adafruit Community Code of Conduct. All reports will be reviewed and
-investigated.
-2. If the behavior is an egregious violation, the community member who
-committed the violation may be banned immediately, without warning.
-3. Otherwise, moderators will first respond to such behavior with a warning.
-4. Moderators follow a soft "three strikes" policy - the community member may
-be given another chance, if they are receptive to the warning and change their
-behavior.
-5. If the community member is unreceptive or unreasonable when warned by a
-moderator, or the warning goes unheeded, they may be banned for a first or
-second offense. Repeated offenses will result in the community member being
-banned.
-
-## Scope
-
-This Code of Conduct and the enforcement policies listed above apply to all
-Adafruit Community venues. This includes but is not limited to any community
-spaces (both public and private), the entire Adafruit Discord server, and
-Adafruit GitHub repositories. Examples of Adafruit Community spaces include
-but are not limited to meet-ups, audio chats on the Adafruit Discord, or
-interaction at a conference.
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. As a community
-member, you are representing our community, and are expected to behave
-accordingly.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant],
-version 1.4, available at
-,
-and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).
-
-For other projects adopting the Adafruit Community Code of
-Conduct, please contact the maintainers of those projects for enforcement.
-If you wish to use this code of conduct for your own project, consider
-explicitly mentioning your moderation policy or making a copy with your
-own moderation policy so as to avoid confusion.
-
-[Contributor Covenant]: https://www.contributor-covenant.org
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSE b/frozen/Adafruit_CircuitPython_SSD1680/LICENSE
deleted file mode 100644
index 88160406de..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Melissa LeBlanc-Williams 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.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
deleted file mode 100644
index 3f92dfc5fd..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/CC-BY-4.0.txt
+++ /dev/null
@@ -1,324 +0,0 @@
-Creative Commons Attribution 4.0 International Creative Commons Corporation
-("Creative Commons") is not a law firm and does not provide legal services
-or legal advice. Distribution of Creative Commons public licenses does not
-create a lawyer-client or other relationship. Creative Commons makes its licenses
-and related information available on an "as-is" basis. Creative Commons gives
-no warranties regarding its licenses, any material licensed under their terms
-and conditions, or any related information. Creative Commons disclaims all
-liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions
-that creators and other rights holders may use to share original works of
-authorship and other material subject to copyright and certain other rights
-specified in the public license below. The following considerations are for
-informational purposes only, are not exhaustive, and do not form part of our
-licenses.
-
-Considerations for licensors: Our public licenses are intended for use by
-those authorized to give the public permission to use material in ways otherwise
-restricted by copyright and certain other rights. Our licenses are irrevocable.
-Licensors should read and understand the terms and conditions of the license
-they choose before applying it. Licensors should also secure all rights necessary
-before applying our licenses so that the public can reuse the material as
-expected. Licensors should clearly mark any material not subject to the license.
-This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
-
-Considerations for the public: By using one of our public licenses, a licensor
-grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
-reason–for example, because of any applicable exception or limitation to copyright–then
-that use is not regulated by the license. Our licenses grant only permissions
-under copyright and certain other rights that a licensor has authority to
-grant. Use of the licensed material may still be restricted for other reasons,
-including because others have copyright or other rights in the material. A
-licensor may make special requests, such as asking that all changes be marked
-or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution
-4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to
-be bound by the terms and conditions of this Creative Commons Attribution
-4.0 International Public License ("Public License"). To the extent this Public
-License may be interpreted as a contract, You are granted the Licensed Rights
-in consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the Licensor
-receives from making the Licensed Material available under these terms and
-conditions.
-
-Section 1 – Definitions.
-
-a. Adapted Material means material subject to Copyright and Similar Rights
-that is derived from or based upon the Licensed Material and in which the
-Licensed Material is translated, altered, arranged, transformed, or otherwise
-modified in a manner requiring permission under the Copyright and Similar
-Rights held by the Licensor. For purposes of this Public License, where the
-Licensed Material is a musical work, performance, or sound recording, Adapted
-Material is always produced where the Licensed Material is synched in timed
-relation with a moving image.
-
-b. Adapter's License means the license You apply to Your Copyright and Similar
-Rights in Your contributions to Adapted Material in accordance with the terms
-and conditions of this Public License.
-
-c. Copyright and Similar Rights means copyright and/or similar rights closely
-related to copyright including, without limitation, performance, broadcast,
-sound recording, and Sui Generis Database Rights, without regard to how the
-rights are labeled or categorized. For purposes of this Public License, the
-rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-
-d. Effective Technological Measures means those measures that, in the absence
-of proper authority, may not be circumvented under laws fulfilling obligations
-under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
-and/or similar international agreements.
-
-e. Exceptions and Limitations means fair use, fair dealing, and/or any other
-exception or limitation to Copyright and Similar Rights that applies to Your
-use of the Licensed Material.
-
-f. Licensed Material means the artistic or literary work, database, or other
-material to which the Licensor applied this Public License.
-
-g. Licensed Rights means the rights granted to You subject to the terms and
-conditions of this Public License, which are limited to all Copyright and
-Similar Rights that apply to Your use of the Licensed Material and that the
-Licensor has authority to license.
-
-h. Licensor means the individual(s) or entity(ies) granting rights under this
-Public License.
-
-i. Share means to provide material to the public by any means or process that
-requires permission under the Licensed Rights, such as reproduction, public
-display, public performance, distribution, dissemination, communication, or
-importation, and to make material available to the public including in ways
-that members of the public may access the material from a place and at a time
-individually chosen by them.
-
-j. Sui Generis Database Rights means rights other than copyright resulting
-from Directive 96/9/EC of the European Parliament and of the Council of 11
-March 1996 on the legal protection of databases, as amended and/or succeeded,
-as well as other essentially equivalent rights anywhere in the world.
-
-k. You means the individual or entity exercising the Licensed Rights under
-this Public License. Your has a corresponding meaning.
-
-Section 2 – Scope.
-
-   a. License grant.
-
-1. Subject to the terms and conditions of this Public License, the Licensor
-hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
-irrevocable license to exercise the Licensed Rights in the Licensed Material
-to:
-
-         A. reproduce and Share the Licensed Material, in whole or in part; and
-
-         B. produce, reproduce, and Share Adapted Material.
-
-2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
-and Limitations apply to Your use, this Public License does not apply, and
-You do not need to comply with its terms and conditions.
-
-      3. Term. The term of this Public License is specified in Section 6(a).
-
-4. Media and formats; technical modifications allowed. The Licensor authorizes
-You to exercise the Licensed Rights in all media and formats whether now known
-or hereafter created, and to make technical modifications necessary to do
-so. The Licensor waives and/or agrees not to assert any right or authority
-to forbid You from making technical modifications necessary to exercise the
-Licensed Rights, including technical modifications necessary to circumvent
-Effective Technological Measures. For purposes of this Public License, simply
-making modifications authorized by this Section 2(a)(4) never produces Adapted
-Material.
-
-      5. Downstream recipients.
-
-A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
-Material automatically receives an offer from the Licensor to exercise the
-Licensed Rights under the terms and conditions of this Public License.
-
-B. No downstream restrictions. You may not offer or impose any additional
-or different terms or conditions on, or apply any Effective Technological
-Measures to, the Licensed Material if doing so restricts exercise of the Licensed
-Rights by any recipient of the Licensed Material.
-
-6. No endorsement. Nothing in this Public License constitutes or may be construed
-as permission to assert or imply that You are, or that Your use of the Licensed
-Material is, connected with, or sponsored, endorsed, or granted official status
-by, the Licensor or others designated to receive attribution as provided in
-Section 3(a)(1)(A)(i).
-
-   b. Other rights.
-
-1. Moral rights, such as the right of integrity, are not licensed under this
-Public License, nor are publicity, privacy, and/or other similar personality
-rights; however, to the extent possible, the Licensor waives and/or agrees
-not to assert any such rights held by the Licensor to the limited extent necessary
-to allow You to exercise the Licensed Rights, but not otherwise.
-
-2. Patent and trademark rights are not licensed under this Public License.
-
-3. To the extent possible, the Licensor waives any right to collect royalties
-from You for the exercise of the Licensed Rights, whether directly or through
-a collecting society under any voluntary or waivable statutory or compulsory
-licensing scheme. In all other cases the Licensor expressly reserves any right
-to collect such royalties.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following
-conditions.
-
-   a. Attribution.
-
-1. If You Share the Licensed Material (including in modified form), You must:
-
-A. retain the following if it is supplied by the Licensor with the Licensed
-Material:
-
-i. identification of the creator(s) of the Licensed Material and any others
-designated to receive attribution, in any reasonable manner requested by the
-Licensor (including by pseudonym if designated);
-
-            ii. a copyright notice;
-
-            iii. a notice that refers to this Public License;
-
-            iv. a notice that refers to the disclaimer of warranties;
-
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
-B. indicate if You modified the Licensed Material and retain an indication
-of any previous modifications; and
-
-C. indicate the Licensed Material is licensed under this Public License, and
-include the text of, or the URI or hyperlink to, this Public License.
-
-2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner
-based on the medium, means, and context in which You Share the Licensed Material.
-For example, it may be reasonable to satisfy the conditions by providing a
-URI or hyperlink to a resource that includes the required information.
-
-3. If requested by the Licensor, You must remove any of the information required
-by Section 3(a)(1)(A) to the extent reasonably practicable.
-
-4. If You Share Adapted Material You produce, the Adapter's License You apply
-must not prevent recipients of the Adapted Material from complying with this
-Public License.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to
-Your use of the Licensed Material:
-
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
-reuse, reproduce, and Share all or a substantial portion of the contents of
-the database;
-
-b. if You include all or a substantial portion of the database contents in
-a database in which You have Sui Generis Database Rights, then the database
-in which You have Sui Generis Database Rights (but not its individual contents)
-is Adapted Material; and
-
-c. You must comply with the conditions in Section 3(a) if You Share all or
-a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not replace
-Your obligations under this Public License where the Licensed Rights include
-other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
-the Licensor offers the Licensed Material as-is and as-available, and makes
-no representations or warranties of any kind concerning the Licensed Material,
-whether express, implied, statutory, or other. This includes, without limitation,
-warranties of title, merchantability, fitness for a particular purpose, non-infringement,
-absence of latent or other defects, accuracy, or the presence or absence of
-errors, whether or not known or discoverable. Where disclaimers of warranties
-are not allowed in full or in part, this disclaimer may not apply to You.
-
-b. To the extent possible, in no event will the Licensor be liable to You
-on any legal theory (including, without limitation, negligence) or otherwise
-for any direct, special, indirect, incidental, consequential, punitive, exemplary,
-or other losses, costs, expenses, or damages arising out of this Public License
-or use of the Licensed Material, even if the Licensor has been advised of
-the possibility of such losses, costs, expenses, or damages. Where a limitation
-of liability is not allowed in full or in part, this limitation may not apply
-to You.
-
-c. The disclaimer of warranties and limitation of liability provided above
-shall be interpreted in a manner that, to the extent possible, most closely
-approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
-a. This Public License applies for the term of the Copyright and Similar Rights
-licensed here. However, if You fail to comply with this Public License, then
-Your rights under this Public License terminate automatically.
-
-b. Where Your right to use the Licensed Material has terminated under Section
-6(a), it reinstates:
-
-1. automatically as of the date the violation is cured, provided it is cured
-within 30 days of Your discovery of the violation; or
-
-      2. upon express reinstatement by the Licensor.
-
-c. For the avoidance of doubt, this Section 6(b) does not affect any right
-the Licensor may have to seek remedies for Your violations of this Public
-License.
-
-d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
-under separate terms or conditions or stop distributing the Licensed Material
-at any time; however, doing so will not terminate this Public License.
-
-   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
-a. The Licensor shall not be bound by any additional or different terms or
-conditions communicated by You unless expressly agreed.
-
-b. Any arrangements, understandings, or agreements regarding the Licensed
-Material not stated herein are separate from and independent of the terms
-and conditions of this Public License.
-
-Section 8 – Interpretation.
-
-a. For the avoidance of doubt, this Public License does not, and shall not
-be interpreted to, reduce, limit, restrict, or impose conditions on any use
-of the Licensed Material that could lawfully be made without permission under
-this Public License.
-
-b. To the extent possible, if any provision of this Public License is deemed
-unenforceable, it shall be automatically reformed to the minimum extent necessary
-to make it enforceable. If the provision cannot be reformed, it shall be severed
-from this Public License without affecting the enforceability of the remaining
-terms and conditions.
-
-c. No term or condition of this Public License will be waived and no failure
-to comply consented to unless expressly agreed to by the Licensor.
-
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
-upon, or waiver of, any privileges and immunities that apply to the Licensor
-or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative
-Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
deleted file mode 100644
index 204b93da48..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/MIT.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-MIT License Copyright (c)  
-
-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 (including the next
-paragraph) 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/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt b/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
deleted file mode 100644
index 24a8f90199..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/LICENSES/Unlicense.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute
-this software, either in source code form or as a compiled binary, for any
-purpose, commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and
-to the detriment of our heirs and successors. We intend this dedication to
-be an overt act of relinquishment in perpetuity of all present and future
-rights to this software under copyright law.
-
-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
-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. For more information,
-please refer to 
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/README.rst b/frozen/Adafruit_CircuitPython_SSD1680/README.rst
deleted file mode 100644
index 0ff9a3382d..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/README.rst
+++ /dev/null
@@ -1,138 +0,0 @@
-Introduction
-============
-
-.. image:: https://readthedocs.org/projects/adafruit-circuitpython-ssd1680/badge/?version=latest
-    :target: https://docs.circuitpython.org/projects/ssd1680/en/latest/
-    :alt: Documentation Status
-
-
-.. image:: https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_Bundle/main/badges/adafruit_discord.svg
-    :target: https://adafru.it/discord
-    :alt: Discord
-
-
-.. image:: https://github.com/adafruit/Adafruit_CircuitPython_SSD1680/workflows/Build%20CI/badge.svg
-    :target: https://github.com/adafruit/Adafruit_CircuitPython_SSD1680/actions
-    :alt: Build Status
-
-
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code Style: Black
-
-CircuitPython `displayio` driver for SSD1680-based ePaper displays
-
-Dependencies
-=============
-This driver depends on:
-
-* `Adafruit CircuitPython `_
-
-Please ensure all dependencies are available on the CircuitPython filesystem.
-This is easily achieved by downloading
-`the Adafruit library and driver bundle `_
-or individual libraries can be installed using
-`circup `_.
-
-* Adafruit 2.13" 250x122 Tri-Color eInk / ePaper Display with SRAM - SSD1680 Driver
-
-`Purchase the Breakout from the Adafruit shop `_
-
-* Adafruit 2.13" HD Tri-Color eInk / ePaper Display FeatherWing - 250x122 RW Panel with SSD1680
-
-`Purchase the FeatherWing from the Adafruit shop `_
-
-Installing from PyPI
-=====================
-
-On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
-PyPI `_. To install for current user:
-
-.. code-block:: shell
-
-    pip3 install adafruit-circuitpython-ssd1680
-
-To install system-wide (this may be required in some cases):
-
-.. code-block:: shell
-
-    sudo pip3 install adafruit-circuitpython-ssd1680
-
-To install in a virtual environment in your current project:
-
-.. code-block:: shell
-
-    mkdir project-name && cd project-name
-    python3 -m venv .venv
-    source .venv/bin/activate
-    pip3 install adafruit-circuitpython-ssd1680
-
-Usage Example
-=============
-
-.. code-block:: python
-
-    import time
-    import board
-    import displayio
-    import adafruit_ssd1680
-
-    displayio.release_displays()
-
-    # This pinout works on a Metro M4 and may need to be altered for other boards.
-    spi = board.SPI()  # Uses SCK and MOSI
-    epd_cs = board.D9
-    epd_dc = board.D10
-    epd_reset = board.D8    # Set to None for FeatherWing
-    epd_busy = board.D7    # Set to None for FeatherWing
-
-    display_bus = displayio.FourWire(
-        spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
-    )
-    time.sleep(1)
-
-    display = adafruit_ssd1680.SSD1680(
-        display_bus,
-        width=250,
-        height=122,
-        busy_pin=epd_busy,
-        highlight_color=0xFF0000,
-        rotation=270,
-    )
-
-    g = displayio.Group()
-
-    # CircuitPython 6 & 7 compatible
-    f = open("/display-ruler.bmp", "rb")
-    pic = displayio.OnDiskBitmap(f)
-    t = displayio.TileGrid(
-        pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter())
-    )
-
-    # # CircuitPython 7 compatible only
-    # pic = displayio.OnDiskBitmap("/display-ruler.bmp")
-    # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
-
-    g.append(t)
-
-    display.show(g)
-
-    display.refresh()
-    print("refreshed")
-
-    time.sleep(120)
-
-
-Documentation
-=============
-
-API documentation for this library can be found on `Read the Docs `_.
-
-For information on building library documentation, please check out `this guide `_.
-
-Contributing
-============
-
-Contributions are welcome! Please read our `Code of Conduct
-`_
-before contributing to help this project stay welcoming.
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license b/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
deleted file mode 100644
index 87eb036957..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/README.rst.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py b/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
deleted file mode 100644
index 490725fed6..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/adafruit_ssd1680.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""
-`adafruit_ssd1680`
-================================================================================
-
-CircuitPython `displayio` driver for SSD1680-based ePaper displays
-
-
-* Author(s): Melissa LeBlanc-Williams
-
-Implementation Notes
---------------------
-
-**Hardware:**
-
-* `Adafruit 2.13" Tri-Color eInk Display Breakout `_
-* `Adafruit 2.13" Tri-Color eInk Display FeatherWing `_
-
-
-**Software and Dependencies:**
-
-* Adafruit CircuitPython firmware for the supported boards:
-  https://github.com/adafruit/circuitpython/releases
-
-"""
-
-import displayio
-
-__version__ = "0.0.0+auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1680.git"
-
-_START_SEQUENCE = (
-    b"\x12\x80\x14"  # soft reset and wait 20ms
-    b"\x11\x01\x03"  # Ram data entry mode
-    b"\x3C\x01\x05"  # border color
-    b"\x2c\x01\x36"  # Set vcom voltage
-    b"\x03\x01\x17"  # Set gate voltage
-    b"\x04\x03\x41\x00\x32"  # Set source voltage
-    b"\x4e\x01\x01"  # ram x count
-    b"\x4f\x02\x00\x00"  # ram y count
-    b"\x01\x03\x00\x00\x00"  # set display size
-    b"\x22\x01\xf4"  # display update mode
-)
-
-_STOP_SEQUENCE = b"\x10\x81\x01\x64"  # Deep Sleep
-# pylint: disable=too-few-public-methods
-class SSD1680(displayio.EPaperDisplay):
-    r"""SSD1680 driver
-
-    :param bus: The data bus the display is on
-    :param \**kwargs:
-        See below
-
-    :Keyword Arguments:
-        * *width* (``int``) --
-          Display width
-        * *height* (``int``) --
-          Display height
-        * *rotation* (``int``) --
-          Display rotation
-    """
-
-    def __init__(self, bus: displayio.Fourwire, **kwargs) -> None:
-        stop_sequence = bytearray(_STOP_SEQUENCE)
-        try:
-            bus.reset()
-        except RuntimeError:
-            # No reset pin defined, so no deep sleeping
-            stop_sequence = b""
-
-        start_sequence = bytearray(_START_SEQUENCE)
-        width = kwargs["width"]
-        height = kwargs["height"]
-        if "rotation" in kwargs and kwargs["rotation"] % 180 != 90:
-            width, height = height, width
-        start_sequence[29] = (width - 1) & 0xFF
-        start_sequence[30] = ((width - 1) >> 8) & 0xFF
-
-        super().__init__(
-            bus,
-            start_sequence,
-            stop_sequence,
-            **kwargs,
-            ram_width=250,
-            ram_height=296,
-            busy_state=True,
-            write_black_ram_command=0x24,
-            write_color_ram_command=0x26,
-            black_bits_inverted=False,
-            set_column_window_command=0x44,
-            set_row_window_command=0x45,
-            set_current_column_command=0x4E,
-            set_current_row_command=0x4F,
-            refresh_display_command=0x20,
-            colstart=1,
-            always_toggle_chip_select=True,
-        )
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico b/frozen/Adafruit_CircuitPython_SSD1680/docs/_static/favicon.ico
deleted file mode 100644
index 5aca98376a1f7e593ebd9cf41a808512c2135635..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4414
zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en
zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK
zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8
z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3
z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG
zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn
zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^>#
z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt
z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx
zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D
z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$
zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ
z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g
z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4
zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%%
z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH
zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI
zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2
z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y
zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV
zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv)
zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^
zXUM@xoV6yBFKfzvY20V&Lr0yC
-    Adafruit 2.13" HD Tri-Color eInk / ePaper Display FeatherWing 
-
-.. toctree::
-    :caption: Other Links
-
-    Download from GitHub 
-    Download Library Bundle 
-    CircuitPython Reference Documentation 
-    CircuitPython Support Forum 
-    Discord Chat 
-    Adafruit Learning System 
-    Adafruit Blog 
-    Adafruit Store 
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license b/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
deleted file mode 100644
index 52de478909..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/docs/index.rst.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-
-SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
deleted file mode 100644
index 88e67331eb..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/docs/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-sphinx>=4.0.0
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp b/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp
deleted file mode 100644
index 726b5e026fd30b7e5baf5c23323d159b0eb5f65d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360122
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
T`pMSbh(J1r2r{u6#p?e9C4JK7

diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license b/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
deleted file mode 100644
index a784acfa32..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/examples/display-ruler.bmp.license
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
-# SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py b/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
deleted file mode 100644
index 48a4d4d8bd..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/examples/ssd1680_simpletest.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-"""Simple test script for 2.13" 250x122 tri-color display.
-Supported products:
-  * Adafruit 2.13" Tri-Color eInk Display Breakout
-    * https://www.adafruit.com/product/4947
-  * Adafruit 2.13" Tri-Color eInk Display FeatherWing
-    * https://www.adafruit.com/product/4814
-"""
-
-import time
-import board
-import displayio
-import adafruit_ssd1680
-
-displayio.release_displays()
-
-# This pinout works on a Metro M4 and may need to be altered for other boards.
-spi = board.SPI()  # Uses SCK and MOSI
-epd_cs = board.D9
-epd_dc = board.D10
-epd_reset = board.D8  # Set to None for FeatherWing
-epd_busy = board.D7  # Set to None for FeatherWing
-
-display_bus = displayio.FourWire(
-    spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
-)
-time.sleep(1)
-
-display = adafruit_ssd1680.SSD1680(
-    display_bus,
-    width=250,
-    height=122,
-    busy_pin=epd_busy,
-    highlight_color=0xFF0000,
-    rotation=270,
-)
-
-g = displayio.Group()
-
-with open("/display-ruler.bmp", "rb") as f:
-    pic = displayio.OnDiskBitmap(f)
-    # CircuitPython 6 & 7 compatible
-    t = displayio.TileGrid(
-        pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter())
-    )
-    # CircuitPython 7 compatible only
-    # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
-    g.append(t)
-
-    display.show(g)
-
-    display.refresh()
-
-    print("refreshed")
-
-    time.sleep(120)
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
deleted file mode 100644
index d4e27c4d74..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/optional_requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml b/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
deleted file mode 100644
index b36b2d7afb..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/pyproject.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-[build-system]
-requires = [
-    "setuptools",
-    "wheel",
-    "setuptools-scm",
-]
-
-[project]
-name = "adafruit-circuitpython-ssd1680"
-description = "CircuitPython `displayio` drivers for SSD1680-based ePaper displays"
-version = "0.0.0+auto.0"
-readme = "README.rst"
-authors = [
-    {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}
-]
-urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1680"}
-keywords = [
-    "adafruit",
-    "blinka",
-    "circuitpython",
-    "micropython",
-    "ssd1680",
-    "displayio",
-    "epd",
-    "epaper",
-]
-license = {text = "MIT"}
-classifiers = [
-    "Intended Audience :: Developers",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Software Development :: Embedded Systems",
-    "Topic :: System :: Hardware",
-    "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3",
-]
-dynamic = ["dependencies", "optional-dependencies"]
-
-[tool.setuptools]
-py-modules = ["adafruit_ssd1680"]
-
-[tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
-optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}
diff --git a/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt b/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt
deleted file mode 100644
index 7a984a4739..0000000000
--- a/frozen/Adafruit_CircuitPython_SSD1680/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-Adafruit-Blinka

From 8c41eb900ea940f1348cfa0e982a00ddc829b48a Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Mon, 31 Oct 2022 21:39:12 +0100
Subject: [PATCH 1309/2403] Delete frozen/Adafruit_CircuitPython_UC8151D
 directory

---
 .../adafruit_circuitpython_pr.md              |  13 -
 .../.github/workflows/build.yml               |  77 ----
 .../.github/workflows/failure-help-text.yml   |  19 -
 .../.github/workflows/release.yml             |  88 ----
 .../Adafruit_CircuitPython_UC8151D/.gitignore |  47 --
 .../.pre-commit-config.yaml                   |  42 --
 .../Adafruit_CircuitPython_UC8151D/.pylintrc  | 436 ------------------
 .../.readthedocs.yaml                         |  19 -
 .../CODE_OF_CONDUCT.md                        | 141 ------
 frozen/Adafruit_CircuitPython_UC8151D/LICENSE |  21 -
 .../LICENSES/CC-BY-4.0.txt                    | 324 -------------
 .../LICENSES/MIT.txt                          |  19 -
 .../LICENSES/Unlicense.txt                    |  20 -
 .../Adafruit_CircuitPython_UC8151D/README.rst | 149 ------
 .../README.rst.license                        |   3 -
 .../adafruit_uc8151d.py                       | 132 ------
 .../docs/_static/favicon.ico                  | Bin 4414 -> 0 bytes
 .../docs/_static/favicon.ico.license          |   3 -
 .../docs/api.rst                              |   8 -
 .../docs/api.rst.license                      |   4 -
 .../docs/conf.py                              | 195 --------
 .../docs/examples.rst                         |   8 -
 .../docs/examples.rst.license                 |   4 -
 .../docs/index.rst                            |  51 --
 .../docs/index.rst.license                    |   4 -
 .../docs/requirements.txt                     |   5 -
 .../examples/display-ruler.bmp                | Bin 360122 -> 0 bytes
 .../examples/display-ruler.bmp.license        |   2 -
 .../examples/uc8151d_grayscale_test.py        |  68 ---
 .../examples/uc8151d_simpletest.py            |  48 --
 .../optional_requirements.txt                 |   3 -
 .../pyproject.toml                            |  50 --
 .../requirements.txt                          |   6 -
 33 files changed, 2009 deletions(-)
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.gitignore
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSE
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/README.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/api.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/api.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/conf.py
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/examples.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/examples.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
 delete mode 100644 frozen/Adafruit_CircuitPython_UC8151D/requirements.txt

diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md b/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
deleted file mode 100644
index 8de294e68a..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-Thank you for contributing! Before you submit a pull request, please read the following.
-
-Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://docs.circuitpython.org/en/latest/docs/design_guide.html
-
-If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs
-
-Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code
-
-Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
deleted file mode 100644
index cb2f60e36a..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/build.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Build CI
-
-on: [pull_request, push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-    - name: Versions
-      run: |
-        python3 --version
-    - name: Checkout Current Repo
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Checkout tools repo
-      uses: actions/checkout@v2
-      with:
-        repository: adafruit/actions-ci-circuitpython-libs
-        path: actions-ci
-    - name: Install dependencies
-      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
-      run: |
-        source actions-ci/install.sh
-    - name: Pip install Sphinx, pre-commit
-      run: |
-        pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
-    - name: Library version
-      run: git describe --dirty --always --tags
-    - name: Setup problem matchers
-      uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
-    - name: Pre-commit hooks
-      run: |
-        pre-commit run --all-files
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
-    - name: Archive bundles
-      uses: actions/upload-artifact@v2
-      with:
-        name: bundles
-        path: ${{ github.workspace }}/bundles/
-    - name: Build docs
-      working-directory: docs
-      run: sphinx-build -E -W -b html . _build/html
-    - name: Check For pyproject.toml
-      id: need-pypi
-      run: |
-        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
-    - name: Build Python package
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      run: |
-        pip install --upgrade build twine
-        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
-            sed -i -e "s/0.0.0+auto.0/1.2.3/" $file;
-        done;
-        python -m build
-        twine check dist/*
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
deleted file mode 100644
index 0b1194f0cd..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/failure-help-text.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Failure help text
-
-on:
-  workflow_run:
-    workflows: ["Build CI"]
-    types:
-      - completed
-
-jobs:
-  post-help:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
-    steps:
-    - name: Post comment to help
-      uses: adafruit/circuitpython-action-library-ci-failed@v1
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml b/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
deleted file mode 100644
index f3a0325ba3..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.github/workflows/release.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-name: Release Actions
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  upload-release-assets:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-    - name: Versions
-      run: |
-        python3 --version
-    - name: Checkout Current Repo
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Checkout tools repo
-      uses: actions/checkout@v2
-      with:
-        repository: adafruit/actions-ci-circuitpython-libs
-        path: actions-ci
-    - name: Install deps
-      run: |
-        source actions-ci/install.sh
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
-    - name: Upload Release Assets
-      # the 'official' actions version does not yet support dynamically
-      # supplying asset names to upload. @csexton's version chosen based on
-      # discussion in the issue below, as its the simplest to implement and
-      # allows for selecting files with a pattern.
-      # https://github.com/actions/upload-release-asset/issues/4
-      #uses: actions/upload-release-asset@v1.0.1
-      uses: csexton/release-asset-action@master
-      with:
-        pattern: "bundles/*"
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  upload-pypi:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Check For pyproject.toml
-      id: need-pypi
-      run: |
-        echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
-    - name: Set up Python
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade build twine
-    - name: Build and publish
-      if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
-      env:
-        TWINE_USERNAME: ${{ secrets.pypi_username }}
-        TWINE_PASSWORD: ${{ secrets.pypi_password }}
-      run: |
-        for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
-            sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file;
-        done;
-        python -m build
-        twine upload dist/*
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.gitignore b/frozen/Adafruit_CircuitPython_UC8151D/.gitignore
deleted file mode 100644
index 544ec4a695..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.gitignore
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-# Do not include files and directories created by your personal work environment, such as the IDE
-# you use, except for those already listed here. Pull requests including changes to this file will
-# not be accepted.
-
-# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
-# including building Sphinx, testing with pip, and creating a virual environment, as well as the
-# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.
-
-# If you find that there are files being generated on your machine that should not be included in
-# your git commit, you should create a .gitignore_global file on your computer to include the
-# files created by your personal setup. To do so, follow the two steps below.
-
-# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
-# the files you want to exclude from git commits.
-
-# Second, configure Git to use the exclude file for all Git repositories by running the
-# following via commandline, replacing "path/to/your/" with the actual path to your newly created
-# .gitignore_global file:
-# git config --global core.excludesfile path/to/your/.gitignore_global
-
-# CircuitPython-specific files
-*.mpy
-
-# Python-specific files
-__pycache__
-*.pyc
-
-# Sphinx build-specific files
-_build
-
-# This file results from running `pip -e install .` in a local repository
-*.egg-info
-
-# Virtual environment-specific files
-.env
-
-# MacOS-specific files
-*.DS_Store
-
-# IDE-specific files
-.idea
-.vscode
-*~
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml b/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
deleted file mode 100644
index 3343606412..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.pre-commit-config.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
-#
-# SPDX-License-Identifier: Unlicense
-
-repos:
-  - repo: https://github.com/python/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-  - repo: https://github.com/fsfe/reuse-tool
-    rev: v0.14.0
-    hooks:
-      - id: reuse
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
-    hooks:
-      - id: check-yaml
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/pycqa/pylint
-    rev: v2.11.1
-    hooks:
-      - id: pylint
-        name: pylint (library code)
-        types: [python]
-        args:
-          - --disable=consider-using-f-string
-        exclude: "^(docs/|examples/|tests/|setup.py$)"
-      - id: pylint
-        name: pylint (example code)
-        description: Run pylint rules on "examples/*.py" files
-        types: [python]
-        files: "^examples/"
-        args:
-          - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
-      - id: pylint
-        name: pylint (test code)
-        description: Run pylint rules on "tests/*.py" files
-        types: [python]
-        files: "^tests/"
-        args:
-          - --disable=missing-docstring,consider-using-f-string,duplicate-code
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc b/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
deleted file mode 100644
index 1f42e5de32..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.pylintrc
+++ /dev/null
@@ -1,436 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-[MASTER]
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
-# Add files or directories to the ignore-list. They should be base names, not
-# paths.
-ignore=CVS
-
-# Add files or directories matching the regex patterns to the ignore-list. The
-# regex matches against base names, not paths.
-ignore-patterns=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Use multiple processes to speed up Pylint.
-jobs=1
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# Specify a configuration file.
-#rcfile=
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
-disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement,unspecified-encoding
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-enable=
-
-
-[REPORTS]
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-# Set the output format. Available formats are text, parseable, colorized, json
-# and msvs (visual studio).You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Activate the evaluation score.
-score=yes
-
-
-[REFACTORING]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
-
-
-[SPELLING]
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-# notes=FIXME,XXX,TODO
-notes=FIXME,XXX
-
-
-[TYPECHECK]
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# This flag controls whether pylint should warn about no-member and similar
-# checks whenever an opaque object is returned when inferring. The inference
-# can return multiple potential results while evaluating a Python object, but
-# some branches might not be evaluated, which results in partial inference. In
-# that case, it might be useful to still emit no-member and other checks for
-# the rest of the inferred objects.
-ignore-on-opaque-inference=yes
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=board
-
-# Show a hint with possible names when a member name was not found. The aspect
-# of finding the hint is based on edit distance.
-missing-member-hint=yes
-
-# The minimum edit distance a name should have in order to be considered a
-# similar match for a missing member name.
-missing-member-hint-distance=1
-
-# The total number of similar names that should be taken in consideration when
-# showing a hint for a missing member.
-missing-member-max-choices=1
-
-
-[VARIABLES]
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# Tells whether unused global variables should be treated as a violation.
-allow-global-unused-variables=yes
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*|^ignored_|^unused_
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,future.builtins
-
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-# expected-line-ending-format=
-expected-line-ending-format=LF
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )??$
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
-
-# Allow the body of a class to be on the same line as the declaration if body
-# contains single statement.
-single-line-class-stmt=no
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-
-[SIMILARITIES]
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=yes
-
-# Minimum lines number of a similarity.
-min-similarity-lines=12
-
-
-[BASIC]
-
-# Naming hint for argument names
-argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct argument names
-argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Naming hint for attribute names
-attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct attribute names
-attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Naming hint for class names
-# class-name-hint=[A-Z_][a-zA-Z0-9]+$
-class-name-hint=[A-Z_][a-zA-Z0-9_]+$
-
-# Regular expression matching correct class names
-# class-rgx=[A-Z_][a-zA-Z0-9]+$
-class-rgx=[A-Z_][a-zA-Z0-9_]+$
-
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-# Naming hint for function names
-function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct function names
-function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Good variable names which should always be accepted, separated by a comma
-# good-names=i,j,k,ex,Run,_
-good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Naming hint for method names
-method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct method names
-method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty
-
-# Naming hint for variable names
-variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-# Regular expression matching correct variable names
-variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
-
-
-[IMPORTS]
-
-# Allow wildcard imports from modules that define __all__.
-allow-wildcard-with-all=no
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=optparse,tkinter.tix
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,_fields,_replace,_source,_make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of attributes for a class (see R0902).
-# max-attributes=7
-max-attributes=11
-
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=1
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml b/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
deleted file mode 100644
index 33c2a6108e..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/.readthedocs.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-build:
-  os: ubuntu-20.04
-  tools:
-    python: "3"
-
-python:
-  install:
-    - requirements: docs/requirements.txt
-    - requirements: requirements.txt
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md b/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
deleted file mode 100644
index 01a7515796..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,141 +0,0 @@
-
-# Adafruit Community Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and leaders pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level or type of
-experience, education, socio-economic status, nationality, personal appearance,
-race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-We are committed to providing a friendly, safe and welcoming environment for
-all.
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Be kind and courteous to others
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Collaborating with other community members
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and sexual attention or advances
-* The use of inappropriate images, including in a community member's avatar
-* The use of inappropriate language, including in a community member's nickname
-* Any spamming, flaming, baiting or other attention-stealing behavior
-* Excessive or unwelcome helping; answering outside the scope of the question
-  asked
-* Discussion or promotion of activities or projects that intend or pose a risk of
-  significant harm
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Promoting or spreading disinformation, lies, or conspiracy theories against
-  a person, group, organisation, project, or community
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate
-
-The goal of the standards and moderation guidelines outlined here is to build
-and maintain a respectful community. We ask that you don’t just aim to be
-"technically unimpeachable", but rather try to be your best self.
-
-We value many things beyond technical expertise, including collaboration and
-supporting others within our community. Providing a positive experience for
-other community members can have a much more significant impact than simply
-providing the correct answer.
-
-## Our Responsibilities
-
-Project leaders are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project leaders have the right and responsibility to remove, edit, or
-reject messages, comments, commits, code, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any community member for other behaviors that they deem
-inappropriate, threatening, offensive, or harmful.
-
-## Moderation
-
-Instances of behaviors that violate the Adafruit Community Code of Conduct
-may be reported by any member of the community. Community members are
-encouraged to report these situations, including situations they witness
-involving other community members.
-
-You may report in the following ways:
-
-In any situation, you may email .
-
-On the Adafruit Discord, you may send an open message from any channel
-to all Community Moderators by tagging @community moderators. You may
-also send an open message from any channel, or a direct message to
-any Community Moderator.
-
-Email and direct message reports will be kept confidential.
-
-In situations on Discord where the issue is particularly offensive, possibly
-illegal, requires immediate action, or violates the Discord terms of service,
-you should also report the message directly to [Discord](https://discord.com/safety).
-
-These are the steps for upholding our community’s standards of conduct.
-
-1. Any member of the community may report any situation that violates the
-   CircuitPython Community Code of Conduct. All reports will be reviewed and
-   investigated.
-2. If the behavior is a severe violation, the community member who
-   committed the violation may be banned immediately, without warning.
-3. Otherwise, moderators will first respond to such behavior with a warning.
-4. Moderators follow a soft "three strikes" policy - the community member may
-   be given another chance, if they are receptive to the warning and change their
-   behavior.
-5. If the community member is unreceptive or unreasonable when warned by a
-   moderator, or the warning goes unheeded, they may be banned for a first or
-   second offense. Repeated offenses will result in the community member being
-   banned.
-6. Disciplinary actions (warnings, bans, etc) for Code of Conduct violations apply
-   to the platform where the violation occurred. However, depending on the severity
-   of the violation, the disciplinary action may be applied across Adafruit's other
-   community platforms. For example, a severe violation on the Adafruit Discord
-   server may result in a ban on not only the Adafruit Discord server, but also on
-   the Adafruit GitHub organisation, Adafruit Forums, Adafruit Twitter, etc.
-
-## Scope
-
-This Code of Conduct and the enforcement policies listed above apply to all
-Adafruit Community venues. This includes but is not limited to any community
-spaces (both public and private), the entire Adafruit Discord server, and
-Adafruit GitHub repositories. Examples of Adafruit Community spaces include
-but are not limited to meet-ups, audio chats on the Adafruit Discord, or
-interaction at a conference.
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. As a community
-member, you are representing our community, and are expected to behave
-accordingly.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/),
-version 1.4, available on [contributor-covenant.org](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html),
-and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).
-
-For other projects adopting the Adafruit Community Code of
-Conduct, please contact the maintainers of those projects for enforcement.
-If you wish to use this code of conduct for your own project, consider
-explicitly mentioning your moderation policy or making a copy with your
-own moderation policy so as to avoid confusion.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSE b/frozen/Adafruit_CircuitPython_UC8151D/LICENSE
deleted file mode 100644
index 88160406de..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Melissa LeBlanc-Williams 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.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
deleted file mode 100644
index 3f92dfc5fd..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/CC-BY-4.0.txt
+++ /dev/null
@@ -1,324 +0,0 @@
-Creative Commons Attribution 4.0 International Creative Commons Corporation
-("Creative Commons") is not a law firm and does not provide legal services
-or legal advice. Distribution of Creative Commons public licenses does not
-create a lawyer-client or other relationship. Creative Commons makes its licenses
-and related information available on an "as-is" basis. Creative Commons gives
-no warranties regarding its licenses, any material licensed under their terms
-and conditions, or any related information. Creative Commons disclaims all
-liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions
-that creators and other rights holders may use to share original works of
-authorship and other material subject to copyright and certain other rights
-specified in the public license below. The following considerations are for
-informational purposes only, are not exhaustive, and do not form part of our
-licenses.
-
-Considerations for licensors: Our public licenses are intended for use by
-those authorized to give the public permission to use material in ways otherwise
-restricted by copyright and certain other rights. Our licenses are irrevocable.
-Licensors should read and understand the terms and conditions of the license
-they choose before applying it. Licensors should also secure all rights necessary
-before applying our licenses so that the public can reuse the material as
-expected. Licensors should clearly mark any material not subject to the license.
-This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
-
-Considerations for the public: By using one of our public licenses, a licensor
-grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
-reason–for example, because of any applicable exception or limitation to copyright–then
-that use is not regulated by the license. Our licenses grant only permissions
-under copyright and certain other rights that a licensor has authority to
-grant. Use of the licensed material may still be restricted for other reasons,
-including because others have copyright or other rights in the material. A
-licensor may make special requests, such as asking that all changes be marked
-or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution
-4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to
-be bound by the terms and conditions of this Creative Commons Attribution
-4.0 International Public License ("Public License"). To the extent this Public
-License may be interpreted as a contract, You are granted the Licensed Rights
-in consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the Licensor
-receives from making the Licensed Material available under these terms and
-conditions.
-
-Section 1 – Definitions.
-
-a. Adapted Material means material subject to Copyright and Similar Rights
-that is derived from or based upon the Licensed Material and in which the
-Licensed Material is translated, altered, arranged, transformed, or otherwise
-modified in a manner requiring permission under the Copyright and Similar
-Rights held by the Licensor. For purposes of this Public License, where the
-Licensed Material is a musical work, performance, or sound recording, Adapted
-Material is always produced where the Licensed Material is synched in timed
-relation with a moving image.
-
-b. Adapter's License means the license You apply to Your Copyright and Similar
-Rights in Your contributions to Adapted Material in accordance with the terms
-and conditions of this Public License.
-
-c. Copyright and Similar Rights means copyright and/or similar rights closely
-related to copyright including, without limitation, performance, broadcast,
-sound recording, and Sui Generis Database Rights, without regard to how the
-rights are labeled or categorized. For purposes of this Public License, the
-rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-
-d. Effective Technological Measures means those measures that, in the absence
-of proper authority, may not be circumvented under laws fulfilling obligations
-under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
-and/or similar international agreements.
-
-e. Exceptions and Limitations means fair use, fair dealing, and/or any other
-exception or limitation to Copyright and Similar Rights that applies to Your
-use of the Licensed Material.
-
-f. Licensed Material means the artistic or literary work, database, or other
-material to which the Licensor applied this Public License.
-
-g. Licensed Rights means the rights granted to You subject to the terms and
-conditions of this Public License, which are limited to all Copyright and
-Similar Rights that apply to Your use of the Licensed Material and that the
-Licensor has authority to license.
-
-h. Licensor means the individual(s) or entity(ies) granting rights under this
-Public License.
-
-i. Share means to provide material to the public by any means or process that
-requires permission under the Licensed Rights, such as reproduction, public
-display, public performance, distribution, dissemination, communication, or
-importation, and to make material available to the public including in ways
-that members of the public may access the material from a place and at a time
-individually chosen by them.
-
-j. Sui Generis Database Rights means rights other than copyright resulting
-from Directive 96/9/EC of the European Parliament and of the Council of 11
-March 1996 on the legal protection of databases, as amended and/or succeeded,
-as well as other essentially equivalent rights anywhere in the world.
-
-k. You means the individual or entity exercising the Licensed Rights under
-this Public License. Your has a corresponding meaning.
-
-Section 2 – Scope.
-
-   a. License grant.
-
-1. Subject to the terms and conditions of this Public License, the Licensor
-hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
-irrevocable license to exercise the Licensed Rights in the Licensed Material
-to:
-
-         A. reproduce and Share the Licensed Material, in whole or in part; and
-
-         B. produce, reproduce, and Share Adapted Material.
-
-2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
-and Limitations apply to Your use, this Public License does not apply, and
-You do not need to comply with its terms and conditions.
-
-      3. Term. The term of this Public License is specified in Section 6(a).
-
-4. Media and formats; technical modifications allowed. The Licensor authorizes
-You to exercise the Licensed Rights in all media and formats whether now known
-or hereafter created, and to make technical modifications necessary to do
-so. The Licensor waives and/or agrees not to assert any right or authority
-to forbid You from making technical modifications necessary to exercise the
-Licensed Rights, including technical modifications necessary to circumvent
-Effective Technological Measures. For purposes of this Public License, simply
-making modifications authorized by this Section 2(a)(4) never produces Adapted
-Material.
-
-      5. Downstream recipients.
-
-A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
-Material automatically receives an offer from the Licensor to exercise the
-Licensed Rights under the terms and conditions of this Public License.
-
-B. No downstream restrictions. You may not offer or impose any additional
-or different terms or conditions on, or apply any Effective Technological
-Measures to, the Licensed Material if doing so restricts exercise of the Licensed
-Rights by any recipient of the Licensed Material.
-
-6. No endorsement. Nothing in this Public License constitutes or may be construed
-as permission to assert or imply that You are, or that Your use of the Licensed
-Material is, connected with, or sponsored, endorsed, or granted official status
-by, the Licensor or others designated to receive attribution as provided in
-Section 3(a)(1)(A)(i).
-
-   b. Other rights.
-
-1. Moral rights, such as the right of integrity, are not licensed under this
-Public License, nor are publicity, privacy, and/or other similar personality
-rights; however, to the extent possible, the Licensor waives and/or agrees
-not to assert any such rights held by the Licensor to the limited extent necessary
-to allow You to exercise the Licensed Rights, but not otherwise.
-
-2. Patent and trademark rights are not licensed under this Public License.
-
-3. To the extent possible, the Licensor waives any right to collect royalties
-from You for the exercise of the Licensed Rights, whether directly or through
-a collecting society under any voluntary or waivable statutory or compulsory
-licensing scheme. In all other cases the Licensor expressly reserves any right
-to collect such royalties.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following
-conditions.
-
-   a. Attribution.
-
-1. If You Share the Licensed Material (including in modified form), You must:
-
-A. retain the following if it is supplied by the Licensor with the Licensed
-Material:
-
-i. identification of the creator(s) of the Licensed Material and any others
-designated to receive attribution, in any reasonable manner requested by the
-Licensor (including by pseudonym if designated);
-
-            ii. a copyright notice;
-
-            iii. a notice that refers to this Public License;
-
-            iv. a notice that refers to the disclaimer of warranties;
-
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
-B. indicate if You modified the Licensed Material and retain an indication
-of any previous modifications; and
-
-C. indicate the Licensed Material is licensed under this Public License, and
-include the text of, or the URI or hyperlink to, this Public License.
-
-2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner
-based on the medium, means, and context in which You Share the Licensed Material.
-For example, it may be reasonable to satisfy the conditions by providing a
-URI or hyperlink to a resource that includes the required information.
-
-3. If requested by the Licensor, You must remove any of the information required
-by Section 3(a)(1)(A) to the extent reasonably practicable.
-
-4. If You Share Adapted Material You produce, the Adapter's License You apply
-must not prevent recipients of the Adapted Material from complying with this
-Public License.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to
-Your use of the Licensed Material:
-
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
-reuse, reproduce, and Share all or a substantial portion of the contents of
-the database;
-
-b. if You include all or a substantial portion of the database contents in
-a database in which You have Sui Generis Database Rights, then the database
-in which You have Sui Generis Database Rights (but not its individual contents)
-is Adapted Material; and
-
-c. You must comply with the conditions in Section 3(a) if You Share all or
-a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not replace
-Your obligations under this Public License where the Licensed Rights include
-other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
-the Licensor offers the Licensed Material as-is and as-available, and makes
-no representations or warranties of any kind concerning the Licensed Material,
-whether express, implied, statutory, or other. This includes, without limitation,
-warranties of title, merchantability, fitness for a particular purpose, non-infringement,
-absence of latent or other defects, accuracy, or the presence or absence of
-errors, whether or not known or discoverable. Where disclaimers of warranties
-are not allowed in full or in part, this disclaimer may not apply to You.
-
-b. To the extent possible, in no event will the Licensor be liable to You
-on any legal theory (including, without limitation, negligence) or otherwise
-for any direct, special, indirect, incidental, consequential, punitive, exemplary,
-or other losses, costs, expenses, or damages arising out of this Public License
-or use of the Licensed Material, even if the Licensor has been advised of
-the possibility of such losses, costs, expenses, or damages. Where a limitation
-of liability is not allowed in full or in part, this limitation may not apply
-to You.
-
-c. The disclaimer of warranties and limitation of liability provided above
-shall be interpreted in a manner that, to the extent possible, most closely
-approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
-a. This Public License applies for the term of the Copyright and Similar Rights
-licensed here. However, if You fail to comply with this Public License, then
-Your rights under this Public License terminate automatically.
-
-b. Where Your right to use the Licensed Material has terminated under Section
-6(a), it reinstates:
-
-1. automatically as of the date the violation is cured, provided it is cured
-within 30 days of Your discovery of the violation; or
-
-      2. upon express reinstatement by the Licensor.
-
-c. For the avoidance of doubt, this Section 6(b) does not affect any right
-the Licensor may have to seek remedies for Your violations of this Public
-License.
-
-d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
-under separate terms or conditions or stop distributing the Licensed Material
-at any time; however, doing so will not terminate this Public License.
-
-   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
-a. The Licensor shall not be bound by any additional or different terms or
-conditions communicated by You unless expressly agreed.
-
-b. Any arrangements, understandings, or agreements regarding the Licensed
-Material not stated herein are separate from and independent of the terms
-and conditions of this Public License.
-
-Section 8 – Interpretation.
-
-a. For the avoidance of doubt, this Public License does not, and shall not
-be interpreted to, reduce, limit, restrict, or impose conditions on any use
-of the Licensed Material that could lawfully be made without permission under
-this Public License.
-
-b. To the extent possible, if any provision of this Public License is deemed
-unenforceable, it shall be automatically reformed to the minimum extent necessary
-to make it enforceable. If the provision cannot be reformed, it shall be severed
-from this Public License without affecting the enforceability of the remaining
-terms and conditions.
-
-c. No term or condition of this Public License will be waived and no failure
-to comply consented to unless expressly agreed to by the Licensor.
-
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
-upon, or waiver of, any privileges and immunities that apply to the Licensor
-or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative
-Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
deleted file mode 100644
index 204b93da48..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/MIT.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-MIT License Copyright (c)  
-
-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 (including the next
-paragraph) 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/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt b/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
deleted file mode 100644
index 24a8f90199..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/LICENSES/Unlicense.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute
-this software, either in source code form or as a compiled binary, for any
-purpose, commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and
-to the detriment of our heirs and successors. We intend this dedication to
-be an overt act of relinquishment in perpetuity of all present and future
-rights to this software under copyright law.
-
-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
-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. For more information,
-please refer to 
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/README.rst b/frozen/Adafruit_CircuitPython_UC8151D/README.rst
deleted file mode 100644
index 08efe2f99b..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/README.rst
+++ /dev/null
@@ -1,149 +0,0 @@
-Introduction
-============
-
-
-.. image:: https://readthedocs.org/projects/adafruit-circuitpython-uc8151d/badge/?version=latest
-    :target: https://docs.circuitpython.org/projects/uc8151d/en/latest/
-    :alt: Documentation Status
-
-
-.. image:: https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_Bundle/main/badges/adafruit_discord.svg
-    :target: https://adafru.it/discord
-    :alt: Discord
-
-
-.. image:: https://github.com/adafruit/Adafruit_CircuitPython_UC8151D/workflows/Build%20CI/badge.svg
-    :target: https://github.com/adafruit/Adafruit_CircuitPython_UC8151D/actions
-    :alt: Build Status
-
-
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code Style: Black
-
-CircuitPython `displayio` driver for US8151D-based ePaper displays
-
-
-Dependencies
-=============
-This driver depends on:
-
-* `Adafruit CircuitPython `_
-
-Please ensure all dependencies are available on the CircuitPython filesystem.
-This is easily achieved by downloading
-`the Adafruit library and driver bundle `_
-or individual libraries can be installed using
-`circup `_.
-
-Adafruit 2.9" Flexible 296x128 Monochrome eInk / ePaper Display
-
-`Purchase one from the Adafruit shop `_
-
-
-Installing from PyPI
-=====================
-
-On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
-PyPI `_.
-To install for current user:
-
-.. code-block:: shell
-
-    pip3 install adafruit-circuitpython-uc8151d
-
-To install system-wide (this may be required in some cases):
-
-.. code-block:: shell
-
-    sudo pip3 install adafruit-circuitpython-uc8151d
-
-To install in a virtual environment in your current project:
-
-.. code-block:: shell
-
-    mkdir project-name && cd project-name
-    python3 -m venv .venv
-    source .venv/bin/activate
-    pip3 install adafruit-circuitpython-uc8151d
-
-
-
-Installing to a Connected CircuitPython Device with Circup
-==========================================================
-
-Make sure that you have ``circup`` installed in your Python environment.
-Install it with the following command if necessary:
-
-.. code-block:: shell
-
-    pip3 install circup
-
-With ``circup`` installed and your CircuitPython device connected use the
-following command to install:
-
-.. code-block:: shell
-
-    circup install uc8151d
-
-Or the following command to update an existing version:
-
-.. code-block:: shell
-
-    circup update
-
-Usage Example
-=============
-
-.. code-block:: python
-
-    import time
-    import board
-    import displayio
-    import adafruit_uc8151d
-
-    displayio.release_displays()
-
-    # This pinout works on a Feather M4 and may need to be altered for other boards.
-    spi = board.SPI()  # Uses SCK and MOSI
-    epd_cs = board.D9
-    epd_dc = board.D10
-    epd_reset = board.D5
-    epd_busy = None
-
-    display_bus = displayio.FourWire(
-        spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
-    )
-    time.sleep(1)
-
-    display = adafruit_uc8151d.UC8151D(
-        display_bus, width=296, height=128, rotation=90, busy_pin=epd_busy
-    )
-
-    g = displayio.Group()
-
-    with open("/display-ruler.bmp", "rb") as f:
-        pic = displayio.OnDiskBitmap(f)
-        t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
-        g.append(t)
-
-        display.show(g)
-
-        display.refresh()
-
-        time.sleep(120)
-
-
-Documentation
-=============
-
-API documentation for this library can be found on `Read the Docs `_.
-
-For information on building library documentation, please check out `this guide `_.
-
-Contributing
-============
-
-Contributions are welcome! Please read our `Code of Conduct
-`_
-before contributing to help this project stay welcoming.
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license b/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
deleted file mode 100644
index 87eb036957..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/README.rst.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py b/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
deleted file mode 100644
index 1055d3d562..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/adafruit_uc8151d.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""
-`adafruit_uc8151d`
-================================================================================
-
-CircuitPython `displayio` driver for US8151D-based ePaper displays
-
-
-* Author(s): Melissa LeBlanc-Williams
-
-Implementation Notes
---------------------
-
-**Hardware:**
-
-* `Adafruit Flexible 2.9" Black and White `_
-
-**Software and Dependencies:**
-
-* Adafruit CircuitPython firmware for the supported boards:
-  https://github.com/adafruit/circuitpython/releases
-
-"""
-
-import displayio
-
-__version__ = "0.0.0+auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_UC8151D.git"
-
-_START_SEQUENCE = (
-    # b"\x01\x05\x03\x00\x2b\x2b\x09"  # power setting
-    # b"\x06\x03\x17\x17\x17"  # booster soft start
-    b"\x04\x80\xc8"  # power on and wait 10 ms
-    b"\x00\x01\x1f"  # panel setting. Further filled in below.
-    b"\x50\x01\x97"  # CDI setting
-)
-
-_GRAYSCALE_START_SEQUENCE = (
-    b"\x04\x80\xc8"  # Power on
-    b"\x00\x01\xbf"  # Panel setting
-    b"\x50\x01\x97"  # CDI setting
-    # Common voltage
-    b"\x20\x2a"
-    b"\x00\x0A\x00\x00\x00\x01"
-    b"\x60\x14\x14\x00\x00\x01"
-    b"\x00\x14\x00\x00\x00\x01"
-    b"\x00\x13\x0A\x01\x00\x01"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    # White to White
-    b"\x21\x2a"
-    b"\x40\x0A\x00\x00\x00\x01"
-    b"\x90\x14\x14\x00\x00\x01"
-    b"\x10\x14\x0A\x00\x00\x01"
-    b"\xA0\x13\x01\x00\x00\x01"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    # Black to White
-    b"\x22\x2a"
-    b"\x40\x0A\x00\x00\x00\x01"
-    b"\x90\x14\x14\x00\x00\x01"
-    b"\x00\x14\x0A\x00\x00\x01"
-    b"\x99\x0B\x04\x04\x01\x01"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    # White to Black
-    b"\x23\x2a"
-    b"\x40\x0A\x00\x00\x00\x01"
-    b"\x90\x14\x14\x00\x00\x01"
-    b"\x00\x14\x0A\x00\x00\x01"
-    b"\x99\x0C\x01\x03\x04\x01"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    # Black to Black
-    b"\x24\x2a"
-    b"\x80\x0A\x00\x00\x00\x01"
-    b"\x90\x14\x14\x00\x00\x01"
-    b"\x20\x14\x0A\x00\x00\x01"
-    b"\x50\x13\x01\x00\x00\x01"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\x00\x00\x00"
-)
-
-
-_STOP_SEQUENCE = b"\x50\x01\xf7" b"\x07\x01\xA5"  # CDI setting  # Deep Sleep
-# pylint: disable=too-few-public-methods
-class UC8151D(displayio.EPaperDisplay):
-    r"""UC8151D driver
-
-    :param bus: The data bus the display is on
-    :param \**kwargs:
-        See below
-
-    :Keyword Arguments:
-        * *width* (``int``) --
-          Display width
-        * *height* (``int``) --
-          Display height
-        * *rotation* (``int``) --
-          Display rotation
-    """
-
-    def __init__(self, bus: displayio.FourWire, **kwargs) -> None:
-        if kwargs.get("grayscale", False):
-            start_sequence = bytearray(_GRAYSCALE_START_SEQUENCE)
-        else:
-            start_sequence = bytearray(_START_SEQUENCE)
-        width = kwargs["width"]
-        height = kwargs["height"]
-        if "rotation" in kwargs and kwargs["rotation"] % 180 != 0:
-            width, height = height, width
-
-        super().__init__(
-            bus,
-            start_sequence,
-            _STOP_SEQUENCE,
-            **kwargs,
-            ram_width=128,
-            ram_height=296,
-            busy_state=False,
-            write_black_ram_command=0x13,
-            write_color_ram_command=0x10,
-            refresh_display_command=0x12,
-        )
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico b/frozen/Adafruit_CircuitPython_UC8151D/docs/_static/favicon.ico
deleted file mode 100644
index 5aca98376a1f7e593ebd9cf41a808512c2135635..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4414
zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en
zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK
zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8
z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3
z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG
zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn
zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^>#
z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt
z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx
zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D
z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$
zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ
z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g
z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4
zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%%
z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH
zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI
zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2
z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y
zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV
zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv)
zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^
zXUM@xoV6yBFKfzvY20V&Lr0yC
-
-.. toctree::
-    :caption: Related Products
-
-Adafruit 2.9" Flexible 296x128 Monochrome eInk / ePaper Display 
-
-.. toctree::
-    :caption: Other Links
-
-    Download from GitHub 
-    Download Library Bundle 
-    CircuitPython Reference Documentation 
-    CircuitPython Support Forum 
-    Discord Chat 
-    Adafruit Learning System 
-    Adafruit Blog 
-    Adafruit Store 
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license b/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
deleted file mode 100644
index 52de478909..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/docs/index.rst.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-
-SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
deleted file mode 100644
index 88e67331eb..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/docs/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-sphinx>=4.0.0
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp b/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp
deleted file mode 100644
index 726b5e026fd30b7e5baf5c23323d159b0eb5f65d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360122
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
T`pMSbh(J1r2r{u6#p?e9C4JK7

diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license b/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
deleted file mode 100644
index a784acfa32..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/examples/display-ruler.bmp.license
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
-# SPDX-License-Identifier: MIT
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
deleted file mode 100644
index 71b8316a87..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_grayscale_test.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Martin Refseth, written for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-"""Simple test script for 1.54" 152x152 grayscale display.
-
-Supported products:
-  * 1.54" Grayscale Display (GDEW0154T8D)
-  """
-# pylint: disable=no-member
-
-import time
-import board
-import displayio
-import busio
-import adafruit_uc8151d
-
-displayio.release_displays()
-
-# Pinout intended for use with a Raspberry Pi Pico
-clk = board.GP10
-si = board.GP11
-dc = board.GP8
-cs = board.GP9
-rst = board.GP12
-busy = board.GP13
-
-display_bus = displayio.FourWire(
-    busio.SPI(clk, si), command=dc, chip_select=cs, reset=rst, baudrate=1000000
-)
-
-time.sleep(1)
-
-display = adafruit_uc8151d.UC8151D(
-    display_bus, width=152, height=152, busy_pin=busy, rotation=180, grayscale=True
-)
-
-
-bitmap = displayio.Bitmap(152, 152, 4)
-
-# Draw Black
-for x in range(0, 152):
-    for y in range(0, 38):
-        bitmap[x, y] = 0
-# Draw Dark Gray
-for x in range(0, 152):
-    for y in range(38, 76):
-        bitmap[x, y] = 1
-# Draw Light Gray
-for x in range(0, 152):
-    for y in range(76, 114):
-        bitmap[x, y] = 2
-# Draw White
-for x in range(0, 152):
-    for y in range(114, 152):
-        bitmap[x, y] = 3
-
-palette = displayio.Palette(4)
-palette[0] = 0x000000  # Black
-palette[1] = 0x404040  # Dark Gray
-palette[2] = 0x808080  # Light Gray
-palette[3] = 0xFFFFFF  # White
-
-g = displayio.Group()
-t = displayio.TileGrid(bitmap, pixel_shader=palette)
-g.append(t)
-display.show(g)
-display.refresh()
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py b/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
deleted file mode 100644
index a6a068fc2d..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/examples/uc8151d_simpletest.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
-# SPDX-FileCopyrightText: Copyright (c) 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-"""Simple test script for 2.9" 296x128 monochrome display.
-
-Supported products:
-  * Adafruit Flexible 2.9" Monochrome
-    * https://www.adafruit.com/product/4262
-  """
-# pylint: disable=no-member
-
-import time
-import board
-import displayio
-import adafruit_uc8151d
-
-displayio.release_displays()
-
-# This pinout works on a Feather M4 and may need to be altered for other boards.
-spi = board.SPI()  # Uses SCK and MOSI
-epd_cs = board.D9
-epd_dc = board.D10
-epd_reset = board.D5
-epd_busy = None
-
-display_bus = displayio.FourWire(
-    spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
-)
-time.sleep(1)
-
-display = adafruit_uc8151d.UC8151D(
-    display_bus, width=296, height=128, rotation=90, busy_pin=epd_busy
-)
-
-g = displayio.Group()
-
-with open("/display-ruler.bmp", "rb") as f:
-    pic = displayio.OnDiskBitmap(f)
-    t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader)
-    g.append(t)
-
-    display.show(g)
-
-    display.refresh()
-
-    time.sleep(120)
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
deleted file mode 100644
index d4e27c4d74..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/optional_requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml b/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
deleted file mode 100644
index 4c3129c59f..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/pyproject.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-[build-system]
-requires = [
-    "setuptools",
-    "wheel",
-    "setuptools-scm",
-]
-
-[project]
-name = "adafruit-circuitpython-uc8151d"
-description = "CircuitPython `displayio` driver for US8151D-based ePaper displays"
-version = "0.0.0+auto.0"
-readme = "README.rst"
-authors = [
-    {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}
-]
-urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_UC8151D.git"}
-keywords = [
-    "adafruit",
-    "blinka",
-    "circuitpython",
-    "micropython",
-    "uc8151d",
-    "uc8151",
-    "us8151d",
-    "displayio",
-    "epd",
-    "epaper",
-    "flexible",
-]
-license = {text = "MIT"}
-classifiers = [
-    "Intended Audience :: Developers",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Software Development :: Embedded Systems",
-    "Topic :: System :: Hardware",
-    "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3",
-]
-dynamic = ["dependencies", "optional-dependencies"]
-
-[tool.setuptools]
-py-modules = ["adafruit_uc8151d"]
-
-[tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
-optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}
diff --git a/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt b/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt
deleted file mode 100644
index 274b851a2d..0000000000
--- a/frozen/Adafruit_CircuitPython_UC8151D/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
-Adafruit-Blinka
-adafruit-blinka-displayio

From 92803a5d5834fe371036ff59a7775ea18d0d1826 Mon Sep 17 00:00:00 2001
From: Rose Hooper 
Date: Mon, 31 Oct 2022 20:46:18 -0400
Subject: [PATCH 1310/2403] Add note about rust to BUILDING.md

---
 BUILDING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BUILDING.md b/BUILDING.md
index 37800e689f..4793824cf1 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -35,6 +35,8 @@ Failing to install these will prevent from properly building.
 
     pip3 install -r requirements-dev.txt
 
+If you run into an error installing minify_html, you may need to install `rust`.
+
 ### mpy-cross
 
 As part of the build process, mpy-cross is needed to compile .py files into .mpy files.

From dec128f508a5c1a3ce4050b43838366a6b6f74c1 Mon Sep 17 00:00:00 2001
From: Rose Hooper 
Date: Mon, 31 Oct 2022 23:57:59 -0400
Subject: [PATCH 1311/2403] add boards list to make error message

---
 ports/atmel-samd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 4405766d00..d82c5faabc 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -24,7 +24,7 @@
 
 # Select the board to build for.
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+  $(error You must provide a BOARD parameter: $(basename $(wildcard boards/*)))
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
     $(error Invalid BOARD specified)

From 36c4cc7d303e1700c684e80d290ca9ec275e38fe Mon Sep 17 00:00:00 2001
From: Rose Hooper 
Date: Tue, 1 Nov 2022 00:18:46 -0400
Subject: [PATCH 1312/2403] fix output layout of board list

---
 ports/atmel-samd/Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index d82c5faabc..fce68d4d41 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -23,8 +23,15 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define boardlist
+
+$(foreach dir,$(filter-out %.*,$(wildcard boards/*)),$(notdir $(dir)))
+
+
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter: $(basename $(wildcard boards/*)))
+  $(error You must provide a BOARD parameter: $(boardlist)Rerun with $(MAKE) BOARD=)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
     $(error Invalid BOARD specified)

From 8933f93439b10a7402f2c962bd5742b7902f1e38 Mon Sep 17 00:00:00 2001
From: Rose Hooper 
Date: Tue, 1 Nov 2022 11:00:48 -0400
Subject: [PATCH 1313/2403] simplify and use columns for boardlist

---
 ports/atmel-samd/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index fce68d4d41..d27a048399 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -23,18 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
-define boardlist
-
-$(foreach dir,$(filter-out %.*,$(wildcard boards/*)),$(notdir $(dir)))
-
-
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
 endef
 
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter: $(boardlist)Rerun with $(MAKE) BOARD=)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 

From 52de6e855975c0c50164563fc006847ba05eb176 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 1 Nov 2022 08:37:06 +0000
Subject: [PATCH 1314/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1003 of 1003 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9aea2605f2..23c301996b 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: 2022-10-29 22:00+0000\n"
+"PO-Revision-Date: 2022-11-02 09:33+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -608,7 +608,7 @@ msgstr "Ambos os RX e TX são necessários para o controle do fluxo"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Ambos os botões foram pressionados na inicialização.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -678,7 +678,7 @@ msgstr "O pino bus %d já está em uso"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "O botão A foi pressionado na inicialização.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -2045,7 +2045,7 @@ msgstr "A leitura da temperatura expirou"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "O botão BOOT foi pressionado na inicialização.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2058,11 +2058,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "O botão SW38 foi pressionado na inicialização.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "O botão VOLUME foi pressionado na inicialização.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2074,11 +2074,11 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "O botão central foi pressionado na inicialização.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "O botão esquerdo foi pressionado na inicialização.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2149,7 +2149,7 @@ msgstr ""
 
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
+msgstr "Para sair, reinicie a placa sem solicitar o modo de segurança."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"

From d6fe37845672475e62cf73ca059bb69e95784dab Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Wed, 2 Nov 2022 22:05:39 +0100
Subject: [PATCH 1315/2403] Update mpconfigboard.h

---
 ports/espressif/boards/maker_badge/mpconfigboard.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.h b/ports/espressif/boards/maker_badge/mpconfigboard.h
index 3c4a993364..18f98a693b 100644
--- a/ports/espressif/boards/maker_badge/mpconfigboard.h
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.h
@@ -34,8 +34,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
 #define AUTORESET_DELAY_MS 500
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)

From 71b5e6088b525e099bf6fb67922be7c06665d73a Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Wed, 2 Nov 2022 22:07:28 +0100
Subject: [PATCH 1316/2403] Update mpconfigboard.mk

---
 ports/espressif/boards/maker_badge/mpconfigboard.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.mk b/ports/espressif/boards/maker_badge/mpconfigboard.mk
index 6faba2aed3..bb96550da0 100644
--- a/ports/espressif/boards/maker_badge/mpconfigboard.mk
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.mk
@@ -3,15 +3,6 @@ USB_PID = 0x2030
 USB_PRODUCT = "Maker badge"
 USB_MANUFACTURER = "Czech maker"
 
-IDF_TARGET = esp32s2
-
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP32_CAMERA = 0
 
 CIRCUITPY_ESP_FLASH_MODE=dio

From 882100a87a9fdb9df78f4132b9453c427a0a4303 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Wed, 2 Nov 2022 22:10:44 +0100
Subject: [PATCH 1317/2403] Create sdkonfig

---
 ports/espressif/boards/maker_badge/sdkonfig | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 ports/espressif/boards/maker_badge/sdkonfig

diff --git a/ports/espressif/boards/maker_badge/sdkonfig b/ports/espressif/boards/maker_badge/sdkonfig
new file mode 100644
index 0000000000..5a33657fdc
--- /dev/null
+++ b/ports/espressif/boards/maker_badge/sdkonfig
@@ -0,0 +1,6 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=n
+
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP

From 1f6cd7bfac6fa208847e8da9fddc1dafd50fbc40 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 2 Nov 2022 17:39:34 -0500
Subject: [PATCH 1318/2403] This compatibility name has been removed in 8.x

---
 shared-bindings/adafruit_pixelbuf/__init__.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/shared-bindings/adafruit_pixelbuf/__init__.c b/shared-bindings/adafruit_pixelbuf/__init__.c
index 7b8d0da829..40bf80094c 100644
--- a/shared-bindings/adafruit_pixelbuf/__init__.c
+++ b/shared-bindings/adafruit_pixelbuf/__init__.c
@@ -38,8 +38,6 @@
 //| The `adafruit_pixelbuf` module provides the :py:class:`PixelBuf` class to accelerate
 //| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel.
 //|
-//| Also available as ``_pixelbuf``. This usage has been deprecated.
-//|
 //| Byteorders are configured with strings, such as "RGB" or "RGBD"."""
 // TODO: Pull in docs from adafruit_pixelbuf.
 

From 91da267a8764e48e8cbc5f996abe317e9b3ecd6b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 2 Nov 2022 19:23:52 -0500
Subject: [PATCH 1319/2403] Pin python version 3.10 for builds

Python 3.11 started to roll out to github actions, and .. it doesn't work.
This MAY affect just the espressif build, but I'm pinning it back at 3.10
for all builds.

Typical failure, during "Run $IDF_PATH/tools/idf_tools.py --non-interactive install required"
shows a lot of failures building gevent:
```
...
Collecting gevent<2.0,>=1.2.2
  Downloading gevent-1.5.0.tar.gz (5.3 MB)
...
  Building wheel for gevent (pyproject.toml): finished with status 'error'
...
      src/gevent/_greenlet_primitives.c:216:12: fatal error: longintrepr.h: No such file or directory
        216 |   #include "longintrepr.h"
            |            ^~~~~~~~~~~~~~~
      compilation terminated.
      error: command '/usr/bin/gcc' failed with exit code 1
```

I notice that gevent is pinned at <2.0 while the current version is 22.10.2!
This is a dependency of gdbgui==0.13.2.0, which is installed by esp-idf
pinned at that version.
---
 .github/workflows/build.yml             | 14 +++++++-------
 .github/workflows/create_website_pr.yml |  2 +-
 .github/workflows/pre-commit.yml        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8338528c42..0dc47946b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py test ${{ github.sha }}
     - name: CircuitPython version
@@ -156,7 +156,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
     - name: CircuitPython version
@@ -220,7 +220,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -278,7 +278,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -331,7 +331,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -384,7 +384,7 @@ jobs:
       id: py3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -473,7 +473,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 75de556c68..1658fe092c 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py website ${{ github.sha }}
     - name: Install deps
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index a23dcd1d11..556f89e63c 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Install deps
       run: |
         sudo apt-get install -y gettext uncrustify

From 722f4561c4428c711b86261c17e4a5edc3b0101a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 3 Nov 2022 15:38:46 -0500
Subject: [PATCH 1320/2403] Update circuitpython.pot

---
 locale/circuitpython.pot | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index ac6dd92211..768daa8651 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3843,10 +3843,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/maker_badge/mpconfigboard.h
-msgid "pressing boot button at start up.\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""

From f3ec46bbb5a97e5218282f1f3ae02cf7dfbadc0d Mon Sep 17 00:00:00 2001
From: Petr Sedlacek 
Date: Thu, 3 Nov 2022 15:35:49 +0100
Subject: [PATCH 1321/2403] Add missing pin definitions for 42. Keebs Frood

---
 ports/raspberrypi/boards/42keebs_frood/pins.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/raspberrypi/boards/42keebs_frood/pins.c b/ports/raspberrypi/boards/42keebs_frood/pins.c
index d5cf864768..972d5354b6 100644
--- a/ports/raspberrypi/boards/42keebs_frood/pins.c
+++ b/ports/raspberrypi/boards/42keebs_frood/pins.c
@@ -43,6 +43,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
 
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
     { 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) },

From 39bab07973f1425da281c7b500eb566e6cc98321 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Thu, 3 Nov 2022 14:22:46 +0000
Subject: [PATCH 1322/2403] Translated using Weblate (German)

Currently translated at 99.8% (1001 of 1003 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index bb53013fac..6fc8b9758b 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-10-13 06:43+0000\n"
+"PO-Revision-Date: 2022-11-04 15:05+0000\n"
 "Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.15-dev\n"
+"X-Generator: Weblate 4.14.2-dev\n"
 
 #: main.c
 msgid ""
@@ -69,7 +69,7 @@ msgstr "%%c erwartet Int oder Char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -600,7 +600,7 @@ msgstr "Sowohl RX als auch TX sind zu Flusssteuerung erforderlich"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurden beide Tasten gedrückt.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -670,7 +670,7 @@ msgstr "Bus-Pin %d wird schon benutzt"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde Taste A gedrückt.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -960,7 +960,7 @@ msgstr "Erwartete ein %q oder %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
-msgstr ""
+msgstr "Erwartet ein %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -2032,7 +2032,7 @@ msgstr "Zeitüberschreitung beim Auslesen der Temperatur"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde die Taste BOOT gedrückt.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2044,11 +2044,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde die Taste SW38 gedrückt.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde die Taste VOLUME gedrückt.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2060,11 +2060,11 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde die zentrale Taste gedrückt.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "Beim Starten wurde die linke Taste gedrückt.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2192,7 +2192,7 @@ msgstr "UART wird geschrieben"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"

From ad9db01f5f6c52e11ab434051f76d5fba2721b63 Mon Sep 17 00:00:00 2001
From: Matthew McGowan 
Date: Fri, 4 Nov 2022 13:15:15 -0700
Subject: [PATCH 1323/2403] Implements PDMIn for STM32L4 using the SAI
 peripheral and decimation/filtering in software.

---
 locale/circuitpython.pot                      |  10 +
 ports/stm/Makefile                            |  11 +
 ports/stm/boards/swan_r5/mpconfigboard.mk     |   8 +-
 ports/stm/boards/swan_r5/pins.c               |   3 +
 ports/stm/common-hal/audiobusio/I2SOut.c      |   1 +
 ports/stm/common-hal/audiobusio/I2SOut.h      |   1 +
 ports/stm/common-hal/audiobusio/MEMS_Audio.c  |  72 ++++
 ports/stm/common-hal/audiobusio/MEMS_Audio.h  | 132 +++++++
 .../stm/common-hal/audiobusio/MEMS_Audio_ll.h |  50 +++
 .../audiobusio/MEMS_Audio_ll_stm32l4.c        | 361 ++++++++++++++++++
 .../audiobusio/MEMS_Audio_ll_stm32l4.h        | 184 +++++++++
 .../stm/common-hal/audiobusio/OpenPDMFilter.c | 302 +++++++++++++++
 .../stm/common-hal/audiobusio/OpenPDMFilter.h | 112 ++++++
 ports/stm/common-hal/audiobusio/PDMIn.c       | 199 ++++++++++
 ports/stm/common-hal/audiobusio/PDMIn.h       |  56 +++
 ports/stm/common-hal/audiobusio/__init__.c    |   0
 supervisor/shared/memory.c                    |   3 +
 17 files changed, 1502 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm/common-hal/audiobusio/I2SOut.c
 create mode 100644 ports/stm/common-hal/audiobusio/I2SOut.h
 create mode 100644 ports/stm/common-hal/audiobusio/MEMS_Audio.c
 create mode 100644 ports/stm/common-hal/audiobusio/MEMS_Audio.h
 create mode 100644 ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
 create mode 100644 ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
 create mode 100644 ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
 create mode 100644 ports/stm/common-hal/audiobusio/OpenPDMFilter.c
 create mode 100644 ports/stm/common-hal/audiobusio/OpenPDMFilter.h
 create mode 100644 ports/stm/common-hal/audiobusio/PDMIn.c
 create mode 100644 ports/stm/common-hal/audiobusio/PDMIn.h
 create mode 100644 ports/stm/common-hal/audiobusio/__init__.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 768daa8651..348ef33021 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3714,10 +3714,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index afde51bdc0..cd37a9bda0 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -234,6 +234,17 @@ SRC_C += \
 	peripherals/stm32$(MCU_SERIES_LOWER)/$(MCU_VARIANT_LOWER)/periph.c \
 	packages/$(MCU_PACKAGE).c
 
+ifneq ($(CIRCUITPY_AUDIOBUSIO_PDMIN),0)
+	SRC_C += \
+		common-hal/audiobusio/MEMS_Audio.c \
+		common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c \
+		common-hal/audiobusio/OpenPDMFilter.c
+
+	SRC_STM32 += \
+		$(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_hal_sai.c
+
+endif
+
 ifneq ($(CIRCUITPY_USB),0)
 SRC_C += lib/tinyusb/src/portable/st/synopsys/dcd_synopsys.c
 endif
diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk
index 2ebaa9c23f..9e5be99bfa 100644
--- a/ports/stm/boards/swan_r5/mpconfigboard.mk
+++ b/ports/stm/boards/swan_r5/mpconfigboard.mk
@@ -41,10 +41,9 @@ CIRCUITPY_PULSEIO = 1
 CIRCUITPY_PWMIO = 1
 CIRCUITPY_AUDIOPWMIO = 1
 CIRCUITPY_CANIO = 0
-CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_I2CTARGET = 0
 # Requires SPI, PulseIO (stub ok):
-CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_DISPLAYIO = 1
 
 # These modules are implemented in shared-module/ - they can be included in
 # any port once their prerequisites in common-hal are complete.
@@ -71,5 +70,8 @@ CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_RTC = 1
-
 CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
+CIRCUITPY_ENABLE_MPY_NATIVE = 1
+CIRCUITPY_AUDIOBUSIO = 1
+CIRCUITPY_AUDIOBUSIO_I2SOUT = 0
+CIRCUITPY_AUDIOBUSIO_PDMIN = 1
diff --git a/ports/stm/boards/swan_r5/pins.c b/ports/stm/boards/swan_r5/pins.c
index cf97c3587a..dc273cb6d4 100644
--- a/ports/stm/boards/swan_r5/pins.c
+++ b/ports/stm/boards/swan_r5/pins.c
@@ -129,5 +129,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { 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_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_PA03) },
+    { MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_PC03) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/stm/common-hal/audiobusio/I2SOut.c b/ports/stm/common-hal/audiobusio/I2SOut.c
new file mode 100644
index 0000000000..b63c3e7b22
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/I2SOut.c
@@ -0,0 +1 @@
+// Although IS2Out is not enabled on the STM32L4 family, this file is still required for the build to pass
diff --git a/ports/stm/common-hal/audiobusio/I2SOut.h b/ports/stm/common-hal/audiobusio/I2SOut.h
new file mode 100644
index 0000000000..b63c3e7b22
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/I2SOut.h
@@ -0,0 +1 @@
+// Although IS2Out is not enabled on the STM32L4 family, this file is still required for the build to pass
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio.c b/ports/stm/common-hal/audiobusio/MEMS_Audio.c
new file mode 100644
index 0000000000..4371b609c0
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio.c
@@ -0,0 +1,72 @@
+#include 
+#include 
+
+#include "MEMS_Audio.h"
+#include "MEMS_Audio_ll.h"
+
+static void default_pcm_data_available(MemsAudio *audio, pcm_sample_t *pcmSamples, size_t pcmLength) {
+}
+
+
+
+/**
+ * @brief Initializes the MemsAudio instance. Only one instance can be initialized and used at a given time.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_init(MemsAudio *audio) {
+    if (!audio->pcm_data_available) {
+        audio->pcm_data_available = default_pcm_data_available;
+    }
+    return mems_audio_ll_init(audio);
+}
+
+/**
+ * @brief Uninitializes the MemsAudio instance.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_uninit(MemsAudio *audio) {
+    return mems_audio_ll_uninit(audio);
+}
+
+/**
+ * @brief Asynchronously records audio.
+ *
+ * @param audio
+ * @param pdmBuffer
+ * @param pdmBufferLength
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_record(MemsAudio *audio) {
+    return mems_audio_ll_record(audio);
+}
+
+/**
+ * @brief Pause recording audio.
+ */
+mems_audio_err_t mems_audio_pause(MemsAudio *audio) {
+    return mems_audio_ll_pause(audio);
+}
+
+/**
+ * @brief Resume recording audio.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_resume(MemsAudio *audio) {
+    return mems_audio_ll_resume(audio);
+}
+
+/**
+ * @brief Stop recording audio and
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_stop(MemsAudio *audio) {
+    return mems_audio_ll_stop(audio);
+}
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio.h b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
new file mode 100644
index 0000000000..a26b94fef3
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
@@ -0,0 +1,132 @@
+#ifndef _MEMS_AUDIO_H_
+#define _MEMS_AUDIO_H_
+
+#include 
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @brief   How many milliseconds of audio can fit in the audio buffer(s).
+ * Interrupts for recieved data fire at half this duration / twice the frequency.
+ */
+#ifndef MEMS_AUDIO_MS_BUFFER
+#define MEMS_AUDIO_MS_BUFFER (1)
+#endif
+
+
+/**
+ * @brief The number of bits per sample of the PCM output
+ */
+#define PCM_OUT_RESOLUTION                  16
+
+/**
+ * @brief The output frequency of PCM samples in Hz.
+ */
+#define PCM_OUT_SAMPLING_FREQUENCY          16000
+
+/**
+ * @brief type for describing error conditions.
+ */
+typedef int32_t mems_audio_err_t;
+
+/**
+ * @brief The datatype that holds an output PCM sample.
+ */
+typedef int16_t pcm_sample_t;
+_Static_assert(PCM_OUT_RESOLUTION==16, "Output PCM resolution must be 16-bits");
+
+
+typedef enum {
+    MEMS_AUDIO_OK = 0,
+    MEMS_AUDIO_ERROR_ALREADY_INITIALIZED = -1,
+    MEMS_AUDIO_ERROR_NOT_INITIALIZED = -2
+} mems_audio_err_enum_t;
+
+#define IS_MEMS_AUDIO_ERROR(e) (e)
+#define CHECK_MEMS_AUDIO_ERROR(e) { if (IS_MEMS_AUDIO_ERROR(e)) return e; }
+#define CHECK_MEMS_AUDIO_INITIALIZED(x) { if (!x) return MEMS_AUDIO_ERROR_NOT_INITIALIZED; }
+
+typedef struct MemsAudio_t MemsAudio;
+
+/**
+ * @brief Callback informing that PCM samples are available for processing.
+ */
+typedef void (*pcm_data_available_t)(MemsAudio* audio, pcm_sample_t* pcmSamples, size_t pcmLength);
+
+/**
+ * @brief MemsAudio manages the filter, buffers and callbacks used to capture PDM audio samples and convert to PCM.
+ *
+ */
+typedef struct MemsAudio_t {
+
+    /**
+     * @brief The buffer to store PCM audio samples
+     */
+    volatile pcm_sample_t* volatile pcmOutputBuffer;
+
+    /**
+     * @brief The length of the PCM buffer. SHould be at least MEMS_AUDIO_PCM_BUFFER_LENGTH
+     */
+    volatile size_t pcmOutputBufferLength;
+
+    /**
+     * @brief Optional callback for when PCM data is available.
+     */
+    pcm_data_available_t pcm_data_available;
+
+    void* audioImpl;
+    void* userData;
+} MemsAudio;
+
+
+mems_audio_err_t mems_audio_init(MemsAudio* audio);
+
+/**
+ * @brief Uninitializes the MemsAudio instance.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_uninit(MemsAudio* audio);
+
+/**
+ * @brief Asynchronously records audio.
+ *
+ * @param audio
+ * @param pdmBuffer
+ * @param pdmBufferLength
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_record(MemsAudio* audio);
+
+/**
+ * @brief Pause recording audio.
+ */
+mems_audio_err_t mems_audio_pause(MemsAudio* audio);
+
+/**
+ * @brief Resume recording audio.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_resume(MemsAudio* audio);
+
+/**
+ * @brief Stop recording audio and
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_stop(MemsAudio* audio);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif  // _MEMS_AUDIO_H_
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
new file mode 100644
index 0000000000..6419b90959
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
@@ -0,0 +1,50 @@
+#ifndef _MEMS_AUDIO_LL_H_
+#define _MEMS_AUDIO_LL_H_
+
+#include "MEMS_Audio.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+mems_audio_err_t mems_audio_ll_init(MemsAudio *audio);
+mems_audio_err_t mems_audio_ll_uninit(MemsAudio *audio);
+
+/**
+ * @brief Asynchronously records audio.
+ *
+ * @param audio
+ * @param pdmBuffer
+ * @param pdmBufferLength
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_ll_record(MemsAudio *audio);
+
+/**
+ * @brief Pause recording audio.
+ */
+mems_audio_err_t mems_audio_ll_pause(MemsAudio *audio);
+
+/**
+ * @brief Resume recording audio.
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_ll_resume(MemsAudio *audio);
+
+/**
+ * @brief Stop recording audio and
+ *
+ * @param audio
+ * @return mems_audio_err_t
+ */
+mems_audio_err_t mems_audio_ll_stop(MemsAudio *audio);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // _MEMS_AUDIO_LL_H_
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
new file mode 100644
index 0000000000..71f046f9b9
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
@@ -0,0 +1,361 @@
+#include 
+#include "MEMS_Audio_ll_stm32l4.h"
+#include "MEMS_Audio.h"
+
+/**
+ * @brief The implementation is a singleton.
+ *
+ */
+MemsAudio_STM32L4SAIPDM* volatile audioImpl;
+
+static mems_audio_err_t MX_DMA_Init(void);
+static mems_audio_err_t MX_DMA_Uninit(void);
+static mems_audio_err_t MX_SAI1_Init(void);
+
+#define CHECK_HAL_ERROR(x, e) \
+    {                         \
+        if ((x) != HAL_OK)    \
+            return e;         \
+    }
+
+/**
+ * @brief Checks the HAL return code and returns from a void function on error. The
+ * error is saved to lastError.
+ */
+#define CHECK_HAL_ERROR_VOID(x, e)    \
+    {                                 \
+        if ((x) != HAL_OK) {          \
+            audioImpl->lastError = e; \
+            return;                   \
+        }                             \
+    }
+
+#define CHECK_MEMS_AUDIO_ERROR_LAST()            \
+    {                                            \
+        if (audioImpl->lastError != MEMS_AUDIO_OK) \
+            return audioImpl->lastError;    \
+    }
+
+static bool default_pdm_data_available(MemsAudio_STM32L4SAIPDM* audio, pdm_sample_t* pdmSamples, size_t count)
+{
+    return true;
+}
+
+int filter_pdm(MemsAudio_STM32L4SAIPDM* impl, pdm_sample_t* input, pcm_sample_t* output)
+{
+    if (impl->filter.Decimation==64) {
+        Open_PDM_Filter_64(input, output, 1, &impl->filter);
+    }
+    else {
+        Open_PDM_Filter_128(input, output, 1, &impl->filter);
+    }
+    return impl->filter.nSamples;
+}
+
+static void mems_audio_init_filter(MemsAudio_STM32L4SAIPDM *impl)
+{
+    TPDMFilter_InitStruct* filter = &impl->filter;
+    filter->Fs = PCM_OUT_SAMPLING_FREQUENCY;
+    filter->nSamples = MEMS_AUDIO_PCM_BUFFER_LENGTH;
+    filter->LP_HZ = PCM_OUT_SAMPLING_FREQUENCY / 2; // The Nyquist frequency
+    filter->HP_HZ = 10;                             // high pass to remove DC offset
+    filter->In_MicChannels = 1;
+    filter->Out_MicChannels = 1;
+    filter->Decimation = PDM_IN_DECIMATION_FACTOR;
+    Open_PDM_Filter_Init(filter);
+}
+volatile unsigned ignore_dma_count;
+
+/**
+ * @brief Converts PDM samples
+ *
+ * @param pdmBuffer The buffer holding the PDM samples
+ * @param pdmBufferLength   The number of samples available
+ */
+void pdm2pcm(uint8_t *pdmBuffer, size_t pdmBufferLength)
+{
+    MemsAudio_STM32L4SAIPDM *impl = audioImpl;
+    if (impl)
+    {
+        bool convert = impl->discard_dma || impl->pdm_data_available(impl, pdmBuffer, pdmBufferLength);
+        if (convert)
+        {
+            MemsAudio* audio = impl->audio;
+            filter_pdm(impl, pdmBuffer, (pcm_sample_t*)audio->pcmOutputBuffer);
+            if (!impl->discard_dma)
+                audio->pcm_data_available(audio, (pcm_sample_t*)audio->pcmOutputBuffer, impl->filter.nSamples);
+            else
+                impl->discard_dma--;
+        }
+    }
+}
+
+/**
+ *  @brief Initialize the PDM interface ready to begin capture.
+ *  @retval
+ */
+mems_audio_err_t mems_audio_ll_init(MemsAudio *audio)
+{
+    mems_audio_init_filter(audioImpl);
+    if (!audioImpl->pdm_data_available) {
+        audioImpl->pdm_data_available = &default_pdm_data_available;
+    }
+
+    CHECK_MEMS_AUDIO_ERROR(MX_DMA_Init());
+    CHECK_MEMS_AUDIO_ERROR(MX_SAI1_Init());
+    return MEMS_AUDIO_OK;
+}
+
+mems_audio_err_t uninit(void) {
+    if (audioImpl) {
+        MemsAudio_STM32L4SAIPDM* impl = audioImpl;
+        audioImpl = NULL;
+        mems_audio_ll_stop(impl->audio);
+        CHECK_HAL_ERROR(HAL_SAI_DeInit(&impl->hSAI_BlockA1), MEMS_AUDIO_ERROR_SAI_DEINIT);
+        CHECK_MEMS_AUDIO_ERROR(MX_DMA_Uninit());
+    }
+    return MEMS_AUDIO_OK;
+}
+
+/**
+ * @brief Uninitialize low level PDM capture
+ */
+mems_audio_err_t mems_audio_ll_uninit(MemsAudio *audio)
+{
+    if (audioImpl->audio == audio) {
+        uninit();
+    }
+    return MEMS_AUDIO_OK;
+}
+
+mems_audio_err_t mems_audio_ll_record(MemsAudio *audio)
+{
+    audioImpl->discard_dma = (100/MEMS_AUDIO_MS_BUFFER)+1;
+    CHECK_HAL_ERROR(HAL_SAI_Receive_DMA(&audioImpl->hSAI_BlockA1, audioImpl->pdmBuffer, audioImpl->pdmBufferLength),
+                    MEMS_AUDIO_ERROR_DMA_START);
+    return MEMS_AUDIO_OK;
+}
+
+mems_audio_err_t mems_audio_ll_stop(MemsAudio *audio)
+{
+    CHECK_HAL_ERROR(HAL_SAI_DMAStop(&audioImpl->hSAI_BlockA1), MEMS_AUDIO_ERROR_DMA_STOP);
+    return MEMS_AUDIO_OK;
+}
+
+mems_audio_err_t mems_audio_ll_pause(MemsAudio *audio)
+{
+    CHECK_HAL_ERROR(HAL_SAI_DMAPause(&audioImpl->hSAI_BlockA1), MEMS_AUDIO_ERROR_DMA_PAUSE);
+    return MEMS_AUDIO_OK;
+}
+
+mems_audio_err_t mems_audio_ll_resume(MemsAudio *audio)
+{
+    CHECK_HAL_ERROR(HAL_SAI_DMAResume(&audioImpl->hSAI_BlockA1), MEMS_AUDIO_ERROR_DMA_RESUME);
+    return MEMS_AUDIO_OK;
+}
+
+/**
+ * @brief SAI1 Initialization Function
+ * @param None
+ * @retval None
+ */
+static mems_audio_err_t MX_SAI1_Init(void)
+{
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+
+    SAI_HandleTypeDef hSAI_BlockA1 = {0};
+    MemsAudio_STM32L4SAIPDM* impl = audioImpl;
+    CHECK_MEMS_AUDIO_INITIALIZED(impl);
+    hSAI_BlockA1.Instance = SAI1_Block_A;
+    hSAI_BlockA1.Init.Protocol = SAI_FREE_PROTOCOL;
+    hSAI_BlockA1.Init.AudioMode = SAI_MODEMASTER_RX;
+    /* The PDM interface provides 8 1-bit samples at a time */
+    hSAI_BlockA1.Init.DataSize = SAI_DATASIZE_8;
+    hSAI_BlockA1.Init.FirstBit = SAI_FIRSTBIT_MSB;
+
+    hSAI_BlockA1.Init.ClockStrobing = SAI_CLOCKSTROBING_FALLINGEDGE;
+    hSAI_BlockA1.Init.Synchro = SAI_ASYNCHRONOUS;            /* asynchronous - not chained to other SAI blocks */
+    hSAI_BlockA1.Init.OutputDrive = SAI_OUTPUTDRIVE_DISABLE; /* Not driving the primary SAI clock */
+    hSAI_BlockA1.Init.NoDivider = SAI_MASTERDIVIDER_DISABLE;
+    hSAI_BlockA1.Init.MckOverSampling = SAI_MCK_OVERSAMPLING_DISABLE;
+    hSAI_BlockA1.Init.FIFOThreshold = SAI_FIFOTHRESHOLD_FULL;
+    hSAI_BlockA1.Init.MonoStereoMode = SAI_MONOMODE; /* PDM is intrinsicly stereo, sampling on */
+    hSAI_BlockA1.Init.CompandingMode = SAI_NOCOMPANDING;
+    hSAI_BlockA1.Init.PdmInit.Activation = ENABLE; /* Enable PDM interface in the SAI */
+    hSAI_BlockA1.Init.PdmInit.MicPairsNbr = 1;     /* 1 pair - 2 mics */
+    hSAI_BlockA1.Init.PdmInit.ClockEnable = SAI_PDM_CLOCK1_ENABLE;
+    hSAI_BlockA1.FrameInit.FrameLength = 16;
+    hSAI_BlockA1.FrameInit.ActiveFrameLength = 1;
+    hSAI_BlockA1.FrameInit.FSDefinition = SAI_FS_STARTFRAME; /* FS is not really used */
+    hSAI_BlockA1.FrameInit.FSPolarity = SAI_FS_ACTIVE_HIGH;
+    hSAI_BlockA1.FrameInit.FSOffset = SAI_FS_FIRSTBIT;
+    hSAI_BlockA1.SlotInit.FirstBitOffset = 0;
+    hSAI_BlockA1.SlotInit.SlotSize = SAI_SLOTSIZE_DATASIZE;
+    hSAI_BlockA1.SlotInit.SlotNumber = 2;
+    hSAI_BlockA1.SlotInit.SlotActive = 0x0001;
+    impl->hSAI_BlockA1 = hSAI_BlockA1;
+    CHECK_HAL_ERROR(HAL_SAI_Init(&impl->hSAI_BlockA1), MEMS_AUDIO_ERROR_SAI_INIT);
+    CHECK_MEMS_AUDIO_ERROR_LAST();
+    return MEMS_AUDIO_OK;
+}
+
+#define MEMS_AUDIO_DMA_IRQn DMA1_Channel6_IRQn
+#define MEMS_AUDIO_DMA_CHANNEL DMA1_Channel6
+#define MEMS_AUDIO_DMA_PRIORITY 6
+#define DMA_HANDLER DMA1_Channel6_IRQHandler
+
+void HAL_SAI_MspInit(SAI_HandleTypeDef *hsai)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  /* SAI1 */
+  MemsAudio_STM32L4SAIPDM* impl = audioImpl;
+  if (hsai->Instance == SAI1_Block_A && impl)
+  {
+      PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_SAI1;
+      PeriphClkInit.Sai1ClockSelection = RCC_SAI1CLKSOURCE_PLLSAI1;
+      PeriphClkInit.PLLSAI1.PLLSAI1Source = RCC_PLLSOURCE_MSI;
+      PeriphClkInit.PLLSAI1.PLLSAI1M = MEMS_AUDIO_CLOCK_PLLM;
+      PeriphClkInit.PLLSAI1.PLLSAI1N = MEMS_AUDIO_CLOCK_PLLN;
+      PeriphClkInit.PLLSAI1.PLLSAI1P = MEMS_AUDIO_CLOCK_PLLP;
+      PeriphClkInit.PLLSAI1.PLLSAI1Q = RCC_PLLQ_DIV2;
+      PeriphClkInit.PLLSAI1.PLLSAI1R = RCC_PLLR_DIV2;
+      PeriphClkInit.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_SAI1CLK;
+      CHECK_HAL_ERROR_VOID(HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit), MEMS_AUDIO_ERROR_SAI_CLOCK);
+
+      if (impl->SAI1_client == 0)
+      {
+          __HAL_RCC_SAI1_CLK_ENABLE();
+      }
+      impl->SAI1_client++;
+
+      /**SAI1_A_Block_A GPIO Configuration
+      PC3     ------> SAI1_D1
+      PA3     ------> SAI1_CK1
+      */
+      GPIO_InitStruct.Pin = GPIO_PIN_3;
+      GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+      GPIO_InitStruct.Pull = GPIO_NOPULL;
+      GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+      GPIO_InitStruct.Alternate = GPIO_AF3_SAI1;
+      HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+      GPIO_InitStruct.Pin = GPIO_PIN_3;
+      GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+      GPIO_InitStruct.Pull = GPIO_NOPULL;
+      GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+      GPIO_InitStruct.Alternate = GPIO_AF3_SAI1;
+      HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+      /* Peripheral DMA init*/
+    DMA_HandleTypeDef hdma_sai1_a = {0};
+      hdma_sai1_a.Instance = MEMS_AUDIO_DMA_CHANNEL;
+      hdma_sai1_a.Init.Request = DMA_REQUEST_SAI1_A;
+      hdma_sai1_a.Init.Direction = DMA_PERIPH_TO_MEMORY;
+      hdma_sai1_a.Init.PeriphInc = DMA_PINC_DISABLE;
+      hdma_sai1_a.Init.MemInc = DMA_MINC_ENABLE;
+      hdma_sai1_a.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+      hdma_sai1_a.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+      hdma_sai1_a.Init.Mode = DMA_CIRCULAR;
+      hdma_sai1_a.Init.Priority = DMA_PRIORITY_HIGH;
+      impl->hdma_sai1_a = hdma_sai1_a;
+      CHECK_HAL_ERROR_VOID(HAL_DMA_Init(&impl->hdma_sai1_a), MEMS_AUDIO_ERROR_SAI_DMA_INIT);
+
+      /* Several peripheral DMA handle pointers point to the same DMA handle.
+       Be aware that there is only one channel to perform all the requested DMAs. */
+      __HAL_LINKDMA(hsai, hdmarx, impl->hdma_sai1_a);
+
+      __HAL_LINKDMA(hsai, hdmatx, impl->hdma_sai1_a);
+  }
+}
+
+void HAL_SAI_MspDeInit(SAI_HandleTypeDef *hsai)
+{
+    /* SAI1 */
+    MemsAudio_STM32L4SAIPDM* impl = audioImpl;
+    if (hsai->Instance == SAI1_Block_A && impl)
+    {
+        impl->SAI1_client--;
+        if (impl->SAI1_client == 0)
+        {
+            /* Peripheral clock disable */
+            __HAL_RCC_SAI1_CLK_DISABLE();
+        }
+
+        /**SAI1_A_Block_A GPIO Configuration
+        PC3     ------> SAI1_D1
+        PA3     ------> SAI1_CK1
+        */
+        HAL_GPIO_DeInit(GPIOC, GPIO_PIN_3);
+
+        HAL_GPIO_DeInit(GPIOA, GPIO_PIN_3);
+
+        /* SAI1 DMA Deinit */
+        HAL_DMA_DeInit(hsai->hdmarx);
+        HAL_DMA_DeInit(hsai->hdmatx);
+    }
+}
+
+/**
+ * @brief Initialize the DMA peripheral
+ *
+ */
+static mems_audio_err_t MX_DMA_Init(void)
+{
+
+    /* DMA controller clock enable */
+    __HAL_RCC_DMAMUX1_CLK_ENABLE();
+    __HAL_RCC_DMA1_CLK_ENABLE();
+
+    /* DMA interrupt init */
+    /* DMA1_Channel1_IRQn interrupt configuration */
+    HAL_NVIC_SetPriority(MEMS_AUDIO_DMA_IRQn, MEMS_AUDIO_DMA_PRIORITY, 0);
+    HAL_NVIC_EnableIRQ(MEMS_AUDIO_DMA_IRQn);
+    return MEMS_AUDIO_OK;
+}
+
+static mems_audio_err_t MX_DMA_Uninit(void)
+{
+    HAL_NVIC_DisableIRQ(MEMS_AUDIO_DMA_IRQn);
+    return MEMS_AUDIO_OK;
+}
+
+/**
+ * @brief Global handler for the DMA interrupt. Forwards to the HAL for further processing.
+ *
+ */
+void DMA_HANDLER(void)
+{
+    HAL_DMA_IRQHandler(&audioImpl->hdma_sai1_a);
+}
+
+/**
+ * @brief Converts PDM samples in the upper half of the PDM buffer.
+ *
+ * @param hSai
+ */
+void HAL_SAI_RxHalfCpltCallback(SAI_HandleTypeDef *hSai)
+{
+    (void)hSai;
+    pdm2pcm(audioImpl->pdmBuffer, audioImpl->pdmBufferLength>>1);
+}
+
+/**
+ * @brief Converts PDM samples in the upper half of the PDM buffer.
+ *
+ * @param hSai
+ */
+void HAL_SAI_RxCpltCallback(SAI_HandleTypeDef *hSai)
+{
+    (void)hSai;
+    pdm2pcm(audioImpl->pdmBuffer+(audioImpl->pdmBufferLength>>1), audioImpl->pdmBufferLength>>1);
+}
+
+mems_audio_err_t mems_audio_init_stm32l4_sai_pdm(MemsAudio* audio, MemsAudio_STM32L4SAIPDM* impl)
+{
+    uninit();
+    audioImpl = impl;
+    impl->audio = audio;
+    return mems_audio_init(audio);
+}
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
new file mode 100644
index 0000000000..c76ccce5e1
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
@@ -0,0 +1,184 @@
+#ifndef _MEMS_AUDIO_LL_STM32L4_H_
+#define _MEMS_AUDIO_LL_STM32L4_H_
+
+#include 
+#include 
+#include 
+#include "OpenPDMFilter.h"
+#include "MEMS_Audio.h"
+#include "MEMS_Audio_ll.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief The SAI PDM interface captures 8 bits from the PDM signal.
+ */
+typedef uint8_t pdm_sample_t;
+
+/**
+ * @brief The PDM sample frequency in kHz. (Bit samples per millisecond.)
+ */
+#define PDM_IN_FREQUENCY_KHZ                1024
+
+#define PDM_IN_FREQUENCY                    (PDM_IN_FREQUENCY_KHZ * 1000)
+
+/**
+ * @brief The number of channels of audio captured
+ */
+#define PDM_IN_CHANNELS                     1
+
+/**
+ * @brief The decimation of the PDM bit stream to produce PCM samples at the desired output rate.
+ */
+#define PDM_IN_DECIMATION_FACTOR            64
+
+/**
+ * @brief The number of pdm samples captured per millisecond from the PDM interface.
+ */
+#define MEMS_AUDIO_PDM_SAMPLES_PER_MS ((PDM_IN_FREQUENCY_KHZ / (sizeof(pdm_sample_t) * 8)) * PDM_IN_CHANNELS)
+
+/**
+ * @brief The size of the buffer used to hold PDM samples prior to conversion to PCM.
+ * Each half of the buffer generates an interrupt.
+ */
+#define MEMS_AUDIO_PDM_BUFFER_LENGTH (MEMS_AUDIO_PDM_SAMPLES_PER_MS * MEMS_AUDIO_MS_BUFFER * 2)
+
+/**
+ * @brief The length of the PCM buffer required to hold converted samples.
+ */
+#define MEMS_AUDIO_PCM_BUFFER_LENGTH (PCM_OUT_SAMPLING_FREQUENCY * MEMS_AUDIO_MS_BUFFER / 1000)
+
+
+/**
+ * Presently the internal PDM parameters and output PCM parameters are fixed for the values given here.
+ */
+
+
+/**
+ * @brief 128 point decimation did not work with the OpenPDMFilter and just produced PCM output
+ * approaching a square wave.
+ */
+_Static_assert(PDM_IN_DECIMATION_FACTOR == 64 || PDM_IN_DECIMATION_FACTOR == 128, "A decomation factor of 64 or 128 is supported at present.");
+
+
+/**
+ * @brief The PDM bitstream frequency divided by the decimation factor should be the same as the desired output PCM frequency.
+ */
+_Static_assert(PDM_IN_FREQUENCY / PDM_IN_DECIMATION_FACTOR == PCM_OUT_SAMPLING_FREQUENCY, "PDM output frequency should equal the input frequency divided by the decimation factor.");
+
+//
+// SAI PDM interface clock configuration
+//
+
+#define MEMS_AUDIO_MSI_FREQUENCY        (48 * 1000 * 1000)
+#define MEMS_AUDIO_CLOCK_PLLM           (15)
+#define MEMS_AUDIO_CLOCK_PLLN           (16)
+#define MEMS_AUDIO_CLOCK_PLLP           (RCC_PLLP_DIV25)
+
+/**
+ * @brief The SAI PDM clock should be twice the desired PDM bitstream frequency
+ */
+_Static_assert((MEMS_AUDIO_MSI_FREQUENCY / MEMS_AUDIO_CLOCK_PLLM * MEMS_AUDIO_CLOCK_PLLN / MEMS_AUDIO_CLOCK_PLLP) == (PDM_IN_FREQUENCY_KHZ * 1000 * 2), "PDM clock should be twice the PDM sample frequency.");
+
+typedef struct MemsAudio_STM32L4SAIPDM_t MemsAudio_STM32L4SAIPDM;
+
+/**
+ * @brief Callback informing that PDM samples are available for processing.
+ * @param audio The MemsAudio instance
+ * @return `false` to skip conversion of PDM to PCM. `true` to convert the PDM samples to PCM.
+ */
+typedef bool (*pdm_data_available_t)(MemsAudio_STM32L4SAIPDM *audio, pdm_sample_t *pdmSamples, size_t pdmLength);
+
+/**
+ * @brief Implementation details for the STM32 SAI PDM implementation.
+ *
+ */
+/**
+ * @brief Audio capture from a MEMS microphone on the STM32L4 using the SAI PDM interface.
+ */
+typedef struct MemsAudio_STM32L4SAIPDM_t {
+
+    MemsAudio *audio;
+
+    /**
+     * @brief The last error that happened in a void function (e.g. HAL callback)
+     */
+    mems_audio_err_t lastError;
+
+    /**
+     * @brief The buffer to store PDM audio samples
+     */
+    pdm_sample_t *pdmBuffer;
+
+    /**
+     * @brief The length of the PDM buffer. Should be at least MEMS_AUDIO_PDM_BUFFER_LENGTH
+     */
+    size_t pdmBufferLength;
+
+    /**
+     * @brief Optional callback for when PDM data is available.
+     */
+    pdm_data_available_t pdm_data_available;
+
+    /**
+     * @brief A cound of the number of PDM clients in use.
+     */
+    uint32_t SAI1_client;
+
+    /**
+     * @brief The SAI peripheral handle being used for SAI A subclock 1.
+     */
+    SAI_HandleTypeDef hSAI_BlockA1;
+
+    /**
+     * @brief The DMA handle to transfer SAI data from the peripheral to memory.
+     */
+    DMA_HandleTypeDef hdma_sai1_a;
+
+    /**
+     * @brief An instance of the PDM filter that performs decimation, and high and low pass filtering.
+     * Unlike the DFSDM peripheral, the SAI PDM interface doesn't perform these operations in hardware.
+     */
+    TPDMFilter_InitStruct filter;
+
+    /**
+     * @brief The number of DMA transfers to ignore after starting recording.
+     */
+    volatile uint16_t discard_dma;
+
+} MemsAudio_STM32L4SAIPDM;
+
+/**
+ * @brief Creates a MemsAudio instance that retrieves PDM samples from SAI A block 1 via the PDM interface,
+ * decimates and filters these in software to produce the PCM output stream.
+ *
+ * @param audio
+ * @param implementation
+ * @return meems_audio_error_t
+ */
+mems_audio_err_t mems_audio_init_stm32l4_sai_pdm(MemsAudio *audio, MemsAudio_STM32L4SAIPDM *implementation);
+
+/**
+ * @brief Implementation-specific error codes.
+ *
+ */
+typedef enum mems_audio_err_stm32l4_t {
+    MEMS_AUDIO_ERROR_SAI_DMA_INIT = 1,
+    MEMS_AUDIO_ERROR_SAI_CLOCK = 2,
+    MEMS_AUDIO_ERROR_SAI_INIT = 3,
+    MEMS_AUDIO_ERROR_SAI_DEINIT = 4,
+    MEMS_AUDIO_ERROR_DMA_START = 5,
+    MEMS_AUDIO_ERROR_DMA_STOP = 6,
+    MEMS_AUDIO_ERROR_DMA_PAUSE = 7,
+    MEMS_AUDIO_ERROR_DMA_RESUME = 8
+} mems_audio_err_stm32l4_t;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // _MEMS_AUDIO_LL_STM32L4_H_
diff --git a/ports/stm/common-hal/audiobusio/OpenPDMFilter.c b/ports/stm/common-hal/audiobusio/OpenPDMFilter.c
new file mode 100644
index 0000000000..c65353b146
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/OpenPDMFilter.c
@@ -0,0 +1,302 @@
+/**
+ *******************************************************************************
+ * @file    OpenPDMFilter.c
+ * @author  CL
+ * @version V1.0.0
+ * @date    9-September-2015
+ * @brief   Open PDM audio software decoding Library.
+ *          This Library is used to decode and reconstruct the audio signal
+ *          produced by ST MEMS microphone (MP45Dxxx, MP34Dxxx).
+ *******************************************************************************
+ * @attention
+ *
+ * 
    © COPYRIGHT 2018 STMicroelectronics
    
+ *
+ * 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.
+ *******************************************************************************
+ */
+
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "OpenPDMFilter.h"
+
+
+
+/* Functions -----------------------------------------------------------------*/
+
+#ifdef USE_LUT
+int32_t filter_table_mono_64(lut_t lut, uint8_t *data, uint8_t sincn) {
+    return (int32_t)
+           lut[data[0]][0][sincn] +
+           lut[data[1]][1][sincn] +
+           lut[data[2]][2][sincn] +
+           lut[data[3]][3][sincn] +
+           lut[data[4]][4][sincn] +
+           lut[data[5]][5][sincn] +
+           lut[data[6]][6][sincn] +
+           lut[data[7]][7][sincn];
+}
+int32_t filter_table_stereo_64(lut_t lut, uint8_t *data, uint8_t sincn) {
+    return (int32_t)
+           lut[data[0]][0][sincn] +
+           lut[data[2]][1][sincn] +
+           lut[data[4]][2][sincn] +
+           lut[data[6]][3][sincn] +
+           lut[data[8]][4][sincn] +
+           lut[data[10]][5][sincn] +
+           lut[data[12]][6][sincn] +
+           lut[data[14]][7][sincn];
+}
+#if DECIMATION_MAX == 128
+int32_t filter_table_mono_128(lut_t lut, uint8_t *data, uint8_t sincn) {
+    return (int32_t)
+           lut[data[0]][0][sincn] +
+           lut[data[1]][1][sincn] +
+           lut[data[2]][2][sincn] +
+           lut[data[3]][3][sincn] +
+           lut[data[4]][4][sincn] +
+           lut[data[5]][5][sincn] +
+           lut[data[6]][6][sincn] +
+           lut[data[7]][7][sincn] +
+           lut[data[8]][8][sincn] +
+           lut[data[9]][9][sincn] +
+           lut[data[10]][10][sincn] +
+           lut[data[11]][11][sincn] +
+           lut[data[12]][12][sincn] +
+           lut[data[13]][13][sincn] +
+           lut[data[14]][14][sincn] +
+           lut[data[15]][15][sincn];
+}
+int32_t filter_table_stereo_128(lut_t lut, uint8_t *data, uint8_t sincn) {
+    return (int32_t)
+           lut[data[0]][0][sincn] +
+           lut[data[2]][1][sincn] +
+           lut[data[4]][2][sincn] +
+           lut[data[6]][3][sincn] +
+           lut[data[8]][4][sincn] +
+           lut[data[10]][5][sincn] +
+           lut[data[12]][6][sincn] +
+           lut[data[14]][7][sincn] +
+           lut[data[16]][8][sincn] +
+           lut[data[18]][9][sincn] +
+           lut[data[20]][10][sincn] +
+           lut[data[22]][11][sincn] +
+           lut[data[24]][12][sincn] +
+           lut[data[26]][13][sincn] +
+           lut[data[28]][14][sincn] +
+           lut[data[30]][15][sincn];
+}
+#endif
+int32_t (*filter_tables_64[2])(lut_t lut, uint8_t *data, uint8_t sincn) = {filter_table_mono_64, filter_table_stereo_64};
+#if DECIMATION_MAX == 128
+int32_t (*filter_tables_128[2])(lut_t lut, uint8_t *data, uint8_t sincn) = {filter_table_mono_128, filter_table_stereo_128};
+#endif
+#else
+int32_t filter_table(uint8_t *data, uint8_t sincn, TPDMFilter_InitStruct *param) {
+    uint8_t c, i;
+    uint16_t data_index = 0;
+    uint32_t *coef_p = ¶m->coef[sincn][0];
+    int32_t F = 0;
+    uint8_t decimation = param->Decimation;
+    uint8_t channels = param->In_MicChannels;
+
+    for (i = 0; i < decimation; i += 8) {
+        c = data[data_index];
+        F += ((c >> 7)) * coef_p[i    ] +
+            ((c >> 6) & 0x01) * coef_p[i + 1] +
+            ((c >> 5) & 0x01) * coef_p[i + 2] +
+            ((c >> 4) & 0x01) * coef_p[i + 3] +
+            ((c >> 3) & 0x01) * coef_p[i + 4] +
+            ((c >> 2) & 0x01) * coef_p[i + 5] +
+            ((c >> 1) & 0x01) * coef_p[i + 6] +
+            ((c) & 0x01) * coef_p[i + 7];
+        data_index += channels;
+    }
+    return F;
+}
+#endif
+
+void convolve(uint32_t Signal[] /* SignalLen */, unsigned short SignalLen,
+    uint32_t Kernel[] /* KernelLen */, unsigned short KernelLen,
+    uint32_t Result[] /* SignalLen + KernelLen - 1 */) {
+    uint16_t n;
+
+    for (n = 0; n < SignalLen + KernelLen - 1; n++)
+    {
+        unsigned short kmin, kmax, k;
+
+        Result[n] = 0;
+
+        kmin = (n >= KernelLen - 1) ? n - (KernelLen - 1) : 0;
+        kmax = (n < SignalLen - 1) ? n : SignalLen - 1;
+
+        for (k = kmin; k <= kmax; k++) {
+            Result[n] += Signal[k] * Kernel[n - k];
+        }
+    }
+}
+
+void Open_PDM_Filter_Init(TPDMFilter_InitStruct *Param) {
+    uint16_t i, j;
+    int64_t sum = 0;
+
+    uint8_t decimation = Param->Decimation;
+
+    for (i = 0; i < SINCN; i++) {
+        Param->Coef[i] = 0;
+        Param->bit[i] = 0;
+    }
+    for (i = 0; i < decimation; i++) {
+        Param->sinc1[i] = 1;
+    }
+
+    Param->OldOut = Param->OldIn = Param->OldZ = 0;
+    Param->LP_ALFA = (Param->LP_HZ != 0 ? (uint16_t)((float)Param->LP_HZ * 256 / (Param->LP_HZ + Param->Fs / (2 * 3.14159))) : 0);
+    Param->HP_ALFA = (Param->HP_HZ != 0 ? (uint16_t)((float)Param->Fs * 256 / (2 * 3.14159 * Param->HP_HZ + Param->Fs)) : 0);
+
+    Param->FilterLen = decimation * SINCN;
+    Param->sinc[0] = 0;
+    Param->sinc[decimation * SINCN - 1] = 0;
+    convolve(Param->sinc1, decimation, Param->sinc1, decimation, Param->sinc2);
+    convolve(Param->sinc2, (decimation << 1) - 1, Param->sinc1, decimation, &Param->sinc[1]);
+    for (j = 0; j < SINCN; j++) {
+        for (i = 0; i < decimation; i++) {
+            Param->coef[j][i] = Param->sinc[j * decimation + i];
+            sum += Param->sinc[j * decimation + i];
+        }
+    }
+
+    Param->sub_const = sum >> 1;
+    uint32_t div_const = Param->sub_const * Param->MaxVolume / 32768 / FILTER_GAIN;
+    Param->div_const = (div_const == 0 ? 1 : div_const);
+
+    #ifdef USE_LUT
+    /* Look-Up Table. */
+    uint16_t c, d, s;
+    for (s = 0; s < SINCN; s++)
+    {
+        uint32_t *coef_p = &Param->coef[s][0];
+        for (c = 0; c < 256; c++) {
+            for (d = 0; d < decimation / 8; d++) {
+                Param->lut[c][d][s] = ((c >> 7)) * coef_p[d * 8    ] +
+                    ((c >> 6) & 0x01) * coef_p[d * 8 + 1] +
+                    ((c >> 5) & 0x01) * coef_p[d * 8 + 2] +
+                    ((c >> 4) & 0x01) * coef_p[d * 8 + 3] +
+                    ((c >> 3) & 0x01) * coef_p[d * 8 + 4] +
+                    ((c >> 2) & 0x01) * coef_p[d * 8 + 5] +
+                    ((c >> 1) & 0x01) * coef_p[d * 8 + 6] +
+                    ((c) & 0x01) * coef_p[d * 8 + 7];
+            }
+        }
+    }
+    #endif
+}
+
+int Open_PDM_Filter_64(uint8_t *data, int16_t *dataOut, uint16_t volume, TPDMFilter_InitStruct *Param) {
+    uint8_t i, data_out_index;
+    uint8_t channels = Param->In_MicChannels;
+    uint8_t data_inc = ((DECIMATION_MAX >> 4) * channels);
+    int64_t Z, Z0, Z1, Z2;
+    int64_t OldOut, OldIn, OldZ;
+
+    OldOut = Param->OldOut;
+    OldIn = Param->OldIn;
+    OldZ = Param->OldZ;
+
+    #ifdef USE_LUT
+    uint8_t j = channels - 1;
+    #endif
+
+    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+        #ifdef USE_LUT
+        Z0 = filter_tables_64[j](Param->lut, data, 0);
+        Z1 = filter_tables_64[j](Param->lut, data, 1);
+        Z2 = filter_tables_64[j](Param->lut, data, 2);
+        #else
+        Z0 = filter_table(data, 0, Param);
+        Z1 = filter_table(data, 1, Param);
+        Z2 = filter_table(data, 2, Param);
+        #endif
+
+        Z = Param->Coef[1] + Z2 - Param->sub_const;
+        Param->Coef[1] = Param->Coef[0] + Z1;
+        Param->Coef[0] = Z0;
+
+        OldOut = (Param->HP_ALFA * (OldOut + Z - OldIn)) >> 8;
+        OldIn = Z;
+        OldZ = ((256 - Param->LP_ALFA) * OldZ + Param->LP_ALFA * OldOut) >> 8;
+
+        Z = OldZ * volume;
+        Z = RoundDiv(Z, (Param->div_const));
+        Z = SaturaLH(Z, -32700, 32700);
+
+        dataOut[data_out_index] = Z;
+        data += data_inc;
+    }
+
+    Param->OldOut = OldOut;
+    Param->OldIn = OldIn;
+    Param->OldZ = OldZ;
+    return data_out_index;
+}
+
+#if DECIMATION_MAX == 128
+int Open_PDM_Filter_128(uint8_t *data, int16_t *dataOut, uint16_t volume, TPDMFilter_InitStruct *Param) {
+    uint8_t i, data_out_index;
+    uint8_t channels = Param->In_MicChannels;
+    uint8_t data_inc = ((DECIMATION_MAX >> 3) * channels);
+    int64_t Z, Z0, Z1, Z2;
+    int64_t OldOut, OldIn, OldZ;
+
+    OldOut = Param->OldOut;
+    OldIn = Param->OldIn;
+    OldZ = Param->OldZ;
+
+    #ifdef USE_LUT
+    uint8_t j = channels - 1;
+    #endif
+
+    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+        #ifdef USE_LUT
+        Z0 = filter_tables_128[j](Param->lut, data, 0);
+        Z1 = filter_tables_128[j](Param->lut, data, 1);
+        Z2 = filter_tables_128[j](Param->lut, data, 2);
+        #else
+        Z0 = filter_table(data, 0, Param);
+        Z1 = filter_table(data, 1, Param);
+        Z2 = filter_table(data, 2, Param);
+        #endif
+
+        Z = Param->Coef[1] + Z2 - Param->sub_const;
+        Param->Coef[1] = Param->Coef[0] + Z1;
+        Param->Coef[0] = Z0;
+
+        OldOut = (Param->HP_ALFA * (OldOut + Z - OldIn)) >> 8;
+        OldIn = Z;
+        OldZ = ((256 - Param->LP_ALFA) * OldZ + Param->LP_ALFA * OldOut) >> 8;
+
+        Z = OldZ * volume;
+        Z = RoundDiv(Z, (Param->div_const));
+        Z = SaturaLH(Z, -32700, 32700);
+
+        dataOut[data_out_index] = Z;
+        data += data_inc;
+    }
+
+    Param->OldOut = OldOut;
+    Param->OldIn = OldIn;
+    Param->OldZ = OldZ;
+    return data_out_index;
+}
+#endif
diff --git a/ports/stm/common-hal/audiobusio/OpenPDMFilter.h b/ports/stm/common-hal/audiobusio/OpenPDMFilter.h
new file mode 100644
index 0000000000..a6e4a8c063
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/OpenPDMFilter.h
@@ -0,0 +1,112 @@
+/**
+ *******************************************************************************
+ * @file    OpenPDMFilter.h
+ * @author  CL
+ * @version V1.0.0
+ * @date    9-September-2015
+ * @brief   Header file for Open PDM audio software decoding Library.
+ *          This Library is used to decode and reconstruct the audio signal
+ *          produced by ST MEMS microphone (MP45Dxxx, MP34Dxxx).
+ *******************************************************************************
+ * @attention
+ *
+ * 
    © COPYRIGHT 2018 STMicroelectronics
    
+ *
+ * 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.
+ *******************************************************************************
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __OPENPDMFILTER_H
+#define __OPENPDMFILTER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+#include 
+
+/* Definitions ---------------------------------------------------------------*/
+
+/*
+ * Enable to use a Look-Up Table to improve performances while using more FLASH
+ * and RAM memory.
+ * Note: Without Look-Up Table up to stereo@16KHz configuration is supported.
+ */
+#define USE_LUT
+
+#define SINCN 3
+#define DECIMATION_MAX 128 // can be 128 but this didn't work for me
+#define FILTER_GAIN 16
+
+#define HTONS(A) ((((uint16_t)(A) & 0xff00) >> 8) | \
+    (((uint16_t)(A) & 0x00ff) << 8))
+
+#define RoundDiv(a, b) (((a) > 0) ? (((a) + (b) / 2) / (b)) : (((a) - (b) / 2) / (b)))
+
+#define SaturaLH(N, L, H) (((N) < (L)) ? (L) : (((N) > (H)) ? (H) : (N)))
+
+/* Types ---------------------------------------------------------------------*/
+
+typedef int32_t lut_t[256][DECIMATION_MAX / 8][SINCN];
+
+
+typedef struct
+{
+    /* Public */
+    uint16_t LP_HZ;
+    uint16_t HP_HZ;
+    uint16_t Fs;
+    unsigned int nSamples;
+    uint8_t In_MicChannels;
+    uint8_t Out_MicChannels;
+    uint8_t Decimation;
+    uint8_t MaxVolume;
+    /* Private */
+    uint32_t Coef[SINCN];
+    uint16_t FilterLen;
+    int64_t OldOut, OldIn, OldZ;
+    uint16_t LP_ALFA;
+    uint16_t HP_ALFA;
+    uint16_t bit[5];
+    uint16_t byte;
+    uint32_t div_const;
+    int64_t sub_const;
+    uint32_t sinc[DECIMATION_MAX * SINCN];
+    uint32_t sinc1[DECIMATION_MAX];
+    uint32_t sinc2[DECIMATION_MAX * 2];
+    uint32_t coef[SINCN][DECIMATION_MAX];
+    #ifdef USE_LUT
+    lut_t lut;
+    #endif
+} TPDMFilter_InitStruct;
+
+/* Exported functions ------------------------------------------------------- */
+
+void Open_PDM_Filter_Init(TPDMFilter_InitStruct *init_struct);
+int Open_PDM_Filter_64(uint8_t *data, int16_t *data_out, uint16_t mic_gain, TPDMFilter_InitStruct *init_struct);
+
+#if DECIMATION_MAX == 128
+int Open_PDM_Filter_128(uint8_t *data, int16_t *data_out, uint16_t mic_gain, TPDMFilter_InitStruct *init_struct);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __OPENPDMFILTER_H
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm/common-hal/audiobusio/PDMIn.c b/ports/stm/common-hal/audiobusio/PDMIn.c
new file mode 100644
index 0000000000..b1aa2047d8
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/PDMIn.c
@@ -0,0 +1,199 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+#include "common-hal/audiobusio/PDMIn.h"
+#include "shared-bindings/audiobusio/PDMIn.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+#include "supervisor/memory.h"
+#include "MEMS_Audio_ll_stm32l4.h"
+
+
+MemsAudio memsAudio;
+MemsAudio_STM32L4SAIPDM memsAudioImpl;
+pdm_sample_t pdmBuffer[MEMS_AUDIO_PDM_BUFFER_LENGTH];
+audiobusio_pdmin_obj_t *instance;
+
+static bool pdm_data_available(MemsAudio_STM32L4SAIPDM *impl, uint8_t *pdmBuffer, size_t pdmBufferLength);
+
+// Caller validates that pins are free.
+void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self,
+    const mcu_pin_obj_t *clock_pin,
+    const mcu_pin_obj_t *data_pin,
+    uint32_t sample_rate,
+    uint8_t bit_depth,
+    bool mono,
+    uint8_t oversample) {
+    self->sample_rate = sample_rate;
+    self->mono = mono;
+    self->oversample = oversample;
+    self->recording_complete = true;
+
+
+    if (!mono) {
+        mp_raise_ValueError(translate("only mono is supported"));
+    }
+    if (sample_rate != 16000) {
+        mp_raise_ValueError(translate("only sample_rate=16000 is supported"));
+    }
+    if (bit_depth != 16) {
+        mp_raise_ValueError(translate("only bit_depth=16 is supported"));
+    }
+    if (oversample != 64) {
+        mp_raise_ValueError(translate("only oversample=64 is supported"));
+    }
+
+    // wait for the previous instance to finish.
+    if (instance) {
+        common_hal_audiobusio_pdmin_deinit(instance);
+    }
+    instance = self;
+
+    memset(&memsAudio, 0, sizeof(memsAudio));
+    memset(&memsAudioImpl, 0, sizeof(memsAudioImpl));
+
+    common_hal_mcu_pin_claim(clock_pin);
+    self->clock_pin = clock_pin;
+    common_hal_mcu_pin_claim(data_pin);
+    self->data_pin = data_pin;
+
+    self->audio = &memsAudio;
+    self->audio_impl = &memsAudioImpl;
+    self->audio_impl->pdmBuffer = pdmBuffer;
+    self->audio_impl->pdmBufferLength = sizeof(pdmBuffer) / sizeof(pdmBuffer[0]);
+    self->audio_impl->pdm_data_available = pdm_data_available;
+
+    mems_audio_init_stm32l4_sai_pdm(self->audio, self->audio_impl);
+    mems_audio_record(self->audio);
+    mems_audio_pause(self->audio);
+}
+
+bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t *self) {
+    return self->clock_pin == NULL;
+}
+
+void wait_dma_complete(audiobusio_pdmin_obj_t *self) {
+    while (!self->recording_complete) {
+        MICROPY_VM_HOOK_LOOP;
+    }
+}
+
+void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t *self) {
+    if (instance != self) {
+        return;
+    }
+    instance = NULL;
+    if (self->audio) {
+        wait_dma_complete(self);
+        mems_audio_stop(self->audio);
+        mems_audio_uninit(self->audio);
+        self->audio = NULL;
+        self->audio_impl = NULL;
+    }
+
+    if (self->data_pin) {
+        common_hal_reset_pin(self->data_pin);
+        self->data_pin = NULL;
+    }
+    if (self->clock_pin) {
+        common_hal_reset_pin(self->clock_pin);
+        self->clock_pin = NULL;
+    }
+
+
+}
+
+uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t *self) {
+    return 16;
+}
+
+uint32_t common_hal_audiobusio_pdmin_get_sample_rate(audiobusio_pdmin_obj_t *self) {
+    return 16000;
+}
+
+static bool pdm_data_available(MemsAudio_STM32L4SAIPDM *impl, uint8_t *pdmBuffer, size_t pdmBufferLength) {
+    // update the filter with the correct number of samples
+
+    audiobusio_pdmin_obj_t *pdmIn = (audiobusio_pdmin_obj_t *)(impl->audio->userData);
+    MemsAudio *audio = impl->audio;
+
+    uint32_t pcmSamplesAvailable = pdmBufferLength * 8 / PDM_IN_DECIMATION_FACTOR;
+    if (pcmSamplesAvailable > audio->pcmOutputBufferLength) {
+        pcmSamplesAvailable = audio->pcmOutputBufferLength;
+    }
+
+    // ensure the filter doesn't try to produce more samples than available
+    pdmIn->audio_impl->filter.nSamples = pcmSamplesAvailable;
+
+    return pcmSamplesAvailable > 0;
+}
+
+static void pcm_data_available(MemsAudio *audio, int16_t *pcmBuffer, size_t pcmBufferLength) {
+    // data is already in the output buffer
+    audiobusio_pdmin_obj_t *pdmIn = (audiobusio_pdmin_obj_t *)(audio->userData);
+
+    // if DMA copies more data than will fit into the output buffer, crop the length to what will fit
+    if (audio->pcmOutputBufferLength < pcmBufferLength) {
+        pcmBufferLength = audio->pcmOutputBufferLength;
+    }
+
+    audio->pcmOutputBuffer += pcmBufferLength;
+    audio->pcmOutputBufferLength -= pcmBufferLength;
+    if (audio->pcmOutputBufferLength == 0) {
+        pdmIn->recording_complete = true;
+        mems_audio_pause(audio);
+    }
+}
+
+uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t *self,
+    uint16_t *output_buffer, uint32_t output_buffer_length) {
+
+    MemsAudio *audio = self->audio;
+
+    wait_dma_complete(self);
+
+    audio->pcmOutputBuffer = (int16_t *)output_buffer;
+    audio->pcmOutputBufferLength = output_buffer_length;
+    audio->pcm_data_available = pcm_data_available;
+    audio->userData = self;         /// reference back to the PDMIn instance
+    self->recording_complete = false;
+
+    mems_audio_err_t err = mems_audio_resume(audio);
+    if (!IS_MEMS_AUDIO_ERROR(err)) {
+        wait_dma_complete(self);
+    }
+
+    mems_audio_pause(audio);
+    int samples_output = (int)(output_buffer_length) - audio->pcmOutputBufferLength;
+
+    // convert from signed to unsigned (min-point moves from 0 to 32k)
+    for (int i = 0; i < samples_output; i++) {
+        output_buffer[i] += 0x8000;
+    }
+
+    return samples_output;
+}
diff --git a/ports/stm/common-hal/audiobusio/PDMIn.h b/ports/stm/common-hal/audiobusio/PDMIn.h
new file mode 100644
index 0000000000..b6ef4ee8bf
--- /dev/null
+++ b/ports/stm/common-hal/audiobusio/PDMIn.h
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_STM_COMMON_HAL_AUDIOBUSIO_AUDIOOUT_H
+#define MICROPY_INCLUDED_STM_COMMON_HAL_AUDIOBUSIO_AUDIOOUT_H
+
+#include 
+#include "py/obj.h"
+#include "peripherals/pins.h"
+#include "supervisor/memory.h"
+
+typedef struct MemsAudio_t MemsAudio;
+typedef struct MemsAudio_STM32L4SAIPDM_t MemsAudio_STM32L4SAIPDM;
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *clock_pin;
+    const mcu_pin_obj_t *data_pin;
+    uint32_t sample_rate;
+    uint8_t bit_depth;
+    bool mono;
+    uint8_t oversample;
+    supervisor_allocation *audio_allocation;
+    MemsAudio *audio;
+    MemsAudio_STM32L4SAIPDM *audio_impl;
+    /**
+     * @brief Flag to indicate from the ISR that recording is complete.
+     */
+    volatile bool recording_complete;
+} audiobusio_pdmin_obj_t;
+
+
+#endif
diff --git a/ports/stm/common-hal/audiobusio/__init__.c b/ports/stm/common-hal/audiobusio/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/supervisor/shared/memory.c b/supervisor/shared/memory.c
index 06c568b42e..a5f3296a28 100644
--- a/supervisor/shared/memory.c
+++ b/supervisor/shared/memory.c
@@ -58,6 +58,9 @@ enum {
         #endif
 
         + CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS
+        #if CIRCUITPY_AUDIOBUSIO_PDMIN
+        + 1
+        #endif
     ,
 
     CIRCUITPY_SUPERVISOR_MOVABLE_ALLOC_COUNT =

From 9dc559bb90bcb8ced99014ea8992087dd7c24a07 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 5 Nov 2022 11:50:19 -0500
Subject: [PATCH 1324/2403] uasyncio: fix definition of ticks again

supervisor_ticks_ms is ALREADY a small int, so passing it to
MP_OBJ_SMALL_INT again messes things up. I don't know why this passed
muster with the C type system, but oh well.
---
 extmod/moduasyncio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 8af32f21d9..1e1c5de7e7 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -83,7 +83,7 @@ STATIC mp_obj_t ticks(void) {
 // shared-bindings/supervisor/__init__.c). We assume/require that
 // supervisor.ticks_ms is picked as the ticks implementation under
 // CircuitPython for the Python-coded bits of asyncio.
-#define ticks() MP_OBJ_NEW_SMALL_INT(supervisor_ticks_ms())
+#define ticks() supervisor_ticks_ms()
 #endif
 
 STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {

From 452ebe27aec89c973f2b8385729d9ce95b7c026c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 5 Nov 2022 11:24:36 -0500
Subject: [PATCH 1325/2403] socketpool: make socket objects selectable

.. which will lead to them being usable in async contexts, pending
relevant changes in asyncio
---
 .../espressif/common-hal/socketpool/Socket.c  | 24 +++++++++++
 .../common-hal/socketpool/Socket.c            | 43 +++++++++++++++++++
 shared-bindings/socketpool/Socket.c           | 35 +++++++++++++--
 shared-bindings/socketpool/Socket.h           |  3 +-
 4 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 53db7ab393..ce177f3821 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -553,3 +553,27 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
 void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms) {
     self->timeout_ms = timeout_ms;
 }
+
+bool common_hal_socketpool_readable(socketpool_socket_obj_t *self) {
+    struct timeval immediate = {0, 0};
+
+    fd_set fds;
+    FD_ZERO(&fds);
+    FD_SET(self->num, &fds);
+    int num_triggered = select(self->num + 1, &fds, NULL, &fds, &immediate);
+
+    // including returning true in the error case
+    return num_triggered != 0;
+}
+
+bool common_hal_socketpool_writable(socketpool_socket_obj_t *self) {
+    struct timeval immediate = {0, 0};
+
+    fd_set fds;
+    FD_ZERO(&fds);
+    FD_SET(self->num, &fds);
+    int num_triggered = select(self->num + 1, NULL, &fds, &fds, &immediate);
+
+    // including returning true in the error case
+    return num_triggered != 0;
+}
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index a099ef9f79..440fe56d42 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -1163,3 +1163,46 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *socket,
 void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms) {
     self->timeout = timeout_ms;
 }
+
+bool common_hal_socketpool_readable(socketpool_socket_obj_t *self) {
+
+    MICROPY_PY_LWIP_ENTER;
+
+    bool result = self->incoming.pbuf != NULL;
+
+    if (self->state == STATE_PEER_CLOSED) {
+        result = true;
+    }
+
+    if (self->type == SOCKETPOOL_SOCK_STREAM && self->pcb.tcp->state == LISTEN) {
+        struct tcp_pcb *volatile *incoming_connection = &lwip_socket_incoming_array(self)[self->incoming.connection.iget];
+        result = (incoming_connection != NULL);
+    }
+
+    MICROPY_PY_LWIP_EXIT;
+
+    return result;
+}
+
+bool common_hal_socketpool_writable(socketpool_socket_obj_t *self) {
+    bool result = false;
+
+    MICROPY_PY_LWIP_ENTER;
+
+    switch (self->type) {
+        case SOCKETPOOL_SOCK_STREAM: {
+            result = tcp_sndbuf(self->pcb.tcp) != 0;
+            break;
+        }
+        case SOCKETPOOL_SOCK_DGRAM:
+        #if MICROPY_PY_LWIP_SOCK_RAW
+        case SOCKETPOOL_SOCK_RAW:
+        #endif
+            result = true;
+            break;
+    }
+
+    MICROPY_PY_LWIP_EXIT;
+
+    return result;
+}
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 89b23125c5..7a60463c4b 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -30,13 +30,14 @@
 #include 
 #include 
 
-#include "shared/runtime/context_manager_helpers.h"
-#include "py/objtuple.h"
-#include "py/objlist.h"
-#include "py/runtime.h"
 #include "py/mperrno.h"
+#include "py/objlist.h"
+#include "py/objtuple.h"
+#include "py/runtime.h"
+#include "py/stream.h"
 
 #include "shared/netutils/netutils.h"
+#include "shared/runtime/context_manager_helpers.h"
 #include "shared/runtime/interrupt_char.h"
 
 //| class Socket:
@@ -422,6 +423,31 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(socketpool_socket_locals_dict, socketpool_socket_locals_dict_table);
 
+STATIC mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        mp_uint_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && common_hal_socketpool_readable(self) > 0) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && common_hal_socketpool_writable(self)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t socket_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
+    .ioctl = socket_ioctl,
+    .is_text = false,
+};
+
 const mp_obj_type_t socketpool_socket_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED,
@@ -429,5 +455,6 @@ const mp_obj_type_t socketpool_socket_type = {
     .locals_dict = (mp_obj_dict_t *)&socketpool_socket_locals_dict,
     MP_TYPE_EXTENDED_FIELDS(
         .unary_op = mp_generic_unary_op,
+        .protocol = &socket_stream_p,
         )
 };
diff --git a/shared-bindings/socketpool/Socket.h b/shared-bindings/socketpool/Socket.h
index c6c2a66630..cf5a97a428 100644
--- a/shared-bindings/socketpool/Socket.h
+++ b/shared-bindings/socketpool/Socket.h
@@ -46,6 +46,8 @@ mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const
 mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
     const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len);
 void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms);
+bool common_hal_socketpool_readable(socketpool_socket_obj_t *self);
+bool common_hal_socketpool_writable(socketpool_socket_obj_t *self);
 
 // Non-allocating versions for internal use.
 int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port);
@@ -53,5 +55,4 @@ void socketpool_socket_close(socketpool_socket_obj_t *self);
 int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len);
 int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
     const uint8_t *buf, uint32_t len);
-
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKET_H

From 2c2c9153ec7c24975048d90bd457138de4ee5f1a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 5 Nov 2022 11:33:47 -0500
Subject: [PATCH 1326/2403] uselect: Allow interrupting poll with ctrl-c

---
 extmod/moduselect.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 5744d2839c..d388438313 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -16,6 +16,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "shared/runtime/interrupt_char.h"
 
 // Flags for poll()
 #define FLAG_ONESHOT (1)
@@ -230,6 +231,9 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
             break;
         }
         RUN_BACKGROUND_TASKS;
+        if (mp_hal_is_interrupted()) {
+            return 0;
+        }
     }
 
     return n_ready;

From f1e658f8bb312c41fdd2fa64094e5b2413c9939c Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Sun, 6 Nov 2022 22:07:12 +0100
Subject: [PATCH 1327/2403] Update sdkonfig

---
 ports/espressif/boards/maker_badge/sdkonfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/maker_badge/sdkonfig b/ports/espressif/boards/maker_badge/sdkonfig
index 5a33657fdc..68689ed79e 100644
--- a/ports/espressif/boards/maker_badge/sdkonfig
+++ b/ports/espressif/boards/maker_badge/sdkonfig
@@ -2,5 +2,5 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=n
 
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+CONFIG_LWIP_LOCAL_HOSTNAME="Maker_badge"
 # end of LWIP

From a568a5c2e25bb873f183633befe22f082a48801b Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Sun, 6 Nov 2022 22:14:19 +0100
Subject: [PATCH 1328/2403] Rename sdkonfig to sdkconfig

---
 ports/espressif/boards/maker_badge/{sdkonfig => sdkconfig} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ports/espressif/boards/maker_badge/{sdkonfig => sdkconfig} (100%)

diff --git a/ports/espressif/boards/maker_badge/sdkonfig b/ports/espressif/boards/maker_badge/sdkconfig
similarity index 100%
rename from ports/espressif/boards/maker_badge/sdkonfig
rename to ports/espressif/boards/maker_badge/sdkconfig

From 9cdfba2e47ff148439e9c03dc5298ce5364bc691 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 7 Nov 2022 09:47:56 -0600
Subject: [PATCH 1329/2403] Simplify argument checking to reduce translated
 strings

Build size on proxlight trinkey m0 en_US:
Before:  2412 (en_US)  820 (ru)
After:   2544 (en_US)  984 (ru)
Savings: +132 (en_US) +164 (ru) bytes available flash
---
 locale/circuitpython.pot                 | 44 ++----------------------
 py/obj.c                                 | 26 ++------------
 py/objstr.c                              |  4 +--
 py/objtype.c                             |  4 +--
 shared-bindings/busio/UART.c             |  4 +--
 shared-bindings/touchio/TouchIn.c        |  5 +--
 shared-bindings/usb_hid/__init__.c       |  4 +--
 shared-bindings/watchdog/WatchDogTimer.c |  8 ++---
 8 files changed, 13 insertions(+), 86 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 768daa8651..779a75deb6 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -110,10 +110,6 @@ msgstr ""
 msgid "%q index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2341,10 +2337,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3166,10 +3158,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3586,10 +3574,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3863,11 +3847,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3931,10 +3910,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4047,10 +4022,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4062,10 +4033,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4119,10 +4086,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4201,7 +4164,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4272,10 +4236,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
diff --git a/py/obj.c b/py/obj.c
index da609aa8ce..af2f4c1b68 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -488,14 +488,7 @@ void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
 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
-        mp_raise_ValueError(MP_ERROR_TEXT("tuple/list has wrong length"));
-        #else
-        mp_raise_ValueError_varg(
-            MP_ERROR_TEXT("requested length %d but object has length %d"), (int)len, (int)seq_len);
-        #endif
-    }
+    mp_arg_validate_length(seq_len, len, mp_obj_get_type(o)->name);
 }
 
 // is_slice determines whether the index is a slice index
@@ -504,13 +497,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
-        mp_raise_TypeError(MP_ERROR_TEXT("indices must be integers"));
-        #else
-        mp_raise_TypeError_varg(
-            MP_ERROR_TEXT("%q indices must be integers, not %s"),
-            type->name, mp_obj_get_type_str(index));
-        #endif
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), MP_QSTR_index, MP_QSTR_int);
     }
 
     if (i < 0) {
@@ -523,14 +510,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
             i = len;
         }
     } else {
-        if (i < 0 || (mp_uint_t)i >= len) {
-            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
-            mp_raise_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);
-            #endif
-        }
+        mp_arg_validate_index_range(i, 0, len - 1, MP_QSTR_index);
     }
 
     // By this point 0 <= i <= len and so fits in a size_t
diff --git a/py/objstr.c b/py/objstr.c
index df735a45cd..fbb044c65e 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -986,7 +986,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             #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"));
+            mp_raise_ValueError_varg(MP_ERROR_TEXT("unmatched '%c' in format"), '}');
             #endif
         }
         if (*str != '{') {
@@ -1063,7 +1063,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
-            mp_raise_ValueError(MP_ERROR_TEXT("unmatched '{' in format"));
+            mp_raise_ValueError_varg(MP_ERROR_TEXT("unmatched '%c' in format"), '{');
             #endif
         }
         if (*str != '}') {
diff --git a/py/objtype.c b/py/objtype.c
index 071065041f..0914ad5f2e 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1181,9 +1181,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     mp_obj_t *bases_items;
     mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
     for (size_t i = 0; i < bases_len; i++) {
-        if (!mp_obj_is_type(bases_items[i], &mp_type_type)) {
-            mp_raise_TypeError(MP_ERROR_TEXT("type is not an acceptable base type"));
-        }
+        mp_arg_validate_type(bases_items[i], &mp_type_type, MP_QSTR___class__);
         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) {
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index eb4f15afe5..eb1d1685a5 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -91,9 +91,7 @@ extern const busio_uart_parity_obj_t busio_uart_parity_odd_obj;
 
 #if CIRCUITPY_BUSIO_UART
 STATIC void validate_timeout(mp_float_t timeout) {
-    if (timeout < (mp_float_t)0.0f || timeout > (mp_float_t)100.0f) {
-        mp_raise_ValueError(translate("timeout must be 0.0-100.0 seconds"));
-    }
+    mp_arg_validate_int_range((int)timeout, 0, 100, MP_QSTR_timeout);
 }
 #endif  // CIRCUITPY_BUSIO_UART
 
diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 63da84e885..226fa445da 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -159,10 +159,7 @@ STATIC mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t thr
     touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
     uint32_t new_threshold = mp_obj_get_int(threshold_obj);
-    if (new_threshold < 0 || new_threshold > UINT16_MAX) {
-        // I would use MP_STRINGIFY(UINT16_MAX), but that prints "0xffff" instead of 65536.
-        mp_raise_ValueError(translate("threshold must be in the range 0-65536"));
-    }
+    mp_arg_validate_int_range(new_threshold, 0, UINT16_MAX, MP_QSTR_threshold);
     common_hal_touchio_touchin_set_threshold(self, new_threshold);
     return mp_const_none;
 }
diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c
index 1c51502455..9cb9303143 100644
--- a/shared-bindings/usb_hid/__init__.c
+++ b/shared-bindings/usb_hid/__init__.c
@@ -123,9 +123,7 @@ STATIC mp_obj_t usb_hid_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     const mp_int_t len = mp_obj_get_int(mp_obj_len(devices));
     for (mp_int_t i = 0; i < len; i++) {
         mp_obj_t item = mp_obj_subscr(devices, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
-        if (!mp_obj_is_type(item, &usb_hid_device_type)) {
-            mp_raise_ValueError_varg(translate("non-Device in %q"), MP_QSTR_devices);
-        }
+        mp_arg_validate_type(item, &usb_hid_device_type, MP_QSTR___class__);
     }
 
     uint8_t boot_device =
diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c
index 1d47e88b9f..acfd353c34 100644
--- a/shared-bindings/watchdog/WatchDogTimer.c
+++ b/shared-bindings/watchdog/WatchDogTimer.c
@@ -94,9 +94,7 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_
     watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_float_t timeout = mp_obj_get_float(timeout_obj);
 
-    if (timeout <= 0) {
-        mp_raise_ValueError(translate("watchdog timeout must be greater than 0"));
-    }
+    mp_arg_validate_int_min((int)timeout, 0, MP_QSTR_timeout);
 
     common_hal_watchdog_set_timeout(self, timeout);
     return mp_const_none;
@@ -136,9 +134,7 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t m
 
     // When setting the mode, the timeout value must be greater than zero
     if (new_mode == WATCHDOGMODE_RESET || new_mode == WATCHDOGMODE_RAISE) {
-        if (current_timeout <= 0) {
-            mp_raise_ValueError(translate("WatchDogTimer.timeout must be greater than 0"));
-        }
+        mp_arg_validate_int_min((int)current_timeout, 0, MP_QSTR_timeout);
     }
 
     // Don't allow changing the mode once the watchdog timer has been started

From 319d9b04f13389bdc6469fe19771125f2b4ef719 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 7 Nov 2022 13:51:58 -0600
Subject: [PATCH 1330/2403] Fix type annotation mistake

---
 shared-bindings/terminalio/Terminal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 2dfe29035e..46e171ff7e 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -61,7 +61,7 @@
 //|         scroll_area: displayio.TileGrid,
 //|         font: fontio.BuiltinFont,
 //|         *,
-//|         status_bar: displayio.TileGrid = None
+//|         status_bar: Optional[displayio.TileGrid] = None
 //|     ) -> None:
 //|         """Terminal manages tile indices and cursor position based on VT100 commands. The font should be
 //|         a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap."""

From 9f3d3ed9b07fc7bc924627e5b7425c74f162fdb9 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 8 Nov 2022 00:29:35 +0100
Subject: [PATCH 1331/2403] 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             | 47 +++--------------------
 locale/cs.po             | 47 +++--------------------
 locale/de_DE.po          | 80 +++++++++++++++++++---------------------
 locale/el.po             | 47 +++--------------------
 locale/en_GB.po          | 80 +++++++++++++++++++---------------------
 locale/es.po             | 80 +++++++++++++++++++---------------------
 locale/fil.po            | 68 +++++++++++++---------------------
 locale/fr.po             | 80 +++++++++++++++++++---------------------
 locale/hi.po             | 44 +---------------------
 locale/it_IT.po          | 68 +++++++++++++---------------------
 locale/ja.po             | 74 ++++++++++++++++---------------------
 locale/ko.po             | 47 +++--------------------
 locale/nl.po             | 77 +++++++++++++++++---------------------
 locale/pl.po             | 71 ++++++++++++++---------------------
 locale/pt_BR.po          | 80 +++++++++++++++++++---------------------
 locale/ru.po             | 47 +++--------------------
 locale/sv.po             | 80 +++++++++++++++++++---------------------
 locale/tr.po             | 47 +++--------------------
 locale/zh_Latn_pinyin.po | 80 +++++++++++++++++++---------------------
 19 files changed, 434 insertions(+), 810 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 6741923b7d..85089303e3 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -116,10 +116,6 @@ msgstr "%q sedang digunakan"
 msgid "%q index out of range"
 msgstr "%q indeks di luar batas"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "indeks %q harus bilangan bulat, bukan %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2372,10 +2368,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3197,10 +3189,6 @@ msgstr ""
 msgid "index out of range"
 msgstr "index keluar dari jangkauan"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3617,10 +3605,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3895,11 +3879,6 @@ msgstr ""
 msgid "relative import"
 msgstr "relative import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3963,10 +3942,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4079,10 +4054,6 @@ msgstr "sintaksis error pada JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "sintaksis error pada pendeskripsi uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4094,10 +4065,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4151,10 +4118,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4233,7 +4196,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4304,10 +4268,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4395,6 +4355,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "indeks %q harus bilangan bulat, bukan %s"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Untuk keluar, silahkan reset board tanpa "
 
diff --git a/locale/cs.po b/locale/cs.po
index 9159489fe5..c0a27df166 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -117,10 +117,6 @@ msgstr "%q se právě používá"
 msgid "%q index out of range"
 msgstr "Index %q je mimo rozsah"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "Indexy %q musí být celá čísla, nikoli %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "Inicializace %q selhala"
@@ -2359,10 +2355,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3184,10 +3176,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3604,10 +3592,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3881,11 +3865,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3949,10 +3928,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4065,10 +4040,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4080,10 +4051,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4137,10 +4104,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4219,7 +4182,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4290,10 +4254,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4381,6 +4341,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "Indexy %q musí být celá čísla, nikoli %s"
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Obraz firmwaru je nevalidní"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6fc8b9758b..17676cfa51 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -118,10 +118,6 @@ msgstr "%q in Benutzung"
 msgid "%q index out of range"
 msgstr "Der Index %q befindet sich außerhalb des Bereiches"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q Indizes müssen Integer sein, nicht %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q Initialisierung ist gescheitert"
@@ -2406,10 +2402,6 @@ msgstr ""
 "WatchDogTimer.mode kann nicht geändert werden, nachdem er auf WatchDogMode."
 "RESET gesetzt wurde"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout muss größer als 0 sein"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3254,10 +3246,6 @@ msgstr "Index ist außerhalb der Grenzen"
 msgid "index out of range"
 msgstr "index außerhalb der Reichweite"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "Indizes müssen Integer sein"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "Indizes müssen Integer, Slices oder Boolesche Listen sein"
@@ -3680,10 +3668,6 @@ msgstr "keine Antwort von der SD-Karte"
 msgid "no such attribute"
 msgstr "kein solches Attribut"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "Nicht-Gerät in %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3962,11 +3946,6 @@ msgstr "Real- und Imaginärteile müssen gleich lang sein"
 msgid "relative import"
 msgstr "relativer Import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "die ersuchte Länge ist %d, aber das Objekt hat eine Länge von %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "Ergebnisse können nicht in den angegebenen Typ umgewandelt werden"
@@ -4030,10 +4009,6 @@ msgstr "Vorzeichen nicht erlaubt in einem String formatierungs specifier"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "Vorzeichen mit ganzzahligem Formatbezeichner 'c' nicht erlaubt"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "einzelne '}' in Formatierungs-String gefunden"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "Größe ist nur für ndarrays definiert"
@@ -4147,10 +4122,6 @@ msgstr "Syntaxfehler in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "Syntaxfehler in uctypes Deskriptor"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "threshold muss im Intervall 0-65536 liegen"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() nimmt eine 9-Sequenz an"
@@ -4162,10 +4133,6 @@ msgstr "time.struct_time() nimmt eine 9-Sequenz an"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "Das Zeitlimit hat den maximal zulässigen Wert überschritten"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "Das Zeitlimit muss 0,0-100,0 Sekunden betragen"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "timeout muss kleiner als 655.35 Sekunden sein"
@@ -4219,10 +4186,6 @@ msgstr "trapz ist für 1D-Arrays gleicher Länge definiert"
 msgid "trapz is defined for 1D iterables"
 msgstr "trapz ist für 1D-Iterables definiert"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tupel/list hat falsche Länge"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4303,8 +4266,9 @@ msgid "unknown type '%q'"
 msgstr "unbekannter Typ '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "'{' ohne passende Zuordnung im Format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4374,10 +4338,6 @@ msgstr "value_count muss größer als 0 sein"
 msgid "watchdog not initialized"
 msgstr "watchdog nicht initialisiert"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "watchdog Zeitlimit muss größer als 0 sein"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "Breite muss größer als 0 sein"
@@ -4465,6 +4425,40 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q Indizes müssen Integer sein, nicht %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout muss größer als 0 sein"
+
+#~ msgid "indices must be integers"
+#~ msgstr "Indizes müssen Integer sein"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "Nicht-Gerät in %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "die ersuchte Länge ist %d, aber das Objekt hat eine Länge von %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "einzelne '}' in Formatierungs-String gefunden"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "threshold muss im Intervall 0-65536 liegen"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "Das Zeitlimit muss 0,0-100,0 Sekunden betragen"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tupel/list hat falsche Länge"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "'{' ohne passende Zuordnung im Format"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "watchdog Zeitlimit muss größer als 0 sein"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Zum beenden, resette bitte das board ohne "
 
diff --git a/locale/el.po b/locale/el.po
index 59e69f257f..6441c013b8 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -122,10 +122,6 @@ msgstr "%q είναι σε χρήση"
 msgid "%q index out of range"
 msgstr "%q δείκτης εκτός εμβέλειας"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q εκκίνηση απέτυχε"
@@ -2368,10 +2364,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3193,10 +3185,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3613,10 +3601,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3890,11 +3874,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3958,10 +3937,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4074,10 +4049,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4089,10 +4060,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4146,10 +4113,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4228,7 +4191,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4299,10 +4263,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4390,6 +4350,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι %s"
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q πρέπει να είναι >= 0"
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 7b111a211a..f2941c143e 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -120,10 +120,6 @@ msgstr "%q in use"
 msgid "%q index out of range"
 msgstr "%q index out of range"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indices must be integers, not %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2374,10 +2370,6 @@ msgstr "WatchDogTimer is not currently running"
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout must be greater than 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3203,10 +3195,6 @@ msgstr "index is out of bounds"
 msgid "index out of range"
 msgstr "index out of range"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "indices must be integers"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "indices must be integers, slices, or Boolean lists"
@@ -3623,10 +3611,6 @@ msgstr "no response from SD card"
 msgid "no such attribute"
 msgstr "no such attribute"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "non-Device in %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3900,11 +3884,6 @@ msgstr "real and imaginary parts must be of equal length"
 msgid "relative import"
 msgstr "relative import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "requested length %d but object has length %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "results cannot be cast to specified type"
@@ -3968,10 +3947,6 @@ msgstr "sign not allowed in string format specifier"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "sign not allowed with integer format specifier 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "single '}' encountered in format string"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "size is defined for ndarrays only"
@@ -4084,10 +4059,6 @@ msgstr "syntax error in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntax error in uctypes descriptor"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "threshold must be in the range 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() takes a 9-sequence"
@@ -4099,10 +4070,6 @@ msgstr "time.struct_time() takes a 9-sequence"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "timeout duration exceeded the maximum supported value"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "timeout must be 0.0-100.0 seconds"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "timeout must be < 655.35 secs"
@@ -4156,10 +4123,6 @@ msgstr "trapz is defined for 1D arrays of equal length"
 msgid "trapz is defined for 1D iterables"
 msgstr "trapz is defined for 1D iterables"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tuple/list has wrong length"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4238,8 +4201,9 @@ msgid "unknown type '%q'"
 msgstr "unknown type '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4309,10 +4273,6 @@ msgstr "value_count must be > 0"
 msgid "watchdog not initialized"
 msgstr "WatchDog not initialised"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "WatchDog timeout must be greater than 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "width must be greater than zero"
@@ -4400,6 +4360,40 @@ 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 "%q indices must be integers, not %s"
+#~ msgstr "%q indices must be integers, not %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout must be greater than 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "indices must be integers"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "non-Device in %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "requested length %d but object has length %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "single '}' encountered in format string"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "threshold must be in the range 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "timeout must be 0.0-100.0 seconds"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tuple/list has wrong length"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "unmatched '{' in format"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "WatchDog timeout must be greater than 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "To exit, please reset the board without "
 
diff --git a/locale/es.po b/locale/es.po
index 5f3837732f..477c7804d0 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -122,10 +122,6 @@ msgstr "%q está siendo utilizado"
 msgid "%q index out of range"
 msgstr "%q indice fuera de rango"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indices deben ser enteros, no %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q inicializado fallido"
@@ -2409,10 +2405,6 @@ msgstr ""
 "WatchDogTimer.mode no se puede modificar luego de configurar WatchDogMode."
 "RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout debe ser mayor a 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3243,10 +3235,6 @@ msgstr "el índice está fuera de límites"
 msgid "index out of range"
 msgstr "index fuera de rango"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "indices deben ser enteros"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "los índices deben ser enteros, particiones o listas de booleanos"
@@ -3667,10 +3655,6 @@ msgstr "no hay respuesta de la tarjeta SD"
 msgid "no such attribute"
 msgstr "no hay tal atributo"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "hay un no-Device en %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3947,11 +3931,6 @@ msgstr "las partes reales e imaginarias deben ser de igual longitud"
 msgid "relative import"
 msgstr "import relativo"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "longitud solicitada %d pero el objeto tiene longitud %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "resultados no pueden aplicar cast a un tipo específico"
@@ -4015,10 +3994,6 @@ msgstr "signo no permitido en el espeficador de string format"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "signo no permitido con el especificador integer format 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "un solo '}' encontrado en format string"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "el tamaño se define solo para ndarrays"
@@ -4131,10 +4106,6 @@ msgstr "error de sintaxis en JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "error de sintaxis en el descriptor uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "limite debe ser en el rango 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() toma un sequencio 9"
@@ -4147,10 +4118,6 @@ msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 "la duración de tiempo de espera ha excedido la capacidad máxima del valor"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "el tiempo de espera debe ser 0.0-100.0 segundos"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "timeout debe ser < 655.35 segundos"
@@ -4204,10 +4171,6 @@ msgstr "trapz está definido para arreglos 1D de igual tamaño"
 msgid "trapz is defined for 1D iterables"
 msgstr "trapz está definido para iterables 1D"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tupla/lista tiene una longitud incorrecta"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4286,8 +4249,9 @@ msgid "unknown type '%q'"
 msgstr "tipo desconocido '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "No coinciden '{' en format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4357,10 +4321,6 @@ msgstr "value_count debe ser > 0"
 msgid "watchdog not initialized"
 msgstr "watchdog no inicializado"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "el tiempo de espera del perro guardián debe ser mayor a 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "el ancho debe ser mayor que cero"
@@ -4448,6 +4408,40 @@ 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 indices must be integers, not %s"
+#~ msgstr "%q indices deben ser enteros, no %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout debe ser mayor a 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "indices deben ser enteros"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "hay un no-Device en %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "longitud solicitada %d pero el objeto tiene longitud %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "un solo '}' encontrado en format string"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "limite debe ser en el rango 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "el tiempo de espera debe ser 0.0-100.0 segundos"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tupla/lista tiene una longitud incorrecta"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "No coinciden '{' en format"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "el tiempo de espera del perro guardián debe ser mayor a 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Para salir, por favor reinicia la tarjeta sin "
 
diff --git a/locale/fil.po b/locale/fil.po
index 9391a5f697..e6f7823269 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -111,10 +111,6 @@ msgstr "%q ay ginagamit"
 msgid "%q index out of range"
 msgstr "%q indeks wala sa sakop"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indeks ay dapat integers, hindi %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2360,10 +2356,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3197,10 +3189,6 @@ msgstr ""
 msgid "index out of range"
 msgstr "index wala sa sakop"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "ang mga indeks ay dapat na integer"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3621,10 +3609,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr "walang ganoon na attribute"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3900,11 +3884,6 @@ msgstr ""
 msgid "relative import"
 msgstr "relative import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "hiniling ang haba %d ngunit may haba ang object na %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3968,10 +3947,6 @@ msgstr "sign hindi maaring string format specifier"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "sign hindi maari sa integer format specifier 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "isang '}' nasalubong sa format string"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4084,10 +4059,6 @@ msgstr "sintaks error sa JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "may pagkakamali sa sintaks sa uctypes descriptor"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "ang threshold ay dapat sa range 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() kumukuha ng 9-sequence"
@@ -4099,10 +4070,6 @@ msgstr "time.struct_time() kumukuha ng 9-sequence"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4156,10 +4123,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "mali ang haba ng tuple/list"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4238,8 +4201,9 @@ msgid "unknown type '%q'"
 msgstr "hindi malaman ang type '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "hindi tugma ang '{' sa format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4309,10 +4273,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4402,6 +4362,28 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q indeks ay dapat integers, hindi %s"
+
+#~ msgid "indices must be integers"
+#~ msgstr "ang mga indeks ay dapat na integer"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "hiniling ang haba %d ngunit may haba ang object na %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "isang '}' nasalubong sa format string"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "ang threshold ay dapat sa range 0-65536"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "mali ang haba ng tuple/list"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "hindi tugma ang '{' sa format"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Para lumabas, paki-reset ang board na wala ang "
 
diff --git a/locale/fr.po b/locale/fr.po
index 9eb7bba7bd..0bba3c5c6a 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -122,10 +122,6 @@ msgstr "%q en cours d'utilisation"
 msgid "%q index out of range"
 msgstr "index %q hors de portée"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "les indices %q doivent être des entiers, pas %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "échec de l'initialisation %q"
@@ -2435,10 +2431,6 @@ msgstr ""
 "WatchDogTimer.mode ne peut pas être changé une fois réglé à WatchDogMode."
 "RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout doit être supérieur à 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3280,10 +3272,6 @@ msgstr "l'index est hors limites"
 msgid "index out of range"
 msgstr "index est hors bornes"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "les indices doivent être des entiers"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3707,10 +3695,6 @@ msgstr "pas de réponse de la carte SD"
 msgid "no such attribute"
 msgstr "pas de tel attribut"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "aucun appareil dans %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3989,11 +3973,6 @@ msgstr "les parties réelles et imaginaires doivent être de longueur égale"
 msgid "relative import"
 msgstr "import relatif"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "la longueur requise est %d mais l'objet est long de %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "résultats ne peuvent être transformé au type spécifié"
@@ -4057,10 +4036,6 @@ msgstr "signe non autorisé dans les spéc. de formats de chaînes de caractère
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "signe non autorisé avec la spéc. de format d'entier 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "'}' seule rencontrée dans une chaîne de format"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "la taille n'est définie que pour les ndarrays"
@@ -4174,10 +4149,6 @@ msgstr "erreur de syntaxe JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "erreur de syntaxe dans le descripteur d'uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "le seuil doit être dans la portée 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() prend une séquence de longueur 9"
@@ -4189,10 +4160,6 @@ msgstr "time.struct_time() prend une séquence de longueur 9"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "le délai d'expiration a dépassé la valeur maximale prise en charge"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "le délai doit être compris entre 0.0 et 100.0 secondes"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "le délai (timeout) doit être < 655.35 secondes"
@@ -4246,10 +4213,6 @@ msgstr "trapz n'est défini que pour des matrices 1D de longueur égales"
 msgid "trapz is defined for 1D iterables"
 msgstr "trapz est défini pour les 1D itérables"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tuple/liste a une mauvaise longueur"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4328,8 +4291,9 @@ msgid "unknown type '%q'"
 msgstr "type '%q' inconnu"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "'{' sans correspondance dans le format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4399,10 +4363,6 @@ msgstr "'value_count' doit être > 0"
 msgid "watchdog not initialized"
 msgstr "chien de garde (watchdog) non initialisé"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "watchdog timeout doit être supérieur à 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "width doit être plus que zero"
@@ -4490,6 +4450,40 @@ 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 "%q indices must be integers, not %s"
+#~ msgstr "les indices %q doivent être des entiers, pas %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout doit être supérieur à 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "les indices doivent être des entiers"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "aucun appareil dans %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "la longueur requise est %d mais l'objet est long de %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "'}' seule rencontrée dans une chaîne de format"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "le seuil doit être dans la portée 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "le délai doit être compris entre 0.0 et 100.0 secondes"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tuple/liste a une mauvaise longueur"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "'{' sans correspondance dans le format"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "watchdog timeout doit être supérieur à 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Pour quitter, SVP redémarrez la carte sans "
 
diff --git a/locale/hi.po b/locale/hi.po
index cde333382b..af78de1e3b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -110,10 +110,6 @@ msgstr ""
 msgid "%q index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2341,10 +2337,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3166,10 +3158,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3586,10 +3574,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3863,11 +3847,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3931,10 +3910,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4047,10 +4022,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4062,10 +4033,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4119,10 +4086,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4201,7 +4164,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4272,10 +4236,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index dc688a83a9..09d98d9ae5 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -117,10 +117,6 @@ msgstr "%q in uso"
 msgid "%q index out of range"
 msgstr "indice %q fuori intervallo"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "gli indici %q devono essere interi, non %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2370,10 +2366,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3205,10 +3197,6 @@ msgstr ""
 msgid "index out of range"
 msgstr "indice fuori intervallo"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "gli indici devono essere interi"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3630,10 +3618,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr "attributo inesistente"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3913,11 +3897,6 @@ msgstr ""
 msgid "relative import"
 msgstr "importazione relativa"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "lunghezza %d richiesta ma l'oggetto ha lunghezza %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3981,10 +3960,6 @@ msgstr "segno non permesso nello spcificatore di formato della stringa"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "segno non permesso nello spcificatore di formato 'c' della stringa"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "'}' singolo presente nella stringa di formattazione"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4097,10 +4072,6 @@ msgstr "errore di sintassi nel JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "errore di sintassi nel descrittore uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "la soglia deve essere nell'intervallo 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4112,10 +4083,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4169,10 +4136,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tupla/lista ha la lunghezza sbagliata"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4251,8 +4214,9 @@ msgid "unknown type '%q'"
 msgstr "tipo '%q' sconosciuto"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "'{' spaiato nella stringa di formattazione"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4322,10 +4286,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4415,6 +4375,28 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "gli indici %q devono essere interi, non %s"
+
+#~ msgid "indices must be integers"
+#~ msgstr "gli indici devono essere interi"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "lunghezza %d richiesta ma l'oggetto ha lunghezza %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "'}' singolo presente nella stringa di formattazione"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "la soglia deve essere nell'intervallo 0-65536"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tupla/lista ha la lunghezza sbagliata"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "'{' spaiato nella stringa di formattazione"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Per uscire resettare la scheda senza "
 
diff --git a/locale/ja.po b/locale/ja.po
index 3d3b5ef16c..f647d9acc7 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -115,10 +115,6 @@ msgstr "%qは使用中"
 msgid "%q index out of range"
 msgstr "%q インデックスは範囲外"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2355,10 +2351,6 @@ msgstr "WatchDogTimerは現在動作していません"
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr "WatchDogTimer.modeはいったんWatchDogMode.RESETに設定すると変更不可"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeoutは0以上でなければなりません"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3184,10 +3176,6 @@ msgstr ""
 msgid "index out of range"
 msgstr "インデクスが範囲外"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "インデクスは整数でなければなりません"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3605,10 +3593,6 @@ msgstr "SDカードからの応答がありません"
 msgid "no such attribute"
 msgstr "指定の属性はありません"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3884,11 +3868,6 @@ msgstr "実数部と虚数部は同じ長さでなければなりません"
 msgid "relative import"
 msgstr "相対インポート"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "必要な長さは%dですがオブジェクトの長さは%d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3952,10 +3931,6 @@ msgstr "文字列フォーマット指定子で符号は使えません"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "整数フォーマット指定子'c'で符号は使えません"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "文字列フォーマット中に孤立した '}' があります"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4068,10 +4043,6 @@ msgstr "JSONに構文エラーがあります"
 msgid "syntax error in uctypes descriptor"
 msgstr "uctypedディスクリプタの構文エラー"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "threshouldは0から65536まで"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time()は9要素のシーケンスを受け取ります"
@@ -4083,10 +4054,6 @@ msgstr "time.struct_time()は9要素のシーケンスを受け取ります"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "タイムアウト長は対応する最大値を超えています"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "timeoutは0.0〜100.0秒でなければなりません"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4140,10 +4107,6 @@ msgstr "trapzは同じ長さの1次元arrayに対して定義されています"
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "タプル/リストの長さが正しくありません"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4222,8 +4185,9 @@ msgid "unknown type '%q'"
 msgstr "不明な型 '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "書式中にマッチしない '{' があります"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4293,10 +4257,6 @@ msgstr "value_countは0より大きくなければなりません"
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "watchdogのtimeoutは0以上でなければなりません"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4384,6 +4344,34 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeoutは0以上でなければなりません"
+
+#~ msgid "indices must be integers"
+#~ msgstr "インデクスは整数でなければなりません"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "必要な長さは%dですがオブジェクトの長さは%d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "文字列フォーマット中に孤立した '}' があります"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "threshouldは0から65536まで"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "timeoutは0.0〜100.0秒でなければなりません"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "タプル/リストの長さが正しくありません"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "書式中にマッチしない '{' があります"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "watchdogのtimeoutは0以上でなければなりません"
+
 #~ msgid "Stream missing readinto() or write() method."
 #~ msgstr "ストリームにreadinto()またはwrite()メソッドがありません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 88c8b4d3c6..8ec7ede284 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -111,10 +111,6 @@ msgstr "%q 사용 중입니다"
 msgid "%q index out of range"
 msgstr "%q 인덱스 범위를 벗어났습니다"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2345,10 +2341,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3170,10 +3162,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3590,10 +3578,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3867,11 +3851,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3935,10 +3914,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4051,10 +4026,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4066,10 +4037,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4123,10 +4090,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4205,7 +4168,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4276,10 +4240,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4367,6 +4327,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다"
+
 #~ msgid "%q must be >= 1"
 #~ msgstr "%q 는 >=1이어야합니다"
 
diff --git a/locale/nl.po b/locale/nl.po
index 69747fb971..990b6154df 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -113,10 +113,6 @@ msgstr "%q in gebruik"
 msgid "%q index out of range"
 msgstr "%q index buiten bereik"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indexen moeten integers zijn, niet %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2371,10 +2367,6 @@ msgstr ""
 "WatchDogTimer.mode kan niet worden gewijzigd zodra de modus is ingesteld op "
 "WatchDogMode.RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout moet groter dan 0 zijn"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3200,10 +3192,6 @@ msgstr "index is buiten bereik"
 msgid "index out of range"
 msgstr "index is buiten bereik"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "indices moeten integers zijn"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "indices moeten integers, segmenten (slices) of Boolean lijsten zijn"
@@ -3623,10 +3611,6 @@ msgstr "geen antwoord van SD kaart"
 msgid "no such attribute"
 msgstr "niet zo'n attribuut"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3900,11 +3884,6 @@ msgstr "reëel en imaginair deel moeten gelijke lengte hebben"
 msgid "relative import"
 msgstr "relatieve import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "gevraagde lengte is %d maar object heeft lengte %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "resultaat kan niet naar gespecificeerd type geconverteerd worden"
@@ -3968,10 +3947,6 @@ msgstr "teken niet toegestaan in string formaatspecificatie"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "teken niet toegestaan bij integer formaatspecificatie 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "enkele '}' aangetroffen in formaat tekenreeks (string)"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "omvang is alleen voor ndarrays gedefinieerd"
@@ -4084,10 +4059,6 @@ msgstr "syntaxisfout in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntaxisfout in uctypes aanduiding"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "drempelwaarde moet in het bereik 0-65536 liggen"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() accepteert een 9-rij"
@@ -4099,10 +4070,6 @@ msgstr "time.struct_time() accepteert een 9-rij"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "time-outduur is groter dan de ondersteunde maximale waarde"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "timeout moet tussen 0.0 en 100.0 seconden zijn"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4156,10 +4123,6 @@ msgstr "trapz is gedefinieerd voor eendimensionale arrays van gelijke lengte"
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tuple of lijst heeft onjuiste lengte"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4238,8 +4201,9 @@ msgid "unknown type '%q'"
 msgstr "onbekend type '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "'{' zonder overeenkomst in formaat"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4309,10 +4273,6 @@ msgstr "value_count moet groter dan 0 zijn"
 msgid "watchdog not initialized"
 msgstr "watchdog niet geïnitialiseerd"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "watchdog time-out moet groter zijn dan 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "breedte moet groter dan nul zijn"
@@ -4400,6 +4360,37 @@ 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 "%q indices must be integers, not %s"
+#~ msgstr "%q indexen moeten integers zijn, niet %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout moet groter dan 0 zijn"
+
+#~ msgid "indices must be integers"
+#~ msgstr "indices moeten integers zijn"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "gevraagde lengte is %d maar object heeft lengte %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "enkele '}' aangetroffen in formaat tekenreeks (string)"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "drempelwaarde moet in het bereik 0-65536 liggen"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "timeout moet tussen 0.0 en 100.0 seconden zijn"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tuple of lijst heeft onjuiste lengte"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "'{' zonder overeenkomst in formaat"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "watchdog time-out moet groter zijn dan 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Om te beëindigen, reset het bord zonder "
 
diff --git a/locale/pl.po b/locale/pl.po
index 200a3eda99..0f0ae884ec 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -115,10 +115,6 @@ msgstr "%q w użyciu"
 msgid "%q index out of range"
 msgstr "%q poza zakresem"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indeks musi być liczbą całkowitą, a nie %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2352,10 +2348,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout musi być większe od 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3178,10 +3170,6 @@ msgstr "indeks jest poza zakresem"
 msgid "index out of range"
 msgstr "indeks poza zakresem"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "indeksy muszą być całkowite"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3598,10 +3586,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr "nie ma takiego atrybutu"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3876,11 +3860,6 @@ msgstr "rzeczywiste i urojone części muszą mieć jednakową długość"
 msgid "relative import"
 msgstr "relatywny import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "zażądano długości %d ale obiekt ma długość %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3944,10 +3923,6 @@ msgstr "znak jest niedopuszczalny w specyfikacji formatu łańcucha"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "znak jest niedopuszczalny w specyfikacji 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "pojedynczy '}' w specyfikacji formatu"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4060,10 +4035,6 @@ msgstr "błąd składni w JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "błąd składni w deskryptorze uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "threshold musi być w zakresie 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() wymaga 9-elementowej sekwencji"
@@ -4075,10 +4046,6 @@ msgstr "time.struct_time() wymaga 9-elementowej sekwencji"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4132,10 +4099,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "krotka/lista ma złą długość"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4214,8 +4177,9 @@ msgid "unknown type '%q'"
 msgstr "zły typ '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "niepasujące '{' for formacie"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4285,10 +4249,6 @@ msgstr "value_count musi być > 0"
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "szerokość musi być większa niż zero"
@@ -4376,6 +4336,31 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q indeks musi być liczbą całkowitą, a nie %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout musi być większe od 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "indeksy muszą być całkowite"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "zażądano długości %d ale obiekt ma długość %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "pojedynczy '}' w specyfikacji formatu"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "threshold musi być w zakresie 0-65536"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "krotka/lista ma złą długość"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "niepasujące '{' for formacie"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "By wyjść, proszę zresetować płytkę bez "
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 23c301996b..4a6de92b4c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -119,10 +119,6 @@ msgstr "%q em uso"
 msgid "%q index out of range"
 msgstr "O índice %q está fora do intervalo"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "Os índices %q devem ser inteiros, e não %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "a inicialização do %q falhou"
@@ -2417,10 +2413,6 @@ msgstr ""
 "O WatchDogTimer.mode não pode ser alterado uma vez definido para "
 "WatchDogMode.RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "O WatchDogTimer.timeout deve ser maior que 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3260,10 +3252,6 @@ msgstr "o índice está fora dos limites"
 msgid "index out of range"
 msgstr "Índice fora do intervalo"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "os índices devem ser inteiros"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "os índices devem ser números inteiros, fatias ou listas booleanas"
@@ -3686,10 +3674,6 @@ msgstr "não houve resposta do cartão SD"
 msgid "no such attribute"
 msgstr "não há tal atributo"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "não dispositivo em %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3968,11 +3952,6 @@ msgstr "partes reais e imaginárias devem ter o mesmo comprimento"
 msgid "relative import"
 msgstr "importação relativa"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "o comprimento solicitado %d, porém o objeto tem comprimento %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "os resultados não podem ser lançados para um determinado tipo"
@@ -4036,10 +4015,6 @@ msgstr "sinal não permitido no especificador do formato da sequência"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "sinal não permitido com o especificador no formato inteiro 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "único '}' encontrado na string do formato"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "o tamanho é definido apenas para os ndarrays"
@@ -4152,10 +4127,6 @@ msgstr "erro de sintaxe no JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "houve um erro de sintaxe no descritor uctypes"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "Limite deve estar no alcance de 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() leva uma sequência com 9"
@@ -4167,10 +4138,6 @@ msgstr "time.struct_time() leva uma sequência com 9"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "a duração do tempo limite excedeu o valor máximo suportado"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "o tempo limite deve ser entre 0.0 a 100.0 segundos"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "o tempo limite deve ser < 655.35 seg"
@@ -4224,10 +4191,6 @@ msgstr "o trapz está definido para 1D arrays de igual tamanho"
 msgid "trapz is defined for 1D iterables"
 msgstr "o trapz é definido para iteráveis 1D"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "a tupla/lista está com tamanho incorreto"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4306,8 +4269,9 @@ msgid "unknown type '%q'"
 msgstr "tipo desconhecido '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "um '{' sem par no formato"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4377,10 +4341,6 @@ msgstr "o value_count deve ser > 0"
 msgid "watchdog not initialized"
 msgstr "o watchdog não foi inicializado"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "o tempo limite do watchdog deve ser maior que 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "a largura deve ser maior que zero"
@@ -4468,6 +4428,40 @@ 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 indices must be integers, not %s"
+#~ msgstr "Os índices %q devem ser inteiros, e não %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "O WatchDogTimer.timeout deve ser maior que 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "os índices devem ser inteiros"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "não dispositivo em %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "o comprimento solicitado %d, porém o objeto tem comprimento %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "único '}' encontrado na string do formato"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "Limite deve estar no alcance de 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "o tempo limite deve ser entre 0.0 a 100.0 segundos"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "a tupla/lista está com tamanho incorreto"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "um '{' sem par no formato"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "o tempo limite do watchdog deve ser maior que 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Para sair, por favor, reinicie a placa sem "
 
diff --git a/locale/ru.po b/locale/ru.po
index cb9f3616ec..8516515291 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -118,10 +118,6 @@ msgstr "%q используется"
 msgid "%q index out of range"
 msgstr "Индекс %q вне диапазона"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "Индексы %q должны быть целыми числами, а не %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -2390,10 +2386,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3215,10 +3207,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3635,10 +3623,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3912,11 +3896,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3980,10 +3959,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4096,10 +4071,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4111,10 +4082,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4168,10 +4135,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4250,7 +4213,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4321,10 +4285,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4412,6 +4372,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "Индексы %q должны быть целыми числами, а не %s"
+
 #~ msgid "Firmware image is invalid"
 #~ msgstr "Образ прошивки неправильный"
 
diff --git a/locale/sv.po b/locale/sv.po
index 598843479c..d7dbb949b2 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -118,10 +118,6 @@ msgstr "%q används redan"
 msgid "%q index out of range"
 msgstr "Index %q ligger utanför intervallet"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "Indexet %q måste vara ett heltal, inte %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q init misslyckades"
@@ -2389,10 +2385,6 @@ msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 "WatchDogTimer.mode kan inte ändras när den är inställd på WatchDogMode.RESET"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.timeout måste vara större än 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3228,10 +3220,6 @@ msgstr "index är utanför gränserna"
 msgid "index out of range"
 msgstr "index utanför intervallet"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "index måste vara heltal"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "index måste vara heltal, slices, eller Boolean-listor"
@@ -3651,10 +3639,6 @@ msgstr "inget svar från SD-kort"
 msgid "no such attribute"
 msgstr "inget sådant attribut"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "icke-enhet i %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3929,11 +3913,6 @@ msgstr "verkliga och imaginära delar måste ha samma längd"
 msgid "relative import"
 msgstr "relativ import"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "begärd längd %d men objektet har längden %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "resultaten kan inte castas till angiven typ"
@@ -3997,10 +3976,6 @@ msgstr "tecknet tillåts inte i strängformatspecificerare"
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "tecken tillåts inte med heltalsformatspecificeraren 'c'"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "Enkelt '}' påträffades i formatsträngen"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "storlek är enbart definierad ndarrays"
@@ -4113,10 +4088,6 @@ msgstr "syntaxfel i JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntaxfel i uctypes deskriptor"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "tröskelvärdet måste ligga i intervallet 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() kräver en 9-sekvens"
@@ -4128,10 +4099,6 @@ msgstr "time.struct_time() kräver en 9-sekvens"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "timeout-längd överskred det maximala värde som stöds"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "timeout måste vara 0.0-100.0 sekunder"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "timeout måste vara < 655,35 sekunder"
@@ -4185,10 +4152,6 @@ msgstr "trapz är definierad för 1D-matriser med samma längd"
 msgid "trapz is defined for 1D iterables"
 msgstr "trapz är definierat för 1D-iterabla"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "tupel/lista har fel längd"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4267,8 +4230,9 @@ msgid "unknown type '%q'"
 msgstr "okänd typ '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "omatchad '{' i format"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4338,10 +4302,6 @@ msgstr "value_count måste vara > 0"
 msgid "watchdog not initialized"
 msgstr "watchdog är inte initierad"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "watchdog timeout måste vara större än 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "width måste vara större än noll"
@@ -4429,6 +4389,40 @@ 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 indices must be integers, not %s"
+#~ msgstr "Indexet %q måste vara ett heltal, inte %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.timeout måste vara större än 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "index måste vara heltal"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "icke-enhet i %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "begärd längd %d men objektet har längden %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "Enkelt '}' påträffades i formatsträngen"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "tröskelvärdet måste ligga i intervallet 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "timeout måste vara 0.0-100.0 sekunder"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "tupel/lista har fel längd"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "omatchad '{' i format"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "watchdog timeout måste vara större än 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "För att avsluta, gör reset på kortet utan "
 
diff --git a/locale/tr.po b/locale/tr.po
index ae8844521d..9734232c62 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -122,10 +122,6 @@ msgstr "%q kullanımda"
 msgid "%q index out of range"
 msgstr "%q indeksi aralık dışında"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q indeksleri integer olmalı, %s değil"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q init başarısız oldu"
@@ -2361,10 +2357,6 @@ msgstr ""
 msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr ""
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3186,10 +3178,6 @@ msgstr ""
 msgid "index out of range"
 msgstr ""
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr ""
@@ -3606,10 +3594,6 @@ msgstr ""
 msgid "no such attribute"
 msgstr ""
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3883,11 +3867,6 @@ msgstr ""
 msgid "relative import"
 msgstr ""
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr ""
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -3951,10 +3930,6 @@ msgstr ""
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr ""
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr ""
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr ""
@@ -4067,10 +4042,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -4082,10 +4053,6 @@ msgstr ""
 msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
@@ -4139,10 +4106,6 @@ msgstr ""
 msgid "trapz is defined for 1D iterables"
 msgstr ""
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4221,7 +4184,8 @@ msgid "unknown type '%q'"
 msgstr ""
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
+#, c-format
+msgid "unmatched '%c' in format"
 msgstr ""
 
 #: py/objtype.c py/runtime.c
@@ -4292,10 +4256,6 @@ msgstr ""
 msgid "watchdog not initialized"
 msgstr ""
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr ""
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr ""
@@ -4383,6 +4343,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q indices must be integers, not %s"
+#~ msgstr "%q indeksleri integer olmalı, %s değil"
+
 #~ msgid "%q must be >= 0"
 #~ msgstr "%q >= 0 olmalıdır"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 6cf446c792..e1313e5b06 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -121,10 +121,6 @@ msgstr "%q zhèngzài bèi shǐyòng"
 msgid "%q index out of range"
 msgstr "%q suǒyǐn chāochū fànwéi"
 
-#: py/obj.c
-msgid "%q indices must be integers, not %s"
-msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
-
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr "%q chūshǐhuà shībài"
@@ -2392,10 +2388,6 @@ msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
 msgstr ""
 "Yīdàn shèzhì wèi WatchDogMode.RESET, zé bùnéng gēnggǎi WatchDogTimer.Mode"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "WatchDogTimer.timeout must be greater than 0"
-msgstr "WatchDogTimer.Timeout bìxū dàyú 0"
-
 #: py/builtinhelp.c
 #, c-format
 msgid ""
@@ -3230,10 +3222,6 @@ msgstr "suǒyǐn chāochū fànwéi"
 msgid "index out of range"
 msgstr "suǒyǐn chāochū fànwéi"
 
-#: py/obj.c
-msgid "indices must be integers"
-msgstr "suǒyǐn bìxū shì zhěngshù"
-
 #: extmod/ulab/code/ndarray.c
 msgid "indices must be integers, slices, or Boolean lists"
 msgstr "suǒyǐn bìxū shì zhěngshù, qiēpiàn huò bù'ěr zhí lièbiǎo"
@@ -3651,10 +3639,6 @@ msgstr "SD kǎ wú huíyīng"
 msgid "no such attribute"
 msgstr "méiyǒu cǐ shǔxìng"
 
-#: shared-bindings/usb_hid/__init__.c
-msgid "non-Device in %q"
-msgstr "fēi shè bèi zài %q"
-
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
@@ -3928,11 +3912,6 @@ msgstr "shí bù hé xū bù bìxū děng zhǎng"
 msgid "relative import"
 msgstr "xiāngduì dǎorù"
 
-#: py/obj.c
-#, c-format
-msgid "requested length %d but object has length %d"
-msgstr "qǐngqiú chángdù %d dàn duìxiàng chángdù %d"
-
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr "wú fǎ jiāng jié guǒ qiáng zhì zhuǎn huàn dào zhǐ dìng lèi xíng"
@@ -3996,10 +3975,6 @@ msgstr "zìfú chuàn géshì shuōmíng fú zhōng bù yǔnxǔ shǐyòng fúhà
 msgid "sign not allowed with integer format specifier 'c'"
 msgstr "zhěngshù géshì shuōmíng fú 'c' bù yǔnxǔ shǐyòng fúhào"
 
-#: py/objstr.c
-msgid "single '}' encountered in format string"
-msgstr "zài géshì zìfú chuàn zhōng yù dào de dāngè '}'"
-
 #: extmod/ulab/code/ulab_tools.c
 msgid "size is defined for ndarrays only"
 msgstr "dàxiǎo jǐn wèi ndarrays dìngyì"
@@ -4115,10 +4090,6 @@ msgstr "JSON yǔfǎ cuòwù"
 msgid "syntax error in uctypes descriptor"
 msgstr "uctypes miáoshù fú zhōng de yǔfǎ cuòwù"
 
-#: shared-bindings/touchio/TouchIn.c
-msgid "threshold must be in the range 0-65536"
-msgstr "yùzhí bìxū zài fànwéi 0-65536"
-
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr "time.struct_time() xūyào 9 xùliè"
@@ -4130,10 +4101,6 @@ msgstr "time.struct_time() xūyào 9 xùliè"
 msgid "timeout duration exceeded the maximum supported value"
 msgstr "chāoshí shíjiān chāoguò zuìdà zhīchí zhí"
 
-#: shared-bindings/busio/UART.c
-msgid "timeout must be 0.0-100.0 seconds"
-msgstr "Chāo shí shíjiān bìxū wèi 0.0 Dào 100.0 Miǎo"
-
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "chāo shí bì xū < 655.35 miǎo"
@@ -4187,10 +4154,6 @@ msgstr "Trapz shì wèi děng zhǎng de 1D shùzǔ dìngyì de"
 msgid "trapz is defined for 1D iterables"
 msgstr "tī xíng dìng yì wéi yì wéi kě dié dài duì xiàng"
 
-#: py/obj.c
-msgid "tuple/list has wrong length"
-msgstr "yuán zǔ/lièbiǎo chángdù cuòwù"
-
 #: ports/espressif/common-hal/canio/CAN.c
 #, c-format
 msgid "twai_driver_install returned esp-idf error #%d"
@@ -4269,8 +4232,9 @@ msgid "unknown type '%q'"
 msgstr "wèizhī lèixíng '%q'"
 
 #: py/objstr.c
-msgid "unmatched '{' in format"
-msgstr "géshì wèi pǐpèi '{'"
+#, c-format
+msgid "unmatched '%c' in format"
+msgstr ""
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4340,10 +4304,6 @@ msgstr "zhí jìshù bìxū wèi > 0"
 msgid "watchdog not initialized"
 msgstr "wèi chū shǐ huà jiān shì qì"
 
-#: shared-bindings/watchdog/WatchDogTimer.c
-msgid "watchdog timeout must be greater than 0"
-msgstr "kān mén gǒu chāoshí bìxū dàyú 0"
-
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
 msgstr "kuāndù bìxū dàyú líng"
@@ -4431,6 +4391,40 @@ 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 indices must be integers, not %s"
+#~ msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
+
+#~ msgid "WatchDogTimer.timeout must be greater than 0"
+#~ msgstr "WatchDogTimer.Timeout bìxū dàyú 0"
+
+#~ msgid "indices must be integers"
+#~ msgstr "suǒyǐn bìxū shì zhěngshù"
+
+#~ msgid "non-Device in %q"
+#~ msgstr "fēi shè bèi zài %q"
+
+#, c-format
+#~ msgid "requested length %d but object has length %d"
+#~ msgstr "qǐngqiú chángdù %d dàn duìxiàng chángdù %d"
+
+#~ msgid "single '}' encountered in format string"
+#~ msgstr "zài géshì zìfú chuàn zhōng yù dào de dāngè '}'"
+
+#~ msgid "threshold must be in the range 0-65536"
+#~ msgstr "yùzhí bìxū zài fànwéi 0-65536"
+
+#~ msgid "timeout must be 0.0-100.0 seconds"
+#~ msgstr "Chāo shí shíjiān bìxū wèi 0.0 Dào 100.0 Miǎo"
+
+#~ msgid "tuple/list has wrong length"
+#~ msgstr "yuán zǔ/lièbiǎo chángdù cuòwù"
+
+#~ msgid "unmatched '{' in format"
+#~ msgstr "géshì wèi pǐpèi '{'"
+
+#~ msgid "watchdog timeout must be greater than 0"
+#~ msgstr "kān mén gǒu chāoshí bìxū dàyú 0"
+
 #~ msgid "To exit, please reset the board without "
 #~ msgstr "Yào tuìchū, qǐng chóng zhì bǎnkuài ér bùyòng "
 

From 09f6919c93e6c182f138f5bdc5b6dc3a433380f3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 09:36:50 -0600
Subject: [PATCH 1332/2403] Add ability to read VOLTAGE_MONITOR on Pico W

Because this must be treated like an in-use pin for all other purposes,
unfortunately a special case must be added in shared-bindings.

Multiple AnalogIn objects for VOLTAGE_MONITOR can be created (because
in use tracking isn't working) but this causes no harm.

Testing performed: Read the monitor, then imported wifi. When the
pin state was insufficiently restored, the second step would fail
with debug messages about do_ioctl timeout.

```
import analogio, board
a = analogio.AnalogIn(board.VOLTAGE_MONITOR)
print(a.value)
import wifi
```

Closes: #7020
---
 ports/raspberrypi/bindings/cyw43/__init__.c   |  8 ++++
 ports/raspberrypi/bindings/cyw43/__init__.h   |  1 +
 .../boards/raspberry_pi_pico_w/pins.c         |  4 ++
 .../common-hal/analogio/AnalogIn.c            | 39 +++++++++++++++----
 shared-bindings/analogio/AnalogIn.c           |  9 ++++-
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index bf0cbc2e67..c72581a6e4 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -123,6 +123,14 @@ const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj) {
     return MP_OBJ_TO_PTR(obj);
 }
 
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
+    if (obj != &pin_GPIO29) {
+        assert_pin_free(pin);
+    }
+    return pin;
+}
+
 const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
     const mcu_pin_obj_t *pin = validate_obj_is_pin_including_cyw43(obj);
     assert_pin_free(pin);
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
index 2520c6c2d1..65e9813f99 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.h
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -32,6 +32,7 @@
 
 extern const mp_obj_type_t cyw43_pin_type;
 const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj);
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj);
 const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
 
 #define CONSTANT_CYW43_PM_VALUE(pm_mode, pm2_sleep_ret_ms, li_beacon_period, li_dtim_period, li_assoc) \
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
index 5a63e43a6d..8c85642597 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c
@@ -45,6 +45,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
 
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+
+
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
index b827068e1a..1dc4749208 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -35,16 +35,26 @@
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 
+// Voltage monitor is special on Pico W, because this pin is shared between the
+// voltage monitor function and the wifi function. Special handling is required
+// to read the analog voltage.
+#if CIRCUITPY_CYW43
+#define SPECIAL_PIN(pin) (pin->number == 29)
+#else
+#define SPECIAL_PIN(pin) false
+#endif
+
 void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) {
     if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number > ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT) {
         raise_ValueError_invalid_pin();
     }
 
     adc_init();
+    if (!SPECIAL_PIN(pin)) {
+        adc_gpio_init(pin->number);
+        claim_pin(pin);
+    }
 
-    adc_gpio_init(pin->number);
-
-    claim_pin(pin);
     self->pin = pin;
 }
 
@@ -57,14 +67,29 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
         return;
     }
 
-    reset_pin_number(self->pin->number);
+    if (!SPECIAL_PIN(self->pin)) {
+        reset_pin_number(self->pin->number);
+    }
     self->pin = NULL;
 }
 
 uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
-    adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
-    uint16_t value = adc_read();
-
+    uint16_t value;
+    if (SPECIAL_PIN(self->pin)) {
+        common_hal_mcu_disable_interrupts();
+        uint32_t old_pad = padsbank0_hw->io[self->pin->number];
+        uint32_t old_ctrl = iobank0_hw->io[self->pin->number].ctrl;
+        adc_gpio_init(self->pin->number);
+        adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+        value = adc_read();
+        gpio_init(self->pin->number);
+        padsbank0_hw->io[self->pin->number] = old_pad;
+        iobank0_hw->io[self->pin->number].ctrl = old_ctrl;
+        common_hal_mcu_enable_interrupts();
+    } else {
+        adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+        value = adc_read();
+    }
     // Stretch 12-bit ADC reading to 16-bit range
     return (value << 4) | (value >> 8);
 }
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 0ca0e09023..274bfa4806 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -36,6 +36,10 @@
 #include "shared-bindings/analogio/AnalogIn.h"
 #include "shared-bindings/util.h"
 
+#if CIRCUITPY_CYW43
+#include "bindings/cyw43/__init__.h"
+#endif
+
 //| class AnalogIn:
 //|     """Read analog voltage levels
 //|
@@ -60,8 +64,11 @@ STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type,
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // 1st argument is the pin
+    #if CIRCUITPY_CYW43
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin_or_gpio29(args[0]);
+    #else
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
-
+    #endif
     analogio_analogin_obj_t *self = m_new_obj(analogio_analogin_obj_t);
     self->base.type = &analogio_analogin_type;
     common_hal_analogio_analogin_construct(self, pin);

From 7f36a365cf855906f4a5e00305f18a4949039f02 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 10:42:14 -0600
Subject: [PATCH 1333/2403] delay 100us for analog voltage to stabilize

.. otherwise, depending on the prior state of the pin as a digital
input, the value read could be 20% low.
---
 ports/raspberrypi/common-hal/analogio/AnalogIn.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
index 1dc4749208..0056eb17b5 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -26,6 +26,7 @@
 
 #include "common-hal/analogio/AnalogIn.h"
 #include "shared-bindings/analogio/AnalogIn.h"
+#include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
@@ -81,6 +82,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
         uint32_t old_ctrl = iobank0_hw->io[self->pin->number].ctrl;
         adc_gpio_init(self->pin->number);
         adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+        common_hal_mcu_delay_us(100);
         value = adc_read();
         gpio_init(self->pin->number);
         padsbank0_hw->io[self->pin->number] = old_pad;

From 843d6b42f9e2794a1cde117e99f06cccc932c3fe Mon Sep 17 00:00:00 2001
From: Matthew McGowan 
Date: Tue, 8 Nov 2022 12:04:30 -0800
Subject: [PATCH 1334/2403] formatting(swan_r5): lexicographically sorted the
 board module names in the swan_r5 makefile include [ci-skip][skip-ci].  Skip
 CI since this is a cosmetic change only.

---
 ports/stm/boards/swan_r5/mpconfigboard.mk | 91 +++++++++--------------
 1 file changed, 35 insertions(+), 56 deletions(-)

diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk
index 9e5be99bfa..ea4125e02b 100644
--- a/ports/stm/boards/swan_r5/mpconfigboard.mk
+++ b/ports/stm/boards/swan_r5/mpconfigboard.mk
@@ -15,63 +15,42 @@ LD_DEFAULT = boards/STM32L4R5_default.ld
 LD_BOOT = boards/STM32L4R5_boot.ld
 UF2_OFFSET = 0x8010000
 UF2_BOOTLOADER ?= 1
-
-# Turn all of the below off while trying to get the thing to run
-# These modules are implemented in ports//common-hal:
-
-# Typically the first module to create
-CIRCUITPY_MICROCONTROLLER = 1
-CIRCUITPY_ALARM = 1
-
-# Typically the second module to create
-CIRCUITPY_DIGITALIO = 1
-# Other modules:
-
-CIRCUITPY_OS = 1
-CIRCUITPY_STORAGE = 1
-CIRCUITPY_USB_MSC = 1
-CIRCUITPY_UDB_CDC = 1
-CIRCUITPY_USB_VENDOR = 1
-CIRCUITPY_NVM = 0
-
-CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_BUSIO = 1
-CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_PULSEIO = 1
-CIRCUITPY_PWMIO = 1
-CIRCUITPY_AUDIOPWMIO = 1
-CIRCUITPY_CANIO = 0
-CIRCUITPY_I2CTARGET = 0
-# Requires SPI, PulseIO (stub ok):
-CIRCUITPY_DISPLAYIO = 1
-
-# These modules are implemented in shared-module/ - they can be included in
-# any port once their prerequisites in common-hal are complete.
-# Requires DigitalIO:
-CIRCUITPY_BITBANGIO = 1
-# Requires neopixel_write or SPI (dotstar)
-CIRCUITPY_PIXELBUF = 0
-# Requires OS
-CIRCUITPY_RANDOM = 1
-# Requires Microcontroller
-CIRCUITPY_TOUCHIO = 1
-# Requires USB
-CIRCUITPY_USB_HID = 0
-CIRCUITPY_USB_MIDI = 0
-# Does nothing without I2C
-CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
-# No requirements, but takes extra flash
-CIRCUITPY_ULAB = 1
-# requires SPI
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_KEYPAD = 1
-CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_RTC = 1
 CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
-CIRCUITPY_ENABLE_MPY_NATIVE = 1
+
+CIRCUITPY_ALARM = 1
+CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOBUSIO = 1
 CIRCUITPY_AUDIOBUSIO_I2SOUT = 0
 CIRCUITPY_AUDIOBUSIO_PDMIN = 1
+CIRCUITPY_AUDIOPWMIO = 1
+CIRCUITPY_BITBANGIO = 1
+CIRCUITPY_BLEIO = 0
+CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_BUSDEVICE = 0
+CIRCUITPY_BUSIO = 1
+CIRCUITPY_CANIO = 0
+CIRCUITPY_DIGITALIO = 1
+CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_ENABLE_MPY_NATIVE = 1
+CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_KEYPAD = 1
+CIRCUITPY_MICROCONTROLLER = 1
+CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_NVM = 0
+CIRCUITPY_OS = 1
+CIRCUITPY_PIXELBUF = 0
+CIRCUITPY_PULSEIO = 1
+CIRCUITPY_PWMIO = 1
+CIRCUITPY_RANDOM = 1
+CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_RTC = 1
+CIRCUITPY_SDCARDIO = 0
+CIRCUITPY_STORAGE = 1
+CIRCUITPY_TOUCHIO = 1
+CIRCUITPY_UDB_CDC = 1
+CIRCUITPY_ULAB = 1
+CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_USB_MSC = 1
+CIRCUITPY_USB_VENDOR = 1

From 97f693d2d8b782bb805fad29e26acc31616ca490 Mon Sep 17 00:00:00 2001
From: Matthew McGowan 
Date: Tue, 8 Nov 2022 14:18:54 -0800
Subject: [PATCH 1335/2403] docs(swan_r5):  updated copyright notices

---
 ports/stm/common-hal/audiobusio/MEMS_Audio.c  | 24 ++++++++++++++++++
 ports/stm/common-hal/audiobusio/MEMS_Audio.h  | 24 ++++++++++++++++++
 .../stm/common-hal/audiobusio/MEMS_Audio_ll.h | 25 +++++++++++++++++++
 .../audiobusio/MEMS_Audio_ll_stm32l4.c        | 25 +++++++++++++++++++
 .../audiobusio/MEMS_Audio_ll_stm32l4.h        | 25 +++++++++++++++++++
 ports/stm/common-hal/audiobusio/PDMIn.c       |  2 +-
 ports/stm/common-hal/audiobusio/PDMIn.h       |  2 +-
 7 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio.c b/ports/stm/common-hal/audiobusio/MEMS_Audio.c
index 4371b609c0..624ffc92b0 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio.c
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio.c
@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
+ *
+ * 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 
 #include 
 
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio.h b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
index a26b94fef3..2f670c8505 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio.h
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
+ *
+ * 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 _MEMS_AUDIO_H_
 #define _MEMS_AUDIO_H_
 
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
index 6419b90959..13d218fd5d 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll.h
@@ -1,3 +1,28 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
+ *
+ * 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 _MEMS_AUDIO_LL_H_
 #define _MEMS_AUDIO_LL_H_
 
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
index 71f046f9b9..d10cdcd23e 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.c
@@ -1,3 +1,28 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
+ *
+ * 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 
 #include "MEMS_Audio_ll_stm32l4.h"
 #include "MEMS_Audio.h"
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
index c76ccce5e1..ce2c397d47 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
@@ -1,3 +1,28 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
+ *
+ * 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 _MEMS_AUDIO_LL_STM32L4_H_
 #define _MEMS_AUDIO_LL_STM32L4_H_
 
diff --git a/ports/stm/common-hal/audiobusio/PDMIn.c b/ports/stm/common-hal/audiobusio/PDMIn.c
index b1aa2047d8..5deb785371 100644
--- a/ports/stm/common-hal/audiobusio/PDMIn.c
+++ b/ports/stm/common-hal/audiobusio/PDMIn.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Jeff Epler for Adafruit Industries
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/stm/common-hal/audiobusio/PDMIn.h b/ports/stm/common-hal/audiobusio/PDMIn.h
index b6ef4ee8bf..64c0d2b167 100644
--- a/ports/stm/common-hal/audiobusio/PDMIn.h
+++ b/ports/stm/common-hal/audiobusio/PDMIn.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Jeff Epler for Adafruit Industries
+ * Copyright (c) 2022 Matthew McGowan for Blues Inc.
  *
  * 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 11ce0743187197fc5abc3e8f4fec6524c14208dd Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Tue, 8 Nov 2022 23:43:13 +0100
Subject: [PATCH 1336/2403] Update mpconfigboard.mk

---
 ports/espressif/boards/maker_badge/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.mk b/ports/espressif/boards/maker_badge/mpconfigboard.mk
index bb96550da0..75d713d904 100644
--- a/ports/espressif/boards/maker_badge/mpconfigboard.mk
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.mk
@@ -9,7 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_MODULE=wroom
+IDF_TARGET = esp32s2
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

From 93b6772c65c7f0b4b6b6cc8535bcf6d6aa4d2300 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 8 Nov 2022 01:25:20 +0000
Subject: [PATCH 1337/2403] 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4a6de92b4c..828e305c38 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: 2022-11-02 09:33+0000\n"
+"PO-Revision-Date: 2022-11-09 10:48+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.14.2-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -4271,7 +4271,7 @@ msgstr "tipo desconhecido '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "'%c' sem correspondência no formato"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"

From 7a26443da8beecab71820d12cb066738e656aa4a Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 8 Nov 2022 08:25:00 +0000
Subject: [PATCH 1338/2403] 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index d7dbb949b2..4c9bd6e193 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: 2022-10-31 13:02+0000\n"
+"PO-Revision-Date: 2022-11-09 10:48+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.14.2-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -4232,7 +4232,7 @@ msgstr "okänd typ '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "Omatchad '%c' i format"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"

From e390e7142638f582a18233f3080ac7f4e4118b5b Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Wed, 9 Nov 2022 18:29:11 +0000
Subject: [PATCH 1339/2403] Translated using Weblate (German)

Currently translated at 99.7% (991 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 17676cfa51..99bc2e96df 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-11-04 15:05+0000\n"
+"PO-Revision-Date: 2022-11-09 19:20+0000\n"
 "Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.14.2-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -38,7 +38,7 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 "\n"
-"Bitte melden Sie ein Problem mit dem Inhalt Ihres CIRCUITPY-Laufwerks unter\n"
+"Bitte melde ein Problem mit dem Inhalt Ihres CIRCUITPY-Laufwerks unter\n"
 "https://github.com/adafruit/circuitpython/issues\n"
 
 #: py/obj.c
@@ -555,8 +555,8 @@ msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
 msgstr ""
-"Automatisches Neuladen ist aktiv. Speichere Dateien über USB um sie "
-"auszuführen oder verbinde dich mit der REPL zum Deaktivieren.\n"
+"Automatisches Neuladen ist aktiviert. Speichere Dateien einfach über USB, um "
+"sie auszuführen, oder gib REPL ein, um sie zu deaktivieren.\n"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "Baudrate not supported by peripheral"
@@ -820,8 +820,8 @@ msgid ""
 "Connection has been disconnected and can no longer be used. Create a new "
 "connection."
 msgstr ""
-"Die Verbindung wurde getrennt und kann nicht mehr verwendet werden. "
-"Erstellen Sie eine neue Verbindung."
+"Die Verbindung wurde getrennt und kann nicht mehr verwendet werden. Erstelle "
+"eine neue Verbindung."
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
@@ -857,7 +857,7 @@ msgstr "DAC-Kanal-Initialisierungsfehler"
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Device Init Error"
-msgstr "DAC Device Initialisierungs-Fehler"
+msgstr "DAC-Gerät-Initialisierungsfehler"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "DAC already in use"
@@ -1082,7 +1082,7 @@ msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr "GNSS Initialisierung"
+msgstr "GNSS-Initialisierung"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1105,7 +1105,7 @@ msgstr "Hald-Duplex SPI is tnicht implementiert"
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
 #: ports/stm/common-hal/sdioio/SDCard.c
 msgid "Hardware busy, try alternative pins"
-msgstr "Hardware beschäftigt, versuchen Sie alternative Pins"
+msgstr "Hardware beschäftigt, versuche alternative Pins"
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Hardware in use, try alternative pins"
@@ -1117,7 +1117,7 @@ msgstr "Lese/Schreibe-operation an geschlossener Datei"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr "I2C Initialisierungsfehler"
+msgstr "I2C-Initialisierungsfehler"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1142,7 +1142,7 @@ msgid ""
 "Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
 "mpy-update for more info."
 msgstr ""
-"Inkompatible mpy-Datei. Bitte aktualisieren Sie alle mpy-Dateien. Siehe "
+"Inkompatible .mpy-Datei. Bitte aktualisiere alle .mpy-Dateien. Siehe "
 "http://adafru.it/mpy-update für weitere Informationen."
 
 #: shared-bindings/_pew/PewPew.c
@@ -1779,8 +1779,8 @@ msgid ""
 "constructor"
 msgstr ""
 "Pinbelegung verwendet %d Bytes pro Element, was mehr als die idealen %d "
-"Bytes verbraucht. Wenn dies nicht vermieden werden kann, übergeben Sie "
-"allow_inefficient = True an den Konstruktor"
+"Bytes verbraucht. Wenn dies nicht vermieden werden kann, übergib "
+"allow_inefficient=True an den Konstruktor"
 
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
@@ -1919,7 +1919,7 @@ msgstr "SD-Card CSD-Format nicht unterstützt"
 
 #: ports/cxd56/common-hal/sdioio/SDCard.c
 msgid "SDCard init"
-msgstr "SDCard Initialisierung"
+msgstr "SDCard-Initialisierung"
 
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
@@ -1937,7 +1937,7 @@ msgstr "SPI-Konfiguration fehlgeschlagen"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI init error"
-msgstr "SPI Initialisierungsfehler"
+msgstr "SPI-Initialisierungsfehler"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -1954,7 +1954,7 @@ msgstr "Maßstabs-Abmeßungen müssen durch 3 teilbar sein"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Scannen Sie bereits in Bearbeitung. Stoppen Sie mit stop_scan."
+msgstr "Scannen bereits in Bearbeitung. Stoppe mit stop_scan."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -1996,7 +1996,7 @@ msgstr "Quell- und Zielbuffer müssen gleich lang sein"
 
 #: shared-bindings/paralleldisplay/ParallelBus.c
 msgid "Specify exactly one of data0 or data_pins"
-msgstr "Geben Sie genau einen von data0 oder data_pins an"
+msgstr "Gib genau einen von data0 oder data_pins an"
 
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
@@ -2012,11 +2012,11 @@ msgstr "Stereo rechts muss sich auf PWM-Kanal B befinden"
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
-msgstr "Geben Sie mindestens einen UART-Pin an"
+msgstr "Gib mindestens einen UART-Pin an"
 
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
-msgstr "Geben Sie entweder monotonic_time oder epoch_time an"
+msgstr "Gib entweder monotonic_time oder epoch_time an"
 
 #: shared-bindings/gnss/GNSS.c
 msgid "System entry must be gnss.SatelliteSystem"
@@ -2036,7 +2036,7 @@ msgid ""
 "Increase the stack size if you know how. If not:"
 msgstr ""
 "Der Heap von CircuitPython wurde beschädigt, weil der Stack zu klein war.\n"
-"Vergrößern Sie den Stack, wenn Sie wissen, wie. Wenn nicht:"
+"Vergrößere den Stack, wenn du weißt, wie. Wenn nicht:"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
@@ -2052,7 +2052,7 @@ msgid ""
 "exit safe mode."
 msgstr ""
 "Das Modul `microcontroller` wurde zum Booten in den abgesicherten Modus "
-"verwendet. Drücken Sie Reset, um den abgesicherten Modus zu verlassen."
+"verwendet. Drücke Reset, um den abgesicherten Modus zu verlassen."
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
@@ -2072,10 +2072,9 @@ msgid ""
 "enough power for the whole circuit and press reset (after ejecting "
 "CIRCUITPY)."
 msgstr ""
-"Der Mikrocontroller hatte einen Stromausfall. Vergewissern Sie sich, dass "
-"die\n"
-"Stromversorgung genügend Strom für die gesamte Schaltung liefert und drücken "
-"Sie Reset (nach dem Auswerfen von CIRCUITPY)."
+"Der Mikrocontroller hatte einen Stromausfall. Vergewisser dich, dass die\n"
+"Stromversorgung genügend Strom für die gesamte Schaltung liefert und\n"
+"drücke Reset (nach dem Auswerfen von CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2133,6 +2132,8 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
+"Zum Beenden setze bitte das Board zurück, ohne den abgesicherten Modus "
+"aufzurufen."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2176,11 +2177,11 @@ msgstr "UART wird de-initialisiert"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "UART init"
-msgstr "UART Initialisierung"
+msgstr "UART-Initialisierung"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr "UART wird wieder Initialisiert"
+msgstr "UART wird erneut Initialisiert"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
@@ -2432,7 +2433,7 @@ msgstr "Schreiben nicht unterstüzt für diese Charakteristik"
 
 #: supervisor/shared/safe_mode.c
 msgid "You are in safe mode because:\n"
-msgstr "Du bist im abgesicherten Modus weil:\n"
+msgstr "Du befindest dich im abgesicherten Modus, weil:\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2521,7 +2522,7 @@ msgstr "Versuch (arg)min/(arg)max einer leeren Sequenz zu holen"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "attempt to get argmin/argmax of an empty sequence"
-msgstr "Sie haben versucht argmin/argmax einer leeren Sequenz zu erhalten"
+msgstr "Versuch, argmin/argmax einer leeren Sequenz zu ermitteln"
 
 #: py/objstr.c
 msgid "attributes not supported yet"
@@ -3449,8 +3450,8 @@ msgstr ""
 #: py/argcheck.c
 msgid "keyword argument(s) not yet implemented - use normal args instead"
 msgstr ""
-"Schlüsselwort-Argument(e) noch nicht implementiert - verwenden Sie "
-"stattdessen normale Argumente"
+"Schlüsselwort-Argument(e) noch nicht implementiert - verwende stattdessen "
+"normale Argumente"
 
 #: py/bc.c
 msgid "keywords must be strings"
@@ -4091,8 +4092,7 @@ msgstr "String Indizes müssen Integer sein, nicht %q"
 
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
-msgstr ""
-"Zeichenfolgen werden nicht unterstützt; Verwenden Sie bytes oder bytearray"
+msgstr "Zeichenfolgen werden nicht unterstützt; verwende bytes oder bytearray"
 
 #: extmod/moductypes.c
 msgid "struct: can't index"
@@ -4147,7 +4147,7 @@ msgstr "Zeitlimit beim warten auf v2 Karte"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr "Timer wird neu initialisiert"
+msgstr "Timer wird erneut initialisiert"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"

From b46997fbcaa0527801c63d6a2d1938f41a3d470f Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Wed, 9 Nov 2022 16:30:17 +0000
Subject: [PATCH 1340/2403] Translated using Weblate (French)

Currently translated at 99.2% (986 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
---
 locale/fr.po | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/locale/fr.po b/locale/fr.po
index 0bba3c5c6a..1ed13f401d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-08-29 18:20+0000\n"
-"Last-Translator: Maxime Leroy \n"
+"PO-Revision-Date: 2022-11-09 19:20+0000\n"
+"Last-Translator: Neradoc \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.14.1-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -73,7 +73,7 @@ msgstr "%%c nécessite un chiffre entier 'int' ou un caractère 'char'"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -1693,7 +1693,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Une seul %q autorisée en sommeil profond."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -2058,7 +2058,7 @@ msgstr "Délais de lecture de température dépassée"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton BOOT était pressé au démarrage.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2070,11 +2070,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton SW38 était pressé au démarrage.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton VOLUME était pressé au démarrage.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2086,11 +2086,11 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton central était pressé au démarrage.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton gauche était pressé au démarrage.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2160,7 +2160,7 @@ msgstr "Le délai est trop long : le délai maximal est de %d secondes"
 
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
+msgstr "Pour le quitter, redémarrez sans demander le mode sans-échec."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2215,8 +2215,9 @@ msgid "UART write"
 msgstr "Écriture UART"
 
 #: main.c
+#, fuzzy
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
@@ -2284,7 +2285,7 @@ msgstr "Impossible de lancer la requête mDNS"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "Écriture impossible"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2346,12 +2347,12 @@ msgstr "Faute inconnue du logiciel systême : %04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error: %d"
-msgstr "Erreur du firmware système inconnue : %d"
+msgstr "Erreur du logiciel système inconnue : %d"
 
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "Erreur inconnue %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
@@ -3039,6 +3040,8 @@ msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"esp32_camera.Camera nécessite la configuration de PSRAM réservée. Se référer "
+"à la documentation."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -4293,7 +4296,7 @@ msgstr "type '%q' inconnu"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "'%c' sans correspondance dans le format"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4374,7 +4377,7 @@ msgstr "wifi n’est pas activé"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor non disponible"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"

From 98ee03259c8e804db726cf69170bd6689b5219c1 Mon Sep 17 00:00:00 2001
From: Deleted User 
Date: Wed, 9 Nov 2022 15:52:46 +0000
Subject: [PATCH 1341/2403] Translated using Weblate (French)

Currently translated at 99.2% (986 of 993 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index 1ed13f401d..bc81a84ad3 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
 "PO-Revision-Date: 2022-11-09 19:20+0000\n"
-"Last-Translator: Neradoc \n"
+"Last-Translator: Deleted User \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -173,7 +173,7 @@ msgstr "%q doit être >= %d"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -602,7 +602,7 @@ msgstr "RX et TX requis pour le contrôle de flux"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Les deux boutons étaient pressés au démarrage.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -672,7 +672,7 @@ msgstr "La broche %d du bus est déjà utilisée"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Le bouton A était pressé au démarrage.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -967,7 +967,7 @@ msgstr "Attendu un %q"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "Attendu un %q ou %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
@@ -1054,16 +1054,16 @@ msgstr "Filtres trop complexe"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Le logiciel est identique"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Logiciel invalide"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Logiciel trop volumineux"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1597,11 +1597,11 @@ msgstr "Aucun minuteur disponible"
 
 #: supervisor/shared/safe_mode.c
 msgid "Nordic system firmware failure assertion."
-msgstr "Assertion échouée du logiciel systême Nordic."
+msgstr "Assertion échouée du logiciel système Nordic."
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
-msgstr "Logiciel systême Nordic hors de mémoire"
+msgstr "Logiciel système Nordic n'a plus de mémoire"
 
 #: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
 msgid "Not a valid IP string"
@@ -1729,7 +1729,7 @@ msgstr "Timeout de l'opération"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
-msgstr "Hors de mémoire"
+msgstr "Mémoire insuffisante"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 #: ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -2337,12 +2337,12 @@ msgstr "Erreur de sécurité inconnue : 0x%04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error at %s:%d: %d"
-msgstr "Erreur du firmware système inconnue à %s:%d : %d"
+msgstr "Erreur du logiciel système inconnue à %s:%d : %d"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error: %04x"
-msgstr "Faute inconnue du logiciel systême : %04x"
+msgstr "Faute inconnue du logiciel système : %04x"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
@@ -2509,7 +2509,7 @@ msgstr "Le paramêtre argsort doit être un ndarray"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "argsort is not implemented for flattened arrays"
-msgstr "argsort n'est pas mis en œuvre pour les matrices aplatis"
+msgstr "argsort n'est pas implémenté pour les matrices aplaties"
 
 #: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"

From 3910557605c4133e2f6e245a5b8aa69ea8909d72 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 9 Nov 2022 20:20:06 +0100
Subject: [PATCH 1342/2403] 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             | 10 ++++++++++
 locale/cs.po             | 10 ++++++++++
 locale/de_DE.po          | 14 ++++++++++++--
 locale/el.po             | 10 ++++++++++
 locale/en_GB.po          | 10 ++++++++++
 locale/es.po             | 10 ++++++++++
 locale/fil.po            | 10 ++++++++++
 locale/fr.po             | 10 ++++++++++
 locale/hi.po             | 10 ++++++++++
 locale/it_IT.po          | 10 ++++++++++
 locale/ja.po             | 10 ++++++++++
 locale/ko.po             | 10 ++++++++++
 locale/nl.po             | 10 ++++++++++
 locale/pl.po             | 10 ++++++++++
 locale/pt_BR.po          | 10 ++++++++++
 locale/ru.po             | 10 ++++++++++
 locale/sv.po             | 10 ++++++++++
 locale/tr.po             | 10 ++++++++++
 locale/zh_Latn_pinyin.po | 10 ++++++++++
 19 files changed, 192 insertions(+), 2 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 85089303e3..fe346373ef 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -3730,10 +3730,20 @@ msgid "offset out of bounds"
 msgstr "modul tidak ditemukan"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index c0a27df166..3ea4c2dcf3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -3716,10 +3716,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 99bc2e96df..d9c21c5742 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1142,8 +1142,8 @@ msgid ""
 "Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
 "mpy-update for more info."
 msgstr ""
-"Inkompatible .mpy-Datei. Bitte aktualisiere alle .mpy-Dateien. Siehe "
-"http://adafru.it/mpy-update für weitere Informationen."
+"Inkompatible .mpy-Datei. Bitte aktualisiere alle .mpy-Dateien. Siehe http://"
+"adafru.it/mpy-update für weitere Informationen."
 
 #: shared-bindings/_pew/PewPew.c
 msgid "Incorrect buffer size"
@@ -3795,10 +3795,20 @@ msgid "offset out of bounds"
 msgstr "offset außerhalb der Grenzen"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "nur eine bit_depth=16 wird unterstützt"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "nur eine sample_rate=16000 wird unterstützt"
 
diff --git a/locale/el.po b/locale/el.po
index 6441c013b8..d47a0c5399 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -3725,10 +3725,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index f2941c143e..e6fabd93d9 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -3735,10 +3735,20 @@ msgid "offset out of bounds"
 msgstr "offset out of bounds"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "only bit_depth=16 is supported"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "only sample_rate=16000 is supported"
 
diff --git a/locale/es.po b/locale/es.po
index 477c7804d0..13cb9a3821 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -3782,10 +3782,20 @@ msgid "offset out of bounds"
 msgstr "offset fuera de límites"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "solo se admite bit_depth=16"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "solo se admite sample_rate=16000"
 
diff --git a/locale/fil.po b/locale/fil.po
index e6f7823269..f1e363b149 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -3734,10 +3734,20 @@ msgid "offset out of bounds"
 msgstr "wala sa sakop ang address"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/fr.po b/locale/fr.po
index bc81a84ad3..2a4d6b230f 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -3825,10 +3825,20 @@ msgid "offset out of bounds"
 msgstr "décalage hors limites"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "seul bit_depth = 16 est pris en charge"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "seul sample_rate = 16000 est pris en charge"
 
diff --git a/locale/hi.po b/locale/hi.po
index af78de1e3b..3c3496600b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -3698,10 +3698,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 09d98d9ae5..e1ba5c3827 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -3745,10 +3745,20 @@ msgid "offset out of bounds"
 msgstr "indirizzo fuori limite"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/ja.po b/locale/ja.po
index f647d9acc7..f0755961cf 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -3717,10 +3717,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "bit_depth=16のみ対応しています"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 8ec7ede284..4ec7ff804f 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -3702,10 +3702,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 990b6154df..fc1e1f77b8 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -3735,10 +3735,20 @@ msgid "offset out of bounds"
 msgstr "offset buiten bereik"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "alleen bit_depth=16 wordt ondersteund"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "alleen sample_rate=16000 wordt ondersteund"
 
diff --git a/locale/pl.po b/locale/pl.po
index 0f0ae884ec..22eacea387 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -3710,10 +3710,20 @@ msgid "offset out of bounds"
 msgstr "offset poza zakresem"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "obsługiwane jest tylko bit_depth=16"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "obsługiwane jest tylko sample_rate=16000"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 828e305c38..f59efab8c2 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -3798,10 +3798,20 @@ msgid "offset out of bounds"
 msgstr "desvio fora dos limites"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "apenas bit_depth = 16 é compatível"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "apenas sample_rate = 16000 é compatível"
 
diff --git a/locale/ru.po b/locale/ru.po
index 8516515291..a575f05a40 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -3747,10 +3747,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 4c9bd6e193..9b4332e60b 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -3763,10 +3763,20 @@ msgid "offset out of bounds"
 msgstr "offset utanför gränserna"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "bara bit_depth=16 stöds"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "enbart sample_rate=16000 stöds"
 
diff --git a/locale/tr.po b/locale/tr.po
index 9734232c62..1d8eacdae0 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -3718,10 +3718,20 @@ msgid "offset out of bounds"
 msgstr ""
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr ""
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index e1313e5b06..8dee6b5f2e 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -3763,10 +3763,20 @@ msgid "offset out of bounds"
 msgstr "piānlí biānjiè"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only bit_depth=16 is supported"
 msgstr "Jǐn zhīchí wèi shēndù = 16"
 
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only mono is supported"
+msgstr ""
+
+#: ports/stm/common-hal/audiobusio/PDMIn.c
+msgid "only oversample=64 is supported"
+msgstr ""
+
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
+#: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only sample_rate=16000 is supported"
 msgstr "Jǐn zhīchí cǎiyàng lǜ = 16000"
 

From 5d974c35ee620e36efa2148a6f64e1e7df1b55f5 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 08:31:27 +0530
Subject: [PATCH 1343/2403] update protomatter to latest commit

---
 lib/protomatter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/protomatter b/lib/protomatter
index d0a07e14ad..cc93ff18c3 160000
--- a/lib/protomatter
+++ b/lib/protomatter
@@ -1 +1 @@
-Subproject commit d0a07e14adcd71a7c22bcceb16c55aadb5e0d104
+Subproject commit cc93ff18c3a20b25396cb2babaee8ed33bb79528

From 1f332e70077b70eac3c41b41d6721b4a5014da4e Mon Sep 17 00:00:00 2001
From: Kyle McCreery 
Date: Wed, 9 Nov 2022 23:15:38 -0500
Subject: [PATCH 1344/2403] Adding pillbug initial commit

---
 ports/nrf/boards/pillbug/board.c          | 29 ++++++++++
 ports/nrf/boards/pillbug/mpconfigboard.h  | 45 ++++++++++++++++
 ports/nrf/boards/pillbug/mpconfigboard.mk |  8 +++
 ports/nrf/boards/pillbug/pins.c           | 64 +++++++++++++++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 ports/nrf/boards/pillbug/board.c
 create mode 100644 ports/nrf/boards/pillbug/mpconfigboard.h
 create mode 100644 ports/nrf/boards/pillbug/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/pillbug/pins.c

diff --git a/ports/nrf/boards/pillbug/board.c b/ports/nrf/boards/pillbug/board.c
new file mode 100644
index 0000000000..fb1ce4fb83
--- /dev/null
+++ b/ports/nrf/boards/pillbug/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/nrf/boards/pillbug/mpconfigboard.h b/ports/nrf/boards/pillbug/mpconfigboard.h
new file mode 100644
index 0000000000..d760b165d6
--- /dev/null
+++ b/ports/nrf/boards/pillbug/mpconfigboard.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2018 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 "nrfx/hal/nrf_gpio.h"
+
+#define MICROPY_HW_BOARD_NAME       "PillBug"
+#define MICROPY_HW_MCU_NAME         "nRF52840"
+
+#define MICROPY_HW_LED_STATUS       (&pin_P0_20)
+
+#define BOARD_HAS_CRYSTAL 1
+
+#define DEFAULT_I2C_BUS_SCL     (&pin_P0_13)
+#define DEFAULT_I2C_BUS_SDA     (&pin_P0_15)
+
+#define DEFAULT_SPI_BUS_SCK     (&pin_P1_08)
+#define DEFAULT_SPI_BUS_MOSI    (&pin_P0_11)
+#define DEFAULT_SPI_BUS_MISO    (&pin_P0_26)
+
+#define DEFAULT_UART_BUS_RX     (&pin_P0_08)
+#define DEFAULT_UART_BUS_TX     (&pin_P0_06)
diff --git a/ports/nrf/boards/pillbug/mpconfigboard.mk b/ports/nrf/boards/pillbug/mpconfigboard.mk
new file mode 100644
index 0000000000..d917ba0157
--- /dev/null
+++ b/ports/nrf/boards/pillbug/mpconfigboard.mk
@@ -0,0 +1,8 @@
+USB_VID = 0x16D0
+USB_PID = 0x10ED
+USB_PRODUCT = "PillBug"
+USB_MANUFACTURER = "Mechwild"
+
+MCU_CHIP = nrf52840
+
+INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/nrf/boards/pillbug/pins.c b/ports/nrf/boards/pillbug/pins.c
new file mode 100644
index 0000000000..503d6b0f1b
--- /dev/null
+++ b/ports/nrf/boards/pillbug/pins.c
@@ -0,0 +1,64 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_P0_04), MP_ROM_PTR(&pin_P0_04) },
+    { MP_ROM_QSTR(MP_QSTR_P0_06), MP_ROM_PTR(&pin_P0_06) },
+    { MP_ROM_QSTR(MP_QSTR_P0_08), MP_ROM_PTR(&pin_P0_08) },
+    { MP_ROM_QSTR(MP_QSTR_P0_09), MP_ROM_PTR(&pin_P0_09) },
+    { MP_ROM_QSTR(MP_QSTR_P0_10), MP_ROM_PTR(&pin_P0_10) },
+    { MP_ROM_QSTR(MP_QSTR_P0_11), MP_ROM_PTR(&pin_P0_11) },
+    { MP_ROM_QSTR(MP_QSTR_P0_12), MP_ROM_PTR(&pin_P0_12) },
+    { MP_ROM_QSTR(MP_QSTR_P0_13), MP_ROM_PTR(&pin_P0_13) },
+    { MP_ROM_QSTR(MP_QSTR_P0_15), MP_ROM_PTR(&pin_P0_15) },
+    { MP_ROM_QSTR(MP_QSTR_P0_17), MP_ROM_PTR(&pin_P0_17) },
+    { MP_ROM_QSTR(MP_QSTR_P0_20), MP_ROM_PTR(&pin_P0_20) },
+    { MP_ROM_QSTR(MP_QSTR_P0_22), MP_ROM_PTR(&pin_P0_22) },
+    { MP_ROM_QSTR(MP_QSTR_P0_24), MP_ROM_PTR(&pin_P0_24) },
+    { MP_ROM_QSTR(MP_QSTR_P0_26), MP_ROM_PTR(&pin_P0_26) },
+    { MP_ROM_QSTR(MP_QSTR_P0_29), MP_ROM_PTR(&pin_P0_29) },
+    { MP_ROM_QSTR(MP_QSTR_P0_31), MP_ROM_PTR(&pin_P0_31) },
+    { MP_ROM_QSTR(MP_QSTR_P1_00), MP_ROM_PTR(&pin_P1_00) },
+    { MP_ROM_QSTR(MP_QSTR_P1_01), MP_ROM_PTR(&pin_P1_01) },
+    { MP_ROM_QSTR(MP_QSTR_P1_02), MP_ROM_PTR(&pin_P1_02) },
+    { MP_ROM_QSTR(MP_QSTR_P1_04), MP_ROM_PTR(&pin_P1_04) },
+    { MP_ROM_QSTR(MP_QSTR_P1_06), MP_ROM_PTR(&pin_P1_06) },
+    { MP_ROM_QSTR(MP_QSTR_P1_07), MP_ROM_PTR(&pin_P1_07) },
+    { MP_ROM_QSTR(MP_QSTR_P1_11), MP_ROM_PTR(&pin_P1_11) },
+    { MP_ROM_QSTR(MP_QSTR_P1_13), MP_ROM_PTR(&pin_P1_13) },
+    { MP_ROM_QSTR(MP_QSTR_P1_15), MP_ROM_PTR(&pin_P1_15) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_AIN2), MP_ROM_PTR(&pin_P0_03) },
+    { MP_ROM_QSTR(MP_QSTR_AIN5), MP_ROM_PTR(&pin_P0_29) },
+    { MP_ROM_QSTR(MP_QSTR_AIN7), MP_ROM_PTR(&pin_P0_31) },
+
+    { MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) },
+    { MP_ROM_QSTR(MP_QSTR_NFC2), MP_ROM_PTR(&pin_P0_10) },
+
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_04) },   // Read battery voltage divider
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_04) },
+
+    { MP_ROM_QSTR(MP_QSTR_VCC_OFF), MP_ROM_PTR(&pin_P1_07) }, // External VCC by MOSFET
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_P0_20) }, // Blue LED, HIGH sets to on
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_08) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_06) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_13) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_15) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P1_13) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_10) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P1_11) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 8fdb2df0bf4ff6759e1b1ca5c8511f2531ece1f2 Mon Sep 17 00:00:00 2001
From: paul-1 <6473457+paul-1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 10:22:58 -0400
Subject: [PATCH 1345/2403] picow: enable dhcpserver for apmode.

---
 ports/raspberrypi/Makefile   | 4 +++-
 shared/netutils/dhcpserver.c | 2 +-
 shared/netutils/netutils.h   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 5095c4c1f8..d7373642b3 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -65,7 +65,7 @@ INC_CYW43 := \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0
+CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0 -DCYW43_NETUTILS=1
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
 	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
@@ -76,6 +76,8 @@ SRC_SDK_CYW43 := \
 
 SRC_LWIP := \
 	shared/netutils/netutils.c \
+	shared/netutils/trace.c \
+	shared/netutils/dhcpserver.c \
 	$(wildcard lib/lwip/src/core/*.c) \
 	$(wildcard lib/lwip/src/core/ipv4/*.c) \
 	lib/lwip/src/netif/ethernet.c \
diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index 9db42b3fd9..a61501c93c 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -33,7 +33,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-#if MICROPY_PY_LWIP
+#if LWIP_UDP
 
 #include "shared/netutils/dhcpserver.h"
 #include "lwip/udp.h"
diff --git a/shared/netutils/netutils.h b/shared/netutils/netutils.h
index b23a78e5b8..3bb9212800 100644
--- a/shared/netutils/netutils.h
+++ b/shared/netutils/netutils.h
@@ -33,6 +33,8 @@
 #define NETUTILS_TRACE_PAYLOAD      (0x0002)
 #define NETUTILS_TRACE_NEWLINE      (0x0004)
 
+#include "py/runtime.h"
+
 typedef enum _netutils_endian_t {
     NETUTILS_LITTLE,
     NETUTILS_BIG,

From 851c2cd8cb691587e53b874752e92ee14a04ae6c Mon Sep 17 00:00:00 2001
From: paul-1 <6473457+paul-1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 15:20:10 -0400
Subject: [PATCH 1346/2403] picow: Add channel setting when starting AP

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 9c2dea85c7..1c92aaea87 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -174,6 +174,10 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
     // Is there a better way?
     common_hal_wifi_radio_stop_station(self);
 
+    // Channel can only be changed after inital powerup and config of ap.
+    // Defaults to 1 if not set or invalid (i.e. 13)
+    cyw43_wifi_ap_set_channel(&cyw43_state, (const uint32_t)channel);
+
     cyw43_arch_enable_ap_mode((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
     // TODO: Implement authmode check like in espressif
     bindings_cyw43_wifi_enforce_pm();

From 11f1174658dbbfae9f8b257feda894befa774113 Mon Sep 17 00:00:00 2001
From: paul-1 <6473457+paul-1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 15:30:57 -0400
Subject: [PATCH 1347/2403] picow: Change init to use country code
 routine.....place holder for future improvements to allow country code
 setting.

---
 ports/raspberrypi/supervisor/port.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 781d2b11d2..be7afcac86 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -140,7 +140,9 @@ safe_mode_t port_init(void) {
     never_reset_pin_number(24);
     never_reset_pin_number(25);
     never_reset_pin_number(29);
-    if (cyw43_arch_init()) {
+    // Change this as a placeholder as to how to init with country code.
+    // Default country code is CYW43_COUNTRY_WORLDWIDE)
+    if (cyw43_arch_init_with_country(PICO_CYW43_ARCH_DEFAULT_COUNTRY_CODE)) {
         serial_write("WiFi init failed\n");
     } else {
         cyw_ever_init = true;

From 19df394437f6f041b293891a8b517320fe012008 Mon Sep 17 00:00:00 2001
From: dronecz 
Date: Thu, 10 Nov 2022 21:14:01 +0000
Subject: [PATCH 1348/2403] Adding frozen modules

---
 .gitmodules                           | 6 ++++++
 frozen/Adafruit_CircuitPython_SSD1680 | 1 +
 frozen/Adafruit_CircuitPython_UC8151D | 1 +
 3 files changed, 8 insertions(+)
 create mode 160000 frozen/Adafruit_CircuitPython_SSD1680
 create mode 160000 frozen/Adafruit_CircuitPython_UC8151D

diff --git a/.gitmodules b/.gitmodules
index 0d521b5ff0..f13eb79e45 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -319,3 +319,9 @@
 [submodule "lib/mbedtls"]
 	path = lib/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "frozen/Adafruit_CircuitPython_UC8151D"]
+	path = frozen/Adafruit_CircuitPython_UC8151D
+	url = https://github.com/adafruit/Adafruit_CircuitPython_UC8151D
+[submodule "frozen/Adafruit_CircuitPython_SSD1680"]
+	path = frozen/Adafruit_CircuitPython_SSD1680
+	url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680
diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680
new file mode 160000
index 0000000000..adff47d7be
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_SSD1680
@@ -0,0 +1 @@
+Subproject commit adff47d7be2a430b20e5ebcc59cb4e5a38fc171c
diff --git a/frozen/Adafruit_CircuitPython_UC8151D b/frozen/Adafruit_CircuitPython_UC8151D
new file mode 160000
index 0000000000..a64fad692c
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_UC8151D
@@ -0,0 +1 @@
+Subproject commit a64fad692cc83fa1ac48b8f5ab1a955fd9b39251

From 0bf9df232a91aa209ee01ac571419d62acbd3a0b Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 11 Nov 2022 14:17:57 +0200
Subject: [PATCH 1349/2403] fix debug

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 3e95ae5cd1..ff0549c14d 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -46,6 +46,7 @@
 #include "components/mdns/include/mdns.h"
 #endif
 
+#include "lwip/sys.h"
 #include "lwip/dns.h"
 #include "lwip/icmp.h"
 #include "lwip/raw.h"
@@ -55,6 +56,15 @@
 #define PING_ID        0xAFAF
 #endif
 
+#ifndef PING_DEBUG
+#define PING_DEBUG     LWIP_DBG_ON
+#endif
+
+#ifdef LWIP_DEBUG
+static u32_t ping_time;
+#endif
+
+
 #define MAC_ADDRESS_LENGTH 6
 
 #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])

From e6a4e2982f670828d35c4265e746e88d4bf461ff Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 11 Nov 2022 14:40:47 +0200
Subject: [PATCH 1350/2403] Update ports/raspberrypi/common-hal/wifi/Radio.c

u32_t -> uint32_t

Co-authored-by: MicroDev <70126934+MicroDev1@users.noreply.github.com>
---
 ports/raspberrypi/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index ff0549c14d..8073f57063 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -61,7 +61,7 @@
 #endif
 
 #ifdef LWIP_DEBUG
-static u32_t ping_time;
+static uint32_t ping_time;
 #endif
 
 

From f5c637dc10e2374ca1282cbc430c94fc0973b2f6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 10 Nov 2022 11:02:31 -0600
Subject: [PATCH 1351/2403] Add adafruit_pixelmap.PixelMap

.. a fast helper for animations. It is similar to and inspired by the
PixelMap helper in Adafruit LED Animation library, but with an extremely
fast 'paste' method for setting a series of pixels. This is a common
operation for many animations, and can give a substantial speed improvement.

It's named `adafruit_pixelmap` so that we can package a compatible version
in pure Python for systems that can't fit it in C in flash, or for
Blinka.

This is a proof of concept and can make a very fast comet animation:
```python
import time
import adafruit_pixelbuf
import adafruti_pixelmap
import board
import neopixel
from supervisor import ticks_ms
from adafruit_led_animation.animation.solid import Solid
from adafruit_led_animation import color

pixel_pin = board.GP0
pixel_num = 96

pixels = neopixel.NeoPixel(pixel_pin, pixel_num, brightness=1, auto_write=False, pixel_order="RGB")

evens = adafruit_pixelmap.PixelMap(pixels, tuple(range(0, pixel_num, 2)))
odd_indices = tuple((i, i+2) for i in range(1, pixel_num, 4))
print(odd_indices)
odds = adafruit_pixelbuf.PixelMap(pixels, odd_indices)
assert len(odds) == len(odd_indices)


comet_length = 16

comet1 = [color.calculate_intensity(color.GREEN, ((1+i) / comet_length) ** 2.4)
        for i in range(comet_length)]
comet2 = [color.calculate_intensity(color.PURPLE, ((1+i) / comet_length) ** 2.4)
        for i in range(comet_length)]

pos1 = 0
pos2 = 96//4

while True:
    evens.paste(comet1, pos1, wrap=True, reverse=False, others=0)
    pos1 = (pos1 + 1) % len(evens)

    odds.paste(comet2, pos2, wrap=True, reverse=True, others=0)
    pos2 = (pos2 - 1) % len(odds)
    pixels.show()

    m = ticks_ms()
    if m % 2000 > 1000:
        time.sleep(.02)
```
---
 locale/circuitpython.pot                      |   9 +
 ports/atmel-samd/mpconfigport.mk              |   1 +
 .../aramcon_badge_2019/mpconfigboard.mk       |   1 +
 py/circuitpy_defns.mk                         |   5 +
 py/circuitpy_mpconfig.mk                      |   3 +
 shared-bindings/adafruit_pixelbuf/PixelBuf.c  |  28 +-
 shared-bindings/adafruit_pixelbuf/PixelBuf.h  |   3 +
 shared-bindings/adafruit_pixelbuf/__init__.c  |   9 +
 shared-bindings/adafruit_pixelmap/PixelMap.c  | 245 ++++++++++++++++++
 shared-bindings/adafruit_pixelmap/PixelMap.h  |  42 +++
 shared-bindings/adafruit_pixelmap/__init__.c  |  62 +++++
 shared-bindings/adafruit_pixelmap/__init__.h  |  30 +++
 shared-module/adafruit_pixelbuf/PixelBuf.c    |  21 +-
 shared-module/adafruit_pixelbuf/PixelBuf.h    |   6 +-
 shared-module/adafruit_pixelmap/PixelMap.c    | 184 +++++++++++++
 shared-module/adafruit_pixelmap/PixelMap.h    |  39 +++
 shared-module/adafruit_pixelmap/__init__.c    |   0
 17 files changed, 658 insertions(+), 30 deletions(-)
 create mode 100644 shared-bindings/adafruit_pixelmap/PixelMap.c
 create mode 100644 shared-bindings/adafruit_pixelmap/PixelMap.h
 create mode 100644 shared-bindings/adafruit_pixelmap/__init__.c
 create mode 100644 shared-bindings/adafruit_pixelmap/__init__.h
 create mode 100644 shared-module/adafruit_pixelmap/PixelMap.c
 create mode 100644 shared-module/adafruit_pixelmap/PixelMap.h
 create mode 100644 shared-module/adafruit_pixelmap/__init__.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 779a75deb6..382aa710c5 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2267,6 +2267,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3152,6 +3153,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3537,6 +3542,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index e6f5759f1c..05aed89eb2 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -42,6 +42,7 @@ CIRCUITPY_I2CTARGET ?= 0
 CIRCUITPY_JSON ?= 0
 CIRCUITPY_KEYPAD ?= 0
 CIRCUITPY_MSGPACK ?= 0
+CIRCUITPY_PIXELMAP ?= 0
 CIRCUITPY_RE ?= 0
 CIRCUITPY_SDCARDIO ?= 0
 CIRCUITPY_SYNTHIO ?= 0
diff --git a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk b/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk
index 06cd9633d1..5bf2eb721b 100644
--- a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk
+++ b/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk
@@ -9,5 +9,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C"
 
 CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_PIXELMAP = 0
 
 CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index ee51a58c58..0d70068e43 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -266,6 +266,9 @@ endif
 ifeq ($(CIRCUITPY_PIXELBUF),1)
 SRC_PATTERNS += adafruit_pixelbuf/%
 endif
+ifeq ($(CIRCUITPY_PIXELMAP),1)
+SRC_PATTERNS += adafruit_pixelmap/%
+endif
 ifeq ($(CIRCUITPY_QRIO),1)
 SRC_PATTERNS += qrio/%
 endif
@@ -543,6 +546,8 @@ SRC_SHARED_MODULE_ALL = \
 	_eve/__init__.c \
 	adafruit_pixelbuf/PixelBuf.c \
 	adafruit_pixelbuf/__init__.c \
+	adafruit_pixelmap/PixelMap.c \
+	adafruit_pixelmap/__init__.c \
 	_stage/Layer.c \
 	_stage/Text.c \
 	_stage/__init__.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index fbf0b587b7..3ca23263d4 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -319,6 +319,9 @@ CFLAGS += -DCIRCUITPY_PEW=$(CIRCUITPY_PEW)
 CIRCUITPY_PIXELBUF ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_PIXELBUF=$(CIRCUITPY_PIXELBUF)
 
+CIRCUITPY_PIXELMAP ?= $(CIRCUITPY_PIXELBUF)
+CFLAGS += -DCIRCUITPY_PIXELMAP=$(CIRCUITPY_PIXELMAP)
+
 # Only for SAMD boards for the moment
 CIRCUITPY_PS2IO ?= 0
 CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO)
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index 6203f672ad..2efde4cafc 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -253,9 +253,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_show_obj, pixelbuf_pixelbuf_show);
 
-//|     def fill(
-//|         self, color: Union[int, Tuple[int, int, int], Tuple[int, int, int, float]]
-//|     ) -> None:
+//|     def fill(self, color: PixelType) -> None:
 //|         """Fills the given pixelbuf with the given color."""
 //|         ...
 
@@ -267,29 +265,21 @@ STATIC mp_obj_t pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t value) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_fill);
 
 //|     @overload
-//|     def __getitem__(
-//|         self, index: slice
-//|     ) -> Union[Tuple[Tuple[int, int, int], ...], Tuple[Tuple[int, int, int, float], ...]]: ...
-//|     @overload
-//|     def __getitem__(
-//|         self, index: int
-//|     ) -> Union[Tuple[int, int, int], Tuple[int, int, int, float]]:
+//|     def __getitem__(self, index: slice) -> PixelReturnSequence:
 //|         """Returns the pixel value at the given index as a tuple of (Red, Green, Blue[, White]) values
 //|         between 0 and 255.  When in PWM (DotStar) mode, the 4th tuple value is a float of the pixel
 //|         intensity from 0-1.0."""
 //|         ...
 //|     @overload
-//|     def __setitem__(
-//|         self, index: slice, value: Tuple[Union[int, Tuple[float, ...], List[float]], ...]
-//|     ) -> None: ...
+//|     def __getitem__(self, index: int) -> PixelReturnType:
+//|         """Returns the pixel value at the given index as a tuple of (Red, Green, Blue[, White]) values
+//|         between 0 and 255.  When in PWM (DotStar) mode, the 4th tuple value is a float of the pixel
+//|         intensity from 0-1.0."""
+//|         ...
 //|     @overload
-//|     def __setitem__(
-//|         self, index: slice, value: List[Union[int, Tuple[float, ...], List[float]]]
-//|     ) -> None: ...
+//|     def __setitem__(self, index: slice, value: PixelSequence) -> None: ...
 //|     @overload
-//|     def __setitem__(
-//|         self, index: int, value: Union[int, Tuple[float, ...], List[float]]
-//|     ) -> None:
+//|     def __setitem__(self, index: int, value: PixelType) -> None:
 //|         """Sets the pixel value at the given index.  Value can either be a tuple or integer.  Tuples are
 //|         The individual (Red, Green, Blue[, White]) values between 0 and 255.  If given an integer, the
 //|         red, green and blue values are packed into the lower three bytes (0xRRGGBB).
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.h b/shared-bindings/adafruit_pixelbuf/PixelBuf.h
index 7ae3d6acf8..88eb06f0a0 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.h
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.h
@@ -27,6 +27,7 @@
 #ifndef CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
 #define CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
 
+#include "py/objtuple.h"
 #include "shared-module/adafruit_pixelbuf/PixelBuf.h"
 
 extern const mp_obj_type_t pixelbuf_pixelbuf_type;
@@ -48,5 +49,7 @@ void common_hal_adafruit_pixelbuf_pixelbuf_show(mp_obj_t self);
 mp_obj_t common_hal_adafruit_pixelbuf_pixelbuf_get_pixel(mp_obj_t self, size_t index);
 void common_hal_adafruit_pixelbuf_pixelbuf_set_pixel(mp_obj_t self, size_t index, mp_obj_t item);
 void common_hal_adafruit_pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t *values, mp_obj_tuple_t *flatten_to);
+void common_hal_adafruit_pixelbuf_pixelbuf_parse_color(mp_obj_t self, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w);
+void common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(mp_obj_t self, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w);
 
 #endif  // CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
diff --git a/shared-bindings/adafruit_pixelbuf/__init__.c b/shared-bindings/adafruit_pixelbuf/__init__.c
index 40bf80094c..fd2915ee0a 100644
--- a/shared-bindings/adafruit_pixelbuf/__init__.c
+++ b/shared-bindings/adafruit_pixelbuf/__init__.c
@@ -39,6 +39,15 @@
 //| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel.
 //|
 //| Byteorders are configured with strings, such as "RGB" or "RGBD"."""
+//|
+//| # The types accepted when getting a pixel value
+//| PixelReturnType = Union[
+//|     Tuple[int, int, int], Tuple[int, int, int, int], Tuple[int, int, int, float]
+//| ]
+//| PixelReturnSequence = Tuple[PixelReturnType]
+//| # The types returned when getting a pixel value
+//| PixelType = Union[int, PixelReturnType]
+//| PixelSequence = Union[Tuple[PixelType], List[PixelType]]
 // TODO: Pull in docs from adafruit_pixelbuf.
 
 STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = {
diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.c b/shared-bindings/adafruit_pixelmap/PixelMap.c
new file mode 100644
index 0000000000..3361534ca1
--- /dev/null
+++ b/shared-bindings/adafruit_pixelmap/PixelMap.c
@@ -0,0 +1,245 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/objproperty.h"
+#include "py/objtype.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+#include "shared-bindings/adafruit_pixelbuf/PixelBuf.h"
+#include "shared-module/adafruit_pixelmap/PixelMap.h"
+
+//| from adafruit_pixelbuf import PixelBuf, PixelReturnType, PixelSequence, PixelType
+//|
+//| class PixelMap:
+//|     def __init__(self, pixelbuf: PixelBuf, indices: Tuple[Union[int, Tuple[int]]]) -> None:
+//|         """Construct a PixelMap object that uses the given indices of the underlying pixelbuf"""
+
+STATIC mp_obj_t pixelmap_pixelmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_pixelbuf, ARG_indices };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pixelbuf, MP_ARG_REQUIRED },
+        { MP_QSTR_indices, MP_ARG_REQUIRED },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_obj_t pixelbuf = args[ARG_pixelbuf].u_obj;
+
+    mp_obj_t native_pixelbuf = mp_obj_cast_to_native_base(pixelbuf, &pixelbuf_pixelbuf_type);
+    if (!native_pixelbuf) {
+        (void)mp_arg_validate_type(args[ARG_pixelbuf].u_obj, &pixelbuf_pixelbuf_type, MP_QSTR_pixelbuf);
+    }
+    mp_obj_assert_native_inited(native_pixelbuf);
+
+    size_t buflen = common_hal_adafruit_pixelbuf_pixelbuf_get_len(pixelbuf);
+
+    mp_obj_t indices = mp_arg_validate_type(args[ARG_indices].u_obj, &mp_type_tuple, MP_QSTR_indices);
+
+    // validate indices
+    size_t len;
+    mp_obj_t *items;
+    mp_obj_tuple_get(indices, &len, &items);
+    mp_arg_validate_length_min(len, 1, MP_QSTR_items);
+
+    for (size_t i = 0; i < len; i++) {
+        mp_obj_t item = items[i];
+        if (mp_obj_is_small_int(item)) {
+            mp_arg_validate_index_range(MP_OBJ_SMALL_INT_VALUE(item), 0, buflen - 1, MP_QSTR_index);
+        } else if (mp_obj_is_tuple_compatible(item)) {
+            size_t len1;
+            mp_obj_t *items1;
+            mp_obj_tuple_get(item, &len1, &items1);
+            for (size_t j = 0; j < len1; j++) {
+                mp_obj_t item1 = items1[j];
+                if (!mp_obj_is_small_int(item1)) {
+                    mp_raise_TypeError(translate("nested index must be int"));
+                }
+                mp_arg_validate_index_range(MP_OBJ_SMALL_INT_VALUE(item1), 0, buflen - 1, MP_QSTR_index);
+            }
+        } else {
+            mp_raise_TypeError(translate("index must be tuple or int"));
+        }
+    }
+
+    pixelmap_pixelmap_obj_t *self = m_new_obj(pixelmap_pixelmap_obj_t);
+    self->base.type = &pixelmap_pixelmap_type;
+    shared_module_pixelmap_pixelmap_construct(self, pixelbuf, indices);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     auto_write: bool
+//|     """True if updates should be automatically written"""
+STATIC mp_obj_t pixelmap_pixelmap_auto_write_get(const mp_obj_t self_in) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(shared_module_pixelmap_pixelmap_auto_write_get(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_auto_write_get_obj, pixelmap_pixelmap_auto_write_get);
+
+STATIC mp_obj_t pixelmap_pixelmap_auto_write_set(const mp_obj_t self_in, const mp_obj_t arg) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    shared_module_pixelmap_pixelmap_auto_write_set(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_auto_write_set_obj, pixelmap_pixelmap_auto_write_set);
+
+MP_PROPERTY_GETSET(pixelmap_pixelmap_auto_write_obj,
+    (mp_obj_t)&pixelmap_pixelmap_auto_write_get_obj,
+    (mp_obj_t)&pixelmap_pixelmap_auto_write_set_obj);
+
+//|     bpp: int
+//|     """The number of bytes per pixel in the buffer (read-only)"""
+STATIC mp_obj_t pixelmap_pixelmap_obj_get_bpp(mp_obj_t self_in) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_adafruit_pixelbuf_pixelbuf_get_bpp(self->pixelbuf));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_get_bpp_obj, pixelmap_pixelmap_obj_get_bpp);
+
+MP_PROPERTY_GETTER(pixelmap_pixelmap_bpp_obj,
+    (mp_obj_t)&pixelmap_pixelmap_get_bpp_obj);
+
+//|     byteorder: str
+//|     """byteorder string for the buffer (read-only)"""
+STATIC mp_obj_t pixelmap_pixelmap_obj_get_byteorder(mp_obj_t self_in) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_adafruit_pixelbuf_pixelbuf_get_byteorder_string(self->pixelbuf);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_get_byteorder, pixelmap_pixelmap_obj_get_byteorder);
+MP_PROPERTY_GETTER(pixelmap_pixelmap_byteorder_obj,
+    (mp_obj_t)&pixelmap_pixelmap_get_byteorder);
+
+//|
+//|     def fill(self, color: PixelType, /) -> None:
+//|         """Fill all the pixels in the map with the given color"""
+STATIC mp_obj_t pixelmap_pixelmap_fill(const mp_obj_t self_in, const mp_obj_t color) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    shared_module_pixelmap_pixelmap_fill(self, color);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_fill_obj, pixelmap_pixelmap_fill);
+
+//|
+//|     def indices(self, index: int, /) -> Tuple[int]:
+//|         """Return the PixelBuf indices for a PixelMap index"""
+STATIC mp_obj_t pixelmap_pixelmap_indices(const mp_obj_t self_in, const mp_obj_t index) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return shared_module_pixelmap_pixelmap_indices(self, mp_obj_get_int(index));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_indices_obj, pixelmap_pixelmap_indices);
+
+
+//|     def __getitem__(self, index: int) -> PixelReturnType:
+//|         """Retrieve the value of one of the underlying pixels at 'index'.
+//|
+//|         Note that slices are not supported by PixelMap.__getitem__"""
+//|     @overload
+//|     def __setitem__(self, index: slice, value: PixelSequence) -> None: ...
+//|     @overload
+//|     def __setitem__(self, index: int, value: PixelType) -> None:
+//|         """Sets the pixel value at the given index.  Value can either be a tuple or integer.  Tuples are
+//|         The individual (Red, Green, Blue[, White]) values between 0 and 255.  If given an integer, the
+//|         red, green and blue values are packed into the lower three bytes (0xRRGGBB).
+//|         For RGBW byteorders, if given only RGB values either as an int or as a tuple, the white value
+//|         is used instead when the red, green, and blue values are the same."""
+//|         ...
+STATIC mp_obj_t pixelmap_pixelmap_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (value == MP_OBJ_NULL) {
+        // delete
+        return MP_OBJ_NULL; // op not supported
+    } else if (value == MP_OBJ_SENTINEL) {
+        int index = mp_obj_get_int(index_in);
+        return shared_module_pixelmap_pixelmap_getitem(self, index);
+    }
+
+    // get
+    if (0) {
+    #if MICROPY_PY_BUILTINS_SLICE
+    } else if (mp_obj_is_type(index_in, &mp_type_slice)) {
+        shared_module_pixelmap_pixelmap_setslice(self, index_in, value);
+    #endif
+    } else {
+        shared_module_pixelmap_pixelmap_setitem(self, mp_obj_get_int(index_in), value);
+    }
+    return mp_const_none;
+}
+
+//|     def __len__(self) -> int:
+//|         """Length of the map"""
+STATIC mp_obj_t pixelmap_pixelmap_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    switch (op) {
+        case MP_UNARY_OP_BOOL:
+            return mp_const_true;
+        case MP_UNARY_OP_LEN:
+            return MP_OBJ_NEW_SMALL_INT(self->len);
+        default:
+            return MP_OBJ_NULL;      // op not supported
+    }
+}
+
+//|     def show(self) -> None:
+//|         """Transmits the color data to the pixels so that they are shown. This is done automatically
+//|         when `auto_write` is True."""
+//|         ...
+//|
+
+STATIC mp_obj_t pixelmap_pixelmap_show(mp_obj_t self_in) {
+    pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_adafruit_pixelbuf_pixelbuf_show(self->pixelbuf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_show_obj, pixelmap_pixelmap_show);
+
+STATIC const mp_rom_map_elem_t pixelmap_pixelmap_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_auto_write), MP_ROM_PTR(&pixelmap_pixelmap_auto_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bpp), MP_ROM_PTR(&pixelmap_pixelmap_bpp_obj) },
+    { MP_ROM_QSTR(MP_QSTR_byteorder), MP_ROM_PTR(&pixelmap_pixelmap_byteorder_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&pixelmap_pixelmap_fill_obj) },
+    { MP_ROM_QSTR(MP_QSTR_indices), MP_ROM_PTR(&pixelmap_pixelmap_indices_obj) },
+    { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&pixelmap_pixelmap_show_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pixelmap_pixelmap_locals_dict, pixelmap_pixelmap_locals_dict_table);
+
+
+const mp_obj_type_t pixelmap_pixelmap_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PixelMap,
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    .locals_dict = (mp_obj_t)&pixelmap_pixelmap_locals_dict,
+    .make_new = pixelmap_pixelmap_make_new,
+    MP_TYPE_EXTENDED_FIELDS(
+        .subscr = pixelmap_pixelmap_subscr,
+        .unary_op = pixelmap_pixelmap_unary_op,
+        ),
+};
diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.h b/shared-bindings/adafruit_pixelmap/PixelMap.h
new file mode 100644
index 0000000000..420df1b9e9
--- /dev/null
+++ b/shared-bindings/adafruit_pixelmap/PixelMap.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+#include "py/obj.h"
+
+extern const mp_obj_type_t pixelmap_pixelmap_type;
+
+typedef struct _pixelmap_pixelmap_obj pixelmap_pixelmap_obj_t;
+
+void shared_module_pixelmap_pixelmap_construct(pixelmap_pixelmap_obj_t *self, mp_obj_t pixelbuf, mp_obj_t indices);
+bool shared_module_pixelmap_pixelmap_auto_write_get(pixelmap_pixelmap_obj_t *self);
+void shared_module_pixelmap_pixelmap_auto_write_set(pixelmap_pixelmap_obj_t *self, bool auto_write);
+void shared_module_pixelmap_pixelmap_fill(pixelmap_pixelmap_obj_t *self, const mp_obj_t color);
+mp_obj_t shared_module_pixelmap_pixelmap_indices(pixelmap_pixelmap_obj_t *self, int index);
+void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t slice_in, const mp_obj_t value);
+mp_obj_t shared_module_pixelmap_pixelmap_getitem(pixelmap_pixelmap_obj_t *self, mp_int_t index);
+void shared_module_pixelmap_pixelmap_setitem(pixelmap_pixelmap_obj_t *self, mp_int_t index, const mp_obj_t value);
diff --git a/shared-bindings/adafruit_pixelmap/__init__.c b/shared-bindings/adafruit_pixelmap/__init__.c
new file mode 100644
index 0000000000..7b10471c83
--- /dev/null
+++ b/shared-bindings/adafruit_pixelmap/__init__.c
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ *
+ * 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/mphal.h"
+#include "py/runtime.h"
+#include "py/objproperty.h"
+
+#include "shared-bindings/adafruit_pixelmap/__init__.h"
+#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+
+
+//| """A fast pixel mapping library
+//|
+//| The `adafruit_pixelmap` module provides the :py:class:`PixelMap` class to accelerate
+//| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel."""
+//|
+//| # The types accepted when getting a pixel value
+//| PixelReturnType = Union[
+//|     Tuple[int, int, int], Tuple[int, int, int, int], Tuple[int, int, int, float]
+//| ]
+//| PixelReturnSequence = Tuple[PixelReturnType]
+//| # The types returned when getting a pixel value
+//| PixelType = Union[int, PixelReturnType]
+//| PixelSequence = Union[Tuple[PixelType], List[PixelType]]
+
+STATIC const mp_rom_map_elem_t pixelmap_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_pixelmap) },
+    { MP_ROM_QSTR(MP_QSTR_PixelMap), MP_ROM_PTR(&pixelmap_pixelmap_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pixelmap_module_globals, pixelmap_module_globals_table);
+
+const mp_obj_module_t pixelmap_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&pixelmap_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_adafruit_pixelmap, pixelmap_module, CIRCUITPY_PIXELMAP);
diff --git a/shared-bindings/adafruit_pixelmap/__init__.h b/shared-bindings/adafruit_pixelmap/__init__.h
new file mode 100644
index 0000000000..9a84bc68a7
--- /dev/null
+++ b/shared-bindings/adafruit_pixelmap/__init__.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ *
+ * 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 CP_SHARED_BINDINGS_PIXELBUF_INIT_H
+#define CP_SHARED_BINDINGS_PIXELBUF_INIT_H
+
+#endif // CP_SHARED_BINDINGS_PIXELBUF_INIT_H
diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c
index cab97feace..72f03c6b26 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.c
@@ -152,7 +152,7 @@ STATIC uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) {
         translate("can't convert %q to %q"), mp_obj_get_type_qstr(obj), MP_QSTR_int);
 }
 
-STATIC void _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
+static void pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
     pixelbuf_byteorder_details_t *byteorder = &self->byteorder;
     // w is shared between white in NeoPixels and brightness in dotstars (so that DotStars can have
     // per-pixel brightness). Set the defaults here in case it isn't set below.
@@ -195,7 +195,12 @@ STATIC void _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color,
     }
 }
 
-STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
+void common_hal_adafruit_pixelbuf_pixelbuf_parse_color(mp_obj_t self_in, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+    pixelbuf_parse_color(self, color, r, g, b, w);
+}
+
+static void pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
     // DotStars don't have white, instead they have 5 bit brightness so pack it into w. Shift right
     // by three to leave the top five bits.
     if (self->bytes_per_pixel == 4 && self->byteorder.is_dotstar) {
@@ -232,14 +237,18 @@ STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t inde
         scaled_buffer[rgbw_order->b] = (b * self->scaled_brightness) / 256;
     }
 }
+void common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(mp_obj_t self_in, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+    pixelbuf_set_pixel_color(self, index, r, g, b, w);
+}
 
 STATIC void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t *self, size_t index, mp_obj_t value) {
     uint8_t r;
     uint8_t g;
     uint8_t b;
     uint8_t w;
-    _pixelbuf_parse_color(self, value, &r, &g, &b, &w);
-    _pixelbuf_set_pixel_color(self, index, r, g, b, w);
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self, value, &r, &g, &b, &w);
+    common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self, index, r, g, b, w);
 }
 
 void common_hal_adafruit_pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t *values,
@@ -322,10 +331,10 @@ void common_hal_adafruit_pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t fill_
     uint8_t g;
     uint8_t b;
     uint8_t w;
-    _pixelbuf_parse_color(self, fill_color, &r, &g, &b, &w);
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self, fill_color, &r, &g, &b, &w);
 
     for (size_t i = 0; i < self->pixel_count; i++) {
-        _pixelbuf_set_pixel_color(self, i, r, g, b, w);
+        common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self, i, r, g, b, w);
     }
     if (self->auto_write) {
         common_hal_adafruit_pixelbuf_pixelbuf_show(self_in);
diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.h b/shared-module/adafruit_pixelbuf/PixelBuf.h
index b526254f29..a4a753baa0 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.h
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.h
@@ -24,13 +24,11 @@
  * THE SOFTWARE.
  */
 
+#pragma once
 
 #include "py/obj.h"
 #include "py/objarray.h"
 
-#ifndef PIXELBUF_SHARED_MODULE_H
-#define PIXELBUF_SHARED_MODULE_H
-
 typedef struct {
     uint8_t r;
     uint8_t g;
@@ -68,5 +66,3 @@ typedef struct {
 
 #define DOTSTAR_LED_START 0b11100000
 #define DOTSTAR_LED_START_FULL_BRIGHT 0xFF
-
-#endif
diff --git a/shared-module/adafruit_pixelmap/PixelMap.c b/shared-module/adafruit_pixelmap/PixelMap.c
new file mode 100644
index 0000000000..6897b172af
--- /dev/null
+++ b/shared-module/adafruit_pixelmap/PixelMap.c
@@ -0,0 +1,184 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/smallint.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+#include "shared-bindings/adafruit_pixelbuf/PixelBuf.h"
+#include "shared-module/adafruit_pixelmap/PixelMap.h"
+
+typedef union {
+    uint32_t rgbw;
+    struct {
+        uint8_t r, g, b, w;
+    };
+} color_u;
+
+static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) {
+    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+
+    mp_obj_t item = self->items[i];
+    if (mp_obj_is_small_int(item)) {
+        common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(item), rgbw.r, rgbw.g, rgbw.b, rgbw.w);
+    } else {
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_tuple_get(item, &len, &items);
+
+        for (size_t j = 0; j < len; j++) {
+            common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(items[j]), rgbw.r, rgbw.g, rgbw.b, rgbw.w);
+        }
+    }
+}
+
+static void pixelmap_set_pixel(pixelmap_pixelmap_obj_t *self, size_t i, mp_obj_t color) {
+    color_u rgbw;
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self->pixelbuf, color, &rgbw.r, &rgbw.g, &rgbw.b, &rgbw.w);
+    pixelmap_set_pixel_rgbw(self, i, rgbw);
+}
+
+void shared_module_pixelmap_pixelmap_construct(pixelmap_pixelmap_obj_t *self, mp_obj_t pixelbuf, mp_obj_t indices) {
+    self->pixelbuf = pixelbuf;
+    self->indices = indices;
+    mp_obj_tuple_get(indices, &self->len, &self->items);
+}
+
+static bool auto_write_get_and_clear(pixelmap_pixelmap_obj_t *self) {
+    bool auto_write = self->auto_write && common_hal_adafruit_pixelbuf_pixelbuf_get_auto_write(self->pixelbuf);
+    if (auto_write) {
+        common_hal_adafruit_pixelbuf_pixelbuf_set_auto_write(self->pixelbuf, false);
+    }
+    return auto_write;
+}
+
+static void auto_write_reapply(pixelmap_pixelmap_obj_t *self, bool auto_write) {
+    if (auto_write) {
+        common_hal_adafruit_pixelbuf_pixelbuf_set_auto_write(self->pixelbuf, true);
+        common_hal_adafruit_pixelbuf_pixelbuf_show(self->pixelbuf);
+    }
+}
+
+bool shared_module_pixelmap_pixelmap_auto_write_get(pixelmap_pixelmap_obj_t *self) {
+    return self->auto_write;
+}
+
+void shared_module_pixelmap_pixelmap_auto_write_set(pixelmap_pixelmap_obj_t *self, bool auto_write) {
+    self->auto_write = auto_write;
+}
+
+void shared_module_pixelmap_pixelmap_fill(pixelmap_pixelmap_obj_t *self, const mp_obj_t color) {
+    color_u rgbw;
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self->pixelbuf, color, &rgbw.r, &rgbw.g, &rgbw.b, &rgbw.w);
+    bool auto_write = auto_write_get_and_clear(self);
+
+    for (size_t i = 0; i < self->len; i++) {
+        pixelmap_set_pixel_rgbw(self, i, rgbw);
+    }
+
+    auto_write_reapply(self, auto_write);
+}
+
+mp_obj_t shared_module_pixelmap_pixelmap_indices(pixelmap_pixelmap_obj_t *self, int index) {
+    mp_arg_validate_index_range(index, 0, self->len - 1, MP_QSTR_index);
+
+    mp_obj_t item = self->items[index];
+    if (mp_obj_is_small_int(item)) {
+        return mp_obj_new_tuple(1, &item);
+    } else {
+        return item;
+    }
+}
+
+#if MICROPY_PY_BUILTINS_SLICE
+void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t slice_in, const mp_obj_t values) {
+    mp_bound_slice_t slice;
+    mp_seq_get_fast_slice_indexes(self->len, slice_in, &slice);
+    size_t slice_len;
+    if (slice.step > 0) {
+        slice_len = slice.stop - slice.start;
+    } else {
+        slice_len = 1 + slice.start - slice.stop;
+    }
+    if (slice.step > 1 || slice.step < -1) {
+        size_t step = slice.step > 0 ? slice.step : slice.step * -1;
+        slice_len = (slice_len / step) + (slice_len % step ? 1 : 0);
+    }
+
+    size_t num_items = mp_obj_get_int(mp_obj_len(values));
+    if (num_items != slice_len) {
+        mp_raise_ValueError_varg(translate("Unmatched number of items on RHS (expected %d, got %d)."), slice_len, num_items);
+    }
+
+    bool auto_write = auto_write_get_and_clear(self);
+
+    // because we didn't preflight the pixel values, an exception could occur.
+    // In that case we need to do the auto-write of any pixels that were set
+    // before re-raising the exception
+    nlr_buf_t nlr;
+
+    size_t start = slice.start;
+    mp_int_t step = slice.step;
+
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_iter_buf_t iter_buf;
+        mp_obj_t iterable = mp_getiter(values, &iter_buf);
+        mp_obj_t item;
+        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+            pixelmap_set_pixel(self, start, item);
+            start += step;
+        }
+        nlr_pop();
+        auto_write_reapply(self, auto_write);
+    } else {
+        auto_write_reapply(self, auto_write);
+        // exception converting color value, re-raise
+        nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
+    }
+}
+#endif
+
+void shared_module_pixelmap_pixelmap_setitem(pixelmap_pixelmap_obj_t *self, mp_int_t i, mp_obj_t color) {
+    color_u rgbw;
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self->pixelbuf, color, &rgbw.r, &rgbw.g, &rgbw.b, &rgbw.w);
+    bool auto_write = auto_write_get_and_clear(self);
+    pixelmap_set_pixel_rgbw(self, i, rgbw);
+    auto_write_reapply(self, auto_write);
+}
+
+mp_obj_t shared_module_pixelmap_pixelmap_getitem(pixelmap_pixelmap_obj_t *self, mp_int_t i) {
+    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+    mp_obj_t item = self->items[i];
+    if (mp_obj_is_small_int(item)) {
+        return common_hal_adafruit_pixelbuf_pixelbuf_get_pixel(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(item));
+    } else {
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_tuple_get(item, &len, &items);
+        return common_hal_adafruit_pixelbuf_pixelbuf_get_pixel(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(items[0]));
+    }
+}
diff --git a/shared-module/adafruit_pixelmap/PixelMap.h b/shared-module/adafruit_pixelmap/PixelMap.h
new file mode 100644
index 0000000000..192d6a4f9c
--- /dev/null
+++ b/shared-module/adafruit_pixelmap/PixelMap.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Rose Hooper
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "shared-module/adafruit_pixelbuf/PixelBuf.h"
+
+typedef struct _pixelmap_pixelmap_obj {
+    mp_obj_base_t base;
+    mp_obj_t pixelbuf;
+    mp_obj_t indices;
+    size_t len;
+    mp_obj_t *items;
+    bool auto_write;
+} pixelmap_pixelmap_obj_t;
diff --git a/shared-module/adafruit_pixelmap/__init__.c b/shared-module/adafruit_pixelmap/__init__.c
new file mode 100644
index 0000000000..e69de29bb2

From 5d3484f61a051d1088e52b76db67afb4db7496b6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 11 Nov 2022 08:57:06 -0600
Subject: [PATCH 1352/2403] Update frozen modules

---
 frozen/Adafruit_CircuitPython_LIS3DH   | 2 +-
 frozen/Adafruit_CircuitPython_Requests | 2 +-
 frozen/Adafruit_CircuitPython_SSD1680  | 2 +-
 frozen/Adafruit_CircuitPython_UC8151D  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index 18eaddb96a..5b4703428f 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 18eaddb96aa6599901ef2ff0e140e89a2de8c5d0
+Subproject commit 5b4703428fc299ac268d08350c885122b2af1e75
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index a5d56f3e48..317f4bdb79 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit a5d56f3e4866c8dbb343e03500355a42c46e557a
+Subproject commit 317f4bdb799afa59b164def4ea0610f57db9922e
diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680
index adff47d7be..168624262c 160000
--- a/frozen/Adafruit_CircuitPython_SSD1680
+++ b/frozen/Adafruit_CircuitPython_SSD1680
@@ -1 +1 @@
-Subproject commit adff47d7be2a430b20e5ebcc59cb4e5a38fc171c
+Subproject commit 168624262c18f5ee80ec392c0844d6a4c6548760
diff --git a/frozen/Adafruit_CircuitPython_UC8151D b/frozen/Adafruit_CircuitPython_UC8151D
index a64fad692c..565fed5151 160000
--- a/frozen/Adafruit_CircuitPython_UC8151D
+++ b/frozen/Adafruit_CircuitPython_UC8151D
@@ -1 +1 @@
-Subproject commit a64fad692cc83fa1ac48b8f5ab1a955fd9b39251
+Subproject commit 565fed515138f962c4bcce0ee756d32e708a151a

From d5ea4d8f2f775597962b6dfc08b466c58a9e9f45 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 10 Nov 2022 18:40:57 +0000
Subject: [PATCH 1353/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (995 of 995 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 f59efab8c2..c3f7475167 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: 2022-11-09 10:48+0000\n"
+"PO-Revision-Date: 2022-11-11 18:49+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -3804,11 +3804,11 @@ msgstr "apenas bit_depth = 16 é compatível"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "Apenas o mono é compatível"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "apenas oversample=64 é compatível"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c

From b9ce2867a05efdcb357ffd1f45cd263eeca0eff1 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 10 Nov 2022 08:36:07 +0000
Subject: [PATCH 1354/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 9b4332e60b..1980477f4f 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: 2022-11-09 10:48+0000\n"
+"PO-Revision-Date: 2022-11-11 18:49+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -3769,11 +3769,11 @@ msgstr "bara bit_depth=16 stöds"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "endast mono stöds"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "endast oversample=64 stöds"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c

From 983502d6e3fe7611130ebec8d9f0d8d87fdbfb93 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 11 Nov 2022 15:31:49 -0500
Subject: [PATCH 1355/2403] ignore pin changes before sleep

---
 ports/raspberrypi/common-hal/alarm/__init__.c |  3 +++
 .../common-hal/alarm/pin/PinAlarm.c           | 27 +++++++++++--------
 .../common-hal/alarm/pin/PinAlarm.h           |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
index 656d15af5a..f6d36f702e 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -234,6 +234,9 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
 
     // Reset uses the watchdog. Use scratch registers to store wake reason
     watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = _get_wakeup_cause();
+
+    // Just before reset, enable the pinalarm interrupt.
+    alarm_pin_pinalarm_entering_deep_sleep();
     reset_cpu();
 }
 
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
index 0af27cb44f..93b8ff3165 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -38,7 +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;
+STATIC bool _not_yet_deep_sleeping = false;
 
 #define GPIO_IRQ_ALL_EVENTS 0x15u
 
@@ -46,12 +46,21 @@ STATIC 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);
+    // gpio_acknowledge_irq(gpio, events) is called automatically, before this callback is called.
 
-    // Disable IRQ automatically
-    gpio_set_irq_enabled(gpio, events, false);
-    gpio_set_dormant_irq_enabled(gpio, events, false);
+    if (_not_yet_deep_sleeping) {
+        // Event went off prematurely, before we went to sleep, so set it again.
+        gpio_set_irq_enabled(gpio, events, false);
+    } else {
+        // Went off during sleep.
+        // Disable IRQ automatically.
+        gpio_set_irq_enabled(gpio, events, false);
+        gpio_set_dormant_irq_enabled(gpio, events, false);
+    }
+}
+
+void alarm_pin_pinalarm_entering_deep_sleep() {
+    _not_yet_deep_sleeping = 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) {
@@ -156,11 +165,7 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
                 gpio_set_dormant_irq_enabled((uint)alarm->pin->number, event, true);
             }
 
-            _pinalarm_set = true;
+            _not_yet_deep_sleeping = 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 9dcbf2b848..26c6c49a5e 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
@@ -46,4 +46,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);
+void alarm_pin_pinalarm_entering_deep_sleep(void);

From b544a3920a2006330f32f0c04e4fc51113295632 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 11 Nov 2022 14:44:13 -0600
Subject: [PATCH 1356/2403] update ulab to 6.0.1

---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index 57de23c1fb..25a825e41c 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 57de23c1fb434ba99aaafe1d00bd77d5cdf5d66b
+Subproject commit 25a825e41c26cfcee018b762416741d0d63aeabf

From 3c4d8c692690e33ec8a29c68ee143a780b418b2a Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 11 Nov 2022 17:50:07 -0600
Subject: [PATCH 1357/2403] implement self hidden property for vectorio shapes

---
 shared-bindings/vectorio/Circle.c      |  4 ++++
 shared-bindings/vectorio/Polygon.c     |  4 ++++
 shared-bindings/vectorio/Rectangle.c   |  4 ++++
 shared-bindings/vectorio/VectorShape.c | 27 ++++++++++++++++++++++++++
 shared-bindings/vectorio/VectorShape.h |  4 ++++
 shared-module/vectorio/VectorShape.c   | 15 ++++++++++++++
 shared-module/vectorio/VectorShape.h   |  1 +
 7 files changed, 59 insertions(+)

diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index 91b0d3ae34..65428966ce 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -109,6 +109,9 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj,
 //|     y: int
 //|     """Y position of the center point of the circle in the parent."""
 //|
+//|     hidden: boolean
+//|     """Hide the circle or not."""
+//|
 //|     location: Tuple[int, int]
 //|     """(X,Y) position of the center point of the circle in the parent."""
 //|
@@ -123,6 +126,7 @@ STATIC const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_radius), MP_ROM_PTR(&vectorio_circle_radius_obj) },
     { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&vectorio_vector_shape_x_obj) },
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&vectorio_vector_shape_y_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&vectorio_vector_shape_hidden_obj) },
     { MP_ROM_QSTR(MP_QSTR_color_index), MP_ROM_PTR(&vectorio_circle_color_index_obj) },
     { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) },
     { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) },
diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index f4f07c66a0..c3a6b3f31b 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -118,6 +118,9 @@ MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj,
 //|     y: int
 //|     """Y position of the 0,0 origin in the points list."""
 //|
+//|     hidden: boolean
+//|     """Hide the polygon or not."""
+//|
 //|     location: Tuple[int, int]
 //|     """(X,Y) position of the 0,0 origin in the points list."""
 //|
@@ -132,6 +135,7 @@ STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_points), MP_ROM_PTR(&vectorio_polygon_points_obj) },
     { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&vectorio_vector_shape_x_obj) },
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&vectorio_vector_shape_y_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&vectorio_vector_shape_hidden_obj) },
     { MP_ROM_QSTR(MP_QSTR_color_index), MP_ROM_PTR(&vectorio_polygon_color_index_obj) },
     { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) },
     { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) },
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index 5c163a7693..8f6c9ffd28 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -139,6 +139,9 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = {
 //|     y: int
 //|     """Y position of the top left corner of the rectangle in the parent."""
 //|
+//|     hidden: boolean
+//|     """Hide the rectangle or not."""
+//|
 //|     location: Tuple[int, int]
 //|     """(X,Y) position of the top left corner of the rectangle in the parent."""
 //|
@@ -152,6 +155,7 @@ STATIC const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = {
     // Properties
     { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&vectorio_vector_shape_x_obj) },
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&vectorio_vector_shape_y_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&vectorio_vector_shape_hidden_obj) },
     { MP_ROM_QSTR(MP_QSTR_color_index), MP_ROM_PTR(&vectorio_rectangle_color_index_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&vectorio_rectangle_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&vectorio_rectangle_height_obj) },
diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c
index ba55cfb851..e5c806b943 100644
--- a/shared-bindings/vectorio/VectorShape.c
+++ b/shared-bindings/vectorio/VectorShape.c
@@ -181,6 +181,33 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_location_obj,
     (mp_obj_t)&vectorio_vector_shape_set_location_obj);
 
 
+// Stub checker does not approve of these shared properties.
+//     hidden: bool
+//     """Hide the shape or not."""
+//
+STATIC mp_obj_t vectorio_vector_shape_obj_get_hidden(mp_obj_t wrapper_shape) {
+    // Relies on the fact that only vector_shape impl gets matched with a VectorShape.
+    const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape);
+    vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape));
+    return mp_obj_new_bool(common_hal_vectorio_vector_shape_get_hidden(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_hidden_obj, vectorio_vector_shape_obj_get_hidden);
+
+STATIC mp_obj_t vectorio_vector_shape_obj_set_hidden(mp_obj_t wrapper_shape, mp_obj_t hidden_obj) {
+    // Relies on the fact that only vector_shape impl gets matched with a VectorShape.
+    const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape);
+    vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape));
+
+    common_hal_vectorio_vector_shape_set_hidden(self, mp_obj_is_true(hidden_obj));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(vectorio_vector_shape_set_hidden_obj, vectorio_vector_shape_obj_set_hidden);
+
+MP_PROPERTY_GETSET(vectorio_vector_shape_hidden_obj,
+    (mp_obj_t)&vectorio_vector_shape_get_hidden_obj,
+    (mp_obj_t)&vectorio_vector_shape_set_hidden_obj);
+
+
 //     pixel_shader: Union[ColorConverter, Palette]
 //     """The pixel shader of the shape."""
 //
diff --git a/shared-bindings/vectorio/VectorShape.h b/shared-bindings/vectorio/VectorShape.h
index 13f62922f3..c94476c25a 100644
--- a/shared-bindings/vectorio/VectorShape.h
+++ b/shared-bindings/vectorio/VectorShape.h
@@ -31,6 +31,9 @@ void common_hal_vectorio_vector_shape_set_location(vectorio_vector_shape_t *self
 mp_int_t common_hal_vectorio_vector_shape_get_y(vectorio_vector_shape_t *self);
 void common_hal_vectorio_vector_shape_set_y(vectorio_vector_shape_t *self, mp_int_t y);
 
+mp_int_t common_hal_vectorio_vector_shape_get_hidden(vectorio_vector_shape_t *self);
+void common_hal_vectorio_vector_shape_set_hidden(vectorio_vector_shape_t *self, bool hidden);
+
 mp_obj_t common_hal_vectorio_vector_shape_get_pixel_shader(vectorio_vector_shape_t *self);
 void common_hal_vectorio_vector_shape_set_pixel_shader(vectorio_vector_shape_t *self, mp_obj_t pixel_shader);
 
@@ -40,6 +43,7 @@ void vectorio_vector_shape_update_transform(vectorio_vector_shape_t *self, displ
 extern vectorio_draw_protocol_impl_t vectorio_vector_shape_draw_protocol_impl;
 extern const mp_obj_property_getset_t vectorio_vector_shape_x_obj;
 extern const mp_obj_property_getset_t vectorio_vector_shape_y_obj;
+extern const mp_obj_property_getset_t vectorio_vector_shape_hidden_obj;
 extern const mp_obj_property_getset_t vectorio_vector_shape_location_obj;
 extern const mp_obj_property_getset_t vectorio_vector_shape_pixel_shader_obj;
 extern const mp_obj_fun_builtin_fixed_t vectorio_vector_shape_contains_obj;
diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c
index d9c13f54cc..20e1405d9a 100644
--- a/shared-module/vectorio/VectorShape.c
+++ b/shared-module/vectorio/VectorShape.c
@@ -293,6 +293,16 @@ void common_hal_vectorio_vector_shape_set_location(vectorio_vector_shape_t *self
     }
 }
 
+mp_int_t common_hal_vectorio_vector_shape_get_hidden(vectorio_vector_shape_t *self) {
+    VECTORIO_SHAPE_DEBUG("%p get_hidden\n", self);
+    return self->hidden;
+}
+
+void common_hal_vectorio_vector_shape_set_hidden(vectorio_vector_shape_t *self, bool hidden) {
+    VECTORIO_SHAPE_DEBUG("%p set_hidden %d\n", self, x);
+    self->hidden = hidden;
+    common_hal_vectorio_vector_shape_set_dirty(self);
+}
 
 mp_obj_t common_hal_vectorio_vector_shape_get_pixel_shader(vectorio_vector_shape_t *self) {
     VECTORIO_SHAPE_DEBUG("%p get_pixel_shader\n", self);
@@ -315,6 +325,11 @@ bool vectorio_vector_shape_fill_area(vectorio_vector_shape_t *self, const _displ
     uint64_t start = common_hal_time_monotonic_ns();
     uint64_t pixel_time = 0;
     #endif
+
+    if (self->hidden) {
+        return false;
+    }
+
     VECTORIO_SHAPE_DEBUG("%p fill_area: fill: {(%5d,%5d), (%5d,%5d)}",
         self,
         area->x1, area->y1, area->x2, area->y2
diff --git a/shared-module/vectorio/VectorShape.h b/shared-module/vectorio/VectorShape.h
index fdbae964a8..ce5823e40c 100644
--- a/shared-module/vectorio/VectorShape.h
+++ b/shared-module/vectorio/VectorShape.h
@@ -30,6 +30,7 @@ typedef struct {
     mp_obj_t pixel_shader;
     int16_t x;
     int16_t y;
+    bool hidden : 1;
     displayio_buffer_transform_t *absolute_transform;
     // Tracks current shape footprint and expands outward as the shape dirties and changes.
     // This is suboptimal if you move your shape far.  Could add more state to only redraw

From 56be5477542b31313d01731cd9730932b4eec66d Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 11 Nov 2022 20:18:42 -0600
Subject: [PATCH 1358/2403] fix type name

---
 shared-bindings/vectorio/Circle.c    | 2 +-
 shared-bindings/vectorio/Polygon.c   | 2 +-
 shared-bindings/vectorio/Rectangle.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index 65428966ce..87cd46ad9a 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -109,7 +109,7 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj,
 //|     y: int
 //|     """Y position of the center point of the circle in the parent."""
 //|
-//|     hidden: boolean
+//|     hidden: bool
 //|     """Hide the circle or not."""
 //|
 //|     location: Tuple[int, int]
diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index c3a6b3f31b..6ad102e6e6 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -118,7 +118,7 @@ MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj,
 //|     y: int
 //|     """Y position of the 0,0 origin in the points list."""
 //|
-//|     hidden: boolean
+//|     hidden: bool
 //|     """Hide the polygon or not."""
 //|
 //|     location: Tuple[int, int]
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index 8f6c9ffd28..a4f3e12e69 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -139,7 +139,7 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = {
 //|     y: int
 //|     """Y position of the top left corner of the rectangle in the parent."""
 //|
-//|     hidden: boolean
+//|     hidden: bool
 //|     """Hide the rectangle or not."""
 //|
 //|     location: Tuple[int, int]

From 6c3b9b64dacf16f128d069bb90e2ce3169ca569c Mon Sep 17 00:00:00 2001
From: root 
Date: Sat, 12 Nov 2022 03:22:15 +0000
Subject: [PATCH 1359/2403] add crcibernetica-ideaboard

---
 .../boards/crcibernetica-ideaboard/board.c    | 29 +++++++++++
 .../crcibernetica-ideaboard/mpconfigboard.h   | 43 +++++++++++++++
 .../crcibernetica-ideaboard/mpconfigboard.mk  |  9 ++++
 .../boards/crcibernetica-ideaboard/pins.c     | 52 +++++++++++++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 ports/espressif/boards/crcibernetica-ideaboard/board.c
 create mode 100644 ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.h
 create mode 100644 ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/crcibernetica-ideaboard/pins.c

diff --git a/ports/espressif/boards/crcibernetica-ideaboard/board.c b/ports/espressif/boards/crcibernetica-ideaboard/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/crcibernetica-ideaboard/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.h b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.h
new file mode 100644
index 0000000000..2d20fff211
--- /dev/null
+++ b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "CRCibernetica IdeaBoard"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
new file mode 100644
index 0000000000..cbc468b3ec
--- /dev/null
+++ b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CIRCUITPY_CREATOR_ID =  0x0000303A
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/pins.c b/ports/espressif/boards/crcibernetica-ideaboard/pins.c
new file mode 100644
index 0000000000..8f90bc90a0
--- /dev/null
+++ b/ports/espressif/boards/crcibernetica-ideaboard/pins.c
@@ -0,0 +1,52 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 512cda8b73d795e17c863da167233e218b58d9b4 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 12 Nov 2022 10:03:00 +0530
Subject: [PATCH 1360/2403] enable `microcontroller.cpu.temperature` on esp32s3

---
 ports/espressif/common-hal/microcontroller/Processor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
index 9b97b98cbd..bacc48c07b 100644
--- a/ports/espressif/common-hal/microcontroller/Processor.c
+++ b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -40,13 +40,13 @@
 
 #include "soc/efuse_reg.h"
 
-#if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+#if !defined(CONFIG_IDF_TARGET_ESP32)
 #include "driver/temp_sensor.h"
 #endif
 
 float common_hal_mcu_processor_get_temperature(void) {
     float tsens_out;
-    #if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32)
+    #if defined(CONFIG_IDF_TARGET_ESP32)
     mp_raise_NotImplementedError(NULL);
     #else
     temp_sensor_config_t temp_sensor = TSENS_CONFIG_DEFAULT(); // DEFAULT: range:-10℃ ~  80℃, error < 1℃.

From 78fc43baab6517a91426480eb2d6e9919f6a998a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 12 Nov 2022 09:16:23 -0600
Subject: [PATCH 1361/2403] raspberrypi: Make port_idle_until_interrupt work

This needs thorough testing before it's merged, as we tried
and reverted this once before (#5341 and #5356).

I think that besides checking for tinyusb having "something to do",
the fact that `port_interrupt_after_ticks` and `port_disable_tick`
weren't implemented that was causing a secondary problem.

I've tested this on a pico w over reboot-cycles and ctrl-c-cycles,
with and without drive automounting, with and without serial repl open,
and on a power-only connection.

I didn't notice the problem reported in #5356 after merely implementing
port_idle_until_interrupt; but I did notice that sleeps in general would
take over-long until "something" (like writing to the USB drive) happened;
I think "something" was probably calling port_enable_tick(). When this
problem was happening, sleeps would take a lot longer; for instance,
`sleep(.001)` would take about 1/20s and `sleep(.1)` would take about 1/7s.
---
 ports/raspberrypi/Makefile          |  1 +
 ports/raspberrypi/supervisor/port.c | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 5095c4c1f8..49a66c28aa 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -127,6 +127,7 @@ INC += \
         -I../shared/timeutils \
         -Iboards/$(BOARD) \
         -Iboards/ \
+        -isystem ./../../lib/cmsis/inc \
         -isystem sdk/ \
         -isystem sdk/src/common/pico_base/include/ \
         -isystem sdk/src/common/pico_binary_info/include/ \
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 781d2b11d2..89e451a3b0 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -72,6 +72,9 @@
 
 #include "supervisor/serial.h"
 
+#include "tusb.h"
+#include 
+
 extern volatile bool mp_msc_enabled;
 
 STATIC void _tick_callback(uint alarm_num);
@@ -241,38 +244,48 @@ uint32_t port_get_saved_word(void) {
     return __scratch_x_start__;
 }
 
+static volatile bool ticks_enabled;
+
 uint64_t port_get_raw_ticks(uint8_t *subticks) {
     uint64_t microseconds = time_us_64();
     return 1024 * (microseconds / 1000000) + (microseconds % 1000000) / 977;
 }
 
 STATIC void _tick_callback(uint alarm_num) {
-    supervisor_tick();
-    hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
+    if (ticks_enabled) {
+        supervisor_tick();
+        hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
+    }
 }
 
 // Enable 1/1024 second tick.
 void port_enable_tick(void) {
+    ticks_enabled = true;
     hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
 }
 
 // Disable 1/1024 second tick.
 void port_disable_tick(void) {
-    // hardware_alarm_cancel(0);
+    // One additional _tick_callback may occur, but it will just return
+    // whenever !ticks_enabled. Cancel is not called just in case
+    // it could nuke a timeout set by port_interrupt_after_ticks.
+    ticks_enabled = false;
 }
 
 // This is called by sleep, we ignore it when our ticks are enabled because
 // they'll wake us up earlier. If we don't, we'll mess up ticks by overwriting
 // the next RTC wake up time.
 void port_interrupt_after_ticks(uint32_t ticks) {
+    if (!ticks_enabled) {
+        hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), ticks * 977));
+    }
 }
 
 void port_idle_until_interrupt(void) {
     common_hal_mcu_disable_interrupts();
-    if (!background_callback_pending()) {
-        // TODO: Does not work when board is power-cycled.
-        // asm volatile ("dsb 0xF" ::: "memory");
-        // __wfi();
+    if (!background_callback_pending() && !tud_task_event_ready()) {
+        __DSB();
+        __WFI();
     }
     common_hal_mcu_enable_interrupts();
 }

From e4d620f0556f76d1c55450e0a3fdc4837bae3851 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 12 Nov 2022 09:17:47 -0600
Subject: [PATCH 1362/2403] make whitespace match

---
 ports/raspberrypi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 49a66c28aa..cb4c80a23d 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -120,8 +120,8 @@ SRC_LWIP :=
 endif
 
 INC += \
-	-I. \
-	-Ilwip_inc \
+        -I. \
+        -Ilwip_inc \
         -I../.. \
         -I../lib/mp-readline \
         -I../shared/timeutils \

From 43566dec5b94f5bf8551611f2da7dee886e3bab1 Mon Sep 17 00:00:00 2001
From: root 
Date: Sun, 13 Nov 2022 12:13:32 +0000
Subject: [PATCH 1363/2403] allow inclusion of board while blocking build files

---
 ports/espressif/.gitignore                    |  2 +-
 .../boards/crcibernetica-ideaboard/sdkconfig  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ports/espressif/boards/crcibernetica-ideaboard/sdkconfig

diff --git a/ports/espressif/.gitignore b/ports/espressif/.gitignore
index 51c080bb7f..d5350e07f9 100644
--- a/ports/espressif/.gitignore
+++ b/ports/espressif/.gitignore
@@ -1,5 +1,5 @@
 # idf.py menuconfig
-sdkconfig*
+./sdkconfig*
 
 # lock files for examples and components
 dependencies.lock
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/sdkconfig b/ports/espressif/boards/crcibernetica-ideaboard/sdkconfig
new file mode 100644
index 0000000000..6c0168c829
--- /dev/null
+++ b/ports/espressif/boards/crcibernetica-ideaboard/sdkconfig
@@ -0,0 +1,20 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From b8f5def9859f74430f39579718c579373e2406c5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 13 Nov 2022 09:26:16 -0600
Subject: [PATCH 1364/2403] return to using python 3.x for builds

---
 .github/workflows/build.yml             | 2 +-
 .github/workflows/create_website_pr.yml | 2 +-
 .github/workflows/pre-commit.yml        | 2 +-
 ports/espressif/esp-idf                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0dc47946b5..92e6600f56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py test ${{ github.sha }}
     - name: CircuitPython version
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 1658fe092c..75de556c68 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py website ${{ github.sha }}
     - name: Install deps
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 556f89e63c..a23dcd1d11 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Install deps
       run: |
         sudo apt-get install -y gettext uncrustify
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 716d8531d7..dbb2d88eb8 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 716d8531d71b122975e2966a24ec7613b87eb7b0
+Subproject commit dbb2d88eb8a90a314d6f2e7b0af71925802c552e

From dec802a73b726ef3cee60b4aef0c7dd79964b5b2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 13 Nov 2022 13:26:35 -0600
Subject: [PATCH 1365/2403] build docs when .github/workflows changes

Closes: #7205
---
 tools/ci_set_matrix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index f22840fad7..2629942383 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -215,7 +215,7 @@ def set_docs_to_build(build_all):
     doc_match = build_all
     if not build_all:
         doc_pattern = re.compile(
-            r"^(?:docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
+            r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
         )
         for p in changed_files:
             if doc_pattern.search(p):

From b499275bb5af25f785b86d77e3981b4ed72893b4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 09:08:17 -0500
Subject: [PATCH 1366/2403] Don't crash when assigning attributes of the
 GeneratorExit const singleton

---
 py/mpconfig.h     | 10 ++++++++++
 py/obj.h          |  4 +++-
 py/objexcept.c    |  4 +++-
 py/objgenerator.c | 19 +++++++++++++++++--
 py/vm.c           |  5 ++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 386a9765eb..9d68f4ce9d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -773,6 +773,16 @@ typedef long long mp_longint_impl_t;
 #define MICROPY_WARNINGS (0)
 #endif
 
+// Whether to support chained exceptions
+#ifndef MICROPY_CPYTHON_EXCEPTION_CHAIN
+#define MICROPY_CPYTHON_EXCEPTION_CHAIN (0)
+#endif
+
+// Whether the statically allocated GeneratorExit exception may be const
+#ifndef MICROPY_CONST_GENERATOREXIT_OBJ
+#define MICROPY_CONST_GENERATOREXIT_OBJ (!MICROPY_CPYTHON_EXCEPTION_CHAIN)
+#endif
+
 // Whether to support warning categories
 #ifndef MICROPY_WARNINGS_CATEGORY
 #define MICROPY_WARNINGS_CATEGORY (0)
diff --git a/py/obj.h b/py/obj.h
index 7fa21f5e38..b7e76a1106 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -791,7 +791,9 @@ extern const struct _mp_obj_dict_t mp_const_empty_dict_obj;
 extern const struct _mp_obj_traceback_t mp_const_empty_traceback_obj;
 extern const struct _mp_obj_singleton_t mp_const_ellipsis_obj;
 extern const struct _mp_obj_singleton_t mp_const_notimplemented_obj;
-extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
+#if MICROPY_CONST_GENERATOREXIT_OBJ
+extern const struct _mp_obj_exception_t mp_static_GeneratorExit_obj;
+#endif
 
 // Fixed empty map. Useful when calling keyword-receiving functions
 // without any keywords from C, etc.
diff --git a/py/objexcept.c b/py/objexcept.c
index 32dacbb17a..5491aea3bf 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -218,9 +218,11 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_exception_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] != MP_OBJ_NULL) {
         // store/delete attribute
-        if (self == &mp_const_GeneratorExit_obj) {
+        #if MICROPY_CONST_GENERATOREXIT_OBJ
+        if (self == &mp_static_GeneratorExit_obj) {
             mp_raise_AttributeError(MP_ERROR_TEXT("can't set attribute"));
         }
+        #endif
         if (attr == MP_QSTR___traceback__) {
             if (dest[1] == mp_const_none) {
                 self->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
diff --git a/py/objgenerator.c b/py/objgenerator.c
index c9af11fbb5..2256911e23 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -38,7 +38,12 @@
 #include "supervisor/shared/translate/translate.h"
 
 // Instance of GeneratorExit exception - needed by generator.close()
-const mp_obj_exception_t mp_const_GeneratorExit_obj = {{&mp_type_GeneratorExit}, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj, (mp_obj_traceback_t *)&mp_const_empty_traceback_obj};
+#if MICROPY_CONST_GENERATOREXIT_OBJ
+const
+#else
+static
+#endif
+mp_obj_exception_t mp_static_GeneratorExit_obj = {{&mp_type_GeneratorExit}, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj, (mp_obj_traceback_t *)&mp_const_empty_traceback_obj};
 
 /******************************************************************************/
 /* generator wrapper                                                          */
@@ -362,9 +367,19 @@ STATIC mp_obj_t gen_instance_throw(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gen_instance_throw_obj, 2, 4, gen_instance_throw);
 
+static mp_obj_t generatorexit(void) {
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    MP_STATIC_ASSERT(!MICROPY_CONST_GENERATOREXIT_OBJ);
+    mp_static_GeneratorExit_obj.context = NULL;
+    mp_static_GeneratorExit_obj.cause = NULL;
+    mp_static_GeneratorExit_obj.suppress_context = false;
+    #endif
+    return MP_OBJ_FROM_PTR(&mp_static_GeneratorExit_obj);
+}
+
 STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
     mp_obj_t ret;
-    switch (mp_obj_gen_resume(self_in, mp_const_none, MP_OBJ_FROM_PTR(&mp_const_GeneratorExit_obj), &ret)) {
+    switch (mp_obj_gen_resume(self_in, mp_const_none, generatorexit(), &ret)) {
         case MP_VM_RETURN_YIELD:
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("generator ignored GeneratorExit"));
 
diff --git a/py/vm.c b/py/vm.c
index 12a0f2d445..04e08e9fd1 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1391,7 +1391,10 @@ unwind_loop:
             // - constant GeneratorExit object, because it's const
             // - exceptions re-raised by END_FINALLY
             // - exceptions re-raised explicitly by "raise"
-            if (nlr.ret_val != &mp_const_GeneratorExit_obj
+            if ( true
+                #if MICROPY_CONST_GENERATOREXIT_OBJ
+                && nlr.ret_val != &mp_static_GeneratorExit_obj
+                #endif
                 && *code_state->ip != MP_BC_END_FINALLY
                 && *code_state->ip != MP_BC_RAISE_LAST) {
                 const byte *ip = code_state->fun_bc->bytecode;

From f3169246ba0ec367bf2b1732351ba365c6819800 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 16 Oct 2022 15:58:44 -0500
Subject: [PATCH 1367/2403] Implement chained exceptions

This adds the __cause__, __context__ and __suppress_context__
members to exception objects and makes e.g., `raise exc from cause`
set them in the same way as standard Python.
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 py/circuitpy_mpconfig.h                       |  3 ++
 py/objexcept.c                                | 34 ++++++++++++-
 py/objexcept.h                                |  2 +
 py/vm.c                                       | 37 ++++++++++----
 tests/basics/exception_chain.py               | 50 +++++++++++++++++--
 tests/basics/exception_chain.py.exp           |  2 -
 tests/run-tests.py                            |  8 ++-
 8 files changed, 118 insertions(+), 19 deletions(-)
 delete mode 100644 tests/basics/exception_chain.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index f6ebc2087b..ba9e941c28 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -65,6 +65,7 @@
 #define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
+#define MICROPY_CPYTHON_EXCEPTION_CHAIN (1)
 
 // use vfs's functions for import stat and builtin open
 #define mp_import_stat mp_vfs_import_stat
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 6ae8275058..d6d8419c8f 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -224,6 +224,9 @@ typedef long mp_off_t;
 #ifndef MICROPY_CPYTHON_COMPAT
 #define MICROPY_CPYTHON_COMPAT                (CIRCUITPY_FULL_BUILD)
 #endif
+#ifndef MICROPY_CPYTHON_EXCEPTION_CHAIN
+#define MICROPY_CPYTHON_EXCEPTION_CHAIN       (CIRCUITPY_FULL_BUILD)
+#endif
 #define MICROPY_PY_BUILTINS_POW3              (CIRCUITPY_BUILTINS_POW3)
 #define MICROPY_PY_FSTRINGS                   (1)
 #define MICROPY_MODULE_WEAK_LINKS             (0)
diff --git a/py/objexcept.c b/py/objexcept.c
index 5491aea3bf..80da487076 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -228,11 +228,35 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
                 self->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
             } else {
                 if (!mp_obj_is_type(dest[1], &mp_type_traceback)) {
-                    mp_raise_TypeError(MP_ERROR_TEXT("invalid traceback"));
+                    mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), MP_QSTR___context__, MP_QSTR_traceback);
                 }
                 self->traceback = MP_OBJ_TO_PTR(dest[1]);
             }
             dest[0] = MP_OBJ_NULL; // indicate success
+        #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+        } else if (attr == MP_QSTR___cause__) {
+            if (dest[1] == mp_const_none) {
+                self->cause = NULL;
+            } else if (!mp_obj_is_type(dest[1], &mp_type_BaseException)) {
+                self->cause = dest[1];
+            } else {
+                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), attr, MP_QSTR_BaseException);
+            }
+            self->suppress_context = true;
+            dest[0] = MP_OBJ_NULL; // indicate success
+        } else if (attr == MP_QSTR___context__) {
+            if (dest[1] == mp_const_none) {
+                self->context = NULL;
+            } else if (!mp_obj_is_type(dest[1], &mp_type_BaseException)) {
+                self->context = dest[1];
+            } else {
+                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), attr, MP_QSTR_BaseException);
+            }
+            dest[0] = MP_OBJ_NULL; // indicate success
+        } else if (attr == MP_QSTR___suppress_context__) {
+            self->suppress_context = mp_obj_is_true(dest[1]);
+            dest[0] = MP_OBJ_NULL; // indicate success
+        #endif
         }
         return;
     }
@@ -242,6 +266,14 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         dest[0] = mp_obj_exception_get_value(self_in);
     } else if (attr == MP_QSTR___traceback__) {
         dest[0] = (self->traceback) ? MP_OBJ_FROM_PTR(self->traceback) : mp_const_none;
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    } else if (attr == MP_QSTR___cause__) {
+        dest[0] = (self->cause) ? MP_OBJ_FROM_PTR(self->cause) : mp_const_none;
+    } else if (attr == MP_QSTR___context__) {
+        dest[0] = (self->context) ? MP_OBJ_FROM_PTR(self->context) : mp_const_none;
+    } else if (attr == MP_QSTR___suppress_context__) {
+        dest[0] = mp_obj_new_bool(self->suppress_context);
+    #endif
     #if MICROPY_CPYTHON_COMPAT
     } else if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(self->base.type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
         if (attr == MP_QSTR_errno) {
diff --git a/py/objexcept.h b/py/objexcept.h
index f28f50f5dc..24eb5cf527 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -34,6 +34,8 @@ typedef struct _mp_obj_exception_t {
     mp_obj_base_t base;
     mp_obj_tuple_t *args;
     mp_obj_traceback_t *traceback;
+    mp_obj_t cause, context;
+    bool suppress_context;
 } mp_obj_exception_t;
 
 void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind);
diff --git a/py/vm.c b/py/vm.c
index 04e08e9fd1..6d9b7f7a0b 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -183,6 +183,15 @@
 #define TRACE_TICK(current_ip, current_sp, is_exception)
 #endif // MICROPY_PY_SYS_SETTRACE
 
+STATIC mp_obj_t get_active_exception(mp_exc_stack_t *exc_sp, mp_exc_stack_t *exc_stack) {
+    for (mp_exc_stack_t *e = exc_sp; e >= exc_stack; --e) {
+        if (e->prev_exc != NULL) {
+            return MP_OBJ_FROM_PTR(e->prev_exc);
+        }
+    }
+    return MP_OBJ_NULL;
+}
+
 // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc)
 // sp points to bottom of stack which grows up
 // returns:
@@ -1129,13 +1138,7 @@ unwind_return:
                 ENTRY(MP_BC_RAISE_LAST): {
                     MARK_EXC_IP_SELECTIVE();
                     // search for the inner-most previous exception, to reraise it
-                    mp_obj_t obj = MP_OBJ_NULL;
-                    for (mp_exc_stack_t *e = exc_sp; e >= exc_stack; --e) {
-                        if (e->prev_exc != NULL) {
-                            obj = MP_OBJ_FROM_PTR(e->prev_exc);
-                            break;
-                        }
-                    }
+                    mp_obj_t obj = get_active_exception(exc_sp, exc_stack);
                     if (obj == MP_OBJ_NULL) {
                         obj = mp_obj_new_exception_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("no active exception to reraise"));
                     }
@@ -1145,14 +1148,30 @@ unwind_return:
                 ENTRY(MP_BC_RAISE_OBJ): {
                     MARK_EXC_IP_SELECTIVE();
                     mp_obj_t obj = mp_make_raise_obj(TOP());
+                    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+                    mp_obj_t active_exception = get_active_exception(exc_sp, exc_stack);
+                    if (active_exception != MP_OBJ_NULL) {
+                        mp_store_attr(obj, MP_QSTR___context__, active_exception);
+                    }
+                    #endif
                     RAISE(obj);
                 }
 
                 ENTRY(MP_BC_RAISE_FROM): {
                     MARK_EXC_IP_SELECTIVE();
-                    mp_warning(NULL, "exception chaining not supported");
-                    sp--; // ignore (pop) "from" argument
+                    mp_obj_t cause = POP();
                     mp_obj_t obj = mp_make_raise_obj(TOP());
+                    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+                    // search for the inner-most previous exception, to chain it
+                    mp_obj_t active_exception = get_active_exception(exc_sp, exc_stack);
+                    if (active_exception != MP_OBJ_NULL) {
+                        mp_store_attr(obj, MP_QSTR___context__, active_exception);
+                    }
+                    mp_store_attr(obj, MP_QSTR___cause__, cause);
+                    #else
+                    (void)cause;
+                    mp_warning(NULL, "exception chaining not supported");
+                    #endif
                     RAISE(obj);
                 }
 
diff --git a/tests/basics/exception_chain.py b/tests/basics/exception_chain.py
index c3a7d6b113..ef506c7cb0 100644
--- a/tests/basics/exception_chain.py
+++ b/tests/basics/exception_chain.py
@@ -1,6 +1,46 @@
-# Exception chaining is not supported, but check that basic
-# exception works as expected.
 try:
-    raise Exception from None
-except Exception:
-    print("Caught Exception")
+    Exception().__cause__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+def print_exc_info(e):
+    print("exception", type(e), repr(e))
+    print("context", type(e.__context__), e.__suppress_context__)
+    print("cause", type(e.__cause__))
+
+try:
+    try:
+        1/0
+    except Exception as inner:
+        raise RuntimeError() from inner
+except Exception as e:
+    print_exc_info(e)
+print()
+
+try:
+    try:
+        1/0
+    except Exception as inner:
+        raise RuntimeError() from OSError()
+except Exception as e:
+    print_exc_info(e)
+print()
+
+
+try:
+    try:
+        1/0
+    except Exception as inner:
+        raise RuntimeError()
+except Exception as e:
+    print_exc_info(e)
+print()
+
+try:
+    try:
+        1/0
+    except Exception as inner:
+        raise RuntimeError() from None
+except Exception as e:
+    print_exc_info(e)
diff --git a/tests/basics/exception_chain.py.exp b/tests/basics/exception_chain.py.exp
deleted file mode 100644
index 13635b3cde..0000000000
--- a/tests/basics/exception_chain.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: exception chaining not supported
-Caught Exception
diff --git a/tests/run-tests.py b/tests/run-tests.py
index ed0cf18e45..7a7b3adbcb 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -522,8 +522,12 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("basics/scope_implicit.py")  # requires checking for unbound local
         skip_tests.add("basics/try_finally_return2.py")  # requires raise_varargs
         skip_tests.add("basics/unboundlocal.py")  # requires checking for unbound local
-        skip_tests.add(
-            "circuitpython/traceback_test.py"
+        skip_tests.update(
+            (
+                "basics/chained_exception.py",
+                "circuitpython/traceback_test.py",
+                "circuitpython/traceback_test_chained.py",
+            )
         )  # because native doesn't have proper traceback info
         skip_tests.add("extmod/uasyncio_event.py")  # unknown issue
         skip_tests.add("extmod/uasyncio_lock.py")  # requires async with

From b6f86e1e731c59dc64e6fee1269d15dd3ad84b06 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 16 Oct 2022 16:21:48 -0500
Subject: [PATCH 1368/2403] Recursively print chained exceptions

---
 locale/circuitpython.pot                      | 20 ++++---
 py/obj.c                                      | 24 ++++++++
 py/objexcept.h                                |  5 +-
 tests/circuitpython/traceback_test_chained.py | 55 +++++++++++++++++++
 .../traceback_test_chained.py.exp             | 43 +++++++++++++++
 5 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 tests/circuitpython/traceback_test_chained.py
 create mode 100644 tests/circuitpython/traceback_test_chained.py.exp

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 044900bd30..3fb6507174 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%q in use"
 msgstr ""
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr ""
 
@@ -171,11 +171,11 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -894,6 +894,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2007,6 +2011,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3153,7 +3161,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3336,10 +3344,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/py/obj.c b/py/obj.c
index af2f4c1b68..72a0647176 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -142,9 +142,33 @@ void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) {
     mp_obj_print_helper(MP_PYTHON_PRINTER, o_in, kind);
 }
 
+static void mp_obj_print_inner_exception(const mp_print_t *print, mp_obj_t self_in, mp_int_t limit) {
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    mp_obj_exception_t *self = mp_obj_exception_get_native(self_in);
+    const compressed_string_t *msg = MP_ERROR_TEXT("During handling of the above exception, another exception occurred:");
+    mp_obj_exception_t *inner = NULL;
+    if (self->cause) {
+        msg = MP_ERROR_TEXT("The above exception was the direct cause of the following exception:");
+        inner = self->cause;
+    } else if (!self->suppress_context) {
+        inner = self->context;
+    }
+    if (inner && !inner->marked) {
+        inner->marked = true;
+        mp_obj_print_exception_with_limit(print, MP_OBJ_FROM_PTR(inner), limit);
+        inner->marked = false;
+        mp_printf(print, "\n");
+        mp_cprintf(print, msg);
+        mp_printf(print, "\n\n");
+    }
+    #endif
+}
+
 // helper function to print an exception with traceback
 void mp_obj_print_exception_with_limit(const mp_print_t *print, mp_obj_t exc, mp_int_t limit) {
     if (mp_obj_is_exception_instance(exc) && stack_ok()) {
+        mp_obj_print_inner_exception(print, exc, limit);
+
         size_t n, *values;
         mp_obj_exception_get_traceback(exc, &n, &values);
         if (n > 0) {
diff --git a/py/objexcept.h b/py/objexcept.h
index 24eb5cf527..77b338e951 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -34,8 +34,11 @@ typedef struct _mp_obj_exception_t {
     mp_obj_base_t base;
     mp_obj_tuple_t *args;
     mp_obj_traceback_t *traceback;
-    mp_obj_t cause, context;
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    struct _mp_obj_exception_t *cause, *context;
     bool suppress_context;
+    bool marked;
+    #endif
 } mp_obj_exception_t;
 
 void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind);
diff --git a/tests/circuitpython/traceback_test_chained.py b/tests/circuitpython/traceback_test_chained.py
new file mode 100644
index 0000000000..a0acc876cc
--- /dev/null
+++ b/tests/circuitpython/traceback_test_chained.py
@@ -0,0 +1,55 @@
+try:
+    Exception().__cause__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    import traceback
+except:
+    print("SKIP")
+    raise SystemExit
+
+
+def print_exc_info(e):
+    print("-" * 72)
+    traceback.print_exception(None, e, e.__traceback__)
+    print("-" * 72)
+    print()
+
+
+try:
+    try:
+        1 / 0
+    except Exception as inner:
+        raise RuntimeError() from inner
+except Exception as e:
+    print_exc_info(e)
+print()
+
+try:
+    try:
+        1 / 0
+    except Exception as inner:
+        raise RuntimeError() from OSError()
+except Exception as e:
+    print_exc_info(e)
+print()
+
+
+try:
+    try:
+        1 / 0
+    except Exception as inner:
+        raise RuntimeError()
+except Exception as e:
+    print_exc_info(e)
+print()
+
+try:
+    try:
+        1 / 0
+    except Exception as inner:
+        raise RuntimeError() from None
+except Exception as e:
+    print_exc_info(e)
diff --git a/tests/circuitpython/traceback_test_chained.py.exp b/tests/circuitpython/traceback_test_chained.py.exp
new file mode 100644
index 0000000000..bc26c44a3e
--- /dev/null
+++ b/tests/circuitpython/traceback_test_chained.py.exp
@@ -0,0 +1,43 @@
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 23, in 
+ZeroDivisionError: division by zero
+
+The above exception was the direct cause of the following exception:
+
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 25, in 
+RuntimeError: 
+------------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+OSError: 
+
+The above exception was the direct cause of the following exception:
+
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 34, in 
+RuntimeError: 
+------------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 42, in 
+ZeroDivisionError: division by zero
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 44, in 
+RuntimeError: 
+------------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 53, in 
+RuntimeError: 
+------------------------------------------------------------------------
+

From dd443bacb857ae736bc51d81585e1063cd0a03f2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Oct 2022 09:08:38 -0500
Subject: [PATCH 1369/2403] Chain exceptions while unwinding

---
 py/vm.c                                           | 11 ++++++++++-
 tests/basics/exception_chain.py                   | 10 +++++++++-
 tests/circuitpython/traceback_test_chained.py     |  8 ++++++++
 tests/circuitpython/traceback_test_chained.py.exp | 12 ++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 6d9b7f7a0b..9e9dbcaa8d 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1456,10 +1456,19 @@ unwind_loop:
                 // catch exception and pass to byte code
                 code_state->ip = exc_sp->handler;
                 mp_obj_t *sp = MP_TAGPTR_PTR(exc_sp->val_sp);
+                #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+                mp_obj_t active_exception = get_active_exception(exc_sp, exc_stack);
+                #endif
                 // save this exception in the stack so it can be used in a reraise, if needed
                 exc_sp->prev_exc = nlr.ret_val;
+                mp_obj_t obj = MP_OBJ_FROM_PTR(nlr.ret_val);
+                #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+                if (active_exception != MP_OBJ_NULL) {
+                    mp_store_attr(obj, MP_QSTR___context__, active_exception);
+                }
+                #endif
                 // push exception object so it can be handled by bytecode
-                PUSH(MP_OBJ_FROM_PTR(nlr.ret_val));
+                PUSH(obj);
                 code_state->sp = sp;
 
             #if MICROPY_STACKLESS
diff --git a/tests/basics/exception_chain.py b/tests/basics/exception_chain.py
index ef506c7cb0..b84ff19dd6 100644
--- a/tests/basics/exception_chain.py
+++ b/tests/basics/exception_chain.py
@@ -5,7 +5,7 @@ except AttributeError:
     raise SystemExit
 
 def print_exc_info(e):
-    print("exception", type(e), repr(e))
+    print("exception", type(e), e.args)
     print("context", type(e.__context__), e.__suppress_context__)
     print("cause", type(e.__cause__))
 
@@ -44,3 +44,11 @@ try:
         raise RuntimeError() from None
 except Exception as e:
     print_exc_info(e)
+
+try:
+    try:
+        raise RuntimeError()
+    except Exception as inner:
+        1/0
+except Exception as e:
+    print_exc_info(e)
diff --git a/tests/circuitpython/traceback_test_chained.py b/tests/circuitpython/traceback_test_chained.py
index a0acc876cc..83d0c03466 100644
--- a/tests/circuitpython/traceback_test_chained.py
+++ b/tests/circuitpython/traceback_test_chained.py
@@ -53,3 +53,11 @@ try:
         raise RuntimeError() from None
 except Exception as e:
     print_exc_info(e)
+
+try:
+    try:
+        raise RuntimeError()
+    except Exception as inner:
+        1 / 0
+except Exception as e:
+    print_exc_info(e)
diff --git a/tests/circuitpython/traceback_test_chained.py.exp b/tests/circuitpython/traceback_test_chained.py.exp
index bc26c44a3e..c874ff707f 100644
--- a/tests/circuitpython/traceback_test_chained.py.exp
+++ b/tests/circuitpython/traceback_test_chained.py.exp
@@ -41,3 +41,15 @@ Traceback (most recent call last):
 RuntimeError: 
 ------------------------------------------------------------------------
 
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 59, in 
+RuntimeError: 
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 61, in 
+ZeroDivisionError: division by zero
+------------------------------------------------------------------------
+

From e1046b1050d21daab224b3044e8665fd5b6d859d Mon Sep 17 00:00:00 2001
From: Dominic Davis-Foster 
Date: Mon, 14 Nov 2022 14:04:07 +0000
Subject: [PATCH 1370/2403] Add support for the 16MB WeAct Studio Pico

---
 .../boards/weact_studio_pico_16mb/board.c     | 29 ++++++++++
 .../weact_studio_pico_16mb/mpconfigboard.h    |  2 +
 .../weact_studio_pico_16mb/mpconfigboard.mk   | 11 ++++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/weact_studio_pico_16mb/pins.c      | 53 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 100644 ports/raspberrypi/boards/weact_studio_pico_16mb/board.c
 create mode 100644 ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/weact_studio_pico_16mb/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c

diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/board.c b/ports/raspberrypi/boards/weact_studio_pico_16mb/board.c
new file mode 100644
index 0000000000..76973aee30
--- /dev/null
+++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Fabian Affolter 
+ *
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.h b/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.h
new file mode 100644
index 0000000000..2dabc3eb1b
--- /dev/null
+++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "WeAct Studio Pico 16MB"
+#define MICROPY_HW_MCU_NAME "rp2040"
diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.mk b/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.mk
new file mode 100644
index 0000000000..55209e1eb4
--- /dev/null
+++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x239A
+USB_PID = 0x102E
+USB_PRODUCT = "Pico"
+USB_MANUFACTURER = "WeAct Studio"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/pico-sdk-configboard.h b/ports/raspberrypi/boards/weact_studio_pico_16mb/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c b/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c
new file mode 100644
index 0000000000..8632d9c322
--- /dev/null
+++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c
@@ -0,0 +1,53 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From cdab078d9dd24498f8abca423b96a40d18e05ae7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 14 Nov 2022 07:50:18 -0600
Subject: [PATCH 1371/2403] shared-bindings: Get rid of CYW43 special cases in
 shared-bindings

.. by moving it into a new weak function that can be replaced
just by the picow build.
---
 ports/raspberrypi/common-hal/analogio/AnalogIn.c    |  5 +++++
 .../raspberrypi/common-hal/digitalio/DigitalInOut.c |  4 ++++
 shared-bindings/analogio/AnalogIn.c                 | 12 ++++--------
 shared-bindings/analogio/AnalogIn.h                 |  1 +
 shared-bindings/digitalio/DigitalInOut.c            | 13 +++++--------
 shared-bindings/digitalio/DigitalInOut.h            |  1 +
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
index 0056eb17b5..8811cd54e4 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -40,7 +40,12 @@
 // voltage monitor function and the wifi function. Special handling is required
 // to read the analog voltage.
 #if CIRCUITPY_CYW43
+#include "bindings/cyw43/__init__.h"
 #define SPECIAL_PIN(pin) (pin->number == 29)
+
+const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
+    return validate_obj_is_free_pin_or_gpio29(obj);
+}
 #else
 #define SPECIAL_PIN(pin) false
 #endif
diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index 1490771661..eb498d3f19 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -41,6 +41,10 @@
 #include "pico/cyw43_arch.h"
 #include "bindings/cyw43/__init__.h"
 #define IS_CYW(self) ((self)->pin->base.type == &cyw43_pin_type)
+
+const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj) {
+    return validate_obj_is_free_pin_including_cyw43(obj);
+}
 #endif
 
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 274bfa4806..800c0bfa21 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -36,9 +36,9 @@
 #include "shared-bindings/analogio/AnalogIn.h"
 #include "shared-bindings/util.h"
 
-#if CIRCUITPY_CYW43
-#include "bindings/cyw43/__init__.h"
-#endif
+MP_WEAK const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
+    return validate_obj_is_free_pin(obj);
+}
 
 //| class AnalogIn:
 //|     """Read analog voltage levels
@@ -64,11 +64,7 @@ STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type,
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // 1st argument is the pin
-    #if CIRCUITPY_CYW43
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin_or_gpio29(args[0]);
-    #else
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
-    #endif
+    const mcu_pin_obj_t *pin = common_hal_analogio_analogin_validate_pin(args[0]);
     analogio_analogin_obj_t *self = m_new_obj(analogio_analogin_obj_t);
     self->base.type = &analogio_analogin_type;
     common_hal_analogio_analogin_construct(self, pin);
diff --git a/shared-bindings/analogio/AnalogIn.h b/shared-bindings/analogio/AnalogIn.h
index 9f80416267..7d667ed3f4 100644
--- a/shared-bindings/analogio/AnalogIn.h
+++ b/shared-bindings/analogio/AnalogIn.h
@@ -32,6 +32,7 @@
 
 extern const mp_obj_type_t analogio_analogin_type;
 
+const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj);
 void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin);
 void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self);
 bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t *self);
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index e42036bb1a..eb3c1ec69d 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -66,6 +66,10 @@ STATIC void check_result(digitalinout_result_t result) {
     }
 }
 
+MP_WEAK const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj) {
+    return validate_obj_is_free_pin(obj);
+}
+
 //| class DigitalInOut:
 //|     """Digital input and output
 //|
@@ -87,14 +91,7 @@ STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type,
     digitalio_digitalinout_obj_t *self = m_new_obj(digitalio_digitalinout_obj_t);
     self->base.type = &digitalio_digitalinout_type;
 
-    #if CIRCUITPY_CYW43
-    // The GPIO pin attached to the CYW43 co-processor can only be used for
-    // DigitalInOut, not for other purposes like PWM. That's why this check
-    // is here, and it's not rolled into validate_obj_is_free_pin.
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin_including_cyw43(args[0]);
-    #else
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
-    #endif
+    const mcu_pin_obj_t *pin = common_hal_digitalio_validate_pin(args[0]);
     common_hal_digitalio_digitalinout_construct(self, pin);
 
     return MP_OBJ_FROM_PTR(self);
diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h
index 9a751e93bb..80c3970f0e 100644
--- a/shared-bindings/digitalio/DigitalInOut.h
+++ b/shared-bindings/digitalio/DigitalInOut.h
@@ -55,6 +55,7 @@ typedef enum {
     DIGITALINOUT_REG_TOGGLE,
 } digitalinout_reg_op_t;
 
+const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj);
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin);
 void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self);
 bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *self);

From adca341d3bff2ba123685b992267ad43c04c42e9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 14 Nov 2022 09:14:39 -0600
Subject: [PATCH 1372/2403] Save code space by packing rgbw values into C union

It's more efficient passing one register-sized structure than 4
arguments or 4 pointers; working on intermediate values of 'int' size
is also more efficient in code size!

On raspberry pi pico w, this increased free flash space by +104 bytes.
It also increased the speed of my testing animation very slightly, from
187fps to 189fps when run 'unthrottled'
---
 shared-bindings/adafruit_pixelbuf/PixelBuf.h |  7 +++
 shared-module/adafruit_pixelbuf/PixelBuf.c   | 58 ++++++++++----------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.h b/shared-bindings/adafruit_pixelbuf/PixelBuf.h
index 7ae3d6acf8..e73d3e02d6 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.h
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.h
@@ -31,6 +31,13 @@
 
 extern const mp_obj_type_t pixelbuf_pixelbuf_type;
 
+typedef union {
+    struct {
+        uint8_t r, g, b, w;
+    };
+    uint32_t rgbw;
+} color_u;
+
 void common_hal_adafruit_pixelbuf_pixelbuf_construct(pixelbuf_pixelbuf_obj_t *self, size_t n,
     pixelbuf_byteorder_details_t *byteorder, mp_float_t brightness, bool auto_write, uint8_t *header,
     size_t header_len, uint8_t *trailer, size_t trailer_len);
diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c
index cab97feace..e0c63306f9 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.c
@@ -152,50 +152,56 @@ STATIC uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) {
         translate("can't convert %q to %q"), mp_obj_get_type_qstr(obj), MP_QSTR_int);
 }
 
-STATIC void _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
+STATIC color_u _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color) {
+    color_u result;
     pixelbuf_byteorder_details_t *byteorder = &self->byteorder;
     // w is shared between white in NeoPixels and brightness in dotstars (so that DotStars can have
     // per-pixel brightness). Set the defaults here in case it isn't set below.
     if (byteorder->is_dotstar) {
-        *w = 255;
+        result.w = 255;
     } else {
-        *w = 0;
+        result.w = 0;
     }
 
     if (mp_obj_is_int(color) || mp_obj_is_float(color)) {
         mp_int_t value = mp_obj_is_int(color) ? mp_obj_get_int_truncated(color) : (mp_int_t)mp_obj_get_float(color);
-        *r = value >> 16 & 0xff;
-        *g = (value >> 8) & 0xff;
-        *b = value & 0xff;
+        result.r = value >> 16 & 0xff;
+        result.g = (value >> 8) & 0xff;
+        result.b = value & 0xff;
     } else {
         mp_obj_t *items;
         size_t len;
         mp_obj_get_array(color, &len, &items);
         mp_arg_validate_length_range(len, 3, 4, MP_QSTR_color);
 
-        *r = _pixelbuf_get_as_uint8(items[PIXEL_R]);
-        *g = _pixelbuf_get_as_uint8(items[PIXEL_G]);
-        *b = _pixelbuf_get_as_uint8(items[PIXEL_B]);
+        result.r = _pixelbuf_get_as_uint8(items[PIXEL_R]);
+        result.g = _pixelbuf_get_as_uint8(items[PIXEL_G]);
+        result.b = _pixelbuf_get_as_uint8(items[PIXEL_B]);
         if (len > 3) {
             if (mp_obj_is_float(items[PIXEL_W])) {
-                *w = 255 * mp_obj_get_float(items[PIXEL_W]);
+                result.w = 255 * mp_obj_get_float(items[PIXEL_W]);
             } else {
-                *w = mp_obj_get_int_truncated(items[PIXEL_W]);
+                result.w = mp_obj_get_int_truncated(items[PIXEL_W]);
             }
-            return;
+            return result;
         }
     }
     // Int colors can't set white directly so convert to white when all components are equal.
     // Also handles RGBW values assigned an RGB tuple.
-    if (!byteorder->is_dotstar && byteorder->bpp == 4 && byteorder->has_white && *r == *g && *r == *b) {
-        *w = *r;
-        *r = 0;
-        *g = 0;
-        *b = 0;
+    if (!byteorder->is_dotstar && byteorder->bpp == 4 && byteorder->has_white && result.r == result.g && result.r == result.b) {
+        result.w = result.r;
+        result.r = 0;
+        result.g = 0;
+        result.b = 0;
     }
+    return result;
 }
 
-STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
+STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, color_u rgbw) {
+    int r = rgbw.r;
+    int g = rgbw.g;
+    int b = rgbw.b;
+    int w = rgbw.w;
     // DotStars don't have white, instead they have 5 bit brightness so pack it into w. Shift right
     // by three to leave the top five bits.
     if (self->bytes_per_pixel == 4 && self->byteorder.is_dotstar) {
@@ -234,12 +240,8 @@ STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t inde
 }
 
 STATIC void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t *self, size_t index, mp_obj_t value) {
-    uint8_t r;
-    uint8_t g;
-    uint8_t b;
-    uint8_t w;
-    _pixelbuf_parse_color(self, value, &r, &g, &b, &w);
-    _pixelbuf_set_pixel_color(self, index, r, g, b, w);
+    color_u rgbw = _pixelbuf_parse_color(self, value);
+    _pixelbuf_set_pixel_color(self, index, rgbw);
 }
 
 void common_hal_adafruit_pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t *values,
@@ -318,14 +320,10 @@ void common_hal_adafruit_pixelbuf_pixelbuf_show(mp_obj_t self_in) {
 void common_hal_adafruit_pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t fill_color) {
     pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
 
-    uint8_t r;
-    uint8_t g;
-    uint8_t b;
-    uint8_t w;
-    _pixelbuf_parse_color(self, fill_color, &r, &g, &b, &w);
+    color_u rgbw = _pixelbuf_parse_color(self, fill_color);
 
     for (size_t i = 0; i < self->pixel_count; i++) {
-        _pixelbuf_set_pixel_color(self, i, r, g, b, w);
+        _pixelbuf_set_pixel_color(self, i, rgbw);
     }
     if (self->auto_write) {
         common_hal_adafruit_pixelbuf_pixelbuf_show(self_in);

From e53bbb1bd22a6c3842e7db2df1d05f144a23aa0b Mon Sep 17 00:00:00 2001
From: River Wang 
Date: Mon, 14 Nov 2022 15:46:58 +0000
Subject: [PATCH 1373/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 97.3% (969 of 995 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 8dee6b5f2e..bee1c4d4b4 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,15 +7,15 @@ 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: 2022-08-20 14:09+0000\n"
-"Last-Translator: hexthat \n"
+"PO-Revision-Date: 2022-11-14 15:47+0000\n"
+"Last-Translator: River Wang \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -740,6 +740,7 @@ msgid "Cannot get temperature"
 msgstr "Wúfǎ huòqǔ wēndù"
 
 #: shared-bindings/_bleio/Adapter.c
+#, fuzzy
 msgid "Cannot have scan responses for extended, connectable advertisements."
 msgstr "Nín wúfǎ sǎomiáo kuòzhǎn de, kě liánjiē de guǎnggào."
 

From 2e6dd1bf1f1b41d0798a708e93559610e75aca6b Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 14 Nov 2022 18:36:42 +0200
Subject: [PATCH 1374/2403] Radio.c no longer needs ping.h

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 8073f57063..a59303a216 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -50,7 +50,6 @@
 #include "lwip/dns.h"
 #include "lwip/icmp.h"
 #include "lwip/raw.h"
-#include "lwip_src/ping.h"
 
 #ifndef PING_ID
 #define PING_ID        0xAFAF
@@ -60,11 +59,6 @@
 #define PING_DEBUG     LWIP_DBG_ON
 #endif
 
-#ifdef LWIP_DEBUG
-static uint32_t ping_time;
-#endif
-
-
 #define MAC_ADDRESS_LENGTH 6
 
 #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
@@ -305,6 +299,10 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv
 }
 
 volatile bool ping_received;
+u16_t ping_seq_num;
+
+void ping_set_target(const ip_addr_t *ping_addr);
+int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
 
 static u8_t
 ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
@@ -313,6 +311,7 @@ ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
 
     if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
         pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
+        uint32_t ping_time = sys_now();
         iecho = (struct icmp_echo_hdr *)p->payload;
 
         if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {

From 14b20087b562d1551d1275d5c3297627f93c5a80 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 14 Nov 2022 11:29:18 -0600
Subject: [PATCH 1375/2403] only ignore sdkconfig* files in the espressif
 port's top directory

danh and microdev1 noticed that this ignore pattern was over-broad
and caused added sdkconfig files in boards/ (which should be committed)
to be ignored and not proposed for addition by common tools like
git status, git gui, etc.

This pattern anchors the search so that it only matches in the
ports/espressif directory, so ports/espressif/sdkconfig is ignored
but ports/espressif/boards/example/sdkconfig is not ignored anymore
---
 ports/espressif/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/.gitignore b/ports/espressif/.gitignore
index d5350e07f9..63e4a35878 100644
--- a/ports/espressif/.gitignore
+++ b/ports/espressif/.gitignore
@@ -1,5 +1,5 @@
 # idf.py menuconfig
-./sdkconfig*
+/sdkconfig*
 
 # lock files for examples and components
 dependencies.lock

From 6ad61a3fd1f40e9ed8832eb083c660a1aea6029d Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 14 Nov 2022 19:31:18 +0200
Subject: [PATCH 1376/2403] Radio.c work

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index a59303a216..4f32fad793 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -299,10 +299,9 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv
 }
 
 volatile bool ping_received;
-u16_t ping_seq_num;
-
-void ping_set_target(const ip_addr_t *ping_addr);
 int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
+uint16_t ping_seq_num;
+uint32_t ping_time;
 
 static u8_t
 ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
@@ -311,7 +310,7 @@ ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
 
     if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
         pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
-        uint32_t ping_time = sys_now();
+
         iecho = (struct icmp_echo_hdr *)p->payload;
 
         if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
@@ -331,6 +330,7 @@ ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
 }
 
 mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
+    ping_time = sys_now();
     ip_addr_t ping_addr;
     ipaddress_ipaddress_to_lwip(ip_address, &ping_addr);
 

From 398e9122a0a4b8ba7ba148f31c09921d01c4ab69 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 14 Nov 2022 19:33:06 +0200
Subject: [PATCH 1377/2403] remove lwip_src

---
 ports/raspberrypi/lwip_src/ping.c | 384 ------------------------------
 ports/raspberrypi/lwip_src/ping.h |  25 --
 2 files changed, 409 deletions(-)
 delete mode 100644 ports/raspberrypi/lwip_src/ping.c
 delete mode 100644 ports/raspberrypi/lwip_src/ping.h

diff --git a/ports/raspberrypi/lwip_src/ping.c b/ports/raspberrypi/lwip_src/ping.c
deleted file mode 100644
index e59b4d6662..0000000000
--- a/ports/raspberrypi/lwip_src/ping.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/**
- * @file
- * Ping sender module
- *
- */
-
-/*
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-/**
- * This is an example of a "ping" sender (with raw API and socket API).
- * It can be used as a start point to maintain opened a network connection, or
- * like a network "watchdog" for your device.
- *
- */
-
-#include "lwip/opt.h"
-
-#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
-
-#include "ping.h"
-
-#include "lwip/mem.h"
-#include "lwip/raw.h"
-#include "lwip/icmp.h"
-#include "lwip/netif.h"
-#include "lwip/sys.h"
-#include "lwip/timeouts.h"
-#include "lwip/inet_chksum.h"
-#include "lwip/prot/ip4.h"
-
-#if PING_USE_SOCKETS
-#include "lwip/sockets.h"
-#include "lwip/inet.h"
-#include 
-#endif /* PING_USE_SOCKETS */
-
-
-/**
- * PING_DEBUG: Enable debugging for PING.
- */
-#ifndef PING_DEBUG
-#define PING_DEBUG     LWIP_DBG_ON
-#endif
-
-/** ping receive timeout - in milliseconds */
-#ifndef PING_RCV_TIMEO
-#define PING_RCV_TIMEO 1000
-#endif
-
-/** ping delay - in milliseconds */
-#ifndef PING_DELAY
-#define PING_DELAY     1000
-#endif
-
-/** ping identifier - must fit on a u16_t */
-#ifndef PING_ID
-#define PING_ID        0xAFAF
-#endif
-
-/** ping additional data size to include in the packet */
-#ifndef PING_DATA_SIZE
-#define PING_DATA_SIZE 32
-#endif
-
-/** ping result action - no default action */
-#ifndef PING_RESULT
-#define PING_RESULT(ping_ok)
-#endif
-
-/* ping variables */
-static const ip_addr_t *ping_target;
-u16_t ping_seq_num;
-#ifdef LWIP_DEBUG
-static u32_t ping_time;
-#endif /* LWIP_DEBUG */
-#if !PING_USE_SOCKETS
-static struct raw_pcb *ping_pcb;
-#endif /* PING_USE_SOCKETS */
-
-/** Prepare a echo ICMP request */
-void
-ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len) {
-    size_t i;
-    size_t data_len = len - sizeof(struct icmp_echo_hdr);
-
-    ICMPH_TYPE_SET(iecho, ICMP_ECHO);
-    ICMPH_CODE_SET(iecho, 0);
-    iecho->chksum = 0;
-    iecho->id = PING_ID;
-    iecho->seqno = lwip_htons(++ping_seq_num);
-
-    /* fill the additional data buffer with some data */
-    for (i = 0; i < data_len; i++) {
-        ((char *)iecho)[sizeof(struct icmp_echo_hdr) + i] = (char)i;
-    }
-
-    iecho->chksum = inet_chksum(iecho, len);
-}
-
-#if PING_USE_SOCKETS
-
-/* Ping using the socket ip */
-err_t
-ping_send(int s, const ip_addr_t *addr) {
-    int err;
-    struct icmp_echo_hdr *iecho;
-    struct sockaddr_storage to;
-    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
-    LWIP_ASSERT("ping_size is too big", ping_size <= 0xffff);
-
-    #if LWIP_IPV6
-    if (IP_IS_V6(addr) && !ip6_addr_isipv4mappedipv6(ip_2_ip6(addr))) {
-        /* todo: support ICMP6 echo */
-        return ERR_VAL;
-    }
-    #endif /* LWIP_IPV6 */
-
-    iecho = (struct icmp_echo_hdr *)mem_malloc((mem_size_t)ping_size);
-    if (!iecho) {
-        return ERR_MEM;
-    }
-
-    ping_prepare_echo(iecho, (u16_t)ping_size);
-
-    #if LWIP_IPV4
-    if (IP_IS_V4(addr)) {
-        struct sockaddr_in *to4 = (struct sockaddr_in *)&to;
-        to4->sin_len = sizeof(*to4);
-        to4->sin_family = AF_INET;
-        inet_addr_from_ip4addr(&to4->sin_addr, ip_2_ip4(addr));
-    }
-    #endif /* LWIP_IPV4 */
-
-    #if LWIP_IPV6
-    if (IP_IS_V6(addr)) {
-        struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to;
-        to6->sin6_len = sizeof(*to6);
-        to6->sin6_family = AF_INET6;
-        inet6_addr_from_ip6addr(&to6->sin6_addr, ip_2_ip6(addr));
-    }
-    #endif /* LWIP_IPV6 */
-
-    err = lwip_sendto(s, iecho, ping_size, 0, (struct sockaddr *)&to, sizeof(to));
-
-    mem_free(iecho);
-
-    return err ? ERR_OK : ERR_VAL;
-}
-
-static void
-ping_recv(int s) {
-    char buf[64];
-    int len;
-    struct sockaddr_storage from;
-    int fromlen = sizeof(from);
-
-    while ((len = lwip_recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr *)&from, (socklen_t *)&fromlen)) > 0) {
-        if (len >= (int)(sizeof(struct ip_hdr) + sizeof(struct icmp_echo_hdr))) {
-            ip_addr_t fromaddr;
-            memset(&fromaddr, 0, sizeof(fromaddr));
-
-            #if LWIP_IPV4
-            if (from.ss_family == AF_INET) {
-                struct sockaddr_in *from4 = (struct sockaddr_in *)&from;
-                inet_addr_to_ip4addr(ip_2_ip4(&fromaddr), &from4->sin_addr);
-                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V4);
-            }
-            #endif /* LWIP_IPV4 */
-
-            #if LWIP_IPV6
-            if (from.ss_family == AF_INET6) {
-                struct sockaddr_in6 *from6 = (struct sockaddr_in6 *)&from;
-                inet6_addr_to_ip6addr(ip_2_ip6(&fromaddr), &from6->sin6_addr);
-                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V6);
-            }
-            #endif /* LWIP_IPV6 */
-
-            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
-            ip_addr_debug_print_val(PING_DEBUG, fromaddr);
-            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
-
-            /* todo: support ICMP6 echo */
-            #if LWIP_IPV4
-            if (IP_IS_V4_VAL(fromaddr)) {
-                struct ip_hdr *iphdr;
-                struct icmp_echo_hdr *iecho;
-
-                iphdr = (struct ip_hdr *)buf;
-                iecho = (struct icmp_echo_hdr *)(buf + (IPH_HL(iphdr) * 4));
-                if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
-                    /* do some ping result processing */
-                    PING_RESULT((ICMPH_TYPE(iecho) == ICMP_ER));
-                    return;
-                } else {
-                    LWIP_DEBUGF(PING_DEBUG, ("ping: drop\n"));
-                }
-            }
-            #endif /* LWIP_IPV4 */
-        }
-        fromlen = sizeof(from);
-    }
-
-    if (len == 0) {
-        LWIP_DEBUGF(PING_DEBUG, ("ping: recv - %"U32_F " ms - timeout\n", (sys_now() - ping_time)));
-    }
-
-    /* do some ping result processing */
-    PING_RESULT(0);
-}
-
-static void
-ping_thread(void *arg) {
-    int s;
-    int ret;
-
-    #if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
-    int timeout = PING_RCV_TIMEO;
-    #else
-    struct timeval timeout;
-    timeout.tv_sec = PING_RCV_TIMEO / 1000;
-    timeout.tv_usec = (PING_RCV_TIMEO % 1000) * 1000;
-    #endif
-    LWIP_UNUSED_ARG(arg);
-
-    #if LWIP_IPV6
-    if (IP_IS_V4(ping_target) || ip6_addr_isipv4mappedipv6(ip_2_ip6(ping_target))) {
-        s = lwip_socket(AF_INET6, SOCK_RAW, IP_PROTO_ICMP);
-    } else {
-        s = lwip_socket(AF_INET6, SOCK_RAW, IP6_NEXTH_ICMP6);
-    }
-    #else
-    s = lwip_socket(AF_INET,  SOCK_RAW, IP_PROTO_ICMP);
-    #endif
-    if (s < 0) {
-        return;
-    }
-
-    ret = lwip_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
-    LWIP_ASSERT("setting receive timeout failed", ret == 0);
-    LWIP_UNUSED_ARG(ret);
-
-    while (1) {
-        if (ping_send(s, ping_target) == ERR_OK) {
-            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
-            ip_addr_debug_print(PING_DEBUG, ping_target);
-            LWIP_DEBUGF(PING_DEBUG, ("\n"));
-
-            #ifdef LWIP_DEBUG
-            ping_time = sys_now();
-            #endif /* LWIP_DEBUG */
-            ping_recv(s);
-        } else {
-            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
-            ip_addr_debug_print(PING_DEBUG, ping_target);
-            LWIP_DEBUGF(PING_DEBUG, (" - error\n"));
-        }
-        sys_msleep(PING_DELAY);
-    }
-}
-
-#else /* PING_USE_SOCKETS */
-
-/* Ping using the raw ip */
-static u8_t
-ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
-    struct icmp_echo_hdr *iecho;
-    LWIP_UNUSED_ARG(arg);
-    LWIP_UNUSED_ARG(pcb);
-    LWIP_UNUSED_ARG(addr);
-    LWIP_ASSERT("p != NULL", p != NULL);
-
-    if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
-        pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
-        iecho = (struct icmp_echo_hdr *)p->payload;
-
-        if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
-            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
-            ip_addr_debug_print(PING_DEBUG, addr);
-            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
-
-            /* do some ping result processing */
-            PING_RESULT(1);
-            pbuf_free(p);
-            return 1; /* eat the packet */
-        }
-        /* not eaten, restore original packet */
-        pbuf_add_header(p, PBUF_IP_HLEN);
-    }
-
-    return 0; /* don't eat the packet */
-}
-
-int
-ping_send(struct raw_pcb *raw, const ip_addr_t *addr) {
-    struct pbuf *p;
-    struct icmp_echo_hdr *iecho;
-    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
-
-    LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
-    ip_addr_debug_print(PING_DEBUG, addr);
-    LWIP_DEBUGF(PING_DEBUG, ("\n"));
-    LWIP_ASSERT("ping_size <= 0xffff", ping_size <= 0xffff);
-
-    p = pbuf_alloc(PBUF_IP, (u16_t)ping_size, PBUF_RAM);
-    if (!p) {
-        return 0;
-    }
-    if ((p->len == p->tot_len) && (p->next == NULL)) {
-        iecho = (struct icmp_echo_hdr *)p->payload;
-
-        ping_prepare_echo(iecho, (u16_t)ping_size);
-
-        raw_sendto(raw, p, addr);
-        #ifdef LWIP_DEBUG
-        ping_time = sys_now();
-        #endif /* LWIP_DEBUG */
-    }
-    pbuf_free(p);
-    return 1;
-}
-
-static void
-ping_timeout(void *arg) {
-    struct raw_pcb *pcb = (struct raw_pcb *)arg;
-
-    LWIP_ASSERT("ping_timeout: no pcb given!", pcb != NULL);
-
-    ping_send(pcb, ping_target);
-
-    sys_timeout(PING_DELAY, ping_timeout, pcb);
-}
-
-static void
-ping_raw_init(void) {
-    if (ping_pcb) {
-        return;
-    }
-    ping_pcb = raw_new(IP_PROTO_ICMP);
-    LWIP_ASSERT("ping_pcb != NULL", ping_pcb != NULL);
-
-    raw_recv(ping_pcb, ping_recv, NULL);
-    raw_bind(ping_pcb, IP_ADDR_ANY);
-    sys_timeout(PING_DELAY, ping_timeout, ping_pcb);
-}
-
-#endif /* PING_USE_SOCKETS */
-
-void
-ping_init(const ip_addr_t *ping_addr) {
-    ping_target = ping_addr;
-
-    #if PING_USE_SOCKETS
-    sys_thread_new("ping_thread", ping_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
-    #else /* PING_USE_SOCKETS */
-    ping_raw_init();
-    #endif /* PING_USE_SOCKETS */
-}
-
-#endif /* LWIP_RAW */
diff --git a/ports/raspberrypi/lwip_src/ping.h b/ports/raspberrypi/lwip_src/ping.h
deleted file mode 100644
index abbae9d086..0000000000
--- a/ports/raspberrypi/lwip_src/ping.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef LWIP_PING_H
-#define LWIP_PING_H
-
-#include "lwip/raw.h"
-#include "lwip/ip_addr.h"
-#include "lwip/prot/icmp.h"
-
-/**
- * PING_USE_SOCKETS: Set to 1 to use sockets, otherwise the raw api is used
- */
-#ifndef PING_USE_SOCKETS
-#define PING_USE_SOCKETS    LWIP_SOCKET
-#endif
-
-void ping_init(const ip_addr_t *ping_addr);
-void ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len);
-
-extern u16_t ping_seq_num;
-#if !PING_USE_SOCKETS
-void ping_set_target(const ip_addr_t *ping_addr);
-int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
-// u8_t ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr);
-#endif /* !PING_USE_SOCKETS */
-
-#endif /* LWIP_PING_H */

From fdeaf805d330543ce317eccfed662048d83064ec Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 13 Nov 2022 18:17:47 -0500
Subject: [PATCH 1378/2403] STM: off-by-one TIMx reference; other code cleanup
 and minor fixes

---
 ports/stm/common-hal/pulseio/PulseIn.c |  3 +-
 ports/stm/common-hal/pwmio/PWMOut.c    | 97 ++++++++++++--------------
 ports/stm/common-hal/pwmio/PWMOut.h    |  6 +-
 ports/stm/peripherals/timers.c         | 58 ++++++++++++---
 4 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c
index 4ed2600d55..5b7602d9bf 100644
--- a/ports/stm/common-hal/pulseio/PulseIn.c
+++ b/ports/stm/common-hal/pulseio/PulseIn.c
@@ -106,7 +106,8 @@ void pulsein_reset(void) {
     memset(callback_obj_ref, 0, sizeof(callback_obj_ref));
 
     HAL_TIM_Base_DeInit(&tim_handle);
-    tim_clock_disable(stm_peripherals_timer_get_index(tim_handle.Instance));
+    // tim_clock_disable() takes a bitmask of timers.
+    tim_clock_disable(1 << stm_peripherals_timer_get_index(tim_handle.Instance));
     memset(&tim_handle, 0, sizeof(tim_handle));
     refcount = 0;
 }
diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c
index 16d510b605..cc712497d2 100644
--- a/ports/stm/common-hal/pwmio/PWMOut.c
+++ b/ports/stm/common-hal/pwmio/PWMOut.c
@@ -36,23 +36,24 @@
 
 #include "timers.h"
 
-#define ALL_CLOCKS 0xFFFF
-
-STATIC uint8_t reserved_tim[TIM_BANK_ARRAY_LEN];
+// Bitmask of channels taken.
+STATIC uint8_t tim_channels_taken[TIM_BANK_ARRAY_LEN];
+// Initial frequency timer is set to.
 STATIC uint32_t tim_frequencies[TIM_BANK_ARRAY_LEN];
 STATIC bool never_reset_tim[TIM_BANK_ARRAY_LEN];
 
 STATIC uint32_t timer_get_internal_duty(uint16_t duty, uint32_t period) {
     // duty cycle is duty/0xFFFF fraction x (number of pulses per period)
-    return (duty * period) / ((1 << 16) - 1);
+    return (duty * period) / 0xffff;
 }
 
 STATIC bool timer_get_optimal_divisors(uint32_t *period, uint32_t *prescaler,
     uint32_t frequency, uint32_t source_freq) {
     // Find the largest possible period supported by this frequency
-    for (int i = 0; i < (1 << 16); i++) {
+    *prescaler = 0;
+    for (uint32_t i = 1; i <= 0xffff; i++) {
         *period = source_freq / (i * frequency);
-        if (*period < (1 << 16) && *period >= 2) {
+        if (*period <= 0xffff && *period >= 2) {
             *prescaler = i;
             break;
         }
@@ -62,13 +63,10 @@ STATIC bool timer_get_optimal_divisors(uint32_t *period, uint32_t *prescaler,
 }
 
 void pwmout_reset(void) {
-    uint16_t never_reset_mask = 0x00;
     for (int i = 0; i < TIM_BANK_ARRAY_LEN; i++) {
         if (!never_reset_tim[i]) {
-            reserved_tim[i] = 0x00;
-            tim_frequencies[i] = 0x00;
-        } else {
-            never_reset_mask |= 1 << i;
+            tim_channels_taken[i] = 0x00;
+            tim_frequencies[i] = 0;
         }
     }
 }
@@ -78,73 +76,69 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     uint16_t duty,
     uint32_t frequency,
     bool variable_frequency) {
-    TIM_TypeDef *TIMx;
-    uint8_t tim_num = MP_ARRAY_SIZE(mcu_tim_pin_list);
-    bool tim_taken_internal = false;
-    bool tim_chan_taken = false;
-    bool tim_taken_f_mismatch = false;
-    bool var_freq_mismatch = false;
+    // Default error is no timer at all on pin.
+    pwmout_result_t last_failure = PWMOUT_INVALID_PIN;
     bool first_time_setup = true;
 
-    for (uint i = 0; i < tim_num; i++) {
-        const mcu_tim_pin_obj_t *l_tim = &mcu_tim_pin_list[i];
-        uint8_t l_tim_index = l_tim->tim_index;
-        uint8_t l_tim_channel = l_tim->channel_index;
+    uint8_t tim_index;
+    uint8_t tim_channel_index;
+
+    self->tim = NULL;
+    for (uint i = 0; i < MP_ARRAY_SIZE(mcu_tim_pin_list); i++) {
+        const mcu_tim_pin_obj_t *tim = &mcu_tim_pin_list[i];
+        tim_index = tim->tim_index;
+        tim_channel_index = tim->channel_index;
 
         // if pin is same
-        if (l_tim->pin == pin) {
+        if (tim->pin == pin) {
             // check if the timer has a channel active, or is reserved by main timer system
-            if (l_tim_index < TIM_BANK_ARRAY_LEN && reserved_tim[l_tim_index] != 0) {
+            if (tim_index < TIM_BANK_ARRAY_LEN && tim_channels_taken[tim_index] != 0) {
                 // Timer has already been reserved by an internal module
-                if (stm_peripherals_timer_is_reserved(mcu_tim_banks[l_tim_index])) {
-                    tim_taken_internal = true;
+                if (stm_peripherals_timer_is_reserved(mcu_tim_banks[tim_index])) {
+                    last_failure = PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
                     continue; // keep looking
                 }
                 // is it the same channel? (or all channels reserved by a var-freq)
-                if (reserved_tim[l_tim_index] & 1 << (l_tim_channel)) {
-                    tim_chan_taken = true;
+                if (tim_channels_taken[tim_index] & (1 << tim_channel_index)) {
+                    last_failure = PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
                     continue; // keep looking, might be another viable option
                 }
                 // If the frequencies are the same it's ok
-                if (tim_frequencies[l_tim_index] != frequency) {
-                    tim_taken_f_mismatch = true;
+                if (tim_frequencies[tim_index] != frequency) {
+                    last_failure = PWMOUT_INVALID_FREQUENCY_ON_PIN;
                     continue; // keep looking
                 }
                 // you can't put a variable frequency on a partially reserved timer
                 if (variable_frequency) {
-                    var_freq_mismatch = true;
+                    last_failure = PWMOUT_VARIABLE_FREQUENCY_NOT_AVAILABLE;
                     continue; // keep looking
                 }
                 first_time_setup = false; // skip setting up the timer
             }
             // No problems taken, so set it up
-            self->tim = l_tim;
+            self->tim = tim;
             break;
         }
     }
 
+    TIM_TypeDef *TIMx;
+
     // handle valid/invalid timer instance
     if (self->tim != NULL) {
         // create instance
-        TIMx = mcu_tim_banks[self->tim->tim_index];
+        TIMx = mcu_tim_banks[tim_index];
         // reserve timer/channel
         if (variable_frequency) {
-            reserved_tim[self->tim->tim_index] = 0x0F;
+            // Take all the channels.
+            tim_channels_taken[tim_index] = 0x0F;
         } else {
-            reserved_tim[self->tim->tim_index] |= 1 << self->tim->channel_index;
+            tim_channels_taken[tim_index] |= 1 << tim_channel_index;
         }
-        tim_frequencies[self->tim->tim_index] = frequency;
+        tim_frequencies[tim_index] = frequency;
         stm_peripherals_timer_reserve(TIMx);
-    } else { // no match found
-        if (tim_chan_taken || tim_taken_internal) {
-            return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
-        } else if (tim_taken_f_mismatch) {
-            return PWMOUT_INVALID_FREQUENCY_ON_PIN;
-        } else if (var_freq_mismatch) {
-            return PWMOUT_VARIABLE_FREQUENCY_NOT_AVAILABLE;
-        } else {
-            return PWMOUT_INVALID_PIN;
-        }
+    } else {
+        // no match found
+        return last_failure;
     }
 
     uint32_t prescaler = 0; // prescaler is 15 bit
@@ -163,10 +157,10 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     HAL_GPIO_Init(pin_port(pin->port), &GPIO_InitStruct);
     self->pin = pin;
 
-    tim_clock_enable(1 << (self->tim->tim_index));
+    tim_clock_enable(1 << tim_index);
 
-    // translate channel into handle value
-    self->channel = 4 * self->tim->channel_index;
+    // translate channel into handle value: TIM_CHANNEL_1, _2, _3, _4.
+    self->channel = 4 * tim_channel_index;
 
     // Timer init
     self->handle.Instance = TIMx;
@@ -175,6 +169,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     self->handle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
     self->handle.Init.CounterMode = TIM_COUNTERMODE_UP;
     self->handle.Init.RepetitionCounter = 0;
+    self->handle.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
 
     // only run init if this is the first instance of this timer
     if (first_time_setup) {
@@ -232,15 +227,15 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
     }
     // var freq shuts down entire timer, others just their channel
     if (self->variable_frequency) {
-        reserved_tim[self->tim->tim_index] = 0x00;
+        tim_channels_taken[self->tim->tim_index] = 0x00;
     } else {
-        reserved_tim[self->tim->tim_index] &= ~(1 << self->tim->channel_index);
+        tim_channels_taken[self->tim->tim_index] &= ~(1 << self->tim->channel_index);
         HAL_TIM_PWM_Stop(&self->handle, self->channel);
     }
     common_hal_reset_pin(self->pin);
 
     // if reserved timer has no active channels, we can disable it
-    if (reserved_tim[self->tim->tim_index] == 0) {
+    if (tim_channels_taken[self->tim->tim_index] == 0) {
         tim_frequencies[self->tim->tim_index] = 0x00;
         stm_peripherals_timer_free(self->handle.Instance);
     }
diff --git a/ports/stm/common-hal/pwmio/PWMOut.h b/ports/stm/common-hal/pwmio/PWMOut.h
index de3a304721..9a8b897c6c 100644
--- a/ports/stm/common-hal/pwmio/PWMOut.h
+++ b/ports/stm/common-hal/pwmio/PWMOut.h
@@ -39,12 +39,12 @@ typedef struct {
     TIM_HandleTypeDef handle;
     TIM_OC_InitTypeDef chan_handle;
     const mcu_tim_pin_obj_t *tim;
-    uint8_t channel : 7;
-    bool variable_frequency : 1;
-    uint16_t duty_cycle;
     uint32_t frequency;
     uint32_t period;
     const mcu_pin_obj_t *pin;
+    uint16_t duty_cycle;
+    uint8_t channel;
+    bool variable_frequency;
 } pwmio_pwmout_obj_t;
 
 void pwmout_reset(void);
diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c
index ed0f2ec38a..20b6bcc759 100644
--- a/ports/stm/peripherals/timers.c
+++ b/ports/stm/peripherals/timers.c
@@ -150,26 +150,65 @@ static size_t irq_map[] = {
 };
 
 // Get the frequency (in Hz) of the source clock for the given timer.
-// On STM32F405/407/415/417 there are 2 cases for how the clock freq is set.
-// If the APB prescaler is 1, then the timer clock is equal to its respective
-// APB clock.  Otherwise (APB prescaler > 1) the timer clock is twice its
-// respective APB clock.  See DM00031020 Rev 4, page 115.
+//
+// From STM ref manual: DM00031020 Rev 19, section 7.2, page 217:
+//
+// The timer clock frequencies for STM32F405xx/07xx and STM32F415xx/17xx are
+// automatically set by hardware. There are two cases:
+// 1. If the APB prescaler is 1, the timer clock frequencies are set to the same frequency as
+// that of the APB domain to which the timers are connected.
+// 2. Otherwise, they are set to twice (×2) the frequency of the APB domain to which the
+// timers are connected.
+
+// From STM ref manual: DM00031020 Rev 19, section 6.2, page 153:
+//
+// The timer clock frequencies for STM32F42xxx and STM32F43xxx are automatically set by
+// hardware. There are two cases depending on the value of TIMPRE bit in RCC_CFGR [sic - should be RCC_DKCFGR]
+// register:
+// * If TIMPRE bit in RCC_DKCFGR register is reset:
+//   If the APB prescaler is configured to a division factor of 1, the timer clock frequencies
+//   (TIMxCLK) are set to PCLKx. Otherwise, the timer clock frequencies are twice the
+//   frequency of the APB domain to which the timers are connected: TIMxCLK = 2xPCLKx.
+// * If TIMPRE bit in RCC_DKCFGR register is set:
+//   If the APB prescaler is configured to a division factor of 1, 2 or 4, the timer clock
+//   frequencies (TIMxCLK) are set to HCLK. Otherwise, the timer clock frequencies is four
+//   times the frequency of the APB domain to which the timers are connected: TIMxCLK = 4xPCLKx.
+
 uint32_t stm_peripherals_timer_get_source_freq(TIM_TypeDef *timer) {
-    size_t tim_id = stm_peripherals_timer_get_index(timer);
+    // The timer index starts at 0, but the timer numbers start at TIM1.
+    size_t tim_id = stm_peripherals_timer_get_index(timer) + 1;
     uint32_t source, clk_div;
     if (tim_id == 1 || (8 <= tim_id && tim_id <= 11)) {
         // TIM{1,8,9,10,11} are on APB2
         source = HAL_RCC_GetPCLK2Freq();
-        clk_div = RCC->CFGR & RCC_CFGR_PPRE2;
+        // 0b0xx means not divided; 0b100 is divide by 2; 0b101 by 4; 0b110 by 8; 0b111 by 16.
+        clk_div = (RCC->CFGR & RCC_CFGR_PPRE2) >> RCC_CFGR_PPRE2_Pos;
     } else {
         // TIM{2,3,4,5,6,7,12,13,14} are on APB1
         source = HAL_RCC_GetPCLK1Freq();
-        clk_div = RCC->CFGR & RCC_CFGR_PPRE1;
+        // 0b0xx means not divided; 0b100 is divide by 2; 0b101 by 4; 0b110 by 8; 0b111 by 16.
+        clk_div = (RCC->CFGR & RCC_CFGR_PPRE1) >> RCC_CFGR_PPRE1_Pos;
     }
-    if (clk_div != 0) {
-        // APB prescaler for this timer is > 1
+
+    // Only some STM32's have TIMPRE.
+    #if defined(RCC_CFGR_TIMPRE)
+    uint32_t timpre = RCC->DCKCFGR & RCC_CFGR_TIMPRE;
+    if (timpre == 0) {
+        if (clk_div >= 0b100) {
+            source *= 2;
+        }
+    } else {
+        if (clk_div > 0b101) {
+            source *= 4;
+        } else {
+            source = HAL_RCC_GetHCLKFreq();
+        }
+    }
+    #else
+    if (clk_div >= 0b100) {
         source *= 2;
     }
+    #endif
     return source;
 }
 
@@ -271,6 +310,7 @@ bool stm_peripherals_timer_is_reserved(TIM_TypeDef *instance) {
     return stm_timer_reserved[tim_idx];
 }
 
+// Note this returns a timer index starting at zero, corresponding to TIM1.
 size_t stm_peripherals_timer_get_index(TIM_TypeDef *instance) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(mcu_tim_banks); i++) {
         if (instance == mcu_tim_banks[i]) {

From fde1c05e6d558b220518bbf7aea7de2bb82b39b3 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 14 Nov 2022 19:54:21 +0200
Subject: [PATCH 1379/2403] Revert "remove lwip_src"

This reverts commit 398e9122a0a4b8ba7ba148f31c09921d01c4ab69.
It fails on LINK without them.
---
 ports/raspberrypi/lwip_src/ping.c | 384 ++++++++++++++++++++++++++++++
 ports/raspberrypi/lwip_src/ping.h |  25 ++
 2 files changed, 409 insertions(+)
 create mode 100644 ports/raspberrypi/lwip_src/ping.c
 create mode 100644 ports/raspberrypi/lwip_src/ping.h

diff --git a/ports/raspberrypi/lwip_src/ping.c b/ports/raspberrypi/lwip_src/ping.c
new file mode 100644
index 0000000000..e59b4d6662
--- /dev/null
+++ b/ports/raspberrypi/lwip_src/ping.c
@@ -0,0 +1,384 @@
+/**
+ * @file
+ * Ping sender module
+ *
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+/**
+ * This is an example of a "ping" sender (with raw API and socket API).
+ * It can be used as a start point to maintain opened a network connection, or
+ * like a network "watchdog" for your device.
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
+
+#include "ping.h"
+
+#include "lwip/mem.h"
+#include "lwip/raw.h"
+#include "lwip/icmp.h"
+#include "lwip/netif.h"
+#include "lwip/sys.h"
+#include "lwip/timeouts.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/prot/ip4.h"
+
+#if PING_USE_SOCKETS
+#include "lwip/sockets.h"
+#include "lwip/inet.h"
+#include 
+#endif /* PING_USE_SOCKETS */
+
+
+/**
+ * PING_DEBUG: Enable debugging for PING.
+ */
+#ifndef PING_DEBUG
+#define PING_DEBUG     LWIP_DBG_ON
+#endif
+
+/** ping receive timeout - in milliseconds */
+#ifndef PING_RCV_TIMEO
+#define PING_RCV_TIMEO 1000
+#endif
+
+/** ping delay - in milliseconds */
+#ifndef PING_DELAY
+#define PING_DELAY     1000
+#endif
+
+/** ping identifier - must fit on a u16_t */
+#ifndef PING_ID
+#define PING_ID        0xAFAF
+#endif
+
+/** ping additional data size to include in the packet */
+#ifndef PING_DATA_SIZE
+#define PING_DATA_SIZE 32
+#endif
+
+/** ping result action - no default action */
+#ifndef PING_RESULT
+#define PING_RESULT(ping_ok)
+#endif
+
+/* ping variables */
+static const ip_addr_t *ping_target;
+u16_t ping_seq_num;
+#ifdef LWIP_DEBUG
+static u32_t ping_time;
+#endif /* LWIP_DEBUG */
+#if !PING_USE_SOCKETS
+static struct raw_pcb *ping_pcb;
+#endif /* PING_USE_SOCKETS */
+
+/** Prepare a echo ICMP request */
+void
+ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len) {
+    size_t i;
+    size_t data_len = len - sizeof(struct icmp_echo_hdr);
+
+    ICMPH_TYPE_SET(iecho, ICMP_ECHO);
+    ICMPH_CODE_SET(iecho, 0);
+    iecho->chksum = 0;
+    iecho->id = PING_ID;
+    iecho->seqno = lwip_htons(++ping_seq_num);
+
+    /* fill the additional data buffer with some data */
+    for (i = 0; i < data_len; i++) {
+        ((char *)iecho)[sizeof(struct icmp_echo_hdr) + i] = (char)i;
+    }
+
+    iecho->chksum = inet_chksum(iecho, len);
+}
+
+#if PING_USE_SOCKETS
+
+/* Ping using the socket ip */
+err_t
+ping_send(int s, const ip_addr_t *addr) {
+    int err;
+    struct icmp_echo_hdr *iecho;
+    struct sockaddr_storage to;
+    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
+    LWIP_ASSERT("ping_size is too big", ping_size <= 0xffff);
+
+    #if LWIP_IPV6
+    if (IP_IS_V6(addr) && !ip6_addr_isipv4mappedipv6(ip_2_ip6(addr))) {
+        /* todo: support ICMP6 echo */
+        return ERR_VAL;
+    }
+    #endif /* LWIP_IPV6 */
+
+    iecho = (struct icmp_echo_hdr *)mem_malloc((mem_size_t)ping_size);
+    if (!iecho) {
+        return ERR_MEM;
+    }
+
+    ping_prepare_echo(iecho, (u16_t)ping_size);
+
+    #if LWIP_IPV4
+    if (IP_IS_V4(addr)) {
+        struct sockaddr_in *to4 = (struct sockaddr_in *)&to;
+        to4->sin_len = sizeof(*to4);
+        to4->sin_family = AF_INET;
+        inet_addr_from_ip4addr(&to4->sin_addr, ip_2_ip4(addr));
+    }
+    #endif /* LWIP_IPV4 */
+
+    #if LWIP_IPV6
+    if (IP_IS_V6(addr)) {
+        struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to;
+        to6->sin6_len = sizeof(*to6);
+        to6->sin6_family = AF_INET6;
+        inet6_addr_from_ip6addr(&to6->sin6_addr, ip_2_ip6(addr));
+    }
+    #endif /* LWIP_IPV6 */
+
+    err = lwip_sendto(s, iecho, ping_size, 0, (struct sockaddr *)&to, sizeof(to));
+
+    mem_free(iecho);
+
+    return err ? ERR_OK : ERR_VAL;
+}
+
+static void
+ping_recv(int s) {
+    char buf[64];
+    int len;
+    struct sockaddr_storage from;
+    int fromlen = sizeof(from);
+
+    while ((len = lwip_recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr *)&from, (socklen_t *)&fromlen)) > 0) {
+        if (len >= (int)(sizeof(struct ip_hdr) + sizeof(struct icmp_echo_hdr))) {
+            ip_addr_t fromaddr;
+            memset(&fromaddr, 0, sizeof(fromaddr));
+
+            #if LWIP_IPV4
+            if (from.ss_family == AF_INET) {
+                struct sockaddr_in *from4 = (struct sockaddr_in *)&from;
+                inet_addr_to_ip4addr(ip_2_ip4(&fromaddr), &from4->sin_addr);
+                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V4);
+            }
+            #endif /* LWIP_IPV4 */
+
+            #if LWIP_IPV6
+            if (from.ss_family == AF_INET6) {
+                struct sockaddr_in6 *from6 = (struct sockaddr_in6 *)&from;
+                inet6_addr_to_ip6addr(ip_2_ip6(&fromaddr), &from6->sin6_addr);
+                IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V6);
+            }
+            #endif /* LWIP_IPV6 */
+
+            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
+            ip_addr_debug_print_val(PING_DEBUG, fromaddr);
+            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
+
+            /* todo: support ICMP6 echo */
+            #if LWIP_IPV4
+            if (IP_IS_V4_VAL(fromaddr)) {
+                struct ip_hdr *iphdr;
+                struct icmp_echo_hdr *iecho;
+
+                iphdr = (struct ip_hdr *)buf;
+                iecho = (struct icmp_echo_hdr *)(buf + (IPH_HL(iphdr) * 4));
+                if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
+                    /* do some ping result processing */
+                    PING_RESULT((ICMPH_TYPE(iecho) == ICMP_ER));
+                    return;
+                } else {
+                    LWIP_DEBUGF(PING_DEBUG, ("ping: drop\n"));
+                }
+            }
+            #endif /* LWIP_IPV4 */
+        }
+        fromlen = sizeof(from);
+    }
+
+    if (len == 0) {
+        LWIP_DEBUGF(PING_DEBUG, ("ping: recv - %"U32_F " ms - timeout\n", (sys_now() - ping_time)));
+    }
+
+    /* do some ping result processing */
+    PING_RESULT(0);
+}
+
+static void
+ping_thread(void *arg) {
+    int s;
+    int ret;
+
+    #if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
+    int timeout = PING_RCV_TIMEO;
+    #else
+    struct timeval timeout;
+    timeout.tv_sec = PING_RCV_TIMEO / 1000;
+    timeout.tv_usec = (PING_RCV_TIMEO % 1000) * 1000;
+    #endif
+    LWIP_UNUSED_ARG(arg);
+
+    #if LWIP_IPV6
+    if (IP_IS_V4(ping_target) || ip6_addr_isipv4mappedipv6(ip_2_ip6(ping_target))) {
+        s = lwip_socket(AF_INET6, SOCK_RAW, IP_PROTO_ICMP);
+    } else {
+        s = lwip_socket(AF_INET6, SOCK_RAW, IP6_NEXTH_ICMP6);
+    }
+    #else
+    s = lwip_socket(AF_INET,  SOCK_RAW, IP_PROTO_ICMP);
+    #endif
+    if (s < 0) {
+        return;
+    }
+
+    ret = lwip_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+    LWIP_ASSERT("setting receive timeout failed", ret == 0);
+    LWIP_UNUSED_ARG(ret);
+
+    while (1) {
+        if (ping_send(s, ping_target) == ERR_OK) {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+            ip_addr_debug_print(PING_DEBUG, ping_target);
+            LWIP_DEBUGF(PING_DEBUG, ("\n"));
+
+            #ifdef LWIP_DEBUG
+            ping_time = sys_now();
+            #endif /* LWIP_DEBUG */
+            ping_recv(s);
+        } else {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+            ip_addr_debug_print(PING_DEBUG, ping_target);
+            LWIP_DEBUGF(PING_DEBUG, (" - error\n"));
+        }
+        sys_msleep(PING_DELAY);
+    }
+}
+
+#else /* PING_USE_SOCKETS */
+
+/* Ping using the raw ip */
+static u8_t
+ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) {
+    struct icmp_echo_hdr *iecho;
+    LWIP_UNUSED_ARG(arg);
+    LWIP_UNUSED_ARG(pcb);
+    LWIP_UNUSED_ARG(addr);
+    LWIP_ASSERT("p != NULL", p != NULL);
+
+    if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
+        pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
+        iecho = (struct icmp_echo_hdr *)p->payload;
+
+        if ((iecho->id == PING_ID) && (iecho->seqno == lwip_htons(ping_seq_num))) {
+            LWIP_DEBUGF(PING_DEBUG, ("ping: recv "));
+            ip_addr_debug_print(PING_DEBUG, addr);
+            LWIP_DEBUGF(PING_DEBUG, (" %"U32_F " ms\n", (sys_now() - ping_time)));
+
+            /* do some ping result processing */
+            PING_RESULT(1);
+            pbuf_free(p);
+            return 1; /* eat the packet */
+        }
+        /* not eaten, restore original packet */
+        pbuf_add_header(p, PBUF_IP_HLEN);
+    }
+
+    return 0; /* don't eat the packet */
+}
+
+int
+ping_send(struct raw_pcb *raw, const ip_addr_t *addr) {
+    struct pbuf *p;
+    struct icmp_echo_hdr *iecho;
+    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
+
+    LWIP_DEBUGF(PING_DEBUG, ("ping: send "));
+    ip_addr_debug_print(PING_DEBUG, addr);
+    LWIP_DEBUGF(PING_DEBUG, ("\n"));
+    LWIP_ASSERT("ping_size <= 0xffff", ping_size <= 0xffff);
+
+    p = pbuf_alloc(PBUF_IP, (u16_t)ping_size, PBUF_RAM);
+    if (!p) {
+        return 0;
+    }
+    if ((p->len == p->tot_len) && (p->next == NULL)) {
+        iecho = (struct icmp_echo_hdr *)p->payload;
+
+        ping_prepare_echo(iecho, (u16_t)ping_size);
+
+        raw_sendto(raw, p, addr);
+        #ifdef LWIP_DEBUG
+        ping_time = sys_now();
+        #endif /* LWIP_DEBUG */
+    }
+    pbuf_free(p);
+    return 1;
+}
+
+static void
+ping_timeout(void *arg) {
+    struct raw_pcb *pcb = (struct raw_pcb *)arg;
+
+    LWIP_ASSERT("ping_timeout: no pcb given!", pcb != NULL);
+
+    ping_send(pcb, ping_target);
+
+    sys_timeout(PING_DELAY, ping_timeout, pcb);
+}
+
+static void
+ping_raw_init(void) {
+    if (ping_pcb) {
+        return;
+    }
+    ping_pcb = raw_new(IP_PROTO_ICMP);
+    LWIP_ASSERT("ping_pcb != NULL", ping_pcb != NULL);
+
+    raw_recv(ping_pcb, ping_recv, NULL);
+    raw_bind(ping_pcb, IP_ADDR_ANY);
+    sys_timeout(PING_DELAY, ping_timeout, ping_pcb);
+}
+
+#endif /* PING_USE_SOCKETS */
+
+void
+ping_init(const ip_addr_t *ping_addr) {
+    ping_target = ping_addr;
+
+    #if PING_USE_SOCKETS
+    sys_thread_new("ping_thread", ping_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
+    #else /* PING_USE_SOCKETS */
+    ping_raw_init();
+    #endif /* PING_USE_SOCKETS */
+}
+
+#endif /* LWIP_RAW */
diff --git a/ports/raspberrypi/lwip_src/ping.h b/ports/raspberrypi/lwip_src/ping.h
new file mode 100644
index 0000000000..abbae9d086
--- /dev/null
+++ b/ports/raspberrypi/lwip_src/ping.h
@@ -0,0 +1,25 @@
+#ifndef LWIP_PING_H
+#define LWIP_PING_H
+
+#include "lwip/raw.h"
+#include "lwip/ip_addr.h"
+#include "lwip/prot/icmp.h"
+
+/**
+ * PING_USE_SOCKETS: Set to 1 to use sockets, otherwise the raw api is used
+ */
+#ifndef PING_USE_SOCKETS
+#define PING_USE_SOCKETS    LWIP_SOCKET
+#endif
+
+void ping_init(const ip_addr_t *ping_addr);
+void ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len);
+
+extern u16_t ping_seq_num;
+#if !PING_USE_SOCKETS
+void ping_set_target(const ip_addr_t *ping_addr);
+int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
+// u8_t ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr);
+#endif /* !PING_USE_SOCKETS */
+
+#endif /* LWIP_PING_H */

From 2cd5d4f5a542d77f117c01b3398daa6f21180b39 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 14 Nov 2022 15:10:28 -0600
Subject: [PATCH 1380/2403] allow setting root_group on Display

---
 shared-bindings/displayio/Display.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 512969eb20..15b5c4c4fa 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -423,8 +423,24 @@ STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_root_group_obj, displayio_display_obj_get_root_group);
 
-MP_PROPERTY_GETTER(displayio_display_root_group_obj,
-    (mp_obj_t)&displayio_display_get_root_group_obj);
+STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) {
+    displayio_display_obj_t *self = native_display(self_in);
+    displayio_group_t *group = NULL;
+    if (group_in != mp_const_none) {
+        group = MP_OBJ_TO_PTR(native_group(group_in));
+    }
+
+    bool ok = common_hal_displayio_display_show(self, group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);
+
+MP_PROPERTY_GETSET(displayio_display_root_group_obj,
+(mp_obj_t)&displayio_display_get_root_group_obj,
+(mp_obj_t)&displayio_display_set_root_group_obj);
 
 
 //|     def fill_row(self, y: int, buffer: WriteableBuffer) -> WriteableBuffer:

From 1329fe998ca30c2d6ae0790224f4be3197807208 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 14 Nov 2022 15:33:55 -0600
Subject: [PATCH 1381/2403] add to .h and format code

---
 shared-bindings/displayio/Display.c | 4 ++--
 shared-bindings/displayio/Display.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 15b5c4c4fa..b472ec6aa4 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -439,8 +439,8 @@ STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);
 
 MP_PROPERTY_GETSET(displayio_display_root_group_obj,
-(mp_obj_t)&displayio_display_get_root_group_obj,
-(mp_obj_t)&displayio_display_set_root_group_obj);
+    (mp_obj_t)&displayio_display_get_root_group_obj,
+    (mp_obj_t)&displayio_display_set_root_group_obj);
 
 
 //|     def fill_row(self, y: int, buffer: WriteableBuffer) -> WriteableBuffer:
diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h
index 35ba0d479a..35f23ae40f 100644
--- a/shared-bindings/displayio/Display.h
+++ b/shared-bindings/displayio/Display.h
@@ -67,5 +67,6 @@ bool common_hal_displayio_display_set_brightness(displayio_display_obj_t *self,
 
 mp_obj_t common_hal_displayio_display_get_bus(displayio_display_obj_t *self);
 mp_obj_t common_hal_displayio_display_get_root_group(displayio_display_obj_t *self);
+mp_obj_t common_hal_displayio_display_set_root_group(displayio_display_obj_t *self, displayio_group_t *root_group);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_DISPLAY_H

From 6954e569b74ab934e0d247056a7503ec9f0720e2 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 15 Nov 2022 00:05:01 +0200
Subject: [PATCH 1382/2403] since it ain't leaving..

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 11 +----------
 ports/raspberrypi/lwip_src/ping.h         |  8 ++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 4f32fad793..2a74c16e0a 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -50,14 +50,7 @@
 #include "lwip/dns.h"
 #include "lwip/icmp.h"
 #include "lwip/raw.h"
-
-#ifndef PING_ID
-#define PING_ID        0xAFAF
-#endif
-
-#ifndef PING_DEBUG
-#define PING_DEBUG     LWIP_DBG_ON
-#endif
+#include "lwip_src/ping.h"
 
 #define MAC_ADDRESS_LENGTH 6
 
@@ -299,8 +292,6 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv
 }
 
 volatile bool ping_received;
-int ping_send(struct raw_pcb *raw, const ip_addr_t *addr);
-uint16_t ping_seq_num;
 uint32_t ping_time;
 
 static u8_t
diff --git a/ports/raspberrypi/lwip_src/ping.h b/ports/raspberrypi/lwip_src/ping.h
index abbae9d086..1a02e2450c 100644
--- a/ports/raspberrypi/lwip_src/ping.h
+++ b/ports/raspberrypi/lwip_src/ping.h
@@ -12,6 +12,14 @@
 #define PING_USE_SOCKETS    LWIP_SOCKET
 #endif
 
+#ifndef PING_ID
+#define PING_ID        0xAFAF
+#endif
+
+#ifndef PING_DEBUG
+#define PING_DEBUG     LWIP_DBG_ON
+#endif
+
 void ping_init(const ip_addr_t *ping_addr);
 void ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len);
 

From 63ad2b763e376808a1338c01d17e3b32c0a53830 Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Mon, 14 Nov 2022 17:35:06 +0000
Subject: [PATCH 1383/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 99.6% (992 of 995 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index bee1c4d4b4..664b38d57c 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,8 +7,8 @@ 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: 2022-11-14 15:47+0000\n"
-"Last-Translator: River Wang \n"
+"PO-Revision-Date: 2022-11-14 22:15+0000\n"
+"Last-Translator: hexthat \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -127,7 +127,7 @@ msgstr "%q chūshǐhuà shībài"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q shì %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
@@ -173,6 +173,7 @@ msgstr "%q bìxū >= %d"
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
+"%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'h', 'H', 'b', huò 'B' de shù zǔ"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -597,7 +598,7 @@ msgstr "RX hé TX dōu xū yào liúliàng kòngzhì"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià le liǎng gè àn niǔ.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -667,7 +668,7 @@ msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià àn niǔ A.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -947,15 +948,15 @@ msgstr "cuò wù: bǎng dìng shī bài"
 #: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
-msgstr "Yùqí %q"
+msgstr "Yù qí %q"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "yù qī wéi %q huò %q"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
-msgstr ""
+msgstr "yù qī wéi %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1037,16 +1038,16 @@ msgstr "guò lǜ qì tài fù zá"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "gù jiàn chóng fù"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "gù jiàn wú xiào"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "gù jiàn tài dà"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1664,7 +1665,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "zài shēn dù shuì mián zhōng zhǐ néng shè zhì yí gè %q."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -2025,7 +2026,7 @@ msgstr "Wēndù dòu qǔ chāoshí"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià le yǐn dǎo àn niǔ.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2037,11 +2038,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià le SW38 àn niǔ .\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià yīn liàng àn niǔ.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2053,11 +2054,11 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià zhōng yāng àn niǔ.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "qǐ dòng shí àn xià zuǒ àn niǔ.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2126,6 +2127,8 @@ msgstr "Chāoshí shíjiān tài zhǎng: Zuìdà chāoshí shíjiān wèi%d miǎ
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
 msgstr ""
+"yào tuì chū, qǐng zài bù qǐng qiú ān quán mó shì de qíng kuàng xià chóng zhì "
+"zhǔ bǎn."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
@@ -2246,7 +2249,7 @@ msgstr "wú fǎ qǐ dòng mDNS chá xún"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "wú fǎ xiě rù"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2313,7 +2316,7 @@ msgstr "wèi zhī de xì tǒng gù jiàn cuò wù: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "wèi zhī cuò wù dài %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #, c-format
@@ -2990,6 +2993,8 @@ msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"esp32_camera. shè xiàng jī xū yào pèi zhì yù liú de PSRAM. yǒu guān shuō "
+"míng, qǐng cān yuè wén dàng."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3770,11 +3775,11 @@ msgstr "Jǐn zhīchí wèi shēndù = 16"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "jǐn zhī chí dān shēng dào"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "jǐn zhī chí guò cǎi yàng =64"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c
@@ -4245,7 +4250,7 @@ msgstr "wèizhī lèixíng '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "gé shì bù pǐ pèi de '%c'"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4326,7 +4331,7 @@ msgstr "wèi qǐ yòng WIFI"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wú xiàn wǎng luò xiǎn shì qì bù kě yòng"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"

From ce22a3293dc00befad9304d8208d3b71e7aa7a86 Mon Sep 17 00:00:00 2001
From: River Wang 
Date: Mon, 14 Nov 2022 15:47:43 +0000
Subject: [PATCH 1384/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 99.6% (992 of 995 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 664b38d57c..bb20f1ef6e 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
 "PO-Revision-Date: 2022-11-14 22:15+0000\n"
-"Last-Translator: hexthat \n"
+"Last-Translator: River Wang \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -747,7 +747,7 @@ msgstr "Nín wúfǎ sǎomiáo kuòzhǎn de, kě liánjiē de guǎnggào."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot pull on input-only pin."
-msgstr "wú fǎ lā dòng jǐn shū rù yǐn jiǎo."
+msgstr "wúfǎ lādòng jǐn shūrù yǐnjiǎo."
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Cannot record to a file"

From 2d08473ee078625b5f6249c54bbbee266e9edafe Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 14 Nov 2022 21:18:40 -0600
Subject: [PATCH 1385/2403] this version actually saves more code space on
 cortex-m0 with -Os (samd21s)

---
 shared-module/adafruit_pixelbuf/PixelBuf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c
index e0c63306f9..5cbda5da96 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.c
@@ -198,10 +198,10 @@ STATIC color_u _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t col
 }
 
 STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, color_u rgbw) {
-    int r = rgbw.r;
-    int g = rgbw.g;
-    int b = rgbw.b;
-    int w = rgbw.w;
+    uint8_t r = rgbw.r;
+    uint8_t g = rgbw.g;
+    uint8_t b = rgbw.b;
+    uint8_t w = rgbw.w;
     // DotStars don't have white, instead they have 5 bit brightness so pack it into w. Shift right
     // by three to leave the top five bits.
     if (self->bytes_per_pixel == 4 && self->byteorder.is_dotstar) {

From 14ba5a75a3b03d6d5c1d6c4ea556d14dfc81b0f8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 14 Nov 2022 21:25:33 -0600
Subject: [PATCH 1386/2403] skip converting from long int if long ints aren't
 enabled

.. saves 20 bytes on proxlight trinkey
---
 shared-module/adafruit_pixelbuf/PixelBuf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c
index 5cbda5da96..5017ba2f2c 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.c
@@ -143,8 +143,10 @@ void common_hal_adafruit_pixelbuf_pixelbuf_set_brightness(mp_obj_t self_in, mp_f
 STATIC uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) {
     if (mp_obj_is_small_int(obj)) {
         return MP_OBJ_SMALL_INT_VALUE(obj);
+    #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
     } else if (mp_obj_is_int(obj)) {
         return mp_obj_get_int_truncated(obj);
+    #endif
     } else if (mp_obj_is_float(obj)) {
         return (uint8_t)mp_obj_get_float(obj);
     }

From a4dd1b2341cd777932279e58f702455c3257a481 Mon Sep 17 00:00:00 2001
From: River Wang 
Date: Tue, 15 Nov 2022 02:16:43 +0000
Subject: [PATCH 1387/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 99.4% (990 of 995 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index bb20f1ef6e..9178bd4caa 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: 2022-11-14 22:15+0000\n"
+"PO-Revision-Date: 2022-11-15 04:35+0000\n"
 "Last-Translator: River Wang \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -755,7 +755,7 @@ msgstr "Wúfǎ jìlù dào wénjiàn"
 
 #: shared-module/storage/__init__.c
 msgid "Cannot remount '/' when visible via USB."
-msgstr "tōng guò USB kě jiàn shí wú fǎ chóng xīn ān zhuāng '/'."
+msgstr "tōngguò USB kějiàn shí wúfǎ chóngxīn ānzhuāng '/'."
 
 #: ports/atmel-samd/common-hal/microcontroller/__init__.c
 #: ports/cxd56/common-hal/microcontroller/__init__.c
@@ -774,31 +774,31 @@ msgstr "Dāng fāngxiàng wéi shūrù shí, bùnéng shèzhì zhí."
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Cannot specify RTS or CTS in RS485 mode"
-msgstr "wú fǎ zài RS485 mó shì xià zhǐ dìng RTS huò CTS"
+msgstr "wúfǎ zài RS485 móshì xià zhǐdìng RTS huò CTS"
 
 #: py/objslice.c
 msgid "Cannot subclass slice"
-msgstr "bùnéng zi lèi huà qiēpiàn"
+msgstr "bùnéng zǐlèihuà qiēpiàn"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr "méiyǒu MOSI hé MISO yǐn jiǎo wúfǎ chuánshū"
+msgstr "méiyǒu MOSI hé MISO yǐnjiǎo, wúfǎ chuánshū"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
-msgstr "Wúfǎ gēnggǎi yǐ zài shǐyòng de jìshí qì shàng de pínlǜ"
+msgstr "Wúfǎ zài shǐyòng zhōng de jìshí qì shàng gēnggǎi pínlǜ"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
-msgstr "wúfǎ zài yǐn jiǎo biānyuán huànxǐng, zhǐ néng diàn píng"
+msgstr "wúfǎ shǐyòng biānyuán huànxǐng, zhǐnéng shǐyòng diànpíng"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
-msgstr "wú fǎ zài yǐn jiǎo biān yuán huàn xǐng. jǐn jí bié."
+msgstr "wúfǎ shǐyòng biānyuán huànxǐng. zhǐnéng shǐyòng diànpíng"
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
-msgstr "Wèi tígōng zìfú huǎncún xiě rù"
+msgstr "Wèi tígōng zìfú huǎncún xiěrù"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython core code crashed hard. Whoops!\n"
@@ -810,11 +810,11 @@ msgstr "CircuitPython wúfǎ fēnpèi duī."
 
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
-msgstr "Shízhōng shēnzhǎn tài zhǎng"
+msgstr "shízhōng yánzhǎn guòcháng"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Clock unit in use"
-msgstr "Shǐyòng shízhōng dānwèi"
+msgstr "shízhōng dānyuán zhèngzài shǐyòng zhōng"
 
 #: shared-bindings/_bleio/Connection.c
 msgid ""
@@ -832,7 +832,7 @@ msgstr "wúfǎ jiǎnsuǒ shízhōng"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
-msgstr "wú fǎ shè zhì dì zhǐ"
+msgstr "wúfǎ shèzhì dìzhǐ"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
@@ -844,11 +844,11 @@ msgstr "Wúfǎ qǐdòng zhōngduàn,RX máng"
 
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Couldn't allocate decoder"
-msgstr "Zhǎo bù dào jiěmǎ qì"
+msgstr "wúfǎ fēnpèi jiěmǎ qì"
 
 #: supervisor/shared/safe_mode.c
 msgid "Crash into the HardFault_Handler."
-msgstr "Zhuìhuǐ. Shūrù HardFault_Handler."
+msgstr "gu4zhang4, jin4ru4 HardFault_Handler."
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
@@ -860,10 +860,11 @@ msgstr "DAC shèbèi chūshǐhuà cuòwù"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "DAC already in use"
-msgstr "Fā yuán huì yǐjīng shǐyòng"
+msgstr "DAC zhèngzài bèi shǐyòng"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
+#, fuzzy
 msgid "Data 0 pin must be byte aligned"
 msgstr "Shùjù 0 de yǐn jiǎo bìxū shì zì jié duìqí"
 
@@ -873,6 +874,7 @@ msgstr "Shùjù kuài bìxū zūnxún fmt qū kuài"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
+#, fuzzy
 msgid "Data not supported with directed advertising"
 msgstr "bù zhī chí dìng xiàng guǎng gào de shù jù"
 

From ca84d79809a4835d1d5d00fa59f6fed880b6f591 Mon Sep 17 00:00:00 2001
From: Dominic Davis-Foster 
Date: Tue, 15 Nov 2022 23:06:36 +0000
Subject: [PATCH 1388/2403] Allow duplicate VID and PID in CI check.

---
 tools/ci_check_duplicate_usb_vid_pid.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index a75bd2b3f8..4e5c48c90d 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -60,6 +60,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s2_devkitc_1_n4r2",
         "espressif_esp32s2_devkitc_1_n8r2",
     ],
+    "0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],
 }
 
 cli_parser = argparse.ArgumentParser(

From 93ee54a2fb52bf20c49e9dfc846e03f400322ec5 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 15 Nov 2022 16:14:31 -0800
Subject: [PATCH 1389/2403] Fix PWM status LED never_reset

It doesn't need never reset because the status LED is only active
when user code isn't.

This also fixes PWM never reset on espressif so that deinit will
undo it.

Fixes #6223
---
 ports/espressif/common-hal/pwmio/PWMOut.c | 18 +++++++++++++++++-
 supervisor/shared/status_leds.c           | 18 +++---------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c
index d83ce6590a..161f547480 100644
--- a/ports/espressif/common-hal/pwmio/PWMOut.c
+++ b/ports/espressif/common-hal/pwmio/PWMOut.c
@@ -166,7 +166,20 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
 
 void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
     never_reset_tim[self->tim_handle.timer_num] = false;
-    never_reset_chan[self->chan_handle.channel] = false;
+    // Search if any other channel is using the timer and is never reset.
+    // Otherwise, we clear never_reset for the timer as well.
+    bool other_never_reset = false;
+    for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
+        if (i != self->tim_handle.timer_num &&
+            reserved_channels[i] == self->tim_handle.timer_num &&
+            never_reset_chan[i]) {
+            other_never_reset = true;
+            break;
+        }
+    }
+    if (!other_never_reset) {
+        never_reset_chan[self->chan_handle.channel] = false;
+    }
 }
 
 bool common_hal_pwmio_pwmout_deinited(pwmio_pwmout_obj_t *self) {
@@ -182,11 +195,13 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
         ledc_stop(LEDC_LOW_SPEED_MODE, self->chan_handle.channel, 0);
     }
     reserved_channels[self->chan_handle.channel] = INDEX_EMPTY;
+    never_reset_chan[self->chan_handle.channel] = false;
     // Search if any other channel is using the timer
     bool taken = false;
     for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
         if (reserved_channels[i] == self->tim_handle.timer_num) {
             taken = true;
+            break;
         }
     }
     // Variable frequency means there's only one channel on the timer
@@ -195,6 +210,7 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
         reserved_timer_freq[self->tim_handle.timer_num] = 0;
         // if timer isn't varfreq this will be off aleady
         varfreq_timers[self->tim_handle.timer_num] = false;
+        never_reset_tim[self->tim_handle.timer_num] = false;
     }
     common_hal_reset_pin(self->pin);
     self->deinited = true;
diff --git a/supervisor/shared/status_leds.c b/supervisor/shared/status_leds.c
index 315e64a9a0..7e6c7983b1 100644
--- a/supervisor/shared/status_leds.c
+++ b/supervisor/shared/status_leds.c
@@ -179,27 +179,15 @@ void status_led_init() {
 
     #elif CIRCUITPY_PWM_RGB_LED
     if (common_hal_mcu_pin_is_free(CIRCUITPY_RGB_STATUS_R)) {
-        pwmout_result_t red_result = common_hal_pwmio_pwmout_construct(&rgb_status_r, CIRCUITPY_RGB_STATUS_R, 0, 50000, false);
-
-        if (PWMOUT_OK == red_result) {
-            common_hal_pwmio_pwmout_never_reset(&rgb_status_r);
-        }
+        common_hal_pwmio_pwmout_construct(&rgb_status_r, CIRCUITPY_RGB_STATUS_R, 0, 50000, false);
     }
 
     if (common_hal_mcu_pin_is_free(CIRCUITPY_RGB_STATUS_G)) {
-        pwmout_result_t green_result = common_hal_pwmio_pwmout_construct(&rgb_status_g, CIRCUITPY_RGB_STATUS_G, 0, 50000, false);
-
-        if (PWMOUT_OK == green_result) {
-            common_hal_pwmio_pwmout_never_reset(&rgb_status_g);
-        }
+        common_hal_pwmio_pwmout_construct(&rgb_status_g, CIRCUITPY_RGB_STATUS_G, 0, 50000, false);
     }
 
     if (common_hal_mcu_pin_is_free(CIRCUITPY_RGB_STATUS_B)) {
-        pwmout_result_t blue_result = common_hal_pwmio_pwmout_construct(&rgb_status_b, CIRCUITPY_RGB_STATUS_B, 0, 50000, false);
-
-        if (PWMOUT_OK == blue_result) {
-            common_hal_pwmio_pwmout_never_reset(&rgb_status_b);
-        }
+        common_hal_pwmio_pwmout_construct(&rgb_status_b, CIRCUITPY_RGB_STATUS_B, 0, 50000, false);
     }
 
     #elif defined(MICROPY_HW_LED_STATUS)

From 5b64a62c1629e793f10a61acfa330857de1cce86 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 15 Nov 2022 18:37:23 -0600
Subject: [PATCH 1390/2403] move hidden declare inside struct

---
 shared-module/vectorio/VectorShape.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/vectorio/VectorShape.h b/shared-module/vectorio/VectorShape.h
index ce5823e40c..6ce09f9308 100644
--- a/shared-module/vectorio/VectorShape.h
+++ b/shared-module/vectorio/VectorShape.h
@@ -30,7 +30,6 @@ typedef struct {
     mp_obj_t pixel_shader;
     int16_t x;
     int16_t y;
-    bool hidden : 1;
     displayio_buffer_transform_t *absolute_transform;
     // Tracks current shape footprint and expands outward as the shape dirties and changes.
     // This is suboptimal if you move your shape far.  Could add more state to only redraw
@@ -38,6 +37,7 @@ typedef struct {
     displayio_area_t ephemeral_dirty_area;
     displayio_area_t current_area;
     bool current_area_dirty;
+    bool hidden;
 } vectorio_vector_shape_t;
 
 displayio_area_t *vectorio_vector_shape_get_refresh_areas(vectorio_vector_shape_t *self, displayio_area_t *tail);

From 8e4e84c58b337eadfa1cd764011786d7c540e187 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 15 Nov 2022 16:51:47 -0800
Subject: [PATCH 1391/2403] Match channel number, not timer number

---
 ports/espressif/common-hal/pwmio/PWMOut.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c
index 161f547480..68518fbd25 100644
--- a/ports/espressif/common-hal/pwmio/PWMOut.c
+++ b/ports/espressif/common-hal/pwmio/PWMOut.c
@@ -170,7 +170,7 @@ void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
     // Otherwise, we clear never_reset for the timer as well.
     bool other_never_reset = false;
     for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
-        if (i != self->tim_handle.timer_num &&
+        if (i != self->chan_handle.channel &&
             reserved_channels[i] == self->tim_handle.timer_num &&
             never_reset_chan[i]) {
             other_never_reset = true;

From 788638f7279e540b21d6f0c08d75a8dc3e00b36d Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 15 Nov 2022 19:15:25 -0600
Subject: [PATCH 1392/2403] displayio.SERIAL_GROUP constant

---
 shared-bindings/displayio/__init__.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 80fcde6e49..8e8a59347c 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -45,6 +45,7 @@
 #endif
 #include "shared-bindings/displayio/Shape.h"
 #include "shared-bindings/displayio/TileGrid.h"
+#include "shared-module/displayio/__init__.h"
 
 //| """Native helpers for driving displays
 //|
@@ -95,6 +96,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SERIAL_GROUP), MP_ROM_PTR(&circuitpython_splash) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table);
 

From 12545fb060fa16388057f9418fec813696154c11 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 15 Nov 2022 19:16:12 -0600
Subject: [PATCH 1393/2403] Add prototype feather esp32s2/s3 reverse tft board
 definition

This is not final hardware and may change!
---
 .../board.c                                   | 136 ++++++++++++++++++
 .../mpconfigboard.h                           |  47 ++++++
 .../mpconfigboard.mk                          |  14 ++
 .../pins.c                                    |  78 ++++++++++
 .../sdkconfig                                 |  47 ++++++
 .../board.c                                   | 136 ++++++++++++++++++
 .../mpconfigboard.h                           |  47 ++++++
 .../mpconfigboard.mk                          |  14 ++
 .../pins.c                                    |  78 ++++++++++
 .../sdkconfig                                 |  47 ++++++
 10 files changed, 644 insertions(+)
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
 create mode 100644 ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
new file mode 100644
index 0000000000..360c71804c
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
@@ -0,0 +1,136 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+#define DELAY 0x80
+
+// display init sequence according to LilyGO example app
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 150,
+    // sleep out
+    0x11, 0 | DELAY, 255,
+    // normal display mode on
+    0x13, 0,
+    // display and color format settings
+    0x36, 1, 0x68,
+    0xB6, 2, 0x0A, 0x82,
+    0x3A, 1 | DELAY,  0x55, 10,
+    // ST7789V frame rate setting
+    0xB2, 5, 0x0C, 0x0C, 0x00, 0x33, 0x33,
+    // voltages: VGH / VGL
+    0xB7, 1, 0x35,
+    // ST7789V power setting
+    0xBB, 1, 0x28,
+    0xC0, 1, 0x0C,
+    0xC2, 2, 0x01, 0xFF,
+    0xC3, 1, 0x10,
+    0xC4, 1, 0x20,
+    0xC6, 1, 0x0F,
+    0xD0, 2, 0xA4, 0xA1,
+    // ST7789V gamma setting
+    0xE0, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x32, 0x44, 0x42, 0x06, 0x0E, 0x12, 0x14, 0x17,
+    0xE1, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x31, 0x54, 0x47, 0x0E, 0x1C, 0x17, 0x1B, 0x1E,
+    0x21, 0,
+    // display on
+    0x29, 0 | DELAY, 255,
+};
+
+
+void board_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO40,    // DC
+        &pin_GPIO42,    // CS
+        &pin_GPIO41,    // RST
+        40000000,       // 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,
+        240,            // width (after rotation)
+        135,            // height (after rotation)
+        40,             // column start
+        53,             // row start
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO45,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Override the I2C/TFT power pin reset to prevent resetting the display.
+    if (pin_number == 21) {
+        // Turn on TFT and I2C
+        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(21, true);
+        return true;
+    }
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
+
+// TODO: Should we turn off the display when asleep, in board_deinit() ?
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
new file mode 100644
index 0000000000..d170bba487
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.h
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Adafruit Feather ESP32-S2 Reverse TFT"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO34)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO34)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO35)
+
+#define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
new file mode 100644
index 0000000000..75c64bb11d
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
@@ -0,0 +1,14 @@
+USB_VID = 0x239A
+USB_PID = 0x8128
+
+USB_PRODUCT = "Feather ESP32-S2 Reverse TFT"
+USB_MANUFACTURER = "Adafruit"
+
+IDF_TARGET = esp32s2
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+OPTIMIZATION_FLAGS = -Os
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
new file mode 100644
index 0000000000..0a331c93fd
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
@@ -0,0 +1,78 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_TFT_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
new file mode 100644
index 0000000000..4ec35ed950
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
@@ -0,0 +1,47 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=n
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s2"
+# end of LWIP
+
+# end of Component config
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
new file mode 100644
index 0000000000..360c71804c
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
@@ -0,0 +1,136 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+#define DELAY 0x80
+
+// display init sequence according to LilyGO example app
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 150,
+    // sleep out
+    0x11, 0 | DELAY, 255,
+    // normal display mode on
+    0x13, 0,
+    // display and color format settings
+    0x36, 1, 0x68,
+    0xB6, 2, 0x0A, 0x82,
+    0x3A, 1 | DELAY,  0x55, 10,
+    // ST7789V frame rate setting
+    0xB2, 5, 0x0C, 0x0C, 0x00, 0x33, 0x33,
+    // voltages: VGH / VGL
+    0xB7, 1, 0x35,
+    // ST7789V power setting
+    0xBB, 1, 0x28,
+    0xC0, 1, 0x0C,
+    0xC2, 2, 0x01, 0xFF,
+    0xC3, 1, 0x10,
+    0xC4, 1, 0x20,
+    0xC6, 1, 0x0F,
+    0xD0, 2, 0xA4, 0xA1,
+    // ST7789V gamma setting
+    0xE0, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x32, 0x44, 0x42, 0x06, 0x0E, 0x12, 0x14, 0x17,
+    0xE1, 14, 0xD0, 0x00, 0x02, 0x07, 0x0A, 0x28, 0x31, 0x54, 0x47, 0x0E, 0x1C, 0x17, 0x1B, 0x1E,
+    0x21, 0,
+    // display on
+    0x29, 0 | DELAY, 255,
+};
+
+
+void board_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO40,    // DC
+        &pin_GPIO42,    // CS
+        &pin_GPIO41,    // RST
+        40000000,       // 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,
+        240,            // width (after rotation)
+        135,            // height (after rotation)
+        40,             // column start
+        53,             // row start
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO45,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Override the I2C/TFT power pin reset to prevent resetting the display.
+    if (pin_number == 21) {
+        // Turn on TFT and I2C
+        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(21, true);
+        return true;
+    }
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
+
+// TODO: Should we turn off the display when asleep, in board_deinit() ?
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
new file mode 100644
index 0000000000..cb0237c3e5
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.h
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Adafruit Feather ESP32-S3 Reverse TFT"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO34)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO34)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO35)
+
+#define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
new file mode 100644
index 0000000000..8185522c52
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
@@ -0,0 +1,14 @@
+USB_VID = 0x239A
+USB_PID = 0x8124
+
+USB_PRODUCT = "Feather ESP32-S3 Reverse TFT"
+USB_MANUFACTURER = "Adafruit"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+OPTIMIZATION_FLAGS = -Os
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
new file mode 100644
index 0000000000..0a331c93fd
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
@@ -0,0 +1,78 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_TFT_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
new file mode 100644
index 0000000000..2e207ec2ce
--- /dev/null
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
@@ -0,0 +1,47 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=n
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP
+
+# end of Component config

From b74893eb07fdbe9fed2b17749c4f66ee664ff153 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 15 Nov 2022 21:52:12 -0500
Subject: [PATCH 1394/2403] samd21: port_disable_tick() should disable event
 channel

---
 ports/atmel-samd/supervisor/port.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 424acece78..2c63e28a17 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -644,6 +644,10 @@ void port_disable_tick(void) {
     RTC->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_PER2;
     #endif
     #ifdef SAMD21
+    if (_tick_event_channel == EVSYS_SYNCH_NUM) {
+        return;
+    }
+
     if (_tick_event_channel >= 8) {
         uint8_t value = 1 << (_tick_event_channel - 8);
         EVSYS->INTENCLR.reg = EVSYS_INTENSET_EVDp8(value);
@@ -651,6 +655,7 @@ void port_disable_tick(void) {
         uint8_t value = 1 << _tick_event_channel;
         EVSYS->INTENCLR.reg = EVSYS_INTENSET_EVD(value);
     }
+    disable_event_channel(_tick_event_channel);
     _tick_event_channel = EVSYS_SYNCH_NUM;
     #endif
 }

From b0d0fcbabc7162533110162d9f03c38321ed9f6a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 17 Nov 2022 10:31:36 -0600
Subject: [PATCH 1395/2403] supervisor_start_terminal: don't crash if display
 is tiny

Closes: #7222
---
 supervisor/shared/display.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 8ed2f5c17e..0a066e8016 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -74,11 +74,8 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         scale = 1;
     }
 
-    width_in_tiles = width_px / (scroll_area->tile_width * scale);
-    if (width_in_tiles < 1) {
-        width_in_tiles = 1;
-    }
-    uint16_t height_in_tiles = height_px / (scroll_area->tile_height * scale);
+    width_in_tiles = MAX(1, width_px / (scroll_area->tile_width * scale));
+    uint16_t height_in_tiles = MAX(2, height_px / (scroll_area->tile_height * scale));
 
     uint16_t total_tiles = width_in_tiles * height_in_tiles;
 
@@ -117,7 +114,6 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         status_bar->top_left_y = 0;
         status_bar->width_in_tiles = width_in_tiles;
         status_bar->height_in_tiles = 1;
-        assert(width_in_tiles > 0);
         status_bar->pixel_width = width_in_tiles * status_bar->tile_width;
         status_bar->pixel_height = status_bar->tile_height;
         status_bar->tiles = tiles;
@@ -127,8 +123,6 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
         scroll_area->top_left_y = 0;
         scroll_area->width_in_tiles = width_in_tiles;
         scroll_area->height_in_tiles = height_in_tiles - 1;
-        assert(width_in_tiles > 0);
-        assert(height_in_tiles > 1);
         scroll_area->pixel_width = width_in_tiles * scroll_area->tile_width;
         scroll_area->pixel_height = (height_in_tiles - 1) * scroll_area->tile_height;
         #if CIRCUITPY_REPL_LOGO

From f9f1edbb08215d90ec99614596131d5705510837 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 1 Apr 2022 12:39:20 +0200
Subject: [PATCH 1396/2403] setup PWM status LED on aithinker ESP32-C3 boards

---
 .../espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h  | 4 +++-
 ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
index a42f8b0436..a9f0075a41 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
@@ -30,7 +30,9 @@
 #define MICROPY_HW_MCU_NAME         "ESP32-C3"
 
 // Status LED
-#define MICROPY_HW_LED_STATUS       (&pin_GPIO19)
+#define CIRCUITPY_RGB_STATUS_R      (&pin_GPIO3)
+#define CIRCUITPY_RGB_STATUS_G      (&pin_GPIO4)
+#define CIRCUITPY_RGB_STATUS_B      (&pin_GPIO5)
 
 // Default bus pins
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO20)
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
index 20fb1ff022..f3f89d500b 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
@@ -30,7 +30,9 @@
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
 
 // Status LED
-#define MICROPY_HW_LED_STATUS       (&pin_GPIO19)
+#define CIRCUITPY_RGB_STATUS_R      (&pin_GPIO3)
+#define CIRCUITPY_RGB_STATUS_G      (&pin_GPIO4)
+#define CIRCUITPY_RGB_STATUS_B      (&pin_GPIO5)
 
 // Default bus pins
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO20)

From b8cd6c093fa25ba650a79a64ce83491607f80691 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 17 Nov 2022 21:47:39 +0200
Subject: [PATCH 1397/2403] picow-ap progress

---
 locale/circuitpython.pot                  | 18 ++++++++--
 ports/raspberrypi/common-hal/wifi/Radio.c | 40 ++++++++++++++++++-----
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 044900bd30..2d759d8cbe 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%q in use"
 msgstr ""
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -397,6 +397,10 @@ msgstr ""
 msgid "ADC2 is being used by WiFi"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "AP cannot be stopped."
+msgstr ""
+
 #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
@@ -478,10 +482,18 @@ msgstr ""
 msgid "Already advertising."
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Already connected to station."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Already in access point mode."
+msgstr ""
+
 #: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -3153,7 +3165,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index b70543a43c..ea0cde78bc 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -155,12 +155,11 @@ void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
 }
 
 void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
+
+    // This is wrong This is fine.
     cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
-    // This is wrong, but without this call the state of ITF_STA is still
-    // reported as CYW43_LINK_JOIN (by wifi_link_status) and CYW43_LINK_UP
-    // (by tcpip_link_status). Until AP support is added, we can ignore the
-    // problem.
     cyw43_wifi_leave(&cyw43_state, CYW43_ITF_AP);
+
     bindings_cyw43_wifi_enforce_pm();
 }
 
@@ -168,21 +167,41 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
-    // Is there a better way?
-    common_hal_wifi_radio_stop_station(self);
+
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_DOWN) {
+        mp_raise_RuntimeError(translate("Already connected to station."));
+    }
+
+    common_hal_wifi_radio_stop_ap(self);
 
     // Channel can only be changed after inital powerup and config of ap.
     // Defaults to 1 if not set or invalid (i.e. 13)
     cyw43_wifi_ap_set_channel(&cyw43_state, (const uint32_t)channel);
 
     cyw43_arch_enable_ap_mode((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
+
     // TODO: Implement authmode check like in espressif
     bindings_cyw43_wifi_enforce_pm();
 }
 
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
-    common_hal_wifi_radio_stop_station(self);
-    // I mean, since it already does both..
+    if (!common_hal_wifi_radio_get_enabled(self)) {
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
+    }
+
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_DOWN) {
+        mp_raise_NotImplementedError(translate("AP cannot be stopped."));
+    }
+
+    /*
+     * AP cannot be disconnected. cyw43_wifi_leave is broken.
+     * This code snippet should work, but doesn't.
+     *
+     * cyw43_wifi_leave(&cyw43_state, CYW43_ITF_AP);
+     * cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
+     *
+     * bindings_cyw43_wifi_enforce_pm();
+     */
 }
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
@@ -190,6 +209,11 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
         mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
 
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_DOWN) {
+        mp_raise_RuntimeError(translate("Already in access point mode."));
+    }
+
+
     size_t timeout_ms = timeout <= 0 ? 8000 : (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
     uint64_t start = port_get_raw_ticks(NULL);
     uint64_t deadline = start + timeout_ms;

From 4f2f489df4bd06b9ed90e355acd7bf332f61523b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 18 Nov 2022 09:54:40 +0530
Subject: [PATCH 1398/2403] ignore espressif_esp32s3_devkitc_1_n32r8 in vid:pid
 check

---
 tools/ci_check_duplicate_usb_vid_pid.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 4e5c48c90d..4d9a0b162e 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -54,6 +54,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s3_devkitc_1_n8",
         "espressif_esp32s3_devkitc_1_n8r2",
         "espressif_esp32s3_devkitc_1_n8r8",
+        "espressif_esp32s3_devkitc_1_n32r8",
     ],
     "0x303A:0x7009": [
         "espressif_esp32s2_devkitc_1_n4",

From e2a359726351cd18ecaaf13c6adaca2091abb2ee Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:27:23 +0530
Subject: [PATCH 1399/2403] add awesome new make error message

Copied from initial implementation on atmel-samd

Co-authored-by: Rose Hooper 
Co-authored-by: Jeff Epler 
---
 ports/broadcom/Makefile    | 13 ++++++++++---
 ports/cxd56/Makefile       | 13 +++++++++++--
 ports/espressif/Makefile   | 13 +++++++++++--
 ports/litex/Makefile       | 13 +++++++++++--
 ports/mimxrt10xx/Makefile  | 13 +++++++++++--
 ports/nrf/Makefile         | 16 +++++++++++-----
 ports/raspberrypi/Makefile | 13 +++++++++++--
 ports/stm/Makefile         | 17 +++++++++++++----
 8 files changed, 89 insertions(+), 22 deletions(-)

diff --git a/ports/broadcom/Makefile b/ports/broadcom/Makefile
index 757e7f3450..ca516958e0 100644
--- a/ports/broadcom/Makefile
+++ b/ports/broadcom/Makefile
@@ -1,11 +1,18 @@
 # Select the board to build for.
-BOARD?=raspberrypi_pi4b
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
 
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD "$(BOARD)" specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile
index 073d2d59ce..208d3222b0 100644
--- a/ports/cxd56/Makefile
+++ b/ports/cxd56/Makefile
@@ -23,11 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 30c35f9caf..331e443561 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -23,11 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/litex/Makefile b/ports/litex/Makefile
index 6b1e33c8d1..3281977657 100644
--- a/ports/litex/Makefile
+++ b/ports/litex/Makefile
@@ -23,11 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index 4b05c91714..2dda646882 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -24,11 +24,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index bbe102ffc8..2dbc582022 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -23,14 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(info You must provide a BOARD parameter with 'BOARD=')
-  $(info Possible values are:)
-  $(info $(sort $(subst /.,,$(subst boards/,,$(wildcard boards/*/.)))))
-  $(error BOARD not defined)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 5095c4c1f8..151c60ba1b 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -23,11 +23,20 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-  $(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
   ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(error Invalid BOARD specified)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
   endif
 endif
 
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index afde51bdc0..ac373cbbfa 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -24,12 +24,21 @@
 # THE SOFTWARE.
 
 # Select the board to build for.
+define show_board_error
+boardlist =
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
 ifeq ($(BOARD),)
-$(error You must provide a BOARD parameter)
+    $(info No BOARD specified)
+    $(call show_board_error)
 else
-ifeq ($(wildcard boards/$(BOARD)/.),)
-$(error Invalid BOARD specified)
-endif
+  ifeq ($(wildcard boards/$(BOARD)/.),)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
+  endif
 endif
 
 # If the build directory is not given, make it reflect the board name.

From c3c1717813808563b9a5f3cd6072d93eb7ba401e Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 18 Nov 2022 23:00:28 +0530
Subject: [PATCH 1400/2403] refactor common port specific Makefile code

---
 ports/atmel-samd/Makefile  | 40 +---------------------
 ports/broadcom/Makefile    | 62 +++++++++++++--------------------
 ports/cxd56/Makefile       | 43 +----------------------
 ports/espressif/Makefile   | 46 +------------------------
 ports/litex/Makefile       | 41 +---------------------
 ports/mimxrt10xx/Makefile  | 40 +---------------------
 ports/nrf/Makefile         | 45 +++---------------------
 ports/raspberrypi/Makefile | 40 +---------------------
 ports/stm/Makefile         | 41 +---------------------
 py/circuitpy_mkenv.mk      | 70 ++++++++++++++++++++++++++++++++++++++
 10 files changed, 106 insertions(+), 362 deletions(-)
 create mode 100644 py/circuitpy_mkenv.mk

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index d27a048399..fdfb6c81b8 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -22,45 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = arm-none-eabi-
 
diff --git a/ports/broadcom/Makefile b/ports/broadcom/Makefile
index ca516958e0..cbd072e833 100644
--- a/ports/broadcom/Makefile
+++ b/ports/broadcom/Makefile
@@ -1,42 +1,28 @@
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 ifeq ($(CHIP_VARIANT), "bcm2711")
 CFLAGS += -mcpu=cortex-a72 -DBCM_VERSION=2711
diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile
index 208d3222b0..389b8a7fe6 100644
--- a/ports/cxd56/Makefile
+++ b/ports/cxd56/Makefile
@@ -22,48 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-
-# Port-specific
-include mpconfigport.mk
-
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = arm-none-eabi-
 
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 331e443561..b197195aa2 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -22,51 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the flash PORT is not given, use the default /dev/tty.SLAB_USBtoUART.
-PORT ?= /dev/tty.SLAB_USBtoUART
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-
-# Port-specific
-include mpconfigport.mk
-
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 ifeq ($(IDF_TARGET),esp32c3)
 IDF_TARGET_ARCH = riscv
diff --git a/ports/litex/Makefile b/ports/litex/Makefile
index 3281977657..1c5c0a014e 100644
--- a/ports/litex/Makefile
+++ b/ports/litex/Makefile
@@ -22,46 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = riscv64-unknown-elf-
 
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index 2dda646882..1c5c62bb85 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -23,45 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = arm-none-eabi-
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 2dbc582022..22cfd474ce 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -22,51 +22,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
+include ../../py/circuitpy_mkenv.mk
 
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-CLI_SD := $(SD)
 SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
 
-# Build directory with SD if it's different from the default.
-BUILD ?= $(if $(CLI_SD),build-$(BOARD)-$(SD_LOWER),build-$(BOARD))
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
-
 ifneq ($(SD), )
 	include bluetooth/bluetooth_common.mk
+	ifeq ($(BUILD), build-$(BOARD))
+		# Build directory with SD if it's different from the default.
+		BUILD = build-$(BOARD)-$(SD_LOWER)
+	endif
 endif
 
 CROSS_COMPILE = arm-none-eabi-
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 151c60ba1b..06408e25c6 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -22,45 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = arm-none-eabi-
 
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index ac373cbbfa..726123a0ba 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -23,46 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Select the board to build for.
-define show_board_error
-boardlist =
-$(info Valid boards:)
-$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
-$(error Rerun with $(MAKE) BOARD=)
-endef
-
-ifeq ($(BOARD),)
-    $(info No BOARD specified)
-    $(call show_board_error)
-else
-  ifeq ($(wildcard boards/$(BOARD)/.),)
-    $(info Invalid BOARD specified)
-    $(call show_board_error)
-  endif
-endif
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
-include ../../py/mkenv.mk
-# Board-specific
-include boards/$(BOARD)/mpconfigboard.mk
-# Port-specific
-include mpconfigport.mk
-
-# CircuitPython-specific
-include $(TOP)/py/circuitpy_mpconfig.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-include $(TOP)/supervisor/supervisor.mk
-
-# Include make rules and variables common across CircuitPython builds.
-include $(TOP)/py/circuitpy_defns.mk
+include ../../py/circuitpy_mkenv.mk
 
 CROSS_COMPILE = arm-none-eabi-
 
diff --git a/py/circuitpy_mkenv.mk b/py/circuitpy_mkenv.mk
new file mode 100644
index 0000000000..d776cc2fef
--- /dev/null
+++ b/py/circuitpy_mkenv.mk
@@ -0,0 +1,70 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# SPDX-FileCopyrightText: Copyright (c) 2022 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
+# 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.
+
+# Common Makefile items that can be shared across CircuitPython ports.
+
+# Select the board to build for.
+define show_board_error
+$(info Valid boards:)
+$(shell printf '%s\n' $(patsubst boards/%/mpconfigboard.mk,%,$(wildcard boards/*/mpconfigboard.mk)) | column -xc $$(tput cols || echo 80) 1>&2)
+$(error Rerun with $(MAKE) BOARD=)
+endef
+
+ifeq ($(BOARD),)
+    $(info No BOARD specified)
+    $(call show_board_error)
+else
+  ifeq ($(wildcard boards/$(BOARD)/.),)
+    $(info Invalid BOARD specified)
+    $(call show_board_error)
+  endif
+endif
+
+# If the flash PORT is not given, use the default /dev/tty.SLAB_USBtoUART.
+PORT ?= /dev/tty.SLAB_USBtoUART
+
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build-$(BOARD)
+
+include ../../py/mkenv.mk
+
+# Board-specific
+include boards/$(BOARD)/mpconfigboard.mk
+
+# Port-specific
+include mpconfigport.mk
+
+# CircuitPython-specific
+include $(TOP)/py/circuitpy_mpconfig.mk
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+
+include $(TOP)/supervisor/supervisor.mk
+
+# Include make rules and variables common across CircuitPython builds.
+include $(TOP)/py/circuitpy_defns.mk

From 7c51201e88e75f351aa882a97e7395181585f8fd Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 19 Nov 2022 00:18:35 +0530
Subject: [PATCH 1401/2403] fix nRF build directory naming

---
 ports/nrf/Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 22cfd474ce..67d2a5e685 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -24,14 +24,8 @@
 
 include ../../py/circuitpy_mkenv.mk
 
-SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
-
 ifneq ($(SD), )
 	include bluetooth/bluetooth_common.mk
-	ifeq ($(BUILD), build-$(BOARD))
-		# Build directory with SD if it's different from the default.
-		BUILD = build-$(BOARD)-$(SD_LOWER)
-	endif
 endif
 
 CROSS_COMPILE = arm-none-eabi-

From 406e46f46bfadb001c38037f3f141f9037d023f6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 18 Nov 2022 14:34:28 -0600
Subject: [PATCH 1402/2403] Allow serial "break" to trigger KeyboardInterrupt

When the USB serial buffer is full, the Ctrl-C code to send
KeyboardInterrupt can't be sent, which creates a problem if you've
pasted code or otherwise filled the buffer and need to recover.
A similar problem affects advanced UIs that interact with CircuitPython
and may send characters when they're unexpected, such as mu when it
tries to move the cursor based on the user clicking on the screen.

The main way forward seems to be to use some kind of message that can
still reach CircuitPython when its internal serial recieve buffer is full.
RS232 defines a "break" signal, in which the transmitting device holds its
data line in the "space" state for many entire character times. This still
exists in the world of USB serial.

This does work, sort of, except that your host computer software will need
to properly handle blocking serial writes; tio can send a break with
the **ctrl-c b** sequence, but this only works if it hasn't yet written
too much data, so it doesn't actually help in most situations :-/
---
 supervisor/shared/usb/usb.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index a51c6c2659..81a4cbc332 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -359,4 +359,10 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     }
 }
 
+void tud_cdc_send_break_cb(uint8_t itf, uint16_t duration_ms) {
+    if (usb_cdc_console_enabled() && mp_interrupt_char != -1 && itf == 0 && duration_ms > 0) {
+        mp_sched_keyboard_interrupt();
+    }
+}
+
 #endif

From 88bd9ef6b8207b9835d60e5c590faa04e46d4895 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 18 Nov 2022 22:51:05 +0200
Subject: [PATCH 1403/2403] just change the ap error

---
 locale/circuitpython.pot                  | 8 ++++----
 ports/raspberrypi/common-hal/wifi/Radio.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 2d759d8cbe..c91b425ef5 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -397,10 +397,6 @@ msgstr ""
 msgid "ADC2 is being used by WiFi"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c
-msgid "AP cannot be stopped."
-msgstr ""
-
 #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
@@ -1979,6 +1975,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index ea0cde78bc..a3a8f8ec12 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -190,7 +190,7 @@ void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
     }
 
     if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_DOWN) {
-        mp_raise_NotImplementedError(translate("AP cannot be stopped."));
+        mp_raise_NotImplementedError(translate("Stopping AP is not supported."));
     }
 
     /*

From afca4cef6dd4daa8ff3c82b4c235b9d60300c67d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 18 Nov 2022 16:05:46 -0600
Subject: [PATCH 1404/2403] This code can only be active if USB CDC is enabled.

---
 supervisor/shared/usb/usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 81a4cbc332..fa85cddb83 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -341,7 +341,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
 #endif // CIRCUITPY_USB_VENDOR
 
 
-#if MICROPY_KBD_EXCEPTION
+#if MICROPY_KBD_EXCEPTION && CIRCUITPY_USB_CDC
 
 /**
  * Callback invoked when received an "wanted" char.

From 403e3ef4309ce761ef0465c58d9b5c038da01851 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 18 Nov 2022 16:53:18 -0600
Subject: [PATCH 1405/2403] change to CIRCUITPYTHON_TERMINAL. change internal
 API to use set_root_group

---
 shared-bindings/displayio/Display.c              |  5 +----
 shared-bindings/displayio/__init__.c             |  2 +-
 shared-module/displayio/Display.c                | 10 +++++++++-
 shared-module/displayio/EPaperDisplay.c          |  2 +-
 shared-module/displayio/display_core.c           |  2 +-
 shared-module/displayio/display_core.h           |  2 +-
 shared-module/framebufferio/FramebufferDisplay.c |  2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index b472ec6aa4..e5a2836d1a 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -430,10 +430,7 @@ STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t
         group = MP_OBJ_TO_PTR(native_group(group_in));
     }
 
-    bool ok = common_hal_displayio_display_show(self, group);
-    if (!ok) {
-        mp_raise_ValueError(translate("Group already used"));
-    }
+    common_hal_displayio_display_set_root_group(self, group);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 8e8a59347c..3fcd1d082b 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -96,7 +96,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SERIAL_GROUP), MP_ROM_PTR(&circuitpython_splash) },
+    { MP_ROM_QSTR(MP_QSTR_CIRCUITPYTHON_TERMINAL), MP_ROM_PTR(&circuitpython_splash) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table);
 
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 9fd55fe19d..2d65e88836 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -141,7 +141,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 }
 
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t *self) {
@@ -398,6 +398,14 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self
     self->auto_refresh = auto_refresh;
 }
 
+mp_obj_t common_hal_displayio_display_set_root_group(displayio_display_obj_t *self, displayio_group_t *root_group) {
+    bool ok = displayio_display_core_set_root_group(&self->core, root_group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}
+
 void displayio_display_background(displayio_display_obj_t *self) {
     if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) {
         _refresh_display(self);
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 0010d88d12..c8378e53dd 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -103,7 +103,7 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
 }
 
 bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(displayio_epaperdisplay_obj_t *self) {
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index 8b2f0bfdf8..eadb0ebd4c 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -162,7 +162,7 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,
     }
 }
 
-bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group) {
+bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group) {
 
     if (root_group == NULL) { // set the display to the REPL, reset REPL position and size
         circuitpython_splash.in_group = false;
diff --git a/shared-module/displayio/display_core.h b/shared-module/displayio/display_core.h
index 8c2ba21b5e..2167683a0d 100644
--- a/shared-module/displayio/display_core.h
+++ b/shared-module/displayio/display_core.h
@@ -61,7 +61,7 @@ void displayio_display_core_construct(displayio_display_core_t *self,
     mp_obj_t bus, uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
     uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word);
 
-bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group);
+bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group);
 
 uint16_t displayio_display_core_get_width(displayio_display_core_t *self);
 uint16_t displayio_display_core_get_height(displayio_display_core_t *self);
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index e2e7d11106..79cb09ab39 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -102,7 +102,7 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
 }
 
 bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 uint16_t common_hal_framebufferio_framebufferdisplay_get_width(framebufferio_framebufferdisplay_obj_t *self) {

From 1611cf98dab67d90c987a261f1b804e33b94ca68 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 18 Nov 2022 18:27:38 -0500
Subject: [PATCH 1406/2403] have clock start high in SPI mode 3

---
 ports/raspberrypi/common-hal/busio/SPI.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c
index a7b97823f9..67323790bf 100644
--- a/ports/raspberrypi/common-hal/busio/SPI.c
+++ b/ports/raspberrypi/common-hal/busio/SPI.c
@@ -151,6 +151,15 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
 
     spi_set_format(self->peripheral, bits, polarity, phase, SPI_MSB_FIRST);
 
+    // Workaround to start with clock line high if polarity=1. The hw SPI peripheral does not do this
+    // automatically. See https://github.com/raspberrypi/pico-sdk/issues/868 and
+    // https://forums.raspberrypi.com/viewtopic.php?t=336142
+    // TODO: scheduled to be be fixed in pico-sdk 1.5.0.
+    if (polarity) {
+        hw_clear_bits(&spi_get_hw(self->peripheral)->cr1, SPI_SSPCR1_SSE_BITS); // disable the SPI
+        hw_set_bits(&spi_get_hw(self->peripheral)->cr1, SPI_SSPCR1_SSE_BITS); // re-enable the SPI
+    }
+
     self->polarity = polarity;
     self->phase = phase;
     self->bits = bits;

From e3cae2229790528fb1167bf7898aa7acd17bc82e Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 18 Nov 2022 17:34:03 -0600
Subject: [PATCH 1407/2403] allow set_root_group for EPaperDisplay instead of
 show()

---
 shared-bindings/displayio/EPaperDisplay.c | 25 +++++++++++++++++++++++
 shared-bindings/displayio/EPaperDisplay.h |  3 +++
 shared-module/displayio/EPaperDisplay.c   |  7 +++++++
 3 files changed, 35 insertions(+)

diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 7b77b42fa4..f3831b5084 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -349,6 +349,30 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_bus_obj, displayio_epaperd
 MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj,
     (mp_obj_t)&displayio_epaperdisplay_get_bus_obj);
 
+//|     root_group: Group
+//|     """The root group on the epaper display."""
+//|
+STATIC mp_obj_t displayio_epaperdisplay_obj_get_root_group(mp_obj_t self_in) {
+    displayio_epaperdisplay_obj_t *self = native_display(self_in);
+    return common_hal_displayio_epaperdisplay_get_root_group(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_epaperdisplay_get_root_group_obj, displayio_epaperdisplay_obj_get_root_group);
+
+STATIC mp_obj_t displayio_epaperdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) {
+    displayio_epaperdisplay_obj_t *self = native_display(self_in);
+    displayio_group_t *group = NULL;
+    if (group_in != mp_const_none) {
+        group = MP_OBJ_TO_PTR(native_group(group_in));
+    }
+
+    common_hal_displayio_epaperdisplay_set_root_group(self, group);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(displayio_epaperdisplay_set_root_group_obj, displayio_epaperdisplay_obj_set_root_group);
+
+MP_PROPERTY_GETSET(displayio_epaperdisplay_root_group_obj,
+    (mp_obj_t)&displayio_epaperdisplay_get_root_group_obj,
+    (mp_obj_t)&displayio_epaperdisplay_set_root_group_obj);
 
 STATIC const mp_rom_map_elem_t displayio_epaperdisplay_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&displayio_epaperdisplay_show_obj) },
@@ -361,6 +385,7 @@ STATIC const mp_rom_map_elem_t displayio_epaperdisplay_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bus), MP_ROM_PTR(&displayio_epaperdisplay_bus_obj) },
     { MP_ROM_QSTR(MP_QSTR_busy), MP_ROM_PTR(&displayio_epaperdisplay_busy_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_to_refresh), MP_ROM_PTR(&displayio_epaperdisplay_time_to_refresh_obj) },
+    { MP_ROM_QSTR(MP_QSTR_root_group), MP_ROM_PTR(&displayio_epaperdisplay_root_group_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_epaperdisplay_locals_dict, displayio_epaperdisplay_locals_dict_table);
 
diff --git a/shared-bindings/displayio/EPaperDisplay.h b/shared-bindings/displayio/EPaperDisplay.h
index ba6dffcb4b..13fd51d132 100644
--- a/shared-bindings/displayio/EPaperDisplay.h
+++ b/shared-bindings/displayio/EPaperDisplay.h
@@ -48,6 +48,9 @@ bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *s
 
 bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group);
 
+mp_obj_t common_hal_displayio_epaperdisplay_get_root_group(displayio_epaperdisplay_obj_t *self);
+bool common_hal_displayio_epaperdisplay_set_root_group(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group);
+
 // Returns time in milliseconds.
 uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaperdisplay_obj_t *self);
 bool common_hal_displayio_epaperdisplay_get_busy(displayio_epaperdisplay_obj_t *self);
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index c8378e53dd..68464d50ea 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -106,6 +106,10 @@ bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
+bool common_hal_displayio_epaperdisplay_set_root_group(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group) {
+    return displayio_display_core_set_root_group(&self->core, root_group);
+}
+
 STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(displayio_epaperdisplay_obj_t *self) {
     if (self->core.full_refresh) {
         self->core.area.next = NULL;
@@ -239,6 +243,9 @@ uint16_t common_hal_displayio_epaperdisplay_get_rotation(displayio_epaperdisplay
     return self->core.rotation;
 }
 
+mp_obj_t common_hal_displayio_epaperdisplay_get_root_group(displayio_epaperdisplay_obj_t *self) {
+    return self->core.current_group;
+}
 
 STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *self, const displayio_area_t *area) {
     uint16_t buffer_size = 128; // In uint32_ts

From e4f5ca11f9439e6aafb3e3063c47b13086e50636 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 19 Nov 2022 10:45:10 +0530
Subject: [PATCH 1408/2403] compare against pr head commit instead of merge ref

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0e540f3aa3..607717f5fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -141,6 +141,7 @@ jobs:
       uses: tj-actions/changed-files@v34
       with:
         json: "true"
+        sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}
         base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
     - name: Set matrix
       id: set-matrix

From 4e0f8e7fcd9cb65bd4583ece41bea6fc7277c3c4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 19 Nov 2022 10:50:12 -0600
Subject: [PATCH 1409/2403] Interrupt on UART 'break'

Tested and working with the CH9102F USB converter on Adafruit's
Feather ESP32 V2 (& tio as the software on the host computer)

Closes: #7233
---
 ports/espressif/common-hal/busio/UART.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
index cdaf25250f..f025c15b3e 100644
--- a/ports/espressif/common-hal/busio/UART.c
+++ b/ports/espressif/common-hal/busio/UART.c
@@ -49,8 +49,9 @@ static void uart_event_task(void *param) {
     while (true) {
         if (xQueueReceive(self->event_queue, &event, portMAX_DELAY)) {
             switch (event.type) {
+                case UART_BREAK:
                 case UART_PATTERN_DET:
-                    // When the console uart receives CTRL+C, wake the main task and schedule a keyboard interrupt
+                    // When the console uart receives CTRL+C or BREAK, wake the main task and schedule a keyboard interrupt
                     if (self->is_console) {
                         port_wake_main_task();
                         if (mp_interrupt_char == CHAR_CTRL_C) {

From ef3398422a88f72cf5863e768f6a5f705d1ffb9e Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 19 Nov 2022 11:41:48 -0600
Subject: [PATCH 1410/2403] allow set_root_group for FrameBufferDisplay instead
 of show()

---
 .../framebufferio/FramebufferDisplay.c        | 20 +++++++++++++++++--
 .../framebufferio/FramebufferDisplay.h        |  1 +
 .../framebufferio/FramebufferDisplay.c        |  8 ++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 20e555eef9..51124984bf 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -328,8 +328,24 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t sel
 }
 MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_root_group_obj, framebufferio_framebufferdisplay_obj_get_root_group);
 
-MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_root_group_obj,
-    (mp_obj_t)&framebufferio_framebufferdisplay_get_root_group_obj);
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    displayio_group_t *group = NULL;
+    if (group_in != mp_const_none) {
+        group = MP_OBJ_TO_PTR(native_group(group_in));
+    }
+
+    bool ok = common_hal_framebufferio_framebufferdisplay_set_root_group(self, group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_root_group_obj, framebufferio_framebufferdisplay_obj_set_root_group);
+
+MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_root_group_obj,
+    (mp_obj_t)&framebufferio_framebufferdisplay_get_root_group_obj,
+    (mp_obj_t)&framebufferio_framebufferdisplay_set_root_group_obj);
 
 STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&framebufferio_framebufferdisplay_show_obj) },
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index 7c63587df7..6526e25afb 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -61,5 +61,6 @@ bool common_hal_framebufferio_framebufferdisplay_set_brightness(framebufferio_fr
 mp_obj_t common_hal_framebufferio_framebufferdisplay_framebuffer(framebufferio_framebufferdisplay_obj_t *self);
 
 mp_obj_t common_hal_framebufferio_framebufferdisplay_get_root_group(framebufferio_framebufferdisplay_obj_t *self);
+mp_obj_t common_hal_framebufferio_framebufferdisplay_set_root_group(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_FRAMEBUFFERDISPLAY_H
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 79cb09ab39..7575523166 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -362,3 +362,11 @@ void framebufferio_framebufferdisplay_reset(framebufferio_framebufferdisplay_obj
 mp_obj_t common_hal_framebufferio_framebufferdisplay_get_root_group(framebufferio_framebufferdisplay_obj_t *self) {
     return self->core.current_group;
 }
+
+mp_obj_t common_hal_framebufferio_framebufferdisplay_set_root_group(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) {
+    bool ok = displayio_display_core_set_root_group(&self->core, root_group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}

From 7ea563e661cedaa6714b003f08801097277938fe Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 19 Nov 2022 23:29:05 +0530
Subject: [PATCH 1411/2403] fix json parse issue

---
 .github/workflows/build.yml | 4 ++--
 tools/ci_set_matrix.py      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 607717f5fe..8863664232 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,14 +140,14 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: tj-actions/changed-files@v34
       with:
-        json: "true"
+        json: true
         sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}
         base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
     - name: Set matrix
       id: set-matrix
       working-directory: tools
       env:
-        CHANGED_FILES: ${{ toJSON(steps.get-changes.outputs.all_changed_and_modified_files) }}
+        CHANGED_FILES: ${{ steps.get-changes.outputs.all_changed_and_modified_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.checkruns }}
       run: python3 -u ci_set_matrix.py
 
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 081cf8d4fa..aeb24b9931 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -69,7 +69,7 @@ else:
         changed_files = []
     else:
         print("Using files list in CHANGED_FILES")
-        changed_files = json.loads(c)
+        changed_files = json.loads(c.replace("\\", ""))
 
     j = os.environ["LAST_FAILED_JOBS"]
     if j == "":
@@ -203,7 +203,7 @@ def set_boards_to_build(build_all):
     # Split boards by architecture.
     print("Building boards:")
     arch_to_boards = {"aarch": [], "arm": [], "riscv": [], "espressif": []}
-    for board in boards_to_build:
+    for board in sorted(boards_to_build):
         print(" ", board)
         port = board_to_port.get(board)
         # A board can appear due to its _deletion_ (rare)
@@ -220,6 +220,7 @@ def set_boards_to_build(build_all):
             failed_boards = last_failed_jobs[f"build-{arch}"]
             for board in failed_boards:
                 if not board in arch_to_boards[arch]:
+                    print(" ", board)
                     arch_to_boards[arch].append(board)
         # Set Output
         set_output(f"boards-{arch}", json.dumps(sorted(arch_to_boards[arch])))

From 4856f42f84316910e49701adf263bb7d09680bd9 Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Fri, 18 Nov 2022 18:28:23 +0000
Subject: [PATCH 1412/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 9178bd4caa..408b785287 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,8 +7,8 @@ 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: 2022-11-15 04:35+0000\n"
-"Last-Translator: River Wang \n"
+"PO-Revision-Date: 2022-11-19 18:48+0000\n"
+"Last-Translator: hexthat \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr "%%c xūyào zhěngshù huòzhě zìfú"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -741,9 +741,8 @@ msgid "Cannot get temperature"
 msgstr "Wúfǎ huòqǔ wēndù"
 
 #: shared-bindings/_bleio/Adapter.c
-#, fuzzy
 msgid "Cannot have scan responses for extended, connectable advertisements."
-msgstr "Nín wúfǎ sǎomiáo kuòzhǎn de, kě liánjiē de guǎnggào."
+msgstr "Quē fá duì tuī guǎng, kě lián jiē guǎng gào de dá fù."
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot pull on input-only pin."
@@ -794,7 +793,7 @@ msgstr "wúfǎ shǐyòng biānyuán huànxǐng, zhǐnéng shǐyòng diànpíng"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
-msgstr "wúfǎ shǐyòng biānyuán huànxǐng. zhǐnéng shǐyòng diànpíng"
+msgstr "wúfǎ shǐyòng biānyuán huànxǐng. zhǐnéng shǐyòng diànpíng."
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
@@ -864,9 +863,8 @@ msgstr "DAC zhèngzài bèi shǐyòng"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
-#, fuzzy
 msgid "Data 0 pin must be byte aligned"
-msgstr "Shùjù 0 de yǐn jiǎo bìxū shì zì jié duìqí"
+msgstr "shù jù 0 yǐn jiǎo bì xū shì zì jié duì qí de"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Data chunk must follow fmt chunk"
@@ -874,9 +872,8 @@ msgstr "Shùjù kuài bìxū zūnxún fmt qū kuài"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-#, fuzzy
 msgid "Data not supported with directed advertising"
-msgstr "bù zhī chí dìng xiàng guǎng gào de shù jù"
+msgstr "wèi xiàng guǎng gào tí gòng zhī zhù de shù jù"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -2186,7 +2183,7 @@ msgstr "UART xiě rù"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"

From 40d35e9eaa764335cbac1f71134914df313ec1eb Mon Sep 17 00:00:00 2001
From: s-ol 
Date: Sun, 20 Nov 2022 16:08:00 +0100
Subject: [PATCH 1413/2403] Don't block in I2CTarget.request(-1)

Partially reverts #6985
Closes #7241
---
 shared-bindings/i2ctarget/I2CTarget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 4dc5b775f4..17da952118 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -159,7 +159,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_
 
     bool forever = false;
     uint64_t timeout_end = 0;
-    if (timeout_ms <= 0) {
+    if (timeout_ms == 0) {
         forever = true;
     } else if (timeout_ms > 0) {
         timeout_end = common_hal_time_monotonic_ms() + timeout_ms;

From 85a83b8150182f3b9b19addbaa92ed774acdc8ca Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 21 Nov 2022 12:35:10 -0500
Subject: [PATCH 1414/2403] Simplify some ESP32-C3 board sdkconfig files

---
 .../boards/adafruit_qtpy_esp32c3/sdkconfig    | 65 -------------------
 .../boards/beetle-esp32-c3/sdkconfig          |  8 ---
 .../espressif/boards/lolin_c3_mini/sdkconfig  |  8 ---
 .../boards/microdev_micro_c3/sdkconfig        | 65 -------------------
 4 files changed, 146 deletions(-)

diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
index 5111900c7e..b47420753c 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
@@ -1,70 +1,5 @@
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=0
-# end of Bootloader config
-
-#
-# Serial flasher config
-#
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# end of Serial flasher config
-
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-# end of Partition Table
-
-#
-# Compiler options
-#
-# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-#
-
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
-CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
-# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
-# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
-# end of ESP System Settings
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-QTPy-ESP32C3"
 # end of LWIP
-
-#
-# SPI Flash driver
-#
-# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
-# end of SPI Flash driver
-
-# end of Component config
-
-#
-# Deprecated options for backward compatibility
-#
-# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=0
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-# end of Deprecated options for backward compatibility
diff --git a/ports/espressif/boards/beetle-esp32-c3/sdkconfig b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
index 331a5d14dc..68be40df7a 100644
--- a/ports/espressif/boards/beetle-esp32-c3/sdkconfig
+++ b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
@@ -1,13 +1,5 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="beetle-esp32-c3
 # end of LWIP
-
-
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index c548ee3c69..833f8368fa 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,13 +1,5 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP
-
-
diff --git a/ports/espressif/boards/microdev_micro_c3/sdkconfig b/ports/espressif/boards/microdev_micro_c3/sdkconfig
index 6674dbfb90..f6f038a77c 100644
--- a/ports/espressif/boards/microdev_micro_c3/sdkconfig
+++ b/ports/espressif/boards/microdev_micro_c3/sdkconfig
@@ -1,70 +1,5 @@
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=0
-# end of Bootloader config
-
-#
-# Serial flasher config
-#
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# end of Serial flasher config
-
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-# end of Partition Table
-
-#
-# Compiler options
-#
-# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-#
-
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
-CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
-# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
-# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
-# end of ESP System Settings
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="MicroDev-microC3"
 # end of LWIP
-
-#
-# SPI Flash driver
-#
-# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
-# end of SPI Flash driver
-
-# end of Component config
-
-#
-# Deprecated options for backward compatibility
-#
-# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=0
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-# end of Deprecated options for backward compatibility

From df0150ff0ea533ccabd3c2a33bd95a2dea8a8268 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 21 Nov 2022 15:15:26 -0500
Subject: [PATCH 1415/2403] Add common settings to sdkconfig-esp32c3.defaults

---
 .../esp-idf-config/sdkconfig-esp32c3.defaults          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
index 5b5df1837c..5fdb766add 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
@@ -80,6 +80,12 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
 
 # end of Hardware Settings
 
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # ESP System Settings
 #
@@ -97,8 +103,12 @@ CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=512
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
+
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
 # end of ESP System Settings
 
+
 #
 # Wi-Fi
 #

From b40facd0b42ecfaffc5f9fb084a49b050a3bf6a2 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 22 Nov 2022 01:00:34 +0200
Subject: [PATCH 1416/2403] Error msg changes

---
 locale/circuitpython.pot                  | 20 ++++++++++++--------
 ports/raspberrypi/common-hal/wifi/Radio.c | 10 +++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index c91b425ef5..2af9257feb 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -478,18 +478,10 @@ msgstr ""
 msgid "Already advertising."
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c
-msgid "Already connected to station."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/canio/Listener.c
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c
-msgid "Already in access point mode."
-msgstr ""
-
 #: ports/espressif/common-hal/coproc/__init__.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -2363,6 +2355,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index a3a8f8ec12..55b9fc7b95 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -134,7 +134,7 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, u
         mp_raise_RuntimeError(translate("Already scanning for wifi networks"));
     }
     if (!common_hal_wifi_radio_get_enabled(self)) {
-        mp_raise_RuntimeError(translate("wifi is not enabled"));
+        mp_raise_RuntimeError(translate("Wifi is not enabled"));
     }
     wifi_scannednetworks_obj_t *scan = m_new_obj(wifi_scannednetworks_obj_t);
     scan->base.type = &wifi_scannednetworks_type;
@@ -165,11 +165,11 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
 
 void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
-        mp_raise_RuntimeError(translate("wifi is not enabled"));
+        mp_raise_RuntimeError(translate("Wifi is not enabled"));
     }
 
     if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_DOWN) {
-        mp_raise_RuntimeError(translate("Already connected to station."));
+        mp_raise_RuntimeError(translate("Wifi is in station mode."));
     }
 
     common_hal_wifi_radio_stop_ap(self);
@@ -206,11 +206,11 @@ void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
-        mp_raise_RuntimeError(translate("wifi is not enabled"));
+        mp_raise_RuntimeError(translate("Wifi is not enabled"));
     }
 
     if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) != CYW43_LINK_DOWN) {
-        mp_raise_RuntimeError(translate("Already in access point mode."));
+        mp_raise_RuntimeError(translate("Wifi is in access point mode."));
     }
 
 

From c3a96a63c03ab54451437a8e289789cdf62d2dda Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 18 Nov 2022 11:21:02 -0800
Subject: [PATCH 1417/2403] Enable* web workflow for Pico W

* Except for circuitpython.local which depends on MDNS and will be
done in a follow up PR.

Progress on #7214
---
 ports/atmel-samd/Makefile                     |   1 -
 ports/atmel-samd/fatfs_port.c                 |  48 -----
 ports/broadcom/Makefile                       |   1 -
 ports/broadcom/fatfs_port.c                   |  48 -----
 ports/cxd56/Makefile                          |   1 -
 ports/cxd56/fatfs_port.c                      |  46 -----
 ports/espressif/Makefile                      |   1 -
 .../espressif/common-hal/socketpool/Socket.c  |  41 +++-
 ports/espressif/fatfs_port.c                  |  51 -----
 ports/litex/Makefile                          |   1 -
 ports/litex/fatfs_port.c                      |  33 ----
 ports/mimxrt10xx/Makefile                     |   1 -
 ports/mimxrt10xx/fatfs_port.c                 |  48 -----
 ports/nrf/Makefile                            |   1 -
 ports/raspberrypi/Makefile                    |   7 +-
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   2 +-
 .../common-hal/socketpool/Socket.c            | 179 ++++++++++++------
 ports/raspberrypi/common-hal/wifi/Radio.c     |  14 +-
 ports/raspberrypi/common-hal/wifi/Radio.h     |   1 +
 ports/raspberrypi/fatfs_port.c                |  48 -----
 ports/stm/Makefile                            |   1 -
 ports/stm/fatfs_port.c                        |  33 ----
 shared-bindings/socketpool/Socket.c           |  58 +++---
 shared-bindings/socketpool/Socket.h           |  11 +-
 shared-bindings/socketpool/SocketPool.c       |  24 ++-
 shared-bindings/socketpool/SocketPool.h       |  18 +-
 supervisor/{fatfs_port.h => fatfs.h}          |   6 +-
 supervisor/shared/bluetooth/file_transfer.c   |   2 +-
 .../fatfs_port.c => supervisor/shared/fatfs.c |   5 +-
 supervisor/shared/web_workflow/web_workflow.c | 148 +++++++--------
 supervisor/shared/web_workflow/websocket.c    |  22 +--
 supervisor/supervisor.mk                      |   1 +
 32 files changed, 333 insertions(+), 569 deletions(-)
 delete mode 100644 ports/atmel-samd/fatfs_port.c
 delete mode 100644 ports/broadcom/fatfs_port.c
 delete mode 100644 ports/cxd56/fatfs_port.c
 delete mode 100644 ports/espressif/fatfs_port.c
 delete mode 100644 ports/litex/fatfs_port.c
 delete mode 100644 ports/mimxrt10xx/fatfs_port.c
 delete mode 100644 ports/raspberrypi/fatfs_port.c
 delete mode 100644 ports/stm/fatfs_port.c
 rename supervisor/{fatfs_port.h => fatfs.h} (89%)
 rename ports/nrf/fatfs_port.c => supervisor/shared/fatfs.c (94%)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 4405766d00..5ddeb07c97 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -322,7 +322,6 @@ SRC_C += \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	eic_handler.c \
-	fatfs_port.c \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	mphalport.c \
 	reset.c \
diff --git a/ports/atmel-samd/fatfs_port.c b/ports/atmel-samd/fatfs_port.c
deleted file mode 100644
index 58a0ef0d72..0000000000
--- a/ports/atmel-samd/fatfs_port.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
-#include "shared/timeutils/timeutils.h"
-
-#if CIRCUITPY_RTC
-#include "shared-bindings/rtc/RTC.h"
-#endif
-
-DWORD get_fattime(void) {
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-
-
-}
diff --git a/ports/broadcom/Makefile b/ports/broadcom/Makefile
index 757e7f3450..1786d1d189 100644
--- a/ports/broadcom/Makefile
+++ b/ports/broadcom/Makefile
@@ -65,7 +65,6 @@ SRC_C += bindings/videocore/__init__.c \
 	     boards/$(BOARD)/pins.c \
 	     background.c \
 	     common-hal/videocore/Framebuffer.c \
-	     fatfs_port.c \
 		 mphalport.c \
 		 lib/sdmmc/sdmmc_cmd.c \
 		 lib/sdmmc/sdmmc_common.c \
diff --git a/ports/broadcom/fatfs_port.c b/ports/broadcom/fatfs_port.c
deleted file mode 100644
index 58a0ef0d72..0000000000
--- a/ports/broadcom/fatfs_port.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
-#include "shared/timeutils/timeutils.h"
-
-#if CIRCUITPY_RTC
-#include "shared-bindings/rtc/RTC.h"
-#endif
-
-DWORD get_fattime(void) {
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-
-
-}
diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile
index 073d2d59ce..3317b90280 100644
--- a/ports/cxd56/Makefile
+++ b/ports/cxd56/Makefile
@@ -172,7 +172,6 @@ SRC_S = supervisor/cpu.s
 
 SRC_C += \
 	background.c \
-	fatfs_port.c \
 	mphalport.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
diff --git a/ports/cxd56/fatfs_port.c b/ports/cxd56/fatfs_port.c
deleted file mode 100644
index e672b095b7..0000000000
--- a/ports/cxd56/fatfs_port.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright 2019 Sony Semiconductor Solutions Corporation
- *
- * 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 "py/runtime.h"
-#include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
-#include "shared/timeutils/timeutils.h"
-
-#if CIRCUITPY_RTC
-#include "shared-bindings/rtc/RTC.h"
-#endif
-
-DWORD get_fattime(void) {
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-}
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 30c35f9caf..4e2ada4317 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -250,7 +250,6 @@ endif
 
 SRC_C += \
 	background.c \
-	fatfs_port.c \
 	mphalport.c \
 	bindings/espidf/__init__.c \
 	boards/$(BOARD)/board.c \
diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index ce177f3821..5f34d674b2 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -240,7 +240,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
     return sock;
 }
 
-int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
+int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port, socketpool_socket_obj_t *accepted) {
     struct sockaddr_in accept_addr;
     socklen_t socklen = sizeof(accept_addr);
     int newsoc = -1;
@@ -274,12 +274,25 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
         lwip_close(newsoc);
         return -MP_EBADF;
     }
+
+
+    if (accepted != NULL) {
+        // Close the active socket because we have another we accepted.
+        if (!common_hal_socketpool_socket_get_closed(accepted)) {
+            common_hal_socketpool_socket_close(accepted);
+        }
+        // Create the socket
+        accepted->num = newsoc;
+        accepted->pool = self->pool;
+        accepted->connected = true;
+    }
+
     return newsoc;
 }
 
 socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
     uint8_t *ip, uint32_t *port) {
-    int newsoc = socketpool_socket_accept(self, ip, port);
+    int newsoc = socketpool_socket_accept(self, ip, port, NULL);
 
     if (newsoc > 0) {
         mark_user_socket(newsoc);
@@ -554,6 +567,15 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint
     self->timeout_ms = timeout_ms;
 }
 
+
+int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen) {
+    int err = lwip_setsockopt(self->num, level, optname, value, optlen);
+    if (err != 0) {
+        return -errno;
+    }
+    return 0;
+}
+
 bool common_hal_socketpool_readable(socketpool_socket_obj_t *self) {
     struct timeval immediate = {0, 0};
 
@@ -577,3 +599,18 @@ bool common_hal_socketpool_writable(socketpool_socket_obj_t *self) {
     // including returning true in the error case
     return num_triggered != 0;
 }
+
+void socketpool_socket_move(socketpool_socket_obj_t *self, socketpool_socket_obj_t *sock) {
+    *sock = *self;
+    self->connected = false;
+    self->num = -1;
+}
+
+void socketpool_socket_reset(socketpool_socket_obj_t *self) {
+    if (self->base.type == &socketpool_socket_type) {
+        return;
+    }
+    self->base.type = &socketpool_socket_type;
+    self->connected = false;
+    self->num = -1;
+}
diff --git a/ports/espressif/fatfs_port.c b/ports/espressif/fatfs_port.c
deleted file mode 100644
index 38c2d923b8..0000000000
--- a/ports/espressif/fatfs_port.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"
-#include "shared/timeutils/timeutils.h"
-#include "shared-bindings/rtc/RTC.h"
-#include "shared-bindings/time/__init__.h"
-#include "supervisor/fatfs_port.h"
-
-DWORD _time_override = 0;
-DWORD get_fattime(void) {
-    if (_time_override > 0) {
-        return _time_override;
-    }
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-}
-
-void override_fattime(DWORD time) {
-    _time_override = time;
-}
diff --git a/ports/litex/Makefile b/ports/litex/Makefile
index 6b1e33c8d1..9e59c1a2fa 100644
--- a/ports/litex/Makefile
+++ b/ports/litex/Makefile
@@ -117,7 +117,6 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_VALENTYUSB_EPTRI -DCFG_TUD_CDC_RX_BUFSIZE=1024
 
 SRC_C += \
 	background.c \
-	fatfs_port.c \
 	mphalport.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c
diff --git a/ports/litex/fatfs_port.c b/ports/litex/fatfs_port.c
deleted file mode 100644
index 631f7f0982..0000000000
--- a/ports/litex/fatfs_port.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"
-
-DWORD get_fattime(void) {
-    // TODO: Implement this function. For now, fake it.
-    return ((2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2);
-}
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index 4b05c91714..291871f275 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -150,7 +150,6 @@ SRC_C += \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/flash_config.c \
 	boards/$(BOARD)/pins.c \
-	fatfs_port.c \
 	lib/tinyusb/src/portable/chipidea/ci_hs/dcd_ci_hs.c \
 	mphalport.c \
 	peripherals/mimxrt10xx/$(CHIP_FAMILY)/clocks.c \
diff --git a/ports/mimxrt10xx/fatfs_port.c b/ports/mimxrt10xx/fatfs_port.c
deleted file mode 100644
index 58a0ef0d72..0000000000
--- a/ports/mimxrt10xx/fatfs_port.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
-#include "shared/timeutils/timeutils.h"
-
-#if CIRCUITPY_RTC
-#include "shared-bindings/rtc/RTC.h"
-#endif
-
-DWORD get_fattime(void) {
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-
-
-}
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index bbe102ffc8..c792223a0b 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -165,7 +165,6 @@ endif
 
 SRC_C += \
 	background.c \
-	fatfs_port.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index cb4c80a23d..9b9ae92322 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -211,13 +211,15 @@ CFLAGS += \
 	-msoft-float \
 	-mfloat-abi=soft
 
-PICO_LDFLAGS = --specs=nosys.specs -Wl,--wrap=__aeabi_ldiv0 -Wl,--wrap=__aeabi_idiv0 -Wl,--wrap=__aeabi_lmul -Wl,--wrap=__clzsi2 -Wl,--wrap=__clzdi2 -Wl,--wrap=__ctzsi2 -Wl,--wrap=__ctzdi2 -Wl,--wrap=__popcountsi2 -Wl,--wrap=__popcountdi2 -Wl,--wrap=__clz -Wl,--wrap=__clzl -Wl,--wrap=__clzll -Wl,--wrap=__aeabi_idiv -Wl,--wrap=__aeabi_idivmod -Wl,--wrap=__aeabi_ldivmod -Wl,--wrap=__aeabi_uidiv -Wl,--wrap=__aeabi_uidivmod -Wl,--wrap=__aeabi_uldivmod -Wl,--wrap=__aeabi_dadd -Wl,--wrap=__aeabi_ddiv -Wl,--wrap=__aeabi_dmul -Wl,--wrap=__aeabi_drsub -Wl,--wrap=__aeabi_dsub -Wl,--wrap=__aeabi_cdcmpeq -Wl,--wrap=__aeabi_cdrcmple -Wl,--wrap=__aeabi_cdcmple -Wl,--wrap=__aeabi_dcmpeq -Wl,--wrap=__aeabi_dcmplt -Wl,--wrap=__aeabi_dcmple -Wl,--wrap=__aeabi_dcmpge -Wl,--wrap=__aeabi_dcmpgt -Wl,--wrap=__aeabi_dcmpun -Wl,--wrap=__aeabi_i2d -Wl,--wrap=__aeabi_l2d -Wl,--wrap=__aeabi_ui2d -Wl,--wrap=__aeabi_ul2d -Wl,--wrap=__aeabi_d2iz -Wl,--wrap=__aeabi_d2lz -Wl,--wrap=__aeabi_d2uiz -Wl,--wrap=__aeabi_d2ulz -Wl,--wrap=__aeabi_d2f -Wl,--wrap=sqrt -Wl,--wrap=cos -Wl,--wrap=sin -Wl,--wrap=tan -Wl,--wrap=atan2 -Wl,--wrap=exp -Wl,--wrap=log -Wl,--wrap=ldexp -Wl,--wrap=copysign -Wl,--wrap=trunc -Wl,--wrap=floor -Wl,--wrap=ceil -Wl,--wrap=round -Wl,--wrap=sincos -Wl,--wrap=asin -Wl,--wrap=acos -Wl,--wrap=atan -Wl,--wrap=sinh -Wl,--wrap=cosh -Wl,--wrap=tanh -Wl,--wrap=asinh -Wl,--wrap=acosh -Wl,--wrap=atanh -Wl,--wrap=exp2 -Wl,--wrap=log2 -Wl,--wrap=exp10 -Wl,--wrap=log10 -Wl,--wrap=pow -Wl,--wrap=powint -Wl,--wrap=hypot -Wl,--wrap=cbrt -Wl,--wrap=fmod -Wl,--wrap=drem -Wl,--wrap=remainder -Wl,--wrap=remquo -Wl,--wrap=expm1 -Wl,--wrap=log1p -Wl,--wrap=fma -Wl,--wrap=__aeabi_fadd -Wl,--wrap=__aeabi_fdiv -Wl,--wrap=__aeabi_fmul -Wl,--wrap=__aeabi_frsub -Wl,--wrap=__aeabi_fsub -Wl,--wrap=__aeabi_cfcmpeq -Wl,--wrap=__aeabi_cfrcmple -Wl,--wrap=__aeabi_cfcmple -Wl,--wrap=__aeabi_fcmpeq -Wl,--wrap=__aeabi_fcmplt -Wl,--wrap=__aeabi_fcmple -Wl,--wrap=__aeabi_fcmpge -Wl,--wrap=__aeabi_fcmpgt -Wl,--wrap=__aeabi_fcmpun -Wl,--wrap=__aeabi_i2f -Wl,--wrap=__aeabi_l2f -Wl,--wrap=__aeabi_ui2f -Wl,--wrap=__aeabi_ul2f -Wl,--wrap=__aeabi_f2iz -Wl,--wrap=__aeabi_f2lz -Wl,--wrap=__aeabi_f2uiz -Wl,--wrap=__aeabi_f2ulz -Wl,--wrap=__aeabi_f2d -Wl,--wrap=sqrtf -Wl,--wrap=cosf -Wl,--wrap=sinf -Wl,--wrap=tanf -Wl,--wrap=atan2f -Wl,--wrap=expf -Wl,--wrap=logf -Wl,--wrap=ldexpf -Wl,--wrap=copysignf -Wl,--wrap=truncf -Wl,--wrap=floorf -Wl,--wrap=ceilf -Wl,--wrap=roundf -Wl,--wrap=sincosf -Wl,--wrap=asinf -Wl,--wrap=acosf -Wl,--wrap=atanf -Wl,--wrap=sinhf -Wl,--wrap=coshf -Wl,--wrap=tanhf -Wl,--wrap=asinhf -Wl,--wrap=acoshf -Wl,--wrap=atanhf -Wl,--wrap=exp2f -Wl,--wrap=log2f -Wl,--wrap=exp10f -Wl,--wrap=log10f -Wl,--wrap=powf -Wl,--wrap=powintf -Wl,--wrap=hypotf -Wl,--wrap=cbrtf -Wl,--wrap=fmodf -Wl,--wrap=dremf -Wl,--wrap=remainderf -Wl,--wrap=remquof -Wl,--wrap=expm1f -Wl,--wrap=log1pf -Wl,--wrap=fmaf -Wl,--wrap=memcpy -Wl,--wrap=memset -Wl,--wrap=__aeabi_memcpy -Wl,--wrap=__aeabi_memset -Wl,--wrap=__aeabi_memcpy4 -Wl,--wrap=__aeabi_memset4 -Wl,--wrap=__aeabi_memcpy8 -Wl,--wrap=__aeabi_memset8
+PICO_LDFLAGS = --specs=nosys.specs --specs=nano.specs -Wl,--wrap=__aeabi_ldiv0 -Wl,--wrap=__aeabi_idiv0 -Wl,--wrap=__aeabi_lmul -Wl,--wrap=__clzsi2 -Wl,--wrap=__clzdi2 -Wl,--wrap=__ctzsi2 -Wl,--wrap=__ctzdi2 -Wl,--wrap=__popcountsi2 -Wl,--wrap=__popcountdi2 -Wl,--wrap=__clz -Wl,--wrap=__clzl -Wl,--wrap=__clzll -Wl,--wrap=__aeabi_idiv -Wl,--wrap=__aeabi_idivmod -Wl,--wrap=__aeabi_ldivmod -Wl,--wrap=__aeabi_uidiv -Wl,--wrap=__aeabi_uidivmod -Wl,--wrap=__aeabi_uldivmod -Wl,--wrap=__aeabi_dadd -Wl,--wrap=__aeabi_ddiv -Wl,--wrap=__aeabi_dmul -Wl,--wrap=__aeabi_drsub -Wl,--wrap=__aeabi_dsub -Wl,--wrap=__aeabi_cdcmpeq -Wl,--wrap=__aeabi_cdrcmple -Wl,--wrap=__aeabi_cdcmple -Wl,--wrap=__aeabi_dcmpeq -Wl,--wrap=__aeabi_dcmplt -Wl,--wrap=__aeabi_dcmple -Wl,--wrap=__aeabi_dcmpge -Wl,--wrap=__aeabi_dcmpgt -Wl,--wrap=__aeabi_dcmpun -Wl,--wrap=__aeabi_i2d -Wl,--wrap=__aeabi_l2d -Wl,--wrap=__aeabi_ui2d -Wl,--wrap=__aeabi_ul2d -Wl,--wrap=__aeabi_d2iz -Wl,--wrap=__aeabi_d2lz -Wl,--wrap=__aeabi_d2uiz -Wl,--wrap=__aeabi_d2ulz -Wl,--wrap=__aeabi_d2f -Wl,--wrap=sqrt -Wl,--wrap=cos -Wl,--wrap=sin -Wl,--wrap=tan -Wl,--wrap=atan2 -Wl,--wrap=exp -Wl,--wrap=log -Wl,--wrap=ldexp -Wl,--wrap=copysign -Wl,--wrap=trunc -Wl,--wrap=floor -Wl,--wrap=ceil -Wl,--wrap=round -Wl,--wrap=sincos -Wl,--wrap=asin -Wl,--wrap=acos -Wl,--wrap=atan -Wl,--wrap=sinh -Wl,--wrap=cosh -Wl,--wrap=tanh -Wl,--wrap=asinh -Wl,--wrap=acosh -Wl,--wrap=atanh -Wl,--wrap=exp2 -Wl,--wrap=log2 -Wl,--wrap=exp10 -Wl,--wrap=log10 -Wl,--wrap=pow -Wl,--wrap=powint -Wl,--wrap=hypot -Wl,--wrap=cbrt -Wl,--wrap=fmod -Wl,--wrap=drem -Wl,--wrap=remainder -Wl,--wrap=remquo -Wl,--wrap=expm1 -Wl,--wrap=log1p -Wl,--wrap=fma -Wl,--wrap=__aeabi_fadd -Wl,--wrap=__aeabi_fdiv -Wl,--wrap=__aeabi_fmul -Wl,--wrap=__aeabi_frsub -Wl,--wrap=__aeabi_fsub -Wl,--wrap=__aeabi_cfcmpeq -Wl,--wrap=__aeabi_cfrcmple -Wl,--wrap=__aeabi_cfcmple -Wl,--wrap=__aeabi_fcmpeq -Wl,--wrap=__aeabi_fcmplt -Wl,--wrap=__aeabi_fcmple -Wl,--wrap=__aeabi_fcmpge -Wl,--wrap=__aeabi_fcmpgt -Wl,--wrap=__aeabi_fcmpun -Wl,--wrap=__aeabi_i2f -Wl,--wrap=__aeabi_l2f -Wl,--wrap=__aeabi_ui2f -Wl,--wrap=__aeabi_ul2f -Wl,--wrap=__aeabi_f2iz -Wl,--wrap=__aeabi_f2lz -Wl,--wrap=__aeabi_f2uiz -Wl,--wrap=__aeabi_f2ulz -Wl,--wrap=__aeabi_f2d -Wl,--wrap=sqrtf -Wl,--wrap=cosf -Wl,--wrap=sinf -Wl,--wrap=tanf -Wl,--wrap=atan2f -Wl,--wrap=expf -Wl,--wrap=logf -Wl,--wrap=ldexpf -Wl,--wrap=copysignf -Wl,--wrap=truncf -Wl,--wrap=floorf -Wl,--wrap=ceilf -Wl,--wrap=roundf -Wl,--wrap=sincosf -Wl,--wrap=asinf -Wl,--wrap=acosf -Wl,--wrap=atanf -Wl,--wrap=sinhf -Wl,--wrap=coshf -Wl,--wrap=tanhf -Wl,--wrap=asinhf -Wl,--wrap=acoshf -Wl,--wrap=atanhf -Wl,--wrap=exp2f -Wl,--wrap=log2f -Wl,--wrap=exp10f -Wl,--wrap=log10f -Wl,--wrap=powf -Wl,--wrap=powintf -Wl,--wrap=hypotf -Wl,--wrap=cbrtf -Wl,--wrap=fmodf -Wl,--wrap=dremf -Wl,--wrap=remainderf -Wl,--wrap=remquof -Wl,--wrap=expm1f -Wl,--wrap=log1pf -Wl,--wrap=fmaf -Wl,--wrap=memcpy -Wl,--wrap=memset -Wl,--wrap=__aeabi_memcpy -Wl,--wrap=__aeabi_memset -Wl,--wrap=__aeabi_memcpy4 -Wl,--wrap=__aeabi_memset4 -Wl,--wrap=__aeabi_memcpy8 -Wl,--wrap=__aeabi_memset8
 
 # Use toolchain libm if we're not using our own.
 ifndef INTERNAL_LIBM
 LIBS += -lm
 endif
 
+LIBS += -lc
+
 SRC_SDK := \
 	src/common/pico_sync/critical_section.c \
 	src/common/pico_sync/lock_core.c \
@@ -270,7 +272,6 @@ SRC_C += \
 	background.c \
 	peripherals/pins.c \
 	lib/crypto-algorithms/sha256.c \
-	fatfs_port.c \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/dcd_rp2040.c \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/rp2040_usb.c \
 	mphalport.c \
@@ -441,7 +442,7 @@ $(BUILD)/firmware.elf: $(OBJ) $(LINK_LD)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)echo $(PICO_LDFLAGS) > $(BUILD)/firmware.ldflags
-	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,$(LINK_LD) -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs
+	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,$(LINK_LD) -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs -Wl,-lc
 	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LINK_LD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index 9773755649..f36fdd6ec7 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -14,7 +14,7 @@ CIRCUITPY_CYW43 = 1
 CIRCUITPY_SSL = 1
 CIRCUITPY_SSL_MBEDTLS = 1
 CIRCUITPY_HASHLIB = 1
-CIRCUITPY_WEB_WORKFLOW = 0
+CIRCUITPY_WEB_WORKFLOW = 1
 CIRCUITPY_MDNS = 0
 CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index 440fe56d42..be3f2cd087 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -166,6 +166,7 @@ static inline void exec_user_callback(socketpool_socket_obj_t *socket) {
         mp_sched_schedule(socket->callback, MP_OBJ_FROM_PTR(socket));
     }
     #endif
+    supervisor_workflow_request_background();
 }
 
 #if MICROPY_PY_LWIP_SOCK_RAW
@@ -745,57 +746,47 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
     return socket;
 }
 
-int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
-    return -MP_EBADF;
-}
-
-socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *socket,
-    uint8_t *ip, uint32_t *port) {
-    if (socket->type != MOD_NETWORK_SOCK_STREAM) {
-        mp_raise_OSError(MP_EOPNOTSUPP);
+int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port, socketpool_socket_obj_t *accepted) {
+    if (self->type != MOD_NETWORK_SOCK_STREAM) {
+        return -MP_EOPNOTSUPP;
     }
 
-    // Create new socket object, do it here because we must not raise an out-of-memory
-    // exception when the LWIP concurrency lock is held
-    socketpool_socket_obj_t *socket2 = m_new_ll_obj_with_finaliser(socketpool_socket_obj_t);
-    socket2->base.type = &socketpool_socket_type;
+    if (common_hal_socketpool_socket_get_closed(self)) {
+        return -MP_EBADF;
+    }
 
     MICROPY_PY_LWIP_ENTER
 
-    if (socket->pcb.tcp == NULL) {
+    if (self->pcb.tcp == NULL) {
         MICROPY_PY_LWIP_EXIT
-        m_del_obj(socketpool_socket_obj_t, socket2);
-        mp_raise_OSError(MP_EBADF);
+        return -MP_EBADF;
     }
 
     // I need to do this because "tcp_accepted", later, is a macro.
-    struct tcp_pcb *listener = socket->pcb.tcp;
+    struct tcp_pcb *listener = self->pcb.tcp;
     if (listener->state != LISTEN) {
         MICROPY_PY_LWIP_EXIT
-        m_del_obj(socketpool_socket_obj_t, socket2);
-        mp_raise_OSError(MP_EINVAL);
+        return -MP_EINVAL;
     }
 
     // accept incoming connection
-    struct tcp_pcb *volatile *incoming_connection = &lwip_socket_incoming_array(socket)[socket->incoming.connection.iget];
+    struct tcp_pcb *volatile *incoming_connection = &lwip_socket_incoming_array(self)[self->incoming.connection.iget];
     if (*incoming_connection == NULL) {
-        if (socket->timeout == 0) {
+        if (self->timeout == 0) {
             MICROPY_PY_LWIP_EXIT
-            m_del_obj(socketpool_socket_obj_t, socket2);
-            mp_raise_OSError(MP_EAGAIN);
-        } else if (socket->timeout != (unsigned)-1) {
-            mp_uint_t retries = socket->timeout / 100;
-            while (*incoming_connection == NULL) {
+            return -MP_EAGAIN;
+        } else if (self->timeout != (unsigned)-1) {
+            mp_uint_t retries = self->timeout / 100;
+            while (*incoming_connection == NULL && !mp_hal_is_interrupted()) {
                 MICROPY_PY_LWIP_EXIT
                 if (retries-- == 0) {
-                    m_del_obj(socketpool_socket_obj_t, socket2);
-                    mp_raise_OSError(MP_ETIMEDOUT);
+                    return -MP_ETIMEDOUT;
                 }
                 mp_hal_delay_ms(100);
                 MICROPY_PY_LWIP_REENTER
             }
         } else {
-            while (*incoming_connection == NULL) {
+            while (*incoming_connection == NULL && !mp_hal_is_interrupted()) {
                 MICROPY_PY_LWIP_EXIT
                 poll_sockets();
                 MICROPY_PY_LWIP_REENTER
@@ -803,43 +794,75 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
         }
     }
 
+    if (*incoming_connection == NULL) {
+        // We were interrupted.
+        return 0;
+    }
+
+    // Close the accepted socket because we have another we accepted.
+    if (!common_hal_socketpool_socket_get_closed(accepted)) {
+        common_hal_socketpool_socket_close(accepted);
+    }
+
     // We get a new pcb handle...
-    socket2->pcb.tcp = *incoming_connection;
-    if (++socket->incoming.connection.iget >= socket->incoming.connection.alloc) {
-        socket->incoming.connection.iget = 0;
+    accepted->pcb.tcp = *incoming_connection;
+    if (++self->incoming.connection.iget >= self->incoming.connection.alloc) {
+        self->incoming.connection.iget = 0;
     }
     *incoming_connection = NULL;
 
     // ...and set up the new socket for it.
-    socket2->domain = MOD_NETWORK_AF_INET;
-    socket2->type = MOD_NETWORK_SOCK_STREAM;
-    socket2->incoming.pbuf = NULL;
-    socket2->timeout = socket->timeout;
-    socket2->state = STATE_CONNECTED;
-    socket2->recv_offset = 0;
-    socket2->callback = MP_OBJ_NULL;
-    tcp_arg(socket2->pcb.tcp, (void *)socket2);
-    tcp_err(socket2->pcb.tcp, _lwip_tcp_error);
-    tcp_recv(socket2->pcb.tcp, _lwip_tcp_recv);
+    accepted->domain = MOD_NETWORK_AF_INET;
+    accepted->type = MOD_NETWORK_SOCK_STREAM;
+    accepted->incoming.pbuf = NULL;
+    accepted->timeout = self->timeout;
+    accepted->state = STATE_CONNECTED;
+    accepted->recv_offset = 0;
+    accepted->callback = MP_OBJ_NULL;
+    tcp_arg(accepted->pcb.tcp, (void *)accepted);
+    tcp_err(accepted->pcb.tcp, _lwip_tcp_error);
+    tcp_recv(accepted->pcb.tcp, _lwip_tcp_recv);
 
     tcp_accepted(listener);
 
     MICROPY_PY_LWIP_EXIT
 
+    // output values
+    memcpy(ip, &(accepted->pcb.tcp->remote_ip), NETUTILS_IPV4ADDR_BUFSIZE);
+    *port = (mp_uint_t)accepted->pcb.tcp->remote_port;
+
+    return 1;
+}
+
+socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *socket,
+    uint8_t *ip, uint32_t *port) {
+    // Create new socket object, do it here because we must not raise an out-of-memory
+    // exception when the LWIP concurrency lock is held
+    socketpool_socket_obj_t *accepted = m_new_ll_obj_with_finaliser(socketpool_socket_obj_t);
+    socketpool_socket_reset(accepted);
+
+    int ret = socketpool_socket_accept(socket, ip, port, accepted);
+
+    if (ret <= 0) {
+        m_del_obj(socketpool_socket_obj_t, accepted);
+        if (ret == 0) {
+            // Interrupted.
+            return mp_const_none;
+        }
+        mp_raise_OSError(-ret);
+    }
+
     DEBUG_printf("registering socket in socketpool_socket_accept()\n");
-    if (!register_open_socket(socket2)) {
+    if (!register_open_socket(accepted)) {
         DEBUG_printf("collecting garbage to open socket\n");
         gc_collect();
-        if (!register_open_socket(socket2)) {
+        if (!register_open_socket(accepted)) {
             mp_raise_RuntimeError(translate("Out of sockets"));
         }
     }
-    mark_user_socket(socket2);
+    mark_user_socket(accepted);
 
-    // output values
-    memcpy(ip, &(socket2->pcb.tcp->remote_ip), NETUTILS_IPV4ADDR_BUFSIZE);
-    *port = (mp_uint_t)socket2->pcb.tcp->remote_port;
-    return MP_OBJ_FROM_PTR(socket2);
+    return MP_OBJ_FROM_PTR(accepted);
 }
 
 bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
@@ -847,21 +870,26 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
 
     // get address
     ip_addr_t bind_addr;
-    int error = socketpool_resolve_host(socket->pool, host, &bind_addr);
-    if (error != 0) {
-        mp_raise_OSError(EHOSTUNREACH);
-    }
+    const ip_addr_t *bind_addr_ptr = &bind_addr;
+    if (hostlen > 0) {
+        int error = socketpool_resolve_host(socket->pool, host, &bind_addr);
+        if (error != 0) {
+            mp_raise_OSError(EHOSTUNREACH);
+        }
 
+    } else {
+        bind_addr_ptr = IP_ANY_TYPE;
+    }
     ip_set_option(socket->pcb.ip, SOF_REUSEADDR);
 
     err_t err = ERR_ARG;
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM: {
-            err = tcp_bind(socket->pcb.tcp, &bind_addr, port);
+            err = tcp_bind(socket->pcb.tcp, bind_addr_ptr, port);
             break;
         }
         case MOD_NETWORK_SOCK_DGRAM: {
-            err = udp_bind(socket->pcb.udp, &bind_addr, port);
+            err = udp_bind(socket->pcb.udp, bind_addr_ptr, port);
             break;
         }
     }
@@ -1164,6 +1192,20 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint
     self->timeout = timeout_ms;
 }
 
+int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen) {
+    if (level == SOCKETPOOL_IPPROTO_TCP && optname == SOCKETPOOL_TCP_NODELAY) {
+        int one = 1;
+        bool enable = optlen == sizeof(&one) && memcmp(value, &one, optlen);
+        if (enable) {
+            tcp_set_flags(self->pcb.tcp, TF_NODELAY);
+        } else {
+            tcp_clear_flags(self->pcb.tcp, TF_NODELAY);
+        }
+        return 0;
+    }
+    return -MP_EOPNOTSUPP;
+}
+
 bool common_hal_socketpool_readable(socketpool_socket_obj_t *self) {
 
     MICROPY_PY_LWIP_ENTER;
@@ -1206,3 +1248,32 @@ bool common_hal_socketpool_writable(socketpool_socket_obj_t *self) {
 
     return result;
 }
+
+void socketpool_socket_move(socketpool_socket_obj_t *self, socketpool_socket_obj_t *sock) {
+    *sock = *self;
+    self->state = _ERR_BADF;
+
+    // Reregister the callbacks with the new socket copy.
+    MICROPY_PY_LWIP_ENTER;
+
+    tcp_arg(self->pcb.tcp, NULL);
+    tcp_err(self->pcb.tcp, NULL);
+    tcp_recv(self->pcb.tcp, NULL);
+
+    self->pcb.tcp = NULL;
+
+    tcp_arg(sock->pcb.tcp, (void *)sock);
+    tcp_err(sock->pcb.tcp, _lwip_tcp_error);
+    tcp_recv(sock->pcb.tcp, _lwip_tcp_recv);
+
+    MICROPY_PY_LWIP_EXIT;
+}
+
+void socketpool_socket_reset(socketpool_socket_obj_t *self) {
+    if (self->base.type == &socketpool_socket_type) {
+        return;
+    }
+    self->base.type = &socketpool_socket_type;
+    self->pcb.tcp = NULL;
+    self->state = _ERR_BADF;
+}
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 2a74c16e0a..cb3fc258af 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -73,13 +73,12 @@ NORETURN static void ro_attribute(int attr) {
 }
 
 bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self) {
-    return true;
+    return self->enabled;
 }
 
 void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
-    if (!enabled) {
-        ro_attribute(MP_QSTR_enabled);
-    }
+    self->enabled = enabled;
+    // TODO: Actually enable and disable the WiFi module at this point.
 }
 
 mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
@@ -242,6 +241,13 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_subnet_ap(wifi_radio_obj_t *self) {
     return common_hal_ipaddress_new_ipv4address(NETIF_AP->netmask.addr);
 }
 
+uint32_t wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
+        return 0;
+    }
+    return NETIF_STA->ip_addr.addr;
+}
+
 mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
     if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
         return mp_const_none;
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.h b/ports/raspberrypi/common-hal/wifi/Radio.h
index 0dc18c8957..b2e9df9e3a 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.h
+++ b/ports/raspberrypi/common-hal/wifi/Radio.h
@@ -35,6 +35,7 @@ typedef struct {
     mp_obj_base_t base;
     char hostname[254]; // hostname max is 253 chars, + 1 for trailing NUL
     wifi_scannednetworks_obj_t *current_scan;
+    bool enabled;
 } wifi_radio_obj_t;
 
 extern void common_hal_wifi_radio_gc_collect(wifi_radio_obj_t *self);
diff --git a/ports/raspberrypi/fatfs_port.c b/ports/raspberrypi/fatfs_port.c
deleted file mode 100644
index 58a0ef0d72..0000000000
--- a/ports/raspberrypi/fatfs_port.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
-#include "shared/timeutils/timeutils.h"
-
-#if CIRCUITPY_RTC
-#include "shared-bindings/rtc/RTC.h"
-#endif
-
-DWORD get_fattime(void) {
-    #if CIRCUITPY_RTC
-    timeutils_struct_time_t tm;
-    common_hal_rtc_get_time(&tm);
-    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
-           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
-    #else
-    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
-    #endif
-
-
-}
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index cd37a9bda0..b69f8370c5 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -221,7 +221,6 @@ SRC_STM32 += boards/system_stm32$(MCU_SERIES_LOWER)xx.c
 
 SRC_C += \
 	background.c \
-	fatfs_port.c \
 	mphalport.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
diff --git a/ports/stm/fatfs_port.c b/ports/stm/fatfs_port.c
deleted file mode 100644
index 631f7f0982..0000000000
--- a/ports/stm/fatfs_port.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: 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.
- */
-
-#include "py/runtime.h"
-#include "lib/oofatfs/ff.h"
-
-DWORD get_fattime(void) {
-    // TODO: Implement this function. For now, fake it.
-    return ((2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2);
-}
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 7a60463c4b..fbf78a4cdc 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -344,38 +344,36 @@ STATIC mp_obj_t socketpool_socket_setblocking(mp_obj_t self_in, mp_obj_t blockin
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_setblocking_obj, socketpool_socket_setblocking);
 
-// //|     def setsockopt(self, level: int, optname: int, value: int) -> None:
-// //|         """Sets socket options"""
-// //|         ...
-// //|
-// STATIC mp_obj_t socketpool_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
-//     // mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+//|     def setsockopt(self, level: int, optname: int, value: int) -> None:
+//|         """Sets socket options"""
+//|         ...
+STATIC mp_obj_t socketpool_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+    socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_int_t level = mp_obj_get_int(args[1]);
+    mp_int_t opt = mp_obj_get_int(args[2]);
 
-//     // mp_int_t level = mp_obj_get_int(args[1]);
-//     // mp_int_t opt = mp_obj_get_int(args[2]);
+    const void *optval;
+    mp_uint_t optlen;
+    mp_int_t val;
+    if (mp_obj_is_integer(args[3])) {
+        val = mp_obj_get_int_truncated(args[3]);
+        optval = &val;
+        optlen = sizeof(val);
+    } else {
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+        optval = bufinfo.buf;
+        optlen = bufinfo.len;
+    }
 
-//     // const void *optval;
-//     // mp_uint_t optlen;
-//     // mp_int_t val;
-//     // if (mp_obj_is_integer(args[3])) {
-//     //     val = mp_obj_get_int_truncated(args[3]);
-//     //     optval = &val;
-//     //     optlen = sizeof(val);
-//     // } else {
-//     //     mp_buffer_info_t bufinfo;
-//     //     mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
-//     //     optval = bufinfo.buf;
-//     //     optlen = bufinfo.len;
-//     // }
+    int _errno = common_hal_socketpool_socket_setsockopt(self, level, opt, optval, optlen);
+    if (_errno < 0) {
+        mp_raise_OSError(-_errno);
+    }
 
-//     // int _errno;
-//     // if (self->nic_type->setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
-//     //     mp_raise_OSError(_errno);
-//     // }
-
-//     return mp_const_none;
-// }
-// STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4, 4, socketpool_socket_setsockopt);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4, 4, socketpool_socket_setsockopt);
 
 
 //|     def settimeout(self, value: int) -> None:
@@ -417,7 +415,7 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_sendall), MP_ROM_PTR(&socketpool_socket_sendall_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socketpool_socket_setblocking_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socketpool_socket_setsockopt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socketpool_socket_setsockopt_obj) },
     { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socketpool_socket_settimeout_obj) },
 };
 
diff --git a/shared-bindings/socketpool/Socket.h b/shared-bindings/socketpool/Socket.h
index cf5a97a428..690c9f8363 100644
--- a/shared-bindings/socketpool/Socket.h
+++ b/shared-bindings/socketpool/Socket.h
@@ -46,13 +46,22 @@ mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t *self, const
 mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
     const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len);
 void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint32_t timeout_ms);
+int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen);
 bool common_hal_socketpool_readable(socketpool_socket_obj_t *self);
 bool common_hal_socketpool_writable(socketpool_socket_obj_t *self);
 
 // Non-allocating versions for internal use.
-int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port);
+int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port, socketpool_socket_obj_t *accepted);
 void socketpool_socket_close(socketpool_socket_obj_t *self);
 int socketpool_socket_send(socketpool_socket_obj_t *self, const uint8_t *buf, uint32_t len);
 int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
     const uint8_t *buf, uint32_t len);
+
+// Moves self to sock without closing the real socket. self will think its closed afterwards.
+void socketpool_socket_move(socketpool_socket_obj_t *self, socketpool_socket_obj_t *sock);
+
+// Resets the socket object state so it appears closed and disconnected. This only works on
+// uninitialized memory.
+void socketpool_socket_reset(socketpool_socket_obj_t *self);
+
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKET_H
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index e500784f1f..278288fa7e 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,7 +52,6 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
-
 STATIC mp_obj_t socketpool_socketpool_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);
 
@@ -65,12 +64,6 @@ STATIC mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t
     return MP_OBJ_FROM_PTR(s);
 }
 
-//|     AF_INET: int
-//|     AF_INET6: int
-//|     SOCK_STREAM: int
-//|     SOCK_DGRAM: int
-//|     SOCK_RAW: int
-//|
 //|     def socket(self, family: int = AF_INET, type: int = SOCK_STREAM) -> socketpool.Socket:
 //|         """Create a new socket
 //|
@@ -114,7 +107,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_socket_obj, 1, socketpool_socke
 //|         address information to call socket.socket() and socket.connect() with,
 //|         as a tuple."""
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_host, ARG_port, ARG_family, ARG_type, ARG_proto, ARG_flags };
     static const mp_arg_t allowed_args[] = {
@@ -164,12 +156,28 @@ STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&socketpool_socketpool_getaddrinfo_obj) },
 
     // class constants
+//|     AF_INET: int
     { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(SOCKETPOOL_AF_INET) },
+//|     AF_INET6: int
     { MP_ROM_QSTR(MP_QSTR_AF_INET6), MP_ROM_INT(SOCKETPOOL_AF_INET6) },
+//|
 
+//|     SOCK_STREAM: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_STREAM), MP_ROM_INT(SOCKETPOOL_SOCK_STREAM) },
+//|     SOCK_DGRAM: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_DGRAM), MP_ROM_INT(SOCKETPOOL_SOCK_DGRAM) },
+//|     SOCK_RAW: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_RAW), MP_ROM_INT(SOCKETPOOL_SOCK_RAW) },
+//|
+
+//|     TCP_NODELAY: int
+    { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(SOCKETPOOL_TCP_NODELAY) },
+//|
+
+//|     IPPROTO_TCP: int
+//|
+    { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(SOCKETPOOL_IPPROTO_TCP) },
+//|
 };
 
 STATIC MP_DEFINE_CONST_DICT(socketpool_socketpool_locals_dict, socketpool_socketpool_locals_dict_table);
diff --git a/shared-bindings/socketpool/SocketPool.h b/shared-bindings/socketpool/SocketPool.h
index 92382078e1..5a2d9f4337 100644
--- a/shared-bindings/socketpool/SocketPool.h
+++ b/shared-bindings/socketpool/SocketPool.h
@@ -34,16 +34,24 @@
 extern const mp_obj_type_t socketpool_socketpool_type;
 
 typedef enum {
-    SOCKETPOOL_SOCK_STREAM,
-    SOCKETPOOL_SOCK_DGRAM,
-    SOCKETPOOL_SOCK_RAW
+    SOCKETPOOL_SOCK_STREAM = 1,
+    SOCKETPOOL_SOCK_DGRAM = 2,
+    SOCKETPOOL_SOCK_RAW = 3
 } socketpool_socketpool_sock_t;
 
 typedef enum {
-    SOCKETPOOL_AF_INET,
-    SOCKETPOOL_AF_INET6
+    SOCKETPOOL_AF_INET = 2,
+    SOCKETPOOL_AF_INET6 = 10
 } socketpool_socketpool_addressfamily_t;
 
+typedef enum {
+    SOCKETPOOL_IPPROTO_TCP = 6,
+} socketpool_socketpool_ipproto_t;
+
+typedef enum {
+    SOCKETPOOL_TCP_NODELAY = 1,
+} socketpool_socketpool_tcpopt_t;
+
 void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *self, mp_obj_t radio);
 
 socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
diff --git a/supervisor/fatfs_port.h b/supervisor/fatfs.h
similarity index 89%
rename from supervisor/fatfs_port.h
rename to supervisor/fatfs.h
index e76ced524d..59226aae1c 100644
--- a/supervisor/fatfs_port.h
+++ b/supervisor/fatfs.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SUPERVISOR_FATFS_PORT_H
-#define MICROPY_INCLUDED_SUPERVISOR_FATFS_PORT_H
+#ifndef MICROPY_INCLUDED_SUPERVISOR_FATFS_H
+#define MICROPY_INCLUDED_SUPERVISOR_FATFS_H
 
 #include "lib/oofatfs/ff.h"
 
 void override_fattime(DWORD time);
 
-#endif  // MICROPY_INCLUDED_SUPERVISOR_FATFS_PORT_H
+#endif  // MICROPY_INCLUDED_SUPERVISOR_FATFS_H
diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c
index 159c639e4d..ae24c29899 100644
--- a/supervisor/shared/bluetooth/file_transfer.c
+++ b/supervisor/shared/bluetooth/file_transfer.c
@@ -42,7 +42,7 @@
 
 #include "common-hal/_bleio/__init__.h"
 
-#include "supervisor/fatfs_port.h"
+#include "supervisor/fatfs.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/bluetooth/file_transfer.h"
diff --git a/ports/nrf/fatfs_port.c b/supervisor/shared/fatfs.c
similarity index 94%
rename from ports/nrf/fatfs_port.c
rename to supervisor/shared/fatfs.c
index 38c2d923b8..76db02d6bf 100644
--- a/ports/nrf/fatfs_port.c
+++ b/supervisor/shared/fatfs.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2022 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,13 @@
  * THE SOFTWARE.
  */
 
+#include "supervisor/fatfs.h"
+
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared-bindings/rtc/RTC.h"
 #include "shared-bindings/time/__init__.h"
-#include "supervisor/fatfs_port.h"
 
 DWORD _time_override = 0;
 DWORD get_fattime(void) {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 3f0b9ad8f7..2d6025b6aa 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -24,18 +24,20 @@
  * THE SOFTWARE.
  */
 
+#include 
 #include 
 
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "genhdr/mpversion.h"
+#include "py/mperrno.h"
 #include "py/mpstate.h"
 #include "py/stackctrl.h"
 
 #include "shared-bindings/wifi/Radio.h"
 #include "shared-module/storage/__init__.h"
 #include "shared/timeutils/timeutils.h"
-#include "supervisor/fatfs_port.h"
+#include "supervisor/fatfs.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/reload.h"
@@ -47,8 +49,12 @@
 
 #include "shared-bindings/hashlib/__init__.h"
 #include "shared-bindings/hashlib/Hash.h"
+
+#if CIRCUITPY_MDNS
 #include "shared-bindings/mdns/RemoteService.h"
 #include "shared-bindings/mdns/Server.h"
+#endif
+
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/socketpool/__init__.h"
 #include "shared-bindings/socketpool/Socket.h"
@@ -62,11 +68,6 @@
 #include "shared-module/dotenv/__init__.h"
 #endif
 
-// TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
-#include "esp_log.h"
-
-static const char *TAG = "CP webserver";
-
 enum request_state {
     STATE_METHOD,
     STATE_PATH,
@@ -95,6 +96,7 @@ typedef struct {
     bool expect;
     bool json;
     bool websocket;
+    bool new_socket;
     uint32_t websocket_version;
     // RFC6455 for websockets says this header should be 24 base64 characters long.
     char websocket_key[24 + 1];
@@ -109,7 +111,10 @@ static uint32_t _last_ip = 0;
 static wifi_radio_error_t _last_wifi_status = WIFI_RADIO_ERROR_NONE;
 #endif
 
+#if CIRCUITPY_MDNS
 static mdns_server_obj_t mdns;
+#endif
+
 static uint32_t web_api_port = 80;
 
 static socketpool_socketpool_obj_t pool;
@@ -271,7 +276,7 @@ void supervisor_start_web_workflow(void) {
     // attempting to connect to the given network.
     _wifi_status = common_hal_wifi_radio_connect(
         &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len,
-        0, 0.1, NULL, 0);
+        0, 8, NULL, 0);
 
     if (_wifi_status != WIFI_RADIO_ERROR_NONE) {
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false);
@@ -289,21 +294,20 @@ void supervisor_start_web_workflow(void) {
         new_port = strtoul(port_encoded, NULL, 10);
     }
 
-    bool first_start = mdns.base.type != &mdns_server_type;
+    bool first_start = pool.base.type != &socketpool_socketpool_type;
     bool port_changed = new_port != web_api_port;
 
     if (first_start) {
-        ESP_LOGI(TAG, "Starting web workflow");
+        #if CIRCUITPY_MDNS
         mdns_server_construct(&mdns, true);
         mdns.base.type = &mdns_server_type;
         common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
+        #endif
         pool.base.type = &socketpool_socketpool_type;
         common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj);
 
-        listening.base.type = &socketpool_socket_type;
-        active.base.type = &socketpool_socket_type;
-        active.num = -1;
-        active.connected = false;
+        socketpool_socket_reset(&listening);
+        socketpool_socket_reset(&active);
 
         websocket_init();
     }
@@ -312,7 +316,9 @@ void supervisor_start_web_workflow(void) {
     }
     if (first_start || port_changed) {
         web_api_port = new_port;
+        #if CIRCUITPY_MDNS
         common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
+        #endif
         socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
         common_hal_socketpool_socket_settimeout(&listening, 0);
         // Bind to any ip.
@@ -326,17 +332,13 @@ void supervisor_start_web_workflow(void) {
         _api_password[api_password_len + 1] = '\0';
         _base64_in_place(_api_password, api_password_len + 1, sizeof(_api_password));
     }
-
-    // TODO:
-    // GET /edit/
-    //   - Super basic editor
     #endif
 }
 
 void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
     int total_sent = 0;
-    int sent = -EAGAIN;
-    while ((sent == -EAGAIN || (sent > 0 && total_sent < len)) &&
+    int sent = -MP_EAGAIN;
+    while ((sent == -MP_EAGAIN || (sent > 0 && total_sent < len)) &&
            common_hal_socketpool_socket_get_connected(socket)) {
         sent = socketpool_socket_send(socket, buf + total_sent, len - total_sent);
         if (sent > 0) {
@@ -347,9 +349,6 @@ void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf,
             }
         }
     }
-    if (total_sent < len) {
-        ESP_LOGE(TAG, "short send %d %d", sent, len);
-    }
 }
 
 STATIC void _print_raw(void *env, const char *str, size_t len) {
@@ -436,13 +435,15 @@ const char *ok_hosts[] = {
 
 static bool _origin_ok(const char *origin) {
     const char *http = "http://";
-    const char *local = ".local";
 
     // note: redirected requests send an Origin of "null" and will be caught by this
     if (strncmp(origin, http, strlen(http)) != 0) {
         return false;
     }
     // These are prefix checks up to : so that any port works.
+    // TODO: Support DHCP hostname in addition to MDNS.
+    #if CIRCUITPY_MDNS
+    const char *local = ".local";
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
     const char *end = origin + strlen(http) + strlen(hostname) + strlen(local);
     if (strncmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
@@ -450,6 +451,9 @@ static bool _origin_ok(const char *origin) {
         (end[0] == '\0' || end[0] == ':')) {
         return true;
     }
+    #else
+    const char *end;
+    #endif
 
     _update_encoded_ip();
     end = origin + strlen(http) + strlen(_our_ip_encoded);
@@ -604,9 +608,10 @@ static void _reply_server_error(socketpool_socket_obj_t *socket, _request *reque
     _send_str(socket, "\r\n");
 }
 
+#if CIRCUITPY_MDNS
 static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request, const char *path) {
     int nodelay = 1;
-    lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
+    common_hal_socketpool_socket_setsockopt(socket, SOCKETPOOL_IPPROTO_TCP, SOCKETPOOL_TCP_NODELAY, &nodelay, sizeof(nodelay));
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
     _send_strs(socket,
         "HTTP/1.1 307 Temporary Redirect\r\n",
@@ -628,6 +633,7 @@ static void _reply_redirect(socketpool_socket_obj_t *socket, _request *request,
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
 }
+#endif
 
 static void _reply_directory_json(socketpool_socket_obj_t *socket, _request *request, FF_DIR *dir, const char *request_path, const char *path) {
     socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON));
@@ -710,10 +716,9 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
         while (send_offset < quantity_read) {
             int sent = socketpool_socket_send(socket, data_buffer + send_offset, quantity_read - send_offset);
             if (sent < 0) {
-                if (sent == -EAGAIN) {
+                if (sent == -MP_EAGAIN) {
                     sent = 0;
                 } else {
-                    ESP_LOGE(TAG, "file send error %d", sent);
                     break;
                 }
             }
@@ -726,15 +731,20 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
 }
 
 static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *request) {
+    #if CIRCUITPY_MDNS
     mdns_remoteservice_obj_t found_devices[32];
     size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices));
     size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices));
+    #else
+    size_t total_results = 0;
+    #endif
     socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON));
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
     mp_print_t _socket_print = {socket, _print_chunk};
 
     mp_printf(&_socket_print, "{\"total\": %d, \"devices\": [", total_results);
+    #if CIRCUITPY_MDNS
     for (size_t i = 0; i < count; i++) {
         if (i > 0) {
             _send_chunk(socket, ",");
@@ -751,6 +761,7 @@ static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *
             "\"ip\": \"%d.%d.%d.%d\"}", hostname, instance_name, port, octets[0], octets[1], octets[2], octets[3]);
         common_hal_mdns_remoteservice_deinit(&found_devices[i]);
     }
+    #endif
     _send_chunk(socket, "]}");
     // Empty chunk signals the end of the response.
     _send_chunk(socket, "");
@@ -762,7 +773,11 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _send_str(socket, "\r\n");
     mp_print_t _socket_print = {socket, _print_chunk};
 
+    #if CIRCUITPY_MDNS
     const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
+    #else
+    const char *hostname = "";
+    #endif
     _update_encoded_ip();
     // Note: this leverages the fact that C concats consecutive string literals together.
     mp_printf(&_socket_print,
@@ -848,7 +863,6 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
         return;
     }
     if (result != FR_OK) {
-        ESP_LOGE(TAG, "file write error %d %s", result, path);
         override_fattime(0);
         #if CIRCUITPY_USB_MSC
         usb_msc_unlock();
@@ -888,19 +902,13 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
         size_t read_len = MIN(sizeof(bytes), request->content_length - total_read);
         int len = socketpool_socket_recv_into(socket, bytes, read_len);
         if (len < 0) {
-            if (len == -EAGAIN) {
+            if (len == -MP_EAGAIN) {
                 continue;
-            } else {
-                ESP_LOGE(TAG, "other error %d", len);
             }
             error = true;
             break;
         }
-        UINT actual;
-        f_write(&active_file, bytes, len, &actual);
-        if (actual != (UINT)len) {
-            ESP_LOGE(TAG, "didn't write whole file");
-        }
+        f_write(&active_file, bytes, len, NULL);
         total_read += len;
     }
 
@@ -934,7 +942,7 @@ STATIC_FILE(blinka_16x16_ico);
 static void _reply_static(socketpool_socket_obj_t *socket, _request *request, const uint8_t *response, size_t response_len, const char *content_type) {
     uint32_t total_length = response_len;
     char encoded_len[10];
-    snprintf(encoded_len, sizeof(encoded_len), "%d", total_length);
+    snprintf(encoded_len, sizeof(encoded_len), "%" PRIu32, total_length);
 
     _send_strs(socket,
         "HTTP/1.1 200 OK\r\n",
@@ -1004,9 +1012,10 @@ static void _decode_percents(char *str) {
 
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
+        #if CIRCUITPY_MDNS
         _reply_redirect(socket, request, request->path);
+        #endif
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
-        ESP_LOGE(TAG, "bad origin %s", request->origin);
         _reply_forbidden(socket, request);
     } else if (strncmp(request->path, "/fs/", 4) == 0) {
         if (strcasecmp(request->method, "OPTIONS") == 0) {
@@ -1061,7 +1070,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 if (result == FR_NO_PATH || result == FR_NO_FILE) {
                     _reply_missing(socket, request);
                 } else if (result != FR_OK) {
-                    ESP_LOGE(TAG, "rm error %d %s", result, path);
                     _reply_server_error(socket, request);
                 } else {
                     _reply_no_content(socket, request);
@@ -1089,7 +1097,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                 } else if (result == FR_NO_PATH || result == FR_NO_FILE) { // Missing higher directories or target file.
                     _reply_missing(socket, request);
                 } else if (result != FR_OK) {
-                    ESP_LOGE(TAG, "move error %d %s", result, path);
                     _reply_server_error(socket, request);
                 } else {
                     _reply_created(socket, request);
@@ -1137,7 +1144,6 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
                     } else if (result == FR_NO_PATH) {
                         _reply_missing(socket, request);
                     } else if (result != FR_OK) {
-                        ESP_LOGE(TAG, "mkdir error %d %s", result, path);
                         _reply_server_error(socket, request);
                     } else {
                         _reply_created(socket, request);
@@ -1237,6 +1243,7 @@ static void _reset_request(_request *request) {
     request->redirect = false;
     request->done = false;
     request->in_progress = false;
+    request->new_socket = false;
     request->authenticated = false;
     request->expect = false;
     request->json = false;
@@ -1257,6 +1264,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
         if (!request->in_progress) {
             autoreload_suspend(AUTORELOAD_SUSPEND_WEB);
             request->in_progress = true;
+            request->new_socket = false;
         }
         switch (request->state) {
             case STATE_METHOD: {
@@ -1276,7 +1284,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                 if (c == ' ') {
                     request->path[request->offset] = '\0';
                     request->offset = 0;
-                    ESP_LOGI(TAG, "Request %s %s", request->method, request->path);
                     request->state = STATE_VERSION;
                 } else if (request->offset > sizeof(request->path) - 1) {
                     // Skip methods that are too long.
@@ -1352,7 +1359,6 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                     } else if (strcasecmp(request->header_key, "X-Destination") == 0) {
                         strcpy(request->destination, request->header_value);
                     }
-                    ESP_LOGI(TAG, "Header %s %s", request->header_key, request->header_value);
                 } else if (request->offset > sizeof(request->header_value) - 1) {
                     // Skip methods that are too long.
                 } else {
@@ -1369,8 +1375,9 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
     }
     if (error) {
         const char *error_response = "HTTP/1.1 501 Not Implemented\r\n\r\n";
+
         int nodelay = 1;
-        lwip_setsockopt(socket->num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
+        common_hal_socketpool_socket_setsockopt(socket, SOCKETPOOL_IPPROTO_TCP, SOCKETPOOL_TCP_NODELAY, &nodelay, sizeof(nodelay));
         socketpool_socket_send(socket, (const uint8_t *)error_response, strlen(error_response));
     }
     if (!request->done) {
@@ -1386,37 +1393,8 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
 
 
 void supervisor_web_workflow_background(void) {
-    // Otherwise, see if we have another socket to accept.
-    if ((!common_hal_socketpool_socket_get_connected(&active) || !active_request.in_progress) &&
-        !common_hal_socketpool_socket_get_closed(&listening) &&
-        listening.num > 0) {
-        uint32_t ip;
-        uint32_t port;
-        int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port);
-        if (newsoc == -EBADF) {
-            common_hal_socketpool_socket_close(&listening);
-            return;
-        }
-        if (newsoc > 0) {
-            // Close the active socket because we have another we accepted.
-            if (!common_hal_socketpool_socket_get_closed(&active)) {
-                common_hal_socketpool_socket_close(&active);
-            }
-            // TODO: Don't do this because it uses the private struct layout.
-            // Create the socket
-            active.num = newsoc;
-            active.pool = &pool;
-            active.connected = true;
-
-            common_hal_socketpool_socket_settimeout(&active, 0);
-
-            _reset_request(&active_request);
-
-            lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
-        }
-    }
-
-    // If we have a request in progress, continue working on it.
+    // If we have a request in progress, continue working on it. Do this first
+    // so that we can accept another socket after finishing this request.
     if (common_hal_socketpool_socket_get_connected(&active)) {
         _process_request(&active, &active_request);
     } else {
@@ -1424,6 +1402,28 @@ void supervisor_web_workflow_background(void) {
         common_hal_socketpool_socket_close(&active);
     }
 
+    // Otherwise, see if we have another socket to accept.
+    if ((!common_hal_socketpool_socket_get_connected(&active) ||
+         (!active_request.in_progress && !active_request.new_socket)) &&
+        !common_hal_socketpool_socket_get_closed(&listening)) {
+        uint32_t ip;
+        uint32_t port;
+        int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port, &active);
+        if (newsoc == -EBADF) {
+            common_hal_socketpool_socket_close(&listening);
+            return;
+        }
+        if (newsoc > 0) {
+            common_hal_socketpool_socket_settimeout(&active, 0);
+
+            _reset_request(&active_request);
+            // Mark new sockets, otherwise we may accept another before the first
+            // could start its request.
+            active_request.new_socket = true;
+        }
+    }
+
+
     websocket_background();
 }
 
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 3901c4eefe..9d1cf9919f 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -29,15 +29,13 @@
 #include "py/ringbuf.h"
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared-bindings/socketpool/SocketPool.h"
 #include "supervisor/shared/web_workflow/web_workflow.h"
 
 #if CIRCUITPY_STATUS_BAR
 #include "supervisor/shared/status_bar.h"
 #endif
 
-// TODO: Remove ESP specific stuff. For now, it is useful as we refine the server.
-#include "esp_log.h"
-
 typedef struct {
     socketpool_socket_obj_t socket;
     uint8_t opcode;
@@ -57,24 +55,18 @@ STATIC uint8_t _buf[16];
 
 static _websocket cp_serial;
 
-static const char *TAG = "CP websocket";
-
 void websocket_init(void) {
-    cp_serial.socket.num = -1;
-    cp_serial.socket.connected = false;
+    socketpool_socket_reset(&cp_serial.socket);
 
     ringbuf_init(&_incoming_ringbuf, _buf, sizeof(_buf) - 1);
 }
 
 void websocket_handoff(socketpool_socket_obj_t *socket) {
-    cp_serial.socket = *socket;
+    socketpool_socket_move(socket, &cp_serial.socket);
     cp_serial.closed = false;
     cp_serial.opcode = 0;
     cp_serial.frame_index = 0;
     cp_serial.frame_len = 2;
-    // Mark the original socket object as closed without telling the lower level.
-    socket->connected = false;
-    socket->num = -1;
 
     #if CIRCUITPY_STATUS_BAR
     // Send the title bar for the new client.
@@ -89,9 +81,6 @@ bool websocket_connected(void) {
 static bool _read_byte(uint8_t *c) {
     int len = socketpool_socket_recv_into(&cp_serial.socket, c, 1);
     if (len != 1) {
-        if (len != -EAGAIN) {
-            ESP_LOGE(TAG, "recv error %d", len);
-        }
         return false;
     }
     return true;
@@ -147,13 +136,10 @@ static void _read_next_frame_header(void) {
                 // Set the TCP socket to send immediately so that we send the payload back before
                 // closing the connection.
                 int nodelay = 1;
-                lwip_setsockopt(cp_serial.socket.num, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
+                common_hal_socketpool_socket_setsockopt(&cp_serial.socket, SOCKETPOOL_IPPROTO_TCP, SOCKETPOOL_TCP_NODELAY, &nodelay, sizeof(nodelay));
             }
             uint8_t frame_header[2];
             frame_header[0] = 1 << 7 | opcode;
-            if (cp_serial.payload_remaining > 125) {
-                ESP_LOGE(TAG, "CLOSE or PING has long payload");
-            }
             frame_header[1] = cp_serial.payload_remaining;
             web_workflow_send_raw(&cp_serial.socket, (const uint8_t *)frame_header, 2);
         }
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index a8deb9606d..801025f41a 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -4,6 +4,7 @@ SRC_SUPERVISOR = \
 	supervisor/shared/background_callback.c \
 	supervisor/shared/board.c \
 	supervisor/shared/cpu.c \
+	supervisor/shared/fatfs.c \
 	supervisor/shared/flash.c \
 	supervisor/shared/lock.c \
 	supervisor/shared/memory.c \

From fa4b480439eb7159b4f803a916eab062d56b6593 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 21 Nov 2022 20:21:39 -0600
Subject: [PATCH 1418/2403] looking into how null show works

---
 shared-module/displayio/Display.c      | 17 +++++++++++++++++
 shared-module/displayio/Display.h      |  2 +-
 shared-module/displayio/display_core.c |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 2d65e88836..780c4a9136 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -136,11 +136,28 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
+    mp_printf(&mp_plat_print, "Inside display make_new\n");
+    is_null(&circuitpython_splash);
+    //is_null(0);
+//    if(circuitpython_splash == mp_const_none) {
+//        mp_printf(&mp_plat_print, "Splash is NULL \n");
+//    }
+//    mp_printf(&mp_plat_print,  *circuitpython_splash);
+//    mp_printf(&mp_plat_print,  "\n");
     common_hal_displayio_display_show(self, &circuitpython_splash);
     common_hal_displayio_display_set_auto_refresh(self, auto_refresh);
 }
 
+void is_null(displayio_group_t *root_group){
+    if (root_group == NULL){
+        mp_printf(&mp_plat_print,  "root_group is null\n");
+    }
+}
+
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
+    if(root_group == NULL){
+        mp_printf(&mp_plat_print,  "Its NULL fer flucks snakes\n");
+    }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
index f513a9d462..eb356a388c 100644
--- a/shared-module/displayio/Display.h
+++ b/shared-module/displayio/Display.h
@@ -64,7 +64,7 @@ typedef struct {
 void displayio_display_background(displayio_display_obj_t *self);
 void release_display(displayio_display_obj_t *self);
 void reset_display(displayio_display_obj_t *self);
-
+void is_null(displayio_group_t *root_group);
 void displayio_display_collect_ptrs(displayio_display_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_DISPLAY_H
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index eadb0ebd4c..635694914f 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -169,7 +169,7 @@ bool displayio_display_core_set_root_group(displayio_display_core_t *self, displ
         // force the circuit_python_splash out of any group (Note: could cause problems with the parent group)
         circuitpython_splash.x = 0; // reset position in case someone moved it.
         circuitpython_splash.y = 0;
-
+        mp_printf(&mp_plat_print, "Inside set root group NULL\n");
         supervisor_start_terminal(self->width, self->height);
 
         root_group = &circuitpython_splash;

From dc2039058851b89a46a70aa3ac76d73a3b7f6c67 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 22 Nov 2022 09:04:12 -0800
Subject: [PATCH 1419/2403] Fix stubs

---
 shared-bindings/socketpool/SocketPool.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 278288fa7e..097cb4f39a 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -63,7 +63,16 @@ STATIC mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t
 
     return MP_OBJ_FROM_PTR(s);
 }
-
+//|     AF_INET: int
+//|     AF_INET6: int
+//|
+//|     SOCK_STREAM: int
+//|     SOCK_DGRAM: int
+//|     SOCK_RAW: int
+//|
+//|     TCP_NODELAY: int
+//|
+//|     IPPROTO_TCP: int
 //|     def socket(self, family: int = AF_INET, type: int = SOCK_STREAM) -> socketpool.Socket:
 //|         """Create a new socket
 //|
@@ -107,6 +116,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_socket_obj, 1, socketpool_socke
 //|         address information to call socket.socket() and socket.connect() with,
 //|         as a tuple."""
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_host, ARG_port, ARG_family, ARG_type, ARG_proto, ARG_flags };
     static const mp_arg_t allowed_args[] = {
@@ -156,28 +166,16 @@ STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&socketpool_socketpool_getaddrinfo_obj) },
 
     // class constants
-//|     AF_INET: int
     { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(SOCKETPOOL_AF_INET) },
-//|     AF_INET6: int
     { MP_ROM_QSTR(MP_QSTR_AF_INET6), MP_ROM_INT(SOCKETPOOL_AF_INET6) },
-//|
 
-//|     SOCK_STREAM: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_STREAM), MP_ROM_INT(SOCKETPOOL_SOCK_STREAM) },
-//|     SOCK_DGRAM: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_DGRAM), MP_ROM_INT(SOCKETPOOL_SOCK_DGRAM) },
-//|     SOCK_RAW: int
     { MP_ROM_QSTR(MP_QSTR_SOCK_RAW), MP_ROM_INT(SOCKETPOOL_SOCK_RAW) },
-//|
 
-//|     TCP_NODELAY: int
     { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(SOCKETPOOL_TCP_NODELAY) },
-//|
 
-//|     IPPROTO_TCP: int
-//|
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(SOCKETPOOL_IPPROTO_TCP) },
-//|
 };
 
 STATIC MP_DEFINE_CONST_DICT(socketpool_socketpool_locals_dict, socketpool_socketpool_locals_dict_table);

From 167a50658a1367927f5403e4c11deedd7690b875 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 22 Nov 2022 09:42:59 -0800
Subject: [PATCH 1420/2403] Try and fix ci change script

---
 tools/ci_changes_per_commit.py | 38 ++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index dd957b2a56..e38c98f40e 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -129,6 +129,7 @@ class Query:
         if request.status_code == 200:
             return request.json()
         else:
+            print(request.json())
             raise Exception("Query Failed: {}".format(request.status_code))
 
 
@@ -164,7 +165,7 @@ def get_commit_and_checksuite(query_commits):
     return [None, None]
 
 
-def append_runs_to_list(runs, list):
+def append_runs_to_list(runs, bad_runs_by_matrix):
     regex_matrix = re.compile("^build-[^ ]+")
     regex_board = re.compile("\([^ ]+\)$")
     for run in runs["nodes"]:
@@ -172,27 +173,32 @@ def append_runs_to_list(runs, list):
         res_matrix = regex_matrix.search(name)
         if res_matrix:
             matrix = res_matrix.group()
-            if matrix not in list:
-                list[matrix] = []
-            list[matrix].append(regex_board.search(name).group()[1:-1])
+            if matrix not in bad_runs_by_matrix:
+                bad_runs_by_matrix[matrix] = []
+            res_board = regex_board.search(name)
+            if res_board:
+                bad_runs_by_matrix[matrix].append(res_board.group()[1:-1])
 
 
-def get_bad_checkruns(query_checkruns, list={}):
-    checkruns = query_checkruns.fetch()["data"]["node"]
-    run_types = ["failed", "incomplete"]
-    paginate = False
+def get_bad_checkruns(query_checkruns):
+    more_pages = True
+    bad_runs_by_matrix = {}
+    while more_pages:
+        checkruns = query_checkruns.fetch()["data"]["node"]
+        run_types = ["failed", "incomplete"]
+        more_pages = False
 
-    for run_type in run_types:
-        run_type_camel = run_type.capitalize() + "Run"
-        run_type = run_type + "Runs"
+        for run_type in run_types:
+            run_type_camel = run_type.capitalize() + "Run"
+            run_type = run_type + "Runs"
 
-        append_runs_to_list(checkruns[run_type], list)
+            append_runs_to_list(checkruns[run_type], bad_runs_by_matrix)
 
-        if query_checkruns.paginate(checkruns[run_type]["pageInfo"], "after" + run_type_camel):
-            query_checkruns.variables["include" + run_type_camel] = True
-            paginate = True
+            if query_checkruns.paginate(checkruns[run_type]["pageInfo"], "after" + run_type_camel):
+                query_checkruns.variables["include" + run_type_camel] = True
+                more_pages = True
 
-    return get_bad_checkruns(query_checkruns, list) if paginate else list
+    return bad_runs_by_matrix
 
 
 def main():

From 1fe7d2956c73dba39333d2b3248e9cf7f89d5eb2 Mon Sep 17 00:00:00 2001
From: flom84 
Date: Tue, 22 Nov 2022 21:17:04 +0100
Subject: [PATCH 1421/2403] Enable uart over FTDI by default.

---
 ports/stm/boards/nucleo_f446re/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.h b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
index f0155f4624..c1d61492e4 100644
--- a/ports/stm/boards/nucleo_f446re/mpconfigboard.h
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
@@ -44,8 +44,8 @@
 // #define CIRCUITPY_CONSOLE_UART_RX (&pin_PC11)
 
 // USART2 + ST link
-// #define CIRCUITPY_CONSOLE_UART_TX (&pin_PA02)
-// #define CIRCUITPY_CONSOLE_UART_RX (&pin_PA03)
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_PA02)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_PA03)
 
 // Status LEDs
 #define MICROPY_HW_LED_STATUS (&pin_PA05)

From 17be447c4bae7aeb63d3ad617c87fcdc2b0cacf5 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 22 Nov 2022 16:09:47 -0500
Subject: [PATCH 1422/2403] correct Radio.connect() and .start_ap() signatures;
 clean up some code

---
 ports/espressif/common-hal/wifi/Network.c   | 18 ++---
 ports/espressif/common-hal/wifi/Radio.c     | 13 ++--
 ports/raspberrypi/common-hal/wifi/Network.c |  8 +--
 ports/raspberrypi/common-hal/wifi/Radio.c   |  2 +-
 shared-bindings/wifi/AuthMode.h             | 14 ++--
 shared-bindings/wifi/Radio.c                | 74 ++++++++++++---------
 shared-bindings/wifi/Radio.h                |  2 +-
 7 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Network.c b/ports/espressif/common-hal/wifi/Network.c
index 34cb15d603..5c9852a1f7 100644
--- a/ports/espressif/common-hal/wifi/Network.c
+++ b/ports/espressif/common-hal/wifi/Network.c
@@ -55,31 +55,31 @@ mp_obj_t common_hal_wifi_network_get_country(wifi_network_obj_t *self) {
 }
 
 mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
-    uint8_t authmode_mask = 0;
+    uint32_t authmode_mask = 0;
     switch (self->record.authmode) {
         case WIFI_AUTH_OPEN:
-            authmode_mask = (1 << AUTHMODE_OPEN);
+            authmode_mask = AUTHMODE_OPEN;
             break;
         case WIFI_AUTH_WEP:
-            authmode_mask = (1 << AUTHMODE_WEP);
+            authmode_mask = AUTHMODE_WEP;
             break;
         case WIFI_AUTH_WPA_PSK:
-            authmode_mask = (1 << AUTHMODE_WPA) | (1 << AUTHMODE_PSK);
+            authmode_mask = AUTHMODE_WPA | AUTHMODE_PSK;
             break;
         case WIFI_AUTH_WPA2_PSK:
-            authmode_mask = (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK);
+            authmode_mask = AUTHMODE_WPA2 | AUTHMODE_PSK;
             break;
         case WIFI_AUTH_WPA_WPA2_PSK:
-            authmode_mask = (1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK);
+            authmode_mask = AUTHMODE_WPA | AUTHMODE_WPA2 | AUTHMODE_PSK;
             break;
         case WIFI_AUTH_WPA2_ENTERPRISE:
-            authmode_mask = (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_ENTERPRISE);
+            authmode_mask = AUTHMODE_WPA2 | AUTHMODE_ENTERPRISE;
             break;
         case WIFI_AUTH_WPA3_PSK:
-            authmode_mask = (1 << AUTHMODE_WPA3) | (1 << AUTHMODE_PSK);
+            authmode_mask = AUTHMODE_WPA3 | AUTHMODE_PSK;
             break;
         case WIFI_AUTH_WPA2_WPA3_PSK:
-            authmode_mask = (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_WPA3) | (1 << AUTHMODE_PSK);
+            authmode_mask = AUTHMODE_WPA2 | AUTHMODE_WPA3 | AUTHMODE_PSK;
             break;
         default:
             break;
diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 27e2c8c610..acd6ae53bc 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -205,20 +205,21 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
     set_mode_station(self, false);
 }
 
-void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
+void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmodes, uint8_t max_connections) {
     set_mode_ap(self, true);
 
-    switch (authmode) {
-        case (1 << AUTHMODE_OPEN):
+    uint8_t authmode = 0;
+    switch (authmodes) {
+        case AUTHMODE_OPEN:
             authmode = WIFI_AUTH_OPEN;
             break;
-        case ((1 << AUTHMODE_WPA) | (1 << AUTHMODE_PSK)):
+        case AUTHMODE_WPA | AUTHMODE_PSK:
             authmode = WIFI_AUTH_WPA_PSK;
             break;
-        case ((1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK)):
+        case AUTHMODE_WPA2 | AUTHMODE_PSK:
             authmode = WIFI_AUTH_WPA2_PSK;
             break;
-        case ((1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK)):
+        case AUTHMODE_WPA | AUTHMODE_WPA2 | AUTHMODE_PSK:
             authmode = WIFI_AUTH_WPA_WPA2_PSK;
             break;
         default:
diff --git a/ports/raspberrypi/common-hal/wifi/Network.c b/ports/raspberrypi/common-hal/wifi/Network.c
index 8db42e962c..e9b64ffd2c 100644
--- a/ports/raspberrypi/common-hal/wifi/Network.c
+++ b/ports/raspberrypi/common-hal/wifi/Network.c
@@ -55,18 +55,18 @@ mp_obj_t common_hal_wifi_network_get_country(wifi_network_obj_t *self) {
 mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
     uint8_t authmode_mask = 0;
     if (self->record.auth_mode == 0) {
-        authmode_mask = (1 << AUTHMODE_OPEN);
+        authmode_mask = AUTHMODE_OPEN;
     }
     if (self->record.auth_mode & 1) {
-        authmode_mask |= (1 << AUTHMODE_PSK);
+        authmode_mask |= AUTHMODE_PSK;
     }
     ;
     if (self->record.auth_mode & 2) {
-        authmode_mask |= (1 << AUTHMODE_WPA);
+        authmode_mask |= AUTHMODE_WPA;
     }
     ;
     if (self->record.auth_mode & 4) {
-        authmode_mask |= (1 << AUTHMODE_WPA2);
+        authmode_mask |= AUTHMODE_WPA2;
     }
     ;
     mp_obj_t authmode_list = mp_obj_new_list(0, NULL);
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 2a74c16e0a..a4df1d22d6 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -164,7 +164,7 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
     bindings_cyw43_wifi_enforce_pm();
 }
 
-void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
+void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmodes, uint8_t max_connections) {
     mp_raise_NotImplementedError(NULL);
     bindings_cyw43_wifi_enforce_pm();
 }
diff --git a/shared-bindings/wifi/AuthMode.h b/shared-bindings/wifi/AuthMode.h
index a1016d6c8a..c514fb2a32 100644
--- a/shared-bindings/wifi/AuthMode.h
+++ b/shared-bindings/wifi/AuthMode.h
@@ -30,13 +30,13 @@
 #include "py/enum.h"
 
 typedef enum {
-    AUTHMODE_OPEN,
-    AUTHMODE_WEP,
-    AUTHMODE_WPA,
-    AUTHMODE_WPA2,
-    AUTHMODE_WPA3,
-    AUTHMODE_PSK,
-    AUTHMODE_ENTERPRISE
+    AUTHMODE_OPEN = 1 << 0,
+    AUTHMODE_WEP = 1 << 1,
+    AUTHMODE_WPA = 1 << 2,
+    AUTHMODE_WPA2 = 1 << 3,
+    AUTHMODE_WPA3 = 1 << 4,
+    AUTHMODE_PSK = 1 << 5,
+    AUTHMODE_ENTERPRISE = 1 << 6,
 } wifi_authmode_t;
 
 extern const mp_obj_type_t wifi_authmode_type;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 57e953ec68..37123dbb44 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -282,10 +282,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 //|     def start_ap(
 //|         self,
 //|         ssid: Union[str | ReadableBuffer],
-//|         password: Union[str | ReadableBuffer] = "",
+//|         password: Union[str | ReadableBuffer] = b"",
 //|         *,
-//|         channel: Optional[int] = 1,
-//|         authmode: Optional[AuthMode],
+//|         channel: int = 1,
+//|         authmode: Optional[AuthMode] = None,
 //|         max_connections: Optional[int] = 4
 //|     ) -> None:
 //|         """Starts an Access Point with the specified ssid and password.
@@ -293,10 +293,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 //|         If ``channel`` is given, the access point will use that channel unless
 //|         a station is already operating on a different channel.
 //|
-//|         If ``authmode`` is given, the access point will use that Authentication
-//|         mode. If a password is given, ``authmode`` must not be ``OPEN``.
-//|         If ``authmode`` isn't given, ``OPEN`` will be used when password isn't provided,
-//|         otherwise ``WPA_WPA2_PSK``.
+//|         If ``authmode`` is not None, the access point will use that Authentication
+//|         mode. If a non-empty password is given, ``authmode`` must not be ``OPEN``.
+//|         If ``authmode`` is not given or is None,
+//|         ``OPEN`` will be used when the password is the empty string,
+//|         otherwise ``authmode`` will be ``WPA_WPA2_PSK``.
 //|
 //|         If ``max_connections`` is given, the access point will allow up to
 //|         that number of stations to connect."""
@@ -305,9 +306,9 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
     enum { ARG_ssid, ARG_password, ARG_channel, ARG_authmode, ARG_max_connections };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_password,  MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_password,  MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes} },
         { MP_QSTR_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
-        { MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
         { MP_QSTR_max_connections, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 4} },
     };
 
@@ -315,12 +316,13 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
     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);
 
-    uint8_t authmode = 0;
-    if (args[ARG_authmode].u_obj != MP_OBJ_NULL) {
+    // 0 indicates mode wasn't given.
+    uint32_t authmodes = 0;
+    if (args[ARG_authmode].u_obj != mp_const_none) {
         mp_obj_iter_buf_t iter_buf;
         mp_obj_t item, iterable = mp_getiter(args[ARG_authmode].u_obj, &iter_buf);
         while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            authmode |= (1 << (wifi_authmode_t)cp_enum_value(&wifi_authmode_type, item));
+            authmodes |= cp_enum_value(&wifi_authmode_type, item);
         }
     }
 
@@ -329,20 +331,24 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
     mp_arg_validate_length_range(ssid.len, 1, 32, MP_QSTR_ssid);
 
     mp_buffer_info_t password;
-    password.len = 0;
-    if (args[ARG_password].u_obj != MP_OBJ_NULL) {
-        if (authmode == 1) {
-            mp_raise_ValueError(translate("AuthMode.OPEN is not used with password"));
-        } else if (authmode == 0) {
-            authmode = (1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK);
+    mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ);
+    if (authmodes == 0) {
+        if (password.len == 0) {
+            authmodes = AUTHMODE_OPEN;
+        } else {
+            authmodes = AUTHMODE_WPA | AUTHMODE_WPA2 | AUTHMODE_PSK;
         }
-        mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ);
-        mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password);
-    } else {
-        authmode = 1;
     }
 
-    common_hal_wifi_radio_start_ap(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, authmode, args[ARG_max_connections].u_int);
+    if (authmodes == AUTHMODE_OPEN && password.len > 0) {
+        mp_raise_ValueError(translate("AuthMode.OPEN is not used with password"));
+    }
+
+    if (authmodes != AUTHMODE_OPEN) {
+        mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password);
+    }
+
+    common_hal_wifi_radio_start_ap(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, authmodes, args[ARG_max_connections].u_int);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_ap);
@@ -359,10 +365,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_ap_obj, wifi_radio_stop_ap);
 //|     def connect(
 //|         self,
 //|         ssid: Union[str | ReadableBuffer],
-//|         password: Union[str | ReadableBuffer] = "",
+//|         password: Union[str | ReadableBuffer] = b"",
 //|         *,
-//|         channel: Optional[int] = 0,
-//|         bssid: Optional[Union[str | ReadableBuffer]] = "",
+//|         channel: int = 0,
+//|         bssid: Optional[Union[str | ReadableBuffer]] = None,
 //|         timeout: Optional[float] = None
 //|     ) -> None:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
@@ -371,20 +377,20 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_ap_obj, wifi_radio_stop_ap);
 //|         By default, this will scan all channels and connect to the access point (AP) with the
 //|         given ``ssid`` and greatest signal strength (rssi).
 //|
-//|         If ``channel`` is given, the scan will begin with the given channel and connect to
+//|         If ``channel`` is non-zero, the scan will begin with the given channel and connect to
 //|         the first AP with the given ``ssid``. This can speed up the connection time
 //|         significantly because a full scan doesn't occur.
 //|
-//|         If ``bssid`` is given, the scan will start at the first channel or the one given and
+//|         If ``bssid`` is given and not None, the scan will start at the first channel or the one given and
 //|         connect to the AP with the given ``bssid`` and ``ssid``."""
 //|         ...
 STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_password, ARG_channel, ARG_bssid, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_password,  MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_password,  MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes} },
         { MP_QSTR_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
@@ -404,9 +410,11 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     mp_buffer_info_t password;
     password.len = 0;
-    if (args[ARG_password].u_obj != MP_OBJ_NULL) {
+    if (args[ARG_password].u_obj != mp_const_none) {
         mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ);
-        mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password);
+        if (password.len != 0) {
+            mp_arg_validate_length_range(password.len, 8, 63, MP_QSTR_password);
+        }
     }
 
     #define MAC_ADDRESS_LENGTH 6
@@ -414,7 +422,7 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
     mp_buffer_info_t bssid;
     bssid.len = 0;
     // Should probably make sure bssid is just bytes and not something else too
-    if (args[ARG_bssid].u_obj != MP_OBJ_NULL) {
+    if (args[ARG_bssid].u_obj != mp_const_none) {
         mp_get_buffer_raise(args[ARG_bssid].u_obj, &bssid, MP_BUFFER_READ);
         if (bssid.len != MAC_ADDRESS_LENGTH) {
             mp_raise_ValueError(translate("Invalid BSSID"));
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 370bdbd917..407443c77e 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -91,7 +91,7 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 extern void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self);
 
-extern void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections);
+extern void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmodes, uint8_t max_connections);
 extern void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self);

From e5ea1d224758dc067359a24cc0ea2a1b15e26dfb Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 22 Nov 2022 18:47:25 -0600
Subject: [PATCH 1423/2403] try to revert pixelbuf merge brokenness. remove
 second color_u def.

---
 shared-module/adafruit_pixelbuf/PixelBuf.c | 67 +++++++++++++---------
 shared-module/adafruit_pixelmap/PixelMap.c |  6 --
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c
index 5017ba2f2c..ca8f1c05b0 100644
--- a/shared-module/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-module/adafruit_pixelbuf/PixelBuf.c
@@ -154,56 +154,55 @@ STATIC uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) {
         translate("can't convert %q to %q"), mp_obj_get_type_qstr(obj), MP_QSTR_int);
 }
 
-STATIC color_u _pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color) {
-    color_u result;
+static void pixelbuf_parse_color(pixelbuf_pixelbuf_obj_t *self, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
     pixelbuf_byteorder_details_t *byteorder = &self->byteorder;
     // w is shared between white in NeoPixels and brightness in dotstars (so that DotStars can have
     // per-pixel brightness). Set the defaults here in case it isn't set below.
     if (byteorder->is_dotstar) {
-        result.w = 255;
+        *w = 255;
     } else {
-        result.w = 0;
+        *w = 0;
     }
 
     if (mp_obj_is_int(color) || mp_obj_is_float(color)) {
         mp_int_t value = mp_obj_is_int(color) ? mp_obj_get_int_truncated(color) : (mp_int_t)mp_obj_get_float(color);
-        result.r = value >> 16 & 0xff;
-        result.g = (value >> 8) & 0xff;
-        result.b = value & 0xff;
+        *r = value >> 16 & 0xff;
+        *g = (value >> 8) & 0xff;
+        *b = value & 0xff;
     } else {
         mp_obj_t *items;
         size_t len;
         mp_obj_get_array(color, &len, &items);
         mp_arg_validate_length_range(len, 3, 4, MP_QSTR_color);
 
-        result.r = _pixelbuf_get_as_uint8(items[PIXEL_R]);
-        result.g = _pixelbuf_get_as_uint8(items[PIXEL_G]);
-        result.b = _pixelbuf_get_as_uint8(items[PIXEL_B]);
+        *r = _pixelbuf_get_as_uint8(items[PIXEL_R]);
+        *g = _pixelbuf_get_as_uint8(items[PIXEL_G]);
+        *b = _pixelbuf_get_as_uint8(items[PIXEL_B]);
         if (len > 3) {
             if (mp_obj_is_float(items[PIXEL_W])) {
-                result.w = 255 * mp_obj_get_float(items[PIXEL_W]);
+                *w = 255 * mp_obj_get_float(items[PIXEL_W]);
             } else {
-                result.w = mp_obj_get_int_truncated(items[PIXEL_W]);
+                *w = mp_obj_get_int_truncated(items[PIXEL_W]);
             }
-            return result;
+            return;
         }
     }
     // Int colors can't set white directly so convert to white when all components are equal.
     // Also handles RGBW values assigned an RGB tuple.
-    if (!byteorder->is_dotstar && byteorder->bpp == 4 && byteorder->has_white && result.r == result.g && result.r == result.b) {
-        result.w = result.r;
-        result.r = 0;
-        result.g = 0;
-        result.b = 0;
+    if (!byteorder->is_dotstar && byteorder->bpp == 4 && byteorder->has_white && *r == *g && *r == *b) {
+        *w = *r;
+        *r = 0;
+        *g = 0;
+        *b = 0;
     }
-    return result;
 }
 
-STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, color_u rgbw) {
-    uint8_t r = rgbw.r;
-    uint8_t g = rgbw.g;
-    uint8_t b = rgbw.b;
-    uint8_t w = rgbw.w;
+void common_hal_adafruit_pixelbuf_pixelbuf_parse_color(mp_obj_t self_in, mp_obj_t color, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *w) {
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+    pixelbuf_parse_color(self, color, r, g, b, w);
+}
+
+static void pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
     // DotStars don't have white, instead they have 5 bit brightness so pack it into w. Shift right
     // by three to leave the top five bits.
     if (self->bytes_per_pixel == 4 && self->byteorder.is_dotstar) {
@@ -240,10 +239,18 @@ STATIC void _pixelbuf_set_pixel_color(pixelbuf_pixelbuf_obj_t *self, size_t inde
         scaled_buffer[rgbw_order->b] = (b * self->scaled_brightness) / 256;
     }
 }
+void common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(mp_obj_t self_in, size_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+    pixelbuf_set_pixel_color(self, index, r, g, b, w);
+}
 
 STATIC void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t *self, size_t index, mp_obj_t value) {
-    color_u rgbw = _pixelbuf_parse_color(self, value);
-    _pixelbuf_set_pixel_color(self, index, rgbw);
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+    uint8_t w;
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self, value, &r, &g, &b, &w);
+    common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self, index, r, g, b, w);
 }
 
 void common_hal_adafruit_pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t *values,
@@ -322,10 +329,14 @@ void common_hal_adafruit_pixelbuf_pixelbuf_show(mp_obj_t self_in) {
 void common_hal_adafruit_pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t fill_color) {
     pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
 
-    color_u rgbw = _pixelbuf_parse_color(self, fill_color);
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+    uint8_t w;
+    common_hal_adafruit_pixelbuf_pixelbuf_parse_color(self, fill_color, &r, &g, &b, &w);
 
     for (size_t i = 0; i < self->pixel_count; i++) {
-        _pixelbuf_set_pixel_color(self, i, rgbw);
+        common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(self, i, r, g, b, w);
     }
     if (self->auto_write) {
         common_hal_adafruit_pixelbuf_pixelbuf_show(self_in);
diff --git a/shared-module/adafruit_pixelmap/PixelMap.c b/shared-module/adafruit_pixelmap/PixelMap.c
index 6897b172af..f2c73c7a61 100644
--- a/shared-module/adafruit_pixelmap/PixelMap.c
+++ b/shared-module/adafruit_pixelmap/PixelMap.c
@@ -32,12 +32,6 @@
 #include "shared-bindings/adafruit_pixelbuf/PixelBuf.h"
 #include "shared-module/adafruit_pixelmap/PixelMap.h"
 
-typedef union {
-    uint32_t rgbw;
-    struct {
-        uint8_t r, g, b, w;
-    };
-} color_u;
 
 static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) {
     mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);

From 79f434486044d5de1ae3378c397a10fedfce81c1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 23 Nov 2022 22:11:41 -0500
Subject: [PATCH 1424/2403] fix playing mono files on stereo output

---
 ports/atmel-samd/common-hal/audioio/AudioOut.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/common-hal/audioio/AudioOut.c b/ports/atmel-samd/common-hal/audioio/AudioOut.c
index a565a77042..7007672b3f 100644
--- a/ports/atmel-samd/common-hal/audioio/AudioOut.c
+++ b/ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -405,7 +405,13 @@ void common_hal_audioio_audioout_play(audioio_audioout_obj_t *self,
     if (self->right_channel == &pin_PA02) {
         right_channel_reg = (uint32_t)&DAC->DATABUF[0].reg;
     }
-    if (right_channel_reg == left_channel_reg + 2 && audiosample_bits_per_sample(sample) == 16) {
+
+    size_t num_channels = audiosample_channel_count(sample);
+
+    if (num_channels == 2 &&
+        // Are DAC channels sequential?
+        left_channel_reg + 2 == right_channel_reg &&
+        audiosample_bits_per_sample(sample) == 16) {
         result = audio_dma_setup_playback(&self->left_dma, sample, loop, false, 0,
             false /* output unsigned */,
             left_channel_reg,
@@ -415,7 +421,11 @@ void common_hal_audioio_audioout_play(audioio_audioout_obj_t *self,
             false /* output unsigned */,
             left_channel_reg,
             left_channel_trigger);
-        if (right_channel_reg != 0 && result == AUDIO_DMA_OK) {
+        // Don't play back on right channel unless stereo.
+        // TODO possibility: Set up non-incrementing DMA on one channel so they use the same samples?
+        // Right now, playing back mono on both channels causes sample to play twice as fast.
+        if (num_channels == 2 &&
+            right_channel_reg != 0 && result == AUDIO_DMA_OK) {
             result = audio_dma_setup_playback(&self->right_dma, sample, loop, true, 1,
                 false /* output unsigned */,
                 right_channel_reg,

From c0b57ff8c5901fb177d6532b085a16792e7d1774 Mon Sep 17 00:00:00 2001
From: Jeffrey Shimbo <16313374+jshimbo@users.noreply.github.com>
Date: Thu, 24 Nov 2022 06:05:46 -0800
Subject: [PATCH 1425/2403] Typo in docs for supervisor.ticks_ms()

https://docs.circuitpython.org/en/latest/shared-bindings/supervisor/index.html#supervisor.ticks_ms
ticks_add() helper function has an error
---
 shared-bindings/supervisor/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index b61d05d636..37f35e2e18 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -197,7 +197,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_next_code_file_obj, 0, supervisor_set_
 //|
 //|         def ticks_add(ticks, delta):
 //|             "Add a delta to a base number of ticks, performing wraparound at 2**29ms."
-//|             return (a + b) % _TICKS_PERIOD
+//|             return (ticks + delta) % _TICKS_PERIOD
 //|
 //|         def ticks_diff(ticks1, ticks2):
 //|             "Compute the signed difference between two ticks values, assuming that they are within 2**28 ticks"

From 57d7f7f2adce8008690f6efd865d0994d4e52143 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Thu, 24 Nov 2022 09:07:08 -0600
Subject: [PATCH 1426/2403] move to _pixelmap

---
 py/circuitpy_defns.mk                                  |  6 +++---
 .../{adafruit_pixelmap => _pixelmap}/PixelMap.c        |  4 ++--
 .../{adafruit_pixelmap => _pixelmap}/PixelMap.h        |  0
 .../{adafruit_pixelmap => _pixelmap}/__init__.c        | 10 +++++-----
 .../{adafruit_pixelmap => _pixelmap}/__init__.h        |  0
 .../{adafruit_pixelmap => _pixelmap}/PixelMap.c        |  4 ++--
 .../{adafruit_pixelmap => _pixelmap}/PixelMap.h        |  0
 .../{adafruit_pixelmap => _pixelmap}/__init__.c        |  0
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename shared-bindings/{adafruit_pixelmap => _pixelmap}/PixelMap.c (98%)
 rename shared-bindings/{adafruit_pixelmap => _pixelmap}/PixelMap.h (100%)
 rename shared-bindings/{adafruit_pixelmap => _pixelmap}/__init__.c (85%)
 rename shared-bindings/{adafruit_pixelmap => _pixelmap}/__init__.h (100%)
 rename shared-module/{adafruit_pixelmap => _pixelmap}/PixelMap.c (98%)
 rename shared-module/{adafruit_pixelmap => _pixelmap}/PixelMap.h (100%)
 rename shared-module/{adafruit_pixelmap => _pixelmap}/__init__.c (100%)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 0d70068e43..70310106f0 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -267,7 +267,7 @@ ifeq ($(CIRCUITPY_PIXELBUF),1)
 SRC_PATTERNS += adafruit_pixelbuf/%
 endif
 ifeq ($(CIRCUITPY_PIXELMAP),1)
-SRC_PATTERNS += adafruit_pixelmap/%
+SRC_PATTERNS += _pixelmap/%
 endif
 ifeq ($(CIRCUITPY_QRIO),1)
 SRC_PATTERNS += qrio/%
@@ -546,8 +546,8 @@ SRC_SHARED_MODULE_ALL = \
 	_eve/__init__.c \
 	adafruit_pixelbuf/PixelBuf.c \
 	adafruit_pixelbuf/__init__.c \
-	adafruit_pixelmap/PixelMap.c \
-	adafruit_pixelmap/__init__.c \
+	_pixelmap/PixelMap.c \
+	_pixelmap/__init__.c \
 	_stage/Layer.c \
 	_stage/Text.c \
 	_stage/__init__.c \
diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.c b/shared-bindings/_pixelmap/PixelMap.c
similarity index 98%
rename from shared-bindings/adafruit_pixelmap/PixelMap.c
rename to shared-bindings/_pixelmap/PixelMap.c
index 3361534ca1..c5f7e0ddb5 100644
--- a/shared-bindings/adafruit_pixelmap/PixelMap.c
+++ b/shared-bindings/_pixelmap/PixelMap.c
@@ -29,9 +29,9 @@
 #include "py/objtype.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+#include "shared-bindings/_pixelmap/PixelMap.h"
 #include "shared-bindings/adafruit_pixelbuf/PixelBuf.h"
-#include "shared-module/adafruit_pixelmap/PixelMap.h"
+#include "shared-module/_pixelmap/PixelMap.h"
 
 //| from adafruit_pixelbuf import PixelBuf, PixelReturnType, PixelSequence, PixelType
 //|
diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.h b/shared-bindings/_pixelmap/PixelMap.h
similarity index 100%
rename from shared-bindings/adafruit_pixelmap/PixelMap.h
rename to shared-bindings/_pixelmap/PixelMap.h
diff --git a/shared-bindings/adafruit_pixelmap/__init__.c b/shared-bindings/_pixelmap/__init__.c
similarity index 85%
rename from shared-bindings/adafruit_pixelmap/__init__.c
rename to shared-bindings/_pixelmap/__init__.c
index 7b10471c83..13a09d69d2 100644
--- a/shared-bindings/adafruit_pixelmap/__init__.c
+++ b/shared-bindings/_pixelmap/__init__.c
@@ -29,13 +29,13 @@
 #include "py/runtime.h"
 #include "py/objproperty.h"
 
-#include "shared-bindings/adafruit_pixelmap/__init__.h"
-#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+#include "shared-bindings/_pixelmap/__init__.h"
+#include "shared-bindings/_pixelmap/PixelMap.h"
 
 
 //| """A fast pixel mapping library
 //|
-//| The `adafruit_pixelmap` module provides the :py:class:`PixelMap` class to accelerate
+//| The `_pixelmap` module provides the :py:class:`PixelMap` class to accelerate
 //| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel."""
 //|
 //| # The types accepted when getting a pixel value
@@ -48,7 +48,7 @@
 //| PixelSequence = Union[Tuple[PixelType], List[PixelType]]
 
 STATIC const mp_rom_map_elem_t pixelmap_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_pixelmap) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pixelmap) },
     { MP_ROM_QSTR(MP_QSTR_PixelMap), MP_ROM_PTR(&pixelmap_pixelmap_type) },
 };
 
@@ -59,4 +59,4 @@ const mp_obj_module_t pixelmap_module = {
     .globals = (mp_obj_dict_t *)&pixelmap_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_adafruit_pixelmap, pixelmap_module, CIRCUITPY_PIXELMAP);
+MP_REGISTER_MODULE(MP_QSTR__pixelmap, pixelmap_module, CIRCUITPY_PIXELMAP);
diff --git a/shared-bindings/adafruit_pixelmap/__init__.h b/shared-bindings/_pixelmap/__init__.h
similarity index 100%
rename from shared-bindings/adafruit_pixelmap/__init__.h
rename to shared-bindings/_pixelmap/__init__.h
diff --git a/shared-module/adafruit_pixelmap/PixelMap.c b/shared-module/_pixelmap/PixelMap.c
similarity index 98%
rename from shared-module/adafruit_pixelmap/PixelMap.c
rename to shared-module/_pixelmap/PixelMap.c
index f2c73c7a61..d20a6dd03c 100644
--- a/shared-module/adafruit_pixelmap/PixelMap.c
+++ b/shared-module/_pixelmap/PixelMap.c
@@ -28,9 +28,9 @@
 #include "py/smallint.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/adafruit_pixelmap/PixelMap.h"
+#include "shared-bindings/_pixelmap/PixelMap.h"
 #include "shared-bindings/adafruit_pixelbuf/PixelBuf.h"
-#include "shared-module/adafruit_pixelmap/PixelMap.h"
+#include "shared-module/_pixelmap/PixelMap.h"
 
 
 static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) {
diff --git a/shared-module/adafruit_pixelmap/PixelMap.h b/shared-module/_pixelmap/PixelMap.h
similarity index 100%
rename from shared-module/adafruit_pixelmap/PixelMap.h
rename to shared-module/_pixelmap/PixelMap.h
diff --git a/shared-module/adafruit_pixelmap/__init__.c b/shared-module/_pixelmap/__init__.c
similarity index 100%
rename from shared-module/adafruit_pixelmap/__init__.c
rename to shared-module/_pixelmap/__init__.c

From c6ca2bdd596bb52226e4d20c135861d8853104c2 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Thu, 24 Nov 2022 09:09:48 -0600
Subject: [PATCH 1427/2403] disable pixelmap on bluemicro833

---
 ports/nrf/boards/bluemicro833/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nrf/boards/bluemicro833/mpconfigboard.mk
index 6108f23102..9b230e9a53 100644
--- a/ports/nrf/boards/bluemicro833/mpconfigboard.mk
+++ b/ports/nrf/boards/bluemicro833/mpconfigboard.mk
@@ -13,4 +13,5 @@ CIRCUITPY_KEYPAD = 1
 CIRCUITPY_NVM = 0
 CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PIXELBUF  = 1
+CIRCUITPY_PIXELMAP = 0
 CIRCUITPY_TOUCHIO = 0

From fb46e7c4d8e044fc577dd588f200331a6236e03d Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Fri, 25 Nov 2022 12:13:44 +0100
Subject: [PATCH 1428/2403] Defined esp32 board for the esp32 devkit v1

---
 .../espressif/boards/esp32_devkit_v1/board.c  | 29 +++++++++
 .../boards/esp32_devkit_v1/mpconfigboard.h    | 60 +++++++++++++++++++
 .../boards/esp32_devkit_v1/mpconfigboard.mk   |  9 +++
 ports/espressif/boards/esp32_devkit_v1/pins.c | 45 ++++++++++++++
 .../boards/esp32_devkit_v1/sdkconfig          | 20 +++++++
 5 files changed, 163 insertions(+)
 create mode 100644 ports/espressif/boards/esp32_devkit_v1/board.c
 create mode 100644 ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
 create mode 100644 ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/esp32_devkit_v1/pins.c
 create mode 100644 ports/espressif/boards/esp32_devkit_v1/sdkconfig

diff --git a/ports/espressif/boards/esp32_devkit_v1/board.c b/ports/espressif/boards/esp32_devkit_v1/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/esp32_devkit_v1/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
new file mode 100644
index 0000000000..4ac75b3651
--- /dev/null
+++ b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME "ESP32 Devkit V1"
+#define MICROPY_HW_MCU_NAME "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+
+#define CIRCUITPY_BOARD_I2C (1)
+#define CIRCUITPY_BOARD_I2C_PIN                    \
+    {                                              \
+        {                                          \
+            .scl = &pin_GPIO22, .sda = &pin_GPIO21 \
+        }                                          \
+    }
+
+#define CIRCUITPY_BOARD_SPI (1)
+#define CIRCUITPY_BOARD_SPI_PIN                                            \
+    {                                                                      \
+        {                                                                  \
+            .clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19 \
+        }                                                                  \
+    }
+
+#define CIRCUITPY_BOARD_UART (1)
+#define CIRCUITPY_BOARD_UART_PIN                 \
+    {                                            \
+        {                                        \
+            .tx = &pin_GPIO17, .rx = &pin_GPIO16 \
+        }                                        \
+    }
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
new file mode 100644
index 0000000000..221543547c
--- /dev/null
+++ b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/esp32_devkit_v1/pins.c b/ports/espressif/boards/esp32_devkit_v1/pins.c
new file mode 100644
index 0000000000..b300f8a80a
--- /dev/null
+++ b/ports/espressif/boards/esp32_devkit_v1/pins.c
@@ -0,0 +1,45 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    {MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15)},
+    {MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2)},
+    {MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5)},
+    {MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19)},
+    {MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_RX0), MP_ROM_PTR(&pin_GPIO1)},
+    {MP_ROM_QSTR(MP_QSTR_TX0), MP_ROM_PTR(&pin_GPIO3)},
+    {MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22)},
+    {MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13)},
+    {MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)},
+    {MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14)},
+    {MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27)},
+    {MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25)},
+    {MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33)},
+    {MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32)},
+    {MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35)},
+    {MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34)},
+
+    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2)},
+
+    {MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22)},
+
+    {MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19)},
+
+    {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16)},
+
+    {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/esp32_devkit_v1/sdkconfig b/ports/espressif/boards/esp32_devkit_v1/sdkconfig
new file mode 100644
index 0000000000..6c0168c829
--- /dev/null
+++ b/ports/espressif/boards/esp32_devkit_v1/sdkconfig
@@ -0,0 +1,20 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 26fbb25653f78335ff5b4c70194b08f98492fb0c Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Fri, 25 Nov 2022 13:55:06 +0100
Subject: [PATCH 1429/2403] Fixed formatting

---
 .../boards/esp32_devkit_v1/mpconfigboard.h    |   29 +-
 ports/espressif/boards/esp32_devkit_v1/pins.c |    3 +-
 uncrustify.cfg                                | 3128 +++++++++++++++++
 3 files changed, 3137 insertions(+), 23 deletions(-)
 create mode 100644 uncrustify.cfg

diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
index 4ac75b3651..2a0dcd0104 100644
--- a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
+++ b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
@@ -29,31 +29,16 @@
 #define MICROPY_HW_BOARD_NAME "ESP32 Devkit V1"
 #define MICROPY_HW_MCU_NAME "ESP32"
 
-#define MICROPY_HW_LED_STATUS (&pin_GPIO2)
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO2)
 
-#define CIRCUITPY_BOARD_I2C (1)
-#define CIRCUITPY_BOARD_I2C_PIN                    \
-    {                                              \
-        {                                          \
-            .scl = &pin_GPIO22, .sda = &pin_GPIO21 \
-        }                                          \
-    }
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
 
-#define CIRCUITPY_BOARD_SPI (1)
-#define CIRCUITPY_BOARD_SPI_PIN                                            \
-    {                                                                      \
-        {                                                                  \
-            .clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19 \
-        }                                                                  \
-    }
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
 
-#define CIRCUITPY_BOARD_UART (1)
-#define CIRCUITPY_BOARD_UART_PIN                 \
-    {                                            \
-        {                                        \
-            .tx = &pin_GPIO17, .rx = &pin_GPIO16 \
-        }                                        \
-    }
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/esp32_devkit_v1/pins.c b/ports/espressif/boards/esp32_devkit_v1/pins.c
index b300f8a80a..78c37897ac 100644
--- a/ports/espressif/boards/esp32_devkit_v1/pins.c
+++ b/ports/espressif/boards/esp32_devkit_v1/pins.c
@@ -41,5 +41,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     {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_UART), MP_ROM_PTR(&board_uart_obj)}
+};
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/uncrustify.cfg b/uncrustify.cfg
new file mode 100644
index 0000000000..63e22e9391
--- /dev/null
+++ b/uncrustify.cfg
@@ -0,0 +1,3128 @@
+# Uncrustify-0.72.0_f
+
+#
+# General options
+#
+
+# The type of line endings.
+#
+# Default: auto
+newlines                        = auto     # lf/crlf/cr/auto
+
+# The original size of tabs in the input.
+#
+# Default: 8
+input_tab_size                  = 8        # unsigned number
+
+# The size of tabs in the output (only used if align_with_tabs=true).
+#
+# Default: 8
+output_tab_size                 = 8        # unsigned number
+
+# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
+#
+# Default: 92
+string_escape_char              = 92       # unsigned number
+
+# Alternate string escape char (usually only used for Pawn).
+# Only works right before the quote char.
+string_escape_char2             = 0        # unsigned number
+
+# Replace tab characters found in string literals with the escape sequence \t
+# instead.
+string_replace_tab_chars        = false    # true/false
+
+# Allow interpreting '>=' and '>>=' as part of a template in code like
+# 'void f(list>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
+# Improvements to template detection may make this option obsolete.
+tok_split_gte                   = false    # true/false
+
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+disable_processing_nl_cont      = false    # true/false
+
+# Specify the marker used in comments to disable processing of part of the
+# file.
+# The comment should be used alone in one line.
+#
+# Default:  *INDENT-OFF*
+disable_processing_cmt          = " *INDENT-OFF*"      # string
+
+# Specify the marker used in comments to (re)enable processing in a file.
+# The comment should be used alone in one line.
+#
+# Default:  *INDENT-ON*
+enable_processing_cmt           = " *INDENT-ON*"     # string
+
+# Enable parsing of digraphs.
+enable_digraphs                 = false    # true/false
+
+# Add or remove the UTF-8 BOM (recommend 'remove').
+utf8_bom                        = ignore   # ignore/add/remove/force
+
+# If the file contains bytes with values between 128 and 255, but is not
+# UTF-8, then output as UTF-8.
+utf8_byte                       = false    # true/false
+
+# Force the output encoding to UTF-8.
+utf8_force                      = false    # true/false
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'while' and '('.
+sp_while_paren_open             = ignore   # ignore/add/remove/force
+
+#
+# Spacing options
+#
+
+# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
+# '<<', and so forth).
+sp_arith                        = ignore   # ignore/add/remove/force
+
+# Add or remove space around arithmetic operators '+' and '-'.
+#
+# Overrides sp_arith.
+sp_arith_additive               = ignore   # ignore/add/remove/force
+
+# Add or remove space around assignment operator '=', '+=', etc.
+sp_assign                       = ignore   # ignore/add/remove/force
+
+# Add or remove space around '=' in C++11 lambda capture specifications.
+#
+# Overrides sp_assign.
+sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
+
+# Add or remove space after the capture specification of a C++11 lambda when
+# an argument list is present, as in '[]  (int x){ ... }'.
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+
+# Add or remove space after the capture specification of a C++11 lambda with
+# no argument list is present, as in '[]  { ... }'.
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+
+# Add or remove space after the argument list of a C++11 lambda, as in
+# '[](int x)  { ... }'.
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+
+# Add or remove space between a lambda body and its call operator of an
+# immediately invoked lambda, as in '[]( ... ){ ... }  ( ... )'.
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+
+# Add or remove space around assignment operator '=' in a prototype.
+#
+# If set to ignore, use sp_assign.
+sp_assign_default               = ignore   # ignore/add/remove/force
+
+# Add or remove space before assignment operator '=', '+=', etc.
+#
+# Overrides sp_assign.
+sp_before_assign                = ignore   # ignore/add/remove/force
+
+# Add or remove space after assignment operator '=', '+=', etc.
+#
+# Overrides sp_assign.
+sp_after_assign                 = ignore   # ignore/add/remove/force
+
+# Add or remove space in 'NS_ENUM ('.
+sp_enum_paren                   = ignore   # ignore/add/remove/force
+
+# Add or remove space around assignment '=' in enum.
+sp_enum_assign                  = ignore   # ignore/add/remove/force
+
+# Add or remove space before assignment '=' in enum.
+#
+# Overrides sp_enum_assign.
+sp_enum_before_assign           = ignore   # ignore/add/remove/force
+
+# Add or remove space after assignment '=' in enum.
+#
+# Overrides sp_enum_assign.
+sp_enum_after_assign            = ignore   # ignore/add/remove/force
+
+# Add or remove space around assignment ':' in enum.
+sp_enum_colon                   = ignore   # ignore/add/remove/force
+
+# Add or remove space around preprocessor '##' concatenation operator.
+#
+# Default: add
+sp_pp_concat                    = add      # ignore/add/remove/force
+
+# Add or remove space after preprocessor '#' stringify operator.
+# Also affects the '#@' charizing operator.
+sp_pp_stringify                 = ignore   # ignore/add/remove/force
+
+# Add or remove space before preprocessor '#' stringify operator
+# as in '#define x(y) L#y'.
+sp_before_pp_stringify          = ignore   # ignore/add/remove/force
+
+# Add or remove space around boolean operators '&&' and '||'.
+sp_bool                         = ignore   # ignore/add/remove/force
+
+# Add or remove space around compare operator '<', '>', '==', etc.
+sp_compare                      = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '(' and ')'.
+sp_inside_paren                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
+sp_paren_paren                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
+sp_cparen_oparen                = ignore   # ignore/add/remove/force
+
+# Whether to balance spaces inside nested parentheses.
+sp_balance_nested_parens        = false    # true/false
+
+# Add or remove space between ')' and '{'.
+sp_paren_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove space before pointer star '*'.
+sp_before_ptr_star              = ignore   # ignore/add/remove/force
+
+# Add or remove space before pointer star '*' that isn't followed by a
+# variable name. If set to ignore, sp_before_ptr_star is used instead.
+sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
+
+# Add or remove space between pointer stars '*'.
+sp_between_ptr_star             = ignore   # ignore/add/remove/force
+
+# Add or remove space after pointer star '*', if followed by a word.
+#
+# Overrides sp_type_func.
+sp_after_ptr_star               = ignore   # ignore/add/remove/force
+
+# Add or remove space after pointer caret '^', if followed by a word.
+sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force
+
+# Add or remove space after pointer star '*', if followed by a qualifier.
+sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
+
+# Add or remove space after a pointer star '*', if followed by a function
+# prototype or function definition.
+#
+# Overrides sp_after_ptr_star and sp_type_func.
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+
+# Add or remove space after a pointer star '*', if followed by an open
+# parenthesis, as in 'void* (*)().
+sp_ptr_star_paren               = ignore   # ignore/add/remove/force
+
+# Add or remove space before a pointer star '*', if followed by a function
+# prototype or function definition.
+sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&'.
+sp_before_byref                 = ignore   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&' that isn't followed by a
+# variable name. If set to ignore, sp_before_byref is used instead.
+sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
+
+# Add or remove space after reference sign '&', if followed by a word.
+#
+# Overrides sp_type_func.
+sp_after_byref                  = ignore   # ignore/add/remove/force
+
+# Add or remove space after a reference sign '&', if followed by a function
+# prototype or function definition.
+#
+# Overrides sp_after_byref and sp_type_func.
+sp_after_byref_func             = ignore   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&', if followed by a function
+# prototype or function definition.
+sp_before_byref_func            = ignore   # ignore/add/remove/force
+
+# Add or remove space between type and word. In cases where total removal of
+# whitespace would be a syntax error, a value of 'remove' is treated the same
+# as 'force'.
+#
+# This also affects some other instances of space following a type that are
+# not covered by other options; for example, between the return type and
+# parenthesis of a function type template argument, between the type and
+# parenthesis of an array parameter, or between 'decltype(...)' and the
+# following word.
+#
+# Default: force
+sp_after_type                   = force    # ignore/add/remove/force
+
+# Add or remove space between 'decltype(...)' and word.
+#
+# Overrides sp_after_type.
+sp_after_decltype               = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space before the parenthesis in the D constructs
+# 'template Foo(' and 'class Foo('.
+sp_before_template_paren        = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'template' and '<'.
+# If set to ignore, sp_before_angle is used.
+sp_template_angle               = ignore   # ignore/add/remove/force
+
+# Add or remove space before '<'.
+sp_before_angle                 = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '<' and '>'.
+sp_inside_angle                 = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '<>'.
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+
+# Add or remove space between '>' and ':'.
+sp_angle_colon                  = ignore   # ignore/add/remove/force
+
+# Add or remove space after '>'.
+sp_after_angle                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between '>' and '(' as found in 'new List(foo);'.
+sp_angle_paren                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between '>' and '()' as found in 'new List();'.
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+
+# Add or remove space between '>' and a word as in 'List m;' or
+# 'template  static ...'.
+sp_angle_word                   = ignore   # ignore/add/remove/force
+
+# Add or remove space between '>' and '>' in '>>' (template stuff).
+#
+# Default: add
+sp_angle_shift                  = add      # ignore/add/remove/force
+
+# (C++11) Permit removal of the space between '>>' in 'foo >'. Note
+# that sp_angle_shift cannot remove the space without this option.
+sp_permit_cpp11_shift           = false    # true/false
+
+# Add or remove space before '(' of control statements ('if', 'for', 'switch',
+# 'while', etc.).
+sp_before_sparen                = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '(' and ')' of control statements.
+sp_inside_sparen                = ignore   # ignore/add/remove/force
+
+# Add or remove space after '(' of control statements.
+#
+# Overrides sp_inside_sparen.
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+
+# Add or remove space before ')' of control statements.
+#
+# Overrides sp_inside_sparen.
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+
+# Add or remove space after ')' of control statements.
+sp_after_sparen                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of of control statements.
+sp_sparen_brace                 = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space between 'invariant' and '('.
+sp_invariant_paren              = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space after the ')' in 'invariant (C) c'.
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+
+# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
+sp_special_semi                 = ignore   # ignore/add/remove/force
+
+# Add or remove space before ';'.
+#
+# Default: remove
+sp_before_semi                  = remove   # ignore/add/remove/force
+
+# Add or remove space before ';' in non-empty 'for' statements.
+sp_before_semi_for              = ignore   # ignore/add/remove/force
+
+# Add or remove space before a semicolon of an empty part of a for statement.
+sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
+
+# Add or remove space after ';', except when followed by a comment.
+#
+# Default: add
+sp_after_semi                   = add      # ignore/add/remove/force
+
+# Add or remove space after ';' in non-empty 'for' statements.
+#
+# Default: force
+sp_after_semi_for               = force    # ignore/add/remove/force
+
+# Add or remove space after the final semicolon of an empty part of a for
+# statement, as in 'for ( ; ;  )'.
+sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
+
+# Add or remove space before '[' (except '[]').
+sp_before_square                = ignore   # ignore/add/remove/force
+
+# Add or remove space before '[' for a variable definition.
+#
+# Default: remove
+sp_before_vardef_square         = remove   # ignore/add/remove/force
+
+# Add or remove space before '[' for asm block.
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+
+# Add or remove space before '[]'.
+sp_before_squares               = ignore   # ignore/add/remove/force
+
+# Add or remove space before C++17 structured bindings.
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+
+# Add or remove space inside a non-empty '[' and ']'.
+sp_inside_square                = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '[]'.
+sp_inside_square_empty          = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
+# ']'. If set to ignore, sp_inside_square is used.
+sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
+
+# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
+sp_after_comma                  = ignore   # ignore/add/remove/force
+
+# Add or remove space before ','.
+#
+# Default: remove
+sp_before_comma                 = remove   # ignore/add/remove/force
+
+# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# like 'int[,,]'.
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+
+# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# like 'int[,,]'.
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+
+# (C#) Add or remove space between ',' in multidimensional array type
+# like 'int[,,]'.
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+
+# Add or remove space between an open parenthesis and comma,
+# i.e. '(,' vs. '( ,'.
+#
+# Default: force
+sp_paren_comma                  = force    # ignore/add/remove/force
+
+# Add or remove space before the variadic '...' when preceded by a
+# non-punctuator.
+sp_before_ellipsis              = ignore   # ignore/add/remove/force
+
+# Add or remove space between a type and '...'.
+sp_type_ellipsis                = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space between a type and '?'.
+sp_type_question                = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and '...'.
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and a qualifier such as 'const'.
+sp_paren_qualifier              = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and 'noexcept'.
+sp_paren_noexcept               = ignore   # ignore/add/remove/force
+
+# Add or remove space after class ':'.
+sp_after_class_colon            = ignore   # ignore/add/remove/force
+
+# Add or remove space before class ':'.
+sp_before_class_colon           = ignore   # ignore/add/remove/force
+
+# Add or remove space after class constructor ':'.
+sp_after_constr_colon           = ignore   # ignore/add/remove/force
+
+# Add or remove space before class constructor ':'.
+sp_before_constr_colon          = ignore   # ignore/add/remove/force
+
+# Add or remove space before case ':'.
+#
+# Default: remove
+sp_before_case_colon            = remove   # ignore/add/remove/force
+
+# Add or remove space between 'operator' and operator sign.
+sp_after_operator               = ignore   # ignore/add/remove/force
+
+# Add or remove space between the operator symbol and the open parenthesis, as
+# in 'operator ++('.
+sp_after_operator_sym           = ignore   # ignore/add/remove/force
+
+# Overrides sp_after_operator_sym when the operator has no arguments, as in
+# 'operator *()'.
+sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
+
+# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
+# '(int)a' vs. '(int) a'.
+sp_after_cast                   = ignore   # ignore/add/remove/force
+
+# Add or remove spaces inside cast parentheses.
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+
+# Add or remove space between the type and open parenthesis in a C++ cast,
+# i.e. 'int(exp)' vs. 'int (exp)'.
+sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'sizeof' and '('.
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'sizeof' and '...'.
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'sizeof...' and '('.
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'decltype' and '('.
+sp_decltype_paren               = ignore   # ignore/add/remove/force
+
+# (Pawn) Add or remove space after the tag keyword.
+sp_after_tag                    = ignore   # ignore/add/remove/force
+
+# Add or remove space inside enum '{' and '}'.
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+
+# Add or remove space inside struct/union '{' and '}'.
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+
+# Add or remove space after open brace in an unnamed temporary
+# direct-list-initialization.
+sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
+
+# Add or remove space before close brace in an unnamed temporary
+# direct-list-initialization.
+sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
+
+# Add or remove space inside an unnamed temporary direct-list-initialization.
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '{' and '}'.
+sp_inside_braces                = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '{}'.
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+
+# Add or remove space around trailing return operator '->'.
+sp_trailing_return              = ignore   # ignore/add/remove/force
+
+# Add or remove space between return type and function name. A minimum of 1
+# is forced except for pointer return types.
+sp_type_func                    = ignore   # ignore/add/remove/force
+
+# Add or remove space between type and open brace of an unnamed temporary
+# direct-list-initialization.
+sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function declaration.
+sp_func_proto_paren             = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '()' on function declaration
+# without parameters.
+sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '(' with a typedef specifier.
+sp_func_type_paren              = ignore   # ignore/add/remove/force
+
+# Add or remove space between alias name and '(' of a non-pointer function type typedef.
+sp_func_def_paren               = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '()' on function definition
+# without parameters.
+sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
+
+# Add or remove space inside empty function '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_fparens               = ignore   # ignore/add/remove/force
+
+# Add or remove space inside function '(' and ')'.
+sp_inside_fparen                = ignore   # ignore/add/remove/force
+
+# Add or remove space inside the first parentheses in a function type, as in
+# 'void (*x)(...)'.
+sp_inside_tparen                = ignore   # ignore/add/remove/force
+
+# Add or remove space between the ')' and '(' in a function type, as in
+# 'void (*x)(...)'.
+sp_after_tparen_close           = ignore   # ignore/add/remove/force
+
+# Add or remove space between ']' and '(' when part of a function call.
+sp_square_fparen                = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of function.
+sp_fparen_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of a function call in object
+# initialization.
+#
+# Overrides sp_fparen_brace.
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+
+# (Java) Add or remove space between ')' and '{{' of double brace initializer.
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function calls.
+sp_func_call_paren              = ignore   # ignore/add/remove/force
+
+# Add or remove space between function name and '()' on function calls without
+# parameters. If set to ignore (the default), sp_func_call_paren is used.
+sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
+
+# Add or remove space between the user function name and '(' on function
+# calls. You need to set a keyword to be a user function in the config file,
+# like:
+#   set func_call_user tr _ i18n
+sp_func_call_user_paren         = ignore   # ignore/add/remove/force
+
+# Add or remove space inside user function '(' and ')'.
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+
+# Add or remove space between nested parentheses with user functions,
+# i.e. '((' vs. '( ('.
+sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
+
+# Add or remove space between a constructor/destructor and the open
+# parenthesis.
+sp_func_class_paren             = ignore   # ignore/add/remove/force
+
+# Add or remove space between a constructor without parameters or destructor
+# and '()'.
+sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'return' and '('.
+sp_return_paren                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'return' and '{'.
+sp_return_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between '__attribute__' and '('.
+sp_attribute_paren              = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
+sp_defined_paren                = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'throw' and '(' in 'throw (something)'.
+sp_throw_paren                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'throw' and anything other than '(' as in
+# '@throw [...];'.
+sp_after_throw                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
+# If set to ignore, sp_before_sparen is used.
+sp_catch_paren                  = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between '@catch' and '('
+# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
+sp_oc_catch_paren               = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before Objective-C protocol list
+# as in '@protocol Protocol' or '@interface MyClass : NSObject'.
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between class name and '('
+# in '@interface className(categoryName):BaseClass'
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space between 'version' and '('
+# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
+sp_version_paren                = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space between 'scope' and '('
+# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
+sp_scope_paren                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'super' and '(' in 'super (something)'.
+#
+# Default: remove
+sp_super_paren                  = remove   # ignore/add/remove/force
+
+# Add or remove space between 'this' and '(' in 'this (something)'.
+#
+# Default: remove
+sp_this_paren                   = remove   # ignore/add/remove/force
+
+# Add or remove space between a macro name and its definition.
+sp_macro                        = ignore   # ignore/add/remove/force
+
+# Add or remove space between a macro function ')' and its definition.
+sp_macro_func                   = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'else' and '{' if on the same line.
+sp_else_brace                   = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'else' if on the same line.
+sp_brace_else                   = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and the name of a typedef on the same line.
+sp_brace_typedef                = ignore   # ignore/add/remove/force
+
+# Add or remove space before the '{' of a 'catch' statement, if the '{' and
+# 'catch' are on the same line, as in 'catch (decl)  {'.
+sp_catch_brace                  = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
+# and '@catch' are on the same line, as in '@catch (decl)  {'.
+# If set to ignore, sp_catch_brace is used.
+sp_oc_catch_brace               = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'catch' if on the same line.
+sp_brace_catch                  = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between '}' and '@catch' if on the same line.
+# If set to ignore, sp_brace_catch is used.
+sp_oc_brace_catch               = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'finally' and '{' if on the same line.
+sp_finally_brace                = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'finally' if on the same line.
+sp_brace_finally                = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'try' and '{' if on the same line.
+sp_try_brace                    = ignore   # ignore/add/remove/force
+
+# Add or remove space between get/set and '{' if on the same line.
+sp_getset_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between a variable and '{' for C++ uniform
+# initialization.
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+
+# Add or remove space between a variable and '{' for a namespace.
+#
+# Default: add
+sp_word_brace_ns                = add      # ignore/add/remove/force
+
+# Add or remove space before the '::' operator.
+sp_before_dc                    = ignore   # ignore/add/remove/force
+
+# Add or remove space after the '::' operator.
+sp_after_dc                     = ignore   # ignore/add/remove/force
+
+# (D) Add or remove around the D named array initializer ':' operator.
+sp_d_array_colon                = ignore   # ignore/add/remove/force
+
+# Add or remove space after the '!' (not) unary operator.
+#
+# Default: remove
+sp_not                          = remove   # ignore/add/remove/force
+
+# Add or remove space after the '~' (invert) unary operator.
+#
+# Default: remove
+sp_inv                          = remove   # ignore/add/remove/force
+
+# Add or remove space after the '&' (address-of) unary operator. This does not
+# affect the spacing after a '&' that is part of a type.
+#
+# Default: remove
+sp_addr                         = remove   # ignore/add/remove/force
+
+# Add or remove space around the '.' or '->' operators.
+#
+# Default: remove
+sp_member                       = remove   # ignore/add/remove/force
+
+# Add or remove space after the '*' (dereference) unary operator. This does
+# not affect the spacing after a '*' that is part of a type.
+#
+# Default: remove
+sp_deref                        = remove   # ignore/add/remove/force
+
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
+#
+# Default: remove
+sp_sign                         = remove   # ignore/add/remove/force
+
+# Add or remove space between '++' and '--' the word to which it is being
+# applied, as in '(--x)' or 'y++;'.
+#
+# Default: remove
+sp_incdec                       = remove   # ignore/add/remove/force
+
+# Add or remove space before a backslash-newline at the end of a line.
+#
+# Default: add
+sp_before_nl_cont               = add      # ignore/add/remove/force
+
+# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
+# or '+(int) bar;'.
+sp_after_oc_scope               = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after the colon in message specs,
+# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
+sp_after_oc_colon               = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before the colon in message specs,
+# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
+sp_before_oc_colon              = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'.
+sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'.
+sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after the colon in message specs,
+# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
+sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before the colon in message specs,
+# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
+sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after the (type) in message specs,
+# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
+sp_after_oc_type                = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after the first (type) in message specs,
+# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
+sp_after_oc_return_type         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between '@selector' and '(',
+# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
+# Also applies to '@protocol()' constructs.
+sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between '@selector(x)' and the following word,
+# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
+sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space inside '@selector' parentheses,
+# i.e. '@selector(foo)' vs. '@selector( foo )'.
+# Also applies to '@protocol()' constructs.
+sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space before a block pointer caret,
+# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
+sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after a block pointer caret,
+# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
+sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between the receiver and selector in a message,
+# as in '[receiver selector ...]'.
+sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space after '@property'.
+sp_after_oc_property            = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove space between '@synchronized' and the open parenthesis,
+# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
+sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
+
+# Add or remove space around the ':' in 'b ? t : f'.
+sp_cond_colon                   = ignore   # ignore/add/remove/force
+
+# Add or remove space before the ':' in 'b ? t : f'.
+#
+# Overrides sp_cond_colon.
+sp_cond_colon_before            = ignore   # ignore/add/remove/force
+
+# Add or remove space after the ':' in 'b ? t : f'.
+#
+# Overrides sp_cond_colon.
+sp_cond_colon_after             = ignore   # ignore/add/remove/force
+
+# Add or remove space around the '?' in 'b ? t : f'.
+sp_cond_question                = ignore   # ignore/add/remove/force
+
+# Add or remove space before the '?' in 'b ? t : f'.
+#
+# Overrides sp_cond_question.
+sp_cond_question_before         = ignore   # ignore/add/remove/force
+
+# Add or remove space after the '?' in 'b ? t : f'.
+#
+# Overrides sp_cond_question.
+sp_cond_question_after          = ignore   # ignore/add/remove/force
+
+# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
+# and ':'.
+#
+# Overrides all other sp_cond_* options.
+sp_cond_ternary_short           = ignore   # ignore/add/remove/force
+
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
+# sense here.
+sp_case_label                   = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space around the D '..' operator.
+sp_range                        = ignore   # ignore/add/remove/force
+
+# Add or remove space after ':' in a Java/C++11 range-based 'for',
+# as in 'for (Type var : expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force
+
+# Add or remove space before ':' in a Java/C++11 range-based 'for',
+# as in 'for (Type var : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force
+
+# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force
+
+# Add or remove space after the opening of a C++ comment,
+# i.e. '// A' vs. '//A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
+
+# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# sequences like '///', '///<', '//!' and '//!<'.
+sp_cmt_cpp_doxygen              = false    # true/false
+
+# If true, space is added with sp_cmt_cpp_start will be added after Qt
+# translator or meta-data comments like '//:', '//=', and '//~'.
+sp_cmt_cpp_qttr                 = false    # true/false
+
+# Add or remove space between #else or #endif and a trailing comment.
+sp_endif_cmt                    = ignore   # ignore/add/remove/force
+
+# Add or remove space after 'new', 'delete' and 'delete[]'.
+sp_after_new                    = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'new' and '(' in 'new()'.
+sp_between_new_paren            = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and type in 'new(foo) BAR'.
+sp_after_newop_paren            = ignore   # ignore/add/remove/force
+
+# Add or remove space inside parenthesis of the new operator
+# as in 'new(foo) BAR'.
+sp_inside_newop_paren           = ignore   # ignore/add/remove/force
+
+# Add or remove space after the open parenthesis of the new operator,
+# as in 'new(foo) BAR'.
+#
+# Overrides sp_inside_newop_paren.
+sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
+
+# Add or remove space before the close parenthesis of the new operator,
+# as in 'new(foo) BAR'.
+#
+# Overrides sp_inside_newop_paren.
+sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
+
+# Add or remove space before a trailing or embedded comment.
+sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
+
+# Number of spaces before a trailing or embedded comment.
+sp_num_before_tr_emb_cmt        = 0        # unsigned number
+
+# (Java) Add or remove space between an annotation and the open parenthesis.
+sp_annotation_paren             = ignore   # ignore/add/remove/force
+
+# If true, vbrace tokens are dropped to the previous token and skipped.
+sp_skip_vbrace_tokens           = false    # true/false
+
+# Add or remove space after 'noexcept'.
+sp_after_noexcept               = ignore   # ignore/add/remove/force
+
+# Add or remove space after '_'.
+sp_vala_after_translation       = ignore   # ignore/add/remove/force
+
+# If true, a  is inserted after #define.
+force_tab_after_define          = false    # true/false
+
+#
+# Indenting options
+#
+
+# The number of columns to indent per level. Usually 2, 3, 4, or 8.
+#
+# Default: 8
+indent_columns                  = 8        # unsigned number
+
+# The continuation indent. If non-zero, this overrides the indent of '(', '['
+# and '=' continuation indents. Negative values are OK; negative value is
+# absolute and not increased for each '(' or '[' level.
+#
+# For FreeBSD, this is set to 4.
+indent_continue                 = 0        # number
+
+# The continuation indent, only for class header line(s). If non-zero, this
+# overrides the indent of 'class' continuation indents.
+indent_continue_class_head      = 0        # unsigned number
+
+# Whether to indent empty lines (i.e. lines which contain only spaces before
+# the newline character).
+indent_single_newlines          = false    # true/false
+
+# The continuation indent for func_*_param if they are true. If non-zero, this
+# overrides the indent.
+indent_param                    = 0        # unsigned number
+
+# How to use tabs when indenting code.
+#
+# 0: Spaces only
+# 1: Indent with tabs to brace level, align with spaces (default)
+# 2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: 1
+indent_with_tabs                = 1        # unsigned number
+
+# Whether to indent comments that are not at a brace level with tabs on a
+# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
+indent_cmt_with_tabs            = false    # true/false
+
+# Whether to indent strings broken by '\' so that they line up.
+indent_align_string             = false    # true/false
+
+# The number of spaces to indent multi-line XML strings.
+# Requires indent_align_string=true.
+indent_xml_string               = 0        # unsigned number
+
+# Spaces to indent '{' from level.
+indent_brace                    = 0        # unsigned number
+
+# Whether braces are indented to the body level.
+indent_braces                   = false    # true/false
+
+# Whether to disable indenting function braces if indent_braces=true.
+indent_braces_no_func           = false    # true/false
+
+# Whether to disable indenting class braces if indent_braces=true.
+indent_braces_no_class          = false    # true/false
+
+# Whether to disable indenting struct braces if indent_braces=true.
+indent_braces_no_struct         = false    # true/false
+
+# Whether to indent based on the size of the brace parent,
+# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent             = false    # true/false
+
+# Whether to indent based on the open parenthesis instead of the open brace
+# in '({\n'.
+indent_paren_open_brace         = false    # true/false
+
+# (C#) Whether to indent the brace of a C# delegate by another level.
+indent_cs_delegate_brace        = false    # true/false
+
+# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
+# another level.
+indent_cs_delegate_body         = false    # true/false
+
+# Whether to indent the body of a 'namespace'.
+indent_namespace                = false    # true/false
+
+# Whether to indent only the first namespace, and not any nested namespaces.
+# Requires indent_namespace=true.
+indent_namespace_single_indent  = false    # true/false
+
+# The number of spaces to indent a namespace block.
+# If set to zero, use the value indent_columns
+indent_namespace_level          = 0        # unsigned number
+
+# If the body of the namespace is longer than this number, it won't be
+# indented. Requires indent_namespace=true. 0 means no limit.
+indent_namespace_limit          = 0        # unsigned number
+
+# Whether the 'extern "C"' body is indented.
+indent_extern                   = false    # true/false
+
+# Whether the 'class' body is indented.
+indent_class                    = false    # true/false
+
+# Whether to indent the stuff after a leading base class colon.
+indent_class_colon              = false    # true/false
+
+# Whether to indent based on a class colon instead of the stuff after the
+# colon. Requires indent_class_colon=true.
+indent_class_on_colon           = false    # true/false
+
+# Whether to indent the stuff after a leading class initializer colon.
+indent_constr_colon             = false    # true/false
+
+# Virtual indent from the ':' for member initializers.
+#
+# Default: 2
+indent_ctor_init_leading        = 2        # unsigned number
+
+# Additional indent for constructor initializer list.
+# Negative values decrease indent down to the first column.
+indent_ctor_init                = 0        # number
+
+# Whether to indent 'if' following 'else' as a new block under the 'else'.
+# If false, 'else\nif' is treated as 'else if' for indenting purposes.
+indent_else_if                  = false    # true/false
+
+# Amount to indent variable declarations after a open brace.
+#
+#  <0: Relative
+# >=0: Absolute
+indent_var_def_blk              = 0        # number
+
+# Whether to indent continued variable declarations instead of aligning.
+indent_var_def_cont             = false    # true/false
+
+# Whether to indent continued shift expressions ('<<' and '>>') instead of
+# aligning. Set align_left_shift=false when enabling this.
+indent_shift                    = false    # true/false
+
+# Whether to force indentation of function definitions to start in column 1.
+indent_func_def_force_col1      = false    # true/false
+
+# Whether to indent continued function call parameters one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_call_param          = false    # true/false
+
+# Whether to indent continued function definition parameters one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_def_param           = false    # true/false
+
+# for function definitions, only if indent_func_def_param is false
+# Allows to align params when appropriate and indent them when not
+# behave as if it was true if paren position is more than this value
+# if paren position is more than the option value
+indent_func_def_param_paren_pos_threshold = 0        # unsigned number
+
+# Whether to indent continued function call prototype one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_proto_param         = false    # true/false
+
+# Whether to indent continued function call declaration one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_class_param         = false    # true/false
+
+# Whether to indent continued class variable constructors one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_ctor_var_param      = false    # true/false
+
+# Whether to indent continued template parameter list one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_template_param           = false    # true/false
+
+# Double the indent for indent_func_xxx_param options.
+# Use both values of the options indent_columns and indent_param.
+indent_func_param_double        = false    # true/false
+
+# Indentation column for standalone 'const' qualifier on a function
+# prototype.
+indent_func_const               = 0        # unsigned number
+
+# Indentation column for standalone 'throw' qualifier on a function
+# prototype.
+indent_func_throw               = 0        # unsigned number
+
+# How to indent within a macro followed by a brace on the same line
+# This allows reducing the indent in macros that have (for example)
+# `do { ... } while (0)` blocks bracketing them.
+#
+# true:  add an indent for the brace on the same line as the macro
+# false: do not add an indent for the brace on the same line as the macro
+#
+# Default: true
+indent_macro_brace              = true     # true/false
+
+# The number of spaces to indent a continued '->' or '.'.
+# Usually set to 0, 1, or indent_columns.
+indent_member                   = 0        # unsigned number
+
+# Whether lines broken at '.' or '->' should be indented by a single indent.
+# The indent_member option will not be effective if this is set to true.
+indent_member_single            = false    # true/false
+
+# Spaces to indent single line ('//') comments on lines before code.
+indent_sing_line_comments       = 0        # unsigned number
+
+# When opening a paren for a control statement (if, for, while, etc), increase
+# the indent level by this value. Negative values decrease the indent level.
+indent_sparen_extra             = 0        # number
+
+# Whether to indent trailing single line ('//') comments relative to the code
+# instead of trying to keep the same absolute column.
+indent_relative_single_line_comments = false    # true/false
+
+# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+indent_switch_case              = 0        # unsigned number
+
+# indent 'break' with 'case' from 'switch'.
+indent_switch_break_with_case   = false    # true/false
+
+# Whether to indent preprocessor statements inside of switch statements.
+#
+# Default: true
+indent_switch_pp                = true     # true/false
+
+# Spaces to shift the 'case' line, without affecting any other lines.
+# Usually 0.
+indent_case_shift               = 0        # unsigned number
+
+# Spaces to indent '{' from 'case'. By default, the brace will appear under
+# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
+indent_case_brace               = 0        # number
+
+# Whether to indent comments found in first column.
+indent_col1_comment             = false    # true/false
+
+# Whether to indent multi string literal in first column.
+indent_col1_multi_string_literal = false    # true/false
+
+# How to indent goto labels.
+#
+#  >0: Absolute column where 1 is the leftmost column
+# <=0: Subtract from brace indent
+#
+# Default: 1
+indent_label                    = 1        # number
+
+# How to indent access specifiers that are followed by a
+# colon.
+#
+#  >0: Absolute column where 1 is the leftmost column
+# <=0: Subtract from brace indent
+#
+# Default: 1
+indent_access_spec              = 1        # number
+
+# Whether to indent the code after an access specifier by one level.
+# If true, this option forces 'indent_access_spec=0'.
+indent_access_spec_body         = false    # true/false
+
+# If an open parenthesis is followed by a newline, whether to indent the next
+# line so that it lines up after the open parenthesis (not recommended).
+indent_paren_nl                 = false    # true/false
+
+# How to indent a close parenthesis after a newline.
+#
+# 0: Indent to body level (default)
+# 1: Align under the open parenthesis
+# 2: Indent to the brace level
+indent_paren_close              = 0        # unsigned number
+
+# Whether to indent the open parenthesis of a function definition,
+# if the parenthesis is on its own line.
+indent_paren_after_func_def     = false    # true/false
+
+# Whether to indent the open parenthesis of a function declaration,
+# if the parenthesis is on its own line.
+indent_paren_after_func_decl    = false    # true/false
+
+# Whether to indent the open parenthesis of a function call,
+# if the parenthesis is on its own line.
+indent_paren_after_func_call    = false    # true/false
+
+# Whether to indent a comma when inside a parenthesis.
+# If true, aligns under the open parenthesis.
+indent_comma_paren              = false    # true/false
+
+# Whether to indent a Boolean operator when inside a parenthesis.
+# If true, aligns under the open parenthesis.
+indent_bool_paren               = false    # true/false
+
+# Whether to indent a semicolon when inside a for parenthesis.
+# If true, aligns under the open for parenthesis.
+indent_semicolon_for_paren      = false    # true/false
+
+# Whether to align the first expression to following ones
+# if indent_bool_paren=true.
+indent_first_bool_expr          = false    # true/false
+
+# Whether to align the first expression to following ones
+# if indent_semicolon_for_paren=true.
+indent_first_for_expr           = false    # true/false
+
+# If an open square is followed by a newline, whether to indent the next line
+# so that it lines up after the open square (not recommended).
+indent_square_nl                = false    # true/false
+
+# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
+indent_preserve_sql             = false    # true/false
+
+# Whether to align continued statements at the '='. If false or if the '=' is
+# followed by a newline, the next line is indent one tab.
+#
+# Default: true
+indent_align_assign             = true     # true/false
+
+# If true, the indentation of the chunks after a '=' sequence will be set at
+# LHS token indentation column before '='.
+indent_off_after_assign         = false    # true/false
+
+# Whether to align continued statements at the '('. If false or the '(' is
+# followed by a newline, the next line indent is one tab.
+#
+# Default: true
+indent_align_paren              = true     # true/false
+
+# (OC) Whether to indent Objective-C code inside message selectors.
+indent_oc_inside_msg_sel        = false    # true/false
+
+# (OC) Whether to indent Objective-C blocks at brace level instead of usual
+# rules.
+indent_oc_block                 = false    # true/false
+
+# (OC) Indent for Objective-C blocks in a message relative to the parameter
+# name.
+#
+# =0: Use indent_oc_block rules
+# >0: Use specified number of spaces to indent
+indent_oc_block_msg             = 0        # unsigned number
+
+# (OC) Minimum indent for subsequent parameters
+indent_oc_msg_colon             = 0        # unsigned number
+
+# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
+# from lines, if necessary).
+#
+# Default: true
+indent_oc_msg_prioritize_first_colon = true     # true/false
+
+# (OC) Whether to indent blocks the way that Xcode does by default
+# (from the keyword if the parameter is on its own line; otherwise, from the
+# previous indentation level). Requires indent_oc_block_msg=true.
+indent_oc_block_msg_xcode_style = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace is, relative to a
+# message keyword. Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_keyword = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace is, relative to a message
+# colon. Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_colon  = false    # true/false
+
+# (OC) Whether to indent blocks from where the block caret is.
+# Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_caret  = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace caret is.
+# Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_brace  = false    # true/false
+
+# When indenting after virtual brace open and newline add further spaces to
+# reach this minimum indent.
+indent_min_vbrace_open          = 0        # unsigned number
+
+# Whether to add further spaces after regular indent to reach next tabstop
+# when indenting after virtual brace open and newline.
+indent_vbrace_open_on_tabstop   = false    # true/false
+
+# How to indent after a brace followed by another token (not a newline).
+# true:  indent all contained lines to match the token
+# false: indent all contained lines to match the brace
+#
+# Default: true
+indent_token_after_brace        = true     # true/false
+
+# Whether to indent the body of a C++11 lambda.
+indent_cpp_lambda_body          = false    # true/false
+
+# How to indent compound literals that are being returned.
+# true: add both the indent from return & the compound literal open brace (ie:
+#       2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only add
+#        the indent for the return.
+#
+# Default: true
+indent_compound_literal_return  = true     # true/false
+
+# (C#) Whether to indent a 'using' block if no braces are used.
+#
+# Default: true
+indent_using_block              = true     # true/false
+
+# How to indent the continuation of ternary operator.
+#
+# 0: Off (default)
+# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 2: When the `:` is a continuation, indent it under `?`
+indent_ternary_operator         = 0        # unsigned number
+
+# Whether to indent the statments inside ternary operator.
+indent_inside_ternary_operator  = false    # true/false
+
+# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
+indent_off_after_return         = false    # true/false
+
+# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
+indent_off_after_return_new     = false    # true/false
+
+# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
+indent_single_after_return      = false    # true/false
+
+# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
+# have their own indentation).
+indent_ignore_asm_block         = false    # true/false
+
+# Don't indent the close parenthesis of a function definition,
+# if the parenthesis is on its own line.
+donot_indent_func_def_close_paren = false    # true/false
+
+#
+# Newline adding and removing options
+#
+
+# Whether to collapse empty blocks between '{' and '}'.
+# If true, overrides nl_inside_empty_func
+nl_collapse_empty_body          = false    # true/false
+
+# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
+nl_assign_leave_one_liners      = false    # true/false
+
+# Don't split one-line braced statements inside a 'class xx { }' body.
+nl_class_leave_one_liners       = false    # true/false
+
+# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners        = false    # true/false
+
+# Don't split one-line get or set functions.
+nl_getset_leave_one_liners      = false    # true/false
+
+# (C#) Don't split one-line property get or set functions.
+nl_cs_property_leave_one_liners = false    # true/false
+
+# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
+# might modify nl_func_type_name
+nl_func_leave_one_liners        = false    # true/false
+
+# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
+nl_cpp_lambda_leave_one_liners  = false    # true/false
+
+# Don't split one-line if/else statements, as in 'if(...) b++;'.
+nl_if_leave_one_liners          = false    # true/false
+
+# Don't split one-line while statements, as in 'while(...) b++;'.
+nl_while_leave_one_liners       = false    # true/false
+
+# Don't split one-line for statements, as in 'for(...) b++;'.
+nl_for_leave_one_liners         = false    # true/false
+
+# (OC) Don't split one-line Objective-C messages.
+nl_oc_msg_leave_one_liner       = false    # true/false
+
+# (OC) Add or remove newline between method declaration and '{'.
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove newline between Objective-C block signature and '{'.
+nl_oc_block_brace               = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove blank line before '@interface' statement.
+nl_oc_before_interface          = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove blank line before '@implementation' statement.
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove blank line before '@end' statement.
+nl_oc_before_end                = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove newline between '@interface' and '{'.
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove newline between '@implementation' and '{'.
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+
+# Add or remove newlines at the start of the file.
+nl_start_of_file                = ignore   # ignore/add/remove/force
+
+# The minimum number of newlines at the start of the file (only used if
+# nl_start_of_file is 'add' or 'force').
+nl_start_of_file_min            = 0        # unsigned number
+
+# Add or remove newline at the end of the file.
+nl_end_of_file                  = ignore   # ignore/add/remove/force
+
+# The minimum number of newlines at the end of the file (only used if
+# nl_end_of_file is 'add' or 'force').
+nl_end_of_file_min              = 0        # unsigned number
+
+# Add or remove newline between '=' and '{'.
+nl_assign_brace                 = ignore   # ignore/add/remove/force
+
+# (D) Add or remove newline between '=' and '['.
+nl_assign_square                = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '[]' and '{'.
+nl_tsquare_brace                = ignore   # ignore/add/remove/force
+
+# (D) Add or remove newline after '= ['. Will also affect the newline before
+# the ']'.
+nl_after_square_assign          = ignore   # ignore/add/remove/force
+
+# Add or remove newline between a function call's ')' and '{', as in
+# 'list_for_each(item, &list) { }'.
+nl_fcall_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'enum' and '{'.
+nl_enum_brace                   = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'enum' and 'class'.
+nl_enum_class                   = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'enum class' and the identifier.
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'enum class' type and ':'.
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'enum class identifier :' and type.
+nl_enum_colon_type              = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'struct and '{'.
+nl_struct_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'union' and '{'.
+nl_union_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'if' and '{'.
+nl_if_brace                     = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'else'.
+nl_brace_else                   = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'else if' and '{'. If set to ignore,
+# nl_if_brace is used instead.
+nl_elseif_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'else' and '{'.
+nl_else_brace                   = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'else' and 'if'.
+nl_else_if                      = ignore   # ignore/add/remove/force
+
+# Add or remove newline before '{' opening brace
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+
+# Add or remove newline before 'if'/'else if' closing parenthesis.
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'finally'.
+nl_brace_finally                = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'finally' and '{'.
+nl_finally_brace                = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'try' and '{'.
+nl_try_brace                    = ignore   # ignore/add/remove/force
+
+# Add or remove newline between get/set and '{'.
+nl_getset_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'for' and '{'.
+nl_for_brace                    = ignore   # ignore/add/remove/force
+
+# Add or remove newline before the '{' of a 'catch' statement, as in
+# 'catch (decl)  {'.
+nl_catch_brace                  = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
+# '@catch (decl)  {'. If set to ignore, nl_catch_brace is used.
+nl_oc_catch_brace               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'catch'.
+nl_brace_catch                  = ignore   # ignore/add/remove/force
+
+# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
+# nl_brace_catch is used.
+nl_oc_brace_catch               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and ']'.
+nl_brace_square                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and ')' in a function invocation.
+nl_brace_fparen                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'while' and '{'.
+nl_while_brace                  = ignore   # ignore/add/remove/force
+
+# (D) Add or remove newline between 'scope (x)' and '{'.
+nl_scope_brace                  = ignore   # ignore/add/remove/force
+
+# (D) Add or remove newline between 'unittest' and '{'.
+nl_unittest_brace               = ignore   # ignore/add/remove/force
+
+# (D) Add or remove newline between 'version (x)' and '{'.
+nl_version_brace                = ignore   # ignore/add/remove/force
+
+# (C#) Add or remove newline between 'using' and '{'.
+nl_using_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline between two open or close braces. Due to general
+# newline/brace handling, REMOVE may not work.
+nl_brace_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'do' and '{'.
+nl_do_brace                     = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'while' of 'do' statement.
+nl_brace_while                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'switch' and '{'.
+nl_switch_brace                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'synchronized' and '{'.
+nl_synchronized_brace           = ignore   # ignore/add/remove/force
+
+# Add a newline between ')' and '{' if the ')' is on a different line than the
+# if/for/etc.
+#
+# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
+# nl_catch_brace.
+nl_multi_line_cond              = false    # true/false
+
+# Add a newline after '(' if an if/for/while/switch condition spans multiple
+# lines
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+
+# Add a newline before ')' if an if/for/while/switch condition spans multiple
+# lines. Overrides nl_before_if_closing_paren if both are specified.
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+
+# Force a newline in a define after the macro name for multi-line defines.
+nl_multi_line_define            = false    # true/false
+
+# Whether to add a newline before 'case', and a blank line before a 'case'
+# statement that follows a ';' or '}'.
+nl_before_case                  = false    # true/false
+
+# Whether to add a newline after a 'case' statement.
+nl_after_case                   = false    # true/false
+
+# Add or remove newline between a case ':' and '{'.
+#
+# Overrides nl_after_case.
+nl_case_colon_brace             = ignore   # ignore/add/remove/force
+
+# Add or remove newline between ')' and 'throw'.
+nl_before_throw                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'namespace' and '{'.
+nl_namespace_brace              = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template class.
+nl_template_class               = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template class declaration.
+#
+# Overrides nl_template_class.
+nl_template_class_decl          = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<>' of a specialized class declaration.
+#
+# Overrides nl_template_class_decl.
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template class definition.
+#
+# Overrides nl_template_class.
+nl_template_class_def           = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<>' of a specialized class definition.
+#
+# Overrides nl_template_class_def.
+nl_template_class_def_special   = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template function.
+nl_template_func                = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template function
+# declaration.
+#
+# Overrides nl_template_func.
+nl_template_func_decl           = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<>' of a specialized function
+# declaration.
+#
+# Overrides nl_template_func_decl.
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template function
+# definition.
+#
+# Overrides nl_template_func.
+nl_template_func_def            = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<>' of a specialized function
+# definition.
+#
+# Overrides nl_template_func_def.
+nl_template_func_def_special    = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'template<...>' of a template variable.
+nl_template_var                 = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'template<...>' and 'using' of a templated
+# type alias.
+nl_template_using               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'class' and '{'.
+nl_class_brace                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline before or after (depending on pos_class_comma,
+# may not be IGNORE) each',' in the base class list.
+nl_class_init_args              = ignore   # ignore/add/remove/force
+
+# Add or remove newline after each ',' in the constructor member
+# initialization. Related to nl_constr_colon, pos_constr_colon and
+# pos_constr_comma.
+nl_constr_init_args             = ignore   # ignore/add/remove/force
+
+# Add or remove newline before first element, after comma, and after last
+# element, in 'enum'.
+nl_enum_own_lines               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in a function
+# definition.
+# might be modified by nl_func_leave_one_liners
+nl_func_type_name               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between return type and function name inside a class
+# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
+# is used instead.
+nl_func_type_name_class         = ignore   # ignore/add/remove/force
+
+# Add or remove newline between class specification and '::'
+# in 'void A::f() { }'. Only appears in separate member implementation (does
+# not appear with in-line implementation).
+nl_func_class_scope             = ignore   # ignore/add/remove/force
+
+# Add or remove newline between function scope and name, as in
+# 'void A ::  f() { }'.
+nl_func_scope_name              = ignore   # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in a prototype.
+nl_func_proto_type_name         = ignore   # ignore/add/remove/force
+
+# Add or remove newline between a function name and the opening '(' in the
+# declaration.
+nl_func_paren                   = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_paren for functions with no parameters.
+nl_func_paren_empty             = ignore   # ignore/add/remove/force
+
+# Add or remove newline between a function name and the opening '(' in the
+# definition.
+nl_func_def_paren               = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_def_paren for functions with no parameters.
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+
+# Add or remove newline between a function name and the opening '(' in the
+# call.
+nl_func_call_paren              = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_call_paren for functions with no parameters.
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+
+# Add or remove newline after '(' in a function declaration.
+nl_func_decl_start              = ignore   # ignore/add/remove/force
+
+# Add or remove newline after '(' in a function definition.
+nl_func_def_start               = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_decl_start when there is only one parameter.
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_def_start when there is only one parameter.
+nl_func_def_start_single        = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after '(' in a function declaration if '(' and ')'
+# are in different lines. If false, nl_func_decl_start is used instead.
+nl_func_decl_start_multi_line   = false    # true/false
+
+# Whether to add a newline after '(' in a function definition if '(' and ')'
+# are in different lines. If false, nl_func_def_start is used instead.
+nl_func_def_start_multi_line    = false    # true/false
+
+# Add or remove newline after each ',' in a function declaration.
+nl_func_decl_args               = ignore   # ignore/add/remove/force
+
+# Add or remove newline after each ',' in a function definition.
+nl_func_def_args                = ignore   # ignore/add/remove/force
+
+# Add or remove newline after each ',' in a function call.
+nl_func_call_args               = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after each ',' in a function declaration if '('
+# and ')' are in different lines. If false, nl_func_decl_args is used instead.
+nl_func_decl_args_multi_line    = false    # true/false
+
+# Whether to add a newline after each ',' in a function definition if '('
+# and ')' are in different lines. If false, nl_func_def_args is used instead.
+nl_func_def_args_multi_line     = false    # true/false
+
+# Add or remove newline before the ')' in a function declaration.
+nl_func_decl_end                = ignore   # ignore/add/remove/force
+
+# Add or remove newline before the ')' in a function definition.
+nl_func_def_end                 = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_decl_end when there is only one parameter.
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+
+# Overrides nl_func_def_end when there is only one parameter.
+nl_func_def_end_single          = ignore   # ignore/add/remove/force
+
+# Whether to add a newline before ')' in a function declaration if '(' and ')'
+# are in different lines. If false, nl_func_decl_end is used instead.
+nl_func_decl_end_multi_line     = false    # true/false
+
+# Whether to add a newline before ')' in a function definition if '(' and ')'
+# are in different lines. If false, nl_func_def_end is used instead.
+nl_func_def_end_multi_line      = false    # true/false
+
+# Add or remove newline between '()' in a function declaration.
+nl_func_decl_empty              = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '()' in a function definition.
+nl_func_def_empty               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between '()' in a function call.
+nl_func_call_empty              = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after '(' in a function call,
+# has preference over nl_func_call_start_multi_line.
+nl_func_call_start              = ignore   # ignore/add/remove/force
+
+# Whether to add a newline before ')' in a function call.
+nl_func_call_end                = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after '(' in a function call if '(' and ')' are in
+# different lines.
+nl_func_call_start_multi_line   = false    # true/false
+
+# Whether to add a newline after each ',' in a function call if '(' and ')'
+# are in different lines.
+nl_func_call_args_multi_line    = false    # true/false
+
+# Whether to add a newline before ')' in a function call if '(' and ')' are in
+# different lines.
+nl_func_call_end_multi_line     = false    # true/false
+
+# Whether to respect nl_func_call_XXX option incase of closure args.
+nl_func_call_args_multi_line_ignore_closures = false    # true/false
+
+# Whether to add a newline after '<' of a template parameter list.
+nl_template_start               = false    # true/false
+
+# Whether to add a newline after each ',' in a template parameter list.
+nl_template_args                = false    # true/false
+
+# Whether to add a newline before '>' of a template parameter list.
+nl_template_end                 = false    # true/false
+
+# (OC) Whether to put each Objective-C message parameter on a separate line.
+# See nl_oc_msg_leave_one_liner.
+nl_oc_msg_args                  = false    # true/false
+
+# Add or remove newline between function signature and '{'.
+nl_fdef_brace                   = ignore   # ignore/add/remove/force
+
+# Add or remove newline between function signature and '{',
+# if signature ends with ')'. Overrides nl_fdef_brace.
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+
+# Add or remove newline between C++11 lambda signature and '{'.
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+
+# Add or remove newline between 'return' and the return expression.
+nl_return_expr                  = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after semicolons, except in 'for' statements.
+nl_after_semicolon              = false    # true/false
+
+# (Java) Add or remove newline between the ')' and '{{' of the double brace
+# initializer.
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after the type in an unnamed temporary
+# direct-list-initialization.
+nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after the open brace in an unnamed temporary
+# direct-list-initialization.
+nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
+
+# Whether to add a newline before the close brace in an unnamed temporary
+# direct-list-initialization.
+nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
+
+# Whether to add a newline after '{'. This also adds a newline before the
+# matching '}'.
+nl_after_brace_open             = false    # true/false
+
+# Whether to add a newline between the open brace and a trailing single-line
+# comment. Requires nl_after_brace_open=true.
+nl_after_brace_open_cmt         = false    # true/false
+
+# Whether to add a newline after a virtual brace open with a non-empty body.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open            = false    # true/false
+
+# Whether to add a newline after a virtual brace open with an empty body.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open_empty      = false    # true/false
+
+# Whether to add a newline after '}'. Does not apply if followed by a
+# necessary ';'.
+nl_after_brace_close            = false    # true/false
+
+# Whether to add a newline after a virtual brace close,
+# as in 'if (foo) a++;  return;'.
+nl_after_vbrace_close           = false    # true/false
+
+# Add or remove newline between the close brace and identifier,
+# as in 'struct { int a; }  b;'. Affects enumerations, unions and
+# structures. If set to ignore, uses nl_after_brace_close.
+nl_brace_struct_var             = ignore   # ignore/add/remove/force
+
+# Whether to alter newlines in '#define' macros.
+nl_define_macro                 = false    # true/false
+
+# Whether to alter newlines between consecutive parenthesis closes. The number
+# of closing parentheses in a line will depend on respective open parenthesis
+# lines.
+nl_squeeze_paren_close          = false    # true/false
+
+# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
+# '#endif'. Does not affect top-level #ifdefs.
+nl_squeeze_ifdef                = false    # true/false
+
+# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
+nl_squeeze_ifdef_top_level      = false    # true/false
+
+# Add or remove blank line before 'if'.
+nl_before_if                    = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'if' statement. Add/Force work only if the
+# next token is not a closing brace.
+nl_after_if                     = ignore   # ignore/add/remove/force
+
+# Add or remove blank line before 'for'.
+nl_before_for                   = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'for' statement.
+nl_after_for                    = ignore   # ignore/add/remove/force
+
+# Add or remove blank line before 'while'.
+nl_before_while                 = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'while' statement.
+nl_after_while                  = ignore   # ignore/add/remove/force
+
+# Add or remove blank line before 'switch'.
+nl_before_switch                = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'switch' statement.
+nl_after_switch                 = ignore   # ignore/add/remove/force
+
+# Add or remove blank line before 'synchronized'.
+nl_before_synchronized          = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'synchronized' statement.
+nl_after_synchronized           = ignore   # ignore/add/remove/force
+
+# Add or remove blank line before 'do'.
+nl_before_do                    = ignore   # ignore/add/remove/force
+
+# Add or remove blank line after 'do/while' statement.
+nl_after_do                     = ignore   # ignore/add/remove/force
+
+# Whether to put a blank line before 'return' statements, unless after an open
+# brace.
+nl_before_return                = false    # true/false
+
+# Whether to put a blank line after 'return' statements, unless followed by a
+# close brace.
+nl_after_return                 = false    # true/false
+
+# Whether to put a blank line before a member '.' or '->' operators.
+nl_before_member                = ignore   # ignore/add/remove/force
+
+# (Java) Whether to put a blank line after a member '.' or '->' operators.
+nl_after_member                 = ignore   # ignore/add/remove/force
+
+# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
+nl_ds_struct_enum_cmt           = false    # true/false
+
+# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
+# (Lower priority than eat_blanks_before_close_brace.)
+nl_ds_struct_enum_close_brace   = false    # true/false
+
+# Add or remove newline before or after (depending on pos_class_colon) a class
+# colon, as in 'class Foo  :  public Bar'.
+nl_class_colon                  = ignore   # ignore/add/remove/force
+
+# Add or remove newline around a class constructor colon. The exact position
+# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
+nl_constr_colon                 = ignore   # ignore/add/remove/force
+
+# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
+# into a single line. If true, prevents other brace newline rules from turning
+# such code into four lines.
+nl_namespace_two_to_one_liner   = false    # true/false
+
+# Whether to remove a newline in simple unbraced if statements, turning them
+# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
+nl_create_if_one_liner          = false    # true/false
+
+# Whether to remove a newline in simple unbraced for statements, turning them
+# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
+nl_create_for_one_liner         = false    # true/false
+
+# Whether to remove a newline in simple unbraced while statements, turning
+# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
+nl_create_while_one_liner       = false    # true/false
+
+# Whether to collapse a function definition whose body (not counting braces)
+# is only one line so that the entire definition (prototype, braces, body) is
+# a single line.
+nl_create_func_def_one_liner    = false    # true/false
+
+# Whether to collapse a function definition whose body (not counting braces)
+# is only one line so that the entire definition (prototype, braces, body) is
+# a single line.
+nl_create_list_one_liner        = false    # true/false
+
+# Whether to split one-line simple unbraced if statements into two lines by
+# adding a newline, as in 'if(b)  i++;'.
+nl_split_if_one_liner           = false    # true/false
+
+# Whether to split one-line simple unbraced for statements into two lines by
+# adding a newline, as in 'for (...)  stmt;'.
+nl_split_for_one_liner          = false    # true/false
+
+# Whether to split one-line simple unbraced while statements into two lines by
+# adding a newline, as in 'while (expr)  stmt;'.
+nl_split_while_one_liner        = false    # true/false
+
+# Don't add a newline before a cpp-comment in a parameter list of a function
+# call.
+donot_add_nl_before_cpp_comment = false    # true/false
+
+#
+# Blank line options
+#
+
+# The maximum number of consecutive newlines (3 = 2 blank lines).
+nl_max                          = 0        # unsigned number
+
+# The maximum number of consecutive newlines in a function.
+nl_max_blank_in_func            = 0        # unsigned number
+
+# The number of newlines inside an empty function body.
+# This option is overridden by nl_collapse_empty_body=true
+nl_inside_empty_func            = 0        # unsigned number
+
+# The number of newlines before a function prototype.
+nl_before_func_body_proto       = 0        # unsigned number
+
+# The number of newlines before a multi-line function definition.
+nl_before_func_body_def         = 0        # unsigned number
+
+# The number of newlines before a class constructor/destructor prototype.
+nl_before_func_class_proto      = 0        # unsigned number
+
+# The number of newlines before a class constructor/destructor definition.
+nl_before_func_class_def        = 0        # unsigned number
+
+# The number of newlines after a function prototype.
+nl_after_func_proto             = 0        # unsigned number
+
+# The number of newlines after a function prototype, if not followed by
+# another function prototype.
+nl_after_func_proto_group       = 0        # unsigned number
+
+# The number of newlines after a class constructor/destructor prototype.
+nl_after_func_class_proto       = 0        # unsigned number
+
+# The number of newlines after a class constructor/destructor prototype,
+# if not followed by another constructor/destructor prototype.
+nl_after_func_class_proto_group = 0        # unsigned number
+
+# Whether one-line method definitions inside a class body should be treated
+# as if they were prototypes for the purposes of adding newlines.
+#
+# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
+# and nl_before_func_class_def for one-liners.
+nl_class_leave_one_liner_groups = false    # true/false
+
+# The number of newlines after '}' of a multi-line function body.
+nl_after_func_body              = 0        # unsigned number
+
+# The number of newlines after '}' of a multi-line function body in a class
+# declaration. Also affects class constructors/destructors.
+#
+# Overrides nl_after_func_body.
+nl_after_func_body_class        = 0        # unsigned number
+
+# The number of newlines after '}' of a single line function body. Also
+# affects class constructors/destructors.
+#
+# Overrides nl_after_func_body and nl_after_func_body_class.
+nl_after_func_body_one_liner    = 0        # unsigned number
+
+# The number of blank lines after a block of variable definitions at the top
+# of a function body.
+#
+# 0: No change (default).
+nl_func_var_def_blk             = 0        # unsigned number
+
+# The number of newlines before a block of typedefs. If nl_after_access_spec
+# is non-zero, that option takes precedence.
+#
+# 0: No change (default).
+nl_typedef_blk_start            = 0        # unsigned number
+
+# The number of newlines after a block of typedefs.
+#
+# 0: No change (default).
+nl_typedef_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of typedefs.
+#
+# 0: No change (default).
+nl_typedef_blk_in               = 0        # unsigned number
+
+# The number of newlines before a block of variable definitions not at the top
+# of a function body. If nl_after_access_spec is non-zero, that option takes
+# precedence.
+#
+# 0: No change (default).
+nl_var_def_blk_start            = 0        # unsigned number
+
+# The number of newlines after a block of variable definitions not at the top
+# of a function body.
+#
+# 0: No change (default).
+nl_var_def_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of variable
+# definitions.
+#
+# 0: No change (default).
+nl_var_def_blk_in               = 0        # unsigned number
+
+# The minimum number of newlines before a multi-line comment.
+# Doesn't apply if after a brace open or another multi-line comment.
+nl_before_block_comment         = 0        # unsigned number
+
+# The minimum number of newlines before a single-line C comment.
+# Doesn't apply if after a brace open or other single-line C comments.
+nl_before_c_comment             = 0        # unsigned number
+
+# The minimum number of newlines before a CPP comment.
+# Doesn't apply if after a brace open or other CPP comments.
+nl_before_cpp_comment           = 0        # unsigned number
+
+# Whether to force a newline after a multi-line comment.
+nl_after_multiline_comment      = false    # true/false
+
+# Whether to force a newline after a label's colon.
+nl_after_label_colon            = false    # true/false
+
+# The number of newlines after '}' or ';' of a struct/enum/union definition.
+nl_after_struct                 = 0        # unsigned number
+
+# The number of newlines before a class definition.
+nl_before_class                 = 0        # unsigned number
+
+# The number of newlines after '}' or ';' of a class definition.
+nl_after_class                  = 0        # unsigned number
+
+# The number of newlines before a namespace.
+nl_before_namespace             = 0        # unsigned number
+
+# The number of newlines after '{' of a namespace. This also adds newlines
+# before the matching '}'.
+#
+# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
+#     applicable, otherwise no change.
+#
+# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
+nl_inside_namespace             = 0        # unsigned number
+
+# The number of newlines after '}' of a namespace.
+nl_after_namespace              = 0        # unsigned number
+
+# The number of newlines before an access specifier label. This also includes
+# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
+# if after a brace open.
+#
+# 0: No change (default).
+nl_before_access_spec           = 0        # unsigned number
+
+# The number of newlines after an access specifier label. This also includes
+# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
+# if after a brace open.
+#
+# 0: No change (default).
+#
+# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
+nl_after_access_spec            = 0        # unsigned number
+
+# The number of newlines between a function definition and the function
+# comment, as in '// comment\n  void foo() {...}'.
+#
+# 0: No change (default).
+nl_comment_func_def             = 0        # unsigned number
+
+# The number of newlines after a try-catch-finally block that isn't followed
+# by a brace close.
+#
+# 0: No change (default).
+nl_after_try_catch_finally      = 0        # unsigned number
+
+# (C#) The number of newlines before and after a property, indexer or event
+# declaration.
+#
+# 0: No change (default).
+nl_around_cs_property           = 0        # unsigned number
+
+# (C#) The number of newlines between the get/set/add/remove handlers.
+#
+# 0: No change (default).
+nl_between_get_set              = 0        # unsigned number
+
+# (C#) Add or remove newline between property and the '{'.
+nl_property_brace               = ignore   # ignore/add/remove/force
+
+# Whether to remove blank lines after '{'.
+eat_blanks_after_open_brace     = false    # true/false
+
+# Whether to remove blank lines before '}'.
+eat_blanks_before_close_brace   = false    # true/false
+
+# How aggressively to remove extra newlines not in preprocessor.
+#
+# 0: No change (default)
+# 1: Remove most newlines not handled by other config
+# 2: Remove all newlines and reformat completely by config
+nl_remove_extra_newlines        = 0        # unsigned number
+
+# (Java) Add or remove newline after an annotation statement. Only affects
+# annotations that are after a newline.
+nl_after_annotation             = ignore   # ignore/add/remove/force
+
+# (Java) Add or remove newline between two annotations.
+nl_between_annotation           = ignore   # ignore/add/remove/force
+
+# The number of newlines before a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_before_whole_file_ifdef      = 0        # unsigned number
+
+# The number of newlines after a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_after_whole_file_ifdef       = 0        # unsigned number
+
+# The number of newlines before a whole-file #endif.
+#
+# 0: No change (default).
+nl_before_whole_file_endif      = 0        # unsigned number
+
+# The number of newlines after a whole-file #endif.
+#
+# 0: No change (default).
+nl_after_whole_file_endif       = 0        # unsigned number
+
+#
+# Positioning options
+#
+
+# The position of arithmetic operators in wrapped expressions.
+pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of assignment in wrapped expressions. Do not affect '='
+# followed by '{'.
+pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of Boolean operators in wrapped expressions.
+pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of comparison operators in wrapped expressions.
+pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of conditional operators, as in the '?' and ':' of
+# 'expr ? stmt : stmt', in wrapped expressions.
+pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in wrapped expressions.
+pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in enum entries.
+pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in the base class list if there is more than one
+# line. Affects nl_class_init_args.
+pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in the constructor initialization list.
+# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
+pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of trailing/leading class colon, between class and base class
+# list. Affects nl_class_colon.
+pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of colons between constructor and member initialization.
+# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
+pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of shift operators in wrapped expressions.
+pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+#
+# Line splitting options
+#
+
+# Try to limit code width to N columns.
+code_width                      = 0        # unsigned number
+
+# Whether to fully split long 'for' statements at semi-colons.
+ls_for_split_full               = false    # true/false
+
+# Whether to fully split long function prototypes/calls at commas.
+# The option ls_code_width has priority over the option ls_func_split_full.
+ls_func_split_full              = false    # true/false
+
+# Whether to split lines as close to code_width as possible and ignore some
+# groupings.
+# The option ls_code_width has priority over the option ls_func_split_full.
+ls_code_width                   = false    # true/false
+
+#
+# Code alignment options (not left column spaces/tabs)
+#
+
+# Whether to keep non-indenting tabs.
+align_keep_tabs                 = false    # true/false
+
+# Whether to use tabs for aligning.
+align_with_tabs                 = false    # true/false
+
+# Whether to bump out to the next tab when aligning.
+align_on_tabstop                = false    # true/false
+
+# Whether to right-align numbers.
+align_number_right              = false    # true/false
+
+# Whether to keep whitespace not required for alignment.
+align_keep_extra_space          = false    # true/false
+
+# Whether to align variable definitions in prototypes and functions.
+align_func_params               = false    # true/false
+
+# The span for aligning parameter definitions in function on parameter name.
+#
+# 0: Don't align (default).
+align_func_params_span          = 0        # unsigned number
+
+# The threshold for aligning function parameter definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_func_params_thresh        = 0        # number
+
+# The gap for aligning function parameter definitions.
+align_func_params_gap           = 0        # unsigned number
+
+# The span for aligning constructor value.
+#
+# 0: Don't align (default).
+align_constr_value_span         = 0        # unsigned number
+
+# The threshold for aligning constructor value.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_constr_value_thresh       = 0        # number
+
+# The gap for aligning constructor value.
+align_constr_value_gap          = 0        # unsigned number
+
+# Whether to align parameters in single-line functions that have the same
+# name. The function names must already be aligned with each other.
+align_same_func_call_params     = false    # true/false
+
+# The span for aligning function-call parameters for single line functions.
+#
+# 0: Don't align (default).
+align_same_func_call_params_span = 0        # unsigned number
+
+# The threshold for aligning function-call parameters for single line
+# functions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_same_func_call_params_thresh = 0        # number
+
+# The span for aligning variable definitions.
+#
+# 0: Don't align (default).
+align_var_def_span              = 0        # unsigned number
+
+# How to consider (or treat) the '*' in the alignment of variable definitions.
+#
+# 0: Part of the type     'void *   foo;' (default)
+# 1: Part of the variable 'void     *foo;'
+# 2: Dangling             'void    *foo;'
+# Dangling: the '*' will not be taken into account when aligning.
+align_var_def_star_style        = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of variable definitions.
+#
+# 0: Part of the type     'long &   foo;' (default)
+# 1: Part of the variable 'long     &foo;'
+# 2: Dangling             'long    &foo;'
+# Dangling: the '&' will not be taken into account when aligning.
+align_var_def_amp_style         = 0        # unsigned number
+
+# The threshold for aligning variable definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_def_thresh            = 0        # number
+
+# The gap for aligning variable definitions.
+align_var_def_gap               = 0        # unsigned number
+
+# Whether to align the colon in struct bit fields.
+align_var_def_colon             = false    # true/false
+
+# The gap for aligning the colon in struct bit fields.
+align_var_def_colon_gap         = 0        # unsigned number
+
+# Whether to align any attribute after the variable name.
+align_var_def_attribute         = false    # true/false
+
+# Whether to align inline struct/enum/union variable definitions.
+align_var_def_inline            = false    # true/false
+
+# The span for aligning on '=' in assignments.
+#
+# 0: Don't align (default).
+align_assign_span               = 0        # unsigned number
+
+# The span for aligning on '=' in function prototype modifier.
+#
+# 0: Don't align (default).
+align_assign_func_proto_span    = 0        # unsigned number
+
+# The threshold for aligning on '=' in assignments.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_assign_thresh             = 0        # number
+
+# How to apply align_assign_span to function declaration "assignments", i.e.
+# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
+#
+# 0: Align with other assignments (default)
+# 1: Align with each other, ignoring regular assignments
+# 2: Don't align
+align_assign_decl_func          = 0        # unsigned number
+
+# The span for aligning on '=' in enums.
+#
+# 0: Don't align (default).
+align_enum_equ_span             = 0        # unsigned number
+
+# The threshold for aligning on '=' in enums.
+# Use a negative number for absolute thresholds.
+#
+# 0: no limit (default).
+align_enum_equ_thresh           = 0        # number
+
+# The span for aligning class member definitions.
+#
+# 0: Don't align (default).
+align_var_class_span            = 0        # unsigned number
+
+# The threshold for aligning class member definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_class_thresh          = 0        # number
+
+# The gap for aligning class member definitions.
+align_var_class_gap             = 0        # unsigned number
+
+# The span for aligning struct/union member definitions.
+#
+# 0: Don't align (default).
+align_var_struct_span           = 0        # unsigned number
+
+# The threshold for aligning struct/union member definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_struct_thresh         = 0        # number
+
+# The gap for aligning struct/union member definitions.
+align_var_struct_gap            = 0        # unsigned number
+
+# The span for aligning struct initializer values.
+#
+# 0: Don't align (default).
+align_struct_init_span          = 0        # unsigned number
+
+# The span for aligning single-line typedefs.
+#
+# 0: Don't align (default).
+align_typedef_span              = 0        # unsigned number
+
+# The minimum space between the type and the synonym of a typedef.
+align_typedef_gap               = 0        # unsigned number
+
+# How to align typedef'd functions with other typedefs.
+#
+# 0: Don't mix them at all (default)
+# 1: Align the open parenthesis with the types
+# 2: Align the function type name with the other type names
+align_typedef_func              = 0        # unsigned number
+
+# How to consider (or treat) the '*' in the alignment of typedefs.
+#
+# 0: Part of the typedef type, 'typedef int * pint;' (default)
+# 1: Part of type name:        'typedef int   *pint;'
+# 2: Dangling:                 'typedef int  *pint;'
+# Dangling: the '*' will not be taken into account when aligning.
+align_typedef_star_style        = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of typedefs.
+#
+# 0: Part of the typedef type, 'typedef int & intref;' (default)
+# 1: Part of type name:        'typedef int   &intref;'
+# 2: Dangling:                 'typedef int  &intref;'
+# Dangling: the '&' will not be taken into account when aligning.
+align_typedef_amp_style         = 0        # unsigned number
+
+# The span for aligning comments that end lines.
+#
+# 0: Don't align (default).
+align_right_cmt_span            = 0        # unsigned number
+
+# Minimum number of columns between preceding text and a trailing comment in
+# order for the comment to qualify for being aligned. Must be non-zero to have
+# an effect.
+align_right_cmt_gap             = 0        # unsigned number
+
+# If aligning comments, whether to mix with comments after '}' and #endif with
+# less than three spaces before the comment.
+align_right_cmt_mix             = false    # true/false
+
+# Whether to only align trailing comments that are at the same brace level.
+align_right_cmt_same_level      = false    # true/false
+
+# Minimum column at which to align trailing comments. Comments which are
+# aligned beyond this column, but which can be aligned in a lesser column,
+# may be "pulled in".
+#
+# 0: Ignore (default).
+align_right_cmt_at_col          = 0        # unsigned number
+
+# The span for aligning function prototypes.
+#
+# 0: Don't align (default).
+align_func_proto_span           = 0        # unsigned number
+
+# The threshold for aligning function prototypes.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_func_proto_thresh         = 0        # number
+
+# Minimum gap between the return type and the function name.
+align_func_proto_gap            = 0        # unsigned number
+
+# Whether to align function prototypes on the 'operator' keyword instead of
+# what follows.
+align_on_operator               = false    # true/false
+
+# Whether to mix aligning prototype and variable declarations. If true,
+# align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto             = false    # true/false
+
+# Whether to align single-line functions with function prototypes.
+# Uses align_func_proto_span.
+align_single_line_func          = false    # true/false
+
+# Whether to align the open brace of single-line functions.
+# Requires align_single_line_func=true. Uses align_func_proto_span.
+align_single_line_brace         = false    # true/false
+
+# Gap for align_single_line_brace.
+align_single_line_brace_gap     = 0        # unsigned number
+
+# (OC) The span for aligning Objective-C message specifications.
+#
+# 0: Don't align (default).
+align_oc_msg_spec_span          = 0        # unsigned number
+
+# Whether to align macros wrapped with a backslash and a newline. This will
+# not work right if the macro contains a multi-line comment.
+align_nl_cont                   = false    # true/false
+
+# Whether to align macro functions and variables together.
+align_pp_define_together        = false    # true/false
+
+# The span for aligning on '#define' bodies.
+#
+# =0: Don't align (default)
+# >0: Number of lines (including comments) between blocks
+align_pp_define_span            = 0        # unsigned number
+
+# The minimum space between label and value of a preprocessor define.
+align_pp_define_gap             = 0        # unsigned number
+
+# Whether to align lines that start with '<<' with previous '<<'.
+#
+# Default: true
+align_left_shift                = true     # true/false
+
+# Whether to align comma-separated statements following '<<' (as used to
+# initialize Eigen matrices).
+align_eigen_comma_init          = false    # true/false
+
+# Whether to align text after 'asm volatile ()' colons.
+align_asm_colon                 = false    # true/false
+
+# (OC) Span for aligning parameters in an Objective-C message call
+# on the ':'.
+#
+# 0: Don't align.
+align_oc_msg_colon_span         = 0        # unsigned number
+
+# (OC) Whether to always align with the first parameter, even if it is too
+# short.
+align_oc_msg_colon_first        = false    # true/false
+
+# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
+# on the ':'.
+align_oc_decl_colon             = false    # true/false
+
+# (OC) Whether to not align parameters in an Objectve-C message call if first
+# colon is not on next line of the message call (the same way Xcode does
+# aligment)
+align_oc_msg_colon_xcode_like   = false    # true/false
+
+#
+# Comment modification options
+#
+
+# Try to wrap comments at N columns.
+cmt_width                       = 0        # unsigned number
+
+# How to reflow comments.
+#
+# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
+# 1: No touching at all
+# 2: Full reflow
+cmt_reflow_mode                 = 0        # unsigned number
+
+# Whether to convert all tabs to spaces in comments. If false, tabs in
+# comments are left alone, unless used for indenting.
+cmt_convert_tab_to_spaces       = false    # true/false
+
+# Whether to apply changes to multi-line comments, including cmt_width,
+# keyword substitution and leading chars.
+#
+# Default: true
+cmt_indent_multi                = true     # true/false
+
+# Whether to group c-comments that look like they are in a block.
+cmt_c_group                     = false    # true/false
+
+# Whether to put an empty '/*' on the first line of the combined c-comment.
+cmt_c_nl_start                  = false    # true/false
+
+# Whether to add a newline before the closing '*/' of the combined c-comment.
+cmt_c_nl_end                    = false    # true/false
+
+# Whether to change cpp-comments into c-comments.
+cmt_cpp_to_c                    = false    # true/false
+
+# Whether to group cpp-comments that look like they are in a block. Only
+# meaningful if cmt_cpp_to_c=true.
+cmt_cpp_group                   = false    # true/false
+
+# Whether to put an empty '/*' on the first line of the combined cpp-comment
+# when converting to a c-comment.
+#
+# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
+cmt_cpp_nl_start                = false    # true/false
+
+# Whether to add a newline before the closing '*/' of the combined cpp-comment
+# when converting to a c-comment.
+#
+# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
+cmt_cpp_nl_end                  = false    # true/false
+
+# Whether to put a star on subsequent comment lines.
+cmt_star_cont                   = false    # true/false
+
+# The number of spaces to insert at the start of subsequent comment lines.
+cmt_sp_before_star_cont         = 0        # unsigned number
+
+# The number of spaces to insert after the star on subsequent comment lines.
+cmt_sp_after_star_cont          = 0        # unsigned number
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first
+# and last lines of the comment are the same length.
+#
+# Default: true
+cmt_multi_check_last            = true     # true/false
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first
+# and last lines of the comment are the same length AND if the length is
+# bigger as the first_len minimum.
+#
+# Default: 4
+cmt_multi_first_len_minimum     = 4        # unsigned number
+
+# Path to a file that contains text to insert at the beginning of a file if
+# the file doesn't start with a C/C++ comment. If the inserted text contains
+# '$(filename)', that will be replaced with the current file's name.
+cmt_insert_file_header          = ""         # string
+
+# Path to a file that contains text to insert at the end of a file if the
+# file doesn't end with a C/C++ comment. If the inserted text contains
+# '$(filename)', that will be replaced with the current file's name.
+cmt_insert_file_footer          = ""         # string
+
+# Path to a file that contains text to insert before a function definition if
+# the function isn't preceded by a C/C++ comment. If the inserted text
+# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
+# replaced with, respectively, the name of the function, the javadoc '@param'
+# and '@return' stuff, or the name of the class to which the member function
+# belongs.
+cmt_insert_func_header          = ""         # string
+
+# Path to a file that contains text to insert before a class if the class
+# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
+# that will be replaced with the class name.
+cmt_insert_class_header         = ""         # string
+
+# Path to a file that contains text to insert before an Objective-C message
+# specification, if the method isn't preceded by a C/C++ comment. If the
+# inserted text contains '$(message)' or '$(javaparam)', these will be
+# replaced with, respectively, the name of the function, or the javadoc
+# '@param' and '@return' stuff.
+cmt_insert_oc_msg_header        = ""         # string
+
+# Whether a comment should be inserted if a preprocessor is encountered when
+# stepping backwards from a function name.
+#
+# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
+# cmt_insert_class_header.
+cmt_insert_before_preproc       = false    # true/false
+
+# Whether a comment should be inserted if a function is declared inline to a
+# class definition.
+#
+# Applies to cmt_insert_func_header.
+#
+# Default: true
+cmt_insert_before_inlines       = true     # true/false
+
+# Whether a comment should be inserted if the function is a class constructor
+# or destructor.
+#
+# Applies to cmt_insert_func_header.
+cmt_insert_before_ctor_dtor     = false    # true/false
+
+#
+# Code modifying options (non-whitespace)
+#
+
+# Add or remove braces on a single-line 'do' statement.
+mod_full_brace_do               = ignore   # ignore/add/remove/force
+
+# Add or remove braces on a single-line 'for' statement.
+mod_full_brace_for              = ignore   # ignore/add/remove/force
+
+# (Pawn) Add or remove braces on a single-line function definition.
+mod_full_brace_function         = ignore   # ignore/add/remove/force
+
+# Add or remove braces on a single-line 'if' statement. Braces will not be
+# removed if the braced statement contains an 'else'.
+mod_full_brace_if               = ignore   # ignore/add/remove/force
+
+# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
+# have, or do not have, braces. If true, braces will be added if any block
+# needs braces, and will only be removed if they can be removed from all
+# blocks.
+#
+# Overrides mod_full_brace_if.
+mod_full_brace_if_chain         = false    # true/false
+
+# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
+# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
+# does not have an 'else if' or 'else'.
+mod_full_brace_if_chain_only    = false    # true/false
+
+# Add or remove braces on single-line 'while' statement.
+mod_full_brace_while            = ignore   # ignore/add/remove/force
+
+# Add or remove braces on single-line 'using ()' statement.
+mod_full_brace_using            = ignore   # ignore/add/remove/force
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl               = 0        # unsigned number
+
+# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
+# which span multiple lines.
+#
+# Affects:
+#   mod_full_brace_for
+#   mod_full_brace_if
+#   mod_full_brace_if_chain
+#   mod_full_brace_if_chain_only
+#   mod_full_brace_while
+#   mod_full_brace_using
+#
+# Does not affect:
+#   mod_full_brace_do
+#   mod_full_brace_function
+mod_full_brace_nl_block_rem_mlcond = false    # true/false
+
+# Add or remove unnecessary parenthesis on 'return' statement.
+mod_paren_on_return             = ignore   # ignore/add/remove/force
+
+# (Pawn) Whether to change optional semicolons to real semicolons.
+mod_pawn_semicolon              = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
+# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
+mod_full_paren_if_bool          = false    # true/false
+
+# Whether to remove superfluous semicolons.
+mod_remove_extra_semicolon      = false    # true/false
+
+# If a function body exceeds the specified number of newlines and doesn't have
+# a comment after the close brace, a comment will be added.
+mod_add_long_function_closebrace_comment = 0        # unsigned number
+
+# If a namespace body exceeds the specified number of newlines and doesn't
+# have a comment after the close brace, a comment will be added.
+mod_add_long_namespace_closebrace_comment = 0        # unsigned number
+
+# If a class body exceeds the specified number of newlines and doesn't have a
+# comment after the close brace, a comment will be added.
+mod_add_long_class_closebrace_comment = 0        # unsigned number
+
+# If a switch body exceeds the specified number of newlines and doesn't have a
+# comment after the close brace, a comment will be added.
+mod_add_long_switch_closebrace_comment = 0        # unsigned number
+
+# If an #ifdef body exceeds the specified number of newlines and doesn't have
+# a comment after the #endif, a comment will be added.
+mod_add_long_ifdef_endif_comment = 0        # unsigned number
+
+# If an #ifdef or #else body exceeds the specified number of newlines and
+# doesn't have a comment after the #else, a comment will be added.
+mod_add_long_ifdef_else_comment = 0        # unsigned number
+
+# Whether to take care of the case by the mod_sort_xx options.
+mod_sort_case_sensitive         = false    # true/false
+
+# Whether to sort consecutive single-line 'import' statements.
+mod_sort_import                 = false    # true/false
+
+# (C#) Whether to sort consecutive single-line 'using' statements.
+mod_sort_using                  = false    # true/false
+
+# Whether to sort consecutive single-line '#include' statements (C/C++) and
+# '#import' statements (Objective-C). Be aware that this has the potential to
+# break your code if your includes/imports have ordering dependencies.
+mod_sort_include                = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# filename without extension when sorting is enabled.
+mod_sort_incl_import_prioritize_filename = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that does not
+# contain extensions when sorting is enabled.
+mod_sort_incl_import_prioritize_extensionless = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# angle over quotes when sorting is enabled.
+mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
+
+# Whether to ignore file extension in '#include' and '#import' statements
+# for sorting comparison.
+mod_sort_incl_import_ignore_extension = false    # true/false
+
+# Whether to group '#include' and '#import' statements when sorting is enabled.
+mod_sort_incl_import_grouping_enabled = false    # true/false
+
+# Whether to move a 'break' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
+mod_move_case_break             = false    # true/false
+
+# Add or remove braces around a fully braced case statement. Will only remove
+# braces if there are no variable declarations in the block.
+mod_case_brace                  = ignore   # ignore/add/remove/force
+
+# Whether to remove a void 'return;' that appears as the last statement in a
+# function.
+mod_remove_empty_return         = false    # true/false
+
+# Add or remove the comma after the last value of an enumeration.
+mod_enum_last_comma             = ignore   # ignore/add/remove/force
+
+# (OC) Whether to organize the properties. If true, properties will be
+# rearranged according to the mod_sort_oc_property_*_weight factors.
+mod_sort_oc_properties          = false    # true/false
+
+# (OC) Weight of a class property modifier.
+mod_sort_oc_property_class_weight = 0        # number
+
+# (OC) Weight of 'atomic' and 'nonatomic'.
+mod_sort_oc_property_thread_safe_weight = 0        # number
+
+# (OC) Weight of 'readwrite' when organizing properties.
+mod_sort_oc_property_readwrite_weight = 0        # number
+
+# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
+# 'weak', 'strong') when organizing properties.
+mod_sort_oc_property_reference_weight = 0        # number
+
+# (OC) Weight of getter type ('getter=') when organizing properties.
+mod_sort_oc_property_getter_weight = 0        # number
+
+# (OC) Weight of setter type ('setter=') when organizing properties.
+mod_sort_oc_property_setter_weight = 0        # number
+
+# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
+# 'null_resettable') when organizing properties.
+mod_sort_oc_property_nullability_weight = 0        # number
+
+#
+# Preprocessor options
+#
+
+# Add or remove indentation of preprocessor directives inside #if blocks
+# at brace level 0 (file-level).
+pp_indent                       = ignore   # ignore/add/remove/force
+
+# Whether to indent #if/#else/#endif at the brace level. If false, these are
+# indented from column 1.
+pp_indent_at_level              = false    # true/false
+
+# Specifies the number of columns to indent preprocessors per level
+# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
+# the number of columns to indent preprocessors per level
+# at brace level > 0 (function-level).
+#
+# Default: 1
+pp_indent_count                 = 1        # unsigned number
+
+# Add or remove space after # based on pp_level of #if blocks.
+pp_space                        = ignore   # ignore/add/remove/force
+
+# Sets the number of spaces per level added with pp_space.
+pp_space_count                  = 0        # unsigned number
+
+# The indent for '#region' and '#endregion' in C# and '#pragma region' in
+# C/C++. Negative values decrease indent down to the first column.
+pp_indent_region                = 0        # number
+
+# Whether to indent the code between #region and #endregion.
+pp_region_indent_code           = false    # true/false
+
+# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
+# not at file-level. Negative values decrease indent down to the first column.
+#
+# =0: Indent preprocessors using output_tab_size
+# >0: Column at which all preprocessors will be indented
+pp_indent_if                    = 0        # number
+
+# Whether to indent the code between #if, #else and #endif.
+pp_if_indent_code               = false    # true/false
+
+# Whether to indent '#define' at the brace level. If false, these are
+# indented from column 1.
+pp_define_at_level              = false    # true/false
+
+# Whether to ignore the '#define' body while formatting.
+pp_ignore_define_body           = false    # true/false
+
+# Whether to indent case statements between #if, #else, and #endif.
+# Only applies to the indent of the preprocesser that the case statements
+# directly inside of.
+#
+# Default: true
+pp_indent_case                  = true     # true/false
+
+# Whether to indent whole function definitions between #if, #else, and #endif.
+# Only applies to the indent of the preprocesser that the function definition
+# is directly inside of.
+#
+# Default: true
+pp_indent_func_def              = true     # true/false
+
+# Whether to indent extern C blocks between #if, #else, and #endif.
+# Only applies to the indent of the preprocesser that the extern block is
+# directly inside of.
+#
+# Default: true
+pp_indent_extern                = true     # true/false
+
+# Whether to indent braces directly inside #if, #else, and #endif.
+# Only applies to the indent of the preprocesser that the braces are directly
+# inside of.
+#
+# Default: true
+pp_indent_brace                 = true     # true/false
+
+#
+# Sort includes options
+#
+
+# The regex for include category with priority 0.
+include_category_0              = ""         # string
+
+# The regex for include category with priority 1.
+include_category_1              = ""         # string
+
+# The regex for include category with priority 2.
+include_category_2              = ""         # string
+
+#
+# Use or Do not Use options
+#
+
+# true:  indent_func_call_param will be used (default)
+# false: indent_func_call_param will NOT be used
+#
+# Default: true
+use_indent_func_call_param      = true     # true/false
+
+# The value of the indentation for a continuation line is calculated
+# differently if the statement is:
+# - a declaration: your case with QString fileName ...
+# - an assignment: your case with pSettings = new QSettings( ...
+#
+# At the second case the indentation value might be used twice:
+# - at the assignment
+# - at the function call (if present)
+#
+# To prevent the double use of the indentation value, use this option with the
+# value 'true'.
+#
+# true:  indent_continue will be used only once
+# false: indent_continue will be used every time (default)
+use_indent_continue_only_once   = false    # true/false
+
+# The value might be used twice:
+# - at the assignment
+# - at the opening brace
+#
+# To prevent the double use of the indentation value, use this option with the
+# value 'true'.
+#
+# true:  indentation will be used only once
+# false: indentation will be used every time (default)
+indent_cpp_lambda_only_once     = false    # true/false
+
+# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
+# historic behavior, but is probably not the desired behavior, so this is off
+# by default.
+use_sp_after_angle_always       = false    # true/false
+
+# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
+# this tries to format these so that they match Qt's normalized form (i.e. the
+# result of QMetaObject::normalizedSignature), which can slightly improve the
+# performance of the QObject::connect call, rather than how they would
+# otherwise be formatted.
+#
+# See options_for_QT.cpp for details.
+#
+# Default: true
+use_options_overriding_for_qt_macros = true     # true/false
+
+# If true: the form feed character is removed from the list
+# of whitespace characters.
+# See https://en.cppreference.com/w/cpp/string/byte/isspace
+use_form_feed_no_more_as_whitespace_character = false    # true/false
+
+#
+# Warn levels - 1: error, 2: warning (default), 3: note
+#
+
+# (C#) Warning is given if doing tab-to-\t replacement and we have found one
+# in a C# verbatim string literal.
+#
+# Default: 2
+warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
+
+# Limit the number of loops.
+# Used by uncrustify.cpp to exit from infinite loop.
+# 0: no limit.
+debug_max_number_of_loops       = 0        # number
+
+# Set the number of the line to protocol;
+# Used in the function prot_the_line if the 2. parameter is zero.
+# 0: nothing protocol.
+debug_line_number_to_protocol   = 0        # number
+
+# Set the number of second(s) before terminating formatting the current file,
+# 0: no timeout.
+# only for linux
+debug_timeout                   = 0        # number
+
+# Meaning of the settings:
+#   Ignore - do not do any changes
+#   Add    - makes sure there is 1 or more space/brace/newline/etc
+#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
+#            behaves like Add in some contexts
+#   Remove - removes space/brace/newline/etc
+#
+#
+# - Token(s) can be treated as specific type(s) with the 'set' option:
+#     `set tokenType tokenString [tokenString...]`
+#
+#     Example:
+#       `set BOOL __AND__ __OR__`
+#
+#     tokenTypes are defined in src/token_enum.h, use them without the
+#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
+#
+#
+# - Token(s) can be treated as type(s) with the 'type' option.
+#     `type tokenString [tokenString...]`
+#
+#     Example:
+#       `type int c_uint_8 Rectangle`
+#
+#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
+#
+#
+# To embed whitespace in tokenStrings use the '\' escape character, or quote
+# the tokenStrings. These quotes are supported: "'`
+#
+#
+# - Support for the auto detection of languages through the file ending can be
+#   added using the 'file_ext' command.
+#     `file_ext langType langString [langString..]`
+#
+#     Example:
+#       `file_ext CPP .ch .cxx .cpp.in`
+#
+#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
+#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
+#
+#
+# - Custom macro-based indentation can be set up using 'macro-open',
+#   'macro-else' and 'macro-close'.
+#     `(macro-open | macro-else | macro-close) tokenString`
+#
+#     Example:
+#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
+#       `macro-open  BEGIN_MESSAGE_MAP`
+#       `macro-close END_MESSAGE_MAP`
+#
+#
+# option(s) with 'not default' value: 0
+#

From 680e56c52a001e72b80fdfe7277ccc9f95f1e961 Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Fri, 25 Nov 2022 14:09:35 +0100
Subject: [PATCH 1430/2403] Changed creator id

---
 ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
index 221543547c..7aa352e16e 100644
--- a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
+++ b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
@@ -1,4 +1,4 @@
-CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATOR_ID =  0xB0D00000
 CIRCUITPY_CREATION_ID = 0x00320002
 
 IDF_TARGET = esp32

From 54f37c3e5a2426738b77817ee4ab2898d144ac69 Mon Sep 17 00:00:00 2001
From: Clay 
Date: Fri, 25 Nov 2022 04:45:34 +0000
Subject: [PATCH 1431/2403] Translated using Weblate (Russian)

Currently translated at 31.9% (318 of 995 strings)

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

diff --git a/locale/ru.po b/locale/ru.po
index a575f05a40..99720416ff 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-04-06 13:37+0000\n"
-"Last-Translator: Jeff Epler \n"
+"PO-Revision-Date: 2022-11-26 04:48+0000\n"
+"Last-Translator: Clay \n"
 "Language-Team: none\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.12-dev\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -31,6 +31,8 @@ msgid ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
+"\n"
+"Программа остановлена автоматической перезагрузкой. Скоро перезагрузка.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""

From 2c479f4fceff522d0cfdf1e8be0a554ba2c54d92 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 26 Nov 2022 11:00:09 -0600
Subject: [PATCH 1432/2403] working on None behavior

---
 shared-module/displayio/Display.c      | 10 ++++++----
 shared-module/displayio/display_core.c | 11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 780c4a9136..58f91fcf82 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -144,19 +144,21 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 //    }
 //    mp_printf(&mp_plat_print,  *circuitpython_splash);
 //    mp_printf(&mp_plat_print,  "\n");
-    common_hal_displayio_display_show(self, &circuitpython_splash);
+    //common_hal_displayio_display_show(self, &circuitpython_splash);
     common_hal_displayio_display_set_auto_refresh(self, auto_refresh);
 }
 
 void is_null(displayio_group_t *root_group){
     if (root_group == NULL){
-        mp_printf(&mp_plat_print,  "root_group is null\n");
+        mp_printf(&mp_plat_print,  "root_group is NULL\n");
+    }else{
+        mp_printf(&mp_plat_print, "root_group not NULL");
     }
 }
 
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
     if(root_group == NULL){
-        mp_printf(&mp_plat_print,  "Its NULL fer flucks snakes\n");
+        mp_printf(&mp_plat_print,  "Its NULL inside display.show()\n");
     }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
@@ -446,7 +448,7 @@ void release_display(displayio_display_obj_t *self) {
 
 void reset_display(displayio_display_obj_t *self) {
     common_hal_displayio_display_set_auto_refresh(self, true);
-    common_hal_displayio_display_show(self, NULL);
+    common_hal_displayio_display_show(self, &circuitpython_splash);
 }
 
 void displayio_display_collect_ptrs(displayio_display_obj_t *self) {
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index 635694914f..ba931f82a4 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -165,14 +165,15 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,
 bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group) {
 
     if (root_group == NULL) { // set the display to the REPL, reset REPL position and size
-        circuitpython_splash.in_group = false;
+        //circuitpython_splash.in_group = false;
         // force the circuit_python_splash out of any group (Note: could cause problems with the parent group)
-        circuitpython_splash.x = 0; // reset position in case someone moved it.
-        circuitpython_splash.y = 0;
+        //circuitpython_splash.x = 0; // reset position in case someone moved it.
+        //circuitpython_splash.y = 0;
         mp_printf(&mp_plat_print, "Inside set root group NULL\n");
-        supervisor_start_terminal(self->width, self->height);
+        //supervisor_start_terminal(self->width, self->height);
+
+        //root_group = &circuitpython_splash;
 
-        root_group = &circuitpython_splash;
     }
     if (root_group == self->current_group) {
         return true;

From 738b73d4b49bdb60a344d66799b1920bf3848206 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 13:54:53 -0600
Subject: [PATCH 1433/2403] check for NULL in fill_area. moved start_terminal
 to reset_display.

---
 shared-module/displayio/Display.c      | 27 ++++++--------------------
 shared-module/displayio/display_core.c | 17 ++++++----------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 58f91fcf82..b06ffa97d6 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -136,30 +136,12 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
-    mp_printf(&mp_plat_print, "Inside display make_new\n");
-    is_null(&circuitpython_splash);
-    //is_null(0);
-//    if(circuitpython_splash == mp_const_none) {
-//        mp_printf(&mp_plat_print, "Splash is NULL \n");
-//    }
-//    mp_printf(&mp_plat_print,  *circuitpython_splash);
-//    mp_printf(&mp_plat_print,  "\n");
-    //common_hal_displayio_display_show(self, &circuitpython_splash);
+
+    common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
     common_hal_displayio_display_set_auto_refresh(self, auto_refresh);
 }
 
-void is_null(displayio_group_t *root_group){
-    if (root_group == NULL){
-        mp_printf(&mp_plat_print,  "root_group is NULL\n");
-    }else{
-        mp_printf(&mp_plat_print, "root_group not NULL");
-    }
-}
-
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
-    if(root_group == NULL){
-        mp_printf(&mp_plat_print,  "Its NULL inside display.show()\n");
-    }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
@@ -448,7 +430,10 @@ void release_display(displayio_display_obj_t *self) {
 
 void reset_display(displayio_display_obj_t *self) {
     common_hal_displayio_display_set_auto_refresh(self, true);
-    common_hal_displayio_display_show(self, &circuitpython_splash);
+    circuitpython_splash.x = 0; // reset position in case someone moved it.
+    circuitpython_splash.y = 0;
+    supervisor_start_terminal(self->core.width, self->core.height);
+    common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
 }
 
 void displayio_display_collect_ptrs(displayio_display_obj_t *self) {
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index ba931f82a4..1e33a5f7e9 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -164,16 +164,8 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,
 
 bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group) {
 
-    if (root_group == NULL) { // set the display to the REPL, reset REPL position and size
-        //circuitpython_splash.in_group = false;
-        // force the circuit_python_splash out of any group (Note: could cause problems with the parent group)
-        //circuitpython_splash.x = 0; // reset position in case someone moved it.
-        //circuitpython_splash.y = 0;
-        mp_printf(&mp_plat_print, "Inside set root group NULL\n");
-        //supervisor_start_terminal(self->width, self->height);
-
-        //root_group = &circuitpython_splash;
-
+    if (root_group == NULL) {
+        // Show nothing on the display
     }
     if (root_group == self->current_group) {
         return true;
@@ -367,7 +359,10 @@ void displayio_display_core_collect_ptrs(displayio_display_core_t *self) {
 }
 
 bool displayio_display_core_fill_area(displayio_display_core_t *self, displayio_area_t *area, uint32_t *mask, uint32_t *buffer) {
-    return displayio_group_fill_area(self->current_group, &self->colorspace, area, mask, buffer);
+    if(self->current_group != NULL){
+        return displayio_group_fill_area(self->current_group, &self->colorspace, area, mask, buffer);
+    }
+    return false;
 }
 
 bool displayio_display_core_clip_area(displayio_display_core_t *self, const displayio_area_t *area, displayio_area_t *clipped) {

From 15a9e63fda71fea11be1d212d2e5ee3189b6b805 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 14:08:38 -0600
Subject: [PATCH 1434/2403] remove is_null troubleshooting function. remove
 empty line

---
 shared-module/displayio/Display.c | 1 -
 shared-module/displayio/Display.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index b06ffa97d6..6103bfaf53 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -136,7 +136,6 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
-
     common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
     common_hal_displayio_display_set_auto_refresh(self, auto_refresh);
 }
diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
index eb356a388c..c60adc482f 100644
--- a/shared-module/displayio/Display.h
+++ b/shared-module/displayio/Display.h
@@ -64,7 +64,6 @@ typedef struct {
 void displayio_display_background(displayio_display_obj_t *self);
 void release_display(displayio_display_obj_t *self);
 void reset_display(displayio_display_obj_t *self);
-void is_null(displayio_group_t *root_group);
 void displayio_display_collect_ptrs(displayio_display_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_DISPLAY_H

From 6844dc0cb79232fb69b765b73254344e644a7bfe Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 14:20:15 -0600
Subject: [PATCH 1435/2403] code format, extra space

---
 shared-module/displayio/display_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index 1e33a5f7e9..2cd9c18cb9 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -359,7 +359,7 @@ void displayio_display_core_collect_ptrs(displayio_display_core_t *self) {
 }
 
 bool displayio_display_core_fill_area(displayio_display_core_t *self, displayio_area_t *area, uint32_t *mask, uint32_t *buffer) {
-    if(self->current_group != NULL){
+    if (self->current_group != NULL){
         return displayio_group_fill_area(self->current_group, &self->colorspace, area, mask, buffer);
     }
     return false;

From 0f3695d0f4b34741bb4d5e08f6ff16be306dfb98 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Sun, 27 Nov 2022 21:24:44 +0100
Subject: [PATCH 1436/2403] initial commit

---
 .devcontainer/Readme.md                  | 31 +++++++++++++
 .devcontainer/cortex-m/devcontainer.json | 23 +++++++++
 .devcontainer/cortex-m/on-create.sh      | 59 ++++++++++++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 .devcontainer/Readme.md
 create mode 100644 .devcontainer/cortex-m/devcontainer.json
 create mode 100755 .devcontainer/cortex-m/on-create.sh

diff --git a/.devcontainer/Readme.md b/.devcontainer/Readme.md
new file mode 100644
index 0000000000..00acbb5786
--- /dev/null
+++ b/.devcontainer/Readme.md
@@ -0,0 +1,31 @@
+Build CircuitPython in a Github-Devcontainer
+============================================
+
+To build CircuitPython within a Github-Devcontainer, you need to perform
+the following steps.
+
+  1. checkout the code to a devcontainer
+
+    - click on the green "<> Code"-button
+    - select the Codespaces-tab
+    - choose "+ new with options..." from the "..."-menu
+    - in the following screen select the branch and then
+    - select ".devcontainer/cortex-m/devcontainer.json" instead
+      of "Default Codespaces configuration"
+    - update region as necessary
+    - finally, click on the green "Create codespace" button
+
+  2. Your codespace is created. Cloning the images is quite fast, but
+     preparing it for CircuitPython-development takes about 10 minutes.
+     Note that this is a one-time task.
+
+  3. During creation, you can run the command
+     `tail -f /workspaces/.codespaces/.persistedshare/creation.log`
+     to see what is going on.
+
+  4. To actually build CircuitPython, run
+
+         cd ports/raspberrypi
+         make -j $(nproc) BOARD=whatever TRANSLATION=xx_XX
+
+     This takes about 2m40s.
diff --git a/.devcontainer/cortex-m/devcontainer.json b/.devcontainer/cortex-m/devcontainer.json
new file mode 100644
index 0000000000..796f83a4eb
--- /dev/null
+++ b/.devcontainer/cortex-m/devcontainer.json
@@ -0,0 +1,23 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/universal
+{
+	"name": "CircuitPython Cortex-M Build-Environment (base: Default Linux Universal)",
+	"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
+	"postCreateCommand": ".devcontainer/cortex-mq/on-create.sh",
+	"remoteEnv": { "PATH": "/workspaces/gcc-arm-none-eabi/bin:${containerEnv:PATH}" }
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/.devcontainer/cortex-m/on-create.sh b/.devcontainer/cortex-m/on-create.sh
new file mode 100755
index 0000000000..8c4bd0cfed
--- /dev/null
+++ b/.devcontainer/cortex-m/on-create.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# on-create.sh: postCreateCommand-hook for devcontainer.json (Cortex-M build)
+#
+# Author: Bernhard Bablok
+#
+# -----------------------------------------------------------------------------
+
+echo -e "[on-create.sh] downloading and installing gcc-arm-non-eabi toolchain"
+cd /workspaces
+wget -qO gcc-arm-none-eabi.tar.bz2 https://adafru.it/Pid
+tar -xjf  gcc-arm-none-eabi.tar.bz2
+ln -s gcc-arm-none-eabi-10-2020-q4-major gcc-arm-none-eabi
+rm -f /workspaces/gcc-arm-none-eabi.tar.bz2
+export PATH=/workspaces/gcc-arm-none-eabi/bin:$PATH
+
+# add repository and install tools
+echo -e "[on-create.sh] adding pybricks/ppa"
+sudo add-apt-repository -y ppa:pybricks/ppa
+echo -e "[on-create.sh] installing uncrustify and mtools"
+sudo apt-get -y install uncrustify mtools
+
+# dosfstools >= 4.2 needed, standard repo only has 4.1
+echo -e "[on-create.sh] downloading and installing dosfstools"
+wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+tar -xzf dosfstools-4.2.tar.gz
+cd dosfstools-4.2/
+./configure
+make -j $(nproc)
+sudo make install
+cd /workspaces
+rm -fr /workspaces/dosfstools-4.2 /workspaces/dosfstools-4.2.tar.gz
+
+# prepare source-code tree
+cd /workspaces/circuitpython/
+echo -e "[on-create.sh] fetching submodules"
+make fetch-submodules
+echo -e "[on-create.sh] fetching tags"
+git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD
+
+# additional python requirements
+echo -e "[on-create.sh] pip-installing requirements"
+pip install --upgrade -r requirements-dev.txt
+pip install --upgrade -r requirements-doc.txt
+
+# add pre-commit
+echo -e "[on-create.sh] installing pre-commit"
+pre-commit install
+
+# create cross-compiler
+echo -e "[on-create.sh] building mpy-cross"
+make -j $(nproc) -C mpy-cross                   # time: about 36 sec
+
+# that's it!
+echo -e "[on-create.sh] setup complete"
+
+#commands to actually build CP:
+#cd ports/raspberrypi
+#time make -j $(nproc) BOARD=pimoroni_tufty2040 TRANSLATION=de_DE

From 3419b118fdf194d47bae143197a286a77c244d01 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 17:02:55 -0600
Subject: [PATCH 1437/2403] fix out of range

Co-authored-by: Mark <56205165+gamblor21@users.noreply.github.com>
---
 shared-module/_pixelmap/PixelMap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/_pixelmap/PixelMap.c b/shared-module/_pixelmap/PixelMap.c
index d20a6dd03c..7599f31f0e 100644
--- a/shared-module/_pixelmap/PixelMap.c
+++ b/shared-module/_pixelmap/PixelMap.c
@@ -34,7 +34,7 @@
 
 
 static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) {
-    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+    mp_arg_validate_index_range(i, 0, self->len - 1, MP_QSTR_index);
 
     mp_obj_t item = self->items[i];
     if (mp_obj_is_small_int(item)) {

From 52be2b80c15a4a1825234e45b949831fdcff3e76 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 17:04:25 -0600
Subject: [PATCH 1438/2403] fix out of range

Co-authored-by: Mark <56205165+gamblor21@users.noreply.github.com>
---
 shared-module/_pixelmap/PixelMap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/_pixelmap/PixelMap.c b/shared-module/_pixelmap/PixelMap.c
index 7599f31f0e..14d07e12fb 100644
--- a/shared-module/_pixelmap/PixelMap.c
+++ b/shared-module/_pixelmap/PixelMap.c
@@ -165,7 +165,7 @@ void shared_module_pixelmap_pixelmap_setitem(pixelmap_pixelmap_obj_t *self, mp_i
 }
 
 mp_obj_t shared_module_pixelmap_pixelmap_getitem(pixelmap_pixelmap_obj_t *self, mp_int_t i) {
-    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+    mp_arg_validate_index_range(i, 0, self->len - 1, MP_QSTR_index);
     mp_obj_t item = self->items[i];
     if (mp_obj_is_small_int(item)) {
         return common_hal_adafruit_pixelbuf_pixelbuf_get_pixel(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(item));

From b8d6605cff992c008e8aa6cab2638b65972fb1e0 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sun, 27 Nov 2022 17:26:46 -0600
Subject: [PATCH 1439/2403] code format, extra space

---
 shared-module/displayio/display_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index 2cd9c18cb9..c21d87316d 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -359,8 +359,8 @@ void displayio_display_core_collect_ptrs(displayio_display_core_t *self) {
 }
 
 bool displayio_display_core_fill_area(displayio_display_core_t *self, displayio_area_t *area, uint32_t *mask, uint32_t *buffer) {
-    if (self->current_group != NULL){
-        return displayio_group_fill_area(self->current_group, &self->colorspace, area, mask, buffer);
+    if (self->current_group != NULL) {
+        return displayio_group_fill_area(self->current_group,&self->colorspace, area, mask, buffer);
     }
     return false;
 }

From 553d48f887fd5af8d33532417e39a05e4dbbae86 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 28 Nov 2022 09:03:03 -0600
Subject: [PATCH 1440/2403] return None for NULL

---
 shared-module/displayio/Display.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 6103bfaf53..a640d10fd3 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -206,6 +206,9 @@ mp_obj_t common_hal_displayio_display_get_bus(displayio_display_obj_t *self) {
 }
 
 mp_obj_t common_hal_displayio_display_get_root_group(displayio_display_obj_t *self) {
+    if (self->core.current_group == NULL) {
+        return mp_const_none;
+    }
     return self->core.current_group;
 }
 

From 0a59b6560a5d4969db28c67ccaed326e5e5cfa17 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Mon, 28 Nov 2022 19:40:09 +0100
Subject: [PATCH 1441/2403] added .devcontainer/* to exclude_patterns

---
 conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf.py b/conf.py
index 90f58979d9..55be66373a 100644
--- a/conf.py
+++ b/conf.py
@@ -171,6 +171,7 @@ exclude_patterns = ["**/build*",
                     ".env",
                     ".venv",
                     ".direnv",
+                    ".devcontainer/*",
                     "data",
                     "docs/autoapi",
                     "docs/README.md",

From e1c025d6dde584445ae7e8cd089722254407cda5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 28 Nov 2022 13:30:08 -0600
Subject: [PATCH 1442/2403] Fix documentation of wifi.Monitor

Its methods & properties were incorrectly documented as being directly
in 'wifi'
---
 shared-bindings/wifi/Monitor.c | 48 ++++++++++++++++------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c
index bd688d357d..d087ec587b 100644
--- a/shared-bindings/wifi/Monitor.c
+++ b/shared-bindings/wifi/Monitor.c
@@ -36,15 +36,14 @@
 //|     """For monitoring WiFi packets."""
 //|
 
-//| def __init__(self, channel: Optional[int] = 1, queue: Optional[int] = 128) -> None:
-//|     """Initialize `wifi.Monitor` singleton.
+//|     def __init__(self, channel: Optional[int] = 1, queue: Optional[int] = 128) -> None:
+//|         """Initialize `wifi.Monitor` singleton.
 //|
-//|     :param int channel: The WiFi channel to scan.
-//|     :param int queue: The queue size for buffering the packet.
-//|
-//|     """
-//|     ...
+//|         :param int channel: The WiFi channel to scan.
+//|         :param int queue: The queue size for buffering the packet.
 //|
+//|         """
+//|         ...
 STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_channel, ARG_queue };
     static const mp_arg_t allowed_args[] = {
@@ -69,8 +68,8 @@ STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
-//| channel: int
-//| """The WiFi channel to scan."""
+//|     channel: int
+//|     """The WiFi channel to scan."""
 STATIC mp_obj_t wifi_monitor_obj_get_channel(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_channel(self_in);
 }
@@ -90,8 +89,8 @@ MP_PROPERTY_GETSET(wifi_monitor_channel_obj,
     (mp_obj_t)&wifi_monitor_get_channel_obj,
     (mp_obj_t)&wifi_monitor_set_channel_obj);
 
-//| queue: int
-//| """The queue size for buffering the packet."""
+//|     queue: int
+//|     """The queue size for buffering the packet."""
 STATIC mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_queue(self_in);
 }
@@ -100,29 +99,26 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_queue_obj, wifi_monitor_obj_get_queue
 MP_PROPERTY_GETTER(wifi_monitor_queue_obj,
     (mp_obj_t)&wifi_monitor_get_queue_obj);
 
-//| def deinit(self) -> None:
-//|     """De-initialize `wifi.Monitor` singleton."""
-//|     ...
-//|
+//|     def deinit(self) -> None:
+//|         """De-initialize `wifi.Monitor` singleton."""
+//|         ...
 STATIC mp_obj_t wifi_monitor_obj_deinit(mp_obj_t self_in) {
     common_hal_wifi_monitor_deinit(self_in);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_deinit_obj, wifi_monitor_obj_deinit);
 
-//| def lost(self) -> int:
-//|     """Returns the packet loss count. The counter resets after each poll."""
-//|     ...
-//|
+//|     def lost(self) -> int:
+//|         """Returns the packet loss count. The counter resets after each poll."""
+//|         ...
 STATIC mp_obj_t wifi_monitor_obj_get_lost(mp_obj_t self_in) {
     return common_hal_wifi_monitor_get_lost(self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost);
 
-//| def queued(self) -> int:
-//|     """Returns the packet queued count."""
-//|     ...
-//|
+//|     def queued(self) -> int:
+//|         """Returns the packet queued count."""
+//|         ...
 STATIC mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {
         return mp_obj_new_int_from_uint(0);
@@ -131,9 +127,9 @@ STATIC mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_queued_obj, wifi_monitor_obj_get_queued);
 
-//| def packet(self) -> dict:
-//|     """Returns the monitor packet."""
-//|     ...
+//|     def packet(self) -> dict:
+//|         """Returns the monitor packet."""
+//|         ...
 //|
 STATIC mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) {
     if (common_hal_wifi_monitor_deinited()) {

From fba71010ac853cb441988cb2cb3fe1eea2764762 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Mon, 28 Nov 2022 21:09:57 +0100
Subject: [PATCH 1443/2403] be more specific with exclude_patterns

---
 conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index 55be66373a..7b3b4ca585 100644
--- a/conf.py
+++ b/conf.py
@@ -171,7 +171,7 @@ exclude_patterns = ["**/build*",
                     ".env",
                     ".venv",
                     ".direnv",
-                    ".devcontainer/*",
+                    ".devcontainer/Readme.md",
                     "data",
                     "docs/autoapi",
                     "docs/README.md",

From aef55b7e41ee8ac14fee902b09b028ead4a89962 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 28 Nov 2022 16:56:28 -0600
Subject: [PATCH 1444/2403] Add SocketPool.gaierror

gaierror(-2) is raised in the failure case of getaddrinfo. This is
compatible with cpython's socket module.

Typical session:
```
>>> import socketpool
>>> import wifi
>>> socket = socketpool.SocketPool(wifi.radio)
>>> try: socket.getaddrinfo("boo", 0)
... except socket.gaierror as e: ee = e
...
>>> type(ee)

>>> ee.errno == socket.EAI_NONAME
True
>>> ee.strerror
'Name or service not known'
>>> raise ee
Traceback (most recent call last):
  File "", line 1, in 
  File "", line 1, in 
gaierror: (-2, 'Name or service not known')
```

Closes: #6941
---
 shared-bindings/socketpool/SocketPool.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 097cb4f39a..4881a0597b 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -36,6 +36,8 @@
 #include "shared-bindings/socketpool/Socket.h"
 #include "shared-bindings/socketpool/SocketPool.h"
 
+#define SOCKETPOOL_EAI_NONAME (-2)
+
 //| class SocketPool:
 //|     """A pool of socket resources available for the given radio. Only one
 //|     SocketPool can be created for each radio.
@@ -63,12 +65,20 @@ STATIC mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t
 
     return MP_OBJ_FROM_PTR(s);
 }
+
+//|     class gaierror(OSError):
+//|         """Errors raised by getaddrinfo"""
+//|
+MP_DEFINE_EXCEPTION(gaierror, OSError)
+
+//|
 //|     AF_INET: int
 //|     AF_INET6: int
 //|
 //|     SOCK_STREAM: int
 //|     SOCK_DGRAM: int
 //|     SOCK_RAW: int
+//|     EAI_NONAME: int
 //|
 //|     TCP_NODELAY: int
 //|
@@ -145,7 +155,11 @@ STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
     }
 
     if (ip_str == mp_const_none) {
-        mp_raise_OSError(-2);  // socket.EAI_NONAME from CPython
+        mp_obj_t exc_args[2] = {
+            MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_EAI_NONAME),
+            MP_OBJ_NEW_QSTR(MP_QSTR_Name_space_or_space_service_space_not_space_known),
+        };
+        nlr_raise(mp_obj_new_exception_args(&mp_type_gaierror, 2, exc_args));
     }
 
     mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
@@ -164,6 +178,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_getaddrinfo_obj, 1, sock
 STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socketpool_socketpool_socket_obj) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&socketpool_socketpool_getaddrinfo_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gaierror), MP_ROM_PTR(&mp_type_gaierror) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(SOCKETPOOL_AF_INET) },
@@ -176,6 +191,8 @@ STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(SOCKETPOOL_TCP_NODELAY) },
 
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(SOCKETPOOL_IPPROTO_TCP) },
+
+    { MP_ROM_QSTR(MP_QSTR_EAI_NONAME), MP_ROM_INT(SOCKETPOOL_EAI_NONAME) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(socketpool_socketpool_locals_dict, socketpool_socketpool_locals_dict_table);

From 1bbdc820c0784c736c7fe98db7252beea47b396e Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 28 Nov 2022 17:02:46 -0600
Subject: [PATCH 1445/2403] make show(None) show the terminal

---
 shared-module/displayio/Display.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index a640d10fd3..1f7891dc17 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -141,6 +141,9 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 }
 
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
+    if (root_group == NULL) {
+        return displayio_display_core_set_root_group(&self->core, &circuitpython_splash);
+    }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 

From c13ca95da1c8a59a18f628891595a7e50fed5d0b Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 22 Nov 2022 17:10:54 -0800
Subject: [PATCH 1446/2403] Add MDNS support to Pico W

This adds both cpy-MAC.local and circuitpython.local support.

Fixes #7214
---
 .gitmodules                                   |   6 +-
 locale/circuitpython.pot                      |  13 +-
 ports/raspberrypi/Makefile                    |   1 +
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   2 +-
 .../common-hal/mdns/RemoteService.c           |  64 ++++
 .../common-hal/mdns/RemoteService.h           |  40 +++
 ports/raspberrypi/common-hal/mdns/Server.c    | 307 ++++++++++++++++++
 ports/raspberrypi/common-hal/mdns/Server.h    |  40 +++
 ports/raspberrypi/common-hal/mdns/__init__.c  |   1 +
 ports/raspberrypi/common-hal/wifi/Radio.c     |   8 +-
 ports/raspberrypi/lib/cyw43-driver            |   2 +-
 ports/raspberrypi/lib/lwip                    |   2 +-
 ports/raspberrypi/lwip_inc/lwipopts.h         |   9 +
 shared-bindings/wifi/Radio.c                  |   4 +-
 shared-bindings/wifi/Radio.h                  |   2 +
 supervisor/shared/web_workflow/web_workflow.c |  63 ++--
 16 files changed, 521 insertions(+), 43 deletions(-)
 create mode 100644 ports/raspberrypi/common-hal/mdns/RemoteService.c
 create mode 100644 ports/raspberrypi/common-hal/mdns/RemoteService.h
 create mode 100644 ports/raspberrypi/common-hal/mdns/Server.c
 create mode 100644 ports/raspberrypi/common-hal/mdns/Server.h
 create mode 100644 ports/raspberrypi/common-hal/mdns/__init__.c

diff --git a/.gitmodules b/.gitmodules
index f13eb79e45..ae413799c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -312,10 +312,12 @@
 	url = https://github.com/adafruit/esp32-camera/
 [submodule "ports/raspberrypi/lib/cyw43-driver"]
 	path = ports/raspberrypi/lib/cyw43-driver
-	url = https://github.com/georgerobotics/cyw43-driver.git
+	url = https://github.com/adafruit/cyw43-driver.git
+	branch = circuitpython8
 [submodule "ports/raspberrypi/lib/lwip"]
 	path = ports/raspberrypi/lib/lwip
-	url = https://github.com/lwip-tcpip/lwip.git
+	url = https://github.com/adafruit/lwip.git
+	branch = circuitpython8
 [submodule "lib/mbedtls"]
 	path = lib/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 044900bd30..09c7ed61bd 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%q in use"
 msgstr ""
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1663,6 +1663,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2192,6 +2196,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3153,7 +3158,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3405,10 +3410,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 44d74f2bd4..acecd68c58 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -47,6 +47,7 @@ SRC_SDK_CYW43 := \
 
 SRC_LWIP := \
 	shared/netutils/netutils.c \
+	$(wildcard lib/lwip/src/apps/mdns/*.c) \
 	$(wildcard lib/lwip/src/core/*.c) \
 	$(wildcard lib/lwip/src/core/ipv4/*.c) \
 	lib/lwip/src/netif/ethernet.c \
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index f36fdd6ec7..a050391505 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -15,7 +15,7 @@ CIRCUITPY_SSL = 1
 CIRCUITPY_SSL_MBEDTLS = 1
 CIRCUITPY_HASHLIB = 1
 CIRCUITPY_WEB_WORKFLOW = 1
-CIRCUITPY_MDNS = 0
+CIRCUITPY_MDNS = 1
 CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
diff --git a/ports/raspberrypi/common-hal/mdns/RemoteService.c b/ports/raspberrypi/common-hal/mdns/RemoteService.c
new file mode 100644
index 0000000000..071a9c1648
--- /dev/null
+++ b/ports/raspberrypi/common-hal/mdns/RemoteService.c
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 "shared-bindings/mdns/RemoteService.h"
+
+#include "shared-bindings/ipaddress/IPv4Address.h"
+
+const char *common_hal_mdns_remoteservice_get_service_type(mdns_remoteservice_obj_t *self) {
+    return self->service_name;
+}
+
+const char *common_hal_mdns_remoteservice_get_protocol(mdns_remoteservice_obj_t *self) {
+    return self->protocol;
+}
+
+const char *common_hal_mdns_remoteservice_get_instance_name(mdns_remoteservice_obj_t *self) {
+    return self->instance_name;
+}
+
+const char *common_hal_mdns_remoteservice_get_hostname(mdns_remoteservice_obj_t *self) {
+    return self->hostname;
+}
+
+mp_int_t common_hal_mdns_remoteservice_get_port(mdns_remoteservice_obj_t *self) {
+    return self->port;
+}
+
+uint32_t mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self) {
+    return self->ipv4_address;
+}
+
+mp_obj_t common_hal_mdns_remoteservice_get_ipv4_address(mdns_remoteservice_obj_t *self) {
+    uint32_t addr = mdns_remoteservice_get_ipv4_address(self);
+    if (addr == 0) {
+        return mp_const_none;
+    }
+    return common_hal_ipaddress_new_ipv4address(addr);
+}
+
+void common_hal_mdns_remoteservice_deinit(mdns_remoteservice_obj_t *self) {
+}
diff --git a/ports/raspberrypi/common-hal/mdns/RemoteService.h b/ports/raspberrypi/common-hal/mdns/RemoteService.h
new file mode 100644
index 0000000000..06814f0fbb
--- /dev/null
+++ b/ports/raspberrypi/common-hal/mdns/RemoteService.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "lwip/apps/mdns.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint32_t ipv4_address;
+    uint16_t port;
+    char protocol[5]; // RFC 6763 Section 7.2 - 4 bytes + 1 for NUL
+    char service_name[17]; // RFC 6763 Section 7.2 - 16 bytes + 1 for NUL
+    char instance_name[64]; // RFC 6763 Section 7.2 - 63 bytes + 1 for NUL
+    char hostname[64]; // RFC 6762 Appendix A - 63 bytes for label + 1 for NUL
+    mp_obj_t next;
+} mdns_remoteservice_obj_t;
diff --git a/ports/raspberrypi/common-hal/mdns/Server.c b/ports/raspberrypi/common-hal/mdns/Server.c
new file mode 100644
index 0000000000..72aedf3889
--- /dev/null
+++ b/ports/raspberrypi/common-hal/mdns/Server.c
@@ -0,0 +1,307 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 "shared-bindings/mdns/Server.h"
+
+#include "py/gc.h"
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared-bindings/mdns/RemoteService.h"
+#include "shared-bindings/wifi/__init__.h"
+#include "supervisor/shared/tick.h"
+
+#include "lwip/apps/mdns.h"
+#include "lwip/prot/dns.h"
+
+STATIC bool inited = false;
+
+#define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
+#define NETIF_AP (&cyw43_state.netif[CYW43_ITF_AP])
+
+void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
+    if (inited) {
+        return;
+    }
+
+    mdns_resp_init();
+    inited = true;
+
+    uint8_t mac[6];
+    wifi_radio_get_mac_address(&common_hal_wifi_radio_obj, mac);
+    snprintf(self->default_hostname, sizeof(self->default_hostname), "cpy-%02x%02x%02x", mac[3], mac[4], mac[5]);
+    common_hal_mdns_server_set_hostname(self, self->default_hostname);
+
+    if (workflow) {
+        // Add a second host entry to respond to "circuitpython.local" queries as well.
+
+        #if MDNS_MAX_SECONDARY_HOSTNAMES > 0
+        mdns_resp_add_secondary_hostname(NETIF_STA, "circuitpython");
+        #endif
+    }
+}
+
+void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface) {
+    if (network_interface != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) {
+        mp_raise_ValueError(translate("mDNS only works with built-in WiFi"));
+        return;
+    }
+    if (inited) {
+        mp_raise_RuntimeError(translate("mDNS already initialized"));
+    }
+    mdns_server_construct(self, false);
+}
+
+void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
+    inited = false;
+    mdns_resp_remove_netif(NETIF_STA);
+}
+
+bool common_hal_mdns_server_deinited(mdns_server_obj_t *self) {
+    return !mdns_resp_netif_active(NETIF_STA);
+}
+
+const char *common_hal_mdns_server_get_hostname(mdns_server_obj_t *self) {
+    return self->hostname;
+}
+
+void common_hal_mdns_server_set_hostname(mdns_server_obj_t *self, const char *hostname) {
+    if (mdns_resp_netif_active(NETIF_STA)) {
+        mdns_resp_rename_netif(NETIF_STA, hostname);
+    } else {
+        mdns_resp_add_netif(NETIF_STA, hostname);
+    }
+
+    self->hostname = hostname;
+}
+
+const char *common_hal_mdns_server_get_instance_name(mdns_server_obj_t *self) {
+    return self->instance_name;
+}
+
+void common_hal_mdns_server_set_instance_name(mdns_server_obj_t *self, const char *instance_name) {
+    self->instance_name = instance_name;
+}
+
+typedef struct {
+    uint8_t request_id;
+    size_t i;
+    mdns_remoteservice_obj_t *out;
+    size_t out_len;
+} nonalloc_search_state_t;
+
+STATIC void copy_data_into_remote_service(struct mdns_answer *answer, const char *varpart, int varlen, mdns_remoteservice_obj_t *out) {
+    if (varlen > 0) {
+        if (answer->info.type == DNS_RRTYPE_A) {
+            char *hostname = out->hostname;
+            size_t len = MIN(63, answer->info.domain.name[0]);
+            memcpy(hostname, answer->info.domain.name + 1, len);
+            hostname[len] = '\0';
+            out->ipv4_address = varpart[0] | varpart[1] << 8 | varpart[2] << 16 | varpart[3] << 24;
+        }
+        if (answer->info.type == DNS_RRTYPE_SRV) {
+            // This isn't a null terminated string. Its length encoded.
+            uint8_t *domain = answer->info.domain.name;
+            char *instance_name = out->instance_name;
+            size_t offset = 0;
+            uint8_t iname_len = domain[offset++];
+            size_t len = MIN(63, iname_len);
+            memcpy(instance_name, domain + offset, len);
+            offset += iname_len;
+            instance_name[len] = '\0';
+
+            uint8_t sn_len = domain[offset++];
+            char *service_name = out->service_name;
+            len = MIN(16, sn_len);
+            memcpy(service_name, domain + offset, len);
+            offset += sn_len;
+            service_name[len] = '\0';
+
+            uint8_t proto_len = domain[offset++];
+            char *protocol = out->protocol;
+            len = MIN(4, proto_len);
+            memcpy(protocol, domain + offset, len);
+            offset += proto_len;
+            protocol[len] = '\0';
+
+            out->port = varpart[4] << 8 | varpart[5];
+        }
+    }
+}
+
+STATIC void search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) {
+    nonalloc_search_state_t *state = arg;
+    state->out[state->i].base.type = &mdns_remoteservice_type;
+
+    copy_data_into_remote_service(answer, varpart, varlen, &state->out[state->i]);
+
+    if ((flags & MDNS_SEARCH_RESULT_LAST) != 0) {
+        state->i += 1;
+    }
+
+    if (state->i == state->out_len) {
+        mdns_search_stop(state->request_id);
+        state->request_id = MDNS_MAX_REQUESTS;
+    }
+}
+
+size_t mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol,
+    mp_float_t timeout, mdns_remoteservice_obj_t *out, size_t out_len) {
+
+    enum mdns_sd_proto proto = DNSSD_PROTO_UDP;
+    if (strcmp(protocol, "_tcp") == 0) {
+        proto = DNSSD_PROTO_TCP;
+    }
+
+    nonalloc_search_state_t state;
+    state.i = 0;
+    state.out = out;
+    state.out_len = out_len;
+
+    err_t err = mdns_search_service(NULL, service_type, proto,
+        NETIF_STA, &search_result_cb, &state,
+        &state.request_id);
+    if (err != ERR_OK) {
+        return 0;
+    }
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t timeout_ms = timeout * 1000;
+
+    while (state.request_id < MDNS_MAX_REQUESTS &&
+           !mp_hal_is_interrupted() &&
+           supervisor_ticks_ms64() - start_ticks < timeout_ms) {
+        RUN_BACKGROUND_TASKS;
+    }
+    if (state.request_id < MDNS_MAX_REQUESTS) {
+        mdns_search_stop(state.request_id);
+        state.request_id = MDNS_MAX_REQUESTS;
+    }
+
+    return state.i;
+}
+
+typedef struct {
+    uint8_t request_id;
+    mdns_remoteservice_obj_t *head;
+    size_t count;
+} alloc_search_state_t;
+
+STATIC void alloc_search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) {
+    alloc_search_state_t *state = arg;
+
+    if ((flags & MDNS_SEARCH_RESULT_FIRST) != 0) {
+        // first
+        mdns_remoteservice_obj_t *service = gc_alloc(sizeof(mdns_remoteservice_obj_t), 0, false);
+        mp_printf(&mp_plat_print, "found service %p\n", service);
+        if (service == NULL) {
+            // alloc fails
+            mdns_search_stop(state->request_id);
+            state->request_id = MDNS_MAX_REQUESTS;
+            if (state->count == 0) {
+                m_malloc_fail(sizeof(mdns_remoteservice_obj_t));
+            }
+            return;
+        }
+        service->base.type = &mdns_remoteservice_type;
+        state->count++;
+        service->next = state->head;
+        state->head = service;
+    }
+
+    copy_data_into_remote_service(answer, varpart, varlen, state->head);
+}
+
+mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_float_t timeout) {
+    enum mdns_sd_proto proto = DNSSD_PROTO_UDP;
+    if (strcmp(protocol, "_tcp") == 0) {
+        proto = DNSSD_PROTO_TCP;
+    }
+
+    alloc_search_state_t state;
+    state.count = 0;
+    state.head = NULL;
+
+    err_t err = mdns_search_service(NULL, service_type, proto,
+        NETIF_STA, &alloc_search_result_cb, &state,
+        &state.request_id);
+    if (err != ERR_OK) {
+        mp_raise_RuntimeError(translate("Unable to start mDNS query"));
+    }
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t timeout_ms = timeout * 1000;
+
+    while (state.request_id < MDNS_MAX_REQUESTS &&
+           !mp_hal_is_interrupted() &&
+           supervisor_ticks_ms64() - start_ticks < timeout_ms) {
+        RUN_BACKGROUND_TASKS;
+    }
+    if (state.request_id < MDNS_MAX_REQUESTS) {
+        mdns_search_stop(state.request_id);
+        state.request_id = MDNS_MAX_REQUESTS;
+    }
+
+    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(state.count, NULL));
+    mdns_remoteservice_obj_t *next = state.head;
+    uint8_t added = 0;
+    while (next != NULL) {
+        mdns_remoteservice_obj_t *cur = next;
+        tuple->items[added] = MP_OBJ_FROM_PTR(cur);
+        next = cur->next;
+        // Set next back to NULL so that each service object is independently
+        // tracked for GC.
+        cur->next = NULL;
+        added++;
+    }
+
+    return MP_OBJ_FROM_PTR(tuple);
+}
+
+void common_hal_mdns_server_advertise_service(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_int_t port) {
+    enum mdns_sd_proto proto = DNSSD_PROTO_UDP;
+    if (strcmp(protocol, "_tcp") == 0) {
+        proto = DNSSD_PROTO_TCP;
+    }
+    // Remove the existing service if it was already added.
+    int8_t existing_slot = MDNS_MAX_SERVICES;
+    for (int i = 0; i < MDNS_MAX_SERVICES; i++) {
+        if (self->service_type[i] != NULL &&
+            (service_type == self->service_type[i] ||
+             strcmp(service_type, self->service_type[i]) == 0)) {
+            existing_slot = i;
+            break;
+        }
+    }
+    if (existing_slot < MDNS_MAX_SERVICES) {
+        mdns_resp_del_service(NETIF_STA, existing_slot);
+    }
+    int8_t slot = mdns_resp_add_service(NETIF_STA, self->instance_name, service_type, proto, port, NULL, NULL);
+    if (slot < 0) {
+        mp_raise_RuntimeError(translate("Out of MDNS service slots"));
+        return;
+    }
+    self->service_type[slot] = service_type;
+}
diff --git a/ports/raspberrypi/common-hal/mdns/Server.h b/ports/raspberrypi/common-hal/mdns/Server.h
new file mode 100644
index 0000000000..8f28d74d3c
--- /dev/null
+++ b/ports/raspberrypi/common-hal/mdns/Server.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "lwip/apps/mdns_opts.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const char *hostname;
+    const char *instance_name;
+    // "cpy-" "XXXXXX" "\0"
+    char default_hostname[4 + 6 + 1];
+    const char *service_type[MDNS_MAX_SERVICES];
+} mdns_server_obj_t;
diff --git a/ports/raspberrypi/common-hal/mdns/__init__.c b/ports/raspberrypi/common-hal/mdns/__init__.c
new file mode 100644
index 0000000000..57740777c8
--- /dev/null
+++ b/ports/raspberrypi/common-hal/mdns/__init__.c
@@ -0,0 +1 @@
+// No mdns module functions.
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index ae8f64e595..7fe03024f2 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -42,10 +42,6 @@
 #include "shared-bindings/time/__init__.h"
 #include "shared-module/ipaddress/__init__.h"
 
-#if CIRCUITPY_MDNS
-#include "components/mdns/include/mdns.h"
-#endif
-
 #include "lwip/sys.h"
 #include "lwip/dns.h"
 #include "lwip/icmp.h"
@@ -95,6 +91,10 @@ void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *host
     netif_set_hostname(NETIF_AP, self->hostname);
 }
 
+void wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac) {
+    memcpy(mac, cyw43_state.mac, MAC_ADDRESS_LENGTH);
+}
+
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
     return mp_obj_new_bytes(cyw43_state.mac, MAC_ADDRESS_LENGTH);
 }
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
index 195dfcc10b..746e063603 160000
--- a/ports/raspberrypi/lib/cyw43-driver
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 195dfcc10bb6f379e3dea45147590db2203d3c7b
+Subproject commit 746e0636033d0550b7652688124a77a6a1639cf9
diff --git a/ports/raspberrypi/lib/lwip b/ports/raspberrypi/lib/lwip
index 239918ccc1..d26459c32c 160000
--- a/ports/raspberrypi/lib/lwip
+++ b/ports/raspberrypi/lib/lwip
@@ -1 +1 @@
-Subproject commit 239918ccc173cb2c2a62f41a40fd893f57faf1d6
+Subproject commit d26459c32c83aa14a6d4e30237d91cee36e0adbd
diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 0d4ecd3707..6d116e89b6 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -54,6 +54,14 @@
 #define LWIP_DHCP_DOES_ACD_CHECK    0
 #define SO_REUSE                    1
 
+#if CIRCUITPY_MDNS
+#define LWIP_IGMP                   1
+#define LWIP_MDNS_RESPONDER         1
+#define LWIP_NUM_NETIF_CLIENT_DATA  1
+#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
+#define MDNS_MAX_SECONDARY_HOSTNAMES 1
+#endif
+
 #ifndef NDEBUG
 #define LWIP_DEBUG                  1
 #define LWIP_STATS                  1
@@ -88,6 +96,7 @@
 #define PPP_DEBUG                   LWIP_DBG_OFF
 #define SLIP_DEBUG                  LWIP_DBG_OFF
 #define DHCP_DEBUG                  LWIP_DBG_OFF
+#define MDNS_DEBUG                  LWIP_DBG_OFF
 
 #define LWIP_TIMEVAL_PRIVATE 0
 
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 37123dbb44..c12e19e726 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -140,11 +140,11 @@ MP_PROPERTY_GETSET(wifi_radio_hostname_obj,
 //|     mac_address: ReadableBuffer
 //|     """MAC address for the station. When the address is altered after interface is connected
 //|        the changes would only be reflected once the interface reconnects."""
-STATIC mp_obj_t wifi_radio_get_mac_address(mp_obj_t self_in) {
+STATIC mp_obj_t _wifi_radio_get_mac_address(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_obj, wifi_radio_get_mac_address);
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_obj, _wifi_radio_get_mac_address);
 
 STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_address_in) {
     mp_buffer_info_t mac_address;
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 407443c77e..dbaeb9cce8 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -77,6 +77,8 @@ extern void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabl
 extern mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname);
 
+
+extern void wifi_radio_get_mac_address(wifi_radio_obj_t *self, uint8_t *mac);
 extern mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_mac_address(wifi_radio_obj_t *self, const uint8_t *mac);
 extern mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 2d6025b6aa..3527090f1e 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -428,7 +428,6 @@ static bool _endswith(const char *str, const char *suffix) {
 }
 
 const char *ok_hosts[] = {
-    "code.circuitpython.org",
     "127.0.0.1",
     "localhost",
 };
@@ -1393,38 +1392,44 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
 
 
 void supervisor_web_workflow_background(void) {
-    // If we have a request in progress, continue working on it. Do this first
-    // so that we can accept another socket after finishing this request.
-    if (common_hal_socketpool_socket_get_connected(&active)) {
-        _process_request(&active, &active_request);
-    } else {
-        // Close the active socket if it is no longer connected.
-        common_hal_socketpool_socket_close(&active);
-    }
-
-    // Otherwise, see if we have another socket to accept.
-    if ((!common_hal_socketpool_socket_get_connected(&active) ||
-         (!active_request.in_progress && !active_request.new_socket)) &&
-        !common_hal_socketpool_socket_get_closed(&listening)) {
-        uint32_t ip;
-        uint32_t port;
-        int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port, &active);
-        if (newsoc == -EBADF) {
-            common_hal_socketpool_socket_close(&listening);
-            return;
+    // Track if we have more to do. For example, we should start processing a
+    // request immediately after we accept the socket.
+    bool more_to_do = true;
+    while (more_to_do) {
+        more_to_do = false;
+        // If we have a request in progress, continue working on it. Do this first
+        // so that we can accept another socket after finishing this request.
+        if (common_hal_socketpool_socket_get_connected(&active)) {
+            _process_request(&active, &active_request);
+        } else {
+            // Close the active socket if it is no longer connected.
+            common_hal_socketpool_socket_close(&active);
         }
-        if (newsoc > 0) {
-            common_hal_socketpool_socket_settimeout(&active, 0);
 
-            _reset_request(&active_request);
-            // Mark new sockets, otherwise we may accept another before the first
-            // could start its request.
-            active_request.new_socket = true;
+        // Otherwise, see if we have another socket to accept.
+        if ((!common_hal_socketpool_socket_get_connected(&active) ||
+             (!active_request.in_progress && !active_request.new_socket)) &&
+            !common_hal_socketpool_socket_get_closed(&listening)) {
+            uint32_t ip;
+            uint32_t port;
+            int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port, &active);
+            if (newsoc == -EBADF) {
+                common_hal_socketpool_socket_close(&listening);
+                return;
+            }
+            if (newsoc > 0) {
+                common_hal_socketpool_socket_settimeout(&active, 0);
+
+                _reset_request(&active_request);
+                // Mark new sockets, otherwise we may accept another before the first
+                // could start its request.
+                active_request.new_socket = true;
+                more_to_do = true;
+            }
         }
+
+        websocket_background();
     }
-
-
-    websocket_background();
 }
 
 void supervisor_stop_web_workflow(void) {

From f3100af6ac1074124237ebef2bacd93dded76fb9 Mon Sep 17 00:00:00 2001
From: Clay 
Date: Mon, 28 Nov 2022 06:39:34 +0000
Subject: [PATCH 1447/2403] Translated using Weblate (Russian)

Currently translated at 35.2% (351 of 995 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ru/
---
 locale/ru.po | 126 +++++++++++++++++++++++++++++----------------------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/locale/ru.po b/locale/ru.po
index 99720416ff..2871aa465e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-11-26 04:48+0000\n"
+"PO-Revision-Date: 2022-11-29 01:02+0000\n"
 "Last-Translator: Clay \n"
 "Language-Team: none\n"
 "Language: ru\n"
@@ -73,13 +73,13 @@ msgstr "%%c требует int или char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
-msgstr "%d адресные пины, %d rgb пины и %d плитки указывают высоту %d а не %d"
+msgstr "%d адресных пинов, %d rgb пинов и %d тайлов указывают высоту %d а не %d"
 
 #: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
@@ -92,7 +92,7 @@ msgstr "%d адресные пины, %d rgb пины и %d плитки ука
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -100,7 +100,7 @@ msgstr "%q и %q содержат пины-дупликаты"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q и %q должны быть разными"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
@@ -122,15 +122,15 @@ msgstr "Индекс %q вне диапазона"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "Инициализация %q не удалась"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q является %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "Длинна %q должна быть %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
@@ -138,11 +138,11 @@ msgstr "Длинна %q должна быть %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "Длинна %q должна быть <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "Длинна %q должна быть >= %d"
 
 #: shared-bindings/busio/I2C.c
 msgid "%q length must be >= 1"
@@ -150,44 +150,44 @@ msgstr "Длинна %q должна быть >= 1"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q должно быть %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr "%q должен быть %d-%d"
+msgstr "%q должно быть %d-%d"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "%q должно быть 1 когда %q is True"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
-msgstr "%q должен быть <= %d"
+msgstr "%q должно быть <= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr "%q должен быть >= %d"
+msgstr "%q должно быть >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b', или 'B'"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr "%q должен быть строкой"
+msgstr "%q должно быть строкой"
 
 #: py/argcheck.c
 msgid "%q must be an int"
-msgstr ""
+msgstr "%q должно быть int"
 
 #: py/argcheck.c
 msgid "%q must be of type %q"
-msgstr "%q должен быть типа %q"
+msgstr "%q должно быть типа %q"
 
 #: shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
-msgstr ""
+msgstr "%q должно быть типа %q или None"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -225,7 +225,7 @@ msgstr "%q, %q, и %q должны быть одной длинны"
 
 #: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
@@ -359,7 +359,7 @@ msgstr "'data' требует как минимум 2 аргумента"
 
 #: py/compile.c
 msgid "'data' requires integer arguments"
-msgstr "'data' требует целочисленных аргументов"
+msgstr "'data' требует целочисленные аргументы"
 
 #: py/compile.c
 msgid "'label' requires 1 argument"
@@ -600,7 +600,7 @@ msgstr "Для управления потоком требуется как RX,
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Обе кнопки были нажаты при загрузке.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -670,7 +670,7 @@ msgstr "Пин шины %d уже используется"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Кнопка A была нажата при загрузке\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -682,7 +682,7 @@ msgstr "Блоки CBC должны быть кратны 16 байтам"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr ""
+msgstr "Не удалось найти или создать диск CIRCUITPY."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
@@ -694,7 +694,7 @@ msgstr "Вызовите super().__init__() перед обращением к 
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "Иницализация камеры"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
@@ -766,7 +766,7 @@ msgstr "Невозможно перемонтировать '/' пока он в
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
+msgstr "Не удалось перезагрузится в загрузчик так как загрузчик отсутствует"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -787,15 +787,18 @@ msgstr "Срез субкласса невозможен"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "Невозможно передать данные без пинов MOSI и MISO"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
 msgstr "Невозможно изменить частоту на таймере, который уже используется"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
+#, fuzzy
 msgid "Cannot wake on pin edge, only level"
 msgstr ""
+"Невозможно проснуться по изменению логического уровня (CHANGE), только по "
+"уровню (LEVEL)"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -915,7 +918,7 @@ msgstr "Поворот дисплея должен осуществляться
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -960,11 +963,12 @@ msgstr "Ожидалось(ся) %q"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "Ожидалось %q или %q"
 
 #: shared-bindings/alarm/__init__.c
+#, fuzzy
 msgid "Expected an %q"
-msgstr ""
+msgstr "Ожидалось %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -994,7 +998,7 @@ msgstr "Не удалось получить mutex, ошибка 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
-msgstr ""
+msgstr "Не удалось выделить буфер %q"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
@@ -1045,17 +1049,19 @@ msgid "Filters too complex"
 msgstr "Фильтры слишком сложные"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
+#, fuzzy
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Прошивка является дубликатом"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
+#, fuzzy
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Прошивка является неправильной"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Прошивка слишком большая"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1075,6 +1081,8 @@ msgstr "Формат не поддерживается"
 msgid ""
 "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 msgstr ""
+"Частота должна быть 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 или 1008 "
+"МГц"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
@@ -1089,7 +1097,7 @@ msgstr "Функция требует блокировки"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "Инициализация GNSS"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1106,7 +1114,7 @@ msgstr "Группа уже используется"
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "Half duplex SPI is not implemented"
-msgstr ""
+msgstr "Полудуплексный SPI не реализован"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
@@ -1124,7 +1132,7 @@ msgstr "Операция ввода-вывода на закрытом файл
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "Ошибка инициализации I2C"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1240,8 +1248,9 @@ msgid "Internal error #%d"
 msgstr "Внутренняя ошибка #%d"
 
 #: supervisor/shared/safe_mode.c
+#, fuzzy
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Внутренний сторожевой таймер истек."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -1324,12 +1333,14 @@ msgid "LHS of keyword arg must be an id"
 msgstr "LHS ключевого слова arg должен быть идентификатором(id)"
 
 #: shared-module/displayio/Group.c
+#, fuzzy
 msgid "Layer already in a group"
-msgstr ""
+msgstr "Слой уже в группе (Group)"
 
 #: shared-module/displayio/Group.c
+#, fuzzy
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "Слой должен быть группой (Group) или субклассом TileGrid."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
@@ -1351,7 +1362,7 @@ msgstr "Задержка включения микрофона должна бы
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched data size"
-msgstr ""
+msgstr "Размер данных различается"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched swap flag"
@@ -1363,7 +1374,7 @@ msgstr "Отсутствует пин MISO или MOSI"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "Отсутствует пин MISO или MOSI"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1428,7 +1439,7 @@ msgstr "Имя слишком длинное"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "New bitmap must be same size as old bitmap"
-msgstr ""
+msgstr "Новый bitmap должен быть того же размера что и старый"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 msgid "Nimble out of memory"
@@ -1456,13 +1467,13 @@ msgid "No DMA pacing timer found"
 msgstr ""
 
 #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
-#, c-format
+#, c-format, fuzzy
 msgid "No I2C device at address: 0x%x"
-msgstr ""
+msgstr "Не найдено устройство I2C по адресу: %x"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "Нет IP"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1471,7 +1482,7 @@ msgstr "Нет пина MISO"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "Нет пина MISO"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1480,7 +1491,7 @@ msgstr "Нет пина MOSI"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "Нет пина MOSI"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
@@ -1566,8 +1577,9 @@ msgid "No space left on device"
 msgstr "На устройстве не осталось свободного места"
 
 #: py/moduerrno.c
+#, fuzzy
 msgid "No such device"
-msgstr ""
+msgstr "Нет такого устройства"
 
 #: py/moduerrno.c
 msgid "No such file/directory"
@@ -1578,8 +1590,9 @@ msgid "No timer available"
 msgstr "Нет доступного таймера"
 
 #: supervisor/shared/safe_mode.c
+#, fuzzy
 msgid "Nordic system firmware failure assertion."
-msgstr ""
+msgstr "Сбой системной прошивки Nordic (assertion)."
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
@@ -1597,12 +1610,14 @@ msgstr "Не подключено"
 
 #: shared-bindings/audiobusio/I2SOut.c shared-bindings/audioio/AudioOut.c
 #: shared-bindings/audiopwmio/PWMAudioOut.c
+#, fuzzy
 msgid "Not playing"
-msgstr "Не играет"
+msgstr "Не воспроизводится (Not playing)"
 
 #: shared-bindings/_bleio/__init__.c
+#, fuzzy
 msgid "Not settable"
-msgstr "Не устанавливается"
+msgstr "Невозможно установить"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
@@ -1622,11 +1637,12 @@ msgstr ""
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Выключено"
 
 #: supervisor/shared/bluetooth/bluetooth.c
+#, fuzzy
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c

From eaf0d04a25426bfda7ff684c77d5a01278d1402b Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 29 Nov 2022 16:09:32 +0100
Subject: [PATCH 1448/2403] 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             | 13 ++++++++++---
 locale/cs.po             | 13 ++++++++++---
 locale/de_DE.po          | 13 ++++++++++---
 locale/el.po             | 13 ++++++++++---
 locale/en_GB.po          | 13 ++++++++++---
 locale/es.po             | 13 ++++++++++---
 locale/fil.po            | 13 ++++++++++---
 locale/fr.po             | 13 ++++++++++---
 locale/hi.po             | 13 ++++++++++---
 locale/it_IT.po          | 13 ++++++++++---
 locale/ja.po             | 13 ++++++++++---
 locale/ko.po             | 13 ++++++++++---
 locale/nl.po             | 13 ++++++++++---
 locale/pl.po             | 13 ++++++++++---
 locale/pt_BR.po          | 13 ++++++++++---
 locale/ru.po             | 18 +++++++++++++-----
 locale/sv.po             | 13 ++++++++++---
 locale/tr.po             | 13 ++++++++++---
 locale/zh_Latn_pinyin.po | 13 ++++++++++---
 19 files changed, 193 insertions(+), 59 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index fe346373ef..5ac957eb07 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -112,7 +112,7 @@ msgstr "%q gagal: %d"
 msgid "%q in use"
 msgstr "%q sedang digunakan"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q indeks di luar batas"
 
@@ -177,7 +177,7 @@ msgstr "%q harus berupa string"
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q harus bertipe %q"
 
@@ -1683,6 +1683,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr "Waktu habis"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Kehabisan memori"
@@ -2221,6 +2225,7 @@ msgid "Unable to read color palette data"
 msgstr "Tidak dapat membaca data palet warna"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3184,7 +3189,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index keluar dari jangkauan"
@@ -3436,10 +3441,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 3ea4c2dcf3..55a1787aa7 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -113,7 +113,7 @@ msgstr "%q: selhání %d"
 msgid "%q in use"
 msgstr "%q se právě používá"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "Index %q je mimo rozsah"
 
@@ -178,7 +178,7 @@ msgstr "%q musí být string"
 msgid "%q must be an int"
 msgstr "%q musí být int"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q musí být typu %q"
 
@@ -1679,6 +1679,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2210,6 +2214,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3171,7 +3176,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3423,10 +3428,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index d9c21c5742..127a1c4ac7 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -114,7 +114,7 @@ msgstr "%q Fehler: %d"
 msgid "%q in use"
 msgstr "%q in Benutzung"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "Der Index %q befindet sich außerhalb des Bereiches"
 
@@ -180,7 +180,7 @@ msgstr "%q muss ein String sein"
 msgid "%q must be an int"
 msgstr "%q muss vom Typ Integer sein"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q muss vom Type %q sein"
 
@@ -1700,6 +1700,10 @@ msgstr "Vorgang oder Funktion wird nicht unterstützt"
 msgid "Operation timed out"
 msgstr "Zeit für Vorgang abgelaufen"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Kein Speicher mehr verfügbar"
@@ -2249,6 +2253,7 @@ msgid "Unable to read color palette data"
 msgstr "Konnte Farbpalettendaten nicht lesen"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
@@ -3242,7 +3247,7 @@ msgid "index is out of bounds"
 msgstr "Index ist außerhalb der Grenzen"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index außerhalb der Reichweite"
@@ -3500,10 +3505,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "Loopback + Silent Mode wird vom Peripheriegerät nicht unterstützt"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr "mDNS bereits initialisiert"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr "mDNS funktioniert nur mit integriertem WiFi"
 
diff --git a/locale/el.po b/locale/el.po
index d47a0c5399..4a6b5c4250 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -118,7 +118,7 @@ msgstr "%q αποτυχία: %d"
 msgid "%q in use"
 msgstr "%q είναι σε χρήση"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q δείκτης εκτός εμβέλειας"
 
@@ -183,7 +183,7 @@ msgstr "%q πρέπει να είναι string"
 msgid "%q must be an int"
 msgstr "%q πρέπει να είναι int"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q πρέπει να είναι τύπου %q"
 
@@ -1688,6 +1688,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2219,6 +2223,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3180,7 +3185,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3432,10 +3437,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index e6fabd93d9..15d3644f52 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -116,7 +116,7 @@ msgstr "%q failure: %d"
 msgid "%q in use"
 msgstr "%q in use"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q index out of range"
 
@@ -181,7 +181,7 @@ msgstr "%q must be a string"
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1683,6 +1683,10 @@ msgstr "Operation or feature not supported"
 msgid "Operation timed out"
 msgstr "Operation timed out"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Out of memory"
@@ -2223,6 +2227,7 @@ msgid "Unable to read color palette data"
 msgstr "Unable to read colour palette data"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3190,7 +3195,7 @@ msgid "index is out of bounds"
 msgstr "index is out of bounds"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index out of range"
@@ -3442,10 +3447,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode not supported by peripheral"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/es.po b/locale/es.po
index 13cb9a3821..bb1c36b9bf 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -118,7 +118,7 @@ msgstr "%q fallo: %d"
 msgid "%q in use"
 msgstr "%q está siendo utilizado"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q indice fuera de rango"
 
@@ -183,7 +183,7 @@ msgstr "%q debe ser una cadena"
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1707,6 +1707,10 @@ msgstr "Operación no característica no soportada"
 msgid "Operation timed out"
 msgstr "Tiempo de espera agotado"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Memoria agotada"
@@ -2255,6 +2259,7 @@ msgid "Unable to read color palette data"
 msgstr "No se pudo leer los datos de la paleta de colores"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3230,7 +3235,7 @@ msgid "index is out of bounds"
 msgstr "el índice está fuera de límites"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index fuera de rango"
@@ -3485,10 +3490,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "Loopback + modo silencioso no están soportados por periférico"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/fil.po b/locale/fil.po
index f1e363b149..2cf6e49da4 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%q in use"
 msgstr "%q ay ginagamit"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q indeks wala sa sakop"
 
@@ -172,7 +172,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1678,6 +1678,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2209,6 +2213,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3184,7 +3189,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index wala sa sakop"
@@ -3440,10 +3445,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/fr.po b/locale/fr.po
index 2a4d6b230f..9f6bfba96b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -118,7 +118,7 @@ msgstr "Échec de %q : %d"
 msgid "%q in use"
 msgstr "%q en cours d'utilisation"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "index %q hors de portée"
 
@@ -183,7 +183,7 @@ msgstr "%q doit être une chaîne de caractères"
 msgid "%q must be an int"
 msgstr "%q doit être un entier"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q doit être du type %q"
 
@@ -1727,6 +1727,10 @@ msgstr "Opération ou fonction non supportée"
 msgid "Operation timed out"
 msgstr "Timeout de l'opération"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
@@ -2280,6 +2284,7 @@ msgid "Unable to read color palette data"
 msgstr "Impossible de lire les données de la palette de couleurs"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr "Impossible de lancer la requête mDNS"
 
@@ -3270,7 +3275,7 @@ msgid "index is out of bounds"
 msgstr "l'index est hors limites"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index est hors bornes"
@@ -3529,10 +3534,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode non pris en charge par le périphérique"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr "mDNS a déjà été initialisé"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr "mDNS ne fonctionne que avec le WiFi intégré"
 
diff --git a/locale/hi.po b/locale/hi.po
index 3c3496600b..ec884b211e 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%q in use"
 msgstr ""
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1663,6 +1663,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2192,6 +2196,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3153,7 +3158,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3405,10 +3410,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index e1ba5c3827..60698f4d36 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -113,7 +113,7 @@ msgstr "%q fallito: %d"
 msgid "%q in use"
 msgstr "%q in uso"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "indice %q fuori intervallo"
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1685,6 +1685,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2219,6 +2223,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3192,7 +3197,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "indice fuori intervallo"
@@ -3449,10 +3454,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/ja.po b/locale/ja.po
index f0755961cf..cc48e83b25 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -111,7 +111,7 @@ msgstr "%q 失敗: %d"
 msgid "%q in use"
 msgstr "%qは使用中"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q インデックスは範囲外"
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1676,6 +1676,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2206,6 +2210,7 @@ msgid "Unable to read color palette data"
 msgstr "カラーパレットデータを読み込めません"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3171,7 +3176,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "インデクスが範囲外"
@@ -3424,10 +3429,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 4ec7ff804f..e1609990db 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%q in use"
 msgstr "%q 사용 중입니다"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q 인덱스 범위를 벗어났습니다"
 
@@ -172,7 +172,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1666,6 +1666,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2196,6 +2200,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3157,7 +3162,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3409,10 +3414,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index fc1e1f77b8..e002370151 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -109,7 +109,7 @@ msgstr "%q fout: %d"
 msgid "%q in use"
 msgstr "%q in gebruik"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q index buiten bereik"
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1680,6 +1680,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2216,6 +2220,7 @@ msgid "Unable to read color palette data"
 msgstr "Niet in staat kleurenpalet data te lezen"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3187,7 +3192,7 @@ msgid "index is out of bounds"
 msgstr "index is buiten bereik"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index is buiten bereik"
@@ -3442,10 +3447,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode wordt niet ondersteund door randapparaat"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/pl.po b/locale/pl.po
index 22eacea387..d025272b69 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -111,7 +111,7 @@ msgstr "%q niepowodzenie: %d"
 msgid "%q in use"
 msgstr "%q w użyciu"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q poza zakresem"
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "%q must be an int"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -1674,6 +1674,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Brak pamięci"
@@ -2203,6 +2207,7 @@ msgid "Unable to read color palette data"
 msgstr "Nie można odczytać danych palety"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3165,7 +3170,7 @@ msgid "index is out of bounds"
 msgstr "indeks jest poza zakresem"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "indeks poza zakresem"
@@ -3417,10 +3422,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c3f7475167..e8a71e3d5b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -115,7 +115,7 @@ msgstr "%q falha: %d"
 msgid "%q in use"
 msgstr "%q em uso"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "O índice %q está fora do intervalo"
 
@@ -180,7 +180,7 @@ msgstr "%q deve ser uma string"
 msgid "%q must be an int"
 msgstr "%q deve ser um inteiro"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q deve ser do tipo %q"
 
@@ -1709,6 +1709,10 @@ msgstr "A operação ou o recurso não é suportado"
 msgid "Operation timed out"
 msgstr "A operação expirou"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Sem memória"
@@ -2262,6 +2266,7 @@ msgid "Unable to read color palette data"
 msgstr "Não foi possível ler os dados da paleta de cores"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr "Não é possível iniciar a consulta mDNS"
 
@@ -3247,7 +3252,7 @@ msgid "index is out of bounds"
 msgstr "o índice está fora dos limites"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "Índice fora do intervalo"
@@ -3503,10 +3508,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "o loopback + o modo silencioso não é suportado pelo periférico"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr "O mDNS já foi inicializado"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr "O mDNS só funciona com WiFi integrado"
 
diff --git a/locale/ru.po b/locale/ru.po
index 2871aa465e..2bfe2cdece 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -79,7 +79,8 @@ msgstr "%02X"
 #, c-format
 msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
-msgstr "%d адресных пинов, %d rgb пинов и %d тайлов указывают высоту %d а не %d"
+msgstr ""
+"%d адресных пинов, %d rgb пинов и %d тайлов указывают высоту %d а не %d"
 
 #: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
@@ -116,7 +117,7 @@ msgstr "%q сбой: %d"
 msgid "%q in use"
 msgstr "%q используется"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "Индекс %q вне диапазона"
 
@@ -181,7 +182,7 @@ msgstr "%q должно быть строкой"
 msgid "%q must be an int"
 msgstr "%q должно быть int"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q должно быть типа %q"
 
@@ -1467,7 +1468,7 @@ msgid "No DMA pacing timer found"
 msgstr ""
 
 #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "No I2C device at address: 0x%x"
 msgstr "Не найдено устройство I2C по адресу: %x"
 
@@ -1723,6 +1724,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2259,6 +2264,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3220,7 +3226,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3472,10 +3478,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 1980477f4f..20e22166cd 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -114,7 +114,7 @@ msgstr "%q-fel: %d"
 msgid "%q in use"
 msgstr "%q används redan"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "Index %q ligger utanför intervallet"
 
@@ -181,7 +181,7 @@ msgstr "%q måste vara en sträng"
 msgid "%q must be an int"
 msgstr "%q måste vara en int"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q måste vara av typen %q"
 
@@ -1691,6 +1691,10 @@ msgstr "Operation eller funktion stöds inte"
 msgid "Operation timed out"
 msgstr "Åtgärden orsakade timeout"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "Slut på minne"
@@ -2237,6 +2241,7 @@ msgid "Unable to read color palette data"
 msgstr "Det går inte att läsa färgpalettdata"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr "Det gick inte att starta mDNS-frågan"
 
@@ -3215,7 +3220,7 @@ msgid "index is out of bounds"
 msgstr "index är utanför gränserna"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "index utanför intervallet"
@@ -3470,10 +3475,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + tyst läge stöds inte av kringutrustning"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr "mDNS har redan initierats"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr "mDNS fungerar bara med inbyggt WiFi"
 
diff --git a/locale/tr.po b/locale/tr.po
index 1d8eacdae0..09705c507e 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -118,7 +118,7 @@ msgstr "%q hata: %d"
 msgid "%q in use"
 msgstr "%q kullanımda"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q indeksi aralık dışında"
 
@@ -183,7 +183,7 @@ msgstr "%q bir string olmalıdır"
 msgid "%q must be an int"
 msgstr "%q bir tam sayı olmalıdır"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q, %q türünde olmalıdır"
 
@@ -1680,6 +1680,10 @@ msgstr ""
 msgid "Operation timed out"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr ""
@@ -2212,6 +2216,7 @@ msgid "Unable to read color palette data"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr ""
 
@@ -3173,7 +3178,7 @@ msgid "index is out of bounds"
 msgstr ""
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr ""
@@ -3425,10 +3430,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr ""
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 408b785287..ac9d28d5fc 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -117,7 +117,7 @@ msgstr "%q Shībài: %d"
 msgid "%q in use"
 msgstr "%q zhèngzài bèi shǐyòng"
 
-#: py/obj.c py/objstr.c py/objstrunicode.c
+#: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
 msgstr "%q suǒyǐn chāochū fànwéi"
 
@@ -183,7 +183,7 @@ msgstr "%q bìxū shì yí gè zì fú chuàn"
 msgid "%q must be an int"
 msgstr "%q bìxū shì zhěng xíng"
 
-#: py/argcheck.c
+#: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr "%q bì xū shì %q lèi xíng"
 
@@ -1698,6 +1698,10 @@ msgstr "bù zhī chí cāo zuò huò gōng néng"
 msgid "Operation timed out"
 msgstr "cāo zuò yǐ fēn shí"
 
+#: ports/raspberrypi/common-hal/mdns/Server.c
+msgid "Out of MDNS service slots"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
 msgstr "nèi cún bù zú"
@@ -2243,6 +2247,7 @@ msgid "Unable to read color palette data"
 msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
 msgstr "wú fǎ qǐ dòng mDNS chá xún"
 
@@ -3222,7 +3227,7 @@ msgid "index is out of bounds"
 msgstr "suǒyǐn chāochū fànwéi"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
-#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c
+#: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
 msgid "index out of range"
 msgstr "suǒyǐn chāochū fànwéi"
@@ -3475,10 +3480,12 @@ msgid "loopback + silent mode not supported by peripheral"
 msgstr "Wài shè bù zhī chí huán huí + jìng yīn mó shì"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
 msgstr "mDNS yǐ chū shǐ huà"
 
 #: ports/espressif/common-hal/mdns/Server.c
+#: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
 msgstr "mDNS jǐn shì yòng yú nèi zhì wú xiàn wǎng luò"
 

From 8e83f36c36a799d6e3e0cd035c3c803eeb504273 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 29 Nov 2022 13:04:50 -0600
Subject: [PATCH 1449/2403] SAM E54 Xplained devkit hardfaults at start with
 -O2

I don't know why, but other samd5x are using -Os too, see the block above.

Closes: #7277
---
 ports/atmel-samd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 1474ad4c39..68beeaf129 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -79,7 +79,7 @@ endif
 
 ifeq ($(CHIP_FAMILY), same54)
 PERIPHERALS_CHIP_FAMILY=sam_d5x_e5x
-OPTIMIZATION_FLAGS ?= -O2
+OPTIMIZATION_FLAGS ?= -Os
 # TinyUSB defines
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAME5X -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_CDC_RX_BUFSIZE=256 -DCFG_TUD_MIDI_TX_BUFSIZE=128 -DCFG_TUD_CDC_TX_BUFSIZE=256 -DCFG_TUD_MSC_BUFSIZE=1024
 endif

From 4af95f1cb16fc484a4cb1360dd5f3e6e9c2d888d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 29 Nov 2022 13:45:18 -0600
Subject: [PATCH 1450/2403] atmel-samd: Ensure sdioio.SDCard pins are released

---
 ports/atmel-samd/common-hal/sdioio/SDCard.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/common-hal/sdioio/SDCard.c b/ports/atmel-samd/common-hal/sdioio/SDCard.c
index 7ce8a1e1b1..e641db75ac 100644
--- a/ports/atmel-samd/common-hal/sdioio/SDCard.c
+++ b/ports/atmel-samd/common-hal/sdioio/SDCard.c
@@ -114,8 +114,6 @@ CLK PA21 PCC_D? (D32)  BROWN
         gpio_set_pin_pull_mode(functions[i]->pin,
             (i == 1 || i == 5) ? GPIO_PULL_OFF : GPIO_PULL_UP);
         gpio_set_pin_function(functions[i]->pin, GPIO_PIN_FUNCTION_SDIO);
-
-        common_hal_never_reset_pin(functions[i]->obj);
     }
 
     self->num_data = num_data;
@@ -145,6 +143,12 @@ CLK PA21 PCC_D? (D32)  BROWN
     }
 
     if (result != SD_MMC_OK) {
+        for (size_t i = 0; i < MP_ARRAY_SIZE(functions); i++) {
+            if (!functions[i]->obj) {
+                break;
+            }
+            reset_pin_number(functions[i]->obj->number);
+        }
         mp_raise_OSError_msg_varg(translate("%q failure: %d"), MP_QSTR_sd_mmc_check, (int)result);
     }
     // sd_mmc_get_capacity() is in KiB, but our "capacity" is in 512-byte blocks

From a8c70aa7bd23aab91e3624d1b52b24bd6ed7bd1e Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 29 Nov 2022 17:20:38 -0800
Subject: [PATCH 1451/2403] Fix S3 deep sleep

Adding `-u ld_include_highint_hdl` forces the linker to keep the
high priority interrupt handler that calls the ipc_isr handler.

The deep sleep is waiting for this interrupt to be handled on core
0 before sleeping from core 1.

Fixes #6090
---
 ports/espressif/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index d515d27b40..4e72e5c45a 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -422,7 +422,7 @@ esp-idf-stamp: $(BUILD)/esp-idf/config/sdkconfig.h
 
 $(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)/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
+	$(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 -u ld_include_highint_hdl -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 $@"

From 3c5fb360a44e607815d768ca7c892edd7d71688f Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Wed, 30 Nov 2022 15:27:14 +0100
Subject: [PATCH 1452/2403] Removed uncrustify.cfg

---
 uncrustify.cfg | 3128 ------------------------------------------------
 1 file changed, 3128 deletions(-)
 delete mode 100644 uncrustify.cfg

diff --git a/uncrustify.cfg b/uncrustify.cfg
deleted file mode 100644
index 63e22e9391..0000000000
--- a/uncrustify.cfg
+++ /dev/null
@@ -1,3128 +0,0 @@
-# Uncrustify-0.72.0_f
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-# The comment should be used alone in one line.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[]  (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[]  { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x)  { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... }  ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force
-
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and '(' as found in 'new List(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and '()' as found in 'new List();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and a word as in 'List m;' or
-# 'template  static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
-
-# (C++11) Permit removal of the space between '>>' in 'foo >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ;  )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol' or '@interface MyClass : NSObject'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName):BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl)  {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl)  {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space after the opening of a C++ comment,
-# i.e. '// A' vs. '//A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
-
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space is added with sp_cmt_cpp_start will be added after Qt
-# translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
-
-# If true, a  is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-indent_switch_case              = 0        # unsigned number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-indent_case_brace               = 0        # number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statments inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl)  {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl)  {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between function scope and name, as in
-# 'void A ::  f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option incase of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++;  return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; }  b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo  :  public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b)  i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...)  stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr)  stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition.
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n  void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#

From 286efc18fc4f207b1a1a4539ee5030a45952c050 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 30 Nov 2022 09:29:05 -0600
Subject: [PATCH 1453/2403] handle domain with trailing dot

Closes: #7032
---
 ports/espressif/common-hal/socketpool/SocketPool.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/espressif/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c
index 1d1aafa638..780e90c42c 100644
--- a/ports/espressif/common-hal/socketpool/SocketPool.c
+++ b/ports/espressif/common-hal/socketpool/SocketPool.c
@@ -45,6 +45,16 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel
 mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
     const char *host) {
 
+    // As of 2022, the version of lwip in esp-idf does not handle the
+    // trailing-dot syntax of domain names, so emulate it.
+    // Remove this once https://github.com/espressif/esp-idf/issues/10013 has
+    // been implemented
+    size_t strlen_host = strlen(host);
+    if (strlen_host && host[strlen_host - 1] == '.') {
+        mp_obj_t nodot = mp_obj_new_str(host, strlen_host - 1);
+        host = mp_obj_str_get_str(nodot);
+    }
+
     const struct addrinfo hints = {
         .ai_family = AF_INET,
         .ai_socktype = SOCK_STREAM,

From 7c336c51a8c920c1d241bd93a70eb081be378f0b Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 29 Nov 2022 15:40:51 +0000
Subject: [PATCH 1454/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (996 of 996 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 20e22166cd..57e2b2e594 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: 2022-11-11 18:49+0000\n"
+"PO-Revision-Date: 2022-11-30 16:14+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1693,7 +1693,7 @@ msgstr "Åtgärden orsakade timeout"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "Slut på MDNS-serviceplatser"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"

From 1711cce52bd03753a306c58f5c323abd30de14ce Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Tue, 29 Nov 2022 22:54:15 +0000
Subject: [PATCH 1455/2403] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index ac9d28d5fc..88d106bfca 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: 2022-11-19 18:48+0000\n"
+"PO-Revision-Date: 2022-11-30 16:14+0000\n"
 "Last-Translator: hexthat \n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -1700,7 +1700,7 @@ msgstr "cāo zuò yǐ fēn shí"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "chāo chū MDNS fú wù chā cáo"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"

From eb1913576e208bfd94ede25298c9caab1709a018 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 30 Nov 2022 17:14:26 +0100
Subject: [PATCH 1456/2403] 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             | 14 +++++++++-----
 locale/cs.po             | 14 +++++++++-----
 locale/de_DE.po          | 17 ++++++++++++-----
 locale/el.po             | 14 +++++++++-----
 locale/en_GB.po          | 17 ++++++++++++-----
 locale/es.po             | 14 +++++++++-----
 locale/fil.po            | 14 +++++++++-----
 locale/fr.po             | 17 ++++++++++++-----
 locale/hi.po             | 14 +++++++++-----
 locale/it_IT.po          | 14 +++++++++-----
 locale/ja.po             | 14 +++++++++-----
 locale/ko.po             | 14 +++++++++-----
 locale/nl.po             | 14 +++++++++-----
 locale/pl.po             | 14 +++++++++-----
 locale/pt_BR.po          | 17 ++++++++++++-----
 locale/ru.po             | 14 +++++++++-----
 locale/sv.po             | 17 ++++++++++++-----
 locale/tr.po             | 14 +++++++++-----
 locale/zh_Latn_pinyin.po | 17 ++++++++++++-----
 19 files changed, 189 insertions(+), 95 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 5ac957eb07..0bf1cf9323 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -181,7 +181,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr "%q harus bertipe %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -907,6 +907,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Mode kendara tidak digunakan saat arah input."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB hanya beroperasi pada 16 byte di satu waktu"
@@ -2040,6 +2044,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3372,10 +3380,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 55a1787aa7..952c7dca61 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -182,7 +182,7 @@ msgstr "%q musí být int"
 msgid "%q must be of type %q"
 msgstr "%q musí být typu %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q musí být typu %q nebo None"
 
@@ -905,6 +905,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB operuje najednou pouze 16 bajtů"
@@ -2029,6 +2033,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3359,10 +3367,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 127a1c4ac7..79ab102d09 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -184,7 +184,7 @@ msgstr "%q muss vom Typ Integer sein"
 msgid "%q must be of type %q"
 msgstr "%q muss vom Type %q sein"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q muss vom Type %q oder None sein"
 
@@ -913,6 +913,10 @@ msgstr "Fertig"
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode wird nicht verwendet, wenn die Richtung input ist."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "Die EZB arbeitet jeweils nur mit 16 Bytes"
@@ -2058,6 +2062,10 @@ msgstr ""
 "Das Modul `microcontroller` wurde zum Booten in den abgesicherten Modus "
 "verwendet. Drücke Reset, um den abgesicherten Modus zu verlassen."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Beim Starten wurde die zentrale Taste gedrückt.\n"
@@ -3430,10 +3438,6 @@ msgstr "ungültige Syntax für integer mit Basis %d"
 msgid "invalid syntax for number"
 msgstr "ungültige Syntax für number"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "ungültiger Traceback"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 muss eine Klasse sein"
@@ -4442,6 +4446,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "invalid traceback"
+#~ msgstr "ungültiger Traceback"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q Indizes müssen Integer sein, nicht %s"
 
diff --git a/locale/el.po b/locale/el.po
index 4a6b5c4250..98b2e191aa 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -187,7 +187,7 @@ msgstr "%q πρέπει να είναι int"
 msgid "%q must be of type %q"
 msgstr "%q πρέπει να είναι τύπου %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q πρέπει να είναι τύπου %q ή None"
 
@@ -919,6 +919,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2038,6 +2042,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3368,10 +3376,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 15d3644f52..d6c8f96d6e 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -185,7 +185,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -908,6 +908,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode not used when direction is input."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB only operates on 16 bytes at a time"
@@ -2039,6 +2043,10 @@ msgstr ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
 "exit safe mode."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3378,10 +3386,6 @@ msgstr "invalid syntax for integer with base %d"
 msgid "invalid syntax for number"
 msgstr "invalid syntax for number"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "invalid traceback"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 must be a class"
@@ -4377,6 +4381,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 "invalid traceback"
+#~ msgstr "invalid traceback"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indices must be integers, not %s"
 
diff --git a/locale/es.po b/locale/es.po
index bb1c36b9bf..4111331bba 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -187,7 +187,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -918,6 +918,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Modo Drive no se usa cuando la dirección es input."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB solo opera sobre 16 bytes a la vez"
@@ -2068,6 +2072,10 @@ msgstr ""
 "El módulo de `microcontroller` se usó para un arranque en modo seguro. "
 "Presione reset para salir del modo seguro."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3418,10 +3426,6 @@ msgstr "sintaxis inválida para entero con base %d"
 msgid "invalid syntax for number"
 msgstr "sintaxis inválida para número"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 debe ser una clase"
diff --git a/locale/fil.po b/locale/fil.po
index 2cf6e49da4..b9a0f3e0fb 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -176,7 +176,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -904,6 +904,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode ay hindi ginagamit kapag ang direksyon ay input."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2028,6 +2032,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3372,10 +3380,6 @@ msgstr "maling sintaks sa integer na may base %d"
 msgid "invalid syntax for number"
 msgstr "maling sintaks sa number"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 ay dapat na class"
diff --git a/locale/fr.po b/locale/fr.po
index 9f6bfba96b..b44afd090f 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -187,7 +187,7 @@ msgstr "%q doit être un entier"
 msgid "%q must be of type %q"
 msgstr "%q doit être du type %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q doit être du type %q ou None"
 
@@ -928,6 +928,10 @@ msgid "Drive mode not used when direction is input."
 msgstr ""
 "Le mode Drive n'est pas utilisé quand la direction est entrante ('input')."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "La BCE ne fonctionne que sur 16 octets à la fois"
@@ -2088,6 +2092,10 @@ msgstr ""
 "Le module `microcontroller` a été utilisé pour démarrer en mode sûr. Pressez "
 "reset pour quitter le mode sûr."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Le bouton central était pressé au démarrage.\n"
@@ -3460,10 +3468,6 @@ msgstr "syntaxe invalide pour un entier de base %d"
 msgid "invalid syntax for number"
 msgstr "syntaxe invalide pour un nombre"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "traceback invalide"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "l'argument 1 de issubclass() doit être une classe"
@@ -4470,6 +4474,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 "invalid traceback"
+#~ msgstr "traceback invalide"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "les indices %q doivent être des entiers, pas %s"
 
diff --git a/locale/hi.po b/locale/hi.po
index ec884b211e..3442078b84 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -175,7 +175,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -894,6 +894,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2011,6 +2015,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3341,10 +3349,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 60698f4d36..0096ffdb40 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -182,7 +182,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -909,6 +909,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2038,6 +2042,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3380,10 +3388,6 @@ msgstr "sintassi invalida per l'intero con base %d"
 msgid "invalid syntax for number"
 msgstr "sintassi invalida per il numero"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "il primo argomento di issubclass() deve essere una classe"
diff --git a/locale/ja.po b/locale/ja.po
index cc48e83b25..226f0d33a1 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -903,6 +903,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "方向がinputのときドライブモードは使われません"
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECBは一度に16バイトの演算のみを行います"
@@ -2024,6 +2028,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3360,10 +3368,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr "数字として不正な構文"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass()の第1引数はクラスでなければなりません"
diff --git a/locale/ko.po b/locale/ko.po
index e1609990db..9f192a7a50 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -176,7 +176,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -897,6 +897,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2014,6 +2018,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3345,10 +3353,6 @@ msgstr "구문(syntax)가 정수가 유효하지 않습니다"
 msgid "invalid syntax for number"
 msgstr "숫자에 대한 구문(syntax)가 유효하지 않습니다"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index e002370151..8fb7799231 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -178,7 +178,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -902,6 +902,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Drive modus niet gebruikt als de richting input is."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB werkt alleen met 16 bytes tegelijkertijd"
@@ -2035,6 +2039,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3375,10 +3383,6 @@ msgstr "ongeldige syntax voor integer met grondtal %d"
 msgid "invalid syntax for number"
 msgstr "ongeldige syntax voor nummer"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() argument 1 moet een klasse zijn"
diff --git a/locale/pl.po b/locale/pl.po
index d025272b69..7d7085a2c0 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%q must be of type %q"
 msgstr ""
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr ""
 
@@ -903,6 +903,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr "Tryb sterowania nieużywany w trybie wejścia."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB działa tylko na 16 bajtach naraz"
@@ -2022,6 +2026,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3353,10 +3361,6 @@ msgstr "zła składnia dla liczby całkowitej w bazie %d"
 msgid "invalid syntax for number"
 msgstr "zła składnia dla liczby"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "argument 1 dla issubclass() musi być klasą"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e8a71e3d5b..979b7c632a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -184,7 +184,7 @@ msgstr "%q deve ser um inteiro"
 msgid "%q must be of type %q"
 msgstr "%q deve ser do tipo %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q deve ser do tipo %q ou nenhum"
 
@@ -921,6 +921,10 @@ msgstr "Feito"
 msgid "Drive mode not used when direction is input."
 msgstr "O modo do controlador não é usado quando a direção for inserida."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "O BCE opera apenas com 16 bytes por vez"
@@ -2072,6 +2076,10 @@ msgstr ""
 "O módulo `microcontrolador` foi utilizado para iniciar em modo seguro. "
 "Pressione reset para encerrar do modo de segurança."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "O botão central foi pressionado na inicialização.\n"
@@ -3436,10 +3444,6 @@ msgstr "sintaxe inválida para o número inteiro com base %d"
 msgid "invalid syntax for number"
 msgstr "sintaxe inválida para o número"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "rastreamento inválido"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 deve ser uma classe"
@@ -4445,6 +4449,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 "invalid traceback"
+#~ msgstr "rastreamento inválido"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "Os índices %q devem ser inteiros, e não %s"
 
diff --git a/locale/ru.po b/locale/ru.po
index 2bfe2cdece..82b2965ead 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -186,7 +186,7 @@ msgstr "%q должно быть int"
 msgid "%q must be of type %q"
 msgstr "%q должно быть типа %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q должно быть типа %q или None"
 
@@ -925,6 +925,10 @@ msgstr "Выполнено"
 msgid "Drive mode not used when direction is input."
 msgstr "Drive mode не используется, когда направление является входным."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB работает только с 16 байтами за раз"
@@ -2077,6 +2081,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3409,10 +3417,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 57e2b2e594..98f0624ca1 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -185,7 +185,7 @@ msgstr "%q måste vara en int"
 msgid "%q must be of type %q"
 msgstr "%q måste vara av typen %q"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q måste vara av typen %q eller None"
 
@@ -910,6 +910,10 @@ msgstr "Klar"
 msgid "Drive mode not used when direction is input."
 msgstr "Drivläge används inte när riktning är input."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB arbetar endast på 16 byte åt gången"
@@ -2050,6 +2054,10 @@ msgstr ""
 "Modulen `microcontroller` användes för att starta upp i felsäkert läge. "
 "Tryck på reset för att avsluta felsäkert läget."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Mittknappen trycktes in vid start.\n"
@@ -3403,10 +3411,6 @@ msgstr "ogiltig syntax för heltal med bas %d"
 msgid "invalid syntax for number"
 msgstr "ogiltig syntax för tal"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "Ogilitig källspårning"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() arg 1 måste vara en klass"
@@ -4406,6 +4410,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 "invalid traceback"
+#~ msgstr "Ogilitig källspårning"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "Indexet %q måste vara ett heltal, inte %s"
 
diff --git a/locale/tr.po b/locale/tr.po
index 09705c507e..858e0ba4b3 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -187,7 +187,7 @@ msgstr "%q bir tam sayı olmalıdır"
 msgid "%q must be of type %q"
 msgstr "%q, %q türünde olmalıdır"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q, %q ya da None türünde olmalıdır"
 
@@ -911,6 +911,10 @@ msgstr ""
 msgid "Drive mode not used when direction is input."
 msgstr ""
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
@@ -2031,6 +2035,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
@@ -3361,10 +3369,6 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr ""
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 88d106bfca..daa7721926 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -187,7 +187,7 @@ msgstr "%q bìxū shì zhěng xíng"
 msgid "%q must be of type %q"
 msgstr "%q bì xū shì %q lèi xíng"
 
-#: shared-bindings/digitalio/Pull.c
+#: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
 msgstr "%q lèi xíng bì xū wéi %q huò wú"
 
@@ -912,6 +912,10 @@ msgstr "zuò"
 msgid "Drive mode not used when direction is input."
 msgstr "Fāngxiàng shūrù shí qūdòng móshì méiyǒu shǐyòng."
 
+#: py/obj.c
+msgid "During handling of the above exception, another exception occurred:"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
 msgstr "ECB yí cì zhǐ shǐ yòng 16 gè zì jié"
@@ -2055,6 +2059,10 @@ msgstr ""
 "`wēi kòng zhì qì` mó kuài yòng yú qǐ dòng dào ān quán mó shì. àn chóng zhì "
 "tuì chū ān quán mó shì."
 
+#: py/obj.c
+msgid "The above exception was the direct cause of the following exception:"
+msgstr ""
+
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "qǐ dòng shí àn xià zhōng yāng àn niǔ.\n"
@@ -3410,10 +3418,6 @@ msgstr "jīshù wèi %d de zhěng shǔ de yǔfǎ wúxiào"
 msgid "invalid syntax for number"
 msgstr "wúxiào de hàomǎ yǔfǎ"
 
-#: py/objexcept.c
-msgid "invalid traceback"
-msgstr "wú xiào zhuī sù"
-
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr "issubclass() cānshù 1 bìxū shì yīgè lèi"
@@ -4413,6 +4417,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 "invalid traceback"
+#~ msgstr "wú xiào zhuī sù"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
 

From 44d5326d4cbc21d93649b7221ee7c8444e6e8f1b Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 30 Nov 2022 19:36:00 +0200
Subject: [PATCH 1457/2403] fix picow-ap

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index fcedcb2ce2..0459841b47 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -162,7 +162,7 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
     bindings_cyw43_wifi_enforce_pm();
 }
 
-void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode, uint8_t max_connections) {
+void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmodes, uint8_t max_connections) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("Wifi is not enabled"));
     }

From e489b73d88fa38e6d4ddff6d6537db120010aee1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 30 Nov 2022 12:04:47 -0600
Subject: [PATCH 1458/2403] update esp-idf to merge commit

---
 ports/espressif/esp-idf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index dbb2d88eb8..26716e006d 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit dbb2d88eb8a90a314d6f2e7b0af71925802c552e
+Subproject commit 26716e006d68e5a584ac29b85d9e2979563fc827

From 10d92873c38211db27aa58dd1114298994543f7d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 11:21:03 -0600
Subject: [PATCH 1459/2403] Don't generate QSTRs for wrong identifiers

MP_REGISTER_MODULE would use identifiers like
"MODULE_DEF_MP_QSTR___FUTURE__" which would in turn cause
a QSTR to be generated for it. This wasn't desirable, because the
qstr would never be used.

This clears out quite a bit of flash storage on the proxlight trinkey.
---
 py/genlast.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/genlast.py b/py/genlast.py
index ad44745d97..460271af81 100644
--- a/py/genlast.py
+++ b/py/genlast.py
@@ -12,7 +12,7 @@ import subprocess
 from makeqstrdefs import qstr_unescape, QSTRING_BLOCK_LIST
 
 re_line = re.compile(r"#[line]*\s(\d+)\s\"([^\"]+)\"", re.DOTALL)
-re_qstr = re.compile(r"MP_QSTR_[_a-zA-Z0-9]+", re.DOTALL)
+re_qstr = re.compile(r"\bMP_QSTR_[_a-zA-Z0-9]+", re.DOTALL)
 re_translate = re.compile(r"translate\(\"((?:(?=(\\?))\2.)*?)\"\)", re.DOTALL)
 
 

From 2315b62bff5ada6dfdfa6a9662266ef2451a9294 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 11:21:22 -0600
Subject: [PATCH 1460/2403] Remove unused static qstrs

These are turned into TRANSLATE() messages now, so the qstr version
would not be used.
---
 py/qstrdefs.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 02b87f4ec3..70753866bd 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -49,7 +49,6 @@ Q({:#x})
 Q({:#b})
 Q( )
 Q(\n)
-Q(maximum recursion depth exceeded)
 Q()
 Q()
 Q()
@@ -63,7 +62,3 @@ Q(utf-8)
 #if MICROPY_MODULE_FROZEN
 Q(.frozen)
 #endif
-
-#if MICROPY_ENABLE_PYSTACK
-Q(pystack exhausted)
-#endif

From 284ac21f512ed06137662833c1c30e2f7e4631cb Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:34:44 -0600
Subject: [PATCH 1461/2403] merge a message

---
 shared-bindings/busio/I2C.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 71ac0e3995..3dd645b256 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -345,7 +345,7 @@ STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *p
     const int32_t in_end = args[ARG_in_end].u_int;
     normalize_buffer_bounds(&in_start, in_end, &in_length);
     if (in_length == 0) {
-        mp_raise_ValueError_varg(translate("%q length must be >= 1"), MP_QSTR_out_buffer);
+        mp_raise_ValueError_varg(translate("%q length must be >= %d"), MP_QSTR_out_buffer, 1);
     }
 
     uint8_t status = common_hal_busio_i2c_write_read(self, args[ARG_address].u_int,

From 6ac2022093bc627b7bb61c336aa5f683406841ea Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:36:35 -0600
Subject: [PATCH 1462/2403] merge a message

---
 shared-bindings/usb_hid/Device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index 97196144be..cb88766b3e 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -155,7 +155,7 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
     }
 
     if (report_ids_array[0] == 0 && report_ids_count > 1) {
-        mp_raise_ValueError_varg(translate("%q with a report ID of 0 must be of length 1"), MP_QSTR_report_ids);
+        mp_raise_ValueError_varg(translate("%q length must be %d"), MP_QSTR_report_id_space_0, 1);
     }
 
     common_hal_usb_hid_device_construct(

From f652a898e78d0a6f0fe7963c86891771d09652df Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:37:32 -0600
Subject: [PATCH 1463/2403] merge two messages

---
 py/argcheck.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index c28c577088..9ec21d4898 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -239,7 +239,7 @@ mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_
 
 mp_obj_t mp_arg_validate_type_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);
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_str);
     }
     return obj;
 }
@@ -247,7 +247,7 @@ mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) {
 mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {
     mp_int_t an_int;
     if (!mp_obj_get_int_maybe(obj, &an_int)) {
-        mp_raise_TypeError_varg(translate("%q must be an int"), arg_name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_int);
     }
     return an_int;
 }

From 7df21c9ecfd2335b004825b999752853cf2fb3f0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:44:08 -0600
Subject: [PATCH 1464/2403] Combine a message

---
 py/runtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/runtime.c b/py/runtime.c
index e5b411b0d3..e3750b7448 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -310,7 +310,7 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
         }
         #else
         if (op == MP_UNARY_OP_INT) {
-            mp_raise_TypeError_varg(MP_ERROR_TEXT("can't convert %q to int"), mp_obj_get_type_qstr(arg));
+            mp_raise_TypeError_varg(MP_ERROR_TEXT("can't convert %q to %q"), mp_obj_get_type_qstr(arg), MP_QSTR_int);
         } else {
             mp_raise_TypeError_varg(MP_ERROR_TEXT("unsupported type for %q: '%q'"),
                 mp_unary_op_method_name[op], mp_obj_get_type_qstr(arg));

From ac999098ee4c9aee39f017bb50146bda419f3d96 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:49:01 -0600
Subject: [PATCH 1465/2403] merge a message

---
 shared-bindings/time/__init__.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 096c80d382..d02923f162 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -97,9 +97,7 @@ STATIC mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, s
     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"));
-    }
+    mp_arg_validate_length(len, 9, MP_QSTR_value);
     return namedtuple_make_new(type, len, 0, items);
 }
 

From 8658e7a9546647521a281ac22e473bf688763d0e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:55:45 -0600
Subject: [PATCH 1466/2403] re-use length validator

---
 shared-bindings/microcontroller/Pin.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index 42076aa90e..f1b9a90d45 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -156,9 +156,7 @@ void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1,
 // Validate every element in the list to be a free pin.
 void validate_list_is_free_pins(qstr what, const mcu_pin_obj_t **pins_out, mp_int_t max_pins, mp_obj_t seq, uint8_t *count_out) {
     mp_int_t len = MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq));
-    if (len > max_pins) {
-        mp_raise_ValueError_varg(translate("At most %d %q may be specified (not %d)"), max_pins, what, len);
-    }
+    mp_arg_validate_length_max(len, max_pins, what);
     *count_out = len;
     for (mp_int_t i = 0; i < len; i++) {
         pins_out[i] = validate_obj_is_free_pin(mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));

From 7c9cd567a0780448b3b29e9666e3cd9dbc50161f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:58:59 -0600
Subject: [PATCH 1467/2403] If uart is disabled, no pins will work; show
 NotImplementedError instead

---
 shared-bindings/busio/UART.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index eb1d1685a5..59e46cafc4 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -155,7 +155,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
         args[ARG_receiver_buffer_size].u_int, NULL, false);
     return (mp_obj_t)self;
     #else
-    mp_raise_ValueError(translate("Invalid pins"));
+    mp_raise_NotImplementedError(NULL);
     #endif  // CIRCUITPY_BUSIO_UART
 }
 

From beb053a94d742d8829e2b77ca8f9b06a7bf7a186 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 14:59:57 -0600
Subject: [PATCH 1468/2403] more thoroughly disable UART when

---
 ports/atmel-samd/common-hal/busio/UART.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c
index 3a9b628e0b..6027b6a5fa 100644
--- a/ports/atmel-samd/common-hal/busio/UART.c
+++ b/ports/atmel-samd/common-hal/busio/UART.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#if CIRCUITPY_BUSIO_UART
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/busio/UART.h"
@@ -485,3 +486,4 @@ bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
     usart_async_get_status(usart_desc_p, &async_status);
     return !(async_status.flags & USART_ASYNC_STATUS_BUSY);
 }
+#endif

From db01dfea2046d29c66acaf709dfaf14129a5fc87 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:03:22 -0600
Subject: [PATCH 1469/2403] use a standard length validator

---
 shared-module/usb_hid/__init__.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-module/usb_hid/__init__.c b/shared-module/usb_hid/__init__.c
index 99be84542f..11b87a78f1 100644
--- a/shared-module/usb_hid/__init__.c
+++ b/shared-module/usb_hid/__init__.c
@@ -220,9 +220,7 @@ bool common_hal_usb_hid_enable(const mp_obj_t devices, uint8_t boot_device) {
     }
 
     const mp_int_t num_devices = MP_OBJ_SMALL_INT_VALUE(mp_obj_len(devices));
-    if (num_devices > MAX_HID_DEVICES) {
-        mp_raise_ValueError_varg(translate("No more than %d HID devices allowed"), MAX_HID_DEVICES);
-    }
+    mp_arg_validate_length_max(num_devices, MAX_HID_DEVICES, MP_QSTR_devices);
 
     num_hid_devices = num_devices;
 

From 2b01c139f5df6f0c58c302143c7857aca968baf8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:05:33 -0600
Subject: [PATCH 1470/2403] use a standard validator function

---
 shared-bindings/adafruit_pixelbuf/PixelBuf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index 6203f672ad..2252b7d59e 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -129,9 +129,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
 }
 
 static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t *parsed) {
-    if (!mp_obj_is_str(byteorder_obj)) {
-        mp_raise_TypeError(translate("byteorder is not a string"));
-    }
+    mp_arg_validate_type_string(byteorder_obj, MP_QSTR_byteorder);
 
     size_t bo_len;
     const char *byteorder = mp_obj_str_get_data(byteorder_obj, &bo_len);

From d904d8e9a0f943ac10aa0360b36ecd01de8e953f Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Wed, 30 Nov 2022 20:26:41 +0100
Subject: [PATCH 1471/2403] Renamed the board folder to doit_esp32_devkit_v1

---
 .../boards/doit_esp32_devkit_v1/board.c       | 29 ++++++++++++
 .../doit_esp32_devkit_v1/mpconfigboard.h      | 45 ++++++++++++++++++
 .../doit_esp32_devkit_v1/mpconfigboard.mk     |  9 ++++
 .../boards/doit_esp32_devkit_v1/pins.c        | 46 +++++++++++++++++++
 .../boards/doit_esp32_devkit_v1/sdkconfig     | 20 ++++++++
 5 files changed, 149 insertions(+)
 create mode 100644 ports/espressif/boards/doit_esp32_devkit_v1/board.c
 create mode 100644 ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.h
 create mode 100644 ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/doit_esp32_devkit_v1/pins.c
 create mode 100644 ports/espressif/boards/doit_esp32_devkit_v1/sdkconfig

diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/board.c b/ports/espressif/boards/doit_esp32_devkit_v1/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.h b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.h
new file mode 100644
index 0000000000..2a0dcd0104
--- /dev/null
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME "ESP32 Devkit V1"
+#define MICROPY_HW_MCU_NAME "ESP32"
+
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO2)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
new file mode 100644
index 0000000000..7aa352e16e
--- /dev/null
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CIRCUITPY_CREATOR_ID =  0xB0D00000
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
new file mode 100644
index 0000000000..78c37897ac
--- /dev/null
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
@@ -0,0 +1,46 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    {MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15)},
+    {MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2)},
+    {MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5)},
+    {MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19)},
+    {MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_RX0), MP_ROM_PTR(&pin_GPIO1)},
+    {MP_ROM_QSTR(MP_QSTR_TX0), MP_ROM_PTR(&pin_GPIO3)},
+    {MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22)},
+    {MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13)},
+    {MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)},
+    {MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14)},
+    {MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27)},
+    {MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25)},
+    {MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33)},
+    {MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32)},
+    {MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35)},
+    {MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34)},
+
+    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2)},
+
+    {MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22)},
+
+    {MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19)},
+
+    {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16)},
+
+    {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/sdkconfig b/ports/espressif/boards/doit_esp32_devkit_v1/sdkconfig
new file mode 100644
index 0000000000..6c0168c829
--- /dev/null
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/sdkconfig
@@ -0,0 +1,20 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From f8070d2141500e7f21021297e773b2f6fff1f6ab Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 30 Nov 2022 21:51:50 +0200
Subject: [PATCH 1472/2403] Change comment, and logic on dhcpserver

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 5 ++++-
 shared/netutils/dhcpserver.c              | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 0459841b47..313363dd32 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -155,8 +155,11 @@ void common_hal_wifi_radio_start_station(wifi_radio_obj_t *self) {
 
 void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
 
-    // This is wrong This is fine.
     cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
+    // This is wrong, but without this call the state of ITF_STA is still
+    // reported as CYW43_LINK_JOIN (by wifi_link_status) and CYW43_LINK_UP
+    // (by tcpip_link_status). However since ap disconnection isn't working
+    // either, this is not an issue.
     cyw43_wifi_leave(&cyw43_state, CYW43_ITF_AP);
 
     bindings_cyw43_wifi_enforce_pm();
diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index a61501c93c..d396a2ba56 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -265,9 +265,9 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
             d->lease[yi].expiry = (mp_hal_ticks_ms() + DEFAULT_LEASE_TIME_S * 1000) >> 16;
             dhcp_msg.yiaddr[3] = DHCPS_BASE_IP + yi;
             opt_write_u8(&opt, DHCP_OPT_MSG_TYPE, DHCPACK);
-            printf("DHCPS: client connected: MAC=%02x:%02x:%02x:%02x:%02x:%02x IP=%u.%u.%u.%u\n",
+            LWIP_DEBUGF(DHCP_DEBUG, ("DHCPS: client connected: MAC=%02x:%02x:%02x:%02x:%02x:%02x IP=%u.%u.%u.%u\n",
                 dhcp_msg.chaddr[0], dhcp_msg.chaddr[1], dhcp_msg.chaddr[2], dhcp_msg.chaddr[3], dhcp_msg.chaddr[4], dhcp_msg.chaddr[5],
-                dhcp_msg.yiaddr[0], dhcp_msg.yiaddr[1], dhcp_msg.yiaddr[2], dhcp_msg.yiaddr[3]);
+                dhcp_msg.yiaddr[0], dhcp_msg.yiaddr[1], dhcp_msg.yiaddr[2], dhcp_msg.yiaddr[3]));
             break;
         }
 

From 2e9954e43d1b0197b57fae0a1455df0e4a26152b Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 30 Nov 2022 17:37:44 +0000
Subject: [PATCH 1473/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 98f0624ca1..fd715cfc13 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: 2022-11-30 16:14+0000\n"
+"PO-Revision-Date: 2022-11-30 20:18+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -913,6 +913,7 @@ msgstr "Drivläge används inte när riktning är input."
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
 msgstr ""
+"Under hanteringen av ovanstående undantag inträffade ett annat undantag:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -2056,7 +2057,7 @@ msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "Ovanstående undantag var den direkta orsaken till följande undantag:"
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"

From 0738d50834afc46f75a94c52910a0d0672b4124f Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 30 Nov 2022 22:24:21 +0200
Subject: [PATCH 1474/2403] debug_dhcp to follow general debug

---
 ports/raspberrypi/lwip_inc/lwipopts.h | 1 -
 shared/netutils/dhcpserver.h          | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 6d116e89b6..64b8cffff3 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -95,7 +95,6 @@
 #define TCPIP_DEBUG                 LWIP_DBG_OFF
 #define PPP_DEBUG                   LWIP_DBG_OFF
 #define SLIP_DEBUG                  LWIP_DBG_OFF
-#define DHCP_DEBUG                  LWIP_DBG_OFF
 #define MDNS_DEBUG                  LWIP_DBG_OFF
 
 #define LWIP_TIMEVAL_PRIVATE 0
diff --git a/shared/netutils/dhcpserver.h b/shared/netutils/dhcpserver.h
index 2349d2ea42..45ceaf9a87 100644
--- a/shared/netutils/dhcpserver.h
+++ b/shared/netutils/dhcpserver.h
@@ -31,6 +31,10 @@
 #define DHCPS_BASE_IP (16)
 #define DHCPS_MAX_IP (8)
 
+#ifndef DHCP_DEBUG
+#define DHCP_DEBUG    LWIP_DBG_ON
+#endif
+
 typedef struct _dhcp_server_lease_t {
     uint8_t mac[6];
     uint16_t expiry;

From 0e19fbb60f41c3586725320aa93771ac6c4cac9c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:24:49 -0600
Subject: [PATCH 1475/2403] Use a function to raise ZeroDivisionError,
 consistent string

---
 locale/circuitpython.pot | 58 +++-------------------------------------
 py/modmath.c             |  2 +-
 py/objcomplex.c          |  2 +-
 py/objfloat.c            |  2 +-
 py/objint_longlong.c     |  2 +-
 py/objint_mpz.c          |  2 +-
 py/runtime.c             |  6 ++++-
 py/runtime.h             |  1 +
 8 files changed, 15 insertions(+), 60 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 3958d2869a..9928ca03e0 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -118,7 +118,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -130,14 +130,10 @@ msgstr ""
 msgid "%q length must be <= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/busio/I2C.c
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -163,14 +159,6 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
 #: py/argcheck.c py/obj.c
 msgid "%q must be of type %q"
 msgstr ""
@@ -201,10 +189,6 @@ msgstr ""
 msgid "%q pin invalid"
 msgstr ""
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr ""
-
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
 msgstr ""
@@ -511,10 +495,6 @@ msgstr ""
 msgid "Array values should be single bytes."
 msgstr ""
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr ""
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1260,10 +1240,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1501,11 +1477,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2545,10 +2516,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2590,14 +2557,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2781,10 +2744,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2887,12 +2846,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c shared-bindings/math/__init__.c
 msgid "division by zero"
 msgstr ""
 
@@ -4043,10 +3997,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
diff --git a/py/modmath.c b/py/modmath.c
index 167d46d02b..bf27e68eaf 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -254,7 +254,7 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
         if (base <= (mp_float_t)0.0) {
             math_error();
         } else if (base == (mp_float_t)1.0) {
-            mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
+            mp_raise_ZeroDivisionError();
         }
         return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base));
     }
diff --git a/py/objcomplex.c b/py/objcomplex.c
index f205249bb4..7f4fd621e6 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -217,7 +217,7 @@ mp_obj_t mp_obj_complex_binary_op(mp_binary_op_t op, mp_float_t lhs_real, mp_flo
         case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
             if (rhs_imag == 0) {
                 if (rhs_real == 0) {
-                    mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("complex division by zero"));
+                    mp_raise_ZeroDivisionError();
                 }
                 lhs_real /= rhs_real;
                 lhs_imag /= rhs_real;
diff --git a/py/objfloat.c b/py/objfloat.c
index f8261df933..7aebcfdeb2 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -266,7 +266,7 @@ mp_obj_t mp_obj_float_binary_op(mp_binary_op_t op, mp_float_t lhs_val, mp_obj_t
         case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
             if (rhs_val == 0) {
             zero_division_error:
-                mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("divide by zero"));
+                mp_raise_ZeroDivisionError();
             }
             // Python specs require that x == (x//y)*y + (x%y) so we must
             // call divmod to compute the correct floor division, which
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 67ec844f47..d318eab38e 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -236,7 +236,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
     }
 
 zero_division:
-    mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
+    mp_raise_ZeroDivisionError();
 }
 
 mp_obj_t mp_obj_new_int(mp_int_t value) {
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index fd74803fe7..e147e5f08a 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -244,7 +244,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
             case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE: {
                 if (mpz_is_zero(zrhs)) {
                 zero_division_error:
-                    mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("divide by zero"));
+                    mp_raise_ZeroDivisionError();
                 }
                 mpz_t rem;
                 mpz_init_zero(&rem);
diff --git a/py/runtime.c b/py/runtime.c
index e3750b7448..6be5c22335 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -631,7 +631,7 @@ unsupported_op:
     #endif
 
 zero_division:
-    mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
+    mp_raise_ZeroDivisionError();
 }
 
 mp_obj_t mp_call_function_0(mp_obj_t fun) {
@@ -1765,3 +1765,7 @@ NORETURN void mp_raise_recursion_depth(void) {
     mp_raise_RuntimeError(MP_ERROR_TEXT("maximum recursion depth exceeded"));
 }
 #endif
+
+NORETURN void mp_raise_ZeroDivisionError(void) {
+    mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
+}
diff --git a/py/runtime.h b/py/runtime.h
index 923071f7ca..951165e279 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -226,6 +226,7 @@ NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg);
 NORETURN void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...);
 NORETURN void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...);
 NORETURN void mp_raise_recursion_depth(void);
+NORETURN void mp_raise_ZeroDivisionError(void);
 #endif
 
 #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG

From f67bca94c4d190e95bd376c1ce883cf17f2437b5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:26:46 -0600
Subject: [PATCH 1476/2403] On python3 log(0) raises math domain error, not
 zerodivisionerror

---
 shared-bindings/math/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c
index 58405564db..42a32749da 100644
--- a/shared-bindings/math/__init__.c
+++ b/shared-bindings/math/__init__.c
@@ -371,7 +371,7 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
             #pragma GCC diagnostic ignored "-Wfloat-equal"
         } else if (base == (mp_float_t)1.0) {
             #pragma GCC diagnostic pop
-            mp_raise_msg(&mp_type_ZeroDivisionError, translate("division by zero"));
+            math_error();
         }
         return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base));
     }

From 5fb191b51c84164788605a7657356eda18ec6baa Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:28:33 -0600
Subject: [PATCH 1477/2403] Use a standard validator

---
 py/parsenum.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index adf2a4d84d..24d46705a7 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -55,9 +55,9 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
     mp_obj_t ret_val;
 
     // check radix base
-    if ((base != 0 && base < 2) || base > 36) {
+    if (base != 0) {
         // this won't be reached if lex!=NULL
-        mp_raise_ValueError(MP_ERROR_TEXT("int() arg 2 must be >= 2 and <= 36"));
+        mp_arg_validate_int_range(base, 2, 36, MP_QSTR_base);
     }
 
     // skip leading space

From d61fde349d42d54d10ccb542534ff002bf201abf Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:30:43 -0600
Subject: [PATCH 1478/2403] re-use an error message

---
 py/objint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objint.c b/py/objint.c
index b44a2e3b4a..6dc675823f 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -396,7 +396,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
 
 // This is called only with strings whose value doesn't fit in SMALL_INT
 mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {
-    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("long int not supported in this build"));
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("small int overflow"));
     return mp_const_none;
 }
 

From d39d146352186b61279a0795ca270fcde56a6877 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:36:23 -0600
Subject: [PATCH 1479/2403] Merge some messages

---
 locale/circuitpython.pot          | 26 +++++---------------------
 py/objrange.c                     |  2 +-
 py/objslice.c                     |  2 +-
 shared-bindings/random/__init__.c |  2 +-
 4 files changed, 8 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 locale/circuitpython.pot

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
old mode 100755
new mode 100644
index 9928ca03e0..e85b9f5d72
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -189,6 +189,10 @@ msgstr ""
 msgid "%q pin invalid"
 msgstr ""
 
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
+
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
 msgstr ""
@@ -2846,7 +2850,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/runtime.c shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3218,10 +3222,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3359,10 +3359,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3897,10 +3893,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -3949,10 +3941,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4278,10 +4266,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
diff --git a/py/objrange.c b/py/objrange.c
index b0c74815dc..78a5fcd0f8 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -110,7 +110,7 @@ STATIC mp_obj_t range_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         if (n_args == 3) {
             o->step = mp_obj_get_int(args[2]);
             if (o->step == 0) {
-                mp_raise_ValueError(MP_ERROR_TEXT("zero step"));
+                mp_raise_ValueError_varg(MP_ERROR_TEXT("%q step cannot be zero"), MP_QSTR_range);
             }
         }
     }
diff --git a/py/objslice.c b/py/objslice.c
index 3172f798c0..395af727e8 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -157,7 +157,7 @@ void mp_obj_slice_indices(mp_obj_t self_in, mp_int_t length, mp_bound_slice_t *r
     } else {
         step = mp_obj_get_int(self->step);
         if (step == 0) {
-            mp_raise_ValueError(MP_ERROR_TEXT("slice step cannot be zero"));
+            mp_raise_ValueError_varg(MP_ERROR_TEXT("%q step cannot be zero"), MP_QSTR_slice);
         }
     }
 
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index 29c6a0e74b..fcf432931e 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -108,7 +108,7 @@ STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) {
             } else if (step < 0) {
                 n = (stop - start + step + 1) / step;
             } else {
-                mp_raise_ValueError(translate("step must be non-zero"));
+                mp_raise_ValueError_varg(MP_ERROR_TEXT("%q step cannot be zero"), MP_QSTR_randrange);
             }
             if (n <= 0) {
                 mp_raise_ValueError(translate("invalid step"));

From a94663b3c9359e076fd5a49a4f2097996d9351f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:37:57 -0600
Subject: [PATCH 1480/2403] use a standard error message

---
 py/objstrunicode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 0f26da62cf..863bbd42d7 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -159,7 +159,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     if (mp_obj_is_small_int(index)) {
         i = MP_OBJ_SMALL_INT_VALUE(index);
     } else if (!mp_obj_get_int_maybe(index, &i)) {
-        mp_raise_TypeError_varg(MP_ERROR_TEXT("string indices must be integers, not %q"), mp_obj_get_type_qstr(index));
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), MP_QSTR_index, MP_QSTR_int);
     }
     const byte *s, *top = self_data + self_len;
     if (i < 0) {

From 4158ddfc17c825017d4e989d2cdf027f9563e3d6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:40:59 -0600
Subject: [PATCH 1481/2403] compile out terse mismatch message when not used

---
 py/argcheck.c | 2 ++
 py/runtime.h  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/py/argcheck.c b/py/argcheck.c
index 9ec21d4898..01c712ac36 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -145,9 +145,11 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
     mp_arg_parse_all(n_pos, args, &kw_args, n_allowed, allowed, out_vals);
 }
 
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
 NORETURN void mp_arg_error_terse_mismatch(void) {
     mp_raise_TypeError(MP_ERROR_TEXT("argument num/types mismatch"));
 }
+#endif
 
 #if MICROPY_CPYTHON_COMPAT
 NORETURN void mp_arg_error_unimpl_kw(void) {
diff --git a/py/runtime.h b/py/runtime.h
index 951165e279..a5f66b1507 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -91,7 +91,9 @@ static inline void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_mi
 }
 void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
 void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
 NORETURN void mp_arg_error_terse_mismatch(void);
+#endif
 NORETURN void mp_arg_error_unimpl_kw(void);
 
 NORETURN void mp_arg_error_invalid(qstr arg_name);

From c46e219795db804c04d80ec474b555510ab300b3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 15:46:48 -0600
Subject: [PATCH 1482/2403] Having an input-only pin is rare, save a string on
 other ports

---
 ports/espressif/mpconfigport.h                             | 2 ++
 py/circuitpy_mpconfig.h                                    | 4 ++++
 shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c | 4 ++++
 shared-bindings/digitalio/DigitalInOut.c                   | 2 ++
 shared-bindings/digitalio/DigitalInOut.h                   | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index 632a7a13cd..1b154b4b99 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -99,4 +99,6 @@
 #define CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS (1)
 #endif
 
+#define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (1)
+
 #endif  // MICROPY_INCLUDED_ESPRESSIF_MPCONFIGPORT_H
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index d6d8419c8f..dc528d0787 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -582,6 +582,10 @@ void supervisor_run_background_tasks_if_tick(void);
 #define MICROPY_WRAP_MP_EXECUTE_BYTECODE PLACE_IN_ITCM
 #endif
 
+#ifndef CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
+#define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (0)
+#endif
+
 #ifndef CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (0)
 #endif
diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index afb11856e2..6626d27f77 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -105,9 +105,13 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
     if (args[ARG_chip_select].u_obj != MP_OBJ_NULL) {
         digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(MP_OBJ_TO_PTR(args[ARG_chip_select].u_obj),
             true, DRIVE_MODE_PUSH_PULL);
+        #if CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
         if (result == DIGITALINOUT_INPUT_ONLY) {
             mp_raise_NotImplementedError(translate("Pin is input only"));
         }
+        #else
+        (void)result;
+        #endif
     }
 
     return (mp_obj_t)self;
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index eb3c1ec69d..e6fe592a65 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -53,8 +53,10 @@ STATIC void check_result(digitalinout_result_t result) {
             return;
         case DIGITALINOUT_PIN_BUSY:
             mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_Pin);
+        #if CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
         case DIGITALINOUT_INPUT_ONLY:
             mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_direction);
+        #endif
         #if CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
         case DIGITALINOUT_INVALID_PULL:
             mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_pull);
diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h
index 80c3970f0e..79a700c905 100644
--- a/shared-bindings/digitalio/DigitalInOut.h
+++ b/shared-bindings/digitalio/DigitalInOut.h
@@ -38,7 +38,9 @@ extern const mp_obj_type_t digitalio_digitalinout_type;
 typedef enum {
     DIGITALINOUT_OK,
     DIGITALINOUT_PIN_BUSY,
+    #if CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
     DIGITALINOUT_INPUT_ONLY,
+    #endif
     #if CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL
     DIGITALINOUT_INVALID_PULL,
     #endif

From 4671658c63bb39072d79d57c770321e03cc7fd63 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 16:32:34 -0600
Subject: [PATCH 1483/2403] Use ASCII apostrophe in french translation, it
 saves flash space

.. it makes mchar_t, the type of storage needed for all the code points
in all translation messages, be an 8-bit type instead of a 16-bit type
---
 locale/fr.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/locale/fr.po b/locale/fr.po
index 9f6bfba96b..905116cb71 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -684,7 +684,7 @@ msgstr "Les blocs CBC doivent être des multiples de 16 octets"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr "L’appareil CIRCUITPY ne peut pas être trouvé ou créé."
+msgstr "L'appareil CIRCUITPY ne peut pas être trouvé ou créé."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
@@ -842,11 +842,11 @@ msgstr "Fichier .mpy corrompu"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c
 msgid "Could not retrieve clock"
-msgstr "Impossible d’obtenir l’horloge"
+msgstr "Impossible d'obtenir l'horloge"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
-msgstr "Impossible de définir l’adresse"
+msgstr "Impossible de définir l'adresse"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
@@ -1006,7 +1006,7 @@ msgstr "Échec d'allocation du tampon %q"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
-msgstr "Impossible d’allouer la mémoire pour Wifi"
+msgstr "Impossible d'allouer la mémoire pour Wifi"
 
 #: ports/espressif/common-hal/wifi/ScannedNetworks.c
 msgid "Failed to allocate wifi scan memory"
@@ -1833,7 +1833,7 @@ msgstr "Ainsi que tout autres modules présents sur le système de fichiers\n"
 
 #: shared-module/vectorio/Polygon.c
 msgid "Polygon needs at least 3 points"
-msgstr "Polygon a besoin d’au moins 3 points"
+msgstr "Polygon a besoin d'au moins 3 points"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Prefix buffer must be on the heap"
@@ -2552,7 +2552,7 @@ msgstr "matrice/octets requis à la droite"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "attempt to get (arg)min/(arg)max of empty sequence"
-msgstr "tentative d’obtenir (arg)min/(arg)max d'une séquence vide"
+msgstr "tentative d'obtenir (arg)min/(arg)max d'une séquence vide"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "attempt to get argmin/argmax of an empty sequence"
@@ -2620,7 +2620,7 @@ msgstr "tampon est plus petit que la taille demandée"
 
 #: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
 msgid "buffer size must be a multiple of element size"
-msgstr "taille du tampon doit être un multiple de la taille de l’élément"
+msgstr "taille du tampon doit être un multiple de la taille de l'élément"
 
 #: shared-module/struct/__init__.c
 msgid "buffer size must match format"
@@ -3181,7 +3181,7 @@ msgstr "la fonction a reçu plusieurs valeurs pour l'argument '%q'"
 
 #: extmod/ulab/code/scipy/optimize/optimize.c
 msgid "function has the same sign at the ends of interval"
-msgstr "la fonction a le même signe aux extrémités de l’intervalle"
+msgstr "la fonction a le même signe aux extrémités de l'intervalle"
 
 #: extmod/ulab/code/ndarray.c
 msgid "function is defined for ndarrays only"
@@ -4186,11 +4186,11 @@ msgstr "le délai (timeout) doit être < 655.35 secondes"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "timeout waiting for v1 card"
-msgstr "Délai d’expiration dépassé en attendant une carte v1"
+msgstr "Délai d'expiration dépassé en attendant une carte v1"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "timeout waiting for v2 card"
-msgstr "Délai d’expiration dépassé en attendant une carte v2"
+msgstr "Délai d'expiration dépassé en attendant une carte v2"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
@@ -4390,7 +4390,7 @@ msgstr "width doit être plus que zero"
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
-msgstr "wifi n’est pas activé"
+msgstr "wifi n'est pas activé"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"

From 9c11bb2ed9b20c8b1709b994336264b724ebd92a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 17:04:58 -0600
Subject: [PATCH 1484/2403] Check that translations fit in expected character
 type

---
 py/maketranslationdata.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py
index c0ae85f4e0..19bbc443a3 100644
--- a/py/maketranslationdata.py
+++ b/py/maketranslationdata.py
@@ -146,7 +146,10 @@ def iter_substrings(s, minlen, maxlen):
             yield s[begin : begin + n]
 
 
-def compute_huffman_coding(translations, f):
+translation_requires_uint16 = {"cs", "el", "fr", "ja", "ko", "pl", "ru", "tr", "zh_Latn_pinyin"}
+
+
+def compute_huffman_coding(translation_name, translations, f):
     texts = [t[1] for t in translations]
     words = []
 
@@ -163,6 +166,12 @@ def compute_huffman_coding(translations, f):
 
     bits_per_codepoint = 16 if max_ord > 255 else 8
     values_type = "uint16_t" if max_ord > 255 else "uint8_t"
+    translation_name = translation_name.split("/")[-1].split(".")[0]
+    if max_ord > 255 and translation_name not in translation_requires_uint16:
+        raise ValueError(
+            f"Translation {translation_name} expected to fit in 8 bits but required 16 bits"
+        )
+
     while len(words) < max_words:
         # Until the dictionary is filled to capacity, use a heuristic to find
         # the best "word" (2- to 11-gram) to add to it.
@@ -522,5 +531,7 @@ if __name__ == "__main__":
     i18ns = parse_input_headers(args.infiles)
     i18ns = sorted(i18ns)
     translations = translate(args.translation, i18ns)
-    encoding_table = compute_huffman_coding(translations, args.compression_filename)
+    encoding_table = compute_huffman_coding(
+        args.translation, translations, args.compression_filename
+    )
     output_translation_data(encoding_table, translations, args.translation_filename)

From 6be0a425c751574074ff92637303c1236a8754ab Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 17:05:09 -0600
Subject: [PATCH 1485/2403] Don't run maketranslationdata twice

---
 py/py.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/py/py.mk b/py/py.mk
index 6827fbe786..0cbfd252f2 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -262,8 +262,15 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/
 	$(STEPECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py --output_type=data $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
 
-$(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/compression.generated.h: $(PY_SRC)/maketranslationdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h
+# Is generated as a side-effect of building compression.generated.h
+# Specifying both in a single rule actually causes the rule to be run twice!
+# This alternative makes it run just once.
+$(PY_BUILD)/translations-$(TRANSLATION).c: $(HEADER_BUILD)/compression.generated.h
+	@true
+
+$(HEADER_BUILD)/compression.generated.h: $(PY_SRC)/maketranslationdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h
 	$(STEPECHO) "GEN $@"
+	$(Q)mkdir -p $(PY_BUILD)
 	$(Q)$(PYTHON) $(PY_SRC)/maketranslationdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo --translation_filename $(PY_BUILD)/translations-$(TRANSLATION).c $(HEADER_BUILD)/qstrdefs.preprocessed.h
 
 PY_CORE_O += $(PY_BUILD)/translations-$(TRANSLATION).o

From 530e5a1df274cb352c147c8ce3e24b4bd4f2f475 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 17:08:53 -0600
Subject: [PATCH 1486/2403] Use standard validation function

---
 shared-bindings/busio/I2C.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 3dd645b256..e589dea08b 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -344,9 +344,7 @@ STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *p
     int32_t in_start = args[ARG_in_start].u_int;
     const int32_t in_end = args[ARG_in_end].u_int;
     normalize_buffer_bounds(&in_start, in_end, &in_length);
-    if (in_length == 0) {
-        mp_raise_ValueError_varg(translate("%q length must be >= %d"), MP_QSTR_out_buffer, 1);
-    }
+    mp_arg_validate_length_min(in_length, 1, MP_QSTR_out_buffer);
 
     uint8_t status = common_hal_busio_i2c_write_read(self, args[ARG_address].u_int,
         ((uint8_t *)out_bufinfo.buf) + out_start, out_length,((uint8_t *)in_bufinfo.buf) + in_start, in_length);

From 19a3893d40aa07232368f327584d7321446f66d0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 17:48:04 -0600
Subject: [PATCH 1487/2403] update translations again

---
 locale/circuitpython.pot | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index e85b9f5d72..1875781e9d 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -130,7 +130,7 @@ msgstr ""
 msgid "%q length must be <= %d"
 msgstr ""
 
-#: py/argcheck.c shared-bindings/busio/I2C.c
+#: py/argcheck.c
 msgid "%q length must be >= %d"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -3949,10 +3949,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""

From 0f6091cc73e8bc38855015518bb2643be64469e4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 18:54:53 -0600
Subject: [PATCH 1488/2403] update fil translation to fit in uint8_t

---
 locale/fil.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/fil.po b/locale/fil.po
index 2cf6e49da4..8d9a48bd69 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -282,7 +282,7 @@ msgstr "Inaasahan ng '%s' ang hangang r%d"
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects {r0, r1, ...}"
-msgstr "Inaasahan ng '%s' ay {r0, r1, …}"
+msgstr "Inaasahan ng '%s' ay {r0, r1, ...}"
 
 #: py/emitinlinextensa.c
 #, c-format
@@ -2789,7 +2789,7 @@ msgstr ""
 
 #: shared-bindings/displayio/Palette.c
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
-msgstr "ang color buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
+msgstr "ang color buffer ay dapat bytearray o array na type 'b' or 'B'"
 
 #: shared-bindings/displayio/Palette.c
 msgid "color must be between 0x000000 and 0xffffff"
@@ -3911,7 +3911,7 @@ msgstr "return annotation ay dapat na identifier"
 
 #: py/emitnative.c
 msgid "return expected '%q' but got '%q'"
-msgstr "return umasa ng '%q' pero ang nakuha ay ‘%q’"
+msgstr "return umasa ng '%q' pero ang nakuha ay '%q'"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -4621,7 +4621,7 @@ msgstr ""
 #~ "Mangyaring bisitahin ang learn.adafruit.com/category/circuitpython para "
 #~ "sa project guides.\n"
 #~ "\n"
-#~ "Para makita ang listahan ng modules, `help(“modules”)`.\n"
+#~ "Para makita ang listahan ng modules, `help(\"modules\")`.\n"
 
 #~ msgid "integer required"
 #~ msgstr "kailangan ng int"

From ed33f65fd9c59c2948bdfc5eace43f9046daeae0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 18:57:33 -0600
Subject: [PATCH 1489/2403] move define to proper place

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

diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index 1b154b4b99..c296be2024 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -33,6 +33,8 @@
 #define MICROPY_USE_INTERNAL_PRINTF         (0)
 #define MICROPY_PY_SYS_PLATFORM             "Espressif"
 
+#define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (1)
+
 #include "py/circuitpy_mpconfig.h"
 
 #if CIRCUITPY_BLEIO
@@ -99,6 +101,4 @@
 #define CIRCUITPY_PORT_NUM_SUPERVISOR_ALLOCATIONS (1)
 #endif
 
-#define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (1)
-
 #endif  // MICROPY_INCLUDED_ESPRESSIF_MPCONFIGPORT_H

From 9916b39b656f3a74d522e799a406c05d9172462a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 8 Nov 2022 19:44:33 -0600
Subject: [PATCH 1490/2403] update nl translation to fit in uint8_t

---
 locale/nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/nl.po b/locale/nl.po
index e002370151..acd7b53fd3 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -283,7 +283,7 @@ msgstr "'%s' verwacht op zijn meest r%d"
 #: py/emitinlinethumb.c
 #, c-format
 msgid "'%s' expects {r0, r1, ...}"
-msgstr "'%s' verwacht {r0, r1, …}"
+msgstr "'%s' verwacht {r0, r1, ...}"
 
 #: py/emitinlinextensa.c
 #, c-format

From d16c9515b7d980ddca02835024762e4d604d5747 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 9 Nov 2022 06:58:09 -0600
Subject: [PATCH 1491/2403] Compact the characters of certain translations, so
 they fit in uint8_t

This saves a few hundred bytes on the affected translations, such
as `el` which shrunk from 186152 to 185588 bytes (564 bytes saved).
---
 py/maketranslationdata.py               | 80 ++++++++++++++++++++++---
 supervisor/shared/translate/translate.c |  3 +
 2 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py
index 19bbc443a3..98c3d77dbb 100644
--- a/py/maketranslationdata.py
+++ b/py/maketranslationdata.py
@@ -10,6 +10,7 @@ supervisor/shared/translate/translate.h
 from __future__ import print_function
 
 import bisect
+from dataclasses import dataclass
 import re
 import sys
 
@@ -146,7 +147,40 @@ def iter_substrings(s, minlen, maxlen):
             yield s[begin : begin + n]
 
 
-translation_requires_uint16 = {"cs", "el", "fr", "ja", "ko", "pl", "ru", "tr", "zh_Latn_pinyin"}
+translation_requires_uint16 = {"cs", "fr", "ja", "ko", "pl", "tr", "zh_Latn_pinyin"}
+
+
+def compute_unicode_offset(texts):
+    all_ch = set(" ".join(texts))
+    ch_160 = sorted(c for c in all_ch if 160 <= ord(c) < 255)
+    ch_256 = sorted(c for c in all_ch if 255 < ord(c))
+    if not ch_256:
+        return 0, 0
+    min_256 = ord(min(ch_256))
+    span = ord(max(ch_256)) - ord(min(ch_256)) + 1
+
+    if ch_160:
+        max_160 = ord(max(ch_160)) + 1
+    else:
+        max_160 = max(160, 255 - span)
+
+    if max_160 + span > 256:
+        return 0, 0
+
+    offstart = max_160
+    offset = min_256 - max_160
+    return offstart, offset
+
+
+@dataclass
+class EncodingTable:
+    values: object
+    lengths: object
+    words: object
+    canonical: object
+    extractor: object
+    apply_offset: object
+    remove_offset: object
 
 
 def compute_huffman_coding(translation_name, translations, f):
@@ -156,8 +190,26 @@ def compute_huffman_coding(translation_name, translations, f):
     start_unused = 0x80
     end_unused = 0xFF
     max_ord = 0
+    offstart, offset = compute_unicode_offset(texts)
+
+    def apply_offset(c):
+        oc = ord(c)
+        if oc >= offstart:
+            oc += offset
+        return chr(oc)
+
+    def remove_offset(c):
+        oc = ord(c)
+        if oc >= offstart:
+            oc = oc - offset
+        try:
+            return chr(oc)
+        except Exception as e:
+            raise ValueError(f"remove_offset {offstart=} {oc=}") from e
+
     for text in texts:
         for c in text:
+            c = remove_offset(c)
             ord_c = ord(c)
             max_ord = max(ord_c, max_ord)
             if 0x80 <= ord_c < 0xFF:
@@ -276,15 +328,17 @@ def compute_huffman_coding(translation_name, translations, f):
         length_count[length] += 1
         if last_length:
             renumbered <<= length - last_length
-        canonical[atom] = "{0:0{width}b}".format(renumbered, width=length)
         # print(f"atom={repr(atom)} code={code}", file=sys.stderr)
+        canonical[atom] = "{0:0{width}b}".format(renumbered, width=length)
         if len(atom) > 1:
             o = words.index(atom) + 0x80
             s = "".join(C_ESCAPES.get(ch1, ch1) for ch1 in atom)
+            f.write(f"// {o} {s} {counter[atom]} {canonical[atom]} {renumbered}\n")
         else:
             s = C_ESCAPES.get(atom, atom)
+            canonical[atom] = "{0:0{width}b}".format(renumbered, width=length)
             o = ord(atom)
-        f.write(f"// {o} {s} {counter[atom]} {canonical[atom]} {renumbered}\n")
+            f.write(f"// {o} {s} {counter[atom]} {canonical[atom]} {renumbered}\n")
         renumbered += 1
         last_length = length
     lengths = bytearray()
@@ -306,7 +360,11 @@ def compute_huffman_coding(translation_name, translations, f):
 
     f.write("typedef {} mchar_t;\n".format(values_type))
     f.write("const uint8_t lengths[] = {{ {} }};\n".format(", ".join(map(str, lengths))))
-    f.write("const mchar_t values[] = {{ {} }};\n".format(", ".join(str(ord(u)) for u in values)))
+    f.write(
+        "const mchar_t values[] = {{ {} }};\n".format(
+            ", ".join(str(ord(remove_offset(u))) for u in values)
+        )
+    )
     f.write(
         "#define compress_max_length_bits ({})\n".format(
             max_translation_encoded_length.bit_length()
@@ -314,7 +372,7 @@ def compute_huffman_coding(translation_name, translations, f):
     )
     f.write(
         "const mchar_t words[] = {{ {} }};\n".format(
-            ", ".join(str(ord(c)) for w in words for c in w)
+            ", ".join(str(ord(remove_offset(c))) for w in words for c in w)
         )
     )
     f.write("const uint8_t wlencount[] = {{ {} }};\n".format(", ".join(str(p) for p in wlencount)))
@@ -322,12 +380,17 @@ def compute_huffman_coding(translation_name, translations, f):
     f.write("#define word_end {}\n".format(word_end))
     f.write("#define minlen {}\n".format(minlen))
     f.write("#define maxlen {}\n".format(maxlen))
+    f.write("#define offstart {}\n".format(offstart))
+    f.write("#define offset {}\n".format(offset))
 
-    return (values, lengths, words, canonical, extractor)
+    return EncodingTable(values, lengths, words, canonical, extractor, apply_offset, remove_offset)
 
 
 def decompress(encoding_table, encoded, encoded_length_bits):
-    (values, lengths, words, _, _) = encoding_table
+    values = encoding_table.values
+    lengths = encoding_table.lengths
+    words = encoding_table.words
+
     dec = []
     this_byte = 0
     this_bit = 7
@@ -385,7 +448,8 @@ def decompress(encoding_table, encoded, encoded_length_bits):
 def compress(encoding_table, decompressed, encoded_length_bits, len_translation_encoded):
     if not isinstance(decompressed, str):
         raise TypeError()
-    (_, _, _, canonical, extractor) = encoding_table
+    canonical = encoding_table.canonical
+    extractor = encoding_table.extractor
 
     enc = bytearray(len(decompressed) * 3)
     current_bit = 7
diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c
index ae6c7524e5..423c5444fd 100644
--- a/supervisor/shared/translate/translate.c
+++ b/supervisor/shared/translate/translate.c
@@ -57,6 +57,9 @@ STATIC void get_word(int n, const mchar_t **pos, const mchar_t **end) {
 }
 
 STATIC int put_utf8(char *buf, int u) {
+    if (u >= offstart) {
+        u += offset;
+    }
     if (u <= 0x7f) {
         *buf = u;
         return 1;

From e5b83821f8b28153c1fdce34c8645d98ec1712f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 9 Nov 2022 07:00:25 -0600
Subject: [PATCH 1492/2403] fr should fit in 8 bits

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

diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py
index 98c3d77dbb..938e8de667 100644
--- a/py/maketranslationdata.py
+++ b/py/maketranslationdata.py
@@ -147,7 +147,7 @@ def iter_substrings(s, minlen, maxlen):
             yield s[begin : begin + n]
 
 
-translation_requires_uint16 = {"cs", "fr", "ja", "ko", "pl", "tr", "zh_Latn_pinyin"}
+translation_requires_uint16 = {"cs", "ja", "ko", "pl", "tr", "zh_Latn_pinyin"}
 
 
 def compute_unicode_offset(texts):

From fb66a6bfe57d5b55c25291ef021c4133a4880ae0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 9 Nov 2022 07:57:36 -0600
Subject: [PATCH 1493/2403] Don't use "offset" as an identifier

---
 py/maketranslationdata.py               | 4 ++--
 supervisor/shared/translate/translate.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py
index 938e8de667..fbf396c73f 100644
--- a/py/maketranslationdata.py
+++ b/py/maketranslationdata.py
@@ -380,8 +380,8 @@ def compute_huffman_coding(translation_name, translations, f):
     f.write("#define word_end {}\n".format(word_end))
     f.write("#define minlen {}\n".format(minlen))
     f.write("#define maxlen {}\n".format(maxlen))
-    f.write("#define offstart {}\n".format(offstart))
-    f.write("#define offset {}\n".format(offset))
+    f.write("#define translation_offstart {}\n".format(offstart))
+    f.write("#define translation_offset {}\n".format(offset))
 
     return EncodingTable(values, lengths, words, canonical, extractor, apply_offset, remove_offset)
 
diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c
index 423c5444fd..b07aa584ca 100644
--- a/supervisor/shared/translate/translate.c
+++ b/supervisor/shared/translate/translate.c
@@ -57,8 +57,8 @@ STATIC void get_word(int n, const mchar_t **pos, const mchar_t **end) {
 }
 
 STATIC int put_utf8(char *buf, int u) {
-    if (u >= offstart) {
-        u += offset;
+    if (u >= translation_offstart) {
+        u += translation_offset;
     }
     if (u <= 0x7f) {
         *buf = u;

From d2e2a6107523951c9ab93a4ef812b7ffaeb06866 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 9 Nov 2022 08:28:56 -0600
Subject: [PATCH 1494/2403] Reworking how "run list" works saves a dozen bytes

---
 main.c | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/main.c b/main.c
index 10fdc65224..d70e718b6d 100644
--- a/main.c
+++ b/main.c
@@ -218,12 +218,10 @@ void supervisor_execution_status(void) {
 }
 #endif
 
-#define STRING_LIST(...) {__VA_ARGS__, ""}
-
 // Look for the first file that exists in the list of filenames, using mp_import_stat().
 // Return its index. If no file found, return -1.
-STATIC const char *first_existing_file_in_list(const char *const *filenames) {
-    for (int i = 0; filenames[i] != (char *)""; i++) {
+STATIC const char *first_existing_file_in_list(const char *const *filenames, size_t n_filenames) {
+    for (size_t i = 0; i < n_filenames; i++) {
         mp_import_stat_t stat = mp_import_stat(filenames[i]);
         if (stat == MP_IMPORT_STAT_FILE) {
             return filenames[i];
@@ -232,11 +230,11 @@ STATIC const char *first_existing_file_in_list(const char *const *filenames) {
     return NULL;
 }
 
-STATIC bool maybe_run_list(const char *const *filenames) {
+STATIC bool maybe_run_list(const char *const *filenames, size_t n_filenames) {
     _exec_result.return_code = 0;
     _exec_result.exception = MP_OBJ_NULL;
     _exec_result.exception_line = 0;
-    _current_executing_filename = first_existing_file_in_list(filenames);
+    _current_executing_filename = first_existing_file_in_list(filenames, n_filenames);
     if (_current_executing_filename == NULL) {
         return false;
     }
@@ -391,12 +389,14 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         filesystem_flush();
     }
     if (safe_mode == NO_SAFE_MODE && !autoreload_pending()) {
-        static const char *const supported_filenames[] = STRING_LIST(
-            "code.txt", "code.py", "main.py", "main.txt");
+        static const char *const supported_filenames[] = {
+            "code.txt", "code.py", "main.py", "main.txt"
+        };
         #if CIRCUITPY_FULL_BUILD
-        static const char *const double_extension_filenames[] = STRING_LIST(
+        static const char *const double_extension_filenames[] = {
             "code.txt.py", "code.py.txt", "code.txt.txt","code.py.py",
-            "main.txt.py", "main.py.txt", "main.txt.txt","main.py.py");
+            "main.txt.py", "main.py.txt", "main.txt.txt","main.py.py"
+        };
         #endif
 
         supervisor_allocation *heap = allocate_remaining_memory();
@@ -410,14 +410,15 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
         // Check if a different run file has been allocated
         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, ""};
+            next_code_info_t *info = ((next_code_info_t *)next_code_allocation->ptr);
+            info->options &= ~SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
+            next_code_options = info->options;
+            if (info->filename[0] != '\0') {
                 // This is where the user's python code is actually executed:
-                found_main = maybe_run_list(next_list);
+                const char *const filenames[] = { info->filename };
+                found_main = maybe_run_list(filenames, MP_ARRAY_SIZE(filenames));
                 if (!found_main) {
-                    serial_write(((next_code_info_t *)next_code_allocation->ptr)->filename);
+                    serial_write(info->filename);
                     serial_write_compressed(translate(" not found.\n"));
                 }
             }
@@ -425,11 +426,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         // Otherwise, default to the standard list of filenames
         if (!found_main) {
             // This is where the user's python code is actually executed:
-            found_main = maybe_run_list(supported_filenames);
+            found_main = maybe_run_list(supported_filenames, MP_ARRAY_SIZE(supported_filenames));
             // If that didn't work, double check the extensions
             #if CIRCUITPY_FULL_BUILD
             if (!found_main) {
-                found_main = maybe_run_list(double_extension_filenames);
+                found_main = maybe_run_list(double_extension_filenames, MP_ARRAY_SIZE(double_extension_filenames));
                 if (found_main) {
                     serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
                 }
@@ -741,7 +742,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         && safe_mode == NO_SAFE_MODE
         && MP_STATE_VM(vfs_mount_table) != NULL;
 
-    static const char *const boot_py_filenames[] = STRING_LIST("boot.py", "boot.txt");
+    static const char *const boot_py_filenames[] = {"boot.py", "boot.txt"};
 
     // Do USB setup even if boot.py is not run.
 
@@ -778,7 +779,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         port_boot_info();
         #endif
 
-        bool found_boot = maybe_run_list(boot_py_filenames);
+        bool found_boot = maybe_run_list(boot_py_filenames, MP_ARRAY_SIZE(boot_py_filenames));
         (void)found_boot;
 
 

From 3fb4fd81e9afd4a129b86a1247816fc07f3b98c7 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 30 Nov 2022 22:44:18 +0200
Subject: [PATCH 1495/2403] Revert "debug_dhcp to follow general debug"

---
 ports/raspberrypi/lwip_inc/lwipopts.h | 1 +
 shared/netutils/dhcpserver.h          | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 64b8cffff3..6d116e89b6 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -95,6 +95,7 @@
 #define TCPIP_DEBUG                 LWIP_DBG_OFF
 #define PPP_DEBUG                   LWIP_DBG_OFF
 #define SLIP_DEBUG                  LWIP_DBG_OFF
+#define DHCP_DEBUG                  LWIP_DBG_OFF
 #define MDNS_DEBUG                  LWIP_DBG_OFF
 
 #define LWIP_TIMEVAL_PRIVATE 0
diff --git a/shared/netutils/dhcpserver.h b/shared/netutils/dhcpserver.h
index 45ceaf9a87..2349d2ea42 100644
--- a/shared/netutils/dhcpserver.h
+++ b/shared/netutils/dhcpserver.h
@@ -31,10 +31,6 @@
 #define DHCPS_BASE_IP (16)
 #define DHCPS_MAX_IP (8)
 
-#ifndef DHCP_DEBUG
-#define DHCP_DEBUG    LWIP_DBG_ON
-#endif
-
 typedef struct _dhcp_server_lease_t {
     uint8_t mac[6];
     uint16_t expiry;

From 65e913ecd6be55da903b7862d705b7e89cb3c51d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 30 Nov 2022 14:22:46 -0800
Subject: [PATCH 1496/2403] Fix writing files from web workflow

Pico W changes assumed that f_write could handle a NULL fourth
argument. It can't.
---
 supervisor/shared/web_workflow/web_workflow.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 3527090f1e..231b1e8ffb 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -907,8 +907,13 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
             error = true;
             break;
         }
-        f_write(&active_file, bytes, len, NULL);
         total_read += len;
+        UINT actual;
+        f_write(&active_file, bytes, len, &actual);
+        if (actual < (UINT)len) {
+            error = true;
+            break;
+        }
     }
 
     f_close(&active_file);
@@ -917,7 +922,10 @@ static void _write_file_and_reply(socketpool_socket_obj_t *socket, _request *req
     #endif
 
     override_fattime(0);
-    if (new_file) {
+    if (error) {
+        _discard_incoming(socket, request->content_length - total_read);
+        _reply_server_error(socket, request);
+    } else if (new_file) {
         _reply_created(socket, request);
     } else {
         _reply_no_content(socket, request);

From 0563487433fa8efd19822e30b866d33d9447eb0d Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Wed, 30 Nov 2022 19:16:20 -0600
Subject: [PATCH 1497/2403] get slicing

---
 shared-bindings/_pixelmap/PixelMap.c | 50 ++++++++++++++++++++--------
 shared-bindings/_pixelmap/PixelMap.h |  3 +-
 shared-module/_pixelmap/PixelMap.c   | 26 ++++++---------
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/shared-bindings/_pixelmap/PixelMap.c b/shared-bindings/_pixelmap/PixelMap.c
index c5f7e0ddb5..94fa4d5c96 100644
--- a/shared-bindings/_pixelmap/PixelMap.c
+++ b/shared-bindings/_pixelmap/PixelMap.c
@@ -135,7 +135,7 @@ MP_PROPERTY_GETTER(pixelmap_pixelmap_byteorder_obj,
     (mp_obj_t)&pixelmap_pixelmap_get_byteorder);
 
 //|
-//|     def fill(self, color: PixelType, /) -> None:
+//|     def fill(self, color: PixelType) -> None:
 //|         """Fill all the pixels in the map with the given color"""
 STATIC mp_obj_t pixelmap_pixelmap_fill(const mp_obj_t self_in, const mp_obj_t color) {
     pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -146,7 +146,7 @@ STATIC mp_obj_t pixelmap_pixelmap_fill(const mp_obj_t self_in, const mp_obj_t co
 MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_fill_obj, pixelmap_pixelmap_fill);
 
 //|
-//|     def indices(self, index: int, /) -> Tuple[int]:
+//|     def indices(self, index: int) -> Tuple[int]:
 //|         """Return the PixelBuf indices for a PixelMap index"""
 STATIC mp_obj_t pixelmap_pixelmap_indices(const mp_obj_t self_in, const mp_obj_t index) {
     pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -157,10 +157,14 @@ STATIC mp_obj_t pixelmap_pixelmap_indices(const mp_obj_t self_in, const mp_obj_t
 MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_indices_obj, pixelmap_pixelmap_indices);
 
 
+//|     @overload
+//|     def __getitem__(self, index: slice) -> PixelReturnSequence:
+//|         """Retrieve the value of the underlying pixels."""
+//|         ...
+//|     @overload
 //|     def __getitem__(self, index: int) -> PixelReturnType:
-//|         """Retrieve the value of one of the underlying pixels at 'index'.
-//|
-//|         Note that slices are not supported by PixelMap.__getitem__"""
+//|         """Retrieve the value of one of the underlying pixels at 'index'."""
+//|         ...
 //|     @overload
 //|     def __setitem__(self, index: slice, value: PixelSequence) -> None: ...
 //|     @overload
@@ -176,21 +180,41 @@ STATIC mp_obj_t pixelmap_pixelmap_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
     if (value == MP_OBJ_NULL) {
         // delete
         return MP_OBJ_NULL; // op not supported
-    } else if (value == MP_OBJ_SENTINEL) {
-        int index = mp_obj_get_int(index_in);
-        return shared_module_pixelmap_pixelmap_getitem(self, index);
     }
 
-    // get
     if (0) {
     #if MICROPY_PY_BUILTINS_SLICE
     } else if (mp_obj_is_type(index_in, &mp_type_slice)) {
-        shared_module_pixelmap_pixelmap_setslice(self, index_in, value);
+        mp_bound_slice_t slice;
+        mp_seq_get_fast_slice_indexes(self->len, index_in, &slice);
+        size_t slice_len;
+        if (slice.step > 0) {
+            slice_len = slice.stop - slice.start;
+        } else {
+            slice_len = 1 + slice.start - slice.stop;
+        }
+        if (slice.step > 1 || slice.step < -1) {
+            size_t step = slice.step > 0 ? slice.step : slice.step * -1;
+            slice_len = (slice_len / step) + (slice_len % step ? 1 : 0);
+        }
+
+        if (value == MP_OBJ_SENTINEL) { // Get
+            return shared_module_pixelmap_pixelmap_getslice(self, slice, slice_len);
+        } else { // Set
+            shared_module_pixelmap_pixelmap_setslice(self, value, slice, slice_len);
+            return mp_const_none;
+        }
     #endif
-    } else {
-        shared_module_pixelmap_pixelmap_setitem(self, mp_obj_get_int(index_in), value);
+    } else { // single index
+        int index = mp_obj_get_int(index_in);
+
+        if (value == MP_OBJ_SENTINEL) { // Get
+            return shared_module_pixelmap_pixelmap_getitem(self, index);
+        } else {
+            shared_module_pixelmap_pixelmap_setitem(self, mp_obj_get_int(index_in), value);
+            return mp_const_none;
+        }
     }
-    return mp_const_none;
 }
 
 //|     def __len__(self) -> int:
diff --git a/shared-bindings/_pixelmap/PixelMap.h b/shared-bindings/_pixelmap/PixelMap.h
index 420df1b9e9..fef0db44d0 100644
--- a/shared-bindings/_pixelmap/PixelMap.h
+++ b/shared-bindings/_pixelmap/PixelMap.h
@@ -37,6 +37,7 @@ bool shared_module_pixelmap_pixelmap_auto_write_get(pixelmap_pixelmap_obj_t *sel
 void shared_module_pixelmap_pixelmap_auto_write_set(pixelmap_pixelmap_obj_t *self, bool auto_write);
 void shared_module_pixelmap_pixelmap_fill(pixelmap_pixelmap_obj_t *self, const mp_obj_t color);
 mp_obj_t shared_module_pixelmap_pixelmap_indices(pixelmap_pixelmap_obj_t *self, int index);
-void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t slice_in, const mp_obj_t value);
+void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t value, mp_bound_slice_t slice, size_t slice_len);
+mp_obj_t shared_module_pixelmap_pixelmap_getslice(pixelmap_pixelmap_obj_t *self, mp_bound_slice_t slice, size_t slice_len);
 mp_obj_t shared_module_pixelmap_pixelmap_getitem(pixelmap_pixelmap_obj_t *self, mp_int_t index);
 void shared_module_pixelmap_pixelmap_setitem(pixelmap_pixelmap_obj_t *self, mp_int_t index, const mp_obj_t value);
diff --git a/shared-module/_pixelmap/PixelMap.c b/shared-module/_pixelmap/PixelMap.c
index d20a6dd03c..5eaad0b2f8 100644
--- a/shared-module/_pixelmap/PixelMap.c
+++ b/shared-module/_pixelmap/PixelMap.c
@@ -34,7 +34,7 @@
 
 
 static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) {
-    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+    mp_arg_validate_index_range(i, 0, self->len - 1, MP_QSTR_index);
 
     mp_obj_t item = self->items[i];
     if (mp_obj_is_small_int(item)) {
@@ -109,20 +109,16 @@ mp_obj_t shared_module_pixelmap_pixelmap_indices(pixelmap_pixelmap_obj_t *self,
 }
 
 #if MICROPY_PY_BUILTINS_SLICE
-void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t slice_in, const mp_obj_t values) {
-    mp_bound_slice_t slice;
-    mp_seq_get_fast_slice_indexes(self->len, slice_in, &slice);
-    size_t slice_len;
-    if (slice.step > 0) {
-        slice_len = slice.stop - slice.start;
-    } else {
-        slice_len = 1 + slice.start - slice.stop;
-    }
-    if (slice.step > 1 || slice.step < -1) {
-        size_t step = slice.step > 0 ? slice.step : slice.step * -1;
-        slice_len = (slice_len / step) + (slice_len % step ? 1 : 0);
-    }
 
+mp_obj_t shared_module_pixelmap_pixelmap_getslice(pixelmap_pixelmap_obj_t *self, mp_bound_slice_t slice, size_t slice_len) {
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(slice_len, NULL));
+    for (uint i = 0; i < slice_len; i++) {
+        t->items[i] = shared_module_pixelmap_pixelmap_getitem(self, i * slice.step + slice.start);
+    }
+    return MP_OBJ_FROM_PTR(t);
+}
+
+void shared_module_pixelmap_pixelmap_setslice(pixelmap_pixelmap_obj_t *self, const mp_obj_t values, mp_bound_slice_t slice, size_t slice_len) {
     size_t num_items = mp_obj_get_int(mp_obj_len(values));
     if (num_items != slice_len) {
         mp_raise_ValueError_varg(translate("Unmatched number of items on RHS (expected %d, got %d)."), slice_len, num_items);
@@ -165,7 +161,7 @@ void shared_module_pixelmap_pixelmap_setitem(pixelmap_pixelmap_obj_t *self, mp_i
 }
 
 mp_obj_t shared_module_pixelmap_pixelmap_getitem(pixelmap_pixelmap_obj_t *self, mp_int_t i) {
-    mp_arg_validate_index_range(i, 0, self->len, MP_QSTR_index);
+    mp_arg_validate_index_range(i, 0, self->len - 1, MP_QSTR_index);
     mp_obj_t item = self->items[i];
     if (mp_obj_is_small_int(item)) {
         return common_hal_adafruit_pixelbuf_pixelbuf_get_pixel(self->pixelbuf, MP_OBJ_SMALL_INT_VALUE(item));

From 4f471dbd0840db22c51d17d66eb94799e1277f4d Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 1 Dec 2022 07:55:39 +0100
Subject: [PATCH 1498/2403] 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             |  97 ++++++---------------------
 locale/cs.po             | 106 ++++++++---------------------
 locale/de_DE.po          | 139 +++++++++++++++++---------------------
 locale/el.po             |  99 ++++++---------------------
 locale/en_GB.po          | 131 +++++++++++++++---------------------
 locale/es.po             | 131 +++++++++++++++---------------------
 locale/fil.po            | 106 +++++++++--------------------
 locale/fr.po             | 140 ++++++++++++++++++---------------------
 locale/hi.po             |  82 ++---------------------
 locale/it_IT.po          | 106 +++++++++--------------------
 locale/ja.po             | 112 ++++++++++---------------------
 locale/ko.po             |  85 +++---------------------
 locale/nl.po             | 115 +++++++++++---------------------
 locale/pl.po             | 106 +++++++++--------------------
 locale/pt_BR.po          | 139 +++++++++++++++++---------------------
 locale/ru.po             | 106 ++++++++---------------------
 locale/sv.po             | 139 +++++++++++++++++---------------------
 locale/tr.po             |  99 ++++++---------------------
 locale/zh_Latn_pinyin.po | 139 +++++++++++++++++---------------------
 19 files changed, 724 insertions(+), 1453 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 0bf1cf9323..1252722c70 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -124,7 +124,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -140,10 +140,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q panjang harus >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -169,15 +165,7 @@ msgstr "%q harus >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q harus berupa string"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q harus bertipe %q"
 
@@ -207,8 +195,8 @@ msgstr "%q di luar jangkauan"
 msgid "%q pin invalid"
 msgstr "pin %q tidak valid"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -517,10 +505,6 @@ msgstr "Array harus mengandung halfwords (ketik 'H')"
 msgid "Array values should be single bytes."
 msgstr "Nilai array harus berupa byte tunggal."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Paling banyak %d %q dapat ditentukan (bukan %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1275,10 +1259,6 @@ msgstr "Akses memori tidak valid."
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Pin-pin tidak valid"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1516,11 +1496,6 @@ msgstr "Tidak ada kunci yang ditentukan"
 msgid "No long integer support"
 msgstr "Tidak ada dukungan bilangan bulat yang panjang"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2576,10 +2551,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2621,14 +2592,10 @@ msgstr "tidak dapat menetapkan ke ekspresi"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2812,10 +2779,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2918,12 +2881,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3295,10 +3253,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3436,10 +3390,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3975,10 +3925,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4027,10 +3973,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4039,10 +3981,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4075,10 +4013,6 @@ msgstr "sintaksis error pada JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "sintaksis error pada pendeskripsi uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4360,10 +4294,6 @@ msgstr "xTaskCreate gagal"
 msgid "y value out of bounds"
 msgstr "Nilai y di luar batas"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "nol langkah"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi harus ndarray"
@@ -4376,6 +4306,21 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "%q panjang harus >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q harus berupa string"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Paling banyak %d %q dapat ditentukan (bukan %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Pin-pin tidak valid"
+
+#~ msgid "zero step"
+#~ msgstr "nol langkah"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "indeks %q harus bilangan bulat, bukan %s"
 
diff --git a/locale/cs.po b/locale/cs.po
index 952c7dca61..a08a8c14f8 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -125,7 +125,7 @@ msgstr "Inicializace %q selhala"
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "Délka %q musí být %d"
 
@@ -141,10 +141,6 @@ msgstr "Délka %q musí být <= %d"
 msgid "%q length must be >= %d"
 msgstr "Délka %q musí být >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q délka musí být >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q musí být %d"
@@ -170,15 +166,7 @@ msgstr "%q musí být >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q musí být string"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q musí být int"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q musí být typu %q"
 
@@ -208,9 +196,9 @@ msgstr "%q je mimo rozsah"
 msgid "%q pin invalid"
 msgstr "pin %q není platný"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q s ID 0 musím být délky 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -518,10 +506,6 @@ msgstr "Pole musí obsahovat poloviční slova (typ „H“)"
 msgid "Array values should be single bytes."
 msgstr "Hodnoty pole by měly být jednoduché bajty."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Lze zadat maximálně %d %q (nikoli %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1275,10 +1259,6 @@ msgstr "Neplatný přístup k paměti."
 msgid "Invalid multicast MAC address"
 msgstr "Chybná multicastová MAC adresa"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Neplatné piny"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Chybná velikost"
@@ -1516,11 +1496,6 @@ msgstr "Nebyl zadán klíč"
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Ne více než %d HID zařízení je povoleno"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Žádná síť s takovým SSID"
@@ -2563,10 +2538,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2608,14 +2579,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2799,10 +2766,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2905,12 +2868,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3282,10 +3240,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3423,10 +3377,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3961,10 +3911,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4013,10 +3959,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4025,10 +3967,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4061,10 +3999,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4346,10 +4280,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4362,6 +4292,28 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "%q délka musí být >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q musí být string"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q musí být int"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q s ID 0 musím být délky 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Lze zadat maximálně %d %q (nikoli %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Neplatné piny"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Ne více než %d HID zařízení je povoleno"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "Indexy %q musí být celá čísla, nikoli %s"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 79ab102d09..04a05d4b9a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -126,7 +126,7 @@ msgstr "%q Initialisierung ist gescheitert"
 msgid "%q is %q"
 msgstr "%q ist %q"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q länge muss %d betragen"
 
@@ -142,10 +142,6 @@ msgstr "%q länge muss kleiner oder gleich %d sein"
 msgid "%q length must be >= %d"
 msgstr "%q länge muss größer oder gleich %d sein"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q Länge muss >= 1 sein"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q muss %d entsprechen"
@@ -172,15 +168,7 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q muss ein String sein"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q muss vom Typ Integer sein"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q muss vom Type %q sein"
 
@@ -210,9 +198,9 @@ msgstr "%q außerhalb des Bereichs"
 msgid "%q pin invalid"
 msgstr "%q Pin ungültig"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q mit Berichts-ID von 0 muss von Länge 1 sein"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -521,10 +509,6 @@ msgstr "Array muss Halbwörter enthalten (type 'H')"
 msgid "Array values should be single bytes."
 msgstr "Array-Werte sollten aus Einzelbytes bestehen."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Es darf höchstens %d %q spezifiziert werden (nicht %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1290,10 +1274,6 @@ msgstr "Ungültiger Speicherzugriff."
 msgid "Invalid multicast MAC address"
 msgstr "Ungültige Multicast-MAC-Adresse"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Ungültige Pins"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Ungültige Größe"
@@ -1532,11 +1512,6 @@ msgstr "Es wurde kein Schlüssel angegeben"
 msgid "No long integer support"
 msgstr "Keine langen Integer (long) unterstützt"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Keine weiteren %d HID-Geräte zulässig"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Kein Netzwerk mit dieser SSID"
@@ -2618,10 +2593,6 @@ msgstr "Der Puffer ist zu klein"
 msgid "buffer too small for requested bytes"
 msgstr "Der Puffer ist zu klein für die angefragten Bytes"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "Byteorder ist kein String"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "Byte-Länge ist kein vielfaches der Item-Größe"
@@ -2665,14 +2636,10 @@ msgstr "kann keinem Ausdruck zuweisen"
 msgid "can't cancel self"
 msgstr "kann self nicht abbrechen"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kann %q nicht zu %q konvertieren"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "kann %q nicht nach int konvertieren"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2864,10 +2831,6 @@ msgstr "Farbe muss zwischen 0x000000 und 0xffffff liegen"
 msgid "comparison of int and uint"
 msgstr "Vergleich von int und uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "Komplexe Division durch null"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "Komplexe Zahlen nicht unterstützt"
@@ -2972,12 +2935,7 @@ msgstr "Abmessungen stimmen nicht überein"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod für uint nicht implementiert"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "durch Null dividieren"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "Division durch Null"
 
@@ -3353,10 +3311,6 @@ msgstr "Eingabevektoren müssen gleich lang sein"
 msgid "inputs are not iterable"
 msgstr "Eingaben sind nicht iterierbar"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 muss >= 2 und <= 36 sein"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "interp ist für 1D-Iterables gleicher Länge definiert"
@@ -3500,10 +3454,6 @@ msgstr ""
 "Es wurde versucht auf eine Variable zuzugreifen, die es (noch) nicht gibt. "
 "Variablen immer zuerst Zuweisen"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int wird in diesem Build nicht unterstützt"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "Loopback + Silent Mode wird vom Peripheriegerät nicht unterstützt"
@@ -4043,10 +3993,6 @@ msgstr "Die Schlafdauer darf nicht negativ sein"
 msgid "slice step can't be zero"
 msgstr "Slice-Schritt darf nicht Null sein"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "Der Slice-Schritt kann nicht Null sein"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "Slice nicht unterstützt"
@@ -4095,10 +4041,6 @@ msgstr "source_bitmap muss value_count von 8 haben"
 msgid "start/end indices"
 msgstr "start/end Indizes"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "Schritt (step) darf nicht Null sein"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop ist von start aus nicht erreichbar"
@@ -4107,10 +4049,6 @@ msgstr "stop ist von start aus nicht erreichbar"
 msgid "stream operation not supported"
 msgstr "stream operation ist nicht unterstützt"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "String Indizes müssen Integer sein, nicht %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "Zeichenfolgen werden nicht unterstützt; verwende bytes oder bytearray"
@@ -4143,10 +4081,6 @@ msgstr "Syntaxfehler in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "Syntaxfehler in uctypes Deskriptor"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() nimmt eine 9-Sequenz an"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4430,10 +4364,6 @@ msgstr "xTaskCreate fehlgeschlagen"
 msgid "y value out of bounds"
 msgstr "y Wert außerhalb der Grenzen"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "Nullschritt"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi muss ein ndarray sein"
@@ -4446,6 +4376,61 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "%q Länge muss >= 1 sein"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q muss ein String sein"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q muss vom Typ Integer sein"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q mit Berichts-ID von 0 muss von Länge 1 sein"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Es darf höchstens %d %q spezifiziert werden (nicht %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Ungültige Pins"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Keine weiteren %d HID-Geräte zulässig"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "Byteorder ist kein String"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "kann %q nicht nach int konvertieren"
+
+#~ msgid "complex division by zero"
+#~ msgstr "Komplexe Division durch null"
+
+#~ msgid "divide by zero"
+#~ msgstr "durch Null dividieren"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 muss >= 2 und <= 36 sein"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int wird in diesem Build nicht unterstützt"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "Der Slice-Schritt kann nicht Null sein"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "Schritt (step) darf nicht Null sein"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "String Indizes müssen Integer sein, nicht %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() nimmt eine 9-Sequenz an"
+
+#~ msgid "zero step"
+#~ msgstr "Nullschritt"
+
 #~ msgid "invalid traceback"
 #~ msgstr "ungültiger Traceback"
 
diff --git a/locale/el.po b/locale/el.po
index 98b2e191aa..94f2418c97 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -130,7 +130,7 @@ msgstr "%q εκκίνηση απέτυχε"
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q μήκος πρέπει να είναι %d"
 
@@ -146,10 +146,6 @@ msgstr "%q μήκος πρέπει να είναι <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q μήκος πρέπει να είναι >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q μήκος πρέπει να είναι >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q πρέπει να είναι %d"
@@ -175,15 +171,7 @@ msgstr "%q πρέπει να είναι >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q πρέπει να είναι string"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q πρέπει να είναι int"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q πρέπει να είναι τύπου %q"
 
@@ -213,9 +201,9 @@ msgstr "%q εκτός εμβέλειας"
 msgid "%q pin invalid"
 msgstr "%q άκυρο pin"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q με ID αναφοράς 0 πρέπει να έχει μήκος 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -524,10 +512,6 @@ msgstr "H παράταξη πρέπει να περιέχει halfwords (τύπ
 msgid "Array values should be single bytes."
 msgstr "Η τιμές της παράταξη πρέπει να είναι μονά bytes."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Το πολύ %d %q μπορεί να είναι καθορισμένα (όχι %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1285,10 +1269,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1526,11 +1506,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2572,10 +2547,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2617,14 +2588,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2808,10 +2775,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2914,12 +2877,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3291,10 +3249,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3432,10 +3386,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3970,10 +3920,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4022,10 +3968,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4034,10 +3976,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4070,10 +4008,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4355,10 +4289,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4371,6 +4301,21 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "%q μήκος πρέπει να είναι >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q πρέπει να είναι string"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q πρέπει να είναι int"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q με ID αναφοράς 0 πρέπει να έχει μήκος 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Το πολύ %d %q μπορεί να είναι καθορισμένα (όχι %d)"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι %s"
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index d6c8f96d6e..de0d9a513a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -128,7 +128,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -144,10 +144,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q length must be >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -173,15 +169,7 @@ msgstr "%q must be >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q must be a string"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -211,8 +199,8 @@ msgstr "%q out of range"
 msgid "%q pin invalid"
 msgstr "%q pin invalid"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -521,10 +509,6 @@ msgstr "Array must contain halfwords (type 'H')"
 msgid "Array values should be single bytes."
 msgstr "Array values should be single bytes."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "At most %d %q may be specified (not %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1276,10 +1260,6 @@ msgstr "Invalid memory access."
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Invalid pins"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Invalid size"
@@ -1517,11 +1497,6 @@ msgstr "No key was specified"
 msgid "No long integer support"
 msgstr "No long integer support"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "No more than %d HID devices allowed"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "No network with that ssid"
@@ -2579,10 +2554,6 @@ msgstr "Buffer too small"
 msgid "buffer too small for requested bytes"
 msgstr "Buffer too small for requested bytes"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "Byteorder is not a string"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "Bytes length not a multiple of item size"
@@ -2624,14 +2595,10 @@ msgstr "Can't assign to expression"
 msgid "can't cancel self"
 msgstr "can't cancel self"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Can't convert %q to %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "can't convert %q to int"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2817,10 +2784,6 @@ msgstr "colour must be between 0x000000 and 0xffffff"
 msgid "comparison of int and uint"
 msgstr "comparison of int and uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "complex division by zero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "complex values not supported"
@@ -2924,12 +2887,7 @@ msgstr "dimensions do not match"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod not implemented for uint"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "divide by zero"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "division by zero"
 
@@ -3301,10 +3259,6 @@ msgstr "input vectors must be of equal length"
 msgid "inputs are not iterable"
 msgstr "inputs are not iterable"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 must be >= 2 and <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "interp is defined for 1D iterables of equal length"
@@ -3442,10 +3396,6 @@ msgstr "local '%q' used before type known"
 msgid "local variable referenced before assignment"
 msgstr "local variable referenced before assignment"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int not supported in this build"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode not supported by peripheral"
@@ -3980,10 +3930,6 @@ msgstr "sleep length must be non-negative"
 msgid "slice step can't be zero"
 msgstr "slice step can't be zero"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "slice step cannot be zero"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "slice unsupported"
@@ -4032,10 +3978,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/end indices"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step must be non-zero"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop not reachable from start"
@@ -4044,10 +3986,6 @@ msgstr "stop not reachable from start"
 msgid "stream operation not supported"
 msgstr "stream operation not supported"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "string indices must be integers, not %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "string not supported; use bytes or bytearray"
@@ -4080,10 +4018,6 @@ msgstr "syntax error in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntax error in uctypes descriptor"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() takes a 9-sequence"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4365,10 +4299,6 @@ msgstr "xTaskCreate failed"
 msgid "y value out of bounds"
 msgstr "y value out of bounds"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "zero step"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi must be an ndarray"
@@ -4381,6 +4311,55 @@ 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 "%q length must be >= 1"
+#~ msgstr "%q length must be >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q must be a string"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "At most %d %q may be specified (not %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Invalid pins"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "No more than %d HID devices allowed"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "Byteorder is not a string"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "can't convert %q to int"
+
+#~ msgid "complex division by zero"
+#~ msgstr "complex division by zero"
+
+#~ msgid "divide by zero"
+#~ msgstr "divide by zero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 must be >= 2 and <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int not supported in this build"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "slice step cannot be zero"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step must be non-zero"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "string indices must be integers, not %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() takes a 9-sequence"
+
+#~ msgid "zero step"
+#~ msgstr "zero step"
+
 #~ msgid "invalid traceback"
 #~ msgstr "invalid traceback"
 
diff --git a/locale/es.po b/locale/es.po
index 4111331bba..4c78717f8f 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -130,7 +130,7 @@ msgstr "%q inicializado fallido"
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q tamaño debe ser %d"
 
@@ -146,10 +146,6 @@ msgstr "%q tamaño debe ser <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q tamaño debe ser >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q tamaño debe ser >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q debe ser %d"
@@ -175,15 +171,7 @@ msgstr "%q debe ser >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q debe ser una cadena"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -213,8 +201,8 @@ msgstr "%q fuera de rango"
 msgid "%q pin invalid"
 msgstr "pin inválido %q"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -525,10 +513,6 @@ msgstr "El array debe contener medias palabras (escriba 'H')"
 msgid "Array values should be single bytes."
 msgstr "Valores del array deben ser bytes individuales."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Como máximo %d %q se puede especificar (no %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1294,10 +1278,6 @@ msgstr "Acceso a memoria no válido."
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "pines inválidos"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Tamaño incorrecto"
@@ -1539,11 +1519,6 @@ msgstr "No se especificó ninguna llave"
 msgid "No long integer support"
 msgstr "No hay soporte de entero largo"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "No se permiten más de %d dispositivos HID permitidos"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "No hay una red con ese ssid"
@@ -2615,10 +2590,6 @@ msgstr "buffer demasiado pequeño"
 msgid "buffer too small for requested bytes"
 msgstr "búfer muy pequeño para los bytes solicitados"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorder no es una cadena"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "el tamaño en bytes no es un múltiplo del tamaño del item"
@@ -2660,14 +2631,10 @@ msgstr "no se puede asignar a la expresión"
 msgid "can't cancel self"
 msgstr "no se puede cancelar a si mismo"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "no puede convertir %q a %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "no se puede convertir %q a int"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2856,10 +2823,6 @@ msgstr "color debe estar entre 0x000000 y 0xffffff"
 msgid "comparison of int and uint"
 msgstr "comparación entre int y uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "división compleja por cero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "valores complejos no soportados"
@@ -2964,12 +2927,7 @@ msgstr "las dimensiones no concuerdan"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod no implementado para uint"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "divide por cero"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "división por cero"
 
@@ -3341,10 +3299,6 @@ msgstr "los vectores de entrada deben ser de igual tamaño"
 msgid "inputs are not iterable"
 msgstr "Entradas no son iterables"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 debe ser >= 2 y <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "interp está definido para iterables 1D de igual tamaño"
@@ -3485,10 +3439,6 @@ msgstr "variable local '%q' usada antes del tipo conocido"
 msgid "local variable referenced before assignment"
 msgstr "variable local referenciada antes de la asignación"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int no soportado en esta compilación"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "Loopback + modo silencioso no están soportados por periférico"
@@ -4027,10 +3977,6 @@ msgstr "la longitud de sleep no puede ser negativa"
 msgid "slice step can't be zero"
 msgstr "el tamaño de la división no puede ser cero"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "slice step no puede ser cero"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "sin capacidades para rebanado"
@@ -4079,10 +4025,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "índices inicio/final"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "paso debe ser numero no cero"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop no se puede alcanzar del principio"
@@ -4091,10 +4033,6 @@ msgstr "stop no se puede alcanzar del principio"
 msgid "stream operation not supported"
 msgstr "operación stream no soportada"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "índices de cadena deben ser enteros, no %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "string no soportado; usa bytes o bytearray"
@@ -4127,10 +4065,6 @@ msgstr "error de sintaxis en JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "error de sintaxis en el descriptor uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() toma un sequencio 9"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4413,10 +4347,6 @@ msgstr "fallo en xTaskCreate"
 msgid "y value out of bounds"
 msgstr "valor y fuera de límites"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "paso cero"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi debe ser un ndarray"
@@ -4429,6 +4359,55 @@ 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 length must be >= 1"
+#~ msgstr "%q tamaño debe ser >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q debe ser una cadena"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Como máximo %d %q se puede especificar (no %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "pines inválidos"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "No se permiten más de %d dispositivos HID permitidos"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorder no es una cadena"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "no se puede convertir %q a int"
+
+#~ msgid "complex division by zero"
+#~ msgstr "división compleja por cero"
+
+#~ msgid "divide by zero"
+#~ msgstr "divide por cero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 debe ser >= 2 y <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int no soportado en esta compilación"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "slice step no puede ser cero"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "paso debe ser numero no cero"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "índices de cadena deben ser enteros, no %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() toma un sequencio 9"
+
+#~ msgid "zero step"
+#~ msgstr "paso cero"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indices deben ser enteros, no %s"
 
diff --git a/locale/fil.po b/locale/fil.po
index 52230ae094..e74d2c1da3 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -119,7 +119,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -135,10 +135,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -164,15 +160,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -202,8 +190,8 @@ msgstr ""
 msgid "%q pin invalid"
 msgstr ""
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -514,10 +502,6 @@ msgstr "May halfwords (type 'H') dapat ang array"
 msgid "Array values should be single bytes."
 msgstr "Array values ay dapat single bytes."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr ""
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1272,10 +1256,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Mali ang pins"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1513,11 +1493,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2565,10 +2540,6 @@ msgstr "masyadong maliit ang buffer"
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2611,14 +2582,10 @@ msgstr "hindi ma i-assign sa expression"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2807,10 +2774,6 @@ msgstr "color ay dapat mula sa 0x000000 hangang 0xffffff"
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "kumplikadong dibisyon sa pamamagitan ng zero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "kumplikadong values hindi sinusuportahan"
@@ -2917,12 +2880,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "dibisyon ng zero"
 
@@ -3295,10 +3253,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 ay dapat >=2 at <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3440,10 +3394,6 @@ msgstr "local '%q' ginamit bago alam ang type"
 msgid "local variable referenced before assignment"
 msgstr "local variable na reference bago na i-assign"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int hindi sinusuportahan sa build na ito"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3980,10 +3930,6 @@ msgstr "sleep length ay dapat hindi negatibo"
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "slice step ay hindi puedeng 0"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4032,10 +3978,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/end indeks"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step ay dapat hindi zero"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop hindi maabot sa simula"
@@ -4044,10 +3986,6 @@ msgstr "stop hindi maabot sa simula"
 msgid "stream operation not supported"
 msgstr "stream operation hindi sinusuportahan"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "string hindi supportado; gumamit ng bytes o kaya bytearray"
@@ -4080,10 +4018,6 @@ msgstr "sintaks error sa JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "may pagkakamali sa sintaks sa uctypes descriptor"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() kumukuha ng 9-sequence"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4367,10 +4301,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr "wala sa sakop ang address"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "zero step"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4383,6 +4313,30 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Invalid pins"
+#~ msgstr "Mali ang pins"
+
+#~ msgid "complex division by zero"
+#~ msgstr "kumplikadong dibisyon sa pamamagitan ng zero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 ay dapat >=2 at <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int hindi sinusuportahan sa build na ito"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "slice step ay hindi puedeng 0"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step ay dapat hindi zero"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() kumukuha ng 9-sequence"
+
+#~ msgid "zero step"
+#~ msgstr "zero step"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indeks ay dapat integers, hindi %s"
 
diff --git a/locale/fr.po b/locale/fr.po
index 2b2ebddf8a..edfab31a58 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -130,7 +130,7 @@ msgstr "échec de l'initialisation %q"
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "La longeur de %q doit être %d"
 
@@ -146,10 +146,6 @@ msgstr "La longeur de %q doit être <= %d"
 msgid "%q length must be >= %d"
 msgstr "La longeur de %q doit être >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "La longueur de %q doit être >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q doit être %d"
@@ -175,15 +171,7 @@ msgstr "%q doit être >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q doit être une chaîne de caractères"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q doit être un entier"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q doit être du type %q"
 
@@ -213,9 +201,9 @@ msgstr "%q est hors de porté"
 msgid "%q pin invalid"
 msgstr "broche %q invalide"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q avec un identifiant de rapport à 0 doit être de longueur 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -523,10 +511,6 @@ msgstr "La matrice doit contenir des demi-mots (type 'H')"
 msgid "Array values should be single bytes."
 msgstr "Les valeurs de la matrice doivent être des octets singuliers."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Au plus %d %q peut être spécifié (pas %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1314,10 +1298,6 @@ msgstr "Accès à la mémoire invalide."
 msgid "Invalid multicast MAC address"
 msgstr "Adresse MAC multicast invalide"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Broches invalides"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Taille invalide"
@@ -1559,11 +1539,6 @@ msgstr "Aucune clé n'a été spécifiée"
 msgid "No long integer support"
 msgstr "Pas de support pour chiffre entier long"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Pas plus de %d appareils HID autorisés"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Aucun réseau avec ce ssid"
@@ -2647,10 +2622,6 @@ msgstr "tampon trop petit"
 msgid "buffer too small for requested bytes"
 msgstr "tampon trop petit pour le nombre d'octets demandé"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorder n'est pas une chaîne"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "bytes length n'est pas un multiple de la taille d'un élément"
@@ -2693,14 +2664,10 @@ msgstr "ne peut pas assigner à une expression"
 msgid "can't cancel self"
 msgstr "ne peut pas s'annuler soi-même"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "impossible de convertir %q en %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "ne peut convertir %q à int"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2893,10 +2860,6 @@ msgstr "la couleur doit être entre 0x000000 et 0xffffff"
 msgid "comparison of int and uint"
 msgstr "comparaison entre int et uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "division complexe par zéro"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "valeurs complexes non supportées"
@@ -3002,12 +2965,7 @@ msgstr "les dimensions ne correspondent pas"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod ne sont pas implémentés pour uint"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "division par zéro"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "division par zéro"
 
@@ -3382,10 +3340,6 @@ msgstr "les vecteurs d'entrée doivent être de longueur égale"
 msgid "inputs are not iterable"
 msgstr "les entrées ne sont pas itérables"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "Le deuxième argument de int() doit être compris entre 2 et 36 inclus"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "interp n'est défini que pour les 1D itérables de taille identique"
@@ -3529,10 +3483,6 @@ msgstr "variable locale '%q' utilisée avant d'en connaitre le type"
 msgid "local variable referenced before assignment"
 msgstr "variable locale référencée avant d'être assignée"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "entiers longs non supportés dans cette build"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode non pris en charge par le périphérique"
@@ -4072,10 +4022,6 @@ msgstr "la longueur de sleep ne doit pas être négative"
 msgid "slice step can't be zero"
 msgstr "le pas 'step' de la tranche ne peut être zéro"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "le pas 'step' de la tranche ne peut être zéro"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "slice non-supporté"
@@ -4124,10 +4070,6 @@ msgstr "source_bitmap doit avoir une value_count de 8"
 msgid "start/end indices"
 msgstr "indices de début/fin"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "le pas 'step' doit être non nul"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop n'est pas accessible au démarrage"
@@ -4136,10 +4078,6 @@ msgstr "stop n'est pas accessible au démarrage"
 msgid "stream operation not supported"
 msgstr "opération de flux non supportée"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "les indices d'une chaîne doivent être des entiers, pas %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4173,10 +4111,6 @@ msgstr "erreur de syntaxe JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "erreur de syntaxe dans le descripteur d'uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() prend une séquence de longueur 9"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4458,10 +4392,6 @@ msgstr "Échec de xTaskCreate"
 msgid "y value out of bounds"
 msgstr "valeur y hors limites"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "'step' nul"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi doit être un ndarray"
@@ -4474,6 +4404,62 @@ 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 "%q length must be >= 1"
+#~ msgstr "La longueur de %q doit être >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q doit être une chaîne de caractères"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q doit être un entier"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q avec un identifiant de rapport à 0 doit être de longueur 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Au plus %d %q peut être spécifié (pas %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Broches invalides"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Pas plus de %d appareils HID autorisés"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorder n'est pas une chaîne"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "ne peut convertir %q à int"
+
+#~ msgid "complex division by zero"
+#~ msgstr "division complexe par zéro"
+
+#~ msgid "divide by zero"
+#~ msgstr "division par zéro"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr ""
+#~ "Le deuxième argument de int() doit être compris entre 2 et 36 inclus"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "entiers longs non supportés dans cette build"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "le pas 'step' de la tranche ne peut être zéro"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "le pas 'step' doit être non nul"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "les indices d'une chaîne doivent être des entiers, pas %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() prend une séquence de longueur 9"
+
+#~ msgid "zero step"
+#~ msgstr "'step' nul"
+
 #~ msgid "invalid traceback"
 #~ msgstr "traceback invalide"
 
diff --git a/locale/hi.po b/locale/hi.po
index 3442078b84..7c46dfeadd 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -118,7 +118,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -134,10 +134,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -163,15 +159,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -201,8 +189,8 @@ msgstr ""
 msgid "%q pin invalid"
 msgstr ""
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -511,10 +499,6 @@ msgstr ""
 msgid "Array values should be single bytes."
 msgstr ""
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr ""
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1260,10 +1244,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1501,11 +1481,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2545,10 +2520,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2590,14 +2561,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2781,10 +2748,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2887,12 +2850,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3264,10 +3222,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3405,10 +3359,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3943,10 +3893,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -3995,10 +3941,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4007,10 +3949,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4043,10 +3981,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4328,10 +4262,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0096ffdb40..93b911fc93 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -125,7 +125,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -141,10 +141,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -170,15 +166,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -208,8 +196,8 @@ msgstr "%q oltre il limite"
 msgid "%q pin invalid"
 msgstr "%q pin non valido"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -520,10 +508,6 @@ msgstr "Array deve avere mezzoparole (typo 'H')"
 msgid "Array values should be single bytes."
 msgstr "I valori dell'Array dovrebbero essere bytes singoli."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Almeno %d %q devono essere specificati (non %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1277,10 +1261,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Pin non validi"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1519,11 +1499,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2577,10 +2552,6 @@ msgstr "buffer troppo piccolo"
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2623,14 +2594,10 @@ msgstr "impossibile assegnare all'espressione"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, fuzzy, c-format
 msgid "can't convert %s to complex"
@@ -2816,10 +2783,6 @@ msgstr "il colore deve essere compreso tra 0x000000 e 0xffffff"
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "complex divisione per zero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "valori complessi non supportai"
@@ -2925,12 +2888,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "divisione per zero"
 
@@ -3303,10 +3261,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "il secondo argomanto di int() deve essere >= 2 e <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3449,10 +3403,6 @@ msgstr "locla '%q' utilizzato prima che il tipo fosse noto"
 msgid "local variable referenced before assignment"
 msgstr "variabile locale richiamata prima di un assegnamento"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int non supportata in questa build"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3993,10 +3943,6 @@ msgstr "la lunghezza di sleed deve essere non negativa"
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "la step della slice non può essere zero"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4045,10 +3991,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step deve essere non zero"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop non raggiungibile dall'inizio"
@@ -4057,10 +3999,6 @@ msgstr "stop non raggiungibile dall'inizio"
 msgid "stream operation not supported"
 msgstr "operazione di stream non supportata"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4093,10 +4031,6 @@ msgstr "errore di sintassi nel JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "errore di sintassi nel descrittore uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4380,10 +4314,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr "indirizzo fuori limite"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "zero step"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4396,6 +4326,30 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Almeno %d %q devono essere specificati (non %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Pin non validi"
+
+#~ msgid "complex division by zero"
+#~ msgstr "complex divisione per zero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "il secondo argomanto di int() deve essere >= 2 e <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int non supportata in questa build"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "la step della slice non può essere zero"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step deve essere non zero"
+
+#~ msgid "zero step"
+#~ msgstr "zero step"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "gli indici %q devono essere interi, non %s"
 
diff --git a/locale/ja.po b/locale/ja.po
index 226f0d33a1..637482c9f1 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -123,7 +123,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -139,10 +139,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -168,15 +164,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -206,8 +194,8 @@ msgstr "%q が範囲外"
 msgid "%q pin invalid"
 msgstr "%q ピンは無効"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -516,10 +504,6 @@ msgstr "array のタイプは16ビット ('H') でなければなりません"
 msgid "Array values should be single bytes."
 msgstr "Arrayの各値は1バイトでなければなりません"
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "最大で %d個の %q が指定できます（%d個でなく）"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1271,10 +1255,6 @@ msgstr "不正なメモリアクセス"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "ピンが不正"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1512,11 +1492,6 @@ msgstr "キーが指定されていません"
 msgid "No long integer support"
 msgstr "long integerに対応していません"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2559,10 +2534,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorderが文字列ではありません"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2604,14 +2575,10 @@ msgstr "式には代入できません"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "%qを%qに変換できません"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2797,10 +2764,6 @@ msgstr "色は0x000000から0xffffffでなければなりません"
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "複素数ゼロ除算"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2905,12 +2868,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "ゼロ除算 (division by zero)"
 
@@ -3283,10 +3241,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int()の第2引数は2以上36以下でなければなりません"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3424,10 +3378,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "このビルドはlong intに非対応"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3964,10 +3914,6 @@ msgstr "sleepの長さは非負数でなければなりません"
 msgid "slice step can't be zero"
 msgstr "スライスのステップは0にできません"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4016,10 +3962,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "stepは非ゼロ値でなければなりません"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4028,10 +3970,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr "ストリーム操作は非対応"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "文字列のインデクスは整数でなければなりません (%qでなく)"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "文字列ではなくbytesまたはbytesarrayが必要"
@@ -4064,10 +4002,6 @@ msgstr "JSONに構文エラーがあります"
 msgid "syntax error in uctypes descriptor"
 msgstr "uctypedディスクリプタの構文エラー"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time()は9要素のシーケンスを受け取ります"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4349,10 +4283,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr "yが範囲外"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "ステップが0"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "ziはndarrayでなければなりません"
@@ -4365,6 +4295,36 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "最大で %d個の %q が指定できます（%d個でなく）"
+
+#~ msgid "Invalid pins"
+#~ msgstr "ピンが不正"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorderが文字列ではありません"
+
+#~ msgid "complex division by zero"
+#~ msgstr "複素数ゼロ除算"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int()の第2引数は2以上36以下でなければなりません"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "このビルドはlong intに非対応"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "stepは非ゼロ値でなければなりません"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "文字列のインデクスは整数でなければなりません (%qでなく)"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time()は9要素のシーケンスを受け取ります"
+
+#~ msgid "zero step"
+#~ msgstr "ステップが0"
+
 #~ msgid "WatchDogTimer.timeout must be greater than 0"
 #~ msgstr "WatchDogTimer.timeoutは0以上でなければなりません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 9f192a7a50..be6a478270 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -119,7 +119,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -135,10 +135,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -164,15 +160,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -202,8 +190,8 @@ msgstr ""
 msgid "%q pin invalid"
 msgstr ""
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -512,10 +500,6 @@ msgstr ""
 msgid "Array values should be single bytes."
 msgstr ""
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr ""
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1263,10 +1247,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "핀이 유효하지 않습니다"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1504,11 +1484,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2549,10 +2524,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2594,14 +2565,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2785,10 +2752,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2891,12 +2854,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3268,10 +3226,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3409,10 +3363,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3947,10 +3897,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -3999,10 +3945,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4011,10 +3953,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4047,10 +3985,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4332,10 +4266,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4348,6 +4278,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Invalid pins"
+#~ msgstr "핀이 유효하지 않습니다"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다"
 
diff --git a/locale/nl.po b/locale/nl.po
index eff8d7e5f9..bade0bb402 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -121,7 +121,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -137,10 +137,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -166,15 +162,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -204,8 +192,8 @@ msgstr "%q buiten bereik"
 msgid "%q pin invalid"
 msgstr "%q pin onjuist"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -514,10 +502,6 @@ msgstr "Array moet halfwords (type 'H') bevatten"
 msgid "Array values should be single bytes."
 msgstr "Array waardes moet enkele bytes zijn."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Op zijn meest %d %q mogen worden gespecificeerd (niet %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1271,10 +1255,6 @@ msgstr "Ongeldig geheugen adres."
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Ongeldige pinnen"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1512,11 +1492,6 @@ msgstr "Een sleutel was niet gespecificeerd"
 msgid "No long integer support"
 msgstr "Geen lange integer ondersteuning"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Geen netwerk met dat SSID gevonden"
@@ -2575,10 +2550,6 @@ msgstr "buffer te klein"
 msgid "buffer too small for requested bytes"
 msgstr "buffer te klein voor gevraagde bytes"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorder is geen string"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "bytes lengte is geen veelvoud van itemgrootte"
@@ -2621,14 +2592,10 @@ msgstr "kan niet toewijzen aan expressie"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan %q niet naar %q converteren"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2812,10 +2779,6 @@ msgstr "kleur moet tussen 0x000000 en 0xffffff liggen"
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "complexe deling door 0"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "complexe waardes niet ondersteund"
@@ -2920,12 +2883,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "deling door nul"
 
@@ -3298,10 +3256,6 @@ msgstr "invoervectors moeten van gelijke lengte zijn"
 msgid "inputs are not iterable"
 msgstr "invoer is niet itereerbaar"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() argument 2 moet >=2 en <= 36 zijn"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3442,10 +3396,6 @@ msgstr "lokale '%q' gebruikt voordat type bekend is"
 msgid "local variable referenced before assignment"
 msgstr "verwijzing naar een (nog) niet toegewezen lokale variabele"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int wordt niet ondersteund in deze build"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + silent mode wordt niet ondersteund door randapparaat"
@@ -3980,10 +3930,6 @@ msgstr "de slaapduur mag niet negatief zijn"
 msgid "slice step can't be zero"
 msgstr "segmentstap mag niet nul zijn"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "segmentstap mag niet nul zijn"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4032,10 +3978,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "start/stop indices"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step mag geen nul zijn"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop is niet bereikbaar vanaf start"
@@ -4044,10 +3986,6 @@ msgstr "stop is niet bereikbaar vanaf start"
 msgid "stream operation not supported"
 msgstr "stream operatie niet ondersteund"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "string indices moeten integers zijn, geen %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "string niet ondersteund; gebruik bytes of bytearray"
@@ -4080,10 +4018,6 @@ msgstr "syntaxisfout in JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntaxisfout in uctypes aanduiding"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() accepteert een 9-rij"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4365,10 +4299,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr "y-waarde buiten bereik"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "nul-stap"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi moet een ndarray zijn"
@@ -4381,6 +4311,39 @@ 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 "At most %d %q may be specified (not %d)"
+#~ msgstr "Op zijn meest %d %q mogen worden gespecificeerd (niet %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Ongeldige pinnen"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorder is geen string"
+
+#~ msgid "complex division by zero"
+#~ msgstr "complexe deling door 0"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() argument 2 moet >=2 en <= 36 zijn"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int wordt niet ondersteund in deze build"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "segmentstap mag niet nul zijn"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step mag geen nul zijn"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "string indices moeten integers zijn, geen %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() accepteert een 9-rij"
+
+#~ msgid "zero step"
+#~ msgstr "nul-stap"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indexen moeten integers zijn, niet %s"
 
diff --git a/locale/pl.po b/locale/pl.po
index 7d7085a2c0..76227fef54 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -123,7 +123,7 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
 
@@ -139,10 +139,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -168,15 +164,7 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr ""
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr ""
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr ""
 
@@ -206,8 +194,8 @@ msgstr "%q poza zakresem"
 msgid "%q pin invalid"
 msgstr "nieprawidłowy pin %q"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
 msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
@@ -516,10 +504,6 @@ msgstr "Tablica musi zawierać pół-słowa (typ 'H')"
 msgid "Array values should be single bytes."
 msgstr "Wartości powinny być bajtami."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr ""
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1271,10 +1255,6 @@ msgstr "Nieprawidłowy dostęp do pamięci."
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Złe nóżki"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Nieprawidłowy rozmiar"
@@ -1512,11 +1492,6 @@ msgstr "Nie określono klucza"
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2556,10 +2531,6 @@ msgstr "zbyt mały bufor"
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2601,14 +2572,10 @@ msgstr "przypisanie do wyrażenia"
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "nie można dokonać konwersji %q na %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2792,10 +2759,6 @@ msgstr "kolor musi być pomiędzy 0x000000 a 0xffffff"
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "zespolone dzielenie przez zero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "wartości zespolone nieobsługiwane"
@@ -2899,12 +2862,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "dzielenie przez zero"
 
@@ -3276,10 +3234,6 @@ msgstr "wektory wejściowe muszą być równej długości"
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "argument 2 do int() busi być pomiędzy 2 a 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3417,10 +3371,6 @@ msgstr "local '%q' użyty zanim typ jest znany"
 msgid "local variable referenced before assignment"
 msgstr "zmienna lokalna użyta przed przypisaniem"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int jest nieobsługiwany"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3956,10 +3906,6 @@ msgstr "okres snu musi być nieujemny"
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "zerowy krok"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4008,10 +3954,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr "początkowe/końcowe indeksy"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step nie może być zerowe"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop nie jest osiągalne ze start"
@@ -4020,10 +3962,6 @@ msgstr "stop nie jest osiągalne ze start"
 msgid "stream operation not supported"
 msgstr "operacja na strumieniu nieobsługiwana"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "łańcuchy nieobsługiwane; użyj bytes lub bytearray"
@@ -4056,10 +3994,6 @@ msgstr "błąd składni w JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "błąd składni w deskryptorze uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() wymaga 9-elementowej sekwencji"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4341,10 +4275,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr "y poza zakresem"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "zerowy krok"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4357,6 +4287,30 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Invalid pins"
+#~ msgstr "Złe nóżki"
+
+#~ msgid "complex division by zero"
+#~ msgstr "zespolone dzielenie przez zero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "argument 2 do int() busi być pomiędzy 2 a 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int jest nieobsługiwany"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "zerowy krok"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step nie może być zerowe"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() wymaga 9-elementowej sekwencji"
+
+#~ msgid "zero step"
+#~ msgstr "zerowy krok"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indeks musi być liczbą całkowitą, a nie %s"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 979b7c632a..e768c6310e 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -127,7 +127,7 @@ msgstr "a inicialização do %q falhou"
 msgid "%q is %q"
 msgstr "%q é %q"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "O comprimento de %q deve ser %d"
 
@@ -143,10 +143,6 @@ msgstr "o comprimento de %q deve ser <= %d"
 msgid "%q length must be >= %d"
 msgstr "o comprimento de %q deve ser >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "o comprimento %q deve ser >=1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q deve ser %d"
@@ -172,15 +168,7 @@ msgstr "o %q deve ser >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q deve ser uma string"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q deve ser um inteiro"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q deve ser do tipo %q"
 
@@ -210,9 +198,9 @@ msgstr "%q fora do alcance"
 msgid "%q pin invalid"
 msgstr "%q pino inválido"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q com um relatório com ID de 0 deve ter comprimento 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -524,10 +512,6 @@ msgstr "Array deve conter meias palavras (tipo 'H')"
 msgid "Array values should be single bytes."
 msgstr "Os valores das matrizes devem ser bytes simples."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Pelo menos %d %q pode ser definido (não %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1299,10 +1283,6 @@ msgstr "O acesso da memória é inválido."
 msgid "Invalid multicast MAC address"
 msgstr "Endereço MAC multicast inválido"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Pinos inválidos"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Tamanho inválido"
@@ -1540,11 +1520,6 @@ msgstr "Nenhuma chave foi definida"
 msgid "No long integer support"
 msgstr "Não há compatibilidade com inteiro longo"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Não são permitidos mais do que %d dispositivos HID"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Não há rede com este ssid"
@@ -2628,10 +2603,6 @@ msgstr "o buffer é muito pequeno"
 msgid "buffer too small for requested bytes"
 msgstr "o buffer é pequeno demais para os bytes requisitados"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "a ordem dos bytes não é uma cadeia de caracteres"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "o comprimento dos bytes não é um múltiplo do tamanho do item"
@@ -2673,14 +2644,10 @@ msgstr "a expressão não pode ser atribuída"
 msgid "can't cancel self"
 msgstr "não é possível cancelar a si mesmo"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "não é possível converter %q para %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "Não é possível converter %q para int"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2870,10 +2837,6 @@ msgstr "cor deve estar entre 0x000000 e 0xffffff"
 msgid "comparison of int and uint"
 msgstr "comparação de int e uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "divisão complexa por zero"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "os valores complexos não compatíveis"
@@ -2979,12 +2942,7 @@ msgstr "as dimensões não coincidem"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod não implementado para uint"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "divido por zero"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "divisão por zero"
 
@@ -3359,10 +3317,6 @@ msgstr "os vetores da entrada devem ter o mesmo comprimento"
 msgid "inputs are not iterable"
 msgstr "as entradas não são iteráveis"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 deve ser >= 2 e <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "o interp é definido para iteráveis 1D com comprimento igual"
@@ -3503,10 +3457,6 @@ msgstr "o local '%q' usado antes do tipo conhecido"
 msgid "local variable referenced before assignment"
 msgstr "a variável local referenciada antes da atribuição"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "o long int não é suportado nesta compilação"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "o loopback + o modo silencioso não é suportado pelo periférico"
@@ -4048,10 +3998,6 @@ msgstr "a duração do sleep não deve ser negativo"
 msgid "slice step can't be zero"
 msgstr "a etapa da fatia não pode ser zero"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "a etapa da fatia não pode ser zero"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "fatia não suportada"
@@ -4100,10 +4046,6 @@ msgstr "o source_bitmap deve ter o value_count de 8"
 msgid "start/end indices"
 msgstr "os índices de início/fim"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "o passo deve ser diferente de zero"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop não está acessível a partir do início"
@@ -4112,10 +4054,6 @@ msgstr "stop não está acessível a partir do início"
 msgid "stream operation not supported"
 msgstr "a operação do fluxo não é compatível"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "a sequência dos índices devem ser inteiros, não %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "a string não é compatível; use bytes ou bytearray"
@@ -4148,10 +4086,6 @@ msgstr "erro de sintaxe no JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "houve um erro de sintaxe no descritor uctypes"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() leva uma sequência com 9"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4433,10 +4367,6 @@ msgstr "o xTaskCreate falhou"
 msgid "y value out of bounds"
 msgstr "o valor y está fora dos limites"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "passo zero"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi deve ser um ndarray"
@@ -4449,6 +4379,61 @@ 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 length must be >= 1"
+#~ msgstr "o comprimento %q deve ser >=1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q deve ser uma string"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q deve ser um inteiro"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q com um relatório com ID de 0 deve ter comprimento 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Pelo menos %d %q pode ser definido (não %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Pinos inválidos"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Não são permitidos mais do que %d dispositivos HID"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "a ordem dos bytes não é uma cadeia de caracteres"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "Não é possível converter %q para int"
+
+#~ msgid "complex division by zero"
+#~ msgstr "divisão complexa por zero"
+
+#~ msgid "divide by zero"
+#~ msgstr "divido por zero"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 deve ser >= 2 e <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "o long int não é suportado nesta compilação"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "a etapa da fatia não pode ser zero"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "o passo deve ser diferente de zero"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "a sequência dos índices devem ser inteiros, não %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() leva uma sequência com 9"
+
+#~ msgid "zero step"
+#~ msgstr "passo zero"
+
 #~ msgid "invalid traceback"
 #~ msgstr "rastreamento inválido"
 
diff --git a/locale/ru.po b/locale/ru.po
index 82b2965ead..4e16f66535 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -129,7 +129,7 @@ msgstr "Инициализация %q не удалась"
 msgid "%q is %q"
 msgstr "%q является %q"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "Длинна %q должна быть %d"
 
@@ -145,10 +145,6 @@ msgstr "Длинна %q должна быть <= %d"
 msgid "%q length must be >= %d"
 msgstr "Длинна %q должна быть >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "Длинна %q должна быть >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q должно быть %d"
@@ -174,15 +170,7 @@ msgstr "%q должно быть >= %d"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b', или 'B'"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q должно быть строкой"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q должно быть int"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q должно быть типа %q"
 
@@ -212,9 +200,9 @@ msgstr "%q вне диапазона"
 msgid "%q pin invalid"
 msgstr "Пин %q не допустим"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q с идентификатором отчёта 0 должен иметь длину 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -522,10 +510,6 @@ msgstr "Массив должен содержать полуслова (тип
 msgid "Array values should be single bytes."
 msgstr "Значения массива должны быть однобайтовыми."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Может быть указано не более %d %q (не %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1308,10 +1292,6 @@ msgstr "Неправильный доступ к памяти."
 msgid "Invalid multicast MAC address"
 msgstr "Неверный MAC-адрес multicast"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Недопустимые пины"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Неверный размер"
@@ -1552,11 +1532,6 @@ msgstr "Ключ не был указан"
 msgid "No long integer support"
 msgstr "Нет поддержки длинных целых чисел (long integer)"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Допускается не более %d HID устройств"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Нет сети с этим ssid"
@@ -2613,10 +2588,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2658,14 +2629,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2849,10 +2816,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2955,12 +2918,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3332,10 +3290,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3473,10 +3427,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -4011,10 +3961,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4063,10 +4009,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4075,10 +4017,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4111,10 +4049,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4396,10 +4330,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4412,6 +4342,28 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "Длинна %q должна быть >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q должно быть строкой"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q должно быть int"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q с идентификатором отчёта 0 должен иметь длину 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Может быть указано не более %d %q (не %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Недопустимые пины"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Допускается не более %d HID устройств"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "Индексы %q должны быть целыми числами, а не %s"
 
diff --git a/locale/sv.po b/locale/sv.po
index fd715cfc13..edb16acdd8 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -126,7 +126,7 @@ msgstr "%q init misslyckades"
 msgid "%q is %q"
 msgstr "%q är %q"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "längden på %q måste vara %d"
 
@@ -142,10 +142,6 @@ msgstr "längden på %q måste vara <= %d"
 msgid "%q length must be >= %d"
 msgstr "längden på %q måste vara >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "längden på %q måste vara >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q måste vara %d"
@@ -173,15 +169,7 @@ msgstr ""
 "%q måste vara en bytearray eller en array av typen \"h\", \"H\", \"b\" eller "
 "\"B\""
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q måste vara en sträng"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q måste vara en int"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q måste vara av typen %q"
 
@@ -211,9 +199,9 @@ msgstr "%q utanför intervallet"
 msgid "%q pin invalid"
 msgstr "Pinne %q ogiltig"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "%q med report-ID 0 måste ha längd 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -521,10 +509,6 @@ msgstr "Matrisen måste innehålla halfwords (typ \"H\")"
 msgid "Array values should be single bytes."
 msgstr "Matrisvärden ska bestå av enstaka bytes."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "Högst %d %q kan anges (inte %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1283,10 +1267,6 @@ msgstr "Ogiltig minnesåtkomst."
 msgid "Invalid multicast MAC address"
 msgstr "Ogiltig MAC-adress för multicast"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Ogiltiga pinnar"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
@@ -1525,11 +1505,6 @@ msgstr "Ingen nyckel angavs"
 msgid "No long integer support"
 msgstr "Inget stöd för långt heltal"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "Högst %d HID-enheter är tillåtna"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Inget nätverk med sådant ssid"
@@ -2601,10 +2576,6 @@ msgstr "buffert för liten"
 msgid "buffer too small for requested bytes"
 msgstr "buffert för liten för begärd längd"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorder är inte en sträng"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "bytelängd inte en multipel av storlek"
@@ -2646,14 +2617,10 @@ msgstr "kan inte tilldela uttryck"
 msgid "can't cancel self"
 msgstr "kan inte avbryta sig själv"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "kan inte konvertera %q till %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "kan inte konvertera %q till int"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2839,10 +2806,6 @@ msgstr "färg måste vara mellan 0x000000 och 0xffffff"
 msgid "comparison of int and uint"
 msgstr "jämförelse av int och uint"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "komplex division med noll"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "komplexa värden stöds inte"
@@ -2948,12 +2911,7 @@ msgstr "dimensioner matchar inte"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod inte implementerat för uint"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "division med noll"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "division med noll"
 
@@ -3327,10 +3285,6 @@ msgstr "indatavektorer måste ha samma längd"
 msgid "inputs are not iterable"
 msgstr "indata är inte iterbara"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "int() arg 2 måste vara >= 2 och <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "interp är definierad för 1D-iterabla med samma längd"
@@ -3471,10 +3425,6 @@ msgstr "lokal '%q' används innan typen är känd"
 msgid "local variable referenced before assignment"
 msgstr "lokal variabel refererad före tilldelning"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "long int stöds inte i denna build"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "loopback + tyst läge stöds inte av kringutrustning"
@@ -4010,10 +3960,6 @@ msgstr "värdet för sleep måste vara positivt"
 msgid "slice step can't be zero"
 msgstr "segmentsteg kan inte vara noll"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "segmentsteg kan inte vara noll"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "slice stöds inte"
@@ -4062,10 +4008,6 @@ msgstr "source_bitmap måste ha value_count av 8"
 msgid "start/end indices"
 msgstr "start-/slutindex"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "step måste vara icke-noll"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "stop kan inte nås från start"
@@ -4074,10 +4016,6 @@ msgstr "stop kan inte nås från start"
 msgid "stream operation not supported"
 msgstr "stream-åtgärd stöds inte"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "strängindex måste vara heltal, inte %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "sträng stöds inte; använd bytes eller bytearray"
@@ -4110,10 +4048,6 @@ msgstr "syntaxfel i JSON"
 msgid "syntax error in uctypes descriptor"
 msgstr "syntaxfel i uctypes deskriptor"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() kräver en 9-sekvens"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4395,10 +4329,6 @@ msgstr "xTaskCreate misslyckades"
 msgid "y value out of bounds"
 msgstr "y-värde utanför intervall"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "noll steg"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi måste vara en ndarray"
@@ -4411,6 +4341,61 @@ 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 length must be >= 1"
+#~ msgstr "längden på %q måste vara >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q måste vara en sträng"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q måste vara en int"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "%q med report-ID 0 måste ha längd 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "Högst %d %q kan anges (inte %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Ogiltiga pinnar"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "Högst %d HID-enheter är tillåtna"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorder är inte en sträng"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "kan inte konvertera %q till int"
+
+#~ msgid "complex division by zero"
+#~ msgstr "komplex division med noll"
+
+#~ msgid "divide by zero"
+#~ msgstr "division med noll"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "int() arg 2 måste vara >= 2 och <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "long int stöds inte i denna build"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "segmentsteg kan inte vara noll"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "step måste vara icke-noll"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "strängindex måste vara heltal, inte %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() kräver en 9-sekvens"
+
+#~ msgid "zero step"
+#~ msgstr "noll steg"
+
 #~ msgid "invalid traceback"
 #~ msgstr "Ogilitig källspårning"
 
diff --git a/locale/tr.po b/locale/tr.po
index 858e0ba4b3..3d78a8c0f9 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -130,7 +130,7 @@ msgstr "%q init başarısız oldu"
 msgid "%q is %q"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q boyutu %d olmalıdır"
 
@@ -146,10 +146,6 @@ msgstr "%q boyutu <= %d olmalıdır"
 msgid "%q length must be >= %d"
 msgstr "%q boyutu >= %d olmalıdır"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q boyutu >=1 olmalıdır"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q, %d olmalıdır"
@@ -175,15 +171,7 @@ msgstr "%q >= %d olmalıdır"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q 'h', 'H', 'b' yada 'B' tipi bir bytearray /array olmalı"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q bir string olmalıdır"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q bir tam sayı olmalıdır"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q, %q türünde olmalıdır"
 
@@ -213,9 +201,9 @@ msgstr "%q aralık dışında"
 msgid "%q pin invalid"
 msgstr "%q pini geçersiz"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "Rapor kimliği 0 olan %q, 1 uzunluğunda olmalıdır"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -524,10 +512,6 @@ msgstr "Dizi yarımsözcüklere sahip olmalıdır (tip 'H')"
 msgid "Array values should be single bytes."
 msgstr "Dizi değerleri tekil bytelar olmalıdır."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "En az %d %q belirtilmeli (%d değil)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1277,10 +1261,6 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr ""
@@ -1518,11 +1498,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2565,10 +2540,6 @@ msgstr ""
 msgid "buffer too small for requested bytes"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr ""
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr ""
@@ -2610,14 +2581,10 @@ msgstr ""
 msgid "can't cancel self"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr ""
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2801,10 +2768,6 @@ msgstr ""
 msgid "comparison of int and uint"
 msgstr ""
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr ""
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr ""
@@ -2907,12 +2870,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr ""
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr ""
 
@@ -3284,10 +3242,6 @@ msgstr ""
 msgid "inputs are not iterable"
 msgstr ""
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr ""
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
@@ -3425,10 +3379,6 @@ msgstr ""
 msgid "local variable referenced before assignment"
 msgstr ""
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr ""
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr ""
@@ -3963,10 +3913,6 @@ msgstr ""
 msgid "slice step can't be zero"
 msgstr ""
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr ""
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4015,10 +3961,6 @@ msgstr ""
 msgid "start/end indices"
 msgstr ""
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr ""
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr ""
@@ -4027,10 +3969,6 @@ msgstr ""
 msgid "stream operation not supported"
 msgstr ""
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr ""
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr ""
@@ -4063,10 +4001,6 @@ msgstr ""
 msgid "syntax error in uctypes descriptor"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4348,10 +4282,6 @@ msgstr ""
 msgid "y value out of bounds"
 msgstr ""
 
-#: py/objrange.c
-msgid "zero step"
-msgstr ""
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr ""
@@ -4364,6 +4294,21 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q length must be >= 1"
+#~ msgstr "%q boyutu >=1 olmalıdır"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q bir string olmalıdır"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q bir tam sayı olmalıdır"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "Rapor kimliği 0 olan %q, 1 uzunluğunda olmalıdır"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "En az %d %q belirtilmeli (%d değil)"
+
 #~ msgid "%q indices must be integers, not %s"
 #~ msgstr "%q indeksleri integer olmalı, %s değil"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index daa7721926..04ad1b28aa 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -129,7 +129,7 @@ msgstr "%q chūshǐhuà shībài"
 msgid "%q is %q"
 msgstr "%q shì %q"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q de chángdù bìxū shì %d"
 
@@ -145,10 +145,6 @@ msgstr "%q chángdù bìxū <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q chángdù bìxū >= %d"
 
-#: shared-bindings/busio/I2C.c
-msgid "%q length must be >= 1"
-msgstr "%q cháng dù bìxū >= 1"
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q bìxū %d"
@@ -175,15 +171,7 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'h', 'H', 'b', huò 'B' de shù zǔ"
 
-#: py/argcheck.c
-msgid "%q must be a string"
-msgstr "%q bìxū shì yí gè zì fú chuàn"
-
-#: py/argcheck.c
-msgid "%q must be an int"
-msgstr "%q bìxū shì zhěng xíng"
-
-#: py/argcheck.c py/obj.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
 msgstr "%q bì xū shì %q lèi xíng"
 
@@ -213,9 +201,9 @@ msgstr "%q chāochū fànwéi"
 msgid "%q pin invalid"
 msgstr "%q yǐn jiǎo wúxiào"
 
-#: shared-bindings/usb_hid/Device.c
-msgid "%q with a report ID of 0 must be of length 1"
-msgstr "bào gào ID shì 0 de %q bì xū cháng dù wéi 1"
+#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
+msgid "%q step cannot be zero"
+msgstr ""
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -523,10 +511,6 @@ msgstr "Shùzǔ bìxū bāohán halfwords (type 'H')"
 msgid "Array values should be single bytes."
 msgstr "shùzǔ de zhí yīnggāi shì dān'gè zìjié."
 
-#: shared-bindings/microcontroller/Pin.c
-msgid "At most %d %q may be specified (not %d)"
-msgstr "zuìduō kěyǐ zhǐdìng %d gè %q (érbúshì %d)"
-
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -1289,10 +1273,6 @@ msgstr "Wúxiào de nèicún fǎngwèn."
 msgid "Invalid multicast MAC address"
 msgstr "wú xiào de duō bō MAC dì zhǐ"
 
-#: shared-bindings/busio/UART.c
-msgid "Invalid pins"
-msgstr "Wúxiào de yǐn jiǎo"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
 msgstr "dà xiǎo wú xiào"
@@ -1531,11 +1511,6 @@ msgstr "Wèi zhǐdìng mì yào"
 msgid "No long integer support"
 msgstr "Méiyǒu zhǎng zhěngshù zhīchí"
 
-#: shared-module/usb_hid/__init__.c
-#, c-format
-msgid "No more than %d HID devices allowed"
-msgstr "bù yǔn xǔ chāo guò %d HID shè bèi"
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr "Méiyǒu wǎngluò yǔ gāi ssid"
@@ -2606,10 +2581,6 @@ msgstr "huǎnchōng qū tài xiǎo"
 msgid "buffer too small for requested bytes"
 msgstr "huǎn chōng qū tài xiǎo, duì yú qǐng qiú de zì jié"
 
-#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-msgid "byteorder is not a string"
-msgstr "byteorder bùshì zìfú chuàn"
-
 #: py/objarray.c
 msgid "bytes length not a multiple of item size"
 msgstr "zì jié chángdù, bùshì xiàngmù dàxiǎo de bèishù"
@@ -2651,14 +2622,10 @@ msgstr "bùnéng fēnpèi dào biǎodá shì"
 msgid "can't cancel self"
 msgstr "bù néng qǔ xiāo zì wǒ"
 
-#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
+#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr "Wúfǎ jiāng %q zhuǎnhuàn wèi %q"
 
-#: py/runtime.c
-msgid "can't convert %q to int"
-msgstr "wú fǎ jiāng %q zhuǎn huàn wéi nèi zài"
-
 #: py/obj.c
 #, c-format
 msgid "can't convert %s to complex"
@@ -2846,10 +2813,6 @@ msgstr "yánsè bìxū jiè yú 0x000000 hé 0xffffff zhī jiān"
 msgid "comparison of int and uint"
 msgstr "yīn tè hé wū yīn tè de bǐ jiào"
 
-#: py/objcomplex.c
-msgid "complex division by zero"
-msgstr "fùzá de fēngé wèi 0"
-
 #: py/objfloat.c py/parsenum.c
 msgid "complex values not supported"
 msgstr "bù zhīchí fùzá de zhí"
@@ -2954,12 +2917,7 @@ msgstr "chǐ cùn bù pǐ pèi"
 msgid "div/mod not implemented for uint"
 msgstr "div/ mó zǔ wèi wéi wèi shí xiàn"
 
-#: py/objfloat.c py/objint_mpz.c
-msgid "divide by zero"
-msgstr "chú yǐ líng"
-
-#: py/modmath.c py/objint_longlong.c py/runtime.c
-#: shared-bindings/math/__init__.c
+#: py/runtime.c
 msgid "division by zero"
 msgstr "bèi líng chú"
 
@@ -3333,10 +3291,6 @@ msgstr "shūrù xiàngliàng de chángdù bìxū xiāngděng"
 msgid "inputs are not iterable"
 msgstr "shū rù bù kě yí dòng"
 
-#: py/parsenum.c
-msgid "int() arg 2 must be >= 2 and <= 36"
-msgstr "zhěngshù() cānshù 2 bìxū > = 2 qiě <= 36"
-
 #: extmod/ulab/code/numpy/approx.c
 msgid "interp is defined for 1D iterables of equal length"
 msgstr "zhōng jiān wéi cháng dù xiāng děng de 1D kě yì jiāo qì dìng yì"
@@ -3475,10 +3429,6 @@ msgstr "běndì '%q' zài zhī lèixíng zhīqián shǐyòng"
 msgid "local variable referenced before assignment"
 msgstr "fùzhí qián yǐnyòng de júbù biànliàng"
 
-#: py/objint.c
-msgid "long int not supported in this build"
-msgstr "cǐ bǎnběn bù zhīchí zhǎng zhěngshù"
-
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "loopback + silent mode not supported by peripheral"
 msgstr "Wài shè bù zhī chí huán huí + jìng yīn mó shì"
@@ -4013,10 +3963,6 @@ msgstr "shuìmián chángdù bìxū shìfēi fùshù"
 msgid "slice step can't be zero"
 msgstr "qiēpiàn bù cháng bùnéng wéi líng"
 
-#: py/objslice.c
-msgid "slice step cannot be zero"
-msgstr "qiēpiàn bù bùnéng wéi líng"
-
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr "qiē piàn bù shòu zhī chí"
@@ -4068,10 +4014,6 @@ msgstr "yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū
 msgid "start/end indices"
 msgstr "kāishǐ/jiéshù zhǐshù"
 
-#: shared-bindings/random/__init__.c
-msgid "step must be non-zero"
-msgstr "bùzhòu bìxū shìfēi líng"
-
 #: shared-bindings/random/__init__.c
 msgid "stop not reachable from start"
 msgstr "tíngzhǐ wúfǎ cóng kāishǐ zhōng zhǎodào"
@@ -4080,10 +4022,6 @@ msgstr "tíngzhǐ wúfǎ cóng kāishǐ zhōng zhǎodào"
 msgid "stream operation not supported"
 msgstr "bù zhīchí liú cāozuò"
 
-#: py/objstrunicode.c
-msgid "string indices must be integers, not %q"
-msgstr "zìfú chuàn suǒyǐn bìxū shì zhěngshù, ér bùshì %q"
-
 #: py/stream.c
 msgid "string not supported; use bytes or bytearray"
 msgstr "zìfú chuàn bù zhīchí; shǐyòng zì jié huò zì jié zǔ"
@@ -4116,10 +4054,6 @@ msgstr "JSON yǔfǎ cuòwù"
 msgid "syntax error in uctypes descriptor"
 msgstr "uctypes miáoshù fú zhōng de yǔfǎ cuòwù"
 
-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes a 9-sequence"
-msgstr "time.struct_time() xūyào 9 xùliè"
-
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 #: ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -4401,10 +4335,6 @@ msgstr "xTaskCreate shī bài"
 msgid "y value out of bounds"
 msgstr "y zhí chāochū biānjiè"
 
-#: py/objrange.c
-msgid "zero step"
-msgstr "líng bù"
-
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
 msgstr "zi bìxū shì ndarray"
@@ -4417,6 +4347,61 @@ 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 length must be >= 1"
+#~ msgstr "%q cháng dù bìxū >= 1"
+
+#~ msgid "%q must be a string"
+#~ msgstr "%q bìxū shì yí gè zì fú chuàn"
+
+#~ msgid "%q must be an int"
+#~ msgstr "%q bìxū shì zhěng xíng"
+
+#~ msgid "%q with a report ID of 0 must be of length 1"
+#~ msgstr "bào gào ID shì 0 de %q bì xū cháng dù wéi 1"
+
+#~ msgid "At most %d %q may be specified (not %d)"
+#~ msgstr "zuìduō kěyǐ zhǐdìng %d gè %q (érbúshì %d)"
+
+#~ msgid "Invalid pins"
+#~ msgstr "Wúxiào de yǐn jiǎo"
+
+#, c-format
+#~ msgid "No more than %d HID devices allowed"
+#~ msgstr "bù yǔn xǔ chāo guò %d HID shè bèi"
+
+#~ msgid "byteorder is not a string"
+#~ msgstr "byteorder bùshì zìfú chuàn"
+
+#~ msgid "can't convert %q to int"
+#~ msgstr "wú fǎ jiāng %q zhuǎn huàn wéi nèi zài"
+
+#~ msgid "complex division by zero"
+#~ msgstr "fùzá de fēngé wèi 0"
+
+#~ msgid "divide by zero"
+#~ msgstr "chú yǐ líng"
+
+#~ msgid "int() arg 2 must be >= 2 and <= 36"
+#~ msgstr "zhěngshù() cānshù 2 bìxū > = 2 qiě <= 36"
+
+#~ msgid "long int not supported in this build"
+#~ msgstr "cǐ bǎnběn bù zhīchí zhǎng zhěngshù"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "qiēpiàn bù bùnéng wéi líng"
+
+#~ msgid "step must be non-zero"
+#~ msgstr "bùzhòu bìxū shìfēi líng"
+
+#~ msgid "string indices must be integers, not %q"
+#~ msgstr "zìfú chuàn suǒyǐn bìxū shì zhěngshù, ér bùshì %q"
+
+#~ msgid "time.struct_time() takes a 9-sequence"
+#~ msgstr "time.struct_time() xūyào 9 xùliè"
+
+#~ msgid "zero step"
+#~ msgstr "líng bù"
+
 #~ msgid "invalid traceback"
 #~ msgstr "wú xiào zhuī sù"
 

From 91b47d435da57cef67a66b8b954ae1dfc45975f5 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 1 Dec 2022 17:43:18 +0100
Subject: [PATCH 1499/2403] 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             | 9 +++++++++
 locale/cs.po             | 9 +++++++++
 locale/de_DE.po          | 9 +++++++++
 locale/el.po             | 9 +++++++++
 locale/en_GB.po          | 9 +++++++++
 locale/es.po             | 9 +++++++++
 locale/fil.po            | 9 +++++++++
 locale/fr.po             | 9 +++++++++
 locale/hi.po             | 9 +++++++++
 locale/it_IT.po          | 9 +++++++++
 locale/ja.po             | 9 +++++++++
 locale/ko.po             | 9 +++++++++
 locale/nl.po             | 9 +++++++++
 locale/pl.po             | 9 +++++++++
 locale/pt_BR.po          | 9 +++++++++
 locale/ru.po             | 9 +++++++++
 locale/sv.po             | 9 +++++++++
 locale/tr.po             | 9 +++++++++
 locale/zh_Latn_pinyin.po | 9 +++++++++
 19 files changed, 171 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 1252722c70..dcab44b0c3 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2284,6 +2284,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Jumlah item pada RHS  tidak cocok (diharapkan %d, didapatkan %d)."
@@ -3154,6 +3155,10 @@ msgstr "lapisan (padding) tidak benar"
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3529,6 +3534,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index a08a8c14f8..3d192db1b7 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2273,6 +2273,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3141,6 +3142,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3516,6 +3521,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 04a05d4b9a..6e9518ebef 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2312,6 +2312,7 @@ msgid "Unkown error code %d"
 msgstr "Unbekannter Fehlercode %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3212,6 +3213,10 @@ msgstr "padding ist inkorrekt"
 msgid "index is out of bounds"
 msgstr "Index ist außerhalb der Grenzen"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3593,6 +3598,10 @@ msgstr "negative Potenz ohne Gleitkomma (float) Unterstützung"
 msgid "negative shift count"
 msgstr "Negative shift Anzahl"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "keine SD-Karte"
diff --git a/locale/el.po b/locale/el.po
index 94f2418c97..6a2221bf79 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2282,6 +2282,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3150,6 +3151,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3525,6 +3530,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index de0d9a513a..d0ffe3f22b 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2286,6 +2286,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Unmatched number of items on RHS (expected %d, got %d)."
@@ -3160,6 +3161,10 @@ msgstr "incorrect padding"
 msgid "index is out of bounds"
 msgstr "index is out of bounds"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3535,6 +3540,10 @@ msgstr "negative power with no float support"
 msgid "negative shift count"
 msgstr "negative shift count"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "no SD card"
diff --git a/locale/es.po b/locale/es.po
index 4c78717f8f..b2a4e3c97b 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2318,6 +2318,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Número incomparable de elementos en RHS (%d esperado,%d obtenido)."
@@ -3200,6 +3201,10 @@ msgstr "relleno (padding) incorrecto"
 msgid "index is out of bounds"
 msgstr "el índice está fuera de límites"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3579,6 +3584,10 @@ msgstr "potencia negativa sin float support"
 msgid "negative shift count"
 msgstr "cuenta de corrimientos negativo"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "no hay tarjeta SD"
diff --git a/locale/fil.po b/locale/fil.po
index e74d2c1da3..e0d2c8b145 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2273,6 +2273,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3154,6 +3155,10 @@ msgstr "mali ang padding"
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3533,6 +3538,10 @@ msgstr "negatibong power na walang float support"
 msgid "negative shift count"
 msgstr "negative shift count"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index edfab31a58..407d64c643 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2343,6 +2343,7 @@ msgid "Unkown error code %d"
 msgstr "Erreur inconnue %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3240,6 +3241,10 @@ msgstr "espacement incorrect"
 msgid "index is out of bounds"
 msgstr "l'index est hors limites"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3622,6 +3627,10 @@ msgstr "puissance négative sans support des nombres à virgule flottante"
 msgid "negative shift count"
 msgstr "compte de décalage négatif"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "pas de carte SD"
diff --git a/locale/hi.po b/locale/hi.po
index 7c46dfeadd..d932a0d1f5 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2255,6 +2255,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3123,6 +3124,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3498,6 +3503,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 93b911fc93..487b45c1c8 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2283,6 +2283,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3162,6 +3163,10 @@ msgstr "padding incorretto"
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3542,6 +3547,10 @@ msgstr "potenza negativa senza supporto per float"
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 637482c9f1..b70c967cd9 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2269,6 +2269,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "右辺の要素数が一致しません (expected %d, got %d)"
@@ -3141,6 +3142,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3517,6 +3522,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr "シフトカウントが負数"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "SDカードがありません"
diff --git a/locale/ko.po b/locale/ko.po
index be6a478270..684e1ebda7 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2259,6 +2259,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3127,6 +3128,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3502,6 +3507,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index bade0bb402..6aaa68cd6d 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2279,6 +2279,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Niet overeenkomend aantal RHS items (verwachtte %d, kreeg %d)."
@@ -3157,6 +3158,10 @@ msgstr "vulling (padding) is onjuist"
 msgid "index is out of bounds"
 msgstr "index is buiten bereik"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3535,6 +3540,10 @@ msgstr "negatieve macht terwijl er geen ondersteuning is voor float"
 msgid "negative shift count"
 msgstr "negatieve verschuivingstelling (shift count)"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "geen SD kaart"
diff --git a/locale/pl.po b/locale/pl.po
index 76227fef54..f33e2b4e78 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2266,6 +2266,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Zła liczba obiektów po prawej stronie (oczekiwano %d, jest %d)."
@@ -3135,6 +3136,10 @@ msgstr "złe wypełnienie"
 msgid "index is out of bounds"
 msgstr "indeks jest poza zakresem"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3510,6 +3515,10 @@ msgstr "ujemna potęga, ale brak obsługi liczb zmiennoprzecinkowych"
 msgid "negative shift count"
 msgstr "ujemne przesunięcie"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e768c6310e..894a70e105 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2325,6 +2325,7 @@ msgid "Unkown error code %d"
 msgstr "Código de erro desconhecido %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Quantidade inigualável de itens no RHS (%d esperado, obteve %d)."
@@ -3217,6 +3218,10 @@ msgstr "preenchimento incorreto"
 msgid "index is out of bounds"
 msgstr "o índice está fora dos limites"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3598,6 +3603,10 @@ msgstr "potência negativa sem suporte de flutuação"
 msgid "negative shift count"
 msgstr "contagem de turnos negativos"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "nenhum cartão SD"
diff --git a/locale/ru.po b/locale/ru.po
index 4e16f66535..8b873461cf 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2323,6 +2323,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3191,6 +3192,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3566,6 +3571,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index edb16acdd8..7e09265ee9 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2301,6 +2301,7 @@ msgid "Unkown error code %d"
 msgstr "Okänd felkod %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Omatchat antal på RHS (förväntat %d, fick %d)."
@@ -3186,6 +3187,10 @@ msgstr "felaktig utfyllnad"
 msgid "index is out of bounds"
 msgstr "index är utanför gränserna"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3564,6 +3569,10 @@ msgstr "negativ exponent utan stöd för flyttal"
 msgid "negative shift count"
 msgstr "negativt skiftantal"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "inget SD-kort"
diff --git a/locale/tr.po b/locale/tr.po
index 3d78a8c0f9..20519bc2b6 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2275,6 +2275,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3143,6 +3144,10 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3518,6 +3523,10 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 04ad1b28aa..86c5ef2776 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2306,6 +2306,7 @@ msgid "Unkown error code %d"
 msgstr "wèi zhī cuò wù dài %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
+#: shared-module/adafruit_pixelbuf/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "RHS (yùqí %d, huòdé %d) shàng wèi pǐpèi de xiàngmù."
@@ -3192,6 +3193,10 @@ msgstr "bù zhèngquè de tiánchōng"
 msgid "index is out of bounds"
 msgstr "suǒyǐn chāochū fànwéi"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "index must be tuple or int"
+msgstr ""
+
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 #: shared-bindings/bitmaptools/__init__.c
@@ -3568,6 +3573,10 @@ msgstr "méiyǒu fú diǎn zhīchí de xiāojí gōnglǜ"
 msgid "negative shift count"
 msgstr "fù zhuǎnyí jìshù"
 
+#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+msgid "nested index must be int"
+msgstr ""
+
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr "méiyǒu SD kǎ"

From 42f1d50acc37de1cbe5834bd27b7a45f42955aef Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Thu, 1 Dec 2022 17:25:36 -0600
Subject: [PATCH 1500/2403] remove extra function call. handle show(None) for
 framebuffer and epaper

---
 shared-module/displayio/Display.c                | 2 +-
 shared-module/displayio/EPaperDisplay.c          | 3 +++
 shared-module/framebufferio/FramebufferDisplay.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 1f7891dc17..8367e23b59 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -142,7 +142,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
     if (root_group == NULL) {
-        return displayio_display_core_set_root_group(&self->core, &circuitpython_splash);
+        root_group = &circuitpython_splash;
     }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 68464d50ea..09bd5d6897 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -103,6 +103,9 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
 }
 
 bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group) {
+    if (root_group == NULL) {
+        root_group = &circuitpython_splash;
+    }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 7575523166..70a0e6639d 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -102,6 +102,9 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
 }
 
 bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) {
+    if (root_group == NULL) {
+        root_group = &circuitpython_splash;
+    }
     return displayio_display_core_set_root_group(&self->core, root_group);
 }
 

From 57462092b5be52dc13b9b02a79bdd58f1aaac9a3 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Thu, 1 Dec 2022 17:34:43 -0600
Subject: [PATCH 1501/2403] return None instead of NULL for framebuffer and
 epaper

---
 shared-module/displayio/EPaperDisplay.c          | 3 +++
 shared-module/framebufferio/FramebufferDisplay.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 09bd5d6897..d876599650 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -247,6 +247,9 @@ uint16_t common_hal_displayio_epaperdisplay_get_rotation(displayio_epaperdisplay
 }
 
 mp_obj_t common_hal_displayio_epaperdisplay_get_root_group(displayio_epaperdisplay_obj_t *self) {
+    if (self->core.current_group == NULL) {
+        return mp_const_none;
+    }
     return self->core.current_group;
 }
 
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 70a0e6639d..3d66370c04 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -363,6 +363,9 @@ void framebufferio_framebufferdisplay_reset(framebufferio_framebufferdisplay_obj
 }
 
 mp_obj_t common_hal_framebufferio_framebufferdisplay_get_root_group(framebufferio_framebufferdisplay_obj_t *self) {
+    if (self->core.current_group == NULL) {
+        return mp_const_none;
+    }
     return self->core.current_group;
 }
 

From 7583ccad2a4f86548467576a1cd3247c0ce4b573 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 1 Dec 2022 19:27:49 -0600
Subject: [PATCH 1502/2403] Ensure orderly shutdown of ssl socket

A crash would occur if an SSL socket was not shut down before
`gc_deinit()`.

I do not fully understand the root cause, but some object deinitialization
/ deallocation prior to `gc_deinit` leaves the SSL object in an
inconsistent state.

Rather than resolve the root cause, instead ensure that the closing of
the user socket also closes the SSL socket.

Closes: #6502
---
 .../espressif/common-hal/socketpool/Socket.c  | 25 +++++++++++++------
 .../espressif/common-hal/socketpool/Socket.h  |  1 +
 ports/espressif/common-hal/ssl/SSLContext.c   |  1 +
 ports/espressif/common-hal/ssl/SSLSocket.h    |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 5f34d674b2..edaed97598 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -31,6 +31,8 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 #include "shared-bindings/socketpool/SocketPool.h"
+#include "shared-bindings/ssl/SSLSocket.h"
+#include "common-hal/ssl/SSLSocket.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/workflow.h"
@@ -44,7 +46,7 @@
 StackType_t socket_select_stack[2 * configMINIMAL_STACK_SIZE];
 
 STATIC int open_socket_fds[CONFIG_LWIP_MAX_SOCKETS];
-STATIC bool user_socket[CONFIG_LWIP_MAX_SOCKETS];
+STATIC socketpool_socket_obj_t *user_socket[CONFIG_LWIP_MAX_SOCKETS];
 StaticTask_t socket_select_task_handle;
 STATIC int socket_change_fd = -1;
 
@@ -117,7 +119,7 @@ void socket_user_reset(void) {
 
         for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
             open_socket_fds[i] = -1;
-            user_socket[i] = false;
+            user_socket[i] = NULL;
         }
         socket_change_fd = eventfd(0, 0);
         // Run this at the same priority as CP so that the web workflow background task can be
@@ -134,12 +136,13 @@ void socket_user_reset(void) {
 
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
         if (open_socket_fds[i] >= 0 && user_socket[i]) {
+            common_hal_socketpool_socket_close(user_socket[i]);
             int num = open_socket_fds[i];
             // Close automatically clears socket handle
             lwip_shutdown(num, SHUT_RDWR);
             lwip_close(num);
             open_socket_fds[i] = -1;
-            user_socket[i] = false;
+            user_socket[i] = NULL;
         }
     }
 }
@@ -171,10 +174,10 @@ STATIC void unregister_open_socket(int fd) {
     }
 }
 
-STATIC void mark_user_socket(int fd) {
+STATIC void mark_user_socket(int fd, socketpool_socket_obj_t *obj) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
         if (open_socket_fds[i] == fd) {
-            user_socket[i] = true;
+            user_socket[i] = obj;
             return;
         }
     }
@@ -236,7 +239,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
     if (!socketpool_socket(self, family, type, sock)) {
         mp_raise_RuntimeError(translate("Out of sockets"));
     }
-    mark_user_socket(sock->num);
+    mark_user_socket(sock->num, sock);
     return sock;
 }
 
@@ -292,12 +295,12 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
 
 socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
     uint8_t *ip, uint32_t *port) {
+    socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
     int newsoc = socketpool_socket_accept(self, ip, port, NULL);
 
     if (newsoc > 0) {
-        mark_user_socket(newsoc);
         // Create the socket
-        socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
+        mark_user_socket(newsoc, sock);
         sock->base.type = &socketpool_socket_type;
         sock->num = newsoc;
         sock->pool = self->pool;
@@ -338,6 +341,12 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
 }
 
 void socketpool_socket_close(socketpool_socket_obj_t *self) {
+    if (self->ssl_socket) {
+        ssl_sslsocket_obj_t *ssl_socket = self->ssl_socket;
+        self->ssl_socket = NULL;
+        common_hal_ssl_sslsocket_close(ssl_socket);
+        return;
+    }
     self->connected = false;
     if (self->num >= 0) {
         lwip_shutdown(self->num, SHUT_RDWR);
diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h
index b91419807c..b189889cfd 100644
--- a/ports/espressif/common-hal/socketpool/Socket.h
+++ b/ports/espressif/common-hal/socketpool/Socket.h
@@ -42,6 +42,7 @@ typedef struct {
     int ipproto;
     bool connected;
     socketpool_socketpool_obj_t *pool;
+    struct ssl_sslsocket_obj *ssl_socket;
     mp_uint_t timeout_ms;
 } socketpool_socket_obj_t;
 
diff --git a/ports/espressif/common-hal/ssl/SSLContext.c b/ports/espressif/common-hal/ssl/SSLContext.c
index 386986e6be..1923a9c2a9 100644
--- a/ports/espressif/common-hal/ssl/SSLContext.c
+++ b/ports/espressif/common-hal/ssl/SSLContext.c
@@ -48,6 +48,7 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
     sock->base.type = &ssl_sslsocket_type;
     sock->ssl_context = self;
     sock->sock = socket;
+    socket->ssl_socket = sock;
 
     // Create a copy of the ESP-TLS config object and store the server hostname
     // Note that ESP-TLS will use common_name for both SNI and verification
diff --git a/ports/espressif/common-hal/ssl/SSLSocket.h b/ports/espressif/common-hal/ssl/SSLSocket.h
index 097f19857b..6b65a56223 100644
--- a/ports/espressif/common-hal/ssl/SSLSocket.h
+++ b/ports/espressif/common-hal/ssl/SSLSocket.h
@@ -34,7 +34,7 @@
 
 #include "components/esp-tls/esp_tls.h"
 
-typedef struct {
+typedef struct ssl_sslsocket_obj {
     mp_obj_base_t base;
     socketpool_socket_obj_t *sock;
     esp_tls_t *tls;

From 255e9973450acb8769038307f09a1aff23eb2b23 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 1 Dec 2022 17:39:49 -0800
Subject: [PATCH 1503/2403] Rework the analogbufio API.

* read() is now readinto() and takes the buffer to write into.
* readinto() returns the number of valid samples.
* readinto() can be interrupted by ctrl-c.
* readinto() API doesn't support signed numbers because it never did.
* sample_rate is now required in the constructor because supported
  values will vary per-port.
* 16 bit values are full range. 12 bit samples from RP2040 are stretched
  in the same way they are for AnalogIn.

Fixes #7226
---
 locale/circuitpython.pot                      |   3 +
 .../common-hal/analogbufio/BufferedIn.c       | 106 +++++++++++-------
 .../common-hal/analogbufio/BufferedIn.h       |   7 --
 shared-bindings/analogbufio/BufferedIn.c      |  89 +++++++--------
 shared-bindings/analogbufio/BufferedIn.h      |   4 +-
 shared-bindings/analogbufio/__init__.c        |  16 ---
 6 files changed, 108 insertions(+), 117 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 3958d2869a..d8e6d69c2f 100755
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -159,6 +159,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index 951c07af03..1b0a0d684a 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -33,6 +33,7 @@
 #include "common-hal/analogbufio/BufferedIn.h"
 #include "shared-bindings/analogbufio/BufferedIn.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
@@ -42,13 +43,18 @@
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 
-void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) {
+#define ADC_CLOCK_INPUT 48000000
+#define ADC_MAX_CLOCK_DIV (1 << (ADC_DIV_INT_MSB - ADC_DIV_INT_LSB + 1))
 
+void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint32_t sample_rate) {
     // Make sure pin number is in range for ADC
     if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
         raise_ValueError_invalid_pins();
     }
 
+    // Validate sample rate here
+    sample_rate = (uint32_t)mp_arg_validate_int_range(sample_rate, ADC_CLOCK_INPUT / ADC_MAX_CLOCK_DIV, ADC_CLOCK_INPUT / 96, MP_QSTR_sample_rate);
+
     // Set pin and channel
     self->pin = pin;
     claim_pin(pin);
@@ -56,45 +62,13 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     // TODO: find a way to accept ADC4 for temperature
     self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
 
-    // Set buffer and length
-    self->buffer = buffer;
-    self->len = len;
-
-    // Set sample rate - used in read
-    self->bytes_per_sample = bytes_per_sample;
-    self->sample_rate = sample_rate;
-
     // Init GPIO for analogue use: hi-Z, no pulls, disable digital input buffer.
+    // TODO: Make sure we share the ADC well. Right now we just assume it is
+    // unused.
     adc_init();
     adc_gpio_init(pin->number);
     adc_select_input(self->chan); // chan = pin - 26 ??
 
-    // RP2040 Implementation Detail
-    // Fills the supplied buffer with ADC values using DMA transfer.
-    // If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
-    // If buffer is 16-bit, then values are not shifted and error bit is present.
-    // Number of transfers is always the number of samples which is the array
-    // byte length divided by the bytes_per_sample.
-
-    // self->bytes_per_sample == 1
-    uint dma_size = DMA_SIZE_8;
-    bool show_error_bit = false;
-    bool shift_sample_8_bits = true;
-    if (self->bytes_per_sample == 2) {
-        dma_size = DMA_SIZE_16;
-        show_error_bit = true;
-        shift_sample_8_bits = false;
-    }
-
-    // adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
-    adc_fifo_setup(
-        true,               // Write each completed conversion to the sample FIFO
-        true,               // Enable DMA data request (DREQ)
-        1,                  // DREQ (and IRQ) asserted when at least 1 sample present
-        show_error_bit,     // See the ERR bit
-        shift_sample_8_bits // Shift each sample to 8 bits when pushing to FIFO
-        );
-
     // Divisor of 0 -> full speed. Free-running capture with the divider is
     // equivalent to pressing the ADC_CS_START_ONCE button once per `div + 1`
     // cycles (div not necessarily an integer). Each conversion takes 96
@@ -104,7 +78,9 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     // sample rate determines divisor, not zero.
 
     // sample_rate is forced to be >= 1 in shared-bindings
-    adc_set_clkdiv((float)48000000.0 / (float)self->sample_rate);
+    float clk_div = (float)ADC_CLOCK_INPUT / (float)sample_rate;
+    mp_printf(&mp_plat_print, "clk_div %f for %d\n", (double)clk_div, sample_rate);
+    adc_set_clkdiv(clk_div);
 
     // Set up the DMA to start transferring data as soon as it appears in FIFO
     uint dma_chan = dma_claim_unused_channel(true);
@@ -114,7 +90,6 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     self->cfg = dma_channel_get_default_config(dma_chan);
 
     // Reading from constant address, writing to incrementing byte addresses
-    channel_config_set_transfer_data_size(&(self->cfg), dma_size);
     channel_config_set_read_increment(&(self->cfg), false);
     channel_config_set_write_increment(&(self->cfg), true);
 
@@ -143,14 +118,36 @@ void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self
     dma_channel_unclaim(self->dma_chan);
 }
 
-void common_hal_analogbufio_bufferedin_read(analogbufio_bufferedin_obj_t *self) {
+uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t *self, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample) {
+    // RP2040 Implementation Detail
+    // Fills the supplied buffer with ADC values using DMA transfer.
+    // If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
+    // If buffer is 16-bit, then values are not shifted and error bit is present.
+    // Number of transfers is always the number of samples which is the array
+    // byte length divided by the bytes_per_sample.
+    uint dma_size = DMA_SIZE_8;
+    bool show_error_bit = false;
+    if (bytes_per_sample == 2) {
+        dma_size = DMA_SIZE_16;
+        show_error_bit = true;
+    }
 
-    uint32_t cdl = self->len / self->bytes_per_sample;
+    adc_fifo_setup(
+        true,                 // Write each completed conversion to the sample FIFO
+        true,                 // Enable DMA data request (DREQ)
+        1,                    // DREQ (and IRQ) asserted when at least 1 sample present
+        show_error_bit,       // See the ERR bit
+        bytes_per_sample == 1 // Shift each sample to 8 bits when pushing to FIFO
+        );
+
+    uint32_t sample_count = len / bytes_per_sample;
+
+    channel_config_set_transfer_data_size(&(self->cfg), dma_size);
 
     dma_channel_configure(self->dma_chan, &(self->cfg),
-        self->buffer,   // dst
+        buffer,   // dst
         &adc_hw->fifo,  // src
-        cdl,            // transfer count
+        sample_count,   // transfer count
         true            // start immediately
         );
 
@@ -159,9 +156,34 @@ void common_hal_analogbufio_bufferedin_read(analogbufio_bufferedin_obj_t *self)
 
     // Once DMA finishes, stop any new conversions from starting, and clean up
     // the FIFO in case the ADC was still mid-conversion.
-    dma_channel_wait_for_finish_blocking(self->dma_chan);
+    uint32_t remaining_transfers = sample_count;
+    while (dma_channel_is_busy(self->dma_chan) &&
+           !mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+    }
+    remaining_transfers = dma_channel_hw_addr(self->dma_chan)->transfer_count;
 
     //  Clean up
     adc_run(false);
+    // Stopping early so abort.
+    if (dma_channel_is_busy(self->dma_chan)) {
+        dma_channel_abort(self->dma_chan);
+    }
     adc_fifo_drain();
+
+    size_t captured_count = sample_count - remaining_transfers;
+    if (dma_size == DMA_SIZE_16) {
+        uint16_t *buf16 = (uint16_t *)buffer;
+        for (size_t i = 0; i < captured_count; i++) {
+            uint16_t value = buf16[i];
+            // Check the error bit and "truncate" the buffer if there is an error.
+            if ((value & ADC_FIFO_ERR_BITS) != 0) {
+                captured_count = i;
+                break;
+            }
+            // Scale the values to the standard 16 bit range.
+            buf16[i] = (value << 4) | (value >> 8);
+        }
+    }
+    return captured_count;
 }
diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
index 8b183a1d70..8ed4cf3a2c 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
@@ -41,16 +41,9 @@
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
-    uint8_t *buffer;
-    uint32_t len;
-    uint8_t bytes_per_sample;
-    bool samples_signed;
-    uint32_t sample_rate;
     uint8_t chan;
     uint dma_chan;
     dma_channel_config cfg;
 } analogbufio_bufferedin_obj_t;
 
-void bufferedin_init(void);
-
 #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 8bdc1b0ea8..d6c6b4a46e 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -49,8 +49,8 @@
 //|         length = 1000
 //|         mybuffer = array.array("H", 0x0000 for i in range(length))
 //|         rate = 500000
-//|         adcbuf = analogbufio.BufferedIn(board.GP26, mybuffer, rate)
-//|         adcbuf.read()
+//|         adcbuf = analogbufio.BufferedIn(board.GP26, sample_rate=rate)
+//|         adcbuf.readinto(mybuffer)
 //|         adcbuf.deinit()
 //|         for i in range(length):
 //|             print(i, mybuffer[i])
@@ -60,26 +60,17 @@
 //|         (TODO) Provide mechanism to read CPU Temperature."""
 //|
 
-//|     def __init__(
-//|         self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000
-//|     ) -> None:
-//|         """Create a `BufferedIn` on the given pin. ADC values will be read
-//|            into the given buffer at the supplied sample_rate. Depending on the
-//|            buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
-//|            16-bit half-words and are signed or unsigned.
-//|            The ADC most significant bits of the ADC are kept. (See
-//|            https://docs.circuitpython.org/en/latest/docs/library/array.html)
+//|     def __init__(self, pin: microcontroller.Pin, *, sample_rate: int) -> None:
+//|         """Create a `BufferedIn` on the given pin and given sample rate.
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from
-//|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples
 //|         :param ~int sample_rate: rate: sampling frequency, in samples per second"""
 //|         ...
 STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_pin, ARG_buffer, ARG_sample_rate };
+    enum { ARG_pin, ARG_sample_rate };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pin,    MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 500000} },
+        { MP_QSTR_sample_rate, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -87,37 +78,12 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
     // Validate Pin
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
 
-    // Buffer defined and allocated by user
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
-
-    // signed or unsigned, byte per sample
-    bool signed_samples = bufinfo.typecode == 'b' || bufinfo.typecode == 'h';
-    uint8_t bytes_per_sample = 1;
-
-    // Bytes Per Sample
-    if (bufinfo.typecode == 'h' || bufinfo.typecode == 'H') {
-        bytes_per_sample = 2;
-    } else if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError_varg(translate("%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"), MP_QSTR_buffer);
-    }
-
-    // Validate sample rate here
-    uint32_t sample_rate = (uint32_t)mp_arg_validate_int_range(args[ARG_sample_rate].u_int, 1, 500000, MP_QSTR_sample_rate);
-
     // Create local object
-    analogbufio_bufferedin_obj_t *self = m_new_obj(analogbufio_bufferedin_obj_t);
+    analogbufio_bufferedin_obj_t *self = m_new_obj_with_finaliser(analogbufio_bufferedin_obj_t);
     self->base.type = &analogbufio_bufferedin_type;
 
-    // Call local intereface in ports/common-hal/analogbufio
-    common_hal_analogbufio_bufferedin_construct(self,
-        pin,
-        ((uint8_t *)bufinfo.buf),
-        bufinfo.len,
-        bytes_per_sample,
-        signed_samples,
-        sample_rate
-        );
+    // Call local interface in ports/common-hal/analogbufio
+    common_hal_analogbufio_bufferedin_construct(self, pin, args[ARG_sample_rate].u_int);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -153,23 +119,46 @@ STATIC mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *a
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, 4, 4, analogbufio_bufferedin___exit__);
 
-//|     def read(self) -> None:
-//|         """Fills the provided buffer with ADC voltage values."""
+//|     def readinto(self, buffer: WriteableBuffer) -> int:
+//|         """Fills the provided buffer with ADC voltage values.
+//|
+//|         ADC values will be read into the given buffer at the supplied sample_rate.
+//|         Depending on the buffer typecode, 'B', 'H', samples are 8-bit byte-arrays or
+//|         16-bit half-words and are always unsigned.
+//|         The ADC most significant bits of the ADC are kept. (See
+//|         https://docs.circuitpython.org/en/latest/docs/library/array.html)
+//|
+//|         :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples"""
 //|         ...
 //|
-STATIC mp_obj_t analogbufio_bufferedin_obj_read(mp_obj_t self_in) {
+STATIC mp_obj_t analogbufio_bufferedin_obj_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) {
     analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    common_hal_analogbufio_bufferedin_read(self);
-    return mp_const_none;
+
+    // Buffer defined and allocated by user
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buffer_obj, &bufinfo, MP_BUFFER_READ);
+
+    uint8_t bytes_per_sample = 1;
+
+    // Bytes Per Sample
+    if (bufinfo.typecode == 'H') {
+        bytes_per_sample = 2;
+    } else if (bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError_varg(translate("%q must be a bytearray or array of type 'H' or 'B'"), MP_QSTR_buffer);
+    }
+
+    mp_uint_t captured = common_hal_analogbufio_bufferedin_readinto(self, bufinfo.buf, bufinfo.len, bytes_per_sample);
+    return MP_OBJ_NEW_SMALL_INT(captured);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_read_obj, analogbufio_bufferedin_obj_read);
+MP_DEFINE_CONST_FUN_OBJ_2(analogbufio_bufferedin_readinto_obj, analogbufio_bufferedin_obj_readinto);
 
 STATIC const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__),    MP_ROM_PTR(&analogbufio_bufferedin_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),     MP_ROM_PTR(&analogbufio_bufferedin_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__),  MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__),   MP_ROM_PTR(&analogbufio_bufferedin___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_read),       MP_ROM_PTR(&analogbufio_bufferedin_read_obj)},
+    { MP_ROM_QSTR(MP_QSTR_readinto),       MP_ROM_PTR(&analogbufio_bufferedin_readinto_obj)},
 
 };
 
diff --git a/shared-bindings/analogbufio/BufferedIn.h b/shared-bindings/analogbufio/BufferedIn.h
index 7d59720cb4..cfd8050bc5 100644
--- a/shared-bindings/analogbufio/BufferedIn.h
+++ b/shared-bindings/analogbufio/BufferedIn.h
@@ -32,9 +32,9 @@
 
 extern const mp_obj_type_t analogbufio_bufferedin_type;
 
-void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate);
+void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint32_t sample_rate);
 void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self);
 bool common_hal_analogbufio_bufferedin_deinited(analogbufio_bufferedin_obj_t *self);
-void common_hal_analogbufio_bufferedin_read(analogbufio_bufferedin_obj_t *self);
+uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t *self, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample);
 
 #endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGBUFIO_BUFFEREDIN_H__
diff --git a/shared-bindings/analogbufio/__init__.c b/shared-bindings/analogbufio/__init__.c
index 49463d6334..749f1aec09 100644
--- a/shared-bindings/analogbufio/__init__.c
+++ b/shared-bindings/analogbufio/__init__.c
@@ -40,22 +40,6 @@
 //| call :py:meth:`!deinit` or use a context manager. See
 //| :ref:`lifetime-and-contextmanagers` for more info.
 //|
-//| For example::
-//|
-//|   import analogbufio
-//|   import array
-//|   from board import *
-//|
-//|   length = 5000000
-//|   mybuffer = array.array("H", 0x0000 for i in range(length))
-//|   adc_in = analogbufio.BufferedIn(GP26, mybuffer, length)
-//|   analogbufio.read()
-//|   print(*mybuffer)
-//|   adc_in.deinit()
-//|
-//| This example will initialize the the device, read and fill
-//| :py:data:`~analogbufio.BufferedIn` to mybuffer
-//|
 //| TODO: For the essentials of `analogbufio`, see the `CircuitPython Essentials
 //| Learn guide `_
 //|

From 7ceca0cbb2c36e275131b80fde3ff1922eddc62e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 1 Dec 2022 19:41:28 -0600
Subject: [PATCH 1504/2403] fix display of the 'host not found' message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The conversion of characters like _space_ in qstrs is a bit
ad-hoc. Because "_not_" stands for the logical negation character ¬
the recently added message was displayed incorrectly:
```
>>> socket.getaddrinfo('does.not.exist', 0)
Traceback (most recent call last):
  File "", line 1, in 
gaierror: (-2, 'Name or service_space¬space_known')
```
I had noticed this, but evidently failed to include the fix in
the problem in #7269.
---
 py/makeqstrdefs.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index f035ed5745..974227f2a5 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -65,6 +65,7 @@ name2codepoint["tilde"] = ord("~")
 # These are just vexing!
 del name2codepoint["and"]
 del name2codepoint["or"]
+del name2codepoint["not"]
 
 
 def preprocess():

From ded0ee4816b6aee4fd3a9f1a624e93c91b534f62 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 1 Dec 2022 17:54:41 -0800
Subject: [PATCH 1505/2403] Fix MDNS hostname mangling

cpy-MAC hostnames were being mangled on circuitpython.local
conflicts.

Fixes #6869
---
 .gitmodules             | 2 +-
 ports/espressif/esp-idf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ae413799c7..3c0128f77d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -146,7 +146,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython8
+	branch = release/v4.4-circuitpython
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = lib/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 26716e006d..20c6d4a623 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 26716e006d68e5a584ac29b85d9e2979563fc827
+Subproject commit 20c6d4a623a9391afd0e803b2bbebe020ed15ec8

From 42e7981b4f961b5829285463ec56f48f0093bb0a Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 1 Dec 2022 18:23:01 +0000
Subject: [PATCH 1506/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (982 of 982 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 7e09265ee9..d95ca33b5f 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: 2022-11-30 20:18+0000\n"
+"PO-Revision-Date: 2022-12-02 01:55+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -201,7 +201,7 @@ msgstr "Pinne %q ogiltig"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "%q steg kan inte vara noll"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -3189,7 +3189,7 @@ msgstr "index är utanför gränserna"
 
 #: shared-bindings/adafruit_pixelbuf/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "index måste vara tuple eller int"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3571,7 +3571,7 @@ msgstr "negativt skiftantal"
 
 #: shared-bindings/adafruit_pixelbuf/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "nästlat index måste vara en int"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"

From 6a34f51465c5e71b0e30f6abe9a80119d5d7de42 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 2 Dec 2022 02:55:28 +0100
Subject: [PATCH 1507/2403] 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             | 16 ++++++++++++++++
 locale/de_DE.po          | 16 ++++++++++++++++
 locale/el.po             | 16 ++++++++++++++++
 locale/en_GB.po          | 16 ++++++++++++++++
 locale/es.po             | 16 ++++++++++++++++
 locale/fil.po            | 16 ++++++++++++++++
 locale/fr.po             | 16 ++++++++++++++++
 locale/hi.po             | 16 ++++++++++++++++
 locale/it_IT.po          | 16 ++++++++++++++++
 locale/ja.po             | 16 ++++++++++++++++
 locale/ko.po             | 16 ++++++++++++++++
 locale/nl.po             | 16 ++++++++++++++++
 locale/pl.po             | 16 ++++++++++++++++
 locale/pt_BR.po          | 16 ++++++++++++++++
 locale/ru.po             | 16 ++++++++++++++++
 locale/sv.po             | 16 ++++++++++++++++
 locale/tr.po             | 16 ++++++++++++++++
 locale/zh_Latn_pinyin.po | 16 ++++++++++++++++
 19 files changed, 304 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index dcab44b0c3..3b169152f5 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1979,6 +1979,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Berikan setidaknya satu pin UART"
@@ -2371,6 +2375,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 3d192db1b7..e7906f40a0 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1968,6 +1968,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2358,6 +2362,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6e9518ebef..5310fda215 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1993,6 +1993,10 @@ msgstr "Stereo links muss sich auf PWM-Kanal A befinden"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Stereo rechts muss sich auf PWM-Kanal B befinden"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Gib mindestens einen UART-Pin an"
@@ -2411,6 +2415,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr "Wi-Fi: "
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Aufgeweckt durch Alarm.\n"
diff --git a/locale/el.po b/locale/el.po
index 6a2221bf79..85a0bb31ff 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1977,6 +1977,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2367,6 +2371,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index d0ffe3f22b..a349cfa422 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1974,6 +1974,10 @@ msgstr "Stereo left must be on PWM channel A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Stereo right must be on PWM channel B"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Supply at least one UART pin"
@@ -2373,6 +2377,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Woken up by alarm.\n"
diff --git a/locale/es.po b/locale/es.po
index b2a4e3c97b..5016035bc1 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2003,6 +2003,10 @@ msgstr "Estéreo izquierdo debe estar en el canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Estéreo derecho debe estar en el canal PWM B"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Suministre al menos un pin UART"
@@ -2408,6 +2412,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Despertado por la alarma.\n"
diff --git a/locale/fil.po b/locale/fil.po
index e0d2c8b145..246a7e2c81 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1967,6 +1967,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2359,6 +2363,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 407d64c643..b964b6e301 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2023,6 +2023,10 @@ msgstr "Canal stéréo gauche doit être sur le canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Canal stéréo droit doit être sur le canal PWM B"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Fournissez au moins une broche UART"
@@ -2440,6 +2444,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr "Wi-Fi : "
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Réveil par alarme.\n"
diff --git a/locale/hi.po b/locale/hi.po
index d932a0d1f5..c4b1d62139 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1950,6 +1950,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2340,6 +2344,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 487b45c1c8..784d7723a8 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1977,6 +1977,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2369,6 +2373,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index b70c967cd9..47caa45a91 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1963,6 +1963,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "少なくとも1つのUARTピンが必要"
@@ -2354,6 +2358,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 684e1ebda7..7106244843 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1953,6 +1953,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2344,6 +2348,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 6aaa68cd6d..35fcd7e8cd 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1974,6 +1974,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Geef op zijn minst 1 UART pin op"
@@ -2370,6 +2374,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Gewekt door alarm.\n"
diff --git a/locale/pl.po b/locale/pl.po
index f33e2b4e78..e001f37108 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1961,6 +1961,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Podaj co najmniej jeden pin UART"
@@ -2351,6 +2355,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 894a70e105..f89157c53b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2006,6 +2006,10 @@ msgstr "O estéreo à esquerda deve estar no canal PWM A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "O estéreo à direita deve estar no canal PWM B"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Forneça pelo menos um pino UART"
@@ -2421,6 +2425,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr "Wi-Fi: "
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Foi despertado através do alarme.\n"
diff --git a/locale/ru.po b/locale/ru.po
index 8b873461cf..6536c624ff 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2016,6 +2016,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Предоставьте хотяб один пин UART"
@@ -2408,6 +2412,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index d95ca33b5f..cb0a0daf8e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1986,6 +1986,10 @@ msgstr "Vänster stereokanal måste använda PWM kanal A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "Höger stereokanal måste använda PWM kanal B"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Ange minst en UART-pinne"
@@ -2394,6 +2398,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr "Wi-Fi: "
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "Vaknade av larm.\n"
diff --git a/locale/tr.po b/locale/tr.po
index 20519bc2b6..f2d0e00c1e 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -1970,6 +1970,10 @@ msgstr ""
 msgid "Stereo right must be on PWM channel B"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr ""
@@ -2360,6 +2364,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 86c5ef2776..93542306cb 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1990,6 +1990,10 @@ msgstr "lì tǐ shēng zuǒ bì xū shì zài PWM tōng dào A"
 msgid "Stereo right must be on PWM channel B"
 msgstr "lì tǐ shēng yòu cè bì xū zài PWM tōng dào B shàng"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Stopping AP is not supported."
+msgstr ""
+
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
 msgstr "Dìngyì zhìshǎo yīgè UART yǐn jiǎo"
@@ -2399,6 +2403,18 @@ msgstr ""
 msgid "Wi-Fi: "
 msgstr "Wi-Fi: "
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in access point mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is in station mode."
+msgstr ""
+
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "Wifi is not enabled"
+msgstr ""
+
 #: main.c
 msgid "Woken up by alarm.\n"
 msgstr "bèi jǐng bào chǎo xǐng.\n"

From b5dda0b7703ba299a7e89a20a94926393000ce48 Mon Sep 17 00:00:00 2001
From: m1cha1s 
Date: Fri, 2 Dec 2022 14:26:46 +0100
Subject: [PATCH 1508/2403] Removed esp32_devkit_v1 folder

---
 .../espressif/boards/esp32_devkit_v1/board.c  | 29 ------------
 .../boards/esp32_devkit_v1/mpconfigboard.h    | 45 ------------------
 .../boards/esp32_devkit_v1/mpconfigboard.mk   |  9 ----
 ports/espressif/boards/esp32_devkit_v1/pins.c | 46 -------------------
 .../boards/esp32_devkit_v1/sdkconfig          | 20 --------
 5 files changed, 149 deletions(-)
 delete mode 100644 ports/espressif/boards/esp32_devkit_v1/board.c
 delete mode 100644 ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
 delete mode 100644 ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
 delete mode 100644 ports/espressif/boards/esp32_devkit_v1/pins.c
 delete mode 100644 ports/espressif/boards/esp32_devkit_v1/sdkconfig

diff --git a/ports/espressif/boards/esp32_devkit_v1/board.c b/ports/espressif/boards/esp32_devkit_v1/board.c
deleted file mode 100644
index 164430c88c..0000000000
--- a/ports/espressif/boards/esp32_devkit_v1/board.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "supervisor/board.h"
-
-// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
deleted file mode 100644
index 2a0dcd0104..0000000000
--- a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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.
- */
-
-// Micropython setup
-
-#define MICROPY_HW_BOARD_NAME "ESP32 Devkit V1"
-#define MICROPY_HW_MCU_NAME "ESP32"
-
-#define MICROPY_HW_LED_STATUS       (&pin_GPIO2)
-
-#define CIRCUITPY_BOARD_I2C         (1)
-#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
-
-#define CIRCUITPY_BOARD_SPI         (1)
-#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
-
-#define CIRCUITPY_BOARD_UART        (1)
-#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
-
-// UART pins attached to the USB-serial converter chip
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
deleted file mode 100644
index 7aa352e16e..0000000000
--- a/ports/espressif/boards/esp32_devkit_v1/mpconfigboard.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-CIRCUITPY_CREATOR_ID =  0xB0D00000
-CIRCUITPY_CREATION_ID = 0x00320002
-
-IDF_TARGET = esp32
-
-CIRCUITPY_ESP_FLASH_MODE = dio
-CIRCUITPY_ESP_FLASH_FREQ = 40m
-CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/esp32_devkit_v1/pins.c b/ports/espressif/boards/esp32_devkit_v1/pins.c
deleted file mode 100644
index 78c37897ac..0000000000
--- a/ports/espressif/boards/esp32_devkit_v1/pins.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
-    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
-
-    // External pins are in silkscreen order, from top to bottom, left side, then right side
-    {MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15)},
-    {MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2)},
-    {MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16)},
-    {MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17)},
-    {MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5)},
-    {MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18)},
-    {MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19)},
-    {MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21)},
-    {MP_ROM_QSTR(MP_QSTR_RX0), MP_ROM_PTR(&pin_GPIO1)},
-    {MP_ROM_QSTR(MP_QSTR_TX0), MP_ROM_PTR(&pin_GPIO3)},
-    {MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22)},
-    {MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23)},
-    {MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13)},
-    {MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)},
-    {MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14)},
-    {MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27)},
-    {MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26)},
-    {MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25)},
-    {MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33)},
-    {MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32)},
-    {MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35)},
-    {MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34)},
-
-    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2)},
-
-    {MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21)},
-    {MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22)},
-
-    {MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18)},
-    {MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23)},
-    {MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO19)},
-
-    {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17)},
-    {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16)},
-
-    {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/esp32_devkit_v1/sdkconfig b/ports/espressif/boards/esp32_devkit_v1/sdkconfig
deleted file mode 100644
index 6c0168c829..0000000000
--- a/ports/espressif/boards/esp32_devkit_v1/sdkconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
-CONFIG_ESP32_SPIRAM_SUPPORT=n
-
-# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
-### #
-### # ESP System Settings
-### #
-### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-### CONFIG_ESP_CONSOLE_NONE is not set
-### CONFIG_ESP_CONSOLE_UART=y
-### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-### CONFIG_ESP_CONSOLE_UART_NUM=0
-### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
-### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
-### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-### # end of ESP System Settings

From b83c42e41ab6b67a42f16415ceeb93bd38ea4a79 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 2 Dec 2022 10:47:50 -0600
Subject: [PATCH 1509/2403] Implement the chain= argument of
 traceback.print_exception

---
 shared-bindings/traceback/__init__.c          | 22 ++++++++++++++-----
 tests/circuitpython/traceback_test_chained.py |  5 +++--
 .../traceback_test_chained.py.exp             | 18 ++++++++++-----
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index eeb7bc458d..153587e919 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -58,6 +58,7 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
     }
     mp_obj_t tb_obj = args[ARG_tb].u_obj;
     mp_obj_t limit_obj = args[ARG_limit].u_obj;
+    bool chain = args[ARG_chain].u_bool;
 
     if (args[ARG_file].u_obj != mp_const_none) {
         if (!is_print_exception) {
@@ -90,6 +91,15 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 
     mp_obj_exception_t *exc = mp_obj_exception_get_native(value);
     mp_obj_traceback_t *trace_backup = exc->traceback;
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    mp_obj_exception_t *context_backup = exc->context;
+    mp_obj_exception_t *cause_backup = exc->cause;
+
+    if (!chain) {
+        exc->context = NULL;
+        exc->cause = NULL;
+    }
+    #endif
 
     if (tb_obj == MP_OBJ_NULL) {
         /* Print the traceback's exception as is */
@@ -101,6 +111,10 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 
     shared_module_traceback_print_exception(MP_OBJ_TO_PTR(value), print, limit);
     exc->traceback = trace_backup;
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    exc->context = context_backup;
+    exc->cause = cause_backup;
+    #endif
 }
 
 //| def format_exception(
@@ -128,14 +142,12 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin
 //|     these lines are concatenated and printed, exactly the same text is
 //|     printed as does print_exception().
 //|
-//|     .. note:: Setting ``chain`` will have no effect as chained exceptions are not yet implemented.
-//|
 //|     :param exc: The exception. Must be an instance of `BaseException`. Unused if value is specified.
 //|     :param value: If specified, is used in place of ``exc``.
 //|     :param TracebackType tb: When value is alsp specified, ``tb`` is used in place of the exception's own traceback. If `None`, the traceback will not be printed.
 //|     :param int limit: Print up to limit stack trace entries (starting from the caller’s frame) if limit is positive.
 //|                       Otherwise, print the last ``abs(limit)`` entries. If limit is omitted or None, all entries are printed.
-//|     :param bool chain: If `True` then chained exceptions will be printed (note: not yet implemented).
+//|     :param bool chain: If `True` then chained exceptions will be printed.
 //|     """
 //|
 STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -169,8 +181,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f
 //|     no traceback will be shown. This is compatible with CPython 3.5 and
 //|     newer.
 //|
-//|     .. note:: Setting ``chain`` will have no effect as chained exceptions are not yet implemented.
-//|
 //|     :param exc: The exception. Must be an instance of `BaseException`. Unused if value is specified.
 //|     :param value: If specified, is used in place of ``exc``.
 //|     :param tb: When value is alsp specified, ``tb`` is used in place of the exception's own traceback. If `None`, the traceback will not be printed.
@@ -178,7 +188,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f
 //|                       Otherwise, print the last ``abs(limit)`` entries. If limit is omitted or None, all entries are printed.
 //|     :param io.FileIO file: If file is omitted or `None`, the output goes to `sys.stderr`; otherwise it should be an open
 //|                            file or file-like object to receive the output.
-//|     :param bool chain: If `True` then chained exceptions will be printed (note: not yet implemented).
+//|     :param bool chain: If `True` then chained exceptions will be printed.
 //|
 //|     """
 //|     ...
diff --git a/tests/circuitpython/traceback_test_chained.py b/tests/circuitpython/traceback_test_chained.py
index 83d0c03466..72336d7495 100644
--- a/tests/circuitpython/traceback_test_chained.py
+++ b/tests/circuitpython/traceback_test_chained.py
@@ -11,9 +11,9 @@ except:
     raise SystemExit
 
 
-def print_exc_info(e):
+def print_exc_info(e, chain=True):
     print("-" * 72)
-    traceback.print_exception(None, e, e.__traceback__)
+    traceback.print_exception(None, e, e.__traceback__, chain=chain)
     print("-" * 72)
     print()
 
@@ -24,6 +24,7 @@ try:
     except Exception as inner:
         raise RuntimeError() from inner
 except Exception as e:
+    print_exc_info(e, chain=False)
     print_exc_info(e)
 print()
 
diff --git a/tests/circuitpython/traceback_test_chained.py.exp b/tests/circuitpython/traceback_test_chained.py.exp
index c874ff707f..5fa40126b3 100644
--- a/tests/circuitpython/traceback_test_chained.py.exp
+++ b/tests/circuitpython/traceback_test_chained.py.exp
@@ -1,3 +1,9 @@
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 25, in 
+RuntimeError: 
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Traceback (most recent call last):
   File "circuitpython/traceback_test_chained.py", line 23, in 
@@ -17,39 +23,39 @@ OSError:
 The above exception was the direct cause of the following exception:
 
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 34, in 
+  File "circuitpython/traceback_test_chained.py", line 35, in 
 RuntimeError: 
 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 42, in 
+  File "circuitpython/traceback_test_chained.py", line 43, in 
 ZeroDivisionError: division by zero
 
 During handling of the above exception, another exception occurred:
 
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 44, in 
+  File "circuitpython/traceback_test_chained.py", line 45, in 
 RuntimeError: 
 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 53, in 
+  File "circuitpython/traceback_test_chained.py", line 54, in 
 RuntimeError: 
 ------------------------------------------------------------------------
 
 ------------------------------------------------------------------------
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 59, in 
+  File "circuitpython/traceback_test_chained.py", line 60, in 
 RuntimeError: 
 
 During handling of the above exception, another exception occurred:
 
 Traceback (most recent call last):
-  File "circuitpython/traceback_test_chained.py", line 61, in 
+  File "circuitpython/traceback_test_chained.py", line 62, in 
 ZeroDivisionError: division by zero
 ------------------------------------------------------------------------
 

From f7504ff857f597a4b18502d759a2a31159b3bc30 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 2 Dec 2022 10:19:31 -0800
Subject: [PATCH 1510/2403] Tweaks based on review comments

---
 ports/raspberrypi/common-hal/analogbufio/BufferedIn.c | 5 +++--
 shared-bindings/analogbufio/BufferedIn.c              | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
index 1b0a0d684a..bc5f9028b7 100644
--- a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
+++ b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -79,7 +79,6 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
 
     // sample_rate is forced to be >= 1 in shared-bindings
     float clk_div = (float)ADC_CLOCK_INPUT / (float)sample_rate;
-    mp_printf(&mp_plat_print, "clk_div %f for %d\n", (double)clk_div, sample_rate);
     adc_set_clkdiv(clk_div);
 
     // Set up the DMA to start transferring data as soon as it appears in FIFO
@@ -122,7 +121,9 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     // RP2040 Implementation Detail
     // Fills the supplied buffer with ADC values using DMA transfer.
     // If the buffer is 8-bit, then values are 8-bit shifted and error bit is off.
-    // If buffer is 16-bit, then values are not shifted and error bit is present.
+    // If buffer is 16-bit, then values are 12-bit and error bit is present. We
+    // stretch the 12-bit value to 16-bits and truncate the number of valid
+    // samples at the first sample with the error bit set.
     // Number of transfers is always the number of samples which is the array
     // byte length divided by the bytes_per_sample.
     uint dma_size = DMA_SIZE_8;
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index d6c6b4a46e..193552c313 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -47,7 +47,7 @@
 //|         import array
 //|
 //|         length = 1000
-//|         mybuffer = array.array("H", 0x0000 for i in range(length))
+//|         mybuffer = array.array("H", [0x0000] * length)
 //|         rate = 500000
 //|         adcbuf = analogbufio.BufferedIn(board.GP26, sample_rate=rate)
 //|         adcbuf.readinto(mybuffer)

From 54831ae692a0455e81329cd2bdfc5df2d6c7edd8 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Fri, 2 Dec 2022 14:23:46 +0000
Subject: [PATCH 1511/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index cb0a0daf8e..8a19545c06 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: 2022-12-02 01:55+0000\n"
+"PO-Revision-Date: 2022-12-02 22:53+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -489,7 +489,7 @@ msgstr "Kör redan"
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
-msgstr "Skannar redan efter wifi-nätverk"
+msgstr "Skannar redan efter WiFi-nätverk"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -1988,7 +1988,7 @@ msgstr "Höger stereokanal måste använda PWM kanal B"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Stoppa AP stöds inte."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
@@ -2400,15 +2400,15 @@ msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "WiFi är i accesspunktläge."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "WiFi är i stationsläge."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "WiFi är inte aktiverat"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -4290,7 +4290,7 @@ msgstr "width måste vara större än noll"
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
-msgstr "wifi är inte aktiverat"
+msgstr "WiFi är inte aktiverat"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"

From 248c17d8bf9b50085a22b6bc7f7c59f3278993ff Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 2 Dec 2022 23:53:24 +0100
Subject: [PATCH 1512/2403] 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/ru.po             | 3 +++
 locale/sv.po             | 3 +++
 locale/tr.po             | 3 +++
 locale/zh_Latn_pinyin.po | 3 +++
 19 files changed, 57 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 3b169152f5..eb8effacb8 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -161,6 +161,9 @@ msgid "%q must be >= %d"
 msgstr "%q harus >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index e7906f40a0..67307d5715 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -162,6 +162,9 @@ msgid "%q must be >= %d"
 msgstr "%q musí být >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5310fda215..cc1c20f2c0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -163,6 +163,9 @@ msgid "%q must be >= %d"
 msgstr "%q muss >= %d sein"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index 85a0bb31ff..b187a003c1 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -167,6 +167,9 @@ msgid "%q must be >= %d"
 msgstr "%q πρέπει να είναι >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index a349cfa422..07c9e578c8 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -165,6 +165,9 @@ msgid "%q must be >= %d"
 msgstr "%q must be >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index 5016035bc1..f160e99a86 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -167,6 +167,9 @@ msgid "%q must be >= %d"
 msgstr "%q debe ser >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/fil.po b/locale/fil.po
index 246a7e2c81..988c921bfb 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -156,6 +156,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index b964b6e301..605e4e8eaa 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -167,6 +167,9 @@ msgid "%q must be >= %d"
 msgstr "%q doit être >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
diff --git a/locale/hi.po b/locale/hi.po
index c4b1d62139..bd4f497f7b 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -155,6 +155,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 784d7723a8..8a0d5cc526 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -162,6 +162,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 47caa45a91..56e1272396 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -160,6 +160,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 7106244843..0e6aa1ed34 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -156,6 +156,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 35fcd7e8cd..4759dce824 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -158,6 +158,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index e001f37108..27ab7e4062 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -160,6 +160,9 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index f89157c53b..4d80147319 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -164,6 +164,9 @@ msgid "%q must be >= %d"
 msgstr "o %q deve ser >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
diff --git a/locale/ru.po b/locale/ru.po
index 6536c624ff..1845bcb929 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -166,6 +166,9 @@ msgid "%q must be >= %d"
 msgstr "%q должно быть >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b', или 'B'"
diff --git a/locale/sv.po b/locale/sv.po
index 8a19545c06..e5fad3a908 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -163,6 +163,9 @@ msgid "%q must be >= %d"
 msgstr "%q måste vara >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
diff --git a/locale/tr.po b/locale/tr.po
index f2d0e00c1e..8381a79c14 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -167,6 +167,9 @@ msgid "%q must be >= %d"
 msgstr "%q >= %d olmalıdır"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q 'h', 'H', 'b' yada 'B' tipi bir bytearray /array olmalı"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 93542306cb..e641213935 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -166,6 +166,9 @@ msgid "%q must be >= %d"
 msgstr "%q bìxū >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
+msgid "%q must be a bytearray or array of type 'H' or 'B'"
+msgstr ""
+
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""

From afb5301cef6d06e5932dbc9bad64062bf9d4ca3c Mon Sep 17 00:00:00 2001
From: BooleanMattock <118489982+BooleanMattock@users.noreply.github.com>
Date: Fri, 2 Dec 2022 20:21:40 -0500
Subject: [PATCH 1513/2403] Fix to Issue #7224 - tested

---
 ports/raspberrypi/common-hal/pwmio/PWMOut.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
index e6f88f8894..f75c4b3451 100644
--- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c
+++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
@@ -236,14 +236,6 @@ extern void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uin
     }
     // compare_count is the CC register value, which should be TOP+1 for 100% duty cycle.
     pwm_set_chan_level(self->slice, self->ab_channel, compare_count);
-    // Wait for wrap so that we know our new cc value has been applied. Clear
-    // the internal interrupt and then wait for it to be set. Worst case, we
-    // wait a full cycle.
-    pwm_hw->intr = 1 << self->slice;
-    while ((pwm_hw->en & (1 << self->slice)) != 0 &&
-           (pwm_hw->intr & (1 << self->slice)) == 0 &&
-           !mp_hal_is_interrupted()) {
-    }
 }
 
 uint16_t common_hal_pwmio_pwmout_get_duty_cycle(pwmio_pwmout_obj_t *self) {

From 51df14896bf5df86cc23b68e0aeb2ead7fa89803 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 3 Dec 2022 17:13:26 +0000
Subject: [PATCH 1514/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (987 of 987 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 e5fad3a908..df1ab4a177 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: 2022-12-02 22:53+0000\n"
+"PO-Revision-Date: 2022-12-04 17:47+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -164,7 +164,7 @@ msgstr "%q måste vara >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q måste vara en bytearray eller array av typen 'H' eller 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"

From 05a8bf8c38513ee329416b7a3f7a44b6ea167c97 Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Mon, 5 Dec 2022 16:06:50 +0900
Subject: [PATCH 1515/2403] Create board.c

---
 .../boards/luatos_core_esp32c3/board.c        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 ports/espressif/boards/luatos_core_esp32c3/board.c

diff --git a/ports/espressif/boards/luatos_core_esp32c3/board.c b/ports/espressif/boards/luatos_core_esp32c3/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/luatos_core_esp32c3/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

From 5b6f06d84c4a6f1e09d9daef792f0a3a8380ea49 Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Mon, 5 Dec 2022 16:08:12 +0900
Subject: [PATCH 1516/2403] Add additional files

---
 .../luatos_core_esp32c3/mpconfigboard.h       | 38 +++++++++++++++++
 .../luatos_core_esp32c3/mpconfigboard.mk      |  8 ++++
 .../boards/luatos_core_esp32c3/pins.c         | 42 +++++++++++++++++++
 .../boards/luatos_core_esp32c3/sdkconfig      |  5 +++
 4 files changed, 93 insertions(+)
 create mode 100644 ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/luatos_core_esp32c3/pins.c
 create mode 100644 ports/espressif/boards/luatos_core_esp32c3/sdkconfig

diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.h b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.h
new file mode 100644
index 0000000000..23bb5ee9b2
--- /dev/null
+++ b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.h
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+// Board setup
+
+#define MICROPY_HW_BOARD_NAME       "Luatos Core-ESP32C3"
+#define MICROPY_HW_MCU_NAME         "ESP32-C3"
+
+// Status LED
+#define MICROPY_HW_LED_STATUS (&pin_GPIO12)
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
new file mode 100644
index 0000000000..29f1719153
--- /dev/null
+++ b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0xDEADBEEF
+CIRCUITPY_CREATION_ID = 0x00C30001
+
+IDF_TARGET = esp32c3
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c
new file mode 100644
index 0000000000..59b1d706b3
--- /dev/null
+++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c
@@ -0,0 +1,42 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // Luatos Core ESP32-C3
+    // Documentation:
+    // https://wiki.luatos.com/chips/esp32c3/index.html
+    // Pinout:
+    // https://wiki.luatos.com/_images/20221023.png
+    // C3 Data Sheet
+    // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) },
+    
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED2), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/luatos_core_esp32c3/sdkconfig b/ports/espressif/boards/luatos_core_esp32c3/sdkconfig
new file mode 100644
index 0000000000..ccc70917b5
--- /dev/null
+++ b/ports/espressif/boards/luatos_core_esp32c3/sdkconfig
@@ -0,0 +1,5 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="luatos-core-esp32c3"
+# end of LWIP

From 14b430ed3534ad9ffe0e143d76eb75eca4297068 Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Mon, 5 Dec 2022 16:35:48 +0900
Subject: [PATCH 1517/2403] Fix pre-commit issues

---
 ports/espressif/boards/luatos_core_esp32c3/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c
index 59b1d706b3..fed05323e8 100644
--- a/ports/espressif/boards/luatos_core_esp32c3/pins.c
+++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c
@@ -4,7 +4,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
     // Luatos Core ESP32-C3
-    // Documentation:
+    // Documentation (Chinese only):
     // https://wiki.luatos.com/chips/esp32c3/index.html
     // Pinout:
     // https://wiki.luatos.com/_images/20221023.png

From eaf39b4c1007eb0a93a9f810c5f8ea4a950563bf Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Mon, 5 Dec 2022 16:40:36 +0900
Subject: [PATCH 1518/2403] Update pins.c

---
 ports/espressif/boards/luatos_core_esp32c3/pins.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c
index fed05323e8..b472446fe2 100644
--- a/ports/espressif/boards/luatos_core_esp32c3/pins.c
+++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c
@@ -20,23 +20,17 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
-
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
-
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
-    
     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) },
-    
     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED2), MP_ROM_PTR(&pin_GPIO13) },
-
     { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
-
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From d080f81ffee36bbedbb78c56e4ee35943971ea4b Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sun, 4 Dec 2022 21:20:22 +0000
Subject: [PATCH 1519/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4d80147319..7ef7f2109f 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: 2022-11-11 18:49+0000\n"
+"PO-Revision-Date: 2022-12-05 21:48+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -165,7 +165,7 @@ msgstr "o %q deve ser >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -203,7 +203,7 @@ msgstr "%q pino inválido"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "A etapa %q não pode ser zero"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -910,7 +910,7 @@ msgstr "O modo do controlador não é usado quando a direção for inserida."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "Outra exceção ocorreu durante o tratamento da exceção acima:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -1693,7 +1693,7 @@ msgstr "A operação expirou"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "Sem slots do serviço MDNS"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
@@ -2011,7 +2011,7 @@ msgstr "O estéreo à direita deve estar no canal PWM B"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Não há suporte para a interrupção do AP."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
@@ -2060,7 +2060,7 @@ msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "A exceção acima foi a causa direta da seguinte exceção:"
 
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
@@ -2430,15 +2430,15 @@ msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "O Wi-Fi está em modo de ponto de acesso."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "O Wi-Fi está em modo estação."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "O Wi-Fi não está ativado"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -3239,7 +3239,7 @@ msgstr "o índice está fora dos limites"
 
 #: shared-bindings/adafruit_pixelbuf/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "o índice deve ser tupla ou int"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3624,7 +3624,7 @@ msgstr "contagem de turnos negativos"
 
 #: shared-bindings/adafruit_pixelbuf/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "o índice aninhado deve ser int"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"

From 1e34fc110aa8af6f6827547d7a4118494562d860 Mon Sep 17 00:00:00 2001
From: Boran Roni 
Date: Sun, 4 Dec 2022 18:17:43 +0000
Subject: [PATCH 1520/2403] Translated using Weblate (Turkish)

Currently translated at 26.7% (264 of 987 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/tr/
---
 locale/tr.po | 258 ++++++++++++++++++++++++++-------------------------
 1 file changed, 132 insertions(+), 126 deletions(-)

diff --git a/locale/tr.po b/locale/tr.po
index 8381a79c14..feb86500fe 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-10-10 18:23+0000\n"
+"PO-Revision-Date: 2022-12-05 21:48+0000\n"
 "Last-Translator: Boran Roni \n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -15,7 +15,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.14.1\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #: main.c
 msgid ""
@@ -73,7 +73,7 @@ msgstr "%%c int veya char tipine ihtiyaç duyar"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -128,7 +128,7 @@ msgstr "%q init başarısız oldu"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q %q dir"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -168,11 +168,11 @@ msgstr "%q >= %d olmalıdır"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr "%q 'h', 'H', 'b' yada 'B' tipi bir bytearray /array olmalı"
+msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
@@ -206,7 +206,7 @@ msgstr "%q pini geçersiz"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "%q sıfır olamaz"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -559,18 +559,17 @@ msgstr "Minimum kare hızından altında"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must be sequential pins"
-msgstr ""
+msgstr "Bit saati ve kelime seçimi pinleri sıralı olmalıdır"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
-msgstr ""
+msgstr "Bit saati ve kelime seçimi, bir saat birimini paylaşmalıdır"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Bit depth must be multiple of 8."
 msgstr "Bit derinliği 8'in katı olacak şekilde olmalı."
 
 #: shared-bindings/bitmaptools/__init__.c
-#, fuzzy
 msgid "Bitmap size and bits per value must match"
 msgstr "Bitmap boyutu ve bit başına değer uyuşmalı"
 
@@ -587,11 +586,11 @@ msgstr "Hem RX hem de TX akış kontrolü için gerekli"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Başlatma sırasında her iki düğmeye de basıldı.\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
-msgstr ""
+msgstr "Her iki pin de donanım kesintilerini desteklemelidir"
 
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -657,7 +656,7 @@ msgstr "Veriyolu pini %d kullanımda"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Başlatma sırasında A düğmesine basıldı.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -677,7 +676,7 @@ msgstr "CRC yada checksum geçersiz"
 
 #: py/objtype.c
 msgid "Call super().__init__() before accessing native object."
-msgstr ""
+msgstr "Yerel nesneye erişmeden önce super().__init__() fonksiyonunu çağırın."
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
@@ -707,7 +706,7 @@ msgstr "USB aygıtları şu an değiştirilemez"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Cannot create a new Adapter; use _bleio.adapter;"
-msgstr "Yeni Adapter oluşturulamaz, _bleio.adapter; kullanın"
+msgstr "yeni Adaptör oluşturulamadı, _bleio.adapter kullanın"
 
 #: shared-bindings/displayio/Bitmap.c
 #: shared-bindings/memorymonitor/AllocationSize.c
@@ -737,30 +736,30 @@ msgstr ""
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Cannot record to a file"
-msgstr ""
+msgstr "Dosyaya kayıt yapılamıyor"
 
 #: shared-module/storage/__init__.c
 msgid "Cannot remount '/' when visible via USB."
-msgstr ""
+msgstr "'/' USB ile görünür olduğunda, yeniden bağlanamaz."
 
 #: ports/atmel-samd/common-hal/microcontroller/__init__.c
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
+msgstr "Hiçbir bootloader bulunmadığından bootloader sıfırlanamıyor"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
-msgstr ""
+msgstr "Soket seçenekleri ayarlanamıyor"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Cannot set value when direction is input."
-msgstr ""
+msgstr "Yön, giriş olduğunda değer ayarlanamıyor."
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Cannot specify RTS or CTS in RS485 mode"
-msgstr ""
+msgstr "RS485 modunda RTS veya CTS belirtilemez"
 
 #: py/objslice.c
 msgid "Cannot subclass slice"
@@ -768,11 +767,11 @@ msgstr ""
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "MOSI ve MISO pinleri olmadan transfer edilemiyor"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
-msgstr ""
+msgstr "Kullanımda olan bir zamanlayıcının frekansı değiştirilemez"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
@@ -784,7 +783,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
-msgstr ""
+msgstr "CharacteristicBuffer yazılmı sağlanmadı"
 
 #: supervisor/shared/safe_mode.c
 msgid "CircuitPython core code crashed hard. Whoops!\n"
@@ -796,7 +795,7 @@ msgstr ""
 
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
-msgstr ""
+msgstr "Saat uzatması çok uzun"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Clock unit in use"
@@ -818,7 +817,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
-msgstr ""
+msgstr "Adres ayarlanamadı"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
@@ -826,7 +825,7 @@ msgstr "PWM başlatılamadı"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "Could not start interrupt, RX busy"
-msgstr ""
+msgstr "Kesinti başlatılamadı, RX kullanımda"
 
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Couldn't allocate decoder"
@@ -846,16 +845,16 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "DAC already in use"
-msgstr ""
+msgstr "DAC zaten kullanımda"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
 msgid "Data 0 pin must be byte aligned"
-msgstr ""
+msgstr "Data 0 pini bite hizalı olmalı"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Data chunk must follow fmt chunk"
-msgstr ""
+msgstr "Veri öbeği, fmt yığınını takip etmelidir"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -873,38 +872,38 @@ msgstr ""
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Destination capacity is smaller than destination_length."
-msgstr ""
+msgstr "Hedef kapasitesi, hedef_uzunluğundan daha küçük."
 
 #: ports/nrf/common-hal/audiobusio/I2SOut.c
 msgid "Device in use"
-msgstr ""
+msgstr "Cihaz kullanımda"
 
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Display must have a 16 bit colorspace."
-msgstr ""
+msgstr "Ekran 16 bitlik bir renk uzayına sahip olmalıdır."
 
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Display rotation must be in 90 degree increments"
-msgstr ""
+msgstr "Ekran dönüşü 90 derecelik artışlarla olmalıdır"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Tamamlandı"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
-msgstr ""
+msgstr "Yön, giriş olduğunda sürüş modu kullanılmaz."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "Yukarıdaki hatanın işlenmesi sırasında başka bir hata oluştu:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
-msgstr ""
+msgstr "ECB aynı anda yalnızca 16 baytla çalışır"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/canio/CAN.c
@@ -916,20 +915,20 @@ msgstr ""
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
 msgid "EXTINT channel already in use"
-msgstr ""
+msgstr "EXTINT kanalı zaten kullanımda"
 
 #: shared-module/synthio/MidiTrack.c
 #, c-format
 msgid "Error in MIDI stream at position %d"
-msgstr ""
+msgstr "%d konumundaki MIDI akışında hata"
 
 #: extmod/modure.c
 msgid "Error in regex"
-msgstr ""
+msgstr "regex'te hata"
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
-msgstr ""
+msgstr "Hata: Bağlanamadı"
 
 #: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
 #: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
@@ -937,15 +936,15 @@ msgstr ""
 #: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
-msgstr ""
+msgstr "%q bekleniyor"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c
 msgid "Expected a %q or %q"
-msgstr ""
+msgstr "%q yada %q bekleniyor"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected an %q"
-msgstr ""
+msgstr "%q bekleniyor"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -954,24 +953,24 @@ msgstr ""
 
 #: extmod/ulab/code/numpy/fft/fft_tools.c
 msgid "FFT is defined for ndarrays only"
-msgstr ""
+msgstr "FFT sadece ndarrays'te tanımlandı"
 
 #: extmod/ulab/code/numpy/fft/fft_tools.c
 msgid "FFT is implemented for linear arrays only"
-msgstr ""
+msgstr "FFT yalnızca doğrusal diziler için uygulanır"
 
 #: ports/espressif/common-hal/ssl/SSLSocket.c
 msgid "Failed SSL handshake"
-msgstr ""
+msgstr "SSL el sıkışma hatası"
 
 #: shared-bindings/ps2io/Ps2.c
 msgid "Failed sending command."
-msgstr ""
+msgstr "Komut gönderilemedi."
 
 #: ports/nrf/sd_mutex.c
 #, c-format
 msgid "Failed to acquire mutex, err 0x%04x"
-msgstr ""
+msgstr "Muteks alınamadı, err 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
@@ -992,24 +991,24 @@ msgstr ""
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
-msgstr ""
+msgstr "Bağlantı kurulamadı: internal error"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
-msgstr ""
+msgstr "Bağlantı kurulamadı: timeout"
 
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
-msgstr ""
+msgstr "MP3 dosyası ayrıştırılamadı"
 
 #: ports/nrf/sd_mutex.c
 #, c-format
 msgid "Failed to release mutex, err 0x%04x"
-msgstr ""
+msgstr "Muteks serbest bırakılamadı, err 0x%04x"
 
 #: supervisor/shared/safe_mode.c
 msgid "Failed to write internal flash."
-msgstr ""
+msgstr "Dahili flaş yazılamadı."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fatal error."
@@ -1017,13 +1016,13 @@ msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
-msgstr ""
+msgstr "Dosya var"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
 msgid "Filters too complex"
-msgstr ""
+msgstr "Filtreler çok karmaşık"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
@@ -1031,42 +1030,46 @@ msgstr ""
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Yazılım geçersiz"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Yazılım çok büyük"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
 msgstr ""
+"L8 renk uzayı için, giriş bitmap'i piksel başına 8 bayta sahip olmalıdır"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
 msgstr ""
+"RGB renk uzayı için, giriş bitmap'i piksel başına 16 bayta sahip olmalıdır"
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Format not supported"
-msgstr ""
+msgstr "Format desteklenmiyor"
 
 #: ports/mimxrt10xx/common-hal/microcontroller/Processor.c
 msgid ""
 "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 msgstr ""
+"Frekans 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 ya da 1008 Mhz "
+"olmalıdır"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
-msgstr ""
+msgstr "Frekans, bu zamanlayıcıyı kullanan mevcut PWMOut ile eşleşmelidir"
 
 #: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
 #: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
 msgid "Function requires lock"
-msgstr ""
+msgstr "Fonksiyon kilit gerektirir"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "GNSS init"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1076,7 +1079,7 @@ msgstr ""
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
-msgstr ""
+msgstr "Grup zaten kullanılıyor"
 
 #: ports/atmel-samd/common-hal/busio/SPI.c ports/cxd56/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/busio/SPI.c
@@ -1089,201 +1092,204 @@ msgstr ""
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
 #: ports/stm/common-hal/sdioio/SDCard.c
 msgid "Hardware busy, try alternative pins"
-msgstr ""
+msgstr "Donanım meşgul, alternatif pinleri deneyin"
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Hardware in use, try alternative pins"
-msgstr ""
+msgstr "Donanım kullanımda, alternatif pinleri deneyin"
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
-msgstr ""
+msgstr "Kapalı dosyada I/O işlemi"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "I2C init hatası"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
-msgstr ""
+msgstr "I2C çevre cihazı kullanımda"
 
 #: shared-bindings/audiobusio/I2SOut.c
 msgid "I2SOut not available"
-msgstr ""
+msgstr "I2SOut uygundeğil"
 
 #: shared-bindings/aesio/aes.c
 #, c-format
 msgid "IV must be %d bytes long"
-msgstr ""
+msgstr "IV %d bayt uzunluğunda olmalı"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
-msgstr ""
+msgstr "Buffer öğeleri <=4 bayt uzunluğunda olmalı"
 
 #: py/persistentcode.c
 msgid ""
 "Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
 "mpy-update for more info."
 msgstr ""
+"Uyumsuz .mpy dosyası. Lütfen tüm .mpy dosyalarını güncelleyin. Daha fazla "
+"bilgi için http://adafru.it/mpy-update ."
 
 #: shared-bindings/_pew/PewPew.c
 msgid "Incorrect buffer size"
-msgstr ""
+msgstr "Yanlış buffer size"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Init program size invalid"
-msgstr ""
+msgstr "Init program boyutu geçersiz"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Initial set pin direction conflicts with initial out pin direction"
-msgstr ""
+msgstr "İlk pin yönü, ilk çıkış pin yönüyle çakışıyor"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Initial set pin state conflicts with initial out pin state"
-msgstr ""
+msgstr "İlk pinin durumu, ilk çıkış pininin durumu ile çakışıyor"
 
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "Initialization failed due to lack of memory"
-msgstr ""
+msgstr "Bellek yetersizliği nedeniyle başlatma başarısız oldu"
 
 #: shared-bindings/bitops/__init__.c
 #, c-format
 msgid "Input buffer length (%d) must be a multiple of the strand count (%d)"
-msgstr ""
+msgstr "Giriş buffer uzunluğu (%d) strand sayımının (%d) katı olmalıdır"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 msgid "Input taking too long"
-msgstr ""
+msgstr "Giriş çok uzun sürüyor"
 
 #: ports/espressif/common-hal/neopixel_write/__init__.c py/moduerrno.c
 msgid "Input/output error"
-msgstr ""
+msgstr "Giriş/çıkış hatası"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
 msgid "Instruction %d shifts in more bits than pin count"
-msgstr ""
+msgstr "Komut %d pin sayısından daha fazla bit içe kaydırıyor"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
 msgid "Instruction %d shifts out more bits than pin count"
-msgstr ""
+msgstr "Komut %d pin sayısından daha fazla bit dışa kaydırıyor"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
 msgid "Instruction %d uses extra pin"
-msgstr ""
+msgstr "Komut %d extra pin kullanıyor"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
 msgid "Instruction %d waits on input outside of count"
-msgstr ""
+msgstr "Komut %d sayım dışında, girişte bekler"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Insufficient authentication"
-msgstr ""
+msgstr "Yetersiz kimlik doğrulama"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Insufficient encryption"
-msgstr ""
+msgstr "Yetersiz şifreleme"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Interface must be started"
-msgstr ""
+msgstr "Arayüz başlatılmalıdır"
 
 #: ports/atmel-samd/audio_dma.c ports/raspberrypi/audio_dma.c
 msgid "Internal audio buffer too small"
-msgstr ""
+msgstr "Dahili ses arabelleği çok küçük"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
-msgstr ""
+msgstr "Dahili tanımlama hatası"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 msgid "Internal error"
-msgstr ""
+msgstr "Dahili hata"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid "Internal error #%d"
-msgstr ""
+msgstr "Dahili hata #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Dahili bekçi zamanlayıcısının süresi doldu."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
-msgstr ""
+msgstr "Geçersiz %q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
-msgstr ""
+msgstr "Geersi %q pin"
 
 #: ports/stm/common-hal/analogio/AnalogIn.c
 msgid "Invalid ADC Unit value"
-msgstr ""
+msgstr "Geçersiz ADC Ünite değeri"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Invalid BLE parameter"
-msgstr ""
+msgstr "Geçersiz BLE parametresi"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid BSSID"
-msgstr ""
+msgstr "Geçersiz BSSID"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
-msgstr ""
+msgstr "Geçersiz MAC adresi"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
 msgid "Invalid argument"
-msgstr ""
+msgstr "Geçersiz argüman"
 
 #: shared-module/displayio/Bitmap.c
+#, fuzzy
 msgid "Invalid bits per value"
-msgstr ""
+msgstr "Geçersiz bit başına değer"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
-msgstr ""
+msgstr "Geçersiz veri_pini [%d]"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
-msgstr ""
+msgstr "Geçersiz biçim yığın boyutu"
 
 #: supervisor/shared/safe_mode.c
 msgid "Invalid memory access."
-msgstr ""
+msgstr "Geçersiz bellek erişimi."
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
-msgstr ""
+msgstr "Geçersiz multicast MAC adresi"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
-msgstr ""
+msgstr "Geçersiz boyut"
 
 #: ports/espressif/common-hal/ssl/SSLContext.c
 #: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "Invalid socket for TLS"
-msgstr ""
+msgstr "TLS için geçersiz soket"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid state"
-msgstr ""
+msgstr "Geçersiz durum"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
-msgstr ""
+msgstr "Anahtar 16, 24 veya 32 bayt uzunluğunda olmalıdır"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
-msgstr ""
+msgstr "LED eşlemeleri ekran boyutuyla eşleşmelidir"
 
 #: py/compile.c
 msgid "LHS of keyword arg must be an id"
@@ -1291,24 +1297,24 @@ msgstr ""
 
 #: shared-module/displayio/Group.c
 msgid "Layer already in a group"
-msgstr ""
+msgstr "Katman zaten bir grupta"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "Katman, bir Grup ya da TileGrid alt sınıfı olmalıdır"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
-msgstr ""
+msgstr "MAC adresi geçersiz"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
-msgstr ""
+msgstr "Map tuple olmalıdır"
 
 #: shared-module/displayio/Shape.c
 #, c-format
 msgid "Maximum x value when mirrored is %d"
-msgstr ""
+msgstr "İkizlendiğinde maksimum x değeri %d'dir"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Microphone startup delay must be in range 0.0 to 1.0"
@@ -1325,11 +1331,11 @@ msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI Pin"
-msgstr ""
+msgstr "Eksik MISO veya MOSI pini"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "Eksik MISO veya MOSI pini"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1385,11 +1391,11 @@ msgstr ""
 
 #: ports/espressif/common-hal/nvm/ByteArray.c
 msgid "NVS Error"
-msgstr ""
+msgstr "NVS hatası"
 
 #: py/qstr.c
 msgid "Name too long"
-msgstr ""
+msgstr "İsim çok uzun"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "New bitmap must be same size as old bitmap"
@@ -1427,43 +1433,43 @@ msgstr ""
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "IP yok"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "No MISO Pin"
-msgstr ""
+msgstr "MISO pini yok"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "MISO pini yok"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "No MOSI Pin"
-msgstr ""
+msgstr "MOSI pini yok"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "MOSI pini yok"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "No RX pin"
-msgstr ""
+msgstr "RX pini yok"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "No TX pin"
-msgstr ""
+msgstr "TX pini yok"
 
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "No available clocks"
-msgstr ""
+msgstr "Kullanılabilir saat yok"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "No capture in progress"

From b354cec8cb0a70896c3f2aee080f68e08e8849fd Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 6 Dec 2022 11:49:04 -0800
Subject: [PATCH 1521/2403] Three small ESP web workflow fixes

* Set nonblock on all accepted sockets. Not just ones for user code.
* Close an open websocket if another is accepted.
* Set debug level to INFO rather than DEBUG because DEBUG crashes
  on ESP32-S3 USB OTG.
---
 ports/espressif/common-hal/socketpool/Socket.c          | 2 +-
 ports/espressif/esp-idf-config/sdkconfig-debug.defaults | 8 ++++----
 supervisor/shared/web_workflow/websocket.c              | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 5f34d674b2..abb5124e0f 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -285,6 +285,7 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
         accepted->num = newsoc;
         accepted->pool = self->pool;
         accepted->connected = true;
+        lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
     }
 
     return newsoc;
@@ -303,7 +304,6 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
         sock->pool = self->pool;
         sock->connected = true;
 
-        lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
         return sock;
     } else {
         mp_raise_OSError(-newsoc);
diff --git a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
index e93b3d2825..bef5ee5fe8 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
@@ -8,8 +8,8 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG=y
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 # end of Bootloader config
 
@@ -72,8 +72,8 @@ CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
 # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
 # end of Log output
 
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 9d1cf9919f..7612066fa6 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -57,11 +57,15 @@ static _websocket cp_serial;
 
 void websocket_init(void) {
     socketpool_socket_reset(&cp_serial.socket);
+    cp_serial.closed = true;
 
     ringbuf_init(&_incoming_ringbuf, _buf, sizeof(_buf) - 1);
 }
 
 void websocket_handoff(socketpool_socket_obj_t *socket) {
+    if (!cp_serial.closed) {
+        common_hal_socketpool_socket_close(&cp_serial.socket);
+    }
     socketpool_socket_move(socket, &cp_serial.socket);
     cp_serial.closed = false;
     cp_serial.opcode = 0;

From 3965ef9c2a39904a7b2e429faf636b8b9acc5b82 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 6 Dec 2022 19:27:00 -0500
Subject: [PATCH 1522/2403] make esp32-box-lite sdkconfig same as box

---
 .../mpconfigboard.mk                          |  8 +++--
 .../espressif_esp32s3_box_lite/sdkconfig      | 36 ++++---------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
index 2e63089b9c..f4a746026a 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -5,6 +5,8 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-CIRCUITPY_ESP_FLASH_MODE=dio
-CIRCUITPY_ESP_FLASH_FREQ=40m
-CIRCUITPY_ESP_FLASH_SIZE=16MB
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig
index 7fcf8ef297..ead0088da5 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/sdkconfig
@@ -1,35 +1,11 @@
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_MODE_QUAD is not set
-CONFIG_SPIRAM_MODE_OCT=y
-CONFIG_SPIRAM_TYPE_AUTO=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=-1
-# end of SPI RAM config
-
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-#
-# PSRAM Clock and CS IO for ESP32S3
-#
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM Clock and CS IO for ESP32S3
-
-# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
-# CONFIG_SPIRAM_RODATA is not set
-CONFIG_SPIRAM_SPEED_80M=y
-# CONFIG_SPIRAM_SPEED_40M is not set
 CONFIG_SPIRAM=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+
 CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-# CONFIG_SPIRAM_USE_MEMMAP is not set
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-CONFIG_SPIRAM_USE_MALLOC=y
-CONFIG_SPIRAM_MEMTEST=y
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+CONFIG_SPIRAM_USE_MEMMAP=y
+
 #
 # LWIP
 #

From ff8d051eff97d55a5a41e2ff6dcfeb6c3f1e9506 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 7 Dec 2022 13:28:34 -0600
Subject: [PATCH 1523/2403] Add an additional large delay time at start for
 pico w boards

---
 ports/raspberrypi/supervisor/port.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index f6ddab2c12..05d53fcc8d 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -62,6 +62,7 @@
 #include "src/rp2_common/hardware_sync/include/hardware/sync.h"
 #include "src/rp2_common/hardware_timer/include/hardware/timer.h"
 #if CIRCUITPY_CYW43
+#include "py/mphal.h"
 #include "pico/cyw43_arch.h"
 #endif
 #include "src/common/pico_time/include/pico/time.h"
@@ -143,6 +144,11 @@ safe_mode_t port_init(void) {
     never_reset_pin_number(24);
     never_reset_pin_number(25);
     never_reset_pin_number(29);
+    // A small number of samples of pico w need an additional delay before
+    // initializing the cyw43 chip. Delays inside cyw43_arch_init_with_country
+    // are intended to meet the power on timing requirements, but apparently
+    // are inadequate. We'll back off this long delay based on future testing.
+    mp_hal_delay_ms(1000);
     // Change this as a placeholder as to how to init with country code.
     // Default country code is CYW43_COUNTRY_WORLDWIDE)
     if (cyw43_arch_init_with_country(PICO_CYW43_ARCH_DEFAULT_COUNTRY_CODE)) {

From a1dd8405f4648fdffc29e7a3ead8781d7fdb296c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 7 Dec 2022 15:14:30 -0600
Subject: [PATCH 1524/2403] use a more standard method of forward-declaring the
 structure

---
 ports/espressif/common-hal/socketpool/Socket.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h
index b189889cfd..6930db625e 100644
--- a/ports/espressif/common-hal/socketpool/Socket.h
+++ b/ports/espressif/common-hal/socketpool/Socket.h
@@ -34,6 +34,8 @@
 
 #include "components/esp-tls/esp_tls.h"
 
+typedef struct ssl_sslsocket_obj ssl_sslsocket_obj_t;
+
 typedef struct {
     mp_obj_base_t base;
     int num;
@@ -42,7 +44,7 @@ typedef struct {
     int ipproto;
     bool connected;
     socketpool_socketpool_obj_t *pool;
-    struct ssl_sslsocket_obj *ssl_socket;
+    ssl_sslsocket_obj_t *ssl_socket;
     mp_uint_t timeout_ms;
 } socketpool_socket_obj_t;
 

From 2326b49b24af673ca6c64a06e6f5b70a3c4811d8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 7 Dec 2022 15:14:54 -0600
Subject: [PATCH 1525/2403] switch this header to 'pragma once' since I'm
 touching it already

---
 ports/espressif/common-hal/socketpool/Socket.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h
index 6930db625e..45e36e58ca 100644
--- a/ports/espressif/common-hal/socketpool/Socket.h
+++ b/ports/espressif/common-hal/socketpool/Socket.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SOCKETPOOL_SOCKET_H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SOCKETPOOL_SOCKET_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -49,5 +48,3 @@ typedef struct {
 } socketpool_socket_obj_t;
 
 void socket_user_reset(void);
-
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SOCKETPOOL_SOCKET_H

From 68d510cb2f1868e7e5cab35aa3dfd1dbd1f719d4 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 7 Dec 2022 23:00:09 -0500
Subject: [PATCH 1526/2403] Update mpconfigboard.h

Configure LED pin for STATUS display and to prevent ESP floating pins from constantly lighting led dimly.
---
 ports/espressif/boards/bpi_picow_s3/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
index f7e7fde31b..a261ed17fa 100644
--- a/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
+++ b/ports/espressif/boards/bpi_picow_s3/mpconfigboard.h
@@ -31,6 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO46)
+
 #define DEFAULT_UART_BUS_RX (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO43)
 

From 99b8564e8f66bfec191669ed7360b8991ec92c2f Mon Sep 17 00:00:00 2001
From: s-ol 
Date: Thu, 8 Dec 2022 14:30:09 +0100
Subject: [PATCH 1527/2403] Add VfsFat.readonly property for getting current
 state

Previously the only other way of determining whether the Vfs has been mounted
read-write or read-only appears to be to attempt a write operation and detect a
possible OSError.

It wasn't possible for the user code to keep track of the state of the state
since the boot VM has to decide whether to (re)mount read-write or read-only,
but can't (easily) pass this information on to the runtime VM.
---
 extmod/vfs_fat.c                   | 13 +++++++++++++
 shared-bindings/storage/__init__.c |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 2a00566317..0a9737e53a 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -429,6 +429,18 @@ STATIC mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t times_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_utime_obj, vfs_fat_utime);
 
+STATIC mp_obj_t vfs_fat_getreadonly(mp_obj_t self_in) {
+    fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(!filesystem_is_writable_by_python(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getreadonly_obj, vfs_fat_getreadonly);
+STATIC const mp_obj_property_t fat_vfs_readonly_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&fat_vfs_getreadonly_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
 #if MICROPY_FATFS_USE_LABEL
 STATIC mp_obj_t vfs_fat_getlabel(mp_obj_t self_in) {
     fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
@@ -481,6 +493,7 @@ STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&vfs_fat_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&fat_vfs_umount_obj) },
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&fat_vfs_utime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readonly), MP_ROM_PTR(&fat_vfs_readonly_obj) },
     #if MICROPY_FATFS_USE_LABEL
     { MP_ROM_QSTR(MP_QSTR_label), MP_ROM_PTR(&fat_vfs_label_obj) },
     #endif
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 838395efb3..ad8b847fd5 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -258,6 +258,10 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     this property can only be set when the device is writable by the
 //|     microcontroller."""
 //|     ...
+//|     readonly: bool
+//|     """``True`` when the device is mounted as readonly by the microcontroller.
+//|     This property cannot be changed, use `storage.remount` instead."""
+//|     ...
 //|
 //|     def mkfs(self) -> None:
 //|         """Format the block device, deleting any data that may have been there"""

From ef2bfdb5db464eec9b947750cfa7eb9467adfa85 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 1 Dec 2022 16:43:08 -0600
Subject: [PATCH 1528/2403] dotenv becomes settings.toml

---
 devices/ble_hci/common-hal/_bleio/Adapter.c   |  16 +-
 docs/environment.rst                          |  32 +-
 docs/workflows.md                             |  14 +-
 locale/circuitpython.pot                      |  18 +
 .../espressif/bindings/esp32_camera/Camera.c  |   2 +-
 ports/espressif/bindings/espidf/__init__.c    |   2 +-
 ports/espressif/common-hal/_bleio/Adapter.c   |  34 +-
 ports/espressif/supervisor/port.c             |   4 +-
 ports/nrf/common-hal/_bleio/Adapter.c         |  15 +-
 .../unix/variants/coverage/mpconfigvariant.mk |   6 +-
 py/circuitpy_defns.mk                         |   6 +-
 py/circuitpy_mpconfig.mk                      |   6 +-
 .../{dotenv => _environ}/__init__.c           |  39 +-
 .../{dotenv => _environ}/__init__.h           |  10 +-
 shared-module/_environ/__init__.c             | 402 ++++++++++++++++++
 shared-module/{dotenv => _environ}/__init__.h |  25 +-
 shared-module/dotenv/__init__.c               | 312 --------------
 shared-module/os/__init__.c                   |   9 +-
 .../shared/web_workflow/static/directory.js   |   2 +-
 .../shared/web_workflow/static/welcome.html   |   2 +-
 supervisor/shared/web_workflow/web_workflow.c |  65 ++-
 tests/circuitpython/bad1.toml                 |   1 +
 tests/circuitpython/bad2.toml                 |   1 +
 tests/circuitpython/bad3.toml                 |   1 +
 tests/circuitpython/dotenv_test.env           |  37 --
 tests/circuitpython/dotenv_test.py            |  31 --
 tests/circuitpython/dotenv_test.py.exp        |  35 --
 tests/circuitpython/environ_test.py           |  42 ++
 tests/circuitpython/environ_test.py.exp       |  17 +
 tests/circuitpython/good.toml                 |  14 +
 tests/unix/extra_coverage.py.exp              |   8 +-
 31 files changed, 642 insertions(+), 566 deletions(-)
 rename shared-bindings/{dotenv => _environ}/__init__.c (68%)
 rename shared-bindings/{dotenv => _environ}/__init__.h (81%)
 create mode 100644 shared-module/_environ/__init__.c
 rename shared-module/{dotenv => _environ}/__init__.h (66%)
 delete mode 100644 shared-module/dotenv/__init__.c
 create mode 100644 tests/circuitpython/bad1.toml
 create mode 100644 tests/circuitpython/bad2.toml
 create mode 100644 tests/circuitpython/bad3.toml
 delete mode 100644 tests/circuitpython/dotenv_test.env
 delete mode 100644 tests/circuitpython/dotenv_test.py
 delete mode 100644 tests/circuitpython/dotenv_test.py.exp
 create mode 100644 tests/circuitpython/environ_test.py
 create mode 100644 tests/circuitpython/environ_test.py.exp
 create mode 100644 tests/circuitpython/good.toml

diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index 8c7b8f67eb..018b65de12 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -49,8 +49,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_DOTENV
-#include "shared-module/dotenv/__init__.h"
+#if CIRCUITPY_ENVIRON
+#include "shared-bindings/_environ/__init__.h"
 #endif
 
 #define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
@@ -284,15 +284,15 @@ char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0
 STATIC void bleio_adapter_hci_init(bleio_adapter_obj_t *self) {
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_DOTENV
-    char ble_name[32];
-    name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
-    if (name_len > 0) {
-        self->name = mp_obj_new_str(ble_name, (size_t)name_len);
+    #if CIRCUITPY_ENVIRON
+    mp_obj_t name = common_hal__environ_get_key("CIRCUITPY_BLE_NAME");
+    if (name != mp_const_none) {
+        mp_arg_validate_type_string(name, MP_QSTR_CIRCUITPY_BLE_NAME);
+        self->name = name;
     }
     #endif
 
-    if (name_len <= 0) {
+    if (!self->name) {
         name_len = sizeof(default_ble_name);
         bt_addr_t addr;
         hci_check_error(hci_read_bd_addr(&addr));
diff --git a/docs/environment.rst b/docs/environment.rst
index 5766b54380..457e5c3f88 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -6,24 +6,36 @@ variables are commonly used to store "secrets" such as Wi-Fi passwords and API
 keys. This method *does not* make them secure. It only separates them from the
 code.
 
-CircuitPython supports these by mimicking the `dotenv `_
-CPython library. Other languages such as Javascript, PHP and Ruby also have
-dotenv libraries.
+CircuitPython supports these by parsing a subset of the `toml `_ file format internally.
 
-These libraries store environment variables in a ``.env`` file. Here is a simple
-example:
+Here is a simple example:
 
 .. code-block:: bash
 
-  KEY1='value1'
+  KEY1="value1"
   # Comment
-  KEY2='value2
-  is multiple lines'
+  KEY2="value2\ncontains a newline"
 
-CircuitPython uses the ``.env`` at the drive root (no folder) as the environment.
+  [SECTION] # Only values in the "root table" are parsed
+  SECTION_VALUE = ... # so this value cannot be seen by getenv
+
+CircuitPython uses the ``settings.toml`` at the drive root (no folder) as the environment.
 User code can access the values from the file using `os.getenv()`. It is
 recommended to save any values used repeatedly in a variable because `os.getenv()`
-will parse the ``/.env`` on every access.
+will parse the ``settings.toml`` file contents on every access.
+
+Details of the toml language subset
+-----------------------------------
+
+* The content is required to be in UTF-8 encoding
+* The supported data types are string and integer
+* Only basic strings are supported, not triple-quoted strings
+* Only integers supported by strtol. (no 0o, no 0b, no underscores 1_000, 011
+  is 9, not 11)
+* Only bare keys are supported
+* Duplicate keys are not diagnosed.
+* Comments are supported
+* Only values from the "root table" can be retrieved
 
 CircuitPython behavior
 ----------------------
diff --git a/docs/workflows.md b/docs/workflows.md
index 26f5179b51..29229bd00e 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -46,7 +46,7 @@ connection, the central device can discover two default services. One for file t
 CircuitPython specifically that includes serial characteristics.
 
 To change the default BLE advertising name without (or before) running user code, the desired name
-can be put in the `/.env` file. The key is `CIRCUITPY_BLE_NAME`. It's limited to approximately
+can be put in the `settings.toml` file. The key is `CIRCUITPY_BLE_NAME`. It's limited to approximately
 30 characters depending on the port's settings and will be truncated if longer.
 
 ### File Transfer API
@@ -69,21 +69,21 @@ Read-only characteristic that returns the UTF-8 encoded version string.
 
 ## Web
 
-The web workflow is depends on adding Wi-Fi credentials into the `/.env` file. The keys are
+The web workflow is depends on adding Wi-Fi credentials into the `settings.toml` file. The keys are
 `CIRCUITPY_WIFI_SSID` and `CIRCUITPY_WIFI_PASSWORD`. Once these are defined, CircuitPython will
 automatically connect to the network and start the webserver used for the workflow. The webserver
 is on port 80 unless overridden by `CIRCUITPY_WEB_API_PORT`. It also enables MDNS.
 
-Here is an example `/.env`:
+Here is an example `/settings.toml`:
 
 ```bash
 # To auto-connect to Wi-Fi
-CIRCUITPY_WIFI_SSID='scottswifi'
-CIRCUITPY_WIFI_PASSWORD='secretpassword'
+CIRCUITPY_WIFI_SSID="scottswifi"
+CIRCUITPY_WIFI_PASSWORD="secretpassword"
 
 # To enable modifying files from the web. Change this too!
 # Leave the User field blank in the browser.
-CIRCUITPY_WEB_API_PASSWORD='passw0rd'
+CIRCUITPY_WEB_API_PASSWORD="passw0rd"
 
 CIRCUITPY_WEB_API_PORT=80
 ```
@@ -124,7 +124,7 @@ All file system related APIs are protected by HTTP basic authentication. It is *
 hopefully prevent some griefing in shared settings. The password is sent unencrypted so do not reuse
 a password with something important. The user field is left blank.
 
-The password is taken from `/.env` with the key `CIRCUITPY_WEB_API_PASSWORD`. If this is unset, the
+The password is taken from `settings.toml` with the key `CIRCUITPY_WEB_API_PASSWORD`. If this is unset, the
 server will respond with `403 Forbidden`. When a password is set, but not provided in a request, it
 will respond `401 Unauthorized`.
 
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 450b2eabd7..16a682cfdd 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1002,6 +1002,10 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
+#: shared-module/dotenv/__init__.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1184,6 +1188,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/dotenv/__init__.c
 msgid "Internal error"
 msgstr ""
 
@@ -1230,6 +1235,11 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/dotenv/__init__.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1260,10 +1270,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/dotenv/__init__.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/dotenv/__init__.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index a770ea8ff7..9bcd398612 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -63,7 +63,7 @@
 //|         """
 //|         Configure and initialize a camera with the given properties
 //|
-//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``/.env`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
+//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``settings.toml`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
 //|
 //|
 //|         .. important::
diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index c42a9e549d..12781000ae 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -132,7 +132,7 @@ STATIC mp_obj_t espidf_get_total_psram(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(espidf_get_total_psram_obj, espidf_get_total_psram);
 
 //| def get_reserved_psram() -> int:
-//|     """Returns number of bytes of psram reserved for use by esp-idf, either a board-specific default value or the value defined in ``/.env``."""
+//|     """Returns number of bytes of psram reserved for use by esp-idf, either a board-specific default value or the value defined in ``settings.toml``."""
 //|
 STATIC mp_obj_t espidf_get_reserved_psram(void) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_reserved_psram());
diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 5eaf6e9cf4..121beb8e90 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -59,8 +59,8 @@
 #include "esp_bt.h"
 #include "esp_nimble_hci.h"
 
-#if CIRCUITPY_DOTENV
-#include "shared-module/dotenv/__init__.h"
+#if CIRCUITPY_ENVIRON
+#include "shared-module/_environ/__init__.h"
 #endif
 
 bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
@@ -101,28 +101,24 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         ble_hs_cfg.sync_cb = _on_sync;
         // ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
-        #if CIRCUITPY_DOTENV
-        mp_int_t name_len = 0;
-        char ble_name[32];
-        name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
-        if (name_len > 0) {
-            if (name_len > MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH) {
-                name_len = MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH;
-            }
-            ble_name[name_len] = '\0';
+        #if CIRCUITPY_ENVIRON
+        char ble_name[1 + MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH];
+        _environ_err_t result = _environ_get_key_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
+        if (result == ENVIRON_OK) {
             ble_svc_gap_device_name_set(ble_name);
-        } else {
+        } else
+        #else
+        {
             ble_svc_gap_device_name_set("CIRCUITPY");
         }
-        #else
-        ble_svc_gap_device_name_set("CIRCUITPY");
         #endif
 
-        // Clear all of the internal connection objects.
-        for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
-            bleio_connection_internal_t *connection = &bleio_connections[i];
-            // Reset connection.
-            connection->conn_handle = BLEIO_HANDLE_INVALID;
+        {// Clear all of the internal connection objects.
+            for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
+                bleio_connection_internal_t *connection = &bleio_connections[i];
+                // Reset connection.
+                connection->conn_handle = BLEIO_HANDLE_INVALID;
+            }
         }
 
         cp_task = xTaskGetCurrentTaskHandle();
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 3106f4b991..e89fb8c976 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -55,7 +55,7 @@
 #include "shared-bindings/microcontroller/RunMode.h"
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/socketpool/__init__.h"
-#include "shared-module/dotenv/__init__.h"
+#include "shared-module/_environ/__init__.h"
 
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
@@ -519,7 +519,7 @@ void port_idle_until_interrupt(void) {
 void port_post_boot_py(bool heap_valid) {
     if (!heap_valid && filesystem_present()) {
         mp_int_t reserved;
-        if (dotenv_get_key_int("/.env", "CIRCUITPY_RESERVED_PSRAM", &reserved)) {
+        if (_environ_get_key_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
             common_hal_espidf_set_reserved_psram(reserved);
         }
         common_hal_espidf_reserve_psram();
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 49b5d638f3..012430704a 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -52,8 +52,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_DOTENV
-#include "shared-module/dotenv/__init__.h"
+#if CIRCUITPY_ENVIRON
+#include "shared-bindings/_environ/__init__.h"
 #endif
 
 #define BLE_MIN_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
@@ -345,12 +345,11 @@ STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
 
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_DOTENV
-    char ble_name[32];
-    name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
-    if (name_len > 0) {
-        ble_name[name_len] = '\0';
-        common_hal_bleio_adapter_set_name(self, (char *)ble_name);
+    #if CIRCUITPY_ENVIRON
+    mp_obj_t ble_name = common_hal__environ_get_key("CIRCUITPY_BLE_NAME");
+    if (ble_name != mp_const_none) {
+        common_hal_bleio_adapter_set_name(self, mp_obj_str_get_str(ble_name));
+        return;
     }
     #endif
 
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 1e8e59f9a9..a0e0f4f3bb 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -33,7 +33,7 @@ SRC_BITMAP := \
 	shared-bindings/aesio/__init__.c \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
-	shared-bindings/dotenv/__init__.c \
+	shared-bindings/_environ/__init__.c \
 	shared-bindings/rainbowio/__init__.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
@@ -45,7 +45,7 @@ SRC_BITMAP := \
 	shared-module/displayio/Bitmap.c \
 	shared-module/displayio/ColorConverter.c \
 	shared-module/displayio/ColorConverter.c \
-	shared-module/dotenv/__init__.c \
+	shared-module/_environ/__init__.c \
 	shared-module/rainbowio/__init__.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
@@ -56,7 +56,7 @@ CFLAGS += \
 	-DCIRCUITPY_AESIO=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
-	-DCIRCUITPY_DOTENV=1 \
+	-DCIRCUITPY_ENVIRON=1 \
 	-DCIRCUITPY_GIFIO=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
 	-DCIRCUITPY_TRACEBACK=1 \
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 70310106f0..7d8fa6bada 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -182,8 +182,8 @@ endif
 ifeq ($(CIRCUITPY_DISPLAYIO),1)
 SRC_PATTERNS += displayio/%
 endif
-ifeq ($(CIRCUITPY_DOTENV),1)
-SRC_PATTERNS += dotenv/%
+ifeq ($(CIRCUITPY_ENVIRON),1)
+SRC_PATTERNS += _environ/%
 endif
 ifeq ($(CIRCUITPY__EVE),1)
 SRC_PATTERNS += _eve/%
@@ -589,7 +589,7 @@ SRC_SHARED_MODULE_ALL = \
 	displayio/TileGrid.c \
 	displayio/area.c \
 	displayio/__init__.c \
-	dotenv/__init__.c \
+	_environ/__init__.c \
 	floppyio/__init__.c \
 	fontio/BuiltinFont.c \
 	fontio/__init__.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 3ca23263d4..a6a1118d2d 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -208,9 +208,6 @@ CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS)
 CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO)
 CFLAGS += -DCIRCUITPY_VECTORIO=$(CIRCUITPY_VECTORIO)
 
-CIRCUITPY_DOTENV ?= $(CIRCUITPY_FULL_BUILD)
-CFLAGS += -DCIRCUITPY_DOTENV=$(CIRCUITPY_DOTENV)
-
 CIRCUITPY_DUALBANK ?= 0
 CFLAGS += -DCIRCUITPY_DUALBANK=$(CIRCUITPY_DUALBANK)
 
@@ -218,6 +215,9 @@ CFLAGS += -DCIRCUITPY_DUALBANK=$(CIRCUITPY_DUALBANK)
 CIRCUITPY_ENABLE_MPY_NATIVE ?= 0
 CFLAGS += -DCIRCUITPY_ENABLE_MPY_NATIVE=$(CIRCUITPY_ENABLE_MPY_NATIVE)
 
+CIRCUITPY_ENVIRON ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_ENVIRON=$(CIRCUITPY_ENVIRON)
+
 CIRCUITPY_ERRNO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 
diff --git a/shared-bindings/dotenv/__init__.c b/shared-bindings/_environ/__init__.c
similarity index 68%
rename from shared-bindings/dotenv/__init__.c
rename to shared-bindings/_environ/__init__.c
index 193338c7c2..81d778f3ed 100644
--- a/shared-bindings/dotenv/__init__.c
+++ b/shared-bindings/_environ/__init__.c
@@ -33,11 +33,11 @@
 #include "py/obj.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
-#include "shared-bindings/dotenv/__init__.h"
+#include "shared-bindings/_environ/__init__.h"
 
 //| """Functions to manage environment variables from a .env file.
 //|
-//|    A subset of the CPython `dotenv library `_. It does
+//|    A subset of the CPython `_environ library `_. It does
 //|    not support variables or double quotes.
 //|
 //|    Keys and values may be put in single quotes.
@@ -71,43 +71,30 @@
 //| import typing
 //|
 
-//| def get_key(dotenv_path: str, key_to_get: str) -> Optional[str]:
+//| def get_key(_environ_path: str, key_to_get: str) -> Optional[str]:
 //|     """Get the value for the given key from the given .env file. If the key occurs multiple
 //|     times in the file, then the last value will be returned.
 //|
 //|     Returns None if the key isn't found or doesn't have a value."""
 //|     ...
 //|
-STATIC mp_obj_t _dotenv_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
-    return common_hal_dotenv_get_key(mp_obj_str_get_str(path_in),
+STATIC mp_obj_t __environ_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
+    return common_hal__environ_get_key_path(mp_obj_str_get_str(path_in),
         mp_obj_str_get_str(key_to_get_in));
 }
-MP_DEFINE_CONST_FUN_OBJ_2(dotenv_get_key_obj, _dotenv_get_key);
+MP_DEFINE_CONST_FUN_OBJ_2(_environ_get_key_obj, __environ_get_key);
 
-//| def load_dotenv() -> None:
-//|     """Does nothing in CircuitPython because os.getenv will automatically read .env when
-//|     available.
-//|
-//|     Present in CircuitPython so CPython-compatible code can use it without error."""
-//|     ...
-//|
-STATIC mp_obj_t dotenv_load_dotenv(void) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(dotenv_load_dotenv_obj, dotenv_load_dotenv);
+STATIC const mp_rom_map_elem_t _environ_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__environ) },
 
-STATIC const mp_rom_map_elem_t dotenv_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_dotenv) },
-
-    { MP_ROM_QSTR(MP_QSTR_get_key), MP_ROM_PTR(&dotenv_get_key_obj) },
-    { MP_ROM_QSTR(MP_QSTR_load_dotenv), MP_ROM_PTR(&dotenv_load_dotenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_key), MP_ROM_PTR(&_environ_get_key_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(dotenv_module_globals, dotenv_module_globals_table);
+STATIC MP_DEFINE_CONST_DICT(_environ_module_globals, _environ_module_globals_table);
 
-const mp_obj_module_t dotenv_module = {
+const mp_obj_module_t _environ_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&dotenv_module_globals,
+    .globals = (mp_obj_dict_t *)&_environ_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_dotenv, dotenv_module, CIRCUITPY_DOTENV);
+MP_REGISTER_MODULE(MP_QSTR__environ, _environ_module, CIRCUITPY_ENVIRON);
diff --git a/shared-bindings/dotenv/__init__.h b/shared-bindings/_environ/__init__.h
similarity index 81%
rename from shared-bindings/dotenv/__init__.h
rename to shared-bindings/_environ/__init__.h
index 18a6c280dd..7779f3ac82 100644
--- a/shared-bindings/dotenv/__init__.h
+++ b/shared-bindings/_environ/__init__.h
@@ -24,16 +24,14 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H
+#pragma once
 
 #include 
 #include 
 
 #include "py/objtuple.h"
 
-#include "shared-module/dotenv/__init__.h"
+#include "shared-module/_environ/__init__.h"
 
-mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key);
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_DOTENV___INIT___H
+mp_obj_t common_hal__environ_get_key_path(const char *path, const char *key);
+mp_obj_t common_hal__environ_get_key(const char *key);
diff --git a/shared-module/_environ/__init__.c b/shared-module/_environ/__init__.c
new file mode 100644
index 0000000000..7e6e133e1a
--- /dev/null
+++ b/shared-module/_environ/__init__.c
@@ -0,0 +1,402 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2022 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 
+#include 
+
+#include "shared-bindings/_environ/__init__.h"
+
+#include "py/gc.h"
+#include "py/misc.h"
+#include "py/mpstate.h"
+#include "py/objstr.h"
+#include "py/parsenum.h"
+#include "py/runtime.h"
+#include "supervisor/filesystem.h"
+#include "supervisor/memory.h"
+
+#define ENVIRON_PATH "settings.toml"
+
+#if defined(UNIX)
+typedef FILE *file_arg;
+STATIC bool open_file(const char *name, file_arg *active_file) {
+    FILE *result = fopen(name, "r");
+    if (result) {
+        *active_file = result;
+    }
+    return result != NULL;
+}
+STATIC void close_file(file_arg *active_file) {
+    fclose(*active_file);
+}
+STATIC bool is_eof(file_arg *active_file) {
+    return feof(*active_file);
+}
+STATIC uint8_t get_next_byte(file_arg *active_file) {
+    int value = fgetc(*active_file);
+    if (value == EOF) {
+        return 0;
+    }
+    return value;
+}
+__attribute__((unused))
+STATIC void seek_eof(file_arg *active_file) {
+    fseek(*active_file, 0, SEEK_END);
+    (void)fgetc(*active_file);
+}
+#else
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+typedef FIL file_arg;
+STATIC bool open_file(const char *name, file_arg *active_file) {
+    FATFS *fs = filesystem_circuitpy();
+    FRESULT result = f_open(fs, active_file, name, FA_READ);
+    return result == FR_OK;
+}
+STATIC void close_file(file_arg *active_file) {
+    // nothing
+}
+STATIC bool is_eof(file_arg *active_file) {
+    return f_eof(active_file);
+}
+
+// Return 0 if there is no next character (EOF).
+STATIC uint8_t get_next_byte(FIL *active_file) {
+    uint8_t character = 0;
+    UINT quantity_read;
+    // If there's an error or quantity_read is 0, character will remain 0.
+    f_read(active_file, &character, 1, &quantity_read);
+    return character;
+}
+STATIC void seek_eof(file_arg *active_file) {
+    f_lseek(active_file, f_size(active_file));
+}
+#endif
+
+// For a fixed buffer, record the required size rather than throwing
+STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) {
+    if (!vstr->fixed_buf || vstr->alloc > vstr->len) {
+        vstr_add_byte(vstr, b);
+    } else {
+        vstr->len++;
+    }
+}
+
+// For a fixed buffer, record the required size rather than throwing
+STATIC void vstr_add_char_nonstd(vstr_t *vstr, unichar c) {
+    size_t ulen =
+        (c < 0x80) ? 1 :
+        (c < 0x800) ? 2 :
+        (c < 0x10000) ? 3 : 4;
+    if (!vstr->fixed_buf || vstr->alloc > vstr->len + ulen) {
+        vstr_add_char(vstr, c);
+    } else {
+        vstr->len += ulen;
+    }
+}
+
+STATIC void next_line(file_arg *active_file) {
+    uint8_t character;
+    do {
+        character = get_next_byte(active_file);
+    } while (character != 0 && character != '\n');
+}
+
+// Discard whitespace, except for newlines, returning the next character after the whitespace.
+// Return 0 if there is no next character (EOF).
+STATIC uint8_t consume_whitespace(file_arg *active_file) {
+    uint8_t character;
+    do {
+        character = get_next_byte(active_file);
+    } while (character != '\n' && character != 0 && unichar_isspace(character));
+    return character;
+}
+
+// Starting at the start of a new line, determines if the key matches the given
+// key.
+//
+// If result is true, the key matches and file pointer is pointing just after the "=".
+// If the result is false, the key does NOT match and the file pointer is
+// pointing at the start of the next line, if any
+STATIC bool key_matches(file_arg *active_file, const char *key) {
+    uint8_t character;
+    character = consume_whitespace(active_file);
+    if (character == '[' || character == 0) {
+        seek_eof(active_file);
+        return false;
+    }
+    while (*key) {
+        if (character != *key++) {
+            // A character didn't match the key, so it's not a match
+            // If the non-matching char was not the end of the line,
+            // then consume the rest of the line
+            if (character != '\n') {
+                next_line(active_file);
+            }
+            return false;
+        }
+        character = get_next_byte(active_file);
+    }
+    // the next character could be whitespace; consume if necessary
+    if (unichar_isspace(character)) {
+        character = consume_whitespace(active_file);
+    }
+    // If we're not looking at the "=" then the key didn't match
+    if (character != '=') {
+        // A character didn't match the key, so it's not a match
+        // If the non-matching char was not the end of the line,
+        // then consume the rest of the line
+        if (character != '\n') {
+            next_line(active_file);
+        }
+        return false;
+    }
+    return true;
+}
+
+STATIC _environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) {
+    char hex_buf[sz + 1];
+    for (int i = 0; i < sz; i++) {
+        hex_buf[i] = get_next_byte(active_file);
+    }
+    hex_buf[sz] = 0;
+    char *end;
+    unsigned long c = strtoul(hex_buf, &end, 16);
+    if (end != &hex_buf[sz]) {
+        return ENVIRON_ERR_UNEXPECTED | *end;
+    }
+    if (c >= 0x110000) {
+        return ENVIRON_ERR_UNICODE;
+    }
+    vstr_add_char_nonstd(buf, c);
+    return ENVIRON_OK;
+}
+
+// Read a quoted string
+STATIC _environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
+    while (true) {
+        int character = get_next_byte(active_file);
+        switch (character) {
+            case 0:
+            case '\n':
+                return ENVIRON_ERR_UNEXPECTED | character;
+
+            case '"':
+                character = consume_whitespace(active_file);
+                switch (character) {
+                    case '#':
+                        next_line(active_file);
+                        MP_FALLTHROUGH;
+                    case '\n':
+                        return ENVIRON_OK;
+                    default:
+                        return ENVIRON_ERR_UNEXPECTED | character;
+                }
+
+            case '\\':
+                character = get_next_byte(active_file);
+                switch (character) {
+                    case 0:
+                    case '\n':
+                        return ENVIRON_ERR_UNEXPECTED | character;
+                    case 'b':
+                        character = '\b';
+                        break;
+                    case 'r':
+                        character = '\r';
+                        break;
+                    case 'n':
+                        character = '\n';
+                        break;
+                    case 't':
+                        character = '\t';
+                        break;
+                    case 'v':
+                        character = '\v';
+                        break;
+                    case 'f':
+                        character = '\f';
+                        break;
+                    case 'U':
+                    case 'u': {
+                        int sz = (character == 'u') ? 4 : 8;
+                        _environ_err_t res;
+                        res = read_unicode_escape(active_file, sz, buf);
+                        if (res != ENVIRON_OK) {
+                            return res;
+                        }
+                        continue;
+                    }
+                        // default falls through, other escaped characters
+                        // represent themselves
+                }
+                MP_FALLTHROUGH;
+            default:
+                vstr_add_byte_nonstd(buf, character);
+        }
+    }
+}
+
+// Read a numeric value (non-quoted value) as a string
+STATIC _environ_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) {
+    int character = first_character;
+    while (true) {
+        switch (character) {
+            case 0:
+                return ENVIRON_ERR_UNEXPECTED | character;
+            case '\n':
+                return ENVIRON_OK;
+            case '#':
+                next_line(active_file);
+                return ENVIRON_OK;
+            default:
+                vstr_add_byte_nonstd(buf, character);
+        }
+        character = get_next_byte(active_file);
+    }
+}
+
+STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) {
+    uint8_t character;
+    character = consume_whitespace(active_file);
+    *quoted = (character == '"');
+
+    if (*quoted) {
+        return read_string_value(active_file, buf);
+    } else {
+        return read_bare_value(active_file, buf, character);
+    }
+}
+
+STATIC _environ_err_t _environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
+    file_arg active_file;
+    if (!open_file(path, &active_file)) {
+        return ENVIRON_ERR_OPEN;
+    }
+
+    _environ_err_t result = ENVIRON_ERR_NOT_FOUND;
+    while (!is_eof(&active_file)) {
+        if (key_matches(&active_file, key)) {
+            result = read_value(&active_file, buf, quoted);
+        }
+    }
+    close_file(&active_file);
+    return result;
+}
+
+STATIC _environ_err_t _environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
+    vstr_t buf;
+    vstr_init_fixed_buf(&buf, value_len, value);
+    _environ_err_t result = _environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
+
+    if (result == ENVIRON_OK) {
+        vstr_add_byte_nonstd(&buf, 0);
+        memcpy(value, buf.buf, MIN(buf.len, value_len));
+        if (buf.len > value_len) {
+            result = ENVIRON_ERR_LENGTH;
+        }
+    }
+    return result;
+}
+
+_environ_err_t _environ_get_key_str(const char *key, char *value, size_t value_len) {
+    bool quoted;
+    _environ_err_t result = _environ_get_key_buf_terminated(key, value, value_len, "ed);
+    if (result == ENVIRON_OK && !quoted) {
+        result = ENVIRON_ERR_UNEXPECTED | value[0];
+    }
+    return result;
+}
+
+STATIC void throw__environ_error(_environ_err_t error) {
+    if (error == ENVIRON_OK) {
+        return;
+    }
+    if (error & ENVIRON_ERR_UNEXPECTED) {
+        byte character = (error & 0xff);
+        mp_print_t print;
+        vstr_t vstr;
+        vstr_init_print(&vstr, 8 + 4 + 1, &print);
+        if (character) {
+            mp_str_print_quoted(&print, &character, 1, true);
+        } else {
+            mp_str_print_quoted(&print, (byte *)"EOF", 3, true);
+        }
+        mp_raise_ValueError_varg(translate("Invalid byte %.*s"),
+            vstr.len, vstr.buf);
+    }
+    switch (error) {
+        case ENVIRON_ERR_OPEN:
+            mp_raise_ValueError(translate("File not found"));
+        case ENVIRON_ERR_UNICODE:
+            mp_raise_ValueError(translate("Invalid unicode escape"));
+        case ENVIRON_ERR_NOT_FOUND:
+            mp_raise_ValueError(translate("Key not found"));
+        default:
+            mp_raise_RuntimeError(translate("Internal error"));
+    }
+}
+
+mp_obj_t common_hal__environ_get_key_path(const char *path, const char *key) {
+    vstr_t buf;
+    bool quoted;
+
+    vstr_init(&buf, 64);
+    _environ_err_t result = _environ_get_key_vstr(path, key, &buf, "ed);
+    if (result == ENVIRON_ERR_NOT_FOUND) {
+        return mp_const_none;
+    }
+    throw__environ_error(result);
+
+    if (quoted) {
+        return mp_obj_new_str_from_vstr(&mp_type_str, &buf);
+    } else {
+        return mp_parse_num_integer(buf.buf, buf.len, 0, NULL);
+    }
+}
+
+mp_obj_t common_hal__environ_get_key(const char *key) {
+    return common_hal__environ_get_key_path(ENVIRON_PATH, key);
+}
+
+_environ_err_t _environ_get_key_int(const char *key, mp_int_t *value) {
+    char buf[16];
+    bool quoted;
+    _environ_err_t result = _environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
+    if (result != ENVIRON_OK) {
+        return result;
+    }
+    if (quoted) {
+        return ENVIRON_ERR_UNEXPECTED | '"';
+    }
+    char *end;
+    long num = strtol(buf, &end, 0);
+    if (end == buf || *end) { // If the whole buffer was not consumed it's an error
+        return ENVIRON_ERR_UNEXPECTED | *end;
+    }
+    *value = (mp_int_t)num;
+    return ENVIRON_OK;
+}
diff --git a/shared-module/dotenv/__init__.h b/shared-module/_environ/__init__.h
similarity index 66%
rename from shared-module/dotenv/__init__.h
rename to shared-module/_environ/__init__.h
index fb27233692..c96eb028b8 100644
--- a/shared-module/dotenv/__init__.h
+++ b/shared-module/_environ/__init__.h
@@ -24,13 +24,22 @@
  * THE SOFTWARE.
  */
 
+#pragma once
+
+typedef enum {
+    ENVIRON_OK = 0,
+    ENVIRON_ERR_OPEN,
+    ENVIRON_ERR_UNICODE,
+    ENVIRON_ERR_LENGTH,
+    ENVIRON_ERR_NOT_FOUND,
+    ENVIRON_ERR_UNEXPECTED = 0xff00, // logical or'd with the byte value
+} _environ_err_t;
+
 // Allocation free version that returns the full length of the value.
-mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len);
+// If it fits, the return value is 0-terminated. If the value doesn't fit,
+// *value_len may be an over-estimate but never an under-estimate.
+_environ_err_t _environ_get_key_str(const char *key, char *value, size_t value_len);
 
-// Returns true and sets value to a '\0'-terminated string if key is present
-// and the value (including the terminating '\0') fits strictly within
-// value_len bytes.
-bool dotenv_get_key_terminated(const char *path, const char *key, char *value, mp_int_t value_len);
-
-// Returns true and sets value to the read value.  Returns false if the value was not numeric.
-bool dotenv_get_key_int(const char *path, const char *key, mp_int_t *value);
+// Returns ENVIRON_ERR_OK and sets value to the read value.  Returns
+// ENVIRON_ERR_... if the value was not numeric. allocation-free.
+_environ_err_t _environ_get_key_int(const char *key, mp_int_t *value);
diff --git a/shared-module/dotenv/__init__.c b/shared-module/dotenv/__init__.c
deleted file mode 100644
index ead7c6561b..0000000000
--- a/shared-module/dotenv/__init__.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: Copyright (c) 2022 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 
-#include 
-
-#include "shared-bindings/dotenv/__init__.h"
-
-#include "py/misc.h"
-#include "py/mpstate.h"
-#include "py/objstr.h"
-#include "supervisor/filesystem.h"
-
-#if defined(UNIX)
-typedef FILE *file_arg;
-STATIC bool open_file(const char *name, file_arg *active_file) {
-    FILE *result = fopen(name, "r");
-    if (result) {
-        *active_file = result;
-    }
-    return result != NULL;
-}
-STATIC void close_file(file_arg *active_file) {
-    fclose(*active_file);
-}
-STATIC uint8_t get_next_character(file_arg *active_file) {
-    int value = fgetc(*active_file);
-    if (value == EOF) {
-        return 0;
-    }
-    return value;
-}
-STATIC void seek_minus_one(file_arg *active_file) {
-    fseek(*active_file, -1, SEEK_CUR);
-}
-#else
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-typedef FIL file_arg;
-STATIC bool open_file(const char *name, file_arg *active_file) {
-    FATFS *fs = filesystem_circuitpy();
-    FRESULT result = f_open(fs, active_file, name, FA_READ);
-    return result == FR_OK;
-}
-STATIC void close_file(file_arg *active_file) {
-    // nothing
-}
-
-// Return 0 if there is no next character (EOF).
-STATIC uint8_t get_next_character(FIL *active_file) {
-    uint8_t character = 0;
-    UINT quantity_read;
-    // If there's an error or quantity_read is 0, character will remain 0.
-    f_read(active_file, &character, 1, &quantity_read);
-    return character;
-}
-STATIC void seek_minus_one(file_arg *active_file) {
-    f_lseek(active_file, f_tell(active_file) - 1);
-}
-#endif
-
-// Discard whitespace, except for newlines, returning the next character after the whitespace.
-// Return 0 if there is no next character (EOF).
-STATIC uint8_t consume_whitespace(file_arg *active_file) {
-    uint8_t character;
-    do {
-        character = get_next_character(active_file);
-    } while (character != '\n' && character != 0 && unichar_isspace(character));
-    return character;
-}
-
-// Starting at the start of a new line, determines if the key matches the given
-// key. File pointer is set to be just before the = after the key.
-STATIC bool key_matches(file_arg *active_file, const char *key) {
-    uint8_t character;
-    character = consume_whitespace(active_file);
-    if (character == 0) {
-        return false;
-    }
-    bool quoted = false;
-    if (character == '\'') {
-        // Beginning of single-quoted string.
-        quoted = true;
-        character = get_next_character(active_file);
-    }
-    size_t key_pos = 0;
-    bool escaped = false;
-    bool matches = true;
-    size_t key_len = strlen(key);
-    while (character != 0) {
-        if (character == '\\' && !escaped && quoted) {
-            escaped = true;
-        } else if (!escaped && quoted && character == '\'') {
-            quoted = false;
-            // End of quoted key. Skip over the ending quote.
-            character = get_next_character(active_file);
-            break;
-        } else if (!quoted && (unichar_isspace(character) || character == '=' || character == '\n' || character == '#' || character == 0)) {
-            // End of unquoted key.
-            break;
-        } else {
-            // Still on tentative key; see if it matches the next supplied key character,
-            // but don't run off the end of the supplied key.
-            if (key_pos < key_len) {
-                matches = matches && (unsigned char)key[key_pos] == character;
-                escaped = false;
-                key_pos++;
-            } else {
-                // Key on line is too long.
-                matches = false;
-            }
-        }
-        character = get_next_character(active_file);
-    }
-    if (character == '=' || character == '\n' || character == '#' || character == 0) {
-        // Rewind one so the value, if any, can be found.
-        seek_minus_one(active_file);
-    } else if (!unichar_isspace(character)) {
-        // We're followed by something else that is invalid syntax.
-        matches = false;
-    }
-
-    return matches && key_pos == key_len;
-}
-
-STATIC bool next_line(file_arg *active_file) {
-    uint8_t character;
-    bool quoted = false;
-    bool escaped = false;
-    // Track comments because they last until the end of the line.
-    bool comment = false;
-    // Consume all characters while quoted or others up to \n.
-    do {
-        character = get_next_character(active_file);
-
-        if ((!quoted || character == '#') || comment) {
-            // Comments consume any escaping.
-            comment = true;
-        } else if (!escaped) {
-            if (character == '\'') {
-                quoted = !quoted;
-            } else if (character == '\\') {
-                escaped = true;
-            }
-        } else {
-            escaped = false;
-        }
-    } while (character != 0 && (quoted || character != '\n'));
-
-    return character != 0;
-}
-
-STATIC mp_int_t read_value(file_arg *active_file, char *value, size_t value_len) {
-    uint8_t character;
-    // Consume spaces before "=", and get first character of interest.
-    character = consume_whitespace(active_file);
-    if (character != '=') {
-        if (character == '#' || character == '\n') {
-            // Keys without an = after them are valid with the value None.
-            return -1;
-        }
-        // All other characters are invalid.
-        return -1;
-    }
-    // Consume space after =
-    if (character != '#') {
-        // a # immediately after = is part of the value!
-        character = consume_whitespace(active_file);
-    }
-    bool quoted = false;
-    if (character == '\'') {
-        quoted = true;
-        character = get_next_character(active_file);
-    }
-    if (character == '"') {
-        // We don't support double quoted values.
-        return -1;
-    }
-    // Copy the value over.
-    size_t value_pos = 0;
-    bool escaped = false;
-    // Count trailing spaces so we can ignore them at the end of unquoted
-    // values.
-    size_t trailing_spaces = 0;
-    bool first_char = true;
-    while (character != 0) {
-        // Consume the first \ if the value is quoted.
-        if (quoted && character == '\\' && !escaped) {
-            escaped = true;
-            // Drop this backslash by short circuiting the rest of the loop.
-            character = get_next_character(active_file);
-            continue;
-        }
-        if (quoted && !escaped && character == '\'') {
-            // trailing ' means the value is done.
-            break;
-        }
-        // Unquoted values are ended by a newline or comment.
-        if (!quoted && (character == '\n' || (character == '#' && !first_char))) {
-            if (character == '\n') {
-                // Rewind one so the next_line can find the \n.
-                seek_minus_one(active_file);
-            }
-            break;
-        }
-        if (!quoted && unichar_isspace(character)) {
-            trailing_spaces += 1;
-        } else {
-            trailing_spaces = 0;
-        }
-        escaped = false;
-        // Only copy the value over if we have space. Otherwise, we'll just
-        // count the overall length.
-        if (value_pos < value_len) {
-            value[value_pos] = character;
-        }
-        value_pos++;
-        character = get_next_character(active_file);
-        first_char = false;
-    }
-
-    return value_pos - trailing_spaces;
-}
-
-mp_int_t dotenv_get_key(const char *path, const char *key, char *value, mp_int_t value_len) {
-    file_arg active_file;
-    if (!open_file(path, &active_file)) {
-        return -1;
-    }
-
-    mp_int_t actual_value_len = -1;
-    bool read_ok = true;
-    while (read_ok) {
-        if (key_matches(&active_file, key)) {
-            actual_value_len = read_value(&active_file, value, value_len);
-        }
-
-        read_ok = next_line(&active_file);
-    }
-    close_file(&active_file);
-    return actual_value_len;
-}
-
-mp_obj_t common_hal_dotenv_get_key(const char *path, const char *key) {
-    // Use the stack for short values. Longer values will require a heap allocation after we know
-    // the length.
-    char value[64];
-    mp_int_t actual_len = dotenv_get_key(path, key, value, sizeof(value));
-    if (actual_len < 0) {
-        return mp_const_none;
-    }
-    if ((size_t)actual_len >= sizeof(value)) {
-        byte *buf = m_new(byte, actual_len + 1);
-        dotenv_get_key(path, key, (char *)buf, actual_len);
-        buf[actual_len] = 0;
-
-        mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
-        o->base.type = &mp_type_str;
-        o->len = actual_len;
-        o->data = buf;
-        o->hash = qstr_compute_hash(buf, actual_len);
-
-        return MP_OBJ_FROM_PTR(o);
-    }
-    return mp_obj_new_str(value, actual_len);
-}
-
-bool dotenv_get_key_terminated(const char *path, const char *key, char *value, mp_int_t value_len) {
-    mp_int_t actual_len = dotenv_get_key(path, key, value, value_len - 1);
-    if (actual_len >= value_len) {
-        return false;
-    }
-    value[actual_len] = '\0'; // terminate string
-    return true;
-}
-
-bool dotenv_get_key_int(const char *path, const char *key, mp_int_t *value) {
-    char buf[16];
-    if (!dotenv_get_key_terminated(path, key, buf, (mp_int_t)sizeof(buf))) {
-        return false;
-    }
-    char *end;
-    long result = strtol(buf, &end, 0);
-    if (end == buf || *end) { // If the whole buffer was not consumed it's an error
-        return false;
-    }
-    *value = (mp_int_t)result;
-    return true;
-}
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index 200fcb2f61..57e7e62932 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -36,8 +36,8 @@
 #include "py/runtime.h"
 #include "shared-bindings/os/__init__.h"
 
-#if CIRCUITPY_DOTENV
-#include "shared-bindings/dotenv/__init__.h"
+#if CIRCUITPY_ENVIRON
+#include "shared-bindings/_environ/__init__.h"
 #endif
 
 // This provides all VFS related OS functions so that ports can share the code
@@ -112,8 +112,9 @@ mp_obj_t common_hal_os_getcwd(void) {
 }
 
 mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
-    #if CIRCUITPY_DOTENV
-    mp_obj_t env_obj = common_hal_dotenv_get_key("/.env", key);
+    #if CIRCUITPY_ENVIRON
+    mp_obj_t env_obj = common_hal__environ_get_key(key);
+    // TODO must be a str object
     if (env_obj != mp_const_none) {
         return env_obj;
     }
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index c1d934c1a8..a89d5e5602 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -95,7 +95,7 @@ async function refresh_list() {
         if (f.directory) {
             icon = "📁";
         } else if(f.name.endsWith(".txt") ||
-                  f.name.endsWith(".env") ||
+                  f.name.endsWith(".toml") ||
                   f.name.endsWith(".py") ||
                   f.name.endsWith(".js") ||
                   f.name.endsWith(".json")) {
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index e773bb6a2e..efbb30e312 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -12,7 +12,7 @@
 
     
     Welcome!
    
 
-    
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the full code editor for a more enriching experience which requires an active internet connection. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /.env. Provide the password when the browser prompts for it. Leave the username blank.
    
+    
    Welcome to CircuitPython's Web API. Go to the file browser to work with files in the CIRCUITPY drive. Go to the full code editor for a more enriching experience which requires an active internet connection. Go to the serial terminal to see code output and interact with the REPL. Make sure you've set CIRCUITPY_WEB_API_PASSWORD='somepassword' in /settings.toml. Provide the password when the browser prompts for it. Leave the username blank.
    
 
     
    Device Info:
    
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 231b1e8ffb..d54f853891 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -64,8 +64,8 @@
 #include "shared-bindings/wifi/__init__.h"
 #endif
 
-#if CIRCUITPY_DOTENV
-#include "shared-module/dotenv/__init__.h"
+#if CIRCUITPY_ENVIRON
+#include "shared-module/_environ/__init__.h"
 #endif
 
 enum request_state {
@@ -115,7 +115,7 @@ static wifi_radio_error_t _last_wifi_status = WIFI_RADIO_ERROR_NONE;
 static mdns_server_obj_t mdns;
 #endif
 
-static uint32_t web_api_port = 80;
+static mp_int_t web_api_port = 80;
 
 static socketpool_socketpool_obj_t pool;
 static socketpool_socket_obj_t listening;
@@ -244,22 +244,23 @@ void supervisor_web_workflow_status(void) {
 #endif
 
 void supervisor_start_web_workflow(void) {
-    #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI
-
+    #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_ENVIRON
 
     char ssid[33];
     char password[64];
-    mp_int_t ssid_len = 0;
-    mp_int_t password_len = 0;
+    size_t ssid_len = 0;
+    size_t password_len = 0;
 
-    #if CIRCUITPY_DOTENV
-    ssid_len = dotenv_get_key("/.env", "CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid) - 1);
-    password_len = dotenv_get_key("/.env", "CIRCUITPY_WIFI_PASSWORD", password, sizeof(password) - 1);
-    #endif
-    if (ssid_len <= 0 || (size_t)ssid_len >= sizeof(ssid) ||
-        password_len <= 0 || (size_t)password_len >= sizeof(password)) {
+    _environ_err_t result = _environ_get_key_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
+    if (result != ENVIRON_OK) {
         return;
     }
+
+    result = _environ_get_key_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
+    if (result != ENVIRON_OK) {
+        return;
+    }
+
     if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
         common_hal_wifi_init(false);
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
@@ -268,9 +269,6 @@ void supervisor_start_web_workflow(void) {
     // TODO: Do our own scan so that we can find the channel we want before calling connect.
     // Otherwise, connect will do a full slow scan to pick the best AP.
 
-    // NUL terminate the strings because dotenv doesn't.
-    ssid[ssid_len] = '\0';
-    password[password_len] = '\0';
     // We can all connect again because it will return early if we're already connected to the
     // network. If we are connected to a different network, then it will disconnect before
     // attempting to connect to the given network.
@@ -283,21 +281,15 @@ void supervisor_start_web_workflow(void) {
         return;
     }
 
-    char port_encoded[6];
-    size_t port_len = 0;
-    size_t new_port = web_api_port;
-    #if CIRCUITPY_DOTENV
-    port_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PORT", port_encoded, sizeof(port_encoded) - 1);
-    #endif
-    if (0 < port_len && port_len < sizeof(port_encoded)) {
-        port_encoded[port_len] = '\0';
-        new_port = strtoul(port_encoded, NULL, 10);
-    }
+    mp_int_t new_port = web_api_port;
+    // (leaves new_port unchanged on any failure)
+    (void)_environ_get_key_int("CIRCUITPY_WEB_API_PORT", &new_port);
 
     bool first_start = pool.base.type != &socketpool_socketpool_type;
     bool port_changed = new_port != web_api_port;
 
     if (first_start) {
+        port_changed = false;
         #if CIRCUITPY_MDNS
         mdns_server_construct(&mdns, true);
         mdns.base.type = &mdns_server_type;
@@ -326,11 +318,12 @@ void supervisor_start_web_workflow(void) {
         common_hal_socketpool_socket_listen(&listening, 1);
     }
 
-    mp_int_t api_password_len = dotenv_get_key("/.env", "CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, sizeof(_api_password) - 2);
-    if (api_password_len > 0) {
+
+    const size_t api_password_len = sizeof(_api_password) - 1;
+    result = _environ_get_key_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
+    if (result == ENVIRON_OK) {
         _api_password[0] = ':';
-        _api_password[api_password_len + 1] = '\0';
-        _base64_in_place(_api_password, api_password_len + 1, sizeof(_api_password));
+        _base64_in_place(_api_password, strlen(_api_password), sizeof(_api_password) - 1);
     }
     #endif
 }
@@ -691,16 +684,16 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
     mp_print_t _socket_print = {socket, _print_raw};
     mp_printf(&_socket_print, "Content-Length: %d\r\n", total_length);
     // TODO: Make this a table to save space.
-    if (_endswith(filename, ".txt") || _endswith(filename, ".py")) {
-        _send_strs(socket, "Content-Type: text/plain", ";charset=UTF-8\r\n", NULL);
+    if (_endswith(filename, ".txt") || _endswith(filename, ".py") || _endswith(filename, ".toml")) {
+        _send_strs(socket, "Content-Type:", "text/plain", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".js")) {
-        _send_strs(socket, "Content-Type: text/javascript", ";charset=UTF-8\r\n", NULL);
+        _send_strs(socket, "Content-Type:", "text/javascript", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".html")) {
-        _send_strs(socket, "Content-Type: text/html", ";charset=UTF-8\r\n", NULL);
+        _send_strs(socket, "Content-Type:", "text/html", ";charset=UTF-8\r\n", NULL);
     } else if (_endswith(filename, ".json")) {
-        _send_strs(socket, "Content-Type: application/json", ";charset=UTF-8\r\n", NULL);
+        _send_strs(socket, "Content-Type:", "application/json", ";charset=UTF-8\r\n", NULL);
     } else {
-        _send_str(socket, "Content-Type: application/octet-stream\r\n");
+        _send_strs(socket, "Content-Type:", "application/octet-stream\r\n");
     }
     _cors_header(socket, request);
     _send_str(socket, "\r\n");
diff --git a/tests/circuitpython/bad1.toml b/tests/circuitpython/bad1.toml
new file mode 100644
index 0000000000..fce8db1800
--- /dev/null
+++ b/tests/circuitpython/bad1.toml
@@ -0,0 +1 @@
+string = "
diff --git a/tests/circuitpython/bad2.toml b/tests/circuitpython/bad2.toml
new file mode 100644
index 0000000000..666c573716
--- /dev/null
+++ b/tests/circuitpython/bad2.toml
@@ -0,0 +1 @@
+string = """
diff --git a/tests/circuitpython/bad3.toml b/tests/circuitpython/bad3.toml
new file mode 100644
index 0000000000..705443a1c6
--- /dev/null
+++ b/tests/circuitpython/bad3.toml
@@ -0,0 +1 @@
+string =
diff --git a/tests/circuitpython/dotenv_test.env b/tests/circuitpython/dotenv_test.env
deleted file mode 100644
index 63753b0ea4..0000000000
--- a/tests/circuitpython/dotenv_test.env
+++ /dev/null
@@ -1,37 +0,0 @@
-# Key "notpresent" is not present
-   # comment preceded by spaces
-plain_value=value
-value_with_comment=value # value followed by a comment
-quoted_value='value'
-quoted_value_with_comment='value' # quoted value followed by a comment
-should_be_none
-should_be_empty_string=
-should_be_hash=#
-quoted_should_be_empty_string=''
-duplicate_key=wrong
-duplicate_key=right
-value_with_hash=value#value
-quoted_value_with_hash='value#value'
-multi_line_value='multi
-line'
- space_before_key=value
-space_before_value= value
-space_before_hash_value= #value
-space_after_key =value
-space_after_key_before_value = value
-quoted_then_comment='value'#comment
-hash_with_spaces=#value value
-aa🐍bb=key with emoji
-value_with_emoji=aa🐍bb
-sz0=x
-sz1=xx
-sz2=xxxx
-sz3=xxxxxxxx
-sz4=xxxxxxxxxxxxxxxx
-sz5=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz6=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz7=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz8=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz9=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz10=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-sz11=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/tests/circuitpython/dotenv_test.py b/tests/circuitpython/dotenv_test.py
deleted file mode 100644
index 109a3bf221..0000000000
--- a/tests/circuitpython/dotenv_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import dotenv
-
-FILE = __file__.rsplit(".", 1)[0] + ".env"
-
-print(f"notpresent={dotenv.get_key(FILE, 'notpresent')}")
-print(f"plain_value={dotenv.get_key(FILE, 'plain_value')}")
-print(f"value_with_comment={dotenv.get_key(FILE, 'value_with_comment')}")
-print(f"quoted_value={dotenv.get_key(FILE, 'quoted_value')}")
-print(f"quoted_value_with_comment={dotenv.get_key(FILE, 'quoted_value_with_comment')}")
-print(f"should_be_none={dotenv.get_key(FILE, 'should_be_none')}")
-print(f"should_be_empty_string={dotenv.get_key(FILE, 'should_be_empty_string')}")
-print(f"should_be_hash={dotenv.get_key(FILE, 'should_be_hash')}")
-print(f"quoted_should_be_empty_string={dotenv.get_key(FILE, 'quoted_should_be_empty_string')}")
-print(f"duplicate_key={dotenv.get_key(FILE, 'duplicate_key')}")
-### This is the a difference from CPython dotenv. The trailing #value is taken as a comment.
-print(f"value_with_hash={dotenv.get_key(FILE, 'value_with_hash')}")
-print(f"quoted_value_with_hash={dotenv.get_key(FILE, 'quoted_value_with_hash')}")
-print(f"multi_line_value={dotenv.get_key(FILE, 'multi_line_value')}")
-print(f"space_before_key={dotenv.get_key(FILE, 'space_before_key')}")
-print(f"space_before_value={dotenv.get_key(FILE, 'space_before_value')}")
-print(f"space_before_hash_value={dotenv.get_key(FILE, 'space_before_hash_value')}")
-print(f"space_after_key={dotenv.get_key(FILE, 'space_after_key')}")
-print(f"space_after_key_before_value={dotenv.get_key(FILE, 'space_after_key_before_value')}")
-print(f"quoted_then_comment={dotenv.get_key(FILE, 'quoted_then_comment')}")
-print(f"hash_with_spaces={dotenv.get_key(FILE, 'hash_with_spaces')}")
-print(f"aa🐍bb={dotenv.get_key(FILE, 'aa🐍bb')}")
-print(f"value_with_emoji={dotenv.get_key(FILE, 'value_with_emoji')}")
-
-for i in range(12):
-    key = f"sz{i}"
-    print(f"len({key})={len(dotenv.get_key(FILE, key))}")
diff --git a/tests/circuitpython/dotenv_test.py.exp b/tests/circuitpython/dotenv_test.py.exp
deleted file mode 100644
index e0ed5f1505..0000000000
--- a/tests/circuitpython/dotenv_test.py.exp
+++ /dev/null
@@ -1,35 +0,0 @@
-notpresent=None
-plain_value=value
-value_with_comment=value
-quoted_value=value
-quoted_value_with_comment=value
-should_be_none=None
-should_be_empty_string=
-should_be_hash=#
-quoted_should_be_empty_string=
-duplicate_key=right
-value_with_hash=value
-quoted_value_with_hash=value#value
-multi_line_value=multi
-line
-space_before_key=value
-space_before_value=value
-space_before_hash_value=#value
-space_after_key=value
-space_after_key_before_value=value
-quoted_then_comment=value
-hash_with_spaces=#value value
-aa🐍bb=key with emoji
-value_with_emoji=aa🐍bb
-len(sz0)=1
-len(sz1)=2
-len(sz2)=4
-len(sz3)=8
-len(sz4)=16
-len(sz5)=32
-len(sz6)=64
-len(sz7)=128
-len(sz8)=256
-len(sz9)=512
-len(sz10)=1024
-len(sz11)=2048
diff --git a/tests/circuitpython/environ_test.py b/tests/circuitpython/environ_test.py
new file mode 100644
index 0000000000..46ceff5c9d
--- /dev/null
+++ b/tests/circuitpython/environ_test.py
@@ -0,0 +1,42 @@
+import os
+
+try:
+    from _environ import get_key
+except:
+    # Because run-tests.py suppresses site-packages, this test can't be run
+    # on the host interpreter. However, it can be run manually to
+    # generate/update the expected file.
+    #
+    # After 3.11 becomes standard, change this to use tomllib.
+    import tomlkit
+
+    def get_key(filename, key):
+        with open(filename) as f:
+            s = tomlkit.load(f)
+            return s.get(key, None)
+
+
+def run_test(f, k=None):
+    try:
+        v = get_key(f"{BASE}/{f}.toml", k or f)
+        print(f, k, repr(v))
+    except Exception as e:
+        print(f, k, "err")
+
+
+if "/" in __file__:
+    BASE = __file__.rsplit("/", 1)[0]
+else:
+    BASE = "."
+
+run_test("good", "notpresent")
+run_test("good", "string")
+run_test("good", "number")
+run_test("good", "cstring")
+run_test("good", "cnumber")
+run_test("good", "subvalue")
+for i in range(8):
+    run_test("good", f"string{i}")
+run_test("bad1", "string")
+run_test("bad2", "string")
+run_test("bad3", "string")
diff --git a/tests/circuitpython/environ_test.py.exp b/tests/circuitpython/environ_test.py.exp
new file mode 100644
index 0000000000..f168b089c0
--- /dev/null
+++ b/tests/circuitpython/environ_test.py.exp
@@ -0,0 +1,17 @@
+good notpresent None
+good string 'hello world'
+good number 7
+good cstring 'hello comment'
+good cnumber 127
+good subvalue None
+good string0 None
+good string1 '\n'
+good string2 'Áx'
+good string3 'Áx'
+good string4 '\x0c"\\'
+good string5 '\t\r\x08'
+good string6 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+good string7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+bad1 string err
+bad2 string err
+bad3 string err
diff --git a/tests/circuitpython/good.toml b/tests/circuitpython/good.toml
new file mode 100644
index 0000000000..17e5c054f4
--- /dev/null
+++ b/tests/circuitpython/good.toml
@@ -0,0 +1,14 @@
+# comment
+string = "hello world"
+number = 7
+ cstring = "hello comment" # comment
+  cnumber = 0x7f # comment
+string1= "\n"
+string2 ="\u00c1x"
+string3 = "\U000000c1x"
+string4 = "\f\"\\"
+string5 = "\t\r\b"
+string6 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+string7 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+[section]
+subvalue = "hi"
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 782ab95cc8..4483eeb0c1 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -29,10 +29,10 @@ RuntimeError:
 ame__
 mport 
 
-builtins        micropython     _asyncio        _thread
-_uasyncio       aesio           array           binascii
-bitmaptools     btree           cexample        cmath
-collections     cppexample      displayio       dotenv
+builtins        micropython     _asyncio        _environ
+_thread         _uasyncio       aesio           array
+binascii        bitmaptools     btree           cexample
+cmath           collections     cppexample      displayio
 errno           ffi             framebuf        gc
 gifio           hashlib         json            math
 qrio            rainbowio       re              sys

From 1fe05cb8cd5d46252dff65436b58d5bfb965e23b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 12:44:34 -0600
Subject: [PATCH 1529/2403] pico w: re-use previous connection if ssid matches

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 26 +++++++++++++++++++++++
 ports/raspberrypi/common-hal/wifi/Radio.h |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 313363dd32..a13222152b 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -206,6 +206,22 @@ void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
      */
 }
 
+static bool connection_unchanged(wifi_radio_obj_t *self, const uint8_t *ssid, size_t ssid_len) {
+    if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
+        mp_printf(&mp_plat_print, "(not connected)\n");
+        return false;
+    }
+    if (ssid_len != self->connected_ssid_len) {
+        mp_printf(&mp_plat_print, "(length mismatch)\n");
+        return false;
+    }
+    if (memcmp(ssid, self->connected_ssid, self->connected_ssid_len)) {
+        mp_printf(&mp_plat_print, "(ssid mismatch)\n");
+        return false;
+    }
+    return true;
+}
+
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("Wifi is not enabled"));
@@ -215,11 +231,19 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
         mp_raise_RuntimeError(translate("Wifi is in access point mode."));
     }
 
+    if (ssid_len > 32) {
+        return WIFI_RADIO_ERROR_CONNECTION_FAIL;
+    }
 
     size_t timeout_ms = timeout <= 0 ? 8000 : (size_t)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
     uint64_t start = port_get_raw_ticks(NULL);
     uint64_t deadline = start + timeout_ms;
 
+    if (connection_unchanged(self, ssid, ssid_len)) {
+        mp_printf(&mp_plat_print, "re-used existing wifi connection");
+        return WIFI_RADIO_ERROR_NONE;
+    }
+
     // disconnect
     common_hal_wifi_radio_stop_station(self);
 
@@ -237,6 +261,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
 
         switch (result) {
             case CYW43_LINK_UP:
+                memcpy(self->connected_ssid, ssid, ssid_len);
+                self->connected_ssid_len = ssid_len;
                 bindings_cyw43_wifi_enforce_pm();
                 return WIFI_RADIO_ERROR_NONE;
             case CYW43_LINK_FAIL:
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.h b/ports/raspberrypi/common-hal/wifi/Radio.h
index b2e9df9e3a..a4125fe7ba 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.h
+++ b/ports/raspberrypi/common-hal/wifi/Radio.h
@@ -35,6 +35,8 @@ typedef struct {
     mp_obj_base_t base;
     char hostname[254]; // hostname max is 253 chars, + 1 for trailing NUL
     wifi_scannednetworks_obj_t *current_scan;
+    uint8_t connected_ssid[32];
+    uint8_t connected_ssid_len;
     bool enabled;
 } wifi_radio_obj_t;
 

From 47339d42489822ecc65367f1e94328d144e0bb84 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 12:56:24 -0600
Subject: [PATCH 1530/2403] make a settings.toml file on boards that support
 the feature

---
 supervisor/shared/filesystem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c
index 01aba0a9ac..2c963b78ef 100644
--- a/supervisor/shared/filesystem.c
+++ b/supervisor/shared/filesystem.c
@@ -129,6 +129,9 @@ bool filesystem_init(bool create_allowed, bool force_create) {
         make_empty_file(&vfs_fat->fatfs, "/.metadata_never_index");
         make_empty_file(&vfs_fat->fatfs, "/.Trashes");
         make_empty_file(&vfs_fat->fatfs, "/.fseventsd/no_log");
+        #if CIRCUITPY_ENVIRON
+        make_empty_file(&vfs_fat->fatfs, "/settings.toml");
+        #endif
         // make a sample code.py file
         make_sample_code_file(&vfs_fat->fatfs);
 

From 4e7d65251fe765ba7010b98d9bf6f5037ac1a6ba Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 8 Dec 2022 14:09:44 -0500
Subject: [PATCH 1531/2403] Add pin for charge rate for Seeed XIAO nRF52840
 Sense

---
 ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c
index 00fa2c1ed5..8714f9bf8c 100644
--- a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c
+++ b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c
@@ -52,6 +52,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_READ_BATT_ENABLE),MP_ROM_PTR(&pin_P0_14)},
     {MP_ROM_QSTR(MP_QSTR_VBATT),MP_ROM_PTR(&pin_P0_31)},
     {MP_ROM_QSTR(MP_QSTR_CHARGE_STATUS),MP_ROM_PTR(&pin_P0_17)},
+    {MP_ROM_QSTR(MP_QSTR_CHARGE_RATE),MP_ROM_PTR(&pin_P0_13)},
 
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },

From a05829528b8a2525b1e887b708838fa3af99035e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 13:36:48 -0600
Subject: [PATCH 1532/2403] _environ: update documentation

---
 shared-bindings/_environ/__init__.c | 58 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/shared-bindings/_environ/__init__.c b/shared-bindings/_environ/__init__.c
index 81d778f3ed..a35181b754 100644
--- a/shared-bindings/_environ/__init__.c
+++ b/shared-bindings/_environ/__init__.c
@@ -35,47 +35,55 @@
 #include "py/runtime.h"
 #include "shared-bindings/_environ/__init__.h"
 
-//| """Functions to manage environment variables from a .env file.
+//| """Functions to manage environment variables from a settings.toml file.
 //|
-//|    A subset of the CPython `_environ library `_. It does
-//|    not support variables or double quotes.
+//|    This library can read a subset of `toml files `_.
 //|
-//|    Keys and values may be put in single quotes.
-//|    ``\`` and ``'`` are escaped by ``\`` in single quotes. Newlines can occur in quotes for multiline values.
-//|    Comments start with ``#`` and apply for the rest of the line.
-//|    A ``#`` immediately following an ``=`` is part of the value, not the start of a comment,
-//|    and a ``#`` embedded in a value without whitespace will be part of that value.
-//|    This corresponds to how assignments and comments work in most Unix shells.
+//|    It is recommended to not use this module directly. Instead, retrieve string
+//|    values using `os.getenv`.
 //|
+//|    Due to technical limitations it probably also accepts some files that are
+//|    not valid TOML files; bugs of this nature are subject to change (i.e., be
+//|    fixed) without the usual deprecation period for incompatible changes.
+//|
+//|    Details of the format understood by this module:
+//|     * the content is required to be in UTF-8 encoding
+//|     * the supported data types are string and integer
+//|     * only integers and basic strings are supported
+//|     * only integers supported by strtol are supported (no 0o, no 0b, no
+//|       underscores 1_000, 011 is 9, not 11)
+//|     * In quoted strings, all standard eescape codes, including ``\\uxxxx``
+//|       and ``\\Uxxxxxxxx``, are supported
+//|     * only bare keys are supported
+//|     * duplicate keys are not diagnosed.
+//|     * comments are supported
+//|     * only values from the "root table" can be retrieved (parsing ends when it
+//|       encounters a line starting with [)
+//|     * due to technical limitations, the content of multi-line
+//|       strings can erroneously be parsed as a value.
 //|
 //|    File format example:
 //|
 //|    .. code-block::
 //|
-//|        key=value
-//|          key2 = value2
-//|        'key3' = 'value with spaces'
+//|        str_key="Hello world" # with trailing comment
+//|        int_key = 7
+//|        unicode_key="👨"
+//|        unicode_key2="\\U0001f468" # same as above
+//|        escape_codes="supported, including \\r\\n\\"\\\\"
 //|        # comment
-//|        key4 = value3 # comment 2
-//|        'key5'=value4
-//|        key=value5 # overrides the first one
-//|        multiline = 'hello
-//|        world
-//|        how are you?'
-//|        # The #'s below will be included in the value. They do not start a comment.
-//|        key6=#value
-//|        key7=abc#def
+//|        [subtable]
+//|        subvalue="cannot retrieve this using _environ or getenv"
 //|
 //| """
 //|
 //| import typing
 //|
 
-//| def get_key(_environ_path: str, key_to_get: str) -> Optional[str]:
-//|     """Get the value for the given key from the given .env file. If the key occurs multiple
-//|     times in the file, then the last value will be returned.
+//| def get_key(_environ_path: str, key_to_get: str) -> Union[str, int, None]:
+//|     """Get the value for the given key from the given .env file.
 //|
-//|     Returns None if the key isn't found or doesn't have a value."""
+//|     Returns None if the key isn't found"""
 //|     ...
 //|
 STATIC mp_obj_t __environ_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {

From 19ad1d5f53e649de34214611f367c8f3a54b550e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 14:12:59 -0600
Subject: [PATCH 1533/2403] update translations

---
 locale/circuitpython.pot | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 16a682cfdd..43c7a79ff7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
-#: shared-module/dotenv/__init__.c
+#: shared-module/_environ/__init__.c
 msgid "File not found"
 msgstr ""
 
@@ -1062,6 +1062,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1188,7 +1190,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
-#: shared-module/dotenv/__init__.c
+#: shared-module/_environ/__init__.c
 msgid "Internal error"
 msgstr ""
 
@@ -1235,7 +1237,7 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
-#: shared-module/dotenv/__init__.c
+#: shared-module/_environ/__init__.c
 #, c-format
 msgid "Invalid byte %.*s"
 msgstr ""
@@ -1270,7 +1272,7 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
-#: shared-module/dotenv/__init__.c
+#: shared-module/_environ/__init__.c
 msgid "Invalid unicode escape"
 msgstr ""
 
@@ -1278,7 +1280,7 @@ msgstr ""
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
-#: shared-module/dotenv/__init__.c
+#: shared-module/_environ/__init__.c
 msgid "Key not found"
 msgstr ""
 
@@ -2280,7 +2282,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3161,7 +3163,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3540,7 +3542,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 

From 170918995c1a3fde1b9c7694e451c2292181fc45 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 14:14:48 -0600
Subject: [PATCH 1534/2403] fix mistaken code formatting

I wanted to use the idiom
```c
#if GUARD
if (condition) {
    alternate code
} else
#else
{
    common default code
}
```
idiom, in which the common default code is conditioned both on a
compile-time check and a run-time check. However, I got it wrong
and uncrustify chipped in, adding extra brackets around a following
piece of code and re-indenting it.
---
 ports/espressif/common-hal/_bleio/Adapter.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 121beb8e90..f89848f782 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -107,18 +107,16 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         if (result == ENVIRON_OK) {
             ble_svc_gap_device_name_set(ble_name);
         } else
-        #else
+        #endif
         {
             ble_svc_gap_device_name_set("CIRCUITPY");
         }
-        #endif
 
-        {// Clear all of the internal connection objects.
-            for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
-                bleio_connection_internal_t *connection = &bleio_connections[i];
-                // Reset connection.
-                connection->conn_handle = BLEIO_HANDLE_INVALID;
-            }
+        // Clear all of the internal connection objects.
+        for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
+            bleio_connection_internal_t *connection = &bleio_connections[i];
+            // Reset connection.
+            connection->conn_handle = BLEIO_HANDLE_INVALID;
         }
 
         cp_task = xTaskGetCurrentTaskHandle();

From 243ecc250289fe66fd3b7ccedba117f2ec8924fb Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 14:18:22 -0600
Subject: [PATCH 1535/2403] remove debugging prints

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index a13222152b..4cd80fb4b7 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -208,15 +208,12 @@ void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
 
 static bool connection_unchanged(wifi_radio_obj_t *self, const uint8_t *ssid, size_t ssid_len) {
     if (cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) != CYW43_LINK_UP) {
-        mp_printf(&mp_plat_print, "(not connected)\n");
         return false;
     }
     if (ssid_len != self->connected_ssid_len) {
-        mp_printf(&mp_plat_print, "(length mismatch)\n");
         return false;
     }
     if (memcmp(ssid, self->connected_ssid, self->connected_ssid_len)) {
-        mp_printf(&mp_plat_print, "(ssid mismatch)\n");
         return false;
     }
     return true;
@@ -240,7 +237,6 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     uint64_t deadline = start + timeout_ms;
 
     if (connection_unchanged(self, ssid, ssid_len)) {
-        mp_printf(&mp_plat_print, "re-used existing wifi connection");
         return WIFI_RADIO_ERROR_NONE;
     }
 

From 3459fe322b45bd1443fca8e12126d3919aa8784c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 15:21:20 -0600
Subject: [PATCH 1536/2403] Withdraw the _environ module

This existed solely for testing, so expose it a different way during
the unix coverage build

Also turn off os.getenv support on samd21.
---
 devices/ble_hci/common-hal/_bleio/Adapter.c   |   8 +-
 docs/environment.rst                          |  36 ++++--
 ports/atmel-samd/mpconfigport.mk              |   1 +
 ports/espressif/common-hal/_bleio/Adapter.c   |   8 +-
 ports/espressif/supervisor/port.c             |   4 +-
 ports/nrf/common-hal/_bleio/Adapter.c         |   8 +-
 ports/unix/coverage.c                         |   1 +
 ports/unix/main.c                             |   8 ++
 .../unix/variants/coverage/mpconfigvariant.mk |   5 +-
 py/circuitpy_defns.mk                         |   4 +-
 py/circuitpy_mpconfig.mk                      |   4 +-
 shared-bindings/_environ/__init__.c           | 108 ------------------
 shared-bindings/_environ/__init__.h           |  37 ------
 shared-bindings/os/__init__.c                 |   4 +
 shared-bindings/os/__init__.h                 |   2 +
 shared-bindings/os/getenv.c                   |   1 +
 shared-module/os/__init__.c                   |  15 ---
 shared-module/{_environ => os}/__init__.h     |   6 +-
 .../{_environ/__init__.c => os/getenv.c}      |  39 ++++---
 supervisor/shared/filesystem.c                |   2 +-
 supervisor/shared/web_workflow/web_workflow.c |  14 +--
 tests/circuitpython/environ_test.py           |   4 +-
 22 files changed, 93 insertions(+), 226 deletions(-)
 delete mode 100644 shared-bindings/_environ/__init__.c
 delete mode 100644 shared-bindings/_environ/__init__.h
 create mode 100644 shared-bindings/os/getenv.c
 rename shared-module/{_environ => os}/__init__.h (89%)
 rename shared-module/{_environ/__init__.c => os/getenv.c} (88%)

diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index 018b65de12..f558d66d40 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -49,8 +49,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_ENVIRON
-#include "shared-bindings/_environ/__init__.h"
+#if CIRCUITPY_OS_GETENV
+#include "shared-bindings/os/__init__.h"
 #endif
 
 #define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
@@ -284,8 +284,8 @@ char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0
 STATIC void bleio_adapter_hci_init(bleio_adapter_obj_t *self) {
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_ENVIRON
-    mp_obj_t name = common_hal__environ_get_key("CIRCUITPY_BLE_NAME");
+    #if CIRCUITPY_OS_GETENV
+    mp_obj_t name = common_hal_os_getenv("CIRCUITPY_BLE_NAME", mp_const_none);
     if (name != mp_const_none) {
         mp_arg_validate_type_string(name, MP_QSTR_CIRCUITPY_BLE_NAME);
         self->name = name;
diff --git a/docs/environment.rst b/docs/environment.rst
index 457e5c3f88..0a370d64d9 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -6,23 +6,33 @@ variables are commonly used to store "secrets" such as Wi-Fi passwords and API
 keys. This method *does not* make them secure. It only separates them from the
 code.
 
-CircuitPython supports these by parsing a subset of the `toml `_ file format internally.
+CircuitPython uses a file called ``settings.toml`` at the drive root (no
+folder) as the environment.  User code can access the values from the file
+using `os.getenv()`. It is recommended to save any values used repeatedly in a
+variable because `os.getenv()` will parse the ``settings.toml`` file contents
+on every access.
 
-Here is a simple example:
+CircuitPython only supports a subset of the full toml specification, see below
+for more details. The subset is very "Python-like", which is a key reason we
+selected the format.
 
-.. code-block:: bash
+Due to technical limitations it probably also accepts some files that are
+not valid TOML files; bugs of this nature are subject to change (i.e., be
+fixed) without the usual deprecation period for incompatible changes.
 
-  KEY1="value1"
-  # Comment
-  KEY2="value2\ncontains a newline"
+File format example:
 
-  [SECTION] # Only values in the "root table" are parsed
-  SECTION_VALUE = ... # so this value cannot be seen by getenv
+.. code-block::
+
+   str_key="Hello world" # with trailing comment
+   int_key = 7
+   unicode_key="👨"
+   unicode_key2="\\U0001f468" # same as above
+   escape_codes="supported, including \\r\\n\\"\\\\"
+   # comment
+   [subtable]
+   subvalue="cannot retrieve this using _environ or getenv"
 
-CircuitPython uses the ``settings.toml`` at the drive root (no folder) as the environment.
-User code can access the values from the file using `os.getenv()`. It is
-recommended to save any values used repeatedly in a variable because `os.getenv()`
-will parse the ``settings.toml`` file contents on every access.
 
 Details of the toml language subset
 -----------------------------------
@@ -36,6 +46,8 @@ Details of the toml language subset
 * Duplicate keys are not diagnosed.
 * Comments are supported
 * Only values from the "root table" can be retrieved
+* due to technical limitations, the content of multi-line
+  strings can erroneously be parsed as a value.
 
 CircuitPython behavior
 ----------------------
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 05aed89eb2..72b1302227 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -33,6 +33,7 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BUILTINS_POW3 ?= 0
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
 CIRCUITPY_COUNTIO ?= 0
+CIRCUITPY_OS_GETENV ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index f89848f782..7da1cd0b8c 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -59,8 +59,8 @@
 #include "esp_bt.h"
 #include "esp_nimble_hci.h"
 
-#if CIRCUITPY_ENVIRON
-#include "shared-module/_environ/__init__.h"
+#if CIRCUITPY_OS_GETENV
+#include "shared-module/os/__init__.h"
 #endif
 
 bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
@@ -101,9 +101,9 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         ble_hs_cfg.sync_cb = _on_sync;
         // ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
-        #if CIRCUITPY_ENVIRON
+        #if CIRCUITPY_OS_GETENV
         char ble_name[1 + MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH];
-        _environ_err_t result = _environ_get_key_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
+        os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
         if (result == ENVIRON_OK) {
             ble_svc_gap_device_name_set(ble_name);
         } else
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index e89fb8c976..2792792455 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -55,7 +55,7 @@
 #include "shared-bindings/microcontroller/RunMode.h"
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/socketpool/__init__.h"
-#include "shared-module/_environ/__init__.h"
+#include "shared-module/os/__init__.h"
 
 #include "peripherals/rmt.h"
 #include "peripherals/timer.h"
@@ -519,7 +519,7 @@ void port_idle_until_interrupt(void) {
 void port_post_boot_py(bool heap_valid) {
     if (!heap_valid && filesystem_present()) {
         mp_int_t reserved;
-        if (_environ_get_key_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
+        if (common_hal_os_environ_get_key_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
             common_hal_espidf_set_reserved_psram(reserved);
         }
         common_hal_espidf_reserve_psram();
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 012430704a..f9e3bddc72 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -52,8 +52,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_ENVIRON
-#include "shared-bindings/_environ/__init__.h"
+#if CIRCUITPY_OS_GETENV
+#include "shared-bindings/os/getenv.h"
 #endif
 
 #define BLE_MIN_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
@@ -345,8 +345,8 @@ STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
 
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_ENVIRON
-    mp_obj_t ble_name = common_hal__environ_get_key("CIRCUITPY_BLE_NAME");
+    #if CIRCUITPY_OS_GETENV
+    mp_obj_t ble_name = common_hal_os_environ_get_key("CIRCUITPY_BLE_NAME");
     if (ble_name != mp_const_none) {
         common_hal_bleio_adapter_set_name(self, mp_obj_str_get_str(ble_name));
         return;
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 0e4c6dbd48..8463c169e4 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -95,6 +95,7 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 5ebcf9193b..aa7c92dcff 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -420,6 +420,13 @@ STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
 #define PATHLIST_SEP_CHAR ':'
 #endif
 
+mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_);
+STATIC mp_obj_t get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
+    return common_hal_os_getenv_path(mp_obj_str_get_str(path_in),
+        mp_obj_str_get_str(key_to_get_in), mp_const_none);
+}
+MP_DEFINE_CONST_FUN_OBJ_2(get_key_obj, get_key);
+
 MP_NOINLINE int main_(int argc, char **argv);
 
 int main(int argc, char **argv) {
@@ -540,6 +547,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
         MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
         mp_store_global(MP_QSTR_extra_coverage, MP_OBJ_FROM_PTR(&extra_coverage_obj));
         mp_store_global(MP_QSTR_extra_cpp_coverage, MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
+        mp_store_global(MP_QSTR_get_key, MP_OBJ_FROM_PTR(&get_key_obj));
     }
     #endif
 
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index a0e0f4f3bb..e351fc0836 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -33,7 +33,6 @@ SRC_BITMAP := \
 	shared-bindings/aesio/__init__.c \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
-	shared-bindings/_environ/__init__.c \
 	shared-bindings/rainbowio/__init__.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
@@ -45,7 +44,7 @@ SRC_BITMAP := \
 	shared-module/displayio/Bitmap.c \
 	shared-module/displayio/ColorConverter.c \
 	shared-module/displayio/ColorConverter.c \
-	shared-module/_environ/__init__.c \
+	shared-module/os/getenv.c \
 	shared-module/rainbowio/__init__.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
@@ -56,7 +55,7 @@ CFLAGS += \
 	-DCIRCUITPY_AESIO=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
-	-DCIRCUITPY_ENVIRON=1 \
+	-DCIRCUITPY_OS_GETENV=1 \
 	-DCIRCUITPY_GIFIO=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
 	-DCIRCUITPY_TRACEBACK=1 \
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 7d8fa6bada..df3f664864 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -182,9 +182,6 @@ endif
 ifeq ($(CIRCUITPY_DISPLAYIO),1)
 SRC_PATTERNS += displayio/%
 endif
-ifeq ($(CIRCUITPY_ENVIRON),1)
-SRC_PATTERNS += _environ/%
-endif
 ifeq ($(CIRCUITPY__EVE),1)
 SRC_PATTERNS += _eve/%
 endif
@@ -618,6 +615,7 @@ SRC_SHARED_MODULE_ALL = \
 	onewireio/__init__.c \
 	onewireio/OneWire.c \
 	os/__init__.c \
+	os/getenv.c \
 	paralleldisplay/ParallelBus.c \
 	qrio/__init__.c \
 	qrio/QRDecoder.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index a6a1118d2d..f0e145998b 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -215,8 +215,8 @@ CFLAGS += -DCIRCUITPY_DUALBANK=$(CIRCUITPY_DUALBANK)
 CIRCUITPY_ENABLE_MPY_NATIVE ?= 0
 CFLAGS += -DCIRCUITPY_ENABLE_MPY_NATIVE=$(CIRCUITPY_ENABLE_MPY_NATIVE)
 
-CIRCUITPY_ENVIRON ?= $(CIRCUITPY_FULL_BUILD)
-CFLAGS += -DCIRCUITPY_ENVIRON=$(CIRCUITPY_ENVIRON)
+CIRCUITPY_OS_GETENV ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_OS_GETENV=$(CIRCUITPY_OS_GETENV)
 
 CIRCUITPY_ERRNO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
diff --git a/shared-bindings/_environ/__init__.c b/shared-bindings/_environ/__init__.c
deleted file mode 100644
index a35181b754..0000000000
--- a/shared-bindings/_environ/__init__.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * SPDX-FileCopyrightText: Copyright (c) 2022 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 
-
-#include "extmod/vfs.h"
-#include "lib/oofatfs/ff.h"
-#include "lib/oofatfs/diskio.h"
-#include "py/mpstate.h"
-#include "py/obj.h"
-#include "py/objstr.h"
-#include "py/runtime.h"
-#include "shared-bindings/_environ/__init__.h"
-
-//| """Functions to manage environment variables from a settings.toml file.
-//|
-//|    This library can read a subset of `toml files `_.
-//|
-//|    It is recommended to not use this module directly. Instead, retrieve string
-//|    values using `os.getenv`.
-//|
-//|    Due to technical limitations it probably also accepts some files that are
-//|    not valid TOML files; bugs of this nature are subject to change (i.e., be
-//|    fixed) without the usual deprecation period for incompatible changes.
-//|
-//|    Details of the format understood by this module:
-//|     * the content is required to be in UTF-8 encoding
-//|     * the supported data types are string and integer
-//|     * only integers and basic strings are supported
-//|     * only integers supported by strtol are supported (no 0o, no 0b, no
-//|       underscores 1_000, 011 is 9, not 11)
-//|     * In quoted strings, all standard eescape codes, including ``\\uxxxx``
-//|       and ``\\Uxxxxxxxx``, are supported
-//|     * only bare keys are supported
-//|     * duplicate keys are not diagnosed.
-//|     * comments are supported
-//|     * only values from the "root table" can be retrieved (parsing ends when it
-//|       encounters a line starting with [)
-//|     * due to technical limitations, the content of multi-line
-//|       strings can erroneously be parsed as a value.
-//|
-//|    File format example:
-//|
-//|    .. code-block::
-//|
-//|        str_key="Hello world" # with trailing comment
-//|        int_key = 7
-//|        unicode_key="👨"
-//|        unicode_key2="\\U0001f468" # same as above
-//|        escape_codes="supported, including \\r\\n\\"\\\\"
-//|        # comment
-//|        [subtable]
-//|        subvalue="cannot retrieve this using _environ or getenv"
-//|
-//| """
-//|
-//| import typing
-//|
-
-//| def get_key(_environ_path: str, key_to_get: str) -> Union[str, int, None]:
-//|     """Get the value for the given key from the given .env file.
-//|
-//|     Returns None if the key isn't found"""
-//|     ...
-//|
-STATIC mp_obj_t __environ_get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
-    return common_hal__environ_get_key_path(mp_obj_str_get_str(path_in),
-        mp_obj_str_get_str(key_to_get_in));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(_environ_get_key_obj, __environ_get_key);
-
-STATIC const mp_rom_map_elem_t _environ_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__environ) },
-
-    { MP_ROM_QSTR(MP_QSTR_get_key), MP_ROM_PTR(&_environ_get_key_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(_environ_module_globals, _environ_module_globals_table);
-
-const mp_obj_module_t _environ_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&_environ_module_globals,
-};
-
-MP_REGISTER_MODULE(MP_QSTR__environ, _environ_module, CIRCUITPY_ENVIRON);
diff --git a/shared-bindings/_environ/__init__.h b/shared-bindings/_environ/__init__.h
deleted file mode 100644
index 7779f3ac82..0000000000
--- a/shared-bindings/_environ/__init__.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#pragma once
-
-#include 
-#include 
-
-#include "py/objtuple.h"
-
-#include "shared-module/_environ/__init__.h"
-
-mp_obj_t common_hal__environ_get_key_path(const char *path, const char *key);
-mp_obj_t common_hal__environ_get_key(const char *key);
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 1260903203..b2fb8ff095 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -92,6 +92,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd);
 //|     ...
 //|
 STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    #if CIRCUITPY_OS_GETENV
     enum { ARG_key, ARG_default };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_key, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -101,6 +102,9 @@ STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     return common_hal_os_getenv(mp_obj_str_get_str(args[ARG_key].u_obj), args[ARG_default].u_obj);
+    #else
+    return mp_const_none;
+    #endif
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv);
 
diff --git a/shared-bindings/os/__init__.h b/shared-bindings/os/__init__.h
index 00d8c28a50..49b12cd52a 100644
--- a/shared-bindings/os/__init__.h
+++ b/shared-bindings/os/__init__.h
@@ -38,6 +38,8 @@ mp_obj_t common_hal_os_uname(void);
 void common_hal_os_chdir(const char *path);
 mp_obj_t common_hal_os_getcwd(void);
 mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
+mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_);
+
 mp_obj_t common_hal_os_listdir(const char *path);
 void common_hal_os_mkdir(const char *path);
 void common_hal_os_remove(const char *path);
diff --git a/shared-bindings/os/getenv.c b/shared-bindings/os/getenv.c
new file mode 100644
index 0000000000..fdb5f0bb50
--- /dev/null
+++ b/shared-bindings/os/getenv.c
@@ -0,0 +1 @@
+// this file needs to exist but does not have any content
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index 57e7e62932..4a4c02e636 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -36,10 +36,6 @@
 #include "py/runtime.h"
 #include "shared-bindings/os/__init__.h"
 
-#if CIRCUITPY_ENVIRON
-#include "shared-bindings/_environ/__init__.h"
-#endif
-
 // This provides all VFS related OS functions so that ports can share the code
 // as needed. It does not provide uname.
 
@@ -111,17 +107,6 @@ mp_obj_t common_hal_os_getcwd(void) {
     return mp_vfs_getcwd();
 }
 
-mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
-    #if CIRCUITPY_ENVIRON
-    mp_obj_t env_obj = common_hal__environ_get_key(key);
-    // TODO must be a str object
-    if (env_obj != mp_const_none) {
-        return env_obj;
-    }
-    #endif
-    return default_;
-}
-
 mp_obj_t common_hal_os_listdir(const char *path) {
     mp_obj_t path_out;
     mp_vfs_mount_t *vfs = lookup_dir_path(path, &path_out);
diff --git a/shared-module/_environ/__init__.h b/shared-module/os/__init__.h
similarity index 89%
rename from shared-module/_environ/__init__.h
rename to shared-module/os/__init__.h
index c96eb028b8..48bd06195e 100644
--- a/shared-module/_environ/__init__.h
+++ b/shared-module/os/__init__.h
@@ -33,13 +33,13 @@ typedef enum {
     ENVIRON_ERR_LENGTH,
     ENVIRON_ERR_NOT_FOUND,
     ENVIRON_ERR_UNEXPECTED = 0xff00, // logical or'd with the byte value
-} _environ_err_t;
+} os_environ_err_t;
 
 // Allocation free version that returns the full length of the value.
 // If it fits, the return value is 0-terminated. If the value doesn't fit,
 // *value_len may be an over-estimate but never an under-estimate.
-_environ_err_t _environ_get_key_str(const char *key, char *value, size_t value_len);
+os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len);
 
 // Returns ENVIRON_ERR_OK and sets value to the read value.  Returns
 // ENVIRON_ERR_... if the value was not numeric. allocation-free.
-_environ_err_t _environ_get_key_int(const char *key, mp_int_t *value);
+os_environ_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value);
diff --git a/shared-module/_environ/__init__.c b/shared-module/os/getenv.c
similarity index 88%
rename from shared-module/_environ/__init__.c
rename to shared-module/os/getenv.c
index 7e6e133e1a..ec9edbacac 100644
--- a/shared-module/_environ/__init__.c
+++ b/shared-module/os/getenv.c
@@ -27,7 +27,8 @@
 #include 
 #include 
 
-#include "shared-bindings/_environ/__init__.h"
+#include "shared-bindings/os/__init__.h"
+#include "shared-module/os/__init__.h"
 
 #include "py/gc.h"
 #include "py/misc.h"
@@ -177,7 +178,7 @@ STATIC bool key_matches(file_arg *active_file, const char *key) {
     return true;
 }
 
-STATIC _environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) {
+STATIC os_environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) {
     char hex_buf[sz + 1];
     for (int i = 0; i < sz; i++) {
         hex_buf[i] = get_next_byte(active_file);
@@ -196,7 +197,7 @@ STATIC _environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t
 }
 
 // Read a quoted string
-STATIC _environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
+STATIC os_environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
     while (true) {
         int character = get_next_byte(active_file);
         switch (character) {
@@ -243,7 +244,7 @@ STATIC _environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                     case 'U':
                     case 'u': {
                         int sz = (character == 'u') ? 4 : 8;
-                        _environ_err_t res;
+                        os_environ_err_t res;
                         res = read_unicode_escape(active_file, sz, buf);
                         if (res != ENVIRON_OK) {
                             return res;
@@ -261,7 +262,7 @@ STATIC _environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
 }
 
 // Read a numeric value (non-quoted value) as a string
-STATIC _environ_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) {
+STATIC os_environ_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) {
     int character = first_character;
     while (true) {
         switch (character) {
@@ -291,13 +292,13 @@ STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) {
     }
 }
 
-STATIC _environ_err_t _environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
+STATIC os_environ_err_t os_environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
     file_arg active_file;
     if (!open_file(path, &active_file)) {
         return ENVIRON_ERR_OPEN;
     }
 
-    _environ_err_t result = ENVIRON_ERR_NOT_FOUND;
+    os_environ_err_t result = ENVIRON_ERR_NOT_FOUND;
     while (!is_eof(&active_file)) {
         if (key_matches(&active_file, key)) {
             result = read_value(&active_file, buf, quoted);
@@ -307,10 +308,10 @@ STATIC _environ_err_t _environ_get_key_vstr(const char *path, const char *key, v
     return result;
 }
 
-STATIC _environ_err_t _environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
+STATIC os_environ_err_t os_environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
     vstr_t buf;
     vstr_init_fixed_buf(&buf, value_len, value);
-    _environ_err_t result = _environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
+    os_environ_err_t result = os_environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
 
     if (result == ENVIRON_OK) {
         vstr_add_byte_nonstd(&buf, 0);
@@ -322,16 +323,16 @@ STATIC _environ_err_t _environ_get_key_buf_terminated(const char *key, char *val
     return result;
 }
 
-_environ_err_t _environ_get_key_str(const char *key, char *value, size_t value_len) {
+os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len) {
     bool quoted;
-    _environ_err_t result = _environ_get_key_buf_terminated(key, value, value_len, "ed);
+    os_environ_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, "ed);
     if (result == ENVIRON_OK && !quoted) {
         result = ENVIRON_ERR_UNEXPECTED | value[0];
     }
     return result;
 }
 
-STATIC void throw__environ_error(_environ_err_t error) {
+STATIC void throw__environ_error(os_environ_err_t error) {
     if (error == ENVIRON_OK) {
         return;
     }
@@ -360,14 +361,14 @@ STATIC void throw__environ_error(_environ_err_t error) {
     }
 }
 
-mp_obj_t common_hal__environ_get_key_path(const char *path, const char *key) {
+mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_) {
     vstr_t buf;
     bool quoted;
 
     vstr_init(&buf, 64);
-    _environ_err_t result = _environ_get_key_vstr(path, key, &buf, "ed);
+    os_environ_err_t result = os_environ_get_key_vstr(path, key, &buf, "ed);
     if (result == ENVIRON_ERR_NOT_FOUND) {
-        return mp_const_none;
+        return default_;
     }
     throw__environ_error(result);
 
@@ -378,14 +379,14 @@ mp_obj_t common_hal__environ_get_key_path(const char *path, const char *key) {
     }
 }
 
-mp_obj_t common_hal__environ_get_key(const char *key) {
-    return common_hal__environ_get_key_path(ENVIRON_PATH, key);
+mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
+    return common_hal_os_getenv_path(ENVIRON_PATH, key, default_);
 }
 
-_environ_err_t _environ_get_key_int(const char *key, mp_int_t *value) {
+os_environ_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value) {
     char buf[16];
     bool quoted;
-    _environ_err_t result = _environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
+    os_environ_err_t result = os_environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
     if (result != ENVIRON_OK) {
         return result;
     }
diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c
index 2c963b78ef..1eab59c384 100644
--- a/supervisor/shared/filesystem.c
+++ b/supervisor/shared/filesystem.c
@@ -129,7 +129,7 @@ bool filesystem_init(bool create_allowed, bool force_create) {
         make_empty_file(&vfs_fat->fatfs, "/.metadata_never_index");
         make_empty_file(&vfs_fat->fatfs, "/.Trashes");
         make_empty_file(&vfs_fat->fatfs, "/.fseventsd/no_log");
-        #if CIRCUITPY_ENVIRON
+        #if CIRCUITPY_OS_GETENV
         make_empty_file(&vfs_fat->fatfs, "/settings.toml");
         #endif
         // make a sample code.py file
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index d54f853891..ab9ded66a3 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -64,8 +64,8 @@
 #include "shared-bindings/wifi/__init__.h"
 #endif
 
-#if CIRCUITPY_ENVIRON
-#include "shared-module/_environ/__init__.h"
+#if CIRCUITPY_OS_GETENV
+#include "shared-module/os/__init__.h"
 #endif
 
 enum request_state {
@@ -244,19 +244,19 @@ void supervisor_web_workflow_status(void) {
 #endif
 
 void supervisor_start_web_workflow(void) {
-    #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_ENVIRON
+    #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_OS_GETENV
 
     char ssid[33];
     char password[64];
     size_t ssid_len = 0;
     size_t password_len = 0;
 
-    _environ_err_t result = _environ_get_key_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
+    os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != ENVIRON_OK) {
         return;
     }
 
-    result = _environ_get_key_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
+    result = common_hal_os_environ_get_key_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
     if (result != ENVIRON_OK) {
         return;
     }
@@ -283,7 +283,7 @@ void supervisor_start_web_workflow(void) {
 
     mp_int_t new_port = web_api_port;
     // (leaves new_port unchanged on any failure)
-    (void)_environ_get_key_int("CIRCUITPY_WEB_API_PORT", &new_port);
+    (void)common_hal_os_environ_get_key_int("CIRCUITPY_WEB_API_PORT", &new_port);
 
     bool first_start = pool.base.type != &socketpool_socketpool_type;
     bool port_changed = new_port != web_api_port;
@@ -320,7 +320,7 @@ void supervisor_start_web_workflow(void) {
 
 
     const size_t api_password_len = sizeof(_api_password) - 1;
-    result = _environ_get_key_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
+    result = common_hal_os_environ_get_key_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
     if (result == ENVIRON_OK) {
         _api_password[0] = ':';
         _base64_in_place(_api_password, strlen(_api_password), sizeof(_api_password) - 1);
diff --git a/tests/circuitpython/environ_test.py b/tests/circuitpython/environ_test.py
index 46ceff5c9d..8dfab8812c 100644
--- a/tests/circuitpython/environ_test.py
+++ b/tests/circuitpython/environ_test.py
@@ -1,8 +1,8 @@
 import os
 
 try:
-    from _environ import get_key
-except:
+    get_key
+except NameError:
     # Because run-tests.py suppresses site-packages, this test can't be run
     # on the host interpreter. However, it can be run manually to
     # generate/update the expected file.

From f30d3ba02e23a30497d38b4905c1dab3194953fe Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 15:39:19 -0600
Subject: [PATCH 1537/2403] update expected result

---
 tests/unix/extra_coverage.py.exp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 4483eeb0c1..582d90e1bc 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -29,22 +29,21 @@ RuntimeError:
 ame__
 mport 
 
-builtins        micropython     _asyncio        _environ
-_thread         _uasyncio       aesio           array
-binascii        bitmaptools     btree           cexample
-cmath           collections     cppexample      displayio
-errno           ffi             framebuf        gc
-gifio           hashlib         json            math
-qrio            rainbowio       re              sys
-termios         traceback       ubinascii       uctypes
-uerrno          uheapq          uio             ujson
-ulab            ulab.numpy      ulab.numpy.fft
-ulab.numpy.linalg               ulab.scipy
-ulab.scipy.linalg               ulab.scipy.optimize
-ulab.scipy.signal               ulab.scipy.special
-ulab.utils      uos             urandom         ure
-uselect         ustruct         utime           utimeq
-uzlib           zlib
+builtins        micropython     _asyncio        _thread
+_uasyncio       aesio           array           binascii
+bitmaptools     btree           cexample        cmath
+collections     cppexample      displayio       errno
+ffi             framebuf        gc              gifio
+hashlib         json            math            qrio
+rainbowio       re              sys             termios
+traceback       ubinascii       uctypes         uerrno
+uheapq          uio             ujson           ulab
+ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
+ulab.scipy      ulab.scipy.linalg
+ulab.scipy.optimize             ulab.scipy.signal
+ulab.scipy.special              ulab.utils      uos
+urandom         ure             uselect         ustruct
+utime           utimeq          uzlib           zlib
 ime
 
 utime           utimeq

From 3cb628d290d80fd0f657e1b0bdb6af54c40335a5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 16:45:58 -0600
Subject: [PATCH 1538/2403] fix nrf build

---
 ports/nrf/common-hal/_bleio/Adapter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index f9e3bddc72..8948be1a5d 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -53,7 +53,7 @@
 #include "shared-bindings/time/__init__.h"
 
 #if CIRCUITPY_OS_GETENV
-#include "shared-bindings/os/getenv.h"
+#include "shared-bindings/os/__init__.h"
 #endif
 
 #define BLE_MIN_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
@@ -346,7 +346,7 @@ STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
     mp_int_t name_len = 0;
 
     #if CIRCUITPY_OS_GETENV
-    mp_obj_t ble_name = common_hal_os_environ_get_key("CIRCUITPY_BLE_NAME");
+    mp_obj_t ble_name = common_hal_os_getenv("CIRCUITPY_BLE_NAME", mp_const_none);
     if (ble_name != mp_const_none) {
         common_hal_bleio_adapter_set_name(self, mp_obj_str_get_str(ble_name));
         return;

From fa96bcce84b0ac6feb34b49d55c05362ea7269d4 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 8 Dec 2022 20:18:20 -0500
Subject: [PATCH 1539/2403] remove micropython asyncio doc; update libraries
 page and links

---
 docs/drivers.rst         |  33 ----
 docs/index.rst           |   2 +-
 docs/libraries.rst       |  31 ++++
 docs/library/asyncio.rst | 323 ---------------------------------------
 docs/library/index.rst   |   1 -
 5 files changed, 32 insertions(+), 358 deletions(-)
 delete mode 100644 docs/drivers.rst
 create mode 100644 docs/libraries.rst
 delete mode 100644 docs/library/asyncio.rst

diff --git a/docs/drivers.rst b/docs/drivers.rst
deleted file mode 100644
index 8855abbd2d..0000000000
--- a/docs/drivers.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-Additional CircuitPython Libraries and Drivers on GitHub
-=========================================================
-
-These are libraries and drivers available in separate GitHub repos. They are
-designed for use with CircuitPython and may or may not work with
-`MicroPython `_.
-
-
-Adafruit CircuitPython Library Bundle
---------------------------------------
-
-We provide a bundle of all our libraries to ease installation of drivers and
-their dependencies. The bundle is primarily geared to the Adafruit Express line
-of boards which feature a relatively large external flash. With Express boards,
-it's easy to copy them all onto the filesystem. However, if you don't have
-enough space simply copy things over as they are needed.
-
-- The Adafruit bundles are available on GitHub: .
-
-- Documentation for the bundle, which includes links to documentation for all
-  libraries, is available here: .
-
-
-CircuitPython Community Library Bundle
----------------------------------------
-
-This bundle contains non-Adafruit sponsored libraries, that are written and submitted
-by members of the community.
-
-- The Community bundles are available on GitHub: .
-
-- Documentation is not available on ReadTheDocs at this time. See each library for any
-  included documentation.
diff --git a/docs/index.rst b/docs/index.rst
index abc0236995..e49b74b4e3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,7 +21,7 @@ Full Table of Contents
    ../shared-bindings/index.rst
    supported_ports.rst
    troubleshooting.rst
-   drivers.rst
+   libraries.rst
    workflows
    environment.rst
 
diff --git a/docs/libraries.rst b/docs/libraries.rst
new file mode 100644
index 0000000000..2d34ccbe3f
--- /dev/null
+++ b/docs/libraries.rst
@@ -0,0 +1,31 @@
+Adafruit CircuitPython Libraries
+================================
+
+Documentation for all Adafruit-sponsored CircuitPython libraries is at:
+.
+
+
+CircuitPython Library Bundles
+=============================
+
+Many Python libraries, including device drivers, have been written for use with CircuitPython.
+They are maintained in separate GitHub repos, one per library.
+
+Libraries are packaged in *bundles*, which are ZIP files that are snapshots in time of a group of libraries.
+
+Adafruit sponsors and maintains several hundred libraries, packaged in the **Adafruit Library Bundle**.
+Adafruit-sponsored libraries are also available on .
+
+Yet other libraries are maintained by members of the CircuitPython community,
+and are packaged in the **CircuitPython Community Library Bundle**.
+
+The Adafruit bundles are available on GitHub: .
+The Community bundles are available at: .
+
+More detailed information about the bundles, and download links for the latest bundles
+are at .
+
+Documentation about bundle construction is at: .
+
+Documentation for Community Libraries is not available on ReadTheDocs at this time. See the GitHub repository
+for each library for any included documentation.
diff --git a/docs/library/asyncio.rst b/docs/library/asyncio.rst
deleted file mode 100644
index 87417f55e2..0000000000
--- a/docs/library/asyncio.rst
+++ /dev/null
@@ -1,323 +0,0 @@
-:mod:`uasyncio` --- asynchronous I/O scheduler
-==============================================
-
-.. module:: uasyncio
-   :synopsis: asynchronous I/O scheduler for writing concurrent code
-
-|see_cpython_module|
-`asyncio `_
-
-Example::
-
-    import uasyncio
-
-    async def blink(led, period_ms):
-        while True:
-            led.on()
-            await uasyncio.sleep_ms(5)
-            led.off()
-            await uasyncio.sleep_ms(period_ms)
-
-    async def main(led1, led2):
-        uasyncio.create_task(blink(led1, 700))
-        uasyncio.create_task(blink(led2, 400))
-        await uasyncio.sleep_ms(10_000)
-
-    # Running on a pyboard
-    from pyb import LED
-    uasyncio.run(main(LED(1), LED(2)))
-
-    # Running on a generic board
-    from machine import Pin
-    uasyncio.run(main(Pin(1), Pin(2)))
-
-Core functions
---------------
-
-.. function:: create_task(coro)
-
-    Create a new task from the given coroutine and schedule it to run.
-
-    Returns the corresponding `Task` object.
-
-.. function:: current_task()
-
-    Return the `Task` object associated with the currently running task.
-
-.. function:: run(coro)
-
-    Create a new task from the given coroutine and run it until it completes.
-
-    Returns the value returned by *coro*.
-
-.. function:: sleep(t)
-
-    Sleep for *t* seconds (can be a float).
-
-    This is a coroutine.
-
-.. function:: sleep_ms(t)
-
-    Sleep for *t* milliseconds.
-
-    This is a coroutine, and a MicroPython extension.
-
-Additional functions
---------------------
-
-.. function:: wait_for(awaitable, timeout)
-
-    Wait for the *awaitable* to complete, but cancel it if it takes longer
-    that *timeout* seconds.  If *awaitable* is not a task then a task will be
-    created from it.
-
-    If a timeout occurs, it cancels the task and raises ``asyncio.TimeoutError``:
-    this should be trapped by the caller.
-
-    Returns the return value of *awaitable*.
-
-    This is a coroutine.
-
-.. function:: wait_for_ms(awaitable, timeout)
-
-    Similar to `wait_for` but *timeout* is an integer in milliseconds.
-
-    This is a coroutine, and a MicroPython extension.
-
-.. function:: gather(*awaitables, return_exceptions=False)
-
-    Run all *awaitables* concurrently.  Any *awaitables* that are not tasks are
-    promoted to tasks.
-
-    Returns a list of return values of all *awaitables*.
-
-    This is a coroutine.
-
-class Task
-----------
-
-.. class:: Task()
-
-    This object wraps a coroutine into a running task.  Tasks can be waited on
-    using ``await task``, which will wait for the task to complete and return
-    the return value of the task.
-
-    Tasks should not be created directly, rather use `create_task` to create them.
-
-.. method:: Task.cancel()
-
-    Cancel the task by injecting a ``CancelledError`` into it.  The task may
-    or may not ignore this exception.
-
-class Event
------------
-
-.. class:: Event()
-
-    Create a new event which can be used to synchronise tasks.  Events start
-    in the cleared state.
-
-.. method:: Event.is_set()
-
-    Returns ``True`` if the event is set, ``False`` otherwise.
-
-.. method:: Event.set()
-
-    Set the event.  Any tasks waiting on the event will be scheduled to run.
-
-.. method:: Event.clear()
-
-    Clear the event.
-
-.. method:: Event.wait()
-
-    Wait for the event to be set.  If the event is already set then it returns
-    immediately.
-
-    This is a coroutine.
-
-class Lock
-----------
-
-.. class:: Lock()
-
-    Create a new lock which can be used to coordinate tasks.  Locks start in
-    the unlocked state.
-
-    In addition to the methods below, locks can be used in an ``async with`` statement.
-
-.. method:: Lock.locked()
-
-    Returns ``True`` if the lock is locked, otherwise ``False``.
-
-.. method:: Lock.acquire()
-
-    Wait for the lock to be in the unlocked state and then lock it in an atomic
-    way.  Only one task can acquire the lock at any one time.
-
-    This is a coroutine.
-
-.. method:: Lock.release()
-
-    Release the lock.  If any tasks are waiting on the lock then the next one in the
-    queue is scheduled to run and the lock remains locked.  Otherwise, no tasks are
-    waiting an the lock becomes unlocked.
-
-TCP stream connections
-----------------------
-
-.. function:: open_connection(host, port)
-
-    Open a TCP connection to the given *host* and *port*.  The *host* address will be
-    resolved using `socket.getaddrinfo`, which is currently a blocking call.
-
-    Returns a pair of streams: a reader and a writer stream.
-    Will raise a socket-specific ``OSError`` if the host could not be resolved or if
-    the connection could not be made.
-
-    This is a coroutine.
-
-.. function:: start_server(callback, host, port, backlog=5)
-
-    Start a TCP server on the given *host* and *port*.  The *callback* will be
-    called with incoming, accepted connections, and be passed 2 arguments: reader
-    and writer streams for the connection.
-
-    Returns a `Server` object.
-
-    This is a coroutine.
-
-.. class:: Stream()
-
-    This represents a TCP stream connection.  To minimise code this class implements
-    both a reader and a writer, and both ``StreamReader`` and ``StreamWriter`` alias to
-    this class.
-
-.. method:: Stream.get_extra_info(v)
-
-    Get extra information about the stream, given by *v*.  The valid values for *v* are:
-    ``peername``.
-
-.. method:: Stream.close()
-
-    Close the stream.
-
-.. method:: Stream.wait_closed()
-
-    Wait for the stream to close.
-
-    This is a coroutine.
-
-.. method:: Stream.read(n)
-
-    Read up to *n* bytes and return them.
-
-    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.readexactly(n)
-
-    Read exactly *n* bytes and return them as a bytes object.
-
-    Raises an ``EOFError`` exception if the stream ends before reading *n* bytes.
-
-    This is a coroutine.
-
-.. method:: Stream.readline()
-
-    Read a line and return it.
-
-    This is a coroutine.
-
-.. method:: Stream.write(buf)
-
-    Accumulated *buf* to the output buffer.  The data is only flushed when
-    `Stream.drain` is called.  It is recommended to call `Stream.drain` immediately
-    after calling this function.
-
-.. method:: Stream.drain()
-
-    Drain (write) all buffered output data out to the stream.
-
-    This is a coroutine.
-
-.. class:: Server()
-
-    This represents the server class returned from `start_server`.  It can be used
-    in an ``async with`` statement to close the server upon exit.
-
-.. method:: Server.close()
-
-    Close the server.
-
-.. method:: Server.wait_closed()
-
-    Wait for the server to close.
-
-    This is a coroutine.
-
-Event Loop
-----------
-
-.. function:: get_event_loop()
-
-    Return the event loop used to schedule and run tasks.  See `Loop`.
-
-.. function:: new_event_loop()
-
-    Reset the event loop and return it.
-
-    Note: since MicroPython only has a single event loop this function just
-    resets the loop's state, it does not create a new one.
-
-.. class:: Loop()
-
-    This represents the object which schedules and runs tasks.  It cannot be
-    created, use `get_event_loop` instead.
-
-.. method:: Loop.create_task(coro)
-
-    Create a task from the given *coro* and return the new `Task` object.
-
-.. method:: Loop.run_forever()
-
-    Run the event loop until `stop()` is called.
-
-.. method:: Loop.run_until_complete(awaitable)
-
-    Run the given *awaitable* until it completes.  If *awaitable* is not a task
-    then it will be promoted to one.
-
-.. method:: Loop.stop()
-
-    Stop the event loop.
-
-.. method:: Loop.close()
-
-    Close the event loop.
-
-.. method:: Loop.set_exception_handler(handler)
-
-    Set the exception handler to call when a Task raises an exception that is not
-    caught.  The *handler* should accept two arguments: ``(loop, context)``.
-
-.. method:: Loop.get_exception_handler()
-
-    Get the current exception handler.  Returns the handler, or ``None`` if no
-    custom handler is set.
-
-.. method:: Loop.default_exception_handler(context)
-
-    The default exception handler that is called.
-
-.. method:: Loop.call_exception_handler(context)
-
-    Call the current exception handler.  The argument *context* is passed through and
-    is a dictionary containing keys: ``'message'``, ``'exception'``, ``'future'``.
diff --git a/docs/library/index.rst b/docs/library/index.rst
index b71949c2dd..2a8e37a8f4 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -35,7 +35,6 @@ These libraries are not currently enabled in any CircuitPython build, but may be
    json.rst
    re.rst
    sys.rst
-   asyncio.rst
    ctypes.rst
    select.rst
 

From 529ec23ecba3718a75ead98e0f43083e7b579f2c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 8 Dec 2022 20:07:48 -0600
Subject: [PATCH 1540/2403] sadly, no emoji in the docs :( hopefully this works

---
 docs/environment.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/environment.rst b/docs/environment.rst
index 0a370d64d9..1d4057b609 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -26,8 +26,9 @@ File format example:
 
    str_key="Hello world" # with trailing comment
    int_key = 7
-   unicode_key="👨"
-   unicode_key2="\\U0001f468" # same as above
+   unicode_key="œuvre"
+   unicode_key2="\\u0153uvre" # same as above
+   unicode_key3="\\U00000153uvre" # same as above
    escape_codes="supported, including \\r\\n\\"\\\\"
    # comment
    [subtable]

From 3a92c079fcc42c2ffe49963ddfb0312557acae6c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:07:23 -0600
Subject: [PATCH 1541/2403] Finish renaming os_environ_get_key to os_getenv

.. for consistency.
---
 ports/espressif/common-hal/_bleio/Adapter.c   | 2 +-
 ports/espressif/supervisor/port.c             | 2 +-
 shared-module/os/__init__.h                   | 2 +-
 shared-module/os/getenv.c                     | 2 +-
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 7da1cd0b8c..414ef8b09c 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -103,7 +103,7 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
 
         #if CIRCUITPY_OS_GETENV
         char ble_name[1 + MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH];
-        os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
+        os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
         if (result == ENVIRON_OK) {
             ble_svc_gap_device_name_set(ble_name);
         } else
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 2792792455..546477cbf2 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -519,7 +519,7 @@ void port_idle_until_interrupt(void) {
 void port_post_boot_py(bool heap_valid) {
     if (!heap_valid && filesystem_present()) {
         mp_int_t reserved;
-        if (common_hal_os_environ_get_key_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
+        if (common_hal_os_getenv_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
             common_hal_espidf_set_reserved_psram(reserved);
         }
         common_hal_espidf_reserve_psram();
diff --git a/shared-module/os/__init__.h b/shared-module/os/__init__.h
index 48bd06195e..7c32cdcd95 100644
--- a/shared-module/os/__init__.h
+++ b/shared-module/os/__init__.h
@@ -38,7 +38,7 @@ typedef enum {
 // Allocation free version that returns the full length of the value.
 // If it fits, the return value is 0-terminated. If the value doesn't fit,
 // *value_len may be an over-estimate but never an under-estimate.
-os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len);
+os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
 
 // Returns ENVIRON_ERR_OK and sets value to the read value.  Returns
 // ENVIRON_ERR_... if the value was not numeric. allocation-free.
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index ec9edbacac..2b610bd91c 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -323,7 +323,7 @@ STATIC os_environ_err_t os_environ_get_key_buf_terminated(const char *key, char
     return result;
 }
 
-os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len) {
+os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
     bool quoted;
     os_environ_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, "ed);
     if (result == ENVIRON_OK && !quoted) {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index ab9ded66a3..525b851b8f 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -251,7 +251,7 @@ void supervisor_start_web_workflow(void) {
     size_t ssid_len = 0;
     size_t password_len = 0;
 
-    os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
+    os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != ENVIRON_OK) {
         return;
     }

From f2032dbf0f47cbc56e3688b361615e3cebf1d31b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:11:37 -0600
Subject: [PATCH 1542/2403] remove mention of _environ

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

diff --git a/docs/environment.rst b/docs/environment.rst
index 1d4057b609..58ada402c6 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -32,7 +32,7 @@ File format example:
    escape_codes="supported, including \\r\\n\\"\\\\"
    # comment
    [subtable]
-   subvalue="cannot retrieve this using _environ or getenv"
+   subvalue="cannot retrieve this using getenv"
 
 
 Details of the toml language subset

From 499af3ed000819cac89930a36c0499e92fd837d1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:11:57 -0600
Subject: [PATCH 1543/2403] update source locations in translation file

---
 locale/circuitpython.pot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 43c7a79ff7..56c2396d46 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
-#: shared-module/_environ/__init__.c
+#: shared-module/os/getenv.c
 msgid "File not found"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
-#: shared-module/_environ/__init__.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
-#: shared-module/_environ/__init__.c
+#: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
 msgstr ""
@@ -1272,7 +1272,7 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
-#: shared-module/_environ/__init__.c
+#: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
 msgstr ""
 
@@ -1280,7 +1280,7 @@ msgstr ""
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
-#: shared-module/_environ/__init__.c
+#: shared-module/os/getenv.c
 msgid "Key not found"
 msgstr ""
 

From 678a466d1af3a6d1bcec01525af12e87182e475e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:12:27 -0600
Subject: [PATCH 1544/2403] alphabetize

---
 ports/atmel-samd/mpconfigport.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 72b1302227..57f7ca339f 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -24,16 +24,15 @@ ifeq ($(CHIP_FAMILY),samd21)
 CIRCUITPY_AESIO ?= 0
 CIRCUITPY_ATEXIT ?= 0
 CIRCUITPY_AUDIOMIXER ?= 0
+CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BINASCII ?= 0
 CIRCUITPY_BITBANGIO ?= 0
 CIRCUITPY_BITMAPTOOLS ?= 0
-CIRCUITPY_BUSDEVICE ?= 0
-CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BUILTINS_POW3 ?= 0
+CIRCUITPY_BUSDEVICE ?= 0
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
 CIRCUITPY_COUNTIO ?= 0
-CIRCUITPY_OS_GETENV ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
@@ -43,6 +42,7 @@ CIRCUITPY_I2CTARGET ?= 0
 CIRCUITPY_JSON ?= 0
 CIRCUITPY_KEYPAD ?= 0
 CIRCUITPY_MSGPACK ?= 0
+CIRCUITPY_OS_GETENV ?= 0
 CIRCUITPY_PIXELMAP ?= 0
 CIRCUITPY_RE ?= 0
 CIRCUITPY_SDCARDIO ?= 0

From 44f15d563dfea31606dc03fb5905c8b91615458f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:14:53 -0600
Subject: [PATCH 1545/2403] Rename "environ" errors to "getenv" errors

---
 ports/espressif/common-hal/_bleio/Adapter.c   |  4 +--
 ports/espressif/supervisor/port.c             |  2 +-
 shared-module/os/__init__.h                   |  8 ++---
 shared-module/os/getenv.c                     | 30 +++++++++----------
 supervisor/shared/web_workflow/web_workflow.c |  4 +--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 414ef8b09c..3239c501cc 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -103,8 +103,8 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
 
         #if CIRCUITPY_OS_GETENV
         char ble_name[1 + MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH];
-        os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
-        if (result == ENVIRON_OK) {
+        os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
+        if (result == GETENV_OK) {
             ble_svc_gap_device_name_set(ble_name);
         } else
         #endif
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 546477cbf2..baeba5ce90 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -519,7 +519,7 @@ void port_idle_until_interrupt(void) {
 void port_post_boot_py(bool heap_valid) {
     if (!heap_valid && filesystem_present()) {
         mp_int_t reserved;
-        if (common_hal_os_getenv_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
+        if (common_hal_os_getenv_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == GETENV_OK) {
             common_hal_espidf_set_reserved_psram(reserved);
         }
         common_hal_espidf_reserve_psram();
diff --git a/shared-module/os/__init__.h b/shared-module/os/__init__.h
index 7c32cdcd95..ce7199c8f2 100644
--- a/shared-module/os/__init__.h
+++ b/shared-module/os/__init__.h
@@ -27,19 +27,19 @@
 #pragma once
 
 typedef enum {
-    ENVIRON_OK = 0,
+    GETENV_OK = 0,
     ENVIRON_ERR_OPEN,
     ENVIRON_ERR_UNICODE,
     ENVIRON_ERR_LENGTH,
     ENVIRON_ERR_NOT_FOUND,
     ENVIRON_ERR_UNEXPECTED = 0xff00, // logical or'd with the byte value
-} os_environ_err_t;
+} os_getenv_err_t;
 
 // Allocation free version that returns the full length of the value.
 // If it fits, the return value is 0-terminated. If the value doesn't fit,
 // *value_len may be an over-estimate but never an under-estimate.
-os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
+os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
 
 // Returns ENVIRON_ERR_OK and sets value to the read value.  Returns
 // ENVIRON_ERR_... if the value was not numeric. allocation-free.
-os_environ_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value);
+os_getenv_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value);
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 2b610bd91c..b883ae423c 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -39,7 +39,7 @@
 #include "supervisor/filesystem.h"
 #include "supervisor/memory.h"
 
-#define ENVIRON_PATH "settings.toml"
+#define GETENV_PATH "settings.toml"
 
 #if defined(UNIX)
 typedef FILE *file_arg;
@@ -178,7 +178,7 @@ STATIC bool key_matches(file_arg *active_file, const char *key) {
     return true;
 }
 
-STATIC os_environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) {
+STATIC os_getenv_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) {
     char hex_buf[sz + 1];
     for (int i = 0; i < sz; i++) {
         hex_buf[i] = get_next_byte(active_file);
@@ -197,7 +197,7 @@ STATIC os_environ_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_
 }
 
 // Read a quoted string
-STATIC os_environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
+STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
     while (true) {
         int character = get_next_byte(active_file);
         switch (character) {
@@ -244,7 +244,7 @@ STATIC os_environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                     case 'U':
                     case 'u': {
                         int sz = (character == 'u') ? 4 : 8;
-                        os_environ_err_t res;
+                        os_getenv_err_t res;
                         res = read_unicode_escape(active_file, sz, buf);
                         if (res != ENVIRON_OK) {
                             return res;
@@ -262,7 +262,7 @@ STATIC os_environ_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
 }
 
 // Read a numeric value (non-quoted value) as a string
-STATIC os_environ_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) {
+STATIC os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) {
     int character = first_character;
     while (true) {
         switch (character) {
@@ -292,13 +292,13 @@ STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) {
     }
 }
 
-STATIC os_environ_err_t os_environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
+STATIC os_getenv_err_t os_environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
     file_arg active_file;
     if (!open_file(path, &active_file)) {
         return ENVIRON_ERR_OPEN;
     }
 
-    os_environ_err_t result = ENVIRON_ERR_NOT_FOUND;
+    os_getenv_err_t result = ENVIRON_ERR_NOT_FOUND;
     while (!is_eof(&active_file)) {
         if (key_matches(&active_file, key)) {
             result = read_value(&active_file, buf, quoted);
@@ -308,10 +308,10 @@ STATIC os_environ_err_t os_environ_get_key_vstr(const char *path, const char *ke
     return result;
 }
 
-STATIC os_environ_err_t os_environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
+STATIC os_getenv_err_t os_environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
     vstr_t buf;
     vstr_init_fixed_buf(&buf, value_len, value);
-    os_environ_err_t result = os_environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
+    os_getenv_err_t result = os_environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
 
     if (result == ENVIRON_OK) {
         vstr_add_byte_nonstd(&buf, 0);
@@ -323,16 +323,16 @@ STATIC os_environ_err_t os_environ_get_key_buf_terminated(const char *key, char
     return result;
 }
 
-os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
+os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
     bool quoted;
-    os_environ_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, "ed);
+    os_getenv_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, "ed);
     if (result == ENVIRON_OK && !quoted) {
         result = ENVIRON_ERR_UNEXPECTED | value[0];
     }
     return result;
 }
 
-STATIC void throw__environ_error(os_environ_err_t error) {
+STATIC void throw__environ_error(os_getenv_err_t error) {
     if (error == ENVIRON_OK) {
         return;
     }
@@ -366,7 +366,7 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d
     bool quoted;
 
     vstr_init(&buf, 64);
-    os_environ_err_t result = os_environ_get_key_vstr(path, key, &buf, "ed);
+    os_getenv_err_t result = os_environ_get_key_vstr(path, key, &buf, "ed);
     if (result == ENVIRON_ERR_NOT_FOUND) {
         return default_;
     }
@@ -383,10 +383,10 @@ mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
     return common_hal_os_getenv_path(ENVIRON_PATH, key, default_);
 }
 
-os_environ_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value) {
+os_getenv_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value) {
     char buf[16];
     bool quoted;
-    os_environ_err_t result = os_environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
+    os_getenv_err_t result = os_environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
     if (result != ENVIRON_OK) {
         return result;
     }
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 525b851b8f..5bac8522dd 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -251,8 +251,8 @@ void supervisor_start_web_workflow(void) {
     size_t ssid_len = 0;
     size_t password_len = 0;
 
-    os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
-    if (result != ENVIRON_OK) {
+    os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
+    if (result != GETENV_OK) {
         return;
     }
 

From 1f504e5c0f65d88212aa32f1b1cb4c9403d23a81 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:15:00 -0600
Subject: [PATCH 1546/2403] Remove line accidentally duplicated

---
 ports/unix/coverage.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 8463c169e4..0e4c6dbd48 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -95,7 +95,6 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);

From cc7d550407adf39c036ddd4ade38d1a35b990ebe Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:28:46 -0600
Subject: [PATCH 1547/2403] Really finish renaming to getenv

---
 py/circuitpy_defns.mk       |  1 -
 shared-module/os/__init__.h | 21 ++++++-----
 shared-module/os/getenv.c   | 74 ++++++++++++++++++-------------------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index df3f664864..2deefda030 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -586,7 +586,6 @@ SRC_SHARED_MODULE_ALL = \
 	displayio/TileGrid.c \
 	displayio/area.c \
 	displayio/__init__.c \
-	_environ/__init__.c \
 	floppyio/__init__.c \
 	fontio/BuiltinFont.c \
 	fontio/__init__.c \
diff --git a/shared-module/os/__init__.h b/shared-module/os/__init__.h
index ce7199c8f2..0e1d78c53b 100644
--- a/shared-module/os/__init__.h
+++ b/shared-module/os/__init__.h
@@ -28,18 +28,19 @@
 
 typedef enum {
     GETENV_OK = 0,
-    ENVIRON_ERR_OPEN,
-    ENVIRON_ERR_UNICODE,
-    ENVIRON_ERR_LENGTH,
-    ENVIRON_ERR_NOT_FOUND,
-    ENVIRON_ERR_UNEXPECTED = 0xff00, // logical or'd with the byte value
+    GETENV_ERR_OPEN,
+    GETENV_ERR_UNICODE,
+    GETENV_ERR_LENGTH,
+    GETENV_ERR_NOT_FOUND,
+    GETENV_ERR_UNEXPECTED = 0xff00, // logical or'd with the byte value
 } os_getenv_err_t;
 
 // Allocation free version that returns the full length of the value.
-// If it fits, the return value is 0-terminated. If the value doesn't fit,
-// *value_len may be an over-estimate but never an under-estimate.
+// If it fits, the return value is 0-terminated. The passed in buffer
+// may be modified even if an error is returned.  Allocation free.
 os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
 
-// Returns ENVIRON_ERR_OK and sets value to the read value.  Returns
-// ENVIRON_ERR_... if the value was not numeric. allocation-free.
-os_getenv_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value);
+// Returns GETENV_OK and sets value to the read value.  Returns
+// GETENV_ERR_... if the value was not numeric. allocation-free.
+// If any error code is returned, value is guaranteed not modified
+os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value);
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index b883ae423c..dc1f640aec 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -187,13 +187,13 @@ STATIC os_getenv_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t
     char *end;
     unsigned long c = strtoul(hex_buf, &end, 16);
     if (end != &hex_buf[sz]) {
-        return ENVIRON_ERR_UNEXPECTED | *end;
+        return GETENV_ERR_UNEXPECTED | *end;
     }
     if (c >= 0x110000) {
-        return ENVIRON_ERR_UNICODE;
+        return GETENV_ERR_UNICODE;
     }
     vstr_add_char_nonstd(buf, c);
-    return ENVIRON_OK;
+    return GETENV_OK;
 }
 
 // Read a quoted string
@@ -203,7 +203,7 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
         switch (character) {
             case 0:
             case '\n':
-                return ENVIRON_ERR_UNEXPECTED | character;
+                return GETENV_ERR_UNEXPECTED | character;
 
             case '"':
                 character = consume_whitespace(active_file);
@@ -212,9 +212,9 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                         next_line(active_file);
                         MP_FALLTHROUGH;
                     case '\n':
-                        return ENVIRON_OK;
+                        return GETENV_OK;
                     default:
-                        return ENVIRON_ERR_UNEXPECTED | character;
+                        return GETENV_ERR_UNEXPECTED | character;
                 }
 
             case '\\':
@@ -222,7 +222,7 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                 switch (character) {
                     case 0:
                     case '\n':
-                        return ENVIRON_ERR_UNEXPECTED | character;
+                        return GETENV_ERR_UNEXPECTED | character;
                     case 'b':
                         character = '\b';
                         break;
@@ -246,7 +246,7 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                         int sz = (character == 'u') ? 4 : 8;
                         os_getenv_err_t res;
                         res = read_unicode_escape(active_file, sz, buf);
-                        if (res != ENVIRON_OK) {
+                        if (res != GETENV_OK) {
                             return res;
                         }
                         continue;
@@ -267,12 +267,12 @@ STATIC os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int f
     while (true) {
         switch (character) {
             case 0:
-                return ENVIRON_ERR_UNEXPECTED | character;
+                return GETENV_ERR_UNEXPECTED | character;
             case '\n':
-                return ENVIRON_OK;
+                return GETENV_OK;
             case '#':
                 next_line(active_file);
-                return ENVIRON_OK;
+                return GETENV_OK;
             default:
                 vstr_add_byte_nonstd(buf, character);
         }
@@ -292,13 +292,13 @@ STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) {
     }
 }
 
-STATIC os_getenv_err_t os_environ_get_key_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
+STATIC os_getenv_err_t os_getenv_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) {
     file_arg active_file;
     if (!open_file(path, &active_file)) {
-        return ENVIRON_ERR_OPEN;
+        return GETENV_ERR_OPEN;
     }
 
-    os_getenv_err_t result = ENVIRON_ERR_NOT_FOUND;
+    os_getenv_err_t result = GETENV_ERR_NOT_FOUND;
     while (!is_eof(&active_file)) {
         if (key_matches(&active_file, key)) {
             result = read_value(&active_file, buf, quoted);
@@ -308,16 +308,16 @@ STATIC os_getenv_err_t os_environ_get_key_vstr(const char *path, const char *key
     return result;
 }
 
-STATIC os_getenv_err_t os_environ_get_key_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
+STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) {
     vstr_t buf;
     vstr_init_fixed_buf(&buf, value_len, value);
-    os_getenv_err_t result = os_environ_get_key_vstr(ENVIRON_PATH, key, &buf, quoted);
+    os_getenv_err_t result = os_getenv_vstr(GETENV_PATH, key, &buf, quoted);
 
-    if (result == ENVIRON_OK) {
+    if (result == GETENV_OK) {
         vstr_add_byte_nonstd(&buf, 0);
         memcpy(value, buf.buf, MIN(buf.len, value_len));
         if (buf.len > value_len) {
-            result = ENVIRON_ERR_LENGTH;
+            result = GETENV_ERR_LENGTH;
         }
     }
     return result;
@@ -325,18 +325,18 @@ STATIC os_getenv_err_t os_environ_get_key_buf_terminated(const char *key, char *
 
 os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
     bool quoted;
-    os_getenv_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, "ed);
-    if (result == ENVIRON_OK && !quoted) {
-        result = ENVIRON_ERR_UNEXPECTED | value[0];
+    os_getenv_err_t result = os_getenv_buf_terminated(key, value, value_len, "ed);
+    if (result == GETENV_OK && !quoted) {
+        result = GETENV_ERR_UNEXPECTED | value[0];
     }
     return result;
 }
 
-STATIC void throw__environ_error(os_getenv_err_t error) {
-    if (error == ENVIRON_OK) {
+STATIC void throw_getenv_error(os_getenv_err_t error) {
+    if (error == GETENV_OK) {
         return;
     }
-    if (error & ENVIRON_ERR_UNEXPECTED) {
+    if (error & GETENV_ERR_UNEXPECTED) {
         byte character = (error & 0xff);
         mp_print_t print;
         vstr_t vstr;
@@ -350,11 +350,11 @@ STATIC void throw__environ_error(os_getenv_err_t error) {
             vstr.len, vstr.buf);
     }
     switch (error) {
-        case ENVIRON_ERR_OPEN:
+        case GETENV_ERR_OPEN:
             mp_raise_ValueError(translate("File not found"));
-        case ENVIRON_ERR_UNICODE:
+        case GETENV_ERR_UNICODE:
             mp_raise_ValueError(translate("Invalid unicode escape"));
-        case ENVIRON_ERR_NOT_FOUND:
+        case GETENV_ERR_NOT_FOUND:
             mp_raise_ValueError(translate("Key not found"));
         default:
             mp_raise_RuntimeError(translate("Internal error"));
@@ -366,11 +366,11 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d
     bool quoted;
 
     vstr_init(&buf, 64);
-    os_getenv_err_t result = os_environ_get_key_vstr(path, key, &buf, "ed);
-    if (result == ENVIRON_ERR_NOT_FOUND) {
+    os_getenv_err_t result = os_getenv_vstr(path, key, &buf, "ed);
+    if (result == GETENV_ERR_NOT_FOUND) {
         return default_;
     }
-    throw__environ_error(result);
+    throw_getenv_error(result);
 
     if (quoted) {
         return mp_obj_new_str_from_vstr(&mp_type_str, &buf);
@@ -380,24 +380,24 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d
 }
 
 mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
-    return common_hal_os_getenv_path(ENVIRON_PATH, key, default_);
+    return common_hal_os_getenv_path(GETENV_PATH, key, default_);
 }
 
-os_getenv_err_t common_hal_os_environ_get_key_int(const char *key, mp_int_t *value) {
+os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value) {
     char buf[16];
     bool quoted;
-    os_getenv_err_t result = os_environ_get_key_buf_terminated(key, buf, sizeof(buf), "ed);
-    if (result != ENVIRON_OK) {
+    os_getenv_err_t result = os_getenv_buf_terminated(key, buf, sizeof(buf), "ed);
+    if (result != GETENV_OK) {
         return result;
     }
     if (quoted) {
-        return ENVIRON_ERR_UNEXPECTED | '"';
+        return GETENV_ERR_UNEXPECTED | '"';
     }
     char *end;
     long num = strtol(buf, &end, 0);
     if (end == buf || *end) { // If the whole buffer was not consumed it's an error
-        return ENVIRON_ERR_UNEXPECTED | *end;
+        return GETENV_ERR_UNEXPECTED | *end;
     }
     *value = (mp_int_t)num;
-    return ENVIRON_OK;
+    return GETENV_OK;
 }

From 040fac07243fb61a66388d9bac9eb3f2d1c28ee6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:29:14 -0600
Subject: [PATCH 1548/2403] No need to track excess length

.. this is a relic from when the actual required length was given
back to the caller
---
 shared-module/os/getenv.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index dc1f640aec..09dc19748d 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -101,8 +101,6 @@ STATIC void seek_eof(file_arg *active_file) {
 STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) {
     if (!vstr->fixed_buf || vstr->alloc > vstr->len) {
         vstr_add_byte(vstr, b);
-    } else {
-        vstr->len++;
     }
 }
 
@@ -114,8 +112,6 @@ STATIC void vstr_add_char_nonstd(vstr_t *vstr, unichar c) {
         (c < 0x10000) ? 3 : 4;
     if (!vstr->fixed_buf || vstr->alloc > vstr->len + ulen) {
         vstr_add_char(vstr, c);
-    } else {
-        vstr->len += ulen;
     }
 }
 

From 6dca9db225c851edb3236e5c613192a48f2a3496 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:35:50 -0600
Subject: [PATCH 1549/2403] Rename test function & fix a bug with default value
 handling

---
 ports/unix/main.c                   | 8 ++++----
 tests/circuitpython/environ_test.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index aa7c92dcff..506a8ed433 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -421,11 +421,11 @@ STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
 #endif
 
 mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_);
-STATIC mp_obj_t get_key(mp_obj_t path_in, mp_obj_t key_to_get_in) {
+STATIC mp_obj_t getenv_from_file(mp_obj_t path_in, mp_obj_t key_to_get_in) {
     return common_hal_os_getenv_path(mp_obj_str_get_str(path_in),
-        mp_obj_str_get_str(key_to_get_in), mp_const_none);
+        mp_obj_str_get_str(key_to_get_in), default_);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(get_key_obj, get_key);
+MP_DEFINE_CONST_FUN_OBJ_2(getenv_from_file_obj, get_key);
 
 MP_NOINLINE int main_(int argc, char **argv);
 
@@ -547,7 +547,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
         MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
         mp_store_global(MP_QSTR_extra_coverage, MP_OBJ_FROM_PTR(&extra_coverage_obj));
         mp_store_global(MP_QSTR_extra_cpp_coverage, MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
-        mp_store_global(MP_QSTR_get_key, MP_OBJ_FROM_PTR(&get_key_obj));
+        mp_store_global(MP_QSTR_getenv_from_file, MP_OBJ_FROM_PTR(&getenv_from_file_obj));
     }
     #endif
 
diff --git a/tests/circuitpython/environ_test.py b/tests/circuitpython/environ_test.py
index 8dfab8812c..9781444100 100644
--- a/tests/circuitpython/environ_test.py
+++ b/tests/circuitpython/environ_test.py
@@ -1,7 +1,7 @@
 import os
 
 try:
-    get_key
+    getenv_from_file
 except NameError:
     # Because run-tests.py suppresses site-packages, this test can't be run
     # on the host interpreter. However, it can be run manually to
@@ -10,7 +10,7 @@ except NameError:
     # After 3.11 becomes standard, change this to use tomllib.
     import tomlkit
 
-    def get_key(filename, key):
+    def getenv_from_file(filename, key):
         with open(filename) as f:
             s = tomlkit.load(f)
             return s.get(key, None)

From 3ab71d7448a5dfb972ab2c2b06121507ed29d5a4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 9 Dec 2022 14:46:06 -0600
Subject: [PATCH 1550/2403] Rename test function, make 'bad' files binary & add
 another test

---
 .gitignore                                    |  1 +
 .pre-commit-config.yaml                       |  4 +-
 ports/unix/main.c                             |  4 +-
 tests/circuitpython/bad4.toml                 |  1 +
 tests/circuitpython/environ_test.py           | 42 -------------------
 tests/circuitpython/getenv_test.py            | 20 +++++++++
 ...environ_test.py.exp => getenv_test.py.exp} | 35 ++++++++--------
 7 files changed, 44 insertions(+), 63 deletions(-)
 create mode 100644 tests/circuitpython/bad4.toml
 delete mode 100644 tests/circuitpython/environ_test.py
 create mode 100644 tests/circuitpython/getenv_test.py
 rename tests/circuitpython/{environ_test.py.exp => getenv_test.py.exp} (69%)

diff --git a/.gitignore b/.gitignore
index 2fdfe207a2..9cb1e9ea5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 !atmel-samd/asf/**/*.a
 *.elf
 *.bin
+!*.toml.bin
 *.map
 *.hex
 *.dis
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1905b233cf..05e193f0e9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,9 +8,9 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.toml|tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
+        exclude: '^(tests/.*\.toml|tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
 -   repo: local
     hooks:
     -   id: translations
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 506a8ed433..e423634e58 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -423,9 +423,9 @@ STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
 mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_);
 STATIC mp_obj_t getenv_from_file(mp_obj_t path_in, mp_obj_t key_to_get_in) {
     return common_hal_os_getenv_path(mp_obj_str_get_str(path_in),
-        mp_obj_str_get_str(key_to_get_in), default_);
+        mp_obj_str_get_str(key_to_get_in), mp_const_none);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(getenv_from_file_obj, get_key);
+MP_DEFINE_CONST_FUN_OBJ_2(getenv_from_file_obj, getenv_from_file);
 
 MP_NOINLINE int main_(int argc, char **argv);
 
diff --git a/tests/circuitpython/bad4.toml b/tests/circuitpython/bad4.toml
new file mode 100644
index 0000000000..befe224084
--- /dev/null
+++ b/tests/circuitpython/bad4.toml
@@ -0,0 +1 @@
+string="
\ No newline at end of file
diff --git a/tests/circuitpython/environ_test.py b/tests/circuitpython/environ_test.py
deleted file mode 100644
index 9781444100..0000000000
--- a/tests/circuitpython/environ_test.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-
-try:
-    getenv_from_file
-except NameError:
-    # Because run-tests.py suppresses site-packages, this test can't be run
-    # on the host interpreter. However, it can be run manually to
-    # generate/update the expected file.
-    #
-    # After 3.11 becomes standard, change this to use tomllib.
-    import tomlkit
-
-    def getenv_from_file(filename, key):
-        with open(filename) as f:
-            s = tomlkit.load(f)
-            return s.get(key, None)
-
-
-def run_test(f, k=None):
-    try:
-        v = get_key(f"{BASE}/{f}.toml", k or f)
-        print(f, k, repr(v))
-    except Exception as e:
-        print(f, k, "err")
-
-
-if "/" in __file__:
-    BASE = __file__.rsplit("/", 1)[0]
-else:
-    BASE = "."
-
-run_test("good", "notpresent")
-run_test("good", "string")
-run_test("good", "number")
-run_test("good", "cstring")
-run_test("good", "cnumber")
-run_test("good", "subvalue")
-for i in range(8):
-    run_test("good", f"string{i}")
-run_test("bad1", "string")
-run_test("bad2", "string")
-run_test("bad3", "string")
diff --git a/tests/circuitpython/getenv_test.py b/tests/circuitpython/getenv_test.py
new file mode 100644
index 0000000000..d3735cc260
--- /dev/null
+++ b/tests/circuitpython/getenv_test.py
@@ -0,0 +1,20 @@
+def run_test(f, k=None):
+    try:
+        v = getenv_from_file(f"{BASE}/{f}.toml", k or f)
+        print(f, k, repr(v))
+    except Exception as e:
+        print(f, k, str(e))
+
+
+BASE = __file__.rpartition("/")[0] or "."
+
+run_test("good", "notpresent")
+run_test("good", "string")
+run_test("good", "number")
+run_test("good", "cstring")
+run_test("good", "cnumber")
+run_test("good", "subvalue")
+for i in range(8):
+    run_test("good", f"string{i}")
+for i in range(1, 5):
+    run_test(f"bad{i}", f"string")
diff --git a/tests/circuitpython/environ_test.py.exp b/tests/circuitpython/getenv_test.py.exp
similarity index 69%
rename from tests/circuitpython/environ_test.py.exp
rename to tests/circuitpython/getenv_test.py.exp
index f168b089c0..e7c58666c2 100644
--- a/tests/circuitpython/environ_test.py.exp
+++ b/tests/circuitpython/getenv_test.py.exp
@@ -1,17 +1,18 @@
-good notpresent None
-good string 'hello world'
-good number 7
-good cstring 'hello comment'
-good cnumber 127
-good subvalue None
-good string0 None
-good string1 '\n'
-good string2 'Áx'
-good string3 'Áx'
-good string4 '\x0c"\\'
-good string5 '\t\r\x08'
-good string6 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-good string7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-bad1 string err
-bad2 string err
-bad3 string err
+good.toml notpresent None
+good.toml string 'hello world'
+good.toml number 7
+good.toml cstring 'hello comment'
+good.toml cnumber 127
+good.toml subvalue None
+good.toml string0 None
+good.toml string1 '\n'
+good.toml string2 'Áx'
+good.toml string3 'Áx'
+good.toml string4 '\x0c"\\'
+good.toml string5 '\t\r\x08'
+good.toml string6 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+good.toml string7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+bad1.toml.bin string Invalid byte '\n'
+bad2.toml.bin string Invalid byte '"'
+bad3.toml.bin string invalid syntax for integer with base 10: ''
+bad4.toml.bin string Invalid byte 'EOF'

From dd6dd5df21a3c7a83f7c5eaa24ff7cfe6ceb8aec Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 10 Dec 2022 12:58:08 -0600
Subject: [PATCH 1551/2403] rework the getenv test again

 * use a virtual fat filesystem during the test
 * this makes the file I/O part more closely patch runtime which is nice
 * side-steps the need to add a special function for testing
   * but test still can't be run on a device, because the vfs calls
     are incompatible, and you intentionally can't remount "/" anyway
 * and side-steps problems with storing 'bad' toml files
---
 .pre-commit-config.yaml                |  4 +-
 ports/unix/main.c                      |  8 ---
 ports/unix/modos.c                     |  5 ++
 shared-module/os/getenv.c              | 47 +++++---------
 tests/circuitpython/bad1.toml          |  1 -
 tests/circuitpython/bad2.toml          |  1 -
 tests/circuitpython/bad3.toml          |  1 -
 tests/circuitpython/bad4.toml          |  1 -
 tests/circuitpython/getenv_test.py     | 88 +++++++++++++++++++++-----
 tests/circuitpython/getenv_test.py.exp | 31 ++++-----
 tests/circuitpython/good.toml          | 14 ----
 11 files changed, 109 insertions(+), 92 deletions(-)
 delete mode 100644 tests/circuitpython/bad1.toml
 delete mode 100644 tests/circuitpython/bad2.toml
 delete mode 100644 tests/circuitpython/bad3.toml
 delete mode 100644 tests/circuitpython/bad4.toml
 delete mode 100644 tests/circuitpython/good.toml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 05e193f0e9..1905b233cf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,9 +8,9 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.toml|tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.toml|tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
 -   repo: local
     hooks:
     -   id: translations
diff --git a/ports/unix/main.c b/ports/unix/main.c
index e423634e58..5ebcf9193b 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -420,13 +420,6 @@ STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
 #define PATHLIST_SEP_CHAR ':'
 #endif
 
-mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_);
-STATIC mp_obj_t getenv_from_file(mp_obj_t path_in, mp_obj_t key_to_get_in) {
-    return common_hal_os_getenv_path(mp_obj_str_get_str(path_in),
-        mp_obj_str_get_str(key_to_get_in), mp_const_none);
-}
-MP_DEFINE_CONST_FUN_OBJ_2(getenv_from_file_obj, getenv_from_file);
-
 MP_NOINLINE int main_(int argc, char **argv);
 
 int main(int argc, char **argv) {
@@ -547,7 +540,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
         MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
         mp_store_global(MP_QSTR_extra_coverage, MP_OBJ_FROM_PTR(&extra_coverage_obj));
         mp_store_global(MP_QSTR_extra_cpp_coverage, MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
-        mp_store_global(MP_QSTR_getenv_from_file, MP_OBJ_FROM_PTR(&getenv_from_file_obj));
     }
     #endif
 
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 6241dfa6c3..deea3bfc91 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -193,7 +193,12 @@ STATIC mp_obj_t mod_os_system(mp_obj_t cmd_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_os_system_obj, mod_os_system);
 
+mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
 STATIC mp_obj_t mod_os_getenv(mp_obj_t var_in) {
+    mp_obj_t result = common_hal_os_getenv(mp_obj_str_get_str(var_in), mp_const_none);
+    if (result != mp_const_none) {
+        return result;
+    }
     const char *s = getenv(mp_obj_str_get_str(var_in));
     if (s == NULL) {
         return mp_const_none;
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 09dc19748d..0112a8a5cd 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -39,43 +39,29 @@
 #include "supervisor/filesystem.h"
 #include "supervisor/memory.h"
 
-#define GETENV_PATH "settings.toml"
+#define GETENV_PATH "/settings.toml"
 
-#if defined(UNIX)
-typedef FILE *file_arg;
-STATIC bool open_file(const char *name, file_arg *active_file) {
-    FILE *result = fopen(name, "r");
-    if (result) {
-        *active_file = result;
-    }
-    return result != NULL;
-}
-STATIC void close_file(file_arg *active_file) {
-    fclose(*active_file);
-}
-STATIC bool is_eof(file_arg *active_file) {
-    return feof(*active_file);
-}
-STATIC uint8_t get_next_byte(file_arg *active_file) {
-    int value = fgetc(*active_file);
-    if (value == EOF) {
-        return 0;
-    }
-    return value;
-}
-__attribute__((unused))
-STATIC void seek_eof(file_arg *active_file) {
-    fseek(*active_file, 0, SEEK_END);
-    (void)fgetc(*active_file);
-}
-#else
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 typedef FIL file_arg;
 STATIC bool open_file(const char *name, file_arg *active_file) {
+    #if defined(UNIX)
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t file_obj = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), mp_obj_new_str(name, strlen(name)), MP_ROM_QSTR(MP_QSTR_rb));
+        mp_arg_validate_type(file_obj, &mp_type_vfs_fat_fileio, MP_QSTR_file);
+        pyb_file_obj_t *file = MP_OBJ_TO_PTR(file_obj);
+        *active_file = file->fp;
+        nlr_pop();
+        return true;
+    } else {
+        return false;
+    }
+    #else
     FATFS *fs = filesystem_circuitpy();
     FRESULT result = f_open(fs, active_file, name, FA_READ);
     return result == FR_OK;
+    #endif
 }
 STATIC void close_file(file_arg *active_file) {
     // nothing
@@ -95,7 +81,6 @@ STATIC uint8_t get_next_byte(FIL *active_file) {
 STATIC void seek_eof(file_arg *active_file) {
     f_lseek(active_file, f_size(active_file));
 }
-#endif
 
 // For a fixed buffer, record the required size rather than throwing
 STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) {
@@ -363,7 +348,7 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d
 
     vstr_init(&buf, 64);
     os_getenv_err_t result = os_getenv_vstr(path, key, &buf, "ed);
-    if (result == GETENV_ERR_NOT_FOUND) {
+    if (result == GETENV_ERR_NOT_FOUND || result == GETENV_ERR_OPEN) {
         return default_;
     }
     throw_getenv_error(result);
diff --git a/tests/circuitpython/bad1.toml b/tests/circuitpython/bad1.toml
deleted file mode 100644
index fce8db1800..0000000000
--- a/tests/circuitpython/bad1.toml
+++ /dev/null
@@ -1 +0,0 @@
-string = "
diff --git a/tests/circuitpython/bad2.toml b/tests/circuitpython/bad2.toml
deleted file mode 100644
index 666c573716..0000000000
--- a/tests/circuitpython/bad2.toml
+++ /dev/null
@@ -1 +0,0 @@
-string = """
diff --git a/tests/circuitpython/bad3.toml b/tests/circuitpython/bad3.toml
deleted file mode 100644
index 705443a1c6..0000000000
--- a/tests/circuitpython/bad3.toml
+++ /dev/null
@@ -1 +0,0 @@
-string =
diff --git a/tests/circuitpython/bad4.toml b/tests/circuitpython/bad4.toml
deleted file mode 100644
index befe224084..0000000000
--- a/tests/circuitpython/bad4.toml
+++ /dev/null
@@ -1 +0,0 @@
-string="
\ No newline at end of file
diff --git a/tests/circuitpython/getenv_test.py b/tests/circuitpython/getenv_test.py
index d3735cc260..2f80e465e3 100644
--- a/tests/circuitpython/getenv_test.py
+++ b/tests/circuitpython/getenv_test.py
@@ -1,20 +1,78 @@
-def run_test(f, k=None):
+import uos
+
+uos.umount("/")
+
+
+class RAMBlockDevice:
+    ERASE_BLOCK_SIZE = 512
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
+
+    def readblocks(self, block, buf, off=0):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def writeblocks(self, block, buf, off=None):
+        if off is None:
+            # erase, then write
+            off = 0
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.ERASE_BLOCK_SIZE
+        if op == 5:  # block size
+            return self.ERASE_BLOCK_SIZE
+        if op == 6:  # erase block
+            return 0
+
+
+bdev = RAMBlockDevice(64)
+uos.VfsFat.mkfs(bdev)
+uos.mount(uos.VfsFat(bdev), "/")
+
+content_good = """
+# comment
+key0 = "hello world"
+key1 = 7
+ cstring = "hello comment" # comment
+  cnumber = 0x7f # comment
+key2= "\n"
+key3 ="\u00c1x"
+key4 = "\U000000c1x"
+key5 = "\f\"\\"
+key6 = "\t\r\b"
+key7 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+key8 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+[section]
+subvalue = "hi"
+"""
+
+content_bad = [
+    'key = "\n',
+    'key = """\n',
+    "key =\n",
+    'key="',
+]
+
+
+def run_test(key, content):
+    with open("/settings.toml", "w") as f:
+        f.write(content)
+
     try:
-        v = getenv_from_file(f"{BASE}/{f}.toml", k or f)
-        print(f, k, repr(v))
+        v = uos.getenv(key)
+        print(key, repr(v))
     except Exception as e:
-        print(f, k, str(e))
+        print(key, str(e))
 
 
-BASE = __file__.rpartition("/")[0] or "."
+for i in range(9):
+    run_test(f"key{i}", content_good)
 
-run_test("good", "notpresent")
-run_test("good", "string")
-run_test("good", "number")
-run_test("good", "cstring")
-run_test("good", "cnumber")
-run_test("good", "subvalue")
-for i in range(8):
-    run_test("good", f"string{i}")
-for i in range(1, 5):
-    run_test(f"bad{i}", f"string")
+for content in content_bad:
+    run_test("key", content)
diff --git a/tests/circuitpython/getenv_test.py.exp b/tests/circuitpython/getenv_test.py.exp
index e7c58666c2..b09c376d19 100644
--- a/tests/circuitpython/getenv_test.py.exp
+++ b/tests/circuitpython/getenv_test.py.exp
@@ -1,18 +1,13 @@
-good.toml notpresent None
-good.toml string 'hello world'
-good.toml number 7
-good.toml cstring 'hello comment'
-good.toml cnumber 127
-good.toml subvalue None
-good.toml string0 None
-good.toml string1 '\n'
-good.toml string2 'Áx'
-good.toml string3 'Áx'
-good.toml string4 '\x0c"\\'
-good.toml string5 '\t\r\x08'
-good.toml string6 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-good.toml string7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-bad1.toml.bin string Invalid byte '\n'
-bad2.toml.bin string Invalid byte '"'
-bad3.toml.bin string invalid syntax for integer with base 10: ''
-bad4.toml.bin string Invalid byte 'EOF'
+key0 'hello world'
+key1 7
+key2 Invalid byte '\n'
+key3 'Áx'
+key4 'Áx'
+key5 Invalid byte '\\'
+key6 '\t\r\x08'
+key7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+key8 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+key Invalid byte '\n'
+key Invalid byte '"'
+key invalid syntax for integer with base 10: ''
+key Invalid byte 'EOF'
diff --git a/tests/circuitpython/good.toml b/tests/circuitpython/good.toml
deleted file mode 100644
index 17e5c054f4..0000000000
--- a/tests/circuitpython/good.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# comment
-string = "hello world"
-number = 7
- cstring = "hello comment" # comment
-  cnumber = 0x7f # comment
-string1= "\n"
-string2 ="\u00c1x"
-string3 = "\U000000c1x"
-string4 = "\f\"\\"
-string5 = "\t\r\b"
-string6 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-string7 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-[section]
-subvalue = "hi"

From 6412d971facb6c0c75aaced897f39dc0a7d17bb2 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Sun, 11 Dec 2022 02:44:35 +0100
Subject: [PATCH 1552/2403] displayio: Set in_group to false when removing a
 layer from a group

Otherwise the removed layer cannot be re-added.
---
 shared-module/displayio/Group.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index ad45852379..7eec72404f 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -310,6 +310,7 @@ static void _remove_layer(displayio_group_t *self, size_t index) {
         self->members->items[index], &displayio_tilegrid_type);
     if (layer != MP_OBJ_NULL) {
         displayio_tilegrid_t *tilegrid = layer;
+        tilegrid->in_group = false;
         rendered_last_frame = displayio_tilegrid_get_previous_area(tilegrid, &layer_area);
         displayio_tilegrid_update_transform(tilegrid, NULL);
     }
@@ -317,6 +318,7 @@ static void _remove_layer(displayio_group_t *self, size_t index) {
         self->members->items[index], &displayio_group_type);
     if (layer != MP_OBJ_NULL) {
         displayio_group_t *group = layer;
+        group->in_group = false;
         rendered_last_frame = displayio_group_get_previous_area(group, &layer_area);
         displayio_group_update_transform(group, NULL);
     }

From da413094f8fa3fcc1043fe85796973a364d73e15 Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Sun, 11 Dec 2022 13:01:00 +0100
Subject: [PATCH 1553/2403] Added LDO control pin and initial setup

---
 ports/nrf/boards/challenger_840/board.c | 7 +++++++
 ports/nrf/boards/challenger_840/pins.c  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nrf/boards/challenger_840/board.c
index fb1ce4fb83..677b6eac8b 100644
--- a/ports/nrf/boards/challenger_840/board.c
+++ b/ports/nrf/boards/challenger_840/board.c
@@ -25,5 +25,12 @@
  */
 
 #include "supervisor/board.h"
+#include "nrf_gpio.h"
+
+#define PORTPIN(x, y)     (x * 32 + y)
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
+void board_init(void) {
+  nrf_gpio_cfg_output(PORTPIN(1, 9));
+  nrf_gpio_pin_write(PORTPIN(1, 9), 1);
+}
diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nrf/boards/challenger_840/pins.c
index 26d780fffe..e059c17a15 100644
--- a/ports/nrf/boards/challenger_840/pins.c
+++ b/ports/nrf/boards/challenger_840/pins.c
@@ -32,6 +32,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P0_06) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P1_08) },
+    { MP_ROM_QSTR(MP_QSTR_LDO_CONTROL), MP_ROM_PTR(&pin_P1_09) },
 
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_12) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_11) },

From fa14307c7d7bc297d550191c199ac621cc7b08a7 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 11 Dec 2022 20:19:43 +0530
Subject: [PATCH 1554/2403] update `tj-actions/changed-files` to `v34.5.3`

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c584f5f427..9bae2e9983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'
-      uses: tj-actions/changed-files@v34
+      uses: tj-actions/changed-files@v34.5.3
       with:
         json: true
         sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}

From 628865b2357bd1c344757a55ffbed763dc506121 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 11 Dec 2022 20:32:12 +0530
Subject: [PATCH 1555/2403] change fetch-depth setting in ci

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9bae2e9983..856072b50a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: false
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:

From f7e735b492c4bf270ba8312a4459ac2cea4b17a4 Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Sun, 11 Dec 2022 17:11:24 +0100
Subject: [PATCH 1556/2403] Added LDO control pin, new flash variants and
 support functions for the LDO control pin.

---
 ports/nrf/boards/challenger_840/board.c           | 11 -----------
 ports/nrf/boards/challenger_840/challenger_840.py | 14 ++++++++++++++
 ports/nrf/boards/challenger_840/mpconfigboard.mk  |  6 +++++-
 3 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 ports/nrf/boards/challenger_840/challenger_840.py

diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nrf/boards/challenger_840/board.c
index 677b6eac8b..14a52fc4de 100644
--- a/ports/nrf/boards/challenger_840/board.c
+++ b/ports/nrf/boards/challenger_840/board.c
@@ -23,14 +23,3 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-
-#include "supervisor/board.h"
-#include "nrf_gpio.h"
-
-#define PORTPIN(x, y)     (x * 32 + y)
-
-// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
-void board_init(void) {
-  nrf_gpio_cfg_output(PORTPIN(1, 9));
-  nrf_gpio_pin_write(PORTPIN(1, 9), 1);
-}
diff --git a/ports/nrf/boards/challenger_840/challenger_840.py b/ports/nrf/boards/challenger_840/challenger_840.py
new file mode 100644
index 0000000000..b40ae22b41
--- /dev/null
+++ b/ports/nrf/boards/challenger_840/challenger_840.py
@@ -0,0 +1,14 @@
+import board
+import digitalio
+
+_LDO_PIN = digitalio.DigitalInOut(board.LDO_CONTROL)
+_LDO_PIN.direction = digitalio.Direction.OUTPUT
+_LDO_PIN.value = True
+
+def ldo_on():
+    global _LDO_PIN
+    _LDO_PIN.value = True
+
+def ldo_off():
+    global _LDO_PIN
+    _LDO_PIN.value = False
diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nrf/boards/challenger_840/mpconfigboard.mk
index ddb55ce705..03cbc20b21 100644
--- a/ports/nrf/boards/challenger_840/mpconfigboard.mk
+++ b/ports/nrf/boards/challenger_840/mpconfigboard.mk
@@ -6,4 +6,8 @@ USB_MANUFACTURER = "Invector Labs AB"
 MCU_CHIP = nrf52840
 
 SPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV,W25Q64FV"
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV,W25Q32JVxQ,W25Q64FV,W25Q64JVxQ"
+
+FROZEN_MPY_DIRS += $(TOP)/ports/nrf/boards/challenger_840
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

From 66eca9c35e9da27232c67b9504b0bec6b6828dd0 Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Sun, 11 Dec 2022 17:25:26 +0100
Subject: [PATCH 1557/2403] Updated formatting.

---
 ports/nrf/boards/challenger_840/challenger_840.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/nrf/boards/challenger_840/challenger_840.py b/ports/nrf/boards/challenger_840/challenger_840.py
index b40ae22b41..bf3ae77170 100644
--- a/ports/nrf/boards/challenger_840/challenger_840.py
+++ b/ports/nrf/boards/challenger_840/challenger_840.py
@@ -5,10 +5,12 @@ _LDO_PIN = digitalio.DigitalInOut(board.LDO_CONTROL)
 _LDO_PIN.direction = digitalio.Direction.OUTPUT
 _LDO_PIN.value = True
 
+
 def ldo_on():
     global _LDO_PIN
     _LDO_PIN.value = True
 
+
 def ldo_off():
     global _LDO_PIN
     _LDO_PIN.value = False

From 53e141648432babaa743807dfb8e5a0b3be7f55c Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 12 Dec 2022 01:42:37 +0530
Subject: [PATCH 1558/2403] downgrade and lock `tj-actions/changed-files` at
 `v34.5.1`

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 856072b50a..f8768b5196 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'
-      uses: tj-actions/changed-files@v34.5.3
+      uses: tj-actions/changed-files@v34.5.1
       with:
         json: true
         sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}

From b01bf1e16cc0d731df9d1bf576022c86c96e7290 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 12 Dec 2022 02:10:01 +0530
Subject: [PATCH 1559/2403] revert fetch-depth setting in ci

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f8768b5196..114fd679a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: false
-        fetch-depth: 0
+        fetch-depth: 1
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:

From 6426ddb73bd6d3a4760a45b44f7eb9fa7a17badb Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 08:22:54 -0600
Subject: [PATCH 1560/2403] Rename test and add some additional cases

While working on adding 0o and 0b literals (which aren't added yet and
may not be) I realized that my approach would likely cause a problem
for the value "0"
---
 tests/circuitpython/{getenv_test.py => getenv.py}         | 7 ++++---
 tests/circuitpython/{getenv_test.py.exp => getenv.py.exp} | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename tests/circuitpython/{getenv_test.py => getenv.py} (97%)
 rename tests/circuitpython/{getenv_test.py.exp => getenv.py.exp} (97%)

diff --git a/tests/circuitpython/getenv_test.py b/tests/circuitpython/getenv.py
similarity index 97%
rename from tests/circuitpython/getenv_test.py
rename to tests/circuitpython/getenv.py
index 2f80e465e3..ad8fdbfeeb 100644
--- a/tests/circuitpython/getenv_test.py
+++ b/tests/circuitpython/getenv.py
@@ -39,8 +39,6 @@ content_good = """
 # comment
 key0 = "hello world"
 key1 = 7
- cstring = "hello comment" # comment
-  cnumber = 0x7f # comment
 key2= "\n"
 key3 ="\u00c1x"
 key4 = "\U000000c1x"
@@ -48,6 +46,9 @@ key5 = "\f\"\\"
 key6 = "\t\r\b"
 key7 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 key8 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ key9 = "hello comment" # comment
+  key10 = 0x7f # comment
+key11 = 0
 [section]
 subvalue = "hi"
 """
@@ -71,7 +72,7 @@ def run_test(key, content):
         print(key, str(e))
 
 
-for i in range(9):
+for i in range(13):
     run_test(f"key{i}", content_good)
 
 for content in content_bad:
diff --git a/tests/circuitpython/getenv_test.py.exp b/tests/circuitpython/getenv.py.exp
similarity index 97%
rename from tests/circuitpython/getenv_test.py.exp
rename to tests/circuitpython/getenv.py.exp
index b09c376d19..f83143c80b 100644
--- a/tests/circuitpython/getenv_test.py.exp
+++ b/tests/circuitpython/getenv.py.exp
@@ -7,6 +7,10 @@ key5 Invalid byte '\\'
 key6 '\t\r\x08'
 key7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 key8 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+key9 'hello comment'
+key10 127
+key11 0
+key12 None
 key Invalid byte '\n'
 key Invalid byte '"'
 key invalid syntax for integer with base 10: ''

From 1b15985783708fed54f83a60a33b04ee8705ea45 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 09:15:35 -0600
Subject: [PATCH 1561/2403] Fix web workflow builds

---
 supervisor/shared/web_workflow/web_workflow.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 5bac8522dd..58a68f0ec9 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -256,8 +256,8 @@ void supervisor_start_web_workflow(void) {
         return;
     }
 
-    result = common_hal_os_environ_get_key_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
-    if (result != ENVIRON_OK) {
+    result = common_hal_os_getenv_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
+    if (result != GETENV_OK) {
         return;
     }
 
@@ -283,7 +283,7 @@ void supervisor_start_web_workflow(void) {
 
     mp_int_t new_port = web_api_port;
     // (leaves new_port unchanged on any failure)
-    (void)common_hal_os_environ_get_key_int("CIRCUITPY_WEB_API_PORT", &new_port);
+    (void)common_hal_os_getenv_int("CIRCUITPY_WEB_API_PORT", &new_port);
 
     bool first_start = pool.base.type != &socketpool_socketpool_type;
     bool port_changed = new_port != web_api_port;
@@ -320,8 +320,8 @@ void supervisor_start_web_workflow(void) {
 
 
     const size_t api_password_len = sizeof(_api_password) - 1;
-    result = common_hal_os_environ_get_key_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
-    if (result == ENVIRON_OK) {
+    result = common_hal_os_getenv_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
+    if (result == GETENV_OK) {
         _api_password[0] = ':';
         _base64_in_place(_api_password, strlen(_api_password), sizeof(_api_password) - 1);
     }

From 3620d14542ceafe293c449ca633865c2420260c4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 17:04:03 -0600
Subject: [PATCH 1562/2403] Pass string length when enabling radio

---
 supervisor/shared/web_workflow/web_workflow.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 58a68f0ec9..87da0bd2a6 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -248,8 +248,6 @@ void supervisor_start_web_workflow(void) {
 
     char ssid[33];
     char password[64];
-    size_t ssid_len = 0;
-    size_t password_len = 0;
 
     os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != GETENV_OK) {
@@ -273,7 +271,7 @@ void supervisor_start_web_workflow(void) {
     // network. If we are connected to a different network, then it will disconnect before
     // attempting to connect to the given network.
     _wifi_status = common_hal_wifi_radio_connect(
-        &common_hal_wifi_radio_obj, (uint8_t *)ssid, ssid_len, (uint8_t *)password, password_len,
+        &common_hal_wifi_radio_obj, (uint8_t *)ssid, strlen(ssid), (uint8_t *)password, strlen(password),
         0, 8, NULL, 0);
 
     if (_wifi_status != WIFI_RADIO_ERROR_NONE) {

From 808161eaaba61860e959515dc55696a780fb329d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 19:09:57 -0600
Subject: [PATCH 1563/2403] fix missing sentinel in call

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

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 87da0bd2a6..35d5c46a94 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -351,7 +351,7 @@ static void _send_str(socketpool_socket_obj_t *socket, const char *str) {
 }
 
 // The last argument must be NULL! Otherwise, it won't stop.
-static void _send_strs(socketpool_socket_obj_t *socket, ...) {
+static __attribute__((sentinel)) void _send_strs(socketpool_socket_obj_t *socket, ...) {
     va_list ap;
     va_start(ap, socket);
 
@@ -691,7 +691,7 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
     } else if (_endswith(filename, ".json")) {
         _send_strs(socket, "Content-Type:", "application/json", ";charset=UTF-8\r\n", NULL);
     } else {
-        _send_strs(socket, "Content-Type:", "application/octet-stream\r\n");
+        _send_strs(socket, "Content-Type:", "application/octet-stream\r\n", NULL);
     }
     _cors_header(socket, request);
     _send_str(socket, "\r\n");

From 90894014a2e146e07c2ea4f9f840242fc33bf6a0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 19:43:10 -0600
Subject: [PATCH 1564/2403] Use the HW LED as status indicator

For me this made a rare startup failure stop, which is nonsense.
---
 ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
index e5d8660b2b..a31ee7327c 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.h
@@ -4,5 +4,7 @@
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
 
+#define MICROPY_HW_LED_STATUS   (&pin_CYW0)
+
 #define CIRCUITPY_BOARD_I2C         (1)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}}

From adff93c61a4ed49cd81893270f269232452b7516 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 12 Dec 2022 20:14:08 -0600
Subject: [PATCH 1565/2403] Mark cyw43 pins "never reset" before reset_port

reset_port calls reset_all_pins, which disables the built-in pull
down. In theory, this could allow some CYW43 interfacing pin to float
to an inappropriate value. There's no proof of this! but the move can't
really hurt, either
---
 ports/raspberrypi/supervisor/port.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 05d53fcc8d..27012f2298 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -127,6 +127,13 @@ safe_mode_t port_init(void) {
         (&_ld_dtcm_bss_start)[i] = 0;
     }
 
+    #if CIRCUITPY_CYW43
+    never_reset_pin_number(23);
+    never_reset_pin_number(24);
+    never_reset_pin_number(25);
+    never_reset_pin_number(29);
+    #endif
+
     // Reset everything into a known state before board_init.
     reset_port();
 
@@ -140,10 +147,6 @@ safe_mode_t port_init(void) {
     // Check brownout.
 
     #if CIRCUITPY_CYW43
-    never_reset_pin_number(23);
-    never_reset_pin_number(24);
-    never_reset_pin_number(25);
-    never_reset_pin_number(29);
     // A small number of samples of pico w need an additional delay before
     // initializing the cyw43 chip. Delays inside cyw43_arch_init_with_country
     // are intended to meet the power on timing requirements, but apparently

From aa5b1e063fd3977b9c43e21b5ec4703e79940210 Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Tue, 13 Dec 2022 13:34:28 +0100
Subject: [PATCH 1566/2403] Added new RP2040 board with integrated SD/Card
 reader and RTC

---
 .../boards/challenger_rp2040_sdrtc/board.c    | 29 +++++++
 .../challenger_rp2040_sdrtc/mpconfigboard.h   | 10 +++
 .../challenger_rp2040_sdrtc/mpconfigboard.mk  | 13 ++++
 .../pico-sdk-configboard.h                    |  1 +
 .../boards/challenger_rp2040_sdrtc/pins.c     | 76 +++++++++++++++++++
 5 files changed, 129 insertions(+)
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_sdrtc/board.c
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_sdrtc/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c

diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/board.c b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/board.c
new file mode 100644
index 0000000000..b66ea0e27f
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Pontus Oldberg, Invector Labs
+ *
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.h b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.h
new file mode 100644
index 0000000000..b8f08b9956
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Challenger RP2040 SD/RTC"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_UART_BUS_TX   (&pin_GPIO16)
+#define DEFAULT_UART_BUS_RX   (&pin_GPIO17)
+#define DEFAULT_I2C_BUS_SDA   (&pin_GPIO0)
+#define DEFAULT_I2C_BUS_SCL   (&pin_GPIO1)
+#define DEFAULT_SPI_BUS_SCK   (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO  (&pin_GPIO20)
diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.mk
new file mode 100644
index 0000000000..022dbd143c
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/mpconfigboard.mk
@@ -0,0 +1,13 @@
+USB_VID = 0x2e8a
+USB_PID = 0x102d
+USB_PRODUCT = "Challenger RP2040 SD/RTC"
+USB_MANUFACTURER = "Invector Labs"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
+
+CIRCUITPY__EVE = 1
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pico-sdk-configboard.h b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c
new file mode 100644
index 0000000000..7f4f620b59
--- /dev/null
+++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c
@@ -0,0 +1,76 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+
+    // RFM95W connections
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SDO), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SDI), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CARD_DETECT), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From d49af4d7848b432998d1d7e28995c7224643390e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 08:11:47 -0600
Subject: [PATCH 1567/2403] make wording a bit clearer

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index f45dc07357..041d02e5cd 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -422,7 +422,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine
 //|     ) -> None:
 //|         """Write data to the TX fifo in the background, with optional looping.
 //|
-//|         First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have.
+//|         First, if any previous ``once`` or ``loop`` buffer has not been started, this function blocks until they have been started.
 //|         This means that any ``once`` or ``loop`` buffer will be written at least once.
 //|         Then the ``once`` and/or ``loop`` buffers are queued. and the function returns.
 //|         The ``once`` buffer (if specified) will be written just once.

From 56d4f8f55265a104ed22a9905e24b1ac8ecca94b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 11:32:33 -0600
Subject: [PATCH 1568/2403] can't use object-based calls at this time

---
 ports/nrf/common-hal/_bleio/Adapter.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 8948be1a5d..2c0c343877 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -54,6 +54,7 @@
 
 #if CIRCUITPY_OS_GETENV
 #include "shared-bindings/os/__init__.h"
+#include "shared-module/os/__init__.h"
 #endif
 
 #define BLE_MIN_CONN_INTERVAL        MSEC_TO_UNITS(15, UNIT_0_625_MS)
@@ -343,19 +344,17 @@ STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
     default_ble_name[len - 1] = nibble_to_hex_lower[addr.addr[0] & 0xf];
     default_ble_name[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
 
-    mp_int_t name_len = 0;
-
     #if CIRCUITPY_OS_GETENV
-    mp_obj_t ble_name = common_hal_os_getenv("CIRCUITPY_BLE_NAME", mp_const_none);
-    if (ble_name != mp_const_none) {
-        common_hal_bleio_adapter_set_name(self, mp_obj_str_get_str(ble_name));
+    char ble_name[32];
+
+    os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
+    if (result == GETENV_OK) {
+        common_hal_bleio_adapter_set_name(self, ble_name);
         return;
     }
     #endif
 
-    if (name_len <= 0) {
-        common_hal_bleio_adapter_set_name(self, (char *)default_ble_name);
-    }
+    common_hal_bleio_adapter_set_name(self, (char *)default_ble_name);
 }
 
 static void bluetooth_adapter_background(void *data) {

From 35f2046ab2703b9d23eb230bc9cddbe5d40eeaad Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 12:02:07 -0600
Subject: [PATCH 1569/2403] Fix returning GETENV_ERR_LENGTH for over-long
 strings

---
 shared-module/os/getenv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 0112a8a5cd..47b479f17c 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -86,6 +86,8 @@ STATIC void seek_eof(file_arg *active_file) {
 STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) {
     if (!vstr->fixed_buf || vstr->alloc > vstr->len) {
         vstr_add_byte(vstr, b);
+    } else {
+        vstr->len++;
     }
 }
 
@@ -97,6 +99,8 @@ STATIC void vstr_add_char_nonstd(vstr_t *vstr, unichar c) {
         (c < 0x10000) ? 3 : 4;
     if (!vstr->fixed_buf || vstr->alloc > vstr->len + ulen) {
         vstr_add_char(vstr, c);
+    } else {
+        vstr->len += ulen;
     }
 }
 
@@ -297,7 +301,7 @@ STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, si
     if (result == GETENV_OK) {
         vstr_add_byte_nonstd(&buf, 0);
         memcpy(value, buf.buf, MIN(buf.len, value_len));
-        if (buf.len > value_len) {
+        if (buf.len > value_len) { // this length includes trailing NUL
             result = GETENV_ERR_LENGTH;
         }
     }

From 5ac622a30d22bac54e8c9652d34d1ef113eb9a4e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 13:13:01 -0600
Subject: [PATCH 1570/2403] get rid of nearly-empty getenv.c file

---
 py/circuitpy_defns.mk       | 2 +-
 shared-bindings/os/getenv.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 shared-bindings/os/getenv.c

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 2deefda030..22ea67d05e 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -614,7 +614,6 @@ SRC_SHARED_MODULE_ALL = \
 	onewireio/__init__.c \
 	onewireio/OneWire.c \
 	os/__init__.c \
-	os/getenv.c \
 	paralleldisplay/ParallelBus.c \
 	qrio/__init__.c \
 	qrio/QRDecoder.c \
@@ -715,6 +714,7 @@ endif
 SRC_SHARED_MODULE_INTERNAL = \
 $(filter $(SRC_PATTERNS), \
 	displayio/display_core.c \
+	os/getenv.c \
 	usb/utf16le.c \
 )
 
diff --git a/shared-bindings/os/getenv.c b/shared-bindings/os/getenv.c
deleted file mode 100644
index fdb5f0bb50..0000000000
--- a/shared-bindings/os/getenv.c
+++ /dev/null
@@ -1 +0,0 @@
-// this file needs to exist but does not have any content

From d40ba94449b461035d032a69e5578826e6a9f5a6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 13:19:10 -0600
Subject: [PATCH 1571/2403] explain why this is its own file

---
 shared-module/os/getenv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 47b479f17c..d96b1fb306 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+// These functions are separate from __init__.c so that os.getenv() can be
+// tested in the unix "coverage" build, without bringing in "our" os module
+
 #include 
 #include 
 

From 41beca14af513ed073f204b5ca1306999bc3e583 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 13 Dec 2022 16:00:24 -0600
Subject: [PATCH 1572/2403] only import a module if we use something from it

This prevents a bogus line such as `from types import ` from being
generated.

surprisingly this was not detected as a problem until a change
in isort! Formerly it would remove the bad line, but now it (correctly!)
errors
---
 tools/extract_pyi.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/extract_pyi.py b/tools/extract_pyi.py
index 7b87404fbc..5f4f9c9561 100644
--- a/tools/extract_pyi.py
+++ b/tools/extract_pyi.py
@@ -228,7 +228,8 @@ def convert_folder(top_level, stub_directory):
     imports, type_imports = extract_imports(tree)
     import_lines = ["from __future__ import annotations"]
     for type_module, used_types in type_imports.items():
-        import_lines.append(f"from {type_module} import {', '.join(sorted(used_types))}")
+        if used_types:
+            import_lines.append(f"from {type_module} import {', '.join(sorted(used_types))}")
     import_lines.extend(f"import {m}" for m in sorted(imports))
     import_body = "\n".join(import_lines)
     m = re.match(r'(\s*""".*?""")', stub_contents, flags=re.DOTALL)

From 369507e1da49ab82f07ebdcc089783481552c3b2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 13 Dec 2022 18:39:25 -0500
Subject: [PATCH 1573/2403] cxd56 was not using SRC_SHARED_MODULE_INTERNAL

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

diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile
index 5d06143f73..f90b6dd460 100644
--- a/ports/cxd56/Makefile
+++ b/ports/cxd56/Makefile
@@ -134,7 +134,8 @@ SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix common-hal/, $(SRC_COMMON_HAL))
 
 SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
-                             $(addprefix shared-module/, $(SRC_SHARED_MODULE))
+                             $(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
+                             $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
 
 SRC_S = supervisor/cpu.s
 

From fa4b8093377da3ccdbb4594180336252381836d6 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 14 Dec 2022 01:56:45 +0100
Subject: [PATCH 1574/2403] 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             | 26 +++++++++++++++++++++++---
 locale/cs.po             | 26 +++++++++++++++++++++++---
 locale/de_DE.po          | 26 +++++++++++++++++++++++---
 locale/el.po             | 26 +++++++++++++++++++++++---
 locale/en_GB.po          | 26 +++++++++++++++++++++++---
 locale/es.po             | 26 +++++++++++++++++++++++---
 locale/fil.po            | 26 +++++++++++++++++++++++---
 locale/fr.po             | 26 +++++++++++++++++++++++---
 locale/hi.po             | 26 +++++++++++++++++++++++---
 locale/it_IT.po          | 26 +++++++++++++++++++++++---
 locale/ja.po             | 26 +++++++++++++++++++++++---
 locale/ko.po             | 26 +++++++++++++++++++++++---
 locale/nl.po             | 26 +++++++++++++++++++++++---
 locale/pl.po             | 26 +++++++++++++++++++++++---
 locale/pt_BR.po          | 26 +++++++++++++++++++++++---
 locale/ru.po             | 26 +++++++++++++++++++++++---
 locale/sv.po             | 26 +++++++++++++++++++++++---
 locale/tr.po             | 26 +++++++++++++++++++++++---
 locale/zh_Latn_pinyin.po | 26 +++++++++++++++++++++++---
 19 files changed, 437 insertions(+), 57 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index eb8effacb8..6551a3253f 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1015,6 +1015,10 @@ msgstr ""
 msgid "File exists"
 msgstr "File sudah ada"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1071,6 +1075,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Grup sudah digunakan"
 
@@ -1199,6 +1205,7 @@ msgid "Internal define error"
 msgstr "Kesalahan definisi internal"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1245,6 +1252,11 @@ msgstr "Argumen tidak valid"
 msgid "Invalid bits per value"
 msgstr "Bit per nilai tidak valid"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1275,10 +1287,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Panjang kunci harus 16, 24, atau 32 byte"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2291,7 +2311,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Jumlah item pada RHS  tidak cocok (diharapkan %d, didapatkan %d)."
@@ -3174,7 +3194,7 @@ msgstr "lapisan (padding) tidak benar"
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3553,7 +3573,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 67307d5715..7e550d8140 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1013,6 +1013,10 @@ msgstr "Fatální chyba."
 msgid "File exists"
 msgstr "soubor existuje"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1071,6 +1075,8 @@ msgstr "Základní chyba"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Skupina již byla použita"
 
@@ -1199,6 +1205,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Interní chyba"
 
@@ -1245,6 +1252,11 @@ msgstr "Neplatný argument"
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1275,10 +1287,18 @@ msgstr "Chybný soket pro TLS"
 msgid "Invalid state"
 msgstr "Chybný stav"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Klíč musí být dlouhý 16, 24 nebo 32 bajtů"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "Mapování LED musí korespondovat s velikostí displeje"
@@ -2280,7 +2300,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3161,7 +3181,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3540,7 +3560,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index cc1c20f2c0..f587d384a1 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1022,6 +1022,10 @@ msgstr "Fataler Fehler."
 msgid "File exists"
 msgstr "Datei existiert"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1082,6 +1086,8 @@ msgstr "Generischer Fehler"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Gruppe schon benutzt"
 
@@ -1214,6 +1220,7 @@ msgid "Internal define error"
 msgstr "Interner Definitionsfehler"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -1260,6 +1267,11 @@ msgstr "Ungültiges Argument"
 msgid "Invalid bits per value"
 msgstr "Ungültige Bits pro Wert"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1290,10 +1302,18 @@ msgstr "Ungültiges Socket für TLS"
 msgid "Invalid state"
 msgstr "Ungültiger Zustand"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Der Schlüssel muss 16, 24 oder 32 Byte lang sein"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "LED-Zuordnungen müssen der Display-Größe entsprechen"
@@ -2319,7 +2339,7 @@ msgid "Unkown error code %d"
 msgstr "Unbekannter Fehlercode %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3232,7 +3252,7 @@ msgstr "padding ist inkorrekt"
 msgid "index is out of bounds"
 msgstr "Index ist außerhalb der Grenzen"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3617,7 +3637,7 @@ msgstr "negative Potenz ohne Gleitkomma (float) Unterstützung"
 msgid "negative shift count"
 msgstr "Negative shift Anzahl"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/el.po b/locale/el.po
index b187a003c1..7b4e3f2001 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1027,6 +1027,10 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1083,6 +1087,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1209,6 +1215,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1255,6 +1262,11 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1285,10 +1297,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2289,7 +2309,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3170,7 +3190,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3549,7 +3569,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 07c9e578c8..8c97dbb7e2 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1016,6 +1016,10 @@ msgstr "Fatal error."
 msgid "File exists"
 msgstr "File exists"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1072,6 +1076,8 @@ msgstr "Generic Failure"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Group already used"
 
@@ -1200,6 +1206,7 @@ msgid "Internal define error"
 msgstr "Internal define error"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1246,6 +1253,11 @@ msgstr "Invalid argument"
 msgid "Invalid bits per value"
 msgstr "Invalid bits per value"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1276,10 +1288,18 @@ msgstr "Invalid socket for TLS"
 msgid "Invalid state"
 msgstr "Invalid state"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Key must be 16, 24, or 32 bytes long"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2293,7 +2313,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Unmatched number of items on RHS (expected %d, got %d)."
@@ -3180,7 +3200,7 @@ msgstr "incorrect padding"
 msgid "index is out of bounds"
 msgstr "index is out of bounds"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3559,7 +3579,7 @@ msgstr "negative power with no float support"
 msgid "negative shift count"
 msgstr "negative shift count"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/es.po b/locale/es.po
index f160e99a86..01f73ffd86 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1026,6 +1026,10 @@ msgstr "Error grave."
 msgid "File exists"
 msgstr "El archivo ya existe"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1083,6 +1087,8 @@ msgstr "Fallo Genérico"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Grupo ya está siendo utilizado"
 
@@ -1218,6 +1224,7 @@ msgid "Internal define error"
 msgstr "Error interno de definición"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1264,6 +1271,11 @@ msgstr "Argumento inválido"
 msgid "Invalid bits per value"
 msgstr "Inválido bits por valor"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1294,10 +1306,18 @@ msgstr "socket invalido para TLS"
 msgid "Invalid state"
 msgstr "Estado invalido"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "La llave debe tener 16, 24 o 32 bytes de longitud"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2325,7 +2345,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Número incomparable de elementos en RHS (%d esperado,%d obtenido)."
@@ -3220,7 +3240,7 @@ msgstr "relleno (padding) incorrecto"
 msgid "index is out of bounds"
 msgstr "el índice está fuera de límites"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3603,7 +3623,7 @@ msgstr "potencia negativa sin float support"
 msgid "negative shift count"
 msgstr "cuenta de corrimientos negativo"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/fil.po b/locale/fil.po
index 988c921bfb..a4255383bd 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1012,6 +1012,10 @@ msgstr ""
 msgid "File exists"
 msgstr "Mayroong file"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1068,6 +1072,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1196,6 +1202,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1242,6 +1249,11 @@ msgstr "Maling argumento"
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1272,10 +1284,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2280,7 +2300,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3174,7 +3194,7 @@ msgstr "mali ang padding"
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3557,7 +3577,7 @@ msgstr "negatibong power na walang float support"
 msgid "negative shift count"
 msgstr "negative shift count"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/fr.po b/locale/fr.po
index 605e4e8eaa..1b31a9dcce 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1037,6 +1037,10 @@ msgstr "Erreurre fatale."
 msgid "File exists"
 msgstr "Le fichier existe"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1099,6 +1103,8 @@ msgstr "Échec génerique"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Groupe déjà utilisé"
 
@@ -1237,6 +1243,7 @@ msgid "Internal define error"
 msgstr "Erreur de définition interne"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -1284,6 +1291,11 @@ msgstr "Paramètre invalide"
 msgid "Invalid bits per value"
 msgstr "Bits par valeur invalides"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1314,10 +1326,18 @@ msgstr "Socket non valide pour TLS"
 msgid "Invalid state"
 msgstr "État invalide"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "La clé doit comporter 16, 24 ou 32 octets"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "La disposition des LED doit correspondre à la taille de l'écran"
@@ -2350,7 +2370,7 @@ msgid "Unkown error code %d"
 msgstr "Erreur inconnue %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3260,7 +3280,7 @@ msgstr "espacement incorrect"
 msgid "index is out of bounds"
 msgstr "l'index est hors limites"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3646,7 +3666,7 @@ msgstr "puissance négative sans support des nombres à virgule flottante"
 msgid "negative shift count"
 msgstr "compte de décalage négatif"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/hi.po b/locale/hi.po
index bd4f497f7b..3b7e9f26d4 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1002,6 +1002,10 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1058,6 +1062,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1184,6 +1190,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1230,6 +1237,11 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1260,10 +1272,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2262,7 +2282,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3143,7 +3163,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3522,7 +3542,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 8a0d5cc526..d21b120e58 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1017,6 +1017,10 @@ msgstr ""
 msgid "File exists"
 msgstr "File esistente"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1073,6 +1077,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1201,6 +1207,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1247,6 +1254,11 @@ msgstr "Argomento non valido"
 msgid "Invalid bits per value"
 msgstr "bits per valore invalido"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1277,10 +1289,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2290,7 +2310,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3182,7 +3202,7 @@ msgstr "padding incorretto"
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3566,7 +3586,7 @@ msgstr "potenza negativa senza supporto per float"
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/ja.po b/locale/ja.po
index 56e1272396..124bb762af 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1011,6 +1011,10 @@ msgstr ""
 msgid "File exists"
 msgstr "ファイルが存在します"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1067,6 +1071,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "グループはすでに使われています"
 
@@ -1195,6 +1201,7 @@ msgid "Internal define error"
 msgstr "内部定義エラー"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1241,6 +1248,11 @@ msgstr "不正な引数"
 msgid "Invalid bits per value"
 msgstr "不正なbits per value"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1271,10 +1283,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Keyの長さは、16, 24, 32バイトのいずれかでなければなりません"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2276,7 +2296,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "右辺の要素数が一致しません (expected %d, got %d)"
@@ -3161,7 +3181,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3541,7 +3561,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr "シフトカウントが負数"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 0e6aa1ed34..fda78fbd95 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1005,6 +1005,10 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1061,6 +1065,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr ""
 
@@ -1187,6 +1193,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1233,6 +1240,11 @@ msgstr ""
 msgid "Invalid bits per value"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1263,10 +1275,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2266,7 +2286,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3147,7 +3167,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3526,7 +3546,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 4759dce824..2bdb6e8a4c 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1010,6 +1010,10 @@ msgstr ""
 msgid "File exists"
 msgstr "Bestand bestaat"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1067,6 +1071,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Groep al gebruikt"
 
@@ -1195,6 +1201,7 @@ msgid "Internal define error"
 msgstr "Interne define fout"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1241,6 +1248,11 @@ msgstr "Ongeldig argument"
 msgid "Invalid bits per value"
 msgstr "Ongeldige bits per waarde"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1271,10 +1283,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr ""
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Sleutel moet 16, 24, of 32 bytes lang zijn"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2286,7 +2306,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Niet overeenkomend aantal RHS items (verwachtte %d, kreeg %d)."
@@ -3177,7 +3197,7 @@ msgstr "vulling (padding) is onjuist"
 msgid "index is out of bounds"
 msgstr "index is buiten bereik"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3559,7 +3579,7 @@ msgstr "negatieve macht terwijl er geen ondersteuning is voor float"
 msgid "negative shift count"
 msgstr "negatieve verschuivingstelling (shift count)"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/pl.po b/locale/pl.po
index 27ab7e4062..b399da6db1 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1011,6 +1011,10 @@ msgstr ""
 msgid "File exists"
 msgstr "Plik istnieje"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1067,6 +1071,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Grupa już używana"
 
@@ -1195,6 +1201,7 @@ msgid "Internal define error"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr ""
 
@@ -1241,6 +1248,11 @@ msgstr "Zły argument"
 msgid "Invalid bits per value"
 msgstr "Zła liczba bitów wartości"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1271,10 +1283,18 @@ msgstr ""
 msgid "Invalid state"
 msgstr "Nieprawidłowy stan"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Klucz musi mieć długość 16, 24 lub 32 bajtów"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2273,7 +2293,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Zła liczba obiektów po prawej stronie (oczekiwano %d, jest %d)."
@@ -3155,7 +3175,7 @@ msgstr "złe wypełnienie"
 msgid "index is out of bounds"
 msgstr "indeks jest poza zakresem"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3534,7 +3554,7 @@ msgstr "ujemna potęga, ale brak obsługi liczb zmiennoprzecinkowych"
 msgid "negative shift count"
 msgstr "ujemne przesunięcie"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 7ef7f2109f..02380d5e8e 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1029,6 +1029,10 @@ msgstr "Erro fatal."
 msgid "File exists"
 msgstr "Arquivo já existe"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1089,6 +1093,8 @@ msgstr "Falha Genérica"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "O grupo já está em uso"
 
@@ -1223,6 +1229,7 @@ msgid "Internal define error"
 msgstr "Erro interno de definição"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -1269,6 +1276,11 @@ msgstr "Argumento inválido"
 msgid "Invalid bits per value"
 msgstr "Os valores por bits são inválidos"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1299,10 +1311,18 @@ msgstr "Soquete inválido para o TLS"
 msgid "Invalid state"
 msgstr "Estado inválido"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "A chave deve ter 16, 24 ou 32 bytes de comprimento"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "Os mapeamentos do led devem corresponder ao tamanho do display"
@@ -2332,7 +2352,7 @@ msgid "Unkown error code %d"
 msgstr "Código de erro desconhecido %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Quantidade inigualável de itens no RHS (%d esperado, obteve %d)."
@@ -3237,7 +3257,7 @@ msgstr "preenchimento incorreto"
 msgid "index is out of bounds"
 msgstr "o índice está fora dos limites"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr "o índice deve ser tupla ou int"
 
@@ -3622,7 +3642,7 @@ msgstr "potência negativa sem suporte de flutuação"
 msgid "negative shift count"
 msgstr "contagem de turnos negativos"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr "o índice aninhado deve ser int"
 
diff --git a/locale/ru.po b/locale/ru.po
index 1845bcb929..014adb5f94 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1034,6 +1034,10 @@ msgstr "Фатальная ошибка."
 msgid "File exists"
 msgstr "Файл существует"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1098,6 +1102,8 @@ msgstr "Общий сбой"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Группа уже используется"
 
@@ -1231,6 +1237,7 @@ msgid "Internal define error"
 msgstr "Внутренняя ошибка определения"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -1278,6 +1285,11 @@ msgstr "Недопустимый аргумент"
 msgid "Invalid bits per value"
 msgstr "Недопустимое бит-на-значение"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1308,10 +1320,18 @@ msgstr "Неверный сокет для TLS"
 msgid "Invalid state"
 msgstr "Неверное состояние"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Ключ должен быть длинной 16, 24 или 32 байта"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr ""
@@ -2330,7 +2350,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3211,7 +3231,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3590,7 +3610,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index df1ab4a177..4b64cdb372 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1019,6 +1019,10 @@ msgstr "Fatalt fel."
 msgid "File exists"
 msgstr "Filen finns redan"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1077,6 +1081,8 @@ msgstr "Allmänt fel"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Grupp används redan"
 
@@ -1207,6 +1213,7 @@ msgid "Internal define error"
 msgstr "Internt define-fel"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -1253,6 +1260,11 @@ msgstr "Ogiltigt argument"
 msgid "Invalid bits per value"
 msgstr "Ogiltigt värde för bitar per värde"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1283,10 +1295,18 @@ msgstr "Ogiltig socket för TLS"
 msgid "Invalid state"
 msgstr "Ogiltigt tillstånd"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Nyckeln måste vara 16, 24 eller 32 byte lång"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "LED-mappning måste matcha displaystorlek"
@@ -2308,7 +2328,7 @@ msgid "Unkown error code %d"
 msgstr "Okänd felkod %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "Omatchat antal på RHS (förväntat %d, fick %d)."
@@ -3206,7 +3226,7 @@ msgstr "felaktig utfyllnad"
 msgid "index is out of bounds"
 msgstr "index är utanför gränserna"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr "index måste vara tuple eller int"
 
@@ -3588,7 +3608,7 @@ msgstr "negativ exponent utan stöd för flyttal"
 msgid "negative shift count"
 msgstr "negativt skiftantal"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr "nästlat index måste vara en int"
 
diff --git a/locale/tr.po b/locale/tr.po
index feb86500fe..b5685d0878 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -1018,6 +1018,10 @@ msgstr ""
 msgid "File exists"
 msgstr "Dosya var"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1078,6 +1082,8 @@ msgstr ""
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Grup zaten kullanılıyor"
 
@@ -1206,6 +1212,7 @@ msgid "Internal define error"
 msgstr "Dahili tanımlama hatası"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "Dahili hata"
 
@@ -1253,6 +1260,11 @@ msgstr "Geçersiz argüman"
 msgid "Invalid bits per value"
 msgstr "Geçersiz bit başına değer"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1283,10 +1295,18 @@ msgstr "TLS için geçersiz soket"
 msgid "Invalid state"
 msgstr "Geçersiz durum"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "Anahtar 16, 24 veya 32 bayt uzunluğunda olmalıdır"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "LED eşlemeleri ekran boyutuyla eşleşmelidir"
@@ -2288,7 +2308,7 @@ msgid "Unkown error code %d"
 msgstr ""
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""
@@ -3169,7 +3189,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3548,7 +3568,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index e641213935..89f1c00379 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1020,6 +1020,10 @@ msgstr "zhì mìng cuò wù."
 msgid "File exists"
 msgstr "Wénjiàn cúnzài"
 
+#: shared-module/os/getenv.c
+msgid "File not found"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1080,6 +1084,8 @@ msgstr "tōng yòng gù zhàng"
 #: shared-bindings/displayio/Display.c
 #: shared-bindings/displayio/EPaperDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
+#: shared-module/displayio/Display.c
+#: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Group already used"
 msgstr "Jítuán yǐjīng shǐyòngguò"
 
@@ -1213,6 +1219,7 @@ msgid "Internal define error"
 msgstr "Nèibù dìngyì cuòwù"
 
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+#: shared-module/os/getenv.c
 msgid "Internal error"
 msgstr "nèi bù cuò wù"
 
@@ -1259,6 +1266,11 @@ msgstr "Wúxiào de cānshù"
 msgid "Invalid bits per value"
 msgstr "Měi gè zhí de wèi wúxiào"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "Invalid byte %.*s"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
@@ -1289,10 +1301,18 @@ msgstr "TLS de chā zuò wú xiào"
 msgid "Invalid state"
 msgstr "wú xiào zhuàng tài"
 
+#: shared-module/os/getenv.c
+msgid "Invalid unicode escape"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
 msgstr "mì yào bì xū wéi 16, 24 huò 32 zì jié cháng"
 
+#: shared-module/os/getenv.c
+msgid "Key not found"
+msgstr ""
+
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
 msgstr "LED yìng shè bì xū yǔ xiǎn shì píng chǐ cùn pǐ pèi"
@@ -2313,7 +2333,7 @@ msgid "Unkown error code %d"
 msgstr "wèi zhī cuò wù dài %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
-#: shared-module/adafruit_pixelbuf/PixelMap.c
+#: shared-module/_pixelmap/PixelMap.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr "RHS (yùqí %d, huòdé %d) shàng wèi pǐpèi de xiàngmù."
@@ -3212,7 +3232,7 @@ msgstr "bù zhèngquè de tiánchōng"
 msgid "index is out of bounds"
 msgstr "suǒyǐn chāochū fànwéi"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
 msgstr ""
 
@@ -3592,7 +3612,7 @@ msgstr "méiyǒu fú diǎn zhīchí de xiāojí gōnglǜ"
 msgid "negative shift count"
 msgstr "fù zhuǎnyí jìshù"
 
-#: shared-bindings/adafruit_pixelbuf/PixelMap.c
+#: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
 msgstr ""
 

From 297657ea9aaf181980c8e6b05307e0ea26d05807 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 14 Dec 2022 14:45:32 -0600
Subject: [PATCH 1575/2403] Refactor so that all sites of name lookup failure
 result in gaierror

---
 .../espressif/common-hal/socketpool/Socket.c  |  4 +--
 .../common-hal/socketpool/Socket.c            | 16 ++--------
 .../common-hal/socketpool/SocketPool.c        | 21 +++++++++----
 .../common-hal/socketpool/SocketPool.h        |  2 +-
 shared-bindings/socketpool/SocketPool.c       | 30 ++++++++++++-------
 shared-bindings/socketpool/SocketPool.h       |  9 ++++++
 6 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index c65771fb0b..18237a4d4e 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -369,7 +369,7 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
     struct addrinfo *result_i;
     int error = lwip_getaddrinfo(host, NULL, &hints, &result_i);
     if (error != 0 || result_i == NULL) {
-        mp_raise_OSError(EHOSTUNREACH);
+        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
     }
 
     // Set parameters
@@ -550,7 +550,7 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
     struct addrinfo *result_i;
     int error = lwip_getaddrinfo(host, NULL, &hints, &result_i);
     if (error != 0 || result_i == NULL) {
-        mp_raise_OSError(EHOSTUNREACH);
+        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
     }
 
     // Set parameters
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index be3f2cd087..fe12f461fb 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -872,11 +872,7 @@ bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
     ip_addr_t bind_addr;
     const ip_addr_t *bind_addr_ptr = &bind_addr;
     if (hostlen > 0) {
-        int error = socketpool_resolve_host(socket->pool, host, &bind_addr);
-        if (error != 0) {
-            mp_raise_OSError(EHOSTUNREACH);
-        }
-
+        socketpool_resolve_host_raise(socket->pool, host, &bind_addr);
     } else {
         bind_addr_ptr = IP_ANY_TYPE;
     }
@@ -965,10 +961,7 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *socket,
 
     // get address
     ip_addr_t dest;
-    int error = socketpool_resolve_host(socket->pool, host, &dest);
-    if (error != 0) {
-        mp_raise_OSError(EHOSTUNREACH);
-    }
+    socketpool_resolve_host_raise(socket->pool, host, &dest);
 
     err_t err = ERR_ARG;
     switch (socket->type) {
@@ -1163,10 +1156,7 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *socket,
     const char *host, size_t hostlen, uint32_t port, const uint8_t *buf, uint32_t len) {
     int _errno;
     ip_addr_t ip;
-    int error = socketpool_resolve_host(socket->pool, host, &ip);
-    if (error != 0) {
-        mp_raise_OSError(EHOSTUNREACH);
-    }
+    socketpool_resolve_host_raise(socket->pool, host, &ip);
 
     mp_uint_t ret = 0;
     switch (socket->type) {
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
index d2f403c852..bdbc7f67c5 100644
--- a/ports/raspberrypi/common-hal/socketpool/SocketPool.c
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
@@ -57,7 +57,7 @@ STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void
     }
 }
 
-int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) {
+STATIC int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) {
 
     getaddrinfo_state_t state;
     state.status = 0;
@@ -94,17 +94,26 @@ int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host,
     return 0;
 }
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
-    const char *host) {
-
-    ip_addr_t addr;
-    int result = socketpool_resolve_host(self, host, &addr);
+void socketpool_resolve_host_raise(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) {
+    int result = socketpool_resolve_host(self, host, addr);
     if (result < 0) {
+        printf("socket_resolve_host() returned %d\n", result);
+        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
         mp_raise_OSError(-result);
     }
+}
+
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self, const char *host) {
+
+    ip_addr_t addr;
+    socketpool_resolve_host_raise(self, host, &addr);
 
     char ip_str[IP4ADDR_STRLEN_MAX];
     inet_ntoa_r(addr, ip_str, IP4ADDR_STRLEN_MAX);
     mp_obj_t ip_obj = mp_obj_new_str(ip_str, strlen(ip_str));
     return ip_obj;
 }
+
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
+    return common_hal_socketpool_socketpool_gethostbyname(self, host);
+}
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.h b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
index 3d498d9a49..a7ad36b92f 100644
--- a/ports/raspberrypi/common-hal/socketpool/SocketPool.h
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.h
@@ -32,4 +32,4 @@ typedef struct {
     mp_obj_base_t base;
 } socketpool_socketpool_obj_t;
 
-int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr);
+void socketpool_resolve_host_raise(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr);
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 4881a0597b..660aba63ed 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -36,8 +36,6 @@
 #include "shared-bindings/socketpool/Socket.h"
 #include "shared-bindings/socketpool/SocketPool.h"
 
-#define SOCKETPOOL_EAI_NONAME (-2)
-
 //| class SocketPool:
 //|     """A pool of socket resources available for the given radio. Only one
 //|     SocketPool can be created for each radio.
@@ -151,15 +149,7 @@ STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
     }
 
     if (ip_str == mp_const_none) {
-        ip_str = common_hal_socketpool_socketpool_gethostbyname(self, host);
-    }
-
-    if (ip_str == mp_const_none) {
-        mp_obj_t exc_args[2] = {
-            MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_EAI_NONAME),
-            MP_OBJ_NEW_QSTR(MP_QSTR_Name_space_or_space_service_space_not_space_known),
-        };
-        nlr_raise(mp_obj_new_exception_args(&mp_type_gaierror, 2, exc_args));
+        ip_str = common_hal_socketpool_socketpool_gethostbyname_raise(self, host);
     }
 
     mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
@@ -203,3 +193,21 @@ const mp_obj_type_t socketpool_socketpool_type = {
     .make_new = socketpool_socketpool_make_new,
     .locals_dict = (mp_obj_dict_t *)&socketpool_socketpool_locals_dict,
 };
+
+MP_WEAK
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
+    mp_obj_t ip_str = common_hal_socketpool_socketpool_gethostbyname(self, host);
+    if (ip_str == mp_const_none) {
+        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
+    }
+    return ip_str;
+}
+
+MP_WEAK NORETURN
+void common_hal_socketpool_socketpool_raise_gaierror(int value, qstr name) {
+    mp_obj_t exc_args[2] = {
+        MP_OBJ_NEW_SMALL_INT(value),
+        MP_OBJ_NEW_QSTR(name),
+    };
+    nlr_raise(mp_obj_new_exception_args(&mp_type_gaierror, 2, exc_args));
+}
diff --git a/shared-bindings/socketpool/SocketPool.h b/shared-bindings/socketpool/SocketPool.h
index 5a2d9f4337..cecbdd86f1 100644
--- a/shared-bindings/socketpool/SocketPool.h
+++ b/shared-bindings/socketpool/SocketPool.h
@@ -52,6 +52,10 @@ typedef enum {
     SOCKETPOOL_TCP_NODELAY = 1,
 } socketpool_socketpool_tcpopt_t;
 
+typedef enum {
+    SOCKETPOOL_EAI_NONAME  = -2,
+} socketpool_eai_t;
+
 void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *self, mp_obj_t radio);
 
 socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
@@ -59,6 +63,9 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
 
 mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
     const char *host);
+// raises an exception instead of returning mp_const_none in the case of error
+mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self,
+    const char *host);
 
 // Non-allocating version for internal use. These sockets are not registered and, therefore, not
 // closed automatically.
@@ -66,4 +73,6 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
     socketpool_socket_obj_t *sock);
 
+NORETURN void common_hal_socketpool_socketpool_raise_gaierror(int value, qstr name);
+
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKETPOOL_H

From 5c569f03c2dffbe2e07cd646b22e7d62a7e8c79f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 14 Dec 2022 19:34:26 -0500
Subject: [PATCH 1576/2403] redo pin never resetting for mimxrt10xx

---
 .../mimxrt10xx/boards/feather_m7_1011/board.c | 45 ++++++++++----
 .../boards/feather_mimxrt1011/board.c         | 44 ++++++++++----
 .../boards/feather_mimxrt1062/board.c         | 40 +++++++++----
 ports/mimxrt10xx/boards/imxrt1010_evk/board.c | 47 ++++++++++-----
 ports/mimxrt10xx/boards/imxrt1020_evk/board.c | 44 ++++++++++----
 ports/mimxrt10xx/boards/imxrt1060_evk/board.c | 59 +++++++++++++------
 ports/mimxrt10xx/boards/metro_m7_1011/board.c | 42 +++++++++----
 .../boards/sparkfun_teensy_micromod/board.c   | 57 +++++++++++-------
 ports/mimxrt10xx/boards/teensy40/board.c      | 56 ++++++++++++------
 ports/mimxrt10xx/boards/teensy41/board.c      | 58 ++++++++++++------
 .../common-hal/microcontroller/Pin.c          | 13 +++-
 .../common-hal/microcontroller/Pin.h          |  7 +++
 12 files changed, 356 insertions(+), 156 deletions(-)

diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/board.c b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
index fa37b8ebfd..3f7f3bd575 100644
--- a/ports/mimxrt10xx/boards/feather_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
@@ -26,21 +26,40 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
 }
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
index 1514503834..cc93da4dd2 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
@@ -26,23 +26,41 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
index df3d502d80..3a3b7f0efd 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
@@ -26,22 +26,40 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);// SWCLK
+    &pin_GPIO_AD_B0_06,// SWDIO
+    &pin_GPIO_AD_B0_07,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
index 5a4cbcfc66..d4cd29b645 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -26,25 +26,42 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13); // SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12); // SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13, // SWDIO
+    &pin_GPIO_AD_12, // SWCLK
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
     // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_12);
-    common_hal_never_reset_pin(&pin_GPIO_13);
+    &pin_GPIO_12,
+    &pin_GPIO_13,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
index a9eea2d14e..64ca9c2b00 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -26,26 +26,44 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_00);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);// SWCLK
+    &pin_GPIO_AD_B0_00,// SWDIO
+    &pin_GPIO_AD_B0_01,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B1_11);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B1_12);
+    &pin_GPIO_AD_B1_11,
+    &pin_GPIO_AD_B1_12,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
index 12e75738f8..7406108109 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
@@ -26,30 +26,51 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);// SWCLK
+    &pin_GPIO_AD_B0_06, // SWDIO
+    &pin_GPIO_AD_B0_07, // SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_00);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_01);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_02);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_03);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_04);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+    &pin_GPIO_SD_B1_00,
+    &pin_GPIO_SD_B1_01,
+    &pin_GPIO_SD_B1_02,
+    &pin_GPIO_SD_B1_03,
+    &pin_GPIO_SD_B1_04,
+    &pin_GPIO_SD_B1_05,
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_03);
+    &pin_GPIO_AD_B0_01,
+    &pin_GPIO_AD_B0_03,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
 }
+
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/board.c b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
index 1514503834..8420ad4884 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
@@ -26,23 +26,41 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
index 55cd826de2..c9042c1fe3 100644
--- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
+++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
@@ -26,31 +26,48 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // FLEX flash 2
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
-    common_hal_never_reset_pin(&pin_GPIO_EMC_01);
-    common_hal_never_reset_pin(&pin_GPIO_B0_13);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
+    &pin_GPIO_AD_B0_04,
+    &pin_GPIO_AD_B0_06,
+    &pin_GPIO_AD_B0_07,
+    &pin_GPIO_AD_B0_08,
+    &pin_GPIO_AD_B0_09,
+    &pin_GPIO_AD_B0_10,
+    &pin_GPIO_EMC_01,
+    &pin_GPIO_B0_13,
+    &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
+    &pin_GPIO_SD_B1_05,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy40/board.c b/ports/mimxrt10xx/boards/teensy40/board.c
index 55cd826de2..8bb1680f00 100644
--- a/ports/mimxrt10xx/boards/teensy40/board.c
+++ b/ports/mimxrt10xx/boards/teensy40/board.c
@@ -26,31 +26,49 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // FLEX flash 2
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
-    common_hal_never_reset_pin(&pin_GPIO_EMC_01);
-    common_hal_never_reset_pin(&pin_GPIO_B0_13);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
+    &pin_GPIO_AD_B0_04,
+    &pin_GPIO_AD_B0_06,
+    &pin_GPIO_AD_B0_07,
+    &pin_GPIO_AD_B0_08,
+    &pin_GPIO_AD_B0_09,
+    &pin_GPIO_AD_B0_10,
+    &pin_GPIO_EMC_01,
+    &pin_GPIO_B0_13,
+    &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
+    &pin_GPIO_SD_B1_05,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy41/board.c b/ports/mimxrt10xx/boards/teensy41/board.c
index 628befd02b..8bb1680f00 100644
--- a/ports/mimxrt10xx/boards/teensy41/board.c
+++ b/ports/mimxrt10xx/boards/teensy41/board.c
@@ -26,29 +26,49 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // FLEX flash 2
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
-    common_hal_never_reset_pin(&pin_GPIO_EMC_01);
-    common_hal_never_reset_pin(&pin_GPIO_B0_13);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
+    &pin_GPIO_AD_B0_04,
+    &pin_GPIO_AD_B0_06,
+    &pin_GPIO_AD_B0_07,
+    &pin_GPIO_AD_B0_08,
+    &pin_GPIO_AD_B0_09,
+    &pin_GPIO_AD_B0_10,
+    &pin_GPIO_EMC_01,
+    &pin_GPIO_B0_13,
+    &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
+    &pin_GPIO_SD_B1_05,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
+        if (pin == _reset_forbidden_pins[i]) {
+            return true;
+        }
+    }
+    return false;
 }
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    if (_reset_forbidden(pin)) {
+        return true;
+    }
+
+    // Other reset variations would go here.
+
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 06a2a34fe1..37a0c9c1a1 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -44,17 +44,26 @@ void reset_all_pins(void) {
         if (never_reset_pins[pin->mux_idx]) {
             continue;
         }
-        *(uint32_t *)pin->mux_reg = pin->mux_reset;
-        *(uint32_t *)pin->cfg_reg = pin->pad_reset;
+        common_hal_reset_pin(pin);
     }
 }
 
+MP_WEAK bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    return false;
+}
+
 // Since i.MX pins need extra register and reset information to reset properly,
 // resetting pins by number alone has been removed.
 void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
     if (pin == NULL) {
         return;
     }
+
+    // Give the board a chance to reset the pin in a particular way, or not reset it at all.
+    if (mimxrt10xx_board_reset_pin_number(pin)) {
+        return;
+    }
+
     never_reset_pins[pin->mux_idx] = false;
     claimed_pins[pin->mux_idx] = false;
     *(uint32_t *)pin->mux_reg = pin->mux_reset;
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index 2638eb89b8..c519d468cb 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -35,4 +35,11 @@
 void reset_all_pins(void);
 void claim_pin(const mcu_pin_obj_t *pin);
 
+// Allow the board to reset a pin in a board-specific way. This can be used
+// for LEDs or enable pins to put them in a state beside the default pull-up,
+// or to simply not reset the pin at all.
+// Return true to indicate that the pin was handled in a special way. Returning false will lead to
+// the port-default reset behavior.
+extern bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin);
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H

From dddc3e31bd6fb993ec62a94c130c505bc9f3f6c2 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 14 Dec 2022 12:23:32 +0000
Subject: [PATCH 1577/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (991 of 991 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 4b64cdb372..85d9845b78 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: 2022-12-04 17:47+0000\n"
+"PO-Revision-Date: 2022-12-15 12:49+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1021,7 +1021,7 @@ msgstr "Filen finns redan"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Filen hittades inte"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1263,7 +1263,7 @@ msgstr "Ogiltigt värde för bitar per värde"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Ogiltig byte %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1297,7 +1297,7 @@ msgstr "Ogiltigt tillstånd"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Ogiltig unicode escape"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1305,7 +1305,7 @@ msgstr "Nyckeln måste vara 16, 24 eller 32 byte lång"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Nyckeln hittades inte"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"

From b90a6413c2640c8e3df2f39b9bdcfd48fdd21794 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Dec 2022 13:17:28 -0500
Subject: [PATCH 1578/2403] refactor to reduce duplicate code

---
 .../mimxrt10xx/boards/feather_m7_1011/board.c | 23 +++---------------
 .../boards/feather_mimxrt1011/board.c         | 24 +++----------------
 .../boards/feather_mimxrt1062/board.c         | 23 +++---------------
 ports/mimxrt10xx/boards/imxrt1010_evk/board.c | 23 +++---------------
 ports/mimxrt10xx/boards/imxrt1020_evk/board.c | 23 +++---------------
 ports/mimxrt10xx/boards/imxrt1060_evk/board.c | 24 +++----------------
 ports/mimxrt10xx/boards/metro_m7_1011/board.c | 23 +++---------------
 .../boards/sparkfun_teensy_micromod/board.c   | 23 +++---------------
 ports/mimxrt10xx/boards/teensy40/board.c      | 23 +++---------------
 ports/mimxrt10xx/boards/teensy41/board.c      | 23 +++---------------
 .../common-hal/microcontroller/Pin.c          | 21 ++++++++++++++++
 .../common-hal/microcontroller/Pin.h          |  3 +++
 12 files changed, 54 insertions(+), 202 deletions(-)

diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/board.c b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
index 3f7f3bd575..9587ea71e8 100644
--- a/ports/mimxrt10xx/boards/feather_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_AD_13,// SWDIO
     &pin_GPIO_AD_12,// SWCLK
 
@@ -41,25 +42,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_SD_08,
     &pin_GPIO_SD_07,
     &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
index cc93da4dd2..9587ea71e8 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_AD_13,// SWDIO
     &pin_GPIO_AD_12,// SWCLK
 
@@ -41,26 +42,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_SD_08,
     &pin_GPIO_SD_07,
     &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
index 3a3b7f0efd..5a8de5a522 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
     &pin_GPIO_AD_B0_06,// SWDIO
     &pin_GPIO_AD_B0_07,// SWCLK
@@ -41,25 +42,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_09,
     &pin_GPIO_SD_B1_10,
     &pin_GPIO_SD_B1_11,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
index d4cd29b645..b839ffa666 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_AD_13, // SWDIO
     &pin_GPIO_AD_12, // SWCLK
     // FLEX flash
@@ -43,25 +44,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // USB Pins
     &pin_GPIO_12,
     &pin_GPIO_13,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
index 64ca9c2b00..afbc0c58b5 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
     &pin_GPIO_AD_B0_00,// SWDIO
     &pin_GPIO_AD_B0_01,// SWCLK
@@ -45,25 +46,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // USB Pins
     &pin_GPIO_AD_B1_11,
     &pin_GPIO_AD_B1_12,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
index 7406108109..f27f549c64 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
     &pin_GPIO_AD_B0_06, // SWDIO
     &pin_GPIO_AD_B0_07, // SWCLK
@@ -51,26 +52,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     // USB Pins
     &pin_GPIO_AD_B0_01,
     &pin_GPIO_AD_B0_03,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/board.c b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
index 8420ad4884..27cbd3eb96 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
     &pin_GPIO_AD_13,// SWDIO
     &pin_GPIO_AD_12,// SWCLK
@@ -42,25 +43,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_SD_08,
     &pin_GPIO_SD_07,
     &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
index c9042c1fe3..fda0b1d202 100644
--- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
+++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_06,
     &pin_GPIO_SD_B1_07,
     &pin_GPIO_SD_B1_08,
@@ -49,25 +50,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
     &pin_GPIO_SD_B1_05,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy40/board.c b/ports/mimxrt10xx/boards/teensy40/board.c
index 8bb1680f00..8ece1546d7 100644
--- a/ports/mimxrt10xx/boards/teensy40/board.c
+++ b/ports/mimxrt10xx/boards/teensy40/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // FLEX flash
     &pin_GPIO_SD_B1_06,
     &pin_GPIO_SD_B1_07,
@@ -50,25 +51,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
     &pin_GPIO_SD_B1_05,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy41/board.c b/ports/mimxrt10xx/boards/teensy41/board.c
index 8bb1680f00..8ece1546d7 100644
--- a/ports/mimxrt10xx/boards/teensy41/board.c
+++ b/ports/mimxrt10xx/boards/teensy41/board.c
@@ -29,7 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 // These pins should never ever be reset; doing so could interfere with basic operation.
-STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // FLEX flash
     &pin_GPIO_SD_B1_06,
     &pin_GPIO_SD_B1_07,
@@ -50,25 +51,7 @@ STATIC const mcu_pin_obj_t *_reset_forbidden_pins[] = {
     &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
     &pin_GPIO_SD_B1_05,
+    NULL,                       // Must end in NULL.
 };
 
-STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(_reset_forbidden_pins); i++) {
-        if (pin == _reset_forbidden_pins[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
-    if (_reset_forbidden(pin)) {
-        return true;
-    }
-
-    // Other reset variations would go here.
-
-    return false;
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 37a0c9c1a1..e891b56a24 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -31,6 +31,22 @@
 STATIC bool claimed_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
 STATIC bool never_reset_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
 
+// Default is that no pins are forbidden to reset.
+MP_WEAK const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    NULL,
+};
+
+STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
+    const mcu_pin_obj_t **forbidden_pin = &mimxrt10xx_reset_forbidden_pins[0];
+    while (*forbidden_pin) {
+        if (pin == *forbidden_pin) {
+            return true;
+        }
+        forbidden_pin++;
+    }
+    return false;
+}
+
 // There are two numbering systems used here:
 // IOMUXC index, used for iterating through pins and accessing reset information,
 // and GPIO port and number, used to store claimed and reset tagging. The two number
@@ -55,10 +71,15 @@ MP_WEAK bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
 // Since i.MX pins need extra register and reset information to reset properly,
 // resetting pins by number alone has been removed.
 void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
+    return;
     if (pin == NULL) {
         return;
     }
 
+    if (_reset_forbidden(pin)) {
+        return;
+    }
+
     // Give the board a chance to reset the pin in a particular way, or not reset it at all.
     if (mimxrt10xx_board_reset_pin_number(pin)) {
         return;
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index c519d468cb..1bfbe41a18 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -35,6 +35,9 @@
 void reset_all_pins(void);
 void claim_pin(const mcu_pin_obj_t *pin);
 
+// List of pins that should never be reset.
+extern const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[];
+
 // Allow the board to reset a pin in a board-specific way. This can be used
 // for LEDs or enable pins to put them in a state beside the default pull-up,
 // or to simply not reset the pin at all.

From 66efed5ba5ab7d9fdf94868d76300fbedde66de5 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 15 Dec 2022 15:49:58 -0500
Subject: [PATCH 1579/2403] fix AuthMode printing regression

---
 ports/espressif/common-hal/wifi/Network.c   | 4 ++--
 ports/raspberrypi/common-hal/wifi/Network.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Network.c b/ports/espressif/common-hal/wifi/Network.c
index 5c9852a1f7..9a20decd4a 100644
--- a/ports/espressif/common-hal/wifi/Network.c
+++ b/ports/espressif/common-hal/wifi/Network.c
@@ -86,9 +86,9 @@ mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
     }
     mp_obj_t authmode_list = mp_obj_new_list(0, NULL);
     if (authmode_mask != 0) {
-        for (uint8_t i = 0; i < 8; i++) {
+        for (uint8_t i = 0; i < 32; i++) {
             if ((authmode_mask >> i) & 1) {
-                mp_obj_list_append(authmode_list, cp_enum_find(&wifi_authmode_type, i));
+                mp_obj_list_append(authmode_list, cp_enum_find(&wifi_authmode_type, 1 << i));
             }
         }
     }
diff --git a/ports/raspberrypi/common-hal/wifi/Network.c b/ports/raspberrypi/common-hal/wifi/Network.c
index e9b64ffd2c..ef81247712 100644
--- a/ports/raspberrypi/common-hal/wifi/Network.c
+++ b/ports/raspberrypi/common-hal/wifi/Network.c
@@ -53,7 +53,7 @@ mp_obj_t common_hal_wifi_network_get_country(wifi_network_obj_t *self) {
 }
 
 mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
-    uint8_t authmode_mask = 0;
+    uint32_t authmode_mask = 0;
     if (self->record.auth_mode == 0) {
         authmode_mask = AUTHMODE_OPEN;
     }
@@ -71,9 +71,9 @@ mp_obj_t common_hal_wifi_network_get_authmode(wifi_network_obj_t *self) {
     ;
     mp_obj_t authmode_list = mp_obj_new_list(0, NULL);
     if (authmode_mask != 0) {
-        for (uint8_t i = 0; i < 8; i++) {
+        for (uint32_t i = 0; i < 32; i++) {
             if ((authmode_mask >> i) & 1) {
-                mp_obj_list_append(authmode_list, cp_enum_find(&wifi_authmode_type, i));
+                mp_obj_list_append(authmode_list, cp_enum_find(&wifi_authmode_type, 1 << i));
             }
         }
     }

From 73084ac79fb1ec7f03bf0991a1ee409ff6c32fe1 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Fri, 16 Dec 2022 09:13:34 +0100
Subject: [PATCH 1580/2403] fixed typo (path) in postCreateCommand

---
 .devcontainer/cortex-m/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/cortex-m/devcontainer.json b/.devcontainer/cortex-m/devcontainer.json
index 796f83a4eb..ee8aeb1ea0 100644
--- a/.devcontainer/cortex-m/devcontainer.json
+++ b/.devcontainer/cortex-m/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "CircuitPython Cortex-M Build-Environment (base: Default Linux Universal)",
 	"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
-	"postCreateCommand": ".devcontainer/cortex-mq/on-create.sh",
+	"postCreateCommand": ".devcontainer/cortex-m/on-create.sh",
 	"remoteEnv": { "PATH": "/workspaces/gcc-arm-none-eabi/bin:${containerEnv:PATH}" }
 
 	// Features to add to the dev container. More info: https://containers.dev/features.

From 1139fc1be9c316185d097d58d601a035d7700c46 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 16 Dec 2022 11:52:48 -0600
Subject: [PATCH 1581/2403] Revert "update protomatter to latest commit"

This reverts commit 5d974c35ee620e36efa2148a6f64e1e7df1b55f5.
---
 lib/protomatter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/protomatter b/lib/protomatter
index cc93ff18c3..d0a07e14ad 160000
--- a/lib/protomatter
+++ b/lib/protomatter
@@ -1 +1 @@
-Subproject commit cc93ff18c3a20b25396cb2babaee8ed33bb79528
+Subproject commit d0a07e14adcd71a7c22bcceb16c55aadb5e0d104

From 90c805d8584969679a6ca3cb9662e39b31937d86 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Fri, 16 Dec 2022 02:11:12 +0100
Subject: [PATCH 1582/2403] esp32-camera: make the master_clock_pin really
 optional

The master_clock_pin was already optional, but not specifying it would
result in a crash. This fixes it, so it really can be omitted, when the
camera module has its own clock source built in.
---
 ports/espressif/bindings/esp32_camera/Camera.c   | 10 +++++-----
 ports/espressif/common-hal/esp32_camera/Camera.c | 13 ++++++++-----
 ports/espressif/esp32-camera                     |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 9bcd398612..687a389fc3 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -50,8 +50,8 @@
 //|         vsync_pin: microcontroller.Pin,
 //|         href_pin: microcontroller.Pin,
 //|         i2c: busio.I2C,
-//|         external_clock_pin: microcontroller.Pin,
-//|         external_clock_frequency: int,
+//|         external_clock_pin: Optional[microcontroller.Pin] = None,
+//|         external_clock_frequency: int = 20_000_000,
 //|         powerdown_pin: Optional[microcontroller.Pin] = None,
 //|         reset_pin: Optional[microcontroller.Pin] = None,
 //|         pixel_format: PixelFormat = PixelFormat.RGB565,
@@ -101,8 +101,8 @@ STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n
         { MP_QSTR_vsync_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
         { MP_QSTR_href_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
         { MP_QSTR_i2c, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_external_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY },
-        { MP_QSTR_external_clock_frequency, MP_ARG_INT | MP_ARG_REQUIRED },
+        { MP_QSTR_external_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_external_clock_frequency, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 20000000L } },
         { MP_QSTR_powerdown_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
         { MP_QSTR_reset_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
         { MP_QSTR_pixel_format, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&pixel_format_RGB565_obj) } },
@@ -125,7 +125,7 @@ STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n
     const mcu_pin_obj_t *vsync_pin = validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj);
     const mcu_pin_obj_t *href_pin = validate_obj_is_free_pin(args[ARG_href_pin].u_obj);
     busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
-    const mcu_pin_obj_t *external_clock_pin = validate_obj_is_free_pin(args[ARG_external_clock_pin].u_obj);
+    const mcu_pin_obj_t *external_clock_pin = validate_obj_is_free_pin_or_none(args[ARG_external_clock_pin].u_obj);
     const mcu_pin_obj_t *powerdown_pin = validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj);
     const mcu_pin_obj_t *reset_pin = validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj);
     const mp_int_t external_clock_frequency = mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_clock_frequency);
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/esp32_camera/Camera.c
index 65d2d0fbc6..34ad1fbbb9 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/esp32_camera/Camera.c
@@ -85,14 +85,20 @@ void common_hal_esp32_camera_camera_construct(
     for (int i = 0; i < 8; i++) {
         claim_pin_number(data_pins[i]);
     }
-    claim_pin(external_clock_pin);
+    maybe_claim_pin(external_clock_pin);
     claim_pin(pixel_clock_pin);
     claim_pin(vsync_pin);
     claim_pin(href_pin);
     maybe_claim_pin(powerdown_pin);
     maybe_claim_pin(reset_pin);
 
-    common_hal_pwmio_pwmout_construct(&self->pwm, external_clock_pin, 1, external_clock_frequency, true);
+    if (external_clock_pin) {
+        common_hal_pwmio_pwmout_construct(&self->pwm, external_clock_pin, 1, external_clock_frequency, true);
+        self->camera_config.ledc_timer = self->pwm.tim_handle.timer_num;
+        self->camera_config.ledc_channel = self->pwm.chan_handle.channel;
+    } else {
+        self->camera_config.ledc_channel = 0xff; // NO_CAMERA_LEDC_CHANNEL
+    }
 
     self->i2c = i2c;
 
@@ -119,9 +125,6 @@ void common_hal_esp32_camera_camera_construct(
 
     self->camera_config.xclk_freq_hz = external_clock_frequency;
 
-    self->camera_config.ledc_timer = self->pwm.tim_handle.timer_num;
-    self->camera_config.ledc_channel = self->pwm.chan_handle.channel;
-
     self->camera_config.pixel_format = pixel_format;
     self->camera_config.frame_size = frame_size;
     self->camera_config.jpeg_quality = jpeg_quality;
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 54c3f61c86..4ff7f348d0 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2
+Subproject commit 4ff7f348d0713ea8eca022f73a059b0fe0934531

From 49dba47f4e0fa359304f59af873debc919691711 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 15 Dec 2022 21:34:47 +0000
Subject: [PATCH 1583/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (991 of 991 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 02380d5e8e..c0e64fd9dc 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: 2022-12-05 21:48+0000\n"
+"PO-Revision-Date: 2022-12-16 21:50+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.15-dev\n"
+"X-Generator: Weblate 4.15\n"
 
 #: main.c
 msgid ""
@@ -1031,7 +1031,7 @@ msgstr "Arquivo já existe"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Arquivo não encontrado"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1279,7 +1279,7 @@ msgstr "Os valores por bits são inválidos"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Byte %.*s inválido"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1313,7 +1313,7 @@ msgstr "Estado inválido"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Escape unicode inválido"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1321,7 +1321,7 @@ msgstr "A chave deve ter 16, 24 ou 32 bytes de comprimento"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Chave não encontrada"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"

From aac324c4d124c83118cbe398d82be83450483f58 Mon Sep 17 00:00:00 2001
From: root 
Date: Sun, 18 Dec 2022 22:49:28 +0000
Subject: [PATCH 1584/2403] added frozen modules, changed to 8BM FLASH

---
 .../boards/crcibernetica-ideaboard/mpconfigboard.mk       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
index cbc468b3ec..3921140b5c 100644
--- a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
+++ b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
@@ -5,5 +5,11 @@ IDF_TARGET = esp32
 
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
-CIRCUITPY_ESP_FLASH_SIZE = 16MB
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
 CIRCUITPY_ESP32_CAMERA = 0
+
+# Include these Python libraries in firmware
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor

From f8ac1d9261c087d1f65886036289c2121c32cc0f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 2 Dec 2022 14:54:42 -0800
Subject: [PATCH 1585/2403] Rework the coproc API

It is now a generic `memorymap` API and an ESP specific `espulp` module.

Fixes #7218. Fixes #3234. Fixes #7300.
---
 locale/circuitpython.pot                      |  42 +++--
 ports/espressif/Makefile                      |  13 +-
 ports/espressif/bindings/espulp/ULP.c         | 144 ++++++++++++++++++
 .../espressif/bindings/espulp/ULP.h           |  17 ++-
 .../espressif/bindings/espulp/ULPAlarm.c      |  38 +++--
 .../espressif/bindings/espulp/ULPAlarm.h      |   9 +-
 ports/espressif/bindings/espulp/__init__.c    |  91 +++++++++++
 .../Coproc.h => bindings/espulp/__init__.h}   |  15 +-
 ports/espressif/common-hal/alarm/__init__.c   |  29 +++-
 ports/espressif/common-hal/alarm/__init__.h   |   7 +-
 .../common-hal/alarm/coproc/CoprocAlarm.c     | 132 ----------------
 ports/espressif/common-hal/coproc/Coproc.c    |  73 ---------
 .../{coproc/__init__.c => espulp/ULP.c}       |  79 ++++++++--
 .../{coproc/CoprocMemory.h => espulp/ULP.h}   |  10 +-
 ports/espressif/common-hal/espulp/ULPAlarm.c  | 110 +++++++++++++
 .../CoprocAlarm.h => espulp/ULPAlarm.h}       |  17 +--
 ports/espressif/common-hal/espulp/__init__.c  |  34 +++++
 .../common-hal/memorymap/AddressRange.c       | 107 +++++++++++++
 .../common-hal/memorymap/AddressRange.h       |  38 +++++
 .../espressif/common-hal/memorymap/__init__.c |   1 +
 .../common-hal/microcontroller/Processor.c    |   1 +
 ports/espressif/esp-idf                       |   2 +-
 ports/espressif/mpconfigport.mk               |   7 +-
 ports/espressif/supervisor/port.c             |   8 +-
 py/circuitpy_defns.mk                         |  14 +-
 py/circuitpy_mpconfig.mk                      |   8 +-
 shared-bindings/alarm/__init__.c              |  24 +--
 shared-bindings/alarm/coproc/CoprocAlarm.c    |  87 -----------
 shared-bindings/coproc/Coproc.c               | 110 -------------
 shared-bindings/coproc/CoprocMemory.h         |  39 -----
 shared-bindings/coproc/__init__.c             | 115 --------------
 .../AddressRange.c}                           | 115 ++++++++------
 .../memorymap/AddressRange.h                  |  34 ++---
 shared-bindings/memorymap/__init__.c          |  52 +++++++
 shared-bindings/memorymap/__init__.h          |  30 ++++
 supervisor/shared/reload.c                    |   2 +
 supervisor/shared/web_workflow/web_workflow.c |   9 ++
 37 files changed, 922 insertions(+), 741 deletions(-)
 create mode 100644 ports/espressif/bindings/espulp/ULP.c
 rename shared-bindings/coproc/__init__.h => ports/espressif/bindings/espulp/ULP.h (73%)
 rename shared-bindings/coproc/Coproc.h => ports/espressif/bindings/espulp/ULPAlarm.c (52%)
 rename shared-bindings/alarm/coproc/CoprocAlarm.h => ports/espressif/bindings/espulp/ULPAlarm.h (79%)
 create mode 100644 ports/espressif/bindings/espulp/__init__.c
 rename ports/espressif/{common-hal/coproc/Coproc.h => bindings/espulp/__init__.h} (75%)
 delete mode 100644 ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 delete mode 100644 ports/espressif/common-hal/coproc/Coproc.c
 rename ports/espressif/common-hal/{coproc/__init__.c => espulp/ULP.c} (50%)
 rename ports/espressif/common-hal/{coproc/CoprocMemory.h => espulp/ULP.h} (82%)
 create mode 100644 ports/espressif/common-hal/espulp/ULPAlarm.c
 rename ports/espressif/common-hal/{alarm/coproc/CoprocAlarm.h => espulp/ULPAlarm.h} (71%)
 create mode 100644 ports/espressif/common-hal/espulp/__init__.c
 create mode 100644 ports/espressif/common-hal/memorymap/AddressRange.c
 create mode 100644 ports/espressif/common-hal/memorymap/AddressRange.h
 create mode 100644 ports/espressif/common-hal/memorymap/__init__.c
 delete mode 100644 shared-bindings/alarm/coproc/CoprocAlarm.c
 delete mode 100644 shared-bindings/coproc/Coproc.c
 delete mode 100644 shared-bindings/coproc/CoprocMemory.h
 delete mode 100644 shared-bindings/coproc/__init__.c
 rename shared-bindings/{coproc/CoprocMemory.c => memorymap/AddressRange.c} (59%)
 rename ports/espressif/common-hal/coproc/CoprocMemory.c => shared-bindings/memorymap/AddressRange.h (53%)
 create mode 100644 shared-bindings/memorymap/__init__.c
 create mode 100644 shared-bindings/memorymap/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 56c2396d46..0cf1027239 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -180,7 +181,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -393,6 +393,10 @@ msgstr ""
 msgid "Address must be %d bytes long"
 msgstr ""
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -473,7 +477,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -497,7 +501,7 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
@@ -914,10 +918,10 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1020,7 +1024,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1628,11 +1631,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1748,6 +1754,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1792,6 +1802,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1936,7 +1950,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2210,8 +2224,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2467,7 +2481,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3725,7 +3739,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 4e72e5c45a..ddfcaeeb6e 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -100,8 +100,6 @@ INC += \
 	-isystem esp-idf/components/soc/include \
 	-isystem esp-idf/components/soc/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/spi_flash/include \
-	-isystem esp-idf/components/ulp/include \
-	-isystem esp-idf/components/ulp/ulp_riscv/include \
 	-isystem esp-idf/components/$(IDF_TARGET_ARCH)/include \
 	-isystem esp-idf/components/$(IDF_TARGET_ARCH)/$(IDF_TARGET)/include
 
@@ -261,6 +259,15 @@ CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
+ifneq ($(CIRCUITPY_ESPULP),0)
+SRC_ULP := \
+	$(wildcard common-hal/espulp/*.c) \
+	$(wildcard bindings/espulp/*.c)
+SRC_C += $(SRC_ULP)
+CFLAGS += -isystem esp-idf/components/ulp/include
+CFLAGS += -isystem esp-idf/components/ulp/ulp_riscv/include
+endif
+
 SRC_COMMON_HAL_EXPANDED = \
 	$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
 	$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
@@ -364,7 +371,7 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 	BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
 	                esp-idf/components/bt/controller/lib_esp32c3_family/$(IDF_TARGET)/libbtdm_app.a
 endif
-ifneq ($(CIRCUITPY_COPROC),0)
+ifneq ($(CIRCUITPY_ESPULP),0)
 	ESP_IDF_COMPONENTS_LINK += ulp
 endif
 
diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c
new file mode 100644
index 0000000000..6cd719277b
--- /dev/null
+++ b/ports/espressif/bindings/espulp/ULP.c
@@ -0,0 +1,144 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/Pin.h"
+#include "shared-bindings/util.h"
+#include "bindings/espulp/ULP.h"
+
+#include "py/runtime.h"
+
+//| class ULP:
+//|     def __init__(self):
+//|         """The ultra-low-power processor.
+//|
+//|         Raises an exception if another ULP has been instantiated. This
+//|         ensures that is is only used by one piece of code at a time."""
+//|         ...
+STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    espulp_ulp_obj_t *self = m_new_obj(espulp_ulp_obj_t);
+    self->base.type = &espulp_ulp_type;
+    common_hal_espulp_ulp_construct(self);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC espulp_ulp_obj_t *get_ulp_obj(mp_obj_t self_in) {
+    if (!mp_obj_is_type(self_in, &espulp_ulp_type)) {
+        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_ULP);
+    }
+    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (common_hal_espulp_ulp_deinited(self)) {
+        raise_deinited_error();
+    }
+    return self;
+}
+
+//|     def deinit(self) -> None:
+//|         """Deinitialises the camera and releases all memory resources for reuse."""
+//|         ...
+STATIC mp_obj_t espulp_ulp_deinit(mp_obj_t self_in) {
+    espulp_ulp_obj_t *self = get_ulp_obj(self_in);
+    common_hal_espulp_ulp_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_deinit_obj, espulp_ulp_deinit);
+
+//|     def __enter__(self) -> ULP:
+//|         """No-op used by Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+STATIC mp_obj_t espulp_ulp_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return espulp_ulp_deinit(args[0]);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espulp_ulp___exit___obj, 4, 4, espulp_ulp_obj___exit__);
+
+//|     def run(
+//|         self, program: ReadableBuffer, *, pins: Sequence[microcontroller.Pin] = ()
+//|     ) -> None:
+//|         """Loads the program into ULP memory and then runs the program. The given pins are
+//|            claimed and not reset until `halt()` is called.
+//|
+//|         The program will continue to run even when the running Python is halted."""
+//|         ...
+STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_program, ARG_pins };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_program, MP_ARG_REQUIRED | MP_ARG_OBJ},
+        { MP_QSTR_pins, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    espulp_ulp_obj_t *self = get_ulp_obj(pos_args[0]);
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_program].u_obj, &bufinfo, MP_BUFFER_READ);
+
+    mp_obj_t pins_in = args[ARG_pins].u_obj;
+    const size_t num_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(pins_in));
+    uint32_t pin_mask = 0;
+
+    for (mp_uint_t i = 0; i < num_pins; i++) {
+        mp_obj_t pin_obj = mp_obj_subscr(pins_in, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
+        validate_obj_is_free_pin(pin_obj);
+        pin_mask |= 1 << ((const mcu_pin_obj_t *)pin_obj)->number;
+    }
+
+    common_hal_espulp_ulp_run(self, bufinfo.buf, bufinfo.len, pin_mask);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espulp_ulp_run_obj, 2, espulp_ulp_run);
+
+//|     def halt(self) -> None:
+//|         """Halts the running program and releases the pins given in `run()`."""
+//|         ...
+//|
+STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) {
+    common_hal_espulp_ulp_halt(get_ulp_obj(self_in));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt);
+
+STATIC const mp_rom_map_elem_t espulp_ulp_locals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espulp_ulp_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espulp_ulp___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&espulp_ulp_run_obj) },
+    { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&espulp_ulp_halt_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table);
+
+const mp_obj_type_t espulp_ulp_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ULP,
+    .make_new = espulp_ulp_make_new,
+    .locals_dict = (mp_obj_t)&espulp_ulp_locals_dict,
+};
diff --git a/shared-bindings/coproc/__init__.h b/ports/espressif/bindings/espulp/ULP.h
similarity index 73%
rename from shared-bindings/coproc/__init__.h
rename to ports/espressif/bindings/espulp/ULP.h
index 6f2b2a56ae..9f9c3ecf7f 100644
--- a/shared-bindings/coproc/__init__.h
+++ b/ports/espressif/bindings/espulp/ULP.h
@@ -24,14 +24,17 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H
+#pragma once
 
 #include "py/obj.h"
-#include "common-hal/coproc/Coproc.h"
+#include "common-hal/espulp/ULP.h"
 
-extern void common_hal_coproc_run(coproc_coproc_obj_t *self);
-extern void common_hal_coproc_halt(coproc_coproc_obj_t *self);
-extern mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self);
 
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC___INIT___H
+extern const mp_obj_type_t espulp_ulp_type;
+
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self);
+bool common_hal_espulp_ulp_deinited(espulp_ulp_obj_t *self);
+void common_hal_espulp_ulp_deinit(espulp_ulp_obj_t *self);
+
+void common_hal_espulp_ulp_run(espulp_ulp_obj_t *self, uint32_t *program, size_t length, uint32_t pin_mask);
+void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self);
diff --git a/shared-bindings/coproc/Coproc.h b/ports/espressif/bindings/espulp/ULPAlarm.c
similarity index 52%
rename from shared-bindings/coproc/Coproc.h
rename to ports/espressif/bindings/espulp/ULPAlarm.c
index fbf9bd9ae0..e77fe7f834 100644
--- a/shared-bindings/coproc/Coproc.h
+++ b/ports/espressif/bindings/espulp/ULPAlarm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,17 +24,33 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROC_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROC_H
+#include "bindings/espulp/ULPAlarm.h"
 
-#include "common-hal/coproc/Coproc.h"
+#include "py/runtime.h"
 
-extern const mp_obj_type_t coproc_coproc_type;
+//| class ULPAlarm:
+//|     """Trigger an alarm when the ULP requests wake-up."""
+//|
+//|     def __init__(self) -> None:
+//|         """Create an alarm that will be triggered when the ULP requests wake-up.
+//|
+//|         The alarm is not active until it is passed to an `alarm`-enabling function, such as
+//|         `alarm.light_sleep_until_alarms()` or `alarm.exit_and_deep_sleep_until_alarms()`.
+//|
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type,
+    size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
-extern void common_hal_coproc_coproc_construct(coproc_coproc_obj_t *self,
-    const uint8_t *buf, const size_t buf_len, coproc_memory_obj_t *coproc_memory);
+    espulp_ulpalarm_obj_t *self = m_new_obj(espulp_ulpalarm_obj_t);
+    self->base.type = &espulp_ulpalarm_type;
+    common_hal_espulp_ulpalarm_construct(self);
+    return MP_OBJ_FROM_PTR(self);
+}
 
-extern void common_hal_coproc_coproc_deinit(coproc_coproc_obj_t *self);
-extern bool common_hal_coproc_coproc_deinited(coproc_coproc_obj_t *self);
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROC_H
+const mp_obj_type_t espulp_ulpalarm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ULPAlarm,
+    .make_new = espulp_ulpalarm_make_new,
+};
diff --git a/shared-bindings/alarm/coproc/CoprocAlarm.h b/ports/espressif/bindings/espulp/ULPAlarm.h
similarity index 79%
rename from shared-bindings/alarm/coproc/CoprocAlarm.h
rename to ports/espressif/bindings/espulp/ULPAlarm.h
index 8f3a85de56..75e96c0a45 100644
--- a/shared-bindings/alarm/coproc/CoprocAlarm.h
+++ b/ports/espressif/bindings/espulp/ULPAlarm.h
@@ -24,11 +24,10 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
+#pragma once
 
-#include "common-hal/alarm/coproc/CoprocAlarm.h"
+#include "common-hal/espulp/ULPAlarm.h"
 
-extern const mp_obj_type_t alarm_coproc_coprocalarm_type;
+extern const mp_obj_type_t espulp_ulpalarm_type;
 
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_COPROC_COPROCALARM_H
+void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self);
diff --git a/ports/espressif/bindings/espulp/__init__.c b/ports/espressif/bindings/espulp/__init__.c
new file mode 100644
index 0000000000..06c62175fa
--- /dev/null
+++ b/ports/espressif/bindings/espulp/__init__.c
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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/util.h"
+#include "bindings/espulp/__init__.h"
+#include "bindings/espulp/ULP.h"
+#include "bindings/espulp/ULPAlarm.h"
+
+#include "py/runtime.h"
+
+//| """ESP Ultra Low Power Processor Module
+//|
+//| The `espulp` module adds ability to load and run
+//| programs on the ESP32-Sx's ultra-low-power RISC-V processor.
+//|
+//| .. code-block:: python
+//|
+//|     import espulp
+//|     import memorymap
+//|
+//|     shared_mem = memorymap.AddressRange(start=0x50000000, length=1024)
+//|     ulp = espulp.ULP()
+//|
+//|     with open("program.bin", "rb") as f:
+//|         program = f.read()
+//|
+//|     ulp.run(program)
+//|     print(shared_mem[0])
+//|     # ulp.halt()
+//| """
+//| ...
+//|
+
+//| def get_rtc_gpio_number(pin: microcontroller.Pin) -> Optional[int]:
+//|     """Return the RTC GPIO number of the given pin or None if not connected
+//|     to RTC GPIO."""
+//|     ...
+//|
+
+STATIC mp_obj_t espulp_get_rtc_gpio_number(mp_obj_t pin_obj) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(pin_obj);
+    mp_int_t number = common_hal_espulp_get_rtc_gpio_number(pin);
+    if (number < 0) {
+        return mp_const_none;
+    }
+    return MP_OBJ_NEW_SMALL_INT(number);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espulp_get_rtc_gpio_number_obj, espulp_get_rtc_gpio_number);
+
+STATIC const mp_rom_map_elem_t espulp_module_globals_table[] = {
+    // module name
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espulp) },
+
+    // module functions
+    { MP_ROM_QSTR(MP_QSTR_get_rtc_gpio_number), MP_OBJ_FROM_PTR(&espulp_get_rtc_gpio_number_obj) },
+
+    // module classes
+    { MP_ROM_QSTR(MP_QSTR_ULP), MP_OBJ_FROM_PTR(&espulp_ulp_type) },
+    { MP_ROM_QSTR(MP_QSTR_ULPAlarm), MP_OBJ_FROM_PTR(&espulp_ulpalarm_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(espulp_module_globals, espulp_module_globals_table);
+
+const mp_obj_module_t espulp_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&espulp_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_espulp, espulp_module, CIRCUITPY_ESPULP);
diff --git a/ports/espressif/common-hal/coproc/Coproc.h b/ports/espressif/bindings/espulp/__init__.h
similarity index 75%
rename from ports/espressif/common-hal/coproc/Coproc.h
rename to ports/espressif/bindings/espulp/__init__.h
index 19082871cc..70daf53183 100644
--- a/ports/espressif/common-hal/coproc/Coproc.h
+++ b/ports/espressif/bindings/espulp/__init__.h
@@ -24,17 +24,10 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
+#pragma once
 
-#include "py/obj.h"
-#include "common-hal/coproc/CoprocMemory.h"
+#include "shared-bindings/microcontroller/Pin.h"
 
-typedef struct {
-    mp_obj_base_t base;
-    uint8_t *buf;
-    size_t buf_len;
-    coproc_memory_obj_t *coproc_memory;
-} coproc_coproc_obj_t;
+void espulp_reset(void);
 
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROC_H
+mp_int_t common_hal_espulp_get_rtc_gpio_number(const mcu_pin_obj_t *pin);
diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index 02ce3e1082..574fab0151 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -35,11 +35,14 @@
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/alarm/touch/TouchAlarm.h"
-#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
 
 #include "shared-bindings/wifi/__init__.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
+#if CIRCUITPY_ESPULP
+#include "bindings/espulp/ULPAlarm.h"
+#endif
+
 #include "common-hal/digitalio/DigitalInOut.h"
 
 #include "supervisor/port.h"
@@ -67,7 +70,9 @@ void alarm_reset(void) {
     alarm_pin_pinalarm_reset();
     alarm_time_timealarm_reset();
     alarm_touch_touchalarm_reset();
-    alarm_coproc_coprocalarm_reset();
+    #if CIRCUITPY_ESPULP
+    espulp_ulpalarm_reset();
+    #endif
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 }
 
@@ -82,9 +87,11 @@ STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(void) {
     if (alarm_touch_touchalarm_woke_this_cycle()) {
         return ESP_SLEEP_WAKEUP_TOUCHPAD;
     }
-    if (alarm_coproc_coprocalarm_woke_this_cycle()) {
+    #if CIRCUITPY_ESPULP
+    if (espulp_ulpalarm_woke_this_cycle()) {
         return ESP_SLEEP_WAKEUP_ULP;
     }
+    #endif
     // If waking from true deep sleep, modules will have lost their state,
     // so check the deep wakeup cause manually
     return esp_sleep_get_wakeup_cause();
@@ -113,9 +120,11 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) {
             return alarm_touch_touchalarm_record_wake_alarm();
         }
 
+        #if CIRCUITPY_ESPULP
         case ESP_SLEEP_WAKEUP_ULP: {
-            return alarm_coproc_coprocalarm_record_wake_alarm();
+            return espulp_ulpalarm_record_wake_alarm();
         }
+        #endif
 
         case ESP_SLEEP_WAKEUP_UNDEFINED:
         default:
@@ -130,7 +139,9 @@ STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t
     alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms);
     alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms);
     alarm_touch_touchalarm_set_alarm(deep_sleep, n_alarms, alarms);
-    alarm_coproc_coprocalarm_set_alarm(deep_sleep, n_alarms, alarms);
+    #if CIRCUITPY_ESPULP
+    espulp_ulpalarm_set_alarm(deep_sleep, n_alarms, alarms);
+    #endif
 }
 
 mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj_t *alarms) {
@@ -157,10 +168,12 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
                     wake_alarm = alarm_touch_touchalarm_find_triggered_alarm(n_alarms,alarms);
                     break;
                 }
+                #if CIRCUITPY_ESPULP
                 case ESP_SLEEP_WAKEUP_ULP: {
-                    wake_alarm = alarm_coproc_coprocalarm_find_triggered_alarm(n_alarms,alarms);
+                    wake_alarm = espulp_ulpalarm_find_triggered_alarm(n_alarms,alarms);
                     break;
                 }
+                #endif
                 default:
                     // Should not reach this, if all light sleep types are covered correctly
                     break;
@@ -187,7 +200,9 @@ 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) {
     alarm_pin_pinalarm_prepare_for_deep_sleep();
     alarm_touch_touchalarm_prepare_for_deep_sleep();
-    alarm_coproc_coprocalarm_prepare_for_deep_sleep();
+    #if CIRCUITPY_ESPULP
+    espulp_ulpalarm_prepare_for_deep_sleep();
+    #endif
 
     // We no longer need to remember the pin preservations, since any pin resets are all done.
     clear_pin_preservations();
diff --git a/ports/espressif/common-hal/alarm/__init__.h b/ports/espressif/common-hal/alarm/__init__.h
index 9f762f9c00..e0086ee61a 100644
--- a/ports/espressif/common-hal/alarm/__init__.h
+++ b/ports/espressif/common-hal/alarm/__init__.h
@@ -27,13 +27,16 @@
 #pragma once
 
 #include "common-hal/alarm/SleepMemory.h"
-#include "common-hal/alarm/coproc/CoprocAlarm.h"
 #include "common-hal/alarm/pin/PinAlarm.h"
 #include "common-hal/alarm/time/TimeAlarm.h"
 #include "common-hal/alarm/touch/TouchAlarm.h"
 
+#if CIRCUITPY_ESPULP
+#include "common-hal/espulp/ULPAlarm.h"
+#endif
+
 typedef union {
-    alarm_coproc_coprocalarm_obj_t coproc_alarm;
+    espulp_ulpalarm_obj_t ulp_alarm;
     alarm_pin_pinalarm_obj_t pin_alarm;
     alarm_time_timealarm_obj_t time_alarm;
     alarm_touch_touchalarm_obj_t touch_alarm;
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c b/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
deleted file mode 100644
index 9ee187d27c..0000000000
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "shared-bindings/alarm/__init__.h"
-#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
-#include "shared-bindings/coproc/__init__.h"
-
-#if CIRCUITPY_COPROC
-
-#include "supervisor/port.h"
-
-#include "driver/rtc_cntl.h"
-#include "soc/rtc_cntl_reg.h"
-
-#include "esp_sleep.h"
-
-static volatile bool woke_up = false;
-
-mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const 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_coproc_coprocalarm_type)) {
-            return alarms[i];
-        }
-    }
-    return mp_const_none;
-}
-
-mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void) {
-    alarm_coproc_coprocalarm_obj_t *const alarm = &alarm_wake_alarm.coproc_alarm;
-
-    alarm->base.type = &alarm_coproc_coprocalarm_type;
-    return alarm;
-}
-
-// This is used to wake the main CircuitPython task.
-STATIC void coproc_interrupt(void *arg) {
-    (void)arg;
-    woke_up = true;
-    port_wake_main_task_from_isr();
-}
-
-void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
-    bool coproc_alarm_set = false;
-    alarm_coproc_coprocalarm_obj_t *coproc_alarm = MP_OBJ_NULL;
-
-    for (size_t i = 0; i < n_alarms; i++) {
-        if (mp_obj_is_type(alarms[i], &alarm_coproc_coprocalarm_type)) {
-            if (deep_sleep && coproc_alarm_set) {
-                mp_raise_ValueError_varg(translate("Only one %q can be set in deep sleep."), MP_QSTR_CoprocAlarm);
-            }
-            coproc_alarm = MP_OBJ_TO_PTR(alarms[i]);
-            coproc_alarm_set = true;
-        }
-    }
-
-    if (!coproc_alarm_set) {
-        return;
-    }
-
-    // enable coproc interrupt
-    rtc_isr_register(&coproc_interrupt, NULL, RTC_CNTL_COCPU_INT_ST);
-    REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
-
-    // start coproc program
-    common_hal_coproc_run(coproc_alarm->coproc);
-}
-
-void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
-    // disbale coproc interrupt
-    rtc_isr_deregister(&coproc_interrupt, NULL);
-    REG_CLR_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
-
-    // enable coproc wakeup
-    esp_sleep_enable_ulp_wakeup();
-    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_SLOW_MEM, ESP_PD_OPTION_ON);
-}
-
-bool alarm_coproc_coprocalarm_woke_this_cycle(void) {
-    return woke_up;
-}
-
-void alarm_coproc_coprocalarm_reset(void) {
-    woke_up = false;
-}
-
-#else // CIRCUITPY_COPROC
-
-mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms) {
-    return mp_const_none;
-}
-
-mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void) {
-    return mp_const_none;
-}
-
-void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
-}
-
-void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void) {
-}
-
-bool alarm_coproc_coprocalarm_woke_this_cycle(void) {
-    return false;
-}
-
-void alarm_coproc_coprocalarm_reset(void) {
-}
-
-#endif // CIRCUITPY_COPROC
diff --git a/ports/espressif/common-hal/coproc/Coproc.c b/ports/espressif/common-hal/coproc/Coproc.c
deleted file mode 100644
index c2115c1e94..0000000000
--- a/ports/espressif/common-hal/coproc/Coproc.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * 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/coproc/Coproc.h"
-#include "shared-bindings/coproc/CoprocMemory.h"
-
-#include "py/runtime.h"
-
-#if defined(CONFIG_IDF_TARGET_ESP32S2)
-#include "esp32s2/ulp.h"
-#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM)
-#elif defined(CONFIG_IDF_TARGET_ESP32S3)
-#include "esp32s3/ulp.h"
-#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM)
-#endif
-
-#define RTC_SLOW_MEM_END ((uint32_t)RTC_SLOW_MEM + ULP_COPROC_RESERVE_MEM)
-
-void common_hal_coproc_coproc_construct(coproc_coproc_obj_t *self,
-    const uint8_t *buf, const size_t buf_len, coproc_memory_obj_t *coproc_memory) {
-    // set CoprocMemory object
-    if (coproc_memory != NULL) {
-        if (coproc_memory->address < ((uint32_t)RTC_SLOW_MEM + buf_len) ||
-            coproc_memory->address > (RTC_SLOW_MEM_END - coproc_memory->len)) {
-            mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_CoprocMemory);
-        }
-    }
-    self->coproc_memory = coproc_memory;
-
-    // load buffer
-    if (buf_len > ULP_COPROC_RESERVE_MEM) {
-        mp_raise_RuntimeError(translate("Firmware is too big"));
-    }
-    self->buf_len = buf_len;
-    self->buf = (uint8_t *)m_malloc(self->buf_len, false);
-    memcpy(self->buf, buf, self->buf_len);
-}
-
-bool common_hal_coproc_coproc_deinited(coproc_coproc_obj_t *self) {
-    return self->buf == NULL;
-}
-
-void common_hal_coproc_coproc_deinit(coproc_coproc_obj_t *self) {
-    if (common_hal_coproc_coproc_deinited(self)) {
-        return;
-    }
-    m_free(self->buf);
-    self->buf = NULL;
-    self->coproc_memory = NULL;
-}
diff --git a/ports/espressif/common-hal/coproc/__init__.c b/ports/espressif/common-hal/espulp/ULP.c
similarity index 50%
rename from ports/espressif/common-hal/coproc/__init__.c
rename to ports/espressif/common-hal/espulp/ULP.c
index e372bfa235..8f80b5c9ec 100644
--- a/ports/espressif/common-hal/coproc/__init__.c
+++ b/ports/espressif/common-hal/espulp/ULP.c
@@ -24,49 +24,104 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/coproc/__init__.h"
+#include "bindings/espulp/__init__.h"
+#include "bindings/espulp/ULP.h"
 
 #include "py/runtime.h"
 
+#include "shared-bindings/microcontroller/Pin.h"
+
 #if defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "esp32s2/ulp.h"
 #include "esp32s2/ulp_riscv.h"
+#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM)
 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
 #include "esp32s3/ulp.h"
 #include "esp32s3/ulp_riscv.h"
+#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM)
 #endif
 
 // To-do idf v5.0: remove following include
 #include "soc/rtc_cntl_reg.h"
 
-void common_hal_coproc_run(coproc_coproc_obj_t *self) {
+STATIC bool ulp_used = false;
+STATIC uint32_t pins_used = 0;
+
+void espulp_reset(void) {
+    // NOTE: This *doesn't* disable the ULP. It'll keep running even when CircuitPython isn't.
+    ulp_used = false;
+}
+
+void common_hal_espulp_ulp_run(espulp_ulp_obj_t *self, uint32_t *program, size_t length, uint32_t pin_mask) {
+    if (length > ULP_COPROC_RESERVE_MEM) {
+        mp_raise_ValueError(translate("Program too long"));
+    }
     if (GET_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN)) {
         mp_raise_RuntimeError(translate("Already running"));
     }
 
-    ulp_riscv_load_binary(self->buf, self->buf_len);
-    m_free(self->buf);
-    self->buf = (uint8_t *)RTC_SLOW_MEM;
+    if (pin_mask >= (1 << 22)) {
+        mp_raise_ValueError(translate("Pins 21+ not supported from ULP"));
+    }
 
+    for (uint8_t i = 0; i < 32; i++) {
+        if ((pin_mask & (1 << i)) != 0 && !pin_number_is_free(i)) {
+            mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_Pin);
+        }
+    }
+
+    for (uint8_t i = 0; i < 32; i++) {
+        if ((pin_mask & (1 << i)) != 0) {
+            claim_pin_number(i);
+            never_reset_pin_number(i);
+        }
+    }
+    pins_used = pin_mask;
+
+
+    ulp_riscv_load_binary((const uint8_t *)program, length);
+    ulp_set_wakeup_period(0, 20000);
     ulp_riscv_run();
 }
 
-void common_hal_coproc_halt(coproc_coproc_obj_t *self) {
-    self->buf = (uint8_t *)m_malloc(self->buf_len, false);
-    memcpy(self->buf, (uint8_t *)RTC_SLOW_MEM, self->buf_len);
-
+void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
     // To-do idf v5.0: use following functions
     // ulp_riscv_timer_stop();
     // ulp_riscv_halt();
 
-    // stop the ulp timer
+    // stop the ulp timer so that is doesn't restart the cpu
     CLEAR_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
+
     // suspends the ulp operation
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE);
+
     // resets the processor
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
+
+    // Release pins we were using.
+    for (uint8_t i = 0; i < 32; i++) {
+        if ((pins_used & (1 << i)) != 0) {
+            reset_pin_number(i);
+        }
+    }
 }
 
-mp_obj_t common_hal_coproc_memory(coproc_coproc_obj_t *self) {
-    return (self->coproc_memory) ? MP_OBJ_FROM_PTR(self->coproc_memory) : mp_const_none;
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self) {
+    if (ulp_used) {
+        mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_ULP);
+    }
+    self->inited = true;
+}
+
+bool common_hal_espulp_ulp_deinited(espulp_ulp_obj_t *self) {
+    return !self->inited;
+}
+
+void common_hal_espulp_ulp_deinit(espulp_ulp_obj_t *self) {
+    if (common_hal_espulp_ulp_deinited(self)) {
+        return;
+    }
+    common_hal_espulp_ulp_halt(self);
+    self->inited = false;
+    ulp_used = false;
 }
diff --git a/ports/espressif/common-hal/coproc/CoprocMemory.h b/ports/espressif/common-hal/espulp/ULP.h
similarity index 82%
rename from ports/espressif/common-hal/coproc/CoprocMemory.h
rename to ports/espressif/common-hal/espulp/ULP.h
index c4aa088394..f73b21d123 100644
--- a/ports/espressif/common-hal/coproc/CoprocMemory.h
+++ b/ports/espressif/common-hal/espulp/ULP.h
@@ -24,15 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
-#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
+#pragma once
 
 #include "py/obj.h"
 
 typedef struct {
     mp_obj_base_t base;
-    uint32_t address;
-    uint16_t len;
-} coproc_memory_obj_t;
-
-#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_COPROC_COPROCMEMORY_H
+    bool inited;
+} espulp_ulp_obj_t;
diff --git a/ports/espressif/common-hal/espulp/ULPAlarm.c b/ports/espressif/common-hal/espulp/ULPAlarm.c
new file mode 100644
index 0000000000..ec1fb8bc45
--- /dev/null
+++ b/ports/espressif/common-hal/espulp/ULPAlarm.c
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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
+ * 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 "bindings/espulp/ULPAlarm.h"
+
+#include "common-hal/alarm/__init__.h"
+#include "supervisor/port.h"
+
+#include "driver/rtc_cntl.h"
+#include "soc/rtc_cntl_reg.h"
+
+#include "esp_sleep.h"
+
+static volatile bool woke_up = false;
+static bool alarm_set = false;
+
+void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self) {
+
+}
+
+mp_obj_t espulp_ulpalarm_find_triggered_alarm(const 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], &espulp_ulpalarm_type)) {
+            return alarms[i];
+        }
+    }
+    return mp_const_none;
+}
+
+mp_obj_t espulp_ulpalarm_record_wake_alarm(void) {
+    espulp_ulpalarm_obj_t *const alarm = &alarm_wake_alarm.ulp_alarm;
+
+    alarm->base.type = &espulp_ulpalarm_type;
+    return alarm;
+}
+
+// This is used to wake the main CircuitPython task.
+STATIC void ulp_interrupt(void *arg) {
+    (void)arg;
+    woke_up = true;
+    port_wake_main_task_from_isr();
+}
+
+void espulp_ulpalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {
+    espulp_ulpalarm_obj_t *alarm = MP_OBJ_NULL;
+
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (mp_obj_is_type(alarms[i], &espulp_ulpalarm_type)) {
+            if (alarm != MP_OBJ_NULL) {
+                mp_raise_ValueError_varg(translate("Only one %q can be set."), MP_QSTR_ULPAlarm);
+            }
+            alarm = MP_OBJ_TO_PTR(alarms[i]);
+        }
+    }
+
+    if (alarm == MP_OBJ_NULL) {
+        return;
+    }
+
+    // enable ulp interrupt
+    rtc_isr_register(&ulp_interrupt, NULL, RTC_CNTL_COCPU_INT_ST);
+    REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+
+    alarm_set = true;
+}
+
+void espulp_ulpalarm_prepare_for_deep_sleep(void) {
+    if (!alarm_set) {
+        return;
+    }
+    // disable ulp interrupt
+    rtc_isr_deregister(&ulp_interrupt, NULL);
+    REG_CLR_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+
+    // enable ulp wakeup
+    esp_sleep_enable_ulp_wakeup();
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_SLOW_MEM, ESP_PD_OPTION_ON);
+}
+
+bool espulp_ulpalarm_woke_this_cycle(void) {
+    return woke_up;
+}
+
+void espulp_ulpalarm_reset(void) {
+    woke_up = false;
+    alarm_set = false;
+}
diff --git a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h b/ports/espressif/common-hal/espulp/ULPAlarm.h
similarity index 71%
rename from ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
rename to ports/espressif/common-hal/espulp/ULPAlarm.h
index 57a9bcdbff..5d2610c6a3 100644
--- a/ports/espressif/common-hal/alarm/coproc/CoprocAlarm.h
+++ b/ports/espressif/common-hal/espulp/ULPAlarm.h
@@ -29,17 +29,14 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-#include "common-hal/coproc/Coproc.h"
-
 typedef struct {
     mp_obj_base_t base;
-    coproc_coproc_obj_t *coproc;
-} alarm_coproc_coprocalarm_obj_t;
+} espulp_ulpalarm_obj_t;
 
-mp_obj_t alarm_coproc_coprocalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
-mp_obj_t alarm_coproc_coprocalarm_record_wake_alarm(void);
+mp_obj_t espulp_ulpalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
+mp_obj_t espulp_ulpalarm_record_wake_alarm(void);
 
-void alarm_coproc_coprocalarm_prepare_for_deep_sleep(void);
-void alarm_coproc_coprocalarm_reset(void);
-void alarm_coproc_coprocalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
-bool alarm_coproc_coprocalarm_woke_this_cycle(void);
+void espulp_ulpalarm_prepare_for_deep_sleep(void);
+void espulp_ulpalarm_reset(void);
+void espulp_ulpalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms);
+bool espulp_ulpalarm_woke_this_cycle(void);
diff --git a/ports/espressif/common-hal/espulp/__init__.c b/ports/espressif/common-hal/espulp/__init__.c
new file mode 100644
index 0000000000..5d403129a6
--- /dev/null
+++ b/ports/espressif/common-hal/espulp/__init__.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft for Adafruit Industries LLC
+ *
+ * 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 "bindings/espulp/__init__.h"
+
+mp_int_t common_hal_espulp_get_rtc_gpio_number(const mcu_pin_obj_t *pin) {
+    if (pin->number <= 21) {
+        return pin->number;
+    }
+    return -1;
+}
diff --git a/ports/espressif/common-hal/memorymap/AddressRange.c b/ports/espressif/common-hal/memorymap/AddressRange.c
new file mode 100644
index 0000000000..ed46c159bb
--- /dev/null
+++ b/ports/espressif/common-hal/memorymap/AddressRange.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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
+ * 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 
+
+#include "shared-bindings/memorymap/AddressRange.h"
+
+#include "py/runtime.h"
+
+#include "soc/soc.h"
+
+size_t allow_ranges[][2] = {
+    // ULP accessible RAM
+    {SOC_RTC_DATA_LOW, SOC_RTC_DATA_HIGH},
+    // CPU accessible RAM that is preserved during sleep if the RTC power domain is left on.
+    {SOC_RTC_DRAM_LOW, SOC_RTC_DRAM_HIGH},
+    // RTC peripheral registers
+    {0x60008000, 0x60009000}
+
+};
+
+void common_hal_memorymap_addressrange_construct(memorymap_addressrange_obj_t *self, uint8_t *start_address, size_t length) {
+    bool allowed = false;
+    for (size_t i = 0; i < MP_ARRAY_SIZE(allow_ranges); i++) {
+        uint8_t *allowed_start = (uint8_t *)allow_ranges[i][0];
+        uint8_t *allowed_end = (uint8_t *)allow_ranges[i][1];
+        if (allowed_start <= start_address &&
+            (start_address + length) <= allowed_end) {
+            allowed = true;
+            break;
+        }
+    }
+
+    if (!allowed) {
+        mp_raise_ValueError(translate("Address range not allowed"));
+    }
+
+    self->start_address = start_address;
+    self->len = length;
+}
+
+size_t common_hal_memorymap_addressrange_get_length(const memorymap_addressrange_obj_t *self) {
+    return self->len;
+}
+
+bool common_hal_memorymap_addressrange_set_bytes(const memorymap_addressrange_obj_t *self,
+    size_t start_index, uint8_t *values, size_t len) {
+    uint8_t *address = self->start_address + start_index;
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    if (len == 1) {
+        *((uint8_t *)address) = values[0];
+    } else if (len == sizeof(uint16_t) && (((size_t)address) % sizeof(uint16_t)) == 0) {
+        *((uint16_t *)address) = ((uint16_t *)values)[0];
+    } else if (len == sizeof(uint32_t) && (((size_t)address) % sizeof(uint32_t)) == 0) {
+        *((uint32_t *)address) = ((uint32_t *)values)[0];
+    } else if (len == sizeof(uint64_t) && (((size_t)address) % sizeof(uint64_t)) == 0) {
+        *((uint64_t *)address) = ((uint64_t *)values)[0];
+    } else {
+        memcpy(address, values, len);
+    }
+    #pragma GCC diagnostic pop
+
+    return true;
+}
+
+void common_hal_memorymap_addressrange_get_bytes(const memorymap_addressrange_obj_t *self,
+    size_t start_index, size_t len, uint8_t *values) {
+    uint8_t *address = self->start_address + start_index;
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    if (len == 1) {
+        values[0] = *((uint8_t *)address);
+    } else if (len == sizeof(uint16_t) && (((size_t)address) % sizeof(uint16_t)) == 0) {
+        ((uint16_t *)values)[0] = *((uint16_t *)address);
+    } else if (len == sizeof(uint32_t) && (((size_t)address) % sizeof(uint32_t)) == 0) {
+        ((uint32_t *)values)[0] = *((uint32_t *)address);
+    } else if (len == sizeof(uint64_t) && (((size_t)address) % sizeof(uint64_t)) == 0) {
+        ((uint64_t *)values)[0] = *((uint64_t *)address);
+    } else {
+        memcpy(values, address, len);
+    }
+    #pragma GCC diagnostic pop
+}
diff --git a/ports/espressif/common-hal/memorymap/AddressRange.h b/ports/espressif/common-hal/memorymap/AddressRange.h
new file mode 100644
index 0000000000..e67cf32f5f
--- /dev/null
+++ b/ports/espressif/common-hal/memorymap/AddressRange.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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
+ * 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_ESPRESSIF_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t *start_address;
+    size_t len;
+} memorymap_addressrange_obj_t;
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
diff --git a/ports/espressif/common-hal/memorymap/__init__.c b/ports/espressif/common-hal/memorymap/__init__.c
new file mode 100644
index 0000000000..c15b17f451
--- /dev/null
+++ b/ports/espressif/common-hal/memorymap/__init__.c
@@ -0,0 +1 @@
+// No memorymap module functions.
diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
index bacc48c07b..1f09742955 100644
--- a/ports/espressif/common-hal/microcontroller/Processor.c
+++ b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -139,6 +139,7 @@ mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) {
                 case ESP_SLEEP_WAKEUP_EXT0:
                 case ESP_SLEEP_WAKEUP_EXT1:
                 case ESP_SLEEP_WAKEUP_TOUCHPAD:
+                case ESP_SLEEP_WAKEUP_ULP:
                     return RESET_REASON_DEEP_SLEEP_ALARM;
 
                 case ESP_SLEEP_WAKEUP_UNDEFINED:
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 20c6d4a623..8d0f1abce7 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 20c6d4a623a9391afd0e803b2bbebe020ed15ec8
+Subproject commit 8d0f1abce769ad4a212c1bb0337999cacd7ee83d
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f1fa24a59b..c5c73c77bd 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -22,7 +22,6 @@ CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_CANIO ?= 1
-CIRCUITPY_COPROC ?= 1
 CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
 CIRCUITPY_ESP32_CAMERA ?= 1
@@ -44,7 +43,6 @@ CIRCUITPY_WIFI ?= 1
 ifeq ($(IDF_TARGET),esp32)
 # Modules
 CIRCUITPY_BLEIO = 0
-CIRCUITPY_COPROC = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_RGBMATRIX = 0
 # Features
@@ -54,7 +52,6 @@ else ifeq ($(IDF_TARGET),esp32c3)
 # Modules
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_COPROC = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_ESP32_CAMERA = 0
 CIRCUITPY_FREQUENCYIO = 0
@@ -68,10 +65,14 @@ CIRCUITPY_USB = 0
 else ifeq ($(IDF_TARGET),esp32s2)
 # Modules
 CIRCUITPY_BLEIO = 0
+CIRCUITPY_ESPULP = 1
+CIRCUITPY_MEMORYMAP = 1
 
 else ifeq ($(IDF_TARGET),esp32s3)
 # Modules
 CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_ESPULP = 1
+CIRCUITPY_MEMORYMAP = 1
 endif
 
 # No room for dualbank on boards with 2MB flash
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index baeba5ce90..6dd09ed238 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -30,12 +30,14 @@
 #include "supervisor/board.h"
 #include "supervisor/port.h"
 #include "supervisor/filesystem.h"
+#include "supervisor/shared/reload.h"
 #include "py/runtime.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
 #include "bindings/espidf/__init__.h"
+#include "bindings/espulp/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/busio/I2C.h"
@@ -367,6 +369,10 @@ void reset_port(void) {
     dualbank_reset();
     #endif
 
+    #if CIRCUITPY_ESPULP
+    espulp_reset();
+    #endif
+
     #if CIRCUITPY_FREQUENCYIO
     peripherals_timer_reset();
     #endif
@@ -511,7 +517,7 @@ void port_interrupt_after_ticks(uint32_t ticks) {
 // On the ESP we use FreeRTOS notifications instead of interrupts so this is a
 // bit of a misnomer.
 void port_idle_until_interrupt(void) {
-    if (!background_callback_pending()) {
+    if (!background_callback_pending() && !autoreload_pending()) {
         xTaskNotifyWait(0x01, 0x01, NULL, portMAX_DELAY);
     }
 }
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 22ea67d05e..be33d80a99 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -167,9 +167,6 @@ endif
 ifeq ($(CIRCUITPY_CANIO),1)
 SRC_PATTERNS += canio/%
 endif
-ifeq ($(CIRCUITPY_COPROC),1)
-SRC_PATTERNS += coproc/%
-endif
 ifeq ($(CIRCUITPY_COUNTIO),1)
 SRC_PATTERNS += countio/%
 endif
@@ -227,6 +224,9 @@ endif
 ifeq ($(CIRCUITPY_MATH),1)
 SRC_PATTERNS += math/%
 endif
+ifeq ($(CIRCUITPY_MEMORYMAP),1)
+SRC_PATTERNS += memorymap/%
+endif
 ifeq ($(CIRCUITPY_MEMORYMONITOR),1)
 SRC_PATTERNS += memorymonitor/%
 endif
@@ -400,7 +400,6 @@ SRC_COMMON_HAL_ALL = \
 	alarm/pin/PinAlarm.c \
 	alarm/time/TimeAlarm.c \
 	alarm/touch/TouchAlarm.c \
-	alarm/coproc/CoprocAlarm.c \
 	analogbufio/BufferedIn.c \
 	analogbufio/__init__.c \
 	analogio/AnalogIn.c \
@@ -423,9 +422,6 @@ SRC_COMMON_HAL_ALL = \
 	canio/CAN.c \
 	canio/Listener.c \
 	canio/__init__.c \
-	coproc/__init__.c \
-	coproc/Coproc.c \
-	coproc/CoprocMemory.c \
 	countio/Counter.c \
 	countio/__init__.c \
 	digitalio/DigitalInOut.c \
@@ -443,9 +439,11 @@ SRC_COMMON_HAL_ALL = \
 	hashlib/Hash.c \
 	i2ctarget/I2CTarget.c \
 	i2ctarget/__init__.c \
+	memorymap/__init__.c \
+	memorymap/AddressRange.c \
+	microcontroller/__init__.c \
 	microcontroller/Pin.c \
 	microcontroller/Processor.c \
-	microcontroller/__init__.c \
 	mdns/__init__.c \
 	mdns/Server.c \
 	mdns/RemoteService.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index f0e145998b..01b078c6e8 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -221,12 +221,15 @@ CFLAGS += -DCIRCUITPY_OS_GETENV=$(CIRCUITPY_OS_GETENV)
 CIRCUITPY_ERRNO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 
-# CIRCUITPY_ESPIDF is handled in the espressif tree.
+# CIRCUITPY_ESPIDF and CIRCUITPY_ESPULP is handled in the espressif tree.
 # Only for ESP32S chips.
 # Assume not a ESP build.
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
+CIRCUITPY_ESPULP ?= 0
+CFLAGS += -DCIRCUITPY_ESPULP=$(CIRCUITPY_ESPULP)
+
 CIRCUITPY_ESP32_CAMERA ?= 0
 CFLAGS += -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)
 
@@ -283,6 +286,9 @@ CFLAGS += -DCIRCUITPY_KEYPAD=$(CIRCUITPY_KEYPAD)
 CIRCUITPY_MATH ?= 1
 CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
 
+CIRCUITPY_MEMORYMAP ?= 0
+CFLAGS += -DCIRCUITPY_MEMORYMAP=$(CIRCUITPY_MEMORYMAP)
+
 CIRCUITPY_MEMORYMONITOR ?= 0
 CFLAGS += -DCIRCUITPY_MEMORYMONITOR=$(CIRCUITPY_MEMORYMONITOR)
 
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index bd11b16996..48dccff8df 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -27,12 +27,15 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
+#if CIRCUITPY_ESPULP
+#include "bindings/espulp/ULPAlarm.h"
+#endif
+
 #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/alarm/coproc/CoprocAlarm.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/supervisor/Runtime.h"
 #include "shared-bindings/time/__init__.h"
@@ -77,8 +80,10 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
     for (size_t i = 0; i < n_args; i++) {
         if (mp_obj_is_type(objs[i], &alarm_pin_pinalarm_type) ||
             mp_obj_is_type(objs[i], &alarm_time_timealarm_type) ||
-            mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type) ||
-            mp_obj_is_type(objs[i], &alarm_coproc_coprocalarm_type)) {
+            #if CIRCUITPY_ESPULP
+            mp_obj_is_type(objs[i], &espulp_ulpalarm_type) ||
+            #endif
+            mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type)) {
             continue;
         }
         mp_raise_TypeError_varg(translate("Expected an %q"), MP_QSTR_Alarm);
@@ -256,18 +261,6 @@ STATIC const mp_obj_module_t alarm_touch_module = {
     .globals = (mp_obj_dict_t *)&alarm_touch_globals,
 };
 
-STATIC const mp_map_elem_t alarm_coproc_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_coproc) },
-    { MP_ROM_QSTR(MP_QSTR_CoprocAlarm), MP_OBJ_FROM_PTR(&alarm_coproc_coprocalarm_type) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(alarm_coproc_globals, alarm_coproc_globals_table);
-
-STATIC const mp_obj_module_t alarm_coproc_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&alarm_coproc_globals,
-};
-
 // The module table is mutable because .wake_alarm is a mutable attribute.
 STATIC mp_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
@@ -282,7 +275,6 @@ STATIC mp_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pin), MP_OBJ_FROM_PTR(&alarm_pin_module) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_OBJ_FROM_PTR(&alarm_time_module) },
     { MP_ROM_QSTR(MP_QSTR_touch), MP_OBJ_FROM_PTR(&alarm_touch_module) },
-    { MP_ROM_QSTR(MP_QSTR_coproc), MP_OBJ_FROM_PTR(&alarm_coproc_module) },
 
     { MP_ROM_QSTR(MP_QSTR_SleepMemory),   MP_OBJ_FROM_PTR(&alarm_sleep_memory_type) },
     { MP_ROM_QSTR(MP_QSTR_sleep_memory),  MP_OBJ_FROM_PTR(&alarm_sleep_memory_obj) },
diff --git a/shared-bindings/alarm/coproc/CoprocAlarm.c b/shared-bindings/alarm/coproc/CoprocAlarm.c
deleted file mode 100644
index 0b60282c2f..0000000000
--- a/shared-bindings/alarm/coproc/CoprocAlarm.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * 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"
-
-#if CIRCUITPY_COPROC
-#include "shared-bindings/util.h"
-#include "shared-bindings/alarm/coproc/CoprocAlarm.h"
-#include "shared-bindings/coproc/Coproc.h"
-
-STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
-    if (!mp_obj_is_type(*self_in, &coproc_coproc_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_Coproc);
-    }
-    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(*self_in);
-    if (common_hal_coproc_coproc_deinited(self)) {
-        raise_deinited_error();
-    }
-    return self;
-}
-#endif
-
-//| class CoprocAlarm:
-//|     """Trigger an alarm when another core or co-processor requests wake-up."""
-//|
-//|     def __init__(self, coproc: coproc.Coproc) -> None:
-//|         """Create an alarm that will be triggered when the co-processor requests wake-up.
-//|
-//|         The alarm is not active until it is passed to an `alarm`-enabling function, such as
-//|         `alarm.light_sleep_until_alarms()` or `alarm.exit_and_deep_sleep_until_alarms()`.
-//|
-//|         :param coproc.Coproc coproc: The coproc program to run.
-//|
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t alarm_coproc_coprocalarm_make_new(const mp_obj_type_t *type,
-    size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_coproc };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_coproc, MP_ARG_REQUIRED | MP_ARG_OBJ },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    #if CIRCUITPY_COPROC
-    // initialize CoprocAlarm object
-    alarm_coproc_coprocalarm_obj_t *self = m_new_obj(alarm_coproc_coprocalarm_obj_t);
-    self->base.type = &alarm_coproc_coprocalarm_type;
-    self->coproc = get_coproc_obj(&args[ARG_coproc].u_obj);
-    // return CoprocAlarm object
-    return MP_OBJ_FROM_PTR(self);
-    #else
-    mp_raise_NotImplementedError(NULL);
-    return mp_const_none;
-    #endif
-}
-
-const mp_obj_type_t alarm_coproc_coprocalarm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_CoprocAlarm,
-    .make_new = alarm_coproc_coprocalarm_make_new,
-};
diff --git a/shared-bindings/coproc/Coproc.c b/shared-bindings/coproc/Coproc.c
deleted file mode 100644
index 85595578c8..0000000000
--- a/shared-bindings/coproc/Coproc.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * 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/runtime/context_manager_helpers.h"
-#include "py/objproperty.h"
-#include "py/runtime.h"
-
-#include "shared-bindings/coproc/Coproc.h"
-#include "shared-bindings/coproc/CoprocMemory.h"
-
-STATIC coproc_memory_obj_t *get_coproc_memory_obj(mp_obj_t *self_in) {
-    if (!mp_obj_is_type(*self_in, &coproc_memory_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_CoprocMemory);
-    }
-    return MP_OBJ_TO_PTR(*self_in);
-}
-
-//| class Coproc:
-//|     def __init__(self, buffer: ReadableBuffer, memory: CoprocMemory) -> None:
-//|         """Loads the program binary into memory.
-//|
-//|         :param buffer: The program binary to run on the core/co-processor
-//|         :param memory: The `CoprocMemory` object used to access shared memory"""
-STATIC mp_obj_t coproc_coproc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_buffer, ARG_memory };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_memory, MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    coproc_coproc_obj_t *self = m_new_obj(coproc_coproc_obj_t);
-    self->base.type = &coproc_coproc_type;
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
-
-    coproc_memory_obj_t *coproc_memory = (args[ARG_memory].u_obj == mp_const_none) ? NULL : get_coproc_memory_obj(&args[ARG_memory].u_obj);
-
-    common_hal_coproc_coproc_construct(self, bufinfo.buf, bufinfo.len, coproc_memory);
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-//|     def deinit(self) -> None:
-//|         """Releases control of the underlying hardware so other classes can use it."""
-//|         ...
-STATIC mp_obj_t coproc_coproc_obj_deinit(mp_obj_t self_in) {
-    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_coproc_coproc_deinit(self);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(coproc_coproc_deinit_obj, coproc_coproc_obj_deinit);
-
-//|     def __enter__(self) -> Coproc:
-//|         """No-op used in Context Managers."""
-//|         ...
-//  Provided by context manager helper.
-
-//|     def __exit__(self) -> None:
-//|         """Close the request."""
-//|         ...
-//|
-STATIC mp_obj_t coproc_coproc_obj___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    mp_check_self(mp_obj_is_type(args[0], &coproc_coproc_type));
-    return coproc_coproc_obj_deinit(args[0]);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(coproc_coproc___exit___obj, 4, 4, coproc_coproc_obj___exit__);
-
-STATIC const mp_rom_map_elem_t coproc_coproc_locals_dict_table[] = {
-    // context managers
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&coproc_coproc___exit___obj) },
-
-    // functions
-    { MP_ROM_QSTR(MP_QSTR_deinit),  MP_ROM_PTR(&coproc_coproc_deinit_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(coproc_coproc_locals_dict, coproc_coproc_locals_dict_table);
-
-const mp_obj_type_t coproc_coproc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Coproc,
-    .make_new = coproc_coproc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&coproc_coproc_locals_dict,
-};
diff --git a/shared-bindings/coproc/CoprocMemory.h b/shared-bindings/coproc/CoprocMemory.h
deleted file mode 100644
index fdbb2fa0fa..0000000000
--- a/shared-bindings/coproc/CoprocMemory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * 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_COPROC_COPROCMEMORY_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROCMEMORY_H
-
-#include "common-hal/coproc/CoprocMemory.h"
-
-extern const mp_obj_type_t coproc_memory_type;
-
-uint32_t common_hal_coproc_memory_get_length(coproc_memory_obj_t *self);
-
-bool common_hal_coproc_memory_set_bytes(coproc_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len);
-void common_hal_coproc_memory_get_bytes(coproc_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len);
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_COPROC_COPROCMEMORY_H
diff --git a/shared-bindings/coproc/__init__.c b/shared-bindings/coproc/__init__.c
deleted file mode 100644
index 06b196d8be..0000000000
--- a/shared-bindings/coproc/__init__.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 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
- * 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/util.h"
-#include "shared-bindings/coproc/__init__.h"
-#include "shared-bindings/coproc/Coproc.h"
-#include "shared-bindings/coproc/CoprocMemory.h"
-
-#include "py/runtime.h"
-
-//| """COPROC Module
-//|
-//| The `coproc` module adds ability to load and run
-//| programs on a co-processor or a different cpu core.
-//|
-//| .. code-block:: python
-//|
-//|     import coproc
-//|
-//|     shared_mem = coproc.CoprocMemory(address=0x500007fc, length=1024)
-//|
-//|     with open("program.bin", "rb") as f:
-//|         program = coproc.Coproc(buffer=f.read(), memory=shared_mem)
-//|
-//|     coproc.run(program)
-//|     print(coproc.memory(program)[0])
-//|     # coproc.halt(program)
-//| """
-//| ...
-//|
-
-STATIC coproc_coproc_obj_t *get_coproc_obj(mp_obj_t *self_in) {
-    if (!mp_obj_is_type(*self_in, &coproc_coproc_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_Coproc);
-    }
-    coproc_coproc_obj_t *self = MP_OBJ_TO_PTR(*self_in);
-    if (common_hal_coproc_coproc_deinited(self)) {
-        raise_deinited_error();
-    }
-    return self;
-}
-
-//| def run(*coproc: Coproc) -> None:
-//|     """Runs the loaded program."""
-//|     ...
-//|
-STATIC mp_obj_t coproc_run(mp_obj_t self_in) {
-    common_hal_coproc_run(get_coproc_obj(&self_in));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_run_obj, coproc_run);
-
-//| def halt(*coproc: Coproc) -> None:
-//|     """Halts the loaded program."""
-//|     ...
-//|
-STATIC mp_obj_t coproc_halt(mp_obj_t self_in) {
-    common_hal_coproc_halt(get_coproc_obj(&self_in));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_halt_obj, coproc_halt);
-
-//| def memory(*coproc: Coproc) -> CoprocMemory:
-//|     """Returns the shared memory as a bytearray."""
-//|     ...
-//|
-STATIC mp_obj_t coproc_memory(mp_obj_t self_in) {
-    return common_hal_coproc_memory(get_coproc_obj(&self_in));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(coproc_memory_obj, coproc_memory);
-
-STATIC const mp_rom_map_elem_t coproc_module_globals_table[] = {
-    // module name
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_coproc) },
-
-    // module functions
-    { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&coproc_run_obj) },
-    { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&coproc_halt_obj) },
-    { MP_ROM_QSTR(MP_QSTR_memory), MP_ROM_PTR(&coproc_memory_obj) },
-
-    // module classes
-    { MP_ROM_QSTR(MP_QSTR_Coproc), MP_OBJ_FROM_PTR(&coproc_coproc_type) },
-    { MP_ROM_QSTR(MP_QSTR_CoprocMemory), MP_OBJ_FROM_PTR(&coproc_memory_type) },
-};
-STATIC MP_DEFINE_CONST_DICT(coproc_module_globals, coproc_module_globals_table);
-
-const mp_obj_module_t coproc_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&coproc_module_globals,
-};
-
-MP_REGISTER_MODULE(MP_QSTR_coproc, coproc_module, CIRCUITPY_COPROC);
diff --git a/shared-bindings/coproc/CoprocMemory.c b/shared-bindings/memorymap/AddressRange.c
similarity index 59%
rename from shared-bindings/coproc/CoprocMemory.c
rename to shared-bindings/memorymap/AddressRange.c
index 0d49a2f008..511400d0af 100644
--- a/shared-bindings/coproc/CoprocMemory.c
+++ b/shared-bindings/memorymap/AddressRange.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 microDev
+ * 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
@@ -28,45 +28,62 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "py/runtime0.h"
-
-#include "shared-bindings/coproc/CoprocMemory.h"
+#include "shared-bindings/memorymap/AddressRange.h"
 #include "supervisor/shared/translate/translate.h"
 
-//| class CoprocMemory:
-//|     def __init__(self, address: int, length: int) -> None:
-//|         """Initialize coproc shared memory.
+//| class AddressRange:
+//|     r"""Presents a range of addresses as a bytearray.
 //|
-//|         :param address: address of shared memory
-//|         :param length: length of shared memory"""
-STATIC mp_obj_t coproc_memory_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_address, ARG_length };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_length, MP_ARG_REQUIRED | MP_ARG_INT },
-    };
+//|     The addresses may access memory or memory mapped peripherals.
+//|
+//|     Some address ranges may be protected by CircuitPython to prevent errors.
+//|     An exception will be raised when constructing an AddressRange for an
+//|     invalid or protected address.
+//|
+//|     Multiple AddressRanges may overlap. There is no "claiming" of addresses.
+//|
+//|     Example usage on ESP32-S2::
+//|
+//|        import memorymap
+//|        rtc_slow_mem = memorymap.AddressRange(start=0x50000000, length=0x2000)
+//|        rtc_slow_mem[0:3] = b"\xcc\x10\x00"
+//|     """
 
+//|     def __init__(self, *, start, length) -> None:
+//|         """Constructs an address range starting at ``start`` and ending at
+//|         ``start + length``. An exception will be raised if any of the
+//|         addresses are invalid or protected."""
+//|         ...
+STATIC mp_obj_t memorymap_addressrange_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_start, ARG_length };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_length, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+    };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    coproc_memory_obj_t *self = m_new_obj(coproc_memory_obj_t);
-    self->base.type = &coproc_memory_type;
-    self->address = args[ARG_address].u_int;
-    self->len = args[ARG_length].u_int;
+    size_t start =
+        mp_arg_validate_int_min(args[ARG_start].u_int, 0, MP_QSTR_start);
+    size_t length =
+        mp_arg_validate_int_min(args[ARG_length].u_int, 1, MP_QSTR_length);
+
+
+    memorymap_addressrange_obj_t *self = m_new_obj(memorymap_addressrange_obj_t);
+    self->base.type = &memorymap_addressrange_type;
+
+    common_hal_memorymap_addressrange_construct(self, (uint8_t *)start, length);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|     def __bool__(self) -> bool:
-//|         """``coproc_memory`` is ``True`` if its length is greater than zero.
-//|         This is an easy way to check for its existence.
-//|         """
-//|         ...
+//|     def __bool__(self) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Return the length. This is used by (`len`)"""
 //|         ...
-STATIC mp_obj_t coproc_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    coproc_memory_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint16_t len = common_hal_coproc_memory_get_length(self);
+STATIC mp_obj_t memorymap_addressrange_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    memorymap_addressrange_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint16_t len = common_hal_memorymap_addressrange_get_length(self);
     switch (op) {
         case MP_UNARY_OP_BOOL:
             return mp_obj_new_bool(len != 0);
@@ -77,36 +94,42 @@ STATIC mp_obj_t coproc_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_rom_map_elem_t coproc_memory_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t memorymap_addressrange_locals_dict_table[] = {
 };
 
-STATIC MP_DEFINE_CONST_DICT(coproc_memory_locals_dict, coproc_memory_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addressrange_locals_dict_table);
 
 //|     @overload
 //|     def __getitem__(self, index: slice) -> bytearray: ...
 //|     @overload
 //|     def __getitem__(self, index: int) -> int:
-//|         """Returns the value at the given index."""
+//|         """Returns the value(s) at the given index.
+//|
+//|         1, 2, 4 and 8 byte reads will be done in one assignment. All others
+//|         will use memcpy."""
 //|         ...
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
 //|     def __setitem__(self, index: int, value: int) -> None:
-//|         """Set the value at the given index."""
+//|         """Set the value(s) at the given index.
+//|
+//|         1, 2, 4 and 8 byte writes will be done in one assignment. All others
+//|         will use memcpy."""
 //|         ...
 //|
-STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
+STATIC mp_obj_t memorymap_addressrange_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         // slice deletion
         return MP_OBJ_NULL; // op not supported
     } else {
-        coproc_memory_obj_t *self = MP_OBJ_TO_PTR(self_in);
+        memorymap_addressrange_obj_t *self = MP_OBJ_TO_PTR(self_in);
         if (0) {
         #if MICROPY_PY_BUILTINS_SLICE
         } else if (mp_obj_is_type(index_in, &mp_type_slice)) {
             mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(common_hal_coproc_memory_get_length(self), index_in, &slice)) {
+            if (!mp_seq_get_fast_slice_indexes(common_hal_memorymap_addressrange_get_length(self), index_in, &slice)) {
                 mp_raise_NotImplementedError(translate("only slices with step=1 (aka None) are supported"));
             }
             if (value != MP_OBJ_SENTINEL) {
@@ -132,8 +155,8 @@ STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
                     mp_raise_NotImplementedError(translate("array/bytes required on right side"));
                 }
 
-                if (!common_hal_coproc_memory_set_bytes(self, slice.start, src_items, src_len)) {
-                    mp_raise_RuntimeError(translate("Unable to write"));
+                if (!common_hal_memorymap_addressrange_set_bytes(self, slice.start, src_items, src_len)) {
+                    mp_raise_RuntimeError(translate("Unable to write to address."));
                 }
                 return mp_const_none;
                 #else
@@ -143,18 +166,18 @@ STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
                 // Read slice.
                 size_t len = slice.stop - slice.start;
                 uint8_t *items = m_new(uint8_t, len);
-                common_hal_coproc_memory_get_bytes(self, slice.start, items, len);
+                common_hal_memorymap_addressrange_get_bytes(self, slice.start, len, items);
                 return mp_obj_new_bytearray_by_ref(len, items);
             }
         #endif
         } else {
             // Single index rather than slice.
-            size_t index = mp_get_index(self->base.type, common_hal_coproc_memory_get_length(self),
+            size_t index = mp_get_index(self->base.type, common_hal_memorymap_addressrange_get_length(self),
                 index_in, false);
             if (value == MP_OBJ_SENTINEL) {
                 // load
                 uint8_t value_out;
-                common_hal_coproc_memory_get_bytes(self, index, &value_out, 1);
+                common_hal_memorymap_addressrange_get_bytes(self, index, 1, &value_out);
                 return MP_OBJ_NEW_SMALL_INT(value_out);
             } else {
                 // store
@@ -162,8 +185,8 @@ STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
                 mp_arg_validate_int_range(byte_value, 0, 255, MP_QSTR_bytes);
 
                 uint8_t short_value = byte_value;
-                if (!common_hal_coproc_memory_set_bytes(self, index, &short_value, 1)) {
-                    mp_raise_RuntimeError(translate("Unable to write"));
+                if (!common_hal_memorymap_addressrange_set_bytes(self, index, &short_value, 1)) {
+                    mp_raise_RuntimeError(translate("Unable to write to address."));
                 }
                 return mp_const_none;
             }
@@ -171,14 +194,14 @@ STATIC mp_obj_t coproc_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
     }
 }
 
-const mp_obj_type_t coproc_memory_type = {
+const mp_obj_type_t memorymap_addressrange_type = {
     { &mp_type_type },
-    .name = MP_QSTR_CoprocMemory,
     .flags = MP_TYPE_FLAG_EXTENDED,
-    .make_new = coproc_memory_make_new,
-    .locals_dict = (mp_obj_t)&coproc_memory_locals_dict,
+    .name = MP_QSTR_AddressRange,
+    .make_new = memorymap_addressrange_make_new,
+    .locals_dict = (mp_obj_t)&memorymap_addressrange_locals_dict,
     MP_TYPE_EXTENDED_FIELDS(
-        .subscr = coproc_memory_subscr,
-        .unary_op = coproc_memory_unary_op,
+        .subscr = memorymap_addressrange_subscr,
+        .unary_op = memorymap_addressrange_unary_op,
         ),
 };
diff --git a/ports/espressif/common-hal/coproc/CoprocMemory.c b/shared-bindings/memorymap/AddressRange.h
similarity index 53%
rename from ports/espressif/common-hal/coproc/CoprocMemory.c
rename to shared-bindings/memorymap/AddressRange.h
index ca9a82dbcf..74a214d949 100644
--- a/ports/espressif/common-hal/coproc/CoprocMemory.c
+++ b/shared-bindings/memorymap/AddressRange.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 microDev
+ * 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,29 +24,23 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/coproc/CoprocMemory.h"
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_MEMORYMAP_ADDRESSRANGE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_MEMORYMAP_ADDRESSRANGE_H
 
-uint32_t common_hal_coproc_memory_get_length(coproc_memory_obj_t *self) {
-    return self->len;
-}
+#include "common-hal/memorymap/AddressRange.h"
 
-bool common_hal_coproc_memory_set_bytes(coproc_memory_obj_t *self,
-    uint32_t start_index, const uint8_t *values, uint32_t len) {
+extern const mp_obj_type_t memorymap_addressrange_type;
 
-    if (start_index + len > self->len) {
-        return false;
-    }
+void common_hal_memorymap_addressrange_construct(memorymap_addressrange_obj_t *self, uint8_t *start_address, size_t length);
 
-    memcpy((uint8_t *)(self->address + start_index), values, len);
-    return true;
-}
+uint32_t common_hal_memorymap_addressrange_get_length(const memorymap_addressrange_obj_t *self);
 
-void common_hal_coproc_memory_get_bytes(coproc_memory_obj_t *self,
-    uint32_t start_index, uint8_t *values, uint32_t len) {
+bool common_hal_memorymap_addressrange_set_bytes(const memorymap_addressrange_obj_t *self,
+    uint32_t start_index, uint8_t *values, uint32_t len);
 
-    if (start_index + len > self->len) {
-        return;
-    }
+// len and values are intentionally swapped to signify values is an output and
+// also leverage the compiler to validate uses are expected.
+void common_hal_memorymap_addressrange_get_bytes(const memorymap_addressrange_obj_t *self,
+    uint32_t start_index, uint32_t len, uint8_t *values);
 
-    memcpy(values, (uint8_t *)(self->address + start_index), len);
-}
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_MEMORYMAP_ADDRESSRANGE_H
diff --git a/shared-bindings/memorymap/__init__.c b/shared-bindings/memorymap/__init__.c
new file mode 100644
index 0000000000..576c7f1e1d
--- /dev/null
+++ b/shared-bindings/memorymap/__init__.c
@@ -0,0 +1,52 @@
+/*
+ * 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 "py/obj.h"
+#include "py/mphal.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/memorymap/__init__.h"
+#include "shared-bindings/memorymap/AddressRange.h"
+
+//| """Raw memory map access
+//|
+//| The `memorymap` module allows you to read and write memory addresses in the
+//| address space seen from the processor running CircuitPython. It is usually
+//| the physical address space.
+//| """
+STATIC const mp_rom_map_elem_t memorymap_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_memorymap) },
+    { MP_ROM_QSTR(MP_QSTR_AddressRange),   MP_ROM_PTR(&memorymap_addressrange_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(memorymap_module_globals, memorymap_module_globals_table);
+
+const mp_obj_module_t memorymap_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&memorymap_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_memorymap, memorymap_module, CIRCUITPY_MEMORYMAP);
diff --git a/shared-bindings/memorymap/__init__.h b/shared-bindings/memorymap/__init__.h
new file mode 100644
index 0000000000..f4e6c51481
--- /dev/null
+++ b/shared-bindings/memorymap/__init__.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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 SHARED_BINDINGS_MEMORYMAP_H
+#define SHARED_BINDINGS_MEMORYMAP_H
+
+#endif  // SHARED_BINDINGS_MEMORYMAP_H
diff --git a/supervisor/shared/reload.c b/supervisor/shared/reload.c
index e1ae2e6764..4e351704f8 100644
--- a/supervisor/shared/reload.c
+++ b/supervisor/shared/reload.c
@@ -28,6 +28,7 @@
 
 #include "py/mphal.h"
 #include "py/mpstate.h"
+#include "supervisor/port.h"
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/tick.h"
 
@@ -52,6 +53,7 @@ void reload_initiate(supervisor_run_reason_t run_reason) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
     }
     #endif
+    port_wake_main_task();
 }
 
 void autoreload_reset() {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 35d5c46a94..c34c3b3c9f 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -246,6 +246,15 @@ void supervisor_web_workflow_status(void) {
 void supervisor_start_web_workflow(void) {
     #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_OS_GETENV
 
+    // Skip starting the workflow if we're not starting from power on or reset.
+    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
+    if (reset_reason != RESET_REASON_POWER_ON &&
+        reset_reason != RESET_REASON_RESET_PIN &&
+        reset_reason != RESET_REASON_UNKNOWN &&
+        reset_reason != RESET_REASON_SOFTWARE) {
+        return;
+    }
+
     char ssid[33];
     char password[64];
 

From 674f0402a9c8f1acc01b4bab397bf119a57a5583 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 19 Dec 2022 15:30:03 -0500
Subject: [PATCH 1586/2403] Fix ESP32 builds

---
 ports/espressif/common-hal/alarm/__init__.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/espressif/common-hal/alarm/__init__.h b/ports/espressif/common-hal/alarm/__init__.h
index e0086ee61a..65cbf96c87 100644
--- a/ports/espressif/common-hal/alarm/__init__.h
+++ b/ports/espressif/common-hal/alarm/__init__.h
@@ -36,7 +36,9 @@
 #endif
 
 typedef union {
+#if CIRCUITPY_ESPULP
     espulp_ulpalarm_obj_t ulp_alarm;
+#endif
     alarm_pin_pinalarm_obj_t pin_alarm;
     alarm_time_timealarm_obj_t time_alarm;
     alarm_touch_touchalarm_obj_t touch_alarm;

From 0498b1d2ae79b44fca529a1a276c376110faaaf7 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 19 Dec 2022 15:51:34 -0500
Subject: [PATCH 1587/2403] Fix indent

---
 ports/espressif/common-hal/alarm/__init__.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/common-hal/alarm/__init__.h b/ports/espressif/common-hal/alarm/__init__.h
index 65cbf96c87..02e27e9806 100644
--- a/ports/espressif/common-hal/alarm/__init__.h
+++ b/ports/espressif/common-hal/alarm/__init__.h
@@ -36,9 +36,9 @@
 #endif
 
 typedef union {
-#if CIRCUITPY_ESPULP
+    #if CIRCUITPY_ESPULP
     espulp_ulpalarm_obj_t ulp_alarm;
-#endif
+    #endif
     alarm_pin_pinalarm_obj_t pin_alarm;
     alarm_time_timealarm_obj_t time_alarm;
     alarm_touch_touchalarm_obj_t touch_alarm;

From b36d603cf3ed1a93459fd6da053da98f2a116293 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Mon, 19 Dec 2022 22:11:30 +0100
Subject: [PATCH 1588/2403] add GP25 as status LED on the Raspberry Pi Pico

---
 ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
index 4714241999..548af930ba 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.h
@@ -1,5 +1,7 @@
 #define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
+#define MICROPY_HW_LED_STATUS (&pin_GPIO25)
+
 #define CIRCUITPY_BOARD_I2C         (1)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}}

From aa63fae0ae56a18e68aa692cc77a9ecdd891f74b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 20 Dec 2022 07:27:26 -0600
Subject: [PATCH 1589/2403] fix ports/unix builds besides coverage

---
 ports/unix/modos.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index deea3bfc91..6bed69c43a 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -56,6 +56,10 @@
 #endif
 #endif
 
+#if defined(MICROPY_UNIX_COVERAGE)
+mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
+#endif
+
 STATIC mp_obj_t mod_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
@@ -193,12 +197,13 @@ STATIC mp_obj_t mod_os_system(mp_obj_t cmd_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_os_system_obj, mod_os_system);
 
-mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
 STATIC mp_obj_t mod_os_getenv(mp_obj_t var_in) {
+    #if defined(MICROPY_UNIX_COVERAGE)
     mp_obj_t result = common_hal_os_getenv(mp_obj_str_get_str(var_in), mp_const_none);
     if (result != mp_const_none) {
         return result;
     }
+    #endif
     const char *s = getenv(mp_obj_str_get_str(var_in));
     if (s == NULL) {
         return mp_const_none;

From c16b42e9725e576da441b2a9734b0029cdadbdd8 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 20 Dec 2022 11:00:13 -0500
Subject: [PATCH 1590/2403] Tweak arg checking and comments

---
 ports/espressif/bindings/espulp/ULP.c    | 11 +++++++++--
 ports/espressif/common-hal/espulp/ULP.c  |  7 +++++--
 shared-bindings/memorymap/AddressRange.c |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c
index 6cd719277b..15af22dca8 100644
--- a/ports/espressif/bindings/espulp/ULP.c
+++ b/ports/espressif/bindings/espulp/ULP.c
@@ -56,7 +56,7 @@ STATIC espulp_ulp_obj_t *get_ulp_obj(mp_obj_t self_in) {
 }
 
 //|     def deinit(self) -> None:
-//|         """Deinitialises the camera and releases all memory resources for reuse."""
+//|         """Deinitialises the ULP and releases it for another program."""
 //|         ...
 STATIC mp_obj_t espulp_ulp_deinit(mp_obj_t self_in) {
     espulp_ulp_obj_t *self = get_ulp_obj(self_in);
@@ -104,12 +104,19 @@ STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     mp_obj_t pins_in = args[ARG_pins].u_obj;
     const size_t num_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(pins_in));
+
+    // The ULP only supports 21 pins on the ESP32-S2 and S3. So we can store it
+    // as a bitmask in a 32 bit number. The common-hal code does further checks.
     uint32_t pin_mask = 0;
 
     for (mp_uint_t i = 0; i < num_pins; i++) {
         mp_obj_t pin_obj = mp_obj_subscr(pins_in, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
         validate_obj_is_free_pin(pin_obj);
-        pin_mask |= 1 << ((const mcu_pin_obj_t *)pin_obj)->number;
+        const mcu_pin_obj_t *pin = ((const mcu_pin_obj_t *)pin_obj);
+        if (pin->number >= 32) {
+            raise_ValueError_invalid_pin();
+        }
+        pin_mask |= 1 << pin->number;
     }
 
     common_hal_espulp_ulp_run(self, bufinfo.buf, bufinfo.len, pin_mask);
diff --git a/ports/espressif/common-hal/espulp/ULP.c b/ports/espressif/common-hal/espulp/ULP.c
index 8f80b5c9ec..4d30a94dfc 100644
--- a/ports/espressif/common-hal/espulp/ULP.c
+++ b/ports/espressif/common-hal/espulp/ULP.c
@@ -61,7 +61,7 @@ void common_hal_espulp_ulp_run(espulp_ulp_obj_t *self, uint32_t *program, size_t
     }
 
     if (pin_mask >= (1 << 22)) {
-        mp_raise_ValueError(translate("Pins 21+ not supported from ULP"));
+        raise_ValueError_invalid_pin();
     }
 
     for (uint8_t i = 0; i < 32; i++) {
@@ -89,7 +89,7 @@ void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
     // ulp_riscv_timer_stop();
     // ulp_riscv_halt();
 
-    // stop the ulp timer so that is doesn't restart the cpu
+    // stop the ulp timer so that it doesn't restart the cpu
     CLEAR_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
 
     // suspends the ulp operation
@@ -107,6 +107,9 @@ void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
 }
 
 void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self) {
+    // Use a static variable to track ULP in use so that subsequent code runs can
+    // use a running ULP. This is only to prevent multiple portions of user code
+    // from using the ULP concurrently.
     if (ulp_used) {
         mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_ULP);
     }
diff --git a/shared-bindings/memorymap/AddressRange.c b/shared-bindings/memorymap/AddressRange.c
index 511400d0af..fb55c07efe 100644
--- a/shared-bindings/memorymap/AddressRange.c
+++ b/shared-bindings/memorymap/AddressRange.c
@@ -105,8 +105,8 @@ STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addres
 //|     def __getitem__(self, index: int) -> int:
 //|         """Returns the value(s) at the given index.
 //|
-//|         1, 2, 4 and 8 byte reads will be done in one assignment. All others
-//|         will use memcpy."""
+//|         1, 2, 4 and 8 byte aligned reads will be done in one transaction.
+//|         All others may use multiple transactions."""
 //|         ...
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
@@ -114,8 +114,8 @@ STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addres
 //|     def __setitem__(self, index: int, value: int) -> None:
 //|         """Set the value(s) at the given index.
 //|
-//|         1, 2, 4 and 8 byte writes will be done in one assignment. All others
-//|         will use memcpy."""
+//|         1, 2, 4 and 8 byte aligned writes will be done in one transaction.
+//|         All others may use multiple transactions."""
 //|         ...
 //|
 STATIC mp_obj_t memorymap_addressrange_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {

From 826116879bcbdf03fb2df8ef86b9502ba77166fc Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 21 Dec 2022 02:43:15 +0100
Subject: [PATCH 1591/2403] 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             | 42 +++++++++++++++++++++++------------
 locale/cs.po             | 42 +++++++++++++++++++++++------------
 locale/de_DE.po          | 47 +++++++++++++++++++++++++++-------------
 locale/el.po             | 42 +++++++++++++++++++++++------------
 locale/en_GB.po          | 42 +++++++++++++++++++++++------------
 locale/es.po             | 42 +++++++++++++++++++++++------------
 locale/fil.po            | 42 +++++++++++++++++++++++------------
 locale/fr.po             | 47 +++++++++++++++++++++++++++-------------
 locale/hi.po             | 42 +++++++++++++++++++++++------------
 locale/it_IT.po          | 42 +++++++++++++++++++++++------------
 locale/ja.po             | 42 +++++++++++++++++++++++------------
 locale/ko.po             | 42 +++++++++++++++++++++++------------
 locale/nl.po             | 42 +++++++++++++++++++++++------------
 locale/pl.po             | 42 +++++++++++++++++++++++------------
 locale/pt_BR.po          | 47 +++++++++++++++++++++++++++-------------
 locale/ru.po             | 42 +++++++++++++++++++++++------------
 locale/sv.po             | 47 +++++++++++++++++++++++++++-------------
 locale/tr.po             | 42 +++++++++++++++++++++++------------
 locale/zh_Latn_pinyin.po | 47 +++++++++++++++++++++++++++-------------
 19 files changed, 552 insertions(+), 271 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 6551a3253f..3aaca9e203 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -106,6 +106,7 @@ msgstr "%q berisi pin duplikat"
 msgid "%q failure: %d"
 msgstr "%q gagal: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -186,7 +187,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -399,6 +399,10 @@ msgstr "ADC2 sedang digunakan oleh WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Alamat harus sepanjang %d byte"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -479,7 +483,7 @@ msgstr "Sudah disebarkan."
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -503,7 +507,7 @@ msgstr "Send yang lain sudah aktif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array harus mengandung halfwords (ketik 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Nilai array harus berupa byte tunggal."
@@ -927,10 +931,10 @@ msgstr "Error pada regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Diharapkan %q"
@@ -1033,7 +1037,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1648,11 +1651,14 @@ msgstr ""
 "Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
 "didukung: %d bpp diberikan"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1773,6 +1779,10 @@ msgstr ""
 "ideal. Jika ini tidak dapat dihindari, berikan allow_inefficient=True ke "
 "konstruktor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pin harus berurutan"
@@ -1819,6 +1829,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull tidak digunakan saat arah output."
@@ -1965,7 +1979,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Potongan dan nilai panjangnya berbeda."
@@ -2239,8 +2253,8 @@ msgstr "Tidak dapat membaca data palet warna"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2498,7 +2512,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "diperlukan array/byte di sisi kanan"
 
@@ -3757,7 +3771,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 7e550d8140..5010b8b862 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -107,6 +107,7 @@ msgstr "%q obsahuje duplicitní piny"
 msgid "%q failure: %d"
 msgstr "%q: selhání %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -187,7 +188,6 @@ msgstr "%q je mimo hranice"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -400,6 +400,10 @@ msgstr "WiFi používá ADC2"
 msgid "Address must be %d bytes long"
 msgstr "Adresa musí být %d bajtů dlouhá"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Všechny CAN periferie jsou používány"
@@ -480,7 +484,7 @@ msgstr "Již propagujeme."
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -504,7 +508,7 @@ msgstr "Další odesílání je již aktivní"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Pole musí obsahovat poloviční slova (typ „H“)"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Hodnoty pole by měly být jednoduché bajty."
@@ -925,10 +929,10 @@ msgstr "Chyba v regulárním výrazu"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Očekává se %q"
@@ -1031,7 +1035,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1644,11 +1647,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1764,6 +1770,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1810,6 +1820,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1954,7 +1968,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2228,8 +2242,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2485,7 +2499,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3743,7 +3757,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f587d384a1..3f1d800592 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -108,6 +108,7 @@ msgstr "%q enthält doppelte Pins"
 msgid "%q failure: %d"
 msgstr "%q Fehler: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -189,7 +190,6 @@ msgstr "%q außerhalb der Grenzen"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -403,6 +403,10 @@ msgstr "ADC2 wird vom WiFi benutzt"
 msgid "Address must be %d bytes long"
 msgstr "Die Adresse muss %d Bytes lang sein"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-Schnittstellen sind in Benutzung"
@@ -483,7 +487,7 @@ msgstr "Bereits am Anbieten (advertising)."
 msgid "Already have all-matches listener"
 msgstr "All-Matchers-Listener bereits vorhanden"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -507,7 +511,7 @@ msgstr "Ein anderer Sendevorgang ist schon aktiv"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array muss Halbwörter enthalten (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array-Werte sollten aus Einzelbytes bestehen."
@@ -933,10 +937,10 @@ msgstr "Fehler in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Bind Fehler"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Erwartet ein(e) %q"
@@ -1040,7 +1044,6 @@ msgstr "Die Firmware ist doppelt vorhanden"
 msgid "Firmware is invalid"
 msgstr "Die Firmware ist ungültig"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Die Firmware ist zu groß"
@@ -1665,11 +1668,14 @@ msgstr ""
 "Nur monochrome, indizierte 4bpp oder 8bpp, und 16bpp oder größere BMPs "
 "unterstützt: %d bpp wurden gegeben"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr "Nur ein %q kann im Deep-Sleep gesetzt werden."
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1788,6 +1794,10 @@ msgstr ""
 "Bytes verbraucht. Wenn dies nicht vermieden werden kann, übergib "
 "allow_inefficient=True an den Konstruktor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pins müssen geordnet sein"
@@ -1835,6 +1845,10 @@ msgstr "Programm macht OUT ohne Laden von OSR"
 msgid "Program size invalid"
 msgstr "Programm-Größe ist ungültig"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull wird nicht verwendet, wenn die Richtung output ist."
@@ -1979,7 +1993,7 @@ msgstr "Größe nicht unterstützt"
 msgid "Sleep Memory not available"
 msgstr "Sleep-Speicher nicht verfügbar"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice und Wert (value) haben unterschiedliche Längen."
@@ -2267,9 +2281,9 @@ msgstr "Konnte Farbpalettendaten nicht lesen"
 msgid "Unable to start mDNS query"
 msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
-msgstr "Schreiben nicht möglich"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
+msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2540,7 +2554,7 @@ msgid "array has too many dimensions"
 msgstr "Das Array hat zu viele Dimensionen"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "Array/Bytes auf der rechten Seite erforderlich"
 
@@ -3822,7 +3836,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "nur eine sample_rate=16000 wird unterstützt"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
@@ -4424,6 +4438,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Unable to write"
+#~ msgstr "Schreiben nicht möglich"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q Länge muss >= 1 sein"
 
diff --git a/locale/el.po b/locale/el.po
index 7b4e3f2001..e022e3a90e 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -112,6 +112,7 @@ msgstr "%q περιέχει διπλότυπα pins"
 msgid "%q failure: %d"
 msgstr "%q αποτυχία: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,7 +193,6 @@ msgstr "%q εκτός ορίων"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -406,6 +406,10 @@ msgstr "Το ADC2 χρησιμοποιείται απο το WIFI"
 msgid "Address must be %d bytes long"
 msgstr "Η διεύθυνση πρέπει να είναι %d bytes μεγάλη"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Όλα τα περιφεριακά CAN είναι σε χρήση"
@@ -486,7 +490,7 @@ msgstr "Ήδη διαφημίζουμε."
 msgid "Already have all-matches listener"
 msgstr "Ύπάρχει ήδη all-matches ακροατής"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -510,7 +514,7 @@ msgstr "Άλλη αποστολή είναι ήδη ενεργή"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "H παράταξη πρέπει να περιέχει halfwords (τύπου 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Η τιμές της παράταξη πρέπει να είναι μονά bytes."
@@ -939,10 +943,10 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1045,7 +1049,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1653,11 +1656,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1773,6 +1779,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1819,6 +1829,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1963,7 +1977,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2237,8 +2251,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2494,7 +2508,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3752,7 +3766,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8c97dbb7e2..0f166288bf 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -110,6 +110,7 @@ msgstr "%q contains duplicate pins"
 msgid "%q failure: %d"
 msgstr "%q failure: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -190,7 +191,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -403,6 +403,10 @@ msgstr "ADC2 is being used by WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Address must be %d bytes long"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "All CAN peripherals are in use"
@@ -483,7 +487,7 @@ msgstr "Already advertising."
 msgid "Already have all-matches listener"
 msgstr "Already have all-matches listener"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -507,7 +511,7 @@ msgstr "Another send is already active"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array must contain halfwords (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array values should be single bytes."
@@ -928,10 +932,10 @@ msgstr "Error in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Failure to bind"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Expected a %q"
@@ -1034,7 +1038,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1648,11 +1651,14 @@ msgstr ""
 "Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
 "%d bpp given"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1772,6 +1778,10 @@ msgstr ""
 "bytes.  If this cannot be avoided, pass allow_inefficient=True to the "
 "constructor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pins must be sequential"
@@ -1816,6 +1826,10 @@ msgstr "Program does OUT without loading OSR"
 msgid "Program size invalid"
 msgstr "Program size invalid"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull not used when direction is output."
@@ -1960,7 +1974,7 @@ msgstr "Size not supported"
 msgid "Sleep Memory not available"
 msgstr "Sleep Memory not available"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice and value different lengths."
@@ -2241,8 +2255,8 @@ msgstr "Unable to read colour palette data"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2501,7 +2515,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes required on right side"
 
@@ -3762,7 +3776,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "only sample_rate=16000 is supported"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "only slices with step=1 (aka None) are supported"
diff --git a/locale/es.po b/locale/es.po
index 01f73ffd86..dd420bbd2e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -112,6 +112,7 @@ msgstr "%q contiene pines duplicados"
 msgid "%q failure: %d"
 msgstr "%q fallo: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,7 +193,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -405,6 +405,10 @@ msgstr "ADC2 está siendo usado por WiFi"
 msgid "Address must be %d bytes long"
 msgstr "La dirección debe tener %d bytes de largo"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Todos los periféricos CAN están en uso"
@@ -487,7 +491,7 @@ msgstr "Ya se encuentra publicando."
 msgid "Already have all-matches listener"
 msgstr "Ya se tiene un escucha de todas las coincidencias"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -511,7 +515,7 @@ msgstr "Otro envío ya está activo"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "El array debe contener medias palabras (escriba 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Valores del array deben ser bytes individuales."
@@ -938,10 +942,10 @@ msgstr "Error en regex"
 msgid "Error: Failure to bind"
 msgstr "Error: fallo al vincular"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Se espera un %q"
@@ -1044,7 +1048,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1672,11 +1675,14 @@ msgstr ""
 "Solo se admiten BMP monocromáticos, indexados de 4 bpp u 8 bpp y 16 bpp o "
 "más: %d bpp proporcionados"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1797,6 +1803,10 @@ msgstr ""
 "ideales. Si esto no se puede evitar, pase allow_inefficient=True al "
 "constructor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Los pines deben estar en orden secuencial"
@@ -1844,6 +1854,10 @@ msgstr "El programa hace OUT sin cargar OSR"
 msgid "Program size invalid"
 msgstr "El tamaño del programa no es correcto"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull no se usa cuando la dirección es output."
@@ -1989,7 +2003,7 @@ msgstr "Sin capacidades para el tamaño"
 msgid "Sleep Memory not available"
 msgstr "Memoria de sueño no disponible"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice y value tienen tamaños diferentes."
@@ -2273,8 +2287,8 @@ msgstr "No se pudo leer los datos de la paleta de colores"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2537,7 +2551,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes requeridos en el lado derecho"
 
@@ -3809,7 +3823,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "solo se admite sample_rate=16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "solo se admiten segmentos con step=1 (alias None)"
diff --git a/locale/fil.po b/locale/fil.po
index a4255383bd..7844d12562 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -101,6 +101,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -181,7 +182,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -395,6 +395,10 @@ msgstr ""
 msgid "Address must be %d bytes long"
 msgstr "ang palette ay dapat 32 bytes ang haba"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -476,7 +480,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -500,7 +504,7 @@ msgstr "Isa pang send ay aktibo na"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "May halfwords (type 'H') dapat ang array"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array values ay dapat single bytes."
@@ -924,10 +928,10 @@ msgstr "May pagkakamali sa REGEX"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Umasa ng %q"
@@ -1030,7 +1034,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1643,11 +1646,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1764,6 +1770,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1808,6 +1818,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull hindi ginagamit kapag ang direksyon ay output."
@@ -1953,7 +1967,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice at value iba't ibang haba."
@@ -2227,8 +2241,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2486,7 +2500,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes kinakailangan sa kanang bahagi"
 
@@ -3761,7 +3775,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "ang mga slices lamang na may hakbang = 1 (aka None) ang sinusuportahan"
diff --git a/locale/fr.po b/locale/fr.po
index 1b31a9dcce..0f0afce8ff 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -112,6 +112,7 @@ msgstr "%q contient des broches en double"
 msgid "%q failure: %d"
 msgstr "Échec de %q : %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,7 +193,6 @@ msgstr "%q est hors limites"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -405,6 +405,10 @@ msgstr "ADC2 est utilisé pars le Wifi"
 msgid "Address must be %d bytes long"
 msgstr "L'adresse doit être longue de %d octets"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Tous les périphériques CAN sont utilisés"
@@ -485,7 +489,7 @@ msgstr "S'annonce déjà."
 msgid "Already have all-matches listener"
 msgstr "Il y a déjà un auditeur all-matches"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -509,7 +513,7 @@ msgstr "Un autre envoi est déjà actif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "La matrice doit contenir des demi-mots (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Les valeurs de la matrice doivent être des octets singuliers."
@@ -948,10 +952,10 @@ msgstr "Erreur dans l'expression régulière"
 msgid "Error: Failure to bind"
 msgstr "Erreur : Impossible de lier"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Attendu un %q"
@@ -1055,7 +1059,6 @@ msgstr "Le logiciel est identique"
 msgid "Firmware is invalid"
 msgstr "Logiciel invalide"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Logiciel trop volumineux"
@@ -1692,11 +1695,14 @@ msgstr ""
 "Seulement les BMP monochromes, 4 bpp ou 8 bpp, ou 16 bpp et plus sont "
 "supportés: %d bpp fournis"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr "Une seul %q autorisée en sommeil profond."
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1817,6 +1823,10 @@ msgstr ""
 "octets idéal. Si cela ne peut pas être évité, transmettez allow_inefficient "
 "= True au constructeur"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Les broches doivent être séquentielles"
@@ -1865,6 +1875,10 @@ msgstr "Le programme fait des sorties sans charger d'OSR"
 msgid "Program size invalid"
 msgstr "Taille du programme invalide"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'."
@@ -2009,7 +2023,7 @@ msgstr "Taille n'est pas supportée"
 msgid "Sleep Memory not available"
 msgstr "La mémoire de sommeil n'est pas disponible"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Tranche et valeur de tailles différentes."
@@ -2298,9 +2312,9 @@ msgstr "Impossible de lire les données de la palette de couleurs"
 msgid "Unable to start mDNS query"
 msgstr "Impossible de lancer la requête mDNS"
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
-msgstr "Écriture impossible"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
+msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2569,7 +2583,7 @@ msgid "array has too many dimensions"
 msgstr "la tableau à trop de dimensions"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "matrice/octets requis à la droite"
 
@@ -3852,7 +3866,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "seul sample_rate = 16000 est pris en charge"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "seules les tranches avec 'step=1' (cad None) sont supportées"
@@ -4452,6 +4466,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 "Unable to write"
+#~ msgstr "Écriture impossible"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "La longueur de %q doit être >= 1"
 
diff --git a/locale/hi.po b/locale/hi.po
index 3b7e9f26d4..7243d82e75 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -100,6 +100,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -180,7 +181,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -393,6 +393,10 @@ msgstr ""
 msgid "Address must be %d bytes long"
 msgstr ""
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -473,7 +477,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -497,7 +501,7 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
@@ -914,10 +918,10 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr ""
@@ -1020,7 +1024,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1628,11 +1631,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1748,6 +1754,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1792,6 +1802,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1936,7 +1950,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2210,8 +2224,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2467,7 +2481,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3725,7 +3739,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index d21b120e58..401a9b9848 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -107,6 +107,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fallito: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -187,7 +188,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -401,6 +401,10 @@ msgstr "ADC2 sta usando il WiFi"
 msgid "Address must be %d bytes long"
 msgstr "L'indirizzo deve essere lungo %d byte"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Tutte le periferiche CAN sono in uso"
@@ -482,7 +486,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr "Già in possesso di tutti i listener abbinati"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -506,7 +510,7 @@ msgstr "Another send è gia activato"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array deve avere mezzoparole (typo 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "I valori dell'Array dovrebbero essere bytes singoli."
@@ -929,10 +933,10 @@ msgstr "Errore nella regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Atteso un %q"
@@ -1035,7 +1039,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1650,11 +1653,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1773,6 +1779,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1818,6 +1828,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1963,7 +1977,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2237,8 +2251,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2496,7 +2510,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3772,7 +3786,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "solo slice con step=1 (aka None) sono supportate"
diff --git a/locale/ja.po b/locale/ja.po
index 124bb762af..0c099d26c3 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -105,6 +105,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q 失敗: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -185,7 +186,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -398,6 +398,10 @@ msgstr ""
 msgid "Address must be %d bytes long"
 msgstr "アドレスは、%dバイト長でなければなりません"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "全てのCAN周辺機器が使用中"
@@ -478,7 +482,7 @@ msgstr "すでにアドバータイズ中"
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -502,7 +506,7 @@ msgstr "他のsendがすでにアクティブ"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "array のタイプは16ビット ('H') でなければなりません"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Arrayの各値は1バイトでなければなりません"
@@ -923,10 +927,10 @@ msgstr "正規表現にエラーがあります"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%qが必要"
@@ -1029,7 +1033,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1641,11 +1644,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1761,6 +1767,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1805,6 +1815,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "方向がoutputのときpullは使われません"
@@ -1949,7 +1963,7 @@ msgstr "サイズは対応していません"
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "スライスと値の長さが一致しません"
@@ -2224,8 +2238,8 @@ msgstr "カラーパレットデータを読み込めません"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2481,7 +2495,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "右辺にはarray/bytesが必要"
 
@@ -3744,7 +3758,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index fda78fbd95..83832d31ef 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -101,6 +101,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -181,7 +182,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -394,6 +394,10 @@ msgstr ""
 msgid "Address must be %d bytes long"
 msgstr ""
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -474,7 +478,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -498,7 +502,7 @@ msgstr ""
 msgid "Array must contain halfwords (type 'H')"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr ""
@@ -917,10 +921,10 @@ msgstr "Regex에 오류가 있습니다."
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%q 이 예상되었습니다."
@@ -1023,7 +1027,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1631,11 +1634,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1751,6 +1757,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1795,6 +1805,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1939,7 +1953,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2214,8 +2228,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2471,7 +2485,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3729,7 +3743,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 2bdb6e8a4c..f639bcec2a 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -103,6 +103,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fout: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -183,7 +184,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -396,6 +396,10 @@ msgstr "ADC2 wordt gebruikt door WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Adres moet %d bytes lang zijn"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Alle CAN-peripherals zijn in gebruik"
@@ -476,7 +480,7 @@ msgstr "Advertising is al bezig."
 msgid "Already have all-matches listener"
 msgstr "Heeft al een luisteraar voor 'all-matches'"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -500,7 +504,7 @@ msgstr "Een andere send is al actief"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array moet halfwords (type 'H') bevatten"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Array waardes moet enkele bytes zijn."
@@ -922,10 +926,10 @@ msgstr "Fout in regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Verwacht een %q"
@@ -1028,7 +1032,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1645,11 +1648,14 @@ msgstr ""
 "Alleen monochrome en 4bpp of 8bpp, en 16bpp of grotere geïndiceerde BMP's "
 "zijn ondersteund: %d bpp is gegeven"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1770,6 +1776,10 @@ msgstr ""
 "gebruikt. Als dit niet kan worden vermeden, geef dan het argument "
 "allow_inefficient=True aan de constructor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1816,6 +1826,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull niet gebruikt wanneer de richting output is."
@@ -1960,7 +1974,7 @@ msgstr "Afmeting niet ondersteund"
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice en waarde hebben verschillende lengtes."
@@ -2234,8 +2248,8 @@ msgstr "Niet in staat kleurenpalet data te lezen"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2497,7 +2511,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes vereist aan de rechterkant"
 
@@ -3762,7 +3776,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "alleen sample_rate=16000 wordt ondersteund"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "alleen segmenten met step=1 (ook wel None) worden ondersteund"
diff --git a/locale/pl.po b/locale/pl.po
index b399da6db1..39853c1ddf 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -105,6 +105,7 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q niepowodzenie: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -185,7 +186,6 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -398,6 +398,10 @@ msgstr "ADC2 jest używany przez WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Adres musi mieć %d bajtów"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr ""
@@ -478,7 +482,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -502,7 +506,7 @@ msgstr "Wysyłanie jest już w toku"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Tablica musi zawierać pół-słowa (typ 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Wartości powinny być bajtami."
@@ -923,10 +927,10 @@ msgstr "Błąd w regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Oczekiwano %q"
@@ -1029,7 +1033,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr ""
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr ""
@@ -1639,11 +1642,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1759,6 +1765,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1803,6 +1813,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Podciągnięcie nieużywane w trybie wyjścia."
@@ -1947,7 +1961,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Fragment i wartość są różnych długości."
@@ -2221,8 +2235,8 @@ msgstr "Nie można odczytać danych palety"
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2478,7 +2492,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "tablica/bytes wymagane po prawej stronie"
 
@@ -3737,7 +3751,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "obsługiwane jest tylko sample_rate=16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "tylko fragmenty ze step=1 (lub None) są wspierane"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c0e64fd9dc..4a95e608d4 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -109,6 +109,7 @@ msgstr "%q contém pinos duplicados"
 msgid "%q failure: %d"
 msgstr "%q falha: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -189,7 +190,6 @@ msgstr "%q fora dos limites"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -406,6 +406,10 @@ msgstr "O ADC2 está sendo usado pelo WiFi"
 msgid "Address must be %d bytes long"
 msgstr "O endereço deve ter %d bytes de comprimento"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Todos os periféricos CAN estão em uso"
@@ -486,7 +490,7 @@ msgstr "Já está anunciando."
 msgid "Already have all-matches listener"
 msgstr "Já há um ouvinte com todas as correspondências"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -510,7 +514,7 @@ msgstr "Outro envio já está ativo"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Array deve conter meias palavras (tipo 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Os valores das matrizes devem ser bytes simples."
@@ -941,10 +945,10 @@ msgstr "Erro no regex"
 msgid "Error: Failure to bind"
 msgstr "Erro: Falha na vinculação"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Esperado um"
@@ -1047,7 +1051,6 @@ msgstr "O firmware está duplicado"
 msgid "Firmware is invalid"
 msgstr "O firmware é inválido"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "O firmware é muito grande"
@@ -1674,11 +1677,14 @@ msgstr ""
 "São compatíveis apenas os BMPs monocromáticos, indexados em 4bpp ou 8bpp e "
 "16bpp ou superior: determinado %d bpp"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr "Apenas um %q pode ser colocado em hibernação profunda."
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1799,6 +1805,10 @@ msgstr ""
 "ideal. Caso isso não possa ser evitado, passe allow_inefficient=True ao "
 "construtor"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Os pinos devem ser sequenciais"
@@ -1848,6 +1858,10 @@ msgstr "O programa faz OUT sem carregar o OSR"
 msgid "Program size invalid"
 msgstr "O tamanho do programa é inválido"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "O Pull não foi usado quando a direção for gerada."
@@ -1992,7 +2006,7 @@ msgstr "O tamanho não é suportado"
 msgid "Sleep Memory not available"
 msgstr "Sleep memory não está disponível"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Fatie e avalie os diferentes comprimentos."
@@ -2280,9 +2294,9 @@ msgstr "Não foi possível ler os dados da paleta de cores"
 msgid "Unable to start mDNS query"
 msgstr "Não é possível iniciar a consulta mDNS"
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
-msgstr "Não é possível escrever"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
+msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2550,7 +2564,7 @@ msgid "array has too many dimensions"
 msgstr "a matriz possui muitas dimensões"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "matriz/bytes são necessários no lado direito"
 
@@ -3825,7 +3839,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "apenas sample_rate = 16000 é compatível"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
@@ -4427,6 +4441,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 "Unable to write"
+#~ msgstr "Não é possível escrever"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "o comprimento %q deve ser >=1"
 
diff --git a/locale/ru.po b/locale/ru.po
index 014adb5f94..ef8dc019b4 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -111,6 +111,7 @@ msgstr "%q содержит пины-дупликаты"
 msgid "%q failure: %d"
 msgstr "%q сбой: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -191,7 +192,6 @@ msgstr "%q за пределом"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -404,6 +404,10 @@ msgstr "ADC2 используется WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Адрес должен быть длиной %d байт"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Все периферийные устройства CAN уже используются"
@@ -484,7 +488,7 @@ msgstr "Уже объявляемся (advertising)."
 msgid "Already have all-matches listener"
 msgstr "Уже есть универсальный слушатель"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -508,7 +512,7 @@ msgstr "Другая передача уже активна"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Массив должен содержать полуслова (тип 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Значения массива должны быть однобайтовыми."
@@ -945,10 +949,10 @@ msgstr "Ошибка в регулярном выражении(regex)"
 msgid "Error: Failure to bind"
 msgstr "Ошибка: Сбой привязки"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Ожидалось(ся) %q"
@@ -1054,7 +1058,6 @@ msgstr "Прошивка является дубликатом"
 msgid "Firmware is invalid"
 msgstr "Прошивка является неправильной"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Прошивка слишком большая"
@@ -1689,11 +1692,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1812,6 +1818,10 @@ msgstr ""
 "%d байт.   Если этого нельзя избежать, передайте allow_inefficient=True в "
 "конструктор"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Пины должны быть последовательными"
@@ -1858,6 +1868,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -2002,7 +2016,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2278,8 +2292,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2535,7 +2549,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3793,7 +3807,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 85d9845b78..74cd6978c7 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -108,6 +108,7 @@ msgstr "%q innehåller dubblettstift"
 msgid "%q failure: %d"
 msgstr "%q-fel: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -190,7 +191,6 @@ msgstr "%q är utanför gränserna"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -403,6 +403,10 @@ msgstr "ADC2 används av WiFi"
 msgid "Address must be %d bytes long"
 msgstr "Adressen måste vara %d byte lång"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "All I2C-kringutrustning används"
@@ -483,7 +487,7 @@ msgstr "Annonserar redan."
 msgid "Already have all-matches listener"
 msgstr "Har redan lyssnare för all-matchningar"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -507,7 +511,7 @@ msgstr "En annan send är redan aktiv"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Matrisen måste innehålla halfwords (typ \"H\")"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Matrisvärden ska bestå av enstaka bytes."
@@ -931,10 +935,10 @@ msgstr "Fel i regex"
 msgid "Error: Failure to bind"
 msgstr "Fel: Bind misslyckades"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Förväntade %q"
@@ -1037,7 +1041,6 @@ msgstr "Firmware är en dubblett"
 msgid "Firmware is invalid"
 msgstr "Firmware är ogiltig"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Firmware är för stor"
@@ -1657,11 +1660,14 @@ msgstr ""
 "Endast monokrom, indexerad 4 bpp eller 8 bpp och 16 bpp eller högre BMP: er "
 "stöds: %d bpp angiven"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr "Endast en %q kan sättas i djup sömn."
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1782,6 +1788,10 @@ msgstr ""
 "%d byte.  Om detta inte kan undvikas, skicka allow_inefficient=True till "
 "konstruktorn"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pinnarna måste vara i sekvens"
@@ -1828,6 +1838,10 @@ msgstr "Program gör OUT utan att läsa in OSR"
 msgid "Program size invalid"
 msgstr "Programstorlek ogiltig"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Pull används inte när riktningen är output."
@@ -1972,7 +1986,7 @@ msgstr "Storleken stöds inte"
 msgid "Sleep Memory not available"
 msgstr "Sömnminne inte tillgängligt"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Slice och värde har olika längd."
@@ -2256,9 +2270,9 @@ msgstr "Det går inte att läsa färgpalettdata"
 msgid "Unable to start mDNS query"
 msgstr "Det gick inte att starta mDNS-frågan"
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
-msgstr "Kan inte skriva"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
+msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2523,7 +2537,7 @@ msgid "array has too many dimensions"
 msgstr "array har för många dimensioner"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "array/bytes krävs på höger sida"
 
@@ -3791,7 +3805,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "enbart sample_rate=16000 stöds"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "endast segment med steg=1 (aka Ingen) stöds"
@@ -4389,6 +4403,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 "Unable to write"
+#~ msgstr "Kan inte skriva"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "längden på %q måste vara >= 1"
 
diff --git a/locale/tr.po b/locale/tr.po
index b5685d0878..bafd72bd7e 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -112,6 +112,7 @@ msgstr "%q yinelenen pinler içeriyor"
 msgid "%q failure: %d"
 msgstr "%q hata: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,7 +193,6 @@ msgstr "%q sınırların dışında"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -406,6 +406,10 @@ msgstr "ADC2, WiFi tarafından kullanılmaktadır"
 msgid "Address must be %d bytes long"
 msgstr "Adres %d byte uzunluğunda olmalıdır"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "Tüm CAN çevre birimleri kullanımda"
@@ -486,7 +490,7 @@ msgstr "Halihazırda duyuruluyor."
 msgid "Already have all-matches listener"
 msgstr "Tüm eşleşmelerle eşleşen dinleyiciniz var"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -510,7 +514,7 @@ msgstr "Başka bir gönderme zaten aktif"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Dizi yarımsözcüklere sahip olmalıdır (tip 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "Dizi değerleri tekil bytelar olmalıdır."
@@ -930,10 +934,10 @@ msgstr "regex'te hata"
 msgid "Error: Failure to bind"
 msgstr "Hata: Bağlanamadı"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "%q bekleniyor"
@@ -1036,7 +1040,6 @@ msgstr ""
 msgid "Firmware is invalid"
 msgstr "Yazılım geçersiz"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "Yazılım çok büyük"
@@ -1651,11 +1654,14 @@ msgid ""
 "%d bpp given"
 msgstr ""
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1771,6 +1777,10 @@ msgid ""
 "constructor"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
@@ -1818,6 +1828,10 @@ msgstr ""
 msgid "Program size invalid"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr ""
@@ -1962,7 +1976,7 @@ msgstr ""
 msgid "Sleep Memory not available"
 msgstr ""
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr ""
@@ -2236,8 +2250,8 @@ msgstr ""
 msgid "Unable to start mDNS query"
 msgstr ""
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
 msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
@@ -2493,7 +2507,7 @@ msgid "array has too many dimensions"
 msgstr ""
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr ""
 
@@ -3751,7 +3765,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr ""
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 89f1c00379..b89f9cd9b5 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -111,6 +111,7 @@ msgstr "%q bāo hán chóng fù de yǐn jiǎo"
 msgid "%q failure: %d"
 msgstr "%q Shībài: %d"
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,7 +193,6 @@ msgstr "%q chāo chū jiè xiàn"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
@@ -405,6 +405,10 @@ msgstr "ADC2 zhèngzài bèi WiFi shǐ yòng"
 msgid "Address must be %d bytes long"
 msgstr "dìzhǐ chángdù bìxū shì %d zìjié"
 
+#: ports/espressif/common-hal/memorymap/AddressRange.c
+msgid "Address range not allowed"
+msgstr ""
+
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
 msgstr "suǒyǒu CAN wàishè dōu zài shǐyòng zhōng"
@@ -485,7 +489,7 @@ msgstr "Mùqián zhèngzài guǎngbō."
 msgid "Already have all-matches listener"
 msgstr "yǐjīng yǒu all-matches jiāntīng qì"
 
-#: ports/espressif/common-hal/coproc/__init__.c
+#: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
@@ -509,7 +513,7 @@ msgstr "Lìng yīgè fāsòng (send) yǐjīng zài gōngzuò"
 msgid "Array must contain halfwords (type 'H')"
 msgstr "Shùzǔ bìxū bāohán halfwords (type 'H')"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Array values should be single bytes."
 msgstr "shùzǔ de zhí yīnggāi shì dān'gè zìjié."
@@ -932,10 +936,10 @@ msgstr "Zhèngzé biǎodá shì cuòwù"
 msgid "Error: Failure to bind"
 msgstr "cuò wù: bǎng dìng shī bài"
 
-#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/alarm/coproc/CoprocAlarm.c
-#: shared-bindings/busio/SPI.c shared-bindings/coproc/Coproc.c
-#: shared-bindings/coproc/__init__.c shared-bindings/microcontroller/Pin.c
+#: ports/espressif/bindings/espulp/ULP.c py/enum.c
+#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
+#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 msgid "Expected a %q"
 msgstr "Yù qí %q"
@@ -1038,7 +1042,6 @@ msgstr "gù jiàn chóng fù"
 msgid "Firmware is invalid"
 msgstr "gù jiàn wú xiào"
 
-#: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
 msgstr "gù jiàn tài dà"
@@ -1663,11 +1666,14 @@ msgstr ""
 "Jǐn zhīchí dān sè, suǒyǐn wéi 4bpp huò 8bpp yǐjí 16bpp huò gèng gāo de BMP: "
 "Gěi chū %d bpp"
 
-#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr "zài shēn dù shuì mián zhōng zhǐ néng shè zhì yí gè %q."
 
+#: ports/espressif/common-hal/espulp/ULPAlarm.c
+msgid "Only one %q can be set."
+msgstr ""
+
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
@@ -1786,6 +1792,10 @@ msgstr ""
 "duōzì jié. Rúguǒ wúfǎ bìmiǎn, qǐng jiāng allow_inefficient = True chuándì "
 "gěigòuzào hánshù"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Pins 21+ not supported from ULP"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "yǐn jiǎo bì xū shì lián xù de"
@@ -1832,6 +1842,10 @@ msgstr "chéng xù zài bù jiā zǎi Osr de qíng kuàng xià zhí xíng OUT"
 msgid "Program size invalid"
 msgstr "chéng xù dà xiǎo wú xiào"
 
+#: ports/espressif/common-hal/espulp/ULP.c
+msgid "Program too long"
+msgstr ""
+
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
 msgstr "Fāngxiàng shūchū shí Pull méiyǒu shǐyòng."
@@ -1976,7 +1990,7 @@ msgstr "bù zhī chí dà xiǎo"
 msgid "Sleep Memory not available"
 msgstr "shuì mián jì yì bù kě yòng"
 
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "Slice and value different lengths."
 msgstr "Qiēpiàn hé zhí bùtóng chángdù."
@@ -2261,9 +2275,9 @@ msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
 msgid "Unable to start mDNS query"
 msgstr "wú fǎ qǐ dòng mDNS chá xún"
 
-#: shared-bindings/coproc/CoprocMemory.c
-msgid "Unable to write"
-msgstr "wú fǎ xiě rù"
+#: shared-bindings/memorymap/AddressRange.c
+msgid "Unable to write to address."
+msgstr ""
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2528,7 +2542,7 @@ msgid "array has too many dimensions"
 msgstr "shùzǔ yǒu tài duō wéidù"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
-#: shared-bindings/coproc/CoprocMemory.c shared-bindings/nvm/ByteArray.c
+#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
 msgstr "yòu cè xūyào shùzǔ/zì jié"
 
@@ -3795,7 +3809,7 @@ msgid "only sample_rate=16000 is supported"
 msgstr "Jǐn zhīchí cǎiyàng lǜ = 16000"
 
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
-#: shared-bindings/alarm/SleepMemory.c shared-bindings/coproc/CoprocMemory.c
+#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
 msgstr "jǐn zhīchí bù zhǎng = 1(jí wú) de qiēpiàn"
@@ -4395,6 +4409,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 "Unable to write"
+#~ msgstr "wú fǎ xiě rù"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q cháng dù bìxū >= 1"
 

From 8087887afd9f661a797eb50e6ed24b03a5e12dba Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 20 Dec 2022 22:18:43 -0500
Subject: [PATCH 1592/2403] Use returns_twice attribute to preserve regs in
 nlrthumb nlr_push()

---
 py/nlrthumb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/nlrthumb.c b/py/nlrthumb.c
index 30f9f2c196..4b20d30c6e 100644
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@@ -36,7 +36,7 @@
 // For reference, arm/thumb callee save regs are:
 //      r4-r11, r13=sp
 
-__attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
+__attribute__((naked, returns_twice)) unsigned int nlr_push(nlr_buf_t *nlr) {
 
     __asm volatile (
         "str    r4, [r0, #12]       \n" // store r4 into nlr_buf

From f97925c66c20972c68e6eb96219342974eb2b62d Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Wed, 21 Dec 2022 13:27:23 +0100
Subject: [PATCH 1593/2403] ignore .devcontainer/*

---
 tools/ci_set_matrix.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 3ec3ba9b73..79ec5c7ace 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -58,6 +58,8 @@ IGNORE = [
     "tools/ci_check_duplicate_usb_vid_pid.py",
 ]
 
+IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
+
 if len(sys.argv) > 1:
     print("Using files list on commandline")
     changed_files = sys.argv[1:]
@@ -150,7 +152,7 @@ def set_boards_to_build(build_all):
                 continue
 
             # Boards don't run tests or docs so ignore those as well.
-            if p.startswith("tests") or p.startswith("docs"):
+            if any([p.startswith(d) for d in IGNORE_DIRS]):
                 continue
 
             # As a (nearly) last resort, for some certain files, we compute the settings from the

From 868a98323a4bcefb5acb47da0ba82c07edf8f486 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Wed, 21 Dec 2022 15:18:33 +0100
Subject: [PATCH 1594/2403] added comment for IGNORE_DIRS

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

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 79ec5c7ace..77f58742cd 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -58,6 +58,7 @@ IGNORE = [
     "tools/ci_check_duplicate_usb_vid_pid.py",
 ]
 
+# Files in these directories never influence board builds
 IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
 
 if len(sys.argv) > 1:
@@ -151,7 +152,6 @@ def set_boards_to_build(build_all):
             if p in IGNORE:
                 continue
 
-            # Boards don't run tests or docs so ignore those as well.
             if any([p.startswith(d) for d in IGNORE_DIRS]):
                 continue
 

From 9f266c361b5698a8d8b6e4b4518544cceadccf1b Mon Sep 17 00:00:00 2001
From: Pontus Oldberg 
Date: Wed, 21 Dec 2022 16:33:06 +0100
Subject: [PATCH 1595/2403] Initializing external flash SPI speed to
 SPI_FLASH_MAX_BAUDRATE, instead of using driver default speed (32MHz), before
 probing JEDEC identifier.

---
 ports/nrf/boards/challenger_840/mpconfigboard.h | 1 +
 supervisor/shared/external_flash/spi_flash.c    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.h b/ports/nrf/boards/challenger_840/mpconfigboard.h
index e68fbc76fb..5226c818d4 100644
--- a/ports/nrf/boards/challenger_840/mpconfigboard.h
+++ b/ports/nrf/boards/challenger_840/mpconfigboard.h
@@ -10,6 +10,7 @@
 #define SPI_FLASH_MISO_PIN          (&pin_P0_11)
 #define SPI_FLASH_SCK_PIN           (&pin_P0_14)
 #define SPI_FLASH_CS_PIN            (&pin_P0_08)
+#define SPI_FLASH_MAX_BAUDRATE      20000000
 #endif
 
 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/supervisor/shared/external_flash/spi_flash.c b/supervisor/shared/external_flash/spi_flash.c
index b47508e051..abff343713 100644
--- a/supervisor/shared/external_flash/spi_flash.c
+++ b/supervisor/shared/external_flash/spi_flash.c
@@ -151,6 +151,7 @@ void spi_flash_init(void) {
     supervisor_flash_spi_bus.base.type = &busio_spi_type;
     common_hal_busio_spi_construct(&supervisor_flash_spi_bus, SPI_FLASH_SCK_PIN, SPI_FLASH_MOSI_PIN, SPI_FLASH_MISO_PIN, false);
     common_hal_busio_spi_never_reset(&supervisor_flash_spi_bus);
+    common_hal_busio_spi_configure(&supervisor_flash_spi_bus, SPI_FLASH_MAX_BAUDRATE, 0, 0, 8);
 
     return;
 }

From e80ff2058373533c565b6962287e8511f2d498f2 Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Thu, 22 Dec 2022 09:29:24 +0900
Subject: [PATCH 1596/2403] Remove IO11 from definition

It is used internally on this particular board version despite being broken out to a pin and marked on silkscreen.
---
 ports/espressif/boards/luatos_core_esp32c3/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c
index b472446fe2..f45205b5c3 100644
--- a/ports/espressif/boards/luatos_core_esp32c3/pins.c
+++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c
@@ -24,7 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    // IO11 used internally on this board version despite being broken out to a pin
     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },

From 7cfdd24f771e9e018a5f63364c5d4c08694a3384 Mon Sep 17 00:00:00 2001
From: evildave666 
Date: Thu, 22 Dec 2022 09:30:52 +0900
Subject: [PATCH 1597/2403] Change flash mode to dio

---
 ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
index 29f1719153..e0df58f756 100644
--- a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
@@ -3,6 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB

From 26143e057fcd6b74187baf682d7b5740ef1918bd Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 21 Dec 2022 15:15:39 +0000
Subject: [PATCH 1598/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4a95e608d4..39b93d335f 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: 2022-12-16 21:50+0000\n"
+"PO-Revision-Date: 2022-12-22 15:49+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.15\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -408,7 +408,7 @@ msgstr "O endereço deve ter %d bytes de comprimento"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Intervalo de endereços não permitido"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -1683,7 +1683,7 @@ msgstr "Apenas um %q pode ser colocado em hibernação profunda."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Apenas um %q pode ser definido."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1807,7 +1807,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Pins 21+ not supported from ULP"
-msgstr ""
+msgstr "Os pinos 21+ não são suportados pelo ULP"
 
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
@@ -1860,7 +1860,7 @@ msgstr "O tamanho do programa é inválido"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "Programa muito longo"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -2296,7 +2296,7 @@ msgstr "Não é possível iniciar a consulta mDNS"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "Não é possível gravar no endereço."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."

From 9bf62d1433d7bf008c5306f80da68c6610942d8d Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 21 Dec 2022 14:44:03 +0000
Subject: [PATCH 1599/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 74cd6978c7..1ad79178d7 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: 2022-12-15 12:49+0000\n"
+"PO-Revision-Date: 2022-12-22 15:49+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.15-dev\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -405,7 +405,7 @@ msgstr "Adressen måste vara %d byte lång"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Adressintervallet är inte tillåtet"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -1666,7 +1666,7 @@ msgstr "Endast en %q kan sättas i djup sömn."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Endast en %q kan ställas in."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1790,7 +1790,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Pins 21+ not supported from ULP"
-msgstr ""
+msgstr "Pins 21+ stöds inte av ULP"
 
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
@@ -1840,7 +1840,7 @@ msgstr "Programstorlek ogiltig"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "Programmet är för långt"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -2272,7 +2272,7 @@ msgstr "Det gick inte att starta mDNS-frågan"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "Det går inte att skriva till adress."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."

From 94dbefacf1e6b01c7458804323f707f067a8185a Mon Sep 17 00:00:00 2001
From: root 
Date: Fri, 23 Dec 2022 19:17:45 -0600
Subject: [PATCH 1600/2403] Issue 7352 - set max value of a pulsein

---
 ports/espressif/common-hal/pulseio/PulseIn.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c
index 41c1dcb189..bb6ef7f975 100644
--- a/ports/espressif/common-hal/pulseio/PulseIn.c
+++ b/ports/espressif/common-hal/pulseio/PulseIn.c
@@ -41,7 +41,12 @@ STATIC void update_internal_buffer(pulseio_pulsein_obj_t *self) {
         length /= 4;
         for (size_t i = 0; i < length; i++) {
             uint16_t pos = (self->start + self->len) % self->maxlen;
-            self->buffer[pos] = items[i].duration0 * 3;
+            uint32_t val = items[i].duration0 * 3;
+            // make sure the value returned does not exceed the max uint16 value.
+            if (val > 65535) {
+                val = 65535;
+            }
+            self->buffer[pos] = (uint16_t)val;
             if (self->len < self->maxlen) {
                 self->len++;
             } else {
@@ -50,7 +55,11 @@ STATIC void update_internal_buffer(pulseio_pulsein_obj_t *self) {
             // Check if second item exists
             if (items[i].duration1) {
                 pos = (self->start + self->len) % self->maxlen;
-                self->buffer[pos] = items[i].duration1 * 3;
+                val = items[i].duration1 * 3;
+                if (val > 65535) {
+                    val = 65535;
+                }
+                self->buffer[pos] = (uint16_t)val;
                 if (self->len < self->maxlen) {
                     self->len++;
                 } else {

From cdefd2e674771174172aa004329989002b406937 Mon Sep 17 00:00:00 2001
From: Jay Greco 
Date: Thu, 22 Dec 2022 06:57:25 +0000
Subject: [PATCH 1601/2403] Add nullbits Bit-C PRO board

---
 .../boards/nullbits_bit_c_pro/board.c         | 29 +++++++++++
 .../boards/nullbits_bit_c_pro/mpconfigboard.h | 17 +++++++
 .../nullbits_bit_c_pro/mpconfigboard.mk       |  9 ++++
 .../nullbits_bit_c_pro/pico-sdk-configboard.h |  4 ++
 .../boards/nullbits_bit_c_pro/pins.c          | 49 +++++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 ports/raspberrypi/boards/nullbits_bit_c_pro/board.c
 create mode 100644 ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/nullbits_bit_c_pro/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c

diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/board.c b/ports/raspberrypi/boards/nullbits_bit_c_pro/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.h b/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.h
new file mode 100644
index 0000000000..d2a514006a
--- /dev/null
+++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.h
@@ -0,0 +1,17 @@
+#define MICROPY_HW_BOARD_NAME "nullbits Bit-C PRO"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO20)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
+
+#define CIRCUITPY_RGB_STATUS_INVERTED_PWM
+#define CIRCUITPY_RGB_STATUS_R (&pin_GPIO16)
+#define CIRCUITPY_RGB_STATUS_G (&pin_GPIO17)
+#define CIRCUITPY_RGB_STATUS_B (&pin_GPIO18)
diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.mk b/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.mk
new file mode 100644
index 0000000000..81271d3721
--- /dev/null
+++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x2E8A
+USB_PID = 0x1048
+USB_PRODUCT = "Bit-C PRO"
+USB_MANUFACTURER = "nullbits"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q32C"
diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/pico-sdk-configboard.h b/ports/raspberrypi/boards/nullbits_bit_c_pro/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c b/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c
new file mode 100644
index 0000000000..ac1b1a8065
--- /dev/null
+++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c
@@ -0,0 +1,49 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1),  MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2),  MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3),  MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_GPIO29) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23),  MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D20),  MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_LED_GREEN), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_LED_BLUE), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO18) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 2901399cc61f77f144b6b871694cc8a1e1677476 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 19 Dec 2022 09:04:09 -0600
Subject: [PATCH 1602/2403] No need to depend it here, conf.py runs `make
 stubs`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b35b5c66b9..40952d261d 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ clean:
 	rm -rf autoapi
 	rm -rf $(STUBDIR) $(DISTDIR) *.egg-info
 
-html: stubs
+html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

From 4dbbfa0931670b8fe0a585a9b8276934b6cfd861 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 26 Dec 2022 10:45:42 -0600
Subject: [PATCH 1603/2403] Print errors to repl about getenv

---
 locale/circuitpython.pot    | 14 ++++--
 shared-module/os/__init__.h |  2 +
 shared-module/os/getenv.c   | 96 +++++++++++++++++++++++++------------
 3 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 0cf1027239..28963bd4a8 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -65,6 +65,11 @@ msgstr ""
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -488,6 +493,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1754,10 +1764,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/shared-module/os/__init__.h b/shared-module/os/__init__.h
index 0e1d78c53b..1b18a1f4b9 100644
--- a/shared-module/os/__init__.h
+++ b/shared-module/os/__init__.h
@@ -38,9 +38,11 @@ typedef enum {
 // Allocation free version that returns the full length of the value.
 // If it fits, the return value is 0-terminated. The passed in buffer
 // may be modified even if an error is returned.  Allocation free.
+// An error that is not 'open' or 'not found' is printed on the repl.
 os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
 
 // Returns GETENV_OK and sets value to the read value.  Returns
 // GETENV_ERR_... if the value was not numeric. allocation-free.
 // If any error code is returned, value is guaranteed not modified
+// An error that is not 'open' or 'not found' is printed on the repl.
 os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value);
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index d96b1fb306..d9e75484ec 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -28,6 +28,7 @@
 // tested in the unix "coverage" build, without bringing in "our" os module
 
 #include 
+#include 
 #include 
 
 #include "shared-bindings/os/__init__.h"
@@ -36,6 +37,7 @@
 #include "py/gc.h"
 #include "py/misc.h"
 #include "py/mpstate.h"
+#include "py/mpprint.h"
 #include "py/objstr.h"
 #include "py/parsenum.h"
 #include "py/runtime.h"
@@ -311,7 +313,58 @@ STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, si
     return result;
 }
 
-os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
+STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) {
+    va_list argptr;
+    va_start(argptr,fmt);
+    mp_vcprintf(&mp_plat_print, fmt, argptr);
+    mp_printf(&mp_plat_print, "\n");
+    va_end(argptr);
+}
+
+STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...)) {
+    if (error == GETENV_OK) {
+        return;
+    }
+    if (error & GETENV_ERR_UNEXPECTED) {
+        byte character = (error & 0xff);
+        char buf[8];
+        vstr_t vstr;
+        vstr_init_fixed_buf(&vstr, sizeof(buf), buf);
+        mp_print_t print = { .data = &vstr, .print_strn = (mp_print_strn_t)vstr_add_strn };
+
+        if (character) {
+            mp_str_print_quoted(&print, &character, 1, true);
+        } else {
+            mp_str_print_quoted(&print, (byte *)"EOF", 3, true);
+        }
+        handle(&mp_type_ValueError, translate("Invalid byte %.*s"), vstr.len, vstr.buf);
+    } else {
+        switch (error) {
+            case GETENV_ERR_OPEN:
+                handle(&mp_type_ValueError, translate("%S"), translate("File not found"));
+                break;
+            case GETENV_ERR_UNICODE:
+                handle(&mp_type_ValueError, translate("%S"), translate("Invalid unicode escape"));
+                break;
+            case GETENV_ERR_NOT_FOUND:
+                handle(&mp_type_ValueError, translate("%S"), translate("Key not found"));
+                break;
+            default:
+                handle(&mp_type_RuntimeError, translate("%S"), translate("Internal error"));
+                break;
+        }
+    }
+}
+
+STATIC void common_hal_os_getenv_showerr(const char *key, os_getenv_err_t result) {
+    if (result != GETENV_OK && result != GETENV_ERR_OPEN && result != GETENV_ERR_NOT_FOUND) {
+        mp_cprintf(&mp_plat_print, translate("An error occurred while retrieving '%s':\n"), key);
+        handle_getenv_error(result, print_dont_raise);
+    }
+}
+
+STATIC
+os_getenv_err_t common_hal_os_getenv_str_inner(const char *key, char *value, size_t value_len) {
     bool quoted;
     os_getenv_err_t result = os_getenv_buf_terminated(key, value, value_len, "ed);
     if (result == GETENV_OK && !quoted) {
@@ -320,33 +373,10 @@ os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t va
     return result;
 }
 
-STATIC void throw_getenv_error(os_getenv_err_t error) {
-    if (error == GETENV_OK) {
-        return;
-    }
-    if (error & GETENV_ERR_UNEXPECTED) {
-        byte character = (error & 0xff);
-        mp_print_t print;
-        vstr_t vstr;
-        vstr_init_print(&vstr, 8 + 4 + 1, &print);
-        if (character) {
-            mp_str_print_quoted(&print, &character, 1, true);
-        } else {
-            mp_str_print_quoted(&print, (byte *)"EOF", 3, true);
-        }
-        mp_raise_ValueError_varg(translate("Invalid byte %.*s"),
-            vstr.len, vstr.buf);
-    }
-    switch (error) {
-        case GETENV_ERR_OPEN:
-            mp_raise_ValueError(translate("File not found"));
-        case GETENV_ERR_UNICODE:
-            mp_raise_ValueError(translate("Invalid unicode escape"));
-        case GETENV_ERR_NOT_FOUND:
-            mp_raise_ValueError(translate("Key not found"));
-        default:
-            mp_raise_RuntimeError(translate("Internal error"));
-    }
+os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
+    os_getenv_err_t result = common_hal_os_getenv_str_inner(key, value, value_len);
+    common_hal_os_getenv_showerr(key, result);
+    return result;
 }
 
 mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t default_) {
@@ -358,7 +388,7 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d
     if (result == GETENV_ERR_NOT_FOUND || result == GETENV_ERR_OPEN) {
         return default_;
     }
-    throw_getenv_error(result);
+    handle_getenv_error(result, mp_raise_msg_varg);
 
     if (quoted) {
         return mp_obj_new_str_from_vstr(&mp_type_str, &buf);
@@ -371,7 +401,7 @@ mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) {
     return common_hal_os_getenv_path(GETENV_PATH, key, default_);
 }
 
-os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value) {
+STATIC os_getenv_err_t common_hal_os_getenv_int_inner(const char *key, mp_int_t *value) {
     char buf[16];
     bool quoted;
     os_getenv_err_t result = os_getenv_buf_terminated(key, buf, sizeof(buf), "ed);
@@ -389,3 +419,9 @@ os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value) {
     *value = (mp_int_t)num;
     return GETENV_OK;
 }
+
+os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value) {
+    os_getenv_err_t result = common_hal_os_getenv_int_inner(key, value);
+    common_hal_os_getenv_showerr(key, result);
+    return result;
+}

From f6b69cf5e3aca4ab745e666f5485a4a5f628fe77 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 26 Dec 2022 10:49:57 -0600
Subject: [PATCH 1604/2403] Allow settings.toml to end without a newline

---
 shared-module/os/getenv.c         | 2 +-
 tests/circuitpython/getenv.py     | 3 +++
 tests/circuitpython/getenv.py.exp | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index d9e75484ec..21a97f3fec 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -201,6 +201,7 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) {
                     case '#':
                         next_line(active_file);
                         MP_FALLTHROUGH;
+                    case 0:
                     case '\n':
                         return GETENV_OK;
                     default:
@@ -257,7 +258,6 @@ STATIC os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int f
     while (true) {
         switch (character) {
             case 0:
-                return GETENV_ERR_UNEXPECTED | character;
             case '\n':
                 return GETENV_OK;
             case '#':
diff --git a/tests/circuitpython/getenv.py b/tests/circuitpython/getenv.py
index ad8fdbfeeb..b63f587730 100644
--- a/tests/circuitpython/getenv.py
+++ b/tests/circuitpython/getenv.py
@@ -75,5 +75,8 @@ def run_test(key, content):
 for i in range(13):
     run_test(f"key{i}", content_good)
 
+# Test value without trailing newline
+run_test(f"noeol", "noeol=3")
+
 for content in content_bad:
     run_test("key", content)
diff --git a/tests/circuitpython/getenv.py.exp b/tests/circuitpython/getenv.py.exp
index f83143c80b..0dcc8f78d3 100644
--- a/tests/circuitpython/getenv.py.exp
+++ b/tests/circuitpython/getenv.py.exp
@@ -11,6 +11,7 @@ key9 'hello comment'
 key10 127
 key11 0
 key12 None
+noeol 3
 key Invalid byte '\n'
 key Invalid byte '"'
 key invalid syntax for integer with base 10: ''

From 337b1da143547b2d8266260cb2824c701106ddf0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 26 Dec 2022 10:53:36 -0600
Subject: [PATCH 1605/2403] Explicitly test \n and \r\n files

\r\n files must be working due to micropython's built in handling of
text-mode files, I didn't implement it.

\r-only (old mac text-mode files) are explicitly not supported by
the toml format.
---
 tests/circuitpython/getenv.py     | 18 +++++++++++-------
 tests/circuitpython/getenv.py.exp | 13 +++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/tests/circuitpython/getenv.py b/tests/circuitpython/getenv.py
index b63f587730..2dccb99f97 100644
--- a/tests/circuitpython/getenv.py
+++ b/tests/circuitpython/getenv.py
@@ -35,7 +35,7 @@ bdev = RAMBlockDevice(64)
 uos.VfsFat.mkfs(bdev)
 uos.mount(uos.VfsFat(bdev), "/")
 
-content_good = """
+content_good = b"""
 # comment
 key0 = "hello world"
 key1 = 7
@@ -54,15 +54,15 @@ subvalue = "hi"
 """
 
 content_bad = [
-    'key = "\n',
-    'key = """\n',
-    "key =\n",
-    'key="',
+    b'key = "\n',
+    b'key = """\n',
+    b"key =\n",
+    b'key="',
 ]
 
 
 def run_test(key, content):
-    with open("/settings.toml", "w") as f:
+    with open("/settings.toml", "wb") as f:
         f.write(content)
 
     try:
@@ -72,11 +72,15 @@ def run_test(key, content):
         print(key, str(e))
 
 
+for i in range(13):
+    run_test(f"key{i}", content_good)
+
+content_good = content_good.replace(b"\n", b"\r\n")
 for i in range(13):
     run_test(f"key{i}", content_good)
 
 # Test value without trailing newline
-run_test(f"noeol", "noeol=3")
+run_test(f"noeol", b"noeol=3")
 
 for content in content_bad:
     run_test("key", content)
diff --git a/tests/circuitpython/getenv.py.exp b/tests/circuitpython/getenv.py.exp
index 0dcc8f78d3..91c96e601a 100644
--- a/tests/circuitpython/getenv.py.exp
+++ b/tests/circuitpython/getenv.py.exp
@@ -11,6 +11,19 @@ key9 'hello comment'
 key10 127
 key11 0
 key12 None
+key0 'hello world'
+key1 7
+key2 Invalid byte '\n'
+key3 'Áx'
+key4 'Áx'
+key5 Invalid byte '\\'
+key6 '\t\r\x08'
+key7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+key8 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+key9 'hello comment'
+key10 127
+key11 0
+key12 None
 noeol 3
 key Invalid byte '\n'
 key Invalid byte '"'

From 928fb0a9c4ec8a3f1903f3f7aefcf63f252cea62 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 26 Dec 2022 13:57:15 -0600
Subject: [PATCH 1606/2403] Make the "name or service not known" message
 translatable

---
 locale/circuitpython.pot                        |  4 ++++
 ports/espressif/common-hal/socketpool/Socket.c  |  4 ++--
 .../common-hal/socketpool/SocketPool.c          |  2 +-
 shared-bindings/socketpool/SocketPool.c         | 17 +++++++++++------
 shared-bindings/socketpool/SocketPool.h         |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 0cf1027239..17c39cafdc 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1393,6 +1393,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 18237a4d4e..ccb01116d8 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -369,7 +369,7 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
     struct addrinfo *result_i;
     int error = lwip_getaddrinfo(host, NULL, &hints, &result_i);
     if (error != 0 || result_i == NULL) {
-        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
+        common_hal_socketpool_socketpool_raise_gaierror_noname();
     }
 
     // Set parameters
@@ -550,7 +550,7 @@ mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t *self,
     struct addrinfo *result_i;
     int error = lwip_getaddrinfo(host, NULL, &hints, &result_i);
     if (error != 0 || result_i == NULL) {
-        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
+        common_hal_socketpool_socketpool_raise_gaierror_noname();
     }
 
     // Set parameters
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
index bdbc7f67c5..e562314d69 100644
--- a/ports/raspberrypi/common-hal/socketpool/SocketPool.c
+++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
@@ -98,7 +98,7 @@ void socketpool_resolve_host_raise(socketpool_socketpool_obj_t *self, const char
     int result = socketpool_resolve_host(self, host, addr);
     if (result < 0) {
         printf("socket_resolve_host() returned %d\n", result);
-        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
+        common_hal_socketpool_socketpool_raise_gaierror_noname();
         mp_raise_OSError(-result);
     }
 }
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 660aba63ed..f056c741f3 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -198,16 +198,21 @@ MP_WEAK
 mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
     mp_obj_t ip_str = common_hal_socketpool_socketpool_gethostbyname(self, host);
     if (ip_str == mp_const_none) {
-        common_hal_socketpool_socketpool_raise_gaierror(SOCKETPOOL_EAI_NONAME, MP_QSTR_Name_space_or_space_service_space_not_space_known);
+        common_hal_socketpool_socketpool_raise_gaierror_noname();
     }
     return ip_str;
 }
 
 MP_WEAK NORETURN
-void common_hal_socketpool_socketpool_raise_gaierror(int value, qstr name) {
-    mp_obj_t exc_args[2] = {
-        MP_OBJ_NEW_SMALL_INT(value),
-        MP_OBJ_NEW_QSTR(name),
+void common_hal_socketpool_socketpool_raise_gaierror_noname(void) {
+    vstr_t vstr;
+    mp_print_t print;
+    vstr_init_print(&vstr, 64, &print);
+    mp_printf(&print, "%S", translate("Name or service not known"));
+
+    mp_obj_t exc_args[] = {
+        MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_EAI_NONAME),
+        mp_obj_new_str_from_vstr(&mp_type_str, &vstr),
     };
-    nlr_raise(mp_obj_new_exception_args(&mp_type_gaierror, 2, exc_args));
+    nlr_raise(mp_obj_new_exception_args(&mp_type_gaierror, MP_ARRAY_SIZE(exc_args), exc_args));
 }
diff --git a/shared-bindings/socketpool/SocketPool.h b/shared-bindings/socketpool/SocketPool.h
index cecbdd86f1..6409f8c763 100644
--- a/shared-bindings/socketpool/SocketPool.h
+++ b/shared-bindings/socketpool/SocketPool.h
@@ -73,6 +73,6 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
     socketpool_socket_obj_t *sock);
 
-NORETURN void common_hal_socketpool_socketpool_raise_gaierror(int value, qstr name);
+NORETURN void common_hal_socketpool_socketpool_raise_gaierror_noname(void);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_SOCKETPOOL_SOCKETPOOL_H

From fc67e8794222380446743b63a341bb1d0006b0d1 Mon Sep 17 00:00:00 2001
From: Clay 
Date: Tue, 27 Dec 2022 07:13:15 +0000
Subject: [PATCH 1607/2403] Translated using Weblate (Russian)

Currently translated at 35.6% (355 of 995 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ru/
---
 locale/ru.po | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/locale/ru.po b/locale/ru.po
index ef8dc019b4..08470eda78 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-11-29 01:02+0000\n"
+"PO-Revision-Date: 2022-12-27 17:42+0000\n"
 "Last-Translator: Clay \n"
 "Language-Team: none\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.15-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -168,7 +168,7 @@ msgstr "%q должно быть >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q должно быть bytearray или array типа ‘H' или 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -205,7 +205,7 @@ msgstr "Пин %q не допустим"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "Шаг %q не может быть нулём"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -406,7 +406,7 @@ msgstr "Адрес должен быть длиной %d байт"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Диапазон адресов не разрешен"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -917,8 +917,10 @@ msgid "Drive mode not used when direction is input."
 msgstr "Drive mode не используется, когда направление является входным."
 
 #: py/obj.c
+#, fuzzy
 msgid "During handling of the above exception, another exception occurred:"
 msgstr ""
+"Во время обработки вышеупомянутого исключения произошло другое исключение:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -1040,7 +1042,7 @@ msgstr "Файл существует"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Файл не найден"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1291,7 +1293,7 @@ msgstr "Недопустимое бит-на-значение"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Неверный байт %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1333,7 +1335,7 @@ msgstr "Ключ должен быть длинной 16, 24 или 32 байт
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Ключ не найден"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
@@ -1377,7 +1379,7 @@ msgstr "Размер данных различается"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched swap flag"
-msgstr ""
+msgstr "Несоответствие флага swap"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI Pin"
@@ -1694,7 +1696,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Только один %q может быть погружен в глубокий сон."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
@@ -4378,7 +4380,7 @@ msgstr ""
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "wrong output type"
-msgstr ""
+msgstr "неверный тип вывода"
 
 #: shared-module/displayio/Shape.c
 msgid "x value out of bounds"
@@ -4386,7 +4388,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/audiobusio/__init__.c
 msgid "xTaskCreate failed"
-msgstr ""
+msgstr "xTaskCreate провалился"
 
 #: shared-module/displayio/Shape.c
 msgid "y value out of bounds"
@@ -4394,7 +4396,7 @@ msgstr ""
 
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be an ndarray"
-msgstr ""
+msgstr "zi должен быть bytearray"
 
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "zi must be of float type"

From 7925069a773f0a4c7c52f0e01e384739db54608b Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 27 Dec 2022 18:42:37 +0100
Subject: [PATCH 1608/2403] 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             | 14 ++++++++++----
 locale/cs.po             | 14 ++++++++++----
 locale/de_DE.po          | 14 ++++++++++----
 locale/el.po             | 14 ++++++++++----
 locale/en_GB.po          | 14 ++++++++++----
 locale/es.po             | 14 ++++++++++----
 locale/fil.po            | 14 ++++++++++----
 locale/fr.po             | 14 ++++++++++----
 locale/hi.po             | 14 ++++++++++----
 locale/it_IT.po          | 14 ++++++++++----
 locale/ja.po             | 14 ++++++++++----
 locale/ko.po             | 14 ++++++++++----
 locale/nl.po             | 14 ++++++++++----
 locale/pl.po             | 14 ++++++++++----
 locale/pt_BR.po          | 17 +++++++++++++----
 locale/ru.po             | 18 ++++++++++++------
 locale/sv.po             | 17 +++++++++++++----
 locale/tr.po             | 14 ++++++++++----
 locale/zh_Latn_pinyin.po | 14 ++++++++++----
 19 files changed, 198 insertions(+), 78 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 3aaca9e203..ab5ea27d40 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -70,6 +70,11 @@ msgstr "%%c harus int atau char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -494,6 +499,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1779,10 +1789,6 @@ msgstr ""
 "ideal. Jika ini tidak dapat dihindari, berikan allow_inefficient=True ke "
 "konstruktor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pin harus berurutan"
diff --git a/locale/cs.po b/locale/cs.po
index 5010b8b862..ce0b944057 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -72,6 +72,11 @@ msgstr "%%c vyžaduje int nebo char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -495,6 +500,11 @@ msgstr "Již běží"
 msgid "Already scanning for wifi networks"
 msgstr "Již skenuje wifi sítě"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Jiný PWMAudioOut je již aktivní"
@@ -1770,10 +1780,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3f1d800592..1c751f839e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -71,6 +71,11 @@ msgstr "%%c erwartet Int oder Char"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -498,6 +503,11 @@ msgstr "Läuft bereits"
 msgid "Already scanning for wifi networks"
 msgstr "Sucht bereits nach Wifi-Netzwerken"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Ein anderer PWMAudioOut ist bereits aktiv"
@@ -1794,10 +1804,6 @@ msgstr ""
 "Bytes verbraucht. Wenn dies nicht vermieden werden kann, übergib "
 "allow_inefficient=True an den Konstruktor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pins müssen geordnet sein"
diff --git a/locale/el.po b/locale/el.po
index e022e3a90e..bc2d642ed9 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -76,6 +76,11 @@ msgstr "%%c απαιτεί int ή char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -501,6 +506,11 @@ msgstr "Τρέχει ήδη"
 msgid "Already scanning for wifi networks"
 msgstr "Ήδη γίνεται σάρωση για δίκτυα wifi"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Και άλλο PWMAudioOut είναι σε χρήση"
@@ -1779,10 +1789,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 0f166288bf..34d1dd5f2a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -74,6 +74,11 @@ msgstr "%%c requires int or char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -498,6 +503,11 @@ msgstr "Already running"
 msgid "Already scanning for wifi networks"
 msgstr "Already scanning for WiFi networks"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Another PWMAudioOut is already active"
@@ -1778,10 +1788,6 @@ msgstr ""
 "bytes.  If this cannot be avoided, pass allow_inefficient=True to the "
 "constructor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pins must be sequential"
diff --git a/locale/es.po b/locale/es.po
index dd420bbd2e..558fc6ddf0 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -74,6 +74,11 @@ msgstr "%%c requiere int o char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -502,6 +507,11 @@ msgstr "Ya está en ejecución"
 msgid "Already scanning for wifi networks"
 msgstr "Ya se están buscando redes wifi"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Otra salida PWMAudioOut esta ya activada"
@@ -1803,10 +1813,6 @@ msgstr ""
 "ideales. Si esto no se puede evitar, pase allow_inefficient=True al "
 "constructor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Los pines deben estar en orden secuencial"
diff --git a/locale/fil.po b/locale/fil.po
index 7844d12562..51468a0a5b 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -66,6 +66,11 @@ msgstr "%%c nangangailangan ng int o char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -491,6 +496,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1770,10 +1780,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 0f0afce8ff..fa071b4f47 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -75,6 +75,11 @@ msgstr "%%c nécessite un chiffre entier 'int' ou un caractère 'char'"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -500,6 +505,11 @@ msgstr "Déjà en cours d'exécution"
 msgid "Already scanning for wifi networks"
 msgstr "Déjà à la recherche des réseaux wifi"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Un autre PWMAudioOut est déjà actif"
@@ -1823,10 +1833,6 @@ msgstr ""
 "octets idéal. Si cela ne peut pas être évité, transmettez allow_inefficient "
 "= True au constructeur"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Les broches doivent être séquentielles"
diff --git a/locale/hi.po b/locale/hi.po
index 7243d82e75..bc22a63370 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -65,6 +65,11 @@ msgstr ""
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -488,6 +493,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1754,10 +1764,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 401a9b9848..51d4cf1088 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -71,6 +71,11 @@ msgstr "%%c necessita di int o char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -497,6 +502,11 @@ msgstr "Già in funzione"
 msgid "Already scanning for wifi networks"
 msgstr "Già in ricerca di collegamenti WiFi"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1779,10 +1789,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 0c099d26c3..49e00a558d 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -70,6 +70,11 @@ msgstr "%%c にはintまたはcharが必要"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -493,6 +498,11 @@ msgstr "すでに実行中"
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1767,10 +1777,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 83832d31ef..c0629fa452 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -66,6 +66,11 @@ msgstr "%%c 전수(int)또는 캐릭터(char)필요합니다"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -489,6 +494,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1757,10 +1767,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index f639bcec2a..f7d3237aad 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -68,6 +68,11 @@ msgstr "%%c vereist een int of char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -491,6 +496,11 @@ msgstr "Wordt al uitgevoerd"
 msgid "Already scanning for wifi networks"
 msgstr "Zoekt al naar WiFi netwerken"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1776,10 +1786,6 @@ msgstr ""
 "gebruikt. Als dit niet kan worden vermeden, geef dan het argument "
 "allow_inefficient=True aan de constructor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 39853c1ddf..9e496f8d26 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -70,6 +70,11 @@ msgstr "%%c wymaga int lub char"
 msgid "%02X"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -493,6 +498,11 @@ msgstr ""
 msgid "Already scanning for wifi networks"
 msgstr ""
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr ""
@@ -1765,10 +1775,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 39b93d335f..933a066371 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -72,6 +72,11 @@ msgstr "%%c requer int ou char"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -501,6 +506,11 @@ msgstr "Já está em execução"
 msgid "Already scanning for wifi networks"
 msgstr "Já está em busca das redes de wifi"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Um outro PWMAudioOut já está ativo"
@@ -1805,10 +1815,6 @@ msgstr ""
 "ideal. Caso isso não possa ser evitado, passe allow_inefficient=True ao "
 "construtor"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr "Os pinos 21+ não são suportados pelo ULP"
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Os pinos devem ser sequenciais"
@@ -4441,6 +4447,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 "Pins 21+ not supported from ULP"
+#~ msgstr "Os pinos 21+ não são suportados pelo ULP"
+
 #~ msgid "Unable to write"
 #~ msgstr "Não é possível escrever"
 
diff --git a/locale/ru.po b/locale/ru.po
index 08470eda78..ef30a149d8 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
@@ -75,6 +75,11 @@ msgstr "%%c требует int или char"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -499,6 +504,11 @@ msgstr "Уже запущен"
 msgid "Already scanning for wifi networks"
 msgstr "Поиск сетей wifi уже происходит"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Другой PWMAudioOut уже активен"
@@ -1820,10 +1830,6 @@ msgstr ""
 "%d байт.   Если этого нельзя избежать, передайте allow_inefficient=True в "
 "конструктор"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Пины должны быть последовательными"
diff --git a/locale/sv.po b/locale/sv.po
index 1ad79178d7..c0ed44de29 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -72,6 +72,11 @@ msgstr "%%c kräver int eller char"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -498,6 +503,11 @@ msgstr "Kör redan"
 msgid "Already scanning for wifi networks"
 msgstr "Skannar redan efter WiFi-nätverk"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "En annan PWMAudioOut är redan aktiv"
@@ -1788,10 +1798,6 @@ msgstr ""
 "%d byte.  Om detta inte kan undvikas, skicka allow_inefficient=True till "
 "konstruktorn"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr "Pins 21+ stöds inte av ULP"
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "Pinnarna måste vara i sekvens"
@@ -4403,6 +4409,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 "Pins 21+ not supported from ULP"
+#~ msgstr "Pins 21+ stöds inte av ULP"
+
 #~ msgid "Unable to write"
 #~ msgstr "Kan inte skriva"
 
diff --git a/locale/tr.po b/locale/tr.po
index bafd72bd7e..56fe53b1eb 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -75,6 +75,11 @@ msgstr "%%c int veya char tipine ihtiyaç duyar"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -501,6 +506,11 @@ msgstr "Halihazırda çalışıyor"
 msgid "Already scanning for wifi networks"
 msgstr "Halihazırda wifi ağları için tarama yapılıyor"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "Başka bir PWMAudioOut zaten aktif durumda"
@@ -1777,10 +1787,6 @@ msgid ""
 "constructor"
 msgstr ""
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index b89f9cd9b5..96ecd16539 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -74,6 +74,11 @@ msgstr "%%c xūyào zhěngshù huòzhě zìfú"
 msgid "%02X"
 msgstr "%02X"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "%S"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -500,6 +505,11 @@ msgstr "yǐjīng zài yùnxíng"
 msgid "Already scanning for wifi networks"
 msgstr "yǐjīng zài sǎomiáo WIFI wǎngluò"
 
+#: shared-module/os/getenv.c
+#, c-format
+msgid "An error occurred while retrieving '%s':\n"
+msgstr ""
+
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
 msgstr "lìng yí gè PWMAudioOut yǐ jīng zài gōngzuò"
@@ -1792,10 +1802,6 @@ msgstr ""
 "duōzì jié. Rúguǒ wúfǎ bìmiǎn, qǐng jiāng allow_inefficient = True chuándì "
 "gěigòuzào hánshù"
 
-#: ports/espressif/common-hal/espulp/ULP.c
-msgid "Pins 21+ not supported from ULP"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Pins must be sequential"
 msgstr "yǐn jiǎo bì xū shì lián xù de"

From d92cb154d61e65d5ef60d11db166b6de6534e077 Mon Sep 17 00:00:00 2001
From: Blinka CircuitPython 
Date: Tue, 27 Dec 2022 18:01:36 +0000
Subject: [PATCH 1609/2403] Translated using Weblate (Filipino)

Currently translated at 33.4% (333 of 996 strings)

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

diff --git a/locale/fil.po b/locale/fil.po
index 51468a0a5b..a7acb9ea61 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -6,8 +6,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-08-23 14:19+0000\n"
-"Last-Translator: Jeff Epler \n"
+"PO-Revision-Date: 2022-12-27 18:02+0000\n"
+"Last-Translator: Blinka CircuitPython \n"
 "Language-Team: fil\n"
 "Language: fil\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1 && n != 2 && n != 3 && (n % 10 == 4 "
 "|| n % 10 == 6 || n % 10 == 9);\n"
-"X-Generator: Weblate 4.8.1-dev\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -69,7 +69,7 @@ msgstr ""
 #: shared-module/os/getenv.c
 #, c-format
 msgid "%S"
-msgstr ""
+msgstr "%S"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format

From 10640c9065239519fce5754dc924fabcc56592dc Mon Sep 17 00:00:00 2001
From: Blinka CircuitPython 
Date: Tue, 27 Dec 2022 18:01:39 +0000
Subject: [PATCH 1610/2403] Translated using Weblate (French)

Currently translated at 97.0% (967 of 996 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index fa071b4f47..922ecbdbc4 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-11-09 19:20+0000\n"
-"Last-Translator: Deleted User \n"
+"PO-Revision-Date: 2022-12-27 18:02+0000\n"
+"Last-Translator: Blinka CircuitPython \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.15-dev\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -78,7 +78,7 @@ msgstr "%02X"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "%S"
-msgstr ""
+msgstr "%S"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format

From 2ad767ee4b318b15f63cd0552b0b2989ae843e01 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 27 Dec 2022 17:57:37 +0000
Subject: [PATCH 1611/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index c0ed44de29..55f0c8efb5 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: 2022-12-22 15:49+0000\n"
+"PO-Revision-Date: 2022-12-27 18:02+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -75,7 +75,7 @@ msgstr "%02X"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "%S"
-msgstr ""
+msgstr "%S"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -506,7 +506,7 @@ msgstr "Skannar redan efter WiFi-nätverk"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "Ett fel uppstod vid hämtning av '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"

From ac3b46111b13f037efe358930432c4d6a86e6905 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 27 Dec 2022 19:16:00 +0100
Subject: [PATCH 1612/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index ab5ea27d40..acb228ebea 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1418,6 +1418,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Nama terlalu panjang"
diff --git a/locale/cs.po b/locale/cs.po
index ce0b944057..cf7973d4ad 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1418,6 +1418,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr "Chyba NVS"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Jméno je příliš dlouhé"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1c751f839e..a72022c938 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1434,6 +1434,10 @@ msgstr "NLR-Sprung fehlgeschlagen. Mögliche Speicher-Beschädigung."
 msgid "NVS Error"
 msgstr "NVS-Fehler"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Name zu lang"
diff --git a/locale/el.po b/locale/el.po
index bc2d642ed9..246d49ad74 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1428,6 +1428,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 34d1dd5f2a..74c7efabf5 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1419,6 +1419,10 @@ msgstr "NLR jump failed. Likely memory corruption."
 msgid "NVS Error"
 msgstr "NVS Error"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Name too long"
diff --git a/locale/es.po b/locale/es.po
index 558fc6ddf0..f39d4e2da5 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1441,6 +1441,10 @@ msgstr "Salto NLR falló. Probablemente corrupción de memoria."
 msgid "NVS Error"
 msgstr "Error NVS"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Nombre muy largo"
diff --git a/locale/fil.po b/locale/fil.po
index a7acb9ea61..6731d2d458 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1415,6 +1415,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 922ecbdbc4..908f93b553 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1460,6 +1460,10 @@ msgstr "Saut NLR échoué. Corruption de mémoire probable."
 msgid "NVS Error"
 msgstr "Erreur NVS"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Nom trop long"
diff --git a/locale/hi.po b/locale/hi.po
index bc22a63370..6e55808443 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1403,6 +1403,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 51d4cf1088..73ed787bf8 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1421,6 +1421,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 49e00a558d..b2227cecab 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1414,6 +1414,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "名前が長すぎます"
diff --git a/locale/ko.po b/locale/ko.po
index c0629fa452..8e7fee3e2f 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1406,6 +1406,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index f7d3237aad..728285da8e 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1414,6 +1414,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr "NVS-fout"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Naam te lang"
diff --git a/locale/pl.po b/locale/pl.po
index 9e496f8d26..ba505d4e6b 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1414,6 +1414,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr ""
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Za długa nazwa"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 933a066371..693f2d1b9b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1442,6 +1442,10 @@ msgstr "O salto NLR falhou. Possível corrupção da memória."
 msgid "NVS Error"
 msgstr "Erro NVS"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Nome muito longo"
diff --git a/locale/ru.po b/locale/ru.po
index ef30a149d8..8152dcc694 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1456,6 +1456,10 @@ msgstr "Не удалось выполнить NLR jump. Вероятно, по
 msgid "NVS Error"
 msgstr "Ошибка NVS"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Имя слишком длинное"
diff --git a/locale/sv.po b/locale/sv.po
index 55f0c8efb5..6038267ddd 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1427,6 +1427,10 @@ msgstr "NLR jump misslyckades. Troligen korrupt minne."
 msgid "NVS Error"
 msgstr "NVS-fel"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Name är för långt"
diff --git a/locale/tr.po b/locale/tr.po
index 56fe53b1eb..e7ed5b06bf 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -1426,6 +1426,10 @@ msgstr ""
 msgid "NVS Error"
 msgstr "NVS hatası"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "İsim çok uzun"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 96ecd16539..088a006c44 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1433,6 +1433,10 @@ msgstr "NLR tiào zhuǎn shī bài. kě néng shì nèi cún sǔn huài."
 msgid "NVS Error"
 msgstr "NVS cuò wù"
 
+#: shared-bindings/socketpool/SocketPool.c
+msgid "Name or service not known"
+msgstr ""
+
 #: py/qstr.c
 msgid "Name too long"
 msgstr "Míngchēng tài zhǎng"

From 7a40d449e6bca4fd88a336627e94c79b0602e00f Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 27 Dec 2022 22:07:54 -0500
Subject: [PATCH 1613/2403] mimxrt10xx/common-hal/UART.C: Fix for bits
 parameter validation.

I believe this will resolve issue #7389
---
 ports/mimxrt10xx/common-hal/busio/UART.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
index 20430c91c8..871d57648d 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.c
+++ b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -113,7 +113,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     bool sigint_enabled) {
 
     self->baudrate = baudrate;
-    self->character_bits = (uint8_t)mp_arg_validate_int_range(self->character_bits, 7, 8, MP_QSTR_bits);
+    self->character_bits = (uint8_t)mp_arg_validate_int_range(bits, 7, 8, MP_QSTR_bits);
     self->timeout_ms = timeout * 1000;
 
 

From 373db7897821bc3e7453c900a75c7df0136259f3 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 27 Dec 2022 22:16:14 +0000
Subject: [PATCH 1614/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (997 of 997 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 693f2d1b9b..63a7cda056 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: 2022-12-22 15:49+0000\n"
+"PO-Revision-Date: 2022-12-28 03:47+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -509,7 +509,7 @@ msgstr "Já está em busca das redes de wifi"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "Ocorreu um erro ao recuperar '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -1444,7 +1444,7 @@ msgstr "Erro NVS"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Nome ou serviço desconhecido"
 
 #: py/qstr.c
 msgid "Name too long"

From e62e9bd4af038e616478e95e68f672c07f8a6078 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 27 Dec 2022 18:58:19 +0000
Subject: [PATCH 1615/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (997 of 997 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 6038267ddd..1a2079f605 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: 2022-12-27 18:02+0000\n"
+"PO-Revision-Date: 2022-12-28 03:47+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1429,7 +1429,7 @@ msgstr "NVS-fel"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Namn eller tjänst inte känd"
 
 #: py/qstr.c
 msgid "Name too long"

From a932fb3fb13391019338b47717204ea11715e1ea Mon Sep 17 00:00:00 2001
From: chukwon <51104273+chukwon@users.noreply.github.com>
Date: Wed, 28 Dec 2022 21:25:25 +0800
Subject: [PATCH 1616/2403] Update pins.c

also match lolin_c3_mini pins definition of new version
---
 ports/espressif/boards/lolin_c3_mini/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index ccc70f6043..6b16020205 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -46,6 +46,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },

From edcb83266113e93465ec0ea17c00de555101db7a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Dec 2022 12:35:48 -0600
Subject: [PATCH 1617/2403] These need to be double-blackslashed

---
 tests/circuitpython/getenv.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/circuitpython/getenv.py b/tests/circuitpython/getenv.py
index 2dccb99f97..e58af0e8e4 100644
--- a/tests/circuitpython/getenv.py
+++ b/tests/circuitpython/getenv.py
@@ -39,11 +39,11 @@ content_good = b"""
 # comment
 key0 = "hello world"
 key1 = 7
-key2= "\n"
-key3 ="\u00c1x"
-key4 = "\U000000c1x"
-key5 = "\f\"\\"
-key6 = "\t\r\b"
+key2= "\\n"
+key3 ="\\u00c1x"
+key4 = "\\U000000c1x"
+key5 = "\\f\\"\\\\"
+key6 = "\\t\\r\\b"
 key7 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 key8 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
  key9 = "hello comment" # comment

From 83bbfd1815ed65031ad9b6eb805af3f2640876fc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Dec 2022 12:36:58 -0600
Subject: [PATCH 1618/2403] Allow the tests to directly call the non-heap using
 _int and _str variants

.. of getenv. These can have their own special bugs.
---
 ports/unix/modos.c            | 30 ++++++++++++++++++++++++++++++
 ports/unix/moduos_vfs.c       |  8 ++++++++
 tests/circuitpython/getenv.py |  3 +++
 3 files changed, 41 insertions(+)

diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 6bed69c43a..a6365aa6a3 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -57,7 +57,11 @@
 #endif
 
 #if defined(MICROPY_UNIX_COVERAGE)
+#include "py/objstr.h"
+typedef int os_getenv_err_t;
 mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
+os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
+os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value);
 #endif
 
 STATIC mp_obj_t mod_os_urandom(mp_obj_t num) {
@@ -212,6 +216,28 @@ STATIC mp_obj_t mod_os_getenv(mp_obj_t var_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_obj, mod_os_getenv);
 
+#if defined(MICROPY_UNIX_COVERAGE)
+STATIC mp_obj_t mod_os_getenv_int(mp_obj_t var_in) {
+    mp_int_t value;
+    os_getenv_err_t result = common_hal_os_getenv_int(mp_obj_str_get_str(var_in), &value);
+    if (result == 0) {
+        return mp_obj_new_int(value);
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_int_obj, mod_os_getenv_int);
+
+STATIC mp_obj_t mod_os_getenv_str(mp_obj_t var_in) {
+    char buf[4096];
+    os_getenv_err_t result = common_hal_os_getenv_str(mp_obj_str_get_str(var_in), buf, sizeof(buf));
+    if (result == 0) {
+        return mp_obj_new_str_copy(&mp_type_str, (byte *)buf, strlen(buf));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_str_obj, mod_os_getenv_str);
+#endif
+
 STATIC mp_obj_t mod_os_putenv(mp_obj_t key_in, mp_obj_t value_in) {
     const char *key = mp_obj_str_get_str(key_in);
     const char *value = mp_obj_str_get_str(value_in);
@@ -351,6 +377,10 @@ STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mod_os_rename_obj) },
     { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mod_os_rmdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mod_os_getenv_obj) },
+    #if defined(MICROPY_UNIX_COVERAGE)
+    { MP_ROM_QSTR(MP_QSTR_getenv_int), MP_ROM_PTR(&mod_os_getenv_int_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getenv_str), MP_ROM_PTR(&mod_os_getenv_str_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mod_os_putenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mod_os_unsetenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mod_os_mkdir_obj) },
diff --git a/ports/unix/moduos_vfs.c b/ports/unix/moduos_vfs.c
index 41273bc7e2..495679290a 100644
--- a/ports/unix/moduos_vfs.c
+++ b/ports/unix/moduos_vfs.c
@@ -37,6 +37,10 @@
 // These are defined in modos.c
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_errno_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mod_os_getenv_obj);
+#if defined(MICROPY_UNIX_COVERAGE)
+MP_DECLARE_CONST_FUN_OBJ_1(mod_os_getenv_int_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mod_os_getenv_str_obj);
+#endif
 MP_DECLARE_CONST_FUN_OBJ_1(mod_os_putenv_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mod_os_unsetenv_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mod_os_system_obj);
@@ -47,6 +51,10 @@ STATIC const mp_rom_map_elem_t uos_vfs_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mod_os_errno_obj) },
     { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mod_os_getenv_obj) },
+    #if defined(MICROPY_UNIX_COVERAGE)
+    { MP_ROM_QSTR(MP_QSTR_getenv_int), MP_ROM_PTR(&mod_os_getenv_int_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getenv_str), MP_ROM_PTR(&mod_os_getenv_str_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mod_os_putenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mod_os_unsetenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mod_os_system_obj) },
diff --git a/tests/circuitpython/getenv.py b/tests/circuitpython/getenv.py
index e58af0e8e4..68dd328cfb 100644
--- a/tests/circuitpython/getenv.py
+++ b/tests/circuitpython/getenv.py
@@ -79,6 +79,9 @@ content_good = content_good.replace(b"\n", b"\r\n")
 for i in range(13):
     run_test(f"key{i}", content_good)
 
+run_test(f"K", b"K = 7\r\n")
+print(uos.getenv_int("K"))
+
 # Test value without trailing newline
 run_test(f"noeol", b"noeol=3")
 

From 15a24b400d1a96f11083d14017016ee2955eebc9 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Dec 2022 12:37:27 -0600
Subject: [PATCH 1619/2403] Permit trailing whitespace in getenv_int

---
 shared-module/os/getenv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 21a97f3fec..aac87e9ee6 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -413,6 +413,9 @@ STATIC os_getenv_err_t common_hal_os_getenv_int_inner(const char *key, mp_int_t
     }
     char *end;
     long num = strtol(buf, &end, 0);
+    while (unichar_isspace(*end)) {
+        end++;
+    }
     if (end == buf || *end) { // If the whole buffer was not consumed it's an error
         return GETENV_ERR_UNEXPECTED | *end;
     }

From 2c46e785f669686100ebc6b2190f1d90379277ad Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Dec 2022 12:38:07 -0600
Subject: [PATCH 1620/2403] update test results

---
 tests/circuitpython/getenv.py.exp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/circuitpython/getenv.py.exp b/tests/circuitpython/getenv.py.exp
index 91c96e601a..ba1b1b3f90 100644
--- a/tests/circuitpython/getenv.py.exp
+++ b/tests/circuitpython/getenv.py.exp
@@ -1,9 +1,9 @@
 key0 'hello world'
 key1 7
-key2 Invalid byte '\n'
+key2 '\n'
 key3 'Áx'
 key4 'Áx'
-key5 Invalid byte '\\'
+key5 '\x0c"\\'
 key6 '\t\r\x08'
 key7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 key8 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
@@ -13,10 +13,10 @@ key11 0
 key12 None
 key0 'hello world'
 key1 7
-key2 Invalid byte '\n'
+key2 '\n'
 key3 'Áx'
 key4 'Áx'
-key5 Invalid byte '\\'
+key5 '\x0c"\\'
 key6 '\t\r\x08'
 key7 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 key8 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
@@ -24,6 +24,8 @@ key9 'hello comment'
 key10 127
 key11 0
 key12 None
+K 7
+7
 noeol 3
 key Invalid byte '\n'
 key Invalid byte '"'

From 7a005aa96b509441fe29fff57541e6d7be61afbb Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 28 Dec 2022 13:22:36 -0600
Subject: [PATCH 1621/2403] break out after reading the value

This is a small optimization, it avoids reading the full file when an
early key is requested.

In the case of an *invalid* TOML file such as
```
K=80
K=81
```
this stops the value of K actually returned being 8081 and makes it 80
instead; but as it's a malformed file it doesn't really matter much.
---
 shared-module/os/getenv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index aac87e9ee6..870973c5d2 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -292,6 +292,7 @@ STATIC os_getenv_err_t os_getenv_vstr(const char *path, const char *key, vstr_t
     while (!is_eof(&active_file)) {
         if (key_matches(&active_file, key)) {
             result = read_value(&active_file, buf, quoted);
+            break;
         }
     }
     close_file(&active_file);

From 3d6f37722636c97ee8540c4f536703ac047d523e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 28 Dec 2022 18:36:25 -0500
Subject: [PATCH 1622/2403] Fix single quote in ru.po

---
 locale/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/ru.po b/locale/ru.po
index 8152dcc694..3d7f536335 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -173,7 +173,7 @@ msgstr "%q должно быть >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr "%q должно быть bytearray или array типа ‘H' или 'B'"
+msgstr "%q должно быть bytearray или array типа 'H' или 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"

From cc92ce4820aebb4a1db93828f42a0ed7e97205ce Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 29 Dec 2022 19:49:40 -0500
Subject: [PATCH 1623/2403] Use memory fence when disabling cache to avoid -O2
 problems

---
 ports/atmel-samd/peripherals                     |  2 +-
 ports/nrf/peripherals/nrf/cache.c                | 10 ++++++++++
 .../shared/external_flash/external_flash.c       | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals
index 57133eefeb..baca4c0843 160000
--- a/ports/atmel-samd/peripherals
+++ b/ports/atmel-samd/peripherals
@@ -1 +1 @@
-Subproject commit 57133eefeb077f73b5ac17ee044d9feaf566da8e
+Subproject commit baca4c084334aa8625f525a4032d66a397199ea6
diff --git a/ports/nrf/peripherals/nrf/cache.c b/ports/nrf/peripherals/nrf/cache.c
index 6eb590d770..54bb77980b 100644
--- a/ports/nrf/peripherals/nrf/cache.c
+++ b/ports/nrf/peripherals/nrf/cache.c
@@ -29,8 +29,18 @@
 
 // Turn off cache and invalidate all data in it.
 void nrf_peripherals_disable_and_clear_cache(void) {
+    // Memory fence for hardware and compiler reasons. If this routine is inlined, the compiler
+    // needs to know that everything written out be stored before this is called.
+    // -O2 optimization needed this on SAMD51. Assuming nRF may have the same issue.
+    // __sync_synchronize() includes volatile asm(), which tells the compiler not to assume
+    // state across this call.
+    __sync_synchronize();
+
     // Disabling cache also invalidates all cache entries.
     NRF_NVMC->ICACHECNF &= ~(1 << NVMC_ICACHECNF_CACHEEN_Pos);
+
+    // Memory fence for hardware and compiler reasons.
+    __sync_synchronize();
 }
 
 // Enable cache
diff --git a/supervisor/shared/external_flash/external_flash.c b/supervisor/shared/external_flash/external_flash.c
index 7da45fdc99..141ad7e5f8 100644
--- a/supervisor/shared/external_flash/external_flash.c
+++ b/supervisor/shared/external_flash/external_flash.c
@@ -58,6 +58,9 @@ static supervisor_allocation *supervisor_cache = NULL;
 
 // Wait until both the write enable and write in progress bits have cleared.
 static bool wait_for_flash_ready(void) {
+    if (flash_device == NULL) {
+        return false;
+    }
     bool ok = true;
     // Both the write enable and write in progress bits should be low.
     if (flash_device->no_ready_bit) {
@@ -192,6 +195,9 @@ static bool copy_block(uint32_t src_address, uint32_t dest_address) {
     return true;
 }
 
+#define READ_JEDEC_ID_RETRY_COUNT (100)
+
+// If this fails, flash_device will remain NULL.
 void supervisor_flash_init(void) {
     if (flash_device != NULL) {
         return;
@@ -220,7 +226,11 @@ void supervisor_flash_init(void) {
     #else
     // The response will be 0xff if the flash needs more time to start up.
     uint8_t jedec_id_response[3] = {0xff, 0xff, 0xff};
-    while (jedec_id_response[0] == 0xff) {
+    // Response can also be 0x00 if reading before ready. When compiled with `-O2`, typically
+    // takes three tries to read on Grand Central M4.
+
+    size_t count = READ_JEDEC_ID_RETRY_COUNT;
+    while ((count-- > 0) && (jedec_id_response[0] == 0xff || jedec_id_response[2] == 0x00)) {
         spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
     }
     for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
@@ -234,6 +244,7 @@ void supervisor_flash_init(void) {
     }
     #endif
     if (flash_device == NULL) {
+        // Flash did not respond. Give up.
         return;
     }
 
@@ -293,6 +304,9 @@ uint32_t supervisor_flash_get_block_size(void) {
 
 // The total number of available blocks.
 uint32_t supervisor_flash_get_block_count(void) {
+    if (flash_device == NULL) {
+        return 0;
+    }
     // We subtract one erase sector size because we may use it as a staging area
     // for writes.
     return (flash_device->total_size - SPI_FLASH_ERASE_SIZE) / FILESYSTEM_BLOCK_SIZE;

From 42195a4a2990e48c4f360e32511d0c42fbfbe6b8 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 30 Dec 2022 17:37:37 +0000
Subject: [PATCH 1624/2403] Added M5Stack Atom Matrix board

---
 .../boards/m5stack_atom_matrix/board.c        | 29 +++++++++++
 .../m5stack_atom_matrix/mpconfigboard.h       | 49 ++++++++++++++++++
 .../m5stack_atom_matrix/mpconfigboard.mk      | 10 ++++
 .../boards/m5stack_atom_matrix/pins.c         | 51 +++++++++++++++++++
 .../boards/m5stack_atom_matrix/sdkconfig      | 27 ++++++++++
 5 files changed, 166 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_atom_matrix/board.c
 create mode 100644 ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_atom_matrix/pins.c
 create mode 100644 ports/espressif/boards/m5stack_atom_matrix/sdkconfig

diff --git a/ports/espressif/boards/m5stack_atom_matrix/board.c b/ports/espressif/boards/m5stack_atom_matrix/board.c
new file mode 100644
index 0000000000..c0d9676d86
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_matrix/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
new file mode 100644
index 0000000000..926b7efbc4
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Atom Matrix"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO27)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO25}, \
+                                     {.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO23, .mosi = &pin_GPIO19, .miso = &pin_GPIO33}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
new file mode 100644
index 0000000000..c34fa9d836
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320004
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_matrix/pins.c b/ports/espressif/boards/m5stack_atom_matrix/pins.c
new file mode 100644
index 0000000000..9b18b954f0
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_matrix/pins.c
@@ -0,0 +1,51 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_atom_matrix/sdkconfig b/ports/espressif/boards/m5stack_atom_matrix/sdkconfig
new file mode 100644
index 0000000000..a6678556eb
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_matrix/sdkconfig
@@ -0,0 +1,27 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskAtomMatrix"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 52ee5a92725a6f9780ef6d572b7433ff163d2c97 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 30 Dec 2022 20:21:00 +0000
Subject: [PATCH 1625/2403] Added M5Stack Atom Echo

---
 .../boards/m5stack_atom_echo/board.c          | 29 ++++++++++++
 .../boards/m5stack_atom_echo/mpconfigboard.h  | 46 +++++++++++++++++++
 .../boards/m5stack_atom_echo/mpconfigboard.mk | 10 ++++
 .../espressif/boards/m5stack_atom_echo/pins.c | 43 +++++++++++++++++
 .../boards/m5stack_atom_echo/sdkconfig        | 27 +++++++++++
 5 files changed, 155 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_atom_echo/board.c
 create mode 100644 ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_atom_echo/pins.c
 create mode 100644 ports/espressif/boards/m5stack_atom_echo/sdkconfig

diff --git a/ports/espressif/boards/m5stack_atom_echo/board.c b/ports/espressif/boards/m5stack_atom_echo/board.c
new file mode 100644
index 0000000000..c0d9676d86
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_echo/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
new file mode 100644
index 0000000000..25eaec1e52
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Atom Echo"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO27)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO25}, \
+                                     {.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
new file mode 100644
index 0000000000..663ceaad81
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320005
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_echo/pins.c b/ports/espressif/boards/m5stack_atom_echo/pins.c
new file mode 100644
index 0000000000..d070414fe5
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_echo/pins.c
@@ -0,0 +1,43 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_SDI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_LRC), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_atom_echo/sdkconfig b/ports/espressif/boards/m5stack_atom_echo/sdkconfig
new file mode 100644
index 0000000000..c6a1fcbabf
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_echo/sdkconfig
@@ -0,0 +1,27 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskAtomEcho"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 58e32bd2cb9a492aeb7163a9ac8964434738a3ed Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 30 Dec 2022 23:09:38 +0000
Subject: [PATCH 1626/2403] Fixed speacker and microphone pins definition

---
 ports/espressif/boards/m5stack_atom_echo/pins.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/m5stack_atom_echo/pins.c b/ports/espressif/boards/m5stack_atom_echo/pins.c
index d070414fe5..2b8044f07e 100644
--- a/ports/espressif/boards/m5stack_atom_echo/pins.c
+++ b/ports/espressif/boards/m5stack_atom_echo/pins.c
@@ -8,10 +8,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     // External pins are in silkscreen order, from top to bottom, left side, then right side
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO22) },
-    { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO19) },
-    { MP_ROM_QSTR(MP_QSTR_I2S_SDI), MP_ROM_PTR(&pin_GPIO23) },
-    { MP_ROM_QSTR(MP_QSTR_I2S_LRC), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_SPK_I2S_SDO), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_SPK_I2S_SCK), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPK_I2S_LRC), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_CLK), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_DATA), MP_ROM_PTR(&pin_GPIO23) },
 
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },

From dec0b272fec849d02285524654c316a8ee6a25a6 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Fri, 30 Dec 2022 23:21:46 +0000
Subject: [PATCH 1627/2403] Fixed I2C bus definition

---
 ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h | 5 ++---
 ports/espressif/boards/m5stack_atom_echo/pins.c          | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
index 25eaec1e52..7d67267897 100644
--- a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
@@ -31,9 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO27)
 
-#define CIRCUITPY_BOARD_I2C         (2)
-#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO25}, \
-                                     {.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
 
 // For entering safe mode
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
diff --git a/ports/espressif/boards/m5stack_atom_echo/pins.c b/ports/espressif/boards/m5stack_atom_echo/pins.c
index 2b8044f07e..68b6389215 100644
--- a/ports/espressif/boards/m5stack_atom_echo/pins.c
+++ b/ports/espressif/boards/m5stack_atom_echo/pins.c
@@ -1,8 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 #include "shared-module/displayio/__init__.h"
 
-CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
-
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -39,8 +37,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO12) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_i2c_obj) },
 
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 4fe00ef74a4225f2d80eebf6b79e69f7fe41ca4d Mon Sep 17 00:00:00 2001
From: CDario 
Date: Sat, 31 Dec 2022 06:21:49 +0000
Subject: [PATCH 1628/2403] Added M5Stack Atom U

---
 ports/espressif/boards/m5stack_atom_u/board.c | 29 +++++++++++
 .../boards/m5stack_atom_u/mpconfigboard.h     | 48 +++++++++++++++++++
 .../boards/m5stack_atom_u/mpconfigboard.mk    | 10 ++++
 ports/espressif/boards/m5stack_atom_u/pins.c  | 42 ++++++++++++++++
 .../espressif/boards/m5stack_atom_u/sdkconfig | 27 +++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_atom_u/board.c
 create mode 100644 ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_atom_u/pins.c
 create mode 100644 ports/espressif/boards/m5stack_atom_u/sdkconfig

diff --git a/ports/espressif/boards/m5stack_atom_u/board.c b/ports/espressif/boards/m5stack_atom_u/board.c
new file mode 100644
index 0000000000..c0d9676d86
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_u/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
new file mode 100644
index 0000000000..b3b0a650ab
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 CDarius
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Atom U"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO27)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO32, .sda = &pin_GPIO26}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO23, .mosi = &pin_GPIO19, .miso = &pin_GPIO33}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
new file mode 100644
index 0000000000..18bb6d3dc0
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320006
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_u/pins.c b/ports/espressif/boards/m5stack_atom_u/pins.c
new file mode 100644
index 0000000000..4ba62ae2b7
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_u/pins.c
@@ -0,0 +1,42 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_A32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_CLK), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_DATA), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_i2c_obj) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_atom_u/sdkconfig b/ports/espressif/boards/m5stack_atom_u/sdkconfig
new file mode 100644
index 0000000000..7f405b00e0
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atom_u/sdkconfig
@@ -0,0 +1,27 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskAtomU"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 91d28c7623da8520c2c12abfe8049d443ed20cc7 Mon Sep 17 00:00:00 2001
From: Orlando Caro 
Date: Fri, 30 Dec 2022 15:58:04 +0000
Subject: [PATCH 1629/2403] Translated using Weblate (Spanish)

Currently translated at 85.8% (856 of 997 strings)

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

diff --git a/locale/es.po b/locale/es.po
index f39d4e2da5..5b8e3b5883 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-09-23 17:20+0000\n"
-"Last-Translator: Alvaro Figueroa \n"
+"PO-Revision-Date: 2022-12-31 17:50+0000\n"
+"Last-Translator: Orlando Caro \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "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.14.1\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -97,9 +97,8 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
-#, fuzzy
 msgid "%q"
-msgstr "%q"
+msgstr ""
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -134,7 +133,7 @@ msgstr "%q inicializado fallido"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q es %q"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -174,27 +173,27 @@ msgstr "%q debe ser >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q debe ser un byte-matriz o matriz de tipo 'H' o 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q"
-msgstr ""
+msgstr "%q debe ser de typo %q"
 
 #: py/objexcept.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or None"
-msgstr ""
+msgstr "%q debe ser de tipo %q o None"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
-msgstr ""
+msgstr "%q debe ser potencia de 2"
 
 #: shared-bindings/wifi/Monitor.c
 msgid "%q out of bounds"
-msgstr ""
+msgstr "%q fuera de limites"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
@@ -211,7 +210,7 @@ msgstr "pin inválido %q"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "%q paso no puede ser cero"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -219,11 +218,11 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q, %q, and %q must all be the same length"
-msgstr ""
+msgstr "%q, %q, y %q deben tener el mismo largo"
 
 #: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
@@ -412,7 +411,7 @@ msgstr "La dirección debe tener %d bytes de largo"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Rango de dirección no permitido"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -510,7 +509,7 @@ msgstr "Ya se están buscando redes wifi"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "Un error ocurrió mientras recuperaba '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -541,7 +540,7 @@ msgstr "Asignación del montículo mientras la VM no esta ejecutándose."
 
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
-msgstr ""
+msgstr "Conversión de audio no esta implementada"
 
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
@@ -586,11 +585,12 @@ msgstr "Bits depth debe ser múltiplo de 8."
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Bitmap size and bits per value must match"
-msgstr ""
+msgstr "El tamaño del mapa de bits y los bits por valor deben cotejar"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first device (interface #0)."
 msgstr ""
+"El dispositivo de arranque debe de ser el primer dispositivo (interfase #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -601,7 +601,7 @@ msgstr "Ambos RX y TX requeridos para control de flujo"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "Both buttons were pressed at start up.\n"
-msgstr ""
+msgstr "Ambos botones fueron prensados al inicio\n"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
@@ -631,17 +631,17 @@ msgstr ""
 
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is not a bytearray."
-msgstr "Buffer no es un bytearray."
+msgstr "Búfer no es un bytearray."
 
 #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is too small"
-msgstr "El buffer es muy pequeño"
+msgstr "Búfer es muy pequeño"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
-msgstr "Longitud del buffer %d es demasiado grande. Tiene que ser menor a %d"
+msgstr "Longitud del búfer %d es demasiado grande. Tiene que ser menor a %d"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
@@ -655,11 +655,11 @@ msgstr "Búfer deber ser un múltiplo de 512 bytes"
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
-msgstr "Búffer muy corto por %d bytes"
+msgstr "Búfer muy corto por %d bytes"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
-msgstr ""
+msgstr "Búferes deben ser del mismo tamaño"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
@@ -672,7 +672,7 @@ msgstr "Bus pin %d ya está siendo utilizado"
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
-msgstr ""
+msgstr "Botón A fue presionado al inicio.\n"
 
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
@@ -683,8 +683,9 @@ msgid "CBC blocks must be multiples of 16 bytes"
 msgstr "Los bloques CBC deben ser múltiplos de 16 bytes"
 
 #: supervisor/shared/safe_mode.c
+#, fuzzy
 msgid "CIRCUITPY drive could not be found or created."
-msgstr ""
+msgstr "CIRCUITPY dispositivo de guardo no pudo ser encontrado o creado."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
@@ -696,7 +697,7 @@ msgstr "Llame a super().__init__() antes de acceder al objeto nativo."
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "Inicialización de cámara"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
@@ -4256,7 +4257,7 @@ msgstr "nombre en unicode escapa"
 
 #: py/parse.c
 msgid "unindent doesn't match any outer indent level"
-msgstr ""
+msgstr "unindent no coteja ningún nivel de espacio exterior"
 
 #: py/objstr.c
 #, c-format
@@ -4278,7 +4279,7 @@ msgstr "tipo desconocido '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "no coteja '%c' en formato"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4300,11 +4301,11 @@ msgstr "instrucción Xtensa '%s' con %d argumentos no soportada"
 
 #: shared-module/gifio/GifWriter.c
 msgid "unsupported colorspace for GifWriter"
-msgstr ""
+msgstr "espacio de color no soportado para GifWriter"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "unsupported colorspace for dither"
-msgstr ""
+msgstr "espacio de color no soportado para tramado"
 
 #: py/objstr.c
 #, c-format
@@ -4325,11 +4326,11 @@ msgstr "tipos no soportados para %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols es muy alto"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "usecols palabra clave debe de ser especificada"
 
 #: py/objint.c
 #, c-format
@@ -4338,7 +4339,7 @@ msgstr "el valor debe caber en %d byte(s)"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "value out of range of target"
-msgstr ""
+msgstr "valor fuera de alcance al blanco"
 
 #: shared-bindings/displayio/Bitmap.c
 msgid "value_count must be > 0"
@@ -4359,7 +4360,7 @@ msgstr "wifi no esta habilitado"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor no esta disponible"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
@@ -4375,7 +4376,7 @@ msgstr "eje especificado erróneo"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "erroneo dtype"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4389,11 +4390,11 @@ msgstr "tipo de entrada incorrecta"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of condition array"
-msgstr ""
+msgstr "largo erroneo en el arreglo de condiciones"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "largo erroneo en el arreglo de índices"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From d2361ae4f9029a6b2a3093788f9786d70fcca2a0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 1 Jan 2023 16:39:52 -0600
Subject: [PATCH 1630/2403] Avoid an undefined shift

(1 << 32), an operation on a signed 32-bit int, is undefined in C. The
operation on the unsigned int (1u<<32) is defined as zero, which is
the desired outcome (subtracting 1 yields the value with all bits set)

This problem was detected by clang scan-build static analysis
---
 shared-module/displayio/Bitmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 676aec2186..ab1b85ea16 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -70,8 +70,8 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
         self->x_shift++;
         power_of_two <<= 1;
     }
-    self->x_mask = (1 << self->x_shift) - 1; // Used as a modulus on the x value
-    self->bitmask = (1 << bits_per_value) - 1;
+    self->x_mask = (1u << self->x_shift) - 1u; // Used as a modulus on the x value
+    self->bitmask = (1u << bits_per_value) - 1u;
 
     self->dirty_area.x1 = 0;
     self->dirty_area.x2 = width;

From d8081857444496b8849a8a910ef0fda771f1cfce Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 1 Jan 2023 16:40:06 -0600
Subject: [PATCH 1631/2403] Emphasize that ALIGN_BITS is a constant

---
 shared-module/displayio/Bitmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index ab1b85ea16..7a1b3e6b17 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -30,12 +30,12 @@
 
 #include "py/runtime.h"
 
-enum { align_bits = 8 * sizeof(uint32_t) };
+enum { ALIGN_BITS = 8 * sizeof(uint32_t) };
 
 static int stride(uint32_t width, uint32_t bits_per_value) {
     uint32_t row_width = width * bits_per_value;
     // align to uint32_t
-    return (row_width + align_bits - 1) / align_bits;
+    return (row_width + ALIGN_BITS - 1) / ALIGN_BITS;
 }
 
 void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t width,
@@ -66,7 +66,7 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
     self->x_shift = 0; // Used to divide the index by the number of pixels per word. Its used in a
                        // shift which effectively divides by 2 ** x_shift.
     uint32_t power_of_two = 1;
-    while (power_of_two < align_bits / bits_per_value) {
+    while (power_of_two < ALIGN_BITS / bits_per_value) {
         self->x_shift++;
         power_of_two <<= 1;
     }

From 34043c2d38c9e9c52fbcee8fe487099098eab927 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 1 Jan 2023 16:44:12 -0600
Subject: [PATCH 1632/2403] Only store up to 'width' pixels, not 'stride'

error detected by clang scan-build static analysis
---
 shared-module/bitmaptools/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 4c73d8fb8e..67b5254b32 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -689,7 +689,7 @@ STATIC void fill_row(displayio_bitmap_t *bitmap, int swap, int16_t *luminance_da
 static void write_pixels(displayio_bitmap_t *bitmap, int y, bool *data) {
     if (bitmap->bits_per_value == 1) {
         uint32_t *pixel_data = (uint32_t *)(bitmap->data + bitmap->stride * y);
-        for (int i = 0; i < bitmap->stride; i++) {
+        for (int i = 0; i < bitmap->width; i++) {
             uint32_t p = 0;
             for (int j = 0; j < 32; j++) {
                 p = (p << 1);

From ef8b297d7f6e04818370de2fe3409823f45b9d02 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 1 Jan 2023 16:56:46 -0600
Subject: [PATCH 1633/2403] Avoid null pointer dereference when no kwargs

clang scan-build reports "Access to field 'table' results in a
dereference of a null pointer (loaded from variable 'kw_args')"
---
 py/objtype.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/objtype.c b/py/objtype.c
index 0914ad5f2e..76b9551be8 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -106,7 +106,9 @@ STATIC mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *pos_args
     // copy in args
     memcpy(args2, pos_args, n_args * sizeof(mp_obj_t));
     // copy in kwargs
-    memcpy(args2 + n_args, kw_args->table, 2 * n_kw * sizeof(mp_obj_t));
+    if (n_kw) {
+        memcpy(args2 + n_args, kw_args->table, 2 * n_kw * sizeof(mp_obj_t));
+    }
     self->subobj[0] = native_base->make_new(native_base, n_args, n_kw, args2);
     m_del(mp_obj_t, args2, n_args + 2 * n_kw);
 

From a3adcf0e1a7b984fd73fd911d09b2370e48eb159 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 19 Dec 2022 10:44:06 -0500
Subject: [PATCH 1634/2403] clarify read-only mac address; reuse translate msgs

---
 locale/circuitpython.pot                    | 17 +++++++----------
 ports/espressif/esp32-camera                |  2 +-
 ports/raspberrypi/common-hal/wifi/Radio.c   |  4 ++--
 shared-bindings/microcontroller/Processor.c |  2 +-
 shared-module/displayio/Bitmap.c            |  2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 57ba9766be..3878310429 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -124,6 +124,11 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+#: shared-bindings/microcontroller/Processor.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -298,7 +303,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -1856,7 +1861,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1864,10 +1869,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -3071,10 +3072,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 4ff7f348d0..54c3f61c86 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 4ff7f348d0713ea8eca022f73a059b0fe0934531
+Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 4cd80fb4b7..db21dd333b 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -64,8 +64,8 @@ static inline void nw_put_le32(uint8_t *buf, uint32_t x) {
     buf[3] = x >> 24;
 }
 
-NORETURN static void ro_attribute(int attr) {
-    mp_raise_msg_varg(&mp_type_AttributeError, MP_ERROR_TEXT("'%s' object has no attribute '%q'"), "Radio", attr);
+NORETURN static void ro_attribute(qstr attr) {
+    mp_raise_NotImplementedError_varg(translate("%q is read-only for this board"), attr);
 }
 
 bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 3b671d0c7b..2479638a92 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -72,7 +72,7 @@ STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) {
     uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency);
     common_hal_mcu_processor_set_frequency(self, value_of_freq);
     #else
-    mp_raise_msg(&mp_type_NotImplementedError,translate("frequency is read-only for this board"));
+    mp_raise_NotImplementedError_varg(translate("%q is read-only for this board"), MP_QSTR_frequency);
     #endif
     return mp_const_none;
 }
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 7a1b3e6b17..6c64830dce 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -117,7 +117,7 @@ uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *self, int16_t
 
 void displayio_bitmap_set_dirty_area(displayio_bitmap_t *self, const displayio_area_t *dirty_area) {
     if (self->read_only) {
-        mp_raise_RuntimeError(translate("Read-only object"));
+        mp_raise_RuntimeError(translate("Read-only"));
     }
 
     displayio_area_t area = *dirty_area;

From 2da4e06890aa081670ea4da92cca7099f51a4e5b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 19 Dec 2022 11:08:35 -0500
Subject: [PATCH 1635/2403] fix up esp32-camera submodule

---
 .gitmodules                  | 1 +
 ports/espressif/esp32-camera | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 3c0128f77d..dfd718630c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -310,6 +310,7 @@
 [submodule "ports/espressif/esp32-camera"]
 	path = ports/espressif/esp32-camera
 	url = https://github.com/adafruit/esp32-camera/
+        branch = circuitpython
 [submodule "ports/raspberrypi/lib/cyw43-driver"]
 	path = ports/raspberrypi/lib/cyw43-driver
 	url = https://github.com/adafruit/cyw43-driver.git
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 54c3f61c86..4ff7f348d0 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2
+Subproject commit 4ff7f348d0713ea8eca022f73a059b0fe0934531

From 01f6762aa1110bf489f39ec0ed2589a277dd78ca Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 2 Jan 2023 10:40:49 -0500
Subject: [PATCH 1636/2403] Update
 ports/espressif/boards/m5stack_atom_u/sdkconfig

---
 ports/espressif/boards/m5stack_atom_u/sdkconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_atom_u/sdkconfig b/ports/espressif/boards/m5stack_atom_u/sdkconfig
index 7f405b00e0..90c99459a8 100644
--- a/ports/espressif/boards/m5stack_atom_u/sdkconfig
+++ b/ports/espressif/boards/m5stack_atom_u/sdkconfig
@@ -1,4 +1,3 @@
-CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_SPIRAM_SUPPORT=n
 
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set

From f5c0996fb7c292ead6d0c86a84cbf8495104690b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 2 Jan 2023 10:41:11 -0500
Subject: [PATCH 1637/2403] Update
 ports/espressif/boards/m5stack_atom_echo/sdkconfig

---
 ports/espressif/boards/m5stack_atom_echo/sdkconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_atom_echo/sdkconfig b/ports/espressif/boards/m5stack_atom_echo/sdkconfig
index c6a1fcbabf..3879222bab 100644
--- a/ports/espressif/boards/m5stack_atom_echo/sdkconfig
+++ b/ports/espressif/boards/m5stack_atom_echo/sdkconfig
@@ -1,4 +1,3 @@
-CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_SPIRAM_SUPPORT=n
 
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set

From a061729dccc367c9e8cb386e3f9b67681f7546ec Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 2 Jan 2023 10:41:25 -0500
Subject: [PATCH 1638/2403] Update
 ports/espressif/boards/m5stack_atom_matrix/sdkconfig

---
 ports/espressif/boards/m5stack_atom_matrix/sdkconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_atom_matrix/sdkconfig b/ports/espressif/boards/m5stack_atom_matrix/sdkconfig
index a6678556eb..474a760b56 100644
--- a/ports/espressif/boards/m5stack_atom_matrix/sdkconfig
+++ b/ports/espressif/boards/m5stack_atom_matrix/sdkconfig
@@ -1,4 +1,3 @@
-CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_SPIRAM_SUPPORT=n
 
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set

From 03b43b7b3f59225d6c67d18b75dc0a87190c235a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 2 Jan 2023 11:45:58 -0500
Subject: [PATCH 1639/2403] complete rework for microcontroller.cpu.frequency
 and wifi.radio MAC addresses

---
 locale/circuitpython.pot                    |  5 +++-
 ports/raspberrypi/mpconfigport.mk           |  3 +++
 py/circuitpy_mpconfig.mk                    |  3 +++
 py/runtime.c                                |  4 ++--
 shared-bindings/microcontroller/Processor.c | 17 ++++++++++----
 shared-bindings/wifi/Radio.c                | 26 +++++++++++++++++++--
 6 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 3878310429..7546dfa0c6 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -125,7 +125,6 @@ msgid "%q is %q"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
-#: shared-bindings/microcontroller/Processor.c
 msgid "%q is read-only for this board"
 msgstr ""
 
@@ -2711,6 +2710,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index fa1f0c153d..c5de2a439d 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -2,6 +2,9 @@
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
+# CYW43 support does not provide settable MAC addresses for station or AP.
+CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS = 0
+
 CIRCUITPY_ALARM ?= 1
 
 CIRCUITPY_RP2PIO ?= 1
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 01b078c6e8..3c1c173a51 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -538,6 +538,9 @@ CFLAGS += -DCIRCUITPY_WIFI=$(CIRCUITPY_WIFI)
 CIRCUITPY_WEB_WORKFLOW ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_WEB_WORKFLOW=$(CIRCUITPY_WEB_WORKFLOW)
 
+CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS?= 1
+CFLAGS += -DCIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS=$(CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS)
+
 # tinyusb port tailored configuration
 CIRCUITPY_TUSB_MEM_ALIGN ?= 4
 CFLAGS += -DCIRCUITPY_TUSB_MEM_ALIGN=$(CIRCUITPY_TUSB_MEM_ALIGN)
diff --git a/py/runtime.c b/py/runtime.c
index 6be5c22335..9779456d0c 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1247,8 +1247,8 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
     mp_raise_AttributeError(MP_ERROR_TEXT("no such attribute"));
     #else
     mp_raise_msg_varg(&mp_type_AttributeError,
-        MP_ERROR_TEXT("'%s' object has no attribute '%q'"),
-        mp_obj_get_type_str(base), attr);
+        MP_ERROR_TEXT("can't set attribute '%q'"),
+        attr);
     #endif
 }
 
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 2479638a92..986f81ea53 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -65,19 +65,21 @@
 //|         ...
 
 //|     frequency: int
-//|     """The CPU operating frequency in Hertz. (read-only)"""
+//|     """The CPU operating frequency in Hertz.
+//|
+//|     **Limitations:** Setting the ``frequency`` is possible only on some i.MX boards.
+//|     On most boards, ``frequency`` is read-only.
+//|     """
 
+#if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY
 STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) {
-    #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY
     uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency);
     common_hal_mcu_processor_set_frequency(self, value_of_freq);
-    #else
-    mp_raise_NotImplementedError_varg(translate("%q is read-only for this board"), MP_QSTR_frequency);
-    #endif
     return mp_const_none;
 }
 
 MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_frequency_obj, mcu_processor_set_frequency);
+#endif
 
 
 STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) {
@@ -86,9 +88,14 @@ STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_frequency_obj, mcu_processor_get_frequency);
 
+#if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY
 MP_PROPERTY_GETSET(mcu_processor_frequency_obj,
     (mp_obj_t)&mcu_processor_get_frequency_obj,
     (mp_obj_t)&mcu_processor_set_frequency_obj);
+#else
+MP_PROPERTY_GETTER(mcu_processor_frequency_obj,
+    (mp_obj_t)&mcu_processor_get_frequency_obj);
+#endif
 
 //|     reset_reason: microcontroller.ResetReason
 //|     """The reason the microcontroller started up from reset state."""
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index c12e19e726..27a5907894 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -139,13 +139,19 @@ MP_PROPERTY_GETSET(wifi_radio_hostname_obj,
 
 //|     mac_address: ReadableBuffer
 //|     """MAC address for the station. When the address is altered after interface is connected
-//|        the changes would only be reflected once the interface reconnects."""
+//|        the changes would only be reflected once the interface reconnects.
+//|
+//|     **Limitations:** Not settable on RP2040 CYW43 boards, such as Pi Pico W.
+//|     """
+
+
 STATIC mp_obj_t _wifi_radio_get_mac_address(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_obj, _wifi_radio_get_mac_address);
 
+#if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS
 STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_address_in) {
     mp_buffer_info_t mac_address;
     mp_get_buffer_raise(mac_address_in, &mac_address, MP_BUFFER_READ);
@@ -160,10 +166,16 @@ STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_addres
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_obj, wifi_radio_set_mac_address);
+#endif
 
+#if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS
 MP_PROPERTY_GETSET(wifi_radio_mac_address_obj,
     (mp_obj_t)&wifi_radio_get_mac_address_obj,
     (mp_obj_t)&wifi_radio_set_mac_address_obj);
+#else
+MP_PROPERTY_GETTER(wifi_radio_mac_address_obj,
+    (mp_obj_t)&wifi_radio_get_mac_address_obj);
+#endif
 
 //|     tx_power: float
 //|     """Wifi transmission power, in dBm."""
@@ -187,13 +199,17 @@ MP_PROPERTY_GETSET(wifi_radio_tx_power_obj,
 
 //|     mac_address_ap: ReadableBuffer
 //|     """MAC address for the AP. When the address is altered after interface is started
-//|        the changes would only be reflected once the interface restarts."""
+//|        the changes would only be reflected once the interface restarts.
+//|
+//|     **Limitations:** Not settable on RP2040 CYW43 boards, such as Pi Pico W.
+//|     """
 STATIC mp_obj_t wifi_radio_get_mac_address_ap(mp_obj_t self_in) {
     wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address_ap(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_ap_obj, wifi_radio_get_mac_address_ap);
 
+#if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS
 STATIC mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_address_in) {
     mp_buffer_info_t mac_address;
     mp_get_buffer_raise(mac_address_in, &mac_address, MP_BUFFER_READ);
@@ -208,10 +224,16 @@ STATIC mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_add
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_mac_address_ap_obj, wifi_radio_set_mac_address_ap);
+#endif
 
+#if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS
 MP_PROPERTY_GETSET(wifi_radio_mac_address_ap_obj,
     (mp_obj_t)&wifi_radio_get_mac_address_ap_obj,
     (mp_obj_t)&wifi_radio_set_mac_address_ap_obj);
+#else
+MP_PROPERTY_GETTER(wifi_radio_mac_address_ap_obj,
+    (mp_obj_t)&wifi_radio_get_mac_address_ap_obj);
+#endif
 
 //|     def start_scanning_networks(
 //|         self, *, start_channel: int = 1, stop_channel: int = 11

From 86e2a2440153c4b8a135f8a89619c15c9609ff7b Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Mon, 2 Jan 2023 19:23:35 +0100
Subject: [PATCH 1640/2403] 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             | 23 +++++++++++++----------
 locale/cs.po             | 20 ++++++++++----------
 locale/de_DE.po          | 26 ++++++++++++++++----------
 locale/el.po             | 20 ++++++++++----------
 locale/en_GB.po          | 23 +++++++++++++----------
 locale/es.po             | 23 +++++++++++++----------
 locale/fil.po            | 25 ++++++++++++++-----------
 locale/fr.po             | 26 ++++++++++++++++----------
 locale/hi.po             | 20 ++++++++++----------
 locale/it_IT.po          | 25 ++++++++++++++-----------
 locale/ja.po             | 23 +++++++++++++----------
 locale/ko.po             | 20 ++++++++++----------
 locale/nl.po             | 23 +++++++++++++----------
 locale/pl.po             | 23 +++++++++++++----------
 locale/pt_BR.po          | 26 ++++++++++++++++----------
 locale/ru.po             | 20 ++++++++++----------
 locale/sv.po             | 26 ++++++++++++++++----------
 locale/tr.po             | 20 ++++++++++----------
 locale/zh_Latn_pinyin.po | 26 ++++++++++++++++----------
 19 files changed, 246 insertions(+), 192 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index acb228ebea..9f1e185dff 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -130,6 +130,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -304,7 +308,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Objek '%s' tidak memiliki atribut '%q'"
 
@@ -1883,7 +1887,7 @@ msgid "Random number generation error"
 msgstr "Kesalahan pembuatan nomor acak"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Baca-saja"
 
@@ -1891,10 +1895,6 @@ msgstr "Baca-saja"
 msgid "Read-only filesystem"
 msgstr "sistem file (filesystem) bersifat Read-only"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Objek Read-only"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2741,6 +2741,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3102,10 +3106,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
@@ -4378,6 +4378,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "Read-only object"
+#~ msgstr "Objek Read-only"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q panjang harus >= 1"
 
diff --git a/locale/cs.po b/locale/cs.po
index cf7973d4ad..b73fe1df88 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -131,6 +131,10 @@ msgstr "Inicializace %q selhala"
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "Délka %q musí být %d"
@@ -305,7 +309,7 @@ msgstr "'%s' objekt nepodporuje přiřazení položky"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' objekt nepodporuje smazání položky"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' objekt nemá žádný atribut '%q'"
 
@@ -1874,7 +1878,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1882,10 +1886,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2728,6 +2728,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3089,10 +3093,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index a72022c938..69d2e6ee36 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -132,6 +132,10 @@ msgstr "%q Initialisierung ist gescheitert"
 msgid "%q is %q"
 msgstr "%q ist %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q länge muss %d betragen"
@@ -308,7 +312,7 @@ msgstr "'%s' Objekt unterstützt keine Element-Zuordnung"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' Objekt unterstützt keine Löschung von Elementen"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' Objekt hat kein Attribut '%q'"
 
@@ -1899,7 +1903,7 @@ msgid "Random number generation error"
 msgstr "Fehler bei der Erzeugung von Zufallszahlen"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Nur lesen möglich, da Schreibgeschützt"
 
@@ -1907,10 +1911,6 @@ msgstr "Nur lesen möglich, da Schreibgeschützt"
 msgid "Read-only filesystem"
 msgstr "Schreibgeschützte Dateisystem"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Schreibgeschützte Objekt"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Erhaltene Antwort ist ungültig"
@@ -2787,6 +2787,10 @@ msgstr "Kann Blockgröße von 512 nicht setzen"
 msgid "can't set attribute"
 msgstr "kann Attribut nicht setzen"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "Speichern von '%q' nicht möglich"
@@ -3158,10 +3162,6 @@ msgstr "Die Schriftart (font) muss 2048 Byte lang sein"
 msgid "format requires a dict"
 msgstr "Format erfordert ein Wörterbuch (dict)"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr "Frequenz ist für dieses Board schreibgeschützt"
-
 #: py/objdeque.c
 msgid "full"
 msgstr "voll"
@@ -4448,6 +4448,12 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Read-only object"
+#~ msgstr "Schreibgeschützte Objekt"
+
+#~ msgid "frequency is read-only for this board"
+#~ msgstr "Frequenz ist für dieses Board schreibgeschützt"
+
 #~ msgid "Unable to write"
 #~ msgstr "Schreiben nicht möglich"
 
diff --git a/locale/el.po b/locale/el.po
index 246d49ad74..fe882c9f30 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -136,6 +136,10 @@ msgstr "%q εκκίνηση απέτυχε"
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q μήκος πρέπει να είναι %d"
@@ -310,7 +314,7 @@ msgstr "'%s' αντικείμενο δεν υποστηρίζει ορισμό 
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' αντικείμενο δεν υποστηρίζει διαγραφή πράγματος"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' αντικείμενο δεν έχει γνώρισμα '%q'"
 
@@ -1883,7 +1887,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1891,10 +1895,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2737,6 +2737,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3098,10 +3102,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 74c7efabf5..6bb13d2570 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -134,6 +134,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -308,7 +312,7 @@ msgstr "'%s' object doesn't support item assignment"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' object doesn't support item deletion"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object has no attribute '%q'"
 
@@ -1880,7 +1884,7 @@ msgid "Random number generation error"
 msgstr "Random number generation error"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Read-only"
 
@@ -1888,10 +1892,6 @@ msgstr "Read-only"
 msgid "Read-only filesystem"
 msgstr "Read-only filesystem"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Read-only object"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Received response was invalid"
@@ -2744,6 +2744,10 @@ msgstr "can't set 512 block size"
 msgid "can't set attribute"
 msgstr "can't set attribute"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "can't store '%q'"
@@ -3108,10 +3112,6 @@ msgstr "font must be 2048 bytes long"
 msgid "format requires a dict"
 msgstr "format requires a dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "full"
@@ -4383,6 +4383,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 "Read-only object"
+#~ msgstr "Read-only object"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q length must be >= 1"
 
diff --git a/locale/es.po b/locale/es.po
index 5b8e3b5883..f65f60a770 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -135,6 +135,10 @@ msgstr "%q inicializado fallido"
 msgid "%q is %q"
 msgstr "%q es %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q tamaño debe ser %d"
@@ -309,7 +313,7 @@ msgstr "'%s' el objeto no tiene capacidad de asignación de item"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' el objeto no tiene capacidad de borrado de item"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "objeto '%s' no tiene atributo '%q'"
 
@@ -1909,7 +1913,7 @@ msgid "Random number generation error"
 msgstr "Error de generación de números aleatorios"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Solo-lectura"
 
@@ -1917,10 +1921,6 @@ msgstr "Solo-lectura"
 msgid "Read-only filesystem"
 msgstr "Sistema de archivos de solo-Lectura"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Objeto de solo-lectura"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "La respuesta recibida es invalida"
@@ -2782,6 +2782,10 @@ msgstr "no se puede definir un tamaño de bloque de 512"
 msgid "can't set attribute"
 msgstr "no se puede asignar el atributo"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "no se puede almacenar '%q'"
@@ -3149,10 +3153,6 @@ msgstr "font debe ser 2048 bytes de largo"
 msgid "format requires a dict"
 msgstr "format requiere un dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "lleno"
@@ -4432,6 +4432,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 "Read-only object"
+#~ msgstr "Objeto de solo-lectura"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q tamaño debe ser >= 1"
 
diff --git a/locale/fil.po b/locale/fil.po
index 6731d2d458..7a77dab021 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -125,6 +125,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -300,7 +304,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object ay walang attribute '%q'"
 
@@ -1872,7 +1876,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Basahin-lamang"
 
@@ -1880,11 +1884,6 @@ msgstr "Basahin-lamang"
 msgid "Read-only filesystem"
 msgstr "Basahin-lamang mode"
 
-#: shared-module/displayio/Bitmap.c
-#, fuzzy
-msgid "Read-only object"
-msgstr "Basahin-lamang"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2732,6 +2731,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "hindi ma i-set ang attribute"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "hindi ma i-store ang '%q'"
@@ -3101,10 +3104,6 @@ msgstr "font ay dapat 2048 bytes ang haba"
 msgid "format requires a dict"
 msgstr "kailangan ng format ng dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "puno"
@@ -4385,6 +4384,10 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Read-only object"
+#~ msgstr "Basahin-lamang"
+
 #~ msgid "Invalid pins"
 #~ msgstr "Mali ang pins"
 
diff --git a/locale/fr.po b/locale/fr.po
index 908f93b553..910c11cf57 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -136,6 +136,10 @@ msgstr "échec de l'initialisation %q"
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "La longeur de %q doit être %d"
@@ -310,7 +314,7 @@ msgstr "l'objet %s ne supporte pas l'assignation d'éléments"
 msgid "'%s' object doesn't support item deletion"
 msgstr "L'objet '%s' ne prend pas en charge la suppression d'éléments"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "l'objet '%s' n'a pas d'attribut '%q'"
 
@@ -1929,7 +1933,7 @@ msgid "Random number generation error"
 msgstr "Erreur de génération de chiffres aléatoires"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Lecture seule"
 
@@ -1937,10 +1941,6 @@ msgstr "Lecture seule"
 msgid "Read-only filesystem"
 msgstr "Système de fichier en lecture seule"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Objet en lecture seule"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Réponse reçue invalide"
@@ -2815,6 +2815,10 @@ msgstr "impossible de définir une taille de bloc de 512"
 msgid "can't set attribute"
 msgstr "attribut non modifiable"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "impossible de stocker '%q'"
@@ -3188,10 +3192,6 @@ msgstr "la police doit être longue de 2048 octets"
 msgid "format requires a dict"
 msgstr "le format nécessite un dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr "la fréquence est en lecture seule pour cette carte"
-
 #: py/objdeque.c
 msgid "full"
 msgstr "plein"
@@ -4476,6 +4476,12 @@ 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 "Read-only object"
+#~ msgstr "Objet en lecture seule"
+
+#~ msgid "frequency is read-only for this board"
+#~ msgstr "la fréquence est en lecture seule pour cette carte"
+
 #~ msgid "Unable to write"
 #~ msgstr "Écriture impossible"
 
diff --git a/locale/hi.po b/locale/hi.po
index 6e55808443..6b43cffabc 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -124,6 +124,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -298,7 +302,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -1856,7 +1860,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1864,10 +1868,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2710,6 +2710,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3071,10 +3075,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 73ed787bf8..33c397da01 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -131,6 +131,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -305,7 +309,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "l'oggetto '%s' non ha l'attributo '%q'"
 
@@ -1882,7 +1886,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Sola lettura"
 
@@ -1890,11 +1894,6 @@ msgstr "Sola lettura"
 msgid "Read-only filesystem"
 msgstr "Filesystem in sola lettura"
 
-#: shared-module/displayio/Bitmap.c
-#, fuzzy
-msgid "Read-only object"
-msgstr "Sola lettura"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2743,6 +2742,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "impossibile impostare attributo"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "impossibile memorizzare '%q'"
@@ -3109,10 +3112,6 @@ msgstr "il font deve essere lungo 2048 byte"
 msgid "format requires a dict"
 msgstr "la formattazione richiede un dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "pieno"
@@ -4398,6 +4397,10 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Read-only object"
+#~ msgstr "Sola lettura"
+
 #~ msgid "At most %d %q may be specified (not %d)"
 #~ msgstr "Almeno %d %q devono essere specificati (non %d)"
 
diff --git a/locale/ja.po b/locale/ja.po
index b2227cecab..d7573c2197 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -129,6 +129,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -303,7 +307,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -1869,7 +1873,7 @@ msgid "Random number generation error"
 msgstr "乱数生成エラー"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "読み込み専用"
 
@@ -1877,10 +1881,6 @@ msgstr "読み込み専用"
 msgid "Read-only filesystem"
 msgstr "読み込み専用のファイルシステム"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "読み込み専用のオブジェクト"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2724,6 +2724,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3089,10 +3093,6 @@ msgstr "fontは2048バイト長でなければなりません"
 msgid "format requires a dict"
 msgstr "formatにはdictが必要"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
@@ -4367,6 +4367,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Read-only object"
+#~ msgstr "読み込み専用のオブジェクト"
+
 #~ msgid "At most %d %q may be specified (not %d)"
 #~ msgstr "最大で %d個の %q が指定できます（%d個でなく）"
 
diff --git a/locale/ko.po b/locale/ko.po
index 8e7fee3e2f..39ff657aff 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -125,6 +125,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -299,7 +303,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -1859,7 +1863,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1867,10 +1871,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2714,6 +2714,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3075,10 +3079,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "완전한(full)"
diff --git a/locale/nl.po b/locale/nl.po
index 728285da8e..79b6333de4 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -127,6 +127,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -301,7 +305,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' object heeft geen attribuut '%q'"
 
@@ -1880,7 +1884,7 @@ msgid "Random number generation error"
 msgstr "Random number generatie fout"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Alleen-lezen"
 
@@ -1888,10 +1892,6 @@ msgstr "Alleen-lezen"
 msgid "Read-only filesystem"
 msgstr "Alleen-lezen bestandssysteem"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Alleen-lezen object"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2741,6 +2741,10 @@ msgstr "kan geen 512 blokgrootte instellen"
 msgid "can't set attribute"
 msgstr "kan attribute niet instellen"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "kan '%q' niet opslaan"
@@ -3104,10 +3108,6 @@ msgstr "lettertype moet 2048 bytes lang zijn"
 msgid "format requires a dict"
 msgstr "format vereist een dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "vol"
@@ -4383,6 +4383,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 "Read-only object"
+#~ msgstr "Alleen-lezen object"
+
 #~ msgid "At most %d %q may be specified (not %d)"
 #~ msgstr "Op zijn meest %d %q mogen worden gespecificeerd (niet %d)"
 
diff --git a/locale/pl.po b/locale/pl.po
index ba505d4e6b..814a5d06d4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -129,6 +129,10 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -303,7 +307,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' obiekt nie ma atrybutu '%q'"
 
@@ -1867,7 +1871,7 @@ msgid "Random number generation error"
 msgstr "Błąd generowania liczb losowych"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Tylko do odczytu"
 
@@ -1875,10 +1879,6 @@ msgstr "Tylko do odczytu"
 msgid "Read-only filesystem"
 msgstr "System plików tylko do odczytu"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Obiekt tylko do odczytu"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Otrzymana odpowiedź była nieprawidłowa"
@@ -2721,6 +2721,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "nie można ustawić atrybutu"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "nie można zapisać '%q'"
@@ -3083,10 +3087,6 @@ msgstr "font musi mieć 2048 bajtów długości"
 msgid "format requires a dict"
 msgstr "format wymaga słownika"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr "pełny"
@@ -4359,6 +4359,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Read-only object"
+#~ msgstr "Obiekt tylko do odczytu"
+
 #~ msgid "Invalid pins"
 #~ msgstr "Złe nóżki"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 63a7cda056..b82aaf1ff9 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -133,6 +133,10 @@ msgstr "a inicialização do %q falhou"
 msgid "%q is %q"
 msgstr "%q é %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "O comprimento de %q deve ser %d"
@@ -307,7 +311,7 @@ msgstr "O objeto '%s' não suporta a atribuição dos itens"
 msgid "'%s' object doesn't support item deletion"
 msgstr "O objeto '%s' não é compatível com exclusão do item"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "O objeto '%s' não possui o atributo '%q'"
 
@@ -1912,7 +1916,7 @@ msgid "Random number generation error"
 msgstr "Houve um erro na geração do número aleatório"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Somente leitura"
 
@@ -1920,10 +1924,6 @@ msgstr "Somente leitura"
 msgid "Read-only filesystem"
 msgstr "Sistema de arquivos somente leitura"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Objeto de leitura apenas"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "A resposta recebida foi inválida"
@@ -2795,6 +2795,10 @@ msgstr "não é possível definir o tamanho de 512 blocos"
 msgid "can't set attribute"
 msgstr "não é possível definir o atributo"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "não é possível armazenar '%q'"
@@ -3165,10 +3169,6 @@ msgstr "a fonte deve ter 2048 bytes de comprimento"
 msgid "format requires a dict"
 msgstr "formato requer um dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr "nesta placa, a frequência é de apenas leitura"
-
 #: py/objdeque.c
 msgid "full"
 msgstr "cheio"
@@ -4451,6 +4451,12 @@ 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 "Read-only object"
+#~ msgstr "Objeto de leitura apenas"
+
+#~ msgid "frequency is read-only for this board"
+#~ msgstr "nesta placa, a frequência é de apenas leitura"
+
 #~ msgid "Pins 21+ not supported from ULP"
 #~ msgstr "Os pinos 21+ não são suportados pelo ULP"
 
diff --git a/locale/ru.po b/locale/ru.po
index 3d7f536335..5549e7e3f9 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -135,6 +135,10 @@ msgstr "Инициализация %q не удалась"
 msgid "%q is %q"
 msgstr "%q является %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "Длинна %q должна быть %d"
@@ -309,7 +313,7 @@ msgstr "Объект '%s' не поддерживает присвоение э
 msgid "'%s' object doesn't support item deletion"
 msgstr "Объект '%s' не поддерживает удаление элементов"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Объект '%s' не имеет атрибута '%q'"
 
@@ -1924,7 +1928,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1932,10 +1936,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2780,6 +2780,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3141,10 +3145,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 1a2079f605..c64ff356c0 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -132,6 +132,10 @@ msgstr "%q init misslyckades"
 msgid "%q is %q"
 msgstr "%q är %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "längden på %q måste vara %d"
@@ -308,7 +312,7 @@ msgstr "Objektet '%s' stöder inte tilldelning"
 msgid "'%s' object doesn't support item deletion"
 msgstr "Objektet '%s' stöder inte borttagning"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "Objektet '%s' har inget attribut '%q'"
 
@@ -1892,7 +1896,7 @@ msgid "Random number generation error"
 msgstr "Fel vid generering av slumptal"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Skrivskyddad"
 
@@ -1900,10 +1904,6 @@ msgstr "Skrivskyddad"
 msgid "Read-only filesystem"
 msgstr "Skrivskyddat filsystem"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Skrivskyddat objekt"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "Mottaget svar var ogiltigt"
@@ -2766,6 +2766,10 @@ msgstr "kan inte sätta blockstorlek 512"
 msgid "can't set attribute"
 msgstr "kan inte att ange attribut"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "kan inte lagra '%q'"
@@ -3134,10 +3138,6 @@ msgstr "typsnitt måste vara 2048 bytes långt"
 msgid "format requires a dict"
 msgstr "formatet kräver en dict"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr "frekvens är skrivskyddad för detta kort"
-
 #: py/objdeque.c
 msgid "full"
 msgstr "full"
@@ -4413,6 +4413,12 @@ 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 "Read-only object"
+#~ msgstr "Skrivskyddat objekt"
+
+#~ msgid "frequency is read-only for this board"
+#~ msgstr "frekvens är skrivskyddad för detta kort"
+
 #~ msgid "Pins 21+ not supported from ULP"
 #~ msgstr "Pins 21+ stöds inte av ULP"
 
diff --git a/locale/tr.po b/locale/tr.po
index e7ed5b06bf..e25e81d679 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -136,6 +136,10 @@ msgstr "%q init başarısız oldu"
 msgid "%q is %q"
 msgstr "%q %q dir"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q boyutu %d olmalıdır"
@@ -310,7 +314,7 @@ msgstr "'%s' nesnesi, öğe atamasını desteklemiyor"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' nesnesi, öğe silmeyi desteklemiyor"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' nesnesinin '%q' özelliği yok"
 
@@ -1882,7 +1886,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1890,10 +1894,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -2736,6 +2736,10 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr ""
@@ -3097,10 +3101,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 088a006c44..8599c77f2e 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -135,6 +135,10 @@ msgstr "%q chūshǐhuà shībài"
 msgid "%q is %q"
 msgstr "%q shì %q"
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr "%q de chángdù bìxū shì %d"
@@ -310,7 +314,7 @@ msgstr "'%s' duìxiàng bù zhīchí yuánsù fùzhí"
 msgid "'%s' object doesn't support item deletion"
 msgstr "'%s' duìxiàng bù zhīchí yuánsù shānchú"
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr "'%s' duìxiàng méiyǒu shǔxìng '%q'"
 
@@ -1896,7 +1900,7 @@ msgid "Random number generation error"
 msgstr "Suíjī shù shēngchéng cuòwù"
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr "Zhǐ dú"
 
@@ -1904,10 +1908,6 @@ msgstr "Zhǐ dú"
 msgid "Read-only filesystem"
 msgstr "Zhǐ dú wénjiàn xìtǒng"
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr "Zhǐ dú duìxiàng"
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr "shōu dào de xiǎng yìng wú xiào"
@@ -2771,6 +2771,10 @@ msgstr "wúfǎ shèzhì 512 kuài dàxiǎo"
 msgid "can't set attribute"
 msgstr "wúfǎ shèzhì shǔxìng"
 
+#: py/runtime.c
+msgid "can't set attribute '%q'"
+msgstr ""
+
 #: py/emitnative.c
 msgid "can't store '%q'"
 msgstr "wúfǎ cúnchú '%q'"
@@ -3140,10 +3144,6 @@ msgstr "zìtǐ bìxū wèi 2048 zì jié"
 msgid "format requires a dict"
 msgstr "géshì yāoqiú yīgè yǔjù"
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr "cǐ zhǔ bǎn de pín lǜ wéi zhǐ dú"
-
 #: py/objdeque.c
 msgid "full"
 msgstr "chōngfèn"
@@ -4419,6 +4419,12 @@ 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 "Read-only object"
+#~ msgstr "Zhǐ dú duìxiàng"
+
+#~ msgid "frequency is read-only for this board"
+#~ msgstr "cǐ zhǔ bǎn de pín lǜ wéi zhǐ dú"
+
 #~ msgid "Unable to write"
 #~ msgstr "wú fǎ xiě rù"
 

From f23a96fa098d75d26079cfa277377f32c10c030e Mon Sep 17 00:00:00 2001
From: Jozsef Kiraly 
Date: Tue, 3 Jan 2023 20:31:18 +0000
Subject: [PATCH 1641/2403] Update config with proper USB VID

---
 .../boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
index cae5659ea9..8c5c9f5f50 100644
--- a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x2E8A
-USB_PID = 0x000A
+USB_PID = 0x1039
 USB_PRODUCT = "Waveshare RP2040-LCD-1.28"
 USB_MANUFACTURER = "Waveshare Electronics"
 

From bea62030b7c484023b1a0cb8b3c21b6a5a5fc4b3 Mon Sep 17 00:00:00 2001
From: 2231puppy <2231puppy@gmail.com>
Date: Tue, 3 Jan 2023 16:02:24 -0500
Subject: [PATCH 1642/2403] Add E-Fidget board

---
 ports/raspberrypi/boards/e_fidget/board.c     | 29 ++++++++++
 .../boards/e_fidget/mpconfigboard.h           |  5 ++
 .../boards/e_fidget/mpconfigboard.mk          | 11 ++++
 .../boards/e_fidget/pico-sdk-configboard.h    |  2 +
 ports/raspberrypi/boards/e_fidget/pins.c      | 54 +++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 ports/raspberrypi/boards/e_fidget/board.c
 create mode 100644 ports/raspberrypi/boards/e_fidget/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/e_fidget/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/e_fidget/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/e_fidget/pins.c

diff --git a/ports/raspberrypi/boards/e_fidget/board.c b/ports/raspberrypi/boards/e_fidget/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/e_fidget/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/e_fidget/mpconfigboard.h b/ports/raspberrypi/boards/e_fidget/mpconfigboard.h
new file mode 100644
index 0000000000..5c34c77f94
--- /dev/null
+++ b/ports/raspberrypi/boards/e_fidget/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "E-Fidget"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+#define MICROPY_HW_NEOPIXEL_COUNT (3)
diff --git a/ports/raspberrypi/boards/e_fidget/mpconfigboard.mk b/ports/raspberrypi/boards/e_fidget/mpconfigboard.mk
new file mode 100644
index 0000000000..62195e46f3
--- /dev/null
+++ b/ports/raspberrypi/boards/e_fidget/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x1209
+USB_PID = 0xEF00
+USB_PRODUCT = "E-Fidget"
+USB_MANUFACTURER = "2231puppy"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/e_fidget/pico-sdk-configboard.h b/ports/raspberrypi/boards/e_fidget/pico-sdk-configboard.h
new file mode 100644
index 0000000000..5f7eb47ae3
--- /dev/null
+++ b/ports/raspberrypi/boards/e_fidget/pico-sdk-configboard.h
@@ -0,0 +1,2 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/e_fidget/pins.c b/ports/raspberrypi/boards/e_fidget/pins.c
new file mode 100644
index 0000000000..40e415d94f
--- /dev/null
+++ b/ports/raspberrypi/boards/e_fidget/pins.c
@@ -0,0 +1,54 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    {MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0)},
+    {MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1)},
+    {MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2)},
+    {MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO3)},
+    {MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO4)},
+    {MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO5)},
+    {MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6)},
+    {MP_ROM_QSTR(MP_QSTR_M1), MP_ROM_PTR(&pin_GPIO7)},
+    {MP_ROM_QSTR(MP_QSTR_M5), MP_ROM_PTR(&pin_GPIO8)},
+    {MP_ROM_QSTR(MP_QSTR_M4), MP_ROM_PTR(&pin_GPIO9)},
+    {MP_ROM_QSTR(MP_QSTR_M6), MP_ROM_PTR(&pin_GPIO10)},
+    {MP_ROM_QSTR(MP_QSTR_M2), MP_ROM_PTR(&pin_GPIO11)},
+    {MP_ROM_QSTR(MP_QSTR_M7), MP_ROM_PTR(&pin_GPIO12)},
+    {MP_ROM_QSTR(MP_QSTR_M3), MP_ROM_PTR(&pin_GPIO13)},
+    {MP_ROM_QSTR(MP_QSTR_M8), MP_ROM_PTR(&pin_GPIO14)},
+    {MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15)},
+    {MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19)},
+    {MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20)},
+    {MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22)},
+
+    {MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23)},
+
+    {MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24)},
+    {MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24)},
+
+    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25)},
+    {MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25)},
+
+    {MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26)},
+
+    {MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27)},
+    {MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27)},
+    {MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27)},
+
+    {MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28)},
+    {MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28)},
+    {MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28)},
+
+    {MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29)},
+    {MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29)},
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 3d66ed27cef459fad56abac0191c7529de6f8094 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 3 Jan 2023 17:18:11 -0600
Subject: [PATCH 1643/2403] oofatfs: enable use of random volume IDs

This may help address #7409 if the underlying cause is the deterministic
volume ID. However, not all boards have working urandom (samd21
at least does not) so a couple of fallbacks are attempted when it fails.

I verified that on a pico_w, each `storage.erase_filesystem()` gives
a distinct 32-bit volume ID (pico_w's urandom can never fail)
---
 lib/oofatfs/ff.c          | 12 +++++++++---
 lib/oofatfs/ff.h          |  4 ++++
 lib/oofatfs/ffconf.h      |  6 +++++-
 py/circuitpy_mpconfig.h   |  1 +
 supervisor/shared/fatfs.c | 18 +++++++++++++++++-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index e6afd57800..9d3c67cf7d 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -257,6 +257,11 @@
 #define GET_FATTIME()   get_fattime()
 #endif
 
+#if FF_FS_MAKE_VOLID == 1
+#define MAKE_VOLID(x) (make_volid())
+#else
+#define MAKE_VOLID(x) (GET_FATTIME())
+#endif
 
 /* File lock controls */
 #if FF_FS_LOCK != 0
@@ -5421,6 +5426,7 @@ FRESULT f_mkfs (
     DWORD tbl[3];
 #endif
 
+    DWORD volid = MAKE_VOLID();
 
     /* Check mounted drive and clear work area */
     fs->fs_type = 0;    /* Clear mounted volume */
@@ -5622,7 +5628,7 @@ FRESULT f_mkfs (
             st_dword(buf + BPB_DataOfsEx, b_data - b_vol);          /* Data offset [sector] */
             st_dword(buf + BPB_NumClusEx, n_clst);                  /* Number of clusters */
             st_dword(buf + BPB_RootClusEx, 2 + tbl[0] + tbl[1]);    /* Root dir cluster # */
-            st_dword(buf + BPB_VolIDEx, GET_FATTIME());             /* VSN */
+            st_dword(buf + BPB_VolIDEx, volid);             /* VSN */
             st_word(buf + BPB_FSVerEx, 0x100);                      /* Filesystem version (1.00) */
             for (buf[BPB_BytsPerSecEx] = 0, i = ss; i >>= 1; buf[BPB_BytsPerSecEx]++) ; /* Log2 of sector size [byte] */
             for (buf[BPB_SecPerClusEx] = 0, i = au; i >>= 1; buf[BPB_SecPerClusEx]++) ; /* Log2 of cluster size [sector] */
@@ -5758,7 +5764,7 @@ FRESULT f_mkfs (
         st_dword(buf + BPB_HiddSec, b_vol);             /* Volume offset in the physical drive [sector] */
 #if FF_MKFS_FAT32
         if (fmt == FS_FAT32) {
-            st_dword(buf + BS_VolID32, GET_FATTIME());  /* VSN */
+            st_dword(buf + BS_VolID32, volid);  /* VSN */
             st_dword(buf + BPB_FATSz32, sz_fat);        /* FAT size [sector] */
             st_dword(buf + BPB_RootClus32, 2);          /* Root directory cluster # (2) */
             st_word(buf + BPB_FSInfo32, 1);             /* Offset of FSINFO sector (VBR + 1) */
@@ -5769,7 +5775,7 @@ FRESULT f_mkfs (
         } else
 #endif
         {
-            st_dword(buf + BS_VolID, GET_FATTIME());    /* VSN */
+            st_dword(buf + BS_VolID, volid);    /* VSN */
             st_word(buf + BPB_FATSz16, (WORD)sz_fat);   /* FAT size [sector] */
             buf[BS_DrvNum] = 0x80;                      /* Drive number (for int13) */
             buf[BS_BootSig] = 0x29;                     /* Extended boot signature */
diff --git a/lib/oofatfs/ff.h b/lib/oofatfs/ff.h
index a8aa00e9af..b133d770db 100644
--- a/lib/oofatfs/ff.h
+++ b/lib/oofatfs/ff.h
@@ -334,6 +334,10 @@ FRESULT f_setcp (WORD cp);                                          /* Set curre
 DWORD get_fattime (void);
 #endif
 
+#if FF_FS_MAKE_VOLID
+DWORD make_volid (void);
+#endif
+
 /* LFN support functions */
 #if FF_USE_LFN >= 1                     /* Code conversion (defined in unicode.c) */
 WCHAR ff_oem2uni (WCHAR oem, WORD cp);  /* OEM code to Unicode conversion */
diff --git a/lib/oofatfs/ffconf.h b/lib/oofatfs/ffconf.h
index 248987dda3..52ff6d0a7a 100644
--- a/lib/oofatfs/ffconf.h
+++ b/lib/oofatfs/ffconf.h
@@ -373,6 +373,10 @@
 /  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
 /  included somewhere in the scope of ff.h. */
 
-
+#ifndef FF_FS_MAKE_VOLID
+#define FF_FS_MAKE_VOLID (0)
+#endif
+/* The option FF_FS_MAKE_VOLID enables the use of a function to return a 32-bit volume identifier.
+/  If it is disabled, a Volume ID based on the current time is used. */
 
 /*--- End of configuration options ---*/
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index dc528d0787..8bfb69297a 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -594,6 +594,7 @@ void supervisor_run_background_tasks_if_tick(void);
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (0)
 #endif
 
+#define FF_FS_MAKE_VOLID (1)
 
 #define MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE (CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE)
 
diff --git a/supervisor/shared/fatfs.c b/supervisor/shared/fatfs.c
index 76db02d6bf..f1452bf567 100644
--- a/supervisor/shared/fatfs.c
+++ b/supervisor/shared/fatfs.c
@@ -28,9 +28,11 @@
 
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
-#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/microcontroller/Processor.h"
+#include "shared-bindings/os/__init__.h"
 #include "shared-bindings/rtc/RTC.h"
 #include "shared-bindings/time/__init__.h"
+#include "shared/timeutils/timeutils.h"
 
 DWORD _time_override = 0;
 DWORD get_fattime(void) {
@@ -50,3 +52,17 @@ DWORD get_fattime(void) {
 void override_fattime(DWORD time) {
     _time_override = time;
 }
+
+DWORD make_volid(void) {
+    DWORD result;
+    if (!common_hal_os_urandom((uint8_t *)&result, sizeof(result))) {
+        #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH >= 4
+        uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
+        common_hal_mcu_processor_get_uid(raw_id);
+        memcpy(&result, raw_id, sizeof(result));
+        #else
+        result = (DWORD)common_hal_time_monotonic_ns();
+        #endif
+    }
+    return result;
+}

From 38ebe90f7cd88d5db0dfd66d7a0f240ae60b4851 Mon Sep 17 00:00:00 2001
From: 2231puppy <2231puppy@gmail.com>
Date: Tue, 3 Jan 2023 19:24:48 -0500
Subject: [PATCH 1644/2403] Remove unexposed pins from E-Fidget

---
 ports/raspberrypi/boards/e_fidget/pins.c | 30 ++++--------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/ports/raspberrypi/boards/e_fidget/pins.c b/ports/raspberrypi/boards/e_fidget/pins.c
index 40e415d94f..dbb27b782d 100644
--- a/ports/raspberrypi/boards/e_fidget/pins.c
+++ b/ports/raspberrypi/boards/e_fidget/pins.c
@@ -9,46 +9,24 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO3)},
     {MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO4)},
     {MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO5)},
-    {MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6)},
     {MP_ROM_QSTR(MP_QSTR_M1), MP_ROM_PTR(&pin_GPIO7)},
-    {MP_ROM_QSTR(MP_QSTR_M5), MP_ROM_PTR(&pin_GPIO8)},
-    {MP_ROM_QSTR(MP_QSTR_M4), MP_ROM_PTR(&pin_GPIO9)},
-    {MP_ROM_QSTR(MP_QSTR_M6), MP_ROM_PTR(&pin_GPIO10)},
     {MP_ROM_QSTR(MP_QSTR_M2), MP_ROM_PTR(&pin_GPIO11)},
-    {MP_ROM_QSTR(MP_QSTR_M7), MP_ROM_PTR(&pin_GPIO12)},
     {MP_ROM_QSTR(MP_QSTR_M3), MP_ROM_PTR(&pin_GPIO13)},
+    {MP_ROM_QSTR(MP_QSTR_M4), MP_ROM_PTR(&pin_GPIO9)},
+    {MP_ROM_QSTR(MP_QSTR_M5), MP_ROM_PTR(&pin_GPIO8)},
+    {MP_ROM_QSTR(MP_QSTR_M6), MP_ROM_PTR(&pin_GPIO10)},
+    {MP_ROM_QSTR(MP_QSTR_M7), MP_ROM_PTR(&pin_GPIO12)},
     {MP_ROM_QSTR(MP_QSTR_M8), MP_ROM_PTR(&pin_GPIO14)},
-    {MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15)},
-    {MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16)},
-    {MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17)},
     {MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18)},
-    {MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19)},
-    {MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20)},
-    {MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21)},
-    {MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22)},
 
     {MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23)},
-    {MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23)},
 
     {MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24)},
-    {MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24)},
-
-    {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25)},
-    {MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25)},
 
     {MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26)},
     {MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26)},
     {MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26)},
 
-    {MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27)},
-    {MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27)},
-    {MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27)},
-
-    {MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28)},
-    {MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28)},
-    {MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28)},
-
-    {MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29)},
     {MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29)},
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From cd76ea2c901c4895d8fba258e74e1820bcc9442d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 3 Jan 2023 20:38:31 -0600
Subject: [PATCH 1645/2403] update to ulab 6.0.2

---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index 25a825e41c..e68bb707b2 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 25a825e41c26cfcee018b762416741d0d63aeabf
+Subproject commit e68bb707b20ee326d84ab75fc9fb35f2e85b87e3

From cc16bd3d53a97215d14eb8a31a9f3969aa5b2f57 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 4 Jan 2023 08:32:59 -0600
Subject: [PATCH 1646/2403] do not chain exceptions to themselves

cpython actually makes sure the newly chained exception doesn't create
a cycle (even indirectly); see _PyErr_SetObject use of "Floyd's cycle
detection algo". We'll go for the simpler solution of just checking
one level deep until it's clear we need to do more.

Closes: #7414
---
 py/vm.c                                           |  6 +++---
 tests/circuitpython/traceback_test_chained.py     | 10 ++++++++++
 tests/circuitpython/traceback_test_chained.py.exp | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 9e9dbcaa8d..2663b5fd68 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1150,7 +1150,7 @@ unwind_return:
                     mp_obj_t obj = mp_make_raise_obj(TOP());
                     #if MICROPY_CPYTHON_EXCEPTION_CHAIN
                     mp_obj_t active_exception = get_active_exception(exc_sp, exc_stack);
-                    if (active_exception != MP_OBJ_NULL) {
+                    if (active_exception != MP_OBJ_NULL && active_exception != obj) {
                         mp_store_attr(obj, MP_QSTR___context__, active_exception);
                     }
                     #endif
@@ -1164,7 +1164,7 @@ unwind_return:
                     #if MICROPY_CPYTHON_EXCEPTION_CHAIN
                     // search for the inner-most previous exception, to chain it
                     mp_obj_t active_exception = get_active_exception(exc_sp, exc_stack);
-                    if (active_exception != MP_OBJ_NULL) {
+                    if (active_exception != MP_OBJ_NULL && active_exception != obj) {
                         mp_store_attr(obj, MP_QSTR___context__, active_exception);
                     }
                     mp_store_attr(obj, MP_QSTR___cause__, cause);
@@ -1463,7 +1463,7 @@ unwind_loop:
                 exc_sp->prev_exc = nlr.ret_val;
                 mp_obj_t obj = MP_OBJ_FROM_PTR(nlr.ret_val);
                 #if MICROPY_CPYTHON_EXCEPTION_CHAIN
-                if (active_exception != MP_OBJ_NULL) {
+                if (active_exception != MP_OBJ_NULL && active_exception != obj) {
                     mp_store_attr(obj, MP_QSTR___context__, active_exception);
                 }
                 #endif
diff --git a/tests/circuitpython/traceback_test_chained.py b/tests/circuitpython/traceback_test_chained.py
index 72336d7495..dac99e00b4 100644
--- a/tests/circuitpython/traceback_test_chained.py
+++ b/tests/circuitpython/traceback_test_chained.py
@@ -62,3 +62,13 @@ try:
         1 / 0
 except Exception as e:
     print_exc_info(e)
+
+try:
+    try:
+        1 / 0
+    except Exception as inner:
+        raise inner
+except Exception as e:
+    print_exc_info(e, chain=False)
+    print_exc_info(e)
+print()
diff --git a/tests/circuitpython/traceback_test_chained.py.exp b/tests/circuitpython/traceback_test_chained.py.exp
index 5fa40126b3..a979adc24c 100644
--- a/tests/circuitpython/traceback_test_chained.py.exp
+++ b/tests/circuitpython/traceback_test_chained.py.exp
@@ -59,3 +59,18 @@ Traceback (most recent call last):
 ZeroDivisionError: division by zero
 ------------------------------------------------------------------------
 
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 70, in 
+  File "circuitpython/traceback_test_chained.py", line 68, in 
+ZeroDivisionError: division by zero
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+Traceback (most recent call last):
+  File "circuitpython/traceback_test_chained.py", line 70, in 
+  File "circuitpython/traceback_test_chained.py", line 68, in 
+ZeroDivisionError: division by zero
+------------------------------------------------------------------------
+
+

From 6b3ae630a9edb7c6e846f2f27337ec539f421c96 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 4 Jan 2023 14:16:35 -0500
Subject: [PATCH 1647/2403] Improve time alarm doc

Fixes #7406
---
 shared-bindings/alarm/time/TimeAlarm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c
index 7bd0a309b9..abbb050c64 100644
--- a/shared-bindings/alarm/time/TimeAlarm.c
+++ b/shared-bindings/alarm/time/TimeAlarm.c
@@ -51,11 +51,12 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //|         ``monotonic_time``, or when `time.time()` would equal ``epoch_time``.
 //|         Only one of the two arguments can be given.
 //|         The alarm is not active until it is passed to an
-//|         `alarm`-enabling function, such as `alarm.light_sleep_until_alarms()` or
+//|         `alarm`-enabling sleep function, such as `alarm.light_sleep_until_alarms()` or
 //|         `alarm.exit_and_deep_sleep_until_alarms()`.
 //|
-//|         If the given time is in the past when sleep occurs, the alarm will be triggered
-//|         immediately.
+//|         If the given time is already in the past, then an exception is raised.
+//|         If the sleep happens after the given time, then it will wake immediately
+//|         due to this time alarm.
 //|         """
 //|         ...
 STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type,

From 1f78d817c6bbdc9d2e38160e9e9bc2ba23cf1112 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 3 Jan 2023 05:51:39 +0000
Subject: [PATCH 1648/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (997 of 997 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 b82aaf1ff9..e4569ad596 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: 2022-12-28 03:47+0000\n"
+"PO-Revision-Date: 2023-01-05 02:52+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -135,7 +135,7 @@ msgstr "%q é %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q é de somente leitura para esta placa"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -2797,7 +2797,7 @@ msgstr "não é possível definir o atributo"
 
 #: py/runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "não é possível definir o atributo '%q'"
 
 #: py/emitnative.c
 msgid "can't store '%q'"

From 9660685a6b3566c26ae53002e6164a3bd526a520 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 3 Jan 2023 16:33:40 +0000
Subject: [PATCH 1649/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index c64ff356c0..4f83512286 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: 2022-12-28 03:47+0000\n"
+"PO-Revision-Date: 2023-01-05 02:52+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -134,7 +134,7 @@ msgstr "%q är %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q är skrivskyddad för det här kortet"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -2768,7 +2768,7 @@ msgstr "kan inte att ange attribut"
 
 #: py/runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "kan inte sätta attribut '%q'"
 
 #: py/emitnative.c
 msgid "can't store '%q'"

From 987b6d1140c5a0c8d6e893f3144dc28a69e1707c Mon Sep 17 00:00:00 2001
From: Matt Watson 
Date: Wed, 4 Jan 2023 01:46:31 +0000
Subject: [PATCH 1650/2403] Translated using Weblate (Japanese)

Currently translated at 42.1% (420 of 997 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ja/
---
 locale/ja.po | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/locale/ja.po b/locale/ja.po
index d7573c2197..afe7997d33 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -8,27 +8,31 @@ 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-08-24 06:48+0000\n"
-"Last-Translator: Jeff Epler \n"
+"PO-Revision-Date: 2023-01-05 02:52+0000\n"
+"Last-Translator: Matt Watson \n"
 "Language-Team: none\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.8.1-dev\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
 "\n"
 "Code done running.\n"
 msgstr ""
+"\n"
+"コード実行完了\n"
 
 #: main.c
 msgid ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
+"\n"
+"オートリロードでコード実行は中止された。まもなくリロードする。\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -54,7 +58,7 @@ msgstr ""
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " 見るからない\n"
 
 #: main.c
 msgid " output:\n"
@@ -66,9 +70,9 @@ msgid "%%c requires int or char"
 msgstr "%%c にはintまたはcharが必要"
 
 #: main.c
-#, c-format
+#, c-format, fuzzy
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-module/os/getenv.c
 #, c-format
@@ -79,7 +83,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
-msgstr ""
+msgstr "%dアドレスピン、%dRGBピン、%dタイルは%dの高さを指示する。%dではない。"
 
 #: ports/atmel-samd/common-hal/alarm/__init__.c
 #: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
@@ -91,8 +95,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
+#, fuzzy
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -100,7 +105,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%qと%qが必ず異なるのは必要"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
@@ -123,15 +128,15 @@ msgstr "%q インデックスは範囲外"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%qは初期化には失敗"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%qは%q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "このボードでは%qが読み取り専用"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -1811,7 +1816,7 @@ msgstr "Prefixバッファはヒープ上になければなりません"
 
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
-msgstr ""
+msgstr "REPLに入るため、エンターキーを押す。リーロードするため、Ctl-Dを入力する。\n"
 
 #: main.c
 msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n"

From a97d8e97ad92325b2e767308236ff09ff5fbf213 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 5 Jan 2023 12:00:46 +0530
Subject: [PATCH 1651/2403] update `tj-actions/changed-files` to `v34`

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 114fd679a8..c584f5f427 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'
-      uses: tj-actions/changed-files@v34.5.1
+      uses: tj-actions/changed-files@v34
       with:
         json: true
         sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}

From 208fb341e2512d83b86e0f1e064e8ee909436098 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Thu, 5 Jan 2023 21:29:02 +0000
Subject: [PATCH 1652/2403] Added M5Stack Stick C board

---
 .../espressif/boards/m5stack_stick_c/axp192.h | 256 ++++++++++++++++
 .../espressif/boards/m5stack_stick_c/board.c  | 285 ++++++++++++++++++
 .../boards/m5stack_stick_c/mpconfigboard.h    |  45 +++
 .../boards/m5stack_stick_c/mpconfigboard.mk   |   9 +
 ports/espressif/boards/m5stack_stick_c/pins.c |  53 ++++
 .../boards/m5stack_stick_c/sdkconfig          |  26 ++
 6 files changed, 674 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_stick_c/axp192.h
 create mode 100644 ports/espressif/boards/m5stack_stick_c/board.c
 create mode 100644 ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_stick_c/pins.c
 create mode 100644 ports/espressif/boards/m5stack_stick_c/sdkconfig

diff --git a/ports/espressif/boards/m5stack_stick_c/axp192.h b/ports/espressif/boards/m5stack_stick_c/axp192.h
new file mode 100644
index 0000000000..78c2d253e4
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/axp192.h
@@ -0,0 +1,256 @@
+/*
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Stephen Oliver
+ * Copyright (c) 2023 CDarius
+ *
+ * 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_AXP192_H
+#define MICROPY_AXP192_H
+
+#define AXP192_I2C_ADDRESS 0x34
+
+#define AXP192_EXTEN_DCDC2_CTRL 0x10
+#define AXP192_EXTEN_DCDC2_CTRL_EXTEN 0b00000100
+#define AXP192_EXTEN_DCDC2_CTRL_DCDC2 0b00000001
+
+#define AXP192_DCDC13_LDO23_CTRL 0x12
+#define AXP192_DCDC13_LDO23_CTRL_EXTEN 0b01000000
+#define AXP192_DCDC13_LDO23_CTRL_LDO3 0b00001000
+#define AXP192_DCDC13_LDO23_CTRL_LDO2 0b00000100
+#define AXP192_DCDC13_LDO23_CTRL_DCDC3 0b00000010
+#define AXP192_DCDC13_LDO23_CTRL_DCDC1 0b00000001
+
+#define AXP192_DCDC2_OUT_VOLTAGE 0x25
+
+#define AXP192_DCDC1_OUT_VOLTAGE 0x26
+#define AXP192_DCDC1_OUT_VOLTAGE_3_350V 0b01101010
+
+#define AXP192_DCDC3_OUT_VOLTAGE 0x27
+
+
+#define AXP192_LDO23_OUT_VOLTAGE 0x28
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_3_0V 0b11000000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_2_8V 0b10100000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_MASK 0b11110000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_3_0V 0b00001100
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_2_8V 0b00001010
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_MASK 0b00001111
+
+#define AXP192_VBUS_IPSOUT 0x30
+#define AXP192_VBUS_IPSOUT_IGNORE_VBUSEN 0b10000000
+#define AXP192_VBUS_IPSOUT_VHOLD_LIMIT 0b01000000
+#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_4_4V 0b00100000
+#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_MASK 0b00111000
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT 0b00000010
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_500mA 0b00000001
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_100mA 0b00000000
+
+#define AXP192_POWER_OFF_VOLTAGE 0x31
+#define AXP192_POWER_OFF_VOLTAGE_2_6V 0b0000
+#define AXP192_POWER_OFF_VOLTAGE_2_7V 0b0001
+#define AXP192_POWER_OFF_VOLTAGE_2_8V 0b0010
+#define AXP192_POWER_OFF_VOLTAGE_2_9V 0b0011
+#define AXP192_POWER_OFF_VOLTAGE_3_0V 0b0100
+#define AXP192_POWER_OFF_VOLTAGE_3_1V 0b0101
+#define AXP192_POWER_OFF_VOLTAGE_3_2V 0b0110
+#define AXP192_POWER_OFF_VOLTAGE_3_3V 0b0111
+#define AXP192_POWER_OFF_VOLTAGE_MASK 0b0111
+
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL 0x32
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_OFF 0b10000000
+
+#define AXP192_CHARGING_CTRL1 0x33
+#define AXP192_CHARGING_CTRL1_ENABLE 0b10000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_36V 0b01100000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_20V 0b01000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_15V 0b00100000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_10V 0b00000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_MASK 0b01100000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_15PERC 0b00010000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_10PERC 0b00000000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_MASK 0b00010000
+#define AXP192_CHARGING_CTRL1_CURRENT_100mA 0b00000000
+#define AXP192_CHARGING_CTRL1_CURRENT_190mA 0b00000001
+#define AXP192_CHARGING_CTRL1_CURRENT_280mA 0b00000010
+#define AXP192_CHARGING_CTRL1_CURRENT_360mA 0b00000011
+#define AXP192_CHARGING_CTRL1_CURRENT_450mA 0b00000100
+#define AXP192_CHARGING_CTRL1_CURRENT_550mA 0b00000101
+#define AXP192_CHARGING_CTRL1_CURRENT_630mA 0b00000110
+#define AXP192_CHARGING_CTRL1_CURRENT_700mA 0b00000111
+#define AXP192_CHARGING_CTRL1_CURRENT_780mA 0b00001000
+#define AXP192_CHARGING_CTRL1_CURRENT_880mA 0b00001001
+#define AXP192_CHARGING_CTRL1_CURRENT_960mA 0b00001010
+#define AXP192_CHARGING_CTRL1_CURRENT_1000mA 0b00001011
+
+#define AXP192_CHARGING_CTRL1_CURRENT_MASK 0b00001111
+
+#define AXP192_CHARGING_CTRL2 0x34
+
+#define AXP192_BACKUP_BATT 0x35
+#define AXP192_BACKUP_BATT_CHARGING_ENABLE 0b10000000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_2_5V 0b01100000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V 0b00100000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_1V 0b00000000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_MASK 0b01100000
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_400uA 0b00000011
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA 0b00000010
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_100uA 0b00000001
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_50uA 0b00000000
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_MASK 0b00000011
+
+#define AXP192_PEK 0x36
+#define AXP192_PEK_SHORT_PRESS_1S 0b11000000
+#define AXP192_PEK_SHORT_PRESS_512mS 0b10000000
+#define AXP192_PEK_SHORT_PRESS_256mS 0b01000000
+#define AXP192_PEK_SHORT_PRESS_128mS 0b00000000
+#define AXP192_PEK_SHORT_PRESS_MASK 0b11000000
+#define AXP192_PEK_LONG_PRESS_2_5S 0b00110000
+#define AXP192_PEK_LONG_PRESS_2_0S 0b00100000
+#define AXP192_PEK_LONG_PRESS_1_5S 0b00010000
+#define AXP192_PEK_LONG_PRESS_1_0S 0b00000000
+#define AXP192_PEK_LONG_PRESS_MASK 0b00110000
+#define AXP192_PEK_LONG_PRESS_POWER_OFF 0b00001000
+#define AXP192_PEK_PWROK_DELAY_64mS 0b00000100
+#define AXP192_PEK_PWROK_DELAY_32mS 0b00000000
+#define AXP192_PEK_PWROK_DELAY_MASK 0b00000100
+#define AXP192_PEK_POWER_OFF_TIME_12S 0b00000011
+#define AXP192_PEK_POWER_OFF_TIME_8S 0b00000010
+#define AXP192_PEK_POWER_OFF_TIME_6S 0b00000001
+#define AXP192_PEK_POWER_OFF_TIME_4S 0b00000000
+#define AXP192_PEK_POWER_OFF_TIME_MASK 0b00000011
+
+#define AXP192_BATT_TEMP_LOW_THRESH 0x38
+#define AXP192_BATT_TEMP_HIGH_THRESH 0x39
+#define AXP192_BATT_TEMP_HIGH_THRESH_DEFAULT 0b11111100
+
+#define AXP192_IRQ_1_ENABLE 0x40
+#define AXP192_IRQ_2_ENABLE 0x41
+#define AXP192_IRQ_3_ENABLE 0x42
+#define AXP192_IRQ_4_ENABLE 0x43
+#define AXP192_IRQ_5_ENABLE 0x4a
+
+#define AXP192_IRQ_1_STATUS 0x44
+#define AXP192_IRQ_2_STATUS 0x45
+#define AXP192_IRQ_3_STATUS 0x46
+#define AXP192_IRQ_4_STATUS 0x47
+#define AXP192_IRQ_5_STATUS 0x4d
+
+#define AXP192_IRQ_3_PEK_SHORT_PRESS 0b00000010
+#define AXP192_IRQ_3_PEK_LONG_PRESS 0b00000001
+
+#define AXP192_ADC_ACIN_VOLTAGE_H 0x56
+#define AXP192_ADC_ACIN_VOLTAGE_L 0x57
+#define AXP192_ADC_ACIN_CURRENT_H 0x58
+#define AXP192_ADC_ACIN_CURRENT_L 0x59
+#define AXP192_ADC_VBUS_VOLTAGE_H 0x5a
+#define AXP192_ADC_VBUS_VOLTAGE_L 0x5b
+#define AXP192_ADC_VBUS_CURRENT_H 0x5c
+#define AXP192_ADC_VBUS_CURRENT_L 0x5d
+#define AXP192_ADC_INTERNAL_TEMP_H 0x5e
+#define AXP192_ADC_INTERNAL_TEMP_L 0x5f
+
+#define AXP192_ADC_BATT_VOLTAGE_H 0x78
+#define AXP192_ADC_BATT_VOLTAGE_L 0x79
+
+#define AXP192_ADC_BATT_POWER_H 0x70
+#define AXP192_ADC_BATT_POWER_M 0x71
+#define AXP192_ADC_BATT_POWER_L 0x72
+
+#define AXP192_ADC_BATT_CHARGE_CURRENT_H 0x7a
+#define AXP192_ADC_BATT_CHARGE_CURRENT_L 0x7b
+#define AXP192_ADC_BATT_DISCHARGE_CURRENT_H 0x7c
+#define AXP192_ADC_BATT_DISCHARGE_CURRENT_L 0x7d
+#define AXP192_ADC_APS_VOLTAGE_H 0x7e
+#define AXP192_ADC_APS_VOLTAGE_L 0x7f
+
+#define AXP192_ADC_ENABLE_1 0x82
+#define AXP192_ADC_ENABLE_1_BATT_VOL 0b10000000
+#define AXP192_ADC_ENABLE_1_BATT_CUR 0b01000000
+#define AXP192_ADC_ENABLE_1_ACIN_VOL 0b00100000
+#define AXP192_ADC_ENABLE_1_ACIN_CUR 0b00010000
+#define AXP192_ADC_ENABLE_1_VBUS_VOL 0b00001000
+#define AXP192_ADC_ENABLE_1_VBUS_CUR 0b00000100
+#define AXP192_ADC_ENABLE_1_APS_VOL 0b00000010
+#define AXP192_ADC_ENABLE_1_TS_PIN 0b00000001
+
+#define AXP192_ADC_ENABLE_2 0x83
+#define AXP192_ADC_ENABLE_2_TEMP_MON 0b10000000
+#define AXP192_ADC_ENABLE_2_GPIO0 0b00001000
+#define AXP192_ADC_ENABLE_2_GPIO1 0b00000100
+#define AXP192_ADC_ENABLE_2_GPIO2 0b00000010
+#define AXP192_ADC_ENABLE_2_GPIO3 0b00000001
+
+#define AXP192_ADC_TS 0x84
+#define AXP192_ADC_TS_SAMPLE_200HZ 0b11000000
+#define AXP192_ADC_TS_SAMPLE_100HZ 0b10000000
+#define AXP192_ADC_TS_SAMPLE_50HZ 0b01000000
+#define AXP192_ADC_TS_SAMPLE_25HZ 0b00000000
+#define AXP192_ADC_TS_SAMPLE_MASK 0b11000000
+#define AXP192_ADC_TS_OUT_CUR_80uA 0b00110000
+#define AXP192_ADC_TS_OUT_CUR_60uA 0b00100000
+#define AXP192_ADC_TS_OUT_CUR_40uA 0b00010000
+#define AXP192_ADC_TS_OUT_CUR_20uA 0b00000000
+#define AXP192_ADC_TS_OUT_CUR_MASK 0b00110000
+#define AXP192_ADC_TS_PIN_TEMP_MON 0b00000000
+#define AXP192_ADC_TS_PIN_EXTERN_ADC 0b00000100
+#define AXP192_ADC_TS_PIN_OUT_ALWAYS 0b00000011
+#define AXP192_ADC_TS_PIN_OUT_SAVE_ENG 0b00000010
+#define AXP192_ADC_TS_PIN_OUT_CHG 0b00000001
+#define AXP192_ADC_TS_PIN_OUT_DIS 0b00000000
+#define AXP192_ADC_TS_PIN_OUT_MASK 0b00000011
+
+#define AXP192_GPIO0_FUNCTION 0x90
+#define AXP192_GPIO0_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO0_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO0_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO0_FUNCTION_LDO_OUTPUT 0b00000010
+#define AXP192_GPIO0_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO0_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+#define AXP192_GPIO0_LDO_VOLTAGE 0x91
+#define AXP192_GPIO0_LDO_VOLTAGE_3_3V 0b11110000
+#define AXP192_GPIO0_LDO_VOLTAGE_2_8V 0b10100000
+#define AXP192_GPIO0_LDO_VOLTAGE_1_8V 0b00000000
+
+
+#define AXP192_GPIO1_FUNCTION 0x92
+#define AXP192_GPIO1_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO1_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO1_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO1_FUNCTION_PWM1_OUTPUT 0b00000010
+#define AXP192_GPIO1_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO1_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+
+#define AXP192_GPIO2_FUNCTION 0x93
+#define AXP192_GPIO2_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO2_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO2_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO1_FUNCTION_PWM2_OUTPUT 0b00000010
+#define AXP192_GPIO2_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO2_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+#define AXP192_PWM1_DUTY_RATIO 0x9A
+
+#endif
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
new file mode 100644
index 0000000000..082147af57
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -0,0 +1,285 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 CDarius
+ *
+ * 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 "shared-bindings/busio/SPI.h"
+#include "shared-bindings/busio/I2C.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+#include "axp192.h"
+
+// display init sequence according to adafruit_st7735r.py library
+uint8_t display_init_sequence[] = {
+    0x01,0x80,0x96,             // SWRESET and Delay 150ms
+    0x11,0x80,0xff,             // SLPOUT and Delay
+    0xb1,0x03,0x01,0x2C,0x2D,   // _FRMCTR1
+    0xb2,0x03,0x01,0x2C,0x2D,   // _FRMCTR2
+    0xb3,0x06,0x01,0x2C,0x2D,0x01,0x2C,0x2D, // _FRMCTR3
+    0xb4,0x01,0x07,             // _INVCTR line inversion
+    0xc0,0x03,0xa2,0x02,0x84,   // _PWCTR1 GVDD = 4.7V, 1.0uA
+    0xc1,0x01,0xc5,             // _PWCTR2 VGH=14.7V, VGL=-7.35V
+    0xc2,0x02,0x0a,0x00,        // _PWCTR3 Opamp current small, Boost frequency
+    0xc3,0x02,0x8a,0x2a,
+    0xc4,0x02,0x8a,0xee,
+    0xc5,0x01,0x0e,             // _VMCTR1 VCOMH = 4V, VOML = -1.1V
+    0x36,0x01,0xc8,             // MADCTL Rotate display
+    0x21,0x00,                  // _INVON
+    0x3a,0x01,0x05,             // COLMOD - 16bit color
+    0xe0,0x10,0x02,0x1c,0x07,0x12,0x37,0x32,0x29,0x2d,0x29,0x25,0x2B,0x39,0x00,0x01,0x03,0x10, // _GMCTRP1 Gamma
+    0xe1,0x10,0x03,0x1d,0x07,0x06,0x2E,0x2C,0x29,0x2D,0x2E,0x2E,0x37,0x3F,0x00,0x00,0x02,0x10, // _GMCTRN1
+    0x13,0x80,0x0a,             // _NORON
+    0x29,0x80,0x64              // _DISPON
+};
+
+static bool pmic_init(void) {
+    int rc;
+    // uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    busio_i2c_obj_t *internal_i2c = common_hal_board_create_i2c(0);
+
+    // Reg: 30h
+    // The VBUS-IPSOUT path can be selected to be opened regardless of the status of N_VBUSEN
+    // VBUS VHOLD pressure limit control disabled
+    // VBUS current limit control disabled
+    write_buf[0] = AXP192_VBUS_IPSOUT;
+    write_buf[1] = AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 31h
+    // VOFF Shutdown voltage setting ( 3.0V )
+    write_buf[0] = AXP192_POWER_OFF_VOLTAGE;
+    write_buf[1] = AXP192_POWER_OFF_VOLTAGE_3_0V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 33h
+    // Charge function enable control bit, including internal and external channels
+    // Charging target voltage: 4.2V
+    // Charging end current: End charging when charging current is less than 10% setting
+    // Internal path charging current: 100mA
+    write_buf[0] = AXP192_CHARGING_CTRL1;
+    write_buf[1] = AXP192_CHARGING_CTRL1_ENABLE |
+        AXP192_CHARGING_CTRL1_VOLTAGE_4_20V |
+        AXP192_CHARGING_CTRL1_CURRENT_100mA;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 35h
+    // Enable RTC battery charge: 3.0V, 200uA
+    write_buf[0] = AXP192_BACKUP_BATT;
+    write_buf[1] = AXP192_BACKUP_BATT_CHARGING_ENABLE |
+        AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V |
+        AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 36h
+    // Power on:  Short press 128ms
+    // Power off: Long press 1s
+    // Power OK delay 64ms
+    // Power off delay 4s
+    write_buf[0] = AXP192_PEK;
+    write_buf[1] = AXP192_PEK_SHORT_PRESS_128mS |
+        AXP192_PEK_LONG_PRESS_1_0S |
+        AXP192_PEK_LONG_PRESS_POWER_OFF |
+        AXP192_PEK_PWROK_DELAY_64mS |
+        AXP192_PEK_POWER_OFF_TIME_4S;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 82h
+    // ADC all on
+    write_buf[0] = AXP192_ADC_ENABLE_1;
+    write_buf[1] = AXP192_ADC_ENABLE_1_BATT_VOL |
+        AXP192_ADC_ENABLE_1_BATT_CUR |
+        AXP192_ADC_ENABLE_1_ACIN_VOL |
+        AXP192_ADC_ENABLE_1_ACIN_CUR |
+        AXP192_ADC_ENABLE_1_VBUS_VOL |
+        AXP192_ADC_ENABLE_1_VBUS_CUR |
+        AXP192_ADC_ENABLE_1_APS_VOL |
+        AXP192_ADC_ENABLE_1_TS_PIN;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 83h
+    // ADC temperature on
+    write_buf[0] = AXP192_ADC_ENABLE_2;
+    write_buf[1] = AXP192_ADC_ENABLE_2_TEMP_MON;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 84h
+    // ADC 25Hz
+    write_buf[0] = AXP192_ADC_TS;
+    write_buf[1] = AXP192_ADC_TS_SAMPLE_25HZ |
+        AXP192_ADC_TS_OUT_CUR_80uA |
+        AXP192_ADC_TS_PIN_OUT_SAVE_ENG;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 90h
+    // GPIO0(LDOio0) floating
+    write_buf[0] = AXP192_GPIO0_FUNCTION;
+    write_buf[1] = AXP192_GPIO0_FUNCTION_FLOATING;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 91h
+    // GPIO0(LDOio0) 2.8V
+    write_buf[0] = AXP192_GPIO0_LDO_VOLTAGE;
+    write_buf[1] = AXP192_GPIO0_LDO_VOLTAGE_2_8V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 28h
+    // LDO2 (TFT backlight): 2.8V
+    // LDO3 (TFT logic): 3.0V
+    write_buf[0] = AXP192_LDO23_OUT_VOLTAGE;
+    write_buf[1] = AXP192_LDO23_OUT_VOLTAGE_LDO2_2_8V |
+        AXP192_LDO23_OUT_VOLTAGE_LDO3_3_0V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 12h
+    // Enable EXTEN, DCDC1, LDO2 and LDO3
+    write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
+    write_buf[1] = AXP192_DCDC13_LDO23_CTRL_EXTEN |
+        AXP192_DCDC13_LDO23_CTRL_LDO3 |
+        AXP192_DCDC13_LDO23_CTRL_LDO2 |
+        AXP192_DCDC13_LDO23_CTRL_DCDC1;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 28h
+    // DCDC1 (ESP32 VDD): 3.350V
+    write_buf[0] = AXP192_DCDC1_OUT_VOLTAGE;
+    write_buf[1] = AXP192_DCDC1_OUT_VOLTAGE_3_350V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool display_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, false);
+    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_GPIO23,    // DC
+        &pin_GPIO5,     // CS
+        &pin_GPIO18,    // RST
+        40000000,       // 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,
+        80,             // width (after rotation)
+        160,            // height (after rotation)
+        26,             // column start
+        1,              // row start
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        NULL,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        80,             // native_frames_per_second
+        false,          // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+    return true;
+}
+
+void board_init(void) {
+    if (!pmic_init()) {
+        mp_printf(&mp_plat_print, "could not initialize axp192 pmic\n");
+        return;
+    }
+
+    if (!display_init()) {
+        mp_printf(&mp_plat_print, "could not initialize ili9342c LCD");
+        return;
+    }
+}
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
new file mode 100644
index 0000000000..4e725c04ff
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 CDarius
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Stick C"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO10)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO37)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
new file mode 100644
index 0000000000..b82fb5ef74
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320007
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/m5stack_stick_c/pins.c b/ports/espressif/boards/m5stack_stick_c/pins.c
new file mode 100644
index 0000000000..84c1b12007
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/pins.c
@@ -0,0 +1,53 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_A36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO9) },
+
+    // buttons
+    { MP_ROM_QSTR(MP_QSTR_BTN_A), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_BTN_B), MP_ROM_PTR(&pin_GPIO39) },
+
+    // internal i2c bus
+    { MP_ROM_QSTR(MP_QSTR_SYS_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SYS_SCL), MP_ROM_PTR(&pin_GPIO22) },
+
+    // internal devices interrupt
+    { MP_ROM_QSTR(MP_QSTR_SYS_INT), MP_ROM_PTR(&pin_GPIO35) },
+
+    // pdm microphone
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_CLK), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_PDM_MIC_DATA), MP_ROM_PTR(&pin_GPIO34) },
+
+    // lcd spi bus
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SYS_I2C), 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_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_stick_c/sdkconfig b/ports/espressif/boards/m5stack_stick_c/sdkconfig
new file mode 100644
index 0000000000..7ec6f90c15
--- /dev/null
+++ b/ports/espressif/boards/m5stack_stick_c/sdkconfig
@@ -0,0 +1,26 @@
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskStickC"
+# end of LWIP
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 56c0f0388d99d89e626ab5171e6fd4ff9504bdc0 Mon Sep 17 00:00:00 2001
From: Conor Burns 
Date: Thu, 5 Jan 2023 23:02:00 +0100
Subject: [PATCH 1653/2403] add 0xCB Helios

---
 ports/raspberrypi/boards/0xcb_helios/board.c  | 29 ++++++++
 .../boards/0xcb_helios/mpconfigboard.h        | 14 ++++
 .../boards/0xcb_helios/mpconfigboard.mk       |  9 +++
 .../boards/0xcb_helios/pico-sdk-configboard.h |  1 +
 ports/raspberrypi/boards/0xcb_helios/pins.c   | 69 +++++++++++++++++++
 5 files changed, 122 insertions(+)
 create mode 100644 ports/raspberrypi/boards/0xcb_helios/board.c
 create mode 100644 ports/raspberrypi/boards/0xcb_helios/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/0xcb_helios/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/0xcb_helios/pins.c

diff --git a/ports/raspberrypi/boards/0xcb_helios/board.c b/ports/raspberrypi/boards/0xcb_helios/board.c
new file mode 100644
index 0000000000..7d8b03d5f4
--- /dev/null
+++ b/ports/raspberrypi/boards/0xcb_helios/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Conor Burns 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"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.h b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.h
new file mode 100644
index 0000000000..fcc3f7d277
--- /dev/null
+++ b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "0xCB Helios"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_LED_STATUS   (&pin_GPIO17)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO20)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
new file mode 100644
index 0000000000..7489842c98
--- /dev/null
+++ b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0xCB00
+USB_PID = 0x1974
+USB_PRODUCT = "Helios"
+USB_MANUFACTURER = "0xCB"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
diff --git a/ports/raspberrypi/boards/0xcb_helios/pico-sdk-configboard.h b/ports/raspberrypi/boards/0xcb_helios/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/0xcb_helios/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/0xcb_helios/pins.c b/ports/raspberrypi/boards/0xcb_helios/pins.c
new file mode 100644
index 0000000000..3d1b22b0a4
--- /dev/null
+++ b/ports/raspberrypi/boards/0xcb_helios/pins.c
@@ -0,0 +1,69 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // Left side top to bottom
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+
+
+    // Right side top to bottom
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3),  MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A2),  MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A1),  MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP22),  MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_SDI), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP20),  MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_SDO), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23),  MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+
+
+    // Bottom side left to right
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+
+
+    // Internal Pins
+    { MP_ROM_QSTR(MP_QSTR_RGB), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From a2668cdf0d0c1a73e4246d899d5b57b91385ef21 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Thu, 5 Jan 2023 22:30:10 +0000
Subject: [PATCH 1654/2403] Added PORT A i2c and slowed down display SPI

---
 ports/espressif/boards/m5stack_stick_c/board.c         | 2 +-
 ports/espressif/boards/m5stack_stick_c/mpconfigboard.h | 5 +++--
 ports/espressif/boards/m5stack_stick_c/pins.c          | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index 082147af57..bbc0447056 100644
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -230,7 +230,7 @@ static bool display_init(void) {
         &pin_GPIO23,    // DC
         &pin_GPIO5,     // CS
         &pin_GPIO18,    // RST
-        40000000,       // baudrate
+        10000000,       // baudrate
         0,              // polarity
         0               // phase
         );
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
index 4e725c04ff..aefdad1598 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
@@ -31,8 +31,9 @@
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO10)
 
-#define CIRCUITPY_BOARD_I2C         (1)
-#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}, \
+                                     {.scl = &pin_GPIO33, .sda = &pin_GPIO32}}
 
 // For entering safe mode
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO37)
diff --git a/ports/espressif/boards/m5stack_stick_c/pins.c b/ports/espressif/boards/m5stack_stick_c/pins.c
index 84c1b12007..65f0960382 100644
--- a/ports/espressif/boards/m5stack_stick_c/pins.c
+++ b/ports/espressif/boards/m5stack_stick_c/pins.c
@@ -1,6 +1,8 @@
 #include "shared-bindings/board/__init__.h"
 #include "shared-module/displayio/__init__.h"
 
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -16,10 +18,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
     { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO32) },
-    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
 
     { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO33) },
-    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
 
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO9) },
@@ -47,6 +49,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
 
     { MP_ROM_QSTR(MP_QSTR_SYS_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
 };

From fa514e22b20a6759793603906f9a50ef1d5ae4e9 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Thu, 5 Jan 2023 19:17:08 -0500
Subject: [PATCH 1655/2403] mimxrt10xx gpio pins don't deinit

It looks like a rogue "return" made it's way into the reset pin code
for the mimxrt10xx port resulting in pin.deinit() not working.
---
 ports/mimxrt10xx/common-hal/microcontroller/Pin.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index e891b56a24..3c8c7f2b27 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -71,7 +71,6 @@ MP_WEAK bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
 // Since i.MX pins need extra register and reset information to reset properly,
 // resetting pins by number alone has been removed.
 void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
-    return;
     if (pin == NULL) {
         return;
     }

From da31232cdf307639486d189de9efdf88c0e41a77 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 11:50:31 +0530
Subject: [PATCH 1656/2403] refactor variable naming

---
 tools/ci_changes_per_commit.py | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index e38c98f40e..e40ee8ae47 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -39,7 +39,7 @@ query ($owner: String!, $name: String!, $pullNumber: Int!, $commitsPerPage: Int!
 }
 """
 
-QUERY_CHECKRUNS = """
+QUERY_CHECK_RUNS = """
 query ($checkSuiteID: ID!,
        $afterFailedRun: String, $afterIncompleteRun: String,
        $includeFailedRuns: Boolean!, $includeIncompleteRuns: Boolean!) {
@@ -92,7 +92,7 @@ query_variables_commits = {
 }
 
 
-query_variables_checkruns = {
+query_variables_check_runs = {
     "checkSuiteID": "",
     "afterFailedRun": None,
     "afterIncompleteRun": None,
@@ -141,7 +141,7 @@ def set_output(name, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def get_commit_and_checksuite(query_commits):
+def get_commit_and_check_suite(query_commits):
     commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
 
     if commits["totalCount"] > 0:
@@ -150,17 +150,17 @@ def get_commit_and_checksuite(query_commits):
             commit_sha = commit["oid"]
             if commit_sha == os.environ["EXCLUDE_COMMIT"]:
                 continue
-            checksuites = commit["checkSuites"]
-            if checksuites["totalCount"] > 0:
-                for checksuite in checksuites["nodes"]:
-                    if checksuite["workflowRun"]["workflow"]["name"] == "Build CI":
+            check_suites = commit["checkSuites"]
+            if check_suites["totalCount"] > 0:
+                for check_suite in check_suites["nodes"]:
+                    if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
                         return [
                             commit_sha,
-                            checksuite["id"] if checksuite["conclusion"] != "SUCCESS" else None,
+                            check_suite["id"] if check_suite["conclusion"] != "SUCCESS" else None,
                         ]
         else:
             if query_commits.paginate(commits["pageInfo"], "beforeCommit"):
-                return get_commit_and_checksuite(query_commits)
+                return get_commit_and_check_suite(query_commits)
 
     return [None, None]
 
@@ -180,11 +180,11 @@ def append_runs_to_list(runs, bad_runs_by_matrix):
                 bad_runs_by_matrix[matrix].append(res_board.group()[1:-1])
 
 
-def get_bad_checkruns(query_checkruns):
+def get_bad_check_runs(query_check_runs):
     more_pages = True
     bad_runs_by_matrix = {}
     while more_pages:
-        checkruns = query_checkruns.fetch()["data"]["node"]
+        check_runs = query_check_runs.fetch()["data"]["node"]
         run_types = ["failed", "incomplete"]
         more_pages = False
 
@@ -192,10 +192,10 @@ def get_bad_checkruns(query_checkruns):
             run_type_camel = run_type.capitalize() + "Run"
             run_type = run_type + "Runs"
 
-            append_runs_to_list(checkruns[run_type], bad_runs_by_matrix)
+            append_runs_to_list(check_runs[run_type], bad_runs_by_matrix)
 
-            if query_checkruns.paginate(checkruns[run_type]["pageInfo"], "after" + run_type_camel):
-                query_checkruns.variables["include" + run_type_camel] = True
+            if query_check_runs.paginate(check_runs[run_type]["pageInfo"], "after" + run_type_camel):
+                query_check_runs.variables["include" + run_type_camel] = True
                 more_pages = True
 
     return bad_runs_by_matrix
@@ -207,26 +207,26 @@ def main():
         "/"
     )
 
-    commit, checksuite = get_commit_and_checksuite(query_commits)
+    commit, check_suite = get_commit_and_check_suite(query_commits)
 
-    if checksuite is None:
+    if check_suite is None:
         if commit is None:
-            print("No checkSuites found -> Abort")
+            print("Abort: No check suite found")
         else:
             set_output("commit", commit)
         quit()
 
-    query_checkruns = Query(QUERY_CHECKRUNS, query_variables_checkruns, headers)
-    query_checkruns.variables["checkSuiteID"] = checksuite
+    query_check_runs = Query(QUERY_CHECK_RUNS, query_variables_check_runs, headers)
+    query_check_runs.variables["checkSuiteID"] = check_suite
 
-    checkruns = get_bad_checkruns(query_checkruns)
+    check_runs = get_bad_check_runs(query_check_runs)
 
-    if len(checkruns) == 0:
-        print("No checkRuns found -> Abort")
+    if len(check_runs) == 0:
+        print("Abort: No check runs found")
         quit()
 
     set_output("commit", commit)
-    set_output("checkruns", json.dumps(checkruns))
+    set_output("check_runs", json.dumps(check_runs))
 
 
 if __name__ == "__main__":

From 5aa8419455e1c5a75a0306b62ed19c9b70200a70 Mon Sep 17 00:00:00 2001
From: Conor Burns 
Date: Sat, 7 Jan 2023 13:11:38 +0100
Subject: [PATCH 1657/2403] add pid.codes VID and PID

---
 ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
index 7489842c98..db3e55ed1f 100644
--- a/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/0xcb_helios/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0xCB00
-USB_PID = 0x1974
+USB_VID = 0x1209
+USB_PID = 0xCB74
 USB_PRODUCT = "Helios"
 USB_MANUFACTURER = "0xCB"
 

From 03d4d63ab56ec93b49a4ce1f53ff36babe4b1499 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 11:55:40 +0530
Subject: [PATCH 1658/2403] simplify fetching changed files

---
 .github/workflows/build.yml    | 22 +++++++++-----
 tools/ci_changes_per_commit.py | 54 +++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c584f5f427..b99dee3edc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,9 +27,9 @@ jobs:
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
     steps:
     - name: Dump GitHub context
+      run: echo "$GITHUB_CONTEXT"
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -135,20 +135,26 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         EXCLUDE_COMMIT: ${{ github.event.after }}
       run: python3 -u ci_changes_per_commit.py
+    - name: Deepen and convert depth to sha
+      id: deepen-and-convert-depth-to-sha
+      run: |
+        DEEPEN=$((DEPTH - $(git rev-list HEAD --count))) && if((DEEPEN > 0)); then git fetch --no-tags --recurse-submodules=no --deepen=$DEEPEN; fi
+        echo "commit=$(git rev-list $GITHUB_SHA --skip=$((DEPTH + 1)) --max-count=1)" >> $GITHUB_OUTPUT
+      env:
+        DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'
-      uses: tj-actions/changed-files@v34
-      with:
-        json: true
-        sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}
-        base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
+      run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
+      env:
+        BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
+        HEAD_SHA: ${{ github.event.after }}
     - name: Set matrix
       id: set-matrix
       working-directory: tools
       env:
-        CHANGED_FILES: ${{ steps.get-changes.outputs.all_changed_and_modified_files }}
-        LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.checkruns }}
+        CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
+        LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
       run: python3 -u ci_set_matrix.py
 
 
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index e40ee8ae47..b2256c6d45 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -18,7 +18,7 @@ query ($owner: String!, $name: String!, $pullNumber: Int!, $commitsPerPage: Int!
         }
         nodes {
           commit {
-            checkSuites(first: 3) {
+            checkSuites(first: 100) {
               nodes {
                 conclusion
                 workflowRun {
@@ -141,26 +141,29 @@ def set_output(name, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def get_commit_and_check_suite(query_commits):
-    commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
+def get_commit_depth_and_check_suite(query_commits):
+    while True:
+      commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
 
-    if commits["totalCount"] > 0:
-        for commit in reversed(commits["nodes"]):
-            commit = commit["commit"]
-            commit_sha = commit["oid"]
-            if commit_sha == os.environ["EXCLUDE_COMMIT"]:
-                continue
-            check_suites = commit["checkSuites"]
-            if check_suites["totalCount"] > 0:
-                for check_suite in check_suites["nodes"]:
-                    if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
-                        return [
-                            commit_sha,
-                            check_suite["id"] if check_suite["conclusion"] != "SUCCESS" else None,
-                        ]
-        else:
-            if query_commits.paginate(commits["pageInfo"], "beforeCommit"):
-                return get_commit_and_check_suite(query_commits)
+      if commits["totalCount"] > 0:
+          nodes = commits["nodes"]
+          nodes.reverse()
+          if nodes[0]["commit"]["oid"] == os.environ["EXCLUDE_COMMIT"]:
+              nodes.pop(0)
+          for index, commit in enumerate(nodes):
+              commit = commit["commit"]
+              commit_sha = commit["oid"]
+              check_suites = commit["checkSuites"]
+              if check_suites["totalCount"] > 0:
+                  for check_suite in check_suites["nodes"]:
+                      if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
+                          return [
+                              {"sha": commit_sha, "depth": index + 1},
+                              check_suite["id"] if check_suite["conclusion"] != "SUCCESS" else None,
+                          ]
+          else:
+              if not query_commits.paginate(commits["pageInfo"], "beforeCommit"):
+                  break
 
     return [None, None]
 
@@ -201,19 +204,24 @@ def get_bad_check_runs(query_check_runs):
     return bad_runs_by_matrix
 
 
+def set_commit(commit):
+    set_output("commit_sha", commit["sha"])
+    set_output("commit_depth", commit["depth"])
+
+
 def main():
     query_commits = Query(QUERY_COMMITS, query_variables_commits, headers)
     query_commits.variables["owner"], query_commits.variables["name"] = os.environ["REPO"].split(
         "/"
     )
 
-    commit, check_suite = get_commit_and_check_suite(query_commits)
+    commit, check_suite = get_commit_depth_and_check_suite(query_commits)
 
     if check_suite is None:
         if commit is None:
             print("Abort: No check suite found")
         else:
-            set_output("commit", commit)
+            set_commit(commit)
         quit()
 
     query_check_runs = Query(QUERY_CHECK_RUNS, query_variables_check_runs, headers)
@@ -225,7 +233,7 @@ def main():
         print("Abort: No check runs found")
         quit()
 
-    set_output("commit", commit)
+    set_commit(commit)
     set_output("check_runs", json.dumps(check_runs))
 
 

From 0e46c77c1463e5dadf34ea061b7ac5d97df04c4d Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 17:52:33 +0530
Subject: [PATCH 1659/2403] fix for bug `fatal: error in object: unshallow`

---
 tools/ci_fetch_deps.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 515c3b198f..e7eb042a1f 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -70,6 +70,8 @@ run(
     "Fetch back to the start of 2021 to get commit history",
     f'git fetch --recurse-submodules=no --shallow-since="2021-07-01" origin {ref}',
 )
+# See https://stackoverflow.com/questions/63878612/git-fatal-error-in-object-unshallow-sha-1#comment118418373_63879454
+run ("Fix for bug \"fatal: error in object: unshallow\"", "git repack -d")
 run("Init submodules", "git submodule init")
 run("Submodule status", "git submodule status")
 

From 8096c94e1b580597e13a6d477a4b8dbdd301f07f Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 18:17:48 +0530
Subject: [PATCH 1660/2403] build docs only when `//|` matches

---
 .github/workflows/build.yml |  2 ++
 tools/ci_set_matrix.py      | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b99dee3edc..660edc1535 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -153,6 +153,8 @@ jobs:
       id: set-matrix
       working-directory: tools
       env:
+        BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
+        HEAD_SHA: ${{ github.event.after }}
         CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
       run: python3 -u ci_set_matrix.py
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 77f58742cd..33dc9af7c5 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -26,6 +26,7 @@ import os
 import sys
 import json
 import pathlib
+import subprocess
 from concurrent.futures import ThreadPoolExecutor
 
 tools_dir = pathlib.Path(__file__).resolve().parent
@@ -238,6 +239,15 @@ def set_docs_to_build(build_all):
             r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
         )
         for p in changed_files:
+            if (
+                p.endswith(".c")
+                and not subprocess.run(
+                    f"git diff -U0 {os.environ.get('BASE_SHA')}...{os.environ.get('HEAD_SHA')} {p} | grep -o -m 1 '^[+-]\/\/|'",
+                    capture_output=True,
+                    shell=True,
+                ).stdout
+            ):
+                continue
             if doc_pattern.search(p):
                 doc_match = True
                 break

From 09adb2428467fe2c5d1b747ff5a2e9b555f7045b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 18:40:18 +0530
Subject: [PATCH 1661/2403] slightly refactor ci

---
 .github/workflows/build.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 660edc1535..2833605f5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -152,12 +152,12 @@ jobs:
     - name: Set matrix
       id: set-matrix
       working-directory: tools
+      run: python3 -u ci_set_matrix.py
       env:
         BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
         HEAD_SHA: ${{ github.event.after }}
         CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
-      run: python3 -u ci_set_matrix.py
 
 
   mpy-cross-mac:
@@ -420,14 +420,15 @@ jobs:
         path: ${{ github.workspace }}/.idf_tools
         key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
     - name: Clone IDF submodules
-      run: |
-        (cd $IDF_PATH && git submodule update --init)
+      run: git submodule update --init $IDF_PATH
       env:
         IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
     - name: Install IDF tools
       run: |
+        echo "Installing ESP-IDF tools"
         $IDF_PATH/tools/idf_tools.py --non-interactive install required
         $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
+        echo "Installing Python environment and packages"
         $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
         rm -rf $IDF_TOOLS_PATH/dist
       env:
@@ -445,7 +446,6 @@ jobs:
       run: |
         source $IDF_PATH/export.sh
         gcc --version
-        xtensa-esp32s2-elf-gcc --version
         python3 --version
         ninja --version
         cmake --version
@@ -479,6 +479,7 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
+
   build-aarch:
     runs-on: ubuntu-20.04
     needs: test

From 70273316f8bd46b6d5259b7c8574314c270c12e9 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 19:00:54 +0530
Subject: [PATCH 1662/2403] run pre-commit formatting

---
 tools/ci_changes_per_commit.py | 46 ++++++++++++++++++----------------
 tools/ci_fetch_deps.py         |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index b2256c6d45..92c98fe858 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -143,27 +143,29 @@ def set_output(name, value):
 
 def get_commit_depth_and_check_suite(query_commits):
     while True:
-      commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
+        commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
 
-      if commits["totalCount"] > 0:
-          nodes = commits["nodes"]
-          nodes.reverse()
-          if nodes[0]["commit"]["oid"] == os.environ["EXCLUDE_COMMIT"]:
-              nodes.pop(0)
-          for index, commit in enumerate(nodes):
-              commit = commit["commit"]
-              commit_sha = commit["oid"]
-              check_suites = commit["checkSuites"]
-              if check_suites["totalCount"] > 0:
-                  for check_suite in check_suites["nodes"]:
-                      if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
-                          return [
-                              {"sha": commit_sha, "depth": index + 1},
-                              check_suite["id"] if check_suite["conclusion"] != "SUCCESS" else None,
-                          ]
-          else:
-              if not query_commits.paginate(commits["pageInfo"], "beforeCommit"):
-                  break
+        if commits["totalCount"] > 0:
+            nodes = commits["nodes"]
+            nodes.reverse()
+            if nodes[0]["commit"]["oid"] == os.environ["EXCLUDE_COMMIT"]:
+                nodes.pop(0)
+            for index, commit in enumerate(nodes):
+                commit = commit["commit"]
+                commit_sha = commit["oid"]
+                check_suites = commit["checkSuites"]
+                if check_suites["totalCount"] > 0:
+                    for check_suite in check_suites["nodes"]:
+                        if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
+                            return [
+                                {"sha": commit_sha, "depth": index + 1},
+                                check_suite["id"]
+                                if check_suite["conclusion"] != "SUCCESS"
+                                else None,
+                            ]
+            else:
+                if not query_commits.paginate(commits["pageInfo"], "beforeCommit"):
+                    break
 
     return [None, None]
 
@@ -197,7 +199,9 @@ def get_bad_check_runs(query_check_runs):
 
             append_runs_to_list(check_runs[run_type], bad_runs_by_matrix)
 
-            if query_check_runs.paginate(check_runs[run_type]["pageInfo"], "after" + run_type_camel):
+            if query_check_runs.paginate(
+                check_runs[run_type]["pageInfo"], "after" + run_type_camel
+            ):
                 query_check_runs.variables["include" + run_type_camel] = True
                 more_pages = True
 
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index e7eb042a1f..04ae6fb0e1 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -71,7 +71,7 @@ run(
     f'git fetch --recurse-submodules=no --shallow-since="2021-07-01" origin {ref}',
 )
 # See https://stackoverflow.com/questions/63878612/git-fatal-error-in-object-unshallow-sha-1#comment118418373_63879454
-run ("Fix for bug \"fatal: error in object: unshallow\"", "git repack -d")
+run('Fix for bug "fatal: error in object: unshallow"', "git repack -d")
 run("Init submodules", "git submodule init")
 run("Submodule status", "git submodule status")
 

From f0e7e3115abdf4a75493cb615f01df564400fbbc Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 21:03:16 +0530
Subject: [PATCH 1663/2403] refactor how base and head commit are set

- avoid `github.event.after` as it isn't available during initial CI run of the PR
---
 .github/workflows/build.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2833605f5b..6694a045be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,27 +135,23 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         EXCLUDE_COMMIT: ${{ github.event.after }}
       run: python3 -u ci_changes_per_commit.py
-    - name: Deepen and convert depth to sha
-      id: deepen-and-convert-depth-to-sha
+    - name: Set base sha
       run: |
         DEEPEN=$((DEPTH - $(git rev-list HEAD --count))) && if((DEEPEN > 0)); then git fetch --no-tags --recurse-submodules=no --deepen=$DEEPEN; fi
-        echo "commit=$(git rev-list $GITHUB_SHA --skip=$((DEPTH + 1)) --max-count=1)" >> $GITHUB_OUTPUT
+        echo "BASE_SHA=$(git rev-list $GITHUB_SHA --skip=$((DEPTH + 1)) --max-count=1)" >> $GITHUB_ENV
       env:
         DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
+    - name: Set head sha
+      run: echo "HEAD_SHA=$(git rev-list $GITHUB_SHA --skip=1 --max-count=1)" >> $GITHUB_ENV
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'
       run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
-      env:
-        BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
-        HEAD_SHA: ${{ github.event.after }}
     - name: Set matrix
       id: set-matrix
       working-directory: tools
       run: python3 -u ci_set_matrix.py
       env:
-        BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
-        HEAD_SHA: ${{ github.event.after }}
         CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
 

From 722a313cc10d7f4cf83161ba1f373e3565d699f2 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 7 Jan 2023 21:12:39 +0530
Subject: [PATCH 1664/2403] set base and head commit only when the event is a
 pr

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6694a045be..e2c5de08a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -136,12 +136,14 @@ jobs:
         EXCLUDE_COMMIT: ${{ github.event.after }}
       run: python3 -u ci_changes_per_commit.py
     - name: Set base sha
+      if: github.event_name == 'pull_request'
       run: |
         DEEPEN=$((DEPTH - $(git rev-list HEAD --count))) && if((DEEPEN > 0)); then git fetch --no-tags --recurse-submodules=no --deepen=$DEEPEN; fi
         echo "BASE_SHA=$(git rev-list $GITHUB_SHA --skip=$((DEPTH + 1)) --max-count=1)" >> $GITHUB_ENV
       env:
         DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
     - name: Set head sha
+      if: github.event_name == 'pull_request'
       run: echo "HEAD_SHA=$(git rev-list $GITHUB_SHA --skip=1 --max-count=1)" >> $GITHUB_ENV
     - name: Get changes
       id: get-changes

From a84a8855ed2deff2b20ef5cfd11bbdef862fc239 Mon Sep 17 00:00:00 2001
From: Colin B 
Date: Sat, 7 Jan 2023 16:17:51 -0800
Subject: [PATCH 1665/2403] Add frequency setting for RP2040 boards.

---
 ports/raspberrypi/Makefile                           |  1 +
 .../common-hal/microcontroller/Processor.c           | 12 ++++++++++++
 ports/raspberrypi/mpconfigport.mk                    |  1 +
 shared-bindings/microcontroller/Processor.c          |  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index d72d59bcf6..395a5553e2 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -229,6 +229,7 @@ SRC_SDK := \
 	src/rp2_common/pico_printf/printf.c \
 	src/rp2_common/pico_runtime/runtime.c \
 	src/rp2_common/pico_stdio/stdio.c \
+	src/rp2_common/pico_stdlib/stdlib.c \
 	src/rp2_common/pico_unique_id/unique_id.c \
 	$(SRC_SDK_CYW43) \
 
diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
index 8c5bc7ba75..08e6495d26 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Processor.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -28,10 +28,12 @@
 #include 
 
 #include "py/mphal.h"
+#include "py/runtime.h"
 #include "common-hal/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
 
+#include "pico/stdlib.h"
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 #include "src/rp2_common/hardware_clocks/include/hardware/clocks.h"
 
@@ -59,6 +61,16 @@ uint32_t common_hal_mcu_processor_get_frequency(void) {
     return clock_get_hz(clk_sys);
 }
 
+uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
+    uint32_t frequency) {
+    uint32_t freq = frequency / 1000;
+
+    if (!set_sys_clock_khz(freq, false)) {
+        mp_raise_ValueError(translate("Invalid frequency supplied"));
+    }
+    return clock_get_hz(clk_sys);
+}
+
 void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
     pico_unique_board_id_t retrieved_id;
     pico_get_unique_board_id(&retrieved_id);
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index c5de2a439d..7a6b9f2167 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -48,3 +48,4 @@ CIRCUITPY_BUILD_EXTENSIONS ?= uf2
 USB_NUM_ENDPOINT_PAIRS = 8
 
 INTERNAL_FLASH_FILESYSTEM = 1
+CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 986f81ea53..f5190d36ef 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -67,7 +67,7 @@
 //|     frequency: int
 //|     """The CPU operating frequency in Hertz.
 //|
-//|     **Limitations:** Setting the ``frequency`` is possible only on some i.MX boards.
+//|     **Limitations:** Setting the ``frequency`` is possible on RP2040 boards and some i.MX boards.
 //|     On most boards, ``frequency`` is read-only.
 //|     """
 

From 565bbd5002e92cebc7c5a31528f5308d8bd58b2a Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 8 Jan 2023 13:23:51 +0530
Subject: [PATCH 1666/2403] fix path in `set_docs_to_build`

---
 tools/ci_set_matrix.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 33dc9af7c5..cc84cddd28 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -238,11 +238,13 @@ def set_docs_to_build(build_all):
         doc_pattern = re.compile(
             r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
         )
+        github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
+        github_workspace = github_workspace and github_workspace + "/"
         for p in changed_files:
             if (
                 p.endswith(".c")
                 and not subprocess.run(
-                    f"git diff -U0 {os.environ.get('BASE_SHA')}...{os.environ.get('HEAD_SHA')} {p} | grep -o -m 1 '^[+-]\/\/|'",
+                    f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + p} | grep -o -m 1 '^[+-]\/\/|'",
                     capture_output=True,
                     shell=True,
                 ).stdout

From c94f83f2e6a276d4ec5936e0b967708a45dbea02 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 9 Jan 2023 18:17:51 +0530
Subject: [PATCH 1667/2403] fix pagination and some refactoring

---
 tools/ci_changes_per_commit.py | 37 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index 92c98fe858..4d71f8e38c 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -111,13 +111,11 @@ class Query:
         self.headers = headers
 
     def paginate(self, page_info, name):
-        has_page = (
-            page_info["hasNextPage"] if name.startswith("after") else page_info["hasPreviousPage"]
-        )
+        has_page = page_info["hasNextPage" if name.startswith("after") else "hasPreviousPage"]
         if has_page:
-            self.variables[name] = (
-                page_info["endCursor"] if name.startswith("after") else page_info["startCursor"]
-            )
+            self.variables[name] = page_info[
+                "endCursor" if name.startswith("after") else "startCursor"
+            ]
         return has_page
 
     def fetch(self):
@@ -142,15 +140,16 @@ def set_output(name, value):
 
 
 def get_commit_depth_and_check_suite(query_commits):
+    commit_depth = 0
     while True:
         commits = query_commits.fetch()["data"]["repository"]["pullRequest"]["commits"]
-
         if commits["totalCount"] > 0:
             nodes = commits["nodes"]
             nodes.reverse()
             if nodes[0]["commit"]["oid"] == os.environ["EXCLUDE_COMMIT"]:
                 nodes.pop(0)
-            for index, commit in enumerate(nodes):
+            for commit in nodes:
+                commit_depth += 1
                 commit = commit["commit"]
                 commit_sha = commit["oid"]
                 check_suites = commit["checkSuites"]
@@ -158,16 +157,13 @@ def get_commit_depth_and_check_suite(query_commits):
                     for check_suite in check_suites["nodes"]:
                         if check_suite["workflowRun"]["workflow"]["name"] == "Build CI":
                             return [
-                                {"sha": commit_sha, "depth": index + 1},
+                                {"sha": commit_sha, "depth": commit_depth},
                                 check_suite["id"]
                                 if check_suite["conclusion"] != "SUCCESS"
                                 else None,
                             ]
-            else:
-                if not query_commits.paginate(commits["pageInfo"], "beforeCommit"):
-                    break
-
-    return [None, None]
+        if not query_commits.paginate(commits["pageInfo"], "beforeCommit"):
+            return [None, None]
 
 
 def append_runs_to_list(runs, bad_runs_by_matrix):
@@ -188,9 +184,10 @@ def append_runs_to_list(runs, bad_runs_by_matrix):
 def get_bad_check_runs(query_check_runs):
     more_pages = True
     bad_runs_by_matrix = {}
+    run_types = ["failed", "incomplete"]
+
     while more_pages:
         check_runs = query_check_runs.fetch()["data"]["node"]
-        run_types = ["failed", "incomplete"]
         more_pages = False
 
         for run_type in run_types:
@@ -221,11 +218,11 @@ def main():
 
     commit, check_suite = get_commit_depth_and_check_suite(query_commits)
 
-    if check_suite is None:
-        if commit is None:
-            print("Abort: No check suite found")
-        else:
+    if not check_suite:
+        if commit:
             set_commit(commit)
+        else:
+            print("Abort: No check suite found")
         quit()
 
     query_check_runs = Query(QUERY_CHECK_RUNS, query_variables_check_runs, headers)
@@ -233,7 +230,7 @@ def main():
 
     check_runs = get_bad_check_runs(query_check_runs)
 
-    if len(check_runs) == 0:
+    if not check_runs:
         print("Abort: No check runs found")
         quit()
 

From af70401aa65bc90c0f9fbc37bd959ad3d61c16be Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 10 Jan 2023 12:18:53 -0600
Subject: [PATCH 1668/2403] Switch the reverse feathers to use modules with
 psram

.. by copying the sdkconfig files from the original s2/s3 tft feathers,
as the module is of the same type.
---
 .../sdkconfig                                 | 40 +++++++------------
 .../sdkconfig                                 |  2 +-
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
index 4ec35ed950..f19afafa3d 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig
@@ -1,32 +1,27 @@
-#
-# Component config
-#
-#
-# ESP32S3-Specific
-#
-CONFIG_ESP32S3_SPIRAM_SUPPORT=n
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_MODE_QUAD=y
-# CONFIG_SPIRAM_MODE_OCT is not set
-CONFIG_SPIRAM_TYPE_AUTO=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
-#
-# PSRAM Clock and CS IO for ESP32S3
-#
+# end of SPI RAM config
+
 CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM clock and cs IO for ESP32S2
+#
 CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM Clock and CS IO for ESP32S3
+# end of PSRAM clock and cs IO for ESP32S2
 
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_SPEED_120M is not set
-CONFIG_SPIRAM_SPEED_80M=y
-# CONFIG_SPIRAM_SPEED_40M is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
@@ -34,14 +29,9 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
 # CONFIG_SPIRAM_USE_MALLOC is not set
 CONFIG_SPIRAM_MEMTEST=y
-# end of SPI RAM config
-
-# end of ESP32S3-Specific
-
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s2"
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # end of LWIP
-
-# end of Component config
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
index 2e207ec2ce..9a05ab0205 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
@@ -4,7 +4,7 @@
 #
 # ESP32S3-Specific
 #
-CONFIG_ESP32S3_SPIRAM_SUPPORT=n
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 #
 # SPI RAM config
 #

From 7db8f925542a3c2ea6356814b35e2313b5c1085b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 10 Jan 2023 12:28:51 -0600
Subject: [PATCH 1669/2403] Update some build flags to be more like the
 original tft feathers

.. enable camera and use default (better) optimization
---
 .../adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk      | 3 ---
 .../adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk      | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
index 75c64bb11d..6f6b949d13 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
@@ -9,6 +9,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-OPTIMIZATION_FLAGS = -Os
-CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
index 8185522c52..3fdb028f5e 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
@@ -9,6 +9,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-OPTIMIZATION_FLAGS = -Os
-CIRCUITPY_ESP32_CAMERA = 0

From a974402542f71fde63043da5725e3777c95b6861 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 10 Jan 2023 13:39:10 -0500
Subject: [PATCH 1670/2403] Improve type validation errors messages, especially
 for pins

---
 locale/circuitpython.pot                      | 48 ++++-------
 .../espressif/bindings/esp32_camera/Camera.c  | 21 +++--
 .../bindings/esp32_camera/__init__.c          |  8 +-
 ports/espressif/bindings/espulp/ULP.c         | 20 ++---
 ports/espressif/bindings/espulp/__init__.c    |  2 +-
 .../common-hal/paralleldisplay/ParallelBus.c  |  3 +-
 ports/raspberrypi/bindings/cyw43/__init__.c   | 12 +--
 ports/raspberrypi/bindings/cyw43/__init__.h   |  6 +-
 .../bindings/rp2pio/StateMachine.c            | 18 +++--
 ports/raspberrypi/bindings/rp2pio/__init__.c  | 12 ++-
 ports/raspberrypi/bindings/rp2pio/__init__.h  |  4 +-
 .../common-hal/analogio/AnalogIn.c            |  2 +-
 .../common-hal/digitalio/DigitalInOut.c       |  2 +-
 .../common-hal/rotaryio/IncrementalEncoder.c  |  7 +-
 .../raspberrypi/common-hal/rp2pio/__init__.c  |  6 +-
 py/argcheck.c                                 | 20 ++++-
 py/enum.c                                     |  6 +-
 py/enum.h                                     |  2 +-
 py/obj.c                                      |  2 +-
 py/objexcept.c                                |  6 +-
 py/objstrunicode.c                            |  2 +-
 py/runtime.h                                  |  2 +
 shared-bindings/_bleio/__init__.c             |  6 +-
 shared-bindings/aesio/aes.c                   | 81 +++++++------------
 shared-bindings/alarm/__init__.c              |  7 +-
 shared-bindings/alarm/pin/PinAlarm.c          |  2 +-
 shared-bindings/alarm/touch/TouchAlarm.c      |  2 +-
 shared-bindings/analogbufio/BufferedIn.c      |  2 +-
 shared-bindings/analogio/AnalogIn.c           |  2 +-
 shared-bindings/analogio/AnalogOut.c          |  2 +-
 shared-bindings/audiobusio/I2SOut.c           |  6 +-
 shared-bindings/audiobusio/PDMIn.c            |  4 +-
 shared-bindings/audioio/AudioOut.c            |  6 +-
 shared-bindings/audiopwmio/PWMAudioOut.c      |  6 +-
 shared-bindings/bitbangio/I2C.c               |  4 +-
 shared-bindings/bitbangio/SPI.c               |  6 +-
 shared-bindings/bitmaptools/__init__.c        |  6 +-
 shared-bindings/busio/I2C.c                   |  4 +-
 shared-bindings/busio/SPI.c                   | 13 ++-
 shared-bindings/busio/SPI.h                   |  2 +-
 shared-bindings/busio/UART.c                  | 10 +--
 shared-bindings/canio/CAN.c                   | 12 +--
 shared-bindings/countio/Counter.c             |  2 +-
 shared-bindings/countio/Edge.c                |  2 +-
 shared-bindings/digitalio/DigitalInOut.c      |  2 +-
 shared-bindings/digitalio/Pull.c              |  2 +-
 shared-bindings/displayio/ColorConverter.c    |  2 +-
 shared-bindings/displayio/Display.c           |  3 +-
 shared-bindings/displayio/EPaperDisplay.c     |  2 +-
 shared-bindings/displayio/FourWire.c          |  6 +-
 shared-bindings/displayio/I2CDisplay.c        |  2 +-
 shared-bindings/frequencyio/FrequencyIn.c     |  2 +-
 shared-bindings/gifio/GifWriter.c             |  2 +-
 shared-bindings/i2ctarget/I2CTarget.c         |  4 +-
 .../imagecapture/ParallelImageCapture.c       |  6 +-
 shared-bindings/keypad/KeyMatrix.c            |  4 +-
 shared-bindings/keypad/Keys.c                 |  2 +-
 shared-bindings/keypad/ShiftRegisterKeys.c    |  6 +-
 shared-bindings/microcontroller/Pin.c         | 38 ++++-----
 shared-bindings/microcontroller/Pin.h         |  9 ++-
 shared-bindings/neopixel_write/__init__.c     |  8 +-
 shared-bindings/onewireio/OneWire.c           |  2 +-
 shared-bindings/paralleldisplay/ParallelBus.c | 12 +--
 shared-bindings/ps2io/Ps2.c                   |  4 +-
 shared-bindings/pulseio/PulseIn.c             |  2 +-
 shared-bindings/pulseio/PulseOut.c            |  4 +-
 shared-bindings/pwmio/PWMOut.c                |  2 +-
 shared-bindings/qrio/QRDecoder.c              |  2 +-
 shared-bindings/rgbmatrix/RGBMatrix.c         | 10 +--
 shared-bindings/rotaryio/IncrementalEncoder.c |  4 +-
 shared-bindings/sdcardio/SDCard.c             |  4 +-
 shared-bindings/sdioio/SDCard.c               |  4 +-
 .../sharpdisplay/SharpMemoryFramebuffer.c     |  4 +-
 shared-bindings/touchio/TouchIn.c             |  2 +-
 shared-bindings/usb_host/Port.c               |  4 +-
 shared-bindings/wifi/Radio.c                  |  2 +-
 76 files changed, 270 insertions(+), 290 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 7546dfa0c6..b98bddec50 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -105,6 +105,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -172,12 +176,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -932,20 +937,8 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr ""
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1118,11 +1111,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1583,10 +1571,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1859,6 +1843,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2045,7 +2030,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2969,14 +2957,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
index 687a389fc3..114795c106 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ b/ports/espressif/bindings/esp32_camera/Camera.c
@@ -121,14 +121,21 @@ STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n
     validate_pins(MP_QSTR_data_pins, data_pins, MP_ARRAY_SIZE(data_pins), args[ARG_data_pins].u_obj, &data_pin_count);
     mp_arg_validate_length(data_pin_count, 8, MP_QSTR_data_pins);
 
-    const mcu_pin_obj_t *pixel_clock_pin = validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj);
-    const mcu_pin_obj_t *vsync_pin = validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj);
-    const mcu_pin_obj_t *href_pin = validate_obj_is_free_pin(args[ARG_href_pin].u_obj);
+    const mcu_pin_obj_t *pixel_clock_pin =
+        validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj, MP_QSTR_pixel_clock_pin);
+    const mcu_pin_obj_t *vsync_pin =
+        validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj, MP_QSTR_vsync_pin);
+    const mcu_pin_obj_t *href_pin =
+        validate_obj_is_free_pin(args[ARG_href_pin].u_obj, MP_QSTR_href_pin);
     busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
-    const mcu_pin_obj_t *external_clock_pin = validate_obj_is_free_pin_or_none(args[ARG_external_clock_pin].u_obj);
-    const mcu_pin_obj_t *powerdown_pin = validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj);
-    const mcu_pin_obj_t *reset_pin = validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj);
-    const mp_int_t external_clock_frequency = mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_clock_frequency);
+    const mcu_pin_obj_t *external_clock_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_external_clock_pin].u_obj, MP_QSTR_external_clock_pin);
+    const mcu_pin_obj_t *powerdown_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj, MP_QSTR_powerdown_pin);
+    const mcu_pin_obj_t *reset_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj, MP_QSTR_reset_pin);
+    const mp_int_t external_clock_frequency =
+        mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_external_clock_frequency);
 
     camera_grab_mode_t grab_mode = validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode);
     framesize_t frame_size = validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/esp32_camera/__init__.c
index f1ee4b6891..36c837106c 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/esp32_camera/__init__.c
@@ -69,7 +69,7 @@ MAKE_PRINTER(esp32_camera, esp32_camera_grab_mode);
 MAKE_ENUM_TYPE(esp32_camera, GrabMode, esp32_camera_grab_mode);
 
 camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_grab_mode_type, mp_arg_validate_type(obj, &esp32_camera_grab_mode_type, arg_name));
+    return cp_enum_value(&esp32_camera_grab_mode_type, obj, arg_name);
 }
 
 //| class PixelFormat:
@@ -100,7 +100,7 @@ MAKE_PRINTER(esp32_camera, esp32_camera_pixel_format);
 MAKE_ENUM_TYPE(esp32_camera, PixelFormat, esp32_camera_pixel_format);
 
 pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_pixel_format_type, mp_arg_validate_type(obj, &esp32_camera_pixel_format_type, arg_name));
+    return cp_enum_value(&esp32_camera_pixel_format_type, obj, arg_name);
 }
 
 //| class FrameSize:
@@ -225,7 +225,7 @@ MAKE_PRINTER(esp32_camera, esp32_camera_frame_size);
 MAKE_ENUM_TYPE(esp32_camera, FrameSize, esp32_camera_frame_size);
 
 framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_frame_size_type, mp_arg_validate_type(obj, &esp32_camera_frame_size_type, arg_name));
+    return cp_enum_value(&esp32_camera_frame_size_type, obj, arg_name);
 }
 
 //| class GainCeiling:
@@ -265,7 +265,7 @@ MAKE_PRINTER(esp32_camera, esp32_camera_gain_ceiling);
 MAKE_ENUM_TYPE(esp32_camera, GainCeiling, esp32_camera_gain_ceiling);
 
 gainceiling_t validate_gain_ceiling(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_gain_ceiling_type, mp_arg_validate_type(obj, &esp32_camera_gain_ceiling_type, arg_name));
+    return cp_enum_value(&esp32_camera_gain_ceiling_type, obj, arg_name);
 }
 
 STATIC const mp_rom_map_elem_t esp32_camera_module_globals_table[] = {
diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c
index 15af22dca8..201226d93f 100644
--- a/ports/espressif/bindings/espulp/ULP.c
+++ b/ports/espressif/bindings/espulp/ULP.c
@@ -44,22 +44,17 @@ STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, si
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC espulp_ulp_obj_t *get_ulp_obj(mp_obj_t self_in) {
-    if (!mp_obj_is_type(self_in, &espulp_ulp_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_ULP);
-    }
-    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void check_for_deinit(espulp_ulp_obj_t *self) {
     if (common_hal_espulp_ulp_deinited(self)) {
         raise_deinited_error();
     }
-    return self;
 }
 
 //|     def deinit(self) -> None:
 //|         """Deinitialises the ULP and releases it for another program."""
 //|         ...
 STATIC mp_obj_t espulp_ulp_deinit(mp_obj_t self_in) {
-    espulp_ulp_obj_t *self = get_ulp_obj(self_in);
+    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_espulp_ulp_deinit(self);
     return mp_const_none;
 }
@@ -89,6 +84,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espulp_ulp___exit___obj, 4, 4, espulp
 //|         The program will continue to run even when the running Python is halted."""
 //|         ...
 STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+
     enum { ARG_program, ARG_pins };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_program, MP_ARG_REQUIRED | MP_ARG_OBJ},
@@ -96,7 +94,6 @@ STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    espulp_ulp_obj_t *self = get_ulp_obj(pos_args[0]);
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_buffer_info_t bufinfo;
@@ -111,7 +108,7 @@ STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     for (mp_uint_t i = 0; i < num_pins; i++) {
         mp_obj_t pin_obj = mp_obj_subscr(pins_in, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
-        validate_obj_is_free_pin(pin_obj);
+        validate_obj_is_free_pin(pin_obj, MP_QSTR_pin);
         const mcu_pin_obj_t *pin = ((const mcu_pin_obj_t *)pin_obj);
         if (pin->number >= 32) {
             raise_ValueError_invalid_pin();
@@ -129,7 +126,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espulp_ulp_run_obj, 2, espulp_ulp_run);
 //|         ...
 //|
 STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) {
-    common_hal_espulp_ulp_halt(get_ulp_obj(self_in));
+    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    common_hal_espulp_ulp_halt(self);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt);
diff --git a/ports/espressif/bindings/espulp/__init__.c b/ports/espressif/bindings/espulp/__init__.c
index 06c62175fa..b51cbebf5e 100644
--- a/ports/espressif/bindings/espulp/__init__.c
+++ b/ports/espressif/bindings/espulp/__init__.c
@@ -61,7 +61,7 @@
 //|
 
 STATIC mp_obj_t espulp_get_rtc_gpio_number(mp_obj_t pin_obj) {
-    const mcu_pin_obj_t *pin = validate_obj_is_pin(pin_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(pin_obj, MP_QSTR_pin);
     mp_int_t number = common_hal_espulp_get_rtc_gpio_number(pin);
     if (number < 0) {
         return mp_const_none;
diff --git a/ports/espressif/common-hal/paralleldisplay/ParallelBus.c b/ports/espressif/common-hal/paralleldisplay/ParallelBus.c
index 1b6ee41c40..c9ba3edd06 100644
--- a/ports/espressif/common-hal/paralleldisplay/ParallelBus.c
+++ b/ports/espressif/common-hal/paralleldisplay/ParallelBus.c
@@ -118,7 +118,8 @@ void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbu
     const mcu_pin_obj_t *data_pins[8];
     for (int i = 0; i < 8; i++) {
         snprintf(buf, sizeof(buf), "GPIO%d", data0->number + i);
-        data_pins[i] = validate_obj_is_free_pin(mp_obj_dict_get(MP_OBJ_FROM_PTR(&mcu_pin_globals), mp_obj_new_str(buf, strlen(buf))));
+        data_pins[i] = validate_obj_is_free_pin(
+            mp_obj_dict_get(MP_OBJ_FROM_PTR(&mcu_pin_globals), mp_obj_new_str(buf, strlen(buf))), MP_QSTR_pin);
     }
     common_hal_paralleldisplay_parallelbus_construct_nonsequential(self, 8, data_pins, command, chip_select, write, read, reset, frequency);
 }
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index c72581a6e4..778da1ab62 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -116,23 +116,23 @@ STATIC mp_obj_t cyw43_get_power_management() {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(cyw43_get_power_management_obj, cyw43_get_power_management);
 
-const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj) {
+const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj, qstr arg_name) {
     if (!mp_obj_is_type(obj, &mcu_pin_type) && !mp_obj_is_type(obj, &cyw43_pin_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q or %q"), mcu_pin_type.name, cyw43_pin_type.name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), arg_name, mcu_pin_type.name, cyw43_pin_type.name, mp_obj_get_type(obj)->name);
     }
     return MP_OBJ_TO_PTR(obj);
 }
 
-const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj) {
-    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj, qstr arg_name) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj, arg_name);
     if (obj != &pin_GPIO29) {
         assert_pin_free(pin);
     }
     return pin;
 }
 
-const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj) {
-    const mcu_pin_obj_t *pin = validate_obj_is_pin_including_cyw43(obj);
+const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj, qstr arg_name) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin_including_cyw43(obj, arg_name);
     assert_pin_free(pin);
     return pin;
 }
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.h b/ports/raspberrypi/bindings/cyw43/__init__.h
index 65e9813f99..26c1aa008f 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.h
+++ b/ports/raspberrypi/bindings/cyw43/__init__.h
@@ -31,9 +31,9 @@
 #include "common-hal/microcontroller/Pin.h"
 
 extern const mp_obj_type_t cyw43_pin_type;
-const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj);
-const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj);
-const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj);
+const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj, qstr arg_name);
 
 #define CONSTANT_CYW43_PM_VALUE(pm_mode, pm2_sleep_ret_ms, li_beacon_period, li_dtim_period, li_assoc) \
     (li_assoc << 20 | /* listen interval sent to ap */ \
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 041d02e5cd..95c5be7447 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -222,19 +222,25 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n
     mp_get_buffer(args[ARG_init].u_obj, &init_bufinfo, MP_BUFFER_READ);
 
     // We don't validate pin in use here because we may be ok sharing them within a PIO.
-    const mcu_pin_obj_t *first_out_pin = validate_obj_is_pin_or_none(args[ARG_first_out_pin].u_obj);
+    const mcu_pin_obj_t *first_out_pin =
+        validate_obj_is_pin_or_none(args[ARG_first_out_pin].u_obj, MP_QSTR_first_out_pin);
     mp_int_t out_pin_count = mp_arg_validate_int_min(args[ARG_out_pin_count].u_int, 1, MP_QSTR_out_pin_count);
 
-    const mcu_pin_obj_t *first_in_pin = validate_obj_is_pin_or_none(args[ARG_first_in_pin].u_obj);
+    const mcu_pin_obj_t *first_in_pin =
+        validate_obj_is_pin_or_none(args[ARG_first_in_pin].u_obj, MP_QSTR_first_in_pin);
     mp_int_t in_pin_count = mp_arg_validate_int_min(args[ARG_in_pin_count].u_int, 1, MP_QSTR_in_pin_count);
 
-    const mcu_pin_obj_t *first_set_pin = validate_obj_is_pin_or_none(args[ARG_first_set_pin].u_obj);
+    const mcu_pin_obj_t *first_set_pin =
+        validate_obj_is_pin_or_none(args[ARG_first_set_pin].u_obj, MP_QSTR_first_set_pin);
     mp_int_t set_pin_count = mp_arg_validate_int_range(args[ARG_set_pin_count].u_int, 1, 5, MP_QSTR_set_pin_count);
 
-    const mcu_pin_obj_t *first_sideset_pin = validate_obj_is_pin_or_none(args[ARG_first_sideset_pin].u_obj);
-    mp_int_t sideset_pin_count = mp_arg_validate_int_range(args[ARG_sideset_pin_count].u_int, 1, 5, MP_QSTR_set_pin_count);
+    const mcu_pin_obj_t *first_sideset_pin =
+        validate_obj_is_pin_or_none(args[ARG_first_sideset_pin].u_obj, MP_QSTR_first_sideset_pin);
+    mp_int_t sideset_pin_count =
+        mp_arg_validate_int_range(args[ARG_sideset_pin_count].u_int, 1, 5, MP_QSTR_set_pin_count);
 
-    const mcu_pin_obj_t *jmp_pin = validate_obj_is_pin_or_none(args[ARG_jmp_pin].u_obj);
+    const mcu_pin_obj_t *jmp_pin =
+        validate_obj_is_pin_or_none(args[ARG_jmp_pin].u_obj, MP_QSTR_jmp_pin);
     digitalio_pull_t jmp_pin_pull = validate_pull(args[ARG_jmp_pin_pull].u_rom_obj, MP_QSTR_jmp_pull);
 
     mp_int_t pull_threshold =
diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c
index 6256d4d898..ce3be4aa52 100644
--- a/ports/raspberrypi/bindings/rp2pio/__init__.c
+++ b/ports/raspberrypi/bindings/rp2pio/__init__.c
@@ -43,11 +43,17 @@
 //|     """Return True if the pins have sequential GPIO numbers, False otherwise"""
 //|     ...
 //|
-STATIC mp_obj_t rp2pio_pins_are_sequential(const mp_obj_t pins) {
+STATIC mp_obj_t rp2pio_pins_are_sequential(mp_obj_t pins_obj) {
     size_t len;
     mp_obj_t *items;
-    mp_obj_get_array(pins, &len, &items);
-    return mp_obj_new_bool(common_hal_rp2pio_pins_are_sequential(len, items));
+    mp_obj_get_array(pins_obj, &len, &items);
+
+    const mcu_pin_obj_t *pins[len];
+    for (size_t i = 0; i < len; i++) {
+        pins[i] = validate_obj_is_pin(items[i], MP_QSTR_pins);
+    }
+
+    return mp_obj_new_bool(common_hal_rp2pio_pins_are_sequential(len, pins));
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_pins_are_sequential_obj, rp2pio_pins_are_sequential);
diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.h b/ports/raspberrypi/bindings/rp2pio/__init__.h
index 89dc7ff98f..5cf73cbde3 100644
--- a/ports/raspberrypi/bindings/rp2pio/__init__.h
+++ b/ports/raspberrypi/bindings/rp2pio/__init__.h
@@ -26,4 +26,6 @@
 
 #pragma once
 
-bool common_hal_rp2pio_pins_are_sequential(size_t len, mp_obj_t *items);
+#include "shared-bindings/microcontroller/Pin.h"
+
+bool common_hal_rp2pio_pins_are_sequential(size_t len, const mcu_pin_obj_t **pins);
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
index 8811cd54e4..afa31e3c83 100644
--- a/ports/raspberrypi/common-hal/analogio/AnalogIn.c
+++ b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -44,7 +44,7 @@
 #define SPECIAL_PIN(pin) (pin->number == 29)
 
 const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
-    return validate_obj_is_free_pin_or_gpio29(obj);
+    return validate_obj_is_free_pin_or_gpio29(obj, MP_QSTR_pin);
 }
 #else
 #define SPECIAL_PIN(pin) false
diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
index eb498d3f19..d90c0db81b 100644
--- a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
+++ b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -43,7 +43,7 @@
 #define IS_CYW(self) ((self)->pin->base.type == &cyw43_pin_type)
 
 const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj) {
-    return validate_obj_is_free_pin_including_cyw43(obj);
+    return validate_obj_is_free_pin_including_cyw43(obj, MP_QSTR_pin);
 }
 #endif
 
diff --git a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
index 0da12e5923..7cb4c84382 100644
--- a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
+++ b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
@@ -61,12 +61,13 @@ STATIC void incrementalencoder_interrupt_handler(void *self_in);
 
 void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
     const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
-    mp_obj_t pins[] = {MP_OBJ_FROM_PTR(pin_a), MP_OBJ_FROM_PTR(pin_b)};
+    const mcu_pin_obj_t *pins[] = { pin_a, pin_b };
+
     // Start out with swapped to match behavior with other ports.
     self->swapped = true;
     if (!common_hal_rp2pio_pins_are_sequential(2, pins)) {
-        pins[0] = MP_OBJ_FROM_PTR(pin_b);
-        pins[1] = MP_OBJ_FROM_PTR(pin_a);
+        pins[0] = pin_b;
+        pins[1] = pin_a;
         self->swapped = false;
         if (!common_hal_rp2pio_pins_are_sequential(2, pins)) {
             mp_raise_RuntimeError(translate("Pins must be sequential GPIO pins"));
diff --git a/ports/raspberrypi/common-hal/rp2pio/__init__.c b/ports/raspberrypi/common-hal/rp2pio/__init__.c
index 61a77e021c..7634001c98 100644
--- a/ports/raspberrypi/common-hal/rp2pio/__init__.c
+++ b/ports/raspberrypi/common-hal/rp2pio/__init__.c
@@ -28,13 +28,13 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/rp2pio/__init__.h"
 
-bool common_hal_rp2pio_pins_are_sequential(size_t len, mp_obj_t *items) {
+bool common_hal_rp2pio_pins_are_sequential(size_t len, const mcu_pin_obj_t **pins) {
     if (len == 0) {
         return true;
     }
-    const mcu_pin_obj_t *last_pin = validate_obj_is_pin(items[0]);
+    const mcu_pin_obj_t *last_pin = pins[0];
     for (size_t i = 1; i < len; i++) {
-        const mcu_pin_obj_t *pin = validate_obj_is_pin(items[i]);
+        const mcu_pin_obj_t *pin = pins[i];
         if (pin->number != last_pin->number + 1) {
             return false;
         }
diff --git a/py/argcheck.c b/py/argcheck.c
index 01c712ac36..05c2567ca2 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -234,14 +234,28 @@ mp_int_t mp_arg_validate_index_range(mp_int_t index, mp_int_t min, mp_int_t max,
 
 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 be of type %q"), arg_name, type->name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, type->name, mp_obj_get_type(obj)->name);
+    }
+    return obj;
+}
+
+mp_obj_t mp_arg_validate_type_in(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 in %q must be of type %q, not %q"), MP_QSTR_object, arg_name, type->name, mp_obj_get_type(obj)->name);
+    }
+    return obj;
+}
+
+mp_obj_t mp_arg_validate_type_or_none(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name) {
+    if (obj != mp_const_none && !mp_obj_is_type(obj, type)) {
+        mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), arg_name, type->name, MP_QSTR_None, mp_obj_get_type(obj)->name);
     }
     return obj;
 }
 
 mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) {
     if (!mp_obj_is_str(obj)) {
-        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_str);
+        mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_str, mp_obj_get_type(obj)->name);
     }
     return obj;
 }
@@ -249,7 +263,7 @@ mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) {
 mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {
     mp_int_t an_int;
     if (!mp_obj_get_int_maybe(obj, &an_int)) {
-        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_int);
+        mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_int, mp_obj_get_type(obj)->name);
     }
     return an_int;
 }
diff --git a/py/enum.c b/py/enum.c
index 681c3b3103..22b9090196 100644
--- a/py/enum.c
+++ b/py/enum.c
@@ -40,10 +40,8 @@ mp_obj_t cp_enum_find(const mp_obj_type_t *type, int value) {
     return mp_const_none;
 }
 
-int cp_enum_value(const mp_obj_type_t *type, mp_obj_t obj) {
-    if (!mp_obj_is_type(obj, type)) {
-        mp_raise_TypeError_varg(MP_ERROR_TEXT("Expected a %q"), type->name);
-    }
+int cp_enum_value(const mp_obj_type_t *type, mp_obj_t obj, qstr arg_name) {
+    (void)mp_arg_validate_type(obj, type, arg_name);
     return ((cp_enum_obj_t *)MP_OBJ_TO_PTR(obj))->value;
 }
 
diff --git a/py/enum.h b/py/enum.h
index d0b8529a4d..63191047e0 100644
--- a/py/enum.h
+++ b/py/enum.h
@@ -61,5 +61,5 @@ typedef struct {
 
 
 mp_obj_t cp_enum_find(const mp_obj_type_t *type, int value);
-int cp_enum_value(const mp_obj_type_t *type, mp_obj_t obj);
+int cp_enum_value(const mp_obj_type_t *type, mp_obj_t obj, qstr arg_name);
 void cp_enum_obj_print_helper(uint16_t module, const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
diff --git a/py/obj.c b/py/obj.c
index 72a0647176..c394656016 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -521,7 +521,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)) {
-        mp_raise_TypeError_varg(translate("%q must be of type %q"), MP_QSTR_index, MP_QSTR_int);
+        mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), MP_QSTR_index, MP_QSTR_int, mp_obj_get_type(index)->name);
     }
 
     if (i < 0) {
diff --git a/py/objexcept.c b/py/objexcept.c
index 80da487076..976535754b 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -228,7 +228,7 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
                 self->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
             } else {
                 if (!mp_obj_is_type(dest[1], &mp_type_traceback)) {
-                    mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), MP_QSTR___context__, MP_QSTR_traceback);
+                    mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or %q, not %q"), MP_QSTR___context__, MP_QSTR_traceback, MP_QSTR_None, mp_obj_get_type(dest[1])->name);
                 }
                 self->traceback = MP_OBJ_TO_PTR(dest[1]);
             }
@@ -240,7 +240,7 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             } else if (!mp_obj_is_type(dest[1], &mp_type_BaseException)) {
                 self->cause = dest[1];
             } else {
-                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), attr, MP_QSTR_BaseException);
+                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or %q, not %q"), attr, MP_QSTR_BaseException, MP_QSTR_None, mp_obj_get_type(dest[1])->name);
             }
             self->suppress_context = true;
             dest[0] = MP_OBJ_NULL; // indicate success
@@ -250,7 +250,7 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             } else if (!mp_obj_is_type(dest[1], &mp_type_BaseException)) {
                 self->context = dest[1];
             } else {
-                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or None"), attr, MP_QSTR_BaseException);
+                mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or %q, not %q"), attr, MP_QSTR_BaseException, MP_QSTR_None, mp_obj_get_type(dest[1])->name);
             }
             dest[0] = MP_OBJ_NULL; // indicate success
         } else if (attr == MP_QSTR___suppress_context__) {
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 863bbd42d7..b3b23d0f01 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -159,7 +159,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     if (mp_obj_is_small_int(index)) {
         i = MP_OBJ_SMALL_INT_VALUE(index);
     } else if (!mp_obj_get_int_maybe(index, &i)) {
-        mp_raise_TypeError_varg(translate("%q must be of type %q"), MP_QSTR_index, MP_QSTR_int);
+        mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), MP_QSTR_index, MP_QSTR_int, mp_obj_get_type(index)->name);
     }
     const byte *s, *top = self_data + self_len;
     if (i < 0) {
diff --git a/py/runtime.h b/py/runtime.h
index a5f66b1507..1a7a5d1698 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -110,6 +110,8 @@ mp_uint_t mp_arg_validate_length_range(mp_uint_t length, mp_uint_t min, mp_uint_
 mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qstr arg_name);
 mp_int_t mp_arg_validate_index_range(mp_int_t index, mp_int_t min, mp_int_t max, qstr arg_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_type_in(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name);
+mp_obj_t mp_arg_validate_type_or_none(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name);
 mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name);
 mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name);
 
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index 1ec2a2758a..59c6c354a4 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -121,9 +121,7 @@ STATIC mp_obj_dict_t bleio_module_globals;
 //|
 mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj) {
     #if CIRCUITPY_BLEIO_HCI
-    if (adapter_obj != mp_const_none && !mp_obj_is_type(adapter_obj, &bleio_adapter_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), bleio_adapter_type.name);
-    }
+    (void)mp_arg_validate_type_or_none(adapter_obj, &bleio_adapter_type, MP_QSTR_adapter);
 
     // Equivalent of:
     // bleio.adapter = adapter_obj
@@ -132,7 +130,7 @@ mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj) {
         elem->value = adapter_obj;
     }
     #else
-    mp_raise_NotImplementedError(translate("Not settable"));
+    mp_raise_NotImplementedError(translate("Read-only"));
     #endif
     return mp_const_none;
 }
diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 9170b63799..50e07a5b61 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -47,7 +47,9 @@
 
 STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     size_t n_kw, const mp_obj_t *all_args) {
-    (void)type;
+    aesio_aes_obj_t *self = m_new_obj(aesio_aes_obj_t);
+    self->base.type = &aesio_aes_type;
+
     enum { ARG_key, ARG_mode, ARG_IV, ARG_counter, ARG_segment_size };
     static const mp_arg_t allowed_args[] = {
         {MP_QSTR_key, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
@@ -61,16 +63,13 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args),
         allowed_args, args);
 
-    aesio_aes_obj_t *self = m_new_obj(aesio_aes_obj_t);
-    self->base.type = &aesio_aes_type;
-
     mp_buffer_info_t bufinfo;
 
     const uint8_t *key = NULL;
     uint32_t key_length = 0;
     mp_get_buffer_raise(args[ARG_key].u_obj, &bufinfo, MP_BUFFER_READ);
     if ((bufinfo.len != 16) && (bufinfo.len != 24) && (bufinfo.len != 32)) {
-        mp_raise_TypeError(translate("Key must be 16, 24, or 32 bytes long"));
+        mp_raise_ValueError(translate("Key must be 16, 24, or 32 bytes long"));
     }
     key = bufinfo.buf;
     key_length = bufinfo.len;
@@ -82,17 +81,15 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
         case AES_MODE_CTR:
             break;
         default:
-            mp_raise_TypeError(translate("Requested AES mode is unsupported"));
+            mp_raise_NotImplementedError(translate("Requested AES mode is unsupported"));
     }
 
     // IV is required for CBC mode and is ignored for other modes.
     const uint8_t *iv = NULL;
     if (args[ARG_IV].u_obj != NULL &&
         mp_get_buffer(args[ARG_IV].u_obj, &bufinfo, MP_BUFFER_READ)) {
-        if (bufinfo.len != AES_BLOCKLEN) {
-            mp_raise_TypeError_varg(translate("IV must be %d bytes long"),
-                AES_BLOCKLEN);
-        }
+        (void)mp_arg_validate_length(bufinfo.len, AES_BLOCKLEN, MP_QSTR_IV);
+
         iv = bufinfo.buf;
     }
 
@@ -112,7 +109,7 @@ STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args) {
         mp_raise_ValueError(translate("No key was specified"));
     }
     if ((key_length != 16) && (key_length != 24) && (key_length != 32)) {
-        mp_raise_TypeError(translate("Key must be 16, 24, or 32 bytes long"));
+        mp_raise_ValueError(translate("Key must be 16, 24, or 32 bytes long"));
     }
 
     const uint8_t *iv = NULL;
@@ -120,10 +117,7 @@ STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args) {
         mp_get_buffer_raise(pos_args[2], &bufinfo, MP_BUFFER_READ);
         size_t iv_length = bufinfo.len;
         iv = (const uint8_t *)bufinfo.buf;
-        if (iv_length != AES_BLOCKLEN) {
-            mp_raise_TypeError_varg(translate("IV must be %d bytes long"),
-                AES_BLOCKLEN);
-        }
+        (void)mp_arg_validate_length(iv_length, AES_BLOCKLEN, MP_QSTR_IV);
     }
 
     common_hal_aesio_aes_rekey(self, key, key_length, iv);
@@ -142,14 +136,12 @@ STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length,
     switch (self->mode) {
         case AES_MODE_ECB:
             if (src_length != 16) {
-                mp_raise_msg(&mp_type_ValueError,
-                    translate("ECB only operates on 16 bytes at a time"));
+                mp_raise_ValueError(translate("ECB only operates on 16 bytes at a time"));
             }
             break;
         case AES_MODE_CBC:
             if ((src_length & 15) != 0) {
-                mp_raise_msg(&mp_type_ValueError,
-                    translate("CBC blocks must be multiples of 16 bytes"));
+                mp_raise_ValueError(translate("CBC blocks must be multiples of 16 bytes"));
             }
             break;
         case AES_MODE_CTR:
@@ -164,28 +156,21 @@ STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length,
 //|         buffers must be a multiple of 16 bytes, and must be equal length.  For
 //|         CTX mode, there are no restrictions."""
 //|         ...
-STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
-    mp_obj_t dest) {
-    if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), aesio_aes_type.name);
-    }
-    // Convert parameters into expected types.
-    aesio_aes_obj_t *aes = MP_OBJ_TO_PTR(aesio_obj);
+STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) {
+    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_buffer_info_t srcbufinfo, destbufinfo;
     mp_get_buffer_raise(src, &srcbufinfo, MP_BUFFER_READ);
     mp_get_buffer_raise(dest, &destbufinfo, MP_BUFFER_WRITE);
-    validate_length(aes, srcbufinfo.len, destbufinfo.len);
+    validate_length(self, srcbufinfo.len, destbufinfo.len);
 
     memcpy(destbufinfo.buf, srcbufinfo.buf, srcbufinfo.len);
 
-    common_hal_aesio_aes_encrypt(aes, (uint8_t *)destbufinfo.buf,
-        destbufinfo.len);
+    common_hal_aesio_aes_encrypt(self, (uint8_t *)destbufinfo.buf, destbufinfo.len);
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj,
-    aesio_aes_encrypt_into);
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj, aesio_aes_encrypt_into);
 
 //|     def decrypt_into(self, src: ReadableBuffer, dest: WriteableBuffer) -> None:
 //|         """Decrypt the buffer from ``src`` into ``dest``.
@@ -194,43 +179,31 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj,
 //|         CTX mode, there are no restrictions."""
 //|         ...
 //|
-STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
-    mp_obj_t dest) {
-    if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), aesio_aes_type.name);
-    }
-    // Convert parameters into expected types.
-    aesio_aes_obj_t *aes = MP_OBJ_TO_PTR(aesio_obj);
+STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) {
+    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_buffer_info_t srcbufinfo, destbufinfo;
     mp_get_buffer_raise(src, &srcbufinfo, MP_BUFFER_READ);
     mp_get_buffer_raise(dest, &destbufinfo, MP_BUFFER_WRITE);
-    validate_length(aes, srcbufinfo.len, destbufinfo.len);
+    validate_length(self, srcbufinfo.len, destbufinfo.len);
 
     memcpy(destbufinfo.buf, srcbufinfo.buf, srcbufinfo.len);
 
-    common_hal_aesio_aes_decrypt(aes, (uint8_t *)destbufinfo.buf,
-        destbufinfo.len);
+    common_hal_aesio_aes_decrypt(self, (uint8_t *)destbufinfo.buf, destbufinfo.len);
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_decrypt_into_obj,
-    aesio_aes_decrypt_into);
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_decrypt_into_obj, aesio_aes_decrypt_into);
+
+STATIC mp_obj_t aesio_aes_get_mode(mp_obj_t self_in) {
+    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-STATIC mp_obj_t aesio_aes_get_mode(mp_obj_t aesio_obj) {
-    if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), aesio_aes_type.name);
-    }
-    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(aesio_obj);
     return MP_OBJ_NEW_SMALL_INT(self->mode);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(aesio_aes_get_mode_obj, aesio_aes_get_mode);
 
-STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t aesio_obj, mp_obj_t mode_obj) {
-    if (!mp_obj_is_type(aesio_obj, &aesio_aes_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), aesio_aes_type.name);
-    }
-    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(aesio_obj);
+STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t self_in, mp_obj_t mode_obj) {
+    aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     int mode = mp_obj_get_int(mode_obj);
     switch (mode) {
@@ -239,7 +212,7 @@ STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t aesio_obj, mp_obj_t mode_obj) {
         case AES_MODE_CTR:
             break;
         default:
-            mp_raise_TypeError(translate("Requested AES mode is unsupported"));
+            mp_raise_NotImplementedError(translate("Requested AES mode is unsupported"));
     }
 
     common_hal_aesio_aes_set_mode(self, mode);
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 48dccff8df..f61482682f 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -86,7 +86,7 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) {
             mp_obj_is_type(objs[i], &alarm_touch_touchalarm_type)) {
             continue;
         }
-        mp_raise_TypeError_varg(translate("Expected an %q"), MP_QSTR_Alarm);
+        mp_raise_TypeError_varg(translate("Expected a kind of %q"), MP_QSTR_Alarm);
     }
 }
 
@@ -207,10 +207,7 @@ STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_o
 
     for (mp_uint_t i = 0; i < num_dios; i++) {
         mp_obj_t dio = mp_obj_subscr(preserve_dios, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL);
-        if (!mp_obj_is_type(dio, &digitalio_digitalinout_type)) {
-            mp_raise_TypeError_varg(translate("Expected a %q"), MP_QSTR_DigitalInOut);
-        }
-        dios_array[i] = MP_OBJ_TO_PTR(dio);
+        dios_array[i] = mp_arg_validate_type(dio, &digitalio_digitalinout_type, MP_QSTR_alarm);
     }
 
     common_hal_alarm_set_deep_sleep_alarms(n_args, pos_args, num_dios, dios_array);
diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c
index 6e8bc5341e..c75061b77a 100644
--- a/shared-bindings/alarm/pin/PinAlarm.c
+++ b/shared-bindings/alarm/pin/PinAlarm.c
@@ -74,7 +74,7 @@ STATIC mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     common_hal_alarm_pin_pinalarm_construct(self,
         pin,
diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c
index cce31e6ffe..20612cb106 100644
--- a/shared-bindings/alarm/touch/TouchAlarm.c
+++ b/shared-bindings/alarm/touch/TouchAlarm.c
@@ -56,7 +56,7 @@ STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     common_hal_alarm_touch_touchalarm_construct(self, pin);
 
diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c
index 193552c313..4641df6891 100644
--- a/shared-bindings/analogbufio/BufferedIn.c
+++ b/shared-bindings/analogbufio/BufferedIn.c
@@ -76,7 +76,7 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // Validate Pin
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     // Create local object
     analogbufio_bufferedin_obj_t *self = m_new_obj_with_finaliser(analogbufio_bufferedin_obj_t);
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 800c0bfa21..3b71f688c8 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -37,7 +37,7 @@
 #include "shared-bindings/util.h"
 
 MP_WEAK const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
-    return validate_obj_is_free_pin(obj);
+    return validate_obj_is_free_pin(obj, MP_QSTR_pin);
 }
 
 //| class AnalogIn:
diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index de6811b5a3..6b10d37571 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -61,7 +61,7 @@ STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t
     // check arguments
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0], MP_QSTR_pin);
 
     analogio_analogout_obj_t *self = m_new_obj(analogio_analogout_obj_t);
     self->base.type = &analogio_analogout_type;
diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index b570191da9..3713caeb7b 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -110,9 +110,9 @@ STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_a
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *bit_clock = validate_obj_is_free_pin(args[ARG_bit_clock].u_obj);
-    const mcu_pin_obj_t *word_select = validate_obj_is_free_pin(args[ARG_word_select].u_obj);
-    const mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj);
+    const mcu_pin_obj_t *bit_clock = validate_obj_is_free_pin(args[ARG_bit_clock].u_obj, MP_QSTR_bit_clock);
+    const mcu_pin_obj_t *word_select = validate_obj_is_free_pin(args[ARG_word_select].u_obj, MP_QSTR_word_select);
+    const mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj, MP_QSTR_data);
 
     audiobusio_i2sout_obj_t *self = m_new_obj_with_finaliser(audiobusio_i2sout_obj_t);
     self->base.type = &audiobusio_i2sout_type;
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index db19ab6edd..b6a316fadb 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -112,8 +112,8 @@ STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock_pin = validate_obj_is_free_pin(args[ARG_clock_pin].u_obj);
-    const mcu_pin_obj_t *data_pin = validate_obj_is_free_pin(args[ARG_data_pin].u_obj);
+    const mcu_pin_obj_t *clock_pin = validate_obj_is_free_pin(args[ARG_clock_pin].u_obj, MP_QSTR_clock_pin);
+    const mcu_pin_obj_t *data_pin = validate_obj_is_free_pin(args[ARG_data_pin].u_obj, MP_QSTR_data_pin);
 
     // create PDMIn object from the given pin
     audiobusio_pdmin_obj_t *self = m_new_obj(audiobusio_pdmin_obj_t);
diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c
index a569097480..7909176114 100644
--- a/shared-bindings/audioio/AudioOut.c
+++ b/shared-bindings/audioio/AudioOut.c
@@ -105,8 +105,10 @@ STATIC mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *left_channel_pin = validate_obj_is_free_pin(args[ARG_left_channel].u_obj);
-    const mcu_pin_obj_t *right_channel_pin = validate_obj_is_free_pin_or_none(args[ARG_right_channel].u_obj);
+    const mcu_pin_obj_t *left_channel_pin =
+        validate_obj_is_free_pin(args[ARG_left_channel].u_obj, MP_QSTR_left_channel);
+    const mcu_pin_obj_t *right_channel_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_right_channel].u_obj, MP_QSTR_right_channel);
 
     // create AudioOut object from the given pin
     audioio_audioout_obj_t *self = m_new_obj(audioio_audioout_obj_t);
diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index 2e17bbda8c..b4cea75184 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -108,8 +108,10 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *left_channel_pin = validate_obj_is_free_pin(args[ARG_left_channel].u_obj);
-    const mcu_pin_obj_t *right_channel_pin = validate_obj_is_free_pin_or_none(args[ARG_right_channel].u_obj);
+    const mcu_pin_obj_t *left_channel_pin =
+        validate_obj_is_free_pin(args[ARG_left_channel].u_obj, MP_QSTR_left_channel);
+    const mcu_pin_obj_t *right_channel_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_right_channel].u_obj, MP_QSTR_right_channel);
 
     // create AudioOut object from the given pin
     audiopwmio_pwmaudioout_obj_t *self = m_new_obj(audiopwmio_pwmaudioout_obj_t);
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index 19c27740e3..2a4b22cb96 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -76,8 +76,8 @@ STATIC mp_obj_t bitbangio_i2c_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_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj);
-    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj);
+    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj, MP_QSTR_scl);
+    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj, MP_QSTR_sda);
 
     bitbangio_i2c_obj_t *self = m_new_obj(bitbangio_i2c_obj_t);
     self->base.type = &bitbangio_i2c_type;
diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c
index 1b7c877bda..84d150a830 100644
--- a/shared-bindings/bitbangio/SPI.c
+++ b/shared-bindings/bitbangio/SPI.c
@@ -84,9 +84,9 @@ STATIC mp_obj_t bitbangio_spi_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_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
-    const mcu_pin_obj_t *mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj);
-    const mcu_pin_obj_t *miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj);
+    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj, MP_QSTR_clock);
+    const mcu_pin_obj_t *mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj, MP_QSTR_mosi);
+    const mcu_pin_obj_t *miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj, MP_QSTR_miso);
 
     bitbangio_spi_obj_t *self = m_new_obj(bitbangio_spi_obj_t);
     self->base.type = &bitbangio_spi_type;
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index dd62b515fe..33e3257770 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -319,7 +319,7 @@ STATIC mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args,
     mp_float_t factor1 = (args[ARG_factor_1].u_obj == mp_const_none) ? MICROPY_FLOAT_CONST(.5) : mp_obj_get_float(args[ARG_factor_1].u_obj);
     mp_float_t factor2 = (args[ARG_factor_2].u_obj == mp_const_none) ? 1 - factor1 : mp_obj_get_float(args[ARG_factor_2].u_obj);
 
-    displayio_colorspace_t colorspace = (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_colorspace].u_obj);
+    displayio_colorspace_t colorspace = (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_colorspace].u_obj, MP_QSTR_colorspace);
 
     if (destination->width != source1->width
         || destination->height != source1->height
@@ -741,8 +741,8 @@ STATIC mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_m
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     displayio_bitmap_t *source_bitmap = mp_arg_validate_type(args[ARG_source_bitmap].u_obj, &displayio_bitmap_type, MP_QSTR_source_bitmap);
     displayio_bitmap_t *dest_bitmap = mp_arg_validate_type(args[ARG_dest_bitmap].u_obj, &displayio_bitmap_type, MP_QSTR_dest_bitmap);
-    bitmaptools_dither_algorithm_t algorithm = cp_enum_value(&bitmaptools_dither_algorithm_type, args[ARG_algorithm].u_obj);
-    displayio_colorspace_t colorspace = cp_enum_value(&displayio_colorspace_type, args[ARG_source_colorspace].u_obj);
+    bitmaptools_dither_algorithm_t algorithm = cp_enum_value(&bitmaptools_dither_algorithm_type, args[ARG_algorithm].u_obj, MP_QSTR_algorithm);
+    displayio_colorspace_t colorspace = cp_enum_value(&displayio_colorspace_type, args[ARG_source_colorspace].u_obj, MP_QSTR_source_colorspace);
 
     if (source_bitmap->width != dest_bitmap->width || source_bitmap->height != dest_bitmap->height) {
         mp_raise_TypeError(translate("bitmap sizes must match"));
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index e589dea08b..d2da3ea7dc 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -80,8 +80,8 @@ STATIC mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj);
-    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj);
+    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj, MP_QSTR_scl);
+    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj, MP_QSTR_sda);
 
     common_hal_busio_i2c_construct(self, scl, sda, args[ARG_frequency].u_int, args[ARG_timeout].u_int);
     return (mp_obj_t)self;
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index badf80bf93..2999a9f5a7 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -103,9 +103,9 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
-    const mcu_pin_obj_t *mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj);
-    const mcu_pin_obj_t *miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj);
+    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj, MP_QSTR_clock);
+    const mcu_pin_obj_t *mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj, MP_QSTR_mosi);
+    const mcu_pin_obj_t *miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj, MP_QSTR_miso);
 
     if (!miso && !mosi) {
         mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
@@ -463,9 +463,6 @@ const mp_obj_type_t busio_spi_type = {
     .locals_dict = (mp_obj_dict_t *)&busio_spi_locals_dict,
 };
 
-busio_spi_obj_t *validate_obj_is_spi_bus(mp_obj_t obj) {
-    if (!mp_obj_is_type(obj, &busio_spi_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), busio_spi_type.name);
-    }
-    return MP_OBJ_TO_PTR(obj);
+busio_spi_obj_t *validate_obj_is_spi_bus(mp_obj_t obj, qstr arg_name) {
+    return mp_arg_validate_type(obj, &busio_spi_type, arg_name);
 }
diff --git a/shared-bindings/busio/SPI.h b/shared-bindings/busio/SPI.h
index 76166580a0..3b8f831219 100644
--- a/shared-bindings/busio/SPI.h
+++ b/shared-bindings/busio/SPI.h
@@ -70,6 +70,6 @@ uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t *self);
 // This is used by the supervisor to claim SPI devices indefinitely.
 extern void common_hal_busio_spi_never_reset(busio_spi_obj_t *self);
 
-extern busio_spi_obj_t *validate_obj_is_spi_bus(mp_obj_t obj_in);
+extern busio_spi_obj_t *validate_obj_is_spi_bus(mp_obj_t obj_in, qstr arg_name);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 59e46cafc4..aada49a051 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -116,8 +116,8 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *rx = validate_obj_is_free_pin_or_none(args[ARG_rx].u_obj);
-    const mcu_pin_obj_t *tx = validate_obj_is_free_pin_or_none(args[ARG_tx].u_obj);
+    const mcu_pin_obj_t *rx = validate_obj_is_free_pin_or_none(args[ARG_rx].u_obj, MP_QSTR_rx);
+    const mcu_pin_obj_t *tx = validate_obj_is_free_pin_or_none(args[ARG_tx].u_obj, MP_QSTR_tx);
 
     if ((tx == NULL) && (rx == NULL)) {
         mp_raise_ValueError(translate("tx and rx cannot both be None"));
@@ -137,9 +137,9 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
     mp_float_t timeout = mp_obj_get_float(args[ARG_timeout].u_obj);
     validate_timeout(timeout);
 
-    const mcu_pin_obj_t *rts = validate_obj_is_free_pin_or_none(args[ARG_rts].u_obj);
-    const mcu_pin_obj_t *cts = validate_obj_is_free_pin_or_none(args[ARG_cts].u_obj);
-    const mcu_pin_obj_t *rs485_dir = validate_obj_is_free_pin_or_none(args[ARG_rs485_dir].u_obj);
+    const mcu_pin_obj_t *rts = validate_obj_is_free_pin_or_none(args[ARG_rts].u_obj, MP_QSTR_rts);
+    const mcu_pin_obj_t *cts = validate_obj_is_free_pin_or_none(args[ARG_cts].u_obj, MP_QSTR_cts);
+    const mcu_pin_obj_t *rs485_dir = validate_obj_is_free_pin_or_none(args[ARG_rs485_dir].u_obj, MP_QSTR_rs485_dir);
 
     const bool rs485_invert = args[ARG_rs485_invert].u_bool;
 
diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c
index b2e85c0244..bce581f501 100644
--- a/shared-bindings/canio/CAN.c
+++ b/shared-bindings/canio/CAN.c
@@ -77,8 +77,8 @@ STATIC mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *rx_pin = validate_obj_is_free_pin_or_none(args[ARG_rx].u_obj);
-    const mcu_pin_obj_t *tx_pin = validate_obj_is_free_pin_or_none(args[ARG_tx].u_obj);
+    const mcu_pin_obj_t *rx_pin = validate_obj_is_free_pin_or_none(args[ARG_rx].u_obj, MP_QSTR_rx);
+    const mcu_pin_obj_t *tx_pin = validate_obj_is_free_pin_or_none(args[ARG_tx].u_obj, MP_QSTR_tx);
     if (!rx_pin && !tx_pin) {
         mp_raise_ValueError(translate("tx and rx cannot both be None"));
     }
@@ -233,11 +233,7 @@ STATIC mp_obj_t canio_can_listen(size_t n_args, const mp_obj_t *pos_args, mp_map
 
     canio_match_obj_t *matches[nmatch];
     for (size_t i = 0; i < nmatch; i++) {
-        const mp_obj_type_t *type = mp_obj_get_type(match_objects[i]);
-        if (type != &canio_match_type) {
-            mp_raise_TypeError_varg(translate("expected '%q' but got '%q'"), MP_QSTR_Match, type->name);
-        }
-        matches[i] = MP_OBJ_TO_PTR(match_objects[i]);
+        matches[i] = mp_arg_validate_type_in(match_objects[i], &canio_match_type, MP_QSTR_matches);
     }
 
     float timeout = args[ARG_timeout].u_obj ? mp_obj_get_float(args[ARG_timeout].u_obj) : 10.0f;
@@ -272,7 +268,7 @@ STATIC mp_obj_t canio_can_send(mp_obj_t self_in, mp_obj_t message_in) {
     common_hal_canio_can_check_for_deinit(self);
     const mp_obj_type_t *message_type = mp_obj_get_type(message_in);
     if (message_type != &canio_message_type && message_type != &canio_remote_transmission_request_type) {
-        mp_raise_TypeError_varg(translate("expected '%q' or '%q' but got '%q'"), MP_QSTR_Message, MP_QSTR_RemoteTransmissionRequest, message_type->name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), MP_QSTR_message, MP_QSTR_Message, MP_QSTR_RemoteTransmissionRequest, message_type->name);
     }
 
     canio_message_obj_t *message = message_in;
diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c
index eed676a17e..4f0e0a692f 100644
--- a/shared-bindings/countio/Counter.c
+++ b/shared-bindings/countio/Counter.c
@@ -53,7 +53,7 @@ STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
     const countio_edge_t edge = validate_edge(args[ARG_edge].u_obj, MP_QSTR_edge);
     const digitalio_pull_t pull = validate_pull(args[ARG_pull].u_obj, MP_QSTR_pull);
     // Make long-lived because some implementations use a pointer to the object as interrupt-handler data.
diff --git a/shared-bindings/countio/Edge.c b/shared-bindings/countio/Edge.c
index ec96163b3e..9b8e74304b 100644
--- a/shared-bindings/countio/Edge.c
+++ b/shared-bindings/countio/Edge.c
@@ -65,5 +65,5 @@ MAKE_PRINTER(countio, countio_edge);
 MAKE_ENUM_TYPE(countio, Edge, countio_edge);
 
 countio_edge_t validate_edge(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&countio_edge_type, mp_arg_validate_type(obj, &countio_edge_type, arg_name));
+    return cp_enum_value(&countio_edge_type, obj, arg_name);
 }
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index e6fe592a65..de4d66f9d8 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -69,7 +69,7 @@ STATIC void check_result(digitalinout_result_t result) {
 }
 
 MP_WEAK const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj) {
-    return validate_obj_is_free_pin(obj);
+    return validate_obj_is_free_pin(obj, MP_QSTR_pin);
 }
 
 //| class DigitalInOut:
diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c
index 5934ddb9c2..3c7a036d1e 100644
--- a/shared-bindings/digitalio/Pull.c
+++ b/shared-bindings/digitalio/Pull.c
@@ -83,5 +83,5 @@ digitalio_pull_t validate_pull(mp_rom_obj_t obj, qstr arg_name) {
     if (obj == MP_ROM_NONE) {
         return PULL_NONE;
     }
-    mp_raise_TypeError_varg(translate("%q must be of type %q or None"), arg_name, MP_QSTR_Pull);
+    mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), arg_name, MP_QSTR_Pull, MP_QSTR_None, mp_obj_get_type(obj)->name);
 }
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 997174f28b..9c3d297fdc 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -61,7 +61,7 @@ STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, siz
     displayio_colorconverter_t *self = m_new_obj(displayio_colorconverter_t);
     self->base.type = &displayio_colorconverter_type;
 
-    common_hal_displayio_colorconverter_construct(self, args[ARG_dither].u_bool, (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_input_colorspace].u_obj));
+    common_hal_displayio_colorconverter_construct(self, args[ARG_dither].u_bool, (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_input_colorspace].u_obj, MP_QSTR_input_colorspace));
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index e5a2836d1a..448aa25b79 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -185,7 +185,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_init_sequence].u_obj, &bufinfo, MP_BUFFER_READ);
 
-    const mcu_pin_obj_t *backlight_pin = validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj);
+    const mcu_pin_obj_t *backlight_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj, MP_QSTR_backlight_pin);
 
     mp_float_t brightness = mp_obj_get_float(args[ARG_brightness].u_obj);
 
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index f3831b5084..6fde664670 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -167,7 +167,7 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
     mp_get_buffer_raise(args[ARG_stop_sequence].u_obj, &stop_bufinfo, MP_BUFFER_READ);
 
 
-    const mcu_pin_obj_t *busy_pin = validate_obj_is_free_pin_or_none(args[ARG_busy_pin].u_obj);
+    const mcu_pin_obj_t *busy_pin = validate_obj_is_free_pin_or_none(args[ARG_busy_pin].u_obj, MP_QSTR_busy_pin);
 
     mp_int_t rotation = args[ARG_rotation].u_int;
     if (rotation % 90 != 0) {
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index edcf2ade0e..1f099f5061 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -89,9 +89,9 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *command = validate_obj_is_free_pin_or_none(args[ARG_command].u_obj);
-    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
-    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);
+    const mcu_pin_obj_t *command = validate_obj_is_free_pin_or_none(args[ARG_command].u_obj, MP_QSTR_command);
+    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj, MP_QSTR_chip_select);
+    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj, MP_QSTR_reset);
 
     mp_obj_t spi = mp_arg_validate_type(args[ARG_spi_bus].u_obj, &busio_spi_type, MP_QSTR_spi_bus);
 
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index 2374e58e4a..14edf7b0be 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -71,7 +71,7 @@ STATIC mp_obj_t displayio_i2cdisplay_make_new(const mp_obj_type_t *type, size_t
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);
+    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj, MP_QSTR_reset);
 
     mp_obj_t i2c = mp_arg_validate_type(args[ARG_i2c_bus].u_obj, &busio_i2c_type, MP_QSTR_i2c_bus);
     displayio_i2cdisplay_obj_t *self = &allocate_display_bus_or_raise()->i2cdisplay_bus;
diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c
index 3138f543e7..bf09196e3d 100644
--- a/shared-bindings/frequencyio/FrequencyIn.c
+++ b/shared-bindings/frequencyio/FrequencyIn.c
@@ -83,7 +83,7 @@ STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     const uint16_t capture_period = args[ARG_capture_period].u_int;
 
diff --git a/shared-bindings/gifio/GifWriter.c b/shared-bindings/gifio/GifWriter.c
index 57c38b554e..a0de52e2cc 100644
--- a/shared-bindings/gifio/GifWriter.c
+++ b/shared-bindings/gifio/GifWriter.c
@@ -80,7 +80,7 @@ static mp_obj_t gifio_gifwriter_make_new(const mp_obj_type_t *type, size_t n_arg
         file,
         args[ARG_width].u_int,
         args[ARG_height].u_int,
-        (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_colorspace].u_obj),
+        (displayio_colorspace_t)cp_enum_value(&displayio_colorspace_type, args[ARG_colorspace].u_obj, MP_QSTR_colorspace),
         args[ARG_loop].u_bool,
         args[ARG_dither].u_bool,
         own_file);
diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c
index 17da952118..a07d038c6f 100644
--- a/shared-bindings/i2ctarget/I2CTarget.c
+++ b/shared-bindings/i2ctarget/I2CTarget.c
@@ -81,8 +81,8 @@ STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj);
-    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj);
+    const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj, MP_QSTR_scl);
+    const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj, MP_QSTR_sda);
 
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(args[ARG_addresses].u_obj, &iter_buf);
diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c
index b6352514bf..d568da158f 100644
--- a/shared-bindings/imagecapture/ParallelImageCapture.c
+++ b/shared-bindings/imagecapture/ParallelImageCapture.c
@@ -72,9 +72,9 @@ STATIC mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t *
     uint8_t pin_count;
     validate_pins(MP_QSTR_data, pins, MP_ARRAY_SIZE(pins), args[ARG_data_pins].u_obj, &pin_count);
 
-    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
-    const mcu_pin_obj_t *vsync = validate_obj_is_free_pin_or_none(args[ARG_vsync].u_obj);
-    const mcu_pin_obj_t *href = validate_obj_is_free_pin_or_none(args[ARG_href].u_obj);
+    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj, MP_QSTR_clock);
+    const mcu_pin_obj_t *vsync = validate_obj_is_free_pin_or_none(args[ARG_vsync].u_obj, MP_QSTR_vsync);
+    const mcu_pin_obj_t *href = validate_obj_is_free_pin_or_none(args[ARG_href].u_obj, MP_QSTR_href);
 
     imagecapture_parallelimagecapture_obj_t *self = m_new_obj(imagecapture_parallelimagecapture_obj_t);
     self->base.type = &imagecapture_parallelimagecapture_type;
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 28a68602ab..49723dbb9e 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -102,13 +102,13 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
 
     for (size_t row = 0; row < num_row_pins; row++) {
         const mcu_pin_obj_t *pin =
-            validate_obj_is_free_pin(mp_obj_subscr(row_pins, MP_OBJ_NEW_SMALL_INT(row), MP_OBJ_SENTINEL));
+            validate_obj_is_free_pin(mp_obj_subscr(row_pins, MP_OBJ_NEW_SMALL_INT(row), MP_OBJ_SENTINEL), MP_QSTR_pin);
         row_pins_array[row] = pin;
     }
 
     for (size_t column = 0; column < num_column_pins; column++) {
         const mcu_pin_obj_t *pin =
-            validate_obj_is_free_pin(mp_obj_subscr(column_pins, MP_OBJ_NEW_SMALL_INT(column), MP_OBJ_SENTINEL));
+            validate_obj_is_free_pin(mp_obj_subscr(column_pins, MP_OBJ_NEW_SMALL_INT(column), MP_OBJ_SENTINEL), MP_QSTR_pin);
         column_pins_array[column] = pin;
     }
 
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 3a9eb84cf3..10519958c7 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -100,7 +100,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     for (mp_uint_t i = 0; i < num_pins; i++) {
         pins_array[i] =
-            validate_obj_is_free_pin(mp_obj_subscr(pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+            validate_obj_is_free_pin(mp_obj_subscr(pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL), MP_QSTR_pin);
     }
 
     common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, interval, max_events);
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 0703a78b66..9113be33d2 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -98,9 +98,9 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
-    const mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj);
-    const mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj);
+    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj, MP_QSTR_clock);
+    const mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj, MP_QSTR_data);
+    const mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj, MP_QSTR_latch);
     const bool value_to_latch = args[ARG_value_to_latch].u_bool;
 
     const size_t key_count = (size_t)mp_arg_validate_int_min(args[ARG_key_count].u_int, 1, MP_QSTR_key_count);
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index f1b9a90d45..a4c5cb2d54 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -93,23 +93,21 @@ const mp_obj_type_t mcu_pin_type = {
         )
 };
 
-const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj) {
-    if (!mp_obj_is_type(obj, &mcu_pin_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), mcu_pin_type.name);
-    }
-    return MP_OBJ_TO_PTR(obj);
+const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj, qstr arg_name) {
+    return MP_OBJ_TO_PTR(mp_arg_validate_type(obj, &mcu_pin_type, arg_name));
+}
+
+const mcu_pin_obj_t *validate_obj_is_pin_in(mp_obj_t obj, qstr arg_name) {
+    return MP_OBJ_TO_PTR(mp_arg_validate_type_in(obj, &mcu_pin_type, arg_name));
 }
 
 // Validate that the obj is a pin or None. Return an mcu_pin_obj_t* or NULL, correspondingly.
-const mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj) {
-    if (obj == mp_const_none) {
-        return NULL;
-    }
-    return validate_obj_is_pin(obj);
+const mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj, qstr arg_name) {
+    return MP_OBJ_TO_PTR(mp_arg_validate_type(obj, &mcu_pin_type, arg_name));
 }
 
-const mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj) {
-    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
+const mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj, qstr arg_name) {
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj, arg_name);
     assert_pin_free(pin);
     return pin;
 }
@@ -120,11 +118,11 @@ void validate_no_duplicate_pins(mp_obj_t seq, qstr arg_name) {
 
     for (size_t pin_cnt = 0; pin_cnt < num_pins; pin_cnt++) {
         mp_obj_t pin1_obj = mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(pin_cnt), MP_OBJ_SENTINEL);
-        const mcu_pin_obj_t *pin1 = validate_obj_is_pin(pin1_obj);
+        const mcu_pin_obj_t *pin1 = validate_obj_is_pin_in(pin1_obj, arg_name);
 
         for (size_t pin_cnt_2 = pin_cnt + 1; pin_cnt_2 < num_pins; pin_cnt_2++) {
             mp_obj_t pin2_obj = mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(pin_cnt_2), MP_OBJ_SENTINEL);
-            const mcu_pin_obj_t *pin2 = validate_obj_is_pin(pin2_obj);
+            const mcu_pin_obj_t *pin2 = validate_obj_is_pin_in(pin2_obj, arg_name);
             if (pin1 == pin2) {
                 mp_raise_TypeError_varg(translate("%q contains duplicate pins"), arg_name);
             }
@@ -141,11 +139,11 @@ void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1,
 
     for (size_t pin_cnt_1 = 0; pin_cnt_1 < num_pins_1; pin_cnt_1++) {
         mp_obj_t pin1_obj = mp_obj_subscr(seq1, MP_OBJ_NEW_SMALL_INT(pin_cnt_1), MP_OBJ_SENTINEL);
-        const mcu_pin_obj_t *pin1 = validate_obj_is_pin(pin1_obj);
+        const mcu_pin_obj_t *pin1 = validate_obj_is_pin_in(pin1_obj, arg_name1);
 
         for (size_t pin_cnt_2 = 0; pin_cnt_2 < num_pins_2; pin_cnt_2++) {
             mp_obj_t pin2_obj = mp_obj_subscr(seq2, MP_OBJ_NEW_SMALL_INT(pin_cnt_2), MP_OBJ_SENTINEL);
-            const mcu_pin_obj_t *pin2 = validate_obj_is_pin(pin2_obj);
+            const mcu_pin_obj_t *pin2 = validate_obj_is_pin_in(pin2_obj, arg_name2);
             if (pin1 == pin2) {
                 mp_raise_TypeError_varg(translate("%q and %q contain duplicate pins"), arg_name1, arg_name2);
             }
@@ -159,16 +157,18 @@ void validate_list_is_free_pins(qstr what, const mcu_pin_obj_t **pins_out, mp_in
     mp_arg_validate_length_max(len, max_pins, what);
     *count_out = len;
     for (mp_int_t i = 0; i < len; i++) {
-        pins_out[i] = validate_obj_is_free_pin(mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+        pins_out[i] =
+            validate_obj_is_pin_in(mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL), what);
+        assert_pin_free(pins_out[i]);
     }
 }
 
 // Validate that the obj is a free pin or None. Return an mcu_pin_obj_t* or NULL, correspondingly.
-const mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj) {
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj, qstr arg_name) {
     if (obj == mp_const_none) {
         return NULL;
     }
-    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_pin(obj, arg_name);
     assert_pin_free(pin);
     return pin;
 }
diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h
index b41b3c308a..28d0949042 100644
--- a/shared-bindings/microcontroller/Pin.h
+++ b/shared-bindings/microcontroller/Pin.h
@@ -33,10 +33,11 @@
 // Type object used in Python. Should be shared between ports.
 extern const mp_obj_type_t mcu_pin_type;
 
-const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj);
-const mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj);
-const mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj);
-const mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj);
+const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_pin_in(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj, qstr arg_name);
+const mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj, qstr arg_name);
 void validate_no_duplicate_pins(mp_obj_t seq, qstr arg_name);
 void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1, qstr arg_name2);
 void validate_list_is_free_pins(qstr what, const mcu_pin_obj_t **pins_out, mp_int_t max_pins, mp_obj_t seq, uint8_t *count_out);
diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c
index 3a35fa8243..66c36af34b 100644
--- a/shared-bindings/neopixel_write/__init__.c
+++ b/shared-bindings/neopixel_write/__init__.c
@@ -113,12 +113,8 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
 //|     ...
 //|
 STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) {
-    if (!mp_obj_is_type(digitalinout_obj, &digitalio_digitalinout_type)) {
-        mp_raise_TypeError_varg(translate("Expected a %q"), digitalio_digitalinout_type.name);
-    }
-
-    // Convert parameters into expected types.
-    const digitalio_digitalinout_obj_t *digitalinout = MP_OBJ_TO_PTR(digitalinout_obj);
+    const digitalio_digitalinout_obj_t *digitalinout =
+        mp_arg_validate_type(digitalinout_obj, &digitalio_digitalinout_type, MP_QSTR_digitalinout);
 
     // Check to see if the NeoPixel has been deinited before writing to it.
     check_for_deinit(digitalinout_obj);
diff --git a/shared-bindings/onewireio/OneWire.c b/shared-bindings/onewireio/OneWire.c
index 4a0140ac5d..3f0dc87722 100644
--- a/shared-bindings/onewireio/OneWire.c
+++ b/shared-bindings/onewireio/OneWire.c
@@ -60,7 +60,7 @@ STATIC mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_a
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     onewireio_onewire_obj_t *self = m_new_obj(onewireio_onewire_obj_t);
     self->base.type = &onewireio_onewire_type;
diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c
index 2f18624f1a..42b4c788c7 100644
--- a/shared-bindings/paralleldisplay/ParallelBus.c
+++ b/shared-bindings/paralleldisplay/ParallelBus.c
@@ -85,11 +85,11 @@ STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj);
-    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
-    const mcu_pin_obj_t *write = validate_obj_is_free_pin(args[ARG_write].u_obj);
-    const mcu_pin_obj_t *read = validate_obj_is_free_pin_or_none(args[ARG_read].u_obj);
-    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);
+    const mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj, MP_QSTR_command);
+    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj, MP_QSTR_chip_select);
+    const mcu_pin_obj_t *write = validate_obj_is_free_pin(args[ARG_write].u_obj, MP_QSTR_write);
+    const mcu_pin_obj_t *read = validate_obj_is_free_pin_or_none(args[ARG_read].u_obj, MP_QSTR_read);
+    const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj, MP_QSTR_reset);
 
     paralleldisplay_parallelbus_obj_t *self = &allocate_display_bus_or_raise()->parallel_bus;
     self->base.type = ¶lleldisplay_parallelbus_type;
@@ -102,7 +102,7 @@ STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type,
     }
 
     if (specified_data0) {
-        const mcu_pin_obj_t *data0 = validate_obj_is_free_pin(args[ARG_data0].u_obj);
+        const mcu_pin_obj_t *data0 = validate_obj_is_free_pin(args[ARG_data0].u_obj, MP_QSTR_data0);
         common_hal_paralleldisplay_parallelbus_construct(self, data0, command, chip_select, write, read, reset, args[ARG_frequency].u_int);
     } else {
         uint8_t num_pins;
diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c
index 5aeb3af51e..67cffc9f7b 100644
--- a/shared-bindings/ps2io/Ps2.c
+++ b/shared-bindings/ps2io/Ps2.c
@@ -75,8 +75,8 @@ STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock_pin = validate_obj_is_free_pin(args[ARG_clock_pin].u_obj);
-    const mcu_pin_obj_t *data_pin = validate_obj_is_free_pin(args[ARG_data_pin].u_obj);
+    const mcu_pin_obj_t *clock_pin = validate_obj_is_free_pin(args[ARG_clock_pin].u_obj, MP_QSTR_clock_pin);
+    const mcu_pin_obj_t *data_pin = validate_obj_is_free_pin(args[ARG_data_pin].u_obj, MP_QSTR_data_pin);
 
     ps2io_ps2_obj_t *self = m_new_obj(ps2io_ps2_obj_t);
     self->base.type = &ps2io_ps2_type;
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index 6d1830c4f2..81edc48bfd 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -86,7 +86,7 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     // Make object long-lived to avoid moving between imports
     pulseio_pulsein_obj_t *self = m_new_ll_obj(pulseio_pulsein_obj_t);
diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c
index 758d3c2e77..2af07a46d8 100644
--- a/shared-bindings/pulseio/PulseOut.c
+++ b/shared-bindings/pulseio/PulseOut.c
@@ -77,10 +77,10 @@ STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin = args[ARG_pin].u_obj;
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
     mp_int_t frequency = args[ARG_frequency].u_int;
     mp_int_t duty_cycle = args[ARG_duty_cycle].u_int;
-    validate_obj_is_free_pin(MP_OBJ_FROM_PTR(pin));
+
     pulseio_pulseout_obj_t *self = m_new_obj(pulseio_pulseout_obj_t);
     self->base.type = &pulseio_pulseout_type;
     common_hal_pulseio_pulseout_construct(self, pin, frequency, duty_cycle);
diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c
index 92eea1d1e0..1fd69272da 100644
--- a/shared-bindings/pwmio/PWMOut.c
+++ b/shared-bindings/pwmio/PWMOut.c
@@ -147,7 +147,7 @@ STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_val_t parsed_args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, parsed_args);
 
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(parsed_args[ARG_pin].u_obj);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(parsed_args[ARG_pin].u_obj, MP_QSTR_pin);
 
     uint16_t duty_cycle = parsed_args[ARG_duty_cycle].u_int;
     uint32_t frequency = parsed_args[ARG_frequency].u_int;
diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c
index 5ff65578e4..b37a14fd8f 100644
--- a/shared-bindings/qrio/QRDecoder.c
+++ b/shared-bindings/qrio/QRDecoder.c
@@ -80,7 +80,7 @@ STATIC mp_obj_t qrio_qrdecoder_decode(size_t n_args, const mp_obj_t *pos_args, m
 
     // verify that the buffer is big enough
     int sz = width * height;
-    qrio_pixel_policy_t policy = cp_enum_value(&qrio_pixel_policy_type, args[ARG_pixel_policy].u_obj);
+    qrio_pixel_policy_t policy = cp_enum_value(&qrio_pixel_policy_type, args[ARG_pixel_policy].u_obj, MP_QSTR_pixel_policy);
     if (policy != QRIO_EVERY_BYTE) {
         sz *= 2;
     }
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index 456f0cfbb1..f2877531bb 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -44,8 +44,8 @@
 
 extern Protomatter_core *_PM_protoPtr;
 
-STATIC uint8_t validate_pin(mp_obj_t obj) {
-    const mcu_pin_obj_t *result = validate_obj_is_free_pin(obj);
+STATIC uint8_t validate_pin(mp_obj_t obj, qstr arg_name) {
+    const mcu_pin_obj_t *result = validate_obj_is_free_pin(obj, arg_name);
     return common_hal_mcu_pin_number(result);
 }
 
@@ -210,9 +210,9 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
     uint8_t rgb_count, addr_count;
     uint8_t rgb_pins[MP_ARRAY_SIZE(self->rgb_pins)];
     uint8_t addr_pins[MP_ARRAY_SIZE(self->addr_pins)];
-    uint8_t clock_pin = validate_pin(args[ARG_clock_pin].u_obj);
-    uint8_t latch_pin = validate_pin(args[ARG_latch_pin].u_obj);
-    uint8_t output_enable_pin = validate_pin(args[ARG_output_enable_pin].u_obj);
+    uint8_t clock_pin = validate_pin(args[ARG_clock_pin].u_obj, MP_QSTR_clock_pin);
+    uint8_t latch_pin = validate_pin(args[ARG_latch_pin].u_obj, MP_QSTR_latch_pin);
+    uint8_t output_enable_pin = validate_pin(args[ARG_output_enable_pin].u_obj, MP_QSTR_output_enable_pin);
     mp_int_t bit_depth = mp_arg_validate_int_range(args[ARG_bit_depth].u_int, 1, 6, MP_QSTR_bit_depth);
 
     validate_pins(MP_QSTR_rgb_pins, rgb_pins, MP_ARRAY_SIZE(self->rgb_pins), args[ARG_rgb_list].u_obj, &rgb_count);
diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index e05ffb9e43..fae55db317 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -72,8 +72,8 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *pin_a = validate_obj_is_free_pin(args[ARG_pin_a].u_obj);
-    const mcu_pin_obj_t *pin_b = validate_obj_is_free_pin(args[ARG_pin_b].u_obj);
+    const mcu_pin_obj_t *pin_a = validate_obj_is_free_pin(args[ARG_pin_a].u_obj, MP_QSTR_pin_a);
+    const mcu_pin_obj_t *pin_b = validate_obj_is_free_pin(args[ARG_pin_b].u_obj, MP_QSTR_pin_b);
 
     // Make long-lived because some implementations use a pointer to the object as interrupt-handler data.
     rotaryio_incrementalencoder_obj_t *self = m_new_ll_obj(rotaryio_incrementalencoder_obj_t);
diff --git a/shared-bindings/sdcardio/SDCard.c b/shared-bindings/sdcardio/SDCard.c
index a71541c548..960d4a733e 100644
--- a/shared-bindings/sdcardio/SDCard.c
+++ b/shared-bindings/sdcardio/SDCard.c
@@ -89,8 +89,8 @@ STATIC mp_obj_t sdcardio_sdcard_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    busio_spi_obj_t *spi = validate_obj_is_spi_bus(args[ARG_spi].u_obj);
-    const mcu_pin_obj_t *cs = validate_obj_is_free_pin(args[ARG_cs].u_obj);
+    busio_spi_obj_t *spi = validate_obj_is_spi_bus(args[ARG_spi].u_obj, MP_QSTR_spi);
+    const mcu_pin_obj_t *cs = validate_obj_is_free_pin(args[ARG_cs].u_obj, MP_QSTR_cs);
 
     sdcardio_sdcard_obj_t *self = m_new_obj(sdcardio_sdcard_obj_t);
     self->base.type = &sdcardio_SDCard_type;
diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c
index 7e57330fc4..f4cc4a9bb1 100644
--- a/shared-bindings/sdioio/SDCard.c
+++ b/shared-bindings/sdioio/SDCard.c
@@ -98,8 +98,8 @@ STATIC mp_obj_t sdioio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args,
 
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
-    const mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj);
+    const mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj, MP_QSTR_clock);
+    const mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj, MP_QSTR_command);
     const mcu_pin_obj_t *data_pins[4];
     uint8_t num_data;
     validate_list_is_free_pins(MP_QSTR_data, data_pins, MP_ARRAY_SIZE(data_pins), args[ARG_data].u_obj, &num_data);
diff --git a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
index 35e06b7838..b0f68333e6 100644
--- a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
+++ b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
@@ -47,8 +47,8 @@ STATIC mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, siz
 
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
-    busio_spi_obj_t *spi = validate_obj_is_spi_bus(args[ARG_spi_bus].u_obj);
+    const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj, MP_QSTR_chip_select);
+    busio_spi_obj_t *spi = validate_obj_is_spi_bus(args[ARG_spi_bus].u_obj, MP_QSTR_spi_bus);
 
     sharpdisplay_framebuffer_obj_t *self = &allocate_display_bus_or_raise()->sharpdisplay;
     self->base.type = &sharpdisplay_framebuffer_type;
diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 226fa445da..7f26149b00 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -63,7 +63,7 @@ STATIC mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type,
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // 1st argument is the pin
-    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0]);
+    const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[0], MP_QSTR_pin);
 
     touchio_touchin_obj_t *self = m_new_obj(touchio_touchin_obj_t);
     self->base.type = &touchio_touchin_type;
diff --git a/shared-bindings/usb_host/Port.c b/shared-bindings/usb_host/Port.c
index 7fb79e75a5..53b1fec54f 100644
--- a/shared-bindings/usb_host/Port.c
+++ b/shared-bindings/usb_host/Port.c
@@ -47,8 +47,8 @@ STATIC mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type,
     // check number of arguments
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
 
-    const mcu_pin_obj_t *dp = validate_obj_is_free_pin(args[0]);
-    const mcu_pin_obj_t *dm = validate_obj_is_free_pin(args[1]);
+    const mcu_pin_obj_t *dp = validate_obj_is_free_pin(args[0], MP_QSTR_dp);
+    const mcu_pin_obj_t *dm = validate_obj_is_free_pin(args[1], MP_QSTR_dm);
 
     usb_host_port_obj_t *self = m_new_obj(usb_host_port_obj_t);
     self->base.type = &usb_host_port_type;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 27a5907894..fc3cc345b8 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -344,7 +344,7 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
         mp_obj_iter_buf_t iter_buf;
         mp_obj_t item, iterable = mp_getiter(args[ARG_authmode].u_obj, &iter_buf);
         while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            authmodes |= cp_enum_value(&wifi_authmode_type, item);
+            authmodes |= cp_enum_value(&wifi_authmode_type, item, MP_QSTR_authmode);
         }
     }
 

From e817563ca054556e6a4a08be63f89cecc01e2259 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 10 Jan 2023 15:03:06 -0600
Subject: [PATCH 1671/2403] Update cyw43-driver, fix no-password wifi

Now, open wifi works on Pico W, so this closes #7438.

For the web workflow it's now OK to either
 * specify an empty password string (as before)
 * not have the CIRCUITPY_WIFI_PASSWORD key at all (new functionality)
---
 ports/raspberrypi/Makefile                    | 2 +-
 ports/raspberrypi/common-hal/wifi/Radio.c     | 3 ++-
 ports/raspberrypi/lib/cyw43-driver            | 2 +-
 supervisor/shared/web_workflow/web_workflow.c | 5 ++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index d72d59bcf6..ee0356b852 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -233,7 +233,7 @@ SRC_SDK := \
 	$(SRC_SDK_CYW43) \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
-$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow -Ilib/cyw43-driver
 
 SRC_C += \
 	boards/$(BOARD)/board.c \
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index db21dd333b..ae14d29ade 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -244,7 +244,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     common_hal_wifi_radio_stop_station(self);
 
     // connect
-    cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, CYW43_AUTH_WPA2_AES_PSK);
+    int auth_mode = password_len ? CYW43_AUTH_WPA2_AES_PSK : CYW43_AUTH_OPEN;
+    cyw43_arch_wifi_connect_async((const char *)ssid, (const char *)password, auth_mode);
     // TODO: Implement authmode check like in espressif
 
     while (port_get_raw_ticks(NULL) < deadline) {
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
index 746e063603..2cf328d9e4 160000
--- a/ports/raspberrypi/lib/cyw43-driver
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 746e0636033d0550b7652688124a77a6a1639cf9
+Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index c34c3b3c9f..c52a4df859 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -264,7 +264,10 @@ void supervisor_start_web_workflow(void) {
     }
 
     result = common_hal_os_getenv_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
-    if (result != GETENV_OK) {
+    if (result == GETENV_ERR_NOT_FOUND) {
+        // if password is unspecified, assume an open network
+        password[0] = '\0';
+    } else if (result != GETENV_OK) {
         return;
     }
 

From fbd5f273713d6f1f453224fbfe685e48484287c6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 10 Jan 2023 15:34:15 -0800
Subject: [PATCH 1672/2403] Ignore ESP-IDF wakeup cause when light sleeping

The IDF's wakeup cause is only for deep sleep. Without ignoring it,
light sleep will wake up too early when done after a deep sleep
wake.

Fixes #7300
---
 ports/espressif/common-hal/alarm/__init__.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c
index 574fab0151..0c288d89b4 100644
--- a/ports/espressif/common-hal/alarm/__init__.c
+++ b/ports/espressif/common-hal/alarm/__init__.c
@@ -76,7 +76,7 @@ void alarm_reset(void) {
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 }
 
-STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(void) {
+STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(bool deep_sleep) {
     // First check if the modules remember what last woke up
     if (alarm_pin_pinalarm_woke_this_cycle()) {
         return ESP_SLEEP_WAKEUP_GPIO;
@@ -94,17 +94,20 @@ STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(void) {
     #endif
     // If waking from true deep sleep, modules will have lost their state,
     // so check the deep wakeup cause manually
-    return esp_sleep_get_wakeup_cause();
+    if (deep_sleep) {
+        return esp_sleep_get_wakeup_cause();
+    }
+    return ESP_SLEEP_WAKEUP_UNDEFINED;
 }
 
 bool common_hal_alarm_woken_from_sleep(void) {
-    return _get_wakeup_cause() != ESP_SLEEP_WAKEUP_UNDEFINED;
+    return _get_wakeup_cause(false) != ESP_SLEEP_WAKEUP_UNDEFINED;
 }
 
 mp_obj_t common_hal_alarm_record_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
-    esp_sleep_wakeup_cause_t cause = _get_wakeup_cause();
+    esp_sleep_wakeup_cause_t cause = _get_wakeup_cause(true);
     switch (cause) {
         case ESP_SLEEP_WAKEUP_TIMER: {
             return alarm_time_timealarm_record_wake_alarm();
@@ -154,7 +157,7 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
         RUN_BACKGROUND_TASKS;
         // Detect if interrupt was alarm or ctrl-C interrupt.
         if (common_hal_alarm_woken_from_sleep()) {
-            esp_sleep_wakeup_cause_t cause = _get_wakeup_cause();
+            esp_sleep_wakeup_cause_t cause = _get_wakeup_cause(false);
             switch (cause) {
                 case ESP_SLEEP_WAKEUP_TIMER: {
                     wake_alarm = alarm_time_timealarm_find_triggered_alarm(n_alarms,alarms);

From 645499e819de6cef7b16d783cf2eb9b03cc0b7ee Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:52:19 +0530
Subject: [PATCH 1673/2403] check `//|` only after a file matches the doc
 pattern

---
 tools/ci_set_matrix.py | 56 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index cc84cddd28..40c5553ded 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -83,7 +83,7 @@ else:
         last_failed_jobs = json.loads(j)
 
 
-def set_output(name, value):
+def set_output(name: str, value):
     if "GITHUB_OUTPUT" in os.environ:
         with open(os.environ["GITHUB_OUTPUT"], "at") as f:
             print(f"{name}={value}", file=f)
@@ -91,7 +91,7 @@ def set_output(name, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def set_boards_to_build(build_all):
+def set_boards_to_build(build_all: bool):
     # Get boards in json format
     boards_info_json = build_board_info.get_board_mapping()
     all_board_ids = set()
@@ -229,34 +229,34 @@ def set_boards_to_build(build_all):
         set_output(f"boards-{arch}", json.dumps(sorted(arch_to_boards[arch])))
 
 
-def set_docs_to_build(build_all):
-    if "build-doc" in last_failed_jobs:
-        build_all = True
-
-    doc_match = build_all
-    if not build_all:
-        doc_pattern = re.compile(
-            r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
-        )
-        github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
-        github_workspace = github_workspace and github_workspace + "/"
-        for p in changed_files:
-            if (
-                p.endswith(".c")
-                and not subprocess.run(
-                    f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + p} | grep -o -m 1 '^[+-]\/\/|'",
-                    capture_output=True,
-                    shell=True,
-                ).stdout
-            ):
-                continue
-            if doc_pattern.search(p):
-                doc_match = True
-                break
+def set_docs_to_build(build_doc: bool):
+    if not build_doc:
+        if "build-doc" in last_failed_jobs:
+            build_doc = True
+        else:
+            doc_pattern = re.compile(
+                r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
+            )
+            github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
+            github_workspace = github_workspace and github_workspace + "/"
+            for p in changed_files:
+                if doc_pattern.search(p) and (
+                    (
+                        subprocess.run(
+                            f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + p} | grep -o -m 1 '^[+-]\/\/|'",
+                            capture_output=True,
+                            shell=True,
+                        ).stdout
+                    )
+                    if p.endswith(".c")
+                    else True
+                ):
+                    build_doc = True
+                    break
 
     # Set the step outputs
-    print("Building docs:", doc_match)
-    set_output("build-doc", doc_match)
+    print("Building docs:", build_doc)
+    set_output("build-doc", build_doc)
 
 
 def check_changed_files():

From ad4357d1529aca1cafa32479846d77ad4fd33b01 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 11 Jan 2023 19:22:07 +0530
Subject: [PATCH 1674/2403] use pr head ref and not the merge ref

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2c5de08a7..b1f9698d4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,16 +135,16 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         EXCLUDE_COMMIT: ${{ github.event.after }}
       run: python3 -u ci_changes_per_commit.py
+    - name: Set head sha
+      if: github.event_name == 'pull_request'
+      run: echo "HEAD_SHA=$(git show -s --format=%s $GITHUB_SHA | grep -o -P "(?<=Merge ).*(?= into)")" >> $GITHUB_ENV
     - name: Set base sha
       if: github.event_name == 'pull_request'
       run: |
-        DEEPEN=$((DEPTH - $(git rev-list HEAD --count))) && if((DEEPEN > 0)); then git fetch --no-tags --recurse-submodules=no --deepen=$DEEPEN; fi
-        echo "BASE_SHA=$(git rev-list $GITHUB_SHA --skip=$((DEPTH + 1)) --max-count=1)" >> $GITHUB_ENV
+        git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
+        echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
       env:
         DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
-    - name: Set head sha
-      if: github.event_name == 'pull_request'
-      run: echo "HEAD_SHA=$(git rev-list $GITHUB_SHA --skip=1 --max-count=1)" >> $GITHUB_ENV
     - name: Get changes
       id: get-changes
       if: github.event_name == 'pull_request'

From 4a9d9340082c8942f1c03a05292f4362369b9288 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 11 Jan 2023 20:56:53 +0530
Subject: [PATCH 1675/2403] escape `.` and `/` in regex

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

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 40c5553ded..bf899127ae 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -235,7 +235,7 @@ def set_docs_to_build(build_doc: bool):
             build_doc = True
         else:
             doc_pattern = re.compile(
-                r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
+                r"^(?:\.github\/workflows\/|docs|extmod\/ulab|(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|conf\.py|tools\/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
             )
             github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
             github_workspace = github_workspace and github_workspace + "/"

From 9a5b6cacbdec33fb56c6e259f5cc4cf93e0f95bf Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 11 Jan 2023 19:54:42 +0100
Subject: [PATCH 1676/2403] 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             | 60 ++++++++++++-----------------
 locale/cs.po             | 65 ++++++++++++++-----------------
 locale/de_DE.po          | 82 ++++++++++++++++++++++------------------
 locale/el.po             | 58 +++++++++++-----------------
 locale/en_GB.po          | 64 +++++++++++++++----------------
 locale/es.po             | 74 ++++++++++++++++++------------------
 locale/fil.po            | 51 +++++++++----------------
 locale/fr.po             | 77 +++++++++++++++++++------------------
 locale/hi.po             | 48 +++++++----------------
 locale/it_IT.po          | 51 +++++++++----------------
 locale/ja.po             | 60 ++++++++++++-----------------
 locale/ko.po             | 51 +++++++++----------------
 locale/nl.po             | 64 +++++++++++++++----------------
 locale/pl.po             | 55 ++++++++++-----------------
 locale/pt_BR.po          | 82 ++++++++++++++++++++++------------------
 locale/ru.po             | 80 ++++++++++++++++++++-------------------
 locale/sv.po             | 82 ++++++++++++++++++++++------------------
 locale/tr.po             | 73 ++++++++++++++++++-----------------
 locale/zh_Latn_pinyin.po | 82 ++++++++++++++++++++++------------------
 19 files changed, 582 insertions(+), 677 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 9f1e185dff..962284a846 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -111,6 +111,10 @@ msgstr "%q berisi pin duplikat"
 msgid "%q failure: %d"
 msgstr "%q gagal: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -178,12 +182,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q harus bertipe %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -945,20 +950,8 @@ msgstr "Error pada regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Diharapkan %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1131,11 +1124,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "Panjang IV harus %d byte"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1598,10 +1586,6 @@ msgstr "Tidak terhubung"
 msgid "Not playing"
 msgstr "Tidak berfungsi"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1886,6 +1870,7 @@ msgstr "RTC tidak didukung di board ini"
 msgid "Random number generation error"
 msgstr "Kesalahan pembuatan nomor acak"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2074,7 +2059,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3000,14 +2988,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
@@ -4378,6 +4358,16 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q harus bertipe %q"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Diharapkan %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "Panjang IV harus %d byte"
+
 #~ msgid "Read-only object"
 #~ msgstr "Objek Read-only"
 
diff --git a/locale/cs.po b/locale/cs.po
index b73fe1df88..4b49cbe531 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -112,6 +112,10 @@ msgstr "%q obsahuje duplicitní piny"
 msgid "%q failure: %d"
 msgstr "%q: selhání %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -179,13 +183,14 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q musí být typu %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q musí být typu %q nebo None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -943,20 +948,8 @@ msgstr "Chyba v regulárním výrazu"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Očekává se %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1131,11 +1124,6 @@ msgstr "Periférie I2C je používána"
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV musí být dlouhé %d bajtů"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1598,10 +1586,6 @@ msgstr "Nepřipojený"
 msgid "Not playing"
 msgstr "Nehraje"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1877,6 +1861,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2063,7 +2048,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2987,14 +2975,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
@@ -4364,6 +4344,19 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q musí být typu %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q musí být typu %q nebo None"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Očekává se %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV musí být dlouhé %d bajtů"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q délka musí být >= 1"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 69d2e6ee36..a5b9a5b6da 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -113,6 +113,10 @@ msgstr "%q enthält doppelte Pins"
 msgid "%q failure: %d"
 msgstr "%q Fehler: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -181,13 +185,14 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q muss vom Type %q sein"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q muss vom Type %q oder None sein"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -951,21 +956,9 @@ msgstr "Fehler in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Bind Fehler"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Erwartet ein(e) %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "Erwartete ein %q oder %q"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
-msgstr "Erwartet ein %q"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1142,11 +1135,6 @@ msgstr "I2C Peripherie in Verwendung"
 msgid "I2SOut not available"
 msgstr "I2SOut nicht verfügbar"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV muss %d Bytes lang sein"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "In-Puffer-Elemente müssen <= 4 Bytes lang sein"
@@ -1614,10 +1602,6 @@ msgstr "Nicht verbunden"
 msgid "Not playing"
 msgstr "Spielt nicht ab"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Kann nicht gesetzt werden"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1902,6 +1886,7 @@ msgstr "Eine RTC wird auf diesem Board nicht unterstützt"
 msgid "Random number generation error"
 msgstr "Fehler bei der Erzeugung von Zufallszahlen"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2092,7 +2077,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Beim Starten wurde die zentrale Taste gedrückt.\n"
 
@@ -3056,14 +3044,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "Exceptions müssen von BaseException abgeleitet sein"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "erwartet '%q' aber bekommen '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "erwartete '%q' oder '%q', aber bekam '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "erwarte ':' nach format specifier"
@@ -4448,6 +4428,34 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q muss vom Type %q sein"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q muss vom Type %q oder None sein"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Erwartet ein(e) %q"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "Erwartete ein %q oder %q"
+
+#~ msgid "Expected an %q"
+#~ msgstr "Erwartet ein %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV muss %d Bytes lang sein"
+
+#~ msgid "Not settable"
+#~ msgstr "Kann nicht gesetzt werden"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "erwartet '%q' aber bekommen '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "erwartete '%q' oder '%q', aber bekam '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Schreibgeschützte Objekt"
 
diff --git a/locale/el.po b/locale/el.po
index fe882c9f30..f48b8e08db 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -117,6 +117,10 @@ msgstr "%q περιέχει διπλότυπα pins"
 msgid "%q failure: %d"
 msgstr "%q αποτυχία: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -184,13 +188,14 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q πρέπει να είναι τύπου %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q πρέπει να είναι τύπου %q ή None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -957,20 +962,8 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr ""
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1143,11 +1136,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1608,10 +1596,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1886,6 +1870,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2072,7 +2057,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2996,14 +2984,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
@@ -4373,6 +4353,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q πρέπει να είναι τύπου %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q πρέπει να είναι τύπου %q ή None"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q μήκος πρέπει να είναι >= 1"
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 6bb13d2570..dee3f6f4c3 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -115,6 +115,10 @@ msgstr "%q contains duplicate pins"
 msgid "%q failure: %d"
 msgstr "%q failure: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -182,12 +186,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -946,20 +951,8 @@ msgstr "Error in regex"
 msgid "Error: Failure to bind"
 msgstr "Error: Failure to bind"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Expected a %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1132,11 +1125,6 @@ msgstr "I2C peripheral in use"
 msgid "I2SOut not available"
 msgstr "I2SOut not available"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV must be %d bytes long"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "In-buffer elements must be <= 4 bytes long"
@@ -1599,10 +1587,6 @@ msgstr "Not connected"
 msgid "Not playing"
 msgstr "Not playing"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Not settable"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1883,6 +1867,7 @@ msgstr "RTC is not supported on this board"
 msgid "Random number generation error"
 msgstr "Random number generation error"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2073,7 +2058,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3006,14 +2994,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "exceptions must derive from BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "expected '%q' but got '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "expected '%q' or '%q' but got '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "expected ':' after format specifier"
@@ -4383,6 +4363,22 @@ 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 "Expected a %q"
+#~ msgstr "Expected a %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV must be %d bytes long"
+
+#~ msgid "Not settable"
+#~ msgstr "Not settable"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "expected '%q' but got '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "expected '%q' or '%q' but got '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Read-only object"
 
diff --git a/locale/es.po b/locale/es.po
index f65f60a770..7a8c1ee940 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -116,6 +116,10 @@ msgstr "%q contiene pines duplicados"
 msgid "%q failure: %d"
 msgstr "%q fallo: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -183,13 +187,14 @@ msgstr "%q debe ser un byte-matriz o matriz de tipo 'H' o 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q debe ser de typo %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q debe ser de tipo %q o None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -957,20 +962,8 @@ msgstr "Error en regex"
 msgid "Error: Failure to bind"
 msgstr "Error: fallo al vincular"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Se espera un %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1144,11 +1137,6 @@ msgstr "Dispositivo I2C en uso"
 msgid "I2SOut not available"
 msgstr "I2SOut no disponible"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV debe tener %d bytes de longitud"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1622,10 +1610,6 @@ msgstr "No conectado"
 msgid "Not playing"
 msgstr "No reproduciendo"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "No configurable"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1912,6 +1896,7 @@ msgstr "RTC no soportado en esta placa"
 msgid "Random number generation error"
 msgstr "Error de generación de números aleatorios"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2103,7 +2088,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3047,14 +3035,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "las excepciones deben derivar de BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "se espera '%q' pero se recibe '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "se espera '%q' o '%q' pero se recibe '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "se esperaba ':' después de un especificador de tipo format"
@@ -4432,6 +4412,28 @@ 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 be of type %q"
+#~ msgstr "%q debe ser de typo %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q debe ser de tipo %q o None"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Se espera un %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV debe tener %d bytes de longitud"
+
+#~ msgid "Not settable"
+#~ msgstr "No configurable"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "se espera '%q' pero se recibe '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "se espera '%q' o '%q' pero se recibe '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Objeto de solo-lectura"
 
diff --git a/locale/fil.po b/locale/fil.po
index 7a77dab021..e44a5a5acd 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -106,6 +106,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -173,12 +177,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -942,20 +947,8 @@ msgstr "May pagkakamali sa REGEX"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Umasa ng %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1128,11 +1121,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1596,10 +1584,6 @@ msgstr "Hindi maka connect sa AP"
 msgid "Not playing"
 msgstr "Hindi playing"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1875,6 +1859,7 @@ msgstr "Hindi supportado ang RTC sa board na ito"
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2061,7 +2046,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2998,14 +2986,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "ang mga exceptions ay dapat makuha mula sa BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "umaasa ng ':' pagkatapos ng format specifier"
@@ -4384,6 +4364,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Expected a %q"
+#~ msgstr "Umasa ng %q"
+
 #, fuzzy
 #~ msgid "Read-only object"
 #~ msgstr "Basahin-lamang"
diff --git a/locale/fr.po b/locale/fr.po
index 910c11cf57..6eb2e23cf7 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -117,6 +117,10 @@ msgstr "%q contient des broches en double"
 msgid "%q failure: %d"
 msgstr "Échec de %q : %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -184,13 +188,14 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q doit être du type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q doit être du type %q ou None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -966,20 +971,8 @@ msgstr "Erreur dans l'expression régulière"
 msgid "Error: Failure to bind"
 msgstr "Erreur : Impossible de lier"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Attendu un %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "Attendu un %q ou %q"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1160,11 +1153,6 @@ msgstr "périphérique I2C utilisé"
 msgid "I2SOut not available"
 msgstr "I2SOut n'est pas disponible"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV doit être de longueur de %d octets"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Éléments dans le tampon doivent être <= à 4 octets"
@@ -1641,10 +1629,6 @@ msgstr "Non connecté"
 msgid "Not playing"
 msgstr "Ne joue pas"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Non réglable"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1932,6 +1916,7 @@ msgstr "RTC non supporté sur cette carte"
 msgid "Random number generation error"
 msgstr "Erreur de génération de chiffres aléatoires"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2122,7 +2107,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Le bouton central était pressé au démarrage.\n"
 
@@ -3086,14 +3074,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "les exceptions doivent dériver de 'BaseException'"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "'%q' était attendu, mais reçu '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "'%q' ou '%q' était attendu, mais reçu '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "':' attendu après la spécification de format"
@@ -4476,6 +4456,31 @@ 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 "%q must be of type %q"
+#~ msgstr "%q doit être du type %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q doit être du type %q ou None"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Attendu un %q"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "Attendu un %q ou %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV doit être de longueur de %d octets"
+
+#~ msgid "Not settable"
+#~ msgstr "Non réglable"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "'%q' était attendu, mais reçu '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "'%q' ou '%q' était attendu, mais reçu '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Objet en lecture seule"
 
diff --git a/locale/hi.po b/locale/hi.po
index 6b43cffabc..79177b1701 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -105,6 +105,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -172,12 +176,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -932,20 +937,8 @@ msgstr ""
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr ""
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1118,11 +1111,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1583,10 +1571,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1859,6 +1843,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2045,7 +2030,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2969,14 +2957,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 33c397da01..9e7fbfce01 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -112,6 +112,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fallito: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -179,12 +183,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -947,20 +952,8 @@ msgstr "Errore nella regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Atteso un %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1133,11 +1126,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1602,10 +1590,6 @@ msgstr "Impossible connettersi all'AP"
 msgid "Not playing"
 msgstr "In pausa"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1885,6 +1869,7 @@ msgstr "RTC non supportato su questa scheda"
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2071,7 +2056,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3006,14 +2994,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "le eccezioni devono derivare da BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "':' atteso dopo lo specificatore di formato"
@@ -4397,6 +4377,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Expected a %q"
+#~ msgstr "Atteso un %q"
+
 #, fuzzy
 #~ msgid "Read-only object"
 #~ msgstr "Sola lettura"
diff --git a/locale/ja.po b/locale/ja.po
index afe7997d33..0c8387fe73 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -70,7 +70,7 @@ msgid "%%c requires int or char"
 msgstr "%%c にはintまたはcharが必要"
 
 #: main.c
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "%02X"
 msgstr "%02X"
 
@@ -115,6 +115,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q 失敗: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -182,12 +186,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -946,20 +951,8 @@ msgstr "正規表現にエラーがあります"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "%qが必要"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1132,11 +1125,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr "I2SOutが利用できません"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IVは%dバイト長でなければなりません"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1599,10 +1587,6 @@ msgstr "接続されていません"
 msgid "Not playing"
 msgstr "再生していません"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1816,7 +1800,8 @@ msgstr "Prefixバッファはヒープ上になければなりません"
 
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
-msgstr "REPLに入るため、エンターキーを押す。リーロードするため、Ctl-Dを入力する。\n"
+msgstr ""
+"REPLに入るため、エンターキーを押す。リーロードするため、Ctl-Dを入力する。\n"
 
 #: main.c
 msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n"
@@ -1877,6 +1862,7 @@ msgstr "このボードはRTCに対応していません"
 msgid "Random number generation error"
 msgstr "乱数生成エラー"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2063,7 +2049,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2992,14 +2981,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "例外はBaseExceptionから派生していなければなりません"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "書式化指定子の後に':'が必要"
@@ -4372,6 +4353,13 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Expected a %q"
+#~ msgstr "%qが必要"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IVは%dバイト長でなければなりません"
+
 #~ msgid "Read-only object"
 #~ msgstr "読み込み専用のオブジェクト"
 
diff --git a/locale/ko.po b/locale/ko.po
index 39ff657aff..59cc20b1e1 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -106,6 +106,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -173,12 +177,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -935,20 +940,8 @@ msgstr "Regex에 오류가 있습니다."
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "%q 이 예상되었습니다."
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1121,11 +1114,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1586,10 +1574,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1862,6 +1846,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2048,7 +2033,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2973,14 +2961,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "':'이 예상되었습니다"
@@ -4350,6 +4330,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Expected a %q"
+#~ msgstr "%q 이 예상되었습니다."
+
 #~ msgid "Invalid pins"
 #~ msgstr "핀이 유효하지 않습니다"
 
diff --git a/locale/nl.po b/locale/nl.po
index 79b6333de4..b8310d5ced 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -108,6 +108,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q fout: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -175,12 +179,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -940,20 +945,8 @@ msgstr "Fout in regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Verwacht een %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1127,11 +1120,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr "I2SOut is niet beschikbaar"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV %d bytes lang zijn"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1594,10 +1582,6 @@ msgstr "Niet verbonden"
 msgid "Not playing"
 msgstr "Wordt niet afgespeeld"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Niet instelbaar"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1883,6 +1867,7 @@ msgstr "RTC is niet ondersteund door dit board"
 msgid "Random number generation error"
 msgstr "Random number generatie fout"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2069,7 +2054,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3002,14 +2990,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "uitzonderingen moeten afleiden van BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "verwachtte '%q' maar ontving '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "verwachtte '%q' of '%q' maar ontving '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "verwachtte ':' na format specifier"
@@ -4383,6 +4363,22 @@ 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 "Expected a %q"
+#~ msgstr "Verwacht een %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV %d bytes lang zijn"
+
+#~ msgid "Not settable"
+#~ msgstr "Niet instelbaar"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "verwachtte '%q' maar ontving '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "verwachtte '%q' of '%q' maar ontving '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Alleen-lezen object"
 
diff --git a/locale/pl.po b/locale/pl.po
index 814a5d06d4..ac54e220ad 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "%q failure: %d"
 msgstr "%q niepowodzenie: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -177,12 +181,13 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
@@ -941,20 +946,8 @@ msgstr "Błąd w regex"
 msgid "Error: Failure to bind"
 msgstr ""
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Oczekiwano %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr ""
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
+msgid "Expected a kind of %q"
 msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
@@ -1127,11 +1120,6 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr "I2SOut niedostępne"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV musi mieć długość %d bajtów"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1594,10 +1582,6 @@ msgstr "Nie podłączono"
 msgid "Not playing"
 msgstr "Nic nie jest odtwarzane"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1870,6 +1854,7 @@ msgstr "Brak obsługi RTC"
 msgid "Random number generation error"
 msgstr "Błąd generowania liczb losowych"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2056,7 +2041,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2981,14 +2969,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "wyjątki muszą dziedziczyć po BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "oczekiwano ':' po specyfikacji formatu"
@@ -4359,6 +4339,13 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Expected a %q"
+#~ msgstr "Oczekiwano %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV musi mieć długość %d bajtów"
+
 #~ msgid "Read-only object"
 #~ msgstr "Obiekt tylko do odczytu"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e4569ad596..45c720e4bb 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -114,6 +114,10 @@ msgstr "%q contém pinos duplicados"
 msgid "%q failure: %d"
 msgstr "%q falha: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -181,13 +185,14 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q deve ser do tipo %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q deve ser do tipo %q ou nenhum"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -959,21 +964,9 @@ msgstr "Erro no regex"
 msgid "Error: Failure to bind"
 msgstr "Erro: Falha na vinculação"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Esperado um"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "Era esperado um %q ou %q"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
-msgstr "Esperava-se um(a) %q"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1149,11 +1142,6 @@ msgstr "Periférico I2C em uso"
 msgid "I2SOut not available"
 msgstr "O I2SOut não está disponível"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "O IV deve ter %d bytes de comprimento"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Os elementos In-buffer devem ter um comprimento de <= 4 bytes"
@@ -1624,10 +1612,6 @@ msgstr "Não Conectado"
 msgid "Not playing"
 msgstr "Não está jogando"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Não configurável"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1915,6 +1899,7 @@ msgstr "O RTC não é suportado nesta placa"
 msgid "Random number generation error"
 msgstr "Houve um erro na geração do número aleatório"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2106,7 +2091,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "A exceção acima foi a causa direta da seguinte exceção:"
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "O botão central foi pressionado na inicialização.\n"
 
@@ -3063,14 +3051,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "as exceções devem derivar a partir do BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "o retorno esperado era '%q', porém obteve '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "o retorno esperado era '%q' ou '%q', porém obteve '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "é esperado ':' após o especificador do formato"
@@ -4451,6 +4431,34 @@ 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 be of type %q"
+#~ msgstr "%q deve ser do tipo %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q deve ser do tipo %q ou nenhum"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Esperado um"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "Era esperado um %q ou %q"
+
+#~ msgid "Expected an %q"
+#~ msgstr "Esperava-se um(a) %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "O IV deve ter %d bytes de comprimento"
+
+#~ msgid "Not settable"
+#~ msgstr "Não configurável"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "o retorno esperado era '%q', porém obteve '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "o retorno esperado era '%q' ou '%q', porém obteve '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Objeto de leitura apenas"
 
diff --git a/locale/ru.po b/locale/ru.po
index 5549e7e3f9..86b977f6f3 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -116,6 +116,10 @@ msgstr "%q содержит пины-дупликаты"
 msgid "%q failure: %d"
 msgstr "%q сбой: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -183,13 +187,14 @@ msgstr "%q должно быть bytearray или array типа 'H' или 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b', или 'B'"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q должно быть типа %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q должно быть типа %q или None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -965,22 +970,9 @@ msgstr "Ошибка в регулярном выражении(regex)"
 msgid "Error: Failure to bind"
 msgstr "Ошибка: Сбой привязки"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Ожидалось(ся) %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "Ожидалось %q или %q"
-
 #: shared-bindings/alarm/__init__.c
-#, fuzzy
-msgid "Expected an %q"
-msgstr "Ожидалось %q"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1160,11 +1152,6 @@ msgstr "Периферийное устройство I2C уже использ
 msgid "I2SOut not available"
 msgstr "I2SOut недоступен"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV должен быть длиной %d байт"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Элементы буфера должны быть длиной <= 4 байта"
@@ -1640,11 +1627,6 @@ msgstr "Не подключено"
 msgid "Not playing"
 msgstr "Не воспроизводится (Not playing)"
 
-#: shared-bindings/_bleio/__init__.c
-#, fuzzy
-msgid "Not settable"
-msgstr "Невозможно установить"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1927,6 +1909,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2113,7 +2096,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -3039,14 +3025,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
@@ -4416,6 +4394,30 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q должно быть типа %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q должно быть типа %q или None"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Ожидалось(ся) %q"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "Ожидалось %q или %q"
+
+#, fuzzy
+#~ msgid "Expected an %q"
+#~ msgstr "Ожидалось %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV должен быть длиной %d байт"
+
+#, fuzzy
+#~ msgid "Not settable"
+#~ msgstr "Невозможно установить"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "Длинна %q должна быть >= 1"
 
diff --git a/locale/sv.po b/locale/sv.po
index 4f83512286..98e2004c9f 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -113,6 +113,10 @@ msgstr "%q innehåller dubblettstift"
 msgid "%q failure: %d"
 msgstr "%q-fel: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -182,13 +186,14 @@ msgstr ""
 "%q måste vara en bytearray eller en array av typen \"h\", \"H\", \"b\" eller "
 "\"B\""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q måste vara av typen %q"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q måste vara av typen %q eller None"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -949,21 +954,9 @@ msgstr "Fel i regex"
 msgid "Error: Failure to bind"
 msgstr "Fel: Bind misslyckades"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Förväntade %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "Förväntade %q eller %q"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
-msgstr "Förväntade en %q"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1137,11 +1130,6 @@ msgstr "I2C-enhet används redan"
 msgid "I2SOut not available"
 msgstr "I2SOut är inte tillgängligt"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV måste vara %d byte lång"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Antal element i buffert måste vara <= 4 byte"
@@ -1607,10 +1595,6 @@ msgstr "Inte ansluten"
 msgid "Not playing"
 msgstr "Ingen uppspelning"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "Går inte sätta"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1895,6 +1879,7 @@ msgstr "RTC stöds inte av detta kort"
 msgid "Random number generation error"
 msgstr "Fel vid generering av slumptal"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2085,7 +2070,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "Ovanstående undantag var den direkta orsaken till följande undantag:"
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "Mittknappen trycktes in vid start.\n"
 
@@ -3032,14 +3020,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "exceptions måste ärvas från BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "förväntade '%q' men fick '%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "förväntade '%q' eller '%q' men fick '%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "förväntade ':' efter formatspecifikation"
@@ -4413,6 +4393,34 @@ 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 be of type %q"
+#~ msgstr "%q måste vara av typen %q"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q måste vara av typen %q eller None"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Förväntade %q"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "Förväntade %q eller %q"
+
+#~ msgid "Expected an %q"
+#~ msgstr "Förväntade en %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV måste vara %d byte lång"
+
+#~ msgid "Not settable"
+#~ msgstr "Går inte sätta"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "förväntade '%q' men fick '%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "förväntade '%q' eller '%q' men fick '%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Skrivskyddat objekt"
 
diff --git a/locale/tr.po b/locale/tr.po
index e25e81d679..5a8f259dac 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -117,6 +117,10 @@ msgstr "%q yinelenen pinler içeriyor"
 msgid "%q failure: %d"
 msgstr "%q hata: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -184,13 +188,14 @@ msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q, %q türünde olmalıdır"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q, %q ya da None türünde olmalıdır"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -948,21 +953,9 @@ msgstr "regex'te hata"
 msgid "Error: Failure to bind"
 msgstr "Hata: Bağlanamadı"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "%q bekleniyor"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "%q yada %q bekleniyor"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
-msgstr "%q bekleniyor"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1138,11 +1131,6 @@ msgstr "I2C çevre cihazı kullanımda"
 msgid "I2SOut not available"
 msgstr "I2SOut uygundeğil"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV %d bayt uzunluğunda olmalı"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Buffer öğeleri <=4 bayt uzunluğunda olmalı"
@@ -1606,10 +1594,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1885,6 +1869,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2071,7 +2056,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr ""
 
@@ -2995,14 +2983,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr ""
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr ""
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr ""
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr ""
@@ -4372,6 +4352,25 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q must be of type %q"
+#~ msgstr "%q, %q türünde olmalıdır"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q, %q ya da None türünde olmalıdır"
+
+#~ msgid "Expected a %q"
+#~ msgstr "%q bekleniyor"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "%q yada %q bekleniyor"
+
+#~ msgid "Expected an %q"
+#~ msgstr "%q bekleniyor"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV %d bayt uzunluğunda olmalı"
+
 #~ msgid "%q length must be >= 1"
 #~ msgstr "%q boyutu >=1 olmalıdır"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 8599c77f2e..60b66d2b72 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -116,6 +116,10 @@ msgstr "%q bāo hán chóng fù de yǐn jiǎo"
 msgid "%q failure: %d"
 msgstr "%q Shībài: %d"
 
+#: py/argcheck.c
+msgid "%q in %q must be of type %q, not %q"
+msgstr ""
+
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -184,13 +188,14 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'h', 'H', 'b', huò 'B' de shù zǔ"
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
-msgid "%q must be of type %q"
-msgstr "%q bì xū shì %q lèi xíng"
+#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
+#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
+msgid "%q must be of type %q or %q, not %q"
+msgstr ""
 
-#: py/objexcept.c shared-bindings/digitalio/Pull.c
-msgid "%q must be of type %q or None"
-msgstr "%q lèi xíng bì xū wéi %q huò wú"
+#: py/argcheck.c py/obj.c py/objstrunicode.c
+msgid "%q must be of type %q, not %q"
+msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -950,21 +955,9 @@ msgstr "Zhèngzé biǎodá shì cuòwù"
 msgid "Error: Failure to bind"
 msgstr "cuò wù: bǎng dìng shī bài"
 
-#: ports/espressif/bindings/espulp/ULP.c py/enum.c
-#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/alarm/__init__.c shared-bindings/busio/SPI.c
-#: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c
-msgid "Expected a %q"
-msgstr "Yù qí %q"
-
-#: ports/raspberrypi/bindings/cyw43/__init__.c
-msgid "Expected a %q or %q"
-msgstr "yù qī wéi %q huò %q"
-
 #: shared-bindings/alarm/__init__.c
-msgid "Expected an %q"
-msgstr "yù qī wéi %q"
+msgid "Expected a kind of %q"
+msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1140,11 +1133,6 @@ msgstr "I2C wài shè zhèng zài shǐ yòng zhōng"
 msgid "I2SOut not available"
 msgstr "I2SOut bù kě yòng"
 
-#: shared-bindings/aesio/aes.c
-#, c-format
-msgid "IV must be %d bytes long"
-msgstr "IV bì xū wéi %d zì jié cháng"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "huǎn chōng nèi yuán sù bì xū <= 4 zì jié cháng"
@@ -1613,10 +1601,6 @@ msgstr "Wèi liánjiē"
 msgid "Not playing"
 msgstr "Wèi bòfàng"
 
-#: shared-bindings/_bleio/__init__.c
-msgid "Not settable"
-msgstr "bù kě shè zhì"
-
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
@@ -1899,6 +1883,7 @@ msgstr "Cǐ bǎn bù zhīchí RTC"
 msgid "Random number generation error"
 msgstr "Suíjī shù shēngchéng cuòwù"
 
+#: shared-bindings/_bleio/__init__.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
@@ -2089,7 +2074,10 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
 msgstr "qǐ dòng shí àn xià zhōng yāng àn niǔ.\n"
 
@@ -3038,14 +3026,6 @@ msgstr ""
 msgid "exceptions must derive from BaseException"
 msgstr "lìwài bìxū láizì BaseException"
 
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' but got '%q'"
-msgstr "yùqí wèi'%q'dàn dédàole'%q'"
-
-#: shared-bindings/canio/CAN.c
-msgid "expected '%q' or '%q' but got '%q'"
-msgstr "yùqí wèi'%q'huò'%q', dàn huòdéle'%q'"
-
 #: py/objstr.c
 msgid "expected ':' after format specifier"
 msgstr "zài géshì shuōmíng fú zhīhòu yùqí ':'"
@@ -4419,6 +4399,34 @@ 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 be of type %q"
+#~ msgstr "%q bì xū shì %q lèi xíng"
+
+#~ msgid "%q must be of type %q or None"
+#~ msgstr "%q lèi xíng bì xū wéi %q huò wú"
+
+#~ msgid "Expected a %q"
+#~ msgstr "Yù qí %q"
+
+#~ msgid "Expected a %q or %q"
+#~ msgstr "yù qī wéi %q huò %q"
+
+#~ msgid "Expected an %q"
+#~ msgstr "yù qī wéi %q"
+
+#, c-format
+#~ msgid "IV must be %d bytes long"
+#~ msgstr "IV bì xū wéi %d zì jié cháng"
+
+#~ msgid "Not settable"
+#~ msgstr "bù kě shè zhì"
+
+#~ msgid "expected '%q' but got '%q'"
+#~ msgstr "yùqí wèi'%q'dàn dédàole'%q'"
+
+#~ msgid "expected '%q' or '%q' but got '%q'"
+#~ msgstr "yùqí wèi'%q'huò'%q', dàn huòdéle'%q'"
+
 #~ msgid "Read-only object"
 #~ msgstr "Zhǐ dú duìxiàng"
 

From aa2ba4d88bfbbebc92a92923ef69a570fa5decd7 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 11 Jan 2023 15:36:41 -0800
Subject: [PATCH 1677/2403] Have start and end kwargs respect element size

The comment says it is `buffer[start:end]` but it assumed elements
were a single byte long. Now it correctly does multibyte elements
from array.array.

Fixes #4988
---
 .../bindings/rp2pio/StateMachine.c            | 65 +++++++++++--------
 .../bindings/rp2pio/StateMachine.h            |  2 +-
 shared-bindings/bitbangio/I2C.c               | 17 ++++-
 shared-bindings/bitbangio/SPI.c               | 43 ++++++++++--
 shared-bindings/busio/I2C.c                   | 33 ++++++++--
 shared-bindings/busio/SPI.c                   | 27 +++++++-
 6 files changed, 140 insertions(+), 47 deletions(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 95c5be7447..5301086709 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -396,17 +396,22 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
-    int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
-    normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
-    if (length == 0) {
-        return mp_const_none;
-    }
-
     int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     if (stride_in_bytes > 4) {
         mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));
     }
+    int32_t start = args[ARG_start].u_int;
+    size_t length = bufinfo.len / stride_in_bytes;
+    // Normalize in element size units, not bytes.
+    normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
+
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
+    if (length == 0) {
+        return mp_const_none;
+    }
 
     bool ok = common_hal_rp2pio_statemachine_write(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes, args[ARG_swap].u_bool);
     if (mp_hal_is_interrupted()) {
@@ -603,18 +608,20 @@ STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
-    int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
-    normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
-
-    if (length == 0) {
-        return mp_const_none;
-    }
-
     int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     if (stride_in_bytes > 4) {
         mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));
     }
+    int32_t start = args[ARG_start].u_int;
+    size_t length = bufinfo.len / stride_in_bytes;
+    normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
+
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+    if (length == 0) {
+        return mp_const_none;
+    }
 
     bool ok = common_hal_rp2pio_statemachine_readinto(self, ((uint8_t *)bufinfo.buf) + start, length, stride_in_bytes, args[ARG_swap].u_bool);
     if (!ok) {
@@ -674,28 +681,32 @@ STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t
 
     mp_buffer_info_t buf_out_info;
     mp_get_buffer_raise(args[ARG_buffer_out].u_obj, &buf_out_info, MP_BUFFER_READ);
+    int out_stride_in_bytes = mp_binary_get_size('@', buf_out_info.typecode, NULL);
+    if (out_stride_in_bytes > 4) {
+        mp_raise_ValueError(translate("Out-buffer elements must be <= 4 bytes long"));
+    }
     int32_t out_start = args[ARG_out_start].u_int;
-    size_t out_length = buf_out_info.len;
+    size_t out_length = buf_out_info.len / out_stride_in_bytes;
     normalize_buffer_bounds(&out_start, args[ARG_out_end].u_int, &out_length);
 
     mp_buffer_info_t buf_in_info;
     mp_get_buffer_raise(args[ARG_buffer_in].u_obj, &buf_in_info, MP_BUFFER_WRITE);
-    int32_t in_start = args[ARG_in_start].u_int;
-    size_t in_length = buf_in_info.len;
-    normalize_buffer_bounds(&in_start, args[ARG_in_end].u_int, &in_length);
-
-    if (out_length == 0 && in_length == 0) {
-        return mp_const_none;
-    }
-
     int in_stride_in_bytes = mp_binary_get_size('@', buf_in_info.typecode, NULL);
     if (in_stride_in_bytes > 4) {
         mp_raise_ValueError(translate("In-buffer elements must be <= 4 bytes long"));
     }
+    int32_t in_start = args[ARG_in_start].u_int;
+    size_t in_length = buf_in_info.len / in_stride_in_bytes;
+    normalize_buffer_bounds(&in_start, args[ARG_in_end].u_int, &in_length);
 
-    int out_stride_in_bytes = mp_binary_get_size('@', buf_out_info.typecode, NULL);
-    if (out_stride_in_bytes > 4) {
-        mp_raise_ValueError(translate("Out-buffer elements must be <= 4 bytes long"));
+    // Treat start and length in terms of bytes from now on.
+    out_start *= out_stride_in_bytes;
+    out_length *= out_stride_in_bytes;
+    in_start *= in_stride_in_bytes;
+    in_length *= in_stride_in_bytes;
+
+    if (out_length == 0 && in_length == 0) {
+        return mp_const_none;
     }
 
     bool ok = common_hal_rp2pio_statemachine_write_readinto(self,
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.h b/ports/raspberrypi/bindings/rp2pio/StateMachine.h
index 3ec70a8703..6f07ac1fa1 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.h
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.h
@@ -64,7 +64,7 @@ void common_hal_rp2pio_statemachine_restart(rp2pio_statemachine_obj_t *self);
 void common_hal_rp2pio_statemachine_stop(rp2pio_statemachine_obj_t *self);
 void common_hal_rp2pio_statemachine_run(rp2pio_statemachine_obj_t *self, const uint16_t *instructions, size_t len);
 
-// Writes out the given data.
+// Lengths are in bytes.
 bool common_hal_rp2pio_statemachine_write(rp2pio_statemachine_obj_t *self, const uint8_t *data, size_t len, uint8_t stride_in_bytes, bool swap);
 bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *self, const sm_buf_info *once_obj, const sm_buf_info *loop_obj, uint8_t stride_in_bytes, bool swap);
 bool common_hal_rp2pio_statemachine_stop_background_write(rp2pio_statemachine_obj_t *self);
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index 2a4b22cb96..9684b87df2 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -33,6 +33,7 @@
 
 #include "shared/runtime/buffer_helper.h"
 #include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/mperrno.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
@@ -187,10 +188,15 @@ STATIC void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffe
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE);
 
-    size_t length = bufinfo.len;
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, end, &length);
     mp_arg_validate_length_min(length, 1, MP_QSTR_buffer);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     uint8_t status = shared_module_bitbangio_i2c_read(self, address, ((uint8_t *)bufinfo.buf) + start, length);
     if (status != 0) {
         mp_raise_OSError(status);
@@ -244,10 +250,15 @@ STATIC void writeto(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_READ);
 
-    size_t length = bufinfo.len;
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, end, &length);
 
-    // do the transfer
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
+    // Do the transfer
     uint8_t status = shared_module_bitbangio_i2c_write(self, address,
         ((uint8_t *)bufinfo.buf) + start, length,
         stop);
diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c
index 84d150a830..cf4f34f0e4 100644
--- a/shared-bindings/bitbangio/SPI.c
+++ b/shared-bindings/bitbangio/SPI.c
@@ -35,6 +35,7 @@
 
 #include "shared/runtime/buffer_helper.h"
 #include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/mperrno.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
@@ -192,9 +193,19 @@ STATIC mp_obj_t bitbangio_spi_obj_unlock(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_unlock_obj, bitbangio_spi_obj_unlock);
 
-//|     def write(self, buf: ReadableBuffer) -> None:
+//|     import sys
+//|     def write(self, buf: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None:
 //|         """Write the data contained in ``buf``. Requires the SPI being locked.
-//|         If the buffer is empty, nothing happens."""
+//|         If the buffer is empty, nothing happens.
+//|
+//|         If ``start`` or ``end`` is provided, then the buffer will be sliced
+//|         as if ``buffer[start:end]`` were passed, but without copying the data.
+//|         The number of bytes written will be the length of ``buffer[start:end]``.
+//|
+//|         :param ReadableBuffer buffer: buffer containing the bytes to write
+//|         :param int start: beginning of buffer slice
+//|         :param int end: end of buffer slice; if not specified, use ``len(buffer)``
+//|         """
 //|         ...
 STATIC mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_buffer, ARG_start, ARG_end };
@@ -211,10 +222,16 @@ STATIC mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+    // Compute bounds in terms of elements, not bytes.
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     if (length == 0) {
         return mp_const_none;
     }
@@ -267,10 +284,16 @@ STATIC mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *pos_args,
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
+    // Compute bounds in terms of elements, not bytes.
     int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     if (length == 0) {
         return mp_const_none;
     }
@@ -337,16 +360,24 @@ STATIC mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_
 
     mp_buffer_info_t buf_out_info;
     mp_get_buffer_raise(args[ARG_out_buffer].u_obj, &buf_out_info, MP_BUFFER_READ);
+    int out_stride_in_bytes = mp_binary_get_size('@', buf_out_info.typecode, NULL);
     int32_t out_start = args[ARG_out_start].u_int;
-    size_t out_length = buf_out_info.len;
+    size_t out_length = buf_out_info.len / out_stride_in_bytes;
     normalize_buffer_bounds(&out_start, args[ARG_out_end].u_int, &out_length);
 
     mp_buffer_info_t buf_in_info;
     mp_get_buffer_raise(args[ARG_in_buffer].u_obj, &buf_in_info, MP_BUFFER_WRITE);
+    int in_stride_in_bytes = mp_binary_get_size('@', buf_in_info.typecode, NULL);
     int32_t in_start = args[ARG_in_start].u_int;
-    size_t in_length = buf_in_info.len;
+    size_t in_length = buf_in_info.len / in_stride_in_bytes;
     normalize_buffer_bounds(&in_start, args[ARG_in_end].u_int, &in_length);
 
+    // Treat start and length in terms of bytes from now on.
+    out_start *= out_stride_in_bytes;
+    out_length *= out_stride_in_bytes;
+    in_start *= in_stride_in_bytes;
+    in_length *= in_stride_in_bytes;
+
     if (out_length != in_length) {
         mp_raise_ValueError(translate("buffer slices must be of equal length"));
     }
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index d2da3ea7dc..de373aaeb4 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -33,6 +33,7 @@
 
 #include "shared/runtime/buffer_helper.h"
 #include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate/translate.h"
 
@@ -207,12 +208,18 @@ STATIC mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args,
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
 
-    size_t length = bufinfo.len;
+    // Compute bounds in terms of elements, not bytes.
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
+    size_t length = bufinfo.len / stride_in_bytes;
     int32_t start = args[ARG_start].u_int;
     const int32_t end = args[ARG_end].u_int;
     normalize_buffer_bounds(&start, end, &length);
     mp_arg_validate_length_min(length, 1, MP_QSTR_buffer);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     uint8_t status =
         common_hal_busio_i2c_read(self, args[ARG_address].u_int, ((uint8_t *)bufinfo.buf) + start, length);
     if (status != 0) {
@@ -260,12 +267,18 @@ STATIC mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_ma
     // get the buffer to write the data from
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
 
-    size_t length = bufinfo.len;
+    // Compute bounds in terms of elements, not bytes.
+    size_t length = bufinfo.len / stride_in_bytes;
     int32_t start = args[ARG_start].u_int;
     const int32_t end = args[ARG_end].u_int;
     normalize_buffer_bounds(&start, end, &length);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     // do the transfer
     uint8_t status =
         common_hal_busio_i2c_write(self, args[ARG_address].u_int, ((uint8_t *)bufinfo.buf) + start, length);
@@ -331,23 +344,29 @@ STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *p
 
     mp_buffer_info_t out_bufinfo;
     mp_get_buffer_raise(args[ARG_out_buffer].u_obj, &out_bufinfo, MP_BUFFER_READ);
-
-    size_t out_length = out_bufinfo.len;
+    int out_stride_in_bytes = mp_binary_get_size('@', out_bufinfo.typecode, NULL);
+    size_t out_length = out_bufinfo.len / out_stride_in_bytes;
     int32_t out_start = args[ARG_out_start].u_int;
     const int32_t out_end = args[ARG_out_end].u_int;
     normalize_buffer_bounds(&out_start, out_end, &out_length);
 
     mp_buffer_info_t in_bufinfo;
     mp_get_buffer_raise(args[ARG_in_buffer].u_obj, &in_bufinfo, MP_BUFFER_WRITE);
-
-    size_t in_length = in_bufinfo.len;
+    int in_stride_in_bytes = mp_binary_get_size('@', in_bufinfo.typecode, NULL);
+    size_t in_length = in_bufinfo.len / in_stride_in_bytes;
     int32_t in_start = args[ARG_in_start].u_int;
     const int32_t in_end = args[ARG_in_end].u_int;
     normalize_buffer_bounds(&in_start, in_end, &in_length);
     mp_arg_validate_length_min(in_length, 1, MP_QSTR_out_buffer);
 
+    // Treat start and length in terms of bytes from now on.
+    out_start *= out_stride_in_bytes;
+    out_length *= out_stride_in_bytes;
+    in_start *= in_stride_in_bytes;
+    in_length *= in_stride_in_bytes;
+
     uint8_t status = common_hal_busio_i2c_write_read(self, args[ARG_address].u_int,
-        ((uint8_t *)out_bufinfo.buf) + out_start, out_length,((uint8_t *)in_bufinfo.buf) + in_start, in_length);
+        ((uint8_t *)out_bufinfo.buf) + out_start, out_length, ((uint8_t *)in_bufinfo.buf) + in_start, in_length);
     if (status != 0) {
         mp_raise_OSError(status);
     }
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index 2999a9f5a7..895d0d931f 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -35,6 +35,7 @@
 
 #include "shared/runtime/buffer_helper.h"
 #include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/mperrno.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
@@ -264,10 +265,16 @@ STATIC mp_obj_t busio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
+    // Compute bounds in terms of elements, not bytes.
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     if (length == 0) {
         return mp_const_none;
     }
@@ -323,10 +330,16 @@ STATIC mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
+    // Compute bounds in terms of elements, not bytes.
+    int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     int32_t start = args[ARG_start].u_int;
     size_t length = bufinfo.len;
     normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
 
+    // Treat start and length in terms of bytes from now on.
+    start *= stride_in_bytes;
+    length *= stride_in_bytes;
+
     if (length == 0) {
         return mp_const_none;
     }
@@ -392,16 +405,24 @@ STATIC mp_obj_t busio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args
 
     mp_buffer_info_t buf_out_info;
     mp_get_buffer_raise(args[ARG_out_buffer].u_obj, &buf_out_info, MP_BUFFER_READ);
+    int out_stride_in_bytes = mp_binary_get_size('@', buf_out_info.typecode, NULL);
     int32_t out_start = args[ARG_out_start].u_int;
-    size_t out_length = buf_out_info.len;
+    size_t out_length = buf_out_info.len / out_stride_in_bytes;
     normalize_buffer_bounds(&out_start, args[ARG_out_end].u_int, &out_length);
 
     mp_buffer_info_t buf_in_info;
     mp_get_buffer_raise(args[ARG_in_buffer].u_obj, &buf_in_info, MP_BUFFER_WRITE);
+    int in_stride_in_bytes = mp_binary_get_size('@', buf_in_info.typecode, NULL);
     int32_t in_start = args[ARG_in_start].u_int;
-    size_t in_length = buf_in_info.len;
+    size_t in_length = buf_in_info.len / in_stride_in_bytes;
     normalize_buffer_bounds(&in_start, args[ARG_in_end].u_int, &in_length);
 
+    // Treat start and length in terms of bytes from now on.
+    out_start *= out_stride_in_bytes;
+    out_length *= out_stride_in_bytes;
+    in_start *= in_stride_in_bytes;
+    in_length *= in_stride_in_bytes;
+
     if (out_length != in_length) {
         mp_raise_ValueError(translate("buffer slices must be of equal length"));
     }

From ca80f30348e7e1ece86b22148b0f313e252c18b7 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 11 Jan 2023 16:05:19 -0800
Subject: [PATCH 1678/2403] Share the web workflow MDNS object with the user

Fixes #7369
---
 shared-bindings/mdns/Server.c                 | 11 +++++++++++
 supervisor/shared/web_workflow/web_workflow.c |  9 +++++++++
 supervisor/shared/web_workflow/web_workflow.h |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index aab7f7e350..2f3a0c7085 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -33,6 +33,10 @@
 #include "shared-bindings/mdns/Server.h"
 #include "shared-bindings/util.h"
 
+#if CIRCUITPY_WEB_WORKFLOW
+#include "supervisor/shared/web_workflow/web_workflow.h"
+#endif
+
 //| class Server:
 //|     """The MDNS Server responds to queries for this device's information and allows for querying
 //|     other devices."""
@@ -53,6 +57,13 @@ STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, s
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    #if CIRCUITPY_WEB_WORKFLOW
+    mdns_server_obj_t *web_workflow_mdns = supervisor_web_workflow_mdns(args[ARG_network_interface].u_obj);
+    if (web_workflow_mdns != NULL) {
+        return web_workflow_mdns;
+    }
+    #endif
+
     mdns_server_obj_t *self = m_new_obj(mdns_server_obj_t);
     self->base.type = &mdns_server_type;
     common_hal_mdns_server_construct(self, args[ARG_network_interface].u_obj);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index c52a4df859..f6fc83bf74 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -200,6 +200,15 @@ STATIC void _update_encoded_ip(void) {
     }
 }
 
+mdns_server_obj_t *supervisor_web_workflow_mdns(mp_obj_t network_interface) {
+    #if CIRCUITPY_MDNS
+    if (network_interface == &common_hal_wifi_radio_obj) {
+        return &mdns;
+    }
+    #endif
+    return NULL;
+}
+
 #if CIRCUITPY_STATUS_BAR
 bool supervisor_web_workflow_status_dirty(void) {
     return common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj) != _last_enabled ||
diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h
index 166219c876..a76490aba2 100644
--- a/supervisor/shared/web_workflow/web_workflow.h
+++ b/supervisor/shared/web_workflow/web_workflow.h
@@ -28,6 +28,7 @@
 
 #include 
 
+#include "shared-bindings/mdns/Server.h"
 #include "shared-bindings/socketpool/Socket.h"
 
 // This background function should be called repeatedly. It cannot be done based
@@ -38,5 +39,8 @@ void supervisor_web_workflow_status(void);
 void supervisor_start_web_workflow(void);
 void supervisor_stop_web_workflow(void);
 
+// Share the MDNS object with user code.
+mdns_server_obj_t *supervisor_web_workflow_mdns(mp_obj_t network_interface);
+
 // To share with websocket.
 void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len);

From 5c517b7e5a8464990723c6d09ebe79fe5a2054a4 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 12 Jan 2023 11:24:20 -0800
Subject: [PATCH 1679/2403] Handle MDNS deinited better.

---
 ports/espressif/common-hal/mdns/Server.c      | 15 +++--
 ports/espressif/common-hal/mdns/Server.h      |  1 +
 ports/raspberrypi/common-hal/mdns/Server.c    | 11 +++-
 ports/raspberrypi/common-hal/mdns/Server.h    |  1 +
 supervisor/shared/web_workflow/web_workflow.c | 66 ++++++++++++-------
 5 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c
index d657a84eb7..38789b0610 100644
--- a/ports/espressif/common-hal/mdns/Server.c
+++ b/ports/espressif/common-hal/mdns/Server.c
@@ -37,6 +37,7 @@ STATIC bool inited = false;
 
 void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
     if (inited) {
+        self->inited = false;
         return;
     }
     mdns_init();
@@ -46,6 +47,8 @@ void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
     snprintf(self->default_hostname, sizeof(self->default_hostname), "cpy-%02x%02x%02x", mac[3], mac[4], mac[5]);
     common_hal_mdns_server_set_hostname(self, self->default_hostname);
 
+    self->inited = true;
+
     if (workflow) {
         // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local"
         // queries as well.
@@ -67,21 +70,23 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_
         mp_raise_ValueError(translate("mDNS only works with built-in WiFi"));
         return;
     }
-    if (inited) {
+    mdns_server_construct(self, false);
+    if (common_hal_mdns_server_deinited(self)) {
         mp_raise_RuntimeError(translate("mDNS already initialized"));
     }
-    mdns_server_construct(self, false);
 }
 
 void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
+    if (common_hal_mdns_server_deinited(self)) {
+        return;
+    }
+    self->inited = false;
     inited = false;
     mdns_free();
 }
 
 bool common_hal_mdns_server_deinited(mdns_server_obj_t *self) {
-    // This returns INVALID_STATE when not initialized and INVALID_PARAM when it
-    // is.
-    return mdns_instance_name_set(NULL) == ESP_ERR_INVALID_STATE;
+    return !self->inited;
 }
 
 const char *common_hal_mdns_server_get_hostname(mdns_server_obj_t *self) {
diff --git a/ports/espressif/common-hal/mdns/Server.h b/ports/espressif/common-hal/mdns/Server.h
index 770f55ece4..795a13a7a8 100644
--- a/ports/espressif/common-hal/mdns/Server.h
+++ b/ports/espressif/common-hal/mdns/Server.h
@@ -34,4 +34,5 @@ typedef struct {
     const char *instance_name;
     // "cpy-" "XXXXXX" "\0"
     char default_hostname[4 + 6 + 1];
+    bool inited;
 } mdns_server_obj_t;
diff --git a/ports/raspberrypi/common-hal/mdns/Server.c b/ports/raspberrypi/common-hal/mdns/Server.c
index 72aedf3889..e9b08efa33 100644
--- a/ports/raspberrypi/common-hal/mdns/Server.c
+++ b/ports/raspberrypi/common-hal/mdns/Server.c
@@ -36,6 +36,8 @@
 #include "lwip/apps/mdns.h"
 #include "lwip/prot/dns.h"
 
+// Track if we are globally inited. This essentially forces one inited MDNS
+// object at a time. (But ignores MDNS objects that are deinited.)
 STATIC bool inited = false;
 
 #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
@@ -43,11 +45,13 @@ STATIC bool inited = false;
 
 void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
     if (inited) {
+        self->inited = false;
         return;
     }
 
     mdns_resp_init();
     inited = true;
+    self->inited = true;
 
     uint8_t mac[6];
     wifi_radio_get_mac_address(&common_hal_wifi_radio_obj, mac);
@@ -75,12 +79,16 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_
 }
 
 void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
+    if (common_hal_mdns_server_deinited(self)) {
+        return;
+    }
+    self->inited = false;
     inited = false;
     mdns_resp_remove_netif(NETIF_STA);
 }
 
 bool common_hal_mdns_server_deinited(mdns_server_obj_t *self) {
-    return !mdns_resp_netif_active(NETIF_STA);
+    return !self->inited;
 }
 
 const char *common_hal_mdns_server_get_hostname(mdns_server_obj_t *self) {
@@ -215,7 +223,6 @@ STATIC void alloc_search_result_cb(struct mdns_answer *answer, const char *varpa
     if ((flags & MDNS_SEARCH_RESULT_FIRST) != 0) {
         // first
         mdns_remoteservice_obj_t *service = gc_alloc(sizeof(mdns_remoteservice_obj_t), 0, false);
-        mp_printf(&mp_plat_print, "found service %p\n", service);
         if (service == NULL) {
             // alloc fails
             mdns_search_stop(state->request_id);
diff --git a/ports/raspberrypi/common-hal/mdns/Server.h b/ports/raspberrypi/common-hal/mdns/Server.h
index 8f28d74d3c..f2440d7a64 100644
--- a/ports/raspberrypi/common-hal/mdns/Server.h
+++ b/ports/raspberrypi/common-hal/mdns/Server.h
@@ -37,4 +37,5 @@ typedef struct {
     // "cpy-" "XXXXXX" "\0"
     char default_hostname[4 + 6 + 1];
     const char *service_type[MDNS_MAX_SERVICES];
+    bool inited;
 } mdns_server_obj_t;
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index f6fc83bf74..97530b970b 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -202,7 +202,8 @@ STATIC void _update_encoded_ip(void) {
 
 mdns_server_obj_t *supervisor_web_workflow_mdns(mp_obj_t network_interface) {
     #if CIRCUITPY_MDNS
-    if (network_interface == &common_hal_wifi_radio_obj) {
+    if (network_interface == &common_hal_wifi_radio_obj &&
+        mdns.base.type == &mdns_server_type) {
         return &mdns;
     }
     #endif
@@ -309,11 +310,6 @@ void supervisor_start_web_workflow(void) {
 
     if (first_start) {
         port_changed = false;
-        #if CIRCUITPY_MDNS
-        mdns_server_construct(&mdns, true);
-        mdns.base.type = &mdns_server_type;
-        common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
-        #endif
         pool.base.type = &socketpool_socketpool_type;
         common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj);
 
@@ -322,13 +318,26 @@ void supervisor_start_web_workflow(void) {
 
         websocket_init();
     }
+    #if CIRCUITPY_MDNS
+    // Try to start MDNS if the user deinited it.
+    if (mdns.base.type != &mdns_server_type ||
+        common_hal_mdns_server_deinited(&mdns)) {
+        mdns_server_construct(&mdns, true);
+        mdns.base.type = &mdns_server_type;
+        if (!common_hal_mdns_server_deinited(&mdns)) {
+            common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
+        }
+    }
+    #endif
     if (port_changed) {
         common_hal_socketpool_socket_close(&listening);
     }
     if (first_start || port_changed) {
         web_api_port = new_port;
         #if CIRCUITPY_MDNS
-        common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
+        if (!common_hal_mdns_server_deinited(&mdns)) {
+            common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
+        }
         #endif
         socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
         common_hal_socketpool_socket_settimeout(&listening, 0);
@@ -453,17 +462,18 @@ static bool _origin_ok(const char *origin) {
     }
     // These are prefix checks up to : so that any port works.
     // TODO: Support DHCP hostname in addition to MDNS.
-    #if CIRCUITPY_MDNS
-    const char *local = ".local";
-    const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
-    const char *end = origin + strlen(http) + strlen(hostname) + strlen(local);
-    if (strncmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
-        strncmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 &&
-        (end[0] == '\0' || end[0] == ':')) {
-        return true;
-    }
-    #else
     const char *end;
+    #if CIRCUITPY_MDNS
+    if (!common_hal_mdns_server_deinited(&mdns)) {
+        const char *local = ".local";
+        const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
+        end = origin + strlen(http) + strlen(hostname) + strlen(local);
+        if (strncmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
+            strncmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 &&
+            (end[0] == '\0' || end[0] == ':')) {
+            return true;
+        }
+    }
     #endif
 
     _update_encoded_ip();
@@ -742,12 +752,13 @@ static void _reply_with_file(socketpool_socket_obj_t *socket, _request *request,
 }
 
 static void _reply_with_devices_json(socketpool_socket_obj_t *socket, _request *request) {
+    size_t total_results = 0;
     #if CIRCUITPY_MDNS
     mdns_remoteservice_obj_t found_devices[32];
-    size_t total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices));
+    if (!common_hal_mdns_server_deinited(&mdns)) {
+        total_results = mdns_server_find(&mdns, "_circuitpython", "_tcp", 1, found_devices, MP_ARRAY_SIZE(found_devices));
+    }
     size_t count = MIN(total_results, MP_ARRAY_SIZE(found_devices));
-    #else
-    size_t total_results = 0;
     #endif
     socketpool_socket_send(socket, (const uint8_t *)OK_JSON, strlen(OK_JSON));
     _cors_header(socket, request);
@@ -784,10 +795,11 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _send_str(socket, "\r\n");
     mp_print_t _socket_print = {socket, _print_chunk};
 
-    #if CIRCUITPY_MDNS
-    const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
-    #else
     const char *hostname = "";
+    #if CIRCUITPY_MDNS
+    if (!common_hal_mdns_server_deinited(&mdns)) {
+        hostname = common_hal_mdns_server_get_hostname(&mdns);
+    }
     #endif
     _update_encoded_ip();
     // Note: this leverages the fact that C concats consecutive string literals together.
@@ -1032,7 +1044,13 @@ static void _decode_percents(char *str) {
 static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
     if (request->redirect) {
         #if CIRCUITPY_MDNS
-        _reply_redirect(socket, request, request->path);
+        if (!common_hal_mdns_server_deinited(&mdns)) {
+            _reply_redirect(socket, request, request->path);
+        } else {
+            _reply_missing(socket, request);
+        }
+        #else
+        _reply_missing(socket, request);
         #endif
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
         _reply_forbidden(socket, request);

From ee2fe993dd86c53f22a03a76414d821588e9148f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 12 Jan 2023 14:56:06 -0800
Subject: [PATCH 1680/2403] Fix repeated MDNS use on Pico W

---
 ports/raspberrypi/common-hal/mdns/Server.c | 19 +++++++++++++------
 shared-bindings/mdns/Server.c              |  3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ports/raspberrypi/common-hal/mdns/Server.c b/ports/raspberrypi/common-hal/mdns/Server.c
index e9b08efa33..38f3a70f76 100644
--- a/ports/raspberrypi/common-hal/mdns/Server.c
+++ b/ports/raspberrypi/common-hal/mdns/Server.c
@@ -36,21 +36,28 @@
 #include "lwip/apps/mdns.h"
 #include "lwip/prot/dns.h"
 
+// Track if we've inited the LWIP MDNS at all. It expects to only init once.
+// Subsequent times, we restart it.
+STATIC bool inited = false;
 // Track if we are globally inited. This essentially forces one inited MDNS
 // object at a time. (But ignores MDNS objects that are deinited.)
-STATIC bool inited = false;
+STATIC bool object_inited = false;
 
 #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA])
 #define NETIF_AP (&cyw43_state.netif[CYW43_ITF_AP])
 
 void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
-    if (inited) {
+    if (object_inited) {
         self->inited = false;
         return;
     }
 
-    mdns_resp_init();
-    inited = true;
+    if (!inited) {
+        mdns_resp_init();
+        inited = true;
+    } else {
+        mdns_resp_restart(NETIF_STA);
+    }
     self->inited = true;
 
     uint8_t mac[6];
@@ -72,7 +79,7 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_
         mp_raise_ValueError(translate("mDNS only works with built-in WiFi"));
         return;
     }
-    if (inited) {
+    if (object_inited) {
         mp_raise_RuntimeError(translate("mDNS already initialized"));
     }
     mdns_server_construct(self, false);
@@ -83,7 +90,7 @@ void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
         return;
     }
     self->inited = false;
-    inited = false;
+    object_inited = false;
     mdns_resp_remove_netif(NETIF_STA);
 }
 
diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
index 2f3a0c7085..0d06d67f0d 100644
--- a/shared-bindings/mdns/Server.c
+++ b/shared-bindings/mdns/Server.c
@@ -64,7 +64,7 @@ STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
     #endif
 
-    mdns_server_obj_t *self = m_new_obj(mdns_server_obj_t);
+    mdns_server_obj_t *self = m_new_obj_with_finaliser(mdns_server_obj_t);
     self->base.type = &mdns_server_type;
     common_hal_mdns_server_construct(self, args[ARG_network_interface].u_obj);
 
@@ -205,6 +205,7 @@ STATIC const mp_rom_map_elem_t mdns_server_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_find),              MP_ROM_PTR(&mdns_server_find_obj) },
     { MP_ROM_QSTR(MP_QSTR_advertise_service), MP_ROM_PTR(&mdns_server_advertise_service_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR___del__),           MP_ROM_PTR(&mdns_server_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),            MP_ROM_PTR(&mdns_server_deinit_obj) },
 };
 

From 987d9a31c8ec428883d1a83ab58a4911a2901780 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 12 Jan 2023 16:03:45 -0800
Subject: [PATCH 1681/2403] Fix pin_or_none

---
 shared-bindings/microcontroller/Pin.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index a4c5cb2d54..ea27df9812 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -103,7 +103,10 @@ const mcu_pin_obj_t *validate_obj_is_pin_in(mp_obj_t obj, qstr arg_name) {
 
 // Validate that the obj is a pin or None. Return an mcu_pin_obj_t* or NULL, correspondingly.
 const mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj, qstr arg_name) {
-    return MP_OBJ_TO_PTR(mp_arg_validate_type(obj, &mcu_pin_type, arg_name));
+    if (obj == mp_const_none) {
+        return NULL;
+    }
+    return validate_obj_is_pin(obj, arg_name);
 }
 
 const mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj, qstr arg_name) {

From 8b0db804ba63ca668e518ed217c093bdfd2bc994 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 12 Jan 2023 16:25:11 -0800
Subject: [PATCH 1682/2403] Fix SPI readinto with negative start or end

---
 shared-bindings/busio/SPI.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index 895d0d931f..af985ed632 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -333,7 +333,7 @@ STATIC mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_m
     // Compute bounds in terms of elements, not bytes.
     int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
     int32_t start = args[ARG_start].u_int;
-    size_t length = bufinfo.len;
+    size_t length = bufinfo.len / stride_in_bytes;
     normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
 
     // Treat start and length in terms of bytes from now on.

From 8423650b78d12c61e241026421d887869be99c26 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Thu, 12 Jan 2023 17:55:07 +0000
Subject: [PATCH 1683/2403] Translated using Weblate (German)

Currently translated at 98.6% (979 of 992 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index a5b9a5b6da..1a3bdbca56 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-11-09 19:20+0000\n"
+"PO-Revision-Date: 2023-01-13 18:51+0000\n"
 "Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.15-dev\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #: main.c
 msgid ""
@@ -115,7 +115,7 @@ msgstr "%q Fehler: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q in %q muss von Typ %q sein, nicht %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -138,7 +138,7 @@ msgstr "%q ist %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q ist für diese Platine schreibgeschützt"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -188,11 +188,11 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q muss von Typ %q oder %q sein, nicht %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q muss von Typ %q sein, nicht %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -217,7 +217,7 @@ msgstr "%q Pin ungültig"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "Schritt %q kann nicht Null sein"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -419,7 +419,7 @@ msgstr "Die Adresse muss %d Bytes lang sein"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Adressbereich nicht erlaubt"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -926,6 +926,8 @@ msgstr "Drive mode wird nicht verwendet, wenn die Richtung input ist."
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
 msgstr ""
+"Während der Behandlung der oben genannten Ausnahme trat eine weitere "
+"Ausnahme auf:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -958,7 +960,7 @@ msgstr "Error: Bind Fehler"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Erwartete eine Art von %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1035,7 +1037,7 @@ msgstr "Datei existiert"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Datei nicht gefunden"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1275,7 +1277,7 @@ msgstr "Ungültige Bits pro Wert"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Ungültiges Byte %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1317,7 +1319,7 @@ msgstr "Der Schlüssel muss 16, 24 oder 32 Byte lang sein"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Schlüssel nicht gefunden"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
@@ -1428,7 +1430,7 @@ msgstr "NVS-Fehler"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Name oder Dienst nicht bekannt"
 
 #: py/qstr.c
 msgid "Name too long"
@@ -1676,7 +1678,7 @@ msgstr "Nur ein %q kann im Deep-Sleep gesetzt werden."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Es kann nur ein %q festgelegt werden."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1845,7 +1847,7 @@ msgstr "Programm-Größe ist ungültig"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "Programm zu lang"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -2076,6 +2078,7 @@ msgstr ""
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
+"Die oben genannte Ausnahme war die direkte Ursache für die folgende Ausnahme:"
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -2281,7 +2284,7 @@ msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "An die Adresse kann nicht geschrieben werden."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2460,7 +2463,7 @@ msgstr ""
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "WLAN ist nicht aktiviert"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -3814,7 +3817,7 @@ msgstr "nur eine bit_depth=16 wird unterstützt"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "nur Mono wird unterstützt"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"

From dbf66f1f01f7ece227142e8804eb74ada7950156 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 12 Jan 2023 11:22:49 +0000
Subject: [PATCH 1684/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 45c720e4bb..2bddd54617 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: 2023-01-05 02:52+0000\n"
+"PO-Revision-Date: 2023-01-13 18:51+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -116,7 +116,7 @@ msgstr "%q falha: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q em %q deve ser do tipo %q e não %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -188,11 +188,11 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q deve ser do tipo %q ou %q e não %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q deve ser do tipo %q e não %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -966,7 +966,7 @@ msgstr "Erro: Falha na vinculação"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Era esperado uma espécie de %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c

From a3882e725cdf54cf7d47dab41fd7df1bd6552569 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 12 Jan 2023 16:12:51 +0000
Subject: [PATCH 1685/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 98e2004c9f..132b296fb9 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: 2023-01-05 02:52+0000\n"
+"PO-Revision-Date: 2023-01-13 18:51+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -115,7 +115,7 @@ msgstr "%q-fel: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q i %q måste vara av typen %q, inte %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -189,11 +189,11 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q måste vara av typen %q eller %q, inte %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q måste vara av typen %q, inte %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -956,7 +956,7 @@ msgstr "Fel: Bind misslyckades"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Förväntade en typ av %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c

From 6bc0274aec15afd8f73c9616a5ae621846eadf09 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 14 Jan 2023 10:58:04 +0530
Subject: [PATCH 1686/2403] cache common submodules and share cp version

---
 .github/workflows/build.yml         | 237 ++++++++++++++++++++--------
 .github/workflows/ports_windows.yml |  26 ++-
 tools/ci_fetch_deps.py              | 119 ++++++--------
 tools/describe                      |   7 +-
 4 files changed, 249 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1f9698d4a..6a7a40c99c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,29 +21,54 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       build-doc: ${{ steps.set-matrix.outputs.build-doc }}
-      boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
-      boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
-      boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
+      boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
+      boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
+      boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
+      cp-version: ${{ steps.cp-version.outputs.cp-version }}
     steps:
     - name: Dump GitHub context
       run: echo "$GITHUB_CONTEXT"
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3
+    - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py test ${{ github.sha }}
-    - name: CircuitPython version
+    - name: Duplicate USB VID/PID check
+      run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Cache submodules
+      uses: actions/cache@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
       run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
+        python tools/ci_fetch_deps.py ${{ github.job }}
+        echo "::group::Fetch history and tags"
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
+        git repack -d
+        echo "::endgroup::"
+    - name: CircuitPython version
+      id: cp-version
+      run: |
+        CP_VERSION=$(tools/describe)
+        echo "$CP_VERSION"
+        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
+        echo "cp-version=$CP_VERSION" >> $GITHUB_OUTPUT
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -54,8 +79,6 @@ jobs:
       run: |
         gcc --version
         python3 --version
-    - name: Duplicate USB VID/PID Check
-      run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Build mpy-cross
       run: make -C mpy-cross -j2
     - name: Build unix port
@@ -160,25 +183,36 @@ jobs:
 
   mpy-cross-mac:
     runs-on: macos-11
+    needs: test
+    if: ${{ needs.test.outputs.boards-aarch != '[]' || needs.test.outputs.boards-arm != '[]' || needs.scheduler.test.boards-espressif != '[]' || needs.scheduler.test.boards-riscv != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3
+    - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
+        python-version: "3.x"
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ github.job }}
     - name: CircuitPython version
-      run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
+      run: tools/describe
     - name: Install dependencies
       run: |
         brew install gettext
@@ -222,21 +256,34 @@ jobs:
     runs-on: ubuntu-20.04
     needs: test
     if: ${{ needs.test.outputs.build-doc == 'True' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     steps:
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py docs ${{ github.sha }}
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ github.job }}
     - name: CircuitPython version
-      run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
-    - name: Set up Python 3
+      run: tools/describe
+    - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -285,22 +332,37 @@ jobs:
   build-arm:
     runs-on: ubuntu-20.04
     needs: test
+    if: ${{ needs.test.outputs.boards-arm != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
         board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
-    if: ${{ needs.test.outputs.boards-arm != '[]' }}
     steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
@@ -338,22 +400,37 @@ jobs:
   build-riscv:
     runs-on: ubuntu-20.04
     needs: test
+    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
         board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
-    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
@@ -390,27 +467,40 @@ jobs:
   build-espressif:
     runs-on: ubuntu-20.04
     needs: test
+    if: ${{ needs.test.outputs.boards-espressif != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
         board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
-    if: ${{ needs.test.outputs.boards-espressif != '[]' }}
     steps:
-    - name: Set up Python 3
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up python
       id: py3
       uses: actions/setup-python@v4
       with:
         python-version: "3.10"
-    - uses: actions/checkout@v3
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
       with:
-        submodules: false
-        fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: CircuitPython version
-      run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
+      run: tools/describe
     - uses: actions/cache@v3
       name: Fetch IDF tool cache
       id: idf-cache
@@ -481,22 +571,37 @@ jobs:
   build-aarch:
     runs-on: ubuntu-20.04
     needs: test
+    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
         board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
-    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
     steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext mtools
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 6d38f3b853..31187776be 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -71,12 +71,32 @@ jobs:
         which python; python --version; python -c "import cascadetoml"
         which python3; python3 --version; python3 -c "import cascadetoml"
 
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py windows ${{ github.sha }}
+    - name: Create submodule status
+      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          frozen/
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+        enableCrossOsArchive: true
+    - name: CircuitPython dependencies
+      run: |
+        python tools/ci_fetch_deps.py windows
+        echo "::group::Fetch history and tags"
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
+        git repack -d
+        echo "::endgroup::"
     - name: CircuitPython version
       run: |
         tools/describe || git log --parents HEAD~4..
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 04ae6fb0e1..43d708bbea 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -4,16 +4,12 @@ import subprocess
 import sys
 import time
 
-# target will be a board, "test", "docs", "mpy-cross-mac", or "windows"
-
-target = sys.argv[1]
-ref = sys.argv[2]
-
-print(target, ref)
+# Target will be a board, "test", "docs", "mpy-cross-mac", or "windows"
+TARGET = sys.argv[1]
 
 # Submodules needed by port builds outside of their ports directory.
 # Should we try and detect these?
-port_deps = {
+PORT_DEPS = {
     "atmel-samd": [
         "extmod/ulab/",
         "lib/adafruit_floppy/",
@@ -58,73 +54,58 @@ def run(title, command, check=True):
     try:
         subprocess.run(shlex.split(command), stderr=subprocess.STDOUT, check=check)
     finally:
-        print("Duration:", time.monotonic() - start, flush=True)
         print("::endgroup::", flush=True)
+        print("Duration:", time.monotonic() - start, flush=True)
 
 
-run(
-    "Fetch back to the start of 2021 to get tag history",
-    'git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD',
-)
-run(
-    "Fetch back to the start of 2021 to get commit history",
-    f'git fetch --recurse-submodules=no --shallow-since="2021-07-01" origin {ref}',
-)
-# See https://stackoverflow.com/questions/63878612/git-fatal-error-in-object-unshallow-sha-1#comment118418373_63879454
-run('Fix for bug "fatal: error in object: unshallow"', "git repack -d")
-run("Init submodules", "git submodule init")
-run("Submodule status", "git submodule status")
+def main():
+    submodules = []
+    print("Target:", TARGET)
 
-submodules = []
+    if TARGET == "scheduler":
+        submodules = ["extmod/ulab", "lib/", "tools/", "frozen/"]
+    elif TARGET == "mpy-cross-tests":
+        submodules = ["extmod/ulab", "lib/", "tools/"]
+    elif TARGET == "build-doc":
+        # used in .readthedocs.yml to generate RTD
+        submodules = ["extmod/ulab", "frozen/"]
+    elif TARGET == "mpy-cross-mac":
+        submodules = ["tools/"]  # for huffman
+    elif TARGET == "windows":
+        # This builds one board from a number of ports so fill out a bunch of submodules
+        submodules = ["extmod/ulab", "lib/", "tools/", "ports/", "data/nvm.toml"]
+    elif TARGET == "website":
+        submodules = ["tools/adabot/", "frozen/"]
+    else:
+        p = list(pathlib.Path(".").glob(f"ports/*/boards/{TARGET}/mpconfigboard.mk"))
+        if not p:
+            raise RuntimeError(f"Unsupported target: {TARGET}")
 
-if target == "test":
-    submodules = ["extmod/", "lib/", "tools/", "extmod/ulab", "lib/berkeley-db-1.xx"]
-elif target == "docs":
-    # used in .readthedocs.yml to generate RTD
-    submodules = ["extmod/ulab/", "frozen/"]
-elif target == "mpy-cross-mac":
-    submodules = ["tools/"]  # for huffman
-elif target == "windows":
-    # This builds one board from a number of ports so fill out a bunch of submodules
-    submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"]
-elif target == "website":
-    submodules = ["tools/adabot/", "frozen/"]
-else:
-    p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk"))
-    if not p:
-        raise RuntimeError(f"Unsupported target: {target}")
+        config = p[0]
+        # Add the ports folder to init submodules
+        port_folder = config.parents[2]
+        port = port_folder.name
+        submodules.append(str(port_folder))
+        submodules.append("tools/")  # for huffman
+        submodules.extend(PORT_DEPS[port])
+        with config.open() as f:
+            for line in f.readlines():
+                prefix = "FROZEN_MPY_DIRS += $(TOP)/"
+                if line.startswith(prefix):
+                    lib_folder = line.strip()[len(prefix) :]
+                    # Drop everything after the second folder because the frozen
+                    # folder may be inside the submodule.
+                    if lib_folder.count("/") > 1:
+                        lib_folder = lib_folder.split("/", maxsplit=2)
+                        lib_folder = "/".join(lib_folder[:2])
+                    submodules.append(lib_folder)
 
-    config = p[0]
-    # Add the ports folder to init submodules
-    port_folder = config.parents[2]
-    port = port_folder.name
-    submodules.append(str(port_folder))
-    submodules.append("tools/")  # for huffman
-    submodules.extend(port_deps[port])
-    with config.open() as f:
-        for line in f.readlines():
-            prefix = "FROZEN_MPY_DIRS += $(TOP)/"
-            if line.startswith(prefix):
-                lib_folder = line.strip()[len(prefix) :]
-                # Drop everything after the second folder because the frozen
-                # folder may be inside the submodule.
-                if lib_folder.count("/") > 1:
-                    lib_folder = lib_folder.split("/", maxsplit=2)
-                    lib_folder = "/".join(lib_folder[:2])
-                submodules.append(lib_folder)
+    print("Submodule paths:", submodules)
 
-print(submodules)
-if submodules:
-    submodules = " ".join(submodules)
-    # This line will fail because the submodule's need different commits than the tip of the branch. We
-    # fix it later.
-    run(
-        "Init the submodules we'll need",
-        f"git submodule update --init -N --depth 1 {submodules}",
-        check=False,
-    )
+    if submodules:
+        submodules = " ".join(submodules)
+        run("Init the required submodules", f"git submodule update --init --depth=1 {submodules}")
 
-    run(
-        "Fetch the submodule sha",
-        "git submodule foreach 'git fetch --tags --depth 1 origin $sha1 && git checkout -q $sha1'",
-    )
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/describe b/tools/describe
index e20c2ffa44..0f3b541e3c 100755
--- a/tools/describe
+++ b/tools/describe
@@ -1,3 +1,6 @@
 #!/bin/sh
-# Add any supplied arguments.
-git describe --first-parent --dirty --tags --match "[1-9].*" "$@"
+if [ -z "$CP_VERSION" ]; then
+    git describe --first-parent --dirty --tags --match "[1-9].*" "$@"
+else
+    echo $CP_VERSION
+fi

From 434c2355a07c7ca2db7be16d545281f6d6cc598e Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 14 Jan 2023 17:10:40 +0530
Subject: [PATCH 1687/2403] multiple ci enhancements

- selectively fetch submodule tags
- conditionally build mpy-cross
- remove frozen from submodule cache
---
 .github/workflows/build.yml         | 45 +++++++++++++++--------------
 .github/workflows/ports_windows.yml |  5 ++--
 tools/ci_fetch_deps.py              | 45 ++++++++++++++++++++++-------
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a7a40c99c..7eb81bd8dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,14 +43,13 @@ jobs:
     - name: Duplicate USB VID/PID check
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Cache submodules
       uses: actions/cache@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
@@ -198,14 +197,13 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
@@ -265,14 +263,13 @@ jobs:
         submodules: false
         fetch-depth: 1
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
@@ -350,18 +347,18 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
+      id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
@@ -375,11 +372,12 @@ jobs:
         gcc --version
         arm-none-eabi-gcc --version
         python3 --version
-    - name: mpy-cross
+    - name: Build mpy-cross
+      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: build
+    - name: Build
       run: python3 -u build_release_files.py
       working-directory: tools
       env:
@@ -418,18 +416,18 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
+      id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
@@ -442,11 +440,12 @@ jobs:
         gcc --version
         riscv64-unknown-elf-gcc --version
         python3 --version
-    - name: mpy-cross
+    - name: Build mpy-cross
+      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: build
+    - name: Build
       run: python3 -u build_release_files.py
       working-directory: tools
       env:
@@ -486,18 +485,18 @@ jobs:
       with:
         python-version: "3.10"
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
+      id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: CircuitPython version
       run: tools/describe
@@ -541,11 +540,12 @@ jobs:
       env:
         IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
-    - name: mpy-cross
+    - name: Build mpy-cross
+      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: build
+    - name: Build
       run: |
         source $IDF_PATH/export.sh
         python3 -u build_release_files.py
@@ -589,18 +589,18 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
+      id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
@@ -627,11 +627,12 @@ jobs:
         arm-none-eabi-gcc --version
         python3 --version
         mkfs.fat --version || true
-    - name: mpy-cross
+    - name: Build mpy-cross
+      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: build
+    - name: Build
       run: python3 -u build_release_files.py
       working-directory: tools
       env:
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 31187776be..61c6376ac7 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     paths:
-      - '.github/workflows/*.yml'
+      - '.github/workflows/ports_windows.yml'
       - 'extmod/**'
       - 'lib/**'
       - 'mpy-cross/**'
@@ -77,14 +77,13 @@ jobs:
         submodules: false
         fetch-depth: 1
     - name: Create submodule status
-      run: git submodule status extmod/ulab frozen/ lib/ tools/ >> submodule_status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
         path: |
           .git/modules/
           extmod/ulab
-          frozen/
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 43d708bbea..ddf7bf3bfd 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -1,8 +1,9 @@
-import pathlib
-import shlex
-import subprocess
+import os
 import sys
 import time
+import shlex
+import pathlib
+import subprocess
 
 # Target will be a board, "test", "docs", "mpy-cross-mac", or "windows"
 TARGET = sys.argv[1]
@@ -58,13 +59,21 @@ def run(title, command, check=True):
         print("Duration:", time.monotonic() - start, flush=True)
 
 
+def set_output(name, value):
+    if "GITHUB_OUTPUT" in os.environ:
+        with open(os.environ["GITHUB_OUTPUT"], "at") as f:
+            print(f"{name}={value}", file=f)
+    else:
+        print(f"Would set GitHub actions output {name} to '{value}'")
+
+
 def main():
     submodules = []
+    submodules_tags = []
+
     print("Target:", TARGET)
 
-    if TARGET == "scheduler":
-        submodules = ["extmod/ulab", "lib/", "tools/", "frozen/"]
-    elif TARGET == "mpy-cross-tests":
+    if TARGET == "test":
         submodules = ["extmod/ulab", "lib/", "tools/"]
     elif TARGET == "build-doc":
         # used in .readthedocs.yml to generate RTD
@@ -98,13 +107,29 @@ def main():
                     if lib_folder.count("/") > 1:
                         lib_folder = lib_folder.split("/", maxsplit=2)
                         lib_folder = "/".join(lib_folder[:2])
-                    submodules.append(lib_folder)
+                    submodules_tags.append(lib_folder)
 
-    print("Submodule paths:", submodules)
+    print("Submodule tags[Y]:", submodules_tags)
+    print("Submodule tags[N]:", submodules)
+
+    if submodules_tags:
+        run(
+            "Init the submodules with tags",
+            f"git submodule update --init {' '.join(submodules_tags)}",
+        )
 
     if submodules:
-        submodules = " ".join(submodules)
-        run("Init the required submodules", f"git submodule update --init --depth=1 {submodules}")
+        run(
+            "Init the submodules without tags",
+            f"git submodule update --init --depth=1 {' '.join(submodules)}",
+        )
+
+    for submodule in submodules_tags:
+        if submodule.startswith("frozen"):
+            set_output("frozen_tags", True)
+            break
+    else:
+        set_output("frozen_tags", False)
 
 
 if __name__ == "__main__":

From 03804e6ec1df0f52bad42ae5465d9f47c3531413 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 14 Jan 2023 20:42:58 +0530
Subject: [PATCH 1688/2403] refactor and alphabetically arrange matrix jobs

---
 .github/workflows/build.yml | 178 ++++++++++++++++++------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7eb81bd8dd..b59c0906bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -326,6 +326,88 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
 
+  build-aarch:
+    runs-on: ubuntu-20.04
+    needs: test
+    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    env:
+      CP_VERSION: ${{ needs.test.outputs.cp-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
+    steps:
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Create submodule status
+      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+    - name: Restore submodules
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          .git/modules/
+          extmod/ulab
+          lib/
+          tools/
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: CircuitPython dependencies
+      id: cp-deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y gettext mtools
+        pip install -r requirements-ci.txt -r requirements-dev.txt
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+    - uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '10-2020-q4'
+    - name: Install mkfs.fat
+      run: |
+        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+        tar -xaf dosfstools-4.2.tar.gz
+        cd dosfstools-4.2
+        ./configure
+        make -j 2
+        cd src
+        echo >>$GITHUB_PATH $(pwd)
+    - name: Versions
+      run: |
+        gcc --version
+        aarch64-none-elf-gcc --version
+        arm-none-eabi-gcc --version
+        python3 --version
+        mkfs.fat --version || true
+    - name: Build mpy-cross
+      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
+      run: make -C mpy-cross -j2
+    - name: Setup build failure matcher
+      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
+    - name: Build
+      run: python3 -u build_release_files.py
+      working-directory: tools
+      env:
+        BOARDS: ${{ matrix.board }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.board }}
+        path: bin/${{ matrix.board }}
+    - name: Upload to S3
+      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+
+
   build-arm:
     runs-on: ubuntu-20.04
     needs: test
@@ -395,74 +477,6 @@ jobs:
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
-  build-riscv:
-    runs-on: ubuntu-20.04
-    needs: test
-    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
-    env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
-    steps:
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.x"
-    - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext
-        pip install -r requirements-ci.txt -r requirements-dev.txt
-        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-    - name: Versions
-      run: |
-        gcc --version
-        riscv64-unknown-elf-gcc --version
-        python3 --version
-    - name: Build mpy-cross
-      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
-      run: make -C mpy-cross -j2
-    - name: Setup build failure matcher
-      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
-      run: python3 -u build_release_files.py
-      working-directory: tools
-      env:
-        BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.board }}
-        path: bin/${{ matrix.board }}
-    - name: Upload to S3
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-
-
   build-espressif:
     runs-on: ubuntu-20.04
     needs: test
@@ -568,16 +582,16 @@ jobs:
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
-  build-aarch:
+  build-riscv:
     runs-on: ubuntu-20.04
     needs: test
-    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
+        board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -604,29 +618,15 @@ jobs:
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
-        sudo apt-get install -y gettext mtools
+        sudo apt-get install -y gettext
         pip install -r requirements-ci.txt -r requirements-dev.txt
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-    - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      with:
-        release: '10-2020-q4'
-    - name: Install mkfs.fat
-      run: |
-        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
-        tar -xaf dosfstools-4.2.tar.gz
-        cd dosfstools-4.2
-        ./configure
-        make -j 2
-        cd src
-        echo >>$GITHUB_PATH $(pwd)
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
     - name: Versions
       run: |
         gcc --version
-        aarch64-none-elf-gcc --version
-        arm-none-eabi-gcc --version
+        riscv64-unknown-elf-gcc --version
         python3 --version
-        mkfs.fat --version || true
     - name: Build mpy-cross
       if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2

From d4aab422eefd85a7faa9e475b88e9093b2eb19e3 Mon Sep 17 00:00:00 2001
From: Kamil Tomaszewski 
Date: Sat, 14 Jan 2023 20:31:06 +0100
Subject: [PATCH 1689/2403] spresense: update SDK to 2.6.0

---
 ports/cxd56/README.md                       | 2 +-
 ports/cxd56/configs/circuitpython/defconfig | 1 +
 ports/cxd56/spresense-exported-sdk          | 2 +-
 ports/cxd56/supervisor/port.c               | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/cxd56/README.md b/ports/cxd56/README.md
index 0656ad1f1a..4266c61c0c 100644
--- a/ports/cxd56/README.md
+++ b/ports/cxd56/README.md
@@ -75,7 +75,7 @@ Bootloader information:
 
 * You have to accept the End User License Agreement to be able to download and use the Spresense bootloader binary.
 
-Download the spresense binaries zip archive from: [Spresense firmware v2-3-000](https://developer.sony.com/file/download/download-spresense-firmware-v2-3-000)
+Download the spresense binaries zip archive from: [Spresense firmware v2-4-000](https://developer.sony.com/file/download/download-spresense-firmware-v2-4-000)
 
 Extract spresense binaries in your PC to ports/spresense/spresense-exported-sdk/firmware/
 
diff --git a/ports/cxd56/configs/circuitpython/defconfig b/ports/cxd56/configs/circuitpython/defconfig
index 6a7c39cba8..92e282649b 100644
--- a/ports/cxd56/configs/circuitpython/defconfig
+++ b/ports/cxd56/configs/circuitpython/defconfig
@@ -113,4 +113,5 @@ CONFIG_USEC_PER_TICK=1000
 CONFIG_USERMAIN_STACKSIZE=8192
 CONFIG_USER_ENTRYPOINT="spresense_main"
 CONFIG_VIDEO_ISX012=y
+CONFIG_VIDEO_ISX019=y
 CONFIG_VIDEO_STREAM=y
diff --git a/ports/cxd56/spresense-exported-sdk b/ports/cxd56/spresense-exported-sdk
index 6a148be849..4f902ca3ff 160000
--- a/ports/cxd56/spresense-exported-sdk
+++ b/ports/cxd56/spresense-exported-sdk
@@ -1 +1 @@
-Subproject commit 6a148be8497704d4afb5d14c175a12a592813fac
+Subproject commit 4f902ca3ffeb327e6c325940ef5133eda588c2e4
diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c
index 10fa4112e8..dfd3cd6646 100644
--- a/ports/cxd56/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
@@ -111,13 +111,13 @@ bool port_has_fixed_stack(void) {
 uint32_t *port_stack_get_limit(void) {
     struct tcb_s *rtcb = this_task();
 
-    return rtcb->adj_stack_ptr - (uint32_t)rtcb->adj_stack_size;
+    return rtcb->stack_base_ptr;
 }
 
 uint32_t *port_stack_get_top(void) {
     struct tcb_s *rtcb = this_task();
 
-    return rtcb->adj_stack_ptr;
+    return rtcb->stack_base_ptr + (uint32_t)rtcb->adj_stack_size;
 }
 
 uint32_t *port_heap_get_bottom(void) {

From 40534da92a8e385b9a04b8d0ff14f8365b2e1f5a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 14 Jan 2023 16:36:33 -0500
Subject: [PATCH 1690/2403] espressif: always make new client sockets be
 non-blocking

---
 ports/espressif/common-hal/socketpool/Socket.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index ccb01116d8..8b6cff30ef 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -168,7 +168,9 @@ STATIC void unregister_open_socket(int fd) {
         if (open_socket_fds[i] == fd) {
             open_socket_fds[i] = -1;
             user_socket[i] = false;
-            write(socket_change_fd, &fd, sizeof(fd));
+            // Write must be 8 bytes for an eventfd.
+            uint64_t signal = 1;
+            write(socket_change_fd, &signal, sizeof(signal));
             return;
         }
     }
@@ -251,7 +253,9 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     uint64_t start_ticks = supervisor_ticks_ms64();
 
     // Allow timeouts and interrupts
-    while (newsoc == -1 && !timed_out) {
+    while (newsoc == -1 &&
+           !timed_out &&
+           !mp_hal_is_interrupted()) {
         if (self->timeout_ms != (uint)-1 && self->timeout_ms != 0) {
             timed_out = supervisor_ticks_ms64() - start_ticks >= self->timeout_ms;
         }
@@ -263,6 +267,9 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
         }
     }
 
+    // New client socket will not be non-blocking by default, so make it non-blocking.
+    lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
+
     if (!timed_out) {
         // harmless on failure but avoiding memcpy is faster
         memcpy((void *)ip, (void *)&accept_addr.sin_addr.s_addr, sizeof(accept_addr.sin_addr.s_addr));
@@ -284,11 +291,10 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
         if (!common_hal_socketpool_socket_get_closed(accepted)) {
             common_hal_socketpool_socket_close(accepted);
         }
-        // Create the socket
+        // Replace the old accepted socket with the new one.
         accepted->num = newsoc;
         accepted->pool = self->pool;
         accepted->connected = true;
-        lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
     }
 
     return newsoc;

From 968d8c5b4bc67b59ee87ea03c76652b5d8abe5b9 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 10:33:34 +0530
Subject: [PATCH 1691/2403] remove pins reserved for flash on microC3

---
 ports/espressif/boards/microdev_micro_c3/pins.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/espressif/boards/microdev_micro_c3/pins.c b/ports/espressif/boards/microdev_micro_c3/pins.c
index 240966404f..ab3abdb39c 100644
--- a/ports/espressif/boards/microdev_micro_c3/pins.c
+++ b/ports/espressif/boards/microdev_micro_c3/pins.c
@@ -40,6 +40,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+
+    /*
+    Reserved for Flash:
     { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
@@ -47,6 +50,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    */
+
     { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
     { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },

From fd3faa4a05966600d88c7b27c0e160a808d5ded9 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 17:03:39 +0530
Subject: [PATCH 1692/2403] only install `awscli` when required

---
 .github/workflows/build.yml | 34 ++++++++++++++++++++++------------
 requirements-ci.txt         |  2 +-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b59c0906bb..42e76ebc03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y eatmydata
         sudo eatmydata apt-get install -y gettext gcc-aarch64-linux-gnu mingw-w64
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        pip install -r requirements-dev.txt
     - name: Versions
       run: |
         gcc --version
@@ -136,13 +136,14 @@ jobs:
       with:
         name: mpy-cross.static-x64-windows
         path: mpy-cross/mpy-cross.static.exe
-    - name: Upload mpy-cross builds to S3
+    - name: Upload to S3
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
+        pip install awscli
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-aarch64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-aarch64-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
@@ -286,7 +287,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y eatmydata
         sudo eatmydata apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
-        pip install -r requirements-ci.txt -r requirements-doc.txt
+        pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
       run: make check-stubs -j2
     - uses: actions/upload-artifact@v3
@@ -306,13 +307,14 @@ jobs:
       with:
         name: docs
         path: _build/latex
-    - name: Upload stubs to S3
+    - name: Upload to S3
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
+        pip install awscli
         zip -9r circuitpython-stubs.zip circuitpython-stubs
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
     - name: Upload stubs to PyPi
@@ -363,7 +365,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext mtools
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        pip install -r requirements-dev.txt
         wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
         sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
     - uses: carlosperate/arm-none-eabi-gcc-action@v1
@@ -400,7 +402,9 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      run: |
+        pip install awscli
+        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -448,7 +452,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        pip install -r requirements-dev.txt
     - name: Versions
       run: |
         gcc --version
@@ -469,7 +473,9 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      run: |
+        pip install awscli
+        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -539,7 +545,7 @@ jobs:
       run: |
         source $IDF_PATH/export.sh
         sudo apt-get install -y gettext ninja-build
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        pip install -r requirements-dev.txt
       env:
         IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
@@ -574,7 +580,9 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      run: |
+        pip install awscli
+        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -619,7 +627,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        pip install -r requirements-dev.txt
         wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
         sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
     - name: Versions
@@ -642,7 +650,9 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      run: |
+        pip install awscli
+        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/requirements-ci.txt b/requirements-ci.txt
index 81deb34beb..2f6e042fb8 100644
--- a/requirements-ci.txt
+++ b/requirements-ci.txt
@@ -1,2 +1,2 @@
 # For uploading artifacts
-awscli
+# awscli

From 1e2d0a4be8428c7bf01d1dda5be6e0c4eda46bc8 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 17:13:19 +0530
Subject: [PATCH 1693/2403] gettext is pre-installed on mac

---
 .github/workflows/build.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 42e76ebc03..079c2aa606 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -212,10 +212,6 @@ jobs:
       run: python tools/ci_fetch_deps.py ${{ github.job }}
     - name: CircuitPython version
       run: tools/describe
-    - name: Install dependencies
-      run: |
-        brew install gettext
-        echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
     - name: Versions
       run: |
         gcc --version

From bad80ef7030b730e73600cf07368ddfa186c8c7b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 18:03:29 +0530
Subject: [PATCH 1694/2403] fix idf submodules init

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 079c2aa606..20d57f6ed9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -523,7 +523,7 @@ jobs:
         path: ${{ github.workspace }}/.idf_tools
         key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
     - name: Clone IDF submodules
-      run: git submodule update --init $IDF_PATH
+      run: cd $IDF_PATH && git submodule update --init --depth=1
       env:
         IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
     - name: Install IDF tools

From 3b2fe1510ebe3fc5dcf4c181ecacce5f880c5f13 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 20:42:38 +0530
Subject: [PATCH 1695/2403] cache idf and its submodules

---
 .github/workflows/build.yml | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20d57f6ed9..a11e21b0d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -485,6 +485,8 @@ jobs:
     if: ${{ needs.test.outputs.boards-espressif != '[]' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
+      IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
+      IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     strategy:
       fail-fast: false
       matrix:
@@ -496,7 +498,7 @@ jobs:
         submodules: false
         fetch-depth: 1
     - name: Set up python
-      id: py3
+      id: setup-python
       uses: actions/setup-python@v4
       with:
         python-version: "3.10"
@@ -511,21 +513,32 @@ jobs:
           lib/
           tools/
         key: submodules-common-${{ hashFiles('submodule_status') }}
+    - name: Get IDF commit
+      id: idf-commit
+      run: |
+        COMMIT=$(git submodule status ports/espressif/esp-idf | grep -o -P '(?<=^-).*(?= )')
+        echo "$COMMIT"
+        echo "commit=$COMMIT" >> $GITHUB_OUTPUT
+    - name: Cache IDF submodules
+      uses: actions/cache@v3
+      with:
+        path: |
+          .git/modules/ports/espressif/esp-idf
+          ports/espressif/esp-idf
+        key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
     - name: CircuitPython dependencies
       id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: CircuitPython version
       run: tools/describe
-    - uses: actions/cache@v3
-      name: Fetch IDF tool cache
-      id: idf-cache
+    - name: Cache IDF tools
+      uses: actions/cache@v3
       with:
-        path: ${{ github.workspace }}/.idf_tools
-        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
+        path: ${{ env.IDF_TOOLS_PATH }}
+        key: ${{ runner.os }}-idf-tools-${{ steps.idf-commit.outputs.commit }}-${{ steps.setup-python.outputs.python-version }}
     - name: Clone IDF submodules
-      run: cd $IDF_PATH && git submodule update --init --depth=1
-      env:
-        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
+      run: git submodule update --init --depth=1
+      working-directory: ${{ env.IDF_PATH }}
     - name: Install IDF tools
       run: |
         echo "Installing ESP-IDF tools"
@@ -534,17 +547,11 @@ jobs:
         echo "Installing Python environment and packages"
         $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
         rm -rf $IDF_TOOLS_PATH/dist
-      env:
-        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
-        IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Install dependencies
       run: |
         source $IDF_PATH/export.sh
         sudo apt-get install -y gettext ninja-build
         pip install -r requirements-dev.txt
-      env:
-        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
-        IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Versions
       run: |
         source $IDF_PATH/export.sh
@@ -552,10 +559,6 @@ jobs:
         python3 --version
         ninja --version
         cmake --version
-      shell: bash
-      env:
-        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
-        IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Build mpy-cross
       if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
@@ -566,10 +569,7 @@ jobs:
         source $IDF_PATH/export.sh
         python3 -u build_release_files.py
       working-directory: tools
-      shell: bash
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
-        IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
         BOARDS: ${{ matrix.board }}
     - uses: actions/upload-artifact@v3
       with:

From bfba1e4100d88999d5c6a211413fc8215c319164 Mon Sep 17 00:00:00 2001
From: Colin B 
Date: Mon, 16 Jan 2023 20:39:20 -0800
Subject: [PATCH 1696/2403] Change common_hal_mcu_processor_set_frequency to
 void

* Add warning about setting RP2040 frequency
---
 .../mimxrt10xx/common-hal/microcontroller/Processor.c  |  4 +---
 .../raspberrypi/common-hal/microcontroller/Processor.c | 10 +++-------
 shared-bindings/microcontroller/Processor.c            |  7 +++++--
 shared-bindings/microcontroller/Processor.h            |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
index 17ced78910..34400e3f41 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
@@ -52,15 +52,13 @@ float common_hal_mcu_processor_get_temperature(void) {
     return temp;
 }
 
-uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
+void common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
     uint32_t frequency) {
     uint32_t freq = frequency / 1000000;
     if (freq != 24 && freq != 150 && freq != 396 && freq != 450 && freq != 528 && freq != 600 &&
         freq != 720 && freq != 816 && freq != 912 && freq != 960 && freq != 1008) {
         mp_raise_ValueError(translate("Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"));
     }
-    SystemCoreClock = setarmclock(frequency);
-    return SystemCoreClock;
 }
 
 
diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
index 08e6495d26..66083a357d 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Processor.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -61,14 +61,10 @@ uint32_t common_hal_mcu_processor_get_frequency(void) {
     return clock_get_hz(clk_sys);
 }
 
-uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
-    uint32_t frequency) {
-    uint32_t freq = frequency / 1000;
-
-    if (!set_sys_clock_khz(freq, false)) {
-        mp_raise_ValueError(translate("Invalid frequency supplied"));
+void common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency) {
+    if (!set_sys_clock_khz(frequency / 1000, false)) {
+        mp_arg_error_invalid(MP_QSTR_frequency);
     }
-    return clock_get_hz(clk_sys);
 }
 
 void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index f5190d36ef..6ae0212a6a 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -67,8 +67,11 @@
 //|     frequency: int
 //|     """The CPU operating frequency in Hertz.
 //|
-//|     **Limitations:** Setting the ``frequency`` is possible on RP2040 boards and some i.MX boards.
-//|     On most boards, ``frequency`` is read-only.
+//|     **Limitations:** On most boards, ``frequency`` is read-only. Setting
+//|     the ``frequency`` is possible on RP2040 boards and some i.MX boards.
+//|
+//|     .. warning:: On RP2040 boards changing the frequency may cause issues
+//|        with other subsystems, such as USB, PWM, and PIO.
 //|     """
 
 #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY
diff --git a/shared-bindings/microcontroller/Processor.h b/shared-bindings/microcontroller/Processor.h
index 9a2f22b245..473f25cbc6 100644
--- a/shared-bindings/microcontroller/Processor.h
+++ b/shared-bindings/microcontroller/Processor.h
@@ -39,6 +39,6 @@ mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void);
 float common_hal_mcu_processor_get_temperature(void);
 void common_hal_mcu_processor_get_uid(uint8_t raw_id[]);
 float common_hal_mcu_processor_get_voltage(void);
-uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency);
+void common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PROCESSOR_H

From 683e393878a831fab559bfa3a3225d682825b292 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 17 Jan 2023 14:07:30 -0800
Subject: [PATCH 1697/2403] Add comments for MDNS code

---
 ports/espressif/common-hal/mdns/Server.c   | 11 ++++++++---
 ports/espressif/common-hal/mdns/Server.h   |  4 ++--
 ports/raspberrypi/common-hal/mdns/Server.c |  1 +
 ports/raspberrypi/common-hal/mdns/Server.h |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c
index 38789b0610..18c0f0f5e4 100644
--- a/ports/espressif/common-hal/mdns/Server.c
+++ b/ports/espressif/common-hal/mdns/Server.c
@@ -33,14 +33,19 @@
 
 #include "components/mdns/include/mdns.h"
 
-STATIC bool inited = false;
+// Track whether the underlying IDF mdns has been started so that we only
+// create a single inited MDNS object to CircuitPython. (After deinit, another
+// could be created.)
+STATIC bool mdns_started = false;
 
 void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
-    if (inited) {
+    if (mdns_started) {
+        // Mark this object as deinited because another is already using MDNS.
         self->inited = false;
         return;
     }
     mdns_init();
+    mdns_started = true;
 
     uint8_t mac[6];
     esp_netif_get_mac(common_hal_wifi_radio_obj.netif, mac);
@@ -81,7 +86,7 @@ void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
         return;
     }
     self->inited = false;
-    inited = false;
+    mdns_started = false;
     mdns_free();
 }
 
diff --git a/ports/espressif/common-hal/mdns/Server.h b/ports/espressif/common-hal/mdns/Server.h
index 795a13a7a8..ee463657f1 100644
--- a/ports/espressif/common-hal/mdns/Server.h
+++ b/ports/espressif/common-hal/mdns/Server.h
@@ -32,7 +32,7 @@ typedef struct {
     mp_obj_base_t base;
     const char *hostname;
     const char *instance_name;
-    // "cpy-" "XXXXXX" "\0"
-    char default_hostname[4 + 6 + 1];
+    char default_hostname[sizeof("cpy-XXXXXX")];
+    // Track if this object owns access to the underlying MDNS service.
     bool inited;
 } mdns_server_obj_t;
diff --git a/ports/raspberrypi/common-hal/mdns/Server.c b/ports/raspberrypi/common-hal/mdns/Server.c
index 38f3a70f76..ab0a7079af 100644
--- a/ports/raspberrypi/common-hal/mdns/Server.c
+++ b/ports/raspberrypi/common-hal/mdns/Server.c
@@ -48,6 +48,7 @@ STATIC bool object_inited = false;
 
 void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
     if (object_inited) {
+        // Mark the object as deinit since another is already using MDNS.
         self->inited = false;
         return;
     }
diff --git a/ports/raspberrypi/common-hal/mdns/Server.h b/ports/raspberrypi/common-hal/mdns/Server.h
index f2440d7a64..a4dab8aa06 100644
--- a/ports/raspberrypi/common-hal/mdns/Server.h
+++ b/ports/raspberrypi/common-hal/mdns/Server.h
@@ -34,8 +34,8 @@ typedef struct {
     mp_obj_base_t base;
     const char *hostname;
     const char *instance_name;
-    // "cpy-" "XXXXXX" "\0"
-    char default_hostname[4 + 6 + 1];
+    char default_hostname[sizeof("cpy-XXXXXX")];
     const char *service_type[MDNS_MAX_SERVICES];
+    // Track if this object owns access to the underlying MDNS service.
     bool inited;
 } mdns_server_obj_t;

From 82a313065ec3fecadd2e21243d2fbaa0ed9a7934 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 17 Jan 2023 16:12:08 -0800
Subject: [PATCH 1698/2403] Tweak RP2040 reset reason

Watchdogs are used to reboot out of the bootloader. There is a
scratch register for user watchdogs. So use sdk functions to better
distinguish these.

Related to #7346
---
 .../common-hal/microcontroller/Processor.c          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
index 8c5bc7ba75..b22d385eec 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Processor.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -34,6 +34,7 @@
 
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 #include "src/rp2_common/hardware_clocks/include/hardware/clocks.h"
+#include "src/rp2_common/hardware_watchdog/include/hardware/watchdog.h"
 
 #include "src/rp2040/hardware_regs/include/hardware/regs/vreg_and_chip_reset.h"
 #include "src/rp2040/hardware_regs/include/hardware/regs/watchdog.h"
@@ -68,7 +69,6 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
 mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) {
     mcu_reset_reason_t reason = RESET_REASON_UNKNOWN;
 
-    uint32_t watchdog_reset_reg = watchdog_hw->reason;
     uint32_t chip_reset_reg = vreg_and_chip_reset_hw->chip_reset;
 
     if (chip_reset_reg & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_PSM_RESTART_BITS) {
@@ -86,13 +86,14 @@ mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) {
 
     // Check watchdog after chip reset since watchdog doesn't clear chip_reset, while chip_reset clears the watchdog
 
-    if (watchdog_reset_reg & WATCHDOG_REASON_TIMER_BITS) {
-        // This bit can also be set during a software reset because the pico-sdk performs a software reset by setting an extremely low timeout on the watchdog, rather than triggering a watchdog reset manually
-        reason = RESET_REASON_WATCHDOG;
+    // The watchdog is used for software reboots such as resetting after copying a UF2 via the bootloader.
+    if (watchdog_caused_reboot()) {
+        reason = RESET_REASON_SOFTWARE;
     }
 
-    if (watchdog_reset_reg & WATCHDOG_REASON_FORCE_BITS) {
-        reason = RESET_REASON_SOFTWARE;
+    // Actual watchdog usage will set a special value that this function detects.
+    if (watchdog_enable_caused_reboot()) {
+        reason = RESET_REASON_WATCHDOG;
     }
 
     return reason;

From f66e865510b2bdad8e425ead9901e86947588c29 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 17 Jan 2023 23:30:36 -0500
Subject: [PATCH 1699/2403] Use low power RTC on mimxrt10xx (Teensy41) boards

There are apparently two RTC interfaces in the mimxrt10xx dev
kit. The low power interface access the battery backed up hardware.

I've tested this on the Teensy41 and it seems to
fix issue #4574
---
 ports/mimxrt10xx/Makefile             |  1 +
 ports/mimxrt10xx/common-hal/rtc/RTC.c | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index 080a65e8fe..b38f120ee2 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -109,6 +109,7 @@ SRC_SDK := \
 	drivers/fsl_ocotp.c \
 	drivers/fsl_pwm.c \
 	drivers/fsl_snvs_hp.c \
+	drivers/fsl_snvs_lp.c \
 	drivers/fsl_tempmon.c \
 	drivers/fsl_trng.c \
 	system_$(CHIP_FAMILY).c \
diff --git a/ports/mimxrt10xx/common-hal/rtc/RTC.c b/ports/mimxrt10xx/common-hal/rtc/RTC.c
index 7ed65a3499..0cf5fe7713 100644
--- a/ports/mimxrt10xx/common-hal/rtc/RTC.c
+++ b/ports/mimxrt10xx/common-hal/rtc/RTC.c
@@ -36,18 +36,26 @@
 #include "supervisor/shared/translate/translate.h"
 
 #include "fsl_snvs_hp.h"
+#include "fsl_snvs_lp.h"
 
 void rtc_init(void) {
-    snvs_hp_rtc_config_t config;
-    SNVS_HP_RTC_GetDefaultConfig(&config);
+    snvs_hp_rtc_config_t hpconfig;
+    SNVS_HP_RTC_GetDefaultConfig(&hpconfig);
 
-    SNVS_HP_RTC_Init(SNVS, &config);
+    SNVS_HP_RTC_Init(SNVS, &hpconfig);
+
+    snvs_lp_srtc_config_t lpconfig;
+    SNVS_LP_SRTC_GetDefaultConfig(&lpconfig);
+
+    SNVS_LP_SRTC_Init(SNVS, &lpconfig);
+
+    SNVS_LP_SRTC_StartTimer(SNVS);
     SNVS_HP_RTC_StartTimer(SNVS);
 }
 
 void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
-    snvs_hp_rtc_datetime_t rtcDate;
-    SNVS_HP_RTC_GetDatetime(SNVS, &rtcDate);
+    snvs_lp_srtc_datetime_t rtcDate;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &rtcDate);
 
     tm->tm_year = rtcDate.year;
     tm->tm_mon = rtcDate.month;
@@ -58,7 +66,7 @@ void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
 }
 
 void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
-    snvs_hp_rtc_datetime_t rtcDate;
+    snvs_lp_srtc_datetime_t rtcDate;
     rtcDate.year = tm->tm_year;
     rtcDate.month = tm->tm_mon;
     rtcDate.day = tm->tm_mday;
@@ -66,7 +74,7 @@ void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
     rtcDate.minute = tm->tm_min;
     rtcDate.second = tm->tm_sec;
 
-    SNVS_HP_RTC_SetDatetime(SNVS, &rtcDate);
+    SNVS_LP_SRTC_SetDatetime(SNVS, &rtcDate);
 }
 
 int common_hal_rtc_get_calibration(void) {

From f36c862cab2f28cee4d0640a4c4c0fd892a35b53 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 18 Jan 2023 12:12:54 +0530
Subject: [PATCH 1700/2403] refactor stuff in ci

---
 .github/workflows/build.yml | 100 +++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a11e21b0d2..c55f1ee06b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  CACHE_SUBMODULES: "['extmod/ulab', 'lib/', 'tools/']"
+
 jobs:
   test:
     runs-on: ubuntu-20.04
@@ -43,15 +46,11 @@ jobs:
     - name: Duplicate USB VID/PID check
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Cache submodules
       uses: actions/cache@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       run: |
@@ -137,7 +136,9 @@ jobs:
         name: mpy-cross.static-x64-windows
         path: mpy-cross/mpy-cross.static.exe
     - name: Upload to S3
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -184,7 +185,11 @@ jobs:
   mpy-cross-mac:
     runs-on: macos-11
     needs: test
-    if: ${{ needs.test.outputs.boards-aarch != '[]' || needs.test.outputs.boards-arm != '[]' || needs.scheduler.test.boards-espressif != '[]' || needs.scheduler.test.boards-riscv != '[]' }}
+    if: >-
+      needs.test.outputs.boards-aarch != '[]' ||
+      needs.test.outputs.boards-arm != '[]' ||
+      needs.test.outputs.boards-espressif != '[]' ||
+      needs.test.outputs.boards-riscv != '[]'
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     steps:
@@ -198,15 +203,11 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       run: python tools/ci_fetch_deps.py ${{ github.job }}
@@ -260,15 +261,11 @@ jobs:
         submodules: false
         fetch-depth: 1
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       run: python tools/ci_fetch_deps.py ${{ github.job }}
@@ -304,7 +301,9 @@ jobs:
         name: docs
         path: _build/latex
     - name: Upload to S3
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -345,15 +344,11 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       id: cp-deps
@@ -398,14 +393,16 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
         pip install awscli
-        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
   build-arm:
@@ -429,15 +426,11 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       id: cp-deps
@@ -469,14 +462,17 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
         pip install awscli
-        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+
 
 
   build-espressif:
@@ -503,15 +499,11 @@ jobs:
       with:
         python-version: "3.10"
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: Get IDF commit
       id: idf-commit
@@ -535,7 +527,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
-        key: ${{ runner.os }}-idf-tools-${{ steps.idf-commit.outputs.commit }}-${{ steps.setup-python.outputs.python-version }}
+        key: ${{ runner.os }}-Python-${{ steps.setup-python.outputs.python-version }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
     - name: Clone IDF submodules
       run: git submodule update --init --depth=1
       working-directory: ${{ env.IDF_PATH }}
@@ -576,14 +568,16 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
         pip install awscli
-        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
   build-riscv:
@@ -607,15 +601,11 @@ jobs:
       with:
         python-version: "3.x"
     - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
+      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
     - name: Restore submodules
       uses: actions/cache/restore@v3
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
+        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: CircuitPython dependencies
       id: cp-deps
@@ -646,11 +636,13 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
         pip install awscli
-        "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

From 9c5e7bffbde72c066ce4e2046fafa6eab2988930 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Wed, 18 Jan 2023 14:37:35 +0000
Subject: [PATCH 1701/2403] Translated using Weblate (Spanish)

Currently translated at 95.2% (945 of 992 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 7a8c1ee940..6a0b5bec2e 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: 2022-12-31 17:50+0000\n"
-"Last-Translator: Orlando Caro \n"
+"PO-Revision-Date: 2023-01-18 16:18+0000\n"
+"Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr "%%c requiere int o char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-module/os/getenv.c
 #, c-format
@@ -98,7 +98,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -118,7 +118,7 @@ msgstr "%q fallo: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q en %q debe ser del tipo %q, no %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -141,7 +141,7 @@ msgstr "%q es %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q es solamente de lectura en esta tarjeta"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -190,11 +190,11 @@ msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q debe ser del tipo %q o %q, y no %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q debe ser del tipo %q, y no %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -692,9 +692,8 @@ msgid "CBC blocks must be multiples of 16 bytes"
 msgstr "Los bloques CBC deben ser múltiplos de 16 bytes"
 
 #: supervisor/shared/safe_mode.c
-#, fuzzy
 msgid "CIRCUITPY drive could not be found or created."
-msgstr "CIRCUITPY dispositivo de guardo no pudo ser encontrado o creado."
+msgstr "El dispositivo CIRCUITPY no pudo ser encontrado o creado."
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "CRC or checksum was invalid"
@@ -776,6 +775,8 @@ msgstr "No se puede remountar '/' cuanto se es visible vía USB."
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
 msgstr ""
+"No puede se reinicilizado al bootloader porque el bootloader no se encuentra "
+"presente"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -796,7 +797,7 @@ msgstr "No se puede manejar la partición en una subclase"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "No puede ser transferido si los pines MOSI y MISO"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
@@ -804,7 +805,7 @@ msgstr "No puede variar la frecuencia en un temporizador que ya está en uso"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
-msgstr ""
+msgstr "No puede ser despertado en transición de pin, only nivel"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -923,7 +924,7 @@ msgstr "Rotación de display debe ser en incrementos de 90 grados"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -931,7 +932,7 @@ msgstr "Modo Drive no se usa cuando la dirección es input."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "Durante el procesamiento de esta excepción, otra excepción ocurrió:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -964,7 +965,7 @@ msgstr "Error: fallo al vincular"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Esperando un tipo %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -994,7 +995,7 @@ msgstr "No se puede adquirir el mutex, error 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
-msgstr ""
+msgstr "Fallo para asignar el %q búfer"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
@@ -1040,7 +1041,7 @@ msgstr "El archivo ya existe"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Archivo no encontrado"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1050,23 +1051,26 @@ msgstr "Filtros muy complejos"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "El Firmware es duplicado"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "El Firmware es inválido"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "El Firmaware es muy grande"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
 msgstr ""
+"Para el espacio de color L8, el bitmap de entrada debe tener 8 bits por pixel"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
 msgstr ""
+"Para espacios de colores RGB, el bitmap de entrada debe tener 16 bits por "
+"pixel"
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Format not supported"
@@ -1076,6 +1080,8 @@ msgstr "Sin capacidades para el formato"
 msgid ""
 "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 msgstr ""
+"La frecuencia debe ser 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 o "
+"1008 Mhz"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
@@ -1089,7 +1095,7 @@ msgstr "La función requiere lock"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "Inicialización GNSS"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Generic Failure"
@@ -1108,7 +1114,7 @@ msgstr "Grupo ya está siendo utilizado"
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "Half duplex SPI is not implemented"
-msgstr ""
+msgstr "SPI Half Duplex no está implementado"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
@@ -1126,7 +1132,7 @@ msgstr "Operación I/O en archivo cerrado"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "Error en la inicialización I2C"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1219,11 +1225,11 @@ msgstr "Cifrado insuficiente"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Interface must be started"
-msgstr ""
+msgstr "La interfaz debe ser iniciada"
 
 #: ports/atmel-samd/audio_dma.c ports/raspberrypi/audio_dma.c
 msgid "Internal audio buffer too small"
-msgstr ""
+msgstr "El búfer de audio interno es muy pequeño"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
@@ -1232,7 +1238,7 @@ msgstr "Error interno de definición"
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #: shared-module/os/getenv.c
 msgid "Internal error"
-msgstr ""
+msgstr "Error interno"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -1241,7 +1247,7 @@ msgstr "Error interno #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "El temporizador interno watchdog terminó."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -1266,7 +1272,7 @@ msgstr "BSSID inválido"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
-msgstr ""
+msgstr "Dirección MAC inválida"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 #: py/moduerrno.c
@@ -1280,7 +1286,7 @@ msgstr "Inválido bits por valor"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "byte %.*s Inválido"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1297,7 +1303,7 @@ msgstr "Acceso a memoria no válido."
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
-msgstr ""
+msgstr "Dirección MAC de multidifusión inválida"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Invalid size"
@@ -1314,7 +1320,7 @@ msgstr "Estado invalido"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Unicode del caracter \"escape\" inválido"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1322,11 +1328,11 @@ msgstr "La llave debe tener 16, 24 o 32 bytes de longitud"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Key no fue encontrada"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
-msgstr ""
+msgstr "Los mappings LED deben coincidir con el tamaño del display"
 
 #: py/compile.c
 msgid "LHS of keyword arg must be an id"
@@ -1334,11 +1340,11 @@ msgstr "LHS del agumento por palabra clave deberia ser un identificador"
 
 #: shared-module/displayio/Group.c
 msgid "Layer already in a group"
-msgstr ""
+msgstr "El Layer ya esta en un grupo"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "El Layer debe ser un grupo o una subclase de TileGrid"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "MAC address was invalid"
@@ -1346,7 +1352,7 @@ msgstr "La dirección MAC es incorrecta"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
-msgstr ""
+msgstr "El mapping debe ser una dupla"
 
 #: shared-module/displayio/Shape.c
 #, c-format
@@ -1360,11 +1366,11 @@ msgstr "Micrófono demora de inicio debe estar en el rango 0.0 a 1.0"
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched data size"
-msgstr ""
+msgstr "Inconsistencia en el tamaño de los datos"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched swap flag"
-msgstr ""
+msgstr "Inconsistencia en el flag de recambio"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI Pin"
@@ -1372,7 +1378,7 @@ msgstr "Falta el pin MISO o MOSI"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "Falta el pin MISO o MOSI"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1411,7 +1417,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
 msgid "Missing jmp_pin. Instruction %d jumps on pin"
-msgstr ""
+msgstr "Falta el jmp_pin. La instrucción %d se dispara en el pin"
 
 #: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c
 msgid "Must be a %q subclass."
@@ -1436,7 +1442,7 @@ msgstr "Error NVS"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Nombre o servicio desconocido"
 
 #: py/qstr.c
 msgid "Name too long"
@@ -1444,11 +1450,11 @@ msgstr "Nombre muy largo"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "New bitmap must be same size as old bitmap"
-msgstr ""
+msgstr "El nuevo bitmap debe ser del mismo tamaño que el bitmap anterior"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 msgid "Nimble out of memory"
-msgstr ""
+msgstr "Nimble sin memoria"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Characteristic.c
@@ -1474,11 +1480,11 @@ msgstr "timer por establecedor de paso DMA no encontrado"
 #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
 #, c-format
 msgid "No I2C device at address: 0x%x"
-msgstr ""
+msgstr "No hay dispositivo en la dirección: 0x%x"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "No IP"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1487,7 +1493,7 @@ msgstr "Sin pin MISO"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "No pin MISO"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1496,7 +1502,7 @@ msgstr "Sin pin MOSI"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "No pin MOSI"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
@@ -1518,7 +1524,7 @@ msgstr "Relojes no disponibles"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "No capture in progress"
-msgstr ""
+msgstr "No hay captura en marcha"
 
 #: shared-bindings/_bleio/PacketBuffer.c
 msgid "No connection: length cannot be determined"
@@ -1577,7 +1583,7 @@ msgstr "No queda espacio en el dispositivo"
 
 #: py/moduerrno.c
 msgid "No such device"
-msgstr ""
+msgstr "No hay tal dispositivo"
 
 #: py/moduerrno.c
 msgid "No such file/directory"
@@ -1613,7 +1619,7 @@ msgstr "No reproduciendo"
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
-msgstr ""
+msgstr "El numero de pines de datos debe ser 8 o 16, no %d"
 
 #: shared-bindings/util.c
 msgid ""
@@ -1628,11 +1634,11 @@ msgstr "Paridad impar no soportada"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Apagado"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1680,22 +1686,22 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Solamente un %q puede ser establecido en deep sleep."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Solamente un %q puede ser establecido."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
-msgstr ""
+msgstr "Solamente una dirección es permitida"
 
 #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set"
-msgstr ""
+msgstr "Solamente una alarma alarm.time puede ser establecida"
 
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1708,7 +1714,7 @@ msgstr "Solo un color puede ser transparente a la vez"
 
 #: py/moduerrno.c
 msgid "Operation not permitted"
-msgstr ""
+msgstr "La operación no es permitida"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Operation or feature not supported"
@@ -1720,7 +1726,7 @@ msgstr "Tiempo de espera agotado"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "No hay slots MDNS de servicio"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
@@ -1752,7 +1758,7 @@ msgstr ""
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "PWM restart"
-msgstr ""
+msgstr "Reinicio de PWM"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "PWM slice already in use"
@@ -1812,7 +1818,7 @@ msgstr "Los pines deben estar en orden secuencial"
 
 #: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Pins must be sequential GPIO pins"
-msgstr ""
+msgstr "Los pines deben ser pines GPIO secuenciales"
 
 #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Pins must share PWM slice"
@@ -1855,7 +1861,7 @@ msgstr "El tamaño del programa no es correcto"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "El programa es demasiado grande"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -1868,7 +1874,7 @@ msgstr "El modo RAISE no esta implementado"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "RISE_AND_FALL not available on this chip"
-msgstr ""
+msgstr "RISE_AND_FALL no esta disponible para este chip"
 
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
@@ -1881,7 +1887,7 @@ msgstr "Error de inicialización de RNG"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
-msgstr ""
+msgstr "RS485"
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -1912,7 +1918,7 @@ msgstr "La respuesta recibida es invalida"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Reconectando"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
@@ -1945,7 +1951,7 @@ msgstr "Sin capacidad para formato CSD para tarjeta SD"
 
 #: ports/cxd56/common-hal/sdioio/SDCard.c
 msgid "SDCard init"
-msgstr ""
+msgstr "Inicialización SDCard"
 
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
@@ -1963,7 +1969,7 @@ msgstr "Configuración de SPI fallida"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI init error"
-msgstr ""
+msgstr "Error de inicialización SPI"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -1971,11 +1977,11 @@ msgstr "Periférico SPI en uso"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI re-init"
-msgstr ""
+msgstr "Re-inicialización SPI"
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "Scale dimensions must divide by 3"
-msgstr ""
+msgstr "Las dimensiones de escala debe ser divisibles por 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -2022,7 +2028,7 @@ msgstr "Los buffers de fuente y destino deben ser del mismo tamaño"
 
 #: shared-bindings/paralleldisplay/ParallelBus.c
 msgid "Specify exactly one of data0 or data_pins"
-msgstr ""
+msgstr "Especifique exactamente uno de data0 or data_pins"
 
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
@@ -2038,7 +2044,7 @@ msgstr "Estéreo derecho debe estar en el canal PWM B"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Parar el AP no esta soportado."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
@@ -2058,7 +2064,7 @@ msgstr "Lectura de temperatura expirada"
 
 #: supervisor/shared/safe_mode.c
 msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
+msgstr "El boton BOOT fur presionado durante el arranque.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2070,11 +2076,11 @@ msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
+msgstr "El boton SW38 fue presionado durante el arranque.\n"
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
+msgstr "El boton de Volumen fue presionado durante el arranque.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2086,18 +2092,18 @@ msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "La excepción fue la causa directa de la excepción siguiente:"
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "The central button was pressed at start up.\n"
-msgstr ""
+msgstr "El boton central fue presionado durante el arranque.\n"
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
-msgstr ""
+msgstr "El boton izquierdo fue presionado durante el arranque.\n"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2132,13 +2138,15 @@ msgstr "El signo del sample no iguala al del mixer"
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
-msgstr ""
+msgstr "Este microcontrolador no soporta captura continua."
 
 #: shared-module/paralleldisplay/ParallelBus.c
 msgid ""
 "This microcontroller only supports data0=, not data_pins=, because it "
 "requires contiguous pins."
 msgstr ""
+"Este microcontrolador solamente soporta data0=, not data_pins=, porque "
+"requiere pines adyacentes."
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "Tile height must exactly divide bitmap height"
@@ -2166,11 +2174,11 @@ msgstr ""
 
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
+msgstr "Para salir, por favor reinicialice la tarjeta sin pedir safe mode."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
-msgstr ""
+msgstr "Demasiados canales en la muestra"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
@@ -2205,24 +2213,24 @@ msgstr "Argumento tuple o struct_time requerido"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART de-init"
-msgstr ""
+msgstr "Desinicialización de UART"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "UART init"
-msgstr ""
+msgstr "Inicialización de UART"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr ""
+msgstr "Re-inicialización de UART"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
-msgstr ""
+msgstr "Escribiendo UART"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
@@ -2284,11 +2292,11 @@ msgstr "No se pudo leer los datos de la paleta de colores"
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
-msgstr ""
+msgstr "Imposible de incializar una consulta mDNS"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "Imposible de escribir en esa dirección."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2310,12 +2318,12 @@ msgstr "Error no manejado de ESP TLS %d %d %x %d"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown BLE error at %s:%d: %d"
-msgstr ""
+msgstr "Error BLE desconocido en %s:%d: %d"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown BLE error: %d"
-msgstr ""
+msgstr "Error BLE desconocido: %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format
@@ -2340,7 +2348,7 @@ msgstr "Error de seguridad desconocido: 0x%04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error at %s:%d: %d"
-msgstr ""
+msgstr "Error del sistema firmware desconocido en %s:%d: %d"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 #, c-format
@@ -2350,12 +2358,12 @@ msgstr "Error desconocido en el firmware sistema: %04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error: %d"
-msgstr ""
+msgstr "Error del sistema de firmware desconocido: %d"
 
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unkown error code %d"
-msgstr ""
+msgstr "Codigo de error desconocido: %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
@@ -2373,7 +2381,7 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Unsupported colorspace"
-msgstr ""
+msgstr "Espacio de color no sportado"
 
 #: shared-module/displayio/display_core.c
 msgid "Unsupported display bus type"
@@ -2385,7 +2393,7 @@ msgstr "Formato no soportado"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Algoritmo hash no soportado"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2443,10 +2451,15 @@ msgid ""
 "\n"
 "To list built-in modules type `help(\"modules\")`.\n"
 msgstr ""
+"Bienvenido a Adafruit CircuitPython %s!\n"
+"\n"
+"Visite circuitpython.org para mayor informacion.\n"
+"\n"
+"Para conocer la lista de modules built-in escriba `help(\"modules\")`.\n"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "Wi-Fi: "
-msgstr ""
+msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."

From 3cbc8e54f20e94a5f463669a922769671b8c9062 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Wed, 18 Jan 2023 16:38:57 +0000
Subject: [PATCH 1702/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 6a0b5bec2e..613d957812 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: 2023-01-18 16:18+0000\n"
+"PO-Revision-Date: 2023-01-18 18:05+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -2463,15 +2463,15 @@ msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "Wifi est en modo de access point."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "Wifi esta en modo station."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "Wifi no esta activado"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -2560,7 +2560,7 @@ msgstr "Longitud del array e índice tienen que ser iguales"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "La matriz tiene demasiadas dimensiones"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -2593,7 +2593,7 @@ msgstr "Eje demasiado largo"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "background value out of range of target"
-msgstr ""
+msgstr "El valor del fondo esta fuera del rango del objectivo"
 
 #: py/builtinevex.c
 msgid "bad compile mode"
@@ -2617,7 +2617,7 @@ msgstr "operacion binaria %q no implementada"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "bitmap sizes must match"
-msgstr ""
+msgstr "Los tamaños de los bitmap deben coincidir"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
@@ -2675,7 +2675,7 @@ msgstr "calibration es de solo lectura"
 #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c
 #: shared-module/vectorio/Rectangle.c
 msgid "can only have one parent"
-msgstr ""
+msgstr "solamente puede tener un parent"
 
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
@@ -2712,7 +2712,7 @@ msgstr "no se puede convertir el objeto '%q' a %q implícitamente"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "can't convert complex to float"
-msgstr ""
+msgstr "no se puede convertir complejo a float"
 
 #: py/obj.c
 msgid "can't convert to %q"
@@ -2768,7 +2768,7 @@ msgstr "no se puede cargar con el índice '%q'"
 
 #: py/builtinimport.c
 msgid "can't perform relative import"
-msgstr ""
+msgstr "no se puede realizar una importacion relativa"
 
 #: py/objgenerator.c
 msgid "can't send non-None value to a just-started generator"
@@ -2785,7 +2785,7 @@ msgstr "no se puede asignar el atributo"
 
 #: py/runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "no se puede configurar el attributo '%q'"
 
 #: py/emitnative.c
 msgid "can't store '%q'"
@@ -2815,7 +2815,7 @@ msgstr ""
 
 #: extmod/ulab/code/ndarray.c
 msgid "cannot assign new shape"
-msgstr ""
+msgstr "no se puede asignar una nueva forma"
 
 #: extmod/ulab/code/ndarray_operators.c
 msgid "cannot cast output with casting rule"
@@ -2823,11 +2823,11 @@ msgstr "No se puede realizar cast de la salida sin una regla de cast"
 
 #: extmod/ulab/code/ndarray.c
 msgid "cannot convert complex to dtype"
-msgstr ""
+msgstr "no se puede convertir complex a dtype"
 
 #: extmod/ulab/code/ndarray.c
 msgid "cannot convert complex type"
-msgstr ""
+msgstr "no se puede convertir tipo complejo"
 
 #: py/objtype.c
 msgid "cannot create '%q' instances"
@@ -2851,7 +2851,7 @@ msgstr "convirtiendo tipo"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "channel re-init"
-msgstr ""
+msgstr "re-nicialización del canal"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
@@ -2923,7 +2923,7 @@ msgstr "los argumentos para convolve no deben estar vacíos"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "Archivo corrompido"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -3003,7 +3003,7 @@ msgstr "división por cero"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "dtype must be float, or complex"
-msgstr ""
+msgstr "dtype debe ser float, o complex"
 
 #: py/objdeque.c
 msgid "empty"
@@ -3011,7 +3011,7 @@ msgstr "vacío"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "archivo vacio"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3043,6 +3043,8 @@ msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"esp32_camera. la camara necesita PSRAM reservada para ser configurada. Vea "
+"la documentacion para mas instrucciones."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3092,7 +3094,7 @@ msgstr "el archivo deberia ser una archivo abierto en modo byte"
 
 #: shared-bindings/traceback/__init__.c
 msgid "file write is not available"
-msgstr ""
+msgstr "la escritura del archivo no esta disponible"
 
 #: shared-bindings/storage/__init__.c
 msgid "filesystem must provide mount method"
@@ -3173,7 +3175,7 @@ msgstr "Función solo definida para ndarrays"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "function is implemented for ndarrays only"
-msgstr ""
+msgstr "la funcion esta implementada solamente para ndarrays"
 
 #: py/argcheck.c
 #, c-format
@@ -3260,7 +3262,7 @@ msgstr "el índice está fuera de límites"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "el indice debe ser tuple o int"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3274,7 +3276,7 @@ msgstr "los índices deben ser enteros, particiones o listas de booleanos"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "init I2C"
-msgstr ""
+msgstr "inicializacion I2C"
 
 #: extmod/ulab/code/scipy/optimize/optimize.c
 msgid "initial values must be iterable"
@@ -3310,7 +3312,7 @@ msgstr "los datos de entrada deben ser iterables"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "input dtype must be float or complex"
-msgstr ""
+msgstr "dtype de entrada debe ser float o complex"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
@@ -3323,11 +3325,11 @@ msgstr "la matriz de entrada es singular"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "entrada debe ser 1-d o 2-d"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
-msgstr ""
+msgstr "entrada debe ser un ndarray de 1D"
 
 #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
 msgid "input must be a dense ndarray"
@@ -3339,7 +3341,7 @@ msgstr "Entrada tiene que ser un ndarray"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be an ndarray, or a scalar"
-msgstr ""
+msgstr "entrada debe ser una ndarray o un escalar"
 
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "input must be one-dimensional"
@@ -3377,7 +3379,7 @@ msgstr "arquitectura inválida"
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
-msgstr ""
+msgstr "bits_per_pixel %d invalidos, deben ser, 1, 2, 4, 8, 16, 24, o 32"
 
 #: ports/raspberrypi/common-hal/ssl/SSLSocket.c
 msgid "invalid cert"
@@ -3395,7 +3397,7 @@ msgstr "el element_size %d,no es valido, debe ser 1,2 ó 4"
 
 #: shared-bindings/traceback/__init__.c
 msgid "invalid exception"
-msgstr ""
+msgstr "excepcion invalida"
 
 #: extmod/modframebuf.c
 msgid "invalid format"
@@ -3419,7 +3421,7 @@ msgstr "decorador de micropython inválido"
 
 #: ports/espressif/common-hal/esp32_camera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "configuracion invalida"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
@@ -3508,12 +3510,12 @@ msgstr "Loopback + modo silencioso no están soportados por periférico"
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
-msgstr ""
+msgstr "mDNS ya esta inicializado"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
-msgstr ""
+msgstr "mDNS solo funciona con WIFI incorporado"
 
 #: py/parse.c
 msgid "malformed f-string"
@@ -3540,7 +3542,7 @@ msgstr "max_length debe ser 0-%d cuando fixed_length es %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "el numero maximo de dimensiones es "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3574,7 +3576,7 @@ msgstr ""
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "mode must be complete, or reduced"
-msgstr ""
+msgstr "el modo debe ser completo o reducido"
 
 #: py/builtinimport.c
 msgid "module not found"
@@ -3582,7 +3584,7 @@ msgstr "módulo no encontrado"
 
 #: ports/espressif/common-hal/wifi/Monitor.c
 msgid "monitor init failed"
-msgstr ""
+msgstr "fallo en el monitor de inicializacion"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "more degrees of freedom than data points"
@@ -3643,7 +3645,7 @@ msgstr "cuenta de corrimientos negativo"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "indice anidado debe ser int"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
@@ -3728,7 +3730,7 @@ msgstr "no suficientes argumentos para format string"
 
 #: extmod/ulab/code/numpy/carray/carray_tools.c
 msgid "not implemented for complex dtype"
-msgstr ""
+msgstr "no esta implementado para complex dtype"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "number of points must be at least 2"
@@ -3790,7 +3792,7 @@ msgstr "string de longitud impar"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "off"
-msgstr ""
+msgstr "apagado"
 
 #: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
@@ -3815,11 +3817,11 @@ msgstr "solo se admite bit_depth=16"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "solamente mono esta suportado"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "solamente oversample=64 esta soportado"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c
@@ -3843,11 +3845,11 @@ msgstr "los operandos no se pueden transmitir juntos"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "operation is defined for 2D arrays only"
-msgstr ""
+msgstr "la operacion esta definida para matrices 2D solamente"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "operation is defined for ndarrays only"
-msgstr ""
+msgstr "la operacion esta definida para ndarrays solamente"
 
 #: extmod/ulab/code/ndarray.c
 msgid "operation is implemented for 1D Boolean arrays only"
@@ -3921,7 +3923,7 @@ msgstr "pixel_shader debe ser displayio.Palette o displayio.ColorConverter"
 
 #: extmod/vfs_posix_file.c
 msgid "poll on file not available on win32"
-msgstr ""
+msgstr "el sondeo del archivo no esta disponible en win32"
 
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 msgid "pop from an empty PulseIn"
@@ -3958,7 +3960,7 @@ msgstr "desbordamiento de cola(queue)"
 
 #: py/parse.c
 msgid "raw f-strings are not supported"
-msgstr ""
+msgstr "raw f-strings no esta soportadas"
 
 #: extmod/ulab/code/numpy/fft/fft_tools.c
 msgid "real and imaginary parts must be of equal length"
@@ -4077,15 +4079,15 @@ msgstr "paleta fuente muy larga"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 2 or 65536"
-msgstr ""
+msgstr "source_bitmap debe tener value_count de 2 o 65536"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 65536"
-msgstr ""
+msgstr "source_bitmap debe tener value_count de 65536"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 8"
-msgstr ""
+msgstr "source_bitmap debe tener value_count de 8"
 
 #: py/objstr.c
 msgid "start/end indices"
@@ -4153,7 +4155,7 @@ msgstr "tiempo de espera agotado esperando a tarjeta v2"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr ""
+msgstr "temporizador re-inicializado"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"

From dca66eb98c458cdd047e5e5c895a895f4d9f72e5 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 18 Jan 2023 16:28:35 -0800
Subject: [PATCH 1703/2403] Watch for ctrl-c over BLE workflow serial

Before this, it was impossible to interrupt a running program over
BLE.
---
 .../common-hal/_bleio/CharacteristicBuffer.c  | 19 ++++++++++++++++---
 .../common-hal/_bleio/CharacteristicBuffer.h  |  3 +++
 .../common-hal/_bleio/CharacteristicBuffer.c  | 18 +++++++++++++++---
 .../common-hal/_bleio/CharacteristicBuffer.h  |  3 +++
 shared-bindings/_bleio/CharacteristicBuffer.h |  5 ++++-
 supervisor/shared/bluetooth/serial.c          |  3 ++-
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
index 48be3abd67..89e5adeebe 100644
--- a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
@@ -49,7 +49,19 @@ STATIC int characteristic_buffer_on_ble_evt(struct ble_gap_event *event, void *p
                 event->notify_rx.attr_handle == self->characteristic->handle) {
                 const struct os_mbuf *m = event->notify_rx.om;
                 while (m != NULL) {
-                    ringbuf_put_n(&self->ringbuf, m->om_data, m->om_len);
+                    const uint8_t *data = m->om_data;
+                    uint16_t len = m->om_len;
+                    if (self->watch_for_interrupt_char) {
+                        for (uint16_t i = 0; i < len; i++) {
+                            if (data[i] == mp_interrupt_char) {
+                                mp_sched_keyboard_interrupt();
+                            } else {
+                                ringbuf_put(&self->ringbuf, data[i]);
+                            }
+                        }
+                    } else {
+                        ringbuf_put_n(&self->ringbuf, data, len);
+                    }
                     m = SLIST_NEXT(m, om_next);
                 }
             }
@@ -69,7 +81,8 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
     uint8_t *buffer, size_t buffer_size,
-    void *static_handler_entry) {
+    void *static_handler_entry,
+    bool watch_for_interrupt_char) {
     self->characteristic = characteristic;
     self->timeout_ms = timeout * 1000;
     ringbuf_init(&self->ringbuf, buffer, buffer_size);
@@ -87,7 +100,7 @@ void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffe
     mp_float_t timeout,
     size_t buffer_size) {
     uint8_t *buffer = m_malloc(buffer_size, true);
-    _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL);
+    _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL, false);
 }
 
 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/espressif/common-hal/_bleio/CharacteristicBuffer.h b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.h
index e5247c20f7..30c3c426e6 100644
--- a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.h
+++ b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
 #define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
 
+#include 
+
 #include "py/ringbuf.h"
 #include "shared-bindings/_bleio/Characteristic.h"
 
@@ -36,6 +38,7 @@ typedef struct {
     uint32_t timeout_ms;
     // Ring buffer storing consecutive incoming values.
     ringbuf_t ringbuf;
+    bool watch_for_interrupt_char;
 } bleio_characteristic_buffer_obj_t;
 
 #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
index d13ffa1a94..58dc94fe25 100644
--- a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
@@ -45,7 +45,17 @@
 STATIC void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) {
     uint8_t is_nested_critical_region;
     sd_nvic_critical_region_enter(&is_nested_critical_region);
-    ringbuf_put_n(&self->ringbuf, data, len);
+    if (self->watch_for_interrupt_char) {
+        for (uint16_t i = 0; i < len; i++) {
+            if (data[i] == mp_interrupt_char) {
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put(&self->ringbuf, data[i]);
+            }
+        }
+    } else {
+        ringbuf_put_n(&self->ringbuf, data, len);
+    }
     sd_nvic_critical_region_exit(is_nested_critical_region);
 }
 
@@ -85,10 +95,12 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
     uint8_t *buffer, size_t buffer_size,
-    void *static_handler_entry) {
+    void *static_handler_entry,
+    bool watch_for_interrupt_char) {
 
     self->characteristic = characteristic;
     self->timeout_ms = timeout * 1000;
+    self->watch_for_interrupt_char = watch_for_interrupt_char;
 
     ringbuf_init(&self->ringbuf, buffer, buffer_size);
 
@@ -105,7 +117,7 @@ void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffe
     mp_float_t timeout,
     size_t buffer_size) {
     uint8_t *buffer = m_malloc(buffer_size, true);
-    _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL);
+    _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL, false);
 }
 
 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/CharacteristicBuffer.h b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.h
index f0949251cd..ba3d7ba3fc 100644
--- a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.h
+++ b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
 
+#include 
+
 #include "nrf_soc.h"
 
 #include "py/ringbuf.h"
@@ -38,6 +40,7 @@ typedef struct {
     uint32_t timeout_ms;
     // Ring buffer storing consecutive incoming values.
     ringbuf_t ringbuf;
+    bool watch_for_interrupt_char;
 } bleio_characteristic_buffer_obj_t;
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.h b/shared-bindings/_bleio/CharacteristicBuffer.h
index de85f019bc..9dc3252d5a 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.h
+++ b/shared-bindings/_bleio/CharacteristicBuffer.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CHARACTERISTICBUFFER_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CHARACTERISTICBUFFER_H
 
+#include 
+
 #include "common-hal/_bleio/CharacteristicBuffer.h"
 
 extern const mp_obj_type_t bleio_characteristic_buffer_type;
@@ -35,7 +37,8 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
     uint8_t *buffer, size_t buffer_size,
-    void *static_handler_entry);
+    void *static_handler_entry,
+    bool watch_for_interrupt_char);
 void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
diff --git a/supervisor/shared/bluetooth/serial.c b/supervisor/shared/bluetooth/serial.c
index 2edf3c784f..a5f4d776b3 100644
--- a/supervisor/shared/bluetooth/serial.c
+++ b/supervisor/shared/bluetooth/serial.c
@@ -146,7 +146,8 @@ void supervisor_start_bluetooth_serial(void) {
         &supervisor_ble_circuitpython_rx_characteristic,
         0.1f,
         (uint8_t *)_incoming, sizeof(_incoming) * sizeof(uint32_t),
-        &rx_static_handler_entry);
+        &rx_static_handler_entry,
+        true /* watch for interrupt character */);
 
     _enabled = true;
 }

From 8f9d1e241d8aadc7c2c1e39efd1aa67bc4388718 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 19 Jan 2023 10:28:56 -0800
Subject: [PATCH 1704/2403] Save watch_for_interrupt_char to espressif too

---
 ports/espressif/common-hal/_bleio/CharacteristicBuffer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
index 89e5adeebe..96de70bf84 100644
--- a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
@@ -85,6 +85,7 @@ void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buff
     bool watch_for_interrupt_char) {
     self->characteristic = characteristic;
     self->timeout_ms = timeout * 1000;
+    self->watch_for_interrupt_char = watch_for_interrupt_char;
     ringbuf_init(&self->ringbuf, buffer, buffer_size);
 
     if (static_handler_entry != NULL) {

From 483f14b73f33531330931e341497940c8d5111ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Soko=C5=82owski?= 
Date: Thu, 19 Jan 2023 21:37:25 +0100
Subject: [PATCH 1705/2403] Allow lines with ends out of bitmap in
 `bitmaptools_obj_draw_line`

---
 shared-bindings/bitmaptools/__init__.c | 7 -------
 shared-module/bitmaptools/__init__.c   | 4 ++++
 shared-module/displayio/Bitmap.c       | 5 +++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 33e3257770..4d968db717 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -514,13 +514,6 @@ STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_arg
     int16_t x2 = args[ARG_x2].u_int;
     int16_t y2 = args[ARG_y2].u_int;
 
-    // verify points are within the bitmap boundary (inclusive)
-    if ((x1 < 0) || (x2 < 0) || (y1 < 0) || (y2 < 0) ||
-        (x1 >= destination->width) || (x2 >= destination->width) ||
-        (y1 >= destination->height) || (y2 >= destination->height)) {
-        mp_raise_ValueError(translate("out of range of target"));
-    }
-
     common_hal_bitmaptools_draw_line(destination, x1, y1, x2, y2, value);
 
     return mp_const_none;
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 67b5254b32..f2fdc6866d 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -423,6 +423,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
             y0 = y1;
             y1 = temp;
         }
+        y0 = max(0, y0); // only draw inside bitmap
+        y1 = min(y1, destination->height - 1);
         for (y = y0; y < (y1 + 1); y++) { // write a horizontal line
             displayio_bitmap_write_pixel(destination, x0, y, value);
         }
@@ -432,6 +434,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
             x0 = x1;
             x1 = temp;
         }
+        x0 = max(0, x0); // only draw inside bitmap
+        x1 = min(x1, destination->width - 1);
         for (x = x0; x < (x1 + 1); x++) { // write a horizontal line
             displayio_bitmap_write_pixel(destination, x, y0, value);
         }
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 6c64830dce..dc82d04e05 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -131,6 +131,11 @@ void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y
     // Writes the color index value into a pixel position
     // Must update the dirty area separately
 
+    // Don't write if out of area
+    if (0 > x || x >= self->width || 0 > y || y >= self->height) {
+        return;
+    }
+
     // Update one pixel of data
     int32_t row_start = y * self->stride;
     uint32_t bytes_per_value = self->bits_per_value / 8;

From 2276254f6c4aafca5e06d4c8dff66e6547a5a5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Soko=C5=82owski?= 
Date: Thu, 19 Jan 2023 21:50:59 +0100
Subject: [PATCH 1706/2403] Fix compilation

---
 shared-module/bitmaptools/__init__.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index f2fdc6866d..dbf5a9ef96 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -423,8 +423,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
             y0 = y1;
             y1 = temp;
         }
-        y0 = max(0, y0); // only draw inside bitmap
-        y1 = min(y1, destination->height - 1);
+        y0 = MAX(0, y0); // only draw inside bitmap
+        y1 = MIN(y1, destination->height - 1);
         for (y = y0; y < (y1 + 1); y++) { // write a horizontal line
             displayio_bitmap_write_pixel(destination, x0, y, value);
         }
@@ -434,8 +434,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
             x0 = x1;
             x1 = temp;
         }
-        x0 = max(0, x0); // only draw inside bitmap
-        x1 = min(x1, destination->width - 1);
+        x0 = MAX(0, x0); // only draw inside bitmap
+        x1 = MIN(x1, destination->width - 1);
         for (x = x0; x < (x1 + 1); x++) { // write a horizontal line
             displayio_bitmap_write_pixel(destination, x, y0, value);
         }

From a30f69aaedc2d52ef227f36e3e31610462b67fff Mon Sep 17 00:00:00 2001
From: root 
Date: Thu, 19 Jan 2023 15:58:03 -0600
Subject: [PATCH 1707/2403] Fixes for microcontroller.on_next_reset() on NRF

---
 ports/nrf/common-hal/microcontroller/__init__.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index d84cc58455..7bf853fb30 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -82,10 +82,10 @@ void common_hal_mcu_enable_interrupts() {
 
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     enum { DFU_MAGIC_UF2_RESET = 0x57 };
-    if (runmode == RUNMODE_BOOTLOADER) {
-        NRF_POWER->GPREGRET = DFU_MAGIC_UF2_RESET;
+    if (runmode == RUNMODE_BOOTLOADER || runmode == RUNMODE_UF2) {
+        sd_power_gpregret_set(0,DFU_MAGIC_UF2_RESET);
     } else {
-        NRF_POWER->GPREGRET = 0;
+        sd_power_gpregret_set(0,0);
     }
     if (runmode == RUNMODE_SAFE_MODE) {
         safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);

From 59c3618cbdb0e8627ef701727e5c2178eb321067 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 20 Jan 2023 13:19:59 +0530
Subject: [PATCH 1708/2403] clone espnow implementation

Co-authored-by: Nick Moore 
Co-authored-by: shawwwn 
Co-authored-by: glenn20 
---
 ports/espressif/bindings/espnow/ESPNow.c | 908 +++++++++++++++++++++++
 ports/espressif/bindings/espnow/ESPNow.h |  30 +
 2 files changed, 938 insertions(+)
 create mode 100644 ports/espressif/bindings/espnow/ESPNow.c
 create mode 100644 ports/espressif/bindings/espnow/ESPNow.h

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
new file mode 100644
index 0000000000..0e9da4fc1b
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -0,0 +1,908 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2020 Nick Moore
+ * Copyright (c) 2018 shawwwn 
+ * Copyright (c) 2020-2021 Glenn Moloney @glenn20
+ *
+ * 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 
+#include 
+#include 
+
+#include "esp_log.h"
+#include "esp_now.h"
+#include "esp_wifi.h"
+#include "esp_wifi_types.h"
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "py/obj.h"
+#include "py/objstr.h"
+#include "py/objarray.h"
+#include "py/stream.h"
+#include "py/binary.h"
+#include "py/ringbuf.h"
+
+#include "mpconfigport.h"
+#include "mphalport.h"
+#include "modnetwork.h"
+#include "modespnow.h"
+
+#ifndef MICROPY_ESPNOW_RSSI
+// Include code to track rssi of peers
+#define MICROPY_ESPNOW_RSSI 1
+#endif
+#ifndef MICROPY_ESPNOW_EXTRA_PEER_METHODS
+// Include mod_peer(),get_peer(),peer_count()
+#define MICROPY_ESPNOW_EXTRA_PEER_METHODS 1
+#endif
+
+// Relies on gcc Variadic Macros and Statement Expressions
+#define NEW_TUPLE(...) \
+    ({mp_obj_t _z[] = {__VA_ARGS__}; mp_obj_new_tuple(MP_ARRAY_SIZE(_z), _z); })
+
+static const uint8_t ESPNOW_MAGIC = 0x99;
+
+// ESPNow packet format for the receive buffer.
+// Use this for peeking at the header of the next packet in the buffer.
+typedef struct {
+    uint8_t magic;              // = ESPNOW_MAGIC
+    uint8_t msg_len;            // Length of the message
+    #if MICROPY_ESPNOW_RSSI
+    uint32_t time_ms;           // Timestamp (ms) when packet is received
+    int8_t rssi;                // RSSI value (dBm) (-127 to 0)
+    #endif // MICROPY_ESPNOW_RSSI
+} __attribute__((packed)) espnow_hdr_t;
+
+typedef struct {
+    espnow_hdr_t hdr;           // The header
+    uint8_t peer[6];            // Peer address
+    uint8_t msg[0];             // Message is up to 250 bytes
+} __attribute__((packed)) espnow_pkt_t;
+
+// The maximum length of an espnow packet (bytes)
+static const size_t MAX_PACKET_LEN = (
+    (sizeof(espnow_pkt_t) + ESP_NOW_MAX_DATA_LEN));
+
+// Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
+// Will allocate an additional 7 bytes for buffer overhead
+static const size_t DEFAULT_RECV_BUFFER_SIZE = (2 * MAX_PACKET_LEN);
+
+// Default timeout (millisec) to wait for incoming ESPNow messages (5 minutes).
+static const size_t DEFAULT_RECV_TIMEOUT_MS = (5 * 60 * 1000);
+
+// Time to wait (millisec) for responses from sent packets: (2 seconds).
+static const size_t DEFAULT_SEND_TIMEOUT_MS = (2 * 1000);
+
+// Number of milliseconds to wait for pending responses to sent packets.
+// This is a fallback which should never be reached.
+static const mp_uint_t PENDING_RESPONSES_TIMEOUT_MS = 100;
+static const mp_uint_t PENDING_RESPONSES_BUSY_POLL_MS = 10;
+
+// The data structure for the espnow_singleton.
+typedef struct _esp_espnow_obj_t {
+    mp_obj_base_t base;
+
+    ringbuf_t *recv_buffer;         // A buffer for received packets
+    size_t recv_buffer_size;        // The size of the recv_buffer
+    size_t recv_timeout_ms;         // Timeout for recv()
+    volatile size_t rx_packets;     // # of received packets
+    size_t dropped_rx_pkts;         // # of dropped packets (buffer full)
+    size_t tx_packets;              // # of sent packets
+    volatile size_t tx_responses;   // # of sent packet responses received
+    volatile size_t tx_failures;    // # of sent packet responses failed
+    size_t peer_count;              // Cache the # of peers for send(sync=True)
+    mp_obj_t recv_cb;               // Callback when a packet is received
+    mp_obj_t recv_cb_arg;           // Argument passed to callback
+    #if MICROPY_ESPNOW_RSSI
+    mp_obj_t peers_table;           // A dictionary of discovered peers
+    #endif // MICROPY_ESPNOW_RSSI
+} esp_espnow_obj_t;
+
+const mp_obj_type_t esp_espnow_type;
+
+// ### Initialisation and Config functions
+//
+
+// Return a pointer to the ESPNow module singleton
+// If state == INITIALISED check the device has been initialised.
+// Raises OSError if not initialised and state == INITIALISED.
+static esp_espnow_obj_t *_get_singleton() {
+    return MP_STATE_PORT(espnow_singleton);
+}
+
+static esp_espnow_obj_t *_get_singleton_initialised() {
+    esp_espnow_obj_t *self = _get_singleton();
+    // assert(self);
+    if (self->recv_buffer == NULL) {
+        // Throw an espnow not initialised error
+        check_esp_err(ESP_ERR_ESPNOW_NOT_INIT);
+    }
+    return self;
+}
+
+// Allocate and initialise the ESPNow module as a singleton.
+// Returns the initialised espnow_singleton.
+STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
+    size_t n_kw, const mp_obj_t *all_args) {
+
+    // The espnow_singleton must be defined in MICROPY_PORT_ROOT_POINTERS
+    // (see mpconfigport.h) to prevent memory allocated here from being
+    // garbage collected.
+    // NOTE: on soft reset the espnow_singleton MUST be set to NULL and the
+    // ESP-NOW functions de-initialised (see main.c).
+    esp_espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
+    if (self != NULL) {
+        return self;
+    }
+    self = m_new_obj(esp_espnow_obj_t);
+    self->base.type = &esp_espnow_type;
+    self->recv_buffer_size = DEFAULT_RECV_BUFFER_SIZE;
+    self->recv_timeout_ms = DEFAULT_RECV_TIMEOUT_MS;
+    self->recv_buffer = NULL;       // Buffer is allocated in espnow_init()
+    self->recv_cb = mp_const_none;
+    #if MICROPY_ESPNOW_RSSI
+    self->peers_table = mp_obj_new_dict(0);
+    // Prevent user code modifying the dict
+    mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
+    #endif // MICROPY_ESPNOW_RSSI
+
+    // Set the global singleton pointer for the espnow protocol.
+    MP_STATE_PORT(espnow_singleton) = self;
+
+    return self;
+}
+
+// Forward declare the send and recv ESPNow callbacks
+STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
+
+STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *data, int len);
+
+// ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
+// Initialise the Espressif ESPNOW software stack, register callbacks and
+// allocate the recv data buffers.
+// Returns None.
+static mp_obj_t espnow_init(mp_obj_t _) {
+    esp_espnow_obj_t *self = _get_singleton();
+    if (self->recv_buffer == NULL) {    // Already initialised
+        self->recv_buffer = m_new_obj(ringbuf_t);
+        ringbuf_alloc(self->recv_buffer, self->recv_buffer_size);
+
+        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
+        check_esp_err(esp_now_init());
+        check_esp_err(esp_now_register_recv_cb(recv_cb));
+        check_esp_err(esp_now_register_send_cb(send_cb));
+    }
+    return mp_const_none;
+}
+
+// ESPNow.deinit(): De-initialise the ESPNOW software stack, disable callbacks
+// and deallocate the recv data buffers.
+// Note: this function is called from main.c:mp_task() to cleanup before soft
+// reset, so cannot be declared STATIC and must guard against self == NULL;.
+mp_obj_t espnow_deinit(mp_obj_t _) {
+    esp_espnow_obj_t *self = _get_singleton();
+    if (self != NULL && self->recv_buffer != NULL) {
+        check_esp_err(esp_now_unregister_recv_cb());
+        check_esp_err(esp_now_unregister_send_cb());
+        check_esp_err(esp_now_deinit());
+        self->recv_buffer->buf = NULL;
+        self->recv_buffer = NULL;
+        self->peer_count = 0; // esp_now_deinit() removes all peers.
+        self->tx_packets = self->tx_responses;
+    }
+    return mp_const_none;
+}
+
+STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
+    esp_espnow_obj_t *self = _get_singleton();
+    if (n_args > 1) {
+        if (mp_obj_is_true(args[1])) {
+            espnow_init(self);
+        } else {
+            espnow_deinit(self);
+        }
+    }
+    return self->recv_buffer != NULL ? mp_const_true : mp_const_false;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
+
+// ESPNow.config(['param'|param=value, ..])
+// Get or set configuration values. Supported config params:
+//    buffer: size of buffer for rx packets (default=514 bytes)
+//    timeout: Default read timeout (default=300,000 milliseconds)
+STATIC mp_obj_t espnow_config(
+    size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    esp_espnow_obj_t *self = _get_singleton();
+    enum { ARG_get, ARG_buffer, ARG_timeout, ARG_rate };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_buffer, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+    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);
+
+    if (args[ARG_buffer].u_int >= 0) {
+        self->recv_buffer_size = args[ARG_buffer].u_int;
+    }
+    if (args[ARG_timeout].u_int >= 0) {
+        self->recv_timeout_ms = args[ARG_timeout].u_int;
+    }
+    if (args[ARG_rate].u_int >= 0) {
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
+        check_esp_err(esp_wifi_config_espnow_rate(
+            ESP_IF_WIFI_STA, args[ARG_rate].u_int));
+        check_esp_err(esp_wifi_config_espnow_rate(
+            ESP_IF_WIFI_AP, args[ARG_rate].u_int));
+        #else
+        mp_raise_ValueError(MP_ERROR_TEXT("rate option not supported"));
+        #endif
+    }
+    if (args[ARG_get].u_obj == MP_OBJ_NULL) {
+        return mp_const_none;
+    }
+#define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
+    // Return the value of the requested parameter
+    uintptr_t name = (uintptr_t)args[ARG_get].u_obj;
+    if (name == QS(MP_QSTR_buffer)) {
+        return mp_obj_new_int(self->recv_buffer_size);
+    } else if (name == QS(MP_QSTR_timeout)) {
+        return mp_obj_new_int(self->recv_timeout_ms);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+#undef QS
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
+
+// ESPNow.on_recv(recv_cb)
+// Set callback function to be invoked when a message is received.
+STATIC mp_obj_t espnow_on_recv(size_t n_args, const mp_obj_t *args) {
+    esp_espnow_obj_t *self = _get_singleton();
+    mp_obj_t recv_cb = args[1];
+    if (recv_cb != mp_const_none && !mp_obj_is_callable(recv_cb)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid handler"));
+    }
+    self->recv_cb = recv_cb;
+    self->recv_cb_arg = (n_args > 2) ? args[2] : mp_const_none;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_on_recv_obj, 2, 3, espnow_on_recv);
+
+// ESPnow.stats(): Provide some useful stats.
+// Returns a tuple of:
+//   (tx_pkts, tx_responses, tx_failures, rx_pkts, dropped_rx_pkts)
+STATIC mp_obj_t espnow_stats(mp_obj_t _) {
+    const esp_espnow_obj_t *self = _get_singleton();
+    return NEW_TUPLE(
+        mp_obj_new_int(self->tx_packets),
+        mp_obj_new_int(self->tx_responses),
+        mp_obj_new_int(self->tx_failures),
+        mp_obj_new_int(self->rx_packets),
+        mp_obj_new_int(self->dropped_rx_pkts));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
+
+#if MICROPY_ESPNOW_RSSI
+// ### Maintaining the peer table and reading RSSI values
+//
+// We maintain a peers table for several reasons, to:
+// - support monitoring the RSSI values for all peers; and
+// - to return unique bytestrings for each peer which supports more efficient
+//   application memory usage and peer handling.
+
+// Get the RSSI value from the wifi packet header
+static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
+    // Warning: Secret magic to get the rssi from the wifi packet header
+    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
+    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
+    // and a espnow_frame_format_t.
+    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
+    static const size_t sizeof_espnow_frame_format = 39;
+    wifi_promiscuous_pkt_t *wifi_pkt = (wifi_promiscuous_pkt_t *)(
+        msg - sizeof_espnow_frame_format - sizeof(wifi_promiscuous_pkt_t));
+
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0)
+    return wifi_pkt->rx_ctrl.rssi - 100;  // Offset rssi for IDF 4.0.2
+    #else
+    return wifi_pkt->rx_ctrl.rssi;
+    #endif
+}
+
+// Lookup a peer in the peers table and return a reference to the item in the
+// peers_table. Add peer to the table if it is not found (may alloc memory).
+// Will not return NULL.
+static mp_map_elem_t *_lookup_add_peer(
+    esp_espnow_obj_t *self, const uint8_t *peer) {
+
+    // We do not want to allocate any new memory in the case that the peer
+    // already exists in the peers_table (which is almost all the time).
+    // So, we use a byte string on the stack and look that up in the dict.
+    mp_map_t *map = mp_obj_dict_get_map(self->peers_table);
+    mp_obj_str_t peer_obj = {{&mp_type_bytes}, 0, ESP_NOW_ETH_ALEN, peer};
+    mp_map_elem_t *item = mp_map_lookup(map, &peer_obj, MP_MAP_LOOKUP);
+    if (item == NULL) {
+        // If not found, add the peer using a new bytestring
+        map->is_fixed = 0;      // Allow to modify the dict
+        mp_obj_t new_peer = mp_obj_new_bytes(peer, ESP_NOW_ETH_ALEN);
+        item = mp_map_lookup(map, new_peer, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+        item->value = mp_obj_new_list(2, NULL);
+        map->is_fixed = 1;      // Relock the dict
+    }
+    return item;
+}
+
+// Update the peers table with the new rssi value from a received pkt and
+// return a reference to the item in the peers_table.
+static mp_map_elem_t *_update_rssi(
+    const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
+
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+    // Lookup the peer in the device table
+    mp_map_elem_t *item = _lookup_add_peer(self, peer);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
+    list->items[0] = MP_OBJ_NEW_SMALL_INT(rssi);
+    list->items[1] = mp_obj_new_int(time_ms);
+    return item;
+}
+#endif // MICROPY_ESPNOW_RSSI
+
+// ### Handling espnow packets in the recv buffer
+//
+
+// ### Send and Receive ESP_Now data
+//
+
+// Return C pointer to byte memory string/bytes/bytearray in obj.
+// Raise ValueError if the length does not match expected len.
+static uint8_t *_get_bytes_len_rw(mp_obj_t obj, size_t len, mp_uint_t rw) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, rw);
+    if (bufinfo.len != len) {
+        mp_raise_ValueError(
+            MP_ERROR_TEXT("ESPNow: bytes or bytearray wrong length"));
+    }
+    return (uint8_t *)bufinfo.buf;
+}
+
+static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len) {
+    return _get_bytes_len_rw(obj, len, MP_BUFFER_READ);
+}
+
+static uint8_t *_get_bytes_len_w(mp_obj_t obj, size_t len) {
+    return _get_bytes_len_rw(obj, len, MP_BUFFER_WRITE);
+}
+
+// Return C pointer to the MAC address.
+// Raise ValueError if mac_addr is wrong type or is not 6 bytes long.
+static const uint8_t *_get_peer(mp_obj_t mac_addr) {
+    return mp_obj_is_true(mac_addr)
+        ? _get_bytes_len(mac_addr, ESP_NOW_ETH_ALEN) : NULL;
+}
+
+// Copy data from the ring buffer - wait if buffer is empty up to timeout_ms
+int ringbuf_read_wait(ringbuf_t *r, void *data, size_t len, int timeout_ms) {
+    int64_t end = mp_hal_ticks_ms() + timeout_ms;
+    int status = 0;
+    while (
+        ((status = ringbuf_read(r, data, len)) == 0) &&
+        (end - (int64_t)mp_hal_ticks_ms()) >= 0) {
+        MICROPY_EVENT_POLL_HOOK;
+    }
+    return status;
+}
+
+// ESPNow.recvinto(buffers[, timeout_ms]):
+// Waits for an espnow message and copies the peer_addr and message into
+// the buffers list.
+// Arguments:
+//      buffers: (Optional) list of bytearrays to store return values.
+//      timeout_ms: (Optional) timeout in milliseconds (or None).
+// Buffers should be a list: [bytearray(6), bytearray(250)]
+// If buffers is 4 elements long, the rssi and timestamp values will be
+// loaded into the 3rd and 4th elements.
+// Default timeout is set with ESPNow.config(timeout=milliseconds).
+// Return (None, None) on timeout.
+STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+
+    size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
+            ? mp_obj_get_int(args[2]) : self->recv_timeout_ms);
+
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(args[1]);
+    if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
+        mp_raise_ValueError(MP_ERROR_TEXT("ESPNow.recvinto(): Invalid argument"));
+    }
+    mp_obj_array_t *msg = MP_OBJ_TO_PTR(list->items[1]);
+    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
+        msg->len += msg->free;   // Make all the space in msg array available
+        msg->free = 0;
+    }
+    #if MICROPY_ESPNOW_RSSI
+    uint8_t peer_buf[ESP_NOW_ETH_ALEN];
+    #else
+    uint8_t *peer_buf = _get_bytes_len_w(list->items[0], ESP_NOW_ETH_ALEN);
+    #endif // MICROPY_ESPNOW_RSSI
+    uint8_t *msg_buf = _get_bytes_len_w(msg, ESP_NOW_MAX_DATA_LEN);
+
+    // Read the packet header from the incoming buffer
+    espnow_hdr_t hdr;
+    if (ringbuf_read_wait(self->recv_buffer, &hdr, sizeof(hdr), timeout_ms) < 1) {
+        return MP_OBJ_NEW_SMALL_INT(0);    // Timeout waiting for packet
+    }
+    int msg_len = hdr.msg_len;
+
+    // Check the message packet header format and read the message data
+    if (hdr.magic != ESPNOW_MAGIC ||
+        msg_len > ESP_NOW_MAX_DATA_LEN ||
+        ringbuf_read(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) < 1 ||
+        ringbuf_read(self->recv_buffer, msg_buf, msg_len) < 1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("ESPNow.recv(): buffer error"));
+    }
+    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
+        // Set the length of the message bytearray.
+        size_t size = msg->len + msg->free;
+        msg->len = msg_len;
+        msg->free = size - msg_len;
+    }
+
+    #if MICROPY_ESPNOW_RSSI
+    // Update rssi value in the peer device table
+    mp_map_elem_t *entry = _update_rssi(peer_buf, hdr.rssi, hdr.time_ms);
+    list->items[0] = entry->key;  // Set first element of list to peer
+    if (list->len >= 4) {
+        list->items[2] = MP_OBJ_NEW_SMALL_INT(hdr.rssi);
+        list->items[3] = mp_obj_new_int(hdr.time_ms);
+    }
+    #endif // MICROPY_ESPNOW_RSSI
+
+    return MP_OBJ_NEW_SMALL_INT(msg_len);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
+
+// Test if data is available to read from the buffers
+STATIC mp_obj_t espnow_any(const mp_obj_t _) {
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+
+    return ringbuf_avail(self->recv_buffer) ? mp_const_true : mp_const_false;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
+
+// Used by espnow_send() for sends() with sync==True.
+// Wait till all pending sent packet responses have been received.
+// ie. self->tx_responses == self->tx_packets.
+static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
+    mp_uint_t start = mp_hal_ticks_ms();
+    mp_uint_t t;
+    while (self->tx_responses < self->tx_packets) {
+        if ((t = mp_hal_ticks_ms() - start) > PENDING_RESPONSES_TIMEOUT_MS) {
+            mp_raise_OSError(MP_ETIMEDOUT);
+        }
+        if (t > PENDING_RESPONSES_BUSY_POLL_MS) {
+            // After 10ms of busy waiting give other tasks a look in.
+            MICROPY_EVENT_POLL_HOOK;
+        }
+    }
+}
+
+// ESPNow.send(peer_addr, message, [sync (=true), size])
+// ESPNow.send(message)
+// Send a message to the peer's mac address. Optionally wait for a response.
+// If peer_addr == None or any non-true value, send to all registered peers.
+// If sync == True, wait for response after sending.
+// If size is provided it should be the number of bytes in message to send().
+// Returns:
+//   True  if sync==False and message sent successfully.
+//   True  if sync==True and message is received successfully by all recipients
+//   False if sync==True and message is not received by at least one recipient
+// Raises: EAGAIN if the internal espnow buffers are full.
+STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+    // Check the various combinations of input arguments
+    const uint8_t *peer = (n_args > 2) ? _get_peer(args[1]) : NULL;
+    mp_obj_t msg = (n_args > 2) ? args[2] : (n_args == 2) ? args[1] : MP_OBJ_NULL;
+    bool sync = n_args <= 3 || args[3] == mp_const_none || mp_obj_is_true(args[3]);
+
+    // Get a pointer to the data buffer of the message
+    mp_buffer_info_t message;
+    mp_get_buffer_raise(msg, &message, MP_BUFFER_READ);
+
+    if (sync) {
+        // Flush out any pending responses.
+        // If the last call was sync==False there may be outstanding responses
+        // still to be received (possible many if we just had a burst of
+        // unsync send()s). We need to wait for all pending responses if this
+        // call has sync=True.
+        _wait_for_pending_responses(self);
+    }
+    int saved_failures = self->tx_failures;
+    // Send the packet - try, try again if internal esp-now buffers are full.
+    esp_err_t err;
+    int64_t start = mp_hal_ticks_ms();
+    while ((ESP_ERR_ESPNOW_NO_MEM ==
+            (err = esp_now_send(peer, message.buf, message.len))) &&
+           (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
+        MICROPY_EVENT_POLL_HOOK;
+    }
+    check_esp_err(err);           // Will raise OSError if e != ESP_OK
+    // Increment the sent packet count. If peer_addr==NULL msg will be
+    // sent to all peers EXCEPT any broadcast or multicast addresses.
+    self->tx_packets += ((peer == NULL) ? self->peer_count : 1);
+    if (sync) {
+        // Wait for and tally all the expected responses from peers
+        _wait_for_pending_responses(self);
+    }
+    // Return False if sync and any peers did not respond.
+    return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
+
+// ### The ESP_Now send and recv callback routines
+//
+
+// Callback triggered when a sent packet is acknowledged by the peer (or not).
+// Just count the number of responses and number of failures.
+// These are used in the send() logic.
+STATIC void send_cb(
+    const uint8_t *mac_addr, esp_now_send_status_t status) {
+
+    esp_espnow_obj_t *self = _get_singleton();
+    self->tx_responses++;
+    if (status != ESP_NOW_SEND_SUCCESS) {
+        self->tx_failures++;
+    }
+}
+
+// Callback triggered when an ESP-Now packet is received.
+// Write the peer MAC address and the message into the recv_buffer as an
+// ESPNow packet.
+// If the buffer is full, drop the message and increment the dropped count.
+// Schedules the user callback if one has been registered (ESPNow.config()).
+STATIC void recv_cb(
+    const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
+
+    esp_espnow_obj_t *self = _get_singleton();
+    ringbuf_t *buf = self->recv_buffer;
+    // TODO: Test this works with ">".
+    if (sizeof(espnow_pkt_t) + msg_len >= ringbuf_free(buf)) {
+        self->dropped_rx_pkts++;
+        return;
+    }
+    espnow_hdr_t header;
+    header.magic = ESPNOW_MAGIC;
+    header.msg_len = msg_len;
+    #if MICROPY_ESPNOW_RSSI
+    header.rssi = _get_rssi_from_wifi_pkt(msg);
+    header.time_ms = mp_hal_ticks_ms();
+    #endif // MICROPY_ESPNOW_RSSI
+
+    ringbuf_write(buf, &header, sizeof(header));
+    ringbuf_write(buf, mac_addr, ESP_NOW_ETH_ALEN);
+    ringbuf_write(buf, msg, msg_len);
+    self->rx_packets++;
+    if (self->recv_cb != mp_const_none) {
+        mp_sched_schedule(self->recv_cb, self->recv_cb_arg);
+    }
+}
+
+// ### Peer Management Functions
+//
+
+// Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
+// Raise OSError if ESP-NOW functions are not initialised.
+// Raise ValueError if key is not a bytes-like object exactly 16 bytes long.
+STATIC mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
+    check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN)));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
+
+// Common code for add_peer() and mod_peer() to process the args and kw_args:
+// Raise ValueError if the LMK is not a bytes-like object of exactly 16 bytes.
+// Raise TypeError if invalid keyword args or too many positional args.
+// Return true if all args parsed correctly.
+STATIC bool _update_peer_info(
+    esp_now_peer_info_t *peer, size_t n_args,
+    const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    enum { ARG_lmk, ARG_channel, ARG_ifidx, ARG_encrypt };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_lmk, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_channel, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_ifidx, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_encrypt, 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);
+    if (args[ARG_lmk].u_obj != mp_const_none) {
+        mp_obj_t obj = args[ARG_lmk].u_obj;
+        peer->encrypt = mp_obj_is_true(obj);
+        if (peer->encrypt) {
+            // Key must be 16 bytes in length.
+            memcpy(peer->lmk,
+                _get_bytes_len(obj, ESP_NOW_KEY_LEN),
+                ESP_NOW_KEY_LEN);
+        }
+    }
+    if (args[ARG_channel].u_obj != mp_const_none) {
+        peer->channel = mp_obj_get_int(args[ARG_channel].u_obj);
+    }
+    if (args[ARG_ifidx].u_obj != mp_const_none) {
+        peer->ifidx = mp_obj_get_int(args[ARG_ifidx].u_obj);
+    }
+    if (args[ARG_encrypt].u_obj != mp_const_none) {
+        peer->encrypt = mp_obj_is_true(args[ARG_encrypt].u_obj);
+    }
+    return true;
+}
+
+// Update the cached peer count in self->peer_count;
+// The peer_count ignores broadcast and multicast addresses and is used for the
+// send() logic and is updated from add_peer(), mod_peer() and del_peer().
+STATIC void _update_peer_count() {
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+
+    esp_now_peer_info_t peer = {0};
+    bool from_head = true;
+    int count = 0;
+    // esp_now_fetch_peer() skips over any broadcast or multicast addresses
+    while (esp_now_fetch_peer(from_head, &peer) == ESP_OK) {
+        from_head = false;
+        if (++count >= ESP_NOW_MAX_TOTAL_PEER_NUM) {
+            break;          // Should not happen
+        }
+    }
+    self->peer_count = count;
+}
+
+// ESPNow.add_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]]) or
+// ESPNow.add_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False],
+//          [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
+// Positional args set to None will be left at defaults.
+// Raise OSError if ESPNow.init() has not been called.
+// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+// Raise TypeError if invalid keyword args or too many positional args.
+// Return None.
+STATIC mp_obj_t espnow_add_peer(
+    size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
+    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
+
+    check_esp_err(esp_now_add_peer(&peer));
+    _update_peer_count();
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
+
+// ESPNow.del_peer(peer_mac): Unregister peer_mac.
+// Raise OSError if ESPNow.init() has not been called.
+// Raise ValueError if peer is not a bytes-like objects or wrong length.
+// Return None.
+STATIC mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
+    uint8_t peer_addr[ESP_NOW_ETH_ALEN];
+    memcpy(peer_addr, _get_peer(peer), ESP_NOW_ETH_ALEN);
+
+    check_esp_err(esp_now_del_peer(peer_addr));
+    _update_peer_count();
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
+
+// Convert a peer_info struct to python tuple
+// Used by espnow_get_peer() and espnow_get_peers()
+static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
+    return NEW_TUPLE(
+        mp_obj_new_bytes(peer->peer_addr, MP_ARRAY_SIZE(peer->peer_addr)),
+        mp_obj_new_bytes(peer->lmk, MP_ARRAY_SIZE(peer->lmk)),
+        mp_obj_new_int(peer->channel),
+        mp_obj_new_int(peer->ifidx),
+        (peer->encrypt) ? mp_const_true : mp_const_false);
+}
+
+// ESPNow.get_peers(): Fetch peer_info records for all registered ESPNow peers.
+// Raise OSError if ESPNow.init() has not been called.
+// Return a tuple of tuples:
+//     ((peer_addr, lmk, channel, ifidx, encrypt),
+//      (peer_addr, lmk, channel, ifidx, encrypt), ...)
+STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
+    esp_espnow_obj_t *self = _get_singleton_initialised();
+
+    // Build and initialise the peer info tuple.
+    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->peer_count, NULL);
+    esp_now_peer_info_t peer = {0};
+    for (int i = 0; i < peerinfo_tuple->len; i++) {
+        int status = esp_now_fetch_peer((i == 0), &peer);
+        peerinfo_tuple->items[i] =
+            (status == ESP_OK ? _peer_info_to_tuple(&peer) : mp_const_none);
+    }
+
+    return peerinfo_tuple;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
+
+#if MICROPY_ESPNOW_EXTRA_PEER_METHODS
+// ESPNow.get_peer(peer_mac): Get the peer info for peer_mac as a tuple.
+// Raise OSError if ESPNow.init() has not been called.
+// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+// Return a tuple of (peer_addr, lmk, channel, ifidx, encrypt).
+STATIC mp_obj_t espnow_get_peer(mp_obj_t _, mp_obj_t arg1) {
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer(arg1), ESP_NOW_ETH_ALEN);
+
+    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+
+    return _peer_info_to_tuple(&peer);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
+
+// ESPNow.mod_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]]) or
+// ESPNow.mod_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False],
+//          [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
+// Positional args set to None will be left at current values.
+// Raise OSError if ESPNow.init() has not been called.
+// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+// Raise TypeError if invalid keyword args or too many positional args.
+// Return None.
+STATIC mp_obj_t espnow_mod_peer(
+    size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
+    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+
+    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
+
+    check_esp_err(esp_now_mod_peer(&peer));
+    _update_peer_count();
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
+
+// ESPNow.espnow_peer_count(): Get the number of registered peers.
+// Raise OSError if ESPNow.init() has not been called.
+// Return a tuple of (num_total_peers, num_encrypted_peers).
+STATIC mp_obj_t espnow_peer_count(mp_obj_t _) {
+    esp_now_peer_num_t peer_num = {0};
+    check_esp_err(esp_now_get_peer_num(&peer_num));
+
+    return NEW_TUPLE(
+        mp_obj_new_int(peer_num.total_num),
+        mp_obj_new_int(peer_num.encrypt_num));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_count_obj, espnow_peer_count);
+#endif
+
+STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&espnow_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&espnow_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on_recv), MP_ROM_PTR(&espnow_on_recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stats), MP_ROM_PTR(&espnow_stats_obj) },
+
+    // Send and receive messages
+    { MP_ROM_QSTR(MP_QSTR_recvinto), MP_ROM_PTR(&espnow_recvinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&espnow_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&espnow_any_obj) },
+
+    // Peer management functions
+    { MP_ROM_QSTR(MP_QSTR_set_pmk), MP_ROM_PTR(&espnow_set_pmk_obj) },
+    { MP_ROM_QSTR(MP_QSTR_add_peer), MP_ROM_PTR(&espnow_add_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_del_peer), MP_ROM_PTR(&espnow_del_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_peers), MP_ROM_PTR(&espnow_get_peers_obj) },
+    #if MICROPY_ESPNOW_EXTRA_PEER_METHODS
+    { MP_ROM_QSTR(MP_QSTR_mod_peer), MP_ROM_PTR(&espnow_mod_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_peer), MP_ROM_PTR(&espnow_get_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_peer_count), MP_ROM_PTR(&espnow_peer_count_obj) },
+    #endif // MICROPY_ESPNOW_EXTRA_PEER_METHODS
+};
+STATIC MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
+
+STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__espnow) },
+    { MP_ROM_QSTR(MP_QSTR_ESPNow), MP_ROM_PTR(&esp_espnow_type) },
+    { MP_ROM_QSTR(MP_QSTR_MAX_DATA_LEN), MP_ROM_INT(ESP_NOW_MAX_DATA_LEN)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_ALEN), MP_ROM_INT(ESP_NOW_ETH_ALEN)},
+    { MP_ROM_QSTR(MP_QSTR_KEY_LEN), MP_ROM_INT(ESP_NOW_KEY_LEN)},
+    { MP_ROM_QSTR(MP_QSTR_MAX_TOTAL_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_TOTAL_PEER_NUM)},
+    { MP_ROM_QSTR(MP_QSTR_MAX_ENCRYPT_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_ENCRYPT_PEER_NUM)},
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
+
+// ### Dummy Buffer Protocol support
+// ...so asyncio can poll.ipoll() on this device
+
+// Support ioctl(MP_STREAM_POLL, ) for asyncio
+STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request,
+    uintptr_t arg, int *errcode) {
+    if (request != MP_STREAM_POLL) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+    esp_espnow_obj_t *self = _get_singleton();
+    return (self->recv_buffer == NULL) ? 0 :  // If not initialised
+           arg ^ (
+               // If no data in the buffer, unset the Read ready flag
+               ((ringbuf_avail(self->recv_buffer) == 0) ? MP_STREAM_POLL_RD : 0) |
+               // If still waiting for responses, unset the Write ready flag
+               ((self->tx_responses < self->tx_packets) ? MP_STREAM_POLL_WR : 0));
+}
+
+STATIC const mp_stream_p_t espnow_stream_p = {
+    .ioctl = espnow_stream_ioctl,
+};
+
+#if MICROPY_ESPNOW_RSSI
+// Return reference to the dictionary of peers we have seen:
+//   {peer1: (rssi, time_sec), peer2: (rssi, time_msec), ...}
+// where:
+//   peerX is a byte string containing the 6-byte mac address of the peer,
+//   rssi is the wifi signal strength from the last msg received
+//       (in dBm from -127 to 0)
+//   time_sec is the time in milliseconds since device last booted.
+STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    esp_espnow_obj_t *self = _get_singleton();
+    if (dest[0] != MP_OBJ_NULL) {   // Only allow "Load" operation
+        return;
+    }
+    if (attr == MP_QSTR_peers_table) {
+        dest[0] = self->peers_table;
+        return;
+    }
+    dest[1] = MP_OBJ_SENTINEL;  // Attribute not found
+}
+#endif // MICROPY_ESPNOW_RSSI
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp_espnow_type,
+    MP_QSTR_ESPNow,
+    MP_TYPE_FLAG_NONE,
+    make_new, espnow_make_new,
+    #if MICROPY_ESPNOW_RSSI
+    attr, espnow_attr,
+    #endif // MICROPY_ESPNOW_RSSI
+    protocol, &espnow_stream_p,
+    locals_dict, &esp_espnow_locals_dict
+    );
+
+const mp_obj_module_t mp_module_espnow = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&espnow_globals_dict,
+};
+
+MP_REGISTER_MODULE(MP_QSTR__espnow, mp_module_espnow);
+MP_REGISTER_ROOT_POINTER(struct _esp_espnow_obj_t *espnow_singleton);
diff --git a/ports/espressif/bindings/espnow/ESPNow.h b/ports/espressif/bindings/espnow/ESPNow.h
new file mode 100644
index 0000000000..3c6280b1ce
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNow.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Glenn Moloney @glenn20
+ *
+ * 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"
+
+// Called from main.c:mp_task() to reset the espnow software stack
+mp_obj_t espnow_deinit(mp_obj_t _);

From 7330c638b9abe1e84b4b6d45f2c0c78179985aea Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 20 Jan 2023 13:27:00 +0530
Subject: [PATCH 1709/2403] minimal changes to make espnow work

---
 locale/circuitpython.pot                      |  33 ++++++
 ports/espressif/Makefile                      |   5 +
 ports/espressif/bindings/espnow/ESPNow.c      | 109 ++++++++++++------
 ports/espressif/bindings/espnow/ESPNow.h      |   7 +-
 .../common-hal/_bleio/CharacteristicBuffer.c  |   9 +-
 .../espressif/common-hal/_bleio/Connection.c  |   7 +-
 .../common-hal/_bleio/PacketBuffer.c          |   7 +-
 ports/espressif/mpconfigport.h                |  18 +--
 ports/espressif/mpconfigport.mk               |   1 +
 ports/espressif/supervisor/port.c             |   5 +
 py/circuitpy_mpconfig.mk                      |   3 +
 py/ringbuf.c                                  |  44 +++++++
 py/ringbuf.h                                  |  10 ++
 13 files changed, 203 insertions(+), 55 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b98bddec50..33effc9612 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -663,6 +663,7 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -917,6 +918,18 @@ msgstr ""
 msgid "ESP-IDF memory allocation failed"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "ESPNow.recv(): buffer error"
+msgstr ""
+
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "ESPNow.recvinto(): Invalid argument"
+msgstr ""
+
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "ESPNow: bytes or bytearray wrong length"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 #: ports/atmel-samd/common-hal/ps2io/Ps2.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -2429,6 +2442,10 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "an error occured"
+msgstr ""
+
 #: py/compile.c
 msgid "annotation must be an identifier"
 msgstr ""
@@ -2953,6 +2970,10 @@ msgid ""
 "documentation for instructions."
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "espnow not inited"
+msgstr ""
+
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
@@ -3314,6 +3335,10 @@ msgstr ""
 msgid "invalid format specifier"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "invalid handler"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "invalid hostname"
 msgstr ""
@@ -3858,6 +3883,10 @@ msgstr ""
 msgid "queue overflow"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "rate option not supported"
+msgstr ""
+
 #: py/parse.c
 msgid "raw f-strings are not supported"
 msgstr ""
@@ -4153,6 +4182,10 @@ msgstr ""
 msgid "unindent doesn't match any outer indent level"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "unknown config param"
+msgstr ""
+
 #: py/objstr.c
 #, c-format
 msgid "unknown conversion specifier %c"
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index ddfcaeeb6e..92e91e808a 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -259,6 +259,11 @@ CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
+ifneq ($(CIRCUITPY_ESPNOW),0)
+SRC_ESPNOW := $(wildcard bindings/espnow/*.c)
+SRC_C += $(SRC_ESPNOW)
+endif
+
 ifneq ($(CIRCUITPY_ESPULP),0)
 SRC_ULP := \
 	$(wildcard common-hal/espulp/*.c) \
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 0e9da4fc1b..33cf2342b8 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2017-2020 Nick Moore
  * Copyright (c) 2018 shawwwn 
  * Copyright (c) 2020-2021 Glenn Moloney @glenn20
+ * Copyright (c) 2023 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
@@ -26,7 +27,6 @@
  * THE SOFTWARE.
  */
 
-
 #include 
 #include 
 #include 
@@ -48,8 +48,10 @@
 
 #include "mpconfigport.h"
 #include "mphalport.h"
-#include "modnetwork.h"
-#include "modespnow.h"
+
+#include "bindings/espnow/ESPNow.h"
+
+#include "shared-bindings/wifi/__init__.h"
 
 #ifndef MICROPY_ESPNOW_RSSI
 // Include code to track rssi of peers
@@ -115,14 +117,22 @@ typedef struct _esp_espnow_obj_t {
     volatile size_t tx_responses;   // # of sent packet responses received
     volatile size_t tx_failures;    // # of sent packet responses failed
     size_t peer_count;              // Cache the # of peers for send(sync=True)
+    #if MICROPY_ENABLE_SCHEDULER
     mp_obj_t recv_cb;               // Callback when a packet is received
     mp_obj_t recv_cb_arg;           // Argument passed to callback
+    #endif
     #if MICROPY_ESPNOW_RSSI
     mp_obj_t peers_table;           // A dictionary of discovered peers
     #endif // MICROPY_ESPNOW_RSSI
 } esp_espnow_obj_t;
 
-const mp_obj_type_t esp_espnow_type;
+static const mp_obj_type_t esp_espnow_type;
+
+static void check_esp_err(esp_err_t status) {
+    if (status != ESP_OK) {
+        mp_raise_RuntimeError(translate("an error occured"));
+    }
+}
 
 // ### Initialisation and Config functions
 //
@@ -130,16 +140,17 @@ const mp_obj_type_t esp_espnow_type;
 // Return a pointer to the ESPNow module singleton
 // If state == INITIALISED check the device has been initialised.
 // Raises OSError if not initialised and state == INITIALISED.
-static esp_espnow_obj_t *_get_singleton() {
+static esp_espnow_obj_t *_get_singleton(void) {
     return MP_STATE_PORT(espnow_singleton);
 }
 
-static esp_espnow_obj_t *_get_singleton_initialised() {
+static esp_espnow_obj_t *_get_singleton_initialised(void) {
     esp_espnow_obj_t *self = _get_singleton();
     // assert(self);
     if (self->recv_buffer == NULL) {
         // Throw an espnow not initialised error
-        check_esp_err(ESP_ERR_ESPNOW_NOT_INIT);
+        // check_esp_err(ESP_ERR_ESPNOW_NOT_INIT);
+        mp_raise_RuntimeError(translate("espnow not inited"));
     }
     return self;
 }
@@ -163,7 +174,9 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
     self->recv_buffer_size = DEFAULT_RECV_BUFFER_SIZE;
     self->recv_timeout_ms = DEFAULT_RECV_TIMEOUT_MS;
     self->recv_buffer = NULL;       // Buffer is allocated in espnow_init()
+    #if MICROPY_ENABLE_SCHEDULER
     self->recv_cb = mp_const_none;
+    #endif
     #if MICROPY_ESPNOW_RSSI
     self->peers_table = mp_obj_new_dict(0);
     // Prevent user code modifying the dict
@@ -181,29 +194,38 @@ STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
 
 STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *data, int len);
 
+static void _wifi_init(void) {
+    if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+        common_hal_wifi_init(false);
+        common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
+    }
+}
+
 // ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
 // Initialise the Espressif ESPNOW software stack, register callbacks and
 // allocate the recv data buffers.
 // Returns None.
-static mp_obj_t espnow_init(mp_obj_t _) {
+static void espnow_init(void) {
     esp_espnow_obj_t *self = _get_singleton();
     if (self->recv_buffer == NULL) {    // Already initialised
         self->recv_buffer = m_new_obj(ringbuf_t);
-        ringbuf_alloc(self->recv_buffer, self->recv_buffer_size);
+        if (!ringbuf_alloc(self->recv_buffer, self->recv_buffer_size, true)) {
+            m_malloc_fail(self->recv_buffer_size);
+        }
+
+        _wifi_init();   // Call the wifi init code
 
-        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
         check_esp_err(esp_now_init());
         check_esp_err(esp_now_register_recv_cb(recv_cb));
         check_esp_err(esp_now_register_send_cb(send_cb));
     }
-    return mp_const_none;
 }
 
 // ESPNow.deinit(): De-initialise the ESPNOW software stack, disable callbacks
 // and deallocate the recv data buffers.
 // Note: this function is called from main.c:mp_task() to cleanup before soft
 // reset, so cannot be declared STATIC and must guard against self == NULL;.
-mp_obj_t espnow_deinit(mp_obj_t _) {
+static void espnow_deinit(void) {
     esp_espnow_obj_t *self = _get_singleton();
     if (self != NULL && self->recv_buffer != NULL) {
         check_esp_err(esp_now_unregister_recv_cb());
@@ -214,16 +236,20 @@ mp_obj_t espnow_deinit(mp_obj_t _) {
         self->peer_count = 0; // esp_now_deinit() removes all peers.
         self->tx_packets = self->tx_responses;
     }
-    return mp_const_none;
+}
+
+void espnow_reset(void) {
+    espnow_deinit();
+    MP_STATE_PORT(espnow_singleton) = NULL;
 }
 
 STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton();
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
-            espnow_init(self);
+            espnow_init();
         } else {
-            espnow_deinit(self);
+            espnow_deinit();
         }
     }
     return self->recv_buffer != NULL ? mp_const_true : mp_const_false;
@@ -257,7 +283,7 @@ STATIC mp_obj_t espnow_config(
     }
     if (args[ARG_rate].u_int >= 0) {
         #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
-        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
+        _wifi_init();  // Call the wifi init code
         check_esp_err(esp_wifi_config_espnow_rate(
             ESP_IF_WIFI_STA, args[ARG_rate].u_int));
         check_esp_err(esp_wifi_config_espnow_rate(
@@ -288,6 +314,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
 // ESPNow.on_recv(recv_cb)
 // Set callback function to be invoked when a message is received.
 STATIC mp_obj_t espnow_on_recv(size_t n_args, const mp_obj_t *args) {
+    #if MICROPY_ENABLE_SCHEDULER
     esp_espnow_obj_t *self = _get_singleton();
     mp_obj_t recv_cb = args[1];
     if (recv_cb != mp_const_none && !mp_obj_is_callable(recv_cb)) {
@@ -295,6 +322,9 @@ STATIC mp_obj_t espnow_on_recv(size_t n_args, const mp_obj_t *args) {
     }
     self->recv_cb = recv_cb;
     self->recv_cb_arg = (n_args > 2) ? args[2] : mp_const_none;
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_on_recv_obj, 2, 3, espnow_on_recv);
@@ -329,9 +359,11 @@ static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
     // and a espnow_frame_format_t.
     // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
     static const size_t sizeof_espnow_frame_format = 39;
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
     wifi_promiscuous_pkt_t *wifi_pkt = (wifi_promiscuous_pkt_t *)(
         msg - sizeof_espnow_frame_format - sizeof(wifi_promiscuous_pkt_t));
-
+    #pragma GCC diagnostic pop
     #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0)
     return wifi_pkt->rx_ctrl.rssi - 100;  // Offset rssi for IDF 4.0.2
     #else
@@ -411,13 +443,13 @@ static const uint8_t *_get_peer(mp_obj_t mac_addr) {
 }
 
 // Copy data from the ring buffer - wait if buffer is empty up to timeout_ms
-int ringbuf_read_wait(ringbuf_t *r, void *data, size_t len, int timeout_ms) {
+static int ringbuf_read_wait(ringbuf_t *r, void *data, size_t len, int timeout_ms) {
     int64_t end = mp_hal_ticks_ms() + timeout_ms;
     int status = 0;
     while (
         ((status = ringbuf_read(r, data, len)) == 0) &&
         (end - (int64_t)mp_hal_ticks_ms()) >= 0) {
-        MICROPY_EVENT_POLL_HOOK;
+        RUN_BACKGROUND_TASKS;
     }
     return status;
 }
@@ -437,7 +469,7 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
-            ? mp_obj_get_int(args[2]) : self->recv_timeout_ms);
+            ? (size_t)mp_obj_get_int(args[2]) : self->recv_timeout_ms);
 
     mp_obj_list_t *list = MP_OBJ_TO_PTR(args[1]);
     if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
@@ -510,7 +542,7 @@ static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
         }
         if (t > PENDING_RESPONSES_BUSY_POLL_MS) {
             // After 10ms of busy waiting give other tasks a look in.
-            MICROPY_EVENT_POLL_HOOK;
+            RUN_BACKGROUND_TASKS;
         }
     }
 }
@@ -545,14 +577,14 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
         // call has sync=True.
         _wait_for_pending_responses(self);
     }
-    int saved_failures = self->tx_failures;
+    size_t saved_failures = self->tx_failures;
     // Send the packet - try, try again if internal esp-now buffers are full.
     esp_err_t err;
     int64_t start = mp_hal_ticks_ms();
     while ((ESP_ERR_ESPNOW_NO_MEM ==
             (err = esp_now_send(peer, message.buf, message.len))) &&
            (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
-        MICROPY_EVENT_POLL_HOOK;
+        RUN_BACKGROUND_TASKS;
     }
     check_esp_err(err);           // Will raise OSError if e != ESP_OK
     // Increment the sent packet count. If peer_addr==NULL msg will be
@@ -610,9 +642,11 @@ STATIC void recv_cb(
     ringbuf_write(buf, mac_addr, ESP_NOW_ETH_ALEN);
     ringbuf_write(buf, msg, msg_len);
     self->rx_packets++;
+    #if MICROPY_ENABLE_SCHEDULER
     if (self->recv_cb != mp_const_none) {
         mp_sched_schedule(self->recv_cb, self->recv_cb_arg);
     }
+    #endif
 }
 
 // ### Peer Management Functions
@@ -670,7 +704,7 @@ STATIC bool _update_peer_info(
 // Update the cached peer count in self->peer_count;
 // The peer_count ignores broadcast and multicast addresses and is used for the
 // send() logic and is updated from add_peer(), mod_peer() and del_peer().
-STATIC void _update_peer_count() {
+STATIC void _update_peer_count(void) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     esp_now_peer_info_t peer = {0};
@@ -745,8 +779,8 @@ STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
     // Build and initialise the peer info tuple.
     mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->peer_count, NULL);
     esp_now_peer_info_t peer = {0};
-    for (int i = 0; i < peerinfo_tuple->len; i++) {
-        int status = esp_now_fetch_peer((i == 0), &peer);
+    for (size_t i = 0; i < peerinfo_tuple->len; i++) {
+        esp_err_t status = esp_now_fetch_peer((i == 0), &peer);
         peerinfo_tuple->items[i] =
             (status == ESP_OK ? _peer_info_to_tuple(&peer) : mp_const_none);
     }
@@ -887,22 +921,23 @@ STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif // MICROPY_ESPNOW_RSSI
 
-MP_DEFINE_CONST_OBJ_TYPE(
-    esp_espnow_type,
-    MP_QSTR_ESPNow,
-    MP_TYPE_FLAG_NONE,
-    make_new, espnow_make_new,
+STATIC const mp_obj_type_t esp_espnow_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ESPNow,
+    .make_new = espnow_make_new,
+    .locals_dict = (mp_obj_t)&esp_espnow_locals_dict,
     #if MICROPY_ESPNOW_RSSI
-    attr, espnow_attr,
+    .attr = espnow_attr,
     #endif // MICROPY_ESPNOW_RSSI
-    protocol, &espnow_stream_p,
-    locals_dict, &esp_espnow_locals_dict
-    );
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    MP_TYPE_EXTENDED_FIELDS(
+        .protocol = &espnow_stream_p,
+        ),
+};
 
 const mp_obj_module_t mp_module_espnow = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&espnow_globals_dict,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__espnow, mp_module_espnow);
-MP_REGISTER_ROOT_POINTER(struct _esp_espnow_obj_t *espnow_singleton);
+MP_REGISTER_MODULE(MP_QSTR__espnow, mp_module_espnow, CIRCUITPY_ESPNOW);
diff --git a/ports/espressif/bindings/espnow/ESPNow.h b/ports/espressif/bindings/espnow/ESPNow.h
index 3c6280b1ce..9855cd4ff8 100644
--- a/ports/espressif/bindings/espnow/ESPNow.h
+++ b/ports/espressif/bindings/espnow/ESPNow.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2021 Glenn Moloney @glenn20
+ * Copyright (c) 2023 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,7 +25,5 @@
  * THE SOFTWARE.
  */
 
-#include "py/obj.h"
-
-// Called from main.c:mp_task() to reset the espnow software stack
-mp_obj_t espnow_deinit(mp_obj_t _);
+#pragma once
+void espnow_reset(void);
diff --git a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
index 48be3abd67..8edb40ca85 100644
--- a/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
@@ -27,17 +27,20 @@
 #include 
 #include 
 
-#include "shared/runtime/interrupt_char.h"
 #include "py/ringbuf.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 
+#include "shared/runtime/interrupt_char.h"
+
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Connection.h"
-#include "supervisor/shared/tick.h"
-#include "common-hal/_bleio/CharacteristicBuffer.h"
 #include "shared-bindings/_bleio/CharacteristicBuffer.h"
 
+#include "supervisor/shared/tick.h"
+
+#include "common-hal/_bleio/ble_events.h"
+
 STATIC int characteristic_buffer_on_ble_evt(struct ble_gap_event *event, void *param) {
     bleio_characteristic_buffer_obj_t *self = (bleio_characteristic_buffer_obj_t *)param;
     switch (event->type) {
diff --git a/ports/espressif/common-hal/_bleio/Connection.c b/ports/espressif/common-hal/_bleio/Connection.c
index 63c85099e6..75def8ad76 100644
--- a/ports/espressif/common-hal/_bleio/Connection.c
+++ b/ports/espressif/common-hal/_bleio/Connection.c
@@ -30,21 +30,24 @@
 #include 
 #include 
 
-#include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"
 #include "py/objlist.h"
 #include "py/objstr.h"
 #include "py/qstr.h"
 #include "py/runtime.h"
+
+#include "shared/runtime/interrupt_char.h"
+
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Adapter.h"
 #include "shared-bindings/_bleio/Attribute.h"
 #include "shared-bindings/_bleio/Characteristic.h"
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
+
 #include "supervisor/shared/tick.h"
 
-// #include "common-hal/_bleio/bonding.h"
+#include "common-hal/_bleio/ble_events.h"
 
 #include "host/ble_att.h"
 
diff --git a/ports/espressif/common-hal/_bleio/PacketBuffer.c b/ports/espressif/common-hal/_bleio/PacketBuffer.c
index 3b3e51df61..d1d8c24123 100644
--- a/ports/espressif/common-hal/_bleio/PacketBuffer.c
+++ b/ports/espressif/common-hal/_bleio/PacketBuffer.c
@@ -27,17 +27,20 @@
 #include 
 #include 
 
-#include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 
+#include "shared/runtime/interrupt_char.h"
+
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Connection.h"
 #include "shared-bindings/_bleio/PacketBuffer.h"
-#include "supervisor/shared/tick.h"
 
+#include "supervisor/shared/tick.h"
 #include "supervisor/shared/bluetooth/serial.h"
 
+#include "common-hal/_bleio/ble_events.h"
+
 #include "host/ble_att.h"
 
 STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, const struct os_mbuf *mbuf) {
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index c296be2024..8c206cf02a 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -38,18 +38,22 @@
 #include "py/circuitpy_mpconfig.h"
 
 #if CIRCUITPY_BLEIO
-#include "common-hal/_bleio/ble_events.h"
+#define BLEIO_ROOT_POINTERS struct ble_event_handler_entry *ble_event_handler_entries;
+#else
+#define BLEIO_ROOT_POINTERS
 #endif
 
-#if CIRCUITPY_BLEIO
-#define MICROPY_PORT_ROOT_POINTERS                              \
-    CIRCUITPY_COMMON_ROOT_POINTERS                              \
-    ble_event_handler_entry_t *ble_event_handler_entries;
+#if CIRCUITPY_ESPNOW
+#define ESPNOW_ROOT_POINTERS struct _esp_espnow_obj_t *espnow_singleton;
 #else
-#define MICROPY_PORT_ROOT_POINTERS \
-    CIRCUITPY_COMMON_ROOT_POINTERS
+#define ESPNOW_ROOT_POINTERS
 #endif
 
+#define MICROPY_PORT_ROOT_POINTERS  \
+    CIRCUITPY_COMMON_ROOT_POINTERS  \
+    BLEIO_ROOT_POINTERS             \
+    ESPNOW_ROOT_POINTERS
+
 #define MICROPY_NLR_SETJMP                  (1)
 #define CIRCUITPY_DEFAULT_STACK_SIZE        0x6000
 
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index c5c73c77bd..035fa75278 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -81,6 +81,7 @@ CIRCUITPY_DUALBANK = 0
 endif
 
 # Modules dependent on other modules
+CIRCUITPY_ESPNOW ?= $(CIRCUITPY_WIFI)
 CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESP32_CAMERA)
 CIRCUITPY_QRIO ?= $(CIRCUITPY_ESP32_CAMERA)
 
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 6dd09ed238..8a6dfabb5f 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -37,6 +37,7 @@
 #include "freertos/task.h"
 
 #include "bindings/espidf/__init__.h"
+#include "bindings/espnow/ESPNow.h"
 #include "bindings/espulp/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"
@@ -369,6 +370,10 @@ void reset_port(void) {
     dualbank_reset();
     #endif
 
+    #if CIRCUITPY_ESPNOW
+    espnow_reset();
+    #endif
+
     #if CIRCUITPY_ESPULP
     espulp_reset();
     #endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 3c1c173a51..03ff0f9d95 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -227,6 +227,9 @@ CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
+CIRCUITPY_ESPNOW ?= 0
+CFLAGS += -DCIRCUITPY_ESPNOW=$(CIRCUITPY_ESPNOW)
+
 CIRCUITPY_ESPULP ?= 0
 CFLAGS += -DCIRCUITPY_ESPULP=$(CIRCUITPY_ESPULP)
 
diff --git a/py/ringbuf.c b/py/ringbuf.c
index 8a4cb33cbc..f90805d6f3 100644
--- a/py/ringbuf.c
+++ b/py/ringbuf.c
@@ -142,3 +142,47 @@ int ringbuf_put16(ringbuf_t *r, uint16_t v) {
     ringbuf_put(r, v & 0xff);
     return 0;
 }
+
+// Returns:
+//    1: Success
+//    0: Not enough data available to complete read (try again later)
+//   -1: Requested read is larger than buffer - will never succeed
+int ringbuf_read(ringbuf_t *r, void *data, size_t data_len) {
+    if (ringbuf_avail(r) < data_len) {
+        return (r->size <= data_len) ? -1 : 0;
+    }
+    uint32_t iget = r->next_read;
+    uint32_t iget_a = (iget + data_len) % r->size;
+    uint8_t *datap = data;
+    if (iget_a < iget) {
+        // Copy part of the data from the space left at the end of the buffer
+        memcpy(datap, r->buf + iget, r->size - iget);
+        datap += (r->size - iget);
+        iget = 0;
+    }
+    memcpy(datap, r->buf + iget, iget_a - iget);
+    r->next_read = iget_a;
+    return 1;
+}
+
+// Returns:
+//    1: Success
+//    0: Not enough free space available to complete write (try again later)
+//   -1: Requested write is larger than buffer - will never succeed
+int ringbuf_write(ringbuf_t *r, const void *data, size_t data_len) {
+    if (ringbuf_free(r) < data_len) {
+        return (r->size <= data_len) ? -1 : 0;
+    }
+    uint32_t iput = r->next_write;
+    uint32_t iput_a = (iput + data_len) % r->size;
+    const uint8_t *datap = data;
+    if (iput_a < iput) {
+        // Copy part of the data to the end of the buffer
+        memcpy(r->buf + iput, datap, r->size - iput);
+        datap += (r->size - iput);
+        iput = 0;
+    }
+    memcpy(r->buf + iput, datap, iput_a - iput);
+    r->next_write = iput_a;
+    return 1;
+}
diff --git a/py/ringbuf.h b/py/ringbuf.h
index 2725bedcca..5d54abc6b5 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -61,5 +61,15 @@ size_t ringbuf_get_n(ringbuf_t *r, uint8_t *buf, size_t bufsize);
 // Note: big-endian. Return -1 if can't read or write two bytes.
 int ringbuf_get16(ringbuf_t *r);
 int ringbuf_put16(ringbuf_t *r, uint16_t v);
+int ringbuf_read(ringbuf_t *r, void *data, size_t data_len);
+int ringbuf_write(ringbuf_t *r, const void *data, size_t data_len);
+
+static inline size_t ringbuf_free(ringbuf_t *r) {
+    return (r->size + r->next_read - r->next_write - 1) % r->size;
+}
+
+static inline size_t ringbuf_avail(ringbuf_t *r) {
+    return (r->size + r->next_write - r->next_read) % r->size;
+}
 
 #endif // MICROPY_INCLUDED_PY_RINGBUF_H

From e474df3a184eda70cc0a54e596e7533f65704ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Soko=C5=82owski?= 
Date: Fri, 20 Jan 2023 23:14:38 +0100
Subject: [PATCH 1710/2403] Add function for drawing polygons to bitmaptools

---
 locale/circuitpython.pot               |   8 ++
 shared-bindings/bitmaptools/__init__.c |  64 +++++++++++++++
 shared-bindings/bitmaptools/__init__.h |   1 +
 shared-module/bitmaptools/__init__.c   | 106 ++++++++++++++++++-------
 4 files changed, 152 insertions(+), 27 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b98bddec50..6f7d0f773a 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -814,6 +814,14 @@ msgid ""
 "connection."
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 4d968db717..d7bd85ddd3 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -522,6 +522,69 @@ STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_arg
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_line);
 // requires all 6 arguments
 
+//| def draw_polygon(
+//|     dest_bitmap: displayio.Bitmap,
+//|     xs: ReadableBuffer,
+//|     ys: ReadableBuffer,
+//|     value: int,
+//|     close: Optional[bool] = True,
+//| ) -> None:
+//|     """Draw a polygon conecting points on provided bitmap with provided value
+//|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be written into
+//|     :param int xs: x-pixel position of the polygon's vertices
+//|     :param int ys: y-pixel position of the polygon's vertices
+//|     :param int value: Bitmap palette index that will be written into the
+//|            line in the destination bitmap
+//|     :param bool close: (Optional) Wether to connect first and last point. (True)
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t bitmaptools_obj_draw_polygon(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {ARG_dest_bitmap, ARG_xs, ARG_ys, ARG_value, ARG_close};
+
+    static const mp_arg_t allowed_args[] = {
+        {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_xs, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_ys, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_close, 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);
+
+    displayio_bitmap_t *destination = MP_OBJ_TO_PTR(args[ARG_dest_bitmap].u_obj);     // the destination bitmap
+
+    mp_buffer_info_t xs_buf, ys_buf;
+    mp_get_buffer_raise(args[ARG_xs].u_obj, &xs_buf, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[ARG_ys].u_obj, &ys_buf, MP_BUFFER_READ);
+    size_t xs_size = mp_binary_get_size('@', xs_buf.typecode, NULL);
+    size_t ys_size = mp_binary_get_size('@', ys_buf.typecode, NULL);
+    size_t xs_len = xs_buf.len / xs_size;
+    size_t ys_len = ys_buf.len / ys_size;
+    if (xs_size != ys_size) {
+        mp_raise_ValueError(translate("Coordinate arrays types have different sizes"));
+    }
+    if (xs_len != ys_len) {
+        mp_raise_ValueError(translate("Coordinate arrays have different lengths"));
+    }
+
+    uint32_t value, color_depth;
+    value = args[ARG_value].u_int;
+    color_depth = (1 << destination->bits_per_value);
+    if (color_depth <= value) {
+        mp_raise_ValueError(translate("out of range of target"));
+    }
+
+    bool close = args[ARG_close].u_bool;
+
+    common_hal_bitmaptools_draw_polygon(destination, xs_buf.buf, ys_buf.buf, xs_len, xs_size, value, close);
+
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_polygon_obj, 0, bitmaptools_obj_draw_polygon);
+
 //| def arrayblit(
 //|     bitmap: displayio.Bitmap,
 //|     data: ReadableBuffer,
@@ -783,6 +846,7 @@ STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_fill_region), MP_ROM_PTR(&bitmaptools_fill_region_obj) },
     { MP_ROM_QSTR(MP_QSTR_boundary_fill), MP_ROM_PTR(&bitmaptools_boundary_fill_obj) },
     { MP_ROM_QSTR(MP_QSTR_draw_line), MP_ROM_PTR(&bitmaptools_draw_line_obj) },
+    { MP_ROM_QSTR(MP_QSTR_draw_polygon), MP_ROM_PTR(&bitmaptools_draw_polygon_obj) },
     { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&bitmaptools_dither_obj) },
     { MP_ROM_QSTR(MP_QSTR_DitherAlgorithm), MP_ROM_PTR(&bitmaptools_dither_algorithm_type) },
 };
diff --git a/shared-bindings/bitmaptools/__init__.h b/shared-bindings/bitmaptools/__init__.h
index fb5c78911f..db72410cf6 100644
--- a/shared-bindings/bitmaptools/__init__.h
+++ b/shared-bindings/bitmaptools/__init__.h
@@ -64,6 +64,7 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
     int16_t x1, int16_t y1,
     uint32_t value);
 
+void common_hal_bitmaptools_draw_polygon(displayio_bitmap_t *destination, void *xs, void *ys, size_t points_len, int point_size, uint32_t value, bool close);
 void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, mp_obj_t *file, int element_size, int bits_per_pixel, bool reverse_pixels_in_word, bool swap_bytes, bool reverse_rows);
 void common_hal_bitmaptools_arrayblit(displayio_bitmap_t *self, void *data, int element_size, int x1, int y1, int x2, int y2, bool skip_specified, uint32_t skip_index);
 void common_hal_bitmaptools_dither(displayio_bitmap_t *dest_bitmap, displayio_bitmap_t *source_bitmap, displayio_colorspace_t colorspace, bitmaptools_dither_algorithm_t algorithm);
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index dbf5a9ef96..6818316768 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -384,37 +384,11 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
 
 }
 
-void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
+STATIC void draw_line(displayio_bitmap_t *destination,
     int16_t x0, int16_t y0,
     int16_t x1, int16_t y1,
     uint32_t value) {
 
-    //
-    // adapted from Adafruit_CircuitPython_Display_Shapes.Polygon._line
-    //
-
-    // update the dirty rectangle
-    int16_t xbb0, xbb1, ybb0, ybb1;
-    if (x0 < x1) {
-        xbb0 = x0;
-        xbb1 = x1 + 1;
-    } else {
-        xbb0 = x1;
-        xbb1 = x0 + 1;
-    }
-    if (y0 < y1) {
-        ybb0 = y0;
-        ybb1 = y1 + 1;
-    } else {
-        ybb0 = y1;
-        ybb1 = y0 + 1;
-    }
-    displayio_area_t area = { xbb0, ybb0, xbb1, ybb1, NULL };
-    displayio_area_t bitmap_area = { 0, 0, destination->width, destination->height, NULL };
-    displayio_area_compute_overlap(&area, &bitmap_area, &area);
-
-    displayio_bitmap_set_dirty_area(destination, &area);
-
     int16_t temp, x, y;
 
     if (x0 == x1) { // vertical line
@@ -488,6 +462,84 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
     }
 }
 
+void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
+    int16_t x0, int16_t y0,
+    int16_t x1, int16_t y1,
+    uint32_t value) {
+
+    //
+    // adapted from Adafruit_CircuitPython_Display_Shapes.Polygon._line
+    //
+
+    // update the dirty rectangle
+    int16_t xbb0, xbb1, ybb0, ybb1;
+    if (x0 < x1) {
+        xbb0 = x0;
+        xbb1 = x1 + 1;
+    } else {
+        xbb0 = x1;
+        xbb1 = x0 + 1;
+    }
+    if (y0 < y1) {
+        ybb0 = y0;
+        ybb1 = y1 + 1;
+    } else {
+        ybb0 = y1;
+        ybb1 = y0 + 1;
+    }
+    displayio_area_t area = { xbb0, ybb0, xbb1, ybb1, NULL };
+    displayio_area_t bitmap_area = { 0, 0, destination->width, destination->height, NULL };
+    displayio_area_compute_overlap(&area, &bitmap_area, &area);
+
+    displayio_bitmap_set_dirty_area(destination, &area);
+
+    draw_line(destination, x0, y0, x1, y1, value);
+}
+
+STATIC int32_t ith(void *data, size_t i, int element_size) {
+    switch (element_size) {
+        default:
+        case 1:
+            return *((int8_t *)data + i);
+        case 2:
+            return *((int16_t *)data + i);
+        case 4:
+            return *((int32_t *)data + i);
+    }
+}
+
+void common_hal_bitmaptools_draw_polygon(displayio_bitmap_t *destination, void *xs, void *ys, size_t points_len, int point_size, uint32_t value, bool close) {
+    int16_t x0, y0, xmin, xmax, ymin, ymax, xprev, yprev, x, y;
+    x0 = ith(xs, 0, point_size);
+    xmin = x0;
+    xmax = x0;
+    xprev = x0;
+    y0 = ith(ys, 0, point_size);
+    ymin = y0;
+    ymax = y0;
+    yprev = y0;
+
+    for (size_t i = 1; i < points_len; i++) {
+        x = ith(xs, i, point_size);
+        y = ith(ys, i, point_size);
+        draw_line(destination, xprev, yprev, x, y, value);
+        xprev = x;
+        yprev = y;
+        xmin = MIN(xmin, x);
+        xmax = MAX(xmax, x);
+        ymin = MIN(ymin, y);
+        ymax = MAX(ymax, y);
+    }
+    if (close) {
+        draw_line(destination, xprev, yprev, x0, y0, value);
+    }
+
+    displayio_area_t area = { xmin, ymin, xmax, ymax, NULL };
+    displayio_area_t bitmap_area = { 0, 0, destination->width, destination->height, NULL };
+    displayio_area_compute_overlap(&area, &bitmap_area, &area);
+    displayio_bitmap_set_dirty_area(destination, &area);
+}
+
 void common_hal_bitmaptools_arrayblit(displayio_bitmap_t *self, void *data, int element_size, int x1, int y1, int x2, int y2, bool skip_specified, uint32_t skip_value) {
     uint32_t mask = (1 << common_hal_displayio_bitmap_get_bits_per_value(self)) - 1;
 

From 39b4f26932dca76506926d3b797a453dea417c11 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 21 Jan 2023 10:24:08 +0530
Subject: [PATCH 1711/2403] update ci

---
 .github/workflows/build.yml             | 10 ++++----
 .github/workflows/create_website_pr.yml | 34 +++++++++++++++----------
 .github/workflows/ports_windows.yml     | 10 ++++----
 .github/workflows/pre-commit.yml        | 23 ++++++++---------
 tools/ci_fetch_deps.py                  |  2 ++
 5 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c55f1ee06b..44309b87f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -249,7 +249,7 @@ jobs:
 
 
   build-doc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     if: ${{ needs.test.outputs.build-doc == 'True' }}
     env:
@@ -324,7 +324,7 @@ jobs:
 
 
   build-aarch:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     if: ${{ needs.test.outputs.boards-aarch != '[]' }}
     env:
@@ -406,7 +406,7 @@ jobs:
 
 
   build-arm:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     if: ${{ needs.test.outputs.boards-arm != '[]' }}
     env:
@@ -476,7 +476,7 @@ jobs:
 
 
   build-espressif:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     if: ${{ needs.test.outputs.boards-espressif != '[]' }}
     env:
@@ -581,7 +581,7 @@ jobs:
 
 
   build-riscv:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     env:
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 75de556c68..2130b8ae45 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -6,41 +6,47 @@ name: Update CircuitPython.org
 
 on:
   release:
-    types: [published]
+    types: [published, rerequested]
 
 jobs:
   website:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Dump GitHub context
+      run: echo "$GITHUB_CONTEXT"
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - uses: actions/checkout@v3
+    - name: Set up repository
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3
+    - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Get CP deps
-      run: python tools/ci_fetch_deps.py website ${{ github.sha }}
-    - name: Install deps
+    - name: CircuitPython dependencies
       run: |
-        pip install -r requirements-dev.txt
+        python tools/ci_fetch_deps.py ${{ github.job }}
+        echo "::group::Fetch history and tags"
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
+        git repack -d
+        echo "::endgroup::"
+    - name: CircuitPython version
+      run: |
+        CP_VERSION=$(tools/describe)
+        echo "$CP_VERSION"
+        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
+    - name: Install dependencies
+      run: pip install -r requirements-dev.txt
     - name: Versions
       run: |
         gcc --version
         python3 --version
-    - name: CircuitPython version
-      run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
     - name: Website
       run: python3 build_board_info.py
       working-directory: tools
       env:
         RELEASE_TAG: ${{ github.event.release.tag_name }}
         ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }}
-      if: github.event_name == 'release' && (github.event.action == 'published'  || github.event.action == 'rerequested')
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 61c6376ac7..f889e70d6d 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     defaults:
       run:
         # We define a custom shell script here, although `msys2.cmd` does neither exist nor is it available in the PATH yet
@@ -32,8 +32,7 @@ jobs:
       shell: bash
 
     - name: Check python coding (cmd)
-      run: |
-        python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
+      run: python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
       shell: cmd
 
     # We use a JS Action, which calls the system terminal or other custom terminals directly, if required
@@ -98,8 +97,9 @@ jobs:
         echo "::endgroup::"
     - name: CircuitPython version
       run: |
-        tools/describe || git log --parents HEAD~4..
-        echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
+        CP_VERSION=$(tools/describe)
+        echo "$CP_VERSION"
+        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
 
     - name: build mpy-cross
       run: make -j2 -C mpy-cross
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index a23dcd1d11..02aed6e9b4 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -16,24 +16,23 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Install deps
+    - name: CircuitPython dependencies
+      run: python tools/ci_fetch_deps.py ${{ github.job }}
+    - name: Install dependencies
       run: |
         sudo apt-get install -y gettext uncrustify
         pip3 install black polib pyyaml
-    - name: Populate selected submodules
-      run: git submodule update --init extmod/ulab
-    - name: Set PY
-      run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
-    - uses: actions/cache@v3
-      with:
-        path: ~/.cache/pre-commit
-        key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
-    - uses: pre-commit/action@v3.0.0
+    - name: Run pre-commit
+      uses: pre-commit/action@v3.0.0
     - name: Make patch
       if: failure()
       run: git diff > ~/pre-commit.patch
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index ddf7bf3bfd..5cf2279314 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -85,6 +85,8 @@ def main():
         submodules = ["extmod/ulab", "lib/", "tools/", "ports/", "data/nvm.toml"]
     elif TARGET == "website":
         submodules = ["tools/adabot/", "frozen/"]
+    elif TARGET == "pre-commit":
+        submodules = ["extmod/ulab"]
     else:
         p = list(pathlib.Path(".").glob(f"ports/*/boards/{TARGET}/mpconfigboard.mk"))
         if not p:

From 2bb12293f8bf7b23da425ee6959dba93a2208b02 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 21 Jan 2023 16:02:59 +0530
Subject: [PATCH 1712/2403] add ulp fsm

---
 ports/espressif/bindings/espulp/ULP.c         | 38 ++++++++++++--
 ports/espressif/bindings/espulp/ULP.h         |  3 +-
 ports/espressif/bindings/espulp/ULPAlarm.c    | 18 +++++--
 ports/espressif/bindings/espulp/ULPArch.c     | 51 +++++++++++++++++++
 ports/espressif/bindings/espulp/ULPArch.h     | 40 +++++++++++++++
 ports/espressif/bindings/espulp/__init__.c    |  3 ++
 ports/espressif/common-hal/espulp/ULP.c       | 47 ++++++++++++++---
 ports/espressif/common-hal/espulp/ULP.h       |  2 +
 ports/espressif/common-hal/espulp/ULPAlarm.c  | 30 ++++++++---
 ports/espressif/common-hal/espulp/ULPAlarm.h  |  3 ++
 .../esp-idf-config/sdkconfig-esp32.defaults   |  4 +-
 ports/espressif/mpconfigport.mk               |  8 +--
 12 files changed, 217 insertions(+), 30 deletions(-)
 create mode 100644 ports/espressif/bindings/espulp/ULPArch.c
 create mode 100644 ports/espressif/bindings/espulp/ULPArch.h

diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c
index 201226d93f..3506a3067b 100644
--- a/ports/espressif/bindings/espulp/ULP.c
+++ b/ports/espressif/bindings/espulp/ULP.c
@@ -28,19 +28,35 @@
 #include "shared-bindings/util.h"
 #include "bindings/espulp/ULP.h"
 
+#include "py/enum.h"
 #include "py/runtime.h"
+#include "py/objproperty.h"
 
 //| class ULP:
-//|     def __init__(self):
+//|     def __init__(self, arch: ULPArch = ULPArch.FSM):
 //|         """The ultra-low-power processor.
 //|
 //|         Raises an exception if another ULP has been instantiated. This
-//|         ensures that is is only used by one piece of code at a time."""
+//|         ensures that is is only used by one piece of code at a time.
+//|
+//|         :param ULPArch arch: The ulp arch"""
 //|         ...
 STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_arch };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_arch, MP_ARG_OBJ, {.u_obj = (void *)&ulparch_FSM_obj} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    const espulp_ulparch_t arch = cp_enum_value(&espulp_ulparch_type, args[ARG_arch].u_obj, MP_QSTR_arch);
+
     espulp_ulp_obj_t *self = m_new_obj(espulp_ulp_obj_t);
     self->base.type = &espulp_ulp_type;
-    common_hal_espulp_ulp_construct(self);
+
+    common_hal_espulp_ulp_construct(self, arch);
+
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -124,7 +140,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espulp_ulp_run_obj, 2, espulp_ulp_run);
 //|     def halt(self) -> None:
 //|         """Halts the running program and releases the pins given in `run()`."""
 //|         ...
-//|
 STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) {
     espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -134,12 +149,27 @@ STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt);
 
+//|     arch: ULPArch
+//|     """The ulp arch. (read-only)"""
+//|
+STATIC mp_obj_t espulp_ulp_get_arch(mp_obj_t self_in) {
+    espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    return cp_enum_find(&espulp_ulparch_type, self->arch);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_get_arch_obj, espulp_ulp_get_arch);
+
+MP_PROPERTY_GETTER(espulp_ulp_arch_obj,
+    (mp_obj_t)&espulp_ulp_get_arch_obj);
+
 STATIC const mp_rom_map_elem_t espulp_ulp_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espulp_ulp_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espulp_ulp___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&espulp_ulp_run_obj) },
     { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&espulp_ulp_halt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_arch), MP_ROM_PTR(&espulp_ulp_arch_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table);
 
diff --git a/ports/espressif/bindings/espulp/ULP.h b/ports/espressif/bindings/espulp/ULP.h
index 9f9c3ecf7f..f06f783902 100644
--- a/ports/espressif/bindings/espulp/ULP.h
+++ b/ports/espressif/bindings/espulp/ULP.h
@@ -29,10 +29,9 @@
 #include "py/obj.h"
 #include "common-hal/espulp/ULP.h"
 
-
 extern const mp_obj_type_t espulp_ulp_type;
 
-void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self);
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_ulparch_t arch);
 bool common_hal_espulp_ulp_deinited(espulp_ulp_obj_t *self);
 void common_hal_espulp_ulp_deinit(espulp_ulp_obj_t *self);
 
diff --git a/ports/espressif/bindings/espulp/ULPAlarm.c b/ports/espressif/bindings/espulp/ULPAlarm.c
index e77fe7f834..921c23d4f5 100644
--- a/ports/espressif/bindings/espulp/ULPAlarm.c
+++ b/ports/espressif/bindings/espulp/ULPAlarm.c
@@ -25,27 +25,35 @@
  */
 
 #include "bindings/espulp/ULPAlarm.h"
+#include "bindings/espulp/ULPArch.h"
 
 #include "py/runtime.h"
 
 //| class ULPAlarm:
 //|     """Trigger an alarm when the ULP requests wake-up."""
 //|
-//|     def __init__(self) -> None:
+//|     def __init__(self, ulp: ULP) -> None:
 //|         """Create an alarm that will be triggered when the ULP requests wake-up.
 //|
 //|         The alarm is not active until it is passed to an `alarm`-enabling function, such as
 //|         `alarm.light_sleep_until_alarms()` or `alarm.exit_and_deep_sleep_until_alarms()`.
 //|
-//|         """
+//|         :param ULP ulp: The ulp instance"""
 //|         ...
 //|
-STATIC mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type,
-    size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+STATIC mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_ulp };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_ulp, MP_ARG_REQUIRED | MP_ARG_OBJ },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     espulp_ulpalarm_obj_t *self = m_new_obj(espulp_ulpalarm_obj_t);
     self->base.type = &espulp_ulpalarm_type;
-    common_hal_espulp_ulpalarm_construct(self);
+    self->ulp = mp_arg_validate_type(args[ARG_ulp].u_obj, &espulp_ulp_type, MP_QSTR_ulp);
+
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/ports/espressif/bindings/espulp/ULPArch.c b/ports/espressif/bindings/espulp/ULPArch.c
new file mode 100644
index 0000000000..01f61458c1
--- /dev/null
+++ b/ports/espressif/bindings/espulp/ULPArch.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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 "bindings/espulp/ULPArch.h"
+
+MAKE_ENUM_VALUE(espulp_ulparch_type, ulparch, FSM, FSM);
+MAKE_ENUM_VALUE(espulp_ulparch_type, ulparch, RISCV, RISCV);
+
+//| class ULPArch:
+//|     """The ULP architectures available."""
+//|
+//|     FSM: ULPArch
+//|     """The ULP Finite State Machine."""
+//|
+//|     RISCV: ULPArch
+//|     """The ULP RISC-V Coprocessor."""
+//|
+MAKE_ENUM_MAP(espulp_ulparch) {
+    MAKE_ENUM_MAP_ENTRY(ulparch, FSM),
+    MAKE_ENUM_MAP_ENTRY(ulparch, RISCV),
+};
+STATIC MP_DEFINE_CONST_DICT(espulp_ulparch_locals_dict, espulp_ulparch_locals_table);
+
+MAKE_PRINTER(espulp, espulp_ulparch);
+
+MAKE_ENUM_TYPE(espulp, ULPArch, espulp_ulparch);
diff --git a/ports/espressif/bindings/espulp/ULPArch.h b/ports/espressif/bindings/espulp/ULPArch.h
new file mode 100644
index 0000000000..1b1e8a1331
--- /dev/null
+++ b/ports/espressif/bindings/espulp/ULPArch.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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_BINDINGS_ESPULP_ULPARCH_H
+#define MICROPY_INCLUDED_BINDINGS_ESPULP_ULPARCH_H
+
+#include "py/enum.h"
+
+typedef enum {
+    FSM,
+    RISCV
+} espulp_ulparch_t;
+
+extern const mp_obj_type_t espulp_ulparch_type;
+extern const cp_enum_obj_t ulparch_FSM_obj;
+
+#endif // MICROPY_INCLUDED_BINDINGS_ESPULP_ULPARCH_H
diff --git a/ports/espressif/bindings/espulp/__init__.c b/ports/espressif/bindings/espulp/__init__.c
index b51cbebf5e..ff6d727ec5 100644
--- a/ports/espressif/bindings/espulp/__init__.c
+++ b/ports/espressif/bindings/espulp/__init__.c
@@ -25,9 +25,11 @@
  */
 
 #include "shared-bindings/util.h"
+
 #include "bindings/espulp/__init__.h"
 #include "bindings/espulp/ULP.h"
 #include "bindings/espulp/ULPAlarm.h"
+#include "bindings/espulp/ULPArch.h"
 
 #include "py/runtime.h"
 
@@ -80,6 +82,7 @@ STATIC const mp_rom_map_elem_t espulp_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_OBJ_FROM_PTR(&espulp_ulp_type) },
     { MP_ROM_QSTR(MP_QSTR_ULPAlarm), MP_OBJ_FROM_PTR(&espulp_ulpalarm_type) },
+    { MP_ROM_QSTR(MP_QSTR_ULPArch),    MP_ROM_PTR(&espulp_ulparch_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(espulp_module_globals, espulp_module_globals_table);
 
diff --git a/ports/espressif/common-hal/espulp/ULP.c b/ports/espressif/common-hal/espulp/ULP.c
index 4d30a94dfc..c2dfdb038b 100644
--- a/ports/espressif/common-hal/espulp/ULP.c
+++ b/ports/espressif/common-hal/espulp/ULP.c
@@ -31,7 +31,10 @@
 
 #include "shared-bindings/microcontroller/Pin.h"
 
-#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#if defined(CONFIG_IDF_TARGET_ESP32)
+#include "esp32/ulp.h"
+#define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32_ULP_COPROC_RESERVE_MEM)
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "esp32s2/ulp.h"
 #include "esp32s2/ulp_riscv.h"
 #define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM)
@@ -56,7 +59,14 @@ void common_hal_espulp_ulp_run(espulp_ulp_obj_t *self, uint32_t *program, size_t
     if (length > ULP_COPROC_RESERVE_MEM) {
         mp_raise_ValueError(translate("Program too long"));
     }
-    if (GET_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN)) {
+
+    if (
+        #ifdef CONFIG_IDF_TARGET_ESP32
+        GET_PERI_REG_MASK(RTC_CNTL_STATE0_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN)
+        #else
+        GET_PERI_REG_MASK(RTC_CNTL_ULP_CP_TIMER_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN)
+        #endif
+        ) {
         mp_raise_RuntimeError(translate("Already running"));
     }
 
@@ -78,13 +88,29 @@ void common_hal_espulp_ulp_run(espulp_ulp_obj_t *self, uint32_t *program, size_t
     }
     pins_used = pin_mask;
 
-
-    ulp_riscv_load_binary((const uint8_t *)program, length);
     ulp_set_wakeup_period(0, 20000);
-    ulp_riscv_run();
+
+    switch (self->arch) {
+        case FSM:
+            ulp_load_binary(0, (const uint8_t *)program, length);
+            ulp_run(0);
+            break;
+        case RISCV:
+            #ifndef CONFIG_IDF_TARGET_ESP32
+            ulp_riscv_load_binary((const uint8_t *)program, length);
+            ulp_riscv_run();
+            break;
+            #endif
+        default:
+            mp_raise_NotImplementedError(NULL);
+            break;
+    }
 }
 
 void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
+    #ifdef CONFIG_IDF_TARGET_ESP32
+    mp_raise_NotImplementedError(NULL);
+    #else
     // To-do idf v5.0: use following functions
     // ulp_riscv_timer_stop();
     // ulp_riscv_halt();
@@ -97,6 +123,7 @@ void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
 
     // resets the processor
     SET_PERI_REG_MASK(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
+    #endif
 
     // Release pins we were using.
     for (uint8_t i = 0; i < 32; i++) {
@@ -106,13 +133,21 @@ void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
     }
 }
 
-void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self) {
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_ulparch_t arch) {
     // Use a static variable to track ULP in use so that subsequent code runs can
     // use a running ULP. This is only to prevent multiple portions of user code
     // from using the ULP concurrently.
     if (ulp_used) {
         mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_ULP);
     }
+
+    #ifdef CONFIG_IDF_TARGET_ESP32
+    if (self->arch == RISCV) {
+        mp_raise_NotImplementedError(NULL);
+    }
+    #endif
+
+    self->arch = arch;
     self->inited = true;
 }
 
diff --git a/ports/espressif/common-hal/espulp/ULP.h b/ports/espressif/common-hal/espulp/ULP.h
index f73b21d123..42081411f0 100644
--- a/ports/espressif/common-hal/espulp/ULP.h
+++ b/ports/espressif/common-hal/espulp/ULP.h
@@ -27,8 +27,10 @@
 #pragma once
 
 #include "py/obj.h"
+#include "bindings/espulp/ULPArch.h"
 
 typedef struct {
     mp_obj_base_t base;
+    espulp_ulparch_t arch;
     bool inited;
 } espulp_ulp_obj_t;
diff --git a/ports/espressif/common-hal/espulp/ULPAlarm.c b/ports/espressif/common-hal/espulp/ULPAlarm.c
index ec1fb8bc45..e209325d68 100644
--- a/ports/espressif/common-hal/espulp/ULPAlarm.c
+++ b/ports/espressif/common-hal/espulp/ULPAlarm.c
@@ -37,10 +37,6 @@
 static volatile bool woke_up = false;
 static bool alarm_set = false;
 
-void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self) {
-
-}
-
 mp_obj_t espulp_ulpalarm_find_triggered_alarm(const 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], &espulp_ulpalarm_type)) {
@@ -52,7 +48,6 @@ mp_obj_t espulp_ulpalarm_find_triggered_alarm(const size_t n_alarms, const mp_ob
 
 mp_obj_t espulp_ulpalarm_record_wake_alarm(void) {
     espulp_ulpalarm_obj_t *const alarm = &alarm_wake_alarm.ulp_alarm;
-
     alarm->base.type = &espulp_ulpalarm_type;
     return alarm;
 }
@@ -81,8 +76,25 @@ void espulp_ulpalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, con
     }
 
     // enable ulp interrupt
-    rtc_isr_register(&ulp_interrupt, NULL, RTC_CNTL_COCPU_INT_ST);
-    REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+    switch (alarm->ulp->arch) {
+        case FSM:
+            #ifdef CONFIG_IDF_TARGET_ESP32
+            rtc_isr_register(&ulp_interrupt, NULL, RTC_CNTL_ULP_CP_INT_RAW);
+            #else
+            rtc_isr_register(&ulp_interrupt, NULL, RTC_CNTL_ULP_CP_INT_ST);
+            #endif
+            REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_ULP_CP_INT_ENA);
+            break;
+        case RISCV:
+            #ifndef CONFIG_IDF_TARGET_ESP32
+            rtc_isr_register(&ulp_interrupt, NULL, RTC_CNTL_COCPU_INT_ST);
+            REG_SET_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+            break;
+            #endif
+        default:
+            mp_raise_NotImplementedError(NULL);
+            break;
+    }
 
     alarm_set = true;
 }
@@ -91,9 +103,13 @@ void espulp_ulpalarm_prepare_for_deep_sleep(void) {
     if (!alarm_set) {
         return;
     }
+
     // disable ulp interrupt
     rtc_isr_deregister(&ulp_interrupt, NULL);
+    REG_CLR_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_ULP_CP_INT_ENA);
+    #ifndef CONFIG_IDF_TARGET_ESP32
     REG_CLR_BIT(RTC_CNTL_INT_ENA_REG, RTC_CNTL_COCPU_INT_ENA);
+    #endif
 
     // enable ulp wakeup
     esp_sleep_enable_ulp_wakeup();
diff --git a/ports/espressif/common-hal/espulp/ULPAlarm.h b/ports/espressif/common-hal/espulp/ULPAlarm.h
index 5d2610c6a3..99d21180fd 100644
--- a/ports/espressif/common-hal/espulp/ULPAlarm.h
+++ b/ports/espressif/common-hal/espulp/ULPAlarm.h
@@ -29,8 +29,11 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
+#include "bindings/espulp/ULP.h"
+
 typedef struct {
     mp_obj_base_t base;
+    espulp_ulp_obj_t *ulp;
 } espulp_ulpalarm_obj_t;
 
 mp_obj_t espulp_ulpalarm_find_triggered_alarm(const size_t n_alarms, const mp_obj_t *alarms);
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 483e0f9b87..b6c5a938b1 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -313,8 +313,8 @@ CONFIG_SPIRAM_SPIWP_SD3_PIN=7
 
 # CONFIG_ESP32_TRAX is not set
 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
-# CONFIG_ESP32_ULP_COPROC_ENABLED is not set
-CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32_ULP_COPROC_ENABLED=y
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=4080
 CONFIG_ESP32_DEBUG_OCDAWARE=y
 CONFIG_ESP32_BROWNOUT_DET=y
 CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index c5c73c77bd..b7b991eb40 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -26,11 +26,13 @@ CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
 CIRCUITPY_ESP32_CAMERA ?= 1
 CIRCUITPY_ESPIDF ?= 1
+CIRCUITPY_ESPULP ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
 CIRCUITPY_HASHLIB ?= 1
 CIRCUITPY_I2CTARGET ?= 1
 CIRCUITPY_IMAGECAPTURE = 0
+CIRCUITPY_MEMORYMAP ?= 1
 CIRCUITPY_NVM ?= 1
 CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_RGBMATRIX ?= 1
@@ -54,7 +56,9 @@ CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPULP = 0
 CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_MEMORYMAP = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO ?= 1
@@ -65,14 +69,10 @@ CIRCUITPY_USB = 0
 else ifeq ($(IDF_TARGET),esp32s2)
 # Modules
 CIRCUITPY_BLEIO = 0
-CIRCUITPY_ESPULP = 1
-CIRCUITPY_MEMORYMAP = 1
 
 else ifeq ($(IDF_TARGET),esp32s3)
 # Modules
 CIRCUITPY_PARALLELDISPLAY = 0
-CIRCUITPY_ESPULP = 1
-CIRCUITPY_MEMORYMAP = 1
 endif
 
 # No room for dualbank on boards with 2MB flash

From 3361ec390daf13cd8aa085e9214c09d5a31c81e2 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 21 Jan 2023 22:19:10 -0500
Subject: [PATCH 1713/2403] Broadcom port: Add 'fake' RTC support

The Broadcom chips apparently don't have an RTC, so this PR uses the
timer to add dummy RTC responses and allow resonable results
from time.localtime() as well as setting the time and date while
the board is powered.
---
 ports/broadcom/common-hal/rtc/RTC.c      | 66 ++++++++++++++++++++++++
 ports/broadcom/common-hal/rtc/RTC.h      | 34 ++++++++++++
 ports/broadcom/common-hal/rtc/__init__.c |  0
 ports/broadcom/mpconfigport.mk           |  2 +-
 ports/broadcom/supervisor/port.c         |  2 +-
 5 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 ports/broadcom/common-hal/rtc/RTC.c
 create mode 100644 ports/broadcom/common-hal/rtc/RTC.h
 create mode 100644 ports/broadcom/common-hal/rtc/__init__.c

diff --git a/ports/broadcom/common-hal/rtc/RTC.c b/ports/broadcom/common-hal/rtc/RTC.c
new file mode 100644
index 0000000000..9d219dbe05
--- /dev/null
+++ b/ports/broadcom/common-hal/rtc/RTC.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Nick Moore 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 
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/rtc/__init__.h"
+#include "shared-bindings/rtc/RTC.h"
+#include "common-hal/rtc/RTC.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/translate/translate.h"
+
+void rtc_init(void) {
+}
+
+// This is the time in seconds since 2000 that the RTC was started.
+// TODO: Change the offset to ticks so that it can be a subsecond adjustment.
+static uint32_t rtc_offset = 0;
+
+void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
+    uint64_t ticks_s = port_get_raw_ticks(NULL) / 1024;
+    timeutils_seconds_since_2000_to_struct_time(rtc_offset + ticks_s, tm);
+}
+
+void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
+    uint64_t ticks_s = port_get_raw_ticks(NULL) / 1024;
+    uint32_t epoch_s = timeutils_seconds_since_2000(
+        tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec
+        );
+    rtc_offset = epoch_s - ticks_s;
+}
+
+int common_hal_rtc_get_calibration(void) {
+    return 0;
+}
+
+void common_hal_rtc_set_calibration(int calibration) {
+    // SNVS has HPCALB_VAL bits for calibration.
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration);
+}
diff --git a/ports/broadcom/common-hal/rtc/RTC.h b/ports/broadcom/common-hal/rtc/RTC.h
new file mode 100644
index 0000000000..4965356c50
--- /dev/null
+++ b/ports/broadcom/common-hal/rtc/RTC.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Noralf Trønnes
+ * 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.
+ */
+
+#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
+
+extern void rtc_init(void);
+extern void rtc_reset(void);
+
+#endif  // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
diff --git a/ports/broadcom/common-hal/rtc/__init__.c b/ports/broadcom/common-hal/rtc/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index 839ef00514..73c91752c6 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -15,7 +15,7 @@ CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
+CIRCUITPY_RTC = 1
 
 CIRCUITPY_SDIOIO = 1
 CIRCUITPY_VIDEOCORE = 1
diff --git a/ports/broadcom/supervisor/port.c b/ports/broadcom/supervisor/port.c
index e036a76cef..fcb86674c5 100644
--- a/ports/broadcom/supervisor/port.c
+++ b/ports/broadcom/supervisor/port.c
@@ -32,7 +32,7 @@
 
 #include "genhdr/mpversion.h"
 
-// #include "common-hal/rtc/RTC.h"
+#include "common-hal/rtc/RTC.h"
 #include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"

From 4f830f1bbb8038015a759a015281bcea6cfb7669 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 21 Jan 2023 22:57:52 -0500
Subject: [PATCH 1714/2403] Fix parameter name and remove unnecessary function

---
 ports/broadcom/common-hal/rtc/RTC.c | 4 ----
 ports/broadcom/common-hal/rtc/RTC.h | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ports/broadcom/common-hal/rtc/RTC.c b/ports/broadcom/common-hal/rtc/RTC.c
index 9d219dbe05..7be9a39803 100644
--- a/ports/broadcom/common-hal/rtc/RTC.c
+++ b/ports/broadcom/common-hal/rtc/RTC.c
@@ -32,13 +32,9 @@
 #include "shared/timeutils/timeutils.h"
 #include "shared-bindings/rtc/__init__.h"
 #include "shared-bindings/rtc/RTC.h"
-#include "common-hal/rtc/RTC.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/translate/translate.h"
 
-void rtc_init(void) {
-}
-
 // This is the time in seconds since 2000 that the RTC was started.
 // TODO: Change the offset to ticks so that it can be a subsecond adjustment.
 static uint32_t rtc_offset = 0;
diff --git a/ports/broadcom/common-hal/rtc/RTC.h b/ports/broadcom/common-hal/rtc/RTC.h
index 4965356c50..09ae4ea86f 100644
--- a/ports/broadcom/common-hal/rtc/RTC.h
+++ b/ports/broadcom/common-hal/rtc/RTC.h
@@ -25,10 +25,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
+#ifndef MICROPY_INCLUDED_BROADCOM_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_BROADCOM_COMMON_HAL_RTC_RTC_H
 
-extern void rtc_init(void);
 extern void rtc_reset(void);
 
-#endif  // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_RTC_RTC_H
+#endif  // MICROPY_INCLUDED_BROADCOM_COMMON_HAL_RTC_RTC_H

From f15e84de6c0c66867c73748649b02d081aa94120 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 09:42:39 +0530
Subject: [PATCH 1715/2403] update espnow module

---
 locale/circuitpython.pot                      |  28 +-
 .../bindings/espnow/{ESPNow.c => Now.c}       | 897 ++++++++----------
 .../bindings/espnow/{ESPNow.h => Now.h}       |   4 +-
 ports/espressif/bindings/espnow/__init__.c    |  85 ++
 ports/espressif/bindings/espnow/__init__.h    |  29 +
 ports/espressif/mpconfigport.h                |   2 +-
 ports/espressif/supervisor/port.c             |   2 +-
 7 files changed, 535 insertions(+), 512 deletions(-)
 rename ports/espressif/bindings/espnow/{ESPNow.c => Now.c} (54%)
 rename ports/espressif/bindings/espnow/{ESPNow.h => Now.h} (95%)
 create mode 100644 ports/espressif/bindings/espnow/__init__.c
 create mode 100644 ports/espressif/bindings/espnow/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 33effc9612..d0fb9e5da4 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -918,18 +918,6 @@ msgstr ""
 msgid "ESP-IDF memory allocation failed"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "ESPNow.recv(): buffer error"
-msgstr ""
-
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "ESPNow.recvinto(): Invalid argument"
-msgstr ""
-
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "ESPNow: bytes or bytearray wrong length"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 #: ports/atmel-samd/common-hal/ps2io/Ps2.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -2442,7 +2430,7 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
+#: ports/espressif/bindings/espnow/Now.c
 msgid "an error occured"
 msgstr ""
 
@@ -2970,10 +2958,6 @@ msgid ""
 "documentation for instructions."
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "espnow not inited"
-msgstr ""
-
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
 msgstr ""
@@ -3335,10 +3319,6 @@ msgstr ""
 msgid "invalid format specifier"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "invalid handler"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "invalid hostname"
 msgstr ""
@@ -3883,10 +3863,6 @@ msgstr ""
 msgid "queue overflow"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "rate option not supported"
-msgstr ""
-
 #: py/parse.c
 msgid "raw f-strings are not supported"
 msgstr ""
@@ -4182,7 +4158,7 @@ msgstr ""
 msgid "unindent doesn't match any outer indent level"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
+#: ports/espressif/bindings/espnow/Now.c
 msgid "unknown config param"
 msgstr ""
 
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/Now.c
similarity index 54%
rename from ports/espressif/bindings/espnow/ESPNow.c
rename to ports/espressif/bindings/espnow/Now.c
index 33cf2342b8..935a740164 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/Now.c
@@ -27,56 +27,52 @@
  * THE SOFTWARE.
  */
 
-#include 
-#include 
-#include 
-
-#include "esp_log.h"
 #include "esp_now.h"
-#include "esp_wifi.h"
-#include "esp_wifi_types.h"
 
 #include "py/runtime.h"
-#include "py/mphal.h"
-#include "py/mperrno.h"
-#include "py/obj.h"
-#include "py/objstr.h"
 #include "py/objarray.h"
+#include "py/objproperty.h"
 #include "py/stream.h"
-#include "py/binary.h"
 #include "py/ringbuf.h"
 
-#include "mpconfigport.h"
 #include "mphalport.h"
 
-#include "bindings/espnow/ESPNow.h"
+#include "bindings/espnow/__init__.h"
+#include "bindings/espnow/Now.h"
 
+#include "shared-bindings/util.h"
 #include "shared-bindings/wifi/__init__.h"
 
-#ifndef MICROPY_ESPNOW_RSSI
-// Include code to track rssi of peers
-#define MICROPY_ESPNOW_RSSI 1
-#endif
-#ifndef MICROPY_ESPNOW_EXTRA_PEER_METHODS
-// Include mod_peer(),get_peer(),peer_count()
-#define MICROPY_ESPNOW_EXTRA_PEER_METHODS 1
-#endif
-
 // Relies on gcc Variadic Macros and Statement Expressions
-#define NEW_TUPLE(...) \
-    ({mp_obj_t _z[] = {__VA_ARGS__}; mp_obj_new_tuple(MP_ARRAY_SIZE(_z), _z); })
+#define NEW_TUPLE(...) ({mp_obj_t _z[] = {__VA_ARGS__}; mp_obj_new_tuple(MP_ARRAY_SIZE(_z), _z);})
 
-static const uint8_t ESPNOW_MAGIC = 0x99;
+#define ESPNOW_MAGIC 0x99
+
+// The maximum length of an espnow packet (bytes)
+#define MAX_PACKET_LEN (sizeof(espnow_pkt_t) + ESP_NOW_MAX_DATA_LEN)
+
+// Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
+// Will allocate an additional 7 bytes for buffer overhead
+#define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
+
+// Default timeout (millisec) to wait for incoming ESPNow messages (5 minutes).
+#define DEFAULT_RECV_TIMEOUT_MS (5 * 60 * 1000)
+
+// Time to wait (millisec) for responses from sent packets: (2 seconds).
+#define DEFAULT_SEND_TIMEOUT_MS (2 * 1000)
+
+// Number of milliseconds to wait for pending responses to sent packets.
+// This is a fallback which should never be reached.
+#define PENDING_RESPONSES_TIMEOUT_MS    100
+#define PENDING_RESPONSES_BUSY_POLL_MS  10
 
 // ESPNow packet format for the receive buffer.
 // Use this for peeking at the header of the next packet in the buffer.
 typedef struct {
     uint8_t magic;              // = ESPNOW_MAGIC
     uint8_t msg_len;            // Length of the message
-    #if MICROPY_ESPNOW_RSSI
     uint32_t time_ms;           // Timestamp (ms) when packet is received
     int8_t rssi;                // RSSI value (dBm) (-127 to 0)
-    #endif // MICROPY_ESPNOW_RSSI
 } __attribute__((packed)) espnow_hdr_t;
 
 typedef struct {
@@ -85,48 +81,20 @@ typedef struct {
     uint8_t msg[0];             // Message is up to 250 bytes
 } __attribute__((packed)) espnow_pkt_t;
 
-// The maximum length of an espnow packet (bytes)
-static const size_t MAX_PACKET_LEN = (
-    (sizeof(espnow_pkt_t) + ESP_NOW_MAX_DATA_LEN));
-
-// Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
-// Will allocate an additional 7 bytes for buffer overhead
-static const size_t DEFAULT_RECV_BUFFER_SIZE = (2 * MAX_PACKET_LEN);
-
-// Default timeout (millisec) to wait for incoming ESPNow messages (5 minutes).
-static const size_t DEFAULT_RECV_TIMEOUT_MS = (5 * 60 * 1000);
-
-// Time to wait (millisec) for responses from sent packets: (2 seconds).
-static const size_t DEFAULT_SEND_TIMEOUT_MS = (2 * 1000);
-
-// Number of milliseconds to wait for pending responses to sent packets.
-// This is a fallback which should never be reached.
-static const mp_uint_t PENDING_RESPONSES_TIMEOUT_MS = 100;
-static const mp_uint_t PENDING_RESPONSES_BUSY_POLL_MS = 10;
-
 // The data structure for the espnow_singleton.
-typedef struct _esp_espnow_obj_t {
+typedef struct _espnow_obj_t {
     mp_obj_base_t base;
-
     ringbuf_t *recv_buffer;         // A buffer for received packets
     size_t recv_buffer_size;        // The size of the recv_buffer
     size_t recv_timeout_ms;         // Timeout for recv()
     volatile size_t rx_packets;     // # of received packets
-    size_t dropped_rx_pkts;         // # of dropped packets (buffer full)
+    volatile size_t rx_failures;    // # of dropped packets (buffer full)
     size_t tx_packets;              // # of sent packets
     volatile size_t tx_responses;   // # of sent packet responses received
     volatile size_t tx_failures;    // # of sent packet responses failed
-    size_t peer_count;              // Cache the # of peers for send(sync=True)
-    #if MICROPY_ENABLE_SCHEDULER
-    mp_obj_t recv_cb;               // Callback when a packet is received
-    mp_obj_t recv_cb_arg;           // Argument passed to callback
-    #endif
-    #if MICROPY_ESPNOW_RSSI
+    size_t num_peers;               // Cache the # of peers for send(sync=True)
     mp_obj_t peers_table;           // A dictionary of discovered peers
-    #endif // MICROPY_ESPNOW_RSSI
-} esp_espnow_obj_t;
-
-static const mp_obj_type_t esp_espnow_type;
+} espnow_obj_t;
 
 static void check_esp_err(esp_err_t status) {
     if (status != ESP_OK) {
@@ -134,54 +102,52 @@ static void check_esp_err(esp_err_t status) {
     }
 }
 
-// ### Initialisation and Config functions
-//
+// --- Initialisation and Config functions ---
 
 // Return a pointer to the ESPNow module singleton
 // If state == INITIALISED check the device has been initialised.
 // Raises OSError if not initialised and state == INITIALISED.
-static esp_espnow_obj_t *_get_singleton(void) {
+static espnow_obj_t *_get_singleton(void) {
     return MP_STATE_PORT(espnow_singleton);
 }
 
-static esp_espnow_obj_t *_get_singleton_initialised(void) {
-    esp_espnow_obj_t *self = _get_singleton();
-    // assert(self);
-    if (self->recv_buffer == NULL) {
-        // Throw an espnow not initialised error
-        // check_esp_err(ESP_ERR_ESPNOW_NOT_INIT);
-        mp_raise_RuntimeError(translate("espnow not inited"));
-    }
-    return self;
+static bool espnow_deinited(espnow_obj_t *self) {
+    return self->recv_buffer == NULL;
 }
 
-// Allocate and initialise the ESPNow module as a singleton.
-// Returns the initialised espnow_singleton.
-STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
-    size_t n_kw, const mp_obj_t *all_args) {
+// Return a pointer to the ESPNow module singleton
+// If state == INITIALISED check the device has been initialised.
+// Raises OSError if not initialised and state == INITIALISED.
+static void check_for_deinit(espnow_obj_t *self) {
+    if (espnow_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//| class Now:
+//|     def __init__(self) -> Now:
+//|     """
+//|         Allocate and initialise the ESPNow module as a singleton.
+//|         Returns the initialised espnow_singleton.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    espnow_obj_t *self = _get_singleton();
 
-    // The espnow_singleton must be defined in MICROPY_PORT_ROOT_POINTERS
-    // (see mpconfigport.h) to prevent memory allocated here from being
-    // garbage collected.
-    // NOTE: on soft reset the espnow_singleton MUST be set to NULL and the
-    // ESP-NOW functions de-initialised (see main.c).
-    esp_espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (self != NULL) {
         return self;
     }
-    self = m_new_obj(esp_espnow_obj_t);
-    self->base.type = &esp_espnow_type;
+
+    self = m_new_obj(espnow_obj_t);
+    self->base.type = &espnow_type;
     self->recv_buffer_size = DEFAULT_RECV_BUFFER_SIZE;
     self->recv_timeout_ms = DEFAULT_RECV_TIMEOUT_MS;
-    self->recv_buffer = NULL;       // Buffer is allocated in espnow_init()
-    #if MICROPY_ENABLE_SCHEDULER
-    self->recv_cb = mp_const_none;
-    #endif
-    #if MICROPY_ESPNOW_RSSI
+    self->recv_buffer = NULL;
     self->peers_table = mp_obj_new_dict(0);
+
     // Prevent user code modifying the dict
     mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
-    #endif // MICROPY_ESPNOW_RSSI
 
     // Set the global singleton pointer for the espnow protocol.
     MP_STATE_PORT(espnow_singleton) = self;
@@ -189,10 +155,47 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
     return self;
 }
 
-// Forward declare the send and recv ESPNow callbacks
-STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
+// --- The ESP-NOW send and recv callback routines ---
 
-STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *data, int len);
+// Callback triggered when a sent packet is acknowledged by the peer (or not).
+// Just count the number of responses and number of failures.
+// These are used in the send() logic.
+static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
+    espnow_obj_t *self = _get_singleton();
+    self->tx_responses++;
+    if (status != ESP_NOW_SEND_SUCCESS) {
+        self->tx_failures++;
+    }
+}
+
+static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg);
+
+// Callback triggered when an ESP-Now packet is received.
+// Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
+// If the buffer is full, drop the message and increment the dropped count.
+// Schedules the user callback if one has been registered (ESPNow.config()).
+static void recv_cb(const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
+    espnow_obj_t *self = _get_singleton();
+    ringbuf_t *buf = self->recv_buffer;
+
+    // TODO: Test this works with ">".
+    if (sizeof(espnow_pkt_t) + msg_len >= ringbuf_free(buf)) {
+        self->rx_failures++;
+        return;
+    }
+
+    espnow_hdr_t header;
+    header.magic = ESPNOW_MAGIC;
+    header.msg_len = msg_len;
+    header.rssi = _get_rssi_from_wifi_pkt(msg);
+    header.time_ms = mp_hal_ticks_ms();
+
+    ringbuf_write(buf, &header, sizeof(header));
+    ringbuf_write(buf, mac_addr, ESP_NOW_ETH_ALEN);
+    ringbuf_write(buf, msg, msg_len);
+
+    self->rx_packets++;
+}
 
 static void _wifi_init(void) {
     if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
@@ -201,13 +204,16 @@ static void _wifi_init(void) {
     }
 }
 
-// ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
-// Initialise the Espressif ESPNOW software stack, register callbacks and
-// allocate the recv data buffers.
-// Returns None.
-static void espnow_init(void) {
-    esp_espnow_obj_t *self = _get_singleton();
-    if (self->recv_buffer == NULL) {    // Already initialised
+//|     def init() -> None:
+//|     """
+//|         Initialise the data buffers and ESP-NOW functions.
+//|         Initialise the Espressif ESP-NOW software stack, register callbacks
+//|         and allocate the recv data buffers.
+//|     """
+//|     ...
+//|
+static void espnow_init(espnow_obj_t *self) {
+    if (espnow_deinited(self)) {    // Already initialised
         self->recv_buffer = m_new_obj(ringbuf_t);
         if (!ringbuf_alloc(self->recv_buffer, self->recv_buffer_size, true)) {
             m_malloc_fail(self->recv_buffer_size);
@@ -216,54 +222,65 @@ static void espnow_init(void) {
         _wifi_init();   // Call the wifi init code
 
         check_esp_err(esp_now_init());
-        check_esp_err(esp_now_register_recv_cb(recv_cb));
         check_esp_err(esp_now_register_send_cb(send_cb));
+        check_esp_err(esp_now_register_recv_cb(recv_cb));
     }
 }
 
-// ESPNow.deinit(): De-initialise the ESPNOW software stack, disable callbacks
-// and deallocate the recv data buffers.
-// Note: this function is called from main.c:mp_task() to cleanup before soft
-// reset, so cannot be declared STATIC and must guard against self == NULL;.
-static void espnow_deinit(void) {
-    esp_espnow_obj_t *self = _get_singleton();
-    if (self != NULL && self->recv_buffer != NULL) {
-        check_esp_err(esp_now_unregister_recv_cb());
+//|     def deinit() -> None:
+//|     """
+//|         De-initialise the ESP-NOW software stack, disable callbacks
+//|         and deallocate the recv data buffers.
+//|     """
+//|     ...
+//|
+static void espnow_deinit(espnow_obj_t *self) {
+    if (self != NULL && !espnow_deinited(self)) {
         check_esp_err(esp_now_unregister_send_cb());
+        check_esp_err(esp_now_unregister_recv_cb());
         check_esp_err(esp_now_deinit());
         self->recv_buffer->buf = NULL;
         self->recv_buffer = NULL;
-        self->peer_count = 0; // esp_now_deinit() removes all peers.
+        self->num_peers = 0; // esp_now_deinit() removes all peers.
         self->tx_packets = self->tx_responses;
     }
 }
 
 void espnow_reset(void) {
-    espnow_deinit();
+    espnow_deinit(_get_singleton());
     MP_STATE_PORT(espnow_singleton) = NULL;
 }
 
+//|     def active(state: bool) -> bool:
+//|     """
+//|         Initialise or de-initialise the ESPNow communication protocol
+//|         depending on the value of the flag optional argument.
+//|     """
+//|     ...
+//|
 STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
-    esp_espnow_obj_t *self = _get_singleton();
+    espnow_obj_t *self = args[0];
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
-            espnow_init();
+            espnow_init(self);
         } else {
-            espnow_deinit();
+            espnow_deinit(self);
         }
     }
-    return self->recv_buffer != NULL ? mp_const_true : mp_const_false;
+    return mp_obj_new_bool(!espnow_deinited(self));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
 
-// ESPNow.config(['param'|param=value, ..])
-// Get or set configuration values. Supported config params:
-//    buffer: size of buffer for rx packets (default=514 bytes)
-//    timeout: Default read timeout (default=300,000 milliseconds)
-STATIC mp_obj_t espnow_config(
-    size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-
-    esp_espnow_obj_t *self = _get_singleton();
+//|     def config(['param'|param=value, ..]) -> int:
+//|     """
+//|         Get or set configuration values. Supported config params:
+//|         buffer: size of buffer for rx packets (default=514 bytes)
+//|         timeout: Default read timeout (default=300,000 milliseconds)
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    espnow_obj_t *self = pos_args[0];
     enum { ARG_get, ARG_buffer, ARG_timeout, ARG_rate };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -271,30 +288,28 @@ STATIC mp_obj_t espnow_config(
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
+
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
-        MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     if (args[ARG_buffer].u_int >= 0) {
         self->recv_buffer_size = args[ARG_buffer].u_int;
     }
+
     if (args[ARG_timeout].u_int >= 0) {
         self->recv_timeout_ms = args[ARG_timeout].u_int;
     }
+
     if (args[ARG_rate].u_int >= 0) {
-        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
         _wifi_init();  // Call the wifi init code
-        check_esp_err(esp_wifi_config_espnow_rate(
-            ESP_IF_WIFI_STA, args[ARG_rate].u_int));
-        check_esp_err(esp_wifi_config_espnow_rate(
-            ESP_IF_WIFI_AP, args[ARG_rate].u_int));
-        #else
-        mp_raise_ValueError(MP_ERROR_TEXT("rate option not supported"));
-        #endif
+        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, args[ARG_rate].u_int));
+        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, args[ARG_rate].u_int));
     }
+
     if (args[ARG_get].u_obj == MP_OBJ_NULL) {
         return mp_const_none;
     }
+
 #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
     // Return the value of the requested parameter
     uintptr_t name = (uintptr_t)args[ARG_get].u_obj;
@@ -311,40 +326,26 @@ STATIC mp_obj_t espnow_config(
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
 
-// ESPNow.on_recv(recv_cb)
-// Set callback function to be invoked when a message is received.
-STATIC mp_obj_t espnow_on_recv(size_t n_args, const mp_obj_t *args) {
-    #if MICROPY_ENABLE_SCHEDULER
-    esp_espnow_obj_t *self = _get_singleton();
-    mp_obj_t recv_cb = args[1];
-    if (recv_cb != mp_const_none && !mp_obj_is_callable(recv_cb)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid handler"));
-    }
-    self->recv_cb = recv_cb;
-    self->recv_cb_arg = (n_args > 2) ? args[2] : mp_const_none;
-    #else
-    mp_raise_NotImplementedError(NULL);
-    #endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_on_recv_obj, 2, 3, espnow_on_recv);
-
-// ESPnow.stats(): Provide some useful stats.
-// Returns a tuple of:
-//   (tx_pkts, tx_responses, tx_failures, rx_pkts, dropped_rx_pkts)
-STATIC mp_obj_t espnow_stats(mp_obj_t _) {
-    const esp_espnow_obj_t *self = _get_singleton();
+//|     stats: Tuple[int, int, int, int, int]
+//|     """Provide some useful stats.
+//|        Returns a tuple of (tx_packets, tx_responses, tx_failures, rx_packets, rx_failures).
+//|     """
+//|
+STATIC mp_obj_t espnow_get_stats(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return NEW_TUPLE(
         mp_obj_new_int(self->tx_packets),
         mp_obj_new_int(self->tx_responses),
         mp_obj_new_int(self->tx_failures),
         mp_obj_new_int(self->rx_packets),
-        mp_obj_new_int(self->dropped_rx_pkts));
+        mp_obj_new_int(self->rx_failures));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_stats_obj, espnow_get_stats);
 
-#if MICROPY_ESPNOW_RSSI
-// ### Maintaining the peer table and reading RSSI values
+MP_PROPERTY_GETTER(espnow_stats_obj,
+    (mp_obj_t)&espnow_get_stats_obj);
+
+// --- Maintaining the peer table and reading RSSI values ---
 //
 // We maintain a peers table for several reasons, to:
 // - support monitoring the RSSI values for all peers; and
@@ -364,19 +365,12 @@ static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
     wifi_promiscuous_pkt_t *wifi_pkt = (wifi_promiscuous_pkt_t *)(
         msg - sizeof_espnow_frame_format - sizeof(wifi_promiscuous_pkt_t));
     #pragma GCC diagnostic pop
-    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0)
-    return wifi_pkt->rx_ctrl.rssi - 100;  // Offset rssi for IDF 4.0.2
-    #else
     return wifi_pkt->rx_ctrl.rssi;
-    #endif
 }
 
-// Lookup a peer in the peers table and return a reference to the item in the
-// peers_table. Add peer to the table if it is not found (may alloc memory).
-// Will not return NULL.
-static mp_map_elem_t *_lookup_add_peer(
-    esp_espnow_obj_t *self, const uint8_t *peer) {
-
+// Lookup a peer in the peers table and return a reference to the item in the peers_table.
+// Add peer to the table if it is not found (may alloc memory). Will not return NULL.
+static mp_map_elem_t *_lookup_add_peer(espnow_obj_t *self, const uint8_t *peer) {
     // We do not want to allocate any new memory in the case that the peer
     // already exists in the peers_table (which is almost all the time).
     // So, we use a byte string on the stack and look that up in the dict.
@@ -396,10 +390,7 @@ static mp_map_elem_t *_lookup_add_peer(
 
 // Update the peers table with the new rssi value from a received pkt and
 // return a reference to the item in the peers_table.
-static mp_map_elem_t *_update_rssi(
-    const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
-
-    esp_espnow_obj_t *self = _get_singleton_initialised();
+static mp_map_elem_t *_update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
     // Lookup the peer in the device table
     mp_map_elem_t *item = _lookup_add_peer(self, peer);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
@@ -407,23 +398,17 @@ static mp_map_elem_t *_update_rssi(
     list->items[1] = mp_obj_new_int(time_ms);
     return item;
 }
-#endif // MICROPY_ESPNOW_RSSI
 
-// ### Handling espnow packets in the recv buffer
-//
+// --- Handling espnow packets in the recv buffer ---
 
-// ### Send and Receive ESP_Now data
-//
+// --- Send and Receive ESP_Now data ---
 
 // Return C pointer to byte memory string/bytes/bytearray in obj.
 // Raise ValueError if the length does not match expected len.
 static uint8_t *_get_bytes_len_rw(mp_obj_t obj, size_t len, mp_uint_t rw) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(obj, &bufinfo, rw);
-    if (bufinfo.len != len) {
-        mp_raise_ValueError(
-            MP_ERROR_TEXT("ESPNow: bytes or bytearray wrong length"));
-    }
+    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_bytes);
     return (uint8_t *)bufinfo.buf;
 }
 
@@ -438,8 +423,7 @@ static uint8_t *_get_bytes_len_w(mp_obj_t obj, size_t len) {
 // Return C pointer to the MAC address.
 // Raise ValueError if mac_addr is wrong type or is not 6 bytes long.
 static const uint8_t *_get_peer(mp_obj_t mac_addr) {
-    return mp_obj_is_true(mac_addr)
-        ? _get_bytes_len(mac_addr, ESP_NOW_ETH_ALEN) : NULL;
+    return mp_obj_is_true(mac_addr) ? _get_bytes_len(mac_addr, ESP_NOW_ETH_ALEN) : NULL;
 }
 
 // Copy data from the ring buffer - wait if buffer is empty up to timeout_ms
@@ -454,88 +438,11 @@ static int ringbuf_read_wait(ringbuf_t *r, void *data, size_t len, int timeout_m
     return status;
 }
 
-// ESPNow.recvinto(buffers[, timeout_ms]):
-// Waits for an espnow message and copies the peer_addr and message into
-// the buffers list.
-// Arguments:
-//      buffers: (Optional) list of bytearrays to store return values.
-//      timeout_ms: (Optional) timeout in milliseconds (or None).
-// Buffers should be a list: [bytearray(6), bytearray(250)]
-// If buffers is 4 elements long, the rssi and timestamp values will be
-// loaded into the 3rd and 4th elements.
-// Default timeout is set with ESPNow.config(timeout=milliseconds).
-// Return (None, None) on timeout.
-STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
-    esp_espnow_obj_t *self = _get_singleton_initialised();
-
-    size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
-            ? (size_t)mp_obj_get_int(args[2]) : self->recv_timeout_ms);
-
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(args[1]);
-    if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
-        mp_raise_ValueError(MP_ERROR_TEXT("ESPNow.recvinto(): Invalid argument"));
-    }
-    mp_obj_array_t *msg = MP_OBJ_TO_PTR(list->items[1]);
-    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
-        msg->len += msg->free;   // Make all the space in msg array available
-        msg->free = 0;
-    }
-    #if MICROPY_ESPNOW_RSSI
-    uint8_t peer_buf[ESP_NOW_ETH_ALEN];
-    #else
-    uint8_t *peer_buf = _get_bytes_len_w(list->items[0], ESP_NOW_ETH_ALEN);
-    #endif // MICROPY_ESPNOW_RSSI
-    uint8_t *msg_buf = _get_bytes_len_w(msg, ESP_NOW_MAX_DATA_LEN);
-
-    // Read the packet header from the incoming buffer
-    espnow_hdr_t hdr;
-    if (ringbuf_read_wait(self->recv_buffer, &hdr, sizeof(hdr), timeout_ms) < 1) {
-        return MP_OBJ_NEW_SMALL_INT(0);    // Timeout waiting for packet
-    }
-    int msg_len = hdr.msg_len;
-
-    // Check the message packet header format and read the message data
-    if (hdr.magic != ESPNOW_MAGIC ||
-        msg_len > ESP_NOW_MAX_DATA_LEN ||
-        ringbuf_read(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) < 1 ||
-        ringbuf_read(self->recv_buffer, msg_buf, msg_len) < 1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("ESPNow.recv(): buffer error"));
-    }
-    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
-        // Set the length of the message bytearray.
-        size_t size = msg->len + msg->free;
-        msg->len = msg_len;
-        msg->free = size - msg_len;
-    }
-
-    #if MICROPY_ESPNOW_RSSI
-    // Update rssi value in the peer device table
-    mp_map_elem_t *entry = _update_rssi(peer_buf, hdr.rssi, hdr.time_ms);
-    list->items[0] = entry->key;  // Set first element of list to peer
-    if (list->len >= 4) {
-        list->items[2] = MP_OBJ_NEW_SMALL_INT(hdr.rssi);
-        list->items[3] = mp_obj_new_int(hdr.time_ms);
-    }
-    #endif // MICROPY_ESPNOW_RSSI
-
-    return MP_OBJ_NEW_SMALL_INT(msg_len);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
-
-// Test if data is available to read from the buffers
-STATIC mp_obj_t espnow_any(const mp_obj_t _) {
-    esp_espnow_obj_t *self = _get_singleton_initialised();
-
-    return ringbuf_avail(self->recv_buffer) ? mp_const_true : mp_const_false;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
-
 // Used by espnow_send() for sends() with sync==True.
 // Wait till all pending sent packet responses have been received.
 // ie. self->tx_responses == self->tx_packets.
-static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
-    mp_uint_t start = mp_hal_ticks_ms();
-    mp_uint_t t;
+static void _wait_for_pending_responses(espnow_obj_t *self) {
+    mp_uint_t t, start = mp_hal_ticks_ms();
     while (self->tx_responses < self->tx_packets) {
         if ((t = mp_hal_ticks_ms() - start) > PENDING_RESPONSES_TIMEOUT_MS) {
             mp_raise_OSError(MP_ETIMEDOUT);
@@ -547,19 +454,26 @@ static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
     }
 }
 
-// ESPNow.send(peer_addr, message, [sync (=true), size])
-// ESPNow.send(message)
-// Send a message to the peer's mac address. Optionally wait for a response.
-// If peer_addr == None or any non-true value, send to all registered peers.
-// If sync == True, wait for response after sending.
-// If size is provided it should be the number of bytes in message to send().
-// Returns:
-//   True  if sync==False and message sent successfully.
-//   True  if sync==True and message is received successfully by all recipients
-//   False if sync==True and message is not received by at least one recipient
-// Raises: EAGAIN if the internal espnow buffers are full.
+//|     def send(peer_addr: bytes = None, message: Union[bytes, str], sync: bool = True) -> bool:
+//|     """
+//|         Send a message to the peer's mac address. Optionally wait for a response.
+//|         If peer_addr == None or any non-true value, send to all registered peers.
+//|         If sync == True, wait for response after sending.
+//|         If size is provided it should be the number of bytes in message to send().
+//|
+//|         Returns:
+//|             True  if sync == False and message sent successfully.
+//|             True  if sync == True and message is received successfully by all recipients
+//|             False if sync == True and message is not received by at least one recipient
+//|
+//|         Raises: EAGAIN if the internal espnow buffers are full.
+//|     """
+//|     ...
+//|
 STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
-    esp_espnow_obj_t *self = _get_singleton_initialised();
+    espnow_obj_t *self = args[0];
+    check_for_deinit(self);
+
     // Check the various combinations of input arguments
     const uint8_t *peer = (n_args > 2) ? _get_peer(args[1]) : NULL;
     mp_obj_t msg = (n_args > 2) ? args[2] : (n_args == 2) ? args[1] : MP_OBJ_NULL;
@@ -577,139 +491,166 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
         // call has sync=True.
         _wait_for_pending_responses(self);
     }
+
     size_t saved_failures = self->tx_failures;
     // Send the packet - try, try again if internal esp-now buffers are full.
     esp_err_t err;
     int64_t start = mp_hal_ticks_ms();
-    while ((ESP_ERR_ESPNOW_NO_MEM ==
-            (err = esp_now_send(peer, message.buf, message.len))) &&
+    while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(peer, message.buf, message.len))) &&
            (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
         RUN_BACKGROUND_TASKS;
     }
     check_esp_err(err);           // Will raise OSError if e != ESP_OK
+
     // Increment the sent packet count. If peer_addr==NULL msg will be
     // sent to all peers EXCEPT any broadcast or multicast addresses.
-    self->tx_packets += ((peer == NULL) ? self->peer_count : 1);
+    self->tx_packets += ((peer == NULL) ? self->num_peers : 1);
     if (sync) {
         // Wait for and tally all the expected responses from peers
         _wait_for_pending_responses(self);
     }
+
     // Return False if sync and any peers did not respond.
     return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
 
-// ### The ESP_Now send and recv callback routines
-//
+//|     def recv(buffers: List[bytearray(6), bytearray(250), ...], timeout: int) -> Optional[int]:
+//|     """
+//|         Waits for an espnow message and copies the peer_addr and message into the buffers list.
+//|
+//|         If buffers is 2 elements long, the peer_mac and message will be
+//|         loaded into the 1st and 2nd elements.
+//|         If buffers is 4 elements long, the rssi and timestamp values will be
+//|         loaded into the 3rd and 4th elements.
+//|
+//|         Default timeout is set with ESPNow.config(timeout=milliseconds).
+//|         Returns None on timeout otherwise length of the message.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_recv(size_t n_args, const mp_obj_t *args) {
+    espnow_obj_t *self = args[0];
+    check_for_deinit(self);
 
-// Callback triggered when a sent packet is acknowledged by the peer (or not).
-// Just count the number of responses and number of failures.
-// These are used in the send() logic.
-STATIC void send_cb(
-    const uint8_t *mac_addr, esp_now_send_status_t status) {
+    size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
+            ? (size_t)mp_obj_get_int(args[2]) : self->recv_timeout_ms);
 
-    esp_espnow_obj_t *self = _get_singleton();
-    self->tx_responses++;
-    if (status != ESP_NOW_SEND_SUCCESS) {
-        self->tx_failures++;
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(args[1]);
+    if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
+        mp_arg_error_invalid(MP_QSTR_buffers);
     }
+
+    mp_obj_array_t *msg = MP_OBJ_TO_PTR(list->items[1]);
+    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
+        msg->len += msg->free;   // Make all the space in msg array available
+        msg->free = 0;
+    }
+
+    uint8_t peer_buf[ESP_NOW_ETH_ALEN];
+    uint8_t *msg_buf = _get_bytes_len_w(msg, ESP_NOW_MAX_DATA_LEN);
+
+    // Read the packet header from the incoming buffer
+    espnow_hdr_t hdr;
+    if (ringbuf_read_wait(self->recv_buffer, &hdr, sizeof(hdr), timeout_ms) < 1) {
+        return MP_OBJ_NEW_SMALL_INT(0);    // Timeout waiting for packet
+    }
+    int msg_len = hdr.msg_len;
+
+    // Check the message packet header format and read the message data
+    if (hdr.magic != ESPNOW_MAGIC ||
+        msg_len > ESP_NOW_MAX_DATA_LEN ||
+        ringbuf_read(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) < 1 ||
+        ringbuf_read(self->recv_buffer, msg_buf, msg_len) < 1) {
+        mp_arg_error_invalid(MP_QSTR_buffer);
+    }
+    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
+        // Set the length of the message bytearray.
+        size_t size = msg->len + msg->free;
+        msg->len = msg_len;
+        msg->free = size - msg_len;
+    }
+
+    // Update rssi value in the peer device table
+    mp_map_elem_t *entry = _update_rssi(self, peer_buf, hdr.rssi, hdr.time_ms);
+    list->items[0] = entry->key;  // Set first element of list to peer
+    if (list->len >= 4) {
+        list->items[2] = MP_OBJ_NEW_SMALL_INT(hdr.rssi);
+        list->items[3] = mp_obj_new_int(hdr.time_ms);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(msg_len);
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recv_obj, 2, 3, espnow_recv);
 
-// Callback triggered when an ESP-Now packet is received.
-// Write the peer MAC address and the message into the recv_buffer as an
-// ESPNow packet.
-// If the buffer is full, drop the message and increment the dropped count.
-// Schedules the user callback if one has been registered (ESPNow.config()).
-STATIC void recv_cb(
-    const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
-
-    esp_espnow_obj_t *self = _get_singleton();
-    ringbuf_t *buf = self->recv_buffer;
-    // TODO: Test this works with ">".
-    if (sizeof(espnow_pkt_t) + msg_len >= ringbuf_free(buf)) {
-        self->dropped_rx_pkts++;
-        return;
-    }
-    espnow_hdr_t header;
-    header.magic = ESPNOW_MAGIC;
-    header.msg_len = msg_len;
-    #if MICROPY_ESPNOW_RSSI
-    header.rssi = _get_rssi_from_wifi_pkt(msg);
-    header.time_ms = mp_hal_ticks_ms();
-    #endif // MICROPY_ESPNOW_RSSI
-
-    ringbuf_write(buf, &header, sizeof(header));
-    ringbuf_write(buf, mac_addr, ESP_NOW_ETH_ALEN);
-    ringbuf_write(buf, msg, msg_len);
-    self->rx_packets++;
-    #if MICROPY_ENABLE_SCHEDULER
-    if (self->recv_cb != mp_const_none) {
-        mp_sched_schedule(self->recv_cb, self->recv_cb_arg);
-    }
-    #endif
+//|     def any(self) -> bool:
+//|     """Test if data is available to read from the buffers.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_any(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return ringbuf_avail(self->recv_buffer) ? mp_const_true : mp_const_false;
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
 
-// ### Peer Management Functions
-//
+// --- Peer Management Functions ---
 
-// Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
-// Raise OSError if ESP-NOW functions are not initialised.
-// Raise ValueError if key is not a bytes-like object exactly 16 bytes long.
-STATIC mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
+//|     def set_pmk(pmk: bytes(16)) -> None:
+//|     """Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
     check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN)));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 
-// Common code for add_peer() and mod_peer() to process the args and kw_args:
-// Raise ValueError if the LMK is not a bytes-like object of exactly 16 bytes.
-// Raise TypeError if invalid keyword args or too many positional args.
-// Return true if all args parsed correctly.
-STATIC bool _update_peer_info(
-    esp_now_peer_info_t *peer, size_t n_args,
-    const mp_obj_t *pos_args, mp_map_t *kw_args) {
-
+// Common code for add_peer() and mod_peer() to process the args and kw_args.
+static void _update_peer_info(esp_now_peer_info_t *peer, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_lmk, ARG_channel, ARG_ifidx, ARG_encrypt };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_lmk, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_channel, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_ifidx, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_encrypt, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_lmk,      MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_channel,  MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_ifidx,    MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_encrypt,  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_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
     if (args[ARG_lmk].u_obj != mp_const_none) {
         mp_obj_t obj = args[ARG_lmk].u_obj;
         peer->encrypt = mp_obj_is_true(obj);
         if (peer->encrypt) {
             // Key must be 16 bytes in length.
-            memcpy(peer->lmk,
-                _get_bytes_len(obj, ESP_NOW_KEY_LEN),
-                ESP_NOW_KEY_LEN);
+            memcpy(peer->lmk, _get_bytes_len(obj, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN);
         }
     }
+
     if (args[ARG_channel].u_obj != mp_const_none) {
         peer->channel = mp_obj_get_int(args[ARG_channel].u_obj);
     }
+
     if (args[ARG_ifidx].u_obj != mp_const_none) {
         peer->ifidx = mp_obj_get_int(args[ARG_ifidx].u_obj);
     }
+
     if (args[ARG_encrypt].u_obj != mp_const_none) {
         peer->encrypt = mp_obj_is_true(args[ARG_encrypt].u_obj);
     }
-    return true;
 }
 
-// Update the cached peer count in self->peer_count;
-// The peer_count ignores broadcast and multicast addresses and is used for the
+// Update the cached peer count in self->num_peers;
+// The num_peers ignores broadcast and multicast addresses and is used for the
 // send() logic and is updated from add_peer(), mod_peer() and del_peer().
-STATIC void _update_peer_count(void) {
-    esp_espnow_obj_t *self = _get_singleton_initialised();
-
+static void _update_peer_count(espnow_obj_t *self) {
     esp_now_peer_info_t peer = {0};
     bool from_head = true;
     int count = 0;
+
     // esp_now_fetch_peer() skips over any broadcast or multicast addresses
     while (esp_now_fetch_peer(from_head, &peer) == ESP_OK) {
         from_head = false;
@@ -717,41 +658,75 @@ STATIC void _update_peer_count(void) {
             break;          // Should not happen
         }
     }
-    self->peer_count = count;
+
+    self->num_peers = count;
 }
 
-// ESPNow.add_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]]) or
-// ESPNow.add_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False],
-//          [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
-// Positional args set to None will be left at defaults.
-// Raise OSError if ESPNow.init() has not been called.
-// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-// Raise TypeError if invalid keyword args or too many positional args.
-// Return None.
-STATIC mp_obj_t espnow_add_peer(
-    size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+// ESPNow.add_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False], [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
+
+//|     def add_peer(self, peer_mac: bytes(6), lmk: bytes, channel: int, ifidx: int, encrypt: bool) -> None:
+//|     """
+//|         Positional args set to None will be left at defaults.
+//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+//|         Raise TypeError if invalid keyword args or too many positional args.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    espnow_obj_t *self = args[0];
+    check_for_deinit(self);
 
     esp_now_peer_info_t peer = {0};
     memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
-    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
 
+    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
     check_esp_err(esp_now_add_peer(&peer));
-    _update_peer_count();
+    _update_peer_count(self);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
 
-// ESPNow.del_peer(peer_mac): Unregister peer_mac.
-// Raise OSError if ESPNow.init() has not been called.
-// Raise ValueError if peer is not a bytes-like objects or wrong length.
-// Return None.
-STATIC mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
+// ESPNow.mod_peer(self, peer_mac, [lmk=b'0123456789abcdef'|b''|None|False], [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
+
+//|     def mod_peer(self, peer_mac: bytes(6), lmk: bytes, channel: int, ifidx: int, encrypt: bool) -> None:
+//|     """
+//|         Positional args set to None will be left at current values.
+//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+//|         Raise TypeError if invalid keyword args or too many positional args.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    espnow_obj_t *self = args[0];
+    check_for_deinit(self);
+
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
+    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+
+    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
+    check_esp_err(esp_now_mod_peer(&peer));
+    _update_peer_count(self);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
+
+//|     def del_peer(peer_mac: bytes(6)) -> None:
+//|     """Un-register peer_mac.
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_del_peer(mp_obj_t self_in, mp_obj_t peer) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     uint8_t peer_addr[ESP_NOW_ETH_ALEN];
     memcpy(peer_addr, _get_peer(peer), ESP_NOW_ETH_ALEN);
 
     check_esp_err(esp_now_del_peer(peer_addr));
-    _update_peer_count();
+    _update_peer_count(self);
 
     return mp_const_none;
 }
@@ -768,127 +743,95 @@ static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
         (peer->encrypt) ? mp_const_true : mp_const_false);
 }
 
-// ESPNow.get_peers(): Fetch peer_info records for all registered ESPNow peers.
-// Raise OSError if ESPNow.init() has not been called.
-// Return a tuple of tuples:
-//     ((peer_addr, lmk, channel, ifidx, encrypt),
-//      (peer_addr, lmk, channel, ifidx, encrypt), ...)
-STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
-    esp_espnow_obj_t *self = _get_singleton_initialised();
+//|     def get_peer(self, peer_mac: bytes(6)) -> Tuple[bytes, int, int, bool]:
+//|     """
+//|         Get the peer info for peer_mac as a tuple.
+//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
+//|         Returns a tuple of (peer_addr, lmk, channel, ifidx, encrypt).
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_get_peer(mp_obj_t self_in, mp_obj_t peer_mac) {
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer(peer_mac), ESP_NOW_ETH_ALEN);
+    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+    return _peer_info_to_tuple(&peer);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
+
+//|     def get_peers(self) -> Tuple[Tuple[bytes, bytes, int, int, bool], ...]:
+//|     """
+//|         Fetch peer_info records for all registered ESPNow peers.
+//|         Returns a tuple of tuples: ((peer_addr, lmk, channel, ifidx, encrypt), ...)
+//|     """
+//|     ...
+//|
+STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     // Build and initialise the peer info tuple.
-    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->peer_count, NULL);
+    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->num_peers, NULL);
     esp_now_peer_info_t peer = {0};
+
     for (size_t i = 0; i < peerinfo_tuple->len; i++) {
         esp_err_t status = esp_now_fetch_peer((i == 0), &peer);
-        peerinfo_tuple->items[i] =
-            (status == ESP_OK ? _peer_info_to_tuple(&peer) : mp_const_none);
+        peerinfo_tuple->items[i] = (status == ESP_OK ? _peer_info_to_tuple(&peer) : mp_const_none);
     }
 
     return peerinfo_tuple;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 
-#if MICROPY_ESPNOW_EXTRA_PEER_METHODS
-// ESPNow.get_peer(peer_mac): Get the peer info for peer_mac as a tuple.
-// Raise OSError if ESPNow.init() has not been called.
-// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-// Return a tuple of (peer_addr, lmk, channel, ifidx, encrypt).
-STATIC mp_obj_t espnow_get_peer(mp_obj_t _, mp_obj_t arg1) {
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer(arg1), ESP_NOW_ETH_ALEN);
-
-    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
-
-    return _peer_info_to_tuple(&peer);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
-
-// ESPNow.mod_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]]) or
-// ESPNow.mod_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False],
-//          [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
-// Positional args set to None will be left at current values.
-// Raise OSError if ESPNow.init() has not been called.
-// Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-// Raise TypeError if invalid keyword args or too many positional args.
-// Return None.
-STATIC mp_obj_t espnow_mod_peer(
-    size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
-    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
-
-    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
-
-    check_esp_err(esp_now_mod_peer(&peer));
-    _update_peer_count();
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
-
-// ESPNow.espnow_peer_count(): Get the number of registered peers.
-// Raise OSError if ESPNow.init() has not been called.
-// Return a tuple of (num_total_peers, num_encrypted_peers).
-STATIC mp_obj_t espnow_peer_count(mp_obj_t _) {
+//|     num_peers: Tuple[int, int]
+//|     """The number of registered peers in a tuple of (num_total_peers, num_encrypted_peers). (read-only)
+//|     """
+//|
+STATIC mp_obj_t espnow_get_num_peers(mp_obj_t self_in) {
     esp_now_peer_num_t peer_num = {0};
     check_esp_err(esp_now_get_peer_num(&peer_num));
-
     return NEW_TUPLE(
         mp_obj_new_int(peer_num.total_num),
         mp_obj_new_int(peer_num.encrypt_num));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_count_obj, espnow_peer_count);
-#endif
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_num_peers_obj, espnow_get_num_peers);
 
-STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&espnow_active_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&espnow_config_obj) },
-    { MP_ROM_QSTR(MP_QSTR_on_recv), MP_ROM_PTR(&espnow_on_recv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stats), MP_ROM_PTR(&espnow_stats_obj) },
+MP_PROPERTY_GETTER(espnow_num_peers_obj,
+    (mp_obj_t)&espnow_get_num_peers_obj);
+
+STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active),      MP_ROM_PTR(&espnow_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config),      MP_ROM_PTR(&espnow_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stats),       MP_ROM_PTR(&espnow_stats_obj) },
 
     // Send and receive messages
-    { MP_ROM_QSTR(MP_QSTR_recvinto), MP_ROM_PTR(&espnow_recvinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&espnow_send_obj) },
-    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&espnow_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_any),         MP_ROM_PTR(&espnow_any_obj) },
 
     // Peer management functions
-    { MP_ROM_QSTR(MP_QSTR_set_pmk), MP_ROM_PTR(&espnow_set_pmk_obj) },
-    { MP_ROM_QSTR(MP_QSTR_add_peer), MP_ROM_PTR(&espnow_add_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_del_peer), MP_ROM_PTR(&espnow_del_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_peers), MP_ROM_PTR(&espnow_get_peers_obj) },
-    #if MICROPY_ESPNOW_EXTRA_PEER_METHODS
-    { MP_ROM_QSTR(MP_QSTR_mod_peer), MP_ROM_PTR(&espnow_mod_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_peer), MP_ROM_PTR(&espnow_get_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_peer_count), MP_ROM_PTR(&espnow_peer_count_obj) },
-    #endif // MICROPY_ESPNOW_EXTRA_PEER_METHODS
+    { MP_ROM_QSTR(MP_QSTR_set_pmk),     MP_ROM_PTR(&espnow_set_pmk_obj) },
+    { MP_ROM_QSTR(MP_QSTR_add_peer),    MP_ROM_PTR(&espnow_add_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mod_peer),    MP_ROM_PTR(&espnow_mod_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_del_peer),    MP_ROM_PTR(&espnow_del_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_peer),    MP_ROM_PTR(&espnow_get_peer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_peers),   MP_ROM_PTR(&espnow_get_peers_obj) },
+    { MP_ROM_QSTR(MP_QSTR_num_peers),   MP_ROM_PTR(&espnow_num_peers_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 
-STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__espnow) },
-    { MP_ROM_QSTR(MP_QSTR_ESPNow), MP_ROM_PTR(&esp_espnow_type) },
-    { MP_ROM_QSTR(MP_QSTR_MAX_DATA_LEN), MP_ROM_INT(ESP_NOW_MAX_DATA_LEN)},
-    { MP_ROM_QSTR(MP_QSTR_ETH_ALEN), MP_ROM_INT(ESP_NOW_ETH_ALEN)},
-    { MP_ROM_QSTR(MP_QSTR_KEY_LEN), MP_ROM_INT(ESP_NOW_KEY_LEN)},
-    { MP_ROM_QSTR(MP_QSTR_MAX_TOTAL_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_TOTAL_PEER_NUM)},
-    { MP_ROM_QSTR(MP_QSTR_MAX_ENCRYPT_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_ENCRYPT_PEER_NUM)},
-};
-STATIC MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
-
-// ### Dummy Buffer Protocol support
+// --- Dummy Buffer Protocol support ---
 // ...so asyncio can poll.ipoll() on this device
 
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
-STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request,
-    uintptr_t arg, int *errcode) {
+STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     if (request != MP_STREAM_POLL) {
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;
     }
-    esp_espnow_obj_t *self = _get_singleton();
-    return (self->recv_buffer == NULL) ? 0 :  // If not initialised
+
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return (espnow_deinited(self)) ? 0 :  // If not initialised
            arg ^ (
                // If no data in the buffer, unset the Read ready flag
                ((ringbuf_avail(self->recv_buffer) == 0) ? MP_STREAM_POLL_RD : 0) |
@@ -900,16 +843,14 @@ STATIC const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
-#if MICROPY_ESPNOW_RSSI
-// Return reference to the dictionary of peers we have seen:
-//   {peer1: (rssi, time_sec), peer2: (rssi, time_msec), ...}
-// where:
-//   peerX is a byte string containing the 6-byte mac address of the peer,
-//   rssi is the wifi signal strength from the last msg received
-//       (in dBm from -127 to 0)
-//   time_sec is the time in milliseconds since device last booted.
+//  Return reference to the dictionary of peers we have seen:
+//  {peer1: (rssi, time), peer2: (rssi, time), ...}
+//  where:
+//      peerX is a byte string containing the 6-byte mac address of the peer,
+//      rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0)
+//      time is the time in milliseconds since device last booted.
 STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    esp_espnow_obj_t *self = _get_singleton();
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] != MP_OBJ_NULL) {   // Only allow "Load" operation
         return;
     }
@@ -917,27 +858,17 @@ STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         dest[0] = self->peers_table;
         return;
     }
-    dest[1] = MP_OBJ_SENTINEL;  // Attribute not found
+    dest[1] = MP_OBJ_SENTINEL;      // Attribute not found
 }
-#endif // MICROPY_ESPNOW_RSSI
 
-STATIC const mp_obj_type_t esp_espnow_type = {
+const mp_obj_type_t espnow_type = {
     { &mp_type_type },
-    .name = MP_QSTR_ESPNow,
+    .name = MP_QSTR_NOW,
     .make_new = espnow_make_new,
-    .locals_dict = (mp_obj_t)&esp_espnow_locals_dict,
-    #if MICROPY_ESPNOW_RSSI
+    .locals_dict = (mp_obj_t)&espnow_locals_dict,
     .attr = espnow_attr,
-    #endif // MICROPY_ESPNOW_RSSI
     .flags = MP_TYPE_FLAG_EXTENDED,
     MP_TYPE_EXTENDED_FIELDS(
         .protocol = &espnow_stream_p,
         ),
 };
-
-const mp_obj_module_t mp_module_espnow = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&espnow_globals_dict,
-};
-
-MP_REGISTER_MODULE(MP_QSTR__espnow, mp_module_espnow, CIRCUITPY_ESPNOW);
diff --git a/ports/espressif/bindings/espnow/ESPNow.h b/ports/espressif/bindings/espnow/Now.h
similarity index 95%
rename from ports/espressif/bindings/espnow/ESPNow.h
rename to ports/espressif/bindings/espnow/Now.h
index 9855cd4ff8..6aa011c501 100644
--- a/ports/espressif/bindings/espnow/ESPNow.h
+++ b/ports/espressif/bindings/espnow/Now.h
@@ -26,4 +26,6 @@
  */
 
 #pragma once
-void espnow_reset(void);
+
+#include "py/obj.h"
+extern const mp_obj_type_t espnow_type;
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
new file mode 100644
index 0000000000..52325dad58
--- /dev/null
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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/util.h"
+
+#include "bindings/espnow/__init__.h"
+#include "bindings/espnow/Now.h"
+
+//| """ESP-NOW Module
+//|
+//| The `espnow` module provides an interface to the
+//| `ESP-NOW `_
+//| protocol provided by Espressif on its SoCs
+//| (`API docs `_).
+//|
+//| **Sender:** ::
+//|
+//|     import espnow
+//|
+//|     e = espnow.ESPNow()
+//|     e.active(True)
+//|     peer = b'\xbb\xbb\xbb\xbb\xbb\xbb'   # MAC address of peer's wifi interface
+//|     e.add_peer(peer)
+//|
+//|     e.send("Starting...")   # Send to all peers
+//|     for i in range(100):
+//|         e.send(peer, str(i)*20, True)
+//|         e.send(b'end')
+//|
+//| **Receiver:** ::
+//|
+//|     import espnow
+//|
+//|     e = espnow.ESPNow()
+//|     e.active(True)
+//|     peer = b'\xaa\xaa\xaa\xaa\xaa\xaa'   # MAC address of peer's wifi interface
+//|     e.add_peer(peer)
+//|
+//|     while True:
+//|         host, msg = e.recv()
+//|         if msg:             # msg == None if timeout in recv()
+//|             print(host, msg)
+//|             if msg == b'end':
+//|                 break
+//| """
+//| ...
+//|
+
+STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
+    // module name
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) },
+    // module classes
+    { MP_ROM_QSTR(MP_QSTR_Now), MP_ROM_PTR(&espnow_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table);
+
+const mp_obj_module_t espnow_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&espnow_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_espnow, espnow_module, CIRCUITPY_ESPNOW);
diff --git a/ports/espressif/bindings/espnow/__init__.h b/ports/espressif/bindings/espnow/__init__.h
new file mode 100644
index 0000000000..fb814a434f
--- /dev/null
+++ b/ports/espressif/bindings/espnow/__init__.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+void espnow_reset(void);
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index 8c206cf02a..e4733356bb 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -44,7 +44,7 @@
 #endif
 
 #if CIRCUITPY_ESPNOW
-#define ESPNOW_ROOT_POINTERS struct _esp_espnow_obj_t *espnow_singleton;
+#define ESPNOW_ROOT_POINTERS struct _espnow_obj_t *espnow_singleton;
 #else
 #define ESPNOW_ROOT_POINTERS
 #endif
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 8a6dfabb5f..be33b87cca 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -37,7 +37,7 @@
 #include "freertos/task.h"
 
 #include "bindings/espidf/__init__.h"
-#include "bindings/espnow/ESPNow.h"
+#include "bindings/espnow/__init__.h"
 #include "bindings/espulp/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"

From 3c10dd8b5f033e8822f845359c4ef1812c331d6b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 23:10:00 +0530
Subject: [PATCH 1716/2403] update espnow api

---
 locale/circuitpython.pot                      |  12 +-
 .../bindings/espnow/{Now.c => ESPNow.c}       | 776 +++++++++---------
 .../bindings/espnow/{Now.h => ESPNow.h}       |   0
 ports/espressif/bindings/espnow/__init__.c    |  12 +-
 py/objtuple.h                                 |   3 +
 py/ringbuf.c                                  |  64 +-
 py/ringbuf.h                                  |  10 -
 7 files changed, 415 insertions(+), 462 deletions(-)
 rename ports/espressif/bindings/espnow/{Now.c => ESPNow.c} (50%)
 rename ports/espressif/bindings/espnow/{Now.h => ESPNow.h} (100%)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index d0fb9e5da4..cca9e1b067 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -124,7 +124,7 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/ESPNow.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -2430,7 +2430,7 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/Now.c
+#: ports/espressif/bindings/espnow/ESPNow.c
 msgid "an error occured"
 msgstr ""
 
@@ -3814,6 +3814,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "peer already exists"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
@@ -4158,10 +4162,6 @@ msgstr ""
 msgid "unindent doesn't match any outer indent level"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/Now.c
-msgid "unknown config param"
-msgstr ""
-
 #: py/objstr.c
 #, c-format
 msgid "unknown conversion specifier %c"
diff --git a/ports/espressif/bindings/espnow/Now.c b/ports/espressif/bindings/espnow/ESPNow.c
similarity index 50%
rename from ports/espressif/bindings/espnow/Now.c
rename to ports/espressif/bindings/espnow/ESPNow.c
index 935a740164..0bcd7d39ed 100644
--- a/ports/espressif/bindings/espnow/Now.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -38,18 +38,15 @@
 #include "mphalport.h"
 
 #include "bindings/espnow/__init__.h"
-#include "bindings/espnow/Now.h"
+#include "bindings/espnow/ESPNow.h"
 
 #include "shared-bindings/util.h"
 #include "shared-bindings/wifi/__init__.h"
 
-// Relies on gcc Variadic Macros and Statement Expressions
-#define NEW_TUPLE(...) ({mp_obj_t _z[] = {__VA_ARGS__}; mp_obj_new_tuple(MP_ARRAY_SIZE(_z), _z);})
-
 #define ESPNOW_MAGIC 0x99
 
 // The maximum length of an espnow packet (bytes)
-#define MAX_PACKET_LEN (sizeof(espnow_pkt_t) + ESP_NOW_MAX_DATA_LEN)
+#define MAX_PACKET_LEN (sizeof(espnow_packet_t) + ESP_NOW_MAX_DATA_LEN)
 
 // Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
 // Will allocate an additional 7 bytes for buffer overhead
@@ -73,26 +70,26 @@ typedef struct {
     uint8_t msg_len;            // Length of the message
     uint32_t time_ms;           // Timestamp (ms) when packet is received
     int8_t rssi;                // RSSI value (dBm) (-127 to 0)
-} __attribute__((packed)) espnow_hdr_t;
+} __attribute__((packed)) espnow_header_t;
 
 typedef struct {
-    espnow_hdr_t hdr;           // The header
+    espnow_header_t header;     // The header
     uint8_t peer[6];            // Peer address
     uint8_t msg[0];             // Message is up to 250 bytes
-} __attribute__((packed)) espnow_pkt_t;
+} __attribute__((packed)) espnow_packet_t;
 
 // The data structure for the espnow_singleton.
 typedef struct _espnow_obj_t {
     mp_obj_base_t base;
     ringbuf_t *recv_buffer;         // A buffer for received packets
     size_t recv_buffer_size;        // The size of the recv_buffer
-    size_t recv_timeout_ms;         // Timeout for recv()
+    wifi_phy_rate_t phy_rate;       // The ESP-NOW physical layer rate.
     volatile size_t rx_packets;     // # of received packets
     volatile size_t rx_failures;    // # of dropped packets (buffer full)
     size_t tx_packets;              // # of sent packets
     volatile size_t tx_responses;   // # of sent packet responses received
     volatile size_t tx_failures;    // # of sent packet responses failed
-    size_t num_peers;               // Cache the # of peers for send(sync=True)
+    size_t peers_count;             // Cache the # of peers for send(sync=True)
     mp_obj_t peers_table;           // A dictionary of discovered peers
 } espnow_obj_t;
 
@@ -105,8 +102,6 @@ static void check_esp_err(esp_err_t status) {
 // --- Initialisation and Config functions ---
 
 // Return a pointer to the ESPNow module singleton
-// If state == INITIALISED check the device has been initialised.
-// Raises OSError if not initialised and state == INITIALISED.
 static espnow_obj_t *_get_singleton(void) {
     return MP_STATE_PORT(espnow_singleton);
 }
@@ -115,43 +110,57 @@ static bool espnow_deinited(espnow_obj_t *self) {
     return self->recv_buffer == NULL;
 }
 
-// Return a pointer to the ESPNow module singleton
-// If state == INITIALISED check the device has been initialised.
-// Raises OSError if not initialised and state == INITIALISED.
 static void check_for_deinit(espnow_obj_t *self) {
     if (espnow_deinited(self)) {
         raise_deinited_error();
     }
 }
 
-//| class Now:
-//|     def __init__(self) -> Now:
-//|     """
-//|         Allocate and initialise the ESPNow module as a singleton.
-//|         Returns the initialised espnow_singleton.
-//|     """
-//|     ...
+static void _set_buffer_size(espnow_obj_t *self, mp_int_t value) {
+    self->recv_buffer_size = mp_arg_validate_int_min(value, MAX_PACKET_LEN, MP_QSTR_buffer_size);
+};
+
+static void _set_phy_rate(espnow_obj_t *self, mp_int_t value) {
+    self->phy_rate = mp_arg_validate_int_range(value, 0, WIFI_PHY_RATE_MAX - 1, MP_QSTR_phy_rate);
+};
+
+//| class ESPNow:
+//|     """Provides access to the ESP-NOW protocol."""
 //|
+//|     def __init__(self, buffer_size: Optional[int], phy_rate: Optional[int]) -> None:
+//|         """Allocate and initialize `ESPNow` instance as a singleton.
+//|
+//|         :param int buffer_size: The size of the internal ring buffer (length > 263 bytes). Default: 526 bytes.
+//|         :param int phy_rate: The ESP-NOW physical layer rate. Default 1 Mbps."""
+//|         ...
 STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_buffer_size, ARG_phy_rate };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buffer_size,  MP_ARG_INT, { .u_int = DEFAULT_RECV_BUFFER_SIZE } },
+        { MP_QSTR_phy_rate,     MP_ARG_INT, { .u_int = WIFI_PHY_RATE_1M_L } },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
     espnow_obj_t *self = _get_singleton();
 
-    if (self != NULL) {
-        return self;
+    if (self == NULL) {
+        self = m_new_obj(espnow_obj_t);
+        self->base.type = &espnow_type;
+
+        _set_buffer_size(self, args[ARG_buffer_size].u_int);
+        _set_phy_rate(self, args[ARG_phy_rate].u_int);
+
+        self->peers_table = mp_obj_new_dict(0);
+
+        // Prevent user code modifying the dict
+        mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
+
+        // Set the global singleton pointer for the espnow protocol.
+        MP_STATE_PORT(espnow_singleton) = self;
     }
 
-    self = m_new_obj(espnow_obj_t);
-    self->base.type = &espnow_type;
-    self->recv_buffer_size = DEFAULT_RECV_BUFFER_SIZE;
-    self->recv_timeout_ms = DEFAULT_RECV_TIMEOUT_MS;
-    self->recv_buffer = NULL;
-    self->peers_table = mp_obj_new_dict(0);
-
-    // Prevent user code modifying the dict
-    mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
-
-    // Set the global singleton pointer for the espnow protocol.
-    MP_STATE_PORT(espnow_singleton) = self;
-
     return self;
 }
 
@@ -160,7 +169,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
+static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
     espnow_obj_t *self = _get_singleton();
     self->tx_responses++;
     if (status != ESP_NOW_SEND_SUCCESS) {
@@ -168,58 +177,49 @@ static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
     }
 }
 
-static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg);
+static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg);
 
-// Callback triggered when an ESP-Now packet is received.
+// Callback triggered when an ESP-NOW packet is received.
 // Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
 // If the buffer is full, drop the message and increment the dropped count.
-// Schedules the user callback if one has been registered (ESPNow.config()).
-static void recv_cb(const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
+static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     espnow_obj_t *self = _get_singleton();
     ringbuf_t *buf = self->recv_buffer;
 
-    // TODO: Test this works with ">".
-    if (sizeof(espnow_pkt_t) + msg_len >= ringbuf_free(buf)) {
+    if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
         self->rx_failures++;
         return;
     }
 
-    espnow_hdr_t header;
+    espnow_header_t header;
     header.magic = ESPNOW_MAGIC;
     header.msg_len = msg_len;
-    header.rssi = _get_rssi_from_wifi_pkt(msg);
+    header.rssi = _get_rssi_from_wifi_packet(msg);
     header.time_ms = mp_hal_ticks_ms();
 
-    ringbuf_write(buf, &header, sizeof(header));
-    ringbuf_write(buf, mac_addr, ESP_NOW_ETH_ALEN);
-    ringbuf_write(buf, msg, msg_len);
+    ringbuf_put_n(buf, (uint8_t *)&header, sizeof(header));
+    ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
+    ringbuf_put_n(buf, msg, msg_len);
 
     self->rx_packets++;
 }
 
-static void _wifi_init(void) {
-    if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
-        common_hal_wifi_init(false);
-        common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
-    }
-}
-
-//|     def init() -> None:
-//|     """
-//|         Initialise the data buffers and ESP-NOW functions.
-//|         Initialise the Espressif ESP-NOW software stack, register callbacks
-//|         and allocate the recv data buffers.
-//|     """
-//|     ...
-//|
+// Initialize the ESP-NOW software stack,
+// register callbacks and allocate the recv data buffers.
 static void espnow_init(espnow_obj_t *self) {
-    if (espnow_deinited(self)) {    // Already initialised
+    if (espnow_deinited(self)) {
         self->recv_buffer = m_new_obj(ringbuf_t);
         if (!ringbuf_alloc(self->recv_buffer, self->recv_buffer_size, true)) {
             m_malloc_fail(self->recv_buffer_size);
         }
 
-        _wifi_init();   // Call the wifi init code
+        if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+            common_hal_wifi_init(false);
+            common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
+        }
+
+        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, self->phy_rate));
+        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, self->phy_rate));
 
         check_esp_err(esp_now_init());
         check_esp_err(esp_now_register_send_cb(send_cb));
@@ -227,13 +227,8 @@ static void espnow_init(espnow_obj_t *self) {
     }
 }
 
-//|     def deinit() -> None:
-//|     """
-//|         De-initialise the ESP-NOW software stack, disable callbacks
-//|         and deallocate the recv data buffers.
-//|     """
-//|     ...
-//|
+// De-initialize the ESP-NOW software stack,
+// disable callbacks and deallocate the recv data buffers.
 static void espnow_deinit(espnow_obj_t *self) {
     if (self != NULL && !espnow_deinited(self)) {
         check_esp_err(esp_now_unregister_send_cb());
@@ -241,7 +236,7 @@ static void espnow_deinit(espnow_obj_t *self) {
         check_esp_err(esp_now_deinit());
         self->recv_buffer->buf = NULL;
         self->recv_buffer = NULL;
-        self->num_peers = 0; // esp_now_deinit() removes all peers.
+        self->peers_count = 0; // esp_now_deinit() removes all peers.
         self->tx_packets = self->tx_responses;
     }
 }
@@ -251,89 +246,94 @@ void espnow_reset(void) {
     MP_STATE_PORT(espnow_singleton) = NULL;
 }
 
-//|     def active(state: bool) -> bool:
-//|     """
-//|         Initialise or de-initialise the ESPNow communication protocol
-//|         depending on the value of the flag optional argument.
-//|     """
-//|     ...
-//|
-STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
-    espnow_obj_t *self = args[0];
-    if (n_args > 1) {
-        if (mp_obj_is_true(args[1])) {
-            espnow_init(self);
-        } else {
-            espnow_deinit(self);
-        }
-    }
-    return mp_obj_new_bool(!espnow_deinited(self));
+// Return C pointer to byte memory string/bytes/bytearray in obj.
+// Raise ValueError if the length does not match expected len.
+static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, rw);
+    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
+    return (uint8_t *)bufinfo.buf;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
 
-//|     def config(['param'|param=value, ..]) -> int:
-//|     """
-//|         Get or set configuration values. Supported config params:
-//|         buffer: size of buffer for rx packets (default=514 bytes)
-//|         timeout: Default read timeout (default=300,000 milliseconds)
-//|     """
-//|     ...
+//|     def set_pmk(self, pmk: bytes) -> None:
+//|         """Set the ESP-NOW Primary Master Key (pmk) for encrypted communications.
 //|
-STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    espnow_obj_t *self = pos_args[0];
-    enum { ARG_get, ARG_buffer, ARG_timeout, ARG_rate };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_buffer, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-    };
-
-    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);
-
-    if (args[ARG_buffer].u_int >= 0) {
-        self->recv_buffer_size = args[ARG_buffer].u_int;
-    }
-
-    if (args[ARG_timeout].u_int >= 0) {
-        self->recv_timeout_ms = args[ARG_timeout].u_int;
-    }
-
-    if (args[ARG_rate].u_int >= 0) {
-        _wifi_init();  // Call the wifi init code
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, args[ARG_rate].u_int));
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, args[ARG_rate].u_int));
-    }
-
-    if (args[ARG_get].u_obj == MP_OBJ_NULL) {
-        return mp_const_none;
-    }
-
-#define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
-    // Return the value of the requested parameter
-    uintptr_t name = (uintptr_t)args[ARG_get].u_obj;
-    if (name == QS(MP_QSTR_buffer)) {
-        return mp_obj_new_int(self->recv_buffer_size);
-    } else if (name == QS(MP_QSTR_timeout)) {
-        return mp_obj_new_int(self->recv_timeout_ms);
-    } else {
-        mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
-    }
-#undef QS
-
+//|         :param bytes pmk: The ESP-NOW Primary Master Key (length = 16 bytes)."""
+//|         ...
+STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
+    check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN, MP_BUFFER_READ)));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
+
+//|     active: bool
+//|     """Initialize or de-initialize the `ESPNow` communication protocol."""
+//|
+STATIC mp_obj_t espnow_get_active(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(!espnow_deinited(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_active_obj, espnow_get_active);
+
+STATIC mp_obj_t espnow_set_active(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_is_true(value) ? espnow_init(self) : espnow_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_active_obj, espnow_set_active);
+
+MP_PROPERTY_GETSET(espnow_active_obj,
+    (mp_obj_t)&espnow_get_active_obj,
+    (mp_obj_t)&espnow_set_active_obj);
+
+
+//|     buffer_size: int
+//|     """The size of the internal ring buffer."""
+//|
+STATIC mp_obj_t espnow_get_buffer_size(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->recv_buffer_size);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_buffer_size_obj, espnow_get_buffer_size);
+
+STATIC mp_obj_t espnow_set_buffer_size(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    _set_buffer_size(self, mp_obj_get_int(value));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_buffer_size_obj, espnow_set_buffer_size);
+
+MP_PROPERTY_GETSET(espnow_buffer_size_obj,
+    (mp_obj_t)&espnow_get_buffer_size_obj,
+    (mp_obj_t)&espnow_set_buffer_size_obj);
+
+//|     phy_rate: int
+//|     """The ESP-NOW physical layer rate."""
+//|
+STATIC mp_obj_t espnow_get_phy_rate(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->phy_rate);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_phy_rate_obj, espnow_get_phy_rate);
+
+STATIC mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    _set_phy_rate(self, mp_obj_get_int(value));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_phy_rate_obj, espnow_set_phy_rate);
+
+MP_PROPERTY_GETSET(espnow_phy_rate_obj,
+    (mp_obj_t)&espnow_get_phy_rate_obj,
+    (mp_obj_t)&espnow_set_phy_rate_obj);
 
 //|     stats: Tuple[int, int, int, int, int]
-//|     """Provide some useful stats.
-//|        Returns a tuple of (tx_packets, tx_responses, tx_failures, rx_packets, rx_failures).
-//|     """
+//|     """Provide some useful stats in a `tuple` of
+//|        (tx_packets, tx_responses, tx_failures, rx_packets, rx_failures). (read-only)"""
 //|
 STATIC mp_obj_t espnow_get_stats(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return NEW_TUPLE(
+    return MP_OBJ_NEW_TUPLE(
         mp_obj_new_int(self->tx_packets),
         mp_obj_new_int(self->tx_responses),
         mp_obj_new_int(self->tx_failures),
@@ -346,26 +346,26 @@ MP_PROPERTY_GETTER(espnow_stats_obj,
     (mp_obj_t)&espnow_get_stats_obj);
 
 // --- Maintaining the peer table and reading RSSI values ---
-//
+
 // We maintain a peers table for several reasons, to:
 // - support monitoring the RSSI values for all peers; and
 // - to return unique bytestrings for each peer which supports more efficient
 //   application memory usage and peer handling.
 
 // Get the RSSI value from the wifi packet header
-static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
+static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
     // Warning: Secret magic to get the rssi from the wifi packet header
     // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
     // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
     // and a espnow_frame_format_t.
     // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
-    static const size_t sizeof_espnow_frame_format = 39;
+    #define SIZEOF_ESPNOW_FRAME_FORMAT 39
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wcast-align"
-    wifi_promiscuous_pkt_t *wifi_pkt = (wifi_promiscuous_pkt_t *)(
-        msg - sizeof_espnow_frame_format - sizeof(wifi_promiscuous_pkt_t));
+    wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
+        msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
     #pragma GCC diagnostic pop
-    return wifi_pkt->rx_ctrl.rssi;
+    return wifi_packet->rx_ctrl.rssi;
 }
 
 // Lookup a peer in the peers table and return a reference to the item in the peers_table.
@@ -388,54 +388,24 @@ static mp_map_elem_t *_lookup_add_peer(espnow_obj_t *self, const uint8_t *peer)
     return item;
 }
 
-// Update the peers table with the new rssi value from a received pkt and
+// Update the peers table with the new rssi value from a received packet and
 // return a reference to the item in the peers_table.
-static mp_map_elem_t *_update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
+static void _update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
     // Lookup the peer in the device table
     mp_map_elem_t *item = _lookup_add_peer(self, peer);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
     list->items[0] = MP_OBJ_NEW_SMALL_INT(rssi);
     list->items[1] = mp_obj_new_int(time_ms);
-    return item;
 }
 
 // --- Handling espnow packets in the recv buffer ---
 
-// --- Send and Receive ESP_Now data ---
-
-// Return C pointer to byte memory string/bytes/bytearray in obj.
-// Raise ValueError if the length does not match expected len.
-static uint8_t *_get_bytes_len_rw(mp_obj_t obj, size_t len, mp_uint_t rw) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(obj, &bufinfo, rw);
-    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_bytes);
-    return (uint8_t *)bufinfo.buf;
-}
-
-static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len) {
-    return _get_bytes_len_rw(obj, len, MP_BUFFER_READ);
-}
-
-static uint8_t *_get_bytes_len_w(mp_obj_t obj, size_t len) {
-    return _get_bytes_len_rw(obj, len, MP_BUFFER_WRITE);
-}
+// --- Send and Receive ESP-NOW data ---
 
 // Return C pointer to the MAC address.
-// Raise ValueError if mac_addr is wrong type or is not 6 bytes long.
-static const uint8_t *_get_peer(mp_obj_t mac_addr) {
-    return mp_obj_is_true(mac_addr) ? _get_bytes_len(mac_addr, ESP_NOW_ETH_ALEN) : NULL;
-}
-
-// Copy data from the ring buffer - wait if buffer is empty up to timeout_ms
-static int ringbuf_read_wait(ringbuf_t *r, void *data, size_t len, int timeout_ms) {
-    int64_t end = mp_hal_ticks_ms() + timeout_ms;
-    int status = 0;
-    while (
-        ((status = ringbuf_read(r, data, len)) == 0) &&
-        (end - (int64_t)mp_hal_ticks_ms()) >= 0) {
-        RUN_BACKGROUND_TASKS;
-    }
-    return status;
+// Raise ValueError if mac is wrong type or is not 6 bytes long.
+static const uint8_t *_get_peer_addr(mp_obj_t mac) {
+    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
 }
 
 // Used by espnow_send() for sends() with sync==True.
@@ -454,57 +424,70 @@ static void _wait_for_pending_responses(espnow_obj_t *self) {
     }
 }
 
-//|     def send(peer_addr: bytes = None, message: Union[bytes, str], sync: bool = True) -> bool:
-//|     """
-//|         Send a message to the peer's mac address. Optionally wait for a response.
-//|         If peer_addr == None or any non-true value, send to all registered peers.
-//|         If sync == True, wait for response after sending.
-//|         If size is provided it should be the number of bytes in message to send().
+//|     def send(
+//|         self,
+//|         message: Union[bytearray, bytes, str],
+//|         mac: Optional[bytes],
+//|         sync: bool = True,
+//|     ) -> bool:
+//|         """Send a message to the peer's mac address. Optionally wait for a response.
 //|
-//|         Returns:
-//|             True  if sync == False and message sent successfully.
-//|             True  if sync == True and message is received successfully by all recipients
-//|             False if sync == True and message is not received by at least one recipient
+//|         :param Union[bytearray, bytes, str] message: The message to send (length < 250 bytes).
+//|         :param bytes mac: The peer's address (length = 6 bytes). If `None` or any non-true value, send to all registered peers.
+//|         :param bool sync: If `True`, wait for response from peer(s) after sending.
 //|
-//|         Raises: EAGAIN if the internal espnow buffers are full.
-//|     """
-//|     ...
+//|         :returns:
+//|             `True` if sync == `False` and message sent successfully.
+//|             `True` if sync == `True` and message is received successfully by all recipients
+//|             `False` if sync == `True` and message is not received by at least one recipient
 //|
-STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
-    espnow_obj_t *self = args[0];
+//|         :raises EAGAIN: if the internal espnow buffers are full."""
+//|         ...
+STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_message, ARG_mac, ARG_sync };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_mac,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
+        { MP_QSTR_sync,     MP_ARG_BOOL, { .u_bool = mp_const_true } },
+    };
+
+    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);
+
+    espnow_obj_t *self = pos_args[0];
     check_for_deinit(self);
 
-    // Check the various combinations of input arguments
-    const uint8_t *peer = (n_args > 2) ? _get_peer(args[1]) : NULL;
-    mp_obj_t msg = (n_args > 2) ? args[2] : (n_args == 2) ? args[1] : MP_OBJ_NULL;
-    bool sync = n_args <= 3 || args[3] == mp_const_none || mp_obj_is_true(args[3]);
-
-    // Get a pointer to the data buffer of the message
-    mp_buffer_info_t message;
-    mp_get_buffer_raise(msg, &message, MP_BUFFER_READ);
+    const bool sync = mp_obj_is_true(args[ARG_sync].u_obj);
 
     if (sync) {
         // Flush out any pending responses.
-        // If the last call was sync==False there may be outstanding responses
-        // still to be received (possible many if we just had a burst of
-        // unsync send()s). We need to wait for all pending responses if this
-        // call has sync=True.
+        // If the last call was sync == False there may be outstanding responses
+        // still to be received (possible many if we just had a burst of unsync send()s).
+        // We need to wait for all pending responses if this call has sync = True.
         _wait_for_pending_responses(self);
     }
 
-    size_t saved_failures = self->tx_failures;
+    const uint8_t *peer_addr = _get_peer_addr(args[ARG_mac].u_obj);
+
+    // Get a pointer to the data buffer of the message
+    mp_buffer_info_t message;
+    mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
+
     // Send the packet - try, try again if internal esp-now buffers are full.
     esp_err_t err;
-    int64_t start = mp_hal_ticks_ms();
-    while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(peer, message.buf, message.len))) &&
+    size_t saved_failures = self->tx_failures;
+    mp_uint_t start = mp_hal_ticks_ms();
+
+    while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(peer_addr, message.buf, message.len))) &&
            (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
         RUN_BACKGROUND_TASKS;
     }
-    check_esp_err(err);           // Will raise OSError if e != ESP_OK
+    check_esp_err(err);
+
+    // Increment the sent packet count.
+    // If peer_addr == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
+    self->tx_packets += ((peer_addr == NULL) ? self->peers_count : 1);
 
-    // Increment the sent packet count. If peer_addr==NULL msg will be
-    // sent to all peers EXCEPT any broadcast or multicast addresses.
-    self->tx_packets += ((peer == NULL) ? self->num_peers : 1);
     if (sync) {
         // Wait for and tally all the expected responses from peers
         _wait_for_pending_responses(self);
@@ -513,30 +496,25 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
     // Return False if sync and any peers did not respond.
     return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 
-//|     def recv(buffers: List[bytearray(6), bytearray(250), ...], timeout: int) -> Optional[int]:
-//|     """
-//|         Waits for an espnow message and copies the peer_addr and message into the buffers list.
+//|     def recv(self, buffers: List[bytearray]) -> int:
+//|         """Loads mac, message, rssi and timestamp into the provided buffers.
 //|
-//|         If buffers is 2 elements long, the peer_mac and message will be
+//|         If buffers is 2 elements long, the mac and message will be
 //|         loaded into the 1st and 2nd elements.
 //|         If buffers is 4 elements long, the rssi and timestamp values will be
 //|         loaded into the 3rd and 4th elements.
 //|
-//|         Default timeout is set with ESPNow.config(timeout=milliseconds).
-//|         Returns None on timeout otherwise length of the message.
-//|     """
-//|     ...
+//|         :param List[bytearray] buffers: List of buffers to be loaded.
 //|
-STATIC mp_obj_t espnow_recv(size_t n_args, const mp_obj_t *args) {
-    espnow_obj_t *self = args[0];
+//|         :returns: Length of the message."""
+//|         ...
+STATIC mp_obj_t espnow_recv(mp_obj_t self_in, mp_obj_t buffers) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
-            ? (size_t)mp_obj_get_int(args[2]) : self->recv_timeout_ms);
-
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(args[1]);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(buffers);
     if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
         mp_arg_error_invalid(MP_QSTR_buffers);
     }
@@ -547,21 +525,22 @@ STATIC mp_obj_t espnow_recv(size_t n_args, const mp_obj_t *args) {
         msg->free = 0;
     }
 
-    uint8_t peer_buf[ESP_NOW_ETH_ALEN];
-    uint8_t *msg_buf = _get_bytes_len_w(msg, ESP_NOW_MAX_DATA_LEN);
+    uint8_t *peer_buf = _get_bytes_len(list->items[0], ESP_NOW_ETH_ALEN, MP_BUFFER_WRITE);
+    uint8_t *msg_buf = _get_bytes_len(msg, ESP_NOW_MAX_DATA_LEN, MP_BUFFER_WRITE);
 
     // Read the packet header from the incoming buffer
-    espnow_hdr_t hdr;
-    if (ringbuf_read_wait(self->recv_buffer, &hdr, sizeof(hdr), timeout_ms) < 1) {
-        return MP_OBJ_NEW_SMALL_INT(0);    // Timeout waiting for packet
+    espnow_header_t header;
+    if (!ringbuf_get_n(self->recv_buffer, (uint8_t *)&header, sizeof(header))) {
+        return MP_OBJ_NEW_SMALL_INT(0);
     }
-    int msg_len = hdr.msg_len;
+
+    uint8_t msg_len = header.msg_len;
 
     // Check the message packet header format and read the message data
-    if (hdr.magic != ESPNOW_MAGIC ||
+    if (header.magic != ESPNOW_MAGIC ||
         msg_len > ESP_NOW_MAX_DATA_LEN ||
-        ringbuf_read(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) < 1 ||
-        ringbuf_read(self->recv_buffer, msg_buf, msg_len) < 1) {
+        !ringbuf_get_n(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) ||
+        !ringbuf_get_n(self->recv_buffer, msg_buf, msg_len)) {
         mp_arg_error_invalid(MP_QSTR_buffer);
     }
     if (mp_obj_is_type(msg, &mp_type_bytearray)) {
@@ -572,79 +551,87 @@ STATIC mp_obj_t espnow_recv(size_t n_args, const mp_obj_t *args) {
     }
 
     // Update rssi value in the peer device table
-    mp_map_elem_t *entry = _update_rssi(self, peer_buf, hdr.rssi, hdr.time_ms);
-    list->items[0] = entry->key;  // Set first element of list to peer
-    if (list->len >= 4) {
-        list->items[2] = MP_OBJ_NEW_SMALL_INT(hdr.rssi);
-        list->items[3] = mp_obj_new_int(hdr.time_ms);
+    _update_rssi(self, peer_buf, header.rssi, header.time_ms);
+    if (list->len == 4) {
+        list->items[2] = MP_OBJ_NEW_SMALL_INT(header.rssi);
+        list->items[3] = mp_obj_new_int(header.time_ms);
     }
 
     return MP_OBJ_NEW_SMALL_INT(msg_len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recv_obj, 2, 3, espnow_recv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_recv_obj, espnow_recv);
 
-//|     def any(self) -> bool:
-//|     """Test if data is available to read from the buffers.
-//|     """
-//|     ...
+//|     any: bool
+//|     """`True` if data is available to read from the buffers."""
 //|
-STATIC mp_obj_t espnow_any(const mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_any(const mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    return ringbuf_avail(self->recv_buffer) ? mp_const_true : mp_const_false;
+
+    return ringbuf_num_filled(self->recv_buffer) ? mp_const_true : mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_any_obj, espnow_get_any);
+
+MP_PROPERTY_GETTER(espnow_any_obj,
+    (mp_obj_t)&espnow_get_any_obj);
 
 // --- Peer Management Functions ---
 
-//|     def set_pmk(pmk: bytes(16)) -> None:
-//|     """Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
-//|     """
-//|     ...
-//|
-STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
-    check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN)));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
-
-// Common code for add_peer() and mod_peer() to process the args and kw_args.
-static void _update_peer_info(esp_now_peer_info_t *peer, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_lmk, ARG_channel, ARG_ifidx, ARG_encrypt };
+// Common code for add_peer() and mod_peer() to process the args.
+static void _update_peer_info(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool modify) {
+    enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypt };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_lmk,      MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_channel,  MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_ifidx,    MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_encrypt,  MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_mac,      MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_lmk,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
+        { MP_QSTR_channel,  MP_ARG_INT, { .u_obj = mp_const_none } },
+        { MP_QSTR_interface,MP_ARG_INT, { .u_obj = mp_const_none } },
+        { MP_QSTR_encrypt,  MP_ARG_BOOL,{ .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_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    if (args[ARG_lmk].u_obj != mp_const_none) {
-        mp_obj_t obj = args[ARG_lmk].u_obj;
-        peer->encrypt = mp_obj_is_true(obj);
-        if (peer->encrypt) {
-            // Key must be 16 bytes in length.
-            memcpy(peer->lmk, _get_bytes_len(obj, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN);
+    esp_now_peer_info_t peer = {0};
+    memcpy(peer.peer_addr, _get_peer_addr(args[ARG_mac].u_obj), ESP_NOW_ETH_ALEN);
+
+    if (modify) {
+        check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+    } else {
+        if (esp_now_is_peer_exist(peer.peer_addr)) {
+            mp_raise_RuntimeError(translate("peer already exists"));
         }
+        peer.channel = 0;
+        peer.ifidx = WIFI_IF_STA;
+        peer.encrypt = false;
     }
 
-    if (args[ARG_channel].u_obj != mp_const_none) {
-        peer->channel = mp_obj_get_int(args[ARG_channel].u_obj);
+    const mp_obj_t channel = args[ARG_channel].u_obj;
+    if (channel != mp_const_none) {
+        peer.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 1, 14, MP_QSTR_channel);
     }
 
-    if (args[ARG_ifidx].u_obj != mp_const_none) {
-        peer->ifidx = mp_obj_get_int(args[ARG_ifidx].u_obj);
+    const mp_obj_t interface = args[ARG_interface].u_obj;
+    if (interface != mp_const_none) {
+        peer.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(interface), 0, 1, MP_QSTR_interface);
     }
 
-    if (args[ARG_encrypt].u_obj != mp_const_none) {
-        peer->encrypt = mp_obj_is_true(args[ARG_encrypt].u_obj);
+    const mp_obj_t encrypt = args[ARG_encrypt].u_obj;
+    if (encrypt != mp_const_none) {
+        peer.encrypt = mp_obj_is_true(encrypt);
     }
+
+    const mp_obj_t lmk = args[ARG_lmk].u_obj;
+    if (lmk != mp_const_none) {
+        memcpy(peer.lmk, _get_bytes_len(lmk, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
+    } else if (peer.encrypt) {
+        mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
+    }
+
+    check_esp_err((modify) ? esp_now_mod_peer(&peer) : esp_now_add_peer(&peer));
 }
 
-// Update the cached peer count in self->num_peers;
-// The num_peers ignores broadcast and multicast addresses and is used for the
+// Update the cached peer count in self->peers_count;
+// The peers_count ignores broadcast and multicast addresses and is used for the
 // send() logic and is updated from add_peer(), mod_peer() and del_peer().
 static void _update_peer_count(espnow_obj_t *self) {
     esp_now_peer_info_t peer = {0};
@@ -659,71 +646,73 @@ static void _update_peer_count(espnow_obj_t *self) {
         }
     }
 
-    self->num_peers = count;
+    self->peers_count = count;
 }
 
-// ESPNow.add_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False], [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
-
-//|     def add_peer(self, peer_mac: bytes(6), lmk: bytes, channel: int, ifidx: int, encrypt: bool) -> None:
-//|     """
-//|         Positional args set to None will be left at defaults.
-//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-//|         Raise TypeError if invalid keyword args or too many positional args.
-//|     """
-//|     ...
+//|     def add_peer(
+//|         self,
+//|         mac: bytes,
+//|         lmk: Optional[bytes],
+//|         channel: int = 0,
+//|         interface: int = 0,
+//|         encrypt: bool = False,
+//|     ) -> None:
+//|         """Add peer.
 //|
-STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    espnow_obj_t *self = args[0];
+//|         :param bytes mac: The mac address of the peer.
+//|         :param bytes lmk: The Local Master Key (lmk) of the peer.
+//|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
+//|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
+//|         :param bool encrypt: Whether or not to use encryption."""
+//|         ...
+STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    espnow_obj_t *self = pos_args[0];
     check_for_deinit(self);
 
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
-
-    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
-    check_esp_err(esp_now_add_peer(&peer));
+    _update_peer_info(n_args, pos_args, kw_args, false);
     _update_peer_count(self);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
 
-// ESPNow.mod_peer(self, peer_mac, [lmk=b'0123456789abcdef'|b''|None|False], [channel=1..11|0], [ifidx=0|1], [encrypt=True|False])
-
-//|     def mod_peer(self, peer_mac: bytes(6), lmk: bytes, channel: int, ifidx: int, encrypt: bool) -> None:
-//|     """
-//|         Positional args set to None will be left at current values.
-//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-//|         Raise TypeError if invalid keyword args or too many positional args.
-//|     """
-//|     ...
+//|     def mod_peer(
+//|         self,
+//|         mac: bytes,
+//|         lmk: Optional[bytes],
+//|         channel: int = 0,
+//|         interface: int = 0,
+//|         encrypt: bool = False,
+//|     ) -> None:
+//|         """Modify peer.
 //|
-STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    espnow_obj_t *self = args[0];
+//|         :param bytes mac: The mac address of the peer.
+//|         :param bytes lmk: The Local Master Key (lmk) of the peer.
+//|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
+//|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
+//|         :param bool encrypt: Whether or not to use encryption."""
+//|         ...
+STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    espnow_obj_t *self = pos_args[0];
     check_for_deinit(self);
 
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
-    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
-
-    _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
-    check_esp_err(esp_now_mod_peer(&peer));
-    _update_peer_count(self);
+    _update_peer_info(n_args, pos_args, kw_args, true);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
 
-//|     def del_peer(peer_mac: bytes(6)) -> None:
-//|     """Un-register peer_mac.
-//|     """
-//|     ...
+//|     def del_peer(self, mac: bytes) -> None:
+//|         """Delete peer.
 //|
-STATIC mp_obj_t espnow_del_peer(mp_obj_t self_in, mp_obj_t peer) {
+//|         :param bytes mac: The mac address of the peer."""
+//|         ...
+STATIC mp_obj_t espnow_del_peer(mp_obj_t self_in, mp_obj_t mac) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
     uint8_t peer_addr[ESP_NOW_ETH_ALEN];
-    memcpy(peer_addr, _get_peer(peer), ESP_NOW_ETH_ALEN);
+    memcpy(peer_addr, _get_peer_addr(mac), ESP_NOW_ETH_ALEN);
 
     check_esp_err(esp_now_del_peer(peer_addr));
     _update_peer_count(self);
@@ -735,43 +724,46 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
 // Convert a peer_info struct to python tuple
 // Used by espnow_get_peer() and espnow_get_peers()
 static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
-    return NEW_TUPLE(
+    return MP_OBJ_NEW_TUPLE(
         mp_obj_new_bytes(peer->peer_addr, MP_ARRAY_SIZE(peer->peer_addr)),
         mp_obj_new_bytes(peer->lmk, MP_ARRAY_SIZE(peer->lmk)),
         mp_obj_new_int(peer->channel),
         mp_obj_new_int(peer->ifidx),
-        (peer->encrypt) ? mp_const_true : mp_const_false);
+        mp_obj_new_bool(peer->encrypt));
 }
 
-//|     def get_peer(self, peer_mac: bytes(6)) -> Tuple[bytes, int, int, bool]:
-//|     """
-//|         Get the peer info for peer_mac as a tuple.
-//|         Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
-//|         Returns a tuple of (peer_addr, lmk, channel, ifidx, encrypt).
-//|     """
-//|     ...
+//|     def get_peer(self, mac: bytes) -> Tuple[bytes, int, int, bool]:
+//|         """Get the peer info for mac as a `tuple`.
 //|
-STATIC mp_obj_t espnow_get_peer(mp_obj_t self_in, mp_obj_t peer_mac) {
+//|         :param bytes mac: The mac address of the peer.
+//|
+//|         :returns: A `tuple` of (mac, lmk, channel, interface, encrypt)."""
+//|         ...
+STATIC mp_obj_t espnow_get_peer(mp_obj_t self_in, mp_obj_t mac) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer(peer_mac), ESP_NOW_ETH_ALEN);
+    memcpy(peer.peer_addr, _get_peer_addr(mac), ESP_NOW_ETH_ALEN);
     check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+
     return _peer_info_to_tuple(&peer);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
 
-//|     def get_peers(self) -> Tuple[Tuple[bytes, bytes, int, int, bool], ...]:
-//|     """
-//|         Fetch peer_info records for all registered ESPNow peers.
-//|         Returns a tuple of tuples: ((peer_addr, lmk, channel, ifidx, encrypt), ...)
-//|     """
-//|     ...
+// --- Peer Related Properties ---
+
+//|     peers: Tuple[Tuple[bytes, bytes, int, int, bool], ...]
+//|     """The peer info records for all registered `ESPNow` peers. (read-only)
+//|
+//|     A `tuple` of tuples: ((mac, lmk, channel, interface, encrypt), ...)."""
 //|
 STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    // Build and initialise the peer info tuple.
-    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->num_peers, NULL);
+    // Build and initialize the peer info tuple.
+    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->peers_count, NULL);
     esp_now_peer_info_t peer = {0};
 
     for (size_t i = 0; i < peerinfo_tuple->len; i++) {
@@ -783,25 +775,52 @@ STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 
-//|     num_peers: Tuple[int, int]
-//|     """The number of registered peers in a tuple of (num_total_peers, num_encrypted_peers). (read-only)
-//|     """
+MP_PROPERTY_GETTER(espnow_peers_obj,
+    (mp_obj_t)&espnow_get_peers_obj);
+
+//|     peers_count: Tuple[int, int]
+//|     """The number of registered peers in a `tuple` of (num_total_peers, num_encrypted_peers). (read-only)"""
 //|
-STATIC mp_obj_t espnow_get_num_peers(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_peers_count(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     esp_now_peer_num_t peer_num = {0};
     check_esp_err(esp_now_get_peer_num(&peer_num));
-    return NEW_TUPLE(
+    return MP_OBJ_NEW_TUPLE(
         mp_obj_new_int(peer_num.total_num),
         mp_obj_new_int(peer_num.encrypt_num));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_num_peers_obj, espnow_get_num_peers);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_count_obj, espnow_get_peers_count);
 
-MP_PROPERTY_GETTER(espnow_num_peers_obj,
-    (mp_obj_t)&espnow_get_num_peers_obj);
+MP_PROPERTY_GETTER(espnow_peers_count_obj,
+    (mp_obj_t)&espnow_get_peers_count_obj);
+
+//|     peers_table: Dict[bytes, List[int]]
+//|     """The dictionary of peers we have seen. (read-only)
+//|
+//|     A `dict` of {peer: [rssi, time], ...}
+//|
+//|     where:
+//|         peer is a byte string containing the 6-byte mac address of the peer.
+//|         rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0).
+//|         time is the time in milliseconds since device last booted."""
+//|
+STATIC mp_obj_t espnow_get_peers_table(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return self->peers_table;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_table_obj, espnow_get_peers_table);
+
+MP_PROPERTY_GETTER(espnow_peers_table_obj,
+    (mp_obj_t)&espnow_get_peers_table_obj);
 
 STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
+    // Config parameters
+    { MP_ROM_QSTR(MP_QSTR_set_pmk),     MP_ROM_PTR(&espnow_set_pmk_obj) },
     { MP_ROM_QSTR(MP_QSTR_active),      MP_ROM_PTR(&espnow_active_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config),      MP_ROM_PTR(&espnow_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_buffer_size), MP_ROM_PTR(&espnow_buffer_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
     { MP_ROM_QSTR(MP_QSTR_stats),       MP_ROM_PTR(&espnow_stats_obj) },
 
     // Send and receive messages
@@ -810,13 +829,15 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_any),         MP_ROM_PTR(&espnow_any_obj) },
 
     // Peer management functions
-    { MP_ROM_QSTR(MP_QSTR_set_pmk),     MP_ROM_PTR(&espnow_set_pmk_obj) },
     { MP_ROM_QSTR(MP_QSTR_add_peer),    MP_ROM_PTR(&espnow_add_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_mod_peer),    MP_ROM_PTR(&espnow_mod_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_del_peer),    MP_ROM_PTR(&espnow_del_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_peer),    MP_ROM_PTR(&espnow_get_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_peers),   MP_ROM_PTR(&espnow_get_peers_obj) },
-    { MP_ROM_QSTR(MP_QSTR_num_peers),   MP_ROM_PTR(&espnow_num_peers_obj) },
+
+    // Peer related properties
+    { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
+    { MP_ROM_QSTR(MP_QSTR_peers_count), MP_ROM_PTR(&espnow_peers_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_peers_table), MP_ROM_PTR(&espnow_peers_table_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 
@@ -831,10 +852,10 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
     }
 
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return (espnow_deinited(self)) ? 0 :  // If not initialised
+    return (espnow_deinited(self)) ? 0 :  // If not initialized
            arg ^ (
                // If no data in the buffer, unset the Read ready flag
-               ((ringbuf_avail(self->recv_buffer) == 0) ? MP_STREAM_POLL_RD : 0) |
+               ((!ringbuf_num_filled(self->recv_buffer)) ? MP_STREAM_POLL_RD : 0) |
                // If still waiting for responses, unset the Write ready flag
                ((self->tx_responses < self->tx_packets) ? MP_STREAM_POLL_WR : 0));
 }
@@ -843,30 +864,11 @@ STATIC const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
-//  Return reference to the dictionary of peers we have seen:
-//  {peer1: (rssi, time), peer2: (rssi, time), ...}
-//  where:
-//      peerX is a byte string containing the 6-byte mac address of the peer,
-//      rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0)
-//      time is the time in milliseconds since device last booted.
-STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (dest[0] != MP_OBJ_NULL) {   // Only allow "Load" operation
-        return;
-    }
-    if (attr == MP_QSTR_peers_table) {
-        dest[0] = self->peers_table;
-        return;
-    }
-    dest[1] = MP_OBJ_SENTINEL;      // Attribute not found
-}
-
 const mp_obj_type_t espnow_type = {
     { &mp_type_type },
-    .name = MP_QSTR_NOW,
+    .name = MP_QSTR_ESPNow,
     .make_new = espnow_make_new,
     .locals_dict = (mp_obj_t)&espnow_locals_dict,
-    .attr = espnow_attr,
     .flags = MP_TYPE_FLAG_EXTENDED,
     MP_TYPE_EXTENDED_FIELDS(
         .protocol = &espnow_stream_p,
diff --git a/ports/espressif/bindings/espnow/Now.h b/ports/espressif/bindings/espnow/ESPNow.h
similarity index 100%
rename from ports/espressif/bindings/espnow/Now.h
rename to ports/espressif/bindings/espnow/ESPNow.h
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index 52325dad58..5661885911 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -27,7 +27,7 @@
 #include "shared-bindings/util.h"
 
 #include "bindings/espnow/__init__.h"
-#include "bindings/espnow/Now.h"
+#include "bindings/espnow/ESPNow.h"
 
 //| """ESP-NOW Module
 //|
@@ -36,7 +36,9 @@
 //| protocol provided by Espressif on its SoCs
 //| (`API docs `_).
 //|
-//| **Sender:** ::
+//| **Sender**
+//|
+//| .. code-block:: python
 //|
 //|     import espnow
 //|
@@ -50,7 +52,9 @@
 //|         e.send(peer, str(i)*20, True)
 //|         e.send(b'end')
 //|
-//| **Receiver:** ::
+//| **Receiver**
+//|
+//| .. code-block:: python
 //|
 //|     import espnow
 //|
@@ -73,7 +77,7 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module name
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) },
     // module classes
-    { MP_ROM_QSTR(MP_QSTR_Now), MP_ROM_PTR(&espnow_type) },
+    { MP_ROM_QSTR(MP_QSTR_ESPNow), MP_ROM_PTR(&espnow_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table);
 
diff --git a/py/objtuple.h b/py/objtuple.h
index 7bfb447fa4..ded265b47e 100644
--- a/py/objtuple.h
+++ b/py/objtuple.h
@@ -50,6 +50,9 @@ mp_obj_t mp_obj_tuple_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf);
 
 extern const mp_obj_type_t mp_type_attrtuple;
 
+// Relies on gcc Variadic Macros and Statement Expressions
+#define MP_OBJ_NEW_TUPLE(...) ({mp_obj_t _z[] = {__VA_ARGS__}; mp_obj_new_tuple(MP_ARRAY_SIZE(_z), _z);})
+
 #define MP_DEFINE_ATTRTUPLE(tuple_obj_name, fields, nitems, ...) \
     const mp_rom_obj_tuple_t tuple_obj_name = { \
         .base = {&mp_type_attrtuple}, \
diff --git a/py/ringbuf.c b/py/ringbuf.c
index f90805d6f3..5936b64230 100644
--- a/py/ringbuf.c
+++ b/py/ringbuf.c
@@ -72,7 +72,6 @@ int ringbuf_get16(ringbuf_t *r) {
     if (r->used < 2) {
         return -1;
     }
-
     int high_byte = ringbuf_get(r);
     int low_byte = ringbuf_get(r);
     return (high_byte << 8) | low_byte;
@@ -92,6 +91,15 @@ int ringbuf_put(ringbuf_t *r, uint8_t v) {
     return 0;
 }
 
+int ringbuf_put16(ringbuf_t *r, uint16_t v) {
+    if (r->size - r->used < 2) {
+        return -1;
+    }
+    ringbuf_put(r, (v >> 8) & 0xff);
+    ringbuf_put(r, v & 0xff);
+    return 0;
+}
+
 void ringbuf_clear(ringbuf_t *r) {
     r->next_write = 0;
     r->next_read = 0;
@@ -132,57 +140,3 @@ size_t ringbuf_get_n(ringbuf_t *r, uint8_t *buf, size_t bufsize) {
     }
     return bufsize;
 }
-
-int ringbuf_put16(ringbuf_t *r, uint16_t v) {
-    if (r->size - r->used < 2) {
-        return -1;
-    }
-
-    ringbuf_put(r, (v >> 8) & 0xff);
-    ringbuf_put(r, v & 0xff);
-    return 0;
-}
-
-// Returns:
-//    1: Success
-//    0: Not enough data available to complete read (try again later)
-//   -1: Requested read is larger than buffer - will never succeed
-int ringbuf_read(ringbuf_t *r, void *data, size_t data_len) {
-    if (ringbuf_avail(r) < data_len) {
-        return (r->size <= data_len) ? -1 : 0;
-    }
-    uint32_t iget = r->next_read;
-    uint32_t iget_a = (iget + data_len) % r->size;
-    uint8_t *datap = data;
-    if (iget_a < iget) {
-        // Copy part of the data from the space left at the end of the buffer
-        memcpy(datap, r->buf + iget, r->size - iget);
-        datap += (r->size - iget);
-        iget = 0;
-    }
-    memcpy(datap, r->buf + iget, iget_a - iget);
-    r->next_read = iget_a;
-    return 1;
-}
-
-// Returns:
-//    1: Success
-//    0: Not enough free space available to complete write (try again later)
-//   -1: Requested write is larger than buffer - will never succeed
-int ringbuf_write(ringbuf_t *r, const void *data, size_t data_len) {
-    if (ringbuf_free(r) < data_len) {
-        return (r->size <= data_len) ? -1 : 0;
-    }
-    uint32_t iput = r->next_write;
-    uint32_t iput_a = (iput + data_len) % r->size;
-    const uint8_t *datap = data;
-    if (iput_a < iput) {
-        // Copy part of the data to the end of the buffer
-        memcpy(r->buf + iput, datap, r->size - iput);
-        datap += (r->size - iput);
-        iput = 0;
-    }
-    memcpy(r->buf + iput, datap, iput_a - iput);
-    r->next_write = iput_a;
-    return 1;
-}
diff --git a/py/ringbuf.h b/py/ringbuf.h
index 5d54abc6b5..2725bedcca 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -61,15 +61,5 @@ size_t ringbuf_get_n(ringbuf_t *r, uint8_t *buf, size_t bufsize);
 // Note: big-endian. Return -1 if can't read or write two bytes.
 int ringbuf_get16(ringbuf_t *r);
 int ringbuf_put16(ringbuf_t *r, uint16_t v);
-int ringbuf_read(ringbuf_t *r, void *data, size_t data_len);
-int ringbuf_write(ringbuf_t *r, const void *data, size_t data_len);
-
-static inline size_t ringbuf_free(ringbuf_t *r) {
-    return (r->size + r->next_read - r->next_write - 1) % r->size;
-}
-
-static inline size_t ringbuf_avail(ringbuf_t *r) {
-    return (r->size + r->next_write - r->next_read) % r->size;
-}
 
 #endif // MICROPY_INCLUDED_PY_RINGBUF_H

From e018c6d0227bcabea4ce25bf018417bc5369f93c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 23 Jan 2023 13:13:27 -0600
Subject: [PATCH 1717/2403] Update PID to match internal list

---
 .../adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
index 6f6b949d13..920b748e3d 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8128
+USB_PID = 0x80EE
 
 USB_PRODUCT = "Feather ESP32-S2 Reverse TFT"
 USB_MANUFACTURER = "Adafruit"

From 43b1d2618e259695bc9b0f16c7c701641b863244 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 23 Jan 2023 14:19:27 -0500
Subject: [PATCH 1718/2403] Remove erroneous left over comment

---
 ports/broadcom/common-hal/rtc/RTC.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/broadcom/common-hal/rtc/RTC.c b/ports/broadcom/common-hal/rtc/RTC.c
index 7be9a39803..898a5c84bb 100644
--- a/ports/broadcom/common-hal/rtc/RTC.c
+++ b/ports/broadcom/common-hal/rtc/RTC.c
@@ -57,6 +57,5 @@ int common_hal_rtc_get_calibration(void) {
 }
 
 void common_hal_rtc_set_calibration(int calibration) {
-    // SNVS has HPCALB_VAL bits for calibration.
     mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration);
 }

From fb4def282472de96b1e9bc7a0b05e62d9555c4b0 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 23 Jan 2023 14:52:20 -0500
Subject: [PATCH 1719/2403] remove CIRCUITPY_RTC = 1 from mpconfigport.mk

Full build includes the RTC bits so don't need to enable it
in ports/broadcom/mpconfigport.mk
---
 ports/broadcom/mpconfigport.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index 73c91752c6..b992d24f0e 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -15,7 +15,6 @@ CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 1
 
 CIRCUITPY_SDIOIO = 1
 CIRCUITPY_VIDEOCORE = 1

From ecde85734ca90953821f95e647e63979a355f63d Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 23 Jan 2023 15:17:24 -0500
Subject: [PATCH 1720/2403] Remove a couple unneeded includes.

---
 ports/broadcom/common-hal/rtc/RTC.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/broadcom/common-hal/rtc/RTC.c b/ports/broadcom/common-hal/rtc/RTC.c
index 898a5c84bb..8f6743cb05 100644
--- a/ports/broadcom/common-hal/rtc/RTC.c
+++ b/ports/broadcom/common-hal/rtc/RTC.c
@@ -30,10 +30,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
-#include "shared-bindings/rtc/__init__.h"
-#include "shared-bindings/rtc/RTC.h"
 #include "supervisor/port.h"
-#include "supervisor/shared/translate/translate.h"
 
 // This is the time in seconds since 2000 that the RTC was started.
 // TODO: Change the offset to ticks so that it can be a subsecond adjustment.

From d9d77e1c152cf8fa1445f11ffbdfa43f9c8d1efe Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Tue, 24 Jan 2023 03:00:30 +0000
Subject: [PATCH 1721/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 60b66d2b72..dde7f576ba 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: 2022-11-30 16:14+0000\n"
+"PO-Revision-Date: 2023-01-25 03:47+0000\n"
 "Last-Translator: hexthat \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.15-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -118,7 +118,7 @@ msgstr "%q Shībài: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q zhōng de %q bì xū shì %q lèi xíng, ér bù shì %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -141,7 +141,7 @@ msgstr "%q shì %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q duì yú cǐ bǎn shì zhǐ dú de"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -181,7 +181,7 @@ msgstr "%q bìxū >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'H' huò 'B' de shù zǔ"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -191,11 +191,11 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q de lèi xíng bì xū shì %q huò %q, ér bù shì %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q de lèi xíng bì xū shì %q, ér bù shì %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -220,7 +220,7 @@ msgstr "%q yǐn jiǎo wúxiào"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "%q bù cháng bù néng wéi líng"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -421,7 +421,7 @@ msgstr "dìzhǐ chángdù bìxū shì %d zìjié"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "bù yǔn xǔ de dì zhǐ fàn wéi"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -517,7 +517,7 @@ msgstr "yǐjīng zài sǎomiáo WIFI wǎngluò"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "jiǎn suǒ '%s' shí chū cuò:\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -924,7 +924,7 @@ msgstr "Fāngxiàng shūrù shí qūdòng móshì méiyǒu shǐyòng."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "zài chǔ lǐ shàng shù yì cháng qī jiān, fā shēng le lìng yí gè yì cháng:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -957,7 +957,7 @@ msgstr "cuò wù: bǎng dìng shī bài"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "yù qī yì zhǒng %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1033,7 +1033,7 @@ msgstr "Wénjiàn cúnzài"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "zhǎo bú dào wén jiàn"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1274,7 +1274,7 @@ msgstr "Měi gè zhí de wèi wúxiào"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "wú xiào zì jié %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1308,7 +1308,7 @@ msgstr "wú xiào zhuàng tài"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "wú xiào de unicode zhuǎn yì"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1316,7 +1316,7 @@ msgstr "mì yào bì xū wéi 16, 24 huò 32 zì jié cháng"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "wèi zhǎo dào mì yào"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
@@ -1427,7 +1427,7 @@ msgstr "NVS cuò wù"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "míng chēng huò fú wù wèi zhī"
 
 #: py/qstr.c
 msgid "Name too long"
@@ -1674,7 +1674,7 @@ msgstr "zài shēn dù shuì mián zhōng zhǐ néng shè zhì yí gè %q."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "zhǐ néng shè zhì yí gè %q."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1842,7 +1842,7 @@ msgstr "chéng xù dà xiǎo wú xiào"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "chéng xù tài cháng"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -2024,7 +2024,7 @@ msgstr "lì tǐ shēng yòu cè bì xū zài PWM tōng dào B shàng"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "bù zhī chí tíng zhǐ AP."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
@@ -2072,7 +2072,7 @@ msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "shàng shù yì cháng shì yǐ xià yì cháng de zhí jiē yuán yīn:"
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -2275,7 +2275,7 @@ msgstr "wú fǎ qǐ dòng mDNS chá xún"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "Wú fǎ xiě rù dì zhǐ."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2440,15 +2440,15 @@ msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "Wú xiàn wǎng luò chǔ yú jiē rù diǎn mó shì."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "Wú xiàn wǎng luò chǔ yú gōng zuò zhàn mó shì."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "wú xiàn wǎng luò wèi qǐ yòng"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -2761,7 +2761,7 @@ msgstr "wúfǎ shèzhì shǔxìng"
 
 #: py/runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "wú fǎ shè zhì shǔ xìng '%q'"
 
 #: py/emitnative.c
 msgid "can't store '%q'"
@@ -3238,7 +3238,7 @@ msgstr "suǒyǐn chāochū fànwéi"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "suǒ yǐn bì xū shì yuán zǔ huò zhěng shù"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3618,7 +3618,7 @@ msgstr "fù zhuǎnyí jìshù"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "qiàn tào suǒ yǐn bì xū shì int"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"

From 9487fb51a4c8a6842dc20cd4558d56048a6605ba Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 25 Jan 2023 19:40:14 +0530
Subject: [PATCH 1722/2403] prettify espressif partition tables

---
 .../esp-idf-config/partitions-16MB-no-uf2.csv | 17 ++++++++---------
 .../esp-idf-config/partitions-16MB.csv        | 19 +++++++++----------
 .../partitions-2MB-no-ota-no-uf2.csv          | 13 ++++++-------
 .../esp-idf-config/partitions-4MB-no-uf2.csv  | 17 ++++++++---------
 .../esp-idf-config/partitions-4MB.csv         | 19 +++++++++----------
 .../esp-idf-config/partitions-8MB-no-uf2.csv  | 17 ++++++++---------
 .../esp-idf-config/partitions-8MB.csv         | 19 +++++++++----------
 7 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
index 8e73e8d056..c4b103aed1 100644
--- a/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
+++ b/ports/espressif/esp-idf-config/partitions-16MB-no-uf2.csv
@@ -1,9 +1,8 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-user_fs,  data, fat,    0x410000,  12224K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+ota_1,              app,    ota_1,      0x210000,   2048K
+user_fs,            data,   fat,        0x410000,   12224K
diff --git a/ports/espressif/esp-idf-config/partitions-16MB.csv b/ports/espressif/esp-idf-config/partitions-16MB.csv
index 13ea81bea5..16c73da32b 100644
--- a/ports/espressif/esp-idf-config/partitions-16MB.csv
+++ b/ports/espressif/esp-idf-config/partitions-16MB.csv
@@ -1,10 +1,9 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-user_fs,  data, fat,    0x450000,  11968K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+ota_1,              app,    ota_1,      0x210000,   2048K
+uf2,                app,    factory,    0x410000,   256K
+user_fs,            data,   fat,        0x450000,   11968K
diff --git a/ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv
index 869e7ac86e..1c38195565 100644
--- a/ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv
+++ b/ports/espressif/esp-idf-config/partitions-2MB-no-ota-no-uf2.csv
@@ -1,7 +1,6 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-app,      app,  factory, 0x10000,  1408K,
-user_fs,  data, fat,    0x170000,  576K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+app,                app,    factory,    0x10000,    1408K,
+user_fs,            data,   fat,        0x170000,   576K,
diff --git a/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
index 6dc2dcf2e9..6d27e22e76 100644
--- a/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
+++ b/ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv
@@ -1,9 +1,8 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-user_fs,  data, fat,    0x2d0000,  1216K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    1408K
+ota_1,              app,    ota_1,      0x170000,   1408K
+user_fs,            data,   fat,        0x2d0000,   1216K
diff --git a/ports/espressif/esp-idf-config/partitions-4MB.csv b/ports/espressif/esp-idf-config/partitions-4MB.csv
index cf9b3cca84..981aee0b17 100644
--- a/ports/espressif/esp-idf-config/partitions-4MB.csv
+++ b/ports/espressif/esp-idf-config/partitions-4MB.csv
@@ -1,10 +1,9 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-user_fs,  data, fat,    0x310000,  960K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    1408K
+ota_1,              app,    ota_1,      0x170000,   1408K
+uf2,                app,    factory,    0x2d0000,   256K
+user_fs,            data,   fat,        0x310000,   960K
diff --git a/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv
index ba92d9fc73..6d78fe8af5 100644
--- a/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv
+++ b/ports/espressif/esp-idf-config/partitions-8MB-no-uf2.csv
@@ -1,9 +1,8 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    app,    ota_0,   0x10000,  2048K,
-ota_1,    app,    ota_1,  0x210000,  2048K,
-user_fs,  data, fat,    0x410000,  4032K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+ota_1,              app,    ota_1,      0x210000,   2048K
+user_fs,            data,   fat,        0x410000,   4032K
diff --git a/ports/espressif/esp-idf-config/partitions-8MB.csv b/ports/espressif/esp-idf-config/partitions-8MB.csv
index f4ba9b60a1..40674d322c 100644
--- a/ports/espressif/esp-idf-config/partitions-8MB.csv
+++ b/ports/espressif/esp-idf-config/partitions-8MB.csv
@@ -1,10 +1,9 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-user_fs,  data, fat,    0x450000,  3776K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+ota_1,              app,    ota_1,      0x210000,   2048K
+uf2,                app,    factory,    0x410000,   256K
+user_fs,            data,   fat,        0x450000,   3776K

From 19c1eb2d1d0cd28160c1f84bd2da5cc89766a4d9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 25 Jan 2023 15:44:43 -0500
Subject: [PATCH 1723/2403] update esp-idf from latest release/v4.4

---
 ports/espressif/esp-idf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 8d0f1abce7..630c2724fc 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 8d0f1abce769ad4a212c1bb0337999cacd7ee83d
+Subproject commit 630c2724fc8c69eeaaa1bb025de52b99c5cb11aa

From ace20625641ccb471f7424857f35844d07c501b7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 25 Jan 2023 15:10:06 -0600
Subject: [PATCH 1724/2403] remove board that will not be manufactured

---
 .../board.c                                   | 108 ------------------
 .../mpconfigboard.h                           |  44 -------
 .../mpconfigboard.mk                          |  15 ---
 .../pins.c                                    |  75 ------------
 .../sdkconfig                                 |   6 -
 5 files changed, 248 deletions(-)
 delete mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
 delete mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
 delete mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
 delete mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c
 delete mode 100644 ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
deleted file mode 100644
index e0edec2fa2..0000000000
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/busio/SPI.h"
-#include "shared-bindings/displayio/FourWire.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-module/displayio/__init__.h"
-#include "shared-module/displayio/mipi_constants.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) {
-    // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
-    #endif /* DEBUG */
-
-    /*
-    busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, 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_GPIO40, // TFT_DC Command or data
-        &pin_GPIO42, // TFT_CS Chip select
-        &pin_GPIO41, // TFT_RST Reset
-        4000000, // 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,
-        240, // Width (after rotation)
-        135, // Height (after rotation)
-        0, // column start
-        0, // row start
-        0, // rotation
-        16, // Color depth
-        false, // Grayscale
-        false, // Pixels in a byte share a 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
-        display_init_sequence,
-        sizeof(display_init_sequence),
-        &pin_GPIO7,  // backlight pin
-        NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness
-        false, // single_byte_bounds
-        false, // data_as_commands
-        true, // auto_refresh
-        60, // native_frames_per_second
-        true, // backlight_on_high
-        false, // not SH1107
-        50000); // backlight pwm frequency
-        */
-}
-
-// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
deleted file mode 100644
index b4034568c0..0000000000
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
+++ /dev/null
@@ -1,44 +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.
- */
-
-// Micropython setup
-
-#define MICROPY_HW_BOARD_NAME       "Feather ESP32S2 without PSRAM"
-#define MICROPY_HW_MCU_NAME         "ESP32S2"
-
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
-#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
-
-#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
-
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
-
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
-
-#define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
deleted file mode 100644
index b07161cee3..0000000000
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x80EE
-USB_PRODUCT = "Feather ESP32S2 TFT no PSRAM"
-USB_MANUFACTURER = "Adafruit"
-
-IDF_TARGET = esp32s2
-
-CIRCUITPY_ESP_FLASH_MODE = dio
-CIRCUITPY_ESP_FLASH_FREQ = 40m
-CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
-CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c
deleted file mode 100644
index 54b9051d73..0000000000
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-#include "shared-module/displayio/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
-    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
-
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
-
-    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) },
-
-    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) },
-
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
-
-    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO7) },
-
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
-
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
-    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
-
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
-
-    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
-
-    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
-
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
-
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
-
-    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) },
-
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
-
-    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
-
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
-
-    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
-
-    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) },
-
-    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) },
-
-    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO41) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO42) },
-
-    { 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_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig
deleted file mode 100644
index 5b9c86dcc3..0000000000
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
-#
-# LWIP
-#
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
-# end of LWIP

From 90e8f9d4a8d75f99bcd6151151e6181cba51cce6 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 18 Nov 2022 09:55:44 +0530
Subject: [PATCH 1725/2403] fix espressif 32MB partition table

---
 .../esp-idf-config/partitions-32MB.csv        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/ports/espressif/esp-idf-config/partitions-32MB.csv b/ports/espressif/esp-idf-config/partitions-32MB.csv
index 34772c8034..42c4084f6c 100644
--- a/ports/espressif/esp-idf-config/partitions-32MB.csv
+++ b/ports/espressif/esp-idf-config/partitions-32MB.csv
@@ -1,10 +1,9 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-user_fs,  data, fat,    0x450000,  28362K,
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+ota_1,              app,    ota_1,      0x210000,   2048K
+uf2,                app,    factory,    0x410000,   256K
+user_fs,            data,   fat,        0x450000,   28352K

From e5cfab060de201800b55f4bcda58bbc51bbbcf2a Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 26 Jan 2023 11:20:18 +0530
Subject: [PATCH 1726/2403] remove redundant config messages

---
 .../espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h    | 2 --
 .../espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk   | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h
index 454203f41f..26410bb210 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.h
@@ -36,6 +36,4 @@
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
 
-#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
-
 #define AUTORESET_DELAY_MS          500
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
index 1b1ab8742e..96ef4e45c9 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
-CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=32MB

From bfb77d05444e68462caaa38fb6f72b223799870a Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 26 Jan 2023 13:01:14 +0530
Subject: [PATCH 1727/2403] move `ULPArch` to `Architecture`

---
 .../espulp/{ULPArch.c => Architecture.c}      | 24 ++++++++---------
 .../espulp/{ULPArch.h => Architecture.h}      | 12 ++++-----
 ports/espressif/bindings/espulp/ULP.c         | 26 +++++++++----------
 ports/espressif/bindings/espulp/ULP.h         |  2 +-
 ports/espressif/bindings/espulp/ULPAlarm.c    |  7 +++--
 ports/espressif/bindings/espulp/ULPAlarm.h    |  2 +-
 ports/espressif/bindings/espulp/__init__.c    |  4 +--
 ports/espressif/common-hal/espulp/ULP.c       |  2 +-
 ports/espressif/common-hal/espulp/ULP.h       |  4 +--
 ports/espressif/common-hal/espulp/ULPAlarm.c  |  4 +++
 10 files changed, 47 insertions(+), 40 deletions(-)
 rename ports/espressif/bindings/espulp/{ULPArch.c => Architecture.c} (70%)
 rename ports/espressif/bindings/espulp/{ULPArch.h => Architecture.h} (81%)

diff --git a/ports/espressif/bindings/espulp/ULPArch.c b/ports/espressif/bindings/espulp/Architecture.c
similarity index 70%
rename from ports/espressif/bindings/espulp/ULPArch.c
rename to ports/espressif/bindings/espulp/Architecture.c
index 01f61458c1..d87691716c 100644
--- a/ports/espressif/bindings/espulp/ULPArch.c
+++ b/ports/espressif/bindings/espulp/Architecture.c
@@ -26,26 +26,26 @@
 
 #include "py/enum.h"
 
-#include "bindings/espulp/ULPArch.h"
+#include "bindings/espulp/Architecture.h"
 
-MAKE_ENUM_VALUE(espulp_ulparch_type, ulparch, FSM, FSM);
-MAKE_ENUM_VALUE(espulp_ulparch_type, ulparch, RISCV, RISCV);
+MAKE_ENUM_VALUE(espulp_architecture_type, architecture, FSM, FSM);
+MAKE_ENUM_VALUE(espulp_architecture_type, architecture, RISCV, RISCV);
 
-//| class ULPArch:
+//| class Architecture:
 //|     """The ULP architectures available."""
 //|
-//|     FSM: ULPArch
+//|     FSM: Architecture
 //|     """The ULP Finite State Machine."""
 //|
-//|     RISCV: ULPArch
+//|     RISCV: Architecture
 //|     """The ULP RISC-V Coprocessor."""
 //|
-MAKE_ENUM_MAP(espulp_ulparch) {
-    MAKE_ENUM_MAP_ENTRY(ulparch, FSM),
-    MAKE_ENUM_MAP_ENTRY(ulparch, RISCV),
+MAKE_ENUM_MAP(espulp_architecture) {
+    MAKE_ENUM_MAP_ENTRY(architecture, FSM),
+    MAKE_ENUM_MAP_ENTRY(architecture, RISCV),
 };
-STATIC MP_DEFINE_CONST_DICT(espulp_ulparch_locals_dict, espulp_ulparch_locals_table);
+STATIC MP_DEFINE_CONST_DICT(espulp_architecture_locals_dict, espulp_architecture_locals_table);
 
-MAKE_PRINTER(espulp, espulp_ulparch);
+MAKE_PRINTER(espulp, espulp_architecture);
 
-MAKE_ENUM_TYPE(espulp, ULPArch, espulp_ulparch);
+MAKE_ENUM_TYPE(espulp, Architecture, espulp_architecture);
diff --git a/ports/espressif/bindings/espulp/ULPArch.h b/ports/espressif/bindings/espulp/Architecture.h
similarity index 81%
rename from ports/espressif/bindings/espulp/ULPArch.h
rename to ports/espressif/bindings/espulp/Architecture.h
index 1b1e8a1331..54c0677f05 100644
--- a/ports/espressif/bindings/espulp/ULPArch.h
+++ b/ports/espressif/bindings/espulp/Architecture.h
@@ -24,17 +24,17 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_BINDINGS_ESPULP_ULPARCH_H
-#define MICROPY_INCLUDED_BINDINGS_ESPULP_ULPARCH_H
+#ifndef MICROPY_INCLUDED_BINDINGS_ESPULP_ARCHITECTURE_H
+#define MICROPY_INCLUDED_BINDINGS_ESPULP_ARCHITECTURE_H
 
 #include "py/enum.h"
 
 typedef enum {
     FSM,
     RISCV
-} espulp_ulparch_t;
+} espulp_architecture_t;
 
-extern const mp_obj_type_t espulp_ulparch_type;
-extern const cp_enum_obj_t ulparch_FSM_obj;
+extern const mp_obj_type_t espulp_architecture_type;
+extern const cp_enum_obj_t architecture_FSM_obj;
 
-#endif // MICROPY_INCLUDED_BINDINGS_ESPULP_ULPARCH_H
+#endif // MICROPY_INCLUDED_BINDINGS_ESPULP_ARCHITECTURE_H
diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c
index 3506a3067b..c9666fb143 100644
--- a/ports/espressif/bindings/espulp/ULP.c
+++ b/ports/espressif/bindings/espulp/ULP.c
@@ -33,24 +33,24 @@
 #include "py/objproperty.h"
 
 //| class ULP:
-//|     def __init__(self, arch: ULPArch = ULPArch.FSM):
+//|     def __init__(self, arch: Architecture = Architecture.FSM):
 //|         """The ultra-low-power processor.
 //|
 //|         Raises an exception if another ULP has been instantiated. This
 //|         ensures that is is only used by one piece of code at a time.
 //|
-//|         :param ULPArch arch: The ulp arch"""
+//|         :param Architecture arch: The ulp arch"""
 //|         ...
 STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_arch };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_arch, MP_ARG_OBJ, {.u_obj = (void *)&ulparch_FSM_obj} },
+        { MP_QSTR_arch, MP_ARG_OBJ, {.u_obj = (void *)&architecture_FSM_obj} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const espulp_ulparch_t arch = cp_enum_value(&espulp_ulparch_type, args[ARG_arch].u_obj, MP_QSTR_arch);
+    const espulp_architecture_t arch = cp_enum_value(&espulp_architecture_type, args[ARG_arch].u_obj, MP_QSTR_arch);
 
     espulp_ulp_obj_t *self = m_new_obj(espulp_ulp_obj_t);
     self->base.type = &espulp_ulp_type;
@@ -149,14 +149,14 @@ STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt);
 
-//|     arch: ULPArch
-//|     """The ulp arch. (read-only)"""
+//|     arch: Architecture
+//|     """The ulp architecture. (read-only)"""
 //|
 STATIC mp_obj_t espulp_ulp_get_arch(mp_obj_t self_in) {
     espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    return cp_enum_find(&espulp_ulparch_type, self->arch);
+    return cp_enum_find(&espulp_architecture_type, self->arch);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_get_arch_obj, espulp_ulp_get_arch);
 
@@ -164,12 +164,12 @@ MP_PROPERTY_GETTER(espulp_ulp_arch_obj,
     (mp_obj_t)&espulp_ulp_get_arch_obj);
 
 STATIC const mp_rom_map_elem_t espulp_ulp_locals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espulp_ulp_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espulp_ulp___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&espulp_ulp_run_obj) },
-    { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&espulp_ulp_halt_obj) },
-    { MP_ROM_QSTR(MP_QSTR_arch), MP_ROM_PTR(&espulp_ulp_arch_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&espulp_ulp_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&espulp_ulp___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_run),         MP_ROM_PTR(&espulp_ulp_run_obj) },
+    { MP_ROM_QSTR(MP_QSTR_halt),        MP_ROM_PTR(&espulp_ulp_halt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_arch),        MP_ROM_PTR(&espulp_ulp_arch_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table);
 
diff --git a/ports/espressif/bindings/espulp/ULP.h b/ports/espressif/bindings/espulp/ULP.h
index f06f783902..490cbef1ca 100644
--- a/ports/espressif/bindings/espulp/ULP.h
+++ b/ports/espressif/bindings/espulp/ULP.h
@@ -31,7 +31,7 @@
 
 extern const mp_obj_type_t espulp_ulp_type;
 
-void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_ulparch_t arch);
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_architecture_t arch);
 bool common_hal_espulp_ulp_deinited(espulp_ulp_obj_t *self);
 void common_hal_espulp_ulp_deinit(espulp_ulp_obj_t *self);
 
diff --git a/ports/espressif/bindings/espulp/ULPAlarm.c b/ports/espressif/bindings/espulp/ULPAlarm.c
index 921c23d4f5..6efd1c98ef 100644
--- a/ports/espressif/bindings/espulp/ULPAlarm.c
+++ b/ports/espressif/bindings/espulp/ULPAlarm.c
@@ -25,9 +25,9 @@
  */
 
 #include "bindings/espulp/ULPAlarm.h"
-#include "bindings/espulp/ULPArch.h"
 
 #include "py/runtime.h"
+#include "py/objproperty.h"
 
 //| class ULPAlarm:
 //|     """Trigger an alarm when the ULP requests wake-up."""
@@ -52,7 +52,10 @@ STATIC mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type, size_t n_arg
 
     espulp_ulpalarm_obj_t *self = m_new_obj(espulp_ulpalarm_obj_t);
     self->base.type = &espulp_ulpalarm_type;
-    self->ulp = mp_arg_validate_type(args[ARG_ulp].u_obj, &espulp_ulp_type, MP_QSTR_ulp);
+
+    espulp_ulp_obj_t *ulp = mp_arg_validate_type(args[ARG_ulp].u_obj, &espulp_ulp_type, MP_QSTR_ulp);
+
+    common_hal_espulp_ulpalarm_construct(self, ulp);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/ports/espressif/bindings/espulp/ULPAlarm.h b/ports/espressif/bindings/espulp/ULPAlarm.h
index 75e96c0a45..f2b2e69bba 100644
--- a/ports/espressif/bindings/espulp/ULPAlarm.h
+++ b/ports/espressif/bindings/espulp/ULPAlarm.h
@@ -30,4 +30,4 @@
 
 extern const mp_obj_type_t espulp_ulpalarm_type;
 
-void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self);
+void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self, espulp_ulp_obj_t *ulp);
diff --git a/ports/espressif/bindings/espulp/__init__.c b/ports/espressif/bindings/espulp/__init__.c
index ff6d727ec5..f2b688dda4 100644
--- a/ports/espressif/bindings/espulp/__init__.c
+++ b/ports/espressif/bindings/espulp/__init__.c
@@ -29,7 +29,7 @@
 #include "bindings/espulp/__init__.h"
 #include "bindings/espulp/ULP.h"
 #include "bindings/espulp/ULPAlarm.h"
-#include "bindings/espulp/ULPArch.h"
+#include "bindings/espulp/Architecture.h"
 
 #include "py/runtime.h"
 
@@ -82,7 +82,7 @@ STATIC const mp_rom_map_elem_t espulp_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_OBJ_FROM_PTR(&espulp_ulp_type) },
     { MP_ROM_QSTR(MP_QSTR_ULPAlarm), MP_OBJ_FROM_PTR(&espulp_ulpalarm_type) },
-    { MP_ROM_QSTR(MP_QSTR_ULPArch),    MP_ROM_PTR(&espulp_ulparch_type) },
+    { MP_ROM_QSTR(MP_QSTR_Architecture), MP_ROM_PTR(&espulp_architecture_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(espulp_module_globals, espulp_module_globals_table);
 
diff --git a/ports/espressif/common-hal/espulp/ULP.c b/ports/espressif/common-hal/espulp/ULP.c
index c2dfdb038b..3350f6d45c 100644
--- a/ports/espressif/common-hal/espulp/ULP.c
+++ b/ports/espressif/common-hal/espulp/ULP.c
@@ -133,7 +133,7 @@ void common_hal_espulp_ulp_halt(espulp_ulp_obj_t *self) {
     }
 }
 
-void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_ulparch_t arch) {
+void common_hal_espulp_ulp_construct(espulp_ulp_obj_t *self, espulp_architecture_t arch) {
     // Use a static variable to track ULP in use so that subsequent code runs can
     // use a running ULP. This is only to prevent multiple portions of user code
     // from using the ULP concurrently.
diff --git a/ports/espressif/common-hal/espulp/ULP.h b/ports/espressif/common-hal/espulp/ULP.h
index 42081411f0..360dd0c9fd 100644
--- a/ports/espressif/common-hal/espulp/ULP.h
+++ b/ports/espressif/common-hal/espulp/ULP.h
@@ -27,10 +27,10 @@
 #pragma once
 
 #include "py/obj.h"
-#include "bindings/espulp/ULPArch.h"
+#include "bindings/espulp/Architecture.h"
 
 typedef struct {
     mp_obj_base_t base;
-    espulp_ulparch_t arch;
+    espulp_architecture_t arch;
     bool inited;
 } espulp_ulp_obj_t;
diff --git a/ports/espressif/common-hal/espulp/ULPAlarm.c b/ports/espressif/common-hal/espulp/ULPAlarm.c
index e209325d68..3717d2ab71 100644
--- a/ports/espressif/common-hal/espulp/ULPAlarm.c
+++ b/ports/espressif/common-hal/espulp/ULPAlarm.c
@@ -37,6 +37,10 @@
 static volatile bool woke_up = false;
 static bool alarm_set = false;
 
+void common_hal_espulp_ulpalarm_construct(espulp_ulpalarm_obj_t *self, espulp_ulp_obj_t *ulp) {
+    self->ulp = ulp;
+}
+
 mp_obj_t espulp_ulpalarm_find_triggered_alarm(const 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], &espulp_ulpalarm_type)) {

From 9b98d485bb40fb316987427ab4c89b06e68d320b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 26 Jan 2023 14:13:38 +0530
Subject: [PATCH 1728/2403] switch to `ReadableBuffer` and `WriteableBuffer`

---
 ports/espressif/bindings/espnow/ESPNow.c | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 0bcd7d39ed..b67574360c 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -255,10 +255,10 @@ static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
     return (uint8_t *)bufinfo.buf;
 }
 
-//|     def set_pmk(self, pmk: bytes) -> None:
+//|     def set_pmk(self, pmk: ReadableBuffer) -> None:
 //|         """Set the ESP-NOW Primary Master Key (pmk) for encrypted communications.
 //|
-//|         :param bytes pmk: The ESP-NOW Primary Master Key (length = 16 bytes)."""
+//|         :param ReadableBuffer pmk: The ESP-NOW Primary Master Key (length = 16 bytes)."""
 //|         ...
 STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
     check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN, MP_BUFFER_READ)));
@@ -426,14 +426,14 @@ static void _wait_for_pending_responses(espnow_obj_t *self) {
 
 //|     def send(
 //|         self,
-//|         message: Union[bytearray, bytes, str],
-//|         mac: Optional[bytes],
+//|         message: ReadableBuffer,
+//|         mac: Optional[ReadableBuffer],
 //|         sync: bool = True,
 //|     ) -> bool:
 //|         """Send a message to the peer's mac address. Optionally wait for a response.
 //|
-//|         :param Union[bytearray, bytes, str] message: The message to send (length < 250 bytes).
-//|         :param bytes mac: The peer's address (length = 6 bytes). If `None` or any non-true value, send to all registered peers.
+//|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
+//|         :param ReadableBuffer mac: The peer's address (length = 6 bytes). If `None` or any non-true value, send to all registered peers.
 //|         :param bool sync: If `True`, wait for response from peer(s) after sending.
 //|
 //|         :returns:
@@ -498,7 +498,7 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 
-//|     def recv(self, buffers: List[bytearray]) -> int:
+//|     def recv(self, buffers: List[WriteableBuffer]) -> int:
 //|         """Loads mac, message, rssi and timestamp into the provided buffers.
 //|
 //|         If buffers is 2 elements long, the mac and message will be
@@ -506,7 +506,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 //|         If buffers is 4 elements long, the rssi and timestamp values will be
 //|         loaded into the 3rd and 4th elements.
 //|
-//|         :param List[bytearray] buffers: List of buffers to be loaded.
+//|         :param List[WriteableBuffer] buffers: List of buffers to be loaded.
 //|
 //|         :returns: Length of the message."""
 //|         ...
@@ -651,16 +651,16 @@ static void _update_peer_count(espnow_obj_t *self) {
 
 //|     def add_peer(
 //|         self,
-//|         mac: bytes,
-//|         lmk: Optional[bytes],
+//|         mac: ReadableBuffer,
+//|         lmk: Optional[ReadableBuffer],
 //|         channel: int = 0,
 //|         interface: int = 0,
 //|         encrypt: bool = False,
 //|     ) -> None:
 //|         """Add peer.
 //|
-//|         :param bytes mac: The mac address of the peer.
-//|         :param bytes lmk: The Local Master Key (lmk) of the peer.
+//|         :param ReadableBuffer mac: The mac address of the peer.
+//|         :param ReadableBuffer lmk: The Local Master Key (lmk) of the peer.
 //|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
 //|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
 //|         :param bool encrypt: Whether or not to use encryption."""
@@ -678,16 +678,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
 
 //|     def mod_peer(
 //|         self,
-//|         mac: bytes,
-//|         lmk: Optional[bytes],
+//|         mac: ReadableBuffer,
+//|         lmk: Optional[ReadableBuffer],
 //|         channel: int = 0,
 //|         interface: int = 0,
 //|         encrypt: bool = False,
 //|     ) -> None:
 //|         """Modify peer.
 //|
-//|         :param bytes mac: The mac address of the peer.
-//|         :param bytes lmk: The Local Master Key (lmk) of the peer.
+//|         :param ReadableBuffer mac: The mac address of the peer.
+//|         :param ReadableBuffer lmk: The Local Master Key (lmk) of the peer.
 //|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
 //|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
 //|         :param bool encrypt: Whether or not to use encryption."""
@@ -702,10 +702,10 @@ STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *pos_args, mp_map_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
 
-//|     def del_peer(self, mac: bytes) -> None:
+//|     def del_peer(self, mac: ReadableBuffer) -> None:
 //|         """Delete peer.
 //|
-//|         :param bytes mac: The mac address of the peer."""
+//|         :param ReadableBuffer mac: The mac address of the peer."""
 //|         ...
 STATIC mp_obj_t espnow_del_peer(mp_obj_t self_in, mp_obj_t mac) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -732,10 +732,10 @@ static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
         mp_obj_new_bool(peer->encrypt));
 }
 
-//|     def get_peer(self, mac: bytes) -> Tuple[bytes, int, int, bool]:
+//|     def get_peer(self, mac: ReadableBuffer) -> Tuple[bytes, int, int, bool]:
 //|         """Get the peer info for mac as a `tuple`.
 //|
-//|         :param bytes mac: The mac address of the peer.
+//|         :param ReadableBuffer mac: The mac address of the peer.
 //|
 //|         :returns: A `tuple` of (mac, lmk, channel, interface, encrypt)."""
 //|         ...

From 842d7087987c1280d8d1ac3cf673f90d2b459909 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 26 Jan 2023 20:18:22 -0500
Subject: [PATCH 1729/2403] update frozen libraries

---
 frozen/Adafruit_CircuitPython_APDS9960       | 2 +-
 frozen/Adafruit_CircuitPython_BLE            | 2 +-
 frozen/Adafruit_CircuitPython_DRV2605        | 2 +-
 frozen/Adafruit_CircuitPython_DS3231         | 2 +-
 frozen/Adafruit_CircuitPython_Display_Shapes | 2 +-
 frozen/Adafruit_CircuitPython_Display_Text   | 2 +-
 frozen/Adafruit_CircuitPython_IRRemote       | 2 +-
 frozen/Adafruit_CircuitPython_IS31FL3731     | 2 +-
 frozen/Adafruit_CircuitPython_LC709203F      | 2 +-
 frozen/Adafruit_CircuitPython_LIS3DH         | 2 +-
 frozen/Adafruit_CircuitPython_LSM6DS         | 2 +-
 frozen/Adafruit_CircuitPython_MIDI           | 2 +-
 frozen/Adafruit_CircuitPython_Motor          | 2 +-
 frozen/Adafruit_CircuitPython_NeoPixel       | 2 +-
 frozen/Adafruit_CircuitPython_PortalBase     | 2 +-
 frozen/Adafruit_CircuitPython_ProgressBar    | 2 +-
 frozen/Adafruit_CircuitPython_RFM9x          | 2 +-
 frozen/Adafruit_CircuitPython_Register       | 2 +-
 frozen/Adafruit_CircuitPython_Requests       | 2 +-
 frozen/Adafruit_CircuitPython_SD             | 2 +-
 frozen/Adafruit_CircuitPython_ST7789         | 2 +-
 frozen/Adafruit_CircuitPython_SimpleIO       | 2 +-
 frozen/Adafruit_CircuitPython_Ticks          | 2 +-
 frozen/Adafruit_CircuitPython_UC8151D        | 2 +-
 frozen/Adafruit_CircuitPython_asyncio        | 2 +-
 frozen/Adafruit_CircuitPython_seesaw         | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
index ba05423ed9..9ddd596505 160000
--- a/frozen/Adafruit_CircuitPython_APDS9960
+++ b/frozen/Adafruit_CircuitPython_APDS9960
@@ -1 +1 @@
-Subproject commit ba05423ed9aae09ce293603b519a4ac644ef0dab
+Subproject commit 9ddd59650598b7a0641d70aabcc8aab71799cb93
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
index 4fd499e397..e07e1853d7 160000
--- a/frozen/Adafruit_CircuitPython_BLE
+++ b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit 4fd499e39720f8ce970cceeb97c2a85c485f7335
+Subproject commit e07e1853d7e995b9797a064c098bccc5c384632e
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
index 4a4619a524..ab0ffa938d 160000
--- a/frozen/Adafruit_CircuitPython_DRV2605
+++ b/frozen/Adafruit_CircuitPython_DRV2605
@@ -1 +1 @@
-Subproject commit 4a4619a524918f2705c05ca4959385937afa9a7c
+Subproject commit ab0ffa938dfa7eb1fd7260353a7a4e28f55e537a
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
index 726270f510..e6a9a0140e 160000
--- a/frozen/Adafruit_CircuitPython_DS3231
+++ b/frozen/Adafruit_CircuitPython_DS3231
@@ -1 +1 @@
-Subproject commit 726270f5103d9d94810eb8b52041b7521afafc5c
+Subproject commit e6a9a0140ed44ef5f15d8040fce35b5319c1f216
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
index 656be4d791..cf2b173d0f 160000
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit 656be4d79196b5f25ab9ebca731d448c5b3bdc17
+Subproject commit cf2b173d0fc3ac2cd961754c6adf8f614a1c7c39
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index 6cf9f3cf32..1590d81f7d 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit 6cf9f3cf32e0c176c861de6356813ea4d08034d6
+Subproject commit 1590d81f7d1474b25aed6a0cb793c7e6dc7634ec
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
index 992b601e24..340c62ef6c 160000
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@@ -1 +1 @@
-Subproject commit 992b601e2469f30e95ec35c9859b4aa2cd917504
+Subproject commit 340c62ef6ce867b3924d166afc3d2a171680f799
diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731
index 794488d1de..8e0f081a0f 160000
--- a/frozen/Adafruit_CircuitPython_IS31FL3731
+++ b/frozen/Adafruit_CircuitPython_IS31FL3731
@@ -1 +1 @@
-Subproject commit 794488d1de3d17d1a08887c4a651cfac2c5a1524
+Subproject commit 8e0f081a0fcc94053b8ef480a916b10855a3c0d5
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
index 1919916dcf..38bd02f014 160000
--- a/frozen/Adafruit_CircuitPython_LC709203F
+++ b/frozen/Adafruit_CircuitPython_LC709203F
@@ -1 +1 @@
-Subproject commit 1919916dcf57e0879832b9c274c5fb77712d7775
+Subproject commit 38bd02f014403954ab52154e3877e502d83862dc
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index 5b4703428f..61ca58788a 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 5b4703428fc299ac268d08350c885122b2af1e75
+Subproject commit 61ca58788aabd53558e10c32064a1304aa7454f2
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
index c8e82b96c6..d689ca77c6 160000
--- a/frozen/Adafruit_CircuitPython_LSM6DS
+++ b/frozen/Adafruit_CircuitPython_LSM6DS
@@ -1 +1 @@
-Subproject commit c8e82b96c68041a11a52f3053d0d2733ae2d1a49
+Subproject commit d689ca77c67806484037e00110c669cf55846b6e
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
index b6891e7341..e38bf1f9cf 160000
--- a/frozen/Adafruit_CircuitPython_MIDI
+++ b/frozen/Adafruit_CircuitPython_MIDI
@@ -1 +1 @@
-Subproject commit b6891e734183f978e7b3d0a363140e98635c0a04
+Subproject commit e38bf1f9cf1e8faeb7d15a1d10674fb2c0a81e72
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
index 31c819f377..f26bead58d 160000
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit 31c819f377cf71f61cfb84eae159f1f948980db7
+Subproject commit f26bead58d3c4036eced586d275396816e92e80a
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
index 1064fdee5a..9516aa97e9 160000
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit 1064fdee5a1421f528af452be5e45ae95ef2b89a
+Subproject commit 9516aa97e9216eac2b229fbb7dac34fa60c347c4
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
index 7eeea1aaf6..759c5c3488 160000
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit 7eeea1aaf6bb5fa0deb080a1dc1aa3cd103f9aad
+Subproject commit 759c5c348878932adc5fcc9e4f3b3f570b43e17f
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
index cad34af526..74a1c26110 160000
--- a/frozen/Adafruit_CircuitPython_ProgressBar
+++ b/frozen/Adafruit_CircuitPython_ProgressBar
@@ -1 +1 @@
-Subproject commit cad34af5267aca3665fdaf1ea5a0eee921d13f06
+Subproject commit 74a1c261103cda43172053ff2370777255b9bf8d
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
index df4c73a5e7..c46c59e300 160000
--- a/frozen/Adafruit_CircuitPython_RFM9x
+++ b/frozen/Adafruit_CircuitPython_RFM9x
@@ -1 +1 @@
-Subproject commit df4c73a5e719f17fae0309e811ff17627cd0f268
+Subproject commit c46c59e3004817c708c78c59d247b02161c6bf06
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
index f611d5e31c..46a49205f3 160000
--- a/frozen/Adafruit_CircuitPython_Register
+++ b/frozen/Adafruit_CircuitPython_Register
@@ -1 +1 @@
-Subproject commit f611d5e31c9735a3c3ac43185e35dcd5f659e3aa
+Subproject commit 46a49205f3f14546273dd1267e66cad82f03986c
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index 317f4bdb79..203d0b1489 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit 317f4bdb799afa59b164def4ea0610f57db9922e
+Subproject commit 203d0b1489cb90a39f8a780570287f1a5bd610a0
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
index bb2fc8c157..eb17bffa75 160000
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit bb2fc8c157ee44869cde4cbc1ab20e6f31ac727f
+Subproject commit eb17bffa757dc8c0a53fe9e61c45246c06418099
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
index 9ff56ce53f..e23c487145 160000
--- a/frozen/Adafruit_CircuitPython_ST7789
+++ b/frozen/Adafruit_CircuitPython_ST7789
@@ -1 +1 @@
-Subproject commit 9ff56ce53f05e23ff678965ba54af89b24b1199a
+Subproject commit e23c4871456cdf0ef1bfb59d1c2f6e38b7b640ee
diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO
index 0a8fcbfc92..eac33b430b 160000
--- a/frozen/Adafruit_CircuitPython_SimpleIO
+++ b/frozen/Adafruit_CircuitPython_SimpleIO
@@ -1 +1 @@
-Subproject commit 0a8fcbfc92060eb298ea52d5e88587b37347a0be
+Subproject commit eac33b430b0cbe1f6f583000f6b29f75bfe8507e
diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks
index 7832bbb544..2634ca0163 160000
--- a/frozen/Adafruit_CircuitPython_Ticks
+++ b/frozen/Adafruit_CircuitPython_Ticks
@@ -1 +1 @@
-Subproject commit 7832bbb5449d55d8c7b731e4ff7490b801e94a9e
+Subproject commit 2634ca0163020bebec300fcca6e0b5afcdc655b8
diff --git a/frozen/Adafruit_CircuitPython_UC8151D b/frozen/Adafruit_CircuitPython_UC8151D
index 565fed5151..b6d9f852f5 160000
--- a/frozen/Adafruit_CircuitPython_UC8151D
+++ b/frozen/Adafruit_CircuitPython_UC8151D
@@ -1 +1 @@
-Subproject commit 565fed515138f962c4bcce0ee756d32e708a151a
+Subproject commit b6d9f852f50b489615f3f357f9758d0073335334
diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio
index fbdb77d712..596cc896e5 160000
--- a/frozen/Adafruit_CircuitPython_asyncio
+++ b/frozen/Adafruit_CircuitPython_asyncio
@@ -1 +1 @@
-Subproject commit fbdb77d7127e7d6a8d3574440b0f790c94a28cf8
+Subproject commit 596cc896e5c8815caa2a6f405560833193848149
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
index 6234787515..d4ff0388f3 160000
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@@ -1 +1 @@
-Subproject commit 6234787515e2f0ece40b6408722ff0b42824038e
+Subproject commit d4ff0388f3e3af2745864f2c3e5926f500673a40

From cda56892630b1be86a7bca43bc6e308c579bb14e Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 27 Jan 2023 21:58:37 +0530
Subject: [PATCH 1730/2403] move `esp32_camera` to `espcamera`

---
 locale/circuitpython.pot                      |    9 +-
 ports/espressif/CMakeLists.txt                |    2 +-
 ports/espressif/Makefile                      |   10 +-
 .../espressif/bindings/esp32_camera/Camera.c  | 1001 -----------------
 ports/espressif/bindings/espcamera/Camera.c   | 1001 +++++++++++++++++
 .../{esp32_camera => espcamera}/Camera.h      |   38 +-
 .../{esp32_camera => espcamera}/__init__.c    |  136 +--
 .../{esp32_camera => espcamera}/__init__.h    |    8 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../boards/adafruit_funhouse/mpconfigboard.mk |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../crcibernetica-ideaboard/mpconfigboard.mk  |    2 +-
 .../doit_esp32_devkit_v1/mpconfigboard.mk     |    2 +-
 .../electroniccats_bastwifi/mpconfigboard.mk  |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../espressif_esp32s3_box/mpconfigboard.mk    |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../espressif_saola_1_wroom/mpconfigboard.mk  |    2 +-
 .../franzininho_wifi_wroom/mpconfigboard.mk   |    2 +-
 .../gravitech_cucumber_m/mpconfigboard.mk     |    2 +-
 .../gravitech_cucumber_ms/mpconfigboard.mk    |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../boards/lolin_s3/mpconfigboard.mk          |    2 +-
 .../boards/m5stack_atom_echo/mpconfigboard.mk |    2 +-
 .../boards/m5stack_atom_lite/mpconfigboard.mk |    2 +-
 .../m5stack_atom_matrix/mpconfigboard.mk      |    2 +-
 .../boards/m5stack_atom_u/mpconfigboard.mk    |    2 +-
 .../m5stack_core_basic/mpconfigboard.mk       |    2 +-
 .../boards/m5stack_core_fire/mpconfigboard.mk |    2 +-
 .../boards/m5stack_stick_c/mpconfigboard.mk   |    2 +-
 .../boards/maker_badge/mpconfigboard.mk       |    2 +-
 .../boards/mixgo_ce_serial/mpconfigboard.mk   |    4 +-
 .../boards/mixgo_ce_udisk/mpconfigboard.mk    |    4 +-
 .../morpheans_morphesp-240/mpconfigboard.mk   |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../smartbeedesigns_bee_s3/mpconfigboard.mk   |    2 +-
 .../mpconfigboard.mk                          |    2 +-
 .../{esp32_camera => espcamera}/Camera.c      |   52 +-
 .../{esp32_camera => espcamera}/Camera.h      |    4 +-
 ports/espressif/mpconfigport.mk               |    8 +-
 ports/espressif/supervisor/port.c             |    4 +-
 py/circuitpy_mpconfig.mk                      |    9 +-
 shared-bindings/imagecapture/__init__.c       |    2 +-
 51 files changed, 1181 insertions(+), 1181 deletions(-)
 delete mode 100644 ports/espressif/bindings/esp32_camera/Camera.c
 create mode 100644 ports/espressif/bindings/espcamera/Camera.c
 rename ports/espressif/bindings/{esp32_camera => espcamera}/Camera.h (72%)
 rename ports/espressif/bindings/{esp32_camera => espcamera}/__init__.c (53%)
 rename ports/espressif/bindings/{esp32_camera => espcamera}/__init__.h (88%)
 rename ports/espressif/common-hal/{esp32_camera => espcamera}/Camera.c (83%)
 rename ports/espressif/common-hal/{esp32_camera => espcamera}/Camera.h (96%)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b98bddec50..b2c7155f18 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -663,6 +663,7 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2947,9 +2948,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3326,7 +3327,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3583,7 +3584,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
index ea4de9f343..ce2935a502 100644
--- a/ports/espressif/CMakeLists.txt
+++ b/ports/espressif/CMakeLists.txt
@@ -8,7 +8,7 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 # can build.
 set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip ulp wpa_supplicant freertos bt usb)
 
-if("${CIRCUITPY_ESP32_CAMERA}")
+if("${CIRCUITPY_ESPCAMERA}")
 message("Including esp32-camera")
 set(EXTRA_COMPONENT_DIRS "esp32-camera")
 list(APPEND COMPONENTS "esp32-camera")
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index ddfcaeeb6e..1c79691b33 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -250,10 +250,10 @@ endif
 
 SRC_C += $(wildcard common-hal/espidf/*.c)
 
-ifneq ($(CIRCUITPY_ESP32_CAMERA),0)
+ifneq ($(CIRCUITPY_ESPCAMERA),0)
 SRC_CAMERA := \
-	$(wildcard common-hal/esp32_camera/*.c) \
-	$(wildcard bindings/esp32_camera/*.c)
+	$(wildcard common-hal/espcamera/*.c) \
+	$(wildcard bindings/espcamera/*.c)
 SRC_C += $(SRC_CAMERA)
 CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
@@ -333,7 +333,7 @@ endif
 .PHONY: do-sdkconfig
 do-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
 $(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig CMakeLists.txt | $(BUILD)/esp-idf
-	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)
+	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja -DCIRCUITPY_ESPCAMERA=$(CIRCUITPY_ESPCAMERA)
 
 # build a lib
 # Adding -d explain -j 1 -v to the ninja line will output debug info
@@ -385,7 +385,7 @@ BINARY_BLOBS += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 endif
 
-ifneq ($(CIRCUITPY_ESP32_CAMERA),0)
+ifneq ($(CIRCUITPY_ESPCAMERA),0)
 ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp32-camera/libesp32-camera.a
 #$(error $(ESP_IDF_COMPONENTS_EXPANDED))
 endif
diff --git a/ports/espressif/bindings/esp32_camera/Camera.c b/ports/espressif/bindings/esp32_camera/Camera.c
deleted file mode 100644
index 114795c106..0000000000
--- a/ports/espressif/bindings/esp32_camera/Camera.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 Jeff Epler for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include 
-
-#include "py/mphal.h"
-#include "py/obj.h"
-#include "py/objproperty.h"
-#include "py/runtime.h"
-
-#include "bindings/esp32_camera/__init__.h"
-#include "bindings/esp32_camera/Camera.h"
-#include "common-hal/esp32_camera/Camera.h"
-
-#include "shared-bindings/displayio/Bitmap.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/util.h"
-#include "esp_camera.h"
-#include "sensor.h"
-
-//| class Camera:
-//|     def __init__(
-//|         self,
-//|         *,
-//|         data_pins: List[microcontroller.Pin],
-//|         pixel_clock_pin: microcontroller.Pin,
-//|         vsync_pin: microcontroller.Pin,
-//|         href_pin: microcontroller.Pin,
-//|         i2c: busio.I2C,
-//|         external_clock_pin: Optional[microcontroller.Pin] = None,
-//|         external_clock_frequency: int = 20_000_000,
-//|         powerdown_pin: Optional[microcontroller.Pin] = None,
-//|         reset_pin: Optional[microcontroller.Pin] = None,
-//|         pixel_format: PixelFormat = PixelFormat.RGB565,
-//|         frame_size: FrameSize = FrameSize.QQVGA,
-//|         jpeg_quality: int = 15,
-//|         framebuffer_count: int = 1,
-//|         grab_mode: GrabMode = GrabMode.WHEN_EMPTY,
-//|     ) -> None:
-//|         """
-//|         Configure and initialize a camera with the given properties
-//|
-//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``settings.toml`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
-//|
-//|
-//|         .. important::
-//|
-//|             Not all supported sensors have all
-//|             of the properties listed below. For instance, the
-//|             OV5640 supports `denoise`, but the
-//|             OV2640 does not. The underlying esp32-camera
-//|             library does not provide a reliable API to check
-//|             which settings are supported. CircuitPython makes
-//|             a best effort to determine when an unsupported
-//|             property is set and will raise an exception in
-//|             that case.
-//|
-//|         :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
-//|         :param pixel_clock_pin: The pixel clock output from the camera module
-//|         :param vsync_pin: The vertical sync pulse output from the camera module
-//|         :param href_pin: The horizontal reference output from the camera module
-//|         :param i2c: The I2C bus connected to the camera module
-//|         :param external_clock_pin: The pin on which to generate the external clock
-//|         :param external_clock_frequency: The frequency generated on the external clock pin
-//|         :param powerdown_pin: The powerdown input to the camera module
-//|         :param reset_pin: The reset input to the camera module
-//|         :param pixel_format: The pixel format of the captured image
-//|         :param frame_size: The size of captured image
-//|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
-//|         :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered)
-//|         :param grab_mode: When to grab a new frame
-//|         """
-STATIC mp_obj_t esp32_camera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_pixel_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_vsync_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_href_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_i2c, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_external_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
-        { MP_QSTR_external_clock_frequency, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 20000000L } },
-        { MP_QSTR_powerdown_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
-        { MP_QSTR_reset_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
-        { MP_QSTR_pixel_format, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&pixel_format_RGB565_obj) } },
-        { MP_QSTR_frame_size, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&frame_size_QQVGA_obj) } },
-        { MP_QSTR_jpeg_quality, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 15 } },
-        { MP_QSTR_framebuffer_count, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 1 } },
-        { MP_QSTR_grab_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&grab_mode_WHEN_EMPTY_obj) } },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS);
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    uint8_t data_pins[8];
-    uint8_t data_pin_count;
-    validate_pins(MP_QSTR_data_pins, data_pins, MP_ARRAY_SIZE(data_pins), args[ARG_data_pins].u_obj, &data_pin_count);
-    mp_arg_validate_length(data_pin_count, 8, MP_QSTR_data_pins);
-
-    const mcu_pin_obj_t *pixel_clock_pin =
-        validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj, MP_QSTR_pixel_clock_pin);
-    const mcu_pin_obj_t *vsync_pin =
-        validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj, MP_QSTR_vsync_pin);
-    const mcu_pin_obj_t *href_pin =
-        validate_obj_is_free_pin(args[ARG_href_pin].u_obj, MP_QSTR_href_pin);
-    busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
-    const mcu_pin_obj_t *external_clock_pin =
-        validate_obj_is_free_pin_or_none(args[ARG_external_clock_pin].u_obj, MP_QSTR_external_clock_pin);
-    const mcu_pin_obj_t *powerdown_pin =
-        validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj, MP_QSTR_powerdown_pin);
-    const mcu_pin_obj_t *reset_pin =
-        validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj, MP_QSTR_reset_pin);
-    const mp_int_t external_clock_frequency =
-        mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_external_clock_frequency);
-
-    camera_grab_mode_t grab_mode = validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode);
-    framesize_t frame_size = validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size);
-    pixformat_t pixel_format = validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format);
-    mp_int_t jpeg_quality = mp_arg_validate_int_range(args[ARG_jpeg_quality].u_int, 2, 55, MP_QSTR_jpeg_quality);
-    mp_int_t framebuffer_count = mp_arg_validate_int_range(args[ARG_framebuffer_count].u_int, 1, 2, MP_QSTR_framebuffer_count);
-
-    esp32_camera_camera_obj_t *self = m_new_obj(esp32_camera_camera_obj_t);
-    self->base.type = &esp32_camera_camera_type;
-    common_hal_esp32_camera_camera_construct(
-        self,
-        data_pins,
-        external_clock_pin,
-        pixel_clock_pin,
-        vsync_pin,
-        href_pin,
-        powerdown_pin,
-        reset_pin,
-        i2c,
-        external_clock_frequency,
-        pixel_format,
-        frame_size,
-        jpeg_quality,
-        framebuffer_count,
-        grab_mode);
-    return MP_OBJ_FROM_PTR(self);
-}
-
-//|     def deinit(self) -> None:
-//|         """Deinitialises the camera and releases all memory resources for reuse."""
-//|         ...
-STATIC mp_obj_t esp32_camera_camera_deinit(mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_esp32_camera_camera_deinit(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_deinit_obj, esp32_camera_camera_deinit);
-
-STATIC void check_for_deinit(esp32_camera_camera_obj_t *self) {
-    if (common_hal_esp32_camera_camera_deinited(self)) {
-        raise_deinited_error();
-    }
-}
-
-//|     def __enter__(self) -> Camera:
-//|         """No-op used by Context Managers."""
-//|         ...
-//  Provided by context manager helper.
-
-//|     def __exit__(self) -> None:
-//|         """Automatically deinitializes the hardware when exiting a context. See
-//|         :ref:`lifetime-and-contextmanagers` for more info."""
-//|         ...
-STATIC mp_obj_t esp32_camera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    return esp32_camera_camera_deinit(args[0]);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera___exit___obj, 4, 4, esp32_camera_camera_obj___exit__);
-
-//|     frame_available: bool
-//|     """True if a frame is available, False otherwise"""
-
-STATIC mp_obj_t esp32_camera_camera_frame_available_get(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(esp_camera_fb_available());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_frame_available_get_obj, esp32_camera_camera_frame_available_get);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_frame_available_obj,
-    (mp_obj_t)&esp32_camera_camera_frame_available_get_obj);
-
-//|     def take(
-//|         self, timeout: Optional[float] = 0.25
-//|     ) -> Optional[displayio.Bitmap | ReadableBuffer]:
-//|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
-//|
-//|         In the case of timeout, `None` is returned.
-//|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a read-only `memoryview`.
-//|         Otherwise, the returned value is a read-only `displayio.Bitmap`.
-//|         """
-STATIC mp_obj_t esp32_camera_camera_take(size_t n_args, const mp_obj_t *args) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]);
-    check_for_deinit(self);
-    camera_fb_t *result = common_hal_esp32_camera_camera_take(self, (int)MICROPY_FLOAT_C_FUN(round)(timeout * 1000));
-    if (!result) {
-        return mp_const_none;
-    }
-    pixformat_t format = common_hal_esp32_camera_camera_get_pixel_format(self);
-    if (format == PIXFORMAT_JPEG) {
-        return mp_obj_new_memoryview('b', result->len, result->buf);
-    } else {
-        int width = common_hal_esp32_camera_camera_get_width(self);
-        int height = common_hal_esp32_camera_camera_get_height(self);
-        displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
-        bitmap->base.type = &displayio_bitmap_type;
-        common_hal_displayio_bitmap_construct_from_buffer(bitmap, width, height, (format == PIXFORMAT_RGB565) ? 16 : 8, (uint32_t *)(void *)result->buf, true);
-        return bitmap;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_camera_camera_take_obj, 1, 2, esp32_camera_camera_take);
-
-
-//|     def reconfigure(
-//|         self,
-//|         frame_size: Optional[FrameSize] = None,
-//|         pixel_format: Optional[PixelFormat] = None,
-//|         grab_mode: Optional[GrabMode] = None,
-//|         framebuffer_count: Optional[int] = None,
-//|     ) -> None:
-//|         """Change multiple related camera settings simultaneously
-//|
-//|         Because these settings interact in complex ways, and take longer than
-//|         the other properties to set, they are set together in a single function call.
-//|
-//|         If an argument is unspecified or None, then the setting is unchanged."""
-
-STATIC mp_obj_t esp32_camera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    check_for_deinit(self);
-
-    enum { ARG_frame_size, ARG_pixel_format, ARG_grab_mode, ARG_framebuffer_count };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_frame_size, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
-        { MP_QSTR_pixel_format, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
-        { MP_QSTR_grab_mode, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
-        { MP_QSTR_framebuffer_count, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
-    };
-
-    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);
-
-    framesize_t frame_size =
-        args[ARG_frame_size].u_obj != MP_ROM_NONE
-        ?  validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size)
-        : common_hal_esp32_camera_camera_get_frame_size(self);
-    pixformat_t pixel_format =
-        args[ARG_pixel_format].u_obj != MP_ROM_NONE
-        ?  validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format)
-        : common_hal_esp32_camera_camera_get_pixel_format(self);
-    camera_grab_mode_t grab_mode =
-        args[ARG_grab_mode].u_obj != MP_ROM_NONE
-        ?  validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode)
-        : common_hal_esp32_camera_camera_get_grab_mode(self);
-    bool framebuffer_count =
-        args[ARG_framebuffer_count].u_obj != MP_ROM_NONE
-        ?  mp_obj_get_int(args[ARG_framebuffer_count].u_obj)
-        : common_hal_esp32_camera_camera_get_framebuffer_count(self);
-
-    common_hal_esp32_camera_camera_reconfigure(self, frame_size, pixel_format, grab_mode, framebuffer_count);
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(esp32_camera_camera_reconfigure_obj, 1, esp32_camera_camera_reconfigure);
-
-//|     pixel_format: PixelFormat
-//|     """The pixel format of captured frames"""
-
-STATIC mp_obj_t esp32_camera_camera_get_pixel_format(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return cp_enum_find(&esp32_camera_pixel_format_type, common_hal_esp32_camera_camera_get_pixel_format(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_pixel_format_obj, esp32_camera_camera_get_pixel_format);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_pixel_format_obj,
-    (mp_obj_t)&esp32_camera_camera_get_pixel_format_obj);
-
-
-//|     frame_size: FrameSize
-//|     """The size of captured frames"""
-
-STATIC mp_obj_t esp32_camera_camera_get_frame_size(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return cp_enum_find(&esp32_camera_frame_size_type, common_hal_esp32_camera_camera_get_frame_size(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_frame_size_obj, esp32_camera_camera_get_frame_size);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_frame_size_obj,
-    (mp_obj_t)&esp32_camera_camera_get_frame_size_obj);
-
-//|     contrast: int
-//|     """The sensor contrast.  Positive values increase contrast, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
-
-STATIC mp_obj_t esp32_camera_camera_get_contrast(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_contrast(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_contrast_obj, esp32_camera_camera_get_contrast);
-
-STATIC mp_obj_t esp32_camera_camera_set_contrast(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_contrast(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_contrast_obj, esp32_camera_camera_set_contrast);
-MP_PROPERTY_GETSET(esp32_camera_camera_contrast_obj,
-    (mp_obj_t)&esp32_camera_camera_get_contrast_obj,
-    (mp_obj_t)&esp32_camera_camera_set_contrast_obj);
-
-//|     brightness: int
-//|     """The sensor brightness.  Positive values increase brightness, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
-
-STATIC mp_obj_t esp32_camera_camera_get_brightness(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_brightness(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_brightness_obj, esp32_camera_camera_get_brightness);
-
-STATIC mp_obj_t esp32_camera_camera_set_brightness(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_brightness(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_brightness_obj, esp32_camera_camera_set_brightness);
-MP_PROPERTY_GETSET(esp32_camera_camera_brightness_obj,
-    (mp_obj_t)&esp32_camera_camera_get_brightness_obj,
-    (mp_obj_t)&esp32_camera_camera_set_brightness_obj);
-
-//|     saturation: int
-//|     """The sensor saturation.  Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
-
-STATIC mp_obj_t esp32_camera_camera_get_saturation(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_saturation(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_saturation_obj, esp32_camera_camera_get_saturation);
-
-STATIC mp_obj_t esp32_camera_camera_set_saturation(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_saturation(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_saturation_obj, esp32_camera_camera_set_saturation);
-MP_PROPERTY_GETSET(esp32_camera_camera_saturation_obj,
-    (mp_obj_t)&esp32_camera_camera_get_saturation_obj,
-    (mp_obj_t)&esp32_camera_camera_set_saturation_obj);
-
-//|     sharpness: int
-//|     """The sensor sharpness.  Positive values increase sharpness (more defined edges), negative values lower it (softer edges).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
-
-STATIC mp_obj_t esp32_camera_camera_get_sharpness(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_sharpness(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_sharpness_obj, esp32_camera_camera_get_sharpness);
-
-STATIC mp_obj_t esp32_camera_camera_set_sharpness(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_sharpness(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_sharpness_obj, esp32_camera_camera_set_sharpness);
-MP_PROPERTY_GETSET(esp32_camera_camera_sharpness_obj,
-    (mp_obj_t)&esp32_camera_camera_get_sharpness_obj,
-    (mp_obj_t)&esp32_camera_camera_set_sharpness_obj);
-
-//|     denoise: int
-//|     """The sensor 'denoise' setting.  Any camera sensor has inherent 'noise', especially in low brightness environments. Software algorithms can decrease noise at the expense of fine detail.  A larger value increases the amount of software noise removal.  The total range is device-specific but the value is often from 0 to 10."""
-
-STATIC mp_obj_t esp32_camera_camera_get_denoise(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_denoise(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_denoise_obj, esp32_camera_camera_get_denoise);
-
-STATIC mp_obj_t esp32_camera_camera_set_denoise(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_denoise(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_denoise_obj, esp32_camera_camera_set_denoise);
-MP_PROPERTY_GETSET(esp32_camera_camera_denoise_obj,
-    (mp_obj_t)&esp32_camera_camera_get_denoise_obj,
-    (mp_obj_t)&esp32_camera_camera_set_denoise_obj);
-
-//|     gain_ceiling: GainCeiling
-//|     """The sensor 'gain ceiling' setting. "Gain" is an analog multiplier applied to the raw sensor data.  The 'ceiling' is the maximum gain value that the sensor will use. A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible."""
-
-STATIC mp_obj_t esp32_camera_camera_get_gain_ceiling(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return cp_enum_find(&esp32_camera_gain_ceiling_type, common_hal_esp32_camera_camera_get_gainceiling(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_gain_ceiling_obj, esp32_camera_camera_get_gain_ceiling);
-
-STATIC mp_obj_t esp32_camera_camera_set_gain_ceiling(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_gainceiling(self, validate_gain_ceiling(arg, MP_QSTR_gain_ceiling));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_gain_ceiling_obj, esp32_camera_camera_set_gain_ceiling);
-MP_PROPERTY_GETSET(esp32_camera_camera_gain_ceiling_obj,
-    (mp_obj_t)&esp32_camera_camera_get_gain_ceiling_obj,
-    (mp_obj_t)&esp32_camera_camera_set_gain_ceiling_obj);
-
-//|     quality: int
-//|     """The 'quality' setting when capturing JPEG images.  This is similar to the quality setting when exporting a jpeg image from photo editing software.  Typical values range from 5 to 40, with higher numbers leading to larger image sizes and better overall image quality. However, when the quality is set to a high number, the total size of the JPEG data can exceed the size of an internal buffer, causing image capture to fail."""
-
-STATIC mp_obj_t esp32_camera_camera_get_quality(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_quality(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_quality_obj, esp32_camera_camera_get_quality);
-
-STATIC mp_obj_t esp32_camera_camera_set_quality(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_quality(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_quality_obj, esp32_camera_camera_set_quality);
-MP_PROPERTY_GETSET(esp32_camera_camera_quality_obj,
-    (mp_obj_t)&esp32_camera_camera_get_quality_obj,
-    (mp_obj_t)&esp32_camera_camera_set_quality_obj);
-
-//|     colorbar: bool
-//|     """When `True`, a test pattern image is captured and the real sensor data is not used."""
-
-STATIC mp_obj_t esp32_camera_camera_get_colorbar(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_colorbar(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_colorbar_obj, esp32_camera_camera_get_colorbar);
-
-STATIC mp_obj_t esp32_camera_camera_set_colorbar(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_colorbar(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_colorbar_obj, esp32_camera_camera_set_colorbar);
-MP_PROPERTY_GETSET(esp32_camera_camera_colorbar_obj,
-    (mp_obj_t)&esp32_camera_camera_get_colorbar_obj,
-    (mp_obj_t)&esp32_camera_camera_set_colorbar_obj);
-
-//|     whitebal: bool
-//|     """When `True`, the camera attempts to automatically control white balance.  When `False`, the `wb_mode` setting is used instead."""
-
-STATIC mp_obj_t esp32_camera_camera_get_whitebal(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_whitebal(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_whitebal_obj, esp32_camera_camera_get_whitebal);
-
-STATIC mp_obj_t esp32_camera_camera_set_whitebal(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_whitebal(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_whitebal_obj, esp32_camera_camera_set_whitebal);
-MP_PROPERTY_GETSET(esp32_camera_camera_whitebal_obj,
-    (mp_obj_t)&esp32_camera_camera_get_whitebal_obj,
-    (mp_obj_t)&esp32_camera_camera_set_whitebal_obj);
-
-//|     gain_ctrl: bool
-//|     """When `True`, the camera attempts to automatically control the sensor gain, up to the value in the `gain_ceiling` property.  When `False`, the `agc_gain` setting is used instead."""
-
-STATIC mp_obj_t esp32_camera_camera_get_gain_ctrl(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_gain_ctrl(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_gain_ctrl_obj, esp32_camera_camera_get_gain_ctrl);
-
-STATIC mp_obj_t esp32_camera_camera_set_gain_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_gain_ctrl(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_gain_ctrl_obj, esp32_camera_camera_set_gain_ctrl);
-MP_PROPERTY_GETSET(esp32_camera_camera_gain_ctrl_obj,
-    (mp_obj_t)&esp32_camera_camera_get_gain_ctrl_obj,
-    (mp_obj_t)&esp32_camera_camera_set_gain_ctrl_obj);
-
-//|     exposure_ctrl: bool
-//|     """When `True` the camera attempts to automatically control the exposure. When `False`, the `aec_value` setting is used instead."""
-
-STATIC mp_obj_t esp32_camera_camera_get_exposure_ctrl(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_exposure_ctrl(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_exposure_ctrl_obj, esp32_camera_camera_get_exposure_ctrl);
-
-STATIC mp_obj_t esp32_camera_camera_set_exposure_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_exposure_ctrl(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_exposure_ctrl_obj, esp32_camera_camera_set_exposure_ctrl);
-MP_PROPERTY_GETSET(esp32_camera_camera_exposure_ctrl_obj,
-    (mp_obj_t)&esp32_camera_camera_get_exposure_ctrl_obj,
-    (mp_obj_t)&esp32_camera_camera_set_exposure_ctrl_obj);
-
-//|     hmirror: bool
-//|     """When `True` the camera image is mirrored left-to-right"""
-
-STATIC mp_obj_t esp32_camera_camera_get_hmirror(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_hmirror(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_hmirror_obj, esp32_camera_camera_get_hmirror);
-
-STATIC mp_obj_t esp32_camera_camera_set_hmirror(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_hmirror(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_hmirror_obj, esp32_camera_camera_set_hmirror);
-MP_PROPERTY_GETSET(esp32_camera_camera_hmirror_obj,
-    (mp_obj_t)&esp32_camera_camera_get_hmirror_obj,
-    (mp_obj_t)&esp32_camera_camera_set_hmirror_obj);
-
-//|     vflip: bool
-//|     """When `True` the camera image is flipped top-to-bottom"""
-
-STATIC mp_obj_t esp32_camera_camera_get_vflip(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_vflip(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_vflip_obj, esp32_camera_camera_get_vflip);
-
-STATIC mp_obj_t esp32_camera_camera_set_vflip(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_vflip(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_vflip_obj, esp32_camera_camera_set_vflip);
-MP_PROPERTY_GETSET(esp32_camera_camera_vflip_obj,
-    (mp_obj_t)&esp32_camera_camera_get_vflip_obj,
-    (mp_obj_t)&esp32_camera_camera_set_vflip_obj);
-
-//|     aec2: bool
-//|     """When `True` the sensor's "night mode" is enabled, extending the range of automatic gain control."""
-
-STATIC mp_obj_t esp32_camera_camera_get_aec2(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_aec2(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_aec2_obj, esp32_camera_camera_get_aec2);
-
-STATIC mp_obj_t esp32_camera_camera_set_aec2(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_aec2(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_aec2_obj, esp32_camera_camera_set_aec2);
-MP_PROPERTY_GETSET(esp32_camera_camera_aec2_obj,
-    (mp_obj_t)&esp32_camera_camera_get_aec2_obj,
-    (mp_obj_t)&esp32_camera_camera_set_aec2_obj);
-
-//|     awb_gain: bool
-//|     """Access the awb_gain property of the camera sensor"""
-
-STATIC mp_obj_t esp32_camera_camera_get_awb_gain(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_awb_gain(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_awb_gain_obj, esp32_camera_camera_get_awb_gain);
-
-STATIC mp_obj_t esp32_camera_camera_set_awb_gain(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_awb_gain(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_awb_gain_obj, esp32_camera_camera_set_awb_gain);
-MP_PROPERTY_GETSET(esp32_camera_camera_awb_gain_obj,
-    (mp_obj_t)&esp32_camera_camera_get_awb_gain_obj,
-    (mp_obj_t)&esp32_camera_camera_set_awb_gain_obj);
-
-//|     agc_gain: int
-//|     """Access the gain level of the sensor. Higher values produce brighter images.  Typical settings range from 0 to 30. """
-
-STATIC mp_obj_t esp32_camera_camera_get_agc_gain(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_agc_gain(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_agc_gain_obj, esp32_camera_camera_get_agc_gain);
-
-STATIC mp_obj_t esp32_camera_camera_set_agc_gain(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_agc_gain(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_agc_gain_obj, esp32_camera_camera_set_agc_gain);
-MP_PROPERTY_GETSET(esp32_camera_camera_agc_gain_obj,
-    (mp_obj_t)&esp32_camera_camera_get_agc_gain_obj,
-    (mp_obj_t)&esp32_camera_camera_set_agc_gain_obj);
-
-//|     aec_value: int
-//|     """Access the exposure value of the camera.  Higher values produce brighter images.  Typical settings range from 0 to 1200."""
-
-STATIC mp_obj_t esp32_camera_camera_get_aec_value(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_aec_value(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_aec_value_obj, esp32_camera_camera_get_aec_value);
-
-STATIC mp_obj_t esp32_camera_camera_set_aec_value(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_aec_value(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_aec_value_obj, esp32_camera_camera_set_aec_value);
-MP_PROPERTY_GETSET(esp32_camera_camera_aec_value_obj,
-    (mp_obj_t)&esp32_camera_camera_get_aec_value_obj,
-    (mp_obj_t)&esp32_camera_camera_set_aec_value_obj);
-
-//|     special_effect: int
-//|     """Enable a "special effect". Zero is no special effect.  On OV5640, special effects range from 0 to 6 inclusive and select various color modes."""
-
-STATIC mp_obj_t esp32_camera_camera_get_special_effect(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_special_effect(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_special_effect_obj, esp32_camera_camera_get_special_effect);
-
-STATIC mp_obj_t esp32_camera_camera_set_special_effect(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_special_effect(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_special_effect_obj, esp32_camera_camera_set_special_effect);
-MP_PROPERTY_GETSET(esp32_camera_camera_special_effect_obj,
-    (mp_obj_t)&esp32_camera_camera_get_special_effect_obj,
-    (mp_obj_t)&esp32_camera_camera_set_special_effect_obj);
-
-//|     wb_mode: int
-//|     """The white balance mode.  0 is automatic white balance.  Typical values range from 0 to 4 inclusive."""
-
-STATIC mp_obj_t esp32_camera_camera_get_wb_mode(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_wb_mode(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_wb_mode_obj, esp32_camera_camera_get_wb_mode);
-
-STATIC mp_obj_t esp32_camera_camera_set_wb_mode(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_wb_mode(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_wb_mode_obj, esp32_camera_camera_set_wb_mode);
-MP_PROPERTY_GETSET(esp32_camera_camera_wb_mode_obj,
-    (mp_obj_t)&esp32_camera_camera_get_wb_mode_obj,
-    (mp_obj_t)&esp32_camera_camera_set_wb_mode_obj);
-
-//|     ae_level: int
-//|     """The exposure offset for automatic exposure.  Typical values range from -2 to +2."""
-
-STATIC mp_obj_t esp32_camera_camera_get_ae_level(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_ae_level(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_ae_level_obj, esp32_camera_camera_get_ae_level);
-
-STATIC mp_obj_t esp32_camera_camera_set_ae_level(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_ae_level(self, mp_obj_get_int(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_ae_level_obj, esp32_camera_camera_set_ae_level);
-MP_PROPERTY_GETSET(esp32_camera_camera_ae_level_obj,
-    (mp_obj_t)&esp32_camera_camera_get_ae_level_obj,
-    (mp_obj_t)&esp32_camera_camera_set_ae_level_obj);
-
-//|     dcw: bool
-//|     """When `True` an advanced white balance mode is selected."""
-
-STATIC mp_obj_t esp32_camera_camera_get_dcw(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_dcw(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_dcw_obj, esp32_camera_camera_get_dcw);
-
-STATIC mp_obj_t esp32_camera_camera_set_dcw(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_dcw(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_dcw_obj, esp32_camera_camera_set_dcw);
-MP_PROPERTY_GETSET(esp32_camera_camera_dcw_obj,
-    (mp_obj_t)&esp32_camera_camera_get_dcw_obj,
-    (mp_obj_t)&esp32_camera_camera_set_dcw_obj);
-
-//|     bpc: bool
-//|     """When `True`, "black point compensation" is enabled. This can make black parts of the image darker."""
-
-STATIC mp_obj_t esp32_camera_camera_get_bpc(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_bpc(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_bpc_obj, esp32_camera_camera_get_bpc);
-
-STATIC mp_obj_t esp32_camera_camera_set_bpc(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_bpc(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_bpc_obj, esp32_camera_camera_set_bpc);
-MP_PROPERTY_GETSET(esp32_camera_camera_bpc_obj,
-    (mp_obj_t)&esp32_camera_camera_get_bpc_obj,
-    (mp_obj_t)&esp32_camera_camera_set_bpc_obj);
-
-//|     wpc: bool
-//|     """When `True`, "white point compensation" is enabled.  This can make white parts of the image whiter."""
-
-STATIC mp_obj_t esp32_camera_camera_get_wpc(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_wpc(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_wpc_obj, esp32_camera_camera_get_wpc);
-
-STATIC mp_obj_t esp32_camera_camera_set_wpc(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_wpc(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_wpc_obj, esp32_camera_camera_set_wpc);
-MP_PROPERTY_GETSET(esp32_camera_camera_wpc_obj,
-    (mp_obj_t)&esp32_camera_camera_get_wpc_obj,
-    (mp_obj_t)&esp32_camera_camera_set_wpc_obj);
-
-//|     raw_gma: bool
-//|     """When `True`, raw gamma mode is enabled."""
-
-STATIC mp_obj_t esp32_camera_camera_get_raw_gma(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_raw_gma(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_raw_gma_obj, esp32_camera_camera_get_raw_gma);
-
-STATIC mp_obj_t esp32_camera_camera_set_raw_gma(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_raw_gma(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_raw_gma_obj, esp32_camera_camera_set_raw_gma);
-MP_PROPERTY_GETSET(esp32_camera_camera_raw_gma_obj,
-    (mp_obj_t)&esp32_camera_camera_get_raw_gma_obj,
-    (mp_obj_t)&esp32_camera_camera_set_raw_gma_obj);
-
-//|     lenc: bool
-//|     """Enable "lens correction". This can help compensate for light fall-off at the edge of the sensor area."""
-
-STATIC mp_obj_t esp32_camera_camera_get_lenc(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_lenc(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_lenc_obj, esp32_camera_camera_get_lenc);
-
-STATIC mp_obj_t esp32_camera_camera_set_lenc(const mp_obj_t self_in, const mp_obj_t arg) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    common_hal_esp32_camera_camera_set_lenc(self, mp_obj_is_true(arg));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_camera_camera_set_lenc_obj, esp32_camera_camera_set_lenc);
-MP_PROPERTY_GETSET(esp32_camera_camera_lenc_obj,
-    (mp_obj_t)&esp32_camera_camera_get_lenc_obj,
-    (mp_obj_t)&esp32_camera_camera_set_lenc_obj);
-
-//|     max_frame_size: FrameSize
-//|     """The maximum frame size that can be captured"""
-STATIC mp_obj_t esp32_camera_camera_get_max_frame_size(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return cp_enum_find(&esp32_camera_frame_size_type, common_hal_esp32_camera_camera_get_max_frame_size(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_max_frame_size_obj, esp32_camera_camera_get_max_frame_size);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_max_frame_size_obj,
-    (mp_obj_t)&esp32_camera_camera_get_max_frame_size_obj);
-
-
-//|     address: int
-//|     """The I2C (SCCB) address of the sensor"""
-STATIC mp_obj_t esp32_camera_camera_get_address(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_address(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_address_obj, esp32_camera_camera_get_address);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_address_obj,
-    (mp_obj_t)&esp32_camera_camera_get_address_obj);
-
-
-//|     sensor_name: str
-//|     """The name of the sensor"""
-STATIC mp_obj_t esp32_camera_camera_get_sensor_name(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    const char *sensor_name = common_hal_esp32_camera_camera_get_sensor_name(self);
-    return mp_obj_new_str(sensor_name, strlen(sensor_name));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_sensor_name_obj, esp32_camera_camera_get_sensor_name);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_sensor_name_obj,
-    (mp_obj_t)&esp32_camera_camera_get_sensor_name_obj);
-
-
-//|     supports_jpeg: bool
-//|     """True if the sensor can capture images in JPEG format"""
-STATIC mp_obj_t esp32_camera_camera_get_supports_jpeg(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_esp32_camera_camera_get_supports_jpeg(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_supports_jpeg_obj, esp32_camera_camera_get_supports_jpeg);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_supports_jpeg_obj,
-    (mp_obj_t)&esp32_camera_camera_get_supports_jpeg_obj);
-
-//|     height: int
-//|     """The height of the image being captured"""
-STATIC mp_obj_t esp32_camera_camera_get_height(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_height(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_height_obj, esp32_camera_camera_get_height);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_height_obj,
-    (mp_obj_t)&esp32_camera_camera_get_height_obj);
-
-//|     width: int
-//|     """The width of the image being captured"""
-STATIC mp_obj_t esp32_camera_camera_get_width(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_width(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_width_obj, esp32_camera_camera_get_width);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_width_obj,
-    (mp_obj_t)&esp32_camera_camera_get_width_obj);
-
-//|     grab_mode: GrabMode
-//|     """The grab mode of the camera"""
-STATIC mp_obj_t esp32_camera_camera_get_grab_mode(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return cp_enum_find(&esp32_camera_grab_mode_type, common_hal_esp32_camera_camera_get_grab_mode(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_grab_mode_obj, esp32_camera_camera_get_grab_mode);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_grab_mode_obj,
-    (mp_obj_t)&esp32_camera_camera_get_grab_mode_obj);
-
-
-//|     framebuffer_count: int
-//|     """True if double buffering is used"""
-//|
-STATIC mp_obj_t esp32_camera_camera_get_framebuffer_count(const mp_obj_t self_in) {
-    esp32_camera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_esp32_camera_camera_get_framebuffer_count(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_camera_camera_get_framebuffer_count_obj, esp32_camera_camera_get_framebuffer_count);
-
-MP_PROPERTY_GETTER(esp32_camera_camera_framebuffer_count_obj,
-    (mp_obj_t)&esp32_camera_camera_get_framebuffer_count_obj);
-
-
-STATIC const mp_rom_map_elem_t esp32_camera_camera_locals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&esp32_camera_camera_address_obj) },
-    { MP_ROM_QSTR(MP_QSTR_aec2), MP_ROM_PTR(&esp32_camera_camera_aec2_obj) },
-    { MP_ROM_QSTR(MP_QSTR_aec_value), MP_ROM_PTR(&esp32_camera_camera_aec_value_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ae_level), MP_ROM_PTR(&esp32_camera_camera_ae_level_obj) },
-    { MP_ROM_QSTR(MP_QSTR_agc_gain), MP_ROM_PTR(&esp32_camera_camera_agc_gain_obj) },
-    { MP_ROM_QSTR(MP_QSTR_awb_gain), MP_ROM_PTR(&esp32_camera_camera_awb_gain_obj) },
-    { MP_ROM_QSTR(MP_QSTR_bpc), MP_ROM_PTR(&esp32_camera_camera_bpc_obj) },
-    { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&esp32_camera_camera_brightness_obj) },
-    { MP_ROM_QSTR(MP_QSTR_colorbar), MP_ROM_PTR(&esp32_camera_camera_colorbar_obj) },
-    { MP_ROM_QSTR(MP_QSTR_contrast), MP_ROM_PTR(&esp32_camera_camera_contrast_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dcw), MP_ROM_PTR(&esp32_camera_camera_dcw_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_camera_camera_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_denoise), MP_ROM_PTR(&esp32_camera_camera_denoise_obj) },
-    { MP_ROM_QSTR(MP_QSTR_framebuffer_count), MP_ROM_PTR(&esp32_camera_camera_framebuffer_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&esp32_camera_camera___exit___obj) },
-    { MP_ROM_QSTR(MP_QSTR_exposure_ctrl), MP_ROM_PTR(&esp32_camera_camera_exposure_ctrl_obj) },
-    { MP_ROM_QSTR(MP_QSTR_frame_available), MP_ROM_PTR(&esp32_camera_camera_frame_available_obj) },
-    { MP_ROM_QSTR(MP_QSTR_frame_size), MP_ROM_PTR(&esp32_camera_camera_frame_size_obj) },
-    { MP_ROM_QSTR(MP_QSTR_gain_ceiling), MP_ROM_PTR(&esp32_camera_camera_gain_ceiling_obj) },
-    { MP_ROM_QSTR(MP_QSTR_gain_ctrl), MP_ROM_PTR(&esp32_camera_camera_gain_ctrl_obj) },
-    { MP_ROM_QSTR(MP_QSTR_grab_mode), MP_ROM_PTR(&esp32_camera_camera_grab_mode_obj) },
-    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&esp32_camera_camera_height_obj) },
-    { MP_ROM_QSTR(MP_QSTR_hmirror), MP_ROM_PTR(&esp32_camera_camera_hmirror_obj) },
-    { MP_ROM_QSTR(MP_QSTR_lenc), MP_ROM_PTR(&esp32_camera_camera_lenc_obj) },
-    { MP_ROM_QSTR(MP_QSTR_max_frame_size), MP_ROM_PTR(&esp32_camera_camera_max_frame_size_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pixel_format), MP_ROM_PTR(&esp32_camera_camera_pixel_format_obj) },
-    { MP_ROM_QSTR(MP_QSTR_quality), MP_ROM_PTR(&esp32_camera_camera_quality_obj) },
-    { MP_ROM_QSTR(MP_QSTR_raw_gma), MP_ROM_PTR(&esp32_camera_camera_raw_gma_obj) },
-    { MP_ROM_QSTR(MP_QSTR_reconfigure), MP_ROM_PTR(&esp32_camera_camera_reconfigure_obj) },
-    { MP_ROM_QSTR(MP_QSTR_saturation), MP_ROM_PTR(&esp32_camera_camera_saturation_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sensor_name), MP_ROM_PTR(&esp32_camera_camera_sensor_name_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sharpness), MP_ROM_PTR(&esp32_camera_camera_sharpness_obj) },
-    { MP_ROM_QSTR(MP_QSTR_special_effect), MP_ROM_PTR(&esp32_camera_camera_special_effect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_supports_jpeg), MP_ROM_PTR(&esp32_camera_camera_supports_jpeg_obj) },
-    { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&esp32_camera_camera_take_obj) },
-    { MP_ROM_QSTR(MP_QSTR_vflip), MP_ROM_PTR(&esp32_camera_camera_vflip_obj) },
-    { MP_ROM_QSTR(MP_QSTR_wb_mode), MP_ROM_PTR(&esp32_camera_camera_wb_mode_obj) },
-    { MP_ROM_QSTR(MP_QSTR_whitebal), MP_ROM_PTR(&esp32_camera_camera_whitebal_obj) },
-    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&esp32_camera_camera_width_obj) },
-    { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&esp32_camera_camera_wpc_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_camera_locals_dict, esp32_camera_camera_locals_table);
-
-const mp_obj_type_t esp32_camera_camera_type = {
-    .base = { &mp_type_type },
-    .name = MP_QSTR_Camera,
-    .make_new = esp32_camera_camera_make_new,
-    .locals_dict = (mp_obj_t)&esp32_camera_camera_locals_dict,
-};
diff --git a/ports/espressif/bindings/espcamera/Camera.c b/ports/espressif/bindings/espcamera/Camera.c
new file mode 100644
index 0000000000..824bc7d3dc
--- /dev/null
+++ b/ports/espressif/bindings/espcamera/Camera.c
@@ -0,0 +1,1001 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "py/mphal.h"
+#include "py/obj.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+
+#include "bindings/espcamera/__init__.h"
+#include "bindings/espcamera/Camera.h"
+#include "common-hal/espcamera/Camera.h"
+
+#include "shared-bindings/displayio/Bitmap.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+#include "esp_camera.h"
+#include "sensor.h"
+
+//| class Camera:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         data_pins: List[microcontroller.Pin],
+//|         pixel_clock_pin: microcontroller.Pin,
+//|         vsync_pin: microcontroller.Pin,
+//|         href_pin: microcontroller.Pin,
+//|         i2c: busio.I2C,
+//|         external_clock_pin: Optional[microcontroller.Pin] = None,
+//|         external_clock_frequency: int = 20_000_000,
+//|         powerdown_pin: Optional[microcontroller.Pin] = None,
+//|         reset_pin: Optional[microcontroller.Pin] = None,
+//|         pixel_format: PixelFormat = PixelFormat.RGB565,
+//|         frame_size: FrameSize = FrameSize.QQVGA,
+//|         jpeg_quality: int = 15,
+//|         framebuffer_count: int = 1,
+//|         grab_mode: GrabMode = GrabMode.WHEN_EMPTY,
+//|     ) -> None:
+//|         """
+//|         Configure and initialize a camera with the given properties
+//|
+//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``settings.toml`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
+//|
+//|
+//|         .. important::
+//|
+//|             Not all supported sensors have all
+//|             of the properties listed below. For instance, the
+//|             OV5640 supports `denoise`, but the
+//|             OV2640 does not. The underlying esp32-camera
+//|             library does not provide a reliable API to check
+//|             which settings are supported. CircuitPython makes
+//|             a best effort to determine when an unsupported
+//|             property is set and will raise an exception in
+//|             that case.
+//|
+//|         :param data_pins: The 8 data data_pins used for image data transfer from the camera module, least significant bit first
+//|         :param pixel_clock_pin: The pixel clock output from the camera module
+//|         :param vsync_pin: The vertical sync pulse output from the camera module
+//|         :param href_pin: The horizontal reference output from the camera module
+//|         :param i2c: The I2C bus connected to the camera module
+//|         :param external_clock_pin: The pin on which to generate the external clock
+//|         :param external_clock_frequency: The frequency generated on the external clock pin
+//|         :param powerdown_pin: The powerdown input to the camera module
+//|         :param reset_pin: The reset input to the camera module
+//|         :param pixel_format: The pixel format of the captured image
+//|         :param frame_size: The size of captured image
+//|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
+//|         :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered)
+//|         :param grab_mode: When to grab a new frame
+//|         """
+STATIC mp_obj_t espcamera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_pixel_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_vsync_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_href_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_i2c, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_external_clock_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_external_clock_frequency, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 20000000L } },
+        { MP_QSTR_powerdown_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_reset_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_NONE } },
+        { MP_QSTR_pixel_format, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&pixel_format_RGB565_obj) } },
+        { MP_QSTR_frame_size, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&frame_size_QQVGA_obj) } },
+        { MP_QSTR_jpeg_quality, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 15 } },
+        { MP_QSTR_framebuffer_count, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 1 } },
+        { MP_QSTR_grab_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = MP_ROM_PTR((void *)&grab_mode_WHEN_EMPTY_obj) } },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS);
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    uint8_t data_pins[8];
+    uint8_t data_pin_count;
+    validate_pins(MP_QSTR_data_pins, data_pins, MP_ARRAY_SIZE(data_pins), args[ARG_data_pins].u_obj, &data_pin_count);
+    mp_arg_validate_length(data_pin_count, 8, MP_QSTR_data_pins);
+
+    const mcu_pin_obj_t *pixel_clock_pin =
+        validate_obj_is_free_pin(args[ARG_pixel_clock_pin].u_obj, MP_QSTR_pixel_clock_pin);
+    const mcu_pin_obj_t *vsync_pin =
+        validate_obj_is_free_pin(args[ARG_vsync_pin].u_obj, MP_QSTR_vsync_pin);
+    const mcu_pin_obj_t *href_pin =
+        validate_obj_is_free_pin(args[ARG_href_pin].u_obj, MP_QSTR_href_pin);
+    busio_i2c_obj_t *i2c = MP_OBJ_TO_PTR(mp_arg_validate_type(args[ARG_i2c].u_obj, &busio_i2c_type, MP_QSTR_i2c));
+    const mcu_pin_obj_t *external_clock_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_external_clock_pin].u_obj, MP_QSTR_external_clock_pin);
+    const mcu_pin_obj_t *powerdown_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_powerdown_pin].u_obj, MP_QSTR_powerdown_pin);
+    const mcu_pin_obj_t *reset_pin =
+        validate_obj_is_free_pin_or_none(args[ARG_reset_pin].u_obj, MP_QSTR_reset_pin);
+    const mp_int_t external_clock_frequency =
+        mp_arg_validate_int_range(args[ARG_external_clock_frequency].u_int, 0, 40000000, MP_QSTR_external_clock_frequency);
+
+    camera_grab_mode_t grab_mode = validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode);
+    framesize_t frame_size = validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size);
+    pixformat_t pixel_format = validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format);
+    mp_int_t jpeg_quality = mp_arg_validate_int_range(args[ARG_jpeg_quality].u_int, 2, 55, MP_QSTR_jpeg_quality);
+    mp_int_t framebuffer_count = mp_arg_validate_int_range(args[ARG_framebuffer_count].u_int, 1, 2, MP_QSTR_framebuffer_count);
+
+    espcamera_camera_obj_t *self = m_new_obj(espcamera_camera_obj_t);
+    self->base.type = &espcamera_camera_type;
+    common_hal_espcamera_camera_construct(
+        self,
+        data_pins,
+        external_clock_pin,
+        pixel_clock_pin,
+        vsync_pin,
+        href_pin,
+        powerdown_pin,
+        reset_pin,
+        i2c,
+        external_clock_frequency,
+        pixel_format,
+        frame_size,
+        jpeg_quality,
+        framebuffer_count,
+        grab_mode);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Deinitialises the camera and releases all memory resources for reuse."""
+//|         ...
+STATIC mp_obj_t espcamera_camera_deinit(mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espcamera_camera_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_deinit_obj, espcamera_camera_deinit);
+
+STATIC void check_for_deinit(espcamera_camera_obj_t *self) {
+    if (common_hal_espcamera_camera_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     def __enter__(self) -> Camera:
+//|         """No-op used by Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+STATIC mp_obj_t espcamera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return espcamera_camera_deinit(args[0]);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera___exit___obj, 4, 4, espcamera_camera_obj___exit__);
+
+//|     frame_available: bool
+//|     """True if a frame is available, False otherwise"""
+
+STATIC mp_obj_t espcamera_camera_frame_available_get(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(esp_camera_fb_available());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_frame_available_get_obj, espcamera_camera_frame_available_get);
+
+MP_PROPERTY_GETTER(espcamera_camera_frame_available_obj,
+    (mp_obj_t)&espcamera_camera_frame_available_get_obj);
+
+//|     def take(
+//|         self, timeout: Optional[float] = 0.25
+//|     ) -> Optional[displayio.Bitmap | ReadableBuffer]:
+//|         """Record a frame. Wait up to 'timeout' seconds for a frame to be captured.
+//|
+//|         In the case of timeout, `None` is returned.
+//|         If `pixel_format` is `PixelFormat.JPEG`, the returned value is a read-only `memoryview`.
+//|         Otherwise, the returned value is a read-only `displayio.Bitmap`.
+//|         """
+STATIC mp_obj_t espcamera_camera_take(size_t n_args, const mp_obj_t *args) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]);
+    check_for_deinit(self);
+    camera_fb_t *result = common_hal_espcamera_camera_take(self, (int)MICROPY_FLOAT_C_FUN(round)(timeout * 1000));
+    if (!result) {
+        return mp_const_none;
+    }
+    pixformat_t format = common_hal_espcamera_camera_get_pixel_format(self);
+    if (format == PIXFORMAT_JPEG) {
+        return mp_obj_new_memoryview('b', result->len, result->buf);
+    } else {
+        int width = common_hal_espcamera_camera_get_width(self);
+        int height = common_hal_espcamera_camera_get_height(self);
+        displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
+        bitmap->base.type = &displayio_bitmap_type;
+        common_hal_displayio_bitmap_construct_from_buffer(bitmap, width, height, (format == PIXFORMAT_RGB565) ? 16 : 8, (uint32_t *)(void *)result->buf, true);
+        return bitmap;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera_take_obj, 1, 2, espcamera_camera_take);
+
+
+//|     def reconfigure(
+//|         self,
+//|         frame_size: Optional[FrameSize] = None,
+//|         pixel_format: Optional[PixelFormat] = None,
+//|         grab_mode: Optional[GrabMode] = None,
+//|         framebuffer_count: Optional[int] = None,
+//|     ) -> None:
+//|         """Change multiple related camera settings simultaneously
+//|
+//|         Because these settings interact in complex ways, and take longer than
+//|         the other properties to set, they are set together in a single function call.
+//|
+//|         If an argument is unspecified or None, then the setting is unchanged."""
+
+STATIC mp_obj_t espcamera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+
+    enum { ARG_frame_size, ARG_pixel_format, ARG_grab_mode, ARG_framebuffer_count };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_frame_size, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_pixel_format, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_grab_mode, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+        { MP_QSTR_framebuffer_count, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE} },
+    };
+
+    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);
+
+    framesize_t frame_size =
+        args[ARG_frame_size].u_obj != MP_ROM_NONE
+        ?  validate_frame_size(args[ARG_frame_size].u_obj, MP_QSTR_frame_size)
+        : common_hal_espcamera_camera_get_frame_size(self);
+    pixformat_t pixel_format =
+        args[ARG_pixel_format].u_obj != MP_ROM_NONE
+        ?  validate_pixel_format(args[ARG_pixel_format].u_obj, MP_QSTR_pixel_format)
+        : common_hal_espcamera_camera_get_pixel_format(self);
+    camera_grab_mode_t grab_mode =
+        args[ARG_grab_mode].u_obj != MP_ROM_NONE
+        ?  validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode)
+        : common_hal_espcamera_camera_get_grab_mode(self);
+    bool framebuffer_count =
+        args[ARG_framebuffer_count].u_obj != MP_ROM_NONE
+        ?  mp_obj_get_int(args[ARG_framebuffer_count].u_obj)
+        : common_hal_espcamera_camera_get_framebuffer_count(self);
+
+    common_hal_espcamera_camera_reconfigure(self, frame_size, pixel_format, grab_mode, framebuffer_count);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(espcamera_camera_reconfigure_obj, 1, espcamera_camera_reconfigure);
+
+//|     pixel_format: PixelFormat
+//|     """The pixel format of captured frames"""
+
+STATIC mp_obj_t espcamera_camera_get_pixel_format(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&espcamera_pixel_format_type, common_hal_espcamera_camera_get_pixel_format(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_pixel_format_obj, espcamera_camera_get_pixel_format);
+
+MP_PROPERTY_GETTER(espcamera_camera_pixel_format_obj,
+    (mp_obj_t)&espcamera_camera_get_pixel_format_obj);
+
+
+//|     frame_size: FrameSize
+//|     """The size of captured frames"""
+
+STATIC mp_obj_t espcamera_camera_get_frame_size(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&espcamera_frame_size_type, common_hal_espcamera_camera_get_frame_size(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_frame_size_obj, espcamera_camera_get_frame_size);
+
+MP_PROPERTY_GETTER(espcamera_camera_frame_size_obj,
+    (mp_obj_t)&espcamera_camera_get_frame_size_obj);
+
+//|     contrast: int
+//|     """The sensor contrast.  Positive values increase contrast, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
+
+STATIC mp_obj_t espcamera_camera_get_contrast(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_contrast(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_contrast_obj, espcamera_camera_get_contrast);
+
+STATIC mp_obj_t espcamera_camera_set_contrast(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_contrast(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_contrast_obj, espcamera_camera_set_contrast);
+MP_PROPERTY_GETSET(espcamera_camera_contrast_obj,
+    (mp_obj_t)&espcamera_camera_get_contrast_obj,
+    (mp_obj_t)&espcamera_camera_set_contrast_obj);
+
+//|     brightness: int
+//|     """The sensor brightness.  Positive values increase brightness, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive."""
+
+STATIC mp_obj_t espcamera_camera_get_brightness(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_brightness(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_brightness_obj, espcamera_camera_get_brightness);
+
+STATIC mp_obj_t espcamera_camera_set_brightness(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_brightness(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_brightness_obj, espcamera_camera_set_brightness);
+MP_PROPERTY_GETSET(espcamera_camera_brightness_obj,
+    (mp_obj_t)&espcamera_camera_get_brightness_obj,
+    (mp_obj_t)&espcamera_camera_set_brightness_obj);
+
+//|     saturation: int
+//|     """The sensor saturation.  Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
+
+STATIC mp_obj_t espcamera_camera_get_saturation(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_saturation(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_saturation_obj, espcamera_camera_get_saturation);
+
+STATIC mp_obj_t espcamera_camera_set_saturation(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_saturation(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_saturation_obj, espcamera_camera_set_saturation);
+MP_PROPERTY_GETSET(espcamera_camera_saturation_obj,
+    (mp_obj_t)&espcamera_camera_get_saturation_obj,
+    (mp_obj_t)&espcamera_camera_set_saturation_obj);
+
+//|     sharpness: int
+//|     """The sensor sharpness.  Positive values increase sharpness (more defined edges), negative values lower it (softer edges).  The total range is device-specific but the value is often from -2 to +2 inclusive."""
+
+STATIC mp_obj_t espcamera_camera_get_sharpness(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_sharpness(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sharpness_obj, espcamera_camera_get_sharpness);
+
+STATIC mp_obj_t espcamera_camera_set_sharpness(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_sharpness(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_sharpness_obj, espcamera_camera_set_sharpness);
+MP_PROPERTY_GETSET(espcamera_camera_sharpness_obj,
+    (mp_obj_t)&espcamera_camera_get_sharpness_obj,
+    (mp_obj_t)&espcamera_camera_set_sharpness_obj);
+
+//|     denoise: int
+//|     """The sensor 'denoise' setting.  Any camera sensor has inherent 'noise', especially in low brightness environments. Software algorithms can decrease noise at the expense of fine detail.  A larger value increases the amount of software noise removal.  The total range is device-specific but the value is often from 0 to 10."""
+
+STATIC mp_obj_t espcamera_camera_get_denoise(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_denoise(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_denoise_obj, espcamera_camera_get_denoise);
+
+STATIC mp_obj_t espcamera_camera_set_denoise(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_denoise(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_denoise_obj, espcamera_camera_set_denoise);
+MP_PROPERTY_GETSET(espcamera_camera_denoise_obj,
+    (mp_obj_t)&espcamera_camera_get_denoise_obj,
+    (mp_obj_t)&espcamera_camera_set_denoise_obj);
+
+//|     gain_ceiling: GainCeiling
+//|     """The sensor 'gain ceiling' setting. "Gain" is an analog multiplier applied to the raw sensor data.  The 'ceiling' is the maximum gain value that the sensor will use. A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible."""
+
+STATIC mp_obj_t espcamera_camera_get_gain_ceiling(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&espcamera_gain_ceiling_type, common_hal_espcamera_camera_get_gainceiling(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ceiling_obj, espcamera_camera_get_gain_ceiling);
+
+STATIC mp_obj_t espcamera_camera_set_gain_ceiling(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_gainceiling(self, validate_gain_ceiling(arg, MP_QSTR_gain_ceiling));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ceiling_obj, espcamera_camera_set_gain_ceiling);
+MP_PROPERTY_GETSET(espcamera_camera_gain_ceiling_obj,
+    (mp_obj_t)&espcamera_camera_get_gain_ceiling_obj,
+    (mp_obj_t)&espcamera_camera_set_gain_ceiling_obj);
+
+//|     quality: int
+//|     """The 'quality' setting when capturing JPEG images.  This is similar to the quality setting when exporting a jpeg image from photo editing software.  Typical values range from 5 to 40, with higher numbers leading to larger image sizes and better overall image quality. However, when the quality is set to a high number, the total size of the JPEG data can exceed the size of an internal buffer, causing image capture to fail."""
+
+STATIC mp_obj_t espcamera_camera_get_quality(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_quality(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_quality_obj, espcamera_camera_get_quality);
+
+STATIC mp_obj_t espcamera_camera_set_quality(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_quality(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_quality_obj, espcamera_camera_set_quality);
+MP_PROPERTY_GETSET(espcamera_camera_quality_obj,
+    (mp_obj_t)&espcamera_camera_get_quality_obj,
+    (mp_obj_t)&espcamera_camera_set_quality_obj);
+
+//|     colorbar: bool
+//|     """When `True`, a test pattern image is captured and the real sensor data is not used."""
+
+STATIC mp_obj_t espcamera_camera_get_colorbar(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_colorbar(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_colorbar_obj, espcamera_camera_get_colorbar);
+
+STATIC mp_obj_t espcamera_camera_set_colorbar(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_colorbar(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_colorbar_obj, espcamera_camera_set_colorbar);
+MP_PROPERTY_GETSET(espcamera_camera_colorbar_obj,
+    (mp_obj_t)&espcamera_camera_get_colorbar_obj,
+    (mp_obj_t)&espcamera_camera_set_colorbar_obj);
+
+//|     whitebal: bool
+//|     """When `True`, the camera attempts to automatically control white balance.  When `False`, the `wb_mode` setting is used instead."""
+
+STATIC mp_obj_t espcamera_camera_get_whitebal(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_whitebal(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_whitebal_obj, espcamera_camera_get_whitebal);
+
+STATIC mp_obj_t espcamera_camera_set_whitebal(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_whitebal(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_whitebal_obj, espcamera_camera_set_whitebal);
+MP_PROPERTY_GETSET(espcamera_camera_whitebal_obj,
+    (mp_obj_t)&espcamera_camera_get_whitebal_obj,
+    (mp_obj_t)&espcamera_camera_set_whitebal_obj);
+
+//|     gain_ctrl: bool
+//|     """When `True`, the camera attempts to automatically control the sensor gain, up to the value in the `gain_ceiling` property.  When `False`, the `agc_gain` setting is used instead."""
+
+STATIC mp_obj_t espcamera_camera_get_gain_ctrl(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_gain_ctrl(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ctrl_obj, espcamera_camera_get_gain_ctrl);
+
+STATIC mp_obj_t espcamera_camera_set_gain_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_gain_ctrl(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ctrl_obj, espcamera_camera_set_gain_ctrl);
+MP_PROPERTY_GETSET(espcamera_camera_gain_ctrl_obj,
+    (mp_obj_t)&espcamera_camera_get_gain_ctrl_obj,
+    (mp_obj_t)&espcamera_camera_set_gain_ctrl_obj);
+
+//|     exposure_ctrl: bool
+//|     """When `True` the camera attempts to automatically control the exposure. When `False`, the `aec_value` setting is used instead."""
+
+STATIC mp_obj_t espcamera_camera_get_exposure_ctrl(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_exposure_ctrl(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_exposure_ctrl_obj, espcamera_camera_get_exposure_ctrl);
+
+STATIC mp_obj_t espcamera_camera_set_exposure_ctrl(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_exposure_ctrl(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_exposure_ctrl_obj, espcamera_camera_set_exposure_ctrl);
+MP_PROPERTY_GETSET(espcamera_camera_exposure_ctrl_obj,
+    (mp_obj_t)&espcamera_camera_get_exposure_ctrl_obj,
+    (mp_obj_t)&espcamera_camera_set_exposure_ctrl_obj);
+
+//|     hmirror: bool
+//|     """When `True` the camera image is mirrored left-to-right"""
+
+STATIC mp_obj_t espcamera_camera_get_hmirror(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_hmirror(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_hmirror_obj, espcamera_camera_get_hmirror);
+
+STATIC mp_obj_t espcamera_camera_set_hmirror(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_hmirror(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_hmirror_obj, espcamera_camera_set_hmirror);
+MP_PROPERTY_GETSET(espcamera_camera_hmirror_obj,
+    (mp_obj_t)&espcamera_camera_get_hmirror_obj,
+    (mp_obj_t)&espcamera_camera_set_hmirror_obj);
+
+//|     vflip: bool
+//|     """When `True` the camera image is flipped top-to-bottom"""
+
+STATIC mp_obj_t espcamera_camera_get_vflip(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_vflip(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_vflip_obj, espcamera_camera_get_vflip);
+
+STATIC mp_obj_t espcamera_camera_set_vflip(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_vflip(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_vflip_obj, espcamera_camera_set_vflip);
+MP_PROPERTY_GETSET(espcamera_camera_vflip_obj,
+    (mp_obj_t)&espcamera_camera_get_vflip_obj,
+    (mp_obj_t)&espcamera_camera_set_vflip_obj);
+
+//|     aec2: bool
+//|     """When `True` the sensor's "night mode" is enabled, extending the range of automatic gain control."""
+
+STATIC mp_obj_t espcamera_camera_get_aec2(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_aec2(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec2_obj, espcamera_camera_get_aec2);
+
+STATIC mp_obj_t espcamera_camera_set_aec2(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_aec2(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec2_obj, espcamera_camera_set_aec2);
+MP_PROPERTY_GETSET(espcamera_camera_aec2_obj,
+    (mp_obj_t)&espcamera_camera_get_aec2_obj,
+    (mp_obj_t)&espcamera_camera_set_aec2_obj);
+
+//|     awb_gain: bool
+//|     """Access the awb_gain property of the camera sensor"""
+
+STATIC mp_obj_t espcamera_camera_get_awb_gain(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_awb_gain(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_awb_gain_obj, espcamera_camera_get_awb_gain);
+
+STATIC mp_obj_t espcamera_camera_set_awb_gain(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_awb_gain(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_awb_gain_obj, espcamera_camera_set_awb_gain);
+MP_PROPERTY_GETSET(espcamera_camera_awb_gain_obj,
+    (mp_obj_t)&espcamera_camera_get_awb_gain_obj,
+    (mp_obj_t)&espcamera_camera_set_awb_gain_obj);
+
+//|     agc_gain: int
+//|     """Access the gain level of the sensor. Higher values produce brighter images.  Typical settings range from 0 to 30. """
+
+STATIC mp_obj_t espcamera_camera_get_agc_gain(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_agc_gain(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_agc_gain_obj, espcamera_camera_get_agc_gain);
+
+STATIC mp_obj_t espcamera_camera_set_agc_gain(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_agc_gain(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_agc_gain_obj, espcamera_camera_set_agc_gain);
+MP_PROPERTY_GETSET(espcamera_camera_agc_gain_obj,
+    (mp_obj_t)&espcamera_camera_get_agc_gain_obj,
+    (mp_obj_t)&espcamera_camera_set_agc_gain_obj);
+
+//|     aec_value: int
+//|     """Access the exposure value of the camera.  Higher values produce brighter images.  Typical settings range from 0 to 1200."""
+
+STATIC mp_obj_t espcamera_camera_get_aec_value(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_aec_value(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec_value_obj, espcamera_camera_get_aec_value);
+
+STATIC mp_obj_t espcamera_camera_set_aec_value(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_aec_value(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec_value_obj, espcamera_camera_set_aec_value);
+MP_PROPERTY_GETSET(espcamera_camera_aec_value_obj,
+    (mp_obj_t)&espcamera_camera_get_aec_value_obj,
+    (mp_obj_t)&espcamera_camera_set_aec_value_obj);
+
+//|     special_effect: int
+//|     """Enable a "special effect". Zero is no special effect.  On OV5640, special effects range from 0 to 6 inclusive and select various color modes."""
+
+STATIC mp_obj_t espcamera_camera_get_special_effect(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_special_effect(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_special_effect_obj, espcamera_camera_get_special_effect);
+
+STATIC mp_obj_t espcamera_camera_set_special_effect(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_special_effect(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_special_effect_obj, espcamera_camera_set_special_effect);
+MP_PROPERTY_GETSET(espcamera_camera_special_effect_obj,
+    (mp_obj_t)&espcamera_camera_get_special_effect_obj,
+    (mp_obj_t)&espcamera_camera_set_special_effect_obj);
+
+//|     wb_mode: int
+//|     """The white balance mode.  0 is automatic white balance.  Typical values range from 0 to 4 inclusive."""
+
+STATIC mp_obj_t espcamera_camera_get_wb_mode(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_wb_mode(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wb_mode_obj, espcamera_camera_get_wb_mode);
+
+STATIC mp_obj_t espcamera_camera_set_wb_mode(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_wb_mode(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wb_mode_obj, espcamera_camera_set_wb_mode);
+MP_PROPERTY_GETSET(espcamera_camera_wb_mode_obj,
+    (mp_obj_t)&espcamera_camera_get_wb_mode_obj,
+    (mp_obj_t)&espcamera_camera_set_wb_mode_obj);
+
+//|     ae_level: int
+//|     """The exposure offset for automatic exposure.  Typical values range from -2 to +2."""
+
+STATIC mp_obj_t espcamera_camera_get_ae_level(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_ae_level(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_ae_level_obj, espcamera_camera_get_ae_level);
+
+STATIC mp_obj_t espcamera_camera_set_ae_level(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_ae_level(self, mp_obj_get_int(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_ae_level_obj, espcamera_camera_set_ae_level);
+MP_PROPERTY_GETSET(espcamera_camera_ae_level_obj,
+    (mp_obj_t)&espcamera_camera_get_ae_level_obj,
+    (mp_obj_t)&espcamera_camera_set_ae_level_obj);
+
+//|     dcw: bool
+//|     """When `True` an advanced white balance mode is selected."""
+
+STATIC mp_obj_t espcamera_camera_get_dcw(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_dcw(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_dcw_obj, espcamera_camera_get_dcw);
+
+STATIC mp_obj_t espcamera_camera_set_dcw(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_dcw(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_dcw_obj, espcamera_camera_set_dcw);
+MP_PROPERTY_GETSET(espcamera_camera_dcw_obj,
+    (mp_obj_t)&espcamera_camera_get_dcw_obj,
+    (mp_obj_t)&espcamera_camera_set_dcw_obj);
+
+//|     bpc: bool
+//|     """When `True`, "black point compensation" is enabled. This can make black parts of the image darker."""
+
+STATIC mp_obj_t espcamera_camera_get_bpc(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_bpc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_bpc_obj, espcamera_camera_get_bpc);
+
+STATIC mp_obj_t espcamera_camera_set_bpc(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_bpc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_bpc_obj, espcamera_camera_set_bpc);
+MP_PROPERTY_GETSET(espcamera_camera_bpc_obj,
+    (mp_obj_t)&espcamera_camera_get_bpc_obj,
+    (mp_obj_t)&espcamera_camera_set_bpc_obj);
+
+//|     wpc: bool
+//|     """When `True`, "white point compensation" is enabled.  This can make white parts of the image whiter."""
+
+STATIC mp_obj_t espcamera_camera_get_wpc(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_wpc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wpc_obj, espcamera_camera_get_wpc);
+
+STATIC mp_obj_t espcamera_camera_set_wpc(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_wpc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wpc_obj, espcamera_camera_set_wpc);
+MP_PROPERTY_GETSET(espcamera_camera_wpc_obj,
+    (mp_obj_t)&espcamera_camera_get_wpc_obj,
+    (mp_obj_t)&espcamera_camera_set_wpc_obj);
+
+//|     raw_gma: bool
+//|     """When `True`, raw gamma mode is enabled."""
+
+STATIC mp_obj_t espcamera_camera_get_raw_gma(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_raw_gma(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_raw_gma_obj, espcamera_camera_get_raw_gma);
+
+STATIC mp_obj_t espcamera_camera_set_raw_gma(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_raw_gma(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_raw_gma_obj, espcamera_camera_set_raw_gma);
+MP_PROPERTY_GETSET(espcamera_camera_raw_gma_obj,
+    (mp_obj_t)&espcamera_camera_get_raw_gma_obj,
+    (mp_obj_t)&espcamera_camera_set_raw_gma_obj);
+
+//|     lenc: bool
+//|     """Enable "lens correction". This can help compensate for light fall-off at the edge of the sensor area."""
+
+STATIC mp_obj_t espcamera_camera_get_lenc(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_lenc(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_lenc_obj, espcamera_camera_get_lenc);
+
+STATIC mp_obj_t espcamera_camera_set_lenc(const mp_obj_t self_in, const mp_obj_t arg) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_espcamera_camera_set_lenc(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_lenc_obj, espcamera_camera_set_lenc);
+MP_PROPERTY_GETSET(espcamera_camera_lenc_obj,
+    (mp_obj_t)&espcamera_camera_get_lenc_obj,
+    (mp_obj_t)&espcamera_camera_set_lenc_obj);
+
+//|     max_frame_size: FrameSize
+//|     """The maximum frame size that can be captured"""
+STATIC mp_obj_t espcamera_camera_get_max_frame_size(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&espcamera_frame_size_type, common_hal_espcamera_camera_get_max_frame_size(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_max_frame_size_obj, espcamera_camera_get_max_frame_size);
+
+MP_PROPERTY_GETTER(espcamera_camera_max_frame_size_obj,
+    (mp_obj_t)&espcamera_camera_get_max_frame_size_obj);
+
+
+//|     address: int
+//|     """The I2C (SCCB) address of the sensor"""
+STATIC mp_obj_t espcamera_camera_get_address(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_address(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_address_obj, espcamera_camera_get_address);
+
+MP_PROPERTY_GETTER(espcamera_camera_address_obj,
+    (mp_obj_t)&espcamera_camera_get_address_obj);
+
+
+//|     sensor_name: str
+//|     """The name of the sensor"""
+STATIC mp_obj_t espcamera_camera_get_sensor_name(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    const char *sensor_name = common_hal_espcamera_camera_get_sensor_name(self);
+    return mp_obj_new_str(sensor_name, strlen(sensor_name));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sensor_name_obj, espcamera_camera_get_sensor_name);
+
+MP_PROPERTY_GETTER(espcamera_camera_sensor_name_obj,
+    (mp_obj_t)&espcamera_camera_get_sensor_name_obj);
+
+
+//|     supports_jpeg: bool
+//|     """True if the sensor can capture images in JPEG format"""
+STATIC mp_obj_t espcamera_camera_get_supports_jpeg(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_bool(common_hal_espcamera_camera_get_supports_jpeg(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_supports_jpeg_obj, espcamera_camera_get_supports_jpeg);
+
+MP_PROPERTY_GETTER(espcamera_camera_supports_jpeg_obj,
+    (mp_obj_t)&espcamera_camera_get_supports_jpeg_obj);
+
+//|     height: int
+//|     """The height of the image being captured"""
+STATIC mp_obj_t espcamera_camera_get_height(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_height(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_height_obj, espcamera_camera_get_height);
+
+MP_PROPERTY_GETTER(espcamera_camera_height_obj,
+    (mp_obj_t)&espcamera_camera_get_height_obj);
+
+//|     width: int
+//|     """The width of the image being captured"""
+STATIC mp_obj_t espcamera_camera_get_width(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_width(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_width_obj, espcamera_camera_get_width);
+
+MP_PROPERTY_GETTER(espcamera_camera_width_obj,
+    (mp_obj_t)&espcamera_camera_get_width_obj);
+
+//|     grab_mode: GrabMode
+//|     """The grab mode of the camera"""
+STATIC mp_obj_t espcamera_camera_get_grab_mode(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return cp_enum_find(&espcamera_grab_mode_type, common_hal_espcamera_camera_get_grab_mode(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_grab_mode_obj, espcamera_camera_get_grab_mode);
+
+MP_PROPERTY_GETTER(espcamera_camera_grab_mode_obj,
+    (mp_obj_t)&espcamera_camera_get_grab_mode_obj);
+
+
+//|     framebuffer_count: int
+//|     """True if double buffering is used"""
+//|
+STATIC mp_obj_t espcamera_camera_get_framebuffer_count(const mp_obj_t self_in) {
+    espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_framebuffer_count(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_framebuffer_count_obj, espcamera_camera_get_framebuffer_count);
+
+MP_PROPERTY_GETTER(espcamera_camera_framebuffer_count_obj,
+    (mp_obj_t)&espcamera_camera_get_framebuffer_count_obj);
+
+
+STATIC const mp_rom_map_elem_t espcamera_camera_locals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&espcamera_camera_address_obj) },
+    { MP_ROM_QSTR(MP_QSTR_aec2), MP_ROM_PTR(&espcamera_camera_aec2_obj) },
+    { MP_ROM_QSTR(MP_QSTR_aec_value), MP_ROM_PTR(&espcamera_camera_aec_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ae_level), MP_ROM_PTR(&espcamera_camera_ae_level_obj) },
+    { MP_ROM_QSTR(MP_QSTR_agc_gain), MP_ROM_PTR(&espcamera_camera_agc_gain_obj) },
+    { MP_ROM_QSTR(MP_QSTR_awb_gain), MP_ROM_PTR(&espcamera_camera_awb_gain_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bpc), MP_ROM_PTR(&espcamera_camera_bpc_obj) },
+    { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&espcamera_camera_brightness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_colorbar), MP_ROM_PTR(&espcamera_camera_colorbar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_contrast), MP_ROM_PTR(&espcamera_camera_contrast_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dcw), MP_ROM_PTR(&espcamera_camera_dcw_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espcamera_camera_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_denoise), MP_ROM_PTR(&espcamera_camera_denoise_obj) },
+    { MP_ROM_QSTR(MP_QSTR_framebuffer_count), MP_ROM_PTR(&espcamera_camera_framebuffer_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espcamera_camera___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_exposure_ctrl), MP_ROM_PTR(&espcamera_camera_exposure_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_available), MP_ROM_PTR(&espcamera_camera_frame_available_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_size), MP_ROM_PTR(&espcamera_camera_frame_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gain_ceiling), MP_ROM_PTR(&espcamera_camera_gain_ceiling_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gain_ctrl), MP_ROM_PTR(&espcamera_camera_gain_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_grab_mode), MP_ROM_PTR(&espcamera_camera_grab_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&espcamera_camera_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hmirror), MP_ROM_PTR(&espcamera_camera_hmirror_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lenc), MP_ROM_PTR(&espcamera_camera_lenc_obj) },
+    { MP_ROM_QSTR(MP_QSTR_max_frame_size), MP_ROM_PTR(&espcamera_camera_max_frame_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pixel_format), MP_ROM_PTR(&espcamera_camera_pixel_format_obj) },
+    { MP_ROM_QSTR(MP_QSTR_quality), MP_ROM_PTR(&espcamera_camera_quality_obj) },
+    { MP_ROM_QSTR(MP_QSTR_raw_gma), MP_ROM_PTR(&espcamera_camera_raw_gma_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reconfigure), MP_ROM_PTR(&espcamera_camera_reconfigure_obj) },
+    { MP_ROM_QSTR(MP_QSTR_saturation), MP_ROM_PTR(&espcamera_camera_saturation_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sensor_name), MP_ROM_PTR(&espcamera_camera_sensor_name_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sharpness), MP_ROM_PTR(&espcamera_camera_sharpness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_special_effect), MP_ROM_PTR(&espcamera_camera_special_effect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_supports_jpeg), MP_ROM_PTR(&espcamera_camera_supports_jpeg_obj) },
+    { MP_ROM_QSTR(MP_QSTR_take), MP_ROM_PTR(&espcamera_camera_take_obj) },
+    { MP_ROM_QSTR(MP_QSTR_vflip), MP_ROM_PTR(&espcamera_camera_vflip_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wb_mode), MP_ROM_PTR(&espcamera_camera_wb_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_whitebal), MP_ROM_PTR(&espcamera_camera_whitebal_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&espcamera_camera_width_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&espcamera_camera_wpc_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(espcamera_camera_locals_dict, espcamera_camera_locals_table);
+
+const mp_obj_type_t espcamera_camera_type = {
+    .base = { &mp_type_type },
+    .name = MP_QSTR_Camera,
+    .make_new = espcamera_camera_make_new,
+    .locals_dict = (mp_obj_t)&espcamera_camera_locals_dict,
+};
diff --git a/ports/espressif/bindings/esp32_camera/Camera.h b/ports/espressif/bindings/espcamera/Camera.h
similarity index 72%
rename from ports/espressif/bindings/esp32_camera/Camera.h
rename to ports/espressif/bindings/espcamera/Camera.h
index f190808531..c6d8182090 100644
--- a/ports/espressif/bindings/esp32_camera/Camera.h
+++ b/ports/espressif/bindings/espcamera/Camera.h
@@ -33,11 +33,11 @@
 
 #include "shared-bindings/busio/I2C.h"
 
-extern const mp_obj_type_t esp32_camera_camera_type;
-typedef struct esp32_camera_camera_obj esp32_camera_camera_obj_t;
+extern const mp_obj_type_t espcamera_camera_type;
+typedef struct espcamera_camera_obj espcamera_camera_obj_t;
 
-extern void common_hal_esp32_camera_camera_construct(
-    esp32_camera_camera_obj_t *self,
+extern void common_hal_espcamera_camera_construct(
+    espcamera_camera_obj_t *self,
     uint8_t data_pins[8],
     const mcu_pin_obj_t *external_clock_pin,
     const mcu_pin_obj_t *pixel_clock_pin,
@@ -53,11 +53,11 @@ extern void common_hal_esp32_camera_camera_construct(
     mp_int_t framebuffer_count,
     camera_grab_mode_t grab_mode);
 
-extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *self);
-extern bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self);
-extern bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self);
-extern camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms);
-extern void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count);
+extern void common_hal_espcamera_camera_deinit(espcamera_camera_obj_t *self);
+extern bool common_hal_espcamera_camera_deinited(espcamera_camera_obj_t *self);
+extern bool common_hal_espcamera_camera_available(espcamera_camera_obj_t *self);
+extern camera_fb_t *common_hal_espcamera_camera_take(espcamera_camera_obj_t *self, int timeout_ms);
+extern void common_hal_espcamera_camera_reconfigure(espcamera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count);
 
 #define DECLARE_SENSOR_GETSET(type, name, field_name, setter_function_name) \
     DECLARE_SENSOR_GET(type, name, field_name, setter_function_name) \
@@ -70,10 +70,10 @@ extern void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t
     DECLARE_SENSOR_GET(type, name, status.status_field_name, setter_function_name)
 
 #define DECLARE_SENSOR_GET(type, name, status_field_name, setter_function_name) \
-    extern type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self);
+    extern type common_hal_espcamera_camera_get_##name(espcamera_camera_obj_t * self);
 
 #define DECLARE_SENSOR_SET(type, name, setter_function_name) \
-    extern void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value);
+    extern void common_hal_espcamera_camera_set_##name(espcamera_camera_obj_t * self, type value);
 
 DECLARE_SENSOR_GET(pixformat_t, pixel_format, pixformat, set_pixformat)
 DECLARE_SENSOR_STATUS_GET(framesize_t, frame_size, framesize, set_framesize)
@@ -104,13 +104,13 @@ DECLARE_SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
 DECLARE_SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
 
 // From settings
-extern camera_grab_mode_t common_hal_esp32_camera_camera_get_grab_mode(esp32_camera_camera_obj_t *self);
-extern int common_hal_esp32_camera_camera_get_framebuffer_count(esp32_camera_camera_obj_t *self);
+extern camera_grab_mode_t common_hal_espcamera_camera_get_grab_mode(espcamera_camera_obj_t *self);
+extern int common_hal_espcamera_camera_get_framebuffer_count(espcamera_camera_obj_t *self);
 
 // From camera_sensor_info_t
-extern int common_hal_esp32_camera_camera_get_address(esp32_camera_camera_obj_t *self);
-extern const char *common_hal_esp32_camera_camera_get_sensor_name(esp32_camera_camera_obj_t *self);
-extern const bool common_hal_esp32_camera_camera_get_supports_jpeg(esp32_camera_camera_obj_t *self);
-extern framesize_t common_hal_esp32_camera_camera_get_max_frame_size(esp32_camera_camera_obj_t *self);
-extern int common_hal_esp32_camera_camera_get_width(esp32_camera_camera_obj_t *self);
-extern int common_hal_esp32_camera_camera_get_height(esp32_camera_camera_obj_t *self);
+extern int common_hal_espcamera_camera_get_address(espcamera_camera_obj_t *self);
+extern const char *common_hal_espcamera_camera_get_sensor_name(espcamera_camera_obj_t *self);
+extern const bool common_hal_espcamera_camera_get_supports_jpeg(espcamera_camera_obj_t *self);
+extern framesize_t common_hal_espcamera_camera_get_max_frame_size(espcamera_camera_obj_t *self);
+extern int common_hal_espcamera_camera_get_width(espcamera_camera_obj_t *self);
+extern int common_hal_espcamera_camera_get_height(espcamera_camera_obj_t *self);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.c b/ports/espressif/bindings/espcamera/__init__.c
similarity index 53%
rename from ports/espressif/bindings/esp32_camera/__init__.c
rename to ports/espressif/bindings/espcamera/__init__.c
index 36c837106c..37b506015f 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.c
+++ b/ports/espressif/bindings/espcamera/__init__.c
@@ -29,13 +29,13 @@
 #include "py/mphal.h"
 
 #include "bindings/espidf/__init__.h"
-#include "bindings/esp32_camera/__init__.h"
-#include "bindings/esp32_camera/Camera.h"
+#include "bindings/espcamera/__init__.h"
+#include "bindings/espcamera/Camera.h"
 
 #include "esp_camera.h"
 #include "sensor.h"
 
-//| """Wrapper for the esp32_camera library
+//| """Wrapper for the espcamera library
 //|
 //| This library enables access to any camera sensor supported by the library,
 //| including OV5640 and OV2640.
@@ -56,20 +56,20 @@
 //|     """Except when 1 frame buffer is used, queue will always contain the last ``fb_count`` frames"""
 //|
 
-MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);
-MAKE_ENUM_VALUE(esp32_camera_grab_mode_type, grab_mode, LATEST, CAMERA_GRAB_LATEST);
+MAKE_ENUM_VALUE(espcamera_grab_mode_type, grab_mode, WHEN_EMPTY, CAMERA_GRAB_WHEN_EMPTY);
+MAKE_ENUM_VALUE(espcamera_grab_mode_type, grab_mode, LATEST, CAMERA_GRAB_LATEST);
 
-MAKE_ENUM_MAP(esp32_camera_grab_mode) {
+MAKE_ENUM_MAP(espcamera_grab_mode) {
     MAKE_ENUM_MAP_ENTRY(grab_mode, WHEN_EMPTY),
     MAKE_ENUM_MAP_ENTRY(grab_mode, LATEST),
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_grab_mode_locals_dict, esp32_camera_grab_mode_locals_table);
-MAKE_PRINTER(esp32_camera, esp32_camera_grab_mode);
-MAKE_ENUM_TYPE(esp32_camera, GrabMode, esp32_camera_grab_mode);
+STATIC MP_DEFINE_CONST_DICT(espcamera_grab_mode_locals_dict, espcamera_grab_mode_locals_table);
+MAKE_PRINTER(espcamera, espcamera_grab_mode);
+MAKE_ENUM_TYPE(espcamera, GrabMode, espcamera_grab_mode);
 
 camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_grab_mode_type, obj, arg_name);
+    return cp_enum_value(&espcamera_grab_mode_type, obj, arg_name);
 }
 
 //| class PixelFormat:
@@ -85,22 +85,22 @@ camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name) {
 //|     """A compressed format"""
 //|
 
-MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, RGB565, PIXFORMAT_RGB565);
-MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, GRAYSCALE, PIXFORMAT_GRAYSCALE);
-MAKE_ENUM_VALUE(esp32_camera_pixel_format_type, pixel_format, JPEG, PIXFORMAT_JPEG);
+MAKE_ENUM_VALUE(espcamera_pixel_format_type, pixel_format, RGB565, PIXFORMAT_RGB565);
+MAKE_ENUM_VALUE(espcamera_pixel_format_type, pixel_format, GRAYSCALE, PIXFORMAT_GRAYSCALE);
+MAKE_ENUM_VALUE(espcamera_pixel_format_type, pixel_format, JPEG, PIXFORMAT_JPEG);
 
-MAKE_ENUM_MAP(esp32_camera_pixel_format) {
+MAKE_ENUM_MAP(espcamera_pixel_format) {
     MAKE_ENUM_MAP_ENTRY(pixel_format, RGB565),
     MAKE_ENUM_MAP_ENTRY(pixel_format, GRAYSCALE),
     MAKE_ENUM_MAP_ENTRY(pixel_format, JPEG),
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_pixel_format_locals_dict, esp32_camera_pixel_format_locals_table);
-MAKE_PRINTER(esp32_camera, esp32_camera_pixel_format);
-MAKE_ENUM_TYPE(esp32_camera, PixelFormat, esp32_camera_pixel_format);
+STATIC MP_DEFINE_CONST_DICT(espcamera_pixel_format_locals_dict, espcamera_pixel_format_locals_table);
+MAKE_PRINTER(espcamera, espcamera_pixel_format);
+MAKE_ENUM_TYPE(espcamera, PixelFormat, espcamera_pixel_format);
 
 pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_pixel_format_type, obj, arg_name);
+    return cp_enum_value(&espcamera_pixel_format_type, obj, arg_name);
 }
 
 //| class FrameSize:
@@ -173,29 +173,29 @@ pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name) {
 //|     """2560x1920"""
 //|
 
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R96X96, FRAMESIZE_96X96);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, R240X240, FRAMESIZE_240X240);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QQVGA, FRAMESIZE_QQVGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QCIF, FRAMESIZE_QCIF);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HQVGA, FRAMESIZE_HQVGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QVGA, FRAMESIZE_QVGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, CIF, FRAMESIZE_CIF);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HVGA, FRAMESIZE_HVGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, VGA, FRAMESIZE_VGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, SVGA, FRAMESIZE_SVGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, XGA, FRAMESIZE_XGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, HD, FRAMESIZE_HD);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, SXGA, FRAMESIZE_SXGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, UXGA, FRAMESIZE_UXGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, FHD, FRAMESIZE_FHD);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_HD, FRAMESIZE_P_HD);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_3MP, FRAMESIZE_P_3MP);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QXGA, FRAMESIZE_QXGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QHD, FRAMESIZE_QHD);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, WQXGA, FRAMESIZE_WQXGA);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, P_FHD, FRAMESIZE_P_FHD);
-MAKE_ENUM_VALUE(esp32_camera_frame_size_type, frame_size, QSXGA, FRAMESIZE_QSXGA);
-MAKE_ENUM_MAP(esp32_camera_frame_size) {
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, R96X96, FRAMESIZE_96X96);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, R240X240, FRAMESIZE_240X240);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QQVGA, FRAMESIZE_QQVGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QCIF, FRAMESIZE_QCIF);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, HQVGA, FRAMESIZE_HQVGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QVGA, FRAMESIZE_QVGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, CIF, FRAMESIZE_CIF);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, HVGA, FRAMESIZE_HVGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, VGA, FRAMESIZE_VGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, SVGA, FRAMESIZE_SVGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, XGA, FRAMESIZE_XGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, HD, FRAMESIZE_HD);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, SXGA, FRAMESIZE_SXGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, UXGA, FRAMESIZE_UXGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, FHD, FRAMESIZE_FHD);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, P_HD, FRAMESIZE_P_HD);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, P_3MP, FRAMESIZE_P_3MP);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QXGA, FRAMESIZE_QXGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QHD, FRAMESIZE_QHD);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, WQXGA, FRAMESIZE_WQXGA);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, P_FHD, FRAMESIZE_P_FHD);
+MAKE_ENUM_VALUE(espcamera_frame_size_type, frame_size, QSXGA, FRAMESIZE_QSXGA);
+MAKE_ENUM_MAP(espcamera_frame_size) {
     MAKE_ENUM_MAP_ENTRY(frame_size, R96X96),
     MAKE_ENUM_MAP_ENTRY(frame_size, R240X240),
     MAKE_ENUM_MAP_ENTRY(frame_size, QQVGA),
@@ -220,12 +220,12 @@ MAKE_ENUM_MAP(esp32_camera_frame_size) {
     MAKE_ENUM_MAP_ENTRY(frame_size, QSXGA),
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_frame_size_locals_dict, esp32_camera_frame_size_locals_table);
-MAKE_PRINTER(esp32_camera, esp32_camera_frame_size);
-MAKE_ENUM_TYPE(esp32_camera, FrameSize, esp32_camera_frame_size);
+STATIC MP_DEFINE_CONST_DICT(espcamera_frame_size_locals_dict, espcamera_frame_size_locals_table);
+MAKE_PRINTER(espcamera, espcamera_frame_size);
+MAKE_ENUM_TYPE(espcamera, FrameSize, espcamera_frame_size);
 
 framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_frame_size_type, obj, arg_name);
+    return cp_enum_value(&espcamera_frame_size_type, obj, arg_name);
 }
 
 //| class GainCeiling:
@@ -242,15 +242,15 @@ framesize_t validate_frame_size(mp_obj_t obj, qstr arg_name) {
 //|     GAIN_128X: GainCeiling
 //|
 
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_2X, GAINCEILING_2X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_4X, GAINCEILING_4X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_8X, GAINCEILING_8X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_16X, GAINCEILING_16X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_32X, GAINCEILING_32X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_64X, GAINCEILING_64X);
-MAKE_ENUM_VALUE(esp32_camera_gain_ceiling_type, gain_ceiling, GAIN_128X, GAINCEILING_128X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_2X, GAINCEILING_2X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_4X, GAINCEILING_4X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_8X, GAINCEILING_8X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_16X, GAINCEILING_16X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_32X, GAINCEILING_32X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_64X, GAINCEILING_64X);
+MAKE_ENUM_VALUE(espcamera_gain_ceiling_type, gain_ceiling, GAIN_128X, GAINCEILING_128X);
 
-MAKE_ENUM_MAP(esp32_camera_gain_ceiling) {
+MAKE_ENUM_MAP(espcamera_gain_ceiling) {
     MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_2X),
     MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_4X),
     MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_8X),
@@ -260,28 +260,28 @@ MAKE_ENUM_MAP(esp32_camera_gain_ceiling) {
     MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_128X)
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_gain_ceiling_locals_dict, esp32_camera_gain_ceiling_locals_table);
-MAKE_PRINTER(esp32_camera, esp32_camera_gain_ceiling);
-MAKE_ENUM_TYPE(esp32_camera, GainCeiling, esp32_camera_gain_ceiling);
+STATIC MP_DEFINE_CONST_DICT(espcamera_gain_ceiling_locals_dict, espcamera_gain_ceiling_locals_table);
+MAKE_PRINTER(espcamera, espcamera_gain_ceiling);
+MAKE_ENUM_TYPE(espcamera, GainCeiling, espcamera_gain_ceiling);
 
 gainceiling_t validate_gain_ceiling(mp_obj_t obj, qstr arg_name) {
-    return cp_enum_value(&esp32_camera_gain_ceiling_type, obj, arg_name);
+    return cp_enum_value(&espcamera_gain_ceiling_type, obj, arg_name);
 }
 
-STATIC const mp_rom_map_elem_t esp32_camera_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32_camera) },
-    { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&esp32_camera_camera_type), },
-    { MP_ROM_QSTR(MP_QSTR_FrameSize), &esp32_camera_frame_size_type },
-    { MP_ROM_QSTR(MP_QSTR_GainCeiling), &esp32_camera_gain_ceiling_type },
-    { MP_ROM_QSTR(MP_QSTR_GrabMode), &esp32_camera_grab_mode_type },
-    { MP_ROM_QSTR(MP_QSTR_PixelFormat), &esp32_camera_pixel_format_type },
+STATIC const mp_rom_map_elem_t espcamera_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espcamera) },
+    { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&espcamera_camera_type), },
+    { MP_ROM_QSTR(MP_QSTR_FrameSize), &espcamera_frame_size_type },
+    { MP_ROM_QSTR(MP_QSTR_GainCeiling), &espcamera_gain_ceiling_type },
+    { MP_ROM_QSTR(MP_QSTR_GrabMode), &espcamera_grab_mode_type },
+    { MP_ROM_QSTR(MP_QSTR_PixelFormat), &espcamera_pixel_format_type },
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_camera_module_globals, esp32_camera_module_globals_table);
+STATIC MP_DEFINE_CONST_DICT(espcamera_module_globals, espcamera_module_globals_table);
 
-const mp_obj_module_t esp32_camera_module = {
+const mp_obj_module_t espcamera_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&esp32_camera_module_globals,
+    .globals = (mp_obj_dict_t *)&espcamera_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_esp32_camera, esp32_camera_module, CIRCUITPY_ESP32_CAMERA);
+MP_REGISTER_MODULE(MP_QSTR_espcamera, espcamera_module, CIRCUITPY_ESPCAMERA);
diff --git a/ports/espressif/bindings/esp32_camera/__init__.h b/ports/espressif/bindings/espcamera/__init__.h
similarity index 88%
rename from ports/espressif/bindings/esp32_camera/__init__.h
rename to ports/espressif/bindings/espcamera/__init__.h
index a0e7290ff9..6e55ac3870 100644
--- a/ports/espressif/bindings/esp32_camera/__init__.h
+++ b/ports/espressif/bindings/espcamera/__init__.h
@@ -31,13 +31,13 @@
 
 #include "esp_camera.h"
 
-extern const mp_obj_type_t esp32_camera_grab_mode_type;
+extern const mp_obj_type_t espcamera_grab_mode_type;
 extern const cp_enum_obj_t grab_mode_WHEN_EMPTY_obj;
-extern const mp_obj_type_t esp32_camera_pixel_format_type;
+extern const mp_obj_type_t espcamera_pixel_format_type;
 extern const cp_enum_obj_t pixel_format_RGB565_obj;
-extern const mp_obj_type_t esp32_camera_frame_size_type;
+extern const mp_obj_type_t espcamera_frame_size_type;
 extern const cp_enum_obj_t frame_size_QQVGA_obj;
-extern const mp_obj_type_t esp32_camera_gain_ceiling_type;
+extern const mp_obj_type_t espcamera_gain_ceiling_type;
 
 extern camera_grab_mode_t validate_grab_mode(mp_obj_t obj, qstr arg_name);
 extern pixformat_t validate_pixel_format(mp_obj_t obj, qstr arg_name);
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index 4ecf6aa969..a8d02f082c 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -10,4 +10,4 @@ CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 OPTIMIZATION_FLAGS = -Os
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
index 3c1cf0d609..582ed4409c 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index baff69b1ac..858d0b1859 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -11,4 +11,4 @@ CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 OPTIMIZATION_FLAGS = -Os
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index 221543547c..c314f90246 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -6,4 +6,4 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index 8b08c94022..7d5c91f154 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -9,7 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index ee2bfdb069..d941039078 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -9,7 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
index 15dd51e5ff..e695bae635 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
@@ -13,4 +13,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
index 3921140b5c..5862ee1192 100644
--- a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
+++ b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
@@ -6,7 +6,7 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 # Include these Python libraries in firmware
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
index 7aa352e16e..23f905dfdf 100644
--- a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
@@ -6,4 +6,4 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
index 67e88a1639..73acab519c 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -10,4 +10,4 @@ CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
index 31e79b2425..d92eff48d0 100644
--- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
index 7ffb076348..5a2a4794bd 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -9,4 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
index f4a746026a..a4bd29fa52 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -9,4 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
index 7ae39254b4..6f56013e09 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
index ac58db8aed..55ad754736 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
index dd8403f779..868e29bf60 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index 4748b1c306..03feef98ce 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index 193a867fb2..76661511e2 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index a7d4d9fb7c..801bd8b508 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
index bbcbfde29a..b57f74f23d 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
index b5cc1bae7c..3244d38869 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.mk b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
index b0b146b03c..c81e3e6fb9 100644
--- a/ports/espressif/boards/lolin_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
@@ -10,4 +10,4 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
 OPTIMIZATION_FLAGS = -Os
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
index 663ceaad81..63ed093f0a 100644
--- a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
@@ -7,4 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
index 6adf65d2bc..e1ba503b8c 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -7,4 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
index c34fa9d836..ecf9319584 100644
--- a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
@@ -7,4 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
index 18bb6d3dc0..f271671113 100644
--- a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
@@ -7,4 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
index 1abf68428c..dedcde81e6 100644
--- a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
@@ -6,4 +6,4 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
index 7a66a977b1..82e462012c 100644
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
@@ -6,4 +6,4 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
index b82fb5ef74..5910605915 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
@@ -6,4 +6,4 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.mk b/ports/espressif/boards/maker_badge/mpconfigboard.mk
index 75d713d904..687f91ad60 100644
--- a/ports/espressif/boards/maker_badge/mpconfigboard.mk
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.mk
@@ -3,7 +3,7 @@ USB_PID = 0x2030
 USB_PRODUCT = "Maker badge"
 USB_MANUFACTURER = "Czech maker"
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index 490675e467..1e4ed0b859 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -9,9 +9,9 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index 5c6649ce6e..e9cd0c6d4a 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -9,9 +9,9 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
index abd2fc12e9..18dd435c53 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
+++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index f2a622bc08..04fde1e562 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
index 8a5fab0c1a..7e58f9979d 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
@@ -11,4 +11,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
index 25a1db15ec..9d0974517d 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
@@ -11,4 +11,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index 3163320208..e13c654aa6 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -8,4 +8,4 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.c b/ports/espressif/common-hal/espcamera/Camera.c
similarity index 83%
rename from ports/espressif/common-hal/esp32_camera/Camera.c
rename to ports/espressif/common-hal/espcamera/Camera.c
index 34ad1fbbb9..e3e5ef49f9 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.c
+++ b/ports/espressif/common-hal/espcamera/Camera.c
@@ -27,9 +27,9 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
-#include "bindings/esp32_camera/Camera.h"
+#include "bindings/espcamera/Camera.h"
 #include "bindings/espidf/__init__.h"
-#include "common-hal/esp32_camera/Camera.h"
+#include "common-hal/espcamera/Camera.h"
 #include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/util.h"
@@ -38,10 +38,10 @@
 #include "esp32-camera/driver/private_include/cam_hal.h"
 
 #if !CONFIG_SPIRAM
-#error esp32_camera only works on boards configured with spiram, disable it in mpconfigboard.mk
+#error espcamera only works on boards configured with spiram, disable it in mpconfigboard.mk
 #endif
 
-static void i2c_lock(esp32_camera_camera_obj_t *self) {
+static void i2c_lock(espcamera_camera_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self->i2c)) {
         raise_deinited_error();
     }
@@ -50,7 +50,7 @@ static void i2c_lock(esp32_camera_camera_obj_t *self) {
     }
 }
 
-static void i2c_unlock(esp32_camera_camera_obj_t *self) {
+static void i2c_unlock(espcamera_camera_obj_t *self) {
     common_hal_busio_i2c_unlock(self->i2c);
 }
 
@@ -60,8 +60,8 @@ static void maybe_claim_pin(const mcu_pin_obj_t *pin) {
     }
 }
 
-void common_hal_esp32_camera_camera_construct(
-    esp32_camera_camera_obj_t *self,
+void common_hal_espcamera_camera_construct(
+    espcamera_camera_obj_t *self,
     uint8_t data_pins[8],
     const mcu_pin_obj_t *external_clock_pin,
     const mcu_pin_obj_t *pixel_clock_pin,
@@ -79,7 +79,7 @@ void common_hal_esp32_camera_camera_construct(
 
     if (common_hal_espidf_get_reserved_psram() == 0) {
         mp_raise_msg(&mp_type_MemoryError, translate(
-            "esp32_camera.Camera requires reserved PSRAM to be configured. "
+            "espcamera.Camera requires reserved PSRAM to be configured. "
             "See the documentation for instructions."));
     }
     for (int i = 0; i < 8; i++) {
@@ -140,8 +140,8 @@ void common_hal_esp32_camera_camera_construct(
     CHECK_ESP_RESULT(result);
 }
 
-extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *self) {
-    if (common_hal_esp32_camera_camera_deinited(self)) {
+extern void common_hal_espcamera_camera_deinit(espcamera_camera_obj_t *self) {
+    if (common_hal_espcamera_camera_deinited(self)) {
         return;
     }
 
@@ -165,15 +165,15 @@ extern void common_hal_esp32_camera_camera_deinit(esp32_camera_camera_obj_t *sel
     self->camera_config.xclk_freq_hz = 0;
 }
 
-bool common_hal_esp32_camera_camera_deinited(esp32_camera_camera_obj_t *self) {
+bool common_hal_espcamera_camera_deinited(espcamera_camera_obj_t *self) {
     return !self->camera_config.xclk_freq_hz;
 }
 
-bool common_hal_esp32_camera_camera_available(esp32_camera_camera_obj_t *self) {
+bool common_hal_espcamera_camera_available(espcamera_camera_obj_t *self) {
     return esp_camera_fb_available();
 }
 
-camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self, int timeout_ms) {
+camera_fb_t *common_hal_espcamera_camera_take(espcamera_camera_obj_t *self, int timeout_ms) {
     if (self->buffer_to_return) {
         esp_camera_fb_return(self->buffer_to_return);
         self->buffer_to_return = NULL;
@@ -189,7 +189,7 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
     SENSOR_GETSET(type, name, status.status_field_name, setter_function_name)
 
 #define SENSOR_GET(type, name, status_field_name, setter_function_name) \
-    type common_hal_esp32_camera_camera_get_##name(esp32_camera_camera_obj_t * self) { \
+    type common_hal_espcamera_camera_get_##name(espcamera_camera_obj_t * self) { \
         i2c_lock(self); \
         sensor_t *sensor = esp_camera_sensor_get(); \
         i2c_unlock(self); \
@@ -200,7 +200,7 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
     }
 
 #define SENSOR_SET(type, name, setter_function_name) \
-    void common_hal_esp32_camera_camera_set_##name(esp32_camera_camera_obj_t * self, type value) { \
+    void common_hal_espcamera_camera_set_##name(espcamera_camera_obj_t * self, type value) { \
         i2c_lock(self); \
         sensor_t *sensor = esp_camera_sensor_get(); \
         i2c_unlock(self); \
@@ -212,15 +212,15 @@ camera_fb_t *common_hal_esp32_camera_camera_take(esp32_camera_camera_obj_t *self
         } \
     }
 
-pixformat_t common_hal_esp32_camera_camera_get_pixel_format(esp32_camera_camera_obj_t *self) {
+pixformat_t common_hal_espcamera_camera_get_pixel_format(espcamera_camera_obj_t *self) {
     return self->camera_config.pixel_format;
 }
 
-framesize_t common_hal_esp32_camera_camera_get_frame_size(esp32_camera_camera_obj_t *self) {
+framesize_t common_hal_espcamera_camera_get_frame_size(espcamera_camera_obj_t *self) {
     return self->camera_config.frame_size;
 }
 
-void common_hal_esp32_camera_camera_reconfigure(esp32_camera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count) {
+void common_hal_espcamera_camera_reconfigure(espcamera_camera_obj_t *self, framesize_t frame_size, pixformat_t pixel_format, camera_grab_mode_t grab_mode, mp_int_t framebuffer_count) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
 
@@ -272,46 +272,46 @@ SENSOR_STATUS_GETSET(bool, wpc, wpc, set_wpc);
 SENSOR_STATUS_GETSET(bool, raw_gma, raw_gma, set_raw_gma);
 SENSOR_STATUS_GETSET(bool, lenc, lenc, set_lenc);
 
-const char *common_hal_esp32_camera_camera_get_sensor_name(esp32_camera_camera_obj_t *self) {
+const char *common_hal_espcamera_camera_get_sensor_name(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
     return sensor_info->name;
 }
 
-const bool common_hal_esp32_camera_camera_get_supports_jpeg(esp32_camera_camera_obj_t *self) {
+const bool common_hal_espcamera_camera_get_supports_jpeg(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
     return sensor_info->support_jpeg;
 }
 
-const framesize_t common_hal_esp32_camera_camera_get_max_frame_size(esp32_camera_camera_obj_t *self) {
+const framesize_t common_hal_espcamera_camera_get_max_frame_size(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
     return sensor_info->max_size;
 }
 
-const int common_hal_esp32_camera_camera_get_address(esp32_camera_camera_obj_t *self) {
+const int common_hal_espcamera_camera_get_address(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     camera_sensor_info_t *sensor_info = esp_camera_sensor_get_info(&sensor->id);
     return sensor_info->sccb_addr;
 }
 
-const int common_hal_esp32_camera_camera_get_width(esp32_camera_camera_obj_t *self) {
+const int common_hal_espcamera_camera_get_width(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     framesize_t framesize = sensor->status.framesize;
     return resolution[framesize].width;
 }
 
-const int common_hal_esp32_camera_camera_get_height(esp32_camera_camera_obj_t *self) {
+const int common_hal_espcamera_camera_get_height(espcamera_camera_obj_t *self) {
     sensor_t *sensor = esp_camera_sensor_get();
     framesize_t framesize = sensor->status.framesize;
     return resolution[framesize].height;
 }
 
-const camera_grab_mode_t common_hal_esp32_camera_camera_get_grab_mode(esp32_camera_camera_obj_t *self) {
+const camera_grab_mode_t common_hal_espcamera_camera_get_grab_mode(espcamera_camera_obj_t *self) {
     return self->camera_config.grab_mode;
 }
 
-const int common_hal_esp32_camera_camera_get_framebuffer_count(esp32_camera_camera_obj_t *self) {
+const int common_hal_espcamera_camera_get_framebuffer_count(espcamera_camera_obj_t *self) {
     return self->camera_config.fb_count;
 }
diff --git a/ports/espressif/common-hal/esp32_camera/Camera.h b/ports/espressif/common-hal/espcamera/Camera.h
similarity index 96%
rename from ports/espressif/common-hal/esp32_camera/Camera.h
rename to ports/espressif/common-hal/espcamera/Camera.h
index 4f34fa54cd..007686a523 100644
--- a/ports/espressif/common-hal/esp32_camera/Camera.h
+++ b/ports/espressif/common-hal/espcamera/Camera.h
@@ -31,10 +31,10 @@
 #include "shared-bindings/pwmio/PWMOut.h"
 #include "common-hal/busio/I2C.h"
 
-typedef struct esp32_camera_camera_obj {
+typedef struct espcamera_camera_obj {
     mp_obj_base_t base;
     camera_config_t camera_config;
     camera_fb_t *buffer_to_return;
     pwmio_pwmout_obj_t pwm;
     busio_i2c_obj_t *i2c;
-} esp32_camera_obj_t;
+} espcamera_obj_t;
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index b7b991eb40..460e651705 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -24,7 +24,7 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
-CIRCUITPY_ESP32_CAMERA ?= 1
+CIRCUITPY_ESPCAMERA ?= 1
 CIRCUITPY_ESPIDF ?= 1
 CIRCUITPY_ESPULP ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
@@ -55,7 +55,7 @@ else ifeq ($(IDF_TARGET),esp32c3)
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_COUNTIO = 0
-CIRCUITPY_ESP32_CAMERA = 0
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_MEMORYMAP = 0
@@ -81,8 +81,8 @@ CIRCUITPY_DUALBANK = 0
 endif
 
 # Modules dependent on other modules
-CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESP32_CAMERA)
-CIRCUITPY_QRIO ?= $(CIRCUITPY_ESP32_CAMERA)
+CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESPCAMERA)
+CIRCUITPY_QRIO ?= $(CIRCUITPY_ESPCAMERA)
 
 # Features dependent on other features
 ifneq ($(CIRCUITPY_USB),0)
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 6dd09ed238..b9c9790de4 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -78,7 +78,7 @@
 #include "shared-bindings/_bleio/__init__.h"
 #endif
 
-#if CIRCUITPY_ESP32_CAMERA
+#if CIRCUITPY_ESPCAMERA
 #include "esp_camera.h"
 #endif
 
@@ -341,7 +341,7 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     // TODO deinit for esp32-camera
-    #if CIRCUITPY_ESP32_CAMERA
+    #if CIRCUITPY_ESPCAMERA
     esp_camera_deinit();
     #endif
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 3c1c173a51..d489edf038 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -221,17 +221,16 @@ CFLAGS += -DCIRCUITPY_OS_GETENV=$(CIRCUITPY_OS_GETENV)
 CIRCUITPY_ERRNO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 
-# CIRCUITPY_ESPIDF and CIRCUITPY_ESPULP is handled in the espressif tree.
-# Only for ESP32S chips.
-# Assume not a ESP build.
+# Espressif specific modules.
+# Assume not an Espressif build.
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
 CIRCUITPY_ESPULP ?= 0
 CFLAGS += -DCIRCUITPY_ESPULP=$(CIRCUITPY_ESPULP)
 
-CIRCUITPY_ESP32_CAMERA ?= 0
-CFLAGS += -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)
+CIRCUITPY_ESPCAMERA ?= 0
+CFLAGS += -DCIRCUITPY_ESPCAMERA=$(CIRCUITPY_ESPCAMERA)
 
 CIRCUITPY__EVE ?= 0
 CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
diff --git a/shared-bindings/imagecapture/__init__.c b/shared-bindings/imagecapture/__init__.c
index fdd4424114..71d0b9125b 100644
--- a/shared-bindings/imagecapture/__init__.c
+++ b/shared-bindings/imagecapture/__init__.c
@@ -35,7 +35,7 @@
 //|
 //| .. seealso::
 //|
-//|     Espressif microcontrollers use the `esp32_camera` module together.
+//|     Espressif microcontrollers use the `espcamera` module together.
 //|
 //| """
 STATIC const mp_rom_map_elem_t imagecapture_module_globals_table[] = {

From ab0cbb5a041506e4a7eeb566ff3ad7a2d62716ad Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Fri, 27 Jan 2023 13:56:35 -0500
Subject: [PATCH 1731/2403] Update notification workflow

---
 .github/workflows/notify.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml
index 4cfb22298f..da1ac0a18e 100644
--- a/.github/workflows/notify.yml
+++ b/.github/workflows/notify.yml
@@ -7,8 +7,12 @@ on:
 jobs:
   notify:
     runs-on: ubuntu-latest
+    permissions:
+        issues: write
     steps:
-        - uses: jenschelkopf/issue-label-notification-action@1.3
+        - uses: tekktrik/issue-labeled-ping@v1
           with:
-             recipients: |
-                  ulab=@v923z
+                github-token: ${{ secrets.GITHUB_TOKEN }}
+                user: v923z
+                label: ulab
+                message: Heads up {user} - the "{label}" label was applied to this issue.

From aaa9ac4aff34753b7527b97e9030e0c9f04a19dc Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 28 Jan 2023 00:59:07 +0100
Subject: [PATCH 1732/2403] 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             |  9 +++++----
 locale/cs.po             |  9 +++++----
 locale/de_DE.po          | 18 ++++++++++++------
 locale/el.po             |  9 +++++----
 locale/en_GB.po          |  9 +++++----
 locale/es.po             | 18 ++++++++++++------
 locale/fil.po            |  9 +++++----
 locale/fr.po             | 18 ++++++++++++------
 locale/hi.po             |  9 +++++----
 locale/it_IT.po          |  9 +++++----
 locale/ja.po             |  9 +++++----
 locale/ko.po             |  9 +++++----
 locale/nl.po             |  9 +++++----
 locale/pl.po             |  9 +++++----
 locale/pt_BR.po          | 18 ++++++++++++------
 locale/ru.po             |  9 +++++----
 locale/sv.po             | 18 ++++++++++++------
 locale/tr.po             |  9 +++++----
 locale/zh_Latn_pinyin.po | 21 ++++++++++++++-------
 19 files changed, 139 insertions(+), 89 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 962284a846..088df0b059 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -671,6 +671,7 @@ msgstr "Pin bus %d sudah digunakan"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2978,9 +2979,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3357,7 +3358,7 @@ msgstr "key tidak valid"
 msgid "invalid micropython decorator"
 msgstr "micropython decorator tidak valid"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3614,7 +3615,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 4b49cbe531..2f7c53ee13 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -672,6 +672,7 @@ msgstr "Sběrnicový pin %d je již používán"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2965,9 +2966,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3344,7 +3345,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3601,7 +3602,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1a3bdbca56..0dde7441cc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -675,6 +675,7 @@ msgstr "Bus-Pin %d wird schon benutzt"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Beim Starten wurde Taste A gedrückt.\n"
 
@@ -3035,13 +3036,11 @@ msgstr "epoch_time wird auf diesem Board nicht unterstützt"
 msgid "error = 0x%08lX"
 msgstr "Fehler = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu "
-"können. Sieh in der Dokumentation für eine Anleitung nach."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3418,7 +3417,7 @@ msgstr "ungültiger Schlüssel"
 msgid "invalid micropython decorator"
 msgstr "ungültiger micropython decorator"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "Invalide Einstellung"
 
@@ -3681,7 +3680,7 @@ msgstr "kein Reset Pin verfügbar"
 msgid "no response from SD card"
 msgstr "keine Antwort von der SD-Karte"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "kein solches Attribut"
 
@@ -4431,6 +4430,13 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu "
+#~ "können. Sieh in der Dokumentation für eine Anleitung nach."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q muss vom Type %q sein"
 
diff --git a/locale/el.po b/locale/el.po
index f48b8e08db..0077b44c2e 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -678,6 +678,7 @@ msgstr "Bus pin %d είναι ήδη σε χρήση"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2974,9 +2975,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3353,7 +3354,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3610,7 +3611,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index dee3f6f4c3..03af36dbaa 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -675,6 +675,7 @@ msgstr "Bus pin %d is already in use"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2984,9 +2985,9 @@ msgstr "epoch_time not supported on this board"
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3363,7 +3364,7 @@ msgstr "invalid key"
 msgid "invalid micropython decorator"
 msgstr "invalid micropython decorator"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3620,7 +3621,7 @@ msgstr "no reset pin available"
 msgid "no response from SD card"
 msgstr "no response from SD card"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "no such attribute"
 
diff --git a/locale/es.po b/locale/es.po
index 613d957812..f68a30a125 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -680,6 +680,7 @@ msgstr "Bus pin %d ya está siendo utilizado"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Botón A fue presionado al inicio.\n"
 
@@ -3038,13 +3039,11 @@ msgstr "epoch_time no esta soportado en esta tarjeta"
 msgid "error = 0x%08lX"
 msgstr "error = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera. la camara necesita PSRAM reservada para ser configurada. Vea "
-"la documentacion para mas instrucciones."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3419,7 +3418,7 @@ msgstr "llave inválida"
 msgid "invalid micropython decorator"
 msgstr "decorador de micropython inválido"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "configuracion invalida"
 
@@ -3680,7 +3679,7 @@ msgstr "no hay pin de reinicio disponible"
 msgid "no response from SD card"
 msgstr "no hay respuesta de la tarjeta SD"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "no hay tal atributo"
 
@@ -4427,6 +4426,13 @@ 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 ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera. la camara necesita PSRAM reservada para ser configurada. "
+#~ "Vea la documentacion para mas instrucciones."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q debe ser de typo %q"
 
diff --git a/locale/fil.po b/locale/fil.po
index e44a5a5acd..4c203ecbba 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -668,6 +668,7 @@ msgstr "Ginagamit na ang DAC"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2976,9 +2977,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3356,7 +3357,7 @@ msgstr "mali ang key"
 msgid "invalid micropython decorator"
 msgstr "mali ang micropython decorator"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3617,7 +3618,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "walang ganoon na attribute"
 
diff --git a/locale/fr.po b/locale/fr.po
index 6eb2e23cf7..6a0e5ac876 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -681,6 +681,7 @@ msgstr "La broche %d du bus est déjà utilisée"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Le bouton A était pressé au démarrage.\n"
 
@@ -3062,13 +3063,11 @@ msgstr "epoch_time n'est pas supporté sur ce panneau"
 msgid "error = 0x%08lX"
 msgstr "erreur = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera.Camera nécessite la configuration de PSRAM réservée. Se référer "
-"à la documentation."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3445,7 +3444,7 @@ msgstr "clé invalide"
 msgid "invalid micropython decorator"
 msgstr "décorateur micropython invalide"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "réglage invalide"
 
@@ -3707,7 +3706,7 @@ msgstr "pas de broche de réinitialisation disponible"
 msgid "no response from SD card"
 msgstr "pas de réponse de la carte SD"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "pas de tel attribut"
 
@@ -4456,6 +4455,13 @@ 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 ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera.Camera nécessite la configuration de PSRAM réservée. Se "
+#~ "référer à la documentation."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q doit être du type %q"
 
diff --git a/locale/hi.po b/locale/hi.po
index 79177b1701..81903ac5a7 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -663,6 +663,7 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2947,9 +2948,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3326,7 +3327,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3583,7 +3584,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 9e7fbfce01..50a754422d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -675,6 +675,7 @@ msgstr "Bus pin %d è già in uso"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2984,9 +2985,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "errore = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3364,7 +3365,7 @@ msgstr "chiave non valida"
 msgid "invalid micropython decorator"
 msgstr "decoratore non valido in micropython"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3626,7 +3627,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "attributo inesistente"
 
diff --git a/locale/ja.po b/locale/ja.po
index 0c8387fe73..5ead67824f 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -675,6 +675,7 @@ msgstr "Busピン%dはすでに使用中"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2971,9 +2972,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "error = 0x1%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3351,7 +3352,7 @@ msgstr "不正な鍵"
 msgid "invalid micropython decorator"
 msgstr "不正なmicropythonデコレータ"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3608,7 +3609,7 @@ msgstr "利用可能なリセットピンがありません"
 msgid "no response from SD card"
 msgstr "SDカードからの応答がありません"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "指定の属性はありません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 59cc20b1e1..078d04dfc8 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -666,6 +666,7 @@ msgstr ""
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2951,9 +2952,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3330,7 +3331,7 @@ msgstr "키가 유효하지 않습니다"
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3587,7 +3588,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index b8310d5ced..1b360e50b7 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -668,6 +668,7 @@ msgstr "Bus pin %d al in gebruik"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2980,9 +2981,9 @@ msgstr "epoch_time niet ondersteund op dit bord"
 msgid "error = 0x%08lX"
 msgstr "fout = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3360,7 +3361,7 @@ msgstr "ongeldige sleutel"
 msgid "invalid micropython decorator"
 msgstr "ongeldige micropython decorator"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3620,7 +3621,7 @@ msgstr "geen reset pin beschikbaar"
 msgid "no response from SD card"
 msgstr "geen antwoord van SD kaart"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "niet zo'n attribuut"
 
diff --git a/locale/pl.po b/locale/pl.po
index ac54e220ad..66d1699919 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -670,6 +670,7 @@ msgstr "Nóżka magistrali %d jest w użyciu"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr ""
 
@@ -2959,9 +2960,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr "błąd = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3338,7 +3339,7 @@ msgstr "zły klucz"
 msgid "invalid micropython decorator"
 msgstr "zły dekorator micropythona"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3595,7 +3596,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "nie ma takiego atrybutu"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 2bddd54617..1a31baac8a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -683,6 +683,7 @@ msgstr "O pino bus %d já está em uso"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "O botão A foi pressionado na inicialização.\n"
 
@@ -3039,13 +3040,11 @@ msgstr "O epoch_time não é compatível com esta placa"
 msgid "error = 0x%08lX"
 msgstr "erro = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera.Camera requer que uma reserva PSRAM seja configurada. Consulte "
-"a documentação para obter mais informações."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3421,7 +3420,7 @@ msgstr "chave inválida"
 msgid "invalid micropython decorator"
 msgstr "o decorador micropython é inválido"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "configuração inválida"
 
@@ -3683,7 +3682,7 @@ msgstr "nenhum pino de redefinição está disponível"
 msgid "no response from SD card"
 msgstr "não houve resposta do cartão SD"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "não há tal atributo"
 
@@ -4431,6 +4430,13 @@ 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 ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera.Camera requer que uma reserva PSRAM seja configurada. "
+#~ "Consulte a documentação para obter mais informações."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q deve ser do tipo %q"
 
diff --git a/locale/ru.po b/locale/ru.po
index 86b977f6f3..b272bc295d 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -680,6 +680,7 @@ msgstr "Пин шины %d уже используется"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Кнопка A была нажата при загрузке\n"
 
@@ -3015,9 +3016,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3394,7 +3395,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3651,7 +3652,7 @@ msgstr "нет доступного контакта сброса"
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 132b296fb9..b29d242fbe 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -675,6 +675,7 @@ msgstr "Busspinne %d används redan"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Knapp A trycktes ned vid start.\n"
 
@@ -3008,13 +3009,11 @@ msgstr "epoch_time stöds inte av detta kort"
 msgid "error = 0x%08lX"
 msgstr "fel = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera.Camera kräver reserverad PSRAM att konfigureras. Se "
-"dokumentationen för instruktioner."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3389,7 +3388,7 @@ msgstr "ogiltig nyckel"
 msgid "invalid micropython decorator"
 msgstr "ogiltig mikropython-dekorator"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "ogiltig inställning"
 
@@ -3649,7 +3648,7 @@ msgstr "ingen reset-pinne tillgänglig"
 msgid "no response from SD card"
 msgstr "inget svar från SD-kort"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "inget sådant attribut"
 
@@ -4393,6 +4392,13 @@ 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 ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera.Camera kräver reserverad PSRAM att konfigureras. Se "
+#~ "dokumentationen för instruktioner."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q måste vara av typen %q"
 
diff --git a/locale/tr.po b/locale/tr.po
index 5a8f259dac..14e378bf61 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -678,6 +678,7 @@ msgstr "Veriyolu pini %d kullanımda"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "Başlatma sırasında A düğmesine basıldı.\n"
 
@@ -2973,9 +2974,9 @@ msgstr ""
 msgid "error = 0x%08lX"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
 
@@ -3352,7 +3353,7 @@ msgstr ""
 msgid "invalid micropython decorator"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr ""
 
@@ -3609,7 +3610,7 @@ msgstr ""
 msgid "no response from SD card"
 msgstr ""
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index dde7f576ba..80270fb391 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -677,6 +677,7 @@ msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng"
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "Button A was pressed at start up.\n"
 msgstr "qǐ dòng shí àn xià àn niǔ A.\n"
 
@@ -924,7 +925,8 @@ msgstr "Fāngxiàng shūrù shí qūdòng móshì méiyǒu shǐyòng."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr "zài chǔ lǐ shàng shù yì cháng qī jiān, fā shēng le lìng yí gè yì cháng:"
+msgstr ""
+"zài chǔ lǐ shàng shù yì cháng qī jiān, fā shēng le lìng yí gè yì cháng:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -3014,13 +3016,11 @@ msgstr "epoch_time bǎn bù zhī chí cǐ bǎn běn"
 msgid "error = 0x%08lX"
 msgstr "cuòwù = 0x%08lX"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid ""
-"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
-"esp32_camera. shè xiàng jī xū yào pèi zhì yù liú de PSRAM. yǒu guān shuō "
-"míng, qǐng cān yuè wén dàng."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3395,7 +3395,7 @@ msgstr "wúxiào de mì yào"
 msgid "invalid micropython decorator"
 msgstr "wúxiào de MicroPython zhuāngshì qì"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c
+#: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
 msgstr "shèzhì wúxiào"
 
@@ -3653,7 +3653,7 @@ msgstr "Méiyǒu kěyòng de fùwèi yǐn jiǎo"
 msgid "no response from SD card"
 msgstr "SD kǎ wú huíyīng"
 
-#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
+#: ports/espressif/common-hal/espcamera/Camera.c py/objobject.c py/runtime.c
 msgid "no such attribute"
 msgstr "méiyǒu cǐ shǔxìng"
 
@@ -4399,6 +4399,13 @@ 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 ""
+#~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
+#~ "documentation for instructions."
+#~ msgstr ""
+#~ "esp32_camera. shè xiàng jī xū yào pèi zhì yù liú de PSRAM. yǒu guān shuō "
+#~ "míng, qǐng cān yuè wén dàng."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q bì xū shì %q lèi xíng"
 

From 401d160c5808ff899496fa45788b3f375471849a Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 28 Jan 2023 11:03:59 +0530
Subject: [PATCH 1733/2403] opi flash needs to be flashed in dout

---
 .../boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
index 96ef4e45c9..78423955bb 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/mpconfigboard.mk
@@ -5,6 +5,6 @@ USB_MANUFACTURER = "Espressif"
 
 IDF_TARGET = esp32s3
 
-CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_MODE=dout
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=32MB

From fc0bd6b7eb23191ff68f37e86883febade7465a2 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 28 Jan 2023 15:30:04 +0530
Subject: [PATCH 1734/2403] use composite action for fetching submodules

---
 .github/actions/fetch_submodules/action.yml |  82 +++++++++++++
 .github/workflows/build.yml                 | 125 +++++---------------
 .github/workflows/create_website_pr.yml     |  17 +--
 .github/workflows/ports_windows.yml         |  30 +----
 4 files changed, 119 insertions(+), 135 deletions(-)
 create mode 100644 .github/actions/fetch_submodules/action.yml

diff --git a/.github/actions/fetch_submodules/action.yml b/.github/actions/fetch_submodules/action.yml
new file mode 100644
index 0000000000..407259967c
--- /dev/null
+++ b/.github/actions/fetch_submodules/action.yml
@@ -0,0 +1,82 @@
+name: 'Fetch Submodules'
+
+inputs:
+  submodules:
+    description: 'The submodules to cache'
+    required: false
+    default: '["extmod/ulab", "lib/", "tools/"]'
+    type: string
+
+  cache:
+    description: 'The cache action to use'
+    required: false
+    default: 'restore'
+    type: choice
+    options:
+    - cache
+    - restore
+
+  version:
+    description: 'Whether to generate CP version'
+    required: false
+    default: false
+    type: boolean
+
+outputs:
+  frozen:
+    description: 'Whether frozen submodules were fetched'
+    value: ${{ steps.cp-deps.outputs.frozen_tags }}
+
+  version:
+    description: 'The CP version'
+    value: ${{ steps.cp-version.outputs.cp-version }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Create submodule status
+      id: create-submodule-status
+      run: |
+        git submodule status ${{ join(fromJSON(inputs.submodules), ' ') }} >> submodule_status
+        echo $(cut -d ' ' -f 2 submodule_status) | echo "submodules=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Cache submodules
+      if: ${{ inputs.cache == 'cache' }}
+      uses: actions/cache@v3
+      with:
+        path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+        enableCrossOsArchive: true
+
+    - name: Restore submodules
+      if: ${{ inputs.cache == 'restore' }}
+      uses: actions/cache/restore@v3
+      with:
+        path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
+        key: submodules-common-${{ hashFiles('submodule_status') }}
+        enableCrossOsArchive: true
+
+    - name: Remove submodule status
+      run: rm submodule_status
+      shell: bash
+
+    - name: CircuitPython dependencies
+      id: cp-deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board || github.job }}
+      shell: bash
+
+    - name: CircuitPython version
+      id: cp-version
+      if: ${{ inputs.version == 'true' }}
+      run: |
+        echo "::group::Fetch history and tags"
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
+        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
+        git repack -d
+        echo "::endgroup::"
+        CP_VERSION=$(tools/describe)
+        echo "$CP_VERSION"
+        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
+        echo "cp-version=$CP_VERSION" >> $GITHUB_OUTPUT
+      shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 44309b87f6..f7d57041e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,9 +16,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  CACHE_SUBMODULES: "['extmod/ulab', 'lib/', 'tools/']"
-
 jobs:
   test:
     runs-on: ubuntu-20.04
@@ -28,7 +25,7 @@ jobs:
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
-      cp-version: ${{ steps.cp-version.outputs.cp-version }}
+      cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
     - name: Dump GitHub context
       run: echo "$GITHUB_CONTEXT"
@@ -45,28 +42,12 @@ jobs:
         python-version: "3.x"
     - name: Duplicate USB VID/PID check
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Cache submodules
-      uses: actions/cache@v3
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
       with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      run: |
-        python tools/ci_fetch_deps.py ${{ github.job }}
-        echo "::group::Fetch history and tags"
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
-        git repack -d
-        echo "::endgroup::"
-    - name: CircuitPython version
-      id: cp-version
-      run: |
-        CP_VERSION=$(tools/describe)
-        echo "$CP_VERSION"
-        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
-        echo "cp-version=$CP_VERSION" >> $GITHUB_OUTPUT
+        cache: "cache"
+        version: true
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -202,17 +183,8 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      run: python tools/ci_fetch_deps.py ${{ github.job }}
-    - name: CircuitPython version
-      run: tools/describe
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
     - name: Versions
       run: |
         gcc --version
@@ -260,21 +232,12 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      run: python tools/ci_fetch_deps.py ${{ github.job }}
-    - name: CircuitPython version
-      run: tools/describe
     - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -343,16 +306,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext mtools
@@ -379,7 +335,7 @@ jobs:
         python3 --version
         mkfs.fat --version || true
     - name: Build mpy-cross
-      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
@@ -425,16 +381,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
     - uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
@@ -448,7 +397,7 @@ jobs:
         arm-none-eabi-gcc --version
         python3 --version
     - name: Build mpy-cross
-      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
@@ -474,7 +423,6 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 
-
   build-espressif:
     runs-on: ubuntu-22.04
     needs: test
@@ -498,13 +446,6 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.10"
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
     - name: Get IDF commit
       id: idf-commit
       run: |
@@ -518,19 +459,13 @@ jobs:
           .git/modules/ports/espressif/esp-idf
           ports/espressif/esp-idf
         key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
-    - name: CircuitPython dependencies
-      id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
-    - name: CircuitPython version
-      run: tools/describe
     - name: Cache IDF tools
       uses: actions/cache@v3
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
         key: ${{ runner.os }}-Python-${{ steps.setup-python.outputs.python-version }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
-    - name: Clone IDF submodules
-      run: git submodule update --init --depth=1
-      working-directory: ${{ env.IDF_PATH }}
+    - name: Initialize IDF submodules
+      run: git submodule update --init --depth=1 --recursive $IDF_PATH
     - name: Install IDF tools
       run: |
         echo "Installing ESP-IDF tools"
@@ -539,6 +474,9 @@ jobs:
         echo "Installing Python environment and packages"
         $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
         rm -rf $IDF_TOOLS_PATH/dist
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
     - name: Install dependencies
       run: |
         source $IDF_PATH/export.sh
@@ -552,7 +490,7 @@ jobs:
         ninja --version
         cmake --version
     - name: Build mpy-cross
-      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
@@ -600,16 +538,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: Create submodule status
-      run: git submodule status ${{ join(fromJSON(env.CACHE_SUBMODULES), ' ') }} >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
-      with:
-        path: ".git/modules/\n${{ join(fromJSON(env.CACHE_SUBMODULES), '\n') }}"
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-    - name: CircuitPython dependencies
-      id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
@@ -622,7 +553,7 @@ jobs:
         riscv64-unknown-elf-gcc --version
         python3 --version
     - name: Build mpy-cross
-      if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
       run: make -C mpy-cross -j2
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 2130b8ae45..19004d9bea 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -25,19 +25,10 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-    - name: CircuitPython dependencies
-      run: |
-        python tools/ci_fetch_deps.py ${{ github.job }}
-        echo "::group::Fetch history and tags"
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
-        git repack -d
-        echo "::endgroup::"
-    - name: CircuitPython version
-      run: |
-        CP_VERSION=$(tools/describe)
-        echo "$CP_VERSION"
-        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
+      with:
+        version: true
     - name: Install dependencies
       run: pip install -r requirements-dev.txt
     - name: Versions
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index f889e70d6d..66d09c2418 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -19,7 +19,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  windows:
     runs-on: windows-2022
     defaults:
       run:
@@ -75,31 +75,11 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-    - name: Create submodule status
-      run: git submodule status extmod/ulab lib/ tools/ >> submodule_status
-    - name: Restore submodules
-      uses: actions/cache/restore@v3
+
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
       with:
-        path: |
-          .git/modules/
-          extmod/ulab
-          lib/
-          tools/
-        key: submodules-common-${{ hashFiles('submodule_status') }}
-        enableCrossOsArchive: true
-    - name: CircuitPython dependencies
-      run: |
-        python tools/ci_fetch_deps.py windows
-        echo "::group::Fetch history and tags"
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" --tags https://github.com/adafruit/circuitpython HEAD
-        git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
-        git repack -d
-        echo "::endgroup::"
-    - name: CircuitPython version
-      run: |
-        CP_VERSION=$(tools/describe)
-        echo "$CP_VERSION"
-        echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
+        version: true
 
     - name: build mpy-cross
       run: make -j2 -C mpy-cross

From 5b814a4561d66c7e3778236b96e3893330be3795 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski 
Date: Sat, 28 Jan 2023 15:16:19 +0100
Subject: [PATCH 1735/2403] pewpew m4: enable CDC back

CDC got disabled on this board by mistake
---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 32be4805d7..0560da84fe 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -11,6 +11,7 @@ LONGINT_IMPL = NONE
 
 CIRCUITPY_FULL_BUILD = 0
 
+CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOMP3 = 0
@@ -31,14 +32,13 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_USB_CDC = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_VECTORIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
+CIRCUITPY_WATCHDOG = 0
 
-CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_DISPLAYIO = 1

From 858e212e34f9ffaaa1c2b5b17331e52bf780b6ad Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 29 Jan 2023 00:23:02 +0530
Subject: [PATCH 1736/2403] enable octal flash in sdkconfig

---
 .../sdkconfig                                 | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig
index f508f4a67c..f915462e11 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/sdkconfig
@@ -27,6 +27,49 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
 # CONFIG_SPIRAM_USE_MALLOC is not set
 CONFIG_SPIRAM_MEMTEST=y
+
+#
+# Serial flasher config
+#
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+# CONFIG_ESPTOOLPY_NO_STUB is not set
+CONFIG_ESPTOOLPY_OCT_FLASH=y
+CONFIG_ESPTOOLPY_FLASHMODE_OPI=y
+# CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_DTR=y
+CONFIG_ESPTOOLPY_FLASHMODE="dout"
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="80m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="32MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+# end of Serial flasher config
+
 #
 # LWIP
 #

From f0058774d0a4798c9c4f40ffa2851949b58fe0ed Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 28 Jan 2023 20:31:59 +0100
Subject: [PATCH 1737/2403] add CIRCUITPY_SKIP_SAFE_MODE_WAIT to
 circuitpy_mpconfig.mk use #if (also a CIRCUITPY_ULAB)

---
 py/circuitpy_mpconfig.mk                     | 5 +++++
 shared-bindings/adafruit_pixelbuf/PixelBuf.c | 2 +-
 supervisor/shared/safe_mode.c                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index d489edf038..8ec338c372 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -393,6 +393,11 @@ CFLAGS += -DCIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY=$(CIRCUITPY_SETTABLE_PROCESSO
 CIRCUITPY_SHARPDISPLAY ?= $(CIRCUITPY_FRAMEBUFFERIO)
 CFLAGS += -DCIRCUITPY_SHARPDISPLAY=$(CIRCUITPY_SHARPDISPLAY)
 
+# Disable the safe mode blink at boot. Speeds up boot time, but makes it
+# impossible to enter safe mode by pressing buttons on boot.
+CIRCUITPY_SKIP_SAFE_MODE_WAIT ?= 0
+CFLAGS += -DCIRCUITPY_SKIP_SAFE_MODE_WAIT=$(CIRCUITPY_SKIP_SAFE_MODE_WAIT)
+
 CIRCUITPY_SOCKETPOOL ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_SOCKETPOOL=$(CIRCUITPY_SOCKETPOOL)
 
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index cf18804ec9..b5b0f1bb41 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -40,7 +40,7 @@
 #include "shared-module/adafruit_pixelbuf/PixelBuf.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
-#ifdef CIRCUITPY_ULAB
+#if CIRCUITPY_ULAB
 #include "extmod/ulab/code/ndarray.h"
 #endif
 
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index d23b78d624..c7e93e6393 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -66,7 +66,7 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         reset_reason != RESET_REASON_SOFTWARE) {
         return NO_SAFE_MODE;
     }
-    #ifdef CIRCUITPY_SKIP_SAFE_MODE_WAIT
+    #if CIRCUITPY_SKIP_SAFE_MODE_WAIT
     return NO_SAFE_MODE;
     #endif
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));

From 172ef91e71ef0af4275e85e862559e2017d3227d Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Sat, 28 Jan 2023 02:50:12 +0000
Subject: [PATCH 1738/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/es.po b/locale/es.po
index f68a30a125..497fadf870 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: 2023-01-18 18:05+0000\n"
+"PO-Revision-Date: 2023-01-29 16:16+0000\n"
 "Last-Translator: Jose David M \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.15.1-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -3044,6 +3044,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera. La cámara requiere una configuración de PSRAM reservada. "
+"Refiérase a la documentación para más instrucciones."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"

From 07c45b9bcfea4dff5088f16037ca9b61d0d11fbc Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 28 Jan 2023 12:13:36 +0000
Subject: [PATCH 1739/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 1a31baac8a..8b370922d4 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: 2023-01-13 18:51+0000\n"
+"PO-Revision-Date: 2023-01-29 16:16+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.15.1-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -3045,6 +3045,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"O espcamera.Camera requer que o PSRAM seja reservado para que possa ser "
+"configurado. Consulte a documentação para obter mais informações."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"

From aee16df340f106126d9055b27efc526538ea9349 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 28 Jan 2023 16:14:34 +0000
Subject: [PATCH 1740/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (992 of 992 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index b29d242fbe..01037522cf 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: 2023-01-13 18:51+0000\n"
+"PO-Revision-Date: 2023-01-29 16:16+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.15.1-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -3014,6 +3014,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera.Camera kräver reserverat PSRAM att vara konfigurerat. Se "
+"dokumentationen för instruktioner."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"

From 4ef363a797779901cb57aaa83a4757d7ac1fac45 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 29 Jan 2023 16:12:05 +0530
Subject: [PATCH 1741/2403] improve dualbank and storage extension docs

---
 shared-bindings/dualbank/__init__.c | 46 +++++++++++++++++------------
 shared-bindings/storage/__init__.c  |  5 +++-
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index d3f75a4153..fedc9c08af 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -30,25 +30,32 @@
 #include "supervisor/flash.h"
 #endif
 
-//| """DUALBANK Module
+//| """Dualbank Module
 //|
-//| The `dualbank` module adds ability to update and switch
-//| between the two app partitions.
+//| The `dualbank` module adds ability to update and switch between the
+//| two identical app partitions, which can contain different firmware versions.
 //|
-//| There are two identical partitions, these contain different
-//| firmware versions.
 //| Having two partitions enables rollback functionality.
 //|
-//| The two partitions are defined as boot partition and
-//| next-update partition. Calling `dualbank.flash()` writes
-//| the next-update partition.
+//| The two partitions are defined as the boot partition and the next-update partition.
+//| Calling `dualbank.flash()` writes the next-update partition.
 //|
-//| After the next-update partition is written a validation
-//| check is performed and on a successful validation this
-//| partition is set as the boot partition. On next reset,
-//| firmware will be loaded from this partition.
+//| After the next-update partition is written a validation check is performed
+//| and on a successful validation this partition is set as the boot partition.
+//| On next reset, firmware will be loaded from this partition.
 //|
-//| Here is the sequence of commands to follow:
+//| Use cases:
+//|     * Can be used for ``OTA`` Over-The-Air updates.
+//|     * Can be used for ``dual-boot`` of different firmware versions or platforms.
+//|
+//| .. note::
+//|
+//|     Boards with flash ``=2MB``:
+//|         This module is unavailable as the flash is only large enough for one app partition.
+//|
+//|     Boards with flash ``>2MB``:
+//|         This module is enabled/disabled at runtime based on whether the ``CIRCUITPY`` drive
+//|         is extended or not. See `storage.erase_filesystem()` for more information.
 //|
 //| .. code-block:: python
 //|
@@ -68,10 +75,12 @@ STATIC void raise_error_if_storage_extended(void) {
 #endif
 
 //| def flash(buffer: ReadableBuffer, offset: int = 0) -> None:
-//|     """Writes one of two app partitions at the given offset.
+//|     """Writes one of the two app partitions at the given offset.
 //|
-//|     This can be called multiple times when flashing the firmware
-//|     in small chunks.
+//|     This can be called multiple times when flashing the firmware in smaller chunks.
+//|
+//|     :param ReadableBuffer buffer: The entire firmware or a partial chunk.
+//|     :param int offset: Start writing at this offset in the app partition.
 //|     """
 //|     ...
 //|
@@ -102,10 +111,9 @@ STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash);
 
 //| def switch() -> None:
-//|     """Switches the boot partition.
+//|     """Switches to the next-update partition.
 //|
-//|     On next reset, firmware will be loaded from the partition
-//|     just switched over to.
+//|     On next reset, firmware will be loaded from the partition just switched over to.
 //|     """
 //|     ...
 //|
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index ad8b847fd5..8e2eee6511 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -166,8 +166,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 //|         extended by setting this to `True`. If this isn't provided or
 //|         set to `None` (default), the existing configuration will be used.
 //|
+//|     .. note:: New firmware starts with storage extended. In case of an existing
+//|          filesystem (e.g. uf2 load), the existing extension setting is preserved.
+//|
 //|     .. warning:: All the data on ``CIRCUITPY`` will be lost, and
-//|          CircuitPython will restart on certain boards."""
+//|         CircuitPython will restart on certain boards."""
 //|     ...
 //|
 

From efec211ee18b97ec8e1665c46bfe48f403e11db5 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 29 Jan 2023 22:56:24 -0500
Subject: [PATCH 1742/2403] update .readthedocs.yml

---
 .readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 94ba8750b0..29a915766f 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -14,7 +14,7 @@ build:
         python: "3"
     jobs:
         post_install:
-            - python tools/ci_fetch_deps.py docs HEAD
+            - python tools/ci_fetch_deps.py build-doc
 
 formats:
     - pdf

From dc5cd275555ce9e57e4d68575a1e9b092723bb3f Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 30 Jan 2023 02:01:33 -0500
Subject: [PATCH 1743/2403] seeed_xiao_esp32c3 flash mode change to dio

I was having trouble flashing CircuitPython to the Seeed xiao
esp32c3 using the make flash option. With the help of DAN and
Neradoc I was able to perform a manual flash and use the make
flash option to flash an Adafruit_qtpy_esp32c3 bin but when I
went back and attempted to use make flash on the seeed bin it didn't
work. Comparing the builds, the flash mode was different and after
making this change the seeed build now flashes properly using make
flash.
---
 ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
index 68722982ab..d7325cf44e 100644
--- a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -3,6 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 
-CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB

From 6e31cd0a4f55556ea083028dd25e43d029a03b05 Mon Sep 17 00:00:00 2001
From: Wind-stormger 
Date: Mon, 30 Jan 2023 15:41:42 +0800
Subject: [PATCH 1744/2403] Update mpconfigboard.h

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

diff --git a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
index 5225325454..ddb51cdb6d 100644
--- a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
+++ b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.h
@@ -30,6 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 // #define MICROPY_HW_NEOPIXEL  (&pin_GPIO18)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO0)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO16)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO15)

From d6ebf1bf43ad42f97418c77c82b98e6b1d418da2 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 17:12:21 -0500
Subject: [PATCH 1745/2403] First commit

---
 .../boards/brainboardz_neuron/board.c         | 48 ++++++++++++++
 .../boards/brainboardz_neuron/mpconfigboard.h | 33 ++++++++++
 .../brainboardz_neuron/mpconfigboard.mk       | 17 +++++
 .../boards/brainboardz_neuron/pins.c          | 64 +++++++++++++++++++
 .../boards/brainboardz_neuron/sdkconfig       | 34 ++++++++++
 5 files changed, 196 insertions(+)
 create mode 100755 ports/espressif/boards/brainboardz_neuron/board.c
 create mode 100755 ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
 create mode 100755 ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
 create mode 100755 ports/espressif/boards/brainboardz_neuron/pins.c
 create mode 100755 ports/espressif/boards/brainboardz_neuron/sdkconfig

diff --git a/ports/espressif/boards/brainboardz_neuron/board.c b/ports/espressif/boards/brainboardz_neuron/board.c
new file mode 100755
index 0000000000..ff9418ec86
--- /dev/null
+++ b/ports/espressif/boards/brainboardz_neuron/board.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
new file mode 100755
index 0000000000..9507917ead
--- /dev/null
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Neuron"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
new file mode 100755
index 0000000000..d6bbc7a7af
--- /dev/null
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80C8
+USB_PRODUCT = "Neuron"
+USB_MANUFACTURER = "BrainBoardz"
+
+IDF_TARGET = esp32s3
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_SIZE=8MB
diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
new file mode 100755
index 0000000000..496983e650
--- /dev/null
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -0,0 +1,64 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
+  
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+
+     // I2C BUS
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+
+     // SD Card
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
+    
+    // BLINK
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
+    
+    // BOOT SOFTWARE BOOT
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/brainboardz_neuron/sdkconfig b/ports/espressif/boards/brainboardz_neuron/sdkconfig
new file mode 100755
index 0000000000..89070ebd52
--- /dev/null
+++ b/ports/espressif/boards/brainboardz_neuron/sdkconfig
@@ -0,0 +1,34 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_OCT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="neuron"
+# end of LWIP

From 34f480d735134e831889c1529f3438c791fde9e9 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 19:03:57 -0500
Subject: [PATCH 1746/2403] Second Commit

---
 ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk | 2 +-
 ports/espressif/boards/brainboardz_neuron/sdkconfig        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
index d6bbc7a7af..1a9b410c06 100755
--- a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
@@ -1,4 +1,4 @@
-USB_VID = 0x239A
+USB_VID = 0x303A
 USB_PID = 0x80C8
 USB_PRODUCT = "Neuron"
 USB_MANUFACTURER = "BrainBoardz"
diff --git a/ports/espressif/boards/brainboardz_neuron/sdkconfig b/ports/espressif/boards/brainboardz_neuron/sdkconfig
index 89070ebd52..39bd2cdb4e 100755
--- a/ports/espressif/boards/brainboardz_neuron/sdkconfig
+++ b/ports/espressif/boards/brainboardz_neuron/sdkconfig
@@ -30,5 +30,5 @@ CONFIG_SPIRAM_MEMTEST=y
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="neuron"
+CONFIG_LWIP_LOCAL_HOSTNAME="BrainBoardzNeuron"
 # end of LWIP

From 7c525fdcb0d0046f45816c0ac8488c4f286be602 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 19:54:11 -0500
Subject: [PATCH 1747/2403] Third Commit

---
 ports/espressif/boards/brainboardz_neuron/pins.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 496983e650..577df2ada8 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -43,7 +43,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
-
      // I2C BUS
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },

From 3f3519e0abbbf783b7621c1fafd102cda05c6da4 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 20:10:34 -0500
Subject: [PATCH 1748/2403] Fourth Commit

---
 ports/espressif/boards/brainboardz_neuron/pins.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 577df2ada8..d6e61810a9 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -43,20 +43,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
-     // I2C BUS
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
 
-     // SD Card
     { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
     
-    // BLINK
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
     
-    // BOOT SOFTWARE BOOT
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }
 };
 

From e10816f34c89dc5995078976696e16e95e45d96d Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 20:20:37 -0500
Subject: [PATCH 1749/2403] Fifth Commit

---
 ports/espressif/boards/brainboardz_neuron/pins.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index d6e61810a9..252cf906f9 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -39,21 +39,19 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
-  
+    
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
-
+    
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
-
+    
     { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
     
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
-    
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }
 };
-
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f71b4bc0180a88568fdc7669131ac83ea883d9d7 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 20:32:19 -0500
Subject: [PATCH 1750/2403] Sixth Commit

---
 ports/espressif/boards/brainboardz_neuron/pins.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 252cf906f9..17d38717b3 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -39,19 +39,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
-    
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
-    
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
-    
     { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
-    
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+    
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f3b1ceeb81eb2c15ea7f8713c95d23025e55f5fb Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Mon, 30 Jan 2023 20:45:57 -0500
Subject: [PATCH 1751/2403] Seventh Commit

---
 ports/espressif/boards/brainboardz_neuron/pins.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 17d38717b3..85673a15b6 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -49,6 +49,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
-    
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From b8d6f20308ee865432ffb18c164faae32d296372 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 31 Jan 2023 10:02:21 -0600
Subject: [PATCH 1752/2403] Add front buttons as D0/1/2, matching the silk

---
 .../boards/adafruit_feather_esp32s2_reverse_tft/pins.c        | 4 ++++
 .../boards/adafruit_feather_esp32s3_reverse_tft/pins.c        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
index 0a331c93fd..32718700b1 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c
@@ -67,6 +67,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
index 0a331c93fd..32718700b1 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c
@@ -67,6 +67,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

From e54775a8cbc431362b2ea408ad6092ec6486c360 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Tue, 31 Jan 2023 18:58:27 -0500
Subject: [PATCH 1753/2403] adding information regarding the version for
 libraries

---
 docs/design_guide.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index 4170d499fe..784284892c 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -267,6 +267,14 @@ After the license comment::
 
     """
 
+Version description
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+After the import statements::
+
+    __version__ = "0.0.0+auto.0"
+    __repo__ = ""
+
 
 Class description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From 2656ccffe48a40a936a43cef9e51beceb2e390f1 Mon Sep 17 00:00:00 2001
From: brainboardz 
Date: Tue, 31 Jan 2023 19:35:57 -0500
Subject: [PATCH 1754/2403] Commit01-31

---
 .../boards/brainboardz_neuron/board.c         | 11 +-----
 .../brainboardz_neuron/mpconfigboard.mk       |  8 +----
 .../boards/brainboardz_neuron/pins.c          | 35 +++++++++++++------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/board.c b/ports/espressif/boards/brainboardz_neuron/board.c
index ff9418ec86..3b1f5efd87 100755
--- a/ports/espressif/boards/brainboardz_neuron/board.c
+++ b/ports/espressif/boards/brainboardz_neuron/board.c
@@ -36,13 +36,4 @@ void board_init(void) {
     #endif
 }
 
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
-
-void board_deinit(void) {
-}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
index 1a9b410c06..1083b18264 100755
--- a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.mk
@@ -1,17 +1,11 @@
 USB_VID = 0x303A
 USB_PID = 0x80C8
+
 USB_PRODUCT = "Neuron"
 USB_MANUFACTURER = "BrainBoardz"
 
 IDF_TARGET = esp32s3
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=8MB
diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 85673a15b6..b0cbb91563 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -4,6 +4,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
     { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BT), MP_ROM_PTR(&pin_GPIO0) },
+
     { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
@@ -11,20 +13,37 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+
     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
+
     { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
+
     { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+
     { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
+
     { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
     { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+
     { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
+
     { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
@@ -33,21 +52,17 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
     { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
     { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+
     { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+
     { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
     { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From d9d94eacca3eaf335c3c7ef4371dd34db3c5c841 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 13:38:41 +0530
Subject: [PATCH 1755/2403] run updated pre-commit

---
 ports/espressif/bindings/espcamera/__init__.c |  1 +
 ports/espressif/bindings/espidf/__init__.c    |  4 +-
 .../bindings/rp2pio/StateMachine.c            |  4 +-
 ports/raspberrypi/bindings/rp2pio/__init__.c  |  1 +
 .../stm/boards/swan_r5/tests/board_voltage.py |  4 +-
 ports/stm/tools/parse_af_csv.py               |  1 +
 py/genlast.py                                 |  1 -
 py/makeqstrdata.py                            |  1 +
 py/maketranslationdata.py                     |  3 +-
 shared-bindings/_bleio/Characteristic.c       |  3 +-
 shared-bindings/_bleio/CharacteristicBuffer.c |  1 -
 shared-bindings/_bleio/ScanResults.c          |  3 +-
 shared-bindings/_bleio/__init__.c             |  1 +
 shared-bindings/_eve/__init__.c               | 99 ++++++++++++-------
 .../i2c_device/I2CDevice.c                    |  1 -
 .../spi_device/SPIDevice.c                    |  1 -
 shared-bindings/adafruit_pixelbuf/PixelBuf.c  |  3 +-
 shared-bindings/alarm/__init__.c              |  1 +
 shared-bindings/atexit/__init__.c             |  3 +-
 shared-bindings/audiomixer/MixerVoice.c       |  3 +-
 shared-bindings/audiomp3/MP3Decoder.c         |  1 -
 shared-bindings/bitmaptools/__init__.c        |  1 +
 shared-bindings/bitops/__init__.c             |  1 +
 shared-bindings/board/__init__.c              | 10 +-
 shared-bindings/busio/I2C.c                   |  1 -
 shared-bindings/busio/SPI.c                   |  1 -
 shared-bindings/canio/__init__.c              |  1 +
 shared-bindings/displayio/Display.c           |  7 +-
 shared-bindings/displayio/EPaperDisplay.c     |  3 +-
 shared-bindings/displayio/I2CDisplay.c        |  3 +-
 shared-bindings/dualbank/__init__.c           |  1 +
 .../framebufferio/FramebufferDisplay.c        |  9 +-
 shared-bindings/getpass/__init__.c            |  2 +-
 shared-bindings/hashlib/Hash.c                |  3 +-
 shared-bindings/ipaddress/__init__.c          |  1 +
 shared-bindings/is31fl3741/IS31FL3741.c       |  3 +-
 shared-bindings/keypad/Event.c                |  3 +-
 shared-bindings/math/__init__.c               |  1 +
 shared-bindings/memorymonitor/__init__.c      |  1 +
 shared-bindings/microcontroller/__init__.c    |  1 +
 shared-bindings/msgpack/__init__.c            |  1 +
 shared-bindings/neopixel_write/__init__.c     |  3 +-
 shared-bindings/rainbowio/__init__.c          |  3 +-
 shared-bindings/random/__init__.c             |  1 +
 shared-bindings/rtc/__init__.c                |  1 +
 shared-bindings/sdcardio/SDCard.c             |  2 -
 shared-bindings/sdioio/SDCard.c               |  2 -
 shared-bindings/socketpool/Socket.c           |  3 +-
 shared-bindings/socketpool/SocketPool.c       |  1 +
 shared-bindings/ssl/SSLSocket.c               |  3 +-
 shared-bindings/ssl/__init__.c                |  1 +
 shared-bindings/struct/__init__.c             |  1 +
 shared-bindings/supervisor/__init__.c         |  1 +
 shared-bindings/traceback/__init__.c          |  1 +
 shared-bindings/uheap/__init__.c              |  1 +
 shared-bindings/usb/core/__init__.c           |  1 +
 shared-bindings/usb_cdc/__init__.c            |  1 +
 shared-bindings/usb_hid/__init__.c            |  1 +
 shared-bindings/usb_midi/__init__.c           |  1 +
 shared-bindings/ustack/__init__.c             |  1 +
 shared-bindings/vectorio/Circle.c             |  3 +-
 shared-bindings/vectorio/Polygon.c            |  3 +-
 shared-bindings/vectorio/Rectangle.c          |  3 +-
 shared-bindings/watchdog/__init__.c           |  1 +
 shared-bindings/zlib/__init__.c               |  1 +
 tests/extmod/framebuf_subclass.py             |  1 +
 tests/extmod/uasyncio_exception.py            |  3 +
 tests/extmod/vfs_fat_fileio1.py               |  1 -
 tests/extmod/vfs_fat_fileio2.py               |  1 -
 tests/extmod/vfs_fat_more.py                  |  1 -
 tests/extmod/vfs_fat_oldproto.py              |  1 -
 tests/extmod/vfs_fat_ramdisk.py               |  1 -
 tests/extmod/vfs_fat_ramdisklarge.py          |  1 -
 tests/import/module_getattr.py                |  1 +
 tests/inlineasm/asmsum.py                     |  2 -
 tests/micropython/const2.py                   |  4 +
 tests/micropython/heapalloc_yield_from.py     |  2 +
 tests/micropython/native_closure.py           |  3 +
 tests/micropython/native_gen.py               |  2 +
 tests/micropython/native_misc.py              |  4 +
 tests/micropython/native_try.py               |  3 +
 tests/micropython/native_try_deep.py          |  1 +
 tests/micropython/native_with.py              |  1 +
 tests/micropython/viper_args.py               |  1 +
 tests/micropython/viper_cond.py               |  3 +
 tests/micropython/viper_misc.py               | 17 ++++
 tests/micropython/viper_misc2.py              |  1 +
 tests/micropython/viper_misc_intbig.py        |  1 +
 tests/micropython/viper_try.py                |  3 +
 tests/micropython/viper_types.py              |  3 +
 tests/micropython/viper_with.py               |  1 +
 tests/misc/non_compliant.py                   |  3 +
 tests/misc/sys_settrace_generator.py          |  2 -
 .../sys_settrace_generic.py                   |  1 +
 tests/perf_bench/bm_nqueens.py                |  1 +
 tests/perf_bench/misc_aes.py                  |  2 +
 tests/run-internalbench.py                    |  1 -
 tests/stress/qstr_limit.py                    |  2 +
 tests/stress/recursive_gen.py                 |  2 +
 tests/thread/mutate_bytearray.py              |  1 +
 tests/thread/mutate_dict.py                   |  1 +
 tests/thread/mutate_instance.py               |  2 +
 tests/thread/mutate_list.py                   |  1 +
 tests/thread/mutate_set.py                    |  1 +
 tests/thread/stress_aes.py                    |  2 +
 tests/thread/thread_qstr1.py                  |  1 +
 tests/unicode/unicode_id.py                   |  2 +
 tools/codeformat.py                           |  1 +
 tools/extract_pyi.py                          |  2 +-
 tools/gen_crt_bundle.py                       |  2 -
 tools/gendoc.py                               |  1 +
 tools/mpy-tool.py                             |  1 +
 tools/preprocess_frozen_modules.py            |  1 -
 113 files changed, 237 insertions(+), 93 deletions(-)

diff --git a/ports/espressif/bindings/espcamera/__init__.c b/ports/espressif/bindings/espcamera/__init__.c
index 37b506015f..633f547fe9 100644
--- a/ports/espressif/bindings/espcamera/__init__.c
+++ b/ports/espressif/bindings/espcamera/__init__.c
@@ -45,6 +45,7 @@
 //|     Non-Espressif microcontrollers use the `imagecapture` module together with wrapper libraries such as `adafruit_ov5640 `_.
 //|
 //| """
+//|
 
 //| class GrabMode:
 //|     """Controls when a new frame is grabbed."""
diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index 12781000ae..c1ef9da1e0 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -37,6 +37,7 @@
 //| """Direct access to a few ESP-IDF details. This module *should not* include any functionality
 //|    that could be implemented by other frameworks. It should only include ESP-IDF specific
 //|    things."""
+//|
 
 //| def heap_caps_get_total_size() -> int:
 //|     """Return the total size of the ESP-IDF, which includes the CircuitPython heap."""
@@ -72,7 +73,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_largest_free_block_obj, espidf_he
 //|     """Erase all data in the non-volatile storage (nvs), including data stored by with `microcontroller.nvm`
 //|
 //|     This is necessary when upgrading from CircuitPython 6.3.0 or earlier to CircuitPython 7.0.0, because the
-//|     layout of data in nvs has changed. The old data will be lost when you perform this operation."""
+//|     layout of data in nvs has changed. The old data will be lost when you perform this operation.
+//|     """
 //|
 STATIC mp_obj_t espidf_erase_nvs(void) {
     ESP_ERROR_CHECK(nvs_flash_deinit());
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index 5301086709..ada9f46020 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -94,7 +94,6 @@
 //|         wrap_target: int = 0,
 //|         wrap: int = -1,
 //|     ) -> None:
-//|
 //|         """Construct a StateMachine object on the given pins with the given program.
 //|
 //|         :param ReadableBuffer program: the program to run with the state machine
@@ -659,7 +658,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach
 //|         :param int in_start: Start of the slice of ``buffer_in`` to read into: ``buffer_in[in_start:in_end]``
 //|         :param int in_end: End of the slice; this index is not included. Defaults to ``len(buffer_in)``
 //|         :param bool swap_out: For 2- and 4-byte elements, swap (reverse) the byte order for the buffer being transmitted (written)
-//|         :param bool swap_in: For 2- and 4-rx elements, swap (reverse) the byte order for the buffer being received (read)"""
+//|         :param bool swap_in: For 2- and 4-rx elements, swap (reverse) the byte order for the buffer being received (read)
+//|         """
 //|         ...
 
 STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c
index ce3be4aa52..193a3a2025 100644
--- a/ports/raspberrypi/bindings/rp2pio/__init__.c
+++ b/ports/raspberrypi/bindings/rp2pio/__init__.c
@@ -38,6 +38,7 @@
 //|     Learn guide `_.
 //|
 //| """
+//|
 
 //| def pins_are_sequential(pins: List[microcontroller.Pin]) -> bool:
 //|     """Return True if the pins have sequential GPIO numbers, False otherwise"""
diff --git a/ports/stm/boards/swan_r5/tests/board_voltage.py b/ports/stm/boards/swan_r5/tests/board_voltage.py
index 6191067fde..2cb0ad4cc0 100644
--- a/ports/stm/boards/swan_r5/tests/board_voltage.py
+++ b/ports/stm/boards/swan_r5/tests/board_voltage.py
@@ -44,6 +44,7 @@ PASS = "PASS"
 FAIL = "FAIL"
 NA = "N/A"
 
+
 # Determine if given value is a number
 def _is_number(val):
     try:
@@ -61,7 +62,6 @@ def _deinit_pins(gpios):
 
 # Toggle IO pins while waiting for answer
 def _toggle_wait(pin_gpios):
-
     timestamp = time.monotonic()
     led_state = False
     failed = []
@@ -96,7 +96,6 @@ def buildPin(pin):
 
 
 def run_test(pins):
-
     """
     Toggles all available GPIO on and off repeatedly.
 
@@ -114,7 +113,6 @@ def run_test(pins):
     gpio_pins = analog_pins + digital_pins
 
     if gpio_pins:
-
         # Print out the LEDs found
         print("GPIO pins found:", end=" ")
         for pin in gpio_pins:
diff --git a/ports/stm/tools/parse_af_csv.py b/ports/stm/tools/parse_af_csv.py
index 3e48d4145d..e3188e2e24 100644
--- a/ports/stm/tools/parse_af_csv.py
+++ b/ports/stm/tools/parse_af_csv.py
@@ -31,6 +31,7 @@ import sys
 #
 # See examples/stm32f405.csv for example formatting.
 
+
 # Most peripherals (SPI, I2C) output 3 values:
 # peripheral index, alt function, pin string
 def evaluate_periph(inper, inlist, periph, subtype, altfn, pin):
diff --git a/py/genlast.py b/py/genlast.py
index 460271af81..1c5089fdfc 100644
--- a/py/genlast.py
+++ b/py/genlast.py
@@ -59,7 +59,6 @@ def maybe_preprocess(command, output_dir, fn):
 
 
 if __name__ == "__main__":
-
     idx1 = sys.argv.index("--")
     idx2 = sys.argv.index("--", idx1 + 1)
     output_dir = sys.argv[1]
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 2abbdedefd..d16bb0d09a 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -249,6 +249,7 @@ static_qstr_list = [
     "zip",
 ]
 
+
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr, bytes_hash):
     hash = 5381
diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py
index fbf396c73f..a07f70265c 100644
--- a/py/maketranslationdata.py
+++ b/py/maketranslationdata.py
@@ -84,6 +84,7 @@ C_ESCAPES = {
     '"': '\\"',
 }
 
+
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr, bytes_hash):
     hash = 5381
@@ -277,7 +278,7 @@ def compute_huffman_coding(translation_name, translations, f):
 
         counter = collections.Counter()
         for t in texts:
-            for (found, word) in extractor.iter_words(t):
+            for found, word in extractor.iter_words(t):
                 if not found:
                     for substr in iter_substrings(word, minlen=2, maxlen=11):
                         counter[substr] += 1
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index e1c5fc3ad5..823250c365 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -256,7 +256,8 @@ MP_PROPERTY_GETTER(bleio_characteristic_service_obj,
 //|         """Set the remote characteristic's CCCD to enable or disable notification and indication.
 //|
 //|         :param bool notify: True if Characteristic should receive notifications of remote writes
-//|         :param float indicate: True if Characteristic should receive indications of remote writes"""
+//|         :param float indicate: True if Characteristic should receive indications of remote writes
+//|         """
 //|         ...
 STATIC mp_obj_t bleio_characteristic_set_cccd(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index 12853b3ac3..218d72bdbb 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -47,7 +47,6 @@ STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self
 //|     def __init__(
 //|         self, characteristic: Characteristic, *, timeout: int = 1, buffer_size: int = 64
 //|     ) -> None:
-//|
 //|         """Monitor the given Characteristic. Each time a new value is written to the Characteristic
 //|         add the newly-written bytes to a FIFO buffer.
 //|
diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c
index b0f37d9fe5..ec4e0c72e8 100644
--- a/shared-bindings/_bleio/ScanResults.c
+++ b/shared-bindings/_bleio/ScanResults.c
@@ -54,7 +54,8 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
 //|         ...
 //|     def __next__(self) -> ScanEntry:
 //|         """Returns the next `_bleio.ScanEntry`. Blocks if none have been received and scanning is still
-//|         active. Raises `StopIteration` if scanning is finished and no other results are available."""
+//|         active. Raises `StopIteration` if scanning is finished and no other results are available.
+//|         """
 //|         ...
 //|
 
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index 59c6c354a4..f34d3af5c5 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -58,6 +58,7 @@
 //| adapter: Adapter
 //| """BLE Adapter used to manage device discovery and connections.
 //| This object is the sole instance of `_bleio.Adapter`."""
+//|
 
 //| class BluetoothError(Exception):
 //|     """Catchall exception for Bluetooth related errors."""
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index bd0cf9b4ea..5975ee1ca1 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -93,7 +93,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc);
 //|         :param int func: specifies the test function, one of ``NEVER``, ``LESS``, ``LEQUAL``, ``GREATER``, ``GEQUAL``, ``EQUAL``, ``NOTEQUAL``, or ``ALWAYS``. Range 0-7. The initial value is ALWAYS(7)
 //|         :param int ref: specifies the reference value for the alpha test. Range 0-255. The initial value is 0
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -109,7 +110,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc);
 //|
 //|         :param int prim: graphics primitive.
 //|
-//|         Valid primitives are ``BITMAPS``, ``POINTS``, ``LINES``, ``LINE_STRIP``, ``EDGE_STRIP_R``, ``EDGE_STRIP_L``, ``EDGE_STRIP_A``, ``EDGE_STRIP_B`` and ``RECTS``."""
+//|         Valid primitives are ``BITMAPS``, ``POINTS``, ``LINES``, ``LINE_STRIP``, ``EDGE_STRIP_R``, ``EDGE_STRIP_L``, ``EDGE_STRIP_A``, ``EDGE_STRIP_B`` and ``RECTS``.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) {
@@ -137,7 +139,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat);
 //|
 //|         :param int handle: bitmap handle. Range 0-31. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) {
@@ -218,7 +221,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize);
 //|     def BitmapSource(self, addr: int) -> None:
 //|         """Set the source address for bitmap graphics
 //|
-//|         :param int addr: Bitmap start address, pixel-aligned. May be in SRAM or flash. Range 0-16777215"""
+//|         :param int addr: Bitmap start address, pixel-aligned. May be in SRAM or flash. Range 0-16777215
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) {
@@ -255,7 +259,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizz
 //|
 //|         The initial value is **p** = 0, **v** = 256. This represents the value 1.0.
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -274,7 +279,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma);
 //|
 //|         The initial value is **p** = 0, **v** = 0. This represents the value 0.0.
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -290,7 +296,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb);
 //|
 //|         :param int v: The :math:`c` component of the bitmap transform matrix, in signed 15.8 bit fixed-point form. Range 0-16777215. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) {
@@ -308,7 +315,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc);
 //|
 //|         The initial value is **p** = 0, **v** = 0. This represents the value 0.0.
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -327,7 +335,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd);
 //|
 //|         The initial value is **p** = 0, **v** = 256. This represents the value 1.0.
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -343,7 +352,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme);
 //|
 //|         :param int v: The :math:`f` component of the bitmap transform matrix, in signed 15.8 bit fixed-point form. Range 0-16777215. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) {
@@ -359,7 +369,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf);
 //|         :param int src: specifies how the source blending factor is computed.  One of ``ZERO``, ``ONE``, ``SRC_ALPHA``, ``DST_ALPHA``, ``ONE_MINUS_SRC_ALPHA`` or ``ONE_MINUS_DST_ALPHA``. Range 0-7. The initial value is SRC_ALPHA(2)
 //|         :param int dst: specifies how the destination blending factor is computed, one of the same constants as **src**. Range 0-7. The initial value is ONE_MINUS_SRC_ALPHA(4)
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -388,7 +399,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call);
 //|
 //|         :param int cell: bitmap cell number. Range 0-127. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) {
@@ -403,7 +415,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell);
 //|
 //|         :param int alpha: alpha value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) {
@@ -420,7 +433,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora);
 //|         :param int green: green value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|         :param int blue: blue value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) {
@@ -454,7 +468,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear);
 //|
 //|         :param int s: value used when the stencil buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) {
@@ -469,7 +484,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil);
 //|
 //|         :param int s: value used when the tag buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 
 STATIC mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) {
     uint32_t s = mp_obj_get_int_truncated(a0);
@@ -483,7 +499,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag);
 //|
 //|         :param int alpha: alpha for the current color. Range 0-255. The initial value is 255
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) {
@@ -501,7 +518,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora);
 //|         :param int b: allow updates to the frame buffer blue component. Range 0-1. The initial value is 1
 //|         :param int a: allow updates to the frame buffer alpha component. Range 0-1. The initial value is 1
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) {
@@ -521,7 +539,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask);
 //|         :param int green: green for the current color. Range 0-255. The initial value is 255
 //|         :param int blue: blue for the current color. Range 0-255. The initial value is 255
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) {
@@ -547,7 +566,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display);
 //|     def End(self) -> None:
 //|         """End drawing a graphics primitive
 //|
-//|         :meth:`Vertex2ii` and :meth:`Vertex2f` calls are ignored until the next :meth:`Begin`."""
+//|         :meth:`Vertex2ii` and :meth:`Vertex2f` calls are ignored until the next :meth:`Begin`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _end(mp_obj_t self) {
@@ -599,7 +619,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop);
 //|
 //|         :param int addr: Address in graphics SRAM, 2-byte aligned. Range 0-4194303. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) {
@@ -648,7 +669,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext);
 //|         :param int width: The width of the scissor clip rectangle, in pixels. Range 0-4095. The initial value is hsize
 //|         :param int height: The height of the scissor clip rectangle, in pixels. Range 0-4095. The initial value is 2048
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -665,7 +687,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize);
 //|         :param int x: The :math:`x` coordinate of the scissor clip rectangle, in pixels. Range 0-2047. The initial value is 0
 //|         :param int y: The :math:`y` coordinate of the scissor clip rectangle, in pixels. Range 0-2047. The initial value is 0
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -683,7 +706,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy);
 //|         :param int ref: specifies the reference value for the stencil test. Range 0-255. The initial value is 0
 //|         :param int mask: specifies a mask that is ANDed with the reference value and the stored stencil value. Range 0-255. The initial value is 255
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) {
@@ -700,7 +724,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc);
 //|
 //|         :param int mask: the mask used to enable writing stencil bits. Range 0-255. The initial value is 255
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) {
@@ -716,7 +741,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask);
 //|         :param int sfail: specifies the action to take when the stencil test fails, one of ``KEEP``, ``ZERO``, ``REPLACE``, ``INCR``, ``INCR_WRAP``, ``DECR``, ``DECR_WRAP``, and ``INVERT``. Range 0-7. The initial value is KEEP(1)
 //|         :param int spass: specifies the action to take when the stencil test passes, one of the same constants as **sfail**. Range 0-7. The initial value is KEEP(1)
 //|
-//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -732,7 +758,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop);
 //|
 //|         :param int mask: allow updates to the tag buffer. Range 0-1. The initial value is 1
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) {
@@ -747,7 +774,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask);
 //|
 //|         :param int s: tag value. Range 0-255. The initial value is 255
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) {
@@ -857,7 +885,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f);
 //|
 //|         :param float width: line width in pixels. Range 0-511. The initial value is 1
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) {
@@ -872,7 +901,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth);
 //|
 //|         :param float size: point diameter in pixels. Range 0-1023. The initial value is 1
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) {
@@ -887,7 +917,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize);
 //|
 //|         :param float x: signed x-coordinate in pixels. Range ±4095. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 STATIC mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) {
@@ -902,7 +933,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex);
 //|
 //|         :param float y: signed y-coordinate in pixels. Range ±4095. The initial value is 0
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 
@@ -918,7 +950,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey);
 //|
 //|         :param int frac: Number of fractional bits in X,Y coordinates, 0-4. Range 0-7. The initial value is 4
 //|
-//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|         This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|         """
 //|         ...
 
 // }
diff --git a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
index d2b7f0c6ce..a77179c886 100644
--- a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -43,7 +43,6 @@
 //|     """I2C Device Manager"""
 //|
 //|     def __init__(self, i2c: busio.I2C, device_address: int, probe: bool = True) -> None:
-//|
 //|         """Represents a single I2C device and manages locking the bus and the device
 //|         address.
 //|
diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index 6626d27f77..6108247aa1 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -51,7 +51,6 @@
 //|         phase: int = 0,
 //|         extra_clocks: int = 0
 //|     ) -> None:
-//|
 //|         """
 //|         Represents a single SPI device and manages locking the bus and the device address.
 //|
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
index b5b0f1bb41..2848a02c62 100644
--- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c
+++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -78,7 +78,8 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t
 //|         :param float brightness: Brightness (0 to 1.0, default 1.0)
 //|         :param bool auto_write: Whether to automatically write pixels (Default False)
 //|         :param ~circuitpython_typing.ReadableBuffer header: Sequence of bytes to always send before pixel values.
-//|         :param ~circuitpython_typing.ReadableBuffer trailer: Sequence of bytes to always send after pixel values."""
+//|         :param ~circuitpython_typing.ReadableBuffer trailer: Sequence of bytes to always send after pixel values.
+//|         """
 //|         ...
 STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_size, ARG_byteorder, ARG_brightness, ARG_auto_write, ARG_header, ARG_trailer };
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index f61482682f..29c9b49d3f 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -73,6 +73,7 @@
 //| """The most recently triggered alarm. If CircuitPython was sleeping, the alarm that woke it from sleep.
 //| If no alarm occured since the last hard reset or soft restart, value is ``None``.
 //| """
+//|
 
 // wake_alarm is implemented as a dictionary entry, so there's no code here.
 
diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c
index 914cac582b..9a91e0bc80 100644
--- a/shared-bindings/atexit/__init__.c
+++ b/shared-bindings/atexit/__init__.c
@@ -37,11 +37,11 @@
 //| |see_cpython_module| :mod:`cpython:atexit`.
 //| """
 //| ...
+//|
 
 //| def register(
 //|     func: Callable[..., Any], *args: Optional[Any], **kwargs: Optional[Any]
 //| ) -> Callable[..., Any]:
-//|
 //|     """Register func as a function to be executed at termination.
 //|
 //|     Any optional arguments that are to be passed to func must be passed as arguments to `register()`.
@@ -65,7 +65,6 @@ STATIC mp_obj_t atexit_register(size_t n_args, const mp_obj_t *pos_args, mp_map_
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register);
 
 //| def unregister(func: Callable[..., Any]) -> None:
-//|
 //|     """Remove func from the list of functions to be run at termination.
 //|
 //|     `unregister()` silently does nothing if func was not previously registered. If func has been registered more than once,
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index 0bdef1f4cd..16a1be520f 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -62,7 +62,8 @@ STATIC mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t
 //|
 //|         Sample must be an `audiocore.WaveFile`, `audiocore.RawSample`, `audiomixer.Mixer` or `audiomp3.MP3Decoder`.
 //|
-//|         The sample must match the `audiomixer.Mixer`'s encoding settings given in the constructor."""
+//|         The sample must match the `audiomixer.Mixer`'s encoding settings given in the constructor.
+//|         """
 //|         ...
 STATIC mp_obj_t audiomixer_mixervoice_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sample, ARG_loop };
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index 4a8805b294..68e78cb0d5 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -45,7 +45,6 @@
 //|     """
 //|
 //|     def __init__(self, file: Union[str, typing.BinaryIO], buffer: WriteableBuffer) -> None:
-//|
 //|         """Load a .mp3 file for playback with `audioio.AudioOut` or `audiobusio.I2SOut`.
 //|
 //|         :param Union[str, typing.BinaryIO] file: The name of a mp3 file (preferred) or an already opened mp3 file
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 4d968db717..493ff93b09 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -50,6 +50,7 @@
 //|     `_
 //|     for information about using the :py:mod:`displayio` module.
 //| """
+//|
 
 STATIC int16_t validate_point(mp_obj_t point, int16_t default_value) {
     // Checks if point is None and returns default_value, otherwise decodes integer value
diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c
index ea4e70ae3a..3107b310db 100644
--- a/shared-bindings/bitops/__init__.c
+++ b/shared-bindings/bitops/__init__.c
@@ -30,6 +30,7 @@
 #include "shared-bindings/bitops/__init__.h"
 
 //| """Routines for low-level manipulation of binary data"""
+//|
 
 //| def bit_transpose(
 //|     input: ReadableBuffer, output: WriteableBuffer, width: int = 8
diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index e4003d4f6b..971ed2f676 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -58,10 +58,12 @@
 //| """Board ID string. The unique identifier for the board model in
 //| circuitpython, as well as on circuitpython.org.
 //| Example: "hallowing_m0_express"."""
+//|
 
 //| def I2C() -> busio.I2C:
 //|     """Returns the `busio.I2C` object for the board's designated I2C bus(es).
-//|     The object created is a singleton, and uses the default parameter values for `busio.I2C`."""
+//|     The object created is a singleton, and uses the default parameter values for `busio.I2C`.
+//|     """
 //|     ...
 //|
 #if CIRCUITPY_BOARD_I2C
@@ -78,7 +80,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c_0);
 
 //| def SPI() -> busio.SPI:
 //|     """Returns the `busio.SPI` object for the board's designated SPI bus(es).
-//|     The object created is a singleton, and uses the default parameter values for `busio.SPI`."""
+//|     The object created is a singleton, and uses the default parameter values for `busio.SPI`.
+//|     """
 //|     ...
 //|
 #if CIRCUITPY_BOARD_SPI
@@ -95,7 +98,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi_0);
 
 //| def UART() -> busio.UART:
 //|     """Returns the `busio.UART` object for the board's designated UART bus(es).
-//|     The object created is a singleton, and uses the default parameter values for `busio.UART`."""
+//|     The object created is a singleton, and uses the default parameter values for `busio.UART`.
+//|     """
 //|     ...
 //|
 #if CIRCUITPY_BOARD_UART
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index de373aaeb4..5cf52eaa1a 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -48,7 +48,6 @@
 //|         frequency: int = 100000,
 //|         timeout: int = 255
 //|     ) -> None:
-//|
 //|         """I2C is a two-wire protocol for communicating between devices.  At the
 //|         physical level it consists of 2 wires: SCL and SDA, the clock and data
 //|         lines respectively.
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index af985ed632..ccdceb5760 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -61,7 +61,6 @@
 //|         MISO: Optional[microcontroller.Pin] = None,
 //|         half_duplex: bool = False,
 //|     ) -> None:
-//|
 //|         """Construct an SPI object on the given pins.
 //|
 //|         .. note:: The SPI peripherals allocated in order of desirability, if possible,
diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
index 0416e5cb39..ecef7ebde6 100644
--- a/shared-bindings/canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -58,6 +58,7 @@
 //| For more information on working with this module, refer to
 //| `this Learn Guide on using it `_.
 //| """
+//|
 
 #include "py/obj.h"
 #include "py/enum.h"
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 448aa25b79..47b1de8914 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -41,6 +41,7 @@
 
 //| _DisplayBus = Union["FourWire", "paralleldisplay.ParallelBus", "I2CDisplay"]
 //| """:py:class:`FourWire`, :py:class:`paralleldisplay.ParallelBus` or :py:class:`I2CDisplay`"""
+//|
 
 //| class Display:
 //|     """Manage updating a display over a display bus
@@ -282,7 +283,8 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_show_obj, displayio_display_obj_show
 //|
 //|         :param Optional[int] target_frames_per_second: The target frame rate that :py:func:`refresh` should try to
 //|             achieve. Set to `None` for immediate refresh.
-//|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second."""
+//|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second.
+//|         """
 //|         ...
 STATIC mp_obj_t displayio_display_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
@@ -445,7 +447,8 @@ MP_PROPERTY_GETSET(displayio_display_root_group_obj,
 //|         """Extract the pixels from a single row
 //|
 //|         :param int y: The top edge of the area
-//|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data"""
+//|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data
+//|         """
 //|         ...
 //|
 STATIC mp_obj_t displayio_display_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 6fde664670..4745223ad3 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -117,7 +117,8 @@
 //|         :param float seconds_per_frame: Minimum number of seconds between screen refreshes
 //|         :param bool always_toggle_chip_select: When True, chip select is toggled every byte
 //|         :param bool grayscale: When true, the color ram is the low bit of 2-bit grayscale
-//|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length"""
+//|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length
+//|         """
 //|         ...
 STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_display_bus, ARG_start_sequence, ARG_stop_sequence, ARG_width, ARG_height,
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index 14edf7b0be..f2647b0b16 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -59,7 +59,8 @@
 //|
 //|         :param busio.I2C i2c_bus: The I2C bus that make up the clock and data lines
 //|         :param int device_address: The I2C address of the device
-//|         :param microcontroller.Pin reset: Reset pin. When None only software reset can be used"""
+//|         :param microcontroller.Pin reset: Reset pin. When None only software reset can be used
+//|         """
 //|         ...
 STATIC mp_obj_t displayio_i2cdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_i2c_bus, ARG_device_address, ARG_reset };
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
index fedc9c08af..b77fb6d76b 100644
--- a/shared-bindings/dualbank/__init__.c
+++ b/shared-bindings/dualbank/__init__.c
@@ -65,6 +65,7 @@
 //|     dualbank.switch()
 //| """
 //| ...
+//|
 
 #if CIRCUITPY_STORAGE_EXTEND
 STATIC void raise_error_if_storage_extended(void) {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 51124984bf..030b924c1e 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -58,7 +58,8 @@
 //|
 //|         :param ~circuitpython_typing.FrameBuffer framebuffer: The framebuffer that the display is connected to
 //|         :param bool auto_refresh: Automatically refresh the screen
-//|         :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)"""
+//|         :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
+//|         """
 //|         ...
 STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_framebuffer, ARG_rotation, ARG_auto_refresh, NUM_ARGS };
@@ -134,7 +135,8 @@ MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebuffer
 //|         without calls to this.)
 //|
 //|         :param int target_frames_per_second: How many times a second `refresh` should be called and the screen updated.
-//|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second."""
+//|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second.
+//|         """
 //|         ...
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
@@ -263,7 +265,8 @@ MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj,
 //|         """Extract the pixels from a single row
 //|
 //|         :param int y: The top edge of the area
-//|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data"""
+//|         :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data
+//|         """
 //|         ...
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_y, ARG_buffer };
diff --git a/shared-bindings/getpass/__init__.c b/shared-bindings/getpass/__init__.c
index 340b8fd7c6..811d78e03d 100644
--- a/shared-bindings/getpass/__init__.c
+++ b/shared-bindings/getpass/__init__.c
@@ -33,9 +33,9 @@
 //|
 //| """
 //| ...
+//|
 
 //| def getpass(prompt: Optional[str] = "Password: ", stream: Optional[io.FileIO] = None) -> str:
-//|
 //|     """Prompt the user without echoing.
 //|
 //|     :param str prompt: The user is prompted using the string ``prompt``, which defaults to ``'Password: '``.
diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c
index f385885b4d..e3cbbc39d3 100644
--- a/shared-bindings/hashlib/Hash.c
+++ b/shared-bindings/hashlib/Hash.c
@@ -49,7 +49,8 @@ MP_PROPERTY_GETTER(hashlib_hash_digest_size_obj, (mp_obj_t)&hashlib_hash_digest_
 //|     def update(self, data: ReadableBuffer) -> None:
 //|         """Update the hash with the given bytes.
 //|
-//|         :param ~circuitpython_typing.ReadableBuffer data: Update the hash from data in this buffer"""
+//|         :param ~circuitpython_typing.ReadableBuffer data: Update the hash from data in this buffer
+//|         """
 //|         ...
 mp_obj_t hashlib_hash_update(mp_obj_t self_in, mp_obj_t buf_in) {
     mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type));
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
index fb4c8bf38d..6da5a52299 100644
--- a/shared-bindings/ipaddress/__init__.c
+++ b/shared-bindings/ipaddress/__init__.c
@@ -35,6 +35,7 @@
 //| The `ipaddress` module provides types for IP addresses. It is a subset of CPython's ipaddress
 //| module.
 //| """
+//|
 
 
 bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t *ip_out) {
diff --git a/shared-bindings/is31fl3741/IS31FL3741.c b/shared-bindings/is31fl3741/IS31FL3741.c
index 706e3deb2b..17b12da67a 100644
--- a/shared-bindings/is31fl3741/IS31FL3741.c
+++ b/shared-bindings/is31fl3741/IS31FL3741.c
@@ -141,7 +141,8 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(is31fl3741_IS31FL3741_set_led_obj, 4, 4, is3
 //|     """Write buf out on the I2C bus to the IS31FL3741.
 //|
 //|     :param ~Tuple[int, ...] mapping: map the pixels in the buffer to the order addressed by the driver chip
-//|     :param ~_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order"""
+//|     :param ~_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order
+//|     """
 //|     ...
 //|
 STATIC mp_obj_t is31fl3741_IS31FL3741_write(mp_obj_t self_in, mp_obj_t mapping, mp_obj_t buffer) {
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 56a5815636..c8d24294f8 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -148,7 +148,8 @@ 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..
 //|
-//|         Note that as events with different timestamps compare equal, they also hash to the same value."""
+//|         Note that as events with different timestamps compare equal, they also hash to the same value.
+//|         """
 //|         ...
 //|
 STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c
index 42a32749da..8aee44ffb8 100644
--- a/shared-bindings/math/__init__.c
+++ b/shared-bindings/math/__init__.c
@@ -86,6 +86,7 @@ STATIC NORETURN void math_error(void) {
 //|
 //| pi: float
 //| """the ratio of a circle's circumference to its diameter"""
+//|
 
 //| def acos(x: float) -> float:
 //|     """Return the inverse cosine of ``x``."""
diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c
index 12c91cd150..7b05acd095 100644
--- a/shared-bindings/memorymonitor/__init__.c
+++ b/shared-bindings/memorymonitor/__init__.c
@@ -34,6 +34,7 @@
 #include "shared-bindings/memorymonitor/AllocationSize.h"
 
 //| """Memory monitoring helpers"""
+//|
 
 //| class AllocationError(Exception):
 //|     """Catchall exception for allocation related errors."""
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 5716f7270e..2c1fdd5b58 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -60,6 +60,7 @@
 //| """CPU information and control, such as ``cpus[0].temperature`` and ``cpus[1].frequency``
 //| (clock frequency) on chips with more than 1 cpu. The index selects which cpu.
 //| This object is an instance of `microcontroller.Processor`."""
+//|
 
 //| def delay_us(delay: int) -> None:
 //|     """Dedicated delay method used for very short delays. **Do not** do long delays
diff --git a/shared-bindings/msgpack/__init__.c b/shared-bindings/msgpack/__init__.c
index d505e3a6d8..7773d6d190 100644
--- a/shared-bindings/msgpack/__init__.c
+++ b/shared-bindings/msgpack/__init__.c
@@ -84,6 +84,7 @@
 //|    print(f"{data} -> {buffer.getvalue()} -> {decoded}")
 //|
 //| """
+//|
 
 //| def pack(
 //|     obj: object,
diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c
index 66c36af34b..cc0e2a041a 100644
--- a/shared-bindings/neopixel_write/__init__.c
+++ b/shared-bindings/neopixel_write/__init__.c
@@ -109,7 +109,8 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
 //|     """Write buf out on the given DigitalInOut.
 //|
 //|     :param ~digitalio.DigitalInOut digitalinout: the DigitalInOut to output with
-//|     :param ~circuitpython_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order"""
+//|     :param ~circuitpython_typing.ReadableBuffer buf: The bytes to clock out. No assumption is made about color order
+//|     """
 //|     ...
 //|
 STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) {
diff --git a/shared-bindings/rainbowio/__init__.c b/shared-bindings/rainbowio/__init__.c
index 0dfdcd3a45..324f43198e 100644
--- a/shared-bindings/rainbowio/__init__.c
+++ b/shared-bindings/rainbowio/__init__.c
@@ -33,7 +33,8 @@
 //|
 //| def colorwheel(n: float) -> int:
 //|     """C implementation of the common colorwheel() function found in many examples.
-//|     Returns the colorwheel RGB value as an integer value for n (usable in neopixel and dotstar)."""
+//|     Returns the colorwheel RGB value as an integer value for n (usable in neopixel and dotstar).
+//|     """
 //|     ...
 //|
 STATIC mp_obj_t rainbowio_colorwheel(mp_obj_t n) {
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index fcf432931e..33cd9e90d0 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -47,6 +47,7 @@
 //| from typing import TypeVar
 //|
 //| _T = TypeVar("_T")
+//|
 
 //| def seed(seed: int) -> None:
 //|     """Sets the starting seed of the random  number generation. Further calls to
diff --git a/shared-bindings/rtc/__init__.c b/shared-bindings/rtc/__init__.c
index 64adfe7d9e..0220745c0f 100644
--- a/shared-bindings/rtc/__init__.c
+++ b/shared-bindings/rtc/__init__.c
@@ -36,6 +36,7 @@
 //| The `rtc` module provides support for a Real Time Clock. You can access and manage the
 //| RTC using :class:`rtc.RTC`. It also backs the :func:`time.time` and :func:`time.localtime`
 //| functions using the onboard RTC if present."""
+//|
 
 void rtc_reset(void) {
     MP_STATE_VM(rtc_time_source) = (mp_obj_t)&rtc_rtc_obj;
diff --git a/shared-bindings/sdcardio/SDCard.c b/shared-bindings/sdcardio/SDCard.c
index 960d4a733e..ce67834774 100644
--- a/shared-bindings/sdcardio/SDCard.c
+++ b/shared-bindings/sdcardio/SDCard.c
@@ -126,7 +126,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_deinit_obj, sdcardio_sdcard_deinit);
 
 
 //|     def readblocks(self, start_block: int, buf: WriteableBuffer) -> None:
-//|
 //|         """Read one or more blocks from the card
 //|
 //|         :param int start_block: The block to start reading from
@@ -166,7 +165,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_sync_obj, sdcardio_sdcard_sync);
 
 
 //|     def writeblocks(self, start_block: int, buf: ReadableBuffer) -> None:
-//|
 //|         """Write one or more blocks to the card
 //|
 //|         :param int start_block: The block to start writing from
diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c
index f4cc4a9bb1..776b20fafe 100644
--- a/shared-bindings/sdioio/SDCard.c
+++ b/shared-bindings/sdioio/SDCard.c
@@ -160,7 +160,6 @@ STATIC mp_obj_t sdioio_sdcard_count(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_count_obj, sdioio_sdcard_count);
 
 //|     def readblocks(self, start_block: int, buf: WriteableBuffer) -> None:
-//|
 //|         """Read one or more blocks from the card
 //|
 //|         :param int start_block: The block to start reading from
@@ -182,7 +181,6 @@ STATIC mp_obj_t sdioio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_
 MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_readblocks_obj, sdioio_sdcard_readblocks);
 
 //|     def writeblocks(self, start_block: int, buf: ReadableBuffer) -> None:
-//|
 //|         """Write one or more blocks to the card
 //|
 //|         :param int start_block: The block to start writing from
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index fbf78a4cdc..9d439b5bd4 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -379,7 +379,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4,
 //|     def settimeout(self, value: int) -> None:
 //|         """Set the timeout value for this socket.
 //|
-//|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely."""
+//|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely.
+//|         """
 //|         ...
 //|
 STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index f056c741f3..3023721378 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,6 +52,7 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socketpool_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);
 
diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c
index d6f4ad051c..e0e7911715 100644
--- a/shared-bindings/ssl/SSLSocket.c
+++ b/shared-bindings/ssl/SSLSocket.c
@@ -240,7 +240,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_send_obj, ssl_sslsocket_send);
 //|     def settimeout(self, value: int) -> None:
 //|         """Set the timeout value for this socket.
 //|
-//|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely."""
+//|         :param ~int value: timeout in seconds.  0 means non-blocking.  None means block indefinitely.
+//|         """
 //|         ...
 STATIC mp_obj_t ssl_sslsocket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c
index 9204c92790..6967860054 100644
--- a/shared-bindings/ssl/__init__.c
+++ b/shared-bindings/ssl/__init__.c
@@ -36,6 +36,7 @@
 //|
 //| |see_cpython_module| :mod:`cpython:ssl`.
 //| """
+//|
 
 //| def create_default_context() -> ssl.SSLContext:
 //|     """Return the default SSLContext."""
diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c
index 59bc78005d..5b63a15f15 100644
--- a/shared-bindings/struct/__init__.c
+++ b/shared-bindings/struct/__init__.c
@@ -46,6 +46,7 @@
 //|
 //| Supported format codes: *b*, *B*, *x*, *h*, *H*, *i*, *I*, *l*, *L*, *q*, *Q*,
 //| *s*, *P*, *f*, *d* (the latter 2 depending on the floating-point support)."""
+//|
 
 
 //| def calcsize(fmt: str) -> int:
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 37f35e2e18..2c84fbc0dd 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -59,6 +59,7 @@
 //| The status bar reports the current IP or BLE connection, what file is running,
 //| the last exception name and location, and firmware version information.
 //| This object is the sole instance of `supervisor.StatusBar`."""
+//|
 
 //| def reload() -> None:
 //|     """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL)."""
diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c
index 153587e919..3ad601eb39 100644
--- a/shared-bindings/traceback/__init__.c
+++ b/shared-bindings/traceback/__init__.c
@@ -37,6 +37,7 @@
 //| |see_cpython_module| :mod:`cpython:traceback`.
 //| """
 //| ...
+//|
 
 STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *print, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_exc, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain };
diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c
index 376be78ef1..40aa869225 100644
--- a/shared-bindings/uheap/__init__.c
+++ b/shared-bindings/uheap/__init__.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/uheap/__init__.h"
 
 //| """Heap size analysis"""
+//|
 
 //| def info(object: object) -> int:
 //|     """Prints memory debugging info for the given object and returns the
diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c
index 84d202945a..faeef23a88 100644
--- a/shared-bindings/usb/core/__init__.c
+++ b/shared-bindings/usb/core/__init__.c
@@ -40,6 +40,7 @@
 //|
 //| This is a subset of the PyUSB core module.
 //| """
+//|
 
 //| class USBError(OSError):
 //|     """Catchall exception for USB related errors."""
diff --git a/shared-bindings/usb_cdc/__init__.c b/shared-bindings/usb_cdc/__init__.c
index e23e289309..b4e712e854 100644
--- a/shared-bindings/usb_cdc/__init__.c
+++ b/shared-bindings/usb_cdc/__init__.c
@@ -62,6 +62,7 @@
 //| """A `Serial` object that can be used to send and receive binary data to and from
 //| the host.
 //| Note that `data` is *disabled* by default. ``data`` is ``None`` if disabled."""
+//|
 
 //| def disable() -> None:
 //|     """Do not present any USB CDC device to the host.
diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c
index 9cb9303143..5c61cc52de 100644
--- a/shared-bindings/usb_hid/__init__.c
+++ b/shared-bindings/usb_hid/__init__.c
@@ -47,6 +47,7 @@
 //| containing a `Device` that describes the boot device chosen (keyboard or mouse).
 //| The request for a boot device overrides any other HID devices.
 //| """
+//|
 
 //| def disable() -> None:
 //|     """Do not present any USB HID devices to the host computer.
diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c
index 982cd144da..d3d5cf2626 100644
--- a/shared-bindings/usb_midi/__init__.c
+++ b/shared-bindings/usb_midi/__init__.c
@@ -42,6 +42,7 @@
 //|
 //| ports: Tuple[Union[PortIn, PortOut], ...]
 //| """Tuple of all MIDI ports. Each item is ether `PortIn` or `PortOut`."""
+//|
 
 //| def disable() -> None:
 //|     """Disable presenting a USB MIDI device to the host.
diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c
index b42fb2a614..17bdcbb1c0 100644
--- a/shared-bindings/ustack/__init__.c
+++ b/shared-bindings/ustack/__init__.c
@@ -35,6 +35,7 @@
 
 
 //| """Stack information and analysis"""
+//|
 
 #if MICROPY_MAX_STACK_USAGE
 //| def max_stack_usage() -> int:
diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
index 87cd46ad9a..9896876a8a 100644
--- a/shared-bindings/vectorio/Circle.c
+++ b/shared-bindings/vectorio/Circle.c
@@ -24,7 +24,8 @@
 //|         :param int radius: The radius of the circle in pixels
 //|         :param int x: Initial x position of the axis.
 //|         :param int y: Initial y position of the axis.
-//|         :param int color_index: Initial color_index to use when selecting color from the palette."""
+//|         :param int color_index: Initial color_index to use when selecting color from the palette.
+//|         """
 static mp_obj_t vectorio_circle_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_radius, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index 6ad102e6e6..b188fc4955 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -32,7 +32,8 @@
 //|         :param List[Tuple[int,int]] points: Vertices for the polygon
 //|         :param int x: Initial screen x position of the 0,0 origin in the points list.
 //|         :param int y: Initial screen y position of the 0,0 origin in the points list.
-//|         :param int color_index: Initial color_index to use when selecting color from the palette."""
+//|         :param int color_index: Initial color_index to use when selecting color from the palette.
+//|         """
 static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_points_list, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
index a4f3e12e69..ad864f2c2d 100644
--- a/shared-bindings/vectorio/Rectangle.c
+++ b/shared-bindings/vectorio/Rectangle.c
@@ -25,7 +25,8 @@
 //|         :param int height: The number of pixels high
 //|         :param int x: Initial x position of the top left corner.
 //|         :param int y: Initial y position of the top left corner.
-//|         :param int color_index: Initial color_index to use when selecting color from the palette."""
+//|         :param int color_index: Initial color_index to use when selecting color from the palette.
+//|         """
 static mp_obj_t vectorio_rectangle_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_pixel_shader, ARG_width, ARG_height, ARG_x, ARG_y, ARG_color_index };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/watchdog/__init__.c b/shared-bindings/watchdog/__init__.c
index df55ab7c16..5281f1c3fc 100644
--- a/shared-bindings/watchdog/__init__.c
+++ b/shared-bindings/watchdog/__init__.c
@@ -49,6 +49,7 @@
 //|     w.timeout=2.5 # Set a timeout of 2.5 seconds
 //|     w.mode = WatchDogMode.RAISE
 //|     w.feed()"""
+//|
 
 //| class WatchDogTimeout(Exception):
 //|     """Exception raised when the watchdog timer is set to
diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c
index d9c2a01810..ba02914638 100644
--- a/shared-bindings/zlib/__init__.c
+++ b/shared-bindings/zlib/__init__.c
@@ -46,6 +46,7 @@
 //| The `zlib` module allows limited functionality similar to the CPython zlib library.
 //| This module allows to decompress binary data compressed with DEFLATE algorithm
 //| (commonly used in zlib library and gzip archiver). Compression is not yet implemented."""
+//|
 
 //| def zlib_decompress(
 //|     data: bytes, wbits: Optional[int] = 0, bufsize: Optional[int] = 0
diff --git a/tests/extmod/framebuf_subclass.py b/tests/extmod/framebuf_subclass.py
index a9e3c5efc7..4cd9ea4eb5 100644
--- a/tests/extmod/framebuf_subclass.py
+++ b/tests/extmod/framebuf_subclass.py
@@ -34,6 +34,7 @@ fb.pixel(2, 2, 0x0708)
 fb2.blit(fb, 0, 0)
 print(bytes(fb2))
 
+
 # Test that blitting something that isn't a subclass fails with TypeError.
 class NotAFrameBuf:
     pass
diff --git a/tests/extmod/uasyncio_exception.py b/tests/extmod/uasyncio_exception.py
index aae55d6320..4e4f978dc2 100644
--- a/tests/extmod/uasyncio_exception.py
+++ b/tests/extmod/uasyncio_exception.py
@@ -9,6 +9,7 @@ except ImportError:
         print("SKIP")
         raise SystemExit
 
+
 # main task raising an exception
 async def main():
     print("main start")
@@ -21,6 +22,7 @@ try:
 except ValueError as er:
     print("ValueError", er.args[0])
 
+
 # sub-task raising an exception
 async def task():
     print("task start")
@@ -40,6 +42,7 @@ try:
 except ValueError as er:
     print("ValueError", er.args[0])
 
+
 # main task raising an exception with sub-task not yet scheduled
 # TODO not currently working, task is never scheduled
 async def task():
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index 10e92d6940..935f01d24f 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -13,7 +13,6 @@ except AttributeError:
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 7c75a6d044..6094b5a6f1 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -13,7 +13,6 @@ except AttributeError:
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index 1b7b04ee63..f5de729402 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -12,7 +12,6 @@ except AttributeError:
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_oldproto.py b/tests/extmod/vfs_fat_oldproto.py
index e447ff4eb3..1998319dbe 100644
--- a/tests/extmod/vfs_fat_oldproto.py
+++ b/tests/extmod/vfs_fat_oldproto.py
@@ -13,7 +13,6 @@ except AttributeError:
 
 
 class RAMFS_OLD:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 4b79391102..a22d480dfd 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -13,7 +13,6 @@ except AttributeError:
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_ramdisklarge.py b/tests/extmod/vfs_fat_ramdisklarge.py
index 69d4a8cbbd..649a53db14 100644
--- a/tests/extmod/vfs_fat_ramdisklarge.py
+++ b/tests/extmod/vfs_fat_ramdisklarge.py
@@ -14,7 +14,6 @@ except AttributeError:
 
 
 class RAMBDevSparse:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/import/module_getattr.py b/tests/import/module_getattr.py
index df7a621815..9ca0d18455 100644
--- a/tests/import/module_getattr.py
+++ b/tests/import/module_getattr.py
@@ -8,6 +8,7 @@ try:
 except AttributeError:
     pass
 
+
 # define __getattr__
 def __getattr__(attr):
     if attr == "does_not_exist":
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/asmsum.py
index 6535a495d4..208709a25f 100644
--- a/tests/inlineasm/asmsum.py
+++ b/tests/inlineasm/asmsum.py
@@ -1,6 +1,5 @@
 @micropython.asm_thumb
 def asm_sum_words(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
@@ -25,7 +24,6 @@ def asm_sum_words(r0, r1):
 
 @micropython.asm_thumb
 def asm_sum_bytes(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
diff --git a/tests/micropython/const2.py b/tests/micropython/const2.py
index ed4720122e..d8b68c25f3 100644
--- a/tests/micropython/const2.py
+++ b/tests/micropython/const2.py
@@ -11,6 +11,7 @@ import micropython as X
 
 print(globals()["X"])
 
+
 # function name that matches a constant
 def X():
     print("function X", X)
@@ -18,6 +19,7 @@ def X():
 
 globals()["X"]()
 
+
 # arguments that match a constant
 def f(X, *Y, **Z):
     pass
@@ -25,6 +27,7 @@ def f(X, *Y, **Z):
 
 f(1)
 
+
 # class name that matches a constant
 class X:
     def f(self):
@@ -33,6 +36,7 @@ class X:
 
 globals()["X"]().f()
 
+
 # constant within a class
 class A:
     C1 = const(4)
diff --git a/tests/micropython/heapalloc_yield_from.py b/tests/micropython/heapalloc_yield_from.py
index 58788b1dbc..9507171890 100644
--- a/tests/micropython/heapalloc_yield_from.py
+++ b/tests/micropython/heapalloc_yield_from.py
@@ -2,6 +2,7 @@
 
 import micropython
 
+
 # Yielding from a function generator
 def sub_gen(a):
     for i in range(a):
@@ -18,6 +19,7 @@ print(next(g))
 print(next(g))
 micropython.heap_unlock()
 
+
 # Yielding from a user iterator
 class G:
     def __init__(self):
diff --git a/tests/micropython/native_closure.py b/tests/micropython/native_closure.py
index 07014e90da..8182cfea70 100644
--- a/tests/micropython/native_closure.py
+++ b/tests/micropython/native_closure.py
@@ -1,5 +1,6 @@
 # test native emitter can handle closures correctly
 
+
 # basic closure
 @micropython.native
 def f():
@@ -15,6 +16,7 @@ def f():
 
 print(f()())
 
+
 # closing over an argument
 @micropython.native
 def f(x):
@@ -28,6 +30,7 @@ def f(x):
 
 print(f(2)())
 
+
 # closing over an argument and a normal local
 @micropython.native
 def f(x):
diff --git a/tests/micropython/native_gen.py b/tests/micropython/native_gen.py
index fb42f9e25e..7ea45b1497 100644
--- a/tests/micropython/native_gen.py
+++ b/tests/micropython/native_gen.py
@@ -1,5 +1,6 @@
 # test for native generators
 
+
 # simple generator with yield and return
 @micropython.native
 def gen1(x):
@@ -16,6 +17,7 @@ try:
 except StopIteration as e:
     print(e.args[0])
 
+
 # using yield from
 @micropython.native
 def gen2(x):
diff --git a/tests/micropython/native_misc.py b/tests/micropython/native_misc.py
index f5ef807fe1..f40fcb2407 100644
--- a/tests/micropython/native_misc.py
+++ b/tests/micropython/native_misc.py
@@ -1,5 +1,6 @@
 # tests for natively compiled functions
 
+
 # basic test
 @micropython.native
 def native_test(x):
@@ -14,6 +15,7 @@ import gc
 gc.collect()
 native_test(3)
 
+
 # native with 2 args
 @micropython.native
 def f(a, b):
@@ -22,6 +24,7 @@ def f(a, b):
 
 f(1, 2)
 
+
 # native with 3 args
 @micropython.native
 def f(a, b, c):
@@ -30,6 +33,7 @@ def f(a, b, c):
 
 f(1, 2, 3)
 
+
 # check not operator
 @micropython.native
 def f(a):
diff --git a/tests/micropython/native_try.py b/tests/micropython/native_try.py
index 492b59085c..6a2152b28c 100644
--- a/tests/micropython/native_try.py
+++ b/tests/micropython/native_try.py
@@ -1,5 +1,6 @@
 # test native try handling
 
+
 # basic try-finally
 @micropython.native
 def f():
@@ -14,6 +15,7 @@ try:
 except NameError:
     print("NameError")
 
+
 # nested try-except with try-finally
 @micropython.native
 def f():
@@ -28,6 +30,7 @@ def f():
 
 f()
 
+
 # check that locals written to in try blocks keep their values
 @micropython.native
 def f():
diff --git a/tests/micropython/native_try_deep.py b/tests/micropython/native_try_deep.py
index 3d31248df0..26b9243e03 100644
--- a/tests/micropython/native_try_deep.py
+++ b/tests/micropython/native_try_deep.py
@@ -1,5 +1,6 @@
 # test native try handling
 
+
 # deeply nested try (9 deep)
 @micropython.native
 def f():
diff --git a/tests/micropython/native_with.py b/tests/micropython/native_with.py
index 4e20b23856..9c0b98af90 100644
--- a/tests/micropython/native_with.py
+++ b/tests/micropython/native_with.py
@@ -21,6 +21,7 @@ def f():
 
 f()
 
+
 # nested with and try-except
 @micropython.native
 def f():
diff --git a/tests/micropython/viper_args.py b/tests/micropython/viper_args.py
index 8e3225331a..27c73fa795 100644
--- a/tests/micropython/viper_args.py
+++ b/tests/micropython/viper_args.py
@@ -56,6 +56,7 @@ def f6(x1: int, x2: int, x3: int, x4: int, x5: int, x6: int):
 
 f6(1, 2, 3, 4, 5, 6)
 
+
 # test compiling *x, **x, * args (currently unsupported at runtime)
 @micropython.viper
 def f(*x, **y):
diff --git a/tests/micropython/viper_cond.py b/tests/micropython/viper_cond.py
index d5ebf837bd..752261ff50 100644
--- a/tests/micropython/viper_cond.py
+++ b/tests/micropython/viper_cond.py
@@ -10,6 +10,7 @@ def f():
 
 f()
 
+
 # using True as a conditional
 @micropython.viper
 def f():
@@ -20,6 +21,7 @@ def f():
 
 f()
 
+
 # using an int as a conditional
 @micropython.viper
 def g():
@@ -30,6 +32,7 @@ def g():
 
 g()
 
+
 # using an int as a conditional that has the lower 16-bits clear
 @micropython.viper
 def h():
diff --git a/tests/micropython/viper_misc.py b/tests/micropython/viper_misc.py
index 41389c751d..f9267f65ca 100644
--- a/tests/micropython/viper_misc.py
+++ b/tests/micropython/viper_misc.py
@@ -1,5 +1,6 @@
 import micropython
 
+
 # viper function taking and returning ints
 @micropython.viper
 def viper_int(x: int, y: int) -> int:
@@ -8,6 +9,7 @@ def viper_int(x: int, y: int) -> int:
 
 print(viper_int(1, 2))
 
+
 # viper function taking and returning objects
 @micropython.viper
 def viper_object(x: object, y: object) -> object:
@@ -16,6 +18,7 @@ def viper_object(x: object, y: object) -> object:
 
 print(viper_object(1, 2))
 
+
 # return None as non-object (should return 0)
 @micropython.viper
 def viper_ret_none() -> int:
@@ -24,6 +27,7 @@ def viper_ret_none() -> int:
 
 print(viper_ret_none())
 
+
 # return Ellipsis as object
 @micropython.viper
 def viper_ret_ellipsis() -> object:
@@ -32,6 +36,7 @@ def viper_ret_ellipsis() -> object:
 
 print(viper_ret_ellipsis())
 
+
 # 3 args
 @micropython.viper
 def viper_3args(a: int, b: int, c: int) -> int:
@@ -40,6 +45,7 @@ def viper_3args(a: int, b: int, c: int) -> int:
 
 print(viper_3args(1, 2, 3))
 
+
 # 4 args
 @micropython.viper
 def viper_4args(a: int, b: int, c: int, d: int) -> int:
@@ -49,6 +55,7 @@ def viper_4args(a: int, b: int, c: int, d: int) -> int:
 # viper call with 4 args not yet supported
 # print(viper_4args(1, 2, 3, 4))
 
+
 # a local (should have automatic type int)
 @micropython.viper
 def viper_local(x: int) -> int:
@@ -58,6 +65,7 @@ def viper_local(x: int) -> int:
 
 print(viper_local(3))
 
+
 # without type annotation, types should default to object
 @micropython.viper
 def viper_no_annotation(x, y):
@@ -66,6 +74,7 @@ def viper_no_annotation(x, y):
 
 print(viper_no_annotation(4, 5))
 
+
 # a for loop
 @micropython.viper
 def viper_for(a: int, b: int) -> int:
@@ -77,6 +86,7 @@ def viper_for(a: int, b: int) -> int:
 
 print(viper_for(10, 10000))
 
+
 # accessing a global
 @micropython.viper
 def viper_access_global():
@@ -87,6 +97,7 @@ def viper_access_global():
 
 print(viper_access_global(), gl)
 
+
 # calling print with object and int types
 @micropython.viper
 def viper_print(x, y: int):
@@ -95,6 +106,7 @@ def viper_print(x, y: int):
 
 viper_print(1, 2)
 
+
 # convert constants to objects in tuple
 @micropython.viper
 def viper_tuple_consts(x):
@@ -103,6 +115,7 @@ def viper_tuple_consts(x):
 
 print(viper_tuple_consts(0))
 
+
 # making a tuple from an object and an int
 @micropython.viper
 def viper_tuple(x, y: int):
@@ -111,6 +124,7 @@ def viper_tuple(x, y: int):
 
 print(viper_tuple(1, 2))
 
+
 # making a list from an object and an int
 @micropython.viper
 def viper_list(x, y: int):
@@ -119,6 +133,7 @@ def viper_list(x, y: int):
 
 print(viper_list(1, 2))
 
+
 # making a set from an object and an int
 @micropython.viper
 def viper_set(x, y: int):
@@ -127,6 +142,7 @@ def viper_set(x, y: int):
 
 print(sorted(list(viper_set(1, 2))))
 
+
 # raising an exception
 @micropython.viper
 def viper_raise(x: int):
@@ -138,6 +154,7 @@ try:
 except OSError as e:
     print(repr(e))
 
+
 # calling GC after defining the function
 @micropython.viper
 def viper_gc() -> int:
diff --git a/tests/micropython/viper_misc2.py b/tests/micropython/viper_misc2.py
index 8f0be487d6..cc77134bd4 100644
--- a/tests/micropython/viper_misc2.py
+++ b/tests/micropython/viper_misc2.py
@@ -1,5 +1,6 @@
 # Miscellaneous viper tests
 
+
 # Test correct use of registers in load and store
 @micropython.viper
 def expand(dest: ptr8, source: ptr8, length: int):
diff --git a/tests/micropython/viper_misc_intbig.py b/tests/micropython/viper_misc_intbig.py
index 055c08d8e5..91673f2c10 100644
--- a/tests/micropython/viper_misc_intbig.py
+++ b/tests/micropython/viper_misc_intbig.py
@@ -1,5 +1,6 @@
 import micropython
 
+
 # unsigned ints
 @micropython.viper
 def viper_uint() -> uint:
diff --git a/tests/micropython/viper_try.py b/tests/micropython/viper_try.py
index 61335af221..f5822a6682 100644
--- a/tests/micropython/viper_try.py
+++ b/tests/micropython/viper_try.py
@@ -1,5 +1,6 @@
 # test try handling within a viper function
 
+
 # basic try-finally
 @micropython.viper
 def f():
@@ -14,6 +15,7 @@ try:
 except NameError:
     print("NameError")
 
+
 # nested try-except with try-finally
 @micropython.viper
 def f():
@@ -28,6 +30,7 @@ def f():
 
 f()
 
+
 # check that locals written to in try blocks keep their values
 @micropython.viper
 def f():
diff --git a/tests/micropython/viper_types.py b/tests/micropython/viper_types.py
index 3af148171e..3e0a4f6640 100644
--- a/tests/micropython/viper_types.py
+++ b/tests/micropython/viper_types.py
@@ -2,6 +2,7 @@
 
 import micropython
 
+
 # converting incoming arg to bool
 @micropython.viper
 def f1(x: bool):
@@ -13,6 +14,7 @@ f1(1)
 f1([])
 f1([1])
 
+
 # taking and returning a bool
 @micropython.viper
 def f2(x: bool) -> bool:
@@ -22,6 +24,7 @@ def f2(x: bool) -> bool:
 print(f2([]))
 print(f2([1]))
 
+
 # converting to bool within function
 @micropython.viper
 def f3(x) -> bool:
diff --git a/tests/micropython/viper_with.py b/tests/micropython/viper_with.py
index d640c8ae0f..40fbf6fb31 100644
--- a/tests/micropython/viper_with.py
+++ b/tests/micropython/viper_with.py
@@ -21,6 +21,7 @@ def f():
 
 f()
 
+
 # nested with and try-except
 @micropython.viper
 def f():
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index cff1894106..1c3706ec33 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -111,6 +111,7 @@ try:
 except NotImplementedError:
     print("NotImplementedError")
 
+
 # can't assign attributes to a function
 def f():
     pass
@@ -127,6 +128,7 @@ try:
 except TypeError:
     print("TypeError")
 
+
 # test when object explicitly listed at not-last position in parent tuple
 # this is not compliant with CPython because of illegal MRO
 class A:
@@ -140,6 +142,7 @@ class B(object, A):
 
 B().foo()
 
+
 # can't assign property (or other special accessors) to already-subclassed class
 class A:
     pass
diff --git a/tests/misc/sys_settrace_generator.py b/tests/misc/sys_settrace_generator.py
index 43065df4ae..1199f1f4eb 100644
--- a/tests/misc/sys_settrace_generator.py
+++ b/tests/misc/sys_settrace_generator.py
@@ -48,11 +48,9 @@ def test_generator():
     gen = make_gen()
     r = 0
     try:
-
         r += gen.send(None)
 
         while True:
-
             r += gen.send(None)
 
     except StopIteration as e:
diff --git a/tests/misc/sys_settrace_subdir/sys_settrace_generic.py b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
index a60ca955d7..fcf034af25 100644
--- a/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
@@ -1,5 +1,6 @@
 print("Now comes the language constructions tests.")
 
+
 # function
 def test_func():
     def test_sub_func():
diff --git a/tests/perf_bench/bm_nqueens.py b/tests/perf_bench/bm_nqueens.py
index 773dd3f7ed..160f1178aa 100644
--- a/tests/perf_bench/bm_nqueens.py
+++ b/tests/perf_bench/bm_nqueens.py
@@ -5,6 +5,7 @@
 # author: collinwinter@google.com (Collin Winter)
 # n_queens function: Copyright 2009 Raymond Hettinger
 
+
 # Pure-Python implementation of itertools.permutations().
 def permutations(iterable, r=None):
     """permutations(range(3), 2) --> (0,1) (0,2) (1,0) (1,2) (2,0) (2,1)"""
diff --git a/tests/perf_bench/misc_aes.py b/tests/perf_bench/misc_aes.py
index 0743737cb7..8a9c58bb38 100644
--- a/tests/perf_bench/misc_aes.py
+++ b/tests/perf_bench/misc_aes.py
@@ -33,6 +33,7 @@ aes_s_box_table = bytes((
 ))
 # fmt: on
 
+
 # multiplication of polynomials modulo x^8 + x^4 + x^3 + x + 1 = 0x11b
 def aes_gf8_mul_2(x):
     if x & 0x80:
@@ -64,6 +65,7 @@ def aes_r_con(a):
 ##################################################################
 # basic AES algorithm; see FIPS-197
 
+
 # all inputs must be size 16
 def aes_add_round_key(state, w):
     for i in range(16):
diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 606fc3b772..24f6d5a771 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -26,7 +26,6 @@ def run_tests(pyb, test_dict):
     for base_test, tests in sorted(test_dict.items()):
         print(base_test + ":")
         for test_file in tests:
-
             # run MicroPython
             if pyb is None:
                 # run on PC
diff --git a/tests/stress/qstr_limit.py b/tests/stress/qstr_limit.py
index d8ce0cf7cd..08b10a039f 100644
--- a/tests/stress/qstr_limit.py
+++ b/tests/stress/qstr_limit.py
@@ -17,6 +17,7 @@ for l in range(254, 259):
         continue
     print(var in g)
 
+
 # calling a function with kwarg
 def f(**k):
     print(k)
@@ -36,6 +37,7 @@ for l in range(254, 259):
     except RuntimeError:
         print("RuntimeError", l)
 
+
 # hasattr, setattr, getattr
 class A:
     pass
diff --git a/tests/stress/recursive_gen.py b/tests/stress/recursive_gen.py
index 8c21397658..e051abb84d 100644
--- a/tests/stress/recursive_gen.py
+++ b/tests/stress/recursive_gen.py
@@ -1,5 +1,6 @@
 # test deeply recursive generators
 
+
 # simple "yield from" recursion
 def gen():
     yield from gen()
@@ -10,6 +11,7 @@ try:
 except RuntimeError:
     print("RuntimeError")
 
+
 # recursion via an iterator over a generator
 def gen2():
     for x in gen2():
diff --git a/tests/thread/mutate_bytearray.py b/tests/thread/mutate_bytearray.py
index 9b52e0c016..7bacabec3a 100644
--- a/tests/thread/mutate_bytearray.py
+++ b/tests/thread/mutate_bytearray.py
@@ -9,6 +9,7 @@ import _thread
 # the shared bytearray
 ba = bytearray()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_dict.py b/tests/thread/mutate_dict.py
index 0840dcafba..fb87190e77 100644
--- a/tests/thread/mutate_dict.py
+++ b/tests/thread/mutate_dict.py
@@ -9,6 +9,7 @@ import _thread
 # the shared dict
 di = {"a": "A", "b": "B", "c": "C", "d": "D"}
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_instance.py b/tests/thread/mutate_instance.py
index 8ba91cbde3..cc0ad9885d 100644
--- a/tests/thread/mutate_instance.py
+++ b/tests/thread/mutate_instance.py
@@ -6,6 +6,7 @@
 
 import _thread
 
+
 # the shared user class and instance
 class User:
     def __init__(self):
@@ -16,6 +17,7 @@ class User:
 
 user = User()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_list.py b/tests/thread/mutate_list.py
index 8ce15c0852..4df86b3008 100644
--- a/tests/thread/mutate_list.py
+++ b/tests/thread/mutate_list.py
@@ -9,6 +9,7 @@ import _thread
 # the shared list
 li = list()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_set.py b/tests/thread/mutate_set.py
index 61169b8aa9..587a3a259a 100644
--- a/tests/thread/mutate_set.py
+++ b/tests/thread/mutate_set.py
@@ -9,6 +9,7 @@ import _thread
 # the shared set
 se = set([-1, -2, -3, -4])
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index 673337563d..199fe3c88c 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -40,6 +40,7 @@ aes_s_box_table = bytes((
 ))
 # fmt: on
 
+
 # multiplication of polynomials modulo x^8 + x^4 + x^3 + x + 1 = 0x11b
 def aes_gf8_mul_2(x):
     if x & 0x80:
@@ -82,6 +83,7 @@ def aes_r_con(a):
 # using OCB, where the sequence is xored against the plaintext.
 # Care must be taken to (almost) always choose a different IV.
 
+
 # all inputs must be size 16
 def aes_add_round_key(state, w):
     for i in range(16):
diff --git a/tests/thread/thread_qstr1.py b/tests/thread/thread_qstr1.py
index 2099f94bdb..9e7d7f0326 100644
--- a/tests/thread/thread_qstr1.py
+++ b/tests/thread/thread_qstr1.py
@@ -10,6 +10,7 @@ except ImportError:
     import time
 import _thread
 
+
 # function to check the interned string
 def check(s, val):
     assert type(s) == str
diff --git a/tests/unicode/unicode_id.py b/tests/unicode/unicode_id.py
index 3a58e3f72b..32817287e9 100644
--- a/tests/unicode/unicode_id.py
+++ b/tests/unicode/unicode_id.py
@@ -10,6 +10,7 @@ bβ = 3
 βb = 4
 print(α, αβγ, bβ, βb)
 
+
 # function, argument, local identifiers
 def α(β, γ):
     δ = β + γ
@@ -18,6 +19,7 @@ def α(β, γ):
 
 α(1, 2)
 
+
 # class, method identifiers
 class φ:
     def __init__(self):
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 223c2bad45..f76e5f0681 100644
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -71,6 +71,7 @@ EXCLUSIONS = [
     "ports/raspberrypi/lwip_src",
 ]
 
+
 # None of the standard Python path matching routines implement the matching
 # we want, which is most like git's "pathspec" version of globs.
 # In particular, we want "**/" to match all directories.
diff --git a/tools/extract_pyi.py b/tools/extract_pyi.py
index 5f4f9c9561..e6bc703c02 100644
--- a/tools/extract_pyi.py
+++ b/tools/extract_pyi.py
@@ -215,7 +215,7 @@ def convert_folder(top_level, stub_directory):
         return (ok, total)
 
     error = False
-    for (level, msg) in find_stub_issues(tree):
+    for level, msg in find_stub_issues(tree):
         if level == "ERROR":
             error = True
         print(f"[{level}] {msg}")
diff --git a/tools/gen_crt_bundle.py b/tools/gen_crt_bundle.py
index eb314bf25e..da0d8837a9 100755
--- a/tools/gen_crt_bundle.py
+++ b/tools/gen_crt_bundle.py
@@ -72,7 +72,6 @@ class CertificateBundle:
             os.remove(ca_bundle_bin_file)
 
     def add_from_path(self, crts_path):
-
         found = False
         for file_path in os.listdir(crts_path):
             found |= self.add_from_file(os.path.join(crts_path, file_path))
@@ -161,7 +160,6 @@ class CertificateBundle:
         return bundle
 
     def add_with_filter(self, crts_path, filter_path):
-
         filter_set = set()
         with open(filter_path, "r", encoding="utf-8") as f:
             csv_reader = csv.reader(f, delimiter=",")
diff --git a/tools/gendoc.py b/tools/gendoc.py
index bf79b3cf5f..f3df853e49 100644
--- a/tools/gendoc.py
+++ b/tools/gendoc.py
@@ -11,6 +11,7 @@ import argparse
 import re
 import markdown
 
+
 # given a list of (name,regex) pairs, find the first one that matches the given line
 def re_match_first(regexs, line):
     for name, regex in regexs:
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 32b064d35f..02ea656c99 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -107,6 +107,7 @@ MP_BC_LOAD_GLOBAL = 0x12
 MP_BC_LOAD_ATTR = 0x13
 MP_BC_STORE_ATTR = 0x18
 
+
 # this function mirrors that in py/bc.c
 def mp_opcode_format(bytecode, ip, count_var_uint):
     opcode = bytecode[ip]
diff --git a/tools/preprocess_frozen_modules.py b/tools/preprocess_frozen_modules.py
index 30263d2e02..6c41c4cd43 100755
--- a/tools/preprocess_frozen_modules.py
+++ b/tools/preprocess_frozen_modules.py
@@ -46,7 +46,6 @@ def version_string(path=None, *, valid_semver=False):
 # with actual version info derived from git.
 def copy_and_process(in_dir, out_dir):
     for root, subdirs, files in os.walk(in_dir):
-
         # Skip library examples directory and subfolders.
         relative_path_parts = Path(root).relative_to(in_dir).parts
         if relative_path_parts and relative_path_parts[0] in [

From 9c430d45d15ef2f3a63459d12831343e0e45677a Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:27:55 +0530
Subject: [PATCH 1756/2403] use truthiness of the object itself instead of
 `any`

---
 ports/espressif/bindings/espnow/ESPNow.c | 37 ++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index b67574360c..d50c41c7c7 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -561,20 +561,6 @@ STATIC mp_obj_t espnow_recv(mp_obj_t self_in, mp_obj_t buffers) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_recv_obj, espnow_recv);
 
-//|     any: bool
-//|     """`True` if data is available to read from the buffers."""
-//|
-STATIC mp_obj_t espnow_get_any(const mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    return ringbuf_num_filled(self->recv_buffer) ? mp_const_true : mp_const_false;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_any_obj, espnow_get_any);
-
-MP_PROPERTY_GETTER(espnow_any_obj,
-    (mp_obj_t)&espnow_get_any_obj);
-
 // --- Peer Management Functions ---
 
 // Common code for add_peer() and mod_peer() to process the args.
@@ -826,7 +812,6 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     // Send and receive messages
     { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_any),         MP_ROM_PTR(&espnow_any_obj) },
 
     // Peer management functions
     { MP_ROM_QSTR(MP_QSTR_add_peer),    MP_ROM_PTR(&espnow_add_peer_obj) },
@@ -864,6 +849,27 @@ STATIC const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
+//|     def __bool__(self) -> bool:
+//|         """``True`` if `len()` is greater than zero.
+//|         This is an easy way to check if the buffer is empty.
+//|         """
+//|         ...
+//|     def __len__(self) -> int:
+//|         """Return the number of `bytes` available to read. Used to implement ``len()``."""
+//|         ...
+STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t len = ringbuf_num_filled(self->recv_buffer);
+    switch (op) {
+        case MP_UNARY_OP_BOOL:
+            return mp_obj_new_bool(len != 0);
+        case MP_UNARY_OP_LEN:
+            return mp_obj_new_int_from_uint(len);
+        default:
+            return MP_OBJ_NULL;      // op not supported
+    }
+}
+
 const mp_obj_type_t espnow_type = {
     { &mp_type_type },
     .name = MP_QSTR_ESPNow,
@@ -872,5 +878,6 @@ const mp_obj_type_t espnow_type = {
     .flags = MP_TYPE_FLAG_EXTENDED,
     MP_TYPE_EXTENDED_FIELDS(
         .protocol = &espnow_stream_p,
+        .unary_op = &espnow_unary_op
         ),
 };

From 3fdebd4f608a0973b3de6303a1367fbe12cd1575 Mon Sep 17 00:00:00 2001
From: Kamil Tomaszewski 
Date: Wed, 1 Feb 2023 12:37:29 +0100
Subject: [PATCH 1757/2403] spresense: Add HDR camera support

---
 ports/cxd56/common-hal/camera/Camera.c | 36 +++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/ports/cxd56/common-hal/camera/Camera.c b/ports/cxd56/common-hal/camera/Camera.c
index f304ed8f74..606ad0f1e6 100644
--- a/ports/cxd56/common-hal/camera/Camera.c
+++ b/ports/cxd56/common-hal/camera/Camera.c
@@ -47,7 +47,7 @@ typedef struct {
     uint16_t height;
 } image_size_t;
 
-STATIC const image_size_t image_size_table[] = {
+STATIC const image_size_t isx012_image_size_table[] = {
     { VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA },
     { VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA },
     { VIDEO_HSIZE_HD, VIDEO_VSIZE_HD },
@@ -57,12 +57,40 @@ STATIC const image_size_t image_size_table[] = {
     { VIDEO_HSIZE_5M, VIDEO_VSIZE_5M },
 };
 
+STATIC const image_size_t isx019_image_size_table[] = {
+    { VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA },
+    { VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA },
+    { VIDEO_HSIZE_HD, VIDEO_VSIZE_HD },
+    { VIDEO_HSIZE_QUADVGA, VIDEO_VSIZE_QUADVGA },
+};
+
+static const char *get_imgsensor_name() {
+    static struct v4l2_capability cap;
+
+    ioctl(camera_dev.fd, VIDIOC_QUERYCAP, (unsigned long)&cap);
+
+    return (const char *)cap.driver;
+}
+
 static bool camera_check_width_and_height(uint16_t width, uint16_t height) {
-    for (int i = 0; i < MP_ARRAY_SIZE(image_size_table); i++) {
-        if (image_size_table[i].width == width && image_size_table[i].height == height) {
-            return true;
+    const char *sensor;
+
+    sensor = get_imgsensor_name();
+
+    if (strncmp(sensor, "ISX012", strlen("ISX012")) == 0) {
+        for (int i = 0; i < MP_ARRAY_SIZE(isx012_image_size_table); i++) {
+            if (isx012_image_size_table[i].width == width && isx012_image_size_table[i].height == height) {
+                return true;
+            }
+        }
+    } else if (strncmp(sensor, "ISX019", strlen("ISX019"))) {
+        for (int i = 0; i < MP_ARRAY_SIZE(isx019_image_size_table); i++) {
+            if (isx019_image_size_table[i].width == width && isx019_image_size_table[i].height == height) {
+                return true;
+            }
         }
     }
+
     return false;
 }
 

From ae4bb75e295ac6f598ccc7802d446f67691cddfe Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:54:51 +0530
Subject: [PATCH 1758/2403] split espnow between bindings and common-hal

---
 locale/circuitpython.pot                      |   6 +
 ports/espressif/Makefile                      |   4 +-
 ports/espressif/bindings/espnow/ESPNow.c      | 349 ++----------------
 .../espressif/bindings/espnow/ESPNowPacket.c  |  70 ++++
 .../espressif/bindings/espnow/ESPNowPacket.h  |  30 ++
 ports/espressif/bindings/espnow/__init__.c    |   7 +-
 ports/espressif/common-hal/espnow/ESPNow.c    | 327 ++++++++++++++++
 ports/espressif/common-hal/espnow/ESPNow.h    |  57 +++
 8 files changed, 539 insertions(+), 311 deletions(-)
 create mode 100644 ports/espressif/bindings/espnow/ESPNowPacket.c
 create mode 100644 ports/espressif/bindings/espnow/ESPNowPacket.h
 create mode 100644 ports/espressif/common-hal/espnow/ESPNow.c
 create mode 100644 ports/espressif/common-hal/espnow/ESPNow.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index cca9e1b067..1b44383086 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -491,6 +491,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -2431,6 +2432,7 @@ msgid "addresses is empty"
 msgstr ""
 
 #: ports/espressif/bindings/espnow/ESPNow.c
+#: ports/espressif/common-hal/espnow/ESPNow.c
 msgid "an error occured"
 msgstr ""
 
@@ -3818,6 +3820,10 @@ msgstr ""
 msgid "peer already exists"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
+msgid "peer not found"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 92e91e808a..76d443dd68 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -260,7 +260,9 @@ CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
 ifneq ($(CIRCUITPY_ESPNOW),0)
-SRC_ESPNOW := $(wildcard bindings/espnow/*.c)
+SRC_ESPNOW := \
+	$(wildcard common-hal/espnow/*.c) \
+	$(wildcard bindings/espnow/*.c)
 SRC_C += $(SRC_ESPNOW)
 endif
 
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index d50c41c7c7..b120b2cdff 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -41,57 +41,8 @@
 #include "bindings/espnow/ESPNow.h"
 
 #include "shared-bindings/util.h"
-#include "shared-bindings/wifi/__init__.h"
 
-#define ESPNOW_MAGIC 0x99
-
-// The maximum length of an espnow packet (bytes)
-#define MAX_PACKET_LEN (sizeof(espnow_packet_t) + ESP_NOW_MAX_DATA_LEN)
-
-// Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
-// Will allocate an additional 7 bytes for buffer overhead
-#define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
-
-// Default timeout (millisec) to wait for incoming ESPNow messages (5 minutes).
-#define DEFAULT_RECV_TIMEOUT_MS (5 * 60 * 1000)
-
-// Time to wait (millisec) for responses from sent packets: (2 seconds).
-#define DEFAULT_SEND_TIMEOUT_MS (2 * 1000)
-
-// Number of milliseconds to wait for pending responses to sent packets.
-// This is a fallback which should never be reached.
-#define PENDING_RESPONSES_TIMEOUT_MS    100
-#define PENDING_RESPONSES_BUSY_POLL_MS  10
-
-// ESPNow packet format for the receive buffer.
-// Use this for peeking at the header of the next packet in the buffer.
-typedef struct {
-    uint8_t magic;              // = ESPNOW_MAGIC
-    uint8_t msg_len;            // Length of the message
-    uint32_t time_ms;           // Timestamp (ms) when packet is received
-    int8_t rssi;                // RSSI value (dBm) (-127 to 0)
-} __attribute__((packed)) espnow_header_t;
-
-typedef struct {
-    espnow_header_t header;     // The header
-    uint8_t peer[6];            // Peer address
-    uint8_t msg[0];             // Message is up to 250 bytes
-} __attribute__((packed)) espnow_packet_t;
-
-// The data structure for the espnow_singleton.
-typedef struct _espnow_obj_t {
-    mp_obj_base_t base;
-    ringbuf_t *recv_buffer;         // A buffer for received packets
-    size_t recv_buffer_size;        // The size of the recv_buffer
-    wifi_phy_rate_t phy_rate;       // The ESP-NOW physical layer rate.
-    volatile size_t rx_packets;     // # of received packets
-    volatile size_t rx_failures;    // # of dropped packets (buffer full)
-    size_t tx_packets;              // # of sent packets
-    volatile size_t tx_responses;   // # of sent packet responses received
-    volatile size_t tx_failures;    // # of sent packet responses failed
-    size_t peers_count;             // Cache the # of peers for send(sync=True)
-    mp_obj_t peers_table;           // A dictionary of discovered peers
-} espnow_obj_t;
+#include "common-hal/espnow/ESPNow.h"
 
 static void check_esp_err(esp_err_t status) {
     if (status != ESP_OK) {
@@ -101,154 +52,59 @@ static void check_esp_err(esp_err_t status) {
 
 // --- Initialisation and Config functions ---
 
-// Return a pointer to the ESPNow module singleton
-static espnow_obj_t *_get_singleton(void) {
-    return MP_STATE_PORT(espnow_singleton);
-}
-
-static bool espnow_deinited(espnow_obj_t *self) {
-    return self->recv_buffer == NULL;
-}
-
 static void check_for_deinit(espnow_obj_t *self) {
-    if (espnow_deinited(self)) {
+    if (common_hal_espnow_deinited(self)) {
         raise_deinited_error();
     }
 }
 
-static void _set_buffer_size(espnow_obj_t *self, mp_int_t value) {
-    self->recv_buffer_size = mp_arg_validate_int_min(value, MAX_PACKET_LEN, MP_QSTR_buffer_size);
-};
-
-static void _set_phy_rate(espnow_obj_t *self, mp_int_t value) {
-    self->phy_rate = mp_arg_validate_int_range(value, 0, WIFI_PHY_RATE_MAX - 1, MP_QSTR_phy_rate);
-};
-
 //| class ESPNow:
 //|     """Provides access to the ESP-NOW protocol."""
 //|
 //|     def __init__(self, buffer_size: Optional[int], phy_rate: Optional[int]) -> None:
 //|         """Allocate and initialize `ESPNow` instance as a singleton.
 //|
-//|         :param int buffer_size: The size of the internal ring buffer (length > 263 bytes). Default: 526 bytes.
-//|         :param int phy_rate: The ESP-NOW physical layer rate. Default 1 Mbps."""
+//|         :param int buffer_size: The size of the internal ring buffer. Default: 526 bytes.
+//|         :param int phy_rate: The ESP-NOW physical layer rate. Default: 1 Mbps."""
 //|         ...
 STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer_size, ARG_phy_rate };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_buffer_size,  MP_ARG_INT, { .u_int = DEFAULT_RECV_BUFFER_SIZE } },
+        { MP_QSTR_buffer_size,  MP_ARG_INT, { .u_int = 526 } },
         { MP_QSTR_phy_rate,     MP_ARG_INT, { .u_int = WIFI_PHY_RATE_1M_L } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    espnow_obj_t *self = _get_singleton();
+    espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
 
-    if (self == NULL) {
-        self = m_new_obj(espnow_obj_t);
-        self->base.type = &espnow_type;
-
-        _set_buffer_size(self, args[ARG_buffer_size].u_int);
-        _set_phy_rate(self, args[ARG_phy_rate].u_int);
-
-        self->peers_table = mp_obj_new_dict(0);
-
-        // Prevent user code modifying the dict
-        mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
-
-        // Set the global singleton pointer for the espnow protocol.
-        MP_STATE_PORT(espnow_singleton) = self;
+    if (self != NULL) {
+        mp_raise_RuntimeError(translate("Already running"));
     }
 
+    self = m_new_obj(espnow_obj_t);
+    self->base.type = &espnow_type;
+
+    common_hal_espnow_set_buffer_size(self, args[ARG_buffer_size].u_int);
+    common_hal_espnow_set_phy_rate(self, args[ARG_phy_rate].u_int);
+
+    self->peers_table = mp_obj_new_dict(0);
+
+    // Prevent user code modifying the dict
+    mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
+
+    // Set the global singleton pointer for the espnow protocol.
+    MP_STATE_PORT(espnow_singleton) = self;
+
+    common_hal_espnow_init(self);
+
     return self;
 }
 
-// --- The ESP-NOW send and recv callback routines ---
-
-// Callback triggered when a sent packet is acknowledged by the peer (or not).
-// Just count the number of responses and number of failures.
-// These are used in the send() logic.
-static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
-    espnow_obj_t *self = _get_singleton();
-    self->tx_responses++;
-    if (status != ESP_NOW_SEND_SUCCESS) {
-        self->tx_failures++;
-    }
-}
-
-static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg);
-
-// Callback triggered when an ESP-NOW packet is received.
-// Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
-// If the buffer is full, drop the message and increment the dropped count.
-static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
-    espnow_obj_t *self = _get_singleton();
-    ringbuf_t *buf = self->recv_buffer;
-
-    if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
-        self->rx_failures++;
-        return;
-    }
-
-    espnow_header_t header;
-    header.magic = ESPNOW_MAGIC;
-    header.msg_len = msg_len;
-    header.rssi = _get_rssi_from_wifi_packet(msg);
-    header.time_ms = mp_hal_ticks_ms();
-
-    ringbuf_put_n(buf, (uint8_t *)&header, sizeof(header));
-    ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
-    ringbuf_put_n(buf, msg, msg_len);
-
-    self->rx_packets++;
-}
-
-// Initialize the ESP-NOW software stack,
-// register callbacks and allocate the recv data buffers.
-static void espnow_init(espnow_obj_t *self) {
-    if (espnow_deinited(self)) {
-        self->recv_buffer = m_new_obj(ringbuf_t);
-        if (!ringbuf_alloc(self->recv_buffer, self->recv_buffer_size, true)) {
-            m_malloc_fail(self->recv_buffer_size);
-        }
-
-        if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
-            common_hal_wifi_init(false);
-            common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
-        }
-
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, self->phy_rate));
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, self->phy_rate));
-
-        check_esp_err(esp_now_init());
-        check_esp_err(esp_now_register_send_cb(send_cb));
-        check_esp_err(esp_now_register_recv_cb(recv_cb));
-    }
-}
-
-// De-initialize the ESP-NOW software stack,
-// disable callbacks and deallocate the recv data buffers.
-static void espnow_deinit(espnow_obj_t *self) {
-    if (self != NULL && !espnow_deinited(self)) {
-        check_esp_err(esp_now_unregister_send_cb());
-        check_esp_err(esp_now_unregister_recv_cb());
-        check_esp_err(esp_now_deinit());
-        self->recv_buffer->buf = NULL;
-        self->recv_buffer = NULL;
-        self->peers_count = 0; // esp_now_deinit() removes all peers.
-        self->tx_packets = self->tx_responses;
-    }
-}
-
-void espnow_reset(void) {
-    espnow_deinit(_get_singleton());
-    MP_STATE_PORT(espnow_singleton) = NULL;
-}
-
 // Return C pointer to byte memory string/bytes/bytearray in obj.
 // Raise ValueError if the length does not match expected len.
-static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
+static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(obj, &bufinfo, rw);
     mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
@@ -261,7 +117,8 @@ static uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
 //|         :param ReadableBuffer pmk: The ESP-NOW Primary Master Key (length = 16 bytes)."""
 //|         ...
 STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
-    check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN, MP_BUFFER_READ)));
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_set_pmk(self, _get_bytes_len(key, ESP_NOW_KEY_LEN, MP_BUFFER_READ));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
@@ -271,13 +128,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 //|
 STATIC mp_obj_t espnow_get_active(const mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(!espnow_deinited(self));
+    return mp_obj_new_bool(!common_hal_espnow_deinited(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_active_obj, espnow_get_active);
 
 STATIC mp_obj_t espnow_set_active(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_is_true(value) ? espnow_init(self) : espnow_deinit(self);
+    mp_obj_is_true(value) ? common_hal_espnow_init(self) : common_hal_espnow_deinit(self);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_active_obj, espnow_set_active);
@@ -298,7 +155,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_buffer_size_obj, espnow_get_buffer_size);
 
 STATIC mp_obj_t espnow_set_buffer_size(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    _set_buffer_size(self, mp_obj_get_int(value));
+    common_hal_espnow_set_buffer_size(self, mp_obj_get_int(value));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_buffer_size_obj, espnow_set_buffer_size);
@@ -318,7 +175,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_phy_rate_obj, espnow_get_phy_rate);
 
 STATIC mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    _set_phy_rate(self, mp_obj_get_int(value));
+    common_hal_espnow_set_phy_rate(self, mp_obj_get_int(value));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_phy_rate_obj, espnow_set_phy_rate);
@@ -368,36 +225,6 @@ static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
     return wifi_packet->rx_ctrl.rssi;
 }
 
-// Lookup a peer in the peers table and return a reference to the item in the peers_table.
-// Add peer to the table if it is not found (may alloc memory). Will not return NULL.
-static mp_map_elem_t *_lookup_add_peer(espnow_obj_t *self, const uint8_t *peer) {
-    // We do not want to allocate any new memory in the case that the peer
-    // already exists in the peers_table (which is almost all the time).
-    // So, we use a byte string on the stack and look that up in the dict.
-    mp_map_t *map = mp_obj_dict_get_map(self->peers_table);
-    mp_obj_str_t peer_obj = {{&mp_type_bytes}, 0, ESP_NOW_ETH_ALEN, peer};
-    mp_map_elem_t *item = mp_map_lookup(map, &peer_obj, MP_MAP_LOOKUP);
-    if (item == NULL) {
-        // If not found, add the peer using a new bytestring
-        map->is_fixed = 0;      // Allow to modify the dict
-        mp_obj_t new_peer = mp_obj_new_bytes(peer, ESP_NOW_ETH_ALEN);
-        item = mp_map_lookup(map, new_peer, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
-        item->value = mp_obj_new_list(2, NULL);
-        map->is_fixed = 1;      // Relock the dict
-    }
-    return item;
-}
-
-// Update the peers table with the new rssi value from a received packet and
-// return a reference to the item in the peers_table.
-static void _update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
-    // Lookup the peer in the device table
-    mp_map_elem_t *item = _lookup_add_peer(self, peer);
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
-    list->items[0] = MP_OBJ_NEW_SMALL_INT(rssi);
-    list->items[1] = mp_obj_new_int(time_ms);
-}
-
 // --- Handling espnow packets in the recv buffer ---
 
 // --- Send and Receive ESP-NOW data ---
@@ -408,22 +235,6 @@ static const uint8_t *_get_peer_addr(mp_obj_t mac) {
     return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
 }
 
-// Used by espnow_send() for sends() with sync==True.
-// Wait till all pending sent packet responses have been received.
-// ie. self->tx_responses == self->tx_packets.
-static void _wait_for_pending_responses(espnow_obj_t *self) {
-    mp_uint_t t, start = mp_hal_ticks_ms();
-    while (self->tx_responses < self->tx_packets) {
-        if ((t = mp_hal_ticks_ms() - start) > PENDING_RESPONSES_TIMEOUT_MS) {
-            mp_raise_OSError(MP_ETIMEDOUT);
-        }
-        if (t > PENDING_RESPONSES_BUSY_POLL_MS) {
-            // After 10ms of busy waiting give other tasks a look in.
-            RUN_BACKGROUND_TASKS;
-        }
-    }
-}
-
 //|     def send(
 //|         self,
 //|         message: ReadableBuffer,
@@ -458,106 +269,26 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     check_for_deinit(self);
 
     const bool sync = mp_obj_is_true(args[ARG_sync].u_obj);
-
-    if (sync) {
-        // Flush out any pending responses.
-        // If the last call was sync == False there may be outstanding responses
-        // still to be received (possible many if we just had a burst of unsync send()s).
-        // We need to wait for all pending responses if this call has sync = True.
-        _wait_for_pending_responses(self);
-    }
-
     const uint8_t *peer_addr = _get_peer_addr(args[ARG_mac].u_obj);
 
     // Get a pointer to the data buffer of the message
     mp_buffer_info_t message;
     mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
 
-    // Send the packet - try, try again if internal esp-now buffers are full.
-    esp_err_t err;
-    size_t saved_failures = self->tx_failures;
-    mp_uint_t start = mp_hal_ticks_ms();
-
-    while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(peer_addr, message.buf, message.len))) &&
-           (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
-        RUN_BACKGROUND_TASKS;
-    }
-    check_esp_err(err);
-
-    // Increment the sent packet count.
-    // If peer_addr == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
-    self->tx_packets += ((peer_addr == NULL) ? self->peers_count : 1);
-
-    if (sync) {
-        // Wait for and tally all the expected responses from peers
-        _wait_for_pending_responses(self);
-    }
-
-    // Return False if sync and any peers did not respond.
-    return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
+    return common_hal_espnow_send(self, sync, peer_addr, &message);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 
-//|     def recv(self, buffers: List[WriteableBuffer]) -> int:
-//|         """Loads mac, message, rssi and timestamp into the provided buffers.
+//|     def recv(self) -> Optional[ESPNowPacket]:
+//|         """Receive a message from the peer(s).
 //|
-//|         If buffers is 2 elements long, the mac and message will be
-//|         loaded into the 1st and 2nd elements.
-//|         If buffers is 4 elements long, the rssi and timestamp values will be
-//|         loaded into the 3rd and 4th elements.
-//|
-//|         :param List[WriteableBuffer] buffers: List of buffers to be loaded.
-//|
-//|         :returns: Length of the message."""
+//|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
 //|         ...
 STATIC mp_obj_t espnow_recv(mp_obj_t self_in, mp_obj_t buffers) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(buffers);
-    if (!mp_obj_is_type(list, &mp_type_list) || list->len < 2) {
-        mp_arg_error_invalid(MP_QSTR_buffers);
-    }
-
-    mp_obj_array_t *msg = MP_OBJ_TO_PTR(list->items[1]);
-    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
-        msg->len += msg->free;   // Make all the space in msg array available
-        msg->free = 0;
-    }
-
-    uint8_t *peer_buf = _get_bytes_len(list->items[0], ESP_NOW_ETH_ALEN, MP_BUFFER_WRITE);
-    uint8_t *msg_buf = _get_bytes_len(msg, ESP_NOW_MAX_DATA_LEN, MP_BUFFER_WRITE);
-
-    // Read the packet header from the incoming buffer
-    espnow_header_t header;
-    if (!ringbuf_get_n(self->recv_buffer, (uint8_t *)&header, sizeof(header))) {
-        return MP_OBJ_NEW_SMALL_INT(0);
-    }
-
-    uint8_t msg_len = header.msg_len;
-
-    // Check the message packet header format and read the message data
-    if (header.magic != ESPNOW_MAGIC ||
-        msg_len > ESP_NOW_MAX_DATA_LEN ||
-        !ringbuf_get_n(self->recv_buffer, peer_buf, ESP_NOW_ETH_ALEN) ||
-        !ringbuf_get_n(self->recv_buffer, msg_buf, msg_len)) {
-        mp_arg_error_invalid(MP_QSTR_buffer);
-    }
-    if (mp_obj_is_type(msg, &mp_type_bytearray)) {
-        // Set the length of the message bytearray.
-        size_t size = msg->len + msg->free;
-        msg->len = msg_len;
-        msg->free = size - msg_len;
-    }
-
-    // Update rssi value in the peer device table
-    _update_rssi(self, peer_buf, header.rssi, header.time_ms);
-    if (list->len == 4) {
-        list->items[2] = MP_OBJ_NEW_SMALL_INT(header.rssi);
-        list->items[3] = mp_obj_new_int(header.time_ms);
-    }
-
-    return MP_OBJ_NEW_SMALL_INT(msg_len);
+    return common_hal_espnow_recv(self);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_recv_obj, espnow_recv);
 
@@ -581,7 +312,9 @@ static void _update_peer_info(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     memcpy(peer.peer_addr, _get_peer_addr(args[ARG_mac].u_obj), ESP_NOW_ETH_ALEN);
 
     if (modify) {
-        check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
+        if (esp_now_get_peer(peer.peer_addr, &peer) != ESP_OK) {
+            mp_raise_RuntimeError(translate("peer not found"));
+        }
     } else {
         if (esp_now_is_peer_exist(peer.peer_addr)) {
             mp_raise_RuntimeError(translate("peer already exists"));
@@ -593,7 +326,7 @@ static void _update_peer_info(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     const mp_obj_t channel = args[ARG_channel].u_obj;
     if (channel != mp_const_none) {
-        peer.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 1, 14, MP_QSTR_channel);
+        peer.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 0, 14, MP_QSTR_channel);
     }
 
     const mp_obj_t interface = args[ARG_interface].u_obj;
@@ -837,7 +570,7 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
     }
 
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return (espnow_deinited(self)) ? 0 :  // If not initialized
+    return (common_hal_espnow_deinited(self)) ? 0 :  // If not initialized
            arg ^ (
                // If no data in the buffer, unset the Read ready flag
                ((!ringbuf_num_filled(self->recv_buffer)) ? MP_STREAM_POLL_RD : 0) |
diff --git a/ports/espressif/bindings/espnow/ESPNowPacket.c b/ports/espressif/bindings/espnow/ESPNowPacket.c
new file mode 100644
index 0000000000..82fcfcce98
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNowPacket.c
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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 "bindings/espnow/ESPNowPacket.h"
+
+//| class ESPNowPacket:
+//|     """A packet retreived from ESP-NOW communication protocol"""
+//|
+//|     mac: ReadableBuffer
+//|     """The sender's mac address (length = 6 bytes)"""
+//|
+//|     msg: RedableBuffer
+//|     """The message sent by the peer (length <= 250 bytes)"""
+//|
+//|     rssi: int
+//|     """The received signal strength indication (in dBm from -127 to 0)"""
+//|
+//|     time: int
+//|     """The is the time in milliseconds since device last booted"""
+//|
+
+const mp_obj_namedtuple_type_t espnow_packet_type_obj = {
+    .base = {
+        .base = {
+            .type = &mp_type_type
+        },
+        .flags = MP_TYPE_FLAG_EXTENDED,
+        .name = MP_QSTR_ESPNowPacket,
+        .print = namedtuple_print,
+        .parent = &mp_type_tuple,
+        .make_new = namedtuple_make_new,
+        .attr = namedtuple_attr,
+        MP_TYPE_EXTENDED_FIELDS(
+            .unary_op = mp_obj_tuple_unary_op,
+            .binary_op = mp_obj_tuple_binary_op,
+            .subscr = mp_obj_tuple_subscr,
+            .getiter = mp_obj_tuple_getiter,
+            ),
+    },
+    .n_fields = 4,
+    .fields = {
+        MP_QSTR_mac,
+        MP_QSTR_msg,
+        MP_QSTR_rssi,
+        MP_QSTR_time,
+    },
+};
diff --git a/ports/espressif/bindings/espnow/ESPNowPacket.h b/ports/espressif/bindings/espnow/ESPNowPacket.h
new file mode 100644
index 0000000000..87fc51ee92
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNowPacket.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/objnamedtuple.h"
+extern const mp_obj_namedtuple_type_t espnow_packet_type_obj;
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index 5661885911..746e9696a9 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -28,6 +28,7 @@
 
 #include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
+#include "bindings/espnow/ESPNowPacket.h"
 
 //| """ESP-NOW Module
 //|
@@ -75,9 +76,11 @@
 
 STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module name
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) },
+    { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_espnow) },
+
     // module classes
-    { MP_ROM_QSTR(MP_QSTR_ESPNow), MP_ROM_PTR(&espnow_type) },
+    { MP_ROM_QSTR(MP_QSTR_ESPNow),      MP_ROM_PTR(&espnow_type) },
+    { MP_ROM_QSTR(MP_QSTR_ESPNowPacket),MP_ROM_PTR(&espnow_packet_type_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table);
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
new file mode 100644
index 0000000000..6e49f5f54a
--- /dev/null
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -0,0 +1,327 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2020 Nick Moore
+ * Copyright (c) 2018 shawwwn 
+ * Copyright (c) 2020-2021 Glenn Moloney @glenn20
+ * Copyright (c) 2023 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
+ * 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/mperrno.h"
+#include "py/runtime.h"
+
+#include "bindings/espnow/ESPNowPacket.h"
+#include "shared-bindings/wifi/__init__.h"
+
+#include "common-hal/espnow/ESPNow.h"
+
+#include "mphalport.h"
+
+#include "esp_now.h"
+
+#define ESPNOW_MAGIC 0x99
+
+// The maximum length of an espnow packet (bytes)
+#define MAX_PACKET_LEN (sizeof(espnow_packet_t) + ESP_NOW_MAX_DATA_LEN)
+
+// Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
+// Will allocate an additional 7 bytes for buffer overhead
+#define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
+
+// Time to wait (millisec) for responses from sent packets: (2 seconds).
+#define DEFAULT_SEND_TIMEOUT_MS (2 * 1000)
+
+// Number of milliseconds to wait for pending responses to sent packets.
+// This is a fallback which should never be reached.
+#define PENDING_RESPONSES_TIMEOUT_MS    100
+#define PENDING_RESPONSES_BUSY_POLL_MS  10
+
+// ESPNow packet format for the receive buffer.
+// Use this for peeking at the header of the next packet in the buffer.
+typedef struct {
+    uint8_t magic;              // = ESPNOW_MAGIC
+    uint8_t msg_len;            // Length of the message
+    uint32_t time_ms;           // Timestamp (ms) when packet is received
+    int8_t rssi;                // RSSI value (dBm) (-127 to 0)
+} __attribute__((packed)) espnow_header_t;
+
+typedef struct {
+    espnow_header_t header;     // The header
+    uint8_t peer[6];            // Peer address
+    uint8_t msg[0];             // Message is up to 250 bytes
+} __attribute__((packed)) espnow_packet_t;
+
+static void check_esp_err(esp_err_t status) {
+    if (status != ESP_OK) {
+        mp_raise_RuntimeError(translate("an error occured"));
+    }
+}
+
+// Return a pointer to the ESPNow module singleton
+static espnow_obj_t *_get_singleton(void) {
+    return MP_STATE_PORT(espnow_singleton);
+}
+
+// --- The ESP-NOW send and recv callback routines ---
+
+// Callback triggered when a sent packet is acknowledged by the peer (or not).
+// Just count the number of responses and number of failures.
+// These are used in the send() logic.
+static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
+    espnow_obj_t *self = _get_singleton();
+    self->tx_responses++;
+    if (status != ESP_NOW_SEND_SUCCESS) {
+        self->tx_failures++;
+    }
+}
+
+static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg);
+
+// Callback triggered when an ESP-NOW packet is received.
+// Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
+// If the buffer is full, drop the message and increment the dropped count.
+static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
+    espnow_obj_t *self = _get_singleton();
+    ringbuf_t *buf = self->recv_buffer;
+
+    if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
+        self->rx_failures++;
+        return;
+    }
+
+    espnow_header_t header;
+    header.magic = ESPNOW_MAGIC;
+    header.msg_len = msg_len;
+    header.rssi = _get_rssi_from_wifi_packet(msg);
+    header.time_ms = mp_hal_ticks_ms();
+
+    ringbuf_put_n(buf, (uint8_t *)&header, sizeof(header));
+    ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
+    ringbuf_put_n(buf, msg, msg_len);
+
+    self->rx_packets++;
+}
+
+bool common_hal_espnow_deinited(espnow_obj_t *self) {
+    return self->recv_buffer == NULL;
+}
+
+// Initialize the ESP-NOW software stack,
+// register callbacks and allocate the recv data buffers.
+void common_hal_espnow_init(espnow_obj_t *self) {
+    if (!common_hal_espnow_deinited(self)) {
+        return;
+    }
+
+    self->recv_buffer = m_new_obj(ringbuf_t);
+    if (!ringbuf_alloc(self->recv_buffer, self->recv_buffer_size, true)) {
+        m_malloc_fail(self->recv_buffer_size);
+    }
+
+    if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
+        common_hal_wifi_init(false);
+        common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
+    }
+
+    check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, self->phy_rate));
+    check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, self->phy_rate));
+
+    check_esp_err(esp_now_init());
+    check_esp_err(esp_now_register_send_cb(send_cb));
+    check_esp_err(esp_now_register_recv_cb(recv_cb));
+}
+
+// De-initialize the ESP-NOW software stack,
+// disable callbacks and deallocate the recv data buffers.
+void common_hal_espnow_deinit(espnow_obj_t *self) {
+    if (self == NULL || common_hal_espnow_deinited(self)) {
+        return;
+    }
+
+    check_esp_err(esp_now_unregister_send_cb());
+    check_esp_err(esp_now_unregister_recv_cb());
+    check_esp_err(esp_now_deinit());
+
+    self->recv_buffer->buf = NULL;
+    self->recv_buffer = NULL;
+    self->peers_count = 0; // esp_now_deinit() removes all peers.
+    self->tx_packets = self->tx_responses;
+}
+
+void espnow_reset(void) {
+    common_hal_espnow_deinit(_get_singleton());
+    MP_STATE_PORT(espnow_singleton) = NULL;
+}
+
+void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value) {
+    self->recv_buffer_size = mp_arg_validate_int_min(value, MAX_PACKET_LEN, MP_QSTR_buffer_size);
+};
+
+void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value) {
+    self->phy_rate = mp_arg_validate_int_range(value, 0, WIFI_PHY_RATE_MAX - 1, MP_QSTR_phy_rate);
+};
+
+void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key) {
+    check_esp_err(esp_now_set_pmk(key));
+}
+
+// --- Maintaining the peer table and reading RSSI values ---
+
+// We maintain a peers table for several reasons, to:
+// - support monitoring the RSSI values for all peers; and
+// - to return unique bytestrings for each peer which supports more efficient
+//   application memory usage and peer handling.
+
+// Get the RSSI value from the wifi packet header
+static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
+    // Warning: Secret magic to get the rssi from the wifi packet header
+    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
+    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
+    // and a espnow_frame_format_t.
+    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
+    #define SIZEOF_ESPNOW_FRAME_FORMAT 39
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
+        msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
+    #pragma GCC diagnostic pop
+    return wifi_packet->rx_ctrl.rssi;
+}
+
+// Lookup a peer in the peers table and return a reference to the item in the peers_table.
+// Add peer to the table if it is not found (may alloc memory). Will not return NULL.
+static mp_map_elem_t *_lookup_add_peer(espnow_obj_t *self, const uint8_t *peer) {
+    // We do not want to allocate any new memory in the case that the peer
+    // already exists in the peers_table (which is almost all the time).
+    // So, we use a byte string on the stack and look that up in the dict.
+    mp_map_t *map = mp_obj_dict_get_map(self->peers_table);
+    mp_obj_str_t peer_obj = {{&mp_type_bytes}, 0, ESP_NOW_ETH_ALEN, peer};
+    mp_map_elem_t *item = mp_map_lookup(map, &peer_obj, MP_MAP_LOOKUP);
+    if (item == NULL) {
+        // If not found, add the peer using a new bytestring
+        map->is_fixed = 0;      // Allow to modify the dict
+        mp_obj_t new_peer = mp_obj_new_bytes(peer, ESP_NOW_ETH_ALEN);
+        item = mp_map_lookup(map, new_peer, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+        item->value = mp_obj_new_list(2, NULL);
+        map->is_fixed = 1;      // Relock the dict
+    }
+    return item;
+}
+
+// Update the peers table with the new rssi value from a received packet and
+// return a reference to the item in the peers_table.
+static void _update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
+    // Lookup the peer in the device table
+    mp_map_elem_t *item = _lookup_add_peer(self, peer);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
+    list->items[0] = MP_OBJ_NEW_SMALL_INT(rssi);
+    list->items[1] = mp_obj_new_int(time_ms);
+}
+
+// --- Send and Receive ESP-NOW data ---
+
+// Used by espnow_send() for sends() with sync==True.
+// Wait till all pending sent packet responses have been received.
+// ie. self->tx_responses == self->tx_packets.
+static void _wait_for_pending_responses(espnow_obj_t *self) {
+    mp_uint_t t, start = mp_hal_ticks_ms();
+    while (self->tx_responses < self->tx_packets) {
+        if ((t = mp_hal_ticks_ms() - start) > PENDING_RESPONSES_TIMEOUT_MS) {
+            mp_raise_OSError(MP_ETIMEDOUT);
+        }
+        if (t > PENDING_RESPONSES_BUSY_POLL_MS) {
+            // After 10ms of busy waiting give other tasks a look in.
+            RUN_BACKGROUND_TASKS;
+        }
+    }
+}
+
+mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8_t *mac, const mp_buffer_info_t *message) {
+    if (sync) {
+        // Flush out any pending responses.
+        // If the last call was sync == False there may be outstanding responses
+        // still to be received (possible many if we just had a burst of unsync send()s).
+        // We need to wait for all pending responses if this call has sync = True.
+        _wait_for_pending_responses(self);
+    }
+
+    // Send the packet - try, try again if internal esp-now buffers are full.
+    esp_err_t err;
+    size_t saved_failures = self->tx_failures;
+    mp_uint_t start = mp_hal_ticks_ms();
+
+    while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(mac, message->buf, message->len))) &&
+           (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
+        RUN_BACKGROUND_TASKS;
+    }
+    check_esp_err(err);
+
+    // Increment the sent packet count.
+    // If mac == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
+    self->tx_packets += ((mac == NULL) ? self->peers_count : 1);
+
+    if (sync) {
+        // Wait for and tally all the expected responses from peers
+        _wait_for_pending_responses(self);
+    }
+
+    // Return False if sync and any peers did not respond.
+    return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
+}
+
+mp_obj_t common_hal_espnow_recv(espnow_obj_t *self) {
+    if (!ringbuf_num_filled(self->recv_buffer)) {
+        return mp_const_none;
+    }
+
+    // Read the packet header from the incoming buffer
+    espnow_header_t header;
+    if (ringbuf_get_n(self->recv_buffer, (uint8_t *)&header, sizeof(header)) != sizeof(header)) {
+        mp_arg_error_invalid(MP_QSTR_buffer);
+    }
+
+    uint8_t msg_len = header.msg_len;
+
+    uint8_t mac_buf[ESP_NOW_ETH_ALEN];
+    uint8_t msg_buf[msg_len];
+
+    // Check the message packet header format and read the message data
+    if (header.magic != ESPNOW_MAGIC ||
+        msg_len > ESP_NOW_MAX_DATA_LEN ||
+        ringbuf_get_n(self->recv_buffer, mac_buf, ESP_NOW_ETH_ALEN) != ESP_NOW_ETH_ALEN ||
+        ringbuf_get_n(self->recv_buffer, msg_buf, msg_len) != msg_len) {
+        mp_arg_error_invalid(MP_QSTR_buffer);
+    }
+
+    // Update rssi value in the peer device table
+    _update_rssi(self, mac_buf, header.rssi, header.time_ms);
+
+    mp_obj_t elems[4] = {
+        mp_obj_new_bytes(mac_buf, ESP_NOW_ETH_ALEN),
+        mp_obj_new_bytes(msg_buf, msg_len),
+        MP_OBJ_NEW_SMALL_INT(header.rssi),
+        mp_obj_new_int(header.time_ms),
+    };
+
+    return namedtuple_make_new((const mp_obj_type_t *)&espnow_packet_type_obj, 4, 0, elems);
+}
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
new file mode 100644
index 0000000000..54761c00df
--- /dev/null
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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/ringbuf.h"
+
+#include "esp_wifi.h"
+
+// The data structure for the espnow_singleton.
+typedef struct _espnow_obj_t {
+    mp_obj_base_t base;
+    ringbuf_t *recv_buffer;         // A buffer for received packets
+    size_t recv_buffer_size;        // The size of the recv_buffer
+    wifi_phy_rate_t phy_rate;       // The ESP-NOW physical layer rate.
+    volatile size_t rx_packets;     // # of received packets
+    volatile size_t rx_failures;    // # of dropped packets (buffer full)
+    size_t tx_packets;              // # of sent packets
+    volatile size_t tx_responses;   // # of sent packet responses received
+    volatile size_t tx_failures;    // # of sent packet responses failed
+    size_t peers_count;             // Cache the # of peers for send(sync=True)
+    mp_obj_t peers_table;           // A dictionary of discovered peers
+} espnow_obj_t;
+
+extern void espnow_reset(void);
+
+extern void common_hal_espnow_init(espnow_obj_t *self);
+extern void common_hal_espnow_deinit(espnow_obj_t *self);
+extern bool common_hal_espnow_deinited(espnow_obj_t *self);
+
+extern void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value);
+extern void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value);
+extern void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key);
+
+extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8_t *mac, const mp_buffer_info_t *message);
+extern mp_obj_t common_hal_espnow_recv(espnow_obj_t *self);

From 79e07bfe00afd4f6b9e63c8ab030818a62a651a2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 1 Feb 2023 09:08:18 -0600
Subject: [PATCH 1759/2403] update ulab to 6.0.7

---
 extmod/ulab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/ulab b/extmod/ulab
index e68bb707b2..f2dd2230c4 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit e68bb707b20ee326d84ab75fc9fb35f2e85b87e3
+Subproject commit f2dd2230c4fdf1aa5c7a160782efdde18e8204bb

From c9e45433ffe7499b44e1876241a066bf195ad36e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 1 Feb 2023 14:03:52 -0500
Subject: [PATCH 1760/2403] make translate

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

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b2c7155f18..72ee60cc0c 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2479,6 +2479,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2907,6 +2911,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3720,6 +3728,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""

From 764d731e2491fb0bff26719a0a6b3d1928ea2f74 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 1 Feb 2023 22:25:19 +0100
Subject: [PATCH 1761/2403] 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             | 12 ++++++++++++
 locale/cs.po             | 12 ++++++++++++
 locale/de_DE.po          | 15 ++++++++++++---
 locale/el.po             | 12 ++++++++++++
 locale/en_GB.po          | 15 ++++++++++++---
 locale/es.po             | 15 ++++++++++++---
 locale/fil.po            | 12 ++++++++++++
 locale/fr.po             | 15 ++++++++++++---
 locale/hi.po             | 12 ++++++++++++
 locale/it_IT.po          | 12 ++++++++++++
 locale/ja.po             | 12 ++++++++++++
 locale/ko.po             | 12 ++++++++++++
 locale/nl.po             | 12 ++++++++++++
 locale/pl.po             | 12 ++++++++++++
 locale/pt_BR.po          | 15 ++++++++++++---
 locale/ru.po             | 12 ++++++++++++
 locale/sv.po             | 15 ++++++++++++---
 locale/tr.po             | 12 ++++++++++++
 locale/zh_Latn_pinyin.po | 15 ++++++++++++---
 19 files changed, 228 insertions(+), 21 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 088df0b059..546828a14d 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2510,6 +2510,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2938,6 +2942,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3752,6 +3760,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 2f7c53ee13..51ed1674f7 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2497,6 +2497,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2925,6 +2929,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3738,6 +3746,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0dde7441cc..594e2005cc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2555,6 +2555,10 @@ msgstr "Array- und Indexlänge müssen gleich sein"
 msgid "array has too many dimensions"
 msgstr "Das Array hat zu viele Dimensionen"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2995,6 +2999,10 @@ msgstr "Abmessungen stimmen nicht überein"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod für uint nicht implementiert"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "durch Null dividieren"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "Division durch Null"
@@ -3818,6 +3826,10 @@ msgstr "nur eine bit_depth=16 wird unterstützt"
 msgid "only mono is supported"
 msgstr "nur Mono wird unterstützt"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
@@ -4505,9 +4517,6 @@ msgstr "zi muss die Form (n_section, 2) haben"
 #~ msgid "complex division by zero"
 #~ msgstr "Komplexe Division durch null"
 
-#~ msgid "divide by zero"
-#~ msgstr "durch Null dividieren"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "int() arg 2 muss >= 2 und <= 36 sein"
 
diff --git a/locale/el.po b/locale/el.po
index 0077b44c2e..7c816d4a9f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2506,6 +2506,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2934,6 +2938,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3747,6 +3755,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 03af36dbaa..ece9ec14f3 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2513,6 +2513,10 @@ msgstr "array and index length must be equal"
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2944,6 +2948,10 @@ msgstr "dimensions do not match"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod not implemented for uint"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "divide by zero"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "division by zero"
@@ -3757,6 +3765,10 @@ msgstr "only bit_depth=16 is supported"
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
@@ -4408,9 +4420,6 @@ msgstr "zi must be of shape (n_section, 2)"
 #~ msgid "complex division by zero"
 #~ msgstr "complex division by zero"
 
-#~ msgid "divide by zero"
-#~ msgstr "divide by zero"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "int() arg 2 must be >= 2 and <= 36"
 
diff --git a/locale/es.po b/locale/es.po
index 497fadf870..2503a3150d 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2563,6 +2563,10 @@ msgstr "Longitud del array e índice tienen que ser iguales"
 msgid "array has too many dimensions"
 msgstr "La matriz tiene demasiadas dimensiones"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2998,6 +3002,10 @@ msgstr "las dimensiones no concuerdan"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod no implementado para uint"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "divide por cero"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "división por cero"
@@ -3820,6 +3828,10 @@ msgstr "solo se admite bit_depth=16"
 msgid "only mono is supported"
 msgstr "solamente mono esta suportado"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr "solamente oversample=64 esta soportado"
@@ -4485,9 +4497,6 @@ msgstr "zi debe ser una forma (n_section,2)"
 #~ msgid "complex division by zero"
 #~ msgstr "división compleja por cero"
 
-#~ msgid "divide by zero"
-#~ msgstr "divide por cero"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "int() arg 2 debe ser >= 2 y <= 36"
 
diff --git a/locale/fil.po b/locale/fil.po
index 4c203ecbba..64a40976f5 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2497,6 +2497,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2936,6 +2940,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "dibisyon ng zero"
@@ -3755,6 +3763,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 6a0e5ac876..28f95530cb 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2581,6 +2581,10 @@ msgstr "la taille de la matrice et de l'index doivent être égaux"
 msgid "array has too many dimensions"
 msgstr "la tableau à trop de dimensions"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -3022,6 +3026,10 @@ msgstr "les dimensions ne correspondent pas"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod ne sont pas implémentés pour uint"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "division par zéro"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "division par zéro"
@@ -3845,6 +3853,10 @@ msgstr "seul bit_depth = 16 est pris en charge"
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
@@ -4527,9 +4539,6 @@ msgstr "zi doit être de forme (n_section, 2)"
 #~ msgid "complex division by zero"
 #~ msgstr "division complexe par zéro"
 
-#~ msgid "divide by zero"
-#~ msgstr "division par zéro"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr ""
 #~ "Le deuxième argument de int() doit être compris entre 2 et 36 inclus"
diff --git a/locale/hi.po b/locale/hi.po
index 81903ac5a7..4fc15e35b4 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2479,6 +2479,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2907,6 +2911,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3720,6 +3728,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 50a754422d..85167249c6 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2507,6 +2507,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2944,6 +2948,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "divisione per zero"
@@ -3766,6 +3774,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 5ead67824f..5f2c6a7aa2 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2499,6 +2499,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2931,6 +2935,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "ゼロ除算 (division by zero)"
@@ -3745,6 +3753,10 @@ msgstr "bit_depth=16のみ対応しています"
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 078d04dfc8..8a4ebc9082 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2483,6 +2483,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2911,6 +2915,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3724,6 +3732,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 1b360e50b7..5122a036bc 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2509,6 +2509,10 @@ msgstr "array en indexlengte moeten gelijk zijn"
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2940,6 +2944,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "deling door nul"
@@ -3757,6 +3765,10 @@ msgstr "alleen bit_depth=16 wordt ondersteund"
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 66d1699919..41c0c432a7 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2490,6 +2490,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2919,6 +2923,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "dzielenie przez zero"
@@ -3732,6 +3740,10 @@ msgstr "obsługiwane jest tylko bit_depth=16"
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8b370922d4..b6a5eccd37 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2562,6 +2562,10 @@ msgstr "a matriz e comprimento do índice devem ser iguais"
 msgid "array has too many dimensions"
 msgstr "a matriz possui muitas dimensões"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2999,6 +3003,10 @@ msgstr "as dimensões não coincidem"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod não implementado para uint"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "divido por zero"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "divisão por zero"
@@ -3820,6 +3828,10 @@ msgstr "apenas bit_depth = 16 é compatível"
 msgid "only mono is supported"
 msgstr "Apenas o mono é compatível"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr "apenas oversample=64 é compatível"
@@ -4510,9 +4522,6 @@ msgstr "zi deve estar na forma (n_section, 2)"
 #~ msgid "complex division by zero"
 #~ msgstr "divisão complexa por zero"
 
-#~ msgid "divide by zero"
-#~ msgstr "divido por zero"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "int() arg 2 deve ser >= 2 e <= 36"
 
diff --git a/locale/ru.po b/locale/ru.po
index b272bc295d..205c1a1c0e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2547,6 +2547,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2975,6 +2979,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3788,6 +3796,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 01037522cf..29fd45ca87 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2535,6 +2535,10 @@ msgstr "array och indexlängd måste vara lika"
 msgid "array has too many dimensions"
 msgstr "array har för många dimensioner"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2968,6 +2972,10 @@ msgstr "dimensioner matchar inte"
 msgid "div/mod not implemented for uint"
 msgstr "div/mod inte implementerat för uint"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "division med noll"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "division med noll"
@@ -3786,6 +3794,10 @@ msgstr "bara bit_depth=16 stöds"
 msgid "only mono is supported"
 msgstr "endast mono stöds"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr "endast oversample=64 stöds"
@@ -4472,9 +4484,6 @@ msgstr "zi måste vara i formen (n_section, 2)"
 #~ msgid "complex division by zero"
 #~ msgstr "komplex division med noll"
 
-#~ msgid "divide by zero"
-#~ msgstr "division med noll"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "int() arg 2 måste vara >= 2 och <= 36"
 
diff --git a/locale/tr.po b/locale/tr.po
index 14e378bf61..85a0d6af12 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2505,6 +2505,10 @@ msgstr ""
 msgid "array has too many dimensions"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2933,6 +2937,10 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr ""
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr ""
@@ -3746,6 +3754,10 @@ msgstr ""
 msgid "only mono is supported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 80270fb391..121a54dcbb 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2541,6 +2541,10 @@ msgstr "shù zǔ hé suǒ yǐn cháng dù bì xū xiāng děng"
 msgid "array has too many dimensions"
 msgstr "shùzǔ yǒu tài duō wéidù"
 
+#: extmod/ulab/code/ndarray.c
+msgid "array is too big"
+msgstr ""
+
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
 msgid "array/bytes required on right side"
@@ -2975,6 +2979,10 @@ msgstr "chǐ cùn bù pǐ pèi"
 msgid "div/mod not implemented for uint"
 msgstr "div/ mó zǔ wèi wéi wèi shí xiàn"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "divide by zero"
+msgstr "chú yǐ líng"
+
 #: py/runtime.c
 msgid "division by zero"
 msgstr "bèi líng chú"
@@ -3789,6 +3797,10 @@ msgstr "Jǐn zhīchí wèi shēndù = 16"
 msgid "only mono is supported"
 msgstr "jǐn zhī chí dān shēng dào"
 
+#: extmod/ulab/code/numpy/create.c
+msgid "only ndarrays can be concatenated"
+msgstr ""
+
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
 msgstr "jǐn zhī chí guò cǎi yàng =64"
@@ -4474,9 +4486,6 @@ msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 #~ msgid "complex division by zero"
 #~ msgstr "fùzá de fēngé wèi 0"
 
-#~ msgid "divide by zero"
-#~ msgstr "chú yǐ líng"
-
 #~ msgid "int() arg 2 must be >= 2 and <= 36"
 #~ msgstr "zhěngshù() cānshù 2 bìxū > = 2 qiě <= 36"
 

From 8529ec2649a85b43b973fff2a5f57a836a1a6b5e Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Wed, 1 Feb 2023 21:40:09 +0000
Subject: [PATCH 1762/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (995 of 995 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 2503a3150d..d40e92464c 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: 2023-01-29 16:16+0000\n"
+"PO-Revision-Date: 2023-02-01 22:11+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -2565,7 +2565,7 @@ msgstr "La matriz tiene demasiadas dimensiones"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "el arreglo es muy grande"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -3830,7 +3830,7 @@ msgstr "solamente mono esta suportado"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "solamente ndarrays pueden ser concatenadas"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"

From 77c6daf4b83f3d24c85c429bc2be9a57755253d1 Mon Sep 17 00:00:00 2001
From: Gregory Neverov 
Date: Wed, 1 Feb 2023 16:33:22 -0800
Subject: [PATCH 1763/2403] don't throw exception

---
 ports/raspberrypi/common-hal/alarm/SleepMemory.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.c b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
index c1765296dc..1f0dddfc51 100644
--- a/ports/raspberrypi/common-hal/alarm/SleepMemory.c
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
@@ -34,7 +34,6 @@ void alarm_sleep_memory_reset(void) {
 }
 
 uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
-    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
     return 0;
 }
 

From 7028a3adfe370be6fc93bc3f2456c36cbbb593c9 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 2 Feb 2023 21:34:24 +0530
Subject: [PATCH 1764/2403] rework espnow api

---
 locale/circuitpython.pot                      |  12 +-
 ports/espressif/Makefile                      |   6 +-
 ports/espressif/bindings/espnow/ESPNow.c      | 352 +++---------------
 .../espressif/bindings/espnow/ESPNowPacket.c  |   2 +-
 ports/espressif/bindings/espnow/Peer.c        | 254 +++++++++++++
 ports/espressif/bindings/espnow/Peer.h        |  37 ++
 ports/espressif/bindings/espnow/Peers.c       | 221 +++++++++++
 ports/espressif/bindings/espnow/Peers.h       |  37 ++
 ports/espressif/bindings/espnow/__init__.c    |  29 +-
 ports/espressif/common-hal/espnow/ESPNow.c    |   8 +-
 ports/espressif/common-hal/espnow/ESPNow.h    |   7 +-
 11 files changed, 641 insertions(+), 324 deletions(-)
 create mode 100644 ports/espressif/bindings/espnow/Peer.c
 create mode 100644 ports/espressif/bindings/espnow/Peer.h
 create mode 100644 ports/espressif/bindings/espnow/Peers.c
 create mode 100644 ports/espressif/bindings/espnow/Peers.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1b44383086..da9e0ac0f2 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -124,7 +124,7 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -2431,7 +2431,7 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
+#: ports/espressif/bindings/espnow/Peers.c
 #: ports/espressif/common-hal/espnow/ESPNow.c
 msgid "an error occured"
 msgstr ""
@@ -3816,14 +3816,6 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "peer already exists"
-msgstr ""
-
-#: ports/espressif/bindings/espnow/ESPNow.c
-msgid "peer not found"
-msgstr ""
-
 #: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 76d443dd68..8e326e18ab 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -126,9 +126,13 @@ ifeq ($(DEBUG), 1)
   # CFLAGS += -fno-inline -fno-ipa-sra
 else
   CFLAGS += -DNDEBUG -ggdb3
-  OPTIMIZATION_FLAGS ?= -O2
   # RISC-V is larger than xtensa
   # Use -Os for RISC-V when it overflows
+  ifeq ($(IDF_TARGET_ARCH),riscv)
+  OPTIMIZATION_FLAGS ?= -Os
+  else
+  OPTIMIZATION_FLAGS ?= -O2
+  endif
 endif
 
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index b120b2cdff..9a1ddfb80f 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -27,27 +27,32 @@
  * THE SOFTWARE.
  */
 
-#include "esp_now.h"
-
 #include "py/runtime.h"
 #include "py/objarray.h"
 #include "py/objproperty.h"
 #include "py/stream.h"
-#include "py/ringbuf.h"
 
-#include "mphalport.h"
-
-#include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
 
 #include "shared-bindings/util.h"
 
 #include "common-hal/espnow/ESPNow.h"
 
-static void check_esp_err(esp_err_t status) {
-    if (status != ESP_OK) {
-        mp_raise_RuntimeError(translate("an error occured"));
-    }
+#include "esp_now.h"
+
+// Return C pointer to byte memory string/bytes/bytearray in obj.
+// Raise ValueError if the length does not match expected len.
+static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, rw);
+    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
+    return (uint8_t *)bufinfo.buf;
+}
+
+// Return C pointer to the MAC address.
+// Raise ValueError if mac is wrong type or is not 6 bytes long.
+static const uint8_t *_get_peer_addr(mp_obj_t mac) {
+    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
 }
 
 // --- Initialisation and Config functions ---
@@ -89,6 +94,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     common_hal_espnow_set_buffer_size(self, args[ARG_buffer_size].u_int);
     common_hal_espnow_set_phy_rate(self, args[ARG_phy_rate].u_int);
 
+    self->peers = espnow_peers_new();
     self->peers_table = mp_obj_new_dict(0);
 
     // Prevent user code modifying the dict
@@ -102,14 +108,30 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return self;
 }
 
-// Return C pointer to byte memory string/bytes/bytearray in obj.
-// Raise ValueError if the length does not match expected len.
-static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(obj, &bufinfo, rw);
-    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
-    return (uint8_t *)bufinfo.buf;
+//|     def deinit(self) -> None:
+//|         """Deinitializes ESP-NOW and releases it for another program."""
+//|         ...
+STATIC mp_obj_t espnow_deinit(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_deinit(self);
+    return mp_const_none;
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_deinit_obj, espnow_deinit);
+
+//|     def __enter__(self) -> ESPNow:
+//|         """No-op used by Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+STATIC mp_obj_t espnow_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return espnow_deinit(args[0]);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj___exit__);
 
 //|     def set_pmk(self, pmk: ReadableBuffer) -> None:
 //|         """Set the ESP-NOW Primary Master Key (pmk) for encrypted communications.
@@ -123,27 +145,6 @@ STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 
-//|     active: bool
-//|     """Initialize or de-initialize the `ESPNow` communication protocol."""
-//|
-STATIC mp_obj_t espnow_get_active(const mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(!common_hal_espnow_deinited(self));
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_active_obj, espnow_get_active);
-
-STATIC mp_obj_t espnow_set_active(const mp_obj_t self_in, const mp_obj_t value) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_is_true(value) ? common_hal_espnow_init(self) : common_hal_espnow_deinit(self);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_active_obj, espnow_set_active);
-
-MP_PROPERTY_GETSET(espnow_active_obj,
-    (mp_obj_t)&espnow_get_active_obj,
-    (mp_obj_t)&espnow_set_active_obj);
-
-
 //|     buffer_size: int
 //|     """The size of the internal ring buffer."""
 //|
@@ -202,39 +203,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_stats_obj, espnow_get_stats);
 MP_PROPERTY_GETTER(espnow_stats_obj,
     (mp_obj_t)&espnow_get_stats_obj);
 
-// --- Maintaining the peer table and reading RSSI values ---
-
-// We maintain a peers table for several reasons, to:
-// - support monitoring the RSSI values for all peers; and
-// - to return unique bytestrings for each peer which supports more efficient
-//   application memory usage and peer handling.
-
-// Get the RSSI value from the wifi packet header
-static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
-    // Warning: Secret magic to get the rssi from the wifi packet header
-    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
-    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
-    // and a espnow_frame_format_t.
-    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
-    #define SIZEOF_ESPNOW_FRAME_FORMAT 39
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wcast-align"
-    wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
-        msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
-    #pragma GCC diagnostic pop
-    return wifi_packet->rx_ctrl.rssi;
-}
-
-// --- Handling espnow packets in the recv buffer ---
-
 // --- Send and Receive ESP-NOW data ---
 
-// Return C pointer to the MAC address.
-// Raise ValueError if mac is wrong type or is not 6 bytes long.
-static const uint8_t *_get_peer_addr(mp_obj_t mac) {
-    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
-}
-
 //|     def send(
 //|         self,
 //|         message: ReadableBuffer,
@@ -284,246 +254,38 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 //|
 //|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
 //|         ...
-STATIC mp_obj_t espnow_recv(mp_obj_t self_in, mp_obj_t buffers) {
+STATIC mp_obj_t espnow_recv(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
     return common_hal_espnow_recv(self);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_recv_obj, espnow_recv);
-
-// --- Peer Management Functions ---
-
-// Common code for add_peer() and mod_peer() to process the args.
-static void _update_peer_info(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool modify) {
-    enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypt };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mac,      MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_lmk,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
-        { MP_QSTR_channel,  MP_ARG_INT, { .u_obj = mp_const_none } },
-        { MP_QSTR_interface,MP_ARG_INT, { .u_obj = mp_const_none } },
-        { MP_QSTR_encrypt,  MP_ARG_BOOL,{ .u_obj = mp_const_none } },
-    };
-
-    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);
-
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer_addr(args[ARG_mac].u_obj), ESP_NOW_ETH_ALEN);
-
-    if (modify) {
-        if (esp_now_get_peer(peer.peer_addr, &peer) != ESP_OK) {
-            mp_raise_RuntimeError(translate("peer not found"));
-        }
-    } else {
-        if (esp_now_is_peer_exist(peer.peer_addr)) {
-            mp_raise_RuntimeError(translate("peer already exists"));
-        }
-        peer.channel = 0;
-        peer.ifidx = WIFI_IF_STA;
-        peer.encrypt = false;
-    }
-
-    const mp_obj_t channel = args[ARG_channel].u_obj;
-    if (channel != mp_const_none) {
-        peer.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 0, 14, MP_QSTR_channel);
-    }
-
-    const mp_obj_t interface = args[ARG_interface].u_obj;
-    if (interface != mp_const_none) {
-        peer.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(interface), 0, 1, MP_QSTR_interface);
-    }
-
-    const mp_obj_t encrypt = args[ARG_encrypt].u_obj;
-    if (encrypt != mp_const_none) {
-        peer.encrypt = mp_obj_is_true(encrypt);
-    }
-
-    const mp_obj_t lmk = args[ARG_lmk].u_obj;
-    if (lmk != mp_const_none) {
-        memcpy(peer.lmk, _get_bytes_len(lmk, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
-    } else if (peer.encrypt) {
-        mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
-    }
-
-    check_esp_err((modify) ? esp_now_mod_peer(&peer) : esp_now_add_peer(&peer));
-}
-
-// Update the cached peer count in self->peers_count;
-// The peers_count ignores broadcast and multicast addresses and is used for the
-// send() logic and is updated from add_peer(), mod_peer() and del_peer().
-static void _update_peer_count(espnow_obj_t *self) {
-    esp_now_peer_info_t peer = {0};
-    bool from_head = true;
-    int count = 0;
-
-    // esp_now_fetch_peer() skips over any broadcast or multicast addresses
-    while (esp_now_fetch_peer(from_head, &peer) == ESP_OK) {
-        from_head = false;
-        if (++count >= ESP_NOW_MAX_TOTAL_PEER_NUM) {
-            break;          // Should not happen
-        }
-    }
-
-    self->peers_count = count;
-}
-
-//|     def add_peer(
-//|         self,
-//|         mac: ReadableBuffer,
-//|         lmk: Optional[ReadableBuffer],
-//|         channel: int = 0,
-//|         interface: int = 0,
-//|         encrypt: bool = False,
-//|     ) -> None:
-//|         """Add peer.
-//|
-//|         :param ReadableBuffer mac: The mac address of the peer.
-//|         :param ReadableBuffer lmk: The Local Master Key (lmk) of the peer.
-//|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
-//|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
-//|         :param bool encrypt: Whether or not to use encryption."""
-//|         ...
-STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    espnow_obj_t *self = pos_args[0];
-    check_for_deinit(self);
-
-    _update_peer_info(n_args, pos_args, kw_args, false);
-    _update_peer_count(self);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
-
-//|     def mod_peer(
-//|         self,
-//|         mac: ReadableBuffer,
-//|         lmk: Optional[ReadableBuffer],
-//|         channel: int = 0,
-//|         interface: int = 0,
-//|         encrypt: bool = False,
-//|     ) -> None:
-//|         """Modify peer.
-//|
-//|         :param ReadableBuffer mac: The mac address of the peer.
-//|         :param ReadableBuffer lmk: The Local Master Key (lmk) of the peer.
-//|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
-//|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
-//|         :param bool encrypt: Whether or not to use encryption."""
-//|         ...
-STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    espnow_obj_t *self = pos_args[0];
-    check_for_deinit(self);
-
-    _update_peer_info(n_args, pos_args, kw_args, true);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
-
-//|     def del_peer(self, mac: ReadableBuffer) -> None:
-//|         """Delete peer.
-//|
-//|         :param ReadableBuffer mac: The mac address of the peer."""
-//|         ...
-STATIC mp_obj_t espnow_del_peer(mp_obj_t self_in, mp_obj_t mac) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    uint8_t peer_addr[ESP_NOW_ETH_ALEN];
-    memcpy(peer_addr, _get_peer_addr(mac), ESP_NOW_ETH_ALEN);
-
-    check_esp_err(esp_now_del_peer(peer_addr));
-    _update_peer_count(self);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
-
-// Convert a peer_info struct to python tuple
-// Used by espnow_get_peer() and espnow_get_peers()
-static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
-    return MP_OBJ_NEW_TUPLE(
-        mp_obj_new_bytes(peer->peer_addr, MP_ARRAY_SIZE(peer->peer_addr)),
-        mp_obj_new_bytes(peer->lmk, MP_ARRAY_SIZE(peer->lmk)),
-        mp_obj_new_int(peer->channel),
-        mp_obj_new_int(peer->ifidx),
-        mp_obj_new_bool(peer->encrypt));
-}
-
-//|     def get_peer(self, mac: ReadableBuffer) -> Tuple[bytes, int, int, bool]:
-//|         """Get the peer info for mac as a `tuple`.
-//|
-//|         :param ReadableBuffer mac: The mac address of the peer.
-//|
-//|         :returns: A `tuple` of (mac, lmk, channel, interface, encrypt)."""
-//|         ...
-STATIC mp_obj_t espnow_get_peer(mp_obj_t self_in, mp_obj_t mac) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    esp_now_peer_info_t peer = {0};
-    memcpy(peer.peer_addr, _get_peer_addr(mac), ESP_NOW_ETH_ALEN);
-    check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
-
-    return _peer_info_to_tuple(&peer);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_recv_obj, espnow_recv);
 
 // --- Peer Related Properties ---
 
-//|     peers: Tuple[Tuple[bytes, bytes, int, int, bool], ...]
-//|     """The peer info records for all registered `ESPNow` peers. (read-only)
-//|
-//|     A `tuple` of tuples: ((mac, lmk, channel, interface, encrypt), ...)."""
+//|     peers: Peers
+//|     """The peer info records for all registered `ESPNow` peers. (read-only)"""
 //|
 STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-
-    // Build and initialize the peer info tuple.
-    mp_obj_tuple_t *peerinfo_tuple = mp_obj_new_tuple(self->peers_count, NULL);
-    esp_now_peer_info_t peer = {0};
-
-    for (size_t i = 0; i < peerinfo_tuple->len; i++) {
-        esp_err_t status = esp_now_fetch_peer((i == 0), &peer);
-        peerinfo_tuple->items[i] = (status == ESP_OK ? _peer_info_to_tuple(&peer) : mp_const_none);
-    }
-
-    return peerinfo_tuple;
+    return MP_OBJ_FROM_PTR(self->peers);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 
 MP_PROPERTY_GETTER(espnow_peers_obj,
     (mp_obj_t)&espnow_get_peers_obj);
 
-//|     peers_count: Tuple[int, int]
-//|     """The number of registered peers in a `tuple` of (num_total_peers, num_encrypted_peers). (read-only)"""
-//|
-STATIC mp_obj_t espnow_get_peers_count(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    esp_now_peer_num_t peer_num = {0};
-    check_esp_err(esp_now_get_peer_num(&peer_num));
-    return MP_OBJ_NEW_TUPLE(
-        mp_obj_new_int(peer_num.total_num),
-        mp_obj_new_int(peer_num.encrypt_num));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_count_obj, espnow_get_peers_count);
-
-MP_PROPERTY_GETTER(espnow_peers_count_obj,
-    (mp_obj_t)&espnow_get_peers_count_obj);
-
 //|     peers_table: Dict[bytes, List[int]]
 //|     """The dictionary of peers we have seen. (read-only)
 //|
 //|     A `dict` of {peer: [rssi, time], ...}
 //|
 //|     where:
-//|         peer is a byte string containing the 6-byte mac address of the peer.
-//|         rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0).
-//|         time is the time in milliseconds since device last booted."""
+//|         * peer is a byte string containing the 6-byte mac address of the peer.
+//|         * rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0).
+//|         * time is the time in milliseconds since device last booted."""
 //|
 STATIC mp_obj_t espnow_get_peers_table(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -535,26 +297,25 @@ MP_PROPERTY_GETTER(espnow_peers_table_obj,
     (mp_obj_t)&espnow_get_peers_table_obj);
 
 STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
+    // Context managers
+    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&espnow___exit___obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&espnow_deinit_obj) },
+
     // Config parameters
     { MP_ROM_QSTR(MP_QSTR_set_pmk),     MP_ROM_PTR(&espnow_set_pmk_obj) },
-    { MP_ROM_QSTR(MP_QSTR_active),      MP_ROM_PTR(&espnow_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_buffer_size), MP_ROM_PTR(&espnow_buffer_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_stats),       MP_ROM_PTR(&espnow_stats_obj) },
 
     // Send and receive messages
     { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_obj) },
 
-    // Peer management functions
-    { MP_ROM_QSTR(MP_QSTR_add_peer),    MP_ROM_PTR(&espnow_add_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mod_peer),    MP_ROM_PTR(&espnow_mod_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_del_peer),    MP_ROM_PTR(&espnow_del_peer_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_peer),    MP_ROM_PTR(&espnow_get_peer_obj) },
-
     // Peer related properties
     { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
-    { MP_ROM_QSTR(MP_QSTR_peers_count), MP_ROM_PTR(&espnow_peers_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_peers_table), MP_ROM_PTR(&espnow_peers_table_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
@@ -570,7 +331,7 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
     }
 
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return (common_hal_espnow_deinited(self)) ? 0 :  // If not initialized
+    return (common_hal_espnow_deinited(self)) ? 0 : // If not initialized
            arg ^ (
                // If no data in the buffer, unset the Read ready flag
                ((!ringbuf_num_filled(self->recv_buffer)) ? MP_STREAM_POLL_RD : 0) |
@@ -590,6 +351,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
 //|     def __len__(self) -> int:
 //|         """Return the number of `bytes` available to read. Used to implement ``len()``."""
 //|         ...
+//|
 STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     size_t len = ringbuf_num_filled(self->recv_buffer);
@@ -599,7 +361,7 @@ STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
         case MP_UNARY_OP_LEN:
             return mp_obj_new_int_from_uint(len);
         default:
-            return MP_OBJ_NULL;      // op not supported
+            return MP_OBJ_NULL; // op not supported
     }
 }
 
diff --git a/ports/espressif/bindings/espnow/ESPNowPacket.c b/ports/espressif/bindings/espnow/ESPNowPacket.c
index 82fcfcce98..9d582a00eb 100644
--- a/ports/espressif/bindings/espnow/ESPNowPacket.c
+++ b/ports/espressif/bindings/espnow/ESPNowPacket.c
@@ -32,7 +32,7 @@
 //|     mac: ReadableBuffer
 //|     """The sender's mac address (length = 6 bytes)"""
 //|
-//|     msg: RedableBuffer
+//|     msg: ReadableBuffer
 //|     """The message sent by the peer (length <= 250 bytes)"""
 //|
 //|     rssi: int
diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
new file mode 100644
index 0000000000..6dcf2732aa
--- /dev/null
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -0,0 +1,254 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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 "bindings/espnow/Peer.h"
+
+// TODO: check peer already exist
+// TODO: check peer dosen't exist
+
+// Return C pointer to the ReadableBuffer.
+// Raise ValueError if the length does not match expected len.
+static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, rw);
+    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
+    return (uint8_t *)bufinfo.buf;
+}
+
+// Return C pointer to the MAC address.
+// Raise ValueError if mac is wrong type or is not 6 bytes long.
+static const uint8_t *_get_peer_addr(mp_obj_t mac) {
+    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
+}
+
+//| class Peer:
+//|     """A data class to store parameters specific to a peer."""
+//|
+//|     def __init__(
+//|         self,
+//|         mac: bytes,
+//|         lmk: Optional[bytes],
+//|         channel: int = 0,
+//|         interface: int = 0,
+//|         encrypt: bool = False,
+//|     ) -> None:
+//|         """Construct a new peer object.
+//|
+//|         :param bytes mac: The mac address of the peer.
+//|         :param bytes lmk: The Local Master Key (lmk) of the peer.
+//|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
+//|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
+//|         :param bool encrypt: Whether or not to use encryption.
+//|         """
+//|         ...
+STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypt };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mac,      MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_lmk,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
+        { MP_QSTR_channel,  MP_ARG_INT, { .u_obj = mp_const_none } },
+        { MP_QSTR_interface,MP_ARG_INT, { .u_obj = mp_const_none } },
+        { MP_QSTR_encrypt,  MP_ARG_BOOL,{ .u_obj = mp_const_none } },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    espnow_peer_obj_t *self = m_new_obj(espnow_peer_obj_t);
+    self->base.type = &espnow_peer_type;
+    self->peer_info = (esp_now_peer_info_t) {
+        .channel = 0,
+        .ifidx = WIFI_IF_STA,
+        .encrypt = false
+    };
+
+    memcpy(self->peer_info.peer_addr, _get_peer_addr(args[ARG_mac].u_obj), ESP_NOW_ETH_ALEN);
+
+    const mp_obj_t channel = args[ARG_channel].u_obj;
+    if (channel != mp_const_none) {
+        self->peer_info.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 0, 14, MP_QSTR_channel);
+    }
+
+    const mp_obj_t interface = args[ARG_interface].u_obj;
+    if (interface != mp_const_none) {
+        self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(interface), 0, 1, MP_QSTR_interface);
+    }
+
+    const mp_obj_t encrypt = args[ARG_encrypt].u_obj;
+    if (encrypt != mp_const_none) {
+        self->peer_info.encrypt = mp_obj_is_true(encrypt);
+    }
+
+    const mp_obj_t lmk = args[ARG_lmk].u_obj;
+    if (lmk != mp_const_none) {
+        memcpy(self->peer_info.lmk, _get_bytes_len(lmk, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
+    } else if (self->peer_info.encrypt && !self->peer_info.lmk) {
+        mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
+    }
+
+    return self;
+}
+
+//|     mac: ReadableBuffer
+//|     """The WiFi mac to use."""
+//|
+STATIC mp_obj_t espnow_peer_get_mac(const mp_obj_t self_in) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bytes(self->peer_info.peer_addr, MP_ARRAY_SIZE(self->peer_info.peer_addr));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_mac_obj, espnow_peer_get_mac);
+
+STATIC mp_obj_t espnow_peer_set_mac(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    memcpy(self->peer_info.peer_addr, _get_peer_addr(value), ESP_NOW_ETH_ALEN);
+    esp_now_mod_peer(&self->peer_info);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_peer_set_mac_obj, espnow_peer_set_mac);
+
+MP_PROPERTY_GETSET(espnow_peer_mac_obj,
+    (mp_obj_t)&espnow_peer_get_mac_obj,
+    (mp_obj_t)&espnow_peer_set_mac_obj);
+
+//|     lmk: ReadableBuffer
+//|     """The WiFi lmk to use."""
+//|
+STATIC mp_obj_t espnow_peer_get_lmk(const mp_obj_t self_in) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bytes(self->peer_info.lmk, MP_ARRAY_SIZE(self->peer_info.lmk));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_lmk_obj, espnow_peer_get_lmk);
+
+STATIC mp_obj_t espnow_peer_set_lmk(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    memcpy(self->peer_info.lmk, _get_bytes_len(value, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
+    esp_now_mod_peer(&self->peer_info);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_peer_set_lmk_obj, espnow_peer_set_lmk);
+
+MP_PROPERTY_GETSET(espnow_peer_lmk_obj,
+    (mp_obj_t)&espnow_peer_get_lmk_obj,
+    (mp_obj_t)&espnow_peer_set_lmk_obj);
+
+//|     channel: int
+//|     """The WiFi channel to use."""
+//|
+STATIC mp_obj_t espnow_peer_get_channel(const mp_obj_t self_in) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->peer_info.channel);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_channel_obj, espnow_peer_get_channel);
+
+STATIC mp_obj_t espnow_peer_set_channel(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    self->peer_info.channel = mp_arg_validate_int_range(mp_obj_get_int(value), 0, 14, MP_QSTR_channel);
+    esp_now_mod_peer(&self->peer_info);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_peer_set_channel_obj, espnow_peer_set_channel);
+
+MP_PROPERTY_GETSET(espnow_peer_channel_obj,
+    (mp_obj_t)&espnow_peer_get_channel_obj,
+    (mp_obj_t)&espnow_peer_set_channel_obj);
+
+//|     interface: int
+//|     """The WiFi interface to use."""
+//|
+STATIC mp_obj_t espnow_peer_get_interface(const mp_obj_t self_in) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->peer_info.ifidx);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_interface_obj, espnow_peer_get_interface);
+
+STATIC mp_obj_t espnow_peer_set_interface(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(value), 0, 1, MP_QSTR_interface);
+    esp_now_mod_peer(&self->peer_info);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_peer_set_interface_obj, espnow_peer_set_interface);
+
+MP_PROPERTY_GETSET(espnow_peer_interface_obj,
+    (mp_obj_t)&espnow_peer_get_interface_obj,
+    (mp_obj_t)&espnow_peer_set_interface_obj);
+
+//|     encrypted: bool
+//|     """Whether or not to use encryption."""
+//|
+STATIC mp_obj_t espnow_peer_get_encrypted(const mp_obj_t self_in) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(self->peer_info.encrypt);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_encrypted_obj, espnow_peer_get_encrypted);
+
+STATIC mp_obj_t espnow_peer_set_encrypted(const mp_obj_t self_in, const mp_obj_t value) {
+    espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    self->peer_info.encrypt = mp_obj_is_true(value);
+
+    if (!self->peer_info.lmk) {
+        mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
+    }
+
+    esp_now_mod_peer(&self->peer_info);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(espnow_peer_set_encrypted_obj, espnow_peer_set_encrypted);
+
+MP_PROPERTY_GETSET(espnow_peer_encrypted_obj,
+    (mp_obj_t)&espnow_peer_get_encrypted_obj,
+    (mp_obj_t)&espnow_peer_set_encrypted_obj);
+
+STATIC const mp_rom_map_elem_t espnow_peer_locals_dict_table[] = {
+    // Peer parameters
+    { MP_ROM_QSTR(MP_QSTR_mac),         MP_ROM_PTR(&espnow_peer_mac_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lmk),         MP_ROM_PTR(&espnow_peer_lmk_obj) },
+    { MP_ROM_QSTR(MP_QSTR_channel),     MP_ROM_PTR(&espnow_peer_channel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_interface),   MP_ROM_PTR(&espnow_peer_interface_obj) },
+    { MP_ROM_QSTR(MP_QSTR_encrypted),   MP_ROM_PTR(&espnow_peer_encrypted_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_peer_locals_dict, espnow_peer_locals_dict_table);
+
+const mp_obj_type_t espnow_peer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Peer,
+    .make_new = espnow_peer_make_new,
+    .locals_dict = (mp_obj_t)&espnow_peer_locals_dict,
+};
diff --git a/ports/espressif/bindings/espnow/Peer.h b/ports/espressif/bindings/espnow/Peer.h
new file mode 100644
index 0000000000..e4cb828472
--- /dev/null
+++ b/ports/espressif/bindings/espnow/Peer.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+#include "esp_now.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    esp_now_peer_info_t peer_info;
+} espnow_peer_obj_t;
+
+const mp_obj_type_t espnow_peer_type;
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
new file mode 100644
index 0000000000..4f0c310f3d
--- /dev/null
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -0,0 +1,221 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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/objlist.h"
+#include "py/runtime.h"
+
+#include "bindings/espnow/Peer.h"
+#include "bindings/espnow/Peers.h"
+
+#include "esp_now.h"
+
+static void check_esp_err(esp_err_t status) {
+    if (status != ESP_OK) {
+        mp_raise_RuntimeError(translate("an error occured"));
+    }
+}
+
+//| class Peers:
+//|     """A class that provides peer managment functions. Sequence[Peer]."""
+//|
+
+//|     def append(self, peer: Peer) -> None:
+//|         """Append peer.
+//|
+//|         :param Peer peer: The peer object to append.
+//|         """
+//|         ...
+STATIC mp_obj_t espnow_peers_append(mp_obj_t self_in, mp_obj_t arg) {
+    espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer));
+    check_esp_err(esp_now_add_peer(&peer->peer_info));
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_list_append(self->list, arg);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_append_obj, espnow_peers_append);
+
+//|     def remove(self, peer: Peer) -> None:
+//|         """Remove peer.
+//|
+//|         :param Peer peer: The peer object to remove.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t espnow_peers_remove(mp_obj_t self_in, mp_obj_t arg) {
+    espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer));
+    check_esp_err(esp_now_del_peer(peer->peer_info.peer_addr));
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_list_remove(self->list, arg);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_remove_obj, espnow_peers_remove);
+
+STATIC const mp_rom_map_elem_t espnow_peers_locals_dict_table[] = {
+    // Peer management functions
+    { MP_ROM_QSTR(MP_QSTR_append),  MP_ROM_PTR(&espnow_peers_append_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove),  MP_ROM_PTR(&espnow_peers_remove_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_peers_locals_dict, espnow_peers_locals_dict_table);
+
+/******************************************************************************/
+/* peers print                                                                */
+
+STATIC void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
+    const char *item_separator = ", ";
+    if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
+        kind = PRINT_REPR;
+    } else {
+        #if MICROPY_PY_UJSON_SEPARATORS
+        item_separator = MP_PRINT_GET_EXT(print)->item_separator;
+        #endif
+    }
+    mp_print_str(print, "[");
+    for (size_t i = 0; i < list->len; i++) {
+        if (i > 0) {
+            mp_print_str(print, item_separator);
+        }
+        mp_obj_print_helper(print, list->items[i], kind);
+    }
+    mp_print_str(print, "]");
+}
+
+/******************************************************************************/
+/* peers unary_op                                                             */
+
+STATIC mp_obj_t espnow_peers_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
+    switch (op) {
+        case MP_UNARY_OP_BOOL:
+            return mp_obj_new_bool(list->len != 0);
+        case MP_UNARY_OP_LEN:
+            return MP_OBJ_NEW_SMALL_INT(list->len);
+        #if MICROPY_PY_SYS_GETSIZEOF
+        case MP_UNARY_OP_SIZEOF: {
+            size_t sz = sizeof(*list) + sizeof(mp_obj_t) * list->alloc;
+            return MP_OBJ_NEW_SMALL_INT(sz);
+        }
+        #endif
+        default:
+            return MP_OBJ_NULL; // op not supported
+    }
+}
+
+/******************************************************************************/
+/* peers subscript                                                            */
+
+STATIC mp_obj_t espnow_peers_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+    if (value != MP_OBJ_SENTINEL) {
+        return MP_OBJ_NULL; // op not supported
+    }
+
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
+
+    // load
+    #if MICROPY_PY_BUILTINS_SLICE
+    if (mp_obj_is_type(index, &mp_type_slice)) {
+        mp_bound_slice_t slice;
+        if (!mp_seq_get_fast_slice_indexes(list->len, index, &slice)) {
+            return mp_seq_extract_slice(list->len, list->items, &slice);
+        }
+
+        mp_obj_list_t *res = MP_OBJ_TO_PTR(mp_obj_new_list(slice.stop - slice.start, NULL));
+        mp_seq_copy(res->items, list->items + slice.start, res->len, mp_obj_t);
+        return MP_OBJ_FROM_PTR(res);
+    }
+    #endif
+    size_t index_val = mp_get_index(list->base.type, list->len, index, false);
+    return list->items[index_val];
+}
+
+/******************************************************************************/
+/* peers iterator                                                             */
+
+typedef struct _espnow_peers_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    mp_obj_t peers;
+    size_t cur;
+} espnow_peers_it_t;
+
+STATIC mp_obj_t espnow_peers_it_iternext(mp_obj_t self_in) {
+    espnow_peers_it_t *self = MP_OBJ_TO_PTR(self_in);
+    espnow_peers_obj_t *peers = MP_OBJ_TO_PTR(self->peers);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(peers->list);
+    if (self->cur < list->len) {
+        mp_obj_t o_out = list->items[self->cur];
+        self->cur += 1;
+        return o_out;
+    } else {
+        return MP_OBJ_STOP_ITERATION;
+    }
+}
+
+STATIC mp_obj_t espnow_peers_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
+    assert(sizeof(espnow_peers_it_t) <= sizeof(mp_obj_iter_buf_t));
+    espnow_peers_it_t *o = (espnow_peers_it_t *)iter_buf;
+    o->base.type = &mp_type_polymorph_iter;
+    o->iternext = espnow_peers_it_iternext;
+    o->peers = o_in;
+    o->cur = 0;
+    return MP_OBJ_FROM_PTR(o);
+}
+
+espnow_peers_obj_t *espnow_peers_new(void) {
+    espnow_peers_obj_t *self = m_new_obj(espnow_peers_obj_t);
+    self->base.type = &espnow_peers_type;
+    self->list = mp_obj_new_list(0, NULL);
+    return self;
+}
+
+const mp_obj_type_t espnow_peers_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Peers,
+    .print = espnow_peers_print,
+    // .make_new = espnow_peers_make_new,
+    .locals_dict = (mp_obj_t)&espnow_peers_locals_dict,
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    MP_TYPE_EXTENDED_FIELDS(
+        .unary_op = espnow_peers_unary_op,
+        .subscr = espnow_peers_subscr,
+        .getiter = espnow_peers_getiter,
+        ),
+};
+
+/*
+STATIC mp_obj_t espnow_peers_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    (void)type_in;
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+
+    espnow_peers_obj_t *self = m_new_obj(espnow_peers_obj_t);
+    self->base.type = &espnow_peers_type;
+    self->list = mp_obj_new_list_from_iter(args[0]);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+*/
diff --git a/ports/espressif/bindings/espnow/Peers.h b/ports/espressif/bindings/espnow/Peers.h
new file mode 100644
index 0000000000..e871ae86c0
--- /dev/null
+++ b/ports/espressif/bindings/espnow/Peers.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t list;
+} espnow_peers_obj_t;
+
+extern const mp_obj_type_t espnow_peers_type;
+extern espnow_peers_obj_t *espnow_peers_new(void);
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index 746e9696a9..d92221c691 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -29,6 +29,8 @@
 #include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
 #include "bindings/espnow/ESPNowPacket.h"
+#include "bindings/espnow/Peer.h"
+#include "bindings/espnow/Peers.h"
 
 //| """ESP-NOW Module
 //|
@@ -44,14 +46,13 @@
 //|     import espnow
 //|
 //|     e = espnow.ESPNow()
-//|     e.active(True)
-//|     peer = b'\xbb\xbb\xbb\xbb\xbb\xbb'   # MAC address of peer's wifi interface
-//|     e.add_peer(peer)
+//|     peer = espnow.Peer(mac=b'\xaa\xaa\xaa\xaa\xaa\xaa')
+//|     e.peers.append(peer)
 //|
-//|     e.send("Starting...")   # Send to all peers
+//|     e.send("Starting...")
 //|     for i in range(100):
 //|         e.send(peer, str(i)*20, True)
-//|         e.send(b'end')
+//|     e.send(b'end')
 //|
 //| **Receiver**
 //|
@@ -60,16 +61,18 @@
 //|     import espnow
 //|
 //|     e = espnow.ESPNow()
-//|     e.active(True)
-//|     peer = b'\xaa\xaa\xaa\xaa\xaa\xaa'   # MAC address of peer's wifi interface
-//|     e.add_peer(peer)
+//|     packets = []
 //|
 //|     while True:
-//|         host, msg = e.recv()
-//|         if msg:             # msg == None if timeout in recv()
-//|             print(host, msg)
-//|             if msg == b'end':
+//|         if e:
+//|             packet = e.recv()
+//|             packets.append(packet)
+//|             if packet.msg == b'end':
 //|                 break
+//|
+//|     print("packets:", f"length={len(packets)}")
+//|     for packet in packets:
+//|         print(packet)
 //| """
 //| ...
 //|
@@ -81,6 +84,8 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ESPNow),      MP_ROM_PTR(&espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowPacket),MP_ROM_PTR(&espnow_packet_type_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Peer),        MP_ROM_PTR(&espnow_peer_type) },
+    { MP_ROM_QSTR(MP_QSTR_Peers),       MP_ROM_PTR(&espnow_peers_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table);
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 6e49f5f54a..e906c2a9d6 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -123,7 +123,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
 }
 
 bool common_hal_espnow_deinited(espnow_obj_t *self) {
-    return self->recv_buffer == NULL;
+    return self == NULL || self->recv_buffer == NULL;
 }
 
 // Initialize the ESP-NOW software stack,
@@ -154,7 +154,7 @@ void common_hal_espnow_init(espnow_obj_t *self) {
 // De-initialize the ESP-NOW software stack,
 // disable callbacks and deallocate the recv data buffers.
 void common_hal_espnow_deinit(espnow_obj_t *self) {
-    if (self == NULL || common_hal_espnow_deinited(self)) {
+    if (common_hal_espnow_deinited(self)) {
         return;
     }
 
@@ -164,7 +164,7 @@ void common_hal_espnow_deinit(espnow_obj_t *self) {
 
     self->recv_buffer->buf = NULL;
     self->recv_buffer = NULL;
-    self->peers_count = 0; // esp_now_deinit() removes all peers.
+    // self->peers_count = 0; // esp_now_deinit() removes all peers.
     self->tx_packets = self->tx_responses;
 }
 
@@ -278,7 +278,7 @@ mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8
 
     // Increment the sent packet count.
     // If mac == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
-    self->tx_packets += ((mac == NULL) ? self->peers_count : 1);
+    self->tx_packets += ((mac == NULL) ? ((mp_obj_list_t *)self->peers->list)->len : 1);
 
     if (sync) {
         // Wait for and tally all the expected responses from peers
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 54761c00df..85108af7a7 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -24,8 +24,13 @@
  * THE SOFTWARE.
  */
 
+#pragma once
+
+#include "py/obj.h"
 #include "py/ringbuf.h"
 
+#include "bindings/espnow/Peers.h"
+
 #include "esp_wifi.h"
 
 // The data structure for the espnow_singleton.
@@ -39,7 +44,7 @@ typedef struct _espnow_obj_t {
     size_t tx_packets;              // # of sent packets
     volatile size_t tx_responses;   // # of sent packet responses received
     volatile size_t tx_failures;    // # of sent packet responses failed
-    size_t peers_count;             // Cache the # of peers for send(sync=True)
+    espnow_peers_obj_t *peers;      // Cache the # of peers for send(sync=True)
     mp_obj_t peers_table;           // A dictionary of discovered peers
 } espnow_obj_t;
 

From 750535d4af713d1a18825db2ff4caf46c65531fb Mon Sep 17 00:00:00 2001
From: root 
Date: Thu, 2 Feb 2023 14:55:57 -0600
Subject: [PATCH 1765/2403] Correct assignment of RMT channels on ESP32C3

---
 ports/espressif/peripherals/rmt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/espressif/peripherals/rmt.c b/ports/espressif/peripherals/rmt.c
index 362bf85748..8dea2c0ab1 100644
--- a/ports/espressif/peripherals/rmt.c
+++ b/ports/espressif/peripherals/rmt.c
@@ -40,6 +40,14 @@ void peripherals_rmt_reset(void) {
 rmt_channel_t peripherals_find_and_reserve_rmt(bool mode) {
     size_t start_channel = 0;
     size_t end_channel = RMT_CHANNEL_MAX;
+    // ESP32C3 can only send on channels 0-1 and receive on channels 2-3
+    #if defined(CONFIG_IDF_TARGET_ESP32C3)
+    if (mode == RECEIVE_MODE) {
+        start_channel = 2;
+    } else {
+        end_channel = 2;
+    }
+    #endif // ESP32C3
     #if SOC_RMT_CHANNELS_PER_GROUP > 4
     if (mode == RECEIVE_MODE) {
         start_channel = 4;

From 8ca22a8a41414b2f124b1fcb404ebd3e822f4671 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 2 Feb 2023 03:37:50 +0000
Subject: [PATCH 1766/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (995 of 995 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 b6a5eccd37..8d5e776397 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: 2023-01-29 16:16+0000\n"
+"PO-Revision-Date: 2023-02-03 04:15+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -2564,7 +2564,7 @@ msgstr "a matriz possui muitas dimensões"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "a array é grande demais"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -3830,7 +3830,7 @@ msgstr "Apenas o mono é compatível"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "somente os ndarrays podem ser concatenados"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"

From f100838ae56aa8e2ecbc00c039c35be80c91b8e1 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:14:50 +0530
Subject: [PATCH 1767/2403] remove `peers_table` from espnow

---
 ports/espressif/bindings/espnow/ESPNow.c   | 24 --------
 ports/espressif/common-hal/espnow/ESPNow.c | 72 +++++-----------------
 ports/espressif/common-hal/espnow/ESPNow.h |  1 -
 3 files changed, 15 insertions(+), 82 deletions(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 9a1ddfb80f..622f80020d 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -95,10 +95,6 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     common_hal_espnow_set_phy_rate(self, args[ARG_phy_rate].u_int);
 
     self->peers = espnow_peers_new();
-    self->peers_table = mp_obj_new_dict(0);
-
-    // Prevent user code modifying the dict
-    mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
 
     // Set the global singleton pointer for the espnow protocol.
     MP_STATE_PORT(espnow_singleton) = self;
@@ -277,25 +273,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 MP_PROPERTY_GETTER(espnow_peers_obj,
     (mp_obj_t)&espnow_get_peers_obj);
 
-//|     peers_table: Dict[bytes, List[int]]
-//|     """The dictionary of peers we have seen. (read-only)
-//|
-//|     A `dict` of {peer: [rssi, time], ...}
-//|
-//|     where:
-//|         * peer is a byte string containing the 6-byte mac address of the peer.
-//|         * rssi is the wifi signal strength from the last msg received (in dBm from -127 to 0).
-//|         * time is the time in milliseconds since device last booted."""
-//|
-STATIC mp_obj_t espnow_get_peers_table(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->peers_table;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_table_obj, espnow_get_peers_table);
-
-MP_PROPERTY_GETTER(espnow_peers_table_obj,
-    (mp_obj_t)&espnow_get_peers_table_obj);
-
 STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     // Context managers
     { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&mp_identity_obj) },
@@ -316,7 +293,6 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
 
     // Peer related properties
     { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
-    { MP_ROM_QSTR(MP_QSTR_peers_table), MP_ROM_PTR(&espnow_peers_table_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index e906c2a9d6..a9e2e45f1f 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -95,7 +95,21 @@ static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
     }
 }
 
-static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg);
+// Get the RSSI value from the wifi packet header
+static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
+    // Warning: Secret magic to get the rssi from the wifi packet header
+    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
+    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
+    // and a espnow_frame_format_t.
+    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
+    #define SIZEOF_ESPNOW_FRAME_FORMAT 39
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
+        msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
+    #pragma GCC diagnostic pop
+    return wifi_packet->rx_ctrl.rssi;
+}
 
 // Callback triggered when an ESP-NOW packet is received.
 // Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
@@ -185,59 +199,6 @@ void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key) {
     check_esp_err(esp_now_set_pmk(key));
 }
 
-// --- Maintaining the peer table and reading RSSI values ---
-
-// We maintain a peers table for several reasons, to:
-// - support monitoring the RSSI values for all peers; and
-// - to return unique bytestrings for each peer which supports more efficient
-//   application memory usage and peer handling.
-
-// Get the RSSI value from the wifi packet header
-static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
-    // Warning: Secret magic to get the rssi from the wifi packet header
-    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
-    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
-    // and a espnow_frame_format_t.
-    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
-    #define SIZEOF_ESPNOW_FRAME_FORMAT 39
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wcast-align"
-    wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
-        msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
-    #pragma GCC diagnostic pop
-    return wifi_packet->rx_ctrl.rssi;
-}
-
-// Lookup a peer in the peers table and return a reference to the item in the peers_table.
-// Add peer to the table if it is not found (may alloc memory). Will not return NULL.
-static mp_map_elem_t *_lookup_add_peer(espnow_obj_t *self, const uint8_t *peer) {
-    // We do not want to allocate any new memory in the case that the peer
-    // already exists in the peers_table (which is almost all the time).
-    // So, we use a byte string on the stack and look that up in the dict.
-    mp_map_t *map = mp_obj_dict_get_map(self->peers_table);
-    mp_obj_str_t peer_obj = {{&mp_type_bytes}, 0, ESP_NOW_ETH_ALEN, peer};
-    mp_map_elem_t *item = mp_map_lookup(map, &peer_obj, MP_MAP_LOOKUP);
-    if (item == NULL) {
-        // If not found, add the peer using a new bytestring
-        map->is_fixed = 0;      // Allow to modify the dict
-        mp_obj_t new_peer = mp_obj_new_bytes(peer, ESP_NOW_ETH_ALEN);
-        item = mp_map_lookup(map, new_peer, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
-        item->value = mp_obj_new_list(2, NULL);
-        map->is_fixed = 1;      // Relock the dict
-    }
-    return item;
-}
-
-// Update the peers table with the new rssi value from a received packet and
-// return a reference to the item in the peers_table.
-static void _update_rssi(espnow_obj_t *self, const uint8_t *peer, int8_t rssi, uint32_t time_ms) {
-    // Lookup the peer in the device table
-    mp_map_elem_t *item = _lookup_add_peer(self, peer);
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(item->value);
-    list->items[0] = MP_OBJ_NEW_SMALL_INT(rssi);
-    list->items[1] = mp_obj_new_int(time_ms);
-}
-
 // --- Send and Receive ESP-NOW data ---
 
 // Used by espnow_send() for sends() with sync==True.
@@ -313,9 +274,6 @@ mp_obj_t common_hal_espnow_recv(espnow_obj_t *self) {
         mp_arg_error_invalid(MP_QSTR_buffer);
     }
 
-    // Update rssi value in the peer device table
-    _update_rssi(self, mac_buf, header.rssi, header.time_ms);
-
     mp_obj_t elems[4] = {
         mp_obj_new_bytes(mac_buf, ESP_NOW_ETH_ALEN),
         mp_obj_new_bytes(msg_buf, msg_len),
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 85108af7a7..63d5f94f26 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -45,7 +45,6 @@ typedef struct _espnow_obj_t {
     volatile size_t tx_responses;   // # of sent packet responses received
     volatile size_t tx_failures;    // # of sent packet responses failed
     espnow_peers_obj_t *peers;      // Cache the # of peers for send(sync=True)
-    mp_obj_t peers_table;           // A dictionary of discovered peers
 } espnow_obj_t;
 
 extern void espnow_reset(void);

From e30126e335abcdd078db2ec14cf1a30d5dc6cdbf Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:08:13 +0530
Subject: [PATCH 1768/2403] remove `sync` from espnow

---
 ports/espressif/bindings/espnow/ESPNow.c   | 13 +------
 ports/espressif/common-hal/espnow/ESPNow.c | 43 ++--------------------
 ports/espressif/common-hal/espnow/ESPNow.h |  2 +-
 3 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 622f80020d..07e80c3b67 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -205,18 +205,11 @@ MP_PROPERTY_GETTER(espnow_stats_obj,
 //|         self,
 //|         message: ReadableBuffer,
 //|         mac: Optional[ReadableBuffer],
-//|         sync: bool = True,
 //|     ) -> bool:
-//|         """Send a message to the peer's mac address. Optionally wait for a response.
+//|         """Send a message to the peer's mac address.
 //|
 //|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
 //|         :param ReadableBuffer mac: The peer's address (length = 6 bytes). If `None` or any non-true value, send to all registered peers.
-//|         :param bool sync: If `True`, wait for response from peer(s) after sending.
-//|
-//|         :returns:
-//|             `True` if sync == `False` and message sent successfully.
-//|             `True` if sync == `True` and message is received successfully by all recipients
-//|             `False` if sync == `True` and message is not received by at least one recipient
 //|
 //|         :raises EAGAIN: if the internal espnow buffers are full."""
 //|         ...
@@ -225,7 +218,6 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_mac,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
-        { MP_QSTR_sync,     MP_ARG_BOOL, { .u_bool = mp_const_true } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -234,14 +226,13 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     espnow_obj_t *self = pos_args[0];
     check_for_deinit(self);
 
-    const bool sync = mp_obj_is_true(args[ARG_sync].u_obj);
     const uint8_t *peer_addr = _get_peer_addr(args[ARG_mac].u_obj);
 
     // Get a pointer to the data buffer of the message
     mp_buffer_info_t message;
     mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
 
-    return common_hal_espnow_send(self, sync, peer_addr, &message);
+    return common_hal_espnow_send(self, peer_addr, &message);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index a9e2e45f1f..b95258f5f5 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -49,12 +49,7 @@
 #define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
 
 // Time to wait (millisec) for responses from sent packets: (2 seconds).
-#define DEFAULT_SEND_TIMEOUT_MS (2 * 1000)
-
-// Number of milliseconds to wait for pending responses to sent packets.
-// This is a fallback which should never be reached.
-#define PENDING_RESPONSES_TIMEOUT_MS    100
-#define PENDING_RESPONSES_BUSY_POLL_MS  10
+#define DEFAULT_SEND_TIMEOUT_MS (1000)
 
 // ESPNow packet format for the receive buffer.
 // Use this for peeking at the header of the next packet in the buffer.
@@ -201,34 +196,10 @@ void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key) {
 
 // --- Send and Receive ESP-NOW data ---
 
-// Used by espnow_send() for sends() with sync==True.
-// Wait till all pending sent packet responses have been received.
-// ie. self->tx_responses == self->tx_packets.
-static void _wait_for_pending_responses(espnow_obj_t *self) {
-    mp_uint_t t, start = mp_hal_ticks_ms();
-    while (self->tx_responses < self->tx_packets) {
-        if ((t = mp_hal_ticks_ms() - start) > PENDING_RESPONSES_TIMEOUT_MS) {
-            mp_raise_OSError(MP_ETIMEDOUT);
-        }
-        if (t > PENDING_RESPONSES_BUSY_POLL_MS) {
-            // After 10ms of busy waiting give other tasks a look in.
-            RUN_BACKGROUND_TASKS;
-        }
-    }
-}
 
-mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8_t *mac, const mp_buffer_info_t *message) {
-    if (sync) {
-        // Flush out any pending responses.
-        // If the last call was sync == False there may be outstanding responses
-        // still to be received (possible many if we just had a burst of unsync send()s).
-        // We need to wait for all pending responses if this call has sync = True.
-        _wait_for_pending_responses(self);
-    }
-
-    // Send the packet - try, try again if internal esp-now buffers are full.
+mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp_buffer_info_t *message) {
+    // Send the packet - keep trying until timeout if the internal esp-now buffers are full.
     esp_err_t err;
-    size_t saved_failures = self->tx_failures;
     mp_uint_t start = mp_hal_ticks_ms();
 
     while ((ESP_ERR_ESPNOW_NO_MEM == (err = esp_now_send(mac, message->buf, message->len))) &&
@@ -241,13 +212,7 @@ mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8
     // If mac == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
     self->tx_packets += ((mac == NULL) ? ((mp_obj_list_t *)self->peers->list)->len : 1);
 
-    if (sync) {
-        // Wait for and tally all the expected responses from peers
-        _wait_for_pending_responses(self);
-    }
-
-    // Return False if sync and any peers did not respond.
-    return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
+    return mp_const_none;
 }
 
 mp_obj_t common_hal_espnow_recv(espnow_obj_t *self) {
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 63d5f94f26..02ca90d5c4 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -57,5 +57,5 @@ extern void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value
 extern void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value);
 extern void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key);
 
-extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const bool sync, const uint8_t *mac, const mp_buffer_info_t *message);
+extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp_buffer_info_t *message);
 extern mp_obj_t common_hal_espnow_recv(espnow_obj_t *self);

From cac90a6969a02c7879764c80c672af4b4eb75708 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:35:06 +0530
Subject: [PATCH 1769/2403] refactor common espnow functions

---
 ports/espressif/bindings/espnow/ESPNow.c     | 20 ++---------
 ports/espressif/bindings/espnow/Peer.c       | 24 +++----------
 ports/espressif/common-hal/espnow/__init__.c | 37 ++++++++++++++++++++
 ports/espressif/common-hal/espnow/__init__.h | 30 ++++++++++++++++
 4 files changed, 75 insertions(+), 36 deletions(-)
 create mode 100644 ports/espressif/common-hal/espnow/__init__.c
 create mode 100644 ports/espressif/common-hal/espnow/__init__.h

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 07e80c3b67..39eb7a5019 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -36,25 +36,11 @@
 
 #include "shared-bindings/util.h"
 
+#include "common-hal/espnow/__init__.h"
 #include "common-hal/espnow/ESPNow.h"
 
 #include "esp_now.h"
 
-// Return C pointer to byte memory string/bytes/bytearray in obj.
-// Raise ValueError if the length does not match expected len.
-static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(obj, &bufinfo, rw);
-    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
-    return (uint8_t *)bufinfo.buf;
-}
-
-// Return C pointer to the MAC address.
-// Raise ValueError if mac is wrong type or is not 6 bytes long.
-static const uint8_t *_get_peer_addr(mp_obj_t mac) {
-    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
-}
-
 // --- Initialisation and Config functions ---
 
 static void check_for_deinit(espnow_obj_t *self) {
@@ -136,7 +122,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj
 //|         ...
 STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_set_pmk(self, _get_bytes_len(key, ESP_NOW_KEY_LEN, MP_BUFFER_READ));
+    common_hal_espnow_set_pmk(self, common_hal_espnow_get_bytes_len(key, ESP_NOW_KEY_LEN));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
@@ -226,7 +212,7 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     espnow_obj_t *self = pos_args[0];
     check_for_deinit(self);
 
-    const uint8_t *peer_addr = _get_peer_addr(args[ARG_mac].u_obj);
+    const uint8_t *peer_addr = common_hal_espnow_get_bytes_len(args[ARG_mac].u_obj, ESP_NOW_ETH_ALEN);
 
     // Get a pointer to the data buffer of the message
     mp_buffer_info_t message;
diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
index 6dcf2732aa..7b6cc5f668 100644
--- a/ports/espressif/bindings/espnow/Peer.c
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -29,25 +29,11 @@
 #include "py/runtime.h"
 
 #include "bindings/espnow/Peer.h"
+#include "common-hal/espnow/__init__.h"
 
 // TODO: check peer already exist
 // TODO: check peer dosen't exist
 
-// Return C pointer to the ReadableBuffer.
-// Raise ValueError if the length does not match expected len.
-static const uint8_t *_get_bytes_len(mp_obj_t obj, size_t len, mp_uint_t rw) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(obj, &bufinfo, rw);
-    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
-    return (uint8_t *)bufinfo.buf;
-}
-
-// Return C pointer to the MAC address.
-// Raise ValueError if mac is wrong type or is not 6 bytes long.
-static const uint8_t *_get_peer_addr(mp_obj_t mac) {
-    return mp_obj_is_true(mac) ? _get_bytes_len(mac, ESP_NOW_ETH_ALEN, MP_BUFFER_READ) : NULL;
-}
-
 //| class Peer:
 //|     """A data class to store parameters specific to a peer."""
 //|
@@ -89,7 +75,7 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
         .encrypt = false
     };
 
-    memcpy(self->peer_info.peer_addr, _get_peer_addr(args[ARG_mac].u_obj), ESP_NOW_ETH_ALEN);
+    memcpy(self->peer_info.peer_addr, common_hal_espnow_get_bytes_len(args[ARG_mac].u_obj, ESP_NOW_ETH_ALEN), ESP_NOW_ETH_ALEN);
 
     const mp_obj_t channel = args[ARG_channel].u_obj;
     if (channel != mp_const_none) {
@@ -108,7 +94,7 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     const mp_obj_t lmk = args[ARG_lmk].u_obj;
     if (lmk != mp_const_none) {
-        memcpy(self->peer_info.lmk, _get_bytes_len(lmk, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
+        memcpy(self->peer_info.lmk, common_hal_espnow_get_bytes_len(lmk, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN);
     } else if (self->peer_info.encrypt && !self->peer_info.lmk) {
         mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
     }
@@ -128,7 +114,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_mac_obj, espnow_peer_get_mac);
 STATIC mp_obj_t espnow_peer_set_mac(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    memcpy(self->peer_info.peer_addr, _get_peer_addr(value), ESP_NOW_ETH_ALEN);
+    memcpy(self->peer_info.peer_addr, common_hal_espnow_get_bytes_len(value, ESP_NOW_ETH_ALEN), ESP_NOW_ETH_ALEN);
     esp_now_mod_peer(&self->peer_info);
 
     return mp_const_none;
@@ -151,7 +137,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_lmk_obj, espnow_peer_get_lmk);
 STATIC mp_obj_t espnow_peer_set_lmk(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    memcpy(self->peer_info.lmk, _get_bytes_len(value, ESP_NOW_KEY_LEN, MP_BUFFER_READ), ESP_NOW_KEY_LEN);
+    memcpy(self->peer_info.lmk, common_hal_espnow_get_bytes_len(value, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN);
     esp_now_mod_peer(&self->peer_info);
 
     return mp_const_none;
diff --git a/ports/espressif/common-hal/espnow/__init__.c b/ports/espressif/common-hal/espnow/__init__.c
new file mode 100644
index 0000000000..498cd49dc9
--- /dev/null
+++ b/ports/espressif/common-hal/espnow/__init__.c
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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 "common-hal/espnow/__init__.h"
+#include "py/runtime.h"
+
+// Return C pointer to byte memory string/bytes/bytearray in obj.
+// Raise ValueError if the length does not match expected len.
+const uint8_t *common_hal_espnow_get_bytes_len(mp_obj_t obj, size_t len) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
+    mp_arg_validate_length(bufinfo.len, len, MP_QSTR_buffer);
+    return (uint8_t *)bufinfo.buf;
+}
diff --git a/ports/espressif/common-hal/espnow/__init__.h b/ports/espressif/common-hal/espnow/__init__.h
new file mode 100644
index 0000000000..bb1950d98c
--- /dev/null
+++ b/ports/espressif/common-hal/espnow/__init__.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+extern const uint8_t *common_hal_espnow_get_bytes_len(mp_obj_t obj, size_t len);

From a1644f15ea7278cdf2fb96a25f549bafc3d8c8a9 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 15:42:44 +0530
Subject: [PATCH 1770/2403] use esp error for espnow

---
 locale/circuitpython.pot                     | 32 +++----
 ports/espressif/Makefile                     | 10 ++-
 ports/espressif/bindings/espnow/Peers.c      | 12 +--
 ports/espressif/common-hal/espidf/__init__.c |  9 +-
 ports/espressif/common-hal/espnow/ESPNow.c   | 30 +++----
 ports/espressif/esp_error.c                  | 91 --------------------
 6 files changed, 46 insertions(+), 138 deletions(-)
 delete mode 100644 ports/espressif/esp_error.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 10993652aa..4337991721 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -222,7 +222,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -680,7 +680,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1067,7 +1067,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1235,8 +1235,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
 
@@ -1266,7 +1265,7 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1275,7 +1274,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1307,7 +1306,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1667,11 +1666,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1679,7 +1678,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1855,7 +1854,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1875,7 +1874,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2341,7 +2340,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
@@ -2431,11 +2430,6 @@ msgstr ""
 msgid "addresses is empty"
 msgstr ""
 
-#: ports/espressif/bindings/espnow/Peers.c
-#: ports/espressif/common-hal/espnow/ESPNow.c
-msgid "an error occured"
-msgstr ""
-
 #: py/compile.c
 msgid "annotation must be an identifier"
 msgstr ""
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index d844fc88bd..cc6d451153 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -218,7 +218,6 @@ endif
 SRC_C += \
 	background.c \
 	mphalport.c \
-	bindings/espidf/__init__.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	shared/netutils/netutils.c \
@@ -252,8 +251,6 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 SRC_C += common-hal/_bleio/ble_events.c
 endif
 
-SRC_C += $(wildcard common-hal/espidf/*.c)
-
 ifneq ($(CIRCUITPY_ESPCAMERA),0)
 SRC_CAMERA := \
 	$(wildcard common-hal/espcamera/*.c) \
@@ -263,6 +260,13 @@ CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
+ifneq ($(CIRCUITPY_ESPIDF),0)
+SRC_ESPIDF := \
+	$(wildcard common-hal/espidf/*.c) \
+	$(wildcard bindings/espidf/*.c)
+SRC_C += $(SRC_ESPIDF)
+endif
+
 ifneq ($(CIRCUITPY_ESPNOW),0)
 SRC_ESPNOW := \
 	$(wildcard common-hal/espnow/*.c) \
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
index 4f0c310f3d..13c44c3423 100644
--- a/ports/espressif/bindings/espnow/Peers.c
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -28,17 +28,13 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 
+#include "bindings/espidf/__init__.h"
+
 #include "bindings/espnow/Peer.h"
 #include "bindings/espnow/Peers.h"
 
 #include "esp_now.h"
 
-static void check_esp_err(esp_err_t status) {
-    if (status != ESP_OK) {
-        mp_raise_RuntimeError(translate("an error occured"));
-    }
-}
-
 //| class Peers:
 //|     """A class that provides peer managment functions. Sequence[Peer]."""
 //|
@@ -51,7 +47,7 @@ static void check_esp_err(esp_err_t status) {
 //|         ...
 STATIC mp_obj_t espnow_peers_append(mp_obj_t self_in, mp_obj_t arg) {
     espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer));
-    check_esp_err(esp_now_add_peer(&peer->peer_info));
+    CHECK_ESP_RESULT(esp_now_add_peer(&peer->peer_info));
     espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_list_append(self->list, arg);
 }
@@ -66,7 +62,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_append_obj, espnow_peers_append);
 //|
 STATIC mp_obj_t espnow_peers_remove(mp_obj_t self_in, mp_obj_t arg) {
     espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer));
-    check_esp_err(esp_now_del_peer(peer->peer_info.peer_addr));
+    CHECK_ESP_RESULT(esp_now_del_peer(peer->peer_info.peer_addr));
     espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_list_remove(self->list, arg);
 }
diff --git a/ports/espressif/common-hal/espidf/__init__.c b/ports/espressif/common-hal/espidf/__init__.c
index 183ebb3817..d2d00ebc56 100644
--- a/ports/espressif/common-hal/espidf/__init__.c
+++ b/ports/espressif/common-hal/espidf/__init__.c
@@ -29,7 +29,9 @@
 #include "supervisor/memory.h"
 #include "py/runtime.h"
 
+#include "esp_now.h"
 #include "esp_log.h"
+
 #define TAG "espidf"
 
 #ifdef CONFIG_SPIRAM
@@ -180,14 +182,19 @@ void raise_esp_error(esp_err_t err) {
 
     // tests must be in descending order
     MP_STATIC_ASSERT(ESP_ERR_FLASH_BASE > ESP_ERR_MESH_BASE);
-    MP_STATIC_ASSERT(ESP_ERR_MESH_BASE > ESP_ERR_WIFI_BASE);
+    MP_STATIC_ASSERT(ESP_ERR_MESH_BASE > ESP_ERR_ESPNOW_BASE);
+    MP_STATIC_ASSERT(ESP_ERR_ESPNOW_BASE > ESP_ERR_WIFI_BASE);
+
     if (err >= ESP_ERR_FLASH_BASE) {
         group = "Flash";
     } else if (err >= ESP_ERR_MESH_BASE) {
         group = "Mesh";
+    } else if (err >= ESP_ERR_ESPNOW_BASE) {
+        group = "ESP-NOW";
     } else if (err >= ESP_ERR_WIFI_BASE) {
         group = "WiFi";
     }
+
     mp_raise_msg_varg(exception_type, translate("%s error 0x%x"), group, err);
 }
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index b95258f5f5..19c0e4a116 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -30,7 +30,9 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
+#include "bindings/espidf/__init__.h"
 #include "bindings/espnow/ESPNowPacket.h"
+
 #include "shared-bindings/wifi/__init__.h"
 
 #include "common-hal/espnow/ESPNow.h"
@@ -41,6 +43,8 @@
 
 #define ESPNOW_MAGIC 0x99
 
+// TODO: deinit wifi?
+
 // The maximum length of an espnow packet (bytes)
 #define MAX_PACKET_LEN (sizeof(espnow_packet_t) + ESP_NOW_MAX_DATA_LEN)
 
@@ -66,12 +70,6 @@ typedef struct {
     uint8_t msg[0];             // Message is up to 250 bytes
 } __attribute__((packed)) espnow_packet_t;
 
-static void check_esp_err(esp_err_t status) {
-    if (status != ESP_OK) {
-        mp_raise_RuntimeError(translate("an error occured"));
-    }
-}
-
 // Return a pointer to the ESPNow module singleton
 static espnow_obj_t *_get_singleton(void) {
     return MP_STATE_PORT(espnow_singleton);
@@ -152,12 +150,12 @@ void common_hal_espnow_init(espnow_obj_t *self) {
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
     }
 
-    check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, self->phy_rate));
-    check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, self->phy_rate));
+    CHECK_ESP_RESULT(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, self->phy_rate));
+    CHECK_ESP_RESULT(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, self->phy_rate));
 
-    check_esp_err(esp_now_init());
-    check_esp_err(esp_now_register_send_cb(send_cb));
-    check_esp_err(esp_now_register_recv_cb(recv_cb));
+    CHECK_ESP_RESULT(esp_now_init());
+    CHECK_ESP_RESULT(esp_now_register_send_cb(send_cb));
+    CHECK_ESP_RESULT(esp_now_register_recv_cb(recv_cb));
 }
 
 // De-initialize the ESP-NOW software stack,
@@ -167,9 +165,9 @@ void common_hal_espnow_deinit(espnow_obj_t *self) {
         return;
     }
 
-    check_esp_err(esp_now_unregister_send_cb());
-    check_esp_err(esp_now_unregister_recv_cb());
-    check_esp_err(esp_now_deinit());
+    CHECK_ESP_RESULT(esp_now_unregister_send_cb());
+    CHECK_ESP_RESULT(esp_now_unregister_recv_cb());
+    CHECK_ESP_RESULT(esp_now_deinit());
 
     self->recv_buffer->buf = NULL;
     self->recv_buffer = NULL;
@@ -191,7 +189,7 @@ void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value) {
 };
 
 void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key) {
-    check_esp_err(esp_now_set_pmk(key));
+    CHECK_ESP_RESULT(esp_now_set_pmk(key));
 }
 
 // --- Send and Receive ESP-NOW data ---
@@ -206,7 +204,7 @@ mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp
            (mp_hal_ticks_ms() - start) <= DEFAULT_SEND_TIMEOUT_MS) {
         RUN_BACKGROUND_TASKS;
     }
-    check_esp_err(err);
+    CHECK_ESP_RESULT(err);
 
     // Increment the sent packet count.
     // If mac == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
diff --git a/ports/espressif/esp_error.c b/ports/espressif/esp_error.c
deleted file mode 100644
index 4bc44674b7..0000000000
--- a/ports/espressif/esp_error.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Jeff Epler for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "esp_error.h"
-#include "py/runtime.h"
-
-#include "bindings/espidf/__init__.h"
-
-void raise_esp_error(esp_err_t err) {
-    const compressed_string_t *msg = NULL;
-    const mp_obj_type_t *exception_type = &mp_type_espidf_IDFError;
-    switch (err) {
-        case ESP_FAIL:
-            msg = translate("Generic Failure");
-            break;
-        case ESP_ERR_NO_MEM:
-            exception_type = &mp_type_espidf_MemoryError;
-            msg = translate("Out of memory");
-            break;
-        case ESP_ERR_INVALID_ARG:
-            msg = translate("Invalid argument");
-            break;
-        case ESP_ERR_INVALID_STATE:
-            msg = translate("Invalid state");
-            break;
-        case ESP_ERR_INVALID_SIZE:
-            msg = translate("Invalid size");
-            break;
-        case ESP_ERR_NOT_FOUND:
-            msg = translate("Requested resource not found");
-            break;
-        case ESP_ERR_NOT_SUPPORTED:
-            msg = translate("Operation or feature not supported");
-            break;
-        case ESP_ERR_TIMEOUT:
-            msg = translate("Operation timed out");
-            break;
-        case ESP_ERR_INVALID_RESPONSE:
-            msg = translate("Received response was invalid");
-            break;
-        case ESP_ERR_INVALID_CRC:
-            msg = translate("CRC or checksum was invalid");
-            break;
-        case ESP_ERR_INVALID_VERSION:
-            msg = translate("Version was invalid");
-            break;
-        case ESP_ERR_INVALID_MAC:
-            msg = translate("MAC address was invalid");
-            break;
-    }
-    if (msg) {
-        mp_raise_msg(exception_type, msg);
-    }
-
-    const char *group = "ESP-IDF";
-
-    // tests must be in descending order
-    MP_STATIC_ASSERT(ESP_ERR_FLASH_BASE > ESP_ERR_MESH_BASE);
-    MP_STATIC_ASSERT(ESP_ERR_MESH_BASE > ESP_ERR_WIFI_BASE);
-    if (err >= ESP_ERR_FLASH_BASE) {
-        group = "Flash";
-    } else if (err >= ESP_ERR_MESH_BASE) {
-        group = "Mesh";
-    } else if (err >= ESP_ERR_WIFI_BASE) {
-        group = "WiFi";
-    }
-    mp_raise_msg_varg(exception_type, translate("%s error 0x%x"), group, err);
-}

From f13e6d8758df942acdb4c89f6b4a458858bb5109 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 3 Feb 2023 11:25:50 -0500
Subject: [PATCH 1771/2403] update flash chip for Metro M7 1011

---
 ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.h  | 2 +-
 ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.h b/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.h
index 23009f353f..589b2a2b65 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.h
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.h
@@ -7,7 +7,7 @@
 // make sure you don't overwrite code
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 
-#define BOARD_FLASH_SIZE (4 * 1024 * 1024)
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO_02)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO_01)
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.mk b/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.mk
index 2655217c78..56155aa4d0 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_MANUFACTURER = "Adafruit"
 
 CHIP_VARIANT = MIMXRT1011DAE5A
 CHIP_FAMILY = MIMXRT1011
-FLASH = W25Q32JV
+FLASH = W25Q64JV
 
 # Include these Python libraries in the firmware
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI

From ff95e9616099e2b7f14b46c69a556714d41359ed Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 01:03:33 +0530
Subject: [PATCH 1772/2403] add `ESPNowStats` class and more

---
 ports/espressif/bindings/espnow/ESPNow.c      | 81 +++++++++--------
 .../espressif/bindings/espnow/ESPNowPacket.c  |  4 +-
 ports/espressif/bindings/espnow/ESPNowStats.c | 87 +++++++++++++++++++
 ports/espressif/bindings/espnow/ESPNowStats.h | 38 ++++++++
 ports/espressif/bindings/espnow/Peers.c       |  2 +
 ports/espressif/bindings/espnow/__init__.c    |  4 +-
 ports/espressif/common-hal/espnow/ESPNow.c    | 77 ++++++++--------
 ports/espressif/common-hal/espnow/ESPNow.h    | 11 ++-
 8 files changed, 220 insertions(+), 84 deletions(-)
 create mode 100644 ports/espressif/bindings/espnow/ESPNowStats.c
 create mode 100644 ports/espressif/bindings/espnow/ESPNowStats.h

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 39eb7a5019..33bb882873 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -27,9 +27,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/objarray.h"
 #include "py/objproperty.h"
+#include "py/runtime.h"
 #include "py/stream.h"
 
 #include "bindings/espnow/ESPNow.h"
@@ -74,19 +73,15 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         mp_raise_RuntimeError(translate("Already running"));
     }
 
+    // Allocate a new object
     self = m_new_obj(espnow_obj_t);
     self->base.type = &espnow_type;
 
-    common_hal_espnow_set_buffer_size(self, args[ARG_buffer_size].u_int);
-    common_hal_espnow_set_phy_rate(self, args[ARG_phy_rate].u_int);
-
-    self->peers = espnow_peers_new();
+    // Construct the object
+    common_hal_espnow_construct(self, args[ARG_buffer_size].u_int, args[ARG_phy_rate].u_int);
 
     // Set the global singleton pointer for the espnow protocol.
     MP_STATE_PORT(espnow_singleton) = self;
-
-    common_hal_espnow_init(self);
-
     return self;
 }
 
@@ -167,23 +162,29 @@ MP_PROPERTY_GETSET(espnow_phy_rate_obj,
     (mp_obj_t)&espnow_get_phy_rate_obj,
     (mp_obj_t)&espnow_set_phy_rate_obj);
 
-//|     stats: Tuple[int, int, int, int, int]
-//|     """Provide some useful stats in a `tuple` of
-//|        (tx_packets, tx_responses, tx_failures, rx_packets, rx_failures). (read-only)"""
+//|     tx_stats: ESPNowStats
+//|     """The ``TX`` packet statistics."""
 //|
-STATIC mp_obj_t espnow_get_stats(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_tx_stats(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_TUPLE(
-        mp_obj_new_int(self->tx_packets),
-        mp_obj_new_int(self->tx_responses),
-        mp_obj_new_int(self->tx_failures),
-        mp_obj_new_int(self->rx_packets),
-        mp_obj_new_int(self->rx_failures));
+    return MP_OBJ_FROM_PTR(self->tx_stats);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_stats_obj, espnow_get_stats);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_tx_stats_obj, espnow_get_tx_stats);
 
-MP_PROPERTY_GETTER(espnow_stats_obj,
-    (mp_obj_t)&espnow_get_stats_obj);
+MP_PROPERTY_GETTER(espnow_tx_stats_obj,
+    (mp_obj_t)&espnow_get_tx_stats_obj);
+
+//|     rx_stats: ESPNowStats
+//|     """The ``RX`` packet statistics."""
+//|
+STATIC mp_obj_t espnow_get_rx_stats(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_FROM_PTR(self->rx_stats);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_rx_stats_obj, espnow_get_rx_stats);
+
+MP_PROPERTY_GETTER(espnow_rx_stats_obj,
+    (mp_obj_t)&espnow_get_rx_stats_obj);
 
 // --- Send and Receive ESP-NOW data ---
 
@@ -195,9 +196,8 @@ MP_PROPERTY_GETTER(espnow_stats_obj,
 //|         """Send a message to the peer's mac address.
 //|
 //|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
-//|         :param ReadableBuffer mac: The peer's address (length = 6 bytes). If `None` or any non-true value, send to all registered peers.
-//|
-//|         :raises EAGAIN: if the internal espnow buffers are full."""
+//|         :param ReadableBuffer mac: The peer's address (length = 6 bytes).
+//|             If `None` or any non-true value, send to all registered peers."""
 //|         ...
 STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_message, ARG_mac, ARG_sync };
@@ -255,6 +255,7 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&espnow___exit___obj) },
 
+    // Deinit the object
     { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&espnow_deinit_obj) },
 
     // Config parameters
@@ -262,7 +263,9 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_buffer_size), MP_ROM_PTR(&espnow_buffer_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_stats),       MP_ROM_PTR(&espnow_stats_obj) },
+    // Packet statistics
+    { MP_ROM_QSTR(MP_QSTR_tx_stats),    MP_ROM_PTR(&espnow_tx_stats_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rx_stats),    MP_ROM_PTR(&espnow_rx_stats_obj) },
 
     // Send and receive messages
     { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
@@ -278,21 +281,25 @@ STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
 STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    if (request != MP_STREAM_POLL) {
-        *errcode = MP_EINVAL;
-        return MP_STREAM_ERROR;
-    }
-
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return (common_hal_espnow_deinited(self)) ? 0 : // If not initialized
-           arg ^ (
-               // If no data in the buffer, unset the Read ready flag
-               ((!ringbuf_num_filled(self->recv_buffer)) ? MP_STREAM_POLL_RD : 0) |
-               // If still waiting for responses, unset the Write ready flag
-               ((self->tx_responses < self->tx_packets) ? MP_STREAM_POLL_WR : 0));
+    check_for_deinit(self);
+    switch (request) {
+        case MP_STREAM_POLL: {
+            mp_uint_t flags = arg;
+            mp_uint_t ret = 0;
+            if ((flags & MP_STREAM_POLL_RD) && ringbuf_num_filled(self->recv_buffer) > 0) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+            return ret;
+        }
+        default:
+            *errcode = MP_EINVAL;
+            return MP_STREAM_ERROR;
+    }
 }
 
 STATIC const mp_stream_p_t espnow_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
     .ioctl = espnow_stream_ioctl,
 };
 
diff --git a/ports/espressif/bindings/espnow/ESPNowPacket.c b/ports/espressif/bindings/espnow/ESPNowPacket.c
index 9d582a00eb..7cbf2caed0 100644
--- a/ports/espressif/bindings/espnow/ESPNowPacket.c
+++ b/ports/espressif/bindings/espnow/ESPNowPacket.c
@@ -27,7 +27,7 @@
 #include "bindings/espnow/ESPNowPacket.h"
 
 //| class ESPNowPacket:
-//|     """A packet retreived from ESP-NOW communication protocol"""
+//|     """A packet retrieved from ESP-NOW communication protocol"""
 //|
 //|     mac: ReadableBuffer
 //|     """The sender's mac address (length = 6 bytes)"""
@@ -39,7 +39,7 @@
 //|     """The received signal strength indication (in dBm from -127 to 0)"""
 //|
 //|     time: int
-//|     """The is the time in milliseconds since device last booted"""
+//|     """The time in milliseconds since the device last booted when the packet was received"""
 //|
 
 const mp_obj_namedtuple_type_t espnow_packet_type_obj = {
diff --git a/ports/espressif/bindings/espnow/ESPNowStats.c b/ports/espressif/bindings/espnow/ESPNowStats.c
new file mode 100644
index 0000000000..babd8e4d83
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNowStats.c
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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 "bindings/espnow/ESPNowStats.h"
+#include "py/objproperty.h"
+
+//| class ESPNowStats:
+//|     """Provide some useful packet tx/rx statistics."""
+//|
+
+//|     success: int
+//|     """The number of successes. (read-only)
+//|
+//|     * In case of transmit ``TX``:
+//|         The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``.
+//|
+//|     * In case of receive ``RX``:
+//|         The number of rx packets captured in the buffer."""
+//|
+STATIC mp_obj_t espnow_stats_get_success(const mp_obj_t self_in) {
+    espnow_stats_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->success);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_get_success_obj, espnow_stats_get_success);
+
+MP_PROPERTY_GETTER(espnow_stats_success_obj,
+    (mp_obj_t)&espnow_stats_get_success_obj);
+
+//|     failure: int
+//|     """The number of failures. (read-only)
+//|
+//|     * In case of transmit ``TX``:
+//|         The number of failed tx packets ``ESP_NOW_SEND_FAIL``.
+//|
+//|     * In case of receive ``RX``:
+//|         The number of dropped rx packets due to buffer overflow."""
+//|
+STATIC mp_obj_t espnow_stats_get_failure(const mp_obj_t self_in) {
+    espnow_stats_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->failure);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_get_failure_obj, espnow_stats_get_failure);
+
+MP_PROPERTY_GETTER(espnow_stats_failure_obj,
+    (mp_obj_t)&espnow_stats_get_failure_obj);
+
+STATIC const mp_rom_map_elem_t espnow_stats_locals_dict_table[] = {
+    // Peer parameters
+    { MP_ROM_QSTR(MP_QSTR_success), MP_ROM_PTR(&espnow_stats_success_obj) },
+    { MP_ROM_QSTR(MP_QSTR_failure), MP_ROM_PTR(&espnow_stats_failure_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_stats_locals_dict, espnow_stats_locals_dict_table);
+
+espnow_stats_obj_t *espnow_stats_new(void) {
+    espnow_stats_obj_t *self = m_new_obj(espnow_stats_obj_t);
+    self->base.type = &espnow_stats_type;
+    return self;
+}
+
+const mp_obj_type_t espnow_stats_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ESPNowStats,
+    .locals_dict = (mp_obj_t)&espnow_stats_locals_dict,
+};
diff --git a/ports/espressif/bindings/espnow/ESPNowStats.h b/ports/espressif/bindings/espnow/ESPNowStats.h
new file mode 100644
index 0000000000..a9a578a8bf
--- /dev/null
+++ b/ports/espressif/bindings/espnow/ESPNowStats.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    volatile size_t success;
+    volatile size_t failure;
+} espnow_stats_obj_t;
+
+const mp_obj_type_t espnow_stats_type;
+extern espnow_stats_obj_t *espnow_stats_new(void);
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
index 13c44c3423..843bff644a 100644
--- a/ports/espressif/bindings/espnow/Peers.c
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -35,6 +35,8 @@
 
 #include "esp_now.h"
 
+// TODO: Check for deinit
+
 //| class Peers:
 //|     """A class that provides peer managment functions. Sequence[Peer]."""
 //|
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index d92221c691..f64a6433dd 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -29,6 +29,7 @@
 #include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
 #include "bindings/espnow/ESPNowPacket.h"
+#include "bindings/espnow/ESPNowStats.h"
 #include "bindings/espnow/Peer.h"
 #include "bindings/espnow/Peers.h"
 
@@ -51,7 +52,7 @@
 //|
 //|     e.send("Starting...")
 //|     for i in range(100):
-//|         e.send(peer, str(i)*20, True)
+//|         e.send(str(i)*20)
 //|     e.send(b'end')
 //|
 //| **Receiver**
@@ -84,6 +85,7 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ESPNow),      MP_ROM_PTR(&espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowPacket),MP_ROM_PTR(&espnow_packet_type_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ESPNowStats), MP_ROM_PTR(&espnow_stats_type) },
     { MP_ROM_QSTR(MP_QSTR_Peer),        MP_ROM_PTR(&espnow_peer_type) },
     { MP_ROM_QSTR(MP_QSTR_Peers),       MP_ROM_PTR(&espnow_peers_type) },
 };
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 19c0e4a116..96a7cfdfaa 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -45,14 +45,15 @@
 
 // TODO: deinit wifi?
 
-// The maximum length of an espnow packet (bytes)
+// The min/max length of an espnow packet (bytes)
+#define MIN_PACKET_LEN (sizeof(espnow_packet_t))
 #define MAX_PACKET_LEN (sizeof(espnow_packet_t) + ESP_NOW_MAX_DATA_LEN)
 
 // Enough for 2 full-size packets: 2 * (6 + 7 + 250) = 526 bytes
 // Will allocate an additional 7 bytes for buffer overhead
 #define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
 
-// Time to wait (millisec) for responses from sent packets: (2 seconds).
+// Time to wait (millisec) for responses from sent packets: (1 seconds).
 #define DEFAULT_SEND_TIMEOUT_MS (1000)
 
 // ESPNow packet format for the receive buffer.
@@ -70,27 +71,34 @@ typedef struct {
     uint8_t msg[0];             // Message is up to 250 bytes
 } __attribute__((packed)) espnow_packet_t;
 
-// Return a pointer to the ESPNow module singleton
-static espnow_obj_t *_get_singleton(void) {
-    return MP_STATE_PORT(espnow_singleton);
-}
-
 // --- The ESP-NOW send and recv callback routines ---
 
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
 static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
-    espnow_obj_t *self = _get_singleton();
-    self->tx_responses++;
-    if (status != ESP_NOW_SEND_SUCCESS) {
-        self->tx_failures++;
+    espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
+    if (status == ESP_NOW_SEND_SUCCESS) {
+        self->tx_stats->success++;
+    } else {
+        self->tx_stats->failure++;
     }
 }
 
-// Get the RSSI value from the wifi packet header
-static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
-    // Warning: Secret magic to get the rssi from the wifi packet header
+// Callback triggered when an ESP-NOW packet is received.
+// Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
+// If the buffer is full, drop the message and increment the dropped count.
+static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
+    espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
+    ringbuf_t *buf = self->recv_buffer;
+
+    if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
+        self->rx_stats->failure++;
+        return;
+    }
+
+    // Get the RSSI value from the wifi packet header
+    // Secret magic to get the rssi from the wifi packet header
     // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
     // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
     // and a espnow_frame_format_t.
@@ -101,38 +109,37 @@ static inline int8_t _get_rssi_from_wifi_packet(const uint8_t *msg) {
     wifi_promiscuous_pkt_t *wifi_packet = (wifi_promiscuous_pkt_t *)(
         msg - SIZEOF_ESPNOW_FRAME_FORMAT - sizeof(wifi_promiscuous_pkt_t));
     #pragma GCC diagnostic pop
-    return wifi_packet->rx_ctrl.rssi;
-}
-
-// Callback triggered when an ESP-NOW packet is received.
-// Write the peer MAC address and the message into the recv_buffer as an ESPNow packet.
-// If the buffer is full, drop the message and increment the dropped count.
-static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
-    espnow_obj_t *self = _get_singleton();
-    ringbuf_t *buf = self->recv_buffer;
-
-    if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
-        self->rx_failures++;
-        return;
-    }
 
     espnow_header_t header;
     header.magic = ESPNOW_MAGIC;
     header.msg_len = msg_len;
-    header.rssi = _get_rssi_from_wifi_packet(msg);
+    header.rssi = wifi_packet->rx_ctrl.rssi;
     header.time_ms = mp_hal_ticks_ms();
 
     ringbuf_put_n(buf, (uint8_t *)&header, sizeof(header));
     ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
     ringbuf_put_n(buf, msg, msg_len);
 
-    self->rx_packets++;
+    self->rx_stats->success++;
 }
 
 bool common_hal_espnow_deinited(espnow_obj_t *self) {
     return self == NULL || self->recv_buffer == NULL;
 }
 
+// Construct the ESPNow object
+void common_hal_espnow_construct(espnow_obj_t *self, mp_int_t buffer_size, mp_int_t phy_rate) {
+    common_hal_espnow_set_buffer_size(self, buffer_size);
+    common_hal_espnow_set_phy_rate(self, phy_rate);
+
+    self->tx_stats = espnow_stats_new();
+    self->rx_stats = espnow_stats_new();
+
+    self->peers = espnow_peers_new();
+
+    common_hal_espnow_init(self);
+}
+
 // Initialize the ESP-NOW software stack,
 // register callbacks and allocate the recv data buffers.
 void common_hal_espnow_init(espnow_obj_t *self) {
@@ -171,17 +178,15 @@ void common_hal_espnow_deinit(espnow_obj_t *self) {
 
     self->recv_buffer->buf = NULL;
     self->recv_buffer = NULL;
-    // self->peers_count = 0; // esp_now_deinit() removes all peers.
-    self->tx_packets = self->tx_responses;
 }
 
 void espnow_reset(void) {
-    common_hal_espnow_deinit(_get_singleton());
+    common_hal_espnow_deinit(MP_STATE_PORT(espnow_singleton));
     MP_STATE_PORT(espnow_singleton) = NULL;
 }
 
 void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value) {
-    self->recv_buffer_size = mp_arg_validate_int_min(value, MAX_PACKET_LEN, MP_QSTR_buffer_size);
+    self->recv_buffer_size = mp_arg_validate_int_min(value, MIN_PACKET_LEN, MP_QSTR_buffer_size);
 };
 
 void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value) {
@@ -206,10 +211,6 @@ mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp
     }
     CHECK_ESP_RESULT(err);
 
-    // Increment the sent packet count.
-    // If mac == NULL msg will be sent to all peers EXCEPT any broadcast or multicast addresses.
-    self->tx_packets += ((mac == NULL) ? ((mp_obj_list_t *)self->peers->list)->len : 1);
-
     return mp_const_none;
 }
 
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 02ca90d5c4..87e3fb7168 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -29,6 +29,7 @@
 #include "py/obj.h"
 #include "py/ringbuf.h"
 
+#include "bindings/espnow/ESPNowStats.h"
 #include "bindings/espnow/Peers.h"
 
 #include "esp_wifi.h"
@@ -39,16 +40,14 @@ typedef struct _espnow_obj_t {
     ringbuf_t *recv_buffer;         // A buffer for received packets
     size_t recv_buffer_size;        // The size of the recv_buffer
     wifi_phy_rate_t phy_rate;       // The ESP-NOW physical layer rate.
-    volatile size_t rx_packets;     // # of received packets
-    volatile size_t rx_failures;    // # of dropped packets (buffer full)
-    size_t tx_packets;              // # of sent packets
-    volatile size_t tx_responses;   // # of sent packet responses received
-    volatile size_t tx_failures;    // # of sent packet responses failed
-    espnow_peers_obj_t *peers;      // Cache the # of peers for send(sync=True)
+    espnow_stats_obj_t *tx_stats;   // The tx packet stats
+    espnow_stats_obj_t *rx_stats;   // The rx packet stats
+    espnow_peers_obj_t *peers;      // The sequence of peers
 } espnow_obj_t;
 
 extern void espnow_reset(void);
 
+extern void common_hal_espnow_construct(espnow_obj_t *self, mp_int_t buffer_size, mp_int_t phy_rate);
 extern void common_hal_espnow_init(espnow_obj_t *self);
 extern void common_hal_espnow_deinit(espnow_obj_t *self);
 extern bool common_hal_espnow_deinited(espnow_obj_t *self);

From 75ed28665c1eb869266a7759dc4f730b993fe404 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 3 Feb 2023 13:54:51 -0600
Subject: [PATCH 1773/2403] espressif: i2sout: enlarge buffers

---
 ports/espressif/common-hal/audiobusio/__init__.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/common-hal/audiobusio/__init__.c b/ports/espressif/common-hal/audiobusio/__init__.c
index d6c3676d6a..eb35c83908 100644
--- a/ports/espressif/common-hal/audiobusio/__init__.c
+++ b/ports/espressif/common-hal/audiobusio/__init__.c
@@ -84,7 +84,7 @@ static void i2s_fill_buffer(i2s_t *self) {
     if (self->instance < 0 || self->instance >= I2S_NUM_MAX) {
         return;
     }
-#define STACK_BUFFER_SIZE (512)
+#define STACK_BUFFER_SIZE (4096)
     int16_t signed_samples[STACK_BUFFER_SIZE / sizeof(int16_t)];
 
     if (!self->playing || self->paused || !self->sample || self->stopping) {
@@ -188,8 +188,8 @@ void port_i2s_allocate_init(i2s_t *self, bool left_justified) {
         .bits_per_sample = 16,
         .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
         .communication_format = left_justified ? I2S_COMM_FORMAT_STAND_I2S : I2S_COMM_FORMAT_STAND_I2S,
-        .dma_buf_count = 2,
-        .dma_buf_len = 128, // in _frames_, so 128 is 512 bytes per dma buf
+        .dma_buf_count = 3,
+        .dma_buf_len = 1024, // in _frames_, so 1024 is 4096 bytes per dma buf
         .use_apll = false,
     };
     CHECK_ESP_RESULT(i2s_driver_install(self->instance, &i2s_config, I2S_QUEUE_SIZE, &i2s_queues[self->instance]));

From 41dff5d8cc8e1f1fc682171b97b75cd04b1ab76d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 3 Feb 2023 13:55:20 -0600
Subject: [PATCH 1774/2403] espressif: i2sout: don't needlessly set sample rate

this may reduce glitches when starting samples
---
 ports/espressif/common-hal/audiobusio/__init__.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/audiobusio/__init__.c b/ports/espressif/common-hal/audiobusio/__init__.c
index eb35c83908..d1a695fbf3 100644
--- a/ports/espressif/common-hal/audiobusio/__init__.c
+++ b/ports/espressif/common-hal/audiobusio/__init__.c
@@ -223,7 +223,11 @@ void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop) {
 
     audiosample_reset_buffer(self->sample, false, 0);
 
-    CHECK_ESP_RESULT(i2s_set_sample_rates(self->instance, audiosample_sample_rate(sample)));
+    uint32_t sample_rate = audiosample_sample_rate(sample);
+    if (sample_rate != self->i2s_config.sample_rate) {
+        CHECK_ESP_RESULT(i2s_set_sample_rates(self->instance, audiosample_sample_rate(sample)));
+        self->i2s_config.sample_rate = sample_rate;
+    }
 
     background_callback_add(&self->callback, i2s_callback_fun, self);
 }

From b03eed32fbbcec426bf721588bcaeb575cde1f10 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 3 Feb 2023 13:57:47 -0600
Subject: [PATCH 1775/2403] espressif: i2sout: wait a short time to succesfully
 write data

---
 ports/espressif/common-hal/audiobusio/__init__.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/audiobusio/__init__.c b/ports/espressif/common-hal/audiobusio/__init__.c
index d1a695fbf3..e58aeefe88 100644
--- a/ports/espressif/common-hal/audiobusio/__init__.c
+++ b/ports/espressif/common-hal/audiobusio/__init__.c
@@ -80,6 +80,8 @@ void i2s_reset(void) {
     }
 }
 
+#define I2S_WRITE_DELAY pdMS_TO_TICKS(1)
+
 static void i2s_fill_buffer(i2s_t *self) {
     if (self->instance < 0 || self->instance >= I2S_NUM_MAX) {
         return;
@@ -92,7 +94,7 @@ static void i2s_fill_buffer(i2s_t *self) {
 
         size_t bytes_written = 0;
         do {
-            CHECK_ESP_RESULT(i2s_write(self->instance, signed_samples, sizeof(signed_samples), &bytes_written, 0));
+            CHECK_ESP_RESULT(i2s_write(self->instance, signed_samples, sizeof(signed_samples), &bytes_written, I2S_WRITE_DELAY));
         } while (bytes_written != 0);
         return;
     }
@@ -120,9 +122,9 @@ static void i2s_fill_buffer(i2s_t *self) {
         size_t bytecount = self->sample_end - self->sample_data;
         if (self->samples_signed && self->channel_count == 2) {
             if (self->bytes_per_sample == 2) {
-                CHECK_ESP_RESULT(i2s_write(self->instance, self->sample_data, bytecount, &bytes_written, 0));
+                CHECK_ESP_RESULT(i2s_write(self->instance, self->sample_data, bytecount, &bytes_written, I2S_WRITE_DELAY));
             } else {
-                CHECK_ESP_RESULT(i2s_write_expand(self->instance, self->sample_data, bytecount, 8, 16, &bytes_written, 0));
+                CHECK_ESP_RESULT(i2s_write_expand(self->instance, self->sample_data, bytecount, 8, 16, &bytes_written, I2S_WRITE_DELAY));
             }
         } else {
             const size_t bytes_per_output_frame = 4;
@@ -151,7 +153,7 @@ static void i2s_fill_buffer(i2s_t *self) {
                 }
             }
             size_t expanded_bytes_written = 0;
-            CHECK_ESP_RESULT(i2s_write(self->instance, signed_samples, bytes_per_output_frame * framecount, &expanded_bytes_written, 0));
+            CHECK_ESP_RESULT(i2s_write(self->instance, signed_samples, bytes_per_output_frame * framecount, &expanded_bytes_written, I2S_WRITE_DELAY));
             assert(expanded_bytes_written % 4 == 0);
             bytes_written = expanded_bytes_written / bytes_per_output_frame * bytes_per_input_frame;
         }

From fab1bb5f2186d6c2f022ef5715ce6bb8c536c21e Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 3 Feb 2023 17:43:12 -0600
Subject: [PATCH 1776/2403] fix for native is31fl3741

---
 shared-module/is31fl3741/FrameBuffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/is31fl3741/FrameBuffer.c b/shared-module/is31fl3741/FrameBuffer.c
index d795c0d5e7..07bd3324f9 100644
--- a/shared-module/is31fl3741/FrameBuffer.c
+++ b/shared-module/is31fl3741/FrameBuffer.c
@@ -172,7 +172,7 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel
                     } else {
                         color = (rsum << 16) + (gsum << 8) + bsum;
                     }
-                    common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->height);
+                    common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->scale_height);
                 }
             }
         } else {
@@ -193,7 +193,7 @@ void common_hal_is31fl3741_FrameBuffer_refresh(is31fl3741_FrameBuffer_obj_t *sel
                             color = *buffer;
                         }
 
-                        common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->height);
+                        common_hal_is31fl3741_draw_pixel(self->is31fl3741, x, y, color, self->mapping, self->scale_height);
                         buffer++;
                     }
                 } else {

From 07e8506b79b22f04cad5520716748e41d18e3f64 Mon Sep 17 00:00:00 2001
From: Alex Sirota <67526318+ajs256@users.noreply.github.com>
Date: Fri, 3 Feb 2023 20:19:11 -0800
Subject: [PATCH 1777/2403] Add board hack_club_sprig

---
 .../boards/hack_club_sprig/board.c            | 128 ++++++++++++++++++
 .../boards/hack_club_sprig/mpconfigboard.h    |   4 +
 .../boards/hack_club_sprig/mpconfigboard.mk   |  11 ++
 .../hack_club_sprig/pico-sdk-configboard.h    |   1 +
 .../raspberrypi/boards/hack_club_sprig/pins.c |  85 ++++++++++++
 5 files changed, 229 insertions(+)
 create mode 100644 ports/raspberrypi/boards/hack_club_sprig/board.c
 create mode 100644 ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/hack_club_sprig/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/hack_club_sprig/pins.c

diff --git a/ports/raspberrypi/boards/hack_club_sprig/board.c b/ports/raspberrypi/boards/hack_club_sprig/board.c
new file mode 100644
index 0000000000..0169e85e0e
--- /dev/null
+++ b/ports/raspberrypi/boards/hack_club_sprig/board.c
@@ -0,0 +1,128 @@
+/*
+ * 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 "supervisor/board.h"
+#include "mpconfigboard.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;
+
+// display init sequence from CircuitPython library https://github.com/adafruit/Adafruit_CircuitPython_ST7735R/blob/dfae353330cf051d1f31db9e4b681c8d70900cc5/adafruit_st7735r.py
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0x80, 0x96,
+    // sleep out and delay
+    0x11, 0x80, 0xFF,
+    // _FRMCTR1
+    0xB1, 0x03, 0x01, 0x2C, 0x2D,
+    // _FRMCTR2
+    0xB2, 0x03, 0x01, 0x2C, 0x2D,
+    // _FRMCTR3
+    0xB3, 0x06, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,
+    // _INVCTR line inversion
+    0xB4, 0x01, 0x07,
+    // _PWCTR1 GVDD = 4.7V, 1.0uA
+    0xC0, 0x03, 0xA2, 0x02, 0x84,
+    // _PWCTR2 VGH=14.7V, VGL=-7.35V
+    0xC1, 0x01, 0xC5,
+    // _PWCTR3 Opamp current small, Boost frequency
+    0xC2, 0x02, 0x0A, 0x00,
+    0xC3, 0x02, 0x8A, 0x2A,
+    0xC4, 0x02, 0x8A, 0xEE,
+    // _VMCTR1 VCOMH = 4V, VOML = -1.1V
+    0xC5, 0x01, 0x0E,
+    // _INVOFF
+    0x20, 0x00,
+    // _MADCTL bottom to top refresh
+    0x36, 0x01, 0x18,
+    // COLMOD - 16 bit color
+    0x3A, 0x01, 0x05,
+    // _GMCTRP1 Gamma
+    0xE0, 0x10, 0x02, 0x1C, 0x07, 0x12, 0x37, 0x32, 0x29, 0x2D, 0x29, 0x25, 0x2B, 0x39, 0x00, 0x01, 0x03, 0x10,
+    // _GMCTRN1
+    0xE1, 0x10, 0x03, 0x1d, 0x07, 0x06, 0x2E, 0x2C, 0x29, 0x2D, 0x2E, 0x2E, 0x37, 0x3F, 0x00, 0x00, 0x02, 0x10,
+    // _NORON
+    0x13, 0x80, 0x0A,
+    // _DISPON
+    0x29, 0x80, 0x64,
+    // _MADCTL Default rotation + BGR encoding
+    0x36, 0x01, 0xC0,
+};
+
+
+void board_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
+    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_GPIO22, // DC
+        &pin_GPIO20, // CS
+        &pin_GPIO26, // RST
+        30000000,
+        0,
+        0);
+
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
+        160, // Width
+        128, // Height
+        0, // column start
+        0, // row start
+        270, // 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_bytes_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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO17,  // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f, // brightness
+        false, // single_byte_bounds
+        false, // data_as_commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        false, // SH1107_addressing
+        50000); // backlight pwm frequency
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.h b/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.h
new file mode 100644
index 0000000000..442e455c5e
--- /dev/null
+++ b/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME "Hack Club Sprig"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO4)
diff --git a/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.mk b/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.mk
new file mode 100644
index 0000000000..1bde636031
--- /dev/null
+++ b/ports/raspberrypi/boards/hack_club_sprig/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x1209
+USB_PID = 0x9000
+USB_PRODUCT = "Sprig"
+USB_MANUFACTURER = "Hack Club"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/hack_club_sprig/pico-sdk-configboard.h b/ports/raspberrypi/boards/hack_club_sprig/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/hack_club_sprig/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/hack_club_sprig/pins.c b/ports/raspberrypi/boards/hack_club_sprig/pins.c
new file mode 100644
index 0000000000..f82b8fafc5
--- /dev/null
+++ b/ports/raspberrypi/boards/hack_club_sprig/pins.c
@@ -0,0 +1,85 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+
+
+    // Start Sprig-specific definitions
+
+    { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_W), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_S), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_D), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_DIN), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_BCLK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_LRCLK), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_I), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_J), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_K), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_L), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_WHITE_LED), MP_ROM_PTR(&pin_GPIO28) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 547ca5a452f64fec654005ec669bb5c5184bd8a2 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 4 Feb 2023 12:02:06 -0600
Subject: [PATCH 1778/2403] bitmap constructor positive validation

---
 shared-bindings/displayio/Bitmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 65551f4e0d..f507a64880 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -62,14 +62,11 @@
 //|         ...
 STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
-    uint32_t width = mp_obj_get_int(all_args[0]);
-    uint32_t height = mp_obj_get_int(all_args[1]);
-    uint32_t value_count = mp_obj_get_int(all_args[2]);
+    uint32_t width = mp_arg_validate_int_min(mp_obj_get_int(all_args[0]), 1, MP_QSTR_width);
+    uint32_t height = mp_arg_validate_int_min(mp_obj_get_int(all_args[1]), 1, MP_QSTR_height);
+    uint32_t value_count = mp_arg_validate_int_min(mp_obj_get_int(all_args[2]), 1, MP_QSTR_value_count);
     uint32_t bits = 1;
 
-    if (value_count == 0) {
-        mp_raise_ValueError(translate("value_count must be > 0"));
-    }
     while ((value_count - 1) >> bits) {
         if (bits < 8) {
             bits <<= 1;

From beb4a797ff136d695d611c8b1665b433cd438331 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 4 Feb 2023 12:37:43 -0600
Subject: [PATCH 1779/2403] bitmap fill, __get_item__, and __set_item__
 positive validation

---
 shared-bindings/displayio/Bitmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index f507a64880..a6bccc6298 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -141,15 +141,15 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     uint16_t x = 0;
     uint16_t y = 0;
     if (mp_obj_is_small_int(index_obj)) {
-        mp_int_t i = MP_OBJ_SMALL_INT_VALUE(index_obj);
+        mp_int_t i = mp_arg_validate_int_min(MP_OBJ_SMALL_INT_VALUE(index_obj), 0, MP_QSTR_index);
         uint16_t width = common_hal_displayio_bitmap_get_width(self);
         x = i % width;
         y = i / width;
     } else {
         mp_obj_t *items;
         mp_obj_get_array_fixed_n(index_obj, 2, &items);
-        x = mp_obj_get_int(items[0]);
-        y = mp_obj_get_int(items[1]);
+        x = mp_arg_validate_int_min(mp_obj_get_int(items[0]), 0, MP_QSTR_x);
+        y = mp_arg_validate_int_min(mp_obj_get_int(items[1]), 0, MP_QSTR_y);
         if (x >= common_hal_displayio_bitmap_get_width(self) || y >= common_hal_displayio_bitmap_get_height(self)) {
             mp_raise_IndexError(translate("pixel coordinates out of bounds"));
         }
@@ -286,7 +286,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_blit_obj, 1, displayio_bitmap_obj_bl
 STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_uint_t value = (mp_uint_t)mp_obj_get_int(value_obj);
+    mp_uint_t value = (mp_uint_t)mp_arg_validate_int_min(mp_obj_get_int(value_obj), 0, MP_QSTR_value);
     if ((value >> common_hal_displayio_bitmap_get_bits_per_value(self)) != 0) {
         mp_raise_ValueError(translate("pixel value requires too many bits"));
     }

From c0a9c71057be49e87327ec487e5f924d9d3d9e7c Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 01:18:18 +0530
Subject: [PATCH 1780/2403] replace `ESPNowStats` with `Communicate` class and
 more

---
 ports/espressif/bindings/espnow/Communicate.c | 197 ++++++++++++++++++
 .../espnow/{ESPNowStats.h => Communicate.h}   |   7 +-
 ports/espressif/bindings/espnow/ESPNow.c      | 105 ++--------
 .../espressif/bindings/espnow/ESPNowPacket.c  |  10 +-
 ports/espressif/bindings/espnow/ESPNowStats.c |  87 --------
 ports/espressif/bindings/espnow/Peers.c       |  17 +-
 ports/espressif/bindings/espnow/__init__.c    |   8 +-
 ports/espressif/common-hal/espnow/ESPNow.c    |  18 +-
 ports/espressif/common-hal/espnow/ESPNow.h    |  16 +-
 ports/espressif/common-hal/espnow/__init__.c  |   9 +
 ports/espressif/common-hal/espnow/__init__.h  |   4 +-
 11 files changed, 264 insertions(+), 214 deletions(-)
 create mode 100644 ports/espressif/bindings/espnow/Communicate.c
 rename ports/espressif/bindings/espnow/{ESPNowStats.h => Communicate.h} (91%)
 delete mode 100644 ports/espressif/bindings/espnow/ESPNowStats.c

diff --git a/ports/espressif/bindings/espnow/Communicate.c b/ports/espressif/bindings/espnow/Communicate.c
new file mode 100644
index 0000000000..2e6e63fe46
--- /dev/null
+++ b/ports/espressif/bindings/espnow/Communicate.c
@@ -0,0 +1,197 @@
+/*
+ * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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
+ * 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/objproperty.h"
+#include "py/runtime.h"
+
+#include "bindings/espnow/Peer.h"
+#include "common-hal/espnow/__init__.h"
+
+// --- Send and Receive ESP-NOW data ---
+
+//| class Communicate:
+//|     """Provides methods and statistics related to communication
+//|     with the ESP-NOW peers.
+//|
+//|     Dictionary:
+//|         * "Send" = "Transmit" = ``TX``
+//|         * "Recv" = "Receive" = ``RX``
+//|     """
+//|
+//|     def __init__(self) -> None:
+//|         """You cannot create an instance of `Communicate`."""
+//|         ...
+
+//|     job: str
+//|     """Used to decide whether to call `__send` or `__recv`. (read-only)"""
+//|
+STATIC mp_obj_t espnow_com_get_job(const mp_obj_t self_in) {
+    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_QSTR(self->job);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_job_obj, espnow_com_get_job);
+
+MP_PROPERTY_GETTER(espnow_com_job_obj,
+    (mp_obj_t)&espnow_com_get_job_obj);
+
+//|     success: int
+//|     """The number of successes. (read-only)
+//|
+//|     * In case of transmit ``TX``:
+//|         The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``.
+//|
+//|     * In case of receive ``RX``:
+//|         The number of rx packets captured in the buffer."""
+//|
+STATIC mp_obj_t espnow_com_get_success(const mp_obj_t self_in) {
+    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->success);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_success_obj, espnow_com_get_success);
+
+MP_PROPERTY_GETTER(espnow_com_success_obj,
+    (mp_obj_t)&espnow_com_get_success_obj);
+
+//|     failure: int
+//|     """The number of failures. (read-only)
+//|
+//|     * In case of transmit ``TX``:
+//|         The number of failed tx packets ``ESP_NOW_SEND_FAIL``.
+//|
+//|     * In case of receive ``RX``:
+//|         The number of dropped rx packets due to buffer overflow."""
+//|
+STATIC mp_obj_t espnow_com_get_failure(const mp_obj_t self_in) {
+    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->failure);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_failure_obj, espnow_com_get_failure);
+
+MP_PROPERTY_GETTER(espnow_com_failure_obj,
+    (mp_obj_t)&espnow_com_get_failure_obj);
+
+//|     def __send(
+//|         self,
+//|         message: ReadableBuffer,
+//|         peer: Peer,
+//|     ) -> bool:
+//|         """Send a message to the peer's mac address.
+//|
+//|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
+//|         :param Peer peer: Send message to this peer. If `None`, send to all registered peers.
+//|         """
+//|         ...
+STATIC mp_obj_t espnow_com___send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_message, ARG_peer };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_peer,     MP_ARG_OBJ, { .u_obj = mp_const_none } },
+    };
+
+    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);
+
+    espnow_obj_t *self = pos_args[0];
+    common_hal_espnow_check_for_deinit(self);
+
+    // Get a pointer to the data buffer of the message
+    mp_buffer_info_t message;
+    mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
+
+    const uint8_t *mac = NULL;
+    if (args[ARG_peer].u_obj != mp_const_none) {
+        const espnow_peer_obj_t *peer = MP_OBJ_FROM_PTR(mp_arg_validate_type_or_none(args[ARG_peer].u_obj, &espnow_peer_type, MP_QSTR_peer));
+        mac = peer->peer_info.peer_addr;
+    }
+
+    return common_hal_espnow_send(self, &message, mac);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_com___send_obj, 2, espnow_com___send);
+
+//|     def __recv(self) -> Optional[ESPNowPacket]:
+//|         """Receive a message from the peer(s).
+//|
+//|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
+//|         ...
+STATIC mp_obj_t espnow_com___recv(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
+
+    return common_hal_espnow_recv(self);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_com___recv_obj, espnow_com___recv);
+
+STATIC const mp_rom_map_elem_t espnow_com_locals_dict_table[] = {
+    // Config parameters
+    { MP_ROM_QSTR(MP_QSTR_job),     MP_ROM_PTR(&espnow_com_job_obj) },
+
+    // Packet statistics
+    { MP_ROM_QSTR(MP_QSTR_success), MP_ROM_PTR(&espnow_com_success_obj) },
+    { MP_ROM_QSTR(MP_QSTR_failure), MP_ROM_PTR(&espnow_com_failure_obj) },
+
+    // Communication methods
+    { MP_ROM_QSTR(MP_QSTR___send), MP_ROM_PTR(&espnow_com___send_obj) },
+    { MP_ROM_QSTR(MP_QSTR___recv), MP_ROM_PTR(&espnow_com___recv_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(espnow_com_locals_dict, espnow_com_locals_dict_table);
+
+//|     def __call__(self, *args: Optional[Any], **kwargs: Optional[Any]) -> Optional[Any]:
+//|         """Calls the private `__send` or `__recv` methods with the supplied ``args`` and ``kwargs``
+//|         based on whether the job parameter is set to ``send`` or ``recv``."""
+//|         ...
+//|
+STATIC mp_obj_t espnow_com_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t meth = NULL;
+    switch (self->job) {
+        case MP_QSTR_send:
+            meth = MP_OBJ_FROM_PTR(&espnow_com___send_obj);
+            break;
+        case MP_QSTR_recv:
+            meth = MP_OBJ_FROM_PTR(&espnow_com___recv_obj);
+            break;
+        default:
+            break;
+    }
+    return meth ? mp_call_method_self_n_kw(meth, MP_STATE_PORT(espnow_singleton), n_args, n_kw, args) : mp_const_none;
+}
+
+espnow_com_obj_t *espnow_com_new(qstr job) {
+    espnow_com_obj_t *self = m_new_obj(espnow_com_obj_t);
+    self->base.type = &espnow_com_type;
+    self->job = job;
+    return self;
+}
+
+const mp_obj_type_t espnow_com_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Communicate,
+    .locals_dict = (mp_obj_t)&espnow_com_locals_dict,
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    MP_TYPE_EXTENDED_FIELDS(
+        .call = &espnow_com_call,
+        ),
+};
diff --git a/ports/espressif/bindings/espnow/ESPNowStats.h b/ports/espressif/bindings/espnow/Communicate.h
similarity index 91%
rename from ports/espressif/bindings/espnow/ESPNowStats.h
rename to ports/espressif/bindings/espnow/Communicate.h
index a9a578a8bf..194784f8b4 100644
--- a/ports/espressif/bindings/espnow/ESPNowStats.h
+++ b/ports/espressif/bindings/espnow/Communicate.h
@@ -32,7 +32,8 @@ typedef struct {
     mp_obj_base_t base;
     volatile size_t success;
     volatile size_t failure;
-} espnow_stats_obj_t;
+    qstr job;
+} espnow_com_obj_t;
 
-const mp_obj_type_t espnow_stats_type;
-extern espnow_stats_obj_t *espnow_stats_new(void);
+const mp_obj_type_t espnow_com_type;
+extern espnow_com_obj_t *espnow_com_new(qstr job);
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 33bb882873..8eb82af31a 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -32,22 +32,12 @@
 #include "py/stream.h"
 
 #include "bindings/espnow/ESPNow.h"
-
-#include "shared-bindings/util.h"
-
 #include "common-hal/espnow/__init__.h"
-#include "common-hal/espnow/ESPNow.h"
 
 #include "esp_now.h"
 
 // --- Initialisation and Config functions ---
 
-static void check_for_deinit(espnow_obj_t *self) {
-    if (common_hal_espnow_deinited(self)) {
-        raise_deinited_error();
-    }
-}
-
 //| class ESPNow:
 //|     """Provides access to the ESP-NOW protocol."""
 //|
@@ -82,7 +72,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 
     // Set the global singleton pointer for the espnow protocol.
     MP_STATE_PORT(espnow_singleton) = self;
-    return self;
+    return MP_OBJ_FROM_PTR(self);
 }
 
 //|     def deinit(self) -> None:
@@ -90,6 +80,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 //|         ...
 STATIC mp_obj_t espnow_deinit(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
     common_hal_espnow_deinit(self);
     return mp_const_none;
 }
@@ -117,6 +108,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj
 //|         ...
 STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
     common_hal_espnow_set_pmk(self, common_hal_espnow_get_bytes_len(key, ESP_NOW_KEY_LEN));
     return mp_const_none;
 }
@@ -133,6 +125,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_buffer_size_obj, espnow_get_buffer_size);
 
 STATIC mp_obj_t espnow_set_buffer_size(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
     common_hal_espnow_set_buffer_size(self, mp_obj_get_int(value));
     return mp_const_none;
 }
@@ -153,6 +146,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_phy_rate_obj, espnow_get_phy_rate);
 
 STATIC mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
     common_hal_espnow_set_phy_rate(self, mp_obj_get_int(value));
     return mp_const_none;
 }
@@ -162,78 +156,29 @@ MP_PROPERTY_GETSET(espnow_phy_rate_obj,
     (mp_obj_t)&espnow_get_phy_rate_obj,
     (mp_obj_t)&espnow_set_phy_rate_obj);
 
-//|     tx_stats: ESPNowStats
-//|     """The ``TX`` packet statistics."""
+//|     send: Communicate
+//|     """A `Communicate` object with ``job`` set to ``send``. (read-only)"""
 //|
-STATIC mp_obj_t espnow_get_tx_stats(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_send(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(self->tx_stats);
+    return MP_OBJ_FROM_PTR(self->send);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_tx_stats_obj, espnow_get_tx_stats);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_send_obj, espnow_get_send);
 
-MP_PROPERTY_GETTER(espnow_tx_stats_obj,
-    (mp_obj_t)&espnow_get_tx_stats_obj);
+MP_PROPERTY_GETTER(espnow_send_call_obj,
+    (mp_obj_t)&espnow_get_send_obj);
 
-//|     rx_stats: ESPNowStats
-//|     """The ``RX`` packet statistics."""
+//|     recv: Communicate
+//|     """A `Communicate` object with ``job`` set to ``recv``. (read-only)"""
 //|
-STATIC mp_obj_t espnow_get_rx_stats(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_recv(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(self->rx_stats);
+    return MP_OBJ_FROM_PTR(self->recv);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_rx_stats_obj, espnow_get_rx_stats);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_recv_obj, espnow_get_recv);
 
-MP_PROPERTY_GETTER(espnow_rx_stats_obj,
-    (mp_obj_t)&espnow_get_rx_stats_obj);
-
-// --- Send and Receive ESP-NOW data ---
-
-//|     def send(
-//|         self,
-//|         message: ReadableBuffer,
-//|         mac: Optional[ReadableBuffer],
-//|     ) -> bool:
-//|         """Send a message to the peer's mac address.
-//|
-//|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
-//|         :param ReadableBuffer mac: The peer's address (length = 6 bytes).
-//|             If `None` or any non-true value, send to all registered peers."""
-//|         ...
-STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_message, ARG_mac, ARG_sync };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_mac,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-
-    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);
-
-    espnow_obj_t *self = pos_args[0];
-    check_for_deinit(self);
-
-    const uint8_t *peer_addr = common_hal_espnow_get_bytes_len(args[ARG_mac].u_obj, ESP_NOW_ETH_ALEN);
-
-    // Get a pointer to the data buffer of the message
-    mp_buffer_info_t message;
-    mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
-
-    return common_hal_espnow_send(self, peer_addr, &message);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
-
-//|     def recv(self) -> Optional[ESPNowPacket]:
-//|         """Receive a message from the peer(s).
-//|
-//|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
-//|         ...
-STATIC mp_obj_t espnow_recv(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    return common_hal_espnow_recv(self);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_recv_obj, espnow_recv);
+MP_PROPERTY_GETTER(espnow_recv_call_obj,
+    (mp_obj_t)&espnow_get_recv_obj);
 
 // --- Peer Related Properties ---
 
@@ -242,7 +187,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_recv_obj, espnow_recv);
 //|
 STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
     return MP_OBJ_FROM_PTR(self->peers);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
@@ -263,13 +207,9 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_buffer_size), MP_ROM_PTR(&espnow_buffer_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
 
-    // Packet statistics
-    { MP_ROM_QSTR(MP_QSTR_tx_stats),    MP_ROM_PTR(&espnow_tx_stats_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rx_stats),    MP_ROM_PTR(&espnow_rx_stats_obj) },
-
     // Send and receive messages
-    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
-    { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_call_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_call_obj) },
 
     // Peer related properties
     { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
@@ -282,7 +222,7 @@ STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
 STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
+    common_hal_espnow_check_for_deinit(self);
     switch (request) {
         case MP_STREAM_POLL: {
             mp_uint_t flags = arg;
@@ -314,6 +254,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
 //|
 STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_espnow_check_for_deinit(self);
     size_t len = ringbuf_num_filled(self->recv_buffer);
     switch (op) {
         case MP_UNARY_OP_BOOL:
diff --git a/ports/espressif/bindings/espnow/ESPNowPacket.c b/ports/espressif/bindings/espnow/ESPNowPacket.c
index 7cbf2caed0..f8bc8e8418 100644
--- a/ports/espressif/bindings/espnow/ESPNowPacket.c
+++ b/ports/espressif/bindings/espnow/ESPNowPacket.c
@@ -27,19 +27,19 @@
 #include "bindings/espnow/ESPNowPacket.h"
 
 //| class ESPNowPacket:
-//|     """A packet retrieved from ESP-NOW communication protocol"""
+//|     """A packet retrieved from ESP-NOW communication protocol. A namedtuple."""
 //|
 //|     mac: ReadableBuffer
-//|     """The sender's mac address (length = 6 bytes)"""
+//|     """The sender's mac address (length = 6 bytes)."""
 //|
 //|     msg: ReadableBuffer
-//|     """The message sent by the peer (length <= 250 bytes)"""
+//|     """The message sent by the peer (length <= 250 bytes)."""
 //|
 //|     rssi: int
-//|     """The received signal strength indication (in dBm from -127 to 0)"""
+//|     """The received signal strength indication (in dBm from -127 to 0)."""
 //|
 //|     time: int
-//|     """The time in milliseconds since the device last booted when the packet was received"""
+//|     """The time in milliseconds since the device last booted when the packet was received."""
 //|
 
 const mp_obj_namedtuple_type_t espnow_packet_type_obj = {
diff --git a/ports/espressif/bindings/espnow/ESPNowStats.c b/ports/espressif/bindings/espnow/ESPNowStats.c
deleted file mode 100644
index babd8e4d83..0000000000
--- a/ports/espressif/bindings/espnow/ESPNowStats.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 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
- * 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 "bindings/espnow/ESPNowStats.h"
-#include "py/objproperty.h"
-
-//| class ESPNowStats:
-//|     """Provide some useful packet tx/rx statistics."""
-//|
-
-//|     success: int
-//|     """The number of successes. (read-only)
-//|
-//|     * In case of transmit ``TX``:
-//|         The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``.
-//|
-//|     * In case of receive ``RX``:
-//|         The number of rx packets captured in the buffer."""
-//|
-STATIC mp_obj_t espnow_stats_get_success(const mp_obj_t self_in) {
-    espnow_stats_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int_from_uint(self->success);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_get_success_obj, espnow_stats_get_success);
-
-MP_PROPERTY_GETTER(espnow_stats_success_obj,
-    (mp_obj_t)&espnow_stats_get_success_obj);
-
-//|     failure: int
-//|     """The number of failures. (read-only)
-//|
-//|     * In case of transmit ``TX``:
-//|         The number of failed tx packets ``ESP_NOW_SEND_FAIL``.
-//|
-//|     * In case of receive ``RX``:
-//|         The number of dropped rx packets due to buffer overflow."""
-//|
-STATIC mp_obj_t espnow_stats_get_failure(const mp_obj_t self_in) {
-    espnow_stats_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int_from_uint(self->failure);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_get_failure_obj, espnow_stats_get_failure);
-
-MP_PROPERTY_GETTER(espnow_stats_failure_obj,
-    (mp_obj_t)&espnow_stats_get_failure_obj);
-
-STATIC const mp_rom_map_elem_t espnow_stats_locals_dict_table[] = {
-    // Peer parameters
-    { MP_ROM_QSTR(MP_QSTR_success), MP_ROM_PTR(&espnow_stats_success_obj) },
-    { MP_ROM_QSTR(MP_QSTR_failure), MP_ROM_PTR(&espnow_stats_failure_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(espnow_stats_locals_dict, espnow_stats_locals_dict_table);
-
-espnow_stats_obj_t *espnow_stats_new(void) {
-    espnow_stats_obj_t *self = m_new_obj(espnow_stats_obj_t);
-    self->base.type = &espnow_stats_type;
-    return self;
-}
-
-const mp_obj_type_t espnow_stats_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ESPNowStats,
-    .locals_dict = (mp_obj_t)&espnow_stats_locals_dict,
-};
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
index 843bff644a..e3f858c1c9 100644
--- a/ports/espressif/bindings/espnow/Peers.c
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -40,6 +40,9 @@
 //| class Peers:
 //|     """A class that provides peer managment functions. Sequence[Peer]."""
 //|
+//|     def __init__(self) -> None:
+//|         """You cannot create an instance of `Peers`."""
+//|         ...
 
 //|     def append(self, peer: Peer) -> None:
 //|         """Append peer.
@@ -195,7 +198,6 @@ const mp_obj_type_t espnow_peers_type = {
     { &mp_type_type },
     .name = MP_QSTR_Peers,
     .print = espnow_peers_print,
-    // .make_new = espnow_peers_make_new,
     .locals_dict = (mp_obj_t)&espnow_peers_locals_dict,
     .flags = MP_TYPE_FLAG_EXTENDED,
     MP_TYPE_EXTENDED_FIELDS(
@@ -204,16 +206,3 @@ const mp_obj_type_t espnow_peers_type = {
         .getiter = espnow_peers_getiter,
         ),
 };
-
-/*
-STATIC mp_obj_t espnow_peers_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void)type_in;
-    mp_arg_check_num(n_args, n_kw, 0, 1, false);
-
-    espnow_peers_obj_t *self = m_new_obj(espnow_peers_obj_t);
-    self->base.type = &espnow_peers_type;
-    self->list = mp_obj_new_list_from_iter(args[0]);
-
-    return MP_OBJ_FROM_PTR(self);
-}
-*/
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index f64a6433dd..2b95085c5d 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -24,12 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/util.h"
-
 #include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
 #include "bindings/espnow/ESPNowPacket.h"
-#include "bindings/espnow/ESPNowStats.h"
+#include "bindings/espnow/Communicate.h"
 #include "bindings/espnow/Peer.h"
 #include "bindings/espnow/Peers.h"
 
@@ -51,7 +49,7 @@
 //|     e.peers.append(peer)
 //|
 //|     e.send("Starting...")
-//|     for i in range(100):
+//|     for i in range(10):
 //|         e.send(str(i)*20)
 //|     e.send(b'end')
 //|
@@ -85,7 +83,7 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ESPNow),      MP_ROM_PTR(&espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowPacket),MP_ROM_PTR(&espnow_packet_type_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ESPNowStats), MP_ROM_PTR(&espnow_stats_type) },
+    { MP_ROM_QSTR(MP_QSTR_Communicate), MP_ROM_PTR(&espnow_com_type) },
     { MP_ROM_QSTR(MP_QSTR_Peer),        MP_ROM_PTR(&espnow_peer_type) },
     { MP_ROM_QSTR(MP_QSTR_Peers),       MP_ROM_PTR(&espnow_peers_type) },
 };
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 96a7cfdfaa..df766ad32f 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -53,8 +53,8 @@
 // Will allocate an additional 7 bytes for buffer overhead
 #define DEFAULT_RECV_BUFFER_SIZE (2 * MAX_PACKET_LEN)
 
-// Time to wait (millisec) for responses from sent packets: (1 seconds).
-#define DEFAULT_SEND_TIMEOUT_MS (1000)
+// Time to wait (millisec) for responses from sent packets: (2 seconds).
+#define DEFAULT_SEND_TIMEOUT_MS (2000)
 
 // ESPNow packet format for the receive buffer.
 // Use this for peeking at the header of the next packet in the buffer.
@@ -79,9 +79,9 @@ typedef struct {
 static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (status == ESP_NOW_SEND_SUCCESS) {
-        self->tx_stats->success++;
+        self->send->success++;
     } else {
-        self->tx_stats->failure++;
+        self->send->failure++;
     }
 }
 
@@ -93,7 +93,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_t *buf = self->recv_buffer;
 
     if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
-        self->rx_stats->failure++;
+        self->recv->failure++;
         return;
     }
 
@@ -120,7 +120,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
     ringbuf_put_n(buf, msg, msg_len);
 
-    self->rx_stats->success++;
+    self->recv->success++;
 }
 
 bool common_hal_espnow_deinited(espnow_obj_t *self) {
@@ -132,8 +132,8 @@ void common_hal_espnow_construct(espnow_obj_t *self, mp_int_t buffer_size, mp_in
     common_hal_espnow_set_buffer_size(self, buffer_size);
     common_hal_espnow_set_phy_rate(self, phy_rate);
 
-    self->tx_stats = espnow_stats_new();
-    self->rx_stats = espnow_stats_new();
+    self->send = espnow_com_new(MP_QSTR_send);
+    self->recv = espnow_com_new(MP_QSTR_recv);
 
     self->peers = espnow_peers_new();
 
@@ -200,7 +200,7 @@ void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key) {
 // --- Send and Receive ESP-NOW data ---
 
 
-mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp_buffer_info_t *message) {
+mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const mp_buffer_info_t *message, const uint8_t *mac) {
     // Send the packet - keep trying until timeout if the internal esp-now buffers are full.
     esp_err_t err;
     mp_uint_t start = mp_hal_ticks_ms();
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 87e3fb7168..32e9a4c44c 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -29,7 +29,7 @@
 #include "py/obj.h"
 #include "py/ringbuf.h"
 
-#include "bindings/espnow/ESPNowStats.h"
+#include "bindings/espnow/Communicate.h"
 #include "bindings/espnow/Peers.h"
 
 #include "esp_wifi.h"
@@ -37,12 +37,12 @@
 // The data structure for the espnow_singleton.
 typedef struct _espnow_obj_t {
     mp_obj_base_t base;
-    ringbuf_t *recv_buffer;         // A buffer for received packets
-    size_t recv_buffer_size;        // The size of the recv_buffer
-    wifi_phy_rate_t phy_rate;       // The ESP-NOW physical layer rate.
-    espnow_stats_obj_t *tx_stats;   // The tx packet stats
-    espnow_stats_obj_t *rx_stats;   // The rx packet stats
-    espnow_peers_obj_t *peers;      // The sequence of peers
+    ringbuf_t *recv_buffer;     // A buffer for received packets
+    size_t recv_buffer_size;    // The size of the recv_buffer
+    wifi_phy_rate_t phy_rate;   // The ESP-NOW physical layer rate.
+    espnow_com_obj_t *send;     // The tx packet stats
+    espnow_com_obj_t *recv;     // The rx packet stats
+    espnow_peers_obj_t *peers;  // The sequence of peers
 } espnow_obj_t;
 
 extern void espnow_reset(void);
@@ -56,5 +56,5 @@ extern void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value
 extern void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value);
 extern void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key);
 
-extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const uint8_t *mac, const mp_buffer_info_t *message);
+extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const mp_buffer_info_t *message, const uint8_t *mac);
 extern mp_obj_t common_hal_espnow_recv(espnow_obj_t *self);
diff --git a/ports/espressif/common-hal/espnow/__init__.c b/ports/espressif/common-hal/espnow/__init__.c
index 498cd49dc9..77196f3349 100644
--- a/ports/espressif/common-hal/espnow/__init__.c
+++ b/ports/espressif/common-hal/espnow/__init__.c
@@ -25,7 +25,16 @@
  */
 
 #include "common-hal/espnow/__init__.h"
+
 #include "py/runtime.h"
+#include "shared-bindings/util.h"
+
+// Raise ValueError if the ESPNow object is deinited
+void common_hal_espnow_check_for_deinit(espnow_obj_t *self) {
+    if (common_hal_espnow_deinited(self)) {
+        raise_deinited_error();
+    }
+}
 
 // Return C pointer to byte memory string/bytes/bytearray in obj.
 // Raise ValueError if the length does not match expected len.
diff --git a/ports/espressif/common-hal/espnow/__init__.h b/ports/espressif/common-hal/espnow/__init__.h
index bb1950d98c..068da3507a 100644
--- a/ports/espressif/common-hal/espnow/__init__.h
+++ b/ports/espressif/common-hal/espnow/__init__.h
@@ -26,5 +26,7 @@
 
 #pragma once
 
-#include "py/obj.h"
+#include "common-hal/espnow/ESPNow.h"
+
+extern void common_hal_espnow_check_for_deinit(espnow_obj_t *self);
 extern const uint8_t *common_hal_espnow_get_bytes_len(mp_obj_t obj, size_t len);

From 6a9b7199ecd457b49a9e51abcdea46e56bce4a85 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 4 Feb 2023 16:44:29 -0600
Subject: [PATCH 1781/2403] Initial gif proof of concept

---
 py/circuitpy_defns.mk                         |   7 +
 shared-bindings/displayio/OnDiskGif.c         | 191 ++++
 shared-bindings/displayio/OnDiskGif.h         |  45 +
 shared-bindings/displayio/__init__.c          |   2 +
 .../displayio/AnimatedGIF_circuitpy.h         | 178 ++++
 shared-module/displayio/OnDiskGif.c           | 195 ++++
 shared-module/displayio/OnDiskGif.h           |  54 +
 shared-module/displayio/gif.c                 | 993 ++++++++++++++++++
 8 files changed, 1665 insertions(+)
 create mode 100644 shared-bindings/displayio/OnDiskGif.c
 create mode 100644 shared-bindings/displayio/OnDiskGif.h
 create mode 100644 shared-module/displayio/AnimatedGIF_circuitpy.h
 create mode 100644 shared-module/displayio/OnDiskGif.c
 create mode 100644 shared-module/displayio/OnDiskGif.h
 create mode 100644 shared-module/displayio/gif.c

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index be33d80a99..6c8a513d8f 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -579,6 +579,8 @@ SRC_SHARED_MODULE_ALL = \
 	displayio/Group.c \
 	displayio/I2CDisplay.c \
 	displayio/OnDiskBitmap.c \
+	displayio/OnDiskGif.c \
+	displayio/gif.c \
 	displayio/Palette.c \
 	displayio/Shape.c \
 	displayio/TileGrid.c \
@@ -697,6 +699,11 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \
 $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes
 endif
 
+#SRC_MOD += $(addprefix lib/AnimatedGIF/, \
+	#gif.c \
+#)
+#$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -Wno-missing-braces -Wno-missing-prototypes
+
 ifeq ($(CIRCUITPY_ZLIB),1)
 SRC_MOD += $(addprefix lib/uzlib/, \
 	tinflate.c \
diff --git a/shared-bindings/displayio/OnDiskGif.c b/shared-bindings/displayio/OnDiskGif.c
new file mode 100644
index 0000000000..eeade372cb
--- /dev/null
+++ b/shared-bindings/displayio/OnDiskGif.c
@@ -0,0 +1,191 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 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 "shared-bindings/displayio/OnDiskGif.h"
+
+#include 
+
+#include "py/runtime.h"
+#include "py/objproperty.h"
+#include "supervisor/shared/translate/translate.h"
+#include "shared-bindings/displayio/OnDiskGif.h"
+
+//| class OnDiskBitmap:
+//|     """Loads values straight from disk. This minimizes memory use but can lead to
+//|     much slower pixel load times. These load times may result in frame tearing where only part of
+//|     the image is visible.
+//|
+//|     It's easiest to use on a board with a built in display such as the `Hallowing M0 Express
+//|     `_.
+//|
+//|     .. code-block:: Python
+//|
+//|       import board
+//|       import displayio
+//|       import time
+//|       import pulseio
+//|
+//|       board.DISPLAY.brightness = 0
+//|       splash = displayio.Group()
+//|       board.DISPLAY.show(splash)
+//|
+//|       odb = displayio.OnDiskBitmap('/sample.bmp')
+//|       face = displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
+//|       splash.append(face)
+//|       # Wait for the image to load.
+//|       board.DISPLAY.refresh(target_frames_per_second=60)
+//|
+//|       # Fade up the backlight
+//|       for i in range(100):
+//|           board.DISPLAY.brightness = 0.01 * i
+//|           time.sleep(0.05)
+//|
+//|       # Wait forever
+//|       while True:
+//|           pass"""
+//|
+//|     def __init__(self, file: Union[str, typing.BinaryIO]) -> None:
+//|         """Create an OnDiskBitmap object with the given file.
+//|
+//|         :param file file: The name of the bitmap file.  For backwards compatibility, a file opened in binary mode may also be passed.
+//|
+//|         Older versions of CircuitPython required a file opened in binary
+//|         mode. CircuitPython 7.0 modified OnDiskBitmap so that it takes a
+//|         filename instead, and opens the file internally.  A future version
+//|         of CircuitPython will remove the ability to pass in an opened file.
+//|         """
+//|         ...
+STATIC mp_obj_t displayio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+    mp_obj_t arg = all_args[0];
+
+    if (mp_obj_is_str(arg)) {
+        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
+    }
+
+    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
+        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
+    }
+
+    displayio_ondiskgif_t *self = m_new_obj(displayio_ondiskgif_t);
+    self->base.type = &displayio_ondiskgif_type;
+    common_hal_displayio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg));
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     width: int
+//|     """Width of the bitmap. (read only)"""
+STATIC mp_obj_t displayio_ondiskgif_obj_get_width(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_width(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_width_obj, displayio_ondiskgif_obj_get_width);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_width_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_width_obj);
+
+//|     height: int
+//|     """Height of the bitmap. (read only)"""
+STATIC mp_obj_t displayio_ondiskgif_obj_get_height(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_height(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_height_obj, displayio_ondiskgif_obj_get_height);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_height_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_height_obj);
+
+//|     pixel_shader: Union[ColorConverter, Palette]
+//|     """The image's pixel_shader.  The type depends on the underlying
+//|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
+//|     transparent pixel or, for palette shaded images, to update the palette.)"""
+//|
+STATIC mp_obj_t displayio_ondiskgif_obj_get_pixel_shader(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_displayio_ondiskgif_get_pixel_shader(self);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_pixel_shader_obj, displayio_ondiskgif_obj_get_pixel_shader);
+
+const mp_obj_property_t displayio_ondiskgif_pixel_shader_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&displayio_ondiskgif_get_pixel_shader_obj,
+              (mp_obj_t)MP_ROM_NONE,
+              (mp_obj_t)MP_ROM_NONE},
+};
+
+//|     bitmap: Bitmap
+//|     """The image's bitmap.  The type depends on the underlying
+//|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
+//|     transparent pixel or, for palette shaded images, to update the palette.)"""
+//|
+STATIC mp_obj_t displayio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_displayio_ondiskgif_get_bitmap(self);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_bitmap_obj, displayio_ondiskgif_obj_get_bitmap);
+
+const mp_obj_property_t displayio_ondiskgif_bitmap_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&displayio_ondiskgif_get_bitmap_obj,
+              (mp_obj_t)MP_ROM_NONE,
+              (mp_obj_t)MP_ROM_NONE},
+};
+
+
+//|     play_frame: None
+//|     """Play next frame. (read only)"""
+//|
+STATIC mp_obj_t displayio_ondiskgif_obj_play_frame(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_play_frame(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_play_frame_obj, displayio_ondiskgif_obj_play_frame);
+
+
+STATIC const mp_rom_map_elem_t displayio_ondiskgif_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskgif_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_ondiskgif_pixel_shader_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_ondiskgif_bitmap_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_ondiskgif_width_obj) },
+    { MP_ROM_QSTR(MP_QSTR_play_frame), MP_ROM_PTR(&displayio_ondiskgif_play_frame_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(displayio_ondiskgif_locals_dict, displayio_ondiskgif_locals_dict_table);
+
+const mp_obj_type_t displayio_ondiskgif_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_OnDiskGif,
+    .make_new = displayio_ondiskgif_make_new,
+    .locals_dict = (mp_obj_dict_t *)&displayio_ondiskgif_locals_dict,
+};
diff --git a/shared-bindings/displayio/OnDiskGif.h b/shared-bindings/displayio/OnDiskGif.h
new file mode 100644
index 0000000000..988bc8581b
--- /dev/null
+++ b/shared-bindings/displayio/OnDiskGif.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
+
+#include "shared-module/displayio/OnDiskGif.h"
+#include "extmod/vfs_fat.h"
+
+extern const mp_obj_type_t displayio_ondiskgif_type;
+
+void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_file_obj_t *file);
+
+uint32_t common_hal_displayio_ondiskgif_get_pixel(displayio_ondiskgif_t *bitmap,
+    int16_t x, int16_t y);
+
+uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self);
+mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *self);
+mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self);
+uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self);
+uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self);
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 3fcd1d082b..4f2905e2e2 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -39,6 +39,7 @@
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/I2CDisplay.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
+#include "shared-bindings/displayio/OnDiskGif.h"
 #include "shared-bindings/displayio/Palette.h"
 #if CIRCUITPY_PARALLELDISPLAY
 #include "shared-bindings/paralleldisplay/ParallelBus.h"
@@ -85,6 +86,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_EPaperDisplay), MP_ROM_PTR(&displayio_epaperdisplay_type) },
     { MP_ROM_QSTR(MP_QSTR_Group), MP_ROM_PTR(&displayio_group_type) },
     { MP_ROM_QSTR(MP_QSTR_OnDiskBitmap), MP_ROM_PTR(&displayio_ondiskbitmap_type) },
+    { MP_ROM_QSTR(MP_QSTR_OnDiskGif), MP_ROM_PTR(&displayio_ondiskgif_type) },
     { MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) },
     { MP_ROM_QSTR(MP_QSTR_Shape), MP_ROM_PTR(&displayio_shape_type) },
     { MP_ROM_QSTR(MP_QSTR_TileGrid), MP_ROM_PTR(&displayio_tilegrid_type) },
diff --git a/shared-module/displayio/AnimatedGIF_circuitpy.h b/shared-module/displayio/AnimatedGIF_circuitpy.h
new file mode 100644
index 0000000000..f81108695c
--- /dev/null
+++ b/shared-module/displayio/AnimatedGIF_circuitpy.h
@@ -0,0 +1,178 @@
+// Copyright 2020 BitBank Software, Inc. All Rights Reserved.
+// 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.
+// ===========================================================================
+
+#ifndef __ANIMATEDGIF__
+#define __ANIMATEDGIF__
+#include 
+#include 
+#include 
+#include 
+//
+// GIF Animator
+// Written by Larry Bank
+// Copyright (c) 2020 BitBank Software, Inc.
+// bitbank@pobox.com
+//
+// Designed to decode images up to 480x320
+// using less than 22K of RAM
+//
+
+/* GIF Defines and variables */
+#define MAX_CHUNK_SIZE 255
+#define LZW_BUF_SIZE (6 * MAX_CHUNK_SIZE)
+#define LZW_HIGHWATER (4 * MAX_CHUNK_SIZE)
+#define MAX_WIDTH 320
+#define FILE_BUF_SIZE 4096
+
+#define PIXEL_FIRST 0
+#define PIXEL_LAST 4096
+#define LINK_UNUSED 5911 // 0x1717 to use memset
+#define LINK_END 5912
+#define MAX_HASH 5003
+#define MAXMAXCODE 4096
+
+enum {
+    GIF_PALETTE_RGB565_LE = 0, // little endian (default)
+    GIF_PALETTE_RGB565_BE,    // big endian
+    GIF_PALETTE_RGB888        // original 24-bpp entries
+};
+// for compatibility with older code
+#define LITTLE_ENDIAN_PIXELS GIF_PALETTE_RGB565_LE
+#define BIG_ENDIAN_PIXELS GIF_PALETTE_RGB565_BE
+//
+// Draw callback pixel type
+// RAW = 8-bit palettized pixels requiring transparent pixel handling
+// COOKED = 16 or 24-bpp fully rendered pixels ready for display
+//
+enum {
+    GIF_DRAW_RAW = 0,
+    GIF_DRAW_COOKED
+};
+
+enum {
+    GIF_SUCCESS = 0,
+    GIF_DECODE_ERROR,
+    GIF_TOO_WIDE,
+    GIF_INVALID_PARAMETER,
+    GIF_UNSUPPORTED_FEATURE,
+    GIF_FILE_NOT_OPEN,
+    GIF_EARLY_EOF,
+    GIF_EMPTY_FRAME,
+    GIF_BAD_FILE,
+    GIF_ERROR_MEMORY
+};
+
+typedef struct gif_file_tag
+{
+    int32_t iPos; // current file position
+    int32_t iSize; // file size
+    uint8_t *pData; // memory file pointer
+    void *fHandle; // class pointer to File/SdFat or whatever you want
+} GIFFILE;
+
+typedef struct gif_info_tag
+{
+    int32_t iFrameCount; // total frames in file
+    int32_t iDuration; // duration of animation in milliseconds
+    int32_t iMaxDelay; // maximum frame delay
+    int32_t iMinDelay; // minimum frame delay
+} GIFINFO;
+
+typedef struct gif_draw_tag
+{
+    int iX, iY; // Corner offset of this frame on the canvas
+    int y; // current line being drawn (0 = top line of image)
+    int iWidth, iHeight; // size of this frame
+    void *pUser; // user supplied pointer
+    uint8_t *pPixels; // 8-bit source pixels for this line
+    uint16_t *pPalette; // little or big-endian RGB565 palette entries (default)
+    uint8_t *pPalette24; // RGB888 palette (optional)
+    uint8_t ucTransparent; // transparent color
+    uint8_t ucHasTransparency; // flag indicating the transparent color is in use
+    uint8_t ucDisposalMethod; // frame disposal method
+    uint8_t ucBackground; // background color
+    uint8_t ucIsGlobalPalette; // Flag to indicate that a global palette, rather than a local palette is being used
+} GIFDRAW;
+
+// Callback function prototypes
+typedef int32_t (GIF_READ_CALLBACK)(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
+typedef int32_t (GIF_SEEK_CALLBACK)(GIFFILE *pFile, int32_t iPosition);
+typedef void (GIF_DRAW_CALLBACK)(GIFDRAW *pDraw);
+typedef void * (GIF_OPEN_CALLBACK)(const char *szFilename, int32_t *pFileSize);
+typedef void (GIF_CLOSE_CALLBACK)(void *pHandle);
+typedef void * (GIF_ALLOC_CALLBACK)(uint32_t iSize);
+typedef void (GIF_FREE_CALLBACK)(void *buffer);
+//
+// our private structure to hold a GIF image decode state
+//
+typedef struct gif_image_tag
+{
+    int iWidth, iHeight, iCanvasWidth, iCanvasHeight;
+    int iX, iY; // GIF corner offset
+    int iBpp;
+    int iError; // last error
+    int iFrameDelay; // delay in milliseconds for this frame
+    int iRepeatCount; // NETSCAPE animation repeat count. 0=forever
+    int iXCount, iYCount; // decoding position in image (countdown values)
+    int iLZWOff; // current LZW data offset
+    int iLZWSize; // current quantity of data in the LZW buffer
+    int iCommentPos; // file offset of start of comment data
+    short sCommentLen; // length of comment
+    GIF_READ_CALLBACK *pfnRead;
+    GIF_SEEK_CALLBACK *pfnSeek;
+    GIF_DRAW_CALLBACK *pfnDraw;
+    GIF_OPEN_CALLBACK *pfnOpen;
+    GIF_CLOSE_CALLBACK *pfnClose;
+    GIFFILE GIFFile;
+    void *pUser;
+    unsigned char *pFrameBuffer;
+    unsigned char *pPixels, *pOldPixels;
+    unsigned char ucLineBuf[MAX_WIDTH]; // current line
+    unsigned char ucFileBuf[FILE_BUF_SIZE]; // holds temp data and pixel stack
+    unsigned short pPalette[384]; // can hold RGB565 or RGB888 - set in begin()
+    unsigned short pLocalPalette[384]; // color palettes for GIF images
+    unsigned char ucLZW[LZW_BUF_SIZE]; // holds 6 chunks (6x255) of GIF LZW data packed together
+    unsigned short usGIFTable[4096];
+    unsigned char ucGIFPixels[8192];
+    unsigned char bEndOfFrame;
+    unsigned char ucGIFBits, ucBackground, ucTransparent, ucCodeStart, ucMap, bUseLocalPalette;
+    unsigned char ucPaletteType; // RGB565 or RGB888
+    unsigned char ucDrawType; // RAW or COOKED
+} GIFIMAGE;
+
+// C interface
+int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw);
+int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw);
+void GIF_close(GIFIMAGE *pGIF);
+void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType);
+void GIF_reset(GIFIMAGE *pGIF);
+int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser);
+int GIF_getCanvasWidth(GIFIMAGE *pGIF);
+int GIF_getCanvasHeight(GIFIMAGE *pGIF);
+int GIF_getComment(GIFIMAGE *pGIF, char *destBuffer);
+int GIF_getInfo(GIFIMAGE *pGIF, GIFINFO *pInfo);
+int GIF_getLastError(GIFIMAGE *pGIF);
+int GIF_getLoopCount(GIFIMAGE *pGIF);
+int GIF_init(GIFIMAGE *pGIF);
+void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw);
+void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian);
+
+// Due to unaligned memory causing an exception, we have to do these macros the slow way
+#define INTELSHORT(p) ((*p) + (*(p + 1) << 8))
+#define INTELLONG(p) ((*p) + (*(p + 1) << 8) + (*(p + 2) << 16) + (*(p + 3) << 24))
+#define MOTOSHORT(p) (((*(p)) << 8) + (*(p + 1)))
+#define MOTOLONG(p) (((*p) << 24) + ((*(p + 1)) << 16) + ((*(p + 2)) << 8) + (*(p + 3)))
+
+// Must be a 32-bit target processor
+#define REGISTER_WIDTH 32
+
+#endif // __ANIMATEDGIF__
diff --git a/shared-module/displayio/OnDiskGif.c b/shared-module/displayio/OnDiskGif.c
new file mode 100644
index 0000000000..88146d354e
--- /dev/null
+++ b/shared-module/displayio/OnDiskGif.c
@@ -0,0 +1,195 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 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 "shared-bindings/displayio/OnDiskGif.h"
+#include "shared-bindings/displayio/ColorConverter.h"
+#include "shared-bindings/displayio/Palette.h"
+#include "shared-bindings/displayio/Bitmap.h"
+#include "shared-module/displayio/ColorConverter.h"
+#include "shared-module/displayio/Palette.h"
+
+#include 
+
+#include "py/mperrno.h"
+#include "py/runtime.h"
+
+static int32_t GIFReadFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
+    // mp_printf(&mp_plat_print, "GifReadFile len %d ", iLen);
+    uint32_t iBytesRead;
+    iBytesRead = iLen;
+    pyb_file_obj_t *f = pFile->fHandle;
+    // Note: If you read a file all the way to the last byte, seek() stops working
+    if ((pFile->iSize - pFile->iPos) < iLen) {
+        iBytesRead = pFile->iSize - pFile->iPos - 1; // <-- ugly work-around
+    }
+    if (iBytesRead <= 0) {
+        return 0;
+    }
+    UINT bytes_read;
+    if (f_read(&f->fp, pBuf, iBytesRead, &bytes_read) != FR_OK) {
+        mp_raise_OSError(MP_EIO);
+    }
+    pFile->iPos = f->fp.fptr;
+    // mp_printf(&mp_plat_print, " now at %d\n", pFile->iPos);
+
+    return bytes_read;
+} /* GIFReadFile() */
+
+static int32_t GIFSeekFile(GIFFILE *pFile, int32_t iPosition) {
+    // mp_printf(&mp_plat_print, "GifSeekFile %d ", iPosition);
+    pyb_file_obj_t *f = pFile->fHandle;
+
+    f_lseek(&f->fp, iPosition);
+    pFile->iPos = f->fp.fptr;
+    // mp_printf(&mp_plat_print, " now at %d\n", pFile->iPos);
+    return pFile->iPos;
+} /* GIFSeekFile() */
+
+static void GIFDraw(GIFDRAW *pDraw) {
+    // Called for every scan line of the image as it decodes
+    // The pixels delivered are the 8-bit native GIF output
+    // The palette is either RGB565 or the original 24-bit RGB values
+    // depending on the pixel type selected with gif.begin()
+
+    displayio_bitmap_t *bitmap = (displayio_bitmap_t *)pDraw->pUser;
+
+    // mp_printf(&mp_plat_print, "GD: y%d iX%d iY%d iW%d iH%d Trans%d hasT%d bk%d pUser %x bmp%x\n",
+    // pDraw->y, pDraw->iX, pDraw->iY, pDraw->iWidth, pDraw->iHeight, pDraw->ucTransparent, pDraw->ucHasTransparency, pDraw->ucBackground, pDraw->pUser, bitmap->data);
+
+/*
+    int iX, iY; // Corner offset of this frame on the canvas
+    int y; // current line being drawn (0 = top line of image)
+    int iWidth, iHeight; // size of this frame
+    void *pUser; // user supplied pointer
+    uint8_t *pPixels; // 8-bit source pixels for this line
+    uint16_t *pPalette; // little or big-endian RGB565 palette entries (default)
+    uint8_t *pPalette24; // RGB888 palette (optional)
+    uint8_t ucTransparent; // transparent color
+    uint8_t ucHasTransparency; // flag indicating the transparent color is in use
+    uint8_t ucDisposalMethod; // frame disposal method
+    uint8_t ucBackground; // background color
+    uint8_t ucIsGlobalPalette; // Flag to indicate that a global palette, rather than a local palette is being used
+*/
+
+    // For all other lines, just push the pixels to the display
+    // (uint8_t *)pDraw->pPixels, pDraw->iWidth*2);
+
+
+
+    int32_t row_start = pDraw->y * bitmap->stride;
+    uint32_t *row = bitmap->data + row_start;
+    uint8_t *d = (uint8_t *)row;
+    // mp_printf(&mp_plat_print, "rs %d strd %d:\n", row_start, bitmap->stride);
+
+    uint8_t *p = (uint8_t *)pDraw->pPixels;
+    for (int w = 0; w < pDraw->iWidth * 2; w++) {
+        // mp_printf(&mp_plat_print, "%x:", *p);
+        *d++ = *p;
+        p++;
+    }
+    // mp_printf(&mp_plat_print, "\n");
+}
+
+void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_file_obj_t *file) {
+    // mp_printf(&mp_plat_print, "Begin OnDiskGif\n");
+    self->file = file;
+
+    GIF_begin(&self->gif, GIF_PALETTE_RGB565_LE);
+
+    self->gif.iError = GIF_SUCCESS;
+    self->gif.pfnRead = GIFReadFile;
+    self->gif.pfnSeek = GIFSeekFile;
+    self->gif.pfnDraw = GIFDraw;
+    self->gif.pfnClose = NULL;
+    self->gif.pfnOpen = NULL;
+    self->gif.GIFFile.fHandle = self->file;
+
+    f_rewind(&self->file->fp);
+    self->gif.GIFFile.iSize = (int32_t)f_size(&self->file->fp);
+
+    int result = GIF_init(&self->gif);
+    if (result != 1) {
+        mp_arg_error_invalid(MP_QSTR_file);
+    }
+
+    self->frame = m_malloc(self->gif.iCanvasWidth * self->gif.iCanvasHeight * sizeof(uint16_t), false); // MUST FREE LATER?
+    self->gif.pFrameBuffer = (uint8_t *)self->frame;
+    self->gif.ucDrawType = GIF_DRAW_COOKED;
+
+    displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
+    bitmap->base.type = &displayio_bitmap_type;
+    common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, 16);
+    self->bitmap = bitmap;
+
+    // mp_printf(&mp_plat_print, "GIF_init returned %d %x\n", result, bitmap->data);
+}
+
+
+uint32_t common_hal_displayio_ondiskgif_get_pixel(displayio_ondiskgif_t *self,
+    int16_t x, int16_t y) {
+    if (x < 0 || x >= self->gif.iCanvasWidth || y < 0 || y >= self->gif.iCanvasHeight) {
+        return 0;
+    }
+
+    return 0;
+}
+
+uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self) {
+    GIFINFO info;
+    GIF_getInfo(&self->gif, &info);
+    mp_printf(&mp_plat_print, "dur %d fc %d max %d min %d\n", info.iDuration, info.iFrameCount, info.iMaxDelay, info.iMinDelay);
+
+    return (uint16_t)self->gif.iCanvasHeight;
+}
+
+uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self) {
+    return (uint16_t)self->gif.iCanvasWidth;
+}
+
+mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *self) {
+    return MP_OBJ_FROM_PTR(self->pixel_shader_base);
+}
+
+mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self) {
+    return MP_OBJ_FROM_PTR(self->bitmap);
+}
+
+uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self) {
+    int result = GIF_playFrame(&self->gif, 0, self->bitmap);
+
+    if (result >= 0) {
+        displayio_area_t dirty_area = {
+            .x1 = 0,
+            .y1 = 0,
+            .x2 = self->bitmap->width,
+            .y2 = self->bitmap->height,
+        };
+
+        displayio_bitmap_set_dirty_area(self->bitmap, &dirty_area);
+    }
+
+    return result;
+}
diff --git a/shared-module/displayio/OnDiskGif.h b/shared-module/displayio/OnDiskGif.h
new file mode 100644
index 0000000000..008635bc66
--- /dev/null
+++ b/shared-module/displayio/OnDiskGif.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKGIF_H
+#define MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKGIF_H
+
+#include 
+#include 
+
+#include "py/obj.h"
+
+// #include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h"
+#include "AnimatedGIF_circuitpy.h"
+#include "Bitmap.h"
+
+#include "extmod/vfs_fat.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    GIFIMAGE gif;
+    pyb_file_obj_t *file;
+    uint32_t *frame;
+    displayio_bitmap_t *bitmap;
+    union {
+        mp_obj_base_t *pixel_shader_base;
+        struct displayio_palette *palette;
+        struct displayio_colorconverter *colorconverter;
+    };
+} displayio_ondiskgif_t;
+
+#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKGIF_H
diff --git a/shared-module/displayio/gif.c b/shared-module/displayio/gif.c
new file mode 100644
index 0000000000..a4ad31608d
--- /dev/null
+++ b/shared-module/displayio/gif.c
@@ -0,0 +1,993 @@
+//
+// GIF Animator
+// written by Larry Bank
+// bitbank@pobox.com
+// Arduino port started 7/5/2020
+// Original GIF code written 20+ years ago :)
+// The goal of this code is to decode images up to 480x320
+// using no more than 22K of RAM (if sent directly to an LCD display)
+//
+// Copyright 2020 BitBank Software, Inc. All Rights Reserved.
+// 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.
+// ===========================================================================
+#define __LINUX__
+#include "AnimatedGIF_circuitpy.h"
+
+#include "py/mperrno.h"
+#include "py/runtime.h"
+
+
+#ifdef HAL_ESP32_HAL_H_
+#define memcpy_P memcpy
+#endif
+
+static const unsigned char cGIFBits[9] = {1,4,4,4,8,8,8,8,8}; // convert odd bpp values to ones we can handle
+
+// forward references
+static int GIFInit(GIFIMAGE *pGIF);
+static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly);
+static int GIFGetMoreData(GIFIMAGE *pPage);
+static void GIFMakePels(GIFIMAGE *pPage, unsigned int code);
+static int DecodeLZW(GIFIMAGE *pImage, int iOptions);
+static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
+static int32_t seekMem(GIFFILE *pFile, int32_t iPosition);
+int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo);
+#if defined(PICO_BUILD) || defined(__LINUX__) || defined(__MCUXPRESSO)
+static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
+static int32_t seekFile(GIFFILE *pFile, int32_t iPosition);
+static void closeFile(void *handle);
+
+// C API
+int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) {
+    pGIF->iError = GIF_SUCCESS;
+    pGIF->pfnRead = readMem;
+    pGIF->pfnSeek = seekMem;
+    pGIF->pfnDraw = pfnDraw;
+    pGIF->pfnOpen = NULL;
+    pGIF->pfnClose = NULL;
+    pGIF->GIFFile.iSize = iDataSize;
+    pGIF->GIFFile.pData = pData;
+    return GIFInit(pGIF);
+} /* GIF_openRAM() */
+
+#ifdef __LINUX__
+int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw) {
+    pGIF->iError = GIF_SUCCESS;
+    pGIF->pfnRead = readFile;
+    pGIF->pfnSeek = seekFile;
+    pGIF->pfnDraw = pfnDraw;
+    pGIF->pfnOpen = NULL;
+    pGIF->pfnClose = closeFile;
+    pGIF->GIFFile.fHandle = fopen(szFilename, "r+b");
+    if (pGIF->GIFFile.fHandle == NULL) {
+        return 0;
+    }
+    fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_END);
+    pGIF->GIFFile.iSize = (int)ftell((FILE *)pGIF->GIFFile.fHandle);
+    fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_SET);
+    return GIFInit(pGIF);
+} /* GIF_openFile() */
+#endif
+
+void GIF_close(GIFIMAGE *pGIF) {
+    if (pGIF->pfnClose) {
+        (*pGIF->pfnClose)(pGIF->GIFFile.fHandle);
+    }
+} /* GIF_close() */
+
+void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType) {
+    memset(pGIF, 0, sizeof(GIFIMAGE));
+    pGIF->ucPaletteType = ucPaletteType;
+} /* GIF_begin() */
+
+void GIF_reset(GIFIMAGE *pGIF) {
+    (*pGIF->pfnSeek)(&pGIF->GIFFile, 0);
+} /* GIF_reset() */
+
+//
+// Return value:
+// 1 = good decode, more frames exist
+// 0 = good decode, no more frames
+// -1 = error
+//
+int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser) {
+    int rc;
+
+    if (delayMilliseconds) {
+        *delayMilliseconds = 0; // clear any old valid
+    }
+    if (pGIF->GIFFile.iPos >= pGIF->GIFFile.iSize - 1) { // no more data exists
+        (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek to start
+    }
+    if (GIFParseInfo(pGIF, 0)) {
+        pGIF->pUser = pUser;
+        if (pGIF->iError == GIF_EMPTY_FRAME) { // don't try to decode it
+            return 0;
+        }
+        rc = DecodeLZW(pGIF, 0);
+        if (rc != 0) { // problem
+            return 0;
+        }
+    } else {
+        return 0; // error parsing the frame info, we may be at the end of the file
+    }
+    // Return 1 for more frames or 0 if this was the last frame
+    if (delayMilliseconds) { // if not NULL, return the frame delay time
+        *delayMilliseconds = pGIF->iFrameDelay;
+    }
+    return pGIF->GIFFile.iPos < pGIF->GIFFile.iSize - 1;
+} /* GIF_playFrame() */
+
+int GIF_getCanvasWidth(GIFIMAGE *pGIF) {
+    return pGIF->iCanvasWidth;
+} /* GIF_getCanvasWidth() */
+
+int GIF_getCanvasHeight(GIFIMAGE *pGIF) {
+    return pGIF->iCanvasHeight;
+} /* GIF_getCanvasHeight() */
+
+int GIF_getLoopCount(GIFIMAGE *pGIF) {
+    return pGIF->iRepeatCount;
+} /* GIF_getLoopCount() */
+
+int GIF_getComment(GIFIMAGE *pGIF, char *pDest) {
+    int32_t iOldPos;
+
+    iOldPos = pGIF->GIFFile.iPos; // keep old position
+    (*pGIF->pfnSeek)(&pGIF->GIFFile, pGIF->iCommentPos);
+    (*pGIF->pfnRead)(&pGIF->GIFFile, (uint8_t *)pDest, pGIF->sCommentLen);
+    (*pGIF->pfnSeek)(&pGIF->GIFFile, iOldPos);
+    pDest[pGIF->sCommentLen] = 0; // zero terminate the string
+    return (int)pGIF->sCommentLen;
+
+} /* GIF_getComment() */
+
+int GIF_getLastError(GIFIMAGE *pGIF) {
+    return pGIF->iError;
+} /* GIF_getLastError() */
+
+int GIF_init(GIFIMAGE *pGIF) {
+    return GIFInit(pGIF);
+}
+
+#endif // !__cplusplus
+//
+// Helper functions for memory based images
+//
+static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
+    int32_t iBytesRead;
+
+    iBytesRead = iLen;
+    if ((pFile->iSize - pFile->iPos) < iLen) {
+        iBytesRead = pFile->iSize - pFile->iPos;
+    }
+    if (iBytesRead <= 0) {
+        return 0;
+    }
+    memmove(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
+    pFile->iPos += iBytesRead;
+    return iBytesRead;
+} /* readMem() */
+
+/*
+static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
+{
+    int32_t iBytesRead;
+
+    iBytesRead = iLen;
+    if ((pFile->iSize - pFile->iPos) < iLen)
+       iBytesRead = pFile->iSize - pFile->iPos;
+    if (iBytesRead <= 0)
+       return 0;
+    memcpy_P(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
+    pFile->iPos += iBytesRead;
+    return iBytesRead;
+} *//* readFLASH() */
+
+static int32_t seekMem(GIFFILE *pFile, int32_t iPosition) {
+    if (iPosition < 0) {
+        iPosition = 0;
+    } else if (iPosition >= pFile->iSize) {
+        iPosition = pFile->iSize - 1;
+    }
+    pFile->iPos = iPosition;
+    return iPosition;
+} /* seekMem() */
+
+#if defined(__LINUX__) || defined(__MCUXPRESSO)
+static void closeFile(void *handle) {
+    fclose((FILE *)handle);
+} /* closeFile() */
+
+static int32_t seekFile(GIFFILE *pFile, int32_t iPosition) {
+    if (iPosition < 0) {
+        iPosition = 0;
+    } else if (iPosition >= pFile->iSize) {
+        iPosition = pFile->iSize - 1;
+    }
+    pFile->iPos = iPosition;
+    fseek((FILE *)pFile->fHandle, iPosition, SEEK_SET);
+    return iPosition;
+} /* seekMem() */
+
+static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
+    int32_t iBytesRead;
+
+    iBytesRead = iLen;
+    if ((pFile->iSize - pFile->iPos) < iLen) {
+        iBytesRead = pFile->iSize - pFile->iPos;
+    }
+    if (iBytesRead <= 0) {
+        return 0;
+    }
+    iBytesRead = (int)fread(pBuf, 1, iBytesRead, (FILE *)pFile->fHandle);
+    pFile->iPos += iBytesRead;
+    return iBytesRead;
+} /* readFile() */
+
+#endif // __LINUX__
+//
+// The following functions are written in plain C and have no
+// 3rd party dependencies, not even the C runtime library
+//
+//
+// Initialize a GIF file and callback access from a file on SD or memory
+// returns 1 for success, 0 for failure
+// Fills in the canvas size of the GIFIMAGE structure
+//
+static int GIFInit(GIFIMAGE *pGIF) {
+    pGIF->GIFFile.iPos = 0; // start at beginning of file
+    if (!GIFParseInfo(pGIF, 1)) { // gather info for the first frame
+        return 0; // something went wrong; not a GIF file?
+    }
+    (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek back to start of the file
+    if (pGIF->iCanvasWidth > MAX_WIDTH) { // need to allocate more space
+        pGIF->iError = GIF_TOO_WIDE;
+        return 0;
+    }
+    return 1;
+} /* GIFInit() */
+
+//
+// Parse the GIF header, gather the size and palette info
+// If called with bInfoOnly set to true, it will test for a valid file
+// and return the canvas size only
+// Returns 1 for success, 0 for failure
+//
+static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
+    int i, j, iColorTableBits;
+    int iBytesRead;
+    unsigned char c, *p;
+    int32_t iOffset = 0;
+    int32_t iStartPos = pPage->GIFFile.iPos; // starting file position
+    int iReadSize;
+
+    pPage->bUseLocalPalette = 0; // assume no local palette
+    pPage->bEndOfFrame = 0; // we're just getting started
+    pPage->iFrameDelay = 0; // may not have a gfx extension block
+    pPage->iRepeatCount = -1; // assume NETSCAPE loop count is not specified
+    iReadSize = (bInfoOnly) ? 12 : MAX_CHUNK_SIZE;
+    // If you try to read past the EOF, the SD lib will return garbage data
+    if (iStartPos + iReadSize > pPage->GIFFile.iSize) {
+        iReadSize = (pPage->GIFFile.iSize - iStartPos - 1);
+    }
+    p = pPage->ucFileBuf;
+    iBytesRead = (*pPage->pfnRead)(&pPage->GIFFile, pPage->ucFileBuf, iReadSize);  // 255 is plenty for now
+
+    if (iBytesRead != iReadSize) { // we're at the end of the file
+        pPage->iError = GIF_EARLY_EOF;
+        return 0;
+    }
+    if (iStartPos == 0) { // start of the file
+        // canvas size
+        if (memcmp(p, "GIF89", 5) != 0 && memcmp(p, "GIF87", 5) != 0) { // not a GIF file
+            pPage->iError = GIF_BAD_FILE;
+            return 0;
+        }
+        pPage->iCanvasWidth = pPage->iWidth = INTELSHORT(&p[6]);
+        pPage->iCanvasHeight = pPage->iHeight = INTELSHORT(&p[8]);
+        pPage->iBpp = ((p[10] & 0x70) >> 4) + 1;
+        if (bInfoOnly) {
+            return 1; // we've got the info we needed, leave
+        }
+        iColorTableBits = (p[10] & 7) + 1; // Log2(size) of the color table
+        pPage->ucBackground = p[11]; // background color
+        pPage->ucGIFBits = 0;
+        iOffset = 13;
+        if (p[10] & 0x80) { // global color table?
+            // by default, convert to byte-reversed RGB565 for immediate use
+            // Read enough additional data for the color table
+            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3 * (1 << iColorTableBits));
+            if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
+                for (i = 0; i < (1 << iColorTableBits); i++)
+                {
+                    uint16_t usRGB565;
+                    usRGB565 = ((p[iOffset] >> 3) << 11); // R
+                    usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
+                    usRGB565 |= (p[iOffset + 2] >> 3); // B
+                    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) {
+                        pPage->pPalette[i] = usRGB565;
+                    } else {
+                        pPage->pPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
+                    }
+                    iOffset += 3;
+                }
+            } else { // just copy it as-is
+                memcpy(pPage->pPalette, &p[iOffset], (1 << iColorTableBits) * 3);
+                iOffset += (1 << iColorTableBits) * 3;
+            }
+        }
+    }
+    while (p[iOffset] != ',' && p[iOffset] != ';') { /* Wait for image separator */
+        if (p[iOffset] == '!') { /* Extension block */
+            iOffset++;
+            switch (p[iOffset++]) /* Block type */
+            {
+                case 0xf9: /* Graphic extension */
+                    if (p[iOffset] == 4) { // correct length
+                        pPage->ucGIFBits = p[iOffset + 1]; // packed fields
+                        pPage->iFrameDelay = (INTELSHORT(&p[iOffset + 2])) * 10; // delay in ms
+                        if (pPage->iFrameDelay <= 1) { // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute
+                            pPage->iFrameDelay = 100;
+                        }
+                        if (pPage->ucGIFBits & 1) { // transparent color is used
+                            pPage->ucTransparent = p[iOffset + 4]; // transparent color index
+                        }
+                        iOffset += 6;
+                    }
+                    //                     else   // error
+                    break;
+                case 0xff: /* App extension */
+                    c = 1;
+                    while (c) { /* Skip all data sub-blocks */
+                        c = p[iOffset++]; /* Block length */
+                        if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first
+                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down
+                            iBytesRead -= iOffset;
+                            iStartPos += iOffset;
+                            iOffset = 0;
+                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32);
+                        }
+                        if (c == 11) { // fixed block length
+                            // Netscape app block contains the repeat count
+                            if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0) {
+                                if (p[iOffset + 11] == 3 && p[iOffset + 12] == 1) { // loop count
+                                    pPage->iRepeatCount = INTELSHORT(&p[iOffset + 13]);
+                                }
+                            }
+                        }
+                        iOffset += (int)c; /* Skip to next sub-block */
+                    }
+                    break;
+                case 0x01: /* Text extension */
+                    c = 1;
+                    j = 0;
+                    while (c) { /* Skip all data sub-blocks */
+                        c = p[iOffset++]; /* Block length */
+                        if (j == 0) { // use only first block
+                            j = c;
+                            if (j > 127) { // max comment length = 127
+                                j = 127;
+                            }
+                            //                           memcpy(pPage->szInfo1, &p[iOffset], j);
+                            //                           pPage->szInfo1[j] = '\0';
+                            j = 1;
+                        }
+                        iOffset += (int)c; /* Skip this sub-block */
+                    }
+                    break;
+                case 0xfe: /* Comment */
+                    c = 1;
+                    while (c) { /* Skip all data sub-blocks */
+                        c = p[iOffset++]; /* Block length */
+                        if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first
+                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down
+                            iBytesRead -= iOffset;
+                            iStartPos += iOffset;
+                            iOffset = 0;
+                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32);
+                        }
+                        if (pPage->iCommentPos == 0) { // Save first block info
+                            pPage->iCommentPos = iStartPos + iOffset;
+                            pPage->sCommentLen = c;
+                        }
+                        iOffset += (int)c; /* Skip this sub-block */
+                    }
+                    break;
+                default:
+                    /* Bad header info */
+                    pPage->iError = GIF_DECODE_ERROR;
+                    return 0;
+            } /* switch */
+        } else { // invalid byte, stop decoding
+            if (pPage->GIFFile.iSize - iStartPos < 32) { // non-image bytes at end of file?
+                pPage->iError = GIF_EMPTY_FRAME;
+            } else {
+                /* Bad header info */
+                pPage->iError = GIF_DECODE_ERROR;
+            }
+            return 0;
+        }
+    } /* while */
+    if (p[iOffset] == ';') { // end of file, quit and return a correct error code
+        pPage->iError = GIF_EMPTY_FRAME;
+        return 1;
+    }
+
+    if (p[iOffset] == ',') {
+        iOffset++;
+    }
+    // This particular frame's size and position on the main frame (if animated)
+    pPage->iX = INTELSHORT(&p[iOffset]);
+    pPage->iY = INTELSHORT(&p[iOffset + 2]);
+    pPage->iWidth = INTELSHORT(&p[iOffset + 4]);
+    pPage->iHeight = INTELSHORT(&p[iOffset + 6]);
+    iOffset += 8;
+
+    /* Image descriptor
+     7 6 5 4 3 2 1 0    M=0 - use global color map, ignore pixel
+     M I 0 0 0 pixel    M=1 - local color map follows, use pixel
+     I=0 - Image in sequential order
+     I=1 - Image in interlaced order
+     pixel+1 = # bits per pixel for this image
+     */
+    pPage->ucMap = p[iOffset++];
+    if (pPage->ucMap & 0x80) { // local color table?
+        // by default, convert to byte-reversed RGB565 for immediate use
+        j = (1 << ((pPage->ucMap & 7) + 1));
+        // Read enough additional data for the color table
+        iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j *3);
+        if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
+            for (i = 0; i < j; i++)
+            {
+                uint16_t usRGB565;
+                usRGB565 = ((p[iOffset] >> 3) << 11); // R
+                usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
+                usRGB565 |= (p[iOffset + 2] >> 3); // B
+                if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) {
+                    pPage->pLocalPalette[i] = usRGB565;
+                } else {
+                    pPage->pLocalPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
+                }
+                iOffset += 3;
+            }
+        } else { // just copy it as-is
+            memcpy(pPage->pLocalPalette, &p[iOffset], j * 3);
+            iOffset += j * 3;
+        }
+        pPage->bUseLocalPalette = 1;
+    }
+    pPage->ucCodeStart = p[iOffset++]; /* initial code size */
+    /* Since GIF can be 1-8 bpp, we only allow 1,4,8 */
+    pPage->iBpp = cGIFBits[pPage->ucCodeStart];
+    // we are re-using the same buffer turning GIF file data
+    // into "pure" LZW
+    pPage->iLZWSize = 0; // we're starting with no LZW data yet
+    c = 1; // get chunk length
+    while (c && iOffset < iBytesRead) {
+//     Serial.printf("iOffset=%d, iBytesRead=%d\n", iOffset, iBytesRead);
+        c = p[iOffset++]; // get chunk length
+//     Serial.printf("Chunk size = %d\n", c);
+        if (c <= (iBytesRead - iOffset)) {
+            memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c);
+            pPage->iLZWSize += c;
+            iOffset += c;
+        } else { // partial chunk in our buffer
+            int iPartialLen = (iBytesRead - iOffset);
+            memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen);
+            pPage->iLZWSize += iPartialLen;
+            iOffset += iPartialLen;
+            (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c - iPartialLen);
+            pPage->iLZWSize += (c - iPartialLen);
+        }
+        if (c == 0) {
+            pPage->bEndOfFrame = 1; // signal not to read beyond the end of the frame
+        }
+    }
+// seeking on an SD card is VERY VERY SLOW, so use the data we've already read by de-chunking it
+// in this case, there's too much data, so we have to seek backwards a bit
+    if (iOffset < iBytesRead) {
+//     Serial.printf("Need to seek back %d bytes\n", iBytesRead - iOffset);
+        (*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot
+    }
+    return 1; // we are now at the start of the chunk data
+} /* GIFParseInfo() */
+//
+// Gather info about an animated GIF file
+//
+int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
+    int iOff, iNumFrames;
+    int iDelay, iMaxDelay, iMinDelay, iTotalDelay;
+    int iReadAmount;
+    int iDataAvailable = 0;
+    int iDataRemaining = 0;
+    uint32_t lFileOff = 0;
+    int bDone = 0;
+    int bExt;
+    uint8_t c, *cBuf;
+
+    iMaxDelay = iTotalDelay = 0;
+    iMinDelay = 10000;
+    iNumFrames = 1;
+    iDataRemaining = pPage->GIFFile.iSize;
+    cBuf = (uint8_t *)pPage->ucFileBuf;
+    (*pPage->pfnSeek)(&pPage->GIFFile, 0);
+    iDataAvailable = (*pPage->pfnRead)(&pPage->GIFFile, cBuf, FILE_BUF_SIZE);
+    iDataRemaining -= iDataAvailable;
+    lFileOff += iDataAvailable;
+    iOff = 10;
+    c = cBuf[iOff]; // get info bits
+    iOff += 3;   /* Skip flags, background color & aspect ratio */
+    if (c & 0x80) { /* Deal with global color table */
+        c &= 7;  /* Get the number of colors defined */
+        iOff += (2 << c) * 3; /* skip color table */
+    }
+    while (!bDone) { // && iNumFrames < MAX_FRAMES)
+        bExt = 1; /* skip extension blocks */
+        while (bExt && iOff < iDataAvailable) {
+            if ((iDataAvailable - iOff) < 258) { // need to read more data first
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                iDataAvailable -= iOff;
+                iOff = 0;
+                iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
+                iDataAvailable += iReadAmount;
+                iDataRemaining -= iReadAmount;
+                lFileOff += iReadAmount;
+            }
+            switch (cBuf[iOff])
+            {
+                case 0x3b: /* End of file */
+                    /* we were fooled into thinking there were more pages */
+                    iNumFrames--;
+                    goto gifpagesz;
+                // F9 = Graphic Control Extension (fixed length of 4 bytes)
+                // FE = Comment Extension
+                // FF = Application Extension
+                // 01 = Plain Text Extension
+                case 0x21: /* Extension block */
+                    if (cBuf[iOff + 1] == 0xf9 && cBuf[iOff + 2] == 4) { // Graphic Control Extension
+                        // cBuf[iOff+3]; // page disposition flags
+                        iDelay = cBuf[iOff + 4]; // delay low byte
+                        iDelay |= ((uint16_t)(cBuf[iOff + 5]) << 8); // delay high byte
+                        if (iDelay < 2) { // too fast, provide a default
+                            iDelay = 2;
+                        }
+                        iDelay *= 10; // turn JIFFIES into milliseconds
+                        iTotalDelay += iDelay;
+                        if (iDelay > iMaxDelay) {
+                            iMaxDelay = iDelay;
+                        } else if (iDelay < iMinDelay) {
+                            iMinDelay = iDelay;
+                        }
+                        // (cBuf[iOff+6]; // transparent color index
+                    }
+                    iOff += 2; /* skip to length */
+                    iOff += (int)cBuf[iOff]; /* Skip the data block */
+                    iOff++;
+                    // block terminator or optional sub blocks
+                    c = cBuf[iOff++]; /* Skip any sub-blocks */
+                    while (c) {
+                        iOff += (int)c;
+                        c = cBuf[iOff++];
+                        if ((iDataAvailable - iOff) < (c + 258)) { // need to read more data first
+                            memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                            iDataAvailable -= iOff;
+                            iOff = 0;
+                            iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
+                            iDataAvailable += iReadAmount;
+                            iDataRemaining -= iReadAmount;
+                            lFileOff += iReadAmount;
+                        }
+                    }
+                    if (c != 0) { // problem, we went past the end
+                        iNumFrames--; // possible corrupt data; stop
+                        goto gifpagesz;
+                    }
+                    break;
+                case 0x2c: /* Start of image data */
+                    bExt = 0; /* Stop doing extension blocks */
+                    break;
+                default:
+                    /* Corrupt data, stop here */
+                    iNumFrames--;
+                    goto gifpagesz;
+            } // switch
+        } // while
+        if (iOff >= iDataAvailable) { // problem
+            iNumFrames--;  // possible corrupt data; stop
+            goto gifpagesz;
+        }
+        /* Start of image data */
+        c = cBuf[iOff + 9]; /* Get the flags byte */
+        iOff += 10; /* Skip image position and size */
+        if (c & 0x80) { /* Local color table */
+            c &= 7;
+            iOff += (2 << c) * 3;
+        }
+        iOff++; /* Skip LZW code size byte */
+        if ((iDataAvailable - iOff) < (c + 258)) { // need to read more data first
+            if (iOff < iDataAvailable) {
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                iDataAvailable -= iOff;
+                iOff = 0;
+            } else {  // already points beyond end
+                iOff -= iDataAvailable;
+                iDataAvailable = 0;
+            }
+            iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
+            iDataAvailable += iReadAmount;
+            iDataRemaining -= iReadAmount;
+            lFileOff += iReadAmount;
+        }
+        c = cBuf[iOff++];
+        while (c) { /* While there are more data blocks */
+            if (iOff > (3 * FILE_BUF_SIZE / 4) && iDataRemaining > 0) { /* Near end of buffer, re-align */
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                iDataAvailable -= iOff;
+                iOff = 0;
+                iReadAmount = (FILE_BUF_SIZE - iDataAvailable);
+                if (iReadAmount > iDataRemaining) {
+                    iReadAmount = iDataRemaining;
+                }
+                iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount);
+                iDataAvailable += iReadAmount;
+                iDataRemaining -= iReadAmount;
+                lFileOff += iReadAmount;
+            }
+            iOff += (int)c;  /* Skip this data block */
+//            if ((int)lFileOff + iOff > pPage->GIFFile.iSize) // past end of file, stop
+//            {
+//                iNumFrames--; // don't count this page
+//                break; // last page is corrupted, don't use it
+//            }
+            c = cBuf[iOff++]; /* Get length of next */
+        }
+        /* End of image data, check for more pages... */
+        if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32)) {
+            bDone = 1; /* End of file has been reached */
+        } else { /* More pages to scan */
+            iNumFrames++;
+            // read new page data starting at this offset
+            if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) { // since we didn't read the whole file in one shot
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                iDataAvailable -= iOff;
+                iOff = 0;
+                iReadAmount = (FILE_BUF_SIZE - iDataAvailable);
+                if (iReadAmount > iDataRemaining) {
+                    iReadAmount = iDataRemaining;
+                }
+                iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount);
+                iDataAvailable += iReadAmount;
+                iDataRemaining -= iReadAmount;
+                lFileOff += iReadAmount;
+            }
+        }
+    } /* while !bDone */
+gifpagesz:
+    pInfo->iFrameCount = iNumFrames;
+    pInfo->iMaxDelay = iMaxDelay;
+    pInfo->iMinDelay = iMinDelay;
+    pInfo->iDuration = iTotalDelay;
+    return 1;
+} /* GIF_getInfo() */
+
+//
+// Unpack more chunk data for decoding
+// returns 1 to signify more data available for this image
+// 0 indicates there is no more data
+//
+static int GIFGetMoreData(GIFIMAGE *pPage) {
+    int iDelta = (pPage->iLZWSize - pPage->iLZWOff);
+    unsigned char c = 1;
+    // move any existing data down
+    if (pPage->bEndOfFrame || iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0) {
+        return 1; // frame is finished or buffer is already full; no need to read more data
+    }
+    if (pPage->iLZWOff != 0) {
+// NB: memcpy() fails on some systems because the src and dest ptrs overlap
+// so copy the bytes in a simple loop to avoid problems
+        for (int i = 0; i < pPage->iLZWSize - pPage->iLZWOff; i++) {
+            pPage->ucLZW[i] = pPage->ucLZW[i + pPage->iLZWOff];
+        }
+        pPage->iLZWSize -= pPage->iLZWOff;
+        pPage->iLZWOff = 0;
+    }
+    while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE - MAX_CHUNK_SIZE)) {
+        (*pPage->pfnRead)(&pPage->GIFFile, &c, 1); // current length
+        (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c);
+        pPage->iLZWSize += c;
+    }
+    if (c == 0) { // end of frame
+        pPage->bEndOfFrame = 1;
+    }
+    return c != 0 && pPage->GIFFile.iPos < pPage->GIFFile.iSize; // more data available?
+} /* GIFGetMoreData() */
+//
+// Handle transparent pixels and disposal method
+// Used only when a frame buffer is allocated
+//
+static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
+    uint8_t *d, *s;
+    int x, iPitch = pPage->iCanvasWidth;
+
+    s = pDraw->pPixels;
+    d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY) * iPitch];  // dest pointer in our complete canvas buffer
+    if (pDraw->ucDisposalMethod == 2) { // restore to background color
+        memset(d, pDraw->ucBackground, pDraw->iWidth);
+    }
+    // Apply the new pixels to the main image
+    if (pDraw->ucHasTransparency) { // if transparency used
+        uint8_t c, ucTransparent = pDraw->ucTransparent;
+        for (x = 0; x < pDraw->iWidth; x++)
+        {
+            c = *s++;
+            if (c != ucTransparent) {
+                *d = c;
+            }
+            d++;
+        }
+    } else {
+        memcpy(d, s, pDraw->iWidth); // just overwrite the old pixels
+    }
+} /* DrawNewPixels() */
+//
+// Convert current line of pixels through the palette
+// to either RGB565 or RGB888 output
+// Used only when a frame buffer has been allocated
+//
+static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
+    uint8_t *d, *s;
+    int x;
+
+    s = &pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX];
+    d = &pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer
+    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
+        uint16_t *pPal, *pu16;
+        pPal = (uint16_t *)pDraw->pPalette;
+        pu16 = (uint16_t *)d;
+        for (x = 0; x < pPage->iWidth; x++)
+        {
+            *pu16++ = pPal[*s++]; // convert to RGB565 pixels
+        }
+    } else {
+        uint8_t *pPal;
+        int pixel;
+        pPal = (uint8_t *)pDraw->pPalette;
+        for (x = 0; x < pPage->iWidth; x++)
+        {
+            pixel = *s++;
+            *d++ = pPal[(pixel * 3) + 0]; // convert to RGB888 pixels
+            *d++ = pPal[(pixel * 3) + 1];
+            *d++ = pPal[(pixel * 3) + 2];
+        }
+    }
+} /* ConvertNewPixels() */
+
+//
+// GIFMakePels
+//
+static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
+    int iPixCount;
+    unsigned short *giftabs;
+    unsigned char *buf, *s, *pEnd, *gifpels;
+    unsigned char ucNeedMore = 0;
+    /* Copy this string of sequential pixels to output buffer */
+    //   iPixCount = 0;
+    s = pPage->ucFileBuf + FILE_BUF_SIZE; /* Pixels will come out in reversed order */
+    buf = pPage->ucLineBuf + (pPage->iWidth - pPage->iXCount);
+    giftabs = pPage->usGIFTable;
+    gifpels = &pPage->ucGIFPixels[PIXEL_LAST];
+    while (code < LINK_UNUSED) {
+        if (s == pPage->ucFileBuf) { /* Houston, we have a problem */
+            return; /* Exit with error */
+        }
+        *(--s) = gifpels[code];
+        code = giftabs[code];
+    }
+    iPixCount = (int)(intptr_t)(pPage->ucFileBuf + FILE_BUF_SIZE - s);
+
+    while (iPixCount && pPage->iYCount > 0) {
+        if (pPage->iXCount > iPixCount) { /* Pixels fit completely on the line */
+            //            memcpy(buf, s, iPixCount);
+            //            buf += iPixCount;
+            pEnd = buf + iPixCount;
+            while (buf < pEnd) {
+                *buf++ = *s++;
+            }
+            pPage->iXCount -= iPixCount;
+            //         iPixCount = 0;
+            if (ucNeedMore) {
+                GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines
+            }
+            return;
+        } else { /* Pixels cross into next line */
+            GIFDRAW gd;
+            pEnd = buf + pPage->iXCount;
+            while (buf < pEnd) {
+                *buf++ = *s++;
+            }
+            iPixCount -= pPage->iXCount;
+            pPage->iXCount = pPage->iWidth; /* Reset pixel count */
+            // Prepare GIDRAW structure for callback
+            gd.iX = pPage->iX;
+            gd.iY = pPage->iY;
+            gd.iWidth = pPage->iWidth;
+            gd.iHeight = pPage->iHeight;
+            gd.pPixels = pPage->ucLineBuf;
+            gd.pPalette = (pPage->bUseLocalPalette) ? pPage->pLocalPalette : pPage->pPalette;
+            gd.pPalette24 = (uint8_t *)gd.pPalette; // just cast the pointer for RGB888
+            gd.ucIsGlobalPalette = pPage->bUseLocalPalette == 1?0:1;
+            gd.y = pPage->iHeight - pPage->iYCount;
+            // Ugly logic to handle the interlaced line position, but it
+            // saves having to have another set of state variables
+            if (pPage->ucMap & 0x40) { // interlaced?
+                int height = pPage->iHeight - 1;
+                if (gd.y > height / 2) {
+                    gd.y = gd.y * 2 - (height | 1);
+                } else if (gd.y > height / 4) {
+                    gd.y = gd.y * 4 - ((height & ~1) | 2);
+                } else if (gd.y > height / 8) {
+                    gd.y = gd.y * 8 - ((height & ~3) | 4);
+                } else {
+                    gd.y = gd.y * 8;
+                }
+            }
+            gd.ucDisposalMethod = (pPage->ucGIFBits & 0x1c) >> 2;
+            gd.ucTransparent = pPage->ucTransparent;
+            gd.ucHasTransparency = pPage->ucGIFBits & 1;
+            gd.ucBackground = pPage->ucBackground;
+            gd.pUser = pPage->pUser;
+            if (pPage->pFrameBuffer) { // update the frame buffer
+                DrawNewPixels(pPage, &gd);
+                if (pPage->ucDrawType == GIF_DRAW_COOKED) {
+                    ConvertNewPixels(pPage, &gd); // prepare for output
+                    gd.pPixels = &pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight];
+                }
+            }
+            (*pPage->pfnDraw)(&gd); // callback to handle this line
+            pPage->iYCount--;
+            buf = pPage->ucLineBuf;
+            if ((pPage->iYCount & 3) == 0) { // since we support only small images...
+                ucNeedMore = 1;
+            }
+        }
+    } /* while */
+    if (ucNeedMore) {
+        GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines
+    }
+    return;
+} /* GIFMakePels() */
+//
+// Macro to extract a variable length code
+//
+#define GET_CODE if (bitnum > (REGISTER_WIDTH - codesize)) { pImage->iLZWOff += (bitnum >> 3); \
+                                                             bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \
+    code = (unsigned short)(ulBits >> bitnum);      /* Read a 32-bit chunk */ \
+    code &= sMask; bitnum += codesize;
+
+//
+// Decode LZW into an image
+//
+static int DecodeLZW(GIFIMAGE *pImage, int iOptions) {
+    int i, bitnum;
+    unsigned short oldcode, codesize, nextcode, nextlim;
+    unsigned short *giftabs, cc, eoi;
+    signed short sMask;
+    unsigned char *gifpels, *p;
+    //    int iStripSize;
+    // unsigned char **index;
+    uint32_t ulBits;
+    unsigned short code;
+    (void)iOptions; // not used for now
+    // if output can be used for string table, do it faster
+    //       if (bGIF && (OutPage->cBitsperpixel == 8 && ((OutPage->iWidth & 3) == 0)))
+    //          return PILFastLZW(InPage, OutPage, bGIF, iOptions);
+    p = pImage->ucLZW; // un-chunked LZW data
+    sMask = 0xffff << (pImage->ucCodeStart + 1);
+    sMask = 0xffff - sMask;
+    cc = (sMask >> 1) + 1; /* Clear code */
+    eoi = cc + 1;
+    giftabs = pImage->usGIFTable;
+    gifpels = pImage->ucGIFPixels;
+    pImage->iYCount = pImage->iHeight; // count down the lines
+    pImage->iXCount = pImage->iWidth;
+    bitnum = 0;
+    pImage->iLZWOff = 0; // Offset into compressed data
+    GIFGetMoreData(pImage); // Read some data to start
+
+    // Initialize code table
+    // this part only needs to be initialized once
+    for (i = 0; i < cc; i++)
+    {
+        gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short)i;
+        giftabs[i] = LINK_END;
+    }
+init_codetable:
+    codesize = pImage->ucCodeStart + 1;
+    sMask = 0xffff << (pImage->ucCodeStart + 1);
+    sMask = 0xffff - sMask;
+    nextcode = cc + 2;
+    nextlim = (unsigned short)((1 << codesize));
+    // This part of the table needs to be reset multiple times
+    memset(&giftabs[cc], LINK_UNUSED, (4096 - cc) * sizeof(short));
+    ulBits = INTELLONG(&p[pImage->iLZWOff]); // start by reading 4 bytes of LZW data
+    GET_CODE
+    if (code == cc) { // we just reset the dictionary, so get another code
+        GET_CODE
+    }
+    oldcode = code;
+    GIFMakePels(pImage, code); // first code is output as the first pixel
+    // Main decode loop
+    while (code != eoi && pImage->iYCount > 0) { // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */
+        GET_CODE
+        if (code == cc) { /* Clear code?, and not first code */
+            goto init_codetable;
+        }
+        if (code != eoi) {
+            if (nextcode < nextlim) {   // for deferred cc case, don't let it overwrite the last entry (fff)
+                giftabs[nextcode] = oldcode;
+                gifpels[PIXEL_FIRST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
+                if (giftabs[code] == LINK_UNUSED) {   /* Old code */
+                    gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
+                } else {
+                    gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code];
+                }
+            }
+            nextcode++;
+            if (nextcode >= nextlim && codesize < 12) {
+                codesize++;
+                nextlim <<= 1;
+                sMask = (sMask << 1) | 1;
+            }
+            GIFMakePels(pImage, code);
+            oldcode = code;
+        }
+    } /* while not end of LZW code stream */
+    return 0;
+// gif_forced_error:
+//    free(pImage->pPixels);
+//    pImage->pPixels = NULL;
+//    return -1;
+} /* DecodeLZW() */
+
+void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw) {
+    pGIF->pfnDraw = pfnDraw;
+} /* GIF_setDrawCallback() */
+//
+// Scale 2 scanlines down by 50% with pixel averaging
+// writes new values over previous line
+// expects RGB565 little endian pixels as input
+//
+void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian) {
+    int x;
+    uint16_t *d = pPrev;
+    uint32_t gSum, rbSum, pix0,pix1,pix2,pix3;
+    const uint32_t RBMask = 0xf81f, GMask = 0x7e0;
+
+    for (x = 0; x < iWidth; x += 2)
+    {
+        pix0 = pCurrent[0];
+        pix1 = pCurrent[1];
+        pix2 = pPrev[0];
+        pix3 = pPrev[1];
+        pCurrent += 2;
+        pPrev += 2;
+        gSum = (pix0 & GMask) + (pix1 & GMask) + (pix2 & GMask) + (pix3 & GMask);
+        gSum = ((gSum + 0x40) >> 2) & GMask; // for rounding towards 1
+        rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask);
+        rbSum = ((rbSum + 0x1002) >> 2) & RBMask;
+        if (bBigEndian) {
+            *d++ = __builtin_bswap16((uint16_t)(gSum + rbSum));
+        } else {
+            *d++ = (uint16_t)(gSum + rbSum); // store finished pixel
+        }
+    } // for x
+} /* GIF_scaleHalf() */

From 2b26242c66beb5f9f265514a326f738489abfe45 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 4 Feb 2023 18:38:07 -0600
Subject: [PATCH 1782/2403] need gif.c in shared-bindings to build

---
 shared-bindings/displayio/gif.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 shared-bindings/displayio/gif.c

diff --git a/shared-bindings/displayio/gif.c b/shared-bindings/displayio/gif.c
new file mode 100644
index 0000000000..e69de29bb2

From 6c54bc9fd9237caf793c16a37f624154be5375d5 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 12:31:08 +0530
Subject: [PATCH 1783/2403] more espnow changes

- improve docs
- use existing list methods
- change `recv` to `read`
---
 ports/espressif/bindings/espnow/Communicate.c | 34 ++++----
 ports/espressif/bindings/espnow/ESPNow.c      | 20 ++---
 ports/espressif/bindings/espnow/Peers.c       | 84 ++-----------------
 ports/espressif/bindings/espnow/__init__.c    |  2 +-
 ports/espressif/common-hal/espnow/ESPNow.c    | 10 +--
 ports/espressif/common-hal/espnow/ESPNow.h    |  6 +-
 6 files changed, 46 insertions(+), 110 deletions(-)

diff --git a/ports/espressif/bindings/espnow/Communicate.c b/ports/espressif/bindings/espnow/Communicate.c
index 2e6e63fe46..5016dcfdda 100644
--- a/ports/espressif/bindings/espnow/Communicate.c
+++ b/ports/espressif/bindings/espnow/Communicate.c
@@ -36,9 +36,9 @@
 //|     """Provides methods and statistics related to communication
 //|     with the ESP-NOW peers.
 //|
-//|     Dictionary:
+//|     Terminology:
 //|         * "Send" = "Transmit" = ``TX``
-//|         * "Recv" = "Receive" = ``RX``
+//|         * "Read" = ``RX``
 //|     """
 //|
 //|     def __init__(self) -> None:
@@ -46,7 +46,7 @@
 //|         ...
 
 //|     job: str
-//|     """Used to decide whether to call `__send` or `__recv`. (read-only)"""
+//|     """Used to decide whether to call `__send` or `__read`. (read-only)"""
 //|
 STATIC mp_obj_t espnow_com_get_job(const mp_obj_t self_in) {
     espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -97,9 +97,11 @@ MP_PROPERTY_GETTER(espnow_com_failure_obj,
 //|         self,
 //|         message: ReadableBuffer,
 //|         peer: Peer,
-//|     ) -> bool:
+//|     ) -> None:
 //|         """Send a message to the peer's mac address.
 //|
+//|         This blocks until a timeout of ``2`` seconds if the ESP-NOW internal buffers are full.
+//|
 //|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
 //|         :param Peer peer: Send message to this peer. If `None`, send to all registered peers.
 //|         """
@@ -131,18 +133,20 @@ STATIC mp_obj_t espnow_com___send(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_com___send_obj, 2, espnow_com___send);
 
-//|     def __recv(self) -> Optional[ESPNowPacket]:
-//|         """Receive a message from the peer(s).
+//|     def __read(self) -> Optional[ESPNowPacket]:
+//|         """Read a packet from the receive buffer.
+//|
+//|         This is non-blocking, the packet is received asynchronously from the peer(s).
 //|
 //|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
 //|         ...
-STATIC mp_obj_t espnow_com___recv(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_com___read(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_espnow_check_for_deinit(self);
 
-    return common_hal_espnow_recv(self);
+    return common_hal_espnow_read(self);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_com___recv_obj, espnow_com___recv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_com___read_obj, espnow_com___read);
 
 STATIC const mp_rom_map_elem_t espnow_com_locals_dict_table[] = {
     // Config parameters
@@ -153,14 +157,14 @@ STATIC const mp_rom_map_elem_t espnow_com_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_failure), MP_ROM_PTR(&espnow_com_failure_obj) },
 
     // Communication methods
-    { MP_ROM_QSTR(MP_QSTR___send), MP_ROM_PTR(&espnow_com___send_obj) },
-    { MP_ROM_QSTR(MP_QSTR___recv), MP_ROM_PTR(&espnow_com___recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR___send),  MP_ROM_PTR(&espnow_com___send_obj) },
+    { MP_ROM_QSTR(MP_QSTR___read),  MP_ROM_PTR(&espnow_com___read_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(espnow_com_locals_dict, espnow_com_locals_dict_table);
 
 //|     def __call__(self, *args: Optional[Any], **kwargs: Optional[Any]) -> Optional[Any]:
-//|         """Calls the private `__send` or `__recv` methods with the supplied ``args`` and ``kwargs``
-//|         based on whether the job parameter is set to ``send`` or ``recv``."""
+//|         """Calls the private `__send` or `__read` methods with the supplied ``args`` and ``kwargs``
+//|         based on whether the job parameter is set to ``send`` or ``read``."""
 //|         ...
 //|
 STATIC mp_obj_t espnow_com_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -170,8 +174,8 @@ STATIC mp_obj_t espnow_com_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
         case MP_QSTR_send:
             meth = MP_OBJ_FROM_PTR(&espnow_com___send_obj);
             break;
-        case MP_QSTR_recv:
-            meth = MP_OBJ_FROM_PTR(&espnow_com___recv_obj);
+        case MP_QSTR_read:
+            meth = MP_OBJ_FROM_PTR(&espnow_com___read_obj);
             break;
         default:
             break;
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 8eb82af31a..bf1dcc9eb4 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -165,20 +165,20 @@ STATIC mp_obj_t espnow_get_send(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_send_obj, espnow_get_send);
 
-MP_PROPERTY_GETTER(espnow_send_call_obj,
+MP_PROPERTY_GETTER(espnow_send_obj,
     (mp_obj_t)&espnow_get_send_obj);
 
-//|     recv: Communicate
-//|     """A `Communicate` object with ``job`` set to ``recv``. (read-only)"""
+//|     read: Communicate
+//|     """A `Communicate` object with ``job`` set to ``read``. (read-only)"""
 //|
-STATIC mp_obj_t espnow_get_recv(mp_obj_t self_in) {
+STATIC mp_obj_t espnow_get_read(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(self->recv);
+    return MP_OBJ_FROM_PTR(self->read);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_recv_obj, espnow_get_recv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_read_obj, espnow_get_read);
 
-MP_PROPERTY_GETTER(espnow_recv_call_obj,
-    (mp_obj_t)&espnow_get_recv_obj);
+MP_PROPERTY_GETTER(espnow_read_obj,
+    (mp_obj_t)&espnow_get_read_obj);
 
 // --- Peer Related Properties ---
 
@@ -208,8 +208,8 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
 
     // Send and receive messages
-    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_call_obj) },
-    { MP_ROM_QSTR(MP_QSTR_recv),        MP_ROM_PTR(&espnow_recv_call_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read),        MP_ROM_PTR(&espnow_read_obj) },
 
     // Peer related properties
     { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
index e3f858c1c9..15d07c09d0 100644
--- a/ports/espressif/bindings/espnow/Peers.c
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -38,7 +38,7 @@
 // TODO: Check for deinit
 
 //| class Peers:
-//|     """A class that provides peer managment functions. Sequence[Peer]."""
+//|     """Maintains a `list` of `Peer` internally and only exposes a subset of `list` methods."""
 //|
 //|     def __init__(self) -> None:
 //|         """You cannot create an instance of `Peers`."""
@@ -86,22 +86,7 @@ STATIC MP_DEFINE_CONST_DICT(espnow_peers_locals_dict, espnow_peers_locals_dict_t
 STATIC void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
-    const char *item_separator = ", ";
-    if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
-        kind = PRINT_REPR;
-    } else {
-        #if MICROPY_PY_UJSON_SEPARATORS
-        item_separator = MP_PRINT_GET_EXT(print)->item_separator;
-        #endif
-    }
-    mp_print_str(print, "[");
-    for (size_t i = 0; i < list->len; i++) {
-        if (i > 0) {
-            mp_print_str(print, item_separator);
-        }
-        mp_obj_print_helper(print, list->items[i], kind);
-    }
-    mp_print_str(print, "]");
+    return list->base.type->print(print, self->list, kind);
 }
 
 /******************************************************************************/
@@ -110,20 +95,7 @@ STATIC void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
 STATIC mp_obj_t espnow_peers_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
-    switch (op) {
-        case MP_UNARY_OP_BOOL:
-            return mp_obj_new_bool(list->len != 0);
-        case MP_UNARY_OP_LEN:
-            return MP_OBJ_NEW_SMALL_INT(list->len);
-        #if MICROPY_PY_SYS_GETSIZEOF
-        case MP_UNARY_OP_SIZEOF: {
-            size_t sz = sizeof(*list) + sizeof(mp_obj_t) * list->alloc;
-            return MP_OBJ_NEW_SMALL_INT(sz);
-        }
-        #endif
-        default:
-            return MP_OBJ_NULL; // op not supported
-    }
+    return list->base.type->ext->unary_op(op, self->list);
 }
 
 /******************************************************************************/
@@ -133,58 +105,18 @@ STATIC mp_obj_t espnow_peers_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t v
     if (value != MP_OBJ_SENTINEL) {
         return MP_OBJ_NULL; // op not supported
     }
-
     espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
-
-    // load
-    #if MICROPY_PY_BUILTINS_SLICE
-    if (mp_obj_is_type(index, &mp_type_slice)) {
-        mp_bound_slice_t slice;
-        if (!mp_seq_get_fast_slice_indexes(list->len, index, &slice)) {
-            return mp_seq_extract_slice(list->len, list->items, &slice);
-        }
-
-        mp_obj_list_t *res = MP_OBJ_TO_PTR(mp_obj_new_list(slice.stop - slice.start, NULL));
-        mp_seq_copy(res->items, list->items + slice.start, res->len, mp_obj_t);
-        return MP_OBJ_FROM_PTR(res);
-    }
-    #endif
-    size_t index_val = mp_get_index(list->base.type, list->len, index, false);
-    return list->items[index_val];
+    return list->base.type->ext->subscr(self->list, index, value);
 }
 
 /******************************************************************************/
 /* peers iterator                                                             */
 
-typedef struct _espnow_peers_it_t {
-    mp_obj_base_t base;
-    mp_fun_1_t iternext;
-    mp_obj_t peers;
-    size_t cur;
-} espnow_peers_it_t;
-
-STATIC mp_obj_t espnow_peers_it_iternext(mp_obj_t self_in) {
-    espnow_peers_it_t *self = MP_OBJ_TO_PTR(self_in);
-    espnow_peers_obj_t *peers = MP_OBJ_TO_PTR(self->peers);
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(peers->list);
-    if (self->cur < list->len) {
-        mp_obj_t o_out = list->items[self->cur];
-        self->cur += 1;
-        return o_out;
-    } else {
-        return MP_OBJ_STOP_ITERATION;
-    }
-}
-
-STATIC mp_obj_t espnow_peers_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
-    assert(sizeof(espnow_peers_it_t) <= sizeof(mp_obj_iter_buf_t));
-    espnow_peers_it_t *o = (espnow_peers_it_t *)iter_buf;
-    o->base.type = &mp_type_polymorph_iter;
-    o->iternext = espnow_peers_it_iternext;
-    o->peers = o_in;
-    o->cur = 0;
-    return MP_OBJ_FROM_PTR(o);
+STATIC mp_obj_t espnow_peers_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+    espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
+    return list->base.type->ext->getiter(self->list, iter_buf);
 }
 
 espnow_peers_obj_t *espnow_peers_new(void) {
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index 2b95085c5d..b76e250f49 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -64,7 +64,7 @@
 //|
 //|     while True:
 //|         if e:
-//|             packet = e.recv()
+//|             packet = e.read()
 //|             packets.append(packet)
 //|             if packet.msg == b'end':
 //|                 break
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index df766ad32f..662da8cf45 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -93,7 +93,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_t *buf = self->recv_buffer;
 
     if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
-        self->recv->failure++;
+        self->read->failure++;
         return;
     }
 
@@ -120,7 +120,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
     ringbuf_put_n(buf, msg, msg_len);
 
-    self->recv->success++;
+    self->read->success++;
 }
 
 bool common_hal_espnow_deinited(espnow_obj_t *self) {
@@ -133,7 +133,7 @@ void common_hal_espnow_construct(espnow_obj_t *self, mp_int_t buffer_size, mp_in
     common_hal_espnow_set_phy_rate(self, phy_rate);
 
     self->send = espnow_com_new(MP_QSTR_send);
-    self->recv = espnow_com_new(MP_QSTR_recv);
+    self->read = espnow_com_new(MP_QSTR_read);
 
     self->peers = espnow_peers_new();
 
@@ -166,7 +166,7 @@ void common_hal_espnow_init(espnow_obj_t *self) {
 }
 
 // De-initialize the ESP-NOW software stack,
-// disable callbacks and deallocate the recv data buffers.
+// disable callbacks and deallocate the recv data buffer.
 void common_hal_espnow_deinit(espnow_obj_t *self) {
     if (common_hal_espnow_deinited(self)) {
         return;
@@ -214,7 +214,7 @@ mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const mp_buffer_info_t *mess
     return mp_const_none;
 }
 
-mp_obj_t common_hal_espnow_recv(espnow_obj_t *self) {
+mp_obj_t common_hal_espnow_read(espnow_obj_t *self) {
     if (!ringbuf_num_filled(self->recv_buffer)) {
         return mp_const_none;
     }
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 32e9a4c44c..21f1646825 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -40,8 +40,8 @@ typedef struct _espnow_obj_t {
     ringbuf_t *recv_buffer;     // A buffer for received packets
     size_t recv_buffer_size;    // The size of the recv_buffer
     wifi_phy_rate_t phy_rate;   // The ESP-NOW physical layer rate.
-    espnow_com_obj_t *send;     // The tx packet stats
-    espnow_com_obj_t *recv;     // The rx packet stats
+    espnow_com_obj_t *send;     // For keeping tx stats
+    espnow_com_obj_t *read;     // For keeping rx stats
     espnow_peers_obj_t *peers;  // The sequence of peers
 } espnow_obj_t;
 
@@ -57,4 +57,4 @@ extern void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value);
 extern void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key);
 
 extern mp_obj_t common_hal_espnow_send(espnow_obj_t *self, const mp_buffer_info_t *message, const uint8_t *mac);
-extern mp_obj_t common_hal_espnow_recv(espnow_obj_t *self);
+extern mp_obj_t common_hal_espnow_read(espnow_obj_t *self);

From dbe518680a001a8e675e0743717fe45107fea621 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 5 Feb 2023 10:54:04 -0600
Subject: [PATCH 1784/2403] Memory savings and more properties

---
 shared-bindings/displayio/OnDiskGif.c | 82 ++++++++++++++++------
 shared-bindings/displayio/OnDiskGif.h |  4 ++
 shared-module/displayio/OnDiskGif.c   | 97 +++++++++++++--------------
 shared-module/displayio/OnDiskGif.h   | 10 ++-
 4 files changed, 114 insertions(+), 79 deletions(-)

diff --git a/shared-bindings/displayio/OnDiskGif.c b/shared-bindings/displayio/OnDiskGif.c
index eeade372cb..66f2f9f5c3 100644
--- a/shared-bindings/displayio/OnDiskGif.c
+++ b/shared-bindings/displayio/OnDiskGif.c
@@ -123,25 +123,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_height_obj, displayio_ondiskgi
 MP_PROPERTY_GETTER(displayio_ondiskgif_height_obj,
     (mp_obj_t)&displayio_ondiskgif_get_height_obj);
 
-//|     pixel_shader: Union[ColorConverter, Palette]
-//|     """The image's pixel_shader.  The type depends on the underlying
-//|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
-//|     transparent pixel or, for palette shaded images, to update the palette.)"""
-//|
-STATIC mp_obj_t displayio_ondiskgif_obj_get_pixel_shader(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-    return common_hal_displayio_ondiskgif_get_pixel_shader(self);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_pixel_shader_obj, displayio_ondiskgif_obj_get_pixel_shader);
-
-const mp_obj_property_t displayio_ondiskgif_pixel_shader_obj = {
-    .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&displayio_ondiskgif_get_pixel_shader_obj,
-              (mp_obj_t)MP_ROM_NONE,
-              (mp_obj_t)MP_ROM_NONE},
-};
-
 //|     bitmap: Bitmap
 //|     """The image's bitmap.  The type depends on the underlying
 //|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
@@ -154,12 +135,16 @@ STATIC mp_obj_t displayio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_bitmap_obj, displayio_ondiskgif_obj_get_bitmap);
 
+MP_PROPERTY_GETTER(displayio_ondiskgif_bitmap_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_bitmap_obj);
+
+/*
 const mp_obj_property_t displayio_ondiskgif_bitmap_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&displayio_ondiskgif_get_bitmap_obj,
               (mp_obj_t)MP_ROM_NONE,
               (mp_obj_t)MP_ROM_NONE},
-};
+};*/
 
 
 //|     play_frame: None
@@ -173,13 +158,68 @@ STATIC mp_obj_t displayio_ondiskgif_obj_play_frame(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_play_frame_obj, displayio_ondiskgif_obj_play_frame);
 
+//|     duration: int
+//|     """Height of the bitmap. (read only)"""
+STATIC mp_obj_t displayio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_duration(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_duration_obj, displayio_ondiskgif_obj_get_duration);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_duration_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_duration_obj);
+
+//|     frame_count: int
+//|     """Height of the bitmap. (read only)"""
+STATIC mp_obj_t displayio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_frame_count(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_frame_count_obj, displayio_ondiskgif_obj_get_frame_count);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_frame_count_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_frame_count_obj);
+
+//|     min_delay: int
+//|     """Height of the bitmap. (read only)"""
+STATIC mp_obj_t displayio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_min_delay(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_min_delay_obj, displayio_ondiskgif_obj_get_min_delay);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_min_delay_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_min_delay_obj);
+
+//|     max_delay: int
+//|     """Height of the bitmap. (read only)"""
+//|
+STATIC mp_obj_t displayio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_max_delay(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_max_delay_obj, displayio_ondiskgif_obj_get_max_delay);
+
+MP_PROPERTY_GETTER(displayio_ondiskgif_max_delay_obj,
+    (mp_obj_t)&displayio_ondiskgif_get_max_delay_obj);
 
 STATIC const mp_rom_map_elem_t displayio_ondiskgif_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskgif_height_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_ondiskgif_pixel_shader_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_ondiskgif_bitmap_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_ondiskgif_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_play_frame), MP_ROM_PTR(&displayio_ondiskgif_play_frame_obj) },
+    { MP_ROM_QSTR(MP_QSTR_duration), MP_ROM_PTR(&displayio_ondiskgif_duration_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_count), MP_ROM_PTR(&displayio_ondiskgif_frame_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_min_delay), MP_ROM_PTR(&displayio_ondiskgif_min_delay_obj) },
+    { MP_ROM_QSTR(MP_QSTR_max_delay), MP_ROM_PTR(&displayio_ondiskgif_max_delay_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_ondiskgif_locals_dict, displayio_ondiskgif_locals_dict_table);
 
diff --git a/shared-bindings/displayio/OnDiskGif.h b/shared-bindings/displayio/OnDiskGif.h
index 988bc8581b..5996930124 100644
--- a/shared-bindings/displayio/OnDiskGif.h
+++ b/shared-bindings/displayio/OnDiskGif.h
@@ -42,4 +42,8 @@ mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *
 mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self);
 uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self);
 uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self);
+int32_t common_hal_displayio_ondiskgif_get_duration(displayio_ondiskgif_t *self);
+int32_t common_hal_displayio_ondiskgif_get_frame_count(displayio_ondiskgif_t *self);
+int32_t common_hal_displayio_ondiskgif_get_min_delay(displayio_ondiskgif_t *self);
+int32_t common_hal_displayio_ondiskgif_get_max_delay(displayio_ondiskgif_t *self);
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
diff --git a/shared-module/displayio/OnDiskGif.c b/shared-module/displayio/OnDiskGif.c
index 88146d354e..97caced1eb 100644
--- a/shared-module/displayio/OnDiskGif.c
+++ b/shared-module/displayio/OnDiskGif.c
@@ -76,41 +76,33 @@ static void GIFDraw(GIFDRAW *pDraw) {
 
     displayio_bitmap_t *bitmap = (displayio_bitmap_t *)pDraw->pUser;
 
-    // mp_printf(&mp_plat_print, "GD: y%d iX%d iY%d iW%d iH%d Trans%d hasT%d bk%d pUser %x bmp%x\n",
-    // pDraw->y, pDraw->iX, pDraw->iY, pDraw->iWidth, pDraw->iHeight, pDraw->ucTransparent, pDraw->ucHasTransparency, pDraw->ucBackground, pDraw->pUser, bitmap->data);
-
-/*
-    int iX, iY; // Corner offset of this frame on the canvas
-    int y; // current line being drawn (0 = top line of image)
-    int iWidth, iHeight; // size of this frame
-    void *pUser; // user supplied pointer
-    uint8_t *pPixels; // 8-bit source pixels for this line
-    uint16_t *pPalette; // little or big-endian RGB565 palette entries (default)
-    uint8_t *pPalette24; // RGB888 palette (optional)
-    uint8_t ucTransparent; // transparent color
-    uint8_t ucHasTransparency; // flag indicating the transparent color is in use
-    uint8_t ucDisposalMethod; // frame disposal method
-    uint8_t ucBackground; // background color
-    uint8_t ucIsGlobalPalette; // Flag to indicate that a global palette, rather than a local palette is being used
-*/
-
-    // For all other lines, just push the pixels to the display
-    // (uint8_t *)pDraw->pPixels, pDraw->iWidth*2);
-
-
+    uint8_t *s;
+    uint16_t *d;
 
     int32_t row_start = pDraw->y * bitmap->stride;
     uint32_t *row = bitmap->data + row_start;
-    uint8_t *d = (uint8_t *)row;
-    // mp_printf(&mp_plat_print, "rs %d strd %d:\n", row_start, bitmap->stride);
+    s = pDraw->pPixels;
+    d = (uint16_t *)row;
 
-    uint8_t *p = (uint8_t *)pDraw->pPixels;
-    for (int w = 0; w < pDraw->iWidth * 2; w++) {
-        // mp_printf(&mp_plat_print, "%x:", *p);
-        *d++ = *p;
-        p++;
+    uint16_t *pPal;
+    pPal = (uint16_t *)pDraw->pPalette;
+
+    if (pDraw->ucDisposalMethod == 2) { // restore to background color
+        memset(d, pDraw->ucBackground, pDraw->iWidth);
+    }
+
+    // We always check for transpancy even if the gif does not have it
+    // as we also convert the color to the palette here
+    // Could separate it but would not sure it would be much a speed up
+    uint8_t c, ucTransparent = pDraw->ucTransparent;
+    for (int x = 0; x < pDraw->iWidth; x++)
+    {
+        c = *s++;
+        if (c != ucTransparent) {
+            *d = pPal[c];
+        }
+        d++;
     }
-    // mp_printf(&mp_plat_print, "\n");
 }
 
 void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_file_obj_t *file) {
@@ -135,33 +127,22 @@ void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_f
         mp_arg_error_invalid(MP_QSTR_file);
     }
 
-    self->frame = m_malloc(self->gif.iCanvasWidth * self->gif.iCanvasHeight * sizeof(uint16_t), false); // MUST FREE LATER?
-    self->gif.pFrameBuffer = (uint8_t *)self->frame;
-    self->gif.ucDrawType = GIF_DRAW_COOKED;
-
     displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
     bitmap->base.type = &displayio_bitmap_type;
     common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, 16);
     self->bitmap = bitmap;
 
+    GIFINFO info;
+    GIF_getInfo(&self->gif, &info);
+    self->duration = info.iDuration;
+    self->frame_count = info.iFrameCount;
+    self->min_delay = info.iMinDelay;
+    self->max_delay = info.iMaxDelay;
+
     // mp_printf(&mp_plat_print, "GIF_init returned %d %x\n", result, bitmap->data);
 }
 
-
-uint32_t common_hal_displayio_ondiskgif_get_pixel(displayio_ondiskgif_t *self,
-    int16_t x, int16_t y) {
-    if (x < 0 || x >= self->gif.iCanvasWidth || y < 0 || y >= self->gif.iCanvasHeight) {
-        return 0;
-    }
-
-    return 0;
-}
-
 uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self) {
-    GIFINFO info;
-    GIF_getInfo(&self->gif, &info);
-    mp_printf(&mp_plat_print, "dur %d fc %d max %d min %d\n", info.iDuration, info.iFrameCount, info.iMaxDelay, info.iMinDelay);
-
     return (uint16_t)self->gif.iCanvasHeight;
 }
 
@@ -169,14 +150,26 @@ uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self) {
     return (uint16_t)self->gif.iCanvasWidth;
 }
 
-mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *self) {
-    return MP_OBJ_FROM_PTR(self->pixel_shader_base);
-}
-
 mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self) {
     return MP_OBJ_FROM_PTR(self->bitmap);
 }
 
+int32_t common_hal_displayio_ondiskgif_get_duration(displayio_ondiskgif_t *self) {
+    return self->duration;
+}
+
+int32_t common_hal_displayio_ondiskgif_get_frame_count(displayio_ondiskgif_t *self) {
+    return self->frame_count;
+}
+
+int32_t common_hal_displayio_ondiskgif_get_min_delay(displayio_ondiskgif_t *self) {
+    return self->min_delay;
+}
+
+int32_t common_hal_displayio_ondiskgif_get_max_delay(displayio_ondiskgif_t *self) {
+    return self->max_delay;
+}
+
 uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self) {
     int result = GIF_playFrame(&self->gif, 0, self->bitmap);
 
diff --git a/shared-module/displayio/OnDiskGif.h b/shared-module/displayio/OnDiskGif.h
index 008635bc66..2184f78dbe 100644
--- a/shared-module/displayio/OnDiskGif.h
+++ b/shared-module/displayio/OnDiskGif.h
@@ -42,13 +42,11 @@ typedef struct {
     mp_obj_base_t base;
     GIFIMAGE gif;
     pyb_file_obj_t *file;
-    uint32_t *frame;
     displayio_bitmap_t *bitmap;
-    union {
-        mp_obj_base_t *pixel_shader_base;
-        struct displayio_palette *palette;
-        struct displayio_colorconverter *colorconverter;
-    };
+    int32_t duration;
+    int32_t frame_count;
+    int32_t min_delay;
+    int32_t max_delay;
 } displayio_ondiskgif_t;
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKGIF_H

From e78143a2f50bb3b15e44193965a9d8184caa9f55 Mon Sep 17 00:00:00 2001
From: Alex <67526318+ajs256@users.noreply.github.com>
Date: Sun, 5 Feb 2023 11:18:23 -0800
Subject: [PATCH 1785/2403] fix copyright header

---
 ports/raspberrypi/boards/hack_club_sprig/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/hack_club_sprig/board.c b/ports/raspberrypi/boards/hack_club_sprig/board.c
index 0169e85e0e..775e6ca5df 100644
--- a/ports/raspberrypi/boards/hack_club_sprig/board.c
+++ b/ports/raspberrypi/boards/hack_club_sprig/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 ajs256
  *
  * 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 efe48e61ed8c3cef958dc9b5ad367cd454c9da19 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 6 Feb 2023 17:03:49 -0600
Subject: [PATCH 1786/2403] argument bounds validation for bitmap.blit()

---
 shared-bindings/displayio/Bitmap.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index a6bccc6298..458a73c3b1 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -212,8 +212,9 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
 
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
-    int16_t x = args[ARG_x].u_int;
-    int16_t y = args[ARG_y].u_int;
+    // Check x,y are within self (target) bitmap boundary
+    int16_t x = mp_arg_validate_int_range(args[ARG_x].u_int, 0, self->width - 1, MP_QSTR_x);
+    int16_t y = mp_arg_validate_int_range(args[ARG_y].u_int, 0, self->height - 1, MP_QSTR_y);
 
     displayio_bitmap_t *source = mp_arg_validate_type(args[ARG_source].u_obj, &displayio_bitmap_type, MP_QSTR_source_bitmap);
 
@@ -223,32 +224,21 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
         mp_raise_ValueError(translate("source palette too large"));
     }
 
-    int16_t x1 = args[ARG_x1].u_int;
-    int16_t y1 = args[ARG_y1].u_int;
+    // Check x1,y1,x2,y2 are within source bitmap boundary
+    int16_t x1 = mp_arg_validate_int_range(args[ARG_x1].u_int, 0, source->width - 1, MP_QSTR_x1);
+    int16_t y1 = mp_arg_validate_int_range(args[ARG_y1].u_int, 0, source->height - 1, MP_QSTR_y1);
     int16_t x2, y2;
     // if x2 or y2 is None, then set as the maximum size of the source bitmap
     if (args[ARG_x2].u_obj == mp_const_none) {
         x2 = source->width;
     } else {
-        x2 = mp_obj_get_int(args[ARG_x2].u_obj);
+        x2 = mp_arg_validate_int_range(mp_obj_get_int(args[ARG_x2].u_obj), 0, source->width, MP_QSTR_x2);
     }
     // int16_t y2;
     if (args[ARG_y2].u_obj == mp_const_none) {
         y2 = source->height;
     } else {
-        y2 = mp_obj_get_int(args[ARG_y2].u_obj);
-    }
-
-    // Check x,y are within self (target) bitmap boundary
-    if ((x < 0) || (y < 0) || (x > self->width) || (y > self->height)) {
-        mp_raise_ValueError(translate("out of range of target"));
-    }
-    // Check x1,y1,x2,y2 are within source bitmap boundary
-    if ((x1 < 0) || (x1 > source->width) ||
-        (y1 < 0) || (y1 > source->height) ||
-        (x2 < 0) || (x2 > source->width) ||
-        (y2 < 0) || (y2 > source->height)) {
-        mp_raise_ValueError(translate("out of range of source"));
+        y2 = mp_arg_validate_int_range(mp_obj_get_int(args[ARG_y2].u_obj), 0, source->height, MP_QSTR_y2);
     }
 
     // Ensure x1 < x2 and y1 < y2

From abc5eb30d73ef5caf0ea811cc1c8727b081bb04a Mon Sep 17 00:00:00 2001
From: Gregory Neverov <42853258+gneverov@users.noreply.github.com>
Date: Mon, 6 Feb 2023 15:07:26 -0800
Subject: [PATCH 1787/2403] add support for array.extend(iterable)

---
 py/objarray.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index a66a73a5ac..763ec15cdb 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -458,26 +458,32 @@ STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
 
     // allow to extend by anything that has the buffer protocol (extension to CPython)
     mp_buffer_info_t arg_bufinfo;
-    mp_get_buffer_raise(arg_in, &arg_bufinfo, MP_BUFFER_READ);
+    if (mp_get_buffer(arg_in, &arg_bufinfo, MP_BUFFER_READ)) {
+        size_t sz = mp_binary_get_size('@', self->typecode, NULL);
 
-    size_t sz = mp_binary_get_size('@', self->typecode, NULL);
+        // convert byte count to element count
+        size_t len = arg_bufinfo.len / sz;
 
-    // convert byte count to element count
-    size_t len = arg_bufinfo.len / sz;
+        // make sure we have enough room to extend
+        // TODO: alloc policy; at the moment we go conservative
+        if (self->free < len) {
+            self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz);
+            self->free = 0;
+        } else {
+            self->free -= len;
+        }
 
-    // make sure we have enough room to extend
-    // TODO: alloc policy; at the moment we go conservative
-    if (self->free < len) {
-        self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz);
-        self->free = 0;
+        // extend
+        mp_seq_copy((byte *)self->items + self->len * sz, arg_bufinfo.buf, len * sz, byte);
+        self->len += len;
     } else {
-        self->free -= len;
+        // Otherwise argument must be an iterable of items to append
+        mp_obj_t iterable = mp_getiter(arg_in, NULL);
+        mp_obj_t item;
+        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+            array_append(self_in, item);
+        }
     }
-
-    // extend
-    mp_seq_copy((byte *)self->items + self->len * sz, arg_bufinfo.buf, len * sz, byte);
-    self->len += len;
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_extend_obj, array_extend);

From b9f689adf407a0062c2d5d0e27883f2e978716b1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 8 Feb 2023 16:18:45 -0600
Subject: [PATCH 1788/2403] Use lowest drive level for PIO

---
 ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index ecaee90cc2..e9cb3d34bb 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -289,6 +289,11 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
             }
             pio_gpio_init(self->pio, pin_number);
         }
+
+        // Use lowest drive level for all State Machine outputs. (#7515
+        // workaround). Remove if/when Pin objects get a drive_strength
+        // property and use that value instead.
+        gpio_set_drive_strength(pin_number, GPIO_DRIVE_STRENGTH_2MA);
     }
 
     pio_sm_config c = {0, 0, 0};

From e125370cd42b67c341d9c3bbe588be09369c1f45 Mon Sep 17 00:00:00 2001
From: Ubuntu 
Date: Thu, 9 Feb 2023 01:59:59 +0000
Subject: [PATCH 1789/2403] first commit

---
 ports/raspberrypi/boards/cosmo_pico/board.c   | 29 ++++++++++++
 .../boards/cosmo_pico/mpconfigboard.h         |  2 +
 .../boards/cosmo_pico/mpconfigboard.mk        | 11 +++++
 .../boards/cosmo_pico/pico-sdk-configboard.h  |  1 +
 ports/raspberrypi/boards/cosmo_pico/pins.c    | 44 +++++++++++++++++++
 5 files changed, 87 insertions(+)
 create mode 100644 ports/raspberrypi/boards/cosmo_pico/board.c
 create mode 100644 ports/raspberrypi/boards/cosmo_pico/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/cosmo_pico/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/cosmo_pico/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/cosmo_pico/pins.c

diff --git a/ports/raspberrypi/boards/cosmo_pico/board.c b/ports/raspberrypi/boards/cosmo_pico/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/cosmo_pico/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.h b/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.h
new file mode 100644
index 0000000000..d313e6097f
--- /dev/null
+++ b/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "COSMO-Pico"
+#define MICROPY_HW_MCU_NAME "rp2040"
diff --git a/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.mk b/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.mk
new file mode 100644
index 0000000000..f4278e0c1b
--- /dev/null
+++ b/ports/raspberrypi/boards/cosmo_pico/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x2E8A
+USB_PID = 0x104C
+USB_PRODUCT = "COSMO-Pico"
+USB_MANUFACTURER = "Raspberry Pi"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/cosmo_pico/pico-sdk-configboard.h b/ports/raspberrypi/boards/cosmo_pico/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/cosmo_pico/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/cosmo_pico/pins.c b/ports/raspberrypi/boards/cosmo_pico/pins.c
new file mode 100644
index 0000000000..f2c094cb4d
--- /dev/null
+++ b/ports/raspberrypi/boards/cosmo_pico/pins.c
@@ -0,0 +1,44 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 19eba4163080fe4ee19be4e5ae1d5998e8bf4077 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Wed, 8 Feb 2023 22:58:44 -0600
Subject: [PATCH 1790/2403] Doc fixes and return next frame delay

---
 shared-bindings/displayio/OnDiskGif.c | 77 ++++++++++-----------------
 shared-bindings/displayio/OnDiskGif.h |  2 +-
 shared-module/displayio/OnDiskGif.c   | 11 ++--
 3 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/shared-bindings/displayio/OnDiskGif.c b/shared-bindings/displayio/OnDiskGif.c
index 66f2f9f5c3..51651a93e7 100644
--- a/shared-bindings/displayio/OnDiskGif.c
+++ b/shared-bindings/displayio/OnDiskGif.c
@@ -33,13 +33,9 @@
 #include "supervisor/shared/translate/translate.h"
 #include "shared-bindings/displayio/OnDiskGif.h"
 
-//| class OnDiskBitmap:
+//| class OnDiskGif:
 //|     """Loads values straight from disk. This minimizes memory use but can lead to
-//|     much slower pixel load times. These load times may result in frame tearing where only part of
-//|     the image is visible.
-//|
-//|     It's easiest to use on a board with a built in display such as the `Hallowing M0 Express
-//|     `_.
+//|     much slower pixel load times
 //|
 //|     .. code-block:: Python
 //|
@@ -48,34 +44,25 @@
 //|       import time
 //|       import pulseio
 //|
-//|       board.DISPLAY.brightness = 0
 //|       splash = displayio.Group()
 //|       board.DISPLAY.show(splash)
 //|
-//|       odb = displayio.OnDiskBitmap('/sample.bmp')
-//|       face = displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
+//|       odg = displayio.OnDiskBitmap('/sample.gif')
+//|       odg.play_frame() # Load the first frame
+//|       face = displayio.TileGrid(odg, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565))
 //|       splash.append(face)
-//|       # Wait for the image to load.
-//|       board.DISPLAY.refresh(target_frames_per_second=60)
-//|
-//|       # Fade up the backlight
-//|       for i in range(100):
-//|           board.DISPLAY.brightness = 0.01 * i
-//|           time.sleep(0.05)
+//|       board.DISPLAY.refresh()
 //|
 //|       # Wait forever
 //|       while True:
-//|           pass"""
+//|           gif.play_frame()
+//|           time.sleep(0.1)"""
 //|
-//|     def __init__(self, file: Union[str, typing.BinaryIO]) -> None:
-//|         """Create an OnDiskBitmap object with the given file.
+//|     def __init__(self, file: str) -> None:
+//|         """Create an OnDiskGif object with the given file.
 //|
-//|         :param file file: The name of the bitmap file.  For backwards compatibility, a file opened in binary mode may also be passed.
+//|         :param file file: The name of the GIF file.
 //|
-//|         Older versions of CircuitPython required a file opened in binary
-//|         mode. CircuitPython 7.0 modified OnDiskBitmap so that it takes a
-//|         filename instead, and opens the file internally.  A future version
-//|         of CircuitPython will remove the ability to pass in an opened file.
 //|         """
 //|         ...
 STATIC mp_obj_t displayio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -98,7 +85,7 @@ STATIC mp_obj_t displayio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n
 }
 
 //|     width: int
-//|     """Width of the bitmap. (read only)"""
+//|     """Width of the gif. (read only)"""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_width(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -111,7 +98,7 @@ MP_PROPERTY_GETTER(displayio_ondiskgif_width_obj,
     (mp_obj_t)&displayio_ondiskgif_get_width_obj);
 
 //|     height: int
-//|     """Height of the bitmap. (read only)"""
+//|     """Height of the gif. (read only)"""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_height(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -124,10 +111,7 @@ MP_PROPERTY_GETTER(displayio_ondiskgif_height_obj,
     (mp_obj_t)&displayio_ondiskgif_get_height_obj);
 
 //|     bitmap: Bitmap
-//|     """The image's bitmap.  The type depends on the underlying
-//|     bitmap's structure.  The pixel shader can be modified (e.g., to set the
-//|     transparent pixel or, for palette shaded images, to update the palette.)"""
-//|
+//|     """The bitmap used to hold the current frame."""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
     return common_hal_displayio_ondiskgif_get_bitmap(self);
@@ -138,28 +122,23 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_bitmap_obj, displayio_ondiskgi
 MP_PROPERTY_GETTER(displayio_ondiskgif_bitmap_obj,
     (mp_obj_t)&displayio_ondiskgif_get_bitmap_obj);
 
-/*
-const mp_obj_property_t displayio_ondiskgif_bitmap_obj = {
-    .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&displayio_ondiskgif_get_bitmap_obj,
-              (mp_obj_t)MP_ROM_NONE,
-              (mp_obj_t)MP_ROM_NONE},
-};*/
+//|     play_frame: int
+//|     """Play next frame. Returns expected delay until the next frame."""
+STATIC mp_obj_t displayio_ondiskgif_obj_play_frame(size_t n_args, const mp_obj_t *args) {
+    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(args[0]);
+    bool setDirty = mp_const_true;
 
+    if (n_args == 1) {
+        setDirty = mp_obj_is_true(args[1]);
+    }
 
-//|     play_frame: None
-//|     """Play next frame. (read only)"""
-//|
-STATIC mp_obj_t displayio_ondiskgif_obj_play_frame(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_play_frame(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_play_frame(self, setDirty));
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_play_frame_obj, displayio_ondiskgif_obj_play_frame);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(displayio_ondiskgif_play_frame_obj, 1, 2, displayio_ondiskgif_obj_play_frame);
 
 //|     duration: int
-//|     """Height of the bitmap. (read only)"""
+//|     """Returns the total duration of the GIF in milliseconds. (read only)"""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -172,7 +151,7 @@ MP_PROPERTY_GETTER(displayio_ondiskgif_duration_obj,
     (mp_obj_t)&displayio_ondiskgif_get_duration_obj);
 
 //|     frame_count: int
-//|     """Height of the bitmap. (read only)"""
+//|     """Returns the number of frames in the GIF. (read only)"""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -185,7 +164,7 @@ MP_PROPERTY_GETTER(displayio_ondiskgif_frame_count_obj,
     (mp_obj_t)&displayio_ondiskgif_get_frame_count_obj);
 
 //|     min_delay: int
-//|     """Height of the bitmap. (read only)"""
+//|     """The minimum delay found between frames. (read only)"""
 STATIC mp_obj_t displayio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -198,7 +177,7 @@ MP_PROPERTY_GETTER(displayio_ondiskgif_min_delay_obj,
     (mp_obj_t)&displayio_ondiskgif_get_min_delay_obj);
 
 //|     max_delay: int
-//|     """Height of the bitmap. (read only)"""
+//|     """The maximum delay found between frames. (read only)"""
 //|
 STATIC mp_obj_t displayio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
     displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/displayio/OnDiskGif.h b/shared-bindings/displayio/OnDiskGif.h
index 5996930124..6e5041c012 100644
--- a/shared-bindings/displayio/OnDiskGif.h
+++ b/shared-bindings/displayio/OnDiskGif.h
@@ -41,7 +41,7 @@ uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self);
 mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *self);
 mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self);
 uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self);
-uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self);
+uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self, bool setDirty);
 int32_t common_hal_displayio_ondiskgif_get_duration(displayio_ondiskgif_t *self);
 int32_t common_hal_displayio_ondiskgif_get_frame_count(displayio_ondiskgif_t *self);
 int32_t common_hal_displayio_ondiskgif_get_min_delay(displayio_ondiskgif_t *self);
diff --git a/shared-module/displayio/OnDiskGif.c b/shared-module/displayio/OnDiskGif.c
index 97caced1eb..22a97020f0 100644
--- a/shared-module/displayio/OnDiskGif.c
+++ b/shared-module/displayio/OnDiskGif.c
@@ -109,7 +109,7 @@ void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_f
     // mp_printf(&mp_plat_print, "Begin OnDiskGif\n");
     self->file = file;
 
-    GIF_begin(&self->gif, GIF_PALETTE_RGB565_LE);
+    GIF_begin(&self->gif, GIF_PALETTE_RGB565_BE);
 
     self->gif.iError = GIF_SUCCESS;
     self->gif.pfnRead = GIFReadFile;
@@ -170,10 +170,11 @@ int32_t common_hal_displayio_ondiskgif_get_max_delay(displayio_ondiskgif_t *self
     return self->max_delay;
 }
 
-uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self) {
-    int result = GIF_playFrame(&self->gif, 0, self->bitmap);
+uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self, bool setDirty) {
+    int nextDelay = 0;
+    int result = GIF_playFrame(&self->gif, &nextDelay, self->bitmap);
 
-    if (result >= 0) {
+    if ((result >= 0) && (setDirty)) {
         displayio_area_t dirty_area = {
             .x1 = 0,
             .y1 = 0,
@@ -184,5 +185,5 @@ uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self) {
         displayio_bitmap_set_dirty_area(self->bitmap, &dirty_area);
     }
 
-    return result;
+    return nextDelay;
 }

From 17751ad2830984b0940915af019f93edde8994c6 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 10 Feb 2023 04:58:37 +0100
Subject: [PATCH 1791/2403] Update build_board_info.py to sh module 2.0.0

---
 tools/build_board_info.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index f810d942a7..5209337b95 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -10,6 +10,7 @@ import subprocess
 import sys
 import sh
 import base64
+from io import StringIO
 from datetime import date
 from sh.contrib import git
 
@@ -58,9 +59,13 @@ def get_languages(list_all=False):
 
 def get_version_info():
     version = None
-    sha = git("rev-parse", "--short", "HEAD").stdout.decode("utf-8")
+    buffer = StringIO()
+    git("rev-parse", "--short", "HEAD", _out=buffer)
+    sha = buffer.getvalue().strip()
     try:
-        version = git("describe", "--tags", "--exact-match").stdout.decode("utf-8").strip()
+        buffer = StringIO()
+        git("describe", "--tags", "--exact-match", _out=buffer)
+        version = buffer.getvalue().strip()
     except sh.ErrorReturnCode_128:
         # No exact match
         pass

From baaa2362c23aa20166113be6a53e6e9a54a614fc Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Feb 2023 16:38:25 +0530
Subject: [PATCH 1792/2403] use already built mpy-cross

---
 .github/workflows/build.yml | 83 ++++++++++++++++++++++++-------------
 requirements-dev.txt        |  6 +--
 tools/ci_set_matrix.py      |  4 +-
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7d57041e6..8cae4c3e68 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,15 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       build-doc: ${{ steps.set-matrix.outputs.build-doc }}
+      build-boards: ${{ steps.set-matrix.outputs.build-boards }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
+    env:
+      MICROPY_CPYTHON3: python3.8
+      MICROPY_MICROPYTHON: ${{ github.workspace }}/ports/unix/micropython-coverage
     steps:
     - name: Dump GitHub context
       run: echo "$GITHUB_CONTEXT"
@@ -39,14 +43,14 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Duplicate USB VID/PID check
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/fetch_submodules
       with:
-        cache: "cache"
+        cache: cache
         version: true
     - name: Install dependencies
       run: |
@@ -60,24 +64,27 @@ jobs:
         python3 --version
     - name: Build mpy-cross
       run: make -C mpy-cross -j2
+    - uses: actions/upload-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross/mpy-cross
     - name: Build unix port
-      run: |
-        make -C ports/unix VARIANT=coverage -j2
+      run: make -C ports/unix VARIANT=coverage -j2
     - name: Test all
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1
+      run:  ./run-tests.py -j2
       working-directory: tests
     - name: Print failure info
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --print-failures
+      run: ./run-tests.py -j2 --print-failures
       if: failure()
       working-directory: tests
     - name: Native Tests
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --emit native
+      run: ./run-tests.py -j2 --emit native
       working-directory: tests
     - name: mpy Tests
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --via-mpy -d basics float micropython
+      run: ./run-tests.py -j2 --via-mpy -d basics float micropython
       working-directory: tests
     - name: Native mpy Tests
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --via-mpy --emit native -d basics float micropython
+      run: ./run-tests.py -j2 --via-mpy --emit native -d basics float micropython
       working-directory: tests
     - name: Build native modules
       run: |
@@ -90,7 +97,7 @@ jobs:
         make -C examples/natmod/ure
         make -C examples/natmod/uzlib
     - name: Test native modules
-      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py
+      run: ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py
       working-directory: tests
     - name: Build mpy-cross.static-aarch64
       run: make -C mpy-cross -j2 -f Makefile.static-aarch64
@@ -166,11 +173,7 @@ jobs:
   mpy-cross-mac:
     runs-on: macos-11
     needs: test
-    if: >-
-      needs.test.outputs.boards-aarch != '[]' ||
-      needs.test.outputs.boards-arm != '[]' ||
-      needs.test.outputs.boards-espressif != '[]' ||
-      needs.test.outputs.boards-riscv != '[]'
+    if: ${{ needs.test.outputs.build-boards == 'True' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     steps:
@@ -182,7 +185,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
       uses: ./.github/actions/fetch_submodules
     - name: Versions
@@ -235,7 +238,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
       uses: ./.github/actions/fetch_submodules
     - name: Install dependencies
@@ -305,7 +308,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/fetch_submodules
@@ -334,9 +337,15 @@ jobs:
         arm-none-eabi-gcc --version
         python3 --version
         mkfs.fat --version || true
-    - name: Build mpy-cross
+    - name: Download mpy-cross
       if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: make -C mpy-cross -j2
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+    - name: Make mpy-cross executable
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      run: sudo chmod +x mpy-cross/mpy-cross
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
     - name: Build
@@ -380,7 +389,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/fetch_submodules
@@ -396,9 +405,15 @@ jobs:
         gcc --version
         arm-none-eabi-gcc --version
         python3 --version
-    - name: Build mpy-cross
+    - name: Download mpy-cross
       if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: make -C mpy-cross -j2
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+    - name: Make mpy-cross executable
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      run: sudo chmod +x mpy-cross/mpy-cross
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
     - name: Build
@@ -489,9 +504,15 @@ jobs:
         python3 --version
         ninja --version
         cmake --version
-    - name: Build mpy-cross
+    - name: Download mpy-cross
       if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: make -C mpy-cross -j2
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+    - name: Make mpy-cross executable
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      run: sudo chmod +x mpy-cross/mpy-cross
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
     - name: Build
@@ -537,7 +558,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/fetch_submodules
@@ -552,9 +573,15 @@ jobs:
         gcc --version
         riscv64-unknown-elf-gcc --version
         python3 --version
-    - name: Build mpy-cross
+    - name: Download mpy-cross
       if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: make -C mpy-cross -j2
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+    - name: Make mpy-cross executable
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      run: sudo chmod +x mpy-cross/mpy-cross
     - name: Setup build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
     - name: Build
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 0dcfad3956..5e8fe3d3f6 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,6 +6,7 @@ typer
 sh
 click
 cpp-coveralls
+
 requests
 requests-cache
 
@@ -13,8 +14,8 @@ requests-cache
 polib
 
 # For pre-commit
-pyyaml
 black
+pyyaml
 pre-commit
 
 # for combining the Nordic SoftDevice with CircuitPython
@@ -23,9 +24,6 @@ intelhex
 # for building & testing natmods
 pyelftools
 
-# for stubs and annotations
-adafruit-circuitpython-typing
-
 # for mbedtls certificate store
 cryptography
 
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index bf899127ae..354ad51d71 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -204,7 +204,9 @@ def set_boards_to_build(build_all: bool):
             break
 
     # Split boards by architecture.
-    print("Building boards:")
+    build_boards = bool(boards_to_build)
+    print("Building boards:", build_boards)
+    set_output("build-boards", build_boards)
     arch_to_boards = {"aarch": [], "arm": [], "riscv": [], "espressif": []}
     for board in sorted(boards_to_build):
         print(" ", board)

From 23bb17c240745c655986e65a3f288a02364baf27 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:10:56 +0530
Subject: [PATCH 1793/2403] use composite actions and reusable workflow

---
 .github/actions/external_deps/action.yml |  81 ++++++
 .github/actions/port_deps/action.yml     |  51 ++++
 .github/actions/upload_aws/action.yml    |  27 ++
 .github/workflows/build-boards.yml       |  99 +++++++
 .github/workflows/build.yml              | 346 +++--------------------
 5 files changed, 293 insertions(+), 311 deletions(-)
 create mode 100644 .github/actions/external_deps/action.yml
 create mode 100644 .github/actions/port_deps/action.yml
 create mode 100644 .github/actions/upload_aws/action.yml
 create mode 100644 .github/workflows/build-boards.yml

diff --git a/.github/actions/external_deps/action.yml b/.github/actions/external_deps/action.yml
new file mode 100644
index 0000000000..c9766eadc2
--- /dev/null
+++ b/.github/actions/external_deps/action.yml
@@ -0,0 +1,81 @@
+name: Fetch external deps
+
+inputs:
+  platform:
+    required: false
+    default: none
+    type: choice
+    options:
+    - arm
+    - aarch
+    - espressif
+    - riscv
+    - none
+
+runs:
+  using: "composite"
+  steps:
+    # aarch
+    - name: Get aarch toolchain
+      if: inputs.platform == 'aarch'
+      run: |
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo apt-get install -y mtools
+      shell: bash
+    - name: Install mkfs.fat
+      if: inputs.platform == 'aarch'
+      run: |
+        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+        tar -xaf dosfstools-4.2.tar.gz
+        cd dosfstools-4.2
+        ./configure
+        make -j 2
+        cd src
+        echo >> $GITHUB_PATH $(pwd)
+      shell: bash
+
+    # arm
+    - name: Get arm toolchain
+      if: inputs.platform == 'aarch' || inputs.platform == 'arm'
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '10-2020-q4'
+
+    # espressif
+    - name: Get espressif toolchain
+      if: inputs.platform == 'espressif'
+      run: sudo apt-get install -y ninja-build
+      shell: bash
+    - name: Install IDF tools
+      if: inputs.platform == 'espressif'
+      run: |
+        echo "Installing ESP-IDF tools"
+        $IDF_PATH/tools/idf_tools.py --non-interactive install required
+        $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
+        echo "Installing Python environment and packages"
+        $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
+        rm -rf $IDF_TOOLS_PATH/dist
+      shell: bash
+    - name: Set environment
+      if: inputs.platform == 'espressif'
+      run: |
+        source $IDF_PATH/export.sh
+        echo >> $GITHUB_ENV "IDF_PYTHON_ENV_PATH=$IDF_PYTHON_ENV_PATH"
+        echo >> $GITHUB_PATH "$PATH"
+      shell: bash
+
+    # riscv
+    - name: Get riscv toolchain
+      if: inputs.platform == 'riscv'
+      run: |
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+      shell: bash
+
+    # common
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y gettext
+        pip install -r requirements-dev.txt
+      shell: bash
diff --git a/.github/actions/port_deps/action.yml b/.github/actions/port_deps/action.yml
new file mode 100644
index 0000000000..c507983406
--- /dev/null
+++ b/.github/actions/port_deps/action.yml
@@ -0,0 +1,51 @@
+name: Fetch port deps
+
+inputs:
+  platform:
+    required: false
+    default: none
+    type: choice
+    options:
+    - espressif
+    - none
+
+runs:
+  using: composite
+  steps:
+    # espressif
+    - name: Set IDF env
+      if: inputs.platform == 'espressif'
+      run: |
+        echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
+        echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
+      shell: bash
+
+    - name: Get IDF commit
+      if: inputs.platform == 'espressif'
+      id: idf-commit
+      run: |
+        COMMIT=$(git submodule status ports/espressif/esp-idf | grep -o -P '(?<=^-).*(?= )')
+        echo "$COMMIT"
+        echo "commit=$COMMIT" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Cache IDF submodules
+      if: inputs.platform == 'espressif'
+      uses: actions/cache@v3
+      with:
+        path: |
+          .git/modules/ports/espressif/esp-idf
+          ports/espressif/esp-idf
+        key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
+
+    - name: Cache IDF tools
+      if: inputs.platform == 'espressif'
+      uses: actions/cache@v3
+      with:
+        path: ${{ env.IDF_TOOLS_PATH }}
+        key: tools-idf-${{ steps.idf-commit.outputs.commit }}-${{ runner.os }}-${{ env.pythonLocation }}
+
+    - name: Initialize IDF submodules
+      if: inputs.platform == 'espressif'
+      run: git submodule update --init --depth=1 --recursive $IDF_PATH
+      shell: bash
diff --git a/.github/actions/upload_aws/action.yml b/.github/actions/upload_aws/action.yml
new file mode 100644
index 0000000000..a2d43f8de7
--- /dev/null
+++ b/.github/actions/upload_aws/action.yml
@@ -0,0 +1,27 @@
+name: Upload to AWS S3
+
+
+inputs:
+  source:
+    required: true
+    type: string
+
+  destination:
+    required: true
+    type: string
+
+
+runs:
+  using: composite
+  steps:
+    - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      run: |
+        pip install awscli
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
new file mode 100644
index 0000000000..10b572065a
--- /dev/null
+++ b/.github/workflows/build-boards.yml
@@ -0,0 +1,99 @@
+name: Build boards
+
+on:
+  workflow_call:
+    inputs:
+      platform:
+        required: true
+        type: string
+
+      boards:
+        required: true
+        type: string
+
+      cp-version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        board: ${{ fromJSON(inputs.boards) }}
+    steps:
+    - name: Dump GitHub context
+      run: echo "$GITHUB_CONTEXT"
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: Set up port
+      uses: ./.github/actions/port_deps
+      with:
+        platform: ${{ inputs.platform }}
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/fetch_submodules
+    - name: Set up external
+      uses: ./.github/actions/external_deps
+      with:
+        platform: ${{ inputs.platform }}
+
+    - name: Versions
+      run: |
+        gcc --version
+        python3 --version
+        cmake --version || true
+        ninja --version || true
+        aarch64-none-elf-gcc --version || true
+        arm-none-eabi-gcc --version || true
+        xtensa-esp32-elf-gcc --version || true
+        riscv32-esp-elf-gcc --version || true
+        riscv64-unknown-elf-gcc --version || true
+        mkfs.fat --version || true
+
+    - name: Download mpy-cross
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+    - name: Make mpy-cross executable
+      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
+      run: sudo chmod +x mpy-cross/mpy-cross
+
+    - name: Set up build failure matcher
+      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
+    - name: Build
+      run: python3 -u build_release_files.py
+      working-directory: tools
+      env:
+        BOARDS: ${{ matrix.board }}
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.board }}
+        path: bin/${{ matrix.board }}
+    - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      run: |
+        pip install awscli
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8cae4c3e68..b01e520fa9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -137,16 +137,17 @@ jobs:
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
-    - name: Get last commit with checks
-      id: get-last-commit-with-checks
-      if: github.event_name == 'pull_request'
-      working-directory: tools
-      env:
-        REPO: ${{ github.repository }}
-        PULL: ${{ github.event.number }}
-        GITHUB_TOKEN: ${{ github.token }}
-        EXCLUDE_COMMIT: ${{ github.event.after }}
-      run: python3 -u ci_changes_per_commit.py
+    # Disabled: Needs to be updated
+    # - name: Get last commit with checks
+    #   id: get-last-commit-with-checks
+    #   if: github.event_name == 'pull_request'
+    #   working-directory: tools
+    #   run: python3 -u ci_changes_per_commit.py
+    #   env:
+    #     REPO: ${{ github.repository }}
+    #     PULL: ${{ github.event.number }}
+    #     GITHUB_TOKEN: ${{ github.token }}
+    #     EXCLUDE_COMMIT: ${{ github.event.after }}
     - name: Set head sha
       if: github.event_name == 'pull_request'
       run: echo "HEAD_SHA=$(git show -s --format=%s $GITHUB_SHA | grep -o -P "(?<=Merge ).*(?= into)")" >> $GITHUB_ENV
@@ -289,318 +290,41 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
 
-  build-aarch:
-    runs-on: ubuntu-22.04
+  aarch:
     needs: test
     if: ${{ needs.test.outputs.boards-aarch != '[]' }}
-    env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
-    steps:
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
-    - name: Set up submodules
-      id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext mtools
-        pip install -r requirements-dev.txt
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-    - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      with:
-        release: '10-2020-q4'
-    - name: Install mkfs.fat
-      run: |
-        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
-        tar -xaf dosfstools-4.2.tar.gz
-        cd dosfstools-4.2
-        ./configure
-        make -j 2
-        cd src
-        echo >>$GITHUB_PATH $(pwd)
-    - name: Versions
-      run: |
-        gcc --version
-        aarch64-none-elf-gcc --version
-        arm-none-eabi-gcc --version
-        python3 --version
-        mkfs.fat --version || true
-    - name: Download mpy-cross
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      uses: actions/download-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross
-    - name: Make mpy-cross executable
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: sudo chmod +x mpy-cross/mpy-cross
-    - name: Setup build failure matcher
-      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
-      run: python3 -u build_release_files.py
-      working-directory: tools
-      env:
-        BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.board }}
-        path: bin/${{ matrix.board }}
-    - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: aarch
+      boards: ${{ needs.test.outputs.boards-aarch }}
+      cp-version: ${{ needs.test.outputs.cp-version }}
 
 
-  build-arm:
-    runs-on: ubuntu-22.04
+  arm:
     needs: test
     if: ${{ needs.test.outputs.boards-arm != '[]' }}
-    env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
-    steps:
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
-    - name: Set up submodules
-      id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
-    - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      with:
-        release: '10-2020-q4'
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext
-        pip install -r requirements-dev.txt
-    - name: Versions
-      run: |
-        gcc --version
-        arm-none-eabi-gcc --version
-        python3 --version
-    - name: Download mpy-cross
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      uses: actions/download-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross
-    - name: Make mpy-cross executable
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: sudo chmod +x mpy-cross/mpy-cross
-    - name: Setup build failure matcher
-      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
-      run: python3 -u build_release_files.py
-      working-directory: tools
-      env:
-        BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.board }}
-        path: bin/${{ matrix.board }}
-    - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: arm
+      boards: ${{ needs.test.outputs.boards-arm }}
+      cp-version: ${{ needs.test.outputs.cp-version }}
 
 
-  build-espressif:
-    runs-on: ubuntu-22.04
+  espressif:
     needs: test
     if: ${{ needs.test.outputs.boards-espressif != '[]' }}
-    env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
-      IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
-      IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
-    strategy:
-      fail-fast: false
-      matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
-    steps:
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Set up python
-      id: setup-python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - name: Get IDF commit
-      id: idf-commit
-      run: |
-        COMMIT=$(git submodule status ports/espressif/esp-idf | grep -o -P '(?<=^-).*(?= )')
-        echo "$COMMIT"
-        echo "commit=$COMMIT" >> $GITHUB_OUTPUT
-    - name: Cache IDF submodules
-      uses: actions/cache@v3
-      with:
-        path: |
-          .git/modules/ports/espressif/esp-idf
-          ports/espressif/esp-idf
-        key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
-    - name: Cache IDF tools
-      uses: actions/cache@v3
-      with:
-        path: ${{ env.IDF_TOOLS_PATH }}
-        key: ${{ runner.os }}-Python-${{ steps.setup-python.outputs.python-version }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
-    - name: Initialize IDF submodules
-      run: git submodule update --init --depth=1 --recursive $IDF_PATH
-    - name: Install IDF tools
-      run: |
-        echo "Installing ESP-IDF tools"
-        $IDF_PATH/tools/idf_tools.py --non-interactive install required
-        $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
-        echo "Installing Python environment and packages"
-        $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
-        rm -rf $IDF_TOOLS_PATH/dist
-    - name: Set up submodules
-      id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
-    - name: Install dependencies
-      run: |
-        source $IDF_PATH/export.sh
-        sudo apt-get install -y gettext ninja-build
-        pip install -r requirements-dev.txt
-    - name: Versions
-      run: |
-        source $IDF_PATH/export.sh
-        gcc --version
-        python3 --version
-        ninja --version
-        cmake --version
-    - name: Download mpy-cross
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      uses: actions/download-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross
-    - name: Make mpy-cross executable
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: sudo chmod +x mpy-cross/mpy-cross
-    - name: Setup build failure matcher
-      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
-      run: |
-        source $IDF_PATH/export.sh
-        python3 -u build_release_files.py
-      working-directory: tools
-      env:
-        BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.board }}
-        path: bin/${{ matrix.board }}
-    - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: espressif
+      boards: ${{ needs.test.outputs.boards-espressif }}
+      cp-version: ${{ needs.test.outputs.cp-version }}
 
 
-  build-riscv:
-    runs-on: ubuntu-22.04
+  riscv:
     needs: test
     if: ${{ needs.test.outputs.boards-riscv != '[]' }}
-    env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
-    steps:
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
-    - name: Set up submodules
-      id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext
-        pip install -r requirements-dev.txt
-        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-    - name: Versions
-      run: |
-        gcc --version
-        riscv64-unknown-elf-gcc --version
-        python3 --version
-    - name: Download mpy-cross
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      uses: actions/download-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross
-    - name: Make mpy-cross executable
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: sudo chmod +x mpy-cross/mpy-cross
-    - name: Setup build failure matcher
-      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
-      run: python3 -u build_release_files.py
-      working-directory: tools
-      env:
-        BOARDS: ${{ matrix.board }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.board }}
-        path: bin/${{ matrix.board }}
-    - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: riscv
+      boards: ${{ needs.test.outputs.boards-riscv }}
+      cp-version: ${{ needs.test.outputs.cp-version }}

From 0d957fe15cbdca39d3d670129e0d891ca0f55b23 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 10 Feb 2023 08:44:58 -0600
Subject: [PATCH 1794/2403] Fix several places where an exception could be
 chained wrongly

If an exception's chain or context can refer to a pointer from a different
VM, a crash would typically result.

This couldn't turn up on UNIX testing because the VM is never torn
down and rebuilt like it is on hardware.

Because in the 'static' case the GeneratorObject is now fully initialized
whenever it's raised, the initialization can be dropped, which reduces
the flash size slightly.
Closes: #7565
---
 py/objexcept.c    | 12 ++++++++++++
 py/objexcept.h    |  1 +
 py/objgenerator.c |  7 +++----
 py/runtime.c      |  8 ++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/py/objexcept.c b/py/objexcept.c
index 976535754b..24fb564e23 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -155,6 +155,12 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
     mp_obj_tuple_print(print, MP_OBJ_FROM_PTR(o->args), kind);
 }
 
+void mp_obj_exception_initialize0(mp_obj_exception_t *o_exc, const mp_obj_type_t *type) {
+    o_exc->base.type = type;
+    o_exc->args = (mp_obj_tuple_t *)&mp_const_empty_tuple_obj;
+    mp_obj_exception_clear_traceback(o_exc);
+}
+
 mp_obj_t mp_obj_exception_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, 0, MP_OBJ_FUN_ARGS_MAX, false);
 
@@ -583,6 +589,12 @@ void mp_obj_exception_clear_traceback(mp_obj_t self_in) {
     // just set the traceback to the empty traceback object
     // we don't want to call any memory management functions here
     self->traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
+    #if MICROPY_CPYTHON_EXCEPTION_CHAIN
+    self->cause = 0;
+    self->context = 0;
+    self->suppress_context = false;
+    self->marked = false;
+    #endif
 }
 
 void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qstr block) {
diff --git a/py/objexcept.h b/py/objexcept.h
index 77b338e951..1230fdf18a 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -43,6 +43,7 @@ typedef struct _mp_obj_exception_t {
 
 void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind);
 void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
+void mp_obj_exception_initialize0(mp_obj_exception_t *o_exc, const mp_obj_type_t *type);
 mp_obj_exception_t *mp_obj_exception_get_native(mp_obj_t self_in);
 
 #define MP_DEFINE_EXCEPTION(exc_name, base_name) \
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 2256911e23..7c3ec99307 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -40,10 +40,11 @@
 // Instance of GeneratorExit exception - needed by generator.close()
 #if MICROPY_CONST_GENERATOREXIT_OBJ
 const
+mp_obj_exception_t mp_static_GeneratorExit_obj = {{&mp_type_GeneratorExit}, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj, (mp_obj_traceback_t *)&mp_const_empty_traceback_obj};
 #else
 static
+mp_obj_exception_t mp_static_GeneratorExit_obj;
 #endif
-mp_obj_exception_t mp_static_GeneratorExit_obj = {{&mp_type_GeneratorExit}, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj, (mp_obj_traceback_t *)&mp_const_empty_traceback_obj};
 
 /******************************************************************************/
 /* generator wrapper                                                          */
@@ -370,9 +371,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gen_instance_throw_obj, 2, 4, gen_ins
 static mp_obj_t generatorexit(void) {
     #if MICROPY_CPYTHON_EXCEPTION_CHAIN
     MP_STATIC_ASSERT(!MICROPY_CONST_GENERATOREXIT_OBJ);
-    mp_static_GeneratorExit_obj.context = NULL;
-    mp_static_GeneratorExit_obj.cause = NULL;
-    mp_static_GeneratorExit_obj.suppress_context = false;
+    mp_obj_exception_initialize0(&mp_static_GeneratorExit_obj, &mp_type_GeneratorExit);
     #endif
     return MP_OBJ_FROM_PTR(&mp_static_GeneratorExit_obj);
 }
diff --git a/py/runtime.c b/py/runtime.c
index 9779456d0c..9227594d83 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -78,14 +78,10 @@ void mp_init(void) {
 
     #if MICROPY_KBD_EXCEPTION
     // initialise the exception object for raising KeyboardInterrupt
-    MP_STATE_VM(mp_kbd_exception).base.type = &mp_type_KeyboardInterrupt;
-    MP_STATE_VM(mp_kbd_exception).args = (mp_obj_tuple_t *)&mp_const_empty_tuple_obj;
-    MP_STATE_VM(mp_kbd_exception).traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
+    mp_obj_exception_initialize0(&MP_STATE_VM(mp_kbd_exception), &mp_type_KeyboardInterrupt);
     #endif
 
-    MP_STATE_VM(mp_reload_exception).base.type = &mp_type_ReloadException;
-    MP_STATE_VM(mp_reload_exception).args = (mp_obj_tuple_t *)&mp_const_empty_tuple_obj;
-    MP_STATE_VM(mp_reload_exception).traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj;
+    mp_obj_exception_initialize0(&MP_STATE_VM(mp_reload_exception), &mp_type_ReloadException);
 
     // call port specific initialization if any
     #ifdef MICROPY_PORT_INIT_FUNC

From cec36b62f1843901be0574fecc84e83ef5fa246a Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 10 Feb 2023 04:58:37 +0100
Subject: [PATCH 1795/2403] Update build_board_info.py to sh module 2.0.0

---
 tools/build_board_info.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index f810d942a7..5209337b95 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -10,6 +10,7 @@ import subprocess
 import sys
 import sh
 import base64
+from io import StringIO
 from datetime import date
 from sh.contrib import git
 
@@ -58,9 +59,13 @@ def get_languages(list_all=False):
 
 def get_version_info():
     version = None
-    sha = git("rev-parse", "--short", "HEAD").stdout.decode("utf-8")
+    buffer = StringIO()
+    git("rev-parse", "--short", "HEAD", _out=buffer)
+    sha = buffer.getvalue().strip()
     try:
-        version = git("describe", "--tags", "--exact-match").stdout.decode("utf-8").strip()
+        buffer = StringIO()
+        git("describe", "--tags", "--exact-match", _out=buffer)
+        version = buffer.getvalue().strip()
     except sh.ErrorReturnCode_128:
         # No exact match
         pass

From 17e03c47682f2a345f32cd48840886fa9a38199b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Feb 2023 19:47:51 +0530
Subject: [PATCH 1796/2403] ci max parallelism

---
 .github/actions/fetch_submodules/action.yml |   7 +-
 .github/actions/mpy_cross/action.yml        |  30 ++++
 .github/workflows/build-boards.yml          |  17 +--
 .github/workflows/build-mpy-cross.yml       |  75 +++++++++
 .github/workflows/build.yml                 | 161 ++++++--------------
 .github/workflows/run-tests.yml             |  76 +++++++++
 tools/ci_fetch_deps.py                      |   7 +-
 7 files changed, 244 insertions(+), 129 deletions(-)
 create mode 100644 .github/actions/mpy_cross/action.yml
 create mode 100644 .github/workflows/build-mpy-cross.yml
 create mode 100644 .github/workflows/run-tests.yml

diff --git a/.github/actions/fetch_submodules/action.yml b/.github/actions/fetch_submodules/action.yml
index 407259967c..c8c6c9b1a0 100644
--- a/.github/actions/fetch_submodules/action.yml
+++ b/.github/actions/fetch_submodules/action.yml
@@ -1,6 +1,11 @@
 name: 'Fetch Submodules'
 
 inputs:
+  target:
+    description: 'The target for ci_fetch_deps'
+    required: false
+    type: string
+
   submodules:
     description: 'The submodules to cache'
     required: false
@@ -63,7 +68,7 @@ runs:
 
     - name: CircuitPython dependencies
       id: cp-deps
-      run: python tools/ci_fetch_deps.py ${{ matrix.board || github.job }}
+      run: python tools/ci_fetch_deps.py ${{ inputs.target || matrix.board || github.job }}
       shell: bash
 
     - name: CircuitPython version
diff --git a/.github/actions/mpy_cross/action.yml b/.github/actions/mpy_cross/action.yml
new file mode 100644
index 0000000000..ea3466e5fb
--- /dev/null
+++ b/.github/actions/mpy_cross/action.yml
@@ -0,0 +1,30 @@
+name: Set up mpy-cross
+
+runs:
+  using: composite
+  steps:
+    - name: Download mpy-cross
+      id: download-mpy-cross
+      continue-on-error: true
+      uses: actions/download-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross
+
+    - name: Make mpy-cross executable
+      if: steps.download-mpy-cross.outcome == 'success'
+      run: sudo chmod +x mpy-cross/mpy-cross
+      shell: bash
+
+    - name: Build mpy-cross
+      if: steps.download-mpy-cross.outcome == 'failure'
+      run: make -C mpy-cross -j2
+      shell: bash
+
+    - name: Upload mpy-cross
+      continue-on-error: true
+      if: steps.download-mpy-cross.outcome == 'failure'
+      uses: actions/upload-artifact@v3
+      with:
+        name: mpy-cross
+        path: mpy-cross/mpy-cross
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index 10b572065a..9397b6f70a 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -25,10 +25,6 @@ jobs:
       matrix:
         board: ${{ fromJSON(inputs.boards) }}
     steps:
-    - name: Dump GitHub context
-      run: echo "$GITHUB_CONTEXT"
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
     - name: Set up repository
       uses: actions/checkout@v3
       with:
@@ -49,6 +45,9 @@ jobs:
       uses: ./.github/actions/external_deps
       with:
         platform: ${{ inputs.platform }}
+    - name: Set up mpy-cross
+      if: steps.set-up-submodules.outputs.frozen == 'True'
+      uses: ./.github/actions/mpy_cross
 
     - name: Versions
       run: |
@@ -63,16 +62,6 @@ jobs:
         riscv64-unknown-elf-gcc --version || true
         mkfs.fat --version || true
 
-    - name: Download mpy-cross
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      uses: actions/download-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross
-    - name: Make mpy-cross executable
-      if: ${{ steps.set-up-submodules.outputs.frozen == 'True' }}
-      run: sudo chmod +x mpy-cross/mpy-cross
-
     - name: Set up build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
     - name: Build
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
new file mode 100644
index 0000000000..cab3a533ae
--- /dev/null
+++ b/.github/workflows/build-mpy-cross.yml
@@ -0,0 +1,75 @@
+name: Build mpy-cross
+
+on:
+  workflow_call:
+    inputs:
+      cp-version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        mpy-cross: ["static", "static-aarch64", "static-mingw", "static-raspbian"]
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+      EX_static-mingw: static.exe
+      OS_static: linux-amd64
+      OS_static-aarch64: linux-aarch64
+      OS_static-mingw: windows
+      OS_static-raspbian: linux-raspbian
+    steps:
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
+      with:
+        target: mpy-cross
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gettext
+
+    - name: Install toolchain (aarch64)
+      if: matrix.mpy-cross == 'static-aarch64'
+      run: sudo apt-get install -y gcc-aarch64-linux-gnu
+
+    - name: Install toolchain (mingw)
+      if: matrix.mpy-cross == 'static-mingw'
+      run: sudo apt-get install -y mingw-w64
+
+    - name: Build mpy-cross.${{ matrix.mpy-cross }}
+      run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        path: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+
+    - name: Upload to S3
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      run: >-
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp
+        mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        s3://adafruit-circuit-python/bin/mpy-cross/$OS_${{ matrix.mpy-cross }}/mpy-cross-$CP_VERSION.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        --no-progress --region us-east-1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b01e520fa9..93c06022ce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
+  scheduler:
     runs-on: ubuntu-20.04
     outputs:
       build-doc: ${{ steps.set-matrix.outputs.build-doc }}
@@ -54,89 +54,8 @@ jobs:
         version: true
     - name: Install dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y eatmydata
-        sudo eatmydata apt-get install -y gettext gcc-aarch64-linux-gnu mingw-w64
-        pip install -r requirements-dev.txt
-    - name: Versions
-      run: |
-        gcc --version
-        python3 --version
-    - name: Build mpy-cross
-      run: make -C mpy-cross -j2
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mpy-cross
-        path: mpy-cross/mpy-cross
-    - name: Build unix port
-      run: make -C ports/unix VARIANT=coverage -j2
-    - name: Test all
-      run:  ./run-tests.py -j2
-      working-directory: tests
-    - name: Print failure info
-      run: ./run-tests.py -j2 --print-failures
-      if: failure()
-      working-directory: tests
-    - name: Native Tests
-      run: ./run-tests.py -j2 --emit native
-      working-directory: tests
-    - name: mpy Tests
-      run: ./run-tests.py -j2 --via-mpy -d basics float micropython
-      working-directory: tests
-    - name: Native mpy Tests
-      run: ./run-tests.py -j2 --via-mpy --emit native -d basics float micropython
-      working-directory: tests
-    - name: Build native modules
-      run: |
-        make -C examples/natmod/features1
-        make -C examples/natmod/features2
-        make -C examples/natmod/btree
-        make -C examples/natmod/framebuf
-        make -C examples/natmod/uheapq
-        make -C examples/natmod/urandom
-        make -C examples/natmod/ure
-        make -C examples/natmod/uzlib
-    - name: Test native modules
-      run: ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py
-      working-directory: tests
-    - name: Build mpy-cross.static-aarch64
-      run: make -C mpy-cross -j2 -f Makefile.static-aarch64
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mpy-cross.static-aarch64
-        path: mpy-cross/mpy-cross.static-aarch64
-    - name: Build mpy-cross.static-raspbian
-      run: make -C mpy-cross -j2 -f Makefile.static-raspbian
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mpy-cross.static-raspbian
-        path: mpy-cross/mpy-cross.static-raspbian
-    - name: Build mpy-cross.static
-      run: make -C mpy-cross -j2 -f Makefile.static
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mpy-cross.static-amd64-linux
-        path: mpy-cross/mpy-cross.static
-    - name: Build mpy-cross.static-mingw
-      run: make -C mpy-cross -j2 -f Makefile.static-mingw
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mpy-cross.static-x64-windows
-        path: mpy-cross/mpy-cross.static.exe
-    - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-aarch64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-aarch64-${{ env.CP_VERSION }} --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
+        sudo apt-get install -y gettext
+        pip install requests requests-cache sh
     # Disabled: Needs to be updated
     # - name: Get last commit with checks
     #   id: get-last-commit-with-checks
@@ -148,6 +67,8 @@ jobs:
     #     PULL: ${{ github.event.number }}
     #     GITHUB_TOKEN: ${{ github.token }}
     #     EXCLUDE_COMMIT: ${{ github.event.after }}
+    - name: Set up mpy-cross
+      uses: ./.github/actions/mpy_cross
     - name: Set head sha
       if: github.event_name == 'pull_request'
       run: echo "HEAD_SHA=$(git show -s --format=%s $GITHUB_SHA | grep -o -P "(?<=Merge ).*(?= into)")" >> $GITHUB_ENV
@@ -170,13 +91,28 @@ jobs:
         CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
 
+  tests:
+    needs: scheduler
+    if: needs.scheduler.outputs.build-boards == 'True'
+    uses: ./.github/workflows/run-tests.yml
+    with:
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
+
+  mpy-cross:
+    needs: scheduler
+    if: needs.scheduler.outputs.build-boards == 'True'
+    uses: ./.github/workflows/build-mpy-cross.yml
+    with:
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
 
   mpy-cross-mac:
     runs-on: macos-11
-    needs: test
-    if: ${{ needs.test.outputs.build-boards == 'True' }}
+    needs: scheduler
+    if: ${{ needs.scheduler.outputs.build-boards == 'True' }}
     env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
+      CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -213,23 +149,25 @@ jobs:
         name: mpy-cross-macos-11-universal
         path: mpy-cross-macos-universal
     - name: Upload mpy-cross build to S3
-      run: |
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
+      if: >-
+          (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+          (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      run: |
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
 
 
   build-doc:
     runs-on: ubuntu-22.04
-    needs: test
-    if: ${{ needs.test.outputs.build-doc == 'True' }}
+    needs: scheduler
+    if: ${{ needs.scheduler.outputs.build-doc == 'True' }}
     env:
-      CP_VERSION: ${{ needs.test.outputs.cp-version }}
+      CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -276,7 +214,6 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        pip install awscli
         zip -9r circuitpython-stubs.zip circuitpython-stubs
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
     - name: Upload stubs to PyPi
@@ -291,40 +228,40 @@ jobs:
 
 
   aarch:
-    needs: test
-    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-aarch != '[]' }}
     uses: ./.github/workflows/build-boards.yml
     with:
       platform: aarch
-      boards: ${{ needs.test.outputs.boards-aarch }}
-      cp-version: ${{ needs.test.outputs.cp-version }}
+      boards: ${{ needs.scheduler.outputs.boards-aarch }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
 
   arm:
-    needs: test
-    if: ${{ needs.test.outputs.boards-arm != '[]' }}
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-arm != '[]' }}
     uses: ./.github/workflows/build-boards.yml
     with:
       platform: arm
-      boards: ${{ needs.test.outputs.boards-arm }}
-      cp-version: ${{ needs.test.outputs.cp-version }}
+      boards: ${{ needs.scheduler.outputs.boards-arm }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
 
   espressif:
-    needs: test
-    if: ${{ needs.test.outputs.boards-espressif != '[]' }}
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-espressif != '[]' }}
     uses: ./.github/workflows/build-boards.yml
     with:
       platform: espressif
-      boards: ${{ needs.test.outputs.boards-espressif }}
-      cp-version: ${{ needs.test.outputs.cp-version }}
+      boards: ${{ needs.scheduler.outputs.boards-espressif }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
 
   riscv:
-    needs: test
-    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-riscv != '[]' }}
     uses: ./.github/workflows/build-boards.yml
     with:
       platform: riscv
-      boards: ${{ needs.test.outputs.boards-riscv }}
-      cp-version: ${{ needs.test.outputs.cp-version }}
+      boards: ${{ needs.scheduler.outputs.boards-riscv }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
new file mode 100644
index 0000000000..15fc8489a4
--- /dev/null
+++ b/.github/workflows/run-tests.yml
@@ -0,0 +1,76 @@
+name: Run tests
+
+on:
+  workflow_call:
+    inputs:
+      cp-version:
+        required: true
+        type: string
+
+jobs:
+  run:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        test: [all, mpy, native, native_mpy]
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+      MICROPY_CPYTHON3: python3.8
+      MICROPY_MICROPYTHON: ../ports/unix/micropython-coverage
+      TEST_all:
+      TEST_mpy: --via-mpy -d basics float micropython
+      TEST_native: --emit native
+      TEST_native_mpy: --via-mpy --emit native -d basics float micropython
+    steps:
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: Set up submodules
+      uses: ./.github/actions/fetch_submodules
+      with:
+        target: tests
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gettext
+
+    - name: Set up mpy-cross
+      uses: ./.github/actions/mpy_cross
+
+    - name: Build unix port
+      run: make -C ports/unix VARIANT=coverage -j2
+
+    - name: Test all
+      run: ./run-tests.py -j2 $TEST_${{ matrix.test }}
+      working-directory: tests
+    - name: Print failure info
+      run: ./run-tests.py -j2 --print-failures
+      if: failure()
+      working-directory: tests
+
+    - name: Set up native modules
+      if: matrix.test == 'all'
+      run: pip install -r requirements-dev.txt
+    - name: Build native modules
+      if: matrix.test == 'all'
+      run: |
+        make -C examples/natmod/features1
+        make -C examples/natmod/features2
+        make -C examples/natmod/btree
+        make -C examples/natmod/framebuf
+        make -C examples/natmod/uheapq
+        make -C examples/natmod/urandom
+        make -C examples/natmod/ure
+        make -C examples/natmod/uzlib
+    - name: Test native modules
+      if: matrix.test == 'all'
+      run: ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py
+      working-directory: tests
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 5cf2279314..bdf2967af8 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -73,12 +73,15 @@ def main():
 
     print("Target:", TARGET)
 
-    if TARGET == "test":
+    if TARGET == "scheduler":
+        # submodules = ["tools/"]
+        submodules = ["extmod/ulab", "lib/", "tools/"]
+    elif TARGET == "tests":
         submodules = ["extmod/ulab", "lib/", "tools/"]
     elif TARGET == "build-doc":
         # used in .readthedocs.yml to generate RTD
         submodules = ["extmod/ulab", "frozen/"]
-    elif TARGET == "mpy-cross-mac":
+    elif TARGET == "mpy-cross" or TARGET == "mpy-cross-mac":
         submodules = ["tools/"]  # for huffman
     elif TARGET == "windows":
         # This builds one board from a number of ports so fill out a bunch of submodules

From 70a4efc08ae6495810704ceb2830406e4439d6df Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Feb 2023 23:03:13 +0530
Subject: [PATCH 1797/2403] use composite action for aws s3 upload

---
 .github/actions/upload_aws/action.yml | 19 ++++++++++++-------
 .github/workflows/build-boards.yml    | 11 +++--------
 .github/workflows/build-mpy-cross.yml | 14 ++++----------
 .github/workflows/build.yml           | 26 +++++++++++---------------
 4 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/.github/actions/upload_aws/action.yml b/.github/actions/upload_aws/action.yml
index a2d43f8de7..7aee8c7e78 100644
--- a/.github/actions/upload_aws/action.yml
+++ b/.github/actions/upload_aws/action.yml
@@ -1,15 +1,19 @@
 name: Upload to AWS S3
 
-
 inputs:
   source:
     required: true
     type: string
 
   destination:
-    required: true
+    required: false
     type: string
 
+  AWS_ACCESS_KEY_ID:
+    required: true
+
+  AWS_SECRET_ACCESS_KEY:
+    required: true
 
 runs:
   using: composite
@@ -18,10 +22,11 @@ runs:
       if: >-
         (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
         (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
+      run: >-
+        [ -z "$AWS_ACCESS_KEY_ID" ] ||
+        aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }} --recursive --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_ACCESS_KEY_ID: ${{ inputs.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
+      shell: bash
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index 9397b6f70a..9b53615fe7 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -76,13 +76,8 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
     - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: |
-        pip install awscli
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
-      env:
-        AWS_PAGER: ''
+      uses: ./.github/actions/upload_aws
+      with:
+        source: bin/
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
index cab3a533ae..3d557df8ee 100644
--- a/.github/workflows/build-mpy-cross.yml
+++ b/.github/workflows/build-mpy-cross.yml
@@ -61,15 +61,9 @@ jobs:
         path: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
 
     - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      env:
-        AWS_PAGER: ''
+      uses: ./.github/actions/upload_aws
+      with:
+        source: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        destination: mpy-cross/${{ env[format('OS_{0}', matrix.mpy-cross)] }}/mpy-cross-${{ env.CP_VERSION }}.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      run: >-
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp
-        mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
-        s3://adafruit-circuit-python/bin/mpy-cross/$OS_${{ matrix.mpy-cross }}/mpy-cross-$CP_VERSION.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
-        --no-progress --region us-east-1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 93c06022ce..37bb4133cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -144,23 +144,23 @@ jobs:
         path: mpy-cross/mpy-cross-arm64
     - name: Make universal binary
       run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
-    - uses: actions/upload-artifact@v3
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
       with:
         name: mpy-cross-macos-11-universal
         path: mpy-cross-macos-universal
-    - name: Upload mpy-cross build to S3
+    - name: Upload to S3
       if: >-
           (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
           (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      env:
-        AWS_PAGER: ''
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
-
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   build-doc:
     runs-on: ubuntu-22.04
@@ -206,16 +206,12 @@ jobs:
         name: docs
         path: _build/latex
     - name: Upload to S3
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      env:
-        AWS_PAGER: ''
+      uses: ./.github/actions/upload_aws
+      with:
+        source: circuitpython-stubs/dist/*.tar.gz
+        destination: stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      run: |
-        zip -9r circuitpython-stubs.zip circuitpython-stubs
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
     - name: Upload stubs to PyPi
       if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
       env:

From 3c93594563443a8e219f3df6c149f2169ec5bd6b Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 10 Feb 2023 19:54:10 +0100
Subject: [PATCH 1798/2403] Deinit the reset pin when displayio.I2CDisplay
 raises an exception

---
 shared-module/displayio/I2CDisplay.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-module/displayio/I2CDisplay.c b/shared-module/displayio/I2CDisplay.c
index 8fae5d31fd..f38e4d6296 100644
--- a/shared-module/displayio/I2CDisplay.c
+++ b/shared-module/displayio/I2CDisplay.c
@@ -54,6 +54,7 @@ void common_hal_displayio_i2cdisplay_construct(displayio_i2cdisplay_obj_t *self,
     // Probe the bus to see if a device acknowledges the given address.
     if (!common_hal_busio_i2c_probe(i2c, device_address)) {
         self->base.type = &mp_type_NoneType;
+        common_hal_displayio_i2cdisplay_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to find I2C Display at %x"), device_address);
     }
 

From a460410d6a6fed0493ca5b245b8e7d8e7f76f286 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 10 Feb 2023 22:45:25 +0200
Subject: [PATCH 1799/2403] First attempt at using alloc

---
 main.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index d70e718b6d..8376e0b089 100644
--- a/main.c
+++ b/main.c
@@ -123,7 +123,8 @@ uint8_t value_out = 0;
 #endif
 
 #if MICROPY_ENABLE_PYSTACK
-static size_t PLACE_IN_DTCM_BSS(_pystack[CIRCUITPY_PYSTACK_SIZE / sizeof(size_t)]);
+size_t *_pystack;
+int _pystack_size = CIRCUITPY_PYSTACK_SIZE;
 #endif
 
 static void reset_devices(void) {
@@ -160,7 +161,7 @@ STATIC void start_mp(supervisor_allocation *heap) {
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(_pystack, _pystack + (sizeof(_pystack) / sizeof(size_t)));
+    mp_pystack_init(_pystack, _pystack + (_pystack_size / sizeof(size_t)));
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -912,6 +913,10 @@ STATIC int run_repl(void) {
 }
 
 int __attribute__((used)) main(void) {
+
+    // allocate the pystack
+    _pystack = (size_t *)allocate_memory(_pystack_size, false, false);
+
     // initialise the cpu and peripherals
     safe_mode_t safe_mode = port_init();
 

From bb4cccc1cda1573889097ee0c596e27686a794bf Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 10 Feb 2023 17:26:01 -0600
Subject: [PATCH 1800/2403] use range instead of min where applicable to
 consolodate bounds checks

---
 shared-bindings/displayio/Bitmap.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 458a73c3b1..0efa801a7d 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -148,21 +148,15 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     } else {
         mp_obj_t *items;
         mp_obj_get_array_fixed_n(index_obj, 2, &items);
-        x = mp_arg_validate_int_min(mp_obj_get_int(items[0]), 0, MP_QSTR_x);
-        y = mp_arg_validate_int_min(mp_obj_get_int(items[1]), 0, MP_QSTR_y);
-        if (x >= common_hal_displayio_bitmap_get_width(self) || y >= common_hal_displayio_bitmap_get_height(self)) {
-            mp_raise_IndexError(translate("pixel coordinates out of bounds"));
-        }
+        x = mp_arg_validate_int_range(mp_obj_get_int(items[0]), 0, self->width - 1, MP_QSTR_x);
+        y = mp_arg_validate_int_range(mp_obj_get_int(items[1]), 0, self->height - 1, MP_QSTR_y);
     }
 
     if (value_obj == MP_OBJ_SENTINEL) {
         // load
         return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_bitmap_get_pixel(self, x, y));
     } else {
-        mp_uint_t value = (mp_uint_t)mp_obj_get_int(value_obj);
-        if ((value >> common_hal_displayio_bitmap_get_bits_per_value(self)) != 0) {
-            mp_raise_ValueError(translate("pixel value requires too many bits"));
-        }
+        mp_uint_t value = (mp_uint_t)mp_arg_validate_int_range(mp_obj_get_int(value_obj), 0,(1u << common_hal_displayio_bitmap_get_bits_per_value(self)) - 1, MP_QSTR_value);
         common_hal_displayio_bitmap_set_pixel(self, x, y, value);
     }
     return mp_const_none;
@@ -276,10 +270,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_blit_obj, 1, displayio_bitmap_obj_bl
 STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_uint_t value = (mp_uint_t)mp_arg_validate_int_min(mp_obj_get_int(value_obj), 0, MP_QSTR_value);
-    if ((value >> common_hal_displayio_bitmap_get_bits_per_value(self)) != 0) {
-        mp_raise_ValueError(translate("pixel value requires too many bits"));
-    }
+    mp_uint_t value = (mp_uint_t)mp_arg_validate_int_range(mp_obj_get_int(value_obj), 0,(1u << common_hal_displayio_bitmap_get_bits_per_value(self)) - 1,MP_QSTR_value);
     common_hal_displayio_bitmap_fill(self, value);
 
     return mp_const_none;

From 67fd815e27581a1a758de68943cd64717e856021 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 10 Feb 2023 17:39:38 -0600
Subject: [PATCH 1801/2403] maximum value validation for bitmap constructor

---
 shared-bindings/displayio/Bitmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 0efa801a7d..566bee954c 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -62,9 +62,9 @@
 //|         ...
 STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
-    uint32_t width = mp_arg_validate_int_min(mp_obj_get_int(all_args[0]), 1, MP_QSTR_width);
-    uint32_t height = mp_arg_validate_int_min(mp_obj_get_int(all_args[1]), 1, MP_QSTR_height);
-    uint32_t value_count = mp_arg_validate_int_min(mp_obj_get_int(all_args[2]), 1, MP_QSTR_value_count);
+    uint32_t width = mp_arg_validate_int_range(mp_obj_get_int(all_args[0]), 1, 32767, MP_QSTR_width);
+    uint32_t height = mp_arg_validate_int_range(mp_obj_get_int(all_args[1]), 1, 32767, MP_QSTR_height);
+    uint32_t value_count = mp_arg_validate_int_range(mp_obj_get_int(all_args[2]), 1, 32767, MP_QSTR_value_count);
     uint32_t bits = 1;
 
     while ((value_count - 1) >> bits) {

From 5f3f87e371c7cc0d83817308375ab58e3d329210 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 10 Feb 2023 18:05:07 -0600
Subject: [PATCH 1802/2403] validate palette color count and group scale

---
 shared-bindings/displayio/Group.c   | 2 +-
 shared-bindings/displayio/Palette.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 3e4569b271..24064a74c1 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -56,7 +56,7 @@ STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    mp_int_t scale = mp_arg_validate_int_min(args[ARG_scale].u_int, 1, MP_QSTR_scale);
+    mp_int_t scale = mp_arg_validate_int_range(args[ARG_scale].u_int, 1, 32767,MP_QSTR_scale);
 
     displayio_group_t *self = m_new_obj(displayio_group_t);
     self->base.type = &displayio_group_type;
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index aa24dc262f..804b9ff034 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -58,7 +58,7 @@ STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_a
 
     displayio_palette_t *self = m_new_obj(displayio_palette_t);
     self->base.type = &displayio_palette_type;
-    common_hal_displayio_palette_construct(self, args[ARG_color_count].u_int);
+    common_hal_displayio_palette_construct(self, mp_arg_validate_int_range(args[ARG_color_count].u_int, 1, 32767, MP_QSTR_color_count));
 
     return MP_OBJ_FROM_PTR(self);
 }

From da9b6fb0e20554135c40fc08af0c4894a366601b Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Fri, 10 Feb 2023 18:31:59 -0600
Subject: [PATCH 1803/2403] Moving library to /lib

---
 lib/AnimatedGIF/AnimatedGIF.cpp               | 236 ++++++
 lib/AnimatedGIF/AnimatedGIF.h                 | 216 +++++
 .../AnimatedGIF}/AnimatedGIF_circuitpy.h      |   3 +
 lib/AnimatedGIF/README.md                     |   5 +
 .../displayio => lib/AnimatedGIF}/gif.c       | 768 ++++++++++--------
 py/circuitpy_defns.mk                         |   9 +-
 shared-bindings/displayio/gif.c               |   0
 shared-module/displayio/OnDiskGif.h           |   3 +-
 8 files changed, 874 insertions(+), 366 deletions(-)
 create mode 100644 lib/AnimatedGIF/AnimatedGIF.cpp
 create mode 100644 lib/AnimatedGIF/AnimatedGIF.h
 rename {shared-module/displayio => lib/AnimatedGIF}/AnimatedGIF_circuitpy.h (99%)
 create mode 100644 lib/AnimatedGIF/README.md
 rename {shared-module/displayio => lib/AnimatedGIF}/gif.c (60%)
 delete mode 100644 shared-bindings/displayio/gif.c

diff --git a/lib/AnimatedGIF/AnimatedGIF.cpp b/lib/AnimatedGIF/AnimatedGIF.cpp
new file mode 100644
index 0000000000..ad79b212b8
--- /dev/null
+++ b/lib/AnimatedGIF/AnimatedGIF.cpp
@@ -0,0 +1,236 @@
+//
+// GIF Animator
+// written by Larry Bank
+// bitbank@pobox.com
+// Arduino port started 7/5/2020
+// Original GIF code written 20+ years ago :)
+// The goal of this code is to decode images up to 480x320
+// using no more than 22K of RAM (if sent directly to an LCD display)
+//
+// Copyright 2020 BitBank Software, Inc. All Rights Reserved.
+// 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.
+//===========================================================================
+#include "AnimatedGIF.h"
+
+// Here is all of the actual code...
+#include "gif.inl"
+
+//
+// Memory initialization
+//
+int AnimatedGIF::open(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw)
+{
+    _gif.iError = GIF_SUCCESS;
+    _gif.pfnRead = readMem;
+    _gif.pfnSeek = seekMem;
+    _gif.pfnDraw = pfnDraw;
+    _gif.pfnOpen = NULL;
+    _gif.pfnClose = NULL;
+    _gif.GIFFile.iSize = iDataSize;
+    _gif.GIFFile.pData = pData;
+    return GIFInit(&_gif);
+} /* open() */
+
+int AnimatedGIF::openFLASH(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw)
+{
+    _gif.iError = GIF_SUCCESS;
+    _gif.pfnRead = readFLASH;
+    _gif.pfnSeek = seekMem;
+    _gif.pfnDraw = pfnDraw;
+    _gif.pfnOpen = NULL;
+    _gif.pfnClose = NULL;
+    _gif.GIFFile.iSize = iDataSize;
+    _gif.GIFFile.pData = pData;
+    return GIFInit(&_gif);
+} /* openFLASH() */
+
+//
+// Returns the first comment block found (if any)
+//
+int AnimatedGIF::getComment(char *pDest)
+{
+int32_t iOldPos;
+
+    iOldPos = _gif.GIFFile.iPos; // keep old position
+    (*_gif.pfnSeek)(&_gif.GIFFile, _gif.iCommentPos);
+    (*_gif.pfnRead)(&_gif.GIFFile, (uint8_t *)pDest, _gif.sCommentLen);
+    (*_gif.pfnSeek)(&_gif.GIFFile, iOldPos);
+    pDest[_gif.sCommentLen] = 0; // zero terminate the string
+    return (int)_gif.sCommentLen;
+} /* getComment() */
+
+//
+// Allocate a block of memory to hold the entire canvas (as 8-bpp)
+//
+int AnimatedGIF::allocFrameBuf(GIF_ALLOC_CALLBACK *pfnAlloc)
+{
+    if (_gif.iCanvasWidth > 0 && _gif.iCanvasHeight > 0 && _gif.pFrameBuffer == NULL)
+    {
+        // Allocate a little extra space for the current line
+        // as RGB565 or RGB888
+        int iCanvasSize = _gif.iCanvasWidth * (_gif.iCanvasHeight+3);
+        _gif.pFrameBuffer = (unsigned char *)(*pfnAlloc)(iCanvasSize);
+        if (_gif.pFrameBuffer == NULL)
+            return GIF_ERROR_MEMORY;
+        return GIF_SUCCESS;
+    }
+    return GIF_INVALID_PARAMETER;
+} /* allocFrameBuf() */
+//
+// Set the DRAW callback behavior to RAW (default)
+// or COOKED (requires allocating a frame buffer)
+//
+int AnimatedGIF::setDrawType(int iType)
+{
+    if (iType != GIF_DRAW_RAW && iType != GIF_DRAW_COOKED)
+        return GIF_INVALID_PARAMETER; // invalid drawing mode
+    _gif.ucDrawType = (uint8_t)iType;
+    return GIF_SUCCESS;
+} /* setDrawType() */
+//
+// Release the memory used by the frame buffer
+//
+int AnimatedGIF::freeFrameBuf(GIF_FREE_CALLBACK *pfnFree)
+{
+    if (_gif.pFrameBuffer)
+    {
+        (*pfnFree)(_gif.pFrameBuffer);
+        _gif.pFrameBuffer = NULL;
+        return GIF_SUCCESS;
+    }
+    return GIF_INVALID_PARAMETER;
+} /* freeFrameBuf() */
+//
+// Return a pointer to the frame buffer (if it was allocated)
+//
+uint8_t * AnimatedGIF::getFrameBuf()
+{
+    return _gif.pFrameBuffer;
+} /* getFrameBuf() */
+
+int AnimatedGIF::getCanvasWidth()
+{
+    return _gif.iCanvasWidth;
+} /* getCanvasWidth() */
+
+int AnimatedGIF::getCanvasHeight()
+{
+    return _gif.iCanvasHeight;
+} /* getCanvasHeight() */
+
+int AnimatedGIF::getLoopCount()
+{
+    return _gif.iRepeatCount;
+} /* getLoopCount() */
+
+int AnimatedGIF::getInfo(GIFINFO *pInfo)
+{
+   return GIF_getInfo(&_gif, pInfo);
+} /* getInfo() */
+
+int AnimatedGIF::getLastError()
+{
+    return _gif.iError;
+} /* getLastError() */
+
+//
+// File (SD/MMC) based initialization
+//
+int AnimatedGIF::open(const char *szFilename, GIF_OPEN_CALLBACK *pfnOpen, GIF_CLOSE_CALLBACK *pfnClose, GIF_READ_CALLBACK *pfnRead, GIF_SEEK_CALLBACK *pfnSeek, GIF_DRAW_CALLBACK *pfnDraw)
+{
+    _gif.iError = GIF_SUCCESS;
+    _gif.pfnRead = pfnRead;
+    _gif.pfnSeek = pfnSeek;
+    _gif.pfnDraw = pfnDraw;
+    _gif.pfnOpen = pfnOpen;
+    _gif.pfnClose = pfnClose;
+    _gif.GIFFile.fHandle = (*pfnOpen)(szFilename, &_gif.GIFFile.iSize);
+    if (_gif.GIFFile.fHandle == NULL) {
+       _gif.iError = GIF_FILE_NOT_OPEN;
+       return 0;
+    }
+    return GIFInit(&_gif);
+
+} /* open() */
+
+void AnimatedGIF::close()
+{
+    if (_gif.pfnClose)
+        (*_gif.pfnClose)(_gif.GIFFile.fHandle);
+} /* close() */
+
+void AnimatedGIF::reset()
+{
+    (*_gif.pfnSeek)(&_gif.GIFFile, 0);
+} /* reset() */
+
+void AnimatedGIF::begin(unsigned char ucPaletteType)
+{
+    memset(&_gif, 0, sizeof(_gif));
+    if (ucPaletteType != GIF_PALETTE_RGB565_LE && ucPaletteType != GIF_PALETTE_RGB565_BE && ucPaletteType != GIF_PALETTE_RGB888)
+        _gif.iError = GIF_INVALID_PARAMETER;
+    _gif.ucPaletteType = ucPaletteType;
+    _gif.ucDrawType = GIF_DRAW_RAW; // assume RAW pixel handling
+    _gif.pFrameBuffer = NULL;
+} /* begin() */
+//
+// Play a single frame
+// returns:
+// 1 = good result and more frames exist
+// 0 = no more frames exist, a frame may or may not have been played: use getLastError() and look for GIF_SUCCESS to know if a frame was played
+// -1 = error
+int AnimatedGIF::playFrame(bool bSync, int *delayMilliseconds, void *pUser)
+{
+int rc;
+#if !defined( __MACH__ ) && !defined( __LINUX__ )
+long lTime = millis();
+#endif
+
+    if (_gif.GIFFile.iPos >= _gif.GIFFile.iSize-1) // no more data exists
+    {
+        (*_gif.pfnSeek)(&_gif.GIFFile, 0); // seek to start
+    }
+    if (GIFParseInfo(&_gif, 0))
+    {
+        _gif.pUser = pUser;
+        if (_gif.iError == GIF_EMPTY_FRAME) // don't try to decode it
+            return 0;
+        rc = DecodeLZW(&_gif, 0);
+        if (rc != 0) // problem
+            return -1;
+    }
+    else
+    {
+        // The file is "malformed" in that there is a bunch of non-image data after
+        // the last frame. Return as if all is well, though if needed getLastError()
+        // can be used to see if a frame was actually processed:
+        // GIF_SUCCESS -> frame processed, GIF_EMPTY_FRAME -> no frame processed
+        if (_gif.iError == GIF_EMPTY_FRAME)
+        {
+	    if (delayMilliseconds)
+                *delayMilliseconds = 0;
+            return 0;
+        }
+        return -1; // error parsing the frame info, we may be at the end of the file
+    }
+    // Return 1 for more frames or 0 if this was the last frame
+    if (bSync)
+    {
+#if !defined( __MACH__ ) && !defined( __LINUX__ )
+        lTime = millis() - lTime;
+        if (lTime < _gif.iFrameDelay) // need to pause a bit
+           delay(_gif.iFrameDelay - lTime);
+#endif // __LINUX__
+    }
+    if (delayMilliseconds) // if not NULL, return the frame delay time
+        *delayMilliseconds = _gif.iFrameDelay;
+    return (_gif.GIFFile.iPos < _gif.GIFFile.iSize-10);
+} /* playFrame() */
diff --git a/lib/AnimatedGIF/AnimatedGIF.h b/lib/AnimatedGIF/AnimatedGIF.h
new file mode 100644
index 0000000000..e1868bb6cd
--- /dev/null
+++ b/lib/AnimatedGIF/AnimatedGIF.h
@@ -0,0 +1,216 @@
+// Copyright 2020 BitBank Software, Inc. All Rights Reserved.
+// 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.
+//===========================================================================
+
+#ifndef __ANIMATEDGIF__
+#define __ANIMATEDGIF__
+#if defined( PICO_BUILD ) || defined( __MACH__ ) || defined( __LINUX__ ) || defined( __MCUXPRESSO )
+#include 
+#include 
+#include 
+#include 
+#define memcpy_P memcpy
+#define PROGMEM
+#else
+#include 
+#endif
+//
+// GIF Animator
+// Written by Larry Bank
+// Copyright (c) 2020 BitBank Software, Inc.
+// bitbank@pobox.com
+//
+// Designed to decode images up to 480x320
+// using less than 22K of RAM
+//
+
+/* GIF Defines and variables */
+#define MAX_CHUNK_SIZE 255
+#define LZW_BUF_SIZE (6*MAX_CHUNK_SIZE)
+#define LZW_HIGHWATER (4*MAX_CHUNK_SIZE)
+#ifdef __LINUX__
+#define MAX_WIDTH 2048
+#else
+#define MAX_WIDTH 320
+#endif // __LINUX__
+#define FILE_BUF_SIZE 4096
+
+#define PIXEL_FIRST 0
+#define PIXEL_LAST 4096
+#define LINK_UNUSED 5911 // 0x1717 to use memset
+#define LINK_END 5912
+#define MAX_HASH 5003
+#define MAXMAXCODE 4096
+
+enum {
+   GIF_PALETTE_RGB565_LE = 0, // little endian (default)
+   GIF_PALETTE_RGB565_BE,     // big endian
+   GIF_PALETTE_RGB888         // original 24-bpp entries
+};
+// for compatibility with older code
+#define LITTLE_ENDIAN_PIXELS GIF_PALETTE_RGB565_LE
+#define BIG_ENDIAN_PIXELS GIF_PALETTE_RGB565_BE
+//
+// Draw callback pixel type
+// RAW = 8-bit palettized pixels requiring transparent pixel handling
+// COOKED = 16 or 24-bpp fully rendered pixels ready for display
+//
+enum {
+   GIF_DRAW_RAW = 0,
+   GIF_DRAW_COOKED
+};
+
+enum {
+   GIF_SUCCESS = 0,
+   GIF_DECODE_ERROR,
+   GIF_TOO_WIDE,
+   GIF_INVALID_PARAMETER,
+   GIF_UNSUPPORTED_FEATURE,
+   GIF_FILE_NOT_OPEN,
+   GIF_EARLY_EOF,
+   GIF_EMPTY_FRAME,
+   GIF_BAD_FILE,
+   GIF_ERROR_MEMORY
+};
+
+typedef struct gif_file_tag
+{
+  int32_t iPos; // current file position
+  int32_t iSize; // file size
+  uint8_t *pData; // memory file pointer
+  void * fHandle; // class pointer to File/SdFat or whatever you want
+} GIFFILE;
+
+typedef struct gif_info_tag
+{
+  int32_t iFrameCount; // total frames in file
+  int32_t iDuration; // duration of animation in milliseconds
+  int32_t iMaxDelay; // maximum frame delay
+  int32_t iMinDelay; // minimum frame delay
+} GIFINFO;
+
+typedef struct gif_draw_tag
+{
+    int iX, iY; // Corner offset of this frame on the canvas
+    int y; // current line being drawn (0 = top line of image)
+    int iWidth, iHeight; // size of this frame
+    void *pUser; // user supplied pointer
+    uint8_t *pPixels; // 8-bit source pixels for this line
+    uint16_t *pPalette; // little or big-endian RGB565 palette entries (default)
+    uint8_t *pPalette24; // RGB888 palette (optional)
+    uint8_t ucTransparent; // transparent color
+    uint8_t ucHasTransparency; // flag indicating the transparent color is in use
+    uint8_t ucDisposalMethod; // frame disposal method
+    uint8_t ucBackground; // background color
+    uint8_t ucIsGlobalPalette; // Flag to indicate that a global palette, rather than a local palette is being used
+} GIFDRAW;
+
+// Callback function prototypes
+typedef int32_t (GIF_READ_CALLBACK)(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
+typedef int32_t (GIF_SEEK_CALLBACK)(GIFFILE *pFile, int32_t iPosition);
+typedef void (GIF_DRAW_CALLBACK)(GIFDRAW *pDraw);
+typedef void * (GIF_OPEN_CALLBACK)(const char *szFilename, int32_t *pFileSize);
+typedef void (GIF_CLOSE_CALLBACK)(void *pHandle);
+typedef void * (GIF_ALLOC_CALLBACK)(uint32_t iSize);
+typedef void (GIF_FREE_CALLBACK)(void *buffer);
+//
+// our private structure to hold a GIF image decode state
+//
+typedef struct gif_image_tag
+{
+    int iWidth, iHeight, iCanvasWidth, iCanvasHeight;
+    int iX, iY; // GIF corner offset
+    int iBpp;
+    int iError; // last error
+    int iFrameDelay; // delay in milliseconds for this frame
+    int iRepeatCount; // NETSCAPE animation repeat count. 0=forever
+    int iXCount, iYCount; // decoding position in image (countdown values)
+    int iLZWOff; // current LZW data offset
+    int iLZWSize; // current quantity of data in the LZW buffer
+    int iCommentPos; // file offset of start of comment data
+    short sCommentLen; // length of comment
+    GIF_READ_CALLBACK *pfnRead;
+    GIF_SEEK_CALLBACK *pfnSeek;
+    GIF_DRAW_CALLBACK *pfnDraw;
+    GIF_OPEN_CALLBACK *pfnOpen;
+    GIF_CLOSE_CALLBACK *pfnClose;
+    GIFFILE GIFFile;
+    void *pUser;
+    unsigned char *pFrameBuffer;
+    unsigned char *pPixels, *pOldPixels;
+    unsigned char ucLineBuf[MAX_WIDTH]; // current line
+    unsigned char ucFileBuf[FILE_BUF_SIZE]; // holds temp data and pixel stack
+    unsigned short pPalette[384]; // can hold RGB565 or RGB888 - set in begin()
+    unsigned short pLocalPalette[384]; // color palettes for GIF images
+    unsigned char ucLZW[LZW_BUF_SIZE]; // holds 6 chunks (6x255) of GIF LZW data packed together
+    unsigned short usGIFTable[4096];
+    unsigned char ucGIFPixels[8192];
+    unsigned char bEndOfFrame;
+    unsigned char ucGIFBits, ucBackground, ucTransparent, ucCodeStart, ucMap, bUseLocalPalette;
+    unsigned char ucPaletteType; // RGB565 or RGB888
+    unsigned char ucDrawType; // RAW or COOKED
+} GIFIMAGE;
+
+#ifdef __cplusplus
+//
+// The GIF class wraps portable C code which does the actual work
+//
+class AnimatedGIF
+{
+  public:
+    int open(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw);
+    int openFLASH(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw);
+    int open(const char *szFilename, GIF_OPEN_CALLBACK *pfnOpen, GIF_CLOSE_CALLBACK *pfnClose, GIF_READ_CALLBACK *pfnRead, GIF_SEEK_CALLBACK *pfnSeek, GIF_DRAW_CALLBACK *pfnDraw);
+    void close();
+    void reset();
+    void begin(unsigned char ucPaletteType = GIF_PALETTE_RGB565_LE);
+    void begin(int iEndian, unsigned char ucPaletteType) { begin(ucPaletteType); };
+    int playFrame(bool bSync, int *delayMilliseconds, void *pUser = NULL);
+    int getCanvasWidth();
+    int allocFrameBuf(GIF_ALLOC_CALLBACK *pfnAlloc);
+    int setDrawType(int iType);
+    int freeFrameBuf(GIF_FREE_CALLBACK *pfnFree);
+    uint8_t *getFrameBuf();
+    int getCanvasHeight();
+    int getLoopCount();
+    int getInfo(GIFINFO *pInfo);
+    int getLastError();
+    int getComment(char *destBuffer);
+
+  private:
+    GIFIMAGE _gif;
+};
+#else
+// C interface
+    int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw);
+    int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw);
+    void GIF_close(GIFIMAGE *pGIF);
+    void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType);
+    void GIF_reset(GIFIMAGE *pGIF);
+    int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser);
+    int GIF_getCanvasWidth(GIFIMAGE *pGIF);
+    int GIF_getCanvasHeight(GIFIMAGE *pGIF);
+    int GIF_getComment(GIFIMAGE *pGIF, char *destBuffer);
+    int GIF_getInfo(GIFIMAGE *pGIF, GIFINFO *pInfo);
+    int GIF_getLastError(GIFIMAGE *pGIF);
+    int GIF_getLoopCount(GIFIMAGE *pGIF);
+#endif // __cplusplus
+
+// Due to unaligned memory causing an exception, we have to do these macros the slow way
+#define INTELSHORT(p) ((*p) + (*(p+1)<<8))
+#define INTELLONG(p) ((*p) + (*(p+1)<<8) + (*(p+2)<<16) + (*(p+3)<<24))
+#define MOTOSHORT(p) (((*(p))<<8) + (*(p+1)))
+#define MOTOLONG(p) (((*p)<<24) + ((*(p+1))<<16) + ((*(p+2))<<8) + (*(p+3)))
+
+// Must be a 32-bit target processor
+#define REGISTER_WIDTH 32
+
+#endif // __ANIMATEDGIF__
diff --git a/shared-module/displayio/AnimatedGIF_circuitpy.h b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h
similarity index 99%
rename from shared-module/displayio/AnimatedGIF_circuitpy.h
rename to lib/AnimatedGIF/AnimatedGIF_circuitpy.h
index f81108695c..e401935a95 100644
--- a/shared-module/displayio/AnimatedGIF_circuitpy.h
+++ b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h
@@ -9,6 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // ===========================================================================
+//
+// Modified 2023 by Mark Komus to work for CircuitPython
+//
 
 #ifndef __ANIMATEDGIF__
 #define __ANIMATEDGIF__
diff --git a/lib/AnimatedGIF/README.md b/lib/AnimatedGIF/README.md
new file mode 100644
index 0000000000..25b8cd59b7
--- /dev/null
+++ b/lib/AnimatedGIF/README.md
@@ -0,0 +1,5 @@
+This library is from the AnimatedGIF Arduino GIF decoder by Larry Bank.
+Released under the Apache License 2.0
+[AnimatedGIF](https://github.com/bitbank2/AnimatedGIF)
+
+It has been modified for use in CircuitPython by Mark Komus.
diff --git a/shared-module/displayio/gif.c b/lib/AnimatedGIF/gif.c
similarity index 60%
rename from shared-module/displayio/gif.c
rename to lib/AnimatedGIF/gif.c
index a4ad31608d..00a0137562 100644
--- a/shared-module/displayio/gif.c
+++ b/lib/AnimatedGIF/gif.c
@@ -17,14 +17,12 @@
 // 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.
-// ===========================================================================
-#define __LINUX__
+//===========================================================================
+//
+// Modified 2023 by Mark Komus to work for CircuitPython
+//
 #include "AnimatedGIF_circuitpy.h"
 
-#include "py/mperrno.h"
-#include "py/runtime.h"
-
-
 #ifdef HAL_ESP32_HAL_H_
 #define memcpy_P memcpy
 #endif
@@ -40,13 +38,16 @@ static int DecodeLZW(GIFIMAGE *pImage, int iOptions);
 static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
 static int32_t seekMem(GIFFILE *pFile, int32_t iPosition);
 int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo);
-#if defined(PICO_BUILD) || defined(__LINUX__) || defined(__MCUXPRESSO)
+
+#if defined ( __LINUX__ ) || defined( __MCUXPRESSO )
 static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen);
 static int32_t seekFile(GIFFILE *pFile, int32_t iPosition);
 static void closeFile(void *handle);
+#endif
 
 // C API
-int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) {
+int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw)
+{
     pGIF->iError = GIF_SUCCESS;
     pGIF->pfnRead = readMem;
     pGIF->pfnSeek = seekMem;
@@ -59,7 +60,8 @@ int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK
 } /* GIF_openRAM() */
 
 #ifdef __LINUX__
-int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw) {
+int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw)
+{
     pGIF->iError = GIF_SUCCESS;
     pGIF->pfnRead = readFile;
     pGIF->pfnSeek = seekFile;
@@ -67,9 +69,8 @@ int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnD
     pGIF->pfnOpen = NULL;
     pGIF->pfnClose = closeFile;
     pGIF->GIFFile.fHandle = fopen(szFilename, "r+b");
-    if (pGIF->GIFFile.fHandle == NULL) {
-        return 0;
-    }
+    if (pGIF->GIFFile.fHandle == NULL)
+       return 0;
     fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_END);
     pGIF->GIFFile.iSize = (int)ftell((FILE *)pGIF->GIFFile.fHandle);
     fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_SET);
@@ -77,18 +78,20 @@ int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnD
 } /* GIF_openFile() */
 #endif
 
-void GIF_close(GIFIMAGE *pGIF) {
-    if (pGIF->pfnClose) {
+void GIF_close(GIFIMAGE *pGIF)
+{
+    if (pGIF->pfnClose)
         (*pGIF->pfnClose)(pGIF->GIFFile.fHandle);
-    }
 } /* GIF_close() */
 
-void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType) {
+void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType)
+{
     memset(pGIF, 0, sizeof(GIFIMAGE));
     pGIF->ucPaletteType = ucPaletteType;
 } /* GIF_begin() */
 
-void GIF_reset(GIFIMAGE *pGIF) {
+void GIF_reset(GIFIMAGE *pGIF)
+{
     (*pGIF->pfnSeek)(&pGIF->GIFFile, 0);
 } /* GIF_reset() */
 
@@ -98,48 +101,53 @@ void GIF_reset(GIFIMAGE *pGIF) {
 // 0 = good decode, no more frames
 // -1 = error
 //
-int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser) {
-    int rc;
+int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser)
+{
+int rc;
 
-    if (delayMilliseconds) {
-        *delayMilliseconds = 0; // clear any old valid
-    }
-    if (pGIF->GIFFile.iPos >= pGIF->GIFFile.iSize - 1) { // no more data exists
+    if (delayMilliseconds)
+       *delayMilliseconds = 0; // clear any old valid
+    if (pGIF->GIFFile.iPos >= pGIF->GIFFile.iSize-1) // no more data exists
+    {
         (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek to start
     }
-    if (GIFParseInfo(pGIF, 0)) {
+    if (GIFParseInfo(pGIF, 0))
+    {
         pGIF->pUser = pUser;
-        if (pGIF->iError == GIF_EMPTY_FRAME) { // don't try to decode it
+        if (pGIF->iError == GIF_EMPTY_FRAME) // don't try to decode it
             return 0;
-        }
         rc = DecodeLZW(pGIF, 0);
-        if (rc != 0) { // problem
+        if (rc != 0) // problem
             return 0;
-        }
-    } else {
+    }
+    else
+    {
         return 0; // error parsing the frame info, we may be at the end of the file
     }
     // Return 1 for more frames or 0 if this was the last frame
-    if (delayMilliseconds) { // if not NULL, return the frame delay time
+    if (delayMilliseconds) // if not NULL, return the frame delay time
         *delayMilliseconds = pGIF->iFrameDelay;
-    }
-    return pGIF->GIFFile.iPos < pGIF->GIFFile.iSize - 1;
+    return (pGIF->GIFFile.iPos < pGIF->GIFFile.iSize-1);
 } /* GIF_playFrame() */
 
-int GIF_getCanvasWidth(GIFIMAGE *pGIF) {
+int GIF_getCanvasWidth(GIFIMAGE *pGIF)
+{
     return pGIF->iCanvasWidth;
 } /* GIF_getCanvasWidth() */
 
-int GIF_getCanvasHeight(GIFIMAGE *pGIF) {
+int GIF_getCanvasHeight(GIFIMAGE *pGIF)
+{
     return pGIF->iCanvasHeight;
 } /* GIF_getCanvasHeight() */
 
-int GIF_getLoopCount(GIFIMAGE *pGIF) {
+int GIF_getLoopCount(GIFIMAGE *pGIF)
+{
     return pGIF->iRepeatCount;
 } /* GIF_getLoopCount() */
 
-int GIF_getComment(GIFIMAGE *pGIF, char *pDest) {
-    int32_t iOldPos;
+int GIF_getComment(GIFIMAGE *pGIF, char *pDest)
+{
+int32_t iOldPos;
 
     iOldPos = pGIF->GIFFile.iPos; // keep old position
     (*pGIF->pfnSeek)(&pGIF->GIFFile, pGIF->iCommentPos);
@@ -150,7 +158,8 @@ int GIF_getComment(GIFIMAGE *pGIF, char *pDest) {
 
 } /* GIF_getComment() */
 
-int GIF_getLastError(GIFIMAGE *pGIF) {
+int GIF_getLastError(GIFIMAGE *pGIF)
+{
     return pGIF->iError;
 } /* GIF_getLastError() */
 
@@ -158,26 +167,24 @@ int GIF_init(GIFIMAGE *pGIF) {
     return GIFInit(pGIF);
 }
 
-#endif // !__cplusplus
 //
 // Helper functions for memory based images
 //
-static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
+static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
+{
     int32_t iBytesRead;
 
     iBytesRead = iLen;
-    if ((pFile->iSize - pFile->iPos) < iLen) {
-        iBytesRead = pFile->iSize - pFile->iPos;
-    }
-    if (iBytesRead <= 0) {
-        return 0;
-    }
+    if ((pFile->iSize - pFile->iPos) < iLen)
+       iBytesRead = pFile->iSize - pFile->iPos;
+    if (iBytesRead <= 0)
+       return 0;
     memmove(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
     pFile->iPos += iBytesRead;
     return iBytesRead;
 } /* readMem() */
 
-/*
+#ifndef CIRCUITPY
 static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
 {
     int32_t iBytesRead;
@@ -190,44 +197,41 @@ static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
     memcpy_P(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
     pFile->iPos += iBytesRead;
     return iBytesRead;
-} *//* readFLASH() */
+} /* readFLASH() */
+#endif
 
-static int32_t seekMem(GIFFILE *pFile, int32_t iPosition) {
-    if (iPosition < 0) {
-        iPosition = 0;
-    } else if (iPosition >= pFile->iSize) {
-        iPosition = pFile->iSize - 1;
-    }
+static int32_t seekMem(GIFFILE *pFile, int32_t iPosition)
+{
+    if (iPosition < 0) iPosition = 0;
+    else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1;
     pFile->iPos = iPosition;
     return iPosition;
 } /* seekMem() */
 
-#if defined(__LINUX__) || defined(__MCUXPRESSO)
-static void closeFile(void *handle) {
+#if defined ( __LINUX__ ) || defined( __MCUXPRESSO )
+static void closeFile(void *handle)
+{
     fclose((FILE *)handle);
 } /* closeFile() */
 
-static int32_t seekFile(GIFFILE *pFile, int32_t iPosition) {
-    if (iPosition < 0) {
-        iPosition = 0;
-    } else if (iPosition >= pFile->iSize) {
-        iPosition = pFile->iSize - 1;
-    }
+static int32_t seekFile(GIFFILE *pFile, int32_t iPosition)
+{
+    if (iPosition < 0) iPosition = 0;
+    else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1;
     pFile->iPos = iPosition;
     fseek((FILE *)pFile->fHandle, iPosition, SEEK_SET);
     return iPosition;
 } /* seekMem() */
 
-static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
+static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
+{
     int32_t iBytesRead;
 
     iBytesRead = iLen;
-    if ((pFile->iSize - pFile->iPos) < iLen) {
-        iBytesRead = pFile->iSize - pFile->iPos;
-    }
-    if (iBytesRead <= 0) {
-        return 0;
-    }
+    if ((pFile->iSize - pFile->iPos) < iLen)
+       iBytesRead = pFile->iSize - pFile->iPos;
+    if (iBytesRead <= 0)
+       return 0;
     iBytesRead = (int)fread(pBuf, 1, iBytesRead, (FILE *)pFile->fHandle);
     pFile->iPos += iBytesRead;
     return iBytesRead;
@@ -243,17 +247,17 @@ static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
 // returns 1 for success, 0 for failure
 // Fills in the canvas size of the GIFIMAGE structure
 //
-static int GIFInit(GIFIMAGE *pGIF) {
+static int GIFInit(GIFIMAGE *pGIF)
+{
     pGIF->GIFFile.iPos = 0; // start at beginning of file
-    if (!GIFParseInfo(pGIF, 1)) { // gather info for the first frame
-        return 0; // something went wrong; not a GIF file?
-    }
+    if (!GIFParseInfo(pGIF, 1)) // gather info for the first frame
+       return 0; // something went wrong; not a GIF file?
     (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek back to start of the file
     if (pGIF->iCanvasWidth > MAX_WIDTH) { // need to allocate more space
         pGIF->iError = GIF_TOO_WIDE;
         return 0;
     }
-    return 1;
+  return 1;
 } /* GIFInit() */
 
 //
@@ -262,7 +266,8 @@ static int GIFInit(GIFIMAGE *pGIF) {
 // and return the canvas size only
 // Returns 1 for success, 0 for failure
 //
-static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
+static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
+{
     int i, j, iColorTableBits;
     int iBytesRead;
     unsigned char c, *p;
@@ -276,92 +281,97 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
     pPage->iRepeatCount = -1; // assume NETSCAPE loop count is not specified
     iReadSize = (bInfoOnly) ? 12 : MAX_CHUNK_SIZE;
     // If you try to read past the EOF, the SD lib will return garbage data
-    if (iStartPos + iReadSize > pPage->GIFFile.iSize) {
-        iReadSize = (pPage->GIFFile.iSize - iStartPos - 1);
-    }
+    if (iStartPos + iReadSize > pPage->GIFFile.iSize)
+       iReadSize = (pPage->GIFFile.iSize - iStartPos - 1);
     p = pPage->ucFileBuf;
-    iBytesRead = (*pPage->pfnRead)(&pPage->GIFFile, pPage->ucFileBuf, iReadSize);  // 255 is plenty for now
+    iBytesRead =  (*pPage->pfnRead)(&pPage->GIFFile, pPage->ucFileBuf, iReadSize); // 255 is plenty for now
 
-    if (iBytesRead != iReadSize) { // we're at the end of the file
-        pPage->iError = GIF_EARLY_EOF;
-        return 0;
+    if (iBytesRead != iReadSize) // we're at the end of the file
+    {
+       pPage->iError = GIF_EARLY_EOF;
+       return 0;
     }
-    if (iStartPos == 0) { // start of the file
-        // canvas size
-        if (memcmp(p, "GIF89", 5) != 0 && memcmp(p, "GIF87", 5) != 0) { // not a GIF file
-            pPage->iError = GIF_BAD_FILE;
-            return 0;
+    if (iStartPos == 0) // start of the file
+    { // canvas size
+        if (memcmp(p, "GIF89", 5) != 0 && memcmp(p, "GIF87", 5) != 0) // not a GIF file
+        {
+           pPage->iError = GIF_BAD_FILE;
+           return 0;
         }
         pPage->iCanvasWidth = pPage->iWidth = INTELSHORT(&p[6]);
         pPage->iCanvasHeight = pPage->iHeight = INTELSHORT(&p[8]);
         pPage->iBpp = ((p[10] & 0x70) >> 4) + 1;
-        if (bInfoOnly) {
-            return 1; // we've got the info we needed, leave
-        }
+        if (bInfoOnly)
+           return 1; // we've got the info we needed, leave
         iColorTableBits = (p[10] & 7) + 1; // Log2(size) of the color table
         pPage->ucBackground = p[11]; // background color
         pPage->ucGIFBits = 0;
         iOffset = 13;
-        if (p[10] & 0x80) { // global color table?
-            // by default, convert to byte-reversed RGB565 for immediate use
+        if (p[10] & 0x80) // global color table?
+        { // by default, convert to byte-reversed RGB565 for immediate use
             // Read enough additional data for the color table
-            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3 * (1 << iColorTableBits));
-            if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
-                for (i = 0; i < (1 << iColorTableBits); i++)
+            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3*(1<ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
+            {
+                for (i=0; i<(1<> 3) << 11); // R
-                    usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
-                    usRGB565 |= (p[iOffset + 2] >> 3); // B
-                    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) {
+                    usRGB565 |= ((p[iOffset+1] >> 2) << 5); // G
+                    usRGB565 |= (p[iOffset+2] >> 3); // B
+                    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE)
                         pPage->pPalette[i] = usRGB565;
-                    } else {
+                    else
                         pPage->pPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
-                    }
                     iOffset += 3;
                 }
-            } else { // just copy it as-is
-                memcpy(pPage->pPalette, &p[iOffset], (1 << iColorTableBits) * 3);
+            }
+            else // just copy it as-is
+            {
+                memcpy(pPage->pPalette, &p[iOffset], (1<ucGIFBits = p[iOffset + 1]; // packed fields
-                        pPage->iFrameDelay = (INTELSHORT(&p[iOffset + 2])) * 10; // delay in ms
-                        if (pPage->iFrameDelay <= 1) { // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute
-                            pPage->iFrameDelay = 100;
-                        }
-                        if (pPage->ucGIFBits & 1) { // transparent color is used
-                            pPage->ucTransparent = p[iOffset + 4]; // transparent color index
-                        }
+                    if (p[iOffset] == 4) // correct length
+                    {
+                        pPage->ucGIFBits = p[iOffset+1]; // packed fields
+                        pPage->iFrameDelay = (INTELSHORT(&p[iOffset+2]))*10; // delay in ms
+                        if (pPage->iFrameDelay <= 1) // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute
+                           pPage->iFrameDelay = 100;
+                        if (pPage->ucGIFBits & 1) // transparent color is used
+                            pPage->ucTransparent = p[iOffset+4]; // transparent color index
                         iOffset += 6;
                     }
                     //                     else   // error
                     break;
                 case 0xff: /* App extension */
                     c = 1;
-                    while (c) { /* Skip all data sub-blocks */
+                    while (c) /* Skip all data sub-blocks */
+                    {
                         c = p[iOffset++]; /* Block length */
-                        if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first
-                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down
+                        if ((iBytesRead - iOffset) < (c+32)) // need to read more data first
+                        {
+                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down
                             iBytesRead -= iOffset;
                             iStartPos += iOffset;
                             iOffset = 0;
-                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32);
+                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c+32);
                         }
-                        if (c == 11) { // fixed block length
-                            // Netscape app block contains the repeat count
-                            if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0) {
-                                if (p[iOffset + 11] == 3 && p[iOffset + 12] == 1) { // loop count
-                                    pPage->iRepeatCount = INTELSHORT(&p[iOffset + 13]);
-                                }
+                        if (c == 11) // fixed block length
+                        { // Netscape app block contains the repeat count
+                            if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0)
+                            {
+                                if (p[iOffset+11] == 3 && p[iOffset+12] == 1) // loop count
+                                    pPage->iRepeatCount = INTELSHORT(&p[iOffset+13]);
                             }
                         }
                         iOffset += (int)c; /* Skip to next sub-block */
@@ -370,13 +380,14 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
                 case 0x01: /* Text extension */
                     c = 1;
                     j = 0;
-                    while (c) { /* Skip all data sub-blocks */
+                    while (c) /* Skip all data sub-blocks */
+                    {
                         c = p[iOffset++]; /* Block length */
-                        if (j == 0) { // use only first block
+                        if (j == 0) // use only first block
+                        {
                             j = c;
-                            if (j > 127) { // max comment length = 127
+                            if (j > 127)   // max comment length = 127
                                 j = 127;
-                            }
                             //                           memcpy(pPage->szInfo1, &p[iOffset], j);
                             //                           pPage->szInfo1[j] = '\0';
                             j = 1;
@@ -386,16 +397,19 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
                     break;
                 case 0xfe: /* Comment */
                     c = 1;
-                    while (c) { /* Skip all data sub-blocks */
+                    while (c) /* Skip all data sub-blocks */
+                    {
                         c = p[iOffset++]; /* Block length */
-                        if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first
-                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down
+                        if ((iBytesRead - iOffset) < (c+32)) // need to read more data first
+                        {
+                            memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down
                             iBytesRead -= iOffset;
                             iStartPos += iOffset;
                             iOffset = 0;
-                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32);
+                            iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c+32);
                         }
-                        if (pPage->iCommentPos == 0) { // Save first block info
+                        if (pPage->iCommentPos == 0) // Save first block info
+                        {
                             pPage->iCommentPos = iStartPos + iOffset;
                             pPage->sCommentLen = c;
                         }
@@ -407,13 +421,14 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
                     pPage->iError = GIF_DECODE_ERROR;
                     return 0;
             } /* switch */
-        } else { // invalid byte, stop decoding
-            if (pPage->GIFFile.iSize - iStartPos < 32) { // non-image bytes at end of file?
+        }
+        else // invalid byte, stop decoding
+        {
+            if (pPage->GIFFile.iSize - iStartPos < 32) // non-image bytes at end of file?
                 pPage->iError = GIF_EMPTY_FRAME;
-            } else {
+            else
                 /* Bad header info */
                 pPage->iError = GIF_DECODE_ERROR;
-            }
             return 0;
         }
     } /* while */
@@ -422,14 +437,13 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
         return 1;
     }
 
-    if (p[iOffset] == ',') {
+    if (p[iOffset] == ',')
         iOffset++;
-    }
     // This particular frame's size and position on the main frame (if animated)
     pPage->iX = INTELSHORT(&p[iOffset]);
-    pPage->iY = INTELSHORT(&p[iOffset + 2]);
-    pPage->iWidth = INTELSHORT(&p[iOffset + 4]);
-    pPage->iHeight = INTELSHORT(&p[iOffset + 6]);
+    pPage->iY = INTELSHORT(&p[iOffset+2]);
+    pPage->iWidth = INTELSHORT(&p[iOffset+4]);
+    pPage->iHeight = INTELSHORT(&p[iOffset+6]);
     iOffset += 8;
 
     /* Image descriptor
@@ -440,28 +454,30 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
      pixel+1 = # bits per pixel for this image
      */
     pPage->ucMap = p[iOffset++];
-    if (pPage->ucMap & 0x80) { // local color table?
-        // by default, convert to byte-reversed RGB565 for immediate use
-        j = (1 << ((pPage->ucMap & 7) + 1));
+    if (pPage->ucMap & 0x80) // local color table?
+    {// by default, convert to byte-reversed RGB565 for immediate use
+        j = (1<<((pPage->ucMap & 7)+1));
         // Read enough additional data for the color table
-        iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j *3);
-        if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
-            for (i = 0; i < j; i++)
+        iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j*3);
+        if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
+        {
+            for (i=0; i> 3) << 11); // R
-                usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
-                usRGB565 |= (p[iOffset + 2] >> 3); // B
-                if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) {
+                usRGB565 |= ((p[iOffset+1] >> 2) << 5); // G
+                usRGB565 |= (p[iOffset+2] >> 3); // B
+                if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE)
                     pPage->pLocalPalette[i] = usRGB565;
-                } else {
+                else
                     pPage->pLocalPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
-                }
                 iOffset += 3;
             }
-        } else { // just copy it as-is
+        }
+        else // just copy it as-is
+        {
             memcpy(pPage->pLocalPalette, &p[iOffset], j * 3);
-            iOffset += j * 3;
+            iOffset += j*3;
         }
         pPage->bUseLocalPalette = 1;
     }
@@ -470,40 +486,45 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) {
     pPage->iBpp = cGIFBits[pPage->ucCodeStart];
     // we are re-using the same buffer turning GIF file data
     // into "pure" LZW
-    pPage->iLZWSize = 0; // we're starting with no LZW data yet
-    c = 1; // get chunk length
-    while (c && iOffset < iBytesRead) {
+   pPage->iLZWSize = 0; // we're starting with no LZW data yet
+   c = 1; // get chunk length
+   while (c && iOffset < iBytesRead)
+   {
 //     Serial.printf("iOffset=%d, iBytesRead=%d\n", iOffset, iBytesRead);
-        c = p[iOffset++]; // get chunk length
+     c = p[iOffset++]; // get chunk length
 //     Serial.printf("Chunk size = %d\n", c);
-        if (c <= (iBytesRead - iOffset)) {
-            memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c);
-            pPage->iLZWSize += c;
-            iOffset += c;
-        } else { // partial chunk in our buffer
-            int iPartialLen = (iBytesRead - iOffset);
-            memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen);
-            pPage->iLZWSize += iPartialLen;
-            iOffset += iPartialLen;
-            (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c - iPartialLen);
-            pPage->iLZWSize += (c - iPartialLen);
-        }
-        if (c == 0) {
-            pPage->bEndOfFrame = 1; // signal not to read beyond the end of the frame
-        }
-    }
+     if (c <= (iBytesRead - iOffset))
+     {
+       memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c);
+       pPage->iLZWSize += c;
+       iOffset += c;
+     }
+     else // partial chunk in our buffer
+     {
+       int iPartialLen = (iBytesRead - iOffset);
+       memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen);
+       pPage->iLZWSize += iPartialLen;
+       iOffset += iPartialLen;
+       (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c - iPartialLen);
+       pPage->iLZWSize += (c - iPartialLen);
+     }
+     if (c == 0)
+        pPage->bEndOfFrame = 1; // signal not to read beyond the end of the frame
+   }
 // seeking on an SD card is VERY VERY SLOW, so use the data we've already read by de-chunking it
 // in this case, there's too much data, so we have to seek backwards a bit
-    if (iOffset < iBytesRead) {
+   if (iOffset < iBytesRead)
+   {
 //     Serial.printf("Need to seek back %d bytes\n", iBytesRead - iOffset);
-        (*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot
-    }
+     (*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot
+   }
     return 1; // we are now at the start of the chunk data
 } /* GIFParseInfo() */
 //
 // Gather info about an animated GIF file
 //
-int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
+int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
+{
     int iOff, iNumFrames;
     int iDelay, iMaxDelay, iMinDelay, iTotalDelay;
     int iReadAmount;
@@ -518,7 +539,7 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
     iMinDelay = 10000;
     iNumFrames = 1;
     iDataRemaining = pPage->GIFFile.iSize;
-    cBuf = (uint8_t *)pPage->ucFileBuf;
+    cBuf = (uint8_t *) pPage->ucFileBuf;
     (*pPage->pfnSeek)(&pPage->GIFFile, 0);
     iDataAvailable = (*pPage->pfnRead)(&pPage->GIFFile, cBuf, FILE_BUF_SIZE);
     iDataRemaining -= iDataAvailable;
@@ -526,68 +547,72 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
     iOff = 10;
     c = cBuf[iOff]; // get info bits
     iOff += 3;   /* Skip flags, background color & aspect ratio */
-    if (c & 0x80) { /* Deal with global color table */
+    if (c & 0x80) /* Deal with global color table */
+    {
         c &= 7;  /* Get the number of colors defined */
-        iOff += (2 << c) * 3; /* skip color table */
+        iOff += (2<pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
+                iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable);
                 iDataAvailable += iReadAmount;
                 iDataRemaining -= iReadAmount;
                 lFileOff += iReadAmount;
             }
-            switch (cBuf[iOff])
+            switch(cBuf[iOff])
             {
                 case 0x3b: /* End of file */
                     /* we were fooled into thinking there were more pages */
                     iNumFrames--;
                     goto gifpagesz;
-                // F9 = Graphic Control Extension (fixed length of 4 bytes)
-                // FE = Comment Extension
-                // FF = Application Extension
-                // 01 = Plain Text Extension
+    // F9 = Graphic Control Extension (fixed length of 4 bytes)
+    // FE = Comment Extension
+    // FF = Application Extension
+    // 01 = Plain Text Extension
                 case 0x21: /* Extension block */
-                    if (cBuf[iOff + 1] == 0xf9 && cBuf[iOff + 2] == 4) { // Graphic Control Extension
-                        // cBuf[iOff+3]; // page disposition flags
-                        iDelay = cBuf[iOff + 4]; // delay low byte
-                        iDelay |= ((uint16_t)(cBuf[iOff + 5]) << 8); // delay high byte
-                        if (iDelay < 2) { // too fast, provide a default
+                    if (cBuf[iOff+1] == 0xf9 && cBuf[iOff+2] == 4) // Graphic Control Extension
+                    {
+                       //cBuf[iOff+3]; // page disposition flags
+                        iDelay = cBuf[iOff+4]; // delay low byte
+                        iDelay |= ((uint16_t)(cBuf[iOff+5]) << 8); // delay high byte
+                        if (iDelay < 2) // too fast, provide a default
                             iDelay = 2;
-                        }
                         iDelay *= 10; // turn JIFFIES into milliseconds
                         iTotalDelay += iDelay;
-                        if (iDelay > iMaxDelay) {
-                            iMaxDelay = iDelay;
-                        } else if (iDelay < iMinDelay) {
-                            iMinDelay = iDelay;
-                        }
-                        // (cBuf[iOff+6]; // transparent color index
+                        if (iDelay > iMaxDelay) iMaxDelay = iDelay;
+                        else if (iDelay < iMinDelay) iMinDelay = iDelay;
+                       // (cBuf[iOff+6]; // transparent color index
                     }
                     iOff += 2; /* skip to length */
                     iOff += (int)cBuf[iOff]; /* Skip the data block */
                     iOff++;
-                    // block terminator or optional sub blocks
+                   // block terminator or optional sub blocks
                     c = cBuf[iOff++]; /* Skip any sub-blocks */
-                    while (c) {
-                        iOff += (int)c;
-                        c = cBuf[iOff++];
-                        if ((iDataAvailable - iOff) < (c + 258)) { // need to read more data first
-                            memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+                    while (c)
+                       {
+                       iOff += (int)c;
+                       c = cBuf[iOff++];
+                       if ((iDataAvailable - iOff) < (c+258)) // need to read more data first
+                        {
+                            memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down
                             iDataAvailable -= iOff;
                             iOff = 0;
-                            iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
+                            iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable);
                             iDataAvailable += iReadAmount;
                             iDataRemaining -= iReadAmount;
                             lFileOff += iReadAmount;
                         }
                     }
-                    if (c != 0) { // problem, we went past the end
+                    if (c != 0) // problem, we went past the end
+                    {
                         iNumFrames--; // possible corrupt data; stop
                         goto gifpagesz;
                     }
@@ -596,47 +621,51 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
                     bExt = 0; /* Stop doing extension blocks */
                     break;
                 default:
-                    /* Corrupt data, stop here */
+                   /* Corrupt data, stop here */
                     iNumFrames--;
                     goto gifpagesz;
             } // switch
         } // while
-        if (iOff >= iDataAvailable) { // problem
-            iNumFrames--;  // possible corrupt data; stop
-            goto gifpagesz;
+        if (iOff >= iDataAvailable) // problem
+        {
+             iNumFrames--; // possible corrupt data; stop
+             goto gifpagesz;
         }
-        /* Start of image data */
-        c = cBuf[iOff + 9]; /* Get the flags byte */
+          /* Start of image data */
+        c = cBuf[iOff+9]; /* Get the flags byte */
         iOff += 10; /* Skip image position and size */
-        if (c & 0x80) { /* Local color table */
+        if (c & 0x80) /* Local color table */
+        {
             c &= 7;
-            iOff += (2 << c) * 3;
+            iOff += (2<pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable);
-            iDataAvailable += iReadAmount;
-            iDataRemaining -= iReadAmount;
-            lFileOff += iReadAmount;
-        }
+        if ((iDataAvailable - iOff) < (c+258)) // need to read more data first
+         {
+             if (iOff < iDataAvailable) {
+                 memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down
+                 iDataAvailable -= iOff;
+                 iOff = 0;
+             } else { // already points beyond end
+                 iOff -= iDataAvailable;
+                 iDataAvailable = 0;
+             }
+             iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable);
+             iDataAvailable += iReadAmount;
+             iDataRemaining -= iReadAmount;
+             lFileOff += iReadAmount;
+         }
         c = cBuf[iOff++];
-        while (c) { /* While there are more data blocks */
-            if (iOff > (3 * FILE_BUF_SIZE / 4) && iDataRemaining > 0) { /* Near end of buffer, re-align */
-                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+        while (c) /* While there are more data blocks */
+        {
+            if (iOff > (3*FILE_BUF_SIZE/4) && iDataRemaining > 0) /* Near end of buffer, re-align */
+            {
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down
                 iDataAvailable -= iOff;
                 iOff = 0;
                 iReadAmount = (FILE_BUF_SIZE - iDataAvailable);
-                if (iReadAmount > iDataRemaining) {
+                if (iReadAmount > iDataRemaining)
                     iReadAmount = iDataRemaining;
-                }
                 iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount);
                 iDataAvailable += iReadAmount;
                 iDataRemaining -= iReadAmount;
@@ -651,19 +680,22 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) {
             c = cBuf[iOff++]; /* Get length of next */
         }
         /* End of image data, check for more pages... */
-        if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32)) {
+        if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32))
+        {
             bDone = 1; /* End of file has been reached */
-        } else { /* More pages to scan */
+        }
+        else /* More pages to scan */
+        {
             iNumFrames++;
-            // read new page data starting at this offset
-            if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) { // since we didn't read the whole file in one shot
-                memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
+             // read new page data starting at this offset
+            if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) // since we didn't read the whole file in one shot
+            {
+                memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down
                 iDataAvailable -= iOff;
                 iOff = 0;
                 iReadAmount = (FILE_BUF_SIZE - iDataAvailable);
-                if (iReadAmount > iDataRemaining) {
+                if (iReadAmount > iDataRemaining)
                     iReadAmount = iDataRemaining;
-                }
                 iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount);
                 iDataAvailable += iReadAmount;
                 iDataRemaining -= iReadAmount;
@@ -684,57 +716,62 @@ gifpagesz:
 // returns 1 to signify more data available for this image
 // 0 indicates there is no more data
 //
-static int GIFGetMoreData(GIFIMAGE *pPage) {
+static int GIFGetMoreData(GIFIMAGE *pPage)
+{
     int iDelta = (pPage->iLZWSize - pPage->iLZWOff);
     unsigned char c = 1;
     // move any existing data down
-    if (pPage->bEndOfFrame || iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0) {
+    if (pPage->bEndOfFrame ||  iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0)
         return 1; // frame is finished or buffer is already full; no need to read more data
-    }
-    if (pPage->iLZWOff != 0) {
+    if (pPage->iLZWOff != 0)
+    {
 // NB: memcpy() fails on some systems because the src and dest ptrs overlap
 // so copy the bytes in a simple loop to avoid problems
-        for (int i = 0; i < pPage->iLZWSize - pPage->iLZWOff; i++) {
-            pPage->ucLZW[i] = pPage->ucLZW[i + pPage->iLZWOff];
-        }
-        pPage->iLZWSize -= pPage->iLZWOff;
-        pPage->iLZWOff = 0;
+      for (int i=0; iiLZWSize - pPage->iLZWOff; i++) {
+         pPage->ucLZW[i] = pPage->ucLZW[i + pPage->iLZWOff];
+      }
+      pPage->iLZWSize -= pPage->iLZWOff;
+      pPage->iLZWOff = 0;
     }
-    while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE - MAX_CHUNK_SIZE)) {
+    while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE-MAX_CHUNK_SIZE))
+    {
         (*pPage->pfnRead)(&pPage->GIFFile, &c, 1); // current length
         (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c);
         pPage->iLZWSize += c;
     }
-    if (c == 0) { // end of frame
+    if (c == 0) // end of frame
         pPage->bEndOfFrame = 1;
-    }
-    return c != 0 && pPage->GIFFile.iPos < pPage->GIFFile.iSize; // more data available?
+    return (c != 0 && pPage->GIFFile.iPos < pPage->GIFFile.iSize); // more data available?
 } /* GIFGetMoreData() */
 //
 // Handle transparent pixels and disposal method
 // Used only when a frame buffer is allocated
 //
-static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
+static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
+{
     uint8_t *d, *s;
     int x, iPitch = pPage->iCanvasWidth;
 
     s = pDraw->pPixels;
-    d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY) * iPitch];  // dest pointer in our complete canvas buffer
-    if (pDraw->ucDisposalMethod == 2) { // restore to background color
+    d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY)  * iPitch]; // dest pointer in our complete canvas buffer
+    if (pDraw->ucDisposalMethod == 2) // restore to background color
+    {
         memset(d, pDraw->ucBackground, pDraw->iWidth);
     }
     // Apply the new pixels to the main image
-    if (pDraw->ucHasTransparency) { // if transparency used
+    if (pDraw->ucHasTransparency) // if transparency used
+    {
         uint8_t c, ucTransparent = pDraw->ucTransparent;
-        for (x = 0; x < pDraw->iWidth; x++)
+        for (x=0; xiWidth; x++)
         {
             c = *s++;
-            if (c != ucTransparent) {
+            if (c != ucTransparent)
                 *d = c;
-            }
             d++;
         }
-    } else {
+    }
+    else
+    {
         memcpy(d, s, pDraw->iWidth); // just overwrite the old pixels
     }
 } /* DrawNewPixels() */
@@ -743,25 +780,29 @@ static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
 // to either RGB565 or RGB888 output
 // Used only when a frame buffer has been allocated
 //
-static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
+static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
+{
     uint8_t *d, *s;
     int x;
 
     s = &pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX];
     d = &pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer
-    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
+    if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
+    {
         uint16_t *pPal, *pu16;
         pPal = (uint16_t *)pDraw->pPalette;
         pu16 = (uint16_t *)d;
-        for (x = 0; x < pPage->iWidth; x++)
+        for (x=0; xiWidth; x++)
         {
             *pu16++ = pPal[*s++]; // convert to RGB565 pixels
         }
-    } else {
+    }
+    else
+    {
         uint8_t *pPal;
         int pixel;
         pPal = (uint8_t *)pDraw->pPalette;
-        for (x = 0; x < pPage->iWidth; x++)
+        for (x=0; xiWidth; x++)
         {
             pixel = *s++;
             *d++ = pPal[(pixel * 3) + 0]; // convert to RGB888 pixels
@@ -774,7 +815,8 @@ static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) {
 //
 // GIFMakePels
 //
-static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
+static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
+{
     int iPixCount;
     unsigned short *giftabs;
     unsigned char *buf, *s, *pEnd, *gifpels;
@@ -785,8 +827,10 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
     buf = pPage->ucLineBuf + (pPage->iWidth - pPage->iXCount);
     giftabs = pPage->usGIFTable;
     gifpels = &pPage->ucGIFPixels[PIXEL_LAST];
-    while (code < LINK_UNUSED) {
-        if (s == pPage->ucFileBuf) { /* Houston, we have a problem */
+    while (code < LINK_UNUSED)
+    {
+        if (s == pPage->ucFileBuf) /* Houston, we have a problem */
+        {
             return; /* Exit with error */
         }
         *(--s) = gifpels[code];
@@ -794,24 +838,29 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
     }
     iPixCount = (int)(intptr_t)(pPage->ucFileBuf + FILE_BUF_SIZE - s);
 
-    while (iPixCount && pPage->iYCount > 0) {
-        if (pPage->iXCount > iPixCount) { /* Pixels fit completely on the line */
-            //            memcpy(buf, s, iPixCount);
-            //            buf += iPixCount;
-            pEnd = buf + iPixCount;
-            while (buf < pEnd) {
-                *buf++ = *s++;
-            }
+    while (iPixCount && pPage->iYCount > 0)
+    {
+        if (pPage->iXCount > iPixCount)  /* Pixels fit completely on the line */
+        {
+                //            memcpy(buf, s, iPixCount);
+                //            buf += iPixCount;
+                pEnd = buf + iPixCount;
+                while (buf < pEnd)
+                {
+                    *buf++ = *s++;
+                }
             pPage->iXCount -= iPixCount;
             //         iPixCount = 0;
-            if (ucNeedMore) {
+            if (ucNeedMore)
                 GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines
-            }
             return;
-        } else { /* Pixels cross into next line */
+        }
+        else  /* Pixels cross into next line */
+        {
             GIFDRAW gd;
             pEnd = buf + pPage->iXCount;
-            while (buf < pEnd) {
+            while (buf < pEnd)
+            {
                 *buf++ = *s++;
             }
             iPixCount -= pPage->iXCount;
@@ -824,30 +873,31 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
             gd.pPixels = pPage->ucLineBuf;
             gd.pPalette = (pPage->bUseLocalPalette) ? pPage->pLocalPalette : pPage->pPalette;
             gd.pPalette24 = (uint8_t *)gd.pPalette; // just cast the pointer for RGB888
-            gd.ucIsGlobalPalette = pPage->bUseLocalPalette == 1?0:1;
+            gd.ucIsGlobalPalette = pPage->bUseLocalPalette==1?0:1;
             gd.y = pPage->iHeight - pPage->iYCount;
             // Ugly logic to handle the interlaced line position, but it
             // saves having to have another set of state variables
             if (pPage->ucMap & 0x40) { // interlaced?
-                int height = pPage->iHeight - 1;
-                if (gd.y > height / 2) {
-                    gd.y = gd.y * 2 - (height | 1);
-                } else if (gd.y > height / 4) {
-                    gd.y = gd.y * 4 - ((height & ~1) | 2);
-                } else if (gd.y > height / 8) {
-                    gd.y = gd.y * 8 - ((height & ~3) | 4);
-                } else {
-                    gd.y = gd.y * 8;
-                }
+               int height = pPage->iHeight-1;
+               if (gd.y > height / 2)
+                  gd.y = gd.y * 2 - (height | 1);
+               else if (gd.y > height / 4)
+                  gd.y = gd.y * 4 - ((height & ~1) | 2);
+               else if (gd.y > height / 8)
+                  gd.y = gd.y * 8 - ((height & ~3) | 4);
+               else
+                  gd.y = gd.y * 8;
             }
-            gd.ucDisposalMethod = (pPage->ucGIFBits & 0x1c) >> 2;
+            gd.ucDisposalMethod = (pPage->ucGIFBits & 0x1c)>>2;
             gd.ucTransparent = pPage->ucTransparent;
             gd.ucHasTransparency = pPage->ucGIFBits & 1;
             gd.ucBackground = pPage->ucBackground;
             gd.pUser = pPage->pUser;
-            if (pPage->pFrameBuffer) { // update the frame buffer
+            if (pPage->pFrameBuffer) // update the frame buffer
+            {
                 DrawNewPixels(pPage, &gd);
-                if (pPage->ucDrawType == GIF_DRAW_COOKED) {
+                if (pPage->ucDrawType == GIF_DRAW_COOKED)
+                {
                     ConvertNewPixels(pPage, &gd); // prepare for output
                     gd.pPixels = &pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight];
                 }
@@ -855,35 +905,34 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) {
             (*pPage->pfnDraw)(&gd); // callback to handle this line
             pPage->iYCount--;
             buf = pPage->ucLineBuf;
-            if ((pPage->iYCount & 3) == 0) { // since we support only small images...
+            if ((pPage->iYCount & 3) == 0) // since we support only small images...
                 ucNeedMore = 1;
-            }
         }
     } /* while */
-    if (ucNeedMore) {
+    if (ucNeedMore)
         GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines
-    }
     return;
 } /* GIFMakePels() */
 //
 // Macro to extract a variable length code
 //
 #define GET_CODE if (bitnum > (REGISTER_WIDTH - codesize)) { pImage->iLZWOff += (bitnum >> 3); \
-                                                             bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \
-    code = (unsigned short)(ulBits >> bitnum);      /* Read a 32-bit chunk */ \
-    code &= sMask; bitnum += codesize;
+            bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \
+        code = (unsigned short) (ulBits >> bitnum); /* Read a 32-bit chunk */ \
+        code &= sMask; bitnum += codesize;
 
 //
 // Decode LZW into an image
 //
-static int DecodeLZW(GIFIMAGE *pImage, int iOptions) {
+static int DecodeLZW(GIFIMAGE *pImage, int iOptions)
+{
     int i, bitnum;
     unsigned short oldcode, codesize, nextcode, nextlim;
     unsigned short *giftabs, cc, eoi;
     signed short sMask;
     unsigned char *gifpels, *p;
     //    int iStripSize;
-    // unsigned char **index;
+    //unsigned char **index;
     uint32_t ulBits;
     unsigned short code;
     (void)iOptions; // not used for now
@@ -907,7 +956,7 @@ static int DecodeLZW(GIFIMAGE *pImage, int iOptions) {
     // this part only needs to be initialized once
     for (i = 0; i < cc; i++)
     {
-        gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short)i;
+        gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short) i;
         giftabs[i] = LINK_END;
     }
 init_codetable:
@@ -915,79 +964,80 @@ init_codetable:
     sMask = 0xffff << (pImage->ucCodeStart + 1);
     sMask = 0xffff - sMask;
     nextcode = cc + 2;
-    nextlim = (unsigned short)((1 << codesize));
+    nextlim = (unsigned short) ((1 << codesize));
     // This part of the table needs to be reset multiple times
-    memset(&giftabs[cc], LINK_UNUSED, (4096 - cc) * sizeof(short));
+    memset(&giftabs[cc], LINK_UNUSED, (4096 - cc)*sizeof(short));
     ulBits = INTELLONG(&p[pImage->iLZWOff]); // start by reading 4 bytes of LZW data
     GET_CODE
-    if (code == cc) { // we just reset the dictionary, so get another code
-        GET_CODE
+    if (code == cc) // we just reset the dictionary, so get another code
+    {
+      GET_CODE
     }
     oldcode = code;
     GIFMakePels(pImage, code); // first code is output as the first pixel
     // Main decode loop
-    while (code != eoi && pImage->iYCount > 0) { // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */
+    while (code != eoi && pImage->iYCount > 0) // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */
+    {
         GET_CODE
-        if (code == cc) { /* Clear code?, and not first code */
+        if (code == cc) /* Clear code?, and not first code */
             goto init_codetable;
-        }
-        if (code != eoi) {
-            if (nextcode < nextlim) {   // for deferred cc case, don't let it overwrite the last entry (fff)
-                giftabs[nextcode] = oldcode;
-                gifpels[PIXEL_FIRST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
-                if (giftabs[code] == LINK_UNUSED) {   /* Old code */
-                    gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
-                } else {
-                    gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code];
+        if (code != eoi)
+        {
+                if (nextcode < nextlim) // for deferred cc case, don't let it overwrite the last entry (fff)
+                {
+                    giftabs[nextcode] = oldcode;
+                    gifpels[PIXEL_FIRST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
+                    if (giftabs[code] == LINK_UNUSED) /* Old code */
+                        gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + oldcode];
+                    else
+                        gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code];
+                }
+                nextcode++;
+                if (nextcode >= nextlim && codesize < 12)
+                {
+                    codesize++;
+                    nextlim <<= 1;
+                    sMask = (sMask << 1) | 1;
                 }
-            }
-            nextcode++;
-            if (nextcode >= nextlim && codesize < 12) {
-                codesize++;
-                nextlim <<= 1;
-                sMask = (sMask << 1) | 1;
-            }
             GIFMakePels(pImage, code);
             oldcode = code;
         }
     } /* while not end of LZW code stream */
     return 0;
-// gif_forced_error:
+//gif_forced_error:
 //    free(pImage->pPixels);
 //    pImage->pPixels = NULL;
 //    return -1;
 } /* DecodeLZW() */
 
-void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw) {
-    pGIF->pfnDraw = pfnDraw;
+void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw)
+{
+   pGIF->pfnDraw = pfnDraw;
 } /* GIF_setDrawCallback() */
 //
 // Scale 2 scanlines down by 50% with pixel averaging
 // writes new values over previous line
 // expects RGB565 little endian pixels as input
 //
-void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian) {
-    int x;
-    uint16_t *d = pPrev;
-    uint32_t gSum, rbSum, pix0,pix1,pix2,pix3;
-    const uint32_t RBMask = 0xf81f, GMask = 0x7e0;
+void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian)
+{
+int x;
+uint16_t *d = pPrev;
+uint32_t gSum, rbSum, pix0,pix1,pix2,pix3;
+const uint32_t RBMask = 0xf81f, GMask = 0x7e0;
 
-    for (x = 0; x < iWidth; x += 2)
-    {
-        pix0 = pCurrent[0];
-        pix1 = pCurrent[1];
-        pix2 = pPrev[0];
-        pix3 = pPrev[1];
-        pCurrent += 2;
-        pPrev += 2;
-        gSum = (pix0 & GMask) + (pix1 & GMask) + (pix2 & GMask) + (pix3 & GMask);
-        gSum = ((gSum + 0x40) >> 2) & GMask; // for rounding towards 1
-        rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask);
-        rbSum = ((rbSum + 0x1002) >> 2) & RBMask;
-        if (bBigEndian) {
-            *d++ = __builtin_bswap16((uint16_t)(gSum + rbSum));
-        } else {
-            *d++ = (uint16_t)(gSum + rbSum); // store finished pixel
-        }
-    } // for x
+   for (x=0; x> 2) & GMask; // for rounding towards 1
+      rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask);
+      rbSum = ((rbSum + 0x1002) >> 2) & RBMask;
+      if (bBigEndian)
+         *d++ = __builtin_bswap16((uint16_t)(gSum + rbSum));
+      else
+         *d++ = (uint16_t)(gSum + rbSum); // store finished pixel
+   } // for x
 } /* GIF_scaleHalf() */
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 6c8a513d8f..5956b3e965 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -580,7 +580,6 @@ SRC_SHARED_MODULE_ALL = \
 	displayio/I2CDisplay.c \
 	displayio/OnDiskBitmap.c \
 	displayio/OnDiskGif.c \
-	displayio/gif.c \
 	displayio/Palette.c \
 	displayio/Shape.c \
 	displayio/TileGrid.c \
@@ -699,10 +698,10 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \
 $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes
 endif
 
-#SRC_MOD += $(addprefix lib/AnimatedGIF/, \
-	#gif.c \
-#)
-#$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -Wno-missing-braces -Wno-missing-prototypes
+SRC_MOD += $(addprefix lib/AnimatedGIF/, \
+	gif.c \
+)
+$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -DCIRCUITPY
 
 ifeq ($(CIRCUITPY_ZLIB),1)
 SRC_MOD += $(addprefix lib/uzlib/, \
diff --git a/shared-bindings/displayio/gif.c b/shared-bindings/displayio/gif.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/shared-module/displayio/OnDiskGif.h b/shared-module/displayio/OnDiskGif.h
index 2184f78dbe..5089e52b42 100644
--- a/shared-module/displayio/OnDiskGif.h
+++ b/shared-module/displayio/OnDiskGif.h
@@ -32,8 +32,7 @@
 
 #include "py/obj.h"
 
-// #include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h"
-#include "AnimatedGIF_circuitpy.h"
+#include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h"
 #include "Bitmap.h"
 
 #include "extmod/vfs_fat.h"

From d959ef1e5b9c2f9b42e0169142dab1bdbd48b0fe Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 11 Feb 2023 12:00:27 +0530
Subject: [PATCH 1804/2403] use venv to cache python deps

---
 .../external}/action.yml                      | 28 ++++++++++++---
 .../{port_deps => deps/port}/action.yml       |  2 +-
 .github/actions/deps/python/action.yml        | 35 +++++++++++++++++++
 .../submodules}/action.yml                    |  6 ++--
 .github/actions/mpy_cross/action.yml          | 13 +++++--
 .github/workflows/build-boards.yml            |  8 ++---
 .github/workflows/build-mpy-cross.yml         | 28 +++++++--------
 .github/workflows/build.yml                   | 19 +++++-----
 .github/workflows/create_website_pr.yml       | 10 +++---
 .github/workflows/ports_windows.yml           |  2 +-
 .github/workflows/pre-commit.yml              | 12 +++----
 .github/workflows/run-tests.yml               | 20 +++--------
 12 files changed, 116 insertions(+), 67 deletions(-)
 rename .github/actions/{external_deps => deps/external}/action.yml (79%)
 rename .github/actions/{port_deps => deps/port}/action.yml (92%)
 create mode 100644 .github/actions/deps/python/action.yml
 rename .github/actions/{fetch_submodules => deps/submodules}/action.yml (96%)

diff --git a/.github/actions/external_deps/action.yml b/.github/actions/deps/external/action.yml
similarity index 79%
rename from .github/actions/external_deps/action.yml
rename to .github/actions/deps/external/action.yml
index c9766eadc2..408a2e8555 100644
--- a/.github/actions/external_deps/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -12,8 +12,18 @@ inputs:
     - riscv
     - none
 
+  apt:
+    required: false
+    default: true
+    type: boolean
+
+  python:
+    required: false
+    default: true
+    type: boolean
+
 runs:
-  using: "composite"
+  using: composite
   steps:
     # aarch
     - name: Get aarch toolchain
@@ -74,8 +84,16 @@ runs:
       shell: bash
 
     # common
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext
-        pip install -r requirements-dev.txt
+    - name: Cache python dependencies
+      if: inputs.python == 'true' && inputs.platform != 'espressif'
+      uses: ./.github/actions/deps/python
+      with:
+        action: ${{ fromJSON('["restore", "cache"]')[github.job == 'scheduler'] }}
+    - name: Install python dependencies
+      if: inputs.python == 'true'
+      run: pip install -r requirements-dev.txt
+      shell: bash
+    - name: Install dependencies
+      if: inputs.apt == 'true'
+      run: sudo apt-get install -y gettext
       shell: bash
diff --git a/.github/actions/port_deps/action.yml b/.github/actions/deps/port/action.yml
similarity index 92%
rename from .github/actions/port_deps/action.yml
rename to .github/actions/deps/port/action.yml
index c507983406..36b67c6081 100644
--- a/.github/actions/port_deps/action.yml
+++ b/.github/actions/deps/port/action.yml
@@ -43,7 +43,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
-        key: tools-idf-${{ steps.idf-commit.outputs.commit }}-${{ runner.os }}-${{ env.pythonLocation }}
+        key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
 
     - name: Initialize IDF submodules
       if: inputs.platform == 'espressif'
diff --git a/.github/actions/deps/python/action.yml b/.github/actions/deps/python/action.yml
new file mode 100644
index 0000000000..fb978ef063
--- /dev/null
+++ b/.github/actions/deps/python/action.yml
@@ -0,0 +1,35 @@
+name: Fetch python deps
+
+inputs:
+  action:
+    description: The cache action to use
+    required: false
+    default: restore
+    type: choice
+    options:
+    - cache
+    - restore
+
+runs:
+  using: composite
+  steps:
+    - name: Cache python dependencies
+      if: ${{ inputs.action == 'cache' }}
+      uses: actions/cache@v3
+      with:
+        path: .cp_tools
+        key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
+
+    - name: Restore python dependencies
+      if: ${{ inputs.action == 'restore' }}
+      uses: actions/cache/restore@v3
+      with:
+        path: .cp_tools
+        key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
+
+    - name: Set up venv
+      run: |
+        python -m venv .cp_tools
+        source .cp_tools/bin/activate
+        echo >> $GITHUB_PATH "$PATH"
+      shell: bash
diff --git a/.github/actions/fetch_submodules/action.yml b/.github/actions/deps/submodules/action.yml
similarity index 96%
rename from .github/actions/fetch_submodules/action.yml
rename to .github/actions/deps/submodules/action.yml
index c8c6c9b1a0..bca76b204c 100644
--- a/.github/actions/fetch_submodules/action.yml
+++ b/.github/actions/deps/submodules/action.yml
@@ -12,7 +12,7 @@ inputs:
     default: '["extmod/ulab", "lib/", "tools/"]'
     type: string
 
-  cache:
+  action:
     description: 'The cache action to use'
     required: false
     default: 'restore'
@@ -47,7 +47,7 @@ runs:
       shell: bash
 
     - name: Cache submodules
-      if: ${{ inputs.cache == 'cache' }}
+      if: ${{ inputs.action == 'cache' }}
       uses: actions/cache@v3
       with:
         path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
@@ -55,7 +55,7 @@ runs:
         enableCrossOsArchive: true
 
     - name: Restore submodules
-      if: ${{ inputs.cache == 'restore' }}
+      if: ${{ inputs.action == 'restore' }}
       uses: actions/cache/restore@v3
       with:
         path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
diff --git a/.github/actions/mpy_cross/action.yml b/.github/actions/mpy_cross/action.yml
index ea3466e5fb..d9fe54fdc7 100644
--- a/.github/actions/mpy_cross/action.yml
+++ b/.github/actions/mpy_cross/action.yml
@@ -1,10 +1,17 @@
 name: Set up mpy-cross
 
+inputs:
+  download:
+    required: false
+    default: true
+    type: boolean
+
 runs:
   using: composite
   steps:
     - name: Download mpy-cross
       id: download-mpy-cross
+      if: inputs.download == 'true'
       continue-on-error: true
       uses: actions/download-artifact@v3
       with:
@@ -12,18 +19,18 @@ runs:
         path: mpy-cross
 
     - name: Make mpy-cross executable
-      if: steps.download-mpy-cross.outcome == 'success'
+      if: inputs.download == 'true' && steps.download-mpy-cross.outcome == 'success'
       run: sudo chmod +x mpy-cross/mpy-cross
       shell: bash
 
     - name: Build mpy-cross
-      if: steps.download-mpy-cross.outcome == 'failure'
+      if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       run: make -C mpy-cross -j2
       shell: bash
 
     - name: Upload mpy-cross
+      if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       continue-on-error: true
-      if: steps.download-mpy-cross.outcome == 'failure'
       uses: actions/upload-artifact@v3
       with:
         name: mpy-cross
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index 9b53615fe7..c302be7c9f 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -35,14 +35,14 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up port
-      uses: ./.github/actions/port_deps
+      uses: ./.github/actions/deps/port
       with:
         platform: ${{ inputs.platform }}
     - name: Set up submodules
       id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
     - name: Set up external
-      uses: ./.github/actions/external_deps
+      uses: ./.github/actions/deps/external
       with:
         platform: ${{ inputs.platform }}
     - name: Set up mpy-cross
@@ -64,7 +64,7 @@ jobs:
 
     - name: Set up build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
-    - name: Build
+    - name: Build board
       run: python3 -u build_release_files.py
       working-directory: tools
       env:
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
index 3d557df8ee..a2c0c64289 100644
--- a/.github/workflows/build-mpy-cross.yml
+++ b/.github/workflows/build-mpy-cross.yml
@@ -27,26 +27,22 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-
     - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: 3.x
-
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
       with:
         target: mpy-cross
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gettext
+    - name: Set up external
+      uses: ./.github/actions/deps/external
+      with:
+        python: false
 
     - name: Install toolchain (aarch64)
       if: matrix.mpy-cross == 'static-aarch64'
       run: sudo apt-get install -y gcc-aarch64-linux-gnu
-
     - name: Install toolchain (mingw)
       if: matrix.mpy-cross == 'static-mingw'
       run: sudo apt-get install -y mingw-w64
@@ -54,16 +50,20 @@ jobs:
     - name: Build mpy-cross.${{ matrix.mpy-cross }}
       run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
 
+    - name: Set output
+      run: |
+        echo >> $GITHUB_ENV "EX=${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}"
+        echo >> $GITHUB_ENV "OS=${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
+
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
-        name: mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
-        path: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
-
+        name: mpy-cross.${{ env.EX }}
+        path: mpy-cross/mpy-cross.${{ env.EX }}
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:
-        source: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
-        destination: mpy-cross/${{ env[format('OS_{0}', matrix.mpy-cross)] }}/mpy-cross-${{ env.CP_VERSION }}.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
+        source: mpy-cross/mpy-cross.${{ env.EX }}
+        destination: mpy-cross/${{ env.OS }}/mpy-cross-${{ env.OS }}-${{ env.CP_VERSION }}.${{ env.EX }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37bb4133cd..8c40acd6d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,9 +27,6 @@ jobs:
       boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
-    env:
-      MICROPY_CPYTHON3: python3.8
-      MICROPY_MICROPYTHON: ${{ github.workspace }}/ports/unix/micropython-coverage
     steps:
     - name: Dump GitHub context
       run: echo "$GITHUB_CONTEXT"
@@ -48,14 +45,12 @@ jobs:
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Set up submodules
       id: set-up-submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
       with:
-        cache: cache
+        action: cache
         version: true
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext
-        pip install requests requests-cache sh
+    - name: Set up external
+      uses: ./.github/actions/deps/external
     # Disabled: Needs to be updated
     # - name: Get last commit with checks
     #   id: get-last-commit-with-checks
@@ -69,6 +64,8 @@ jobs:
     #     EXCLUDE_COMMIT: ${{ github.event.after }}
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
+      with:
+        download: false
     - name: Set head sha
       if: github.event_name == 'pull_request'
       run: echo "HEAD_SHA=$(git show -s --format=%s $GITHUB_SHA | grep -o -P "(?<=Merge ).*(?= into)")" >> $GITHUB_ENV
@@ -124,7 +121,7 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
     - name: Versions
       run: |
         gcc --version
@@ -179,7 +176,7 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
     - name: Install dependencies
       run: |
         sudo apt-get update
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 19004d9bea..9f89490161 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -24,13 +24,15 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: 3.x
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
       with:
         version: true
-    - name: Install dependencies
-      run: pip install -r requirements-dev.txt
+    - name: Set up external
+      uses: ./.github/actions/deps/external
+      with:
+        apt: false
     - name: Versions
       run: |
         gcc --version
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 66d09c2418..ba2042660a 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -77,7 +77,7 @@ jobs:
         fetch-depth: 1
 
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
       with:
         version: true
 
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 02aed6e9b4..fc36f2a505 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -24,13 +24,13 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
-    - name: CircuitPython dependencies
-      run: python tools/ci_fetch_deps.py ${{ github.job }}
+        python-version: 3.x
+    - name: Set up submodules
+      uses: ./.github/actions/deps/submodules
+    - name: Set up external
+      uses: ./.github/actions/deps/external
     - name: Install dependencies
-      run: |
-        sudo apt-get install -y gettext uncrustify
-        pip3 install black polib pyyaml
+      run: sudo apt-get install -y uncrustify
     - name: Run pre-commit
       uses: pre-commit/action@v3.0.0
     - name: Make patch
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 15fc8489a4..1ab0f6eeab 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -33,32 +33,22 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up submodules
-      uses: ./.github/actions/fetch_submodules
+      uses: ./.github/actions/deps/submodules
       with:
         target: tests
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gettext
-
+    - name: Set up external
+      uses: ./.github/actions/deps/external
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
-
     - name: Build unix port
       run: make -C ports/unix VARIANT=coverage -j2
-
-    - name: Test all
-      run: ./run-tests.py -j2 $TEST_${{ matrix.test }}
+    - name: Run tests
+      run: ./run-tests.py -j2 ${{ env[format('TEST_{0}', matrix.test)] }}
       working-directory: tests
     - name: Print failure info
       run: ./run-tests.py -j2 --print-failures
       if: failure()
       working-directory: tests
-
-    - name: Set up native modules
-      if: matrix.test == 'all'
-      run: pip install -r requirements-dev.txt
     - name: Build native modules
       if: matrix.test == 'all'
       run: |

From a2bbca1428efc334243e1ac474244d667d5854bd Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Thu, 9 Feb 2023 01:14:01 -0500
Subject: [PATCH 1805/2403] Broadcom Raspberry Pi Zero2W neopixel timing fix

These changes result in working neopixel functionality. I've tested on
both the zero2w and the pi4b (The 4b didn't exhibit the original issue)
and the boards now behave properly with 1 to 30 pixels and the board hanging
no longer occurs.

Remove mod that didn't help during testing
Restoring back to original structure
Replace 2 microsecond delay w/deterministic loop
Remove unneded check for empty queue

Put transmit delay outside loop so Queue is used

Make sure last transmission is complete
---
 .../common-hal/neopixel_write/__init__.c      | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 0cd76ebca9..822c61e36e 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -45,7 +45,11 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     uint8_t *pixels, uint32_t num_bytes) {
     // Wait to make sure we don't append onto the last transmission. This should only be a tick or
     // two.
-    while (port_get_raw_ticks(NULL) < next_start_raw_ticks) {
+    int icnt;
+    while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) & 
+        (next_start_raw_ticks-port_get_raw_ticks(NULL) < 100)) {
+        
+        RUN_BACKGROUND_TASKS;
     }
 
     BP_Function_Enum alt_function = GPIO_FUNCTION_OUTPUT;
@@ -92,7 +96,8 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
 
         // Wait for the clock to start up.
         COMPLETE_MEMORY_READS;
-        while (CM_PWM->CS_b.BUSY == 0) {
+        icnt = 0;
+        while ((CM_PWM->CS_b.BUSY == 0) & (icnt++ < 1000)) {
         }
     }
 
@@ -134,22 +139,41 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
                 expanded |= 0x80000000;
             }
         }
-        while (pwm->STA_b.FULL1 == 1) {
-            RUN_BACKGROUND_TASKS;
-        }
         if (channel == 1) {
+            icnt=0;
+            while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+                RUN_BACKGROUND_TASKS;
+            }
             // Dummy value for the first channel.
             pwm->FIF1 = 0x000000;
         }
+        icnt=0;
+        while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+            RUN_BACKGROUND_TASKS;
+        }
         pwm->FIF1 = expanded;
         if (channel == 0) {
+            icnt=0;
+            while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+                RUN_BACKGROUND_TASKS;
+            }
             // Dummy value for the second channel.
             pwm->FIF1 = 0x000000;
         }
     }
-    // Wait just a little bit so that transmission can start.
-    common_hal_mcu_delay_us(2);
-    while (pwm->STA_b.STA1 == 1) {
+
+    icnt = 0;
+    while ((pwm->STA_b.EMPT1 == 0) & (icnt++ < 2500)) {
+        RUN_BACKGROUND_TASKS;
+    }
+    // Wait for transmission to start.
+    icnt = 0;
+    while (((pwm->STA_b.STA1 ==0) & (pwm->STA_b.STA2 == 0)) & (icnt++ < 150)) {
+        RUN_BACKGROUND_TASKS;
+    }
+    // Wait for transmission to complete.
+    icnt = 0;
+    while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) & (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
     }
 

From a462a316bddb3860c3bc5e352084a03d31d08650 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 11 Feb 2023 12:10:03 -0500
Subject: [PATCH 1806/2403] Fix pre-commit formatting

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 822c61e36e..60b288eb28 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -47,7 +47,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     // two.
     int icnt;
     while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) & 
-        (next_start_raw_ticks-port_get_raw_ticks(NULL) < 100)) {
+           (next_start_raw_ticks - port_get_raw_ticks(NULL) < 100)) {
         
         RUN_BACKGROUND_TASKS;
     }
@@ -140,20 +140,20 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
             }
         }
         if (channel == 1) {
-            icnt=0;
+            icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
             }
             // Dummy value for the first channel.
             pwm->FIF1 = 0x000000;
         }
-        icnt=0;
+        icnt = 0;
         while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
             RUN_BACKGROUND_TASKS;
         }
         pwm->FIF1 = expanded;
         if (channel == 0) {
-            icnt=0;
+            icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
             }
@@ -168,7 +168,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     }
     // Wait for transmission to start.
     icnt = 0;
-    while (((pwm->STA_b.STA1 ==0) & (pwm->STA_b.STA2 == 0)) & (icnt++ < 150)) {
+    while (((pwm->STA_b.STA1 == 0) & (pwm->STA_b.STA2 == 0)) & (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
     }
     // Wait for transmission to complete.

From f29cd4a836eb97cb589818932b55b002468e964e Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 11 Feb 2023 12:13:34 -0500
Subject: [PATCH 1807/2403] Pre-commit fix trim trailing whitespace

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 60b288eb28..023feb995f 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -46,7 +46,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     // Wait to make sure we don't append onto the last transmission. This should only be a tick or
     // two.
     int icnt;
-    while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) & 
+    while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) &
            (next_start_raw_ticks - port_get_raw_ticks(NULL) < 100)) {
         
         RUN_BACKGROUND_TASKS;

From 2104708c58c881a7ecf0b972245cc3ffcb48901d Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 11 Feb 2023 12:17:55 -0500
Subject: [PATCH 1808/2403] missed a trailing space

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 023feb995f..38519a0232 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -48,7 +48,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     int icnt;
     while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) &
            (next_start_raw_ticks - port_get_raw_ticks(NULL) < 100)) {
-        
+
         RUN_BACKGROUND_TASKS;
     }
 

From 359a27e166617260d75dc6ef6769114ebac03d19 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 11 Feb 2023 12:19:21 -0500
Subject: [PATCH 1809/2403] Pre-commit is stubborn

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 38519a0232..5629c97425 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -48,7 +48,6 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     int icnt;
     while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) &
            (next_start_raw_ticks - port_get_raw_ticks(NULL) < 100)) {
-
         RUN_BACKGROUND_TASKS;
     }
 

From 1679790481a80270e6d79bb7fe069cd71fe46488 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 11 Feb 2023 20:21:25 -0500
Subject: [PATCH 1810/2403] Tweaked to run without delays on zero w

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 5629c97425..d685ac53ce 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -97,6 +97,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         COMPLETE_MEMORY_READS;
         icnt = 0;
         while ((CM_PWM->CS_b.BUSY == 0) & (icnt++ < 1000)) {
+            COMPLETE_MEMORY_READS;
         }
     }
 
@@ -142,6 +143,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
             icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
+                COMPLETE_MEMORY_READS;
             }
             // Dummy value for the first channel.
             pwm->FIF1 = 0x000000;
@@ -149,12 +151,14 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         icnt = 0;
         while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
             RUN_BACKGROUND_TASKS;
+            COMPLETE_MEMORY_READS;
         }
         pwm->FIF1 = expanded;
         if (channel == 0) {
             icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
+                COMPLETE_MEMORY_READS;
             }
             // Dummy value for the second channel.
             pwm->FIF1 = 0x000000;
@@ -164,17 +168,23 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     icnt = 0;
     while ((pwm->STA_b.EMPT1 == 0) & (icnt++ < 2500)) {
         RUN_BACKGROUND_TASKS;
+        COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to start.
     icnt = 0;
     while (((pwm->STA_b.STA1 == 0) & (pwm->STA_b.STA2 == 0)) & (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
+        COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to complete.
     icnt = 0;
     while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) & (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
+        COMPLETE_MEMORY_READS;
     }
+    // Shouldn't be anything left in queue but clear it so the clock doesn't crash if there is
+    pwm->CTL = PWM0_CTL_CLRF1_Msk;
+    COMPLETE_MEMORY_READS;
 
     gpio_set_function(digitalinout->pin->number, GPIO_FUNCTION_OUTPUT);
 

From 6726f2518e8d4c09ec3adca02929ae705636bf8e Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Sat, 11 Feb 2023 22:30:25 -0500
Subject: [PATCH 1811/2403] Minor fixes to bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7b6a53dbba..8e0f2be25b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: >-
-        Thanks! for testing out CircuitPython. Now that you have encountered a
+        Thanks for testing out CircuitPython! Now that you have encountered a
         bug... you can file a report for it.
   - type: textarea
     id: firmware
@@ -16,7 +16,6 @@ body:
         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 on 2021-03-01; Raspberry Pi Pico with rp2040
-      render: python
     validations:
       required: true
   - type: textarea
@@ -36,7 +35,7 @@ body:
       label: Behavior
       description: What happens when you run the code above? Include error messages (if any).
       placeholder: |
-        ```python
+        ```
         Traceback (most recent call last):
           File "", line 1, in 
           TimeoutError: Clock stretch too long

From 29e91e0d4f6da2f5984660d0318d6d9dfbe1d160 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 12 Feb 2023 09:11:12 -0600
Subject: [PATCH 1812/2403] Fix for changing frame size and disposal method
 issues

---
 shared-module/displayio/OnDiskGif.c | 41 +++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/shared-module/displayio/OnDiskGif.c b/shared-module/displayio/OnDiskGif.c
index 22a97020f0..1ef7fbed96 100644
--- a/shared-module/displayio/OnDiskGif.c
+++ b/shared-module/displayio/OnDiskGif.c
@@ -79,7 +79,16 @@ static void GIFDraw(GIFDRAW *pDraw) {
     uint8_t *s;
     uint16_t *d;
 
-    int32_t row_start = pDraw->y * bitmap->stride;
+    int iWidth = pDraw->iWidth;
+    if (iWidth + pDraw->iX > bitmap->width) {
+        iWidth = bitmap->width - pDraw->iX;
+    }
+
+    if (pDraw->iY + pDraw->y >= bitmap->height || pDraw->iX >= bitmap->width || iWidth < 1) {
+        return;
+    }
+
+    int32_t row_start = (pDraw->y + pDraw->iY) * bitmap->stride;
     uint32_t *row = bitmap->data + row_start;
     s = pDraw->pPixels;
     d = (uint16_t *)row;
@@ -88,20 +97,30 @@ static void GIFDraw(GIFDRAW *pDraw) {
     pPal = (uint16_t *)pDraw->pPalette;
 
     if (pDraw->ucDisposalMethod == 2) { // restore to background color
-        memset(d, pDraw->ucBackground, pDraw->iWidth);
+        // Not supported currently. Need to reset the area the previous frame occupied
+        // to the background color before the previous frame was drawn
+        // See: https://github.com/bitbank2/AnimatedGIF/issues/3
+
+        // To workaround clear the gif.bitmap object yourself as required.
     }
 
-    // We always check for transpancy even if the gif does not have it
-    // as we also convert the color to the palette here
-    // Could separate it but would not sure it would be much a speed up
     uint8_t c, ucTransparent = pDraw->ucTransparent;
-    for (int x = 0; x < pDraw->iWidth; x++)
-    {
-        c = *s++;
-        if (c != ucTransparent) {
-            *d = pPal[c];
+    d += pDraw->iX;
+    if (pDraw->ucHasTransparency == 1) {
+        for (int x = 0; x < iWidth; x++)
+        {
+            c = *s++;
+            if (c != ucTransparent) {
+                *d = pPal[c];
+            }
+            d++;
+        }
+    } else {
+        for (int x = 0; x < iWidth; x++)
+        {
+            c = *s++;
+            *d++ = pPal[c];
         }
-        d++;
     }
 }
 

From 953c98917742340e9a0aa765744f93fcefd649cb Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 12 Feb 2023 09:39:08 -0600
Subject: [PATCH 1813/2403] Fixign alignment issue on ESP and SAMD boards

---
 lib/AnimatedGIF/AnimatedGIF_circuitpy.h |  3 ++-
 lib/AnimatedGIF/gif.c                   | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/AnimatedGIF/AnimatedGIF_circuitpy.h b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h
index e401935a95..c1f359194f 100644
--- a/lib/AnimatedGIF/AnimatedGIF_circuitpy.h
+++ b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h
@@ -137,7 +137,8 @@ typedef struct gif_image_tag
     GIF_CLOSE_CALLBACK *pfnClose;
     GIFFILE GIFFile;
     void *pUser;
-    unsigned char *pFrameBuffer;
+    //unsigned char *pFrameBuffer;
+    unsigned int *pFrameBuffer;
     unsigned char *pPixels, *pOldPixels;
     unsigned char ucLineBuf[MAX_WIDTH]; // current line
     unsigned char ucFileBuf[FILE_BUF_SIZE]; // holds temp data and pixel stack
diff --git a/lib/AnimatedGIF/gif.c b/lib/AnimatedGIF/gif.c
index 00a0137562..0822b608c1 100644
--- a/lib/AnimatedGIF/gif.c
+++ b/lib/AnimatedGIF/gif.c
@@ -753,7 +753,7 @@ static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
     int x, iPitch = pPage->iCanvasWidth;
 
     s = pDraw->pPixels;
-    d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY)  * iPitch]; // dest pointer in our complete canvas buffer
+    d = (uint8_t*)&pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY)  * iPitch]; // dest pointer in our complete canvas buffer
     if (pDraw->ucDisposalMethod == 2) // restore to background color
     {
         memset(d, pDraw->ucBackground, pDraw->iWidth);
@@ -785,13 +785,13 @@ static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
     uint8_t *d, *s;
     int x;
 
-    s = &pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX];
-    d = &pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer
+    s = (uint8_t*)&pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX];
+    d = (uint8_t*)&pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer
     if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
     {
         uint16_t *pPal, *pu16;
         pPal = (uint16_t *)pDraw->pPalette;
-        pu16 = (uint16_t *)d;
+        pu16 = (uint16_t *)&pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth];
         for (x=0; xiWidth; x++)
         {
             *pu16++ = pPal[*s++]; // convert to RGB565 pixels
@@ -899,7 +899,7 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
                 if (pPage->ucDrawType == GIF_DRAW_COOKED)
                 {
                     ConvertNewPixels(pPage, &gd); // prepare for output
-                    gd.pPixels = &pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight];
+                    gd.pPixels = (uint8_t*)&pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight];
                 }
             }
             (*pPage->pfnDraw)(&gd); // callback to handle this line

From 0c95e6a08ece6542c97ed6717bd3a671298de3dc Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 12 Feb 2023 11:17:34 -0600
Subject: [PATCH 1814/2403] Moving to gifio module

---
 py/circuitpy_defns.mk                         |   4 +-
 py/circuitpy_mpconfig.mk                      |   3 +-
 shared-bindings/displayio/OnDiskGif.c         | 210 ------------------
 shared-bindings/displayio/__init__.c          |   2 -
 shared-bindings/gifio/OnDiskGif.c             | 210 ++++++++++++++++++
 .../{displayio => gifio}/OnDiskGif.h          |  26 +--
 shared-bindings/gifio/__init__.c              |   2 +
 .../{displayio => gifio}/OnDiskGif.c          |  24 +-
 .../{displayio => gifio}/OnDiskGif.h          |   4 +-
 9 files changed, 242 insertions(+), 243 deletions(-)
 delete mode 100644 shared-bindings/displayio/OnDiskGif.c
 create mode 100644 shared-bindings/gifio/OnDiskGif.c
 rename shared-bindings/{displayio => gifio}/OnDiskGif.h (59%)
 rename shared-module/{displayio => gifio}/OnDiskGif.c (85%)
 rename shared-module/{displayio => gifio}/OnDiskGif.h (96%)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 5956b3e965..df5f1488ea 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -579,7 +579,6 @@ SRC_SHARED_MODULE_ALL = \
 	displayio/Group.c \
 	displayio/I2CDisplay.c \
 	displayio/OnDiskBitmap.c \
-	displayio/OnDiskGif.c \
 	displayio/Palette.c \
 	displayio/Shape.c \
 	displayio/TileGrid.c \
@@ -593,6 +592,7 @@ SRC_SHARED_MODULE_ALL = \
 	getpass/__init__.c \
 	gifio/__init__.c \
 	gifio/GifWriter.c \
+	gifio/OnDiskGif.c \
 	imagecapture/ParallelImageCapture.c \
 	ipaddress/IPv4Address.c \
 	ipaddress/__init__.c \
@@ -698,10 +698,12 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \
 $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes
 endif
 
+ifeq ($(CIRCUITPY_GIFIO),1)
 SRC_MOD += $(addprefix lib/AnimatedGIF/, \
 	gif.c \
 )
 $(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -DCIRCUITPY
+endif
 
 ifeq ($(CIRCUITPY_ZLIB),1)
 SRC_MOD += $(addprefix lib/uzlib/, \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 3c1c173a51..c28e686b78 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -249,7 +249,8 @@ CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS)
 
 ifeq ($(CIRCUITPY_DISPLAYIO),1)
-CIRCUITPY_GIFIO ?= $(CIRCUITPY_CAMERA)
+#CIRCUITPY_GIFIO ?= $(CIRCUITPY_CAMERA)
+CIRCUITPY_GIFIO ?= 1
 else
 CIRCUITPY_GIFIO ?= 0
 endif
diff --git a/shared-bindings/displayio/OnDiskGif.c b/shared-bindings/displayio/OnDiskGif.c
deleted file mode 100644
index 51651a93e7..0000000000
--- a/shared-bindings/displayio/OnDiskGif.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 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 "shared-bindings/displayio/OnDiskGif.h"
-
-#include 
-
-#include "py/runtime.h"
-#include "py/objproperty.h"
-#include "supervisor/shared/translate/translate.h"
-#include "shared-bindings/displayio/OnDiskGif.h"
-
-//| class OnDiskGif:
-//|     """Loads values straight from disk. This minimizes memory use but can lead to
-//|     much slower pixel load times
-//|
-//|     .. code-block:: Python
-//|
-//|       import board
-//|       import displayio
-//|       import time
-//|       import pulseio
-//|
-//|       splash = displayio.Group()
-//|       board.DISPLAY.show(splash)
-//|
-//|       odg = displayio.OnDiskBitmap('/sample.gif')
-//|       odg.play_frame() # Load the first frame
-//|       face = displayio.TileGrid(odg, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565))
-//|       splash.append(face)
-//|       board.DISPLAY.refresh()
-//|
-//|       # Wait forever
-//|       while True:
-//|           gif.play_frame()
-//|           time.sleep(0.1)"""
-//|
-//|     def __init__(self, file: str) -> None:
-//|         """Create an OnDiskGif object with the given file.
-//|
-//|         :param file file: The name of the GIF file.
-//|
-//|         """
-//|         ...
-STATIC mp_obj_t displayio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    mp_obj_t arg = all_args[0];
-
-    if (mp_obj_is_str(arg)) {
-        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
-    }
-
-    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
-        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
-    }
-
-    displayio_ondiskgif_t *self = m_new_obj(displayio_ondiskgif_t);
-    self->base.type = &displayio_ondiskgif_type;
-    common_hal_displayio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg));
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-//|     width: int
-//|     """Width of the gif. (read only)"""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_width(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_width(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_width_obj, displayio_ondiskgif_obj_get_width);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_width_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_width_obj);
-
-//|     height: int
-//|     """Height of the gif. (read only)"""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_height(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_height(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_height_obj, displayio_ondiskgif_obj_get_height);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_height_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_height_obj);
-
-//|     bitmap: Bitmap
-//|     """The bitmap used to hold the current frame."""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-    return common_hal_displayio_ondiskgif_get_bitmap(self);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_bitmap_obj, displayio_ondiskgif_obj_get_bitmap);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_bitmap_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_bitmap_obj);
-
-//|     play_frame: int
-//|     """Play next frame. Returns expected delay until the next frame."""
-STATIC mp_obj_t displayio_ondiskgif_obj_play_frame(size_t n_args, const mp_obj_t *args) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(args[0]);
-    bool setDirty = mp_const_true;
-
-    if (n_args == 1) {
-        setDirty = mp_obj_is_true(args[1]);
-    }
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_play_frame(self, setDirty));
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(displayio_ondiskgif_play_frame_obj, 1, 2, displayio_ondiskgif_obj_play_frame);
-
-//|     duration: int
-//|     """Returns the total duration of the GIF in milliseconds. (read only)"""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_duration(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_duration_obj, displayio_ondiskgif_obj_get_duration);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_duration_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_duration_obj);
-
-//|     frame_count: int
-//|     """Returns the number of frames in the GIF. (read only)"""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_frame_count(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_frame_count_obj, displayio_ondiskgif_obj_get_frame_count);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_frame_count_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_frame_count_obj);
-
-//|     min_delay: int
-//|     """The minimum delay found between frames. (read only)"""
-STATIC mp_obj_t displayio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_min_delay(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_min_delay_obj, displayio_ondiskgif_obj_get_min_delay);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_min_delay_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_min_delay_obj);
-
-//|     max_delay: int
-//|     """The maximum delay found between frames. (read only)"""
-//|
-STATIC mp_obj_t displayio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
-    displayio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskgif_get_max_delay(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskgif_get_max_delay_obj, displayio_ondiskgif_obj_get_max_delay);
-
-MP_PROPERTY_GETTER(displayio_ondiskgif_max_delay_obj,
-    (mp_obj_t)&displayio_ondiskgif_get_max_delay_obj);
-
-STATIC const mp_rom_map_elem_t displayio_ondiskgif_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskgif_height_obj) },
-    { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_ondiskgif_bitmap_obj) },
-    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_ondiskgif_width_obj) },
-    { MP_ROM_QSTR(MP_QSTR_play_frame), MP_ROM_PTR(&displayio_ondiskgif_play_frame_obj) },
-    { MP_ROM_QSTR(MP_QSTR_duration), MP_ROM_PTR(&displayio_ondiskgif_duration_obj) },
-    { MP_ROM_QSTR(MP_QSTR_frame_count), MP_ROM_PTR(&displayio_ondiskgif_frame_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_min_delay), MP_ROM_PTR(&displayio_ondiskgif_min_delay_obj) },
-    { MP_ROM_QSTR(MP_QSTR_max_delay), MP_ROM_PTR(&displayio_ondiskgif_max_delay_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(displayio_ondiskgif_locals_dict, displayio_ondiskgif_locals_dict_table);
-
-const mp_obj_type_t displayio_ondiskgif_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_OnDiskGif,
-    .make_new = displayio_ondiskgif_make_new,
-    .locals_dict = (mp_obj_dict_t *)&displayio_ondiskgif_locals_dict,
-};
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 4f2905e2e2..3fcd1d082b 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -39,7 +39,6 @@
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/I2CDisplay.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
-#include "shared-bindings/displayio/OnDiskGif.h"
 #include "shared-bindings/displayio/Palette.h"
 #if CIRCUITPY_PARALLELDISPLAY
 #include "shared-bindings/paralleldisplay/ParallelBus.h"
@@ -86,7 +85,6 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_EPaperDisplay), MP_ROM_PTR(&displayio_epaperdisplay_type) },
     { MP_ROM_QSTR(MP_QSTR_Group), MP_ROM_PTR(&displayio_group_type) },
     { MP_ROM_QSTR(MP_QSTR_OnDiskBitmap), MP_ROM_PTR(&displayio_ondiskbitmap_type) },
-    { MP_ROM_QSTR(MP_QSTR_OnDiskGif), MP_ROM_PTR(&displayio_ondiskgif_type) },
     { MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) },
     { MP_ROM_QSTR(MP_QSTR_Shape), MP_ROM_PTR(&displayio_shape_type) },
     { MP_ROM_QSTR(MP_QSTR_TileGrid), MP_ROM_PTR(&displayio_tilegrid_type) },
diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
new file mode 100644
index 0000000000..2030d50b71
--- /dev/null
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -0,0 +1,210 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 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 "shared-bindings/gifio/OnDiskGif.h"
+
+#include 
+
+#include "py/runtime.h"
+#include "py/objproperty.h"
+#include "supervisor/shared/translate/translate.h"
+#include "shared-bindings/gifio/OnDiskGif.h"
+
+//| class OnDiskGif:
+//|     """Loads values straight from disk. This minimizes memory use but can lead to
+//|     much slower pixel load times
+//|
+//|     .. code-block:: Python
+//|
+//|       import board
+//|       import gifio
+//|       import time
+//|       import pulseio
+//|
+//|       splash = gifio.Group()
+//|       board.DISPLAY.show(splash)
+//|
+//|       odg = gifio.OnDiskBitmap('/sample.gif')
+//|       odg.play_frame() # Load the first frame
+//|       face = gifio.TileGrid(odg, pixel_shader=gifio.ColorConverter(input_colorspace=gifio.Colorspace.RGB565))
+//|       splash.append(face)
+//|       board.DISPLAY.refresh()
+//|
+//|       # Wait forever
+//|       while True:
+//|           gif.play_frame()
+//|           time.sleep(0.1)"""
+//|
+//|     def __init__(self, file: str) -> None:
+//|         """Create an OnDiskGif object with the given file.
+//|
+//|         :param file file: The name of the GIF file.
+//|
+//|         """
+//|         ...
+STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+    mp_obj_t arg = all_args[0];
+
+    if (mp_obj_is_str(arg)) {
+        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
+    }
+
+    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
+        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
+    }
+
+    gifio_ondiskgif_t *self = m_new_obj(gifio_ondiskgif_t);
+    self->base.type = &gifio_ondiskgif_type;
+    common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg));
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     width: int
+//|     """Width of the gif. (read only)"""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_width(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_width(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_width_obj, gifio_ondiskgif_obj_get_width);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_width_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_width_obj);
+
+//|     height: int
+//|     """Height of the gif. (read only)"""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_height(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_height(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_height_obj, gifio_ondiskgif_obj_get_height);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_height_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_height_obj);
+
+//|     bitmap: Bitmap
+//|     """The bitmap used to hold the current frame."""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_gifio_ondiskgif_get_bitmap(self);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_bitmap_obj, gifio_ondiskgif_obj_get_bitmap);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
+
+//|     play_frame: int
+//|     """Play next frame. Returns expected delay until the next frame."""
+STATIC mp_obj_t gifio_ondiskgif_obj_play_frame(size_t n_args, const mp_obj_t *args) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(args[0]);
+    bool setDirty = mp_const_true;
+
+    if (n_args == 1) {
+        setDirty = mp_obj_is_true(args[1]);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_play_frame(self, setDirty));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif_play_frame_obj, 1, 2, gifio_ondiskgif_obj_play_frame);
+
+//|     duration: int
+//|     """Returns the total duration of the GIF in milliseconds. (read only)"""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_duration(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_duration_obj, gifio_ondiskgif_obj_get_duration);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_duration_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_duration_obj);
+
+//|     frame_count: int
+//|     """Returns the number of frames in the GIF. (read only)"""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_frame_count(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_frame_count_obj, gifio_ondiskgif_obj_get_frame_count);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_frame_count_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_frame_count_obj);
+
+//|     min_delay: int
+//|     """The minimum delay found between frames. (read only)"""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_min_delay(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_min_delay_obj, gifio_ondiskgif_obj_get_min_delay);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_min_delay_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_min_delay_obj);
+
+//|     max_delay: int
+//|     """The maximum delay found between frames. (read only)"""
+//|
+STATIC mp_obj_t gifio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_max_delay(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_max_delay_obj, gifio_ondiskgif_obj_get_max_delay);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_max_delay_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_max_delay_obj);
+
+STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&gifio_ondiskgif_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&gifio_ondiskgif_bitmap_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&gifio_ondiskgif_width_obj) },
+    { MP_ROM_QSTR(MP_QSTR_play_frame), MP_ROM_PTR(&gifio_ondiskgif_play_frame_obj) },
+    { MP_ROM_QSTR(MP_QSTR_duration), MP_ROM_PTR(&gifio_ondiskgif_duration_obj) },
+    { MP_ROM_QSTR(MP_QSTR_frame_count), MP_ROM_PTR(&gifio_ondiskgif_frame_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_min_delay), MP_ROM_PTR(&gifio_ondiskgif_min_delay_obj) },
+    { MP_ROM_QSTR(MP_QSTR_max_delay), MP_ROM_PTR(&gifio_ondiskgif_max_delay_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(gifio_ondiskgif_locals_dict, gifio_ondiskgif_locals_dict_table);
+
+const mp_obj_type_t gifio_ondiskgif_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_OnDiskGif,
+    .make_new = gifio_ondiskgif_make_new,
+    .locals_dict = (mp_obj_dict_t *)&gifio_ondiskgif_locals_dict,
+};
diff --git a/shared-bindings/displayio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
similarity index 59%
rename from shared-bindings/displayio/OnDiskGif.h
rename to shared-bindings/gifio/OnDiskGif.h
index 6e5041c012..0399724379 100644
--- a/shared-bindings/displayio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -27,23 +27,23 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
 
-#include "shared-module/displayio/OnDiskGif.h"
+#include "shared-module/gifio/OnDiskGif.h"
 #include "extmod/vfs_fat.h"
 
-extern const mp_obj_type_t displayio_ondiskgif_type;
+extern const mp_obj_type_t gifio_ondiskgif_type;
 
-void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_file_obj_t *file);
+void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file);
 
-uint32_t common_hal_displayio_ondiskgif_get_pixel(displayio_ondiskgif_t *bitmap,
+uint32_t common_hal_gifio_ondiskgif_get_pixel(gifio_ondiskgif_t *bitmap,
     int16_t x, int16_t y);
 
-uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self);
-mp_obj_t common_hal_displayio_ondiskgif_get_pixel_shader(displayio_ondiskgif_t *self);
-mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self);
-uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self);
-uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self, bool setDirty);
-int32_t common_hal_displayio_ondiskgif_get_duration(displayio_ondiskgif_t *self);
-int32_t common_hal_displayio_ondiskgif_get_frame_count(displayio_ondiskgif_t *self);
-int32_t common_hal_displayio_ondiskgif_get_min_delay(displayio_ondiskgif_t *self);
-int32_t common_hal_displayio_ondiskgif_get_max_delay(displayio_ondiskgif_t *self);
+uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self);
+mp_obj_t common_hal_gifio_ondiskgif_get_pixel_shader(gifio_ondiskgif_t *self);
+mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self);
+uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self);
+uint8_t common_hal_gifio_ondiskgif_play_frame(gifio_ondiskgif_t *self, bool setDirty);
+int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self);
+int32_t common_hal_gifio_ondiskgif_get_frame_count(gifio_ondiskgif_t *self);
+int32_t common_hal_gifio_ondiskgif_get_min_delay(gifio_ondiskgif_t *self);
+int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self);
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
diff --git a/shared-bindings/gifio/__init__.c b/shared-bindings/gifio/__init__.c
index 6bd5765966..bfc87f0d99 100644
--- a/shared-bindings/gifio/__init__.c
+++ b/shared-bindings/gifio/__init__.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "shared-bindings/gifio/GifWriter.h"
+#include "shared-bindings/gifio/OnDiskGif.h"
 #include "shared-bindings/util.h"
 
 //| """Access GIF-format images
@@ -34,6 +35,7 @@
 STATIC const mp_rom_map_elem_t gifio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gifio) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_GifWriter),  MP_ROM_PTR(&gifio_gifwriter_type)},
+    { MP_ROM_QSTR(MP_QSTR_OnDiskGif), MP_ROM_PTR(&gifio_ondiskgif_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(gifio_module_globals, gifio_module_globals_table);
diff --git a/shared-module/displayio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
similarity index 85%
rename from shared-module/displayio/OnDiskGif.c
rename to shared-module/gifio/OnDiskGif.c
index 1ef7fbed96..faa20d5586 100644
--- a/shared-module/displayio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -24,12 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/displayio/OnDiskGif.h"
-#include "shared-bindings/displayio/ColorConverter.h"
-#include "shared-bindings/displayio/Palette.h"
+#include "shared-bindings/gifio/OnDiskGif.h"
 #include "shared-bindings/displayio/Bitmap.h"
-#include "shared-module/displayio/ColorConverter.h"
-#include "shared-module/displayio/Palette.h"
 
 #include 
 
@@ -124,7 +120,7 @@ static void GIFDraw(GIFDRAW *pDraw) {
     }
 }
 
-void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_file_obj_t *file) {
+void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file) {
     // mp_printf(&mp_plat_print, "Begin OnDiskGif\n");
     self->file = file;
 
@@ -161,35 +157,35 @@ void common_hal_displayio_ondiskgif_construct(displayio_ondiskgif_t *self, pyb_f
     // mp_printf(&mp_plat_print, "GIF_init returned %d %x\n", result, bitmap->data);
 }
 
-uint16_t common_hal_displayio_ondiskgif_get_height(displayio_ondiskgif_t *self) {
+uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self) {
     return (uint16_t)self->gif.iCanvasHeight;
 }
 
-uint16_t common_hal_displayio_ondiskgif_get_width(displayio_ondiskgif_t *self) {
+uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self) {
     return (uint16_t)self->gif.iCanvasWidth;
 }
 
-mp_obj_t common_hal_displayio_ondiskgif_get_bitmap(displayio_ondiskgif_t *self) {
+mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self) {
     return MP_OBJ_FROM_PTR(self->bitmap);
 }
 
-int32_t common_hal_displayio_ondiskgif_get_duration(displayio_ondiskgif_t *self) {
+int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self) {
     return self->duration;
 }
 
-int32_t common_hal_displayio_ondiskgif_get_frame_count(displayio_ondiskgif_t *self) {
+int32_t common_hal_gifio_ondiskgif_get_frame_count(gifio_ondiskgif_t *self) {
     return self->frame_count;
 }
 
-int32_t common_hal_displayio_ondiskgif_get_min_delay(displayio_ondiskgif_t *self) {
+int32_t common_hal_gifio_ondiskgif_get_min_delay(gifio_ondiskgif_t *self) {
     return self->min_delay;
 }
 
-int32_t common_hal_displayio_ondiskgif_get_max_delay(displayio_ondiskgif_t *self) {
+int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) {
     return self->max_delay;
 }
 
-uint8_t common_hal_displayio_ondiskgif_play_frame(displayio_ondiskgif_t *self, bool setDirty) {
+uint8_t common_hal_gifio_ondiskgif_play_frame(gifio_ondiskgif_t *self, bool setDirty) {
     int nextDelay = 0;
     int result = GIF_playFrame(&self->gif, &nextDelay, self->bitmap);
 
diff --git a/shared-module/displayio/OnDiskGif.h b/shared-module/gifio/OnDiskGif.h
similarity index 96%
rename from shared-module/displayio/OnDiskGif.h
rename to shared-module/gifio/OnDiskGif.h
index 5089e52b42..b142d78938 100644
--- a/shared-module/displayio/OnDiskGif.h
+++ b/shared-module/gifio/OnDiskGif.h
@@ -33,7 +33,7 @@
 #include "py/obj.h"
 
 #include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h"
-#include "Bitmap.h"
+#include "shared-module/displayio/Bitmap.h"
 
 #include "extmod/vfs_fat.h"
 
@@ -46,6 +46,6 @@ typedef struct {
     int32_t frame_count;
     int32_t min_delay;
     int32_t max_delay;
-} displayio_ondiskgif_t;
+} gifio_ondiskgif_t;
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKGIF_H

From cab38ed6a6088526526642a53624aa7e17c146e9 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 12 Feb 2023 11:51:23 -0600
Subject: [PATCH 1815/2403] Doc fixes and renamed play_frame to next_frame

---
 shared-bindings/gifio/OnDiskGif.c | 32 ++++++++++++++++---------------
 shared-bindings/gifio/OnDiskGif.h |  4 ++--
 shared-module/gifio/OnDiskGif.c   |  4 ++--
 shared-module/gifio/OnDiskGif.h   |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 2030d50b71..b790d1dc3a 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 Mark Komus
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,28 +34,28 @@
 #include "shared-bindings/gifio/OnDiskGif.h"
 
 //| class OnDiskGif:
-//|     """Loads values straight from disk. This minimizes memory use but can lead to
-//|     much slower pixel load times
+//|     """Loads frames of the GIF straight from disk. This minimizes memory use but can
+//|     lead to much slower pixel load times
 //|
 //|     .. code-block:: Python
 //|
 //|       import board
 //|       import gifio
+//|       import displayio
 //|       import time
-//|       import pulseio
 //|
-//|       splash = gifio.Group()
+//|       splash = displayio.Group()
 //|       board.DISPLAY.show(splash)
 //|
-//|       odg = gifio.OnDiskBitmap('/sample.gif')
-//|       odg.play_frame() # Load the first frame
-//|       face = gifio.TileGrid(odg, pixel_shader=gifio.ColorConverter(input_colorspace=gifio.Colorspace.RGB565))
+//|       odg = gifio.OnDiskGif('/sample.gif')
+//|       odg.next_frame() # Load the first frame
+//|       face = displayio.TileGrid(odg, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565))
 //|       splash.append(face)
 //|       board.DISPLAY.refresh()
 //|
 //|       # Wait forever
 //|       while True:
-//|           gif.play_frame()
+//|           gif.next_frame()
 //|           time.sleep(0.1)"""
 //|
 //|     def __init__(self, file: str) -> None:
@@ -122,9 +122,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_bitmap_obj, gifio_ondiskgif_obj_ge
 MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
     (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
 
-//|     play_frame: int
-//|     """Play next frame. Returns expected delay until the next frame."""
-STATIC mp_obj_t gifio_ondiskgif_obj_play_frame(size_t n_args, const mp_obj_t *args) {
+//|     def next_frame(self, set_dirty: bool = True) -> int:
+//|         """Loads the next frame. Returns expected delay before the next frame in milliseconds.
+//|
+//|         :param set_dirty: Mark the bitmap as dirty"""
+STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(size_t n_args, const mp_obj_t *args) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(args[0]);
     bool setDirty = mp_const_true;
 
@@ -132,10 +134,10 @@ STATIC mp_obj_t gifio_ondiskgif_obj_play_frame(size_t n_args, const mp_obj_t *ar
         setDirty = mp_obj_is_true(args[1]);
     }
 
-    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_play_frame(self, setDirty));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_next_frame(self, setDirty));
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif_play_frame_obj, 1, 2, gifio_ondiskgif_obj_play_frame);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif_next_frame_obj, 1, 2, gifio_ondiskgif_obj_next_frame);
 
 //|     duration: int
 //|     """Returns the total duration of the GIF in milliseconds. (read only)"""
@@ -194,7 +196,7 @@ STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&gifio_ondiskgif_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&gifio_ondiskgif_bitmap_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&gifio_ondiskgif_width_obj) },
-    { MP_ROM_QSTR(MP_QSTR_play_frame), MP_ROM_PTR(&gifio_ondiskgif_play_frame_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_frame), MP_ROM_PTR(&gifio_ondiskgif_next_frame_obj) },
     { MP_ROM_QSTR(MP_QSTR_duration), MP_ROM_PTR(&gifio_ondiskgif_duration_obj) },
     { MP_ROM_QSTR(MP_QSTR_frame_count), MP_ROM_PTR(&gifio_ondiskgif_frame_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_min_delay), MP_ROM_PTR(&gifio_ondiskgif_min_delay_obj) },
diff --git a/shared-bindings/gifio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
index 0399724379..aa84baf32d 100644
--- a/shared-bindings/gifio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 Mark Komus
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,7 @@ uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self);
 mp_obj_t common_hal_gifio_ondiskgif_get_pixel_shader(gifio_ondiskgif_t *self);
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self);
 uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self);
-uint8_t common_hal_gifio_ondiskgif_play_frame(gifio_ondiskgif_t *self, bool setDirty);
+uint8_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty);
 int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_frame_count(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_min_delay(gifio_ondiskgif_t *self);
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index faa20d5586..05de2d59ff 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 Mark Komus
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -185,7 +185,7 @@ int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) {
     return self->max_delay;
 }
 
-uint8_t common_hal_gifio_ondiskgif_play_frame(gifio_ondiskgif_t *self, bool setDirty) {
+uint8_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) {
     int nextDelay = 0;
     int result = GIF_playFrame(&self->gif, &nextDelay, self->bitmap);
 
diff --git a/shared-module/gifio/OnDiskGif.h b/shared-module/gifio/OnDiskGif.h
index b142d78938..c40781ef1f 100644
--- a/shared-module/gifio/OnDiskGif.h
+++ b/shared-module/gifio/OnDiskGif.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 Mark Komus
  *
  * 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 65e9d937ac2e0df60d35414274ea5f4a30412147 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Mon, 13 Feb 2023 10:42:24 +0530
Subject: [PATCH 1816/2403] use python based msgfmt

---
 .github/actions/deps/external/action.yml |  17 +-
 .github/actions/deps/python/action.yml   |  13 +-
 .github/workflows/build-mpy-cross.yml    |   4 -
 .github/workflows/build.yml              |   4 +-
 .github/workflows/create_website_pr.yml  |   2 -
 .github/workflows/pre-commit.yml         |   2 +-
 .github/workflows/run-tests.yml          |   1 +
 py/py.mk                                 |   2 +-
 tools/msgfmt.py                          | 244 +++++++++++++++++++++++
 9 files changed, 259 insertions(+), 30 deletions(-)
 create mode 100644 tools/msgfmt.py

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 408a2e8555..9f5c3bd7c9 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -12,16 +12,6 @@ inputs:
     - riscv
     - none
 
-  apt:
-    required: false
-    default: true
-    type: boolean
-
-  python:
-    required: false
-    default: true
-    type: boolean
-
 runs:
   using: composite
   steps:
@@ -85,15 +75,10 @@ runs:
 
     # common
     - name: Cache python dependencies
-      if: inputs.python == 'true' && inputs.platform != 'espressif'
+      if: inputs.platform != 'espressif'
       uses: ./.github/actions/deps/python
       with:
         action: ${{ fromJSON('["restore", "cache"]')[github.job == 'scheduler'] }}
     - name: Install python dependencies
-      if: inputs.python == 'true'
       run: pip install -r requirements-dev.txt
       shell: bash
-    - name: Install dependencies
-      if: inputs.apt == 'true'
-      run: sudo apt-get install -y gettext
-      shell: bash
diff --git a/.github/actions/deps/python/action.yml b/.github/actions/deps/python/action.yml
index fb978ef063..9b3732c9e0 100644
--- a/.github/actions/deps/python/action.yml
+++ b/.github/actions/deps/python/action.yml
@@ -14,22 +14,29 @@ runs:
   using: composite
   steps:
     - name: Cache python dependencies
-      if: ${{ inputs.action == 'cache' }}
+      id: cache-python-deps
+      if: inputs.action == 'cache'
       uses: actions/cache@v3
       with:
         path: .cp_tools
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
 
     - name: Restore python dependencies
-      if: ${{ inputs.action == 'restore' }}
+      id: restore-python-deps
+      if: inputs.action == 'restore'
       uses: actions/cache/restore@v3
       with:
         path: .cp_tools
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
 
     - name: Set up venv
+      if: inputs.action == 'cache' && !steps.cache-python-deps.outputs.cache-hit
+      run: python -m venv .cp_tools
+      shell: bash
+
+    - name: Activate venv
+      if: inputs.action == 'cache' || (inputs.action == 'restore' && steps.restore-python-deps.outputs.cache-hit)
       run: |
-        python -m venv .cp_tools
         source .cp_tools/bin/activate
         echo >> $GITHUB_PATH "$PATH"
       shell: bash
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
index a2c0c64289..c17c9da1cb 100644
--- a/.github/workflows/build-mpy-cross.yml
+++ b/.github/workflows/build-mpy-cross.yml
@@ -35,10 +35,6 @@ jobs:
       uses: ./.github/actions/deps/submodules
       with:
         target: mpy-cross
-    - name: Set up external
-      uses: ./.github/actions/deps/external
-      with:
-        python: false
 
     - name: Install toolchain (aarch64)
       if: matrix.mpy-cross == 'static-aarch64'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c40acd6d3..cdf9462289 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -179,9 +179,7 @@ jobs:
       uses: ./.github/actions/deps/submodules
     - name: Install dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y eatmydata
-        sudo eatmydata apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
+        sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
       run: make check-stubs -j2
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 9f89490161..eeae8c8299 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -31,8 +31,6 @@ jobs:
         version: true
     - name: Set up external
       uses: ./.github/actions/deps/external
-      with:
-        apt: false
     - name: Versions
       run: |
         gcc --version
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index fc36f2a505..c0dff33564 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Set up external
       uses: ./.github/actions/deps/external
     - name: Install dependencies
-      run: sudo apt-get install -y uncrustify
+      run: sudo apt-get install -y gettext uncrustify
     - name: Run pre-commit
       uses: pre-commit/action@v3.0.0
     - name: Make patch
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 1ab0f6eeab..12e8d2ef74 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -37,6 +37,7 @@ jobs:
       with:
         target: tests
     - name: Set up external
+      if: matrix.test == 'all'
       uses: ./.github/actions/deps/external
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
diff --git a/py/py.mk b/py/py.mk
index 0cbfd252f2..c598f44cbd 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -243,7 +243,7 @@ $(HEADER_BUILD)/mpversion.h: FORCE | $(HEADER_BUILD)
 MPCONFIGPORT_MK = $(wildcard mpconfigport.mk)
 
 $(HEADER_BUILD)/$(TRANSLATION).mo: $(TOP)/locale/$(TRANSLATION).po | $(HEADER_BUILD)
-	$(Q)msgfmt -o $@ $^
+	$(Q)$(PYTHON) $(TOP)/tools/msgfmt.py -o $@ $^
 
 $(HEADER_BUILD)/qstrdefs.preprocessed.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEFS_COLLECTED) mpconfigport.h $(MPCONFIGPORT_MK) $(PY_SRC)/mpconfig.h | $(HEADER_BUILD)
 	$(STEPECHO) "GEN $@"
diff --git a/tools/msgfmt.py b/tools/msgfmt.py
new file mode 100644
index 0000000000..1ed594b84f
--- /dev/null
+++ b/tools/msgfmt.py
@@ -0,0 +1,244 @@
+#! /usr/bin/env python3
+# Written by Martin v. Löwis 
+
+"""Generate binary message catalog from textual translation description.
+This program converts a textual Uniforum-style message catalog (.po file) into
+a binary GNU catalog (.mo file).  This is essentially the same function as the
+GNU msgfmt program, however, it is a simpler implementation.  Currently it
+does not handle plural forms but it does handle message contexts.
+Usage: msgfmt.py [OPTIONS] filename.po
+Options:
+    -o file
+    --output-file=file
+        Specify the output file to write to.  If omitted, output will go to a
+        file named filename.mo (based off the input file name).
+    -h
+    --help
+        Print this message and exit.
+    -V
+    --version
+        Display version information and exit.
+"""
+
+import os
+import sys
+import ast
+import getopt
+import struct
+import array
+from email.parser import HeaderParser
+
+__version__ = "1.2"
+
+MESSAGES = {}
+
+
+def usage(code, msg=""):
+    print(__doc__, file=sys.stderr)
+    if msg:
+        print(msg, file=sys.stderr)
+    sys.exit(code)
+
+
+def add(ctxt, id, str, fuzzy):
+    "Add a non-fuzzy translation to the dictionary."
+    global MESSAGES
+    if not fuzzy and str:
+        if ctxt is None:
+            MESSAGES[id] = str
+        else:
+            MESSAGES[b"%b\x04%b" % (ctxt, id)] = str
+
+
+def generate():
+    "Return the generated output."
+    global MESSAGES
+    # the keys are sorted in the .mo file
+    keys = sorted(MESSAGES.keys())
+    offsets = []
+    ids = strs = b""
+    for id in keys:
+        # For each string, we need size and file offset.  Each string is NUL
+        # terminated; the NUL does not count into the size.
+        offsets.append((len(ids), len(id), len(strs), len(MESSAGES[id])))
+        ids += id + b"\0"
+        strs += MESSAGES[id] + b"\0"
+    output = ""
+    # The header is 7 32-bit unsigned integers.  We don't use hash tables, so
+    # the keys start right after the index tables.
+    # translated string.
+    keystart = 7 * 4 + 16 * len(keys)
+    # and the values start after the keys
+    valuestart = keystart + len(ids)
+    koffsets = []
+    voffsets = []
+    # The string table first has the list of keys, then the list of values.
+    # Each entry has first the size of the string, then the file offset.
+    for o1, l1, o2, l2 in offsets:
+        koffsets += [l1, o1 + keystart]
+        voffsets += [l2, o2 + valuestart]
+    offsets = koffsets + voffsets
+    output = struct.pack(
+        "Iiiiiii",
+        0x950412DE,  # Magic
+        0,  # Version
+        len(keys),  # # of entries
+        7 * 4,  # start of key index
+        7 * 4 + len(keys) * 8,  # start of value index
+        0,
+        0,
+    )  # size and offset of hash table
+    output += array.array("i", offsets).tobytes()
+    output += ids
+    output += strs
+    return output
+
+
+def make(filename, outfile):
+    ID = 1
+    STR = 2
+    CTXT = 3
+
+    # Compute .mo name from .po name and arguments
+    if filename.endswith(".po"):
+        infile = filename
+    else:
+        infile = filename + ".po"
+    if outfile is None:
+        outfile = os.path.splitext(infile)[0] + ".mo"
+
+    try:
+        with open(infile, "rb") as f:
+            lines = f.readlines()
+    except IOError as msg:
+        print(msg, file=sys.stderr)
+        sys.exit(1)
+
+    section = msgctxt = None
+    fuzzy = 0
+
+    # Start off assuming Latin-1, so everything decodes without failure,
+    # until we know the exact encoding
+    encoding = "latin-1"
+
+    # Parse the catalog
+    lno = 0
+    for l in lines:
+        l = l.decode(encoding)
+        lno += 1
+        # If we get a comment line after a msgstr, this is a new entry
+        if l[0] == "#" and section == STR:
+            add(msgctxt, msgid, msgstr, fuzzy)
+            section = msgctxt = None
+            fuzzy = 0
+        # Record a fuzzy mark
+        if l[:2] == "#," and "fuzzy" in l:
+            fuzzy = 1
+        # Skip comments
+        if l[0] == "#":
+            continue
+        # Now we are in a msgid or msgctxt section, output previous section
+        if l.startswith("msgctxt"):
+            if section == STR:
+                add(msgctxt, msgid, msgstr, fuzzy)
+            section = CTXT
+            l = l[7:]
+            msgctxt = b""
+        elif l.startswith("msgid") and not l.startswith("msgid_plural"):
+            if section == STR:
+                add(msgctxt, msgid, msgstr, fuzzy)
+                if not msgid:
+                    # See whether there is an encoding declaration
+                    p = HeaderParser()
+                    charset = p.parsestr(msgstr.decode(encoding)).get_content_charset()
+                    if charset:
+                        encoding = charset
+            section = ID
+            l = l[5:]
+            msgid = msgstr = b""
+            is_plural = False
+        # This is a message with plural forms
+        elif l.startswith("msgid_plural"):
+            if section != ID:
+                print(
+                    "msgid_plural not preceded by msgid on %s:%d" % (infile, lno), file=sys.stderr
+                )
+                sys.exit(1)
+            l = l[12:]
+            msgid += b"\0"  # separator of singular and plural
+            is_plural = True
+        # Now we are in a msgstr section
+        elif l.startswith("msgstr"):
+            section = STR
+            if l.startswith("msgstr["):
+                if not is_plural:
+                    print("plural without msgid_plural on %s:%d" % (infile, lno), file=sys.stderr)
+                    sys.exit(1)
+                l = l.split("]", 1)[1]
+                if msgstr:
+                    msgstr += b"\0"  # Separator of the various plural forms
+            else:
+                if is_plural:
+                    print(
+                        "indexed msgstr required for plural on  %s:%d" % (infile, lno),
+                        file=sys.stderr,
+                    )
+                    sys.exit(1)
+                l = l[6:]
+        # Skip empty lines
+        l = l.strip()
+        if not l:
+            continue
+        l = ast.literal_eval(l)
+        if section == CTXT:
+            msgctxt += l.encode(encoding)
+        elif section == ID:
+            msgid += l.encode(encoding)
+        elif section == STR:
+            msgstr += l.encode(encoding)
+        else:
+            print("Syntax error on %s:%d" % (infile, lno), "before:", file=sys.stderr)
+            print(l, file=sys.stderr)
+            sys.exit(1)
+    # Add last entry
+    if section == STR:
+        add(msgctxt, msgid, msgstr, fuzzy)
+
+    # Compute output
+    output = generate()
+
+    try:
+        with open(outfile, "wb") as f:
+            f.write(output)
+    except IOError as msg:
+        print(msg, file=sys.stderr)
+
+
+def main():
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "hVo:", ["help", "version", "output-file="])
+    except getopt.error as msg:
+        usage(1, msg)
+
+    outfile = None
+    # parse options
+    for opt, arg in opts:
+        if opt in ("-h", "--help"):
+            usage(0)
+        elif opt in ("-V", "--version"):
+            print("msgfmt.py", __version__)
+            sys.exit(0)
+        elif opt in ("-o", "--output-file"):
+            outfile = arg
+    # do it
+    if not args:
+        print("No input file given", file=sys.stderr)
+        print("Try `msgfmt --help' for more information.", file=sys.stderr)
+        return
+
+    for filename in args:
+        make(filename, outfile)
+
+
+if __name__ == "__main__":
+    main()

From 5c2bd38684c94631b5750ef5c56834e3263a56a6 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Mon, 13 Feb 2023 09:40:16 -0600
Subject: [PATCH 1817/2403] Removed gifio module from tests

---
 .../unix/variants/coverage/mpconfigvariant.mk |  1 -
 tests/unix/extra_coverage.py.exp              | 22 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index e351fc0836..fd12bbd8b5 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -26,7 +26,6 @@ CFLAGS += -DCIRCUITPY_QRIO=1
 $(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-shadow -Wno-sign-compare -include shared-module/qrio/quirc_alloc.h
 
 SRC_BITMAP := \
-	$(patsubst ../../%,%,$(wildcard ../../shared-bindings/gifio/*.c ../../shared-module/gifio/*.c)) \
 	shared/runtime/context_manager_helpers.c \
 	displayio_min.c \
 	shared-bindings/aesio/aes.c \
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 582d90e1bc..65f67f0727 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -33,17 +33,17 @@ builtins        micropython     _asyncio        _thread
 _uasyncio       aesio           array           binascii
 bitmaptools     btree           cexample        cmath
 collections     cppexample      displayio       errno
-ffi             framebuf        gc              gifio
-hashlib         json            math            qrio
-rainbowio       re              sys             termios
-traceback       ubinascii       uctypes         uerrno
-uheapq          uio             ujson           ulab
-ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
-ulab.scipy      ulab.scipy.linalg
-ulab.scipy.optimize             ulab.scipy.signal
-ulab.scipy.special              ulab.utils      uos
-urandom         ure             uselect         ustruct
-utime           utimeq          uzlib           zlib
+ffi             framebuf        gc              hashlib
+json            math            qrio            rainbowio
+re              sys             termios         traceback
+ubinascii       uctypes         uerrno          uheapq
+uio             ujson           ulab            ulab.numpy
+ulab.numpy.fft  ulab.numpy.linalg               ulab.scipy
+ulab.scipy.linalg               ulab.scipy.optimize
+ulab.scipy.signal               ulab.scipy.special
+ulab.utils      uos             urandom         ure
+uselect         ustruct         utime           utimeq
+uzlib           zlib
 ime
 
 utime           utimeq

From 676cbb308db2b8a8da758ecab7f6f4f8ea0fcfa6 Mon Sep 17 00:00:00 2001
From: Pierre Constantineau 
Date: Mon, 13 Feb 2023 09:52:18 -0600
Subject: [PATCH 1818/2403] minor update to boards.c to fix mismatched number
 of LEDs causing LEDs not to be reset

---
 ports/raspberrypi/boards/jpconstantineau_pykey18/board.c | 2 +-
 ports/raspberrypi/boards/jpconstantineau_pykey44/board.c | 2 +-
 ports/raspberrypi/boards/jpconstantineau_pykey87/board.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
index 4785f742ec..5b1190727f 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
@@ -31,7 +31,7 @@
 
 void reset_board(void) {
     // turn off any left over LED
-    board_reset_user_neopixels(&pin_GPIO29, 62);
+    board_reset_user_neopixels(&pin_GPIO29, 19);
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
index 4785f742ec..4e0aa74450 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
@@ -31,7 +31,7 @@
 
 void reset_board(void) {
     // turn off any left over LED
-    board_reset_user_neopixels(&pin_GPIO29, 62);
+    board_reset_user_neopixels(&pin_GPIO29, 45);
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
index 4785f742ec..a77563c663 100644
--- a/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
@@ -31,7 +31,7 @@
 
 void reset_board(void) {
     // turn off any left over LED
-    board_reset_user_neopixels(&pin_GPIO29, 62);
+    board_reset_user_neopixels(&pin_GPIO29, 88);
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

From 88212b066ed931a9108178b5743d38cf6ca8d0b0 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Mon, 13 Feb 2023 11:32:25 -0600
Subject: [PATCH 1819/2403] Doc fix

---
 shared-bindings/gifio/OnDiskGif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index b790d1dc3a..3d5bc03f62 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -110,7 +110,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_height_obj, gifio_ondiskgif_obj_ge
 MP_PROPERTY_GETTER(gifio_ondiskgif_height_obj,
     (mp_obj_t)&gifio_ondiskgif_get_height_obj);
 
-//|     bitmap: Bitmap
+//|     bitmap: displayio.Bitmap
 //|     """The bitmap used to hold the current frame."""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);

From 1f1a495e26a94873f7094a59400465171e5558ad Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Mon, 13 Feb 2023 20:57:54 +0200
Subject: [PATCH 1820/2403] rename _pystack -> pystack

---
 main.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 8376e0b089..6f3f2820cd 100644
--- a/main.c
+++ b/main.c
@@ -123,8 +123,8 @@ uint8_t value_out = 0;
 #endif
 
 #if MICROPY_ENABLE_PYSTACK
-size_t *_pystack;
-int _pystack_size = CIRCUITPY_PYSTACK_SIZE;
+size_t *pystack;
+int pystack_size = CIRCUITPY_PYSTACK_SIZE;
 #endif
 
 static void reset_devices(void) {
@@ -161,7 +161,7 @@ STATIC void start_mp(supervisor_allocation *heap) {
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(_pystack, _pystack + (_pystack_size / sizeof(size_t)));
+    mp_pystack_init(pystack, pystack + (pystack_size / sizeof(size_t)));
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -914,8 +914,10 @@ STATIC int run_repl(void) {
 
 int __attribute__((used)) main(void) {
 
+    #if MICROPY_ENABLE_PYSTACK
     // allocate the pystack
-    _pystack = (size_t *)allocate_memory(_pystack_size, false, false);
+    pystack = (size_t *)allocate_memory(pystack_size, false, false);
+    #endif
 
     // initialise the cpu and peripherals
     safe_mode_t safe_mode = port_init();

From 575f177dd09f0f518f7e2c8514b20e9b12c19af8 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 14:44:46 -0500
Subject: [PATCH 1821/2403] Update
 ports/broadcom/common-hal/neopixel_write/__init__.c

Co-authored-by: Scott Shawcroft 
---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index d685ac53ce..38b1028bb3 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -96,7 +96,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         // Wait for the clock to start up.
         COMPLETE_MEMORY_READS;
         icnt = 0;
-        while ((CM_PWM->CS_b.BUSY == 0) & (icnt++ < 1000)) {
+        while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {
             COMPLETE_MEMORY_READS;
         }
     }

From 791aefd3880d8c0f58baa2e9cd7cc40815d05059 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 14:44:54 -0500
Subject: [PATCH 1822/2403] Update
 ports/broadcom/common-hal/neopixel_write/__init__.c

Co-authored-by: Scott Shawcroft 
---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index 38b1028bb3..b631953c50 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -46,7 +46,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     // Wait to make sure we don't append onto the last transmission. This should only be a tick or
     // two.
     int icnt;
-    while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) &
+    while ((port_get_raw_ticks(NULL) < next_start_raw_ticks) &&
            (next_start_raw_ticks - port_get_raw_ticks(NULL) < 100)) {
         RUN_BACKGROUND_TASKS;
     }

From dcb6955fa5a8619e222109a334bdd31f377fd337 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 14:58:37 -0500
Subject: [PATCH 1823/2403] use boolean and symbols

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index b631953c50..b42bfb9de8 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -141,7 +141,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         }
         if (channel == 1) {
             icnt = 0;
-            while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+            while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
                 COMPLETE_MEMORY_READS;
             }
@@ -149,14 +149,14 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
             pwm->FIF1 = 0x000000;
         }
         icnt = 0;
-        while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+        while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
             RUN_BACKGROUND_TASKS;
             COMPLETE_MEMORY_READS;
         }
         pwm->FIF1 = expanded;
         if (channel == 0) {
             icnt = 0;
-            while ((pwm->STA_b.FULL1 == 1) & (icnt++ < 150)) {
+            while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
                 COMPLETE_MEMORY_READS;
             }
@@ -166,19 +166,19 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     }
 
     icnt = 0;
-    while ((pwm->STA_b.EMPT1 == 0) & (icnt++ < 2500)) {
+    while ((pwm->STA_b.EMPT1 == 0) && (icnt++ < 2500)) {
         RUN_BACKGROUND_TASKS;
         COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to start.
     icnt = 0;
-    while (((pwm->STA_b.STA1 == 0) & (pwm->STA_b.STA2 == 0)) & (icnt++ < 150)) {
+    while (((pwm->STA_b.STA1 == 0) && (pwm->STA_b.STA2 == 0)) && (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
         COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to complete.
     icnt = 0;
-    while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) & (icnt++ < 150)) {
+    while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
         COMPLETE_MEMORY_READS;
     }

From be67cb72add7918de5b4e073569cbbe6c88111eb Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Mon, 13 Feb 2023 17:04:54 -0600
Subject: [PATCH 1824/2403] Disable for pewpew_m4 for space

---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 32be4805d7..914a676e94 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -37,6 +37,7 @@ CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_VECTORIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
+CIRCUITPY_GIFIO = 0
 
 CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOIO = 1

From d8231f15886ef43cf3a052c50bca49ec6dd150ff Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 11 Feb 2023 23:50:20 -0500
Subject: [PATCH 1825/2403] Implement safemode.py

---
 README.rst                                    |  14 +-
 locale/circuitpython.pot                      | 111 +++++++------
 main.c                                        |  65 ++++++--
 .../circuitplayground_express/mpconfigboard.h |   2 +-
 .../mpconfigboard.h                           |   2 +-
 .../mpconfigboard.h                           |   2 +-
 .../boards/meowmeow/mpconfigboard.h           |   2 +-
 .../common-hal/microcontroller/__init__.c     |   7 +-
 ports/atmel-samd/supervisor/port.c            |  10 +-
 .../common-hal/microcontroller/__init__.c     |   2 +-
 ports/broadcom/supervisor/port.c              |   4 +-
 .../common-hal/microcontroller/__init__.c     |   2 +-
 ports/cxd56/supervisor/port.c                 |   4 +-
 .../adafruit_feather_esp32_v2/mpconfigboard.h |   2 +-
 .../hardkernel_odroid_go/mpconfigboard.h      |   2 +-
 .../boards/m5stack_atom_echo/mpconfigboard.h  |   2 +-
 .../boards/m5stack_atom_lite/mpconfigboard.h  |   2 +-
 .../m5stack_atom_matrix/mpconfigboard.h       |   2 +-
 .../boards/m5stack_atom_u/mpconfigboard.h     |   2 +-
 .../boards/m5stack_core_basic/mpconfigboard.h |   2 +-
 .../boards/m5stack_core_fire/mpconfigboard.h  |   2 +-
 .../boards/m5stack_stick_c/mpconfigboard.h    |   2 +-
 .../common-hal/microcontroller/__init__.c     |   2 +-
 ports/espressif/supervisor/port.c             |  10 +-
 .../common-hal/microcontroller/__init__.c     |   7 +-
 ports/litex/supervisor/port.c                 |   2 +-
 .../common-hal/microcontroller/__init__.c     |   8 +-
 ports/mimxrt10xx/supervisor/port.c            |  12 +-
 .../nrf/boards/aramcon2_badge/mpconfigboard.h |   2 +-
 ports/nrf/common-hal/_bleio/Adapter.c         |   2 +-
 .../nrf/common-hal/microcontroller/__init__.c |   7 +-
 ports/nrf/supervisor/internal_flash.c         |   2 +-
 ports/nrf/supervisor/port.c                   |   8 +-
 .../common-hal/microcontroller/__init__.c     |   4 +-
 ports/raspberrypi/supervisor/port.c           |   6 +-
 ports/stm/common-hal/canio/Listener.c         |   3 +-
 .../stm/common-hal/microcontroller/__init__.c |   7 +-
 ports/stm/supervisor/internal_flash.c         |  12 +-
 ports/stm/supervisor/port.c                   |  10 +-
 py/circuitpy_defns.mk                         |   1 +
 py/circuitpy_mpconfig.mk                      |   4 +
 py/gc.c                                       |   4 +-
 shared-bindings/microcontroller/ResetReason.c |   2 +-
 shared-bindings/supervisor/Runtime.c          |  18 +-
 shared-bindings/supervisor/Runtime.h          |   4 +
 shared-bindings/supervisor/SafeModeReason.c   | 156 ++++++++++++++++++
 shared-bindings/supervisor/SafeModeReason.h   |  31 ++++
 shared-bindings/supervisor/__init__.c         |   5 +
 supervisor/messages/default.h                 |  99 -----------
 supervisor/shared/safe_mode.c                 | 112 ++++++-------
 supervisor/shared/safe_mode.h                 |  43 ++---
 supervisor/shared/stack.c                     |   2 +-
 supervisor/shared/usb/usb_desc.c              |   6 +-
 supervisor/stub/safe_mode.c                   |   2 +-
 54 files changed, 497 insertions(+), 341 deletions(-)
 create mode 100644 shared-bindings/supervisor/SafeModeReason.c
 create mode 100644 shared-bindings/supervisor/SafeModeReason.h
 delete mode 100644 supervisor/messages/default.h

diff --git a/README.rst b/README.rst
index d8a35fb98c..35a66669ed 100644
--- a/README.rst
+++ b/README.rst
@@ -138,6 +138,14 @@ Behavior
 -  Adds a safe mode that does not run user code after a hard crash or brown out. This makes it
    possible to fix code that causes nasty crashes by making it available through mass storage after
    the crash. A reset (the button) is needed after it's fixed to get back into normal mode.
+-  Safe mode may be handled programmatically by providing a ``safemode.py``.
+   ``safemode.py`` is run if the board has reset due to entering safe mode. USB is not
+   available so nothing can be printed. ``safemode.py`` can determine why the safe mode occurred
+   using ``supervisor.runtime.safe_mode_reason``, and take appropriate action. For instance,
+   if a hard crash occurred, ``safemode.py`` may do a ``microcontroller.reset()``
+   to automatically restart despite the crash.
+   If the battery is low, but is being charged, ``safemode.py`` may put the board in deep sleep
+   for a while. Or it may simply reset, and have ``code.py`` check the voltage and do the sleep.
 -  RGB status LED indicating CircuitPython state.
    - One green flash - code completed without error.
    - Two red flashes - code ended due to an exception.
@@ -145,9 +153,9 @@ Behavior
 -  Re-runs ``code.py`` or other main file after file system writes by a workflow. (Disable with
    ``supervisor.disable_autoreload()``)
 -  Autoreload is disabled while the REPL is active.
--  Main is one of these: ``code.txt``, ``code.py``, ``main.py``,
-   ``main.txt``
--  Boot is one of these: ``boot.py``, ``boot.txt``
+-  ``code.py`` may also be named``code.txt``, ``main.py``, or ``main.txt``.
+-  ``boot.py`` may also be named ``boot.txt``.
+-  ``safemode.py`` may also be named ``safemode.txt``.
 
 API
 ~~~
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 72ee60cc0c..960625e949 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -35,6 +35,12 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"To exit, reset the board without requesting safe mode."
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@@ -85,7 +91,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -589,13 +595,6 @@ msgstr ""
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -661,12 +660,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""
@@ -934,6 +927,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1006,10 +1003,6 @@ msgstr ""
 msgid "Failed to write internal flash."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr ""
-
 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""
@@ -1209,6 +1202,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1257,10 +1254,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1549,10 +1542,6 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2003,24 +1992,12 @@ msgstr ""
 msgid "Temperature read timed out"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
 "Increase the stack size if you know how. If not:"
 msgstr ""
 
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
@@ -2031,17 +2008,6 @@ msgstr ""
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
@@ -2069,6 +2035,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2101,10 +2071,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2405,9 +2371,44 @@ msgstr ""
 msgid "You are in safe mode because:\n"
 msgstr ""
 
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up."
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: py/objtype.c
diff --git a/main.c b/main.c
index d70e718b6d..4d37e17992 100644
--- a/main.c
+++ b/main.c
@@ -358,7 +358,7 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) {
     } else {
         serial_write_compressed(translate("Auto-reload is off.\n"));
     }
-    if (safe_mode != NO_SAFE_MODE) {
+    if (safe_mode != SAFE_MODE_NONE) {
         serial_write_compressed(translate("Running in safe mode! Not running saved code.\n"));
     }
 }
@@ -384,11 +384,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
     // Do the filesystem flush check before reload in case another write comes
     // in while we're doing the flush.
-    if (safe_mode == NO_SAFE_MODE) {
+    if (safe_mode == SAFE_MODE_NONE) {
         stack_resize();
         filesystem_flush();
     }
-    if (safe_mode == NO_SAFE_MODE && !autoreload_pending()) {
+    if (safe_mode == SAFE_MODE_NONE && !autoreload_pending()) {
         static const char *const supported_filenames[] = {
             "code.txt", "code.py", "main.py", "main.txt"
         };
@@ -510,7 +510,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
     } else
     #endif
     if (_exec_result.return_code != PYEXEC_EXCEPTION) {
-        if (safe_mode == NO_SAFE_MODE) {
+        if (safe_mode == SAFE_MODE_NONE) {
             color = ALL_DONE;
             blink_count = ALL_DONE_BLINKS;
         } else {
@@ -730,8 +730,32 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 vstr_t *boot_output;
 
+#if CIRCUITPY_SAFEMODE_PY
+STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) {
+    // Don't run if we aren't in safe mode or we won't be able to find safemode.py.
+    if (safe_mode == SAFE_MODE_NONE || !filesystem_present()) {
+        return;
+    }
+
+    supervisor_allocation *heap = allocate_remaining_memory();
+    start_mp(heap);
+
+    static const char *const safemode_py_filenames[] = {"safemode.py", "safemode.txt"};
+    maybe_run_list(safemode_py_filenames, MP_ARRAY_SIZE(safemode_py_filenames));
+
+    // If safemode.py itself caused an error, change the safe_mode state to indicate that.
+    if (_exec_result.exception != MP_OBJ_NULL &&
+        _exec_result.exception != MP_OBJ_SENTINEL) {
+        set_safe_mode(SAFE_MODE_SAFEMODE_PY_ERROR);
+    }
+
+    cleanup_after_vm(heap, _exec_result.exception);
+    _exec_result.exception = NULL;
+}
+#endif
+
 STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
-    if (safe_mode == NO_HEAP) {
+    if (safe_mode == SAFE_MODE_NO_HEAP) {
         return;
     }
 
@@ -739,7 +763,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // There is USB setup to do even if boot.py is not actually run.
     const bool ok_to_run = filesystem_present()
-        && safe_mode == NO_SAFE_MODE
+        && safe_mode == SAFE_MODE_NONE
         && MP_STATE_VM(vfs_mount_table) != NULL;
 
     static const char *const boot_py_filenames[] = {"boot.py", "boot.txt"};
@@ -913,7 +937,7 @@ STATIC int run_repl(void) {
 
 int __attribute__((used)) main(void) {
     // initialise the cpu and peripherals
-    safe_mode_t safe_mode = port_init();
+    set_safe_mode(port_init());
 
     // Turn on RX and TX LEDs if we have them.
     init_rxtx_leds();
@@ -926,8 +950,8 @@ int __attribute__((used)) main(void) {
     #endif
 
     // Wait briefly to give a reset window where we'll enter safe mode after the reset.
-    if (safe_mode == NO_SAFE_MODE) {
-        safe_mode = wait_for_safe_mode_reset();
+    if (get_safe_mode() == SAFE_MODE_NONE) {
+        set_safe_mode(wait_for_safe_mode_reset());
     }
 
     stack_init();
@@ -956,8 +980,8 @@ int __attribute__((used)) main(void) {
 
     // Check whether CIRCUITPY is available. No need to reset to get safe mode
     // since we haven't run user code yet.
-    if (!filesystem_init(safe_mode == NO_SAFE_MODE, false)) {
-        safe_mode = NO_CIRCUITPY;
+    if (!filesystem_init(get_safe_mode() == SAFE_MODE_NONE, false)) {
+        set_safe_mode(SAFE_MODE_NO_CIRCUITPY);
     }
 
     #if CIRCUITPY_ALARM
@@ -982,16 +1006,23 @@ int __attribute__((used)) main(void) {
     supervisor_set_run_reason(RUN_REASON_STARTUP);
 
     // If not in safe mode turn on autoreload by default but before boot.py in case it wants to change it.
-    if (safe_mode == NO_SAFE_MODE) {
+    if (get_safe_mode() == SAFE_MODE_NONE) {
         autoreload_enable();
     }
 
     // By default our internal flash is readonly to local python code and
-    // writable over USB. Set it here so that boot.py can change it.
+    // writable over USB. Set it here so that safemode.py or boot.py can change it.
     filesystem_set_internal_concurrent_write_protection(true);
     filesystem_set_internal_writable_by_usb(CIRCUITPY_USB == 1);
 
-    run_boot_py(safe_mode);
+    #if CIRCUITPY_SAFEMODE_PY
+    // Run safemode.py if we ARE in safe mode.
+    // If safemode.py does not do a hard reset, and exits normally, we will continue on
+    // and report the safe mode as usual.
+    run_safemode_py(get_safe_mode());
+    #endif
+
+    run_boot_py(get_safe_mode());
 
     supervisor_workflow_start();
 
@@ -1016,7 +1047,7 @@ int __attribute__((used)) main(void) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard
                 // reset. This will preserve any alarm information.
-                skip_repl = run_code_py(safe_mode, &simulate_reset);
+                skip_repl = run_code_py(get_safe_mode(), &simulate_reset);
             } else {
                 skip_repl = false;
             }
@@ -1076,14 +1107,14 @@ void gc_collect(void) {
 }
 
 void NORETURN nlr_jump_fail(void *val) {
-    reset_into_safe_mode(MICROPY_NLR_JUMP_FAIL);
+    reset_into_safe_mode(SAFE_MODE_NLR_JUMP_FAIL);
     while (true) {
     }
 }
 
 #ifndef NDEBUG
 static void NORETURN __fatal_error(const char *msg) {
-    reset_into_safe_mode(MICROPY_FATAL_ERROR);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
     }
 }
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
index 33910221a0..d7ca2a107c 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed both buttons at start up.")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
index 7f0e041f25..6ee5e0504b 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed both buttons at start up.")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
index 12fd30e005..c0f2d07e9d 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@@ -23,7 +23,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed both buttons at start up.")
 
 // Increase stack size slightly due to CPX library import nesting.
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248)  // divisible by 8
diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
index ad6901230f..ab5f652d1e 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
@@ -6,7 +6,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed both buttons at start up.")
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA01)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA00)
diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c
index 60b35a2c5c..d1c02b360f 100644
--- a/ports/atmel-samd/common-hal/microcontroller/__init__.c
+++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c
@@ -51,9 +51,8 @@ void common_hal_mcu_disable_interrupts(void) {
 
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // This is very very bad because it means there was mismatched disable/enables so we
-        // "HardFault".
-        HardFault_Handler();
+        // This is very very bad because it means there was mismatched disable/enables.
+        reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -76,7 +75,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
         _bootloader_dbl_tap = DBL_TAP_MAGIC_QUICK_BOOT;
     }
     if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
 }
 
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 2c63e28a17..45b999f1a1 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -368,20 +368,20 @@ safe_mode_t port_init(void) {
 
     #ifdef SAMD21
     if (PM->RCAUSE.bit.BOD33 == 1 || PM->RCAUSE.bit.BOD12 == 1) {
-        return BROWNOUT;
+        return SAFE_MODE_BROWNOUT;
     }
     #endif
     #ifdef SAM_D5X_E5X
     if (RSTC->RCAUSE.bit.BODVDD == 1 || RSTC->RCAUSE.bit.BODCORE == 1) {
-        return BROWNOUT;
+        return SAFE_MODE_BROWNOUT;
     }
     #endif
 
     if (board_requests_safe_mode()) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
@@ -720,7 +720,7 @@ __attribute__((used)) void HardFault_Handler(void) {
     REG_MTB_MASTER = 0x00000000 + 6;
     #endif
 
-    reset_into_safe_mode(HARD_CRASH);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
diff --git a/ports/broadcom/common-hal/microcontroller/__init__.c b/ports/broadcom/common-hal/microcontroller/__init__.c
index a1491d9668..53f04ebec3 100644
--- a/ports/broadcom/common-hal/microcontroller/__init__.c
+++ b/ports/broadcom/common-hal/microcontroller/__init__.c
@@ -46,7 +46,7 @@ void common_hal_mcu_disable_interrupts(void) {
 
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // reset_into_safe_mode(LOCKING_ERROR);
+        // reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
diff --git a/ports/broadcom/supervisor/port.c b/ports/broadcom/supervisor/port.c
index fcb86674c5..ec6feb8703 100644
--- a/ports/broadcom/supervisor/port.c
+++ b/ports/broadcom/supervisor/port.c
@@ -78,10 +78,10 @@ safe_mode_t port_init(void) {
     // Check brownout.
 
     if (board_requests_safe_mode()) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c
index dd9a54063f..c77a8829f2 100644
--- a/ports/cxd56/common-hal/microcontroller/__init__.c
+++ b/ports/cxd56/common-hal/microcontroller/__init__.c
@@ -74,7 +74,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     if (runmode == RUNMODE_BOOTLOADER) {
         mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present"));
     } else if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
 }
 
diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c
index 10fa4112e8..7e22b3c777 100644
--- a/ports/cxd56/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
@@ -66,10 +66,10 @@ safe_mode_t port_init(void) {
     heap_size = size / sizeof(uint32_t);
 
     if (board_requests_safe_mode()) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_cpu(void) {
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
index b7f2513217..4e9e679e5f 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
@@ -47,7 +47,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO38)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The SW38 button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the SW38 button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
index 7de90b0ae8..49d49f2427 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+++ b/ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
@@ -35,7 +35,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The VOLUME button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the VOLUME button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
index 7d67267897..426d5c3bf7 100644
--- a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
@@ -38,7 +38,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the central button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
index dfa12b53b0..9ec15fa0f2 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
@@ -42,7 +42,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the central button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
index 926b7efbc4..77eba4ab92 100644
--- a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -42,7 +42,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the central button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
index b3b0a650ab..b5b2101134 100644
--- a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
@@ -41,7 +41,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("The central button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the central button at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
index c974c64874..0135b66661 100755
--- a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
@@ -42,7 +42,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed button A at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
index f56a8fe901..2073473e1a 100755
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
@@ -43,7 +43,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO39)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed button A at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
index aefdad1598..c80dbc9ee2 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
@@ -39,7 +39,7 @@
 #define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO37)
 
 // Explanation of how a user got into safe mode
-#define BOARD_USER_SAFE_MODE_ACTION translate("Button A was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed button A at start up.")
 
 // UART pins attached to the USB-serial converter chip
 #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c
index 68479dc46f..23c7c153e9 100644
--- a/ports/espressif/common-hal/microcontroller/__init__.c
+++ b/ports/espressif/common-hal/microcontroller/__init__.c
@@ -108,7 +108,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
             break;
         case RUNMODE_SAFE_MODE:
             // enter safe mode on next boot
-            safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+            safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
             break;
         case RUNMODE_BOOTLOADER:
             // DFU download
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index b9c9790de4..a71825afa5 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -318,25 +318,25 @@ safe_mode_t port_init(void) {
     }
     if (heap == NULL) {
         heap_size = 0;
-        return NO_HEAP;
+        return SAFE_MODE_NO_HEAP;
     }
 
     esp_reset_reason_t reason = esp_reset_reason();
     switch (reason) {
         case ESP_RST_BROWNOUT:
-            return BROWNOUT;
+            return SAFE_MODE_BROWNOUT;
         case ESP_RST_PANIC:
-            return HARD_CRASH;
+            return SAFE_MODE_HARD_FAULT;
         case ESP_RST_INT_WDT:
             // The interrupt watchdog is used internally to make sure that latency sensitive
             // interrupt code isn't blocked. User watchdog resets come through ESP_RST_WDT.
-            return WATCHDOG_RESET;
+            return SAFE_MODE_WATCHDOG;
         case ESP_RST_WDT:
         default:
             break;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
diff --git a/ports/litex/common-hal/microcontroller/__init__.c b/ports/litex/common-hal/microcontroller/__init__.c
index 0a496d804e..1de55653fb 100644
--- a/ports/litex/common-hal/microcontroller/__init__.c
+++ b/ports/litex/common-hal/microcontroller/__init__.c
@@ -70,9 +70,8 @@ void common_hal_mcu_disable_interrupts(void) {
 __attribute__((section(".ramtext")))
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // This is very very bad because it means there was mismatched disable/enables so we
-        // "HardFault".
-        asm ("ebreak");
+        // This is very very bad because it means there was mismatched disable/enables.
+        reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -83,7 +82,7 @@ void common_hal_mcu_enable_interrupts(void) {
 
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
 }
 
diff --git a/ports/litex/supervisor/port.c b/ports/litex/supervisor/port.c
index 42d3a63920..45f9b91976 100644
--- a/ports/litex/supervisor/port.c
+++ b/ports/litex/supervisor/port.c
@@ -71,7 +71,7 @@ safe_mode_t port_init(void) {
     irq_setmask(0);
     irq_setie(1);
     tick_init();
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 extern uint32_t _ebss;
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index 8de63061ad..ded46b648e 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -52,12 +52,10 @@ void common_hal_mcu_disable_interrupts(void) {
     nesting_count++;
 }
 
-void HardFault_Handler(void);
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // This is very very bad because it means there was mismatched disable/enables so we
-        // "HardFault".
-        HardFault_Handler();
+        // This is very very bad because it means there was mismatched disable/enables
+        reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -80,7 +78,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
         DBL_TAP_REG = DBL_TAP_MAGIC_QUICK_BOOT;
     }
     if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
 }
 
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index fbf0e8a9d8..2ac7995943 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -259,10 +259,10 @@ safe_mode_t port_init(void) {
     // run yet, which uses `never_reset` to protect critical pins from being reset by  `reset_port`.
 
     if (board_requests_safe_mode()) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
@@ -419,7 +419,7 @@ void port_idle_until_interrupt(void) {
  */
 void MemManage_Handler(void);
 __attribute__((used)) void MemManage_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
@@ -430,7 +430,7 @@ __attribute__((used)) void MemManage_Handler(void) {
  */
 void BusFault_Handler(void);
 __attribute__((used)) void BusFault_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
@@ -441,7 +441,7 @@ __attribute__((used)) void BusFault_Handler(void) {
  */
 void UsageFault_Handler(void);
 __attribute__((used)) void UsageFault_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
@@ -452,7 +452,7 @@ __attribute__((used)) void UsageFault_Handler(void) {
  */
 void HardFault_Handler(void);
 __attribute__((used)) void HardFault_Handler(void) {
-    reset_into_safe_mode(HARD_CRASH);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h b/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
index af8e3c3507..58df3a4058 100644
--- a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+++ b/ports/nrf/boards/aramcon2_badge/mpconfigboard.h
@@ -52,7 +52,7 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_P0_29)
 
-#define BOARD_USER_SAFE_MODE_ACTION translate("The left button was pressed at start up.\n")
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the left button at start up.")
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 2c0c343877..1c3c829c5b 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -91,7 +91,7 @@ const nvm_bytearray_obj_t common_hal_bleio_nvm_obj = {
 };
 
 STATIC void softdevice_assert_handler(uint32_t id, uint32_t pc, uint32_t info) {
-    reset_into_safe_mode(NORDIC_SOFT_DEVICE_ASSERT);
+    reset_into_safe_mode(SAFE_MODE_SDK_FATAL_ERROR);
 }
 
 bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index 7bf853fb30..cd4114dcfb 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -68,9 +68,8 @@ void common_hal_mcu_disable_interrupts() {
 
 void common_hal_mcu_enable_interrupts() {
     if (nesting_count == 0) {
-        // This is very very bad because it means there was mismatched disable/enables so we
-        // crash.
-        reset_into_safe_mode(HARD_CRASH);
+        // This is very very bad because it means there was mismatched disable/enables.
+        reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -88,7 +87,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
         sd_power_gpregret_set(0,0);
     }
     if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
 }
 
diff --git a/ports/nrf/supervisor/internal_flash.c b/ports/nrf/supervisor/internal_flash.c
index cce48a4c32..4229ec771b 100644
--- a/ports/nrf/supervisor/internal_flash.c
+++ b/ports/nrf/supervisor/internal_flash.c
@@ -75,7 +75,7 @@ void port_internal_flash_flush(void) {
     // Skip if data is the same
     if (memcmp(_flash_cache, (void *)_flash_page_addr, FLASH_PAGE_SIZE) != 0) {
         if (!nrf_nvm_safe_flash_page_write(_flash_page_addr, _flash_cache)) {
-            reset_into_safe_mode(FLASH_WRITE_FAIL);
+            reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
         }
     }
 }
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index e67f641900..313ecd7e44 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -77,7 +77,7 @@ extern void qspi_disable(void);
 #endif
 
 static void power_warning_handler(void) {
-    reset_into_safe_mode(BROWNOUT);
+    reset_into_safe_mode(SAFE_MODE_BROWNOUT);
 }
 
 uint32_t reset_reason_saved = 0;
@@ -204,11 +204,11 @@ safe_mode_t port_init(void) {
         // If USB is connected, then the user might be editing `code.py`,
         // in which case we should reboot into Safe Mode.
         if (usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk) {
-            return WATCHDOG_RESET;
+            return SAFE_MODE_WATCHDOG;
         }
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
@@ -399,7 +399,7 @@ void port_idle_until_interrupt(void) {
 
 extern void HardFault_Handler(void);
 void HardFault_Handler(void) {
-    reset_into_safe_mode(HARD_CRASH);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
index 327799a6e7..6d9b3d7fa0 100644
--- a/ports/raspberrypi/common-hal/microcontroller/__init__.c
+++ b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -60,7 +60,7 @@ void common_hal_mcu_disable_interrupts(void) {
 
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // reset_into_safe_mode(LOCKING_ERROR);
+        // reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -79,7 +79,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
             next_reset_to_bootloader = true;
             break;
         case RUNMODE_SAFE_MODE:
-            safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+            safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
             break;
         default:
             break;
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 27012f2298..f3da71cbd7 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -161,10 +161,10 @@ safe_mode_t port_init(void) {
     }
     #endif
     if (board_requests_safe_mode()) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_port(void) {
@@ -312,7 +312,7 @@ __attribute__((used)) void HardFault_Handler(void) {
     REG_MTB_MASTER = 0x00000000 + 6;
     #endif
 
-    reset_into_safe_mode(HARD_CRASH);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
diff --git a/ports/stm/common-hal/canio/Listener.c b/ports/stm/common-hal/canio/Listener.c
index 69c196b78d..0def8192f9 100644
--- a/ports/stm/common-hal/canio/Listener.c
+++ b/ports/stm/common-hal/canio/Listener.c
@@ -105,8 +105,7 @@ STATIC int next_filter(canio_can_obj_t *can) {
             return i;
         }
     }
-    reset_into_safe_mode(MICROPY_FATAL_ERROR);
-    return -1;
+    mp_raise_msg_varg(&mp_type_RuntimeError, translate("%q"), MP_QSTR_Listener);
 }
 
 // IDE = "extended ID" flag of packet header.  We always add this bit to the
diff --git a/ports/stm/common-hal/microcontroller/__init__.c b/ports/stm/common-hal/microcontroller/__init__.c
index c399951f54..dc2e125a68 100644
--- a/ports/stm/common-hal/microcontroller/__init__.c
+++ b/ports/stm/common-hal/microcontroller/__init__.c
@@ -61,9 +61,8 @@ void common_hal_mcu_disable_interrupts(void) {
 
 void common_hal_mcu_enable_interrupts(void) {
     if (nesting_count == 0) {
-        // This is very very bad because it means there was mismatched disable/enables so we
-        // "HardFault".
-        asm ("bkpt");
+        // This is very very bad because it means there was mismatched disable/enables.
+        reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
     }
     nesting_count--;
     if (nesting_count > 0) {
@@ -77,7 +76,7 @@ static bool next_reset_to_bootloader = false;
 
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     if (runmode == RUNMODE_SAFE_MODE) {
-        safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
     }
     if (runmode == RUNMODE_BOOTLOADER) {
         next_reset_to_bootloader = true;
diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c
index e0f4153cb1..f3f9719753 100644
--- a/ports/stm/supervisor/internal_flash.c
+++ b/ports/stm/supervisor/internal_flash.c
@@ -215,7 +215,7 @@ void port_internal_flash_flush(void) {
     EraseInitStruct.NbSectors = 1;
     #endif
     if (sector_size > sizeof(_flash_cache) || sector_start_addr == 0xffffffff) {
-        reset_into_safe_mode(FLASH_WRITE_FAIL);
+        reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
     }
 
     // Skip if data is the same
@@ -228,7 +228,7 @@ void port_internal_flash_flush(void) {
         if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK) {
             // error occurred during sector erase
             HAL_FLASH_Lock(); // lock the flash
-            reset_into_safe_mode(FLASH_WRITE_FAIL);
+            reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
         }
 
         uint32_t *cache_addr = (uint32_t *)_flash_cache;
@@ -240,7 +240,7 @@ void port_internal_flash_flush(void) {
                 (uint32_t)cache_addr) != HAL_OK) {
                 // error occurred during flash write
                 HAL_FLASH_Lock(); // lock the flash
-                reset_into_safe_mode(FLASH_WRITE_FAIL);
+                reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
             }
             // RAM memory is by word (4 byte), but flash memory is by byte
             cache_addr += 8;
@@ -253,7 +253,7 @@ void port_internal_flash_flush(void) {
                 *(uint64_t *)cache_addr) != HAL_OK) {
                 // error occurred during flash write
                 HAL_FLASH_Lock(); // lock the flash
-                reset_into_safe_mode(FLASH_WRITE_FAIL);
+                reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
             }
             // RAM memory is by word (4 byte), but flash memory is by byte
             cache_addr += 2;
@@ -267,7 +267,7 @@ void port_internal_flash_flush(void) {
                 (uint64_t)*cache_addr) != HAL_OK) {
                 // error occurred during flash write
                 HAL_FLASH_Lock(); // lock the flash
-                reset_into_safe_mode(FLASH_WRITE_FAIL);
+                reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
             }
             // RAM memory is by word (4 byte), but flash memory is by byte
             cache_addr += 1;
@@ -335,7 +335,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num,
 
         // Fail for any sector outside what's supported by the cache
         if (sector_size > sizeof(_flash_cache)) {
-            reset_into_safe_mode(FLASH_WRITE_FAIL);
+            reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
         }
 
         // Find how many blocks are left in the sector
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 97bd1c4982..1fb3f36377 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -211,7 +211,7 @@ safe_mode_t port_init(void) {
     // Turn off SysTick
     SysTick->CTRL = 0;
 
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void HAL_Delay(uint32_t delay_ms) {
@@ -357,28 +357,28 @@ uint32_t port_get_saved_word(void) {
 }
 
 __attribute__((used)) void MemManage_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
 __attribute__((used)) void BusFault_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
 __attribute__((used)) void UsageFault_Handler(void) {
-    reset_into_safe_mode(MEM_MANAGE);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
 __attribute__((used)) void HardFault_Handler(void) {
-    reset_into_safe_mode(HARD_CRASH);
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index be33d80a99..eaf78d3688 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -525,6 +525,7 @@ $(filter $(SRC_PATTERNS), \
 	qrio/PixelPolicy.c \
 	qrio/QRInfo.c \
 	supervisor/RunReason.c \
+	supervisor/SafeModeReason.c \
 	supervisor/StatusBar.c \
 	wifi/AuthMode.c \
 	wifi/Packet.c \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 8ec338c372..4ea6ead794 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -372,6 +372,10 @@ CFLAGS += -DCIRCUITPY_ROTARYIO_SOFTENCODER=$(CIRCUITPY_ROTARYIO_SOFTENCODER)
 CIRCUITPY_RTC ?= 1
 CFLAGS += -DCIRCUITPY_RTC=$(CIRCUITPY_RTC)
 
+# Enable support for safemode.py
+CIRCUITPY_SAFEMODE_PY ?= 1
+CFLAGS += -DCIRCUITPY_SAFEMODE_PY=$(CIRCUITPY_SAFEMODE_PY)
+
 # CIRCUITPY_SAMD is handled in the atmel-samd tree.
 # Only for SAMD chips.
 # Assume not a SAMD build.
diff --git a/py/gc.c b/py/gc.c
index fc6bc90b67..0ced4c854d 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -518,7 +518,7 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags, bool long_lived) {
     }
 
     if (MP_STATE_MEM(gc_pool_start) == 0) {
-        reset_into_safe_mode(GC_ALLOC_OUTSIDE_VM);
+        reset_into_safe_mode(SAFE_MODE_GC_ALLOC_OUTSIDE_VM);
     }
 
     GC_ENTER();
@@ -712,7 +712,7 @@ void gc_free(void *ptr) {
         GC_EXIT();
     } else {
         if (MP_STATE_MEM(gc_pool_start) == 0) {
-            reset_into_safe_mode(GC_ALLOC_OUTSIDE_VM);
+            reset_into_safe_mode(SAFE_MODE_GC_ALLOC_OUTSIDE_VM);
         }
         // get the GC block number corresponding to this pointer
         assert(VERIFY_PTR(ptr));
diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c
index 905c19f83f..13a8f25e6d 100644
--- a/shared-bindings/microcontroller/ResetReason.c
+++ b/shared-bindings/microcontroller/ResetReason.c
@@ -42,7 +42,7 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESCUE_DEBUG, RESET_REASON_
 //|     """The reason the microntroller was last reset"""
 //|
 //|     POWER_ON: object
-//|     """The microntroller was started from power off."""
+//|     """The microcontroller was started from power off."""
 //|
 //|     BROWNOUT: object
 //|     """The microntroller was reset due to too low a voltage."""
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 4d8ddbacc7..c9c47a638d 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -32,6 +32,7 @@
 
 #include "shared-bindings/supervisor/RunReason.h"
 #include "shared-bindings/supervisor/Runtime.h"
+#include "shared-bindings/supervisor/SafeModeReason.h"
 
 #include "supervisor/shared/reload.h"
 #include "supervisor/shared/stack.h"
@@ -106,7 +107,7 @@ void supervisor_set_run_reason(supervisor_run_reason_t run_reason) {
 }
 
 //|     run_reason: RunReason
-//|     """Why CircuitPython started running this particular time."""
+//|     """Why CircuitPython started running this particular time (read-only)."""
 STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) {
     return cp_enum_find(&supervisor_run_reason_type, _run_reason);
 }
@@ -115,6 +116,20 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_run_reason_obj, supervisor_runt
 MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj,
     (mp_obj_t)&supervisor_runtime_get_run_reason_obj);
 
+//|     safe_mode_reason: SafeModeReason
+//|     """Why CircuitPython went into safe mode this particular time (read-only)."""
+STATIC mp_obj_t supervisor_runtime_get_safe_mode_reason(mp_obj_t self) {
+    #if CIRCUITPY_SAFEMODE_PY
+    return cp_enum_find(&supervisor_safe_mode_reason_type, get_safe_mode());
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_safe_mode_reason_obj, supervisor_runtime_get_safe_mode_reason);
+
+MP_PROPERTY_GETTER(supervisor_runtime_safe_mode_reason_obj,
+    (mp_obj_t)&supervisor_runtime_get_safe_mode_reason_obj);
+
 //|     autoreload: bool
 //|     """Whether CircuitPython may autoreload based on workflow writes to the filesystem."""
 //|
@@ -218,6 +233,7 @@ STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_serial_connected), MP_ROM_PTR(&supervisor_runtime_serial_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_bytes_available), MP_ROM_PTR(&supervisor_runtime_serial_bytes_available_obj) },
     { MP_ROM_QSTR(MP_QSTR_run_reason), MP_ROM_PTR(&supervisor_runtime_run_reason_obj) },
+    { MP_ROM_QSTR(MP_QSTR_safe_mode_reason), MP_ROM_PTR(&supervisor_runtime_safe_mode_reason_obj) },
     { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_ble_workflow),  MP_ROM_PTR(&supervisor_runtime_ble_workflow_obj) },
     { MP_ROM_QSTR(MP_QSTR_next_stack_limit),  MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
diff --git a/shared-bindings/supervisor/Runtime.h b/shared-bindings/supervisor/Runtime.h
index debc5ec79c..3c3e2611f6 100644
--- a/shared-bindings/supervisor/Runtime.h
+++ b/shared-bindings/supervisor/Runtime.h
@@ -31,12 +31,16 @@
 #include "py/obj.h"
 
 #include "shared-bindings/supervisor/RunReason.h"
+#include "shared-bindings/supervisor/SafeModeReason.h"
 
 extern const mp_obj_type_t supervisor_runtime_type;
 
 supervisor_run_reason_t supervisor_get_run_reason(void);
 void supervisor_set_run_reason(supervisor_run_reason_t run_reason);
 
+safe_mode_t supervisor_get_safe_mode(void);
+void supervisor_set_safe_mode(safe_mode_t safe_mode);
+
 bool common_hal_supervisor_runtime_get_serial_connected(void);
 
 bool common_hal_supervisor_runtime_get_serial_bytes_available(void);
diff --git a/shared-bindings/supervisor/SafeModeReason.c b/shared-bindings/supervisor/SafeModeReason.c
new file mode 100644
index 0000000000..9a253596f3
--- /dev/null
+++ b/shared-bindings/supervisor/SafeModeReason.c
@@ -0,0 +1,156 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "shared-bindings/supervisor/SafeModeReason.h"
+
+// Reuse the non-Python safe_mode_t enum
+#include "supervisor/shared/safe_mode.h"
+
+#if CIRCUITPY_SAFEMODE_PY
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, NONE, SAFE_MODE_NONE);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, BROWNOUT, SAFE_MODE_BROWNOUT);
+// alphabetical from here down
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, FLASH_WRITE_FAIL, SAFE_MODE_FLASH_WRITE_FAIL);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, GC_ALLOC_OUTSIDE_VM, SAFE_MODE_GC_ALLOC_OUTSIDE_VM);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, HARD_FAULT, SAFE_MODE_HARD_FAULT);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, INTERRUPT_ERROR, SAFE_MODE_INTERRUPT_ERROR);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, NLR_JUMP_FAIL, SAFE_MODE_NLR_JUMP_FAIL);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, NO_CIRCUITPY, SAFE_MODE_NO_CIRCUITPY);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, NO_HEAP, SAFE_MODE_NO_HEAP);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, PROGRAMMATIC, SAFE_MODE_PROGRAMMATIC);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, SDK_FATAL_ERROR, SAFE_MODE_SDK_FATAL_ERROR);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, STACK_OVERFLOW, SAFE_MODE_STACK_OVERFLOW);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USB_BOOT_DEVICE_NOT_INTERFACE_ZERO, SAFE_MODE_USB_BOOT_DEVICE_NOT_INTERFACE_ZERO);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USB_TOO_MANY_ENDPOINTS, SAFE_MODE_USB_TOO_MANY_ENDPOINTS);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USB_TOO_MANY_INTERFACE_NAMES, SAFE_MODE_USB_TOO_MANY_INTERFACE_NAMES);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USER, SAFE_MODE_USER);
+MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, WATCHDOG, SAFE_MODE_WATCHDOG);
+#endif
+
+
+//| class SafeModeReason:
+//|     """The reason that CircuitPython went into safe mode."""
+//|
+MAKE_ENUM_MAP(supervisor_safe_mode_reason) {
+
+    #if CIRCUITPY_SAFEMODE_PY
+
+//|     NONE: object
+//|     """CircuitPython is not in safe mode."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, NONE),
+
+//|     BROWNOUT: object
+//|     """The microcontroller voltage dropped too low."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, BROWNOUT),
+
+// alphabetical from here down
+
+//|     FLASH_WRITE_FAIL: object
+//|     """Could not write to flash memory."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, FLASH_WRITE_FAIL),
+
+//|     GC_ALLOC_OUTSIDE_VM: object
+//|     """CircuitPython tried to allocate storage when its virtual machine was not running."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, GC_ALLOC_OUTSIDE_VM),
+
+//|     HARD_FAULT: object
+//|     """The microcontroller detected a fault, such as an out-of-bounds memory write."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, HARD_FAULT),
+
+//|     INTERRUPT_ERROR: object
+//|     """Internal error related to interrupts."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, INTERRUPT_ERROR),
+
+//|     NLR_JUMP_FAIL: object
+//|     """An error occurred during exception handling, possibly due to memory corruption."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, NLR_JUMP_FAIL),
+
+//|     NO_CIRCUITPY: object
+//|     """The CIRCUITPY drive was not available."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, NO_CIRCUITPY),
+
+//|     NO_HEAP: object
+//|     """Heap storage was not present."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, NO_HEAP),
+
+//|     PROGRAMMATIC: object
+//|     """The program entered safe mode using the `supervisor` module."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, PROGRAMMATIC),
+
+//|     SDK_FATAL_ERROR: object
+//|     """Third party firmware reported a fatal error."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, SDK_FATAL_ERROR),
+
+//|     STACK_OVERFLOW: object
+//|     """The CircuitPython heap was corrupted because the stack was too small."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, STACK_OVERFLOW),
+
+//|     USB_BOOT_DEVICE_NOT_INTERFACE_ZERO: object
+//|     """The USB HID boot device was not set up to be the first device, on interface #0."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USB_BOOT_DEVICE_NOT_INTERFACE_ZERO),
+
+//|     USB_TOO_MANY_ENDPOINTS: object
+//|     """USB devices need more endpoints than are available."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USB_TOO_MANY_ENDPOINTS),
+
+//|     USB_TOO_MANY_INTERFACE_NAMES: object
+//|     """USB devices specify too many interface names."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USB_TOO_MANY_INTERFACE_NAMES),
+
+//|     USER: object
+//|     """The user pressed one or more buttons to enter safe mode."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USER),
+
+//|     SAFE_MODE_WATCHDOG: object
+//|     """An internal watchdog timer expired."""
+//|
+    MAKE_ENUM_MAP_ENTRY(safe_mode_reason, WATCHDOG),
+    #endif
+};
+
+STATIC MP_DEFINE_CONST_DICT(supervisor_safe_mode_reason_locals_dict, supervisor_safe_mode_reason_locals_table);
+
+MAKE_PRINTER(supervisor, supervisor_safe_mode_reason);
+
+MAKE_ENUM_TYPE(supervisor, SafeModeReason, supervisor_safe_mode_reason);
diff --git a/shared-bindings/supervisor/SafeModeReason.h b/shared-bindings/supervisor/SafeModeReason.h
new file mode 100644
index 0000000000..d061d75154
--- /dev/null
+++ b/shared-bindings/supervisor/SafeModeReason.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ */
+
+#pragma once
+
+#include "supervisor/shared/safe_mode.h"
+
+extern const mp_obj_type_t supervisor_safe_mode_reason_type;
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 2c84fbc0dd..850931ceac 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -336,6 +336,11 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_runtime),  MP_ROM_PTR(&common_hal_supervisor_runtime_obj) },
     { 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) },
+    #if CIRCUITPY_SAFEMODE_PY
+    { MP_ROM_QSTR(MP_QSTR_SafeModeReason),  MP_ROM_PTR(&supervisor_safe_mode_reason_type) },
+    #else
+    { MP_ROM_QSTR(MP_QSTR_SafeModeReason),  mp_const_none },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_set_next_code_file),  MP_ROM_PTR(&supervisor_set_next_code_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_ms),  MP_ROM_PTR(&supervisor_ticks_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_previous_traceback),  MP_ROM_PTR(&supervisor_get_previous_traceback_obj) },
diff --git a/supervisor/messages/default.h b/supervisor/messages/default.h
deleted file mode 100644
index 8cdd671b31..0000000000
--- a/supervisor/messages/default.h
+++ /dev/null
@@ -1,99 +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.
- */
-
-#ifndef MICROPY_SUPERVISOR_MESSAGES_DEFAULT_H
-#define MICROPY_SUPERVISOR_MESSAGES_DEFAULT_H
-
-#ifndef MSG_OUTPUT_SUFFIX
-#define MSG_OUTPUT_SUFFIX " output:\r\n"
-#endif
-
-#ifndef MSG_NEWLINE
-#define MSG_NEWLINE "\r\n"
-#endif
-
-#ifndef MSG_AUTORELOAD_ON
-#define MSG_AUTORELOAD_ON "Auto-reload is on. Simply save files over USB to run them or enter REPL to disable.\r\n"
-#endif
-
-#ifndef MSG_AUTORELOAD_OFF
-#define MSG_AUTORELOAD_OFF "Auto-reload is off.\r\n"
-#endif
-
-#ifndef MSG_SAFE_MODE_ON
-#define MSG_SAFE_MODE_ON "Running in safe mode! Auto-reload is off.\r\n"
-#endif
-
-#ifndef MSG_SAFE_MODE_NO_MAIN
-#define MSG_SAFE_MODE_NO_MAIN "Running in safe mode! Not running saved code.\r\n"
-#endif
-
-#ifndef MSG_SAFE_MODE_USER_REQUESTED
-#define MSG_SAFE_MODE_USER_REQUESTED "You requested starting safe mode by "
-#endif
-
-#ifndef MSG_SAFE_MODE_USER_EXIT
-#define MSG_SAFE_MODE_USER_EXIT "To exit, please reset the board without "
-#endif
-
-#ifndef MSG_BAD_SAFE_MODE
-#define MSG_BAD_SAFE_MODE "You are running in safe mode which means something really bad happened."
-#endif
-
-#ifndef MSG_SAFE_MODE_CRASH
-#define MSG_SAFE_MODE_CRASH "Looks like our core CircuitPython code crashed hard. Whoops!"
-#endif
-
-#ifndef MSG_SAFE_MODE_FILE_ISSUE
-#define MSG_SAFE_MODE_FILE_ISSUE "Please file an issue here with the contents of your CIRCUITPY drive:"
-#endif
-
-#ifndef MSG_SAFE_MODE_ISSUE_LINK
-#define MSG_SAFE_MODE_ISSUE_LINK "https://github.com/adafruit/circuitpython/issues"
-#endif
-
-#ifndef MSG_SAFE_MODE_BROWN_OUT_LINE_1
-#define MSG_SAFE_MODE_BROWN_OUT_LINE_1 "The microcontroller's power dipped. Please make sure your power supply provides"
-#endif
-
-#ifndef MSG_SAFE_MODE_BROWN_OUT_LINE_2
-#define MSG_SAFE_MODE_BROWN_OUT_LINE_2 "enough power for the whole circuit and press reset (after ejecting CIRCUITPY)."
-#endif
-
-#ifndef MSG_WAIT_BEFORE_REPL
-#define MSG_WAIT_BEFORE_REPL "Press any key to enter the REPL. Use CTRL-D to reload."
-#endif
-
-// Be careful, some tools depend on this.
-#ifndef MSG_SOFT_REBOOT
-#define MSG_SOFT_REBOOT "soft reboot"
-#endif
-
-#ifndef MSG_DOUBLE_FILE_EXTENSION
-#define MSG_DOUBLE_FILE_EXTENSION "WARNING: Your code filename has two extensions\r\n"
-#endif
-
-#endif  // MICROPY_SUPERVISOR_MESSAGES_DEFAULT_H
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index c7e93e6393..0032337a75 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -43,20 +43,28 @@
 #define SAFE_MODE_DATA_GUARD 0xad0000af
 #define SAFE_MODE_DATA_GUARD_MASK 0xff0000ff
 
-static safe_mode_t current_safe_mode;
+static safe_mode_t _safe_mode;
+
+safe_mode_t get_safe_mode(void) {
+    return _safe_mode;
+}
+
+void set_safe_mode(safe_mode_t safe_mode) {
+    _safe_mode = safe_mode;
+}
 
 safe_mode_t wait_for_safe_mode_reset(void) {
     uint32_t reset_state = port_get_saved_word();
-    safe_mode_t safe_mode = NO_SAFE_MODE;
+    safe_mode_t safe_mode = SAFE_MODE_NONE;
     if ((reset_state & SAFE_MODE_DATA_GUARD_MASK) == SAFE_MODE_DATA_GUARD) {
         safe_mode = (reset_state & ~SAFE_MODE_DATA_GUARD_MASK) >> 8;
     }
-    if (safe_mode != NO_SAFE_MODE) {
+    if (safe_mode != SAFE_MODE_NONE) {
         port_set_saved_word(SAFE_MODE_DATA_GUARD);
-        current_safe_mode = safe_mode;
+        _safe_mode = safe_mode;
         return safe_mode;
     } else {
-        current_safe_mode = 0;
+        _safe_mode = SAFE_MODE_NONE;
     }
 
     const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
@@ -64,12 +72,12 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         reset_reason != RESET_REASON_RESET_PIN &&
         reset_reason != RESET_REASON_UNKNOWN &&
         reset_reason != RESET_REASON_SOFTWARE) {
-        return NO_SAFE_MODE;
+        return SAFE_MODE_NONE;
     }
     #if CIRCUITPY_SKIP_SAFE_MODE_WAIT
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
     #endif
-    port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));
+    port_set_saved_word(SAFE_MODE_DATA_GUARD | (SAFE_MODE_USER << 8));
     // Wait for a while to allow for reset.
 
     #if CIRCUITPY_STATUS_LED
@@ -106,11 +114,11 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     status_led_deinit();
     #endif
     if (boot_in_safe_mode) {
-        return USER_SAFE_MODE;
+        return SAFE_MODE_USER;
     }
     // 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;
+    return SAFE_MODE_NONE;
 }
 
 void safe_mode_on_next_reset(safe_mode_t reason) {
@@ -119,7 +127,7 @@ void safe_mode_on_next_reset(safe_mode_t reason) {
 
 // Don't inline this so it's easy to break on it from GDB.
 void __attribute__((noinline,)) reset_into_safe_mode(safe_mode_t reason) {
-    if (current_safe_mode > BROWNOUT && reason > BROWNOUT) {
+    if (_safe_mode > SAFE_MODE_BROWNOUT && reason > SAFE_MODE_BROWNOUT) {
         while (true) {
             // This very bad because it means running in safe mode didn't save us. Only ignore brownout
             // because it may be due to a switch bouncing.
@@ -133,7 +141,7 @@ void __attribute__((noinline,)) reset_into_safe_mode(safe_mode_t reason) {
 
 
 void print_safe_mode_message(safe_mode_t reason) {
-    if (reason == NO_SAFE_MODE) {
+    if (reason == SAFE_MODE_NONE) {
         return;
     }
 
@@ -145,43 +153,42 @@ void print_safe_mode_message(safe_mode_t reason) {
     // First check for safe mode reasons that do not necessarily reflect bugs.
 
     switch (reason) {
-        case USER_SAFE_MODE:
+        case SAFE_MODE_BROWNOUT:
+            message = translate("The microcontroller's power dipped. Make sure your power supply provides\nenough power for the whole circuit and press reset (after ejecting CIRCUITPY).");
+            break;
+        case SAFE_MODE_USER:
             #if defined(BOARD_USER_SAFE_MODE_ACTION)
             message = BOARD_USER_SAFE_MODE_ACTION;
             #elif defined(CIRCUITPY_BOOT_BUTTON)
-            message = translate("The BOOT button was pressed at start up.\n");
+            message = translate("You pressed the BOOT button at start up.");
+            #else
+            message = translate("You pressed the reset button during boot.");
             #endif
-            #if defined(BOARD_USER_SAFE_MODE_ACTION) || defined(CIRCUITPY_BOOT_BUTTON)
-            // Output a user safe mode string if it's set.
             serial_write_compressed(message);
-            message = translate("To exit, please reset the board without requesting safe mode.");
+            message = translate("\nTo exit, reset the board without requesting safe mode.");
             // The final piece is printed below.
-            #endif
             break;
-        case MANUAL_SAFE_MODE:
-            message = translate("You pressed the reset button during boot. Press again to exit safe mode.");
+        case SAFE_MODE_NO_CIRCUITPY:
+            message = translate("CIRCUITPY drive could not be found or created.");
             break;
-        case PROGRAMMATIC_SAFE_MODE:
+        case SAFE_MODE_PROGRAMMATIC:
             message = translate("The `microcontroller` module was used to boot into safe mode. Press reset to exit safe mode.");
             break;
-        case BROWNOUT:
-            message = translate("The microcontroller's power dipped. Make sure your power supply provides\nenough power for the whole circuit and press reset (after ejecting CIRCUITPY).");
+        case SAFE_MODE_SAFEMODE_PY_ERROR:
+            message = translate("Error in safemode.py.");
             break;
-        case USB_TOO_MANY_ENDPOINTS:
+        case SAFE_MODE_USB_TOO_MANY_ENDPOINTS:
             message = translate("USB devices need more endpoints than are available.");
             break;
-        case USB_TOO_MANY_INTERFACE_NAMES:
+        case SAFE_MODE_USB_TOO_MANY_INTERFACE_NAMES:
             message = translate("USB devices specify too many interface names.");
             break;
-        case USB_BOOT_DEVICE_NOT_INTERFACE_ZERO:
+        case SAFE_MODE_USB_BOOT_DEVICE_NOT_INTERFACE_ZERO:
             message = translate("Boot device must be first device (interface #0).");
             break;
-        case WATCHDOG_RESET:
+        case SAFE_MODE_WATCHDOG:
             message = translate("Internal watchdog timer expired.");
             break;
-        case NO_CIRCUITPY:
-            message = translate("CIRCUITPY drive could not be found or created.");
-            break;
         default:
             break;
     }
@@ -197,36 +204,29 @@ void print_safe_mode_message(safe_mode_t reason) {
     serial_write_compressed(translate("CircuitPython core code crashed hard. Whoops!\n"));
 
     switch (reason) {
-        case HARD_CRASH:
-            message = translate("Crash into the HardFault_Handler.");
-            break;
-        case MICROPY_NLR_JUMP_FAIL:
-            message = translate("NLR jump failed. Likely memory corruption.");
-            break;
-        case MICROPY_FATAL_ERROR:
-            message = translate("Fatal error.");
-            break;
-        case NO_HEAP:
-            message = translate("CircuitPython was unable to allocate the heap.");
-            break;
-        case HEAP_OVERWRITTEN:
-            message = translate("The CircuitPython heap was corrupted because the stack was too small.\nIncrease the stack size if you know how. If not:");
-            break;
-        case GC_ALLOC_OUTSIDE_VM:
+        case SAFE_MODE_GC_ALLOC_OUTSIDE_VM:
             message = translate("Attempted heap allocation when VM not running.");
             break;
-            #ifdef SOFTDEVICE_PRESENT
-        // defined in ports/nrf/bluetooth/bluetooth_common.mk
-        // will print "Unknown reason" if somehow encountered on other ports
-        case NORDIC_SOFT_DEVICE_ASSERT:
-            message = translate("Nordic system firmware failure assertion.");
-            break;
-            #endif
-        case FLASH_WRITE_FAIL:
+        case SAFE_MODE_FLASH_WRITE_FAIL:
             message = translate("Failed to write internal flash.");
             break;
-        case MEM_MANAGE:
-            message = translate("Invalid memory access.");
+        case SAFE_MODE_HARD_FAULT:
+            message = translate("Crash into the HardFault_Handler.");
+            break;
+        case SAFE_MODE_INTERRUPT_ERROR:
+            message = translate("Interrupt error.");
+            break;
+        case SAFE_MODE_NLR_JUMP_FAIL:
+            message = translate("NLR jump failed. Likely memory corruption.");
+            break;
+        case SAFE_MODE_NO_HEAP:
+            message = translate("CircuitPython was unable to allocate the heap.");
+            break;
+        case SAFE_MODE_SDK_FATAL_ERROR:
+            message = translate("Third-party firmware fatal error.");
+            break;
+        case SAFE_MODE_STACK_OVERFLOW:
+            message = translate("The CircuitPython heap was corrupted because the stack was too small.\nIncrease the stack size if you know how. If not:");
             break;
         default:
             message = translate("Unknown reason.");
diff --git a/supervisor/shared/safe_mode.h b/supervisor/shared/safe_mode.h
index 0c8d018bfe..005488552e 100644
--- a/supervisor/shared/safe_mode.h
+++ b/supervisor/shared/safe_mode.h
@@ -30,27 +30,32 @@
 #include "py/mpconfig.h"
 
 typedef enum {
-    NO_SAFE_MODE = 0,
-    BROWNOUT,
-    HARD_CRASH,
-    USER_SAFE_MODE,
-    HEAP_OVERWRITTEN,
-    MANUAL_SAFE_MODE,
-    MICROPY_NLR_JUMP_FAIL,
-    MICROPY_FATAL_ERROR,
-    GC_ALLOC_OUTSIDE_VM,
-    PROGRAMMATIC_SAFE_MODE,
-    NORDIC_SOFT_DEVICE_ASSERT,
-    FLASH_WRITE_FAIL,
-    MEM_MANAGE,
-    WATCHDOG_RESET,
-    USB_TOO_MANY_ENDPOINTS,
-    USB_TOO_MANY_INTERFACE_NAMES,
-    USB_BOOT_DEVICE_NOT_INTERFACE_ZERO,
-    NO_HEAP,
-    NO_CIRCUITPY,
+    SAFE_MODE_NONE = 0,
+    // BROWNOUT should be lowest after SAFE_MODE_NONE.
+    SAFE_MODE_BROWNOUT,
+    // alphabetical from here down
+    SAFE_MODE_FLASH_WRITE_FAIL,
+    SAFE_MODE_GC_ALLOC_OUTSIDE_VM,
+    SAFE_MODE_HARD_FAULT,
+    SAFE_MODE_INTERRUPT_ERROR,
+    SAFE_MODE_MANUAL,
+    SAFE_MODE_NLR_JUMP_FAIL,
+    SAFE_MODE_NO_CIRCUITPY,
+    SAFE_MODE_NO_HEAP,
+    SAFE_MODE_PROGRAMMATIC,
+    SAFE_MODE_SAFEMODE_PY_ERROR,
+    SAFE_MODE_SDK_FATAL_ERROR,
+    SAFE_MODE_STACK_OVERFLOW,
+    SAFE_MODE_USB_BOOT_DEVICE_NOT_INTERFACE_ZERO,
+    SAFE_MODE_USB_TOO_MANY_ENDPOINTS,
+    SAFE_MODE_USB_TOO_MANY_INTERFACE_NAMES,
+    SAFE_MODE_USER,
+    SAFE_MODE_WATCHDOG,
 } safe_mode_t;
 
+safe_mode_t get_safe_mode(void);
+void set_safe_mode(safe_mode_t safe_mode);
+
 safe_mode_t wait_for_safe_mode_reset(void);
 
 void safe_mode_on_next_reset(safe_mode_t reason);
diff --git a/supervisor/shared/stack.c b/supervisor/shared/stack.c
index fa8d019fea..be97cee234 100644
--- a/supervisor/shared/stack.c
+++ b/supervisor/shared/stack.c
@@ -74,7 +74,7 @@ inline bool stack_ok(void) {
 
 inline void assert_heap_ok(void) {
     if (!stack_ok()) {
-        reset_into_safe_mode(HEAP_OVERWRITTEN);
+        reset_into_safe_mode(SAFE_MODE_STACK_OVERFLOW);
     }
 }
 
diff --git a/supervisor/shared/usb/usb_desc.c b/supervisor/shared/usb/usb_desc.c
index fa4cf9607e..e7cffee351 100644
--- a/supervisor/shared/usb/usb_desc.c
+++ b/supervisor/shared/usb/usb_desc.c
@@ -228,7 +228,7 @@ static void usb_build_configuration_descriptor(void) {
         if (usb_hid_boot_device() > 0 && descriptor_counts.current_interface > 0) {
             // Hosts using boot devices generally to expect them to be at interface zero,
             // and will not work properly otherwise.
-            reset_into_safe_mode(USB_BOOT_DEVICE_NOT_INTERFACE_ZERO);
+            reset_into_safe_mode(SAFE_MODE_USB_BOOT_DEVICE_NOT_INTERFACE_ZERO);
         }
         descriptor_buf_remaining += usb_hid_add_descriptor(
             descriptor_buf_remaining, &descriptor_counts, ¤t_interface_string,
@@ -258,14 +258,14 @@ static void usb_build_configuration_descriptor(void) {
     if (descriptor_counts.current_endpoint > USB_NUM_ENDPOINT_PAIRS ||
         descriptor_counts.num_in_endpoints > USB_NUM_IN_ENDPOINTS ||
         descriptor_counts.num_out_endpoints > USB_NUM_OUT_ENDPOINTS) {
-        reset_into_safe_mode(USB_TOO_MANY_ENDPOINTS);
+        reset_into_safe_mode(SAFE_MODE_USB_TOO_MANY_ENDPOINTS);
     }
 }
 
 // str must not be on the heap.
 void usb_add_interface_string(uint8_t interface_string_index, const char str[]) {
     if (interface_string_index > MAX_INTERFACE_STRINGS) {
-        reset_into_safe_mode(USB_TOO_MANY_INTERFACE_NAMES);
+        reset_into_safe_mode(SAFE_MODE_USB_TOO_MANY_INTERFACE_NAMES);
     }
 
     collected_interface_strings[interface_string_index].char_str = str;
diff --git a/supervisor/stub/safe_mode.c b/supervisor/stub/safe_mode.c
index b62cc05d78..ea5187da28 100644
--- a/supervisor/stub/safe_mode.c
+++ b/supervisor/stub/safe_mode.c
@@ -29,7 +29,7 @@
 #include 
 
 safe_mode_t wait_for_safe_mode_reset(void) {
-    return NO_SAFE_MODE;
+    return SAFE_MODE_NONE;
 }
 
 void reset_into_safe_mode(safe_mode_t reason) {

From 39d3d97ea4a0805dd12294728f16bca4a6301fbd Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 19:46:35 -0500
Subject: [PATCH 1826/2403] Remove unnecessary memory barriers

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index b42bfb9de8..f5c3c245f6 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -96,9 +96,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         // Wait for the clock to start up.
         COMPLETE_MEMORY_READS;
         icnt = 0;
-        while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {
-            COMPLETE_MEMORY_READS;
-        }
+        while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {}
     }
 
     PWM0_Type *pwm = PWM0;
@@ -143,7 +141,6 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
             icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
-                COMPLETE_MEMORY_READS;
             }
             // Dummy value for the first channel.
             pwm->FIF1 = 0x000000;
@@ -151,14 +148,12 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         icnt = 0;
         while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
             RUN_BACKGROUND_TASKS;
-            COMPLETE_MEMORY_READS;
         }
         pwm->FIF1 = expanded;
         if (channel == 0) {
             icnt = 0;
             while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
                 RUN_BACKGROUND_TASKS;
-                COMPLETE_MEMORY_READS;
             }
             // Dummy value for the second channel.
             pwm->FIF1 = 0x000000;
@@ -168,23 +163,19 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     icnt = 0;
     while ((pwm->STA_b.EMPT1 == 0) && (icnt++ < 2500)) {
         RUN_BACKGROUND_TASKS;
-        COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to start.
     icnt = 0;
     while (((pwm->STA_b.STA1 == 0) && (pwm->STA_b.STA2 == 0)) && (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
-        COMPLETE_MEMORY_READS;
     }
     // Wait for transmission to complete.
     icnt = 0;
     while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
-        COMPLETE_MEMORY_READS;
     }
     // Shouldn't be anything left in queue but clear it so the clock doesn't crash if there is
     pwm->CTL = PWM0_CTL_CLRF1_Msk;
-    COMPLETE_MEMORY_READS;
 
     gpio_set_function(digitalinout->pin->number, GPIO_FUNCTION_OUTPUT);
 

From 09ccf2988d78a387f19ff0a9db7413fa8b62a926 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 21:04:11 -0500
Subject: [PATCH 1827/2403] Replace bitwise or with boolean or

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index f5c3c245f6..aa256c7413 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -171,7 +171,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     }
     // Wait for transmission to complete.
     icnt = 0;
-    while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) {
+    while (((pwm->STA_b.STA1 == 1) || (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) {
         RUN_BACKGROUND_TASKS;
     }
     // Shouldn't be anything left in queue but clear it so the clock doesn't crash if there is

From 6ebb911a4dde0801c9fd5f56da7ee43c51375fd5 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Mon, 13 Feb 2023 21:06:47 -0500
Subject: [PATCH 1828/2403] pre-commit formatting fix

---
 ports/broadcom/common-hal/neopixel_write/__init__.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c
index aa256c7413..245244614f 100644
--- a/ports/broadcom/common-hal/neopixel_write/__init__.c
+++ b/ports/broadcom/common-hal/neopixel_write/__init__.c
@@ -96,7 +96,8 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
         // Wait for the clock to start up.
         COMPLETE_MEMORY_READS;
         icnt = 0;
-        while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {}
+        while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {
+        }
     }
 
     PWM0_Type *pwm = PWM0;

From d46d9d5c21e21267979e8d5f6ffef84d86f2a53e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 13 Feb 2023 21:29:57 -0500
Subject: [PATCH 1829/2403] shorten safe mode messages; improve message
 printing; fix CIRCUITPY_SAFEMODE_PY=0

---
 locale/circuitpython.pot                    | 64 +++++++--------
 py/circuitpy_defns.mk                       |  6 +-
 shared-bindings/supervisor/Runtime.c        |  5 +-
 shared-bindings/supervisor/SafeModeReason.c | 10 +--
 shared-bindings/supervisor/__init__.c       |  2 +-
 supervisor/shared/safe_mode.c               | 90 ++++++++++-----------
 6 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 960625e949..e6948de330 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -31,14 +31,20 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"To exit, reset the board without requesting safe mode."
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
 msgstr ""
 
 #: py/obj.c
@@ -536,10 +542,6 @@ msgstr ""
 msgid "Attempt to allocate %d blocks"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -588,7 +590,7 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -790,10 +792,6 @@ msgstr ""
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr ""
@@ -832,10 +830,6 @@ msgstr ""
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -1003,6 +997,10 @@ msgstr ""
 msgid "Failed to write internal flash."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Fault detected by hardware."
+msgstr ""
+
 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""
@@ -1088,6 +1086,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1993,15 +2000,7 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
@@ -2013,10 +2012,7 @@ msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2162,6 +2158,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2367,10 +2367,6 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr ""
-
 #: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@@ -2385,7 +2381,7 @@ msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "You pressed the BOOT button at start up."
+msgid "You pressed the BOOT button at start up"
 msgstr ""
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index eaf78d3688..9de0e5a804 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -525,12 +525,16 @@ $(filter $(SRC_PATTERNS), \
 	qrio/PixelPolicy.c \
 	qrio/QRInfo.c \
 	supervisor/RunReason.c \
-	supervisor/SafeModeReason.c \
 	supervisor/StatusBar.c \
 	wifi/AuthMode.c \
 	wifi/Packet.c \
 )
 
+ifeq ($(CIRCUITPY_SAFEMODE_PY),1)
+SRC_BINDINGS_ENUMS += \
+	supervisor/SafeModeReason.c
+endif
+
 SRC_BINDINGS_ENUMS += \
 	util.c
 
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index c9c47a638d..db3d8d1e4d 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -117,7 +117,10 @@ MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj,
     (mp_obj_t)&supervisor_runtime_get_run_reason_obj);
 
 //|     safe_mode_reason: SafeModeReason
-//|     """Why CircuitPython went into safe mode this particular time (read-only)."""
+//|     """Why CircuitPython went into safe mode this particular time (read-only).
+//|
+//|     **Limitations**: Raises ``NotImplementedError`` on builds that do not implement ``safemode.py``.
+//|     """
 STATIC mp_obj_t supervisor_runtime_get_safe_mode_reason(mp_obj_t self) {
     #if CIRCUITPY_SAFEMODE_PY
     return cp_enum_find(&supervisor_safe_mode_reason_type, get_safe_mode());
diff --git a/shared-bindings/supervisor/SafeModeReason.c b/shared-bindings/supervisor/SafeModeReason.c
index 9a253596f3..180b7a1530 100644
--- a/shared-bindings/supervisor/SafeModeReason.c
+++ b/shared-bindings/supervisor/SafeModeReason.c
@@ -31,7 +31,6 @@
 // Reuse the non-Python safe_mode_t enum
 #include "supervisor/shared/safe_mode.h"
 
-#if CIRCUITPY_SAFEMODE_PY
 MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, NONE, SAFE_MODE_NONE);
 MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, BROWNOUT, SAFE_MODE_BROWNOUT);
 // alphabetical from here down
@@ -50,16 +49,16 @@ MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USB_TOO_MANY
 MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USB_TOO_MANY_INTERFACE_NAMES, SAFE_MODE_USB_TOO_MANY_INTERFACE_NAMES);
 MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, USER, SAFE_MODE_USER);
 MAKE_ENUM_VALUE(supervisor_safe_mode_reason_type, safe_mode_reason, WATCHDOG, SAFE_MODE_WATCHDOG);
-#endif
 
 
 //| class SafeModeReason:
-//|     """The reason that CircuitPython went into safe mode."""
+//|     """The reason that CircuitPython went into safe mode.
+//|
+//|     **Limitations**: Class not available on builds that do not implement ``safemode.py``.
+//|     """
 //|
 MAKE_ENUM_MAP(supervisor_safe_mode_reason) {
 
-    #if CIRCUITPY_SAFEMODE_PY
-
 //|     NONE: object
 //|     """CircuitPython is not in safe mode."""
 //|
@@ -146,7 +145,6 @@ MAKE_ENUM_MAP(supervisor_safe_mode_reason) {
 //|     """An internal watchdog timer expired."""
 //|
     MAKE_ENUM_MAP_ENTRY(safe_mode_reason, WATCHDOG),
-    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_safe_mode_reason_locals_dict, supervisor_safe_mode_reason_locals_table);
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 850931ceac..491cac2f17 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -339,7 +339,7 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     #if CIRCUITPY_SAFEMODE_PY
     { MP_ROM_QSTR(MP_QSTR_SafeModeReason),  MP_ROM_PTR(&supervisor_safe_mode_reason_type) },
     #else
-    { MP_ROM_QSTR(MP_QSTR_SafeModeReason),  mp_const_none },
+    { MP_ROM_QSTR(MP_QSTR_SafeModeReason),  MP_ROM_NONE },
     #endif
     { MP_ROM_QSTR(MP_QSTR_set_next_code_file),  MP_ROM_PTR(&supervisor_set_next_code_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_ms),  MP_ROM_PTR(&supervisor_ticks_ms_obj) },
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 0032337a75..5112b17ebf 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -145,8 +145,7 @@ void print_safe_mode_message(safe_mode_t reason) {
         return;
     }
 
-    serial_write("\r\n");
-    serial_write_compressed(translate("You are in safe mode because:\n"));
+    serial_write_compressed(translate("\nYou are in safe mode because:\n"));
 
     const compressed_string_t *message = NULL;
 
@@ -154,29 +153,31 @@ void print_safe_mode_message(safe_mode_t reason) {
 
     switch (reason) {
         case SAFE_MODE_BROWNOUT:
-            message = translate("The microcontroller's power dipped. Make sure your power supply provides\nenough power for the whole circuit and press reset (after ejecting CIRCUITPY).");
+            message = translate("The power dipped. Make sure you are providing enough power.");
             break;
         case SAFE_MODE_USER:
             #if defined(BOARD_USER_SAFE_MODE_ACTION)
             message = BOARD_USER_SAFE_MODE_ACTION;
             #elif defined(CIRCUITPY_BOOT_BUTTON)
-            message = translate("You pressed the BOOT button at start up.");
+            message = translate("You pressed the BOOT button at start up");
             #else
             message = translate("You pressed the reset button during boot.");
             #endif
-            serial_write_compressed(message);
-            message = translate("\nTo exit, reset the board without requesting safe mode.");
-            // The final piece is printed below.
             break;
         case SAFE_MODE_NO_CIRCUITPY:
             message = translate("CIRCUITPY drive could not be found or created.");
             break;
         case SAFE_MODE_PROGRAMMATIC:
-            message = translate("The `microcontroller` module was used to boot into safe mode. Press reset to exit safe mode.");
+            message = translate("The `microcontroller` module was used to boot into safe mode.");
             break;
+        #if CIRCUITPY_SAFEMODE_PY
         case SAFE_MODE_SAFEMODE_PY_ERROR:
             message = translate("Error in safemode.py.");
             break;
+        #endif
+        case SAFE_MODE_STACK_OVERFLOW:
+            message = translate("Heap was corrupted because the stack was too small. Increase stack size.");
+            break;
         case SAFE_MODE_USB_TOO_MANY_ENDPOINTS:
             message = translate("USB devices need more endpoints than are available.");
             break;
@@ -184,7 +185,7 @@ void print_safe_mode_message(safe_mode_t reason) {
             message = translate("USB devices specify too many interface names.");
             break;
         case SAFE_MODE_USB_BOOT_DEVICE_NOT_INTERFACE_ZERO:
-            message = translate("Boot device must be first device (interface #0).");
+            message = translate("Boot device must be first (interface #0).");
             break;
         case SAFE_MODE_WATCHDOG:
             message = translate("Internal watchdog timer expired.");
@@ -194,44 +195,41 @@ void print_safe_mode_message(safe_mode_t reason) {
     }
 
     if (message) {
+        // Non-crash safe mode.
         serial_write_compressed(message);
-        serial_write("\r\n");
-        return;
+    } else {
+        // Something worse happened.
+        serial_write_compressed(translate("CircuitPython core code crashed hard. Whoops!\n"));
+        switch (reason) {
+            case SAFE_MODE_GC_ALLOC_OUTSIDE_VM:
+                message = translate("Heap allocation when VM not running.");
+                break;
+            case SAFE_MODE_FLASH_WRITE_FAIL:
+                message = translate("Failed to write internal flash.");
+                break;
+            case SAFE_MODE_HARD_FAULT:
+                message = translate("Fault detected by hardware.");
+                break;
+            case SAFE_MODE_INTERRUPT_ERROR:
+                message = translate("Interrupt error.");
+                break;
+            case SAFE_MODE_NLR_JUMP_FAIL:
+                message = translate("NLR jump failed. Likely memory corruption.");
+                break;
+            case SAFE_MODE_NO_HEAP:
+                message = translate("Unable to allocate the heap.");
+                break;
+            case SAFE_MODE_SDK_FATAL_ERROR:
+                message = translate("Third-party firmware fatal error.");
+                break;
+            default:
+                message = translate("Unknown reason.");
+                break;
+        }
+        serial_write_compressed(message);
+        serial_write_compressed(translate("\nPlease file an issue with your program at https://github.com/adafruit/circuitpython/issues."));
     }
 
-    // Something worse happened.
-
-    serial_write_compressed(translate("CircuitPython core code crashed hard. Whoops!\n"));
-
-    switch (reason) {
-        case SAFE_MODE_GC_ALLOC_OUTSIDE_VM:
-            message = translate("Attempted heap allocation when VM not running.");
-            break;
-        case SAFE_MODE_FLASH_WRITE_FAIL:
-            message = translate("Failed to write internal flash.");
-            break;
-        case SAFE_MODE_HARD_FAULT:
-            message = translate("Crash into the HardFault_Handler.");
-            break;
-        case SAFE_MODE_INTERRUPT_ERROR:
-            message = translate("Interrupt error.");
-            break;
-        case SAFE_MODE_NLR_JUMP_FAIL:
-            message = translate("NLR jump failed. Likely memory corruption.");
-            break;
-        case SAFE_MODE_NO_HEAP:
-            message = translate("CircuitPython was unable to allocate the heap.");
-            break;
-        case SAFE_MODE_SDK_FATAL_ERROR:
-            message = translate("Third-party firmware fatal error.");
-            break;
-        case SAFE_MODE_STACK_OVERFLOW:
-            message = translate("The CircuitPython heap was corrupted because the stack was too small.\nIncrease the stack size if you know how. If not:");
-            break;
-        default:
-            message = translate("Unknown reason.");
-            break;
-    }
-    serial_write_compressed(message);
-    serial_write_compressed(translate("\nPlease file an issue with the contents of your CIRCUITPY drive at \nhttps://github.com/adafruit/circuitpython/issues\n"));
+    // Always tell user how to get out of safe mode.
+    serial_write_compressed(translate("\nPress reset to exit safe mode.\n"));
 }

From c39a51527f2455f1b7e013fa4371bfbd06b66e1e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 13 Feb 2023 21:48:03 -0500
Subject: [PATCH 1830/2403] Turn safemode.py off on non-external-flash SAMD21
 builds

---
 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 57f7ca339f..0d6c5a761b 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -57,6 +57,7 @@ CIRCUITPY_ZLIB = 0
 
 ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
 CIRCUITPY_ONEWIREIO ?= 0
+CIRCUITPY_SAFEMODE_PY ?= 0
 CIRCUITPY_USB_IDENTIFICATION ?= 0
 endif
 

From 0f099cdb3197accdaa54b5a39c1b9c952708a6ed Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 13 Feb 2023 22:52:39 -0500
Subject: [PATCH 1831/2403] Turn off safemode.py for pewpew_m4

---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 0560da84fe..2497eedad3 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -30,6 +30,7 @@ CIRCUITPY_PWMIO = 0
 CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
+CIRCUITPY_SAFEMODE_PY = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0

From 50c52fca88d3e8098bc9857f8223c1d961494391 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 14 Feb 2023 20:33:24 +0530
Subject: [PATCH 1832/2403] split raspberrypi and refactor espressif

---
 .github/actions/deps/external/action.yml      | 14 ++++----
 .../deps/{port => ports/espressif}/action.yml | 17 +---------
 .github/workflows/build-boards.yml            |  5 ++-
 .github/workflows/build.yml                   | 20 +++++++++---
 tools/ci_set_matrix.py                        | 32 ++++++++++---------
 5 files changed, 42 insertions(+), 46 deletions(-)
 rename .github/actions/deps/{port => ports/espressif}/action.yml (74%)

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 9f5c3bd7c9..3503e5b194 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -8,7 +8,7 @@ inputs:
     options:
     - arm
     - aarch
-    - espressif
+    - esp
     - riscv
     - none
 
@@ -42,13 +42,13 @@ runs:
       with:
         release: '10-2020-q4'
 
-    # espressif
-    - name: Get espressif toolchain
-      if: inputs.platform == 'espressif'
+    # esp
+    - name: Get esp toolchain
+      if: inputs.platform == 'esp'
       run: sudo apt-get install -y ninja-build
       shell: bash
     - name: Install IDF tools
-      if: inputs.platform == 'espressif'
+      if: inputs.platform == 'esp'
       run: |
         echo "Installing ESP-IDF tools"
         $IDF_PATH/tools/idf_tools.py --non-interactive install required
@@ -58,7 +58,7 @@ runs:
         rm -rf $IDF_TOOLS_PATH/dist
       shell: bash
     - name: Set environment
-      if: inputs.platform == 'espressif'
+      if: inputs.platform == 'esp'
       run: |
         source $IDF_PATH/export.sh
         echo >> $GITHUB_ENV "IDF_PYTHON_ENV_PATH=$IDF_PYTHON_ENV_PATH"
@@ -75,7 +75,7 @@ runs:
 
     # common
     - name: Cache python dependencies
-      if: inputs.platform != 'espressif'
+      if: inputs.platform != 'esp'
       uses: ./.github/actions/deps/python
       with:
         action: ${{ fromJSON('["restore", "cache"]')[github.job == 'scheduler'] }}
diff --git a/.github/actions/deps/port/action.yml b/.github/actions/deps/ports/espressif/action.yml
similarity index 74%
rename from .github/actions/deps/port/action.yml
rename to .github/actions/deps/ports/espressif/action.yml
index 36b67c6081..aa1e98f8a0 100644
--- a/.github/actions/deps/port/action.yml
+++ b/.github/actions/deps/ports/espressif/action.yml
@@ -1,27 +1,15 @@
-name: Fetch port deps
-
-inputs:
-  platform:
-    required: false
-    default: none
-    type: choice
-    options:
-    - espressif
-    - none
+name: Fetch espressif port deps
 
 runs:
   using: composite
   steps:
-    # espressif
     - name: Set IDF env
-      if: inputs.platform == 'espressif'
       run: |
         echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
         echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
       shell: bash
 
     - name: Get IDF commit
-      if: inputs.platform == 'espressif'
       id: idf-commit
       run: |
         COMMIT=$(git submodule status ports/espressif/esp-idf | grep -o -P '(?<=^-).*(?= )')
@@ -30,7 +18,6 @@ runs:
       shell: bash
 
     - name: Cache IDF submodules
-      if: inputs.platform == 'espressif'
       uses: actions/cache@v3
       with:
         path: |
@@ -39,13 +26,11 @@ runs:
         key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
 
     - name: Cache IDF tools
-      if: inputs.platform == 'espressif'
       uses: actions/cache@v3
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}
 
     - name: Initialize IDF submodules
-      if: inputs.platform == 'espressif'
       run: git submodule update --init --depth=1 --recursive $IDF_PATH
       shell: bash
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index c302be7c9f..b9e6577a19 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -35,9 +35,8 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up port
-      uses: ./.github/actions/deps/port
-      with:
-        platform: ${{ inputs.platform }}
+      if: inputs.platform == 'esp'
+      uses: ./.github/actions/deps/ports/espressif
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cdf9462289..dae1ffc271 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,8 +24,9 @@ jobs:
       build-boards: ${{ steps.set-matrix.outputs.build-boards }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
-      boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
+      boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
+      boards-rpi: ${{ steps.set-matrix.outputs.boards-rpi }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
     - name: Dump GitHub context
@@ -238,13 +239,13 @@ jobs:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
 
-  espressif:
+  esp:
     needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-espressif != '[]' }}
+    if: ${{ needs.scheduler.outputs.boards-esp != '[]' }}
     uses: ./.github/workflows/build-boards.yml
     with:
-      platform: espressif
-      boards: ${{ needs.scheduler.outputs.boards-espressif }}
+      platform: esp
+      boards: ${{ needs.scheduler.outputs.boards-esp }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
 
@@ -256,3 +257,12 @@ jobs:
       platform: riscv
       boards: ${{ needs.scheduler.outputs.boards-riscv }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
+  rpi:
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-rpi != '[]' }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: arm
+      boards: ${{ needs.scheduler.outputs.boards-rpi }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 354ad51d71..6e7a4f1229 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -46,11 +46,11 @@ PORT_TO_ARCH = {
     "atmel-samd": "arm",
     "broadcom": "aarch",
     "cxd56": "arm",
-    "espressif": "espressif",
+    "espressif": "esp",
     "litex": "riscv",
     "mimxrt10xx": "arm",
     "nrf": "arm",
-    "raspberrypi": "arm",
+    "raspberrypi": "rpi",
     "stm": "arm",
 }
 
@@ -204,31 +204,33 @@ def set_boards_to_build(build_all: bool):
             break
 
     # Split boards by architecture.
+    arch_to_boards = {"aarch": [], "arm": [], "esp": [], "riscv": [], "rpi": []}
+
+    # Append previously failed boards
+    for arch in arch_to_boards:
+        arch_to_job = f"build-{arch}"
+        if arch_to_job in last_failed_jobs:
+            for board in last_failed_jobs[arch_to_job]:
+                if not board in boards_to_build:
+                    boards_to_build.append(board)
+
     build_boards = bool(boards_to_build)
     print("Building boards:", build_boards)
     set_output("build-boards", build_boards)
-    arch_to_boards = {"aarch": [], "arm": [], "riscv": [], "espressif": []}
+
+    # Append boards according to arch
     for board in sorted(boards_to_build):
-        print(" ", board)
         port = board_to_port.get(board)
         # A board can appear due to its _deletion_ (rare)
         # if this happens it's not in `board_to_port`.
         if not port:
             continue
-        arch = PORT_TO_ARCH[port]
-        arch_to_boards[arch].append(board)
+        arch_to_boards[PORT_TO_ARCH[port]].append(board)
+        print(" ", board)
 
     # Set the step outputs for each architecture
     for arch in arch_to_boards:
-        # Append previous failed jobs
-        if f"build-{arch}" in last_failed_jobs:
-            failed_boards = last_failed_jobs[f"build-{arch}"]
-            for board in failed_boards:
-                if not board in arch_to_boards[arch]:
-                    print(" ", board)
-                    arch_to_boards[arch].append(board)
-        # Set Output
-        set_output(f"boards-{arch}", json.dumps(sorted(arch_to_boards[arch])))
+        set_output(f"boards-{arch}", json.dumps(arch_to_boards[arch]))
 
 
 def set_docs_to_build(build_doc: bool):

From 328585f1607b94ed365858432116e4b3e880c341 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Feb 2023 11:20:29 -0500
Subject: [PATCH 1833/2403] don't enter safemode.py on USER safe mode

---
 README.rst                                  | 6 ++++--
 main.c                                      | 4 +++-
 shared-bindings/supervisor/SafeModeReason.c | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 35a66669ed..1a6dc2c33e 100644
--- a/README.rst
+++ b/README.rst
@@ -139,8 +139,10 @@ Behavior
    possible to fix code that causes nasty crashes by making it available through mass storage after
    the crash. A reset (the button) is needed after it's fixed to get back into normal mode.
 -  Safe mode may be handled programmatically by providing a ``safemode.py``.
-   ``safemode.py`` is run if the board has reset due to entering safe mode. USB is not
-   available so nothing can be printed. ``safemode.py`` can determine why the safe mode occurred
+   ``safemode.py`` is run if the board has reset due to entering safe mode, unless the safe mode
+   initiated by the user by pressing button(s).
+   USB is not available so nothing can be printed.
+   ``safemode.py`` can determine why the safe mode occurred
    using ``supervisor.runtime.safe_mode_reason``, and take appropriate action. For instance,
    if a hard crash occurred, ``safemode.py`` may do a ``microcontroller.reset()``
    to automatically restart despite the crash.
diff --git a/main.c b/main.c
index 4d37e17992..c0b4cb7be2 100644
--- a/main.c
+++ b/main.c
@@ -733,7 +733,9 @@ vstr_t *boot_output;
 #if CIRCUITPY_SAFEMODE_PY
 STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) {
     // Don't run if we aren't in safe mode or we won't be able to find safemode.py.
-    if (safe_mode == SAFE_MODE_NONE || !filesystem_present()) {
+    // Also don't run if it's a user-initiated safemode (pressing button(s) during boot),
+    // since that's deliberate.
+    if (safe_mode == SAFE_MODE_NONE || safe_mode == SAFE_MODE_USER || !filesystem_present()) {
         return;
     }
 
diff --git a/shared-bindings/supervisor/SafeModeReason.c b/shared-bindings/supervisor/SafeModeReason.c
index 180b7a1530..2da03bdced 100644
--- a/shared-bindings/supervisor/SafeModeReason.c
+++ b/shared-bindings/supervisor/SafeModeReason.c
@@ -137,7 +137,11 @@ MAKE_ENUM_MAP(supervisor_safe_mode_reason) {
     MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USB_TOO_MANY_INTERFACE_NAMES),
 
 //|     USER: object
-//|     """The user pressed one or more buttons to enter safe mode."""
+//|     """The user pressed one or more buttons to enter safe mode.
+//|     This safe mode does **not** cause ``safemode.py`` to be run, since its purpose
+//|     is to prevent all user code from running.
+//|     This allows errors in ``safemode.py`` to be corrected easily.
+//|     """
 //|
     MAKE_ENUM_MAP_ENTRY(safe_mode_reason, USER),
 

From 73840f840db1e7f2374ccc57f236e1185aa3c744 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 14 Feb 2023 10:46:20 -0600
Subject: [PATCH 1834/2403] Improve boot_out.txt truncation

 * write any partial message
 * instead of "..." show a sensible (translatable) message

This does slightly lower the amount of data that can be printed,
and makes the exact amount dependent on the language. However, if boot.py
intentionally needs to produce larger amounts of output, it can
deliberately mount the filesystem in RW mode and perform any writes needed.
In that case it's up to the boot.py to choose an appropriate way to
limit the number of writes if needed for the application.
---
 locale/circuitpython.pot        |  4 ++++
 supervisor/shared/micropython.c | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 72ee60cc0c..4e7abcb0b8 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2410,6 +2410,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c
index ebc0aef2d1..5ee0061544 100644
--- a/supervisor/shared/micropython.c
+++ b/supervisor/shared/micropython.c
@@ -62,8 +62,15 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #ifdef CIRCUITPY_BOOT_OUTPUT_FILE
     if (boot_output != NULL) {
         // Ensure boot_out.txt is capped at 1 filesystem block and ends with a newline
-        if (len + boot_output->len > 508) {
-            vstr_add_str(boot_output, "...\n");
+        #define TRUNCATED translate("[truncated due to length]")
+        size_t truncated_message_len = decompress_length(TRUNCATED);
+        size_t maxlen = 512 - truncated_message_len; // includes trailing '\0' so we do not need to account for trailing newline '\n' in vstr_add_byte
+        if (len + boot_output->len > maxlen) {
+            size_t remaining_len = maxlen - boot_output->len;
+            vstr_add_strn(boot_output, str, remaining_len);
+            char buf[truncated_message_len];
+            vstr_add_str(boot_output, decompress(TRUNCATED, buf));
+            vstr_add_byte(boot_output, '\n');
             boot_output = NULL;
         } else {
             vstr_add_strn(boot_output, str, len);

From 98b61279e4c691e750b905dc7357f0081cbf91d8 Mon Sep 17 00:00:00 2001
From: Gregory Neverov <42853258+gneverov@users.noreply.github.com>
Date: Tue, 14 Feb 2023 09:05:24 -0800
Subject: [PATCH 1835/2403] Add function common_hal_busio_uart_never_reset for
 rp2

---
 ports/raspberrypi/common-hal/busio/UART.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
index 4212249ec9..8c33226707 100644
--- a/ports/raspberrypi/common-hal/busio/UART.c
+++ b/ports/raspberrypi/common-hal/busio/UART.c
@@ -339,3 +339,18 @@ bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
     }
     return uart_is_writable(self->uart);
 }
+
+STATIC void pin_never_reset(uint8_t pin) {
+    if (pin != NO_PIN) {
+        never_reset_pin_number(pin);
+    }
+}
+
+void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) {
+    never_reset_uart(self->uart_id);
+    pin_never_reset(self->tx_pin);
+    pin_never_reset(self->rx_pin);
+    pin_never_reset(self->cts_pin);
+    pin_never_reset(self->rs485_dir_pin);
+    pin_never_reset(self->rts_pin);
+}

From 5168e96d0c478b4de0e064d1a91e27775ced731f Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:53:56 +0530
Subject: [PATCH 1836/2403] fix docs upload to aws

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dae1ffc271..0af395a620 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -201,6 +201,11 @@ jobs:
       with:
         name: docs
         path: _build/latex
+    - name: Zip stubs
+      if: >-
+        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
+        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+      run: zip -9r circuitpython-stubs.zip circuitpython-stubs
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:

From cfea7c1d6995a79d954a0253f24cc3228f83abf5 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 15 Feb 2023 10:56:54 +0530
Subject: [PATCH 1837/2403] refactor mpy-cross-mac aws path

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0af395a620..ad488152f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -152,9 +152,9 @@ jobs:
           (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
           (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
+        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

From 422098e1711259d18b4b26077f8435302d1fb1d7 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 12:30:42 +0200
Subject: [PATCH 1838/2403] pystack is now a valid supervisor allocation

---
 main.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/main.c b/main.c
index 6f3f2820cd..7b9f10d1e3 100644
--- a/main.c
+++ b/main.c
@@ -122,18 +122,13 @@
 uint8_t value_out = 0;
 #endif
 
-#if MICROPY_ENABLE_PYSTACK
-size_t *pystack;
-int pystack_size = CIRCUITPY_PYSTACK_SIZE;
-#endif
-
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_reset();
     #endif
 }
 
-STATIC void start_mp(supervisor_allocation *heap) {
+STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack, int pystack_size) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -161,7 +156,7 @@ STATIC void start_mp(supervisor_allocation *heap) {
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(pystack, pystack + (pystack_size / sizeof(size_t)));
+    mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -364,7 +359,7 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) {
     }
 }
 
-STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
+STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset, supervisor_allocation *pystack, int pystack_size) {
     bool serial_connected_at_start = serial_connected();
     bool printed_safe_mode_message = false;
     #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
@@ -403,7 +398,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         supervisor_allocation *heap = allocate_remaining_memory();
 
         // Prepare the VM state.
-        start_mp(heap);
+        start_mp(heap, pystack, pystack_size);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -731,7 +726,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 vstr_t *boot_output;
 
-STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
+STATIC void run_boot_py(safe_mode_t safe_mode, supervisor_allocation *pystack, int pystack_size) {
     if (safe_mode == NO_HEAP) {
         return;
     }
@@ -749,7 +744,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     supervisor_allocation *heap = allocate_remaining_memory();
 
-    start_mp(heap);
+    start_mp(heap, pystack, pystack_size);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -846,12 +841,12 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     #endif
 }
 
-STATIC int run_repl(void) {
+STATIC int run_repl(supervisor_allocation *pystack, int pystack_size) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap);
+    start_mp(heap, pystack, pystack_size);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -915,8 +910,11 @@ STATIC int run_repl(void) {
 int __attribute__((used)) main(void) {
 
     #if MICROPY_ENABLE_PYSTACK
+    supervisor_allocation *pystack;
+    int pystack_size = CIRCUITPY_PYSTACK_SIZE;
+
     // allocate the pystack
-    pystack = (size_t *)allocate_memory(pystack_size, false, false);
+    pystack = allocate_memory(pystack_size, false, false);
     #endif
 
     // initialise the cpu and peripherals
@@ -998,7 +996,7 @@ int __attribute__((used)) main(void) {
     filesystem_set_internal_concurrent_write_protection(true);
     filesystem_set_internal_writable_by_usb(CIRCUITPY_USB == 1);
 
-    run_boot_py(safe_mode);
+    run_boot_py(safe_mode, pystack, pystack_size);
 
     supervisor_workflow_start();
 
@@ -1012,7 +1010,7 @@ int __attribute__((used)) main(void) {
     bool simulate_reset = true;
     for (;;) {
         if (!skip_repl) {
-            exit_code = run_repl();
+            exit_code = run_repl(pystack, pystack_size);
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
@@ -1023,7 +1021,7 @@ int __attribute__((used)) main(void) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard
                 // reset. This will preserve any alarm information.
-                skip_repl = run_code_py(safe_mode, &simulate_reset);
+                skip_repl = run_code_py(safe_mode, &simulate_reset, pystack, pystack_size);
             } else {
                 skip_repl = false;
             }

From 9e2235d7f716171f8cf1432b59d64edc914c9794 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 15:23:16 +0200
Subject: [PATCH 1839/2403] pystack works via settings.toml, stackless not
 working yet

---
 main.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/main.c b/main.c
index 7b9f10d1e3..19bfe85973 100644
--- a/main.c
+++ b/main.c
@@ -122,6 +122,10 @@
 uint8_t value_out = 0;
 #endif
 
+#if MICROPY_ENABLE_PYSTACK
+#include "shared-module/os/__init__.h"
+#endif
+
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_reset();
@@ -156,7 +160,9 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
+    if (pystack_size > 0) {
+        mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
+    }
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -398,7 +404,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset, supervisor_
         supervisor_allocation *heap = allocate_remaining_memory();
 
         // Prepare the VM state.
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
         start_mp(heap, pystack, pystack_size);
+        #pragma GCC diagnostic pop
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -743,8 +752,10 @@ STATIC void run_boot_py(safe_mode_t safe_mode, supervisor_allocation *pystack, i
     // Do USB setup even if boot.py is not run.
 
     supervisor_allocation *heap = allocate_remaining_memory();
-
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
     start_mp(heap, pystack, pystack_size);
+    #pragma GCC diagnostic pop
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -846,7 +857,10 @@ STATIC int run_repl(supervisor_allocation *pystack, int pystack_size) {
     stack_resize();
     filesystem_flush();
     supervisor_allocation *heap = allocate_remaining_memory();
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
     start_mp(heap, pystack, pystack_size);
+    #pragma GCC diagnostic pop
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -909,14 +923,6 @@ STATIC int run_repl(supervisor_allocation *pystack, int pystack_size) {
 
 int __attribute__((used)) main(void) {
 
-    #if MICROPY_ENABLE_PYSTACK
-    supervisor_allocation *pystack;
-    int pystack_size = CIRCUITPY_PYSTACK_SIZE;
-
-    // allocate the pystack
-    pystack = allocate_memory(pystack_size, false, false);
-    #endif
-
     // initialise the cpu and peripherals
     safe_mode_t safe_mode = port_init();
 
@@ -974,6 +980,38 @@ int __attribute__((used)) main(void) {
     alarm_reset();
     #endif
 
+    // Pystack variables have to exist even in stackless for the function calls
+    supervisor_allocation *pystack;
+    int pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
+    #if MICROPY_ENABLE_PYSTACK
+    // Allocate default at least temporarily, needed for getenv
+    pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
+
+    // Fetch value if exists from settings.toml
+    #if CIRCUITPY_OS_GETENV
+    // Init needed.
+    supervisor_allocation *heap = allocate_remaining_memory();
+
+    // Leaves size to build default on any failure
+    (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
+    free_memory(heap);
+
+    // Check if value is valid multiple of size_t else revert
+    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size > 0) && (pystack_size % sizeof(size_t) != 0)) {
+        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
+        // TODO: Find a way to inform the user about it.
+        // Perhaps safemode?
+    }
+
+    if (CIRCUITPY_PYSTACK_SIZE != pystack_size) {
+        free_memory(pystack); // Free the temporary
+        if (pystack_size > 0) { // Allocate new if needed
+            pystack = allocate_memory(pystack_size, false, false);
+        }
+    }
+    #endif
+    #endif
+
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     // Port-independent devices, like CIRCUITPY_BLEIO_HCI.

From 0d5b400b331a05330b31ec29c57d11e5405371dc Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 16:08:22 +0200
Subject: [PATCH 1840/2403] swap int for mp_int_t

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

diff --git a/main.c b/main.c
index 19bfe85973..55f464bc00 100644
--- a/main.c
+++ b/main.c
@@ -982,7 +982,7 @@ int __attribute__((used)) main(void) {
 
     // Pystack variables have to exist even in stackless for the function calls
     supervisor_allocation *pystack;
-    int pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
+    mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
     #if MICROPY_ENABLE_PYSTACK
     // Allocate default at least temporarily, needed for getenv
     pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);

From 2077bb9da994c32008bf4b9ce14a7cf6a190b742 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 17:54:52 +0200
Subject: [PATCH 1841/2403] pystack_size as multiple of sizeof size_t, no more
 stackless via settings.toml

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

diff --git a/main.c b/main.c
index 55f464bc00..ffd5b80610 100644
--- a/main.c
+++ b/main.c
@@ -122,7 +122,7 @@
 uint8_t value_out = 0;
 #endif
 
-#if MICROPY_ENABLE_PYSTACK
+#if MICROPY_ENABLE_PYSTACK && CIRCUITPY_OS_GETENV
 #include "shared-module/os/__init__.h"
 #endif
 
@@ -160,9 +160,7 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    if (pystack_size > 0) {
-        mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
-    }
+    mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -995,9 +993,11 @@ int __attribute__((used)) main(void) {
     // Leaves size to build default on any failure
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     free_memory(heap);
+    // Convert frame count to allocation size, 384 is the default for 1536 bytes
+    pystack_size = pystack_size * sizeof(size_t);
 
-    // Check if value is valid multiple of size_t else revert
-    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size > 0) && (pystack_size % sizeof(size_t) != 0)) {
+    // Check if value is valid
+    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size < 1)) {
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
         // TODO: Find a way to inform the user about it.
         // Perhaps safemode?
@@ -1005,9 +1005,7 @@ int __attribute__((used)) main(void) {
 
     if (CIRCUITPY_PYSTACK_SIZE != pystack_size) {
         free_memory(pystack); // Free the temporary
-        if (pystack_size > 0) { // Allocate new if needed
-            pystack = allocate_memory(pystack_size, false, false);
-        }
+        pystack = allocate_memory(pystack_size, false, false); // Allocate new pystack
     }
     #endif
     #endif

From 9de039b62555e71c9b4bc5c849d20cd8c3399d47 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 15 Feb 2023 21:25:56 +0530
Subject: [PATCH 1842/2403] pass secrets to reusable workflows

---
 .github/workflows/build-boards.yml    |  7 +++++--
 .github/workflows/build-mpy-cross.yml |  5 +++++
 .github/workflows/build.yml           | 12 ++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index b9e6577a19..457fce5b98 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -6,14 +6,17 @@ on:
       platform:
         required: true
         type: string
-
       boards:
         required: true
         type: string
-
       cp-version:
         required: true
         type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: false
+      AWS_SECRET_ACCESS_KEY:
+        required: false
 
 jobs:
   build:
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
index c17c9da1cb..10c4498bc8 100644
--- a/.github/workflows/build-mpy-cross.yml
+++ b/.github/workflows/build-mpy-cross.yml
@@ -6,6 +6,11 @@ on:
       cp-version:
         required: true
         type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: false
+      AWS_SECRET_ACCESS_KEY:
+        required: false
 
 jobs:
   build:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad488152f1..6159f7291e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,15 +96,14 @@ jobs:
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
-
   mpy-cross:
     needs: scheduler
     if: needs.scheduler.outputs.build-boards == 'True'
     uses: ./.github/workflows/build-mpy-cross.yml
+    secrets: inherit
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
-
   mpy-cross-mac:
     runs-on: macos-11
     needs: scheduler
@@ -223,41 +222,41 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
-
   aarch:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-aarch != '[]' }}
     uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
     with:
       platform: aarch
       boards: ${{ needs.scheduler.outputs.boards-aarch }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
-
   arm:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-arm != '[]' }}
     uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
     with:
       platform: arm
       boards: ${{ needs.scheduler.outputs.boards-arm }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
-
   esp:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-esp != '[]' }}
     uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
     with:
       platform: esp
       boards: ${{ needs.scheduler.outputs.boards-esp }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
-
   riscv:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-riscv != '[]' }}
     uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
     with:
       platform: riscv
       boards: ${{ needs.scheduler.outputs.boards-riscv }}
@@ -267,6 +266,7 @@ jobs:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-rpi != '[]' }}
     uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
     with:
       platform: arm
       boards: ${{ needs.scheduler.outputs.boards-rpi }}

From ffbb7550b40a2de6b8945af90904f9428b6bce10 Mon Sep 17 00:00:00 2001
From: Gregory Neverov <42853258+gneverov@users.noreply.github.com>
Date: Wed, 15 Feb 2023 11:08:09 -0800
Subject: [PATCH 1843/2403] Move serial init to earlier in boot process

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index d70e718b6d..6e953a6233 100644
--- a/main.c
+++ b/main.c
@@ -925,6 +925,9 @@ int __attribute__((used)) main(void) {
     common_hal_nvm_bytearray_set_bytes(&common_hal_mcu_nvm_obj,0,&value_out,1);
     #endif
 
+    // Start the debug serial
+    serial_early_init();
+
     // Wait briefly to give a reset window where we'll enter safe mode after the reset.
     if (safe_mode == NO_SAFE_MODE) {
         safe_mode = wait_for_safe_mode_reset();
@@ -941,9 +944,6 @@ int __attribute__((used)) main(void) {
     supervisor_bluetooth_init();
     #endif
 
-    // Start the debug serial
-    serial_early_init();
-
     #if !INTERNAL_FLASH_FILESYSTEM
     // Set up anything that might need to get done before we try to use SPI flash
     // This is needed for some boards where flash relies on GPIO setup to work

From fe40181144b8441a5b11a25d884a7f6d78458f19 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 15 Feb 2023 14:45:15 -0500
Subject: [PATCH 1844/2403] Turn back on for pewpew_m4, turn off terminalio for
 incomplete fonts in pewpew_m4

---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 2497eedad3..1e1bd31a24 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -30,7 +30,6 @@ CIRCUITPY_PWMIO = 0
 CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAFEMODE_PY = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0
@@ -54,3 +53,13 @@ CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
 
 # Override optimization to keep binary small
 OPTIMIZATION_FLAGS = -Os
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif

From fa302b2e29ff15095871d6cf01e0ad7f010a691e Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 21:54:53 +0200
Subject: [PATCH 1845/2403] Now works on reload.

---
 main.c | 102 +++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 54 deletions(-)

diff --git a/main.c b/main.c
index ffd5b80610..3f9de99cd9 100644
--- a/main.c
+++ b/main.c
@@ -122,9 +122,13 @@
 uint8_t value_out = 0;
 #endif
 
-#if MICROPY_ENABLE_PYSTACK && CIRCUITPY_OS_GETENV
+#if MICROPY_ENABLE_PYSTACK
+supervisor_allocation *pystack;
+mp_int_t pystack_size = 0; // 0 indicated 'not allocated'
+#if CIRCUITPY_OS_GETENV
 #include "shared-module/os/__init__.h"
 #endif
+#endif
 
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
@@ -132,7 +136,31 @@ static void reset_devices(void) {
     #endif
 }
 
-STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack, int pystack_size) {
+#if MICROPY_ENABLE_PYSTACK
+STATIC void alloc_pystack(void) {
+    mp_int_t old_pystack_size = pystack_size;
+    pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
+    // Fetch value if exists from settings.toml
+    #if CIRCUITPY_OS_GETENV
+    // Leaves size to build default on any failure
+    (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
+    // Check if value is valid
+    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 1) || (pystack_size % sizeof(size_t) != 0))) {
+        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
+        // TODO: Find a way to inform the user about it.
+        // Perhaps safemode? Or is it too much?
+    }
+    #endif
+    if (old_pystack_size != pystack_size) {
+        if (old_pystack_size != 0) {
+            free_memory(pystack);
+        }
+        pystack = allocate_memory(pystack_size, false, false);
+    }
+}
+#endif
+
+STATIC void start_mp(supervisor_allocation *heap) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -363,7 +391,7 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) {
     }
 }
 
-STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset, supervisor_allocation *pystack, int pystack_size) {
+STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
     bool serial_connected_at_start = serial_connected();
     bool printed_safe_mode_message = false;
     #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
@@ -399,13 +427,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset, supervisor_
         };
         #endif
 
+        #if MICROPY_ENABLE_PYSTACK
+        alloc_pystack();
+        #endif
         supervisor_allocation *heap = allocate_remaining_memory();
-
-        // Prepare the VM state.
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
-        start_mp(heap, pystack, pystack_size);
-        #pragma GCC diagnostic pop
+        start_mp(heap);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -733,7 +759,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset, supervisor_
 
 vstr_t *boot_output;
 
-STATIC void run_boot_py(safe_mode_t safe_mode, supervisor_allocation *pystack, int pystack_size) {
+STATIC void run_boot_py(safe_mode_t safe_mode) {
     if (safe_mode == NO_HEAP) {
         return;
     }
@@ -749,11 +775,11 @@ STATIC void run_boot_py(safe_mode_t safe_mode, supervisor_allocation *pystack, i
 
     // Do USB setup even if boot.py is not run.
 
+    #if MICROPY_ENABLE_PYSTACK
+    alloc_pystack();
+    #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
-    start_mp(heap, pystack, pystack_size);
-    #pragma GCC diagnostic pop
+    start_mp(heap);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -850,15 +876,15 @@ STATIC void run_boot_py(safe_mode_t safe_mode, supervisor_allocation *pystack, i
     #endif
 }
 
-STATIC int run_repl(supervisor_allocation *pystack, int pystack_size) {
+STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
+    #if MICROPY_ENABLE_PYSTACK
+    alloc_pystack();
+    #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // stackless doesn't want allocations.
-    start_mp(heap, pystack, pystack_size);
-    #pragma GCC diagnostic pop
+    start_mp(heap);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -978,38 +1004,6 @@ int __attribute__((used)) main(void) {
     alarm_reset();
     #endif
 
-    // Pystack variables have to exist even in stackless for the function calls
-    supervisor_allocation *pystack;
-    mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
-    #if MICROPY_ENABLE_PYSTACK
-    // Allocate default at least temporarily, needed for getenv
-    pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
-
-    // Fetch value if exists from settings.toml
-    #if CIRCUITPY_OS_GETENV
-    // Init needed.
-    supervisor_allocation *heap = allocate_remaining_memory();
-
-    // Leaves size to build default on any failure
-    (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
-    free_memory(heap);
-    // Convert frame count to allocation size, 384 is the default for 1536 bytes
-    pystack_size = pystack_size * sizeof(size_t);
-
-    // Check if value is valid
-    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size < 1)) {
-        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
-        // TODO: Find a way to inform the user about it.
-        // Perhaps safemode?
-    }
-
-    if (CIRCUITPY_PYSTACK_SIZE != pystack_size) {
-        free_memory(pystack); // Free the temporary
-        pystack = allocate_memory(pystack_size, false, false); // Allocate new pystack
-    }
-    #endif
-    #endif
-
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     // Port-independent devices, like CIRCUITPY_BLEIO_HCI.
@@ -1032,7 +1026,7 @@ int __attribute__((used)) main(void) {
     filesystem_set_internal_concurrent_write_protection(true);
     filesystem_set_internal_writable_by_usb(CIRCUITPY_USB == 1);
 
-    run_boot_py(safe_mode, pystack, pystack_size);
+    run_boot_py(safe_mode);
 
     supervisor_workflow_start();
 
@@ -1046,7 +1040,7 @@ int __attribute__((used)) main(void) {
     bool simulate_reset = true;
     for (;;) {
         if (!skip_repl) {
-            exit_code = run_repl(pystack, pystack_size);
+            exit_code = run_repl();
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
@@ -1057,7 +1051,7 @@ int __attribute__((used)) main(void) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard
                 // reset. This will preserve any alarm information.
-                skip_repl = run_code_py(safe_mode, &simulate_reset, pystack, pystack_size);
+                skip_repl = run_code_py(safe_mode, &simulate_reset);
             } else {
                 skip_repl = false;
             }

From cf6afe250c6865671bfab20841729fc369a04cee Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 22:00:52 +0200
Subject: [PATCH 1846/2403] re-add attribute

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

diff --git a/main.c b/main.c
index 3f9de99cd9..bc86d9182d 100644
--- a/main.c
+++ b/main.c
@@ -759,7 +759,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 vstr_t *boot_output;
 
-STATIC void run_boot_py(safe_mode_t safe_mode) {
+STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     if (safe_mode == NO_HEAP) {
         return;
     }

From c3b9567641728000e617252559b7194012d2d449 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 22:27:37 +0200
Subject: [PATCH 1847/2403] using vm cleanup and no globals

---
 main.c | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/main.c b/main.c
index bc86d9182d..fd1e508fc7 100644
--- a/main.c
+++ b/main.c
@@ -122,13 +122,9 @@
 uint8_t value_out = 0;
 #endif
 
-#if MICROPY_ENABLE_PYSTACK
-supervisor_allocation *pystack;
-mp_int_t pystack_size = 0; // 0 indicated 'not allocated'
-#if CIRCUITPY_OS_GETENV
+#if MICROPY_ENABLE_PYSTACK && CIRCUITPY_OS_GETENV
 #include "shared-module/os/__init__.h"
 #endif
-#endif
 
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
@@ -137,30 +133,24 @@ static void reset_devices(void) {
 }
 
 #if MICROPY_ENABLE_PYSTACK
-STATIC void alloc_pystack(void) {
-    mp_int_t old_pystack_size = pystack_size;
-    pystack_size = CIRCUITPY_PYSTACK_SIZE; // Use build default for now.
-    // Fetch value if exists from settings.toml
+STATIC mp_int_t fetch_pystack_size(void) {
+    mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV
+    // Fetch value if exists from settings.toml
     // Leaves size to build default on any failure
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
     if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 1) || (pystack_size % sizeof(size_t) != 0))) {
-        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
+        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
         // TODO: Find a way to inform the user about it.
         // Perhaps safemode? Or is it too much?
     }
     #endif
-    if (old_pystack_size != pystack_size) {
-        if (old_pystack_size != 0) {
-            free_memory(pystack);
-        }
-        pystack = allocate_memory(pystack_size, false, false);
-    }
+    return pystack_size;
 }
 #endif
 
-STATIC void start_mp(supervisor_allocation *heap) {
+STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack, mp_int_t pystack_size) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -292,7 +282,7 @@ STATIC void count_strn(void *data, const char *str, size_t len) {
     *(size_t *)data += len;
 }
 
-STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) {
+STATIC void cleanup_after_vm(supervisor_allocation *heap, supervisor_allocation *pystack, mp_obj_t exception) {
     // Get the traceback of any exception from this run off the heap.
     // MP_OBJ_SENTINEL means "this run does not contribute to traceback storage, don't touch it"
     // MP_OBJ_NULL (=0) means "this run completed successfully, clear any stored traceback"
@@ -373,6 +363,7 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) {
     filesystem_flush();
     stop_mp();
     free_memory(heap);
+    free_memory(pystack);
     supervisor_move_memory();
 
     // Let the workflows know we've reset in case they want to restart.
@@ -428,10 +419,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         #endif
 
         #if MICROPY_ENABLE_PYSTACK
-        alloc_pystack();
+        mp_int_t pystack_size = fetch_pystack_size();
+        supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
         #endif
         supervisor_allocation *heap = allocate_remaining_memory();
-        start_mp(heap);
+        start_mp(heap, pystack, pystack_size);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -479,7 +471,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
-        cleanup_after_vm(heap, _exec_result.exception);
+        cleanup_after_vm(heap, pystack, _exec_result.exception);
         _exec_result.exception = NULL;
 
         // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
@@ -776,10 +768,11 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     // Do USB setup even if boot.py is not run.
 
     #if MICROPY_ENABLE_PYSTACK
-    alloc_pystack();
+    mp_int_t pystack_size = fetch_pystack_size();
+    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap);
+    start_mp(heap, pystack, pystack_size);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -865,7 +858,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     port_post_boot_py(true);
 
-    cleanup_after_vm(heap, _exec_result.exception);
+    cleanup_after_vm(heap, pystack, _exec_result.exception);
     _exec_result.exception = NULL;
 
     port_post_boot_py(false);
@@ -881,10 +874,11 @@ STATIC int run_repl(void) {
     stack_resize();
     filesystem_flush();
     #if MICROPY_ENABLE_PYSTACK
-    alloc_pystack();
+    mp_int_t pystack_size = fetch_pystack_size();
+    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap);
+    start_mp(heap, pystack, pystack_size);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -927,7 +921,7 @@ STATIC int run_repl(void) {
         exit_code = PYEXEC_DEEP_SLEEP;
     }
     #endif
-    cleanup_after_vm(heap, MP_OBJ_SENTINEL);
+    cleanup_after_vm(heap, pystack, MP_OBJ_SENTINEL);
 
     // Also reset bleio. The above call omits it in case workflows should continue. In this case,
     // we're switching straight to another VM so we want to reset.

From 818d1d4cb15832e90b79bc9f9f2f495fa68d3334 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 22:43:57 +0200
Subject: [PATCH 1848/2403] Discard pystack_size

---
 main.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index fd1e508fc7..599c80eb45 100644
--- a/main.c
+++ b/main.c
@@ -133,24 +133,25 @@ static void reset_devices(void) {
 }
 
 #if MICROPY_ENABLE_PYSTACK
-STATIC mp_int_t fetch_pystack_size(void) {
+STATIC supervisor_allocation __attribute__ ((noinline)) * alloc_pystack(void) {
     mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV
     // Fetch value if exists from settings.toml
     // Leaves size to build default on any failure
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
-    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 1) || (pystack_size % sizeof(size_t) != 0))) {
+    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 384) || (pystack_size % sizeof(size_t) != 0))) {
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
         // TODO: Find a way to inform the user about it.
         // Perhaps safemode? Or is it too much?
     }
     #endif
-    return pystack_size;
+    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+    return pystack;
 }
 #endif
 
-STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack, mp_int_t pystack_size) {
+STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -178,7 +179,7 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
+    mp_pystack_init(pystack->ptr, pystack->ptr + (get_allocation_length(pystack) / sizeof(size_t)));
     #endif
 
     #if MICROPY_ENABLE_GC
@@ -419,11 +420,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         #endif
 
         #if MICROPY_ENABLE_PYSTACK
-        mp_int_t pystack_size = fetch_pystack_size();
-        supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+        supervisor_allocation *pystack = alloc_pystack();
         #endif
         supervisor_allocation *heap = allocate_remaining_memory();
-        start_mp(heap, pystack, pystack_size);
+        start_mp(heap, pystack);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -768,11 +768,10 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     // Do USB setup even if boot.py is not run.
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_int_t pystack_size = fetch_pystack_size();
-    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+    supervisor_allocation *pystack = alloc_pystack();
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap, pystack, pystack_size);
+    start_mp(heap, pystack);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -874,11 +873,10 @@ STATIC int run_repl(void) {
     stack_resize();
     filesystem_flush();
     #if MICROPY_ENABLE_PYSTACK
-    mp_int_t pystack_size = fetch_pystack_size();
-    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+    supervisor_allocation *pystack = alloc_pystack();
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap, pystack, pystack_size);
+    start_mp(heap, pystack);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();

From bf274258a457b5b5a4db2194b2a9b7344c20ddab Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 15 Feb 2023 22:07:24 +0100
Subject: [PATCH 1849/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 546828a14d..d4cd357358 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2441,6 +2441,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() harus mengembalikan None"
diff --git a/locale/cs.po b/locale/cs.po
index 51ed1674f7..acda63fa4b 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2428,6 +2428,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 594e2005cc..5c519a09e2 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2486,6 +2486,10 @@ msgstr ""
 "Du hast beim Booten die Reset-Taste gedrückt. Drücke sie erneut, um den "
 "abgesicherten Modus zu beenden."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() sollte None zurückgeben"
diff --git a/locale/el.po b/locale/el.po
index 7c816d4a9f..904d89846a 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2437,6 +2437,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index ece9ec14f3..d9b6508b05 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2444,6 +2444,10 @@ msgid ""
 msgstr ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() should return None"
diff --git a/locale/es.po b/locale/es.po
index d40e92464c..141951b5c6 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2494,6 +2494,10 @@ msgstr ""
 "Has presionado el botón de reset durante el arranque. Presiones de nuevo "
 "para salir del modo seguro."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() deberia devolver None"
diff --git a/locale/fil.po b/locale/fil.po
index 64a40976f5..4f7cf38dd7 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2428,6 +2428,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() dapat magbalik na None"
diff --git a/locale/fr.po b/locale/fr.po
index 28f95530cb..58fbaf79a2 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2512,6 +2512,10 @@ msgstr ""
 "Vous avez pressé le bouton reset pendant le démarrage. Pressez-le à nouveau "
 "pour sortir du mode sûr."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() doit retourner None"
diff --git a/locale/hi.po b/locale/hi.po
index 4fc15e35b4..84482dd969 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2410,6 +2410,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 85167249c6..f52f91e2fa 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2438,6 +2438,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() deve ritornare None"
diff --git a/locale/ja.po b/locale/ja.po
index 5f2c6a7aa2..cd28a37893 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2430,6 +2430,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 8a4ebc9082..a5f1c477e2 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2414,6 +2414,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 5122a036bc..f3c63f14e9 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2440,6 +2440,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() zou None moeten retourneren"
diff --git a/locale/pl.po b/locale/pl.po
index 41c0c432a7..548c79e9d0 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2421,6 +2421,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() powinien zwracać None"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8d5e776397..50e1d38efc 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2493,6 +2493,10 @@ msgstr ""
 "Você pressionou o botão reset durante a inicialização. Pressione-o novamente "
 "para sair do modo de segurança."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "O __init__() deve retornar Nenhum"
diff --git a/locale/ru.po b/locale/ru.po
index 205c1a1c0e..ab17fd486d 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2478,6 +2478,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index 29fd45ca87..7bfae7e58d 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2466,6 +2466,10 @@ msgstr ""
 "Du tryckte på resetknappen under uppstarten. Tryck igen för att avsluta "
 "felsäkert läge."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init __() ska returnera None"
diff --git a/locale/tr.po b/locale/tr.po
index 85a0d6af12..f856e50f0b 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2436,6 +2436,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 121a54dcbb..4299e116d2 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2472,6 +2472,10 @@ msgstr ""
 "zài qǐ dòng guò chéng zhōng, nín àn xià le chóng zhì àn niǔ. zài cì àn xià "
 "yǐ tuì chū ān quán mó shì."
 
+#: supervisor/shared/micropython.c
+msgid "[truncated due to length]"
+msgstr ""
+
 #: py/objtype.c
 msgid "__init__() should return None"
 msgstr "__init__() fǎnhuí not"

From 133045a95a74287206e62bb20900b8be699991b4 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 15 Feb 2023 23:15:21 +0200
Subject: [PATCH 1850/2403] Add error message and guardrail

---
 locale/circuitpython.pot | 14 ++++++++++++++
 main.c                   |  7 +++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 72ee60cc0c..299c1d5985 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -35,6 +35,20 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"WARNING: Allocating pystack failed, defaulting back to build value. \n"
+"\n"
+msgstr ""
+
+#: main.c
+msgid ""
+"\n"
+"WARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n"
+"\n"
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
diff --git a/main.c b/main.c
index 599c80eb45..64251e88a7 100644
--- a/main.c
+++ b/main.c
@@ -141,12 +141,15 @@ STATIC supervisor_allocation __attribute__ ((noinline)) * alloc_pystack(void) {
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
     if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 384) || (pystack_size % sizeof(size_t) != 0))) {
+        serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
-        // TODO: Find a way to inform the user about it.
-        // Perhaps safemode? Or is it too much?
     }
     #endif
     supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+    if (pystack == NULL) {
+        serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value. \n\n"));
+        pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
+    }
     return pystack;
 }
 #endif

From f79459cb709c113720e19c2602ad4293887a629f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 15 Feb 2023 16:38:24 -0500
Subject: [PATCH 1851/2403] Try -fweb -frename-registers to make more SAMD21
 builds fit

---
 ports/atmel-samd/mpconfigport.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 0d6c5a761b..d4d1ff31a3 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -78,10 +78,8 @@ SUPEROPT_VM = 0
 
 CIRCUITPY_LTO_PARTITION = one
 
-ifeq ($(CIRCUITPY_FULL_BUILD),0)
-# On the smallest boards, this saves about 180 bytes. On other boards, it may -increase- space used.
+# On smaller builds this saves about 180 bytes. On other boards, it may -increase- space used, so use with care.
 CFLAGS_BOARD = -fweb -frename-registers
-endif
 
 endif # samd21
 ######################################################################

From f3cc597c134860c2fcfa68ecfc64c1da6d0cec73 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 15 Feb 2023 21:20:28 +0000
Subject: [PATCH 1852/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (996 of 996 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 7bfae7e58d..ee5591e015 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: 2023-01-29 16:16+0000\n"
+"PO-Revision-Date: 2023-02-15 21:55+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -2468,7 +2468,7 @@ msgstr ""
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[trunkerad på grund av längd]"
 
 #: py/objtype.c
 msgid "__init__() should return None"
@@ -2541,7 +2541,7 @@ msgstr "array har för många dimensioner"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "matrisen är för stor"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -3800,7 +3800,7 @@ msgstr "endast mono stöds"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "endast ndarrays kan sammanfogas"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"

From 8216aa48909b256417177173289f856971be3032 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 00:41:49 +0200
Subject: [PATCH 1853/2403] struct stacks

---
 main.c | 63 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/main.c b/main.c
index 64251e88a7..1a85c01199 100644
--- a/main.c
+++ b/main.c
@@ -126,6 +126,13 @@ uint8_t value_out = 0;
 #include "shared-module/os/__init__.h"
 #endif
 
+typedef struct {
+    #if MICROPY_ENABLE_PYSTACK
+    supervisor_allocation *pystack;
+    #endif
+    supervisor_allocation *heap;
+} stacks;
+
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_reset();
@@ -133,28 +140,33 @@ static void reset_devices(void) {
 }
 
 #if MICROPY_ENABLE_PYSTACK
-STATIC supervisor_allocation __attribute__ ((noinline)) * alloc_pystack(void) {
+STATIC stacks __attribute__ ((noinline)) alloc_stacks(void) {
+    stacks res;
+    #if MICROPY_ENABLE_PYSTACK
     mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV
     // Fetch value if exists from settings.toml
     // Leaves size to build default on any failure
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
-    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && ((pystack_size < 384) || (pystack_size % sizeof(size_t) != 0))) {
+    pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
+    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size < 384)) {
         serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }
     #endif
-    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
-    if (pystack == NULL) {
+    res.pystack = allocate_memory(pystack_size, false, false);
+    if (res.pystack == NULL) {
         serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value. \n\n"));
-        pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
+        res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
     }
-    return pystack;
+    #endif
+    res.heap = allocate_remaining_memory();
+    return res;
 }
 #endif
 
-STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack) {
+STATIC void start_mp(stacks combo) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -182,11 +194,11 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(pystack->ptr, pystack->ptr + (get_allocation_length(pystack) / sizeof(size_t)));
+    mp_pystack_init(combo.pystack->ptr, combo.pystack->ptr + get_allocation_length(combo.pystack) / sizeof(size_t));
     #endif
 
     #if MICROPY_ENABLE_GC
-    gc_init(heap->ptr, heap->ptr + get_allocation_length(heap) / 4);
+    gc_init(combo.heap->ptr, combo.heap->ptr + get_allocation_length(combo.heap) / 4);
     #endif
     mp_init();
     mp_obj_list_init((mp_obj_list_t *)mp_sys_path, 0);
@@ -286,7 +298,7 @@ STATIC void count_strn(void *data, const char *str, size_t len) {
     *(size_t *)data += len;
 }
 
-STATIC void cleanup_after_vm(supervisor_allocation *heap, supervisor_allocation *pystack, mp_obj_t exception) {
+STATIC void cleanup_after_vm(stacks combo, mp_obj_t exception) {
     // Get the traceback of any exception from this run off the heap.
     // MP_OBJ_SENTINEL means "this run does not contribute to traceback storage, don't touch it"
     // MP_OBJ_NULL (=0) means "this run completed successfully, clear any stored traceback"
@@ -366,8 +378,8 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, supervisor_allocation
     // Free the heap last because other modules may reference heap memory and need to shut down.
     filesystem_flush();
     stop_mp();
-    free_memory(heap);
-    free_memory(pystack);
+    free_memory(combo.heap);
+    free_memory(combo.pystack);
     supervisor_move_memory();
 
     // Let the workflows know we've reset in case they want to restart.
@@ -422,11 +434,8 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        #if MICROPY_ENABLE_PYSTACK
-        supervisor_allocation *pystack = alloc_pystack();
-        #endif
-        supervisor_allocation *heap = allocate_remaining_memory();
-        start_mp(heap, pystack);
+        stacks combo = alloc_stacks();
+        start_mp(combo);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -474,7 +483,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
-        cleanup_after_vm(heap, pystack, _exec_result.exception);
+        cleanup_after_vm(combo, _exec_result.exception);
         _exec_result.exception = NULL;
 
         // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
@@ -770,11 +779,8 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    #if MICROPY_ENABLE_PYSTACK
-    supervisor_allocation *pystack = alloc_pystack();
-    #endif
-    supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap, pystack);
+    stacks combo = alloc_stacks();
+    start_mp(combo);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -860,7 +866,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     port_post_boot_py(true);
 
-    cleanup_after_vm(heap, pystack, _exec_result.exception);
+    cleanup_after_vm(combo, _exec_result.exception);
     _exec_result.exception = NULL;
 
     port_post_boot_py(false);
@@ -875,11 +881,8 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    #if MICROPY_ENABLE_PYSTACK
-    supervisor_allocation *pystack = alloc_pystack();
-    #endif
-    supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap, pystack);
+    stacks combo = alloc_stacks();
+    start_mp(combo);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -922,7 +925,7 @@ STATIC int run_repl(void) {
         exit_code = PYEXEC_DEEP_SLEEP;
     }
     #endif
-    cleanup_after_vm(heap, pystack, MP_OBJ_SENTINEL);
+    cleanup_after_vm(combo, MP_OBJ_SENTINEL);
 
     // Also reset bleio. The above call omits it in case workflows should continue. In this case,
     // we're switching straight to another VM so we want to reset.

From 659adb717235cd841738da03d0e9cdf83a93252a Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 00:45:41 +0200
Subject: [PATCH 1854/2403] fix for stackless

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

diff --git a/main.c b/main.c
index 1a85c01199..74f61d846d 100644
--- a/main.c
+++ b/main.c
@@ -379,7 +379,9 @@ STATIC void cleanup_after_vm(stacks combo, mp_obj_t exception) {
     filesystem_flush();
     stop_mp();
     free_memory(combo.heap);
+    #if MICROPY_ENABLE_PYSTACK
     free_memory(combo.pystack);
+    #endif
     supervisor_move_memory();
 
     // Let the workflows know we've reset in case they want to restart.

From 931c7c1c51fe3b2affa765d94c7178ae3d1be80c Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 29 Jul 2022 22:09:49 -0700
Subject: [PATCH 1855/2403] Add Bangle.js 2, JDI memory displays and ACeP epd

This 2-in-1 PR started with the goal of support the Bangle.js 2
smartwatch with *no USB*.
* Adds "secure" DFU build support with a committed private key.
* Adds 3-bit color support with one dummy bit for the JDI memory display
* Allows nrf boards to have a board_background_task() run in RUN_BACKGROUND_TASK.
  This is needed because the Bangle.js 2 uses the watchdog to reset.
* Renamed port_background_task() to port_background_tick() to indicate it
  runs on tick, not RUN_BACKGROUND_TASK.
* Marks serial connected when the display terminal is inited. This means
  that safe mode messages show up on the display.

ACep, 7-color epaper displays also pack 3 bits in 4. So, I added that
support as well.
* Adds 3-bit ACeP color support for 7-color e-paper displays. (Not
  watch related but similar due to color depth.)
* Allows a refresh sequence instead of a single int command. The 7" ACeP
  display requires a data byte for refresh.
* Adds optional delay after resetting the display. The ACeP displays
  need this. (Probably to load LUTs from flash.)
* Adds a cleaning phase for ACeP displays before the real refresh.

For both:
* Add dither support to Palette.
* Palette no longer converts colors when set. Instead, it caches
  converted colors at each index.
* ColorConverter now caches the last converted color. It should make
  conversions faster for repeated colors (not dithering.)
---
 .github/actions/deps/external/action.yml      | 18 +++-
 .github/workflows/build.yml                   | 11 +++
 data/nvm.toml                                 |  2 +-
 locale/circuitpython.pot                      |  6 +-
 ports/atmel-samd/background.c                 |  3 +
 ports/atmel-samd/boards/openbook_m4/board.c   |  9 +-
 .../boards/pewpew_m4/mpconfigboard.mk         |  7 ++
 .../common-hal/microcontroller/Pin.c          |  2 +-
 ports/broadcom/background.c                   |  3 +
 ports/cxd56/background.c                      |  2 +
 ports/espressif/background.c                  |  5 +-
 .../adafruit_magtag_2.9_grayscale/board.c     |  8 +-
 ports/litex/background.c                      |  2 +
 ports/mimxrt10xx/background.c                 |  4 +
 ports/nrf/Makefile                            | 12 ++-
 ports/nrf/background.c                        | 13 ++-
 ports/nrf/background.h                        |  2 +
 ports/nrf/boards/espruino_banglejs2/board.c   | 97 +++++++++++++++++++
 .../boards/espruino_banglejs2/mpconfigboard.h | 44 +++++++++
 .../espruino_banglejs2/mpconfigboard.mk       | 27 ++++++
 ports/nrf/boards/espruino_banglejs2/pins.c    | 41 ++++++++
 ports/nrf/espruino_dfu_private_key.pem        |  5 +
 ports/raspberrypi/background.c                |  4 +
 .../boards/pimoroni_badger2040/board.c        |  8 +-
 ports/stm/background.c                        |  2 +
 shared-bindings/_bleio/CharacteristicBuffer.c |  7 +-
 shared-bindings/displayio/EPaperDisplay.c     | 50 +++++++---
 shared-bindings/displayio/EPaperDisplay.h     |  6 +-
 shared-bindings/displayio/Palette.c           | 34 ++++++-
 shared-bindings/displayio/Palette.h           |  5 +-
 .../sharpdisplay/SharpMemoryFramebuffer.c     | 38 +++++++-
 .../sharpdisplay/SharpMemoryFramebuffer.h     | 15 ++-
 shared-module/displayio/ColorConverter.c      | 92 +++++++++++++++---
 shared-module/displayio/ColorConverter.h      | 10 ++
 shared-module/displayio/EPaperDisplay.c       | 82 ++++++++++++++--
 shared-module/displayio/EPaperDisplay.h       | 11 ++-
 shared-module/displayio/OnDiskBitmap.c        |  2 +-
 shared-module/displayio/Palette.c             | 62 +++++-------
 shared-module/displayio/Palette.h             | 14 +--
 shared-module/displayio/TileGrid.c            |  2 +-
 .../framebufferio/FramebufferDisplay.h        |  2 +-
 .../sharpdisplay/SharpMemoryFramebuffer.c     | 41 ++++++--
 .../sharpdisplay/SharpMemoryFramebuffer.h     | 13 +--
 shared-module/vectorio/VectorShape.c          |  2 +-
 supervisor/port.h                             |  6 +-
 supervisor/shared/background_callback.c       |  1 +
 supervisor/shared/bluetooth/bluetooth.c       |  4 +-
 supervisor/shared/display.c                   |  8 ++
 supervisor/shared/display.h                   |  1 +
 supervisor/shared/serial.c                    |  6 ++
 tools/build_release_files.py                  | 13 ++-
 tools/ci_set_matrix.py                        | 22 ++---
 tools/gen_display_resources.py                | 60 +++---------
 53 files changed, 752 insertions(+), 194 deletions(-)
 create mode 100644 ports/nrf/boards/espruino_banglejs2/board.c
 create mode 100644 ports/nrf/boards/espruino_banglejs2/mpconfigboard.h
 create mode 100644 ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/espruino_banglejs2/pins.c
 create mode 100644 ports/nrf/espruino_dfu_private_key.pem

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 3503e5b194..40a6cb78bb 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -37,7 +37,7 @@ runs:
 
     # arm
     - name: Get arm toolchain
-      if: inputs.platform == 'aarch' || inputs.platform == 'arm'
+      if: inputs.platform == 'aarch' || inputs.platform == 'arm' || inputs.platform == 'nrf'
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
@@ -65,6 +65,22 @@ runs:
         echo >> $GITHUB_PATH "$PATH"
       shell: bash
 
+    # nrf
+    - name: Get nrfutil 7+
+      if: inputs.platform == 'nrf'
+      run: |
+        wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
+        chmod +x nrfutil
+        ./nrfutil install nrf5sdk-tools
+        mkdir -p $HOME/.local/bin
+        mv nrfutil $HOME/.local/bin
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Print nrfutil version
+      if: inputs.platform == 'nrf'
+      run: nrfutil -V
+      shell: bash
+
     # riscv
     - name: Get riscv toolchain
       if: inputs.platform == 'riscv'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6159f7291e..88faaf79bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
+      boards-nrf: ${{ steps.set-matrix.outputs.boards-nrf }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
       boards-rpi: ${{ steps.set-matrix.outputs.boards-rpi }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
@@ -252,6 +253,16 @@ jobs:
       boards: ${{ needs.scheduler.outputs.boards-esp }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
+  nrf:
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-nrf != '[]' }}
+    uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
+    with:
+      platform: nrf
+      boards: ${{ needs.scheduler.outputs.boards-nrf }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
   riscv:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-riscv != '[]' }}
diff --git a/data/nvm.toml b/data/nvm.toml
index 2d292ad4e6..73fafcbe4c 160000
--- a/data/nvm.toml
+++ b/data/nvm.toml
@@ -1 +1 @@
-Subproject commit 2d292ad4e67890d4b85b027431ba9fef7bf561fd
+Subproject commit 73fafcbe4c66b23df63be31e9227353b695abb08
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 4e7abcb0b8..81e510c0b4 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -202,10 +202,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1210,9 +1206,11 @@ msgid "Internal watchdog timer expired."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
diff --git a/ports/atmel-samd/background.c b/ports/atmel-samd/background.c
index 9dcedf3f9b..6e1dc71d85 100644
--- a/ports/atmel-samd/background.c
+++ b/ports/atmel-samd/background.c
@@ -57,5 +57,8 @@ void port_finish_background_task(void) {
 }
 #endif
 
+void port_background_tick(void) {
+}
+
 void port_background_task(void) {
 }
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
index 30537dd3f4..ec1ba9f956 100644
--- a/ports/atmel-samd/boards/openbook_m4/board.c
+++ b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -52,6 +52,10 @@ uint8_t stop_sequence[] = {
     0x02, 0x80, 0xf0  // Power off
 };
 
+uint8_t refresh_sequence[] = {
+    0x12, 0x00
+};
+
 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, false);
@@ -74,6 +78,7 @@ void board_init(void) {
         bus,
         start_sequence,
         sizeof(start_sequence),
+        0, // start up time
         stop_sequence,
         sizeof(stop_sequence),
         300, // width
@@ -92,13 +97,15 @@ void board_init(void) {
         NO_COMMAND, // write_color_ram_command (can add this for grayscale eventually)
         false, // color_bits_inverted
         0x000000, // highlight_color
-        0x12, // refresh_display_command
+        refresh_sequence, // refresh_display_sequence
+        sizeof(refresh_sequence),
         40, // refresh_time
         &pin_PA01, // busy_pin
         false, // busy_state
         5, // seconds_per_frame
         false, // chip_select (don't always toggle chip select)
         false, // grayscale
+        false, // acep
         false); // two_byte_sequence_length
 }
 
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 0560da84fe..b273a936a3 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -53,3 +53,10 @@ CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
 
 # Override optimization to keep binary small
 OPTIMIZATION_FLAGS = -Os
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio and force a clean build.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = 1
+endif
diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.c b/ports/atmel-samd/common-hal/microcontroller/Pin.c
index b36286e5f2..d70de33618 100644
--- a/ports/atmel-samd/common-hal/microcontroller/Pin.c
+++ b/ports/atmel-samd/common-hal/microcontroller/Pin.c
@@ -211,5 +211,5 @@ mcu_pin_function_t *mcu_find_pin_function(mcu_pin_function_t *table, const mcu_p
             return table;
         }
     }
-    mp_raise_ValueError_varg(translate("%q pin invalid"), name);
+    mp_raise_ValueError_varg(translate("Invalid %q pin"), name);
 }
diff --git a/ports/broadcom/background.c b/ports/broadcom/background.c
index 4b5190aa27..5d92f1b8bf 100644
--- a/ports/broadcom/background.c
+++ b/ports/broadcom/background.c
@@ -33,5 +33,8 @@ void port_start_background_task(void) {
 void port_finish_background_task(void) {
 }
 
+void port_background_tick(void) {
+}
+
 void port_background_task(void) {
 }
diff --git a/ports/cxd56/background.c b/ports/cxd56/background.c
index 644a5d7b0b..da172cf5d7 100644
--- a/ports/cxd56/background.c
+++ b/ports/cxd56/background.c
@@ -30,6 +30,8 @@
 #include "supervisor/filesystem.h"
 #include "supervisor/shared/stack.h"
 
+void port_background_tick(void) {
+}
 void port_background_task(void) {
 }
 void port_start_background_task(void) {
diff --git a/ports/espressif/background.c b/ports/espressif/background.c
index 0b5bb96a3b..3fac768f3f 100644
--- a/ports/espressif/background.c
+++ b/ports/espressif/background.c
@@ -40,7 +40,7 @@
 #include "common-hal/pulseio/PulseIn.h"
 #endif
 
-void port_background_task(void) {
+void port_background_tick(void) {
     // Zero delay in case FreeRTOS wants to switch to something else.
     vTaskDelay(0);
     #if CIRCUITPY_PULSEIO
@@ -48,6 +48,9 @@ void port_background_task(void) {
     #endif
 }
 
+void port_background_task(void) {
+}
+
 void port_start_background_task(void) {
 }
 
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
index 0c85922524..681efc1cea 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -109,6 +109,10 @@ const uint8_t display_stop_sequence[] = {
     0x02, 0x00  // Power off
 };
 
+const uint8_t refresh_sequence[] = {
+    0x12, 0x00
+};
+
 void board_init(void) {
     // Debug UART
     #ifdef DEBUG
@@ -137,6 +141,7 @@ void board_init(void) {
         display,
         bus,
         display_start_sequence, sizeof(display_start_sequence),
+        0, // start up time
         display_stop_sequence, sizeof(display_stop_sequence),
         296,  // width
         128,  // height
@@ -154,13 +159,14 @@ void board_init(void) {
         0x13,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
-        0x12,  // refresh_display_command
+        refresh_sequence, sizeof(refresh_sequence),
         1.0,  // refresh_time
         &pin_GPIO5,  // busy_pin
         false,  // busy_state
         5.0, // seconds_per_frame
         false,  // always_toggle_chip_select
         true, // grayscale
+        false, // acep
         false);  // two_byte_sequence_length
 }
 
diff --git a/ports/litex/background.c b/ports/litex/background.c
index d2e94c5b8d..1329d5fd83 100644
--- a/ports/litex/background.c
+++ b/ports/litex/background.c
@@ -32,6 +32,8 @@
 
 void port_background_task(void) {
 }
+void port_background_tick(void) {
+}
 void port_start_background_task(void) {
 }
 void port_finish_background_task(void) {
diff --git a/ports/mimxrt10xx/background.c b/ports/mimxrt10xx/background.c
index 9e531cea23..5815c222b4 100644
--- a/ports/mimxrt10xx/background.c
+++ b/ports/mimxrt10xx/background.c
@@ -28,10 +28,14 @@
 #include "supervisor/port.h"
 
 void port_background_task(void) {
+}
+
+void port_background_tick(void) {
     #if CIRCUITPY_AUDIOIO || CIRCUITPY_AUDIOBUSIO
     audio_dma_background();
     #endif
 }
+
 void port_start_background_task(void) {
 }
 void port_finish_background_task(void) {
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index d1b71799bf..972b549f61 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -275,7 +275,8 @@ endif
 #####################
 .phony: dfu-gen dfu-flash
 
-NRFUTIL = adafruit-nrfutil
+NRFUTIL = nrfutil
+ADAFRUIT_NRFUTIL = adafruit-nrfutil
 
 ifeq ($(MCU_SUB_VARIANT),nrf52840)
 	DFU_TOUCH = --touch 1200
@@ -293,14 +294,19 @@ __check_defined = \
 ## Flash with DFU serial
 dfu-flash: $(BUILD)/dfu-package.zip
 	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
+	$(ADAFRUIT_NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
 
 ## Create DFU package file
 dfu-gen: $(BUILD)/dfu-package.zip
 
 $(BUILD)/dfu-package.zip: $(BUILD)/firmware.hex
-	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
+	$(ADAFRUIT_NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
 
+# Espruino DFU
+$(BUILD)/firmware.espruino.zip: $(BUILD)/firmware.hex
+	$(Q)$(NRFUTIL) pkg generate $(BUILD)/firmware.espruino.zip --application $^ --application-version 0xff --hw-version 52 --sd-req 0xa9,0xae,0xb6 --key-file espruino_dfu_private_key.pem
+
+espruino-dfu-gen: $(BUILD)/firmware.espruino.zip
 
 include $(TOP)/py/mkrules.mk
 
diff --git a/ports/nrf/background.c b/ports/nrf/background.c
index f0822de521..b8d4df6324 100644
--- a/ports/nrf/background.c
+++ b/ports/nrf/background.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include "background.h"
+
 #include "py/runtime.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/port.h"
@@ -44,10 +46,11 @@
 
 void port_start_background_task(void) {
 }
+
 void port_finish_background_task(void) {
 }
 
-void port_background_task(void) {
+void port_background_tick(void) {
     #if CIRCUITPY_AUDIOPWMIO
     audiopwmout_background();
     #endif
@@ -55,3 +58,11 @@ void port_background_task(void) {
     i2s_background();
     #endif
 }
+
+// Allow boards to override this.
+MP_WEAK void board_background_task(void) {
+}
+
+void port_background_task(void) {
+    board_background_task();
+}
diff --git a/ports/nrf/background.h b/ports/nrf/background.h
index 64a768cf9b..4fba46d031 100644
--- a/ports/nrf/background.h
+++ b/ports/nrf/background.h
@@ -27,4 +27,6 @@
 #ifndef MICROPY_INCLUDED_NRF_BACKGROUND_H
 #define MICROPY_INCLUDED_NRF_BACKGROUND_H
 
+void board_background_task(void);
+
 #endif  // MICROPY_INCLUDED_NRF_BACKGROUND_H
diff --git a/ports/nrf/boards/espruino_banglejs2/board.c b/ports/nrf/boards/espruino_banglejs2/board.c
new file mode 100644
index 0000000000..49a37b7db5
--- /dev/null
+++ b/ports/nrf/boards/espruino_banglejs2/board.c
@@ -0,0 +1,97 @@
+/*
+ * 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 "background.h"
+#include "mpconfigboard.h"
+
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/framebufferio/FramebufferDisplay.h"
+#include "shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h"
+#include "shared-module/displayio/__init__.h"
+
+digitalio_digitalinout_obj_t extcomin;
+digitalio_digitalinout_obj_t display_on;
+
+uint32_t last_down_ticks_ms;
+
+void board_init(void) {
+    common_hal_digitalio_digitalinout_construct(&extcomin, &pin_P0_06);
+    common_hal_digitalio_digitalinout_switch_to_output(&extcomin, true, DRIVE_MODE_PUSH_PULL);
+    common_hal_digitalio_digitalinout_never_reset(&extcomin);
+
+    common_hal_digitalio_digitalinout_construct(&display_on, &pin_P0_07);
+    common_hal_digitalio_digitalinout_switch_to_output(&display_on, true, DRIVE_MODE_PUSH_PULL);
+    common_hal_digitalio_digitalinout_never_reset(&display_on);
+
+    sharpdisplay_framebuffer_obj_t *fb = &allocate_display_bus()->sharpdisplay;
+    fb->base.type = &sharpdisplay_framebuffer_type;
+
+    busio_spi_obj_t *spi = &fb->inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_P0_26, &pin_P0_27, NULL, false);
+    common_hal_busio_spi_never_reset(spi);
+
+    common_hal_sharpdisplay_framebuffer_construct(fb, spi, &pin_P0_05, 500000, 176, 176, true);
+
+    primary_display_t *display = allocate_display();
+    framebufferio_framebufferdisplay_obj_t *self = &display->framebuffer_display;
+    self->base.type = &framebufferio_framebufferdisplay_type;
+    common_hal_framebufferio_framebufferdisplay_construct(self, fb, 0, true);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+    nrf_gpio_cfg_input(17, NRF_GPIO_PIN_PULLUP);
+}
+
+void board_deinit(void) {
+    // common_hal_displayio_release_displays();
+}
+
+void board_background_task(void) {
+    if (!nrf_gpio_pin_read(17)) {
+        if (last_down_ticks_ms == 0) {
+            last_down_ticks_ms = supervisor_ticks_ms32();
+        }
+    } else {
+        last_down_ticks_ms = 0;
+    }
+    // If the button isn't pressed, then feed the watchdog.
+    if (last_down_ticks_ms == 0) {
+        NRF_WDT->RR[0] = 0x6E524635;
+        return;
+    }
+    // if the button has been pressed less than 5 seconds, then feed the watchdog.
+    uint32_t now = supervisor_ticks_ms32();
+    if (now - last_down_ticks_ms < 5000) {
+        NRF_WDT->RR[0] = 0x6E524635;
+    }
+    // Don't feed the watchdog so that it'll expire and kick us to the bootloader.
+}
diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.h b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.h
new file mode 100644
index 0000000000..6057cd56e7
--- /dev/null
+++ b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2018 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 "nrfx/hal/nrf_gpio.h"
+
+#define MICROPY_HW_BOARD_NAME       "Espruino Bangle.js 2"
+#define MICROPY_HW_MCU_NAME         "nRF52840"
+
+#define MICROPY_HW_LED_STATUS       (&pin_P0_19)
+
+#if SPI_FLASH_FILESYSTEM
+#define SPI_FLASH_MOSI_PIN &pin_P0_15
+#define SPI_FLASH_MISO_PIN &pin_P0_13
+#define SPI_FLASH_SCK_PIN &pin_P0_16
+#define SPI_FLASH_CS_PIN &pin_P0_14
+#endif
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_P0_17)
+
+#define BOARD_HAS_32KHZ_XTAL (1)
diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
new file mode 100644
index 0000000000..483c5b95e4
--- /dev/null
+++ b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
@@ -0,0 +1,27 @@
+CIRCUITPY_CREATOR_ID = 0xBA000000
+CIRCUITPY_CREATION_ID = 0x0BA20001
+MCU_CHIP = nrf52840
+
+SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICES = "XT25F64B,GD25Q64C"
+
+CIRCUITPY_USB = 0
+
+CIRCUITPY_FULL_BUILD = 1
+CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_COUNTIO = 0
+CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_AESIO = 0
+CIRCUITPY_ANALOGIO = 1
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOMIXER = 0
+CIRCUITPY_RAINBOWIO = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_ONEWIREIO = 0
+
+CIRCUITPY_BUILD_EXTENSIONS = espruino.zip
+
+CIRCUITPY_DISPLAYIO = 1
diff --git a/ports/nrf/boards/espruino_banglejs2/pins.c b/ports/nrf/boards/espruino_banglejs2/pins.c
new file mode 100644
index 0000000000..b114c2f130
--- /dev/null
+++ b/ports/nrf/boards/espruino_banglejs2/pins.c
@@ -0,0 +1,41 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "supervisor/board.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_PRESSURE_SCL), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_03) },
+    { MP_ROM_QSTR(MP_QSTR_MEMLCD_CS), MP_ROM_PTR(&pin_P0_05) },
+    { MP_ROM_QSTR(MP_QSTR_MEMLCD_EXTCOMIN), MP_ROM_PTR(&pin_P0_06) },
+    { MP_ROM_QSTR(MP_QSTR_MEMLCD_DISP), MP_ROM_PTR(&pin_P0_07) },
+    { MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_P0_08) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_P0_17) },
+    { MP_ROM_QSTR(MP_QSTR_VIBRATE), MP_ROM_PTR(&pin_P0_19) },
+    { MP_ROM_QSTR(MP_QSTR_HRM_POWER), MP_ROM_PTR(&pin_P0_21) },
+    { MP_ROM_QSTR(MP_QSTR_HRM_INT), MP_ROM_PTR(&pin_P0_22) },
+    { MP_ROM_QSTR(MP_QSTR_CHARGE_PORT), MP_ROM_PTR(&pin_P0_23) },
+    { MP_ROM_QSTR(MP_QSTR_HRM_SDA), MP_ROM_PTR(&pin_P0_24) },
+    { MP_ROM_QSTR(MP_QSTR_CHARGE_COMPLETE), MP_ROM_PTR(&pin_P0_25) },
+    { MP_ROM_QSTR(MP_QSTR_MEMLCD_SCK), MP_ROM_PTR(&pin_P0_26) },
+    { MP_ROM_QSTR(MP_QSTR_MEMLCD_MOSI), MP_ROM_PTR(&pin_P0_27) },
+    { MP_ROM_QSTR(MP_QSTR_GPS_POWER), MP_ROM_PTR(&pin_P0_29) },
+    { MP_ROM_QSTR(MP_QSTR_GPS_TX), MP_ROM_PTR(&pin_P0_30) },
+    { MP_ROM_QSTR(MP_QSTR_GPS_RX), MP_ROM_PTR(&pin_P0_31) },
+    { MP_ROM_QSTR(MP_QSTR_HRM_SCL), MP_ROM_PTR(&pin_P1_00) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_SDA), MP_ROM_PTR(&pin_P1_01) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_SCL), MP_ROM_PTR(&pin_P1_02) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_P1_03) },
+    { MP_ROM_QSTR(MP_QSTR_ACCEL_SDA), MP_ROM_PTR(&pin_P1_04) },
+    { MP_ROM_QSTR(MP_QSTR_ACCEL_SCL), MP_ROM_PTR(&pin_P1_05) },
+    { MP_ROM_QSTR(MP_QSTR_COMPASS_SDA), MP_ROM_PTR(&pin_P1_10) },
+    { MP_ROM_QSTR(MP_QSTR_COMPASS_SCL), MP_ROM_PTR(&pin_P1_11) },
+    { MP_ROM_QSTR(MP_QSTR_PRESSURE_SDA), MP_ROM_PTR(&pin_P1_13) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/nrf/espruino_dfu_private_key.pem b/ports/nrf/espruino_dfu_private_key.pem
new file mode 100644
index 0000000000..79c70f76ee
--- /dev/null
+++ b/ports/nrf/espruino_dfu_private_key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIK5uG3MovsdlHdw0xKzHsiv7hCRlFFQbwF30wW2KT4YJoAoGCCqGSM49
+AwEHoUQDQgAElQMkm+myar6SNwygD8seLeccsydVakcn3kHvxVK5AUnTCcYEFKPY
+B9RfTIE/mwpHoaXs8e4swKX9nPBeC2mTZQ==
+-----END EC PRIVATE KEY-----
diff --git a/ports/raspberrypi/background.c b/ports/raspberrypi/background.c
index 4b5190aa27..8e5e3fcd91 100644
--- a/ports/raspberrypi/background.c
+++ b/ports/raspberrypi/background.c
@@ -30,8 +30,12 @@
 
 void port_start_background_task(void) {
 }
+
 void port_finish_background_task(void) {
 }
 
+void port_background_tick(void) {
+}
+
 void port_background_task(void) {
 }
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
index 48ae66e7cb..9eea472925 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -260,6 +260,10 @@ const uint8_t display_stop_sequence[] = {
     POF, 0x00  // Power off
 };
 
+const uint8_t refresh_sequence[] = {
+    DRF, 0x00
+};
+
 void board_init(void) {
     // Drive the EN_3V3 pin high so the board stays awake on battery power
     enable_pin_obj.base.type = &digitalio_digitalinout_type;
@@ -293,6 +297,7 @@ void board_init(void) {
         display,
         bus,
         display_start_sequence, sizeof(display_start_sequence),
+        0, // start up time
         display_stop_sequence, sizeof(display_stop_sequence),
         296,  // width
         128,  // height
@@ -310,13 +315,14 @@ void board_init(void) {
         DTM1,  // write_color_ram_command
         false,  // color_bits_inverted
         0x000000,  // highlight_color
-        DRF,  // refresh_display_command
+        refresh_sequence, sizeof(refresh_sequence),  // refresh_display_command
         1.0,  // refresh_time
         &pin_GPIO26,  // busy_pin
         false,  // busy_state
         2.0, // seconds_per_frame
         false,  // always_toggle_chip_select
         false, // grayscale
+        false, // acep
         false);  // two_byte_sequence_length
 }
 
diff --git a/ports/stm/background.c b/ports/stm/background.c
index dbf5ccee2b..68703a5233 100644
--- a/ports/stm/background.c
+++ b/ports/stm/background.c
@@ -35,6 +35,8 @@
 
 void port_background_task(void) {
 }
+void port_background_tick(void) {
+}
 void port_start_background_task(void) {
 }
 void port_finish_background_task(void) {
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index 218d72bdbb..1efb992c72 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -159,7 +159,12 @@ STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t r
 STATIC mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) {
     bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_characteristic_buffer_rx_characters_available(self));
+    uint32_t available = common_hal_bleio_characteristic_buffer_rx_characters_available(self);
+    if (available == 0) {
+        // Only check if connected when none available, otherwise, allow code to continue.
+        raise_error_if_not_connected(self);
+    }
+    return MP_OBJ_NEW_SMALL_INT(available);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_get_in_waiting_obj, bleio_characteristic_buffer_obj_get_in_waiting);
 
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 4745223ad3..6b4ad0cb66 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -71,14 +71,16 @@
 //|         write_color_ram_command: Optional[int] = None,
 //|         color_bits_inverted: bool = False,
 //|         highlight_color: int = 0x000000,
-//|         refresh_display_command: int,
+//|         refresh_display_command: Union[int, circuitpython_typing.ReadableBuffer],
 //|         refresh_time: float = 40,
 //|         busy_pin: Optional[microcontroller.Pin] = None,
 //|         busy_state: bool = True,
 //|         seconds_per_frame: float = 180,
 //|         always_toggle_chip_select: bool = False,
 //|         grayscale: bool = False,
-//|         two_byte_sequence_length: bool = False
+//|         advanced_color_epaper: bool = False,
+//|         two_byte_sequence_length: bool = False,
+//|         start_up_time: float = 0
 //|     ) -> None:
 //|         """Create a EPaperDisplay object on the given display bus (`displayio.FourWire` or `paralleldisplay.ParallelBus`).
 //|
@@ -92,8 +94,8 @@
 //|
 //|         :param display_bus: The bus that the display is connected to
 //|         :type _DisplayBus: displayio.FourWire or paralleldisplay.ParallelBus
-//|         :param ~circuitpython_typing.ReadableBuffer start_sequence: Byte-packed initialization sequence.
-//|         :param ~circuitpython_typing.ReadableBuffer stop_sequence: Byte-packed initialization sequence.
+//|         :param ~circuitpython_typing.ReadableBuffer start_sequence: Byte-packed command sequence.
+//|         :param ~circuitpython_typing.ReadableBuffer stop_sequence: Byte-packed command sequence.
 //|         :param int width: Width in pixels
 //|         :param int height: Height in pixels
 //|         :param int ram_width: RAM width in pixels
@@ -110,14 +112,16 @@
 //|         :param int write_color_ram_command: Command used to write pixels values into the update region
 //|         :param bool color_bits_inverted: True if 0 bits are used to show the color. Otherwise, 1 means to show color.
 //|         :param int highlight_color: RGB888 of source color to highlight with third ePaper color.
-//|         :param int refresh_display_command: Command used to start a display refresh
+//|         :param int refresh_display_command: Command used to start a display refresh. Single int or byte-packed command sequence
 //|         :param float refresh_time: Time it takes to refresh the display before the stop_sequence should be sent. Ignored when busy_pin is provided.
 //|         :param microcontroller.Pin busy_pin: Pin used to signify the display is busy
 //|         :param bool busy_state: State of the busy pin when the display is busy
 //|         :param float seconds_per_frame: Minimum number of seconds between screen refreshes
 //|         :param bool always_toggle_chip_select: When True, chip select is toggled every byte
 //|         :param bool grayscale: When true, the color ram is the low bit of 2-bit grayscale
+//|         :param bool advanced_color_epaper: When true, the display is a 7-color advanced color epaper (ACeP)
 //|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length
+//|         :param float start_up_time: Time to wait after reset before sending commands
 //|         """
 //|         ...
 STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -127,7 +131,8 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
            ARG_set_current_row_command, ARG_write_black_ram_command, ARG_black_bits_inverted,
            ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color,
            ARG_refresh_display_command,  ARG_refresh_time, ARG_busy_pin, ARG_busy_state,
-           ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_two_byte_sequence_length };
+           ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper,
+           ARG_two_byte_sequence_length, ARG_start_up_time };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_start_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -148,14 +153,16 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
         { MP_QSTR_write_color_ram_command, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
         { MP_QSTR_color_bits_inverted, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_highlight_color, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0x000000} },
-        { MP_QSTR_refresh_display_command, MP_ARG_INT | MP_ARG_REQUIRED },
+        { MP_QSTR_refresh_display_command, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_refresh_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(40)} },
         { MP_QSTR_busy_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
         { MP_QSTR_busy_state, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
         { MP_QSTR_seconds_per_frame, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(180)} },
         { MP_QSTR_always_toggle_chip_select, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_grayscale, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_advanced_color_epaper, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_two_byte_sequence_length, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_start_up_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -177,10 +184,10 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
 
     primary_display_t *disp = allocate_display_or_raise();
     displayio_epaperdisplay_obj_t *self = &disp->epaper_display;
-    ;
 
     mp_float_t refresh_time = mp_obj_get_float(args[ARG_refresh_time].u_obj);
     mp_float_t seconds_per_frame = mp_obj_get_float(args[ARG_seconds_per_frame].u_obj);
+    mp_float_t start_up_time = mp_obj_get_float(args[ARG_start_up_time].u_obj);
 
     mp_int_t write_color_ram_command = NO_COMMAND;
     mp_int_t highlight_color = args[ARG_highlight_color].u_int;
@@ -188,19 +195,40 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
         write_color_ram_command = mp_obj_get_int(args[ARG_write_color_ram_command].u_obj);
     }
 
+    bool two_byte_sequence_length = args[ARG_two_byte_sequence_length].u_bool;
+
+    mp_obj_t refresh_obj = args[ARG_refresh_display_command].u_obj;
+    const uint8_t *refresh_buf;
+    mp_buffer_info_t refresh_bufinfo;
+    size_t refresh_buf_len = 0;
+    mp_int_t refresh_command;
+    if (mp_obj_get_int_maybe(refresh_obj, &refresh_command)) {
+        uint8_t *command_buf = m_malloc(3, true);
+        command_buf[0] = refresh_command;
+        command_buf[1] = 0;
+        command_buf[2] = 0;
+        refresh_buf = command_buf;
+        refresh_buf_len = two_byte_sequence_length? 3: 2;
+    } else if (mp_get_buffer(refresh_obj, &refresh_bufinfo, MP_BUFFER_READ)) {
+        refresh_buf = refresh_bufinfo.buf;
+        refresh_buf_len = refresh_bufinfo.len;
+    } else {
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_refresh_display_command);
+    }
+
     self->base.type = &displayio_epaperdisplay_type;
     common_hal_displayio_epaperdisplay_construct(
         self,
         display_bus,
-        start_bufinfo.buf, start_bufinfo.len, stop_bufinfo.buf, stop_bufinfo.len,
+        start_bufinfo.buf, start_bufinfo.len, start_up_time, stop_bufinfo.buf, stop_bufinfo.len,
         args[ARG_width].u_int, args[ARG_height].u_int, args[ARG_ram_width].u_int, args[ARG_ram_height].u_int,
         args[ARG_colstart].u_int, args[ARG_rowstart].u_int, rotation,
         args[ARG_set_column_window_command].u_int, args[ARG_set_row_window_command].u_int,
         args[ARG_set_current_column_command].u_int, args[ARG_set_current_row_command].u_int,
         args[ARG_write_black_ram_command].u_int, args[ARG_black_bits_inverted].u_bool, write_color_ram_command,
-        args[ARG_color_bits_inverted].u_bool, highlight_color, args[ARG_refresh_display_command].u_int, refresh_time,
+        args[ARG_color_bits_inverted].u_bool, highlight_color, refresh_buf, refresh_buf_len, refresh_time,
         busy_pin, args[ARG_busy_state].u_bool, seconds_per_frame,
-        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_two_byte_sequence_length].u_bool
+        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool, two_byte_sequence_length
         );
 
     return self;
diff --git a/shared-bindings/displayio/EPaperDisplay.h b/shared-bindings/displayio/EPaperDisplay.h
index 13fd51d132..1ef2ed4b4b 100644
--- a/shared-bindings/displayio/EPaperDisplay.h
+++ b/shared-bindings/displayio/EPaperDisplay.h
@@ -37,12 +37,12 @@ extern const mp_obj_type_t displayio_epaperdisplay_type;
 #define NO_COMMAND 0x100
 
 void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t *self,
-    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, const uint8_t *stop_sequence, uint16_t stop_sequence_len,
+    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, mp_float_t start_up_time, const uint8_t *stop_sequence, uint16_t stop_sequence_len,
     uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
     uint16_t set_column_window_command, uint16_t set_row_window_command,
     uint16_t set_current_column_command, uint16_t set_current_row_command,
-    uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint16_t refresh_display_command, mp_float_t refresh_time,
-    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool always_toggle_chip_select, bool grayscale, bool two_byte_sequence_length);
+    uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
+    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool always_toggle_chip_select, bool grayscale, bool acep, bool two_byte_sequence_length);
 
 bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *self);
 
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index aa24dc262f..50deff5748 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -40,29 +40,54 @@
 //|     """Map a pixel palette_index to a full color. Colors are transformed to the display's format internally to
 //|     save memory."""
 //|
-//|     def __init__(self, color_count: int) -> None:
+//|     def __init__(self, color_count: int, *, dither: bool = False) -> None:
 //|         """Create a Palette object to store a set number of colors.
 //|
-//|         :param int color_count: The number of colors in the Palette"""
+//|         :param int color_count: The number of colors in the Palette
+//|         :param bool dither: When true, dither the RGB color before converting to the display's color space
+//|         """
 //|         ...
 // TODO(tannewt): Add support for other color formats.
 // TODO(tannewt): Add support for 8-bit alpha blending.
 //|
 STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_color_count };
+    enum { ARG_color_count, ARG_dither };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_color_count, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_dither, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     displayio_palette_t *self = m_new_obj(displayio_palette_t);
     self->base.type = &displayio_palette_type;
-    common_hal_displayio_palette_construct(self, args[ARG_color_count].u_int);
+    common_hal_displayio_palette_construct(self, args[ARG_color_count].u_int, args[ARG_dither].u_bool);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
+//|     dither: bool
+//|     """When `True` the Palette dithers the output color by adding random
+//|     noise when truncating to display bitdepth"""
+STATIC mp_obj_t displayio_palette_obj_get_dither(mp_obj_t self_in) {
+    displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(common_hal_displayio_palette_get_dither(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_palette_get_dither_obj, displayio_palette_obj_get_dither);
+
+STATIC mp_obj_t displayio_palette_obj_set_dither(mp_obj_t self_in, mp_obj_t dither) {
+    displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_displayio_palette_set_dither(self, mp_obj_is_true(dither));
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_set_dither_obj, displayio_palette_obj_set_dither);
+
+MP_PROPERTY_GETSET(displayio_palette_dither_obj,
+    (mp_obj_t)&displayio_palette_get_dither_obj,
+    (mp_obj_t)&displayio_palette_set_dither_obj);
+
 //|     def __bool__(self) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Returns the number of colors in a Palette"""
@@ -185,6 +210,7 @@ STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_is_transparent_obj, displayio_palette_obj_is_transparent);
 
 STATIC const mp_rom_map_elem_t displayio_palette_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&displayio_palette_dither_obj) },
     { MP_ROM_QSTR(MP_QSTR_make_transparent), MP_ROM_PTR(&displayio_palette_make_transparent_obj) },
     { MP_ROM_QSTR(MP_QSTR_make_opaque), MP_ROM_PTR(&displayio_palette_make_opaque_obj) },
     { MP_ROM_QSTR(MP_QSTR_is_transparent), MP_ROM_PTR(&displayio_palette_is_transparent_obj) },
diff --git a/shared-bindings/displayio/Palette.h b/shared-bindings/displayio/Palette.h
index d9a798016c..2cc7417fe3 100644
--- a/shared-bindings/displayio/Palette.h
+++ b/shared-bindings/displayio/Palette.h
@@ -31,11 +31,14 @@
 
 extern const mp_obj_type_t displayio_palette_type;
 
-void common_hal_displayio_palette_construct(displayio_palette_t *self, uint16_t color_count);
+void common_hal_displayio_palette_construct(displayio_palette_t *self, uint16_t color_count, bool dither);
 void common_hal_displayio_palette_set_color(displayio_palette_t *self, uint32_t palette_index, uint32_t color);
 uint32_t common_hal_displayio_palette_get_color(displayio_palette_t *self, uint32_t palette_index);
 uint32_t common_hal_displayio_palette_get_len(displayio_palette_t *self);
 
+void common_hal_displayio_palette_set_dither(displayio_palette_t *self, bool dither);
+bool common_hal_displayio_palette_get_dither(displayio_palette_t *self);
+
 void common_hal_displayio_palette_make_opaque(displayio_palette_t *self, uint32_t palette_index);
 void common_hal_displayio_palette_make_transparent(displayio_palette_t *self, uint32_t palette_index);
 bool common_hal_displayio_palette_is_transparent(displayio_palette_t *self, uint32_t palette_index);
diff --git a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
index b0f68333e6..d9643495ba 100644
--- a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
+++ b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c
@@ -33,14 +33,42 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
 
+//| class SharpMemoryFramebuffer:
+//|     """A framebuffer for a memory-in-pixel display. Sharp makes monochrome displays and JDI used
+//|     to make 8-color displays.
+//|
+//|     This initializes a display and connects it into CircuitPython. Unlike other
+//|     objects in CircuitPython, Display objects live until `displayio.release_displays()`
+//|     is called. This is done so that CircuitPython can use the display itself."""
+//|
+//|     def __init__(
+//|         self,
+//|         spi_bus: busio.SPI,
+//|         chip_select: microcontroller.Pin,
+//|         width: int,
+//|         height: int,
+//|         baudrate: int = 2000000,
+//|         jdi_display: bool = False,
+//|     ) -> None:
+//|         """Create a framebuffer for the memory-in-pixel display.
+//|
+//|         :param busio.SPI spi_bus: The SPI bus that the display is connected to
+//|         :param microcontroller.Pin chip_select: The pin connect to the display's chip select line
+//|         :param int width: The width of the display in pixels
+//|         :param int height: The height of the display in pixels
+//|         :param int baudrate: The baudrate to communicate with the screen at
+//|         :param bool jdi_display: When True, work with an 8-color JDI display. Otherwise, a monochrome Sharp display.
+//|         """
+//|         ...
 STATIC mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_spi_bus, ARG_chip_select, ARG_width, ARG_height, ARG_baudrate, NUM_ARGS };
+    enum { ARG_spi_bus, ARG_chip_select, ARG_width, ARG_height, ARG_baudrate, ARG_jdi_display, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_spi_bus, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_width, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = 0} },
         { MP_QSTR_height, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = 0} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 2000000} },
+        { MP_QSTR_jdi_display, MP_ARG_BOOL, {.u_bool = false} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS);
@@ -53,7 +81,7 @@ STATIC mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, siz
     sharpdisplay_framebuffer_obj_t *self = &allocate_display_bus_or_raise()->sharpdisplay;
     self->base.type = &sharpdisplay_framebuffer_type;
 
-    common_hal_sharpdisplay_framebuffer_construct(self, spi, chip_select, args[ARG_baudrate].u_int, args[ARG_width].u_int, args[ARG_height].u_int);
+    common_hal_sharpdisplay_framebuffer_construct(self, spi, chip_select, args[ARG_baudrate].u_int, args[ARG_width].u_int, args[ARG_height].u_int, args[ARG_jdi_display].u_bool);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -69,6 +97,12 @@ STATIC mp_int_t sharpdisplay_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_
     return 0;
 }
 
+//|     def deinit(self) -> None:
+//|         """Free the resources (pins, timers, etc.) associated with this
+//|         SharpMemoryFramebuffer instance.  After deinitialization, no further operations
+//|         may be performed."""
+//|         ...
+//|
 STATIC mp_obj_t sharpdisplay_framebuffer_deinit(mp_obj_t self_in) {
     sharpdisplay_framebuffer_obj_t *self = (sharpdisplay_framebuffer_obj_t *)self_in;
     common_hal_sharpdisplay_framebuffer_deinit(self);
diff --git a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h
index 30f1b867b1..b2c15ac499 100644
--- a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h
+++ b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h
@@ -26,9 +26,18 @@
 
 #pragma once
 
-// #include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
-// #include "shared-module/framebufferio/FramebufferDisplay.h"
-
 #include "py/objtype.h"
 
+#include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
+
 extern const mp_obj_type_t sharpdisplay_framebuffer_type;
+
+void common_hal_sharpdisplay_framebuffer_construct(sharpdisplay_framebuffer_obj_t *self, busio_spi_obj_t *spi, const mcu_pin_obj_t *chip_select, int baudrate, int width, int height, bool jdi_display);
+void common_hal_sharpdisplay_framebuffer_swap_buffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask);
+void common_hal_sharpdisplay_framebuffer_deinit(sharpdisplay_framebuffer_obj_t *self);
+void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_obj_t *self, mp_buffer_info_t *bufinfo);
+int common_hal_sharpdisplay_framebuffer_get_height(sharpdisplay_framebuffer_obj_t *self);
+int common_hal_sharpdisplay_framebuffer_get_width(sharpdisplay_framebuffer_obj_t *self);
+void common_hal_sharpdisplay_framebuffer_swap_buffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask);
+void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *self);
+void common_hal_sharpdisplay_framebuffer_reconstruct(sharpdisplay_framebuffer_obj_t *self);
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 707601a3e7..23c38ebb8b 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -54,6 +54,13 @@ uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888) {
     return r5 << 11 | g6 << 5 | b5;
 }
 
+uint8_t displayio_colorconverter_compute_rgbd(uint32_t color_rgb888) {
+    uint32_t r1 = (color_rgb888 >> 23) & 0x1;
+    uint32_t g1 = (color_rgb888 >> 15) & 0x1;
+    uint32_t b1 = (color_rgb888 >> 7) & 0x1;
+    return r1 << 3 | g1 << 2 | b1 << 1 /* | dummy */;
+}
+
 uint8_t displayio_colorconverter_compute_luma(uint32_t color_rgb888) {
     uint32_t r8 = (color_rgb888 >> 16);
     uint32_t g8 = (color_rgb888 >> 8) & 0xff;
@@ -96,6 +103,44 @@ uint8_t displayio_colorconverter_compute_hue(uint32_t color_rgb888) {
     return hue;
 }
 
+uint8_t displayio_colorconverter_compute_sevencolor(uint32_t color_rgb888) {
+    // This is DDX=1, the default for the displays.
+    uint8_t chroma = displayio_colorconverter_compute_chroma(color_rgb888);
+    if (chroma >= 64) {
+        uint8_t hue = displayio_colorconverter_compute_hue(color_rgb888);
+        // Red 0
+        if (hue < 10) {
+            return 0x4;
+        }
+        // Orange 21
+        if (hue < 21 + 10) {
+            return 0x6;
+        }
+        // Yellow 42
+        if (hue < 42 + 21) {
+            return 0x5;
+        }
+        // Green 85
+        if (hue < 85 + 42) {
+            return 0x2;
+        }
+        // Blue 170
+        if (hue < 170 + 42) {
+            return 0x3;
+        }
+
+        // The rest is red to 255
+        return 0x4;
+    } else {
+        uint8_t luma = displayio_colorconverter_compute_luma(color_rgb888);
+        if (luma >= 128) {
+            return 0x1; // White
+        } else {
+            return 0x0; // Black
+        }
+    }
+}
+
 void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color) {
 
     int16_t hue_diff = colorspace->tricolor_hue - pixel_hue;
@@ -207,18 +252,9 @@ uint32_t displayio_colorconverter_convert_pixel(displayio_colorspace_t colorspac
     return pixel;
 }
 
-void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t *colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
+void displayio_convert_color(const _displayio_colorspace_t *colorspace, bool dither, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
     uint32_t pixel = input_pixel->pixel;
-
-    if (self->transparent_color == pixel) {
-        output_color->opaque = false;
-        return;
-    }
-
-    pixel = displayio_colorconverter_convert_pixel(self->input_colorspace, pixel);
-
-
-    if (self->dither) {
+    if (dither) {
         uint8_t randr = (displayio_colorconverter_dither_noise_2(input_pixel->tile_x,input_pixel->tile_y));
         uint8_t randg = (displayio_colorconverter_dither_noise_2(input_pixel->tile_x + 33,input_pixel->tile_y));
         uint8_t randb = (displayio_colorconverter_dither_noise_2(input_pixel->tile_x,input_pixel->tile_y + 33));
@@ -272,10 +308,44 @@ void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
         output_color->pixel = pixel;
         output_color->opaque = true;
         return;
+    } else if (colorspace->depth == 4) {
+        uint8_t packed;
+        if (colorspace->sevencolor) {
+            packed = displayio_colorconverter_compute_sevencolor(pixel);
+        } else {
+            packed = displayio_colorconverter_compute_rgbd(pixel);
+        }
+        output_color->pixel = packed;
+        output_color->opaque = true;
+        return;
     }
     output_color->opaque = false;
 }
 
+void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t *colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
+    uint32_t pixel = input_pixel->pixel;
+
+    if (self->transparent_color == pixel) {
+        output_color->opaque = false;
+        return;
+    }
+
+    if (!self->dither && self->cached_colorspace == colorspace && self->cached_input_pixel == input_pixel->pixel) {
+        output_color->pixel = self->cached_output_color;
+        return;
+    }
+
+    displayio_input_pixel_t rgb888_pixel = *input_pixel;
+    rgb888_pixel.pixel = displayio_colorconverter_convert_pixel(self->input_colorspace, input_pixel->pixel);
+    displayio_convert_color(colorspace, self->dither, &rgb888_pixel, output_color);
+
+    if (!self->dither) {
+        self->cached_colorspace = colorspace;
+        self->cached_input_pixel = input_pixel->pixel;
+        self->cached_output_color = output_color->pixel;
+    }
+}
+
 
 
 // Currently no refresh logic is needed for a ColorConverter.
diff --git a/shared-module/displayio/ColorConverter.h b/shared-module/displayio/ColorConverter.h
index 7e4e9819ac..582c9c7823 100644
--- a/shared-module/displayio/ColorConverter.h
+++ b/shared-module/displayio/ColorConverter.h
@@ -38,6 +38,11 @@ typedef struct displayio_colorconverter {
     bool dither;
     uint8_t input_colorspace;
     uint32_t transparent_color;
+
+    // Cache the last computed color in case the are the same.
+    const _displayio_colorspace_t *cached_colorspace;
+    uint32_t cached_input_pixel;
+    uint32_t cached_output_color;
 } displayio_colorconverter_t;
 
 bool displayio_colorconverter_needs_refresh(displayio_colorconverter_t *self);
@@ -47,10 +52,15 @@ void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
 uint32_t displayio_colorconverter_dither_noise_1(uint32_t n);
 uint32_t displayio_colorconverter_dither_noise_2(uint32_t x, uint32_t y);
 
+// Convert version that doesn't require a colorconverter object.
+void displayio_convert_color(const _displayio_colorspace_t *colorspace, bool dither, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color);
+
 uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888);
+uint8_t displayio_colorconverter_compute_rgbd(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_luma(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_chroma(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_hue(uint32_t color_rgb888);
+uint8_t displayio_colorconverter_compute_sevencolor(uint32_t color_rgb888);
 void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_COLORCONVERTER_H
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index d876599650..869bb6c358 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -28,6 +28,7 @@
 
 #include "py/gc.h"
 #include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
 #include "shared-bindings/displayio/ColorConverter.h"
 #include "shared-bindings/displayio/FourWire.h"
 #include "shared-bindings/displayio/I2CDisplay.h"
@@ -47,21 +48,31 @@
 #define DELAY 0x80
 
 void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t *self,
-    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len,
+    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, mp_float_t start_up_time,
     const uint8_t *stop_sequence, uint16_t stop_sequence_len,
     uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height,
     int16_t colstart, int16_t rowstart, uint16_t rotation,
     uint16_t set_column_window_command, uint16_t set_row_window_command,
     uint16_t set_current_column_command, uint16_t set_current_row_command,
-    uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint16_t refresh_display_command, mp_float_t refresh_time,
-    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool chip_select, bool grayscale, bool two_byte_sequence_length) {
+    uint16_t write_black_ram_command, bool black_bits_inverted,
+    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
+    const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
+    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
+    bool chip_select, bool grayscale, bool acep, bool two_byte_sequence_length) {
+    uint16_t color_depth = 1;
     if (highlight_color != 0x000000) {
         self->core.colorspace.tricolor = true;
         self->core.colorspace.tricolor_hue = displayio_colorconverter_compute_hue(highlight_color);
         self->core.colorspace.tricolor_luma = displayio_colorconverter_compute_luma(highlight_color);
     }
+    if (acep) {
+        self->core.colorspace.sevencolor = true;
+        color_depth = 4; // bits. 7 colors + clean
+        self->acep = acep;
+        grayscale = false;
+    }
 
-    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation, 1, true, true, 1, true, true);
+    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation, color_depth, grayscale, true, 1, true, true);
 
     self->set_column_window_command = set_column_window_command;
     self->set_row_window_command = set_row_window_command;
@@ -71,7 +82,6 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
     self->black_bits_inverted = black_bits_inverted;
     self->write_color_ram_command = write_color_ram_command;
     self->color_bits_inverted = color_bits_inverted;
-    self->refresh_display_command = refresh_display_command;
     self->refresh_time = refresh_time * 1000;
     self->busy_state = busy_state;
     self->refreshing = false;
@@ -81,8 +91,11 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
 
     self->start_sequence = start_sequence;
     self->start_sequence_len = start_sequence_len;
+    self->start_up_time_ms = start_up_time * 1000;
     self->stop_sequence = stop_sequence;
     self->stop_sequence_len = stop_sequence_len;
+    self->refresh_sequence = refresh_sequence;
+    self->refresh_sequence_len = refresh_sequence_len;
 
     self->busy.base.type = &mp_type_NoneType;
     self->two_byte_sequence_length = two_byte_sequence_length;
@@ -193,6 +206,8 @@ STATIC void displayio_epaperdisplay_start_refresh(displayio_epaperdisplay_obj_t
     // run start sequence
     self->core.bus_reset(self->core.bus);
 
+    common_hal_time_delay_ms(self->start_up_time_ms);
+
     send_command_sequence(self, true, self->start_sequence, self->start_sequence_len);
     displayio_display_core_start_refresh(&self->core);
 }
@@ -211,9 +226,8 @@ uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaper
 
 STATIC void displayio_epaperdisplay_finish_refresh(displayio_epaperdisplay_obj_t *self) {
     // Actually refresh the display now that all pixel RAM has been updated.
-    displayio_display_core_begin_transaction(&self->core);
-    self->core.send(self->core.bus, DISPLAY_COMMAND, self->chip_select, &self->refresh_display_command, 1);
-    displayio_display_core_end_transaction(&self->core);
+    send_command_sequence(self, false, self->refresh_sequence, self->refresh_sequence_len);
+
     supervisor_enable_tick();
     self->refreshing = true;
 
@@ -326,8 +340,10 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
             memset(mask, 0, mask_length * sizeof(mask[0]));
             memset(buffer, 0, buffer_size * sizeof(buffer[0]));
 
-            self->core.colorspace.grayscale = true;
-            self->core.colorspace.grayscale_bit = 7;
+            if (self->grayscale) {
+                self->core.colorspace.grayscale = true;
+                self->core.colorspace.grayscale_bit = 7;
+            }
             if (pass == 1) {
                 if (self->grayscale) { // 4-color grayscale
                     self->core.colorspace.grayscale_bit = 6;
@@ -335,6 +351,8 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
                 } else if (self->core.colorspace.tricolor) {
                     self->core.colorspace.grayscale = false;
                     displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
+                } else if (self->core.colorspace.sevencolor) {
+                    displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
                 }
             } else {
                 displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
@@ -366,6 +384,38 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
     return true;
 }
 
+STATIC bool _clean_area(displayio_epaperdisplay_obj_t *self) {
+    uint16_t width = displayio_display_core_get_width(&self->core);
+    uint16_t height = displayio_display_core_get_height(&self->core);
+
+    // Allocated and shared as a uint32_t array so the compiler knows the
+    // alignment everywhere.
+    uint8_t buffer[width / 2];
+    memset(buffer, 0x77, width / 2);
+
+    uint8_t write_command = self->write_black_ram_command;
+    displayio_display_core_begin_transaction(&self->core);
+    self->core.send(self->core.bus, DISPLAY_COMMAND, self->chip_select, &write_command, 1);
+    displayio_display_core_end_transaction(&self->core);
+
+    for (uint16_t j = 0; j < height; j++) {
+        if (!displayio_display_core_begin_transaction(&self->core)) {
+            // Can't acquire display bus; skip the rest of the data. Try next display.
+            return false;
+        }
+        self->core.send(self->core.bus, DISPLAY_DATA, self->chip_select, (uint8_t *)buffer, width / 2);
+        displayio_display_core_end_transaction(&self->core);
+
+        // TODO(tannewt): Make refresh displays faster so we don't starve other
+        // background tasks.
+        #if CIRCUITPY_USB
+        usb_background();
+        #endif
+    }
+
+    return true;
+}
+
 bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *self) {
 
     if (self->refreshing && self->busy.base.type == &digitalio_digitalinout_type) {
@@ -393,6 +443,18 @@ bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *s
     if (current_area == NULL) {
         return true;
     }
+    if (self->acep) {
+        displayio_epaperdisplay_start_refresh(self);
+        _clean_area(self);
+        displayio_epaperdisplay_finish_refresh(self);
+        while (self->refreshing && !mp_hal_is_interrupted()) {
+            RUN_BACKGROUND_TASKS;
+        }
+    }
+    if (mp_hal_is_interrupted()) {
+        return false;
+    }
+
     displayio_epaperdisplay_start_refresh(self);
     while (current_area != NULL) {
         displayio_epaperdisplay_refresh_area(self, current_area);
diff --git a/shared-module/displayio/EPaperDisplay.h b/shared-module/displayio/EPaperDisplay.h
index 55feaf964b..f2398398ea 100644
--- a/shared-module/displayio/EPaperDisplay.h
+++ b/shared-module/displayio/EPaperDisplay.h
@@ -39,9 +39,12 @@ typedef struct {
     digitalio_digitalinout_obj_t busy;
     uint32_t milliseconds_per_frame;
     const uint8_t *start_sequence;
-    uint32_t start_sequence_len;
     const uint8_t *stop_sequence;
-    uint32_t stop_sequence_len;
+    const uint8_t *refresh_sequence;
+    uint16_t start_sequence_len;
+    uint16_t stop_sequence_len;
+    uint16_t refresh_sequence_len;
+    uint16_t start_up_time_ms;
     uint16_t refresh_time;
     uint16_t set_column_window_command;
     uint16_t set_row_window_command;
@@ -49,15 +52,15 @@ typedef struct {
     uint16_t set_current_row_command;
     uint16_t write_black_ram_command;
     uint16_t write_color_ram_command;
-    uint8_t refresh_display_command;
     uint8_t hue;
     bool busy_state;
     bool black_bits_inverted;
     bool color_bits_inverted;
     bool refreshing;
     bool grayscale;
-    display_chip_select_behavior_t chip_select;
+    bool acep;
     bool two_byte_sequence_length;
+    display_chip_select_behavior_t chip_select;
 } displayio_epaperdisplay_obj_t;
 
 void displayio_epaperdisplay_change_refresh_mode_parameters(displayio_epaperdisplay_obj_t *self,
diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c
index 2863dffb19..c9a9d7d9f2 100644
--- a/shared-module/displayio/OnDiskBitmap.c
+++ b/shared-module/displayio/OnDiskBitmap.c
@@ -90,7 +90,7 @@ void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self,
 
         displayio_palette_t *palette = m_new_obj(displayio_palette_t);
         palette->base.type = &displayio_palette_type;
-        common_hal_displayio_palette_construct(palette, number_of_colors);
+        common_hal_displayio_palette_construct(palette, number_of_colors, false);
 
         if (number_of_colors > 1) {
             uint16_t palette_size = number_of_colors * sizeof(uint32_t);
diff --git a/shared-module/displayio/Palette.c b/shared-module/displayio/Palette.c
index 1bd168b354..a2ddc285fd 100644
--- a/shared-module/displayio/Palette.c
+++ b/shared-module/displayio/Palette.c
@@ -28,9 +28,18 @@
 
 #include "shared-module/displayio/ColorConverter.h"
 
-void common_hal_displayio_palette_construct(displayio_palette_t *self, uint16_t color_count) {
+void common_hal_displayio_palette_construct(displayio_palette_t *self, uint16_t color_count, bool dither) {
     self->color_count = color_count;
     self->colors = (_displayio_color_t *)m_malloc(color_count * sizeof(_displayio_color_t), false);
+    self->dither = dither;
+}
+
+void common_hal_displayio_palette_set_dither(displayio_palette_t *self, bool dither) {
+    self->dither = dither;
+}
+
+bool common_hal_displayio_palette_get_dither(displayio_palette_t *self) {
+    return self->dither;
 }
 
 void common_hal_displayio_palette_make_opaque(displayio_palette_t *self, uint32_t palette_index) {
@@ -56,12 +65,7 @@ void common_hal_displayio_palette_set_color(displayio_palette_t *self, uint32_t
         return;
     }
     self->colors[palette_index].rgb888 = color;
-    self->colors[palette_index].luma = displayio_colorconverter_compute_luma(color);
-    self->colors[palette_index].rgb565 = displayio_colorconverter_compute_rgb565(color);
-
-    uint8_t chroma = displayio_colorconverter_compute_chroma(color);
-    self->colors[palette_index].chroma = chroma;
-    self->colors[palette_index].hue = displayio_colorconverter_compute_hue(color);
+    self->colors[palette_index].cached_colorspace = NULL;
     self->needs_refresh = true;
 }
 
@@ -69,40 +73,26 @@ uint32_t common_hal_displayio_palette_get_color(displayio_palette_t *self, uint3
     return self->colors[palette_index].rgb888;
 }
 
-bool displayio_palette_get_color(displayio_palette_t *self, const _displayio_colorspace_t *colorspace, uint32_t palette_index, uint32_t *color) {
+void displayio_palette_get_color(displayio_palette_t *self, const _displayio_colorspace_t *colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
+    uint32_t palette_index = input_pixel->pixel;
     if (palette_index > self->color_count || self->colors[palette_index].transparent) {
-        return false; // returns transparent
+        output_color->opaque = false;
+        return;
     }
 
-    if (colorspace->tricolor) {
-        uint8_t luma = self->colors[palette_index].luma;
-        *color = luma >> (8 - colorspace->depth);
-        // Chroma 0 means the color is a gray and has no hue so never color based on it.
-        if (self->colors[palette_index].chroma <= 16) {
-            if (!colorspace->grayscale) {
-                *color = 0;
-            }
-            return true;
-        }
-        uint8_t pixel_hue = self->colors[palette_index].hue;
-        displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, color);
-    } else if (colorspace->grayscale) {
-        size_t bitmask = (1 << colorspace->depth) - 1;
-        *color = (self->colors[palette_index].luma >> colorspace->grayscale_bit) & bitmask;
-    } else if (colorspace->depth == 16) {
-        uint16_t packed = self->colors[palette_index].rgb565;
-        if (colorspace->reverse_bytes_in_word) {
-            // swap bytes
-            packed = __builtin_bswap16(packed);
-        }
-        *color = packed;
-    } else if (colorspace->depth == 32) {
-        *color = self->colors[palette_index].rgb888;
-    } else {
-        return false;
+    // Cache results when not dithering.
+    if (!self->dither && self->colors[palette_index].cached_colorspace == colorspace) {
+        output_color->pixel = self->colors[palette_index].cached_color;
+        return;
     }
 
-    return true;
+    displayio_input_pixel_t rgb888_pixel = *input_pixel;
+    rgb888_pixel.pixel = self->colors[palette_index].rgb888;
+    displayio_convert_color(colorspace, self->dither, &rgb888_pixel, output_color);
+    if (!self->dither) {
+        self->colors[palette_index].cached_colorspace = colorspace;
+        self->colors[palette_index].cached_color = output_color->pixel;
+    }
 }
 
 bool displayio_palette_needs_refresh(displayio_palette_t *self) {
diff --git a/shared-module/displayio/Palette.h b/shared-module/displayio/Palette.h
index 49f03b56c7..e9b449c4e7 100644
--- a/shared-module/displayio/Palette.h
+++ b/shared-module/displayio/Palette.h
@@ -40,6 +40,7 @@ typedef struct {
     uint8_t grayscale_bit; // The lowest grayscale bit. Normally 8 - depth.
     bool grayscale;
     bool tricolor;
+    bool sevencolor; // Acep e-ink screens.
     bool pixels_in_byte_share_row;
     bool reverse_pixels_in_byte;
     bool reverse_bytes_in_word;
@@ -48,10 +49,8 @@ typedef struct {
 
 typedef struct {
     uint32_t rgb888;
-    uint16_t rgb565;
-    uint8_t luma;
-    uint8_t hue;
-    uint8_t chroma;
+    const _displayio_colorspace_t *cached_colorspace;
+    uint32_t cached_color;
     bool transparent; // This may have additional bits added later for blending.
 } _displayio_color_t;
 
@@ -74,11 +73,12 @@ typedef struct displayio_palette {
     _displayio_color_t *colors;
     uint32_t color_count;
     bool needs_refresh;
+    bool dither;
 } displayio_palette_t;
 
-// Returns false if color fetch did not succeed (out of range or transparent).
-// Returns true if color is opaque, and sets color.
-bool displayio_palette_get_color(displayio_palette_t *palette, const _displayio_colorspace_t *colorspace, uint32_t palette_index, uint32_t *color);
+
+void displayio_palette_get_color(displayio_palette_t *palette, const _displayio_colorspace_t *colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color);
+;
 bool displayio_palette_needs_refresh(displayio_palette_t *self);
 void displayio_palette_finish_refresh(displayio_palette_t *self);
 
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index 769c334ac6..e5573ac34c 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -507,7 +507,7 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self,
             if (self->pixel_shader == mp_const_none) {
                 output_pixel.pixel = input_pixel.pixel;
             } else if (mp_obj_is_type(self->pixel_shader, &displayio_palette_type)) {
-                output_pixel.opaque = displayio_palette_get_color(self->pixel_shader, colorspace, input_pixel.pixel, &output_pixel.pixel);
+                displayio_palette_get_color(self->pixel_shader, colorspace, &input_pixel, &output_pixel);
             } else if (mp_obj_is_type(self->pixel_shader, &displayio_colorconverter_type)) {
                 displayio_colorconverter_convert(self->pixel_shader, colorspace, &input_pixel, &output_pixel);
             }
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
index b53461aad5..47f31d794f 100644
--- a/shared-module/framebufferio/FramebufferDisplay.h
+++ b/shared-module/framebufferio/FramebufferDisplay.h
@@ -66,7 +66,7 @@ typedef bool (*framebuffer_set_brightness_fun)(mp_obj_t, mp_float_t);
 typedef int (*framebuffer_get_bytes_per_cell_fun)(mp_obj_t);
 typedef int (*framebuffer_get_color_depth_fun)(mp_obj_t);
 typedef int (*framebuffer_get_first_pixel_offset_fun)(mp_obj_t);
-typedef int (*framebuffer_get_grayscale_fun)(mp_obj_t);
+typedef bool (*framebuffer_get_grayscale_fun)(mp_obj_t);
 typedef int (*framebuffer_get_height_fun)(mp_obj_t);
 typedef int (*framebuffer_get_native_frames_per_second_fun)(mp_obj_t);
 typedef bool (*framebuffer_get_pixels_in_byte_share_row_fun)(mp_obj_t);
diff --git a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c
index 285abb1dbe..3bb7f00e1b 100644
--- a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c
+++ b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c
@@ -36,6 +36,7 @@
 #include "supervisor/memory.h"
 
 #define SHARPMEM_BIT_WRITECMD_LSB (0x80)
+#define JDI_BIT_WRITECMD_LSB      (0x90)
 #define SHARPMEM_BIT_VCOM_LSB (0x40)
 
 STATIC uint8_t bitrev(uint8_t n) {
@@ -54,7 +55,11 @@ int common_hal_sharpdisplay_framebuffer_get_height(sharpdisplay_framebuffer_obj_
 }
 
 STATIC int common_hal_sharpdisplay_framebuffer_get_row_stride(sharpdisplay_framebuffer_obj_t *self) {
-    return (self->width + 7) / 8 + 2;
+    if (self->jdi_display) {
+        return (self->width + 1) / 2 + 2;
+    } else {
+        return (self->width + 7) / 8 + 2;
+    }
 }
 
 STATIC int common_hal_sharpdisplay_framebuffer_get_first_pixel_offset(sharpdisplay_framebuffer_obj_t *self) {
@@ -99,10 +104,18 @@ void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_ob
         memset(alloc->ptr, 0, self->bufinfo.len);
 
         uint8_t *data = self->bufinfo.buf;
-        *data++ = SHARPMEM_BIT_WRITECMD_LSB;
+        if (self->jdi_display) {
+            *data++ = JDI_BIT_WRITECMD_LSB;
+        } else {
+            *data++ = SHARPMEM_BIT_WRITECMD_LSB;
+        }
 
         for (int y = 0; y < height; y++) {
-            *data = bitrev(y + 1);
+            if (self->jdi_display) {
+                *data = y + 1;
+            } else {
+                *data = bitrev(y + 1);
+            }
             data += row_stride;
         }
         self->full_refresh = true;
@@ -128,7 +141,14 @@ void common_hal_sharpdisplay_framebuffer_deinit(sharpdisplay_framebuffer_obj_t *
     memset(self, 0, sizeof(*self));
 }
 
-void common_hal_sharpdisplay_framebuffer_construct(sharpdisplay_framebuffer_obj_t *self, busio_spi_obj_t *spi, const mcu_pin_obj_t *chip_select, int baudrate, int width, int height) {
+void common_hal_sharpdisplay_framebuffer_construct(
+    sharpdisplay_framebuffer_obj_t *self,
+    busio_spi_obj_t *spi,
+    const mcu_pin_obj_t *chip_select,
+    int baudrate,
+    int width,
+    int height,
+    bool jdi_display) {
     common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
     common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
     common_hal_never_reset_pin(chip_select);
@@ -139,6 +159,7 @@ void common_hal_sharpdisplay_framebuffer_construct(sharpdisplay_framebuffer_obj_
     self->width = width;
     self->height = height;
     self->baudrate = baudrate;
+    self->jdi_display = jdi_display;
 
     common_hal_sharpdisplay_framebuffer_get_bufinfo(self, NULL);
 }
@@ -169,7 +190,8 @@ STATIC void common_hal_sharpdisplay_framebuffer_swapbuffers(sharpdisplay_framebu
     }
 
     // output a trailing zero
-    common_hal_busio_spi_write(self->bus, data, 1);
+    uint8_t zero[2] = {0, 0};
+    common_hal_busio_spi_write(self->bus, zero, self->jdi_display ? 2 : 1);
 
     // set chip select low
     common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
@@ -191,7 +213,13 @@ STATIC void sharpdisplay_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_inf
 }
 
 STATIC int sharpdisplay_framebuffer_get_color_depth(mp_obj_t self_in) {
-    return 1;
+    sharpdisplay_framebuffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return self->jdi_display ? 4 : 1;
+}
+
+STATIC bool sharpdisplay_framebuffer_get_grayscale(mp_obj_t self_in) {
+    sharpdisplay_framebuffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return !self->jdi_display;
 }
 
 STATIC int sharpdisplay_framebuffer_get_height(mp_obj_t self_in) {
@@ -234,6 +262,7 @@ const framebuffer_p_t sharpdisplay_framebuffer_proto = {
     .deinit = sharpdisplay_framebuffer_deinit,
     .get_bufinfo = sharpdisplay_framebuffer_get_bufinfo,
     .get_color_depth = sharpdisplay_framebuffer_get_color_depth,
+    .get_grayscale = sharpdisplay_framebuffer_get_grayscale,
     .get_height = sharpdisplay_framebuffer_get_height,
     .get_width = sharpdisplay_framebuffer_get_width,
     .swapbuffers = sharpdisplay_framebuffer_swapbuffers,
diff --git a/shared-module/sharpdisplay/SharpMemoryFramebuffer.h b/shared-module/sharpdisplay/SharpMemoryFramebuffer.h
index abc951baf5..75abb2ff10 100644
--- a/shared-module/sharpdisplay/SharpMemoryFramebuffer.h
+++ b/shared-module/sharpdisplay/SharpMemoryFramebuffer.h
@@ -41,19 +41,10 @@ typedef struct {
     uint16_t width, height;
     uint32_t baudrate;
 
-    bool full_refresh : 1;
+    bool full_refresh;
+    bool jdi_display;
 } sharpdisplay_framebuffer_obj_t;
 
-void common_hal_sharpdisplay_framebuffer_construct(sharpdisplay_framebuffer_obj_t *self, busio_spi_obj_t *spi, const mcu_pin_obj_t *chip_select, int baudrate, int width, int height);
-void common_hal_sharpdisplay_framebuffer_swap_buffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask);
-void common_hal_sharpdisplay_framebuffer_deinit(sharpdisplay_framebuffer_obj_t *self);
-void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_obj_t *self, mp_buffer_info_t *bufinfo);
-int common_hal_sharpdisplay_framebuffer_get_height(sharpdisplay_framebuffer_obj_t *self);
-int common_hal_sharpdisplay_framebuffer_get_width(sharpdisplay_framebuffer_obj_t *self);
-void common_hal_sharpdisplay_framebuffer_swap_buffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask);
-void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *self);
-void common_hal_sharpdisplay_framebuffer_reconstruct(sharpdisplay_framebuffer_obj_t *self);
-
 extern const framebuffer_p_t sharpdisplay_framebuffer_proto;
 
 void common_hal_sharpdisplay_framebuffer_collect_ptrs(sharpdisplay_framebuffer_obj_t *);
diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c
index 20e1405d9a..35131faa4f 100644
--- a/shared-module/vectorio/VectorShape.c
+++ b/shared-module/vectorio/VectorShape.c
@@ -406,7 +406,7 @@ bool vectorio_vector_shape_fill_area(vectorio_vector_shape_t *self, const _displ
                 if (self->pixel_shader == mp_const_none) {
                     output_pixel.pixel = input_pixel.pixel;
                 } else if (mp_obj_is_type(self->pixel_shader, &displayio_palette_type)) {
-                    output_pixel.opaque = displayio_palette_get_color(self->pixel_shader, colorspace, input_pixel.pixel, &output_pixel.pixel);
+                    displayio_palette_get_color(self->pixel_shader, colorspace, &input_pixel, &output_pixel);
                 } else if (mp_obj_is_type(self->pixel_shader, &displayio_colorconverter_type)) {
                     displayio_colorconverter_convert(self->pixel_shader, colorspace, &input_pixel, &output_pixel);
                 }
diff --git a/supervisor/port.h b/supervisor/port.h
index 2fb24385c1..70bdcb0170 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -90,7 +90,11 @@ void port_interrupt_after_ticks(uint32_t ticks);
 // may not be a system level sleep.
 void port_idle_until_interrupt(void);
 
-// Execute port specific actions during background tasks.
+// Execute port specific actions during background tick. Only if ticks are enabled.
+void port_background_tick(void);
+
+// Execute port specific actions during background tasks. This is before the
+// background callback system.
 void port_background_task(void);
 
 // Take port specific actions at the beginning and end of background tasks.
diff --git a/supervisor/shared/background_callback.c b/supervisor/shared/background_callback.c
index 88ffc15911..db6d62f8e7 100644
--- a/supervisor/shared/background_callback.c
+++ b/supervisor/shared/background_callback.c
@@ -74,6 +74,7 @@ bool PLACE_IN_ITCM(background_callback_pending)(void) {
 
 static bool in_background_callback;
 void PLACE_IN_ITCM(background_callback_run_all)() {
+    port_background_task();
     if (!background_callback_pending()) {
         return;
     }
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index 6fe5d570b8..bb44ab0f00 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -158,7 +158,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     _private_advertising = true;
     // 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) {
+    if (!bonded || boot_in_discovery_mode) {
         tx_power = -20;
         adv = public_advertising_data;
         adv_len = sizeof(public_advertising_data);
@@ -179,7 +179,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     }
     uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
         true,
-        bonded, // Advertise anonymously if we are bonded
+        _private_advertising, // Advertise anonymously if we are privately advertising
         timeout,
         interval,
         adv,
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 0a066e8016..26585c54d5 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -159,6 +159,14 @@ void supervisor_stop_terminal(void) {
     #endif
 }
 
+bool supervisor_terminal_started(void) {
+    #if CIRCUITPY_TERMINALIO
+    return tilegrid_tiles != NULL;
+    #else
+    return false;
+    #endif
+}
+
 void supervisor_display_move_memory(void) {
     #if CIRCUITPY_TERMINALIO
     displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid;
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h
index fcaab10818..0eb9bc507f 100644
--- a/supervisor/shared/display.h
+++ b/supervisor/shared/display.h
@@ -54,6 +54,7 @@ extern displayio_tilegrid_t supervisor_blinka_sprite;
 
 void supervisor_start_terminal(uint16_t width_px, uint16_t height_px);
 void supervisor_stop_terminal(void);
+bool supervisor_terminal_started(void);
 
 void supervisor_display_move_memory(void);
 
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 5680d8afe0..e683e8eb7c 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -192,6 +192,12 @@ bool serial_connected(void) {
     }
     #endif
 
+    #if CIRCUITPY_TERMINALIO
+    if (supervisor_terminal_started()) {
+        return true;
+    }
+    #endif
+
 
     if (port_serial_connected()) {
         return true;
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index 309d91c368..a4f28f1c1c 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -66,13 +66,20 @@ for board in build_boards:
         if clean_build:
             build_dir += "-{language}".format(language=language)
 
+        extensions = [
+            extension.strip()
+            for extension in board_settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
+        ]
+
+        artifacts = [os.path.join(build_dir, "firmware." + extension) for extension in extensions]
         make_result = subprocess.run(
-            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build} -j {cores}".format(
+            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build} -j {cores} {artifacts}".format(
                 port=board_info["port"],
                 language=language,
                 board=board,
                 build=build_dir,
                 cores=cores,
+                artifacts=" ".join(artifacts),
             ),
             shell=True,
             stdout=subprocess.PIPE,
@@ -86,10 +93,6 @@ for board in build_boards:
             success = "\033[31mfailed\033[0m"
 
         other_output = ""
-        extensions = [
-            extension.strip()
-            for extension in board_settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
-        ]
 
         for extension in extensions:
             temp_filename = "../ports/{port}/{build}/firmware.{extension}".format(
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 6e7a4f1229..37f3349d5c 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -42,14 +42,14 @@ from shared_bindings_matrix import (
     all_ports_all_boards,
 )
 
-PORT_TO_ARCH = {
+PORT_TO_BUILD_JOB = {
     "atmel-samd": "arm",
     "broadcom": "aarch",
     "cxd56": "arm",
     "espressif": "esp",
     "litex": "riscv",
     "mimxrt10xx": "arm",
-    "nrf": "arm",
+    "nrf": "nrf",
     "raspberrypi": "rpi",
     "stm": "arm",
 }
@@ -203,14 +203,14 @@ def set_boards_to_build(build_all: bool):
             boards_to_build = all_board_ids
             break
 
-    # Split boards by architecture.
-    arch_to_boards = {"aarch": [], "arm": [], "esp": [], "riscv": [], "rpi": []}
+    # Split boards by build job.
+    build_job_to_boards = {"aarch": [], "arm": [], "esp": [], "nrf": [], "riscv": [], "rpi": []}
 
     # Append previously failed boards
-    for arch in arch_to_boards:
-        arch_to_job = f"build-{arch}"
-        if arch_to_job in last_failed_jobs:
-            for board in last_failed_jobs[arch_to_job]:
+    for build_job in build_job_to_boards:
+        job_name = f"build-{build_job}"
+        if job_name in last_failed_jobs:
+            for board in last_failed_jobs[job_name]:
                 if not board in boards_to_build:
                     boards_to_build.append(board)
 
@@ -225,12 +225,12 @@ def set_boards_to_build(build_all: bool):
         # if this happens it's not in `board_to_port`.
         if not port:
             continue
-        arch_to_boards[PORT_TO_ARCH[port]].append(board)
+        build_job_to_boards[PORT_TO_BUILD_JOB[port]].append(board)
         print(" ", board)
 
     # Set the step outputs for each architecture
-    for arch in arch_to_boards:
-        set_output(f"boards-{arch}", json.dumps(arch_to_boards[arch]))
+    for build_job in build_job_to_boards:
+        set_output(f"boards-{build_job}", json.dumps(build_job_to_boards[build_job]))
 
 
 def set_docs_to_build(build_doc: bool):
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index e5ce775e4a..7165db84cc 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -180,51 +180,25 @@ displayio_bitmap_t blinka_bitmap = {{
 _displayio_color_t blinka_colors[7] = {{
     {{
         .rgb888 = 0x000000,
-        .rgb565 = 0x0000,
-        .luma = 0x00,
-        .chroma = 0,
         .transparent = true
     }},
-    {{
-        .rgb888 = 0x8428bc,
-        .rgb565 = 0x8978,
-        .luma = 0xff, // We cheat the luma here. It is actually 0x60
-        .hue = 184,
-        .chroma = 148
+    {{ // Purple
+        .rgb888 = 0x8428bc
     }},
-    {{
-        .rgb888 = 0xff89bc,
-        .rgb565 = 0xFCB8,
-        .luma = 0xb5,
-        .hue = 222,
-        .chroma = 118
+    {{ // Pink
+        .rgb888 = 0xff89bc
     }},
-    {{
-        .rgb888 = 0x7beffe,
-        .rgb565 = 0x869F,
-        .luma = 0xe0,
-        .hue = 124,
-        .chroma = 131
+    {{ // Light blue
+        .rgb888 = 0x7beffe
     }},
-    {{
-        .rgb888 = 0x51395f,
-        .rgb565 = 0x5A0D,
-        .luma = 0x47,
-        .hue = 185,
-        .chroma = 38
+    {{ // Dark purple
+        .rgb888 = 0x51395f
     }},
-    {{
-        .rgb888 = 0xffffff,
-        .rgb565 = 0xffff,
-        .luma = 0xff,
-        .chroma = 0
+    {{ // White
+        .rgb888 = 0xffffff
     }},
-    {{
-        .rgb888 = 0x0736a0,
-        .rgb565 = 0x01f5,
-        .luma = 0x44,
-        .hue = 147,
-        .chroma = 153
+    {{ // Dark Blue
+        .rgb888 = 0x0736a0
     }},
 }};
 
@@ -270,16 +244,10 @@ c_file.write(
 #if CIRCUITPY_TERMINALIO
 _displayio_color_t terminal_colors[2] = {
     {
-        .rgb888 = 0x000000,
-        .rgb565 = 0x0000,
-        .luma = 0x00,
-        .chroma = 0
+        .rgb888 = 0x000000
     },
     {
-        .rgb888 = 0xffffff,
-        .rgb565 = 0xffff,
-        .luma = 0xff,
-        .chroma = 0
+        .rgb888 = 0xffffff
     },
 };
 

From fd1c3ca7849a2a97ed427327c57317616025dfa6 Mon Sep 17 00:00:00 2001
From: Gregory Neverov <42853258+gneverov@users.noreply.github.com>
Date: Wed, 15 Feb 2023 14:02:13 -0800
Subject: [PATCH 1856/2403] Increase number of LWIP timers for MDNS

---
 ports/raspberrypi/lwip_inc/lwipopts.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/lwip_inc/lwipopts.h b/ports/raspberrypi/lwip_inc/lwipopts.h
index 6d116e89b6..06df7f1318 100644
--- a/ports/raspberrypi/lwip_inc/lwipopts.h
+++ b/ports/raspberrypi/lwip_inc/lwipopts.h
@@ -60,6 +60,7 @@
 #define LWIP_NUM_NETIF_CLIENT_DATA  1
 #define LWIP_NETIF_EXT_STATUS_CALLBACK 1
 #define MDNS_MAX_SECONDARY_HOSTNAMES 1
+#define MEMP_NUM_SYS_TIMEOUT        (8 + 3 * (LWIP_IPV4 + LWIP_IPV6))
 #endif
 
 #ifndef NDEBUG

From 3036348f7278ea8104c059717869162d9fc04e50 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 16 Feb 2023 08:53:18 +0530
Subject: [PATCH 1857/2403] couple ci fixes

- upload stubs as `.tar.gz` instead of `.zip`
- append recursive flag only when the source ends with a backslash
---
 .github/actions/upload_aws/action.yml | 3 ++-
 .github/workflows/build.yml           | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/actions/upload_aws/action.yml b/.github/actions/upload_aws/action.yml
index 7aee8c7e78..643dd00342 100644
--- a/.github/actions/upload_aws/action.yml
+++ b/.github/actions/upload_aws/action.yml
@@ -24,7 +24,8 @@ runs:
         (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: >-
         [ -z "$AWS_ACCESS_KEY_ID" ] ||
-        aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }} --recursive --no-progress --region us-east-1
+        aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}
+        ${{ endsWith(inputs.source, '/') && '--recursive' || '' }} --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ inputs.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6159f7291e..e9146c39b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -200,16 +200,11 @@ jobs:
       with:
         name: docs
         path: _build/latex
-    - name: Zip stubs
-      if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-      run: zip -9r circuitpython-stubs.zip circuitpython-stubs
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:
         source: circuitpython-stubs/dist/*.tar.gz
-        destination: stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip
+        destination: stubs/circuitpython-stubs-${{ env.CP_VERSION }}.tar.gz
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     - name: Upload stubs to PyPi

From 729fc97668175b5e7af1eafc2a95da4f0c597f09 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 16 Feb 2023 09:18:01 +0530
Subject: [PATCH 1858/2403] custom board build

---
 .github/actions/deps/external/action.yml  |  10 ++-
 .github/workflows/build-boards-custom.yml | 104 ++++++++++++++++++++++
 .github/workflows/build.yml               |   2 +
 3 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/build-boards-custom.yml

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 3503e5b194..5db7c04686 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -1,6 +1,14 @@
 name: Fetch external deps
 
 inputs:
+  action:
+    required: false
+    default: restore
+    type: choice
+    options:
+    - cache
+    - restore
+
   platform:
     required: false
     default: none
@@ -78,7 +86,7 @@ runs:
       if: inputs.platform != 'esp'
       uses: ./.github/actions/deps/python
       with:
-        action: ${{ fromJSON('["restore", "cache"]')[github.job == 'scheduler'] }}
+        action: ${{ inputs.action }}
     - name: Install python dependencies
       run: pip install -r requirements-dev.txt
       shell: bash
diff --git a/.github/workflows/build-boards-custom.yml b/.github/workflows/build-boards-custom.yml
new file mode 100644
index 0000000000..22ba0f62f4
--- /dev/null
+++ b/.github/workflows/build-boards-custom.yml
@@ -0,0 +1,104 @@
+name: Custom board build
+
+on:
+  workflow_dispatch:
+    inputs:
+      board:
+        description: 'Board: Found in ports/*/boards/[board_id]'
+        required: true
+        type: string
+      version:
+        description: 'Version: Can be a tag or a commit (>=8.1.0)'
+        required: false
+        default: latest
+        type: string
+      language:
+        description: 'Language: Found in locale/[language].po'
+        required: false
+        default: en_US
+        type: string
+      flags:
+        description: 'Flags: Build flags (e.g. CIRCUITPY_WIFI=1)'
+        required: false
+        type: string
+      debug:
+        description: 'Make a debug build'
+        required: false
+        default: false
+        type: boolean
+
+run-name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      PLATFORM_atmel-samd: arm
+      PLATFORM_broadcom: aarch
+      PLATFORM_cxd56: arm
+      PLATFORM_espressif: esp
+      PLATFORM_litex: riscv
+      PLATFORM_mimxrt10xx: arm
+      PLATFORM_nrf: arm
+      PLATFORM_raspberrypi: arm
+      PLATFORM_stm: arm
+    steps:
+    - name: Set up repository
+      run: |
+        git clone --filter=tree:0 https://github.com/adafruit/circuitpython.git $GITHUB_WORKSPACE
+        git checkout ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
+    - name: Set up identifier
+      if: inputs.debug || inputs.flags != ''
+      run: |
+        > custom-build && git add custom-build
+    - name: Get port
+      id: get-port
+      run: |
+        PORT=$(find ports/*/boards/ -type d -name ${{ inputs.board }} | sed 's/^ports\///g;s/\/boards.*//g')
+        if [ -z $PORT ]; then (exit 1); else echo >> $GITHUB_OUTPUT "port=$PORT"; fi
+    - name: Port to platform
+      run: echo >> $GITHUB_ENV "PLATFORM=${{ env[format('PLATFORM_{0}', steps.get-port.outputs.port)] }}"
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: Set up port
+      if: env.PLATFORM == 'esp'
+      uses: ./.github/actions/deps/ports/espressif
+    - name: Set up submodules
+      id: set-up-submodules
+      uses: ./.github/actions/deps/submodules
+      with:
+        action: cache
+        target: ${{ inputs.board }}
+    - name: Set up external
+      uses: ./.github/actions/deps/external
+      with:
+        action: cache
+        platform: ${{ env.PLATFORM }}
+    - name: Set up mpy-cross
+      if: steps.set-up-submodules.outputs.frozen == 'True'
+      uses: ./.github/actions/mpy_cross
+      with:
+        download: false
+    - name: Versions
+      run: |
+        tools/describe
+        gcc --version
+        python3 --version
+        cmake --version || true
+        ninja --version || true
+        aarch64-none-elf-gcc --version || true
+        arm-none-eabi-gcc --version || true
+        xtensa-esp32-elf-gcc --version || true
+        riscv32-esp-elf-gcc --version || true
+        riscv64-unknown-elf-gcc --version || true
+        mkfs.fat --version || true
+    - name: Build board
+      run: make -j2 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
+      working-directory: ports/${{ steps.get-port.outputs.port }}
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
+        path: ports/${{ steps.get-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9146c39b0..00c7f8749f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,6 +52,8 @@ jobs:
         version: true
     - name: Set up external
       uses: ./.github/actions/deps/external
+      with:
+        action: cache
     # Disabled: Needs to be updated
     # - name: Get last commit with checks
     #   id: get-last-commit-with-checks

From 8061e8e7c647b9a509bd4812f91e88de8ec6d9da Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 11:05:29 +0200
Subject: [PATCH 1859/2403] Names changed to better fit mp style

---
 main.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/main.c b/main.c
index 06ddc0aa6d..dc5e015da7 100644
--- a/main.c
+++ b/main.c
@@ -131,7 +131,7 @@ typedef struct {
     supervisor_allocation *pystack;
     #endif
     supervisor_allocation *heap;
-} stacks;
+} vm_memory_t;
 
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
@@ -139,9 +139,8 @@ static void reset_devices(void) {
     #endif
 }
 
-#if MICROPY_ENABLE_PYSTACK
-STATIC stacks __attribute__ ((noinline)) alloc_stacks(void) {
-    stacks res;
+STATIC vm_memory_t allocate_vm_memory(void) {
+    vm_memory_t res;
     #if MICROPY_ENABLE_PYSTACK
     mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV
@@ -164,9 +163,8 @@ STATIC stacks __attribute__ ((noinline)) alloc_stacks(void) {
     res.heap = allocate_remaining_memory();
     return res;
 }
-#endif
 
-STATIC void start_mp(stacks combo) {
+STATIC void start_mp(vm_memory_t vm_memory) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -194,11 +192,11 @@ STATIC void start_mp(stacks combo) {
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(combo.pystack->ptr, combo.pystack->ptr + get_allocation_length(combo.pystack) / sizeof(size_t));
+    mp_pystack_init(vm_memory.pystack->ptr, vm_memory.pystack->ptr + get_allocation_length(vm_memory.pystack) / sizeof(size_t));
     #endif
 
     #if MICROPY_ENABLE_GC
-    gc_init(combo.heap->ptr, combo.heap->ptr + get_allocation_length(combo.heap) / 4);
+    gc_init(vm_memory.heap->ptr, vm_memory.heap->ptr + get_allocation_length(vm_memory.heap) / 4);
     #endif
     mp_init();
     mp_obj_list_init((mp_obj_list_t *)mp_sys_path, 0);
@@ -298,7 +296,7 @@ STATIC void count_strn(void *data, const char *str, size_t len) {
     *(size_t *)data += len;
 }
 
-STATIC void cleanup_after_vm(stacks combo, mp_obj_t exception) {
+STATIC void cleanup_after_vm(vm_memory_t vm_memory, mp_obj_t exception) {
     // Get the traceback of any exception from this run off the heap.
     // MP_OBJ_SENTINEL means "this run does not contribute to traceback storage, don't touch it"
     // MP_OBJ_NULL (=0) means "this run completed successfully, clear any stored traceback"
@@ -378,9 +376,9 @@ STATIC void cleanup_after_vm(stacks combo, mp_obj_t exception) {
     // Free the heap last because other modules may reference heap memory and need to shut down.
     filesystem_flush();
     stop_mp();
-    free_memory(combo.heap);
+    free_memory(vm_memory.heap);
     #if MICROPY_ENABLE_PYSTACK
-    free_memory(combo.pystack);
+    free_memory(vm_memory.pystack);
     #endif
     supervisor_move_memory();
 
@@ -436,8 +434,8 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        stacks combo = alloc_stacks();
-        start_mp(combo);
+        vm_memory_t vm_memory = allocate_vm_memory();
+        start_mp(vm_memory);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -485,7 +483,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
-        cleanup_after_vm(combo, _exec_result.exception);
+        cleanup_after_vm(vm_memory, _exec_result.exception);
         _exec_result.exception = NULL;
 
         // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
@@ -781,8 +779,8 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    stacks combo = alloc_stacks();
-    start_mp(combo);
+    vm_memory_t vm_memory = allocate_vm_memory();
+    start_mp(vm_memory);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -868,7 +866,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     port_post_boot_py(true);
 
-    cleanup_after_vm(combo, _exec_result.exception);
+    cleanup_after_vm(vm_memory, _exec_result.exception);
     _exec_result.exception = NULL;
 
     port_post_boot_py(false);
@@ -883,8 +881,8 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    stacks combo = alloc_stacks();
-    start_mp(combo);
+    vm_memory_t vm_memory = allocate_vm_memory();
+    start_mp(vm_memory);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -927,7 +925,7 @@ STATIC int run_repl(void) {
         exit_code = PYEXEC_DEEP_SLEEP;
     }
     #endif
-    cleanup_after_vm(combo, MP_OBJ_SENTINEL);
+    cleanup_after_vm(vm_memory, MP_OBJ_SENTINEL);
 
     // Also reset bleio. The above call omits it in case workflows should continue. In this case,
     // we're switching straight to another VM so we want to reset.

From c920dbb81c267f2f56b64a045f49cac3a3422796 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 11:50:35 +0200
Subject: [PATCH 1860/2403] Skip unecessary check for space

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

diff --git a/main.c b/main.c
index dc5e015da7..82b0a54fd6 100644
--- a/main.c
+++ b/main.c
@@ -149,7 +149,7 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
-    if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size < 384)) {
+    if (pystack_size < 384) {
         serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }

From f6e7edc9000acf6462c119a07c5ffffd274c0dee Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 12:34:48 +0200
Subject: [PATCH 1861/2403] Size reductions

---
 locale/circuitpython.pot | 24 +++++++++++++++---------
 main.c                   |  8 ++++++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f44f69dfde..8e9a929db9 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -38,15 +38,7 @@ msgstr ""
 #: main.c
 msgid ""
 "\n"
-"WARNING: Allocating pystack failed, defaulting back to build value. \n"
-"\n"
-msgstr ""
-
-#: main.c
-msgid ""
-"\n"
-"WARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n"
-"\n"
+"WARNING: "
 msgstr ""
 
 #: py/obj.c
@@ -390,6 +382,12 @@ msgstr ""
 msgid "*x must be assignment target"
 msgstr ""
 
+#: main.c
+msgid ""
+", defaulting back to build value.\n"
+"\n"
+msgstr ""
+
 #: py/obj.c
 msgid ", in %q\n"
 msgstr ""
@@ -496,6 +494,10 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""
 
+#: main.c
+msgid "Allocating pystack failed"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Already advertising."
@@ -1244,6 +1246,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/main.c b/main.c
index 82b0a54fd6..ad91b50434 100644
--- a/main.c
+++ b/main.c
@@ -150,13 +150,17 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
     if (pystack_size < 384) {
-        serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
+        serial_write_compressed(translate("\nWARNING: "));
+        serial_write_compressed(translate("Invalid CIRCUITPY_PYSTACK_SIZE"));
+        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }
     #endif
     res.pystack = allocate_memory(pystack_size, false, false);
     if (res.pystack == NULL) {
-        serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value. \n\n"));
+        serial_write_compressed(translate("\nWARNING: "));
+        serial_write_compressed(translate("Allocating pystack failed"));
+        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
     }
     #endif

From a61a9f4bde75ad981aca73191837f5b476bab757 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 13:12:21 +0200
Subject: [PATCH 1862/2403] Size reductions (attempts, at the very least)

---
 locale/circuitpython.pot | 12 +++++-------
 main.c                   |  9 ++++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 8e9a929db9..ab9df4aa37 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -35,12 +35,6 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"WARNING: "
-msgstr ""
-
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@@ -2369,7 +2363,7 @@ msgid "Voltage read timed out"
 msgstr ""
 
 #: main.c
-msgid "WARNING: Your code filename has two extensions\n"
+msgid "WARNING: "
 msgstr ""
 
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
@@ -2430,6 +2424,10 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
+#: main.c
+msgid "Your code filename has two extensions\n"
+msgstr ""
+
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
 msgstr ""
diff --git a/main.c b/main.c
index ad91b50434..d94f1501e3 100644
--- a/main.c
+++ b/main.c
@@ -150,7 +150,8 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
     if (pystack_size < 384) {
-        serial_write_compressed(translate("\nWARNING: "));
+        serial_write("\n");
+        serial_write_compressed(translate("WARNING: "));
         serial_write_compressed(translate("Invalid CIRCUITPY_PYSTACK_SIZE"));
         serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
@@ -158,7 +159,8 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     #endif
     res.pystack = allocate_memory(pystack_size, false, false);
     if (res.pystack == NULL) {
-        serial_write_compressed(translate("\nWARNING: "));
+        serial_write("\n");
+        serial_write_compressed(translate("WARNING: "));
         serial_write_compressed(translate("Allocating pystack failed"));
         serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
@@ -469,7 +471,8 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
             if (!found_main) {
                 found_main = maybe_run_list(double_extension_filenames, MP_ARRAY_SIZE(double_extension_filenames));
                 if (found_main) {
-                    serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
+                    serial_write_compressed(translate("WARNING: "));
+                    serial_write_compressed(translate("Your code filename has two extensions\n"));
                 }
             }
             #else

From 6dc179dc4a3ec54a26f0c50bca0af2ded9cfc640 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 13:33:37 +0200
Subject: [PATCH 1863/2403] Removed old supervisor stack setting code and
 revert some 'optimisations'

---
 locale/circuitpython.pot             | 34 ++++++++++++----------------
 main.c                               | 13 +++--------
 shared-bindings/supervisor/Runtime.c | 21 -----------------
 3 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index ab9df4aa37..a5906ca6e7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -35,6 +35,20 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"WARNING: Allocating pystack failed, defaulting back to build value.\n"
+"\n"
+msgstr ""
+
+#: main.c
+msgid ""
+"\n"
+"WARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n"
+"\n"
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@@ -376,12 +390,6 @@ msgstr ""
 msgid "*x must be assignment target"
 msgstr ""
 
-#: main.c
-msgid ""
-", defaulting back to build value.\n"
-"\n"
-msgstr ""
-
 #: py/obj.c
 msgid ", in %q\n"
 msgstr ""
@@ -488,10 +496,6 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""
 
-#: main.c
-msgid "Allocating pystack failed"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Already advertising."
@@ -1240,10 +1244,6 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
-#: main.c
-msgid "Invalid CIRCUITPY_PYSTACK_SIZE"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
@@ -2363,7 +2363,7 @@ msgid "Voltage read timed out"
 msgstr ""
 
 #: main.c
-msgid "WARNING: "
+msgid "WARNING: Your code filename has two extensions\n"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
@@ -2424,10 +2424,6 @@ msgid ""
 "You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
-#: main.c
-msgid "Your code filename has two extensions\n"
-msgstr ""
-
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
 msgstr ""
diff --git a/main.c b/main.c
index d94f1501e3..09f507867f 100644
--- a/main.c
+++ b/main.c
@@ -150,19 +150,13 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
     if (pystack_size < 384) {
-        serial_write("\n");
-        serial_write_compressed(translate("WARNING: "));
-        serial_write_compressed(translate("Invalid CIRCUITPY_PYSTACK_SIZE"));
-        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
+        serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }
     #endif
     res.pystack = allocate_memory(pystack_size, false, false);
     if (res.pystack == NULL) {
-        serial_write("\n");
-        serial_write_compressed(translate("WARNING: "));
-        serial_write_compressed(translate("Allocating pystack failed"));
-        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
+        serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value.\n\n"));
         res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
     }
     #endif
@@ -471,8 +465,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
             if (!found_main) {
                 found_main = maybe_run_list(double_extension_filenames, MP_ARRAY_SIZE(double_extension_filenames));
                 if (found_main) {
-                    serial_write_compressed(translate("WARNING: "));
-                    serial_write_compressed(translate("Your code filename has two extensions\n"));
+                    serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
                 }
             }
             #else
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 4d8ddbacc7..d250ae89c0 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -168,26 +168,6 @@ MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
     (mp_obj_t)&supervisor_runtime_get_ble_workflow_obj,
     (mp_obj_t)&supervisor_runtime_set_ble_workflow_obj);
 
-//|     next_stack_limit: int
-//|     """The size of the stack for the next vm run. If its too large, the default will be used."""
-//|
-STATIC mp_obj_t supervisor_runtime_get_next_stack_limit(mp_obj_t self) {
-    return mp_obj_new_int(get_next_stack_size());
-}
-MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_next_stack_limit_obj, supervisor_runtime_get_next_stack_limit);
-
-STATIC mp_obj_t supervisor_runtime_set_next_stack_limit(mp_obj_t self, mp_obj_t size_obj) {
-    mp_int_t size = mp_obj_get_int(size_obj);
-    mp_arg_validate_int_min(size, 256, MP_QSTR_size);
-    set_next_stack_size(size);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_next_stack_limit_obj, supervisor_runtime_set_next_stack_limit);
-
-MP_PROPERTY_GETSET(supervisor_runtime_next_stack_limit_obj,
-    (mp_obj_t)&supervisor_runtime_get_next_stack_limit_obj,
-    (mp_obj_t)&supervisor_runtime_set_next_stack_limit_obj);
-
 //|     rgb_status_brightness: int
 //|     """Set brightness of status RGB LED from 0-255. This will take effect
 //|     after the current code finishes and the status LED is used to show
@@ -220,7 +200,6 @@ STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_run_reason), MP_ROM_PTR(&supervisor_runtime_run_reason_obj) },
     { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_ble_workflow),  MP_ROM_PTR(&supervisor_runtime_ble_workflow_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next_stack_limit),  MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
     { MP_ROM_QSTR(MP_QSTR_rgb_status_brightness),  MP_ROM_PTR(&supervisor_runtime_rgb_status_brightness_obj) },
 };
 

From 1d1abd690f0b55d99aa02c322117d82d3ebda815 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Thu, 16 Feb 2023 14:44:03 +0000
Subject: [PATCH 1864/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 141951b5c6..74084bb34d 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: 2023-02-01 22:11+0000\n"
+"PO-Revision-Date: 2023-02-16 19:15+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -2496,7 +2496,7 @@ msgstr ""
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[truncado debido a la longitud]"
 
 #: py/objtype.c
 msgid "__init__() should return None"

From 459f991dfbff2fbe3b2267092d3930c8daf3172c Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 16 Feb 2023 02:12:40 +0000
Subject: [PATCH 1865/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (996 of 996 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 50e1d38efc..ecf54a74b4 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: 2023-02-03 04:15+0000\n"
+"PO-Revision-Date: 2023-02-16 19:15+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -2495,7 +2495,7 @@ msgstr ""
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[truncado devido ao comprimento]"
 
 #: py/objtype.c
 msgid "__init__() should return None"

From 5a955a8740500a134b6e6612c3bb5ec7641033b2 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 16 Feb 2023 20:15:42 +0100
Subject: [PATCH 1866/2403] 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             | 177 +++++++++++++------------
 locale/cs.po             | 193 ++++++++++++++-------------
 locale/de_DE.po          | 268 ++++++++++++++++++++++++--------------
 locale/el.po             | 187 ++++++++++++++-------------
 locale/en_GB.po          | 232 +++++++++++++++++++--------------
 locale/es.po             | 267 ++++++++++++++++++++++++--------------
 locale/fil.po            | 161 ++++++++++++-----------
 locale/fr.po             | 272 +++++++++++++++++++++++++--------------
 locale/hi.po             | 161 ++++++++++++-----------
 locale/it_IT.po          | 171 ++++++++++++------------
 locale/ja.po             | 180 ++++++++++++++------------
 locale/ko.po             | 161 ++++++++++++-----------
 locale/nl.po             | 180 ++++++++++++++------------
 locale/pl.po             | 177 +++++++++++++------------
 locale/pt_BR.po          | 271 ++++++++++++++++++++++++--------------
 locale/ru.po             | 207 ++++++++++++++++-------------
 locale/sv.po             | 266 ++++++++++++++++++++++++--------------
 locale/tr.po             | 190 ++++++++++++++-------------
 locale/zh_Latn_pinyin.po | 267 ++++++++++++++++++++++++--------------
 19 files changed, 2292 insertions(+), 1696 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index d4cd357358..fc74173994 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -33,12 +33,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -91,7 +100,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -536,10 +545,6 @@ msgstr "Nilai array harus berupa byte tunggal."
 msgid "Attempt to allocate %d blocks"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -590,20 +595,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Kedua pin harus mendukung hardware interrut"
@@ -669,12 +667,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Pin bus %d sudah digunakan"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer harus 16 byte."
@@ -809,10 +801,6 @@ msgstr "Menulis CharacteristicBuffer tidak tersedia"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Kode inti CircuitPython mengalami crash. Aduh!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Peregangan clock terlalu panjang"
@@ -852,10 +840,6 @@ msgstr "Tidak dapat memulai interupsi, RX sibuk"
 msgid "Couldn't allocate decoder"
 msgstr "Tidak dapat mengalokasikan dekoder"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Gagal ke HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Terjadi kesalahan saat menginisialisasi kanal DAC"
@@ -947,6 +931,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "Error pada regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1020,7 +1008,7 @@ msgid "Failed to write internal flash."
 msgstr "Gagal menulis flash internal."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1108,6 +1096,15 @@ msgstr "Perangkat keras sibuk, coba pin alternatif"
 msgid "Hardware in use, try alternative pins"
 msgstr "Perangkat keras sedang digunakan, coba pin alternatif"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "operasi I/O pada file tertutup"
@@ -1224,6 +1221,10 @@ msgstr "Kesalahan internal #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1272,10 +1273,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Ukuran potongan format tidak valid"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Akses memori tidak valid."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1564,10 +1561,6 @@ msgstr "Tidak ada file/direktori"
 msgid "No timer available"
 msgstr "Penghitung waktu tidak tersedia"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2033,53 +2026,19 @@ msgid "Temperature read timed out"
 msgstr "Waktu baca suhu habis"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2098,6 +2057,10 @@ msgstr "Tingkat sampel dari sampel tidak cocok dengan mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "signedness dari sampel tidak cocok dengan mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2130,10 +2093,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2225,6 +2184,10 @@ msgstr "Nilai UUID bukan str, int atau byte buffer"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2432,13 +2395,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr "Menulis tidak didukung pada Karakteristik"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4375,6 +4369,21 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Gagal ke HardFault_Handler."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Akses memori tidak valid."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q harus bertipe %q"
 
diff --git a/locale/cs.po b/locale/cs.po
index acda63fa4b..d48c02b952 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -35,12 +35,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Prosím vytvořte tiket s obsahem vaší jednotky CIRCUITPY na adrese\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -92,7 +101,7 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d"
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -537,10 +546,6 @@ msgstr "Hodnoty pole by měly být jednoduché bajty."
 msgid "Attempt to allocate %d blocks"
 msgstr "Pokus o alokování %d bloků"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Pokus o alokaci haldy, když neběží VM."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Konverze audia není implementována"
@@ -591,20 +596,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Velikost bitmapy a počet bitů na hodnotu se musí shodovat"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Bootovací zařízení musí být první (rozhraní #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "RX a TX jsou vyžadovány pro kontrolu toku"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Oba piny musí podporovat hardwarové přerušení"
@@ -670,12 +668,6 @@ msgstr "Buffery musí mít stejnou velikost"
 msgid "Bus pin %d is already in use"
 msgstr "Sběrnicový pin %d je již používán"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bajtový buffer musí být 16 bajtů."
@@ -807,10 +799,6 @@ msgstr "CharacteristicBuffer psaní není poskytováno"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Jádro kódu CircuitPython tvrdě havarovalo. Jejda!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython nedokázal alokovat haldu."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Hodiny jsou příliš dlouhé"
@@ -850,10 +838,6 @@ msgstr "Nelze začít přerušení, RX je zaneprázdněn"
 msgid "Couldn't allocate decoder"
 msgstr "Dekodér nelze přiřadit"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Pád do HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Chyba inicializace kanálu DAC"
@@ -945,6 +929,10 @@ msgstr "Chyba v MIDI přenosu na pozici %d"
 msgid "Error in regex"
 msgstr "Chyba v regulárním výrazu"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1018,8 +1006,8 @@ msgid "Failed to write internal flash."
 msgstr "Nepodařilo se zapsat do interní paměti."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Fatální chyba."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1108,6 +1096,15 @@ msgstr "Hardware je zaneprázdněn, zkuste alternativní piny"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hardware je používán, zkuste alternativní piny"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1224,6 +1221,10 @@ msgstr "Vnitřní chyba #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1272,10 +1273,6 @@ msgstr "Chybný data_pin[%d]"
 msgid "Invalid format chunk size"
 msgstr "Neplatná velikost bloku"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Neplatný přístup k paměti."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Chybná multicastová MAC adresa"
@@ -1564,10 +1561,6 @@ msgstr "Žádný takový soubor / adresář"
 msgid "No timer available"
 msgstr "Není k dispozici žádný časovač"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2022,53 +2015,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2087,6 +2046,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2119,10 +2082,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2214,6 +2173,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2419,13 +2382,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4361,6 +4355,33 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Prosím vytvořte tiket s obsahem vaší jednotky CIRCUITPY na adrese\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Pokus o alokaci haldy, když neběží VM."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "Bootovací zařízení musí být první (rozhraní #0)."
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython nedokázal alokovat haldu."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Pád do HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Fatální chyba."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Neplatný přístup k paměti."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q musí být typu %q"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5c519a09e2..c9d5d3955b 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -34,12 +34,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Bitte melde ein Problem mit dem Inhalt Ihres CIRCUITPY-Laufwerks unter\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -93,7 +102,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -540,10 +549,6 @@ msgstr "Array-Werte sollten aus Einzelbytes bestehen."
 msgid "Attempt to allocate %d blocks"
 msgstr "Versuche %d Blöcke zu allokieren"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Versuchte Heap-Zuordnung wenn VM nicht läuft."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Audio-Konvertierung nicht implementiert"
@@ -594,20 +599,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Bitmap-Grösse und Bits pro Wert müssen übereinstimmen"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Boot-Gerät muss erstes Gerät sein (interface #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Sowohl RX als auch TX sind zu Flusssteuerung erforderlich"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Beim Starten wurden beide Tasten gedrückt.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Beide Pins müssen Hardware-Interrupts unterstützen"
@@ -673,12 +671,6 @@ msgstr "Buffers müssen gleiche Größe haben"
 msgid "Bus pin %d is already in use"
 msgstr "Bus-Pin %d wird schon benutzt"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Beim Starten wurde Taste A gedrückt.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Der Puffer muss 16 Bytes lang sein."
@@ -814,10 +806,6 @@ msgstr "Schreiben von CharacteristicBuffer ist nicht vorgesehen"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Der CircuitPython-Kerncode ist hart abgestürzt. Hoppla!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Clock stretch zu lang"
@@ -858,10 +846,6 @@ msgstr "Interrupt konnte nicht gestartet werden, RX beschäftigt"
 msgid "Couldn't allocate decoder"
 msgstr "Decoder konnte nicht zugeordnet werden"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Absturz in den HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "DAC-Kanal-Initialisierungsfehler"
@@ -955,6 +939,10 @@ msgstr "Fehler in MIDI Datenstrom um Position %d"
 msgid "Error in regex"
 msgstr "Fehler in regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Error: Bind Fehler"
@@ -1029,8 +1017,8 @@ msgid "Failed to write internal flash."
 msgstr "Interner Flash konnte nicht geschrieben werden."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Fataler Fehler."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1121,6 +1109,15 @@ msgstr "Hardware beschäftigt, versuche alternative Pins"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hardware in Benutzung, probiere alternative Pins"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Lese/Schreibe-operation an geschlossener Datei"
@@ -1241,6 +1238,10 @@ msgstr "Interner Fehler #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Der Interne WatchDog Timer ist abgelaufen."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ungültiger %q"
@@ -1289,10 +1290,6 @@ msgstr "Ungültige data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Ungültige format chunk size"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Ungültiger Speicherzugriff."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Ungültige Multicast-MAC-Adresse"
@@ -1582,10 +1579,6 @@ msgstr "Keine solche Datei/Verzeichnis"
 msgid "No timer available"
 msgstr "Kein Timer verfügbar"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Nordic System-Firmware Fehler Assertion."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "Nordic System-Firmware kein Speicher verfügbar"
@@ -2049,62 +2042,21 @@ msgid "Temperature read timed out"
 msgstr "Zeitüberschreitung beim Auslesen der Temperatur"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "Beim Starten wurde die Taste BOOT gedrückt.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
-"Der Heap von CircuitPython wurde beschädigt, weil der Stack zu klein war.\n"
-"Vergrößere den Stack, wenn du weißt, wie. Wenn nicht:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "Beim Starten wurde die Taste SW38 gedrückt.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "Beim Starten wurde die Taste VOLUME gedrückt.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"Das Modul `microcontroller` wurde zum Booten in den abgesicherten Modus "
-"verwendet. Drücke Reset, um den abgesicherten Modus zu verlassen."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 "Die oben genannte Ausnahme war die direkte Ursache für die folgende Ausnahme:"
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "Beim Starten wurde die zentrale Taste gedrückt.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "Beim Starten wurde die linke Taste gedrückt.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Die Länge von rgb_pins muss 6, 12, 18, 24 oder 30 betragen"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"Der Mikrocontroller hatte einen Stromausfall. Vergewisser dich, dass die\n"
-"Stromversorgung genügend Strom für die gesamte Schaltung liefert und\n"
-"drücke Reset (nach dem Auswerfen von CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2124,6 +2076,10 @@ msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 "Die Art des Vorzeichens des Samples stimmt nicht mit dem des Mixers überein"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "Dieser Mikrocontroller unterstützt keine kontinuierliche Erfassung."
@@ -2159,12 +2115,6 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 "Zeitbeschränkung ist zu groß: Maximale Zeitbeschränkung ist %d Sekunden"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-"Zum Beenden setze bitte das Board zurück, ohne den abgesicherten Modus "
-"aufzurufen."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "Zu viele Kanäle im Beispiel"
@@ -2256,6 +2206,10 @@ msgstr "Der UUID-Wert ist kein str-, int- oder Byte-Puffer"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Konnte keine Buffer für Vorzeichenumwandlung allozieren"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Lock kann nicht erzeugt werden"
@@ -2475,16 +2429,45 @@ msgstr "Aufgeweckt durch Alarm.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Schreiben nicht unterstüzt für diese Charakteristik"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "Du befindest dich im abgesicherten Modus, weil:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"Du hast beim Booten die Reset-Taste gedrückt. Drücke sie erneut, um den "
-"abgesicherten Modus zu beenden."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4446,6 +4429,95 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Bitte melde ein Problem mit dem Inhalt Ihres CIRCUITPY-Laufwerks unter\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Versuchte Heap-Zuordnung wenn VM nicht läuft."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "Boot-Gerät muss erstes Gerät sein (interface #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Beim Starten wurden beide Tasten gedrückt.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde Taste A gedrückt.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Absturz in den HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Fataler Fehler."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Ungültiger Speicherzugriff."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Nordic System-Firmware Fehler Assertion."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde die Taste BOOT gedrückt.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "Der Heap von CircuitPython wurde beschädigt, weil der Stack zu klein "
+#~ "war.\n"
+#~ "Vergrößere den Stack, wenn du weißt, wie. Wenn nicht:"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde die Taste SW38 gedrückt.\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde die Taste VOLUME gedrückt.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "Das Modul `microcontroller` wurde zum Booten in den abgesicherten Modus "
+#~ "verwendet. Drücke Reset, um den abgesicherten Modus zu verlassen."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde die zentrale Taste gedrückt.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "Beim Starten wurde die linke Taste gedrückt.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "Der Mikrocontroller hatte einen Stromausfall. Vergewisser dich, dass die\n"
+#~ "Stromversorgung genügend Strom für die gesamte Schaltung liefert und\n"
+#~ "drücke Reset (nach dem Auswerfen von CIRCUITPY)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr ""
+#~ "Zum Beenden setze bitte das Board zurück, ohne den abgesicherten Modus "
+#~ "aufzurufen."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "Du befindest dich im abgesicherten Modus, weil:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "Du hast beim Booten die Reset-Taste gedrückt. Drücke sie erneut, um den "
+#~ "abgesicherten Modus zu beenden."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."
diff --git a/locale/el.po b/locale/el.po
index 904d89846a..6f8d4e4be0 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -38,13 +38,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Παρακαλώ δημιουγήστε ενα πρόβλημα με τα περιεχόμενα του CIRCUITPY δίσκου "
-"στο\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -97,7 +105,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -543,10 +551,6 @@ msgstr "Η τιμές της παράταξη πρέπει να είναι μο
 msgid "Attempt to allocate %d blocks"
 msgstr "Προσπάθεια να δεσμευτούν %d blocks"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Προσπάθεια δέσμευσης heap όταν το VM δεν τρέχει."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Η μετατροπή ήχου δεν υποστηρίζεται"
@@ -597,20 +601,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Το μέγεθος του bitmap και τα bits ανα τιμή πρέπει να ταιριάζουν"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Η συσκευή boot πρέπει να είναι η πρώτη συσκευή (interface #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Και RX και TX απαιτούνται για έλεγχο flow"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Και τα δύο pin πρέπει να υποστηρίζουν interrupts υλικού"
@@ -676,12 +673,6 @@ msgstr "Τα Buffers πρέπει να είναι του ιδίου μεγέθο
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d είναι ήδη σε χρήση"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer πρέπει να είναι 16 bytes."
@@ -820,10 +811,6 @@ msgstr "Δεν υποστηρίζονται εγγραφές στο Characterist
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Ο πυρήνας της CircuitPython κατέρευσε. Οουπς!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "Η CircuitPython δεν μπορέσε να δεσμεύσει το heap."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Stretch ρολογιού πολύ μεγάλο"
@@ -864,10 +851,6 @@ msgstr "Δεν μπόρεσε να εκκινηθεί το interrupt, RX κατ
 msgid "Couldn't allocate decoder"
 msgstr "Δεν μπόρεσε να δεσμευτεί decoder"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Κατέρευσε μέσα στο HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Σφάλμα εκκίνησης καναλιού DAC"
@@ -959,6 +942,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1032,7 +1019,7 @@ msgid "Failed to write internal flash."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1120,6 +1107,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1234,6 +1230,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1282,10 +1282,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1574,10 +1570,6 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2031,53 +2023,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2096,6 +2054,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2128,10 +2090,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2223,6 +2181,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2428,13 +2390,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4370,6 +4363,28 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Παρακαλώ δημιουγήστε ενα πρόβλημα με τα περιεχόμενα του CIRCUITPY δίσκου "
+#~ "στο\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Προσπάθεια δέσμευσης heap όταν το VM δεν τρέχει."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "Η συσκευή boot πρέπει να είναι η πρώτη συσκευή (interface #0)."
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "Η CircuitPython δεν μπορέσε να δεσμεύσει το heap."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Κατέρευσε μέσα στο HardFault_Handler."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q πρέπει να είναι τύπου %q"
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index d9b6508b05..aba4255e9b 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -37,12 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -95,7 +104,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -540,10 +549,6 @@ msgstr "Array values should be single bytes."
 msgid "Attempt to allocate %d blocks"
 msgstr "Attempt to allocate %d blocks"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Attempted heap allocation when VM not running."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Audio conversion not implemented"
@@ -594,20 +599,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Both RX and TX required for flow control"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Both pins must support hardware interrupts"
@@ -673,12 +671,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d is already in use"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer must be 16 bytes."
@@ -809,10 +801,6 @@ msgstr "CharacteristicBuffer writing not provided"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPython core code crashed hard. Crikey!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython was unable to allocate the heap."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Clock stretch too long"
@@ -853,10 +841,6 @@ msgstr "Could not start interrupt, RX busy"
 msgid "Couldn't allocate decoder"
 msgstr "Couldn't allocate decoder"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Crash into the HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "DAC channel init error"
@@ -948,6 +932,10 @@ msgstr "Error in MIDI stream at position %d"
 msgid "Error in regex"
 msgstr "Error in regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Error: Failure to bind"
@@ -1021,8 +1009,8 @@ msgid "Failed to write internal flash."
 msgstr "Failed to write internal flash."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Fatal error."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1109,6 +1097,15 @@ msgstr "Hardware busy, try alternative pins"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hardware in use, try alternative pins"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "I/O operation on closed file"
@@ -1225,6 +1222,10 @@ msgstr "Internal error #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Invalid %q"
@@ -1273,10 +1274,6 @@ msgstr "Invalid data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Invalid format chunk size"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Invalid memory access."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1565,10 +1562,6 @@ msgstr "No such file/directory"
 msgid "No timer available"
 msgstr "No timer available"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Nordic system firmware failure assertion."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "Nordic system firmware out of memory"
@@ -2028,61 +2021,20 @@ msgid "Temperature read timed out"
 msgstr "Temperature read timed out"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2100,6 +2052,10 @@ msgstr "The sample's sample rate does not match the mixer's"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "The sample's signedness does not match the mixer's"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2132,10 +2088,6 @@ msgstr "Time is in the past."
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Timeout is too long: Maximum timeout length is %d seconds"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2227,6 +2179,10 @@ msgstr "UUID value is not str, int or byte buffer"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Unable to allocate buffers for signed conversion"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Unable to create lock"
@@ -2434,15 +2390,45 @@ msgstr "Woken up by alarm.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Writes not supported on Characteristic"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"You pressed the reset button during boot. Press again to exit safe mode."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4380,6 +4366,64 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Attempted heap allocation when VM not running."
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython was unable to allocate the heap."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Crash into the HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Fatal error."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Invalid memory access."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Nordic system firmware failure assertion."
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "You are in safe mode because:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+
 #~ msgid "Expected a %q"
 #~ msgstr "Expected a %q"
 
diff --git a/locale/es.po b/locale/es.po
index 74084bb34d..8b3496cb65 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -37,12 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Presente un problema con el contenido de su unidad CIRCUITPY en\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -96,7 +105,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -543,10 +552,6 @@ msgstr "Valores del array deben ser bytes individuales."
 msgid "Attempt to allocate %d blocks"
 msgstr "Tratando de localizar %d bloques"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Asignación del montículo mientras la VM no esta ejecutándose."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Conversión de audio no esta implementada"
@@ -597,21 +602,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "El tamaño del mapa de bits y los bits por valor deben cotejar"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
-"El dispositivo de arranque debe de ser el primer dispositivo (interfase #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Ambos RX y TX requeridos para control de flujo"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Ambos botones fueron prensados al inicio\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ambos pines deben soportar interrupciones por hardware"
@@ -678,12 +675,6 @@ msgstr "Búferes deben ser del mismo tamaño"
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d ya está siendo utilizado"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Botón A fue presionado al inicio.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Búfer Byte debe de ser 16 bytes."
@@ -820,10 +811,6 @@ msgstr "CharateristicBuffer escritura no proporcionada"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "El código central de CircuitPython se estrelló con fuerza. ¡Whoops!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython no puedo encontrar el montículo."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Estirado de reloj demasiado largo"
@@ -864,10 +851,6 @@ msgstr "No se pudo iniciar la interrupción, RX ocupado"
 msgid "Couldn't allocate decoder"
 msgstr "No se pudo encontrar el decodificador"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Choque contra el HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Error de inicio del canal DAC"
@@ -960,6 +943,10 @@ msgstr "Error en el flujo MIDI en la posición %d"
 msgid "Error in regex"
 msgstr "Error en regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Error: fallo al vincular"
@@ -1033,8 +1020,8 @@ msgid "Failed to write internal flash."
 msgstr "Error al escribir el flash interno."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Error grave."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1127,6 +1114,15 @@ msgstr "Hardware ocupado, pruebe pines alternativos"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hardware en uso, pruebe pines alternativos"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Operación I/O en archivo cerrado"
@@ -1250,6 +1246,10 @@ msgstr "Error interno #%d"
 msgid "Internal watchdog timer expired."
 msgstr "El temporizador interno watchdog terminó."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q inválido"
@@ -1298,10 +1298,6 @@ msgstr "Inválidos los data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Formato de fragmento de formato no válido"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Acceso a memoria no válido."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Dirección MAC de multidifusión inválida"
@@ -1594,10 +1590,6 @@ msgstr "No existe el archivo/directorio"
 msgid "No timer available"
 msgstr "No hay temporizador disponible"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Falla en la aserción del firmware del dispositivo Nordic."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "El firmware del sistema Nordic no tiene memoria"
@@ -2064,62 +2056,20 @@ msgid "Temperature read timed out"
 msgstr "Lectura de temperatura expirada"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "El boton BOOT fur presionado durante el arranque.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
-"El montículo de CircuitPython está corrupto porque la pila era muy pequeña.\n"
-"Aumente el tamaño de pila si sabe como. De lo contrario:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "El boton SW38 fue presionado durante el arranque.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "El boton de Volumen fue presionado durante el arranque.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"El módulo de `microcontroller` se usó para un arranque en modo seguro. "
-"Presione reset para salir del modo seguro."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "La excepción fue la causa directa de la excepción siguiente:"
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "El boton central fue presionado durante el arranque.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "El boton izquierdo fue presionado durante el arranque.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"La corriente eléctrica de la microcontroladora bajó. Asegúrate que tu fuente "
-"de poder provee\n"
-"suficiente corriente para todo el circuito y presiones reset (luego de "
-"expulsar CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2137,6 +2087,10 @@ msgstr "El sample rate del sample no iguala al del mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "El signo del sample no iguala al del mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "Este microcontrolador no soporta captura continua."
@@ -2173,10 +2127,6 @@ msgstr ""
 "Tiempo de espera demasiado largo: El tiempo máximo de espera es de %d "
 "segundos"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr "Para salir, por favor reinicialice la tarjeta sin pedir safe mode."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "Demasiados canales en la muestra"
@@ -2268,6 +2218,10 @@ msgstr "UUID valor no es un str, int o byte buffer"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "No se pudieron asignar buffers para la conversión con signo"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "No se puede crear bloqueo"
@@ -2483,16 +2437,45 @@ msgstr "Despertado por la alarma.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Escrituras no admitidas en Characteristic"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "Estás en modo seguro por la razón:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"Has presionado el botón de reset durante el arranque. Presiones de nuevo "
-"para salir del modo seguro."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4444,6 +4427,96 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Presente un problema con el contenido de su unidad CIRCUITPY en\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Asignación del montículo mientras la VM no esta ejecutándose."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr ""
+#~ "El dispositivo de arranque debe de ser el primer dispositivo (interfase "
+#~ "#0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Ambos botones fueron prensados al inicio\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Botón A fue presionado al inicio.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython no puedo encontrar el montículo."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Choque contra el HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Error grave."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Acceso a memoria no válido."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Falla en la aserción del firmware del dispositivo Nordic."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "El boton BOOT fur presionado durante el arranque.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "El montículo de CircuitPython está corrupto porque la pila era muy "
+#~ "pequeña.\n"
+#~ "Aumente el tamaño de pila si sabe como. De lo contrario:"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "El boton SW38 fue presionado durante el arranque.\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "El boton de Volumen fue presionado durante el arranque.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "El módulo de `microcontroller` se usó para un arranque en modo seguro. "
+#~ "Presione reset para salir del modo seguro."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "El boton central fue presionado durante el arranque.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "El boton izquierdo fue presionado durante el arranque.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "La corriente eléctrica de la microcontroladora bajó. Asegúrate que tu "
+#~ "fuente de poder provee\n"
+#~ "suficiente corriente para todo el circuito y presiones reset (luego de "
+#~ "expulsar CIRCUITPY)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr "Para salir, por favor reinicialice la tarjeta sin pedir safe mode."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "Estás en modo seguro por la razón:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "Has presionado el botón de reset durante el arranque. Presiones de nuevo "
+#~ "para salir del modo seguro."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."
diff --git a/locale/fil.po b/locale/fil.po
index 4f7cf38dd7..7da4d6ce83 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -32,8 +32,20 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
 msgstr ""
 
 #: py/obj.c
@@ -86,7 +98,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -533,10 +545,6 @@ msgstr "Array values ay dapat single bytes."
 msgid "Attempt to allocate %d blocks"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -587,20 +595,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ang parehong mga pin ay dapat na sumusuporta sa hardware interrupts"
@@ -666,12 +667,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Ginagamit na ang DAC"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 #, fuzzy
 msgid "Byte buffer must be 16 bytes."
@@ -804,10 +799,6 @@ msgstr ""
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Masyadong mahaba ang Clock stretch"
@@ -846,10 +837,6 @@ msgstr ""
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -944,6 +931,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "May pagkakamali sa REGEX"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1017,7 +1008,7 @@ msgid "Failed to write internal flash."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1105,6 +1096,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "I/O operasyon sa saradong file"
@@ -1221,6 +1221,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1269,10 +1273,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Mali ang format ng chunk size"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1561,10 +1561,6 @@ msgstr "Walang file/directory"
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2020,53 +2016,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2085,6 +2047,10 @@ msgstr "Ang sample rate ng sample ay hindi tugma sa mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "Ang signedness ng sample hindi tugma sa mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2117,10 +2083,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2212,6 +2174,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Hindi ma-allocate ang buffers para sa naka-sign na conversion"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2419,13 +2385,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
diff --git a/locale/fr.po b/locale/fr.po
index 58fbaf79a2..4919bcebff 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -37,13 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Veuillez signaler un problème avec le contenu de votre lecteur CIRCUITPY à "
-"l'adresse\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -97,7 +105,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -542,12 +550,6 @@ msgstr "Les valeurs de la matrice doivent être des octets singuliers."
 msgid "Attempt to allocate %d blocks"
 msgstr "Tentative d'allocation de %d blocs"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-"Tentative d'allocation à la pile quand la Machine Virtuelle n'est pas en "
-"exécution."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "La conversion audio n'est pas implémentée"
@@ -600,20 +602,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "La dimension et la taille en bits de l'image doivent correspondre"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "L'appareil de démarrage doit être le premier (interface #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "RX et TX requis pour le contrôle de flux"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Les deux boutons étaient pressés au démarrage.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Les deux broches doivent supporter les interruptions matérielles"
@@ -679,12 +674,6 @@ msgstr "Les tampons doivent avoir la même taille"
 msgid "Bus pin %d is already in use"
 msgstr "La broche %d du bus est déjà utilisée"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Le bouton A était pressé au démarrage.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Le tampon doit être de 16 octets."
@@ -827,10 +816,6 @@ msgstr "Ecriture sur 'CharacteristicBuffer' non fournie"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Le code principal de CircuitPython s'est complètement planté. Oups !\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython n'as pu faire l'allocation de la pile."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Période de l'horloge trop longue"
@@ -871,10 +856,6 @@ msgstr "Impossible de démarrer l'interruption, RX occupé"
 msgid "Couldn't allocate decoder"
 msgstr "Impossible d'allouer le décodeur"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Échec vers le HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Erreur d'initialisation du canal DAC"
@@ -968,6 +949,10 @@ msgstr "Erreur dans le flot MIDI à la position %d"
 msgid "Error in regex"
 msgstr "Erreur dans l'expression régulière"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Erreur : Impossible de lier"
@@ -1042,8 +1027,8 @@ msgid "Failed to write internal flash."
 msgstr "Échec de l'écriture vers flash interne."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Erreurre fatale."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1137,6 +1122,15 @@ msgstr "Matériel occupé, essayez d'autres broches"
 msgid "Hardware in use, try alternative pins"
 msgstr "Matériel utilisé, essayez d'autres broches"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Opération d'E/S sur un fichier fermé"
@@ -1263,6 +1257,10 @@ msgstr "Erreur interne #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Le minuteur du watchdog interne a expiré."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q invalide"
@@ -1311,10 +1309,6 @@ msgstr "data_pins[%d] invalide"
 msgid "Invalid format chunk size"
 msgstr "Taille de bloc de formatage invalide"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Accès à la mémoire invalide."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Adresse MAC multicast invalide"
@@ -1607,10 +1601,6 @@ msgstr "Fichier/répertoire introuvable"
 msgid "No timer available"
 msgstr "Aucun minuteur disponible"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Assertion échouée du logiciel système Nordic."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "Logiciel système Nordic n'a plus de mémoire"
@@ -2077,62 +2067,20 @@ msgid "Temperature read timed out"
 msgstr "Délais de lecture de température dépassée"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "Le bouton BOOT était pressé au démarrage.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
-"La pile de CircuitPython est corrompue parce que la pile était trop petite.\n"
-"Augmentez la taille de la pile si vous savez comment. Sinon :"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "Le bouton SW38 était pressé au démarrage.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "Le bouton VOLUME était pressé au démarrage.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"Le module `microcontroller` a été utilisé pour démarrer en mode sûr. Pressez "
-"reset pour quitter le mode sûr."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "Le bouton central était pressé au démarrage.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "Le bouton gauche était pressé au démarrage.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "La taille de rgb_pins doit être 6, 12, 18, 24 ou 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"L'alimentation du microcontrôleur a diminué. Veillez à ce que votre "
-"alimentation fournisse\n"
-"assez de puissance pour tout le circuit, puis appuyez sur 'reset' (après "
-"avoir éjecté CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2151,6 +2099,10 @@ msgstr "L'échantillonage de l'échantillon ne correspond pas à celui du mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "Le signe de l'échantillon ne correspond pas à celui du mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "Ce microcontrôleur ne support pas la capture continue."
@@ -2185,10 +2137,6 @@ msgstr "L'heure est dans le passé."
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Le délai est trop long : le délai maximal est de %d secondes"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr "Pour le quitter, redémarrez sans demander le mode sans-échec."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "Trop de canaux dans l'échantillon"
@@ -2284,6 +2232,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Impossible d'allouer des tampons pour une conversion signée"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Impossible de créer un verrou ('lock')"
@@ -2501,16 +2453,45 @@ msgstr "Réveil par alarme.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Écritures non supporté vers les Characteristic"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "Vous êtres en mode sûr parce que :\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"Vous avez pressé le bouton reset pendant le démarrage. Pressez-le à nouveau "
-"pour sortir du mode sûr."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4471,6 +4452,97 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Veuillez signaler un problème avec le contenu de votre lecteur CIRCUITPY "
+#~ "à l'adresse\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr ""
+#~ "Tentative d'allocation à la pile quand la Machine Virtuelle n'est pas en "
+#~ "exécution."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "L'appareil de démarrage doit être le premier (interface #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Les deux boutons étaient pressés au démarrage.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Le bouton A était pressé au démarrage.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython n'as pu faire l'allocation de la pile."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Échec vers le HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Erreurre fatale."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Accès à la mémoire invalide."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Assertion échouée du logiciel système Nordic."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "Le bouton BOOT était pressé au démarrage.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "La pile de CircuitPython est corrompue parce que la pile était trop "
+#~ "petite.\n"
+#~ "Augmentez la taille de la pile si vous savez comment. Sinon :"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "Le bouton SW38 était pressé au démarrage.\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "Le bouton VOLUME était pressé au démarrage.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "Le module `microcontroller` a été utilisé pour démarrer en mode sûr. "
+#~ "Pressez reset pour quitter le mode sûr."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "Le bouton central était pressé au démarrage.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "Le bouton gauche était pressé au démarrage.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "L'alimentation du microcontrôleur a diminué. Veillez à ce que votre "
+#~ "alimentation fournisse\n"
+#~ "assez de puissance pour tout le circuit, puis appuyez sur 'reset' (après "
+#~ "avoir éjecté CIRCUITPY)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr "Pour le quitter, redémarrez sans demander le mode sans-échec."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "Vous êtres en mode sûr parce que :\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "Vous avez pressé le bouton reset pendant le démarrage. Pressez-le à "
+#~ "nouveau pour sortir du mode sûr."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."
diff --git a/locale/hi.po b/locale/hi.po
index 84482dd969..94dda9b2d1 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -31,8 +31,20 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
 msgstr ""
 
 #: py/obj.c
@@ -85,7 +97,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -530,10 +542,6 @@ msgstr ""
 msgid "Attempt to allocate %d blocks"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -582,20 +590,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -661,12 +662,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""
@@ -797,10 +792,6 @@ msgstr ""
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr ""
@@ -839,10 +830,6 @@ msgstr ""
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -934,6 +921,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1007,7 +998,7 @@ msgid "Failed to write internal flash."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1095,6 +1086,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1209,6 +1209,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1257,10 +1261,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1549,10 +1549,6 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2004,53 +2000,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2069,6 +2031,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2101,10 +2067,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2196,6 +2158,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2401,13 +2367,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
diff --git a/locale/it_IT.po b/locale/it_IT.po
index f52f91e2fa..a0b50f6d24 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -34,12 +34,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Per favore, segnala il problema con il contenuto del tuo CIRCUITPY a\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -92,7 +101,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -539,10 +548,6 @@ msgstr "I valori dell'Array dovrebbero essere bytes singoli."
 msgid "Attempt to allocate %d blocks"
 msgstr "Provo ad allocare %d blocchi"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -594,20 +599,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Sia RX che TX richiedono il controllo del flow"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Entrambi i pin devono supportare gli interrupt hardware"
@@ -673,12 +671,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d è già in uso"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "I buffer byte devono essere di almeno 16 bytes."
@@ -810,10 +802,6 @@ msgstr "CharacteristicBuffer scritura non dato"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Orologio e troppo allungato"
@@ -852,10 +840,6 @@ msgstr ""
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -949,6 +933,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "Errore nella regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1022,7 +1010,7 @@ msgid "Failed to write internal flash."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1110,6 +1098,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "operazione I/O su file chiuso"
@@ -1226,6 +1223,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1274,10 +1275,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1567,10 +1564,6 @@ msgstr "Nessun file/directory esistente"
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2030,53 +2023,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2095,6 +2054,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2127,10 +2090,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2222,6 +2181,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Ipossibilitato ad allocare buffer per la conversione con segno"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2429,13 +2392,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4394,6 +4388,15 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Per favore, segnala il problema con il contenuto del tuo CIRCUITPY a\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
 #~ msgid "Expected a %q"
 #~ msgstr "Atteso un %q"
 
diff --git a/locale/ja.po b/locale/ja.po
index cd28a37893..bfd8471f38 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -37,12 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"CIRCUITPYドライブの内容を添えて問題を以下で報告してください：\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -94,7 +103,7 @@ msgstr "%dアドレスピン、%dRGBピン、%dタイルは%dの高さを指示
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 #, fuzzy
 msgid "%q"
 msgstr "%q"
@@ -540,10 +549,6 @@ msgstr "Arrayの各値は1バイトでなければなりません"
 msgid "Attempt to allocate %d blocks"
 msgstr "%d個のブロックの確保を試みました"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -594,20 +599,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "フロー制御のためRXとTXの両方が必要"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "両方のピンにハードウェア割り込み対応が必要"
@@ -673,12 +671,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Busピン%dはすでに使用中"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "バッファは16バイトでなければなりません"
@@ -811,10 +803,6 @@ msgstr ""
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPythonのコアコードが激しくクラッシュしました。おっと！\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPythonはヒープを確保できませんでした"
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "クロックのストレッチが長すぎ"
@@ -853,10 +841,6 @@ msgstr "割り込みをスタートできません。RXビジー"
 msgid "Couldn't allocate decoder"
 msgstr "デコーダを確保できません"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "クラッシュしてHardFault_Handlerに入りました"
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "DACチャネル初期化エラー"
@@ -948,6 +932,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "正規表現にエラーがあります"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1021,7 +1009,7 @@ msgid "Failed to write internal flash."
 msgstr "内部フラッシュ書き込みに失敗"
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1109,6 +1097,15 @@ msgstr "ハードウェアビジー。代替のピンを試してください"
 msgid "Hardware in use, try alternative pins"
 msgstr "ハードウェア使用中。代わりのピンを試してください"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "閉じられたファイルへのI/O操作"
@@ -1225,6 +1222,10 @@ msgstr "内部エラー #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "不正な %q"
@@ -1273,10 +1274,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "フォーマットチャンクのサイズが不正"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "不正なメモリアクセス"
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1565,10 +1562,6 @@ msgstr "指定されたファイル/ディレクトリはありません"
 msgid "No timer available"
 msgstr "利用できるタイマーなし"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2023,53 +2016,19 @@ msgid "Temperature read timed out"
 msgstr "温度読み取りがタイムアウトしました"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2088,6 +2047,10 @@ msgstr "サンプルレートがサンプルとミキサーで一致しません
 msgid "The sample's signedness does not match the mixer's"
 msgstr "符号の有無がサンプルとミキサーで一致しません"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2120,10 +2083,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "タイムアウトが長すぎです。最大のタイムアウト長は%d秒"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2216,6 +2175,10 @@ msgstr "UUIDの値がstr, int, bufferのいずれでもありません"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2421,13 +2384,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4370,6 +4364,24 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "CIRCUITPYドライブの内容を添えて問題を以下で報告してください：\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPythonはヒープを確保できませんでした"
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "クラッシュしてHardFault_Handlerに入りました"
+
+#~ msgid "Invalid memory access."
+#~ msgstr "不正なメモリアクセス"
+
 #~ msgid "Expected a %q"
 #~ msgstr "%qが必要"
 
diff --git a/locale/ko.po b/locale/ko.po
index a5f1c477e2..daa474f57d 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -32,8 +32,20 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
 msgstr ""
 
 #: py/obj.c
@@ -86,7 +98,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -531,10 +543,6 @@ msgstr ""
 msgid "Attempt to allocate %d blocks"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -585,20 +593,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr ""
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr ""
@@ -664,12 +665,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "잘못된 크기의 버퍼. 16 바이트 여야합니다."
@@ -800,10 +795,6 @@ msgstr ""
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr ""
@@ -842,10 +833,6 @@ msgstr ""
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -937,6 +924,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "Regex에 오류가 있습니다."
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1010,7 +1001,7 @@ msgid "Failed to write internal flash."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1098,6 +1089,15 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1212,6 +1212,10 @@ msgstr ""
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr ""
@@ -1260,10 +1264,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "형식 청크 크기가 잘못되었습니다"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr ""
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1552,10 +1552,6 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2007,53 +2003,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2072,6 +2034,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2104,10 +2070,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2200,6 +2162,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2405,13 +2371,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
diff --git a/locale/nl.po b/locale/nl.po
index f3c63f14e9..142e538a28 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -31,12 +31,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Meld een probleem met de inhoud van de CIRCUITPY drive op:\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -88,7 +97,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -533,10 +542,6 @@ msgstr "Array waardes moet enkele bytes zijn."
 msgid "Attempt to allocate %d blocks"
 msgstr "Poging om %d blokken toe te wijzen"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -587,20 +592,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "RX en TX zijn beide vereist voor stroomregeling"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Beide pinnen moeten hardware interrupts ondersteunen"
@@ -666,12 +664,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d al in gebruik"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte buffer moet 16 bytes zijn."
@@ -803,10 +795,6 @@ msgstr "CharacteristicBuffer schrijven is niet beschikbaar"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPython core code is hard gecrashed. Ojee!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython kon het heap geheugen niet toewijzen."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Clock stretch is te lang"
@@ -847,10 +835,6 @@ msgstr "Kan interrupt niet starten, RX is bezig"
 msgid "Couldn't allocate decoder"
 msgstr "Kan decoder niet alloceren"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Crash naar de HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "DAC kanaal Init Fout"
@@ -942,6 +926,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "Fout in regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1015,7 +1003,7 @@ msgid "Failed to write internal flash."
 msgstr "Schrijven naar interne flash mislukt."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1104,6 +1092,15 @@ msgstr "Hardware bezig, probeer alternatieve pinnen"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hardware in gebruik, probeer alternatieve pinnen"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "I/O actie op gesloten bestand"
@@ -1220,6 +1217,10 @@ msgstr "Interne fout #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ongeldige %q"
@@ -1268,10 +1269,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Ongeldig formaat stuk grootte"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Ongeldig geheugen adres."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1560,10 +1557,6 @@ msgstr "Bestand/map bestaat niet"
 msgid "No timer available"
 msgstr "Geen timer beschikbaar"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2028,53 +2021,19 @@ msgid "Temperature read timed out"
 msgstr "Temperatuur lees time-out"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "De lengte van rgb_pins moet 6, 12, 18, 24 of 30 zijn"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2093,6 +2052,10 @@ msgstr "De sample's sample rate komt niet overeen met die van de mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "De sample's signature komt niet overeen met die van de mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2125,10 +2088,6 @@ msgstr "Tijdstip ligt in het verleden."
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Time-out is te lang. Maximale time-out lengte is %d seconden"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2220,6 +2179,10 @@ msgstr "UUID waarde is geen str, int, of byte buffer"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Niet in staat buffers voor gesigneerde conversie te alloceren"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Kan vergrendeling niet maken"
@@ -2431,13 +2394,44 @@ msgstr "Gewekt door alarm.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Schrijven niet ondersteund op Characteristic"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4380,6 +4374,24 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Meld een probleem met de inhoud van de CIRCUITPY drive op:\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython kon het heap geheugen niet toewijzen."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Crash naar de HardFault_Handler."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Ongeldig geheugen adres."
+
 #~ msgid "Expected a %q"
 #~ msgstr "Verwacht een %q"
 
diff --git a/locale/pl.po b/locale/pl.po
index 548c79e9d0..10c5daf794 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -33,12 +33,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Zgłoś problem z zawartością dysku CIRCUITPY pod adresem\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -90,7 +99,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr ""
 
@@ -535,10 +544,6 @@ msgstr "Wartości powinny być bajtami."
 msgid "Attempt to allocate %d blocks"
 msgstr "Próba przydzielenia %d bloków"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr ""
@@ -589,20 +594,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Do kontroli przepływu wymagane są zarówno RX, jak i TX"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Obie nóżki muszą wspierać przerwania sprzętowe"
@@ -668,12 +666,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr "Nóżka magistrali %d jest w użyciu"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bufor musi mieć 16 bajtów."
@@ -804,10 +796,6 @@ msgstr "Pisanie do CharacteristicBuffer niewspierane"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython nie mógł przydzielić sterty."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Rozciągnięcie zegara zbyt duże"
@@ -848,10 +836,6 @@ msgstr "Nie można rozpocząć przerwania, RX jest zajęty"
 msgid "Couldn't allocate decoder"
 msgstr "Nie udało się przydzielić dekodera"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Błąd inicjalizacji kanału DAC"
@@ -943,6 +927,10 @@ msgstr ""
 msgid "Error in regex"
 msgstr "Błąd w regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr ""
@@ -1016,7 +1004,7 @@ msgid "Failed to write internal flash."
 msgstr "Nie udało się zapisać wewnętrznej pamięci flash."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1104,6 +1092,15 @@ msgstr "Sprzęt zajęty, wypróbuj alternatywne piny"
 msgid "Hardware in use, try alternative pins"
 msgstr "Sprzęt w użyciu, wypróbuj alternatywne piny"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Operacja I/O na zamkniętym pliku"
@@ -1220,6 +1217,10 @@ msgstr "Błąd wewnętrzny #%d"
 msgid "Internal watchdog timer expired."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Nieprawidłowe %q"
@@ -1268,10 +1269,6 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Zła wielkość fragmentu formatu"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Nieprawidłowy dostęp do pamięci."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1560,10 +1557,6 @@ msgstr "Brak pliku/katalogu"
 msgid "No timer available"
 msgstr "Brak dostępnego timera"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2015,53 +2008,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2080,6 +2039,10 @@ msgstr "Sample rate nie pasuje do miksera"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "Znak nie pasuje do miksera"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2112,10 +2075,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2207,6 +2166,10 @@ msgstr "UUID nie jest typu str, int lub bytes"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Nie udała się alokacja buforów do konwersji ze znakiem"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2412,13 +2375,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4356,6 +4350,21 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Zgłoś problem z zawartością dysku CIRCUITPY pod adresem\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython nie mógł przydzielić sterty."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Nieprawidłowy dostęp do pamięci."
+
 #~ msgid "Expected a %q"
 #~ msgstr "Oczekiwano %q"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index ecf54a74b4..cb68940269 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -35,12 +35,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Registre um problema com o conteúdo do seu controlador no CIRCUITPY\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -94,7 +103,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -543,11 +552,6 @@ msgstr "Os valores das matrizes devem ser bytes simples."
 msgid "Attempt to allocate %d blocks"
 msgstr "Tentativa de alocar %d blocos"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr ""
-"Tentativa de alocação das pilhas quando o VM não estiver em funcionamento."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "A conversão de áudio ainda não foi implementada"
@@ -600,22 +604,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "O tamanho do bitmap e os bits por valor devem coincidir"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
+msgid "Boot device must be first (interface #0)."
 msgstr ""
-"O dispositivo de inicialização deve ser o primeiro dispositivo (interface "
-"#0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Ambos os RX e TX são necessários para o controle do fluxo"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Ambos os botões foram pressionados na inicialização.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Ambos os pinos devem suportar interrupções de hardware"
@@ -681,12 +676,6 @@ msgstr "Os buffers devem ter o mesmo tamanho"
 msgid "Bus pin %d is already in use"
 msgstr "O pino bus %d já está em uso"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "O botão A foi pressionado na inicialização.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "O buffer deve ter 16 bytes."
@@ -823,10 +812,6 @@ msgstr "Escrita CharacteristicBuffer não informada"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "O núcleo principal do CircuitPython falhou feio. Ops!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "O CircuitPython não conseguiu alocar o heap."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Clock se estendeu por tempo demais"
@@ -866,10 +851,6 @@ msgstr "Não foi possível iniciar a interrupção, RX ocupado"
 msgid "Couldn't allocate decoder"
 msgstr "Não foi possível alocar o decodificador"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Falha no HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Erro de Inicialização do Canal DAC"
@@ -961,6 +942,10 @@ msgstr "Houve um erro no fluxo MIDI na posição %d"
 msgid "Error in regex"
 msgstr "Erro no regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Erro: Falha na vinculação"
@@ -1034,8 +1019,8 @@ msgid "Failed to write internal flash."
 msgstr "Falha ao gravar o flash interno."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Erro fatal."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1126,6 +1111,15 @@ msgstr "O hardware está ocupado, tente os pinos alternativos"
 msgid "Hardware in use, try alternative pins"
 msgstr "O hardware está em uso, tente os pinos alternativos"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Operação I/O no arquivo fechado"
@@ -1248,6 +1242,10 @@ msgstr "Erro interno #%d"
 msgid "Internal watchdog timer expired."
 msgstr "O temporizador do watchdog interno expirou."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "%q Inválido"
@@ -1296,10 +1294,6 @@ msgstr "data_pins[%d] inválido"
 msgid "Invalid format chunk size"
 msgstr "Tamanho do pedaço de formato inválido"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "O acesso da memória é inválido."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Endereço MAC multicast inválido"
@@ -1590,10 +1584,6 @@ msgstr "Este arquivo/diretório não existe"
 msgid "No timer available"
 msgstr "Não há um temporizador disponível"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Declaração de falha do firmware do sistema nórdico."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "O firmware do sistema nórdico está sem memória"
@@ -2060,63 +2050,20 @@ msgid "Temperature read timed out"
 msgstr "A leitura da temperatura expirou"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "O botão BOOT foi pressionado na inicialização.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
-"A área de alocação dinâmica de variáveis (heap) do CircuitPython foi "
-"corrompido pois a pilha era muito pequena.\n"
-"Aumente o tamanho da pilha se souber como. Senão:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "O botão SW38 foi pressionado na inicialização.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "O botão VOLUME foi pressionado na inicialização.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"O módulo `microcontrolador` foi utilizado para iniciar em modo seguro. "
-"Pressione reset para encerrar do modo de segurança."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "A exceção acima foi a causa direta da seguinte exceção:"
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "O botão central foi pressionado na inicialização.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "O botão esquerdo foi pressionado na inicialização.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "O comprimento dos rgb_pins devem ser 6, 12, 18, 24, ou 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"O alimentação do micro controlador diminuiu. Certifique-se de que a sua "
-"fonte de alimentação fornece\n"
-"corrente suficiente para todo o circuito e pressione reset (depois de ejetar "
-"o CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2134,6 +2081,10 @@ msgstr "A taxa de amostragem da amostra não coincide com a do mixer"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "A amostragem \"signedness\" não coincide com a do mixer"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "Este microcontrolador não tem suporte para captura contínua."
@@ -2170,10 +2121,6 @@ msgstr ""
 "O tempo limite é long demais: O comprimento máximo do tempo limite é de %d "
 "segundos"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr "Para sair, reinicie a placa sem solicitar o modo de segurança."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "Muitos canais na amostra"
@@ -2266,6 +2213,10 @@ msgstr "O valor UUID não é um buffer str, int ou byte"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Não é possível alocar buffers para conversão assinada"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Não é possível criar um lock"
@@ -2482,16 +2433,45 @@ msgstr "Foi despertado através do alarme.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "A escrita não é compatível na Característica"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "Você está no modo de segurança pois:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"Você pressionou o botão reset durante a inicialização. Pressione-o novamente "
-"para sair do modo de segurança."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4448,6 +4428,97 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Registre um problema com o conteúdo do seu controlador no CIRCUITPY\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr ""
+#~ "Tentativa de alocação das pilhas quando o VM não estiver em funcionamento."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr ""
+#~ "O dispositivo de inicialização deve ser o primeiro dispositivo (interface "
+#~ "#0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Ambos os botões foram pressionados na inicialização.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "O botão A foi pressionado na inicialização.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "O CircuitPython não conseguiu alocar o heap."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Falha no HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Erro fatal."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "O acesso da memória é inválido."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Declaração de falha do firmware do sistema nórdico."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "O botão BOOT foi pressionado na inicialização.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "A área de alocação dinâmica de variáveis (heap) do CircuitPython foi "
+#~ "corrompido pois a pilha era muito pequena.\n"
+#~ "Aumente o tamanho da pilha se souber como. Senão:"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "O botão SW38 foi pressionado na inicialização.\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "O botão VOLUME foi pressionado na inicialização.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "O módulo `microcontrolador` foi utilizado para iniciar em modo seguro. "
+#~ "Pressione reset para encerrar do modo de segurança."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "O botão central foi pressionado na inicialização.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "O botão esquerdo foi pressionado na inicialização.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "O alimentação do micro controlador diminuiu. Certifique-se de que a sua "
+#~ "fonte de alimentação fornece\n"
+#~ "corrente suficiente para todo o circuito e pressione reset (depois de "
+#~ "ejetar o CIRCUITPY)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr "Para sair, reinicie a placa sem solicitar o modo de segurança."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "Você está no modo de segurança pois:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "Você pressionou o botão reset durante a inicialização. Pressione-o "
+#~ "novamente para sair do modo de segurança."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."
diff --git a/locale/ru.po b/locale/ru.po
index ab17fd486d..dff2abbd1e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -37,13 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Пожалуйста, сообщите о проблеме, приложив содержимое вашего диска CIRCUITPY "
-"на\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -96,7 +104,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -541,10 +549,6 @@ msgstr "Значения массива должны быть однобайто
 msgid "Attempt to allocate %d blocks"
 msgstr "Попытка выделения %d блоков"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Попытка выделения heap пока виртуальная машина не запущена."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Преобразование звука не реализовано"
@@ -599,20 +603,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Размер bitmap и количество бит-на-значение должны совпадать"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Загрузочное устройство должно быть первым устройством (интерфейс #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Для управления потоком требуется как RX, так и TX"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Обе кнопки были нажаты при загрузке.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Оба пина должны поддерживать аппаратные прерывания"
@@ -678,12 +675,6 @@ msgstr "Буферы должны быть одинакового размера
 msgid "Bus pin %d is already in use"
 msgstr "Пин шины %d уже используется"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Кнопка A была нажата при загрузке\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Буфер байтов должен быть размером 16 байтам."
@@ -824,10 +815,6 @@ msgstr "Запись в CharacteristicBuffer не предусмотрена"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "Код ядра CircuitPython сильно крашнулся. Упс!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython не смог выделить heap."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Длинна такта слишком велика"
@@ -868,10 +855,6 @@ msgstr "Не удалось запустить прерывание, RX заня
 msgid "Couldn't allocate decoder"
 msgstr "Не удалось выделить место для декодера"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Крашнулся в HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Ошибка инициализации канала ЦАП"
@@ -967,6 +950,10 @@ msgstr "Ошибка в MIDI-потоке на позиции %d"
 msgid "Error in regex"
 msgstr "Ошибка в регулярном выражении(regex)"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Ошибка: Сбой привязки"
@@ -1040,8 +1027,8 @@ msgid "Failed to write internal flash."
 msgstr "Не удалось записать внутреннюю флэш-память."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Фатальная ошибка."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1136,6 +1123,15 @@ msgstr "Оборудование занято, попробуйте исполь
 msgid "Hardware in use, try alternative pins"
 msgstr "Оборудование используется, попробуйте использовать другие пины"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Операция ввода-вывода на закрытом файле"
@@ -1258,6 +1254,10 @@ msgstr "Внутренняя ошибка #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Внутренний сторожевой таймер истек."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Недопустимый %q"
@@ -1306,10 +1306,6 @@ msgstr "Неверный data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Неверный размер блока формата"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Неправильный доступ к памяти."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Неверный MAC-адрес multicast"
@@ -1603,11 +1599,6 @@ msgstr "Файл/директория не существует"
 msgid "No timer available"
 msgstr "Нет доступного таймера"
 
-#: supervisor/shared/safe_mode.c
-#, fuzzy
-msgid "Nordic system firmware failure assertion."
-msgstr "Сбой системной прошивки Nordic (assertion)."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2070,53 +2061,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Длина rgb_pins должна быть 6, 12, 18, 24 или 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2135,6 +2092,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2169,10 +2130,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2264,6 +2221,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2469,13 +2430,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4411,6 +4403,45 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Пожалуйста, сообщите о проблеме, приложив содержимое вашего диска "
+#~ "CIRCUITPY на\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "Попытка выделения heap пока виртуальная машина не запущена."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr ""
+#~ "Загрузочное устройство должно быть первым устройством (интерфейс #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Обе кнопки были нажаты при загрузке.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Кнопка A была нажата при загрузке\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython не смог выделить heap."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Крашнулся в HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Фатальная ошибка."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Неправильный доступ к памяти."
+
+#, fuzzy
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Сбой системной прошивки Nordic (assertion)."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q должно быть типа %q"
 
diff --git a/locale/sv.po b/locale/sv.po
index ee5591e015..95c9674dd7 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -35,12 +35,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Vänligen skapa ett ärende med innehållet i din CIRCUITPY-enhet på\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -93,7 +102,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -540,10 +549,6 @@ msgstr "Matrisvärden ska bestå av enstaka bytes."
 msgid "Attempt to allocate %d blocks"
 msgstr "Försök att tilldela %d block"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "Försök till heap-allokering när den virtuella maskinen inte är igång."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Ljudkonvertering inte implementerad"
@@ -594,20 +599,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Bitmappstorlek och bitar per värde måste överensstämma"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Startenheten måste vara den första enheten (gränssnitt #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Både RX och TX krävs för handskakning"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Båda knapparna trycktes ned vid start.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Båda pinnarna måste stödja maskinvaruavbrott"
@@ -673,12 +671,6 @@ msgstr "Buffertarna måste ha samma storlek"
 msgid "Bus pin %d is already in use"
 msgstr "Busspinne %d används redan"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Knapp A trycktes ned vid start.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Byte-buffert måste vara 16 byte."
@@ -811,10 +803,6 @@ msgstr "Skrivning för CharacteristicBuffer är inte tillhandahållen"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPython kärnkod kraschade hårt. Hoppsan!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython kunde inte allokera heap."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Klockförlängning för lång"
@@ -855,10 +843,6 @@ msgstr "Det gick inte att starta avbrott, RX upptagen"
 msgid "Couldn't allocate decoder"
 msgstr "Det gick inte att allokera avkodaren"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "Krasch in i HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "Initieringsfel för DAC-kanal"
@@ -951,6 +935,10 @@ msgstr "Fel i MIDI-ström vid position %d"
 msgid "Error in regex"
 msgstr "Fel i regex"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Fel: Bind misslyckades"
@@ -1024,8 +1012,8 @@ msgid "Failed to write internal flash."
 msgstr "Det gick inte att skriva till intern flash."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "Fatalt fel."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1114,6 +1102,15 @@ msgstr "Hårdvaran är upptagen, prova alternativa pinnar"
 msgid "Hardware in use, try alternative pins"
 msgstr "Hårdvaran används redan, prova alternativa pinnar"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "I/O-operation på stängd fil"
@@ -1232,6 +1229,10 @@ msgstr "Internt fel #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Intern watchdog-timer har löpt ut."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Ogiltig %q"
@@ -1280,10 +1281,6 @@ msgstr "Ogiltig data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Ogiltig formatsegmentstorlek"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Ogiltig minnesåtkomst."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Ogiltig MAC-adress för multicast"
@@ -1573,10 +1570,6 @@ msgstr "Ingen sådan fil/katalog"
 msgid "No timer available"
 msgstr "Ingen timer tillgänglig"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "Felaktigt tillstånd i Nordic systemfirmware."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "Nordic systemfirmware fick slut på minne"
@@ -2040,62 +2033,20 @@ msgid "Temperature read timed out"
 msgstr "Temperaturavläsning tog för lång tid"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "BOOT-knappen trycktes ner vid start.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
-"CircuitPython-heapen blev korrupt eftersom stacken är för liten.\n"
-"Öka stackstorleken om du vet hur, eller om inte:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "SW38-knappen trycktes ned vid start.\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "VOLUME-knappen trycktes ned vid start.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"Modulen `microcontroller` användes för att starta upp i felsäkert läge. "
-"Tryck på reset för att avsluta felsäkert läget."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "Ovanstående undantag var den direkta orsaken till följande undantag:"
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "Mittknappen trycktes in vid start.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "Den vänstra knappen trycktes ned vid start.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Längden på rgb_pins vara 6, 12, 18, 24 eller 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"Mikrokontrollerns matningsspänning sjönk. Se till att strömförsörjningen "
-"ger\n"
-"tillräckligt med ström för hela kretsen och tryck på reset (efter utmatning "
-"av CIRCUITPY)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2113,6 +2064,10 @@ msgstr "Samplingens frekvens matchar inte mixerns"
 msgid "The sample's signedness does not match the mixer's"
 msgstr "Samplingens signerad/osignerad stämmer inte med mixern"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "Den här mikrokontrollern stöder inte kontinuerlig insamling."
@@ -2147,10 +2102,6 @@ msgstr "Tid har passerats."
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Åtgärden tog för lång tid: Max väntetid är %d sekunder"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr "För att avsluta, återställ kortet utan att begära säkert läge."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "För många kanaler i urvalet"
@@ -2242,6 +2193,10 @@ msgstr "UUID-värdet är inte str, int eller byte-buffert"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Det går inte att allokera buffert för signerad konvertering"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Kan inte skapa lås"
@@ -2455,16 +2410,45 @@ msgstr "Vaknade av larm.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Skrivning stöds inte på karaktäristik"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "Du är i felsäkert läge eftersom:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"Du tryckte på resetknappen under uppstarten. Tryck igen för att avsluta "
-"felsäkert läge."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4410,6 +4394,94 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Vänligen skapa ett ärende med innehållet i din CIRCUITPY-enhet på\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr ""
+#~ "Försök till heap-allokering när den virtuella maskinen inte är igång."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "Startenheten måste vara den första enheten (gränssnitt #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Båda knapparna trycktes ned vid start.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Knapp A trycktes ned vid start.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython kunde inte allokera heap."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "Krasch in i HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "Fatalt fel."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Ogiltig minnesåtkomst."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "Felaktigt tillstånd i Nordic systemfirmware."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "BOOT-knappen trycktes ner vid start.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "Increase the stack size if you know how. If not:"
+#~ msgstr ""
+#~ "CircuitPython-heapen blev korrupt eftersom stacken är för liten.\n"
+#~ "Öka stackstorleken om du vet hur, eller om inte:"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "SW38-knappen trycktes ned vid start.\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "VOLUME-knappen trycktes ned vid start.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "Modulen `microcontroller` användes för att starta upp i felsäkert läge. "
+#~ "Tryck på reset för att avsluta felsäkert läget."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "Mittknappen trycktes in vid start.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "Den vänstra knappen trycktes ned vid start.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "Mikrokontrollerns matningsspänning sjönk. Se till att strömförsörjningen "
+#~ "ger\n"
+#~ "tillräckligt med ström för hela kretsen och tryck på reset (efter "
+#~ "utmatning av CIRCUITPY)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr "För att avsluta, återställ kortet utan att begära säkert läge."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "Du är i felsäkert läge eftersom:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "Du tryckte på resetknappen under uppstarten. Tryck igen för att avsluta "
+#~ "felsäkert läge."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."
diff --git a/locale/tr.po b/locale/tr.po
index f856e50f0b..52b6031590 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -37,13 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Lütfen, şu adrese CIRCUITPY sürücünüzün içerikleri ile beraber bir hata/konu "
-"kaydı ekleyin\n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -97,7 +105,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -543,10 +551,6 @@ msgstr "Dizi değerleri tekil bytelar olmalıdır."
 msgid "Attempt to allocate %d blocks"
 msgstr "%d bloğun ayrılması girişimi"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "VM çalışmazken heap'ten alan tahsis edilmeye çalışıldı."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "Ses dönüşümü implemente edilmedi"
@@ -597,20 +601,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "Bitmap boyutu ve bit başına değer uyuşmalı"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "Önyükleme cihazı ilk cihaz olmalı (arayüz #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "Hem RX hem de TX akış kontrolü için gerekli"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "Başlatma sırasında her iki düğmeye de basıldı.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "Her iki pin de donanım kesintilerini desteklemelidir"
@@ -676,12 +673,6 @@ msgstr "Arabellek boyutları aynı olmalı"
 msgid "Bus pin %d is already in use"
 msgstr "Veriyolu pini %d kullanımda"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "Başlatma sırasında A düğmesine basıldı.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Bit buffer'ı 16bit olmalı."
@@ -813,10 +804,6 @@ msgstr "CharacteristicBuffer yazılmı sağlanmadı"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPython kor kodu patladı. Haydaaa!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr ""
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "Saat uzatması çok uzun"
@@ -855,10 +842,6 @@ msgstr "Kesinti başlatılamadı, RX kullanımda"
 msgid "Couldn't allocate decoder"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr ""
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr ""
@@ -950,6 +933,10 @@ msgstr "%d konumundaki MIDI akışında hata"
 msgid "Error in regex"
 msgstr "regex'te hata"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "Hata: Bağlanamadı"
@@ -1023,7 +1010,7 @@ msgid "Failed to write internal flash."
 msgstr "Dahili flaş yazılamadı."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
+msgid "Fault detected by hardware."
 msgstr ""
 
 #: py/moduerrno.c
@@ -1115,6 +1102,15 @@ msgstr "Donanım meşgul, alternatif pinleri deneyin"
 msgid "Hardware in use, try alternative pins"
 msgstr "Donanım kullanımda, alternatif pinleri deneyin"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Kapalı dosyada I/O işlemi"
@@ -1231,6 +1227,10 @@ msgstr "Dahili hata #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Dahili bekçi zamanlayıcısının süresi doldu."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "Geçersiz %q"
@@ -1280,10 +1280,6 @@ msgstr "Geçersiz veri_pini [%d]"
 msgid "Invalid format chunk size"
 msgstr "Geçersiz biçim yığın boyutu"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Geçersiz bellek erişimi."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Geçersiz multicast MAC adresi"
@@ -1572,10 +1568,6 @@ msgstr ""
 msgid "No timer available"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -2030,53 +2022,19 @@ msgid "Temperature read timed out"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
-msgstr ""
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr ""
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
+msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2095,6 +2053,10 @@ msgstr ""
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr ""
@@ -2127,10 +2089,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2222,6 +2180,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2427,13 +2389,44 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
 
 #: supervisor/shared/micropython.c
@@ -4369,6 +4362,31 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lütfen, şu adrese CIRCUITPY sürücünüzün içerikleri ile beraber bir hata/"
+#~ "konu kaydı ekleyin\n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "VM çalışmazken heap'ten alan tahsis edilmeye çalışıldı."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "Önyükleme cihazı ilk cihaz olmalı (arayüz #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "Başlatma sırasında her iki düğmeye de basıldı.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "Başlatma sırasında A düğmesine basıldı.\n"
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Geçersiz bellek erişimi."
+
 #~ msgid "%q must be of type %q"
 #~ msgstr "%q, %q türünde olmalıdır"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 4299e116d2..19bf8e2543 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -37,12 +37,21 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
-"Please file an issue with the contents of your CIRCUITPY drive at \n"
-"https://github.com/adafruit/circuitpython/issues\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
 "\n"
-"Qǐng tōngguò https://github.com/adafruit/circuitpython/issues\n"
-"tíjiāo yǒuguān nín de CIRCUITPY qūdòngqì nèiróng de wèntí \n"
+"Press reset to exit safe mode.\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"You are in safe mode because:\n"
+msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -96,7 +105,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/alarm/__init__.c
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
-#: ports/stm/common-hal/rtc/RTC.c
+#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
 msgstr "%q"
 
@@ -542,10 +551,6 @@ msgstr "shùzǔ de zhí yīnggāi shì dān'gè zìjié."
 msgid "Attempt to allocate %d blocks"
 msgstr "shìtú fēnpèi %d blocks"
 
-#: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when VM not running."
-msgstr "shìtú zài xūnǐjī (VM) yùn xíng shí fēnpèi duī (heap)."
-
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
 msgstr "yīnpín zhuǎnhuàn wèi bèi shíxiàn"
@@ -596,20 +601,13 @@ msgid "Bitmap size and bits per value must match"
 msgstr "wèi tú dàxiǎo hé měi gè zhí de wèi shù bìxū pǐpèi"
 
 #: supervisor/shared/safe_mode.c
-msgid "Boot device must be first device (interface #0)."
-msgstr "yǐndǎo shèbèi bìxū shì dìyī tái shèbèi (interface #0)."
+msgid "Boot device must be first (interface #0)."
+msgstr ""
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr "RX hé TX dōu xū yào liúliàng kòngzhì"
 
-#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
-#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
-#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
-msgid "Both buttons were pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià le liǎng gè àn niǔ.\n"
-
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Both pins must support hardware interrupts"
 msgstr "liǎnggè yǐnjiǎo dōu bìxū zhīchí yìngjiàn zhōngduàn"
@@ -675,12 +673,6 @@ msgstr "huǎnchōng qū bìxū dàxiǎo xiāngtóng"
 msgid "Bus pin %d is already in use"
 msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng"
 
-#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
-#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
-#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
-msgid "Button A was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià àn niǔ A.\n"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr "Zìjié huǎnchōng qū bìxū shì 16 zìjié."
@@ -814,10 +806,6 @@ msgstr "Wèi tígōng zìfú huǎncún xiěrù"
 msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr "CircuitPython de héxīn chūxiàn gùzhàng. Āiyā!\n"
 
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap."
-msgstr "CircuitPython wúfǎ fēnpèi duī."
-
 #: shared-module/bitbangio/I2C.c
 msgid "Clock stretch too long"
 msgstr "shízhōng yánzhǎn guòcháng"
@@ -856,10 +844,6 @@ msgstr "Wúfǎ qǐdòng zhōngduàn,RX máng"
 msgid "Couldn't allocate decoder"
 msgstr "wúfǎ fēnpèi jiěmǎ qì"
 
-#: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler."
-msgstr "gu4zhang4, jin4ru4 HardFault_Handler."
-
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
 msgstr "DAC tōngdào chūshǐhuà cuòwù"
@@ -953,6 +937,10 @@ msgstr "wèi yú %d wèi zhì de MIDI liú zhōng de cuò wù"
 msgid "Error in regex"
 msgstr "Zhèngzé biǎodá shì cuòwù"
 
+#: supervisor/shared/safe_mode.c
+msgid "Error in safemode.py."
+msgstr ""
+
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
 msgstr "cuò wù: bǎng dìng shī bài"
@@ -1026,8 +1014,8 @@ msgid "Failed to write internal flash."
 msgstr "Wúfǎ xiě rù nèibù shǎncún."
 
 #: supervisor/shared/safe_mode.c
-msgid "Fatal error."
-msgstr "zhì mìng cuò wù."
+msgid "Fault detected by hardware."
+msgstr ""
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1118,6 +1106,15 @@ msgstr "Yìngjiàn máng, qǐng chángshì qítā zhēnjiǎo"
 msgid "Hardware in use, try alternative pins"
 msgstr "Shǐyòng de yìngjiàn, qǐng chángshì qítā yǐn jiǎo"
 
+#: supervisor/shared/safe_mode.c
+msgid "Heap allocation when VM not running."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"Heap was corrupted because the stack was too small. Increase stack size."
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr "Wénjiàn shàng de I/ O cāozuò"
@@ -1239,6 +1236,10 @@ msgstr "nèi bù cuò wù #%d"
 msgid "Internal watchdog timer expired."
 msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 
+#: supervisor/shared/safe_mode.c
+msgid "Interrupt error."
+msgstr ""
+
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
 msgstr "wú xiào %q"
@@ -1287,10 +1288,6 @@ msgstr "wú xiào data_pins[%d]"
 msgid "Invalid format chunk size"
 msgstr "Géshì kuài dàxiǎo wúxiào"
 
-#: supervisor/shared/safe_mode.c
-msgid "Invalid memory access."
-msgstr "Wúxiào de nèicún fǎngwèn."
-
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "wú xiào de duō bō MAC dì zhǐ"
@@ -1580,10 +1577,6 @@ msgstr "Méiyǒu cǐ lèi wénjiàn/mùlù"
 msgid "No timer available"
 msgstr "Méiyǒu jìshí qì"
 
-#: supervisor/shared/safe_mode.c
-msgid "Nordic system firmware failure assertion."
-msgstr "běi ōu xì tǒng gù jiàn gù zhàng duàn yán."
-
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr "běi ōu xì tǒng gù jiàn chū nèi cún"
@@ -2045,61 +2038,20 @@ msgid "Temperature read timed out"
 msgstr "Wēndù dòu qǔ chāoshí"
 
 #: supervisor/shared/safe_mode.c
-msgid "The BOOT button was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià le yǐn dǎo àn niǔ.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The CircuitPython heap was corrupted because the stack was too small.\n"
-"Increase the stack size if you know how. If not:"
+msgid "The `microcontroller` module was used to boot into safe mode."
 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:"
-
-#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
-msgid "The SW38 button was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià le SW38 àn niǔ .\n"
-
-#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
-msgid "The VOLUME button was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià yīn liàng àn niǔ.\n"
-
-#: supervisor/shared/safe_mode.c
-msgid ""
-"The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode."
-msgstr ""
-"`wēi kòng zhì qì` mó kuài yòng yú qǐ dòng dào ān quán mó shì. àn chóng zhì "
-"tuì chū ān quán mó shì."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
 msgstr "shàng shù yì cháng shì yǐ xià yì cháng de zhí jiē yuán yīn:"
 
-#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
-#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià zhōng yāng àn niǔ.\n"
-
-#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
-msgid "The left button was pressed at start up.\n"
-msgstr "qǐ dòng shí àn xià zuǒ àn niǔ.\n"
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Rgb_pins de chángdù bìxū wèi 6,12,18,24 huò 30"
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"The microcontroller's power dipped. Make sure your power supply provides\n"
-"enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY)."
+msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
-"wēi kòng zhì qì de gōng lǜ xià jiàng. què bǎo diàn yuán tí gòng\n"
-"zú gòu de gōng lǜ yòng yú zhěng gè diàn lù hé àn chóng zhì (tán chū "
-"CIRCUITPY hòu)."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2117,6 +2069,10 @@ msgstr "Yàngběn de yàngběn sùdù yǔ hǔn yīn qì de xiāngchà bù pǐpè
 msgid "The sample's signedness does not match the mixer's"
 msgstr "Yàngběn de qiānmíng yǔ hǔn yīn qì de qiānmíng bù pǐpèi"
 
+#: supervisor/shared/safe_mode.c
+msgid "Third-party firmware fatal error."
+msgstr ""
+
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
 msgstr "cǐ wēi kòng zhì qì bù zhī chí lián xù bǔ huò."
@@ -2151,12 +2107,6 @@ msgstr "shí jiān yǐ jīng guò qù."
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr "Chāoshí shíjiān tài zhǎng: Zuìdà chāoshí shíjiān wèi%d miǎo"
 
-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without requesting safe mode."
-msgstr ""
-"yào tuì chū, qǐng zài bù qǐng qiú ān quán mó shì de qíng kuàng xià chóng zhì "
-"zhǔ bǎn."
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr "yàngběn zhōng de tōngdào tài duō"
@@ -2248,6 +2198,10 @@ msgstr "UUID zhí bùshì str,int huò zì jié huǎnchōng qū"
 msgid "Unable to allocate buffers for signed conversion"
 msgstr "Wúfǎ fēnpèi huǎnchōng qū yòng yú qiānmíng zhuǎnhuàn"
 
+#: supervisor/shared/safe_mode.c
+msgid "Unable to allocate the heap."
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Wúfǎ chuàngjiàn suǒ"
@@ -2461,16 +2415,45 @@ msgstr "bèi jǐng bào chǎo xǐng.\n"
 msgid "Writes not supported on Characteristic"
 msgstr "Tèzhēng bù zhīchí xiě rù"
 
-#: supervisor/shared/safe_mode.c
-msgid "You are in safe mode because:\n"
-msgstr "nín chǔ yú ān quán mó shì, yīn wéi:\n"
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "You pressed both buttons at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
+#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
+#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+msgid "You pressed button A at start up."
+msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You pressed the reset button during boot. Press again to exit safe mode."
+msgid "You pressed the BOOT button at start up"
+msgstr ""
+
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "You pressed the SW38 button at start up."
+msgstr ""
+
+#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+msgid "You pressed the VOLUME button at start up."
+msgstr ""
+
+#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
+#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
+msgid "You pressed the central button at start up."
+msgstr ""
+
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "You pressed the left button at start up."
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "You pressed the reset button during boot."
 msgstr ""
-"zài qǐ dòng guò chéng zhōng, nín àn xià le chóng zhì àn niǔ. zài cì àn xià "
-"yǐ tuì chū ān quán mó shì."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
@@ -4415,6 +4398,94 @@ 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 ""
+#~ "\n"
+#~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
+#~ "https://github.com/adafruit/circuitpython/issues\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Qǐng tōngguò https://github.com/adafruit/circuitpython/issues\n"
+#~ "tíjiāo yǒuguān nín de CIRCUITPY qūdòngqì nèiróng de wèntí \n"
+
+#~ msgid "Attempted heap allocation when VM not running."
+#~ msgstr "shìtú zài xūnǐjī (VM) yùn xíng shí fēnpèi duī (heap)."
+
+#~ msgid "Boot device must be first device (interface #0)."
+#~ msgstr "yǐndǎo shèbèi bìxū shì dìyī tái shèbèi (interface #0)."
+
+#~ msgid "Both buttons were pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià le liǎng gè àn niǔ.\n"
+
+#~ msgid "Button A was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià àn niǔ A.\n"
+
+#~ msgid "CircuitPython was unable to allocate the heap."
+#~ msgstr "CircuitPython wúfǎ fēnpèi duī."
+
+#~ msgid "Crash into the HardFault_Handler."
+#~ msgstr "gu4zhang4, jin4ru4 HardFault_Handler."
+
+#~ msgid "Fatal error."
+#~ msgstr "zhì mìng cuò wù."
+
+#~ msgid "Invalid memory access."
+#~ msgstr "Wúxiào de nèicún fǎngwèn."
+
+#~ msgid "Nordic system firmware failure assertion."
+#~ msgstr "běi ōu xì tǒng gù jiàn gù zhàng duàn yán."
+
+#~ msgid "The BOOT button was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià le yǐn dǎo àn niǔ.\n"
+
+#~ msgid ""
+#~ "The CircuitPython heap was corrupted because the stack was too small.\n"
+#~ "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:"
+
+#~ msgid "The SW38 button was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià le SW38 àn niǔ .\n"
+
+#~ msgid "The VOLUME button was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià yīn liàng àn niǔ.\n"
+
+#~ msgid ""
+#~ "The `microcontroller` module was used to boot into safe mode. Press reset "
+#~ "to exit safe mode."
+#~ msgstr ""
+#~ "`wēi kòng zhì qì` mó kuài yòng yú qǐ dòng dào ān quán mó shì. àn chóng "
+#~ "zhì tuì chū ān quán mó shì."
+
+#~ msgid "The central button was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià zhōng yāng àn niǔ.\n"
+
+#~ msgid "The left button was pressed at start up.\n"
+#~ msgstr "qǐ dòng shí àn xià zuǒ àn niǔ.\n"
+
+#~ msgid ""
+#~ "The microcontroller's power dipped. Make sure your power supply provides\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY)."
+#~ msgstr ""
+#~ "wēi kòng zhì qì de gōng lǜ xià jiàng. què bǎo diàn yuán tí gòng\n"
+#~ "zú gòu de gōng lǜ yòng yú zhěng gè diàn lù hé àn chóng zhì (tán chū "
+#~ "CIRCUITPY hòu)."
+
+#~ msgid "To exit, please reset the board without requesting safe mode."
+#~ msgstr ""
+#~ "yào tuì chū, qǐng zài bù qǐng qiú ān quán mó shì de qíng kuàng xià chóng "
+#~ "zhì zhǔ bǎn."
+
+#~ msgid "You are in safe mode because:\n"
+#~ msgstr "nín chǔ yú ān quán mó shì, yīn wéi:\n"
+
+#~ msgid ""
+#~ "You pressed the reset button during boot. Press again to exit safe mode."
+#~ msgstr ""
+#~ "zài qǐ dòng guò chéng zhōng, nín àn xià le chóng zhì àn niǔ. zài cì àn "
+#~ "xià yǐ tuì chū ān quán mó shì."
+
 #~ msgid ""
 #~ "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 #~ "documentation for instructions."

From 54ae7ced827089694f1a94ac551daf425b39b77c Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 23:10:11 +0200
Subject: [PATCH 1867/2403] Updated to requested changes

---
 locale/circuitpython.pot | 22 +++++-------
 main.c                   | 77 ++++++++++++++++++++++------------------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index a5906ca6e7..79899735de 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -28,6 +28,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -35,20 +43,6 @@ msgid ""
 "https://github.com/adafruit/circuitpython/issues\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"WARNING: Allocating pystack failed, defaulting back to build value.\n"
-"\n"
-msgstr ""
-
-#: main.c
-msgid ""
-"\n"
-"WARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n"
-"\n"
-msgstr ""
-
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
diff --git a/main.c b/main.c
index 09f507867f..1d67424e28 100644
--- a/main.c
+++ b/main.c
@@ -126,45 +126,36 @@ uint8_t value_out = 0;
 #include "shared-module/os/__init__.h"
 #endif
 
-typedef struct {
-    #if MICROPY_ENABLE_PYSTACK
-    supervisor_allocation *pystack;
-    #endif
-    supervisor_allocation *heap;
-} vm_memory_t;
-
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_reset();
     #endif
 }
 
-STATIC vm_memory_t allocate_vm_memory(void) {
-    vm_memory_t res;
-    #if MICROPY_ENABLE_PYSTACK
+#if MICROPY_ENABLE_PYSTACK
+STATIC supervisor_allocation *allocate_pystack(void) {
     mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
-    #if CIRCUITPY_OS_GETENV
+    #if CIRCUITPY_OS_GETENV && CIRCUITPY_SETTABLE_PYSTACK
     // Fetch value if exists from settings.toml
     // Leaves size to build default on any failure
     (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
     if (pystack_size < 384) {
-        serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
+        serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }
     #endif
-    res.pystack = allocate_memory(pystack_size, false, false);
-    if (res.pystack == NULL) {
-        serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value.\n\n"));
-        res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
+    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
+    if (pystack == NULL) {
+        serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
+        pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
     }
-    #endif
-    res.heap = allocate_remaining_memory();
-    return res;
+    return pystack;
 }
+#endif
 
-STATIC void start_mp(vm_memory_t vm_memory) {
+STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack) {
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -192,11 +183,11 @@ STATIC void start_mp(vm_memory_t vm_memory) {
     readline_init0();
 
     #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_init(vm_memory.pystack->ptr, vm_memory.pystack->ptr + get_allocation_length(vm_memory.pystack) / sizeof(size_t));
+    mp_pystack_init(pystack->ptr, pystack->ptr + get_allocation_length(pystack) / sizeof(size_t));
     #endif
 
     #if MICROPY_ENABLE_GC
-    gc_init(vm_memory.heap->ptr, vm_memory.heap->ptr + get_allocation_length(vm_memory.heap) / 4);
+    gc_init(heap->ptr, heap->ptr + get_allocation_length(heap) / 4);
     #endif
     mp_init();
     mp_obj_list_init((mp_obj_list_t *)mp_sys_path, 0);
@@ -296,7 +287,7 @@ STATIC void count_strn(void *data, const char *str, size_t len) {
     *(size_t *)data += len;
 }
 
-STATIC void cleanup_after_vm(vm_memory_t vm_memory, mp_obj_t exception) {
+STATIC void cleanup_after_vm(supervisor_allocation *heap, supervisor_allocation *pystack, mp_obj_t exception) {
     // Get the traceback of any exception from this run off the heap.
     // MP_OBJ_SENTINEL means "this run does not contribute to traceback storage, don't touch it"
     // MP_OBJ_NULL (=0) means "this run completed successfully, clear any stored traceback"
@@ -376,9 +367,9 @@ STATIC void cleanup_after_vm(vm_memory_t vm_memory, mp_obj_t exception) {
     // Free the heap last because other modules may reference heap memory and need to shut down.
     filesystem_flush();
     stop_mp();
-    free_memory(vm_memory.heap);
+    free_memory(heap);
     #if MICROPY_ENABLE_PYSTACK
-    free_memory(vm_memory.pystack);
+    free_memory(pystack);
     #endif
     supervisor_move_memory();
 
@@ -434,8 +425,14 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        vm_memory_t vm_memory = allocate_vm_memory();
-        start_mp(vm_memory);
+        supervisor_allocation *pystack;
+        #if MICROPY_ENABLE_PYSTACK
+        pystack = allocate_pystack();
+        #else
+        pystack = NULL;
+        #endif
+        supervisor_allocation *heap = allocate_remaining_memory();
+        start_mp(heap, pystack);
 
         #if CIRCUITPY_USB
         usb_setup_with_vm();
@@ -483,7 +480,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
 
         // Finished executing python code. Cleanup includes filesystem flush and a board reset.
-        cleanup_after_vm(vm_memory, _exec_result.exception);
+        cleanup_after_vm(heap, pystack, _exec_result.exception);
         _exec_result.exception = NULL;
 
         // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
@@ -779,8 +776,14 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    vm_memory_t vm_memory = allocate_vm_memory();
-    start_mp(vm_memory);
+    supervisor_allocation *pystack;
+    #if MICROPY_ENABLE_PYSTACK
+    pystack = allocate_pystack();
+    #else
+    pystack = NULL;
+    #endif
+    supervisor_allocation *heap = allocate_remaining_memory();
+    start_mp(heap, pystack);
 
     #if CIRCUITPY_USB
     // Set up default USB values after boot.py VM starts but before running boot.py.
@@ -866,7 +869,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     port_post_boot_py(true);
 
-    cleanup_after_vm(vm_memory, _exec_result.exception);
+    cleanup_after_vm(heap, pystack, _exec_result.exception);
     _exec_result.exception = NULL;
 
     port_post_boot_py(false);
@@ -881,8 +884,14 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    vm_memory_t vm_memory = allocate_vm_memory();
-    start_mp(vm_memory);
+    supervisor_allocation *pystack;
+    #if MICROPY_ENABLE_PYSTACK
+    pystack = allocate_pystack();
+    #else
+    pystack = NULL;
+    #endif
+    supervisor_allocation *heap = allocate_remaining_memory();
+    start_mp(heap, pystack);
 
     #if CIRCUITPY_USB
     usb_setup_with_vm();
@@ -925,7 +934,7 @@ STATIC int run_repl(void) {
         exit_code = PYEXEC_DEEP_SLEEP;
     }
     #endif
-    cleanup_after_vm(vm_memory, MP_OBJ_SENTINEL);
+    cleanup_after_vm(heap, pystack, MP_OBJ_SENTINEL);
 
     // Also reset bleio. The above call omits it in case workflows should continue. In this case,
     // we're switching straight to another VM so we want to reset.

From a37dad61fb3d72e5ab2ad993baac2494d4438c12 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 23:10:30 +0200
Subject: [PATCH 1868/2403] CIRCUITPY_SETTABLE_PYSTACK

---
 py/circuitpy_mpconfig.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 8bfb69297a..95a95fa12f 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -145,6 +145,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_REPL_AUTO_INDENT         (1)
 #define MICROPY_REPL_EVENT_DRIVEN        (0)
 #define MICROPY_ENABLE_PYSTACK           (1)
+#define CIRCUITPY_SETTABLE_PYSTACK       (1)
 #define MICROPY_STACK_CHECK              (1)
 #define MICROPY_STREAMS_NON_BLOCK        (1)
 #ifndef MICROPY_USE_INTERNAL_PRINTF

From 4bb0b0acdfc7f2a67d8312c11fe19c253c6d9297 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 23:37:37 +0200
Subject: [PATCH 1869/2403] volatile to skip optimisation

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

diff --git a/main.c b/main.c
index 1d67424e28..4a1201f56c 100644
--- a/main.c
+++ b/main.c
@@ -776,7 +776,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    supervisor_allocation *pystack;
+    volatile supervisor_allocation *pystack;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
     #else

From c003b8817a8243968b166e8a6c7fca05fa8f81cb Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 23:40:49 +0200
Subject: [PATCH 1870/2403] Put on all and preinit with NULL

---
 main.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/main.c b/main.c
index 4a1201f56c..2f3f9bc969 100644
--- a/main.c
+++ b/main.c
@@ -425,11 +425,9 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        supervisor_allocation *pystack;
+        volatile supervisor_allocation *pystack = NULL;
         #if MICROPY_ENABLE_PYSTACK
         pystack = allocate_pystack();
-        #else
-        pystack = NULL;
         #endif
         supervisor_allocation *heap = allocate_remaining_memory();
         start_mp(heap, pystack);
@@ -776,11 +774,9 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    volatile supervisor_allocation *pystack;
+    volatile supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
-    #else
-    pystack = NULL;
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
     start_mp(heap, pystack);
@@ -884,11 +880,9 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    supervisor_allocation *pystack;
+    volatile supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
-    #else
-    pystack = NULL;
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
     start_mp(heap, pystack);

From 66215f7983b05ebe7e9018495e02100af8908a55 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Thu, 16 Feb 2023 23:57:47 +0200
Subject: [PATCH 1871/2403] gcc is evil, I respond with fake pointer

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 2f3f9bc969..1a622a9858 100644
--- a/main.c
+++ b/main.c
@@ -425,7 +425,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        volatile supervisor_allocation *pystack = NULL;
+        supervisor_allocation *pystack = (supervisor_allocation *)1;
         #if MICROPY_ENABLE_PYSTACK
         pystack = allocate_pystack();
         #endif
@@ -774,7 +774,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    volatile supervisor_allocation *pystack = NULL;
+    supervisor_allocation *pystack = (supervisor_allocation *)1;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
     #endif
@@ -880,7 +880,7 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    volatile supervisor_allocation *pystack = NULL;
+    supervisor_allocation *pystack = (supervisor_allocation *)1;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
     #endif

From 8abce77971c47297526437bec5260ba7e005beb7 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 00:52:13 +0200
Subject: [PATCH 1872/2403] fix safemode

---
 main.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index aa58dcf45f..19ef60f2e1 100644
--- a/main.c
+++ b/main.c
@@ -425,7 +425,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         };
         #endif
 
-        supervisor_allocation *pystack = (supervisor_allocation *)1;
+        supervisor_allocation *pystack = NULL;
         #if MICROPY_ENABLE_PYSTACK
         pystack = allocate_pystack();
         #endif
@@ -767,8 +767,12 @@ STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) {
         return;
     }
 
+    supervisor_allocation *pystack = NULL;
+    #if MICROPY_ENABLE_PYSTACK
+    pystack = allocate_pystack();
+    #endif
     supervisor_allocation *heap = allocate_remaining_memory();
-    start_mp(heap);
+    start_mp(heap, pystack);
 
     static const char *const safemode_py_filenames[] = {"safemode.py", "safemode.txt"};
     maybe_run_list(safemode_py_filenames, MP_ARRAY_SIZE(safemode_py_filenames));
@@ -779,7 +783,7 @@ STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) {
         set_safe_mode(SAFE_MODE_SAFEMODE_PY_ERROR);
     }
 
-    cleanup_after_vm(heap, _exec_result.exception);
+    cleanup_after_vm(heap, pystack, _exec_result.exception);
     _exec_result.exception = NULL;
 }
 #endif
@@ -800,7 +804,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     // Do USB setup even if boot.py is not run.
 
-    supervisor_allocation *pystack = (supervisor_allocation *)1;
+    supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
     #endif
@@ -906,7 +910,7 @@ STATIC int run_repl(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
-    supervisor_allocation *pystack = (supervisor_allocation *)1;
+    supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
     pystack = allocate_pystack();
     #endif

From f05c730a01b55b779547e80bea79ac0d54a1cfec Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 15:14:09 +0200
Subject: [PATCH 1873/2403] settable pystack = 0 for kicksat-sprite

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
index eb7f1c62e3..7bcff4ad73 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@@ -21,3 +21,8 @@
 #define IGNORE_PIN_PA25     1
 
 #define MICROPY_FATFS_EXFAT 0
+
+#ifdef CIRCUITPY_SETTABLE_PYSTACK
+#undef CIRCUITPY_SETTABLE_PYSTACK
+#endif
+#define CIRCUITPY_SETTABLE_PYSTACK (0)

From a2c22521b45bab26c1ed48a72d862f53c682ab39 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 15:16:18 +0200
Subject: [PATCH 1874/2403] Updates to waveshare-esp32s2-pico board definition

---
 .../boards/waveshare_esp32s2_pico/mpconfigboard.mk          | 2 +-
 ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
index 70f4bf008f..2db911fb26 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.mk
@@ -5,6 +5,6 @@ USB_MANUFACTURER = "Waveshare Electronics"
 
 IDF_TARGET = esp32s2
 
-CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
index e1635f6d17..3a2989a41e 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
@@ -1,9 +1,11 @@
+#
+# SPI RAM config
+#
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
-
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y

From 17e2598fa1b9f9bec2b1cd6df566f44e9e40145c Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 15:23:01 +0200
Subject: [PATCH 1875/2403] Revert "settable pystack = 0 for kicksat-sprite"

This reverts commit f05c730a01b55b779547e80bea79ac0d54a1cfec.
---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
index 7bcff4ad73..eb7f1c62e3 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@@ -21,8 +21,3 @@
 #define IGNORE_PIN_PA25     1
 
 #define MICROPY_FATFS_EXFAT 0
-
-#ifdef CIRCUITPY_SETTABLE_PYSTACK
-#undef CIRCUITPY_SETTABLE_PYSTACK
-#endif
-#define CIRCUITPY_SETTABLE_PYSTACK (0)

From 388279d9c15332f247ce92eeda0c303bb503f529 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 15:24:27 +0200
Subject: [PATCH 1876/2403] Disable rainbowio instead.

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index 9bc50ab429..51b4371675 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -25,6 +25,7 @@ CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0

From 56350778531aca4909ba665e557d2b2afa284942 Mon Sep 17 00:00:00 2001
From: Milind Movasha 
Date: Fri, 17 Feb 2023 19:19:15 +0530
Subject: [PATCH 1877/2403] Espressif analogbufio implementation

---
 .../common-hal/analogbufio/BufferedIn.c       | 283 ++++++++++++++++++
 .../common-hal/analogbufio/BufferedIn.h       |  42 +++
 .../common-hal/analogbufio/__init__.c         |   1 +
 ports/espressif/mpconfigport.mk               |   1 +
 4 files changed, 327 insertions(+)
 create mode 100644 ports/espressif/common-hal/analogbufio/BufferedIn.c
 create mode 100644 ports/espressif/common-hal/analogbufio/BufferedIn.h
 create mode 100644 ports/espressif/common-hal/analogbufio/__init__.c

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
new file mode 100644
index 0000000000..e26afb283e
--- /dev/null
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -0,0 +1,283 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2023 Milind Movasha
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ *
+ * 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 
+#include "common-hal/analogbufio/BufferedIn.h"
+#include "shared-bindings/analogbufio/BufferedIn.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared/runtime/interrupt_char.h"
+#include "py/runtime.h"
+#include 
+#include 
+#include "sdkconfig.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+#include "driver/adc.h"
+
+//#define DEBUG_ANALOGBUFIO
+
+#define NUM_SAMPLES_PER_INTERRUPT   256
+#define NUM_ADC_CHANNELS            1
+#define DMA_BUFFER_SIZE	   	        1024
+#define ATTENUATION                 ADC_ATTEN_DB_0
+#define ADC_READ_TIMEOUT_MS         2000
+
+#if defined(CONFIG_IDF_TARGET_ESP32)
+#define ADC_RESULT_BYTE     2
+#define ADC_CONV_LIMIT_EN   1   //For ESP32, this should always be set to 1
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+#define ADC_RESULT_BYTE     2
+#define ADC_CONV_LIMIT_EN   0
+#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32H2)
+#define ADC_RESULT_BYTE     4
+#define ADC_CONV_LIMIT_EN   0
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+#define ADC_RESULT_BYTE     4
+#define ADC_CONV_LIMIT_EN   0
+#endif
+
+static adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2;
+static adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
+static uint8_t adc_channel = 0;
+
+void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint32_t sample_rate) {
+    uint16_t adc1_chan_mask = 0;
+    uint16_t adc2_chan_mask = 0;
+
+    if( self->pin != NULL) {
+        mp_raise_ValueError(translate("ADC DMA already initialized"));
+    }
+
+    output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
+    if(pin->adc_index == ADC_UNIT_1) {
+        convert_mode = ADC_CONV_SINGLE_UNIT_1;
+    } else {
+        convert_mode = ADC_CONV_SINGLE_UNIT_2;
+    }
+
+    if (pin->adc_index == NO_ADC || pin->adc_channel == NO_ADC_CHANNEL) {
+        raise_ValueError_invalid_pin();
+    }
+
+    adc_channel = pin->adc_channel;
+
+    /*
+     *	Chip version	Conversion Mode		Output Format Type
+     *	ESP32			1					TYPE1
+     *	ESP32S2			1,2,BOTH,ALTER		TYPE1, TYPE2
+     *	ESP32C3			ALTER				TYPE2
+     *	ESP32S3			1,2,BOTH,ALTER		TYPE2
+     *	ESP32H3			1,2,BOTH,ALTER		TYPE2
+     */
+
+#if defined(CONFIG_IDF_TARGET_ESP32)
+    if(pin->adc_index != ADC_UNIT_1) {
+        mp_raise_ValueError(translate("ESP32 only supports ADC1 unit"));
+    }
+#endif
+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#endif
+#if defined(CONFIG_IDF_TARGET_ESP32C3)
+    //ESP32C3 only supports alter mode
+    convert_mode = ADC_CONV_ALTER_UNIT;
+    output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
+#endif
+#if defined(CONFIG_IDF_TARGET_ESP32S3)
+#endif
+#if defined(CONFIG_IDF_TARGET_ESP32H2)
+#endif
+
+    self->pin = pin;
+    common_hal_mcu_pin_claim(pin);
+
+    if(pin->adc_index == ADC_UNIT_1) {
+        adc1_chan_mask = 1 << pin->adc_channel;
+    } else {
+        adc2_chan_mask = 1 << pin->adc_channel;
+    }
+
+    adc_digi_init_config_t adc_dma_config = {
+        .max_store_buf_size = DMA_BUFFER_SIZE,
+        .conv_num_each_intr = NUM_SAMPLES_PER_INTERRUPT,
+        .adc1_chan_mask = adc1_chan_mask,
+        .adc2_chan_mask = adc2_chan_mask,
+    };
+
+#if defined(DEBUG_ANALOGBUFIO)
+    mp_printf(&mp_plat_print,"pin:%d, ADC channel:%d, ADC index:%d, adc1_chan_mask:0x%x, adc2_chan_mask:0x%x\n",pin->number,pin->adc_channel,pin->adc_index,adc1_chan_mask,adc2_chan_mask);
+#endif //DEBUG_ANALOGBUFIO
+    esp_err_t err = adc_digi_initialize(&adc_dma_config);
+    if(ESP_OK != err) {
+        common_hal_analogbufio_bufferedin_deinit(self);
+        mp_raise_ValueError_varg(translate("Unable to initialize ADC DMA controller, ErrorCode:%d"),err);
+    }
+
+    adc_digi_configuration_t dig_cfg = {
+        .conv_limit_en = ADC_CONV_LIMIT_EN,
+        .conv_limit_num = 250,
+        .pattern_num = NUM_ADC_CHANNELS,
+        .sample_freq_hz = sample_rate,
+        .conv_mode = convert_mode,
+        .format = output_format,
+    };
+
+#if defined(DEBUG_ANALOGBUFIO)
+    mp_printf(&mp_plat_print,"conversion_mode:%d, format:%d, conv_limit_en:%d, sample_rate:%d\n",convert_mode,output_format,ADC_CONV_LIMIT_EN,sample_rate);
+#endif //DEBUG_ANALOGBUFIO
+
+    adc_digi_pattern_config_t adc_pattern[NUM_ADC_CHANNELS] = {0};
+    adc_pattern[0].atten = ATTENUATION;
+    adc_pattern[0].channel = pin->adc_channel;
+    if(pin->adc_index == ADC_UNIT_1) {
+        adc_pattern[0].unit = 0;
+    } else {
+        adc_pattern[0].unit = 1;
+    }
+    adc_pattern[0].bit_width = SOC_ADC_DIGI_MAX_BITWIDTH;
+
+    dig_cfg.adc_pattern = adc_pattern;
+#if defined(DEBUG_ANALOGBUFIO)
+    mp_printf(&mp_plat_print,"adc_pattern[0].channel:%d, adc_pattern[0].unit:%d, adc_pattern[0].atten:%d\n",adc_pattern[0].channel,adc_pattern[0].unit,adc_pattern[0].atten);
+#endif //DEBUG_ANALOGBUFIO
+
+    err = adc_digi_controller_configure(&dig_cfg);
+    if(ESP_OK != err) {
+        common_hal_analogbufio_bufferedin_deinit(self);
+        mp_raise_ValueError_varg(translate("Unable to configure ADC DMA controller, ErrorCode:%d"),err);
+    }
+    err = adc_digi_start();
+    if(ESP_OK != err) {
+        common_hal_analogbufio_bufferedin_deinit(self);
+        mp_raise_ValueError_varg(translate("Unable to start ADC DMA controller, ErrorCode:%d"),err);
+    }
+}
+
+bool common_hal_analogbufio_bufferedin_deinited(analogbufio_bufferedin_obj_t *self) {
+    return self->pin == NULL;
+}
+
+void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self) {
+    if (common_hal_analogbufio_bufferedin_deinited(self)) {
+        return;
+    }
+
+    adc_digi_stop();
+    adc_digi_deinitialize();
+
+    // Release ADC Pin
+    reset_pin_number(self->pin->number);
+    self->pin = NULL;
+}
+
+static bool check_valid_data(const adc_digi_output_data_t *data)
+{
+    unsigned int unit = data->type2.unit;
+    if(output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE2) {
+        if (data->type2.channel >= SOC_ADC_CHANNEL_NUM(unit)) return false;
+        if (adc_channel != data->type2.channel) return false;
+    } else {
+        if( convert_mode == ADC_CONV_SINGLE_UNIT_1 ) {
+            unit = 0;
+        } else {
+            unit = 1;
+        }
+        if (data->type1.channel >= SOC_ADC_CHANNEL_NUM(unit)) return false;
+        if (adc_channel != data->type1.channel) return false;
+    }
+    if (unit > 2) return false;
+    return true;
+}
+
+
+uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t *self, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample) {
+    uint8_t result[NUM_SAMPLES_PER_INTERRUPT] __attribute__ ((aligned (4))) = {0};
+    uint32_t captured_samples = 0;
+    uint32_t captured_bytes = 0;
+    esp_err_t ret;
+    uint32_t ret_num = 0;
+
+#if defined(DEBUG_ANALOGBUFIO)
+    mp_printf(&mp_plat_print,"Required bytes: %d\n",len);
+#endif //DEBUG_ANALOGBUFIO
+
+    while(captured_bytes < len) {
+        ret_num = 0;
+        ret = adc_digi_read_bytes(result, NUM_SAMPLES_PER_INTERRUPT, &ret_num, ADC_READ_TIMEOUT_MS);
+
+        if (ret == ESP_OK) {
+            for(uint32_t i=0; itype1.data;
+                            } else {
+                                *(uint16_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type2.data;
+                            }
+                        } else {
+                            if(output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
+                                *(uint32_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type1.data;
+                            } else {
+                                *(uint32_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type2.data;
+                            }
+                        }
+                        captured_bytes += ADC_RESULT_BYTE;
+                        captured_samples++;
+                    } else {
+                        return captured_samples;
+                    }
+                } else {
+#if defined(DEBUG_ANALOGBUFIO)
+                    if(ADC_RESULT_BYTE == 2) {
+                        mp_printf(&mp_plat_print,"Invalid sample received: 0x%0x\n",*(uint16_t *)(void *)&result[i]);
+                    } else {
+                        mp_printf(&mp_plat_print,"Invalid sample received: 0x%0x\n",*(uint32_t *)(void *)&result[i]);
+                    }
+#endif //DEBUG_ANALOGBUFIO
+                    return captured_samples;
+                } 
+            }
+        } else if (ret == ESP_ERR_TIMEOUT) {
+#if defined(DEBUG_ANALOGBUFIO)
+            mp_printf(&mp_plat_print,"ADC Timeout\n");
+#endif //DEBUG_ANALOGBUFIO
+            return captured_samples;
+        } else {
+#if defined(DEBUG_ANALOGBUFIO)
+            mp_printf(&mp_plat_print,"adc_digi_read_bytes failed error code:%d\n",ret);
+#endif //DEBUG_ANALOGBUFIO
+            return captured_samples;
+        }
+    }
+#if defined(DEBUG_ANALOGBUFIO)
+    mp_printf(&mp_plat_print,"Captured bytes: %d\n",captured_bytes);
+#endif //DEBUG_ANALOGBUFIO
+    return captured_samples;
+}
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.h b/ports/espressif/common-hal/analogbufio/BufferedIn.h
new file mode 100644
index 0000000000..0c9d7df3d7
--- /dev/null
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2023 Milind Movasha
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * 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_ESP32_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
+#define MICROPY_INCLUDED_ESP32_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "py/obj.h"
+
+//  This is the analogbufio object
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+    uint8_t chan;
+} analogbufio_bufferedin_obj_t;
+
+#endif // MICROPY_INCLUDED_ESP32_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H
diff --git a/ports/espressif/common-hal/analogbufio/__init__.c b/ports/espressif/common-hal/analogbufio/__init__.c
new file mode 100644
index 0000000000..b6c74b985b
--- /dev/null
+++ b/ports/espressif/common-hal/analogbufio/__init__.c
@@ -0,0 +1 @@
+// No analogbufio module functions.
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 460e651705..c82d622570 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -13,6 +13,7 @@ CIRCUITPY_FULL_BUILD ?= 1
 # These modules are implemented in ports//common-hal:
 CIRCUITPY_ALARM ?= 1
 CIRCUITPY_AUDIOBUSIO ?= 1
+CIRCUITPY_ANALOGBUFIO ?= 1
 CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
 CIRCUITPY_AUDIOCORE ?= 1

From 8a4a408707256a563764afd050be992594178b99 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 16:35:16 +0200
Subject: [PATCH 1878/2403] Disable settable-pystack too to make more space

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
index eb7f1c62e3..bdc3fc5890 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@@ -21,3 +21,8 @@
 #define IGNORE_PIN_PA25     1
 
 #define MICROPY_FATFS_EXFAT 0
+
+#ifdef CIRCUITPY_SETTABLE_PYSTACK
+#undef CIRCUITPY_SETTABLE_PYSTACK
+#endif
+#define CIRCUITPY_SETTABLE_PYSTACK 0

From d249af2a2434b155091b33ca72e3059d3642df32 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 17 Feb 2023 09:21:50 -0600
Subject: [PATCH 1879/2403] don't explicitly register ulab here

.. it is registered by MP_REGISTER_MODULE in ulab.

Closes: #7600
---
 py/objmodule.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/py/objmodule.c b/py/objmodule.c
index a9d20c7ee5..8f04a44597 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -218,9 +218,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     #if MICROPY_PY_UJSON && !CIRCUITPY
     { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
     #endif
-    #if CIRCUITPY_ULAB
-    { MP_ROM_QSTR(MP_QSTR_ulab), MP_ROM_PTR(&ulab_user_cmodule) },
-    #endif
     #if MICROPY_PY_URE && !CIRCUITPY
     { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
     #endif

From d7e6a78ef447d592feb37486a644de8fce1089b2 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 17:40:55 +0200
Subject: [PATCH 1880/2403] safemode prevent dynamic stack alloc

---
 main.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/main.c b/main.c
index 19ef60f2e1..5889ae5a67 100644
--- a/main.c
+++ b/main.c
@@ -133,17 +133,19 @@ static void reset_devices(void) {
 }
 
 #if MICROPY_ENABLE_PYSTACK
-STATIC supervisor_allocation *allocate_pystack(void) {
+STATIC supervisor_allocation *allocate_pystack(safe_mode_t safe_mode) {
     mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV && CIRCUITPY_SETTABLE_PYSTACK
     // Fetch value if exists from settings.toml
     // Leaves size to build default on any failure
-    (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
-    // Check if value is valid
-    pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
-    if (pystack_size < 384) {
-        serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
-        pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
+    if (safe_mode == SAFE_MODE_NONE || safe_mode == SAFE_MODE_USER) {
+        (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
+        // Check if value is valid
+        pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
+        if (pystack_size < 384) {
+            serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
+            pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
+        }
     }
     #endif
     supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
@@ -427,7 +429,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
         supervisor_allocation *pystack = NULL;
         #if MICROPY_ENABLE_PYSTACK
-        pystack = allocate_pystack();
+        pystack = allocate_pystack(safe_mode);
         #endif
         supervisor_allocation *heap = allocate_remaining_memory();
         start_mp(heap, pystack);
@@ -769,7 +771,7 @@ STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) {
 
     supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
-    pystack = allocate_pystack();
+    pystack = allocate_pystack(safe_mode);
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
     start_mp(heap, pystack);
@@ -806,7 +808,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
-    pystack = allocate_pystack();
+    pystack = allocate_pystack(safe_mode);
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
     start_mp(heap, pystack);
@@ -906,13 +908,13 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     #endif
 }
 
-STATIC int run_repl(void) {
+STATIC int run_repl(safe_mode_t safe_mode) {
     int exit_code = PYEXEC_FORCED_EXIT;
     stack_resize();
     filesystem_flush();
     supervisor_allocation *pystack = NULL;
     #if MICROPY_ENABLE_PYSTACK
-    pystack = allocate_pystack();
+    pystack = allocate_pystack(safe_mode);
     #endif
     supervisor_allocation *heap = allocate_remaining_memory();
     start_mp(heap, pystack);
@@ -1078,7 +1080,7 @@ int __attribute__((used)) main(void) {
     bool simulate_reset = true;
     for (;;) {
         if (!skip_repl) {
-            exit_code = run_repl();
+            exit_code = run_repl(get_safe_mode());
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {

From 58532ece3fb216ab552c2fa8f4578ef395e9ace7 Mon Sep 17 00:00:00 2001
From: Milind Movasha 
Date: Fri, 17 Feb 2023 23:50:41 +0530
Subject: [PATCH 1881/2403] Moved CIRCUITPY_ANALOGBUFIO flag to correct place
 in alphabetical order

---
 ports/espressif/mpconfigport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index c82d622570..79515619ea 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -12,8 +12,8 @@ CIRCUITPY_FULL_BUILD ?= 1
 
 # These modules are implemented in ports//common-hal:
 CIRCUITPY_ALARM ?= 1
-CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_ANALOGBUFIO ?= 1
+CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
 CIRCUITPY_AUDIOCORE ?= 1

From 309a5e600d605ab55864d1f07b236d9fe5fdfc63 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 17 Feb 2023 20:46:30 +0200
Subject: [PATCH 1882/2403] Hide it.

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 40952d261d..91d842231f 100644
--- a/Makefile
+++ b/Makefile
@@ -323,10 +323,11 @@ clean-nrf:
 clean-stm:
 	$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
 
+
+# This update will fail because the commits we need aren't the latest on the
+# branch. We can ignore that though because we fix it with the second command.
+# (Only works for git servers that allow sha fetches.)
 .PHONY: fetch-submodules
 fetch-submodules:
-	# This update will fail because the commits we need aren't the latest on the
-	# branch. We can ignore that though because we fix it with the second command.
-	# (Only works for git servers that allow sha fetches.)
 	git submodule update --init -N --depth 1 || true
 	git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'

From 20eb7d11bd840a9e2142c59ed69ee067d0f1fa33 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Fri, 17 Feb 2023 13:06:56 -0600
Subject: [PATCH 1883/2403] Changes times to seconds, remove dirty bitmap flag

---
 shared-bindings/gifio/OnDiskGif.c | 34 +++++++++++++------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 3d5bc03f62..32e6153b9a 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -122,29 +122,23 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_bitmap_obj, gifio_ondiskgif_obj_ge
 MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
     (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
 
-//|     def next_frame(self, set_dirty: bool = True) -> int:
-//|         """Loads the next frame. Returns expected delay before the next frame in milliseconds.
-//|
-//|         :param set_dirty: Mark the bitmap as dirty"""
-STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(size_t n_args, const mp_obj_t *args) {
-    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(args[0]);
-    bool setDirty = mp_const_true;
+//|     def next_frame(self) -> float:
+//|         """Loads the next frame. Returns expected delay before the next frame in seconds."""
+STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (n_args == 1) {
-        setDirty = mp_obj_is_true(args[1]);
-    }
-
-    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_next_frame(self, setDirty));
+    return mp_obj_new_float((float)common_hal_gifio_ondiskgif_next_frame(self, true) / 1000);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif_next_frame_obj, 1, 2, gifio_ondiskgif_obj_next_frame);
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_next_frame_obj, gifio_ondiskgif_obj_next_frame);
 
-//|     duration: int
-//|     """Returns the total duration of the GIF in milliseconds. (read only)"""
+
+//|     duration: float
+//|     """Returns the total duration of the GIF in seconds. (read only)"""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
-    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_duration(self));
+    return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_duration(self) / 1000);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_duration_obj, gifio_ondiskgif_obj_get_duration);
@@ -165,12 +159,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_frame_count_obj, gifio_ondiskgif_o
 MP_PROPERTY_GETTER(gifio_ondiskgif_frame_count_obj,
     (mp_obj_t)&gifio_ondiskgif_get_frame_count_obj);
 
-//|     min_delay: int
+//|     min_delay: float
 //|     """The minimum delay found between frames. (read only)"""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
-    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_min_delay(self));
+    return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_min_delay(self) / 1000);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_min_delay_obj, gifio_ondiskgif_obj_get_min_delay);
@@ -178,13 +172,13 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_min_delay_obj, gifio_ondiskgif_obj
 MP_PROPERTY_GETTER(gifio_ondiskgif_min_delay_obj,
     (mp_obj_t)&gifio_ondiskgif_get_min_delay_obj);
 
-//|     max_delay: int
+//|     max_delay: float
 //|     """The maximum delay found between frames. (read only)"""
 //|
 STATIC mp_obj_t gifio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
-    return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_max_delay(self));
+    return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_max_delay(self) / 1000);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_max_delay_obj, gifio_ondiskgif_obj_get_max_delay);

From 5b1a51d56b8a71743ed6da229a3875681e0838d8 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Thu, 16 Feb 2023 19:41:34 +0000
Subject: [PATCH 1884/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 8b3496cb65..076687d809 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: 2023-02-16 19:15+0000\n"
+"PO-Revision-Date: 2023-02-17 20:38+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -40,18 +40,25 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Por favor describa su problema en https://github.com/adafruit/circuitpython/"
+"issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Presione reset para salir de safe mode.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Estas in safe mode porque:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -603,7 +610,7 @@ msgstr "El tamaño del mapa de bits y los bits por valor deben cotejar"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "El dispositivo de inicialización debe estar primero (interface #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -945,7 +952,7 @@ msgstr "Error en regex"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Error en safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -1021,7 +1028,7 @@ msgstr "Error al escribir el flash interno."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "Falló detectado por el hardware."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1116,12 +1123,13 @@ msgstr "Hardware en uso, pruebe pines alternativos"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Alocación del Heap cuando la VM no esta corriendo."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
 msgstr ""
+"El Heap está corrupto, ya que la pila era muy pequeña. Incremente el tamaño."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1248,7 +1256,7 @@ msgstr "El temporizador interno watchdog terminó."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Error de interrupción."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -2057,7 +2065,7 @@ msgstr "Lectura de temperatura expirada"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr ""
+msgstr "El modulo `microcontrolador` fue usado para inicializar en modo seguro."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2069,7 +2077,7 @@ msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr ""
+msgstr "La potencia calló. Asegúrese que está suministrando suficiente energía."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2089,7 +2097,7 @@ msgstr "El signo del sample no iguala al del mixer"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Error gráve del firmware de un tercero."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2220,7 +2228,7 @@ msgstr "No se pudieron asignar buffers para la conversión con signo"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Imposible de asignar el heap."
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2442,40 +2450,40 @@ msgstr "Escrituras no admitidas en Characteristic"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "Usted presionó ambos botones al iniciar."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "Usted presionó el boton A al iniciar."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "Usted presionó el boton BOOT al iniciar"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "Usted presionó el boton SW38 al iniciar."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "Usted presionó el boton de Volumén al iniciar."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "Usted presionó el boton central al iniciar."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "Usted presionó el boton izquierdo al iniciar."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "Usted presionó el boton izquierdo al iniciar."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"

From 8fc24a6b2e3679aac43daf3d11a8dd618430c05b Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 16 Feb 2023 19:39:19 +0000
Subject: [PATCH 1885/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index cb68940269..69f1119677 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: 2023-02-16 19:15+0000\n"
+"PO-Revision-Date: 2023-02-17 20:38+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -38,18 +38,25 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Relate o problema com seu programa em https://github.com/adafruit/"
+"circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Pressione reset para sair do modo de segurança.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Você está no modo de segurança porque:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -605,7 +612,7 @@ msgstr "O tamanho do bitmap e os bits por valor devem coincidir"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "O dispositivo de inicialização deve ser o primeiro (interface #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -944,7 +951,7 @@ msgstr "Erro no regex"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Erro no safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -1020,7 +1027,7 @@ msgstr "Falha ao gravar o flash interno."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "Falha detectada pelo hardware."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1113,12 +1120,14 @@ msgstr "O hardware está em uso, tente os pinos alternativos"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Alocação dinâmica de variáveis quando a VM não estiver funcionando."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
 msgstr ""
+"A área de alocação dinâmica de variáveis foi corrompida porque a pilha de "
+"funções era muito pequena. Aumente o tamanho da pilha."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1244,7 +1253,7 @@ msgstr "O temporizador do watchdog interno expirou."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Erro de interrupção."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -2052,6 +2061,7 @@ msgstr "A leitura da temperatura expirou"
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
+"O módulo `microcontroller` foi usado para inicializar em modo de segurança."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2064,6 +2074,7 @@ msgstr "O comprimento dos rgb_pins devem ser 6, 12, 18, 24, ou 30"
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
+"A alimentação foi reduzida. Certifique-se de fornecer energia suficiente."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2083,7 +2094,7 @@ msgstr "A amostragem \"signedness\" não coincide com a do mixer"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Erro fatal no firmware de terceiros."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2215,7 +2226,7 @@ msgstr "Não é possível alocar buffers para conversão assinada"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Não é possível alocar a área de alocação dinâmica de variáveis."
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2438,40 +2449,40 @@ msgstr "A escrita não é compatível na Característica"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "Você pressionou os dois botões durante a inicialização."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "Você pressionou o botão A na inicialização."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "Você pressionou o botão BOOT na inicialização"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "Você pressionou o botão SW38 na inicialização."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "Você pressionou o botão VOLUME na inicialização."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "Você pressionou o botão central na inicialização."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "Você pressionou o botão esquerdo na inicialização."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "Você pressionou o botão de reinicialização durante a inicialização."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"

From 512f2cc12ffe9844b04e0c6502183d53a17a8014 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 16 Feb 2023 19:18:01 +0000
Subject: [PATCH 1886/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 95c9674dd7..f0f4162e67 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: 2023-02-15 21:55+0000\n"
+"PO-Revision-Date: 2023-02-17 20:38+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -38,18 +38,25 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Skicka in ett ärende med ditt program till https://github.com/adafruit/"
+"circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Tryck reset för att lämna säkert läge.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Du är i säkert läge eftersom:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -600,7 +607,7 @@ msgstr "Bitmappstorlek och bitar per värde måste överensstämma"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "Boot-enhet måste vara först (gränssnitt #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -937,7 +944,7 @@ msgstr "Fel i regex"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Fel i safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -1013,7 +1020,7 @@ msgstr "Det gick inte att skriva till intern flash."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "Fel upptäckt av hårdvara."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1104,12 +1111,12 @@ msgstr "Hårdvaran används redan, prova alternativa pinnar"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Heap-allokering när VM inte körs."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
-msgstr ""
+msgstr "Heap skadades eftersom stacken var för liten. Öka stackstorlek."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1231,7 +1238,7 @@ msgstr "Intern watchdog-timer har löpt ut."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Interrupt-fel."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -2034,7 +2041,7 @@ msgstr "Temperaturavläsning tog för lång tid"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr ""
+msgstr "Modulen `microcontroller` användes för att starta i felsäkert läge."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2046,7 +2053,7 @@ msgstr "Längden på rgb_pins vara 6, 12, 18, 24 eller 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr ""
+msgstr "Spänningen sjönk. Se till att du ger tillräckligt med ström."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2066,7 +2073,7 @@ msgstr "Samplingens signerad/osignerad stämmer inte med mixern"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Fel från firmware från tredje part."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2195,7 +2202,7 @@ msgstr "Det går inte att allokera buffert för signerad konvertering"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Kan inte allokera heap."
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2415,40 +2422,40 @@ msgstr "Skrivning stöds inte på karaktäristik"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "Du tryckte ner båda knapparna vid start."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "Du tryckte ner knapp A vid start."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "Du tryckte ner BOOT-knappen vid start"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "Du tryckte ned SW38-knappen vid start."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "Du tryckte ned VOLYM-knappen vid start."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "Du tryckte ned mittknappen vid start."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "Du tryckte ned vänster knapp vid start."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "Du tryckte på reset-knappen under uppstart."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"

From b2a205e6150d71b29db8d389d9cd0c7c4be07f03 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Fri, 17 Feb 2023 15:48:26 -0600
Subject: [PATCH 1887/2403] Doc fix

---
 shared-bindings/gifio/OnDiskGif.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 32e6153b9a..83cf5539e7 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -34,8 +34,7 @@
 #include "shared-bindings/gifio/OnDiskGif.h"
 
 //| class OnDiskGif:
-//|     """Loads frames of the GIF straight from disk. This minimizes memory use but can
-//|     lead to much slower pixel load times
+//|     """Loads one frame of a GIF into memory at a time.
 //|
 //|     .. code-block:: Python
 //|

From 13716c9c303f8c6e14c5d5cc6b67f6c815ba38e2 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 17 Feb 2023 23:29:44 +0100
Subject: [PATCH 1888/2403] tweak the UART in use message on RP2040

---
 locale/circuitpython.pot                  | 5 ++++-
 ports/raspberrypi/common-hal/busio/UART.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 72ee60cc0c..cafc4b9b0e 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -438,7 +438,6 @@ msgid "All SPI peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr ""
 
@@ -2149,6 +2148,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
index 8c33226707..156a5e11ce 100644
--- a/ports/raspberrypi/common-hal/busio/UART.c
+++ b/ports/raspberrypi/common-hal/busio/UART.c
@@ -111,7 +111,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     uint8_t uart_id = ((((tx != NULL) ? tx->number : rx->number) + 4) / 8) % NUM_UARTS;
 
     if (uart_status[uart_id] != STATUS_FREE) {
-        mp_raise_RuntimeError(translate("All UART peripherals are in use"));
+        mp_raise_ValueError(translate("UART peripheral in use"));
     }
     // These may raise exceptions if pins are already in use.
     self->tx_pin = pin_init(uart_id, tx, 0);

From 023efb790c2b607f0a9ea5b91601121faf229bee Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 18 Feb 2023 04:06:01 +0100
Subject: [PATCH 1889/2403] 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             | 11 ++++++++---
 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          |  5 ++++-
 locale/ru.po             |  5 ++++-
 locale/sv.po             |  5 ++++-
 locale/tr.po             |  5 ++++-
 locale/zh_Latn_pinyin.po |  5 ++++-
 19 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index fc74173994..8c0b3066f8 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -453,7 +453,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Semua perangkat SPI sedang digunakan"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Semua perangkat UART sedang digunakan"
 
@@ -2137,6 +2136,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index d48c02b952..c18e714f75 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -454,7 +454,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Všechny SPI periferie jsou používány"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Všechny UART periferie jsou používány"
 
@@ -2126,6 +2125,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c9d5d3955b..4569dfb508 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -457,7 +457,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Alle SPI-Peripheriegeräte sind in Benutzung"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Alle UART-Peripheriegeräte sind in Benutzung"
 
@@ -2159,6 +2158,10 @@ msgstr "UART wird de-initialisiert"
 msgid "UART init"
 msgstr "UART-Initialisierung"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "UART wird erneut Initialisiert"
diff --git a/locale/el.po b/locale/el.po
index 6f8d4e4be0..c939577cd5 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -459,7 +459,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Όλα τα SPI περιφεριακά είναι σε χρήση"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Όλα τα UART περιφεριακά ειναι σε χρήση"
 
@@ -2134,6 +2133,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index aba4255e9b..e960651197 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -457,7 +457,6 @@ msgid "All SPI peripherals are in use"
 msgstr "All SPI peripherals are in use"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "All UART peripherals are in use"
 
@@ -2132,6 +2131,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index 076687d809..3ca89f4430 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -465,7 +465,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Todos los periféricos SPI están siendo usados"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Todos los periféricos UART están siendo usados"
 
@@ -2065,7 +2064,8 @@ msgstr "Lectura de temperatura expirada"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr "El modulo `microcontrolador` fue usado para inicializar en modo seguro."
+msgstr ""
+"El modulo `microcontrolador` fue usado para inicializar en modo seguro."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2077,7 +2077,8 @@ msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr "La potencia calló. Asegúrese que está suministrando suficiente energía."
+msgstr ""
+"La potencia calló. Asegúrese que está suministrando suficiente energía."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2179,6 +2180,10 @@ msgstr "Desinicialización de UART"
 msgid "UART init"
 msgstr "Inicialización de UART"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "Re-inicialización de UART"
diff --git a/locale/fil.po b/locale/fil.po
index 7da4d6ce83..d5857a53ea 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -452,7 +452,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Lahat ng SPI peripherals ay ginagamit"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 #, fuzzy
 msgid "All UART peripherals are in use"
 msgstr "Lahat ng I2C peripherals ginagamit"
@@ -2127,6 +2126,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 4919bcebff..19f75abfac 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -458,7 +458,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Tous les périphériques SPI sont utilisés"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Tous les périphériques UART sont utilisés"
 
@@ -2181,6 +2180,10 @@ msgstr "Dé-initialisation du UART"
 msgid "UART init"
 msgstr "Initialisation UART"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "Ré-initialisation du UART"
diff --git a/locale/hi.po b/locale/hi.po
index 94dda9b2d1..70bda4ec7c 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -450,7 +450,6 @@ msgid "All SPI peripherals are in use"
 msgstr ""
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr ""
 
@@ -2111,6 +2110,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a0b50f6d24..d3b91d4c3d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -455,7 +455,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Tutte le periferiche SPI sono in uso"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 #, fuzzy
 msgid "All UART peripherals are in use"
 msgstr "Tutte le periferiche I2C sono in uso"
@@ -2134,6 +2133,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index bfd8471f38..dca26f752b 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -457,7 +457,6 @@ msgid "All SPI peripherals are in use"
 msgstr "全てのSPI周辺機器が使用中"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "全てのUART周辺機器が使用中"
 
@@ -2127,6 +2126,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index daa474f57d..c08aa5b714 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -451,7 +451,6 @@ msgid "All SPI peripherals are in use"
 msgstr "사용중인 모든 SPI주변 기기"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "사용중인 모든 UART주변 기기"
 
@@ -2114,6 +2113,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 142e538a28..9f5a7d382f 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -450,7 +450,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Alle SPI peripherals zijn in gebruik"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Alle UART peripherals zijn in gebruik"
 
@@ -2132,6 +2131,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 10c5daf794..6320ff566f 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -452,7 +452,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Wszystkie peryferia SPI w użyciu"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Wszystkie peryferia UART w użyciu"
 
@@ -2119,6 +2118,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 69f1119677..eab698b723 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -467,7 +467,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Todos os periféricos SPI estão em uso"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Todos os periféricos UART estão em uso"
 
@@ -2176,6 +2175,10 @@ msgstr "descontinuar o início UART"
 msgid "UART init"
 msgstr "inicialização do UART"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "Reinicialização do UART"
diff --git a/locale/ru.po b/locale/ru.po
index dff2abbd1e..7f73a33083 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -457,7 +457,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Все периферийные устройства SPI уже используются"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Все периферийные устройства UART уже используются"
 
@@ -2174,6 +2173,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index f0f4162e67..cfd6fd582c 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -464,7 +464,6 @@ msgid "All SPI peripherals are in use"
 msgstr "All SPI-kringutrustning används"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Alla UART-kringutrustning används"
 
@@ -2153,6 +2152,10 @@ msgstr "UART omstart"
 msgid "UART init"
 msgstr "UART start"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "UART omstart"
diff --git a/locale/tr.po b/locale/tr.po
index 52b6031590..1adac6b08d 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -459,7 +459,6 @@ msgid "All SPI peripherals are in use"
 msgstr "Tüm SPI çevre birimleri kullanımda"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "Tüm UART çevre birimleri kullanımda"
 
@@ -2133,6 +2132,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 19bf8e2543..5b180eaec1 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -459,7 +459,6 @@ msgid "All SPI peripherals are in use"
 msgstr "suǒyǒu SPI wàishè dōu zài shǐyòng zhōng"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
-#: ports/raspberrypi/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr "suǒyǒu UART wàishè dōu zài shǐyòng zhōng"
 
@@ -2151,6 +2150,10 @@ msgstr "UART qù chūshǐhuà"
 msgid "UART init"
 msgstr "UART chūshǐhuà"
 
+#: ports/raspberrypi/common-hal/busio/UART.c
+msgid "UART peripheral in use"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
 msgstr "UART chóngxīn qǐdòng"

From c637ec9ea03448a619d8237613532ead02794aca Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Fri, 17 Feb 2023 23:37:49 -0600
Subject: [PATCH 1890/2403] Removed forgotten func defn

---
 shared-bindings/gifio/OnDiskGif.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
index aa84baf32d..cdd884ec1d 100644
--- a/shared-bindings/gifio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -38,7 +38,6 @@ uint32_t common_hal_gifio_ondiskgif_get_pixel(gifio_ondiskgif_t *bitmap,
     int16_t x, int16_t y);
 
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self);
-mp_obj_t common_hal_gifio_ondiskgif_get_pixel_shader(gifio_ondiskgif_t *self);
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self);
 uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self);
 uint8_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty);

From ead5751803ae2c770ec5923c5c996cb1f33aa930 Mon Sep 17 00:00:00 2001
From: Milind Movasha 
Date: Sat, 18 Feb 2023 14:23:49 +0530
Subject: [PATCH 1891/2403] Pre-commit: Done the formatting changes Pre-commit:
 Fixed compilation error for other ESP32C3/ESP32S3/ESP32H2 boards Review
 comment: Removed the self->pin NULL check Review comment: Using
 raise_ValueError_invalid_pin when adc_index is not ADC_UNIT1 for ESP32 Review
 comment: Optimized the code to set data in buffer from DMA results Fix: For
 ESP32C3 boards continuing collecting samples after channel mismatch as DMA
 runs in alternating UNIT mode Fix: For ESP32S3 and ESP32H2 setting conversion
 mode to type2

---
 .../common-hal/analogbufio/BufferedIn.c       | 161 +++++++++---------
 1 file changed, 83 insertions(+), 78 deletions(-)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index e26afb283e..0a88ccaba2 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -41,17 +41,17 @@
 #include "freertos/semphr.h"
 #include "driver/adc.h"
 
-//#define DEBUG_ANALOGBUFIO
+// #define DEBUG_ANALOGBUFIO
 
 #define NUM_SAMPLES_PER_INTERRUPT   256
 #define NUM_ADC_CHANNELS            1
-#define DMA_BUFFER_SIZE	   	        1024
+#define DMA_BUFFER_SIZE             1024
 #define ATTENUATION                 ADC_ATTEN_DB_0
 #define ADC_READ_TIMEOUT_MS         2000
 
 #if defined(CONFIG_IDF_TARGET_ESP32)
 #define ADC_RESULT_BYTE     2
-#define ADC_CONV_LIMIT_EN   1   //For ESP32, this should always be set to 1
+#define ADC_CONV_LIMIT_EN   1   // For ESP32, this should always be set to 1
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
 #define ADC_RESULT_BYTE     2
 #define ADC_CONV_LIMIT_EN   0
@@ -71,12 +71,8 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     uint16_t adc1_chan_mask = 0;
     uint16_t adc2_chan_mask = 0;
 
-    if( self->pin != NULL) {
-        mp_raise_ValueError(translate("ADC DMA already initialized"));
-    }
-
     output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
-    if(pin->adc_index == ADC_UNIT_1) {
+    if (pin->adc_index == ADC_UNIT_1) {
         convert_mode = ADC_CONV_SINGLE_UNIT_1;
     } else {
         convert_mode = ADC_CONV_SINGLE_UNIT_2;
@@ -90,34 +86,37 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
 
     /*
      *	Chip version	Conversion Mode		Output Format Type
-     *	ESP32			1					TYPE1
-     *	ESP32S2			1,2,BOTH,ALTER		TYPE1, TYPE2
-     *	ESP32C3			ALTER				TYPE2
-     *	ESP32S3			1,2,BOTH,ALTER		TYPE2
-     *	ESP32H3			1,2,BOTH,ALTER		TYPE2
+     *	ESP32           1                   TYPE1
+     *	ESP32S2         1,2,BOTH,ALTER      TYPE1, TYPE2
+     *	ESP32C3         ALTER               TYPE2
+     *	ESP32S3         1,2,BOTH,ALTER      TYPE2
+     *	ESP32H3         1,2,BOTH,ALTER      TYPE2
      */
 
-#if defined(CONFIG_IDF_TARGET_ESP32)
-    if(pin->adc_index != ADC_UNIT_1) {
-        mp_raise_ValueError(translate("ESP32 only supports ADC1 unit"));
+    #if defined(CONFIG_IDF_TARGET_ESP32)
+    if (pin->adc_index != ADC_UNIT_1) {
+        /* 
+         * ESP32 only supports ADC1 unit
+         * https://www.espressif.com/sites/default/files/documentation/esp32_technical_reference_manual_en.pdf
+         * Table 29-3
+         */
+        raise_ValueError_invalid_pin();
     }
-#endif
-#if defined(CONFIG_IDF_TARGET_ESP32S2)
-#endif
-#if defined(CONFIG_IDF_TARGET_ESP32C3)
-    //ESP32C3 only supports alter mode
+    #endif
+
+    #if defined(CONFIG_IDF_TARGET_ESP32C3)
+    /* ESP32C3 only supports alter mode */
     convert_mode = ADC_CONV_ALTER_UNIT;
+    #endif
+
+    #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2)
     output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
-#endif
-#if defined(CONFIG_IDF_TARGET_ESP32S3)
-#endif
-#if defined(CONFIG_IDF_TARGET_ESP32H2)
-#endif
+    #endif
 
     self->pin = pin;
     common_hal_mcu_pin_claim(pin);
 
-    if(pin->adc_index == ADC_UNIT_1) {
+    if (pin->adc_index == ADC_UNIT_1) {
         adc1_chan_mask = 1 << pin->adc_channel;
     } else {
         adc2_chan_mask = 1 << pin->adc_channel;
@@ -130,11 +129,11 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
         .adc2_chan_mask = adc2_chan_mask,
     };
 
-#if defined(DEBUG_ANALOGBUFIO)
+    #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"pin:%d, ADC channel:%d, ADC index:%d, adc1_chan_mask:0x%x, adc2_chan_mask:0x%x\n",pin->number,pin->adc_channel,pin->adc_index,adc1_chan_mask,adc2_chan_mask);
-#endif //DEBUG_ANALOGBUFIO
+    #endif // DEBUG_ANALOGBUFIO
     esp_err_t err = adc_digi_initialize(&adc_dma_config);
-    if(ESP_OK != err) {
+    if (ESP_OK != err) {
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to initialize ADC DMA controller, ErrorCode:%d"),err);
     }
@@ -148,14 +147,14 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
         .format = output_format,
     };
 
-#if defined(DEBUG_ANALOGBUFIO)
+    #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"conversion_mode:%d, format:%d, conv_limit_en:%d, sample_rate:%d\n",convert_mode,output_format,ADC_CONV_LIMIT_EN,sample_rate);
-#endif //DEBUG_ANALOGBUFIO
+    #endif // DEBUG_ANALOGBUFIO
 
     adc_digi_pattern_config_t adc_pattern[NUM_ADC_CHANNELS] = {0};
     adc_pattern[0].atten = ATTENUATION;
     adc_pattern[0].channel = pin->adc_channel;
-    if(pin->adc_index == ADC_UNIT_1) {
+    if (pin->adc_index == ADC_UNIT_1) {
         adc_pattern[0].unit = 0;
     } else {
         adc_pattern[0].unit = 1;
@@ -163,17 +162,17 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     adc_pattern[0].bit_width = SOC_ADC_DIGI_MAX_BITWIDTH;
 
     dig_cfg.adc_pattern = adc_pattern;
-#if defined(DEBUG_ANALOGBUFIO)
+    #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"adc_pattern[0].channel:%d, adc_pattern[0].unit:%d, adc_pattern[0].atten:%d\n",adc_pattern[0].channel,adc_pattern[0].unit,adc_pattern[0].atten);
-#endif //DEBUG_ANALOGBUFIO
+    #endif // DEBUG_ANALOGBUFIO
 
     err = adc_digi_controller_configure(&dig_cfg);
-    if(ESP_OK != err) {
+    if (ESP_OK != err) {
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to configure ADC DMA controller, ErrorCode:%d"),err);
     }
     err = adc_digi_start();
-    if(ESP_OK != err) {
+    if (ESP_OK != err) {
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to start ADC DMA controller, ErrorCode:%d"),err);
     }
@@ -196,36 +195,46 @@ void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self
     self->pin = NULL;
 }
 
-static bool check_valid_data(const adc_digi_output_data_t *data)
-{
+static bool check_valid_data(const adc_digi_output_data_t *data) {
     unsigned int unit = data->type2.unit;
-    if(output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE2) {
-        if (data->type2.channel >= SOC_ADC_CHANNEL_NUM(unit)) return false;
-        if (adc_channel != data->type2.channel) return false;
+    if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE2) {
+        if (data->type2.channel >= SOC_ADC_CHANNEL_NUM(unit)) {
+            return false;
+        }
+        if (adc_channel != data->type2.channel) {
+            return false;
+        }
     } else {
-        if( convert_mode == ADC_CONV_SINGLE_UNIT_1 ) {
+        if ( convert_mode == ADC_CONV_SINGLE_UNIT_1 ) {
             unit = 0;
         } else {
             unit = 1;
         }
-        if (data->type1.channel >= SOC_ADC_CHANNEL_NUM(unit)) return false;
-        if (adc_channel != data->type1.channel) return false;
+        #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
+        if (data->type1.channel >= SOC_ADC_CHANNEL_NUM(unit)) {
+            return false;
+        }
+        if (adc_channel != data->type1.channel) {
+            return false;
+        }
+        #endif
+    }
+    if (unit > 2) {
+        return false;
     }
-    if (unit > 2) return false;
     return true;
 }
 
-
 uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t *self, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample) {
-    uint8_t result[NUM_SAMPLES_PER_INTERRUPT] __attribute__ ((aligned (4))) = {0};
+    uint8_t result[NUM_SAMPLES_PER_INTERRUPT] __attribute__ ((aligned(4))) = {0};
     uint32_t captured_samples = 0;
     uint32_t captured_bytes = 0;
     esp_err_t ret;
     uint32_t ret_num = 0;
 
-#if defined(DEBUG_ANALOGBUFIO)
+    #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"Required bytes: %d\n",len);
-#endif //DEBUG_ANALOGBUFIO
+    #endif // DEBUG_ANALOGBUFIO
 
     while(captured_bytes < len) {
         ret_num = 0;
@@ -233,51 +242,47 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
 
         if (ret == ESP_OK) {
             for(uint32_t i=0; itype1.data;
-                            } else {
-                                *(uint16_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type2.data;
-                            }
+                adc_digi_output_data_t *pResult = (adc_digi_output_data_t *) (void *)&result[i];
+                if (check_valid_data(pResult)) {
+                    if (captured_bytes < len) {
+                        uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes];
+                        if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
+                            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
+                            *pBuffer = pResult->type1.data;
+                            #endif
                         } else {
-                            if(output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
-                                *(uint32_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type1.data;
-                            } else {
-                                *(uint32_t *)(void *)&buffer[captured_bytes] = ((adc_digi_output_data_t *) (void *)&result[i])->type2.data;
-                            }
+                            *pBuffer = pResult->type2.data;
                         }
-                        captured_bytes += ADC_RESULT_BYTE;
+                        captured_bytes += sizeof(uint16_t);
                         captured_samples++;
                     } else {
                         return captured_samples;
                     }
                 } else {
-#if defined(DEBUG_ANALOGBUFIO)
-                    if(ADC_RESULT_BYTE == 2) {
-                        mp_printf(&mp_plat_print,"Invalid sample received: 0x%0x\n",*(uint16_t *)(void *)&result[i]);
-                    } else {
-                        mp_printf(&mp_plat_print,"Invalid sample received: 0x%0x\n",*(uint32_t *)(void *)&result[i]);
-                    }
-#endif //DEBUG_ANALOGBUFIO
+                    #if !defined(CONFIG_IDF_TARGET_ESP32C3)
+                    // For all chips except for ESP32C3 we would receive samples only from one unit
+                    // For ESP32C3 we may receive sample from alternating units and need to ignore them
+                    #if defined(DEBUG_ANALOGBUFIO)
+                    mp_printf(&mp_plat_print,"Invalid sample received: 0x%x\n",pResult->val);
+                    #endif // DEBUG_ANALOGBUFIO
                     return captured_samples;
-                } 
+                    #endif
+                }
             }
         } else if (ret == ESP_ERR_TIMEOUT) {
-#if defined(DEBUG_ANALOGBUFIO)
+            #if defined(DEBUG_ANALOGBUFIO)
             mp_printf(&mp_plat_print,"ADC Timeout\n");
-#endif //DEBUG_ANALOGBUFIO
+            #endif // DEBUG_ANALOGBUFIO
             return captured_samples;
         } else {
-#if defined(DEBUG_ANALOGBUFIO)
+            #if defined(DEBUG_ANALOGBUFIO)
             mp_printf(&mp_plat_print,"adc_digi_read_bytes failed error code:%d\n",ret);
-#endif //DEBUG_ANALOGBUFIO
+            #endif // DEBUG_ANALOGBUFIO
             return captured_samples;
         }
     }
-#if defined(DEBUG_ANALOGBUFIO)
+    #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"Captured bytes: %d\n",captured_bytes);
-#endif //DEBUG_ANALOGBUFIO
+    #endif // DEBUG_ANALOGBUFIO
     return captured_samples;
 }

From 4683e48337941a55a35b3b9f8ab2aee51a4ae4fc Mon Sep 17 00:00:00 2001
From: Milind Movasha 
Date: Sat, 18 Feb 2023 14:40:12 +0530
Subject: [PATCH 1892/2403] Further formatting changes related to whitespaces

---
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index 0a88ccaba2..e2928e5236 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -95,7 +95,7 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
 
     #if defined(CONFIG_IDF_TARGET_ESP32)
     if (pin->adc_index != ADC_UNIT_1) {
-        /* 
+        /*
          * ESP32 only supports ADC1 unit
          * https://www.espressif.com/sites/default/files/documentation/esp32_technical_reference_manual_en.pdf
          * Table 29-3
@@ -205,7 +205,7 @@ static bool check_valid_data(const adc_digi_output_data_t *data) {
             return false;
         }
     } else {
-        if ( convert_mode == ADC_CONV_SINGLE_UNIT_1 ) {
+        if (convert_mode == ADC_CONV_SINGLE_UNIT_1) {
             unit = 0;
         } else {
             unit = 1;
@@ -236,12 +236,12 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     mp_printf(&mp_plat_print,"Required bytes: %d\n",len);
     #endif // DEBUG_ANALOGBUFIO
 
-    while(captured_bytes < len) {
+    while (captured_bytes < len) {
         ret_num = 0;
         ret = adc_digi_read_bytes(result, NUM_SAMPLES_PER_INTERRUPT, &ret_num, ADC_READ_TIMEOUT_MS);
 
         if (ret == ESP_OK) {
-            for(uint32_t i=0; i
Date: Sat, 18 Feb 2023 14:45:37 +0530
Subject: [PATCH 1893/2403] Additional formatting change related to whitespaces

---
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index e2928e5236..582fe6e700 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -241,7 +241,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
         ret = adc_digi_read_bytes(result, NUM_SAMPLES_PER_INTERRUPT, &ret_num, ADC_READ_TIMEOUT_MS);
 
         if (ret == ESP_OK) {
-            for (uint32_t i=0; i
Date: Sat, 18 Feb 2023 14:49:11 +0530
Subject: [PATCH 1894/2403] Yet another formatting change related to
 whitespaces

---
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index 582fe6e700..db76069a69 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -242,7 +242,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
 
         if (ret == ESP_OK) {
             for (uint32_t i = 0; i < ret_num; i += ADC_RESULT_BYTE) {
-                adc_digi_output_data_t *pResult = (adc_digi_output_data_t *) (void *)&result[i];
+                adc_digi_output_data_t *pResult = (adc_digi_output_data_t *)(void *)&result[i];
                 if (check_valid_data(pResult)) {
                     if (captured_bytes < len) {
                         uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes];

From dc80133d7e60a24441d5b432505f9a8ca12ea4d1 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 18 Feb 2023 16:29:59 +0530
Subject: [PATCH 1895/2403] re-enable changes per commit

---
 .github/workflows/build.yml    | 21 ++++++++++-----------
 tools/ci_changes_per_commit.py | 30 ++++++++++++++----------------
 tools/ci_set_matrix.py         |  3 +++
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00c7f8749f..7029cc4897 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,17 +54,16 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
-    # Disabled: Needs to be updated
-    # - name: Get last commit with checks
-    #   id: get-last-commit-with-checks
-    #   if: github.event_name == 'pull_request'
-    #   working-directory: tools
-    #   run: python3 -u ci_changes_per_commit.py
-    #   env:
-    #     REPO: ${{ github.repository }}
-    #     PULL: ${{ github.event.number }}
-    #     GITHUB_TOKEN: ${{ github.token }}
-    #     EXCLUDE_COMMIT: ${{ github.event.after }}
+    - name: Get last commit with checks
+      id: get-last-commit-with-checks
+      if: github.event_name == 'pull_request'
+      working-directory: tools
+      run: python3 -u ci_changes_per_commit.py
+      env:
+        REPO: ${{ github.repository }}
+        PULL: ${{ github.event.number }}
+        GITHUB_TOKEN: ${{ github.token }}
+        EXCLUDE_COMMIT: ${{ github.event.after }}
     - name: Set up mpy-cross
       uses: ./.github/actions/mpy_cross
       with:
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index 4d71f8e38c..6452f241c0 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -166,26 +166,14 @@ def get_commit_depth_and_check_suite(query_commits):
             return [None, None]
 
 
-def append_runs_to_list(runs, bad_runs_by_matrix):
-    regex_matrix = re.compile("^build-[^ ]+")
-    regex_board = re.compile("\([^ ]+\)$")
-    for run in runs["nodes"]:
-        name = run["name"]
-        res_matrix = regex_matrix.search(name)
-        if res_matrix:
-            matrix = res_matrix.group()
-            if matrix not in bad_runs_by_matrix:
-                bad_runs_by_matrix[matrix] = []
-            res_board = regex_board.search(name)
-            if res_board:
-                bad_runs_by_matrix[matrix].append(res_board.group()[1:-1])
-
-
 def get_bad_check_runs(query_check_runs):
     more_pages = True
     bad_runs_by_matrix = {}
+
     run_types = ["failed", "incomplete"]
 
+    regex_matrix = re.compile("^[^\n ]+ \/ (build|run) \([^\n ]+\)$")
+
     while more_pages:
         check_runs = query_check_runs.fetch()["data"]["node"]
         more_pages = False
@@ -194,7 +182,17 @@ def get_bad_check_runs(query_check_runs):
             run_type_camel = run_type.capitalize() + "Run"
             run_type = run_type + "Runs"
 
-            append_runs_to_list(check_runs[run_type], bad_runs_by_matrix)
+            for check_run in check_runs[run_type]["nodes"]:
+                name = check_run["name"]
+                res_matrix = regex_matrix.search(name)
+                if res_matrix:
+                    matrix = name.split(" /", 1)[0]
+                    matrix_job = name.split(" (", 1)[1][:-1]
+                    bad_runs_by_matrix.setdefault(matrix, []).append(matrix_job)
+                elif name != "scheduler":
+                    bad_runs_by_matrix[name] = True
+                else:
+                    return {}
 
             if query_check_runs.paginate(
                 check_runs[run_type]["pageInfo"], "after" + run_type_camel
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 6e7a4f1229..8c248d8fd7 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -92,6 +92,9 @@ def set_output(name: str, value):
 
 
 def set_boards_to_build(build_all: bool):
+    if "mpy_cross" in last_failed_jobs or "tests" in last_failed_jobs:
+        build_all = True
+
     # Get boards in json format
     boards_info_json = build_board_info.get_board_mapping()
     all_board_ids = set()

From 556e2c915d6a399cb3210c4baf7984794233a469 Mon Sep 17 00:00:00 2001
From: Milind Movasha 
Date: Sat, 18 Feb 2023 20:42:31 +0530
Subject: [PATCH 1896/2403] Fix for pre-commit issue related to translation

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

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 775a85ffe1..f3186a49c8 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2162,6 +2162,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2180,10 +2185,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"

From f165b0155282e756dbd38e6c4f8520263a79dfe2 Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Sat, 18 Feb 2023 10:17:28 -0500
Subject: [PATCH 1897/2403] Reintroduce Python rendering per review feedback

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 8e0f2be25b..c81bf63123 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -16,6 +16,7 @@ body:
         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 on 2021-03-01; Raspberry Pi Pico with rp2040
+      render: python
     validations:
       required: true
   - type: textarea
@@ -35,7 +36,7 @@ body:
       label: Behavior
       description: What happens when you run the code above? Include error messages (if any).
       placeholder: |
-        ```
+        ```python
         Traceback (most recent call last):
           File "", line 1, in 
           TimeoutError: Clock stretch too long

From 694537acb323314a25a802e53c4c34be5c6ced73 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 18 Feb 2023 10:35:39 -0600
Subject: [PATCH 1898/2403] change validation maximum computation

---
 shared-bindings/displayio/Bitmap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 566bee954c..e14ac638e2 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -156,7 +156,9 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
         // load
         return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_bitmap_get_pixel(self, x, y));
     } else {
-        mp_uint_t value = (mp_uint_t)mp_arg_validate_int_range(mp_obj_get_int(value_obj), 0,(1u << common_hal_displayio_bitmap_get_bits_per_value(self)) - 1, MP_QSTR_value);
+        mp_uint_t value = (mp_uint_t)mp_arg_validate_int_range(
+            mp_obj_get_int(value_obj), 0,
+            (UINT32_MAX >> (32 - common_hal_displayio_bitmap_get_bits_per_value(self))), MP_QSTR_value);
         common_hal_displayio_bitmap_set_pixel(self, x, y, value);
     }
     return mp_const_none;

From e78875a93b387c1ab44c6972f4b78cd48a24512e Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 18 Feb 2023 15:35:56 -0600
Subject: [PATCH 1899/2403] ColorConverter output colorspace fix

---
 shared-bindings/displayio/ColorConverter.c | 4 +---
 shared-module/displayio/ColorConverter.c   | 1 +
 shared-module/displayio/ColorConverter.h   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 9c3d297fdc..06de5a4b09 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -73,10 +73,8 @@ STATIC mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_int_t color = mp_arg_validate_type_int(color_obj, MP_QSTR_color);
-    _displayio_colorspace_t colorspace;
-    colorspace.depth = 16;
     uint32_t output_color;
-    common_hal_displayio_colorconverter_convert(self, &colorspace, color, &output_color);
+    common_hal_displayio_colorconverter_convert(self, &self->output_colorspace, color, &output_color);
     return MP_OBJ_NEW_SMALL_INT(output_color);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_convert_obj, displayio_colorconverter_obj_convert);
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 707601a3e7..078c7876e4 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -45,6 +45,7 @@ void common_hal_displayio_colorconverter_construct(displayio_colorconverter_t *s
     self->dither = dither;
     self->transparent_color = NO_TRANSPARENT_COLOR;
     self->input_colorspace = input_colorspace;
+    self->output_colorspace.depth = 16;
 }
 
 uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888) {
diff --git a/shared-module/displayio/ColorConverter.h b/shared-module/displayio/ColorConverter.h
index 7e4e9819ac..f67b1dbfda 100644
--- a/shared-module/displayio/ColorConverter.h
+++ b/shared-module/displayio/ColorConverter.h
@@ -37,6 +37,7 @@ typedef struct displayio_colorconverter {
     mp_obj_base_t base;
     bool dither;
     uint8_t input_colorspace;
+    _displayio_colorspace_t output_colorspace;
     uint32_t transparent_color;
 } displayio_colorconverter_t;
 

From b4ff08d185389e5b540a8e468c00895e1ae83927 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Sat, 18 Feb 2023 23:56:06 +0200
Subject: [PATCH 1900/2403] Prohibit too big a size

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

diff --git a/main.c b/main.c
index 5889ae5a67..18f145c334 100644
--- a/main.c
+++ b/main.c
@@ -142,7 +142,7 @@ STATIC supervisor_allocation *allocate_pystack(safe_mode_t safe_mode) {
         (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
         // Check if value is valid
         pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
-        if (pystack_size < 384) {
+        if ((pystack_size < 384) || (pystack_size > 900000)) {
             serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
             pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
         }

From 6d5135632443a7a4305eb6d05702209bd11e387c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 19 Feb 2023 19:26:55 -0500
Subject: [PATCH 1901/2403] Fix pad assignments on atmel-samd UART

---
 ports/atmel-samd/common-hal/busio/UART.c | 135 +++++++++++++++--------
 ports/mimxrt10xx/common-hal/busio/UART.c |   2 +-
 ports/stm/common-hal/busio/UART.c        |   2 +-
 shared-bindings/busio/UART.c             |  28 +++--
 4 files changed, 114 insertions(+), 53 deletions(-)

diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c
index 6027b6a5fa..280e8d10b6 100644
--- a/ports/atmel-samd/common-hal/busio/UART.c
+++ b/ports/atmel-samd/common-hal/busio/UART.c
@@ -58,6 +58,8 @@ static void usart_async_rxc_callback(const struct usart_async_descriptor *const
     // Nothing needs to be done by us.
 }
 
+// shared-bindings validates that the tx and rx are not both missing,
+// and that the pins are distinct.
 void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     const mcu_pin_obj_t *tx, const mcu_pin_obj_t *rx,
     const mcu_pin_obj_t *rts, const mcu_pin_obj_t *cts,
@@ -92,10 +94,6 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     bool have_rts = rts != NULL;
     bool have_cts = cts != NULL;
 
-    if (!have_tx && !have_rx) {
-        mp_raise_ValueError(translate("tx and rx cannot both be None"));
-    }
-
     if (have_rx && receiver_buffer_size > 0 && (receiver_buffer_size & (receiver_buffer_size - 1)) != 0) {
         mp_raise_ValueError_varg(translate("%q must be power of 2"), MP_QSTR_receiver_buffer_size);
     }
@@ -107,6 +105,20 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     // This assignment is only here because the usart_async routines take a *const argument.
     struct usart_async_descriptor *const usart_desc_p = (struct usart_async_descriptor *const)&self->usart_desc;
 
+    // Allowed pads for USART. See the SAMD21 and SAMx5x datasheets.
+    // TXPO:
+    // (both)     0x0: TX pad 0; no RTS/CTS
+    // (SAMD21)   0x1: TX pad 2; no RTS/CTS
+    // (SAMx5x)   0x1: reserved
+    // (both)     0x2: TX pad 0; RTS: pad 2, CTS: pad 3
+    // (SAMD21)   0x3: reserved
+    // (SAMx5x)   0x3: TX pad 0; RTS: pad 2; no CTS
+    // RXPO:
+    // 0x0: RX pad 0
+    // 0x1: RX pad 1
+    // 0x2: RX pad 2
+    // 0x3: RX pad 3
+
     for (int i = 0; i < NUM_SERCOMS_PER_PIN; i++) {
         Sercom *potential_sercom = NULL;
         if (have_tx) {
@@ -115,29 +127,71 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
                 continue;
             }
             potential_sercom = sercom_insts[sercom_index];
+
+            // SAMD21 and SAMx5x have different requirements.
+
             #ifdef SAMD21
-            if (potential_sercom->USART.CTRLA.bit.ENABLE != 0 ||
-                !(tx->sercom[i].pad == 0 ||
-                  tx->sercom[i].pad == 2)) {
+            if (potential_sercom->USART.CTRLA.bit.ENABLE != 0) {
+                // In use.
                 continue;
             }
+            if (tx->sercom[i].pad != 0 &&
+                tx->sercom[i].pad != 2) {
+                // TX must be on pad 0 or 2.
+                continue;
+            }
+            if (have_rts) {
+                if (rts->sercom[i].pad != 2 ||
+                    tx->sercom[i].pad == 2) {
+                    // RTS pin must be on pad 2, so if TX is also on pad 2, not possible
+                    continue;
+                }
+            }
+            if (have_cts) {
+                if (cts->sercom[i].pad != 3 ||
+                    (have_rx && rx->sercom[i].pad == 3)) {
+                    // CTS pin must be on pad 3, so if RX is also on pad 3, not possible
+                    continue;
+                }
+            }
             #endif
+
             #ifdef SAM_D5X_E5X
-            if (potential_sercom->USART.CTRLA.bit.ENABLE != 0 ||
-                !(tx->sercom[i].pad == 0)) {
+            if (potential_sercom->USART.CTRLA.bit.ENABLE != 0) {
+                // In use.
                 continue;
             }
+            if (tx->sercom[i].pad != 0) {
+                // TX must be on pad 0
+                continue;
+            }
+
+            if (have_rts && rts->sercom[i].pad != 2) {
+                // RTS pin must be on pad 2
+                continue;
+            }
+            if (have_cts) {
+                if (cts->sercom[i].pad != 3 ||
+                    (have_rx && rx->sercom[i].pad == 3)) {
+                    // CTS pin must be on pad 3, so if RX is also on pad 3, not possible
+                    continue;
+                }
+            }
             #endif
+
             tx_pinmux = PINMUX(tx->number, (i == 0) ? MUX_C : MUX_D);
             tx_pad = tx->sercom[i].pad;
             if (have_rts) {
                 rts_pinmux = PINMUX(rts->number, (i == 0) ? MUX_C : MUX_D);
             }
-            if (rx == NULL) {
+            if (!have_rx) {
+                // TX only, so don't need to look further.
                 sercom = potential_sercom;
                 break;
             }
         }
+
+        // Have TX, now look for RX match. We know have_rx is true at this point.
         for (int j = 0; j < NUM_SERCOMS_PER_PIN; j++) {
             if (((!have_tx && rx->sercom[j].index < SERCOM_INST_NUM &&
                   sercom_insts[rx->sercom[j].index]->USART.CTRLA.bit.ENABLE == 0) ||
@@ -160,20 +214,10 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     if (sercom == NULL) {
         raise_ValueError_invalid_pins();
     }
-    if (!have_tx) {
-        tx_pad = 0;
-        if (rx_pad == 0) {
-            tx_pad = 2;
-        }
-    }
-    if (!have_rx) {
-        rx_pad = (tx_pad + 1) % 4;
-    }
-
     // Set up clocks on SERCOM.
     samd_peripherals_sercom_clock_init(sercom, sercom_index);
 
-    if (rx && receiver_buffer_size > 0) {
+    if (have_rx && receiver_buffer_size > 0) {
         self->buffer_length = receiver_buffer_size;
         if (NULL != receiver_buffer) {
             self->buffer = receiver_buffer;
@@ -204,36 +248,41 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     // which don't necessarily match what we need. After calling it, set the values
     // specific to this instantiation of UART.
 
-    // Set pads computed for this SERCOM. Refer to the datasheet for details on pads.
-    // TXPO:
-    // 0x0: TX pad 0; no RTS/CTS
-    // 0x1: reserved
-    // 0x2: TX pad 0; RTS: pad 2, CTS: pad 3
-    // 0x3: TX pad 0; RTS: pad 2; no CTS
-    // RXPO:
-    // 0x0: RX pad 0
-    // 0x1: RX pad 1
-    // 0x2: RX pad 2
-    // 0x3: RX pad 3
+    // See the TXPO/RXPO table above for how RXPO and TXPO are chosen below.
 
-    // Default to TXPO with no RTS/CTS
-    uint8_t computed_txpo = 0;
-    // If we have both CTS (with or without RTS), use second pinout
-    if (have_cts) {
-        computed_txpo = 2;
-    }
-    // If we have RTS only, use the third pinout
-    if (have_rts && !have_cts) {
-        computed_txpo = 3;
+    // rxpo maps directly to rx_pad.
+    // Set to 0x0 if no RX, but it doesn't matter because RX will not be enabled.
+    const uint8_t rxpo = have_rx ? rx_pad : 0x0;
+
+    #ifdef SAMD21
+    // SAMD21 has only one txpo value when using either CTS or RTS or both.
+    // TX is on pad 0 or 2, or there is no TX.
+    // 0x0 for pad 0, 0x1 for pad 2.
+    uint8_t txpo;
+    if (tx_pad == 2) {
+        txpo = 0x1;
+    } else {
+        txpo = (have_cts || have_rts) ? 0x2 : 0x0;
     }
+    #endif
+
+    #ifdef SAM_D5X_E5X
+    // SAMx5x has two different possibilities, per the chart above.
+    // We already know TX is on pad 0, or there is no TX.
+
+    // Without RTS or CTS, txpo can be 0x0.
+    // It's not clear if 0x2 would cover all our cases, but this is known to be safe.
+    uint8_t txpo = (have_rts || have_cts) ? 0x2: 0x0;
+    #endif
 
     // Doing a group mask and set of the registers saves 60 bytes over setting the bitfields individually.
 
     sercom->USART.CTRLA.reg &= ~(SERCOM_USART_CTRLA_TXPO_Msk |
         SERCOM_USART_CTRLA_RXPO_Msk |
         SERCOM_USART_CTRLA_FORM_Msk);
-    sercom->USART.CTRLA.reg |= SERCOM_USART_CTRLA_TXPO(computed_txpo) |
-        SERCOM_USART_CTRLA_RXPO(rx_pad) |
+    // See chart above for TXPO values and RXPO values.
+    sercom->USART.CTRLA.reg |= SERCOM_USART_CTRLA_TXPO(txpo) |
+        SERCOM_USART_CTRLA_RXPO(rxpo) |
         (parity == BUSIO_UART_PARITY_NONE ? 0 : SERCOM_USART_CTRLA_FORM(1));
 
     // Enable tx and/or rx based on whether the pins were specified.
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
index 871d57648d..a61b86bee3 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.c
+++ b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -179,7 +179,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             break;
         }
     } else {
-        mp_raise_ValueError(translate("Supply at least one UART pin"));
+        mp_raise_ValueError(translate("tx and rx cannot both be None"));
     }
 
     if (rx && !rx_config) {
diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c
index 48894db5f9..e8284713d1 100644
--- a/ports/stm/common-hal/busio/UART.c
+++ b/ports/stm/common-hal/busio/UART.c
@@ -160,7 +160,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             periph_index, uart_taken);
     } else {
         // both pins cannot be empty
-        mp_raise_ValueError(translate("Supply at least one UART pin"));
+        mp_raise_ValueError(translate("tx and rx cannot both be None"));
     }
 
     // Other errors
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index aada49a051..77d7036c2e 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -48,9 +48,13 @@
 //|
 //|     def __init__(
 //|         self,
-//|         tx: microcontroller.Pin,
-//|         rx: microcontroller.Pin,
+//|         tx: Optional[microcontroller.Pin] = None,
+//|         rx: Optional[microcontroller.Pin] = None,
 //|         *,
+//|         rts: Optional[microcontroller.Pin] = None,
+//|         cts: Optional[microcontroller.Pin] = None,
+//|         rs485_dir: Optional[microcontroller.Pin] = None,
+//|         rs485_invert: bool = False,
 //|         baudrate: int = 9600,
 //|         bits: int = 8,
 //|         parity: Optional[Parity] = None,
@@ -74,11 +78,13 @@
 //|         :param float timeout:  the timeout in seconds to wait for the first character and between subsequent characters when reading. Raises ``ValueError`` if timeout >100 seconds.
 //|         :param int receiver_buffer_size: the character length of the read buffer (0 to disable). (When a character is 9 bits the buffer will be 2 * receiver_buffer_size bytes.)
 //|
+//|         ``tx`` and ``rx`` cannot both be ``None``.
+//|
 //|         *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds.
 //|         The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds.
 //|
 //|         **Limitations:** RS485 is not supported on SAMD, nRF, Broadcom, Spresense, or STM.
-//|         On i.MX and Raspberry Pi RP2040 support is implemented in software:
+//|         On i.MX and Raspberry Pi RP2040, RS485 support is implemented in software:
 //|         The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet
 //|         RS485 specifications intermittently.
 //|         """
@@ -118,11 +124,21 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
 
     const mcu_pin_obj_t *rx = validate_obj_is_free_pin_or_none(args[ARG_rx].u_obj, MP_QSTR_rx);
     const mcu_pin_obj_t *tx = validate_obj_is_free_pin_or_none(args[ARG_tx].u_obj, MP_QSTR_tx);
-
+    const mcu_pin_obj_t *rts = validate_obj_is_free_pin_or_none(args[ARG_rts].u_obj, MP_QSTR_rts);
+    const mcu_pin_obj_t *cts = validate_obj_is_free_pin_or_none(args[ARG_cts].u_obj, MP_QSTR_cts);
+    const mcu_pin_obj_t *rs485_dir = validate_obj_is_free_pin_or_none(args[ARG_rs485_dir].u_obj, MP_QSTR_rs485_dir);
     if ((tx == NULL) && (rx == NULL)) {
         mp_raise_ValueError(translate("tx and rx cannot both be None"));
     }
 
+    // Pins must be distinct.
+    if ((tx != NULL && (tx == rx || tx == rts || tx == cts || tx == rs485_dir)) ||
+        (rx != NULL && (rx == rts || rx == cts || rx == rs485_dir)) ||
+        (rts != NULL && (rts == cts || rts == rs485_dir)) ||
+        (cts != NULL && (cts == rs485_dir))) {
+        raise_ValueError_invalid_pins();
+    }
+
     uint8_t bits = (uint8_t)mp_arg_validate_int_range(args[ARG_bits].u_int, 5, 9, MP_QSTR_bits);
 
     busio_uart_parity_t parity = BUSIO_UART_PARITY_NONE;
@@ -137,10 +153,6 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
     mp_float_t timeout = mp_obj_get_float(args[ARG_timeout].u_obj);
     validate_timeout(timeout);
 
-    const mcu_pin_obj_t *rts = validate_obj_is_free_pin_or_none(args[ARG_rts].u_obj, MP_QSTR_rts);
-    const mcu_pin_obj_t *cts = validate_obj_is_free_pin_or_none(args[ARG_cts].u_obj, MP_QSTR_cts);
-    const mcu_pin_obj_t *rs485_dir = validate_obj_is_free_pin_or_none(args[ARG_rs485_dir].u_obj, MP_QSTR_rs485_dir);
-
     const bool rs485_invert = args[ARG_rs485_invert].u_bool;
 
     // Always initially allocate the UART object within the long-lived heap.

From 8e9c048223893360de2e26484d0ed65f68f08e61 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Sun, 19 Feb 2023 02:51:59 +0000
Subject: [PATCH 1902/2403] Translated using Weblate (German)

Currently translated at 96.1% (959 of 997 strings)

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

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4569dfb508..02b335186a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-01-13 18:51+0000\n"
+"PO-Revision-Date: 2023-02-20 03:39+0000\n"
 "Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.15.1-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -49,6 +49,8 @@ msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Sie befinden sich im abgesicherten Modus, weil:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""

From ec8b06a3a82f5d0ff872e96c8cd7f310ee20cc92 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Sat, 18 Feb 2023 04:27:39 +0000
Subject: [PATCH 1903/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 3ca89f4430..0b3a3e88bd 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: 2023-02-17 20:38+0000\n"
+"PO-Revision-Date: 2023-02-20 03:39+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -2182,7 +2182,7 @@ msgstr "Inicialización de UART"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "Periférico UART en uso"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"

From 0e6484a94a6d61ba2dc91abe0b40a130b3e18c7a Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 18 Feb 2023 06:13:30 +0000
Subject: [PATCH 1904/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (997 of 997 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 eab698b723..3f00eb1c88 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: 2023-02-17 20:38+0000\n"
+"PO-Revision-Date: 2023-02-20 03:39+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -2177,7 +2177,7 @@ msgstr "inicialização do UART"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "Periférico UART em uso"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"

From a1adf7c4ca13fe1aa3f4b6fc1cc2f097436106a0 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 18 Feb 2023 15:19:43 +0000
Subject: [PATCH 1905/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (997 of 997 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 cfd6fd582c..abc344a7bb 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: 2023-02-17 20:38+0000\n"
+"PO-Revision-Date: 2023-02-20 03:39+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -2154,7 +2154,7 @@ msgstr "UART start"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "UART-enhet används redan"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"

From 2684aeb838ff75985d83083007e0e4131c100aab Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 20 Feb 2023 17:02:46 -0500
Subject: [PATCH 1906/2403] don't check for RX and TX both none in ports: now
 checked in shared-bindings

---
 locale/circuitpython.pot                 | 6 ------
 ports/espressif/common-hal/busio/UART.c  | 5 ++---
 ports/mimxrt10xx/common-hal/busio/UART.c | 3 ++-
 ports/nrf/common-hal/busio/UART.c        | 4 +---
 ports/stm/common-hal/busio/UART.c        | 6 +++---
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 72ee60cc0c..24b5b541dc 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1987,10 +1987,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4116,8 +4112,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
index f025c15b3e..c13bdedac0 100644
--- a/ports/espressif/common-hal/busio/UART.c
+++ b/ports/espressif/common-hal/busio/UART.c
@@ -112,9 +112,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
 
     uart_config_t uart_config = {0};
     bool have_rs485_dir = rs485_dir != NULL;
-    if (!have_tx && !have_rx) {
-        mp_raise_ValueError(translate("tx and rx cannot both be None"));
-    }
+
+    // shared-bindings checks that TX and RX are not both None, so we don't need to check here.
 
     // Filter for sane settings for RS485
     if (have_rs485_dir) {
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
index a61b86bee3..086b8dee87 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.c
+++ b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -179,7 +179,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             break;
         }
     } else {
-        mp_raise_ValueError(translate("tx and rx cannot both be None"));
+        // TX and RX are both None. But this is already handled in shared-bindings, so
+        // we won't get here.
     }
 
     if (rx && !rx_config) {
diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index df4a485999..10a34e09df 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -183,9 +183,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         mp_raise_ValueError(translate("All UART peripherals are in use"));
     }
 
-    if ((tx == NULL) && (rx == NULL)) {
-        mp_raise_ValueError(translate("tx and rx cannot both be None"));
-    }
+    // shared-bindings checks that TX and RX are not both None, so we don't need to check here.
 
     mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size);
 
diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c
index e8284713d1..cdace31639 100644
--- a/ports/stm/common-hal/busio/UART.c
+++ b/ports/stm/common-hal/busio/UART.c
@@ -85,7 +85,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     bool sigint_enabled) {
 
     // match pins to UART objects
-    USART_TypeDef *USARTx;
+    USART_TypeDef *USARTx = NULL;
 
     uint8_t tx_len = MP_ARRAY_SIZE(mcu_uart_tx_list);
     uint8_t rx_len = MP_ARRAY_SIZE(mcu_uart_rx_list);
@@ -159,8 +159,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         USARTx = assign_uart_or_throw(self, (self->tx != NULL),
             periph_index, uart_taken);
     } else {
-        // both pins cannot be empty
-        mp_raise_ValueError(translate("tx and rx cannot both be None"));
+        // TX and RX are both None. But this is already handled in shared-bindings, so
+        // we won't get here.
     }
 
     // Other errors

From 8ffa7b1d55677e5359b666190b2049666320d51c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 20 Feb 2023 20:04:22 -0500
Subject: [PATCH 1907/2403] Add Adafruit HUZZAH32 breakout

---
 locale/circuitpython.pot                      |  4 ++
 .../mpconfigboard.mk                          |  1 +
 .../boards/adafruit_huzzah32_breakout/board.c | 29 +++++++++++
 .../mpconfigboard.h                           | 42 ++++++++++++++++
 .../mpconfigboard.mk                          | 10 ++++
 .../boards/adafruit_huzzah32_breakout/pins.c  | 49 +++++++++++++++++++
 .../adafruit_huzzah32_breakout/sdkconfig      | 20 ++++++++
 7 files changed, 155 insertions(+)
 create mode 100644 ports/espressif/boards/adafruit_huzzah32_breakout/board.c
 create mode 100644 ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 create mode 100644 ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/adafruit_huzzah32_breakout/pins.c
 create mode 100644 ports/espressif/boards/adafruit_huzzah32_breakout/sdkconfig

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 082ea7bfa9..abadd83b6a 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2387,6 +2387,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index c314f90246..8fafc18373 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -6,4 +6,5 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/board.c b/ports/espressif/boards/adafruit_huzzah32_breakout/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
new file mode 100644
index 0000000000..0c6132c7ff
--- /dev/null
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Adafruit HUZZAH32 Breakout"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+// For entering safe mode, use GPIO0 button
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the GPIO0 button at start up.")
+
+// UART pins
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
new file mode 100644
index 0000000000..ecf07e8e70
--- /dev/null
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x0000239A
+CIRCUITPY_CREATION_ID = 0x00320004
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c b/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c
new file mode 100644
index 0000000000..f0d6f3118a
--- /dev/null
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c
@@ -0,0 +1,49 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/sdkconfig b/ports/espressif/boards/adafruit_huzzah32_breakout/sdkconfig
new file mode 100644
index 0000000000..6c0168c829
--- /dev/null
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/sdkconfig
@@ -0,0 +1,20 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=n
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From 3601bb3062735e12e9666e0bd1c0f730ab831f33 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 20 Feb 2023 20:37:42 -0600
Subject: [PATCH 1908/2403] change value_count max

---
 shared-bindings/displayio/Bitmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index e14ac638e2..c2431699b2 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -64,7 +64,7 @@ STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
     uint32_t width = mp_arg_validate_int_range(mp_obj_get_int(all_args[0]), 1, 32767, MP_QSTR_width);
     uint32_t height = mp_arg_validate_int_range(mp_obj_get_int(all_args[1]), 1, 32767, MP_QSTR_height);
-    uint32_t value_count = mp_arg_validate_int_range(mp_obj_get_int(all_args[2]), 1, 32767, MP_QSTR_value_count);
+    uint32_t value_count = mp_arg_validate_int_range(mp_obj_get_int(all_args[2]), 1, 65535, MP_QSTR_value_count);
     uint32_t bits = 1;
 
     while ((value_count - 1) >> bits) {

From 48e60391a5162e9b8ba2c176b4d16dfc32ea11d5 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 21 Feb 2023 05:11:02 +0100
Subject: [PATCH 1909/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 8c0b3066f8..490d3ecbba 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2415,6 +2415,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index c18e714f75..13723a2be8 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2402,6 +2402,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 02b335186a..620bf7dcfc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2451,6 +2451,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index c939577cd5..1e7a7c9813 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2410,6 +2410,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index e960651197..e26be76d6d 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2410,6 +2410,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index 0b3a3e88bd..e5a89fbd53 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2467,6 +2467,10 @@ msgstr "Usted presionó el boton A al iniciar."
 msgid "You pressed the BOOT button at start up"
 msgstr "Usted presionó el boton BOOT al iniciar"
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Usted presionó el boton SW38 al iniciar."
diff --git a/locale/fil.po b/locale/fil.po
index d5857a53ea..99ca28a5b0 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2405,6 +2405,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 19f75abfac..9d7e737659 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2473,6 +2473,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/hi.po b/locale/hi.po
index 70bda4ec7c..fe1f7cfa95 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2387,6 +2387,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index d3b91d4c3d..a941c39ed9 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2412,6 +2412,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index dca26f752b..47a9602b14 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2404,6 +2404,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index c08aa5b714..26bff6a610 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2391,6 +2391,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 9f5a7d382f..616c469595 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2414,6 +2414,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 6320ff566f..e773fec6b1 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2395,6 +2395,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 3f00eb1c88..04aab50246 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2464,6 +2464,10 @@ msgstr "Você pressionou o botão A na inicialização."
 msgid "You pressed the BOOT button at start up"
 msgstr "Você pressionou o botão BOOT na inicialização"
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Você pressionou o botão SW38 na inicialização."
diff --git a/locale/ru.po b/locale/ru.po
index 7f73a33083..334b0420fa 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2450,6 +2450,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index abc344a7bb..1ec9ce4033 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2437,6 +2437,10 @@ msgstr "Du tryckte ner knapp A vid start."
 msgid "You pressed the BOOT button at start up"
 msgstr "Du tryckte ner BOOT-knappen vid start"
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Du tryckte ned SW38-knappen vid start."
diff --git a/locale/tr.po b/locale/tr.po
index 1adac6b08d..4f17c5d33d 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2409,6 +2409,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 5b180eaec1..79b895afe4 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2435,6 +2435,10 @@ msgstr ""
 msgid "You pressed the BOOT button at start up"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
+msgid "You pressed the GPIO0 button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""

From 30a8e8bbcdba454b0af3c4acbe1cd6401fc92aa4 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 21 Feb 2023 13:26:57 +0200
Subject: [PATCH 1910/2403] Revert next_stack_size

---
 shared-bindings/supervisor/Runtime.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 4d94172205..c3418c6437 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -168,6 +168,26 @@ STATIC mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_ble_workflow_obj, supervisor_runtime_get_ble_workflow);
 
+//|     next_stack_limit: int
+//|     """The size of the stack for the next vm run. If its too large, the default will be used."""
+//|
+STATIC mp_obj_t supervisor_runtime_get_next_stack_limit(mp_obj_t self) {
+    return mp_obj_new_int(get_next_stack_size());
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_next_stack_limit_obj, supervisor_runtime_get_next_stack_limit);
+
+STATIC mp_obj_t supervisor_runtime_set_next_stack_limit(mp_obj_t self, mp_obj_t size_obj) {
+    mp_int_t size = mp_obj_get_int(size_obj);
+    mp_arg_validate_int_min(size, 256, MP_QSTR_size);
+    set_next_stack_size(size);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_next_stack_limit_obj, supervisor_runtime_set_next_stack_limit);
+
+MP_PROPERTY_GETSET(supervisor_runtime_next_stack_limit_obj,
+    (mp_obj_t)&supervisor_runtime_get_next_stack_limit_obj,
+    (mp_obj_t)&supervisor_runtime_set_next_stack_limit_obj);
+
 STATIC mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) {
     #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE
     if (mp_obj_is_true(state_in)) {
@@ -219,6 +239,7 @@ STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_safe_mode_reason), MP_ROM_PTR(&supervisor_runtime_safe_mode_reason_obj) },
     { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_ble_workflow),  MP_ROM_PTR(&supervisor_runtime_ble_workflow_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_stack_limit), MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
     { MP_ROM_QSTR(MP_QSTR_rgb_status_brightness),  MP_ROM_PTR(&supervisor_runtime_rgb_status_brightness_obj) },
 };
 

From d42aa41c70635c877c014fb6bfc2b654ede72bbd Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 21 Feb 2023 13:29:39 +0200
Subject: [PATCH 1911/2403] Revert it with more passion

---
 shared-bindings/supervisor/Runtime.c | 38 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index c3418c6437..db3d8d1e4d 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -168,6 +168,24 @@ STATIC mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_ble_workflow_obj, supervisor_runtime_get_ble_workflow);
 
+STATIC mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) {
+    #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE
+    if (mp_obj_is_true(state_in)) {
+        supervisor_bluetooth_enable_workflow();
+    } else {
+        supervisor_bluetooth_disable_workflow();
+    }
+    #else
+    mp_raise_NotImplementedError(NULL);
+    #endif
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_ble_workflow_obj, supervisor_runtime_set_ble_workflow);
+
+MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
+    (mp_obj_t)&supervisor_runtime_get_ble_workflow_obj,
+    (mp_obj_t)&supervisor_runtime_set_ble_workflow_obj);
+
 //|     next_stack_limit: int
 //|     """The size of the stack for the next vm run. If its too large, the default will be used."""
 //|
@@ -188,24 +206,6 @@ MP_PROPERTY_GETSET(supervisor_runtime_next_stack_limit_obj,
     (mp_obj_t)&supervisor_runtime_get_next_stack_limit_obj,
     (mp_obj_t)&supervisor_runtime_set_next_stack_limit_obj);
 
-STATIC mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) {
-    #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE
-    if (mp_obj_is_true(state_in)) {
-        supervisor_bluetooth_enable_workflow();
-    } else {
-        supervisor_bluetooth_disable_workflow();
-    }
-    #else
-    mp_raise_NotImplementedError(NULL);
-    #endif
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_ble_workflow_obj, supervisor_runtime_set_ble_workflow);
-
-MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
-    (mp_obj_t)&supervisor_runtime_get_ble_workflow_obj,
-    (mp_obj_t)&supervisor_runtime_set_ble_workflow_obj);
-
 //|     rgb_status_brightness: int
 //|     """Set brightness of status RGB LED from 0-255. This will take effect
 //|     after the current code finishes and the status LED is used to show
@@ -239,7 +239,7 @@ STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_safe_mode_reason), MP_ROM_PTR(&supervisor_runtime_safe_mode_reason_obj) },
     { MP_ROM_QSTR(MP_QSTR_autoreload), MP_ROM_PTR(&supervisor_runtime_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_ble_workflow),  MP_ROM_PTR(&supervisor_runtime_ble_workflow_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next_stack_limit), MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_stack_limit),  MP_ROM_PTR(&supervisor_runtime_next_stack_limit_obj) },
     { MP_ROM_QSTR(MP_QSTR_rgb_status_brightness),  MP_ROM_PTR(&supervisor_runtime_rgb_status_brightness_obj) },
 };
 

From 5dba32ed073f3cb00e961335ee7aaa1d74a9eaa8 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 21 Feb 2023 17:42:08 +0200
Subject: [PATCH 1912/2403] Try to pass ci with rainbowio

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index 51b4371675..9bc50ab429 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -25,7 +25,6 @@ CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0

From 650c4c5d92f9f15ea1b29422caab323780b3a2a2 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Tue, 21 Feb 2023 20:50:07 +0200
Subject: [PATCH 1913/2403] pystack+ rainbow-

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h  | 5 -----
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
index bdc3fc5890..eb7f1c62e3 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@@ -21,8 +21,3 @@
 #define IGNORE_PIN_PA25     1
 
 #define MICROPY_FATFS_EXFAT 0
-
-#ifdef CIRCUITPY_SETTABLE_PYSTACK
-#undef CIRCUITPY_SETTABLE_PYSTACK
-#endif
-#define CIRCUITPY_SETTABLE_PYSTACK 0
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index 9bc50ab429..51b4371675 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -25,6 +25,7 @@ CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0

From 7e6e824d5655026906b6515070aeb604d2ef3426 Mon Sep 17 00:00:00 2001
From: root 
Date: Tue, 21 Feb 2023 13:38:29 -0600
Subject: [PATCH 1914/2403] Correctly raise OS error in
 socketpool_socket_recv_into()

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index fe12f461fb..e2b82264ba 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -1109,7 +1109,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
             break;
     }
     if (ret == (unsigned)-1) {
-        return -_errno;
+        mp_raise_OSError(_errno);
     }
     return ret;
 }

From 1ea118684c4f3b4b2db767ced5e9afa17a733985 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 22 Feb 2023 00:49:55 +0200
Subject: [PATCH 1915/2403] 120M qspi

---
 ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
index 3a2989a41e..c81fbb4837 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/sdkconfig
@@ -5,8 +5,9 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_MODE_QUAD=y
 CONFIG_SPIRAM_SIZE=8388608
-CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_SPEED_120M=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_USE_MEMMAP=y

From 7c717a54f3b345d96dac606b0866ad2f04a75bc6 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 21 Feb 2023 22:10:36 -0500
Subject: [PATCH 1916/2403] Switch to "unmeasured" core clock speed check

---
 ports/broadcom/common-hal/busio/I2C.c  | 2 +-
 ports/broadcom/common-hal/busio/SPI.c  | 5 ++++-
 ports/broadcom/common-hal/busio/UART.c | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/broadcom/common-hal/busio/I2C.c b/ports/broadcom/common-hal/busio/I2C.c
index 3142fda145..64187f434b 100644
--- a/ports/broadcom/common-hal/busio/I2C.c
+++ b/ports/broadcom/common-hal/busio/I2C.c
@@ -98,7 +98,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     self->sda_pin = sda;
     self->scl_pin = scl;
 
-    uint32_t source_clock = vcmailbox_get_clock_rate_measured(VCMAILBOX_CLOCK_CORE);
+    uint32_t source_clock = vcmailbox_get_clock_rate(VCMAILBOX_CLOCK_CORE);
     uint16_t clock_divider = source_clock / frequency;
     self->peripheral->DIV_b.CDIV = clock_divider;
 
diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c
index 017674dfc0..6b9354313b 100644
--- a/ports/broadcom/common-hal/busio/SPI.c
+++ b/ports/broadcom/common-hal/busio/SPI.c
@@ -87,6 +87,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         mp_raise_NotImplementedError(translate("Half duplex SPI is not implemented"));
     }
 
+    // BCM_VERSION != 2711 have 3 SPI but as listed in peripherals/gen/pins.c two are on
+    // index 0, once one index 0 SPI is found the other will throw an invalid_pins error.
     for (size_t i = 0; i < NUM_SPI; i++) {
         if (spi_in_use[i]) {
             continue;
@@ -157,6 +159,7 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     common_hal_reset_pin(self->MOSI);
     common_hal_reset_pin(self->MISO);
     self->clock = NULL;
+    spi_in_use[self->index] = false;
 
     if (self->index == 1 ||
         self->index == 2) {
@@ -198,7 +201,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
         SPI0_Type *p = spi[self->index];
         p->CS = polarity << SPI0_CS_CPOL_Pos |
             phase << SPI0_CS_CPHA_Pos;
-        uint32_t source_clock = vcmailbox_get_clock_rate_measured(VCMAILBOX_CLOCK_CORE);
+        uint32_t source_clock = vcmailbox_get_clock_rate(VCMAILBOX_CLOCK_CORE);
         uint16_t clock_divider = source_clock / baudrate;
         if (source_clock % baudrate > 0) {
             clock_divider += 2;
diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c
index 9f51f15acb..4d60866c04 100644
--- a/ports/broadcom/common-hal/busio/UART.c
+++ b/ports/broadcom/common-hal/busio/UART.c
@@ -460,7 +460,7 @@ uint32_t common_hal_busio_uart_get_baudrate(busio_uart_obj_t *self) {
 
 void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrate) {
     if (self->uart_id == 1) {
-        uint32_t source_clock = vcmailbox_get_clock_rate_measured(VCMAILBOX_CLOCK_CORE);
+        uint32_t source_clock = vcmailbox_get_clock_rate(VCMAILBOX_CLOCK_CORE);
         UART1->BAUD = ((source_clock / (baudrate * 8)) - 1);
     } else {
         ARM_UART_PL011_Type *pl011 = uart[self->uart_id];

From 1d12014ec76fda494b777aae29de0d1ee5762046 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 22 Feb 2023 13:31:15 +0200
Subject: [PATCH 1917/2403] disable pixelmap

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index 51b4371675..9ca9259747 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -20,6 +20,7 @@ CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_PIXELMAP = 0
 CIRCUITPY_GETPASS = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0

From 592fea682297177cd5710f4a507fcd33eec5ab96 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:08:13 +0530
Subject: [PATCH 1918/2403] split `atmel-samd` instead of `raspberrypi`

---
 .github/workflows/build.yml | 22 +++++++++++-----------
 tools/ci_set_matrix.py      | 15 +++++++--------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7029cc4897..b275a6d86d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,9 +24,9 @@ jobs:
       build-boards: ${{ steps.set-matrix.outputs.build-boards }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
+      boards-atmel: ${{ steps.set-matrix.outputs.boards-atmel }}
       boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
-      boards-rpi: ${{ steps.set-matrix.outputs.boards-rpi }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
     - name: Dump GitHub context
@@ -238,6 +238,16 @@ jobs:
       boards: ${{ needs.scheduler.outputs.boards-arm }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
+  atmel:
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-atmel != '[]' }}
+    uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
+    with:
+      platform: arm
+      boards: ${{ needs.scheduler.outputs.boards-atmel }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
   esp:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-esp != '[]' }}
@@ -257,13 +267,3 @@ jobs:
       platform: riscv
       boards: ${{ needs.scheduler.outputs.boards-riscv }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  rpi:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-rpi != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: arm
-      boards: ${{ needs.scheduler.outputs.boards-rpi }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 8c248d8fd7..374e2f0c2b 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -43,14 +43,14 @@ from shared_bindings_matrix import (
 )
 
 PORT_TO_ARCH = {
-    "atmel-samd": "arm",
+    "atmel-samd": "atmel",
     "broadcom": "aarch",
     "cxd56": "arm",
     "espressif": "esp",
     "litex": "riscv",
     "mimxrt10xx": "arm",
     "nrf": "arm",
-    "raspberrypi": "rpi",
+    "raspberrypi": "arm",
     "stm": "arm",
 }
 
@@ -92,7 +92,7 @@ def set_output(name: str, value):
 
 
 def set_boards_to_build(build_all: bool):
-    if "mpy_cross" in last_failed_jobs or "tests" in last_failed_jobs:
+    if last_failed_jobs.get("mpy_cross") or last_failed_jobs.get("tests"):
         build_all = True
 
     # Get boards in json format
@@ -207,13 +207,12 @@ def set_boards_to_build(build_all: bool):
             break
 
     # Split boards by architecture.
-    arch_to_boards = {"aarch": [], "arm": [], "esp": [], "riscv": [], "rpi": []}
+    arch_to_boards = {"aarch": [], "arm": [], "atmel": [], "esp": [], "riscv": []}
 
     # Append previously failed boards
     for arch in arch_to_boards:
-        arch_to_job = f"build-{arch}"
-        if arch_to_job in last_failed_jobs:
-            for board in last_failed_jobs[arch_to_job]:
+        if arch in last_failed_jobs:
+            for board in last_failed_jobs[arch]:
                 if not board in boards_to_build:
                     boards_to_build.append(board)
 
@@ -238,7 +237,7 @@ def set_boards_to_build(build_all: bool):
 
 def set_docs_to_build(build_doc: bool):
     if not build_doc:
-        if "build-doc" in last_failed_jobs:
+        if last_failed_jobs.get("build-doc"):
             build_doc = True
         else:
             doc_pattern = re.compile(

From 1ea21cc8fc210f9a16f92c77c632a8bd40812671 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:11:38 +0530
Subject: [PATCH 1919/2403] refactor and simplify fetching port deps

---
 .github/actions/deps/ports/action.yml     | 24 +++++++++++++++++++++++
 .github/workflows/build-boards-custom.yml | 19 +++++++-----------
 .github/workflows/build-boards.yml        |  5 +++--
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 .github/actions/deps/ports/action.yml

diff --git a/.github/actions/deps/ports/action.yml b/.github/actions/deps/ports/action.yml
new file mode 100644
index 0000000000..2aa50a1cc2
--- /dev/null
+++ b/.github/actions/deps/ports/action.yml
@@ -0,0 +1,24 @@
+name: Fetch port deps
+
+inputs:
+  board:
+    required: true
+    type: string
+
+outputs:
+  port:
+    value: ${{ steps.board-to-port.outputs.port }}
+
+runs:
+  using: composite
+  steps:
+    - name: Board to port
+      id: board-to-port
+      run: |
+        PORT=$(find ports/*/boards/ -type d -name ${{ inputs.board }} | sed 's/^ports\///g;s/\/boards.*//g')
+        if [ -z $PORT ]; then (exit 1); else echo >> $GITHUB_OUTPUT "port=$PORT"; fi
+      shell: bash
+
+    - name: Set up espressif port
+      if: steps.board-to-port.outputs.port == 'espressif'
+      uses: ./.github/actions/deps/ports/espressif
diff --git a/.github/workflows/build-boards-custom.yml b/.github/workflows/build-boards-custom.yml
index 22ba0f62f4..df8197d9ae 100644
--- a/.github/workflows/build-boards-custom.yml
+++ b/.github/workflows/build-boards-custom.yml
@@ -51,20 +51,15 @@ jobs:
       if: inputs.debug || inputs.flags != ''
       run: |
         > custom-build && git add custom-build
-    - name: Get port
-      id: get-port
-      run: |
-        PORT=$(find ports/*/boards/ -type d -name ${{ inputs.board }} | sed 's/^ports\///g;s/\/boards.*//g')
-        if [ -z $PORT ]; then (exit 1); else echo >> $GITHUB_OUTPUT "port=$PORT"; fi
-    - name: Port to platform
-      run: echo >> $GITHUB_ENV "PLATFORM=${{ env[format('PLATFORM_{0}', steps.get-port.outputs.port)] }}"
     - name: Set up python
       uses: actions/setup-python@v4
       with:
         python-version: 3.x
     - name: Set up port
-      if: env.PLATFORM == 'esp'
-      uses: ./.github/actions/deps/ports/espressif
+      id: set-up-port
+      uses: ./.github/actions/deps/ports
+      with:
+        board: ${{ inputs.board }}
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules
@@ -75,7 +70,7 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
-        platform: ${{ env.PLATFORM }}
+        platform: ${{ env[format('PLATFORM_{0}', steps.set-up-port.outputs.port)] }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
@@ -96,9 +91,9 @@ jobs:
         mkfs.fat --version || true
     - name: Build board
       run: make -j2 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
-      working-directory: ports/${{ steps.get-port.outputs.port }}
+      working-directory: ports/${{ steps.set-up-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
         name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
-        path: ports/${{ steps.get-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
+        path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index 457fce5b98..b975c131ee 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -38,8 +38,9 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up port
-      if: inputs.platform == 'esp'
-      uses: ./.github/actions/deps/ports/espressif
+      uses: ./.github/actions/deps/ports
+      with:
+        board: ${{ matrix.board }}
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules

From f4f95ada79808ab95ba51f3b0fd0535ea0906921 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:30:21 +0530
Subject: [PATCH 1920/2403] fix empty exclude commit

---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b275a6d86d..453804a26a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,6 +54,10 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
+    - name: Set up mpy-cross
+      uses: ./.github/actions/mpy_cross
+      with:
+        download: false
     - name: Get last commit with checks
       id: get-last-commit-with-checks
       if: github.event_name == 'pull_request'
@@ -63,14 +67,10 @@ jobs:
         REPO: ${{ github.repository }}
         PULL: ${{ github.event.number }}
         GITHUB_TOKEN: ${{ github.token }}
-        EXCLUDE_COMMIT: ${{ github.event.after }}
-    - name: Set up mpy-cross
-      uses: ./.github/actions/mpy_cross
-      with:
-        download: false
+        EXCLUDE_COMMIT: ${{ github.event.pull_request.head.sha }}
     - name: Set head sha
       if: github.event_name == 'pull_request'
-      run: echo "HEAD_SHA=$(git show -s --format=%s $GITHUB_SHA | grep -o -P "(?<=Merge ).*(?= into)")" >> $GITHUB_ENV
+      run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
     - name: Set base sha
       if: github.event_name == 'pull_request'
       run: |

From d1f50041213d91be4b5823bd2a096d2b7abf3fb0 Mon Sep 17 00:00:00 2001
From: Dennis Field 
Date: Tue, 21 Feb 2023 15:43:12 -0500
Subject: [PATCH 1921/2403] Add ESP32-LyraT board

---
 locale/circuitpython.pot                      |  4 ++
 .../boards/espressif_esp32_lyrat/board.c      | 34 +++++++++++
 .../espressif_esp32_lyrat/mpconfigboard.h     | 50 +++++++++++++++++
 .../espressif_esp32_lyrat/mpconfigboard.mk    | 10 ++++
 .../boards/espressif_esp32_lyrat/pins.c       | 56 +++++++++++++++++++
 .../boards/espressif_esp32_lyrat/sdkconfig    | 37 ++++++++++++
 6 files changed, 191 insertions(+)
 create mode 100644 ports/espressif/boards/espressif_esp32_lyrat/board.c
 create mode 100644 ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 create mode 100644 ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/espressif_esp32_lyrat/pins.c
 create mode 100644 ports/espressif/boards/espressif_esp32_lyrat/sdkconfig

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index abadd83b6a..2343144dfa 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2391,6 +2391,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/board.c b/ports/espressif/boards/espressif_esp32_lyrat/board.c
new file mode 100644
index 0000000000..8c0c8b8b0b
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_lyrat/board.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Radio Sound, Inc.
+ *
+ * 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 "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
new file mode 100644
index 0000000000..7835e93f21
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Radio Sound, Inc.
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Espressif ESP32-LyraT"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO22)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO23, .sda = &pin_GPIO18}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12}}
+
+#define CIRCUITPY_BOARD_UART        (0)
+
+// For entering safe mode, use Rec button
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO36)
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the Rec button at start up.")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
new file mode 100644
index 0000000000..e9fcd24e61
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x000C303A
+CIRCUITPY_CREATION_ID = 0x0032A000
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/pins.c b/ports/espressif/boards/espressif_esp32_lyrat/pins.c
new file mode 100644
index 0000000000..afef90e480
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_lyrat/pins.c
@@ -0,0 +1,56 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    { MP_ROM_QSTR(MP_QSTR_CS0), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_REC), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SW36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_MODE), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_SW39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/sdkconfig b/ports/espressif/boards/espressif_esp32_lyrat/sdkconfig
new file mode 100644
index 0000000000..4b2981ba62
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32_lyrat/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+# SPI RAM config
+#
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=4194304
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+### #
+### # ESP System Settings
+### #
+### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+### # CONFIG_ESP_CONSOLE_NONE is not set
+### CONFIG_ESP_CONSOLE_UART=y
+### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+### CONFIG_ESP_CONSOLE_UART_NUM=0
+### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+### # end of ESP System Settings

From de9233f84a89a9622382929ce86c2a8f1cc28c97 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Feb 2023 08:59:13 -0600
Subject: [PATCH 1922/2403] raspberrypi: SSLSocket: raise OSError when
 appropriate

Rather than returning the negative error value.

This is intended to close #7606, though I did not test with mqtt.
Instead, I created a simple standalone test program:
```python
import wifi, socketpool, ssl, time
#wifi.radio.connect()
import socketpool
socket = socketpool.SocketPool(wifi.radio)
ctx = ssl.create_default_context()

b = bytearray(8)

s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sss = ctx.wrap_socket(s, server_hostname='example.com')
sss.connect(('example.com', 443))
sss.setblocking(False)
r = sss.recv_into(b)
print(r, b)  # prints 4294967285 which is -11 as unsigned
sss.close()
```

Before the change, r was the out of range value 4294967285. After the
change, the recv_into call raises OSError instead.

This is comparable to the behavior on standard Python, though an
SSLWantReadError is raised instead.

The original (mis)behavior seems to match what was uncovered deep inside
minimqtt by adding logging:
```
370.578: DEBUG - PKT: _sock_exact_recv: recv_len = 4294967285
```
---
 ports/raspberrypi/common-hal/ssl/SSLSocket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 21e2a95c90..67508f16c8 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -260,8 +260,8 @@ mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t
         // renegotation.
         ret = MP_EWOULDBLOCK;
     }
-    DEBUG("returning [error case] %d\n", -ret);
-    return -ret;
+    DEBUG("raising errno [error case] %d\n", ret);
+    mp_raise_OSError(ret);
 }
 
 mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len) {
@@ -279,8 +279,8 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
         // renegotation.
         ret = MP_EWOULDBLOCK;
     }
-    DEBUG("returning [error case] %d\n", -ret);
-    return -ret;
+    DEBUG("raising errno [error case] %d\n", ret);
+    mp_raise_OSError(ret);
 }
 
 bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {

From c73f0086883030d0f2025c05b5f6acdbe6f4ef03 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 11:58:13 -0500
Subject: [PATCH 1923/2403] Make vcmailbox call change for AUX SPI instances

---
 ports/broadcom/common-hal/busio/SPI.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c
index 6b9354313b..5780ebe801 100644
--- a/ports/broadcom/common-hal/busio/SPI.c
+++ b/ports/broadcom/common-hal/busio/SPI.c
@@ -183,7 +183,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
 
     if (self->index == 1 || self->index == 2) {
         SPI1_Type *p = aux_spi[self->index];
-        uint32_t source_clock = vcmailbox_get_clock_rate_measured(VCMAILBOX_CLOCK_CORE);
+        uint32_t source_clock = vcmailbox_get_clock_rate(VCMAILBOX_CLOCK_CORE);
         uint16_t clock_divider = source_clock / baudrate;
         if (source_clock % baudrate > 0) {
             clock_divider += 2;

From 4722b5277116d1b1097ab1d2a69897bc9109ab89 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Tue, 21 Feb 2023 23:15:47 +0000
Subject: [PATCH 1924/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (998 of 998 strings)

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

diff --git a/locale/es.po b/locale/es.po
index e5a89fbd53..d32f6d4d06 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: 2023-02-20 03:39+0000\n"
+"PO-Revision-Date: 2023-02-22 18:34+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -2469,7 +2469,7 @@ msgstr "Usted presionó el boton BOOT al iniciar"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "Presionaste el botón GPIO0 al inicio."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."

From ea4fa2402eee478f88aabfb162e373e228303ce9 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 21 Feb 2023 19:53:44 +0000
Subject: [PATCH 1925/2403] Translated using Weblate (French)

Currently translated at 98.9% (988 of 998 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
---
 locale/fr.po | 112 +++++++++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/locale/fr.po b/locale/fr.po
index 9d7e737659..aece2bd6d7 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-12-27 18:02+0000\n"
-"Last-Translator: Blinka CircuitPython \n"
+"PO-Revision-Date: 2023-02-22 18:34+0000\n"
+"Last-Translator: Neradoc \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.15.1-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: main.c
 msgid ""
@@ -46,12 +46,16 @@ msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Appuyer sur reset pour sortir du mode sûr.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Le mode sûr est actif:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -127,7 +131,7 @@ msgstr "Échec de %q : %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q dans %q doit être de type %q, pas %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -150,7 +154,7 @@ msgstr ""
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q est en lecture seule sur cette carte"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
@@ -190,7 +194,7 @@ msgstr "%q doit être >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q doit être un bytearray ou matrice de type 'H' ou 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -199,11 +203,11 @@ msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q doit être de type %q ou %q, pas %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q doit être de type %q, pas %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -228,7 +232,7 @@ msgstr "broche %q invalide"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "le pas ne peut être zéro dans %q"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -429,7 +433,7 @@ msgstr "L'adresse doit être longue de %d octets"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Plage d'adresses non autorisée"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -524,7 +528,7 @@ msgstr "Déjà à la recherche des réseaux wifi"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "Erreur survenue en récupérant '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -921,7 +925,7 @@ msgstr ""
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "Pendant la gestion de cette exception, un autre s'est produite:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -950,7 +954,7 @@ msgstr "Erreur dans l'expression régulière"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Erreur dans safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -958,7 +962,7 @@ msgstr "Erreur : Impossible de lier"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Argument de type %q attendu"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -1035,7 +1039,7 @@ msgstr "Le fichier existe"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "Fichier non trouvé"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1123,12 +1127,12 @@ msgstr "Matériel utilisé, essayez d'autres broches"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Allocation du tas en dehors de la MV."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
-msgstr ""
+msgstr "Tas corrompu parce que la pile était trop petite. Augmenter la pile."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1141,7 +1145,7 @@ msgstr "Erreur d'initialisation I2C"
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "I2C peripheral in use"
-msgstr "périphérique I2C utilisé"
+msgstr "Périphérique I2C utilisé"
 
 #: shared-bindings/audiobusio/I2SOut.c
 msgid "I2SOut not available"
@@ -1258,7 +1262,7 @@ msgstr "Le minuteur du watchdog interne a expiré."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Erreur d'interruption."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid %q"
@@ -1297,7 +1301,7 @@ msgstr "Bits par valeur invalides"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Octet invalide %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1327,7 +1331,7 @@ msgstr "État invalide"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Séquence unicode invalide"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1335,7 +1339,7 @@ msgstr "La clé doit comporter 16, 24 ou 32 octets"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Clé non trouvée"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
@@ -1448,7 +1452,7 @@ msgstr "Erreur NVS"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Nom ou service inconnu"
 
 #: py/qstr.c
 msgid "Name too long"
@@ -1693,7 +1697,7 @@ msgstr "Une seul %q autorisée en sommeil profond."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Un seul %q peut être défini."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1729,7 +1733,7 @@ msgstr "Timeout de l'opération"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "À cours de services MDNS"
 
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Out of memory"
@@ -1865,7 +1869,7 @@ msgstr "Taille du programme invalide"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "Programme trop long"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -2047,7 +2051,7 @@ msgstr "Canal stéréo droit doit être sur le canal PWM B"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Stopper n'est pas supporté."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "Supply at least one UART pin"
@@ -2067,11 +2071,11 @@ msgstr "Délais de lecture de température dépassée"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr ""
+msgstr "Le module microcontroller a été utilisé pour démarrer en mode sûr."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "L'exception précédente est la cause directe de l'exception suivante:"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2079,7 +2083,7 @@ msgstr "La taille de rgb_pins doit être 6, 12, 18, 24 ou 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr ""
+msgstr "La puissance a chu. Assurez vous de fournir assez de puissance."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2100,7 +2104,7 @@ msgstr "Le signe de l'échantillon ne correspond pas à celui du mixer"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Erreur fatale de logiciel système tierce partie."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2182,7 +2186,7 @@ msgstr "Initialisation UART"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "Périphérique UART utilisé"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
@@ -2237,7 +2241,7 @@ msgstr "Impossible d'allouer des tampons pour une conversion signée"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Impossible d'allouer le tas."
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2268,7 +2272,7 @@ msgstr "Impossible de lancer la requête mDNS"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "L'écriture a échoué."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2437,15 +2441,15 @@ msgstr "Wi-Fi : "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "Wifi en mode point d'accès."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "Wifi en mode station."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "Le wifi n'est pas activé"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -2461,48 +2465,48 @@ msgstr "Écritures non supporté vers les Characteristic"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "Vous avez appuyé les deux boutons au démarrage."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton A au démarrage."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "Vous avez appuyé le bouton BOOT au démarrage"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton GPIO0 au démarrage."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton SW38 au démarrage."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton VOLUME au démarrage."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton central au démarrage."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "Vous avez appuyé le bouton gauche au démarrage."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "Vous avez appuyé le bouton reset au démarrage."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[taille limite atteinte]"
 
 #: py/objtype.c
 msgid "__init__() should return None"
@@ -2575,7 +2579,7 @@ msgstr "la tableau à trop de dimensions"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "matrice trop grande"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -2802,7 +2806,7 @@ msgstr "attribut non modifiable"
 
 #: py/runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "attribut '%q' non modifiable"
 
 #: py/emitnative.c
 msgid "can't store '%q'"
@@ -3068,6 +3072,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera.Camera a besoin de PSRAM réservée. Voir la documentation pour les "
+"instructions."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3285,7 +3291,7 @@ msgstr "l'index est hors limites"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "l'index doit être un tuple ou entier"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3671,7 +3677,7 @@ msgstr "compte de décalage négatif"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "sous index doit être entier"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
@@ -3843,7 +3849,7 @@ msgstr "seul bit_depth = 16 est pris en charge"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "seul mono est supporté"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
@@ -3851,7 +3857,7 @@ msgstr ""
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "seul oversample=64 supporté"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c

From fa787bd2d58a6b04144abd5d8bd81f5f8b01ef79 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 22 Feb 2023 12:43:36 +0000
Subject: [PATCH 1926/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (998 of 998 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 04aab50246..51bdae63a0 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: 2023-02-20 03:39+0000\n"
+"PO-Revision-Date: 2023-02-22 18:34+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -2466,7 +2466,7 @@ msgstr "Você pressionou o botão BOOT na inicialização"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "Você pressionou o botão GPIO0 durante a inicialização."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."

From c0f495756f37187bbbb1fff2b0dab25a7d42b870 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 21 Feb 2023 12:13:08 +0000
Subject: [PATCH 1927/2403] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index 1ec9ce4033..e72ec10045 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: 2023-02-20 03:39+0000\n"
+"PO-Revision-Date: 2023-02-22 18:34+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -2439,7 +2439,7 @@ msgstr "Du tryckte ner BOOT-knappen vid start"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "Du tryckte på GPIO0-knappen vid start."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."

From 6b0367f9eb77bbce35aedf608cb6a8e7f903dd51 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 22 Feb 2023 19:34:49 +0100
Subject: [PATCH 1928/2403] 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             | 12 ++++++++++++
 locale/cs.po             | 12 ++++++++++++
 locale/de_DE.po          | 12 ++++++++++++
 locale/el.po             | 12 ++++++++++++
 locale/en_GB.po          | 12 ++++++++++++
 locale/es.po             | 12 ++++++++++++
 locale/fil.po            | 12 ++++++++++++
 locale/fr.po             | 12 ++++++++++++
 locale/hi.po             | 12 ++++++++++++
 locale/it_IT.po          | 12 ++++++++++++
 locale/ja.po             | 12 ++++++++++++
 locale/ko.po             | 12 ++++++++++++
 locale/nl.po             | 12 ++++++++++++
 locale/pl.po             | 12 ++++++++++++
 locale/pt_BR.po          | 12 ++++++++++++
 locale/ru.po             | 12 ++++++++++++
 locale/sv.po             | 12 ++++++++++++
 locale/tr.po             | 12 ++++++++++++
 locale/zh_Latn_pinyin.po | 12 ++++++++++++
 19 files changed, 228 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 490d3ecbba..61d2ce3308 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -30,6 +30,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2419,6 +2427,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 13723a2be8..aabc3f2c78 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -32,6 +32,14 @@ msgstr ""
 "\n"
 "Kód byl zastaven kvůli automatickému načtení. K načtení dojde brzy.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2406,6 +2414,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 620bf7dcfc..9629e6e36a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -31,6 +31,14 @@ msgstr ""
 "\n"
 "Code wurde durch automatisches Neuladen gestoppt. Wird bald neu geladen.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2455,6 +2463,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index 1e7a7c9813..ad3d815961 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -35,6 +35,14 @@ msgstr ""
 "Ο κώδικας σταμάτησε λόγω της αυτόματης επαναφόρτωσης. Η επαναφόρτωση θα "
 "γίνει σύντομα.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2414,6 +2422,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index e26be76d6d..122300a5ed 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -34,6 +34,14 @@ msgstr ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2414,6 +2422,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index d32f6d4d06..1219be52f8 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -34,6 +34,14 @@ msgstr ""
 "\n"
 "Código detenido por la auto-recarga. Recargando pronto.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2471,6 +2479,10 @@ msgstr "Usted presionó el boton BOOT al iniciar"
 msgid "You pressed the GPIO0 button at start up."
 msgstr "Presionaste el botón GPIO0 al inicio."
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Usted presionó el boton SW38 al iniciar."
diff --git a/locale/fil.po b/locale/fil.po
index 99ca28a5b0..ad46137e27 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -29,6 +29,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2409,6 +2417,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index aece2bd6d7..d06595c001 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -34,6 +34,14 @@ msgstr ""
 "Le code a été arrêté par l'actualisation automatique. Rechargement "
 "prochain.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2481,6 +2489,10 @@ msgstr "Vous avez appuyé le bouton BOOT au démarrage"
 msgid "You pressed the GPIO0 button at start up."
 msgstr "Vous avez appuyé le bouton GPIO0 au démarrage."
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Vous avez appuyé le bouton SW38 au démarrage."
diff --git a/locale/hi.po b/locale/hi.po
index fe1f7cfa95..97c730de83 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -28,6 +28,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2391,6 +2399,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a941c39ed9..413fceead6 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -31,6 +31,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2416,6 +2424,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 47a9602b14..19eed77eb3 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -34,6 +34,14 @@ msgstr ""
 "\n"
 "オートリロードでコード実行は中止された。まもなくリロードする。\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2408,6 +2416,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 26bff6a610..86a1e30538 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -29,6 +29,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2395,6 +2403,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 616c469595..a7b2aed3e3 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -28,6 +28,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2418,6 +2426,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index e773fec6b1..a952e22b0a 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -30,6 +30,14 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2399,6 +2407,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 51bdae63a0..cdb69ec484 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -32,6 +32,14 @@ msgstr ""
 "\n"
 "O código parou pela recarga automática. Recarregando em breve.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2468,6 +2476,10 @@ msgstr "Você pressionou o botão BOOT na inicialização"
 msgid "You pressed the GPIO0 button at start up."
 msgstr "Você pressionou o botão GPIO0 durante a inicialização."
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Você pressionou o botão SW38 na inicialização."
diff --git a/locale/ru.po b/locale/ru.po
index 334b0420fa..824a8180f6 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -34,6 +34,14 @@ msgstr ""
 "\n"
 "Программа остановлена автоматической перезагрузкой. Скоро перезагрузка.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2454,6 +2462,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index e72ec10045..c4b3a36166 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -32,6 +32,14 @@ msgstr ""
 "\n"
 "Koden stoppades av automatisk laddning. Omladdning sker strax.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2441,6 +2449,10 @@ msgstr "Du tryckte ner BOOT-knappen vid start"
 msgid "You pressed the GPIO0 button at start up."
 msgstr "Du tryckte på GPIO0-knappen vid start."
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr "Du tryckte ned SW38-knappen vid start."
diff --git a/locale/tr.po b/locale/tr.po
index 4f17c5d33d..988db77b4c 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -34,6 +34,14 @@ msgstr ""
 "Program otomatik yeniden yükleme tarafından durduruldu. Birazdan tekrar "
 "yüklenecek.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2413,6 +2421,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 79b895afe4..53ac3eb84d 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -34,6 +34,14 @@ msgstr ""
 "dài mǎ yīn zì dòng chóng xīn jiā zǎi ér tíng zhǐ. jí jiāng chóng xīn jiā "
 "zǎi.\n"
 
+#: main.c
+msgid ""
+"\n"
+"Invalid CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\r"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -2439,6 +2447,10 @@ msgstr ""
 msgid "You pressed the GPIO0 button at start up."
 msgstr ""
 
+#: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
+msgid "You pressed the Rec button at start up."
+msgstr ""
+
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
 msgstr ""

From 1acf65ee226d5957442ce60964c7f02569826ecf Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 17 Feb 2023 16:13:18 -0800
Subject: [PATCH 1929/2403] Fix `pwmio` on iMX RT.

It now handles deinit, never_reset and sharing tracking. PWM
now runs in the WAIT state as well during a time.sleep().

_reset_ok() was removed because it was called in one spot right
before deinit().

Some PWMOut were also switched to a bitmap for use instead of
reference count. That way init and deinit are idempotent.

Fixes #6589. Fixes #4841. Fixes #4541.
---
 ports/atmel-samd/common-hal/pwmio/PWMOut.c  |   5 +-
 ports/cxd56/common-hal/pwmio/PWMOut.c       |   6 +-
 ports/espressif/common-hal/pwmio/PWMOut.c   |  25 +-
 ports/mimxrt10xx/common-hal/pwmio/PWMOut.c  | 331 ++++++++++++--------
 ports/mimxrt10xx/common-hal/pwmio/PWMOut.h  |   6 +-
 ports/mimxrt10xx/supervisor/port.c          |   2 +-
 ports/nrf/common-hal/pwmio/PWMOut.c         |  26 +-
 ports/raspberrypi/common-hal/pwmio/PWMOut.c |   8 -
 ports/stm/common-hal/pwmio/PWMOut.c         |  38 ++-
 shared-module/displayio/Display.c           |   1 -
 10 files changed, 246 insertions(+), 202 deletions(-)

diff --git a/ports/atmel-samd/common-hal/pwmio/PWMOut.c b/ports/atmel-samd/common-hal/pwmio/PWMOut.c
index c6e9e07304..1bb955fce8 100644
--- a/ports/atmel-samd/common-hal/pwmio/PWMOut.c
+++ b/ports/atmel-samd/common-hal/pwmio/PWMOut.c
@@ -67,10 +67,6 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
     never_reset_pin_number(self->pin->number);
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    timer_reset_ok(self->timer->index, self->timer->is_tc);
-}
-
 void pwmout_reset(void) {
     // Reset all timers
     for (int i = 0; i < TCC_INST_NUM; i++) {
@@ -267,6 +263,7 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
     if (common_hal_pwmio_pwmout_deinited(self)) {
         return;
     }
+    timer_reset_ok(self->timer->index, self->timer->is_tc);
     const pin_timer_t *t = self->timer;
     if (t->is_tc) {
         Tc *tc = tc_insts[t->index];
diff --git a/ports/cxd56/common-hal/pwmio/PWMOut.c b/ports/cxd56/common-hal/pwmio/PWMOut.c
index 7e27817aab..10689dc55a 100644
--- a/ports/cxd56/common-hal/pwmio/PWMOut.c
+++ b/ports/cxd56/common-hal/pwmio/PWMOut.c
@@ -90,6 +90,8 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
         return;
     }
 
+    pwmout_dev[self->number].reset = true;
+
     ioctl(pwmout_dev[self->number].fd, PWMIOC_STOP, 0);
     close(pwmout_dev[self->number].fd);
     pwmout_dev[self->number].fd = -1;
@@ -134,10 +136,6 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
     pwmout_dev[self->number].reset = false;
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    pwmout_dev[self->number].reset = true;
-}
-
 void pwmout_reset(void) {
     for (int i = 0; i < MP_ARRAY_SIZE(pwmout_dev); i++) {
         if (pwmout_dev[i].fd >= 0 && pwmout_dev[i].reset) {
diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c
index 68518fbd25..2cb1e6254b 100644
--- a/ports/espressif/common-hal/pwmio/PWMOut.c
+++ b/ports/espressif/common-hal/pwmio/PWMOut.c
@@ -164,24 +164,6 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
     never_reset_pin_number(self->pin->number);
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    never_reset_tim[self->tim_handle.timer_num] = false;
-    // Search if any other channel is using the timer and is never reset.
-    // Otherwise, we clear never_reset for the timer as well.
-    bool other_never_reset = false;
-    for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
-        if (i != self->chan_handle.channel &&
-            reserved_channels[i] == self->tim_handle.timer_num &&
-            never_reset_chan[i]) {
-            other_never_reset = true;
-            break;
-        }
-    }
-    if (!other_never_reset) {
-        never_reset_chan[self->chan_handle.channel] = false;
-    }
-}
-
 bool common_hal_pwmio_pwmout_deinited(pwmio_pwmout_obj_t *self) {
     return self->deinited == true;
 }
@@ -196,14 +178,21 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
     }
     reserved_channels[self->chan_handle.channel] = INDEX_EMPTY;
     never_reset_chan[self->chan_handle.channel] = false;
+
     // Search if any other channel is using the timer
     bool taken = false;
+    bool other_never_reset = false;
     for (size_t i = 0; i < LEDC_CHANNEL_MAX; i++) {
         if (reserved_channels[i] == self->tim_handle.timer_num) {
             taken = true;
+            other_never_reset = never_reset_chan[i];
             break;
         }
     }
+    // Clear the timer's never reset if the other channel isn't never reset.
+    if (!other_never_reset) {
+        never_reset_tim[self->tim_handle.timer_num] = false;
+    }
     // Variable frequency means there's only one channel on the timer
     if (!taken || self->variable_frequency) {
         ledc_timer_rst(LEDC_LOW_SPEED_MODE, self->tim_handle.timer_num);
diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
index 97892b1095..c2afb38664 100644
--- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
@@ -38,9 +38,19 @@
 #include "supervisor/shared/translate/translate.h"
 #include "periph.h"
 
-// Debug print support set to zero to enable debug printing
-#define ENABLE_DEBUG_PRINTING 0
+static PWM_Type *const _flexpwms[] = PWM_BASE_PTRS;
 
+// 4 bits for each submodule in each FlexPWM.
+static uint16_t _pwm_never_reset[MP_ARRAY_SIZE(_flexpwms)];
+// Bitmask of whether state machines are use for variable frequency.
+static uint8_t _pwm_variable_frequency[MP_ARRAY_SIZE(_flexpwms)];
+// Configured frequency for each submodule.
+static uint32_t _pwm_sm_frequencies[MP_ARRAY_SIZE(_flexpwms)][FSL_FEATURE_PWM_SUBMODULE_COUNT];
+// Channels use is tracked using the OUTEN register.
+
+// The SDK gives use clocks per submodule but they all share the same value! So, ignore the
+// submodule and only turn off the clock when no other submodules are in use.
+static const clock_ip_name_t _flexpwm_clocks[][FSL_FEATURE_PWM_SUBMODULE_COUNT] = PWM_CLOCKS;
 
 static void config_periph_pin(const mcu_pwm_obj_t *periph) {
     IOMUXC_SetPinMux(
@@ -61,13 +71,59 @@ static void config_periph_pin(const mcu_pwm_obj_t *periph) {
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
 
+static uint16_t _outen_mask(pwm_submodule_t submodule, pwm_channels_t channel) {
+    uint16_t outen_mask = 0;
+    uint8_t sm_mask = 1 << submodule;
+    switch (channel) {
+        case kPWM_PwmX:
+            outen_mask |= PWM_OUTEN_PWMX_EN(sm_mask);
+            break;
+        case kPWM_PwmA:
+            outen_mask |= PWM_OUTEN_PWMA_EN(sm_mask);
+            break;
+        case kPWM_PwmB:
+            outen_mask |= PWM_OUTEN_PWMB_EN(sm_mask);
+            break;
+    }
+    return outen_mask;
+}
+
 void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
+    common_hal_never_reset_pin(self->pin);
+    _pwm_never_reset[self->flexpwm_index] |= (1 << (self->pwm->submodule * 4 + self->pwm->channel));
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
+STATIC void _maybe_disable_clock(uint8_t instance) {
+    if ((_flexpwms[instance]->MCTRL & PWM_MCTRL_RUN_MASK) == 0) {
+        CLOCK_DisableClock(_flexpwm_clocks[instance][0]);
+    }
 }
 
-void pwmout_reset(void) {
+void reset_all_flexpwm(void) {
+    for (size_t i = 1; i < MP_ARRAY_SIZE(_pwm_never_reset); i++) {
+        PWM_Type *flexpwm = _flexpwms[i];
+        for (size_t submodule = 0; submodule < FSL_FEATURE_PWM_SUBMODULE_COUNT; submodule++) {
+            uint8_t sm_mask = 1 << submodule;
+            for (size_t channel = 0; channel < 3; channel++) {
+                uint16_t channel_mask = 0x1 << (submodule * 4 + channel);
+                if ((_pwm_never_reset[i] & channel_mask) != 0) {
+                    continue;
+                }
+
+                // Turn off the channel.
+                flexpwm->OUTEN &= ~_outen_mask(submodule, channel);
+            }
+            uint16_t submodule_mask = 0xf << (submodule * 4);
+            if ((_pwm_never_reset[i] & submodule_mask) != 0) {
+                // Leave the submodule on since a channel is marked for never_reset.
+                continue;
+            }
+            flexpwm->MCTRL &= ~(sm_mask << PWM_MCTRL_RUN_SHIFT);
+            _pwm_variable_frequency[i] &= ~sm_mask;
+            _pwm_sm_frequencies[i][submodule] = 0;
+        }
+        _maybe_disable_clock(i);
+    }
 }
 
 #define PWM_SRC_CLK_FREQ CLOCK_GetFreq(kCLOCK_IpgClk)
@@ -87,33 +143,6 @@ static int calculate_pulse_count(uint32_t frequency, uint8_t *prescaler) {
     return 0;
 }
 
-// ==========================================================
-// Debug code
-// ==========================================================
-#if ENABLE_DEBUG_PRINTING
-#define DBGPrintf mp_printf
-extern void debug_print_flexpwm_registers(PWM_Type *base);
-
-void debug_print_flexpwm_registers(PWM_Type *base) {
-    mp_printf(&mp_plat_print,
-        "\t\tPWM OUTEN:%x  MASK:%x  SWCOUT:%x DTSRCSEL:%x MCTRL:%x MCTRL2:%x FCTRL:%x FSTS:%x FFILT:%x FTST:%x FCTRL2:%x\n",
-        base->OUTEN, base->MASK, base->SWCOUT, base->DTSRCSEL, base->MCTRL, base->MCTRL2, base->FCTRL,
-        base->FSTS, base->FFILT, base->FTST, base->FCTRL2);
-    for (uint8_t i = 0; i < 4; i++) {
-        mp_printf(&mp_plat_print,
-            "\t\t(%u) INIT:%x CTRL2:%x CTRL:%x VAL0:%x VAL1:%x VAL2:%x VAL3:%x VAL4:%x VAL5:%x OCTRL:%x DTCNT0:%x DTCNT1:%x  DISMAP: %x %x\n", i,
-            base->SM[i].INIT, base->SM[i].CTRL2, base->SM[i].CTRL, base->SM[i].VAL0, base->SM[i].VAL1, base->SM[i].VAL2,
-            base->SM[i].VAL3, base->SM[i].VAL4, base->SM[i].VAL5, base->SM[i].OCTRL, base->SM[i].DTCNT0, base->SM[i].DTCNT1,
-            base->SM[i].DISMAP[0], base->SM[i].DISMAP[1]);
-    }
-
-}
-#else
-#define DBGPrintf(p,...)
-inline void debug_print_flexpwm_registers(PWM_Type *base) {
-}
-#endif
-
 pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     const mcu_pin_obj_t *pin,
     uint16_t duty,
@@ -122,12 +151,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     self->pin = pin;
     self->variable_frequency = variable_frequency;
 
-    const uint32_t pwm_count = sizeof(mcu_pwm_list) / sizeof(mcu_pwm_obj_t);
-
-    DBGPrintf(&mp_plat_print, ">>> common_hal_pwmio_pwmout_construct called: pin: %p %u freq:%u duty:%u var:%u\n",
-        self->pin->gpio, self->pin->number, frequency, duty, variable_frequency);
-
-    for (uint32_t i = 0; i < pwm_count; ++i) {
+    for (uint32_t i = 0; i < MP_ARRAY_SIZE(mcu_pwm_list); ++i) {
         if (mcu_pwm_list[i].pin != pin) {
             continue;
         }
@@ -141,30 +165,20 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
         return PWMOUT_INVALID_PIN;
     }
 
-    DBGPrintf(&mp_plat_print, "\tFound in PWM List\n");
+    PWM_Type *flexpwm = self->pwm->pwm;
+    pwm_submodule_t submodule = self->pwm->submodule;
+    uint16_t sm_mask = 1 << submodule;
+    pwm_channels_t channel = self->pwm->channel;
 
-    config_periph_pin(self->pwm);
+    uint8_t flexpwm_index = 1;
+    for (; flexpwm_index < MP_ARRAY_SIZE(_flexpwms); flexpwm_index++) {
+        if (_flexpwms[flexpwm_index] == flexpwm) {
+            break;
+        }
+    }
+    self->flexpwm_index = flexpwm_index;
 
-    pwm_config_t pwmConfig;
-
-    /*
-     * pwmConfig.enableDebugMode = false;
-     * pwmConfig.enableWait = false;
-     * pwmConfig.reloadSelect = kPWM_LocalReload;
-     * pwmConfig.faultFilterCount = 0;
-     * pwmConfig.faultFilterPeriod = 0;
-     * pwmConfig.clockSource = kPWM_BusClock;
-     * pwmConfig.prescale = kPWM_Prescale_Divide_1;
-     * pwmConfig.initializationControl = kPWM_Initialize_LocalSync;
-     * pwmConfig.forceTrigger = kPWM_Force_Local;
-     * pwmConfig.reloadFrequency = kPWM_LoadEveryOportunity;
-     * pwmConfig.reloadLogic = kPWM_ReloadImmediate;
-     * pwmConfig.pairOperation = kPWM_Independent;
-     */
-    PWM_GetDefaultConfig(&pwmConfig);
-
-    // pwmConfig.reloadLogic = kPWM_ReloadPwmFullCycle;
-    pwmConfig.enableDebugMode = true;
+    uint16_t outen_mask = _outen_mask(submodule, channel);
 
     self->pulse_count = calculate_pulse_count(frequency, &self->prescaler);
 
@@ -172,69 +186,92 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
         return PWMOUT_INVALID_FREQUENCY;
     }
 
-    pwmConfig.prescale = self->prescaler;
-
-    DBGPrintf(&mp_plat_print, "\tCall PWM_Init\n");
-    if (PWM_Init(self->pwm->pwm, self->pwm->submodule, &pwmConfig) == kStatus_Fail) {
-        return PWMOUT_INVALID_PIN;
-    }
-
-    // Disable all fault inputs
-    self->pwm->pwm->SM[self->pwm->submodule].DISMAP[0] = 0;
-    self->pwm->pwm->SM[self->pwm->submodule].DISMAP[1] = 0;
-
-    DBGPrintf(&mp_plat_print, "\tCall PWM_SetupPwm %p %x %u\n", self->pwm->pwm, self->pwm->submodule);
-    // ========================================================================================================
-    // Not calling the PWM_SetupPwm as it was setup to only work for PWM output on chan A and B but not X
-    // I have done some experimenting, probably could try others, but again they do not work with X.
-    // Most of the code checks to see if A if not, then it assume B.
-    //
-    // Instead I set it up to work similar to what the Teensy 4.x code does.
-    //
-    // That is we set the PWM_CTRL_FULL_MASK, which then uses  base->SM[submodule].VAL1  to control
-    // when the timer is reset, so it sets up your cycle/frequency.  But then this implies that X channel
-    // which uses 0, 1 has to be handled specially. So for the different channels:
-    //      A - Uses VAL2 to turn on (0) and VAL3=duty to turn off
-    //      B - Uses VAL4 to turn on (0) and VAL5 to turn off
-    //      X - As mentioned above VAL1 turns off, but it's set to the timing for frequency. so
-    //          VAL0 turns on, so we set it to VAL1 - duty
-    //
-    PWM_Type *base = self->pwm->pwm;
-    uint8_t submodule = self->pwm->submodule;
-
-    uint32_t mask = 1 << submodule;
-    uint32_t olddiv = base->SM[submodule].VAL1 + 1;
-    if (self->pulse_count != olddiv) {
-        base->MCTRL |= PWM_MCTRL_CLDOK(mask);
-        base->SM[submodule].CTRL = PWM_CTRL_PRSC_MASK | PWM_CTRL_PRSC(self->prescaler);
-        base->SM[submodule].VAL1 = self->pulse_count - 1;
-        base->SM[submodule].CTRL2 = PWM_CTRL2_INDEP_MASK | PWM_CTRL2_WAITEN_MASK | PWM_CTRL2_DBGEN_MASK;
-
-        if (olddiv == 1) {
-            base->SM[submodule].CTRL = PWM_CTRL_FULL_MASK;
-            base->SM[submodule].VAL0 = 0;
-            base->SM[submodule].VAL2 = 0;
-            base->SM[submodule].VAL3 = 0;
-            base->SM[submodule].VAL4 = 0;
-            base->SM[submodule].VAL5 = 0;
-        } else {
-            base->SM[submodule].VAL0 = (base->SM[submodule].VAL0 * self->pulse_count) / olddiv;
-            base->SM[submodule].VAL3 = (base->SM[submodule].VAL3 * self->pulse_count) / olddiv;
-            base->SM[submodule].VAL5 = (base->SM[submodule].VAL5 * self->pulse_count) / olddiv;
+    // The submodule is already running
+    if (((flexpwm->MCTRL >> PWM_MCTRL_RUN_SHIFT) & sm_mask) != 0) {
+        // Another output has claimed this submodule for variable frequency already.
+        if ((_pwm_variable_frequency[flexpwm_index] & sm_mask) != 0) {
+            return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
+        }
+
+        // We want variable frequency but another class has already claim a fixed frequency.
+        if (variable_frequency) {
+            return PWMOUT_VARIABLE_FREQUENCY_NOT_AVAILABLE;
+        }
+
+        // Another pin is already using this output.
+        if ((flexpwm->OUTEN & outen_mask) != 0) {
+            return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
+        }
+
+        if (frequency != _pwm_sm_frequencies[flexpwm_index][submodule]) {
+            return PWMOUT_INVALID_FREQUENCY_ON_PIN;
+        }
+
+        // Submodule is already running at our target frequency and the output
+        // is free.
+    } else {
+        pwm_config_t pwmConfig;
+
+        /*
+         * pwmConfig.enableDebugMode = false;
+         * pwmConfig.enableWait = false;
+         * pwmConfig.reloadSelect = kPWM_LocalReload;
+         * pwmConfig.faultFilterCount = 0;
+         * pwmConfig.faultFilterPeriod = 0;
+         * pwmConfig.clockSource = kPWM_BusClock;
+         * pwmConfig.prescale = kPWM_Prescale_Divide_1;
+         * pwmConfig.initializationControl = kPWM_Initialize_LocalSync;
+         * pwmConfig.forceTrigger = kPWM_Force_Local;
+         * pwmConfig.reloadFrequency = kPWM_LoadEveryOportunity;
+         * pwmConfig.reloadLogic = kPWM_ReloadImmediate;
+         * pwmConfig.pairOperation = kPWM_Independent;
+         */
+        PWM_GetDefaultConfig(&pwmConfig);
+
+        pwmConfig.reloadLogic = kPWM_ReloadPwmFullCycle;
+        pwmConfig.enableWait = true;
+        pwmConfig.enableDebugMode = true;
+
+        pwmConfig.prescale = self->prescaler;
+
+        if (PWM_Init(flexpwm, submodule, &pwmConfig) != kStatus_Success) {
+            return PWMOUT_INITIALIZATION_ERROR;
+        }
+
+        // Disable all fault inputs
+        flexpwm->SM[submodule].DISMAP[0] = 0;
+        flexpwm->SM[submodule].DISMAP[1] = 0;
+
+        PWM_SetPwmLdok(flexpwm, sm_mask, false);
+        flexpwm->SM[submodule].CTRL = PWM_CTRL_FULL_MASK | PWM_CTRL_PRSC(self->prescaler);
+        flexpwm->SM[submodule].CTRL2 = PWM_CTRL2_INDEP_MASK | PWM_CTRL2_WAITEN_MASK | PWM_CTRL2_DBGEN_MASK;
+        // Set the reload value to zero so we're in unsigned mode.
+        flexpwm->SM[submodule].INIT = 0;
+        // Set the top/reload value.
+        flexpwm->SM[submodule].VAL1 = self->pulse_count;
+        // Clear the other channels.
+        flexpwm->SM[submodule].VAL0 = 0;
+        flexpwm->SM[submodule].VAL2 = 0;
+        flexpwm->SM[submodule].VAL3 = 0;
+        flexpwm->SM[submodule].VAL4 = 0;
+        flexpwm->SM[submodule].VAL5 = 0;
+        PWM_SetPwmLdok(flexpwm, sm_mask, true);
+
+        PWM_StartTimer(flexpwm, sm_mask);
+        _pwm_sm_frequencies[flexpwm_index][submodule] = frequency;
+
+        if (variable_frequency) {
+            _pwm_variable_frequency[flexpwm_index] = sm_mask;
         }
-        base->MCTRL |= PWM_MCTRL_LDOK(mask);
     }
-    debug_print_flexpwm_registers(self->pwm->pwm);
 
-    PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, true);
-
-    PWM_StartTimer(self->pwm->pwm, 1 << self->pwm->submodule);
-
-
-    DBGPrintf(&mp_plat_print, "\tCall common_hal_pwmio_pwmout_set_duty_cycle\n");
     common_hal_pwmio_pwmout_set_duty_cycle(self, duty);
 
-    DBGPrintf(&mp_plat_print, "\tReturn OK\n");
+    flexpwm->OUTEN |= outen_mask;
+
+    // Configure the IOMUX once we know everything else is working.
+    config_periph_pin(self->pwm);
+
     return PWMOUT_OK;
 }
 
@@ -247,8 +284,29 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
         return;
     }
 
+    _pwm_never_reset[self->flexpwm_index] &= ~(1 << (self->pwm->submodule * 4 + self->pwm->channel));
+
+    PWM_Type *flexpwm = self->pwm->pwm;
+    pwm_submodule_t submodule = self->pwm->submodule;
+    uint16_t sm_mask = 1 << submodule;
+
+    // Reset the pin before we turn it off.
     common_hal_reset_pin(self->pin);
     self->pin = NULL;
+
+    // Always disable the output.
+    flexpwm->OUTEN &= ~_outen_mask(submodule, self->pwm->channel);
+
+    uint16_t all_sm_channels = _outen_mask(submodule, kPWM_PwmX) | _outen_mask(submodule, kPWM_PwmA) | _outen_mask(submodule, kPWM_PwmB);
+
+    // Turn off the submodule if it doesn't have any outputs active.
+    if ((flexpwm->OUTEN & all_sm_channels) == 0) {
+        // Deinit ourselves because the SDK turns off the clock to the whole FlexPWM on deinit.
+        flexpwm->MCTRL &= ~(sm_mask << PWM_MCTRL_RUN_SHIFT);
+        _pwm_variable_frequency[self->flexpwm_index] &= ~sm_mask;
+        _pwm_sm_frequencies[self->flexpwm_index][submodule] = 0;
+    }
+    _maybe_disable_clock(self->flexpwm_index);
 }
 
 void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uint16_t duty) {
@@ -261,39 +319,40 @@ void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uint16_t d
     //      X - As mentioned above VAL1 turns off, but it's set to the timing for frequency. so
     //          VAL0 turns on, so we set it to VAL1 - duty
 
-    DBGPrintf(&mp_plat_print, "common_hal_pwmio_pwmout_set_duty_cycle %u\n", duty);
     self->duty_cycle = duty;
     PWM_Type *base = self->pwm->pwm;
-    uint8_t mask = 1 << self->pwm->submodule;
+    uint8_t sm_mask = 1 << self->pwm->submodule;
+    uint16_t duty_scaled;
     if (duty == 65535) {
-        self->duty_scaled = self->pulse_count + 1;
+        // X channels can't do a full 100% duty cycle.
+        if (self->pwm->channel == kPWM_PwmX) {
+            mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_duty_cycle);
+        }
+        duty_scaled = self->pulse_count + 1;
     } else {
-        self->duty_scaled = ((uint32_t)duty * self->pulse_count + self->pulse_count / 2) / 65535;
+        duty_scaled = ((uint32_t)duty * self->pulse_count) / 65535;
     }
+    PWM_SetPwmLdok(self->pwm->pwm, sm_mask, false);
     switch (self->pwm->channel) {
         case kPWM_PwmX:
-            base->SM[self->pwm->submodule].VAL0 = self->pulse_count - self->duty_scaled;
-            base->OUTEN |= PWM_OUTEN_PWMX_EN(mask);
+            // PWM X Signals always having a falling edge at the reload value. (Otherwise we'd
+            // change the PWM frequency.) So, we adjust the rising edge to get the correct duty
+            // cycle.
+            base->SM[self->pwm->submodule].VAL0 = self->pulse_count - duty_scaled;
             break;
         case kPWM_PwmA:
-            base->SM[self->pwm->submodule].VAL3 = self->duty_scaled;
-            base->OUTEN |= PWM_OUTEN_PWMA_EN(mask);
+            // The other two channels always have their rising edge at 0 and vary their falling
+            // edge.
+            base->SM[self->pwm->submodule].VAL3 = duty_scaled;
             break;
         case kPWM_PwmB:
-            base->SM[self->pwm->submodule].VAL5 = self->duty_scaled;
-            base->OUTEN |= PWM_OUTEN_PWMB_EN(mask);
+            base->SM[self->pwm->submodule].VAL5 = duty_scaled;
     }
-    PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, true);
-
-    debug_print_flexpwm_registers(self->pwm->pwm);
-
+    PWM_SetPwmLdok(self->pwm->pwm, sm_mask, true);
 }
 
 uint16_t common_hal_pwmio_pwmout_get_duty_cycle(pwmio_pwmout_obj_t *self) {
-    if (self->duty_cycle == 65535) {
-        return 65535;
-    }
-    return ((uint32_t)self->duty_scaled * 65535 + 65535 / 2) / self->pulse_count;
+    return self->duty_cycle;
 }
 
 void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self,
@@ -309,6 +368,8 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self,
     // a small glitch can occur when adjusting the prescaler, from the setting
     // of CTRL just below to the setting of the Ldok register in
     // set_duty_cycle.
+    // Clear LDOK so that we can update the values.
+    PWM_SetPwmLdok(self->pwm->pwm, 1 << self->pwm->submodule, false);
     uint32_t reg = self->pwm->pwm->SM[self->pwm->submodule].CTRL;
     reg &= ~(PWM_CTRL_PRSC_MASK);
     reg |= PWM_CTRL_PRSC(self->prescaler);
diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.h b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.h
index fa4ce46780..6542d67e1f 100644
--- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.h
+++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.h
@@ -37,10 +37,12 @@ typedef struct {
     const mcu_pin_obj_t *pin;
     const mcu_pwm_obj_t *pwm;
     bool variable_frequency;
+    uint8_t flexpwm_index;
     uint8_t prescaler;
-    uint16_t duty_cycle, duty_scaled, pulse_count;
+    uint16_t duty_cycle;
+    uint16_t pulse_count;
 } pwmio_pwmout_obj_t;
 
-void pwmout_reset(void);
+void reset_all_flexpwm(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_PWMIO_PWMOUT_H
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 2ac7995943..13ccf96c8c 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -284,7 +284,7 @@ void reset_port(void) {
 //    eic_reset();
 
     #if CIRCUITPY_PWMIO
-    pwmout_reset();
+    reset_all_flexpwm();
     #endif
 
     #if CIRCUITPY_RTC
diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nrf/common-hal/pwmio/PWMOut.c
index 1bd38e7a6e..f73e3d3952 100644
--- a/ports/nrf/common-hal/pwmio/PWMOut.c
+++ b/ports/nrf/common-hal/pwmio/PWMOut.c
@@ -67,25 +67,11 @@ STATIC int pwm_idx(NRF_PWM_Type *pwm) {
 }
 
 void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(pwms); i++) {
-        NRF_PWM_Type *pwm = pwms[i];
-        if (pwm == self->pwm) {
-            never_reset_pwm[i] += 1;
-        }
-    }
+    never_reset_pwm[pwm_idx(self->pwm)] |= 1 << self->channel;
 
     common_hal_never_reset_pin(self->pin);
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(pwms); i++) {
-        NRF_PWM_Type *pwm = pwms[i];
-        if (pwm == self->pwm) {
-            never_reset_pwm[i] -= 1;
-        }
-    }
-}
-
 STATIC void reset_single_pwmout(uint8_t i) {
     NRF_PWM_Type *pwm = pwms[i];
 
@@ -114,7 +100,13 @@ STATIC void reset_single_pwmout(uint8_t i) {
 
 void pwmout_reset(void) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(pwms); i++) {
-        if (never_reset_pwm[i] > 0) {
+        for (size_t c = 0; c < CHANNELS_PER_PWM; c++) {
+            if ((never_reset_pwm[i] & (1 << c)) != 0) {
+                continue;
+            }
+            pwms[i]->PSEL.OUT[c] = 0xFFFFFFFF;
+        }
+        if (never_reset_pwm[i] != 0) {
             continue;
         }
         reset_single_pwmout(i);
@@ -270,6 +262,8 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
 
     nrf_gpio_cfg_default(self->pin->number);
 
+    never_reset_pwm[pwm_idx(self->pwm)] &= ~(1 << self->channel);
+
     NRF_PWM_Type *pwm = self->pwm;
     self->pwm = NULL;
 
diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
index f75c4b3451..7925a734fb 100644
--- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c
+++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
@@ -89,20 +89,12 @@ void pwmout_never_reset(uint8_t slice, uint8_t ab_channel) {
     never_reset_channel |= _mask(slice, ab_channel);
 }
 
-void pwmout_reset_ok(uint8_t slice, uint8_t ab_channel) {
-    never_reset_channel &= ~_mask(slice, ab_channel);
-}
-
 void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
     pwmout_never_reset(self->slice, self->ab_channel);
 
     never_reset_pin_number(self->pin->number);
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    pwmout_reset_ok(self->slice, self->ab_channel);
-}
-
 void pwmout_reset(void) {
     // Reset all slices
     for (size_t slice = 0; slice < NUM_PWM_SLICES; slice++) {
diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c
index cc712497d2..a983718ff2 100644
--- a/ports/stm/common-hal/pwmio/PWMOut.c
+++ b/ports/stm/common-hal/pwmio/PWMOut.c
@@ -40,7 +40,8 @@
 STATIC uint8_t tim_channels_taken[TIM_BANK_ARRAY_LEN];
 // Initial frequency timer is set to.
 STATIC uint32_t tim_frequencies[TIM_BANK_ARRAY_LEN];
-STATIC bool never_reset_tim[TIM_BANK_ARRAY_LEN];
+STATIC uint8_t never_reset_tim[TIM_BANK_ARRAY_LEN];
+STATIC TIM_HandleTypeDef *active_handles[TIM_BANK_ARRAY_LEN];
 
 STATIC uint32_t timer_get_internal_duty(uint16_t duty, uint32_t period) {
     // duty cycle is duty/0xFFFF fraction x (number of pulses per period)
@@ -64,10 +65,25 @@ STATIC bool timer_get_optimal_divisors(uint32_t *period, uint32_t *prescaler,
 
 void pwmout_reset(void) {
     for (int i = 0; i < TIM_BANK_ARRAY_LEN; i++) {
-        if (!never_reset_tim[i]) {
-            tim_channels_taken[i] = 0x00;
-            tim_frequencies[i] = 0;
+        if (active_handles[i] == NULL) {
+            continue;
         }
+        for (int c = 0; c < 8; c++) {
+            if ((never_reset_tim[i] & (1 << c)) != 0 ||
+                (tim_channels_taken[i] & (1 << c)) == 0) {
+                continue;
+            }
+            HAL_TIM_PWM_Stop(active_handles[i], c);
+        }
+        // TODO: Actually shut down individual channels and PWM.
+        if (never_reset_tim[i] != 0) {
+            continue;
+        }
+        tim_channels_taken[i] = 0x00;
+        tim_frequencies[i] = 0;
+        stm_peripherals_timer_free(mcu_tim_banks[i]);
+        HAL_TIM_PWM_DeInit(active_handles[i]);
+        active_handles[i] = NULL;
     }
 }
 
@@ -176,6 +192,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
         if (HAL_TIM_PWM_Init(&self->handle) != HAL_OK) {
             return PWMOUT_INITIALIZATION_ERROR;
         }
+        active_handles[tim_index] = &self->handle;
     }
 
     // Channel/PWM init
@@ -208,15 +225,6 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
     }
 }
 
-void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
-    for (size_t i = 0; i < TIM_BANK_ARRAY_LEN; i++) {
-        if (mcu_tim_banks[i] == self->handle.Instance) {
-            never_reset_tim[i] = false;
-            break;
-        }
-    }
-}
-
 bool common_hal_pwmio_pwmout_deinited(pwmio_pwmout_obj_t *self) {
     return self->tim == NULL;
 }
@@ -234,9 +242,13 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
     }
     common_hal_reset_pin(self->pin);
 
+    never_reset_tim[self->tim->tim_index] &= ~(1 << self->tim->channel_index);
+
     // if reserved timer has no active channels, we can disable it
     if (tim_channels_taken[self->tim->tim_index] == 0) {
         tim_frequencies[self->tim->tim_index] = 0x00;
+        HAL_TIM_PWM_DeInit(&self->handle);
+        active_handles[self->tim->tim_index] = NULL;
         stm_peripherals_timer_free(self->handle.Instance);
     }
 
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 8367e23b59..5af97a4144 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -423,7 +423,6 @@ void release_display(displayio_display_obj_t *self) {
     release_display_core(&self->core);
     #if (CIRCUITPY_PWMIO)
     if (self->backlight_pwm.base.type == &pwmio_pwmout_type) {
-        common_hal_pwmio_pwmout_reset_ok(&self->backlight_pwm);
         common_hal_pwmio_pwmout_deinit(&self->backlight_pwm);
     } else if (self->backlight_inout.base.type == &digitalio_digitalinout_type) {
         common_hal_digitalio_digitalinout_deinit(&self->backlight_inout);

From 9cc27be0bf98fec7a6867242a17c98ec50e047b8 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 20:00:53 -0500
Subject: [PATCH 1930/2403] Removed broadcom-peripherals

---
 .gitmodules                | 4 ----
 ports/broadcom/peripherals | 1 -
 2 files changed, 5 deletions(-)
 delete mode 160000 ports/broadcom/peripherals

diff --git a/.gitmodules b/.gitmodules
index dfd718630c..00f774cba7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -187,10 +187,6 @@
 [submodule "frozen/Adafruit_CircuitPython_APDS9960"]
 	path = frozen/Adafruit_CircuitPython_APDS9960
 	url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960
-[submodule "ports/broadcom/peripherals"]
-	path = ports/broadcom/peripherals
-	url = https://github.com/adafruit/broadcom-peripherals.git
-	branch = main-build
 [submodule "rpi-firmware"]
 	path = ports/broadcom/firmware
 	url = https://github.com/raspberrypi/rpi-firmware.git
diff --git a/ports/broadcom/peripherals b/ports/broadcom/peripherals
deleted file mode 160000
index 0837008608..0000000000
--- a/ports/broadcom/peripherals
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 08370086080759ed54ac1136d62d2ad24c6fa267

From c8dd0369a46009d1dc17073bcb9bf2c43944ca76 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 20:12:39 -0500
Subject: [PATCH 1931/2403] Added broadcom-peripherals back in

---
 .gitmodules                | 4 ++++
 ports/broadcom/peripherals | 1 +
 2 files changed, 5 insertions(+)
 create mode 160000 ports/broadcom/peripherals

diff --git a/.gitmodules b/.gitmodules
index 00f774cba7..3de3c6a51e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -324,3 +324,7 @@
 [submodule "frozen/Adafruit_CircuitPython_SSD1680"]
 	path = frozen/Adafruit_CircuitPython_SSD1680
 	url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680
+[submodule "ports/broadcom/peripherals"]
+	path = ports/broadcom/peripherals
+	url = https://github.com/adafruit/broadcom-peripherals.git
+	branch = main-build
diff --git a/ports/broadcom/peripherals b/ports/broadcom/peripherals
new file mode 160000
index 0000000000..3e95941bff
--- /dev/null
+++ b/ports/broadcom/peripherals
@@ -0,0 +1 @@
+Subproject commit 3e95941bff4409ee20374b3bbe30d0cdfbf073ba

From 7cfc689f72c9eb9bbab4d2338bec0614f0eec843 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 22:59:55 -0500
Subject: [PATCH 1932/2403] Removed peripherals submodule

---
 .gitmodules                | 4 ----
 ports/broadcom/peripherals | 1 -
 2 files changed, 5 deletions(-)
 delete mode 160000 ports/broadcom/peripherals

diff --git a/.gitmodules b/.gitmodules
index 3de3c6a51e..00f774cba7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -324,7 +324,3 @@
 [submodule "frozen/Adafruit_CircuitPython_SSD1680"]
 	path = frozen/Adafruit_CircuitPython_SSD1680
 	url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680
-[submodule "ports/broadcom/peripherals"]
-	path = ports/broadcom/peripherals
-	url = https://github.com/adafruit/broadcom-peripherals.git
-	branch = main-build
diff --git a/ports/broadcom/peripherals b/ports/broadcom/peripherals
deleted file mode 160000
index 3e95941bff..0000000000
--- a/ports/broadcom/peripherals
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e95941bff4409ee20374b3bbe30d0cdfbf073ba

From 08ac95a2eb671181a15f2314b20a3c82953a4e22 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 23:03:53 -0500
Subject: [PATCH 1933/2403] Added updated submodule back

---
 .gitmodules                | 4 ++++
 ports/broadcom/peripherals | 1 +
 2 files changed, 5 insertions(+)
 create mode 160000 ports/broadcom/peripherals

diff --git a/.gitmodules b/.gitmodules
index 00f774cba7..3de3c6a51e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -324,3 +324,7 @@
 [submodule "frozen/Adafruit_CircuitPython_SSD1680"]
 	path = frozen/Adafruit_CircuitPython_SSD1680
 	url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680
+[submodule "ports/broadcom/peripherals"]
+	path = ports/broadcom/peripherals
+	url = https://github.com/adafruit/broadcom-peripherals.git
+	branch = main-build
diff --git a/ports/broadcom/peripherals b/ports/broadcom/peripherals
new file mode 160000
index 0000000000..d3a6b50a21
--- /dev/null
+++ b/ports/broadcom/peripherals
@@ -0,0 +1 @@
+Subproject commit d3a6b50a21e7dd49ba4bfa0374da3407594caa50

From ea8dd95931027a1a06ad3363074763da4e0f2d3b Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 22 Feb 2023 23:04:41 -0500
Subject: [PATCH 1934/2403] Update common-hal routines with new params

---
 ports/broadcom/common-hal/busio/UART.c    | 22 +++++++++----------
 ports/broadcom/common-hal/sdioio/SDCard.c | 26 +++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c
index 4d60866c04..5be098cf03 100644
--- a/ports/broadcom/common-hal/busio/UART.c
+++ b/ports/broadcom/common-hal/busio/UART.c
@@ -124,7 +124,7 @@ void pl011_IRQHandler(uint8_t index) {
     // Clear the interrupt in case we weren't able to clear it by emptying the
     // FIFO. (This won't clear the FIFO.)
     ARM_UART_PL011_Type *pl011 = uart[index];
-    pl011->ICR = UART0_ICR_RXIC_Msk;
+    pl011->ICR = ARM_UART_PL011_ICR_RXIC_Msk;
 }
 
 void UART0_IRQHandler(void) {
@@ -258,31 +258,31 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
 
         common_hal_busio_uart_set_baudrate(self, baudrate);
 
-        uint32_t line_control = UART0_LCR_H_FEN_Msk;
-        line_control |= (bits - 5) << UART0_LCR_H_WLEN_Pos;
+        uint32_t line_control = ARM_UART_PL011_LCR_H_FEN_Msk;
+        line_control |= (bits - 5) << ARM_UART_PL011_LCR_H_WLEN_Pos;
         if (stop == 2) {
-            line_control |= UART0_LCR_H_STP2_Msk;
+            line_control |= ARM_UART_PL011_LCR_H_STP2_Msk;
         }
         if (parity != BUSIO_UART_PARITY_NONE) {
-            line_control |= UART0_LCR_H_PEN_Msk;
+            line_control |= ARM_UART_PL011_LCR_H_PEN_Msk;
         }
         if (parity == BUSIO_UART_PARITY_EVEN) {
-            line_control |= UART0_LCR_H_EPS_Msk;
+            line_control |= ARM_UART_PL011_LCR_H_EPS_Msk;
         }
         pl011->LCR_H = line_control;
 
-        uint32_t control = UART0_CR_UARTEN_Msk;
+        uint32_t control = ARM_UART_PL011_CR_UARTEN_Msk;
         if (tx != NULL) {
-            control |= UART0_CR_TXE_Msk;
+            control |= ARM_UART_PL011_CR_TXE_Msk;
         }
         if (rx != NULL) {
-            control |= UART0_CR_RXE_Msk;
+            control |= ARM_UART_PL011_CR_RXE_Msk;
         }
         if (cts != NULL) {
-            control |= UART0_CR_CTSEN_Msk;
+            control |= ARM_UART_PL011_CR_CTSEN_Msk;
         }
         if (rts != NULL) {
-            control |= UART0_CR_RTSEN_Msk;
+            control |= ARM_UART_PL011_CR_RTSEN_Msk;
         }
         pl011->CR = control;
     }
diff --git a/ports/broadcom/common-hal/sdioio/SDCard.c b/ports/broadcom/common-hal/sdioio/SDCard.c
index 27b36041de..cf8bfb1faa 100644
--- a/ports/broadcom/common-hal/sdioio/SDCard.c
+++ b/ports/broadcom/common-hal/sdioio/SDCard.c
@@ -122,27 +122,27 @@ STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) {
         if (EMMC->STATUS_b.DAT_INHIBIT) {
             return SDMMC_ERR_BUSY;
         }
-        cmd_flags = EMMC_CMDTM_TM_BLKCNT_EN_Msk | EMMC_CMDTM_CMD_ISDATA_Msk;
+        cmd_flags = Arasan_EMMC_Distributor_CMDTM_TM_BLKCNT_EN_Msk | Arasan_EMMC_Distributor_CMDTM_CMD_ISDATA_Msk;
         if (cmdinfo->datalen > cmdinfo->blklen) {
-            cmd_flags |= EMMC_CMDTM_TM_MULTI_BLOCK_Msk;
+            cmd_flags |= Arasan_EMMC_Distributor_CMDTM_TM_MULTI_BLOCK_Msk;
             if ((cmdinfo->flags & SCF_AUTO_STOP) != 0) {
-                cmd_flags |= 1 << EMMC_CMDTM_TM_AUTO_CMD_EN_Pos;
+                cmd_flags |= 1 << Arasan_EMMC_Distributor_CMDTM_TM_AUTO_CMD_EN_Pos;
             }
         }
         if (read) {
-            cmd_flags |= EMMC_CMDTM_TM_DAT_DIR_Msk;
+            cmd_flags |= Arasan_EMMC_Distributor_CMDTM_TM_DAT_DIR_Msk;
         }
-        EMMC->BLKSIZECNT = (cmdinfo->datalen / cmdinfo->blklen) << EMMC_BLKSIZECNT_BLKCNT_Pos |
-            cmdinfo->blklen << EMMC_BLKSIZECNT_BLKSIZE_Pos;
+        EMMC->BLKSIZECNT = (cmdinfo->datalen / cmdinfo->blklen) << Arasan_EMMC_Distributor_BLKSIZECNT_BLKCNT_Pos |
+            cmdinfo->blklen << Arasan_EMMC_Distributor_BLKSIZECNT_BLKSIZE_Pos;
     }
 
     uint32_t response_type = EMMC_CMDTM_CMD_RSPNS_TYPE_RESPONSE_48BITS;
     uint32_t crc = 0;
     if ((cmdinfo->flags & SCF_RSP_CRC) != 0) {
-        crc |= EMMC_CMDTM_CMD_CRCCHK_EN_Msk;
+        crc |= Arasan_EMMC_Distributor_CMDTM_CMD_CRCCHK_EN_Msk;
     }
     if ((cmdinfo->flags & SCF_RSP_IDX) != 0) {
-        crc |= EMMC_CMDTM_CMD_IXCHK_EN_Msk;
+        crc |= Arasan_EMMC_Distributor_CMDTM_CMD_IXCHK_EN_Msk;
     }
     if ((cmdinfo->flags & SCF_RSP_136) != 0) {
         response_type = EMMC_CMDTM_CMD_RSPNS_TYPE_RESPONSE_136BITS;
@@ -152,8 +152,8 @@ STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) {
         response_type = EMMC_CMDTM_CMD_RSPNS_TYPE_RESPONSE_NONE;
     }
     uint32_t full_cmd = cmd_flags | crc |
-        cmdinfo->opcode << EMMC_CMDTM_CMD_INDEX_Pos |
-        response_type << EMMC_CMDTM_CMD_RSPNS_TYPE_Pos;
+        cmdinfo->opcode << Arasan_EMMC_Distributor_CMDTM_CMD_INDEX_Pos |
+        response_type << Arasan_EMMC_Distributor_CMDTM_CMD_RSPNS_TYPE_Pos;
     EMMC->CMDTM = full_cmd;
 
     // Wait for an interrupt to indicate completion of the command.
@@ -170,7 +170,7 @@ STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) {
         }
         return SDMMC_ERR_TIMEOUT;
     } else {
-        EMMC->INTERRUPT = EMMC_INTERRUPT_CMD_DONE_Msk;
+        EMMC->INTERRUPT = Arasan_EMMC_Distributor_INTERRUPT_CMD_DONE_Msk;
     }
 
     // Transfer the data.
@@ -197,7 +197,7 @@ STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) {
                 EMMC->DATA = ((uint32_t *)cmdinfo->data)[i];
             }
         }
-        uint32_t data_done_mask = EMMC_INTERRUPT_ERR_Msk | EMMC_INTERRUPT_DATA_DONE_Msk;
+        uint32_t data_done_mask = Arasan_EMMC_Distributor_INTERRUPT_ERR_Msk | Arasan_EMMC_Distributor_INTERRUPT_DATA_DONE_Msk;
         start_ticks = port_get_raw_ticks(NULL);
         while ((EMMC->INTERRUPT & data_done_mask) == 0 && (port_get_raw_ticks(NULL) - start_ticks) < (size_t)cmdinfo->timeout_ms) {
         }
@@ -282,7 +282,7 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self,
 
     }
     // Set max timeout
-    EMMC->CONTROL1 |= EMMC_CONTROL1_CLK_INTLEN_Msk | (0xe << EMMC_CONTROL1_DATA_TOUNIT_Pos);
+    EMMC->CONTROL1 |= Arasan_EMMC_Distributor_CONTROL1_CLK_INTLEN_Msk | (0xe << Arasan_EMMC_Distributor_CONTROL1_DATA_TOUNIT_Pos);
 
     EMMC->IRPT_MASK = 0xffffffff;
 

From 09f84e351318f9f3bf5bff6bb9664703ca743c78 Mon Sep 17 00:00:00 2001
From: Milind 
Date: Thu, 23 Feb 2023 13:32:48 +0530
Subject: [PATCH 1935/2403] Changed the code structure to start and stop dma
 from readinto function as per review comment to support one shot conversion
 mode for analogbufio Added check for verifying the buffer type passed to
 readinto is H

---
 locale/circuitpython.pot                      |  4 ++
 .../common-hal/analogbufio/BufferedIn.c       | 67 ++++++++++++-------
 .../common-hal/analogbufio/BufferedIn.h       |  2 +-
 3 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f3186a49c8..5977d4fc49 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -180,6 +180,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be a array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index db76069a69..5e34896b3e 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -63,27 +63,32 @@
 #define ADC_CONV_LIMIT_EN   0
 #endif
 
-static adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2;
-static adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
-static uint8_t adc_channel = 0;
+static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_t *convert_mode, adc_digi_output_format_t *output_format);
+static void stop_dma(analogbufio_bufferedin_obj_t *self);
 
 void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint32_t sample_rate) {
+    self->pin = pin;
+    self->sample_rate = sample_rate;
+}
+
+static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_t *convert_mode, adc_digi_output_format_t *output_format) {
     uint16_t adc1_chan_mask = 0;
     uint16_t adc2_chan_mask = 0;
 
-    output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
+    const mcu_pin_obj_t *pin = self->pin;
+    uint32_t sample_rate = self->sample_rate;
+
+    *output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
     if (pin->adc_index == ADC_UNIT_1) {
-        convert_mode = ADC_CONV_SINGLE_UNIT_1;
+        *convert_mode = ADC_CONV_SINGLE_UNIT_1;
     } else {
-        convert_mode = ADC_CONV_SINGLE_UNIT_2;
+        *convert_mode = ADC_CONV_SINGLE_UNIT_2;
     }
 
     if (pin->adc_index == NO_ADC || pin->adc_channel == NO_ADC_CHANNEL) {
         raise_ValueError_invalid_pin();
     }
 
-    adc_channel = pin->adc_channel;
-
     /*
      *	Chip version	Conversion Mode		Output Format Type
      *	ESP32           1                   TYPE1
@@ -106,14 +111,13 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
 
     #if defined(CONFIG_IDF_TARGET_ESP32C3)
     /* ESP32C3 only supports alter mode */
-    convert_mode = ADC_CONV_ALTER_UNIT;
+    *convert_mode = ADC_CONV_ALTER_UNIT;
     #endif
 
     #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2)
-    output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
+    *output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE2;
     #endif
 
-    self->pin = pin;
     common_hal_mcu_pin_claim(pin);
 
     if (pin->adc_index == ADC_UNIT_1) {
@@ -143,12 +147,12 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
         .conv_limit_num = 250,
         .pattern_num = NUM_ADC_CHANNELS,
         .sample_freq_hz = sample_rate,
-        .conv_mode = convert_mode,
-        .format = output_format,
+        .conv_mode = *convert_mode,
+        .format = *output_format,
     };
 
     #if defined(DEBUG_ANALOGBUFIO)
-    mp_printf(&mp_plat_print,"conversion_mode:%d, format:%d, conv_limit_en:%d, sample_rate:%d\n",convert_mode,output_format,ADC_CONV_LIMIT_EN,sample_rate);
+    mp_printf(&mp_plat_print,"conversion_mode:%d, format:%d, conv_limit_en:%d, sample_rate:%d\n",*convert_mode,*output_format,ADC_CONV_LIMIT_EN,sample_rate);
     #endif // DEBUG_ANALOGBUFIO
 
     adc_digi_pattern_config_t adc_pattern[NUM_ADC_CHANNELS] = {0};
@@ -178,6 +182,13 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     }
 }
 
+static void stop_dma(analogbufio_bufferedin_obj_t *self) {
+    adc_digi_stop();
+    adc_digi_deinitialize();
+    // Release ADC Pin
+    reset_pin_number(self->pin->number);
+}
+
 bool common_hal_analogbufio_bufferedin_deinited(analogbufio_bufferedin_obj_t *self) {
     return self->pin == NULL;
 }
@@ -186,22 +197,16 @@ void common_hal_analogbufio_bufferedin_deinit(analogbufio_bufferedin_obj_t *self
     if (common_hal_analogbufio_bufferedin_deinited(self)) {
         return;
     }
-
-    adc_digi_stop();
-    adc_digi_deinitialize();
-
-    // Release ADC Pin
-    reset_pin_number(self->pin->number);
     self->pin = NULL;
 }
 
-static bool check_valid_data(const adc_digi_output_data_t *data) {
+static bool check_valid_data(const adc_digi_output_data_t *data, const mcu_pin_obj_t *pin, adc_digi_convert_mode_t convert_mode, adc_digi_output_format_t output_format) {
     unsigned int unit = data->type2.unit;
     if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE2) {
         if (data->type2.channel >= SOC_ADC_CHANNEL_NUM(unit)) {
             return false;
         }
-        if (adc_channel != data->type2.channel) {
+        if (pin->adc_channel != data->type2.channel) {
             return false;
         }
     } else {
@@ -214,7 +219,7 @@ static bool check_valid_data(const adc_digi_output_data_t *data) {
         if (data->type1.channel >= SOC_ADC_CHANNEL_NUM(unit)) {
             return false;
         }
-        if (adc_channel != data->type1.channel) {
+        if (pin->adc_channel != data->type1.channel) {
             return false;
         }
         #endif
@@ -231,6 +236,14 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     uint32_t captured_bytes = 0;
     esp_err_t ret;
     uint32_t ret_num = 0;
+    adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2;
+    adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
+
+    if (bytes_per_sample != 2) {
+        mp_raise_ValueError_varg(translate("%q must be a array of type 'H'"), MP_QSTR_buffer);
+    }
+
+    start_dma(self, &convert_mode, &output_format);
 
     #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"Required bytes: %d\n",len);
@@ -243,7 +256,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
         if (ret == ESP_OK) {
             for (uint32_t i = 0; i < ret_num; i += ADC_RESULT_BYTE) {
                 adc_digi_output_data_t *pResult = (adc_digi_output_data_t *)(void *)&result[i];
-                if (check_valid_data(pResult)) {
+                if (check_valid_data(pResult, self->pin, convert_mode, output_format)) {
                     if (captured_bytes < len) {
                         uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes];
                         if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
@@ -256,6 +269,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
                         captured_bytes += sizeof(uint16_t);
                         captured_samples++;
                     } else {
+                        stop_dma(self);
                         return captured_samples;
                     }
                 } else {
@@ -265,6 +279,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
                     #if defined(DEBUG_ANALOGBUFIO)
                     mp_printf(&mp_plat_print,"Invalid sample received: 0x%x\n",pResult->val);
                     #endif // DEBUG_ANALOGBUFIO
+                    stop_dma(self);
                     return captured_samples;
                     #endif
                 }
@@ -273,14 +288,18 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
             #if defined(DEBUG_ANALOGBUFIO)
             mp_printf(&mp_plat_print,"ADC Timeout\n");
             #endif // DEBUG_ANALOGBUFIO
+            stop_dma(self);
             return captured_samples;
         } else {
             #if defined(DEBUG_ANALOGBUFIO)
             mp_printf(&mp_plat_print,"adc_digi_read_bytes failed error code:%d\n",ret);
             #endif // DEBUG_ANALOGBUFIO
+            stop_dma(self);
             return captured_samples;
         }
     }
+
+    stop_dma(self);
     #if defined(DEBUG_ANALOGBUFIO)
     mp_printf(&mp_plat_print,"Captured bytes: %d\n",captured_bytes);
     #endif // DEBUG_ANALOGBUFIO
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.h b/ports/espressif/common-hal/analogbufio/BufferedIn.h
index 0c9d7df3d7..909455ca06 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.h
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.h
@@ -36,7 +36,7 @@
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
-    uint8_t chan;
+    uint32_t sample_rate;
 } analogbufio_bufferedin_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP32_COMMON_HAL_ANALOGBUFIO_BUFFEREDIN_H

From 60a9c7e5b2570a84c07c6c0c78f73c63322937f0 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 23 Feb 2023 12:49:34 +0530
Subject: [PATCH 1936/2403] move windows workflow to build ci and more

---
 .github/workflows/build.yml         |  69 +++++++++++++++++
 .github/workflows/ports_windows.yml | 111 ----------------------------
 tools/ci_changes_per_commit.py      |   2 +-
 tools/ci_fetch_deps.py              |   8 +-
 tools/ci_set_matrix.py              |  50 +++++++++++--
 5 files changed, 118 insertions(+), 122 deletions(-)
 delete mode 100644 .github/workflows/ports_windows.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 453804a26a..0c8b927de8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
     outputs:
       build-doc: ${{ steps.set-matrix.outputs.build-doc }}
       build-boards: ${{ steps.set-matrix.outputs.build-boards }}
+      build-windows: ${{ steps.set-matrix.outputs.build-windows }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-atmel: ${{ steps.set-matrix.outputs.boards-atmel }}
@@ -218,6 +219,74 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
+  build-windows:
+    runs-on: windows-2022
+    needs: scheduler
+    if: ${{ needs.scheduler.outputs.build-windows == 'True' }}
+    env:
+      CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
+    defaults:
+      run:
+        # We define a custom shell script here, although `msys2.cmd` does neither exist nor is it available in the PATH yet
+        shell: msys2 {0}
+    steps:
+    # We want to change the configuration of the git command that actions/checkout will be using
+    # (since it is not possible to set autocrlf through the action yet, see actions/checkout#226).
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - name: Check python coding (cmd)
+      run: python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
+      shell: cmd
+    # We use a JS Action, which calls the system terminal or other custom terminals directly, if required
+    - uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel git wget unzip gcc python-pip
+    # The goal of this was to test how things worked when the default file encoding (locale.getpreferedencoding())
+    # was not UTF-8. However, msys2 python does use utf-8 as the preferred file encoding, and using actions/setup-python
+    # python3.8 gave a broken build, so we're not really testing what we wanted to test.
+    # However, commandline length limits are being tested so that does some good.
+    - name: Check python coding (msys2)
+      run: |
+        locale -v
+        which python; python --version
+        python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
+        which python3; python3 --version
+        python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
+    - name: Install dependencies
+      run: |
+        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-win32.zip
+        unzip -q -d /tmp gcc-arm.zip
+        tar -C /tmp/gcc-arm-none-* -cf - . | tar -C /usr/local -xf -
+        pip install wheel
+        # requirements_dev.txt doesn't install on windows. (with msys2 python)
+        # instead, pick a subset for what we want to do
+        pip install cascadetoml jinja2 typer click intelhex
+        # check that installed packages work....?
+        which python; python --version; python -c "import cascadetoml"
+        which python3; python3 --version; python3 -c "import cascadetoml"
+    - name: Set up repository
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Set up submodules
+      uses: ./.github/actions/deps/submodules
+    - name: build mpy-cross
+      run: make -j2 -C mpy-cross
+    - name: build rp2040
+      run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
+    - name: build samd21
+      run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
+    - name: build samd51
+      run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
+    - name: build nrf
+      run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
+    - name: build stm
+      run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
+    # I gave up trying to do esp builds on windows when I saw
+    # ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
+    # https://github.com/espressif/esp-idf/issues/7062
+
   aarch:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-aarch != '[]' }}
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
deleted file mode 100644
index ba2042660a..0000000000
--- a/.github/workflows/ports_windows.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-name: windows port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/ports_windows.yml'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'mpy-cross/**'
-      - 'ports/unix/**'
-      - 'ports/windows/**'
-      - 'py/**'
-      - 'requirements*.txt'
-      - 'tools/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  windows:
-    runs-on: windows-2022
-    defaults:
-      run:
-        # We define a custom shell script here, although `msys2.cmd` does neither exist nor is it available in the PATH yet
-        shell: msys2 {0}
-    steps:
-
-    # We want to change the configuration of the git command that actions/checkout will be using (since it is not possible to set autocrlf through the action yet, see actions/checkout#226).
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - name: Check python coding (cmd)
-      run: python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
-      shell: cmd
-
-    # We use a JS Action, which calls the system terminal or other custom terminals directly, if required
-    - uses: msys2/setup-msys2@v2
-      with:
-        update: true
-        install: base-devel git wget unzip gcc python-pip
-
-    # The goal of this was to test how things worked when the default file
-    # encoding (locale.getpreferedencoding()) was not UTF-8.  However, msys2
-    # python does use utf-8 as the preferred file encoding, and using
-    # actions/setup-python python3.8 gave a broken build, so we're not really
-    # testing what we wanted to test.
-    #
-    # however, commandline length limits are being tested so that does some
-    # good.
-    - name: Check python coding (msys2)
-      run: |
-        locale -v
-        which python; python --version
-        python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
-        which python3; python3 --version
-        python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
-
-    - name: Install dependencies
-      run: |
-        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-win32.zip
-        unzip -q -d /tmp gcc-arm.zip
-        tar -C /tmp/gcc-arm-none-* -cf - . | tar -C /usr/local -xf -
-        pip install wheel
-        # requirements_dev.txt doesn't install on windows. (with msys2 python)
-        # instead, pick a subset for what we want to do
-        pip install cascadetoml jinja2 typer click intelhex
-        # check that installed packages work....?
-        which python; python --version; python -c "import cascadetoml"
-        which python3; python3 --version; python3 -c "import cascadetoml"
-
-    - name: Set up repository
-      uses: actions/checkout@v3
-      with:
-        submodules: false
-        fetch-depth: 1
-
-    - name: Set up submodules
-      uses: ./.github/actions/deps/submodules
-      with:
-        version: true
-
-    - name: build mpy-cross
-      run: make -j2 -C mpy-cross
-
-    - name: build rp2040
-      run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
-
-    - name: build samd21
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
-
-    - name: build samd51
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
-
-    - name: build nrf
-      run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
-
-    - name: build stm
-      run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
-
-# I gave up trying to do esp32 builds on windows when I saw
-# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
-# https://github.com/espressif/esp-idf/issues/7062
-#
-#    - name: prepare esp
-#      run: ports/espressif/esp-idf/install.bat
-#      shell: cmd
-#
-#    - name: build esp
-#      run: . ports/espressif/esp-idf/export.sh && make -j2 -C ports/espressif BOARD=adafruit_metro_esp32s2
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index 6452f241c0..d5f621d263 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -172,7 +172,7 @@ def get_bad_check_runs(query_check_runs):
 
     run_types = ["failed", "incomplete"]
 
-    regex_matrix = re.compile("^[^\n ]+ \/ (build|run) \([^\n ]+\)$")
+    regex_matrix = re.compile(r"^\S+ \/ (build|run) \(\S+\)$")
 
     while more_pages:
         check_runs = query_check_runs.fetch()["data"]["node"]
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index bdf2967af8..3b495f8758 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -80,14 +80,16 @@ def main():
         submodules = ["extmod/ulab", "lib/", "tools/"]
     elif TARGET == "build-doc":
         # used in .readthedocs.yml to generate RTD
-        submodules = ["extmod/ulab", "frozen/"]
+        submodules = ["extmod/ulab"]
+        submodules_tags = ["frozen/"]
     elif TARGET == "mpy-cross" or TARGET == "mpy-cross-mac":
         submodules = ["tools/"]  # for huffman
-    elif TARGET == "windows":
+    elif TARGET == "build-windows":
         # This builds one board from a number of ports so fill out a bunch of submodules
         submodules = ["extmod/ulab", "lib/", "tools/", "ports/", "data/nvm.toml"]
     elif TARGET == "website":
-        submodules = ["tools/adabot/", "frozen/"]
+        submodules = ["tools/adabot/"]
+        submodules_tags = ["frozen/"]
     elif TARGET == "pre-commit":
         submodules = ["extmod/ulab"]
     else:
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 374e2f0c2b..43a9790160 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -62,6 +62,24 @@ IGNORE = [
 # Files in these directories never influence board builds
 IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
 
+PATTERN_DOCS = (
+    r"^(?:\.github|docs|extmod\/ulab)|"
+    r"^(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|tools\/extract_pyi\.py|conf\.py|requirements-doc\.txt)$|"
+    r"(?:-stubs|\.(?:md|MD|rst|RST))$"
+)
+
+PATTERN_WINDOWS = [
+    ".github/",
+    "extmod/",
+    "lib/",
+    "mpy-cross/",
+    "ports/unix/",
+    "ports/windows/",
+    "py/",
+    "requirements",
+    "tools/",
+]
+
 if len(sys.argv) > 1:
     print("Using files list on commandline")
     changed_files = sys.argv[1:]
@@ -240,21 +258,19 @@ def set_docs_to_build(build_doc: bool):
         if last_failed_jobs.get("build-doc"):
             build_doc = True
         else:
-            doc_pattern = re.compile(
-                r"^(?:\.github\/workflows\/|docs|extmod\/ulab|(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|conf\.py|tools\/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
-            )
+            doc_pattern = re.compile(PATTERN_DOCS)
             github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
             github_workspace = github_workspace and github_workspace + "/"
-            for p in changed_files:
-                if doc_pattern.search(p) and (
+            for file in changed_files:
+                if doc_pattern.search(file) and (
                     (
                         subprocess.run(
-                            f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + p} | grep -o -m 1 '^[+-]\/\/|'",
+                            f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + file} | grep -o -m 1 '^[+-]\/\/|'",
                             capture_output=True,
                             shell=True,
                         ).stdout
                     )
-                    if p.endswith(".c")
+                    if file.endswith(".c")
                     else True
                 ):
                     build_doc = True
@@ -265,6 +281,25 @@ def set_docs_to_build(build_doc: bool):
     set_output("build-doc", build_doc)
 
 
+def set_windows_to_build(build_windows):
+    if not build_windows:
+        if last_failed_jobs.get("build-windows"):
+            build_windows = True
+        else:
+            for file in changed_files:
+                for pattern in PATTERN_WINDOWS:
+                    if file.startswith(pattern):
+                        build_windows = True
+                        break
+                else:
+                    continue
+                break
+
+    # Set the step outputs
+    print("Building windows:", build_windows)
+    set_output("build-windows", build_windows)
+
+
 def check_changed_files():
     if not changed_files:
         print("Building all docs/boards")
@@ -277,6 +312,7 @@ def check_changed_files():
 def main():
     build_all = check_changed_files()
     set_docs_to_build(build_all)
+    set_windows_to_build(build_all)
     set_boards_to_build(build_all)
 
 

From 9e73e8351aace95c6600345ca80134a7e13915de Mon Sep 17 00:00:00 2001
From: Milind 
Date: Thu, 23 Feb 2023 14:47:05 +0530
Subject: [PATCH 1937/2403] Calling stop_dma function while retruning errors
 from start_dma after configuring dma

---
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index 5e34896b3e..04595910ca 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -138,6 +138,7 @@ static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_
     #endif // DEBUG_ANALOGBUFIO
     esp_err_t err = adc_digi_initialize(&adc_dma_config);
     if (ESP_OK != err) {
+        stop_dma(self);
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to initialize ADC DMA controller, ErrorCode:%d"),err);
     }
@@ -172,11 +173,13 @@ static void start_dma(analogbufio_bufferedin_obj_t *self, adc_digi_convert_mode_
 
     err = adc_digi_controller_configure(&dig_cfg);
     if (ESP_OK != err) {
+        stop_dma(self);
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to configure ADC DMA controller, ErrorCode:%d"),err);
     }
     err = adc_digi_start();
     if (ESP_OK != err) {
+        stop_dma(self);
         common_hal_analogbufio_bufferedin_deinit(self);
         mp_raise_ValueError_varg(translate("Unable to start ADC DMA controller, ErrorCode:%d"),err);
     }

From 8322caa1785b078732cda0c7920a0c4654295b1a Mon Sep 17 00:00:00 2001
From: Luis Ruiz San Segundo 
Date: Thu, 23 Feb 2023 07:23:23 +0000
Subject: [PATCH 1938/2403] Translated using Weblate (Spanish)

Currently translated at 99.9% (999 of 1000 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 1219be52f8..4cab30cf90 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: 2023-02-22 18:34+0000\n"
-"Last-Translator: Jose David M \n"
+"PO-Revision-Date: 2023-02-23 17:53+0000\n"
+"Last-Translator: Luis Ruiz San Segundo \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -35,12 +35,17 @@ msgstr ""
 "Código detenido por la auto-recarga. Recargando pronto.\n"
 
 #: main.c
+#, fuzzy
 msgid ""
 "\n"
 "Invalid CIRCUITPY_PYSTACK_SIZE\n"
 "\n"
 "\r"
 msgstr ""
+"\n"
+"CIRCUITPY_PYSTACK_SIZE no válido\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -58,7 +63,7 @@ msgid ""
 "Press reset to exit safe mode.\n"
 msgstr ""
 "\n"
-"Presione reset para salir de safe mode.\n"
+"Presione reset para salir del modo seguro.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -66,7 +71,7 @@ msgid ""
 "You are in safe mode because:\n"
 msgstr ""
 "\n"
-"Estas in safe mode porque:\n"
+"Estas en modo seguro porque:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -153,7 +158,7 @@ msgstr "%q está siendo utilizado"
 
 #: py/objstr.c py/objstrunicode.c
 msgid "%q index out of range"
-msgstr "%q indice fuera de rango"
+msgstr "%q índice fuera de rango"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
@@ -169,19 +174,19 @@ msgstr "%q es solamente de lectura en esta tarjeta"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
-msgstr "%q tamaño debe ser %d"
+msgstr "%q longitud debe ser %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
-msgstr "%q tamaño debe ser %d-%d"
+msgstr "%q longitud debe ser %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr "%q tamaño debe ser <= %d"
+msgstr "%q longitud debe ser <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr "%q tamaño debe ser >= %d"
+msgstr "%q longitud debe ser >= %d"
 
 #: py/argcheck.c
 msgid "%q must be %d"
@@ -205,7 +210,7 @@ msgstr "%q debe ser >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr "%q debe ser un byte-matriz o matriz de tipo 'H' o 'B'"
+msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -251,7 +256,7 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q, %q, and %q must all be the same length"
-msgstr "%q, %q, y %q deben tener el mismo largo"
+msgstr "%q, %q, y %q deben tener la misma longitud"
 
 #: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
@@ -357,7 +362,7 @@ msgstr "'=' alineación no permitida en el especificador string format"
 
 #: shared-module/struct/__init__.c
 msgid "'S' and 'O' are not supported format types"
-msgstr "'S' y 'O' no son compatibles con los tipos de formato"
+msgstr "'S' y 'O' no son tipos de formato soportados"
 
 #: py/compile.c
 msgid "'align' requires 1 argument"
@@ -431,7 +436,7 @@ msgstr "tipos de 64 bit"
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
 msgid "A hardware interrupt channel is already in use"
-msgstr "El canal EXTINT ya está siendo utilizado"
+msgstr "Un canal de interrupción por hardware ya está en uso"
 
 #: ports/espressif/common-hal/analogio/AnalogIn.c
 msgid "ADC2 is being used by WiFi"
@@ -440,7 +445,7 @@ msgstr "ADC2 está siendo usado por WiFi"
 #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
-msgstr "La dirección debe tener %d bytes de largo"
+msgstr "La dirección debe tener %d bytes de longitud"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
@@ -454,7 +459,7 @@ msgstr "Todos los periféricos CAN están en uso"
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
-msgstr "Todos los periféricos I2C están siendo usados"
+msgstr "Todos los periféricos I2C están en uso"
 
 #: ports/espressif/common-hal/countio/Counter.c
 #: ports/espressif/common-hal/frequencyio/FrequencyIn.c
@@ -470,36 +475,36 @@ msgstr "Todos los FIFOs de RX en uso"
 
 #: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 msgid "All SPI peripherals are in use"
-msgstr "Todos los periféricos SPI están siendo usados"
+msgstr "Todos los periféricos SPI están en uso"
 
 #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
-msgstr "Todos los periféricos UART están siendo usados"
+msgstr "Todos los periféricos UART están en uso"
 
 #: ports/nrf/common-hal/countio/Counter.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All channels in use"
-msgstr "Todos los canales esta en uso"
+msgstr "Todos los canales están en uso"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "All event channels in use"
-msgstr "Todos los canales de eventos estan siendo usados"
+msgstr "Todos los canales de eventos están en uso"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
-msgstr "Todas las máquinas de estado en uso"
+msgstr "Todas las máquinas de estado están en uso"
 
 #: ports/atmel-samd/audio_dma.c
 msgid "All sync event channels in use"
 msgstr ""
 "Todos los canales de eventos de sincronización (sync event channels) están "
-"siendo utilizados"
+"en uso"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
-msgstr "Todos los timers para este pin están siendo utilizados"
+msgstr "Todos los timers para este pin están en uso"
 
 #: ports/atmel-samd/common-hal/_pew/PewPew.c
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -568,7 +573,7 @@ msgstr "Tratando de localizar %d bloques"
 
 #: ports/raspberrypi/audio_dma.c
 msgid "Audio conversion not implemented"
-msgstr "Conversión de audio no esta implementada"
+msgstr "Conversión de audio no está implementada"
 
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
@@ -587,12 +592,12 @@ msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
 msgstr ""
-"Auto-reload habilitado. Simplemente guarda los archivos via USB para "
-"ejecutarlos o entra al REPL para desabilitarlos.\n"
+"Auto-reload habilitado. Simplemente guarda los archivos vía USB para "
+"ejecutarlos o entra al REPL para deshabilitarlo.\n"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "Baudrate not supported by peripheral"
-msgstr "El periférico no maneja el Baudrate"
+msgstr "Baudrate no soportado por el periférico"
 
 #: shared-module/displayio/Display.c
 #: shared-module/framebufferio/FramebufferDisplay.c
@@ -613,7 +618,7 @@ msgstr "Bits depth debe ser múltiplo de 8."
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Bitmap size and bits per value must match"
-msgstr "El tamaño del mapa de bits y los bits por valor deben cotejar"
+msgstr "El tamaño del mapa de bits y los bits por valor deben coincidir"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
@@ -642,44 +647,43 @@ msgstr "El brillo no se puede ajustar"
 #: shared-bindings/_bleio/UUID.c
 #, c-format
 msgid "Buffer + offset too small %d %d %d"
-msgstr "Búfer + compensado muy pequeños %d %d %d"
+msgstr "Buffer + offset muy pequeños %d %d %d"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
-msgstr ""
-"Los elementos del búfer deben de ser de una longitud de 4 bytes o menos"
+msgstr "Los elementos del buffer deben tener una longitud de 4 bytes o menos"
 
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is not a bytearray."
-msgstr "Búfer no es un bytearray."
+msgstr "Buffer no es un bytearray."
 
 #: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 msgid "Buffer is too small"
-msgstr "Búfer es muy pequeño"
+msgstr "Buffer es muy pequeño"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
-msgstr "Longitud del búfer %d es demasiado grande. Tiene que ser menor a %d"
+msgstr "La longitud del buffer %d es demasiado grande. Tiene que ser menor a %d"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
 msgid "Buffer length must be a multiple of 512"
-msgstr "El tamaño del búfer debe ser múltiplo de 512"
+msgstr "El tamaño del buffer debe ser múltiplo de 512"
 
 #: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
 msgid "Buffer must be a multiple of 512 bytes"
-msgstr "Búfer deber ser un múltiplo de 512 bytes"
+msgstr "El buffer deber ser un múltiplo de 512 bytes"
 
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
-msgstr "Búfer muy corto por %d bytes"
+msgstr "Buffer muy corto por %d bytes"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
-msgstr "Búferes deben ser del mismo tamaño"
+msgstr "Los buffers deben ser del mismo tamaño"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
@@ -766,7 +770,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot pull on input-only pin."
-msgstr "No puede hacer pull en un pin de entrada sola."
+msgstr "No puede hacer pull en un pin de solo entrada."
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Cannot record to a file"
@@ -1852,7 +1856,7 @@ msgstr ""
 #: main.c
 msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n"
 msgstr ""
-"Pretendiendo ir a deep sleep hasta la alarma, CTRL-C or una escritura de "
+"Pretendiendo ir a deep sleep hasta la alarma, CTRL-C o una escritura de "
 "archivo\n"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -2469,11 +2473,11 @@ msgstr "Usted presionó ambos botones al iniciar."
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr "Usted presionó el boton A al iniciar."
+msgstr "Usted presionó el botón A al iniciar."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr "Usted presionó el boton BOOT al iniciar"
+msgstr "Usted presionó el botón BOOT al iniciar"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
@@ -2481,30 +2485,30 @@ msgstr "Presionaste el botón GPIO0 al inicio."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "Presionó el botón Rec al inicio."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr "Usted presionó el boton SW38 al iniciar."
+msgstr "Usted presionó el botón SW38 al iniciar."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr "Usted presionó el boton de Volumén al iniciar."
+msgstr "Usted presionó el botón de volumen al iniciar."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr "Usted presionó el boton central al iniciar."
+msgstr "Usted presionó el botón central al iniciar."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr "Usted presionó el boton izquierdo al iniciar."
+msgstr "Usted presionó el botón izquierdo al iniciar."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr "Usted presionó el boton izquierdo al iniciar."
+msgstr "Presionó el botón de reinicio durante el arranque."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"

From 2f78fff1a689e29dc9f9d1b7d11c7b2e5f2729fc Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 22 Feb 2023 20:05:14 +0000
Subject: [PATCH 1939/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index cdb69ec484..1464311003 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: 2023-02-22 18:34+0000\n"
+"PO-Revision-Date: 2023-02-23 17:53+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -39,6 +39,10 @@ msgid ""
 "\n"
 "\r"
 msgstr ""
+"\n"
+"CIRCUITPY_PYSTACK_SIZE inválido\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2478,7 +2482,7 @@ msgstr "Você pressionou o botão GPIO0 durante a inicialização."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "Você pressionou o botão Rec durante a inicialização."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."

From d4f4da279e4484c2cd121e413750a02bd0cfc5d3 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 22 Feb 2023 18:38:24 +0000
Subject: [PATCH 1940/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index c4b3a36166..d6642c8a93 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: 2023-02-22 18:34+0000\n"
+"PO-Revision-Date: 2023-02-23 17:53+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -39,6 +39,10 @@ msgid ""
 "\n"
 "\r"
 msgstr ""
+"\n"
+"Ogiltig CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2451,7 +2455,7 @@ msgstr "Du tryckte på GPIO0-knappen vid start."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "Du tryckte ned Rec-knappen vid start."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."

From 9058beb5737f1112d3dda43b18ec1c6634118f3e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 23 Feb 2023 13:41:49 -0500
Subject: [PATCH 1941/2403] "a array" to "an array"

---
 locale/circuitpython.pot                            | 2 +-
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5977d4fc49..096ef68ddc 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -181,7 +181,7 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be a array of type 'H'"
+msgid "%q must be an array of type 'H'"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index 04595910ca..7639ad03fe 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -243,7 +243,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
 
     if (bytes_per_sample != 2) {
-        mp_raise_ValueError_varg(translate("%q must be a array of type 'H'"), MP_QSTR_buffer);
+        mp_raise_ValueError_varg(translate("%q must be an array of type 'H'"), MP_QSTR_buffer);
     }
 
     start_dma(self, &convert_mode, &output_format);

From 8996fda0498b6914db6838bb8f5d717578482c2d Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 23 Feb 2023 13:55:52 -0500
Subject: [PATCH 1942/2403] "an array" -> "array"

---
 locale/circuitpython.pot                            | 2 +-
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 096ef68ddc..e607d15af7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -181,7 +181,7 @@ msgid "%q must be >= %d"
 msgstr ""
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be an array of type 'H'"
+msgid "%q must be array of type 'H'"
 msgstr ""
 
 #: shared-bindings/analogbufio/BufferedIn.c
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index 7639ad03fe..f2ee8c19af 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -243,7 +243,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
 
     if (bytes_per_sample != 2) {
-        mp_raise_ValueError_varg(translate("%q must be an array of type 'H'"), MP_QSTR_buffer);
+        mp_raise_ValueError_varg(translate("%q must be array of type 'H'"), MP_QSTR_buffer);
     }
 
     start_dma(self, &convert_mode, &output_format);

From 1a3358d036ece62ff22614e4844ea79b90825b87 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 23 Feb 2023 14:28:58 -0800
Subject: [PATCH 1943/2403] Limit FatFs' ability to upper case paths

Only uppercase ASCII letters a-z. This saves ~900 bytes. Previously
written files with other unicode letters will only be accessible
from their upper cased path.
---
 lib/oofatfs/ff.c        | 12 ++++++++++++
 lib/oofatfs/ffunicode.c |  8 ++++++++
 py/circuitpy_mpconfig.h |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index 9d3c67cf7d..dbcfa3efc3 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -278,6 +278,12 @@ typedef struct {
 
 
 /* SBCS up-case tables (\x80-\xFF) */
+// Optimize the 437-only case with a truncated lookup table.
+#if FF_CODE_PAGE == 437
+#define TBL_CT437  {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
+                    0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+                    0x41,0x49,0x4F,0x55,0xA5}
+#else
 #define TBL_CT437  {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
                     0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
                     0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -286,6 +292,7 @@ typedef struct {
                     0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
                     0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \
                     0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+#endif
 #define TBL_CT720  {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \
                     0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
                     0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -2887,7 +2894,12 @@ static FRESULT create_name (    /* FR_OK: successful, FR_INVALID_NAME: could not
             }
 #elif FF_CODE_PAGE < 900    /* SBCS cfg */
             wc = ff_uni2oem(wc, CODEPAGE);          /* Unicode ==> ANSI/OEM code */
+            // Optimize the 437-only case with a truncated lookup table.
+#if FF_CODE_PAGE == 437
+            if (wc & 0x80 && wc < (0xA5 - 0x80)) wc = ExCvt[wc & 0x7F];   /* Convert extended character to upper (SBCS) */
+#else
             if (wc & 0x80) wc = ExCvt[wc & 0x7F];   /* Convert extended character to upper (SBCS) */
+#endif
 #else                       /* DBCS cfg */
             wc = ff_uni2oem(ff_wtoupper(wc), CODEPAGE); /* Unicode ==> Upper convert ==> ANSI/OEM code */
 #endif
diff --git a/lib/oofatfs/ffunicode.c b/lib/oofatfs/ffunicode.c
index 4153f9131c..26ac738507 100644
--- a/lib/oofatfs/ffunicode.c
+++ b/lib/oofatfs/ffunicode.c
@@ -499,6 +499,13 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
     DWORD uni       /* Unicode code point to be up-converted */
 )
 {
+    #if FF_FS_ASCII_UPPER_ONLY
+    // Only uppercase ASCII characters. Everything else will require the user to
+    // pass in an uppercase version.
+    if ('a' <= uni && uni <= 'z') {
+        uni -= 32;
+    }
+    #else
     const WORD *p;
     WORD uc, bc, nc, cmd;
     static const WORD cvt1[] = {    /* Compressed up conversion table for U+0000 - U+0FFF */
@@ -619,6 +626,7 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
         }
         uni = uc;
     }
+    #endif
 
     return uni;
 }
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 8bfb69297a..7142eff62f 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -594,6 +594,8 @@ void supervisor_run_background_tasks_if_tick(void);
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (0)
 #endif
 
+#define FF_FS_ASCII_UPPER_ONLY (1)
+
 #define FF_FS_MAKE_VOLID (1)
 
 #define MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE (CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE)

From b79661d6310618f6057464498f8ed26d2b2d12cd Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 23 Feb 2023 14:34:54 -0800
Subject: [PATCH 1944/2403] Alphabetize, fix typo and remove incorrect comment

---
 .../espruino_banglejs2/mpconfigboard.mk       | 20 +++++++++----------
 py/obj.h                                      |  2 +-
 shared-module/displayio/EPaperDisplay.c       |  4 +---
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
index 483c5b95e4..106b85cd75 100644
--- a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
+++ b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk
@@ -5,23 +5,21 @@ MCU_CHIP = nrf52840
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "XT25F64B,GD25Q64C"
 
-CIRCUITPY_USB = 0
-
 CIRCUITPY_FULL_BUILD = 1
+
+# Modules that aren't useful on the board.
+CIRCUITPY_AESIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOMIXER = 0
 CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_SYNTHIO = 0
-CIRCUITPY_AESIO = 0
-CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_AUDIOCORE = 0
-CIRCUITPY_AUDIOMIXER = 0
+CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_ONEWIREIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_USB = 0
 
 CIRCUITPY_BUILD_EXTENSIONS = espruino.zip
-
-CIRCUITPY_DISPLAYIO = 1
diff --git a/py/obj.h b/py/obj.h
index b7e76a1106..86fbe5155f 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -419,7 +419,7 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 // Declare a module as a builtin, processed by makemoduledefs.py
 // param module_name: MP_QSTR_
 // param obj_module: mp_obj_module_t instance
-// prarm enabled_define: used as `#if (enabled_define) around entry`
+// param enabled_define: used as `#if (enabled_define) around entry`
 
 #define MP_REGISTER_MODULE(module_name, obj_module, enabled_define)
 
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 869bb6c358..289fc47a68 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -388,8 +388,6 @@ STATIC bool _clean_area(displayio_epaperdisplay_obj_t *self) {
     uint16_t width = displayio_display_core_get_width(&self->core);
     uint16_t height = displayio_display_core_get_height(&self->core);
 
-    // Allocated and shared as a uint32_t array so the compiler knows the
-    // alignment everywhere.
     uint8_t buffer[width / 2];
     memset(buffer, 0x77, width / 2);
 
@@ -403,7 +401,7 @@ STATIC bool _clean_area(displayio_epaperdisplay_obj_t *self) {
             // Can't acquire display bus; skip the rest of the data. Try next display.
             return false;
         }
-        self->core.send(self->core.bus, DISPLAY_DATA, self->chip_select, (uint8_t *)buffer, width / 2);
+        self->core.send(self->core.bus, DISPLAY_DATA, self->chip_select, buffer, width / 2);
         displayio_display_core_end_transaction(&self->core);
 
         // TODO(tannewt): Make refresh displays faster so we don't starve other

From 1197394a034cc6e71cfab4773940199998dc7670 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 23 Feb 2023 15:53:59 -0800
Subject: [PATCH 1945/2403] Add simple test

---
 tests/extmod/vfs_fat_case.py     | 70 ++++++++++++++++++++++++++++++++
 tests/extmod/vfs_fat_case.py.exp |  3 ++
 2 files changed, 73 insertions(+)
 create mode 100644 tests/extmod/vfs_fat_case.py
 create mode 100644 tests/extmod/vfs_fat_case.py.exp

diff --git a/tests/extmod/vfs_fat_case.py b/tests/extmod/vfs_fat_case.py
new file mode 100644
index 0000000000..45496dcf81
--- /dev/null
+++ b/tests/extmod/vfs_fat_case.py
@@ -0,0 +1,70 @@
+try:
+    import uerrno
+    import uos
+except ImportError:
+    print("missing u")
+    print("SKIP")
+    raise SystemExit
+
+try:
+    uos.VfsFat
+except AttributeError:
+    print("missing VfsFat")
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMFS:
+    SEC_SIZE = 512
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.SEC_SIZE)
+
+    def readblocks(self, n, buf):
+        # print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
+        for i in range(len(buf)):
+            buf[i] = self.data[n * self.SEC_SIZE + i]
+        return 0
+
+    def writeblocks(self, n, buf):
+        # print("writeblocks(%s, %x)" % (n, id(buf)))
+        for i in range(len(buf)):
+            self.data[n * self.SEC_SIZE + i] = buf[i]
+        return 0
+
+    def ioctl(self, op, arg):
+        # print("ioctl(%d, %r)" % (op, arg))
+        if op == 4:  # MP_BLOCKDEV_IOCTL_BLOCK_COUNT
+            return len(self.data) // self.SEC_SIZE
+        if op == 5:  # MP_BLOCKDEV_IOCTL_BLOCK_SIZE
+            return self.SEC_SIZE
+
+
+try:
+    bdev = RAMFS(50)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
+uos.VfsFat.mkfs(bdev)
+vfs = uos.VfsFat(bdev)
+uos.mount(vfs, "/ramdisk")
+uos.chdir("/ramdisk")
+
+# Check ASCII case-insensitivity
+vfs.mkdir("foo_dir_az")
+print(uos.listdir(""))
+vfs.rmdir("fOO_dir_AZ")
+
+# Characters outside of a-z are case sensitive.
+vfs.mkdir("extended_æ")
+print(uos.listdir(""))
+try:
+    vfs.rmdir("extended_Æ")
+except OSError as e:
+    print(e.errno == uerrno.ENOENT)
+vfs.rmdir("extended_æ")
+
+# Emoji test for fun.
+vfs.mkdir("emoji_😀")
+vfs.rmdir("emoji_😀")
diff --git a/tests/extmod/vfs_fat_case.py.exp b/tests/extmod/vfs_fat_case.py.exp
new file mode 100644
index 0000000000..0089bc9b51
--- /dev/null
+++ b/tests/extmod/vfs_fat_case.py.exp
@@ -0,0 +1,3 @@
+['foo_dir_az']
+['extended_æ']
+True

From 0e17deff058ecb4f0c393cc1a2ed37d916dd298d Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 24 Feb 2023 11:25:06 +0530
Subject: [PATCH 1946/2403] ci fix scheduler

---
 .github/workflows/build.yml |  7 +++----
 tools/ci_set_matrix.py      | 27 +++++++++++++--------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c8b927de8..19976f7c3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,6 @@ jobs:
 
   tests:
     needs: scheduler
-    if: needs.scheduler.outputs.build-boards == 'True'
     uses: ./.github/workflows/run-tests.yml
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
@@ -109,7 +108,7 @@ jobs:
   mpy-cross-mac:
     runs-on: macos-11
     needs: scheduler
-    if: ${{ needs.scheduler.outputs.build-boards == 'True' }}
+    if: needs.scheduler.outputs.build-boards == 'True'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
@@ -164,7 +163,7 @@ jobs:
   build-doc:
     runs-on: ubuntu-22.04
     needs: scheduler
-    if: ${{ needs.scheduler.outputs.build-doc == 'True' }}
+    if: needs.scheduler.outputs.build-doc == 'True'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
@@ -222,7 +221,7 @@ jobs:
   build-windows:
     runs-on: windows-2022
     needs: scheduler
-    if: ${{ needs.scheduler.outputs.build-windows == 'True' }}
+    if: needs.scheduler.outputs.build-windows == 'True'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     defaults:
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 43a9790160..02a1cbee73 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -42,7 +42,7 @@ from shared_bindings_matrix import (
     all_ports_all_boards,
 )
 
-PORT_TO_ARCH = {
+PORT_TO_JOB = {
     "atmel-samd": "atmel",
     "broadcom": "aarch",
     "cxd56": "arm",
@@ -110,7 +110,7 @@ def set_output(name: str, value):
 
 
 def set_boards_to_build(build_all: bool):
-    if last_failed_jobs.get("mpy_cross") or last_failed_jobs.get("tests"):
+    if last_failed_jobs.get("mpy-cross") or last_failed_jobs.get("tests"):
         build_all = True
 
     # Get boards in json format
@@ -224,33 +224,32 @@ def set_boards_to_build(build_all: bool):
             boards_to_build = all_board_ids
             break
 
-    # Split boards by architecture.
-    arch_to_boards = {"aarch": [], "arm": [], "atmel": [], "esp": [], "riscv": []}
+    # Split boards by job
+    job_to_boards = {"aarch": [], "arm": [], "atmel": [], "esp": [], "riscv": []}
 
     # Append previously failed boards
-    for arch in arch_to_boards:
-        if arch in last_failed_jobs:
-            for board in last_failed_jobs[arch]:
-                if not board in boards_to_build:
-                    boards_to_build.append(board)
+    for job in job_to_boards:
+        if job in last_failed_jobs:
+            for board in last_failed_jobs[job]:
+                boards_to_build.add(board)
 
     build_boards = bool(boards_to_build)
     print("Building boards:", build_boards)
     set_output("build-boards", build_boards)
 
-    # Append boards according to arch
+    # Append boards according to job
     for board in sorted(boards_to_build):
         port = board_to_port.get(board)
         # A board can appear due to its _deletion_ (rare)
         # if this happens it's not in `board_to_port`.
         if not port:
             continue
-        arch_to_boards[PORT_TO_ARCH[port]].append(board)
+        job_to_boards[PORT_TO_JOB[port]].append(board)
         print(" ", board)
 
-    # Set the step outputs for each architecture
-    for arch in arch_to_boards:
-        set_output(f"boards-{arch}", json.dumps(arch_to_boards[arch]))
+    # Set the step outputs for each job
+    for job in job_to_boards:
+        set_output(f"boards-{job}", json.dumps(job_to_boards[job]))
 
 
 def set_docs_to_build(build_doc: bool):

From 144aed40e3710d2454dfa8ead88d5132e3c99d22 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 24 Feb 2023 12:23:59 -0800
Subject: [PATCH 1947/2403] Rename flag. Turn on UTF-8 and flag on unix

Also added label portion to the test.
---
 lib/oofatfs/ffunicode.c          |  2 +-
 ports/unix/mpconfigport.h        |  3 +++
 py/circuitpy_mpconfig.h          |  2 +-
 tests/extmod/vfs_fat_case.py     | 15 +++++++++++++--
 tests/extmod/vfs_fat_case.py.exp |  4 +++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/oofatfs/ffunicode.c b/lib/oofatfs/ffunicode.c
index 26ac738507..a04577616a 100644
--- a/lib/oofatfs/ffunicode.c
+++ b/lib/oofatfs/ffunicode.c
@@ -499,7 +499,7 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
     DWORD uni       /* Unicode code point to be up-converted */
 )
 {
-    #if FF_FS_ASCII_UPPER_ONLY
+    #if FF_FS_CASE_INSENSITIVE_COMPARISON_ASCII_ONLY
     // Only uppercase ASCII characters. Everything else will require the user to
     // pass in an uppercase version.
     if ('a' <= uni && uni <= 'z') {
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c54fede813..c94845229c 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -178,6 +178,9 @@
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_MAX_SS           (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_LFN_UNICODE      (2)
+
+#define FF_FS_CASE_INSENSITIVE_COMPARISON_ASCII_ONLY         (1)
 
 // Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
 // names in exception messages (may require more RAM).
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 6b9ded9294..a514b6a160 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -595,7 +595,7 @@ void supervisor_run_background_tasks_if_tick(void);
 #define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (0)
 #endif
 
-#define FF_FS_ASCII_UPPER_ONLY (1)
+#define FF_FS_CASE_INSENSITIVE_COMPARISON_ASCII_ONLY (1)
 
 #define FF_FS_MAKE_VOLID (1)
 
diff --git a/tests/extmod/vfs_fat_case.py b/tests/extmod/vfs_fat_case.py
index 45496dcf81..40d67da9b8 100644
--- a/tests/extmod/vfs_fat_case.py
+++ b/tests/extmod/vfs_fat_case.py
@@ -51,18 +51,29 @@ vfs = uos.VfsFat(bdev)
 uos.mount(vfs, "/ramdisk")
 uos.chdir("/ramdisk")
 
+vfs.label = "labelæ"
+# This label would normally be LABELÆ but our limited upper casing does "LABELæ"
+print(vfs.label)
+
 # Check ASCII case-insensitivity
-vfs.mkdir("foo_dir_az")
+vfs.mkdir("fooaz")
 print(uos.listdir(""))
-vfs.rmdir("fOO_dir_AZ")
+vfs.rmdir("fOOAZ")
+
+# Check ASCII case-insensitivity for long names (8+ characters)
+vfs.mkdir("123456789fooaz")
+print(uos.listdir(""))
+vfs.rmdir("123456789fOOAZ")
 
 # Characters outside of a-z are case sensitive.
 vfs.mkdir("extended_æ")
 print(uos.listdir(""))
+# Normally this would work ok. With our limited uppercasing, it won't.
 try:
     vfs.rmdir("extended_Æ")
 except OSError as e:
     print(e.errno == uerrno.ENOENT)
+
 vfs.rmdir("extended_æ")
 
 # Emoji test for fun.
diff --git a/tests/extmod/vfs_fat_case.py.exp b/tests/extmod/vfs_fat_case.py.exp
index 0089bc9b51..64b5e7b27a 100644
--- a/tests/extmod/vfs_fat_case.py.exp
+++ b/tests/extmod/vfs_fat_case.py.exp
@@ -1,3 +1,5 @@
-['foo_dir_az']
+LABELæ
+['fooaz']
+['123456789fooaz']
 ['extended_æ']
 True

From 51f2d0f64bf87acd214b4d5550e64e60f29fed3f Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 24 Feb 2023 22:09:46 +0100
Subject: [PATCH 1948/2403] 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             | 19 +++++++++++++++++++
 locale/cs.po             | 19 +++++++++++++++++++
 locale/de_DE.po          | 19 +++++++++++++++++++
 locale/el.po             | 19 +++++++++++++++++++
 locale/en_GB.po          | 19 +++++++++++++++++++
 locale/es.po             | 22 +++++++++++++++++++++-
 locale/fil.po            | 19 +++++++++++++++++++
 locale/fr.po             | 19 +++++++++++++++++++
 locale/hi.po             | 19 +++++++++++++++++++
 locale/it_IT.po          | 19 +++++++++++++++++++
 locale/ja.po             | 19 +++++++++++++++++++
 locale/ko.po             | 19 +++++++++++++++++++
 locale/nl.po             | 19 +++++++++++++++++++
 locale/pl.po             | 19 +++++++++++++++++++
 locale/pt_BR.po          | 19 +++++++++++++++++++
 locale/ru.po             | 19 +++++++++++++++++++
 locale/sv.po             | 19 +++++++++++++++++++
 locale/tr.po             | 19 +++++++++++++++++++
 locale/zh_Latn_pinyin.po | 19 +++++++++++++++++++
 19 files changed, 363 insertions(+), 1 deletion(-)

diff --git a/locale/ID.po b/locale/ID.po
index 61d2ce3308..da9250cdc4 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -191,6 +191,10 @@ msgstr "%q harus <= %d"
 msgid "%q must be >= %d"
 msgstr "%q harus >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2199,6 +2203,11 @@ msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2217,10 +2226,20 @@ msgstr "Tidak dapat menemukan GCLK yang kosong"
 msgid "Unable to init parser"
 msgstr "Tidak dapat memulai parser"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Tidak dapat membaca data palet warna"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/cs.po b/locale/cs.po
index aabc3f2c78..a401f4a39b 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -192,6 +192,10 @@ msgstr "%q musí být <= %d"
 msgid "%q must be >= %d"
 msgstr "%q musí být >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2188,6 +2192,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2206,10 +2215,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 9629e6e36a..ff7da20902 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -195,6 +195,10 @@ msgstr "%q muss <= %d sein"
 msgid "%q must be >= %d"
 msgstr "%q muss >= %d sein"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2223,6 +2227,11 @@ msgstr "Konnte keine Buffer für Vorzeichenumwandlung allozieren"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Lock kann nicht erzeugt werden"
@@ -2241,10 +2250,20 @@ msgstr "Konnte keinen freien GCLK finden"
 msgid "Unable to init parser"
 msgstr "Parser konnte nicht gestartet werden"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Konnte Farbpalettendaten nicht lesen"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/el.po b/locale/el.po
index ad3d815961..36715577fb 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -196,6 +196,10 @@ msgstr "%q πρέπει να είναι <= %d"
 msgid "%q must be >= %d"
 msgstr "%q πρέπει να είναι >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2196,6 +2200,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2214,10 +2223,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 122300a5ed..1b24a3ce37 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -195,6 +195,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr "%q must be >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2194,6 +2198,11 @@ msgstr "Unable to allocate buffers for signed conversion"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Unable to create lock"
@@ -2212,10 +2221,20 @@ msgstr "Unable to find free GCLK"
 msgid "Unable to init parser"
 msgstr "Unable to init parser"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Unable to read colour palette data"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/es.po b/locale/es.po
index 4cab30cf90..a3a0cd0b6c 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -208,6 +208,10 @@ msgstr "%q debe ser <= %d"
 msgid "%q must be >= %d"
 msgstr "%q debe ser >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'"
@@ -665,7 +669,8 @@ msgstr "Buffer es muy pequeño"
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
-msgstr "La longitud del buffer %d es demasiado grande. Tiene que ser menor a %d"
+msgstr ""
+"La longitud del buffer %d es demasiado grande. Tiene que ser menor a %d"
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
 #: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
@@ -2247,6 +2252,11 @@ msgstr "No se pudieron asignar buffers para la conversión con signo"
 msgid "Unable to allocate the heap."
 msgstr "Imposible de asignar el heap."
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "No se puede crear bloqueo"
@@ -2265,10 +2275,20 @@ msgstr "No se pudo encontrar un GCLK libre"
 msgid "Unable to init parser"
 msgstr "Incapaz de inicializar el parser"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "No se pudo leer los datos de la paleta de colores"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/fil.po b/locale/fil.po
index ad46137e27..d35c19085b 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -189,6 +189,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2189,6 +2193,11 @@ msgstr "Hindi ma-allocate ang buffers para sa naka-sign na conversion"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2207,10 +2216,20 @@ msgstr "Hindi mahanap ang libreng GCLK"
 msgid "Unable to init parser"
 msgstr "Hindi ma-init ang parser"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/fr.po b/locale/fr.po
index d06595c001..1ada14bfa2 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -200,6 +200,10 @@ msgstr "%q doit être <= %d"
 msgid "%q must be >= %d"
 msgstr "%q doit être >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q doit être un bytearray ou matrice de type 'H' ou 'B'"
@@ -2251,6 +2255,11 @@ msgstr "Impossible d'allouer des tampons pour une conversion signée"
 msgid "Unable to allocate the heap."
 msgstr "Impossible d'allouer le tas."
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Impossible de créer un verrou ('lock')"
@@ -2269,10 +2278,20 @@ msgstr "Impossible de trouver un GCLK libre"
 msgid "Unable to init parser"
 msgstr "Impossible d'initialiser le parser"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Impossible de lire les données de la palette de couleurs"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/hi.po b/locale/hi.po
index 97c730de83..ad1a2e7093 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -188,6 +188,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2173,6 +2177,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2191,10 +2200,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 413fceead6..822b262d7c 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -192,6 +192,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2196,6 +2200,11 @@ msgstr "Ipossibilitato ad allocare buffer per la conversione con segno"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2214,10 +2223,20 @@ msgstr "Impossibile trovare un GCLK libero"
 msgid "Unable to init parser"
 msgstr "Inizilizzazione del parser non possibile"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/ja.po b/locale/ja.po
index 19eed77eb3..57ff5157d5 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -195,6 +195,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2190,6 +2194,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2208,10 +2217,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr "パーザを初期化できません"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "カラーパレットデータを読み込めません"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/ko.po b/locale/ko.po
index 86a1e30538..38fb676065 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -189,6 +189,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2177,6 +2181,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2195,10 +2204,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr "파서를 초기화(init) 할 수 없습니다"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/nl.po b/locale/nl.po
index a7b2aed3e3..59aab1fd51 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -188,6 +188,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2194,6 +2198,11 @@ msgstr "Niet in staat buffers voor gesigneerde conversie te alloceren"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Kan vergrendeling niet maken"
@@ -2212,10 +2221,20 @@ msgstr "Niet in staat een vrije GCLK te vinden"
 msgid "Unable to init parser"
 msgstr "Niet in staat om de parser te initialiseren"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Niet in staat kleurenpalet data te lezen"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/pl.po b/locale/pl.po
index a952e22b0a..d692e8bcfe 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -190,6 +190,10 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -2181,6 +2185,11 @@ msgstr "Nie udała się alokacja buforów do konwersji ze znakiem"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2199,10 +2208,20 @@ msgstr "Brak wolnego GCLK"
 msgid "Unable to init parser"
 msgstr "Błąd ustawienia parsera"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Nie można odczytać danych palety"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 1464311003..c940ce6ca8 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -205,6 +205,10 @@ msgstr "%q deve ser <= %d"
 msgid "%q must be >= %d"
 msgstr "o %q deve ser >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'"
@@ -2243,6 +2247,11 @@ msgstr "Não é possível alocar buffers para conversão assinada"
 msgid "Unable to allocate the heap."
 msgstr "Não é possível alocar a área de alocação dinâmica de variáveis."
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Não é possível criar um lock"
@@ -2261,10 +2270,20 @@ msgstr "Não é possível encontrar GCLK livre"
 msgid "Unable to init parser"
 msgstr "Não foi possível iniciar o analisador"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Não foi possível ler os dados da paleta de cores"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/ru.po b/locale/ru.po
index 824a8180f6..cbfa2b924c 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -195,6 +195,10 @@ msgstr "%q должно быть <= %d"
 msgid "%q must be >= %d"
 msgstr "%q должно быть >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q должно быть bytearray или array типа 'H' или 'B'"
@@ -2236,6 +2240,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2254,10 +2263,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/sv.po b/locale/sv.po
index d6642c8a93..eae670d914 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -204,6 +204,10 @@ msgstr "%q måste vara <= %d"
 msgid "%q must be >= %d"
 msgstr "%q måste vara >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q måste vara en bytearray eller array av typen 'H' eller 'B'"
@@ -2219,6 +2223,11 @@ msgstr "Det går inte att allokera buffert för signerad konvertering"
 msgid "Unable to allocate the heap."
 msgstr "Kan inte allokera heap."
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Kan inte skapa lås"
@@ -2237,10 +2246,20 @@ msgstr "Det gick inte att hitta ledig GCLK"
 msgid "Unable to init parser"
 msgstr "Kan inte initiera tolken"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Det går inte att läsa färgpalettdata"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/tr.po b/locale/tr.po
index 988db77b4c..dec345dcd0 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -196,6 +196,10 @@ msgstr "%q <= %d olmalıdır"
 msgid "%q must be >= %d"
 msgstr "%q >= %d olmalıdır"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır"
@@ -2195,6 +2199,11 @@ msgstr ""
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr ""
@@ -2213,10 +2222,20 @@ msgstr ""
 msgid "Unable to init parser"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 53ac3eb84d..5ce8200885 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -196,6 +196,10 @@ msgstr "%q bìxū <= %d"
 msgid "%q must be >= %d"
 msgstr "%q bìxū >= %d"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'H' huò 'B' de shù zǔ"
@@ -2213,6 +2217,11 @@ msgstr "Wúfǎ fēnpèi huǎnchōng qū yòng yú qiānmíng zhuǎnhuàn"
 msgid "Unable to allocate the heap."
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
 msgstr "Wúfǎ chuàngjiàn suǒ"
@@ -2231,10 +2240,20 @@ msgstr "Wúfǎ zhǎodào miǎnfèi de GCLK"
 msgid "Unable to init parser"
 msgstr "Wúfǎ chūshǐhuà jiěxī qì"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
 msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+#, c-format
+msgid "Unable to start ADC DMA controller, ErrorCode:%d"
+msgstr ""
+
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"

From 666d333e874b22de1bb084ea3fade393fd2a3fe8 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Fri, 24 Feb 2023 21:45:42 +0000
Subject: [PATCH 1949/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/es.po b/locale/es.po
index a3a0cd0b6c..5fcfa142ac 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: 2023-02-23 17:53+0000\n"
-"Last-Translator: Luis Ruiz San Segundo \n"
+"PO-Revision-Date: 2023-02-24 23:20+0000\n"
+"Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,6 @@ msgstr ""
 "Código detenido por la auto-recarga. Recargando pronto.\n"
 
 #: main.c
-#, fuzzy
 msgid ""
 "\n"
 "Invalid CIRCUITPY_PYSTACK_SIZE\n"
@@ -43,7 +42,7 @@ msgid ""
 "\r"
 msgstr ""
 "\n"
-"CIRCUITPY_PYSTACK_SIZE no válido\n"
+"CIRCUITPY_PYSTACK_SIZE inválido\n"
 "\n"
 "\n"
 
@@ -210,7 +209,7 @@ msgstr "%q debe ser >= %d"
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q debe ser un arreglo de tipo 'H'"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
@@ -610,7 +609,8 @@ msgstr "Por debajo de la tasa mínima de refrescamiento"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must be sequential pins"
-msgstr "Le reloj de bit y de selector de palabra deben ser pines secuenciales"
+msgstr ""
+"Los pines de reloj de bit y de selector de palabra deben ser secuenciales"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
@@ -2255,7 +2255,7 @@ msgstr "Imposible de asignar el heap."
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Imposible de configurar el controlador ADC DMA , código de error:%d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2278,7 +2278,7 @@ msgstr "Incapaz de inicializar el parser"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "No es posible de inicializar el controlador ADC DMA, código de error:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2287,7 +2287,7 @@ msgstr "No se pudo leer los datos de la paleta de colores"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Imposible de iniciar el controlador ADC DMA, código de error:%d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c

From 70d1640e465f289abb84e08e4d351083cc722196 Mon Sep 17 00:00:00 2001
From: Luis Ruiz San Segundo 
Date: Fri, 24 Feb 2023 21:45:51 +0000
Subject: [PATCH 1950/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 5fcfa142ac..6012b50c43 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
 "PO-Revision-Date: 2023-02-24 23:20+0000\n"
-"Last-Translator: Jose David M \n"
+"Last-Translator: Luis Ruiz San Segundo \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -2509,7 +2509,7 @@ msgstr "Presionó el botón Rec al inicio."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr "Usted presionó el botón SW38 al iniciar."
+msgstr "Presionó el botón SW38 al iniciar."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."

From 547bb1fd44fb697a5e264900c8b3a0356438729f Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 25 Feb 2023 00:20:19 +0100
Subject: [PATCH 1951/2403] 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             |  9 +++++----
 locale/cs.po             |  9 +++++----
 locale/de_DE.po          |  9 +++++----
 locale/el.po             |  9 +++++----
 locale/en_GB.po          |  9 +++++----
 locale/es.po             | 12 +++++++-----
 locale/fil.po            |  6 ++----
 locale/fr.po             |  9 +++++----
 locale/hi.po             |  6 ++----
 locale/it_IT.po          |  9 +++++----
 locale/ja.po             |  9 +++++----
 locale/ko.po             |  6 ++----
 locale/nl.po             |  9 +++++----
 locale/pl.po             |  9 +++++----
 locale/pt_BR.po          |  9 +++++----
 locale/ru.po             |  9 +++++----
 locale/sv.po             |  9 +++++----
 locale/tr.po             |  9 +++++----
 locale/zh_Latn_pinyin.po |  9 +++++----
 19 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index da9250cdc4..cc8fa0e28c 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -229,10 +229,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q di luar jangkauan"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "pin %q tidak valid"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1237,9 +1233,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "%q pada tidak valid"
@@ -4407,6 +4405,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q pin invalid"
+#~ msgstr "pin %q tidak valid"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/cs.po b/locale/cs.po
index a401f4a39b..7011d2d5d5 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -230,10 +230,6 @@ msgstr "%q je mimo hranice"
 msgid "%q out of range"
 msgstr "%q je mimo rozsah"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "pin %q není platný"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1237,9 +1233,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Neplatný pin %q"
@@ -4393,6 +4391,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "pin %q není platný"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index ff7da20902..883f876764 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -234,10 +234,6 @@ msgstr "%q außerhalb der Grenzen"
 msgid "%q out of range"
 msgstr "%q außerhalb des Bereichs"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q Pin ungültig"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "Schritt %q kann nicht Null sein"
@@ -1256,9 +1252,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ungültiger %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ungültiger %q Pin"
@@ -4469,6 +4467,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "%q pin invalid"
+#~ msgstr "%q Pin ungültig"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/el.po b/locale/el.po
index 36715577fb..e6edee8095 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -234,10 +234,6 @@ msgstr "%q εκτός ορίων"
 msgid "%q out of range"
 msgstr "%q εκτός εμβέλειας"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q άκυρο pin"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1246,9 +1242,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -4401,6 +4399,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "%q άκυρο pin"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 1b24a3ce37..542c8a1a6f 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -233,10 +233,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q out of range"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q pin invalid"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1238,9 +1234,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Invalid %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Invalid %q pin"
@@ -4404,6 +4402,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 "%q pin invalid"
+#~ msgstr "%q pin invalid"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/es.po b/locale/es.po
index 6012b50c43..1b3edca300 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -245,10 +245,6 @@ msgstr "%q fuera de limites"
 msgid "%q out of range"
 msgstr "%q fuera de rango"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "pin inválido %q"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "%q paso no puede ser cero"
@@ -1275,9 +1271,11 @@ msgid "Interrupt error."
 msgstr "Error de interrupción."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q inválido"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pin %q inválido"
@@ -2278,7 +2276,8 @@ msgstr "Incapaz de inicializar el parser"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr "No es posible de inicializar el controlador ADC DMA, código de error:%d"
+msgstr ""
+"No es posible de inicializar el controlador ADC DMA, código de error:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -4480,6 +4479,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 pin invalid"
+#~ msgstr "pin inválido %q"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/fil.po b/locale/fil.po
index d35c19085b..0d0c475f05 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -227,10 +227,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1237,9 +1233,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Mali ang %q pin"
diff --git a/locale/fr.po b/locale/fr.po
index 1ada14bfa2..7e188571f1 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -238,10 +238,6 @@ msgstr "%q est hors limites"
 msgid "%q out of range"
 msgstr "%q est hors de porté"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "broche %q invalide"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "le pas ne peut être zéro dans %q"
@@ -1277,9 +1273,11 @@ msgid "Interrupt error."
 msgstr "Erreur d'interruption."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q invalide"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Broche invalide pour '%q'"
@@ -4496,6 +4494,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 "%q pin invalid"
+#~ msgstr "broche %q invalide"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/hi.po b/locale/hi.po
index ad1a2e7093..e6363b0bf5 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -226,10 +226,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1225,9 +1221,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 822b262d7c..f1d9aaf3f1 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -230,10 +230,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q oltre il limite"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q pin non valido"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1239,9 +1235,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pin %q non valido"
@@ -4426,6 +4424,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "%q pin non valido"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/ja.po b/locale/ja.po
index 57ff5157d5..177030ca7c 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -233,10 +233,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q が範囲外"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q ピンは無効"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1238,9 +1234,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "不正な %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "不正な%qピン"
@@ -4402,6 +4400,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "%q ピンは無効"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/ko.po b/locale/ko.po
index 38fb676065..6c6128ef60 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -227,10 +227,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1228,9 +1224,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 59aab1fd51..e12ba52d13 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -226,10 +226,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q buiten bereik"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q pin onjuist"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1233,9 +1229,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ongeldige %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ongeldige %q pin"
@@ -4412,6 +4410,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 "%q pin invalid"
+#~ msgstr "%q pin onjuist"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/pl.po b/locale/pl.po
index d692e8bcfe..e1397ceffe 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -228,10 +228,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr "%q poza zakresem"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "nieprawidłowy pin %q"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1233,9 +1229,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Nieprawidłowe %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Zła nóżka %q"
@@ -4388,6 +4386,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "nieprawidłowy pin %q"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c940ce6ca8..0f72e073e0 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -243,10 +243,6 @@ msgstr "%q fora dos limites"
 msgid "%q out of range"
 msgstr "%q fora do alcance"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q pino inválido"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "A etapa %q não pode ser zero"
@@ -1271,9 +1267,11 @@ msgid "Interrupt error."
 msgstr "Erro de interrupção."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q Inválido"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pino do %q inválido"
@@ -4481,6 +4479,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 pin invalid"
+#~ msgstr "%q pino inválido"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/ru.po b/locale/ru.po
index cbfa2b924c..615a0431ae 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -233,10 +233,6 @@ msgstr "%q за пределом"
 msgid "%q out of range"
 msgstr "%q вне диапазона"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "Пин %q не допустим"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "Шаг %q не может быть нулём"
@@ -1270,9 +1266,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Недопустимый %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Недопустимый пин %q"
@@ -4441,6 +4439,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "%q pin invalid"
+#~ msgstr "Пин %q не допустим"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/sv.po b/locale/sv.po
index eae670d914..5db63ce9eb 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -244,10 +244,6 @@ msgstr "%q är utanför gränserna"
 msgid "%q out of range"
 msgstr "%q utanför intervallet"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "Pinne %q ogiltig"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "%q steg kan inte vara noll"
@@ -1256,9 +1252,11 @@ msgid "Interrupt error."
 msgstr "Interrupt-fel."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ogiltig %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ogiltig %q-pinne"
@@ -4443,6 +4441,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 pin invalid"
+#~ msgstr "Pinne %q ogiltig"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/tr.po b/locale/tr.po
index dec345dcd0..062c5ef34f 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -234,10 +234,6 @@ msgstr "%q sınırların dışında"
 msgid "%q out of range"
 msgstr "%q aralık dışında"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q pini geçersiz"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "%q sıfır olamaz"
@@ -1243,9 +1239,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Geçersiz %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Geersi %q pin"
@@ -4400,6 +4398,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "%q pin invalid"
+#~ msgstr "%q pini geçersiz"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 5ce8200885..95640b14d4 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -235,10 +235,6 @@ msgstr "%q chāo chū jiè xiàn"
 msgid "%q out of range"
 msgstr "%q chāochū fànwéi"
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr "%q yǐn jiǎo wúxiào"
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr "%q bù cháng bù néng wéi líng"
@@ -1252,9 +1248,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "wú xiào %q"
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Wúxiào de %q yǐn jiǎo"
@@ -4436,6 +4434,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 pin invalid"
+#~ msgstr "%q yǐn jiǎo wúxiào"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please file an issue with the contents of your CIRCUITPY drive at \n"

From f2c7e2af25a08872af4142f9e3d1bc80e2c13bc1 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 25 Feb 2023 01:53:40 +0100
Subject: [PATCH 1952/2403] 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             | 9 +++------
 locale/cs.po             | 6 ------
 locale/de_DE.po          | 9 +++------
 locale/el.po             | 6 ------
 locale/en_GB.po          | 9 +++------
 locale/es.po             | 9 +++------
 locale/fil.po            | 6 ------
 locale/fr.po             | 9 +++------
 locale/hi.po             | 6 ------
 locale/it_IT.po          | 6 ------
 locale/ja.po             | 9 +++------
 locale/ko.po             | 6 ------
 locale/nl.po             | 9 +++------
 locale/pl.po             | 9 +++------
 locale/pt_BR.po          | 9 +++------
 locale/ru.po             | 9 +++------
 locale/sv.po             | 9 +++------
 locale/tr.po             | 6 ------
 locale/zh_Latn_pinyin.po | 9 +++------
 19 files changed, 36 insertions(+), 114 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index cc8fa0e28c..120333a7a2 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2018,10 +2018,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Berikan setidaknya satu pin UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4182,8 +4178,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx dan rx keduanya tidak boleh kosong"
@@ -4405,6 +4399,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "Supply at least one UART pin"
+#~ msgstr "Berikan setidaknya satu pin UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "pin %q tidak valid"
 
diff --git a/locale/cs.po b/locale/cs.po
index 7011d2d5d5..0fa986c7c3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2007,10 +2007,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4168,8 +4164,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 883f876764..33d0ed76dc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2036,10 +2036,6 @@ msgstr "Stereo rechts muss sich auf PWM-Kanal B befinden"
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Gib mindestens einen UART-Pin an"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Gib entweder monotonic_time oder epoch_time an"
@@ -4242,8 +4238,6 @@ msgstr "twai_driver_install gab esp-idf-Fehler zurück #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start gab esp-idf-Fehler zurück #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx und rx können nicht beide None sein"
@@ -4467,6 +4461,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "Supply at least one UART pin"
+#~ msgstr "Gib mindestens einen UART-Pin an"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q Pin ungültig"
 
diff --git a/locale/el.po b/locale/el.po
index e6edee8095..24783d0351 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2015,10 +2015,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4176,8 +4172,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 542c8a1a6f..3b6e00e32d 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2013,10 +2013,6 @@ msgstr "Stereo right must be on PWM channel B"
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Supply at least one UART pin"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Supply one of monotonic_time or epoch_time"
@@ -4179,8 +4175,6 @@ msgstr "twai_driver_install returned esp-idf error #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start returned esp-idf error #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx and rx cannot both be None"
@@ -4402,6 +4396,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 "Supply at least one UART pin"
+#~ msgstr "Supply at least one UART pin"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q pin invalid"
 
diff --git a/locale/es.po b/locale/es.po
index 1b3edca300..24a842500e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2061,10 +2061,6 @@ msgstr "Estéreo derecho debe estar en el canal PWM B"
 msgid "Stopping AP is not supported."
 msgstr "Parar el AP no esta soportado."
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Suministre al menos un pin UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Suministre monotonic_time o epoch_time"
@@ -4256,8 +4252,6 @@ msgstr "twai_driver_install devolvió esp-idf error #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start devolvió esp-idf error #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "Ambos tx y rx no pueden ser None"
@@ -4479,6 +4473,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 "Supply at least one UART pin"
+#~ msgstr "Suministre al menos un pin UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "pin inválido %q"
 
diff --git a/locale/fil.po b/locale/fil.po
index 0d0c475f05..a05897f4fe 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2008,10 +2008,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4189,8 +4185,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx at rx hindi pwedeng parehas na None"
diff --git a/locale/fr.po b/locale/fr.po
index 7e188571f1..b40753315b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2063,10 +2063,6 @@ msgstr "Canal stéréo droit doit être sur le canal PWM B"
 msgid "Stopping AP is not supported."
 msgstr "Stopper n'est pas supporté."
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Fournissez au moins une broche UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Fournissez l'un de monotonic_time ou epoch_time"
@@ -4271,8 +4267,6 @@ msgstr "twai_driver_install a renvoyé l'erreur esp-idf #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start a renvoyé l'erreur esp-idf #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx et rx ne peuvent être 'None' tous les deux"
@@ -4494,6 +4488,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 "Supply at least one UART pin"
+#~ msgstr "Fournissez au moins une broche UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "broche %q invalide"
 
diff --git a/locale/hi.po b/locale/hi.po
index e6363b0bf5..6f42103bc4 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1992,10 +1992,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4153,8 +4149,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index f1d9aaf3f1..52c8f1f6e4 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2015,10 +2015,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4199,8 +4195,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx e rx non possono essere entrambi None"
diff --git a/locale/ja.po b/locale/ja.po
index 177030ca7c..8bc8d0f49e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2008,10 +2008,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "少なくとも1つのUARTピンが必要"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4177,8 +4173,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "txとrxを両方ともNoneにできません"
@@ -4400,6 +4394,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Supply at least one UART pin"
+#~ msgstr "少なくとも1つのUARTピンが必要"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q ピンは無効"
 
diff --git a/locale/ko.po b/locale/ko.po
index 6c6128ef60..01624c24f7 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1995,10 +1995,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4157,8 +4153,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index e12ba52d13..30b8c80352 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2013,10 +2013,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Geef op zijn minst 1 UART pin op"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Geef monotonic_time of epoch_time"
@@ -4187,8 +4183,6 @@ msgstr "twai_driver_install geeft esp-idf fout #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start geeft esp-idf error #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx en rx kunnen niet beiden None zijn"
@@ -4410,6 +4404,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 "Supply at least one UART pin"
+#~ msgstr "Geef op zijn minst 1 UART pin op"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q pin onjuist"
 
diff --git a/locale/pl.po b/locale/pl.po
index e1397ceffe..f2fed6df1c 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2000,10 +2000,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Podaj co najmniej jeden pin UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4163,8 +4159,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx i rx nie mogą być oba None"
@@ -4386,6 +4380,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Supply at least one UART pin"
+#~ msgstr "Podaj co najmniej jeden pin UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "nieprawidłowy pin %q"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 0f72e073e0..cd0a071386 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2055,10 +2055,6 @@ msgstr "O estéreo à direita deve estar no canal PWM B"
 msgid "Stopping AP is not supported."
 msgstr "Não há suporte para a interrupção do AP."
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Forneça pelo menos um pino UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Forneça um de monotonic_time ou de epoch_time"
@@ -4256,8 +4252,6 @@ msgstr "o twai_driver_install retornou um erro esp-idf #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "o twai_start retornou um erro esp-idf #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "TX e RX não podem ser ambos"
@@ -4479,6 +4473,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 "Supply at least one UART pin"
+#~ msgstr "Forneça pelo menos um pino UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q pino inválido"
 
diff --git a/locale/ru.po b/locale/ru.po
index 615a0431ae..c1d2e9d4de 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2053,10 +2053,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Предоставьте хотяб один пин UART"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4216,8 +4212,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
@@ -4439,6 +4433,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "Supply at least one UART pin"
+#~ msgstr "Предоставьте хотяб один пин UART"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "Пин %q не допустим"
 
diff --git a/locale/sv.po b/locale/sv.po
index 5db63ce9eb..26db196379 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2036,10 +2036,6 @@ msgstr "Höger stereokanal måste använda PWM kanal B"
 msgid "Stopping AP is not supported."
 msgstr "Stoppa AP stöds inte."
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Ange minst en UART-pinne"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "Ange en av monotonic_time eller epoch_time"
@@ -4218,8 +4214,6 @@ msgstr "twai_driver_install returnerade esp-idf-fel #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start returnerade esp-idf-fel #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx och rx kan inte båda vara None"
@@ -4441,6 +4435,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 "Supply at least one UART pin"
+#~ msgstr "Ange minst en UART-pinne"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "Pinne %q ogiltig"
 
diff --git a/locale/tr.po b/locale/tr.po
index 062c5ef34f..883715ee96 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -2014,10 +2014,6 @@ msgstr ""
 msgid "Stopping AP is not supported."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -4175,8 +4171,6 @@ msgstr ""
 msgid "twai_start returned esp-idf error #%d"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 95640b14d4..efaa14a1ac 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2030,10 +2030,6 @@ msgstr "lì tǐ shēng yòu cè bì xū zài PWM tōng dào B shàng"
 msgid "Stopping AP is not supported."
 msgstr "bù zhī chí tíng zhǐ AP."
 
-#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
-msgid "Supply at least one UART pin"
-msgstr "Dìngyì zhìshǎo yīgè UART yǐn jiǎo"
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr "tí gòng qí zhōng yī monotonic_time huò epoch_time"
@@ -4211,8 +4207,6 @@ msgstr "twai_driver_install fǎn huí esp-idf cuò wù #%d"
 msgid "twai_start returned esp-idf error #%d"
 msgstr "twai_start fǎn huí esp -idf cuò wù #%d"
 
-#: ports/atmel-samd/common-hal/busio/UART.c
-#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr "tx hé rx bùnéng dōu shì wú"
@@ -4434,6 +4428,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 "Supply at least one UART pin"
+#~ msgstr "Dìngyì zhìshǎo yīgè UART yǐn jiǎo"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q yǐn jiǎo wúxiào"
 

From 328a08729dafc4fdf9bd3d9b20a5f47547466e06 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 25 Feb 2023 09:16:33 -0600
Subject: [PATCH 1953/2403] Example fix

---
 shared-bindings/gifio/OnDiskGif.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 83cf5539e7..2ce902a497 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -48,14 +48,15 @@
 //|
 //|       odg = gifio.OnDiskGif('/sample.gif')
 //|       odg.next_frame() # Load the first frame
-//|       face = displayio.TileGrid(odg, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565))
+//|       # Depending on your display the next line may need Colorspace.RGB565 instead of Colorspace.RGB565_SWAPPED
+//|       face = displayio.TileGrid(odg.bitmap, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565_SWAPPED))
 //|       splash.append(face)
 //|       board.DISPLAY.refresh()
 //|
 //|       # Wait forever
 //|       while True:
-//|           gif.next_frame()
-//|           time.sleep(0.1)"""
+//|           next_delay = odg.next_frame()
+//|           time.sleep(next_delay)"""
 //|
 //|     def __init__(self, file: str) -> None:
 //|         """Create an OnDiskGif object with the given file.

From 07b3bd6d77506ab139c92f648610ddec7157cd04 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 25 Feb 2023 11:02:49 -0600
Subject: [PATCH 1954/2403] Improve pwmio documentation

#7644 pointed out the need for better documentation.

To the best of my ability I noted the current behavior.
I think that there may be some ports that do not actually read
back the 'set' frequency value, but they are ports marked as beta
status (mimxrt10xx) or not maintained by us (cxd56).
---
 shared-bindings/pwmio/PWMOut.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c
index 1fd69272da..24c0097c0c 100644
--- a/shared-bindings/pwmio/PWMOut.c
+++ b/shared-bindings/pwmio/PWMOut.c
@@ -69,7 +69,27 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) {
 }
 
 //| class PWMOut:
-//|     """Output a Pulse Width Modulated signal on a given pin."""
+//|     """Output a Pulse Width Modulated signal on a given pin.
+//|
+//|     .. note:: The exact frequencies possible depend on the specific microcontroller.
+//|       If the requested frequency is within the available range, one of the two
+//|       nearest possible frequencies to the requested one is selected.
+//|
+//|       If the requested frequency is outside the range, either (A) a ValueError
+//|       may be raised or (B) the highest or lowest frequency is selected. This
+//|       behavior is microcontroller-dependent, and may depend on whether it's the
+//|       upper or lower bound that is exceeded.
+//|
+//|       In any case, the actual frequency (rounded to 1Hz) is available in the
+//|       ``frequency`` property after construction.
+//|
+//|     .. note:: The frequency is calculated based on a nominal CPU frequency.
+//|       However, depending on the board, the error between the nominal and
+//|       actual CPU frequency can be large (several hundred PPM in the case of
+//|       crystal oscillators and up to ten percent in the case of RC
+//|       oscillators)
+//|
+//|     """
 //|
 //|     def __init__(
 //|         self,
@@ -134,7 +154,9 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) {
 //|           pwm = pwmio.PWMOut(board.D13, duty_cycle=2 ** 15, frequency=440, variable_frequency=True)
 //|           time.sleep(0.2)
 //|           pwm.frequency = 880
-//|           time.sleep(0.1)"""
+//|           time.sleep(0.1)
+//|
+//|         """
 //|         ...
 STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     enum { ARG_pin, ARG_duty_cycle, ARG_frequency, ARG_variable_frequency };
@@ -234,7 +256,8 @@ MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj,
 //|     for the PWM's duty cycle may need to be recalculated when the frequency
 //|     changes. In these cases, the duty cycle is automatically recalculated
 //|     from the original duty cycle value. This should happen without any need
-//|     to manually re-set the duty cycle."""
+//|     to manually re-set the duty cycle. However, an output glitch may occur during the adjustment.
+//|     """
 //|
 STATIC mp_obj_t pwmio_pwmout_obj_get_frequency(mp_obj_t self_in) {
     pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);

From ce3da1ec66df70af8db75f6739bc981256d2e818 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 25 Feb 2023 14:15:33 -0600
Subject: [PATCH 1955/2403] Small doc change

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

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 2ce902a497..a4da733ceb 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -43,8 +43,9 @@
 //|       import displayio
 //|       import time
 //|
+//|       display = board.DISPLAY
 //|       splash = displayio.Group()
-//|       board.DISPLAY.show(splash)
+//|       display.root_group = splash
 //|
 //|       odg = gifio.OnDiskGif('/sample.gif')
 //|       odg.next_frame() # Load the first frame

From 05f7bfe70ec1dde2c08bfde3159f9ec2469372f1 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 25 Feb 2023 02:45:22 +0000
Subject: [PATCH 1956/2403] Translated using Weblate (French)

Currently translated at 98.5% (987 of 1002 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index b40753315b..728cb901bf 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-02-22 18:34+0000\n"
+"PO-Revision-Date: 2023-02-26 06:37+0000\n"
 "Last-Translator: Neradoc \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -41,6 +41,10 @@ msgid ""
 "\n"
 "\r"
 msgstr ""
+"\n"
+"CIRCUITPY_PYSTACK_SIZE invalide\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""

From f15669af6cc4f8338a6bb07803b439975e658240 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Sat, 25 Feb 2023 06:19:21 +0000
Subject: [PATCH 1957/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index cd0a071386..fb13d6c08b 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: 2023-02-23 17:53+0000\n"
+"PO-Revision-Date: 2023-02-26 06:37+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -207,7 +207,7 @@ msgstr "o %q deve ser >= %d"
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q deve ser uma matriz do tipo 'H'"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
@@ -2244,7 +2244,7 @@ msgstr "Não é possível alocar a área de alocação dinâmica de variáveis."
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Não foi possível configurar o controlador ADC DMA, ErrorCode:%d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2267,7 +2267,7 @@ msgstr "Não foi possível iniciar o analisador"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Não foi possível inicializar o controlador ADC DMA, ErrorCode:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2276,7 +2276,7 @@ msgstr "Não foi possível ler os dados da paleta de cores"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Não foi possível iniciar o controlador ADC DMA, ErrorCode:%d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c

From 3db4312441a3cdc08841ea5b874d2014060e7dde Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Sat, 25 Feb 2023 02:35:33 +0000
Subject: [PATCH 1958/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 26db196379..e7cafc4ddd 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: 2023-02-23 17:53+0000\n"
+"PO-Revision-Date: 2023-02-26 06:37+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -206,7 +206,7 @@ msgstr "%q måste vara >= %d"
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q måste vara en array av typen 'H'"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
@@ -2220,7 +2220,7 @@ msgstr "Kan inte allokera heap."
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Kan inte konfigurera ADC DMA controller, Felkod:%d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2243,7 +2243,7 @@ msgstr "Kan inte initiera tolken"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Kan inte konfigurera ADC DMA controller, Felkod:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2252,7 +2252,7 @@ msgstr "Det går inte att läsa färgpalettdata"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Kan inte starta ADC DMA controller, Felkod:%d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c

From 5bca86b43dfcba4f4bf357a003bdf7fabba19a11 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck 
Date: Sun, 26 Feb 2023 16:00:37 -0700
Subject: [PATCH 1959/2403] Fix print of "soft reboot" when the user presses ^D

The logic of the main loop was changed between version 7 and 8.
[Commit](https://github.com/adafruit/circuitpython/commit/9307b62ad54bcd27c493e8d63dc91059e6612b79)
Something is wrong with the existing version 8 logic so the serial
write of "soft reboot" is never executed when the user does a
soft reboot.
A consequence of this is that tools like `tools/pyboard.py`, `ampy`
and `mpremote` are not able to activate the raw REPL since they
execute a soft reboot and wait for this to be printed to the console.
---
 main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 18f145c334..a44e502821 100644
--- a/main.c
+++ b/main.c
@@ -1078,15 +1078,17 @@ int __attribute__((used)) main(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     bool skip_repl = true;
     bool simulate_reset = true;
+    bool first_run = true;
     for (;;) {
         if (!skip_repl) {
             exit_code = run_repl(get_safe_mode());
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
-            if (!simulate_reset) {
+            if (!first_run) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
+            first_run = false;
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard

From 4c9044a0bff1fa9660e4fecf198642ee2d418028 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck 
Date: Sun, 26 Feb 2023 19:49:12 -0700
Subject: [PATCH 1960/2403] Fix it with simulate_reset instead

---
 main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index a44e502821..002c97c167 100644
--- a/main.c
+++ b/main.c
@@ -1078,17 +1078,16 @@ int __attribute__((used)) main(void) {
     int exit_code = PYEXEC_FORCED_EXIT;
     bool skip_repl = true;
     bool simulate_reset = true;
-    bool first_run = true;
     for (;;) {
         if (!skip_repl) {
             exit_code = run_repl(get_safe_mode());
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
-            if (!first_run) {
+            if (!simulate_reset) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
-            first_run = false;
+            simulate_reset = false;
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard

From 8f3e20ff960a116d074bda3a160419d23231ebe2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 26 Feb 2023 23:18:59 -0500
Subject: [PATCH 1961/2403] Merge pull request #7652 from
 xorbit/fix_soft_reboot_marker

Fix print of "soft reboot" when the user presses ^D
---
 main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.c b/main.c
index d70e718b6d..16353678d2 100644
--- a/main.c
+++ b/main.c
@@ -1012,6 +1012,7 @@ int __attribute__((used)) main(void) {
             if (!simulate_reset) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
+            simulate_reset = false;
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard

From f22f2a36623734231337cfdc2cde3b63bd98f788 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Mon, 27 Feb 2023 18:44:08 +0100
Subject: [PATCH 1962/2403] enable bus device on hallowing M0

---
 ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
index 6017b551f1..1c032f02c0 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
@@ -12,6 +12,7 @@ LONGINT_IMPL = NONE
 
 # To keep the build small
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_BUSDEVICE = 1  # lis3dh needs it
 CIRCUITPY_KEYPAD = 0
 
 # Include these Python libraries in firmware.

From 9b2f1abeab0cf57173e31f6be34b8bff8c5ea5e7 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 27 Feb 2023 20:56:14 -0500
Subject: [PATCH 1963/2403] update frozen libraries and get smaller RFM69
 library

---
 frozen/Adafruit_CircuitPython_Display_Text | 2 +-
 frozen/Adafruit_CircuitPython_DotStar      | 2 +-
 frozen/Adafruit_CircuitPython_IS31FL3731   | 2 +-
 frozen/Adafruit_CircuitPython_LIS3DH       | 2 +-
 frozen/Adafruit_CircuitPython_Motor        | 2 +-
 frozen/Adafruit_CircuitPython_RFM69        | 2 +-
 frozen/Adafruit_CircuitPython_Requests     | 2 +-
 frozen/Adafruit_CircuitPython_SSD1680      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
index 1590d81f7d..911201504a 160000
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit 1590d81f7d1474b25aed6a0cb793c7e6dc7634ec
+Subproject commit 911201504a269dbfc49b04ca59bc54adabd4716a
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
index d645fc2ade..187279a95e 160000
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@@ -1 +1 @@
-Subproject commit d645fc2aded3606e5b0c17689e9f29e7e56bb612
+Subproject commit 187279a95e5cdd634d233af59352558cea4c1227
diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731
index 8e0f081a0f..5433ba3760 160000
--- a/frozen/Adafruit_CircuitPython_IS31FL3731
+++ b/frozen/Adafruit_CircuitPython_IS31FL3731
@@ -1 +1 @@
-Subproject commit 8e0f081a0fcc94053b8ef480a916b10855a3c0d5
+Subproject commit 5433ba3760ca605267223de883a44cb8394f40a5
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
index 61ca58788a..240fe51935 160000
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 61ca58788aabd53558e10c32064a1304aa7454f2
+Subproject commit 240fe51935f4a9def33ef347d40b13862a60b7ac
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
index f26bead58d..9c3de3abce 160000
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit f26bead58d3c4036eced586d275396816e92e80a
+Subproject commit 9c3de3abce00b50ba936f4f8daad0a8a6bee34a6
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
index 96b4a05c8a..af1cba8a7e 160000
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit 96b4a05c8a225ad7ddc392be7fb69efebe151981
+Subproject commit af1cba8a7e4e3950fcc5367e9c55a024d9ab9f64
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
index 203d0b1489..558fff7223 160000
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit 203d0b1489cb90a39f8a780570287f1a5bd610a0
+Subproject commit 558fff7223178eae6228e5262f3a08d3a4101394
diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680
index 168624262c..91b6867aca 160000
--- a/frozen/Adafruit_CircuitPython_SSD1680
+++ b/frozen/Adafruit_CircuitPython_SSD1680
@@ -1 +1 @@
-Subproject commit 168624262c18f5ee80ec392c0844d6a4c6548760
+Subproject commit 91b6867aca2b0511571fed14ab051d37f1f1544c

From c6d38e4ba8d3612ac570801c9c4fbd97c6fded0c Mon Sep 17 00:00:00 2001
From: Thierry Chantier 
Date: Sun, 19 Feb 2023 10:37:03 +0100
Subject: [PATCH 1964/2403] add support Lilygo T-embed esp32s3 board

---
 .../boards/lilygo_tembed_esp32s3/board.c      | 99 +++++++++++++++++++
 .../lilygo_tembed_esp32s3/mpconfigboard.h     | 38 +++++++
 .../lilygo_tembed_esp32s3/mpconfigboard.mk    | 10 ++
 .../boards/lilygo_tembed_esp32s3/pins.c       | 86 ++++++++++++++++
 .../boards/lilygo_tembed_esp32s3/sdkconfig    | 34 +++++++
 5 files changed, 267 insertions(+)
 create mode 100644 ports/espressif/boards/lilygo_tembed_esp32s3/board.c
 create mode 100644 ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lilygo_tembed_esp32s3/pins.c
 create mode 100644 ports/espressif/boards/lilygo_tembed_esp32s3/sdkconfig

diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/board.c b/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
new file mode 100644
index 0000000000..ed49eb504c
--- /dev/null
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.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"
+
+uint8_t display_init_sequence[] = {
+    0x01, 0x80, 0x96, //  _SWRESET and Delay 150ms
+    0x11, 0x80, 0xFF, //  _SLPOUT and Delay 500ms
+    0x3A, 0x81, 0x55, 0x0A, //  _COLMOD and Delay 10ms
+    0x13, 0x80, 0x0A, //  _NORON and Delay 10ms
+    0x36, 0x01, 0xC8, //  _MADCTL
+    0x29, 0x80, 0xFF, //  _DISPON and Delay 500ms
+};
+
+void board_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO12, &pin_GPIO11, NULL, false);
+    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_GPIO13, // TFT_DC Command or data
+        &pin_GPIO10, // TFT_CS Chip select
+        &pin_GPIO9, // 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
+        170, // Height
+        35, // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO15,  // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f, // brightness
+        false, // single_byte_bounds
+        false, // data_as_commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        false, // SH1107_addressing
+        50000); // backlight pwm frequency
+
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.h b/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.h
new file mode 100644
index 0000000000..307c103e33
--- /dev/null
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.h
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "LILYGO TEMBED ESP32S3"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO48)
+
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11)
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO12)
+
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.mk b/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.mk
new file mode 100644
index 0000000000..2b8f67b560
--- /dev/null
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/mpconfigboard.mk
@@ -0,0 +1,10 @@
+USB_VID = 0x303A
+USB_PID = 0x8151
+USB_PRODUCT = "TEMBED ESP32S3"
+USB_MANUFACTURER = "LILYGO"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c b/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c
new file mode 100644
index 0000000000..94c57f162f
--- /dev/null
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c
@@ -0,0 +1,86 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    // TFT control pins
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE),  MP_ROM_PTR(&pin_GPIO15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI),  MP_ROM_PTR(&pin_GPIO11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK),  MP_ROM_PTR(&pin_GPIO12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST),  MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
+
+    // SD card control pins
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SCLK), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO38) },
+
+    // Microphone control pins
+    { MP_ROM_QSTR(MP_QSTR_ES_BCLK), MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_ES_LRCK), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_ES_DIN), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_ES_MCLK), MP_ROM_PTR(&pin_GPIO48) },
+
+    // Speaker control pins
+    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WCLK), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_DOUT), MP_ROM_PTR(&pin_GPIO6) },
+
+    // Encoder control pins
+    { MP_ROM_QSTR(MP_QSTR_ENCODER_A), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_ENCODER_B), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_ENCODER_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+
+    // APA102 control pins (Leds)
+    { MP_ROM_QSTR(MP_QSTR_APA102_CLK), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_APA102_DI), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/sdkconfig b/ports/espressif/boards/lilygo_tembed_esp32s3/sdkconfig
new file mode 100644
index 0000000000..f508f4a67c
--- /dev/null
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/sdkconfig
@@ -0,0 +1,34 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_OCT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP

From 5386cafa21c25fca41928436e15a9186dad4da01 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 28 Feb 2023 13:02:24 -0500
Subject: [PATCH 1965/2403] Update gifio and displayio documentation

---
 shared-bindings/displayio/Display.c       | 14 ++++++++++---
 shared-bindings/displayio/EPaperDisplay.c | 10 +++++++--
 shared-bindings/gifio/OnDiskGif.c         | 25 +++++++++++++++++------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 47b1de8914..49194ebd1e 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -240,10 +240,16 @@ static displayio_display_obj_t *native_display(mp_obj_t display_obj) {
 }
 
 //|     def show(self, group: Group) -> None:
-//|         """Switches to displaying the given group of layers. When group is None, the default
+//|         """
+//|         .. note:: `show()` is deprecated and will be removed in CircuitPython 9.0.0.
+//|           Use ``.root_group = group`` instead.
+//|
+//|         Switches to displaying the given group of layers. When group is None, the default
 //|         CircuitPython terminal will be shown.
 //|
-//|         :param Group group: The group to show."""
+//|         :param Group group: The group to show.
+//|
+//|         """
 //|         ...
 STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     displayio_display_obj_t *self = native_display(self_in);
@@ -419,7 +425,9 @@ MP_PROPERTY_GETTER(displayio_display_bus_obj,
     (mp_obj_t)&displayio_display_get_bus_obj);
 
 //|     root_group: Group
-//|     """The root group on the display."""
+//|     """The root group on the display.
+//|     If the root group is set to ``None``, the default CircuitPython terminal will be shown.
+//|     """
 STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
     return common_hal_displayio_display_get_root_group(self);
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 6b4ad0cb66..93d91110a2 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -242,7 +242,11 @@ static displayio_epaperdisplay_obj_t *native_display(mp_obj_t display_obj) {
 }
 
 //|     def show(self, group: Group) -> None:
-//|         """Switches to displaying the given group of layers. When group is None, the default
+//|         """
+//|         .. note:: `show()` is deprecated and will be removed in CircuitPython 9.0.0.
+//|           Use ``.root_group = group`` instead.
+//|
+//|         Switches to displaying the given group of layers. When group is None, the default
 //|         CircuitPython terminal will be shown.
 //|
 //|         :param Group group: The group to show."""
@@ -379,7 +383,9 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj,
     (mp_obj_t)&displayio_epaperdisplay_get_bus_obj);
 
 //|     root_group: Group
-//|     """The root group on the epaper display."""
+//|     """The root group on the epaper display.
+//|     If the root group is set to ``None``, the default CircuitPython terminal will be shown.
+//|     """
 //|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_root_group(mp_obj_t self_in) {
     displayio_epaperdisplay_obj_t *self = native_display(self_in);
diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index a4da733ceb..a1eb6051eb 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -48,22 +48,35 @@
 //|       display.root_group = splash
 //|
 //|       odg = gifio.OnDiskGif('/sample.gif')
+//|
+//|       start = time.monotonic()
 //|       odg.next_frame() # Load the first frame
-//|       # Depending on your display the next line may need Colorspace.RGB565 instead of Colorspace.RGB565_SWAPPED
-//|       face = displayio.TileGrid(odg.bitmap, pixel_shader=displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565_SWAPPED))
+//|       end = time.monotonic()
+//|       overhead = end - start
+//|
+//|       face = displayio.TileGrid(
+//|           odg.bitmap,
+//|           pixel_shader=displayio.ColorConverter(
+//|               input_colorspace=displayio.Colorspace.RGB565_SWAPPED
+//|           ),
+//|       )
 //|       splash.append(face)
 //|       board.DISPLAY.refresh()
 //|
-//|       # Wait forever
+//|       # Display repeatedly.
 //|       while True:
+//|           # Sleep for the frame delay specified by the GIF,
+//|           # minus the overhead measured to advance between frames.
+//|           time.sleep(max(0, next_delay - overhead))
 //|           next_delay = odg.next_frame()
-//|           time.sleep(next_delay)"""
+//|     """
 //|
 //|     def __init__(self, file: str) -> None:
-//|         """Create an OnDiskGif object with the given file.
+//|         """Create an `OnDiskGif` object with the given file.
+//|         The GIF frames are decoded into RGB565 big-endian format.
+//|         `displayio` expects little-endian, so the example above uses `Colorspace.RGB565_SWAPPED`.
 //|
 //|         :param file file: The name of the GIF file.
-//|
 //|         """
 //|         ...
 STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {

From e2c6cf592946ab3192e9e22d93a869c11c717969 Mon Sep 17 00:00:00 2001
From: Matthew McGowan 
Date: Tue, 28 Feb 2023 14:34:10 -0800
Subject: [PATCH 1966/2403] fix: Increases drive strength of 32kHz external
 crystal, in line with calculations specified in ST AN2867 sections 3.3, 3.4,
 and STM32L4 datasheet DS12023 Table 58. LSE oscillator characteristics. The
 drive strength RCC_LSEDRIVE_LOW is marginal for the 32kHz crystal oscillator
 stability, and RCC_LSEDRIVE_MEDIUMLOW meets the calculated drive strength
 with a small margin for parasitic capacitance.

---
 ports/stm/boards/swan_r5/mpconfigboard.h | 3 +++
 ports/stm/peripherals/stm32l4/clocks.c   | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm/boards/swan_r5/mpconfigboard.h b/ports/stm/boards/swan_r5/mpconfigboard.h
index 94cc58ff9d..8c6949201e 100644
--- a/ports/stm/boards/swan_r5/mpconfigboard.h
+++ b/ports/stm/boards/swan_r5/mpconfigboard.h
@@ -45,6 +45,9 @@
 #define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
 #define BOARD_HAS_HIGH_SPEED_CRYSTAL (0)
 
+// Increase drive strength of 32kHz external crystal, in line with calculations specified in ST AN2867 sections 3.3, 3.4, and STM32L4 datasheet DS12023 Table 58. LSE oscillator characteristics.
+// The drive strength RCC_LSEDRIVE_LOW is marginal for the 32kHz crystal oscillator stability, and RCC_LSEDRIVE_MEDIUMLOW meets the calculated drive strength with a small margin for parasitic capacitance.
+#define BOARD_LSE_DRIVE_LEVEL RCC_LSEDRIVE_MEDIUMLOW
 
 // Bootloader only
 #ifdef UF2_BOOTLOADER_ENABLED
diff --git a/ports/stm/peripherals/stm32l4/clocks.c b/ports/stm/peripherals/stm32l4/clocks.c
index 4419f751d4..5724a74ae2 100644
--- a/ports/stm/peripherals/stm32l4/clocks.c
+++ b/ports/stm/peripherals/stm32l4/clocks.c
@@ -39,6 +39,8 @@
 #error HSE support needs to be added for the L4 family.
 #elif !BOARD_HAS_LOW_SPEED_CRYSTAL
   #error LSE clock source required
+#elif !defined(BOARD_LSE_DRIVE_LEVEL)
+  #error BOARD_LSE_DRIVE_LEVEL is not defined for this board. The board should define the drive strength of 32kHz external crystal in line with calculations specified in ST AN2867 sections 3.3, 3.4, and STM32L4 datasheet DS12023 Table 58, LSE oscillator characteristics.
 #endif
 
 void Error_Handler(void) {
@@ -57,7 +59,7 @@ void stm32_peripherals_clocks_init(void) {
 
     // Configure LSE Drive
     HAL_PWR_EnableBkUpAccess();
-    __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+    __HAL_RCC_LSEDRIVE_CONFIG(BOARD_LSE_DRIVE_LEVEL);
     __HAL_RCC_PWR_CLK_ENABLE();
 
     /** Configure the main internal regulator output voltage

From bb4ebf7c17cda2e9c900c95c8b65a8bd472dd502 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Mon, 27 Feb 2023 20:08:35 +0000
Subject: [PATCH 1967/2403] Translated using Weblate (German)

Currently translated at 95.6% (958 of 1002 strings)

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

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 33d0ed76dc..7060946cf8 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-02-20 03:39+0000\n"
+"PO-Revision-Date: 2023-03-01 17:39+0000\n"
 "Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.16-dev\n"
+"X-Generator: Weblate 4.16\n"
 
 #: main.c
 msgid ""
@@ -38,6 +38,10 @@ msgid ""
 "\n"
 "\r"
 msgstr ""
+"\n"
+"Ungültige CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""

From 175049841dffb69abf555fddba717d5c638344f3 Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Tue, 28 Feb 2023 17:19:43 +0000
Subject: [PATCH 1968/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index efaa14a1ac..eebc16bc6c 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: 2023-01-25 03:47+0000\n"
+"PO-Revision-Date: 2023-03-01 17:39+0000\n"
 "Last-Translator: hexthat \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.16-dev\n"
+"X-Generator: Weblate 4.16\n"
 
 #: main.c
 msgid ""
@@ -41,6 +41,10 @@ msgid ""
 "\n"
 "\r"
 msgstr ""
+"\n"
+"wú xiào CIRCUITPY_PYSTACK_SIZE\n"
+"\n"
+"\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -48,18 +52,25 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"qǐng zài https://github.com/adafruit/circuitpython/issues tí jiāo nín de "
+"chéng xù wèn tí."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"àn chóng zhì tuì chū ān quán mó shì.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"nín chǔ yú ān quán mó shì, yīn wéi:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -198,7 +209,7 @@ msgstr "%q bìxū >= %d"
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
@@ -609,7 +620,7 @@ msgstr "wèi tú dàxiǎo hé měi gè zhí de wèi shù bìxū pǐpèi"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "yǐn dǎo shè bèi bì xū shì dì yī gè (jiē kǒu #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -946,7 +957,7 @@ msgstr "Zhèngzé biǎodá shì cuòwù"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "safemode.py cuò wù."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -1022,7 +1033,7 @@ msgstr "Wúfǎ xiě rù nèibù shǎncún."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "yìng jiàn jiǎn cè dào gù zhàng."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1115,12 +1126,12 @@ msgstr "Shǐyòng de yìngjiàn, qǐng chángshì qítā yǐn jiǎo"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "VM wèi yùn xíng shí de duī fēn pèi."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
-msgstr ""
+msgstr "duī yǐ sǔn huài, yīn wéi duī zhàn tài xiǎo. zēng jiā duī zhàn dà xiǎo."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1245,7 +1256,7 @@ msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "zhōng duàn cuò wù."
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -2044,7 +2055,7 @@ msgstr "Wēndù dòu qǔ chāoshí"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr ""
+msgstr "`microcontroller` mó kuài yòng yú qǐ dòng dào ān quán mó shì."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2056,7 +2067,7 @@ msgstr "Rgb_pins de chángdù bìxū wèi 6,12,18,24 huò 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr ""
+msgstr "lì liàng xià jiàng le. què bǎo nín tí gòng zú gòu de diàn lì."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2076,7 +2087,7 @@ msgstr "Yàngběn de qiānmíng yǔ hǔn yīn qì de qiānmíng bù pǐpèi"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "dì sān fāng gù jiàn zhì mìng cuò wù."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2158,7 +2169,7 @@ msgstr "UART chūshǐhuà"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "UART wài shè shǐ yòng zhōng"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
@@ -2209,12 +2220,12 @@ msgstr "Wúfǎ fēnpèi huǎnchōng qū yòng yú qiānmíng zhuǎnhuàn"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "wú fǎ fēn pèi duī."
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "wú fǎ pèi zhì ADC DMA kòng zhì qì, cuò wù dài mǎ:%d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2237,7 +2248,7 @@ msgstr "Wúfǎ chūshǐhuà jiěxī qì"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "wú fǎ chū shǐ huà ADC DMA kòng zhì qì, cuò wù dài mǎ:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2246,7 +2257,7 @@ msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "wú fǎ qǐ dòng ADC DMA kòng zhì qì, cuò wù dài mǎ:%d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
@@ -2444,52 +2455,52 @@ msgstr "Tèzhēng bù zhīchí xiě rù"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le liǎng gè àn niǔ."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le àn niǔ A."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le qǐ dòng àn niǔ"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le GPIO0 àn niǔ."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le lù zhì àn niǔ."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le SW38 àn niǔ."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le yīn liàng àn niǔ."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le zhōng yāng àn niǔ."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "nín zài qǐ dòng shí àn xià le zuǒ àn niǔ."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "nín zài qǐ dòng guò chéng zhōng àn xià le chóng zhì àn niǔ."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[yīn cháng dù ér jié duàn]"
 
 #: py/objtype.c
 msgid "__init__() should return None"
@@ -2562,7 +2573,7 @@ msgstr "shùzǔ yǒu tài duō wéidù"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "zhèn liè tài dà"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -3048,6 +3059,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera.Camera xū yào pèi zhì bǎo liú de PSRAM. yǒu guān shuō míng, qǐng "
+"cān yuè wén dàng."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3818,7 +3831,7 @@ msgstr "jǐn zhī chí dān shēng dào"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "zhǐ néng lián jiē ndarray (shù zì)"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"

From ac0bf1049a9413fd0d85389fc8297c31c381a3d1 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 1 Mar 2023 17:50:02 -0600
Subject: [PATCH 1969/2403] document going directly to display with ondiskgif

---
 shared-bindings/gifio/OnDiskGif.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index a1eb6051eb..b4a2e04cdb 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -36,6 +36,8 @@
 //| class OnDiskGif:
 //|     """Loads one frame of a GIF into memory at a time.
 //|
+//|     The code can be used in cooperation with displayio but this mode is relatively slow:
+//|
 //|     .. code-block:: Python
 //|
 //|       import board
@@ -69,6 +71,32 @@
 //|           # minus the overhead measured to advance between frames.
 //|           time.sleep(max(0, next_delay - overhead))
 //|           next_delay = odg.next_frame()
+//|
+//|     The displayio Group and TileGrid layers can be bypassed and the image can
+//|     be directly blitted to the full screen. This can give a speed-up of ~4x to
+//|     ~6x depending on the GIF and display. This requires an LCD that uses
+//|     standard codes to set the update area, and which accepts RGB565_SWAPPED
+//|     pixel data directly:
+//|
+//|     .. code-block:: Python
+//|       # Initial set-up the same as above
+//|
+//|       # Take over display to drive directly
+//|       display.auto_refresh = False
+//|       bus = display.bus
+//|
+//|       # Display repeatedly & directly.
+//|       while True:
+//|           # Sleep for the frame delay specified by the GIF,
+//|           # minus the overhead measured to advance between frames.
+//|           time.sleep(max(0, next_delay - overhead))
+//|           next_delay = odg.next_frame()
+//|
+//|           display_bus.send(42, struct.pack(">hh", 0, odg.bitmap.width - 1))
+//|           display_bus.send(43, struct.pack(">hh", 0, odg.bitmap.height - 1))
+//|           display_bus.send(44, d.bitmap)
+//|
+//|           d.next_frame()
 //|     """
 //|
 //|     def __init__(self, file: str) -> None:

From 6eae40338cfe2aaf06fcdb4b686eb249f67f7fc8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 1 Mar 2023 17:56:18 -0600
Subject: [PATCH 1970/2403] fix problems spotted very quickly by gamblor :)

---
 shared-bindings/gifio/OnDiskGif.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index b4a2e04cdb..24412c7cfe 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -83,7 +83,7 @@
 //|
 //|       # Take over display to drive directly
 //|       display.auto_refresh = False
-//|       bus = display.bus
+//|       display_bus = display.bus
 //|
 //|       # Display repeatedly & directly.
 //|       while True:
@@ -95,8 +95,6 @@
 //|           display_bus.send(42, struct.pack(">hh", 0, odg.bitmap.width - 1))
 //|           display_bus.send(43, struct.pack(">hh", 0, odg.bitmap.height - 1))
 //|           display_bus.send(44, d.bitmap)
-//|
-//|           d.next_frame()
 //|     """
 //|
 //|     def __init__(self, file: str) -> None:

From bac1a9625ab9d65ef671b36a4190474e002285f1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 2 Mar 2023 16:47:07 -0500
Subject: [PATCH 1971/2403] OnDiskGif delay was being chopped to 8 bits

---
 shared-bindings/gifio/OnDiskGif.h | 2 +-
 shared-module/gifio/OnDiskGif.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
index cdd884ec1d..4ecbfca495 100644
--- a/shared-bindings/gifio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -40,7 +40,7 @@ uint32_t common_hal_gifio_ondiskgif_get_pixel(gifio_ondiskgif_t *bitmap,
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self);
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self);
 uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self);
-uint8_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty);
+uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty);
 int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_frame_count(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_min_delay(gifio_ondiskgif_t *self);
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index 05de2d59ff..234b7f8198 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -185,7 +185,7 @@ int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) {
     return self->max_delay;
 }
 
-uint8_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) {
+uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) {
     int nextDelay = 0;
     int result = GIF_playFrame(&self->gif, &nextDelay, self->bitmap);
 

From 6987d3d752dddf14bdc0bf499548eaeaead91f67 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Thu, 2 Mar 2023 21:55:21 -0600
Subject: [PATCH 1972/2403] Fix for long length writes

---
 ports/atmel-samd/common-hal/busio/SPI.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c
index 3bb0cabf9e..720f487bb1 100644
--- a/ports/atmel-samd/common-hal/busio/SPI.c
+++ b/ports/atmel-samd/common-hal/busio/SPI.c
@@ -268,7 +268,14 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
     }
     int32_t status;
     if (len >= 16) {
-        status = sercom_dma_write(self->spi_desc.dev.prvt, data, len);
+        size_t bytes_remaining = len;
+
+        // Maximum DMA transfer is 65535
+        while (bytes_remaining > 0) {
+            size_t to_send = (bytes_remaining > 65535) ? 65535 : bytes_remaining;
+            status = sercom_dma_write(self->spi_desc.dev.prvt, data + (len - bytes_remaining), to_send);
+            bytes_remaining -= to_send;
+        }
     } else {
         struct io_descriptor *spi_io;
         spi_m_sync_get_io_descriptor(&self->spi_desc, &spi_io);

From b2a08e2ccefe1dbfd2bfebeabca6e0ca96ea31a6 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 3 Mar 2023 10:05:28 -0600
Subject: [PATCH 1973/2403] use right DBL_TAP_REG when resetting to bootloader

This helps my development scripts work better, and probably also fixes
a problem switching from the circuitpython environment back to arduino.
(specifically, the "1200 baud" serial trick was not rebooting into
the bootloader but was just resetting)
---
 ports/mimxrt10xx/common-hal/microcontroller/__init__.c | 2 --
 ports/mimxrt10xx/reset.h                               | 1 +
 ports/mimxrt10xx/supervisor/port.c                     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index ded46b648e..5388f404de 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -39,8 +39,6 @@
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/translate/translate.h"
 
-#define DBL_TAP_REG              SNVS->LPGPR[3]
-
 void common_hal_mcu_delay_us(uint32_t delay) {
     mp_hal_delay_us(delay);
 }
diff --git a/ports/mimxrt10xx/reset.h b/ports/mimxrt10xx/reset.h
index ea56df02a1..0d458a907d 100644
--- a/ports/mimxrt10xx/reset.h
+++ b/ports/mimxrt10xx/reset.h
@@ -33,6 +33,7 @@
 #include "py/mpconfig.h"
 
 // Copied from inc/uf2.h in https://github.com/Microsoft/uf2-samd21
+#define DBL_TAP_REG              SNVS->LPGPR[3]
 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 2ac7995943..911f0843b6 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -301,7 +301,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
-    SNVS->LPGPR[0] = DBL_TAP_MAGIC;
+    DBL_TAP_REG = DBL_TAP_MAGIC;
     reset();
 }
 

From 055c9bfb401e20f3e7c1384ca60fd346494d9463 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 4 Mar 2023 10:32:19 +0530
Subject: [PATCH 1974/2403] split boards dynamically

---
 .github/actions/deps/external/action.yml      | 55 +++----------
 .github/actions/deps/ports/action.yml         | 12 ++-
 .../actions/deps/ports/broadcom/action.yml    | 21 +++++
 .github/actions/deps/ports/litex/action.yml   | 10 +++
 .github/workflows/build-boards-custom.yml     | 12 +--
 .github/workflows/build-boards.yml            |  6 +-
 .github/workflows/build.yml                   | 73 ++++-------------
 tools/ci_changes_per_commit.py                | 15 ++--
 tools/ci_fetch_deps.py                        |  4 +-
 tools/ci_set_matrix.py                        | 78 ++++++++-----------
 10 files changed, 112 insertions(+), 174 deletions(-)
 create mode 100644 .github/actions/deps/ports/broadcom/action.yml
 create mode 100644 .github/actions/deps/ports/litex/action.yml

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 5db7c04686..9e32e733a2 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -9,54 +9,31 @@ inputs:
     - cache
     - restore
 
-  platform:
+  port:
     required: false
     default: none
-    type: choice
-    options:
-    - arm
-    - aarch
-    - esp
-    - riscv
-    - none
+    type: string
 
 runs:
   using: composite
   steps:
-    # aarch
-    - name: Get aarch toolchain
-      if: inputs.platform == 'aarch'
-      run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo apt-get install -y mtools
-      shell: bash
-    - name: Install mkfs.fat
-      if: inputs.platform == 'aarch'
-      run: |
-        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
-        tar -xaf dosfstools-4.2.tar.gz
-        cd dosfstools-4.2
-        ./configure
-        make -j 2
-        cd src
-        echo >> $GITHUB_PATH $(pwd)
-      shell: bash
-
     # arm
     - name: Get arm toolchain
-      if: inputs.platform == 'aarch' || inputs.platform == 'arm'
+      if: >-
+        inputs.port != 'none' &&
+        inputs.port != 'litex' &&
+        inputs.port != 'espressif'
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
 
-    # esp
-    - name: Get esp toolchain
-      if: inputs.platform == 'esp'
+    # espressif
+    - name: Get espressif toolchain
+      if: inputs.port == 'espressif'
       run: sudo apt-get install -y ninja-build
       shell: bash
     - name: Install IDF tools
-      if: inputs.platform == 'esp'
+      if: inputs.port == 'espressif'
       run: |
         echo "Installing ESP-IDF tools"
         $IDF_PATH/tools/idf_tools.py --non-interactive install required
@@ -66,24 +43,16 @@ runs:
         rm -rf $IDF_TOOLS_PATH/dist
       shell: bash
     - name: Set environment
-      if: inputs.platform == 'esp'
+      if: inputs.port == 'espressif'
       run: |
         source $IDF_PATH/export.sh
         echo >> $GITHUB_ENV "IDF_PYTHON_ENV_PATH=$IDF_PYTHON_ENV_PATH"
         echo >> $GITHUB_PATH "$PATH"
       shell: bash
 
-    # riscv
-    - name: Get riscv toolchain
-      if: inputs.platform == 'riscv'
-      run: |
-        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-      shell: bash
-
     # common
     - name: Cache python dependencies
-      if: inputs.platform != 'esp'
+      if: inputs.port != 'espressif'
       uses: ./.github/actions/deps/python
       with:
         action: ${{ inputs.action }}
diff --git a/.github/actions/deps/ports/action.yml b/.github/actions/deps/ports/action.yml
index a8c4f81a19..8125de2acc 100644
--- a/.github/actions/deps/ports/action.yml
+++ b/.github/actions/deps/ports/action.yml
@@ -19,10 +19,18 @@ runs:
         if [ -z $PORT ]; then (exit 1); else echo >> $GITHUB_OUTPUT "port=$PORT"; fi
       shell: bash
 
-    - name: Set up espressif port
+    - name: Set up broadcom
+      if: steps.board-to-port.outputs.port == 'broadcom'
+      uses: ./.github/actions/deps/ports/broadcom
+
+    - name: Set up espressif
       if: steps.board-to-port.outputs.port == 'espressif'
       uses: ./.github/actions/deps/ports/espressif
 
-    - name: Set up nrf port
+    - name: Set up litex
+      if: steps.board-to-port.outputs.port == 'litex'
+      uses: ./.github/actions/deps/ports/litex
+
+    - name: Set up nrf
       if: steps.board-to-port.outputs.port == 'nrf'
       uses: ./.github/actions/deps/ports/nrf
diff --git a/.github/actions/deps/ports/broadcom/action.yml b/.github/actions/deps/ports/broadcom/action.yml
new file mode 100644
index 0000000000..20d6641603
--- /dev/null
+++ b/.github/actions/deps/ports/broadcom/action.yml
@@ -0,0 +1,21 @@
+name: Fetch broadcom port deps
+
+runs:
+  using: composite
+  steps:
+    - name: Get broadcom toolchain
+      run: |
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-broadcom64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-broadcom64-none-elf.tar.xz
+        sudo apt-get install -y mtools
+      shell: bash
+    - name: Install mkfs.fat
+      run: |
+        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+        tar -xaf dosfstools-4.2.tar.gz
+        cd dosfstools-4.2
+        ./configure
+        make -j 2
+        cd src
+        echo >> $GITHUB_PATH $(pwd)
+      shell: bash
diff --git a/.github/actions/deps/ports/litex/action.yml b/.github/actions/deps/ports/litex/action.yml
new file mode 100644
index 0000000000..a89a222505
--- /dev/null
+++ b/.github/actions/deps/ports/litex/action.yml
@@ -0,0 +1,10 @@
+name: Fetch litex port deps
+
+runs:
+  using: composite
+  steps:
+    - name: Get litex toolchain
+      run: |
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+      shell: bash
diff --git a/.github/workflows/build-boards-custom.yml b/.github/workflows/build-boards-custom.yml
index df8197d9ae..aa8044b0d2 100644
--- a/.github/workflows/build-boards-custom.yml
+++ b/.github/workflows/build-boards-custom.yml
@@ -32,16 +32,6 @@ run-name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ in
 jobs:
   build:
     runs-on: ubuntu-22.04
-    env:
-      PLATFORM_atmel-samd: arm
-      PLATFORM_broadcom: aarch
-      PLATFORM_cxd56: arm
-      PLATFORM_espressif: esp
-      PLATFORM_litex: riscv
-      PLATFORM_mimxrt10xx: arm
-      PLATFORM_nrf: arm
-      PLATFORM_raspberrypi: arm
-      PLATFORM_stm: arm
     steps:
     - name: Set up repository
       run: |
@@ -70,7 +60,7 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
-        platform: ${{ env[format('PLATFORM_{0}', steps.set-up-port.outputs.port)] }}
+        port: ${{ steps.set-up-port.outputs.port }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index b975c131ee..180bae8341 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -3,9 +3,6 @@ name: Build boards
 on:
   workflow_call:
     inputs:
-      platform:
-        required: true
-        type: string
       boards:
         required: true
         type: string
@@ -38,6 +35,7 @@ jobs:
       with:
         python-version: 3.x
     - name: Set up port
+      id: set-up-port
       uses: ./.github/actions/deps/ports
       with:
         board: ${{ matrix.board }}
@@ -47,7 +45,7 @@ jobs:
     - name: Set up external
       uses: ./.github/actions/deps/external
       with:
-        platform: ${{ inputs.platform }}
+        port: ${{ steps.set-up-port.outputs.port }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 19976f7c3d..a481dda4d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,14 +20,9 @@ jobs:
   scheduler:
     runs-on: ubuntu-20.04
     outputs:
-      build-doc: ${{ steps.set-matrix.outputs.build-doc }}
-      build-boards: ${{ steps.set-matrix.outputs.build-boards }}
-      build-windows: ${{ steps.set-matrix.outputs.build-windows }}
-      boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
-      boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
-      boards-atmel: ${{ steps.set-matrix.outputs.boards-atmel }}
-      boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
-      boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
+      docs: ${{ steps.set-matrix.outputs.docs }}
+      boards: ${{ steps.set-matrix.outputs.boards }}
+      windows: ${{ steps.set-matrix.outputs.windows }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
     - name: Dump GitHub context
@@ -99,7 +94,7 @@ jobs:
 
   mpy-cross:
     needs: scheduler
-    if: needs.scheduler.outputs.build-boards == 'True'
+    if: needs.scheduler.outputs.boards != '{}'
     uses: ./.github/workflows/build-mpy-cross.yml
     secrets: inherit
     with:
@@ -108,7 +103,7 @@ jobs:
   mpy-cross-mac:
     runs-on: macos-11
     needs: scheduler
-    if: needs.scheduler.outputs.build-boards == 'True'
+    if: needs.scheduler.outputs.boards != '{}'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
@@ -160,10 +155,10 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
-  build-doc:
+  docs:
     runs-on: ubuntu-22.04
     needs: scheduler
-    if: needs.scheduler.outputs.build-doc == 'True'
+    if: needs.scheduler.outputs.docs == 'True'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
@@ -218,10 +213,10 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
-  build-windows:
+  windows:
     runs-on: windows-2022
     needs: scheduler
-    if: needs.scheduler.outputs.build-windows == 'True'
+    if: needs.scheduler.outputs.windows == 'True'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     defaults:
@@ -286,52 +281,14 @@ jobs:
     # ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
     # https://github.com/espressif/esp-idf/issues/7062
 
-  aarch:
+  boards:
     needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-aarch != '[]' }}
+    if: needs.scheduler.outputs.boards != '{}'
     uses: ./.github/workflows/build-boards.yml
     secrets: inherit
+    strategy:
+      matrix:
+        port: ${{ fromJSON(needs.scheduler.outputs.boards).ports }}
     with:
-      platform: aarch
-      boards: ${{ needs.scheduler.outputs.boards-aarch }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  arm:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-arm != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: arm
-      boards: ${{ needs.scheduler.outputs.boards-arm }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  atmel:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-atmel != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: arm
-      boards: ${{ needs.scheduler.outputs.boards-atmel }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  esp:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-esp != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: esp
-      boards: ${{ needs.scheduler.outputs.boards-esp }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  riscv:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-riscv != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: riscv
-      boards: ${{ needs.scheduler.outputs.boards-riscv }}
+      boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.boards)[matrix.port]) }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index d5f621d263..e4249901af 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -167,8 +167,8 @@ def get_commit_depth_and_check_suite(query_commits):
 
 
 def get_bad_check_runs(query_check_runs):
+    bad_runs = {}
     more_pages = True
-    bad_runs_by_matrix = {}
 
     run_types = ["failed", "incomplete"]
 
@@ -184,13 +184,12 @@ def get_bad_check_runs(query_check_runs):
 
             for check_run in check_runs[run_type]["nodes"]:
                 name = check_run["name"]
-                res_matrix = regex_matrix.search(name)
-                if res_matrix:
-                    matrix = name.split(" /", 1)[0]
-                    matrix_job = name.split(" (", 1)[1][:-1]
-                    bad_runs_by_matrix.setdefault(matrix, []).append(matrix_job)
+                if name.startswith("boards") or regex_matrix.search(name):
+                    matrix = name.split(" ", 1)[0]
+                    matrix_job = name.rsplit(" (", 1)[1][:-1]
+                    bad_runs.setdefault(matrix, []).append(matrix_job)
                 elif name != "scheduler":
-                    bad_runs_by_matrix[name] = True
+                    bad_runs[name] = True
                 else:
                     return {}
 
@@ -200,7 +199,7 @@ def get_bad_check_runs(query_check_runs):
                 query_check_runs.variables["include" + run_type_camel] = True
                 more_pages = True
 
-    return bad_runs_by_matrix
+    return bad_runs
 
 
 def set_commit(commit):
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 3b495f8758..1b292b9d73 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -78,13 +78,13 @@ def main():
         submodules = ["extmod/ulab", "lib/", "tools/"]
     elif TARGET == "tests":
         submodules = ["extmod/ulab", "lib/", "tools/"]
-    elif TARGET == "build-doc":
+    elif TARGET == "docs":
         # used in .readthedocs.yml to generate RTD
         submodules = ["extmod/ulab"]
         submodules_tags = ["frozen/"]
     elif TARGET == "mpy-cross" or TARGET == "mpy-cross-mac":
         submodules = ["tools/"]  # for huffman
-    elif TARGET == "build-windows":
+    elif TARGET == "windows":
         # This builds one board from a number of ports so fill out a bunch of submodules
         submodules = ["extmod/ulab", "lib/", "tools/", "ports/", "data/nvm.toml"]
     elif TARGET == "website":
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 02a1cbee73..4a4d5e9b51 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -42,18 +42,6 @@ from shared_bindings_matrix import (
     all_ports_all_boards,
 )
 
-PORT_TO_JOB = {
-    "atmel-samd": "atmel",
-    "broadcom": "aarch",
-    "cxd56": "arm",
-    "espressif": "esp",
-    "litex": "riscv",
-    "mimxrt10xx": "arm",
-    "nrf": "arm",
-    "raspberrypi": "arm",
-    "stm": "arm",
-}
-
 IGNORE = [
     "tools/ci_set_matrix.py",
     "tools/ci_check_duplicate_usb_vid_pid.py",
@@ -109,7 +97,7 @@ def set_output(name: str, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def set_boards_to_build(build_all: bool):
+def set_boards(build_all: bool):
     if last_failed_jobs.get("mpy-cross") or last_failed_jobs.get("tests"):
         build_all = True
 
@@ -224,18 +212,15 @@ def set_boards_to_build(build_all: bool):
             boards_to_build = all_board_ids
             break
 
-    # Split boards by job
-    job_to_boards = {"aarch": [], "arm": [], "atmel": [], "esp": [], "riscv": []}
-
     # Append previously failed boards
-    for job in job_to_boards:
-        if job in last_failed_jobs:
-            for board in last_failed_jobs[job]:
-                boards_to_build.add(board)
+    last_failed_boards = last_failed_jobs.get("boards")
+    if last_failed_boards:
+        boards_to_build.update(last_failed_boards)
 
-    build_boards = bool(boards_to_build)
-    print("Building boards:", build_boards)
-    set_output("build-boards", build_boards)
+    print("Building boards:", bool(boards_to_build))
+
+    # Split boards by port
+    port_to_boards_to_build = {}
 
     # Append boards according to job
     for board in sorted(boards_to_build):
@@ -244,17 +229,19 @@ def set_boards_to_build(build_all: bool):
         # if this happens it's not in `board_to_port`.
         if not port:
             continue
-        job_to_boards[PORT_TO_JOB[port]].append(board)
+        port_to_boards_to_build.setdefault(port, []).append(board)
         print(" ", board)
 
-    # Set the step outputs for each job
-    for job in job_to_boards:
-        set_output(f"boards-{job}", json.dumps(job_to_boards[job]))
+    if port_to_boards_to_build:
+        port_to_boards_to_build["ports"] = sorted(list(port_to_boards_to_build.keys()))
+
+    # Set the step outputs
+    set_output("boards", json.dumps(port_to_boards_to_build))
 
 
-def set_docs_to_build(build_doc: bool):
+def set_docs(build_doc: bool):
     if not build_doc:
-        if last_failed_jobs.get("build-doc"):
+        if last_failed_jobs.get("docs"):
             build_doc = True
         else:
             doc_pattern = re.compile(PATTERN_DOCS)
@@ -277,12 +264,12 @@ def set_docs_to_build(build_doc: bool):
 
     # Set the step outputs
     print("Building docs:", build_doc)
-    set_output("build-doc", build_doc)
+    set_output("docs", build_doc)
 
 
-def set_windows_to_build(build_windows):
+def set_windows(build_windows: bool):
     if not build_windows:
-        if last_failed_jobs.get("build-windows"):
+        if last_failed_jobs.get("windows"):
             build_windows = True
         else:
             for file in changed_files:
@@ -296,23 +283,22 @@ def set_windows_to_build(build_windows):
 
     # Set the step outputs
     print("Building windows:", build_windows)
-    set_output("build-windows", build_windows)
-
-
-def check_changed_files():
-    if not changed_files:
-        print("Building all docs/boards")
-        return True
-    else:
-        print("Adding docs/boards to build based on changed files")
-        return False
+    set_output("windows", build_windows)
 
 
 def main():
-    build_all = check_changed_files()
-    set_docs_to_build(build_all)
-    set_windows_to_build(build_all)
-    set_boards_to_build(build_all)
+    # Build all if no changed files
+    build_all = not changed_files
+    print(
+        "Building all docs/boards"
+        if build_all
+        else "Adding docs/boards to build based on changed files"
+    )
+
+    # Set jobs
+    set_docs(build_all)
+    set_windows(build_all)
+    set_boards(build_all)
 
 
 if __name__ == "__main__":

From d35297ceae8558d77e841a502ae5ecabaf936891 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 4 Mar 2023 12:11:30 +0530
Subject: [PATCH 1975/2403] refactor workflow names

---
 .github/workflows/build.yml                                 | 6 +++---
 .../{create_website_pr.yml => create-website-pr.yml}        | 0
 .../{build-boards-custom.yml => custom-board-build.yml}     | 0
 .github/workflows/{notify.yml => notify-on-issue-label.yml} | 0
 .github/workflows/{build-boards.yml => re-build-boards.yml} | 2 +-
 .../{build-mpy-cross.yml => re-build-mpy-cross.yml}         | 2 +-
 .github/workflows/{run-tests.yml => re-run-tests.yml}       | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename .github/workflows/{create_website_pr.yml => create-website-pr.yml} (100%)
 rename .github/workflows/{build-boards-custom.yml => custom-board-build.yml} (100%)
 rename .github/workflows/{notify.yml => notify-on-issue-label.yml} (100%)
 rename .github/workflows/{build-boards.yml => re-build-boards.yml} (98%)
 rename .github/workflows/{build-mpy-cross.yml => re-build-mpy-cross.yml} (98%)
 rename .github/workflows/{run-tests.yml => re-run-tests.yml} (98%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a481dda4d9..98bbb75b2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,14 +88,14 @@ jobs:
 
   tests:
     needs: scheduler
-    uses: ./.github/workflows/run-tests.yml
+    uses: ./.github/workflows/re-run-tests.yml
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
   mpy-cross:
     needs: scheduler
     if: needs.scheduler.outputs.boards != '{}'
-    uses: ./.github/workflows/build-mpy-cross.yml
+    uses: ./.github/workflows/re-build-mpy-cross.yml
     secrets: inherit
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
@@ -284,7 +284,7 @@ jobs:
   boards:
     needs: [scheduler, mpy-cross, tests]
     if: needs.scheduler.outputs.boards != '{}'
-    uses: ./.github/workflows/build-boards.yml
+    uses: ./.github/workflows/re-build-boards.yml
     secrets: inherit
     strategy:
       matrix:
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create-website-pr.yml
similarity index 100%
rename from .github/workflows/create_website_pr.yml
rename to .github/workflows/create-website-pr.yml
diff --git a/.github/workflows/build-boards-custom.yml b/.github/workflows/custom-board-build.yml
similarity index 100%
rename from .github/workflows/build-boards-custom.yml
rename to .github/workflows/custom-board-build.yml
diff --git a/.github/workflows/notify.yml b/.github/workflows/notify-on-issue-label.yml
similarity index 100%
rename from .github/workflows/notify.yml
rename to .github/workflows/notify-on-issue-label.yml
diff --git a/.github/workflows/build-boards.yml b/.github/workflows/re-build-boards.yml
similarity index 98%
rename from .github/workflows/build-boards.yml
rename to .github/workflows/re-build-boards.yml
index 180bae8341..57ab28bdc4 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/re-build-boards.yml
@@ -1,4 +1,4 @@
-name: Build boards
+name: Reusable | Build boards
 
 on:
   workflow_call:
diff --git a/.github/workflows/build-mpy-cross.yml b/.github/workflows/re-build-mpy-cross.yml
similarity index 98%
rename from .github/workflows/build-mpy-cross.yml
rename to .github/workflows/re-build-mpy-cross.yml
index 10c4498bc8..dc08bf80dc 100644
--- a/.github/workflows/build-mpy-cross.yml
+++ b/.github/workflows/re-build-mpy-cross.yml
@@ -1,4 +1,4 @@
-name: Build mpy-cross
+name: Reusable | Build mpy-cross
 
 on:
   workflow_call:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/re-run-tests.yml
similarity index 98%
rename from .github/workflows/run-tests.yml
rename to .github/workflows/re-run-tests.yml
index 12e8d2ef74..daa347431a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/re-run-tests.yml
@@ -1,4 +1,4 @@
-name: Run tests
+name: Reusable | Run tests
 
 on:
   workflow_call:

From b17364a447c5592afbbb2305bd1342f436f8a275 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 4 Mar 2023 14:07:38 +0530
Subject: [PATCH 1976/2403] conditionally build all languages

---
 .../actions/deps/ports/broadcom/action.yml    |  4 ++--
 .github/workflows/build.yml                   |  3 ++-
 .github/workflows/re-run-tests.yml            |  4 ++--
 ports/atmel-samd/Makefile                     |  2 +-
 ports/espressif/Makefile                      |  2 +-
 ports/espressif/tools/build_memory_info.py    |  9 +++++---
 ports/litex/Makefile                          |  2 +-
 ports/nrf/Makefile                            |  2 +-
 ports/raspberrypi/Makefile                    |  2 +-
 ports/stm/Makefile                            |  2 +-
 tools/build_memory_info.py                    | 11 +++++++--
 tools/build_release_files.py                  | 23 ++++++++++++++++++-
 12 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/.github/actions/deps/ports/broadcom/action.yml b/.github/actions/deps/ports/broadcom/action.yml
index 20d6641603..bd76c78262 100644
--- a/.github/actions/deps/ports/broadcom/action.yml
+++ b/.github/actions/deps/ports/broadcom/action.yml
@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Get broadcom toolchain
       run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-broadcom64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-broadcom64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get install -y mtools
       shell: bash
     - name: Install mkfs.fat
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98bbb75b2e..d67c4cc2d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   scheduler:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       docs: ${{ steps.set-matrix.outputs.docs }}
       boards: ${{ steps.set-matrix.outputs.boards }}
@@ -287,6 +287,7 @@ jobs:
     uses: ./.github/workflows/re-build-boards.yml
     secrets: inherit
     strategy:
+      fail-fast: false
       matrix:
         port: ${{ fromJSON(needs.scheduler.outputs.boards).ports }}
     with:
diff --git a/.github/workflows/re-run-tests.yml b/.github/workflows/re-run-tests.yml
index daa347431a..f986abcd0b 100644
--- a/.github/workflows/re-run-tests.yml
+++ b/.github/workflows/re-run-tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -31,7 +31,7 @@ jobs:
     - name: Set up python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.x
+        python-version: 3.8
     - name: Set up submodules
       uses: ./.github/actions/deps/submodules
       with:
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 68beeaf129..0ac326d3cc 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -367,7 +367,7 @@ $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 1c79691b33..ea70f320cb 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -434,7 +434,7 @@ $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp
 $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py
 	$(STEPECHO) "Create $@"
 	$(Q)esptool.py --chip $(IDF_TARGET) elf2image $(FLASH_FLAGS) --elf-sha256-offset 0xb0 -o $@ $^
-	$(Q)$(PYTHON) tools/build_memory_info.py $< $(BUILD)/esp-idf/sdkconfig $@
+	$(Q)$(PYTHON) tools/build_memory_info.py $< $(BUILD)/esp-idf/sdkconfig $@ $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/circuitpython-firmware.bin | esp-idf-stamp
 	$(Q)$(PYTHON) ../../tools/join_bins.py $@ $(BOOTLOADER_OFFSET) $(BUILD)/esp-idf/bootloader/bootloader.bin $(PARTITION_TABLE_OFFSET) $(BUILD)/esp-idf/partition_table/partition-table.bin $(FIRMWARE_OFFSET) $(BUILD)/circuitpython-firmware.bin
diff --git a/ports/espressif/tools/build_memory_info.py b/ports/espressif/tools/build_memory_info.py
index df9d6a801e..a11bef82bc 100644
--- a/ports/espressif/tools/build_memory_info.py
+++ b/ports/espressif/tools/build_memory_info.py
@@ -6,13 +6,12 @@
 # SPDX-License-Identifier: MIT
 
 import csv
+import json
 import os
-import re
 import sys
 
 from elftools.elf.elffile import ELFFile
 
-print()
 
 internal_memory = {
     "esp32": [
@@ -117,8 +116,12 @@ with open(sys.argv[1], "rb") as stream:
 
 # This file is the bin
 used_flash = os.stat(sys.argv[3]).st_size
-
 free_flash = firmware_region - used_flash
+
+with open(f"{sys.argv[4]}/firmware.size.json", "w") as f:
+    json.dump({"used_flash": used_flash, "firmware_region": firmware_region}, f)
+
+print()
 print(
     "{:7} bytes used, {:7} bytes free in flash firmware space out of {} bytes ({}kB).".format(
         used_flash, free_flash, firmware_region, firmware_region / 1024
diff --git a/ports/litex/Makefile b/ports/litex/Makefile
index efe99dc5b4..5556dea11d 100644
--- a/ports/litex/Makefile
+++ b/ports/litex/Makefile
@@ -136,7 +136,7 @@ all: $(BUILD)/firmware.bin $(BUILD)/firmware.dfu
 $(BUILD)/firmware.elf: $(OBJ)
 	$(STEPECHO) "LINK $@"
 	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE)
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 972b549f61..2267a582a4 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -212,7 +212,7 @@ $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index ee0356b852..d440031784 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -417,7 +417,7 @@ $(BUILD)/firmware.elf: $(OBJ) $(LINK_LD)
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)echo $(PICO_LDFLAGS) > $(BUILD)/firmware.ldflags
 	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,$(LINK_LD) -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs -Wl,-lc
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LINK_LD)
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LINK_LD) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index 094bee7aef..325b13b1bc 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -268,7 +268,7 @@ $(BUILD)/firmware.elf: $(OBJ)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $^ > $(BUILD)/firmware.objs
 	$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE)
+	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py
index 722c548a1c..09d2e72a64 100755
--- a/tools/build_memory_info.py
+++ b/tools/build_memory_info.py
@@ -7,6 +7,8 @@
 
 import re
 import sys
+import json
+
 
 # Handle size constants with K or M suffixes (allowed in .ld but not in Python).
 K_PATTERN = re.compile(r"([0-9]+)[kK]")
@@ -15,11 +17,10 @@ K_REPLACE = r"(\1*1024)"
 M_PATTERN = re.compile(r"([0-9]+)[mM]")
 M_REPLACE = r"(\1*1024*1024)"
 
-print()
-
 text = 0
 data = 0
 bss = 0
+
 # stdin is the linker output.
 for line in sys.stdin:
     # Uncomment to see linker output.
@@ -29,6 +30,7 @@ for line in sys.stdin:
         text, data, bss = map(int, line.split()[:3])
 
 regions = {}
+
 # This file is the linker script.
 with open(sys.argv[1], "r") as f:
     for line in f:
@@ -51,6 +53,11 @@ used_flash = data + text
 free_flash = firmware_region - used_flash
 used_ram = data + bss
 free_ram = ram_region - used_ram
+
+with open(f"{sys.argv[2]}/firmware.size.json", "w") as f:
+    json.dump({"used_flash": used_flash, "firmware_region": firmware_region}, f)
+
+print()
 print(
     "{} bytes used, {} bytes free in flash firmware space out of {} bytes ({}kB).".format(
         used_flash, free_flash, firmware_region, firmware_region / 1024
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index a4f28f1c1c..341ae2d67f 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -11,6 +11,7 @@ import subprocess
 import shutil
 import build_board_info as build_info
 import time
+import json
 
 sys.path.append("../docs")
 from shared_bindings_matrix import get_settings_from_makefile
@@ -18,7 +19,7 @@ from shared_bindings_matrix import get_settings_from_makefile
 for port in build_info.SUPPORTED_PORTS:
     result = subprocess.run("rm -rf ../ports/{port}/build*".format(port=port), shell=True)
 
-PARALLEL = "-j 5"
+PARALLEL = "-j 4"
 if "GITHUB_ACTION" in os.environ:
     PARALLEL = "-j 2"
 
@@ -29,6 +30,11 @@ if "BOARDS" in os.environ:
 
 sha, version = build_info.get_version_info()
 
+build_all = os.environ.get("GITHUB_EVENT_NAME") != "pull_request"
+
+LANGUAGE_FIRST = "en_US"
+LANGUAGE_THRESHOLD = 10 * 1024
+
 languages = build_info.get_languages()
 
 all_languages = build_info.get_languages(list_all=True)
@@ -44,6 +50,9 @@ for board in build_boards:
     board_info = all_boards[board]
     board_settings = get_settings_from_makefile("../ports/" + board_info["port"], board)
 
+    languages.remove(LANGUAGE_FIRST)
+    languages.insert(0, LANGUAGE_FIRST)
+
     for language in languages:
         bin_directory = "../bin/{board}/{language}".format(board=board, language=language)
         os.makedirs(bin_directory, exist_ok=True)
@@ -130,4 +139,16 @@ for board in build_boards:
         # Flush so we will see something before 10 minutes has passed.
         print(flush=True)
 
+        if (not build_all) and (language is LANGUAGE_FIRST) and (exit_status is 0):
+            try:
+                with open(
+                    f"../ports/{board_info['port']}/{build_dir}/firmware.size.json", "r"
+                ) as f:
+                    firmware = json.load(f)
+                    if firmware["used_flash"] + LANGUAGE_THRESHOLD < firmware["firmware_region"]:
+                        print("Skipping languages")
+                        break
+            except FileNotFoundError:
+                pass
+
 sys.exit(exit_status)

From 2ac1c7a0205745edd50abcc86467d1171fd5180d Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 4 Mar 2023 11:59:31 -0500
Subject: [PATCH 1977/2403] Add blank line after code-block

---
 shared-bindings/gifio/OnDiskGif.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 24412c7cfe..7fb3fcf2bd 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -79,6 +79,7 @@
 //|     pixel data directly:
 //|
 //|     .. code-block:: Python
+//|
 //|       # Initial set-up the same as above
 //|
 //|       # Take over display to drive directly

From 7740cbac97a312f5932ad0731b46ad5ad8398a23 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Sat, 4 Mar 2023 13:13:59 -0600
Subject: [PATCH 1978/2403] do background tasks and handle interrupt during
 boundary fill

---
 shared-module/bitmaptools/__init__.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index dbf5a9ef96..6354dd508a 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "shared/runtime/interrupt_char.h"
 #include "shared-bindings/bitmaptools/__init__.h"
 #include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/Palette.h"
@@ -376,6 +377,10 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
         }
 
         mp_obj_list_get(fill_area, &list_length, &fill_points);
+        RUN_BACKGROUND_TASKS;
+        if (mp_hal_is_interrupted()) {
+            return;
+        }
     }
 
     // set dirty the area so displayio will draw

From 08c9eb9f00a4c88d0a81f9b6d5e4298d021ca74c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 4 Mar 2023 14:40:06 -0500
Subject: [PATCH 1979/2403] be more careful when setting socket to non-blocking

---
 ports/espressif/common-hal/socketpool/Socket.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 8b6cff30ef..19e83e717f 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -253,9 +253,7 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     uint64_t start_ticks = supervisor_ticks_ms64();
 
     // Allow timeouts and interrupts
-    while (newsoc == -1 &&
-           !timed_out &&
-           !mp_hal_is_interrupted()) {
+    while (newsoc == -1 && !timed_out) {
         if (self->timeout_ms != (uint)-1 && self->timeout_ms != 0) {
             timed_out = supervisor_ticks_ms64() - start_ticks >= self->timeout_ms;
         }
@@ -267,9 +265,6 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
         }
     }
 
-    // New client socket will not be non-blocking by default, so make it non-blocking.
-    lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
-
     if (!timed_out) {
         // harmless on failure but avoiding memcpy is faster
         memcpy((void *)ip, (void *)&accept_addr.sin_addr.s_addr, sizeof(accept_addr.sin_addr.s_addr));
@@ -280,6 +275,10 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     if (newsoc < 0) {
         return -MP_EBADF;
     }
+
+    // We got a socket. New client socket will not be non-blocking by default, so make it non-blocking.
+    lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
+
     if (!register_open_socket(newsoc)) {
         lwip_close(newsoc);
         return -MP_EBADF;

From 90155925d570313b2ccb3b70549aec0c2327a4a4 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Sun, 5 Mar 2023 12:58:40 -0800
Subject: [PATCH 1980/2403] Document aeios.AES.rekey() and refactor arg
 validation

---
 shared-bindings/aesio/aes.c | 40 ++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 50e07a5b61..ca0cf735e1 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -98,33 +98,49 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args) {
+//|     def rekey(
+//|         self,
+//|         key: ReadableBuffer,
+//|         iv: Optional[ReadableBuffer] = None,
+//|     ) -> None:
+//|         """Update the AES state with the given key.
+//|
+//|         :param ~circuitpython_typing.ReadableBuffer key: A 16-, 24-, or 32-byte key
+//|         :param ~circuitpython_typing.ReadableBuffer iv: Initialization vector to use
+//|                                                         for CBC or CTR mode"""
+//|         ...
+STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     aesio_aes_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    enum { ARG_key, ARG_IV };
+    static const mp_arg_t allowed_args[] = {
+        {MP_QSTR_key, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
+        {MP_QSTR_IV, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(pos_args[1], &bufinfo, MP_BUFFER_READ);
+
+    mp_get_buffer_raise(args[ARG_key].u_obj, &bufinfo, MP_BUFFER_READ);
     const uint8_t *key = bufinfo.buf;
     size_t key_length = bufinfo.len;
-    if (key == NULL) {
-        mp_raise_ValueError(translate("No key was specified"));
-    }
+
     if ((key_length != 16) && (key_length != 24) && (key_length != 32)) {
         mp_raise_ValueError(translate("Key must be 16, 24, or 32 bytes long"));
     }
 
     const uint8_t *iv = NULL;
-    if (n_args > 2) {
-        mp_get_buffer_raise(pos_args[2], &bufinfo, MP_BUFFER_READ);
-        size_t iv_length = bufinfo.len;
-        iv = (const uint8_t *)bufinfo.buf;
-        (void)mp_arg_validate_length(iv_length, AES_BLOCKLEN, MP_QSTR_IV);
+    if (args[ARG_IV].u_obj != NULL &&
+        mp_get_buffer(args[ARG_IV].u_obj, &bufinfo, MP_BUFFER_READ)) {
+        (void)mp_arg_validate_length(bufinfo.len, AES_BLOCKLEN, MP_QSTR_IV);
+
+        iv = bufinfo.buf;
     }
 
     common_hal_aesio_aes_rekey(self, key, key_length, iv);
     return mp_const_none;
 }
-
-MP_DEFINE_CONST_FUN_OBJ_VAR(aesio_aes_rekey_obj, 2, aesio_aes_rekey);
+MP_DEFINE_CONST_FUN_OBJ_KW(aesio_aes_rekey_obj, 1, aesio_aes_rekey);
 
 STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length,
     size_t dest_length) {

From dd051186452e827af8eaba15c2e73bf6cb3eb550 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sun, 5 Mar 2023 22:59:10 -0600
Subject: [PATCH 1981/2403] Add multiple transctions to SPI

---
 ports/espressif/common-hal/busio/SPI.c | 56 +++++++++++++++++---------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
index 0b894fa215..659aa52f5b 100644
--- a/ports/espressif/common-hal/busio/SPI.c
+++ b/ports/espressif/common-hal/busio/SPI.c
@@ -33,6 +33,7 @@
 #include "driver/spi_common_internal.h"
 
 #define SPI_MAX_DMA_BITS (SPI_MAX_DMA_LEN * 8)
+#define MAX_SPI_TRANSACTIONS 10
 
 static bool spi_never_reset[SOC_SPI_PERIPH_NUM];
 static spi_device_handle_t spi_handle[SOC_SPI_PERIPH_NUM];
@@ -59,7 +60,7 @@ static void set_spi_config(busio_spi_obj_t *self,
         .clock_speed_hz = baudrate,
         .mode = phase | (polarity << 1),
         .spics_io_num = -1, // No CS pin
-        .queue_size = 1,
+        .queue_size = MAX_SPI_TRANSACTIONS,
         .pre_cb = NULL
     };
     esp_err_t result = spi_bus_add_device(self->host_id, &device_config, &spi_handle[self->host_id]);
@@ -213,47 +214,62 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
         mp_raise_ValueError(translate("No MISO Pin"));
     }
 
-    spi_transaction_t transaction = { 0 };
+    spi_transaction_t transactions[MAX_SPI_TRANSACTIONS];
 
     // Round to nearest whole set of bits
     int bits_to_send = len * 8 / self->bits * self->bits;
 
     if (len <= 4) {
+        memset(&transactions[0], 0, sizeof(spi_transaction_t));
         if (data_out != NULL) {
-            memcpy(&transaction.tx_data, data_out, len);
+            memcpy(&transactions[0].tx_data, data_out, len);
         }
 
-        transaction.flags = SPI_TRANS_USE_TXDATA | SPI_TRANS_USE_RXDATA;
-        transaction.length = bits_to_send;
-        spi_device_transmit(spi_handle[self->host_id], &transaction);
+        transactions[0].flags = SPI_TRANS_USE_TXDATA | SPI_TRANS_USE_RXDATA;
+        transactions[0].length = bits_to_send;
+        spi_device_transmit(spi_handle[self->host_id], &transactions[0]);
 
         if (data_in != NULL) {
-            memcpy(data_in, &transaction.rx_data, len);
+            memcpy(data_in, &transactions[0].rx_data, len);
         }
     } else {
         int offset = 0;
         int bits_remaining = bits_to_send;
+        int cur_trans = 0;
 
         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;
+            cur_trans = 0;
+            while (bits_remaining && (cur_trans != MAX_SPI_TRANSACTIONS)) {
+                memset(&transactions[cur_trans], 0, sizeof(spi_transaction_t));
 
-            if (data_out != NULL) {
-                transaction.tx_buffer = data_out + offset;
-            }
-            if (data_in != NULL) {
-                transaction.rx_buffer = data_in + offset;
+                transactions[cur_trans].length =
+                    bits_remaining > SPI_MAX_DMA_BITS ? SPI_MAX_DMA_BITS : bits_remaining;
+
+                if (data_out != NULL) {
+                    transactions[cur_trans].tx_buffer = data_out + offset;
+                }
+                if (data_in != NULL) {
+                    transactions[cur_trans].rx_buffer = data_in + offset;
+                }
+
+                bits_remaining -= transactions[cur_trans].length;
+
+                // doesn't need ceil(); loop ends when bits_remaining is 0
+                offset += transactions[cur_trans].length / 8;
+                cur_trans++;
             }
 
-            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;
+            for (int i = 0; i < cur_trans; i++) {
+                spi_device_queue_trans(spi_handle[self->host_id], &transactions[i], portMAX_DELAY);
+            }
 
             RUN_BACKGROUND_TASKS;
+
+            spi_transaction_t *rtrans;
+            for (int x = 0; x < cur_trans; x++) {
+                spi_device_get_trans_result(spi_handle[self->host_id], &rtrans, portMAX_DELAY);
+            }
         }
     }
     return true;

From 8955caff442ebe2b0ab7bd752b45b08bab7e98e0 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Mon, 6 Mar 2023 10:38:28 -0800
Subject: [PATCH 1982/2403] Fix capitalization of the IV argument
 (documentation)

---
 shared-bindings/aesio/aes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index ca0cf735e1..8572b58e9e 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -20,7 +20,7 @@
 //|         self,
 //|         key: ReadableBuffer,
 //|         mode: int = 0,
-//|         iv: Optional[ReadableBuffer] = None,
+//|         IV: Optional[ReadableBuffer] = None,
 //|         segment_size: int = 8,
 //|     ) -> None:
 //|         """Create a new AES state with the given key.
@@ -101,7 +101,7 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     def rekey(
 //|         self,
 //|         key: ReadableBuffer,
-//|         iv: Optional[ReadableBuffer] = None,
+//|         IV: Optional[ReadableBuffer] = None,
 //|     ) -> None:
 //|         """Update the AES state with the given key.
 //|

From 03bb7ff652e420661ec653221fd5f81f92b9622b Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 7 Mar 2023 03:22:31 +0530
Subject: [PATCH 1983/2403] refactor `boards / build` to `ports / board`

---
 .github/workflows/build.yml           | 14 +++++++-------
 .github/workflows/re-build-boards.yml |  2 +-
 tools/ci_changes_per_commit.py        |  2 +-
 tools/ci_set_matrix.py                |  6 ++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d67c4cc2d2..d6f4e475a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       docs: ${{ steps.set-matrix.outputs.docs }}
-      boards: ${{ steps.set-matrix.outputs.boards }}
+      ports: ${{ steps.set-matrix.outputs.ports }}
       windows: ${{ steps.set-matrix.outputs.windows }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
@@ -94,7 +94,7 @@ jobs:
 
   mpy-cross:
     needs: scheduler
-    if: needs.scheduler.outputs.boards != '{}'
+    if: needs.scheduler.outputs.ports != '{}'
     uses: ./.github/workflows/re-build-mpy-cross.yml
     secrets: inherit
     with:
@@ -103,7 +103,7 @@ jobs:
   mpy-cross-mac:
     runs-on: macos-11
     needs: scheduler
-    if: needs.scheduler.outputs.boards != '{}'
+    if: needs.scheduler.outputs.ports != '{}'
     env:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
@@ -281,15 +281,15 @@ jobs:
     # ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
     # https://github.com/espressif/esp-idf/issues/7062
 
-  boards:
+  ports:
     needs: [scheduler, mpy-cross, tests]
-    if: needs.scheduler.outputs.boards != '{}'
+    if: needs.scheduler.outputs.ports != '{}'
     uses: ./.github/workflows/re-build-boards.yml
     secrets: inherit
     strategy:
       fail-fast: false
       matrix:
-        port: ${{ fromJSON(needs.scheduler.outputs.boards).ports }}
+        port: ${{ fromJSON(needs.scheduler.outputs.ports).ports }}
     with:
-      boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.boards)[matrix.port]) }}
+      boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.ports)[matrix.port]) }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/.github/workflows/re-build-boards.yml b/.github/workflows/re-build-boards.yml
index 57ab28bdc4..524549cc50 100644
--- a/.github/workflows/re-build-boards.yml
+++ b/.github/workflows/re-build-boards.yml
@@ -16,7 +16,7 @@ on:
         required: false
 
 jobs:
-  build:
+  board:
     runs-on: ubuntu-22.04
     env:
       CP_VERSION: ${{ inputs.cp-version }}
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index e4249901af..e83a702b22 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -184,7 +184,7 @@ def get_bad_check_runs(query_check_runs):
 
             for check_run in check_runs[run_type]["nodes"]:
                 name = check_run["name"]
-                if name.startswith("boards") or regex_matrix.search(name):
+                if name.startswith("ports") or regex_matrix.search(name):
                     matrix = name.split(" ", 1)[0]
                     matrix_job = name.rsplit(" (", 1)[1][:-1]
                     bad_runs.setdefault(matrix, []).append(matrix_job)
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 4a4d5e9b51..fe823ac030 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -213,9 +213,7 @@ def set_boards(build_all: bool):
             break
 
     # Append previously failed boards
-    last_failed_boards = last_failed_jobs.get("boards")
-    if last_failed_boards:
-        boards_to_build.update(last_failed_boards)
+    boards_to_build.update(last_failed_jobs.get("ports") or [])
 
     print("Building boards:", bool(boards_to_build))
 
@@ -236,7 +234,7 @@ def set_boards(build_all: bool):
         port_to_boards_to_build["ports"] = sorted(list(port_to_boards_to_build.keys()))
 
     # Set the step outputs
-    set_output("boards", json.dumps(port_to_boards_to_build))
+    set_output("ports", json.dumps(port_to_boards_to_build))
 
 
 def set_docs(build_doc: bool):

From 7f5f93126c69ca18d8f8ae3d20b73ed5c3a8d0fd Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Mon, 6 Mar 2023 16:26:22 -0600
Subject: [PATCH 1984/2403] Move background task check

---
 ports/espressif/common-hal/busio/SPI.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
index 659aa52f5b..68d4e1d72b 100644
--- a/ports/espressif/common-hal/busio/SPI.c
+++ b/ports/espressif/common-hal/busio/SPI.c
@@ -262,10 +262,9 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
 
             for (int i = 0; i < cur_trans; i++) {
                 spi_device_queue_trans(spi_handle[self->host_id], &transactions[i], portMAX_DELAY);
+                RUN_BACKGROUND_TASKS;
             }
 
-            RUN_BACKGROUND_TASKS;
-
             spi_transaction_t *rtrans;
             for (int x = 0; x < cur_trans; x++) {
                 spi_device_get_trans_result(spi_handle[self->host_id], &rtrans, portMAX_DELAY);

From 812fa2b34b6c73706ca42034e4a554c0942988b4 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 6 Mar 2023 16:55:12 -0600
Subject: [PATCH 1985/2403] change docstring, add example code.

---
 shared-bindings/bitmaptools/__init__.c | 36 ++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index d7bd85ddd3..6b19d11b52 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -532,11 +532,43 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_li
 //|     """Draw a polygon conecting points on provided bitmap with provided value
 //|
 //|     :param bitmap dest_bitmap: Destination bitmap that will be written into
-//|     :param int xs: x-pixel position of the polygon's vertices
-//|     :param int ys: y-pixel position of the polygon's vertices
+//|     :param ReadableBuffer xs: x-pixel position of the polygon's vertices
+//|     :param ReadableBuffer ys: y-pixel position of the polygon's vertices
 //|     :param int value: Bitmap palette index that will be written into the
 //|            line in the destination bitmap
 //|     :param bool close: (Optional) Wether to connect first and last point. (True)
+//|
+//|     .. code-block:: Python
+//|
+//|        import board
+//|        import displayio
+//|        import bitmaptools
+//|
+//|        display = board.DISPLAY
+//|        main_group = displayio.Group()
+//|        display.root_group = main_group
+//|
+//|        palette = displayio.Palette(3)
+//|        palette[0] = 0xffffff
+//|        palette[1] = 0x0000ff
+//|        palette[2] = 0xff0000
+//|
+//|        bmp = displayio.Bitmap(128,128, 3)
+//|        bmp.fill(0)
+//|
+//|        xs = bytes([4, 101, 101, 19])
+//|        ys = bytes([4, 19,  121, 101])
+//|        bitmaptools.draw_polygon(bmp, xs, ys, 1)
+//|
+//|        xs = bytes([14, 60, 110])
+//|        ys = bytes([14, 24,  90])
+//|        bitmaptools.draw_polygon(bmp, xs, ys, 2)
+//|
+//|        tilegrid = displayio.TileGrid(bitmap=bmp, pixel_shader=palette)
+//|        main_group.append(tilegrid)
+//|
+//|        while True:
+//|            pass
 //|     """
 //|     ...
 //|

From 2d74d062be0a32db7a796c1a74aed0edde4b0217 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 7 Mar 2023 03:58:37 +0100
Subject: [PATCH 1986/2403] 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/ru.po             | 8 ++++++++
 locale/sv.po             | 8 ++++++++
 locale/tr.po             | 8 ++++++++
 locale/zh_Latn_pinyin.po | 8 ++++++++
 19 files changed, 152 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 120333a7a2..b30c7d5d9c 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -823,6 +823,14 @@ msgid ""
 msgstr ""
 "Koneksi telah terputus dan tidak dapat lagi digunakan. Buat koneksi baru."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "File .mpy rusak"
diff --git a/locale/cs.po b/locale/cs.po
index 0fa986c7c3..164f9c42ad 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -821,6 +821,14 @@ msgid ""
 msgstr ""
 "Připojení bylo odpojeno a nelze jej dále používat. Vytvořte nové připojení."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Poškozený soubor .mpy"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7060946cf8..fd309dd287 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -835,6 +835,14 @@ msgstr ""
 "Die Verbindung wurde getrennt und kann nicht mehr verwendet werden. Erstelle "
 "eine neue Verbindung."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Beschädigte .mpy Datei"
diff --git a/locale/el.po b/locale/el.po
index 24783d0351..b36d0a39b6 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -834,6 +834,14 @@ msgstr ""
 "Έχει γίνει αποσύνδεση και αυτή η συνδεση δεν μπορεί να χρησιμοποιηθεί. "
 "Δημιουργήστε μια νέα σύνδεση."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Κατεστραμένο .mpy αρχείο"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 3b6e00e32d..b1c1c46b50 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -824,6 +824,14 @@ msgstr ""
 "Connection has been disconnected and can no longer be used. Create a new "
 "connection."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Corrupt .mpy file"
diff --git a/locale/es.po b/locale/es.po
index 24a842500e..8f6f61b802 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -846,6 +846,14 @@ msgstr ""
 "La conexión se ha desconectado y ya no se puede usar. Crea una nueva "
 "conexión."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Archivo .mpy corrupto"
diff --git a/locale/fil.po b/locale/fil.po
index a05897f4fe..02b8fda384 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -820,6 +820,14 @@ msgid ""
 "connection."
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 728cb901bf..322314b018 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -847,6 +847,14 @@ msgstr ""
 "La connexion a été déconnectée et ne peut plus être utilisée. Créez une "
 "nouvelle connexion."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Fichier .mpy corrompu"
diff --git a/locale/hi.po b/locale/hi.po
index 6f42103bc4..649b98c521 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -813,6 +813,14 @@ msgid ""
 "connection."
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 52c8f1f6e4..a6ab324c58 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -823,6 +823,14 @@ msgid ""
 "connection."
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 8bc8d0f49e..e8a70816c8 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -824,6 +824,14 @@ msgid ""
 "connection."
 msgstr "接続は切断済みでもう使えません。新しい接続を作成してください"
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "破損した .mpy ファイル"
diff --git a/locale/ko.po b/locale/ko.po
index 01624c24f7..6b09cf6e94 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -816,6 +816,14 @@ msgid ""
 "connection."
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 30b8c80352..90c3e8130e 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -818,6 +818,14 @@ msgstr ""
 "Verbinding is verbroken en kan niet langer gebruikt worden. Creëer een "
 "nieuwe verbinding."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Corrupt .mpy bestand"
diff --git a/locale/pl.po b/locale/pl.po
index f2fed6df1c..b48ca01b81 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -819,6 +819,14 @@ msgstr ""
 "Połączenie zostało rozłączone i nie można go już używać. Utwórz nowe "
 "połączenie."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Uszkodzony plik .mpy"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index fb13d6c08b..12e0df5000 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -845,6 +845,14 @@ msgid ""
 msgstr ""
 "A conexão foi desconectada e não pode mais ser usada. Crie uma nova conexão."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Arquivo .mpy corrompido"
diff --git a/locale/ru.po b/locale/ru.po
index c1d2e9d4de..50249c621d 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -838,6 +838,14 @@ msgstr ""
 "Соединение было отключено и больше не может использоваться. Создайте новое "
 "соединение."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Файл .mpy поврежден"
diff --git a/locale/sv.po b/locale/sv.po
index e7cafc4ddd..94beea2f81 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -837,6 +837,14 @@ msgstr ""
 "Anslutningen har kopplats bort och kan inte längre användas. Skapa en ny "
 "anslutning."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Skadad .mpy-fil"
diff --git a/locale/tr.po b/locale/tr.po
index 883715ee96..74e44c2d8d 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -825,6 +825,14 @@ msgid ""
 "connection."
 msgstr "Bağlantı koparıldı ve tekrar kullanılamaz. Yeni bir bağlantı kurun."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "Bozuk .mpy dosyası"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index eebc16bc6c..ea9fa2fc68 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -838,6 +838,14 @@ msgid ""
 "connection."
 msgstr "Liánjiē yǐ duàn kāi, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xīn de liánjiē."
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays have different lengths"
+msgstr ""
+
+#: shared-bindings/bitmaptools/__init__.c
+msgid "Coordinate arrays types have different sizes"
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr "sǔnhuài de .mpy wénjiàn"

From b7db2896d16098d46d742771100130e4d0776590 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Tue, 7 Mar 2023 10:12:57 -0800
Subject: [PATCH 1987/2403] Second fix for the IV argument capitalization
 (documentation)

---
 shared-bindings/aesio/aes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 8572b58e9e..c5c50515ea 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -28,7 +28,7 @@
 //|         :param ~circuitpython_typing.ReadableBuffer key: A 16-, 24-, or 32-byte key
 //|         :param int mode: AES mode to use.  One of: `MODE_ECB`, `MODE_CBC`, or
 //|                          `MODE_CTR`
-//|         :param ~circuitpython_typing.ReadableBuffer iv: Initialization vector to use for CBC or CTR mode
+//|         :param ~circuitpython_typing.ReadableBuffer IV: Initialization vector to use for CBC or CTR mode
 //|
 //|         Additional arguments are supported for legacy reasons.
 //|
@@ -106,7 +106,7 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
 //|         """Update the AES state with the given key.
 //|
 //|         :param ~circuitpython_typing.ReadableBuffer key: A 16-, 24-, or 32-byte key
-//|         :param ~circuitpython_typing.ReadableBuffer iv: Initialization vector to use
+//|         :param ~circuitpython_typing.ReadableBuffer IV: Initialization vector to use
 //|                                                         for CBC or CTR mode"""
 //|         ...
 STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

From f0b509cd0d64c6725f6c4459303ddb2c321bdaa5 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 8 Mar 2023 00:49:03 +0530
Subject: [PATCH 1988/2403] partially revert refactor workflow names

---
 .github/workflows/{re-build-boards.yml => build-boards.yml} | 2 +-
 .../{re-build-mpy-cross.yml => build-mpy-cross.yml}         | 2 +-
 .github/workflows/build.yml                                 | 6 +++---
 .github/workflows/{re-run-tests.yml => run-tests.yml}       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename .github/workflows/{re-build-boards.yml => build-boards.yml} (98%)
 rename .github/workflows/{re-build-mpy-cross.yml => build-mpy-cross.yml} (98%)
 rename .github/workflows/{re-run-tests.yml => run-tests.yml} (98%)

diff --git a/.github/workflows/re-build-boards.yml b/.github/workflows/build-boards.yml
similarity index 98%
rename from .github/workflows/re-build-boards.yml
rename to .github/workflows/build-boards.yml
index 524549cc50..85e789bf87 100644
--- a/.github/workflows/re-build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -1,4 +1,4 @@
-name: Reusable | Build boards
+name: Build boards
 
 on:
   workflow_call:
diff --git a/.github/workflows/re-build-mpy-cross.yml b/.github/workflows/build-mpy-cross.yml
similarity index 98%
rename from .github/workflows/re-build-mpy-cross.yml
rename to .github/workflows/build-mpy-cross.yml
index dc08bf80dc..10c4498bc8 100644
--- a/.github/workflows/re-build-mpy-cross.yml
+++ b/.github/workflows/build-mpy-cross.yml
@@ -1,4 +1,4 @@
-name: Reusable | Build mpy-cross
+name: Build mpy-cross
 
 on:
   workflow_call:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d6f4e475a1..bee5afdd6a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,14 +88,14 @@ jobs:
 
   tests:
     needs: scheduler
-    uses: ./.github/workflows/re-run-tests.yml
+    uses: ./.github/workflows/run-tests.yml
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
   mpy-cross:
     needs: scheduler
     if: needs.scheduler.outputs.ports != '{}'
-    uses: ./.github/workflows/re-build-mpy-cross.yml
+    uses: ./.github/workflows/build-mpy-cross.yml
     secrets: inherit
     with:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
@@ -284,7 +284,7 @@ jobs:
   ports:
     needs: [scheduler, mpy-cross, tests]
     if: needs.scheduler.outputs.ports != '{}'
-    uses: ./.github/workflows/re-build-boards.yml
+    uses: ./.github/workflows/build-boards.yml
     secrets: inherit
     strategy:
       fail-fast: false
diff --git a/.github/workflows/re-run-tests.yml b/.github/workflows/run-tests.yml
similarity index 98%
rename from .github/workflows/re-run-tests.yml
rename to .github/workflows/run-tests.yml
index f986abcd0b..44146662f2 100644
--- a/.github/workflows/re-run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -1,4 +1,4 @@
-name: Reusable | Run tests
+name: Run tests
 
 on:
   workflow_call:

From 03815eb3d676f94ee489f3d6bc7da391b5f4b304 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 7 Mar 2023 07:24:18 +0000
Subject: [PATCH 1989/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 12e0df5000..618f8c6379 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: 2023-02-26 06:37+0000\n"
+"PO-Revision-Date: 2023-03-08 07:10+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.16-dev\n"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 #: main.c
 msgid ""
@@ -847,11 +847,11 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "As coordenadas das matrizes possuem comprimentos diferentes"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "Os tipos das coordenadas das matrizes possuem tamanhos diferentes"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"

From b23d24d8178877c8dd440caccf1e2a6a9f86f1d0 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Tue, 7 Mar 2023 08:27:51 +0000
Subject: [PATCH 1990/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1004 of 1004 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 94beea2f81..6ba1cdc1a2 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: 2023-02-26 06:37+0000\n"
+"PO-Revision-Date: 2023-03-08 07:10+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.16-dev\n"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 #: main.c
 msgid ""
@@ -839,11 +839,11 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "Arrayer för koordinater har olika längd"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "Arrayer för koordinater har olika storlek"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"

From 59f56a438a5a2736f91267d2b94dff86c66cfe16 Mon Sep 17 00:00:00 2001
From: root 
Date: Wed, 8 Mar 2023 13:09:45 -0600
Subject: [PATCH 1991/2403] Fix for issue #7054 by avoiding recursive calls to
 websocket_background.

---
 supervisor/shared/web_workflow/websocket.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 7612066fa6..e55e09b3e7 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -52,6 +52,8 @@ typedef struct {
 // interrupt character.
 STATIC ringbuf_t _incoming_ringbuf;
 STATIC uint8_t _buf[16];
+// make sure background is not called recursively
+STATIC bool in_web_background = false;
 
 static _websocket cp_serial;
 
@@ -244,6 +246,10 @@ void websocket_background(void) {
     if (!websocket_connected()) {
         return;
     }
+    if (in_web_background) {
+        return;
+    }
+    in_web_background = true;
     uint8_t c;
     while (ringbuf_num_empty(&_incoming_ringbuf) > 0 &&
            _read_next_payload_byte(&c)) {
@@ -253,4 +259,5 @@ void websocket_background(void) {
         }
         ringbuf_put(&_incoming_ringbuf, c);
     }
+    in_web_background = false;
 }

From a2514ca3049cb90a38fcacd8a7d089923b969e64 Mon Sep 17 00:00:00 2001
From: Phillip Burgess 
Date: Wed, 8 Mar 2023 11:37:51 -0800
Subject: [PATCH 1992/2403] Add board adafruit_feather_rp2040_dvi

Based on Feather RP2040 SCORPIO, but new USB PID (from MBAdafruitBoards/Production) and pin name changes for GP16-23 (CKN/CKP etc., from board schematic).
---
 .../adafruit_feather_rp2040_dvi/board.c       | 29 +++++++++++
 .../mpconfigboard.h                           | 14 ++++++
 .../mpconfigboard.mk                          |  9 ++++
 .../pico-sdk-configboard.h                    |  4 ++
 .../boards/adafruit_feather_rp2040_dvi/pins.c | 48 +++++++++++++++++++
 5 files changed, 104 insertions(+)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
new file mode 100644
index 0000000000..06cfaf37f6
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 DVI"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO16)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
new file mode 100644
index 0000000000..a60ff7b9a7
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x8128
+USB_PRODUCT = "Feather RP2040 DVI"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
new file mode 100644
index 0000000000..b352cd96e2
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -0,0 +1,48 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D0N), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D0P), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D1N), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D1P), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D2N), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D2P), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 7f8a3052be11075fa9bdfe53c0aa23d26a13a203 Mon Sep 17 00:00:00 2001
From: BrainBoardz <87398149+BrainBoardz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:25:18 -0500
Subject: [PATCH 1993/2403] Updated Pins.c definitions for SPI and I2C

Removed "CD" from the pin definitions for (MISO, MOSI and SCK pins). Specifically Pins 13, 15 and 14. Added Pin definitions for I2C and SPI objects
---
 ports/espressif/boards/brainboardz_neuron/pins.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index b0cbb91563..31757e1843 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -25,13 +25,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
 
     { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
 
     { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
 
     { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
 
     { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO16) },
@@ -63,6 +63,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
-
+    
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From c133e79a08b336a456e8286a70e22c95a5743e4c Mon Sep 17 00:00:00 2001
From: BrainBoardz <87398149+BrainBoardz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:31:47 -0500
Subject: [PATCH 1994/2403] Updated mpconfigboard.h

Add #defines for SPI_BUS_SCK, SPI_BUS_MOSI and SPI_BUS.MISO
---
 ports/espressif/boards/brainboardz_neuron/mpconfigboard.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
index 9507917ead..47be454d8b 100755
--- a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
@@ -31,3 +31,10 @@
 
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO13)

From 1200fe405f9e4e672e12e86daac216376671a777 Mon Sep 17 00:00:00 2001
From: BrainBoardz <87398149+BrainBoardz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:38:16 -0500
Subject: [PATCH 1995/2403] Change GPIO pins for SDA and SCL

Chnage the SDA pin define to GPIO9 and SCL pin define to GPIO8. This now matches the currect GPIO pins numbers in pins.c
The previous GPIO pins number in mpconfigboard.h were incorrect
---
 ports/espressif/boards/brainboardz_neuron/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
index 47be454d8b..72cda83c9b 100755
--- a/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
+++ b/ports/espressif/boards/brainboardz_neuron/mpconfigboard.h
@@ -32,8 +32,8 @@
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
 #define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)

From 6da2ca6770e89a47484ab9a8499ea4830ec45d48 Mon Sep 17 00:00:00 2001
From: BrainBoardz <87398149+BrainBoardz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:46:31 -0500
Subject: [PATCH 1996/2403] Update pins.c

Added a comma (,) to the the end of the definition for board_spi_obj
---
 ports/espressif/boards/brainboardz_neuron/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index 31757e1843..b436045b05 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -65,6 +65,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
     
     { 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_SPI), MP_ROM_PTR(&board_spi_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From ab70506178a9a050598a1cad95deea71d7198620 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Wed, 8 Mar 2023 16:14:58 -0600
Subject: [PATCH 1997/2403] Move background tasks to slower routine

---
 ports/espressif/common-hal/busio/SPI.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
index 68d4e1d72b..da9170a5b0 100644
--- a/ports/espressif/common-hal/busio/SPI.c
+++ b/ports/espressif/common-hal/busio/SPI.c
@@ -262,11 +262,11 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
 
             for (int i = 0; i < cur_trans; i++) {
                 spi_device_queue_trans(spi_handle[self->host_id], &transactions[i], portMAX_DELAY);
-                RUN_BACKGROUND_TASKS;
             }
 
             spi_transaction_t *rtrans;
             for (int x = 0; x < cur_trans; x++) {
+                RUN_BACKGROUND_TASKS;
                 spi_device_get_trans_result(spi_handle[self->host_id], &rtrans, portMAX_DELAY);
             }
         }

From fef957140095101127286c567ef402641f826412 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 8 Mar 2023 22:43:12 -0500
Subject: [PATCH 1998/2403] pico-sdk to 1.5.0; cyw43-driver to 0.9.0

---
 .gitmodules                        |  3 +--
 ports/raspberrypi/Makefile         | 30 ++++++++++++------------------
 ports/raspberrypi/lib/cyw43-driver |  2 +-
 ports/raspberrypi/sdk              |  2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3de3c6a51e..2ba84b4305 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -309,8 +309,7 @@
         branch = circuitpython
 [submodule "ports/raspberrypi/lib/cyw43-driver"]
 	path = ports/raspberrypi/lib/cyw43-driver
-	url = https://github.com/adafruit/cyw43-driver.git
-	branch = circuitpython8
+	url = https://github.com/georgerobotics/cyw43-driver.git
 [submodule "ports/raspberrypi/lib/lwip"]
 	path = ports/raspberrypi/lib/lwip
 	url = https://github.com/adafruit/lwip.git
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index ee0356b852..e36ed78eb1 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -33,17 +33,23 @@ INC_CYW43 := \
 	-isystem lib/cyw43-driver/firmware \
 	-isystem lib/cyw43-driver/src \
 	-isystem lib/lwip/src/include \
+        -isystem sdk/src/rp2_common/pico_async_context/include/ \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
+	-isystem sdk/src/rp2_common/pico_cyw43_driver/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
+        -isystem sdk/src/rp2_common/pico_rand/include/ \
 
 CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0 -DCYW43_NETUTILS=1
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
-	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
+	src/rp2_common/pico_async_context/async_context_base.c \
+	src/rp2_common/pico_async_context/async_context_threadsafe_background.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch_threadsafe_background.c \
-	src/rp2_common/pico_lwip/nosys.c \
-	src/rp2_common/pico_lwip/random.c \
+	src/rp2_common/pico_cyw43_driver/cyw43_driver.c \
+	src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.c \
+	src/rp2_common/pico_lwip/lwip_nosys.c \
+	src/rp2_common/pico_rand/rand.c \
 
 SRC_LWIP := \
 	shared/netutils/netutils.c \
@@ -69,27 +75,15 @@ $(PIOASM):
 	$(Q)cmake -S pioasm -B $(BUILD)/pioasm
 	$(Q)$(MAKE) -C $(BUILD)/pioasm PioasmBuild
 
-$(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
+$(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
 	$(Q)$(PIOASM) -o c-sdk $< $@
-$(BUILD)/sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus_pio_spi.pio.h
+$(BUILD)/sdk/src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus_pio_spi.pio.h
 
-CYW43_FIRMWARE_BIN = 43439A0-7.95.49.00.combined
-
-$(BUILD)/cyw43_resource.o: lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
-	$(Q)$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
-		--readonly-text \
-		--rename-section .data=.big_const,contents,alloc,load,readonly,data \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start=fw_43439A0_7_95_49_00_start \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size=fw_43439A0_7_95_49_00_size \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
-		$< $@
-OBJ_CYW43 := $(BUILD)/cyw43_resource.o
 else
 INC_CYW43 :=
 CFLAGS_CYW43 :=
 SRC_SDK_CYW43 :=
 SRC_CYW43 :=
-OBJ_CYW43 :=
 SRC_LWIP :=
 endif
 
@@ -377,7 +371,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/boot2_padded_checksummed.o
-OBJ += $(OBJ_CYW43) $(OBJ_MBEDTLS)
+OBJ += $(OBJ_MBEDTLS)
 
 $(BUILD)/%.o: $(BUILD)/%.S
 	$(STEPECHO) "CC $<"
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
index 2cf328d9e4..e52dd14a15 160000
--- a/ports/raspberrypi/lib/cyw43-driver
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6
+Subproject commit e52dd14a15e6a53e6263840704470246aa77c5ce
diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
index 2e6142b15b..2ccab115de 160000
--- a/ports/raspberrypi/sdk
+++ b/ports/raspberrypi/sdk
@@ -1 +1 @@
-Subproject commit 2e6142b15b8a75c1227dd3edbe839193b2bf9041
+Subproject commit 2ccab115de0d42d31d6611cca19ef0cd0d2ccaa7

From 874ba4ec68dae62914d04edb543dd90bf98be8ba Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 12:04:50 +0530
Subject: [PATCH 1999/2403] revert `Communicate` class and more

---
 ports/espressif/bindings/espnow/Communicate.c | 201 ------------------
 ports/espressif/bindings/espnow/Communicate.h |  39 ----
 ports/espressif/bindings/espnow/ESPNow.c      | 182 ++++++++++++----
 ports/espressif/bindings/espnow/__init__.c    |   2 -
 ports/espressif/common-hal/espnow/ESPNow.c    |  19 +-
 ports/espressif/common-hal/espnow/ESPNow.h    |  17 +-
 ports/espressif/common-hal/espnow/__init__.c  |   8 -
 ports/espressif/common-hal/espnow/__init__.h  |   4 +-
 8 files changed, 150 insertions(+), 322 deletions(-)
 delete mode 100644 ports/espressif/bindings/espnow/Communicate.c
 delete mode 100644 ports/espressif/bindings/espnow/Communicate.h

diff --git a/ports/espressif/bindings/espnow/Communicate.c b/ports/espressif/bindings/espnow/Communicate.c
deleted file mode 100644
index 5016dcfdda..0000000000
--- a/ports/espressif/bindings/espnow/Communicate.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 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
- * 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/objproperty.h"
-#include "py/runtime.h"
-
-#include "bindings/espnow/Peer.h"
-#include "common-hal/espnow/__init__.h"
-
-// --- Send and Receive ESP-NOW data ---
-
-//| class Communicate:
-//|     """Provides methods and statistics related to communication
-//|     with the ESP-NOW peers.
-//|
-//|     Terminology:
-//|         * "Send" = "Transmit" = ``TX``
-//|         * "Read" = ``RX``
-//|     """
-//|
-//|     def __init__(self) -> None:
-//|         """You cannot create an instance of `Communicate`."""
-//|         ...
-
-//|     job: str
-//|     """Used to decide whether to call `__send` or `__read`. (read-only)"""
-//|
-STATIC mp_obj_t espnow_com_get_job(const mp_obj_t self_in) {
-    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_QSTR(self->job);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_job_obj, espnow_com_get_job);
-
-MP_PROPERTY_GETTER(espnow_com_job_obj,
-    (mp_obj_t)&espnow_com_get_job_obj);
-
-//|     success: int
-//|     """The number of successes. (read-only)
-//|
-//|     * In case of transmit ``TX``:
-//|         The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``.
-//|
-//|     * In case of receive ``RX``:
-//|         The number of rx packets captured in the buffer."""
-//|
-STATIC mp_obj_t espnow_com_get_success(const mp_obj_t self_in) {
-    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int_from_uint(self->success);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_success_obj, espnow_com_get_success);
-
-MP_PROPERTY_GETTER(espnow_com_success_obj,
-    (mp_obj_t)&espnow_com_get_success_obj);
-
-//|     failure: int
-//|     """The number of failures. (read-only)
-//|
-//|     * In case of transmit ``TX``:
-//|         The number of failed tx packets ``ESP_NOW_SEND_FAIL``.
-//|
-//|     * In case of receive ``RX``:
-//|         The number of dropped rx packets due to buffer overflow."""
-//|
-STATIC mp_obj_t espnow_com_get_failure(const mp_obj_t self_in) {
-    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int_from_uint(self->failure);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(espnow_com_get_failure_obj, espnow_com_get_failure);
-
-MP_PROPERTY_GETTER(espnow_com_failure_obj,
-    (mp_obj_t)&espnow_com_get_failure_obj);
-
-//|     def __send(
-//|         self,
-//|         message: ReadableBuffer,
-//|         peer: Peer,
-//|     ) -> None:
-//|         """Send a message to the peer's mac address.
-//|
-//|         This blocks until a timeout of ``2`` seconds if the ESP-NOW internal buffers are full.
-//|
-//|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
-//|         :param Peer peer: Send message to this peer. If `None`, send to all registered peers.
-//|         """
-//|         ...
-STATIC mp_obj_t espnow_com___send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_message, ARG_peer };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_peer,     MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-
-    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);
-
-    espnow_obj_t *self = pos_args[0];
-    common_hal_espnow_check_for_deinit(self);
-
-    // Get a pointer to the data buffer of the message
-    mp_buffer_info_t message;
-    mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
-
-    const uint8_t *mac = NULL;
-    if (args[ARG_peer].u_obj != mp_const_none) {
-        const espnow_peer_obj_t *peer = MP_OBJ_FROM_PTR(mp_arg_validate_type_or_none(args[ARG_peer].u_obj, &espnow_peer_type, MP_QSTR_peer));
-        mac = peer->peer_info.peer_addr;
-    }
-
-    return common_hal_espnow_send(self, &message, mac);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_com___send_obj, 2, espnow_com___send);
-
-//|     def __read(self) -> Optional[ESPNowPacket]:
-//|         """Read a packet from the receive buffer.
-//|
-//|         This is non-blocking, the packet is received asynchronously from the peer(s).
-//|
-//|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
-//|         ...
-STATIC mp_obj_t espnow_com___read(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
-
-    return common_hal_espnow_read(self);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_com___read_obj, espnow_com___read);
-
-STATIC const mp_rom_map_elem_t espnow_com_locals_dict_table[] = {
-    // Config parameters
-    { MP_ROM_QSTR(MP_QSTR_job),     MP_ROM_PTR(&espnow_com_job_obj) },
-
-    // Packet statistics
-    { MP_ROM_QSTR(MP_QSTR_success), MP_ROM_PTR(&espnow_com_success_obj) },
-    { MP_ROM_QSTR(MP_QSTR_failure), MP_ROM_PTR(&espnow_com_failure_obj) },
-
-    // Communication methods
-    { MP_ROM_QSTR(MP_QSTR___send),  MP_ROM_PTR(&espnow_com___send_obj) },
-    { MP_ROM_QSTR(MP_QSTR___read),  MP_ROM_PTR(&espnow_com___read_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(espnow_com_locals_dict, espnow_com_locals_dict_table);
-
-//|     def __call__(self, *args: Optional[Any], **kwargs: Optional[Any]) -> Optional[Any]:
-//|         """Calls the private `__send` or `__read` methods with the supplied ``args`` and ``kwargs``
-//|         based on whether the job parameter is set to ``send`` or ``read``."""
-//|         ...
-//|
-STATIC mp_obj_t espnow_com_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    espnow_com_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t meth = NULL;
-    switch (self->job) {
-        case MP_QSTR_send:
-            meth = MP_OBJ_FROM_PTR(&espnow_com___send_obj);
-            break;
-        case MP_QSTR_read:
-            meth = MP_OBJ_FROM_PTR(&espnow_com___read_obj);
-            break;
-        default:
-            break;
-    }
-    return meth ? mp_call_method_self_n_kw(meth, MP_STATE_PORT(espnow_singleton), n_args, n_kw, args) : mp_const_none;
-}
-
-espnow_com_obj_t *espnow_com_new(qstr job) {
-    espnow_com_obj_t *self = m_new_obj(espnow_com_obj_t);
-    self->base.type = &espnow_com_type;
-    self->job = job;
-    return self;
-}
-
-const mp_obj_type_t espnow_com_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Communicate,
-    .locals_dict = (mp_obj_t)&espnow_com_locals_dict,
-    .flags = MP_TYPE_FLAG_EXTENDED,
-    MP_TYPE_EXTENDED_FIELDS(
-        .call = &espnow_com_call,
-        ),
-};
diff --git a/ports/espressif/bindings/espnow/Communicate.h b/ports/espressif/bindings/espnow/Communicate.h
deleted file mode 100644
index 194784f8b4..0000000000
--- a/ports/espressif/bindings/espnow/Communicate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#pragma once
-
-#include "py/obj.h"
-
-typedef struct {
-    mp_obj_base_t base;
-    volatile size_t success;
-    volatile size_t failure;
-    qstr job;
-} espnow_com_obj_t;
-
-const mp_obj_type_t espnow_com_type;
-extern espnow_com_obj_t *espnow_com_new(qstr job);
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index bf1dcc9eb4..d2f5d2268f 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -31,11 +31,23 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 
+#include "shared-bindings/util.h"
+
 #include "bindings/espnow/ESPNow.h"
+#include "bindings/espnow/Peer.h"
+
 #include "common-hal/espnow/__init__.h"
+#include "common-hal/espnow/ESPNow.h"
 
 #include "esp_now.h"
 
+// Raise ValueError if the ESPNow object is deinited
+static void espnow_check_for_deinit(espnow_obj_t *self) {
+    if (common_hal_espnow_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
 // --- Initialisation and Config functions ---
 
 //| class ESPNow:
@@ -80,7 +92,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 //|         ...
 STATIC mp_obj_t espnow_deinit(mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
+    espnow_check_for_deinit(self);
     common_hal_espnow_deinit(self);
     return mp_const_none;
 }
@@ -101,6 +113,111 @@ STATIC mp_obj_t espnow_obj___exit__(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj___exit__);
 
+// --- Send and Read messages ---
+
+//|     def send(
+//|         self,
+//|         message: ReadableBuffer,
+//|         peer: Peer,
+//|     ) -> None:
+//|         """Send a message to the peer's mac address.
+//|
+//|         This blocks until a timeout of ``2`` seconds if the ESP-NOW internal buffers are full.
+//|
+//|         :param ReadableBuffer message: The message to send (length <= 250 bytes).
+//|         :param Peer peer: Send message to this peer. If `None`, send to all registered peers.
+//|         """
+//|         ...
+STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_message, ARG_peer };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_message,  MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_peer,     MP_ARG_OBJ, { .u_obj = mp_const_none } },
+    };
+
+    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);
+
+    espnow_obj_t *self = pos_args[0];
+    espnow_check_for_deinit(self);
+
+    // Get a pointer to the data buffer of the message
+    mp_buffer_info_t message;
+    mp_get_buffer_raise(args[ARG_message].u_obj, &message, MP_BUFFER_READ);
+
+    const uint8_t *mac = NULL;
+    if (args[ARG_peer].u_obj != mp_const_none) {
+        const espnow_peer_obj_t *peer = MP_OBJ_FROM_PTR(mp_arg_validate_type_or_none(args[ARG_peer].u_obj, &espnow_peer_type, MP_QSTR_peer));
+        mac = peer->peer_info.peer_addr;
+    }
+
+    return common_hal_espnow_send(self, &message, mac);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send);
+
+//|     def read(self) -> Optional[ESPNowPacket]:
+//|         """Read a packet from the receive buffer.
+//|
+//|         This is non-blocking, the packet is received asynchronously from the peer(s).
+//|
+//|         :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`."""
+//|         ...
+STATIC mp_obj_t espnow_read(mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    espnow_check_for_deinit(self);
+
+    return common_hal_espnow_read(self);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_read_obj, espnow_read);
+
+//|     send_success: int
+//|     """The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``. (read-only)"""
+//|
+STATIC mp_obj_t espnow_get_send_success(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->send_success);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_send_success_obj, espnow_get_send_success);
+
+MP_PROPERTY_GETTER(espnow_send_success_obj,
+    (mp_obj_t)&espnow_get_send_success_obj);
+
+//|     send_failure: int
+//|     """The number of failed tx packets ``ESP_NOW_SEND_FAIL``. (read-only)"""
+//|
+STATIC mp_obj_t espnow_send_get_failure(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->send_failure);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_send_get_failure_obj, espnow_send_get_failure);
+
+MP_PROPERTY_GETTER(espnow_send_failure_obj,
+    (mp_obj_t)&espnow_send_get_failure_obj);
+
+//|     read_success: int
+//|     """The number of rx packets captured in the buffer. (read-only)"""
+//|
+STATIC mp_obj_t espnow_get_read_success(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->read_success);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_read_success_obj, espnow_get_read_success);
+
+MP_PROPERTY_GETTER(espnow_read_success_obj,
+    (mp_obj_t)&espnow_get_read_success_obj);
+
+//|     read_failure: int
+//|     """The number of dropped rx packets due to buffer overflow. (read-only)"""
+//|
+STATIC mp_obj_t espnow_read_get_failure(const mp_obj_t self_in) {
+    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_uint(self->read_failure);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(espnow_read_get_failure_obj, espnow_read_get_failure);
+
+MP_PROPERTY_GETTER(espnow_read_failure_obj,
+    (mp_obj_t)&espnow_read_get_failure_obj);
+
 //|     def set_pmk(self, pmk: ReadableBuffer) -> None:
 //|         """Set the ESP-NOW Primary Master Key (pmk) for encrypted communications.
 //|
@@ -108,32 +225,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj
 //|         ...
 STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
+    espnow_check_for_deinit(self);
     common_hal_espnow_set_pmk(self, common_hal_espnow_get_bytes_len(key, ESP_NOW_KEY_LEN));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 
 //|     buffer_size: int
-//|     """The size of the internal ring buffer."""
+//|     """The size of the internal ring buffer. (read-only)"""
 //|
 STATIC mp_obj_t espnow_get_buffer_size(const mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(self->recv_buffer_size);
+    return mp_obj_new_int_from_uint(self->recv_buffer_size);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_buffer_size_obj, espnow_get_buffer_size);
 
-STATIC mp_obj_t espnow_set_buffer_size(const mp_obj_t self_in, const mp_obj_t value) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
-    common_hal_espnow_set_buffer_size(self, mp_obj_get_int(value));
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_buffer_size_obj, espnow_set_buffer_size);
-
-MP_PROPERTY_GETSET(espnow_buffer_size_obj,
-    (mp_obj_t)&espnow_get_buffer_size_obj,
-    (mp_obj_t)&espnow_set_buffer_size_obj);
+MP_PROPERTY_GETTER(espnow_buffer_size_obj,
+    (mp_obj_t)&espnow_get_buffer_size_obj);
 
 //|     phy_rate: int
 //|     """The ESP-NOW physical layer rate."""
@@ -146,7 +254,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_phy_rate_obj, espnow_get_phy_rate);
 
 STATIC mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
+    espnow_check_for_deinit(self);
     common_hal_espnow_set_phy_rate(self, mp_obj_get_int(value));
     return mp_const_none;
 }
@@ -156,30 +264,6 @@ MP_PROPERTY_GETSET(espnow_phy_rate_obj,
     (mp_obj_t)&espnow_get_phy_rate_obj,
     (mp_obj_t)&espnow_set_phy_rate_obj);
 
-//|     send: Communicate
-//|     """A `Communicate` object with ``job`` set to ``send``. (read-only)"""
-//|
-STATIC mp_obj_t espnow_get_send(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(self->send);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_send_obj, espnow_get_send);
-
-MP_PROPERTY_GETTER(espnow_send_obj,
-    (mp_obj_t)&espnow_get_send_obj);
-
-//|     read: Communicate
-//|     """A `Communicate` object with ``job`` set to ``read``. (read-only)"""
-//|
-STATIC mp_obj_t espnow_get_read(mp_obj_t self_in) {
-    espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(self->read);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_read_obj, espnow_get_read);
-
-MP_PROPERTY_GETTER(espnow_read_obj,
-    (mp_obj_t)&espnow_get_read_obj);
-
 // --- Peer Related Properties ---
 
 //|     peers: Peers
@@ -202,15 +286,21 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
     // Deinit the object
     { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&espnow_deinit_obj) },
 
+    // Send messages
+    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send_success),MP_ROM_PTR(&espnow_send_success_obj)},
+    { MP_ROM_QSTR(MP_QSTR_send_failure),MP_ROM_PTR(&espnow_send_failure_obj)},
+
+    // Read messages
+    { MP_ROM_QSTR(MP_QSTR_read),        MP_ROM_PTR(&espnow_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read_success),MP_ROM_PTR(&espnow_read_success_obj)},
+    { MP_ROM_QSTR(MP_QSTR_read_failure),MP_ROM_PTR(&espnow_read_failure_obj)},
+
     // Config parameters
     { MP_ROM_QSTR(MP_QSTR_set_pmk),     MP_ROM_PTR(&espnow_set_pmk_obj) },
     { MP_ROM_QSTR(MP_QSTR_buffer_size), MP_ROM_PTR(&espnow_buffer_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_phy_rate),    MP_ROM_PTR(&espnow_phy_rate_obj) },
 
-    // Send and receive messages
-    { MP_ROM_QSTR(MP_QSTR_send),        MP_ROM_PTR(&espnow_send_obj) },
-    { MP_ROM_QSTR(MP_QSTR_read),        MP_ROM_PTR(&espnow_read_obj) },
-
     // Peer related properties
     { MP_ROM_QSTR(MP_QSTR_peers),       MP_ROM_PTR(&espnow_peers_obj) },
 };
@@ -222,7 +312,7 @@ STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
 STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
+    espnow_check_for_deinit(self);
     switch (request) {
         case MP_STREAM_POLL: {
             mp_uint_t flags = arg;
@@ -254,7 +344,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
 //|
 STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_espnow_check_for_deinit(self);
+    espnow_check_for_deinit(self);
     size_t len = ringbuf_num_filled(self->recv_buffer);
     switch (op) {
         case MP_UNARY_OP_BOOL:
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index b76e250f49..da15be49ea 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -27,7 +27,6 @@
 #include "bindings/espnow/__init__.h"
 #include "bindings/espnow/ESPNow.h"
 #include "bindings/espnow/ESPNowPacket.h"
-#include "bindings/espnow/Communicate.h"
 #include "bindings/espnow/Peer.h"
 #include "bindings/espnow/Peers.h"
 
@@ -83,7 +82,6 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
     // module classes
     { MP_ROM_QSTR(MP_QSTR_ESPNow),      MP_ROM_PTR(&espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowPacket),MP_ROM_PTR(&espnow_packet_type_obj) },
-    { MP_ROM_QSTR(MP_QSTR_Communicate), MP_ROM_PTR(&espnow_com_type) },
     { MP_ROM_QSTR(MP_QSTR_Peer),        MP_ROM_PTR(&espnow_peer_type) },
     { MP_ROM_QSTR(MP_QSTR_Peers),       MP_ROM_PTR(&espnow_peers_type) },
 };
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 662da8cf45..a048c7f9f1 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -79,9 +79,9 @@ typedef struct {
 static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (status == ESP_NOW_SEND_SUCCESS) {
-        self->send->success++;
+        self->send_success++;
     } else {
-        self->send->failure++;
+        self->send_failure++;
     }
 }
 
@@ -93,7 +93,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_t *buf = self->recv_buffer;
 
     if (sizeof(espnow_packet_t) + msg_len > ringbuf_num_empty(buf)) {
-        self->read->failure++;
+        self->read_failure++;
         return;
     }
 
@@ -120,7 +120,7 @@ static void recv_cb(const uint8_t *mac, const uint8_t *msg, int msg_len) {
     ringbuf_put_n(buf, mac, ESP_NOW_ETH_ALEN);
     ringbuf_put_n(buf, msg, msg_len);
 
-    self->read->success++;
+    self->read_success++;
 }
 
 bool common_hal_espnow_deinited(espnow_obj_t *self) {
@@ -129,14 +129,9 @@ bool common_hal_espnow_deinited(espnow_obj_t *self) {
 
 // Construct the ESPNow object
 void common_hal_espnow_construct(espnow_obj_t *self, mp_int_t buffer_size, mp_int_t phy_rate) {
-    common_hal_espnow_set_buffer_size(self, buffer_size);
     common_hal_espnow_set_phy_rate(self, phy_rate);
-
-    self->send = espnow_com_new(MP_QSTR_send);
-    self->read = espnow_com_new(MP_QSTR_read);
-
+    self->recv_buffer_size = mp_arg_validate_int_min(buffer_size, MIN_PACKET_LEN, MP_QSTR_buffer_size);
     self->peers = espnow_peers_new();
-
     common_hal_espnow_init(self);
 }
 
@@ -185,10 +180,6 @@ void espnow_reset(void) {
     MP_STATE_PORT(espnow_singleton) = NULL;
 }
 
-void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value) {
-    self->recv_buffer_size = mp_arg_validate_int_min(value, MIN_PACKET_LEN, MP_QSTR_buffer_size);
-};
-
 void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value) {
     self->phy_rate = mp_arg_validate_int_range(value, 0, WIFI_PHY_RATE_MAX - 1, MP_QSTR_phy_rate);
 };
diff --git a/ports/espressif/common-hal/espnow/ESPNow.h b/ports/espressif/common-hal/espnow/ESPNow.h
index 21f1646825..6240788603 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.h
+++ b/ports/espressif/common-hal/espnow/ESPNow.h
@@ -29,20 +29,20 @@
 #include "py/obj.h"
 #include "py/ringbuf.h"
 
-#include "bindings/espnow/Communicate.h"
 #include "bindings/espnow/Peers.h"
 
 #include "esp_wifi.h"
 
-// The data structure for the espnow_singleton.
 typedef struct _espnow_obj_t {
     mp_obj_base_t base;
-    ringbuf_t *recv_buffer;     // A buffer for received packets
-    size_t recv_buffer_size;    // The size of the recv_buffer
-    wifi_phy_rate_t phy_rate;   // The ESP-NOW physical layer rate.
-    espnow_com_obj_t *send;     // For keeping tx stats
-    espnow_com_obj_t *read;     // For keeping rx stats
-    espnow_peers_obj_t *peers;  // The sequence of peers
+    ringbuf_t *recv_buffer;
+    size_t recv_buffer_size;
+    wifi_phy_rate_t phy_rate;
+    espnow_peers_obj_t *peers;
+    volatile size_t send_success;
+    volatile size_t send_failure;
+    volatile size_t read_success;
+    volatile size_t read_failure;
 } espnow_obj_t;
 
 extern void espnow_reset(void);
@@ -52,7 +52,6 @@ extern void common_hal_espnow_init(espnow_obj_t *self);
 extern void common_hal_espnow_deinit(espnow_obj_t *self);
 extern bool common_hal_espnow_deinited(espnow_obj_t *self);
 
-extern void common_hal_espnow_set_buffer_size(espnow_obj_t *self, mp_int_t value);
 extern void common_hal_espnow_set_phy_rate(espnow_obj_t *self, mp_int_t value);
 extern void common_hal_espnow_set_pmk(espnow_obj_t *self, const uint8_t *key);
 
diff --git a/ports/espressif/common-hal/espnow/__init__.c b/ports/espressif/common-hal/espnow/__init__.c
index 77196f3349..effc752f79 100644
--- a/ports/espressif/common-hal/espnow/__init__.c
+++ b/ports/espressif/common-hal/espnow/__init__.c
@@ -27,14 +27,6 @@
 #include "common-hal/espnow/__init__.h"
 
 #include "py/runtime.h"
-#include "shared-bindings/util.h"
-
-// Raise ValueError if the ESPNow object is deinited
-void common_hal_espnow_check_for_deinit(espnow_obj_t *self) {
-    if (common_hal_espnow_deinited(self)) {
-        raise_deinited_error();
-    }
-}
 
 // Return C pointer to byte memory string/bytes/bytearray in obj.
 // Raise ValueError if the length does not match expected len.
diff --git a/ports/espressif/common-hal/espnow/__init__.h b/ports/espressif/common-hal/espnow/__init__.h
index 068da3507a..bb1950d98c 100644
--- a/ports/espressif/common-hal/espnow/__init__.h
+++ b/ports/espressif/common-hal/espnow/__init__.h
@@ -26,7 +26,5 @@
 
 #pragma once
 
-#include "common-hal/espnow/ESPNow.h"
-
-extern void common_hal_espnow_check_for_deinit(espnow_obj_t *self);
+#include "py/obj.h"
 extern const uint8_t *common_hal_espnow_get_bytes_len(mp_obj_t obj, size_t len);

From bc8f89b19577f83dc3d0773665fcf4da521b2b77 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Wed, 8 Mar 2023 09:45:27 +0000
Subject: [PATCH 2000/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1004 of 1004 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 8f6f61b802..ee2c98a23b 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-02-24 23:20+0000\n"
-"Last-Translator: Luis Ruiz San Segundo \n"
+"PO-Revision-Date: 2023-03-09 10:38+0000\n"
+"Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "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.16-dev\n"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 #: main.c
 msgid ""
@@ -848,11 +848,11 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "Las matrices de coordenadas tienen diferentes longitudes"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "Las matrices de coordenadas tienen diferentes tamaños"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"

From 005436278473f6326e41b79edbc612ab5d26b22a Mon Sep 17 00:00:00 2001
From: BrainBoardz <87398149+BrainBoardz@users.noreply.github.com>
Date: Thu, 9 Mar 2023 10:26:54 -0500
Subject: [PATCH 2001/2403] Updated Pin Assignments (Add SPI definition)

Changed incorrect i2C pins assignment in mpconfigboard.h (changed SDA/SCL to GPIO 8/GPIO 9.
Rename  SD_MOSI, SD_MISO and SD_SCK to MOSI, MISO and SCK
Added SPI define in mpconfigboard.h for SPI
---
 ports/espressif/boards/brainboardz_neuron/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c
index b436045b05..5c198c20a7 100755
--- a/ports/espressif/boards/brainboardz_neuron/pins.c
+++ b/ports/espressif/boards/brainboardz_neuron/pins.c
@@ -63,7 +63,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
     { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
     { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
 };

From de3c5ad2f4c71170bb7f5e1e94c4159ef9f07cf2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 11:00:55 -0500
Subject: [PATCH 2002/2403] add blank lines around aliased pins

---
 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
index b352cd96e2..f8618cd6d1 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -12,10 +12,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
 
@@ -27,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
 

From a2cb953eac8f77223595f420432da79328af5b95 Mon Sep 17 00:00:00 2001
From: root 
Date: Wed, 8 Mar 2023 13:09:45 -0600
Subject: [PATCH 2003/2403] Fix for issue #7054 by avoiding recursive calls to
 websocket_background.

---
 supervisor/shared/web_workflow/websocket.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index 7612066fa6..e55e09b3e7 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -52,6 +52,8 @@ typedef struct {
 // interrupt character.
 STATIC ringbuf_t _incoming_ringbuf;
 STATIC uint8_t _buf[16];
+// make sure background is not called recursively
+STATIC bool in_web_background = false;
 
 static _websocket cp_serial;
 
@@ -244,6 +246,10 @@ void websocket_background(void) {
     if (!websocket_connected()) {
         return;
     }
+    if (in_web_background) {
+        return;
+    }
+    in_web_background = true;
     uint8_t c;
     while (ringbuf_num_empty(&_incoming_ringbuf) > 0 &&
            _read_next_payload_byte(&c)) {
@@ -253,4 +259,5 @@ void websocket_background(void) {
         }
         ringbuf_put(&_incoming_ringbuf, c);
     }
+    in_web_background = false;
 }

From 2ebc0ea51ca22a0e32d1d2d2ead7000bca971bfa Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 11:30:38 -0500
Subject: [PATCH 2004/2403] GitHub online editor introduced spaces on blank
 lines :(

---
 ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
index f8618cd6d1..e014ace05a 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -15,10 +15,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
 

From 96e2a72d7159e6bb2dd449a8390faca97eec409f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 11:53:16 -0500
Subject: [PATCH 2005/2403] run background tasks during multi-part DMA

---
 ports/atmel-samd/common-hal/busio/SPI.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c
index 720f487bb1..02776928ca 100644
--- a/ports/atmel-samd/common-hal/busio/SPI.c
+++ b/ports/atmel-samd/common-hal/busio/SPI.c
@@ -271,10 +271,17 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
         size_t bytes_remaining = len;
 
         // Maximum DMA transfer is 65535
-        while (bytes_remaining > 0) {
+        while (1) {
             size_t to_send = (bytes_remaining > 65535) ? 65535 : bytes_remaining;
             status = sercom_dma_write(self->spi_desc.dev.prvt, data + (len - bytes_remaining), to_send);
             bytes_remaining -= to_send;
+            if (bytes_remaining > 0) {
+                // Multi-part transfer; let other things run before doing the next chunk.
+                RUN_BACKGROUND_TASKS;
+            } else {
+                // All done.
+                break;
+            }
         }
     } else {
         struct io_descriptor *spi_io;

From 58f28b98be93a25ebe1d75fbfff2b4a1ebff7009 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+microdev1@users.noreply.github.com>
Date: Fri, 10 Mar 2023 00:01:44 +0530
Subject: [PATCH 2006/2403] minor doc fix

Co-authored-by: Scott Shawcroft 
---
 ports/espressif/bindings/espnow/ESPNow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index d2f5d2268f..513966e1e8 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -118,7 +118,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj
 //|     def send(
 //|         self,
 //|         message: ReadableBuffer,
-//|         peer: Peer,
+//|         peer: Optional[Peer] = None,
 //|     ) -> None:
 //|         """Send a message to the peer's mac address.
 //|

From ec2101f4aa5a94d3592a9fedd1672ec896d28463 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 13:18:54 -0500
Subject: [PATCH 2007/2403] update tinyusb to latest

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 73896a3b71..990fb6ae5c 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 73896a3b71c525a3ee4cefa7e35ce3b3a93786ef
+Subproject commit 990fb6ae5c4d9d4b77c5a9ecb3a2abe899dd2712

From 0f31ba676b187d2d641eabb8cce4a298cea3ae8e Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 17:40:53 -0500
Subject: [PATCH 2008/2403] update errata fixes for RP2040

---
 ports/raspberrypi/sdk_config/pico/config_autogen.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/raspberrypi/sdk_config/pico/config_autogen.h b/ports/raspberrypi/sdk_config/pico/config_autogen.h
index a29ccb458a..ee99b1c609 100644
--- a/ports/raspberrypi/sdk_config/pico/config_autogen.h
+++ b/ports/raspberrypi/sdk_config/pico/config_autogen.h
@@ -18,6 +18,8 @@
 #define PICO_NO_HARDWARE (0)
 #define PICO_ON_DEVICE (1)
 #define PICO_PRINTF_ALWAYS_INCLUDED (1)
+#define PICO_RP2040_USB_DEVICE_ENUMERATION_FIX (1)
+#define PICO_RP2040_USB_DEVICE_UFRAME_FIX (1)
 #define PICO_STDIO_IGNORE_NESTED_STDOUT (0)
 #define PICO_USE_CRT_PRINTF (0)
 #define PICO_USE_OPTIMISTIC_SBRK (0)

From 7f10f36dfbe4b5f48371e40e66157236b696f102 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 9 Mar 2023 23:18:58 -0500
Subject: [PATCH 2009/2403] usbh_control.c no longer exists

---
 supervisor/supervisor.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 801025f41a..c461c5353f 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -163,7 +163,6 @@ ifeq ($(CIRCUITPY_USB),1)
     SRC_SUPERVISOR += \
       lib/tinyusb/src/host/hub.c \
       lib/tinyusb/src/host/usbh.c \
-      lib/tinyusb/src/host/usbh_control.c \
 
   endif
 endif

From 64ba371f28c2f1a54e40183fa158e95331e128f3 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Mar 2023 15:02:10 +0530
Subject: [PATCH 2010/2403] conditionally run jobs on push

---
 .github/workflows/build.yml             | 18 ++++++++++++------
 .github/workflows/create-website-pr.yml |  2 +-
 .github/workflows/pre-commit.yml        |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bee5afdd6a..4383153fd1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,8 +9,6 @@ on:
   pull_request:
   release:
     types: [published]
-  check_suite:
-    types: [rerequested]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -64,24 +62,32 @@ jobs:
         PULL: ${{ github.event.number }}
         GITHUB_TOKEN: ${{ github.token }}
         EXCLUDE_COMMIT: ${{ github.event.pull_request.head.sha }}
-    - name: Set head sha
+    - name: Set head sha (pull)
       if: github.event_name == 'pull_request'
       run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
-    - name: Set base sha
+    - name: Set base sha (pull)
       if: github.event_name == 'pull_request'
       run: |
         git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
         echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
       env:
         DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
+    - name: Set head sha (push)
+      if: github.event_name == 'push'
+      run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
+    - name: Set base sha (push)
+      if: github.event_name == 'push'
+      run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
+      env:
+        SHA: ${{ github.event.before }}
     - name: Get changes
       id: get-changes
-      if: github.event_name == 'pull_request'
+      if: env.BASE_SHA && env.HEAD_SHA
       run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
     - name: Set matrix
       id: set-matrix
-      working-directory: tools
       run: python3 -u ci_set_matrix.py
+      working-directory: tools
       env:
         CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
diff --git a/.github/workflows/create-website-pr.yml b/.github/workflows/create-website-pr.yml
index eeae8c8299..7f047d4b1e 100644
--- a/.github/workflows/create-website-pr.yml
+++ b/.github/workflows/create-website-pr.yml
@@ -6,7 +6,7 @@ name: Update CircuitPython.org
 
 on:
   release:
-    types: [published, rerequested]
+    types: [published]
 
 jobs:
   website:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index c0dff33564..2a3fcf9439 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -5,8 +5,8 @@
 name: pre-commit
 
 on:
-  pull_request:
   push:
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

From 91d4fed01d80ee515ac50f19d98d9a0625131885 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:41:13 +0530
Subject: [PATCH 2011/2403] explicitly check for failure of certain jobs

---
 tools/ci_changes_per_commit.py | 18 +++++++++---------
 tools/ci_set_matrix.py         |  3 ---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
index e83a702b22..58e86148ed 100644
--- a/tools/ci_changes_per_commit.py
+++ b/tools/ci_changes_per_commit.py
@@ -171,8 +171,7 @@ def get_bad_check_runs(query_check_runs):
     more_pages = True
 
     run_types = ["failed", "incomplete"]
-
-    regex_matrix = re.compile(r"^\S+ \/ (build|run) \(\S+\)$")
+    have_dependent_jobs = ["scheduler", "mpy-cross", "tests"]
 
     while more_pages:
         check_runs = query_check_runs.fetch()["data"]["node"]
@@ -184,15 +183,16 @@ def get_bad_check_runs(query_check_runs):
 
             for check_run in check_runs[run_type]["nodes"]:
                 name = check_run["name"]
-                if name.startswith("ports") or regex_matrix.search(name):
-                    matrix = name.split(" ", 1)[0]
-                    matrix_job = name.rsplit(" (", 1)[1][:-1]
-                    bad_runs.setdefault(matrix, []).append(matrix_job)
-                elif name != "scheduler":
-                    bad_runs[name] = True
-                else:
+
+                if any([name.startswith(job) for job in have_dependent_jobs]):
                     return {}
 
+                if name.startswith("ports"):
+                    matrix_job = name.rsplit(" (", 1)[1][:-1]
+                    bad_runs.setdefault("ports", []).append(matrix_job)
+                else:
+                    bad_runs[name] = True
+
             if query_check_runs.paginate(
                 check_runs[run_type]["pageInfo"], "after" + run_type_camel
             ):
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index fe823ac030..b5618aec2f 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -98,9 +98,6 @@ def set_output(name: str, value):
 
 
 def set_boards(build_all: bool):
-    if last_failed_jobs.get("mpy-cross") or last_failed_jobs.get("tests"):
-        build_all = True
-
     # Get boards in json format
     boards_info_json = build_board_info.get_board_mapping()
     all_board_ids = set()

From 77ec3e4b76005d780a9868a1099f61b1b7da0bde Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Fri, 10 Mar 2023 18:22:08 +0100
Subject: [PATCH 2012/2403] 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             | 30 +++++++++++++++---------------
 locale/cs.po             | 30 +++++++++++++++---------------
 locale/de_DE.po          | 30 +++++++++++++++---------------
 locale/el.po             | 30 +++++++++++++++---------------
 locale/en_GB.po          | 30 +++++++++++++++---------------
 locale/es.po             | 30 +++++++++++++++---------------
 locale/fil.po            | 30 +++++++++++++++---------------
 locale/fr.po             | 30 +++++++++++++++---------------
 locale/hi.po             | 30 +++++++++++++++---------------
 locale/it_IT.po          | 30 +++++++++++++++---------------
 locale/ja.po             | 30 +++++++++++++++---------------
 locale/ko.po             | 30 +++++++++++++++---------------
 locale/nl.po             | 30 +++++++++++++++---------------
 locale/pl.po             | 30 +++++++++++++++---------------
 locale/pt_BR.po          | 30 +++++++++++++++---------------
 locale/ru.po             | 30 +++++++++++++++---------------
 locale/sv.po             | 30 +++++++++++++++---------------
 locale/tr.po             | 30 +++++++++++++++---------------
 locale/zh_Latn_pinyin.po | 30 +++++++++++++++---------------
 19 files changed, 285 insertions(+), 285 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index b30c7d5d9c..f6960665b4 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -147,7 +147,7 @@ msgstr "%q indeks di luar batas"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s kesalahan 0x%x"
@@ -513,6 +513,7 @@ msgstr "Sudah disebarkan."
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -686,7 +687,7 @@ msgstr "Blok CBC harus merupakan kelipatan 16 byte"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1082,7 +1083,7 @@ msgstr "Fungsinya membutuhkan kunci"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1267,8 +1268,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumen tidak valid"
 
@@ -1294,7 +1294,7 @@ msgstr "Ukuran potongan format tidak valid"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1303,7 +1303,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1696,11 +1696,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Waktu habis"
 
@@ -1708,7 +1708,7 @@ msgstr "Waktu habis"
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
@@ -1891,7 +1891,7 @@ msgstr "Baca-saja"
 msgid "Read-only filesystem"
 msgstr "sistem file (filesystem) bersifat Read-only"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1911,7 +1911,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "Mode AES yang diminta tidak didukung"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2366,7 +2366,7 @@ msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
 msgid "Value length > max_length"
 msgstr "Panjang nilai > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/cs.po b/locale/cs.po
index 164f9c42ad..0ffdbdcc67 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -148,7 +148,7 @@ msgstr "Index %q je mimo rozsah"
 msgid "%q init failed"
 msgstr "Inicializace %q selhala"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr "%q, %q, a %q musí mít všechny shodnou délku"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s chyba 0x%x"
@@ -514,6 +514,7 @@ msgstr "Již propagujeme."
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -687,7 +688,7 @@ msgstr "Bloky CBC musí být násobky 16 bajtů"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "Disk CIRCUITPY nelze nalézt nebo vytvořit."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1082,7 +1083,7 @@ msgstr "Funkce vyžaduje zámek"
 msgid "GNSS init"
 msgstr "Inicializace GNSS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Základní chyba"
 
@@ -1267,8 +1268,7 @@ msgstr "Chybné BSSID"
 msgid "Invalid MAC address"
 msgstr "Chybná MAC adresa"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Neplatný argument"
 
@@ -1294,7 +1294,7 @@ msgstr "Neplatná velikost bloku"
 msgid "Invalid multicast MAC address"
 msgstr "Chybná multicastová MAC adresa"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Chybná velikost"
 
@@ -1303,7 +1303,7 @@ msgstr "Chybná velikost"
 msgid "Invalid socket for TLS"
 msgstr "Chybný soket pro TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Chybný stav"
 
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC adresa byla chybná"
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1704,7 +1704,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1882,7 +1882,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2353,7 +2353,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index fd309dd287..9f2c83e8cc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -155,7 +155,7 @@ msgstr "Der Index %q befindet sich außerhalb des Bereiches"
 msgid "%q init failed"
 msgstr "%q Initialisierung ist gescheitert"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q ist %q"
 
@@ -255,7 +255,7 @@ msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s Fehler 0x%x"
@@ -523,6 +523,7 @@ msgstr "Bereits am Anbieten (advertising)."
 msgid "Already have all-matches listener"
 msgstr "All-Matchers-Listener bereits vorhanden"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -696,7 +697,7 @@ msgstr "CBC-Blöcke müssen ein Vielfaches von 16 Bytes sein"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY-Laufwerk konnte nicht gefunden oder erzeugt werden."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC oder Checksumme ungültig"
 
@@ -1101,7 +1102,7 @@ msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
 msgid "GNSS init"
 msgstr "GNSS-Initialisierung"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Generischer Fehler"
 
@@ -1290,8 +1291,7 @@ msgstr "Ungültige BSSID"
 msgid "Invalid MAC address"
 msgstr "Ungültige MAC-Adresse"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
 
@@ -1317,7 +1317,7 @@ msgstr "Ungültige format chunk size"
 msgid "Invalid multicast MAC address"
 msgstr "Ungültige Multicast-MAC-Adresse"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
@@ -1326,7 +1326,7 @@ msgstr "Ungültige Größe"
 msgid "Invalid socket for TLS"
 msgstr "Ungültiges Socket für TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Ungültiger Zustand"
 
@@ -1358,7 +1358,7 @@ msgstr "Ebene ist bereits in der Gruppe"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Ebene muss eine Gruppe oder eine TileGrid Subklasse sein"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC Adresse war ungültig"
 
@@ -1721,11 +1721,11 @@ msgstr "Nur eine Farbe kann transparent sein zu einer Zeit"
 msgid "Operation not permitted"
 msgstr "Operation nicht erlaubt"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "Vorgang oder Funktion wird nicht unterstützt"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Zeit für Vorgang abgelaufen"
 
@@ -1733,7 +1733,7 @@ msgstr "Zeit für Vorgang abgelaufen"
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Kein Speicher mehr verfügbar"
 
@@ -1915,7 +1915,7 @@ msgstr "Nur lesen möglich, da Schreibgeschützt"
 msgid "Read-only filesystem"
 msgstr "Schreibgeschützte Dateisystem"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "Erhaltene Antwort ist ungültig"
 
@@ -1935,7 +1935,7 @@ msgstr "RemoteTransmissionRequests limitiert auf 8 Bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Der angeforderte AES-Modus wird nicht unterstützt"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Angefragte Ressource nicht gefunden"
 
@@ -2396,7 +2396,7 @@ msgstr "Wert Länge != Erforderliche feste Länge"
 msgid "Value length > max_length"
 msgstr "Länge des Wertes > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "Version ist ungültig"
 
diff --git a/locale/el.po b/locale/el.po
index b36d0a39b6..81118aa8fd 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -152,7 +152,7 @@ msgstr "%q δείκτης εκτός εμβέλειας"
 msgid "%q init failed"
 msgstr "%q εκκίνηση απέτυχε"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr "%q, %q, και %q πρέπει να είναι όλα του ιδίου
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s σφάλμα 0x%x"
@@ -519,6 +519,7 @@ msgstr "Ήδη διαφημίζουμε."
 msgid "Already have all-matches listener"
 msgstr "Ύπάρχει ήδη all-matches ακροατής"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -692,7 +693,7 @@ msgstr "CBC blocks πρέπει να είναι πολλαπλάσια του 16
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "Ο CIRCUITPY δίσκος δεν μπόρεσε να βρεθεί ή να δημιουργηθεί."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC ή checksum ήταν άκυρο"
 
@@ -1093,7 +1094,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1276,8 +1277,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
 
@@ -1303,7 +1303,7 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1312,7 +1312,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1700,11 +1700,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1712,7 +1712,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1890,7 +1890,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1910,7 +1910,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2361,7 +2361,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index b1c1c46b50..9ced3137b9 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -151,7 +151,7 @@ msgstr "%q index out of range"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr "%q, %q, and %q must all be the same length"
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s error 0x%x"
@@ -517,6 +517,7 @@ msgstr "Already advertising."
 msgid "Already have all-matches listener"
 msgstr "Already have all-matches listener"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -690,7 +691,7 @@ msgstr "CBC blocks must be multiples of 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC or checksum was invalid"
 
@@ -1083,7 +1084,7 @@ msgstr "Function requires lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Generic Failure"
 
@@ -1268,8 +1269,7 @@ msgstr "Invalid BSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
@@ -1295,7 +1295,7 @@ msgstr "Invalid format chunk size"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Invalid size"
 
@@ -1304,7 +1304,7 @@ msgstr "Invalid size"
 msgid "Invalid socket for TLS"
 msgstr "Invalid socket for TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Invalid state"
 
@@ -1336,7 +1336,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC address was invalid"
 
@@ -1696,11 +1696,11 @@ msgstr "Only one colour can be transparent at a time"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "Operation or feature not supported"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Operation timed out"
 
@@ -1708,7 +1708,7 @@ msgstr "Operation timed out"
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Out of memory"
 
@@ -1888,7 +1888,7 @@ msgstr "Read-only"
 msgid "Read-only filesystem"
 msgstr "Read-only filesystem"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "Received response was invalid"
 
@@ -1908,7 +1908,7 @@ msgstr "RemoteTransmissionRequests limited to 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Requested AES mode is unsupported"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Requested resource not found"
 
@@ -2361,7 +2361,7 @@ msgstr "Value length != required fixed length"
 msgid "Value length > max_length"
 msgstr "Value length > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "Version was invalid"
 
diff --git a/locale/es.po b/locale/es.po
index ee2c98a23b..ee2af9d603 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -163,7 +163,7 @@ msgstr "%q índice fuera de rango"
 msgid "%q init failed"
 msgstr "%q inicializado fallido"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q es %q"
 
@@ -261,7 +261,7 @@ msgstr "%q, %q, y %q deben tener la misma longitud"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s error 0x%x"
@@ -531,6 +531,7 @@ msgstr "Ya se encuentra publicando."
 msgid "Already have all-matches listener"
 msgstr "Ya se tiene un escucha de todas las coincidencias"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -706,7 +707,7 @@ msgstr "Los bloques CBC deben ser múltiplos de 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "El dispositivo CIRCUITPY no pudo ser encontrado o creado."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC o suma de comprobación inválida"
 
@@ -1112,7 +1113,7 @@ msgstr "La función requiere lock"
 msgid "GNSS init"
 msgstr "Inicialización GNSS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Fallo Genérico"
 
@@ -1305,8 +1306,7 @@ msgstr "BSSID inválido"
 msgid "Invalid MAC address"
 msgstr "Dirección MAC inválida"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
@@ -1332,7 +1332,7 @@ msgstr "Formato de fragmento de formato no válido"
 msgid "Invalid multicast MAC address"
 msgstr "Dirección MAC de multidifusión inválida"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Tamaño incorrecto"
 
@@ -1341,7 +1341,7 @@ msgstr "Tamaño incorrecto"
 msgid "Invalid socket for TLS"
 msgstr "socket invalido para TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Estado invalido"
 
@@ -1373,7 +1373,7 @@ msgstr "El Layer ya esta en un grupo"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "El Layer debe ser un grupo o una subclase de TileGrid"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "La dirección MAC es incorrecta"
 
@@ -1739,11 +1739,11 @@ msgstr "Solo un color puede ser transparente a la vez"
 msgid "Operation not permitted"
 msgstr "La operación no es permitida"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "Operación no característica no soportada"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Tiempo de espera agotado"
 
@@ -1751,7 +1751,7 @@ msgstr "Tiempo de espera agotado"
 msgid "Out of MDNS service slots"
 msgstr "No hay slots MDNS de servicio"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Memoria agotada"
 
@@ -1935,7 +1935,7 @@ msgstr "Solo-lectura"
 msgid "Read-only filesystem"
 msgstr "Sistema de archivos de solo-Lectura"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "La respuesta recibida es invalida"
 
@@ -1955,7 +1955,7 @@ msgstr "RemoteTransmissionRequests limitado a 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "El modo AES solicitado no es compatible"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Recurso solicitado no encontrado"
 
@@ -2416,7 +2416,7 @@ msgstr "Tamaño del valor != del tamaño fijo requerido"
 msgid "Value length > max_length"
 msgstr "Tamaño de valor > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "La versión era invalida"
 
diff --git a/locale/fil.po b/locale/fil.po
index 02b8fda384..f943746a34 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -145,7 +145,7 @@ msgstr "%q indeks wala sa sakop"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -687,7 +688,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1082,7 +1083,7 @@ msgstr "Function nangangailangan ng lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1267,8 +1268,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Maling argumento"
 
@@ -1294,7 +1294,7 @@ msgstr "Mali ang format ng chunk size"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1303,7 +1303,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1694,11 +1694,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1706,7 +1706,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1883,7 +1883,7 @@ msgstr "Basahin-lamang"
 msgid "Read-only filesystem"
 msgstr "Basahin-lamang mode"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1903,7 +1903,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2356,7 +2356,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/fr.po b/locale/fr.po
index 322314b018..424e16a1b5 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -160,7 +160,7 @@ msgstr "index %q hors de portée"
 msgid "%q init failed"
 msgstr "échec de l'initialisation %q"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr "%q, %q, et %q doivent tous être de la même longueur"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s erreur 0x%x"
@@ -526,6 +526,7 @@ msgstr "S'annonce déjà."
 msgid "Already have all-matches listener"
 msgstr "Il y a déjà un auditeur all-matches"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -701,7 +702,7 @@ msgstr "Les blocs CBC doivent être des multiples de 16 octets"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "L'appareil CIRCUITPY ne peut pas être trouvé ou créé."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC ou somme de contrôle invalide"
 
@@ -1115,7 +1116,7 @@ msgstr "La fonction nécessite un verrou ('lock')"
 msgid "GNSS init"
 msgstr "Initialisation GNSS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Échec génerique"
 
@@ -1311,8 +1312,7 @@ msgstr "BSSID invalide"
 msgid "Invalid MAC address"
 msgstr "Adresse MAC invalide"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Paramètre invalide"
 
@@ -1338,7 +1338,7 @@ msgstr "Taille de bloc de formatage invalide"
 msgid "Invalid multicast MAC address"
 msgstr "Adresse MAC multicast invalide"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Taille invalide"
 
@@ -1347,7 +1347,7 @@ msgstr "Taille invalide"
 msgid "Invalid socket for TLS"
 msgstr "Socket non valide pour TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "État invalide"
 
@@ -1379,7 +1379,7 @@ msgstr "Ce calque est déjà dans un groupe"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Le calque doit être une sous-classe de Group ou TileGrid"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "Adresse physique (MAC) invalide"
 
@@ -1745,11 +1745,11 @@ msgstr "Une seule couleur peut être transparente à la fois"
 msgid "Operation not permitted"
 msgstr "Cette opération n'est pas permise"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "Opération ou fonction non supportée"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Timeout de l'opération"
 
@@ -1757,7 +1757,7 @@ msgstr "Timeout de l'opération"
 msgid "Out of MDNS service slots"
 msgstr "À cours de services MDNS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
@@ -1942,7 +1942,7 @@ msgstr "Lecture seule"
 msgid "Read-only filesystem"
 msgstr "Système de fichier en lecture seule"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "Réponse reçue invalide"
 
@@ -1962,7 +1962,7 @@ msgstr "RemoteTransmissionRequests limité à 8 octets"
 msgid "Requested AES mode is unsupported"
 msgstr "Le mode AES demandé n'est pas supporté"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Resource demandée non trouvée"
 
@@ -2423,7 +2423,7 @@ msgstr "Longueur de valeur != Longueur fixe requise"
 msgid "Value length > max_length"
 msgstr "Longueur de la valeur > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "Version est invalide"
 
diff --git a/locale/hi.po b/locale/hi.po
index 649b98c521..94a42e19f8 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -144,7 +144,7 @@ msgstr ""
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -510,6 +510,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -681,7 +682,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1072,7 +1073,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1255,8 +1256,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
 
@@ -1282,7 +1282,7 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1291,7 +1291,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1323,7 +1323,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1679,11 +1679,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1867,7 +1867,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1887,7 +1887,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2338,7 +2338,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a6ab324c58..5fb7e50d6b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -148,7 +148,7 @@ msgstr "indice %q fuori intervallo"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s errore 0x%x"
@@ -516,6 +516,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr "Già in possesso di tutti i listener abbinati"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -690,7 +691,7 @@ msgstr "I blocchi CBC devono essere multipli di 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC o controllo totale è risultato non valido"
 
@@ -1084,7 +1085,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1269,8 +1270,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
@@ -1296,7 +1296,7 @@ msgstr ""
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1305,7 +1305,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1698,11 +1698,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1710,7 +1710,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1890,7 +1890,7 @@ msgstr "Sola lettura"
 msgid "Read-only filesystem"
 msgstr "Filesystem in sola lettura"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1910,7 +1910,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2363,7 +2363,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/ja.po b/locale/ja.po
index e8a70816c8..7e63cb55c3 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -151,7 +151,7 @@ msgstr "%q インデックスは範囲外"
 msgid "%q init failed"
 msgstr "%qは初期化には失敗"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%qは%q"
 
@@ -249,7 +249,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -517,6 +517,7 @@ msgstr "すでにアドバータイズ中"
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -690,7 +691,7 @@ msgstr "CBCブロックは16バイトの整数倍でなければなりません"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1083,7 +1084,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1268,8 +1269,7 @@ msgstr "不正なBSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "不正な引数"
 
@@ -1295,7 +1295,7 @@ msgstr "フォーマットチャンクのサイズが不正"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1304,7 +1304,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1336,7 +1336,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1694,11 +1694,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1706,7 +1706,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1883,7 +1883,7 @@ msgstr "読み込み専用"
 msgid "Read-only filesystem"
 msgstr "読み込み専用のファイルシステム"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1903,7 +1903,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "要求のAESモードは非対応"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2355,7 +2355,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 6b09cf6e94..129c9b4bcd 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -145,7 +145,7 @@ msgstr "%q 인덱스 범위를 벗어났습니다"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -511,6 +511,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -684,7 +685,7 @@ msgstr ""
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1075,7 +1076,7 @@ msgstr ""
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1258,8 +1259,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr ""
 
@@ -1285,7 +1285,7 @@ msgstr "형식 청크 크기가 잘못되었습니다"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1294,7 +1294,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1326,7 +1326,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1682,11 +1682,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1694,7 +1694,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1870,7 +1870,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1890,7 +1890,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index 90c3e8130e..87fdb61c60 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -144,7 +144,7 @@ msgstr "%q index buiten bereik"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -510,6 +510,7 @@ msgstr "Advertising is al bezig."
 msgid "Already have all-matches listener"
 msgstr "Heeft al een luisteraar voor 'all-matches'"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -683,7 +684,7 @@ msgstr "CBC blocks moeten meervouden van 16 bytes zijn"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1078,7 +1079,7 @@ msgstr "Functie vereist lock"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1263,8 +1264,7 @@ msgstr "Ongeldig BSSID"
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ongeldig argument"
 
@@ -1290,7 +1290,7 @@ msgstr "Ongeldig formaat stuk grootte"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr ""
 
@@ -1299,7 +1299,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr ""
 
@@ -1331,7 +1331,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1693,11 +1693,11 @@ msgstr "Er kan maar één kleur per keer transparant zijn"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1705,7 +1705,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1888,7 +1888,7 @@ msgstr "Alleen-lezen"
 msgid "Read-only filesystem"
 msgstr "Alleen-lezen bestandssysteem"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1908,7 +1908,7 @@ msgstr "RemoteTransmissionRequests is beperkt tot 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "Gevraagde AES modus is niet ondersteund"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2361,7 +2361,7 @@ msgstr "Waarde lengte != vereist vaste lengte"
 msgid "Value length > max_length"
 msgstr "Waarde length > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/pl.po b/locale/pl.po
index b48ca01b81..1348c0f321 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -146,7 +146,7 @@ msgstr "%q poza zakresem"
 msgid "%q init failed"
 msgstr ""
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "%q=%q"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr ""
@@ -512,6 +512,7 @@ msgstr ""
 msgid "Already have all-matches listener"
 msgstr ""
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -685,7 +686,7 @@ msgstr "Bloki CBC muszą być wielokrotnościami 16 bajtów"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr ""
 
@@ -1078,7 +1079,7 @@ msgstr "Funkcja wymaga blokady"
 msgid "GNSS init"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1263,8 +1264,7 @@ msgstr ""
 msgid "Invalid MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Zły argument"
 
@@ -1290,7 +1290,7 @@ msgstr "Zła wielkość fragmentu formatu"
 msgid "Invalid multicast MAC address"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Nieprawidłowy rozmiar"
 
@@ -1299,7 +1299,7 @@ msgstr "Nieprawidłowy rozmiar"
 msgid "Invalid socket for TLS"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Nieprawidłowy stan"
 
@@ -1331,7 +1331,7 @@ msgstr ""
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr ""
 
@@ -1687,11 +1687,11 @@ msgstr "W danym momencie przezroczysty może być tylko jeden kolor"
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1699,7 +1699,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
@@ -1875,7 +1875,7 @@ msgstr "Tylko do odczytu"
 msgid "Read-only filesystem"
 msgstr "System plików tylko do odczytu"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "Otrzymana odpowiedź była nieprawidłowa"
 
@@ -1895,7 +1895,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr "Żądany tryb AES nie jest obsługiwany"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Nie znaleziono żądanego zasobu"
 
@@ -2346,7 +2346,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 618f8c6379..fdf2eaaf31 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -161,7 +161,7 @@ msgstr "O índice %q está fora do intervalo"
 msgid "%q init failed"
 msgstr "a inicialização do %q falhou"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q é %q"
 
@@ -259,7 +259,7 @@ msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s erro 0x%x"
@@ -531,6 +531,7 @@ msgstr "Já está anunciando."
 msgid "Already have all-matches listener"
 msgstr "Já há um ouvinte com todas as correspondências"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -706,7 +707,7 @@ msgstr "Os blocos CBC devem ter múltiplos de 16 bytes"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "A unidade CIRCUITPY não pôde ser encontrada nem criada."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC ou checksum inválido"
 
@@ -1108,7 +1109,7 @@ msgstr "A função requer bloqueio"
 msgid "GNSS init"
 msgstr "Inicialização do GNSS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Falha Genérica"
 
@@ -1301,8 +1302,7 @@ msgstr "BSSID Inválido"
 msgid "Invalid MAC address"
 msgstr "Endereço MAC inválido"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
@@ -1328,7 +1328,7 @@ msgstr "Tamanho do pedaço de formato inválido"
 msgid "Invalid multicast MAC address"
 msgstr "Endereço MAC multicast inválido"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
@@ -1337,7 +1337,7 @@ msgstr "Tamanho inválido"
 msgid "Invalid socket for TLS"
 msgstr "Soquete inválido para o TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Estado inválido"
 
@@ -1369,7 +1369,7 @@ msgstr "Camada já está num grupo"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "A camada deve ser uma subclasse Group ou TileGrid"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "Endereço MAC inválido"
 
@@ -1732,11 +1732,11 @@ msgstr "Apenas uma cor pode ser transparente de cada vez"
 msgid "Operation not permitted"
 msgstr "A operação não é permitida"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "A operação ou o recurso não é suportado"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "A operação expirou"
 
@@ -1744,7 +1744,7 @@ msgstr "A operação expirou"
 msgid "Out of MDNS service slots"
 msgstr "Sem slots do serviço MDNS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Sem memória"
 
@@ -1930,7 +1930,7 @@ msgstr "Somente leitura"
 msgid "Read-only filesystem"
 msgstr "Sistema de arquivos somente leitura"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "A resposta recebida foi inválida"
 
@@ -1950,7 +1950,7 @@ msgstr "As requisições de transmissões remotas é limitada a 8 bytes"
 msgid "Requested AES mode is unsupported"
 msgstr "O modo AES solicitado não é compatível"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "O recurso solicitado não foi encontrado"
 
@@ -2410,7 +2410,7 @@ msgstr "Comprimento do valor != comprimento fixo necessário"
 msgid "Value length > max_length"
 msgstr "O comprimento do valor é > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "A versão era inválida"
 
diff --git a/locale/ru.po b/locale/ru.po
index 50249c621d..0fe6cfac97 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -151,7 +151,7 @@ msgstr "Индекс %q вне диапазона"
 msgid "%q init failed"
 msgstr "Инициализация %q не удалась"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q является %q"
 
@@ -249,7 +249,7 @@ msgstr "%q, %q, и %q должны быть одной длинны"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s ошибка 0x%x"
@@ -517,6 +517,7 @@ msgstr "Уже объявляемся (advertising)."
 msgid "Already have all-matches listener"
 msgstr "Уже есть универсальный слушатель"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -694,7 +695,7 @@ msgstr "Блоки CBC должны быть кратны 16 байтам"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "Не удалось найти или создать диск CIRCUITPY."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC или контрольная сумма неправильная"
 
@@ -1109,7 +1110,7 @@ msgstr "Функция требует блокировки"
 msgid "GNSS init"
 msgstr "Инициализация GNSS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Общий сбой"
 
@@ -1300,8 +1301,7 @@ msgstr "Неверный BSSID"
 msgid "Invalid MAC address"
 msgstr "Неверный MAC-адрес"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
 
@@ -1327,7 +1327,7 @@ msgstr "Неверный размер блока формата"
 msgid "Invalid multicast MAC address"
 msgstr "Неверный MAC-адрес multicast"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Неверный размер"
 
@@ -1336,7 +1336,7 @@ msgstr "Неверный размер"
 msgid "Invalid socket for TLS"
 msgstr "Неверный сокет для TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Неверное состояние"
 
@@ -1370,7 +1370,7 @@ msgstr "Слой уже в группе (Group)"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Слой должен быть группой (Group) или субклассом TileGrid."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC адрес был недействительным"
 
@@ -1735,11 +1735,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1747,7 +1747,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1928,7 +1928,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1948,7 +1948,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/sv.po b/locale/sv.po
index 6ba1cdc1a2..84ce4b6ecb 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -160,7 +160,7 @@ msgstr "Index %q ligger utanför intervallet"
 msgid "%q init failed"
 msgstr "%q init misslyckades"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q är %q"
 
@@ -260,7 +260,7 @@ msgstr "%q, %q och %q måste vara lika långa"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s fel 0x%x"
@@ -528,6 +528,7 @@ msgstr "Annonserar redan."
 msgid "Already have all-matches listener"
 msgstr "Har redan lyssnare för all-matchningar"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -701,7 +702,7 @@ msgstr "CBC-block måste vara multiplar om 16 byte"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY-enheten kunde inte hittas eller skapas."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC eller checksumma var ogiltig"
 
@@ -1099,7 +1100,7 @@ msgstr "Funktionen kräver lås"
 msgid "GNSS init"
 msgstr "GNSS start"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "Allmänt fel"
 
@@ -1286,8 +1287,7 @@ msgstr "Ogiltig BSSID"
 msgid "Invalid MAC address"
 msgstr "Ogiltig MAC-adress"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
@@ -1313,7 +1313,7 @@ msgstr "Ogiltig formatsegmentstorlek"
 msgid "Invalid multicast MAC address"
 msgstr "Ogiltig MAC-adress för multicast"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
@@ -1322,7 +1322,7 @@ msgstr "Ogiltig storlek"
 msgid "Invalid socket for TLS"
 msgstr "Ogiltig socket för TLS"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Ogiltigt tillstånd"
 
@@ -1354,7 +1354,7 @@ msgstr "Layer är redan med i en grupp"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Layer måste vara en underklass av Group eller TileGrid"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC-adressen var ogiltig"
 
@@ -1716,11 +1716,11 @@ msgstr "Bara en färg kan vara genomskinlig i taget"
 msgid "Operation not permitted"
 msgstr "Åtgärden inte tillåten"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "Operation eller funktion stöds inte"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "Åtgärden orsakade timeout"
 
@@ -1728,7 +1728,7 @@ msgstr "Åtgärden orsakade timeout"
 msgid "Out of MDNS service slots"
 msgstr "Slut på MDNS-serviceplatser"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "Slut på minne"
 
@@ -1911,7 +1911,7 @@ msgstr "Skrivskyddad"
 msgid "Read-only filesystem"
 msgstr "Skrivskyddat filsystem"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "Mottaget svar var ogiltigt"
 
@@ -1931,7 +1931,7 @@ msgstr "RemoteTransmissionRequests begränsad till 8 byte"
 msgid "Requested AES mode is unsupported"
 msgstr "Det begärda AES-läget stöds inte"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "Begärd resurs hittades inte"
 
@@ -2386,7 +2386,7 @@ msgstr "Värdets längde ! = krävd fast längd"
 msgid "Value length > max_length"
 msgstr "Värdets längd > max_length"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "Versionen var ogiltig"
 
diff --git a/locale/tr.po b/locale/tr.po
index 74e44c2d8d..67a73375ea 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -152,7 +152,7 @@ msgstr "%q indeksi aralık dışında"
 msgid "%q init failed"
 msgstr "%q init başarısız oldu"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q %q dir"
 
@@ -250,7 +250,7 @@ msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s hatası 0x%x"
@@ -519,6 +519,7 @@ msgstr "Halihazırda duyuruluyor."
 msgid "Already have all-matches listener"
 msgstr "Tüm eşleşmelerle eşleşen dinleyiciniz var"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -692,7 +693,7 @@ msgstr "CBC blokları 16 baytın katları şeklinde olmalı"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "CIRCUITPY sürücüsü bulunamadı veya oluşturulamadı."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC yada checksum geçersiz"
 
@@ -1088,7 +1089,7 @@ msgstr "Fonksiyon kilit gerektirir"
 msgid "GNSS init"
 msgstr "GNSS init"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr ""
 
@@ -1273,8 +1274,7 @@ msgstr "Geçersiz BSSID"
 msgid "Invalid MAC address"
 msgstr "Geçersiz MAC adresi"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Geçersiz argüman"
 
@@ -1301,7 +1301,7 @@ msgstr "Geçersiz biçim yığın boyutu"
 msgid "Invalid multicast MAC address"
 msgstr "Geçersiz multicast MAC adresi"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "Geçersiz boyut"
 
@@ -1310,7 +1310,7 @@ msgstr "Geçersiz boyut"
 msgid "Invalid socket for TLS"
 msgstr "TLS için geçersiz soket"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "Geçersiz durum"
 
@@ -1342,7 +1342,7 @@ msgstr "Katman zaten bir grupta"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "Katman, bir Grup ya da TileGrid alt sınıfı olmalıdır"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC adresi geçersiz"
 
@@ -1698,11 +1698,11 @@ msgstr ""
 msgid "Operation not permitted"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr ""
 
@@ -1710,7 +1710,7 @@ msgstr ""
 msgid "Out of MDNS service slots"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr ""
 
@@ -1889,7 +1889,7 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr ""
 
@@ -1909,7 +1909,7 @@ msgstr ""
 msgid "Requested AES mode is unsupported"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr ""
 
@@ -2360,7 +2360,7 @@ msgstr ""
 msgid "Value length > max_length"
 msgstr ""
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr ""
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index ea9fa2fc68..485c30353d 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -163,7 +163,7 @@ msgstr "%q suǒyǐn chāochū fànwéi"
 msgid "%q init failed"
 msgstr "%q chūshǐhuà shībài"
 
-#: shared-bindings/dualbank/__init__.c
+#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
 msgstr "%q shì %q"
 
@@ -262,7 +262,7 @@ msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 msgid "%q=%q"
 msgstr "%q=%q"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
 msgid "%s error 0x%x"
 msgstr "%s cuò wù 0x%x"
@@ -530,6 +530,7 @@ msgstr "Mùqián zhèngzài guǎngbō."
 msgid "Already have all-matches listener"
 msgstr "yǐjīng yǒu all-matches jiāntīng qì"
 
+#: ports/espressif/bindings/espnow/ESPNow.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #: shared-module/memorymonitor/AllocationSize.c
@@ -703,7 +704,7 @@ msgstr "CBC kuài bìxū shì 16 zìjié de bèishù"
 msgid "CIRCUITPY drive could not be found or created."
 msgstr "zhǎo bú dào huò chuàng jiàn CIRCUITPY qū dòng qì."
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
 msgstr "CRC huò jiàoyàn hé wúxiào"
 
@@ -1103,7 +1104,7 @@ msgstr "Hánshù xūyào suǒdìng"
 msgid "GNSS init"
 msgstr "GNSS chūshǐhuà"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
 msgstr "tōng yòng gù zhàng"
 
@@ -1293,8 +1294,7 @@ msgstr "Wúxiào de BSSID"
 msgid "Invalid MAC address"
 msgstr "wú xiào de MAC dì zhǐ"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
-#: py/moduerrno.c
+#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
 msgstr "Wúxiào de cānshù"
 
@@ -1320,7 +1320,7 @@ msgstr "Géshì kuài dàxiǎo wúxiào"
 msgid "Invalid multicast MAC address"
 msgstr "wú xiào de duō bō MAC dì zhǐ"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
 msgstr "dà xiǎo wú xiào"
 
@@ -1329,7 +1329,7 @@ msgstr "dà xiǎo wú xiào"
 msgid "Invalid socket for TLS"
 msgstr "TLS de chā zuò wú xiào"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid state"
 msgstr "wú xiào zhuàng tài"
 
@@ -1361,7 +1361,7 @@ msgstr "tú céng yǐ zài zǔ zhōng"
 msgid "Layer must be a Group or TileGrid subclass"
 msgstr "tú céng bìxū shì zǔ huò píng pū wǎng gé zi lèi"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
 msgstr "MAC dì zhǐ wú xiào"
 
@@ -1723,11 +1723,11 @@ msgstr "Yīcì zhǐ néng yǒuyī zhǒng yánsè shì tòumíng de"
 msgid "Operation not permitted"
 msgstr "bù yǔnxǔ cāozuò"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
 msgstr "bù zhī chí cāo zuò huò gōng néng"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation timed out"
 msgstr "cāo zuò yǐ fēn shí"
 
@@ -1735,7 +1735,7 @@ msgstr "cāo zuò yǐ fēn shí"
 msgid "Out of MDNS service slots"
 msgstr "chāo chū MDNS fú wù chā cáo"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
 msgstr "nèi cún bù zú"
 
@@ -1916,7 +1916,7 @@ msgstr "Zhǐ dú"
 msgid "Read-only filesystem"
 msgstr "Zhǐ dú wénjiàn xìtǒng"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Received response was invalid"
 msgstr "shōu dào de xiǎng yìng wú xiào"
 
@@ -1936,7 +1936,7 @@ msgstr "RemoteTransmissionRequests xiànzhì wèi 8 gè zì jié"
 msgid "Requested AES mode is unsupported"
 msgstr "Qǐngqiú de AES móshì bù shòu zhīchí"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Requested resource not found"
 msgstr "wèi zhǎo dào qǐng qiú de zī yuán"
 
@@ -2391,7 +2391,7 @@ msgstr "Zhí chángdù != Suǒ xū de gùdìng chángdù"
 msgid "Value length > max_length"
 msgstr "Zhí chángdù > zuìdà chángdù"
 
-#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
+#: ports/espressif/common-hal/espidf/__init__.c
 msgid "Version was invalid"
 msgstr "bǎn běn wú xiào"
 

From 5cb21539f295d3537a80bbf4c33266a9feab6642 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 10 Mar 2023 13:12:37 -0500
Subject: [PATCH 2013/2403] use revised USB host API on mimxrt10xx

---
 shared-module/usb/core/Device.c | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/shared-module/usb/core/Device.c b/shared-module/usb/core/Device.c
index 81431d5d7a..706c94eec3 100644
--- a/shared-module/usb/core/Device.c
+++ b/shared-module/usb/core/Device.c
@@ -61,12 +61,9 @@ uint16_t common_hal_usb_core_device_get_idProduct(usb_core_device_obj_t *self) {
 }
 
 STATIC xfer_result_t _get_string_result;
-STATIC bool _transfer_done_cb(uint8_t daddr, tusb_control_request_t const *request, xfer_result_t result) {
-    // Store the result so we stop waiting for the transfer. We don't need the other data for now.
-    (void)daddr;
-    (void)request;
-    _get_string_result = result;
-    return true;
+STATIC void _transfer_done_cb(tuh_xfer_t *xfer) {
+    // Store the result so we stop waiting for the transfer.
+    _get_string_result = xfer->result;
 }
 
 STATIC void _wait_for_callback(void) {
@@ -89,7 +86,7 @@ STATIC mp_obj_t _get_string(const uint16_t *temp_buf) {
 mp_obj_t common_hal_usb_core_device_get_serial_number(usb_core_device_obj_t *self) {
     _get_string_result = 0xff;
     uint16_t temp_buf[127];
-    if (!tuh_descriptor_string_serial_get(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb)) {
+    if (!tuh_descriptor_get_serial_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0)) {
         return mp_const_none;
     }
     _wait_for_callback();
@@ -99,7 +96,7 @@ mp_obj_t common_hal_usb_core_device_get_serial_number(usb_core_device_obj_t *sel
 mp_obj_t common_hal_usb_core_device_get_product(usb_core_device_obj_t *self) {
     _get_string_result = 0xff;
     uint16_t temp_buf[127];
-    if (!tuh_descriptor_string_product_get(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb)) {
+    if (!tuh_descriptor_get_product_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0)) {
         return mp_const_none;
     }
     _wait_for_callback();
@@ -109,7 +106,7 @@ mp_obj_t common_hal_usb_core_device_get_product(usb_core_device_obj_t *self) {
 mp_obj_t common_hal_usb_core_device_get_manufacturer(usb_core_device_obj_t *self) {
     _get_string_result = 0xff;
     uint16_t temp_buf[127];
-    if (!tuh_descriptor_string_manufacturer_get(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb)) {
+    if (!tuh_descriptor_get_manufacturer_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0)) {
         return mp_const_none;
     }
     _wait_for_callback();
@@ -125,11 +122,8 @@ mp_obj_t common_hal_usb_core_device_read(usb_core_device_obj_t *self, mp_int_t e
 }
 
 xfer_result_t control_result;
-STATIC bool _control_complete_cb(uint8_t dev_addr, tusb_control_request_t const *request, xfer_result_t result) {
-    (void)dev_addr;
-    (void)request;
-    control_result = result;
-    return true;
+STATIC void _control_complete_cb(tuh_xfer_t *xfer) {
+    control_result = xfer->result;
 }
 
 mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
@@ -145,11 +139,17 @@ mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
         .wIndex = wIndex,
         .wLength = len
     };
+    tuh_xfer_t xfer = {
+        .daddr = self->device_number,
+        .ep_addr = 0,
+        .setup = &request,
+        .buffer = buffer,
+        .complete_cb = _control_complete_cb,
+    };
+
     control_result = XFER_RESULT_STALLED;
-    bool result = tuh_control_xfer(self->device_number,
-        &request,
-        buffer,
-        _control_complete_cb);
+
+    bool result = tuh_control_xfer(&xfer);
     if (!result) {
         mp_raise_usb_core_USBError(NULL);
     }

From a6400fb08ae896f5c71989ac47bf5ea803faeb70 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 11 Mar 2023 00:14:36 +0530
Subject: [PATCH 2014/2403] use intersection of changes per commit and merge
 ref

---
 .github/workflows/build.yml |  5 ----
 tools/ci_set_matrix.py      | 46 ++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4383153fd1..150c2364ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,16 +80,11 @@ jobs:
       run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
       env:
         SHA: ${{ github.event.before }}
-    - name: Get changes
-      id: get-changes
-      if: env.BASE_SHA && env.HEAD_SHA
-      run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
     - name: Set matrix
       id: set-matrix
       run: python3 -u ci_set_matrix.py
       working-directory: tools
       env:
-        CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
         LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
 
   tests:
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index b5618aec2f..3cd0dbf56f 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -68,25 +68,43 @@ PATTERN_WINDOWS = [
     "tools/",
 ]
 
+
+def git_diff(pattern: str):
+    return (
+        subprocess.run(
+            f"git diff {pattern} --name-only",
+            capture_output=True,
+            shell=True,
+        )
+        .stdout.decode("utf-8")
+        .split("\n")[:-1]
+    )
+
+
 if len(sys.argv) > 1:
     print("Using files list on commandline")
     changed_files = sys.argv[1:]
-    last_failed_jobs = {}
+elif os.environ.get("BASE_SHA") and os.environ.get("HEAD_SHA"):
+    print("Using files list by computing diff")
+    changed_files = git_diff("$BASE_SHA...$HEAD_SHA")
+    if os.environ.get("GITHUB_EVENT_NAME") == "pull_request":
+        changed_files = list(set(changed_files).intersection(git_diff("$HEAD_SHA~...$HEAD_SHA")))
 else:
-    c = os.environ["CHANGED_FILES"]
-    if c == "":
-        print("CHANGED_FILES is in environment, but value is empty")
-        changed_files = []
-    else:
-        print("Using files list in CHANGED_FILES")
-        changed_files = json.loads(c.replace("\\", ""))
+    print("Using files list in CHANGED_FILES")
+    changed_files = json.loads(os.environ.get("CHANGED_FILES") or "[]")
 
-    j = os.environ["LAST_FAILED_JOBS"]
-    if j == "":
-        print("LAST_FAILED_JOBS is in environment, but value is empty")
-        last_failed_jobs = {}
-    else:
-        last_failed_jobs = json.loads(j)
+print("Using jobs list in LAST_FAILED_JOBS")
+last_failed_jobs = json.loads(os.environ.get("LAST_FAILED_JOBS") or "{}")
+
+
+def print_enclosed(title, content):
+    print("::group::" + title)
+    print(content)
+    print("::endgroup::")
+
+
+print_enclosed("LOG: changed_files", changed_files)
+print_enclosed("LOG: last_failed_jobs", last_failed_jobs)
 
 
 def set_output(name: str, value):

From 5f0aa4a608c1e38533bc057227609961d255ef28 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 11 Mar 2023 08:49:17 +0530
Subject: [PATCH 2015/2403] change board config of some esp32s3 boards

- remove unnecessary optimization flags
- shrink adafruit_feather_esp32s3_reverse_tft
---
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk | 1 -
 .../adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk       | 2 ++
 .../boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk        | 1 -
 ports/espressif/boards/lolin_s3/mpconfigboard.mk                | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
index a8d02f082c..6d78999532 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -9,5 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
index 3fdb028f5e..d027443f56 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk
@@ -9,3 +9,5 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
index 858d0b1859..d801afd493 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -10,5 +10,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.mk b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
index c81e3e6fb9..56b42a419c 100644
--- a/ports/espressif/boards/lolin_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
@@ -9,5 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
-OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0

From a651696c5c5bfdb945c06645963f3b56ad0cc9eb Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 10 Mar 2023 23:07:29 -0500
Subject: [PATCH 2016/2403] pick up latest tinyusb changes

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 990fb6ae5c..be21413361 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 990fb6ae5c4d9d4b77c5a9ecb3a2abe899dd2712
+Subproject commit be214133615684327b114a5f167cd052841c3acf

From 29cee603d32b8f7854626b8aaa90b54d5c420828 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 11 Mar 2023 11:56:04 +0530
Subject: [PATCH 2017/2403] update `.readthedocs.yml` and add it to docs
 pattern

---
 .readthedocs.yml       | 2 +-
 tools/ci_set_matrix.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 29a915766f..8f1b89cb67 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -14,7 +14,7 @@ build:
         python: "3"
     jobs:
         post_install:
-            - python tools/ci_fetch_deps.py build-doc
+            - python tools/ci_fetch_deps.py docs
 
 formats:
     - pdf
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 3cd0dbf56f..5d7e3a477b 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -52,7 +52,7 @@ IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
 
 PATTERN_DOCS = (
     r"^(?:\.github|docs|extmod\/ulab)|"
-    r"^(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|tools\/extract_pyi\.py|conf\.py|requirements-doc\.txt)$|"
+    r"^(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|tools\/extract_pyi\.py|\.readthedocs\.yml|conf\.py|requirements-doc\.txt)$|"
     r"(?:-stubs|\.(?:md|MD|rst|RST))$"
 )
 

From ec74be7cb42071c5d9e0cc0bdaf4ed260afc91ae Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 11 Mar 2023 14:00:29 +0530
Subject: [PATCH 2018/2403] use set for `changed_files` and minor updates

---
 tools/ci_set_matrix.py | 49 +++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index 5d7e3a477b..c38ef29ecc 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -42,13 +42,15 @@ from shared_bindings_matrix import (
     all_ports_all_boards,
 )
 
-IGNORE = [
-    "tools/ci_set_matrix.py",
+# Files that never influence board builds
+IGNORE_BOARD = {
+    ".devcontainer",
+    "docs",
+    "tests",
+    "tools/ci_changes_per_commit.py",
     "tools/ci_check_duplicate_usb_vid_pid.py",
-]
-
-# Files in these directories never influence board builds
-IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
+    "tools/ci_set_matrix.py",
+}
 
 PATTERN_DOCS = (
     r"^(?:\.github|docs|extmod\/ulab)|"
@@ -56,21 +58,20 @@ PATTERN_DOCS = (
     r"(?:-stubs|\.(?:md|MD|rst|RST))$"
 )
 
-PATTERN_WINDOWS = [
+PATTERN_WINDOWS = {
     ".github/",
     "extmod/",
     "lib/",
     "mpy-cross/",
     "ports/unix/",
-    "ports/windows/",
     "py/",
-    "requirements",
     "tools/",
-]
+    "requirements-dev.txt",
+}
 
 
 def git_diff(pattern: str):
-    return (
+    return set(
         subprocess.run(
             f"git diff {pattern} --name-only",
             capture_output=True,
@@ -83,15 +84,15 @@ def git_diff(pattern: str):
 
 if len(sys.argv) > 1:
     print("Using files list on commandline")
-    changed_files = sys.argv[1:]
+    changed_files = set(sys.argv[1:])
 elif os.environ.get("BASE_SHA") and os.environ.get("HEAD_SHA"):
     print("Using files list by computing diff")
     changed_files = git_diff("$BASE_SHA...$HEAD_SHA")
     if os.environ.get("GITHUB_EVENT_NAME") == "pull_request":
-        changed_files = list(set(changed_files).intersection(git_diff("$HEAD_SHA~...$HEAD_SHA")))
+        changed_files.intersection_update(git_diff("$HEAD_SHA~...$HEAD_SHA"))
 else:
     print("Using files list in CHANGED_FILES")
-    changed_files = json.loads(os.environ.get("CHANGED_FILES") or "[]")
+    changed_files = set(json.loads(os.environ.get("CHANGED_FILES") or "[]"))
 
 print("Using jobs list in LAST_FAILED_JOBS")
 last_failed_jobs = json.loads(os.environ.get("LAST_FAILED_JOBS") or "{}")
@@ -103,8 +104,8 @@ def print_enclosed(title, content):
     print("::endgroup::")
 
 
-print_enclosed("LOG: changed_files", changed_files)
-print_enclosed("LOG: last_failed_jobs", last_failed_jobs)
+print_enclosed("Log: changed_files", changed_files)
+print_enclosed("Log: last_failed_jobs", last_failed_jobs)
 
 
 def set_output(name: str, value):
@@ -173,11 +174,7 @@ def set_boards(build_all: bool):
                     boards_to_build.update(port_to_boards[port])
                 continue
 
-            # Check the ignore list to see if the file isn't used on board builds.
-            if p in IGNORE:
-                continue
-
-            if any([p.startswith(d) for d in IGNORE_DIRS]):
+            if any([p.startswith(d) for d in IGNORE_BOARD]):
                 continue
 
             # As a (nearly) last resort, for some certain files, we compute the settings from the
@@ -287,7 +284,9 @@ def set_windows(build_windows: bool):
         else:
             for file in changed_files:
                 for pattern in PATTERN_WINDOWS:
-                    if file.startswith(pattern):
+                    if file.startswith(pattern) and not any(
+                        [file.startswith(d) for d in IGNORE_BOARD]
+                    ):
                         build_windows = True
                         break
                 else:
@@ -302,11 +301,7 @@ def set_windows(build_windows: bool):
 def main():
     # Build all if no changed files
     build_all = not changed_files
-    print(
-        "Building all docs/boards"
-        if build_all
-        else "Adding docs/boards to build based on changed files"
-    )
+    print("Running: " + ("all" if build_all else "conditionally"))
 
     # Set jobs
     set_docs(build_all)

From 76e83a432c64014e8e630227f9b268a32c378223 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Sat, 11 Mar 2023 14:05:45 +0200
Subject: [PATCH 2019/2403] Debug uart, default spi/i2c

---
 .../boards/waveshare_esp32s2_pico/mpconfigboard.h      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
index 6a10db6061..4b47fb2984 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
@@ -30,3 +30,13 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO9)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO40)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO10)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO12)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

From bfc551c158c17bceefd81e82f0955f982b493d37 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Sat, 11 Mar 2023 14:14:47 +0200
Subject: [PATCH 2020/2403] Invert led

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

diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
index 4b47fb2984..bb8b00f327 100644
--- a/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
+++ b/ports/espressif/boards/waveshare_esp32s2_pico/mpconfigboard.h
@@ -30,6 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO9)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO40)

From e95099fe48658f35b3a4b25cf9fabc0452848d31 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 11 Mar 2023 08:13:30 -0600
Subject: [PATCH 2021/2403] uncrustify 0.75 is not OK

---
 BUILDING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILDING.md b/BUILDING.md
index 4793824cf1..f108675b7c 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -109,7 +109,7 @@ Pre-commit also requires some additional programs to be installed through your p
 
  * Standard Unix tools such as make, find, etc
  * The gettext package, any modern version
- * uncrustify version 0.71 (0.72 is also tested)
+ * uncrustify version 0.71 (0.72 is also tested and OK; 0.75 is not OK)
 
 Each time you create a git commit, the pre-commit quality checks will be run.  You can also run them e.g., with `pre-commit run foo.c` or `pre-commit run --all` to run on all files whether modified or not.
 

From 3a4bffdd6505dac0a7fda88070b6484f67fb1708 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sun, 12 Mar 2023 09:42:16 +0530
Subject: [PATCH 2022/2403] use correct commits for diff

---
 .github/workflows/build.yml | 6 ++----
 tools/ci_set_matrix.py      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 150c2364ae..e322004515 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,11 +67,9 @@ jobs:
       run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
     - name: Set base sha (pull)
       if: github.event_name == 'pull_request'
-      run: |
-        git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
-        echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
+      run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
       env:
-        DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
+        SHA: ${{ steps.get-last-commit-with-checks.outputs.commit_sha || github.event.pull_request.base.sha }}
     - name: Set head sha (push)
       if: github.event_name == 'push'
       run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index c38ef29ecc..fa53c81829 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -89,7 +89,7 @@ elif os.environ.get("BASE_SHA") and os.environ.get("HEAD_SHA"):
     print("Using files list by computing diff")
     changed_files = git_diff("$BASE_SHA...$HEAD_SHA")
     if os.environ.get("GITHUB_EVENT_NAME") == "pull_request":
-        changed_files.intersection_update(git_diff("$HEAD_SHA~...$HEAD_SHA"))
+        changed_files.intersection_update(git_diff("$GITHUB_SHA~...$GITHUB_SHA"))
 else:
     print("Using files list in CHANGED_FILES")
     changed_files = set(json.loads(os.environ.get("CHANGED_FILES") or "[]"))

From daa927a114148904f82604f4fb47aca84cb00df2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sun, 12 Mar 2023 14:02:38 -0400
Subject: [PATCH 2023/2403] switch STM to dwc2 USB

---
 ports/stm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index 325b13b1bc..d6afeb5f29 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -215,7 +215,7 @@ ifneq ($(CIRCUITPY_AUDIOBUSIO_PDMIN),0)
 endif
 
 ifneq ($(CIRCUITPY_USB),0)
-SRC_C += lib/tinyusb/src/portable/st/synopsys/dcd_synopsys.c
+SRC_C += lib/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c
 endif
 
 SRC_S = \

From 49e9ea2e9aa77060275b764d064d025a29b43712 Mon Sep 17 00:00:00 2001
From: Matthias Kreier <43933271+kreier@users.noreply.github.com>
Date: Mon, 13 Mar 2023 15:17:55 +0700
Subject: [PATCH 2024/2403] add missing pins 4, 36 and 39 - and 4 aliases

The original list left D4 (GPIO4), VN (GPIO39) and VP (GPIO36) out.

Added aliases for 1, 3, 16 and 17 with their GPIO names, even though they won't be used as such since they are UART0 and UART2
---
 ports/espressif/boards/doit_esp32_devkit_v1/pins.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
index 78c37897ac..673728e9f3 100644
--- a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
@@ -3,9 +3,10 @@
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
-    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    // External pins are in silkscreen order, from top to bottom, left side
     {MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15)},
     {MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2)},
+    {MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4)},
     {MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO16)},
     {MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO17)},
     {MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5)},
@@ -16,6 +17,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_TX0), MP_ROM_PTR(&pin_GPIO3)},
     {MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22)},
     {MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23)},
+    // External pins are in silkscreen order, from top to bottom, right side
     {MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13)},
     {MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)},
     {MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14)},
@@ -26,6 +28,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32)},
     {MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35)},
     {MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34)},
+    {MP_ROM_QSTR(MP_QSTR_VN), MP_ROM_PTR(&pin_GPIO39)},
+    {MP_ROM_QSTR(MP_QSTR_VP), MP_ROM_PTR(&pin_GPIO36)},
 
     {MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2)},
 
@@ -38,6 +42,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17)},
     {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16)},
+    
+    {MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1)},
+    {MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3)},
+    {MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17)},
 
     {MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
     {MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},

From f5b8b8d6f22eed5e36499060d085eb88812a35ca Mon Sep 17 00:00:00 2001
From: Matthias Kreier <43933271+kreier@users.noreply.github.com>
Date: Mon, 13 Mar 2023 15:30:52 +0700
Subject: [PATCH 2025/2403] tailing whitespace removed (pre-commit run failed)

---
 ports/espressif/boards/doit_esp32_devkit_v1/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
index 673728e9f3..8381fa0644 100644
--- a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c
@@ -42,7 +42,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17)},
     {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16)},
-    
+
     {MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1)},
     {MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3)},
     {MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16)},

From b432cf62019d40b103e1cba6fbfecb5813cd61a7 Mon Sep 17 00:00:00 2001
From: hathach 
Date: Mon, 13 Mar 2023 21:49:01 +0700
Subject: [PATCH 2026/2403] fix rp2040 with new shared irq usb handler

---
 ports/raspberrypi/supervisor/usb.c | 11 ++---------
 supervisor/shared/usb/usb.c        | 12 ++++++++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ports/raspberrypi/supervisor/usb.c b/ports/raspberrypi/supervisor/usb.c
index d0e9b2e466..fb4f72134d 100644
--- a/ports/raspberrypi/supervisor/usb.c
+++ b/ports/raspberrypi/supervisor/usb.c
@@ -39,15 +39,8 @@ STATIC void _usb_irq_wrapper(void) {
 }
 
 void post_usb_init(void) {
-    irq_set_enabled(USBCTRL_IRQ, false);
-
-    irq_handler_t usb_handler = irq_get_exclusive_handler(USBCTRL_IRQ);
-    if (usb_handler) {
-        irq_remove_handler(USBCTRL_IRQ, usb_handler);
-    }
-    irq_set_exclusive_handler(USBCTRL_IRQ, _usb_irq_wrapper);
-
-    irq_set_enabled(USBCTRL_IRQ, true);
+    irq_add_shared_handler(USBCTRL_IRQ, _usb_irq_wrapper,
+        PICO_SHARED_IRQ_HANDLER_LOWEST_ORDER_PRIORITY);
 
     // There is a small window where the USB interrupt may be handled by the
     // pico-sdk instead of CircuitPython. If that is the case, then we'll have
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index fa85cddb83..5ac8454312 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -225,13 +225,17 @@ void usb_background_schedule(void) {
 }
 
 void usb_irq_handler(int instance) {
+    #if CFG_TUSB_MCU != OPT_MCU_RP2040
+    // For rp2040, IRQ handler is already installed and invoked automatically
     if (instance == CIRCUITPY_USB_DEVICE_INSTANCE) {
         tud_int_handler(instance);
-    } else if (instance == CIRCUITPY_USB_HOST_INSTANCE) {
-        #if CIRCUITPY_USB_HOST
-        tuh_int_handler(instance);
-        #endif
     }
+    #if CIRCUITPY_USB_HOST
+    else if (instance == CIRCUITPY_USB_HOST_INSTANCE) {
+        tuh_int_handler(instance);
+    }
+    #endif
+    #endif
 
     usb_background_schedule();
 }

From d85970b7a2cfb0aeb4d89575d839c91ce3e6d1ad Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 13 Mar 2023 17:53:32 -0400
Subject: [PATCH 2027/2403] update TinyUSB again for latest changes

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index be21413361..7cf67b2845 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit be214133615684327b114a5f167cd052841c3acf
+Subproject commit 7cf67b28456f6cb8738956bd6af1fd2b8300de4f

From 2497b3ea7a67c7371a857deae32ca4a5ed572dff Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 13 Mar 2023 22:11:02 -0400
Subject: [PATCH 2028/2403] update tinyusb

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 7cf67b2845..ea8ecea59a 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 7cf67b28456f6cb8738956bd6af1fd2b8300de4f
+Subproject commit ea8ecea59aa60a1028cce16b0f15bb33918b11af

From d4840cbf1022f447d2fa76eac4f40c4257425e9a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Mar 2023 13:13:58 -0400
Subject: [PATCH 2029/2403] translate() messages must be one string

---
 ports/espressif/common-hal/espcamera/Camera.c | 3 +--
 shared-bindings/pwmio/PWMOut.c                | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/common-hal/espcamera/Camera.c b/ports/espressif/common-hal/espcamera/Camera.c
index e3e5ef49f9..574b4e846b 100644
--- a/ports/espressif/common-hal/espcamera/Camera.c
+++ b/ports/espressif/common-hal/espcamera/Camera.c
@@ -79,8 +79,7 @@ void common_hal_espcamera_camera_construct(
 
     if (common_hal_espidf_get_reserved_psram() == 0) {
         mp_raise_msg(&mp_type_MemoryError, translate(
-            "espcamera.Camera requires reserved PSRAM to be configured. "
-            "See the documentation for instructions."));
+            "espcamera.Camera requires reserved PSRAM to be configured. See the documentation for instructions."));
     }
     for (int i = 0; i < 8; i++) {
         claim_pin_number(data_pins[i]);
diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c
index 24c0097c0c..784f87a025 100644
--- a/shared-bindings/pwmio/PWMOut.c
+++ b/shared-bindings/pwmio/PWMOut.c
@@ -271,8 +271,7 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t freque
     check_for_deinit(self);
     if (!common_hal_pwmio_pwmout_get_variable_frequency(self)) {
         mp_raise_AttributeError(translate(
-            "PWM frequency not writable when variable_frequency is False on "
-            "construction."));
+            "PWM frequency not writable when variable_frequency is False on construction."));
     }
     mp_int_t freq = mp_obj_get_int(frequency);
     if (freq == 0) {

From 5ec586019ba5e293451534e5368769136493f2e9 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Mar 2023 13:27:57 -0400
Subject: [PATCH 2030/2403] fix TimeAlarm signature

---
 shared-bindings/alarm/time/TimeAlarm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c
index abbb050c64..86c96de1d4 100644
--- a/shared-bindings/alarm/time/TimeAlarm.c
+++ b/shared-bindings/alarm/time/TimeAlarm.c
@@ -45,7 +45,7 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
 //|     """Trigger an alarm when the specified time is reached."""
 //|
 //|     def __init__(
-//|         self, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None
+//|         self, *, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None
 //|     ) -> None:
 //|         """Create an alarm that will be triggered when `time.monotonic()` would equal
 //|         ``monotonic_time``, or when `time.time()` would equal ``epoch_time``.

From 5bb8a7a7c68781e6edbd3aebaf7eeeecb310bd86 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 28 Feb 2023 15:07:35 -0800
Subject: [PATCH 2031/2403] Improve iMX RT performance

* Enable dcache for OCRAM where the VM heap lives.
* Add CIRCUITPY_SWO_TRACE for pushing program counters out over the
  SWO pin via the ITM module in the CPU. Exempt some functions from
  instrumentation to reduce traffic and allow inlining.
* Place more functions in ITCM to handle errors using code in RAM-only
  and speed up CP.
* Use SET and CLEAR registers for digitalio. The SDK does read, mask
  and write.
* Switch to 2MiB reserved for CircuitPython code. Up from 1MiB.
* Run USB interrupts during flash erase and write.
* Allow storage writes from CP if the USB drive is disabled.
* Get perf bench tests running on CircuitPython and increase timeouts
  so it works when instrumentation is active.
---
 ports/atmel-samd/Makefile                     |   2 +-
 ports/mimxrt10xx/Makefile                     |  15 +-
 ports/mimxrt10xx/background.c                 |   7 +-
 .../boards/imxrt1010_evk/mpconfigboard.h      |   5 +
 ports/mimxrt10xx/boards/metro_m7_1011/board.c |  15 ++
 .../boards/metro_m7_1011/flash_config.c       |   4 +-
 .../common-hal/digitalio/DigitalInOut.c       |   7 +-
 .../common-hal/microcontroller/__init__.c     |   7 +-
 .../common-hal/neopixel_write/__init__.c      |   8 +-
 ports/mimxrt10xx/linking/common.ld            |  76 ++++++--
 ports/mimxrt10xx/mpconfigport.mk              |   2 +
 ports/mimxrt10xx/reset.c                      |   3 +-
 .../supervisor/flexspi_nor_flash_ops.c        |  16 +-
 ports/mimxrt10xx/supervisor/internal_flash.c  |  40 ++--
 ports/mimxrt10xx/supervisor/internal_flash.h  |   1 +
 ports/mimxrt10xx/supervisor/port.c            | 172 ++++++++++++++----
 ports/mimxrt10xx/supervisor/serial.c          |  90 ---------
 ports/mimxrt10xx/supervisor/usb.c             |   6 +-
 py/argcheck.c                                 |   2 +-
 py/bc.c                                       |   2 +-
 py/circuitpy_mpconfig.h                       |  12 ++
 py/circuitpy_mpconfig.mk                      |   4 +
 py/gc.c                                       |   8 +-
 py/mpconfig.h                                 |  17 ++
 py/obj.h                                      |  74 ++++----
 py/objdict.c                                  |   4 +-
 py/objfun.c                                   |  14 +-
 py/objproperty.c                              |   2 +-
 py/pystack.c                                  |   2 +-
 py/pystack.h                                  |  26 +--
 py/qstr.c                                     |   2 +-
 py/runtime.c                                  |  61 ++++---
 py/runtime.h                                  |  12 +-
 py/stackctrl.c                                |   4 +-
 shared-bindings/digitalio/DigitalInOut.c      |   2 +-
 shared-module/storage/__init__.c              |   1 +
 supervisor/linker.h                           |   3 +-
 supervisor/shared/background_callback.c       |   6 +-
 supervisor/shared/filesystem.c                |   3 +-
 supervisor/shared/flash.c                     |   2 +-
 supervisor/shared/safe_mode.c                 |   5 +-
 supervisor/shared/status_bar.c                |   4 +-
 supervisor/shared/translate/translate_impl.h  |   4 +-
 supervisor/shared/usb/usb.c                   |   4 +-
 tests/perf_bench/benchrun.py                  |   2 +-
 tools/cortex-m-fault-gdb.py                   | 106 +++++++++++
 tools/cpboard.py                              |  26 ++-
 tools/gen_display_resources.py                |  10 +-
 tools/swo_function_trace.py                   | 143 +++++++++++++++
 tools/swo_viewer.py                           |  67 +++++++
 50 files changed, 809 insertions(+), 301 deletions(-)
 delete mode 100644 ports/mimxrt10xx/supervisor/serial.c
 create mode 100644 tools/cortex-m-fault-gdb.py
 create mode 100644 tools/swo_function_trace.py
 create mode 100644 tools/swo_viewer.py

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 0ac326d3cc..5a4e5111da 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -366,7 +366,7 @@ all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
 $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
-	$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
+	$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--print-memory-usage -Wl,--start-group $(LIBS) -Wl,--end-group
 	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE) $(BUILD)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index b38f120ee2..c561b894d3 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -49,7 +49,12 @@ INC += \
 CFLAGS += -ftree-vrp -DNDEBUG
 
 # TinyUSB defines
-CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=1024
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512
+ifeq ($(CHIP_FAMILY), MIMXRT1011)
+CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=64 -DCFG_TUD_MIDI_TX_BUFSIZE=64 -DCFG_TUD_MSC_BUFSIZE=512
+else
+CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=1024
+endif
 
 #Debugging/Optimization
 # Never set -fno-inline because we use inline to move small functions into routines that must be
@@ -76,11 +81,15 @@ CFLAGS += \
 	-g3 -Wno-unused-parameter \
 	-ffunction-sections -fdata-sections -fstack-usage
 
-OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
+OPTIMIZATION_FLAGS ?= -O2
 
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
 CFLAGS += $(OPTIMIZATION_FLAGS)
 
+ifeq ($(CIRCUITPY_SWO_TRACE), 1)
+  CFLAGS += -finstrument-functions -finstrument-functions-exclude-file-list=tinyusb -finstrument-functions-exclude-function-list='USB_OTG1_IRQHandler,usb_irq_handler,nlr_push,CLOCK_EnableClock,CLOCK_SetDiv,CLOCK_SetMux,__DMB,__ISB,__DSB,SCB_EnableICache,SCB_EnableDCache,ARM_MPU_Disable,ARM_MPU_Enable,SCB_DisableDCache,SCB_DisableICache,__enable_irq,__disable_irq,__set_MSP,port_get_raw_ticks,supervisor_ticks_ms64'
+endif
+
 LD_FILES = $(wildcard boards/$(BOARD)/*.ld) $(addprefix linking/, flash/$(FLASH).ld chip_family/$(CHIP_FAMILY).ld common.ld)
 
 LD_SCRIPT_FLAG := -Wl,-T,
@@ -171,7 +180,7 @@ all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 $(BUILD)/firmware.hex
 
 $(BUILD)/firmware.elf: $(OBJ) $(LD_FILES)
 	$(STEPECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(LDFLAGS) $(filter-out %.ld, $^) -Wl,--start-group $(LIBS) -Wl,--end-group
+	$(Q)$(CC) -o $@ $(LDFLAGS) $(filter-out %.ld, $^) -Wl,--print-memory-usage -Wl,--start-group $(LIBS) -Wl,--end-group
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/mimxrt10xx/background.c b/ports/mimxrt10xx/background.c
index 5815c222b4..529f791a39 100644
--- a/ports/mimxrt10xx/background.c
+++ b/ports/mimxrt10xx/background.c
@@ -27,7 +27,11 @@
 
 #include "supervisor/port.h"
 
-void port_background_task(void) {
+#include "supervisor/linker.h"
+
+#include "fsl_common.h"
+
+void PLACE_IN_ITCM(port_background_task)(void) {
 }
 
 void port_background_tick(void) {
@@ -38,5 +42,6 @@ void port_background_tick(void) {
 
 void port_start_background_task(void) {
 }
+
 void port_finish_background_task(void) {
 }
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
index 77d458d75b..192c265f88 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
@@ -16,3 +16,8 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_GPIO_09)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO_10)
+
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_09)
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_10)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO_11)
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/board.c b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
index 27cbd3eb96..62be2303a5 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/board.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
@@ -47,3 +47,18 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
 };
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
+
+bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin) {
+    #if CIRCUITPY_SWO_TRACE
+    if (pin == &pin_GPIO_AD_09) {
+        IOMUXC_SetPinMux( /* Add these lines*/
+            IOMUXC_GPIO_AD_09_ARM_TRACE_SWO,
+            0U);
+        IOMUXC_SetPinConfig( /* Add these lines*/
+            IOMUXC_GPIO_AD_09_ARM_TRACE_SWO,
+            0x00F9U);
+        return true;
+    }
+    #endif
+    return false;
+}
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
index b2894d7669..3477de9e34 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
@@ -10,7 +10,7 @@
 #include "fsl_flexspi_nor_boot.h"
 
 
-__attribute__((section(".boot_hdr.ivt")))
+__attribute__((section(".boot_hdr.ivt"),used))
 /*************************************
  *  IVT Data
  *************************************/
@@ -25,7 +25,7 @@ const ivt image_vector_table = {
     IVT_RSVD                          /* Reserved = 0 */
 };
 
-__attribute__((section(".boot_hdr.boot_data")))
+__attribute__((section(".boot_hdr.boot_data"),used))
 /*************************************
  *  Boot Data
  *************************************/
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
index 7639204bc6..d800de15de 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -118,7 +118,12 @@ digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
 
 void common_hal_digitalio_digitalinout_set_value(
     digitalio_digitalinout_obj_t *self, bool value) {
-    GPIO_PinWrite(self->pin->gpio, self->pin->number, value);
+    GPIO_Type *gpio = self->pin->gpio;
+    if (value) {
+        gpio->DR_SET = 1 << self->pin->number;
+    } else {
+        gpio->DR_CLEAR = 1 << self->pin->number;
+    }
 }
 
 bool common_hal_digitalio_digitalinout_get_value(
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index 5388f404de..1b10b4d4ee 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -36,6 +36,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
+#include "supervisor/linker.h"
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/translate/translate.h"
 
@@ -43,14 +44,14 @@ void common_hal_mcu_delay_us(uint32_t delay) {
     mp_hal_delay_us(delay);
 }
 
-volatile uint32_t nesting_count = 0;
-void common_hal_mcu_disable_interrupts(void) {
+volatile uint32_t PLACE_IN_DTCM_BSS(nesting_count) = 0;
+void PLACE_IN_ITCM(common_hal_mcu_disable_interrupts)(void) {
     __disable_irq();
     __DMB();
     nesting_count++;
 }
 
-void common_hal_mcu_enable_interrupts(void) {
+void PLACE_IN_ITCM(common_hal_mcu_enable_interrupts)(void) {
     if (nesting_count == 0) {
         // This is very very bad because it means there was mismatched disable/enables
         reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);
diff --git a/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c b/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
index 88d0453065..933d8aa444 100644
--- a/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
+++ b/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
@@ -64,9 +64,7 @@ void PLACE_IN_ITCM(common_hal_neopixel_write)(const digitalio_digitalinout_obj_t
     const uint32_t pin = digitalinout->pin->number;
 
     __disable_irq();
-    // Enable DWT in debug core. Useable when interrupts disabled, as opposed to Systick->VAL
-    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
-    DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
+    // Use DWT in debug core. Useable when interrupts disabled, as opposed to Systick->VAL
     DWT->CYCCNT = 0;
 
     for (;;) {
@@ -88,12 +86,12 @@ void PLACE_IN_ITCM(common_hal_neopixel_write)(const digitalio_digitalinout_obj_t
             mask = 0x80;
         }
     }
+    // Enable interrupts again
+    __enable_irq();
 
     // Update the next start.
     next_start_raw_ticks = port_get_raw_ticks(NULL) + 4;
 
-    // Enable interrupts again
-    __enable_irq();
 }
 
 #pragma GCC pop_options
diff --git a/ports/mimxrt10xx/linking/common.ld b/ports/mimxrt10xx/linking/common.ld
index b6f1acc8d0..61a9a2299f 100644
--- a/ports/mimxrt10xx/linking/common.ld
+++ b/ports/mimxrt10xx/linking/common.ld
@@ -6,7 +6,7 @@ Boards can setup reserved flash with _ld_reserved_flash_size in board.ld. */
 
 ENTRY(Reset_Handler)
 
-code_size = 1M;
+code_size = 2M;
 _ld_default_stack_size = 20K;
 
 /* Default reserved flash to nothing. */
@@ -22,9 +22,9 @@ MEMORY
     FLASH_IVT (rx)        : ORIGIN = 0x60001000, LENGTH = 4K
     /* Place the ISRs 48k in to leave room for the bootloader when it is available. */
     FLASH_FIRMWARE (rx)   : ORIGIN = 0x6000C000, LENGTH = code_size - 48K
-    FLASH_FATFS (r)       : ORIGIN = 0x60100000, LENGTH = _ld_flash_size - code_size - _ld_reserved_flash_size
+    FLASH_FATFS (r)       : ORIGIN = 0x60000000 + code_size, LENGTH = _ld_flash_size - code_size - _ld_reserved_flash_size
     /* Teensy uses the last bit of flash for recovery. */
-    RESERVED_FLASH        : ORIGIN = 0x60100000 + _ld_flash_size - _ld_reserved_flash_size, LENGTH = _ld_reserved_flash_size
+    RESERVED_FLASH        : ORIGIN = 0x60000000 + code_size + _ld_flash_size - _ld_reserved_flash_size, LENGTH = _ld_reserved_flash_size
     OCRAM (rwx)           : ORIGIN = 0x20200000, LENGTH = ram_size - 64K
     DTCM (x)              : ORIGIN = 0x20000000, LENGTH = 32K
     ITCM (x)              : ORIGIN = 0x00000000, LENGTH = 32K
@@ -55,21 +55,42 @@ SECTIONS
     .text :
     {
         . = ALIGN(4);
-        __VECTOR_TABLE = .;
-        __VECTOR_RAM = .;
-        _ld_isr_table = .;
-
-        KEEP(*(.isr_vector))         /* Startup code */
     *(EXCLUDE_FILE(
         *fsl_flexspi.o
+        *dcd_ci_hs.o
+        *tusb_fifo.o
+        *usbd.o
+        *string0.o
+        *py/nlr*.o
+        *py/obj.o
+        *py/gc.o
+        *py/map.o
+        *py/runtime.o
+        *py/objboundmeth.o
+        *py/objtype.o
     ) .text*)                /* .text* sections (code) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+
+        /* Keep USB processing functions out of RAM because we don't know which will be used.
+           We try to only keep USB interrupt related functions. */
+        *dcd_ci_hs.o(.text.process_*_request .text.dcd_edpt* .text.dcd_init .text.dcd_set_address)
+        *usbd.o(.text.process_*_request .text.process_[gs]et* .text.tud_* .text.usbd_* .text.configuration_reset .text.invoke_*)
+
+        /* Anything marked cold/unlikely should be in flash. */
+        *(.text.unlikely.*)
+
+    *(EXCLUDE_FILE(
+        *dcd_ci_hs.o
+        *py/objboundmeth.o
+        *py/objtype.o
+    ) .rodata*)        /* .rodata* sections (constants, strings, etc.) */
         . = ALIGN(4);
     } > FLASH_FIRMWARE
 
     .ARM.exidx :
     {
+        __exidx_start = .;
         *(.ARM.exidx*)
+        __exidx_end = .;
         *(.gnu.linkonce.armexidx.*)
         _etext = .;        /* define a global symbol at end of code */
         __etext = .;       /* define a global symbol at end of code */
@@ -81,7 +102,6 @@ SECTIONS
     {
         . = ALIGN(4);
         *(.data*)               /* .data* sections */
-        *fsl_flexspi.o(.text*)
         . = ALIGN(4);
     } > OCRAM AT> FLASH_FIRMWARE
     _ld_ocram_data_destination = ADDR(.data);
@@ -93,7 +113,7 @@ SECTIONS
     {
         . = ALIGN(4);
 
-        *(.bss*)
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
         *(COMMON)
 
         . = ALIGN(4);
@@ -103,22 +123,50 @@ SECTIONS
     _ld_heap_start = _ld_ocram_bss_start + _ld_ocram_bss_size;
     _ld_heap_end = ORIGIN(OCRAM) + LENGTH(OCRAM);
 
-    .itcm :
+
+    .itcm : ALIGN(4)
     {
         . = ALIGN(4);
         *(.itcm.*)
-
+        *fsl_flexspi.o(.text*)
+        *dcd_ci_hs.o(.text*)
+        *tusb_fifo.o(.text*)
+        *py/objboundmeth.o(.text*)
+        *py/objtype.o(.text*)
+        *py/obj.o(.text*)
+        *py/gc.o(.text*)
+        *py/map.o(.text*)
+        *py/nlr*.o(.text*)
+        *py/runtime.o(.text*)
+        *(.text.process_*_isr .text.dcd_event_* .text.osal_queue*)
+        *string0.o(.text*)
         . = ALIGN(4);
     } > ITCM AT> FLASH_FIRMWARE
     _ld_itcm_destination = ADDR(.itcm);
     _ld_itcm_flash_copy = LOADADDR(.itcm);
     _ld_itcm_size = SIZEOF(.itcm);
 
+    /* Align for 256 ISR entries */
+    .isr_vector : ALIGN(4 * 256)
+    {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))         /* Startup code */
+        . = ALIGN(4);
+    } > ITCM AT> FLASH_FIRMWARE
+    _ld_isr_destination = ADDR(.isr_vector);
+    _ld_isr_flash_copy = LOADADDR(.isr_vector);
+    _ld_isr_size = SIZEOF(.isr_vector);
+    /* Used by the bootloader to start user code. */
+    __VECTOR_TABLE = LOADADDR(.isr_vector);
+
     .dtcm_data :
     {
         . = ALIGN(4);
 
         *(.dtcm_data.*)
+        *dcd_ci_hs.o(.rodata*)
+        *py/objboundmeth.o(.rodata*)
+        *py/objtype.o(.rodata*)
 
         . = ALIGN(4);
     } > DTCM AT> FLASH_FIRMWARE
@@ -139,7 +187,7 @@ SECTIONS
     _ld_dtcm_bss_start = ADDR(.dtcm_bss);
     _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
 
-    .stack :
+    .stack (NOLOAD) :
     {
         . = ALIGN(8);
         _ld_stack_bottom = .;
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index cee2d9a698..236d5b9966 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -6,6 +6,8 @@ USB_HIGHSPEED = 1
 
 # Number of USB endpoint pairs.
 USB_NUM_ENDPOINT_PAIRS = 8
+# Align buffers on the cache boundary so we don't inadvertently load them early.
+CIRCUITPY_TUSB_MEM_ALIGN = 32
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/mimxrt10xx/reset.c b/ports/mimxrt10xx/reset.c
index a3a4f667de..3d9a0b071b 100644
--- a/ports/mimxrt10xx/reset.c
+++ b/ports/mimxrt10xx/reset.c
@@ -26,10 +26,11 @@
 
 #include "reset.h"
 #include "supervisor/filesystem.h"
+#include "supervisor/linker.h"
 
 #include "fsl_common.h"
 
-void reset(void) {
+void PLACE_IN_ITCM(reset)(void) {
     filesystem_flush();
     NVIC_SystemReset();
 }
diff --git a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
index 950e9aa403..7563f386f9 100644
--- a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
+++ b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
@@ -13,6 +13,17 @@
 #include "supervisor/internal_flash.h"
 #include "supervisor/linker.h"
 
+STATIC uint8_t _busy_bit_shift;
+STATIC bool _busy_bit_polarity;
+STATIC bool _inited = false;
+
+void flexspi_nor_init(void) {
+    // Copy busy bit info into RAM so we can use if when flash isn't available.
+    _busy_bit_shift = qspiflash_config.memConfig.busyOffset;
+    _busy_bit_polarity = qspiflash_config.memConfig.busyBitPolarity;
+    _inited = true;
+}
+
 STATIC status_t PLACE_IN_ITCM(flexspi_nor_write_enable)(FLEXSPI_Type * base, uint32_t baseAddr)
 {
     flexspi_transfer_t flashXfer;
@@ -53,9 +64,8 @@ STATIC status_t PLACE_IN_ITCM(flexspi_nor_wait_bus_busy)(FLEXSPI_Type * base)
         if (status != kStatus_Success) {
             return status;
         }
-        size_t busyBit = readValue & (1U << qspiflash_config.memConfig.busyOffset);
-        isBusy = (qspiflash_config.memConfig.busyBitPolarity == 0 && busyBit != 0) ||
-            (qspiflash_config.memConfig.busyBitPolarity == 1 && busyBit == 0);
+        bool busyBit = (readValue >> _busy_bit_shift) & 0x1;
+        isBusy = busyBit != _busy_bit_polarity;
     } while (isBusy);
 
     return status;
diff --git a/ports/mimxrt10xx/supervisor/internal_flash.c b/ports/mimxrt10xx/supervisor/internal_flash.c
index 72d57d1dd4..30a033a183 100644
--- a/ports/mimxrt10xx/supervisor/internal_flash.c
+++ b/ports/mimxrt10xx/supervisor/internal_flash.c
@@ -53,8 +53,15 @@ uint8_t _flash_cache[SECTOR_SIZE] __attribute__((aligned(4)));
 uint32_t _flash_page_addr = NO_CACHE;
 
 void PLACE_IN_ITCM(supervisor_flash_init)(void) {
-    // Update the LUT to make sure all entries are available.
-    FLEXSPI_UpdateLUT(FLEXSPI, 0, (const uint32_t *)&qspiflash_config.memConfig.lookupTable, 64);
+    // Update the LUT to make sure all entries are available. Copy the values to
+    // memory first so that we don't read from the flash as we update the LUT.
+    uint32_t lut_copy[64];
+    memcpy(lut_copy, (const uint32_t *)&qspiflash_config.memConfig.lookupTable, 64 * sizeof(uint32_t));
+    FLEXSPI_UpdateLUT(FLEXSPI, 0, lut_copy, 64);
+    // Make sure everything is flushed after updating the LUT.
+    __DSB();
+    __ISB();
+    flexspi_nor_init();
 }
 
 static inline uint32_t lba2addr(uint32_t block) {
@@ -79,20 +86,21 @@ void PLACE_IN_ITCM(port_internal_flash_flush)(void) {
     if (memcmp(_flash_cache, (void *)_flash_page_addr, SECTOR_SIZE) != 0) {
         volatile uint32_t sector_addr = (_flash_page_addr - FlexSPI_AMBA_BASE);
 
-        __disable_irq();
+        // Disable interrupts of priority 8+. They likely use code in flash
+        // itself. Higher priority interrupts (<8) should ensure all of their
+        // code is in RAM.
+        __set_BASEPRI(8 << (8 - __NVIC_PRIO_BITS));
         status = flexspi_nor_flash_erase_sector(FLEXSPI, sector_addr);
-        __enable_irq();
+        __set_BASEPRI(0U);
         if (status != kStatus_Success) {
-            printf("Page erase failure %ld!\r\n", status);
             return;
         }
 
         for (int i = 0; i < SECTOR_SIZE / FLASH_PAGE_SIZE; ++i) {
-            __disable_irq();
+            __set_BASEPRI(8 << (8 - __NVIC_PRIO_BITS));
             status = flexspi_nor_flash_page_program(FLEXSPI, sector_addr + i * FLASH_PAGE_SIZE, (void *)_flash_cache + i * FLASH_PAGE_SIZE);
-            __enable_irq();
+            __set_BASEPRI(0U);
             if (status != kStatus_Success) {
-                printf("Page program failure %ld!\r\n", status);
                 return;
             }
         }
@@ -103,11 +111,17 @@ void PLACE_IN_ITCM(port_internal_flash_flush)(void) {
 }
 
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
-    // Must write out anything in cache before trying to read.
-    supervisor_flash_flush();
+    for (size_t i = 0; i < num_blocks; i++) {
+        uint32_t src = lba2addr(block + i);
+        uint32_t page_addr = src & ~(SECTOR_SIZE - 1);
+        // Copy from the cache if our page matches the cached one.
+        if (page_addr == _flash_page_addr) {
+            src = ((uint32_t)&_flash_cache) + (src - page_addr);
+        }
+
+        memcpy(dest + FILESYSTEM_BLOCK_SIZE * i, (uint8_t *)src, FILESYSTEM_BLOCK_SIZE);
+    }
 
-    uint32_t src = lba2addr(block);
-    memcpy(dest, (uint8_t *)src, FILESYSTEM_BLOCK_SIZE * num_blocks);
     return 0; // success
 }
 
@@ -141,5 +155,5 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
     return 0; // success
 }
 
-void supervisor_flash_release_cache(void) {
+void PLACE_IN_ITCM(supervisor_flash_release_cache)(void) {
 }
diff --git a/ports/mimxrt10xx/supervisor/internal_flash.h b/ports/mimxrt10xx/supervisor/internal_flash.h
index 66d3f73db1..c38e2bc416 100644
--- a/ports/mimxrt10xx/supervisor/internal_flash.h
+++ b/ports/mimxrt10xx/supervisor/internal_flash.h
@@ -42,6 +42,7 @@
 #define ROM_INDEX_PAGEPROGRAM 9
 #define ROM_INDEX_READSTATUSREG 1
 
+extern void flexspi_nor_init(void);
 extern status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 extern status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src);
 extern status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base);
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 6997b4bae5..a27ab3ea58 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -42,13 +42,14 @@
 #include "common-hal/busio/SPI.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
-#include "reset.h"
-
-#include "supervisor/background_callback.h"
-
 #if CIRCUITPY_PEW
 #include "shared-module/_pew/PewPew.h"
 #endif
+
+#include "reset.h"
+
+#include "supervisor/background_callback.h"
+#include "supervisor/linker.h"
 #include "supervisor/shared/tick.h"
 
 #include "clocks.h"
@@ -97,16 +98,25 @@ extern uint32_t _ld_dtcm_data_flash_copy;
 extern uint32_t _ld_itcm_destination;
 extern uint32_t _ld_itcm_size;
 extern uint32_t _ld_itcm_flash_copy;
+extern uint32_t _ld_isr_destination;
+extern uint32_t _ld_isr_size;
+extern uint32_t _ld_isr_flash_copy;
 
 extern void main(void);
 
 // This replaces the Reset_Handler in startup_*.S and SystemInit in system_*.c.
+// Turn off optimize("no-tree-loop-distribute-patterns") so that this isn't replaced
+// by calls to memcpy because we're copying it over now.
 void Reset_Handler(void);
-__attribute__((used, naked)) void Reset_Handler(void) {
+__attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distribute-patterns"))) void Reset_Handler(void) {
     __disable_irq();
-    SCB->VTOR = (uint32_t)&__isr_vector;
+    // Set the VTOR to the flash copy since we haven't copied it into RAM.
+    SCB->VTOR = (uint32_t)&_ld_isr_flash_copy;
     __set_MSP((uint32_t)&_ld_stack_top);
 
+    // Turn off any residual ITM outputs.
+    ITM->TER = 0;
+
     /* Disable I cache and D cache */
     SCB_DisableICache();
     SCB_DisableDCache();
@@ -128,6 +138,11 @@ __attribute__((used, naked)) void Reset_Handler(void) {
     current_gpr14 |= IOMUXC_GPR_GPR14_CM7_CFGITCMSZ(0x6);
     IOMUXC_GPR->GPR14 = current_gpr14;
 
+    // Enable FlexRAM interrupts on invalid access.
+    FLEXRAM->INT_STAT_EN = FLEXRAM_INT_STAT_EN_ITCM_ERR_STAT_EN(1) |
+        FLEXRAM_INT_STAT_EN_DTCM_ERR_STAT_EN(1) |
+        FLEXRAM_INT_STAT_EN_OCRAM_ERR_STAT_EN(1);
+
     #if ((__FPU_PRESENT == 1) && (__FPU_USED == 1))
     SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2));  /* set CP10, CP11 Full Access */
     #endif /* ((__FPU_PRESENT == 1) && (__FPU_USED == 1)) */
@@ -157,6 +172,13 @@ __attribute__((used, naked)) void Reset_Handler(void) {
         (&_ld_itcm_destination)[i] = (&_ld_itcm_flash_copy)[i];
     }
 
+    for (uint32_t i = 0; i < ((size_t)&_ld_isr_size) / 4; i++) {
+        (&_ld_isr_destination)[i] = (&_ld_isr_flash_copy)[i];
+    }
+
+    // Now that we've copied the ISR table over, use that VTOR.
+    SCB->VTOR = (uint32_t)&_ld_isr_destination;
+
     // The first number in RBAR is the region number. When searching for a policy, the region with
     // the highest number wins. If none match, then the default policy set at enable applies.
 
@@ -170,14 +192,19 @@ __attribute__((used, naked)) void Reset_Handler(void) {
 
     // FlexSPI2 is 0x70000000
 
-    // This the first 1MB of flash is the bootloader and CircuitPython read-only data.
-    MPU->RBAR = ARM_MPU_RBAR(10, 0x60000000U);
-    MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, NO_SUBREGIONS, ARM_MPU_REGION_SIZE_1MB);
+    // This the first portion (1MB, 2MB or 4MB) of flash is the bootloader and CircuitPython read-only data.
+    MPU->RBAR = ARM_MPU_RBAR(10, FlexSPI_AMBA_BASE);
+    uint32_t region_size = ARM_MPU_REGION_SIZE_32B;
+    uint32_t code_size = ((uint32_t)&_ld_filesystem_start) - FlexSPI_AMBA_BASE;
+    while (code_size > (1u << (region_size + 1))) {
+        region_size += 1;
+    }
+    MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, NO_SUBREGIONS, region_size);
 
     // The remainder of flash is the fat filesystem which could have code on it too. Make sure that
     // we set the region to the minimal size so that bad data doesn't get speculatively fetched.
     // Thanks to Damien for the tip!
-    uint32_t region_size = ARM_MPU_REGION_SIZE_32B;
+    region_size = ARM_MPU_REGION_SIZE_32B;
     uint32_t filesystem_size = &_ld_filesystem_end - &_ld_filesystem_start;
     while (filesystem_size > (1u << (region_size + 1))) {
         region_size += 1;
@@ -189,7 +216,7 @@ __attribute__((used, naked)) void Reset_Handler(void) {
     uint32_t subregion_size = (1u << (region_size + 1)) / 8;
     uint8_t subregion_mask = (0xff00 >> (remainder / subregion_size)) & 0xff;
 
-    MPU->RBAR = ARM_MPU_RBAR(11, 0x60100000U);
+    MPU->RBAR = ARM_MPU_RBAR(11, (size_t)&_ld_filesystem_start);
     MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, subregion_mask, region_size);
 
     // This the ITCM. Set it to read-only because we've loaded everything already and it's easy to
@@ -205,9 +232,10 @@ __attribute__((used, naked)) void Reset_Handler(void) {
     // cost of 1/4 speed OCRAM accesses. It will leave more room for caching data from the flash
     // too which might be a net win.
     MPU->RBAR = ARM_MPU_RBAR(14, 0x20200000U);
-    MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, SHAREABLE, CACHEABLE, BUFFERABLE, NO_SUBREGIONS, ARM_MPU_REGION_SIZE_512KB);
+    MPU->RASR = ARM_MPU_RASR(NO_EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, NO_SUBREGIONS, ARM_MPU_REGION_SIZE_512KB);
 
     // We steal 64k from FlexRAM for ITCM and DTCM so disable those memory regions here.
+    // We use 64k from FlexRAM for ITCM and DTCM so disable those memory regions here.
     MPU->RBAR = ARM_MPU_RBAR(15, 0x20280000U);
     MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, 0x80, ARM_MPU_REGION_SIZE_512KB);
 
@@ -239,14 +267,97 @@ __attribute__((used, naked)) void Reset_Handler(void) {
     }
 
     __enable_irq();
+
     main();
 }
 
+void __attribute__((no_instrument_function,section(".itcm.profile_enter"),long_call)) __cyg_profile_func_enter(void *this_fn,
+    void *call_site) {
+    if ((ITM->TER & (1 << 3)) == 0) {
+        return;
+    }
+    uint32_t addr = (uint32_t)this_fn;
+    while (ITM->PORT[3U].u32 == 0UL) {
+        // addr |= 1;
+    }
+    ITM->PORT[3].u32 = addr;
+}
+
+void __attribute__((no_instrument_function,section(".itcm.profile_exit"),long_call)) __cyg_profile_func_exit(void *this_fn,
+    void *call_site) {
+    if ((ITM->TER & (1 << 4)) == 0) {
+        return;
+    }
+    uint32_t addr = (uint32_t)this_fn;
+    while (ITM->PORT[4U].u32 == 0UL) {
+        // addr |= 1;
+    }
+    ITM->PORT[4].u32 = addr;
+}
+
 safe_mode_t port_init(void) {
     CLOCK_SetMode(kCLOCK_ModeRun);
 
     clocks_init();
 
+    // Turn on the DWT so that neopixel_write can use CYCCNT for timing.
+    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+    DWT->CTRL = 0x2 << DWT_CTRL_SYNCTAP_Pos | DWT_CTRL_CYCCNTENA_Msk;
+
+    // Enable SWO if needed.
+    #if CIRCUITPY_SWO_TRACE
+
+    // Turn on the 528 MHz clock to the TPIU.
+    CLOCK_EnableClock(kCLOCK_Trace); /* Make these edits*/
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 0); /* Make these edits*/
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 0); /* Make these edits*/
+
+    ITM->TCR = ITM_TCR_TSENA_Msk | ITM_TCR_ITMENA_Msk | ITM_TCR_SYNCENA_Msk | ITM_TCR_DWTENA_Msk;
+
+    // Run at 2.75 mbaud. CP2102N says it can do up to 3.
+    // Base clock is 528 mhz (not 500 like the core).
+    // TPI->ACPR = 191;
+    // Run at 1 mbaud so that USB isn't bottlenecked.
+    TPI->ACPR = 527;
+    TPI->SPPR = 0x2; // NRZ aka UART
+    TPI->FFCR = 0;
+
+    IOMUXC_SetPinMux( /* Add these lines*/
+        IOMUXC_GPIO_AD_09_ARM_TRACE_SWO,
+        0U);
+    IOMUXC_SetPinConfig( /* Add these lines*/
+        IOMUXC_GPIO_AD_09_ARM_TRACE_SWO,
+        0x00F9U);
+
+    // Enable ports 0-4:
+    // * 0 is serial output
+    // *
+    // * 3 is addresses of functions beginning.
+    // * 4 is addresses of functions ending.
+    ITM->TER |= 0x1f;
+    ITM->PORT[0].u8 = 'C';
+    ITM->PORT[0].u8 = 'P';
+    ITM->PORT[0].u8 = '\n';
+    #endif
+
+    // Set all peripheral interrupt priorities to the lowest priority by default.
+    for (uint16_t i = 0; i < NUMBER_OF_INT_VECTORS; i++) {
+        NVIC_SetPriority(i, (1UL << __NVIC_PRIO_BITS) - 1UL);
+    }
+    NVIC_SetPriority(USB_OTG1_IRQn, 1);
+    #ifdef USBPHY2
+    NVIC_SetPriority(USB_OTG2_IRQn, 1);
+    #endif
+
+    NVIC_SetPriority(FLEXRAM_IRQn, 0);
+    NVIC_EnableIRQ(FLEXRAM_IRQn);
+
+    // Priorities 8+ will be disabled during flash operations. To run during
+    // flash operations, ensure all code is in RAM (not flash) and set the
+    // priority < 8.
+
     #if CIRCUITPY_RTC
     rtc_init();
     #endif
@@ -305,7 +416,7 @@ void reset_to_bootloader(void) {
     reset();
 }
 
-void reset_cpu(void) {
+void PLACE_IN_ITCM(reset_cpu)(void) {
     reset();
 }
 
@@ -332,7 +443,7 @@ uint32_t *port_heap_get_top(void) {
 }
 
 // Place the word into the low power section of the SNVS.
-void port_set_saved_word(uint32_t value) {
+void PLACE_IN_ITCM(port_set_saved_word)(uint32_t value) {
     SNVS->LPGPR[1] = value;
 }
 
@@ -355,7 +466,7 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) {
 
 void SNVS_HP_WRAPPER_IRQHandler(void);
 __attribute__((used))
-void SNVS_HP_WRAPPER_IRQHandler(void) {
+void PLACE_IN_ITCM(SNVS_HP_WRAPPER_IRQHandler)(void) {
     if ((SNVS->HPSR & SNVS_HPSR_PI_MASK) != 0) {
         supervisor_tick();
         SNVS->HPSR = SNVS_HPSR_PI_MASK;
@@ -414,44 +525,43 @@ void port_idle_until_interrupt(void) {
     common_hal_mcu_enable_interrupts();
 }
 
-/**
- * \brief Default interrupt handler for unused IRQs.
- */
+// Catch faults where the memory access violates MPU settings.
 void MemManage_Handler(void);
-__attribute__((used)) void MemManage_Handler(void) {
+__attribute__((used)) void PLACE_IN_ITCM(MemManage_Handler)(void) {
     reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
-/**
- * \brief Default interrupt handler for unused IRQs.
- */
 void BusFault_Handler(void);
-__attribute__((used)) void BusFault_Handler(void) {
+__attribute__((used)) void PLACE_IN_ITCM(BusFault_Handler)(void) {
     reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
-/**
- * \brief Default interrupt handler for unused IRQs.
- */
 void UsageFault_Handler(void);
-__attribute__((used)) void UsageFault_Handler(void) {
+__attribute__((used)) void PLACE_IN_ITCM(UsageFault_Handler)(void) {
     reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
     }
 }
 
-/**
- * \brief Default interrupt handler for unused IRQs.
- */
+// Default fault handler.
 void HardFault_Handler(void);
-__attribute__((used)) void HardFault_Handler(void) {
+__attribute__((used)) void PLACE_IN_ITCM(HardFault_Handler)(void) {
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    while (true) {
+        asm ("nop;");
+    }
+}
+
+// Catch access errors to FlexRAM (if the MPU didn't catch it first.)
+void FLEXRAM_IRQHandler(void);
+__attribute__((used)) void PLACE_IN_ITCM(FLEXRAM_IRQHandler)(void) {
     reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     while (true) {
         asm ("nop;");
diff --git a/ports/mimxrt10xx/supervisor/serial.c b/ports/mimxrt10xx/supervisor/serial.c
deleted file mode 100644
index cb557d36a8..0000000000
--- a/ports/mimxrt10xx/supervisor/serial.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017, 2018 Scott Shawcroft for Adafruit Industries
- * Copyright (c) 2019 Lucian Copeland 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 "supervisor/serial.h"
-#include "py/mphal.h"
-#include 
-
-#include "fsl_clock.h"
-#include "fsl_lpuart.h"
-
-#if defined(CIRCUITPY_CONSOLE_UART)
-// static LPUART_Type *uart_instance = LPUART1; // evk
-static LPUART_Type *uart_instance = LPUART4; // feather 1011
-// static LPUART_Type *uart_instance = LPUART2; // feather 1062
-static uint32_t UartSrcFreq(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 */
-    /* PLL3 div6 80M */
-    if (CLOCK_GetMux(kCLOCK_UartMux) == 0) {
-        freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) /
-            (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
-    } else {
-        freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
-    }
-
-    return freq;
-}
-
-void port_serial_init(void) {
-    lpuart_config_t config;
-
-    LPUART_GetDefaultConfig(&config);
-    config.baudRate_Bps = 115200;
-    config.enableTx = true;
-    config.enableRx = true;
-
-    LPUART_Init(uart_instance, &config, UartSrcFreq());
-}
-
-bool port_serial_connected(void) {
-    return true;
-}
-
-char port_serial_read(void) {
-    uint8_t data;
-
-    LPUART_ReadBlocking(uart_instance, &data, sizeof(data));
-
-    return data;
-}
-
-bool port_serial_bytes_available(void) {
-    return LPUART_GetStatusFlags(uart_instance) & kLPUART_RxDataRegFullFlag;
-}
-
-void port_serial_write_substring(const char *text, uint32_t len) {
-    if (len == 0) {
-        return;
-    }
-
-    LPUART_WriteBlocking(uart_instance, (uint8_t *)text, len);
-}
-#endif // CIRCUITPY_CONSOLE_UART
diff --git a/ports/mimxrt10xx/supervisor/usb.c b/ports/mimxrt10xx/supervisor/usb.c
index 2094a943b5..bc6bc5f0cd 100644
--- a/ports/mimxrt10xx/supervisor/usb.c
+++ b/ports/mimxrt10xx/supervisor/usb.c
@@ -27,6 +27,8 @@
 
 #include "fsl_clock.h"
 #include "tusb.h"
+
+#include "supervisor/linker.h"
 #include "supervisor/usb.h"
 
 STATIC void init_usb_instance(mp_int_t instance) {
@@ -78,13 +80,13 @@ STATIC void init_usb_instance(mp_int_t instance) {
 // Provide the prototypes for the interrupt handlers. The iMX RT SDK doesn't.
 // The SDK only links to them from assembly.
     void USB_OTG1_IRQHandler(void);
-    void USB_OTG1_IRQHandler(void) {
+    void PLACE_IN_ITCM(USB_OTG1_IRQHandler)(void) {
         usb_irq_handler(0);
     }
 
     #ifdef USBPHY2
     void USB_OTG2_IRQHandler(void);
-    void USB_OTG2_IRQHandler(void) {
+    void PLACE_IN_ITCM(USB_OTG2_IRQHandler)(void) {
         usb_irq_handler(1);
     }
     #endif
diff --git a/py/argcheck.c b/py/argcheck.c
index 05c2567ca2..465a82c97e 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -31,7 +31,7 @@
 
 #include "supervisor/shared/translate/translate.h"
 
-void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
+void PLACE_IN_ITCM(mp_arg_check_num_sig)(size_t n_args, size_t n_kw, uint32_t sig) {
     // TODO maybe take the function name as an argument so we can print nicer error messages
 
     // The reverse of MP_OBJ_FUN_MAKE_SIG
diff --git a/py/bc.c b/py/bc.c
index e1645dbff0..e7ad43389a 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -111,7 +111,7 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 //    - code_state->fun_bc should contain a pointer to the function object
 //    - code_state->ip should contain the offset in bytes from the pointer
 //      code_state->fun_bc->bytecode to the entry n_state (0 for bytecode, non-zero for native)
-void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+void PLACE_IN_ITCM(mp_setup_code_state)(mp_code_state_t * code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // This function is pretty complicated.  It's main aim is to be efficient in speed and RAM
     // usage for the common case of positional only args.
 
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index a514b6a160..fb85983675 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -583,6 +583,18 @@ void supervisor_run_background_tasks_if_tick(void);
 #define MICROPY_WRAP_MP_EXECUTE_BYTECODE PLACE_IN_ITCM
 #endif
 
+#ifndef MICROPY_WRAP_MP_LOAD_GLOBAL
+#define MICROPY_WRAP_MP_LOAD_GLOBAL PLACE_IN_ITCM
+#endif
+
+#ifndef MICROPY_WRAP_MP_LOAD_NAME
+#define MICROPY_WRAP_MP_LOAD_NAME PLACE_IN_ITCM
+#endif
+
+#ifndef MICROPY_WRAP_MP_OBJ_GET_TYPE
+#define MICROPY_WRAP_MP_OBJ_GET_TYPE PLACE_IN_ITCM
+#endif
+
 #ifndef CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
 #define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (0)
 #endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index c849a12851..d002ab4d43 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -560,6 +560,10 @@ CFLAGS += -DCIRCUITPY_TUSB_MEM_ALIGN=$(CIRCUITPY_TUSB_MEM_ALIGN)
 CIRCUITPY_TUSB_ATTR_USBRAM ?= ".bss.usbram"
 CFLAGS += -DCIRCUITPY_TUSB_ATTR_USBRAM=$(CIRCUITPY_TUSB_ATTR_USBRAM)
 
+# Output function trace information from the ARM ITM.
+CIRCUITPY_SWO_TRACE ?= 0
+CFLAGS += -DCIRCUITPY_SWO_TRACE=$(CIRCUITPY_SWO_TRACE)
+
 # Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
 # $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
 # This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
diff --git a/py/gc.c b/py/gc.c
index 0ced4c854d..1812507c61 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -231,7 +231,9 @@ bool gc_is_locked(void) {
 // children: mark the unmarked child blocks and put those newly marked
 // blocks on the stack. When all children have been checked, pop off the
 // topmost block on the stack and repeat with that one.
-STATIC void gc_mark_subtree(size_t block) {
+// We don't instrument these functions because they occur a lot during GC and
+// fill up the output buffer quickly.
+STATIC void MP_NO_INSTRUMENT PLACE_IN_ITCM(gc_mark_subtree)(size_t block) {
     // Start with the block passed in the argument.
     size_t sp = 0;
     for (;;) {
@@ -350,7 +352,7 @@ STATIC void gc_sweep(void) {
 }
 
 // Mark can handle NULL pointers because it verifies the pointer is within the heap bounds.
-STATIC void gc_mark(void *ptr) {
+STATIC void MP_NO_INSTRUMENT PLACE_IN_ITCM(gc_mark)(void *ptr) {
     if (VERIFY_PTR(ptr)) {
         size_t block = BLOCK_FROM_PTR(ptr);
         if (ATB_GET_KIND(block) == AT_HEAD) {
@@ -397,7 +399,7 @@ void gc_collect_ptr(void *ptr) {
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
 __attribute__((no_sanitize_address))
 #endif
-static void *gc_get_ptr(void **ptrs, int i) {
+static void *MP_NO_INSTRUMENT PLACE_IN_ITCM(gc_get_ptr)(void **ptrs, int i) {
     #if MICROPY_DEBUG_VALGRIND
     if (!VALGRIND_CHECK_MEM_IS_ADDRESSABLE(&ptrs[i], sizeof(*ptrs))) {
         return NULL;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 9d68f4ce9d..d3842afbe7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1827,6 +1827,17 @@ typedef double mp_float_t;
 #define MP_WEAK __attribute__((weak))
 #endif
 
+// Modifier for functions which should not be instrumented when tracing with
+// -finstrument-functions
+#ifndef MP_NO_INSTRUMENT
+#define MP_NO_INSTRUMENT __attribute__((no_instrument_function))
+#endif
+
+// Modifier for functions which should ideally inlined
+#ifndef MP_INLINE
+#define MP_INLINE inline MP_NO_INSTRUMENT
+#endif
+
 // Modifier for functions which should be never inlined
 #ifndef MP_NOINLINE
 #define MP_NOINLINE __attribute__((noinline))
@@ -1847,6 +1858,12 @@ typedef double mp_float_t;
 #define MP_UNLIKELY(x) __builtin_expect((x), 0)
 #endif
 
+// Modifier for functions which aren't often used. Calls will also be considered
+// unlikely. Section names are `.text.unlikely` for use in linker scripts.
+#ifndef MP_COLD
+#define MP_COLD __attribute__((cold))
+#endif
+
 // To annotate that code is unreachable
 #ifndef MP_UNREACHABLE
 #if defined(__GNUC__)
diff --git a/py/obj.h b/py/obj.h
index 86fbe5155f..92732b31dd 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -86,19 +86,19 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
 
 #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A
 
-static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_small_int(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 1) != 0;
 }
 #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 1)
 #define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_uint_t)(small_int)) << 1) | 1))
 
-static inline bool mp_obj_is_qstr(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_qstr(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 7) == 2;
 }
 #define MP_OBJ_QSTR_VALUE(o) (((mp_uint_t)(o)) >> 3)
 #define MP_OBJ_NEW_QSTR(qst) ((mp_obj_t)((((mp_uint_t)(qst)) << 3) | 2))
 
-static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 7) == 6;
 }
 #define MP_OBJ_IMMEDIATE_OBJ_VALUE(o) (((mp_uint_t)(o)) >> 3)
@@ -115,25 +115,25 @@ mp_float_t mp_obj_float_get(mp_obj_t self_in);
 mp_obj_t mp_obj_new_float(mp_float_t value);
 #endif
 
-static inline bool mp_obj_is_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_obj(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 3) == 0;
 }
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B
 
-static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_small_int(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 3) == 1;
 }
 #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 2)
 #define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_uint_t)(small_int)) << 2) | 1))
 
-static inline bool mp_obj_is_qstr(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_qstr(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 7) == 3;
 }
 #define MP_OBJ_QSTR_VALUE(o) (((mp_uint_t)(o)) >> 3)
 #define MP_OBJ_NEW_QSTR(qst) ((mp_obj_t)((((mp_uint_t)(qst)) << 3) | 3))
 
-static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 7) == 7;
 }
 #define MP_OBJ_IMMEDIATE_OBJ_VALUE(o) (((mp_uint_t)(o)) >> 3)
@@ -150,13 +150,13 @@ mp_float_t mp_obj_float_get(mp_obj_t self_in);
 mp_obj_t mp_obj_new_float(mp_float_t value);
 #endif
 
-static inline bool mp_obj_is_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_obj(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 1) == 0;
 }
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
 
-static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_small_int(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 1) != 0;
 }
 #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 1)
@@ -166,17 +166,17 @@ static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
 #define mp_const_float_e MP_ROM_PTR((mp_obj_t)(((0x402df854 & ~3) | 2) + 0x80800000))
 #define mp_const_float_pi MP_ROM_PTR((mp_obj_t)(((0x40490fdb & ~3) | 2) + 0x80800000))
 
-static inline bool mp_obj_is_float(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_float(mp_const_obj_t o) {
     return (((mp_uint_t)(o)) & 3) == 2 && (((mp_uint_t)(o)) & 0xff800007) != 0x00000006;
 }
-static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
+static MP_INLINE mp_float_t mp_obj_float_get(mp_const_obj_t o) {
     union {
         mp_float_t f;
         mp_uint_t u;
     } num = {.u = ((mp_uint_t)o - 0x80800000) & ~3};
     return num.f;
 }
-static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
+static MP_INLINE mp_obj_t mp_obj_new_float(mp_float_t f) {
     union {
         mp_float_t f;
         mp_uint_t u;
@@ -185,37 +185,37 @@ static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
 }
 #endif
 
-static inline bool mp_obj_is_qstr(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_qstr(mp_const_obj_t o) {
     return (((mp_uint_t)(o)) & 0xff80000f) == 0x00000006;
 }
 #define MP_OBJ_QSTR_VALUE(o) (((mp_uint_t)(o)) >> 4)
 #define MP_OBJ_NEW_QSTR(qst) ((mp_obj_t)((((mp_uint_t)(qst)) << 4) | 0x00000006))
 
-static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
     return (((mp_uint_t)(o)) & 0xff80000f) == 0x0000000e;
 }
 #define MP_OBJ_IMMEDIATE_OBJ_VALUE(o) (((mp_uint_t)(o)) >> 4)
 #define MP_OBJ_NEW_IMMEDIATE_OBJ(val) ((mp_obj_t)(((val) << 4) | 0xe))
 
-static inline bool mp_obj_is_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_obj(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 3) == 0;
 }
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
 
-static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_small_int(mp_const_obj_t o) {
     return (((uint64_t)(o)) & 0xffff000000000000) == 0x0001000000000000;
 }
 #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)((o) << 16)) >> 17)
 #define MP_OBJ_NEW_SMALL_INT(small_int) (((((uint64_t)(small_int)) & 0x7fffffffffff) << 1) | 0x0001000000000001)
 
-static inline bool mp_obj_is_qstr(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_qstr(mp_const_obj_t o) {
     return (((uint64_t)(o)) & 0xffff000000000000) == 0x0002000000000000;
 }
 #define MP_OBJ_QSTR_VALUE(o) ((((uint32_t)(o)) >> 1) & 0xffffffff)
 #define MP_OBJ_NEW_QSTR(qst) ((mp_obj_t)(((uint64_t)(((uint32_t)(qst)) << 1)) | 0x0002000000000001))
 
-static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
     return (((uint64_t)(o)) & 0xffff000000000000) == 0x0003000000000000;
 }
 #define MP_OBJ_IMMEDIATE_OBJ_VALUE(o) ((((uint32_t)(o)) >> 46) & 3)
@@ -230,17 +230,17 @@ static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
 #define mp_const_float_e {((mp_obj_t)((uint64_t)0x4005bf0a8b145769 + 0x8004000000000000))}
 #define mp_const_float_pi {((mp_obj_t)((uint64_t)0x400921fb54442d18 + 0x8004000000000000))}
 
-static inline bool mp_obj_is_float(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_float(mp_const_obj_t o) {
     return ((uint64_t)(o) & 0xfffc000000000000) != 0;
 }
-static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
+static MP_INLINE mp_float_t mp_obj_float_get(mp_const_obj_t o) {
     union {
         mp_float_t f;
         uint64_t r;
     } num = {.r = o - 0x8004000000000000};
     return num.f;
 }
-static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
+static MP_INLINE mp_obj_t mp_obj_new_float(mp_float_t f) {
     union {
         mp_float_t f;
         uint64_t r;
@@ -249,7 +249,7 @@ static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
 }
 #endif
 
-static inline bool mp_obj_is_obj(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_obj(mp_const_obj_t o) {
     return (((uint64_t)(o)) & 0xffff000000000000) == 0x0000000000000000;
 }
 #define MP_OBJ_TO_PTR(o) ((void *)(uintptr_t)(o))
@@ -454,7 +454,7 @@ typedef enum _mp_map_lookup_kind_t {
     MP_MAP_LOOKUP_ADD_IF_NOT_FOUND_OR_REMOVE_IF_FOUND = 3, // only valid for mp_set_lookup
 } mp_map_lookup_kind_t;
 
-static inline bool mp_map_slot_is_filled(const mp_map_t *map, size_t pos) {
+static MP_INLINE bool mp_map_slot_is_filled(const mp_map_t *map, size_t pos) {
     assert(pos < map->alloc);
     return (map)->table[pos].key != MP_OBJ_NULL && (map)->table[pos].key != MP_OBJ_SENTINEL;
 }
@@ -476,7 +476,7 @@ typedef struct _mp_set_t {
     mp_obj_t *table;
 } mp_set_t;
 
-static inline bool mp_set_slot_is_filled(const mp_set_t *set, size_t pos) {
+static MP_INLINE bool mp_set_slot_is_filled(const mp_set_t *set, size_t pos) {
     return (set)->table[pos] != MP_OBJ_NULL && (set)->table[pos] != MP_OBJ_SENTINEL;
 }
 
@@ -821,7 +821,7 @@ extern const struct _mp_obj_exception_t mp_static_GeneratorExit_obj;
 #define mp_obj_is_tuple_compatible(o) (mp_type_get_getiter_slot(mp_obj_get_type(o)) == 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) {
+static MP_INLINE mp_obj_t mp_obj_new_bool(mp_int_t x) {
     return x ? mp_const_true : mp_const_false;
 }
 mp_obj_t mp_obj_new_cell(mp_obj_t obj);
@@ -893,7 +893,7 @@ mp_obj_t mp_obj_equal_not_equal(mp_binary_op_t op, mp_obj_t o1, mp_obj_t o2);
 bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2);
 
 // returns true if o is bool, small int or long int
-static inline bool mp_obj_is_integer(mp_const_obj_t o) {
+static MP_INLINE bool mp_obj_is_integer(mp_const_obj_t o) {
     return mp_obj_is_int(o) || mp_obj_is_bool(o);
 }
 
@@ -940,7 +940,7 @@ mp_obj_t mp_obj_exception_get_value(mp_obj_t self_in);
 mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in);
 void mp_init_emergency_exception_buf(void);
-static inline mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
+static MP_INLINE mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
     assert(exc_type->make_new == mp_obj_exception_make_new);
     return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
 }
@@ -957,42 +957,42 @@ void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, size_t s
 #if MICROPY_PY_BUILTINS_FLOAT
 // float
 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-static inline float mp_obj_get_float_to_f(mp_obj_t o) {
+static MP_INLINE float mp_obj_get_float_to_f(mp_obj_t o) {
     return mp_obj_get_float(o);
 }
 
-static inline double mp_obj_get_float_to_d(mp_obj_t o) {
+static MP_INLINE double mp_obj_get_float_to_d(mp_obj_t o) {
     return (double)mp_obj_get_float(o);
 }
 
-static inline mp_obj_t mp_obj_new_float_from_f(float o) {
+static MP_INLINE mp_obj_t mp_obj_new_float_from_f(float o) {
     return mp_obj_new_float(o);
 }
 
-static inline mp_obj_t mp_obj_new_float_from_d(double o) {
+static MP_INLINE mp_obj_t mp_obj_new_float_from_d(double o) {
     return mp_obj_new_float((mp_float_t)o);
 }
 #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-static inline float mp_obj_get_float_to_f(mp_obj_t o) {
+static MP_INLINE float mp_obj_get_float_to_f(mp_obj_t o) {
     return (float)mp_obj_get_float(o);
 }
 
-static inline double mp_obj_get_float_to_d(mp_obj_t o) {
+static MP_INLINE double mp_obj_get_float_to_d(mp_obj_t o) {
     return mp_obj_get_float(o);
 }
 
-static inline mp_obj_t mp_obj_new_float_from_f(float o) {
+static MP_INLINE mp_obj_t mp_obj_new_float_from_f(float o) {
     return mp_obj_new_float((mp_float_t)o);
 }
 
-static inline mp_obj_t mp_obj_new_float_from_d(double o) {
+static MP_INLINE mp_obj_t mp_obj_new_float_from_d(double o) {
     return mp_obj_new_float(o);
 }
 #endif
 #if MICROPY_FLOAT_HIGH_QUALITY_HASH
 mp_int_t mp_float_hash(mp_float_t val);
 #else
-static inline mp_int_t mp_float_hash(mp_float_t val) {
+static MP_INLINE mp_int_t mp_float_hash(mp_float_t val) {
     return (mp_int_t)val;
 }
 #endif
@@ -1031,7 +1031,7 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index);
 mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value);
 mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key);
 mp_obj_t mp_obj_dict_copy(mp_obj_t self_in);
-static inline mp_map_t *mp_obj_dict_get_map(mp_obj_t dict) {
+static MP_INLINE mp_map_t *mp_obj_dict_get_map(mp_obj_t dict) {
     return &((mp_obj_dict_t *)MP_OBJ_TO_PTR(dict))->map;
 }
 
diff --git a/py/objdict.c b/py/objdict.c
index 306205d12f..02aedacdd6 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -229,7 +229,7 @@ STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 /******************************************************************************/
 /* dict methods                                                               */
 
-STATIC void mp_ensure_not_fixed(const mp_obj_dict_t *dict) {
+STATIC void PLACE_IN_ITCM(mp_ensure_not_fixed)(const mp_obj_dict_t * dict) {
     if (dict->map.is_fixed) {
         mp_raise_TypeError(NULL);
     }
@@ -643,7 +643,7 @@ size_t mp_obj_dict_len(mp_obj_t self_in) {
     return self->map.used;
 }
 
-mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
+mp_obj_t PLACE_IN_ITCM(mp_obj_dict_store)(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
     mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_ensure_not_fixed(self);
diff --git a/py/objfun.c b/py/objfun.c
index 55c3fbbb06..5a02869fcf 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -50,7 +50,7 @@
 /******************************************************************************/
 /* builtin functions                                                          */
 
-STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_builtin_0_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)args;
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_0));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
@@ -68,7 +68,7 @@ const mp_obj_type_t mp_type_fun_builtin_0 = {
         ),
 };
 
-STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_builtin_1_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_1));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
@@ -85,7 +85,7 @@ const mp_obj_type_t mp_type_fun_builtin_1 = {
         ),
 };
 
-STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_builtin_2_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_2));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
@@ -102,7 +102,7 @@ const mp_obj_type_t mp_type_fun_builtin_2 = {
         ),
 };
 
-STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_builtin_3_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_3));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
@@ -119,7 +119,7 @@ const mp_obj_type_t mp_type_fun_builtin_3 = {
         ),
 };
 
-STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_builtin_var_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_var));
     mp_obj_fun_builtin_var_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -418,7 +418,7 @@ mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args_in, mp_obj_t def_kw_args, const byt
 
 #if MICROPY_EMIT_NATIVE
 
-STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_native_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     MP_STACK_CHECK();
     mp_obj_fun_bc_t *self = self_in;
     mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode);
@@ -505,7 +505,7 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
     }
 }
 
-STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t PLACE_IN_ITCM(fun_asm_call)(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_fun_asm_t *self = self_in;
 
     mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
diff --git a/py/objproperty.c b/py/objproperty.c
index e8ae5094fa..f55efc8bdb 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -99,7 +99,7 @@ const mp_obj_type_t mp_type_property = {
 extern const mp_obj_property_t __property_getter_start, __property_getter_end, __property_getset_start, __property_getset_end;
 #endif
 
-const mp_obj_t *mp_obj_property_get(mp_obj_t self_in, size_t *n_proxy) {
+const mp_obj_t *PLACE_IN_ITCM(mp_obj_property_get)(mp_obj_t self_in, size_t *n_proxy) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_property));
     mp_obj_property_t *self = MP_OBJ_TO_PTR(self_in);
     #if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE
diff --git a/py/pystack.c b/py/pystack.c
index 43dfd4ed6c..696b033377 100644
--- a/py/pystack.c
+++ b/py/pystack.c
@@ -36,7 +36,7 @@ void mp_pystack_init(void *start, void *end) {
     MP_STATE_THREAD(pystack_cur) = start;
 }
 
-void *mp_pystack_alloc(size_t n_bytes) {
+void *PLACE_IN_ITCM(mp_pystack_alloc)(size_t n_bytes) {
     n_bytes = (n_bytes + (MICROPY_PYSTACK_ALIGN - 1)) & ~(MICROPY_PYSTACK_ALIGN - 1);
     #if MP_PYSTACK_DEBUG
     n_bytes += MICROPY_PYSTACK_ALIGN;
diff --git a/py/pystack.h b/py/pystack.h
index ed51e0c7e3..169d58b6f7 100644
--- a/py/pystack.h
+++ b/py/pystack.h
@@ -41,7 +41,7 @@ void *mp_pystack_alloc(size_t n_bytes);
 // This function can free multiple continuous blocks at once: just pass the
 // pointer to the block that was allocated first and it and all subsequently
 // allocated blocks will be freed.
-static inline void mp_pystack_free(void *ptr) {
+static MP_INLINE void mp_pystack_free(void *ptr) {
     assert((uint8_t *)ptr >= MP_STATE_THREAD(pystack_start));
     assert((uint8_t *)ptr <= MP_STATE_THREAD(pystack_cur));
     #if MP_PYSTACK_DEBUG
@@ -59,16 +59,16 @@ static inline void mp_pystack_free(void *ptr) {
     MP_STATE_THREAD(pystack_cur) = (uint8_t *)ptr;
 }
 
-static inline void mp_pystack_realloc(void *ptr, size_t n_bytes) {
+static MP_INLINE void mp_pystack_realloc(void *ptr, size_t n_bytes) {
     mp_pystack_free(ptr);
     mp_pystack_alloc(n_bytes);
 }
 
-static inline size_t mp_pystack_usage(void) {
+static MP_INLINE size_t mp_pystack_usage(void) {
     return MP_STATE_THREAD(pystack_cur) - MP_STATE_THREAD(pystack_start);
 }
 
-static inline size_t mp_pystack_limit(void) {
+static MP_INLINE size_t mp_pystack_limit(void) {
     return MP_STATE_THREAD(pystack_end) - MP_STATE_THREAD(pystack_start);
 }
 
@@ -78,43 +78,43 @@ static inline size_t mp_pystack_limit(void) {
 
 #define mp_local_alloc(n_bytes) alloca(n_bytes)
 
-static inline void mp_local_free(void *ptr) {
+static MP_INLINE void mp_local_free(void *ptr) {
     (void)ptr;
 }
 
-static inline void *mp_nonlocal_alloc(size_t n_bytes) {
+static MP_INLINE void *mp_nonlocal_alloc(size_t n_bytes) {
     return m_new(uint8_t, n_bytes);
 }
 
-static inline void *mp_nonlocal_realloc(void *ptr, size_t old_n_bytes, size_t new_n_bytes) {
+static MP_INLINE void *mp_nonlocal_realloc(void *ptr, size_t old_n_bytes, size_t new_n_bytes) {
     return m_renew(uint8_t, ptr, old_n_bytes, new_n_bytes);
 }
 
-static inline void mp_nonlocal_free(void *ptr, size_t n_bytes) {
+static MP_INLINE void mp_nonlocal_free(void *ptr, size_t n_bytes) {
     m_del(uint8_t, ptr, n_bytes);
 }
 
 #else
 
-static inline void *mp_local_alloc(size_t n_bytes) {
+static MP_INLINE void *mp_local_alloc(size_t n_bytes) {
     return mp_pystack_alloc(n_bytes);
 }
 
-static inline void mp_local_free(void *ptr) {
+static MP_INLINE void mp_local_free(void *ptr) {
     mp_pystack_free(ptr);
 }
 
-static inline void *mp_nonlocal_alloc(size_t n_bytes) {
+static MP_INLINE void *mp_nonlocal_alloc(size_t n_bytes) {
     return mp_pystack_alloc(n_bytes);
 }
 
-static inline void *mp_nonlocal_realloc(void *ptr, size_t old_n_bytes, size_t new_n_bytes) {
+static MP_INLINE void *mp_nonlocal_realloc(void *ptr, size_t old_n_bytes, size_t new_n_bytes) {
     (void)old_n_bytes;
     mp_pystack_realloc(ptr, new_n_bytes);
     return ptr;
 }
 
-static inline void mp_nonlocal_free(void *ptr, size_t n_bytes) {
+static MP_INLINE void mp_nonlocal_free(void *ptr, size_t n_bytes) {
     (void)n_bytes;
     mp_pystack_free(ptr);
 }
diff --git a/py/qstr.c b/py/qstr.c
index 083e12d6f0..96e2a79192 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -137,7 +137,7 @@ void qstr_init(void) {
     #endif
 }
 
-STATIC const char *find_qstr(qstr q, qstr_attr_t *attr) {
+STATIC const char *PLACE_IN_ITCM(find_qstr)(qstr q, qstr_attr_t *attr) {
     // search pool for this qstr
     // total_prev_len==0 in the final pool, so the loop will always terminate
     const qstr_pool_t *pool = MP_STATE_VM(last_pool);
diff --git a/py/runtime.c b/py/runtime.c
index 9227594d83..91d9eb1c6d 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1588,7 +1588,7 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
 
 #endif // MICROPY_ENABLE_COMPILER
 
-NORETURN void m_malloc_fail(size_t num_bytes) {
+NORETURN MP_COLD void m_malloc_fail(size_t num_bytes) {
     DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes);
     #if MICROPY_ENABLE_GC
     if (gc_is_locked()) {
@@ -1601,25 +1601,25 @@ NORETURN void m_malloc_fail(size_t num_bytes) {
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
 
-NORETURN void mp_raise_type(const mp_obj_type_t *exc_type) {
+NORETURN MP_COLD 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) {
+NORETURN MP_COLD void mp_raise_ValueError_no_msg(void) {
     mp_raise_type(&mp_type_ValueError);
 }
 
-NORETURN void mp_raise_TypeError_no_msg(void) {
+NORETURN MP_COLD void mp_raise_TypeError_no_msg(void) {
     mp_raise_type(&mp_type_TypeError);
 }
 
-NORETURN void mp_raise_NotImplementedError_no_msg(void) {
+NORETURN MP_COLD 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, const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg) {
     if (msg == NULL) {
         nlr_raise(mp_obj_new_exception(exc_type));
     } else {
@@ -1627,19 +1627,19 @@ NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_strin
     }
 }
 
-NORETURN void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list argptr) {
+NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list argptr) {
     mp_obj_t exception = mp_obj_new_exception_msg_vlist(exc_type, fmt, argptr);
     nlr_raise(exception);
 }
 
-NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(exc_type, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg) {
+NORETURN MP_COLD void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg) {
     if (msg == NULL) {
         nlr_raise(mp_obj_new_exception(exc_type));
     } else {
@@ -1647,56 +1647,56 @@ NORETURN void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg) {
     }
 }
 
-NORETURN void mp_raise_AttributeError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_AttributeError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_AttributeError, msg);
 }
 
-NORETURN void mp_raise_RuntimeError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_RuntimeError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_RuntimeError, msg);
 }
 
-NORETURN void mp_raise_ImportError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_ImportError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_ImportError, msg);
 }
 
-NORETURN void mp_raise_IndexError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_IndexError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_IndexError, msg);
 }
 
-NORETURN void mp_raise_IndexError_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_IndexError_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_IndexError, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_ValueError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_ValueError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_ValueError, msg);
 }
 
-NORETURN void mp_raise_ValueError_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_ValueError_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_ValueError, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_TypeError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_TypeError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_TypeError, msg);
 }
 
-NORETURN void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_TypeError, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_OSError_msg(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_OSError_msg(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_OSError, msg);
 }
 
-NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
+NORETURN MP_COLD void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
     mp_obj_t args[2] = {
         MP_OBJ_NEW_SMALL_INT(errno_),
         str,
@@ -1704,26 +1704,26 @@ NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
     nlr_raise(mp_obj_new_exception_args(&mp_type_OSError, 2, args));
 }
 
-NORETURN void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_OSError, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_ConnectionError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_ConnectionError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_ConnectionError, msg);
 }
 
-NORETURN void mp_raise_BrokenPipeError(void) {
+NORETURN MP_COLD void mp_raise_BrokenPipeError(void) {
     mp_raise_type_arg(&mp_type_BrokenPipeError, MP_OBJ_NEW_SMALL_INT(MP_EPIPE));
 }
 
-NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg) {
+NORETURN MP_COLD void mp_raise_NotImplementedError(const compressed_string_t *msg) {
     mp_raise_msg(&mp_type_NotImplementedError, msg);
 }
 
-NORETURN void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_NotImplementedError, fmt, argptr);
@@ -1731,17 +1731,18 @@ NORETURN void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt,
 }
 
 
-NORETURN void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...) {
+NORETURN MP_COLD void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...) {
     va_list argptr;
     va_start(argptr,fmt);
     mp_raise_msg_vlist(&mp_type_OverflowError, fmt, argptr);
     va_end(argptr);
 }
 
-NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
+NORETURN MP_COLD void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
     nlr_raise(mp_obj_new_exception_arg1(exc_type, arg));
 }
 
+// Leave this as not COLD because it is used by iterators in normal execution.
 NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
     if (arg == MP_OBJ_NULL) {
         mp_raise_type(&mp_type_StopIteration);
@@ -1750,18 +1751,18 @@ NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
     }
 }
 
-NORETURN void mp_raise_OSError(int errno_) {
+NORETURN MP_COLD void mp_raise_OSError(int errno_) {
     mp_raise_type_arg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_));
 }
 
 #endif
 
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
-NORETURN void mp_raise_recursion_depth(void) {
+NORETURN MP_COLD void mp_raise_recursion_depth(void) {
     mp_raise_RuntimeError(MP_ERROR_TEXT("maximum recursion depth exceeded"));
 }
 #endif
 
-NORETURN void mp_raise_ZeroDivisionError(void) {
+NORETURN MP_COLD void mp_raise_ZeroDivisionError(void) {
     mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
 }
diff --git a/py/runtime.h b/py/runtime.h
index 1a7a5d1698..d154772508 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -86,7 +86,7 @@ bool mp_sched_schedule(mp_obj_t function, mp_obj_t arg);
 int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec);
 
 void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig);
-static inline void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_args_max, bool takes_kw) {
+static MP_INLINE void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_args_max, bool takes_kw) {
     mp_arg_check_num_sig(n_args, n_kw, MP_OBJ_FUN_MAKE_SIG(n_args_min, n_args_max, takes_kw));
 }
 void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
@@ -115,16 +115,16 @@ mp_obj_t mp_arg_validate_type_or_none(mp_obj_t obj, const mp_obj_type_t *type, q
 mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name);
 mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name);
 
-static inline mp_obj_dict_t *PLACE_IN_ITCM(mp_locals_get)(void) {
+static MP_INLINE mp_obj_dict_t *mp_locals_get(void) {
     return MP_STATE_THREAD(dict_locals);
 }
-static inline void PLACE_IN_ITCM(mp_locals_set)(mp_obj_dict_t * d) {
+static MP_INLINE void mp_locals_set(mp_obj_dict_t *d) {
     MP_STATE_THREAD(dict_locals) = d;
 }
-static inline mp_obj_dict_t *PLACE_IN_ITCM(mp_globals_get)(void) {
+static MP_INLINE mp_obj_dict_t *mp_globals_get(void) {
     return MP_STATE_THREAD(dict_globals);
 }
-static inline void PLACE_IN_ITCM(mp_globals_set)(mp_obj_dict_t * d) {
+static MP_INLINE void mp_globals_set(mp_obj_dict_t *d) {
     MP_STATE_THREAD(dict_globals) = d;
 }
 
@@ -181,7 +181,7 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o); // may return MP_OBJ_STOP_ITERATIO
 mp_obj_t mp_iternext(mp_obj_t o); // will always return MP_OBJ_STOP_ITERATION instead of raising StopIteration(...)
 mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val);
 
-static inline mp_obj_t mp_make_stop_iteration(mp_obj_t o) {
+static MP_INLINE mp_obj_t mp_make_stop_iteration(mp_obj_t o) {
     MP_STATE_THREAD(stop_iteration_arg) = o;
     return MP_OBJ_STOP_ITERATION;
 }
diff --git a/py/stackctrl.c b/py/stackctrl.c
index d699d6da61..546987f04d 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -38,7 +38,7 @@ void mp_stack_set_top(void *top) {
     MP_STATE_THREAD(stack_top) = top;
 }
 
-mp_uint_t mp_stack_usage(void) {
+mp_uint_t PLACE_IN_ITCM(mp_stack_usage)(void) {
     // Assumes descending stack
     // Force routine to not be inlined. Better guarantee than MP_NOINLINE for -flto.
     __asm volatile ("");
@@ -52,7 +52,7 @@ void mp_stack_set_limit(mp_uint_t limit) {
     MP_STATE_THREAD(stack_limit) = limit;
 }
 
-void mp_stack_check(void) {
+void PLACE_IN_ITCM(mp_stack_check)(void) {
     if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
         mp_raise_recursion_depth();
     }
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index de4d66f9d8..c0195115fa 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -125,7 +125,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj___exit__(size_t n_args, const mp_obj_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(digitalio_digitalinout_obj___exit___obj, 4, 4, digitalio_digitalinout_obj___exit__);
 
-STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
+STATIC inline void check_for_deinit(digitalio_digitalinout_obj_t *self) {
     if (common_hal_digitalio_digitalinout_deinited(self)) {
         raise_deinited_error();
     }
diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c
index 7b6eec7e1b..060972d0c3 100644
--- a/shared-module/storage/__init__.c
+++ b/shared-module/storage/__init__.c
@@ -127,6 +127,7 @@ static bool usb_drive_set_enabled(bool enabled) {
     if (tud_connected()) {
         return false;
     }
+    filesystem_set_internal_writable_by_usb(enabled);
     storage_usb_is_enabled = enabled;
     return true;
 }
diff --git a/supervisor/linker.h b/supervisor/linker.h
index 58068c1a4b..c6ee8b4218 100644
--- a/supervisor/linker.h
+++ b/supervisor/linker.h
@@ -32,7 +32,8 @@
 #if defined(IMXRT10XX) || defined(FOMU) || defined(STM32H7) || defined(RASPBERRYPI)
 #define PLACE_IN_DTCM_DATA(name) name __attribute__((section(".dtcm_data." #name)))
 #define PLACE_IN_DTCM_BSS(name) name __attribute__((section(".dtcm_bss." #name)))
-#define PLACE_IN_ITCM(name) __attribute__((section(".itcm." #name))) name
+// Don't inline ITCM functions because that may pull them out of ITCM into other sections.
+#define PLACE_IN_ITCM(name) __attribute__((section(".itcm." #name),noinline)) name
 #else
 #define PLACE_IN_DTCM_DATA(name) name
 #define PLACE_IN_DTCM_BSS(name) name
diff --git a/supervisor/shared/background_callback.c b/supervisor/shared/background_callback.c
index db6d62f8e7..80f70b528a 100644
--- a/supervisor/shared/background_callback.c
+++ b/supervisor/shared/background_callback.c
@@ -42,7 +42,7 @@ STATIC volatile background_callback_t *volatile callback_head, *volatile callbac
 MP_WEAK void port_wake_main_task(void) {
 }
 
-void background_callback_add_core(background_callback_t *cb) {
+void PLACE_IN_ITCM(background_callback_add_core)(background_callback_t * cb) {
     CALLBACK_CRITICAL_BEGIN;
     if (cb->prev || callback_head == cb) {
         CALLBACK_CRITICAL_END;
@@ -62,13 +62,13 @@ void background_callback_add_core(background_callback_t *cb) {
     port_wake_main_task();
 }
 
-void background_callback_add(background_callback_t *cb, background_callback_fun fun, void *data) {
+void PLACE_IN_ITCM(background_callback_add)(background_callback_t * cb, background_callback_fun fun, void *data) {
     cb->fun = fun;
     cb->data = data;
     background_callback_add_core(cb);
 }
 
-bool PLACE_IN_ITCM(background_callback_pending)(void) {
+bool inline background_callback_pending(void) {
     return callback_head != NULL;
 }
 
diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c
index 1eab59c384..345f55f2f1 100644
--- a/supervisor/shared/filesystem.c
+++ b/supervisor/shared/filesystem.c
@@ -33,6 +33,7 @@
 #include "py/mpstate.h"
 
 #include "supervisor/flash.h"
+#include "supervisor/linker.h"
 
 static mp_vfs_mount_t _mp_vfs;
 static fs_user_mount_t _internal_vfs;
@@ -165,7 +166,7 @@ bool filesystem_init(bool create_allowed, bool force_create) {
     return true;
 }
 
-void filesystem_flush(void) {
+void PLACE_IN_ITCM(filesystem_flush)(void) {
     // Reset interval before next flush.
     filesystem_flush_interval_ms = CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS;
     supervisor_flash_flush();
diff --git a/supervisor/shared/flash.c b/supervisor/shared/flash.c
index dfd7cf2050..53815c9836 100644
--- a/supervisor/shared/flash.c
+++ b/supervisor/shared/flash.c
@@ -132,7 +132,7 @@ static mp_uint_t flash_write_blocks(const uint8_t *src, uint32_t block_num, uint
     }
 }
 
-void supervisor_flash_flush(void) {
+void PLACE_IN_ITCM(supervisor_flash_flush)(void) {
     #if INTERNAL_FLASH_FILESYSTEM
     port_internal_flash_flush();
     #else
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 5112b17ebf..d3a31de71a 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -34,6 +34,7 @@
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
 
+#include "supervisor/linker.h"
 #include "supervisor/serial.h"
 #include "supervisor/shared/rgb_led_colors.h"
 #include "supervisor/shared/status_leds.h"
@@ -121,12 +122,12 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     return SAFE_MODE_NONE;
 }
 
-void safe_mode_on_next_reset(safe_mode_t reason) {
+void PLACE_IN_ITCM(safe_mode_on_next_reset)(safe_mode_t reason) {
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (reason << 8));
 }
 
 // Don't inline this so it's easy to break on it from GDB.
-void __attribute__((noinline,)) reset_into_safe_mode(safe_mode_t reason) {
+void __attribute__((noinline,)) PLACE_IN_ITCM(reset_into_safe_mode)(safe_mode_t reason) {
     if (_safe_mode > SAFE_MODE_BROWNOUT && reason > SAFE_MODE_BROWNOUT) {
         while (true) {
             // This very bad because it means running in safe mode didn't save us. Only ignore brownout
diff --git a/supervisor/shared/status_bar.c b/supervisor/shared/status_bar.c
index 4f5fa06464..16d23fe541 100644
--- a/supervisor/shared/status_bar.c
+++ b/supervisor/shared/status_bar.c
@@ -78,8 +78,8 @@ void supervisor_status_bar_update(void) {
         !shared_module_supervisor_status_bar_get_display(&shared_module_supervisor_status_bar_obj);
 
     // Suppress writes to console and/or display if status bar is not enabled for either or both.
-    bool prev_console_disable;
-    bool prev_display_disable;
+    bool prev_console_disable = false;
+    bool prev_display_disable = false;
 
     if (disable_console_writes) {
         prev_console_disable = serial_console_write_disable(true);
diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h
index 1c144197cb..13da8c656b 100644
--- a/supervisor/shared/translate/translate_impl.h
+++ b/supervisor/shared/translate/translate_impl.h
@@ -48,7 +48,9 @@ inline
 #if !CIRCUITPY_LTO || CIRCUITPY_DEBUG < 1
 __attribute__((always_inline))
 #endif
-const compressed_string_t *translate(const char *original) {
+// Prevent instrumenting this because that disables the inlining we rely of for code size
+// optimization.
+__attribute__((no_instrument_function)) const compressed_string_t *translate(const char *original) {
     #ifndef NO_QSTR
     #define QDEF(id, hash, len, str)
     #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return &translation##number; } else
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 5ac8454312..1d600e1158 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -220,11 +220,11 @@ static void usb_background_do(void *unused) {
     usb_background();
 }
 
-void usb_background_schedule(void) {
+void PLACE_IN_ITCM(usb_background_schedule)(void) {
     background_callback_add(&usb_callback, usb_background_do, NULL);
 }
 
-void usb_irq_handler(int instance) {
+void PLACE_IN_ITCM(usb_irq_handler)(int instance) {
     #if CFG_TUSB_MCU != OPT_MCU_RP2040
     // For rp2040, IRQ handler is already installed and invoked automatically
     if (instance == CIRCUITPY_USB_DEVICE_INSTANCE) {
diff --git a/tests/perf_bench/benchrun.py b/tests/perf_bench/benchrun.py
index 90c303dd29..0092ecaa33 100644
--- a/tests/perf_bench/benchrun.py
+++ b/tests/perf_bench/benchrun.py
@@ -4,7 +4,7 @@ def bm_run(N, M):
     except ImportError:
         import time
 
-        ticks_us = lambda: int(time.perf_counter() * 1000000)
+        ticks_us = lambda: int(time.monotonic_ns() / 1000)
         ticks_diff = lambda a, b: a - b
 
     # Pick sensible parameters given N, M
diff --git a/tools/cortex-m-fault-gdb.py b/tools/cortex-m-fault-gdb.py
new file mode 100644
index 0000000000..31b76aa1d4
--- /dev/null
+++ b/tools/cortex-m-fault-gdb.py
@@ -0,0 +1,106 @@
+"""Source this file into gdb `source ../../tools/cortex-m-fault-gdb.py` then run
+   `cortex-m-fault` to print basic info about the fault registers."""
+
+SCS = 0xE000E000
+SCB = SCS + 0x0D00
+CPUID = SCB + 0x000  # (R/ )  CPUID Base Register */
+ICSR = SCB + 0x004  # (R/W)  Interrupt Control and State Register */
+VTOR = SCB + 0x008  # (R/W)  Vector Table Offset Register */
+AIRCR = SCB + 0x00C  # (R/W)  Application Interrupt and Reset Control Register */
+SCR = SCB + 0x010  # (R/W)  System Control Register */
+CCR = SCB + 0x014  # (R/W)  Configuration Control Register */
+SHCSR = SCB + 0x024  # (R/W)  System Handler Control and State Register */
+CFSR = SCB + 0x028  # (R/W)  Configurable Fault Status Register */
+HFSR = SCB + 0x02C  # (R/W)  HardFault Status Register */
+DFSR = SCB + 0x030  # (R/W)  Debug Fault Status Register */
+MMFAR = SCB + 0x034  # (R/W)  MemManage Fault Address Register */
+BFAR = SCB + 0x038  # (R/W)  BusFault Address Register */
+AFSR = SCB + 0x03C  # (R/W)  Auxiliary Fault Status Register */
+
+PARTS = {0xC27: "Cortex M7"}
+
+EXCEPTIONS = {
+    0: "Thread mode",
+    2: "Non Maskable Interrupt",
+    3: "Hard Fault",
+    4: "MemManage Fault",
+    5: "Bus Fault",
+    6: "Usage Fault",
+    11: "SVCAll",
+    14: "PendSV",
+    15: "SysTick",
+}
+
+
+class CortexMFault(gdb.Command):
+    def __init__(self):
+        super(CortexMFault, self).__init__("cortex-m-fault", gdb.COMMAND_USER)
+
+    def _read(self, address):
+        i = gdb.selected_inferior()
+        return i.read_memory(address, 4).cast("I")[0]
+
+    def invoke(self, arg, from_tty):
+        cpuid = self._read(CPUID)
+        implementer = cpuid >> 24
+        if implementer != 0x41:
+            raise RuntimeError()
+        variant = (cpuid >> 20) & 0xF
+        constant = (cpuid >> 16) & 0xF
+        if constant != 0xF:
+            raise RuntimeError()
+        revision = cpuid & 0xF
+        part_no = (cpuid >> 4) & 0xFFF
+        print(PARTS[part_no])
+        icsr = self._read(ICSR)
+        if (icsr & (1 << 11)) != 0:
+            print("No preempted exceptions")
+        else:
+            print("Another exception was preempted")
+        vectactive = icsr & 0x1FF
+        if vectactive != 0:
+            if vectactive in EXCEPTIONS:
+                print(EXCEPTIONS[vectactive])
+            else:
+                print(vectactive - 16)
+
+        vtor = self._read(VTOR)
+        # print(hex(self._read(SHCSR)))
+        cfsr = self._read(CFSR)
+        ufsr = cfsr >> 16
+        bfsr = (cfsr >> 8) & 0xFF
+        mmfsr = cfsr & 0xFF
+        print("ufsr", hex(ufsr), "bfsr", hex(bfsr), "mmfsr", hex(mmfsr))
+        if (bfsr & (1 << 7)) != 0:
+            print("Bad address", hex(self._read(BFAR)))
+        if (bfsr & (1 << 3)) != 0:
+            print("Unstacking from exception error")
+        if (bfsr & (1 << 2)) != 0:
+            print("Imprecise data bus error")
+        if (bfsr & (1 << 1)) != 0:
+            print("Precise data bus error")
+        if (bfsr & (1 << 0)) != 0:
+            print("Instruction bus error")
+
+        if (mmfsr & (1 << 7)) != 0:
+            print("Bad address", hex(self._read(MMFAR)))
+        if (mmfsr & (1 << 3)) != 0:
+            print("Unstacking from exception error")
+        if (mmfsr & (1 << 1)) != 0:
+            print("Data access violation")
+        if (mmfsr & (1 << 0)) != 0:
+            print("Instruction access violation")
+
+        if (ufsr & (1 << 8)) != 0:
+            print("Unaligned access")
+        if (ufsr & (1 << 0)) != 0:
+            print("Undefined instruction")
+        hfsr = self._read(HFSR)
+        if (hfsr & (1 << 30)) != 0:
+            print("Forced hard fault")
+        if (hfsr & (1 << 1)) != 0:
+            print("Bus fault when reading vector table")
+            print("VTOR", hex(vtor))
+
+
+CortexMFault()
diff --git a/tools/cpboard.py b/tools/cpboard.py
index 1f399d1dfc..658cf512a2 100644
--- a/tools/cpboard.py
+++ b/tools/cpboard.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MIT
 
 import os
+import pathlib
 import re
 import serial
 import sys
@@ -93,16 +94,18 @@ class REPL:
         for i in range(0, len(data), chunk_size):
             chunk = data[i : min(i + chunk_size, len(data))]
             self.session += chunk
-            self.serial.write(chunk)
+            c = self.serial.write(chunk)
+            if c < len(chunk):
+                raise RuntimeError()
             time.sleep(0.01)
 
     def reset(self):
         # Use read() since serial.reset_input_buffer() fails with termios.error now and then
         self.read()
         self.session = b""
-        self.write(b"\r" + REPL.CHAR_CTRL_C + REPL.CHAR_CTRL_C)  # interrupt any running program
+        self.write(REPL.CHAR_CTRL_C + REPL.CHAR_CTRL_C)  # interrupt any running program
         self.write(b"\r" + REPL.CHAR_CTRL_B)  # enter or reset friendly repl
-        data = self.read_until(b">>> ")
+        self.read_until(b">>> ", timeout=60)
 
     def execute(self, code, timeout=10, wait_for_response=True):
         self.read()  # Throw away
@@ -347,7 +350,7 @@ class CPboard:
         return cls(dev, baudrate=baudrate, wait=wait, timeout=timeout)
 
     def __init__(self, device, baudrate=115200, wait=0, timeout=10):
-        self.device = device
+        self.device = str(pathlib.Path(device).resolve())
         self.usb_dev = None
         try:
             # Is it a usb.core.Device?
@@ -357,7 +360,7 @@ class CPboard:
         else:
             serials = [serial for serial in os.listdir("/dev/serial/by-path") if portstr in serial]
             if len(serials) != 1:
-                raise RuntimeError("Can't find excatly one matching usb serial device")
+                raise RuntimeError("Can't find exactly one matching usb serial device")
             self.device = os.path.realpath("/dev/serial/by-path/" + serials[0])
             self.usb_dev = device
 
@@ -370,6 +373,10 @@ class CPboard:
         self.bootloader = False
         self.repl = REPL(self)
 
+        # Disable autoreload so that file copies won't mess us up.
+        with self:
+            self.exec("import supervisor;supervisor.runtime.autoreload = False")
+
     def __enter__(self):
         self.open()
         return self
@@ -507,7 +514,7 @@ class CPboard:
 
         part = [part for part in disks if "part1" in part]
         if not part:
-            raise RuntimeError("Disk not found for: " + self.device)
+            return None
 
         return Disk(part[0])
 
@@ -557,9 +564,16 @@ class Pyboard:
     def enter_raw_repl(self):
         self.board.open()
 
+    def exit_raw_repl(self):
+        self.close()
+
     def execfile(self, filename):
         return self.board.execfile(filename)
 
+    def exec_(self, command, data_consumer=None):
+        output = self.board.exec(command, timeout=20000)
+        return output
+
 
 def eval_namedtuple(board, command):
     from collections import namedtuple
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index 7165db84cc..350988bab0 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -121,7 +121,7 @@ if tile_y == 16:
     blinka_size = 16
     c_file.write(
         """\
-uint32_t blinka_bitmap_data[32] = {
+const uint32_t blinka_bitmap_data[32] = {
     0x00000011, 0x11000000,
     0x00000111, 0x53100000,
     0x00000111, 0x56110000,
@@ -145,7 +145,7 @@ else:
     blinka_size = 12
     c_file.write(
         """\
-uint32_t blinka_bitmap_data[28] = {
+const uint32_t blinka_bitmap_data[28] = {
     0x00000111, 0x00000000,
     0x00001153, 0x10000000,
     0x00001156, 0x11000000,
@@ -164,11 +164,11 @@ uint32_t blinka_bitmap_data[28] = {
 
 c_file.write(
     """\
-displayio_bitmap_t blinka_bitmap = {{
+const displayio_bitmap_t blinka_bitmap = {{
     .base = {{.type = &displayio_bitmap_type }},
     .width = {0},
     .height = {0},
-    .data = blinka_bitmap_data,
+    .data = (uint32_t*) blinka_bitmap_data,
     .stride = 2,
     .bits_per_value = 4,
     .x_shift = 3,
@@ -211,7 +211,7 @@ displayio_palette_t blinka_palette = {{
 
 displayio_tilegrid_t supervisor_blinka_sprite = {{
     .base = {{.type = &displayio_tilegrid_type }},
-    .bitmap = &blinka_bitmap,
+    .bitmap = (displayio_bitmap_t*) &blinka_bitmap,
     .pixel_shader = &blinka_palette,
     .x = 0,
     .y = 0,
diff --git a/tools/swo_function_trace.py b/tools/swo_function_trace.py
new file mode 100644
index 0000000000..bdc1b0f840
--- /dev/null
+++ b/tools/swo_function_trace.py
@@ -0,0 +1,143 @@
+"""This prints out Chrome Trace Formatted json that can be viewed in Perfetto or Spall.
+https://ui.perfetto.dev/
+https://gravitymoth.com/spall/spall.html
+
+Format:
+https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview#
+
+Connect a USB to Serial converter to the SWO pin and then provide the serial
+device to this script. It should be 1MBaud SWO signal. CTRL-C when you've captured enough data and
+then it'll process and output.
+
+pip install pysigrok-libsigrokdecode
+python tools/swo_function_trace.py /dev/ttyACM0 build-metro_m7_1011/firmware.elf > trace.json
+"""
+
+import serial
+import sys
+import sigrokdecode
+import time
+import json
+
+from elftools.elf.elffile import ELFFile
+
+f = open(sys.argv[-1], "rb")
+ef = ELFFile(f)
+
+symtab = ef.get_section_by_name(".symtab")
+symbols = {}
+for s in symtab.iter_symbols():
+    addr = s.entry["st_value"]
+    symbols[addr] = s.name
+f.close()
+
+# sys.exit(0)
+
+decoder = sigrokdecode.get_decoder("arm_itm")()
+
+decoder.reset()
+decoder.options = {"objdump": "", "elffile": ""}
+decoder.start()
+
+dwt_timestamp = 0
+last_dwt_timestamp = 0
+streak = 0
+print("[")
+
+stack = []
+
+
+def emit(ts, addr, channel):
+    s = None
+    if addr in symbols:
+        s = symbols[addr]
+    else:
+        s = hex(addr)
+    if addr < 0x6000_0000:
+        s = "R:" + s
+    else:
+        s = "F:" + s
+    if channel[0] == "3":
+        stack.append(addr)
+    else:
+        if not stack or stack[-1] != addr:
+            return
+        stack.pop()
+    event = {
+        "name": s,
+        "ph": "B" if channel[0] == "3" else "E",
+        "ts": ts,
+        "pid": 0,
+        "tid": 0,
+    }
+    print(json.dumps(event), ",")
+
+
+def decoder_cb(ss, es, data):
+    global streak
+    global last_dwt_timestamp
+    # print(ss, es, data)
+    ptype = data[0]
+    ts = (dwt_timestamp + (streak * 32)) / 500
+    if ptype == 0:
+        event = {"name": data[1][0], "ph": "i", "ts": ts, "pid": 0, "tid": 0, "s": "g"}
+        print(json.dumps(event), ",")
+        if data[1][0] == "Overflow":
+            while stack:
+                emit(ts, stack[-1], "4:")
+
+    if ptype in (0, 1):
+        return
+    if ptype == 2 and (data[1][0].startswith("3:") or data[1][0].startswith("4:")):
+        channel, addr = data[1][0].split()
+        addr = int(addr[2:], 16)
+        # if addr & 0x1 != 0:
+        #     addr -= 1
+        # print(dwt_timestamp + streak, channel, symbols[addr], hex(addr))
+        emit(ts, addr, channel)
+    else:
+        # print(dwt_timestamp + streak, data)
+        pass
+    if dwt_timestamp == last_dwt_timestamp:
+        streak += 1
+    else:
+        streak = 0
+
+    if last_dwt_timestamp > dwt_timestamp:
+        raise RuntimeError()
+    last_dwt_timestamp = dwt_timestamp
+
+
+decoder.add_callback(sigrokdecode.OUTPUT_ANN, None, decoder_cb)
+
+s = serial.Serial(sys.argv[-2], 1000000)
+
+
+buffers = []
+while True:
+    try:
+        start_ts = time.monotonic_ns()
+        b = s.read(s.in_waiting)
+        if b:
+            end_ts = time.monotonic_ns()
+            buffers.append((start_ts, end_ts, b))
+            # print(len(b))
+            # if len(buffers) > 10:
+            #     break
+    except KeyboardInterrupt:
+        break
+
+time_per_bit = 1_000_000_000 / 1000000
+
+min_gap = 100000000
+total_bytes = 0
+for start_ts, end_ts, buf in buffers:
+    # print(total_bytes, start_ts, end_ts, buf)
+    ts_per_byte = (end_ts - start_ts) / len(buf)
+    for i, b in enumerate(buf):
+        # print(total_bytes, hex(b))
+        total_bytes += 1
+        decoder.decode(
+            start_ts + ts_per_byte * i, start_ts + ts_per_byte * (i + 1), ("DATA", None, (b,))
+        )
+        dwt_timestamp = decoder.dwt_timestamp
diff --git a/tools/swo_viewer.py b/tools/swo_viewer.py
new file mode 100644
index 0000000000..327c450023
--- /dev/null
+++ b/tools/swo_viewer.py
@@ -0,0 +1,67 @@
+"""This prints out all parsed ITM packets.
+
+Connect a USB to Serial converter to the SWO pin and then provide the serial
+device to this script. It should be 1MBaud SWO signal. CTRL-C when you've
+captured enough data and then it'll process and output.
+
+pip install pysigrok-libsigrokdecode
+python tools/swo_viewer.py /dev/ttyACM0
+"""
+
+import serial
+import sys
+import sigrokdecode
+import time
+import json
+
+decoder = sigrokdecode.get_decoder("arm_itm")()
+
+decoder.reset()
+decoder.options = {"objdump": "", "elffile": ""}
+decoder.start()
+
+dwt_timestamp = 0
+last_dwt_timestamp = 0
+streak = 0
+
+stack = []
+
+
+def decoder_cb(ss, es, data):
+    global streak
+    global last_dwt_timestamp
+    print(dwt_timestamp, ss, es, data)
+
+
+decoder.add_callback(sigrokdecode.OUTPUT_ANN, None, decoder_cb)
+
+s = serial.Serial(sys.argv[-2], 1000000)
+
+buffers = []
+while True:
+    try:
+        start_ts = time.monotonic_ns()
+        b = s.read(s.in_waiting)
+        if b:
+            end_ts = time.monotonic_ns()
+            buffers.append((start_ts, end_ts, b))
+            # print(len(b))
+            # if len(buffers) > 10:
+            #     break
+    except KeyboardInterrupt:
+        break
+
+time_per_bit = 1_000_000_000 / 1000000
+
+min_gap = 100000000
+total_bytes = 0
+for start_ts, end_ts, buf in buffers:
+    # print(total_bytes, start_ts, end_ts, buf)
+    ts_per_byte = (end_ts - start_ts) / len(buf)
+    for i, b in enumerate(buf):
+        # print(total_bytes, hex(b))
+        total_bytes += 1
+        decoder.decode(
+            start_ts + ts_per_byte * i, start_ts + ts_per_byte * (i + 1), ("DATA", None, (b,))
+        )
+        dwt_timestamp = decoder.dwt_timestamp

From 6a9d69d743ba9ffc9fb96de1fceb79a0b9cac0e8 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Mar 2023 16:03:42 -0400
Subject: [PATCH 2032/2403] add port-specific modules to support matrix

---
 docs/shared_bindings_matrix.py | 201 ++++++++++++++++++++-------------
 1 file changed, 123 insertions(+), 78 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 761e3e29f2..9705e33585 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -31,7 +31,17 @@ import functools
 
 from concurrent.futures import ThreadPoolExecutor
 
-SUPPORTED_PORTS = ['atmel-samd', 'broadcom', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
+SUPPORTED_PORTS = [
+    "atmel-samd",
+    "broadcom",
+    "cxd56",
+    "espressif",
+    "litex",
+    "mimxrt10xx",
+    "nrf",
+    "raspberrypi",
+    "stm",
+]
 
 ALIASES_BY_BOARD = {
     "circuitplayground_express": [
@@ -44,16 +54,11 @@ ALIASES_BY_BOARD = {
 }
 
 ALIASES_BRAND_NAMES = {
-    "circuitplayground_express_4h":
-        "Adafruit Circuit Playground Express 4-H",
-    "circuitplayground_express_digikey_pycon2019":
-        "Circuit Playground Express Digi-Key PyCon 2019",
-    "edgebadge":
-        "Adafruit EdgeBadge",
-    "pyportal_pynt":
-        "Adafruit PyPortal Pynt",
-    "gemma_m0_pycon2018":
-        "Adafruit Gemma M0 PyCon 2018",
+    "circuitplayground_express_4h": "Adafruit Circuit Playground Express 4-H",
+    "circuitplayground_express_digikey_pycon2019": "Circuit Playground Express Digi-Key PyCon 2019",
+    "edgebadge": "Adafruit EdgeBadge",
+    "pyportal_pynt": "Adafruit PyPortal Pynt",
+    "gemma_m0_pycon2018": "Adafruit Gemma M0 PyCon 2018",
 }
 
 ADDITIONAL_MODULES = {
@@ -72,7 +77,19 @@ ADDITIONAL_MODULES = {
     "usb": "CIRCUITPY_USB_HOST",
 }
 
-MODULES_NOT_IN_SHARED_BINDINGS = ["_asyncio", "array", "binascii", "builtins", "collections", "errno", "json", "re", "select", "sys", "ulab"]
+MODULES_NOT_IN_BINDINGS = [
+    "_asyncio",
+    "array",
+    "binascii",
+    "builtins",
+    "collections",
+    "errno",
+    "json",
+    "re",
+    "select",
+    "sys",
+    "ulab",
+]
 
 FROZEN_EXCLUDES = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
 """Files and dirs at the root of a frozen directory that should be ignored.
@@ -83,16 +100,23 @@ repository_urls = {}
 
 root_dir = pathlib.Path(__file__).resolve().parent.parent
 
+
 def get_circuitpython_root_dir():
-    """ The path to the root './circuitpython' directory.
-    """
+    """The path to the root './circuitpython' directory."""
     return root_dir
 
-def get_shared_bindings():
-    """ Get a list of modules in shared-bindings based on folder names.
-    """
-    shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
-    return [item.name for item in shared_bindings_dir.iterdir()] + MODULES_NOT_IN_SHARED_BINDINGS
+
+def get_bindings():
+    """Get a list of modules in shared-bindings and ports/*/bindings based on folder names."""
+    shared_bindings_modules = [
+        module.name
+        for module in (get_circuitpython_root_dir() / "shared-bindings").iterdir()
+        if module.is_dir()
+    ]
+    bindings_modules = []
+    for d in get_circuitpython_root_dir().glob("ports/*/bindings"):
+        bindings_modules.extend(module.name for module in d.iterdir() if d.is_dir())
+    return shared_bindings_modules + bindings_modules + MODULES_NOT_IN_BINDINGS
 
 
 def get_board_mapping():
@@ -124,8 +148,7 @@ def get_board_mapping():
 
 
 def read_mpconfig():
-    """ Open 'circuitpy_mpconfig.mk' and return the contents.
-    """
+    """Open 'circuitpy_mpconfig.mk' and return the contents."""
     configs = []
     cpy_mpcfg = get_circuitpython_root_dir() / "py" / "circuitpy_mpconfig.mk"
     with open(cpy_mpcfg) as mpconfig:
@@ -135,14 +158,14 @@ def read_mpconfig():
 
 
 def build_module_map():
-    """ Establish the base of the JSON file, based on the contents from
-        `configs`. Base will contain module names, if they're part of
-        the `FULL_BUILD`, or their default value (0, 1, or a list of
-        modules that determine default [see audiocore, audiomixer, etc.]).
+    """Establish the base of the JSON file, based on the contents from
+    `configs`. Base will contain module names, if they're part of
+    the `FULL_BUILD`, or their default value (0, 1, or a list of
+    modules that determine default [see audiocore, audiomixer, etc.]).
 
     """
     base = dict()
-    modules = get_shared_bindings()
+    modules = get_bindings()
     configs = read_mpconfig()
     full_build = False
     for module in modules:
@@ -150,7 +173,7 @@ def build_module_map():
         if module in ADDITIONAL_MODULES:
             search_identifier = ADDITIONAL_MODULES[module]
         else:
-            search_identifier = 'CIRCUITPY_'+module.lstrip("_").upper()
+            search_identifier = "CIRCUITPY_" + module.lstrip("_").upper()
         re_pattern = f"{re.escape(search_identifier)}\s*\??=\s*(.+)"
         find_config = re.findall(re_pattern, configs)
         if not find_config:
@@ -173,21 +196,22 @@ def build_module_map():
 
     return base
 
-def get_settings_from_makefile(port_dir, board_name):
-    """ Invoke make in a mode which prints the database, then parse it for
-        settings.
 
-        This means that the effect of all Makefile directives is taken
-        into account, without having to re-encode the logic that sets them
-        in this script, something that has proved error-prone
+def get_settings_from_makefile(port_dir, board_name):
+    """Invoke make in a mode which prints the database, then parse it for
+    settings.
+
+    This means that the effect of all Makefile directives is taken
+    into account, without having to re-encode the logic that sets them
+    in this script, something that has proved error-prone
     """
     contents = subprocess.run(
-            ["make", "-C", port_dir, f"BOARD={board_name}", "-qp", "print-CC"],
-            encoding="utf-8",
-            errors="replace",
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
-        )
+        ["make", "-C", port_dir, f"BOARD={board_name}", "-qp", "print-CC"],
+        encoding="utf-8",
+        errors="replace",
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
     # Make signals errors with exit status 2; 0 and 1 are "non-error" statuses
     if contents.returncode not in (0, 1):
         error_msg = (
@@ -197,22 +221,23 @@ def get_settings_from_makefile(port_dir, board_name):
         raise RuntimeError(error_msg)
 
     settings = {}
-    for line in contents.stdout.split('\n'):
+    for line in contents.stdout.split("\n"):
         # Handle both = and := definitions.
-        m = re.match(r'^([A-Z][A-Z0-9_]*) :?= (.*)$', line)
+        m = re.match(r"^([A-Z][A-Z0-9_]*) :?= (.*)$", line)
         if m:
             settings[m.group(1)] = m.group(2)
 
     return settings
 
+
 def get_repository_url(directory):
     if directory in repository_urls:
         return repository_urls[directory]
     readme = None
     for readme_path in (
-            os.path.join(directory, "README.rst"),
-            os.path.join(os.path.dirname(directory), "README.rst")
-        ):
+        os.path.join(directory, "README.rst"),
+        os.path.join(os.path.dirname(directory), "README.rst"),
+    ):
         if os.path.exists(readme_path):
             readme = readme_path
             break
@@ -220,7 +245,10 @@ def get_repository_url(directory):
     if readme:
         with open(readme, "r") as fp:
             for line in fp.readlines():
-                if m := re.match("\s+:target:\s+(http\S+(docs.circuitpython|readthedocs)\S+)\s*", line):
+                if m := re.match(
+                    "\s+:target:\s+(http\S+(docs.circuitpython|readthedocs)\S+)\s*",
+                    line,
+                ):
                     path = m.group(1)
                     break
                 if m := re.search("<(http[^>]+)>", line):
@@ -233,12 +261,13 @@ def get_repository_url(directory):
             errors="replace",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            cwd=directory
+            cwd=directory,
         )
         path = contents.stdout.strip()
     repository_urls[directory] = path
     return path
 
+
 def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
     Go through the list of frozen directories and extract the python modules.
@@ -261,34 +290,36 @@ def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
                 else:
                     frozen_modules.append(sub.name[:-3])
                 continue
-            if next(sub.glob("**/*.py"), None): # tests if not empty
+            if next(sub.glob("**/*.py"), None):  # tests if not empty
                 if withurl:
                     frozen_modules.append((sub.name, url_repository))
                 else:
                     frozen_modules.append(sub.name)
     return frozen_modules
 
-def lookup_setting(settings, key, default=''):
+
+def lookup_setting(settings, key, default=""):
     while True:
         value = settings.get(key, default)
-        if not value.startswith('$'):
+        if not value.startswith("$"):
             break
         key = value[2:-1]
     return value
 
+
 @functools.cache
 def all_ports_all_boards(ports=SUPPORTED_PORTS):
     for port in ports:
-
         port_dir = get_circuitpython_root_dir() / "ports" / port
         for entry in (port_dir / "boards").iterdir():
             if not entry.is_dir():
                 continue
             yield (port, entry)
 
+
 def support_matrix_by_board(use_branded_name=True, withurl=True):
-    """ Compiles a list of the available core modules available for each
-        board.
+    """Compiles a list of the available core modules available for each
+    board.
     """
     base = build_module_map()
 
@@ -300,8 +331,9 @@ def support_matrix_by_board(use_branded_name=True, withurl=True):
         if use_branded_name:
             with open(entry / "mpconfigboard.h") as get_name:
                 board_contents = get_name.read()
-            board_name_re = re.search(r"(?<=MICROPY_HW_BOARD_NAME)\s+(.+)",
-                                      board_contents)
+            board_name_re = re.search(
+                r"(?<=MICROPY_HW_BOARD_NAME)\s+(.+)", board_contents
+            )
             if board_name_re:
                 board_name = board_name_re.group(1).strip('"')
         else:
@@ -309,56 +341,69 @@ def support_matrix_by_board(use_branded_name=True, withurl=True):
 
         board_modules = []
         for module in base:
-            key = base[module]['key']
-            if int(lookup_setting(settings, key, '0')):
-                board_modules.append(base[module]['name'])
+            key = base[module]["key"]
+            if int(lookup_setting(settings, key, "0")):
+                board_modules.append(base[module]["name"])
         board_modules.sort()
 
         if "CIRCUITPY_BUILD_EXTENSIONS" in settings:
             board_extensions = [
-                extension.strip() for extension in
-                settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
+                extension.strip()
+                for extension in settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
             ]
         else:
             raise OSError(f"Board extensions undefined: {board_name}.")
 
         frozen_modules = []
         if "FROZEN_MPY_DIRS" in settings:
-            frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"], withurl)
+            frozen_modules = frozen_modules_from_dirs(
+                settings["FROZEN_MPY_DIRS"], withurl
+            )
             if frozen_modules:
                 frozen_modules.sort()
 
         # generate alias boards too
-        board_matrix = [(
-            board_name, {
-                "modules": board_modules,
-                "frozen_libraries": frozen_modules,
-                "extensions": board_extensions,
-            }
-        )]
+        board_matrix = [
+            (
+                board_name,
+                {
+                    "modules": board_modules,
+                    "frozen_libraries": frozen_modules,
+                    "extensions": board_extensions,
+                },
+            )
+        ]
         if entry.name in ALIASES_BY_BOARD:
             for alias in ALIASES_BY_BOARD[entry.name]:
                 if use_branded_name:
                     if alias in ALIASES_BRAND_NAMES:
                         alias = ALIASES_BRAND_NAMES[alias]
                     else:
-                        alias = alias.replace("_"," ").title()
-                board_matrix.append((
-                    alias, {
-                        "modules": board_modules,
-                        "frozen_libraries": frozen_modules,
-                        "extensions": board_extensions,
-                    },
-                ))
+                        alias = alias.replace("_", " ").title()
+                board_matrix.append(
+                    (
+                        alias,
+                        {
+                            "modules": board_modules,
+                            "frozen_libraries": frozen_modules,
+                            "extensions": board_extensions,
+                        },
+                    )
+                )
 
-        return board_matrix # this is now a list of (board,modules)
+        return board_matrix  # this is now a list of (board,modules)
 
     executor = ThreadPoolExecutor(max_workers=os.cpu_count())
     mapped_exec = executor.map(support_matrix, all_ports_all_boards())
     # flatmap with comprehensions
-    boards = dict(sorted([board for matrix in mapped_exec for board in matrix], key=lambda x: x[0]))
+    boards = dict(
+        sorted(
+            [board for matrix in mapped_exec for board in matrix], key=lambda x: x[0]
+        )
+    )
 
     return boards
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     print(json.dumps(support_matrix_by_board(), indent=2))

From 408406c84fb51c01fa9b2055d44ddcefad00ab60 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 14 Mar 2023 18:09:18 -0500
Subject: [PATCH 2033/2403] starting diskinfo api

---
 supervisor/shared/web_workflow/web_workflow.c | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 97530b970b..8b3250a0ec 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -828,6 +828,46 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _send_chunk(socket, "");
 }
 
+static void _reply_with_diskinfo_json(socketpool_socket_obj_t *socket, _request *request) {
+    _send_str(socket, OK_JSON);
+    _cors_header(socket, request);
+    _send_str(socket, "\r\n");
+    mp_print_t _socket_print = {socket, _print_chunk};
+
+    const char *hostname = "";
+    #if CIRCUITPY_MDNS
+    if (!common_hal_mdns_server_deinited(&mdns)) {
+        hostname = common_hal_mdns_server_get_hostname(&mdns);
+    }
+    #endif
+    _update_encoded_ip();
+    // Note: this leverages the fact that C concats consecutive string literals together.
+    mp_printf(&_socket_print,
+        "{\"web_api_version\": 1, "
+        "\"version\": \"" MICROPY_GIT_TAG "\", "
+        "\"build_date\": \"" MICROPY_BUILD_DATE "\", "
+        "\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "
+        "\"mcu_name\": \"" MICROPY_HW_MCU_NAME "\", "
+        "\"board_id\": \"" CIRCUITPY_BOARD_ID "\", "
+        "\"creator_id\": %u, "
+        "\"creation_id\": %u, "
+        "\"hostname\": \"%s\", "
+        "\"port\": %d, ", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
+    #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
+    uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
+    common_hal_mcu_processor_get_uid(raw_id);
+    mp_printf(&_socket_print, "\"UID\": \"");
+    for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
+        mp_printf(&_socket_print, "%02X", raw_id[i]);
+    }
+    mp_printf(&_socket_print, "\", ");
+    #endif
+    mp_printf(&_socket_print, "\"ip\": \"%s\"}", _our_ip_encoded);
+    // Empty chunk signals the end of the response.
+    _send_chunk(socket, "");
+}
+
+
 // FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution.
 // This function truncates the time the time to a resolution storable by FATFS and fills in the
 // FATFS encoded version into fattime.
@@ -1228,6 +1268,8 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
             _reply_with_devices_json(socket, request);
         } else if (strcmp(path, "/version.json") == 0) {
             _reply_with_version_json(socket, request);
+        } else if (strcmp(path, "/diskinfo.json") == 0) {
+            _reply_with_diskinfo_json(socket, request);
         } else if (strcmp(path, "/serial/") == 0) {
             if (!request->authenticated) {
                 if (_api_password[0] != '\0') {

From f2931dec7aed790e26c8ce1136e097cce0fff7c6 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 14 Mar 2023 18:26:23 -0500
Subject: [PATCH 2034/2403] empty RUN_BACKGROUND_TASKS for unix port

---
 ports/unix/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c94845229c..237b99bfe8 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -194,6 +194,8 @@
 
 extern const struct _mp_print_t mp_stderr_print;
 
+#define RUN_BACKGROUND_TASKS
+
 #if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
 // Fall back to setjmp() implementation for discovery of GC pointers in registers.
 #define MICROPY_GCREGS_SETJMP (1)

From 069a058a83ebb9fbf35bbe3c76691564a830f3ad Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Mar 2023 22:37:56 -0400
Subject: [PATCH 2035/2403] update build_board_info.py per Neradoc

---
 tools/build_board_info.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 5209337b95..01d935ac46 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -6,6 +6,7 @@
 
 import json
 import os
+import requests
 import subprocess
 import sys
 import sh
@@ -96,7 +97,19 @@ def get_current_info():
     response = response.json()
 
     git_info = commit_sha, response["sha"]
-    current_list = json.loads(base64.b64decode(response["content"]).decode("utf-8"))
+
+    if response["content"] != "":
+        # if the file is there
+        current_list = json.loads(base64.b64decode(response["content"]).decode("utf-8"))
+    else:
+        # if too big, the file is not included
+        download_url = response["download_url"]
+        response = requests.get(download_url)
+        if not response.ok:
+            print(response.text)
+            raise RuntimeError("cannot get previous files.json")
+        current_list = response.json()
+
     current_info = {}
     for info in current_list:
         current_info[info["id"]] = info

From 60e7df1b0ebaed428871d99077952a4bd4518433 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 14 Mar 2023 22:37:56 -0400
Subject: [PATCH 2036/2403] update build_board_info.py per Neradoc

---
 tools/build_board_info.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 5209337b95..01d935ac46 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -6,6 +6,7 @@
 
 import json
 import os
+import requests
 import subprocess
 import sys
 import sh
@@ -96,7 +97,19 @@ def get_current_info():
     response = response.json()
 
     git_info = commit_sha, response["sha"]
-    current_list = json.loads(base64.b64decode(response["content"]).decode("utf-8"))
+
+    if response["content"] != "":
+        # if the file is there
+        current_list = json.loads(base64.b64decode(response["content"]).decode("utf-8"))
+    else:
+        # if too big, the file is not included
+        download_url = response["download_url"]
+        response = requests.get(download_url)
+        if not response.ok:
+            print(response.text)
+            raise RuntimeError("cannot get previous files.json")
+        current_list = response.json()
+
     current_info = {}
     for info in current_list:
         current_info[info["id"]] = info

From 6062e75b0885743fb9f03c4781b8667fde82a2a9 Mon Sep 17 00:00:00 2001
From: Kyle Brown 
Date: Sat, 19 Nov 2022 12:11:13 -0800
Subject: [PATCH 2037/2403] add Blok

---
 .../boards/boardsource_blok/board.c           | 45 +++++++++++++++++
 .../boards/boardsource_blok/mpconfigboard.h   |  4 ++
 .../boards/boardsource_blok/mpconfigboard.mk  | 14 ++++++
 .../boardsource_blok/pico-sdk-configboard.h   |  4 ++
 .../boards/boardsource_blok/pins.c            | 50 +++++++++++++++++++
 5 files changed, 117 insertions(+)
 create mode 100644 ports/raspberrypi/boards/boardsource_blok/board.c
 create mode 100644 ports/raspberrypi/boards/boardsource_blok/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/boardsource_blok/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/boardsource_blok/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/boardsource_blok/pins.c

diff --git a/ports/raspberrypi/boards/boardsource_blok/board.c b/ports/raspberrypi/boards/boardsource_blok/board.c
new file mode 100644
index 0000000000..55540c965a
--- /dev/null
+++ b/ports/raspberrypi/boards/boardsource_blok/board.c
@@ -0,0 +1,45 @@
+/*
+ * 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 "supervisor/board.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "supervisor/shared/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+    // turn off any left over LED
+    // board_reset_user_neopixels(&pin_GPIO29, 62);
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.h b/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.h
new file mode 100644
index 0000000000..0ac77bf54e
--- /dev/null
+++ b/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME "BLOK"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO29)
diff --git a/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.mk b/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.mk
new file mode 100644
index 0000000000..aba2838864
--- /dev/null
+++ b/ports/raspberrypi/boards/boardsource_blok/mpconfigboard.mk
@@ -0,0 +1,14 @@
+USB_VID = 0x2E8A
+USB_PID = 0x104A
+USB_PRODUCT = "BLOK"
+USB_MANUFACTURER = "Boardsource"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+
+
+# CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/boardsource_blok/pico-sdk-configboard.h b/ports/raspberrypi/boards/boardsource_blok/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/boardsource_blok/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/boardsource_blok/pins.c b/ports/raspberrypi/boards/boardsource_blok/pins.c
new file mode 100644
index 0000000000..e3b0ba0169
--- /dev/null
+++ b/ports/raspberrypi/boards/boardsource_blok/pins.c
@@ -0,0 +1,50 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0)},
+    {MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1)},
+    {MP_ROM_QSTR(MP_QSTR_GP02), MP_ROM_PTR(&pin_GPIO2)},
+    {MP_ROM_QSTR(MP_QSTR_GP03), MP_ROM_PTR(&pin_GPIO3)},
+    {MP_ROM_QSTR(MP_QSTR_GP04), MP_ROM_PTR(&pin_GPIO4)},
+    {MP_ROM_QSTR(MP_QSTR_GP05), MP_ROM_PTR(&pin_GPIO5)},
+    {MP_ROM_QSTR(MP_QSTR_GP06), MP_ROM_PTR(&pin_GPIO6)},
+    {MP_ROM_QSTR(MP_QSTR_GP07), MP_ROM_PTR(&pin_GPIO7)},
+    {MP_ROM_QSTR(MP_QSTR_GP08), MP_ROM_PTR(&pin_GPIO8)},
+    {MP_ROM_QSTR(MP_QSTR_GP09), MP_ROM_PTR(&pin_GPIO9)},
+    {MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10)},
+    {MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11)},
+    {MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12)},
+    {MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13)},
+    {MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14)},
+    {MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15)},
+    {MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17)},
+    {MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18)},
+    {MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20)},
+
+    {MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21)},
+    {MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22)},
+    {MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23)},
+    {MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24)},
+
+    {MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24)},
+    {MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25)},
+    {MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO25)},
+    {MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27)},
+    {MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28)},
+    {MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29)},
+    {MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16)},
+    {MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO17)},
+
+    {MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO26)},
+    {MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO28)},
+    {MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO27)},
+
+    {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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 4f1627f68e3b931147f94fdbd26b62237f20f683 Mon Sep 17 00:00:00 2001
From: kreasteve 
Date: Thu, 16 Mar 2023 10:56:22 +0100
Subject: [PATCH 2038/2403] bugfix

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index ada9f46020..bbf076ba68 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -341,7 +341,10 @@ STATIC mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(instruction_obj, &bufinfo, MP_BUFFER_READ);
 
-    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, bufinfo.len);
+    if (bufinfo.len % 2 != 0) {
+        mp_raise_ValueError(translate("Program size invalid"));
+    }
+    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, (size_t)bufinfo.len / 2);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_run_obj, rp2pio_statemachine_run);

From d7fb21ec7607fbeeaff4391125cb00f87ffbe148 Mon Sep 17 00:00:00 2001
From: kreasteve 
Date: Thu, 16 Mar 2023 11:02:41 +0100
Subject: [PATCH 2039/2403] Revert "bugfix"

This reverts commit 4f1627f68e3b931147f94fdbd26b62237f20f683.
---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index bbf076ba68..ada9f46020 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -341,10 +341,7 @@ STATIC mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(instruction_obj, &bufinfo, MP_BUFFER_READ);
 
-    if (bufinfo.len % 2 != 0) {
-        mp_raise_ValueError(translate("Program size invalid"));
-    }
-    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, (size_t)bufinfo.len / 2);
+    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, bufinfo.len);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_run_obj, rp2pio_statemachine_run);

From 208c081c95e70ebbccfd9f9eb2f4b0e1bd9b0eef Mon Sep 17 00:00:00 2001
From: kreasteve 
Date: Thu, 16 Mar 2023 11:10:57 +0100
Subject: [PATCH 2040/2403] bugfix_#7706

---
 ports/raspberrypi/bindings/rp2pio/StateMachine.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
index ada9f46020..bbf076ba68 100644
--- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -341,7 +341,10 @@ STATIC mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(instruction_obj, &bufinfo, MP_BUFFER_READ);
 
-    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, bufinfo.len);
+    if (bufinfo.len % 2 != 0) {
+        mp_raise_ValueError(translate("Program size invalid"));
+    }
+    common_hal_rp2pio_statemachine_run(self, bufinfo.buf, (size_t)bufinfo.len / 2);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_run_obj, rp2pio_statemachine_run);

From eab8633a9ef77aae21c3c1af28f1d3b14a1adc1d Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Thu, 16 Mar 2023 16:41:49 -0500
Subject: [PATCH 2041/2403] Updated Fig Pi Pins and Added Memory Option

Updated the Fig Pi pin definition to match latest production and fix errors.  Added an optional memory chip for parts shortage issues.
---
 .../boards/bwshockley_figpi/mpconfigboard.h        |  1 -
 .../boards/bwshockley_figpi/mpconfigboard.mk       |  2 +-
 ports/raspberrypi/boards/bwshockley_figpi/pins.c   | 14 ++++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
index fbd03379dd..88847a21bc 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.h
@@ -2,7 +2,6 @@
 #define MICROPY_HW_MCU_NAME "rp2040"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO13)
-#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO1)
 
 #define CIRCUITPY_BOARD_I2C         (2)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO17, .sda = &pin_GPIO16}, \
diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
index 95bd9715d6..789816cd70 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "Benjamin Shockley"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
\ No newline at end of file
diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pins.c b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
index 1bec6fd91b..1a68e8ec80 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/pins.c
+++ b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
@@ -40,23 +40,25 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO23) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO00) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO1) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO00) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO20) },
 
     { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_I2C0), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C0), 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_STEMMA_I2C), MP_ROM_PTR(&board_stemma_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C1), MP_ROM_PTR(&board_stemma_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_I2C1), MP_ROM_PTR(&board_stemma_i2c_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From d59a57ecc935c805f20618b12e461b8a4e268a5b Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Thu, 16 Mar 2023 16:54:38 -0500
Subject: [PATCH 2042/2403] Update pins.c

Changed GIO00 to GIO0
---
 ports/raspberrypi/boards/bwshockley_figpi/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pins.c b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
index 1a68e8ec80..f178e533fb 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/pins.c
+++ b/ports/raspberrypi/boards/bwshockley_figpi/pins.c
@@ -40,11 +40,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO23) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO22) },
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO00) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO5) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO00) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO0) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO20) },
 

From f35af4c9ce86885f89cae31029684340c82b6e91 Mon Sep 17 00:00:00 2001
From: Benjamin Shockley 
Date: Thu, 16 Mar 2023 16:54:55 -0500
Subject: [PATCH 2043/2403] Update mpconfigboard.mk

Added trailing line
---
 ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
index 789816cd70..06c9f2e958 100644
--- a/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/bwshockley_figpi/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "Benjamin Shockley"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
\ No newline at end of file
+EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

From 058a8e65d841d0bfab9466dd50b84d6849c786c4 Mon Sep 17 00:00:00 2001
From: Carlin Kartchner 
Date: Thu, 16 Mar 2023 18:22:24 -0400
Subject: [PATCH 2044/2403] define frame delay before reference

---
 shared-bindings/gifio/OnDiskGif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 7fb3fcf2bd..ca77459ac8 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -52,7 +52,7 @@
 //|       odg = gifio.OnDiskGif('/sample.gif')
 //|
 //|       start = time.monotonic()
-//|       odg.next_frame() # Load the first frame
+//|       next_delay = odg.next_frame() # Load the first frame
 //|       end = time.monotonic()
 //|       overhead = end - start
 //|

From 6ff58fd94af5cf0aa03bae5c1d021b892d4df2d4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 17 Mar 2023 09:37:15 -0500
Subject: [PATCH 2045/2403] re-enable mkfs for >4GB filesystems whenver
 FULL_BUILD

---
 py/circuitpy_mpconfig.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index a514b6a160..641da7814f 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -255,6 +255,10 @@ typedef long mp_off_t;
 #define MICROPY_FATFS_EXFAT           (CIRCUITPY_FULL_BUILD)
 #endif
 
+#ifndef MICROPY_FF_MKFS_FAT32
+#define MICROPY_FF_MKFS_FAT32           (CIRCUITPY_FULL_BUILD)
+#endif
+
 // LONGINT_IMPL_xxx are defined in the Makefile.
 //
 #ifdef LONGINT_IMPL_NONE

From 5569f101a7ed92ca7242e0d3e86b22442b939dc6 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 17 Mar 2023 10:50:07 -0400
Subject: [PATCH 2046/2403] Document that storage.VfsFat.mkfs() is a
 @staticmethod

---
 shared-bindings/storage/__init__.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 8e2eee6511..5e8f32f17e 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -266,6 +266,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     This property cannot be changed, use `storage.remount` instead."""
 //|     ...
 //|
+//|     @staticmethod
 //|     def mkfs(self) -> None:
 //|         """Format the block device, deleting any data that may have been there"""
 //|         ...

From ca292f342795ee36de7263f1024bee166a1415d3 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 17 Mar 2023 12:18:24 -0400
Subject: [PATCH 2047/2403] Turn off mkfs FAT32 on all SAMD21 builds; note in
 doc

---
 ports/atmel-samd/mpconfigport.h    | 4 +++-
 shared-bindings/storage/__init__.c | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 9d4ddd7134..887748c7a0 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -60,7 +60,9 @@
     X(EISDIR) \
     X(EINVAL) \
 
-#define MICROPY_FATFS_EXFAT 0
+#define MICROPY_FATFS_EXFAT    (0)
+// FAT32 mkfs takes about 500 bytes.
+#define MICROPY_FF_MKFS_FAT32 (0)
 
 // Only support simpler HID descriptors on SAMD21.
 #define CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR (1)
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 5e8f32f17e..9e82654bc9 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -268,7 +268,13 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|
 //|     @staticmethod
 //|     def mkfs(self) -> None:
-//|         """Format the block device, deleting any data that may have been there"""
+//|         """Format the block device, deleting any data that may have been there.
+//|
+//|         **Limitations**: On SAMD21 builds, `mkfs()` will raise ``OSError(22)`` when
+//|         attempting to format filesystems larger than 4GB. The extra code to format larger
+//|         filesystems will not fit on these builds. You can still access
+//|         larger filesystems, but you will need to format the filesystem on another device.
+//|         """
 //|         ...
 //|     def open(self, path: str, mode: str) -> None:
 //|         """Like builtin ``open()``"""

From f1b7612b5a362d8251dc02180fe667b40a2fd178 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 18 Mar 2023 00:58:43 +0100
Subject: [PATCH 2048/2403] Add Lilygo T-Watch 2020 V3 (ESP32) - DISPLAY is in,
 brightness is ok - default busses and pin names - enabled PSRAM

---
 .../boards/lilygo_twatch_2020_v3/board.c      | 161 ++++++++++++++++++
 .../lilygo_twatch_2020_v3/mpconfigboard.h     |  44 +++++
 .../lilygo_twatch_2020_v3/mpconfigboard.mk    |   8 +
 .../boards/lilygo_twatch_2020_v3/pins.c       |  54 ++++++
 .../boards/lilygo_twatch_2020_v3/sdkconfig    |  31 ++++
 5 files changed, 298 insertions(+)
 create mode 100644 ports/espressif/boards/lilygo_twatch_2020_v3/board.c
 create mode 100644 ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lilygo_twatch_2020_v3/pins.c
 create mode 100644 ports/espressif/boards/lilygo_twatch_2020_v3/sdkconfig

diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/board.c b/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
new file mode 100644
index 0000000000..6a60ada6b0
--- /dev/null
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+
+#define DELAY 0x80
+
+// display init sequence for ST7789 (works in python)
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 0x96,
+    // sleep out
+    0x11, 0 | DELAY, 0xFF,
+    0x3A, 1 | DELAY,  0x55, 10,
+    0x36, 1, 0x08,
+    0x21, 0 | DELAY, 10,
+    0x13, 0 | DELAY, 10,
+    0x36, 1, 0xC0,
+    // display on
+    0x29, 0 | DELAY, 255,
+};
+
+static void display_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO18,    // CLK
+        &pin_GPIO19,    // MOSI
+        NULL,           // MISO not connected
+        false           // Not half-duplex
+        );
+
+    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_GPIO27,    // DC
+        &pin_GPIO5,     // CS
+        NULL,           // RST
+        24000000,       // 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,
+        240,            // width (after rotation)
+        240,            // height (after rotation)
+        0,              // column start
+        80,             // row start
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO15,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        5000           // backlight pwm frequency
+        );
+}
+
+/*
+#define APX202_ADDRESS (0x35)
+#define AXP202_LDO2 (2)
+#define AXP202_ON  (1)
+#define AXP202_OFF (0)
+#define AXP202_DCDC3 (1)
+#define AXP202_IC_TYPE (0x03)
+#define AXP202_LDO234_DC23_CTL (0x12)
+#define AXP_PASS (1)
+#define AXP_FAIL (-1)
+#define AXP202_CHIP_ID (0x41)
+#define AXP192_CHIP_ID (0x03)
+#define FORCED_OPEN_DCDC3(x) (x |= (AXP202_ON << AXP202_DCDC3))
+
+static void backlight_init(void) {
+    // Turn LDO2 on for display
+    busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);
+    uint8_t data = 0;
+    uint8_t outputReg = 0;
+    uint8_t read = 0;
+    // lock
+    // _readByte(AXP202_LDO234_DC23_CTL, 1, &outputReg)
+    // time.sleep(0.001)
+    // _readByte(AXP202_LDO234_DC23_CTL, 1, &data)
+    // time.sleep(0.001)
+    // data |= 1 << AXP202_LDO2
+    // FORCED_OPEN_DCDC3(data)
+    // _writeByte(AXP202_LDO234_DC23_CTL, 1, &data)
+    // time.sleep(0.001)
+    // unlock
+}
+*/
+
+void board_init(void) {
+    // Display
+    display_init();
+    // backlight_init();
+}
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    if (pin_number == MOTOR_PIN) {
+        // no motor
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, false);
+        return true;
+    }
+    return false;
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.h b/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.h
new file mode 100644
index 0000000000..bf65b394f7
--- /dev/null
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Lilygo T-watch 2020 V3"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MOTOR_PIN (4)
+#define MICROPY_HW_LED_STATUS (&pin_GPIO4)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}, \
+                                     {.scl = &pin_GPIO32, .sda = &pin_GPIO23}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO19, .miso = NULL}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.mk b/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.mk
new file mode 100644
index 0000000000..9d6c8dc25b
--- /dev/null
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0xC3C30000
+CIRCUITPY_CREATION_ID = 0x00320001
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c b/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c
new file mode 100644
index 0000000000..8dd20b1a69
--- /dev/null
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c
@@ -0,0 +1,54 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(touch_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // buzz buzz
+    { MP_ROM_QSTR(MP_QSTR_VIBRATE), MP_ROM_PTR(&pin_GPIO4) },
+
+    // I2S out
+    { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_OUT), MP_ROM_PTR(&pin_GPIO33) },
+
+    // PDM in
+    { MP_ROM_QSTR(MP_QSTR_PDM_CLK), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_PDM_DATA), MP_ROM_PTR(&pin_GPIO2) },
+
+    // IR send
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    // main I2C port, for the AXP202, and 2 others
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+
+    // interrupt pins for sensors
+    { MP_ROM_QSTR(MP_QSTR_BMA423_INT), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_PCF8563_INT), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_AXP202_INT), MP_ROM_PTR(&pin_GPIO35) },
+
+    // I2C port for the FT6336 touch sensor
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_SCL), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_SDA), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_RST), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_I2C), MP_ROM_PTR(&board_touch_i2c_obj) },
+
+    // LCD display
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_BRIGHTNESS), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_LCD_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_module_globals_table);
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/sdkconfig b/ports/espressif/boards/lilygo_twatch_2020_v3/sdkconfig
new file mode 100644
index 0000000000..89647ab5a1
--- /dev/null
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/sdkconfig
@@ -0,0 +1,31 @@
+# SPI RAM config
+#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+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
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+
+# Uncomment (remove ###) to send ESP_LOG  output to TX/RX pins
+#
+# ESP System Settings
+#
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_TX_GPIO=1
+CONFIG_ESP_CONSOLE_UART_RX_GPIO=3
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+# end of ESP System Settings

From a1506df805b127d715f275248d1b82457553a388 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 17 Mar 2023 21:36:13 -0500
Subject: [PATCH 2049/2403] implement real diskinfo functionality

---
 supervisor/shared/web_workflow/web_workflow.c | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 8b3250a0ec..c006a9e7cb 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -49,6 +49,7 @@
 
 #include "shared-bindings/hashlib/__init__.h"
 #include "shared-bindings/hashlib/Hash.h"
+#include "lib/oofatfs/diskio.h"
 
 #if CIRCUITPY_MDNS
 #include "shared-bindings/mdns/RemoteService.h"
@@ -834,35 +835,21 @@ static void _reply_with_diskinfo_json(socketpool_socket_obj_t *socket, _request
     _send_str(socket, "\r\n");
     mp_print_t _socket_print = {socket, _print_chunk};
 
-    const char *hostname = "";
-    #if CIRCUITPY_MDNS
-    if (!common_hal_mdns_server_deinited(&mdns)) {
-        hostname = common_hal_mdns_server_get_hostname(&mdns);
+    DWORD free_clusters;
+    FATFS *fs = filesystem_circuitpy();
+    FRESULT blk_result = f_getfree(fs, &free_clusters);
+    uint16_t block_size;
+    if (blk_result == FR_OK) {
+        disk_ioctl(fs, GET_SECTOR_SIZE, &block_size);
     }
-    #endif
-    _update_encoded_ip();
-    // Note: this leverages the fact that C concats consecutive string literals together.
+
+    uint16_t total_size = fs->n_fatent - 2;
+
     mp_printf(&_socket_print,
-        "{\"web_api_version\": 1, "
-        "\"version\": \"" MICROPY_GIT_TAG "\", "
-        "\"build_date\": \"" MICROPY_BUILD_DATE "\", "
-        "\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "
-        "\"mcu_name\": \"" MICROPY_HW_MCU_NAME "\", "
-        "\"board_id\": \"" CIRCUITPY_BOARD_ID "\", "
-        "\"creator_id\": %u, "
-        "\"creation_id\": %u, "
-        "\"hostname\": \"%s\", "
-        "\"port\": %d, ", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
-    #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
-    uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
-    common_hal_mcu_processor_get_uid(raw_id);
-    mp_printf(&_socket_print, "\"UID\": \"");
-    for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
-        mp_printf(&_socket_print, "%02X", raw_id[i]);
-    }
-    mp_printf(&_socket_print, "\", ");
-    #endif
-    mp_printf(&_socket_print, "\"ip\": \"%s\"}", _our_ip_encoded);
+        "{\"free\": %d, "
+        "\"block_size\": %d, "
+        "\"total\": %d}", free_clusters * block_size, block_size, total_size * block_size);
+
     // Empty chunk signals the end of the response.
     _send_chunk(socket, "");
 }

From e7c349ea43d22e1fbc3efb2fa14827087b464ad1 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sat, 18 Mar 2023 15:27:59 +0100
Subject: [PATCH 2050/2403] Add Lilygo TTGO T-display ESP32 board

---
 .../lilygo_ttgo_tdisplay_esp32_16m/board.c    | 114 ++++++++++++++++++
 .../mpconfigboard.h                           |  34 ++++++
 .../mpconfigboard.mk                          |  10 ++
 .../lilygo_ttgo_tdisplay_esp32_16m/pins.c     |  41 +++++++
 .../lilygo_ttgo_tdisplay_esp32_16m/sdkconfig  |   5 +
 5 files changed, 204 insertions(+)
 create mode 100644 ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
 create mode 100644 ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c
 create mode 100644 ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/sdkconfig

diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
new file mode 100644
index 0000000000..630de0b63f
--- /dev/null
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
@@ -0,0 +1,114 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+
+#define DELAY 0x80
+
+// display init sequence according to LilyGO example app
+uint8_t display_init_sequence[] = {
+    0x01, DELAY, 0x96,  // _SWRESET and Delay 150ms
+    0x11, DELAY, 0xFF,  // _SLPOUT and Delay 500ms
+    0x3A, DELAY | 1, 0x55, 0x0A,  // _COLMOD and Delay 10ms
+    0x36, 0x01, 0x08,  // _MADCTL
+    0x21, DELAY, 0x0A,  // _INVON Hack and Delay 10ms
+    0x13, DELAY, 0x0A,  // _NORON and Delay 10ms
+    0x36, 0x01, 0xC0,  // _MADCTL
+    0x29, DELAY, 0xFF,  // _DISPON and Delay 500ms
+};
+
+static void display_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO18,    // CLK
+        &pin_GPIO19,    // MOSI
+        NULL,           // MISO not connected
+        false);         // Not half-duplex
+
+    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_GPIO16,    // DC
+        &pin_GPIO5,     // CS
+        &pin_GPIO23,    // RST
+        24000000,       // baudrate (default from the driver)
+        // 40000000,
+        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,
+        240,            // width (after rotation)
+        135,            // height (after rotation)
+        53,             // column start
+        40,             // row start
+        270,             // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO4,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+}
+
+void board_init(void) {
+    // Display
+    display_init();
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.h
new file mode 100644
index 0000000000..39febafb6a
--- /dev/null
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.h
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "LILYGO TTGO T-DISPLAY v1.1"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
new file mode 100644
index 0000000000..dd177ec1c9
--- /dev/null
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0xC3C30000
+CIRCUITPY_CREATION_ID = 0x00320002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c
new file mode 100644
index 0000000000..5a72b0f416
--- /dev/null
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c
@@ -0,0 +1,41 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+
+    // 1.14 inch LCD ST7789
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_BCKL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D_C), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
+
+    // Battery Sense
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO34) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/sdkconfig b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/sdkconfig
new file mode 100644
index 0000000000..55052e98ca
--- /dev/null
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/sdkconfig
@@ -0,0 +1,5 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="TTGO-TDISPLAY"
+# end of LWIP

From d9fee4c354fdebc5470f378cae799adb7a97efac Mon Sep 17 00:00:00 2001
From: hathach 
Date: Sat, 18 Mar 2023 21:28:45 +0700
Subject: [PATCH 2051/2403] add codespell

---
 .codespell/exclude-file.txt |  0
 .codespell/ignore-words.txt |  4 ++++
 .codespellrc                | 10 ++++++++++
 .pre-commit-config.yaml     |  6 ++++++
 4 files changed, 20 insertions(+)
 create mode 100644 .codespell/exclude-file.txt
 create mode 100644 .codespell/ignore-words.txt
 create mode 100644 .codespellrc

diff --git a/.codespell/exclude-file.txt b/.codespell/exclude-file.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
new file mode 100644
index 0000000000..84171bfd52
--- /dev/null
+++ b/.codespell/ignore-words.txt
@@ -0,0 +1,4 @@
+ans
+ure
+clen
+ser
diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 0000000000..dd495c65bd
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,10 @@
+# See: https://github.com/codespell-project/codespell#using-a-config-file
+[codespell]
+# In the event of a false positive, add the problematic word, in all lowercase, to 'ignore-words.txt' (one word per line).
+# Or copy & paste the whole problematic line to 'exclude-file.txt'
+ignore-words = .codespell/ignore-words.txt
+exclude-file = .codespell/exclude-file.txt
+check-filenames =
+check-hidden =
+count =
+skip = .cproject,.git,./lib,./locale
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1905b233cf..c1a3a61387 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,6 +11,12 @@ repos:
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+    -   id: codespell
+        #args: [-w]
+        exclude: ^locale/
 -   repo: local
     hooks:
     -   id: translations

From fecc1bdedbfff71448474c654ff543c1dbc52560 Mon Sep 17 00:00:00 2001
From: hathach 
Date: Sat, 18 Mar 2023 22:17:02 +0700
Subject: [PATCH 2052/2403] fix typos (partial) detected by codepell

---
 .codespell/ignore-words.txt                   | 13 +++++
 .codespellrc                                  |  2 +-
 .pre-commit-config.yaml                       |  2 +-
 devices/ble_hci/common-hal/_bleio/Adapter.c   |  2 +-
 devices/ble_hci/common-hal/_bleio/Adapter.h   |  2 +-
 .../ble_hci/common-hal/_bleio/Connection.c    |  2 +-
 devices/ble_hci/common-hal/_bleio/att.c       |  4 +-
 .../_bleio/hci_include/att_internal.h         |  4 +-
 docs/library/collections.rst                  |  4 +-
 examples/natmod/features1/features1.c         |  2 +-
 lib/cmsis/inc/core_armv81mml.h                |  4 +-
 lib/cmsis/inc/core_sc300.h                    |  2 +-
 lib/cmsis/inc/mpu_armv8.h                     |  2 +-
 lib/libm_dbl/__rem_pio2_large.c               |  6 +--
 lib/libm_dbl/fmod.c                           |  2 +-
 lib/libm_dbl/sqrt.c                           |  2 +-
 lib/littlefs/lfs1.h                           | 12 ++---
 lib/littlefs/lfs2.c                           |  6 +--
 lib/littlefs/lfs2.h                           | 14 +++---
 lib/oofatfs/diskio.h                          |  4 +-
 lib/oofatfs/ff.c                              | 48 +++++++++----------
 lib/oofatfs/ff.h                              |  2 +-
 lib/oofatfs/ffconf.h                          |  6 +--
 lib/oofatfs/ffunicode.c                       |  2 +-
 lib/sdmmc/sdmmc_io.c                          |  2 +-
 lib/uzlib/tinflate.c                          |  2 +-
 locale/circuitpython.pot                      | 31 ++++++------
 .../asf4_conf/samd21/hpl_tc_config.h          |  2 +-
 .../asf4_conf/samd51/hpl_tc_config.h          |  2 +-
 .../asf4_conf/same51/hpl_tc_config.h          |  2 +-
 .../asf4_conf/same54/hpl_tc_config.h          |  2 +-
 .../boards/hallowing_m0_express/board.c       |  2 +-
 ports/atmel-samd/boards/pybadge/board.c       |  2 +-
 ports/atmel-samd/boards/pygamer/board.c       |  2 +-
 ports/atmel-samd/boards/ugame10/board.c       |  2 +-
 .../common-hal/alarm/time/TimeAlarm.c         |  2 +-
 .../common-hal/frequencyio/FrequencyIn.c      |  2 +-
 ports/atmel-samd/mpconfigport.h               |  2 +-
 ports/atmel-samd/sd_mmc/sd_mmc.c              | 10 ++--
 ports/atmel-samd/sd_mmc/sd_mmc.h              |  4 +-
 ports/atmel-samd/sd_mmc/sd_mmc_protocol.h     | 16 +++----
 ports/atmel-samd/supervisor/port.c            |  4 +-
 ports/espressif/README.rst                    |  6 +--
 ports/espressif/bindings/espcamera/Camera.c   |  4 +-
 ports/espressif/bindings/espnow/Peer.c        |  2 +-
 ports/espressif/boards/lolin_s2_mini/pins.c   |  4 +-
 .../espressif/boards/m5stack_stick_c/board.c  |  2 +-
 .../waveshare_esp32_s2_pico_lcd/board.c       |  2 +-
 ports/espressif/common-hal/_bleio/Adapter.c   |  2 +-
 .../espressif/common-hal/_bleio/Connection.c  |  2 +-
 .../common-hal/alarm/touch/TouchAlarm.c       |  4 +-
 ports/espressif/common-hal/pulseio/PulseIn.c  |  2 +-
 ports/espressif/common-hal/pwmio/PWMOut.c     |  2 +-
 .../common-hal/rotaryio/IncrementalEncoder.c  |  2 +-
 ports/espressif/i2s_lcd_driver.h              |  2 +-
 ports/litex/boards/fomu/fomu-spi.ld           |  2 +-
 .../common-hal/neopixel_write/__init__.c      |  2 +-
 ports/litex/crt0-vexriscv.S                   |  2 +-
 .../common-hal/neopixel_write/__init__.c      |  2 +-
 ports/nrf/Makefile                            |  2 +-
 .../s140_nrf52_6.1.0_API/include/ble_l2cap.h  |  2 +-
 .../s140_nrf52_7.0.1_API/include/ble_l2cap.h  |  2 +-
 .../s140_nrf52_7.0.1_API/include/nrf_sdm.h    |  4 +-
 .../boards/feather_nrf52840_express/README.md |  2 +-
 ports/nrf/boards/hiibot_bluefi/pins.c         |  2 +-
 .../sparkfun_nrf52840_micromod/README.md      |  4 +-
 ports/nrf/common-hal/_bleio/Adapter.c         |  4 +-
 ports/nrf/common-hal/_bleio/Characteristic.c  |  2 +-
 ports/nrf/common-hal/_bleio/Connection.c      |  2 +-
 ports/nrf/common-hal/_bleio/__init__.c        |  2 +-
 .../nrf/common-hal/microcontroller/__init__.c |  2 +-
 ports/nrf/common-hal/pwmio/PWMOut.c           |  2 +-
 ports/nrf/mpconfigport.h                      |  2 +-
 ports/nrf/supervisor/qspi_flash.c             |  2 +-
 ports/raspberrypi/bindings/cyw43/__init__.c   |  2 +-
 ports/raspberrypi/common-hal/ssl/SSLSocket.c  |  4 +-
 ports/raspberrypi/common-hal/wifi/Radio.c     |  2 +-
 ports/raspberrypi/common-hal/wifi/__init__.c  |  2 +-
 ports/stm/boards/common_default.ld            |  2 +-
 ports/stm/boards/common_nvm.ld                |  2 +-
 ports/stm/boards/common_tcm.ld                |  2 +-
 .../stm/boards/espruino_pico/mpconfigboard.mk |  2 +-
 ports/stm/boards/meowbit_v121/board.c         |  2 +-
 ports/stm/boards/swan_r5/tests/enable_3v3.py  |  2 +-
 ports/stm/common-hal/audiobusio/MEMS_Audio.h  |  2 +-
 .../stm/common-hal/neopixel_write/__init__.c  |  2 +-
 ports/unix/coverage.c                         |  2 +-
 ports/unix/modos.c                            |  2 +-
 ports/unix/modtermios.c                       |  2 +-
 py/asmthumb.c                                 |  2 +-
 py/circuitpy_mpconfig.h                       |  2 +-
 py/circuitpy_mpconfig.mk                      |  2 +-
 py/compile.c                                  |  2 +-
 py/formatfloat.c                              |  4 +-
 py/makecompresseddata.py                      |  2 +-
 py/mkrules.mk                                 |  4 +-
 py/objexcept.c                                |  2 +-
 py/objtype.c                                  |  2 +-
 py/runtime.c                                  |  2 +-
 py/sequence.c                                 |  2 +-
 shared-bindings/alarm/__init__.c              |  2 +-
 shared-bindings/alarm/__init__.h              |  2 +-
 shared-bindings/audiomp3/__init__.c           |  2 +-
 shared-bindings/bitmaptools/__init__.c        | 10 ++--
 shared-bindings/board/__init__.c              |  2 +-
 shared-bindings/busio/UART.c                  |  2 +-
 shared-bindings/countio/__init__.c            |  2 +-
 shared-bindings/displayio/__init__.c          |  2 +-
 shared-bindings/keypad/Event.c                |  2 +-
 shared-bindings/keypad/KeyMatrix.c            |  2 +-
 shared-bindings/microcontroller/ResetReason.c | 14 +++---
 shared-bindings/paralleldisplay/ParallelBus.c |  2 +-
 shared-bindings/rotaryio/IncrementalEncoder.c |  2 +-
 shared-module/bitmaptools/__init__.c          |  2 +-
 shared/netutils/dhcpserver.c                  |  4 +-
 shared/runtime/pyexec.c                       |  2 +-
 .../shared/external_flash/external_flash.c    |  2 +-
 supervisor/shared/safe_mode.c                 |  2 +-
 .../shared/translate/compressed_string.h      |  2 +-
 tests/basics/annotate_var.py                  |  2 +-
 tests/basics/deque2.py                        |  4 +-
 tests/basics/struct1.py                       |  2 +-
 tests/cpydiff/core_fstring_repr.py            |  2 +-
 tests/cpydiff/core_import_path.py             |  2 +-
 tests/cpydiff/core_import_split_ns_pkgs.py    |  2 +-
 tests/extmod/framebuf_palette.py              |  2 +-
 tests/extmod/uctypes_sizeof_layout.py         |  2 +-
 tests/extmod/utimeq1.py                       |  2 +-
 tests/thread/thread_lock1.py                  |  2 +-
 tools/analyze_heap_dump.py                    |  2 +-
 tools/cpboard.py                              |  2 +-
 tools/gendoc.py                               |  2 +-
 tools/makemanifest.py                         |  2 +-
 tools/preprocess_frozen_modules.py            | 10 ++--
 tools/pydfu.py                                |  2 +-
 tools/uncrustify.cfg                          | 14 +++---
 tools/verifygitlog.py                         |  2 +-
 137 files changed, 253 insertions(+), 243 deletions(-)

diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
index 84171bfd52..76849278a0 100644
--- a/.codespell/ignore-words.txt
+++ b/.codespell/ignore-words.txt
@@ -2,3 +2,16 @@ ans
 ure
 clen
 ser
+endianess
+pris
+synopsys
+reenable
+dout
+wel
+iput
+hsi
+astroid
+busses
+cyphertext
+dum
+extint
diff --git a/.codespellrc b/.codespellrc
index dd495c65bd..d4ef112d7a 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -7,4 +7,4 @@ exclude-file = .codespell/exclude-file.txt
 check-filenames =
 check-hidden =
 count =
-skip = .cproject,.git,./lib,./locale
+skip = .cproject,.git,./lib,./locale,ACKNOWLEDGEMENTS
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c1a3a61387..1695a883b4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
     hooks:
     -   id: codespell
         #args: [-w]
-        exclude: ^locale/
+        exclude: ^(locale/|lib/)
 -   repo: local
     hooks:
     -   id: translations
diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index f558d66d40..843c143424 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -483,7 +483,7 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
 
     if (self->scan_results != NULL) {
         if (!shared_module_bleio_scanresults_get_done(self->scan_results)) {
-            mp_raise_bleio_BluetoothError(translate("Scan already in progess. Stop with stop_scan."));
+            mp_raise_bleio_BluetoothError(translate("Scan already in progress. Stop with stop_scan."));
         }
         self->scan_results = NULL;
     }
diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.h b/devices/ble_hci/common-hal/_bleio/Adapter.h
index 48d4f2e6a2..45a37ad67c 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.h
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.h
@@ -65,7 +65,7 @@ typedef struct _bleio_adapter_obj_t {
     uint16_t manufacturer;
     uint16_t lmp_subversion;
 
-    // Used to monitor advertising timeout for legacy avertising.
+    // Used to monitor advertising timeout for legacy advertising.
     uint64_t advertising_start_ticks;
     uint64_t advertising_timeout_msecs;  // If zero, do not check.
 
diff --git a/devices/ble_hci/common-hal/_bleio/Connection.c b/devices/ble_hci/common-hal/_bleio/Connection.c
index 9531231506..e9e1254b43 100644
--- a/devices/ble_hci/common-hal/_bleio/Connection.c
+++ b/devices/ble_hci/common-hal/_bleio/Connection.c
@@ -515,7 +515,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern
 //             (gattc_char->char_props.write ? CHAR_PROP_WRITE : 0) |
 //             (gattc_char->char_props.write_wo_resp ? CHAR_PROP_WRITE_NO_RESPONSE : 0);
 
-//         // Call common_hal_bleio_characteristic_construct() to initalize some fields and set up evt handler.
+//         // Call common_hal_bleio_characteristic_construct() to initialize some fields and set up evt handler.
 //         common_hal_bleio_characteristic_construct(
 //             characteristic, m_char_discovery_service, gattc_char->handle_value, uuid,
 //             props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,
diff --git a/devices/ble_hci/common-hal/_bleio/att.c b/devices/ble_hci/common-hal/_bleio/att.c
index f649967ca9..9dfe9eb26c 100644
--- a/devices/ble_hci/common-hal/_bleio/att.c
+++ b/devices/ble_hci/common-hal/_bleio/att.c
@@ -96,7 +96,7 @@ STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties)
     return ble_spec_properties;
 }
 
-// FIX not currently used; reenable when used.
+// FIX not currently used; re-enable when used.
 #if 0
 STATIC uint8_t ble_spec_properties_to_bleio_properties(uint8_t ble_spec_properties) {
     uint8_t bleio_properties = 0;
@@ -964,7 +964,7 @@ static void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t d
     // Keep track of the first one to make sure.
     size_t sizeof_first_service_uuid = 0;
 
-    // Size of a single bt_att_group_data chunk. Start with the intial size, and
+    // Size of a single bt_att_group_data chunk. Start with the initial size, and
     // add the uuid size in the loop below.
     size_t data_length = sizeof(struct bt_att_group_data);
 
diff --git a/devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h b/devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h
index af8695da98..0f03894caa 100644
--- a/devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h
+++ b/devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h
@@ -150,7 +150,7 @@ struct bt_att_read_mult_req {
     uint16_t handles[];
 } __packed;
 
-/* Read Multiple Respose */
+/* Read Multiple Response */
 #define BT_ATT_OP_READ_MULT_RSP                 0x0f
 struct bt_att_read_mult_rsp {
     uint8_t _dummy[0];
@@ -243,7 +243,7 @@ struct bt_att_read_mult_vl_req {
     uint16_t handles[];
 } __packed;
 
-/* Read Multiple Respose */
+/* Read Multiple Response */
 #define BT_ATT_OP_READ_MULT_VL_RSP              0x21
 struct bt_att_read_mult_vl_rsp {
     uint16_t len;
diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index 2cc1a215d1..01882ba244 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -16,8 +16,8 @@ Classes
 
 .. function:: deque(iterable, maxlen[, flags])
 
-    Deques (double-ended queues) are a list-like container that support O(1)
-    appends and pops from either side of the deque.  New deques are created
+    Dequeues (double-ended queues) are a list-like container that support O(1)
+    appends and pops from either side of the deque.  New dequeues are created
     using the following arguments:
 
         - *iterable* must be the empty tuple, and the new deque is created empty.
diff --git a/examples/natmod/features1/features1.c b/examples/natmod/features1/features1.c
index f865f1887c..a5e82252a1 100644
--- a/examples/natmod/features1/features1.c
+++ b/examples/natmod/features1/features1.c
@@ -88,7 +88,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     // This must be first, it sets up the globals dict and other things
     MP_DYNRUNTIME_INIT_ENTRY
 
-    // Messages can be printed as usualy
+    // Messages can be printed as usually
     mp_printf(&mp_plat_print, "initialising module self=%p\n", self);
 
     // Make the functions available in the module's namespace
diff --git a/lib/cmsis/inc/core_armv81mml.h b/lib/cmsis/inc/core_armv81mml.h
index 9425dbc321..48428fd650 100644
--- a/lib/cmsis/inc/core_armv81mml.h
+++ b/lib/cmsis/inc/core_armv81mml.h
@@ -2162,7 +2162,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
   SCB->AIRCR =  reg_value;
 }
 
@@ -2536,7 +2536,7 @@ __STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk));             /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
   SCB_NS->AIRCR =  reg_value;
 }
 
diff --git a/lib/cmsis/inc/core_sc300.h b/lib/cmsis/inc/core_sc300.h
index 5478ea74a5..cbbac7e82c 100644
--- a/lib/cmsis/inc/core_sc300.h
+++ b/lib/cmsis/inc/core_sc300.h
@@ -1467,7 +1467,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
   SCB->AIRCR =  reg_value;
 }
 
diff --git a/lib/cmsis/inc/mpu_armv8.h b/lib/cmsis/inc/mpu_armv8.h
index 8002738606..84fdd323ae 100644
--- a/lib/cmsis/inc/mpu_armv8.h
+++ b/lib/cmsis/inc/mpu_armv8.h
@@ -84,7 +84,7 @@
 * \param SH Defines the Shareability domain for this memory region.
 * \param RO Read-Only: Set to 1 for a read-only memory region.
 * \param NP Non-Privileged: Set to 1 for a non-privileged memory region.
-* \oaram XN eXecute Never: Set to 1 for a non-executable memory region.
+* \param XN eXecute Never: Set to 1 for a non-executable memory region.
 */
 #define ARM_MPU_RBAR(BASE, SH, RO, NP, XN) \
   ((BASE & MPU_RBAR_BASE_Msk) | \
diff --git a/lib/libm_dbl/__rem_pio2_large.c b/lib/libm_dbl/__rem_pio2_large.c
index 958f28c255..2d1904efc3 100644
--- a/lib/libm_dbl/__rem_pio2_large.c
+++ b/lib/libm_dbl/__rem_pio2_large.c
@@ -40,14 +40,14 @@
  *                      z    = (z-x[i])*2**24
  *
  *
- *      y[]     ouput result in an array of double precision numbers.
+ *      y[]     output result in an array of double precision numbers.
  *              The dimension of y[] is:
  *                      24-bit  precision       1
  *                      53-bit  precision       2
  *                      64-bit  precision       2
  *                      113-bit precision       3
  *              The actual value is the sum of them. Thus for 113-bit
- *              precison, one may have to do something like:
+ *              precision, one may have to do something like:
  *
  *              long double t,w,r_head, r_tail;
  *              t = (long double)y[2] + (long double)y[1];
@@ -78,7 +78,7 @@
  *              jk+1 must be 2 larger than you might expect so that our
  *              recomputation test works. (Up to 24 bits in the integer
  *              part (the 24 bits of it that we compute) and 23 bits in
- *              the fraction part may be lost to cancelation before we
+ *              the fraction part may be lost to cancellation before we
  *              recompute.)
  *
  *      jz      local integer variable indicating the number of
diff --git a/lib/libm_dbl/fmod.c b/lib/libm_dbl/fmod.c
index 6849722bac..cf03aacdb2 100644
--- a/lib/libm_dbl/fmod.c
+++ b/lib/libm_dbl/fmod.c
@@ -9,7 +9,7 @@ double fmod(double x, double y)
 	int sx = ux.i>>63;
 	uint64_t i;
 
-	/* in the followings uxi should be ux.i, but then gcc wrongly adds */
+	/* in the following uxi should be ux.i, but then gcc wrongly adds */
 	/* float load/store to inner loops ruining performance and code size */
 	uint64_t uxi = ux.i;
 
diff --git a/lib/libm_dbl/sqrt.c b/lib/libm_dbl/sqrt.c
index b277567385..194b09fb52 100644
--- a/lib/libm_dbl/sqrt.c
+++ b/lib/libm_dbl/sqrt.c
@@ -37,7 +37,7 @@
  *      If (2) is false, then q   = q ; otherwise q   = q  + 2      .
  *                             i+1   i             i+1   i
  *
- *      With some algebric manipulation, it is not difficult to see
+ *      With some algebraic manipulation, it is not difficult to see
  *      that (2) is equivalent to
  *                             -(i+1)
  *                      s  +  2       <= y                      (3)
diff --git a/lib/littlefs/lfs1.h b/lib/littlefs/lfs1.h
index 355c145d08..08f0b193c8 100644
--- a/lib/littlefs/lfs1.h
+++ b/lib/littlefs/lfs1.h
@@ -94,7 +94,7 @@ enum lfs1_open_flags {
     LFS1_F_DIRTY   = 0x10000, // File does not match storage
     LFS1_F_WRITING = 0x20000, // File has been written since last flush
     LFS1_F_READING = 0x40000, // File has been read since last flush
-    LFS1_F_ERRED   = 0x80000, // An error occured during write
+    LFS1_F_ERRED   = 0x80000, // An error occurred during write
 };
 
 // File seek flags
@@ -111,25 +111,25 @@ struct lfs1_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propogated
+    // Read a region in a block. Negative error codes are propagated
     // to the user.
     int (*read)(const struct lfs1_config *c, lfs1_block_t block,
             lfs1_off_t off, void *buffer, lfs1_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propogated to the user.
+    // been erased. Negative error codes are propagated to the user.
     // May return LFS1_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs1_config *c, lfs1_block_t block,
             lfs1_off_t off, const void *buffer, lfs1_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     // May return LFS1_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs1_config *c, lfs1_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*sync)(const struct lfs1_config *c);
 
     // Minimum size of a block read. This determines the size of read buffers.
@@ -484,7 +484,7 @@ int lfs1_dir_rewind(lfs1_t *lfs1, lfs1_dir_t *dir);
 // Returns a negative error code on failure.
 int lfs1_traverse(lfs1_t *lfs1, int (*cb)(void*, lfs1_block_t), void *data);
 
-// Prunes any recoverable errors that may have occured in the filesystem
+// Prunes any recoverable errors that may have occurred in the filesystem
 //
 // Not needed to be called by user unless an operation is interrupted
 // but the filesystem is still mounted. This is already called on first
diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 39bd2f0d1c..7f3519acd2 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -1449,7 +1449,7 @@ static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
         }
     }
 
-    // zero for reproducability in case initial block is unreadable
+    // zero for reproducibility in case initial block is unreadable
     dir->rev = 0;
 
     // rather than clobbering one of the blocks we just pretend
@@ -1643,7 +1643,7 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
                     return err;
                 }
 
-                // welp, we tried, if we ran out of space there's not much
+                // whelp, we tried, if we ran out of space there's not much
                 // we can do, we'll error later if we've become frozen
                 if (!err) {
                     end = begin;
@@ -4037,7 +4037,7 @@ static int lfs2_fs_relocate(lfs2_t *lfs2,
             lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
         }
 
-        // replace bad pair, either we clean up desync, or no desync occured
+        // replace bad pair, either we clean up desync, or no desync occurred
         lfs2_pair_tole32(newpair);
         err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
                 {LFS2_MKTAG_IF(moveid != 0x3ff,
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index f3b66d76ff..b819aaa3b5 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -159,34 +159,34 @@ struct lfs2_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propogated
+    // Read a region in a block. Negative error codes are propagated
     // to the user.
     int (*read)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, void *buffer, lfs2_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propogated to the user.
+    // been erased. Negative error codes are propagated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, const void *buffer, lfs2_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*sync)(const struct lfs2_config *c);
 
 #ifdef LFS2_THREADSAFE
     // Lock the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*lock)(const struct lfs2_config *c);
 
     // Unlock the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*unlock)(const struct lfs2_config *c);
 #endif
 
@@ -479,7 +479,7 @@ int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
 // Returns the size of the attribute, or a negative error code on failure.
 // Note, the returned size is the size of the attribute on disk, irrespective
 // of the size of the buffer. This can be used to dynamically allocate a buffer
-// or check for existance.
+// or check for existence.
 lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size);
 
diff --git a/lib/oofatfs/diskio.h b/lib/oofatfs/diskio.h
index d886bdd9cc..00768cac72 100644
--- a/lib/oofatfs/diskio.h
+++ b/lib/oofatfs/diskio.h
@@ -3,7 +3,7 @@
  */
 
 /*-----------------------------------------------------------------------/
-/  Low level disk interface modlue include file   (C)ChaN, 2014          /
+/  Low level disk interface module include file   (C)ChaN, 2014          /
 /-----------------------------------------------------------------------*/
 
 #ifndef _DISKIO_DEFINED
@@ -42,7 +42,7 @@ DRESULT disk_ioctl (void *drv, BYTE cmd, void* buff);
 #define STA_PROTECT     0x04    /* Write protected */
 
 
-/* Command code for disk_ioctrl fucntion */
+/* Command code for disk_ioctrl function */
 
 /* Generic command (Used by FatFs) */
 #define CTRL_SYNC           0   /* Complete pending write process (needed at FF_FS_READONLY == 0) */
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index dbcfa3efc3..a4c17f0560 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -996,7 +996,7 @@ static FRESULT dec_lock (   /* Decrement object open counter */
         if (n == 0) Files[i].fs = 0;    /* Delete the entry if open count gets zero */
         res = FR_OK;
     } else {
-        res = FR_INT_ERR;           /* Invalid index nunber */
+        res = FR_INT_ERR;           /* Invalid index number */
     }
     return res;
 }
@@ -1990,7 +1990,7 @@ static void gen_numname (
         seq = (UINT)sr;
     }
 
-    /* itoa (hexdecimal) */
+    /* itoa (hexadecimal) */
     i = 7;
     do {
         c = (BYTE)((seq % 16) + '0');
@@ -2098,7 +2098,7 @@ static DWORD xsum32 (   /* Returns 32-bit checksum */
 /*------------------------------------------------------*/
 
 static void get_xfileinfo (
-    BYTE* dirb,         /* Pointer to the direcotry entry block 85+C0+C1s */
+    BYTE* dirb,         /* Pointer to the directory entry block 85+C0+C1s */
     FILINFO* fno        /* Buffer to store the extracted file information */
 )
 {
@@ -2135,16 +2135,16 @@ static void get_xfileinfo (
 
 
 /*-----------------------------------*/
-/* exFAT: Get a directry entry block */
+/* exFAT: Get a directory entry block */
 /*-----------------------------------*/
 
 static FRESULT load_xdir (  /* FR_INT_ERR: invalid entry block */
-    DIR* dp                 /* Reading direcotry object pointing top of the entry block to load */
+    DIR* dp                 /* Reading directory object pointing top of the entry block to load */
 )
 {
     FRESULT res;
     UINT i, sz_ent;
-    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the on-memory direcotry entry block 85+C0+C1s */
+    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the on-memory directory entry block 85+C0+C1s */
 
 
     /* Load file-directory entry */
@@ -2208,7 +2208,7 @@ static void init_alloc_info (
 /*------------------------------------------------*/
 
 static FRESULT load_obj_xdir (
-    DIR* dp,            /* Blank directory object to be used to access containing direcotry */
+    DIR* dp,            /* Blank directory object to be used to access containing directory */
     const FFOBJID* obj  /* Object with its containing directory information */
 )
 {
@@ -2237,18 +2237,18 @@ static FRESULT load_obj_xdir (
 /*----------------------------------------*/
 
 static FRESULT store_xdir (
-    DIR* dp             /* Pointer to the direcotry object */
+    DIR* dp             /* Pointer to the directory object */
 )
 {
     FRESULT res;
     UINT nent;
-    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the direcotry entry block 85+C0+C1s */
+    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the directory entry block 85+C0+C1s */
 
     /* Create set sum */
     st_word(dirb + XDIR_SetSum, xdir_sum(dirb));
     nent = dirb[XDIR_NumSec] + 1;
 
-    /* Store the direcotry entry block to the directory */
+    /* Store the directory entry block to the directory */
     res = dir_sdi(dp, dp->blk_ofs);
     while (res == FR_OK) {
         res = move_window(dp->obj.fs, dp->sect);
@@ -2265,11 +2265,11 @@ static FRESULT store_xdir (
 
 
 /*-------------------------------------------*/
-/* exFAT: Create a new directory enrty block */
+/* exFAT: Create a new directory entry block */
 /*-------------------------------------------*/
 
 static void create_xdir (
-    BYTE* dirb,         /* Pointer to the direcotry entry block buffer */
+    BYTE* dirb,         /* Pointer to the directory entry block buffer */
     const WCHAR* lfn    /* Pointer to the object name */
 )
 {
@@ -2690,7 +2690,7 @@ static void get_fileinfo (
     fno->altname[di] = 0;   /* Terminate the SFN  (null string means SFN is invalid) */
 
     if (fno->fname[0] == 0) {   /* If LFN is invalid, altname[] needs to be copied to fname[] */
-        if (di == 0) {  /* If LFN and SFN both are invalid, this object is inaccesible */
+        if (di == 0) {  /* If LFN and SFN both are invalid, this object is inaccessible */
             fno->fname[di++] = '?';
         } else {
             for (si = di = 0, lcf = NS_BODY; fno->altname[si]; si++, di++) { /* Copy altname[] to fname[] with case information */
@@ -2764,7 +2764,7 @@ static DWORD get_achar (    /* Get a character and advances ptr */
 
 static int pattern_matching (   /* 0:not matched, 1:matched */
     const TCHAR* pat,   /* Matching pattern */
-    const TCHAR* nam,   /* String to be tested */
+    const TCHAR* name,   /* String to be tested */
     int skip,           /* Number of pre-skip chars (number of ?s) */
     int inf             /* Infinite search (* specified) */
 )
@@ -2775,12 +2775,12 @@ static int pattern_matching (   /* 0:not matched, 1:matched */
 
 
     while (skip--) {                /* Pre-skip name chars */
-        if (!get_achar(&nam)) return 0; /* Branch mismatched if less name chars */
+        if (!get_achar(&name)) return 0; /* Branch mismatched if less name chars */
     }
     if (*pat == 0 && inf) return 1; /* (short circuit) */
 
     do {
-        pp = pat; np = nam;         /* Top of pattern and name to match */
+        pp = pat; np = name;         /* Top of pattern and name to match */
         for (;;) {
             if (*pp == '?' || *pp == '*') { /* Wildcard? */
                 nm = nx = 0;
@@ -2795,7 +2795,7 @@ static int pattern_matching (   /* 0:not matched, 1:matched */
             if (pc != nc) break;    /* Branch mismatched? */
             if (pc == 0) return 1;  /* Branch matched? (matched at end of both strings) */
         }
-        get_achar(&nam);            /* nam++ */
+        get_achar(&name);            /* name++ */
     } while (inf && nc);            /* Retry until end of name if infinite search is specified */
 
     return 0;
@@ -3183,7 +3183,7 @@ static FRESULT find_volume (    /* FR_OK(0): successful, !=0: an error occurred
             fmt = bsect ? check_fs(fs, bsect) : 3;  /* Check the partition */
         } while (LD2PT(fs) == 0 && fmt >= 2 && ++i < 4);
     }
-    if (fmt == 4) return FR_DISK_ERR;       /* An error occured in the disk I/O layer */
+    if (fmt == 4) return FR_DISK_ERR;       /* An error occurred in the disk I/O layer */
     if (fmt >= 2) return FR_NO_FILESYSTEM;  /* No FAT volume is found */
 
     /* An FAT volume is found (bsect). Following code initializes the filesystem object */
@@ -3221,7 +3221,7 @@ static FRESULT find_volume (    /* FR_OK(0): successful, !=0: an error occurred
         fs->volbase = bsect;
         fs->database = bsect + ld_dword(fs->win + BPB_DataOfsEx);
         fs->fatbase = bsect + ld_dword(fs->win + BPB_FatOfsEx);
-        if (maxlba < (QWORD)fs->database + nclst * fs->csize) return FR_NO_FILESYSTEM;  /* (Volume size must not be smaller than the size requiered) */
+        if (maxlba < (QWORD)fs->database + nclst * fs->csize) return FR_NO_FILESYSTEM;  /* (Volume size must not be smaller than the size required) */
         fs->dirbase = ld_dword(fs->win + BPB_RootClusEx);
 
         /* Get bitmap location and check if it is contiguous (implementation assumption) */
@@ -3365,7 +3365,7 @@ static FRESULT validate (   /* Returns FR_OK or FR_INVALID_OBJECT */
     if (obj && obj->fs && obj->fs->fs_type && obj->id == obj->fs->id) { /* Test if the object is valid */
 #if FF_FS_REENTRANT
         if (lock_fs(obj->fs)) { /* Obtain the filesystem object */
-            if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
+            if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the physical drive is kept initialized */
                 res = FR_OK;
             } else {
                 unlock_fs(obj->fs, FR_OK);
@@ -3374,7 +3374,7 @@ static FRESULT validate (   /* Returns FR_OK or FR_INVALID_OBJECT */
             res = FR_TIMEOUT;
         }
 #else
-        if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
+        if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the physical drive is kept initialized */
             res = FR_OK;
         }
 #endif
@@ -3528,7 +3528,7 @@ FRESULT f_open (
             }
         }
         else {  /* Open an existing file */
-            if (res == FR_OK) {                 /* Is the object exsiting? */
+            if (res == FR_OK) {                 /* Is the object existing? */
                 if (dj.obj.attr & AM_DIR) {     /* File open against a directory */
                     res = FR_NO_FILE;
                 } else {
@@ -4339,7 +4339,7 @@ FRESULT f_opendir (
         FREE_NAMBUF();
         if (res == FR_NO_FILE) res = FR_NO_PATH;
     }
-    if (res != FR_OK) dp->obj.fs = 0;       /* Invalidate the directory object if function faild */
+    if (res != FR_OK) dp->obj.fs = 0;       /* Invalidate the directory object if function failed */
 
     LEAVE_FF(fs, res);
 }
@@ -4779,7 +4779,7 @@ FRESULT f_mkdir (
                         st_clust(fs, fs->win + SZDIRE, pcl);
                         fs->wflag = 1;
                     }
-                    res = dir_register(&dj);    /* Register the object to the parent directoy */
+                    res = dir_register(&dj);    /* Register the object to the parent directory */
                 }
             }
             if (res == FR_OK) {
diff --git a/lib/oofatfs/ff.h b/lib/oofatfs/ff.h
index b133d770db..fe731eb694 100644
--- a/lib/oofatfs/ff.h
+++ b/lib/oofatfs/ff.h
@@ -240,7 +240,7 @@ typedef struct {
     WORD    ftime;          /* Modified time */
     BYTE    fattrib;        /* File attribute */
 #if FF_USE_LFN
-    TCHAR   altname[FF_SFN_BUF + 1];/* Altenative file name */
+    TCHAR   altname[FF_SFN_BUF + 1];/* Alternative file name */
     TCHAR   fname[FF_LFN_BUF + 1];  /* Primary file name */
 #else
     TCHAR   fname[12 + 1];  /* File name */
diff --git a/lib/oofatfs/ffconf.h b/lib/oofatfs/ffconf.h
index 52ff6d0a7a..bcd7ee5baf 100644
--- a/lib/oofatfs/ffconf.h
+++ b/lib/oofatfs/ffconf.h
@@ -188,7 +188,7 @@
 #define FF_LFN_BUF      255
 #define FF_SFN_BUF      12
 /* This set of options defines size of file name members in the FILINFO structure
-/  which is used to read out directory items. These values should be suffcient for
+/  which is used to read out directory items. These values should be sufficient for
 /  the file names to read. The maximum possible length of the read file name depends
 /  on character encoding. When LFN is not enabled, these options have no effect. */
 
@@ -251,7 +251,7 @@
 /  number and only an FAT volume found on the physical drive will be mounted.
 /  When this function is enabled (1), each logical drive number can be bound to
 /  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  funciton will be available. */
+/  function will be available. */
 
 
 #define FF_MIN_SS   512
@@ -316,7 +316,7 @@
 #define FF_NORTC_MON    1
 #define FF_NORTC_MDAY   1
 #define FF_NORTC_YEAR   2018
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
+/* The option FF_FS_NORTC switches timestamp function. If the system does not have
 /  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
 /  the timestamp function. Every object modified by FatFs will have a fixed timestamp
 /  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
diff --git a/lib/oofatfs/ffunicode.c b/lib/oofatfs/ffunicode.c
index a04577616a..ce60b42193 100644
--- a/lib/oofatfs/ffunicode.c
+++ b/lib/oofatfs/ffunicode.c
@@ -3,7 +3,7 @@
 /*------------------------------------------------------------------------*/
 /* This module will occupy a huge memory in the .const section when the    /
 /  FatFs is configured for LFN with DBCS. If the system has any Unicode    /
-/  utilitiy for the code conversion, this module should be modified to use /
+/  utility for the code conversion, this module should be modified to use /
 /  that function to avoid silly memory consumption.                        /
 /-------------------------------------------------------------------------*/
 /*
diff --git a/lib/sdmmc/sdmmc_io.c b/lib/sdmmc/sdmmc_io.c
index 17ab291515..68c804982b 100644
--- a/lib/sdmmc/sdmmc_io.c
+++ b/lib/sdmmc/sdmmc_io.c
@@ -282,7 +282,7 @@ sdmmc_err_t sdmmc_io_rw_extended(sdmmc_card_t* card, int func,
             return SDMMC_ERR_INVALID_SIZE;
         }
         if (datalen == max_byte_transfer_size) {
-            count = 0;  // See 5.3.1 SDIO simplifed spec
+            count = 0;  // See 5.3.1 SDIO simplified spec
         } else {
             count = datalen;
         }
diff --git a/lib/uzlib/tinflate.c b/lib/uzlib/tinflate.c
index 045952c755..fbee7ce721 100644
--- a/lib/uzlib/tinflate.c
+++ b/lib/uzlib/tinflate.c
@@ -597,7 +597,7 @@ next_blk:
 
         if (res == TINF_DONE && !d->bfinal) {
             /* the block has ended (without producing more data), but we
-               can't return without data, so start procesing next block */
+               can't return without data, so start processing next block */
             goto next_blk;
         }
 
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 560dffe6a4..f3e6ffc341 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -188,10 +188,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -200,6 +196,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1229,7 +1229,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1523,10 +1524,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1939,7 +1936,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2252,6 +2249,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2287,11 +2289,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -3044,8 +3041,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
diff --git a/ports/atmel-samd/asf4_conf/samd21/hpl_tc_config.h b/ports/atmel-samd/asf4_conf/samd21/hpl_tc_config.h
index d651ca33a8..706c7f4b67 100644
--- a/ports/atmel-samd/asf4_conf/samd21/hpl_tc_config.h
+++ b/ports/atmel-samd/asf4_conf/samd21/hpl_tc_config.h
@@ -49,7 +49,7 @@
 #define CONF_TC3_WAVE_DUTY_VAL 0x1f4
 #endif
 
-/* Caculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
+/* Calculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
 #if CONF_TC3_PRESCALER < TC_CTRLA_PRESCALER_DIV64_Val
 #define CONF_TC3_CC0                                                                                                   \
     ((uint32_t)(((double)CONF_TC3_WAVE_PER_VAL * CONF_GCLK_TC3_FREQUENCY) / 1000000 / (1 << CONF_TC3_PRESCALER) - 1))
diff --git a/ports/atmel-samd/asf4_conf/samd51/hpl_tc_config.h b/ports/atmel-samd/asf4_conf/samd51/hpl_tc_config.h
index 3bc688295b..dc08b6eb23 100644
--- a/ports/atmel-samd/asf4_conf/samd51/hpl_tc_config.h
+++ b/ports/atmel-samd/asf4_conf/samd51/hpl_tc_config.h
@@ -42,7 +42,7 @@
 #define CONF_TC0_WAVE_DUTY_VAL 0x1f4
 #endif
 
-/* Caculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
+/* Calculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
 #if CONF_TC0_PRESCALER < TC_CTRLA_PRESCALER_DIV64_Val
 #define CONF_TC0_CC0                                                                                                   \
     ((uint32_t)(((double)CONF_TC0_WAVE_PER_VAL * CONF_GCLK_TC0_FREQUENCY) / 1000000 / (1 << CONF_TC0_PRESCALER) - 1))
diff --git a/ports/atmel-samd/asf4_conf/same51/hpl_tc_config.h b/ports/atmel-samd/asf4_conf/same51/hpl_tc_config.h
index 3bc688295b..dc08b6eb23 100644
--- a/ports/atmel-samd/asf4_conf/same51/hpl_tc_config.h
+++ b/ports/atmel-samd/asf4_conf/same51/hpl_tc_config.h
@@ -42,7 +42,7 @@
 #define CONF_TC0_WAVE_DUTY_VAL 0x1f4
 #endif
 
-/* Caculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
+/* Calculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
 #if CONF_TC0_PRESCALER < TC_CTRLA_PRESCALER_DIV64_Val
 #define CONF_TC0_CC0                                                                                                   \
     ((uint32_t)(((double)CONF_TC0_WAVE_PER_VAL * CONF_GCLK_TC0_FREQUENCY) / 1000000 / (1 << CONF_TC0_PRESCALER) - 1))
diff --git a/ports/atmel-samd/asf4_conf/same54/hpl_tc_config.h b/ports/atmel-samd/asf4_conf/same54/hpl_tc_config.h
index 3bc688295b..dc08b6eb23 100644
--- a/ports/atmel-samd/asf4_conf/same54/hpl_tc_config.h
+++ b/ports/atmel-samd/asf4_conf/same54/hpl_tc_config.h
@@ -42,7 +42,7 @@
 #define CONF_TC0_WAVE_DUTY_VAL 0x1f4
 #endif
 
-/* Caculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
+/* Calculate pwm ccx register value based on WAVE_PER_VAL and Waveform Duty Value */
 #if CONF_TC0_PRESCALER < TC_CTRLA_PRESCALER_DIV64_Val
 #define CONF_TC0_CC0                                                                                                   \
     ((uint32_t)(((double)CONF_TC0_WAVE_PER_VAL * CONF_GCLK_TC0_FREQUENCY) / 1000000 / (1 << CONF_TC0_PRESCALER) - 1))
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index 701dc4a8ec..aeea62d2a2 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -51,7 +51,7 @@ uint8_t display_init_sequence[] = {
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
     0x36, 1, 0x18, // _MADCTL bottom to top refresh
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color
     0xe0, 16, 0x02, 0x1c, 0x07, 0x12, // _GMCTRP1 Gamma
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index a1cb3a0714..11db1ba0a8 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -50,7 +50,7 @@ uint8_t display_init_sequence[] = {
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
     0x36, 1, 0b10100000,  // _MADCTL for rotation 0
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color
     0xe0, 16, 0x02, 0x1c, 0x07, 0x12, // _GMCTRP1 Gamma
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
index 8ff34f24c5..141365a4a1 100644
--- a/ports/atmel-samd/boards/pygamer/board.c
+++ b/ports/atmel-samd/boards/pygamer/board.c
@@ -52,7 +52,7 @@ uint8_t display_init_sequence[] = {
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
     0x36, 1, 0b10100000,  // _MADCTL for rotation 0
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color
     0xe0, 16, 0x02, 0x1c, 0x07, 0x12, // _GMCTRP1 Gamma
diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c
index 90cf9dff20..9953f27d02 100644
--- a/ports/atmel-samd/boards/ugame10/board.c
+++ b/ports/atmel-samd/boards/ugame10/board.c
@@ -52,7 +52,7 @@ uint8_t display_init_sequence[] = {
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
     0x36, 1, 0xa8, // _MADCTL bottom to top refresh
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color
     0xe0, 16, 0x02, 0x1c, 0x07, 0x12, // _GMCTRP1 Gamma
diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
index 2ead87428b..4c1d05feb2 100644
--- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
@@ -36,7 +36,7 @@ STATIC volatile bool woke_up = false;
 STATIC mp_float_t wakeup_time;
 
 void common_hal_alarm_time_timealarm_construct(alarm_time_timealarm_obj_t *self, mp_float_t monotonic_time) {
-    // TODO: when issueing light/seep sleep, throw a ValueError if the
+    // TODO: when issuing light/seep sleep, throw a ValueError if the
     //       time exceeds the maximum value.  For light sleep, max =
     //       2**32 / 16384 = 3 days.  For deep sleep, max = 2**32 / 32
     //       = 1550 days.
diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
index 22200c5d1c..6d1a3f7c0e 100644
--- a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
+++ b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
@@ -482,7 +482,7 @@ uint32_t common_hal_frequencyio_frequencyin_get_item(frequencyio_frequencyin_obj
         float time_each_event = self->factor / self->frequency; // get the time for each event during actual period
         float capture_diff = self->factor - self->capture_period; // get the difference of actual and base periods
         // we only need to adjust if the capture_diff can contain 1 or more events
-        // if so, we add how many events could have occured during the diff time
+        // if so, we add how many events could have occurred during the diff time
         if (time_each_event > capture_diff) {
             frequency_adjustment = capture_diff / time_each_event;
         }
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 887748c7a0..73686e1445 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -189,7 +189,7 @@
 // - firmware
 // - internal CIRCUITPY flash filesystem (optional)
 // - internal config, used to store crystalless clock calibration info (optional)
-// - microntroller.nvm (optional)
+// - microcontroller.nvm (optional)
 
 // Define these regions starting up from the bottom of flash:
 
diff --git a/ports/atmel-samd/sd_mmc/sd_mmc.c b/ports/atmel-samd/sd_mmc/sd_mmc.c
index de5a3cfe17..b558922d1f 100644
--- a/ports/atmel-samd/sd_mmc/sd_mmc.c
+++ b/ports/atmel-samd/sd_mmc/sd_mmc.c
@@ -1073,7 +1073,7 @@ static void sd_mmc_deselect_slot(void) {
  * \note
  * This function runs the initialization procedure and the identification
  * process, then it sets the SD/MMC card in transfer state.
- * At last, it will automaticly enable maximum bus width and transfer speed.
+ * At last, it will automatically enable maximum bus width and transfer speed.
  *
  * \return true if success, otherwise false
  */
@@ -1205,7 +1205,7 @@ static bool sd_mmc_mci_card_init(void) {
  * \note
  * This function runs the initialization procedure and the identification
  * process, then it sets the SD/MMC card in transfer state.
- * At last, it will automaticly enable maximum bus width and transfer speed.
+ * At last, it will automatically enable maximum bus width and transfer speed.
  *
  * \return true if success, otherwise false
  */
@@ -1270,7 +1270,7 @@ static bool sd_mmc_mci_install_mmc(void) {
     uint8_t retry = 10;
     while (retry--) {
         /* Retry is a WORKAROUND for no compliance card (Atmel Internal ref. MMC19):
-         * These cards seem not ready immediatly
+         * These cards seem not ready immediately
          * after the end of busy of mmc_cmd6_set_high_speed()*/
 
         /* Set default block size */
@@ -1427,7 +1427,7 @@ sd_mmc_err_t sd_mmc_wait_end_of_read_blocks(bool abort) {
         return SD_MMC_OK;
     }
 
-    /* All blocks are transfered then stop read operation */
+    /* All blocks are transferred then stop read operation */
     if (sd_mmc_nb_block_to_tranfer == 1) {
         /* Single block transfer, then nothing to do */
         sd_mmc_deselect_slot();
@@ -1506,7 +1506,7 @@ sd_mmc_err_t sd_mmc_wait_end_of_write_blocks(bool abort) {
         return SD_MMC_OK;
     }
 
-    /* All blocks are transfered then stop write operation */
+    /* All blocks are transferred then stop write operation */
     if (sd_mmc_nb_block_to_tranfer == 1) {
         /* Single block transfer, then nothing to do */
         sd_mmc_deselect_slot();
diff --git a/ports/atmel-samd/sd_mmc/sd_mmc.h b/ports/atmel-samd/sd_mmc/sd_mmc.h
index e51bf17e80..667520317c 100644
--- a/ports/atmel-samd/sd_mmc/sd_mmc.h
+++ b/ports/atmel-samd/sd_mmc/sd_mmc.h
@@ -67,7 +67,7 @@ typedef uint8_t sd_mmc_err_t; /**< Type of return error code */
 #define SD_MMC_INIT_ONGOING 1 /**< Card not initialized */
 #define SD_MMC_ERR_NO_CARD 2  /**< No SD/MMC card inserted */
 #define SD_MMC_ERR_UNUSABLE 3 /**< Unusable card */
-#define SD_MMC_ERR_SLOT 4     /**< Slot unknow */
+#define SD_MMC_ERR_SLOT 4     /**< Slot unknown */
 #define SD_MMC_ERR_COMM 5     /**< General communication error */
 #define SD_MMC_ERR_PARAM 6    /**< Illeage input parameter */
 #define SD_MMC_ERR_WP 7       /**< Card write protected */
@@ -166,7 +166,7 @@ uint32_t sd_mmc_get_capacity(uint8_t slot);
  *
  * \param[in] slot     Card slot
  *
- * \return true, if write portected
+ * \return true, if write protected
  */
 bool sd_mmc_is_write_protected(uint8_t slot);
 
diff --git a/ports/atmel-samd/sd_mmc/sd_mmc_protocol.h b/ports/atmel-samd/sd_mmc/sd_mmc_protocol.h
index 9b4d8e8e74..c205415559 100644
--- a/ports/atmel-samd/sd_mmc/sd_mmc_protocol.h
+++ b/ports/atmel-samd/sd_mmc/sd_mmc_protocol.h
@@ -73,8 +73,8 @@ extern "C" {
  * Responses types:
  *
  * R1, R3, R4 & R5 use a 48 bits response protected by a 7bit CRC checksum
- * - R1 receiv data not specified
- * - R3 receiv OCR
+ * - R1 receive data not specified
+ * - R3 receive OCR
  * - R4, R5 RCA management (MMC only)
  * - R6, R7 RCA management (SD only)
  *
@@ -115,14 +115,14 @@ typedef uint32_t sdmmc_cmd_def_t;
 #define SDMMC_RESP_CRC (1lu << 12)
 // ! Card may send busy
 #define SDMMC_RESP_BUSY (1lu << 13)
-// Open drain for a braodcast command (bc)
+// Open drain for a broadcast command (bc)
 // or to enter in inactive state (MCI only)
 #define SDMMC_CMD_OPENDRAIN (1lu << 14)
 // ! To signal a data write operation
 #define SDMMC_CMD_WRITE (1lu << 15)
-// ! To signal a SDIO tranfer in multi byte mode
+// ! To signal a SDIO transfer in multi byte mode
 #define SDMMC_CMD_SDIO_BYTE (1lu << 16)
-// ! To signal a SDIO tranfer in block mode
+// ! To signal a SDIO transfer in block mode
 #define SDMMC_CMD_SDIO_BLOCK (1lu << 17)
 // ! To signal a data transfer in stream mode
 #define SDMMC_CMD_STREAM (1lu << 18)
@@ -132,7 +132,7 @@ typedef uint32_t sdmmc_cmd_def_t;
 #define SDMMC_CMD_MULTI_BLOCK (1lu << 20)
 // ! @}
 
-// ! \name Set of flags to define a reponse type
+// ! \name Set of flags to define a response type
 // ! @{
 #define SDMMC_CMD_NO_RESP (0)
 #define SDMMC_CMD_R1 (SDMMC_RESP_PRESENT | SDMMC_RESP_CRC)
@@ -324,7 +324,7 @@ typedef uint32_t sdmmc_cmd_def_t;
 #define SD_MCI_ACMD41_SD_SEND_OP_COND (41 | SDMMC_CMD_R3 | SDMMC_CMD_OPENDRAIN)
 /**
  * ACMD41(R1): Send host capacity support information (HCS) and activates the
- * card's initilization process
+ * card's initialization process
  */
 #define SD_SPI_ACMD41_SD_SEND_OP_COND (41 | SDMMC_CMD_R1)
 /**
@@ -440,7 +440,7 @@ typedef uint32_t sdmmc_cmd_def_t;
 #define SDIO_R5_ERROR (1lu << 11)                                                    /**< General error */
 #define SDIO_R5_FUNC_NUM (1lu << 9)                                                  /**< Invalid function number */
 #define SDIO_R5_OUT_OF_RANGE (1lu << 8)                                              /**< Argument out of range */
-#define SDIO_R5_STATUS_ERR (SDIO_R5_ERROR | SDIO_R5_FUNC_NUM | SDIO_R5_OUT_OF_RANGE) // !< Errro status bits mask
+#define SDIO_R5_STATUS_ERR (SDIO_R5_ERROR | SDIO_R5_FUNC_NUM | SDIO_R5_OUT_OF_RANGE) // !< Error status bits mask
                                                                                      // ! @}
 
 // ! \name SDIO state (in R6)
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 45b999f1a1..8cba5c61e0 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -307,7 +307,7 @@ safe_mode_t port_init(void) {
     // because it was hard enough to figure out, and maybe there's
     // a mistake that could make it work in the future.
     #if 0
-    // Designate QSPI memory mapped region as not cachable.
+    // Designate QSPI memory mapped region as not cacheable.
 
     // Turn off MPU in case it is on.
     MPU->CTRL = 0;
@@ -320,7 +320,7 @@ safe_mode_t port_init(void) {
         0b011 << MPU_RASR_AP_Pos |     // full read/write access for privileged and user mode
             0b000 << MPU_RASR_TEX_Pos | // caching not allowed, strongly ordered
             1 << MPU_RASR_S_Pos |      // sharable
-            0 << MPU_RASR_C_Pos |      // not cachable
+            0 << MPU_RASR_C_Pos |      // not cacheable
             0 << MPU_RASR_B_Pos |      // not bufferable
             0b10111 << MPU_RASR_SIZE_Pos | // 16MB region size
             1 << MPU_RASR_ENABLE_Pos   // enable this region
diff --git a/ports/espressif/README.rst b/ports/espressif/README.rst
index 949f3533ae..49f372359b 100644
--- a/ports/espressif/README.rst
+++ b/ports/espressif/README.rst
@@ -55,7 +55,7 @@ Connect these pins using a `USB adapter `
 
 **UART Connection:**
 
-A `USB to UART convertor `_ can be used for connecting to ESP32-C3 to get access to the serial console and REPL and for flashing CircuitPython.
+A `USB to UART converter `_ can be used for connecting to ESP32-C3 to get access to the serial console and REPL and for flashing CircuitPython.
 
 The following connections need to be made in this case:
 
@@ -92,7 +92,7 @@ Connect these pins using a `USB adapter `
 
 **UART Connection:**
 
-A `USB to UART convertor `_ can be used for connecting to ESP32-S2 to get access to the serial console and REPL and for flashing CircuitPython.
+A `USB to UART converter `_ can be used for connecting to ESP32-S2 to get access to the serial console and REPL and for flashing CircuitPython.
 
 The following connections need to be made in this case:
 
@@ -129,7 +129,7 @@ Connect these pins using a `USB adapter `
 
 **UART Connection:**
 
-A `USB to UART convertor `_ can be used for connecting to ESP32-S3 to get access to the serial console and REPL and for flashing CircuitPython.
+A `USB to UART converter `_ can be used for connecting to ESP32-S3 to get access to the serial console and REPL and for flashing CircuitPython.
 
 The following connections need to be made in this case:
 
diff --git a/ports/espressif/bindings/espcamera/Camera.c b/ports/espressif/bindings/espcamera/Camera.c
index 824bc7d3dc..5fb9576e58 100644
--- a/ports/espressif/bindings/espcamera/Camera.c
+++ b/ports/espressif/bindings/espcamera/Camera.c
@@ -63,7 +63,7 @@
 //|         """
 //|         Configure and initialize a camera with the given properties
 //|
-//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``settings.toml`` be large enough to hold the camera frambuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
+//|         This driver requires that the ``CIRCUITPY_RESERVED_PSRAM`` in ``settings.toml`` be large enough to hold the camera framebuffer(s). Generally, boards with built-in cameras will have a default setting that is large enough. If the constructor raises a MemoryError or an IDFError, this probably indicates the setting is too small and should be increased.
 //|
 //|
 //|         .. important::
@@ -89,7 +89,7 @@
 //|         :param reset_pin: The reset input to the camera module
 //|         :param pixel_format: The pixel format of the captured image
 //|         :param frame_size: The size of captured image
-//|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the availalble buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
+//|         :param jpeg_quality: For `PixelFormat.JPEG`, the quality. Higher numbers increase quality. If the quality is too high, the JPEG data will be larger than the available buffer size and the image will be unusable or truncated. The exact range of appropriate values depends on the sensor and must be determined empirically.
 //|         :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered)
 //|         :param grab_mode: When to grab a new frame
 //|         """
diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
index 7b6cc5f668..ca756409a6 100644
--- a/ports/espressif/bindings/espnow/Peer.c
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -32,7 +32,7 @@
 #include "common-hal/espnow/__init__.h"
 
 // TODO: check peer already exist
-// TODO: check peer dosen't exist
+// TODO: check peer doesn't exist
 
 //| class Peer:
 //|     """A data class to store parameters specific to a peer."""
diff --git a/ports/espressif/boards/lolin_s2_mini/pins.c b/ports/espressif/boards/lolin_s2_mini/pins.c
index a4b18c4e9b..ee81e00d9e 100644
--- a/ports/espressif/boards/lolin_s2_mini/pins.c
+++ b/ports/espressif/boards/lolin_s2_mini/pins.c
@@ -4,7 +4,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
     // S2 Mini Board bottom, right, top-bottom
-    // GPIO0-GPIO14: broken out as a bloc on ESP32-S2FN4R2 SoC
+    // GPIO0-GPIO14: broken out as a block on ESP32-S2FN4R2 SoC
     // mpconfigboard.h: GPIO0: CIRCUITPY_BOOT_BUTTON
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },  // RTC_GPIO0,GPIO0
@@ -57,7 +57,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // skip GPIO22-GPIO25: not broken out on ESP32-S2FN4R2 SoC
     // skip GPIO26-GPIO32: SPI Flash & RAM, not broken out on S2 Mini (internal to ESP32-S2FN4R2 SoC?)
 
-    // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG
+    // GPIO33-GPIO40: broken out as a block on ESP32-S2FN4R2 SoC, last 2 half of JTAG
     { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD
     { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO33) },// def from Wemos MP
     { MP_ROM_QSTR(MP_QSTR_D2),   MP_ROM_PTR(&pin_GPIO33) },// D1 mini pin D2 GPIO4
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index bbc0447056..88d0287419 100644
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -193,7 +193,7 @@ static bool pmic_init(void) {
     }
 
     // Reg: 12h
-    // Enable EXTEN, DCDC1, LDO2 and LDO3
+    // Enable EXTENT, DCDC1, LDO2 and LDO3
     write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
     write_buf[1] = AXP192_DCDC13_LDO23_CTRL_EXTEN |
         AXP192_DCDC13_LDO23_CTRL_LDO3 |
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
index 070e3418da..359263df81 100644
--- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -51,7 +51,7 @@ uint8_t display_init_sequence[] = {
     0xC5, 0x01, 0x0E, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x20, 0x00, // _INVOFF
     0x36, 0x01, 0x18, // _MADCTL bottom to top refresh
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3A, 0x01, 0x05, // COLMOD - 16bit color
     0xE0, 0x10, 0x02, 0x1C, 0x07, 0x12, 0x37, 0x32, 0x29, 0x2D, 0x29, 0x25, 0x2B, 0x39, 0x00, 0x01, 0x03, 0x10, // _GMCTRP1 Gamma
diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
index 3239c501cc..01adae3adb 100644
--- a/ports/espressif/common-hal/_bleio/Adapter.c
+++ b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -221,7 +221,7 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
     mp_float_t interval, mp_float_t window, mp_int_t minimum_rssi, bool active) {
     if (self->scan_results != NULL) {
         if (!shared_module_bleio_scanresults_get_done(self->scan_results)) {
-            mp_raise_bleio_BluetoothError(translate("Scan already in progess. Stop with stop_scan."));
+            mp_raise_bleio_BluetoothError(translate("Scan already in progress. Stop with stop_scan."));
         }
         self->scan_results = NULL;
     }
diff --git a/ports/espressif/common-hal/_bleio/Connection.c b/ports/espressif/common-hal/_bleio/Connection.c
index 75def8ad76..5e3e02d8e5 100644
--- a/ports/espressif/common-hal/_bleio/Connection.c
+++ b/ports/espressif/common-hal/_bleio/Connection.c
@@ -248,7 +248,7 @@ STATIC int _discovered_characteristic_cb(uint16_t conn_handle,
         ((chr->properties & BLE_GATT_CHR_PROP_WRITE) != 0 ? CHAR_PROP_WRITE : 0) |
         ((chr->properties & BLE_GATT_CHR_PROP_WRITE_NO_RSP) != 0 ? CHAR_PROP_WRITE_NO_RESPONSE : 0);
 
-    // Call common_hal_bleio_characteristic_construct() to initalize some fields and set up evt handler.
+    // Call common_hal_bleio_characteristic_construct() to initialize some fields and set up evt handler.
     common_hal_bleio_characteristic_construct(
         characteristic, service, chr->val_handle, uuid,
         props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,
diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
index 232614ce32..b58234c9a8 100644
--- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
+++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c
@@ -119,7 +119,7 @@ void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alar
     for (uint8_t i = 1; i <= 14; i++) {
         if ((touch_channel_mask & 1 << i) != 0) {
             touch_pad_t touch_channel = (touch_pad_t)i;
-            // intialize touchpad
+            // initialize touchpad
             peripherals_touch_init(touch_channel);
 
             // wait for touch data to reset
@@ -166,7 +166,7 @@ void alarm_touch_touchalarm_prepare_for_deep_sleep(void) {
     peripherals_touch_never_reset(false);
     peripherals_touch_reset();
 
-    // intialize touchpad
+    // initialize touchpad
     peripherals_touch_init(touch_channel);
 
     #if !defined(CONFIG_IDF_TARGET_ESP32)
diff --git a/ports/espressif/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c
index bb6ef7f975..42db2f18bd 100644
--- a/ports/espressif/common-hal/pulseio/PulseIn.c
+++ b/ports/espressif/common-hal/pulseio/PulseIn.c
@@ -123,7 +123,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu
     rmt_config_t config = RMT_DEFAULT_CONFIG_RX(pin->number, channel);
     config.rx_config.filter_en = true;
     config.rx_config.idle_threshold = 30000; // 30*3=90ms idle required to register a sequence
-    config.clk_div = 240; // All measurements are divided by 3 to accomodate 65ms pulses
+    config.clk_div = 240; // All measurements are divided by 3 to accommodate 65ms pulses
     rmt_config(&config);
     rmt_driver_install(channel, 1000, 0); // TODO: pick a more specific buffer size?
 
diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c
index 2cb1e6254b..519885a032 100644
--- a/ports/espressif/common-hal/pwmio/PWMOut.c
+++ b/ports/espressif/common-hal/pwmio/PWMOut.c
@@ -197,7 +197,7 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
     if (!taken || self->variable_frequency) {
         ledc_timer_rst(LEDC_LOW_SPEED_MODE, self->tim_handle.timer_num);
         reserved_timer_freq[self->tim_handle.timer_num] = 0;
-        // if timer isn't varfreq this will be off aleady
+        // if timer isn't varfreq this will be off already
         varfreq_timers[self->tim_handle.timer_num] = false;
         never_reset_tim[self->tim_handle.timer_num] = false;
     }
diff --git a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
index 07b97cf9a3..088f4a15dc 100644
--- a/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
+++ b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -69,7 +69,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
         .unit = unit,
     };
 
-    // Reinitalize same unit, CHANNEL_1 with different parameters.
+    // Reinitialize same unit, CHANNEL_1 with different parameters.
     peripherals_pcnt_reinit(&pcnt_config_channel_1);
 
     self->pin_a = pin_a->number;
diff --git a/ports/espressif/i2s_lcd_driver.h b/ports/espressif/i2s_lcd_driver.h
index 0002d6b564..27c4e66b06 100644
--- a/ports/espressif/i2s_lcd_driver.h
+++ b/ports/espressif/i2s_lcd_driver.h
@@ -44,7 +44,7 @@ typedef struct {
 } i2s_lcd_config_t;
 
 /**
- * @brief Initilize i2s lcd driver.
+ * @brief Initialize i2s lcd driver.
  *
  * @param config configuration of i2s
  *
diff --git a/ports/litex/boards/fomu/fomu-spi.ld b/ports/litex/boards/fomu/fomu-spi.ld
index e7db25b0c5..33ba3db686 100644
--- a/ports/litex/boards/fomu/fomu-spi.ld
+++ b/ports/litex/boards/fomu/fomu-spi.ld
@@ -93,7 +93,7 @@ SECTIONS
 
         . = ALIGN(4);
         _etext = .;        /* define a global symbol at end of code */
-        _sidata = _etext;  /* This is used by the startup in order to initialize the .data secion */
+        _sidata = _etext;  /* This is used by the startup in order to initialize the .data section */
     } >FLASH_FIRMWARE
 
     /* Uninitialized data section */
diff --git a/ports/litex/common-hal/neopixel_write/__init__.c b/ports/litex/common-hal/neopixel_write/__init__.c
index e7e5600fb1..b26bbac695 100644
--- a/ports/litex/common-hal/neopixel_write/__init__.c
+++ b/ports/litex/common-hal/neopixel_write/__init__.c
@@ -72,7 +72,7 @@ static void ledda_init(void) {
     // Set clock register to 12 MHz / 64 kHz - 1
     ledda_write((12000000 / 64000) - 1, LEDDBR);
 
-    // Ensure LED "breathe" effect is diabled
+    // Ensure LED "breathe" effect is disabled
     ledda_write(0, LEDDBCRR);
     ledda_write(0, LEDDBCFR);
 
diff --git a/ports/litex/crt0-vexriscv.S b/ports/litex/crt0-vexriscv.S
index 0419acf851..0517711865 100644
--- a/ports/litex/crt0-vexriscv.S
+++ b/ports/litex/crt0-vexriscv.S
@@ -6,7 +6,7 @@
 
 _start:
   j crt_init
-  # This sentinal ensures that this program is loaded
+  # This sentinel ensures that this program is loaded
   # to RAM when loaded using dfu-util.
   #.word 0x17ab0f23
   #.word 0x10001000
diff --git a/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c b/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
index 88d0453065..c757a28e6e 100644
--- a/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
+++ b/ports/mimxrt10xx/common-hal/neopixel_write/__init__.c
@@ -64,7 +64,7 @@ void PLACE_IN_ITCM(common_hal_neopixel_write)(const digitalio_digitalinout_obj_t
     const uint32_t pin = digitalinout->pin->number;
 
     __disable_irq();
-    // Enable DWT in debug core. Useable when interrupts disabled, as opposed to Systick->VAL
+    // Enable DWT in debug core. Usable when interrupts disabled, as opposed to Systick->VAL
     CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
     DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
     DWT->CYCCNT = 0;
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 2267a582a4..412ff86cde 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -241,7 +241,7 @@ FLASHER ?=
 
 ifeq ($(FLASHER),)
 
-# Also update to bootloader settting to validate application and skip checksum ( app valid = 0x0001, crc = 0x0000 )
+# Also update to bootloader setting to validate application and skip checksum ( app valid = 0x0001, crc = 0x0000 )
 flash: $(BUILD)/firmware.hex
 	nrfjprog --program $< --sectorerase -f $(MCU_VARIANT)
 	nrfjprog --erasepage $(BOOT_SETTING_ADDR) -f $(MCU_VARIANT)
diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h b/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h
index d04bec3fbf..e0f005d9b0 100644
--- a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h
+++ b/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h
@@ -286,7 +286,7 @@ typedef struct
 /**@brief L2CAP event structure. */
 typedef struct
 {
-    uint16_t conn_handle;                                   /**< Connection Handle on which the event occured. */
+    uint16_t conn_handle;                                   /**< Connection Handle on which the event occurred. */
     uint16_t local_cid;                                     /**< Local Channel ID of the L2CAP channel, or
                                                                  @ref BLE_L2CAP_CID_INVALID if not present. */
     union
diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h
index 933f398b57..a624338ceb 100644
--- a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h
+++ b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h
@@ -287,7 +287,7 @@ typedef struct
 /**@brief L2CAP event structure. */
 typedef struct
 {
-    uint16_t conn_handle;                                   /**< Connection Handle on which the event occured. */
+    uint16_t conn_handle;                                   /**< Connection Handle on which the event occurred. */
     uint16_t local_cid;                                     /**< Local Channel ID of the L2CAP channel, or
                                                                  @ref BLE_L2CAP_CID_INVALID if not present. */
     union
diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h
index 24001fb12a..3def7d6783 100644
--- a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h
+++ b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h
@@ -275,8 +275,8 @@ typedef struct
  * If the application returns from the fault handler the SoftDevice will call NVIC_SystemReset().
  *
  * @note It is recommended to either perform a reset in the fault handler or to let the SoftDevice reset the device.
- *       Otherwise SoC peripherals may behave in an undefined way. For example, the RADIO peripherial may
- *       continously transmit packets.
+ *       Otherwise SoC peripherals may behave in an undefined way. For example, the RADIO peripheral may
+ *       continuously transmit packets.
  *
  * @note This callback is executed in HardFault context, thus SVC functions cannot be called from the fault callback.
  *
diff --git a/ports/nrf/boards/feather_nrf52840_express/README.md b/ports/nrf/boards/feather_nrf52840_express/README.md
index 8d515010f9..88a78a20fd 100644
--- a/ports/nrf/boards/feather_nrf52840_express/README.md
+++ b/ports/nrf/boards/feather_nrf52840_express/README.md
@@ -104,7 +104,7 @@ Parsing hex file.
 Erasing user available code and UICR flash areas.
 Applying system reset.
 Checking that the area to write is not protected.
-Programing device.
+Programming device.
 Applying system reset.
 Run.
 ```
diff --git a/ports/nrf/boards/hiibot_bluefi/pins.c b/ports/nrf/boards/hiibot_bluefi/pins.c
index ba1910dc9d..7e0e0a94f4 100644
--- a/ports/nrf/boards/hiibot_bluefi/pins.c
+++ b/ports/nrf/boards/hiibot_bluefi/pins.c
@@ -117,7 +117,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_P1_13) },
     { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_P1_13) },
 
-    // P28~P33/D28~D33 connecte into QSPI FlashROM (W25Q16JV_IQ)
+    // P28~P33/D28~D33 connected into QSPI FlashROM (W25Q16JV_IQ)
 
     { MP_ROM_QSTR(MP_QSTR_P34), MP_ROM_PTR(&pin_P0_22) },
     { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_P0_22) },
diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md b/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md
index 5c41fdb7cf..7040507ba6 100644
--- a/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md
+++ b/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md
@@ -8,11 +8,11 @@ We've also routed two I2C buses, 2 SPI buses, eleven GPIO, dedicated
 
 ## CircuitPython Pin Defs
 
-CircuitPython pin definitions, while simialr to other boards represent a slight departure from just the typical `A` and `D` pin definitions. The majority of general pins are labled as `G` (or alternatively, `BUS`,) as the MicroMod system they build on uses those names to specify pins that may not be specficially analog or digital.
+CircuitPython pin definitions, while similar to other boards represent a slight departure from just the typical `A` and `D` pin definitions. The majority of general pins are labeled as `G` (or alternatively, `BUS`,) as the MicroMod system they build on uses those names to specify pins that may not be specficially analog or digital.
 
 This can be somewhat confusing, especially around the analog pins. Here's a quick pin-map:
 
-MicroMod Pin # | ATP Pin Label | Pin Definition | Additional Definitons | Pin/Port Reference | Notes
+MicroMod Pin # | ATP Pin Label | Pin Definition | Additional Definitions | Pin/Port Reference | Notes
 :--------------|:--------------|:--------------|:-----------------------|:-------------------|:------
 8 | G11 | | | (Not Connected) |
 10 | D0 | D0 | | P0_27 |
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 1c3c829c5b..828ff8806d 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -190,7 +190,7 @@ STATIC uint32_t ble_stack_enable(void) {
         return err_code;
     }
 
-    // Increase the GATT Server attribute size to accomodate both the CircuitPython built-in service
+    // Increase the GATT Server attribute size to accommodate both the CircuitPython built-in service
     // and anything the user does.
     memset(&ble_conf, 0, sizeof(ble_conf));
     // Each increment to the BLE_GATTS_ATTR_TAB_SIZE_DEFAULT multiplier costs 1408 bytes.
@@ -529,7 +529,7 @@ STATIC bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) {
 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) {
     if (self->scan_results != NULL) {
         if (!shared_module_bleio_scanresults_get_done(self->scan_results)) {
-            mp_raise_bleio_BluetoothError(translate("Scan already in progess. Stop with stop_scan."));
+            mp_raise_bleio_BluetoothError(translate("Scan already in progress. Stop with stop_scan."));
         }
         self->scan_results = NULL;
     }
diff --git a/ports/nrf/common-hal/_bleio/Characteristic.c b/ports/nrf/common-hal/_bleio/Characteristic.c
index df86654c70..e911e5a1e3 100644
--- a/ports/nrf/common-hal/_bleio/Characteristic.c
+++ b/ports/nrf/common-hal/_bleio/Characteristic.c
@@ -283,7 +283,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
         }
 
         // Write with response will return NRF_ERROR_BUSY if the response has not been received.
-        // Write without reponse will return NRF_ERROR_RESOURCES if too many writes are pending.
+        // Write without response will return NRF_ERROR_RESOURCES if too many writes are pending.
         if (err_code == NRF_ERROR_BUSY || err_code == NRF_ERROR_RESOURCES) {
             // We could wait for an event indicating the write is complete, but just retrying is easier.
             RUN_BACKGROUND_TASKS;
diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nrf/common-hal/_bleio/Connection.c
index 0d8d8c32f0..69e6945d21 100644
--- a/ports/nrf/common-hal/_bleio/Connection.c
+++ b/ports/nrf/common-hal/_bleio/Connection.c
@@ -528,7 +528,7 @@ STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio
             (gattc_char->char_props.write ? CHAR_PROP_WRITE : 0) |
             (gattc_char->char_props.write_wo_resp ? CHAR_PROP_WRITE_NO_RESPONSE : 0);
 
-        // Call common_hal_bleio_characteristic_construct() to initalize some fields and set up evt handler.
+        // Call common_hal_bleio_characteristic_construct() to initialize some fields and set up evt handler.
         common_hal_bleio_characteristic_construct(
             characteristic, m_char_discovery_service, gattc_char->handle_value, uuid,
             props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,
diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c
index 718b28c7fe..75bfb60342 100644
--- a/ports/nrf/common-hal/_bleio/__init__.c
+++ b/ports/nrf/common-hal/_bleio/__init__.c
@@ -249,7 +249,7 @@ void common_hal_bleio_gattc_write(uint16_t handle, uint16_t conn_handle, mp_buff
         }
 
         // Write with response will return NRF_ERROR_BUSY if the response has not been received.
-        // Write without reponse will return NRF_ERROR_RESOURCES if too many writes are pending.
+        // Write without response will return NRF_ERROR_RESOURCES if too many writes are pending.
         if (err_code == NRF_ERROR_BUSY || err_code == NRF_ERROR_RESOURCES) {
             // We could wait for an event indicating the write is complete, but just retrying is easier.
             MICROPY_VM_HOOK_LOOP;
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index cd4114dcfb..7824175605 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -55,7 +55,7 @@ void common_hal_mcu_disable_interrupts() {
         // Unlike __disable_irq(), this should only be called the first time
         // "is_nested_critical_region" is sd's equivalent of our nesting count
         // so a nested call would store 0 in the global and make the later
-        // exit call not actually reenable interrupts
+        // exit call not actually re-enable interrupts
         //
         // This only disables interrupts of priority 2 through 7; levels 0, 1,
         // and 4, are exclusive to softdevice and should never be used, so
diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nrf/common-hal/pwmio/PWMOut.c
index f73e3d3952..6171f5eb76 100644
--- a/ports/nrf/common-hal/pwmio/PWMOut.c
+++ b/ports/nrf/common-hal/pwmio/PWMOut.c
@@ -94,7 +94,7 @@ STATIC void reset_single_pwmout(uint8_t i) {
 
     for (int ch = 0; ch < CHANNELS_PER_PWM; ch++) {
         pwm_seq[i][ch] = (1 << 15); // polarity = 0
-        pwm->PSEL.OUT[ch] = 0xFFFFFFFF; // disconnnect from I/O
+        pwm->PSEL.OUT[ch] = 0xFFFFFFFF; // disconnect from I/O
     }
 }
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 99effcea2f..4726d51c55 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -65,7 +65,7 @@
 // This also includes mpconfigboard.h.
 #include "py/circuitpy_mpconfig.h"
 
-// Definitions that might be overriden by mpconfigboard.h
+// Definitions that might be overridden by mpconfigboard.h
 
 #ifndef CIRCUITPY_INTERNAL_NVM_SIZE
 #define CIRCUITPY_INTERNAL_NVM_SIZE (8 * 1024)
diff --git a/ports/nrf/supervisor/qspi_flash.c b/ports/nrf/supervisor/qspi_flash.c
index df80671e64..2ae166d3ad 100644
--- a/ports/nrf/supervisor/qspi_flash.c
+++ b/ports/nrf/supervisor/qspi_flash.c
@@ -59,7 +59,7 @@ static int sck_delay_saved = 0;
 void qspi_disable(void) {
     // If VBUS is detected, no need to disable QSPI
     if (NRF_QSPI->ENABLE && !(NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk)) {
-        // Keep CS high when QSPI is diabled
+        // Keep CS high when QSPI is disabled
         nrf_gpio_cfg_output(MICROPY_QSPI_CS);
         nrf_gpio_pin_write(MICROPY_QSPI_CS, 1);
 
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
index 778da1ab62..520d10263c 100644
--- a/ports/raspberrypi/bindings/cyw43/__init__.c
+++ b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -84,7 +84,7 @@ const mp_obj_type_t cyw43_pin_type = {
 //|     The low 4 bits, ``m``, are the power management mode:
 //|      * 0: disabled
 //|      * 1: aggressive power saving which reduces wifi throughput
-//|      * 2: Power saving with high througput
+//|      * 2: Power saving with high throughput
 //|
 //|     The next 8 bits, ``r``, specify "the maximum time to wait before going back to sleep" for power management mode 2. The units of ``r`` are 10ms.
 //|
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
index 67508f16c8..06fe350cb6 100644
--- a/ports/raspberrypi/common-hal/ssl/SSLSocket.c
+++ b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -257,7 +257,7 @@ mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t
     } else if (ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
         // If handshake is not finished, read attempt may end up in protocol
         // wanting to write next handshake message. The same may happen with
-        // renegotation.
+        // renegotiation.
         ret = MP_EWOULDBLOCK;
     }
     DEBUG("raising errno [error case] %d\n", ret);
@@ -276,7 +276,7 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
     } else if (ret == MBEDTLS_ERR_SSL_WANT_READ) {
         // If handshake is not finished, write attempt may end up in protocol
         // wanting to read next handshake message. The same may happen with
-        // renegotation.
+        // renegotiation.
         ret = MP_EWOULDBLOCK;
     }
     DEBUG("raising errno [error case] %d\n", ret);
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index ae14d29ade..2ed19a96e7 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -176,7 +176,7 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
 
     common_hal_wifi_radio_stop_ap(self);
 
-    // Channel can only be changed after inital powerup and config of ap.
+    // Channel can only be changed after initial powerup and config of ap.
     // Defaults to 1 if not set or invalid (i.e. 13)
     cyw43_wifi_ap_set_channel(&cyw43_state, (const uint32_t)channel);
 
diff --git a/ports/raspberrypi/common-hal/wifi/__init__.c b/ports/raspberrypi/common-hal/wifi/__init__.c
index e5a646f88f..91a45e8d92 100644
--- a/ports/raspberrypi/common-hal/wifi/__init__.c
+++ b/ports/raspberrypi/common-hal/wifi/__init__.c
@@ -107,7 +107,7 @@ void raise_cyw_error(int err) {
             mp_errno = MP_ETIMEDOUT;
             break;
         default:
-            mp_raise_OSError_msg_varg(translate("Unkown error code %d"), err);
+            mp_raise_OSError_msg_varg(translate("Unknown error code %d"), err);
     }
     mp_raise_OSError(mp_errno);
 }
diff --git a/ports/stm/boards/common_default.ld b/ports/stm/boards/common_default.ld
index 0c7efd01d4..7c96a42bc5 100644
--- a/ports/stm/boards/common_default.ld
+++ b/ports/stm/boards/common_default.ld
@@ -24,7 +24,7 @@ SECTIONS
         . = ALIGN(4);
         KEEP(*(.isr_vector)) /* Startup code */
 
-        /* This first flash block is 16K annd the isr vectors only take up
+        /* This first flash block is 16K and the isr vectors only take up
            about 400 bytes. Micropython pads this with files, but this didn't
            work with the size of Circuitpython's ff object. */
 
diff --git a/ports/stm/boards/common_nvm.ld b/ports/stm/boards/common_nvm.ld
index 91e453bfd9..1d10db8a31 100644
--- a/ports/stm/boards/common_nvm.ld
+++ b/ports/stm/boards/common_nvm.ld
@@ -26,7 +26,7 @@ SECTIONS
         . = ALIGN(4);
         KEEP(*(.isr_vector)) /* Startup code */
 
-        /* This first flash block is 16K annd the isr vectors only take up
+        /* This first flash block is 16K and the isr vectors only take up
            about 400 bytes. Micropython pads this with files, but this didn't
            work with the size of Circuitpython's ff object. */
 
diff --git a/ports/stm/boards/common_tcm.ld b/ports/stm/boards/common_tcm.ld
index 9e677862d3..d7be64d667 100644
--- a/ports/stm/boards/common_tcm.ld
+++ b/ports/stm/boards/common_tcm.ld
@@ -26,7 +26,7 @@ SECTIONS
         . = ALIGN(4);
         KEEP(*(.isr_vector)) /* Startup code */
 
-        /* This first flash block is 16K annd the isr vectors only take up
+        /* This first flash block is 16K and the isr vectors only take up
            about 400 bytes. Micropython pads this with files, but this didn't
            work with the size of Circuitpython's ff object. */
 
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index 6e4da86dd7..0ed5b161a1 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -14,7 +14,7 @@ LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F401xd_fs.ld
 
 # Disable ulab as we're nearly out of space on this board due to
-# INTERNAL_FLASH_FILESYSTEM.  It can probably be reenabled if we enable
+# INTERNAL_FLASH_FILESYSTEM.  It can probably be re-enabled if we enable
 # lto for this port, and if other stuff hasn't been added in the
 # meantime
 CIRCUITPY_AESIO = 0
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index e4d362bbfa..0edf3d40e4 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -54,7 +54,7 @@ uint8_t display_init_sequence[] = {
     0xc5, 1, 0x0e,     // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x20, 0,     // _INVOFF //MISMATCh 0x2a vs 0x20
     0x36, 1, 0x60,     // _MADCTL bottom to top refresh
-    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05,     // COLMOD - 16bit color
     0xe0, 0x10, 0x02, 0x1c, 0x07, 0x12,
diff --git a/ports/stm/boards/swan_r5/tests/enable_3v3.py b/ports/stm/boards/swan_r5/tests/enable_3v3.py
index ba955c4f58..c32bbc58b8 100644
--- a/ports/stm/boards/swan_r5/tests/enable_3v3.py
+++ b/ports/stm/boards/swan_r5/tests/enable_3v3.py
@@ -5,7 +5,7 @@ import digitalio
 import supervisor
 import time
 
-# Scenario: Enable 3V3 pin defintiion
+# Scenario: Enable 3V3 pin definition
 # Then the symbol "board.ENABLE_3V3" is defined
 assert board.ENABLE_3V3 is not None
 
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio.h b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
index 2f670c8505..77f11dc82f 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio.h
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio.h
@@ -35,7 +35,7 @@ extern "C" {
 
 /**
  * @brief   How many milliseconds of audio can fit in the audio buffer(s).
- * Interrupts for recieved data fire at half this duration / twice the frequency.
+ * Interrupts for received data fire at half this duration / twice the frequency.
  */
 #ifndef MEMS_AUDIO_MS_BUFFER
 #define MEMS_AUDIO_MS_BUFFER (1)
diff --git a/ports/stm/common-hal/neopixel_write/__init__.c b/ports/stm/common-hal/neopixel_write/__init__.c
index 99529793fa..9eb30a4509 100644
--- a/ports/stm/common-hal/neopixel_write/__init__.c
+++ b/ports/stm/common-hal/neopixel_write/__init__.c
@@ -67,7 +67,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
     uint32_t p_mask = pin_mask(digitalinout->pin->number);
 
     __disable_irq();
-    // Enable DWT in debug core. Useable when interrupts disabled, as opposed to Systick->VAL
+    // Enable DWT in debug core. Usable when interrupts disabled, as opposed to Systick->VAL
     CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
     DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
     DWT->CYCCNT = 0;
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 0e4c6dbd48..b04bc2158c 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -456,7 +456,7 @@ STATIC mp_obj_t extra_coverage(void) {
     {
         mp_printf(&mp_plat_print, "# VM\n");
 
-        // call mp_execute_bytecode with invalide bytecode (should raise NotImplementedError)
+        // call mp_execute_bytecode with invalid bytecode (should raise NotImplementedError)
         mp_obj_fun_bc_t fun_bc;
         fun_bc.bytecode = (const byte *)"\x01"; // just needed for n_state
         mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, mp_obj_t, 1);
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index a6365aa6a3..8373c07a5c 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -147,7 +147,7 @@ STATIC mp_obj_t mod_os_remove(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
 
     // Note that POSIX requires remove() to be able to delete a directory
-    // too (act as rmdir()). This is POSIX extenstion to ANSI C semantics
+    // too (act as rmdir()). This is POSIX extension to ANSI C semantics
     // of that function. But Python remove() follows ANSI C, and explicitly
     // required to raise exception on attempt to remove a directory. Thus,
     // call POSIX unlink() here.
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index 7a578becb9..4adef8a380 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -73,7 +73,7 @@ STATIC mp_obj_t mod_termios_tcsetattr(mp_obj_t fd_in, mp_obj_t when_in, mp_obj_t
         // We don't export TCSANOW and friends to save on code space. Then
         // common lazy sense says that passing 0 should be godo enough, and
         // it is e.g. for glibc. But for other libc's it's not, so set just
-        // treat 0 as defauling to TCSANOW.
+        // treat 0 as defaulting to TCSANOW.
         when = TCSANOW;
     }
 
diff --git a/py/asmthumb.c b/py/asmthumb.c
index 547e5bedc1..1b1923370b 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -281,7 +281,7 @@ bool asm_thumb_b_n_label(asm_thumb_t *as, uint label) {
 
 #define OP_BCC_N(cond, byte_offset) (0xd000 | ((cond) << 8) | (((byte_offset) >> 1) & 0x00ff))
 
-// all these bit arithmetics need coverage testing!
+// all these bit arithmetic need coverage testing!
 #define OP_BCC_W_HI(cond, byte_offset) (0xf000 | ((cond) << 6) | (((byte_offset) >> 10) & 0x0400) | (((byte_offset) >> 14) & 0x003f))
 #define OP_BCC_W_LO(byte_offset) (0x8000 | ((byte_offset) & 0x2000) | (((byte_offset) >> 1) & 0x0fff))
 
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 641da7814f..b4cbe83b95 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -393,7 +393,7 @@ extern const struct _mp_obj_module_t nvm_module;
 // Native modules that are weak links can be accessed directly
 // by prepending their name with an underscore. This list should correspond to
 // MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS, assuming you want the native modules
-// to be accessible when overriden.
+// to be accessible when overridden.
 
 #define MICROPY_PORT_BUILTIN_MODULE_ALT_NAMES
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index c849a12851..046957751a 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -526,7 +526,7 @@ CFLAGS += -DUSB_NUM_ENDPOINT_PAIRS=$(USB_NUM_ENDPOINT_PAIRS)
 CIRCUITPY_USTACK ?= 0
 CFLAGS += -DCIRCUITPY_USTACK=$(CIRCUITPY_USTACK)
 
-# for decompressing utlities
+# for decompressing utilities
 CIRCUITPY_ZLIB ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB)
 
diff --git a/py/compile.c b/py/compile.c
index 432aeca561..3668bee320 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3477,7 +3477,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
             }
         }
 
-        // update maximim number of labels needed
+        // update maximum number of labels needed
         if (comp->next_label > max_num_labels) {
             max_num_labels = comp->next_label;
         }
diff --git a/py/formatfloat.c b/py/formatfloat.c
index d75cfc6658..4671f3348b 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -39,7 +39,7 @@
   Routine for converting a arbitrary floating
   point number into a string.
 
-  The code in this funcion was inspired from Fred Bayer's pdouble.c.
+  The code in this function was inspired from Fred Bayer's pdouble.c.
   Since pdouble.c was released as Public Domain, I'm releasing this
   code as public domain as well.
 
@@ -390,7 +390,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         --dec;
         --num_digits_left;
         if (digit_index <= 0) {
-            // Once we get below 1.0, we scale up f instead of calculting
+            // Once we get below 1.0, we scale up f instead of calculating
             // negative powers of 10 in u_base.  This provides better
             // renditions of exact decimals like 1/16 etc.
             f *= FPCONST(10.0);
diff --git a/py/makecompresseddata.py b/py/makecompresseddata.py
index 9603de8713..1bce3e8e83 100644
--- a/py/makecompresseddata.py
+++ b/py/makecompresseddata.py
@@ -24,7 +24,7 @@ def check_non_ascii(msg):
 
 
 # Replace  with .
-# Trival scheme to demo/test.
+# Trivial scheme to demo/test.
 def space_compression(error_strings):
     for line in error_strings:
         check_non_ascii(line)
diff --git a/py/mkrules.mk b/py/mkrules.mk
index ef0f66117d..09ed82ac5b 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -13,7 +13,7 @@ OBJ_EXTRA_ORDER_DEPS =
 # tree.
 #
 # So for example, py/map.c would have an object file name py/map.o
-# The object files will go into the build directory and mantain the same
+# The object files will go into the build directory and maintain the same
 # directory structure as the source tree. So the final dependency will look
 # like this:
 #
@@ -142,7 +142,7 @@ endif
 ifneq ($(PROG),)
 # Build a standalone executable (unix does this)
 
-# The executable should have an .exe extension for builds targetting 'pure'
+# The executable should have an .exe extension for builds targeting 'pure'
 # Windows, i.e. msvc or mingw builds, but not when using msys or cygwin's gcc.
 COMPILER_TARGET := $(shell $(CC) -dumpmachine)
 ifneq (,$(findstring mingw,$(COMPILER_TARGET)))
diff --git a/py/objexcept.c b/py/objexcept.c
index 24fb564e23..e05c3ca8d7 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -176,7 +176,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     mp_obj_tuple_t *o_tuple;
     if (n_args == 0) {
-        // No args, can use the empty tuple straightaway
+        // No args, can use the empty tuple straight away
         o_tuple = (mp_obj_tuple_t *)&mp_const_empty_tuple_obj;
     } else {
         // Try to allocate memory for the tuple containing the args
diff --git a/py/objtype.c b/py/objtype.c
index 76b9551be8..5b04c361e1 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -649,7 +649,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     mp_obj_t member = dest[0];
     if (member != MP_OBJ_NULL) {
         if (!(self->base.type->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
-            // Class doesn't have any special accessors to check so return straightaway
+            // Class doesn't have any special accessors to check so return straight away
             return;
         }
 
diff --git a/py/runtime.c b/py/runtime.c
index 9227594d83..5d8be5672f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -414,7 +414,7 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                     } else {
                         // standard precision is enough for right-shift
                         if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * MP_BITS_PER_BYTE)) {
-                            // Shifting to big amounts is underfined behavior
+                            // Shifting to big amounts is undefined behavior
                             // in C and is CPU-dependent; propagate sign bit.
                             rhs_val = sizeof(lhs_val) * MP_BITS_PER_BYTE - 1;
                         }
diff --git a/py/sequence.c b/py/sequence.c
index 7befc85763..42a9a4a0ae 100644
--- a/py/sequence.c
+++ b/py/sequence.c
@@ -171,7 +171,7 @@ bool mp_seq_cmp_objs(mp_uint_t op, const mp_obj_t *items1, size_t len1, const mp
             continue;
         }
 
-        // Othewise, if they are not equal, we can have final decision based on them
+        // Otherwise, if they are not equal, we can have final decision based on them
         if (op == MP_BINARY_OP_EQUAL) {
             // In particular, if we are checking for equality, here're the answer
             return false;
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 29c9b49d3f..94879e14d4 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -71,7 +71,7 @@
 
 //| wake_alarm: Optional[circuitpython_typing.Alarm]
 //| """The most recently triggered alarm. If CircuitPython was sleeping, the alarm that woke it from sleep.
-//| If no alarm occured since the last hard reset or soft restart, value is ``None``.
+//| If no alarm occurred since the last hard reset or soft restart, value is ``None``.
 //| """
 //|
 
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
index 82bfae4286..c47f482e74 100644
--- a/shared-bindings/alarm/__init__.h
+++ b/shared-bindings/alarm/__init__.h
@@ -33,7 +33,7 @@
 #include "common-hal/digitalio/DigitalInOut.h"
 
 // Light sleep fully self-contained and does not exit user code. It will return
-// the same alarm object that was orignally passed in, unlike deep sleep, which
+// the same alarm object that was originally passed in, unlike deep sleep, which
 // must create an identical copy due to the VM reset
 extern mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj_t *alarms);
 
diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c
index 948910c45e..9fe525dfe2 100644
--- a/shared-bindings/audiomp3/__init__.c
+++ b/shared-bindings/audiomp3/__init__.c
@@ -33,7 +33,7 @@
 
 //| """Support for MP3-compressed audio files
 //|
-//| For more infomration about working with MP3 files in CircuitPython,
+//| For more information about working with MP3 files in CircuitPython,
 //| see `this CircuitPython Essentials Learn guide page
 //| `_.
 //| """
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 1195e1811d..f965e504f2 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -530,14 +530,14 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_li
 //|     value: int,
 //|     close: Optional[bool] = True,
 //| ) -> None:
-//|     """Draw a polygon conecting points on provided bitmap with provided value
+//|     """Draw a polygon connecting points on provided bitmap with provided value
 //|
 //|     :param bitmap dest_bitmap: Destination bitmap that will be written into
 //|     :param ReadableBuffer xs: x-pixel position of the polygon's vertices
 //|     :param ReadableBuffer ys: y-pixel position of the polygon's vertices
 //|     :param int value: Bitmap palette index that will be written into the
 //|            line in the destination bitmap
-//|     :param bool close: (Optional) Wether to connect first and last point. (True)
+//|     :param bool close: (Optional) Whether to connect first and last point. (True)
 //|
 //|     .. code-block:: Python
 //|
@@ -630,7 +630,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_polygon_obj, 0, bitmaptools_obj_draw
 //|     """Inserts pixels from ``data`` into the rectangle of width×height pixels with the upper left corner at ``(x,y)``
 //|
 //|     The values from ``data`` are taken modulo the number of color values
-//|     avalable in the destination bitmap.
+//|     available in the destination bitmap.
 //|
 //|     If x1 or y1 are not specified, they are taken as 0.  If x2 or y2
 //|     are not specified, or are given as -1, they are taken as the width
@@ -722,7 +722,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_arrayblit_obj, 0, bitmaptools_arrayblit);
 //|     :param typing.BinaryIO file: A file opened in binary mode
 //|     :param int bits_per_pixel: Number of bits per pixel.  Values 1, 2, 4, 8, 16, 24, and 32 are supported;
 //|     :param int element_size: Number of bytes per element.  Values of 1, 2, and 4 are supported, except that 24 ``bits_per_pixel`` requires 1 byte per element.
-//|     :param bool reverse_pixels_in_element: If set, the first pixel in a word is taken from the Most Signficant Bits; otherwise, it is taken from the Least Significant Bits.
+//|     :param bool reverse_pixels_in_element: If set, the first pixel in a word is taken from the Most Significant Bits; otherwise, it is taken from the Least Significant Bits.
 //|     :param bool swap_bytes_in_element: If the ``element_size`` is not 1, then reverse the byte order of each element read.
 //|     :param bool reverse_rows: Reverse the direction of the row loading (required for some bitmap images).
 //|     """
@@ -782,7 +782,7 @@ STATIC mp_obj_t bitmaptools_readinto(size_t n_args, const mp_obj_t *pos_args, mp
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_readinto_obj, 0, bitmaptools_readinto);
 
 //| class DitherAlgorithm:
-//|     """Identifies the algorith for dither to use"""
+//|     """Identifies the algorithm for dither to use"""
 //|
 //|     Atkinson: "DitherAlgorithm"
 //|     """The classic Atkinson dither, often associated with the Hypercard esthetic"""
diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index 971ed2f676..99b99b37ea 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -43,7 +43,7 @@
 //| Common container for board base pin names. These will vary from board to
 //| board so don't expect portability when using this module.
 //|
-//| Another common use of this module is to use serial communciation buses with
+//| Another common use of this module is to use serial communication buses with
 //| the default pins and settings.  For more information about serial communcication
 //| in CircuitPython, see the :mod:`busio`.
 //|
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 77d7036c2e..a10dc8efad 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -157,7 +157,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
 
     // Always initially allocate the UART object within the long-lived heap.
     // This is needed to avoid crashes with certain UART implementations which
-    // cannot accomodate being moved after creation. (See
+    // cannot accommodate being moved after creation. (See
     // https://github.com/adafruit/circuitpython/issues/1056)
     busio_uart_obj_t *self = m_new_ll_obj_with_finaliser(busio_uart_obj_t);
     self->base.type = &busio_uart_type;
diff --git a/shared-bindings/countio/__init__.c b/shared-bindings/countio/__init__.c
index 25e9c7d630..0d412cc17f 100644
--- a/shared-bindings/countio/__init__.c
+++ b/shared-bindings/countio/__init__.c
@@ -11,7 +11,7 @@
 
 //| """Support for edge counting
 //|
-//| The `countio` module contains logic to read and count edge transistions
+//| The `countio` module contains logic to read and count edge transitions
 //|
 //| For more information on the applications of counting edges, see
 //| `this Learn Guide on sequential circuits
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 3fcd1d082b..77dc8aecee 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -61,7 +61,7 @@
 //|
 
 //| def release_displays() -> None:
-//|     """Releases any actively used displays so their busses and pins can be used again. This will also
+//|     """Releases any actively used displays so their buses and pins can be used again. This will also
 //|     release the builtin display on boards that have one. You will need to reinitialize it yourself
 //|     afterwards. This may take seconds to complete if an active EPaperDisplay is refreshing.
 //|
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index c8d24294f8..8264ebe612 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -64,7 +64,7 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args,
         timestamp = supervisor_ticks_ms();
     }
 
-    (void)mp_obj_get_int_truncated(timestamp); // ensure that timesamp is an integer
+    (void)mp_obj_get_int_truncated(timestamp); // ensure that timestamp is an integer
     common_hal_keypad_event_construct(self, key_number, args[ARG_pressed].u_bool, timestamp);
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 49723dbb9e..1c623f4bed 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -56,7 +56,7 @@
 //|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
 //|
 //|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to the rows.
-//|         :param Sequence[microcontroller.Pin] column_pins: The pins attached to the colums.
+//|         :param Sequence[microcontroller.Pin] column_pins: The pins attached to the columns.
 //|         :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,
diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c
index 13a8f25e6d..6f8ac8f42b 100644
--- a/shared-bindings/microcontroller/ResetReason.c
+++ b/shared-bindings/microcontroller/ResetReason.c
@@ -39,31 +39,31 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, UNKNOWN, RESET_REASON_UNKNO
 MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESCUE_DEBUG, RESET_REASON_RESCUE_DEBUG);
 
 //| class ResetReason:
-//|     """The reason the microntroller was last reset"""
+//|     """The reason the microcontroller was last reset"""
 //|
 //|     POWER_ON: object
 //|     """The microcontroller was started from power off."""
 //|
 //|     BROWNOUT: object
-//|     """The microntroller was reset due to too low a voltage."""
+//|     """The microcontroller was reset due to too low a voltage."""
 //|
 //|     SOFTWARE: object
-//|     """The microntroller was reset from software."""
+//|     """The microcontroller was reset from software."""
 //|
 //|     DEEP_SLEEP_ALARM: object
-//|     """The microntroller was reset for deep sleep and restarted by an alarm."""
+//|     """The microcontroller was reset for deep sleep and restarted by an alarm."""
 //|
 //|     RESET_PIN: object
-//|     """The microntroller was reset by a signal on its reset pin. The pin might be connected to a reset button."""
+//|     """The microcontroller was reset by a signal on its reset pin. The pin might be connected to a reset button."""
 //|
 //|     WATCHDOG: object
 //|     """The microcontroller was reset by its watchdog timer."""
 //|
 //|     UNKNOWN: object
-//|     """The microntroller restarted for an unknown reason."""
+//|     """The microcontroller restarted for an unknown reason."""
 //|
 //|     RESCUE_DEBUG: object
-//|     """The microntroller was reset by the rescue debug port."""
+//|     """The microcontroller was reset by the rescue debug port."""
 //|
 MAKE_ENUM_MAP(mcu_reset_reason) {
     MAKE_ENUM_MAP_ENTRY(reset_reason, POWER_ON),
diff --git a/shared-bindings/paralleldisplay/ParallelBus.c b/shared-bindings/paralleldisplay/ParallelBus.c
index 42b4c788c7..ad9a1efdce 100644
--- a/shared-bindings/paralleldisplay/ParallelBus.c
+++ b/shared-bindings/paralleldisplay/ParallelBus.c
@@ -39,7 +39,7 @@
 
 //| class ParallelBus:
 //|     """Manage updating a display over 8-bit parallel bus in the background while Python code runs. This
-//|     protocol may be refered to as 8080-I Series Parallel Interface in datasheets. It doesn't handle
+//|     protocol may be referred to as 8080-I Series Parallel Interface in datasheets. It doesn't handle
 //|     display initialization."""
 //|
 //|     def __init__(
diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index fae55db317..09a48f01aa 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -42,7 +42,7 @@
 //|     ) -> None:
 //|         """Create an IncrementalEncoder object associated with the given pins. It tracks the positional
 //|         state of an incremental rotary encoder (also known as a quadrature encoder.) Position is
-//|         relative to the position when the object is contructed.
+//|         relative to the position when the object is constructed.
 //|
 //|         :param ~microcontroller.Pin pin_a: First pin to read pulses from.
 //|         :param ~microcontroller.Pin pin_b: Second pin to read pulses from.
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 6818316768..08b4138202 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -776,7 +776,7 @@ void common_hal_bitmaptools_dither(displayio_bitmap_t *dest_bitmap, displayio_bi
 
     bitmaptools_dither_algorithm_info_t *info = algorithms[algorithm];
     // rowdata holds 3 rows of data.  Each one is larger than the input
-    // bitmap's width, beacuse `mx` extra pixels are allocated at the start and
+    // bitmap's width, because `mx` extra pixels are allocated at the start and
     // end of the row so that no conditionals are needed when storing the error data.
     int16_t rowdata[(width + 2 * info->mx) * 3];
     int16_t *rows[3] = {
diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index d396a2ba56..3f90a06e46 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -277,8 +277,8 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
 
     opt_write_n(&opt, DHCP_OPT_SERVER_ID, 4, &d->ip.addr);
     opt_write_n(&opt, DHCP_OPT_SUBNET_MASK, 4, &d->nm.addr);
-    opt_write_n(&opt, DHCP_OPT_ROUTER, 4, &d->ip.addr); // aka gateway; can have mulitple addresses
-    opt_write_u32(&opt, DHCP_OPT_DNS, DEFAULT_DNS); // can have mulitple addresses
+    opt_write_n(&opt, DHCP_OPT_ROUTER, 4, &d->ip.addr); // aka gateway; can have multiple addresses
+    opt_write_u32(&opt, DHCP_OPT_DNS, DEFAULT_DNS); // can have multiple addresses
     opt_write_u32(&opt, DHCP_OPT_IP_LEASE_TIME, DEFAULT_LEASE_TIME_S);
     *opt++ = DHCP_OPT_END;
     dhcp_socket_sendto(&d->udp, &dhcp_msg, opt - (uint8_t *)&dhcp_msg, 0xffffffff, PORT_DHCP_CLIENT);
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 87219d18f5..aeb92f59d3 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -643,7 +643,7 @@ friendly_repl_reset:
             // If the user gets to here and interrupts are disabled then
             // they'll never see the prompt, traceback etc. The USB REPL needs
             // interrupts to be enabled or no transfers occur. So we try to
-            // do the user a favor and reenable interrupts.
+            // do the user a favor and re-enable interrupts.
             if (query_irq() == IRQ_STATE_DISABLED) {
                 enable_irq(IRQ_STATE_ENABLED);
                 mp_hal_stdout_tx_str("MPY: enabling IRQs\r\n");
diff --git a/supervisor/shared/external_flash/external_flash.c b/supervisor/shared/external_flash/external_flash.c
index 141ad7e5f8..f72518ac50 100644
--- a/supervisor/shared/external_flash/external_flash.c
+++ b/supervisor/shared/external_flash/external_flash.c
@@ -97,7 +97,7 @@ static bool write_flash(uint32_t address, const uint8_t *data, uint32_t data_len
     if (flash_device == NULL) {
         return false;
     }
-    // Don't bother writing if the data is all 1s. Thats equivalent to the flash
+    // Don't bother writing if the data is all 1s. That's equivalent to the flash
     // state after an erase.
     if (!flash_device->no_erase_cmd) {
         // Only do this if the device has an erase command
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 5112b17ebf..8709d3c356 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -116,7 +116,7 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     if (boot_in_safe_mode) {
         return SAFE_MODE_USER;
     }
-    // Restore the original state of the saved word if no reset occured during our wait period.
+    // Restore the original state of the saved word if no reset occurred during our wait period.
     port_set_saved_word(reset_state);
     return SAFE_MODE_NONE;
 }
diff --git a/supervisor/shared/translate/compressed_string.h b/supervisor/shared/translate/compressed_string.h
index e331a5866f..f524010db5 100644
--- a/supervisor/shared/translate/compressed_string.h
+++ b/supervisor/shared/translate/compressed_string.h
@@ -62,7 +62,7 @@
 //
 // The "data" / "tail" construct is so that the struct's last member is a
 // "flexible array".  However, the _only_ member is not permitted to be
-// a flexible member, so we have to declare the first byte as a separte
+// a flexible member, so we have to declare the first byte as a separate
 // member of the structure.
 //
 // For translations where length needs 8 bits, this saves about 1.5
diff --git a/tests/basics/annotate_var.py b/tests/basics/annotate_var.py
index 3f767e4a73..a359b229b1 100644
--- a/tests/basics/annotate_var.py
+++ b/tests/basics/annotate_var.py
@@ -1,4 +1,4 @@
-# test PEP 526, varible annotations
+# test PEP 526, variable annotations
 
 x: int
 print("x" in globals())
diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 22d370e943..1b6f072da5 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -1,4 +1,4 @@
-# Tests for deques with "check overflow" flag and other extensions
+# Tests for dequeues with "check overflow" flag and other extensions
 # wrt to CPython.
 try:
     try:
@@ -22,7 +22,7 @@ try:
 except ValueError:
     print("ValueError")
 
-# Only fixed-size deques are supported, so length arg is mandatory
+# Only fixed-size dequeues are supported, so length arg is mandatory
 try:
     deque(())
 except TypeError:
diff --git a/tests/basics/struct1.py b/tests/basics/struct1.py
index ec29ea9080..2ac900bbc7 100644
--- a/tests/basics/struct1.py
+++ b/tests/basics/struct1.py
@@ -79,7 +79,7 @@ try:
 except:
     print("Unknown type")
 
-# Initially repitition counters were supported only for strings,
+# Initially repetition counters were supported only for strings,
 # but later were implemented for all.
 print(struct.unpack("<3B2h", b"foo\x12\x34\xff\xff"))
 print(struct.pack("<3B", 1, 2, 3))
diff --git a/tests/cpydiff/core_fstring_repr.py b/tests/cpydiff/core_fstring_repr.py
index fcadcbf1b9..df80abf795 100644
--- a/tests/cpydiff/core_fstring_repr.py
+++ b/tests/cpydiff/core_fstring_repr.py
@@ -2,7 +2,7 @@
 categories: Core
 description: f-strings don't support the !r, !s, and !a conversions
 cause: MicroPython is optimised for code space.
-workaround: Use repr(), str(), and ascii() explictly.
+workaround: Use repr(), str(), and ascii() explicitly.
 """
 
 
diff --git a/tests/cpydiff/core_import_path.py b/tests/cpydiff/core_import_path.py
index 04fc4bd5bb..959fd571f5 100644
--- a/tests/cpydiff/core_import_path.py
+++ b/tests/cpydiff/core_import_path.py
@@ -1,7 +1,7 @@
 """
 categories: Core,import
 description: __path__ attribute of a package has a different type (single string instead of list of strings) in MicroPython
-cause: MicroPython does't support namespace packages split across filesystem. Beyond that, MicroPython's import system is highly optimized for minimal memory usage.
+cause: MicroPython doesn't support namespace packages split across filesystem. Beyond that, MicroPython's import system is highly optimized for minimal memory usage.
 workaround: Details of import handling is inherently implementation dependent. Don't rely on such details in portable applications.
 """
 import modules
diff --git a/tests/cpydiff/core_import_split_ns_pkgs.py b/tests/cpydiff/core_import_split_ns_pkgs.py
index 62bf337a22..5c92b63124 100644
--- a/tests/cpydiff/core_import_split_ns_pkgs.py
+++ b/tests/cpydiff/core_import_split_ns_pkgs.py
@@ -1,6 +1,6 @@
 """
 categories: Core,import
-description: MicroPython does't support namespace packages split across filesystem.
+description: MicroPython doesn't support namespace packages split across filesystem.
 cause: MicroPython's import system is highly optimized for simplicity, minimal memory usage, and minimal filesystem search overhead.
 workaround: Don't install modules belonging to the same namespace package in different directories. For MicroPython, it's recommended to have at most 3-component module search paths: for your current application, per-user (writable), system-wide (non-writable).
 """
diff --git a/tests/extmod/framebuf_palette.py b/tests/extmod/framebuf_palette.py
index 84db834c15..f5b15fda73 100644
--- a/tests/extmod/framebuf_palette.py
+++ b/tests/extmod/framebuf_palette.py
@@ -30,6 +30,6 @@ fbd.blit(fbc, 0, 0, -1, palette)
 
 print(fbd.pixel(0, 0) == fg)
 print(fbd.pixel(7, 7) == fg)
-print(fbd.pixel(8, 8) == 0)  # Ouside blit
+print(fbd.pixel(8, 8) == 0)  # Outside blit
 print(fbd.pixel(0, 1) == bg)
 print(fbd.pixel(1, 0) == bg)
diff --git a/tests/extmod/uctypes_sizeof_layout.py b/tests/extmod/uctypes_sizeof_layout.py
index 2108e81502..c710ecde95 100644
--- a/tests/extmod/uctypes_sizeof_layout.py
+++ b/tests/extmod/uctypes_sizeof_layout.py
@@ -13,7 +13,7 @@ desc = {
 # uctypes.NATIVE is default
 print(uctypes.sizeof(desc) == uctypes.sizeof(desc, uctypes.NATIVE))
 
-# Here we assume that that we run on a platform with convential ABI
+# Here we assume that that we run on a platform with conventional ABI
 # (which rounds up structure size based on max alignment). For platforms
 # where that doesn't hold, this tests should be just disabled in the runner.
 print(uctypes.sizeof(desc, uctypes.NATIVE) > uctypes.sizeof(desc, uctypes.LITTLE_ENDIAN))
diff --git a/tests/extmod/utimeq1.py b/tests/extmod/utimeq1.py
index ddbc969afb..688e5b834f 100644
--- a/tests/extmod/utimeq1.py
+++ b/tests/extmod/utimeq1.py
@@ -125,7 +125,7 @@ assert edge_case(MODULO_HALF - 1, -100) == diff
 
 # We expect diff to be always positive, per the definition of heappop() which should return
 # the smallest value.
-# This is the edge case where this invariant breaks, due to assymetry of two's-complement
+# This is the edge case where this invariant breaks, due to asymmetry of two's-complement
 # range - there's one more negative integer than positive, so heappushing values like below
 # will then make ticks_diff() return the minimum negative value. We could make heappop
 # return them in a different order, but ticks_diff() result would be the same. Conclusion:
diff --git a/tests/thread/thread_lock1.py b/tests/thread/thread_lock1.py
index e7066402ca..f49f57ce83 100644
--- a/tests/thread/thread_lock1.py
+++ b/tests/thread/thread_lock1.py
@@ -32,7 +32,7 @@ print(lock.locked())
 with lock:
     print(lock.locked())
 
-# test that lock is unlocked if an error is rasied
+# test that lock is unlocked if an error is raised
 try:
     with lock:
         print(lock.locked())
diff --git a/tools/analyze_heap_dump.py b/tools/analyze_heap_dump.py
index d9b3dda599..ede990929d 100755
--- a/tools/analyze_heap_dump.py
+++ b/tools/analyze_heap_dump.py
@@ -446,7 +446,7 @@ def do_all_the_things(
                     current_allocation = 1
                 elif block_state == AT_TAIL and current_allocation > 0:
                     # In gc_free the logging happens before the tail is freed. So checking
-                    # current_allocation > 0 ensures we only extend an allocation thats started.
+                    # current_allocation > 0 ensures we only extend an allocation that's started.
                     current_allocation += 1
                 longest_free = max(longest_free, current_free)
         # if current_free > 0:
diff --git a/tools/cpboard.py b/tools/cpboard.py
index 1f399d1dfc..46ae659d34 100644
--- a/tools/cpboard.py
+++ b/tools/cpboard.py
@@ -357,7 +357,7 @@ class CPboard:
         else:
             serials = [serial for serial in os.listdir("/dev/serial/by-path") if portstr in serial]
             if len(serials) != 1:
-                raise RuntimeError("Can't find excatly one matching usb serial device")
+                raise RuntimeError("Can't find exactly one matching usb serial device")
             self.device = os.path.realpath("/dev/serial/by-path/" + serials[0])
             self.usb_dev = device
 
diff --git a/tools/gendoc.py b/tools/gendoc.py
index f3df853e49..e7eb011b7c 100644
--- a/tools/gendoc.py
+++ b/tools/gendoc.py
@@ -523,7 +523,7 @@ def main():
         description="Generate documentation for pyboard API from C files."
     )
     cmd_parser.add_argument(
-        "--outdir", metavar="", default="gendoc-out", help="ouput directory"
+        "--outdir", metavar="", default="gendoc-out", help="output directory"
     )
     cmd_parser.add_argument("--format", default="html", help="output format: html or rst")
     cmd_parser.add_argument("files", nargs="+", help="input files")
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 8cdc3eb774..b2856889b9 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -164,7 +164,7 @@ def system(cmd):
 
 
 def convert_path(path):
-    # Perform variable substituion.
+    # Perform variable substitution.
     for name, value in VARS.items():
         path = path.replace("$({})".format(name), value)
     # Convert to absolute path (so that future operations don't rely on
diff --git a/tools/preprocess_frozen_modules.py b/tools/preprocess_frozen_modules.py
index 6c41c4cd43..80ab547f3b 100755
--- a/tools/preprocess_frozen_modules.py
+++ b/tools/preprocess_frozen_modules.py
@@ -21,10 +21,10 @@ def version_string(path=None, *, valid_semver=False):
         version = tag.strip().decode("utf-8", "strict")
     except subprocess.CalledProcessError:
         describe = subprocess.check_output("git describe --tags", shell=True, cwd=path)
-        tag, additional_commits, commitish = (
+        tag, additional_commits, committish = (
             describe.strip().decode("utf-8", "strict").rsplit("-", maxsplit=2)
         )
-        commitish = commitish[1:]
+        committish = committish[1:]
         if valid_semver:
             version_info = semver.parse_version_info(tag)
             if not version_info.prerelease:
@@ -33,12 +33,12 @@ def version_string(path=None, *, valid_semver=False):
                     + "-alpha.0.plus."
                     + additional_commits
                     + "+"
-                    + commitish
+                    + committish
                 )
             else:
-                version = tag + ".plus." + additional_commits + "+" + commitish
+                version = tag + ".plus." + additional_commits + "+" + committish
         else:
-            version = commitish
+            version = committish
     return version
 
 
diff --git a/tools/pydfu.py b/tools/pydfu.py
index ce34b08a58..57a8708e5d 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -483,7 +483,7 @@ def get_memory_layout(device):
 
 
 def list_dfu_devices(*args, **kwargs):
-    """Prints a lits of devices detected in DFU mode."""
+    """Prints a list of devices detected in DFU mode."""
     devices = get_dfu_devices(*args, **kwargs)
     if not devices:
         raise SystemExit("No DFU capable devices found")
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 88127112e8..a92530fd93 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1323,7 +1323,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1779,7 +1779,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -2570,7 +2570,7 @@ align_oc_decl_colon             = false    # true/false
 
 # (OC) Whether to not align parameters in an Objectve-C message call if first
 # colon is not on next line of the message call (the same way Xcode does
-# aligment)
+# alignment)
 align_oc_msg_colon_xcode_like   = false    # true/false
 
 #
@@ -2916,28 +2916,28 @@ pp_define_at_level              = false    # true/false
 pp_ignore_define_body           = false    # true/false
 
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
 pp_indent_extern                = true     # true/false
 
 # Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
+# Only applies to the indent of the preprocessor that the braces are directly
 # inside of.
 #
 # Default: true
diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index cc4b80f4a9..24171f9c68 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -101,7 +101,7 @@ def run(args):
 
 def show_help():
     print("usage: verifygitlog.py [-v -n -h] ...")
-    print("-v  : increase verbosity, can be speficied multiple times")
+    print("-v  : increase verbosity, can be specified multiple times")
     print("-n  : do not print multi-line suggestions")
     print("-h  : print this help message and exit")
     print("... : arguments passed to git log to retrieve commits to verify")

From c2d506b1fa931744a6ff4ca0a54c60aaac68f095 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Sat, 18 Mar 2023 19:38:40 -0400
Subject: [PATCH 2053/2403] add 'deque` to known words.

---
 .codespell/ignore-words.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
index 76849278a0..39eb42e0df 100644
--- a/.codespell/ignore-words.txt
+++ b/.codespell/ignore-words.txt
@@ -14,4 +14,5 @@ astroid
 busses
 cyphertext
 dum
+deque
 extint

From b88e76d3a48c0d1e3e00e35255b68621d286b07d Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 14 Mar 2023 19:02:41 +0100
Subject: [PATCH 2054/2403] Add builtin display support with shared board.I2C
 to Lolin S2 Pico

---
 ports/espressif/boards/lolin_s2_pico/board.c | 68 ++++++++++++++++++++
 ports/espressif/boards/lolin_s2_pico/pins.c  |  3 +
 2 files changed, 71 insertions(+)

diff --git a/ports/espressif/boards/lolin_s2_pico/board.c b/ports/espressif/boards/lolin_s2_pico/board.c
index b3c8cb4191..e2c24bb22a 100644
--- a/ports/espressif/boards/lolin_s2_pico/board.c
+++ b/ports/espressif/boards/lolin_s2_pico/board.c
@@ -27,8 +27,76 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/board/__init__.h"
+#include "shared-bindings/displayio/I2CDisplay.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/busio/I2C.h"
+#include "supervisor/shared/board.h"
+#include "shared-bindings/board/__init__.h"
+
+uint8_t display_init_sequence[] = { // SSD1306
+    0xAE, 0, // DISPLAY_OFF
+    0x20, 1, 0x00, // Set memory addressing to horizontal mode.
+    0x81, 1, 0xcf, // set contrast control
+    0xA1, 0, // Column 127 is segment 0
+    0xA6, 0, // Normal display
+    0xc8, 0, // Normal display
+    0xA8, 1, 0x1f, // Mux ratio is height-1
+    0xd5, 1, 0x80, // Set divide ratio
+    0xd9, 1, 0xf1, // Set pre-charge period
+    0xda, 1, 0x02, // Set com configuration to 2 if height is 32 and width not 64
+    0xdb, 1, 0x40, // Set vcom configuration
+    0x8d, 1, 0x14, // Enable charge pump
+    0xAF, 0, // DISPLAY_ON
+};
+
+static void display_init(void) {
+    busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);
+
+    displayio_i2cdisplay_obj_t *bus = &displays[0].i2cdisplay_bus;
+    bus->base.type = &displayio_i2cdisplay_type;
+    common_hal_displayio_i2cdisplay_construct(bus,
+        i2c,
+        0x3c,
+        &pin_GPIO18 // reset
+        );
+
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
+        128, // Width
+        32, // Height
+        0, // 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
+        0x21, // Set column command
+        0x22, // Set row command
+        44, // Write ram command
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        NULL, // no backlight pin
+        0x81, // brightness command
+        1.0f, // brightness
+        true, // single_byte_bounds
+        true, // data as commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        false, // SH1107_addressing
+        0); // backlight pwm frequency
+}
 
 void board_init(void) {
+    // init display
+    display_init();
     // Debug UART
     #ifdef DEBUG
     common_hal_never_reset_pin(&pin_GPIO43);
diff --git a/ports/espressif/boards/lolin_s2_pico/pins.c b/ports/espressif/boards/lolin_s2_pico/pins.c
index 5c3f1f4db5..1afd508f03 100644
--- a/ports/espressif/boards/lolin_s2_pico/pins.c
+++ b/ports/espressif/boards/lolin_s2_pico/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_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
@@ -52,5 +53,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_GPIO36) }, // Not labelled on booard, on schematic
     { MP_ROM_QSTR(MP_QSTR_MISO),  MP_ROM_PTR(&pin_GPIO37) },// Not labelled on booard, on schematic
     { MP_ROM_QSTR(MP_QSTR_I2C), 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_module_globals_table);

From 9e630a565ed9d8b2259596d3ea526498baf94f67 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Sun, 19 Mar 2023 15:08:29 -0700
Subject: [PATCH 2055/2403] Updated block_device type annotation

---
 shared-bindings/storage/__init__.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 9e82654bc9..3f0dc5f6f3 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -252,7 +252,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_enable_usb_drive),  MP_ROM_PTR(&storage_enable_usb_drive_obj) },
 
 //| class VfsFat:
-//|     def __init__(self, block_device: str) -> None:
+//|     def __init__(self, block_device: BlockDevice) -> None:
 //|         """Create a new VfsFat filesystem around the given block device.
 //|
 //|         :param block_device: Block device the the filesystem lives on"""
@@ -267,7 +267,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     ...
 //|
 //|     @staticmethod
-//|     def mkfs(self) -> None:
+//|     def mkfs(self, block_device: BlockDevice) -> None:
 //|         """Format the block device, deleting any data that may have been there.
 //|
 //|         **Limitations**: On SAMD21 builds, `mkfs()` will raise ``OSError(22)`` when

From ce2c3d7dc5d5824ff2f6df302ffde229214915f2 Mon Sep 17 00:00:00 2001
From: hathach 
Date: Mon, 20 Mar 2023 12:12:30 +0700
Subject: [PATCH 2056/2403] revert deque(s)

---
 .codespell/ignore-words.txt  | 1 +
 docs/library/collections.rst | 4 ++--
 tests/basics/deque2.py       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
index 39eb42e0df..5a54e22f0d 100644
--- a/.codespell/ignore-words.txt
+++ b/.codespell/ignore-words.txt
@@ -15,4 +15,5 @@ busses
 cyphertext
 dum
 deque
+deques
 extint
diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index 01882ba244..2cc1a215d1 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -16,8 +16,8 @@ Classes
 
 .. function:: deque(iterable, maxlen[, flags])
 
-    Dequeues (double-ended queues) are a list-like container that support O(1)
-    appends and pops from either side of the deque.  New dequeues are created
+    Deques (double-ended queues) are a list-like container that support O(1)
+    appends and pops from either side of the deque.  New deques are created
     using the following arguments:
 
         - *iterable* must be the empty tuple, and the new deque is created empty.
diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 1b6f072da5..22d370e943 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -1,4 +1,4 @@
-# Tests for dequeues with "check overflow" flag and other extensions
+# Tests for deques with "check overflow" flag and other extensions
 # wrt to CPython.
 try:
     try:
@@ -22,7 +22,7 @@ try:
 except ValueError:
     print("ValueError")
 
-# Only fixed-size dequeues are supported, so length arg is mandatory
+# Only fixed-size deques are supported, so length arg is mandatory
 try:
     deque(())
 except TypeError:

From ace25e83ce66c4f800cdbf3f2cd8f28996ef8e2b Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Mon, 20 Mar 2023 15:44:49 -0400
Subject: [PATCH 2057/2403] correcting vectorshape location property

---
 shared-module/vectorio/VectorShape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c
index 35131faa4f..fab12c664e 100644
--- a/shared-module/vectorio/VectorShape.c
+++ b/shared-module/vectorio/VectorShape.c
@@ -278,7 +278,7 @@ void common_hal_vectorio_vector_shape_set_location(vectorio_vector_shape_t *self
     mp_arg_validate_length(tuple_len, 2, MP_QSTR_location);
 
     mp_int_t x = mp_arg_validate_type_int(tuple_items[0], MP_QSTR_x);
-    mp_int_t y = mp_arg_validate_type_int(tuple_items[0], MP_QSTR_y);
+    mp_int_t y = mp_arg_validate_type_int(tuple_items[1], MP_QSTR_y);
     bool dirty = false;
     if (self->x != x) {
         check_bounds_and_set_x(self, x);

From bdf592089ae461434a03ba0f185dfce3d09953fb Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 17 Mar 2023 08:49:47 -0700
Subject: [PATCH 2058/2403] Fix .bin, .hex and .uf2 with new linker sections

Also, format perfbench output in table with reference timing from
the host.
---
 ports/mimxrt10xx/Makefile          | 10 ++--
 ports/mimxrt10xx/linking/common.ld | 29 +++++-----
 supervisor/linker.h                |  2 +-
 tests/perf_bench/benchrun.py       |  2 +-
 tests/run-perfbench.py             | 90 ++++++++++++++++++++++--------
 tools/cpboard.py                   | 25 +++++++--
 6 files changed, 110 insertions(+), 48 deletions(-)

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index c561b894d3..d3db4c44e3 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -182,18 +182,20 @@ $(BUILD)/firmware.elf: $(OBJ) $(LD_FILES)
 	$(STEPECHO) "LINK $@"
 	$(Q)$(CC) -o $@ $(LDFLAGS) $(filter-out %.ld, $^) -Wl,--print-memory-usage -Wl,--start-group $(LIBS) -Wl,--end-group
 
+# -R excludes sections from the output files.
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
-	$(Q)$(OBJCOPY) -O binary -j .flash_config -j .ivt -j .text -j .ARM.exidx -j .data -j .itcm -j .dtcm_data $^ $@
+	$(Q)$(OBJCOPY) -O binary -R .stack -R .dtcm_bss $^ $@
 
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
-	$(Q)$(OBJCOPY) -O binary -j .text -j .ARM.exidx -j .data -j .itcm -j .dtcm_data $^ $@-binpart
+	$(Q)$(OBJCOPY) -O binary -R .stack -R .dtcm_bss -R .ivt -R .flash_config $^ $@-binpart
 	$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -f MIMXRT10XX -c -o $@ $@-binpart
-	$(Q)rm $@-binpart
+
+# $(Q)rm $@-binpart
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
-	$(Q)$(OBJCOPY) -O ihex -j .flash_config -j .ivt -j .text -j .ARM.exidx -j .data -j .itcm -j .dtcm_data $< $@
+	$(Q)$(OBJCOPY) -O ihex -R .stack -R .dtcm_bss $< $@
 
 include $(TOP)/py/mkrules.mk
 
diff --git a/ports/mimxrt10xx/linking/common.ld b/ports/mimxrt10xx/linking/common.ld
index 61a9a2299f..461a9d89eb 100644
--- a/ports/mimxrt10xx/linking/common.ld
+++ b/ports/mimxrt10xx/linking/common.ld
@@ -6,7 +6,7 @@ Boards can setup reserved flash with _ld_reserved_flash_size in board.ld. */
 
 ENTRY(Reset_Handler)
 
-code_size = 2M;
+code_size = _ld_flash_size >= 4M ? 2M : 1M;
 _ld_default_stack_size = 20K;
 
 /* Default reserved flash to nothing. */
@@ -52,6 +52,20 @@ SECTIONS
         . = ALIGN(4);
     } > FLASH_IVT
 
+    /* Align for 256 ISR entries and place first in flash. Otherwise the UF2
+       bootloader can't find it because it uses its own flash_config and ivt. */
+    .isr_vector : ALIGN(4 * 256)
+    {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))         /* Startup code */
+        . = ALIGN(4);
+    } > ITCM AT> FLASH_FIRMWARE
+    _ld_isr_destination = ADDR(.isr_vector);
+    _ld_isr_flash_copy = LOADADDR(.isr_vector);
+    _ld_isr_size = SIZEOF(.isr_vector);
+    /* Used by the bootloader to start user code. */
+    __VECTOR_TABLE = LOADADDR(.isr_vector);
+
     .text :
     {
         . = ALIGN(4);
@@ -146,19 +160,6 @@ SECTIONS
     _ld_itcm_flash_copy = LOADADDR(.itcm);
     _ld_itcm_size = SIZEOF(.itcm);
 
-    /* Align for 256 ISR entries */
-    .isr_vector : ALIGN(4 * 256)
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))         /* Startup code */
-        . = ALIGN(4);
-    } > ITCM AT> FLASH_FIRMWARE
-    _ld_isr_destination = ADDR(.isr_vector);
-    _ld_isr_flash_copy = LOADADDR(.isr_vector);
-    _ld_isr_size = SIZEOF(.isr_vector);
-    /* Used by the bootloader to start user code. */
-    __VECTOR_TABLE = LOADADDR(.isr_vector);
-
     .dtcm_data :
     {
         . = ALIGN(4);
diff --git a/supervisor/linker.h b/supervisor/linker.h
index c6ee8b4218..9666c4ca12 100644
--- a/supervisor/linker.h
+++ b/supervisor/linker.h
@@ -33,7 +33,7 @@
 #define PLACE_IN_DTCM_DATA(name) name __attribute__((section(".dtcm_data." #name)))
 #define PLACE_IN_DTCM_BSS(name) name __attribute__((section(".dtcm_bss." #name)))
 // Don't inline ITCM functions because that may pull them out of ITCM into other sections.
-#define PLACE_IN_ITCM(name) __attribute__((section(".itcm." #name),noinline)) name
+#define PLACE_IN_ITCM(name) __attribute__((section(".itcm." #name),noinline,aligned(4))) name
 #else
 #define PLACE_IN_DTCM_DATA(name) name
 #define PLACE_IN_DTCM_BSS(name) name
diff --git a/tests/perf_bench/benchrun.py b/tests/perf_bench/benchrun.py
index 0092ecaa33..87b6489d07 100644
--- a/tests/perf_bench/benchrun.py
+++ b/tests/perf_bench/benchrun.py
@@ -4,7 +4,7 @@ def bm_run(N, M):
     except ImportError:
         import time
 
-        ticks_us = lambda: int(time.monotonic_ns() / 1000)
+        ticks_us = lambda: int(time.monotonic_ns() // 1000)
         ticks_diff = lambda a, b: a - b
 
     # Pick sensible parameters given N, M
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 5f299281fd..3d3639e057 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -7,8 +7,12 @@
 import os
 import subprocess
 import sys
+import time
 import argparse
 from glob import glob
+from rich.live import Live
+from rich.console import Console
+from rich.table import Table
 
 sys.path.append("../tools")
 import pyboard
@@ -37,7 +41,7 @@ def compute_stats(lst):
     return avg, var**0.5
 
 
-def run_script_on_target(target, script):
+def run_script_on_target(target, script, run_command=None):
     output = b""
     err = None
 
@@ -45,50 +49,72 @@ def run_script_on_target(target, script):
         # Run via pyboard interface
         try:
             target.enter_raw_repl()
+            start_ts = time.monotonic_ns()
             output = target.exec_(script)
+            if run_command:
+                start_ts = time.monotonic_ns()
+                output = target.exec_(run_command)
+            end_ts = time.monotonic_ns()
         except pyboard.PyboardError as er:
+            end_ts = time.monotonic_ns()
             err = er
+        finally:
+            target.exit_raw_repl()
     else:
         # Run local executable
         try:
+            if run_command:
+                script += run_command
+            start_ts = time.monotonic_ns()
             p = subprocess.run(
                 target, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, input=script
             )
+            end_ts = time.monotonic_ns()
             output = p.stdout
         except subprocess.CalledProcessError as er:
+            end_ts = time.monotonic_ns()
             err = er
 
-    return str(output.strip(), "ascii"), err
+    return str(output.strip(), "ascii"), err, (end_ts - start_ts) // 1000
 
 
 def run_feature_test(target, test):
     with open("feature_check/" + test + ".py", "rb") as f:
         script = f.read()
-    output, err = run_script_on_target(target, script)
+    output, err, _ = run_script_on_target(target, script)
     if err is None:
         return output
     else:
         return "CRASH: %r" % err
 
 
-def run_benchmark_on_target(target, script):
-    output, err = run_script_on_target(target, script)
+def run_benchmark_on_target(target, script, run_command=None):
+    output, err, runtime_us = run_script_on_target(target, script, run_command)
     if err is None:
         time, norm, result = output.split(None, 2)
         try:
-            return int(time), int(norm), result
+            return int(time), int(norm), result, runtime_us
         except ValueError:
-            return -1, -1, "CRASH: %r" % output
+            return -1, -1, "CRASH: %r" % output, runtime_us
     else:
-        return -1, -1, "CRASH: %r" % err
+        return -1, -1, "CRASH: %r" % err, runtime_us
 
 
-def run_benchmarks(target, param_n, param_m, n_average, test_list):
+def run_benchmarks(console, 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") != "native"
 
+    table = Table(show_header=True)
+    table.add_column("Test")
+    table.add_column("Time", justify="right")
+    table.add_column("Score", justify="right")
+    table.add_column("Ref Time", justify="right")
+
+    live = Live(table, console=console)
+    live.start()
+
     for test_file in sorted(test_list):
-        print(test_file + ": ", end="")
+        # print(test_file + ": ", end="")
 
         # Check if test should be skipped
         skip = (
@@ -99,6 +125,7 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
         )
         if skip:
             print("skip")
+            table.add_row(test_file, *(["skip"] * 6))
             continue
 
         # Create test script
@@ -106,7 +133,7 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
             test_script = f.read()
         with open(BENCH_SCRIPT_DIR + "benchrun.py", "rb") as f:
             test_script += f.read()
-        test_script += b"bm_run(%u, %u)\n" % (param_n, param_m)
+        bm_run = b"bm_run(%u, %u)\n" % (param_n, param_m)
 
         # Write full test script if needed
         if 0:
@@ -115,12 +142,15 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
 
         # Run MicroPython a given number of times
         times = []
+        runtimes = []
         scores = []
         error = None
         result_out = None
         for _ in range(n_average):
-            time, norm, result = run_benchmark_on_target(target, test_script)
-            if time < 0 or norm < 0:
+            self_time, norm, result, runtime_us = run_benchmark_on_target(
+                target, test_script, bm_run
+            )
+            if self_time < 0 or norm < 0:
                 error = result
                 break
             if result_out is None:
@@ -128,30 +158,43 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
             elif result != result_out:
                 error = "FAIL self"
                 break
-            times.append(time)
-            scores.append(1e6 * norm / time)
+            times.append(self_time)
+            runtimes.append(runtime_us)
+            scores.append(1e6 * norm / self_time)
 
         # Check result against truth if needed
         if error is None and result_out != "None":
-            _, _, result_exp = run_benchmark_on_target(PYTHON_TRUTH, test_script)
+            _, _, result_exp, _ = run_benchmark_on_target(PYTHON_TRUTH, test_script, bm_run)
             if result_out != result_exp:
                 error = "FAIL truth"
 
         if error is not None:
-            print(error)
+            print(test_file, error)
+            if error == "no matching params":
+                table.add_row(test_file, *([None] * 3))
+            else:
+                table.add_row(test_file, *(["error"] * 3))
         else:
             t_avg, t_sd = compute_stats(times)
+            r_avg, r_sd = compute_stats(runtimes)
             s_avg, s_sd = compute_stats(scores)
-            print(
-                "{:.2f} {:.4f} {:.2f} {:.4f}".format(
-                    t_avg, 100 * t_sd / t_avg, s_avg, 100 * s_sd / s_avg
-                )
+            # print(
+            #     "{:.2f} {:.4f} {:.2f} {:.4f} {:.2f} {:.4f}".format(
+            #         t_avg, 100 * t_sd / t_avg, s_avg, 100 * s_sd / s_avg, r_avg, 100 * r_sd / r_avg
+            #     )
+            # )
+            table.add_row(
+                test_file,
+                f"{t_avg:.2f}±{100 * t_sd / t_avg:.1f}%",
+                f"{s_avg:.2f}±{100 * s_sd / s_avg:.1f}%",
+                f"{r_avg:.2f}±{100 * r_sd / r_avg:.1f}%",
             )
             if 0:
                 print("  times: ", times)
                 print("  scores:", scores)
 
-        sys.stdout.flush()
+        live.update(table, refresh=True)
+    live.stop()
 
 
 def parse_output(filename):
@@ -268,9 +311,10 @@ def main():
     else:
         tests = sorted(args.files)
 
+    console = Console()
     print("N={} M={} n_average={}".format(N, M, n_average))
 
-    run_benchmarks(target, N, M, n_average, tests)
+    run_benchmarks(console, target, N, M, n_average, tests)
 
     if isinstance(target, pyboard.Pyboard):
         target.exit_raw_repl()
diff --git a/tools/cpboard.py b/tools/cpboard.py
index 658cf512a2..12d7d374a3 100644
--- a/tools/cpboard.py
+++ b/tools/cpboard.py
@@ -81,6 +81,7 @@ class REPL:
             else:
                 timeout_count += 1
                 if timeout is not None and timeout_count >= 100 * timeout:
+                    print("timeout")
                     raise TimeoutError(110, "timeout waiting for", ending)
                 time.sleep(0.01)
         return data
@@ -164,7 +165,10 @@ class Disk:
             self._path = mount[0][1]
         else:
             name = os.path.basename(dev)
-            sh.pmount("-tvfat", dev, name, _timeout=10)
+            try:
+                sh.pmount("-tvfat", dev, name, _timeout=10)
+            except sh.CommandNotFound:
+                raise ValueError()
             self.mountpoint = "/media/" + name
             self._path = self.mountpoint
 
@@ -516,7 +520,10 @@ class CPboard:
         if not part:
             return None
 
-        return Disk(part[0])
+        try:
+            return Disk(part[0])
+        except ValueError:
+            return None
 
     @property
     def firmware(self):
@@ -555,14 +562,17 @@ PyboardError = CPboardError
 class Pyboard:
     def __init__(self, device, baudrate=115200, user="micro", password="python", wait=0):
         self.board = CPboard.from_try_all(device, baudrate=baudrate, wait=wait)
-        with self.board.disk as disk:
-            disk.copy("skip_if.py")
+        disk = self.board.disk
+        if disk:
+            with disk as open_disk:
+                open_disk.copy("skip_if.py")
 
     def close(self):
         self.board.close()
 
     def enter_raw_repl(self):
         self.board.open()
+        self.board.repl.reset()
 
     def exit_raw_repl(self):
         self.close()
@@ -571,7 +581,12 @@ class Pyboard:
         return self.board.execfile(filename)
 
     def exec_(self, command, data_consumer=None):
-        output = self.board.exec(command, timeout=20000)
+        try:
+            output, error = self.board.repl.execute(command, timeout=20000, wait_for_response=True)
+        except OSError as e:
+            raise CPboardError("timeout", e)
+        if error:
+            raise CPboardError("exception", output, error)
         return output
 
 

From f56c221a501da028bcfedffab65a0858e68221d2 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Mon, 20 Mar 2023 17:23:49 -0400
Subject: [PATCH 2059/2403] removing need to use print format option.

---
 docs/design_guide.rst | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/design_guide.rst b/docs/design_guide.rst
index 784284892c..40ce285177 100644
--- a/docs/design_guide.rst
+++ b/docs/design_guide.rst
@@ -742,14 +742,7 @@ You could other examples if needed featuring different
 functionalities of the library.
 If you add additional examples, be sure to include them in the ``examples.rst``. Naming of the examples
 files should use the name of the library followed by a description, using underscore to separate them.
-When using print statements you should use the ``" ".format()`` format, as there are particular boards
-that are not capable to use f-strings.
 
-.. code-block:: python
-
-  text_to_display = "World!"
-
-  print("Hello {}".format(text_to_display))
 
 Sensor properties and units
 --------------------------------------------------------------------------------

From 0773a2bd6d741d791734a96a3cf5ca3e7fd3e167 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 20 Mar 2023 17:32:00 -0500
Subject: [PATCH 2060/2403] increment web_api_version

---
 supervisor/shared/web_workflow/web_workflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index c006a9e7cb..2caacbd39b 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -805,7 +805,7 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     _update_encoded_ip();
     // Note: this leverages the fact that C concats consecutive string literals together.
     mp_printf(&_socket_print,
-        "{\"web_api_version\": 1, "
+        "{\"web_api_version\": 2, "
         "\"version\": \"" MICROPY_GIT_TAG "\", "
         "\"build_date\": \"" MICROPY_BUILD_DATE "\", "
         "\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "

From 7ee3f30c174fd7143c1dcccb5ec3c9e1bdd4ede2 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 21 Mar 2023 07:06:46 +0530
Subject: [PATCH 2061/2403] rewrite `allocate_pystack` logic

---
 locale/circuitpython.pot | 12 ++++--------
 main.c                   | 22 +++++++---------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 560dffe6a4..0c7f823b5a 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -28,14 +28,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1252,6 +1244,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/main.c b/main.c
index 002c97c167..7b805b57b0 100644
--- a/main.c
+++ b/main.c
@@ -134,26 +134,18 @@ static void reset_devices(void) {
 
 #if MICROPY_ENABLE_PYSTACK
 STATIC supervisor_allocation *allocate_pystack(safe_mode_t safe_mode) {
-    mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
     #if CIRCUITPY_OS_GETENV && CIRCUITPY_SETTABLE_PYSTACK
-    // Fetch value if exists from settings.toml
-    // Leaves size to build default on any failure
-    if (safe_mode == SAFE_MODE_NONE || safe_mode == SAFE_MODE_USER) {
+    if (safe_mode == SAFE_MODE_NONE) {
+        mp_int_t pystack_size = CIRCUITPY_PYSTACK_SIZE;
         (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
-        // Check if value is valid
-        pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
-        if ((pystack_size < 384) || (pystack_size > 900000)) {
-            serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
-            pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
+        supervisor_allocation *pystack = allocate_memory(pystack_size >= 384 ? pystack_size : 0, false, false);
+        if (pystack) {
+            return pystack;
         }
+        serial_write_compressed(translate("Invalid CIRCUITPY_PYSTACK_SIZE\n"));
     }
     #endif
-    supervisor_allocation *pystack = allocate_memory(pystack_size, false, false);
-    if (pystack == NULL) {
-        serial_write_compressed(translate("\nInvalid CIRCUITPY_PYSTACK_SIZE\n\n\r"));
-        pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
-    }
-    return pystack;
+    return allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
 }
 #endif
 

From 36e4dc2588f705f6d0010aff33b8f618b2310355 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Fri, 17 Mar 2023 19:11:51 +0100
Subject: [PATCH 2062/2403] Adding 01space OLED 0.42 C3

---
 .../boards/01space_lcd042_esp32c3/board.c     | 102 ++++++++++++++++++
 .../01space_lcd042_esp32c3/mpconfigboard.h    |  40 +++++++
 .../01space_lcd042_esp32c3/mpconfigboard.mk   |   8 ++
 .../boards/01space_lcd042_esp32c3/pins.c      |  68 ++++++++++++
 .../boards/01space_lcd042_esp32c3/sdkconfig   |   6 ++
 5 files changed, 224 insertions(+)
 create mode 100644 ports/espressif/boards/01space_lcd042_esp32c3/board.c
 create mode 100644 ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.h
 create mode 100644 ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/01space_lcd042_esp32c3/pins.c
 create mode 100644 ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig

diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/board.c b/ports/espressif/boards/01space_lcd042_esp32c3/board.c
new file mode 100644
index 0000000000..56df21ab57
--- /dev/null
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/board.c
@@ -0,0 +1,102 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 microDev
+ * Copyright (c) 2021 skieast/Bruce Segal
+ *
+ * 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/board/__init__.h"
+#include "shared-bindings/displayio/I2CDisplay.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/busio/I2C.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
+#include "supervisor/shared/board.h"
+#include "shared-bindings/board/__init__.h"
+
+uint8_t display_init_sequence[] = { // SSD1306
+    0xAE, 0, // DISPLAY_OFF
+    0x20, 1, 0x00, // Set memory addressing to horizontal mode.
+    0x81, 1, 0xcf, // set contrast control
+    0xA1, 0, // Column 127 is segment 0
+    0xA6, 0, // Normal display
+    0xc8, 0, // Normal display
+    0xA8, 1, 0x3f, // Mux ratio is 1/64
+    0xd5, 1, 0x80, // Set divide ratio
+    0xd9, 1, 0xf1, // Set pre-charge period
+    0xda, 1, 0x12, // Set com configuration
+    0xdb, 1, 0x40, // Set vcom configuration
+    0x8d, 1, 0x14, // Enable charge pump
+    0xAF, 0, // DISPLAY_ON
+};
+
+void board_init(void) {
+    busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);
+
+    // What we would do if it wasn't the shared board I2C: (for reference)
+    // busio_i2c_obj_t *i2c = &displays[0].i2cdisplay_bus.inline_bus;
+    // common_hal_busio_i2c_construct(i2c, &pin_GPIO23, &pin_GPIO22, 100000, 0);
+    // common_hal_busio_i2c_never_reset(i2c);
+
+    displayio_i2cdisplay_obj_t *bus = &displays[0].i2cdisplay_bus;
+    bus->base.type = &displayio_i2cdisplay_type;
+    common_hal_displayio_i2cdisplay_construct(bus,
+        i2c,
+        0x3c,
+        NULL
+        );
+
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
+        72, // Width
+        40, // Height
+        28, // column start
+        28, // 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
+        0x21, // Set column command
+        0x22, // Set row command
+        44, // Write ram command
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        NULL, // no backlight pin
+        0x81, // brightness command
+        1.0f, // brightness
+        true, // single_byte_bounds
+        true, // data as commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        false, // SH1107_addressing
+        0); // backlight pwm frequency
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.h b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.h
new file mode 100644
index 0000000000..cae80fa78c
--- /dev/null
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Neradoc
+ *
+ * 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.
+ */
+
+// Board setup
+#define MICROPY_HW_BOARD_NAME       "01Space 0.42 OLED ESP32C3"
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FH4"
+
+// Status LED
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO2)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO6, .sda = &pin_GPIO5}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO9)
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
new file mode 100644
index 0000000000..e4467a3bbf
--- /dev/null
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0x01011ACE
+CIRCUITPY_CREATION_ID = 0x00C30042
+
+IDF_TARGET = esp32c3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/pins.c b/ports/espressif/boards/01space_lcd042_esp32c3/pins.c
new file mode 100644
index 0000000000..a28ffca6d2
--- /dev/null
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/pins.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Neradoc
+ *
+ * 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/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), 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_module_globals_table);
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig b/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig
new file mode 100644
index 0000000000..b75eaee69f
--- /dev/null
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig
@@ -0,0 +1,6 @@
+# chip is ESP32-C3 FH4
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-QTPy-ESP32C3"
+# end of LWIP

From ccd417cd8b6c31e787f7b7835d9ce1ca765490db Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:01:13 +0530
Subject: [PATCH 2063/2403] add esp specific modules to src patterns

---
 py/circuitpy_defns.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 79769e000e..94377238a0 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -182,6 +182,18 @@ endif
 ifeq ($(CIRCUITPY__EVE),1)
 SRC_PATTERNS += _eve/%
 endif
+ifeq ($(CIRCUITPY_ESPCAMERA),1)
+SRC_PATTERNS += espcamera/%
+endif
+ifeq ($(CIRCUITPY_ESPIDF),1)
+SRC_PATTERNS += espidf/%
+endif
+ifeq ($(CIRCUITPY_ESPNOW),1)
+SRC_PATTERNS += espnow/%
+endif
+ifeq ($(CIRCUITPY_ESPULP),1)
+SRC_PATTERNS += espulp/%
+endif
 ifeq ($(CIRCUITPY_FLOPPYIO),1)
 SRC_PATTERNS += floppyio/%
 endif

From 395bc0aac71941b25536b7ed82344200cefe1f54 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:01:21 +0530
Subject: [PATCH 2064/2403] don't run all jobs if changed files is empty

---
 tools/ci_set_matrix.py | 204 +++++++++++++++++++----------------------
 1 file changed, 95 insertions(+), 109 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index fa53c81829..f89b2133ac 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -116,26 +116,24 @@ def set_output(name: str, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def set_boards(build_all: bool):
-    # Get boards in json format
-    boards_info_json = build_board_info.get_board_mapping()
+def set_boards(build_all=False):
     all_board_ids = set()
-    port_to_boards = {}
+    boards_to_build = all_board_ids if build_all else set()
+
     board_to_port = {}
-    board_settings = {}
-    for board_id in boards_info_json:
-        info = boards_info_json[board_id]
-        if info.get("alias", False):
+    port_to_board = {}
+    board_setting = {}
+
+    for id, info in build_board_info.get_board_mapping().items():
+        if info.get("alias"):
             continue
-        all_board_ids.add(board_id)
         port = info["port"]
-        if port not in port_to_boards:
-            port_to_boards[port] = set()
-        port_to_boards[port].add(board_id)
-        board_to_port[board_id] = port
+        all_board_ids.add(id)
+        board_to_port[id] = port
+        port_to_board.setdefault(port, set()).add(id)
 
     def compute_board_settings(boards):
-        need = set(boards) - set(board_settings.keys())
+        need = set(boards) - set(board_setting.keys())
         if not need:
             return
 
@@ -146,78 +144,76 @@ def set_boards(build_all: bool):
             )
 
         with ThreadPoolExecutor(max_workers=os.cpu_count()) as ex:
-            board_settings.update(ex.map(get_settings, need))
-
-    boards_to_build = all_board_ids
+            board_setting.update(ex.map(get_settings, need))
 
     if not build_all:
-        boards_to_build = set()
-        board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
-        port_pattern = re.compile(r"^ports/([^/]+)/")
-        module_pattern = re.compile(
+        pattern_port = re.compile(r"^ports/([^/]+)/")
+        pattern_board = re.compile(r"^ports/[^/]+/boards/([^/]+)/")
+        pattern_module = re.compile(
             r"^(ports/[^/]+/(?:common-hal|bindings)|shared-bindings|shared-module)/([^/]+)/"
         )
-        for p in changed_files:
+
+        for file in changed_files:
+            if len(all_board_ids) == len(boards_to_build):
+                break
+
+            if any([file.startswith(path) for path in IGNORE_BOARD]):
+                continue
+
             # See if it is board specific
-            board_matches = board_pattern.search(p)
+            board_matches = pattern_board.search(file)
             if board_matches:
-                board = board_matches.group(1)
-                boards_to_build.add(board)
+                boards_to_build.add(board_matches.group(1))
                 continue
 
             # See if it is port specific
-            port_matches = port_pattern.search(p)
+            port_matches = pattern_port.search(file)
+            module_matches = pattern_module.search(file)
             port = port_matches.group(1) if port_matches else None
-            module_matches = module_pattern.search(p)
             if port and not module_matches:
                 if port != "unix":
-                    boards_to_build.update(port_to_boards[port])
-                continue
-
-            if any([p.startswith(d) for d in IGNORE_BOARD]):
+                    boards_to_build.update(port_to_board[port])
                 continue
 
             # As a (nearly) last resort, for some certain files, we compute the settings from the
-            # makefile for each board and determine whether to build them that way.
-            if p.startswith("frozen") or p.startswith("supervisor") or module_matches:
-                if port:
-                    board_ids = port_to_boards[port]
-                else:
-                    board_ids = all_board_ids
-                compute_board_settings(board_ids)
-                for board in board_ids:
-                    settings = board_settings[board]
+            # makefile for each board and determine whether to build them that way
+            if file.startswith("frozen") or file.startswith("supervisor") or module_matches:
+                boards = port_to_board[port] if port else all_board_ids
+                compute_board_settings(boards)
 
-                    # Check frozen files to see if they are in each board.
-                    frozen = settings.get("FROZEN_MPY_DIRS", "")
-                    if frozen and p.startswith("frozen") and p in frozen:
-                        boards_to_build.add(board)
-                        continue
+                for board in boards:
+                    settings = board_setting[board]
 
-                    # Check supervisor files. This is useful for limiting workflow changes to the
-                    # relevant boards.
-                    supervisor = settings["SRC_SUPERVISOR"]
-                    if p.startswith("supervisor"):
-                        if p in supervisor:
+                    # Check frozen files to see if they are in each board
+                    if file.startswith("frozen"):
+                        if file in settings.get("FROZEN_MPY_DIRS", ""):
                             boards_to_build.add(board)
                             continue
 
-                        web_workflow = settings["CIRCUITPY_WEB_WORKFLOW"]
-                        while web_workflow.startswith("$("):
-                            web_workflow = settings[web_workflow[2:-1]]
-                        if (
-                            p.startswith("supervisor/shared/web_workflow/static/")
-                            and web_workflow != "0"
-                        ):
+                    # Check supervisor files
+                    # This is useful for limiting workflow changes to the relevant boards
+                    if file.startswith("supervisor"):
+                        if file in settings["SRC_SUPERVISOR"]:
                             boards_to_build.add(board)
                             continue
 
+                        if file.startswith("supervisor/shared/web_workflow/static/"):
+                            web_workflow = settings["CIRCUITPY_WEB_WORKFLOW"]
+
+                            while web_workflow.startswith("$("):
+                                web_workflow = settings[web_workflow[2:-1]]
+
+                            if web_workflow != "0":
+                                boards_to_build.add(board)
+                                continue
+
                     # Check module matches
                     if module_matches:
                         module = module_matches.group(2) + "/"
                         if module in settings["SRC_PATTERNS"]:
                             boards_to_build.add(board)
                             continue
+
                 continue
 
             # Otherwise build it all
@@ -225,7 +221,7 @@ def set_boards(build_all: bool):
             break
 
     # Append previously failed boards
-    boards_to_build.update(last_failed_jobs.get("ports") or [])
+    boards_to_build.update(last_failed_jobs.get("ports", []))
 
     print("Building boards:", bool(boards_to_build))
 
@@ -249,64 +245,54 @@ def set_boards(build_all: bool):
     set_output("ports", json.dumps(port_to_boards_to_build))
 
 
-def set_docs(build_doc: bool):
-    if not build_doc:
-        if last_failed_jobs.get("docs"):
-            build_doc = True
-        else:
-            doc_pattern = re.compile(PATTERN_DOCS)
-            github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
-            github_workspace = github_workspace and github_workspace + "/"
-            for file in changed_files:
-                if doc_pattern.search(file) and (
-                    (
-                        subprocess.run(
-                            f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + file} | grep -o -m 1 '^[+-]\/\/|'",
-                            capture_output=True,
-                            shell=True,
-                        ).stdout
-                    )
-                    if file.endswith(".c")
-                    else True
-                ):
-                    build_doc = True
-                    break
-
-    # Set the step outputs
-    print("Building docs:", build_doc)
-    set_output("docs", build_doc)
-
-
-def set_windows(build_windows: bool):
-    if not build_windows:
-        if last_failed_jobs.get("windows"):
-            build_windows = True
-        else:
-            for file in changed_files:
-                for pattern in PATTERN_WINDOWS:
-                    if file.startswith(pattern) and not any(
-                        [file.startswith(d) for d in IGNORE_BOARD]
-                    ):
-                        build_windows = True
-                        break
-                else:
-                    continue
+def set_docs(run=bool(last_failed_jobs.get("docs"))):
+    if not run:
+        pattern_doc = re.compile(PATTERN_DOCS)
+        github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
+        github_workspace = github_workspace and github_workspace + "/"
+        for file in changed_files:
+            if pattern_doc.search(file) and (
+                (
+                    subprocess.run(
+                        f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + file} | grep -o -m 1 '^[+-]\/\/|'",
+                        capture_output=True,
+                        shell=True,
+                    ).stdout
+                )
+                if file.endswith(".c")
+                else True
+            ):
+                run = True
                 break
 
     # Set the step outputs
-    print("Building windows:", build_windows)
-    set_output("windows", build_windows)
+    print("Building docs:", run)
+    set_output("docs", run)
+
+
+def set_windows(run=bool(last_failed_jobs.get("windows"))):
+    if not run:
+        for file in changed_files:
+            for pattern in PATTERN_WINDOWS:
+                if file.startswith(pattern) and not any(
+                    [file.startswith(path) for path in IGNORE_BOARD]
+                ):
+                    run = True
+                    break
+            else:
+                continue
+            break
+
+    # Set the step outputs
+    print("Building windows:", run)
+    set_output("windows", run)
 
 
 def main():
-    # Build all if no changed files
-    build_all = not changed_files
-    print("Running: " + ("all" if build_all else "conditionally"))
-
     # Set jobs
-    set_docs(build_all)
-    set_windows(build_all)
-    set_boards(build_all)
+    set_docs()
+    set_windows()
+    set_boards()
 
 
 if __name__ == "__main__":

From d9d27a3e315531622bf78f4b19280a022973b3c2 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 21 Mar 2023 10:30:03 -0400
Subject: [PATCH 2065/2403] Fix signature of `mkfs()`

---
 shared-bindings/storage/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 3f0dc5f6f3..c4bd728f67 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -267,7 +267,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|     ...
 //|
 //|     @staticmethod
-//|     def mkfs(self, block_device: BlockDevice) -> None:
+//|     def mkfs(block_device: BlockDevice) -> None:
 //|         """Format the block device, deleting any data that may have been there.
 //|
 //|         **Limitations**: On SAMD21 builds, `mkfs()` will raise ``OSError(22)`` when

From c0384b57f11838164b98f45d127686af3997408f Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 21 Mar 2023 11:01:40 -0400
Subject: [PATCH 2066/2403] remove unused submodule tools/usb_descriptor

---
 .gitmodules          | 3 ---
 tools/usb_descriptor | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 tools/usb_descriptor

diff --git a/.gitmodules b/.gitmodules
index 2ba84b4305..023892218a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,9 +33,6 @@
 	path = ports/atmel-samd/asf4
 	url = https://github.com/adafruit/asf4.git
 	branch = circuitpython
-[submodule "tools/usb_descriptor"]
-	path = tools/usb_descriptor
-	url = https://github.com/adafruit/usb_descriptor.git
 [submodule "lib/nrfutil"]
 	path = lib/nrfutil
 	url = https://github.com/adafruit/nRF52_nrfutil
diff --git a/tools/usb_descriptor b/tools/usb_descriptor
deleted file mode 160000
index 2eaa6114b2..0000000000
--- a/tools/usb_descriptor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2eaa6114b209fe7f0a795eda8d6a7b3b93d76d2e

From 98bff96d3c1245efe76262eee4709f015f0d2b22 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 21 Mar 2023 11:01:58 -0400
Subject: [PATCH 2067/2403] update tinyusb: fixes + no more submodules

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index ea8ecea59a..ec9c666107 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit ea8ecea59aa60a1028cce16b0f15bb33918b11af
+Subproject commit ec9c666107c0be0f8dc7c2a15e3bdea8c44a50b4

From ae95274b66cb3bf72b5ff14421bd02137abee31c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 21 Mar 2023 11:43:33 -0400
Subject: [PATCH 2068/2403] use blobless partial clone for make
 fetch-submodules

---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 91d842231f..50c86fc128 100644
--- a/Makefile
+++ b/Makefile
@@ -324,10 +324,9 @@ clean-stm:
 	$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
 
 
-# This update will fail because the commits we need aren't the latest on the
-# branch. We can ignore that though because we fix it with the second command.
-# (Only works for git servers that allow sha fetches.)
+# Do blobless partial clones of submodules to save time and space.
+# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
+# so it does not have the idiosyncrasies of a shallow clone.
 .PHONY: fetch-submodules
 fetch-submodules:
-	git submodule update --init -N --depth 1 || true
-	git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'
+	git submodule update --init --filter=blob:none

From b45d1287263a94d1f4f415d07b8a6dd1d5188dc7 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 21 Mar 2023 16:45:38 +0100
Subject: [PATCH 2069/2403] fix lwip name in 01space_lcd042_esp32c3

---
 ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig b/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig
index b75eaee69f..24f7d625ea 100644
--- a/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/sdkconfig
@@ -2,5 +2,5 @@
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-QTPy-ESP32C3"
+CONFIG_LWIP_LOCAL_HOSTNAME="01Space-LCD042-ESP32C3"
 # end of LWIP

From e4b5b20ebec60557af3c0c5ab35b9c4616e1dd31 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 21 Mar 2023 21:34:30 +0530
Subject: [PATCH 2070/2403] don't call `reload_initiate` if already initiated

---
 supervisor/shared/reload.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/supervisor/shared/reload.c b/supervisor/shared/reload.c
index 4e351704f8..da2ffc26e1 100644
--- a/supervisor/shared/reload.c
+++ b/supervisor/shared/reload.c
@@ -82,15 +82,19 @@ inline bool autoreload_is_enabled() {
 }
 
 void autoreload_trigger() {
-    if (autoreload_enabled & !autoreload_suspended) {
-        last_autoreload_trigger = supervisor_ticks_ms32();
-        // Guard against the rare time that ticks is 0;
-        if (last_autoreload_trigger == 0) {
-            last_autoreload_trigger += 1;
-        }
-        // Initiate a reload of the VM immediately. Later code will pause to
-        // wait for the autoreload to become ready. Doing the VM exit
-        // immediately is clearer for the user.
+    if (!autoreload_enabled || autoreload_suspended != 0) {
+        return;
+    }
+    bool reload_initiated = autoreload_pending();
+    last_autoreload_trigger = supervisor_ticks_ms32();
+    // Guard against the rare time that ticks is 0;
+    if (last_autoreload_trigger == 0) {
+        last_autoreload_trigger += 1;
+    }
+    // Initiate a reload of the VM immediately. Later code will pause to
+    // wait for the autoreload to become ready. Doing the VM exit
+    // immediately is clearer for the user.
+    if (!reload_initiated) {
         reload_initiate(RUN_REASON_AUTO_RELOAD);
     }
 }
@@ -111,5 +115,5 @@ bool autoreload_ready() {
 }
 
 bool autoreload_pending(void) {
-    return last_autoreload_trigger != 0;
+    return last_autoreload_trigger > 0;
 }

From 4a6965ee769767223e138c9c4a1747722864abd3 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Tue, 21 Mar 2023 22:32:40 +0530
Subject: [PATCH 2071/2403] change condition to run all jobs

---
 tools/ci_set_matrix.py | 78 ++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index f89b2133ac..f549b6f6f1 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -82,10 +82,12 @@ def git_diff(pattern: str):
     )
 
 
+compute_diff = bool(os.environ.get("BASE_SHA") and os.environ.get("HEAD_SHA"))
+
 if len(sys.argv) > 1:
     print("Using files list on commandline")
     changed_files = set(sys.argv[1:])
-elif os.environ.get("BASE_SHA") and os.environ.get("HEAD_SHA"):
+elif compute_diff:
     print("Using files list by computing diff")
     changed_files = git_diff("$BASE_SHA...$HEAD_SHA")
     if os.environ.get("GITHUB_EVENT_NAME") == "pull_request":
@@ -116,7 +118,7 @@ def set_output(name: str, value):
         print(f"Would set GitHub actions output {name} to '{value}'")
 
 
-def set_boards(build_all=False):
+def set_boards(build_all: bool):
     all_board_ids = set()
     boards_to_build = all_board_ids if build_all else set()
 
@@ -245,43 +247,49 @@ def set_boards(build_all=False):
     set_output("ports", json.dumps(port_to_boards_to_build))
 
 
-def set_docs(run=bool(last_failed_jobs.get("docs"))):
+def set_docs(run: bool):
     if not run:
-        pattern_doc = re.compile(PATTERN_DOCS)
-        github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
-        github_workspace = github_workspace and github_workspace + "/"
-        for file in changed_files:
-            if pattern_doc.search(file) and (
-                (
-                    subprocess.run(
-                        f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + file} | grep -o -m 1 '^[+-]\/\/|'",
-                        capture_output=True,
-                        shell=True,
-                    ).stdout
-                )
-                if file.endswith(".c")
-                else True
-            ):
-                run = True
-                break
+        if last_failed_jobs.get("docs"):
+            run = True
+        else:
+            pattern_doc = re.compile(PATTERN_DOCS)
+            github_workspace = os.environ.get("GITHUB_WORKSPACE") or ""
+            github_workspace = github_workspace and github_workspace + "/"
+            for file in changed_files:
+                if pattern_doc.search(file) and (
+                    (
+                        subprocess.run(
+                            f"git diff -U0 $BASE_SHA...$HEAD_SHA {github_workspace + file} | grep -o -m 1 '^[+-]\/\/|'",
+                            capture_output=True,
+                            shell=True,
+                        ).stdout
+                    )
+                    if file.endswith(".c")
+                    else True
+                ):
+                    run = True
+                    break
 
     # Set the step outputs
     print("Building docs:", run)
     set_output("docs", run)
 
 
-def set_windows(run=bool(last_failed_jobs.get("windows"))):
+def set_windows(run: bool):
     if not run:
-        for file in changed_files:
-            for pattern in PATTERN_WINDOWS:
-                if file.startswith(pattern) and not any(
-                    [file.startswith(path) for path in IGNORE_BOARD]
-                ):
-                    run = True
-                    break
-            else:
-                continue
-            break
+        if last_failed_jobs.get("windows"):
+            run = True
+        else:
+            for file in changed_files:
+                for pattern in PATTERN_WINDOWS:
+                    if file.startswith(pattern) and not any(
+                        [file.startswith(path) for path in IGNORE_BOARD]
+                    ):
+                        run = True
+                        break
+                else:
+                    continue
+                break
 
     # Set the step outputs
     print("Building windows:", run)
@@ -289,10 +297,12 @@ def set_windows(run=bool(last_failed_jobs.get("windows"))):
 
 
 def main():
+    run_all = not changed_files and not compute_diff
+    print("Running: " + ("all" if run_all else "conditionally"))
     # Set jobs
-    set_docs()
-    set_windows()
-    set_boards()
+    set_docs(run_all)
+    set_windows(run_all)
+    set_boards(run_all)
 
 
 if __name__ == "__main__":

From 9c3c0555ddfcfc3bca779d5fb779f35cdc86e9a2 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 21 Mar 2023 16:21:57 -0700
Subject: [PATCH 2072/2403] Switch iMX RT sdk to NXP repo

Fixes #7645
---
 .gitmodules                                   |  2 +-
 ports/mimxrt10xx/Makefile                     | 45 ++++++-------
 ports/mimxrt10xx/board.h                      |  1 -
 ports/mimxrt10xx/boards/board.h               | 29 ++++++++
 .../boards/feather_m7_1011/flash_config.c     | 62 +++++------------
 .../boards/feather_mimxrt1011/flash_config.c  | 62 +++++------------
 .../boards/feather_mimxrt1062/flash_config.c  | 63 +++++------------
 ports/mimxrt10xx/boards/flash_config.h        | 36 +++++++++-
 .../boards/imxrt1010_evk/flash_config.c       | 63 +++++------------
 .../boards/imxrt1020_evk/flash_config.c       | 63 +++++------------
 .../boards/imxrt1060_evk/flash_config.c       | 63 +++++------------
 .../boards/metro_m7_1011/flash_config.c       | 65 ++++++------------
 .../sparkfun_teensy_micromod/flash_config.c   | 65 +++++-------------
 .../mimxrt10xx/boards/teensy40/flash_config.c | 67 ++++++-------------
 .../mimxrt10xx/boards/teensy41/flash_config.c | 65 +++++-------------
 .../mimxrt10xx/common-hal/analogio/AnalogIn.c |  2 +-
 ports/mimxrt10xx/common-hal/busio/I2C.c       |  4 +-
 ports/mimxrt10xx/common-hal/busio/SPI.c       |  2 +-
 ports/mimxrt10xx/common-hal/busio/UART.c      |  4 +-
 ports/mimxrt10xx/common-hal/busio/UART.h      |  2 +-
 .../common-hal/digitalio/DigitalInOut.c       |  2 +-
 .../common-hal/microcontroller/Processor.c    |  4 +-
 ports/mimxrt10xx/common-hal/os/__init__.c     |  2 +-
 ports/mimxrt10xx/common-hal/pwmio/PWMOut.c    |  3 +-
 ports/mimxrt10xx/common-hal/rtc/RTC.c         |  4 +-
 ports/mimxrt10xx/linking/common.ld            |  2 +
 ports/mimxrt10xx/mphalport.c                  |  4 --
 .../mimxrt10xx/peripherals/mimxrt10xx/pins.h  |  2 +-
 ports/mimxrt10xx/sdk                          |  2 +-
 .../supervisor/flexspi_nor_flash_ops.c        |  2 +-
 ports/mimxrt10xx/supervisor/internal_flash.c  |  4 +-
 ports/mimxrt10xx/supervisor/port.c            | 34 +++++++++-
 32 files changed, 322 insertions(+), 508 deletions(-)
 delete mode 100644 ports/mimxrt10xx/board.h
 create mode 100644 ports/mimxrt10xx/boards/board.h

diff --git a/.gitmodules b/.gitmodules
index 023892218a..9c8d3b4b68 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,7 +100,7 @@
 	url = https://github.com/adafruit/Adafruit_MP3
 [submodule "ports/mimxrt10xx/sdk"]
 	path = ports/mimxrt10xx/sdk
-	url = https://github.com/adafruit/MIMXRT10xx_SDK
+	url = https://github.com/nxp-mcuxpresso/mcux-sdk.git
 [submodule "frozen/Adafruit_CircuitPython_Register"]
 	path = frozen/Adafruit_CircuitPython_Register
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index d3db4c44e3..d8d12b74da 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -30,8 +30,7 @@ CROSS_COMPILE = arm-none-eabi-
 INC += \
 	-I. \
 	-I../.. \
-	-I../lib/mp-readline \
-	-I../shared/timeutils \
+	-I../../lib/cmsis/inc \
 	-I../../lib/tinyusb/src \
 	-I../../supervisor/shared/usb \
 	-I$(BUILD) \
@@ -42,7 +41,7 @@ INC += \
 	-Isdk/CMSIS/Include \
 	-Isdk/devices/$(CHIP_FAMILY) \
 	-Isdk/devices/$(CHIP_FAMILY)/drivers \
-	-Isdk/devices/$(CHIP_FAMILY)/xip \
+	-Isdk/drivers/common
 
 # NDEBUG disables assert() statements. This reduces code size pretty dramatically, per tannewt.
 
@@ -106,25 +105,26 @@ LDFLAGS += -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -mthumb -mapcs
 BOOTLOADER_SIZE := 0x6000C000
 
 SRC_SDK := \
-	drivers/fsl_adc.c \
-	drivers/fsl_cache.c \
-	drivers/fsl_clock.c \
-	drivers/fsl_common.c \
-	drivers/fsl_flexspi.c \
-	drivers/fsl_gpio.c \
-	drivers/fsl_lpi2c.c \
-	drivers/fsl_lpspi.c \
-	drivers/fsl_lpuart.c \
-	drivers/fsl_ocotp.c \
-	drivers/fsl_pwm.c \
-	drivers/fsl_snvs_hp.c \
-	drivers/fsl_snvs_lp.c \
-	drivers/fsl_tempmon.c \
-	drivers/fsl_trng.c \
-	system_$(CHIP_FAMILY).c \
+	devices/$(CHIP_FAMILY)/drivers/fsl_clock.c \
+	devices/$(CHIP_FAMILY)/system_$(CHIP_FAMILY).c \
+	devices/$(CHIP_FAMILY)/xip/fsl_flexspi_nor_boot.c \
+	drivers/adc_12b1msps_sar/fsl_adc.c \
+	drivers/cache/armv7-m7/fsl_cache.c \
+	drivers/common/fsl_common_arm.c \
+	drivers/common/fsl_common.c \
+	drivers/flexspi/fsl_flexspi.c \
+	drivers/igpio/fsl_gpio.c \
+	drivers/lpi2c/fsl_lpi2c.c \
+	drivers/lpspi/fsl_lpspi.c \
+	drivers/lpuart/fsl_lpuart.c \
+	drivers/ocotp/fsl_ocotp.c \
+	drivers/pwm/fsl_pwm.c \
+	drivers/snvs_hp/fsl_snvs_hp.c \
+	drivers/snvs_lp/fsl_snvs_lp.c \
+	drivers/tempmon/fsl_tempmon.c \
+	drivers/trng/fsl_trng.c \
 
-SRC_SDK := $(addprefix sdk/devices/$(CHIP_FAMILY)/, $(SRC_SDK))
-$(addprefix $(BUILD)/, $(SRC_SDK:.c=.o)): CFLAGS += -Wno-undef -Wno-missing-prototypes -Wno-cast-align
+SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
 
 SRC_C += \
 	background.c \
@@ -191,8 +191,7 @@ $(BUILD)/firmware.uf2: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary -R .stack -R .dtcm_bss -R .ivt -R .flash_config $^ $@-binpart
 	$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -f MIMXRT10XX -c -o $@ $@-binpart
-
-# $(Q)rm $@-binpart
+	$(Q)rm $@-binpart
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O ihex -R .stack -R .dtcm_bss $< $@
diff --git a/ports/mimxrt10xx/board.h b/ports/mimxrt10xx/board.h
deleted file mode 100644
index 1c9596e7d2..0000000000
--- a/ports/mimxrt10xx/board.h
+++ /dev/null
@@ -1 +0,0 @@
-// Empty but needed for the SDK
diff --git a/ports/mimxrt10xx/boards/board.h b/ports/mimxrt10xx/boards/board.h
new file mode 100644
index 0000000000..e6736806ed
--- /dev/null
+++ b/ports/mimxrt10xx/boards/board.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "mpconfigboard.h"
+
+#define XIP_BOOT_HEADER_ENABLE (1)
diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/flash_config.c b/ports/mimxrt10xx/boards/feather_m7_1011/flash_config.c
index 5871dda963..4e189590d0 100644
--- a/ports/mimxrt10xx/boards/feather_m7_1011/flash_config.c
+++ b/ports/mimxrt10xx/boards/feather_m7_1011/flash_config.c
@@ -7,47 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q32JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -61,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,     // Bit pattern for setting Quad Enable.
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .serialClkFreq = kFLEXSPISerialClk_133MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -78,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -101,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status -2
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01 /* number of bytes to write */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -128,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -147,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/flash_config.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/flash_config.c
index 7460615c4c..2c6fa962aa 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1011/flash_config.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/flash_config.c
@@ -7,47 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q64JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -61,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .serialClkFreq = kFLEXSPISerialClk_133MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -78,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -101,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -128,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -147,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/flash_config.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/flash_config.c
index d6cfc07e62..2c6fa962aa 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1062/flash_config.c
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1062/flash_config.c
@@ -7,48 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q64JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -62,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .serialClkFreq = kFLEXSPISerialClk_133MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -79,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -102,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -129,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -148,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/flash_config.h b/ports/mimxrt10xx/boards/flash_config.h
index 25f1550ae8..b0be0a93c0 100644
--- a/ports/mimxrt10xx/boards/flash_config.h
+++ b/ports/mimxrt10xx/boards/flash_config.h
@@ -34,7 +34,41 @@
 #include "mpconfigboard.h"  // For flash size settings
 
 #include "fsl_common.h"
-#include "fsl_flexspi_nor_config.h"
+#ifdef CPU_MIMXRT1011DAE5A
+// TODO: Remove this when the 1011 has a romapi header that matches the others.
+#include "sdk/boards/evkmimxrt1010/xip/evkmimxrt1010_flexspi_nor_config.h"
+typedef enum _flexspi_serial_clk_freq_caps
+{
+    kFLEXSPISerialClk_NoChange = 0U,
+    kFLEXSPISerialClk_30MHz    = 1U,
+    kFLEXSPISerialClk_50MHz    = 2U,
+    kFLEXSPISerialClk_60MHz    = 3U,
+    kFLEXSPISerialClk_75MHz    = 4U,
+    kFLEXSPISerialClk_80MHz    = 5U,
+    kFLEXSPISerialClk_100MHz   = 6U,
+    kFLEXSPISerialClk_133MHz   = 7U,
+    kFLEXSPISerialClk_166MHz   = 8U,
+    kFLEXSPISerialClk_200MHz   = 9U,
+} caps_flexspi_serial_clk_freq_t;
+
+/*! @brief FLEXSPI Read Sample Clock Source definition */
+typedef enum _flexspi_read_sample_clk_caps
+{
+    kFLEXSPIReadSampleClk_LoopbackInternally      = 0U,
+    kFLEXSPIReadSampleClk_LoopbackFromDqsPad      = 1U,
+    kFLEXSPIReadSampleClk_LoopbackFromSckPad      = 2U,
+    kFLEXSPIReadSampleClk_ExternalInputFromDqsPad = 3U,
+} caps_flexspi_read_sample_clk_t;
+
+enum
+{
+    kFLEXSPIDeviceType_SerialNOR = 1U, /*!< Flash device is Serial NOR */
+};
+
+#define FSL_ROM_FLEXSPI_LUT_SEQ FLEXSPI_LUT_SEQ
+#else
+#include "fsl_romapi.h"
+#endif
 
 #define SEQUENCE(first, second, third, fourth) first, second, third, fourth
 #define TWO_EMPTY_STEPS 0x00000000
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
index 9c88f689d8..f15a3f3459 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
@@ -7,48 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for AT25SF128A with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -62,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -79,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -102,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -129,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -148,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
index 6589ad9c48..2ae8ae9b76 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
@@ -7,48 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for IS25LP064A with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -62,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x40,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_30MHz,
+        .serialClkFreq = kFLEXSPISerialClk_30MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -79,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            // SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            // SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
             //                          RADDR_SDR, FLEXSPI_4PAD, 24  bits to transmit ),
-            //          FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+            //          FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
             //                          READ_SDR,  FLEXSPI_4PAD, 0x04),
             // Single fast read version, good for debugging.
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                     READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -102,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -129,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -148,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
index 40db33444f..c75174d1c4 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
@@ -7,48 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for IS25WP064A with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -62,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x40,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -79,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -102,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -129,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -148,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
index 3477de9e34..e4562c1965 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
@@ -7,48 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt"),used))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    IVT_HEADER,                       /* IVT Header */
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-__attribute__((section(".boot_hdr.boot_data"),used))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    FLASH_SIZE,               /* size */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q32JV with QSPI routed. (compatible with GD25Q32)
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -68,13 +41,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqId = 2u,
             .seqNum = 1u,
         },
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -85,48 +58,48 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 2: Empty
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x35 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x35 /* the command to send */,
                 DUMMY_SDR, FLEXSPI_1PAD, 8),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -139,17 +112,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -158,7 +131,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c
index e0f5a5bd7d..abc26a2bcd 100644
--- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c
+++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/flash_config.c
@@ -7,50 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    0x432000D1,                       /* Teensy bootloader looks for this value*/
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-extern unsigned long _flashimagelen;
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    (uint32_t)&_flashimagelen, /* actual size of image */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q64JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -64,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -81,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -104,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -131,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -150,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/teensy40/flash_config.c b/ports/mimxrt10xx/boards/teensy40/flash_config.c
index d878124b40..30d40d7c84 100644
--- a/ports/mimxrt10xx/boards/teensy40/flash_config.c
+++ b/ports/mimxrt10xx/boards/teensy40/flash_config.c
@@ -7,50 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    0x432000D1,                       /* Teensy bootloader looks for this value*/
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-extern unsigned long _flashimagelen;
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    (uint32_t)&_flashimagelen, /* actual size of image */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q16JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -70,13 +41,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqId = 2u,
             .seqNum = 1u,
         },
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -87,48 +58,48 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 2: Empty
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x35 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x35 /* the command to send */,
                 DUMMY_SDR, FLEXSPI_1PAD, 8),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x02),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -141,17 +112,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -160,7 +131,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/boards/teensy41/flash_config.c b/ports/mimxrt10xx/boards/teensy41/flash_config.c
index e0f5a5bd7d..abc26a2bcd 100644
--- a/ports/mimxrt10xx/boards/teensy41/flash_config.c
+++ b/ports/mimxrt10xx/boards/teensy41/flash_config.c
@@ -7,50 +7,21 @@
 
 #include "boards/flash_config.h"
 
-#include "fsl_flexspi_nor_boot.h"
-
-
-__attribute__((section(".boot_hdr.ivt")))
-/*************************************
- *  IVT Data
- *************************************/
-const ivt image_vector_table = {
-    0x432000D1,                       /* Teensy bootloader looks for this value*/
-    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
-    IVT_RSVD,                         /* Reserved = 0 */
-    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
-    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
-    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
-    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
-    IVT_RSVD                          /* Reserved = 0 */
-};
-
-extern unsigned long _flashimagelen;
-
-__attribute__((section(".boot_hdr.boot_data")))
-/*************************************
- *  Boot Data
- *************************************/
-const BOOT_DATA_T boot_data = {
-    FLASH_BASE,               /* boot start location */
-    (uint32_t)&_flashimagelen, /* actual size of image */
-    PLUGIN_FLAG,              /* Plugin flag*/
-    0xFFFFFFFF                /* empty - extra data word */
-};
+#include "xip/fsl_flexspi_nor_boot.h"
 
 // Config for W25Q64JV with QSPI routed.
 __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -64,13 +35,13 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x02,
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
-            // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
             // The high 16 bits is command 1 and the low are command 0.
             // Within a command, the top 6 bits are the opcode, the next two are the number
             // of pads and then last byte is the operand. The operand's meaning changes
@@ -81,20 +52,20 @@ const flexspi_nor_config_t qspiflash_config = {
 
             // 0: ROM: Read LUTs
             // Quad version
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
                 RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
-                FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
                     READ_SDR,  FLEXSPI_4PAD, 0x04),
                 // Single fast read version, good for debugging.
-                // FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
                 //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
-                // FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
                 //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 1: ROM: Read status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
                 READ_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -104,21 +75,21 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 3: ROM: Write Enable
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0x00),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 4: Config: Write Status
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
                 WRITE_SDR, FLEXSPI_1PAD, 0x01),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 5: ROM: Erase Sector
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
@@ -131,17 +102,17 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 8: Block Erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
 
             // 9: ROM: Page program
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
                 RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
 
-                FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
                     STOP,      FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS),
@@ -150,7 +121,7 @@ const flexspi_nor_config_t qspiflash_config = {
             EMPTY_SEQUENCE,
 
             // 11: ROM: Chip erase
-            SEQUENCE(FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
                 STOP,    FLEXSPI_1PAD, 0),
                 TWO_EMPTY_STEPS,
                 TWO_EMPTY_STEPS,
diff --git a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c
index f5d2e7f42e..237566b1f0 100644
--- a/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c
+++ b/ports/mimxrt10xx/common-hal/analogio/AnalogIn.c
@@ -33,7 +33,7 @@
 
 #include "py/runtime.h"
 
-#include "fsl_adc.h"
+#include "sdk/drivers/adc_12b1msps_sar/fsl_adc.h"
 
 #define ADC_CHANNEL_GROUP 0
 
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c
index 50aae54aba..6c5bbea416 100644
--- a/ports/mimxrt10xx/common-hal/busio/I2C.c
+++ b/ports/mimxrt10xx/common-hal/busio/I2C.c
@@ -34,8 +34,8 @@
 #include "py/runtime.h"
 #include "periph.h"
 
-#include "fsl_lpi2c.h"
-#include "fsl_gpio.h"
+#include "sdk/drivers/lpi2c/fsl_lpi2c.h"
+#include "sdk/drivers/igpio/fsl_gpio.h"
 
 #define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (1 + CLOCK_GetDiv(kCLOCK_Lpi2cDiv)))
 #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c
index 0048c2aeb2..d88b71a403 100644
--- a/ports/mimxrt10xx/common-hal/busio/SPI.c
+++ b/ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "periph.h"
 
-#include "fsl_lpspi.h"
+#include "sdk/drivers/lpspi/fsl_lpspi.h"
 
 #include 
 
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
index 086b8dee87..088b2aefc6 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.c
+++ b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -38,8 +38,8 @@
 #include "py/stream.h"
 #include "periph.h"
 
-#include "fsl_lpuart.h"
-#include "fsl_gpio.h"
+#include "sdk/drivers/lpuart/fsl_lpuart.h"
+#include "sdk/drivers/igpio/fsl_gpio.h"
 // ==========================================================
 // Debug code
 // ==========================================================
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.h b/ports/mimxrt10xx/common-hal/busio/UART.h
index bc8374aabb..f09de935c2 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.h
+++ b/ports/mimxrt10xx/common-hal/busio/UART.h
@@ -34,7 +34,7 @@
 #include "py/obj.h"
 #include "periph.h"
 
-#include "fsl_lpuart.h"
+#include "sdk/drivers/lpuart/fsl_lpuart.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
index d800de15de..3445cf42a0 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#include "fsl_gpio.h"
+#include "sdk/drivers/igpio/fsl_gpio.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
index 17ced78910..9277f81d47 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
@@ -33,8 +33,8 @@
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
 
-#include "fsl_tempmon.h"
-#include "fsl_ocotp.h"
+#include "sdk/drivers/tempmon/fsl_tempmon.h"
+#include "sdk/drivers/ocotp/fsl_ocotp.h"
 #include "clocks.h"
 
 float common_hal_mcu_processor_get_temperature(void) {
diff --git a/ports/mimxrt10xx/common-hal/os/__init__.c b/ports/mimxrt10xx/common-hal/os/__init__.c
index e2c43e43fa..9219242685 100644
--- a/ports/mimxrt10xx/common-hal/os/__init__.c
+++ b/ports/mimxrt10xx/common-hal/os/__init__.c
@@ -33,7 +33,7 @@
 
 #include "shared-bindings/os/__init__.h"
 
-#include "fsl_trng.h"
+#include "sdk/drivers/trng/fsl_trng.h"
 
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
index c2afb38664..0bf11403d2 100644
--- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
@@ -33,7 +33,7 @@
 #include "shared-bindings/pwmio/PWMOut.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-#include "fsl_pwm.h"
+#include "sdk/drivers/pwm/fsl_pwm.h"
 
 #include "supervisor/shared/translate/translate.h"
 #include "periph.h"
@@ -240,7 +240,6 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
 
         // Disable all fault inputs
         flexpwm->SM[submodule].DISMAP[0] = 0;
-        flexpwm->SM[submodule].DISMAP[1] = 0;
 
         PWM_SetPwmLdok(flexpwm, sm_mask, false);
         flexpwm->SM[submodule].CTRL = PWM_CTRL_FULL_MASK | PWM_CTRL_PRSC(self->prescaler);
diff --git a/ports/mimxrt10xx/common-hal/rtc/RTC.c b/ports/mimxrt10xx/common-hal/rtc/RTC.c
index 0cf5fe7713..386b6a3ac5 100644
--- a/ports/mimxrt10xx/common-hal/rtc/RTC.c
+++ b/ports/mimxrt10xx/common-hal/rtc/RTC.c
@@ -35,8 +35,8 @@
 #include "common-hal/rtc/RTC.h"
 #include "supervisor/shared/translate/translate.h"
 
-#include "fsl_snvs_hp.h"
-#include "fsl_snvs_lp.h"
+#include "sdk/drivers/snvs_hp/fsl_snvs_hp.h"
+#include "sdk/drivers/snvs_lp/fsl_snvs_lp.h"
 
 void rtc_init(void) {
     snvs_hp_rtc_config_t hpconfig;
diff --git a/ports/mimxrt10xx/linking/common.ld b/ports/mimxrt10xx/linking/common.ld
index 461a9d89eb..76c11c8d6f 100644
--- a/ports/mimxrt10xx/linking/common.ld
+++ b/ports/mimxrt10xx/linking/common.ld
@@ -195,6 +195,8 @@ SECTIONS
         . += _ld_default_stack_size;
     } > DTCM
     _ld_stack_top = ORIGIN(DTCM) + LENGTH(DTCM);
+    /* For the SDK's isr vector table */
+    __StackTop = ORIGIN(DTCM) + LENGTH(DTCM);
 
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/ports/mimxrt10xx/mphalport.c b/ports/mimxrt10xx/mphalport.c
index ad0fb4d9ba..f160cf1365 100644
--- a/ports/mimxrt10xx/mphalport.c
+++ b/ports/mimxrt10xx/mphalport.c
@@ -35,11 +35,7 @@
 #include "fsl_common.h"
 
 void mp_hal_delay_us(mp_uint_t delay) {
-    #if defined(MIMXRT1011_SERIES) || defined(MIMXRT1021_SERIES)
     SDK_DelayAtLeastUs(delay, SystemCoreClock);
-    #else
-    SDK_DelayAtLeastUs(delay);
-    #endif
 }
 
 void mp_hal_disable_all_interrupts(void) {
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
index d6d12771c5..82cb0dc69e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
@@ -35,7 +35,7 @@
 #include 
 
 #include "fsl_iomuxc.h"
-#include "fsl_pwm.h"
+#include "sdk/drivers/pwm/fsl_pwm.h"
 #include "py/obj.h"
 
 extern const mp_obj_type_t mcu_pin_type;
diff --git a/ports/mimxrt10xx/sdk b/ports/mimxrt10xx/sdk
index 8363ff7bed..2b9354539e 160000
--- a/ports/mimxrt10xx/sdk
+++ b/ports/mimxrt10xx/sdk
@@ -1 +1 @@
-Subproject commit 8363ff7bed7533b9e7e6a6239aace3d6da14f349
+Subproject commit 2b9354539e6e4f722749e87b0bdc22966dc080d9
diff --git a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
index 7563f386f9..e32eaf8832 100644
--- a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
+++ b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "fsl_flexspi.h"
+#include "sdk/drivers/flexspi/fsl_flexspi.h"
 #include "internal_flash.h"
 #include "boards/flash_config.h"
 #include "supervisor/internal_flash.h"
diff --git a/ports/mimxrt10xx/supervisor/internal_flash.c b/ports/mimxrt10xx/supervisor/internal_flash.c
index 30a033a183..bacb62854a 100644
--- a/ports/mimxrt10xx/supervisor/internal_flash.c
+++ b/ports/mimxrt10xx/supervisor/internal_flash.c
@@ -38,8 +38,8 @@
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 
-#include "fsl_cache.h"
-#include "fsl_flexspi.h"
+#include "sdk/drivers/cache/armv7-m7/fsl_cache.h"
+#include "sdk/drivers/flexspi/fsl_flexspi.h"
 #include "fsl_iomuxc.h"
 
 // defined in linker
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index a27ab3ea58..55bf72352d 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -54,8 +54,8 @@
 
 #include "clocks.h"
 
-#include "fsl_gpio.h"
-#include "fsl_lpuart.h"
+#include "sdk/drivers/igpio/fsl_gpio.h"
+#include "sdk/drivers/lpuart/fsl_lpuart.h"
 
 // Device memories must be accessed in order.
 #define DEVICE 2
@@ -102,6 +102,36 @@ extern uint32_t _ld_isr_destination;
 extern uint32_t _ld_isr_size;
 extern uint32_t _ld_isr_flash_copy;
 
+// Remove these once the SDK re-includes them.
+// https://github.com/nxp-mcuxpresso/mcux-sdk/issues/110
+/*! @name GPR14 - GPR14 General Purpose Register */
+/*! @{ */
+#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_MASK      (0xF0000U)
+#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_SHIFT     (16U)
+/*! CM7_CFGITCMSZ
+ *  0b0000..0 KB (No ITCM)
+ *  0b0011..4 KB
+ *  0b0100..8 KB
+ *  0b0101..16 KB
+ *  0b0110..32 KB
+ *  0b0111..64 KB
+ *  0b1000..128 KB
+ */
+#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ(x)        (((uint32_t)(((uint32_t)(x)) << IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_SHIFT)) & IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_MASK)
+#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK      (0xF00000U)
+#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_SHIFT     (20U)
+/*! CM7_CFGDTCMSZ
+ *  0b0000..0 KB (No DTCM)
+ *  0b0011..4 KB
+ *  0b0100..8 KB
+ *  0b0101..16 KB
+ *  0b0110..32 KB
+ *  0b0111..64 KB
+ *  0b1000..128 KB
+ */
+#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ(x)        (((uint32_t)(((uint32_t)(x)) << IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_SHIFT)) & IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK)
+/*! @} */
+
 extern void main(void);
 
 // This replaces the Reset_Handler in startup_*.S and SystemInit in system_*.c.

From 0eb08509f0f9e6aa353782b9d20c69714dd77034 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 21 Mar 2023 16:42:49 -0700
Subject: [PATCH 2073/2403] Make set_stack_limit respect fixed stack

Fixes #2830
---
 shared-bindings/supervisor/Runtime.c |  6 +++++-
 supervisor/shared/stack.c            | 12 ++++++++++--
 supervisor/shared/stack.h            |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index db3d8d1e4d..ecdd914a8f 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -197,7 +197,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_next_stack_limit_obj, superviso
 STATIC mp_obj_t supervisor_runtime_set_next_stack_limit(mp_obj_t self, mp_obj_t size_obj) {
     mp_int_t size = mp_obj_get_int(size_obj);
     mp_arg_validate_int_min(size, 256, MP_QSTR_size);
-    set_next_stack_size(size);
+    if (!set_next_stack_size(size)) {
+        mp_raise_msg_varg(&mp_type_AttributeError,
+            MP_ERROR_TEXT("can't set attribute '%q'"),
+            MP_QSTR_next_stack_limit);
+    }
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(supervisor_runtime_set_next_stack_limit_obj, supervisor_runtime_set_next_stack_limit);
diff --git a/supervisor/shared/stack.c b/supervisor/shared/stack.c
index be97cee234..148bb0bbd5 100644
--- a/supervisor/shared/stack.c
+++ b/supervisor/shared/stack.c
@@ -35,7 +35,7 @@
 extern uint32_t _estack;
 
 // Requested size.
-static uint32_t next_stack_size = CIRCUITPY_DEFAULT_STACK_SIZE;
+static uint32_t next_stack_size = 0;
 static uint32_t current_stack_size = 0;
 // Actual location and size, may be larger than requested.
 static uint32_t *stack_limit = NULL;
@@ -49,11 +49,15 @@ static void allocate_stack(void) {
         stack_limit = port_stack_get_limit();
         stack_length = (port_stack_get_top() - stack_limit) * sizeof(uint32_t);
         current_stack_size = stack_length;
+        next_stack_size = stack_length;
     } else {
         mp_uint_t regs[10];
         mp_uint_t sp = cpu_get_regs_and_sp(regs);
 
         mp_uint_t c_size = (mp_uint_t)port_stack_get_top() - sp;
+        if (next_stack_size == 0) {
+            next_stack_size = CIRCUITPY_DEFAULT_STACK_SIZE;
+        }
         supervisor_allocation *stack_alloc = allocate_memory(c_size + next_stack_size + EXCEPTION_STACK_SIZE, true, false);
         if (stack_alloc == NULL) {
             stack_alloc = allocate_memory(c_size + CIRCUITPY_DEFAULT_STACK_SIZE + EXCEPTION_STACK_SIZE, true, false);
@@ -103,8 +107,12 @@ size_t stack_get_length(void) {
     return stack_length;
 }
 
-void set_next_stack_size(uint32_t size) {
+bool set_next_stack_size(uint32_t size) {
+    if (port_has_fixed_stack()) {
+        return false;
+    }
     next_stack_size = size;
+    return true;
 }
 
 uint32_t get_next_stack_size(void) {
diff --git a/supervisor/shared/stack.h b/supervisor/shared/stack.h
index 4acda57354..4a03fcf275 100644
--- a/supervisor/shared/stack.h
+++ b/supervisor/shared/stack.h
@@ -37,7 +37,7 @@ void stack_resize(void);
 uint32_t *stack_get_bottom(void);
 size_t stack_get_length(void);
 // Next/current requested stack size.
-void set_next_stack_size(uint32_t size);
+bool set_next_stack_size(uint32_t size);
 uint32_t get_next_stack_size(void);
 uint32_t get_current_stack_size(void);
 bool stack_ok(void);

From 349dedca5416d22ac9934d5357adbb0641e0cce3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Mar 2023 09:35:01 -0500
Subject: [PATCH 2074/2403] struct: Check that argument counts match, similar
 to cpython3

.. and test our struct module during the build-time tests

Closes #7771
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 .../unix/variants/coverage/mpconfigvariant.mk |  3 ++
 shared-module/struct/__init__.c               | 32 +++++++++-------
 tests/circuitpython/struct_nargs.py           | 38 +++++++++++++++++++
 tests/unix/extra_coverage.py.exp              | 18 ++++-----
 5 files changed, 69 insertions(+), 23 deletions(-)
 create mode 100644 tests/circuitpython/struct_nargs.py

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index ba9e941c28..0c6e10aeae 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -62,6 +62,7 @@
 #define MICROPY_PY_FRAMEBUF            (1)
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
+#define MICROPY_PY_STRUCT              (0) // uses shared-bindings struct
 #define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index fd12bbd8b5..20320916bc 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -33,6 +33,7 @@ SRC_BITMAP := \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
 	shared-bindings/rainbowio/__init__.c \
+	shared-bindings/struct/__init__.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
 	shared-bindings/zlib/__init__.c \
@@ -45,6 +46,7 @@ SRC_BITMAP := \
 	shared-module/displayio/ColorConverter.c \
 	shared-module/os/getenv.c \
 	shared-module/rainbowio/__init__.c \
+	shared-module/struct/__init__.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
 
@@ -57,6 +59,7 @@ CFLAGS += \
 	-DCIRCUITPY_OS_GETENV=1 \
 	-DCIRCUITPY_GIFIO=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
+	-DCIRCUITPY_STRUCT=1 \
 	-DCIRCUITPY_TRACEBACK=1 \
 	-DCIRCUITPY_ZLIB=1
 
diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index e87321ae79..dedaf93afa 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -129,14 +129,10 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
         mp_raise_RuntimeError(translate("buffer too small"));
     }
 
-    size_t i;
+    size_t i = 0;
     byte *p_base = p;
-    for (i = 0; i < n_args;) {
+    while (*fmt) {
         mp_uint_t sz = 1;
-        if (*fmt == '\0') {
-            // more arguments given than used by format string; CPython raises struct.error here
-            mp_raise_RuntimeError(translate("too many arguments provided with the given format"));
-        }
         struct_validate_format(*fmt);
 
         if (unichar_isdigit(*fmt)) {
@@ -144,14 +140,17 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
         }
 
         if (*fmt == 's') {
-            mp_buffer_info_t bufinfo;
-            mp_get_buffer_raise(args[i++], &bufinfo, MP_BUFFER_READ);
-            mp_uint_t to_copy = sz;
-            if (bufinfo.len < to_copy) {
-                to_copy = bufinfo.len;
+            if (i < n_args) {
+                mp_buffer_info_t bufinfo;
+                mp_get_buffer_raise(args[i], &bufinfo, MP_BUFFER_READ);
+                mp_uint_t to_copy = sz;
+                if (bufinfo.len < to_copy) {
+                    to_copy = bufinfo.len;
+                }
+                memcpy(p, bufinfo.buf, to_copy);
+                memset(p + to_copy, 0, sz - to_copy);
             }
-            memcpy(p, bufinfo.buf, to_copy);
-            memset(p + to_copy, 0, sz - to_copy);
+            i++;
             p += sz;
         } else {
             while (sz--) {
@@ -159,13 +158,18 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
                 if (*fmt == 'x') {
                     mp_binary_set_val(fmt_type, *fmt, MP_OBJ_NEW_SMALL_INT(0), p_base, &p);
                 } else {
-                    mp_binary_set_val(fmt_type, *fmt, args[i], p_base, &p);
+                    if (i < n_args) {
+                        mp_binary_set_val(fmt_type, *fmt, args[i], p_base, &p);
+                    }
                     i++;
                 }
             }
         }
         fmt++;
     }
+    if (i != n_args) {
+        mp_raise_ValueError_varg(translate("%q length must be %d"), MP_QSTR_args, i);
+    }
 }
 
 mp_obj_tuple_t *shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p, bool exact_size) {
diff --git a/tests/circuitpython/struct_nargs.py b/tests/circuitpython/struct_nargs.py
new file mode 100644
index 0000000000..0a0cb140c3
--- /dev/null
+++ b/tests/circuitpython/struct_nargs.py
@@ -0,0 +1,38 @@
+import struct
+
+
+def do_pack(*args):
+    try:
+        print(struct.pack(*args))
+    except Exception as e:
+        print("ERROR")
+
+
+do_pack("H")
+do_pack("H", 1)
+do_pack("H", 1, 2)
+
+do_pack("2H")
+do_pack("2H", 1)
+do_pack("2H", 1, 2)
+
+do_pack("3H")
+do_pack("3H", 1)
+do_pack("3H", 1, 2)
+do_pack("3H", 1, 2, 3)
+do_pack("3H", 1, 2, 3, 4)
+
+do_pack("4sH", b"x")
+do_pack("4sH", b"x", 1)
+do_pack("4sH", b"x", 1, 2)
+
+do_pack("4s2H", b"x")
+do_pack("4s2H", b"x", 1)
+do_pack("4s2H", b"x", 1, 2)
+do_pack("4s2H", b"x", 1, 2, 3)
+
+do_pack("4s3H", b"x")
+do_pack("4s3H", b"x", 1)
+do_pack("4s3H", b"x", 1, 2)
+do_pack("4s3H", b"x", 1, 2, 3)
+do_pack("4s3H", b"x", 1, 2, 3, 4)
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 65f67f0727..8014dd3010 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -35,15 +35,15 @@ bitmaptools     btree           cexample        cmath
 collections     cppexample      displayio       errno
 ffi             framebuf        gc              hashlib
 json            math            qrio            rainbowio
-re              sys             termios         traceback
-ubinascii       uctypes         uerrno          uheapq
-uio             ujson           ulab            ulab.numpy
-ulab.numpy.fft  ulab.numpy.linalg               ulab.scipy
-ulab.scipy.linalg               ulab.scipy.optimize
-ulab.scipy.signal               ulab.scipy.special
-ulab.utils      uos             urandom         ure
-uselect         ustruct         utime           utimeq
-uzlib           zlib
+re              struct          sys             termios
+traceback       ubinascii       uctypes         uerrno
+uheapq          uio             ujson           ulab
+ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
+ulab.scipy      ulab.scipy.linalg
+ulab.scipy.optimize             ulab.scipy.signal
+ulab.scipy.special              ulab.utils      uos
+urandom         ure             uselect         utime
+utimeq          uzlib           zlib
 ime
 
 utime           utimeq

From 98c546bf57977c73eddf923475b7bb23db0ec600 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Mar 2023 10:16:48 -0500
Subject: [PATCH 2075/2403] call common validation function

Co-authored-by: MicroDev <70126934+microdev1@users.noreply.github.com>
---
 shared-module/struct/__init__.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index dedaf93afa..b595504969 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -167,9 +167,7 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
         }
         fmt++;
     }
-    if (i != n_args) {
-        mp_raise_ValueError_varg(translate("%q length must be %d"), MP_QSTR_args, i);
-    }
+    (void)mp_arg_validate_length(n_args, i, MP_QSTR_args);
 }
 
 mp_obj_tuple_t *shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p, bool exact_size) {

From b5834886521a16419af25c512472029f97234cd6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 22 Mar 2023 09:24:03 -0700
Subject: [PATCH 2076/2403] Fix stub

---
 supervisor/stub/stack.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/supervisor/stub/stack.c b/supervisor/stub/stack.c
index 2abc197878..bb6e0d4cb0 100644
--- a/supervisor/stub/stack.c
+++ b/supervisor/stub/stack.c
@@ -39,8 +39,9 @@ void stack_init(void) {
 void stack_resize(void) {
 }
 
-void set_next_stack_size(uint32_t size) {
+bool set_next_stack_size(uint32_t size) {
     (void)size;
+    return true;
 }
 
 uint32_t get_current_stack_size(void) {

From 32973423046b1804648e95c6891d3a7798cdb03e Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 22 Mar 2023 17:39:25 +0100
Subject: [PATCH 2077/2403] 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             | 12 ++++--------
 locale/cs.po             | 12 ++++--------
 locale/de_DE.po          | 27 +++++++++++++++------------
 locale/el.po             | 12 ++++--------
 locale/en_GB.po          | 12 ++++--------
 locale/es.po             | 27 +++++++++++++++------------
 locale/fil.po            | 12 ++++--------
 locale/fr.po             | 27 +++++++++++++++------------
 locale/hi.po             | 12 ++++--------
 locale/it_IT.po          | 12 ++++--------
 locale/ja.po             | 12 ++++--------
 locale/ko.po             | 12 ++++--------
 locale/nl.po             | 12 ++++--------
 locale/pl.po             | 12 ++++--------
 locale/pt_BR.po          | 27 +++++++++++++++------------
 locale/ru.po             | 12 ++++--------
 locale/sv.po             | 27 +++++++++++++++------------
 locale/tr.po             | 12 ++++--------
 locale/zh_Latn_pinyin.po | 27 +++++++++++++++------------
 19 files changed, 142 insertions(+), 176 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index f6960665b4..a136f6e498 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -30,14 +30,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1264,6 +1256,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index 0ffdbdcc67..1d666730ec 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -32,14 +32,6 @@ msgstr ""
 "\n"
 "Kód byl zastaven kvůli automatickému načtení. K načtení dojde brzy.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1264,6 +1256,10 @@ msgstr "Chybný BLE parametr"
 msgid "Invalid BSSID"
 msgstr "Chybné BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Chybná MAC adresa"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 9f2c83e8cc..f6bc0b789e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -31,18 +31,6 @@ msgstr ""
 "\n"
 "Code wurde durch automatisches Neuladen gestoppt. Wird bald neu geladen.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"Ungültige CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1287,6 +1275,10 @@ msgstr "Ungültiges BLE Parameter"
 msgid "Invalid BSSID"
 msgstr "Ungültige BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Ungültige MAC-Adresse"
@@ -4473,6 +4465,17 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "Ungültige CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Gib mindestens einen UART-Pin an"
 
diff --git a/locale/el.po b/locale/el.po
index 81118aa8fd..f2382feb94 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -35,14 +35,6 @@ msgstr ""
 "Ο κώδικας σταμάτησε λόγω της αυτόματης επαναφόρτωσης. Η επαναφόρτωση θα "
 "γίνει σύντομα.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1273,6 +1265,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 9ced3137b9..45131d1dcb 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -34,14 +34,6 @@ msgstr ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1265,6 +1257,10 @@ msgstr "Invalid BLE parameter"
 msgid "Invalid BSSID"
 msgstr "Invalid BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index ee2af9d603..cf81206c3d 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -34,18 +34,6 @@ msgstr ""
 "\n"
 "Código detenido por la auto-recarga. Recargando pronto.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"CIRCUITPY_PYSTACK_SIZE inválido\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1302,6 +1290,10 @@ msgstr "Parámetro BLE invalido"
 msgid "Invalid BSSID"
 msgstr "BSSID inválido"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Dirección MAC inválida"
@@ -4481,6 +4473,17 @@ 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 ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "CIRCUITPY_PYSTACK_SIZE inválido\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Suministre al menos un pin UART"
 
diff --git a/locale/fil.po b/locale/fil.po
index f943746a34..591620e6c4 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -29,14 +29,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1264,6 +1256,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 424e16a1b5..4ebcc918bf 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -34,18 +34,6 @@ msgstr ""
 "Le code a été arrêté par l'actualisation automatique. Rechargement "
 "prochain.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"CIRCUITPY_PYSTACK_SIZE invalide\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1308,6 +1296,10 @@ msgstr "Paramètre BLE invalide"
 msgid "Invalid BSSID"
 msgstr "BSSID invalide"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Adresse MAC invalide"
@@ -4500,6 +4492,17 @@ 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 ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "CIRCUITPY_PYSTACK_SIZE invalide\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Fournissez au moins une broche UART"
 
diff --git a/locale/hi.po b/locale/hi.po
index 94a42e19f8..2b9825e4b8 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -28,14 +28,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1252,6 +1244,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 5fb7e50d6b..84bc790df4 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -31,14 +31,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1266,6 +1258,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 7e63cb55c3..081dd57e9f 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -34,14 +34,6 @@ msgstr ""
 "\n"
 "オートリロードでコード実行は中止された。まもなくリロードする。\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1265,6 +1257,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr "不正なBSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 129c9b4bcd..7668d8c8a3 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -29,14 +29,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1255,6 +1247,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 87fdb61c60..61c96a877d 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -28,14 +28,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1260,6 +1252,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr "Ongeldig BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 1348c0f321..642e5f99de 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -30,14 +30,6 @@ msgid ""
 "Code stopped by auto-reload. Reloading soon.\n"
 msgstr ""
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1260,6 +1252,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index fdf2eaaf31..bef3ea8849 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -32,18 +32,6 @@ msgstr ""
 "\n"
 "O código parou pela recarga automática. Recarregando em breve.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"CIRCUITPY_PYSTACK_SIZE inválido\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1298,6 +1286,10 @@ msgstr "Parâmetro BLE inválido"
 msgid "Invalid BSSID"
 msgstr "BSSID Inválido"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Endereço MAC inválido"
@@ -4481,6 +4473,17 @@ 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 ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "CIRCUITPY_PYSTACK_SIZE inválido\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Forneça pelo menos um pino UART"
 
diff --git a/locale/ru.po b/locale/ru.po
index 0fe6cfac97..2ad4b094a2 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -34,14 +34,6 @@ msgstr ""
 "\n"
 "Программа остановлена автоматической перезагрузкой. Скоро перезагрузка.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1297,6 +1289,10 @@ msgstr "Недопустимый параметр BLE"
 msgid "Invalid BSSID"
 msgstr "Неверный BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Неверный MAC-адрес"
diff --git a/locale/sv.po b/locale/sv.po
index 84ce4b6ecb..3c2c9f6520 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -32,18 +32,6 @@ msgstr ""
 "\n"
 "Koden stoppades av automatisk laddning. Omladdning sker strax.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"Ogiltig CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1283,6 +1271,10 @@ msgstr "Ogiltig BLE-parameter"
 msgid "Invalid BSSID"
 msgstr "Ogiltig BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Ogiltig MAC-adress"
@@ -4443,6 +4435,17 @@ 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 ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "Ogiltig CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Ange minst en UART-pinne"
 
diff --git a/locale/tr.po b/locale/tr.po
index 67a73375ea..bd9d746940 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -34,14 +34,6 @@ msgstr ""
 "Program otomatik yeniden yükleme tarafından durduruldu. Birazdan tekrar "
 "yüklenecek.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1270,6 +1262,10 @@ msgstr "Geçersiz BLE parametresi"
 msgid "Invalid BSSID"
 msgstr "Geçersiz BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "Geçersiz MAC adresi"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 485c30353d..72df0f5aed 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -34,18 +34,6 @@ msgstr ""
 "dài mǎ yīn zì dòng chóng xīn jiā zǎi ér tíng zhǐ. jí jiāng chóng xīn jiā "
 "zǎi.\n"
 
-#: main.c
-msgid ""
-"\n"
-"Invalid CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\r"
-msgstr ""
-"\n"
-"wú xiào CIRCUITPY_PYSTACK_SIZE\n"
-"\n"
-"\n"
-
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
@@ -1290,6 +1278,10 @@ msgstr "wú xiào BLE cān shù"
 msgid "Invalid BSSID"
 msgstr "Wúxiào de BSSID"
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr "wú xiào de MAC dì zhǐ"
@@ -4449,6 +4441,17 @@ 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 ""
+#~ "\n"
+#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\r"
+#~ msgstr ""
+#~ "\n"
+#~ "wú xiào CIRCUITPY_PYSTACK_SIZE\n"
+#~ "\n"
+#~ "\n"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Dìngyì zhìshǎo yīgè UART yǐn jiǎo"
 

From 08358ecd5004fe14169d0851dcae8635a13befe3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 20 Mar 2023 10:28:46 -0500
Subject: [PATCH 2078/2403] constify spi, i2c, uart bank data

---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h | 6 +++---
 ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h            | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
index bdf3299217..0c2b5893bc 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
@@ -29,7 +29,7 @@
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
 
-LPI2C_Type *mcu_i2c_banks[2] = { LPI2C1, LPI2C2 };
+LPI2C_Type *const mcu_i2c_banks[2] = { LPI2C1, LPI2C2 };
 
 const mcu_periph_obj_t mcu_i2c_sda_list[8] = {
     PERIPH_PIN(1, 0, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 0, &pin_GPIO_AD_13),
@@ -55,7 +55,7 @@ const mcu_periph_obj_t mcu_i2c_scl_list[8] = {
     PERIPH_PIN(2, 3, kIOMUXC_LPI2C2_SCL_SELECT_INPUT, 3, &pin_GPIO_10),
 };
 
-LPSPI_Type *mcu_spi_banks[2] = { LPSPI1, LPSPI2 };
+LPSPI_Type *const mcu_spi_banks[2] = { LPSPI1, LPSPI2 };
 
 const mcu_periph_obj_t mcu_spi_sck_list[4] = {
     PERIPH_PIN(1, 0, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 0, &pin_GPIO_AD_06),
@@ -81,7 +81,7 @@ const mcu_periph_obj_t mcu_spi_miso_list[4] = {
     PERIPH_PIN(2, 1, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_SD_09),
 };
 
-LPUART_Type *mcu_uart_banks[4] = { LPUART1, LPUART2, LPUART3, LPUART4 };
+LPUART_Type *const mcu_uart_banks[4] = { LPUART1, LPUART2, LPUART3, LPUART4 };
 
 const mcu_periph_obj_t mcu_uart_rx_list[9] = {
     PERIPH_PIN(1, 2, kIOMUXC_LPUART1_RXD_SELECT_INPUT, 0, &pin_GPIO_SD_11),
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
index c50d73294b..b3bddcb76b 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
@@ -27,18 +27,18 @@
 #ifndef MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
 #define MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
 
-extern LPI2C_Type *mcu_i2c_banks[2];
+extern LPI2C_Type *const mcu_i2c_banks[2];
 
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
 
-extern LPSPI_Type *mcu_spi_banks[2];
+extern LPSPI_Type *const mcu_spi_banks[2];
 
 extern const mcu_periph_obj_t mcu_spi_sck_list[4];
 extern const mcu_periph_obj_t mcu_spi_mosi_list[4];
 extern const mcu_periph_obj_t mcu_spi_miso_list[4];
 
-extern LPUART_Type *mcu_uart_banks[4];
+extern LPUART_Type *const mcu_uart_banks[4];
 
 extern const mcu_periph_obj_t mcu_uart_rx_list[9];
 extern const mcu_periph_obj_t mcu_uart_tx_list[9];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
index 5b21c12c2a..ffcadbb696 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
 
-LPI2C_Type *mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
+LPI2C_Type *const mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
 
 const mcu_periph_obj_t mcu_i2c_sda_list[8] = {
     PERIPH_PIN(1, 6, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 0, &pin_GPIO_EMC_03),
@@ -60,7 +60,7 @@ const mcu_periph_obj_t mcu_i2c_scl_list[8] = {
     PERIPH_PIN(4, 3, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 1, &pin_GPIO_SD_B1_02),
 };
 
-LPSPI_Type *mcu_spi_banks[4] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4 };
+LPSPI_Type *const mcu_spi_banks[4] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4 };
 
 const mcu_periph_obj_t mcu_spi_sck_list[8] = {
     PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 0, &pin_GPIO_SD_B0_02),
@@ -104,7 +104,7 @@ const mcu_periph_obj_t mcu_spi_miso_list[8] = {
     PERIPH_PIN(4, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_35),
 };
 
-LPUART_Type *mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
+LPUART_Type *const mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
 
 const mcu_periph_obj_t mcu_uart_rx_list[16] = {
     PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_07),
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
index 6c778ad525..9074987cd8 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
@@ -28,18 +28,18 @@
 #ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
 #define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
 
-extern LPI2C_Type *mcu_i2c_banks[4];
+extern LPI2C_Type *const mcu_i2c_banks[4];
 
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
 
-extern LPSPI_Type *mcu_spi_banks[4];
+extern LPSPI_Type *const mcu_spi_banks[4];
 
 extern const mcu_periph_obj_t mcu_spi_sck_list[8];
 extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
 extern const mcu_periph_obj_t mcu_spi_miso_list[8];
 
-extern LPUART_Type *mcu_uart_banks[8];
+extern LPUART_Type *const mcu_uart_banks[8];
 
 extern const mcu_periph_obj_t mcu_uart_rx_list[16];
 extern const mcu_periph_obj_t mcu_uart_tx_list[16];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
index 19ce48f288..b6efe5e6a9 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
@@ -29,7 +29,7 @@
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
 
-LPI2C_Type *mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
+LPI2C_Type *const mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
 
 const mcu_periph_obj_t mcu_i2c_sda_list[9] = {
     PERIPH_PIN(1, 2, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 0, &pin_GPIO_SD_B1_05),
@@ -61,7 +61,7 @@ const mcu_periph_obj_t mcu_i2c_scl_list[9] = {
     PERIPH_PIN(4, 0, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 1, &pin_GPIO_AD_B0_12),
 };
 
-LPSPI_Type *mcu_spi_banks[4] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4 };
+LPSPI_Type *const mcu_spi_banks[4] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4 };
 
 const mcu_periph_obj_t mcu_spi_sck_list[8] = {
     PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 0, &pin_GPIO_EMC_27),
@@ -105,7 +105,7 @@ const mcu_periph_obj_t mcu_spi_miso_list[8] = {
     PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SDI_SELECT_INPUT, 1, &pin_GPIO_B1_05),
 };
 
-LPUART_Type *mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
+LPUART_Type *const mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
 
 const mcu_periph_obj_t mcu_uart_rx_list[18] = {
     PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_13),
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
index 067c05d0d0..9a06a491f9 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
@@ -27,18 +27,18 @@
 #ifndef MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
 #define MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
 
-extern LPI2C_Type *mcu_i2c_banks[4];
+extern LPI2C_Type *const mcu_i2c_banks[4];
 
 extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[9];
 
-extern LPSPI_Type *mcu_spi_banks[4];
+extern LPSPI_Type *const mcu_spi_banks[4];
 
 extern const mcu_periph_obj_t mcu_spi_sck_list[8];
 extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
 extern const mcu_periph_obj_t mcu_spi_miso_list[8];
 
-extern LPUART_Type *mcu_uart_banks[8];
+extern LPUART_Type *const mcu_uart_banks[8];
 
 extern const mcu_periph_obj_t mcu_uart_rx_list[18];
 extern const mcu_periph_obj_t mcu_uart_tx_list[18];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
index c77497a775..818b203da4 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
@@ -72,9 +72,9 @@ typedef struct {
         .pin = p_pin, \
     }
 
-extern LPI2C_Type *mcu_i2c_banks[];
-extern LPSPI_Type *mcu_spi_banks[];
-extern LPUART_Type *mcu_uart_banks[];
+extern LPI2C_Type *const mcu_i2c_banks[];
+extern LPSPI_Type *const mcu_spi_banks[];
+extern LPUART_Type *const mcu_uart_banks[];
 
 #ifdef MIMXRT1011_SERIES
 #include "MIMXRT1011/periph.h"

From 1e1172bc246d325d342d48a35663116bafdfc631 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 21 Mar 2023 12:07:03 -0500
Subject: [PATCH 2079/2403] fix sorting of block

---
 ports/mimxrt10xx/mpconfigport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 236d5b9966..7eaac85b34 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -11,8 +11,8 @@ CIRCUITPY_TUSB_MEM_ALIGN = 32
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0

From 36dbaf4ccc51c61c11b90954ddbbed90927fb7ef Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 22 Mar 2023 10:14:34 -0700
Subject: [PATCH 2080/2403] Add more checks for read-only Bitmaps

Fixes #7768
---
 shared-module/displayio/Bitmap.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index dc82d04e05..8cb80a661d 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -128,6 +128,9 @@ void displayio_bitmap_set_dirty_area(displayio_bitmap_t *self, const displayio_a
 }
 
 void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y, uint32_t value) {
+    if (self->read_only) {
+        mp_raise_RuntimeError(translate("Read-only"));
+    }
     // Writes the color index value into a pixel position
     // Must update the dirty area separately
 
@@ -160,6 +163,9 @@ void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y
 
 void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16_t y, displayio_bitmap_t *source,
     int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint32_t skip_index, bool skip_index_none) {
+    if (self->read_only) {
+        mp_raise_RuntimeError(translate("Read-only"));
+    }
     // Copy region of "source" bitmap into "self" bitmap at location x,y in the "self"
     // If skip_value is encountered in the source bitmap, it will not be copied.
     // If skip_value is `None`, then all pixels are copied.
@@ -213,6 +219,9 @@ void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16
 }
 
 void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *self, int16_t x, int16_t y, uint32_t value) {
+    if (self->read_only) {
+        mp_raise_RuntimeError(translate("Read-only"));
+    }
     // update the dirty region
     displayio_area_t a = {x, y, x + 1, y + 1, NULL};
     displayio_bitmap_set_dirty_area(self, &a);
@@ -223,7 +232,7 @@ void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *self, int16_t x,
 }
 
 displayio_area_t *displayio_bitmap_get_refresh_areas(displayio_bitmap_t *self, displayio_area_t *tail) {
-    if (self->dirty_area.x1 == self->dirty_area.x2) {
+    if (self->dirty_area.x1 == self->dirty_area.x2 || self->read_only) {
         return tail;
     }
     self->dirty_area.next = tail;
@@ -231,11 +240,17 @@ displayio_area_t *displayio_bitmap_get_refresh_areas(displayio_bitmap_t *self, d
 }
 
 void displayio_bitmap_finish_refresh(displayio_bitmap_t *self) {
+    if (self->read_only) {
+        return;
+    }
     self->dirty_area.x1 = 0;
     self->dirty_area.x2 = 0;
 }
 
 void common_hal_displayio_bitmap_fill(displayio_bitmap_t *self, uint32_t value) {
+    if (self->read_only) {
+        mp_raise_RuntimeError(translate("Read-only"));
+    }
     displayio_area_t a = {0, 0, self->width, self->height, NULL};
     displayio_bitmap_set_dirty_area(self, &a);
 

From c6bc9c48c9958947c5e65e712bda953a024bfef0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Mar 2023 12:14:00 -0500
Subject: [PATCH 2081/2403] mimxrt10xx: implement i2sout

tested on metro m7 (green prototype version) with max98357a i2s amplifier and the following test code:
```py
import board
import time
import digitalio
from audiobusio import I2SOut
from audiocore import RawSample
from microcontroller import pin
from ulab import numpy as np

n = np.array(np.sin(np.linspace(0, np.pi*2, 218, endpoint=False)) * 200, dtype=np.int16)
print(n)
r = RawSample(n, sample_rate=8000, channel_count=2)
def main():
    with digitalio.DigitalInOut(board.LED) as l:
        l.switch_to_output(True)
        value = False
        while True:
            with I2SOut(pin.GPIO_06, pin.GPIO_07, pin.GPIO_04) as i:
                time.sleep(.01)
                l.value = value = not value
                i.play(r, loop=True)
                print(i.playing)
                time.sleep(.5)
                i.stop()
                print("STOPPED")
                print(i.playing)
                time.sleep(.5)
                i.play(r, loop=True)
                print(i.playing)
                print("PLAY AGAIN")
                time.sleep(.5)
            time.sleep(1)
```

Only stereo, 16-bit, raw samples were tested; the sample rate is actually fixed
at 48kHz in the core right now. There is more to do, but the basics work.

# Conflicts:
#	ports/mimxrt10xx/Makefile
#	ports/mimxrt10xx/mpconfigport.mk
---
 ports/mimxrt10xx/Makefile                     |   6 +-
 ports/mimxrt10xx/background.c                 |   3 -
 ports/mimxrt10xx/boards/metro_m7_1011/pins.c  |   4 +
 .../mimxrt10xx/common-hal/audiobusio/I2SOut.c | 154 +++++++
 .../mimxrt10xx/common-hal/audiobusio/I2SOut.h |  47 ++
 .../mimxrt10xx/common-hal/audiobusio/PDMIn.c  |   0
 .../mimxrt10xx/common-hal/audiobusio/PDMIn.h  |   0
 .../common-hal/audiobusio/__init__.c          | 422 ++++++++++++++++++
 .../common-hal/audiobusio/__init__.h          |  59 +++
 .../common-hal/microcontroller/Pin.c          |  19 +-
 .../common-hal/microcontroller/Pin.h          |  12 +-
 ports/mimxrt10xx/mpconfigport.mk              |   4 +-
 .../mimxrt10xx/MIMXRT1011/periph.c            |  25 ++
 .../mimxrt10xx/MIMXRT1011/periph.h            |   7 +
 .../mimxrt10xx/MIMXRT1021/periph.c            |  55 +++
 .../mimxrt10xx/MIMXRT1021/periph.h            |  10 +-
 .../mimxrt10xx/MIMXRT1062/periph.c            |  56 +++
 .../mimxrt10xx/MIMXRT1062/periph.h            |   7 +
 .../peripherals/mimxrt10xx/periph.h           |   2 +-
 ports/mimxrt10xx/supervisor/port.c            |   7 +-
 20 files changed, 878 insertions(+), 21 deletions(-)
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/PDMIn.c
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/PDMIn.h
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 create mode 100644 ports/mimxrt10xx/common-hal/audiobusio/__init__.h

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index d8d12b74da..27f3b0e304 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -119,6 +119,7 @@ SRC_SDK := \
 	drivers/lpuart/fsl_lpuart.c \
 	drivers/ocotp/fsl_ocotp.c \
 	drivers/pwm/fsl_pwm.c \
+	drivers/sai/fsl_sai.c \
 	drivers/snvs_hp/fsl_snvs_hp.c \
 	drivers/snvs_lp/fsl_snvs_lp.c \
 	drivers/tempmon/fsl_tempmon.c \
@@ -146,11 +147,6 @@ SRC_C += \
 
 endif
 
-# TODO
-#ifeq ($(CIRCUITPY_AUDIOBUSIO),1)
-#SRC_C += peripherals/samd/i2s.c peripherals/samd/$(CHIP_FAMILY)/i2s.c
-#endif
-#
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
                           $(addprefix common-hal/, $(SRC_COMMON_HAL))
diff --git a/ports/mimxrt10xx/background.c b/ports/mimxrt10xx/background.c
index 529f791a39..faa2bda3f8 100644
--- a/ports/mimxrt10xx/background.c
+++ b/ports/mimxrt10xx/background.c
@@ -35,9 +35,6 @@ void PLACE_IN_ITCM(port_background_task)(void) {
 }
 
 void port_background_tick(void) {
-    #if CIRCUITPY_AUDIOIO || CIRCUITPY_AUDIOBUSIO
-    audio_dma_background();
-    #endif
 }
 
 void port_start_background_task(void) {
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
index 886909e1dd..f48066dae1 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
@@ -56,5 +56,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_STEMMA_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_I2S_WSEL), MP_ROM_PTR(&pin_GPIO_06) }, // D10
+    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO_07) }, // D9
+    { MP_ROM_QSTR(MP_QSTR_I2S_DOUT), MP_ROM_PTR(&pin_GPIO_04) }, // D12
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
new file mode 100644
index 0000000000..06765afe02
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
@@ -0,0 +1,154 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+#include 
+
+#include "mpconfigport.h"
+
+// Some boards don't implement I2SOut, so suppress any routines from here.
+#if CIRCUITPY_AUDIOBUSIO_I2SOUT
+
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "common-hal/audiobusio/I2SOut.h"
+#include "shared-bindings/audiobusio/I2SOut.h"
+#include "shared-bindings/audiocore/RawSample.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/shared/translate/translate.h"
+#include "supervisor/shared/tick.h"
+
+// Where required we use identifier names that are required by NXP's
+// API, even though they do not conform to the naming standards that Adafruit
+// strives to adhere to. https://www.adafruit.com/blacklivesmatter
+#include "sdk/drivers/sai/fsl_sai.h"
+
+STATIC void config_periph_pin(const mcu_periph_obj_t *periph) {
+    if (!periph) {
+        return;
+    }
+    if (periph->pin->mux_reg) {
+        IOMUXC_SetPinMux(
+            periph->pin->mux_reg, periph->mux_mode,
+            periph->input_reg, periph->input_idx,
+            0,
+            1);
+    }
+
+    IOMUXC_SetPinConfig(0, 0, 0, 0,
+        periph->pin->cfg_reg,
+        IOMUXC_SW_PAD_CTL_PAD_HYS(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PUS(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        | IOMUXC_SW_PAD_CTL_PAD_DSE(4)
+        | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
+}
+
+// Caller validates that pins are free.
+void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self,
+    const mcu_pin_obj_t *bit_clock, const mcu_pin_obj_t *word_select,
+    const mcu_pin_obj_t *data, bool left_justified) {
+
+    int instance = -1;
+    const mcu_periph_obj_t *bclk_periph = find_pin_function(mcu_sai_tx_bclk_list, bit_clock, &instance, MP_QSTR_bit_clock);
+    const mcu_periph_obj_t *sync_periph = find_pin_function(mcu_sai_tx_sync_list, word_select, &instance, MP_QSTR_word_select);
+    const mcu_periph_obj_t *data_periph = find_pin_function(mcu_sai_tx_data0_list, data, &instance, MP_QSTR_data);
+
+    sai_transceiver_t config;
+    SAI_GetClassicI2SConfig(&config, 16, kSAI_Stereo, 1);
+    config.syncMode = kSAI_ModeAsync;
+    config.fifo.fifoPacking = kSAI_FifoPackingDisabled;
+    // These identifier names are required by NXP's API, even though they do
+    // not conform to the naming standards that Adafruit strives to adhere to.
+    // https://www.adafruit.com/blacklivesmatter
+    config.masterSlave = kSAI_Master;
+    port_i2s_initialize(&self->i2s, instance, &config);
+
+    self->bit_clock = bit_clock;
+    self->word_select = word_select;
+    self->data = data;
+    claim_pin(bit_clock);
+    claim_pin(word_select);
+    claim_pin(data);
+    config_periph_pin(data_periph);
+    config_periph_pin(sync_periph);
+    config_periph_pin(bclk_periph);
+}
+
+bool common_hal_audiobusio_i2sout_deinited(audiobusio_i2sout_obj_t *self) {
+    return port_i2s_deinited(&self->i2s);
+}
+
+void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) {
+    if (common_hal_audiobusio_i2sout_deinited(self)) {
+        return;
+    }
+
+    port_i2s_deinit(&self->i2s);
+
+    common_hal_reset_pin(self->bit_clock);
+    self->bit_clock = NULL;
+
+    common_hal_reset_pin(self->word_select);
+    self->word_select = NULL;
+
+    common_hal_reset_pin(self->data);
+    self->data = NULL;
+}
+
+void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
+    mp_obj_t sample, bool loop) {
+    if (common_hal_audiobusio_i2sout_get_playing(self)) {
+        common_hal_audiobusio_i2sout_stop(self);
+    }
+    port_i2s_play(&self->i2s, sample, loop);
+}
+
+void common_hal_audiobusio_i2sout_pause(audiobusio_i2sout_obj_t *self) {
+    port_i2s_pause(&self->i2s);
+}
+
+void common_hal_audiobusio_i2sout_resume(audiobusio_i2sout_obj_t *self) {
+    port_i2s_resume(&self->i2s);
+}
+
+bool common_hal_audiobusio_i2sout_get_paused(audiobusio_i2sout_obj_t *self) {
+    return port_i2s_get_paused(&self->i2s);
+}
+
+void common_hal_audiobusio_i2sout_stop(audiobusio_i2sout_obj_t *self) {
+    port_i2s_stop(&self->i2s);
+}
+
+bool common_hal_audiobusio_i2sout_get_playing(audiobusio_i2sout_obj_t *self) {
+    return port_i2s_get_playing(&self->i2s);
+}
+
+#endif // CIRCUITPY_AUDIOBUSIO_I2SOUT
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
new file mode 100644
index 0000000000..c4194402be
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "supervisor/background_callback.h"
+#include "common-hal/microcontroller/Pin.h"
+
+#include "common-hal/audiobusio/__init__.h"
+
+// Some boards don't implement I2SOut, so suppress any routines from here.
+#if CIRCUITPY_AUDIOBUSIO_I2SOUT
+
+#include "sdk/drivers/sai/fsl_sai.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    i2s_t i2s;
+    const mcu_pin_obj_t *bit_clock;
+    const mcu_pin_obj_t *word_select;
+    const mcu_pin_obj_t *data;
+} audiobusio_i2sout_obj_t;
+
+#endif
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/PDMIn.c b/ports/mimxrt10xx/common-hal/audiobusio/PDMIn.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/PDMIn.h b/ports/mimxrt10xx/common-hal/audiobusio/PDMIn.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
new file mode 100644
index 0000000000..2be6c6bcbb
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -0,0 +1,422 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "py/runtime.h"
+
+#include "common-hal/audiobusio/__init__.h"
+#include "shared-module/audiocore/__init__.h"
+
+#define SAI_CLOCK_SOURCE_SELECT (2U)
+#define SAI_CLOCK_SOURCE_DIVIDER (63U)
+#define SAI_CLOCK_SOURCE_PRE_DIVIDER (0U)
+
+#define SAI_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_AudioPllClk) / (SAI_CLOCK_SOURCE_DIVIDER + 1U) / \
+    (SAI_CLOCK_SOURCE_PRE_DIVIDER + 1U))
+
+// must match what's in clocks.c (but that's a C file so there's no way to include it)
+// This is 480MMHz * (18/17) / 8 (around 63.5MHz) and there's no partiuclar
+// logic to this value that I was able to determine.
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+
+#define AUDIO_BUFFER_FRAME_COUNT (128) // in uint32_t; there are 4, giving 2048 bytes. In all they hold 10ms @ stereo 16-bit 48kHz before all buffers drain
+
+/*
+ * AUDIO PLL setting: Frequency = Fref * (DIV_SELECT + NUM / DENOM)
+ *                              = 24 * (32 + 77/100)
+ *                              = 786.48 MHz
+ */
+const clock_audio_pll_config_t audioPllConfig = {
+    .loopDivider = 32,  /* PLL loop divider. Valid range for DIV_SELECT divider value: 27~54. */
+    .postDivider = 1,   /* Divider after the PLL, should only be 1, 2, 4, 8, 16. */
+    .numerator = 77,    /* 30 bit numerator of fractional loop divider. */
+    .denominator = 100, /* 30 bit denominator of fractional loop divider */
+};
+
+static I2S_Type *const i2s_instances[] = I2S_BASE_PTRS;
+static uint8_t i2s_in_use;
+
+static I2S_Type *SAI_GetPeripheral(int idx) {
+    if (idx < 0 || idx >= (int)MP_ARRAY_SIZE(i2s_instances)) {
+        return NULL;
+    }
+    return i2s_instances[idx];
+}
+
+static int SAI_GetInstance(I2S_Type *peripheral) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(i2s_instances); i++) { if (peripheral == i2s_instances[i]) {
+                                                                    return i;
+                                                                }
+    }
+    return -1;
+}
+
+static bool i2s_clock_off(I2S_Type *peripheral) {
+    int index = SAI_GetInstance(peripheral);
+    switch (index) {
+        #if defined(SAI0)
+        case 0:
+            CLOCK_DisableClock(kCLOCK_Sai0);
+            return true;
+        #endif
+        #if defined(SAI1)
+        case 1:
+            CLOCK_DisableClock(kCLOCK_Sai1);
+            return true;
+        #endif
+        #if defined(SAI2)
+        case 2:
+            CLOCK_DisableClock(kCLOCK_Sai2);
+            return true;
+        #endif
+        #if defined(SAI3)
+        case 3:
+            CLOCK_DisableClock(kCLOCK_Sai3);
+            return true;
+        #endif
+        #if defined(SAI4)
+        case 4:
+            CLOCK_DisableClock(kCLOCK_Sai4);
+            return true;
+        #endif
+        #if defined(SAI5)
+        case 5:
+            CLOCK_DisableClock(kCLOCK_Sai5);
+            return true;
+        #endif
+        #if defined(SAI6)
+        case 6:
+            CLOCK_DisableClock(kCLOCK_Sai6);
+            return true;
+        #endif
+        #if defined(SAI7)
+        case 7:
+            CLOCK_DisableClock(kCLOCK_Sai7);
+            return true;
+        #endif
+    }
+    return false;
+}
+
+static bool i2s_clocking(I2S_Type *peripheral) {
+    int index = SAI_GetInstance(peripheral);
+    switch (index) {
+        #if defined(SAI0)
+        case 0:
+            CLOCK_SetDiv(kCLOCK_Sai0PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai0Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai0Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai0);
+            return true;
+        #endif
+        #if defined(SAI1)
+        case 1:
+            CLOCK_SetDiv(kCLOCK_Sai1PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai1Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai1Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai1);
+            return true;
+        #endif
+        #if defined(SAI2)
+        case 2:
+            CLOCK_SetDiv(kCLOCK_Sai2PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai2Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai2Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai2);
+            return true;
+        #endif
+        #if defined(SAI3)
+        case 3:
+            CLOCK_SetDiv(kCLOCK_Sai3PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai3Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai3Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai3);
+            return true;
+        #endif
+        #if defined(SAI4)
+        case 4:
+            CLOCK_SetDiv(kCLOCK_Sai4PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai4Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai4Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai4);
+            return true;
+        #endif
+        #if defined(SAI5)
+        case 5:
+            CLOCK_SetDiv(kCLOCK_Sai5PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai5Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai5Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai5);
+            return true;
+        #endif
+        #if defined(SAI6)
+        case 6:
+            CLOCK_SetDiv(kCLOCK_Sai6PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai6Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai6Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai6);
+            return true;
+        #endif
+        #if defined(SAI7)
+        case 7:
+            CLOCK_SetDiv(kCLOCK_Sai7PreDiv, SAI_CLOCK_SOURCE_PRE_DIVIDER);
+            CLOCK_SetDiv(kCLOCK_Sai7Div, SAI_CLOCK_SOURCE_DIVIDER);
+            CLOCK_SetMux(kCLOCK_Sai7Mux, SAI_CLOCK_SOURCE_SELECT);
+            CLOCK_EnableClock(kCLOCK_Sai7);
+            return true;
+        #endif
+    }
+    return false;
+}
+
+
+static bool i2s_queue_available(i2s_t *self) {
+    return !self->handle.saiQueue[self->handle.queueUser].data;
+}
+
+static void i2s_fill_buffer(i2s_t *self) {
+    if (!self->peripheral) {
+        return;
+    }
+    while (i2s_queue_available(self)) {
+        uint32_t *buffer = self->buffers[self->buffer_idx];
+        uint32_t *ptr = buffer, *end = buffer + AUDIO_BUFFER_FRAME_COUNT;
+        self->buffer_idx = (self->buffer_idx + 1) % SAI_XFER_QUEUE_SIZE;
+
+        while (self->playing && !self->paused && ptr < end) {
+            if (self->sample_data == self->sample_end) {
+                if (self->stopping) {
+                    // non-looping sample, previously returned GET_BUFFER_DONE
+                    self->playing = false;
+                    break;
+                }
+                uint32_t sample_buffer_length;
+                audioio_get_buffer_result_t get_buffer_result =
+                    audiosample_get_buffer(self->sample, false, 0,
+                        &self->sample_data, &sample_buffer_length);
+                self->sample_end = self->sample_data + sample_buffer_length;
+                if (get_buffer_result == GET_BUFFER_DONE) {
+                    if (self->loop) {
+                        audiosample_reset_buffer(self->sample, false, 0);
+                    } else {
+                        self->stopping = true;
+                    }
+                }
+                if (get_buffer_result == GET_BUFFER_ERROR || sample_buffer_length == 0) {
+                    self->stopping = true;
+                }
+            }
+            size_t input_bytecount = self->sample_end - self->sample_data;
+            size_t bytes_per_input_frame = self->channel_count * self->bytes_per_sample;
+            size_t framecount = MIN((size_t)(end - ptr), input_bytecount / bytes_per_input_frame);
+
+#define SAMPLE_TYPE(is_signed, channel_count, bytes_per_sample) ((is_signed) | ((channel_count) << 1) | ((bytes_per_sample) << 3))
+
+            switch (SAMPLE_TYPE(self->samples_signed, self->channel_count, self->bytes_per_sample)) {
+
+                case SAMPLE_TYPE(true, 2, 2):
+                    memcpy(ptr, self->sample_data, 4 * framecount);
+                    break;
+
+                case SAMPLE_TYPE(false, 2, 2):
+                    audiosample_convert_u16s_s16s((int16_t *)ptr, (uint16_t *)(void *)self->sample_data, framecount);
+                    break;
+
+                case SAMPLE_TYPE(true, 1, 2):
+                    audiosample_convert_s16m_s16s((int16_t *)ptr, (int16_t *)(void *)self->sample_data, framecount);
+                    break;
+
+                case SAMPLE_TYPE(false, 1, 2):
+                    audiosample_convert_u16m_s16s((int16_t *)ptr, (uint16_t *)(void *)self->sample_data, framecount);
+                    break;
+
+                case SAMPLE_TYPE(true, 2, 1):
+                    audiosample_convert_s8s_s16s((int16_t *)ptr, (int8_t *)(void *)self->sample_data, framecount);
+                    memcpy(ptr, self->sample_data, 4 * framecount);
+                    break;
+
+                case SAMPLE_TYPE(false, 2, 1):
+                    audiosample_convert_u8s_s16s((int16_t *)ptr, (uint8_t *)(void *)self->sample_data, framecount);
+                    break;
+
+                case SAMPLE_TYPE(true, 1, 1):
+                    audiosample_convert_s8m_s16s((int16_t *)ptr, (int8_t *)(void *)self->sample_data, framecount);
+                    break;
+
+                case SAMPLE_TYPE(false, 1, 1):
+                    audiosample_convert_u8m_s16s((int16_t *)ptr, (uint8_t *)(void *)self->sample_data, framecount);
+                    break;
+            }
+            self->sample_data += bytes_per_input_frame * framecount; // in bytes
+            ptr += framecount; // in frames
+        }
+        // Fill any remaining portion of the buffer with 'no sound'
+        memset(ptr, 0, (end - ptr) * sizeof(uint32_t));
+        sai_transfer_t xfer = {
+            .data = (uint8_t *)buffer,
+            .dataSize = AUDIO_BUFFER_FRAME_COUNT * sizeof(uint32_t),
+        };
+        int r = SAI_TransferSendNonBlocking(self->peripheral, &self->handle, &xfer);
+        if (r != kStatus_Success) {
+            mp_printf(&mp_plat_print, "transfer returned %d\n", (int)r);
+        }
+    }
+}
+
+static void i2s_callback_fun(void *self_in) {
+    i2s_t *self = self_in;
+    i2s_fill_buffer(self);
+}
+
+static void i2s_transfer_callback(I2S_Type *base, sai_handle_t *handle, status_t status, void *self_in) {
+    i2s_t *self = self_in;
+    if (status == kStatus_SAI_TxIdle) {
+        // a block has been finished
+        background_callback_add(&self->callback, i2s_callback_fun, self_in);
+    }
+}
+
+
+void port_i2s_initialize(i2s_t *self, int instance, sai_transceiver_t *config) {
+    if (!i2s_in_use) {
+        // need to set audio pll up!
+
+        /* DeInit Audio PLL. */
+        CLOCK_DeinitAudioPll();
+        /* Bypass Audio PLL. */
+        CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+        /* Set divider for Audio PLL. */
+        CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+        CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+        /* Enable Audio PLL output. */
+        CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+
+        CLOCK_InitAudioPll(&audioPllConfig);
+    }
+
+    I2S_Type *peripheral = SAI_GetPeripheral(instance);
+    if (!peripheral) {
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_I2SOut);
+    }
+    if (i2s_in_use & (1 << instance)) {
+        mp_raise_ValueError_varg(translate("%q in use"), MP_QSTR_I2SOut);
+    }
+    if (!i2s_clocking(peripheral)) {
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_I2SOut);
+    }
+    for (size_t i = 0; i < MP_ARRAY_SIZE(self->buffers); i++) {
+        self->buffers[i] = m_malloc(AUDIO_BUFFER_FRAME_COUNT * sizeof(uint32_t), false);
+    }
+    self->peripheral = peripheral;
+    SAI_Init(self->peripheral);
+    SAI_TransferTxCreateHandle(peripheral, &self->handle, i2s_transfer_callback, (void *)self);
+    SAI_TransferTxSetConfig(peripheral, &self->handle, config);
+    self->sample_rate = 0;
+    i2s_in_use |= (1 << instance);
+}
+
+bool port_i2s_deinited(i2s_t *self) {
+    return !self->peripheral;
+}
+
+void port_i2s_deinit(i2s_t *self) {
+    if (port_i2s_deinited(self)) {
+        return;
+    }
+    SAI_TransferAbortSend(self->peripheral, &self->handle);
+    i2s_clock_off(self->peripheral);
+    i2s_in_use &= ~(1 << SAI_GetInstance(self->peripheral));
+    if (!i2s_in_use) {
+        CCM_ANALOG->PLL_AUDIO = CCM_ANALOG_PLL_AUDIO_BYPASS_MASK | CCM_ANALOG_PLL_AUDIO_POWERDOWN_MASK | CCM_ANALOG_PLL_AUDIO_BYPASS_CLK_SRC(kCLOCK_PllClkSrc24M);
+    }
+    self->peripheral = NULL;
+    for (size_t i = 0; i < MP_ARRAY_SIZE(self->buffers); i++) {
+        self->buffers[i] = NULL;
+    }
+}
+
+void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop) {
+    self->sample = sample;
+    self->loop = loop;
+    self->bytes_per_sample = audiosample_bits_per_sample(sample) / 8;
+    self->channel_count = audiosample_channel_count(sample);
+    uint32_t sample_rate = audiosample_sample_rate(sample);
+    if (sample_rate != self->sample_rate) {
+        SAI_TxSetBitClockRate(self->peripheral, SAI_CLOCK_FREQ, sample_rate, 16, 2);
+        self->sample_rate = sample_rate;
+    }
+    bool single_buffer;
+    bool samples_signed;
+    uint32_t max_buffer_length;
+    uint8_t spacing;
+    audiosample_get_buffer_structure(sample, false, &single_buffer, &samples_signed,
+        &max_buffer_length, &spacing);
+    self->samples_signed = samples_signed;
+    self->playing = true;
+    self->paused = false;
+    self->stopping = false;
+    self->sample_data = self->sample_end = NULL;
+
+    audiosample_reset_buffer(self->sample, false, 0);
+
+// TODO
+    #if 0
+    uint32_t sample_rate = audiosample_sample_rate(sample);
+    if (sample_rate != self->i2s_config.sample_rate) {
+        CHECK_ESP_RESULT(i2s_set_sample_rates(self->instance, audiosample_sample_rate(sample)));
+        self->i2s_config.sample_rate = sample_rate;
+    }
+    #endif
+    background_callback_add(&self->callback, i2s_callback_fun, self);
+}
+
+bool port_i2s_get_playing(i2s_t *self) {
+    return self->playing;
+}
+
+bool port_i2s_get_paused(i2s_t *self) {
+    return self->paused;
+}
+
+void port_i2s_stop(i2s_t *self) {
+    self->sample = NULL;
+    self->paused = false;
+    self->playing = false;
+    self->stopping = false;
+}
+
+void port_i2s_pause(i2s_t *self) {
+    self->paused = true;
+}
+
+void port_i2s_resume(i2s_t *self) {
+    self->paused = false;
+}
+
+void i2s_reset() {
+// this port relies on object finalizers for reset
+}
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.h b/ports/mimxrt10xx/common-hal/audiobusio/__init__.h
new file mode 100644
index 0000000000..f0663e2897
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.h
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "sdk/drivers/sai/fsl_sai.h"
+#include "py/obj.h"
+
+#include "supervisor/background_callback.h"
+
+
+typedef struct {
+    I2S_Type *peripheral;
+    sai_handle_t handle;
+    mp_obj_t sample;
+    uint32_t *buffers[SAI_XFER_QUEUE_SIZE];
+    uint8_t *sample_data, *sample_end;
+    background_callback_t callback;
+    bool playing, paused, loop, stopping;
+    bool samples_signed;
+    uint8_t channel_count, bytes_per_sample;
+    uint8_t buffer_idx;
+    uint32_t sample_rate;
+} i2s_t;
+
+
+void i2s_reset(void);
+void port_i2s_initialize(i2s_t *self, int instance, sai_transceiver_t *config);
+void port_i2s_deinit(i2s_t *self);
+bool port_i2s_deinited(i2s_t *self);
+void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop);
+void port_i2s_stop(i2s_t *self);
+bool port_i2s_get_playing(i2s_t *self);
+bool port_i2s_get_paused(i2s_t *self);
+void port_i2s_pause(i2s_t *self);
+void port_i2s_resume(i2s_t *self);
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 3c8c7f2b27..a43ef2b7ab 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -25,8 +25,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "shared-bindings/microcontroller/__init__.h"
+#include "py/runtime.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/microcontroller/__init__.h"
 
 STATIC bool claimed_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
 STATIC bool never_reset_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
@@ -116,3 +117,19 @@ void claim_pin(const mcu_pin_obj_t *pin) {
 void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
     common_hal_reset_pin((mcu_pin_obj_t *)(mcu_pin_globals.map.table[pin_no].value));
 }
+
+const mcu_periph_obj_t *find_pin_function_sz(const mcu_periph_obj_t *list, size_t sz, const mcu_pin_obj_t *pin, int *instance, uint16_t name) {
+    if (!pin) {
+        return NULL;
+    }
+    for (size_t i = 0; i < sz; i++) {
+        if (*instance != -1 && *instance != list[i].bank_idx) {
+            continue;
+        }
+        if (pin == list[i].pin) {
+            *instance = list[i].bank_idx;
+            return &list[i];
+        }
+    }
+    mp_raise_ValueError_varg(translate("Invalid %q pin"), name);
+}
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index 1bfbe41a18..4c66dd4ea5 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -25,11 +25,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
-
-#include 
+#pragma once
 
+#include "periph.h"
 #include "pins.h"
 
 void reset_all_pins(void);
@@ -45,4 +43,8 @@ extern const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[];
 // the port-default reset behavior.
 extern bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin);
 
-#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
+// Find the entry in the peripheral list for this pin. If instance is (-1), any instance (bank_idx) may be used. Otherwise, the bank_idx must match the instance.
+// If instance was -1, and the function succeeds, then instance is updated with the new bank_idx.
+// If the pin is NULL then NULL is always returned. But if it was not NULL, and no match was found, then a ValueError is raised.
+const mcu_periph_obj_t *find_pin_function_sz(const mcu_periph_obj_t *list, size_t sz, const mcu_pin_obj_t *pin, int *instance, uint16_t name);
+#define find_pin_function(list, pin, instance, name) (find_pin_function_sz((list), MP_ARRAY_SIZE((list)), (pin), (instance), (name)))
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 7eaac85b34..787c3c7929 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -11,7 +11,9 @@ CIRCUITPY_TUSB_MEM_ALIGN = 32
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_AUDIOBUSIO = 1
+CIRCUITPY_AUDIOBUSIO_PDMIN = 0
+CIRCUITPY_AUDIOCORE = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
index 0c2b5893bc..fbbf65c8a5 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
@@ -166,3 +166,28 @@ const mcu_pwm_obj_t mcu_pwm_list[20] = {
 
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_09_FLEXPWM1_PWM3_X, &pin_GPIO_AD_09),
 };
+
+const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_08),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_00),
+};
+const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_03),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_03),
+};
+const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_02),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_04),
+};
+const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_06),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_01),
+};
+const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_04),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_02),
+};
+const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_07),
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_00),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
index b3bddcb76b..109717528f 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
@@ -47,4 +47,11 @@ extern const mcu_periph_obj_t mcu_uart_cts_list[4];
 
 extern const mcu_pwm_obj_t mcu_pwm_list[20];
 
+extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[2];
+extern const mcu_periph_obj_t mcu_sai_rx_data0_list[2];
+extern const mcu_periph_obj_t mcu_sai_rx_sync_list[2];
+extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[2];
+extern const mcu_periph_obj_t mcu_sai_tx_data0_list[2];
+extern const mcu_periph_obj_t mcu_sai_tx_sync_list[2];
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
index ffcadbb696..b80fcf5065 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
@@ -256,3 +256,58 @@ const mcu_pwm_obj_t mcu_pwm_list[39] = {
     PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_EMC_12_FLEXPWM2_PWMX02, &pin_GPIO_EMC_12),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_EMC_13_FLEXPWM2_PWMX03, &pin_GPIO_EMC_13),
 };
+
+const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_14),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_19),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_06),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_09),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_02),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_29),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_09),
+};
+const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_21),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_05),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_08),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_03),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_30),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_11),
+};
+const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_15),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_28),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_07),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_01),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_30),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_10),
+};
+const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_11),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_26),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_01),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_04),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B0_06),
+};
+const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_12),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_25),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_03),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_04),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_32),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_08),
+};
+const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_10),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_27),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_02),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_05),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_06),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_07),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
index 9074987cd8..31ac10e651 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
@@ -25,8 +25,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
-#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
+#pragma once
 
 extern LPI2C_Type *const mcu_i2c_banks[4];
 
@@ -48,4 +47,9 @@ extern const mcu_periph_obj_t mcu_uart_cts_list[10];
 
 extern const mcu_pwm_obj_t mcu_pwm_list[39];
 
-#endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIP_H
+extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_sai_rx_data0_list[7];
+extern const mcu_periph_obj_t mcu_sai_rx_sync_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
index b6efe5e6a9..8c038bdb71 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
@@ -306,3 +306,59 @@ const mcu_pwm_obj_t mcu_pwm_list[67] = {
     PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_18_FLEXPWM4_PWMB03, &pin_GPIO_EMC_18),
 
 };
+
+const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_11),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B0_15),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_05),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_10),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_06),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_35),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
+};
+
+const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_00),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_12),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_06),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_08),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_08),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
+};
+const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_11),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B0_15),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_05),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_09),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_06),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_05),
+};
+const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_02),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_14),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B0_05),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_03),
+};
+const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_13),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_01),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_07),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_09),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_36),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_01),
+};
+const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_15),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_03),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B0_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_05),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_02),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
index 9a06a491f9..ab8eb22678 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
@@ -47,4 +47,11 @@ extern const mcu_periph_obj_t mcu_uart_cts_list[9];
 
 extern const mcu_pwm_obj_t mcu_pwm_list[67];
 
+extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_sai_rx_data0_list[7];
+extern const mcu_periph_obj_t mcu_sai_rx_sync_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
+extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
index 818b203da4..8184d5b135 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
@@ -31,7 +31,7 @@
 #include "pins.h"
 
 typedef struct {
-    uint8_t bank_idx : 4;
+    uint8_t bank_idx : 4; // e.g. the peripheral number
     uint8_t mux_mode : 4;
     uint32_t input_reg;
     uint8_t input_idx;
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 55bf72352d..feb8566aad 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -36,6 +36,10 @@
 
 #include "fsl_device_registers.h"
 
+#if CIRCUITPY_AUDIOBUSIO
+#include "common-hal/audiobusio/__init__.h"
+#endif
+
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/pwmio/PWMOut.h"
 #include "common-hal/rtc/RTC.h"
@@ -414,8 +418,7 @@ void reset_port(void) {
     audioout_reset();
     #endif
     #if CIRCUITPY_AUDIOBUSIO
-    i2sout_reset();
-    // pdmin_reset();
+    i2s_reset();
     #endif
 
     #if CIRCUITPY_TOUCHIO && CIRCUITPY_TOUCHIO_USE_NATIVE

From 04bb0513df068ae3091bcc9c3b83a6ff9598b89a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 21 Mar 2023 11:58:51 -0500
Subject: [PATCH 2082/2403] enable audiomixer

---
 ports/mimxrt10xx/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 787c3c7929..8597fc068b 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -15,6 +15,7 @@ CIRCUITPY_AUDIOBUSIO = 1
 CIRCUITPY_AUDIOBUSIO_PDMIN = 0
 CIRCUITPY_AUDIOCORE = 1
 CIRCUITPY_AUDIOIO = 0
+CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0

From f40504b7bc16b538fdb2a34e3dc6b7c5e9e3b3f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 21 Mar 2023 12:17:17 -0500
Subject: [PATCH 2083/2403] enable MP3

---
 ports/mimxrt10xx/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 8597fc068b..a952460259 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -16,6 +16,7 @@ CIRCUITPY_AUDIOBUSIO_PDMIN = 0
 CIRCUITPY_AUDIOCORE = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOMIXER = 1
+CIRCUITPY_AUDIOMP3 = 1
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0

From 57188885d3dc895f691956cfd2dd6e76eb889b94 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 22 Mar 2023 14:08:03 -0400
Subject: [PATCH 2084/2403] Swap ESP32 RX and TX pins on Metro M7 1011

---
 ports/mimxrt10xx/boards/metro_m7_1011/pins.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
index 886909e1dd..675773798c 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c
@@ -38,8 +38,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_GPIO0), MP_ROM_PTR(&pin_GPIO_SD_05) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_GPIO_AD_11) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_GPIO_AD_07) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_GPIO_09) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_GPIO_10) },
+    // These RX and TX are from the point of view of the i.MX microcontroller.
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_GPIO_09) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_GPIO_10) },
 
     // SPI
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_AD_06) },

From a280c010c2e5f99868ab43ef00042d7d32922a74 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 22 Mar 2023 11:14:38 -0700
Subject: [PATCH 2085/2403] Fix tricolor epd and add EPD feather

---
 .../adafruit_feather_rp2040_epd/board.c       | 29 +++++++++++
 .../mpconfigboard.h                           | 15 ++++++
 .../mpconfigboard.mk                          |  9 ++++
 .../pico-sdk-configboard.h                    |  4 ++
 .../boards/adafruit_feather_rp2040_epd/pins.c | 51 +++++++++++++++++++
 shared-module/displayio/EPaperDisplay.c       |  6 ++-
 6 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
new file mode 100644
index 0000000000..356f0f5b54
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
@@ -0,0 +1,15 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 EPD"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO20)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
new file mode 100644
index 0000000000..3b457b93cb
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x812C
+USB_PRODUCT = "Feather RP2040 EPD"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
new file mode 100644
index 0000000000..22ae43adad
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
@@ -0,0 +1,51 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_EPD_BUSY), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_RESET), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_DC), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_CS), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_SCK), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 289fc47a68..74f828aea8 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -60,6 +60,7 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
     const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
     bool chip_select, bool grayscale, bool acep, bool two_byte_sequence_length) {
     uint16_t color_depth = 1;
+    bool core_grayscale = true;
     if (highlight_color != 0x000000) {
         self->core.colorspace.tricolor = true;
         self->core.colorspace.tricolor_hue = displayio_colorconverter_compute_hue(highlight_color);
@@ -70,9 +71,10 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
         color_depth = 4; // bits. 7 colors + clean
         self->acep = acep;
         grayscale = false;
+        core_grayscale = false;
     }
 
-    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation, color_depth, grayscale, true, 1, true, true);
+    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation, color_depth, core_grayscale, true, 1, true, true);
 
     self->set_column_window_command = set_column_window_command;
     self->set_row_window_command = set_row_window_command;
@@ -340,7 +342,7 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
             memset(mask, 0, mask_length * sizeof(mask[0]));
             memset(buffer, 0, buffer_size * sizeof(buffer[0]));
 
-            if (self->grayscale) {
+            if (!self->acep) {
                 self->core.colorspace.grayscale = true;
                 self->core.colorspace.grayscale_bit = 7;
             }

From 16c8dad0784c13ad039508bba8397da5c61f377f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 22 Mar 2023 11:54:43 -0700
Subject: [PATCH 2086/2403] Fix Pallete cache for grayscale and tricolor epd

---
 shared-module/displayio/Palette.c | 14 +++++++++++---
 shared-module/displayio/Palette.h |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/shared-module/displayio/Palette.c b/shared-module/displayio/Palette.c
index a2ddc285fd..c61b9ebc82 100644
--- a/shared-module/displayio/Palette.c
+++ b/shared-module/displayio/Palette.c
@@ -81,7 +81,13 @@ void displayio_palette_get_color(displayio_palette_t *self, const _displayio_col
     }
 
     // Cache results when not dithering.
-    if (!self->dither && self->colors[palette_index].cached_colorspace == colorspace) {
+    _displayio_color_t *color = &self->colors[palette_index];
+    // Check the grayscale settings because EPaperDisplay will change them on
+    // the same object.
+    if (!self->dither &&
+        color->cached_colorspace == colorspace &&
+        color->cached_colorspace_grayscale_bit == colorspace->grayscale_bit &&
+        color->cached_colorspace_grayscale == colorspace->grayscale) {
         output_color->pixel = self->colors[palette_index].cached_color;
         return;
     }
@@ -90,8 +96,10 @@ void displayio_palette_get_color(displayio_palette_t *self, const _displayio_col
     rgb888_pixel.pixel = self->colors[palette_index].rgb888;
     displayio_convert_color(colorspace, self->dither, &rgb888_pixel, output_color);
     if (!self->dither) {
-        self->colors[palette_index].cached_colorspace = colorspace;
-        self->colors[palette_index].cached_color = output_color->pixel;
+        color->cached_colorspace = colorspace;
+        color->cached_color = output_color->pixel;
+        color->cached_colorspace_grayscale = colorspace->grayscale;
+        color->cached_colorspace_grayscale_bit = colorspace->grayscale_bit;
     }
 }
 
diff --git a/shared-module/displayio/Palette.h b/shared-module/displayio/Palette.h
index e9b449c4e7..050423d052 100644
--- a/shared-module/displayio/Palette.h
+++ b/shared-module/displayio/Palette.h
@@ -51,6 +51,8 @@ typedef struct {
     uint32_t rgb888;
     const _displayio_colorspace_t *cached_colorspace;
     uint32_t cached_color;
+    uint8_t cached_colorspace_grayscale_bit;
+    bool cached_colorspace_grayscale;
     bool transparent; // This may have additional bits added later for blending.
 } _displayio_color_t;
 

From e05f0ba3b2eba583a88a18bf4de95ebee3125a16 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Mar 2023 14:32:00 -0500
Subject: [PATCH 2087/2403] Revert "Correctly raise OS error in
 socketpool_socket_recv_into()"

This reverts commit 7e6e824d5655026906b6515070aeb604d2ef3426.

Fixes #7770

The change in #7623 needs to be revered; the raise-site added in #7632
is the correct one and the one in socketpool needs to be reverted.

This is not affecting 8.0.x because #7623 was not back-ported to there
before we realized it was not a full fix.

Both #7770 and #7606 should be re-tested. I didn't test.
---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index e2b82264ba..fe12f461fb 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -1109,7 +1109,7 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *socket,
             break;
     }
     if (ret == (unsigned)-1) {
-        mp_raise_OSError(_errno);
+        return -_errno;
     }
     return ret;
 }

From 127a7092bf9927eaff84274983e72412a2faa7b5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 22 Mar 2023 16:09:56 -0500
Subject: [PATCH 2088/2403] use `values` in this error message ...

matching the documentation of struct.pack, which has `def pack(fmt: str,
*values: Any)` as the signature.
---
 shared-module/struct/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index b595504969..11e122915c 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -167,7 +167,7 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
         }
         fmt++;
     }
-    (void)mp_arg_validate_length(n_args, i, MP_QSTR_args);
+    (void)mp_arg_validate_length(n_args, i, MP_QSTR_values);
 }
 
 mp_obj_tuple_t *shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p, bool exact_size) {

From 0b3099a9ff935bc6d59c3db41316c262be254712 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Wed, 22 Mar 2023 18:44:45 -0400
Subject: [PATCH 2089/2403] adding bitmaptools circle

---
 shared-bindings/bitmaptools/__init__.c | 49 +++++++++++++++++++++
 shared-bindings/bitmaptools/__init__.h |  5 +++
 shared-module/bitmaptools/__init__.c   | 61 +++++++++++++++++++++++++-
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 1195e1811d..19ea952999 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -868,7 +868,55 @@ STATIC mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_m
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_dither_obj, 0, bitmaptools_dither);
+// requires all 5 arguments
 
+//| def draw_circle(
+//|     dest_bitmap: displayio.Bitmap, x0: int, y0: int, radius: int, value: int
+//| ) -> None:
+//|     """Draws a circle into a bitmap specified using a center (x0,y0) and radius r.
+//|
+//|     :param bitmap dest_bitmap: Destination bitmap that will be written into
+//|     :param int x0: x-pixel position of the circle's center
+//|     :param int y0: y-pixel position of the circle's center
+//|     :param int radius: circle's radius
+//|     :param int value: Bitmap palette index that will be written into the
+//|            circle in the destination bitmap"""
+//|     ...
+//|
+STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {ARG_dest_bitmap, ARG_x0, ARG_y0, ARG_radius, ARG_value};
+
+    static const mp_arg_t allowed_args[] = {
+        {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_x0, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_y0, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_radius, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+    };
+    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);
+
+    displayio_bitmap_t *destination = MP_OBJ_TO_PTR(args[ARG_dest_bitmap].u_obj);     // the destination bitmap
+
+    uint32_t value, color_depth;
+    value = args[ARG_value].u_int;
+    color_depth = (1 << destination->bits_per_value);
+    if (color_depth <= value) {
+        mp_raise_ValueError(translate("out of range of target"));
+    }
+
+
+    int16_t x0 = args[ARG_x0].u_int;
+    int16_t y0 = args[ARG_y0].u_int;
+    int16_t radius = args[ARG_radius].u_int;
+
+
+    common_hal_bitmaptools_draw_circle(destination, x0, y0, radius, value);
+
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_circle_obj, 0, bitmaptools_obj_draw_circle);
 
 STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitmaptools) },
@@ -880,6 +928,7 @@ STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_boundary_fill), MP_ROM_PTR(&bitmaptools_boundary_fill_obj) },
     { MP_ROM_QSTR(MP_QSTR_draw_line), MP_ROM_PTR(&bitmaptools_draw_line_obj) },
     { MP_ROM_QSTR(MP_QSTR_draw_polygon), MP_ROM_PTR(&bitmaptools_draw_polygon_obj) },
+        { MP_ROM_QSTR(MP_QSTR_draw_circle), MP_ROM_PTR(&bitmaptools_draw_circle_obj) },
     { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&bitmaptools_dither_obj) },
     { MP_ROM_QSTR(MP_QSTR_DitherAlgorithm), MP_ROM_PTR(&bitmaptools_dither_algorithm_type) },
 };
diff --git a/shared-bindings/bitmaptools/__init__.h b/shared-bindings/bitmaptools/__init__.h
index db72410cf6..3c356e761e 100644
--- a/shared-bindings/bitmaptools/__init__.h
+++ b/shared-bindings/bitmaptools/__init__.h
@@ -64,6 +64,11 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
     int16_t x1, int16_t y1,
     uint32_t value);
 
+void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
+    int16_t x0, int16_t y0,
+    int16_t radius,
+    uint32_t value);
+
 void common_hal_bitmaptools_draw_polygon(displayio_bitmap_t *destination, void *xs, void *ys, size_t points_len, int point_size, uint32_t value, bool close);
 void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, mp_obj_t *file, int element_size, int bits_per_pixel, bool reverse_pixels_in_word, bool swap_bytes, bool reverse_rows);
 void common_hal_bitmaptools_arrayblit(displayio_bitmap_t *self, void *data, int element_size, int x1, int y1, int x2, int y2, bool skip_specified, uint32_t skip_index);
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 8068bbe8b6..699516f37c 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Kevin Matocha
+ * Copyright (c) 2021 Kevin Matocha, Jose David Montoya
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,6 +40,9 @@
 #include 
 #include 
 
+#define BITMAP_DEBUG(...) (void)0
+// #define BITMAP_DEBUG(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+
 void common_hal_bitmaptools_rotozoom(displayio_bitmap_t *self, int16_t ox, int16_t oy,
     int16_t dest_clip0_x, int16_t dest_clip0_y,
     int16_t dest_clip1_x, int16_t dest_clip1_y,
@@ -918,3 +921,59 @@ void common_hal_bitmaptools_alphablend(displayio_bitmap_t *dest, displayio_bitma
         }
     }
 }
+
+STATIC void draw_circle(displayio_bitmap_t *destination,
+    int16_t x0, int16_t y0,
+    int16_t radius, uint32_t value) {
+
+    int16_t d, y;
+
+    mp_arg_validate_int_range(x0, SHRT_MIN, SHRT_MAX, MP_QSTR_x0);
+    mp_arg_validate_int_range(y0, SHRT_MIN, SHRT_MAX, MP_QSTR_y0);
+
+    BITMAP_DEBUG("x, y, radius    (%4d, %4d, %4d)\n", x0, y0, radius);
+
+    y = radius;
+    d = 3 - 2 * radius;
+
+    // Bresenham's circle algorithm
+    for (int x = 0; x <= y; x++) {
+        displayio_bitmap_write_pixel(destination, x + x0, y + y0, value);
+        displayio_bitmap_write_pixel(destination, -x + x0, -y + y0, value);
+        displayio_bitmap_write_pixel(destination, -x + x0, y + y0, value);
+        displayio_bitmap_write_pixel(destination, x + x0, -y + y0, value);
+        displayio_bitmap_write_pixel(destination, y + x0, x + y0, value);
+        displayio_bitmap_write_pixel(destination, -y + x0, x + y0, value);
+        displayio_bitmap_write_pixel(destination, -y + x0, -x + y0, value);
+        displayio_bitmap_write_pixel(destination, y + x0, -x + y0, value);
+        if (d <= 0) {
+            d = d + (4 * x) + 6;
+        } else {
+            d = d + 4 * (x - y) + 10;
+            y = y - 1;
+        }
+    }
+}
+
+void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
+    int16_t x0, int16_t y0,
+    int16_t radius,
+    uint32_t value) {
+
+
+    // update the dirty area
+    int16_t xbb0, xbb1, ybb0, ybb1;
+
+    xbb0 = x0 - radius;
+    xbb1 = x0 + radius;
+    ybb0 = y0 - radius;
+    ybb1 = y0 + radius;
+
+    displayio_area_t area = { xbb0, ybb0, xbb1, ybb1, NULL };
+    displayio_area_t bitmap_area = { 0, 0, destination->width, destination->height, NULL };
+    displayio_area_compute_overlap(&area, &bitmap_area, &area);
+
+    displayio_bitmap_set_dirty_area(destination, &area);
+
+    draw_circle(destination, x0, y0, radius, value);
+}
\ No newline at end of file

From 29613c73e158cfd21732f076f12d7f0223d26b97 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Wed, 22 Mar 2023 19:05:18 -0400
Subject: [PATCH 2090/2403] pre-commit

---
 shared-bindings/bitmaptools/__init__.c | 2 +-
 shared-module/bitmaptools/__init__.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 19ea952999..e377d40031 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -928,7 +928,7 @@ STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_boundary_fill), MP_ROM_PTR(&bitmaptools_boundary_fill_obj) },
     { MP_ROM_QSTR(MP_QSTR_draw_line), MP_ROM_PTR(&bitmaptools_draw_line_obj) },
     { MP_ROM_QSTR(MP_QSTR_draw_polygon), MP_ROM_PTR(&bitmaptools_draw_polygon_obj) },
-        { MP_ROM_QSTR(MP_QSTR_draw_circle), MP_ROM_PTR(&bitmaptools_draw_circle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_draw_circle), MP_ROM_PTR(&bitmaptools_draw_circle_obj) },
     { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&bitmaptools_dither_obj) },
     { MP_ROM_QSTR(MP_QSTR_DitherAlgorithm), MP_ROM_PTR(&bitmaptools_dither_algorithm_type) },
 };
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 699516f37c..778d0629a7 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -976,4 +976,4 @@ void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
     displayio_bitmap_set_dirty_area(destination, &area);
 
     draw_circle(destination, x0, y0, radius, value);
-}
\ No newline at end of file
+}

From 8b9f5e7f531d8e7dbcff41723bc7c1fb3c1f1614 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 11 Mar 2023 09:44:35 -0600
Subject: [PATCH 2091/2403] Remove del obj and add deinited

---
 shared-bindings/gifio/OnDiskGif.c | 36 +++++++++++++++++++++++++++++++
 shared-bindings/gifio/OnDiskGif.h |  2 ++
 shared-module/gifio/OnDiskGif.c   |  8 ++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 7fb3fcf2bd..3eb56a1c32 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -30,6 +30,8 @@
 
 #include "py/runtime.h"
 #include "py/objproperty.h"
+#include "shared/runtime/context_manager_helpers.h"
+#include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
 #include "shared-bindings/gifio/OnDiskGif.h"
 
@@ -125,11 +127,34 @@ STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC void check_for_deinit(gifio_ondiskgif_t *self) {
+    if (common_hal_gifio_ondiskgif_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     def __enter__(self) -> OnDiskGif:
+//|         """No-op used by Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the GIF when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+STATIC mp_obj_t gifio_ondiskgif_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_gifio_ondiskgif_deinit(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif___exit___obj, 4, 4, gifio_ondiskgif_obj___exit__);
+
 //|     width: int
 //|     """Width of the gif. (read only)"""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_width(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_width(self));
 }
 
@@ -143,6 +168,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_width_obj,
 STATIC mp_obj_t gifio_ondiskgif_obj_get_height(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_height(self));
 }
 
@@ -155,6 +181,8 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_height_obj,
 //|     """The bitmap used to hold the current frame."""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    check_for_deinit(self);
     return common_hal_gifio_ondiskgif_get_bitmap(self);
 }
 
@@ -168,6 +196,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
 STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return mp_obj_new_float((float)common_hal_gifio_ondiskgif_next_frame(self, true) / 1000);
 }
 
@@ -179,6 +208,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_next_frame_obj, gifio_ondiskgif_obj_ne
 STATIC mp_obj_t gifio_ondiskgif_obj_get_duration(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_duration(self) / 1000);
 }
 
@@ -192,6 +222,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_duration_obj,
 STATIC mp_obj_t gifio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return MP_OBJ_NEW_SMALL_INT(common_hal_gifio_ondiskgif_get_frame_count(self));
 }
 
@@ -205,6 +236,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_frame_count_obj,
 STATIC mp_obj_t gifio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_min_delay(self) / 1000);
 }
 
@@ -219,6 +251,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_min_delay_obj,
 STATIC mp_obj_t gifio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return mp_obj_new_float((float)common_hal_gifio_ondiskgif_get_max_delay(self) / 1000);
 }
 
@@ -228,6 +261,9 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_max_delay_obj,
     (mp_obj_t)&gifio_ondiskgif_get_max_delay_obj);
 
 STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gifio_ondiskgif_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&gifio_ondiskgif___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&gifio_ondiskgif_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&gifio_ondiskgif_bitmap_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&gifio_ondiskgif_width_obj) },
diff --git a/shared-bindings/gifio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
index 4ecbfca495..6776466e8d 100644
--- a/shared-bindings/gifio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -45,4 +45,6 @@ int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_frame_count(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_min_delay(gifio_ondiskgif_t *self);
 int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self);
+void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self);
+bool common_hal_gifio_ondiskgif_deinited(gifio_ondiskgif_t *self);
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKGIF_H
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index 234b7f8198..eb8afb52ab 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -154,7 +154,13 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
     self->min_delay = info.iMinDelay;
     self->max_delay = info.iMaxDelay;
 
-    // mp_printf(&mp_plat_print, "GIF_init returned %d %x\n", result, bitmap->data);
+void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
+    self->file = NULL;
+    self->bitmap = NULL;
+}
+
+bool common_hal_gifio_ondiskgif_deinited(gifio_ondiskgif_t *self) {
+    return self->bitmap == NULL;
 }
 
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self) {

From 07e83674c90b28c522df7b84417db583568ef9b4 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Tue, 14 Mar 2023 18:02:53 -0500
Subject: [PATCH 2092/2403] Add deinit to displayio.Bitmap

---
 shared-bindings/displayio/Bitmap.c | 28 ++++++++++++++++++++++++++--
 shared-bindings/displayio/Bitmap.h |  2 ++
 shared-module/displayio/Bitmap.c   |  7 +++++++
 shared-module/gifio/OnDiskGif.c    |  1 +
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 65551f4e0d..718e1c334c 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -84,11 +84,19 @@ STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_ar
 
     return MP_OBJ_FROM_PTR(self);
 }
+
+STATIC void check_for_deinit(displayio_bitmap_t *self) {
+    if (common_hal_displayio_bitmap_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
 //|     width: int
 //|     """Width of the bitmap. (read only)"""
 STATIC mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_bitmap_get_width(self));
 }
 
@@ -102,6 +110,7 @@ MP_PROPERTY_GETTER(displayio_bitmap_width_obj,
 STATIC mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
 
+    check_for_deinit(self);
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_bitmap_get_height(self));
 }
 
@@ -134,6 +143,7 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     }
 
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     if (mp_obj_is_type(index_obj, &mp_type_slice)) {
         // TODO(tannewt): Implement subscr after slices support start, stop and step tuples.
@@ -214,6 +224,7 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
 
     int16_t x = args[ARG_x].u_int;
     int16_t y = args[ARG_y].u_int;
@@ -288,6 +299,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_blit_obj, 1, displayio_bitmap_obj_bl
 //|         ...
 STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     mp_uint_t value = (mp_uint_t)mp_obj_get_int(value_obj);
     if ((value >> common_hal_displayio_bitmap_get_bits_per_value(self)) != 0) {
@@ -318,9 +330,10 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill);
 //|         notified of the "dirty rectangle" that encloses all modified
 //|         pixels."""
 //|         ...
-//|
 STATIC mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+
     enum { ARG_x1, ARG_y1, ARG_x2, ARG_y2 };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_x1, MP_ARG_INT, {.u_int = 0} },
@@ -344,13 +357,24 @@ STATIC mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_ar
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_dirty_obj, 0, displayio_bitmap_obj_dirty);
 
+//|     def deinit(self) -> None:
+//|         """Release resources allocated by Bitmap."""
+//|         ...
+//|
+STATIC mp_obj_t displayio_bitmap_obj_deinit(mp_obj_t self_in) {
+    displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_displayio_bitmap_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_deinit_obj, displayio_bitmap_obj_deinit);
+
 STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_bitmap_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_bitmap_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&displayio_bitmap_blit_obj) },
     { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&displayio_bitmap_fill_obj) },
     { MP_ROM_QSTR(MP_QSTR_dirty), MP_ROM_PTR(&displayio_bitmap_dirty_obj) },
-
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&displayio_bitmap_deinit_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_bitmap_locals_dict, displayio_bitmap_locals_dict_table);
 
diff --git a/shared-bindings/displayio/Bitmap.h b/shared-bindings/displayio/Bitmap.h
index 074f7dfa5c..b35f4eadbc 100644
--- a/shared-bindings/displayio/Bitmap.h
+++ b/shared-bindings/displayio/Bitmap.h
@@ -48,5 +48,7 @@ void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16
 uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y);
 void common_hal_displayio_bitmap_fill(displayio_bitmap_t *bitmap, uint32_t value);
 int common_hal_displayio_bitmap_get_buffer(displayio_bitmap_t *self, mp_buffer_info_t *bufinfo, mp_uint_t flags);
+void common_hal_displayio_bitmap_deinit(displayio_bitmap_t *self);
+bool common_hal_displayio_bitmap_deinited(displayio_bitmap_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_BITMAP_H
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index dc82d04e05..94981cbd4f 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -79,6 +79,13 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
     self->dirty_area.y2 = height;
 }
 
+void common_hal_displayio_bitmap_deinit(displayio_bitmap_t *self) {
+    self->data = NULL;
+}
+
+bool common_hal_displayio_bitmap_deinited(displayio_bitmap_t *self) {
+    return self->data == NULL;
+}
 
 uint16_t common_hal_displayio_bitmap_get_height(displayio_bitmap_t *self) {
     return self->height;
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index eb8afb52ab..4c4a6b1f00 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -156,6 +156,7 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
 
 void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
     self->file = NULL;
+    common_hal_displayio_bitmap_deinit(self->bitmap);
     self->bitmap = NULL;
 }
 

From aa423cc1c63341b2476d0b8368f68d68d5e24ae5 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 18 Mar 2023 09:21:40 -0500
Subject: [PATCH 2093/2403] Free memory allocated by bitmap obj

---
 shared-module/displayio/Bitmap.c | 6 ++++++
 shared-module/displayio/Bitmap.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 94981cbd4f..8b578005c6 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -50,6 +50,9 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
     self->stride = stride(width, bits_per_value);
     if (!data) {
         data = m_malloc(self->stride * height * sizeof(uint32_t), false);
+        self->data_alloc = true;
+    } else {
+        self->data_alloc = false;
     }
     self->data = data;
     self->read_only = read_only;
@@ -80,6 +83,9 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
 }
 
 void common_hal_displayio_bitmap_deinit(displayio_bitmap_t *self) {
+    if (self->data_alloc) {
+        m_free(self->data);
+    }
     self->data = NULL;
 }
 
diff --git a/shared-module/displayio/Bitmap.h b/shared-module/displayio/Bitmap.h
index 0373ae80c5..2025e56282 100644
--- a/shared-module/displayio/Bitmap.h
+++ b/shared-module/displayio/Bitmap.h
@@ -45,6 +45,7 @@ typedef struct {
     displayio_area_t dirty_area;
     uint16_t bitmask;
     bool read_only;
+    bool data_alloc; // did bitmap allocate data or someone else
 } displayio_bitmap_t;
 
 void displayio_bitmap_finish_refresh(displayio_bitmap_t *self);

From 2c1e2061db5e12f6a7a8ba173bda432966e33806 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 18 Mar 2023 09:28:41 -0500
Subject: [PATCH 2094/2403] Change free function

---
 shared-module/displayio/Bitmap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 8b578005c6..094b2288a4 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -29,6 +29,7 @@
 #include 
 
 #include "py/runtime.h"
+#include "py/gc.h"
 
 enum { ALIGN_BITS = 8 * sizeof(uint32_t) };
 
@@ -84,7 +85,7 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
 
 void common_hal_displayio_bitmap_deinit(displayio_bitmap_t *self) {
     if (self->data_alloc) {
-        m_free(self->data);
+        gc_free(self->data);
     }
     self->data = NULL;
 }

From 3020893ba2718acbd4b936688b87c753ccc8d7a4 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Sat, 18 Mar 2023 10:01:41 -0500
Subject: [PATCH 2095/2403] Tweak to try to reduce low space builds

---
 shared-module/displayio/Bitmap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 094b2288a4..4a439e56c0 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -49,11 +49,10 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
     self->width = width;
     self->height = height;
     self->stride = stride(width, bits_per_value);
+    self->data_alloc = false;
     if (!data) {
         data = m_malloc(self->stride * height * sizeof(uint32_t), false);
         self->data_alloc = true;
-    } else {
-        self->data_alloc = false;
     }
     self->data = data;
     self->read_only = read_only;

From 2365f9b3bee1828500f5eb572a737e26e7d63b63 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 22 Mar 2023 12:41:38 -0400
Subject: [PATCH 2096/2403] shrink SAMD21 builds; rework shrink logic in
 Makefile

---
 ports/atmel-samd/Makefile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 68beeaf129..84cb4d0dcc 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -59,6 +59,7 @@ INC += -I. \
 ifeq ($(CHIP_FAMILY), samd21)
 PERIPHERALS_CHIP_FAMILY=samd21
 OPTIMIZATION_FLAGS ?= -Os
+
 # TinyUSB defines
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAMD21 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_CDC_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128 -DCFG_TUD_CDC_TX_BUFSIZE=128 -DCFG_TUD_MSC_BUFSIZE=512
 endif
@@ -101,24 +102,26 @@ ifeq ($(DEBUG), 1)
   endif
 else
   CFLAGS += -DNDEBUG
-  # -finline-limit can shrink the image size.
-  # -finline-limit=80 or so is similar to not having it on.
-  # There is no simple default value, though.
 
-  # Do a default shrink for small builds.
-  ifndef CFLAGS_INLINE_LIMIT
-    ifeq ($(CIRCUITPY_FULL_BUILD),0)
-      CFLAGS_INLINE_LIMIT = 50
+  # Do a default shrink for small builds, including all SAMD21 builds.
+  ifeq ($(CIRCUITPY_FULL_BUILD),0)
+    SHRINK_BUILD = 1
+  else
+    ifeq ($(CHIP_FAMILY), samd21)
+      SHRINK_BUILD = 1
     endif
   endif
 
-  ifdef CFLAGS_INLINE_LIMIT
-    CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT)
+  # -finline-limit can shrink the image size.
+  # -finline-limit=80 or so is similar to not having it on.
+  # There is no simple default value, though.
+  ifeq ($(SHRINK_BUILD), 1)
+    CFLAGS += -finline-limit=45
   endif
 
-  ifeq ($(CIRCUITPY_FULL_BUILD),0)
-    CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20
-  endif
+  # We used to do this but it seems to not reduce space any more, at least in gcc 11.
+  # Leave it here, commented out, just for reference.
+  # --param inline-unit-growth=15 --param max-inline-insns-auto=20
 
   ifdef CFLAGS_BOARD
     CFLAGS += $(CFLAGS_BOARD)

From 98ebc676ce273734d5818b7910cb5b6ded4017ee Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Wed, 22 Mar 2023 18:00:18 -0500
Subject: [PATCH 2097/2403] Added documentation about freeing a GIF

---
 shared-bindings/gifio/OnDiskGif.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index 3eb56a1c32..cc7112c04c 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -98,6 +98,14 @@
 //|           display_bus.send(42, struct.pack(">hh", 0, odg.bitmap.width - 1))
 //|           display_bus.send(43, struct.pack(">hh", 0, odg.bitmap.height - 1))
 //|           display_bus.send(44, d.bitmap)
+//|
+//|       # The following optional code will free the OnDiskGif and allocated resources
+//|       # after use. This may be required before loading a new GIF in situations
+//|       # where RAM is limited and the first GIF took most of the RAM.
+//|       odg.deinit()
+//|       odg = None
+//|       gc.collect()
+//|
 //|     """
 //|
 //|     def __init__(self, file: str) -> None:

From e993d0f3c3bb68852faff35b7e5458f013a0cff0 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Wed, 22 Mar 2023 20:19:09 -0500
Subject: [PATCH 2098/2403] Missing brace

---
 shared-module/gifio/OnDiskGif.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index 4c4a6b1f00..aeb4f7bb74 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -32,6 +32,7 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
+
 static int32_t GIFReadFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
     // mp_printf(&mp_plat_print, "GifReadFile len %d ", iLen);
     uint32_t iBytesRead;
@@ -153,6 +154,7 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
     self->frame_count = info.iFrameCount;
     self->min_delay = info.iMinDelay;
     self->max_delay = info.iMaxDelay;
+}
 
 void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
     self->file = NULL;

From 45599258c9cc64225bbba7110bfc60d2b4e1fd94 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 22 Mar 2023 22:00:59 -0400
Subject: [PATCH 2099/2403] fix missing close brace

---
 shared-module/gifio/OnDiskGif.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index 4c4a6b1f00..309b48eca6 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -153,6 +153,7 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
     self->frame_count = info.iFrameCount;
     self->min_delay = info.iMinDelay;
     self->max_delay = info.iMaxDelay;
+}
 
 void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
     self->file = NULL;

From 52631bb1c5664da8080b56a049c8cdb67b08ff00 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Wed, 22 Mar 2023 22:30:38 -0500
Subject: [PATCH 2100/2403] Restore OnDiskGif deinit

---
 shared-bindings/gifio/OnDiskGif.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index cc7112c04c..ed14cf9fe8 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -268,6 +268,17 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_max_delay_obj, gifio_ondiskgif_obj
 MP_PROPERTY_GETTER(gifio_ondiskgif_max_delay_obj,
     (mp_obj_t)&gifio_ondiskgif_get_max_delay_obj);
 
+//|     def deinit(self) -> None:
+//|         """Release resources allocated by OnDiskGif."""
+//|         ...
+//|
+STATIC mp_obj_t gifio_ondiskgif_obj_deinit(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_gifio_ondiskgif_deinit(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_deinit_obj, gifio_ondiskgif_obj_deinit);
+
 STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gifio_ondiskgif_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },

From a8abe8e70518f0ced9069614cf81e51d1473b704 Mon Sep 17 00:00:00 2001
From: hathach 
Date: Mon, 20 Mar 2023 13:36:08 +0700
Subject: [PATCH 2101/2403] remove lib from exludes, fix all remaining typos

---
 .codespell/exclude-file.txt                                | 7 +++++++
 .codespell/ignore-words.txt                                | 3 +++
 .pre-commit-config.yaml                                    | 6 +++++-
 .../s140_nrf52_7.0.1_API/include/nrf_svc.h                 | 2 +-
 ports/raspberrypi/mpconfigport.mk                          | 4 ++--
 ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h    | 2 +-
 py/emitbc.c                                                | 4 ++--
 py/emitnative.c                                            | 2 +-
 py/scope.h                                                 | 2 +-
 shared-bindings/socketpool/SocketPool.c                    | 1 -
 tests/basics/int_big1.py                                   | 2 +-
 tests/basics/with_return.py                                | 4 ++--
 tests/feature_check/README                                 | 2 +-
 tests/misc/non_compliant.py                                | 2 +-
 14 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.codespell/exclude-file.txt b/.codespell/exclude-file.txt
index e69de29bb2..9f49d9ae0c 100644
--- a/.codespell/exclude-file.txt
+++ b/.codespell/exclude-file.txt
@@ -0,0 +1,7 @@
+#define MICROPY_HW_BOARD_NAME "BLOK"
+USB_PRODUCT = "BLOK"
+    uint32_t THI = (*(uint32_t *)FUSES_HOT_TEMP_VAL_INT_ADDR & FUSES_HOT_TEMP_VAL_INT_Msk) >> FUSES_HOT_TEMP_VAL_INT_Pos;
+    float TH = THI + convert_dec_to_frac(THD);
+print(binascii.b2a_base64(b"fo"))
+        # again, neither will "there" or "wither", since they have "the"
+i1Qb$TE"rl
diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
index 5a54e22f0d..f2a8dc2be5 100644
--- a/.codespell/ignore-words.txt
+++ b/.codespell/ignore-words.txt
@@ -7,6 +7,7 @@ pris
 synopsys
 reenable
 dout
+inout
 wel
 iput
 hsi
@@ -17,3 +18,5 @@ dum
 deque
 deques
 extint
+shs
+pass-thru
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1695a883b4..f8cc372d0f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,11 @@ repos:
     hooks:
     -   id: codespell
         #args: [-w]
-        exclude: ^(locale/|lib/)
+        exclude: |
+          (?x)^(
+            locale/|
+            lib/
+          )
 -   repo: local
     hooks:
     -   id: translations
diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h
index 293001eccf..629739ed75 100644
--- a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h
+++ b/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h
@@ -48,7 +48,7 @@ extern "C" {
 /** @brief Supervisor call declaration.
  *
  * A call to a function marked with @ref SVCALL, will trigger a Supervisor Call (SVC) Exception.
- * The SVCs with SVC numbers 0x00-0x0F are forwared to the application. All other SVCs are handled by the SoftDevice.
+ * The SVCs with SVC numbers 0x00-0x0F are forwarded to the application. All other SVCs are handled by the SoftDevice.
  *
  * @param[in] number      The SVC number to be used.
  * @param[in] return_type The return type of the SVC function.
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index c5de2a439d..21dde6d239 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -21,11 +21,11 @@ CIRCUITPY_ROTARYIO ?= 1
 CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 
 # Things that need to be implemented.
-# Use PWM interally
+# Use PWM internally
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CTARGET = 1
 CIRCUITPY_NVM = 1
-# Use PIO interally
+# Use PIO internally
 CIRCUITPY_PULSEIO ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
diff --git a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
index ce2c397d47..31a8133b63 100644
--- a/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
+++ b/ports/stm/common-hal/audiobusio/MEMS_Audio_ll_stm32l4.h
@@ -148,7 +148,7 @@ typedef struct MemsAudio_STM32L4SAIPDM_t {
     pdm_data_available_t pdm_data_available;
 
     /**
-     * @brief A cound of the number of PDM clients in use.
+     * @brief A count of the number of PDM clients in use.
      */
     uint32_t SAI1_client;
 
diff --git a/py/emitbc.c b/py/emitbc.c
index 8f7b1d5b72..80d0bf489b 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -253,7 +253,7 @@ STATIC void emit_write_bytecode_byte_obj(emit_t *emit, int stack_adj, byte b, mp
     emit_write_bytecode_byte(emit, stack_adj, b);
     emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(mp_obj_t));
     mp_obj_t *c = (mp_obj_t *)emit_get_cur_to_write_bytecode(emit, sizeof(mp_obj_t));
-    // Verify thar c is already uint-aligned
+    // Verify that c is already uint-aligned
     assert(c == MP_ALIGN(c, sizeof(mp_obj_t)));
     *c = obj;
     #endif
@@ -269,7 +269,7 @@ STATIC void emit_write_bytecode_byte_raw_code(emit_t *emit, int stack_adj, byte
     emit_write_bytecode_byte(emit, stack_adj, b);
     emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(void *));
     void **c = (void **)emit_get_cur_to_write_bytecode(emit, sizeof(void *));
-    // Verify thar c is already uint-aligned
+    // Verify that c is already uint-aligned
     assert(c == MP_ALIGN(c, sizeof(void *)));
     *c = rc;
     #endif
diff --git a/py/emitnative.c b/py/emitnative.c
index 5946fcd341..7d615d5816 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -944,7 +944,7 @@ STATIC void emit_access_stack(emit_t *emit, int pos, vtype_kind_t *vtype, int re
 }
 
 // does an efficient X=pop(); discard(); push(X)
-// needs a (non-temp) register in case the poped element was stored in the stack
+// needs a (non-temp) register in case the popped element was stored in the stack
 STATIC void emit_fold_stack_top(emit_t *emit, int reg_dest) {
     stack_info_t *si = &emit->stack_info[emit->stack_size - 2];
     si[0] = si[1];
diff --git a/py/scope.h b/py/scope.h
index 8b05421072..b189260a37 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -49,7 +49,7 @@ typedef struct _id_info_t {
     uint8_t kind;
     uint8_t flags;
     // when it's an ID_INFO_KIND_LOCAL this is the unique number of the local
-    // whet it's an ID_INFO_KIND_CELL/FREE this is the unique number of the closed over variable
+    // when it's an ID_INFO_KIND_CELL/FREE this is the unique number of the closed over variable
     uint16_t local_num;
     qstr qst;
 } id_info_t;
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 3023721378..f056c741f3 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,7 +52,6 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socketpool_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);
 
diff --git a/tests/basics/int_big1.py b/tests/basics/int_big1.py
index 40d16c455b..01d58f7233 100644
--- a/tests/basics/int_big1.py
+++ b/tests/basics/int_big1.py
@@ -1,4 +1,4 @@
-# to test arbitrariy precision integers
+# to test arbitrarily precision integers
 
 x = 1000000000000000000000000000000
 xn = -1000000000000000000000000000000
diff --git a/tests/basics/with_return.py b/tests/basics/with_return.py
index fd848f1331..6f36d9ad03 100644
--- a/tests/basics/with_return.py
+++ b/tests/basics/with_return.py
@@ -30,7 +30,7 @@ def f():
                 return (i, j)
 print(f())
 
-# multiple for loops within nested withs
+# multiple for loops within nested with(s)
 def f():
     with CtxMgr(1):
         for i in [1, 2]:
@@ -41,7 +41,7 @@ def f():
                             return (i, j, k, l)
 print(f())
 
-# multiple for loops that are optimised, and nested withs
+# multiple for loops that are optimised, and nested with(s)
 def f():
     with CtxMgr(1):
         for i in range(1, 3):
diff --git a/tests/feature_check/README b/tests/feature_check/README
index 3b7b6cba41..0f55e7ece4 100644
--- a/tests/feature_check/README
+++ b/tests/feature_check/README
@@ -1,4 +1,4 @@
 This directory doesn't contain real tests, but code snippets to detect
-various interpreter features, which can't be/inconvenient to detecte by
+various interpreter features, which can't be/inconvenient to detected by
 other means. Scripts here are executed by run-tests.py at the beginning of
 testsuite to decide what other test groups to run/exclude.
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index 1c3706ec33..ecd4f10391 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -39,7 +39,7 @@ try:
 except NotImplementedError:
     print("NotImplementedError")
 
-# uPy raises TypeError, shold be ValueError
+# uPy raises TypeError, should be ValueError
 try:
     "%c" % b"\x01\x02"
 except (TypeError, ValueError):

From bce1e7e28000abfcf45507db7e8106c982c1b910 Mon Sep 17 00:00:00 2001
From: hathach 
Date: Thu, 23 Mar 2023 14:01:20 +0700
Subject: [PATCH 2102/2403] Revert changes in lib/

---
 lib/cmsis/inc/core_armv81mml.h  |  4 +--
 lib/cmsis/inc/core_sc300.h      |  2 +-
 lib/cmsis/inc/mpu_armv8.h       |  2 +-
 lib/libm_dbl/__rem_pio2_large.c |  6 ++---
 lib/libm_dbl/fmod.c             |  2 +-
 lib/libm_dbl/sqrt.c             |  2 +-
 lib/littlefs/lfs1.h             | 12 ++++-----
 lib/littlefs/lfs2.c             |  6 ++---
 lib/littlefs/lfs2.h             | 14 +++++-----
 lib/oofatfs/diskio.h            |  4 +--
 lib/oofatfs/ff.c                | 48 ++++++++++++++++-----------------
 lib/oofatfs/ff.h                |  2 +-
 lib/oofatfs/ffconf.h            |  6 ++---
 lib/oofatfs/ffunicode.c         |  2 +-
 lib/sdmmc/sdmmc_io.c            |  2 +-
 lib/uzlib/tinflate.c            |  2 +-
 16 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/lib/cmsis/inc/core_armv81mml.h b/lib/cmsis/inc/core_armv81mml.h
index 48428fd650..9425dbc321 100644
--- a/lib/cmsis/inc/core_armv81mml.h
+++ b/lib/cmsis/inc/core_armv81mml.h
@@ -2162,7 +2162,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
   SCB->AIRCR =  reg_value;
 }
 
@@ -2536,7 +2536,7 @@ __STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk));             /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
   SCB_NS->AIRCR =  reg_value;
 }
 
diff --git a/lib/cmsis/inc/core_sc300.h b/lib/cmsis/inc/core_sc300.h
index cbbac7e82c..5478ea74a5 100644
--- a/lib/cmsis/inc/core_sc300.h
+++ b/lib/cmsis/inc/core_sc300.h
@@ -1467,7 +1467,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priority group */
+                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
   SCB->AIRCR =  reg_value;
 }
 
diff --git a/lib/cmsis/inc/mpu_armv8.h b/lib/cmsis/inc/mpu_armv8.h
index 84fdd323ae..8002738606 100644
--- a/lib/cmsis/inc/mpu_armv8.h
+++ b/lib/cmsis/inc/mpu_armv8.h
@@ -84,7 +84,7 @@
 * \param SH Defines the Shareability domain for this memory region.
 * \param RO Read-Only: Set to 1 for a read-only memory region.
 * \param NP Non-Privileged: Set to 1 for a non-privileged memory region.
-* \param XN eXecute Never: Set to 1 for a non-executable memory region.
+* \oaram XN eXecute Never: Set to 1 for a non-executable memory region.
 */
 #define ARM_MPU_RBAR(BASE, SH, RO, NP, XN) \
   ((BASE & MPU_RBAR_BASE_Msk) | \
diff --git a/lib/libm_dbl/__rem_pio2_large.c b/lib/libm_dbl/__rem_pio2_large.c
index 2d1904efc3..958f28c255 100644
--- a/lib/libm_dbl/__rem_pio2_large.c
+++ b/lib/libm_dbl/__rem_pio2_large.c
@@ -40,14 +40,14 @@
  *                      z    = (z-x[i])*2**24
  *
  *
- *      y[]     output result in an array of double precision numbers.
+ *      y[]     ouput result in an array of double precision numbers.
  *              The dimension of y[] is:
  *                      24-bit  precision       1
  *                      53-bit  precision       2
  *                      64-bit  precision       2
  *                      113-bit precision       3
  *              The actual value is the sum of them. Thus for 113-bit
- *              precision, one may have to do something like:
+ *              precison, one may have to do something like:
  *
  *              long double t,w,r_head, r_tail;
  *              t = (long double)y[2] + (long double)y[1];
@@ -78,7 +78,7 @@
  *              jk+1 must be 2 larger than you might expect so that our
  *              recomputation test works. (Up to 24 bits in the integer
  *              part (the 24 bits of it that we compute) and 23 bits in
- *              the fraction part may be lost to cancellation before we
+ *              the fraction part may be lost to cancelation before we
  *              recompute.)
  *
  *      jz      local integer variable indicating the number of
diff --git a/lib/libm_dbl/fmod.c b/lib/libm_dbl/fmod.c
index cf03aacdb2..6849722bac 100644
--- a/lib/libm_dbl/fmod.c
+++ b/lib/libm_dbl/fmod.c
@@ -9,7 +9,7 @@ double fmod(double x, double y)
 	int sx = ux.i>>63;
 	uint64_t i;
 
-	/* in the following uxi should be ux.i, but then gcc wrongly adds */
+	/* in the followings uxi should be ux.i, but then gcc wrongly adds */
 	/* float load/store to inner loops ruining performance and code size */
 	uint64_t uxi = ux.i;
 
diff --git a/lib/libm_dbl/sqrt.c b/lib/libm_dbl/sqrt.c
index 194b09fb52..b277567385 100644
--- a/lib/libm_dbl/sqrt.c
+++ b/lib/libm_dbl/sqrt.c
@@ -37,7 +37,7 @@
  *      If (2) is false, then q   = q ; otherwise q   = q  + 2      .
  *                             i+1   i             i+1   i
  *
- *      With some algebraic manipulation, it is not difficult to see
+ *      With some algebric manipulation, it is not difficult to see
  *      that (2) is equivalent to
  *                             -(i+1)
  *                      s  +  2       <= y                      (3)
diff --git a/lib/littlefs/lfs1.h b/lib/littlefs/lfs1.h
index 08f0b193c8..355c145d08 100644
--- a/lib/littlefs/lfs1.h
+++ b/lib/littlefs/lfs1.h
@@ -94,7 +94,7 @@ enum lfs1_open_flags {
     LFS1_F_DIRTY   = 0x10000, // File does not match storage
     LFS1_F_WRITING = 0x20000, // File has been written since last flush
     LFS1_F_READING = 0x40000, // File has been read since last flush
-    LFS1_F_ERRED   = 0x80000, // An error occurred during write
+    LFS1_F_ERRED   = 0x80000, // An error occured during write
 };
 
 // File seek flags
@@ -111,25 +111,25 @@ struct lfs1_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propagated
+    // Read a region in a block. Negative error codes are propogated
     // to the user.
     int (*read)(const struct lfs1_config *c, lfs1_block_t block,
             lfs1_off_t off, void *buffer, lfs1_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propagated to the user.
+    // been erased. Negative error codes are propogated to the user.
     // May return LFS1_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs1_config *c, lfs1_block_t block,
             lfs1_off_t off, const void *buffer, lfs1_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     // May return LFS1_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs1_config *c, lfs1_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     int (*sync)(const struct lfs1_config *c);
 
     // Minimum size of a block read. This determines the size of read buffers.
@@ -484,7 +484,7 @@ int lfs1_dir_rewind(lfs1_t *lfs1, lfs1_dir_t *dir);
 // Returns a negative error code on failure.
 int lfs1_traverse(lfs1_t *lfs1, int (*cb)(void*, lfs1_block_t), void *data);
 
-// Prunes any recoverable errors that may have occurred in the filesystem
+// Prunes any recoverable errors that may have occured in the filesystem
 //
 // Not needed to be called by user unless an operation is interrupted
 // but the filesystem is still mounted. This is already called on first
diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 7f3519acd2..39bd2f0d1c 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -1449,7 +1449,7 @@ static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
         }
     }
 
-    // zero for reproducibility in case initial block is unreadable
+    // zero for reproducability in case initial block is unreadable
     dir->rev = 0;
 
     // rather than clobbering one of the blocks we just pretend
@@ -1643,7 +1643,7 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
                     return err;
                 }
 
-                // whelp, we tried, if we ran out of space there's not much
+                // welp, we tried, if we ran out of space there's not much
                 // we can do, we'll error later if we've become frozen
                 if (!err) {
                     end = begin;
@@ -4037,7 +4037,7 @@ static int lfs2_fs_relocate(lfs2_t *lfs2,
             lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
         }
 
-        // replace bad pair, either we clean up desync, or no desync occurred
+        // replace bad pair, either we clean up desync, or no desync occured
         lfs2_pair_tole32(newpair);
         err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
                 {LFS2_MKTAG_IF(moveid != 0x3ff,
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index b819aaa3b5..f3b66d76ff 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -159,34 +159,34 @@ struct lfs2_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propagated
+    // Read a region in a block. Negative error codes are propogated
     // to the user.
     int (*read)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, void *buffer, lfs2_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propagated to the user.
+    // been erased. Negative error codes are propogated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, const void *buffer, lfs2_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     int (*sync)(const struct lfs2_config *c);
 
 #ifdef LFS2_THREADSAFE
     // Lock the underlying block device. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     int (*lock)(const struct lfs2_config *c);
 
     // Unlock the underlying block device. Negative error codes
-    // are propagated to the user.
+    // are propogated to the user.
     int (*unlock)(const struct lfs2_config *c);
 #endif
 
@@ -479,7 +479,7 @@ int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
 // Returns the size of the attribute, or a negative error code on failure.
 // Note, the returned size is the size of the attribute on disk, irrespective
 // of the size of the buffer. This can be used to dynamically allocate a buffer
-// or check for existence.
+// or check for existance.
 lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size);
 
diff --git a/lib/oofatfs/diskio.h b/lib/oofatfs/diskio.h
index 00768cac72..d886bdd9cc 100644
--- a/lib/oofatfs/diskio.h
+++ b/lib/oofatfs/diskio.h
@@ -3,7 +3,7 @@
  */
 
 /*-----------------------------------------------------------------------/
-/  Low level disk interface module include file   (C)ChaN, 2014          /
+/  Low level disk interface modlue include file   (C)ChaN, 2014          /
 /-----------------------------------------------------------------------*/
 
 #ifndef _DISKIO_DEFINED
@@ -42,7 +42,7 @@ DRESULT disk_ioctl (void *drv, BYTE cmd, void* buff);
 #define STA_PROTECT     0x04    /* Write protected */
 
 
-/* Command code for disk_ioctrl function */
+/* Command code for disk_ioctrl fucntion */
 
 /* Generic command (Used by FatFs) */
 #define CTRL_SYNC           0   /* Complete pending write process (needed at FF_FS_READONLY == 0) */
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index a4c17f0560..dbcfa3efc3 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -996,7 +996,7 @@ static FRESULT dec_lock (   /* Decrement object open counter */
         if (n == 0) Files[i].fs = 0;    /* Delete the entry if open count gets zero */
         res = FR_OK;
     } else {
-        res = FR_INT_ERR;           /* Invalid index number */
+        res = FR_INT_ERR;           /* Invalid index nunber */
     }
     return res;
 }
@@ -1990,7 +1990,7 @@ static void gen_numname (
         seq = (UINT)sr;
     }
 
-    /* itoa (hexadecimal) */
+    /* itoa (hexdecimal) */
     i = 7;
     do {
         c = (BYTE)((seq % 16) + '0');
@@ -2098,7 +2098,7 @@ static DWORD xsum32 (   /* Returns 32-bit checksum */
 /*------------------------------------------------------*/
 
 static void get_xfileinfo (
-    BYTE* dirb,         /* Pointer to the directory entry block 85+C0+C1s */
+    BYTE* dirb,         /* Pointer to the direcotry entry block 85+C0+C1s */
     FILINFO* fno        /* Buffer to store the extracted file information */
 )
 {
@@ -2135,16 +2135,16 @@ static void get_xfileinfo (
 
 
 /*-----------------------------------*/
-/* exFAT: Get a directory entry block */
+/* exFAT: Get a directry entry block */
 /*-----------------------------------*/
 
 static FRESULT load_xdir (  /* FR_INT_ERR: invalid entry block */
-    DIR* dp                 /* Reading directory object pointing top of the entry block to load */
+    DIR* dp                 /* Reading direcotry object pointing top of the entry block to load */
 )
 {
     FRESULT res;
     UINT i, sz_ent;
-    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the on-memory directory entry block 85+C0+C1s */
+    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the on-memory direcotry entry block 85+C0+C1s */
 
 
     /* Load file-directory entry */
@@ -2208,7 +2208,7 @@ static void init_alloc_info (
 /*------------------------------------------------*/
 
 static FRESULT load_obj_xdir (
-    DIR* dp,            /* Blank directory object to be used to access containing directory */
+    DIR* dp,            /* Blank directory object to be used to access containing direcotry */
     const FFOBJID* obj  /* Object with its containing directory information */
 )
 {
@@ -2237,18 +2237,18 @@ static FRESULT load_obj_xdir (
 /*----------------------------------------*/
 
 static FRESULT store_xdir (
-    DIR* dp             /* Pointer to the directory object */
+    DIR* dp             /* Pointer to the direcotry object */
 )
 {
     FRESULT res;
     UINT nent;
-    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the directory entry block 85+C0+C1s */
+    BYTE* dirb = dp->obj.fs->dirbuf;    /* Pointer to the direcotry entry block 85+C0+C1s */
 
     /* Create set sum */
     st_word(dirb + XDIR_SetSum, xdir_sum(dirb));
     nent = dirb[XDIR_NumSec] + 1;
 
-    /* Store the directory entry block to the directory */
+    /* Store the direcotry entry block to the directory */
     res = dir_sdi(dp, dp->blk_ofs);
     while (res == FR_OK) {
         res = move_window(dp->obj.fs, dp->sect);
@@ -2265,11 +2265,11 @@ static FRESULT store_xdir (
 
 
 /*-------------------------------------------*/
-/* exFAT: Create a new directory entry block */
+/* exFAT: Create a new directory enrty block */
 /*-------------------------------------------*/
 
 static void create_xdir (
-    BYTE* dirb,         /* Pointer to the directory entry block buffer */
+    BYTE* dirb,         /* Pointer to the direcotry entry block buffer */
     const WCHAR* lfn    /* Pointer to the object name */
 )
 {
@@ -2690,7 +2690,7 @@ static void get_fileinfo (
     fno->altname[di] = 0;   /* Terminate the SFN  (null string means SFN is invalid) */
 
     if (fno->fname[0] == 0) {   /* If LFN is invalid, altname[] needs to be copied to fname[] */
-        if (di == 0) {  /* If LFN and SFN both are invalid, this object is inaccessible */
+        if (di == 0) {  /* If LFN and SFN both are invalid, this object is inaccesible */
             fno->fname[di++] = '?';
         } else {
             for (si = di = 0, lcf = NS_BODY; fno->altname[si]; si++, di++) { /* Copy altname[] to fname[] with case information */
@@ -2764,7 +2764,7 @@ static DWORD get_achar (    /* Get a character and advances ptr */
 
 static int pattern_matching (   /* 0:not matched, 1:matched */
     const TCHAR* pat,   /* Matching pattern */
-    const TCHAR* name,   /* String to be tested */
+    const TCHAR* nam,   /* String to be tested */
     int skip,           /* Number of pre-skip chars (number of ?s) */
     int inf             /* Infinite search (* specified) */
 )
@@ -2775,12 +2775,12 @@ static int pattern_matching (   /* 0:not matched, 1:matched */
 
 
     while (skip--) {                /* Pre-skip name chars */
-        if (!get_achar(&name)) return 0; /* Branch mismatched if less name chars */
+        if (!get_achar(&nam)) return 0; /* Branch mismatched if less name chars */
     }
     if (*pat == 0 && inf) return 1; /* (short circuit) */
 
     do {
-        pp = pat; np = name;         /* Top of pattern and name to match */
+        pp = pat; np = nam;         /* Top of pattern and name to match */
         for (;;) {
             if (*pp == '?' || *pp == '*') { /* Wildcard? */
                 nm = nx = 0;
@@ -2795,7 +2795,7 @@ static int pattern_matching (   /* 0:not matched, 1:matched */
             if (pc != nc) break;    /* Branch mismatched? */
             if (pc == 0) return 1;  /* Branch matched? (matched at end of both strings) */
         }
-        get_achar(&name);            /* name++ */
+        get_achar(&nam);            /* nam++ */
     } while (inf && nc);            /* Retry until end of name if infinite search is specified */
 
     return 0;
@@ -3183,7 +3183,7 @@ static FRESULT find_volume (    /* FR_OK(0): successful, !=0: an error occurred
             fmt = bsect ? check_fs(fs, bsect) : 3;  /* Check the partition */
         } while (LD2PT(fs) == 0 && fmt >= 2 && ++i < 4);
     }
-    if (fmt == 4) return FR_DISK_ERR;       /* An error occurred in the disk I/O layer */
+    if (fmt == 4) return FR_DISK_ERR;       /* An error occured in the disk I/O layer */
     if (fmt >= 2) return FR_NO_FILESYSTEM;  /* No FAT volume is found */
 
     /* An FAT volume is found (bsect). Following code initializes the filesystem object */
@@ -3221,7 +3221,7 @@ static FRESULT find_volume (    /* FR_OK(0): successful, !=0: an error occurred
         fs->volbase = bsect;
         fs->database = bsect + ld_dword(fs->win + BPB_DataOfsEx);
         fs->fatbase = bsect + ld_dword(fs->win + BPB_FatOfsEx);
-        if (maxlba < (QWORD)fs->database + nclst * fs->csize) return FR_NO_FILESYSTEM;  /* (Volume size must not be smaller than the size required) */
+        if (maxlba < (QWORD)fs->database + nclst * fs->csize) return FR_NO_FILESYSTEM;  /* (Volume size must not be smaller than the size requiered) */
         fs->dirbase = ld_dword(fs->win + BPB_RootClusEx);
 
         /* Get bitmap location and check if it is contiguous (implementation assumption) */
@@ -3365,7 +3365,7 @@ static FRESULT validate (   /* Returns FR_OK or FR_INVALID_OBJECT */
     if (obj && obj->fs && obj->fs->fs_type && obj->id == obj->fs->id) { /* Test if the object is valid */
 #if FF_FS_REENTRANT
         if (lock_fs(obj->fs)) { /* Obtain the filesystem object */
-            if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the physical drive is kept initialized */
+            if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
                 res = FR_OK;
             } else {
                 unlock_fs(obj->fs, FR_OK);
@@ -3374,7 +3374,7 @@ static FRESULT validate (   /* Returns FR_OK or FR_INVALID_OBJECT */
             res = FR_TIMEOUT;
         }
 #else
-        if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the physical drive is kept initialized */
+        if (disk_ioctl(obj->fs->drv, IOCTL_STATUS, &stat) == RES_OK && !(stat & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
             res = FR_OK;
         }
 #endif
@@ -3528,7 +3528,7 @@ FRESULT f_open (
             }
         }
         else {  /* Open an existing file */
-            if (res == FR_OK) {                 /* Is the object existing? */
+            if (res == FR_OK) {                 /* Is the object exsiting? */
                 if (dj.obj.attr & AM_DIR) {     /* File open against a directory */
                     res = FR_NO_FILE;
                 } else {
@@ -4339,7 +4339,7 @@ FRESULT f_opendir (
         FREE_NAMBUF();
         if (res == FR_NO_FILE) res = FR_NO_PATH;
     }
-    if (res != FR_OK) dp->obj.fs = 0;       /* Invalidate the directory object if function failed */
+    if (res != FR_OK) dp->obj.fs = 0;       /* Invalidate the directory object if function faild */
 
     LEAVE_FF(fs, res);
 }
@@ -4779,7 +4779,7 @@ FRESULT f_mkdir (
                         st_clust(fs, fs->win + SZDIRE, pcl);
                         fs->wflag = 1;
                     }
-                    res = dir_register(&dj);    /* Register the object to the parent directory */
+                    res = dir_register(&dj);    /* Register the object to the parent directoy */
                 }
             }
             if (res == FR_OK) {
diff --git a/lib/oofatfs/ff.h b/lib/oofatfs/ff.h
index fe731eb694..b133d770db 100644
--- a/lib/oofatfs/ff.h
+++ b/lib/oofatfs/ff.h
@@ -240,7 +240,7 @@ typedef struct {
     WORD    ftime;          /* Modified time */
     BYTE    fattrib;        /* File attribute */
 #if FF_USE_LFN
-    TCHAR   altname[FF_SFN_BUF + 1];/* Alternative file name */
+    TCHAR   altname[FF_SFN_BUF + 1];/* Altenative file name */
     TCHAR   fname[FF_LFN_BUF + 1];  /* Primary file name */
 #else
     TCHAR   fname[12 + 1];  /* File name */
diff --git a/lib/oofatfs/ffconf.h b/lib/oofatfs/ffconf.h
index bcd7ee5baf..52ff6d0a7a 100644
--- a/lib/oofatfs/ffconf.h
+++ b/lib/oofatfs/ffconf.h
@@ -188,7 +188,7 @@
 #define FF_LFN_BUF      255
 #define FF_SFN_BUF      12
 /* This set of options defines size of file name members in the FILINFO structure
-/  which is used to read out directory items. These values should be sufficient for
+/  which is used to read out directory items. These values should be suffcient for
 /  the file names to read. The maximum possible length of the read file name depends
 /  on character encoding. When LFN is not enabled, these options have no effect. */
 
@@ -251,7 +251,7 @@
 /  number and only an FAT volume found on the physical drive will be mounted.
 /  When this function is enabled (1), each logical drive number can be bound to
 /  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  function will be available. */
+/  funciton will be available. */
 
 
 #define FF_MIN_SS   512
@@ -316,7 +316,7 @@
 #define FF_NORTC_MON    1
 #define FF_NORTC_MDAY   1
 #define FF_NORTC_YEAR   2018
-/* The option FF_FS_NORTC switches timestamp function. If the system does not have
+/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
 /  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
 /  the timestamp function. Every object modified by FatFs will have a fixed timestamp
 /  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
diff --git a/lib/oofatfs/ffunicode.c b/lib/oofatfs/ffunicode.c
index ce60b42193..a04577616a 100644
--- a/lib/oofatfs/ffunicode.c
+++ b/lib/oofatfs/ffunicode.c
@@ -3,7 +3,7 @@
 /*------------------------------------------------------------------------*/
 /* This module will occupy a huge memory in the .const section when the    /
 /  FatFs is configured for LFN with DBCS. If the system has any Unicode    /
-/  utility for the code conversion, this module should be modified to use /
+/  utilitiy for the code conversion, this module should be modified to use /
 /  that function to avoid silly memory consumption.                        /
 /-------------------------------------------------------------------------*/
 /*
diff --git a/lib/sdmmc/sdmmc_io.c b/lib/sdmmc/sdmmc_io.c
index 68c804982b..17ab291515 100644
--- a/lib/sdmmc/sdmmc_io.c
+++ b/lib/sdmmc/sdmmc_io.c
@@ -282,7 +282,7 @@ sdmmc_err_t sdmmc_io_rw_extended(sdmmc_card_t* card, int func,
             return SDMMC_ERR_INVALID_SIZE;
         }
         if (datalen == max_byte_transfer_size) {
-            count = 0;  // See 5.3.1 SDIO simplified spec
+            count = 0;  // See 5.3.1 SDIO simplifed spec
         } else {
             count = datalen;
         }
diff --git a/lib/uzlib/tinflate.c b/lib/uzlib/tinflate.c
index fbee7ce721..045952c755 100644
--- a/lib/uzlib/tinflate.c
+++ b/lib/uzlib/tinflate.c
@@ -597,7 +597,7 @@ next_blk:
 
         if (res == TINF_DONE && !d->bfinal) {
             /* the block has ended (without producing more data), but we
-               can't return without data, so start processing next block */
+               can't return without data, so start procesing next block */
             goto next_blk;
         }
 

From 66129311f4a9e60ea00739dc95e0ba0db7f4c51d Mon Sep 17 00:00:00 2001
From: hathach 
Date: Thu, 23 Mar 2023 14:19:36 +0700
Subject: [PATCH 2103/2403] fix pre-commit format

---
 shared-bindings/socketpool/SocketPool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index f056c741f3..3023721378 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,6 +52,7 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socketpool_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);
 

From 81e71c706f16f2e481b0c47a17c4c095a20f2683 Mon Sep 17 00:00:00 2001
From: ozgurbostan 
Date: Thu, 23 Mar 2023 13:13:56 +0300
Subject: [PATCH 2104/2403] Update pre-commit

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1905b233cf..ce2167abbd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.4.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer

From b38c0a4dc1e47b9b585d9d5fd5d9c3868ad126bf Mon Sep 17 00:00:00 2001
From: ozgurbostan 
Date: Thu, 23 Mar 2023 14:27:15 +0300
Subject: [PATCH 2105/2403] Add new boards (deneyapkart/1a/g)

---
 ports/espressif/boards/deneyap_kart/board.c   | 34 +++++++
 .../boards/deneyap_kart/mpconfigboard.h       | 50 ++++++++++
 .../boards/deneyap_kart/mpconfigboard.mk      |  8 ++
 ports/espressif/boards/deneyap_kart/pins.c    | 99 +++++++++++++++++++
 ports/espressif/boards/deneyap_kart/sdkconfig | 19 ++++
 .../espressif/boards/deneyap_kart_1a/board.c  | 34 +++++++
 .../boards/deneyap_kart_1a/mpconfigboard.h    | 50 ++++++++++
 .../boards/deneyap_kart_1a/mpconfigboard.mk   |  8 ++
 ports/espressif/boards/deneyap_kart_1a/pins.c | 97 ++++++++++++++++++
 .../boards/deneyap_kart_1a/sdkconfig          | 19 ++++
 ports/espressif/boards/deneyap_kart_g/board.c | 31 ++++++
 .../boards/deneyap_kart_g/mpconfigboard.h     | 44 +++++++++
 .../boards/deneyap_kart_g/mpconfigboard.mk    |  8 ++
 ports/espressif/boards/deneyap_kart_g/pins.c  | 51 ++++++++++
 .../espressif/boards/deneyap_kart_g/sdkconfig |  5 +
 15 files changed, 557 insertions(+)
 create mode 100644 ports/espressif/boards/deneyap_kart/board.c
 create mode 100644 ports/espressif/boards/deneyap_kart/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_kart/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_kart/pins.c
 create mode 100644 ports/espressif/boards/deneyap_kart/sdkconfig
 create mode 100644 ports/espressif/boards/deneyap_kart_1a/board.c
 create mode 100644 ports/espressif/boards/deneyap_kart_1a/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_kart_1a/pins.c
 create mode 100644 ports/espressif/boards/deneyap_kart_1a/sdkconfig
 create mode 100644 ports/espressif/boards/deneyap_kart_g/board.c
 create mode 100644 ports/espressif/boards/deneyap_kart_g/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_kart_g/pins.c
 create mode 100644 ports/espressif/boards/deneyap_kart_g/sdkconfig

diff --git a/ports/espressif/boards/deneyap_kart/board.c b/ports/espressif/boards/deneyap_kart/board.c
new file mode 100644
index 0000000000..8c0c8b8b0b
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart/board.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Radio Sound, Inc.
+ *
+ * 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 "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_kart/mpconfigboard.h b/ports/espressif/boards/deneyap_kart/mpconfigboard.h
new file mode 100644
index 0000000000..c2251c3dcb
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart/mpconfigboard.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Deneyap Kart"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO4)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO15, .sda = &pin_GPIO4}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO19, .mosi = &pin_GPIO5, .miso = &pin_GPIO18}}
+
+#define CIRCUITPY_BOARD_UART        (0)
+
+// For entering safe mode, use BUT button
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+// #define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the BUT button at start up.")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/deneyap_kart/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
new file mode 100644
index 0000000000..c98cdb87b6
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0x00001209
+CIRCUITPY_CREATION_ID = 0x0032D001
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/deneyap_kart/pins.c b/ports/espressif/boards/deneyap_kart/pins.c
new file mode 100644
index 0000000000..9408d4470c
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart/pins.c
@@ -0,0 +1,99 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, right side, then left side
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD4), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD3), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_LEDG), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_LEDR), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD5), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD2), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD6), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_CAMPC), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GPKEY), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IMUSD), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_LEDB), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IMUSC), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_T5), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_MICC), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_T4), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_MICD), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_T3), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_T2), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_CAMV), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_CAMH), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD9), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD8), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_T0), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_CAMXC), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_T1), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_CAMSD), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_CAMSC), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD7), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_kart/sdkconfig b/ports/espressif/boards/deneyap_kart/sdkconfig
new file mode 100644
index 0000000000..c98c5de68d
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart/sdkconfig
@@ -0,0 +1,19 @@
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=8388608
+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_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
\ No newline at end of file
diff --git a/ports/espressif/boards/deneyap_kart_1a/board.c b/ports/espressif/boards/deneyap_kart_1a/board.c
new file mode 100644
index 0000000000..8c0c8b8b0b
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a/board.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Radio Sound, Inc.
+ *
+ * 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 "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.h b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.h
new file mode 100644
index 0000000000..ba7c216c89
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Deneyap Kart 1A"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO15, .sda = &pin_GPIO4}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO19, .mosi = &pin_GPIO5, .miso = &pin_GPIO18}}
+
+#define CIRCUITPY_BOARD_UART        (0)
+
+// For entering safe mode, use BUT button
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// Explanation of how a user got into safe mode
+// #define BOARD_USER_SAFE_MODE_ACTION translate("You pressed the BUT button at start up.")
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
new file mode 100644
index 0000000000..8b3da63e5b
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0x00001209
+CIRCUITPY_CREATION_ID = 0x0032D002
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/deneyap_kart_1a/pins.c b/ports/espressif/boards/deneyap_kart_1a/pins.c
new file mode 100644
index 0000000000..c4b1d51840
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a/pins.c
@@ -0,0 +1,97 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, right side, then left side
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD4), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD3), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD5), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD2), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD6), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_CAMPC), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GPKEY), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SDMI), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_T5), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_RGBLED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_T4), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_SDCS), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_T3), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SDMO), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_T2), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_SDCK), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_CAMV), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_CAMH), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD9), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD8), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_T0), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_CAMXC), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_T1), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_CAMSD), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_CAMSC), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_CAMD7), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_kart_1a/sdkconfig b/ports/espressif/boards/deneyap_kart_1a/sdkconfig
new file mode 100644
index 0000000000..c98c5de68d
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a/sdkconfig
@@ -0,0 +1,19 @@
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=8388608
+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_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
\ No newline at end of file
diff --git a/ports/espressif/boards/deneyap_kart_g/board.c b/ports/espressif/boards/deneyap_kart_g/board.c
new file mode 100644
index 0000000000..9b26fe466d
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_g/board.c
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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/Pin.h"
+#include "supervisor/board.h"
+
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.h b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.h
new file mode 100644
index 0000000000..ce2969bbda
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 microDev
+ * Copyright (c) 2021 skieast/Bruce Segal
+ *
+ * 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.
+ */
+
+// Board setup
+#define MICROPY_HW_BOARD_NAME       "Deneyap Kart G"
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FN4"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO2, .sda = &pin_GPIO8}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO4, .mosi = &pin_GPIO6, .miso = &pin_GPIO5}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+// For entering safe mode
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO9)
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
new file mode 100644
index 0000000000..c01e84611b
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
@@ -0,0 +1,8 @@
+CIRCUITPY_CREATOR_ID =  0x00001209
+CIRCUITPY_CREATION_ID = 0x0032D003
+
+IDF_TARGET = esp32c3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/deneyap_kart_g/pins.c b/ports/espressif/boards/deneyap_kart_g/pins.c
new file mode 100644
index 0000000000..c8b7ef4996
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_g/pins.c
@@ -0,0 +1,51 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GPKEY), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BT), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_RGBLED), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_PWM2), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_kart_g/sdkconfig b/ports/espressif/boards/deneyap_kart_g/sdkconfig
new file mode 100644
index 0000000000..a988de5fea
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_g/sdkconfig
@@ -0,0 +1,5 @@
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="DeneyapKartG"
+# end of LWIP

From b947605ab781cb5e7435223681b70c5e1260c6b0 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 23 Mar 2023 09:24:11 -0400
Subject: [PATCH 2106/2403] Touch up

---
 ports/espressif/boards/m5stack_stick_c/board.c |  2 +-
 tests/basics/int_big1.py                       |  2 +-
 tests/basics/with_return.py                    |  4 ++--
 tools/preprocess_frozen_modules.py             | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index 88d0287419..ae29c9fa76 100644
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -193,7 +193,7 @@ static bool pmic_init(void) {
     }
 
     // Reg: 12h
-    // Enable EXTENT, DCDC1, LDO2 and LDO3
+    // Enable CTRL_EXTEN, DCDC1, LDO2 and LDO3
     write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
     write_buf[1] = AXP192_DCDC13_LDO23_CTRL_EXTEN |
         AXP192_DCDC13_LDO23_CTRL_LDO3 |
diff --git a/tests/basics/int_big1.py b/tests/basics/int_big1.py
index 01d58f7233..f6e4b61d1d 100644
--- a/tests/basics/int_big1.py
+++ b/tests/basics/int_big1.py
@@ -1,4 +1,4 @@
-# to test arbitrarily precision integers
+# to test arbitrary precision integers
 
 x = 1000000000000000000000000000000
 xn = -1000000000000000000000000000000
diff --git a/tests/basics/with_return.py b/tests/basics/with_return.py
index 6f36d9ad03..af65a5b984 100644
--- a/tests/basics/with_return.py
+++ b/tests/basics/with_return.py
@@ -30,7 +30,7 @@ def f():
                 return (i, j)
 print(f())
 
-# multiple for loops within nested with(s)
+# multiple for loops within nested with statements
 def f():
     with CtxMgr(1):
         for i in [1, 2]:
@@ -41,7 +41,7 @@ def f():
                             return (i, j, k, l)
 print(f())
 
-# multiple for loops that are optimised, and nested with(s)
+# multiple for loops that are optimised, and nested with statements
 def f():
     with CtxMgr(1):
         for i in range(1, 3):
diff --git a/tools/preprocess_frozen_modules.py b/tools/preprocess_frozen_modules.py
index 80ab547f3b..eb835961f6 100755
--- a/tools/preprocess_frozen_modules.py
+++ b/tools/preprocess_frozen_modules.py
@@ -21,10 +21,10 @@ def version_string(path=None, *, valid_semver=False):
         version = tag.strip().decode("utf-8", "strict")
     except subprocess.CalledProcessError:
         describe = subprocess.check_output("git describe --tags", shell=True, cwd=path)
-        tag, additional_commits, committish = (
+        tag, additional_commits, commit_ish = (
             describe.strip().decode("utf-8", "strict").rsplit("-", maxsplit=2)
         )
-        committish = committish[1:]
+        commit_ish = commit_ish[1:]
         if valid_semver:
             version_info = semver.parse_version_info(tag)
             if not version_info.prerelease:
@@ -33,12 +33,12 @@ def version_string(path=None, *, valid_semver=False):
                     + "-alpha.0.plus."
                     + additional_commits
                     + "+"
-                    + committish
+                    + commit_ish
                 )
             else:
-                version = tag + ".plus." + additional_commits + "+" + committish
+                version = tag + ".plus." + additional_commits + "+" + commit_ish
         else:
-            version = committish
+            version = commit_ish
     return version
 
 

From b50c80e3d93775561a314c0712195760547bb18c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 09:12:46 -0500
Subject: [PATCH 2107/2403] remove unused macro

---
 ports/mimxrt10xx/common-hal/audiobusio/__init__.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
index 2be6c6bcbb..515c39a268 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -38,11 +38,6 @@
 #define SAI_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_AudioPllClk) / (SAI_CLOCK_SOURCE_DIVIDER + 1U) / \
     (SAI_CLOCK_SOURCE_PRE_DIVIDER + 1U))
 
-// must match what's in clocks.c (but that's a C file so there's no way to include it)
-// This is 480MMHz * (18/17) / 8 (around 63.5MHz) and there's no partiuclar
-// logic to this value that I was able to determine.
-#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
-
 #define AUDIO_BUFFER_FRAME_COUNT (128) // in uint32_t; there are 4, giving 2048 bytes. In all they hold 10ms @ stereo 16-bit 48kHz before all buffers drain
 
 /*

From 47e1abdbc7ba23dac7b6596bacd22416002649ec Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 6 Mar 2023 16:04:39 -0600
Subject: [PATCH 2108/2403] Add IncrementalEncoder for mimxrt1011

.. and write a general 'pin change interrupt' facility to power it

This uses the same quadrature state machine as atmel-samd, nrf, and
rp2040. The 1011 doesn't have a dedicated encoder peripheral, so we
go the pin-change + software route.
---
 .../common-hal/digitalio/DigitalInOut.c       |  2 +-
 .../common-hal/digitalio/DigitalInOut.h       |  2 +
 .../common-hal/microcontroller/Pin.c          | 98 +++++++++++++++++++
 .../common-hal/microcontroller/Pin.h          |  4 +
 .../common-hal/rotaryio/IncrementalEncoder.c  | 87 ++++++++++++++++
 .../common-hal/rotaryio/IncrementalEncoder.h  | 44 +++++++++
 .../mimxrt10xx/common-hal/rotaryio/__init__.c |  0
 .../mimxrt10xx/common-hal/rotaryio/__init__.h |  0
 ports/mimxrt10xx/mpconfigport.mk              |  3 +-
 9 files changed, 238 insertions(+), 2 deletions(-)
 create mode 100644 ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
 create mode 100644 ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.h
 create mode 100644 ports/mimxrt10xx/common-hal/rotaryio/__init__.c
 create mode 100644 ports/mimxrt10xx/common-hal/rotaryio/__init__.h

diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
index 3445cf42a0..2b4a78948e 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -40,7 +40,7 @@
 
 #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U
 
-STATIC void pin_config(const mcu_pin_obj_t *pin, bool open_drain, digitalio_pull_t pull) {
+void pin_config(const mcu_pin_obj_t *pin, bool open_drain, digitalio_pull_t pull) {
     IOMUXC_SetPinConfig(0, 0, 0, 0, pin->cfg_reg,
         IOMUXC_SW_PAD_CTL_PAD_HYS(1)
         | IOMUXC_SW_PAD_CTL_PAD_PUS((pull == PULL_UP) ? 2 : 0)
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h
index 4c19de20b6..06adb93cb8 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h
@@ -40,4 +40,6 @@ typedef struct {
     digitalio_pull_t pull;
 } digitalio_digitalinout_obj_t;
 
+void pin_config(const mcu_pin_obj_t *pin, bool open_drain, digitalio_pull_t pull);
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 3c8c7f2b27..9d55382306 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -84,6 +84,7 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
         return;
     }
 
+    disable_pin_change_interrupt(pin);
     never_reset_pins[pin->mux_idx] = false;
     claimed_pins[pin->mux_idx] = false;
     *(uint32_t *)pin->mux_reg = pin->mux_reset;
@@ -116,3 +117,100 @@ void claim_pin(const mcu_pin_obj_t *pin) {
 void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
     common_hal_reset_pin((mcu_pin_obj_t *)(mcu_pin_globals.map.table[pin_no].value));
 }
+
+/* Array of GPIO peripheral base address. */
+static GPIO_Type *const s_gpioBases[] = GPIO_BASE_PTRS;
+static uint32_t GPIO_GetInstance(GPIO_Type *base) {
+    uint32_t instance;
+
+    /* Find the instance index from base address mappings. */
+    for (instance = 0U; instance < ARRAY_SIZE(s_gpioBases); instance++)
+    {
+        if (s_gpioBases[instance] == base) {
+            break;
+        }
+    }
+
+    assert(instance < ARRAY_SIZE(s_gpioBases));
+
+    return instance;
+}
+
+/* to find IRQ based on GPIO */
+static const IRQn_Type low_irqs[] = GPIO_COMBINED_LOW_IRQS;
+static const IRQn_Type high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
+
+typedef struct {
+    gpio_change_interrupt_t *func;
+    void *data;
+} pin_change_interrupt_data;
+
+volatile static pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
+
+void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data) {
+    int instance = GPIO_GetInstance(pin->gpio);
+    volatile pin_change_interrupt_data *pci = &pcid[instance][pin->number];
+    common_hal_mcu_disable_interrupts();
+    pci->data = data;
+    pci->func = func;
+    IRQn_Type irq = pin->number < 16 ? low_irqs[instance] : high_irqs[instance];
+    if (irq != NotAvail_IRQn) {
+        EnableIRQ(irq);
+    }
+    pin->gpio->IMR |= (1 << pin->number);
+    common_hal_mcu_enable_interrupts();
+}
+
+void disable_pin_change_interrupt(const mcu_pin_obj_t *pin) {
+    volatile pin_change_interrupt_data *pci = &pcid[GPIO_GetInstance(pin->gpio)][pin->number];
+    common_hal_mcu_disable_interrupts();
+    pin->gpio->IMR &= ~(1 << pin->number);
+    pci->data = NULL;
+    pci->func = NULL;
+    pin->gpio->ISR = (1 << pin->number); // acknowledge any pending interrupt
+    common_hal_mcu_enable_interrupts();
+}
+
+static void pin_change_interrupt_common(uint32_t isr, volatile pin_change_interrupt_data *pcr) {
+    for (uint32_t i = 0; i < 32; i++) {
+        if (isr & (1 << i)) {
+            pin_change_interrupt_data cb = pcr[i];
+            if (cb.func) {
+                cb.func(cb.data);
+            }
+        }
+    }
+}
+
+#define GPIO_INTERRUPT_HANDLER(name, ptr, instance, offset) \
+    void name(void); \
+    __attribute__((used)) void name(void) { \
+        uint32_t isr = ptr->ISR; \
+        ptr->ISR = isr; \
+        pin_change_interrupt_common(isr, pcid[instance]); \
+    }
+
+#if defined(GPIO1)
+GPIO_INTERRUPT_HANDLER(GPIO1_Combined_0_15_IRQHandler, GPIO1, 1, 0);
+GPIO_INTERRUPT_HANDLER(GPIO1_Combined_16_31_IRQHandler, GPIO1, 1, 16);
+#endif
+#if defined(GPIO2)
+GPIO_INTERRUPT_HANDLER(GPIO2_Combined_0_15_IRQHandler, GPIO2, 2, 0);
+GPIO_INTERRUPT_HANDLER(GPIO2_Combined_16_31_IRQHandler, GPIO2, 2, 16);
+#endif
+#if defined(GPIO3)
+GPIO_INTERRUPT_HANDLER(GPIO3_Combined_0_15_IRQHandler, GPIO3, 3, 0);
+GPIO_INTERRUPT_HANDLER(GPIO3_Combined_16_31_IRQHandler, GPIO3, 3, 16);
+#endif
+#if defined(GPIO4)
+GPIO_INTERRUPT_HANDLER(GPIO4_Combined_0_15_IRQHandler, GPIO4, 4, 0);
+GPIO_INTERRUPT_HANDLER(GPIO4_Combined_16_31_IRQHandler, GPIO4, 4, 16);
+#endif
+#if defined(GPIO5)
+GPIO_INTERRUPT_HANDLER(GPIO5_Combined_0_15_IRQHandler, GPIO5, 5, 0);
+GPIO_INTERRUPT_HANDLER(GPIO5_Combined_16_31_IRQHandler, GPIO5, 5, 16);
+#endif
+#if defined(GPIO6)
+GPIO_INTERRUPT_HANDLER(GPIO6_Combined_0_15_IRQHandler, GPIO6, 6, 0);
+GPIO_INTERRUPT_HANDLER(GPIO6_Combined_16_31_IRQHandler, GPIO6, 6, 16);
+#endif
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index 1bfbe41a18..cbcce13e2b 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -45,4 +45,8 @@ extern const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[];
 // the port-default reset behavior.
 extern bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin);
 
+typedef void (gpio_change_interrupt_t)(void *data);
+void disable_pin_change_interrupt(const mcu_pin_obj_t *pin);
+void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data);
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
new file mode 100644
index 0000000000..dab74c1ce9
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Nick Moore for Adafruit Industries
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "common-hal/digitalio/DigitalInOut.h"
+#include "common-hal/rotaryio/IncrementalEncoder.h"
+#include "shared-module/rotaryio/IncrementalEncoder.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/rotaryio/IncrementalEncoder.h"
+
+#include "py/runtime.h"
+
+#include "fsl_gpio.h"
+static void encoder_change(void *self_in) {
+    rotaryio_incrementalencoder_obj_t *self = self_in;
+
+    bool value_a = GPIO_PinRead(self->pin_a->gpio, self->pin_a->number);
+    bool value_b = GPIO_PinRead(self->pin_b->gpio, self->pin_b->number);
+    uint8_t new_state = (value_a << 1) | value_b;
+    shared_module_softencoder_state_update(self, new_state);
+}
+
+void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
+
+    self->pin_a = pin_a;
+    self->pin_b = pin_b;
+
+    // GPIO is always IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 until proven otherwise
+#define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U
+    IOMUXC_SetPinMux(pin_a->mux_reg, IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5, 0, 0, 0, 0);
+    IOMUXC_SetPinMux(pin_b->mux_reg, IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5, 0, 0, 0, 0);
+
+    const gpio_pin_config_t config = { kGPIO_DigitalInput, 0, kGPIO_IntRisingOrFallingEdge };
+    GPIO_PinInit(pin_a->gpio, pin_a->number, &config);
+    GPIO_PinInit(pin_b->gpio, pin_b->number, &config);
+
+    enable_pin_change_interrupt(pin_a, encoder_change, self);
+    enable_pin_change_interrupt(pin_b, encoder_change, self);
+
+    pin_config(pin_a, false, PULL_UP);
+    pin_config(pin_b, false, PULL_UP);
+
+    claim_pin(pin_a);
+    claim_pin(pin_b);
+}
+
+bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t *self) {
+    return !self->pin_a;
+}
+
+void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_obj_t *self) {
+    if (common_hal_rotaryio_incrementalencoder_deinited(self)) {
+        return;
+    }
+    disable_pin_change_interrupt(self->pin_a);
+    disable_pin_change_interrupt(self->pin_b);
+
+    common_hal_reset_pin(self->pin_a);
+    common_hal_reset_pin(self->pin_b);
+
+    self->pin_a = NULL;
+    self->pin_b = NULL;
+}
diff --git a/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.h b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.h
new file mode 100644
index 0000000000..920b32cba9
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin_a, *pin_b;
+    uint8_t state;        // 
+    int8_t sub_count; // count intermediate transitions between detents
+    int8_t divisor; // Number of quadrature edges required per count
+    mp_int_t position;
+} rotaryio_incrementalencoder_obj_t;
+
+
+void incrementalencoder_interrupt_handler(uint8_t channel);
diff --git a/ports/mimxrt10xx/common-hal/rotaryio/__init__.c b/ports/mimxrt10xx/common-hal/rotaryio/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/common-hal/rotaryio/__init__.h b/ports/mimxrt10xx/common-hal/rotaryio/__init__.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 236d5b9966..15a0a0e466 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -20,7 +20,8 @@ CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 CIRCUITPY_PULSEIO = 0
-CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_ROTARYIO = 1
+CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 CIRCUITPY_USB_MIDI = 1
 LONGINT_IMPL = MPZ
 

From d247e5c6c97a5e88af86dfb73daeb54e1642bba3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 7 Mar 2023 10:37:08 -0600
Subject: [PATCH 2109/2403] Add the ability for a port to gc things, collect
 pin change objects that way

---
 main.c                                            | 6 ++++++
 ports/mimxrt10xx/common-hal/microcontroller/Pin.c | 7 +++++++
 ports/mimxrt10xx/common-hal/microcontroller/Pin.h | 1 +
 ports/mimxrt10xx/supervisor/port.c                | 4 ++++
 supervisor/port.h                                 | 4 ++++
 5 files changed, 22 insertions(+)

diff --git a/main.c b/main.c
index 7b805b57b0..6ff6202d6d 100644
--- a/main.c
+++ b/main.c
@@ -1111,6 +1111,8 @@ void gc_collect(void) {
     // have lost their references in the VM even though they are mounted.
     gc_collect_root((void **)&MP_STATE_VM(vfs_mount_table), sizeof(mp_vfs_mount_t) / sizeof(mp_uint_t));
 
+    port_gc_collect();
+
     background_callback_gc_collect();
 
     #if CIRCUITPY_ALARM
@@ -1143,6 +1145,10 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
+// Ports may provide an implementation of this function if it is needed
+MP_WEAK void port_gc_collect() {
+}
+
 void NORETURN nlr_jump_fail(void *val) {
     reset_into_safe_mode(SAFE_MODE_NLR_JUMP_FAIL);
     while (true) {
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 9d55382306..fc455d7a27 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -28,6 +28,8 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
+#include "py/gc.h"
+
 STATIC bool claimed_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
 STATIC bool never_reset_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
 
@@ -147,6 +149,11 @@ typedef struct {
 
 volatile static pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
 
+// The 'data' pointers may be to gc objects, they must be kept alive.
+void pin_gc_collect() {
+    gc_collect_root((void **)&pcid, sizeof(pcid) / sizeof(void *));
+}
+
 void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data) {
     int instance = GPIO_GetInstance(pin->gpio);
     volatile pin_change_interrupt_data *pci = &pcid[instance][pin->number];
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index cbcce13e2b..f75f4fbbee 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -48,5 +48,6 @@ extern bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin);
 typedef void (gpio_change_interrupt_t)(void *data);
 void disable_pin_change_interrupt(const mcu_pin_obj_t *pin);
 void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data);
+void pin_gc_collect(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 55bf72352d..1e46159829 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -555,6 +555,10 @@ void port_idle_until_interrupt(void) {
     common_hal_mcu_enable_interrupts();
 }
 
+void port_gc_collect(void) {
+    pin_gc_collect();
+}
+
 // Catch faults where the memory access violates MPU settings.
 void MemManage_Handler(void);
 __attribute__((used)) void PLACE_IN_ITCM(MemManage_Handler)(void) {
diff --git a/supervisor/port.h b/supervisor/port.h
index 70bdcb0170..b50179e4de 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -128,4 +128,8 @@ void port_post_boot_py(bool heap_valid);
 // A default weak implementation is provided that does nothing.
 void port_boot_info(void);
 
+// Some ports want to mark additional pointers as gc roots.
+// A default weak implementation is provided that does nothing.
+void port_gc_collect(void);
+
 #endif  // MICROPY_INCLUDED_SUPERVISOR_PORT_H

From de74b634725a464e82795ed9e48f2562b9eb3fd7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 09:28:14 -0500
Subject: [PATCH 2110/2403] move pin change interrupt stuff to peripherals

---
 ports/mimxrt10xx/Makefile                     |  1 +
 .../common-hal/microcontroller/Pin.c          | 97 -------------------
 .../common-hal/microcontroller/Pin.h          |  3 -
 .../common-hal/rotaryio/IncrementalEncoder.c  |  2 +-
 .../mimxrt10xx/peripherals/mimxrt10xx/pins.c  | 94 ++++++++++++++++++
 .../mimxrt10xx/peripherals/mimxrt10xx/pins.h  | 10 ++
 6 files changed, 106 insertions(+), 101 deletions(-)
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index d8d12b74da..542014e91a 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -136,6 +136,7 @@ SRC_C += \
 	peripherals/mimxrt10xx/$(CHIP_FAMILY)/clocks.c \
 	peripherals/mimxrt10xx/$(CHIP_FAMILY)/periph.c \
 	peripherals/mimxrt10xx/$(CHIP_FAMILY)/pins.c \
+	peripherals/mimxrt10xx/pins.c \
 	reset.c \
 	supervisor/flexspi_nor_flash_ops.c
 
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index fc455d7a27..a5c491ee7d 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -120,104 +120,7 @@ void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
     common_hal_reset_pin((mcu_pin_obj_t *)(mcu_pin_globals.map.table[pin_no].value));
 }
 
-/* Array of GPIO peripheral base address. */
-static GPIO_Type *const s_gpioBases[] = GPIO_BASE_PTRS;
-static uint32_t GPIO_GetInstance(GPIO_Type *base) {
-    uint32_t instance;
-
-    /* Find the instance index from base address mappings. */
-    for (instance = 0U; instance < ARRAY_SIZE(s_gpioBases); instance++)
-    {
-        if (s_gpioBases[instance] == base) {
-            break;
-        }
-    }
-
-    assert(instance < ARRAY_SIZE(s_gpioBases));
-
-    return instance;
-}
-
-/* to find IRQ based on GPIO */
-static const IRQn_Type low_irqs[] = GPIO_COMBINED_LOW_IRQS;
-static const IRQn_Type high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
-
-typedef struct {
-    gpio_change_interrupt_t *func;
-    void *data;
-} pin_change_interrupt_data;
-
-volatile static pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
-
 // The 'data' pointers may be to gc objects, they must be kept alive.
 void pin_gc_collect() {
     gc_collect_root((void **)&pcid, sizeof(pcid) / sizeof(void *));
 }
-
-void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data) {
-    int instance = GPIO_GetInstance(pin->gpio);
-    volatile pin_change_interrupt_data *pci = &pcid[instance][pin->number];
-    common_hal_mcu_disable_interrupts();
-    pci->data = data;
-    pci->func = func;
-    IRQn_Type irq = pin->number < 16 ? low_irqs[instance] : high_irqs[instance];
-    if (irq != NotAvail_IRQn) {
-        EnableIRQ(irq);
-    }
-    pin->gpio->IMR |= (1 << pin->number);
-    common_hal_mcu_enable_interrupts();
-}
-
-void disable_pin_change_interrupt(const mcu_pin_obj_t *pin) {
-    volatile pin_change_interrupt_data *pci = &pcid[GPIO_GetInstance(pin->gpio)][pin->number];
-    common_hal_mcu_disable_interrupts();
-    pin->gpio->IMR &= ~(1 << pin->number);
-    pci->data = NULL;
-    pci->func = NULL;
-    pin->gpio->ISR = (1 << pin->number); // acknowledge any pending interrupt
-    common_hal_mcu_enable_interrupts();
-}
-
-static void pin_change_interrupt_common(uint32_t isr, volatile pin_change_interrupt_data *pcr) {
-    for (uint32_t i = 0; i < 32; i++) {
-        if (isr & (1 << i)) {
-            pin_change_interrupt_data cb = pcr[i];
-            if (cb.func) {
-                cb.func(cb.data);
-            }
-        }
-    }
-}
-
-#define GPIO_INTERRUPT_HANDLER(name, ptr, instance, offset) \
-    void name(void); \
-    __attribute__((used)) void name(void) { \
-        uint32_t isr = ptr->ISR; \
-        ptr->ISR = isr; \
-        pin_change_interrupt_common(isr, pcid[instance]); \
-    }
-
-#if defined(GPIO1)
-GPIO_INTERRUPT_HANDLER(GPIO1_Combined_0_15_IRQHandler, GPIO1, 1, 0);
-GPIO_INTERRUPT_HANDLER(GPIO1_Combined_16_31_IRQHandler, GPIO1, 1, 16);
-#endif
-#if defined(GPIO2)
-GPIO_INTERRUPT_HANDLER(GPIO2_Combined_0_15_IRQHandler, GPIO2, 2, 0);
-GPIO_INTERRUPT_HANDLER(GPIO2_Combined_16_31_IRQHandler, GPIO2, 2, 16);
-#endif
-#if defined(GPIO3)
-GPIO_INTERRUPT_HANDLER(GPIO3_Combined_0_15_IRQHandler, GPIO3, 3, 0);
-GPIO_INTERRUPT_HANDLER(GPIO3_Combined_16_31_IRQHandler, GPIO3, 3, 16);
-#endif
-#if defined(GPIO4)
-GPIO_INTERRUPT_HANDLER(GPIO4_Combined_0_15_IRQHandler, GPIO4, 4, 0);
-GPIO_INTERRUPT_HANDLER(GPIO4_Combined_16_31_IRQHandler, GPIO4, 4, 16);
-#endif
-#if defined(GPIO5)
-GPIO_INTERRUPT_HANDLER(GPIO5_Combined_0_15_IRQHandler, GPIO5, 5, 0);
-GPIO_INTERRUPT_HANDLER(GPIO5_Combined_16_31_IRQHandler, GPIO5, 5, 16);
-#endif
-#if defined(GPIO6)
-GPIO_INTERRUPT_HANDLER(GPIO6_Combined_0_15_IRQHandler, GPIO6, 6, 0);
-GPIO_INTERRUPT_HANDLER(GPIO6_Combined_16_31_IRQHandler, GPIO6, 6, 16);
-#endif
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
index f75f4fbbee..57df61c691 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.h
@@ -45,9 +45,6 @@ extern const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[];
 // the port-default reset behavior.
 extern bool mimxrt10xx_board_reset_pin_number(const mcu_pin_obj_t *pin);
 
-typedef void (gpio_change_interrupt_t)(void *data);
-void disable_pin_change_interrupt(const mcu_pin_obj_t *pin);
-void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data);
 void pin_gc_collect(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
index dab74c1ce9..043b791b4d 100644
--- a/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
+++ b/ports/mimxrt10xx/common-hal/rotaryio/IncrementalEncoder.c
@@ -33,7 +33,7 @@
 
 #include "py/runtime.h"
 
-#include "fsl_gpio.h"
+#include "sdk/drivers/igpio/fsl_gpio.h"
 static void encoder_change(void *self_in) {
     rotaryio_incrementalencoder_obj_t *self = self_in;
 
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c
new file mode 100644
index 0000000000..1f2d5321e9
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c
@@ -0,0 +1,94 @@
+#include "peripherals/mimxrt10xx/pins.h"
+
+/* Array of GPIO peripheral base address. */
+static GPIO_Type *const s_gpioBases[] = GPIO_BASE_PTRS;
+static uint32_t GPIO_GetInstance(GPIO_Type *base) {
+    uint32_t instance;
+
+    /* Find the instance index from base address mappings. */
+    for (instance = 0U; instance < ARRAY_SIZE(s_gpioBases); instance++)
+    {
+        if (s_gpioBases[instance] == base) {
+            break;
+        }
+    }
+
+    assert(instance < ARRAY_SIZE(s_gpioBases));
+
+    return instance;
+}
+
+
+/* to find IRQ based on GPIO */
+static const IRQn_Type low_irqs[] = GPIO_COMBINED_LOW_IRQS;
+static const IRQn_Type high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
+
+volatile pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
+
+void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data) {
+    int instance = GPIO_GetInstance(pin->gpio);
+    volatile pin_change_interrupt_data *pci = &pcid[instance][pin->number];
+    common_hal_mcu_disable_interrupts();
+    pci->data = data;
+    pci->func = func;
+    IRQn_Type irq = pin->number < 16 ? low_irqs[instance] : high_irqs[instance];
+    if (irq != NotAvail_IRQn) {
+        EnableIRQ(irq);
+    }
+    pin->gpio->IMR |= (1 << pin->number);
+    common_hal_mcu_enable_interrupts();
+}
+
+void disable_pin_change_interrupt(const mcu_pin_obj_t *pin) {
+    volatile pin_change_interrupt_data *pci = &pcid[GPIO_GetInstance(pin->gpio)][pin->number];
+    common_hal_mcu_disable_interrupts();
+    pin->gpio->IMR &= ~(1 << pin->number);
+    pci->data = NULL;
+    pci->func = NULL;
+    pin->gpio->ISR = (1 << pin->number); // acknowledge any pending interrupt
+    common_hal_mcu_enable_interrupts();
+}
+
+static void pin_change_interrupt_common(uint32_t isr, volatile pin_change_interrupt_data *pcr) {
+    for (uint32_t i = 0; i < 32; i++) {
+        if (isr & (1 << i)) {
+            pin_change_interrupt_data cb = pcr[i];
+            if (cb.func) {
+                cb.func(cb.data);
+            }
+        }
+    }
+}
+
+#define GPIO_INTERRUPT_HANDLER(name, ptr, instance, offset) \
+    void name(void); \
+    __attribute__((used)) void name(void) { \
+        uint32_t isr = ptr->ISR; \
+        ptr->ISR = isr; \
+        pin_change_interrupt_common(isr, pcid[instance]); \
+    }
+
+#if defined(GPIO1)
+GPIO_INTERRUPT_HANDLER(GPIO1_Combined_0_15_IRQHandler, GPIO1, 1, 0);
+GPIO_INTERRUPT_HANDLER(GPIO1_Combined_16_31_IRQHandler, GPIO1, 1, 16);
+#endif
+#if defined(GPIO2)
+GPIO_INTERRUPT_HANDLER(GPIO2_Combined_0_15_IRQHandler, GPIO2, 2, 0);
+GPIO_INTERRUPT_HANDLER(GPIO2_Combined_16_31_IRQHandler, GPIO2, 2, 16);
+#endif
+#if defined(GPIO3)
+GPIO_INTERRUPT_HANDLER(GPIO3_Combined_0_15_IRQHandler, GPIO3, 3, 0);
+GPIO_INTERRUPT_HANDLER(GPIO3_Combined_16_31_IRQHandler, GPIO3, 3, 16);
+#endif
+#if defined(GPIO4)
+GPIO_INTERRUPT_HANDLER(GPIO4_Combined_0_15_IRQHandler, GPIO4, 4, 0);
+GPIO_INTERRUPT_HANDLER(GPIO4_Combined_16_31_IRQHandler, GPIO4, 4, 16);
+#endif
+#if defined(GPIO5)
+GPIO_INTERRUPT_HANDLER(GPIO5_Combined_0_15_IRQHandler, GPIO5, 5, 0);
+GPIO_INTERRUPT_HANDLER(GPIO5_Combined_16_31_IRQHandler, GPIO5, 5, 16);
+#endif
+#if defined(GPIO6)
+GPIO_INTERRUPT_HANDLER(GPIO6_Combined_0_15_IRQHandler, GPIO6, 6, 0);
+GPIO_INTERRUPT_HANDLER(GPIO6_Combined_16_31_IRQHandler, GPIO6, 6, 16);
+#endif
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
index 82cb0dc69e..76a8d03e08 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
@@ -72,6 +72,16 @@ typedef struct {
         .pad_reset = p_pad_reset, \
     }
 
+typedef void (gpio_change_interrupt_t)(void *data);
+typedef struct {
+    gpio_change_interrupt_t *func;
+    void *data;
+} pin_change_interrupt_data;
+extern volatile pin_change_interrupt_data pcid[MP_ARRAY_SIZE((GPIO_Type *const[])GPIO_BASE_PTRS)][32];
+
+void disable_pin_change_interrupt(const mcu_pin_obj_t *pin);
+void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data);
+
 #ifdef MIMXRT1011_SERIES
 #include "MIMXRT1011/pins.h"
 #elif defined(MIMXRT1021_SERIES)

From c45db1c1eb0a71b8378c4007fb23b4dfe24c2059 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 09:56:14 -0500
Subject: [PATCH 2111/2403] incrementalencoder: give it a finaliser

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

diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index fae55db317..ec2a281157 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -76,7 +76,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type,
     const mcu_pin_obj_t *pin_b = validate_obj_is_free_pin(args[ARG_pin_b].u_obj, MP_QSTR_pin_b);
 
     // Make long-lived because some implementations use a pointer to the object as interrupt-handler data.
-    rotaryio_incrementalencoder_obj_t *self = m_new_ll_obj(rotaryio_incrementalencoder_obj_t);
+    rotaryio_incrementalencoder_obj_t *self = m_new_ll_obj_with_finaliser(rotaryio_incrementalencoder_obj_t);
     self->base.type = &rotaryio_incrementalencoder_type;
 
     common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b);
@@ -171,6 +171,7 @@ MP_PROPERTY_GETSET(rotaryio_incrementalencoder_position_obj,
 STATIC const mp_rom_map_elem_t rotaryio_incrementalencoder_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rotaryio_incrementalencoder_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&rotaryio_incrementalencoder_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&rotaryio_incrementalencoder___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_position), MP_ROM_PTR(&rotaryio_incrementalencoder_position_obj) },

From 50ba218afb199685e96a43ef8333cba76d0a691f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 09:57:32 -0500
Subject: [PATCH 2112/2403] PulseIn, Counter: give finali(s/z)ers to these
 types too

for similar reasons, an interrupt handler might point at these
objects, and we can worry less about it if the object deinits when it
is GC'd.
---
 shared-bindings/countio/Counter.c | 3 ++-
 shared-bindings/pulseio/PulseIn.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c
index 4f0e0a692f..fc60994f5c 100644
--- a/shared-bindings/countio/Counter.c
+++ b/shared-bindings/countio/Counter.c
@@ -57,7 +57,7 @@ STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_arg
     const countio_edge_t edge = validate_edge(args[ARG_edge].u_obj, MP_QSTR_edge);
     const digitalio_pull_t pull = validate_pull(args[ARG_pull].u_obj, MP_QSTR_pull);
     // Make long-lived because some implementations use a pointer to the object as interrupt-handler data.
-    countio_counter_obj_t *self = m_new_ll_obj(countio_counter_obj_t);
+    countio_counter_obj_t *self = m_new_ll_obj_with_finaliser(countio_counter_obj_t);
     self->base.type = &countio_counter_type;
 
     common_hal_countio_counter_construct(self, pin, edge, pull);
@@ -134,6 +134,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(countio_counter_reset_obj, countio_counter_reset);
 STATIC const mp_rom_map_elem_t countio_counter_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&countio_counter_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&countio_counter_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&countio_counter___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&countio_counter_count_obj) },
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index 81edc48bfd..3510f11289 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -89,7 +89,7 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg
     const mcu_pin_obj_t *pin = validate_obj_is_free_pin(args[ARG_pin].u_obj, MP_QSTR_pin);
 
     // Make object long-lived to avoid moving between imports
-    pulseio_pulsein_obj_t *self = m_new_ll_obj(pulseio_pulsein_obj_t);
+    pulseio_pulsein_obj_t *self = m_new_ll_obj_with_finaliser(pulseio_pulsein_obj_t);
     self->base.type = &pulseio_pulsein_type;
 
     common_hal_pulseio_pulsein_construct(self, pin, args[ARG_maxlen].u_int,
@@ -277,6 +277,7 @@ STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t va
 STATIC const mp_rom_map_elem_t pulseio_pulsein_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pulseio_pulsein_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&pulseio_pulsein_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&pulseio_pulsein___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_pause), MP_ROM_PTR(&pulseio_pulsein_pause_obj) },

From b235b50647845f4eb624c70785b385943a4a2821 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 09:58:40 -0500
Subject: [PATCH 2113/2403] mimxrt: no longer need to collect the pin chainge
 interrupt ptrs

.. the objects on the gc heap are guaranteed to be alive, as their
finali(s/z)er will disable the interrupt.
---
 ports/mimxrt10xx/common-hal/microcontroller/Pin.c | 5 -----
 ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c    | 7 ++++++-
 ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h    | 6 ------
 ports/mimxrt10xx/supervisor/port.c                | 4 ----
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index a5c491ee7d..f888152af1 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -119,8 +119,3 @@ void claim_pin(const mcu_pin_obj_t *pin) {
 void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
     common_hal_reset_pin((mcu_pin_obj_t *)(mcu_pin_globals.map.table[pin_no].value));
 }
-
-// The 'data' pointers may be to gc objects, they must be kept alive.
-void pin_gc_collect() {
-    gc_collect_root((void **)&pcid, sizeof(pcid) / sizeof(void *));
-}
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c
index 1f2d5321e9..d052711033 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.c
@@ -1,5 +1,10 @@
 #include "peripherals/mimxrt10xx/pins.h"
 
+typedef struct {
+    gpio_change_interrupt_t *func;
+    void *data;
+} pin_change_interrupt_data;
+
 /* Array of GPIO peripheral base address. */
 static GPIO_Type *const s_gpioBases[] = GPIO_BASE_PTRS;
 static uint32_t GPIO_GetInstance(GPIO_Type *base) {
@@ -23,7 +28,7 @@ static uint32_t GPIO_GetInstance(GPIO_Type *base) {
 static const IRQn_Type low_irqs[] = GPIO_COMBINED_LOW_IRQS;
 static const IRQn_Type high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
 
-volatile pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
+static volatile pin_change_interrupt_data pcid[MP_ARRAY_SIZE(s_gpioBases)][32];
 
 void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data) {
     int instance = GPIO_GetInstance(pin->gpio);
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
index 76a8d03e08..0457a09a1a 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
@@ -73,12 +73,6 @@ typedef struct {
     }
 
 typedef void (gpio_change_interrupt_t)(void *data);
-typedef struct {
-    gpio_change_interrupt_t *func;
-    void *data;
-} pin_change_interrupt_data;
-extern volatile pin_change_interrupt_data pcid[MP_ARRAY_SIZE((GPIO_Type *const[])GPIO_BASE_PTRS)][32];
-
 void disable_pin_change_interrupt(const mcu_pin_obj_t *pin);
 void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt_t func, void *data);
 
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index 1e46159829..55bf72352d 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -555,10 +555,6 @@ void port_idle_until_interrupt(void) {
     common_hal_mcu_enable_interrupts();
 }
 
-void port_gc_collect(void) {
-    pin_gc_collect();
-}
-
 // Catch faults where the memory access violates MPU settings.
 void MemManage_Handler(void);
 __attribute__((used)) void PLACE_IN_ITCM(MemManage_Handler)(void) {

From 1525672146d071a95766b1208ebe62c8e69858ce Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Thu, 23 Mar 2023 11:18:03 +0000
Subject: [PATCH 2114/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1004 of 1004 strings)

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

diff --git a/locale/es.po b/locale/es.po
index cf81206c3d..0201f7f78c 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: 2023-03-09 10:38+0000\n"
+"PO-Revision-Date: 2023-03-23 17:26+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -1292,7 +1292,7 @@ msgstr "BSSID inválido"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "CIRCUITPY_PYSTACK_SIZE inválido\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"

From da0df8a692b4a6d4d8f4b74f30a9c98e13cfedfa Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Wed, 22 Mar 2023 22:18:49 +0000
Subject: [PATCH 2115/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1004 of 1004 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 bef3ea8849..c998d04270 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: 2023-03-08 07:10+0000\n"
+"PO-Revision-Date: 2023-03-23 17:26+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -1288,7 +1288,7 @@ msgstr "BSSID Inválido"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "CIRCUITPY_PYSTACK_SIZE inválido\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"

From 24aea014752bd6de6d873025eb1b3354b3281984 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 23 Mar 2023 13:08:50 +0000
Subject: [PATCH 2116/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1004 of 1004 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 3c2c9f6520..66318a01b1 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: 2023-03-08 07:10+0000\n"
+"PO-Revision-Date: 2023-03-23 17:26+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1273,7 +1273,7 @@ msgstr "Ogiltig BSSID"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "Ogiltig CIRCUITPY_PYSTACK_SIZE\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"

From ff242e6198b486adf03c27f6f666c2c5708945ea Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 23 Mar 2023 18:26:38 +0100
Subject: [PATCH 2117/2403] 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             | 45 +++++++++++++++++-----------------
 locale/cs.po             | 40 ++++++++++++++-----------------
 locale/de_DE.po          | 52 ++++++++++++++++++++++------------------
 locale/el.po             | 37 ++++++++++++----------------
 locale/en_GB.po          | 48 +++++++++++++++++++------------------
 locale/es.po             | 52 ++++++++++++++++++++++------------------
 locale/fil.po            | 40 ++++++++++++++-----------------
 locale/fr.po             | 52 ++++++++++++++++++++++------------------
 locale/hi.po             | 37 ++++++++++++----------------
 locale/it_IT.po          | 40 ++++++++++++++-----------------
 locale/ja.po             | 48 +++++++++++++++++++------------------
 locale/ko.po             | 37 ++++++++++++----------------
 locale/nl.po             | 48 +++++++++++++++++++------------------
 locale/pl.po             | 48 +++++++++++++++++++------------------
 locale/pt_BR.po          | 52 ++++++++++++++++++++++------------------
 locale/ru.po             | 40 ++++++++++++++-----------------
 locale/sv.po             | 52 ++++++++++++++++++++++------------------
 locale/tr.po             | 37 ++++++++++++----------------
 locale/zh_Latn_pinyin.po | 52 ++++++++++++++++++++++------------------
 19 files changed, 428 insertions(+), 429 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index a136f6e498..0affac3ed4 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -183,10 +183,6 @@ msgstr "%q harus <= %d"
 msgid "%q must be >= %d"
 msgstr "%q harus >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -195,6 +191,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1233,7 +1233,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1531,10 +1532,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Tidak ada kunci yang ditentukan"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Tidak ada dukungan bilangan bulat yang panjang"
@@ -1961,8 +1958,8 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Pindai sudah dalam proses. Hentikan dengan stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2274,6 +2271,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2309,11 +2311,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2768,7 +2765,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3068,8 +3065,8 @@ msgid "extra positional arguments given"
 msgstr "argumen posisi ekstra telah diberikan"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4143,10 +4140,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4403,6 +4396,12 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "No key was specified"
+#~ msgstr "Tidak ada kunci yang ditentukan"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Pindai sudah dalam proses. Hentikan dengan stop_scan."
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Berikan setidaknya satu pin UART"
 
diff --git a/locale/cs.po b/locale/cs.po
index 1d666730ec..7af7d489b1 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -184,10 +184,6 @@ msgstr "%q musí být <= %d"
 msgid "%q must be >= %d"
 msgstr "%q musí být >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -196,6 +192,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1233,7 +1233,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1531,10 +1532,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Nebyl zadán klíč"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1950,7 +1947,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2263,6 +2260,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2298,11 +2300,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2755,7 +2752,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3055,8 +3052,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4129,10 +4126,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4389,6 +4382,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "No key was specified"
+#~ msgstr "Nebyl zadán klíč"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "pin %q není platný"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f6bc0b789e..fb676d621e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -187,10 +187,6 @@ msgstr "%q muss <= %d sein"
 msgid "%q must be >= %d"
 msgstr "%q muss >= %d sein"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -200,6 +196,10 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1252,7 +1252,8 @@ msgstr "Der Interne WatchDog Timer ist abgelaufen."
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ungültiger %q"
@@ -1551,10 +1552,6 @@ msgstr "Nicht in Programm"
 msgid "No in or out in program"
 msgstr "Kein Ein oder Aus in Programm"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Es wurde kein Schlüssel angegeben"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Keine langen Integer (long) unterstützt"
@@ -1979,8 +1976,8 @@ msgstr "Maßstabs-Abmeßungen müssen durch 3 teilbar sein"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Scannen bereits in Bearbeitung. Stoppe mit stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2298,6 +2295,11 @@ msgstr "Unbekannter BLE-Fehler bei %s:%d: %d"
 msgid "Unknown BLE error: %d"
 msgstr "Unbekannter BLE-Fehler: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2333,11 +2335,6 @@ msgstr "Unbekannter Systemfirmware Fehler: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Unbekannter System-Firmware-Fehler: %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "Unbekannter Fehlercode %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2808,7 +2805,7 @@ msgstr "Kann Blockgröße von 512 nicht setzen"
 msgid "can't set attribute"
 msgstr "kann Attribut nicht setzen"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3116,8 +3113,8 @@ msgid "extra positional arguments given"
 msgstr "Es wurden zusätzliche Argumente ohne Schlüsselwort angegeben"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "Die Datei muss eine im Byte-Modus geöffnete Datei sein"
 
@@ -4203,10 +4200,6 @@ msgstr "Zeitstempel außerhalb des Bereichs für Plattform time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes kann nur für dichte Arrays aufgerufen werden"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "zu viele Argumente mit dem angegebenen Format"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "zu viele Dimensionen"
@@ -4465,6 +4458,19 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "No key was specified"
+#~ msgstr "Es wurde kein Schlüssel angegeben"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Scannen bereits in Bearbeitung. Stoppe mit stop_scan."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "Unbekannter Fehlercode %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "zu viele Argumente mit dem angegebenen Format"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
diff --git a/locale/el.po b/locale/el.po
index f2382feb94..ab4b2d9b90 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -188,10 +188,6 @@ msgstr "%q πρέπει να είναι <= %d"
 msgid "%q must be >= %d"
 msgstr "%q πρέπει να είναι >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -200,6 +196,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1242,7 +1242,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1540,10 +1541,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1958,7 +1955,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2271,6 +2268,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2306,11 +2308,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2763,7 +2760,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3063,8 +3060,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4137,10 +4134,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 45131d1dcb..e2d9cd9f13 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -187,10 +187,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr "%q must be >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -199,6 +195,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1234,7 +1234,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Invalid %q"
@@ -1532,10 +1533,6 @@ msgstr "No in in program"
 msgid "No in or out in program"
 msgstr "No in or out in program"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "No key was specified"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "No long integer support"
@@ -1956,8 +1953,8 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2269,6 +2266,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2304,11 +2306,6 @@ msgstr "Unknown system firmware error: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2763,7 +2760,7 @@ msgstr "can't set 512 block size"
 msgid "can't set attribute"
 msgstr "can't set attribute"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3066,8 +3063,8 @@ msgid "extra positional arguments given"
 msgstr "extra positional arguments given"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "file must be a file opened in byte mode"
 
@@ -4140,10 +4137,6 @@ msgstr "timestamp out of range for platform time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes can be invoked for dense arrays only"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "too many arguments provided with the given format"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "too many dimensions"
@@ -4400,6 +4393,15 @@ 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 "No key was specified"
+#~ msgstr "No key was specified"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Scan already in progess. Stop with stop_scan."
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "too many arguments provided with the given format"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Supply at least one UART pin"
 
diff --git a/locale/es.po b/locale/es.po
index 0201f7f78c..ebd1ea4a2b 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -195,10 +195,6 @@ msgstr "%q debe ser <= %d"
 msgid "%q must be >= %d"
 msgstr "%q debe ser >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr "%q debe ser un arreglo de tipo 'H'"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'"
@@ -207,6 +203,10 @@ msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr "%q debe ser un arreglo de tipo 'H'"
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1267,7 +1267,8 @@ msgstr "El temporizador interno watchdog terminó."
 msgid "Interrupt error."
 msgstr "Error de interrupción."
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q inválido"
@@ -1569,10 +1570,6 @@ msgstr "No hay \"in\" en el programa"
 msgid "No in or out in program"
 msgstr "No hay \"in\" o \"out\" en el programa"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "No se especificó ninguna llave"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "No hay soporte de entero largo"
@@ -2000,8 +1997,8 @@ msgstr "Las dimensiones de escala debe ser divisibles por 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Escaneo en progreso. Usa stop_scan para detener."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2320,6 +2317,11 @@ msgstr "Error BLE desconocido en %s:%d: %d"
 msgid "Unknown BLE error: %d"
 msgstr "Error BLE desconocido: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2355,11 +2357,6 @@ msgstr "Error desconocido en el firmware sistema: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Error del sistema de firmware desconocido: %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "Codigo de error desconocido: %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2823,7 +2820,7 @@ msgstr "no se puede definir un tamaño de bloque de 512"
 msgid "can't set attribute"
 msgstr "no se puede asignar el atributo"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr "no se puede configurar el attributo '%q'"
 
@@ -3131,8 +3128,8 @@ msgid "extra positional arguments given"
 msgstr "argumento posicional adicional dado"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "el archivo deberia ser una archivo abierto en modo byte"
 
@@ -4213,10 +4210,6 @@ msgstr "timestamp fuera de rango para plataform time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes solo pueden ser invocados por arrays densos"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "demasiados argumentos provistos con el formato dado"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "demasiadas dimensiones"
@@ -4473,6 +4466,19 @@ 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 "No key was specified"
+#~ msgstr "No se especificó ninguna llave"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Escaneo en progreso. Usa stop_scan para detener."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "Codigo de error desconocido: %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "demasiados argumentos provistos con el formato dado"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
diff --git a/locale/fil.po b/locale/fil.po
index 591620e6c4..86677af69b 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -181,10 +181,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -193,6 +189,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1233,7 +1233,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1531,10 +1532,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1951,7 +1948,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2265,6 +2262,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2300,11 +2302,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2761,7 +2758,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "hindi ma i-set ang attribute"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3069,8 +3066,8 @@ msgid "extra positional arguments given"
 msgstr "dagdag na positional argument na ibinigay"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "file ay dapat buksan sa byte mode"
 
@@ -4150,10 +4147,6 @@ msgstr "wala sa sakop ng timestamp ang platform time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "masyadong maraming mga argumento na ibinigay sa ibinigay na format"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4412,6 +4405,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "masyadong maraming mga argumento na ibinigay sa ibinigay na format"
+
 #~ msgid "Expected a %q"
 #~ msgstr "Umasa ng %q"
 
diff --git a/locale/fr.po b/locale/fr.po
index 4ebcc918bf..812f09b454 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -192,10 +192,6 @@ msgstr "%q doit être <= %d"
 msgid "%q must be >= %d"
 msgstr "%q doit être >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q doit être un bytearray ou matrice de type 'H' ou 'B'"
@@ -204,6 +200,10 @@ msgstr "%q doit être un bytearray ou matrice de type 'H' ou 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1273,7 +1273,8 @@ msgstr "Le minuteur du watchdog interne a expiré."
 msgid "Interrupt error."
 msgstr "Erreur d'interruption."
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q invalide"
@@ -1575,10 +1576,6 @@ msgstr "Programme n'a pas de \"in\""
 msgid "No in or out in program"
 msgstr "Programme n'a aucun \"in\" ni \"out\""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Aucune clé n'a été spécifiée"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Pas de support pour chiffre entier long"
@@ -2006,8 +2003,8 @@ msgstr "La dimension d'échelle doit être un multiple de 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Scan déjà en cours. Arrêtez avec stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2326,6 +2323,11 @@ msgstr "Erreur BLE inconnue à %s:%d : %d"
 msgid "Unknown BLE error: %d"
 msgstr "Erreur BLE inconnue : %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2361,11 +2363,6 @@ msgstr "Faute inconnue du logiciel système : %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Erreur du logiciel système inconnue : %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "Erreur inconnue %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2833,7 +2830,7 @@ msgstr "impossible de définir une taille de bloc de 512"
 msgid "can't set attribute"
 msgstr "attribut non modifiable"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr "attribut '%q' non modifiable"
 
@@ -3145,8 +3142,8 @@ msgid "extra positional arguments given"
 msgstr "argument(s) positionnel(s) supplémentaire(s) donné(s)"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "le fichier doit être un fichier ouvert en mode 'byte'"
 
@@ -4232,10 +4229,6 @@ msgstr "timestamp hors bornes pour 'time_t' de la plateforme"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes ne peut être appelée que pour des matrices dense"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "trop d'arguments fournis avec ce format"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "Trop de dimensions"
@@ -4492,6 +4485,19 @@ 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 "No key was specified"
+#~ msgstr "Aucune clé n'a été spécifiée"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Scan déjà en cours. Arrêtez avec stop_scan."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "Erreur inconnue %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "trop d'arguments fournis avec ce format"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
diff --git a/locale/hi.po b/locale/hi.po
index 2b9825e4b8..75efddc294 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -180,10 +180,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -192,6 +188,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1221,7 +1221,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1519,10 +1520,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1935,7 +1932,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2248,6 +2245,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2283,11 +2285,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2740,7 +2737,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3040,8 +3037,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4114,10 +4111,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 84bc790df4..e8d32b163e 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -184,10 +184,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -196,6 +192,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1235,7 +1235,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1534,10 +1535,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1958,7 +1955,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2272,6 +2269,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2307,11 +2309,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2769,7 +2766,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "impossibile impostare attributo"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3074,8 +3071,8 @@ msgid "extra positional arguments given"
 msgstr "argomenti posizonali extra dati"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4160,10 +4157,6 @@ msgstr "timestamp è fuori intervallo per il time_t della piattaforma"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "troppi argomenti forniti con il formato specificato"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4422,6 +4415,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "troppi argomenti forniti con il formato specificato"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q pin non valido"
 
diff --git a/locale/ja.po b/locale/ja.po
index 081dd57e9f..f90abd66da 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -187,10 +187,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -199,6 +195,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1234,7 +1234,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "不正な %q"
@@ -1532,10 +1533,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "キーが指定されていません"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "long integerに対応していません"
@@ -1951,8 +1948,8 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "既にスキャン進行中。stop_scanで停止してください"
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2265,6 +2262,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2300,11 +2302,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2757,7 +2754,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3061,8 +3058,8 @@ msgid "extra positional arguments given"
 msgstr "余分な位置引数が与えられました"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "fileはバイトモードで開かれたファイルでなければなりません"
 
@@ -4138,10 +4135,6 @@ msgstr "timestampがプラットフォームのtime_tの範囲外"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "指定された書式に対して引数が多すぎます"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4398,6 +4391,15 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "No key was specified"
+#~ msgstr "キーが指定されていません"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "既にスキャン進行中。stop_scanで停止してください"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "指定された書式に対して引数が多すぎます"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "少なくとも1つのUARTピンが必要"
 
diff --git a/locale/ko.po b/locale/ko.po
index 7668d8c8a3..fbb45ed195 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -181,10 +181,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -193,6 +189,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1224,7 +1224,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
@@ -1522,10 +1523,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1938,7 +1935,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2252,6 +2249,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2287,11 +2289,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2744,7 +2741,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3044,8 +3041,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4118,10 +4115,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 61c96a877d..f9faf2a6a5 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -180,10 +180,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -192,6 +188,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1229,7 +1229,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ongeldige %q"
@@ -1527,10 +1528,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Een sleutel was niet gespecificeerd"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Geen lange integer ondersteuning"
@@ -1956,8 +1953,8 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Scan wordt al uitvoerd. Stop met stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2269,6 +2266,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2304,11 +2306,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2768,7 +2765,7 @@ msgstr "kan geen 512 blokgrootte instellen"
 msgid "can't set attribute"
 msgstr "kan attribute niet instellen"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3070,8 +3067,8 @@ msgid "extra positional arguments given"
 msgstr "extra positionele argumenten gegeven"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "bestand moet een bestand zijn geopend in byte modus"
 
@@ -4148,10 +4145,6 @@ msgstr "timestamp buiten bereik voor platform time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes kunnen alleen ingeroepen worden voor gesloten arrays"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "te veel argumenten opgegeven bij dit formaat"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4408,6 +4401,15 @@ 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 "No key was specified"
+#~ msgstr "Een sleutel was niet gespecificeerd"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Scan wordt al uitvoerd. Stop met stop_scan."
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "te veel argumenten opgegeven bij dit formaat"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Geef op zijn minst 1 UART pin op"
 
diff --git a/locale/pl.po b/locale/pl.po
index 642e5f99de..4fc4337a55 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -182,10 +182,6 @@ msgstr ""
 msgid "%q must be >= %d"
 msgstr ""
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr ""
@@ -194,6 +190,10 @@ msgstr ""
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1229,7 +1229,8 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Nieprawidłowe %q"
@@ -1527,10 +1528,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Nie określono klucza"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1943,8 +1940,8 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Skanuj już w toku. Zatrzymaj za pomocą stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2256,6 +2253,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2291,11 +2293,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2748,7 +2745,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr "nie można ustawić atrybutu"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3049,8 +3046,8 @@ msgid "extra positional arguments given"
 msgstr "nadmiarowe argumenty pozycyjne"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "file musi być otwarte w trybie bajtowym"
 
@@ -4124,10 +4121,6 @@ msgstr "timestamp poza zakresem dla time_t na tej platformie"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "zbyt wiele argumentów podanych dla tego formatu"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4384,6 +4377,15 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "No key was specified"
+#~ msgstr "Nie określono klucza"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Skanuj już w toku. Zatrzymaj za pomocą stop_scan."
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "zbyt wiele argumentów podanych dla tego formatu"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Podaj co najmniej jeden pin UART"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c998d04270..88ccd57c4e 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -193,10 +193,6 @@ msgstr "%q deve ser <= %d"
 msgid "%q must be >= %d"
 msgstr "o %q deve ser >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr "%q deve ser uma matriz do tipo 'H'"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'"
@@ -205,6 +201,10 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr "%q deve ser uma matriz do tipo 'H'"
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1263,7 +1263,8 @@ msgstr "O temporizador do watchdog interno expirou."
 msgid "Interrupt error."
 msgstr "Erro de interrupção."
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "%q Inválido"
@@ -1561,10 +1562,6 @@ msgstr "Sem entrada no programa"
 msgid "No in or out in program"
 msgstr "Sem entrada ou saída no programa"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Nenhuma chave foi definida"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Não há compatibilidade com inteiro longo"
@@ -1994,8 +1991,8 @@ msgstr "As dimensões da escala devem ser poder ser divididas por 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "O escaneamento já está em andamento. Interrompa com stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2314,6 +2311,11 @@ msgstr "Houve um erro BLE desconhecido em %s:%d: %d"
 msgid "Unknown BLE error: %d"
 msgstr "Houve um erro BLE desconhecido: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2349,11 +2351,6 @@ msgstr "Erro desconhecido do firmware: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Ocorreu um erro desconhecido no firmware do sistema: %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "Código de erro desconhecido %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2819,7 +2816,7 @@ msgstr "não é possível definir o tamanho de 512 blocos"
 msgid "can't set attribute"
 msgstr "não é possível definir o atributo"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr "não é possível definir o atributo '%q'"
 
@@ -3128,8 +3125,8 @@ msgid "extra positional arguments given"
 msgstr "argumentos extra posicionais passados"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "o arquivo deve ser um arquivo aberto no modo byte"
 
@@ -4213,10 +4210,6 @@ msgstr "timestamp fora do intervalo para a plataforma time_t"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "os tobytes podem ser invocados apenas nas matrizes densas"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "Muitos argumentos fornecidos com o formato dado"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "dimensões demais"
@@ -4473,6 +4466,19 @@ 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 "No key was specified"
+#~ msgstr "Nenhuma chave foi definida"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "O escaneamento já está em andamento. Interrompa com stop_scan."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "Código de erro desconhecido %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "Muitos argumentos fornecidos com o formato dado"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
diff --git a/locale/ru.po b/locale/ru.po
index 2ad4b094a2..c2e6ccc265 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -187,10 +187,6 @@ msgstr "%q должно быть <= %d"
 msgid "%q must be >= %d"
 msgstr "%q должно быть >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q должно быть bytearray или array типа 'H' или 'B'"
@@ -199,6 +195,10 @@ msgstr "%q должно быть bytearray или array типа 'H' или 'B'"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b', или 'B'"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1266,7 +1266,8 @@ msgstr "Внутренний сторожевой таймер истек."
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Недопустимый %q"
@@ -1567,10 +1568,6 @@ msgstr "Нет in в программе"
 msgid "No in or out in program"
 msgstr "В программе отсутствует ввод или вывод"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Ключ не был указан"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Нет поддержки длинных целых чисел (long integer)"
@@ -1996,7 +1993,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2311,6 +2308,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2346,11 +2348,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2803,7 +2800,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3103,8 +3100,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4177,10 +4174,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
@@ -4437,6 +4430,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "No key was specified"
+#~ msgstr "Ключ не был указан"
+
 #~ msgid "Supply at least one UART pin"
 #~ msgstr "Предоставьте хотяб один пин UART"
 
diff --git a/locale/sv.po b/locale/sv.po
index 66318a01b1..da13d25599 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -192,10 +192,6 @@ msgstr "%q måste vara <= %d"
 msgid "%q must be >= %d"
 msgstr "%q måste vara >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr "%q måste vara en array av typen 'H'"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q måste vara en bytearray eller array av typen 'H' eller 'B'"
@@ -206,6 +202,10 @@ msgstr ""
 "%q måste vara en bytearray eller en array av typen \"h\", \"H\", \"b\" eller "
 "\"B\""
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr "%q måste vara en array av typen 'H'"
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1248,7 +1248,8 @@ msgstr "Intern watchdog-timer har löpt ut."
 msgid "Interrupt error."
 msgstr "Interrupt-fel."
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Ogiltig %q"
@@ -1547,10 +1548,6 @@ msgstr "Inget in i programmet"
 msgid "No in or out in program"
 msgstr "Inget in eller ut i programmet"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Ingen nyckel angavs"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Inget stöd för långt heltal"
@@ -1975,8 +1972,8 @@ msgstr "Skaldimension måste vara delbar med 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Skanning pågår redan. Avsluta med stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2290,6 +2287,11 @@ msgstr "Okänt BLE-fel vid %s:%d: %d"
 msgid "Unknown BLE error: %d"
 msgstr "Okänt BLE-fel: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2325,11 +2327,6 @@ msgstr "Okänt systemfirmwarefel: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "Okänt fel i systemets firmware: %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "Okänd felkod %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2790,7 +2787,7 @@ msgstr "kan inte sätta blockstorlek 512"
 msgid "can't set attribute"
 msgstr "kan inte att ange attribut"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr "kan inte sätta attribut '%q'"
 
@@ -3097,8 +3094,8 @@ msgid "extra positional arguments given"
 msgstr "extra positions-argument angivna"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "filen måste vara en fil som öppnats i byte-läge"
 
@@ -4175,10 +4172,6 @@ msgstr "timestamp utom räckvidd för plattformens \"time_t\""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobyte kan enbart anropas för täta matriser"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "för många argument för det givna formatet"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "för många dimensioner"
@@ -4435,6 +4428,19 @@ 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 "No key was specified"
+#~ msgstr "Ingen nyckel angavs"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Skanning pågår redan. Avsluta med stop_scan."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "Okänd felkod %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "för många argument för det givna formatet"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
diff --git a/locale/tr.po b/locale/tr.po
index bd9d746940..62c5fc9dc2 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -188,10 +188,6 @@ msgstr "%q <= %d olmalıdır"
 msgid "%q must be >= %d"
 msgstr "%q >= %d olmalıdır"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr ""
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır"
@@ -200,6 +196,10 @@ msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır"
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1239,7 +1239,8 @@ msgstr "Dahili bekçi zamanlayıcısının süresi doldu."
 msgid "Interrupt error."
 msgstr ""
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "Geçersiz %q"
@@ -1538,10 +1539,6 @@ msgstr ""
 msgid "No in or out in program"
 msgstr ""
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr ""
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr ""
@@ -1957,7 +1954,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
+msgid "Scan already in progress. Stop with stop_scan."
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2270,6 +2267,11 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2305,11 +2307,6 @@ msgstr ""
 msgid "Unknown system firmware error: %d"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr ""
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2762,7 +2759,7 @@ msgstr ""
 msgid "can't set attribute"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr ""
 
@@ -3062,8 +3059,8 @@ msgid "extra positional arguments given"
 msgstr ""
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
 
@@ -4136,10 +4133,6 @@ msgstr ""
 msgid "tobytes can be invoked for dense arrays only"
 msgstr ""
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 72df0f5aed..98876f3cdb 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -195,10 +195,6 @@ msgstr "%q bìxū <= %d"
 msgid "%q must be >= %d"
 msgstr "%q bìxū >= %d"
 
-#: ports/espressif/common-hal/analogbufio/BufferedIn.c
-msgid "%q must be array of type 'H'"
-msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'H' huò 'B' de shù zǔ"
@@ -208,6 +204,10 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgstr ""
 "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'h', 'H', 'b', huò 'B' de shù zǔ"
 
+#: ports/espressif/common-hal/analogbufio/BufferedIn.c
+msgid "%q must be array of type 'H'"
+msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1255,7 +1255,8 @@ msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 msgid "Interrupt error."
 msgstr "zhōng duàn cuò wù."
 
-#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr "wú xiào %q"
@@ -1554,10 +1555,6 @@ msgstr "chéng xù zhōng méi yǒu"
 msgid "No in or out in program"
 msgstr "chéng xù zhōng méi yǒu jìn chū"
 
-#: shared-bindings/aesio/aes.c
-msgid "No key was specified"
-msgstr "Wèi zhǐdìng mì yào"
-
 #: shared-bindings/time/__init__.c
 msgid "No long integer support"
 msgstr "Méiyǒu zhǎng zhěngshù zhīchí"
@@ -1980,8 +1977,8 @@ msgstr "bǐ lì chǐ cùn bì xū chú yǐ 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
-msgid "Scan already in progess. Stop with stop_scan."
-msgstr "Zhèngzài jìn háng sǎomiáo. Shǐyòng stop_scan tíngzhǐ."
+msgid "Scan already in progress. Stop with stop_scan."
+msgstr ""
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2295,6 +2292,11 @@ msgstr "%s:%d: %d chù chū xiàn wèi zhī BLE cuò wù"
 msgid "Unknown BLE error: %d"
 msgstr "wèi zhī de BLE cuò wù: %d"
 
+#: ports/raspberrypi/common-hal/wifi/__init__.c
+#, c-format
+msgid "Unknown error code %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 #, c-format
 msgid "Unknown failure %d"
@@ -2330,11 +2332,6 @@ msgstr "wèi zhī xì tǒng gù jiàn cuò wù: %04x"
 msgid "Unknown system firmware error: %d"
 msgstr "wèi zhī de xì tǒng gù jiàn cuò wù: %d"
 
-#: ports/raspberrypi/common-hal/wifi/__init__.c
-#, c-format
-msgid "Unkown error code %d"
-msgstr "wèi zhī cuò wù dài %d"
-
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
 #, c-format
@@ -2795,7 +2792,7 @@ msgstr "wúfǎ shèzhì 512 kuài dàxiǎo"
 msgid "can't set attribute"
 msgstr "wúfǎ shèzhì shǔxìng"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
 msgstr "wú fǎ shè zhì shǔ xìng '%q'"
 
@@ -3103,8 +3100,8 @@ msgid "extra positional arguments given"
 msgstr "gěi chūle éwài de wèizhì cānshù"
 
 #: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
-#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
-#: shared-module/gifio/GifWriter.c
+#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
+#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
 msgid "file must be a file opened in byte mode"
 msgstr "wénjiàn bìxū shì zài zì jié móshì xià dǎkāi de wénjiàn"
 
@@ -4181,10 +4178,6 @@ msgstr "time_t shíjiān chuō chāochū píngtái fànwéi"
 msgid "tobytes can be invoked for dense arrays only"
 msgstr "tobytes zhǐ néng duì mì jí shù zǔ diào yòng"
 
-#: shared-module/struct/__init__.c
-msgid "too many arguments provided with the given format"
-msgstr "tígōng jǐ dìng géshì de cānshù tài duō"
-
 #: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
 msgid "too many dimensions"
 msgstr "chǐ cùn tài duō"
@@ -4441,6 +4434,19 @@ 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 "No key was specified"
+#~ msgstr "Wèi zhǐdìng mì yào"
+
+#~ msgid "Scan already in progess. Stop with stop_scan."
+#~ msgstr "Zhèngzài jìn háng sǎomiáo. Shǐyòng stop_scan tíngzhǐ."
+
+#, c-format
+#~ msgid "Unkown error code %d"
+#~ msgstr "wèi zhī cuò wù dài %d"
+
+#~ msgid "too many arguments provided with the given format"
+#~ msgstr "tígōng jǐ dìng géshì de cānshù tài duō"
+
 #~ msgid ""
 #~ "\n"
 #~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"

From e2565e2305df87c12f115514d66634ba9bfdfd60 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 14:00:14 -0500
Subject: [PATCH 2118/2403] mimxrt10xx: Add PWMAudioOut

.. via a peripheral known as the "MQS" (medium quality sound). It uses an
~192kHz PWM signal to generate audio. It sounds OK on a small speaker with
no amplifier. There's a small pop when starting/stopping audio, as is
typical.
---
 .../mimxrt10xx/common-hal/audiobusio/I2SOut.h |   4 +-
 .../common-hal/audiobusio/__init__.c          |   1 +
 .../common-hal/audiopwmio/PWMAudioOut.c       | 159 ++++++++++++++++++
 .../common-hal/audiopwmio/PWMAudioOut.h       |  43 +++++
 .../common-hal/audiopwmio/__init__.c          |   0
 .../common-hal/audiopwmio/__init__.h          |   0
 ports/mimxrt10xx/mpconfigport.mk              |   1 +
 .../mimxrt10xx/MIMXRT1011/periph.c            |  18 +-
 .../mimxrt10xx/MIMXRT1011/periph.h            |   3 +
 .../mimxrt10xx/MIMXRT1021/periph.c            |  10 ++
 .../mimxrt10xx/MIMXRT1021/periph.h            |   3 +
 .../mimxrt10xx/MIMXRT1062/periph.c            |  10 ++
 .../mimxrt10xx/MIMXRT1062/periph.h            |   3 +
 13 files changed, 246 insertions(+), 9 deletions(-)
 create mode 100644 ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
 create mode 100644 ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
 create mode 100644 ports/mimxrt10xx/common-hal/audiopwmio/__init__.c
 create mode 100644 ports/mimxrt10xx/common-hal/audiopwmio/__init__.h

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
index c4194402be..2473eb4cab 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
+++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
@@ -26,15 +26,13 @@
 
 #pragma once
 
+#if CIRCUITPY_AUDIOBUSIO_I2SOUT
 #include "supervisor/background_callback.h"
 #include "common-hal/microcontroller/Pin.h"
 
 #include "common-hal/audiobusio/__init__.h"
 
 // Some boards don't implement I2SOut, so suppress any routines from here.
-#if CIRCUITPY_AUDIOBUSIO_I2SOUT
-
-#include "sdk/drivers/sai/fsl_sai.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
index 515c39a268..f2de99f004 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -284,6 +284,7 @@ static void i2s_fill_buffer(i2s_t *self) {
 
 static void i2s_callback_fun(void *self_in) {
     i2s_t *self = self_in;
+    mp_printf(&mp_plat_print, ".");
     i2s_fill_buffer(self);
 }
 
diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
new file mode 100644
index 0000000000..dd50c7950a
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
@@ -0,0 +1,159 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+#include 
+
+#include "mpconfigport.h"
+
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "common-hal/audiobusio/__init__.h"
+#include "common-hal/audiopwmio/PWMAudioOut.h"
+#include "shared-bindings/audiopwmio/PWMAudioOut.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/shared/translate/translate.h"
+#include "supervisor/shared/tick.h"
+
+// Where required we use identifier names that are required by NXP's
+// API, even though they do not conform to the naming standards that Adafruit
+// strives to adhere to. https://www.adafruit.com/blacklivesmatter
+#include "sdk/drivers/sai/fsl_sai.h"
+
+STATIC void config_periph_pin(const mcu_periph_obj_t *periph) {
+    if (!periph) {
+        return;
+    }
+    if (periph->pin->mux_reg) {
+        IOMUXC_SetPinMux(
+            periph->pin->mux_reg, periph->mux_mode,
+            periph->input_reg, periph->input_idx,
+            0,
+            1);
+    }
+
+    IOMUXC_SetPinConfig(0, 0, 0, 0,
+        periph->pin->cfg_reg,
+        IOMUXC_SW_PAD_CTL_PAD_HYS(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PUS(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        | IOMUXC_SW_PAD_CTL_PAD_DSE(4)
+        | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
+}
+
+static void config_mqs(void) {
+    CCM->CCGR0 = (CCM->CCGR0 & (~CCM_CCGR0_CG2_MASK)) | CCM_CCGR0_CG2(3);       /* Enable MQS hmclk. */
+
+    IOMUXC_MQSEnterSoftwareReset(IOMUXC_GPR, true);                             /* Reset MQS. */
+    IOMUXC_MQSEnterSoftwareReset(IOMUXC_GPR, false);                            /* Release reset MQS. */
+    IOMUXC_MQSEnable(IOMUXC_GPR, true);                                         /* Enable MQS. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate64, 0u);           /* 98.304MHz/64/(0+1) = 1.536MHz
+                                                                                Higher frequency PWM involves less low frequen cy harmonic.*/
+
+}
+
+// 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 default_value) {
+
+    int instance = -1;
+    const mcu_periph_obj_t *left_periph = find_pin_function(mcu_mqs_left_list, left_channel, &instance, MP_QSTR_left_channel);
+    const mcu_periph_obj_t *right_periph = find_pin_function(mcu_mqs_right_list, right_channel, &instance, MP_QSTR_right_channel);
+
+    mp_printf(&mp_plat_print, "note: peripheral %d\n", instance);
+    sai_transceiver_t config;
+    SAI_GetClassicI2SConfig(&config, kSAI_WordWidth16bits, kSAI_Stereo, 1U << 0u);
+    config.frameSync.frameSyncEarly = false;
+    config.frameSync.frameSyncPolarity = kSAI_PolarityActiveHigh;
+    // config.syncMode = kSAI_ModeAsync;
+    config.fifo.fifoPacking = kSAI_FifoPackingDisabled;
+    // These identifier names are required by NXP's API, even though they do
+    // not conform to the naming standards that Adafruit strives to adhere to.
+    // https://www.adafruit.com/blacklivesmatter
+    // config.masterSlave = kSAI_Master;
+    port_i2s_initialize(&self->i2s, instance, &config);
+
+    self->left_channel = left_channel;
+    self->right_channel = right_channel;
+    claim_pin(left_channel);
+    claim_pin(right_channel);
+    config_periph_pin(left_periph);
+    config_periph_pin(right_periph);
+    config_mqs();
+}
+
+bool common_hal_audiopwmio_pwmaudioout_deinited(audiopwmio_pwmaudioout_obj_t *self) {
+    return port_i2s_deinited(&self->i2s);
+}
+
+void common_hal_audiopwmio_pwmaudioout_deinit(audiopwmio_pwmaudioout_obj_t *self) {
+    if (common_hal_audiopwmio_pwmaudioout_deinited(self)) {
+        return;
+    }
+
+    port_i2s_deinit(&self->i2s);
+
+    common_hal_reset_pin(self->left_channel);
+    self->left_channel = NULL;
+
+    common_hal_reset_pin(self->right_channel);
+    self->right_channel = NULL;
+
+    IOMUXC_MQSEnterSoftwareReset(IOMUXC_GPR, true);                             /* Reset MQS. */
+    CCM->CCGR0 = CCM->CCGR0 & (~CCM_CCGR0_CG2_MASK);                            /* Disable MQS hmclk. */
+}
+
+void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
+    mp_obj_t sample, bool loop) {
+    if (common_hal_audiopwmio_pwmaudioout_get_playing(self)) {
+        common_hal_audiopwmio_pwmaudioout_stop(self);
+    }
+    port_i2s_play(&self->i2s, sample, loop);
+}
+
+void common_hal_audiopwmio_pwmaudioout_pause(audiopwmio_pwmaudioout_obj_t *self) {
+    port_i2s_pause(&self->i2s);
+}
+
+void common_hal_audiopwmio_pwmaudioout_resume(audiopwmio_pwmaudioout_obj_t *self) {
+    port_i2s_resume(&self->i2s);
+}
+
+bool common_hal_audiopwmio_pwmaudioout_get_paused(audiopwmio_pwmaudioout_obj_t *self) {
+    return port_i2s_get_paused(&self->i2s);
+}
+
+void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self) {
+    port_i2s_stop(&self->i2s);
+}
+
+bool common_hal_audiopwmio_pwmaudioout_get_playing(audiopwmio_pwmaudioout_obj_t *self) {
+    return port_i2s_get_playing(&self->i2s);
+}
diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
new file mode 100644
index 0000000000..27cebc649b
--- /dev/null
+++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#if CIRCUITPY_AUDIOBUSIO_I2SOUT
+#include "supervisor/background_callback.h"
+#include "common-hal/microcontroller/Pin.h"
+
+#include "common-hal/audiobusio/__init__.h"
+
+// Some boards don't implement I2SOut, so suppress any routines from here.
+
+typedef struct {
+    mp_obj_base_t base;
+    i2s_t i2s;
+    const mcu_pin_obj_t *left_channel, *right_channel;
+} audiopwmio_pwmaudioout_obj_t;
+
+#endif
diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/__init__.c b/ports/mimxrt10xx/common-hal/audiopwmio/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/__init__.h b/ports/mimxrt10xx/common-hal/audiopwmio/__init__.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index a952460259..f7ab3d8130 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -17,6 +17,7 @@ CIRCUITPY_AUDIOCORE = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_AUDIOMP3 = 1
+CIRCUITPY_AUDIOPWMIO = 1
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
index fbbf65c8a5..b67f7b1179 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
@@ -169,25 +169,31 @@ const mcu_pwm_obj_t mcu_pwm_list[20] = {
 
 const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_08),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_00),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_00),
 };
 const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_03),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_03),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_03),
 };
 const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_02),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_04),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_04),
 };
 const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_06),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_01),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_01),
 };
 const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_04),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_02),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_02),
 };
 const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
     PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_07),
-    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_SD_00),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_00),
+};
+const mcu_periph_obj_t mcu_mqs_left_list[] = {
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_01),
+};
+const mcu_periph_obj_t mcu_mqs_right_list[] = {
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_02),
 };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
index 109717528f..045e33ca0e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
@@ -54,4 +54,7 @@ extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[2];
 extern const mcu_periph_obj_t mcu_sai_tx_data0_list[2];
 extern const mcu_periph_obj_t mcu_sai_tx_sync_list[2];
 
+extern const mcu_periph_obj_t mcu_mqs_left_list[1];
+extern const mcu_periph_obj_t mcu_mqs_right_list[1];
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
index b80fcf5065..59bd3cc105 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
@@ -311,3 +311,13 @@ const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
     PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
     PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_07),
 };
+const mcu_periph_obj_t mcu_mqs_left_list[] = {
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_07),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_17),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+};
+const mcu_periph_obj_t mcu_mqs_right_list[] = {
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_06),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_37),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
index 31ac10e651..51c97b3eef 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
@@ -53,3 +53,6 @@ extern const mcu_periph_obj_t mcu_sai_rx_sync_list[7];
 extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
 extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
 extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
+
+extern const mcu_periph_obj_t mcu_mqs_left_list[3];
+extern const mcu_periph_obj_t mcu_mqs_right_list[3];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
index 8c038bdb71..c43f4eb96b 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
@@ -362,3 +362,13 @@ const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
     PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
     PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_02),
 };
+const mcu_periph_obj_t mcu_mqs_left_list[] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_01),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_05),
+};
+const mcu_periph_obj_t mcu_mqs_right_list[] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_00),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_04),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
index ab8eb22678..28ea8e3742 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
@@ -54,4 +54,7 @@ extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
 extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
 extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
 
+extern const mcu_periph_obj_t mcu_mqs_left_list[3];
+extern const mcu_periph_obj_t mcu_mqs_right_list[3];
+
 #endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H

From e1c8a3062a0c5000162ff8730dcb28dc2637a78c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 21:06:53 -0500
Subject: [PATCH 2119/2403] remove debugging print

---
 ports/mimxrt10xx/common-hal/audiobusio/__init__.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
index f2de99f004..515c39a268 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -284,7 +284,6 @@ static void i2s_fill_buffer(i2s_t *self) {
 
 static void i2s_callback_fun(void *self_in) {
     i2s_t *self = self_in;
-    mp_printf(&mp_plat_print, ".");
     i2s_fill_buffer(self);
 }
 

From 0c0e06c940848e9bf26642272e5bb2eb0fa1352a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 21:10:04 -0500
Subject: [PATCH 2120/2403] remove comment that was copypasted

---
 ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
index 27cebc649b..b9e4279927 100644
--- a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
+++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.h
@@ -32,8 +32,6 @@
 
 #include "common-hal/audiobusio/__init__.h"
 
-// Some boards don't implement I2SOut, so suppress any routines from here.
-
 typedef struct {
     mp_obj_base_t base;
     i2s_t i2s;

From b1d9331367b4717996cf4c353a18212491dcfa5b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 23 Mar 2023 21:11:05 -0500
Subject: [PATCH 2121/2403] move comment next to its associated #if

---
 ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
index 2473eb4cab..319e52c159 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
+++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.h
@@ -26,14 +26,13 @@
 
 #pragma once
 
+// Some boards don't implement I2SOut, so suppress any routines from here.
 #if CIRCUITPY_AUDIOBUSIO_I2SOUT
 #include "supervisor/background_callback.h"
 #include "common-hal/microcontroller/Pin.h"
 
 #include "common-hal/audiobusio/__init__.h"
 
-// Some boards don't implement I2SOut, so suppress any routines from here.
-
 typedef struct {
     mp_obj_base_t base;
     i2s_t i2s;

From c5a6fd97b0bd602ec6d057683fb253f7418b9f18 Mon Sep 17 00:00:00 2001
From: Ozgur BOSTAN <79173593+ozgurbostan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 09:43:49 +0300
Subject: [PATCH 2122/2403] Update sdkconfig

Add missing new line
---
 ports/espressif/boards/deneyap_kart/sdkconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/deneyap_kart/sdkconfig b/ports/espressif/boards/deneyap_kart/sdkconfig
index c98c5de68d..7ec0461dcf 100644
--- a/ports/espressif/boards/deneyap_kart/sdkconfig
+++ b/ports/espressif/boards/deneyap_kart/sdkconfig
@@ -16,4 +16,4 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
\ No newline at end of file
+CONFIG_SPIRAM_CACHE_WORKAROUND=y

From 659e5b4bedc11f90a9792ee7310657bbd1d28e05 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Fri, 24 Mar 2023 12:29:51 +0100
Subject: [PATCH 2123/2403] support for Pimoroni Badger2040W

---
 .gitmodules                                   |   3 +
 frozen/circuitpython-pcf85063a                |   1 +
 .../pimoroni_badger2040w/badger-shared.h      |   8 +
 .../boards/pimoroni_badger2040w/board.c       | 341 ++++++++++++++++++
 .../boards/pimoroni_badger2040w/link.ld       | 294 +++++++++++++++
 .../pimoroni_badger2040w/mpconfigboard.h      |  18 +
 .../pimoroni_badger2040w/mpconfigboard.mk     |  27 ++
 .../pico-sdk-configboard.h                    |   1 +
 .../boards/pimoroni_badger2040w/pins.c        |  68 ++++
 9 files changed, 761 insertions(+)
 create mode 160000 frozen/circuitpython-pcf85063a
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/badger-shared.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/board.c
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_badger2040w/pins.c

diff --git a/.gitmodules b/.gitmodules
index 9c8d3b4b68..e2e90243a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -324,3 +324,6 @@
 	path = ports/broadcom/peripherals
 	url = https://github.com/adafruit/broadcom-peripherals.git
 	branch = main-build
+[submodule "frozen/circuitpython-pcf85063a"]
+	path = frozen/circuitpython-pcf85063a
+	url = https://github.com/bablokb/circuitpython-pcf85063a
diff --git a/frozen/circuitpython-pcf85063a b/frozen/circuitpython-pcf85063a
new file mode 160000
index 0000000000..21baeb6479
--- /dev/null
+++ b/frozen/circuitpython-pcf85063a
@@ -0,0 +1 @@
+Subproject commit 21baeb6479434b950e9356a320a5a4d050a4bf47
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/badger-shared.h b/ports/raspberrypi/boards/pimoroni_badger2040w/badger-shared.h
new file mode 100644
index 0000000000..5a64e9e00b
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/badger-shared.h
@@ -0,0 +1,8 @@
+#ifndef PIMORONI_BADGER2040W_SHARED
+#define PIMORONI_BADGER2040W_SHARED
+
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+extern digitalio_digitalinout_obj_t enable_pin_obj;
+
+#endif // PIMORONI_BADGER2040W_SHARED
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
new file mode 100644
index 0000000000..9eea472925
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
@@ -0,0 +1,341 @@
+/*
+ * 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 "supervisor/board.h"
+
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "supervisor/shared/board.h"
+#include "badger-shared.h"
+
+digitalio_digitalinout_obj_t enable_pin_obj;
+
+#define DELAY 0x80
+
+enum reg {
+    PSR      = 0x00,
+    PWR      = 0x01,
+    POF      = 0x02,
+    PFS      = 0x03,
+    PON      = 0x04,
+    PMES     = 0x05,
+    BTST     = 0x06,
+    DSLP     = 0x07,
+    DTM1     = 0x10,
+    DSP      = 0x11,
+    DRF      = 0x12,
+    DTM2     = 0x13,
+    LUT_VCOM = 0x20,
+    LUT_WW   = 0x21,
+    LUT_BW   = 0x22,
+    LUT_WB   = 0x23,
+    LUT_BB   = 0x24,
+    PLL      = 0x30,
+    TSC      = 0x40,
+    TSE      = 0x41,
+    TSR      = 0x43,
+    TSW      = 0x42,
+    CDI      = 0x50,
+    LPD      = 0x51,
+    TCON     = 0x60,
+    TRES     = 0x61,
+    REV      = 0x70,
+    FLG      = 0x71,
+    AMV      = 0x80,
+    VV       = 0x81,
+    VDCS     = 0x82,
+    PTL      = 0x90,
+    PTIN     = 0x91,
+    PTOU     = 0x92,
+    PGM      = 0xa0,
+    APG      = 0xa1,
+    ROTP     = 0xa2,
+    CCSET    = 0xe0,
+    PWS      = 0xe3,
+    TSSET    = 0xe5
+};
+
+enum PSR_FLAGS {
+    RES_96x230   = 0b00000000,
+    RES_96x252   = 0b01000000,
+    RES_128x296  = 0b10000000,
+    RES_160x296  = 0b11000000,
+
+    LUT_OTP      = 0b00000000,
+    LUT_REG      = 0b00100000,
+
+    FORMAT_BWR   = 0b00000000,
+    FORMAT_BW    = 0b00010000,
+
+    SCAN_DOWN    = 0b00000000,
+    SCAN_UP      = 0b00001000,
+
+    SHIFT_LEFT   = 0b00000000,
+    SHIFT_RIGHT  = 0b00000100,
+
+    BOOSTER_OFF  = 0b00000000,
+    BOOSTER_ON   = 0b00000010,
+
+    RESET_SOFT   = 0b00000000,
+    RESET_NONE   = 0b00000001
+};
+
+enum PWR_FLAGS_1 {
+    VDS_EXTERNAL = 0b00000000,
+    VDS_INTERNAL = 0b00000010,
+
+    VDG_EXTERNAL = 0b00000000,
+    VDG_INTERNAL = 0b00000001
+};
+
+enum PWR_FLAGS_2 {
+    VCOM_VD      = 0b00000000,
+    VCOM_VG      = 0b00000100,
+
+    VGHL_16V     = 0b00000000,
+    VGHL_15V     = 0b00000001,
+    VGHL_14V     = 0b00000010,
+    VGHL_13V     = 0b00000011
+};
+
+enum BOOSTER_FLAGS {
+    START_10MS = 0b00000000,
+    START_20MS = 0b01000000,
+    START_30MS = 0b10000000,
+    START_40MS = 0b11000000,
+
+    STRENGTH_1 = 0b00000000,
+    STRENGTH_2 = 0b00001000,
+    STRENGTH_3 = 0b00010000,
+    STRENGTH_4 = 0b00011000,
+    STRENGTH_5 = 0b00100000,
+    STRENGTH_6 = 0b00101000,
+    STRENGTH_7 = 0b00110000,
+    STRENGTH_8 = 0b00111000,
+
+    OFF_0_27US = 0b00000000,
+    OFF_0_34US = 0b00000001,
+    OFF_0_40US = 0b00000010,
+    OFF_0_54US = 0b00000011,
+    OFF_0_80US = 0b00000100,
+    OFF_1_54US = 0b00000101,
+    OFF_3_34US = 0b00000110,
+    OFF_6_58US = 0b00000111
+};
+
+enum PFS_FLAGS {
+    FRAMES_1   = 0b00000000,
+    FRAMES_2   = 0b00010000,
+    FRAMES_3   = 0b00100000,
+    FRAMES_4   = 0b00110000
+};
+
+enum TSE_FLAGS {
+    TEMP_INTERNAL = 0b00000000,
+    TEMP_EXTERNAL = 0b10000000,
+
+    OFFSET_0      = 0b00000000,
+    OFFSET_1      = 0b00000001,
+    OFFSET_2      = 0b00000010,
+    OFFSET_3      = 0b00000011,
+    OFFSET_4      = 0b00000100,
+    OFFSET_5      = 0b00000101,
+    OFFSET_6      = 0b00000110,
+    OFFSET_7      = 0b00000111,
+
+    OFFSET_MIN_8  = 0b00001000,
+    OFFSET_MIN_7  = 0b00001001,
+    OFFSET_MIN_6  = 0b00001010,
+    OFFSET_MIN_5  = 0b00001011,
+    OFFSET_MIN_4  = 0b00001100,
+    OFFSET_MIN_3  = 0b00001101,
+    OFFSET_MIN_2  = 0b00001110,
+    OFFSET_MIN_1  = 0b00001111
+};
+
+enum PLL_FLAGS {
+    // other frequency options exist but there doesn't seem to be much
+    // point in including them - this is a fair range of options...
+    HZ_29      = 0b00111111,
+    HZ_33      = 0b00111110,
+    HZ_40      = 0b00111101,
+    HZ_50      = 0b00111100,
+    HZ_67      = 0b00111011,
+    HZ_100     = 0b00111010,
+    HZ_200     = 0b00111001
+};
+
+// This is an UC8151 control chip. The display is a 2.9" grayscale EInk.
+const uint8_t display_start_sequence[] = {
+    PWR, 5, VDS_INTERNAL | VDG_INTERNAL, VCOM_VD | VGHL_16V, 0b101011, 0b101011, 0b101011, // power setting
+    PON, DELAY, 200, // power on and wait 200 ms
+    BTST, 3, (START_10MS | STRENGTH_3 | OFF_6_58US), (START_10MS | STRENGTH_3 | OFF_6_58US), (START_10MS | STRENGTH_3 | OFF_6_58US),
+    PSR, 1, (RES_128x296 | LUT_REG | FORMAT_BW | SCAN_UP | SHIFT_RIGHT | BOOSTER_ON | RESET_NONE),
+    PFS, 1, FRAMES_1,
+    TSE, 1, TEMP_INTERNAL | OFFSET_0,
+    TCON, 1, 0x22, // tcon setting
+    CDI, 1, 0b01001100, // vcom and data interval
+    PLL, 1, HZ_100, // PLL set to 100 Hz
+
+    // Look up tables for voltage sequence for pixel transition
+    // Common voltage
+    LUT_VCOM, 44,
+    0x00, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x23, 0x23, 0x00, 0x00, 0x02,
+    0x00, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // White to white
+    LUT_WW, 42,
+    0x54, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x60, 0x23, 0x23, 0x00, 0x00, 0x02,
+    0xa8, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+    // Black to white
+    LUT_BW, 42,
+    0x54, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x60, 0x23, 0x23, 0x00, 0x00, 0x02,
+    0xa8, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+    // White to black
+    LUT_WB, 42,
+    0xa8, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x60, 0x23, 0x23, 0x00, 0x00, 0x02,
+    0x54, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+    // Black to black
+    LUT_BB, 42,
+    0xa8, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x60, 0x23, 0x23, 0x00, 0x00, 0x02,
+    0x54, 0x16, 0x16, 0x0d, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+const uint8_t display_stop_sequence[] = {
+    POF, 0x00  // Power off
+};
+
+const uint8_t refresh_sequence[] = {
+    DRF, 0x00
+};
+
+void board_init(void) {
+    // Drive the EN_3V3 pin high so the board stays awake on battery power
+    enable_pin_obj.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&enable_pin_obj, &pin_GPIO10);
+    common_hal_digitalio_digitalinout_switch_to_output(&enable_pin_obj, true, DRIVE_MODE_PUSH_PULL);
+
+    // Never reset
+    common_hal_digitalio_digitalinout_never_reset(&enable_pin_obj);
+
+    // Set up the SPI object used to control the display
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
+    common_hal_busio_spi_never_reset(spi);
+
+    // Set up the DisplayIO pin object
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+    common_hal_displayio_fourwire_construct(bus,
+        spi,
+        &pin_GPIO20, // EPD_DC Command or data
+        &pin_GPIO17, // EPD_CS Chip select
+        &pin_GPIO21, // EPD_RST Reset
+        1200000, // Baudrate
+        0, // Polarity
+        0); // Phase
+
+    // Set up the DisplayIO epaper object
+    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    display->base.type = &displayio_epaperdisplay_type;
+    common_hal_displayio_epaperdisplay_construct(
+        display,
+        bus,
+        display_start_sequence, sizeof(display_start_sequence),
+        0, // start up time
+        display_stop_sequence, sizeof(display_stop_sequence),
+        296,  // width
+        128,  // height
+        160,  // ram_width
+        296,  // ram_height
+        0,  // colstart
+        0,  // rowstart
+        270,  // rotation
+        NO_COMMAND,  // set_column_window_command
+        NO_COMMAND,  // set_row_window_command
+        NO_COMMAND,  // set_current_column_command
+        NO_COMMAND,  // set_current_row_command
+        DTM2,  // write_black_ram_command
+        true,  // black_bits_inverted
+        DTM1,  // write_color_ram_command
+        false,  // color_bits_inverted
+        0x000000,  // highlight_color
+        refresh_sequence, sizeof(refresh_sequence),  // refresh_display_command
+        1.0,  // refresh_time
+        &pin_GPIO26,  // busy_pin
+        false,  // busy_state
+        2.0, // seconds_per_frame
+        false,  // always_toggle_chip_select
+        false, // grayscale
+        false, // acep
+        false);  // two_byte_sequence_length
+}
+
+void board_deinit(void) {
+    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    if (display->base.type == &displayio_epaperdisplay_type) {
+        size_t i = 0;
+        while (common_hal_displayio_epaperdisplay_get_busy(display)) {
+            RUN_BACKGROUND_TASKS;
+            i++;
+        }
+    }
+    common_hal_displayio_release_displays();
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld b/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
new file mode 100644
index 0000000000..2777b41720
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
@@ -0,0 +1,294 @@
+/* Based on GCC ARM embedded samples.
+   Defines the following symbols for use by code:
+    __exidx_start
+    __exidx_end
+    __etext
+    __data_start__
+    __preinit_array_start
+    __preinit_array_end
+    __init_array_start
+    __init_array_end
+    __fini_array_start
+    __fini_array_end
+    __data_end__
+    __bss_start__
+    __bss_end__
+    __end__
+    end
+    __HeapLimit
+    __StackLimit
+    __StackTop
+    __stack (== StackTop)
+*/
+
+MEMORY
+{
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
+    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
+    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
+    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
+    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
+}
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
+       and checksummed. It is usually built by the boot_stage2 target
+       in the Pico SDK
+    */
+
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH_FIRMWARE
+
+    .boot2 : {
+        __boot2_start__ = .;
+        KEEP (*(.boot2))
+        __boot2_end__ = .;
+    } > FLASH_FIRMWARE
+
+    ASSERT(__boot2_end__ - __boot2_start__ == 256,
+        "ERROR: Pico second stage bootloader must be 256 bytes in size")
+
+    /* The second stage will always enter the image at the start of .text.
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol if present, otherwise defaults to start of .text.
+       This can be used to transfer control back to the bootrom on debugger
+       launches only, to perform proper flash setup.
+    */
+
+    .text : {
+        __logical_binary_start = .;
+        KEEP (*(.vectors))
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.reset))
+        /* TODO revisit this now memset/memcpy/float in ROM */
+        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
+         * FLASH ... we will include any thing excluded here in .data below by default */
+        *(.init)
+
+        __property_getter_start = .;
+        *(.property_getter)
+        __property_getter_end = .;
+        __property_getset_start = .;
+        *(.property_getset)
+        __property_getset_end = .;
+
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
+        *(.fini)
+        /* Pull all c'tors into .text */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+        /* Followed by destructors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        . = ALIGN(4);
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH_FIRMWARE
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH_FIRMWARE
+    __exidx_end = .;
+
+    /* Machine inspectable binary information */
+    . = ALIGN(4);
+    __binary_info_start = .;
+    .binary_info :
+    {
+        KEEP(*(.binary_info.keep.*))
+        *(.binary_info.*)
+    } > FLASH_FIRMWARE
+    __binary_info_end = .;
+    . = ALIGN(4);
+
+    /* End of .text-like segments */
+    __etext = .;
+
+   .ram_vector_table (COPY): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .data : {
+        __data_start__ = .;
+        *(vtable)
+
+        *(.time_critical*)
+
+        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+        *(.text*)
+        . = ALIGN(4);
+        *(.rodata*)
+        . = ALIGN(4);
+
+        *(.data*)
+
+        . = ALIGN(4);
+        *(.after_data.*)
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__mutex_array_start = .);
+        KEEP(*(SORT(.mutex_array.*)))
+        KEEP(*(.mutex_array))
+        PROVIDE_HIDDEN (__mutex_array_end = .);
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(SORT(.preinit_array.*)))
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        *(SORT(.fini_array.*))
+        *(.fini_array)
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+        /* All data end */
+        __data_end__ = .;
+    } > RAM AT> FLASH_FIRMWARE
+
+    .itcm :
+    {
+        . = ALIGN(4);
+        *(.itcm.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_itcm_destination = ADDR(.itcm);
+    _ld_itcm_flash_copy = LOADADDR(.itcm);
+    _ld_itcm_size = SIZEOF(.itcm);
+
+    .dtcm_data :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_data.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_dtcm_data_destination = ADDR(.dtcm_data);
+    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
+    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
+
+    .dtcm_bss :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_bss.*)
+
+        . = ALIGN(4);
+    } > RAM AT> RAM
+    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
+    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
+
+    .uninitialized_data (COPY): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > RAM
+
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH_FIRMWARE
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        *(.scratch_y.*)
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH_FIRMWARE
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
+    .bss  : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (COPY):
+    {
+        __end__ = .;
+        end = __end__;
+        *(.heap*)
+        __HeapLimit = .;
+    } > RAM
+
+    /* .stack*_dummy section doesn't contains any symbols. It is only
+     * used for linker to calculate size of stack sections, and assign
+     * values to stack symbols later
+     *
+     * stack1 section may be empty/missing if platform_launch_core1 is not used */
+
+    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
+     * stack is not used then all of SCRATCH_X is free.
+     */
+    .stack1_dummy (COPY):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (COPY):
+    {
+        *(.stack*)
+    } > SCRATCH_Y
+
+    .flash_end : {
+        __flash_binary_end = .;
+    } > FLASH_FIRMWARE
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
+    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
+    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
+    PROVIDE(__stack = __StackTop);
+
+    /* Check if data + heap + stack exceeds RAM limit */
+    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
+    /* todo assert on extra code */
+}
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.h
new file mode 100644
index 0000000000..674f07b538
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.h
@@ -0,0 +1,18 @@
+#define MICROPY_HW_BOARD_NAME "Pimoroni Badger 2040 W"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
+
+// Status LED
+#define MICROPY_HW_LED_STATUS   (&pin_CYW0)
+
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16)
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
new file mode 100644
index 0000000000..4ddb0e7d87
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
@@ -0,0 +1,27 @@
+USB_VID = 0x2E8A
+USB_PID = 0x104F
+
+USB_PRODUCT = "Badger 2040 W"
+USB_MANUFACTURER = "Pimoroni"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+
+CIRCUITPY_CYW43 = 1
+CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_MBEDTLS = 1
+CIRCUITPY_HASHLIB = 1
+CIRCUITPY_WEB_WORKFLOW = 1
+CIRCUITPY_MDNS = 1
+CIRCUITPY_SOCKETPOOL = 1
+CIRCUITPY_WIFI = 1
+
+CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+# Must be accompanied by a linker script change
+CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-pcf85063a
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_badger2040w/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c
new file mode 100644
index 0000000000..49a821000c
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c
@@ -0,0 +1,68 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-module/displayio/__init__.h"
+#include "badger-shared.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_RTC_ALARM), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+
+    // { MP_ROM_QSTR(MP_QSTR_EN_3V3), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_SW_DOWN), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_SW_A), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_SW_B), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_SW_C), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SW_UP), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_INKY_CS), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_INKY_DC), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_INKY_RST), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
+
+    { MP_ROM_QSTR(MP_QSTR_INKY_BUSY), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+
+    { 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].epaper_display)},
+    { MP_ROM_QSTR(MP_QSTR_ENABLE_DIO), MP_ROM_PTR(&enable_pin_obj)},   // GP10
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 8814e0f4f7660be9a17b8acd836be19e545dfbf7 Mon Sep 17 00:00:00 2001
From: Ozgur BOSTAN <79173593+ozgurbostan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:34:17 +0300
Subject: [PATCH 2124/2403] Update sdkconfig

Add missing new line
---
 ports/espressif/boards/deneyap_kart_1a/sdkconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/deneyap_kart_1a/sdkconfig b/ports/espressif/boards/deneyap_kart_1a/sdkconfig
index c98c5de68d..7ec0461dcf 100644
--- a/ports/espressif/boards/deneyap_kart_1a/sdkconfig
+++ b/ports/espressif/boards/deneyap_kart_1a/sdkconfig
@@ -16,4 +16,4 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
\ No newline at end of file
+CONFIG_SPIRAM_CACHE_WORKAROUND=y

From a2b2158bcbb1a4031fb47bca8dedf4c07b11a133 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Thu, 23 Mar 2023 20:35:44 +0000
Subject: [PATCH 2125/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/es.po b/locale/es.po
index ebd1ea4a2b..9578e4048a 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: 2023-03-23 17:26+0000\n"
+"PO-Revision-Date: 2023-03-25 02:42+0000\n"
 "Last-Translator: Jose David M \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.16.2-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -1998,7 +1998,7 @@ msgstr "Las dimensiones de escala debe ser divisibles por 3"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Escaneo en progreso. Usa stop_scan para detenerlo."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2320,7 +2320,7 @@ msgstr "Error BLE desconocido: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Código de error desconocido %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format

From 277edddf2a8c9e50b559dbd9088a536e88568241 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Fri, 24 Mar 2023 02:02:08 +0000
Subject: [PATCH 2126/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 88ccd57c4e..a684aacfb1 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: 2023-03-23 17:26+0000\n"
+"PO-Revision-Date: 2023-03-25 02:42+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.16.2-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -1992,7 +1992,7 @@ msgstr "As dimensões da escala devem ser poder ser divididas por 3"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Digitalização já em andamento. Pare com stop_scan."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2314,7 +2314,7 @@ msgstr "Houve um erro BLE desconhecido: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Código de erro desconhecido %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format

From 6effaef9b45c407e9178f436432e01bef73dcc06 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 23 Mar 2023 17:30:20 +0000
Subject: [PATCH 2127/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1002 of 1002 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 da13d25599..bbbe1ad4fb 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: 2023-03-23 17:26+0000\n"
+"PO-Revision-Date: 2023-03-25 02:42+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.16.2-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -1973,7 +1973,7 @@ msgstr "Skaldimension måste vara delbar med 3"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Skanning pågår redan. Stoppa med stop_scan."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2290,7 +2290,7 @@ msgstr "Okänt BLE-fel: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Okänd felkod %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format

From 94f487c08d132645f25d282ce151e2ebe82f3815 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 24 Mar 2023 22:45:12 -0400
Subject: [PATCH 2128/2403] handle older versions of git for make
 fetch-submodules; add remove-submodules

---
 Makefile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 50c86fc128..d0f1fcb3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -324,9 +324,24 @@ clean-stm:
 	$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
 
 
-# Do blobless partial clones of submodules to save time and space.
+# If available, do blobless partial clones of submodules to save time and space.
 # A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
 # so it does not have the idiosyncrasies of a shallow clone.
+#
+# If not available, do a fetch that will fail, and then fix it up with a second fetch.
+# (Only works for git servers that allow sha fetches.)
 .PHONY: fetch-submodules
 fetch-submodules:
-	git submodule update --init --filter=blob:none
+	git submodule sync
+	#####################################################################################
+	# NOTE: Ideally, use git version 2.36.0 or later, to do partial clones of submodules.
+	# If an older git is used, submodules will be cloned with a shallow clone of depth 1.
+	# You will see a git usage message first if the git version is too old to do
+	# clones of submodules.
+	#####################################################################################
+	git submodule update --init --filter=blob:none || git submodule update --init -N --depth 1 || git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1' || echo 'make fetch-submodules FAILED'
+
+.PHONY: remove-submodules
+remove-submodules:
+	git submodule deinit -f --all
+	rm -rf .git/modules/*

From 730a2a9c2c9b43bfdfda86fb61111bd46e5eedfd Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Sat, 25 Mar 2023 13:09:35 +0530
Subject: [PATCH 2129/2403] remove certain excludes from pre-commit

---
 .pre-commit-config.yaml                                       | 4 ++--
 .../espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig  | 1 -
 ports/espressif/boards/espressif_esp32_eye/sdkconfig          | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ab0279f7d7..942a51afdc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,9 +8,9 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig
index a162344cfb..9d924272ec 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig
@@ -5,4 +5,3 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=n
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
-
diff --git a/ports/espressif/boards/espressif_esp32_eye/sdkconfig b/ports/espressif/boards/espressif_esp32_eye/sdkconfig
index a73d92e0a2..26db1e8087 100644
--- a/ports/espressif/boards/espressif_esp32_eye/sdkconfig
+++ b/ports/espressif/boards/espressif_esp32_eye/sdkconfig
@@ -69,4 +69,3 @@ CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
 #
 CONFIG_ESP_CONSOLE_UART_TX_GPIO=1
 CONFIG_ESP_CONSOLE_UART_RX_GPIO=3
-

From efeaa1ad20a9977117169a9670707e17e767bd8a Mon Sep 17 00:00:00 2001
From: Ozgur BOSTAN <79173593+ozgurbostan@users.noreply.github.com>
Date: Sun, 26 Mar 2023 01:02:08 +0300
Subject: [PATCH 2130/2403] Update mpconfigboard.mk of Deneyap Kart

---
 ports/espressif/boards/deneyap_kart/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/deneyap_kart/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
index c98cdb87b6..ea8c9a8522 100644
--- a/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x00001209
-CIRCUITPY_CREATION_ID = 0x0032D001
+CIRCUITPY_CREATOR_ID =  0x19231923
+CIRCUITPY_CREATION_ID = 0x00320001
 
 IDF_TARGET = esp32
 

From c8b329c4eeafcfd7350fe75652b2193a72e3bbcd Mon Sep 17 00:00:00 2001
From: Ozgur BOSTAN <79173593+ozgurbostan@users.noreply.github.com>
Date: Sun, 26 Mar 2023 01:03:01 +0300
Subject: [PATCH 2131/2403] Update mpconfigboard.mk of Deneyap Kart 1A

---
 ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
index 8b3da63e5b..976083217e 100644
--- a/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x00001209
-CIRCUITPY_CREATION_ID = 0x0032D002
+CIRCUITPY_CREATOR_ID =  0x19231923
+CIRCUITPY_CREATION_ID = 0x00320002
 
 IDF_TARGET = esp32
 

From 872495ef36a49c939d0e46f147476b1f4d904cf7 Mon Sep 17 00:00:00 2001
From: Ozgur BOSTAN <79173593+ozgurbostan@users.noreply.github.com>
Date: Sun, 26 Mar 2023 01:03:40 +0300
Subject: [PATCH 2132/2403] Update mpconfigboard.mk Deneyap Kart G

---
 ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
index c01e84611b..a470d7a088 100644
--- a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x00001209
-CIRCUITPY_CREATION_ID = 0x0032D003
+CIRCUITPY_CREATOR_ID =  0x19231923
+CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 

From 297d9d0a8152299d95d7c04cf07a409d2a955d66 Mon Sep 17 00:00:00 2001
From: ozgurbostan 
Date: Sun, 26 Mar 2023 14:54:34 +0300
Subject: [PATCH 2133/2403] Add new boards (deneyapmini/v2 and deneyapkart1a)

---
 .../boards/deneyap_kart_1a_v2/board.c         | 32 +++++++
 .../boards/deneyap_kart_1a_v2/mpconfigboard.h | 47 ++++++++++
 .../deneyap_kart_1a_v2/mpconfigboard.mk       | 12 +++
 .../boards/deneyap_kart_1a_v2/pins.c          | 73 +++++++++++++++
 .../boards/deneyap_kart_1a_v2/sdkconfig       | 47 ++++++++++
 ports/espressif/boards/deneyap_mini/board.c   | 31 +++++++
 .../boards/deneyap_mini/mpconfigboard.h       | 39 ++++++++
 .../boards/deneyap_mini/mpconfigboard.mk      | 12 +++
 ports/espressif/boards/deneyap_mini/pins.c    | 89 +++++++++++++++++++
 ports/espressif/boards/deneyap_mini/sdkconfig |  4 +
 .../espressif/boards/deneyap_mini_v2/board.c  | 32 +++++++
 .../boards/deneyap_mini_v2/mpconfigboard.h    | 39 ++++++++
 .../boards/deneyap_mini_v2/mpconfigboard.mk   | 11 +++
 ports/espressif/boards/deneyap_mini_v2/pins.c | 85 ++++++++++++++++++
 .../boards/deneyap_mini_v2/sdkconfig          | 37 ++++++++
 15 files changed, 590 insertions(+)
 create mode 100644 ports/espressif/boards/deneyap_kart_1a_v2/board.c
 create mode 100644 ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_kart_1a_v2/pins.c
 create mode 100644 ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
 create mode 100644 ports/espressif/boards/deneyap_mini/board.c
 create mode 100644 ports/espressif/boards/deneyap_mini/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_mini/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_mini/pins.c
 create mode 100644 ports/espressif/boards/deneyap_mini/sdkconfig
 create mode 100644 ports/espressif/boards/deneyap_mini_v2/board.c
 create mode 100644 ports/espressif/boards/deneyap_mini_v2/mpconfigboard.h
 create mode 100644 ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/deneyap_mini_v2/pins.c
 create mode 100644 ports/espressif/boards/deneyap_mini_v2/sdkconfig

diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/board.c b/ports/espressif/boards/deneyap_kart_1a_v2/board.c
new file mode 100644
index 0000000000..2287dbaaa7
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/board.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.h b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.h
new file mode 100644
index 0000000000..088bfbfd41
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.h
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Deneyap Kart 1A v2"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
+#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO21)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO38)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO39)
+
+#define DOUBLE_TAP_PIN (&pin_GPIO34)
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
new file mode 100644
index 0000000000..1ec7c73185
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
@@ -0,0 +1,12 @@
+USB_VID = 0x239A
+USB_PID = 0x8148
+
+USB_PRODUCT = "Deneyap Kart 1A v2"
+USB_MANUFACTURER = "Turkish Technology Team Foundation"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/pins.c b/ports/espressif/boards/deneyap_kart_1a_v2/pins.c
new file mode 100644
index 0000000000..cf4c915e7f
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/pins.c
@@ -0,0 +1,73 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C_POWER), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig b/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
new file mode 100644
index 0000000000..4e99a09f2e
--- /dev/null
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
@@ -0,0 +1,47 @@
+#
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_OCT=y
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# end of SPI RAM config
+
+# end of ESP32S3-Specific
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP
+
+# end of Component config
diff --git a/ports/espressif/boards/deneyap_mini/board.c b/ports/espressif/boards/deneyap_mini/board.c
new file mode 100644
index 0000000000..ac27ce4970
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini/board.c
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_mini/mpconfigboard.h b/ports/espressif/boards/deneyap_mini/mpconfigboard.h
new file mode 100644
index 0000000000..0e47285238
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini/mpconfigboard.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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Deneyap Mini"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO37, .sda = &pin_GPIO36}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO38, .mosi = &pin_GPIO40, .miso = &pin_GPIO39}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO43, .rx = &pin_GPIO44}}
diff --git a/ports/espressif/boards/deneyap_mini/mpconfigboard.mk b/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
new file mode 100644
index 0000000000..f6944b7d7a
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
@@ -0,0 +1,12 @@
+USB_VID = 0x303A
+USB_PID = 0x8142
+
+USB_PRODUCT = "Deneyap Mini"
+USB_MANUFACTURER = "Turkish Technology Team Foundation"
+
+IDF_TARGET = esp32s2
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/deneyap_mini/pins.c b/ports/espressif/boards/deneyap_mini/pins.c
new file mode 100644
index 0000000000..6c04661467
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini/pins.c
@@ -0,0 +1,89 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO41) },
+
+    { MP_ROM_QSTR(MP_QSTR_MO), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO40) },
+
+    { MP_ROM_QSTR(MP_QSTR_MI), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_MC), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_SC), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_DA1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_DA0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_DAC0), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_BT), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GPKEY), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_LEDB), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_LEDG), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_LEDR), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_T0), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_T1), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_T2), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_T3), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_T4), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_T5), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_mini/sdkconfig b/ports/espressif/boards/deneyap_mini/sdkconfig
new file mode 100644
index 0000000000..7dfaf3052c
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini/sdkconfig
@@ -0,0 +1,4 @@
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="DeneyapMini"
+# end of LWIP
diff --git a/ports/espressif/boards/deneyap_mini_v2/board.c b/ports/espressif/boards/deneyap_mini_v2/board.c
new file mode 100644
index 0000000000..2287dbaaa7
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini_v2/board.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.h b/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.h
new file mode 100644
index 0000000000..be6cbd86b7
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Deneyap Mini v2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO37, .sda = &pin_GPIO36}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO38, .mosi = &pin_GPIO40, .miso = &pin_GPIO39}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO43, .rx = &pin_GPIO44}}
diff --git a/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk
new file mode 100644
index 0000000000..fa9c6b40ea
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x303A
+USB_PID = 0x8145
+
+USB_PRODUCT = "Deneyap Mini v2"
+USB_MANUFACTURER = "Turkish Technology Team Foundation"
+
+IDF_TARGET = esp32s2
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
diff --git a/ports/espressif/boards/deneyap_mini_v2/pins.c b/ports/espressif/boards/deneyap_mini_v2/pins.c
new file mode 100644
index 0000000000..ab3250769d
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini_v2/pins.c
@@ -0,0 +1,85 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_PWM0), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_PWM1), MP_ROM_PTR(&pin_GPIO41) },
+
+    { MP_ROM_QSTR(MP_QSTR_MO), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO40) },
+
+    { MP_ROM_QSTR(MP_QSTR_MI), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO39) },
+
+    { MP_ROM_QSTR(MP_QSTR_MC), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_SC), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_DA1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_DA0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_DAC0), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GPKEY), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_RGBLED), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_T0), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_T1), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_T2), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_T3), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_T4), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_T5), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_T6), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/deneyap_mini_v2/sdkconfig b/ports/espressif/boards/deneyap_mini_v2/sdkconfig
new file mode 100644
index 0000000000..613b744ef2
--- /dev/null
+++ b/ports/espressif/boards/deneyap_mini_v2/sdkconfig
@@ -0,0 +1,37 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="DeneyapMini_v2"
+# end of LWIP

From d9c4050f9263ca0f62a20f4c36362b8d31221865 Mon Sep 17 00:00:00 2001
From: Luc 
Date: Sat, 25 Mar 2023 22:01:49 +0000
Subject: [PATCH 2134/2403] Translated using Weblate (German)

Currently translated at 96.0% (962 of 1002 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index fb676d621e..68b1152895 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-03-01 17:39+0000\n"
-"Last-Translator: Ettore Atalan \n"
+"PO-Revision-Date: 2023-03-26 22:37+0000\n"
+"Last-Translator: Luc \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "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.16\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -198,7 +198,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q muss ein Array vom Typ 'H' sein"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
@@ -526,7 +526,7 @@ msgstr "Sucht bereits nach Wifi-Netzwerken"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "Ein Fehler ist aufgetreten beim Abfragen von '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -826,11 +826,11 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "Koordinaten-Arrays haben unterschiedliche Längen"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "Typen der Koordinaten-Arrays haben unterschiedliche Längen"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
@@ -951,7 +951,7 @@ msgstr "Fehler in regex"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Fehler in safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -1028,7 +1028,7 @@ msgstr "Interner Flash konnte nicht geschrieben werden."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "Hardware hat Fehler festgestellt."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1250,7 +1250,7 @@ msgstr "Der Interne WatchDog Timer ist abgelaufen."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Interrupt Fehler."
 
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -1278,7 +1278,7 @@ msgstr "Ungültige BSSID"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "Ungültiger Wert CIRCUITPY_PYSTACK_SIZE\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
@@ -1977,7 +1977,7 @@ msgstr "Maßstabs-Abmeßungen müssen durch 3 teilbar sein"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Scan läuft schon. Stoppen mit stop_scan."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c

From 19429d3626c7396b6ce064ea844e98081e53a0bb Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Mon, 27 Mar 2023 16:58:44 +0200
Subject: [PATCH 2135/2403] espnow.Peer: fix argument types and default values

---
 ports/espressif/bindings/espnow/ESPNow.c |  2 +-
 ports/espressif/bindings/espnow/Peer.c   | 24 ++++++++----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 513966e1e8..06c186d210 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -53,7 +53,7 @@ static void espnow_check_for_deinit(espnow_obj_t *self) {
 //| class ESPNow:
 //|     """Provides access to the ESP-NOW protocol."""
 //|
-//|     def __init__(self, buffer_size: Optional[int], phy_rate: Optional[int]) -> None:
+//|     def __init__(self, buffer_size: int = 526, phy_rate: Optional[int] = None) -> None:
 //|         """Allocate and initialize `ESPNow` instance as a singleton.
 //|
 //|         :param int buffer_size: The size of the internal ring buffer. Default: 526 bytes.
diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
index ca756409a6..89766dbf11 100644
--- a/ports/espressif/bindings/espnow/Peer.c
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -40,6 +40,7 @@
 //|     def __init__(
 //|         self,
 //|         mac: bytes,
+//|         *,
 //|         lmk: Optional[bytes],
 //|         channel: int = 0,
 //|         interface: int = 0,
@@ -58,10 +59,10 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
     enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypt };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mac,      MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_lmk,      MP_ARG_OBJ, { .u_obj = mp_const_none } },
-        { MP_QSTR_channel,  MP_ARG_INT, { .u_obj = mp_const_none } },
-        { MP_QSTR_interface,MP_ARG_INT, { .u_obj = mp_const_none } },
-        { MP_QSTR_encrypt,  MP_ARG_BOOL,{ .u_obj = mp_const_none } },
+        { MP_QSTR_lmk,      MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = mp_const_none } },
+        { MP_QSTR_channel,  MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
+        { MP_QSTR_interface,MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
+        { MP_QSTR_encrypt,  MP_ARG_BOOL | MP_ARG_KW_ONLY,{ .u_bool = false } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -77,20 +78,11 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     memcpy(self->peer_info.peer_addr, common_hal_espnow_get_bytes_len(args[ARG_mac].u_obj, ESP_NOW_ETH_ALEN), ESP_NOW_ETH_ALEN);
 
-    const mp_obj_t channel = args[ARG_channel].u_obj;
-    if (channel != mp_const_none) {
-        self->peer_info.channel = mp_arg_validate_int_range(mp_obj_get_int(channel), 0, 14, MP_QSTR_channel);
-    }
+    self->peer_info.channel = mp_arg_validate_int_range(args[ARG_channel].u_int, 0, 14, MP_QSTR_channel);
 
-    const mp_obj_t interface = args[ARG_interface].u_obj;
-    if (interface != mp_const_none) {
-        self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(interface), 0, 1, MP_QSTR_interface);
-    }
+    self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(args[ARG_interface].u_int, 0, 1, MP_QSTR_interface);
 
-    const mp_obj_t encrypt = args[ARG_encrypt].u_obj;
-    if (encrypt != mp_const_none) {
-        self->peer_info.encrypt = mp_obj_is_true(encrypt);
-    }
+    self->peer_info.encrypt = args[ARG_encrypt].u_bool;
 
     const mp_obj_t lmk = args[ARG_lmk].u_obj;
     if (lmk != mp_const_none) {

From d6a067b0e564cc9d40d7782541393c5fe63f99e2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 27 Mar 2023 10:52:23 -0500
Subject: [PATCH 2136/2403] Make PWMAudioOut object ll, have finaliser

.. for reasons stated in the comment
---
 shared-bindings/audiopwmio/PWMAudioOut.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index b4cea75184..56c6412bc6 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -114,7 +114,12 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_
         validate_obj_is_free_pin_or_none(args[ARG_right_channel].u_obj, MP_QSTR_right_channel);
 
     // create AudioOut object from the given pin
-    audiopwmio_pwmaudioout_obj_t *self = m_new_obj(audiopwmio_pwmaudioout_obj_t);
+    // The object is made long-lived because many implementations keep
+    // a pointer to the object (e.g., for the interrupt handler), which
+    // will not work properly if the object is moved. It is created
+    // with a finaliser as some ports use these (rather than 'reset' functions)
+    // to ensure resources are collected at interpreter shutdown.
+    audiopwmio_pwmaudioout_obj_t *self = m_new_ll_obj_with_finaliser(audiopwmio_pwmaudioout_obj_t);
     self->base.type = &audiopwmio_pwmaudioout_type;
     common_hal_audiopwmio_pwmaudioout_construct(self, left_channel_pin, right_channel_pin, args[ARG_quiescent_value].u_int);
 
@@ -249,6 +254,7 @@ MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_paused_obj,
 STATIC const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiopwmio_pwmaudioout_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiopwmio_pwmaudioout_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiopwmio_pwmaudioout___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_play), MP_ROM_PTR(&audiopwmio_pwmaudioout_play_obj) },

From 9d090ee73eabe5a84eb7f2aeacad431b4994cd29 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 27 Mar 2023 10:52:52 -0500
Subject: [PATCH 2137/2403] get rid of another debug print

---
 ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
index dd50c7950a..8650522b41 100644
--- a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
+++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
@@ -87,7 +87,6 @@ void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *s
     const mcu_periph_obj_t *left_periph = find_pin_function(mcu_mqs_left_list, left_channel, &instance, MP_QSTR_left_channel);
     const mcu_periph_obj_t *right_periph = find_pin_function(mcu_mqs_right_list, right_channel, &instance, MP_QSTR_right_channel);
 
-    mp_printf(&mp_plat_print, "note: peripheral %d\n", instance);
     sai_transceiver_t config;
     SAI_GetClassicI2SConfig(&config, kSAI_WordWidth16bits, kSAI_Stereo, 1U << 0u);
     config.frameSync.frameSyncEarly = false;

From 1fad969389ee76138c4ae3834724e2bde550ae78 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Sun, 17 Jul 2022 10:17:05 +0200
Subject: [PATCH 2138/2403] add unsigned ints and 64 bit types to msgpack
 change msgpack error message when format invalid

---
 locale/circuitpython.pot         |  8 +++---
 shared-module/msgpack/__init__.c | 42 +++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 55ab977e97..b5026f7829 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -400,10 +400,6 @@ msgstr ""
 msgid "3-arg pow() not supported"
 msgstr ""
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1271,6 +1267,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr ""
diff --git a/shared-module/msgpack/__init__.c b/shared-module/msgpack/__init__.c
index d32550722c..3a34731d77 100644
--- a/shared-module/msgpack/__init__.c
+++ b/shared-module/msgpack/__init__.c
@@ -102,6 +102,16 @@ STATIC uint32_t read4(msgpack_stream_t *s) {
     return res;
 }
 
+STATIC uint64_t read8(msgpack_stream_t *s) {
+    uint64_t res = 0;
+    read(s, &res, 8);
+    int n = 1;
+    if (*(char *)&n == 1) {
+        res = __builtin_bswap64(res);
+    }
+    return res;
+}
+
 STATIC size_t read_size(msgpack_stream_t *s, uint8_t len_index) {
     size_t res = 0;
     switch (len_index) {
@@ -207,7 +217,7 @@ STATIC void pack_bin(msgpack_stream_t *s, const uint8_t *data, size_t len) {
     }
 }
 
-STATIC void  pack_ext(msgpack_stream_t *s, int8_t code, const uint8_t *data, size_t len) {
+STATIC void pack_ext(msgpack_stream_t *s, int8_t code, const uint8_t *data, size_t len) {
     if (len == 1) {
         write1(s, 0xd4);
     } else if (len == 2) {
@@ -424,22 +434,39 @@ STATIC mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list) {
             return unpack_bytes(s, read_size(s, code - 0xc4));
         }
         case 0xcc: // uint8
+            return MP_OBJ_NEW_SMALL_INT((uint8_t)read1(s));
         case 0xd0: // int8
             return MP_OBJ_NEW_SMALL_INT((int8_t)read1(s));
         case 0xcd: // uint16
+            return MP_OBJ_NEW_SMALL_INT((uint16_t)read2(s));
         case 0xd1: // int16
             return MP_OBJ_NEW_SMALL_INT((int16_t)read2(s));
         case 0xce: // uint32
+            return mp_obj_new_int_from_uint((uint32_t)read4(s));
         case 0xd2: // int32
-            return MP_OBJ_NEW_SMALL_INT((int32_t)read4(s));
-        case 0xca: {
-            union Float { mp_float_t f;
-                          uint32_t u;
+            return mp_obj_new_int((int32_t)read4(s));
+        case 0xcf: // uint 64
+            return mp_obj_new_int_from_ull((uint64_t)read8(s));
+        case 0xd3: // int 64
+            return mp_obj_new_int_from_ll((int64_t)read8(s));
+        case 0xca: { // float
+            union Float {
+                mp_float_t f;
+                uint32_t u;
             };
             union Float data;
             data.u = read4(s);
             return mp_obj_new_float(data.f);
         }
+        case 0xcb: { // double
+            union Double {
+                uint64_t u;
+                double d;
+            };
+            union Double data;
+            data.u = read8(s);
+            return mp_obj_new_float_from_d(data.d);
+        }
         case 0xd9:
         case 0xda:
         case 0xdb: {
@@ -483,11 +510,8 @@ STATIC mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list) {
             // ext 8, 16, 32
             return unpack_ext(s, read_size(s, code - 0xc7), ext_hook);
         case 0xc1:      // never used
-        case 0xcb:      // float 64
-        case 0xcf:      // uint 64
-        case 0xd3:      // int 64
         default:
-            mp_raise_NotImplementedError(translate("64 bit types"));
+            mp_raise_ValueError(translate("Invalid format"));
     }
 }
 

From 16854ae57084659390ed14f1dc69afa4f5547bc6 Mon Sep 17 00:00:00 2001
From: Kattni Rembor 
Date: Mon, 27 Mar 2023 16:29:03 -0400
Subject: [PATCH 2139/2403] Add BUTTON, reorganise pins.

---
 .../raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
index e014ace05a..368f96b6fe 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -19,8 +19,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
 
-    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
@@ -31,10 +32,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
 
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
     { MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D0N), MP_ROM_PTR(&pin_GPIO18) },

From ca23f1e1acf573d8922bef35df2d4235f26d3aad Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 27 Mar 2023 16:52:01 -0500
Subject: [PATCH 2140/2403] attempt to fix missing jquery in RTD

---
 conf.py              | 1 +
 requirements-doc.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/conf.py b/conf.py
index 7b3b4ca585..ea5072ae4c 100644
--- a/conf.py
+++ b/conf.py
@@ -77,6 +77,7 @@ needs_sphinx = '1.3'
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
+    "sphinxcontrib.jquery",
     'sphinxcontrib.rsvgconverter',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
diff --git a/requirements-doc.txt b/requirements-doc.txt
index 43e99fa32f..0489dc0b9f 100644
--- a/requirements-doc.txt
+++ b/requirements-doc.txt
@@ -13,6 +13,7 @@ sphinx!=5.2.0.post0
 sphinx-autoapi
 sphinx-rtd-theme
 sphinxcontrib-svg2pdfconverter
+sphinxcontrib-jquery
 readthedocs-sphinx-search
 myst-parser
 

From 89bd5fae616ec6d403d820bb470a5375789ccf5d Mon Sep 17 00:00:00 2001
From: CDario 
Date: Tue, 28 Mar 2023 06:28:56 +0000
Subject: [PATCH 2141/2403] Add M5stack AtomS3 Lite

---
 .../boards/m5stack_atoms3_lite/board.c        | 29 +++++++++++++
 .../m5stack_atoms3_lite/mpconfigboard.h       | 36 ++++++++++++++++
 .../m5stack_atoms3_lite/mpconfigboard.mk      | 11 +++++
 .../boards/m5stack_atoms3_lite/pins.c         | 42 +++++++++++++++++++
 .../boards/m5stack_atoms3_lite/sdkconfig      |  7 ++++
 5 files changed, 125 insertions(+)
 create mode 100644 ports/espressif/boards/m5stack_atoms3_lite/board.c
 create mode 100644 ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_atoms3_lite/pins.c
 create mode 100644 ports/espressif/boards/m5stack_atoms3_lite/sdkconfig

diff --git a/ports/espressif/boards/m5stack_atoms3_lite/board.c b/ports/espressif/boards/m5stack_atoms3_lite/board.c
new file mode 100644
index 0000000000..164430c88c
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atoms3_lite/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.h b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.h
new file mode 100644
index 0000000000..43dd436345
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack AtomS3 Lite"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO35)
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO39, .sda = &pin_GPIO38}, \
+                                     {.scl = &pin_GPIO1, .sda = &pin_GPIO2}}
diff --git a/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
new file mode 100644
index 0000000000..8bb5ab76d8
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x303A
+USB_PID = 0x815F
+USB_PRODUCT = "M5Stack AtomS3 Lite"
+USB_MANUFACTURER = "M5Stack"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atoms3_lite/pins.c b/ports/espressif/boards/m5stack_atoms3_lite/pins.c
new file mode 100644
index 0000000000..052c15e69f
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atoms3_lite/pins.c
@@ -0,0 +1,42 @@
+#include "shared-bindings/board/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO41) },
+
+    { MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_atoms3_lite/sdkconfig b/ports/espressif/boards/m5stack_atoms3_lite/sdkconfig
new file mode 100644
index 0000000000..9d924272ec
--- /dev/null
+++ b/ports/espressif/boards/m5stack_atoms3_lite/sdkconfig
@@ -0,0 +1,7 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=n
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP

From a481c564da37beeaa5d88b08a33103901b803839 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 28 Mar 2023 14:00:03 +0200
Subject: [PATCH 2142/2403] change Peer(encrypt=) to encrypted to match the
 property

---
 ports/espressif/bindings/espnow/Peer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
index 89766dbf11..5c21dafc4c 100644
--- a/ports/espressif/bindings/espnow/Peer.c
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -44,7 +44,7 @@
 //|         lmk: Optional[bytes],
 //|         channel: int = 0,
 //|         interface: int = 0,
-//|         encrypt: bool = False,
+//|         encrypted: bool = False,
 //|     ) -> None:
 //|         """Construct a new peer object.
 //|
@@ -52,17 +52,17 @@
 //|         :param bytes lmk: The Local Master Key (lmk) of the peer.
 //|         :param int channel: The peer's channel. Default: 0 ie. use the current channel.
 //|         :param int interface: The WiFi interface to use. Default: 0 ie. STA.
-//|         :param bool encrypt: Whether or not to use encryption.
+//|         :param bool encrypted: Whether or not to use encryption.
 //|         """
 //|         ...
 STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypt };
+    enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypted };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mac,      MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_lmk,      MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = mp_const_none } },
         { MP_QSTR_channel,  MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
         { MP_QSTR_interface,MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
-        { MP_QSTR_encrypt,  MP_ARG_BOOL | MP_ARG_KW_ONLY,{ .u_bool = false } },
+        { MP_QSTR_encrypted,MP_ARG_BOOL | MP_ARG_KW_ONLY, { .u_bool = false } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -82,7 +82,7 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(args[ARG_interface].u_int, 0, 1, MP_QSTR_interface);
 
-    self->peer_info.encrypt = args[ARG_encrypt].u_bool;
+    self->peer_info.encrypt = args[ARG_encrypted].u_bool;
 
     const mp_obj_t lmk = args[ARG_lmk].u_obj;
     if (lmk != mp_const_none) {

From 02c628a3c70870557c83477a78b6a85a87f40bb7 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 28 Mar 2023 14:36:43 +0200
Subject: [PATCH 2143/2403] Update ports/espressif/bindings/espnow/ESPNow.c

Co-authored-by: MicroDev <70126934+microdev1@users.noreply.github.com>
---
 ports/espressif/bindings/espnow/ESPNow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 06c186d210..32676bc9be 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -53,7 +53,7 @@ static void espnow_check_for_deinit(espnow_obj_t *self) {
 //| class ESPNow:
 //|     """Provides access to the ESP-NOW protocol."""
 //|
-//|     def __init__(self, buffer_size: int = 526, phy_rate: Optional[int] = None) -> None:
+//|     def __init__(self, buffer_size: int = 526, phy_rate: int = 0) -> None:
 //|         """Allocate and initialize `ESPNow` instance as a singleton.
 //|
 //|         :param int buffer_size: The size of the internal ring buffer. Default: 526 bytes.

From f7c2599c293dde3e790adc4cb337ae1e9195261e Mon Sep 17 00:00:00 2001
From: Luc 
Date: Mon, 27 Mar 2023 19:20:28 +0000
Subject: [PATCH 2144/2403] Translated using Weblate (German)

Currently translated at 100.0% (1002 of 1002 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/
---
 locale/de_DE.po | 163 ++++++++++++++++++++++++++----------------------
 1 file changed, 87 insertions(+), 76 deletions(-)

diff --git a/locale/de_DE.po b/locale/de_DE.po
index 68b1152895..98d4f651de 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-03-26 22:37+0000\n"
+"PO-Revision-Date: 2023-03-28 14:18+0000\n"
 "Last-Translator: Luc \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -37,12 +37,17 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Bitte erstellen Sie ein Problem (Issue) für Ihr Programm unter https://github"
+".com/adafruit/circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Drücke Reset, um den Sicherheitsmodus zu beenden.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -189,7 +194,7 @@ msgstr "%q muss >= %d sein"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q muss ein Bytearray oder ein Array vom Typ 'H' oder 'B' sein"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
@@ -602,7 +607,7 @@ msgstr "Bitmap-Grösse und Bits pro Wert müssen übereinstimmen"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "Boot-Device muss an erster Stelle kommen (Interface #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -792,9 +797,8 @@ msgstr ""
 "Die Frequenz eines bereits verwendeten Timers kann nicht variiert werden"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
-#, fuzzy
 msgid "Cannot wake on pin edge, only level"
-msgstr "Kann nicht durch \"Pin edge\" geweckt werden nur durch \"level\""
+msgstr "Kann nicht durch Flanke an Pin geweckt werden, sondern nur durch Pegel"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -1121,12 +1125,13 @@ msgstr "Hardware in Benutzung, probiere alternative Pins"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Allokation auf Heap während VM nicht läuft."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
 msgstr ""
+"Heap wurde beschädigt, weil der Stack zu klein war. Bitte Stack vergrößern."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1325,7 +1330,7 @@ msgstr "Ungültiger Zustand"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Ungültiges Unicode-Escape-Zeichen"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1720,7 +1725,7 @@ msgstr "Zeit für Vorgang abgelaufen"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "Keine freien Slots für MDNS-Dienst mehr verfügbar"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
@@ -1826,7 +1831,7 @@ msgstr "Polygone brauchen mindestens 3 Punkte"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Prefix buffer must be on the heap"
-msgstr "Der Präfix-Puffer muss sich auf dem Heap befinden"
+msgstr "Präfix-Puffer muss sich auf dem Heap befinden"
 
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
@@ -1874,7 +1879,7 @@ msgstr "RNG DeInit-Fehler"
 
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG Init Error"
-msgstr "RNG Init-Fehler"
+msgstr "RNG-Init-Fehler"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
@@ -2015,7 +2020,7 @@ msgstr "SocketPool kann nur mit wifi.radio verwendet werden"
 
 #: shared-bindings/aesio/aes.c
 msgid "Source and destination buffers must be the same length"
-msgstr "Quell- und Zielbuffer müssen gleich lang sein"
+msgstr "Quell- und Zielpuffer müssen gleich lang sein"
 
 #: shared-bindings/paralleldisplay/ParallelBus.c
 msgid "Specify exactly one of data0 or data_pins"
@@ -2035,7 +2040,7 @@ msgstr "Stereo rechts muss sich auf PWM-Kanal B befinden"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Das Stoppen des AP wird nicht unterstützt."
 
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
@@ -2052,6 +2057,8 @@ msgstr "Zeitüberschreitung beim Auslesen der Temperatur"
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
 msgstr ""
+"Das 'microcontroller'-Modul wurde benutzt, um in den Sichheitsmodus zu "
+"booten."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
@@ -2065,6 +2072,8 @@ msgstr "Die Länge von rgb_pins muss 6, 12, 18, 24 oder 30 betragen"
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
 msgstr ""
+"Die Spannung ist eingebrochen. Stelle sicher, dass genügend Leistung "
+"verfügbar ist."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2073,7 +2082,7 @@ msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's channel count does not match the mixer's"
-msgstr "Die Kanalanzahl des Samples stimmt nicht mit der des Mixers überein"
+msgstr "Die Kanalanzahl des Samples stimmt nicht mit der des Mischers überein"
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's sample rate does not match the mixer's"
@@ -2081,12 +2090,11 @@ msgstr "Die Abtastrate der Probe stimmt nicht mit der des Mischers überein"
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's signedness does not match the mixer's"
-msgstr ""
-"Die Art des Vorzeichens des Samples stimmt nicht mit dem des Mixers überein"
+msgstr "Der Vorzeichentyp des Samples stimmt nicht mit dem des Mixers überein"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Fataler Fehler bei Drittanbieter-Firmware."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
@@ -2106,7 +2114,7 @@ msgstr "Die Kachelhöhe muss die Bitmaphöhe genau teilen"
 
 #: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
 msgid "Tile index out of bounds"
-msgstr "Kachel index außerhalb der Grenzen"
+msgstr "Kachelindex außerhalb der Grenzen"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "Tile width must exactly divide bitmap width"
@@ -2133,7 +2141,7 @@ msgstr "Zu viele Kanäle im sample."
 
 #: shared-module/displayio/__init__.c
 msgid "Too many display busses"
-msgstr "Zu viele Display Busse"
+msgstr "Zu viele Anzeigebusse"
 
 #: shared-module/displayio/__init__.c
 msgid "Too many displays"
@@ -2169,7 +2177,7 @@ msgstr "UART-Initialisierung"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "UART-Endgerät in Benutzung"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
@@ -2220,12 +2228,12 @@ msgstr "Konnte keine Buffer für Vorzeichenumwandlung allozieren"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Keine Allokation auf dem Heap möglich."
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "ADC-DMA-Controller konnte nicht konfiguriert werden, Fehlercode: %d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2248,7 +2256,7 @@ msgstr "Parser konnte nicht gestartet werden"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "ADC-DMA-Controller konnte nicht initialisiert werden, Fehlercode: %d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2257,7 +2265,7 @@ msgstr "Konnte Farbpalettendaten nicht lesen"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "ADC-DMA-Controller konnte nicht gestartet werden, Fehlercode: %d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
@@ -2298,7 +2306,7 @@ msgstr "Unbekannter BLE-Fehler: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Unbekannter Fehlercode %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format
@@ -2376,7 +2384,7 @@ msgstr "Update fehlgeschlagen"
 #: ports/nrf/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Descriptor.c
 msgid "Value length != required fixed length"
-msgstr "Wert Länge != Erforderliche feste Länge"
+msgstr "Länge des Wertes != Erforderliche feste Länge"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/espressif/common-hal/_bleio/Descriptor.c
@@ -2437,11 +2445,11 @@ msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "Das Wifi ist im Accesspoint-Modus."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "Das Wifi ist im Station-Modus."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
@@ -2454,59 +2462,59 @@ msgstr "Aufgeweckt durch Alarm.\n"
 #: ports/espressif/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/PacketBuffer.c
 msgid "Writes not supported on Characteristic"
-msgstr "Schreiben nicht unterstüzt für diese Charakteristik"
+msgstr "Schreiben für diese Charakteristik nicht unterstützt"
 
 #: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "Beide Knöpfe wurden beim Starten gedrückt."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "Knopf A wurde beim Starten gedrückt."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "Der BOOT-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "Der GPIO0-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "Der Rec-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "Der SW38-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "Der VOLUME-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "Der zentrale Knopf wurde beim Starten gedrückt."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "Der linke Knopf wurde beim Starten gedrückt."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "Der Reset-Knopf wurde beim Booten gedrückt."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[abgeschnitten wegen der Länge]"
 
 #: py/objtype.c
 msgid "__init__() should return None"
@@ -2579,7 +2587,7 @@ msgstr "Das Array hat zu viele Dimensionen"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "Array ist zu groß"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -2794,8 +2802,8 @@ msgstr "kann keinen relativen Import durchführen"
 #: py/objgenerator.c
 msgid "can't send non-None value to a just-started generator"
 msgstr ""
-"Nicht \"None\" Werte können nicht an einen gerade gestarteten Generator "
-"gesendet werden"
+"Nicht-None-Wert kann nicht an einen gerade gestarteten Generator gesendet "
+"werden"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "can't set 512 block size"
@@ -2807,7 +2815,7 @@ msgstr "kann Attribut nicht setzen"
 
 #: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "Attribut '%q' kann nicht gesetzt werden"
 
 #: py/emitnative.c
 msgid "can't store '%q'"
@@ -2877,7 +2885,7 @@ msgstr "Kanal wird erneut initialisiert"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
-msgstr "(char) Zeichenpuffer zu klein"
+msgstr "Zeichenpuffer zu klein"
 
 #: py/modbuiltins.c
 msgid "chr() arg not in range(0x110000)"
@@ -2943,7 +2951,7 @@ msgstr "Convolve-Argumente müssen ndarrays sein"
 
 #: extmod/ulab/code/numpy/filter.c
 msgid "convolve arguments must not be empty"
-msgstr "Convolve Argumente dürfen nicht leer sein"
+msgstr "Faltungsargumente dürfen nicht leer sein"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
@@ -2994,8 +3002,8 @@ msgstr "default ist keine Funktion"
 msgid ""
 "destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
 msgstr ""
-"Der Zielbuffer muss ein Bytearray oder ein Array vom Typ 'B' für bit_depth = "
-"8 sein"
+"Zielpuffer muss ein Bytearray oder ein Array vom Typ 'B' für bit_depth = 8 "
+"sein"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "destination buffer must be an array of type 'H' for bit_depth = 16"
@@ -3055,7 +3063,7 @@ msgstr "leere Sequenz"
 
 #: py/objstr.c
 msgid "end of format while looking for conversion specifier"
-msgstr "Ende des Formats wärend der Suche nach einem conversion specifier"
+msgstr "Ende des Formats bei der Suche nach einem Konvertierungsspezifizierer"
 
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "epoch_time not supported on this board"
@@ -3071,6 +3079,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera.Camera benötigt reservierten PSRAM um konfiguriert zu werden. "
+"Siehe Dokumentation für Anweisungen."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3290,7 +3300,7 @@ msgstr "Index ist außerhalb der Grenzen"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "Index muss tuple oder int sein"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3482,7 +3492,7 @@ msgstr "issubclass() arg 2 muss eine Klasse oder ein Tupel von Klassen sein"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "iterations did not converge"
-msgstr "Iterationen sind nicht konvergiert (converged)"
+msgstr "Iterationen sind nicht konvergiert"
 
 #: py/objstr.c
 msgid "join expects a list of str/bytes objects consistent with self object"
@@ -3550,7 +3560,7 @@ msgstr "mDNS funktioniert nur mit integriertem WiFi"
 
 #: py/parse.c
 msgid "malformed f-string"
-msgstr "fehlformatierter f-string"
+msgstr "fehlerhafter F-String"
 
 #: shared-bindings/_stage/Layer.c
 msgid "map buffer too small"
@@ -3634,7 +3644,7 @@ msgstr "Mehrfache Vererbung nicht unterstützt"
 
 #: py/emitnative.c
 msgid "must raise an object"
-msgstr "muss ein Objekt verursachen (raise)"
+msgstr "muss ein Objekt aufwerfen (raise)"
 
 #: py/modbuiltins.c
 msgid "must use keyword argument for key function"
@@ -3654,7 +3664,7 @@ msgstr "native Methode zu groß"
 
 #: py/emitnative.c
 msgid "native yield"
-msgstr "native Ausbeute (yield)"
+msgstr "natives yield"
 
 #: py/runtime.c
 #, c-format
@@ -3667,15 +3677,15 @@ msgstr "negative Fakultät"
 
 #: py/objint_longlong.c py/objint_mpz.c py/runtime.c
 msgid "negative power with no float support"
-msgstr "negative Potenz ohne Gleitkomma (float) Unterstützung"
+msgstr "negative Potenz ohne Gleitkomma(float)-Unterstützung"
 
 #: py/objint_mpz.c py/runtime.c
 msgid "negative shift count"
-msgstr "Negative shift Anzahl"
+msgstr "Negative Anzahl an Verschiebungen"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "verschachtelter Index muss int sein"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
@@ -3683,11 +3693,11 @@ msgstr "keine SD-Karte"
 
 #: py/vm.c
 msgid "no active exception to reraise"
-msgstr "Keine aktive Ausnahme zu verusachen (raise)"
+msgstr "Keine aktive Ausnahme zum Wiederaufwerfen (reraise)"
 
 #: py/compile.c
 msgid "no binding for nonlocal found"
-msgstr "Kein Binding für nonlocal gefunden"
+msgstr "Keine Bindung für nichtlokale Variable gefunden"
 
 #: shared-module/msgpack/__init__.c
 msgid "no default packer"
@@ -3717,7 +3727,7 @@ msgstr "kein solches Attribut"
 #: ports/espressif/common-hal/_bleio/Connection.c
 #: ports/nrf/common-hal/_bleio/Connection.c
 msgid "non-UUID found in service_uuids_whitelist"
-msgstr "non-UUID gefunden in service_uuids_whitelist"
+msgstr "Nicht-UUID in service_uuids_whitelist gefunden"
 
 #: py/compile.c
 msgid "non-default argument follows default argument"
@@ -3733,7 +3743,7 @@ msgstr "Nicht-Schlüsselwort arg nach * / **"
 
 #: py/compile.c
 msgid "non-keyword arg after keyword arg"
-msgstr "Nicht-Schlüsselwort Argument nach Schlüsselwort Argument"
+msgstr "Nicht-Schlüsselwort-Argument nach Schlüsselwort-Argument"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "non-zero timeout must be > 0.01"
@@ -3750,11 +3760,12 @@ msgstr "keine 128-bit UUID"
 #: py/objstr.c
 msgid "not all arguments converted during string formatting"
 msgstr ""
-"Nicht alle Argumente wurden während der Formatierung des Strings konvertiert"
+"Nicht alle Argumente wurden während der Formatierung der Zeichenfolge "
+"konvertiert"
 
 #: py/objstr.c
 msgid "not enough arguments for format string"
-msgstr "Nicht genügend Argumente für den Formatierungs-String"
+msgstr "Nicht genügend Argumente für die Formatzeichenfolge"
 
 #: extmod/ulab/code/numpy/carray/carray_tools.c
 msgid "not implemented for complex dtype"
@@ -3850,11 +3861,11 @@ msgstr "nur Mono wird unterstützt"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "nur ndarrays können aneinandergehängt werden"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "nur oversample=64 wird unterstützt"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c
@@ -3891,7 +3902,7 @@ msgstr "Operation wird nur für boolesche 1D-Arrays implementiert"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "operation is not implemented on ndarrays"
-msgstr "Die Operation ist für ndarrays nicht implementiert"
+msgstr "Operation ist auf ndarrays nicht implementiert"
 
 #: extmod/ulab/code/ndarray.c
 msgid "operation is not supported for given type"
@@ -3943,7 +3954,7 @@ msgstr "Die Parameter müssen Register der Reihenfolge a2 bis a5 sein"
 
 #: py/emitinlinethumb.c
 msgid "parameters must be registers in sequence r0 to r3"
-msgstr "Die Parameter müssen Register der Reihenfolge r0 bis r3 sein"
+msgstr "Parameter müssen Register im Bereich von r0 bis r3 sein"
 
 #: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "pixel coordinates out of bounds"
@@ -3984,7 +3995,7 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
 
 #: py/objint_mpz.c
 msgid "pow() with 3 arguments requires integers"
-msgstr "pow() mit 3 Argumenten erfordert Integer"
+msgstr "pow() mit 3 Argumenten erfordert ganze Zahlen"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
@@ -4016,7 +4027,7 @@ msgstr "Rückgabewert-Beschreibung muss ein Identifier sein"
 
 #: py/emitnative.c
 msgid "return expected '%q' but got '%q'"
-msgstr "Rückgabe erwartet '%q', aber '%q' erhalten"
+msgstr "Rückgabe (return) erwartet '%q', hat aber '%q' erhalten"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -4026,7 +4037,7 @@ msgstr "rgb_pins[%d] dupliziert eine andere Pinbelegung"
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid "rgb_pins[%d] is not on the same port as clock"
-msgstr "rgb_pins [%d] befindet sich nicht am selben Port wie clock"
+msgstr "rgb_pins[%d] befindet sich nicht am selben Port wie clock"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "roll argument must be an ndarray"
@@ -4063,7 +4074,7 @@ msgstr "kurze Lektüre"
 
 #: py/objstr.c
 msgid "sign not allowed in string format specifier"
-msgstr "Vorzeichen nicht erlaubt in einem String formatierungs specifier"
+msgstr "Vorzeichen im Zeichenfolgenformatbezeichner nicht zulässig"
 
 #: py/objstr.c
 msgid "sign not allowed with integer format specifier 'c'"
@@ -4095,7 +4106,7 @@ msgstr "weicher reboot\n"
 
 #: extmod/ulab/code/numpy/numerical.c
 msgid "sort argument must be an ndarray"
-msgstr "sortierungs Argument muss ein ndarray sein"
+msgstr "Sortierungsargument muss ein ndarray sein"
 
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "sos array must be of shape (n_section, 6)"
@@ -4215,7 +4226,7 @@ msgstr "zu viele Lokale für die native Methode"
 #: py/runtime.c
 #, c-format
 msgid "too many values to unpack (expected %d)"
-msgstr "zu viele Werte zum Auspacken (erwartet %d)"
+msgstr "zu viele Werte zum Auspacken (%d erwartet)"
 
 #: extmod/ulab/code/numpy/approx.c
 msgid "trapz is defined for 1D arrays of equal length"
@@ -4249,7 +4260,7 @@ msgstr "Typ ist kein akzeptierter Basis-Typ"
 
 #: py/objgenerator.c py/runtime.c
 msgid "type object '%q' has no attribute '%q'"
-msgstr "Typ vom Objekt '%q' hat kein Attribut '%q'"
+msgstr "Typ-Objekt '%q' hat kein Attribut '%q'"
 
 #: py/objtype.c
 msgid "type takes 1 or 3 arguments"
@@ -4279,7 +4290,7 @@ msgstr "unerwartetes Schlüsselwort-Argument '%q'"
 
 #: py/lexer.c
 msgid "unicode name escapes"
-msgstr "Unicode Name ausgebrochen (escaped)"
+msgstr "Escaping von Unicode-Namen"
 
 #: py/parse.c
 msgid "unindent doesn't match any outer indent level"
@@ -4288,7 +4299,7 @@ msgstr "unindent stimmt mit keiner äußeren Einrückungsebene überein"
 #: py/objstr.c
 #, c-format
 msgid "unknown conversion specifier %c"
-msgstr "unbekannter Konvertierungs specifier %c"
+msgstr "unbekannter Konvertierungsspezifizierer %c"
 
 #: py/objstr.c
 msgid "unknown format code '%c' for object of type '%q'"
@@ -4305,7 +4316,7 @@ msgstr "unbekannter Typ '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "'%c' in Format konnte nicht zugeordnet werden"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"

From 128a4f9697de2c86668f4f3087536feca29f088c Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Tue, 28 Mar 2023 16:18:27 +0200
Subject: [PATCH 2145/2403] 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             | 11 +++++++----
 locale/de_DE.po          | 15 +++++++++------
 locale/el.po             | 13 ++++++++-----
 locale/en_GB.po          | 11 +++++++----
 locale/es.po             | 11 +++++++----
 locale/fil.po            |  8 ++++----
 locale/fr.po             | 11 +++++++----
 locale/hi.po             |  8 ++++----
 locale/it_IT.po          | 11 +++++++----
 locale/ja.po             |  8 ++++----
 locale/ko.po             |  8 ++++----
 locale/nl.po             |  8 ++++----
 locale/pl.po             |  8 ++++----
 locale/pt_BR.po          | 11 +++++++----
 locale/ru.po             | 11 +++++++----
 locale/sv.po             | 11 +++++++----
 locale/tr.po             | 11 +++++++----
 locale/zh_Latn_pinyin.po | 11 +++++++----
 19 files changed, 115 insertions(+), 79 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 0affac3ed4..21d3e4a4c2 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -403,10 +403,6 @@ msgstr "0.0 ke kompleks berpangkat"
 msgid "3-arg pow() not supported"
 msgstr "pow() 3-arg tidak didukung"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1283,6 +1279,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Ukuran potongan format tidak valid"
diff --git a/locale/cs.po b/locale/cs.po
index 7af7d489b1..a8d09ade34 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -404,10 +404,6 @@ msgstr ""
 msgid "3-arg pow() not supported"
 msgstr "pow() nepodporuje 3 argumenty"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64 bit typy"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1283,6 +1279,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr "Chybný data_pin[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Neplatná velikost bloku"
@@ -4382,6 +4382,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "64 bit types"
+#~ msgstr "64 bit typy"
+
 #~ msgid "No key was specified"
 #~ msgstr "Nebyl zadán klíč"
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 98d4f651de..ab543ccea4 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -38,8 +38,8 @@ msgid ""
 "circuitpython/issues."
 msgstr ""
 "\n"
-"Bitte erstellen Sie ein Problem (Issue) für Ihr Programm unter https://github"
-".com/adafruit/circuitpython/issues."
+"Bitte erstellen Sie ein Problem (Issue) für Ihr Programm unter https://"
+"github.com/adafruit/circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -414,10 +414,6 @@ msgstr "0.0 zu einer komplexen Potenz"
 msgid "3-arg pow() not supported"
 msgstr "3-arg pow() wird nicht unterstützt"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64 bit-Typen"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1307,6 +1303,10 @@ msgstr "Ungültiges Byte %.*s"
 msgid "Invalid data_pins[%d]"
 msgstr "Ungültige data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Ungültige format chunk size"
@@ -4469,6 +4469,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "64 bit types"
+#~ msgstr "64 bit-Typen"
+
 #~ msgid "No key was specified"
 #~ msgstr "Es wurde kein Schlüssel angegeben"
 
diff --git a/locale/el.po b/locale/el.po
index ab4b2d9b90..3336cbae67 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -408,11 +408,6 @@ msgstr "0.0 σε μία σύνθετη δύναμη"
 msgid "3-arg pow() not supported"
 msgstr "pow() με 3 παραμέτρους δεν υποστηρίζεται"
 
-#: shared-module/msgpack/__init__.c
-#, fuzzy
-msgid "64 bit types"
-msgstr "64 bit τύποι"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1292,6 +1287,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr ""
@@ -4390,6 +4389,10 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "64 bit types"
+#~ msgstr "64 bit τύποι"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q άκυρο pin"
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index e2d9cd9f13..9c26f47d45 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -407,10 +407,6 @@ msgstr "0.0 to a complex power"
 msgid "3-arg pow() not supported"
 msgstr "3-arg pow() not supported"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64 bit types"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1284,6 +1280,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr "Invalid data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Invalid format chunk size"
@@ -4393,6 +4393,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 "64 bit types"
+#~ msgstr "64 bit types"
+
 #~ msgid "No key was specified"
 #~ msgstr "No key was specified"
 
diff --git a/locale/es.po b/locale/es.po
index 9578e4048a..d5db9c0c88 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -415,10 +415,6 @@ msgstr "0.0 a una potencia compleja"
 msgid "3-arg pow() not supported"
 msgstr "pow() con 3 argumentos no soportado"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "tipos de 64 bit"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1317,6 +1313,10 @@ msgstr "byte %.*s Inválido"
 msgid "Invalid data_pins[%d]"
 msgstr "Inválidos los data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Formato de fragmento de formato no válido"
@@ -4466,6 +4466,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 "64 bit types"
+#~ msgstr "tipos de 64 bit"
+
 #~ msgid "No key was specified"
 #~ msgstr "No se especificó ninguna llave"
 
diff --git a/locale/fil.po b/locale/fil.po
index 86677af69b..f83cfb1173 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -402,10 +402,6 @@ msgstr "0.0 para sa complex power"
 msgid "3-arg pow() not supported"
 msgstr "3-arg pow() hindi suportado"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1283,6 +1279,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Mali ang format ng chunk size"
diff --git a/locale/fr.po b/locale/fr.po
index 812f09b454..e536cbd346 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -412,10 +412,6 @@ msgstr "0.0 à une puissance complexe"
 msgid "3-arg pow() not supported"
 msgstr "pow() non supporté avec 3 paramètres"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "types à 64 bit"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1323,6 +1319,10 @@ msgstr "Octet invalide %.*s"
 msgid "Invalid data_pins[%d]"
 msgstr "data_pins[%d] invalide"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Taille de bloc de formatage invalide"
@@ -4485,6 +4485,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 "64 bit types"
+#~ msgstr "types à 64 bit"
+
 #~ msgid "No key was specified"
 #~ msgstr "Aucune clé n'a été spécifiée"
 
diff --git a/locale/hi.po b/locale/hi.po
index 75efddc294..977cd4986a 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -400,10 +400,6 @@ msgstr ""
 msgid "3-arg pow() not supported"
 msgstr ""
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1271,6 +1267,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index e8d32b163e..b4e998f698 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -405,10 +405,6 @@ msgstr "0.0 elevato alla potenza di un numero complesso"
 msgid "3-arg pow() not supported"
 msgstr "pow() con tre argmomenti non supportata"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "Tipo 64 bits"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1285,6 +1281,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr ""
@@ -4415,6 +4415,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "64 bit types"
+#~ msgstr "Tipo 64 bits"
+
 #~ msgid "too many arguments provided with the given format"
 #~ msgstr "troppi argomenti forniti con il formato specificato"
 
diff --git a/locale/ja.po b/locale/ja.po
index f90abd66da..ab8ca26d28 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -407,10 +407,6 @@ msgstr "0.0を複素数でべき乗"
 msgid "3-arg pow() not supported"
 msgstr "引数3つのpow()は非対応"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1284,6 +1280,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "フォーマットチャンクのサイズが不正"
diff --git a/locale/ko.po b/locale/ko.po
index fbb45ed195..21b5cdecd6 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -401,10 +401,6 @@ msgstr ""
 msgid "3-arg pow() not supported"
 msgstr ""
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1274,6 +1270,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "형식 청크 크기가 잘못되었습니다"
diff --git a/locale/nl.po b/locale/nl.po
index f9faf2a6a5..50a0ab6d99 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -400,10 +400,6 @@ msgstr "0.0 tot een complexe macht"
 msgid "3-arg pow() not supported"
 msgstr "3-arg pow() niet ondersteund"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1279,6 +1275,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Ongeldig formaat stuk grootte"
diff --git a/locale/pl.po b/locale/pl.po
index 4fc4337a55..e873e45a51 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -402,10 +402,6 @@ msgstr "0.0 do potęgi zespolonej"
 msgid "3-arg pow() not supported"
 msgstr "3-argumentowy pow() jest niewspierany"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1279,6 +1275,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr ""
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Zła wielkość fragmentu formatu"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index a684aacfb1..6968cfbb84 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -417,10 +417,6 @@ msgstr "0,0 para uma potência complexa"
 msgid "3-arg pow() not supported"
 msgstr "3-arg pow() não compatível"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "Tipos 64 bit"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1313,6 +1309,10 @@ msgstr "Byte %.*s inválido"
 msgid "Invalid data_pins[%d]"
 msgstr "data_pins[%d] inválido"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Tamanho do pedaço de formato inválido"
@@ -4466,6 +4466,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 "64 bit types"
+#~ msgstr "Tipos 64 bit"
+
 #~ msgid "No key was specified"
 #~ msgstr "Nenhuma chave foi definida"
 
diff --git a/locale/ru.po b/locale/ru.po
index c2e6ccc265..e2c1eae4f1 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -407,10 +407,6 @@ msgstr "0.0 в комплексную степень"
 msgid "3-arg pow() not supported"
 msgstr "3-аргументный pow() не поддерживается"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64-битные типы"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1316,6 +1312,10 @@ msgstr "Неверный байт %.*s"
 msgid "Invalid data_pins[%d]"
 msgstr "Неверный data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Неверный размер блока формата"
@@ -4430,6 +4430,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "64 bit types"
+#~ msgstr "64-битные типы"
+
 #~ msgid "No key was specified"
 #~ msgstr "Ключ не был указан"
 
diff --git a/locale/sv.po b/locale/sv.po
index bbbe1ad4fb..1cef8c6d7a 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -414,10 +414,6 @@ msgstr "0,0 till ett komplext nummer"
 msgid "3-arg pow() not supported"
 msgstr "3-arguments pow() stöds inte"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64-bitars typer"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1298,6 +1294,10 @@ msgstr "Ogiltig byte %.*s"
 msgid "Invalid data_pins[%d]"
 msgstr "Ogiltig data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Ogiltig formatsegmentstorlek"
@@ -4428,6 +4428,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 "64 bit types"
+#~ msgstr "64-bitars typer"
+
 #~ msgid "No key was specified"
 #~ msgstr "Ingen nyckel angavs"
 
diff --git a/locale/tr.po b/locale/tr.po
index 62c5fc9dc2..f785cff4fc 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -409,10 +409,6 @@ msgstr "0.0'dan bir karmaşık güce"
 msgid "3-arg pow() not supported"
 msgstr "3-argümanlı pow() desteklenmemektedir"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64 bit tipler"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1290,6 +1286,10 @@ msgstr ""
 msgid "Invalid data_pins[%d]"
 msgstr "Geçersiz veri_pini [%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Geçersiz biçim yığın boyutu"
@@ -4389,6 +4389,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "64 bit types"
+#~ msgstr "64 bit tipler"
+
 #~ msgid "%q pin invalid"
 #~ msgstr "%q pini geçersiz"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 98876f3cdb..2246687ef3 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -416,10 +416,6 @@ msgstr "0.0 de fùshù cì mì"
 msgid "3-arg pow() not supported"
 msgstr "bù zhī chí 3-arg pow()"
 
-#: shared-module/msgpack/__init__.c
-msgid "64 bit types"
-msgstr "64 wèi lèixíng"
-
 #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/atmel-samd/common-hal/countio/Counter.c
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1305,6 +1301,10 @@ msgstr "wú xiào zì jié %.*s"
 msgid "Invalid data_pins[%d]"
 msgstr "wú xiào data_pins[%d]"
 
+#: shared-module/msgpack/__init__.c
+msgid "Invalid format"
+msgstr ""
+
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
 msgstr "Géshì kuài dàxiǎo wúxiào"
@@ -4434,6 +4434,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 "64 bit types"
+#~ msgstr "64 wèi lèixíng"
+
 #~ msgid "No key was specified"
 #~ msgstr "Wèi zhǐdìng mì yào"
 

From cb5e1a1e981a970744d0a53626addfb608c9091d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 28 Mar 2023 09:20:54 -0500
Subject: [PATCH 2146/2403] mimxrt: Fix output frequency for samples that don't
 divide 192kHz

This makes all the samples from Dan's collection register as 440Hz
when playing on pwmio or i2sout, using https://webaudiodemos.appspot.com/pitchdetect/index.html
to detect the frequency played (all should show as A 440Hz; an error
of up to 20 "cents" should be treated as OK)

There's an audible carrier with PWM output and the 8kHz samples. This is
probably a limitation of the peripheral which is documented as being for
input signals of 44 kHz or 48 kHz; the carrier frequency is a fixed
multiple of the sample frequency.

Closes #7800
---
 .../common-hal/audiobusio/__init__.c          | 59 +++++++++++++++++--
 shared-bindings/audiopwmio/PWMAudioOut.c      |  4 ++
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
index 515c39a268..13ae64d27c 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+++ b/ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -42,18 +42,23 @@
 
 /*
  * AUDIO PLL setting: Frequency = Fref * (DIV_SELECT + NUM / DENOM)
- *                              = 24 * (32 + 77/100)
- *                              = 786.48 MHz
+ *                              = 24 * (32 + 96 / 125) = 24 * (32.768)
+ *                              = 786.432 MHz = 48kHz * 16384
+ *
+ * This default clocking is used during initial configuration; it also works well for
+ * frequencies that evenly divide 192kHz, such as 8/12/24/48kHz. However, it doesn't work
+ * well for 44.1/22/11kHz, so there's the possibility of using a different
+ * setting when playing a particular sample.
  */
 const clock_audio_pll_config_t audioPllConfig = {
     .loopDivider = 32,  /* PLL loop divider. Valid range for DIV_SELECT divider value: 27~54. */
     .postDivider = 1,   /* Divider after the PLL, should only be 1, 2, 4, 8, 16. */
-    .numerator = 77,    /* 30 bit numerator of fractional loop divider. */
-    .denominator = 100, /* 30 bit denominator of fractional loop divider */
+    .numerator = 96,    /* 30 bit numerator of fractional loop divider. */
+    .denominator = 125, /* 30 bit denominator of fractional loop divider */
 };
 
 static I2S_Type *const i2s_instances[] = I2S_BASE_PTRS;
-static uint8_t i2s_in_use;
+static uint8_t i2s_in_use, i2s_playing;
 
 static I2S_Type *SAI_GetPeripheral(int idx) {
     if (idx < 0 || idx >= (int)MP_ARRAY_SIZE(i2s_instances)) {
@@ -344,7 +349,11 @@ void port_i2s_deinit(i2s_t *self) {
     }
     SAI_TransferAbortSend(self->peripheral, &self->handle);
     i2s_clock_off(self->peripheral);
-    i2s_in_use &= ~(1 << SAI_GetInstance(self->peripheral));
+
+    uint32_t instance_mask = 1 << SAI_GetInstance(self->peripheral);
+    i2s_in_use &= ~instance_mask;
+    i2s_playing &= ~instance_mask;
+
     if (!i2s_in_use) {
         CCM_ANALOG->PLL_AUDIO = CCM_ANALOG_PLL_AUDIO_BYPASS_MASK | CCM_ANALOG_PLL_AUDIO_POWERDOWN_MASK | CCM_ANALOG_PLL_AUDIO_BYPASS_CLK_SRC(kCLOCK_PllClkSrc24M);
     }
@@ -354,13 +363,51 @@ void port_i2s_deinit(i2s_t *self) {
     }
 }
 
+static uint32_t gcd(uint32_t a, uint32_t b) {
+    while (b) {
+        uint32_t tmp = a % b;
+        a = b;
+        b = tmp;
+    }
+    return a;
+}
+
+static void set_sai_clocking_for_sample_rate(uint32_t sample_rate) {
+    mp_arg_validate_int_range((mp_uint_t)sample_rate, 4000, 192000, MP_QSTR_sample_rate);
+
+    uint32_t target_rate = sample_rate;
+    // ensure the PWM rate of MQS will be adequately high
+    while (target_rate < 175000) {
+        target_rate <<= 1;
+    }
+    target_rate *= 4096; // various prescalers divide by this much
+    uint32_t div = gcd(target_rate % 24000000, 24000000);
+    clock_audio_pll_config_t config = {
+        .loopDivider = target_rate / 24000000,
+        .postDivider = 1,
+        .numerator = (target_rate % 24000000) / div,
+        .denominator = 24000000 / div,
+    };
+    CLOCK_InitAudioPll(&config);
+}
+
 void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop) {
     self->sample = sample;
     self->loop = loop;
     self->bytes_per_sample = audiosample_bits_per_sample(sample) / 8;
     self->channel_count = audiosample_channel_count(sample);
+    int instance = SAI_GetInstance(self->peripheral);
+    i2s_playing |= (1 << instance);
     uint32_t sample_rate = audiosample_sample_rate(sample);
     if (sample_rate != self->sample_rate) {
+        if (__builtin_popcount(i2s_playing) <= 1) {
+            // as this is the first/only i2s instance playing audio, we can
+            // safely change the overall clock used by the SAI peripheral, to
+            // get more accurate frequency reproduction. If another i2s
+            // instance is playing, then we can't touch the audio PLL and have
+            // to live with what we can get, which may be inaccurate
+            set_sai_clocking_for_sample_rate(sample_rate);
+        }
         SAI_TxSetBitClockRate(self->peripheral, SAI_CLOCK_FREQ, sample_rate, 16, 2);
         self->sample_rate = sample_rate;
     }
diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index 56c6412bc6..f05fbfdfe9 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -56,6 +56,10 @@
 //|         :param int quiescent_value: The output value when no signal is present. Samples should start
 //|             and end with this value to prevent audible popping.
 //|
+//|         **Limitations:** On mimxrt10xx, low sample rates may have an audible
+//|         "carrier" frequency. The manufacturer datasheet states that the "MQS" peripheral
+//|         is intended for 44 kHz or 48kHz input signals.
+//|
 //|         Simple 8ksps 440 Hz sin wave::
 //|
 //|           import audiocore

From d28932934482cd5df5871d8276adc1cc812e9fc4 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 28 Mar 2023 11:02:17 -0400
Subject: [PATCH 2147/2403] Handle HID OUT reports with no report ID

---
 shared-module/usb_hid/Device.c | 44 +++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c
index 680bb83893..6f530bfef8 100644
--- a/shared-module/usb_hid/Device.c
+++ b/shared-module/usb_hid/Device.c
@@ -293,24 +293,40 @@ uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t
 // Callback invoked when we receive Set_Report request through control endpoint
 void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t const *buffer, uint16_t bufsize) {
     (void)itf;
-    if (report_type == HID_REPORT_TYPE_INVALID) {
-        report_id = buffer[0];
-        buffer++;
-        bufsize--;
+
+    usb_hid_device_obj_t *hid_device = NULL;
+    size_t id_idx;
+
+    if (report_id == 0 && report_type == HID_REPORT_TYPE_INVALID) {
+        // This could be a report with a non-zero report ID in the first byte, or
+        // it could be for report ID 0.
+        // Heuristic: see if there's a device with report ID 0, and if its report length matches
+        // the size of the incoming buffer. In that case, assume the first byte is not the report ID,
+        // but is data. Otherwise use the first byte as the report id.
+        if (usb_hid_get_device_with_report_id(0, &hid_device, &id_idx) &&
+            hid_device &&
+            hid_device->out_report_buffers[id_idx] &&
+            hid_device->out_report_lengths[id_idx] == bufsize) {
+            // Use as is, with report_id 0.
+        } else {
+            // No matching report ID 0, so use the first byte as the report ID.
+            report_id = buffer[0];
+            buffer++;
+            bufsize--;
+        }
     } else if (report_type != HID_REPORT_TYPE_OUTPUT && report_type != HID_REPORT_TYPE_FEATURE) {
         return;
     }
 
-    usb_hid_device_obj_t *hid_device;
-    size_t id_idx;
-    // Find device with this report id, and get the report id index.
-    if (usb_hid_get_device_with_report_id(report_id, &hid_device, &id_idx)) {
+    // report_id might be changed due to parsing above, so test again.
+    if ((report_id == 0 && report_type == HID_REPORT_TYPE_INVALID) ||
+        // Fetch the matching device if we don't already have the report_id 0 device.
+        (usb_hid_get_device_with_report_id(report_id, &hid_device, &id_idx) &&
+         hid_device &&
+         hid_device->out_report_buffers[id_idx] &&
+         hid_device->out_report_lengths[id_idx] == bufsize)) {
         // If a report of the correct size has been read, save it in the proper OUT report buffer.
-        if (hid_device &&
-            hid_device->out_report_buffers[id_idx] &&
-            hid_device->out_report_lengths[id_idx] >= bufsize) {
-            memcpy(hid_device->out_report_buffers[id_idx], buffer, bufsize);
-            hid_device->out_report_buffers_updated[id_idx] = true;
-        }
+        memcpy(hid_device->out_report_buffers[id_idx], buffer, bufsize);
+        hid_device->out_report_buffers_updated[id_idx] = true;
     }
 }

From 2a4383e633766e01c4c07149161def59c11a576e Mon Sep 17 00:00:00 2001
From: Kattni Rembor 
Date: Tue, 28 Mar 2023 15:23:19 -0400
Subject: [PATCH 2148/2403] Add Feather RP2040 RFM, update DVI.

---
 .../mpconfigboard.h                           |  2 +-
 .../boards/adafruit_feather_rp2040_dvi/pins.c | 32 ++++++-----
 .../adafruit_feather_rp2040_rfm/board.c       | 29 ++++++++++
 .../mpconfigboard.h                           | 14 +++++
 .../mpconfigboard.mk                          |  9 +++
 .../pico-sdk-configboard.h                    |  4 ++
 .../boards/adafruit_feather_rp2040_rfm/pins.c | 57 +++++++++++++++++++
 7 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
index 06cfaf37f6..55b69b4ad8 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.h
@@ -1,7 +1,7 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 DVI"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO16)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO4)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
index 368f96b6fe..c8b4e3474f 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -9,22 +9,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
     { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
 
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
-
-    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
-
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
@@ -32,6 +17,23 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
 
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
 
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.h
new file mode 100644
index 0000000000..fff88cc1fa
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 RFM"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO4)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.mk
new file mode 100644
index 0000000000..161a2b5c2e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x812E
+USB_PRODUCT = "Feather RP2040 RFM"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c
new file mode 100644
index 0000000000..71679fb53b
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c
@@ -0,0 +1,57 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_RFM_CS), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_RST), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO5), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO3), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO4), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO0), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO1), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_RFM_IO2), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 11082435f1d6c916d6274e77e842c0d10cbbff6a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 28 Mar 2023 16:05:17 -0400
Subject: [PATCH 2149/2403] shrink SAMD21 builds by a few hundred bytes

---
 ports/atmel-samd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 343dcf7d63..31e69f36c9 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -116,12 +116,12 @@ else
   # -finline-limit=80 or so is similar to not having it on.
   # There is no simple default value, though.
   ifeq ($(SHRINK_BUILD), 1)
-    CFLAGS += -finline-limit=45
+    CFLAGS += -finline-limit=45 --param max-inline-insns-auto=110
   endif
 
   # We used to do this but it seems to not reduce space any more, at least in gcc 11.
   # Leave it here, commented out, just for reference.
-  # --param inline-unit-growth=15 --param max-inline-insns-auto=20
+  # --param inline-unit-growth=15
 
   ifdef CFLAGS_BOARD
     CFLAGS += $(CFLAGS_BOARD)

From b2535496b08849d93cec582d5894a748b60cbb96 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 28 Mar 2023 16:28:31 -0400
Subject: [PATCH 2150/2403] use max-inline-insns-auto=110 only on SAMD21

---
 ports/atmel-samd/Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 31e69f36c9..ca906ab98f 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -104,19 +104,16 @@ else
   CFLAGS += -DNDEBUG
 
   # Do a default shrink for small builds, including all SAMD21 builds.
-  ifeq ($(CIRCUITPY_FULL_BUILD),0)
-    SHRINK_BUILD = 1
-  else
-    ifeq ($(CHIP_FAMILY), samd21)
-      SHRINK_BUILD = 1
-    endif
-  endif
-
   # -finline-limit can shrink the image size.
   # -finline-limit=80 or so is similar to not having it on.
   # There is no simple default value, though.
-  ifeq ($(SHRINK_BUILD), 1)
-    CFLAGS += -finline-limit=45 --param max-inline-insns-auto=110
+  ifeq ($(CIRCUITPY_FULL_BUILD),0)
+    CFLAGS += -finline-limit=45
+  else
+    ifeq ($(CHIP_FAMILY), samd21)
+      # max-inline-insns-auto increases the size of SAMD51 builds.
+      CFLAGS += -finline-limit=45 --param max-inline-insns-auto=110
+    endif
   endif
 
   # We used to do this but it seems to not reduce space any more, at least in gcc 11.

From f14861c2457f3f9d3c8610ca48c080f63c787b66 Mon Sep 17 00:00:00 2001
From: MicroDev <70126934+MicroDev1@users.noreply.github.com>
Date: Wed, 29 Mar 2023 09:49:35 +0530
Subject: [PATCH 2151/2403] fix espnow reinit, remove todos and improve docs

---
 ports/espressif/bindings/espidf/__init__.c | 14 ++++++++++----
 ports/espressif/bindings/espnow/ESPNow.c   | 10 +++++++---
 ports/espressif/bindings/espnow/Peer.c     |  5 +----
 ports/espressif/bindings/espnow/Peers.c    |  2 --
 ports/espressif/bindings/espnow/__init__.c |  5 ++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c
index c1ef9da1e0..65b7f12a18 100644
--- a/ports/espressif/bindings/espidf/__init__.c
+++ b/ports/espressif/bindings/espidf/__init__.c
@@ -34,6 +34,8 @@
 #include "nvs_flash.h"
 #include "components/heap/include/esp_heap_caps.h"
 
+//| import builtins
+//|
 //| """Direct access to a few ESP-IDF details. This module *should not* include any functionality
 //|    that could be implemented by other frameworks. It should only include ESP-IDF specific
 //|    things."""
@@ -95,6 +97,13 @@ STATIC void espidf_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_pr
     mp_obj_exception_print(print, o_in, kind);
 }
 
+//| class IDFError(builtins.OSError):
+//|     """Raised when an ``ESP-IDF`` function returns an error code.
+//|     `esp_err_t `_
+//|     """
+//|
+//|     ...
+//|
 const mp_obj_type_t mp_type_espidf_IDFError = {
     { &mp_type_type },
     .name = MP_QSTR_IDFError,
@@ -104,11 +113,8 @@ const mp_obj_type_t mp_type_espidf_IDFError = {
     .parent = &mp_type_OSError,
 };
 
-
-//| import builtins
-//|
 //| class MemoryError(builtins.MemoryError):
-//|     """Raised when an ESP IDF memory allocation fails."""
+//|     """Raised when an ``ESP-IDF`` memory allocation fails."""
 //|
 //|     ...
 //|
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
index 32676bc9be..78d80924fd 100644
--- a/ports/espressif/bindings/espnow/ESPNow.c
+++ b/ports/espressif/bindings/espnow/ESPNow.c
@@ -57,7 +57,9 @@ static void espnow_check_for_deinit(espnow_obj_t *self) {
 //|         """Allocate and initialize `ESPNow` instance as a singleton.
 //|
 //|         :param int buffer_size: The size of the internal ring buffer. Default: 526 bytes.
-//|         :param int phy_rate: The ESP-NOW physical layer rate. Default: 1 Mbps."""
+//|         :param int phy_rate: The ESP-NOW physical layer rate. Default: 1 Mbps.
+//|             `wifi_phy_rate_t `_
+//|         """
 //|         ...
 STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_buffer_size, ARG_phy_rate };
@@ -71,7 +73,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
 
-    if (self != NULL) {
+    if (!common_hal_espnow_deinited(self)) {
         mp_raise_RuntimeError(translate("Already running"));
     }
 
@@ -244,7 +246,9 @@ MP_PROPERTY_GETTER(espnow_buffer_size_obj,
     (mp_obj_t)&espnow_get_buffer_size_obj);
 
 //|     phy_rate: int
-//|     """The ESP-NOW physical layer rate."""
+//|     """The ESP-NOW physical layer rate.
+//|     `wifi_phy_rate_t `_
+//|     """
 //|
 STATIC mp_obj_t espnow_get_phy_rate(const mp_obj_t self_in) {
     espnow_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c
index 5c21dafc4c..f69bec01e6 100644
--- a/ports/espressif/bindings/espnow/Peer.c
+++ b/ports/espressif/bindings/espnow/Peer.c
@@ -31,9 +31,6 @@
 #include "bindings/espnow/Peer.h"
 #include "common-hal/espnow/__init__.h"
 
-// TODO: check peer already exist
-// TODO: check peer doesn't exist
-
 //| class Peer:
 //|     """A data class to store parameters specific to a peer."""
 //|
@@ -62,7 +59,7 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
         { MP_QSTR_lmk,      MP_ARG_OBJ | MP_ARG_KW_ONLY, { .u_obj = mp_const_none } },
         { MP_QSTR_channel,  MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
         { MP_QSTR_interface,MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
-        { MP_QSTR_encrypted,MP_ARG_BOOL | MP_ARG_KW_ONLY, { .u_bool = false } },
+        { MP_QSTR_encrypted,MP_ARG_BOOL | MP_ARG_KW_ONLY,{ .u_bool = false } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c
index 15d07c09d0..6fda9aed7a 100644
--- a/ports/espressif/bindings/espnow/Peers.c
+++ b/ports/espressif/bindings/espnow/Peers.c
@@ -35,8 +35,6 @@
 
 #include "esp_now.h"
 
-// TODO: Check for deinit
-
 //| class Peers:
 //|     """Maintains a `list` of `Peer` internally and only exposes a subset of `list` methods."""
 //|
diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c
index da15be49ea..3135858601 100644
--- a/ports/espressif/bindings/espnow/__init__.c
+++ b/ports/espressif/bindings/espnow/__init__.c
@@ -33,9 +33,8 @@
 //| """ESP-NOW Module
 //|
 //| The `espnow` module provides an interface to the
-//| `ESP-NOW `_
-//| protocol provided by Espressif on its SoCs
-//| (`API docs `_).
+//| `ESP-NOW `_
+//| protocol provided by Espressif on its SoCs.
 //|
 //| **Sender**
 //|

From cc3d0f6fa15bf3532ad99f289db29555a9e37858 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 29 Mar 2023 10:03:56 -0500
Subject: [PATCH 2152/2403] getenv: treat a read error like eof

Otherwise, the following would occur:
 * settings.toml is in the process of being written by host computer
 * soft-reset begins
 * web workflow tries to grab CIRCUITPY_WIFI_SSID, but loops forever
   because FAT filesystem is in inconsistent state and file reads error
 * settings.toml write by host computer never completes and the filesystem
   remains corrupt
 * restarting yields a soft-bricked device, because startup reads
   CIRCUITPY_WIFI_SSID again
---
 shared-module/os/getenv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 870973c5d2..6585aeb88c 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -72,7 +72,7 @@ STATIC void close_file(file_arg *active_file) {
     // nothing
 }
 STATIC bool is_eof(file_arg *active_file) {
-    return f_eof(active_file);
+    return f_eof(active_file) | f_error(active_file);
 }
 
 // Return 0 if there is no next character (EOF).

From a8bbb21eeb5bcdab5eb71be3793c6efd3dd0622d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 29 Mar 2023 10:09:01 -0500
Subject: [PATCH 2153/2403] Use short-circuiting or (also may save some code
 size)

Co-authored-by: Dan Halbert 
---
 shared-module/os/getenv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
index 6585aeb88c..76cbf48dae 100644
--- a/shared-module/os/getenv.c
+++ b/shared-module/os/getenv.c
@@ -72,7 +72,7 @@ STATIC void close_file(file_arg *active_file) {
     // nothing
 }
 STATIC bool is_eof(file_arg *active_file) {
-    return f_eof(active_file) | f_error(active_file);
+    return f_eof(active_file) || f_error(active_file);
 }
 
 // Return 0 if there is no next character (EOF).

From 173bc198c604aa9d3475bed79acdaaf57f47f5dc Mon Sep 17 00:00:00 2001
From: Gregory Neverov <42853258+gneverov@users.noreply.github.com>
Date: Wed, 29 Mar 2023 11:49:32 -0700
Subject: [PATCH 2154/2403] don't set tcp_err callback for listen sockets

---
 ports/raspberrypi/common-hal/socketpool/Socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c
index fe12f461fb..0696cc7ae9 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.c
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.c
@@ -706,8 +706,6 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
         case MOD_NETWORK_SOCK_STREAM: {
             // Register the socket object as our callback argument.
             tcp_arg(socket->pcb.tcp, (void *)socket);
-            // Register our error callback.
-            tcp_err(socket->pcb.tcp, _lwip_tcp_error);
             break;
         }
         case MOD_NETWORK_SOCK_DGRAM: {
@@ -916,10 +914,11 @@ void socketpool_socket_close(socketpool_socket_obj_t *socket) {
         case SOCKETPOOL_SOCK_STREAM: {
             // Deregister callback (pcb.tcp is set to NULL below so must deregister now)
             tcp_arg(socket->pcb.tcp, NULL);
-            tcp_err(socket->pcb.tcp, NULL);
-            tcp_recv(socket->pcb.tcp, NULL);
 
             if (socket->pcb.tcp->state != LISTEN) {
+                tcp_err(socket->pcb.tcp, NULL);
+                tcp_recv(socket->pcb.tcp, NULL);
+
                 // Schedule a callback to abort the connection if it's not cleanly closed after
                 // the given timeout.  The callback must be set before calling tcp_close since
                 // the latter may free the pcb; if it doesn't then the callback will be active.
@@ -977,6 +976,7 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *socket,
             // Register our receive callback.
             MICROPY_PY_LWIP_ENTER
             tcp_recv(socket->pcb.tcp, _lwip_tcp_recv);
+            tcp_err(socket->pcb.tcp, _lwip_tcp_error);
             socket->state = STATE_CONNECTING;
             err = tcp_connect(socket->pcb.tcp, &dest, port, _lwip_tcp_connected);
             if (err != ERR_OK) {

From 1a5afd485bfa5aa5269a25d0ab40ab47413cf3f6 Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Wed, 29 Mar 2023 15:47:17 -0400
Subject: [PATCH 2155/2403] Allow web_workflow to startup after deep sleep
 alarm wakeup

---
 supervisor/shared/web_workflow/web_workflow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 2caacbd39b..75ab78bf03 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -261,6 +261,7 @@ void supervisor_start_web_workflow(void) {
     const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
     if (reset_reason != RESET_REASON_POWER_ON &&
         reset_reason != RESET_REASON_RESET_PIN &&
+        reset_reason != RESET_REASON_DEEP_SLEEP_ALARM &&
         reset_reason != RESET_REASON_UNKNOWN &&
         reset_reason != RESET_REASON_SOFTWARE) {
         return;

From b746fd05baad4daf776366d7cf9e833c159cd075 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Wed, 29 Mar 2023 23:58:54 +0300
Subject: [PATCH 2156/2403] 24Mhz -> 240Mhz

---
 ports/espressif/common-hal/microcontroller/Processor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
index 1f09742955..c0e72c85b9 100644
--- a/ports/espressif/common-hal/microcontroller/Processor.c
+++ b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -64,7 +64,7 @@ float common_hal_mcu_processor_get_voltage(void) {
 
 uint32_t common_hal_mcu_processor_get_frequency(void) {
     #if defined(CONFIG_IDF_TARGET_ESP32)
-    return CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 100000;
+    return CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000;
     #elif defined(CONFIG_IDF_TARGET_ESP32C3)
     return CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ * 1000000;
     #elif defined(CONFIG_IDF_TARGET_ESP32S2)

From a10ce2170c26e532080f99ecaeb753267c8bb912 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 29 Mar 2023 17:16:39 -0400
Subject: [PATCH 2157/2403] doc typo fix in OnDiskGif

---
 shared-bindings/gifio/OnDiskGif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index a16cb92b4e..f6acccfabf 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -97,7 +97,7 @@
 //|
 //|           display_bus.send(42, struct.pack(">hh", 0, odg.bitmap.width - 1))
 //|           display_bus.send(43, struct.pack(">hh", 0, odg.bitmap.height - 1))
-//|           display_bus.send(44, d.bitmap)
+//|           display_bus.send(44, odg.bitmap)
 //|
 //|       # The following optional code will free the OnDiskGif and allocated resources
 //|       # after use. This may be required before loading a new GIF in situations

From 24ed20b1fcf5eaf2d3a99b2701402cd5a1afc90f Mon Sep 17 00:00:00 2001
From: CDario 
Date: Thu, 30 Mar 2023 09:06:34 +0000
Subject: [PATCH 2158/2403] Fixed boot led inverted status

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

diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
index c80dbc9ee2..1614a9ddad 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
@@ -30,6 +30,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32"
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO10)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
 
 #define CIRCUITPY_BOARD_I2C         (2)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}, \

From 808df200ab658749e78caab83a6c27747da71b43 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Thu, 30 Mar 2023 09:15:17 +0000
Subject: [PATCH 2159/2403] Added pin connected to AXP192 N_VBUSSEN

---
 ports/espressif/boards/m5stack_stick_c/pins.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/espressif/boards/m5stack_stick_c/pins.c b/ports/espressif/boards/m5stack_stick_c/pins.c
index 65f0960382..5c8b897618 100644
--- a/ports/espressif/boards/m5stack_stick_c/pins.c
+++ b/ports/espressif/boards/m5stack_stick_c/pins.c
@@ -37,6 +37,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // internal devices interrupt
     { MP_ROM_QSTR(MP_QSTR_SYS_INT), MP_ROM_PTR(&pin_GPIO35) },
 
+    // pmu AXP192
+    { MP_ROM_QSTR(MP_QSTR_PMU_N_VBUSEN), MP_ROM_PTR(&pin_GPIO27) },
+
     // pdm microphone
     { MP_ROM_QSTR(MP_QSTR_PDM_MIC_CLK), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_PDM_MIC_DATA), MP_ROM_PTR(&pin_GPIO34) },

From 1ea6d7b9f4626028fdca2a6c46ffe8cc5b18f0a4 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Thu, 30 Mar 2023 09:24:52 +0000
Subject: [PATCH 2160/2403] Updatate PMU initializaiton. Increased low battery
 waring levels and disabled some interrupts

---
 .../espressif/boards/m5stack_stick_c/axp192.h | 13 ++-
 .../espressif/boards/m5stack_stick_c/board.c  | 80 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 ports/espressif/boards/m5stack_stick_c/axp192.h
 mode change 100644 => 100755 ports/espressif/boards/m5stack_stick_c/board.c

diff --git a/ports/espressif/boards/m5stack_stick_c/axp192.h b/ports/espressif/boards/m5stack_stick_c/axp192.h
old mode 100644
new mode 100755
index 78c2d253e4..aa8f6367a7
--- a/ports/espressif/boards/m5stack_stick_c/axp192.h
+++ b/ports/espressif/boards/m5stack_stick_c/axp192.h
@@ -144,21 +144,28 @@
 #define AXP192_BATT_TEMP_HIGH_THRESH 0x39
 #define AXP192_BATT_TEMP_HIGH_THRESH_DEFAULT 0b11111100
 
+#define AXP192_APS_LOW_BATT_LEVEL_1 0x3A
+#define AXP192_APS_LOW_BATT_LEVEL_2 0x3B
+#define AXP192_APS_LOW_BATT_VOLTAGE_3_695V 0b10010100
+#define AXP192_APS_LOW_BATT_VOLTAGE_3_600V 0b10000011
+
 #define AXP192_IRQ_1_ENABLE 0x40
 #define AXP192_IRQ_2_ENABLE 0x41
 #define AXP192_IRQ_3_ENABLE 0x42
+#define AXP192_IRQ_3_PEK_SHORT_PRESS 0b00000010
+#define AXP192_IRQ_3_PEK_LONG_PRESS  0b00000001
 #define AXP192_IRQ_4_ENABLE 0x43
+#define AXP192_IRQ_4_LOW_VOLTAGE_WARNING 0b00000001
 #define AXP192_IRQ_5_ENABLE 0x4a
 
+#define AXP192_IRQ_X_DISABLE_ALL     0b00000000
+
 #define AXP192_IRQ_1_STATUS 0x44
 #define AXP192_IRQ_2_STATUS 0x45
 #define AXP192_IRQ_3_STATUS 0x46
 #define AXP192_IRQ_4_STATUS 0x47
 #define AXP192_IRQ_5_STATUS 0x4d
 
-#define AXP192_IRQ_3_PEK_SHORT_PRESS 0b00000010
-#define AXP192_IRQ_3_PEK_LONG_PRESS 0b00000001
-
 #define AXP192_ADC_ACIN_VOLTAGE_H 0x56
 #define AXP192_ADC_ACIN_VOLTAGE_L 0x57
 #define AXP192_ADC_ACIN_CURRENT_H 0x58
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
old mode 100644
new mode 100755
index ae29c9fa76..2f993d4a05
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -127,6 +127,24 @@ static bool pmic_init(void) {
         return false;
     }
 
+    // Reg: 3Ah
+    // APS Low battery warning level 1: 3.695V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_1;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_695V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 3Bh
+    // APS Low battery warning level 2: 3.600V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_2;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_600V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
     // Reg: 82h
     // ADC all on
     write_buf[0] = AXP192_ADC_ENABLE_1;
@@ -204,7 +222,7 @@ static bool pmic_init(void) {
         return false;
     }
 
-    // Reg: 28h
+    // Reg: 26h
     // DCDC1 (ESP32 VDD): 3.350V
     write_buf[0] = AXP192_DCDC1_OUT_VOLTAGE;
     write_buf[1] = AXP192_DCDC1_OUT_VOLTAGE_3_350V;
@@ -213,6 +231,54 @@ static bool pmic_init(void) {
         return false;
     }
 
+    // Reg: 40h
+    // IRQ enable control register 1
+    write_buf[0] = AXP192_IRQ_1_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 41h
+    // IRQ enable control register 2
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 42h
+    // IRQ enable control register 3
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_3_PEK_SHORT_PRESS |
+        AXP192_IRQ_3_PEK_LONG_PRESS;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 43h
+    // IRQ enable control register 4
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_4_LOW_VOLTAGE_WARNING;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 44h
+    // IRQ enable control register 5
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
     return true;
 }
 
@@ -279,7 +345,17 @@ void board_init(void) {
     }
 
     if (!display_init()) {
-        mp_printf(&mp_plat_print, "could not initialize ili9342c LCD");
+        mp_printf(&mp_plat_print, "could not initialize the display");
         return;
     }
 }
+
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    // Set IR led gpio high to prevent power drain from the led
+    if (pin_number == 9) {
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
+        return true;
+    }
+    return false;
+}

From 6ad053e40375169e907dc5f4949775bef3c6b332 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Thu, 30 Mar 2023 08:51:52 -0400
Subject: [PATCH 2161/2403] correcting feedback

---
 locale/circuitpython.pot               | 23 +++++------
 shared-bindings/bitmaptools/__init__.c | 53 ++++++++++++++++++++++----
 shared-module/bitmaptools/__init__.c   |  5 +++
 3 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b5026f7829..21196702f2 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1217,6 +1218,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1224,6 +1226,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -3827,11 +3830,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3856,14 +3855,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -3905,6 +3900,10 @@ msgstr ""
 msgid "queue overflow"
 msgstr ""
 
+#: shared-bindings/bitmaptools/__init__.c
+msgid "radius must be greater than zero"
+msgstr ""
+
 #: py/parse.c
 msgid "raw f-strings are not supported"
 msgstr ""
@@ -4276,10 +4275,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 2a23a2c05d..9aa7362269 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -871,20 +871,48 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_dither_obj, 0, bitmaptools_dither);
 // requires all 5 arguments
 
 //| def draw_circle(
-//|     dest_bitmap: displayio.Bitmap, x0: int, y0: int, radius: int, value: int
+//|     dest_bitmap: displayio.Bitmap, x: int, y: int, radius: int, value: int
 //| ) -> None:
 //|     """Draws a circle into a bitmap specified using a center (x0,y0) and radius r.
 //|
 //|     :param bitmap dest_bitmap: Destination bitmap that will be written into
-//|     :param int x0: x-pixel position of the circle's center
-//|     :param int y0: y-pixel position of the circle's center
+//|     :param int x: x-pixel position of the circle's center
+//|     :param int y: y-pixel position of the circle's center
 //|     :param int radius: circle's radius
 //|     :param int value: Bitmap palette index that will be written into the
-//|            circle in the destination bitmap"""
+//|            circle in the destination bitmap
+//|
+//|     .. code-block:: Python
+//|
+//|        import board
+//|        import displayio
+//|        import bitmaptools
+//|
+//|        display = board.DISPLAY
+//|        main_group = displayio.Group()
+//|        display.root_group = main_group
+//|
+//|        palette = displayio.Palette(2)
+//|        palette[0] = 0xffffff
+//|        palette[1] = 0x440044
+//|
+//|        bmp = displayio.Bitmap(128,128, 2)
+//|        bmp.fill(0)
+//|
+//|        bitmaptools.circle(64,64, 32, 1)
+//|
+//|        tilegrid = displayio.TileGrid(bitmap=bmp, pixel_shader=palette)
+//|        main_group.append(tilegrid)
+//|
+//|        while True:
+//|            pass
+//|
+//|     """
+//|
 //|     ...
 //|
 STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum {ARG_dest_bitmap, ARG_x0, ARG_y0, ARG_radius, ARG_value};
+    enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_radius, ARG_value};
 
     static const mp_arg_t allowed_args[] = {
         {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
@@ -906,12 +934,21 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
     }
 
 
-    int16_t x0 = args[ARG_x0].u_int;
-    int16_t y0 = args[ARG_y0].u_int;
+    int16_t x = args[ARG_x].u_int;
+    int16_t y = args[ARG_y].u_int;
     int16_t radius = args[ARG_radius].u_int;
 
+    if (x < 0 || x >= destination->width) {
+        mp_raise_ValueError(translate("out of range of target"));
+    }
+    if (y < 0 || y >= destination->height) {
+        mp_raise_ValueError(translate("out of range of target"));
+    }
+    if (radius < 0) {
+        mp_raise_ValueError(translate("radius must be greater than zero"));
+    }
 
-    common_hal_bitmaptools_draw_circle(destination, x0, y0, radius, value);
+    common_hal_bitmaptools_draw_circle(destination, x, y, radius, value);
 
     return mp_const_none;
 }
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 449815533d..7809e5fc87 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -931,6 +931,11 @@ STATIC void draw_circle(displayio_bitmap_t *destination,
     mp_arg_validate_int_range(x0, SHRT_MIN, SHRT_MAX, MP_QSTR_x0);
     mp_arg_validate_int_range(y0, SHRT_MIN, SHRT_MAX, MP_QSTR_y0);
 
+    x0 = MIN(x0, destination->width);
+    x0 = MAX(0, x0);
+    y0 = MIN(y0, destination->height);
+    y0 = MIN(0, y0);
+
     BITMAP_DEBUG("x, y, radius    (%4d, %4d, %4d)\n", x0, y0, radius);
 
     y = radius;

From 844ea2f60b1b4f8c6155a2cd8cea8c0d15b9e4af Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:28:15 -0400
Subject: [PATCH 2162/2403] Update shared-bindings/bitmaptools/__init__.c

Co-authored-by: Dan Halbert 
---
 shared-bindings/bitmaptools/__init__.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 9aa7362269..7754bf57eb 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -916,10 +916,10 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
 
     static const mp_arg_t allowed_args[] = {
         {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
-        {MP_QSTR_x0, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
-        {MP_QSTR_y0, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
-        {MP_QSTR_radius, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
-        {MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_x, MP_ARG_REQUIRED | MP_ARG_INT},
+        {MP_QSTR_y, MP_ARG_REQUIRED | MP_ARG_INT},
+        {MP_QSTR_radius, MP_ARG_REQUIRED | MP_ARG_INT},
+        {MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT},
     };
     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);

From 4e332fb1c493d8498b7f71347eefcf2b9caacc95 Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:28:42 -0400
Subject: [PATCH 2163/2403] Update shared-bindings/bitmaptools/__init__.h

Co-authored-by: Dan Halbert 
---
 shared-bindings/bitmaptools/__init__.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/bitmaptools/__init__.h b/shared-bindings/bitmaptools/__init__.h
index 3c356e761e..21fb1b50ab 100644
--- a/shared-bindings/bitmaptools/__init__.h
+++ b/shared-bindings/bitmaptools/__init__.h
@@ -65,7 +65,7 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
     uint32_t value);
 
 void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
-    int16_t x0, int16_t y0,
+    int16_t x, int16_t y,
     int16_t radius,
     uint32_t value);
 

From 533f532ff24f70538b9891aef9c0c45ce46dbd96 Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:29:18 -0400
Subject: [PATCH 2164/2403] Update shared-module/bitmaptools/__init__.c

Co-authored-by: Dan Halbert 
---
 shared-module/bitmaptools/__init__.c | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 7809e5fc87..1ab9c72de9 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -923,39 +923,39 @@ void common_hal_bitmaptools_alphablend(displayio_bitmap_t *dest, displayio_bitma
 }
 
 STATIC void draw_circle(displayio_bitmap_t *destination,
-    int16_t x0, int16_t y0,
+    int16_t x, int16_t y,
     int16_t radius, uint32_t value) {
 
-    int16_t d, y;
+    int16_t d, yb;
 
-    mp_arg_validate_int_range(x0, SHRT_MIN, SHRT_MAX, MP_QSTR_x0);
-    mp_arg_validate_int_range(y0, SHRT_MIN, SHRT_MAX, MP_QSTR_y0);
+    mp_arg_validate_int_range(x0, SHRT_MIN, SHRT_MAX, MP_QSTR_x);
+    mp_arg_validate_int_range(y0, SHRT_MIN, SHRT_MAX, MP_QSTR_y);
 
-    x0 = MIN(x0, destination->width);
-    x0 = MAX(0, x0);
-    y0 = MIN(y0, destination->height);
-    y0 = MIN(0, y0);
+    x = MIN(x, destination->width);
+    x = MAX(0, x);
+    y = MIN(y, destination->height);
+    y = MIN(0, y);
 
-    BITMAP_DEBUG("x, y, radius    (%4d, %4d, %4d)\n", x0, y0, radius);
+    BITMAP_DEBUG("x, y, radius    (%4d, %4d, %4d)\n", x, y, radius);
 
-    y = radius;
+    yb = radius;
     d = 3 - 2 * radius;
 
     // Bresenham's circle algorithm
-    for (int x = 0; x <= y; x++) {
-        displayio_bitmap_write_pixel(destination, x + x0, y + y0, value);
-        displayio_bitmap_write_pixel(destination, -x + x0, -y + y0, value);
-        displayio_bitmap_write_pixel(destination, -x + x0, y + y0, value);
-        displayio_bitmap_write_pixel(destination, x + x0, -y + y0, value);
-        displayio_bitmap_write_pixel(destination, y + x0, x + y0, value);
-        displayio_bitmap_write_pixel(destination, -y + x0, x + y0, value);
-        displayio_bitmap_write_pixel(destination, -y + x0, -x + y0, value);
-        displayio_bitmap_write_pixel(destination, y + x0, -x + y0, value);
+    for (int xb = 0; x <= yb; xb++) {
+        displayio_bitmap_write_pixel(destination, xb + x, yb + y, value);
+        displayio_bitmap_write_pixel(destination, -xb + x, -yb + y, value);
+        displayio_bitmap_write_pixel(destination, -xb + x, yb + y, value);
+        displayio_bitmap_write_pixel(destination, xb + x, -yb + y, value);
+        displayio_bitmap_write_pixel(destination, yb + x, xb + y, value);
+        displayio_bitmap_write_pixel(destination, -yb + x, xb + y, value);
+        displayio_bitmap_write_pixel(destination, -yb + x, -xb + y, value);
+        displayio_bitmap_write_pixel(destination, yb + x, -xb + y, value);
         if (d <= 0) {
-            d = d + (4 * x) + 6;
+            d = d + (4 * xb) + 6;
         } else {
-            d = d + 4 * (x - y) + 10;
-            y = y - 1;
+            d = d + 4 * (xb - yb) + 10;
+            yb = yb - 1;
         }
     }
 }

From f6a0fb20f2d41d8378abb467f7822d057fe1c74f Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:29:39 -0400
Subject: [PATCH 2165/2403] Update shared-module/bitmaptools/__init__.c

Co-authored-by: Dan Halbert 
---
 shared-module/bitmaptools/__init__.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 1ab9c72de9..105a7c1e77 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -961,7 +961,7 @@ STATIC void draw_circle(displayio_bitmap_t *destination,
 }
 
 void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
-    int16_t x0, int16_t y0,
+    int16_t x, int16_t y,
     int16_t radius,
     uint32_t value) {
 
@@ -969,10 +969,10 @@ void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
     // update the dirty area
     int16_t xbb0, xbb1, ybb0, ybb1;
 
-    xbb0 = x0 - radius;
-    xbb1 = x0 + radius;
-    ybb0 = y0 - radius;
-    ybb1 = y0 + radius;
+    xbb0 = x - radius;
+    xbb1 = x + radius;
+    ybb0 = y - radius;
+    ybb1 = y + radius;
 
     displayio_area_t area = { xbb0, ybb0, xbb1, ybb1, NULL };
     displayio_area_t bitmap_area = { 0, 0, destination->width, destination->height, NULL };
@@ -980,5 +980,5 @@ void common_hal_bitmaptools_draw_circle(displayio_bitmap_t *destination,
 
     displayio_bitmap_set_dirty_area(destination, &area);
 
-    draw_circle(destination, x0, y0, radius, value);
+    draw_circle(destination, x, y, radius, value);
 }

From 9a77199f2e92512ab3c0dcc20ec2279040a1813c Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:43:48 -0400
Subject: [PATCH 2166/2403] Update shared-bindings/bitmaptools/__init__.c

Co-authored-by: Dan Halbert 
---
 shared-bindings/bitmaptools/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 7754bf57eb..5ae5182c59 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -915,7 +915,7 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
     enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_radius, ARG_value};
 
     static const mp_arg_t allowed_args[] = {
-        {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ},
         {MP_QSTR_x, MP_ARG_REQUIRED | MP_ARG_INT},
         {MP_QSTR_y, MP_ARG_REQUIRED | MP_ARG_INT},
         {MP_QSTR_radius, MP_ARG_REQUIRED | MP_ARG_INT},

From 4986ad6d6b0cdcbfd24031492986cd178522d6a0 Mon Sep 17 00:00:00 2001
From: jposada202020 <34255413+jposada202020@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:43:57 -0400
Subject: [PATCH 2167/2403] Update shared-module/bitmaptools/__init__.c

Co-authored-by: Dan Halbert 
---
 shared-module/bitmaptools/__init__.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 105a7c1e77..0c9d2a1f6a 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -928,8 +928,8 @@ STATIC void draw_circle(displayio_bitmap_t *destination,
 
     int16_t d, yb;
 
-    mp_arg_validate_int_range(x0, SHRT_MIN, SHRT_MAX, MP_QSTR_x);
-    mp_arg_validate_int_range(y0, SHRT_MIN, SHRT_MAX, MP_QSTR_y);
+    mp_arg_validate_int_range(x, SHRT_MIN, SHRT_MAX, MP_QSTR_x);
+    mp_arg_validate_int_range(y, SHRT_MIN, SHRT_MAX, MP_QSTR_y);
 
     x = MIN(x, destination->width);
     x = MAX(0, x);

From 96b2604083837b896bb9060f5fbf93df81f58c9c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 30 Mar 2023 15:39:25 -0500
Subject: [PATCH 2168/2403] sort new boards & new languages lists in
 circuitpython.org update PR

---
 tools/build_board_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 01d935ac46..f73f83b5ee 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -136,10 +136,10 @@ def create_pr(changes, updated, git_info, user):
     pr_title = "Automated website update for release {}".format(changes["new_release"])
     boards = ""
     if changes["new_boards"]:
-        boards = "New boards:\n* " + "\n* ".join(changes["new_boards"])
+        boards = "New boards:\n* " + "\n* ".join(sorted(changes["new_boards"]))
     languages = ""
     if changes["new_languages"]:
-        languages = "New languages:\n* " + "\n* ".join(changes["new_languages"])
+        languages = "New languages:\n* " + "\n* ".join(sorted(changes["new_languages"]))
     message = "Automated website update for release {} by Blinka.\n\n{}\n\n{}\n".format(
         changes["new_release"], boards, languages
     )

From 1931b6c0424f8b8ed636321d31e87db96de53018 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Thu, 30 Mar 2023 18:08:17 -0400
Subject: [PATCH 2169/2403] fixing algorithm and MAX

---
 shared-module/bitmaptools/__init__.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index 0c9d2a1f6a..0ded6d6abb 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -934,7 +934,7 @@ STATIC void draw_circle(displayio_bitmap_t *destination,
     x = MIN(x, destination->width);
     x = MAX(0, x);
     y = MIN(y, destination->height);
-    y = MIN(0, y);
+    y = MAX(0, y);
 
     BITMAP_DEBUG("x, y, radius    (%4d, %4d, %4d)\n", x, y, radius);
 
@@ -942,7 +942,7 @@ STATIC void draw_circle(displayio_bitmap_t *destination,
     d = 3 - 2 * radius;
 
     // Bresenham's circle algorithm
-    for (int xb = 0; x <= yb; xb++) {
+    for (int xb = 0; xb <= yb; xb++) {
         displayio_bitmap_write_pixel(destination, xb + x, yb + y, value);
         displayio_bitmap_write_pixel(destination, -xb + x, -yb + y, value);
         displayio_bitmap_write_pixel(destination, -xb + x, yb + y, value);

From 2d48e9b0b7e81a9ddd735cc1d871cddb374fb7bb Mon Sep 17 00:00:00 2001
From: Dogus Cendek <55203951+DogushC@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:44:23 +0300
Subject: [PATCH 2170/2403] Fix VID and Local_Hostname of DeneyapKart1A_v2

Fix VID and Local_Hostname of DeneyapKart1A_v2
---
 ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk | 2 +-
 ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
index 1ec7c73185..5fa5d4822f 100644
--- a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
@@ -1,4 +1,4 @@
-USB_VID = 0x239A
+USB_VID = 0x303A
 USB_PID = 0x8148
 
 USB_PRODUCT = "Deneyap Kart 1A v2"
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig b/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
index 4e99a09f2e..2cdb172e06 100644
--- a/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
@@ -41,7 +41,7 @@ CONFIG_SPIRAM_MEMTEST=y
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+CONFIG_LWIP_LOCAL_HOSTNAME="DeneyapKart1A_v2"
 # end of LWIP
 
 # end of Component config

From dea5d1c4eaeea863f344af34f660082156c69708 Mon Sep 17 00:00:00 2001
From: Dogus Cendek <55203951+DogushC@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:50:43 +0300
Subject: [PATCH 2171/2403] Update .pre-commit-config.yaml

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 87bd49027d..942a51afdc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.0.1
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer

From 72614ed09e65af1c7ae6ddb0d7237a2a58abf9a5 Mon Sep 17 00:00:00 2001
From: Ettore Atalan 
Date: Wed, 29 Mar 2023 18:29:49 +0000
Subject: [PATCH 2172/2403] Translated using Weblate (German)

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/de_DE.po b/locale/de_DE.po
index ab543ccea4..3c0c0c8233 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-03-28 14:18+0000\n"
-"Last-Translator: Luc \n"
+"PO-Revision-Date: 2023-03-31 14:39+0000\n"
+"Last-Translator: Ettore Atalan \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1305,7 +1305,7 @@ msgstr "Ungültige data_pins[%d]"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "Ungültiges Format"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"

From 3b60215ac9f3de327a22f613a85630436d706698 Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Thu, 30 Mar 2023 14:05:52 +0000
Subject: [PATCH 2173/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1002 of 1002 strings)

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

diff --git a/locale/es.po b/locale/es.po
index d5db9c0c88..266ac9edea 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: 2023-03-25 02:42+0000\n"
+"PO-Revision-Date: 2023-03-31 14:39+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -1315,7 +1315,7 @@ msgstr "Inválidos los data_pins[%d]"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "Formato inválido"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"

From cef262fd5cbe8cbe13a842981e63bfd2fef7ca2d Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Tue, 28 Mar 2023 17:52:34 +0000
Subject: [PATCH 2174/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1002 of 1002 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 6968cfbb84..802966354a 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: 2023-03-25 02:42+0000\n"
+"PO-Revision-Date: 2023-03-31 14:39+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -1311,7 +1311,7 @@ msgstr "data_pins[%d] inválido"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "Formato inválido"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"

From e4a002b96cfcbd54fe3e76294c0e2972a9e5420b Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 29 Mar 2023 08:58:07 +0000
Subject: [PATCH 2175/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1002 of 1002 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 1cef8c6d7a..a7dee9421d 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: 2023-03-25 02:42+0000\n"
+"PO-Revision-Date: 2023-03-31 14:39+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -1296,7 +1296,7 @@ msgstr "Ogiltig data_pins[%d]"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "Ogiltigt format"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"

From 5c429320a8a2f7219e0f2c80689f3dbff4b84cab Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 26 Dec 2022 12:28:44 -0500
Subject: [PATCH 2176/2403] Add wifi.radio.connected, wifi.radio.ap_active

---
 ports/espressif/common-hal/wifi/Radio.c   |  8 ++++
 ports/raspberrypi/common-hal/wifi/Radio.c |  8 ++++
 shared-bindings/wifi/Radio.c              | 47 ++++++++++++++---------
 shared-bindings/wifi/Radio.h              |  2 +
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index acd6ae53bc..4ca3bf1a6c 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -242,6 +242,10 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
     esp_wifi_set_config(WIFI_IF_AP, config);
 }
 
+bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self) {
+    return self->ap_mode;
+}
+
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
     set_mode_ap(self, false);
 }
@@ -347,6 +351,10 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     return WIFI_RADIO_ERROR_NONE;
 }
 
+bool common_hal_wifi_radio_get_connected(wifi_radio_obj_t *self) {
+    return self->sta_mode && esp_netif_is_netif_up(self->netif);
+}
+
 mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 2ed19a96e7..0ef4f8bb76 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -186,6 +186,10 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
     bindings_cyw43_wifi_enforce_pm();
 }
 
+bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self) {
+    return cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_AP) == CYW43_LINK_UP;
+}
+
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("wifi is not enabled"));
@@ -275,6 +279,10 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     return WIFI_RADIO_ERROR_UNSPECIFIED;
 }
 
+bool common_hal_wifi_radio_get_connected(wifi_radio_obj_t *self) {
+    return cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA) == CYW43_LINK_UP;
+}
+
 mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
     mp_raise_NotImplementedError(NULL);
 }
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index fc3cc345b8..9475ee3b31 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -310,7 +310,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 //|         authmode: Optional[AuthMode] = None,
 //|         max_connections: Optional[int] = 4
 //|     ) -> None:
-//|         """Starts an Access Point with the specified ssid and password.
+//|         """Starts running an access point with the specified ssid and password.
 //|
 //|         If ``channel`` is given, the access point will use that channel unless
 //|         a station is already operating on a different channel.
@@ -376,7 +376,7 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_ap);
 
 //|     def stop_ap(self) -> None:
-//|         """Stops the Access Point."""
+//|         """Stops the access point."""
 //|         ...
 STATIC mp_obj_t wifi_radio_stop_ap(mp_obj_t self) {
     common_hal_wifi_radio_stop_ap(self);
@@ -384,6 +384,16 @@ STATIC mp_obj_t wifi_radio_stop_ap(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_ap_obj, wifi_radio_stop_ap);
 
+//|     ap_active: bool
+//|     """True if running as an access point. (read-only)"""
+STATIC mp_obj_t wifi_radio_get_ap_active(mp_obj_t self) {
+    return mp_obj_new_bool(common_hal_wifi_radio_get_ap_active(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_active_obj, wifi_radio_get_ap_active);
+
+MP_PROPERTY_GETTER(wifi_radio_ap_active_obj,
+    (mp_obj_t)&wifi_radio_get_ap_active_obj);
+
 //|     def connect(
 //|         self,
 //|         ssid: Union[str | ReadableBuffer],
@@ -464,11 +474,20 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect);
 
+//|     connected: bool
+//|     """True if connected to an access point (read-only)."""
+STATIC mp_obj_t wifi_radio_get_connected(mp_obj_t self) {
+    return mp_obj_new_bool(common_hal_wifi_radio_get_connected(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_connected_obj, wifi_radio_get_connected);
+
+MP_PROPERTY_GETTER(wifi_radio_connected_obj,
+    (mp_obj_t)&wifi_radio_get_connected_obj);
+
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
-//|     """IP v4 Address of the station gateway when connected to an access point. None otherwise."""
+//|     """IP v4 Address of the station gateway when connected to an access point. None otherwise. (read-only)"""
 STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_gateway(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_obj, wifi_radio_get_ipv4_gateway);
 
@@ -476,10 +495,9 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_gateway_obj);
 
 //|     ipv4_gateway_ap: Optional[ipaddress.IPv4Address]
-//|     """IP v4 Address of the access point gateway, when enabled. None otherwise."""
+//|     """IP v4 Address of the access point gateway, when enabled. None otherwise. (read-only)"""
 STATIC mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_gateway_ap(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_ap_obj, wifi_radio_get_ipv4_gateway_ap);
 
@@ -487,10 +505,9 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_gateway_ap_obj);
 
 //|     ipv4_subnet: Optional[ipaddress.IPv4Address]
-//|     """IP v4 Address of the station subnet when connected to an access point. None otherwise."""
+//|     """IP v4 Address of the station subnet when connected to an access point. None otherwise. (read-only)"""
 STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_subnet(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_obj, wifi_radio_get_ipv4_subnet);
 
@@ -498,10 +515,9 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_subnet_obj);
 
 //|     ipv4_subnet_ap: Optional[ipaddress.IPv4Address]
-//|     """IP v4 Address of the access point subnet, when enabled. None otherwise."""
+//|     """IP v4 Address of the access point subnet, when enabled. None otherwise. (read-only)"""
 STATIC mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_subnet_ap(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4_subnet_ap);
 
@@ -538,10 +554,9 @@ STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_a
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address);
 
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
-//|     """IP v4 Address of the station when connected to an access point. None otherwise."""
+//|     """IP v4 Address of the station when connected to an access point. None otherwise. (read-only)"""
 STATIC mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_address(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, _wifi_radio_get_ipv4_address);
 
@@ -552,7 +567,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj,
 //|     """IP v4 Address of the access point, when enabled. None otherwise."""
 STATIC mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_address_ap(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_ap_obj, wifi_radio_get_ipv4_address_ap);
 
@@ -563,7 +577,6 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj,
 //|     """IP v4 Address of the DNS server to be used."""
 STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) {
     return common_hal_wifi_radio_get_ipv4_dns(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns);
 
@@ -582,7 +595,6 @@ MP_PROPERTY_GETSET(wifi_radio_ipv4_dns_obj,
 //|     """Network object containing BSSID, SSID, authmode, channel, country and RSSI when connected to an access point. None otherwise."""
 STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
     return common_hal_wifi_radio_get_ap_info(self);
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info);
 
@@ -656,12 +668,14 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_start_ap),    MP_ROM_PTR(&wifi_radio_start_ap_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop_ap),    MP_ROM_PTR(&wifi_radio_stop_ap_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ap_active),   MP_ROM_PTR(&wifi_radio_ap_active_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_start_dhcp),    MP_ROM_PTR(&wifi_radio_start_dhcp_client_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop_dhcp),    MP_ROM_PTR(&wifi_radio_stop_dhcp_client_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connected),    MP_ROM_PTR(&wifi_radio_connected_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ap_info),    MP_ROM_PTR(&wifi_radio_ap_info_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
@@ -674,9 +688,6 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_set_ipv4_address),    MP_ROM_PTR(&wifi_radio_set_ipv4_address_obj) },
 
-    // { MP_ROM_QSTR(MP_QSTR_access_point_active),   MP_ROM_PTR(&wifi_radio_access_point_active_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_start_access_point), MP_ROM_PTR(&wifi_radio_start_access_point_obj) },
-
     { MP_ROM_QSTR(MP_QSTR_ping), MP_ROM_PTR(&wifi_radio_ping_obj) },
 };
 
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index dbaeb9cce8..1fb70ef818 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -95,11 +95,13 @@ extern void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmodes, uint8_t max_connections);
 extern void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self);
+extern bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self);
 
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len);
+extern bool common_hal_wifi_radio_get_connected(wifi_radio_obj_t *self);
 
 extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);

From df46636c5e699fd2e98f4897285fd221ee129488 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Fri, 31 Mar 2023 20:15:07 -0400
Subject: [PATCH 2177/2403] improving range validation

---
 locale/circuitpython.pot               |  4 ----
 shared-bindings/bitmaptools/__init__.c | 12 +++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 21196702f2..77d5aab1d3 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3900,10 +3900,6 @@ msgstr ""
 msgid "queue overflow"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c
-msgid "radius must be greater than zero"
-msgstr ""
-
 #: py/parse.c
 msgid "raw f-strings are not supported"
 msgstr ""
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 5ae5182c59..629d602846 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -938,15 +938,9 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
     int16_t y = args[ARG_y].u_int;
     int16_t radius = args[ARG_radius].u_int;
 
-    if (x < 0 || x >= destination->width) {
-        mp_raise_ValueError(translate("out of range of target"));
-    }
-    if (y < 0 || y >= destination->height) {
-        mp_raise_ValueError(translate("out of range of target"));
-    }
-    if (radius < 0) {
-        mp_raise_ValueError(translate("radius must be greater than zero"));
-    }
+    mp_arg_validate_int_range(x, 0, destination->width, MP_QSTR_x)
+    mp_arg_validate_int_range(y, 0, destination->height, MP_QSTR_y)
+    mp_arg_validate_int_min(radius, 0, MP_QSTR_radius)
 
     common_hal_bitmaptools_draw_circle(destination, x, y, radius, value);
 

From 2f3ea812776e6450a07710c32edeb78e72c525b3 Mon Sep 17 00:00:00 2001
From: jposada202020 
Date: Fri, 31 Mar 2023 20:29:29 -0400
Subject: [PATCH 2178/2403] correcting

---
 shared-bindings/bitmaptools/__init__.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
index 629d602846..d0aea33ef9 100644
--- a/shared-bindings/bitmaptools/__init__.c
+++ b/shared-bindings/bitmaptools/__init__.c
@@ -938,9 +938,9 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
     int16_t y = args[ARG_y].u_int;
     int16_t radius = args[ARG_radius].u_int;
 
-    mp_arg_validate_int_range(x, 0, destination->width, MP_QSTR_x)
-    mp_arg_validate_int_range(y, 0, destination->height, MP_QSTR_y)
-    mp_arg_validate_int_min(radius, 0, MP_QSTR_radius)
+    mp_arg_validate_int_range(x, 0, destination->width, MP_QSTR_x);
+    mp_arg_validate_int_range(y, 0, destination->height, MP_QSTR_y);
+    mp_arg_validate_int_min(radius, 0, MP_QSTR_radius);
 
     common_hal_bitmaptools_draw_circle(destination, x, y, radius, value);
 

From 0aacb146efd6a9618fda692096b62cf4911a0c29 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 31 Mar 2023 22:27:21 -0400
Subject: [PATCH 2179/2403] take wifi.radio.enabled into account

---
 ports/espressif/common-hal/wifi/Radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 4ca3bf1a6c..0ce535899a 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -243,7 +243,7 @@ void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_
 }
 
 bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self) {
-    return self->ap_mode;
+    return self->ap_mode && esp_netif_is_netif_up(self->ap_netif);
 }
 
 void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {

From 02f8a45dfad42dbaa9d1049e65eb4eefbc1cf5c0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 31 Mar 2023 10:51:03 -0500
Subject: [PATCH 2180/2403] synthio: allow increasing number of channels

12 channels works well on metro m7
---
 ports/mimxrt10xx/mpconfigport.mk      |   1 +
 py/circuitpy_mpconfig.mk              |   4 +
 shared-bindings/audiocore/RawSample.c |   2 +-
 shared-module/synthio/MidiTrack.c     | 105 +++++++++++++++-----------
 shared-module/synthio/MidiTrack.h     |   2 +-
 5 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index b03535b6b2..ae22cb69f4 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -18,6 +18,7 @@ CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_AUDIOMP3 = 1
 CIRCUITPY_AUDIOPWMIO = 1
+CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index b8e2178870..3e5acd908c 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -437,6 +437,10 @@ CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR)
 CIRCUITPY_SYNTHIO ?= $(CIRCUITPY_AUDIOCORE)
 CFLAGS += -DCIRCUITPY_SYNTHIO=$(CIRCUITPY_SYNTHIO)
 
+CIRCUITPY_SYNTHIO_MAX_CHANNELS ?= 2
+CFLAGS += -DCIRCUITPY_SYNTHIO_MAX_CHANNELS=$(CIRCUITPY_SYNTHIO_MAX_CHANNELS)
+
+
 CIRCUITPY_SYS ?= 1
 CFLAGS += -DCIRCUITPY_SYS=$(CIRCUITPY_SYS)
 
diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c
index d185476f03..39992f87c1 100644
--- a/shared-bindings/audiocore/RawSample.c
+++ b/shared-bindings/audiocore/RawSample.c
@@ -40,7 +40,7 @@
 //|     def __init__(
 //|         self, buffer: ReadableBuffer, *, channel_count: int = 1, sample_rate: int = 8000
 //|     ) -> None:
-//|         """Create a RawSample based on the given buffer of signed values. If channel_count is more than
+//|         """Create a RawSample based on the given buffer of values. If channel_count is more than
 //|         1 then each channel's samples should alternate. In other words, for a two channel buffer, the
 //|         first sample will be for channel 1, the second sample will be for channel two, the third for
 //|         channel 1 and so on.
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index f02747d734..da810b99f3 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "shared-bindings/synthio/MidiTrack.h"
 
-#define LOUDNESS 0x4000  // 0.5
 #define BITS_PER_SAMPLE 16
 #define BYTES_PER_SAMPLE (BITS_PER_SAMPLE / 8)
 #define SILENCE 0x80
@@ -47,36 +46,51 @@ STATIC uint8_t parse_note(const uint8_t *buffer, uint32_t len, uint32_t *pos) {
     return note;
 }
 
-STATIC void terminate_span(synthio_miditrack_obj_t *self, uint16_t *dur, uint16_t *max_dur) {
+STATIC void terminate_span(synthio_miditrack_obj_t *self, uint16_t *dur) {
     if (*dur) {
         self->track[self->total_spans - 1].dur = *dur;
-        if (*dur > *max_dur) {
-            *max_dur = *dur;
-        }
         *dur = 0;
     } else {
         self->total_spans--;
     }
 }
 
-STATIC void add_span(synthio_miditrack_obj_t *self, uint8_t note1, uint8_t note2) {
-    synthio_midi_span_t span = { 0, {note1, note2} };
+STATIC void add_span(synthio_miditrack_obj_t *self, const synthio_midi_span_t *span) {
     self->track = m_realloc(self->track,
         (self->total_spans + 1) * sizeof(synthio_midi_span_t));
-    self->track[self->total_spans++] = span;
+    self->track[self->total_spans++] = *span;
+}
+
+STATIC int find_channel_with_note(const synthio_midi_span_t *span, uint8_t note) {
+    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (span->note[i] == note) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+STATIC void change_span_note(synthio_miditrack_obj_t *self, uint8_t old_note, uint8_t new_note, uint16_t *dur) {
+    synthio_midi_span_t span = self->track[self->total_spans - 1];
+    int channel = find_channel_with_note(&span, old_note);
+    if (channel != -1) {
+        terminate_span(self, dur);
+        span.note[channel] = new_note;
+        add_span(self, &span);
+    }
 }
 
 void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate) {
 
-    synthio_midi_span_t initial = { 0, {SILENCE, SILENCE} };
+    synthio_midi_span_t initial = { 0, {[0 ... (CIRCUITPY_SYNTHIO_MAX_CHANNELS - 1)] = SILENCE} };
     self->sample_rate = sample_rate;
     self->track = m_malloc(sizeof(synthio_midi_span_t), false);
     self->next_span = 0;
     self->total_spans = 1;
     *self->track = initial;
 
-    uint16_t dur = 0, max_dur = 0;
+    uint16_t dur = 0;
     uint32_t pos = 0;
     while (pos < len) {
         uint8_t c;
@@ -91,37 +105,19 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
             raise_midi_stream_error(pos);
         }
 
+        // dur is carried over here so that if a note on/off message doesn't actually produce a change, the
+        // underlying "span" is extended. Otherwise, it is zeroed out in the call to `terminate_span`.
         dur += delta * sample_rate / tempo;
 
         switch (buffer[pos++] >> 4) {
             case 8: { // Note Off
                 uint8_t note = parse_note(buffer, len, &pos);
-
-                // Ignore if not a note which is playing
-                synthio_midi_span_t last_span = self->track[self->total_spans - 1];
-                if (last_span.note[0] == note || last_span.note[1] == note) {
-                    terminate_span(self, &dur, &max_dur);
-                    if (last_span.note[0] == note) {
-                        add_span(self, last_span.note[1], SILENCE);
-                    } else {
-                        add_span(self, last_span.note[0], SILENCE);
-                    }
-                }
+                change_span_note(self, note, SILENCE, &dur);
                 break;
             }
             case 9: { // Note On
                 uint8_t note = parse_note(buffer, len, &pos);
-
-                // Ignore if two notes are already playing
-                synthio_midi_span_t last_span = self->track[self->total_spans - 1];
-                if (last_span.note[1] == SILENCE) {
-                    terminate_span(self, &dur, &max_dur);
-                    if (last_span.note[0] == SILENCE) {
-                        add_span(self, note, SILENCE);
-                    } else {
-                        add_span(self, last_span.note[0], note);
-                    }
-                }
+                change_span_note(self, SILENCE, note, &dur);
                 break;
             }
             case 10:
@@ -142,8 +138,12 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
                 raise_midi_stream_error(pos);
         }
     }
-    terminate_span(self, &dur, &max_dur);
+    terminate_span(self, &dur);
 
+    uint16_t max_dur = 0;
+    for (int i = 0; i < self->total_spans; i++) {
+        max_dur = MAX(self->track[i].dur, max_dur);
+    }
     self->buffer_length = max_dur * BYTES_PER_SAMPLE;
     self->buffer = m_malloc(self->buffer_length, false);
 }
@@ -177,6 +177,16 @@ void synthio_miditrack_reset_buffer(synthio_miditrack_obj_t *self,
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
+static int count_active_channels(synthio_midi_span_t *span) {
+    int result = 0;
+    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (span->note[i] != SILENCE) {
+            result += 1;
+        }
+    }
+    return result;
+}
+
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
 
@@ -187,19 +197,26 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
 
     synthio_midi_span_t span = self->track[self->next_span++];
     *buffer_length = span.dur * BYTES_PER_SAMPLE;
-    uint8_t octave1 = span.note[0] / 12; // 0..10
-    uint8_t octave2 = span.note[1] / 12; // 0..10
-    int32_t base_freq1 = notes[span.note[0] % 12];
-    int32_t base_freq2 = notes[span.note[1] % 12];
-    int32_t sample_rate = self->sample_rate;
+    memset(self->buffer, 0, *buffer_length);
 
-    for (uint16_t i = 0; i < span.dur; i++) {
-        int16_t semiperiod1 = span.note[0] == SILENCE ? 0 :
-            ((base_freq1 * i * 2) / sample_rate) >> (10 - octave1);
-        int16_t semiperiod2 = span.note[1] == SILENCE ? semiperiod1 :
-            ((base_freq2 * i * 2) / sample_rate) >> (10 - octave2);
-        self->buffer[i] = ((semiperiod1 % 2 + semiperiod2 % 2) - 1) * LOUDNESS;
+    int32_t sample_rate = self->sample_rate;
+    int active_channels = count_active_channels(&span);
+    if (active_channels) {
+        int16_t loudness = 0x3fff / (1 + active_channels);
+        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+            uint8_t octave = span.note[chan] / 12;
+            uint16_t base_freq = notes[span.note[chan] % 12];
+            if (span.note[chan] == SILENCE) {
+                continue;
+            }
+            for (uint16_t i = 0; i < span.dur; i++) {
+                int16_t semiperiod =
+                    ((base_freq * i * 2) / sample_rate) >> (10 - octave);
+                self->buffer[i] += semiperiod % 2 ? loudness : -loudness;
+            }
+        }
     }
+
     *buffer = (uint8_t *)self->buffer;
 
     return self->next_span >= self->total_spans ?
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index 0af174ebc1..39e61b046e 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -33,7 +33,7 @@
 
 typedef struct {
     uint16_t dur;
-    uint8_t note[2];
+    uint8_t note[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_midi_span_t;
 
 typedef struct {

From 7f73ff1b2d7a5fb8d8e9f4312c92c165d5e53384 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 31 Mar 2023 10:51:03 -0500
Subject: [PATCH 2181/2403] hold accumulator phase across span

this fixes grunk in held notes
---
 shared-module/synthio/MidiTrack.c | 12 ++++++++----
 shared-module/synthio/MidiTrack.h |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index da810b99f3..dd36e7c454 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -204,16 +204,20 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
     if (active_channels) {
         int16_t loudness = 0x3fff / (1 + active_channels);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-            uint8_t octave = span.note[chan] / 12;
-            uint16_t base_freq = notes[span.note[chan] % 12];
             if (span.note[chan] == SILENCE) {
+                self->accum[chan] = 0;
                 continue;
             }
+            uint8_t octave = span.note[chan] / 12;
+            uint16_t base_freq = notes[span.note[chan] % 12];
+            uint32_t accum = self->accum[chan];
+            uint32_t rate = base_freq * 2;
             for (uint16_t i = 0; i < span.dur; i++) {
-                int16_t semiperiod =
-                    ((base_freq * i * 2) / sample_rate) >> (10 - octave);
+                accum += rate;
+                int16_t semiperiod = (accum / sample_rate) >> (10 - octave);
                 self->buffer[i] += semiperiod % 2 ? loudness : -loudness;
             }
+            self->accum[chan] = accum;
         }
     }
 
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index 39e61b046e..083392e608 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -44,6 +44,7 @@ typedef struct {
     synthio_midi_span_t *track;
     uint16_t next_span;
     uint16_t total_spans;
+    uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_miditrack_obj_t;
 
 

From db1e01c462876846ae52ae98ca4da17d0b7f3208 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 31 Mar 2023 16:41:05 -0500
Subject: [PATCH 2182/2403] Don't require huge buffers for long-held notes

---
 shared-module/synthio/MidiTrack.c | 29 +++++++++++++++++++----------
 shared-module/synthio/MidiTrack.h |  3 ++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index dd36e7c454..c745479c4a 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -27,9 +27,10 @@
 #include "py/runtime.h"
 #include "shared-bindings/synthio/MidiTrack.h"
 
-#define BITS_PER_SAMPLE 16
+#define BITS_PER_SAMPLE (16)
 #define BYTES_PER_SAMPLE (BITS_PER_SAMPLE / 8)
-#define SILENCE 0x80
+#define MAX_DUR (512)
+#define SILENCE (0x80)
 
 STATIC NORETURN void raise_midi_stream_error(uint32_t pos) {
     mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos);
@@ -77,6 +78,7 @@ STATIC void change_span_note(synthio_miditrack_obj_t *self, uint8_t old_note, ui
         terminate_span(self, dur);
         span.note[channel] = new_note;
         add_span(self, &span);
+        *dur = 0;
     }
 }
 
@@ -144,7 +146,7 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     for (int i = 0; i < self->total_spans; i++) {
         max_dur = MAX(self->track[i].dur, max_dur);
     }
-    self->buffer_length = max_dur * BYTES_PER_SAMPLE;
+    self->buffer_length = MIN(MAX_DUR, max_dur) * BYTES_PER_SAMPLE;
     self->buffer = m_malloc(self->buffer_length, false);
 }
 
@@ -171,6 +173,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_output, uint8_t channel) {
 
+    self->remaining_dur = 0;
     self->next_span = 0;
 }
 
@@ -189,14 +192,20 @@ static int count_active_channels(synthio_midi_span_t *span) {
 
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
+    synthio_midi_span_t span = self->track[self->next_span - !!self->remaining_dur];
 
-    if (self->next_span >= self->total_spans) {
-        *buffer_length = 0;
-        return GET_BUFFER_DONE;
+    if (self->remaining_dur == 0) {
+        if (self->next_span >= self->total_spans) {
+            *buffer_length = 0;
+            return GET_BUFFER_DONE;
+        }
+        self->next_span++;
+        self->remaining_dur = span.dur;
     }
 
-    synthio_midi_span_t span = self->track[self->next_span++];
-    *buffer_length = span.dur * BYTES_PER_SAMPLE;
+    uint16_t dur = MIN(MAX_DUR, self->remaining_dur);
+    self->remaining_dur -= dur;
+    *buffer_length = dur * BYTES_PER_SAMPLE;
     memset(self->buffer, 0, *buffer_length);
 
     int32_t sample_rate = self->sample_rate;
@@ -212,7 +221,7 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
             uint16_t base_freq = notes[span.note[chan] % 12];
             uint32_t accum = self->accum[chan];
             uint32_t rate = base_freq * 2;
-            for (uint16_t i = 0; i < span.dur; i++) {
+            for (uint16_t i = 0; i < dur; i++) {
                 accum += rate;
                 int16_t semiperiod = (accum / sample_rate) >> (10 - octave);
                 self->buffer[i] += semiperiod % 2 ? loudness : -loudness;
@@ -223,7 +232,7 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
 
     *buffer = (uint8_t *)self->buffer;
 
-    return self->next_span >= self->total_spans ?
+    return (self->remaining_dur == 0 && self->next_span >= self->total_spans) ?
            GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
 }
 
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index 083392e608..42ef9c93ae 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -41,10 +41,11 @@ typedef struct {
     uint32_t sample_rate;
     uint16_t *buffer;
     uint16_t buffer_length;
-    synthio_midi_span_t *track;
+    uint16_t remaining_dur;
     uint16_t next_span;
     uint16_t total_spans;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+    synthio_midi_span_t *track;
 } synthio_miditrack_obj_t;
 
 

From 13e17e6dcd7a3c73e7dbff49ef0c32160f563a28 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 10:19:44 -0500
Subject: [PATCH 2183/2403] Make synthio debuggable in unix coverage port

---
 .../unix/variants/coverage/mpconfigvariant.mk | 16 ++++++-
 py/circuitpy_mpconfig.mk                      |  5 ++
 shared-bindings/audiocore/WaveFile.c          |  1 +
 shared-bindings/audiocore/__init__.c          | 48 ++++++++++++++++++-
 shared-bindings/audiomixer/Mixer.h            |  1 -
 shared-bindings/synthio/__init__.c            |  5 ++
 shared-module/synthio/MidiTrack.c             |  7 ++-
 7 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 20320916bc..fca9a99518 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -30,15 +30,23 @@ SRC_BITMAP := \
 	displayio_min.c \
 	shared-bindings/aesio/aes.c \
 	shared-bindings/aesio/__init__.c \
+	shared-bindings/audiocore/__init__.c \
+	shared-bindings/audiocore/RawSample.c \
+	shared-bindings/audiocore/WaveFile.c \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
 	shared-bindings/rainbowio/__init__.c \
 	shared-bindings/struct/__init__.c \
+	shared-bindings/synthio/__init__.c \
+	shared-bindings/synthio/MidiTrack.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
 	shared-bindings/zlib/__init__.c \
 	shared-module/aesio/aes.c \
 	shared-module/aesio/__init__.c \
+	shared-module/audiocore/__init__.c \
+	shared-module/audiocore/RawSample.c \
+	shared-module/audiocore/WaveFile.c \
 	shared-module/bitmaptools/__init__.c \
 	shared-module/displayio/area.c \
 	shared-module/displayio/Bitmap.c \
@@ -47,6 +55,8 @@ SRC_BITMAP := \
 	shared-module/os/getenv.c \
 	shared-module/rainbowio/__init__.c \
 	shared-module/struct/__init__.c \
+	shared-module/synthio/__init__.c \
+	shared-module/synthio/MidiTrack.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
 
@@ -54,12 +64,16 @@ SRC_C += $(SRC_BITMAP)
 
 CFLAGS += \
 	-DCIRCUITPY_AESIO=1 \
+	-DCIRCUITPY_AUDIOCORE=1 \
+	-DCIRCUITPY_AUDIOCORE_DEBUG=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
-	-DCIRCUITPY_OS_GETENV=1 \
 	-DCIRCUITPY_GIFIO=1 \
+	-DCIRCUITPY_OS_GETENV=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
 	-DCIRCUITPY_STRUCT=1 \
+	-DCIRCUITPY_SYNTHIO=1 \
+	-DCIRCUITPY_SYNTHIO_MAX_CHANNELS=14 \
 	-DCIRCUITPY_TRACEBACK=1 \
 	-DCIRCUITPY_ZLIB=1
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 3e5acd908c..dcd870597e 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -107,6 +107,11 @@ CFLAGS += -DCIRCUITPY_AUDIOCORE=$(CIRCUITPY_AUDIOCORE)
 CIRCUITPY_AUDIOMIXER ?= $(CIRCUITPY_AUDIOIO)
 CFLAGS += -DCIRCUITPY_AUDIOMIXER=$(CIRCUITPY_AUDIOMIXER)
 
+ifndef CIRCUITPY_AUDIOCORE_DEBUG
+CIRCUITPY_AUDIOCORE_DEBUG ?= 0
+endif
+CFLAGS += -DCIRCUITPY_AUDIOCORE_DEBUG=$(CIRCUITPY_AUDIOCORE_DEBUG)
+
 ifndef CIRCUITPY_AUDIOMP3
 ifeq ($(CIRCUITPY_FULL_BUILD),1)
 CIRCUITPY_AUDIOMP3 = $(CIRCUITPY_AUDIOCORE)
diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 36204fa2b2..3a13db72a0 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/audiocore/WaveFile.h"
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
+#include "extmod/vfs_posix.h"
 
 //| class WaveFile:
 //|     """Load a wave file for audio playback
diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c
index 2e3b479cf6..6f32979099 100644
--- a/shared-bindings/audiocore/__init__.c
+++ b/shared-bindings/audiocore/__init__.c
@@ -29,7 +29,6 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/audiocore/__init__.h"
 #include "shared-bindings/audiocore/RawSample.h"
 #include "shared-bindings/audiocore/WaveFile.h"
@@ -37,10 +36,57 @@
 
 //| """Support for audio samples"""
 
+#if CIRCUITPY_AUDIOCORE_DEBUG
+// (no docstrings so that the debug functions are not shown on docs.circuitpython.org)
+STATIC mp_obj_t audiocore_get_buffer(mp_obj_t sample_in) {
+    uint8_t *buffer = NULL;
+    uint32_t buffer_length = 0;
+    audioio_get_buffer_result_t gbr = audiosample_get_buffer(sample_in, false, 0, &buffer, &buffer_length);
+
+    mp_obj_t result[2] = {mp_obj_new_int_from_uint(gbr), mp_const_none};
+
+    if (gbr != GET_BUFFER_ERROR) {
+        // copies the data because the gc semantics of get_buffer are unclear
+        result[1] = mp_obj_new_bytes(buffer, buffer_length);
+    }
+
+    return mp_obj_new_tuple(2, result);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_buffer_obj, audiocore_get_buffer);
+
+STATIC mp_obj_t audiocore_get_structure(mp_obj_t sample_in) {
+    bool single_buffer, samples_signed;
+    uint32_t max_buffer_length;
+    uint8_t spacing;
+
+    audiosample_get_buffer_structure(sample_in, false, &single_buffer, &samples_signed, &max_buffer_length, &spacing);
+    mp_obj_t result[4] = {
+        mp_obj_new_int_from_uint(single_buffer),
+        mp_obj_new_int_from_uint(samples_signed),
+        mp_obj_new_int_from_uint(max_buffer_length),
+        mp_obj_new_int_from_uint(spacing),
+    };
+    return mp_obj_new_tuple(4, result);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_structure_obj, audiocore_get_structure);
+
+STATIC mp_obj_t audiocore_reset_buffer(mp_obj_t sample_in) {
+    audiosample_reset_buffer(sample_in, false, 0);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_reset_buffer_obj, audiocore_reset_buffer);
+
+#endif
+
 STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiocore) },
     { MP_ROM_QSTR(MP_QSTR_RawSample), MP_ROM_PTR(&audioio_rawsample_type) },
     { MP_ROM_QSTR(MP_QSTR_WaveFile), MP_ROM_PTR(&audioio_wavefile_type) },
+    #if CIRCUITPY_AUDIOCORE_DEBUG
+    { MP_ROM_QSTR(MP_QSTR_get_buffer), MP_ROM_PTR(&audiocore_get_buffer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset_buffer), MP_ROM_PTR(&audiocore_reset_buffer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_structure), MP_ROM_PTR(&audiocore_get_structure_obj) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(audiocore_module_globals, audiocore_module_globals_table);
diff --git a/shared-bindings/audiomixer/Mixer.h b/shared-bindings/audiomixer/Mixer.h
index 88592a1cb3..fd1154cc43 100644
--- a/shared-bindings/audiomixer/Mixer.h
+++ b/shared-bindings/audiomixer/Mixer.h
@@ -27,7 +27,6 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOMIXER_MIXER_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOMIXER_MIXER_H
 
-#include "common-hal/microcontroller/Pin.h"
 #include "shared-module/audiomixer/Mixer.h"
 #include "shared-bindings/audiocore/RawSample.h"
 
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 106a073535..29a0c4d293 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "extmod/vfs_fat.h"
+#include "extmod/vfs_posix.h"
 
 #include "shared-bindings/synthio/__init__.h"
 #include "shared-bindings/synthio/MidiTrack.h"
@@ -115,7 +116,11 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     common_hal_synthio_miditrack_construct(result, buffer, track_size,
         tempo, args[ARG_sample_rate].u_int);
 
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+    m_free(buffer, track_size);
+    #else
     m_free(buffer);
+    #endif
 
     return MP_OBJ_FROM_PTR(result);
 }
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index c745479c4a..dbc2d4ced1 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -57,8 +57,7 @@ STATIC void terminate_span(synthio_miditrack_obj_t *self, uint16_t *dur) {
 }
 
 STATIC void add_span(synthio_miditrack_obj_t *self, const synthio_midi_span_t *span) {
-    self->track = m_realloc(self->track,
-        (self->total_spans + 1) * sizeof(synthio_midi_span_t));
+    self->track = m_renew(synthio_midi_span_t, self->track, self->total_spans, self->total_spans + 1);
     self->track[self->total_spans++] = *span;
 }
 
@@ -151,9 +150,9 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
 }
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self) {
-    m_free(self->buffer);
+    m_del(uint8_t, self->buffer, self->buffer_length);
     self->buffer = NULL;
-    m_free(self->track);
+    m_del(synthio_midi_span_t, self->track, self->total_spans + 1);
     self->track = NULL;
 }
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self) {

From e9e4ce9546806de4e9f4b1dd6bf37d825391b673 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 10:21:22 -0500
Subject: [PATCH 2184/2403] add waveform support in synthio

a waveform object (array of 'h') can be passed in, replacing the
standard square wave. This waveform must be a 'single cycle waveform'
and some obvious things to pass in are sine, triangle or sawtooth waves,
but you can construct whatever you like.
---
 locale/circuitpython.pot            | 23 +++++++++-------------
 shared-bindings/synthio/MidiTrack.c | 30 +++++++++++++++++++++++++----
 shared-bindings/synthio/MidiTrack.h |  2 +-
 shared-bindings/synthio/__init__.c  | 20 +++++++++++++++++--
 shared-bindings/synthio/__init__.h  |  9 ++-------
 shared-module/synthio/MidiTrack.c   | 21 ++++++++++++++++----
 shared-module/synthio/MidiTrack.h   |  4 +++-
 7 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b5026f7829..f87fc02975 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -192,6 +193,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
@@ -1217,6 +1222,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1224,6 +1230,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -3827,11 +3834,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3856,14 +3859,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4276,10 +4275,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index b987337eaa..727b9ba335 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -32,13 +32,19 @@
 #include "py/runtime.h"
 #include "shared-bindings/util.h"
 #include "shared-bindings/synthio/MidiTrack.h"
+#include "shared-bindings/synthio/__init__.h"
 #include "supervisor/shared/translate/translate.h"
 
 //| class MidiTrack:
-//|     """Simple square-wave MIDI synth"""
+//|     """Simple MIDI synth"""
 //|
 //|     def __init__(
-//|         self, buffer: ReadableBuffer, tempo: int, *, sample_rate: int = 11025
+//|         self,
+//|         buffer: ReadableBuffer,
+//|         tempo: int,
+//|         *,
+//|         sample_rate: int = 11025,
+//|         waveform: ReadableBuffer = None
 //|     ) -> None:
 //|         """Create a MidiTrack from the given stream of MIDI events. Only "Note On" and "Note Off" events
 //|         are supported; channel numbers and key velocities are ignored. Up to two notes may be on at the
@@ -47,6 +53,7 @@
 //|         :param ~circuitpython_typing.ReadableBuffer buffer: Stream of MIDI events, as stored in a MIDI file track chunk
 //|         :param int tempo: Tempo of the streamed events, in MIDI ticks per second
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
+//|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
 //|
 //|         Simple melody::
 //|
@@ -65,11 +72,12 @@
 //|           print("stopped")"""
 //|         ...
 STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_buffer, ARG_tempo, ARG_sample_rate };
+    enum { ARG_buffer, ARG_tempo, ARG_sample_rate, ARG_waveform };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_tempo, MP_ARG_INT | MP_ARG_REQUIRED },
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
+        { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -77,13 +85,27 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
 
+    mp_buffer_info_t bufinfo_waveform = {
+        .buf = shared_bindings_synthio_square_wave,
+        .len = 4
+    };
+
+    if (args[ARG_waveform].u_obj != mp_const_none) {
+        mp_get_buffer_raise(args[ARG_waveform].u_obj, &bufinfo_waveform, MP_BUFFER_READ);
+        if (bufinfo_waveform.typecode != 'h') {
+            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
+        }
+    }
+
     synthio_miditrack_obj_t *self = m_new_obj(synthio_miditrack_obj_t);
     self->base.type = &synthio_miditrack_type;
 
     common_hal_synthio_miditrack_construct(self,
         (uint8_t *)bufinfo.buf, bufinfo.len,
         args[ARG_tempo].u_int,
-        args[ARG_sample_rate].u_int);
+        args[ARG_sample_rate].u_int,
+        bufinfo_waveform.buf,
+        bufinfo_waveform.len / 2);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/synthio/MidiTrack.h b/shared-bindings/synthio/MidiTrack.h
index d44d4c3bb7..90ddab8728 100644
--- a/shared-bindings/synthio/MidiTrack.h
+++ b/shared-bindings/synthio/MidiTrack.h
@@ -32,7 +32,7 @@
 extern const mp_obj_type_t synthio_miditrack_type;
 
 void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
-    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate);
+    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len);
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self);
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 29a0c4d293..dc627adb36 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -35,6 +35,8 @@
 #include "shared-bindings/synthio/__init__.h"
 #include "shared-bindings/synthio/MidiTrack.h"
 
+int16_t shared_bindings_synthio_square_wave[] = {-32768, 32767};
+
 //| """Support for MIDI synthesis"""
 //|
 //| def from_file(file: typing.BinaryIO, *, sample_rate: int = 11025) -> MidiTrack:
@@ -43,6 +45,7 @@
 //|
 //|     :param typing.BinaryIO file: Already opened MIDI file
 //|     :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
+//|     :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
 //|
 //|
 //|     Playing a MIDI file from flash::
@@ -63,10 +66,11 @@
 //|     ...
 //|
 STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_file, ARG_sample_rate };
+    enum { ARG_file, ARG_sample_rate, ARG_waveform };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
+        { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.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);
@@ -75,6 +79,18 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     }
     pyb_file_obj_t *file = MP_OBJ_TO_PTR(args[ARG_file].u_obj);
 
+    mp_buffer_info_t bufinfo_waveform = {
+        .buf = shared_bindings_synthio_square_wave,
+        .len = 4
+    };
+
+    if (args[ARG_waveform].u_obj != mp_const_none) {
+        mp_get_buffer_raise(args[ARG_waveform].u_obj, &bufinfo_waveform, MP_BUFFER_READ);
+        if (bufinfo_waveform.typecode != 'h') {
+            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
+        }
+    }
+
     uint8_t chunk_header[14];
     f_rewind(&file->fp);
     UINT bytes_read;
@@ -114,7 +130,7 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     result->base.type = &synthio_miditrack_type;
 
     common_hal_synthio_miditrack_construct(result, buffer, track_size,
-        tempo, args[ARG_sample_rate].u_int);
+        tempo, args[ARG_sample_rate].u_int, bufinfo_waveform.buf, bufinfo_waveform.len / 2);
 
     #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
     m_free(buffer, track_size);
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index 14af1a5805..3b7d47db28 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -24,11 +24,6 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO___INIT___H
+#pragma once
 
-#include "py/obj.h"
-
-// Nothing now.
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO___INIT___H
+extern int16_t shared_bindings_synthio_square_wave[];
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index dbc2d4ced1..f7c17427d1 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -32,6 +32,7 @@
 #define MAX_DUR (512)
 #define SILENCE (0x80)
 
+
 STATIC NORETURN void raise_midi_stream_error(uint32_t pos) {
     mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos);
 }
@@ -82,7 +83,8 @@ STATIC void change_span_note(synthio_miditrack_obj_t *self, uint8_t old_note, ui
 }
 
 void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
-    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate) {
+    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate,
+    const int16_t *waveform, uint16_t waveform_length) {
 
     synthio_midi_span_t initial = { 0, {[0 ... (CIRCUITPY_SYNTHIO_MAX_CHANNELS - 1)] = SILENCE} };
     self->sample_rate = sample_rate;
@@ -90,6 +92,11 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     self->next_span = 0;
     self->total_spans = 1;
     *self->track = initial;
+    self->waveform = waveform;
+    self->waveform_length = waveform_length;
+    (void)mp_arg_validate_length_min(waveform_length, 2, MP_QSTR_waveform);
+    mp_printf(&mp_plat_print, "note: waveform_length = %d\n", waveform_length);
+    mp_printf(&mp_plat_print, "waveform[0:2] = %d %d\n", waveform[0], waveform[1]);
 
     uint16_t dur = 0;
     uint32_t pos = 0;
@@ -209,6 +216,9 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
 
     int32_t sample_rate = self->sample_rate;
     int active_channels = count_active_channels(&span);
+    const int16_t *waveform = self->waveform;
+    int16_t waveform_length = self->waveform_length;
+    int16_t *out_buffer = self->buffer;
     if (active_channels) {
         int16_t loudness = 0x3fff / (1 + active_channels);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
@@ -219,11 +229,14 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
             uint8_t octave = span.note[chan] / 12;
             uint16_t base_freq = notes[span.note[chan] % 12];
             uint32_t accum = self->accum[chan];
-            uint32_t rate = base_freq * 2;
+            uint32_t rate = base_freq * waveform_length;
             for (uint16_t i = 0; i < dur; i++) {
                 accum += rate;
-                int16_t semiperiod = (accum / sample_rate) >> (10 - octave);
-                self->buffer[i] += semiperiod % 2 ? loudness : -loudness;
+                int16_t idx = ((accum / sample_rate) >> (10 - octave)) % waveform_length;
+                if (chan == 0 && i < 10) {
+                    mp_printf(&mp_plat_print, "%d %d %d\n", accum, idx, waveform[idx]);
+                }
+                out_buffer[i] += (waveform[idx] * loudness) / 65536;
             }
             self->accum[chan] = accum;
         }
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index 42ef9c93ae..c9206c69bb 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -39,11 +39,13 @@ typedef struct {
 typedef struct {
     mp_obj_base_t base;
     uint32_t sample_rate;
-    uint16_t *buffer;
+    int16_t *buffer;
     uint16_t buffer_length;
     uint16_t remaining_dur;
     uint16_t next_span;
     uint16_t total_spans;
+    uint16_t waveform_length;
+    const int16_t *waveform;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
     synthio_midi_span_t *track;
 } synthio_miditrack_obj_t;

From e728a0c1b9eccb75d1c5edb452e75abb2931d57b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 11:42:51 -0500
Subject: [PATCH 2185/2403] switch to 16.16 fixed point for synthesis

---
 shared-module/synthio/MidiTrack.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index f7c17427d1..e2614bd0a3 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -94,9 +94,7 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     *self->track = initial;
     self->waveform = waveform;
     self->waveform_length = waveform_length;
-    (void)mp_arg_validate_length_min(waveform_length, 2, MP_QSTR_waveform);
-    mp_printf(&mp_plat_print, "note: waveform_length = %d\n", waveform_length);
-    mp_printf(&mp_plat_print, "waveform[0:2] = %d %d\n", waveform[0], waveform[1]);
+    mp_arg_validate_length_range(waveform_length, 2, 1024, MP_QSTR_waveform);
 
     uint16_t dur = 0;
     uint32_t pos = 0;
@@ -217,7 +215,7 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
     int32_t sample_rate = self->sample_rate;
     int active_channels = count_active_channels(&span);
     const int16_t *waveform = self->waveform;
-    int16_t waveform_length = self->waveform_length;
+    uint32_t waveform_length = self->waveform_length;
     int16_t *out_buffer = self->buffer;
     if (active_channels) {
         int16_t loudness = 0x3fff / (1 + active_channels);
@@ -229,13 +227,20 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
             uint8_t octave = span.note[chan] / 12;
             uint16_t base_freq = notes[span.note[chan] % 12];
             uint32_t accum = self->accum[chan];
-            uint32_t rate = base_freq * waveform_length;
+#define SHIFT (16)
+            // rate = base_freq * waveform_length
+            // den = sample_rate * 2 ^ (10 - octave)
+            // den = sample_rate * 2 ^ 10 / 2^octave
+            // dds_rate = 2^SHIFT * rate / den
+            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
+            uint32_t dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SHIFT - 10 + octave))) / sample_rate;
+
             for (uint16_t i = 0; i < dur; i++) {
-                accum += rate;
-                int16_t idx = ((accum / sample_rate) >> (10 - octave)) % waveform_length;
-                if (chan == 0 && i < 10) {
-                    mp_printf(&mp_plat_print, "%d %d %d\n", accum, idx, waveform[idx]);
+                accum += dds_rate;
+                if (accum > waveform_length << SHIFT) {
+                    accum -= waveform_length << SHIFT;
                 }
+                int16_t idx = accum >> SHIFT;
                 out_buffer[i] += (waveform[idx] * loudness) / 65536;
             }
             self->accum[chan] = accum;

From 736af5b0c80e1ce79935c72e3bdf545ff3a38cc8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 13:12:00 -0500
Subject: [PATCH 2186/2403] update expected result

---
 tests/unix/extra_coverage.py.exp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 8014dd3010..0baf8e1f44 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -30,20 +30,21 @@ ame__
 mport 
 
 builtins        micropython     _asyncio        _thread
-_uasyncio       aesio           array           binascii
-bitmaptools     btree           cexample        cmath
-collections     cppexample      displayio       errno
-ffi             framebuf        gc              hashlib
-json            math            qrio            rainbowio
-re              struct          sys             termios
-traceback       ubinascii       uctypes         uerrno
-uheapq          uio             ujson           ulab
-ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
-ulab.scipy      ulab.scipy.linalg
-ulab.scipy.optimize             ulab.scipy.signal
-ulab.scipy.special              ulab.utils      uos
-urandom         ure             uselect         utime
-utimeq          uzlib           zlib
+_uasyncio       aesio           array           audiocore
+binascii        bitmaptools     btree           cexample
+cmath           collections     cppexample      displayio
+errno           ffi             framebuf        gc
+hashlib         json            math            qrio
+rainbowio       re              struct          synthio
+sys             termios         traceback       ubinascii
+uctypes         uerrno          uheapq          uio
+ujson           ulab            ulab.numpy      ulab.numpy.fft
+ulab.numpy.linalg               ulab.scipy
+ulab.scipy.linalg               ulab.scipy.optimize
+ulab.scipy.signal               ulab.scipy.special
+ulab.utils      uos             urandom         ure
+uselect         utime           utimeq          uzlib
+zlib
 ime
 
 utime           utimeq

From a24b12ee1084c113f6c73260c29de86119ac25cb Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Sat, 1 Apr 2023 21:01:31 +0200
Subject: [PATCH 2187/2403] 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             | 19 +++++--------------
 locale/cs.po             | 19 +++++--------------
 locale/de_DE.po          | 28 ++++++++++++++--------------
 locale/el.po             | 19 +++++--------------
 locale/en_GB.po          | 28 ++++++++++++++--------------
 locale/es.po             | 28 ++++++++++++++--------------
 locale/fil.po            | 19 +++++--------------
 locale/fr.po             | 28 ++++++++++++++--------------
 locale/hi.po             | 19 +++++--------------
 locale/it_IT.po          | 19 +++++--------------
 locale/ja.po             | 25 +++++++++++--------------
 locale/ko.po             | 19 +++++--------------
 locale/nl.po             | 28 ++++++++++++++--------------
 locale/pl.po             | 25 +++++++++++--------------
 locale/pt_BR.po          | 28 ++++++++++++++--------------
 locale/ru.po             | 19 +++++--------------
 locale/sv.po             | 28 ++++++++++++++--------------
 locale/tr.po             | 19 +++++--------------
 locale/zh_Latn_pinyin.po | 28 ++++++++++++++--------------
 19 files changed, 179 insertions(+), 266 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 21d3e4a4c2..99ed347bf5 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -125,6 +125,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1229,6 +1230,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1236,6 +1238,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "%q pada tidak valid"
@@ -3856,11 +3859,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3885,14 +3884,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parameter harus menjadi register dalam urutan r0 sampai r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4305,10 +4300,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index a8d09ade34..9f2917d396 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -126,6 +126,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1229,6 +1230,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1236,6 +1238,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Neplatný pin %q"
@@ -3842,11 +3845,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3871,14 +3870,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4291,10 +4286,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3c0c0c8233..30b1c8a6c7 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -134,6 +134,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q in %q muss von Typ %q sein, nicht %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1253,6 +1254,7 @@ msgstr "Der Interne WatchDog Timer ist abgelaufen."
 msgid "Interrupt error."
 msgstr "Interrupt Fehler."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1260,6 +1262,7 @@ msgid "Invalid %q"
 msgstr "Ungültiger %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ungültiger %q Pin"
@@ -3927,11 +3930,7 @@ msgstr "Ausgabe-Array ist zu klein"
 msgid "out must be a float dense array"
 msgstr "Ausgabe muss ein floatdichtes Array sein"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "Außerhalb des Bereichs der Quelle"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "Außerhalb des Bereichs des Ziels"
 
@@ -3956,14 +3955,10 @@ msgstr "Die Parameter müssen Register der Reihenfolge a2 bis a5 sein"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "Parameter müssen Register im Bereich von r0 bis r3 sein"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "Pixelkoordinaten außerhalb der Grenzen"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "Der Pixelwert erfordert zu viele Bits"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader muss displayio.Palette oder displayio.ColorConverter sein"
@@ -4378,10 +4373,6 @@ msgstr "Wert muss in %d Byte(s) passen"
 msgid "value out of range of target"
 msgstr "Wert außerhalb des Zielbereiches"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count muss größer als 0 sein"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "watchdog nicht initialisiert"
@@ -4469,6 +4460,15 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "out of range of source"
+#~ msgstr "Außerhalb des Bereichs der Quelle"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "Der Pixelwert erfordert zu viele Bits"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count muss größer als 0 sein"
+
 #~ msgid "64 bit types"
 #~ msgstr "64 bit-Typen"
 
diff --git a/locale/el.po b/locale/el.po
index 3336cbae67..69d62af435 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -130,6 +130,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1237,6 +1238,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1244,6 +1246,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -3849,11 +3852,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3878,14 +3877,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4298,10 +4293,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 9c26f47d45..0f6abecec5 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -129,6 +129,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1230,6 +1231,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1237,6 +1239,7 @@ msgid "Invalid %q"
 msgstr "Invalid %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Invalid %q pin"
@@ -3853,11 +3856,7 @@ msgstr "out array is too small"
 msgid "out must be a float dense array"
 msgstr "out must be a float dense array"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "out of range of source"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "out of range of target"
 
@@ -3882,14 +3881,10 @@ msgstr "parameters must be registers in sequence a2 to a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parameters must be registers in sequence r0 to r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "pixel coordinates out of bounds"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "pixel value requires too many bits"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader must be displayio.Palette or displayio.ColorConverter"
@@ -4302,10 +4297,6 @@ msgstr "value must fit in %d byte(s)"
 msgid "value out of range of target"
 msgstr "value out of range of target"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count must be > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "WatchDog not initialised"
@@ -4393,6 +4384,15 @@ 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 "out of range of source"
+#~ msgstr "out of range of source"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "pixel value requires too many bits"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count must be > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "64 bit types"
 
diff --git a/locale/es.po b/locale/es.po
index 266ac9edea..3dd68ca430 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -137,6 +137,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q en %q debe ser del tipo %q, no %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1263,6 +1264,7 @@ msgstr "El temporizador interno watchdog terminó."
 msgid "Interrupt error."
 msgstr "Error de interrupción."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1270,6 +1272,7 @@ msgid "Invalid %q"
 msgstr "%q inválido"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pin %q inválido"
@@ -3925,11 +3928,7 @@ msgstr "La matriz de salida es demasiado pequeña"
 msgid "out must be a float dense array"
 msgstr "la matriz de salida debe ser densa de números float"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "fuera de rango de fuente"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "fuera de rango del objetivo"
 
@@ -3954,14 +3953,10 @@ msgstr "los parámetros deben ser registros en secuencia de a2 a a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "los parametros deben ser registros en secuencia del r0 al r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "coordenadas del pixel fuera de límites"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "valor del pixel require demasiado bits"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader debe ser displayio.Palette o displayio.ColorConverter"
@@ -4375,10 +4370,6 @@ msgstr "el valor debe caber en %d byte(s)"
 msgid "value out of range of target"
 msgstr "valor fuera de alcance al blanco"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count debe ser > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "watchdog no inicializado"
@@ -4466,6 +4457,15 @@ 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 "out of range of source"
+#~ msgstr "fuera de rango de fuente"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "valor del pixel require demasiado bits"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count debe ser > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "tipos de 64 bit"
 
diff --git a/locale/fil.po b/locale/fil.po
index f83cfb1173..7540377953 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -123,6 +123,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1229,6 +1230,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1236,6 +1238,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Mali ang %q pin"
@@ -3862,11 +3865,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3891,15 +3890,11 @@ msgstr "ang mga parameter ay dapat na nagrerehistro sa sequence a2 hanggang a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "ang mga parameter ay dapat na nagrerehistro sa sequence r0 hanggang r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 #, fuzzy
 msgid "pixel coordinates out of bounds"
 msgstr "wala sa sakop ang address"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader ay dapat displayio.Palette o displayio.ColorConverter"
@@ -4312,10 +4307,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index e536cbd346..3076df8d16 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -134,6 +134,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q dans %q doit être de type %q, pas %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1269,6 +1270,7 @@ msgstr "Le minuteur du watchdog interne a expiré."
 msgid "Interrupt error."
 msgstr "Erreur d'interruption."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1276,6 +1278,7 @@ msgid "Invalid %q"
 msgstr "%q invalide"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Broche invalide pour '%q'"
@@ -3943,11 +3946,7 @@ msgstr "matrice de sortie est trop petite"
 msgid "out must be a float dense array"
 msgstr "la matrice sortante doit être de type float"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "dépassement des bornes de source"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "dépassement des bornes de target"
 
@@ -3972,14 +3971,10 @@ msgstr "les paramètres doivent être des registres dans la séquence a2 à a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "les paramètres doivent être des registres dans la séquence r0 à r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "coordonnées de pixel hors limites"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "la valeur du pixel requiet trop de bits"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4394,10 +4389,6 @@ msgstr "la valeur doit tenir dans %d octet(s)"
 msgid "value out of range of target"
 msgstr "valeur hors de porté de la cible"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "'value_count' doit être > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "chien de garde (watchdog) non initialisé"
@@ -4485,6 +4476,15 @@ 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 "out of range of source"
+#~ msgstr "dépassement des bornes de source"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "la valeur du pixel requiet trop de bits"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "'value_count' doit être > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "types à 64 bit"
 
diff --git a/locale/hi.po b/locale/hi.po
index 977cd4986a..b0ede40028 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1217,6 +1218,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1224,6 +1226,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -3827,11 +3830,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3856,14 +3855,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4276,10 +4271,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b4e998f698..f8037c8954 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -126,6 +126,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1231,6 +1232,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1238,6 +1240,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pin %q non valido"
@@ -3871,11 +3874,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3901,15 +3900,11 @@ msgstr "parametri devono essere i registri in sequenza da a2 a a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parametri devono essere i registri in sequenza da a2 a a5"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 #, fuzzy
 msgid "pixel coordinates out of bounds"
 msgstr "indirizzo fuori limite"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader deve essere displayio.Palette o displayio.ColorConverter"
@@ -4322,10 +4317,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index ab8ca26d28..8931beb108 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -129,6 +129,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1230,6 +1231,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1237,6 +1239,7 @@ msgid "Invalid %q"
 msgstr "不正な %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "不正な%qピン"
@@ -3849,11 +3852,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "ソースが範囲外"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3878,14 +3877,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4300,10 +4295,6 @@ msgstr "値は%dバイトに収まらなければなりません"
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_countは0より大きくなければなりません"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
@@ -4391,6 +4382,12 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "out of range of source"
+#~ msgstr "ソースが範囲外"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_countは0より大きくなければなりません"
+
 #~ msgid "No key was specified"
 #~ msgstr "キーが指定されていません"
 
diff --git a/locale/ko.po b/locale/ko.po
index 21b5cdecd6..34d4ffcb5d 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -123,6 +123,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1220,6 +1221,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1227,6 +1229,7 @@ msgid "Invalid %q"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""
@@ -3831,11 +3834,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3860,14 +3859,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4280,10 +4275,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 50a0ab6d99..3232cc6f14 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1225,6 +1226,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1232,6 +1234,7 @@ msgid "Invalid %q"
 msgstr "Ongeldige %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ongeldige %q pin"
@@ -3861,11 +3864,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "buiten bereik van bron"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "buiten bereik van doel"
 
@@ -3890,14 +3889,10 @@ msgstr "parameters moeten registers zijn in de volgorde a2 tot a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parameters moeten registers zijn in de volgorde r0 tot r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "pixel coördinaten buiten bereik"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "pixel waarde vereist te veel bits"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader moet displayio.Palette of displayio.ColorConverter zijn"
@@ -4310,10 +4305,6 @@ msgstr "waarde moet in %d byte(s) passen"
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count moet groter dan 0 zijn"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "watchdog niet geïnitialiseerd"
@@ -4401,6 +4392,15 @@ 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 "out of range of source"
+#~ msgstr "buiten bereik van bron"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "pixel waarde vereist te veel bits"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count moet groter dan 0 zijn"
+
 #~ msgid "No key was specified"
 #~ msgstr "Een sleutel was niet gespecificeerd"
 
diff --git a/locale/pl.po b/locale/pl.po
index e873e45a51..e1bed87c6c 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -124,6 +124,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1225,6 +1226,7 @@ msgstr ""
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1232,6 +1234,7 @@ msgid "Invalid %q"
 msgstr "Nieprawidłowe %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Zła nóżka %q"
@@ -3836,11 +3839,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3865,14 +3864,10 @@ msgstr "parametry muszą być rejestrami w kolejności a2 do a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parametry muszą być rejestrami w kolejności r0 do r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "współrzędne piksela poza zakresem"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "wartość piksela wymaga zbyt wielu bitów"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4286,10 +4281,6 @@ msgstr "wartość musi mieścić się w %d bajtach"
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count musi być > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
@@ -4377,6 +4368,12 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "wartość piksela wymaga zbyt wielu bitów"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count musi być > 0"
+
 #~ msgid "No key was specified"
 #~ msgstr "Nie określono klucza"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 802966354a..85ca810b98 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -135,6 +135,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q em %q deve ser do tipo %q e não %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1259,6 +1260,7 @@ msgstr "O temporizador do watchdog interno expirou."
 msgid "Interrupt error."
 msgstr "Erro de interrupção."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1266,6 +1268,7 @@ msgid "Invalid %q"
 msgstr "%q Inválido"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Pino do %q inválido"
@@ -3924,11 +3927,7 @@ msgstr "a matriz externa é muito pequena"
 msgid "out must be a float dense array"
 msgstr "deve ser uma matriz densa flutuante"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "fora do alcance da fonte"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "fora do alcance do alvo"
 
@@ -3955,14 +3954,10 @@ msgstr "os parâmetros devem ser registradores na sequência a2 até a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "os parâmetros devem ser registradores na sequência r0 até r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "as coordenadas do pixel estão fora dos limites"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "o valor do pixel requer bits demais"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "o pixel_shader deve ser displayio.Palette ou displayio.ColorConverter"
@@ -4375,10 +4370,6 @@ msgstr "o valor deve caber em %d byte(s)"
 msgid "value out of range of target"
 msgstr "valor fora do alcance do alvo"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "o value_count deve ser > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "o watchdog não foi inicializado"
@@ -4466,6 +4457,15 @@ 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 "out of range of source"
+#~ msgstr "fora do alcance da fonte"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "o valor do pixel requer bits demais"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "o value_count deve ser > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "Tipos 64 bit"
 
diff --git a/locale/ru.po b/locale/ru.po
index e2c1eae4f1..4d40fe946e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -129,6 +129,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1262,6 +1263,7 @@ msgstr "Внутренний сторожевой таймер истек."
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1269,6 +1271,7 @@ msgid "Invalid %q"
 msgstr "Недопустимый %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Недопустимый пин %q"
@@ -3890,11 +3893,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3919,14 +3918,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4339,10 +4334,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/sv.po b/locale/sv.po
index a7dee9421d..8d3bed02f4 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -134,6 +134,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q i %q måste vara av typen %q, inte %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1244,6 +1245,7 @@ msgstr "Intern watchdog-timer har löpt ut."
 msgid "Interrupt error."
 msgstr "Interrupt-fel."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1251,6 +1253,7 @@ msgid "Invalid %q"
 msgstr "Ogiltig %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Ogiltig %q-pinne"
@@ -3887,11 +3890,7 @@ msgstr "matrisen för out är för liten"
 msgid "out must be a float dense array"
 msgstr "out måste vara en float dense array"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "utanför räckvidd för source"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "utanför räckvidd för target"
 
@@ -3916,14 +3915,10 @@ msgstr "parametrarna måste registreras i följd a2-a5"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "parametrarna måste registreras i följd r0-r3"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "pixelkoordinater utanför gränserna"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "pixelvärdet kräver för många bitar"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4337,10 +4332,6 @@ msgstr "värdet måste passa i %d byte(s)"
 msgid "value out of range of target"
 msgstr "värde utanför målintervall"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "value_count måste vara > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "watchdog är inte initierad"
@@ -4428,6 +4419,15 @@ 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 "out of range of source"
+#~ msgstr "utanför räckvidd för source"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "pixelvärdet kräver för många bitar"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "value_count måste vara > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "64-bitars typer"
 
diff --git a/locale/tr.po b/locale/tr.po
index f785cff4fc..5f3882ca9e 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -130,6 +130,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1235,6 +1236,7 @@ msgstr "Dahili bekçi zamanlayıcısının süresi doldu."
 msgid "Interrupt error."
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1242,6 +1244,7 @@ msgid "Invalid %q"
 msgstr "Geçersiz %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Geersi %q pin"
@@ -3849,11 +3852,7 @@ msgstr ""
 msgid "out must be a float dense array"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr ""
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
 
@@ -3878,14 +3877,10 @@ msgstr ""
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr ""
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr ""
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr ""
@@ -4298,10 +4293,6 @@ msgstr ""
 msgid "value out of range of target"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr ""
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr ""
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 2246687ef3..d149942d6a 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -137,6 +137,7 @@ msgid "%q in %q must be of type %q, not %q"
 msgstr "%q zhōng de %q bì xū shì %q lèi xíng, ér bù shì %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -1251,6 +1252,7 @@ msgstr "Nèibù kān mén gǒu dìngshí qì chāoshí."
 msgid "Interrupt error."
 msgstr "zhōng duàn cuò wù."
 
+#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
@@ -1258,6 +1260,7 @@ msgid "Invalid %q"
 msgstr "wú xiào %q"
 
 #: ports/atmel-samd/common-hal/microcontroller/Pin.c
+#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr "Wúxiào de %q yǐn jiǎo"
@@ -3891,11 +3894,7 @@ msgstr "chū zhèn liè tài xiǎo"
 msgid "out must be a float dense array"
 msgstr "chū bì xū shì yí gè fú dòng mì jí zhèn liè"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "out of range of source"
-msgstr "yuán fàn wéi wài"
-
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr "mù biāo fàn wéi wài"
 
@@ -3920,14 +3919,10 @@ msgstr "cānshù bìxū shì xùliè a2 zhì a5 de dēngjì shù"
 msgid "parameters must be registers in sequence r0 to r3"
 msgstr "cānshù bìxū shì xùliè r0 zhì r3 de dēngjì qì"
 
-#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c
 msgid "pixel coordinates out of bounds"
 msgstr "xiàngsù zuòbiāo chāochū biānjiè"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "pixel value requires too many bits"
-msgstr "xiàngsù zhí xūyào tài duō wèi"
-
 #: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
 msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 msgstr "pixel_shader bìxū shì displayio.Palette huò displayio.ColorConverter"
@@ -4343,10 +4338,6 @@ msgstr "Zhí bìxū fúhé %d zì jié"
 msgid "value out of range of target"
 msgstr "zhí fàn wéi wài de mù biāo"
 
-#: shared-bindings/displayio/Bitmap.c
-msgid "value_count must be > 0"
-msgstr "zhí jìshù bìxū wèi > 0"
-
 #: ports/espressif/common-hal/watchdog/WatchDogTimer.c
 msgid "watchdog not initialized"
 msgstr "wèi chū shǐ huà jiān shì qì"
@@ -4434,6 +4425,15 @@ 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 "out of range of source"
+#~ msgstr "yuán fàn wéi wài"
+
+#~ msgid "pixel value requires too many bits"
+#~ msgstr "xiàngsù zhí xūyào tài duō wèi"
+
+#~ msgid "value_count must be > 0"
+#~ msgstr "zhí jìshù bìxū wèi > 0"
+
 #~ msgid "64 bit types"
 #~ msgstr "64 wèi lèixíng"
 

From 05cf5213e20568f269f4fab678b307b06bf97fe3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 19:22:52 -0500
Subject: [PATCH 2188/2403] Allow disabling each class in keypad

.. for boards like pewpewm4 which need a specific kind. And need
some space.
---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk |  2 ++
 py/circuitpy_mpconfig.mk                           |  9 +++++++++
 shared-bindings/keypad/KeyMatrix.c                 | 10 ++++++++++
 shared-bindings/keypad/Keys.c                      |  9 +++++++++
 shared-bindings/keypad/ShiftRegisterKeys.c         |  8 ++++++++
 5 files changed, 38 insertions(+)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index f7e7be88d5..49be084ddf 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -44,6 +44,8 @@ CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_DISPLAYIO = 1
 CIRCUITPY_KEYPAD = 1
+CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS = 0
+CIRCUITPY_KEYPAD_KEYMATRIX = 0
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
 CIRCUITPY_SYNTHIO = 1
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index dcd870597e..0aec2ebe74 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -291,6 +291,15 @@ CFLAGS += -DCIRCUITPY_JSON=$(CIRCUITPY_JSON)
 CIRCUITPY_KEYPAD ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_KEYPAD=$(CIRCUITPY_KEYPAD)
 
+CIRCUITPY_KEYPAD_KEYS ?= $(CIRCUITPY_KEYPAD)
+CFLAGS += -DCIRCUITPY_KEYPAD_KEYS=$(CIRCUITPY_KEYPAD_KEYS)
+
+CIRCUITPY_KEYPAD_KEYMATRIX ?= $(CIRCUITPY_KEYPAD)
+CFLAGS += -DCIRCUITPY_KEYPAD_KEYMATRIX=$(CIRCUITPY_KEYPAD_KEYMATRIX)
+
+CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS ?= $(CIRCUITPY_KEYPAD)
+CFLAGS += -DCIRCUITPY_KEYPAD_SHIFTREGISTERKEYS=$(CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS)
+
 CIRCUITPY_MATH ?= 1
 CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
 
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 1c623f4bed..2209f3f68f 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -71,6 +71,7 @@
 //|         ...
 
 STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    #if CIRCUITPY_KEYPAD_KEYMATRIX
     keypad_keymatrix_obj_t *self = m_new_obj(keypad_keymatrix_obj_t);
     self->base.type = &keypad_keymatrix_type;
     enum { ARG_row_pins, ARG_column_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events };
@@ -114,8 +115,13 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
 
     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);
+    #else
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_KeyMatrix);
+
+    #endif
 }
 
+#if CIRCUITPY_KEYPAD_KEYMATRIX
 //|     def deinit(self) -> None:
 //|         """Stop scanning and release the pins."""
 //|         ...
@@ -228,9 +234,13 @@ STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
 
+#endif
+
 const mp_obj_type_t keypad_keymatrix_type = {
     { &mp_type_type },
     .name = MP_QSTR_KeyMatrix,
     .make_new = keypad_keymatrix_make_new,
+    #if CIRCUITPY_KEYPAD_KEYMATRIX
     .locals_dict = (mp_obj_t)&keypad_keymatrix_locals_dict,
+    #endif
 };
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 10519958c7..2481fedc6b 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -73,6 +73,7 @@
 //|         ...
 
 STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    #if CIRCUITPY_KEYPAD_KEYS
     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_interval, ARG_max_events };
@@ -106,8 +107,13 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s
     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);
+    #else
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_Keys);
+
+    #endif
 }
 
+#if CIRCUITPY_KEYPAD_KEYS
 //|     def deinit(self) -> None:
 //|         """Stop scanning and release the pins."""
 //|         ...
@@ -162,10 +168,13 @@ STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
+#endif
 
 const mp_obj_type_t keypad_keys_type = {
     { &mp_type_type },
     .name = MP_QSTR_Keys,
     .make_new = keypad_keys_make_new,
+    #if CIRCUITPY_KEYPAD_KEYS
     .locals_dict = (mp_obj_t)&keypad_keys_locals_dict,
+    #endif
 };
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 9113be33d2..9c44717a41 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -82,6 +82,7 @@
 //|         ...
 
 STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    #if CIRCUITPY_KEYPAD_KEYMATRIX
     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_key_count, ARG_value_when_pressed, ARG_interval, ARG_max_events };
@@ -113,8 +114,12 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
         self, clock, data, latch, value_to_latch, key_count, value_when_pressed, interval, max_events);
 
     return MP_OBJ_FROM_PTR(self);
+    #else
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_ShiftRegisterKeys);
+    #endif
 }
 
+#if CIRCUITPY_KEYPAD_KEYMATRIX
 //|     def deinit(self) -> None:
 //|         """Stop scanning and release the pins."""
 //|         ...
@@ -169,10 +174,13 @@ STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table);
+#endif
 
 const mp_obj_type_t keypad_shiftregisterkeys_type = {
     { &mp_type_type },
     .name = MP_QSTR_ShiftRegisterKeys,
     .make_new = keypad_shiftregisterkeys_make_new,
+    #if CIRCUITPY_KEYPAD_KEYMATRIX
     .locals_dict = (mp_obj_t)&keypad_shiftregisterkeys_locals_dict,
+    #endif
 };

From 62636cf722bd7c775f217e6f80b10cc5eb35673a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 19:24:06 -0500
Subject: [PATCH 2189/2403] Make a message more terse

This matches a bunch of other NotImplementedErrors
---
 shared-bindings/audiobusio/I2SOut.c | 2 +-
 shared-bindings/audiobusio/PDMIn.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index 3713caeb7b..e0d46de8e1 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -97,7 +97,7 @@
 //|         ...
 STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_I2SOUT
-    mp_raise_NotImplementedError(translate("I2SOut not available"));
+    mp_raise_NotImplementedError(translate("%q"), MP_QSTR_I2SOut);
     return NULL;                // Not reachable.
     #else
     enum { ARG_bit_clock, ARG_word_select, ARG_data, ARG_left_justified };
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index b6a316fadb..f26a5f4cc2 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -94,7 +94,7 @@
 //|     ...
 STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_PDMIN
-    mp_raise_NotImplementedError(translate("PDMIn not available"));
+    mp_raise_NotImplementedError(translate("%q"), MP_QSTR_PDMIn);
     #else
     enum { ARG_clock_pin, ARG_data_pin, ARG_sample_rate, ARG_bit_depth, ARG_mono, ARG_oversample, ARG_startup_delay };
     static const mp_arg_t allowed_args[] = {

From 8b05d11538cb45f8734274fedecc6a4bc4e98c4a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 1 Apr 2023 19:25:30 -0500
Subject: [PATCH 2190/2403] save 4 bytes memory since qstr constants are smol

---
 shared-bindings/keypad/Event.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 8264ebe612..52c574e692 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -167,9 +167,9 @@ 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, "",
+    mp_printf(print, "",
         common_hal_keypad_event_get_key_number(self),
-        common_hal_keypad_event_get_pressed(self) ? "pressed" : "released");
+        common_hal_keypad_event_get_pressed(self) ? MP_QSTR_pressed : MP_QSTR_released);
 }
 
 STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {

From 975c981e4f32638051832973ba1f1c8a33cf021a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 2 Apr 2023 11:55:14 -0500
Subject: [PATCH 2191/2403] fix some calls that needed to be _varg

---
 shared-bindings/audiobusio/I2SOut.c | 2 +-
 shared-bindings/audiobusio/PDMIn.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index e0d46de8e1..8c6f1a3a7a 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -97,7 +97,7 @@
 //|         ...
 STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_I2SOUT
-    mp_raise_NotImplementedError(translate("%q"), MP_QSTR_I2SOut);
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_I2SOut);
     return NULL;                // Not reachable.
     #else
     enum { ARG_bit_clock, ARG_word_select, ARG_data, ARG_left_justified };
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index f26a5f4cc2..1f0e500292 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -94,7 +94,7 @@
 //|     ...
 STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if !CIRCUITPY_AUDIOBUSIO_PDMIN
-    mp_raise_NotImplementedError(translate("%q"), MP_QSTR_PDMIn);
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_PDMIn);
     #else
     enum { ARG_clock_pin, ARG_data_pin, ARG_sample_rate, ARG_bit_depth, ARG_mono, ARG_oversample, ARG_startup_delay };
     static const mp_arg_t allowed_args[] = {

From 7bbb2ed898695a054cb1175e1743fbe33a9a73f3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 2 Apr 2023 13:48:23 -0500
Subject: [PATCH 2192/2403] add a basic acceptance test of MidiTrack

---
 tests/circuitpython/miditrack.py     | 20 ++++++++++++++++++++
 tests/circuitpython/miditrack.py.exp |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/circuitpython/miditrack.py
 create mode 100644 tests/circuitpython/miditrack.py.exp

diff --git a/tests/circuitpython/miditrack.py b/tests/circuitpython/miditrack.py
new file mode 100644
index 0000000000..53a8ca631d
--- /dev/null
+++ b/tests/circuitpython/miditrack.py
@@ -0,0 +1,20 @@
+import array
+
+try:
+    from synthio import MidiTrack
+    from audiocore import get_buffer, get_structure
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+SCORE = b"\0\x90@\0\x20\x90b\0\x20\x80@\0\0\x80\b\0"
+
+with MidiTrack(SCORE, sample_rate=8000, tempo=640) as m:
+    print(get_structure(m))
+    print(get_buffer(m))
+
+with MidiTrack(
+    SCORE, sample_rate=8000, tempo=640, waveform=array.array("h", [0, 32767, 0, -32768])
+) as m:
+    print(get_structure(m))
+    print(get_buffer(m))
diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
new file mode 100644
index 0000000000..c5dc447e74
--- /dev/null
+++ b/tests/circuitpython/miditrack.py.exp
@@ -0,0 +1,4 @@
+(1, 1, 800, 1)
+(1, b'\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0')
+(1, 1, 800, 1)
+(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f')

From e0984fa195c1a45de9e7774d4948467c397d1692 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 2 Apr 2023 18:54:07 -0500
Subject: [PATCH 2193/2403] Factor out the synthesizer from midi track

---
 shared-module/synthio/MidiTrack.c | 101 +++++-------------------------
 shared-module/synthio/MidiTrack.h |  13 +---
 shared-module/synthio/__init__.c  |  81 ++++++++++++++++++++++++
 shared-module/synthio/__init__.h  |  30 ++++++++-
 4 files changed, 126 insertions(+), 99 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index e2614bd0a3..9cc224d96b 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -27,11 +27,6 @@
 #include "py/runtime.h"
 #include "shared-bindings/synthio/MidiTrack.h"
 
-#define BITS_PER_SAMPLE (16)
-#define BYTES_PER_SAMPLE (BITS_PER_SAMPLE / 8)
-#define MAX_DUR (512)
-#define SILENCE (0x80)
-
 
 STATIC NORETURN void raise_midi_stream_error(uint32_t pos) {
     mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos);
@@ -86,14 +81,13 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate,
     const int16_t *waveform, uint16_t waveform_length) {
 
-    synthio_midi_span_t initial = { 0, {[0 ... (CIRCUITPY_SYNTHIO_MAX_CHANNELS - 1)] = SILENCE} };
-    self->sample_rate = sample_rate;
+    self->synth.sample_rate = sample_rate;
     self->track = m_malloc(sizeof(synthio_midi_span_t), false);
+    *self->track = ((synthio_midi_span_t) { 0, {[0 ... (CIRCUITPY_SYNTHIO_MAX_CHANNELS - 1)] = SYNTHIO_SILENCE} });
     self->next_span = 0;
     self->total_spans = 1;
-    *self->track = initial;
-    self->waveform = waveform;
-    self->waveform_length = waveform_length;
+    self->synth.waveform = waveform;
+    self->synth.waveform_length = waveform_length;
     mp_arg_validate_length_range(waveform_length, 2, 1024, MP_QSTR_waveform);
 
     uint16_t dur = 0;
@@ -118,12 +112,12 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
         switch (buffer[pos++] >> 4) {
             case 8: { // Note Off
                 uint8_t note = parse_note(buffer, len, &pos);
-                change_span_note(self, note, SILENCE, &dur);
+                change_span_note(self, note, SYNTHIO_SILENCE, &dur);
                 break;
             }
             case 9: { // Note On
                 uint8_t note = parse_note(buffer, len, &pos);
-                change_span_note(self, SILENCE, note, &dur);
+                change_span_note(self, SYNTHIO_SILENCE, note, &dur);
                 break;
             }
             case 10:
@@ -150,25 +144,23 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     for (int i = 0; i < self->total_spans; i++) {
         max_dur = MAX(self->track[i].dur, max_dur);
     }
-    self->buffer_length = MIN(MAX_DUR, max_dur) * BYTES_PER_SAMPLE;
-    self->buffer = m_malloc(self->buffer_length, false);
+    synthio_synth_init(&self->synth, max_dur);
 }
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self) {
-    m_del(uint8_t, self->buffer, self->buffer_length);
-    self->buffer = NULL;
+    synthio_synth_deinit(&self->synth);
     m_del(synthio_midi_span_t, self->track, self->total_spans + 1);
     self->track = NULL;
 }
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self) {
-    return self->buffer == NULL;
+    return synthio_synth_deinited(&self->synth);
 }
 
 uint32_t common_hal_synthio_miditrack_get_sample_rate(synthio_miditrack_obj_t *self) {
-    return self->sample_rate;
+    return self->synth.sample_rate;
 }
 uint8_t common_hal_synthio_miditrack_get_bits_per_sample(synthio_miditrack_obj_t *self) {
-    return BITS_PER_SAMPLE;
+    return SYNTHIO_BITS_PER_SAMPLE;
 }
 uint8_t common_hal_synthio_miditrack_get_channel_count(synthio_miditrack_obj_t *self) {
     return 1;
@@ -177,87 +169,28 @@ 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_output, uint8_t channel) {
 
-    self->remaining_dur = 0;
+    self->synth.span.dur = 0;
     self->next_span = 0;
 }
 
-STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
-                                 12544, 13290, 14080, 14917, 15804}; // 9th octave
-
-static int count_active_channels(synthio_midi_span_t *span) {
-    int result = 0;
-    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (span->note[i] != SILENCE) {
-            result += 1;
-        }
-    }
-    return result;
-}
-
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
-    synthio_midi_span_t span = self->track[self->next_span - !!self->remaining_dur];
 
-    if (self->remaining_dur == 0) {
+    if (self->synth.span.dur == 0) {
         if (self->next_span >= self->total_spans) {
             *buffer_length = 0;
             return GET_BUFFER_DONE;
         }
-        self->next_span++;
-        self->remaining_dur = span.dur;
+        self->synth.span = self->track[self->next_span++];
     }
 
-    uint16_t dur = MIN(MAX_DUR, self->remaining_dur);
-    self->remaining_dur -= dur;
-    *buffer_length = dur * BYTES_PER_SAMPLE;
-    memset(self->buffer, 0, *buffer_length);
+    synthio_synth_synthesize(&self->synth, buffer, buffer_length);
 
-    int32_t sample_rate = self->sample_rate;
-    int active_channels = count_active_channels(&span);
-    const int16_t *waveform = self->waveform;
-    uint32_t waveform_length = self->waveform_length;
-    int16_t *out_buffer = self->buffer;
-    if (active_channels) {
-        int16_t loudness = 0x3fff / (1 + active_channels);
-        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-            if (span.note[chan] == SILENCE) {
-                self->accum[chan] = 0;
-                continue;
-            }
-            uint8_t octave = span.note[chan] / 12;
-            uint16_t base_freq = notes[span.note[chan] % 12];
-            uint32_t accum = self->accum[chan];
-#define SHIFT (16)
-            // rate = base_freq * waveform_length
-            // den = sample_rate * 2 ^ (10 - octave)
-            // den = sample_rate * 2 ^ 10 / 2^octave
-            // dds_rate = 2^SHIFT * rate / den
-            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
-            uint32_t dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SHIFT - 10 + octave))) / sample_rate;
-
-            for (uint16_t i = 0; i < dur; i++) {
-                accum += dds_rate;
-                if (accum > waveform_length << SHIFT) {
-                    accum -= waveform_length << SHIFT;
-                }
-                int16_t idx = accum >> SHIFT;
-                out_buffer[i] += (waveform[idx] * loudness) / 65536;
-            }
-            self->accum[chan] = accum;
-        }
-    }
-
-    *buffer = (uint8_t *)self->buffer;
-
-    return (self->remaining_dur == 0 && self->next_span >= self->total_spans) ?
+    return (self->synth.span.dur == 0 && self->next_span >= self->total_spans) ?
            GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
 }
 
 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;
-    *samples_signed = true;
-    *max_buffer_length = self->buffer_length;
-    *spacing = 1;
+    return synthio_synth_get_buffer_structure(&self->synth, single_channel_output, single_buffer, samples_signed, max_buffer_length, spacing);
 }
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index c9206c69bb..e301ef355f 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -31,22 +31,11 @@
 
 #include "shared-module/synthio/__init__.h"
 
-typedef struct {
-    uint16_t dur;
-    uint8_t note[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
-} synthio_midi_span_t;
-
 typedef struct {
     mp_obj_base_t base;
-    uint32_t sample_rate;
-    int16_t *buffer;
-    uint16_t buffer_length;
-    uint16_t remaining_dur;
+    synthio_synth_t synth;
     uint16_t next_span;
     uint16_t total_spans;
-    uint16_t waveform_length;
-    const int16_t *waveform;
-    uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
     synthio_midi_span_t *track;
 } synthio_miditrack_obj_t;
 
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index e69de29bb2..8c58d5b2da 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -0,0 +1,81 @@
+#include "shared-module/synthio/__init__.h"
+
+STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
+                                 12544, 13290, 14080, 14917, 15804}; // 9th octave
+
+STATIC int count_active_channels(synthio_midi_span_t *span) {
+    int result = 0;
+    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (span->note[i] != SYNTHIO_SILENCE) {
+            result += 1;
+        }
+    }
+    return result;
+}
+
+
+void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length) {
+    uint16_t dur = MIN(SYNTHIO_MAX_DUR, synth->span.dur);
+    synth->span.dur -= dur;
+    memset(synth->buffer, 0, synth->buffer_length);
+
+    int32_t sample_rate = synth->sample_rate;
+    int active_channels = count_active_channels(&synth->span);
+    const int16_t *waveform = synth->waveform;
+    uint32_t waveform_length = synth->waveform_length;
+    int16_t *out_buffer = synth->buffer;
+    if (active_channels) {
+        int16_t loudness = 0x3fff / (1 + active_channels);
+        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+            if (synth->span.note[chan] == SYNTHIO_SILENCE) {
+                synth->accum[chan] = 0;
+                continue;
+            }
+            uint8_t octave = synth->span.note[chan] / 12;
+            uint16_t base_freq = notes[synth->span.note[chan] % 12];
+            uint32_t accum = synth->accum[chan];
+#define SHIFT (16)
+            // rate = base_freq * waveform_length
+            // den = sample_rate * 2 ^ (10 - octave)
+            // den = sample_rate * 2 ^ 10 / 2^octave
+            // dds_rate = 2^SHIFT * rate / den
+            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
+            uint32_t dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SHIFT - 10 + octave))) / sample_rate;
+
+            for (uint16_t i = 0; i < dur; i++) {
+                accum += dds_rate;
+                if (accum > waveform_length << SHIFT) {
+                    accum -= waveform_length << SHIFT;
+                }
+                int16_t idx = accum >> SHIFT;
+                out_buffer[i] += (waveform[idx] * loudness) / 65536;
+            }
+            synth->accum[chan] = accum;
+        }
+    }
+
+    *buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
+    *buffer = (uint8_t *)synth->buffer;
+}
+
+bool synthio_synth_deinited(synthio_synth_t *synth) {
+    return synth->buffer == NULL;
+}
+
+void synthio_synth_deinit(synthio_synth_t *synth) {
+    m_del(uint8_t, synth->buffer, synth->buffer_length);
+    synth->buffer = NULL;
+}
+
+void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur) {
+    synth->buffer_length = MIN(SYNTHIO_MAX_DUR, max_dur) * SYNTHIO_BYTES_PER_SAMPLE;
+    synth->buffer = m_malloc(synth->buffer_length, false);
+}
+
+void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
+    bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing) {
+    *single_buffer = true;
+    *samples_signed = true;
+    *max_buffer_length = synth->buffer_length;
+    *spacing = 1;
+}
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index d9d98a5341..88be7e689e 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -24,9 +24,33 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_MODULE_SYNTHIO__INIT__H
-#define MICROPY_INCLUDED_SHARED_MODULE_SYNTHIO__INIT__H
+#pragma once
+
+#define SYNTHIO_BITS_PER_SAMPLE (16)
+#define SYNTHIO_BYTES_PER_SAMPLE (SYNTHIO_BITS_PER_SAMPLE / 8)
+#define SYNTHIO_MAX_DUR (512)
+#define SYNTHIO_SILENCE (0x80)
 
 #include "shared-module/audiocore/__init__.h"
 
-#endif  // MICROPY_INCLUDED_SHARED_MODULE_SYNTHIO__INIT__H
+typedef struct {
+    uint16_t dur;
+    uint8_t note[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+} synthio_midi_span_t;
+
+typedef struct {
+    uint32_t sample_rate;
+    int16_t *buffer;
+    const int16_t *waveform;
+    uint16_t buffer_length;
+    uint16_t waveform_length;
+    synthio_midi_span_t span;
+    uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+} synthio_synth_t;
+
+void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length);
+void synthio_synth_deinit(synthio_synth_t *synth);
+bool synthio_synth_deinited(synthio_synth_t *synth);
+void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur);
+void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
+    bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);

From b01146825175c5738de17fb8387124150eaba768 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 2 Apr 2023 20:37:23 -0500
Subject: [PATCH 2194/2403] Add synthio.Synthesizer

In contrast to MidiTrack, this can be controlled from Python code,
turning notes on/off as desired.

Not tested on real HW yet, just the acceptance test based on checking
which notes it thinks are held internally.
---
 .../unix/variants/coverage/mpconfigvariant.mk |   2 +
 py/circuitpy_defns.mk                         |   1 +
 shared-bindings/synthio/MidiTrack.c           |  13 +-
 shared-bindings/synthio/Synthesizer.c         | 211 ++++++++++++++++++
 shared-bindings/synthio/Synthesizer.h         |  45 ++++
 shared-bindings/synthio/__init__.c            |  16 +-
 shared-module/synthio/MidiTrack.c             |  16 +-
 shared-module/synthio/Synthesizer.c           | 104 +++++++++
 shared-module/synthio/Synthesizer.h           |  53 +++++
 shared-module/synthio/__init__.c              |  70 +++++-
 shared-module/synthio/__init__.h              |   4 +
 tests/circuitpython/synthesizer.py            |  24 ++
 tests/circuitpython/synthesizer.py.exp        |   8 +
 13 files changed, 528 insertions(+), 39 deletions(-)
 create mode 100644 shared-bindings/synthio/Synthesizer.c
 create mode 100644 shared-bindings/synthio/Synthesizer.h
 create mode 100644 shared-module/synthio/Synthesizer.c
 create mode 100644 shared-module/synthio/Synthesizer.h
 create mode 100644 tests/circuitpython/synthesizer.py
 create mode 100644 tests/circuitpython/synthesizer.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index fca9a99518..8b25ddb705 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -39,6 +39,7 @@ SRC_BITMAP := \
 	shared-bindings/struct/__init__.c \
 	shared-bindings/synthio/__init__.c \
 	shared-bindings/synthio/MidiTrack.c \
+	shared-bindings/synthio/Synthesizer.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
 	shared-bindings/zlib/__init__.c \
@@ -57,6 +58,7 @@ SRC_BITMAP := \
 	shared-module/struct/__init__.c \
 	shared-module/synthio/__init__.c \
 	shared-module/synthio/MidiTrack.c \
+	shared-module/synthio/Synthesizer.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
 
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 94377238a0..fb5d745ebb 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -648,6 +648,7 @@ SRC_SHARED_MODULE_ALL = \
 	supervisor/__init__.c \
 	supervisor/StatusBar.c \
 	synthio/MidiTrack.c \
+	synthio/Synthesizer.c \
 	synthio/__init__.c \
 	terminalio/Terminal.c \
 	terminalio/__init__.c \
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 727b9ba335..20a203ce9c 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -85,17 +85,8 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
 
-    mp_buffer_info_t bufinfo_waveform = {
-        .buf = shared_bindings_synthio_square_wave,
-        .len = 4
-    };
-
-    if (args[ARG_waveform].u_obj != mp_const_none) {
-        mp_get_buffer_raise(args[ARG_waveform].u_obj, &bufinfo_waveform, MP_BUFFER_READ);
-        if (bufinfo_waveform.typecode != 'h') {
-            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
-        }
-    }
+    mp_buffer_info_t bufinfo_waveform;
+    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
 
     synthio_miditrack_obj_t *self = m_new_obj(synthio_miditrack_obj_t);
     self->base.type = &synthio_miditrack_type;
diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
new file mode 100644
index 0000000000..2ad5cbcd42
--- /dev/null
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -0,0 +1,211 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "shared/runtime/context_manager_helpers.h"
+#include "py/binary.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "shared-bindings/util.h"
+#include "shared-bindings/synthio/Synthesizer.h"
+#include "shared-bindings/synthio/__init__.h"
+#include "supervisor/shared/translate/translate.h"
+
+//| class Synth:
+//|     def __init__(self, *, sample_rate: int = 11025, waveform: ReadableBuffer = None) -> None:
+//|         """Create a synthesizer object."""
+STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_sample_rate, ARG_waveform };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
+        { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo_waveform;
+    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
+
+    synthio_synthesizer_obj_t *self = m_new_obj(synthio_synthesizer_obj_t);
+    self->base.type = &synthio_synthesizer_type;
+
+    common_hal_synthio_synthesizer_construct(self,
+        args[ARG_sample_rate].u_int,
+        bufinfo_waveform.buf,
+        bufinfo_waveform.len / 2);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void check_for_deinit(synthio_synthesizer_obj_t *self) {
+    if (common_hal_synthio_synthesizer_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     def press(self, /, press: Sequence[int] = ()) -> None:
+//|         """Turn some notes on. Notes use MIDI numbering, with 60 being middle C."""
+STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_synthio_synthesizer_press(self, press);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesizer_press);
+//
+//|     def release_then_press(
+//|         self, release: Sequence[int] = (), press: Sequence[int] = ()
+//|     ) -> None:
+//|         """Turn some notes on and/or off. Notes use MIDI numbering, with 60 being middle C."""
+STATIC mp_obj_t synthio_synthesizer_release_then_press(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_release, ARG_press };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_release, MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple } },
+        { MP_QSTR_press, MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple } },
+    };
+
+    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);
+
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+    common_hal_synthio_synthesizer_release(self, args[ARG_release].u_obj);
+    common_hal_synthio_synthesizer_press(self, args[ARG_press].u_obj);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_release_then_press_obj, 1, synthio_synthesizer_release_then_press);
+
+//
+//|     def release_all_then_press(self, /, press: Sequence[int]) -> None:
+//|         """Turn any currently-playing notes off, then turn on the given notes"""
+STATIC mp_obj_t synthio_synthesizer_release_all_then_press(mp_obj_t self_in, mp_obj_t press) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_synthio_synthesizer_release_all(self);
+    common_hal_synthio_synthesizer_press(self, press);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_all_then_press_obj, synthio_synthesizer_release_all_then_press);
+
+//
+//|     def release_all(self) -> None:
+//|         """Turn any currently-playing notes off"""
+STATIC mp_obj_t synthio_synthesizer_release_all(mp_obj_t self_in) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_synthio_synthesizer_release_all(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_release_all_obj, synthio_synthesizer_release_all);
+
+//|     def deinit(self) -> None:
+//|         """Deinitialises the object and releases any memory resources for reuse."""
+//|         ...
+STATIC mp_obj_t synthio_synthesizer_deinit(mp_obj_t self_in) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_synthesizer_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_deinit_obj, synthio_synthesizer_deinit);
+
+//|     def __enter__(self) -> MidiTrack:
+//|         """No-op used by Context Managers."""
+//|         ...
+//  Provided by context manager helper.
+//|
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+STATIC mp_obj_t synthio_synthesizer_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_synthio_synthesizer_deinit(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_synthesizer___exit___obj, 4, 4, synthio_synthesizer_obj___exit__);
+//|     sample_rate: int
+//|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
+STATIC mp_obj_t synthio_synthesizer_obj_get_sample_rate(mp_obj_t self_in) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_synthio_synthesizer_get_sample_rate(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_sample_rate_obj, synthio_synthesizer_obj_get_sample_rate);
+
+MP_PROPERTY_GETTER(synthio_synthesizer_sample_rate_obj,
+    (mp_obj_t)&synthio_synthesizer_get_sample_rate_obj);
+
+//|     pressed: Tuple[int]
+//|     """A sequence of the currently pressed notes (read-only property)"""
+//|
+STATIC mp_obj_t synthio_synthesizer_obj_get_pressed(mp_obj_t self_in) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return common_hal_synthio_synthesizer_get_pressed_notes(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_pressed_obj, synthio_synthesizer_obj_get_pressed);
+
+MP_PROPERTY_GETTER(synthio_synthesizer_pressed_obj,
+    (mp_obj_t)&synthio_synthesizer_get_pressed_obj);
+
+STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_press), MP_ROM_PTR(&synthio_synthesizer_press_obj) },
+    { MP_ROM_QSTR(MP_QSTR_release_all), MP_ROM_PTR(&synthio_synthesizer_release_all_obj) },
+    { MP_ROM_QSTR(MP_QSTR_release_then_press), MP_ROM_PTR(&synthio_synthesizer_release_then_press_obj) },
+    { MP_ROM_QSTR(MP_QSTR_release_all_then_press), MP_ROM_PTR(&synthio_synthesizer_release_all_then_press_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&synthio_synthesizer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&synthio_synthesizer___exit___obj) },
+
+    // Properties
+    { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&synthio_synthesizer_sample_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed), MP_ROM_PTR(&synthio_synthesizer_pressed_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(synthio_synthesizer_locals_dict, synthio_synthesizer_locals_dict_table);
+
+STATIC const audiosample_p_t synthio_synthesizer_proto = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample)
+    .sample_rate = (audiosample_sample_rate_fun)common_hal_synthio_synthesizer_get_sample_rate,
+    .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_synthio_synthesizer_get_bits_per_sample,
+    .channel_count = (audiosample_channel_count_fun)common_hal_synthio_synthesizer_get_channel_count,
+    .reset_buffer = (audiosample_reset_buffer_fun)synthio_synthesizer_reset_buffer,
+    .get_buffer = (audiosample_get_buffer_fun)synthio_synthesizer_get_buffer,
+    .get_buffer_structure = (audiosample_get_buffer_structure_fun)synthio_synthesizer_get_buffer_structure,
+};
+
+const mp_obj_type_t synthio_synthesizer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Synthesizer,
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    .make_new = synthio_synthesizer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&synthio_synthesizer_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .protocol = &synthio_synthesizer_proto,
+        ),
+};
diff --git a/shared-bindings/synthio/Synthesizer.h b/shared-bindings/synthio/Synthesizer.h
new file mode 100644
index 0000000000..92e75a1c23
--- /dev/null
+++ b/shared-bindings/synthio/Synthesizer.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "shared-module/synthio/Synthesizer.h"
+
+extern const mp_obj_type_t synthio_synthesizer_type;
+
+void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
+    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len);
+
+void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self);
+bool common_hal_synthio_synthesizer_deinited(synthio_synthesizer_obj_t *self);
+uint32_t common_hal_synthio_synthesizer_get_sample_rate(synthio_synthesizer_obj_t *self);
+uint8_t common_hal_synthio_synthesizer_get_bits_per_sample(synthio_synthesizer_obj_t *self);
+uint8_t common_hal_synthio_synthesizer_get_channel_count(synthio_synthesizer_obj_t *self);
+void common_hal_synthio_synthesizer_release(synthio_synthesizer_obj_t *self, mp_obj_t to_release);
+void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_obj_t to_press);
+void common_hal_synthio_synthesizer_release_all(synthio_synthesizer_obj_t *self);
+mp_obj_t common_hal_synthio_synthesizer_get_pressed_notes(synthio_synthesizer_obj_t *self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index dc627adb36..3c50377ff8 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -34,8 +34,7 @@
 
 #include "shared-bindings/synthio/__init__.h"
 #include "shared-bindings/synthio/MidiTrack.h"
-
-int16_t shared_bindings_synthio_square_wave[] = {-32768, 32767};
+#include "shared-bindings/synthio/Synthesizer.h"
 
 //| """Support for MIDI synthesis"""
 //|
@@ -79,17 +78,9 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     }
     pyb_file_obj_t *file = MP_OBJ_TO_PTR(args[ARG_file].u_obj);
 
-    mp_buffer_info_t bufinfo_waveform = {
-        .buf = shared_bindings_synthio_square_wave,
-        .len = 4
-    };
 
-    if (args[ARG_waveform].u_obj != mp_const_none) {
-        mp_get_buffer_raise(args[ARG_waveform].u_obj, &bufinfo_waveform, MP_BUFFER_READ);
-        if (bufinfo_waveform.typecode != 'h') {
-            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
-        }
-    }
+    mp_buffer_info_t bufinfo_waveform;
+    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
 
     uint8_t chunk_header[14];
     f_rewind(&file->fp);
@@ -146,6 +137,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file);
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
+    { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
     { MP_ROM_QSTR(MP_QSTR_from_file), MP_ROM_PTR(&synthio_from_file_obj) },
 };
 
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 9cc224d96b..0d91ee6982 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -57,21 +57,10 @@ STATIC void add_span(synthio_miditrack_obj_t *self, const synthio_midi_span_t *s
     self->track[self->total_spans++] = *span;
 }
 
-STATIC int find_channel_with_note(const synthio_midi_span_t *span, uint8_t note) {
-    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (span->note[i] == note) {
-            return i;
-        }
-    }
-    return -1;
-}
-
 STATIC void change_span_note(synthio_miditrack_obj_t *self, uint8_t old_note, uint8_t new_note, uint16_t *dur) {
     synthio_midi_span_t span = self->track[self->total_spans - 1];
-    int channel = find_channel_with_note(&span, old_note);
-    if (channel != -1) {
+    if (synthio_span_change_note(&span, old_note, new_note)) {
         terminate_span(self, dur);
-        span.note[channel] = new_note;
         add_span(self, &span);
         *dur = 0;
     }
@@ -83,12 +72,11 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
 
     self->synth.sample_rate = sample_rate;
     self->track = m_malloc(sizeof(synthio_midi_span_t), false);
-    *self->track = ((synthio_midi_span_t) { 0, {[0 ... (CIRCUITPY_SYNTHIO_MAX_CHANNELS - 1)] = SYNTHIO_SILENCE} });
+    synthio_span_init(self->track);
     self->next_span = 0;
     self->total_spans = 1;
     self->synth.waveform = waveform;
     self->synth.waveform_length = waveform_length;
-    mp_arg_validate_length_range(waveform_length, 2, 1024, MP_QSTR_waveform);
 
     uint16_t dur = 0;
     uint32_t pos = 0;
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
new file mode 100644
index 0000000000..8cfc73a980
--- /dev/null
+++ b/shared-module/synthio/Synthesizer.c
@@ -0,0 +1,104 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ *
+ * 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/synthio/Synthesizer.h"
+
+
+
+void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
+    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length) {
+
+    self->synth.sample_rate = sample_rate;
+    self->synth.waveform = waveform;
+    self->synth.waveform_length = waveform_length;
+    synthio_synth_init(&self->synth, SYNTHIO_MAX_DUR);
+    common_hal_synthio_synthesizer_release_all(self);
+}
+
+void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self) {
+    synthio_synth_deinit(&self->synth);
+}
+bool common_hal_synthio_synthesizer_deinited(synthio_synthesizer_obj_t *self) {
+    return synthio_synth_deinited(&self->synth);
+}
+
+uint32_t common_hal_synthio_synthesizer_get_sample_rate(synthio_synthesizer_obj_t *self) {
+    return self->synth.sample_rate;
+}
+uint8_t common_hal_synthio_synthesizer_get_bits_per_sample(synthio_synthesizer_obj_t *self) {
+    return SYNTHIO_BITS_PER_SAMPLE;
+}
+uint8_t common_hal_synthio_synthesizer_get_channel_count(synthio_synthesizer_obj_t *self) {
+    return 1;
+}
+
+void synthio_synthesizer_reset_buffer(synthio_synthesizer_obj_t *self,
+    bool single_channel_output, uint8_t channel) {
+}
+
+audioio_get_buffer_result_t synthio_synthesizer_get_buffer(synthio_synthesizer_obj_t *self,
+    bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
+    self->synth.span.dur = SYNTHIO_MAX_DUR;
+    synthio_synth_synthesize(&self->synth, buffer, buffer_length);
+    return GET_BUFFER_MORE_DATA;
+}
+
+void synthio_synthesizer_get_buffer_structure(synthio_synthesizer_obj_t *self, bool single_channel_output,
+    bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing) {
+    return synthio_synth_get_buffer_structure(&self->synth, single_channel_output, single_buffer, samples_signed, max_buffer_length, spacing);
+}
+
+void common_hal_synthio_synthesizer_release_all(synthio_synthesizer_obj_t *self) {
+    synthio_span_init(&self->synth.span);
+}
+void common_hal_synthio_synthesizer_release(synthio_synthesizer_obj_t *self, mp_obj_t to_release) {
+    mp_obj_iter_buf_t iter_buf;
+    mp_obj_t iterable = mp_getiter(to_release, &iter_buf);
+    mp_obj_t item;
+    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+        synthio_span_change_note(&self->synth.span, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note), SYNTHIO_SILENCE);
+    }
+}
+
+void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_obj_t to_press) {
+    mp_obj_iter_buf_t iter_buf;
+    mp_obj_t iterable = mp_getiter(to_press, &iter_buf);
+    mp_obj_t item;
+    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+        synthio_span_change_note(&self->synth.span, SYNTHIO_SILENCE, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note));
+    }
+}
+
+mp_obj_t common_hal_synthio_synthesizer_get_pressed_notes(synthio_synthesizer_obj_t *self) {
+    mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(synthio_span_count_active_channels(&self->synth.span), NULL));
+    for (size_t i = 0, j = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (self->synth.span.note[i] != SYNTHIO_SILENCE) {
+            result->items[j++] = MP_OBJ_NEW_SMALL_INT(self->synth.span.note[i]);
+        }
+    }
+    return MP_OBJ_FROM_PTR(result);
+}
diff --git a/shared-module/synthio/Synthesizer.h b/shared-module/synthio/Synthesizer.h
new file mode 100644
index 0000000000..256b6137f2
--- /dev/null
+++ b/shared-module/synthio/Synthesizer.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+
+#include "shared-module/synthio/__init__.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    synthio_synth_t synth;
+} synthio_synthesizer_obj_t;
+
+
+// These are not available from Python because it may be called in an interrupt.
+void synthio_synthesizer_reset_buffer(synthio_synthesizer_obj_t *self,
+    bool single_channel_output,
+    uint8_t channel);
+
+audioio_get_buffer_result_t synthio_synthesizer_get_buffer(synthio_synthesizer_obj_t *self,
+    bool single_channel_output,
+    uint8_t channel,
+    uint8_t **buffer,
+    uint32_t *buffer_length); // length in bytes
+
+void synthio_synthesizer_get_buffer_structure(synthio_synthesizer_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/__init__.c b/shared-module/synthio/__init__.c
index 8c58d5b2da..0dee75deb7 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -1,9 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "shared-module/synthio/__init__.h"
+#include "py/runtime.h"
+
+STATIC const int16_t square_wave[] = {-32768, 32767};
 
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
-STATIC int count_active_channels(synthio_midi_span_t *span) {
+int synthio_span_count_active_channels(synthio_midi_span_t *span) {
     int result = 0;
     for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
         if (span->note[i] != SYNTHIO_SILENCE) {
@@ -20,7 +50,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t
     memset(synth->buffer, 0, synth->buffer_length);
 
     int32_t sample_rate = synth->sample_rate;
-    int active_channels = count_active_channels(&synth->span);
+    int active_channels = synthio_span_count_active_channels(&synth->span);
     const int16_t *waveform = synth->waveform;
     uint32_t waveform_length = synth->waveform_length;
     int16_t *out_buffer = synth->buffer;
@@ -79,3 +109,39 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan
     *max_buffer_length = synth->buffer_length;
     *spacing = 1;
 }
+
+void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj) {
+    *bufinfo_waveform = ((mp_buffer_info_t) { .buf = (void *)square_wave, .len = 4 });
+
+    if (waveform_obj != mp_const_none) {
+        mp_get_buffer_raise(waveform_obj, bufinfo_waveform, MP_BUFFER_READ);
+        if (bufinfo_waveform->typecode != 'h') {
+            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
+        }
+    }
+    mp_arg_validate_length_range(bufinfo_waveform->len / 2, 2, 1024, MP_QSTR_waveform);
+}
+
+void synthio_span_init(synthio_midi_span_t *span) {
+    span->dur = 0;
+    for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) { span->note[i] = SYNTHIO_SILENCE;
+    }
+}
+
+STATIC int find_channel_with_note(const synthio_midi_span_t *span, uint8_t note) {
+    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (span->note[i] == note) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note) {
+    int channel = find_channel_with_note(span, old_note);
+    if (channel != -1) {
+        span->note[channel] = new_note;
+        return true;
+    }
+    return false;
+}
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 88be7e689e..9397495f98 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -48,9 +48,13 @@ typedef struct {
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_synth_t;
 
+void synthio_span_init(synthio_midi_span_t *span);
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
 void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur);
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);
+void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj);
+bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note);
+int synthio_span_count_active_channels(synthio_midi_span_t *span);
diff --git a/tests/circuitpython/synthesizer.py b/tests/circuitpython/synthesizer.py
new file mode 100644
index 0000000000..bdb273f861
--- /dev/null
+++ b/tests/circuitpython/synthesizer.py
@@ -0,0 +1,24 @@
+import struct
+import synthio
+import audiocore
+
+
+def dump_samples():
+    print(struct.unpack("12h", audiocore.get_buffer(s)[1][:24]))
+
+
+s = synthio.Synthesizer(sample_rate=8000)
+print(s.pressed)
+dump_samples()
+
+s.press((80,))
+print(s.pressed)
+dump_samples()
+
+s.press((91,))
+print(s.pressed)
+dump_samples()
+
+s.release_then_press((80,))
+print(s.pressed)
+dump_samples()
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
new file mode 100644
index 0000000000..aa2567641c
--- /dev/null
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -0,0 +1,8 @@
+()
+(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+(80,)
+(-4095, -4095, -4095, -4095, 4095, 4095, 4095, 4095, 4095, -4095, -4095, -4095)
+(80, 91)
+(-5460, -5460, 0, 5460, 5460, 0, 0, 5460, 0, 0, -5460, -5460)
+(91,)
+(4095, 4095, 4095, -4095, -4095, 4095, 4095, 4095, -4095, -4095, 4095, 4095)

From 60e12c5c1d40550ca8c5c97abd15305926e46777 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 3 Apr 2023 15:43:29 -0500
Subject: [PATCH 2195/2403] only add circuitpython_splash to display if it's
 not already in another group

---
 shared-module/displayio/Display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 5af97a4144..d0608cd532 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -136,7 +136,9 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
-    common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
+    if (!circuitpython_splash.in_group) {
+        common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
+    }
     common_hal_displayio_display_set_auto_refresh(self, auto_refresh);
 }
 

From 5d56ef06e7d526ee9f4f97dbe7704788cc353b18 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 4 Apr 2023 19:16:39 -0400
Subject: [PATCH 2196/2403] Add Adafruit Feather RP2040 CAN

---
 .../adafruit_feather_rp2040_can/board.c       | 29 ++++++++++
 .../mpconfigboard.h                           | 14 +++++
 .../mpconfigboard.mk                          |  9 +++
 .../pico-sdk-configboard.h                    |  4 ++
 .../boards/adafruit_feather_rp2040_can/pins.c | 56 +++++++++++++++++++
 5 files changed, 112 insertions(+)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_can/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_can/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
new file mode 100644
index 0000000000..519c784452
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 CAN"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO20)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.mk
new file mode 100644
index 0000000000..543b5adcc0
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x8130
+USB_PRODUCT = "Feather RP2040 CAN"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c
new file mode 100644
index 0000000000..b64d007a0d
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c
@@ -0,0 +1,56 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_CAN_STANDBY), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_TX0_RTS), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_RESET), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_CS), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_INTERRUPT), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_RX0_BF), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 44d7f4e7e1c0bde0d794b5ece4b9a5298b35bba1 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 4 Apr 2023 19:33:39 -0400
Subject: [PATCH 2197/2403] fix Neopixel for RP2040 CAN

---
 .../boards/adafruit_feather_rp2040_can/mpconfigboard.h          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
index 519c784452..a012abec22 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/mpconfigboard.h
@@ -1,7 +1,7 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 CAN"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO20)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)

From 85cc21adc0a890310f7d078d95717cccf9aa6d05 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 4 Apr 2023 19:40:37 -0400
Subject: [PATCH 2198/2403] add Adafruit Feather RP2040 USB Host

---
 .../adafruit_feather_rp2040_usb_host/board.c  | 29 ++++++++++
 .../mpconfigboard.h                           | 14 +++++
 .../mpconfigboard.mk                          |  9 ++++
 .../pico-sdk-configboard.h                    |  4 ++
 .../adafruit_feather_rp2040_usb_host/pins.c   | 53 +++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.h
new file mode 100644
index 0000000000..f300bfe711
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 USB Host"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.mk
new file mode 100644
index 0000000000..d249861efb
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x812A
+USB_PRODUCT = "Feather RP2040 USB Host"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c
new file mode 100644
index 0000000000..ab07688f4c
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c
@@ -0,0 +1,53 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DATA_PLUS), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DATA_MINUS), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_5V_POWER), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 8bf94d03e48a90d83da9eeeb7711c1038ce1873b Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Tue, 4 Apr 2023 20:31:42 -0500
Subject: [PATCH 2199/2403] try to fix multi-display reset

---
 shared-module/displayio/Display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index d0608cd532..01d8c544ad 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -439,7 +439,9 @@ void reset_display(displayio_display_obj_t *self) {
     circuitpython_splash.x = 0; // reset position in case someone moved it.
     circuitpython_splash.y = 0;
     supervisor_start_terminal(self->core.width, self->core.height);
-    common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
+    if (!circuitpython_splash.in_group) {
+        common_hal_displayio_display_set_root_group(self, &circuitpython_splash);
+    }
 }
 
 void displayio_display_collect_ptrs(displayio_display_obj_t *self) {

From b9dea05dbfaa9a55a429892b1cf87e1518083866 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 08:51:55 -0500
Subject: [PATCH 2200/2403] Enable audiomixer on unix port, for testing

---
 ports/unix/variants/coverage/mpconfigvariant.mk | 7 +++++++
 shared-bindings/audiomixer/Mixer.c              | 2 --
 shared-bindings/audiomixer/Mixer.h              | 1 -
 shared-bindings/audiomixer/MixerVoice.c         | 4 +---
 shared-bindings/audiomixer/MixerVoice.h         | 7 ++-----
 shared-bindings/audiomixer/__init__.c           | 1 -
 shared-module/audiomixer/Mixer.c                | 6 +++++-
 shared-module/audiomixer/MixerVoice.c           | 8 ++++----
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 8b25ddb705..854d052c6c 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -33,6 +33,9 @@ SRC_BITMAP := \
 	shared-bindings/audiocore/__init__.c \
 	shared-bindings/audiocore/RawSample.c \
 	shared-bindings/audiocore/WaveFile.c \
+	shared-bindings/audiomixer/__init__.c \
+	shared-bindings/audiomixer/Mixer.c \
+	shared-bindings/audiomixer/MixerVoice.c \
 	shared-bindings/bitmaptools/__init__.c \
 	shared-bindings/displayio/Bitmap.c \
 	shared-bindings/rainbowio/__init__.c \
@@ -48,6 +51,9 @@ SRC_BITMAP := \
 	shared-module/audiocore/__init__.c \
 	shared-module/audiocore/RawSample.c \
 	shared-module/audiocore/WaveFile.c \
+	shared-module/audiomixer/__init__.c \
+	shared-module/audiomixer/Mixer.c \
+	shared-module/audiomixer/MixerVoice.c \
 	shared-module/bitmaptools/__init__.c \
 	shared-module/displayio/area.c \
 	shared-module/displayio/Bitmap.c \
@@ -67,6 +73,7 @@ SRC_C += $(SRC_BITMAP)
 CFLAGS += \
 	-DCIRCUITPY_AESIO=1 \
 	-DCIRCUITPY_AUDIOCORE=1 \
+	-DCIRCUITPY_AUDIOMIXER=1 \
 	-DCIRCUITPY_AUDIOCORE_DEBUG=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c
index 58c618fc11..83fcc06712 100644
--- a/shared-bindings/audiomixer/Mixer.c
+++ b/shared-bindings/audiomixer/Mixer.c
@@ -33,8 +33,6 @@
 #include "py/binary.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/audiocore/RawSample.h"
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
 
diff --git a/shared-bindings/audiomixer/Mixer.h b/shared-bindings/audiomixer/Mixer.h
index fd1154cc43..d04f793dde 100644
--- a/shared-bindings/audiomixer/Mixer.h
+++ b/shared-bindings/audiomixer/Mixer.h
@@ -28,7 +28,6 @@
 #define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOMIXER_MIXER_H
 
 #include "shared-module/audiomixer/Mixer.h"
-#include "shared-bindings/audiocore/RawSample.h"
 
 extern const mp_obj_type_t audiomixer_mixer_type;
 extern const mp_obj_type_t audiomixer_mixervoice_type;
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index 16a1be520f..1d6cd7f39a 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -32,8 +32,6 @@
 #include "py/binary.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/audiocore/RawSample.h"
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate/translate.h"
 
@@ -115,7 +113,7 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_
     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);
 
-    float level = mp_obj_get_float(args[ARG_level].u_obj);
+    mp_float_t level = mp_obj_get_float(args[ARG_level].u_obj);
 
     if (level > 1 || level < 0) {
         mp_raise_ValueError(translate("level must be between 0 and 1"));
diff --git a/shared-bindings/audiomixer/MixerVoice.h b/shared-bindings/audiomixer/MixerVoice.h
index bce4632760..0ff8accee4 100644
--- a/shared-bindings/audiomixer/MixerVoice.h
+++ b/shared-bindings/audiomixer/MixerVoice.h
@@ -26,9 +26,6 @@
 #ifndef SHARED_BINDINGS_AUDIOMIXER_MIXERVOICE_H_
 #define SHARED_BINDINGS_AUDIOMIXER_MIXERVOICE_H_
 
-#include "common-hal/microcontroller/Pin.h"
-#include "shared-bindings/audiocore/RawSample.h"
-
 #include "shared-module/audiomixer/MixerVoice.h"
 #include "shared-module/audiomixer/Mixer.h"
 
@@ -39,8 +36,8 @@ void common_hal_audiomixer_mixervoice_construct(audiomixer_mixervoice_obj_t *sel
 void common_hal_audiomixer_mixervoice_set_parent(audiomixer_mixervoice_obj_t *self, audiomixer_mixer_obj_t *parent);
 void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp_obj_t sample, bool loop);
 void common_hal_audiomixer_mixervoice_stop(audiomixer_mixervoice_obj_t *self);
-float common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self);
-void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, float gain);
+mp_float_t common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self);
+void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, mp_float_t gain);
 
 bool common_hal_audiomixer_mixervoice_get_playing(audiomixer_mixervoice_obj_t *self);
 
diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c
index 8292be9e95..4c8068172b 100644
--- a/shared-bindings/audiomixer/__init__.c
+++ b/shared-bindings/audiomixer/__init__.c
@@ -29,7 +29,6 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/audiomixer/Mixer.h"
 
 //| """Support for audio mixing"""
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
index 1c5de4d934..ce39f88919 100644
--- a/shared-module/audiomixer/Mixer.c
+++ b/shared-module/audiomixer/Mixer.c
@@ -35,6 +35,10 @@
 #include "shared-module/audiocore/__init__.h"
 #include "shared-module/audiocore/RawSample.h"
 
+#if (defined(__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))
+#include "periph.h"
+#endif
+
 void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t *self,
     uint8_t voice_count,
     uint32_t buffer_size,
@@ -140,7 +144,7 @@ static inline uint32_t mult16signed(uint32_t val, int32_t mul) {
     float mod_mul = (float)mul / (float)((1 << 15) - 1);
     for (int8_t i = 0; i < 2; i++) {
         int16_t ai = (val >> (sizeof(uint16_t) * 8 * i));
-        int32_t intermediate = ai * mod_mul;
+        int32_t intermediate = (int32_t)(ai * mod_mul);
         if (intermediate > SHRT_MAX) {
             intermediate = SHRT_MAX;
         } else if (intermediate < SHRT_MIN) {
diff --git a/shared-module/audiomixer/MixerVoice.c b/shared-module/audiomixer/MixerVoice.c
index bb58b0c111..f4d2a6514e 100644
--- a/shared-module/audiomixer/MixerVoice.c
+++ b/shared-module/audiomixer/MixerVoice.c
@@ -42,12 +42,12 @@ void common_hal_audiomixer_mixervoice_set_parent(audiomixer_mixervoice_obj_t *se
     self->parent = parent;
 }
 
-float common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self) {
-    return (float)self->level / (1 << 15);
+mp_float_t common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self) {
+    return (mp_float_t)self->level / (1 << 15);
 }
 
-void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, float level) {
-    self->level = level * (1 << 15);
+void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, mp_float_t level) {
+    self->level = (uint16_t)(level * (1 << 15));
 }
 
 void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp_obj_t sample, bool loop) {

From 4c7b962d16f556a9fce9462289379fa243571ce3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 10:30:57 -0500
Subject: [PATCH 2201/2403] Increase synthio channels to 12 on rp2040

with the AudioMixer workaround for #7837 this appears to work
even up to 48kHz.
---
 ports/raspberrypi/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 21dde6d239..671d4669bf 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -19,6 +19,7 @@ CIRCUITPY_PWMIO ?= 1
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_DISPLAYIO)
 CIRCUITPY_ROTARYIO ?= 1
 CIRCUITPY_ROTARYIO_SOFTENCODER = 1
+CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
 
 # Things that need to be implemented.
 # Use PWM internally

From 685fdf29e32b5b62f43f037be4d9f1ae89e1df38 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 10:31:05 -0500
Subject: [PATCH 2202/2403] remove include directory that doesn't exist

---
 ports/mimxrt10xx/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index ff2b6c35c1..72f4d191ef 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -38,7 +38,6 @@ INC += \
 	-Iboards/$(BOARD) \
 	-Iperipherals/ \
 	-Iperipherals/mimxrt10xx/ \
-	-Isdk/CMSIS/Include \
 	-Isdk/devices/$(CHIP_FAMILY) \
 	-Isdk/devices/$(CHIP_FAMILY)/drivers \
 	-Isdk/drivers/common

From 3038b9a56055190d6a523065877caa08e876883b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 11:56:21 -0500
Subject: [PATCH 2203/2403] Update shared-bindings/keypad/ShiftRegisterKeys.c

Co-authored-by: Scott Shawcroft 
---
 shared-bindings/keypad/ShiftRegisterKeys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 9c44717a41..465ff9542c 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -82,7 +82,7 @@
 //|         ...
 
 STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    #if CIRCUITPY_KEYPAD_KEYMATRIX
+    #if CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS
     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_key_count, ARG_value_when_pressed, ARG_interval, ARG_max_events };

From 9679aaa0be1a2b1943430b798c770b5e0377b83b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 11:57:06 -0500
Subject: [PATCH 2204/2403] Apply suggestions from code review

Co-authored-by: Scott Shawcroft 
---
 shared-bindings/keypad/ShiftRegisterKeys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 465ff9542c..1fcf517ac3 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -119,7 +119,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     #endif
 }
 
-#if CIRCUITPY_KEYPAD_KEYMATRIX
+#if CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS
 //|     def deinit(self) -> None:
 //|         """Stop scanning and release the pins."""
 //|         ...
@@ -180,7 +180,7 @@ const mp_obj_type_t keypad_shiftregisterkeys_type = {
     { &mp_type_type },
     .name = MP_QSTR_ShiftRegisterKeys,
     .make_new = keypad_shiftregisterkeys_make_new,
-    #if CIRCUITPY_KEYPAD_KEYMATRIX
+    #if CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS
     .locals_dict = (mp_obj_t)&keypad_shiftregisterkeys_locals_dict,
     #endif
 };

From 04f4092e110b50fc03dd55e8a5f1c2151c5d0035 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 11:55:54 -0500
Subject: [PATCH 2205/2403] synthio: support audio outputs that need double
 buffering

closes #7837

tested on rp2040 pico w on pico dv shield
---
 shared-module/synthio/MidiTrack.c   |  4 +--
 shared-module/synthio/Synthesizer.c |  3 ++-
 shared-module/synthio/__init__.c    | 42 ++++++++++++++++++++++-------
 shared-module/synthio/__init__.h    | 10 ++++---
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 0d91ee6982..f8b39c29e3 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -156,7 +156,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_output, uint8_t channel) {
-
+    synthio_synth_reset_buffer(&self->synth, single_channel_output, channel);
     self->synth.span.dur = 0;
     self->next_span = 0;
 }
@@ -172,7 +172,7 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
         self->synth.span = self->track[self->next_span++];
     }
 
-    synthio_synth_synthesize(&self->synth, buffer, buffer_length);
+    synthio_synth_synthesize(&self->synth, buffer, buffer_length, single_channel_output ? 0 : channel);
 
     return (self->synth.span.dur == 0 && self->next_span >= self->total_spans) ?
            GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index 8cfc73a980..25c91ecbe0 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -58,12 +58,13 @@ uint8_t common_hal_synthio_synthesizer_get_channel_count(synthio_synthesizer_obj
 
 void synthio_synthesizer_reset_buffer(synthio_synthesizer_obj_t *self,
     bool single_channel_output, uint8_t channel) {
+    synthio_synth_reset_buffer(&self->synth, single_channel_output, channel);
 }
 
 audioio_get_buffer_result_t synthio_synthesizer_get_buffer(synthio_synthesizer_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
     self->synth.span.dur = SYNTHIO_MAX_DUR;
-    synthio_synth_synthesize(&self->synth, buffer, buffer_length);
+    synthio_synth_synthesize(&self->synth, buffer, buffer_length, single_channel_output ? channel : 0);
     return GET_BUFFER_MORE_DATA;
 }
 
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 0dee75deb7..7ac8e47746 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -44,16 +44,27 @@ int synthio_span_count_active_channels(synthio_midi_span_t *span) {
 }
 
 
-void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length) {
+void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t *buffer_length, uint8_t channel) {
+
+    if (channel == synth->other_channel) {
+        *buffer_length = synth->last_buffer_length;
+        *bufptr = (uint8_t *)(synth->buffers[synth->other_buffer_index] + channel);
+        return;
+    }
+
+    synth->buffer_index = !synth->buffer_index;
+    synth->other_channel = 1 - channel;
+    synth->other_buffer_index = synth->buffer_index;
+    int16_t *out_buffer = (int16_t *)(void *)synth->buffers[synth->buffer_index];
+
     uint16_t dur = MIN(SYNTHIO_MAX_DUR, synth->span.dur);
     synth->span.dur -= dur;
-    memset(synth->buffer, 0, synth->buffer_length);
+    memset(out_buffer, 0, synth->buffer_length);
 
     int32_t sample_rate = synth->sample_rate;
     int active_channels = synthio_span_count_active_channels(&synth->span);
     const int16_t *waveform = synth->waveform;
     uint32_t waveform_length = synth->waveform_length;
-    int16_t *out_buffer = synth->buffer;
     if (active_channels) {
         int16_t loudness = 0x3fff / (1 + active_channels);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
@@ -84,27 +95,38 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t
         }
     }
 
-    *buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
-    *buffer = (uint8_t *)synth->buffer;
+    *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
+    *bufptr = (uint8_t *)out_buffer;
+}
+
+void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_output, uint8_t channel) {
+    if (single_channel_output && channel == 1) {
+        return;
+    }
+    synth->other_channel = -1;
 }
 
 bool synthio_synth_deinited(synthio_synth_t *synth) {
-    return synth->buffer == NULL;
+    return synth->buffers[0] == NULL;
 }
 
 void synthio_synth_deinit(synthio_synth_t *synth) {
-    m_del(uint8_t, synth->buffer, synth->buffer_length);
-    synth->buffer = NULL;
+    m_del(uint8_t, synth->buffers[0], synth->buffer_length);
+    m_del(uint8_t, synth->buffers[1], synth->buffer_length);
+    synth->buffers[0] = NULL;
+    synth->buffers[1] = NULL;
 }
 
 void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur) {
     synth->buffer_length = MIN(SYNTHIO_MAX_DUR, max_dur) * SYNTHIO_BYTES_PER_SAMPLE;
-    synth->buffer = m_malloc(synth->buffer_length, false);
+    synth->buffers[0] = m_malloc(synth->buffer_length, false);
+    synth->buffers[1] = m_malloc(synth->buffer_length, false);
+    synth->other_channel = -1;
 }
 
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing) {
-    *single_buffer = true;
+    *single_buffer = false;
     *samples_signed = true;
     *max_buffer_length = synth->buffer_length;
     *spacing = 1;
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 9397495f98..e14e5ead10 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -28,7 +28,7 @@
 
 #define SYNTHIO_BITS_PER_SAMPLE (16)
 #define SYNTHIO_BYTES_PER_SAMPLE (SYNTHIO_BITS_PER_SAMPLE / 8)
-#define SYNTHIO_MAX_DUR (512)
+#define SYNTHIO_MAX_DUR (256)
 #define SYNTHIO_SILENCE (0x80)
 
 #include "shared-module/audiocore/__init__.h"
@@ -40,21 +40,25 @@ typedef struct {
 
 typedef struct {
     uint32_t sample_rate;
-    int16_t *buffer;
+    int16_t *buffers[2];
     const int16_t *waveform;
     uint16_t buffer_length;
+    uint16_t last_buffer_length;
+    uint8_t other_channel, buffer_index, other_buffer_index;
     uint16_t waveform_length;
     synthio_midi_span_t span;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_synth_t;
 
 void synthio_span_init(synthio_midi_span_t *span);
-void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length);
+void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length, uint8_t channel);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
 void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur);
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);
+void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_output, uint8_t channel);
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj);
+
 bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note);
 int synthio_span_count_active_channels(synthio_midi_span_t *span);

From 14637cd75ad2d5d7e61fa6272dafc0ce0671c648 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 12:00:05 -0500
Subject: [PATCH 2206/2403] update tests with new expected results

---
 tests/circuitpython/miditrack.py.exp   |  8 ++++----
 tests/circuitpython/synthesizer.py.exp |  4 ++--
 tests/unix/extra_coverage.py.exp       | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
index c5dc447e74..be5eef1d0b 100644
--- a/tests/circuitpython/miditrack.py.exp
+++ b/tests/circuitpython/miditrack.py.exp
@@ -1,4 +1,4 @@
-(1, 1, 800, 1)
-(1, b'\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0')
-(1, 1, 800, 1)
-(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f')
+(0, 1, 512, 1)
+(1, b'\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f')
+(0, 1, 512, 1)
+(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00')
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
index aa2567641c..4296662d60 100644
--- a/tests/circuitpython/synthesizer.py.exp
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -3,6 +3,6 @@
 (80,)
 (-4095, -4095, -4095, -4095, 4095, 4095, 4095, 4095, 4095, -4095, -4095, -4095)
 (80, 91)
-(-5460, -5460, 0, 5460, 5460, 0, 0, 5460, 0, 0, -5460, -5460)
+(0, 0, 5460, 5460, 0, -5460, -5460, 0, 5460, 5460, 0, 0)
 (91,)
-(4095, 4095, 4095, -4095, -4095, 4095, 4095, 4095, -4095, -4095, 4095, 4095)
+(-4095, 4095, 4095, 4095, -4095, -4095, 4095, 4095, 4095, -4095, -4095, 4095)
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 0baf8e1f44..c750ca0e95 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -31,15 +31,15 @@ mport
 
 builtins        micropython     _asyncio        _thread
 _uasyncio       aesio           array           audiocore
-binascii        bitmaptools     btree           cexample
-cmath           collections     cppexample      displayio
-errno           ffi             framebuf        gc
-hashlib         json            math            qrio
-rainbowio       re              struct          synthio
-sys             termios         traceback       ubinascii
-uctypes         uerrno          uheapq          uio
-ujson           ulab            ulab.numpy      ulab.numpy.fft
-ulab.numpy.linalg               ulab.scipy
+audiomixer      binascii        bitmaptools     btree
+cexample        cmath           collections     cppexample
+displayio       errno           ffi             framebuf
+gc              hashlib         json            math
+qrio            rainbowio       re              struct
+synthio         sys             termios         traceback
+ubinascii       uctypes         uerrno          uheapq
+uio             ujson           ulab            ulab.numpy
+ulab.numpy.fft  ulab.numpy.linalg               ulab.scipy
 ulab.scipy.linalg               ulab.scipy.optimize
 ulab.scipy.signal               ulab.scipy.special
 ulab.utils      uos             urandom         ure

From 9825b7fbb7bf260485e66e66b0f38fb76f32f0ad Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Tue, 4 Apr 2023 15:07:04 -0400
Subject: [PATCH 2207/2403] Web Workflow sockets and threads handling
 improvements. Fixes polling thread looping forever hangs preventing new
 connections. Don't lose listening sockets on mp resets and re-init. Keep
 better separation of "system" and "user" sockets. Track socket states to
 prevent re-use of sockets before closed. Close REST socket when transaction
 completes. No post-init. Remove unnecessary state flags.

---
 .../espressif/common-hal/socketpool/Socket.c  | 235 ++++++++++--------
 .../espressif/common-hal/socketpool/Socket.h  |   2 +
 .../common-hal/socketpool/Socket.h            |   3 +
 supervisor/shared/web_workflow/web_workflow.c |  85 ++++---
 supervisor/shared/web_workflow/web_workflow.h |   2 +-
 supervisor/shared/web_workflow/websocket.c    |  14 +-
 supervisor/shared/workflow.c                  |  40 +--
 7 files changed, 199 insertions(+), 182 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 19e83e717f..5af3cdbbc3 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -45,70 +45,79 @@
 
 StackType_t socket_select_stack[2 * configMINIMAL_STACK_SIZE];
 
-STATIC int open_socket_fds[CONFIG_LWIP_MAX_SOCKETS];
+/* Socket state table:
+ * 0 := Closed (unused)
+ * 1 := Open
+ * 2 := Closing (remove from rfds)
+ * Index into socket_fd_state is calculated from actual lwip fd. idx := fd - LWIP_SOCKET_OFFSET
+*/
+#define FDSTATE_CLOSED  0
+#define FDSTATE_OPEN    1
+#define FDSTATE_CLOSING 2
+STATIC uint8_t socket_fd_state[CONFIG_LWIP_MAX_SOCKETS];
+
 STATIC socketpool_socket_obj_t *user_socket[CONFIG_LWIP_MAX_SOCKETS];
-StaticTask_t socket_select_task_handle;
+StaticTask_t socket_select_task_buffer;
+TaskHandle_t socket_select_task_handle;
 STATIC int socket_change_fd = -1;
 
 STATIC void socket_select_task(void *arg) {
     uint64_t signal;
+    fd_set readfds;
+    fd_set excptfds;
 
     while (true) {
-        fd_set readfds;
-        fd_set errfds;
         FD_ZERO(&readfds);
-        FD_ZERO(&errfds);
+        FD_ZERO(&excptfds);
         FD_SET(socket_change_fd, &readfds);
-        FD_SET(socket_change_fd, &errfds);
         int max_fd = socket_change_fd;
-        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-            int sockfd = open_socket_fds[i];
-            if (sockfd < 0) {
-                continue;
+        for (size_t i = 0; i < MP_ARRAY_SIZE(socket_fd_state); i++) {
+            if ((socket_fd_state[i] == FDSTATE_OPEN) && (user_socket[i] == NULL)) {
+                int sockfd = i + LWIP_SOCKET_OFFSET;
+                max_fd = MAX(max_fd, sockfd);
+                FD_SET(sockfd, &readfds);
+                FD_SET(sockfd, &excptfds);
             }
-            max_fd = MAX(max_fd, sockfd);
-            FD_SET(sockfd, &readfds);
-            FD_SET(sockfd, &errfds);
         }
 
-        int num_triggered = select(max_fd + 1, &readfds, NULL, &errfds, NULL);
-        // Check for bad file descriptor and queue up the background task before
-        // circling around.
-        if (num_triggered == -1 && errno == EBADF) {
-            // One for the change fd and one for the closed socket.
-            num_triggered = 2;
+        int num_triggered = select(max_fd + 1, &readfds, NULL, &excptfds, NULL);
+        // Hard error (or someone closed a socket on another thread)
+        if (num_triggered == -1) {
+            assert(errno == EBADF);
+            continue;
         }
-        // Try and find the bad file and remove it from monitoring.
-        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-            int sockfd = open_socket_fds[i];
-            if (sockfd < 0) {
-                continue;
-            }
-            int err;
-            int optlen = sizeof(int);
-            int ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, (socklen_t *)&optlen);
-            if (ret < 0) {
-                open_socket_fds[i] = -1;
-                // Raise num_triggered so that we skip the assert and queue the background task.
-                num_triggered = 2;
-            }
-        }
-        assert(num_triggered >= 0);
 
+        assert(num_triggered > 0);
+        assert(!FD_ISSET(socket_change_fd, &excptfds));
+
+        // Notice event trigger
         if (FD_ISSET(socket_change_fd, &readfds)) {
             read(socket_change_fd, &signal, sizeof(signal));
-            num_triggered -= 1;
+            num_triggered--;
         }
+
+        // Handle active FDs, close the dead ones
+        for (size_t i = 0; i < MP_ARRAY_SIZE(socket_fd_state); i++) {
+            int sockfd = i + LWIP_SOCKET_OFFSET;
+            if (socket_fd_state[i] != FDSTATE_CLOSED) {
+                if (FD_ISSET(sockfd, &readfds) || FD_ISSET(sockfd, &excptfds)) {
+                    if (socket_fd_state[i] == FDSTATE_CLOSING) {
+                        socket_fd_state[i] = FDSTATE_CLOSED;
+                        num_triggered--;
+                    }
+                }
+            }
+        }
+
         if (num_triggered > 0) {
+            // Wake up CircuitPython by queuing request
             supervisor_workflow_request_background();
-
-            // Wake up CircuitPython. We know it is asleep because we are lower
-            // priority.
-            port_wake_main_task();
+            ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
         }
-
     }
+
     close(socket_change_fd);
+    socket_change_fd = -1;
     vTaskDelete(NULL);
 }
 
@@ -117,75 +126,62 @@ void socket_user_reset(void) {
         esp_vfs_eventfd_config_t config = ESP_VFS_EVENTD_CONFIG_DEFAULT();
         ESP_ERROR_CHECK(esp_vfs_eventfd_register(&config));
 
-        for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-            open_socket_fds[i] = -1;
+        // Clear initial socket states
+        for (size_t i = 0; i < MP_ARRAY_SIZE(socket_fd_state); i++) {
+            socket_fd_state[i] = FDSTATE_CLOSED;
             user_socket[i] = NULL;
         }
         socket_change_fd = eventfd(0, 0);
         // Run this at the same priority as CP so that the web workflow background task can be
         // queued while CP is running. Both tasks can still sleep and, therefore, sleep overall.
-        (void)xTaskCreateStaticPinnedToCore(socket_select_task,
+        socket_select_task_handle = xTaskCreateStaticPinnedToCore(socket_select_task,
             "socket_select",
             2 * configMINIMAL_STACK_SIZE,
             NULL,
             uxTaskPriorityGet(NULL),
             socket_select_stack,
-            &socket_select_task_handle,
+            &socket_select_task_buffer,
             xPortGetCoreID());
-    }
-
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-        if (open_socket_fds[i] >= 0 && user_socket[i]) {
-            common_hal_socketpool_socket_close(user_socket[i]);
-            int num = open_socket_fds[i];
-            // Close automatically clears socket handle
-            lwip_shutdown(num, SHUT_RDWR);
-            lwip_close(num);
-            open_socket_fds[i] = -1;
-            user_socket[i] = NULL;
+    } else {
+        // Not init - close open user sockets
+        for (size_t i = 0; i < MP_ARRAY_SIZE(socket_fd_state); i++) {
+            if ((socket_fd_state[i] == FDSTATE_OPEN) && user_socket[i]) {
+                common_hal_socketpool_socket_close(user_socket[i]);
+            }
         }
     }
 }
 
+// Unblock select task (ok if not blocked yet)
+void socketpool_socket_poll_resume(void) {
+    if (socket_select_task_handle) {
+        xTaskNotifyGive(socket_select_task_handle);
+    }
+}
+
 // The writes below send an event to the socket select task so that it redoes the
 // select with the new open socket set.
 
 STATIC bool register_open_socket(int fd) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-        if (open_socket_fds[i] == -1) {
-            open_socket_fds[i] = fd;
-            user_socket[i] = false;
-            uint64_t signal = 1;
-            write(socket_change_fd, &signal, sizeof(signal));
-            return true;
-        }
+    if (fd < FD_SETSIZE) {
+        socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_OPEN;
+        user_socket[fd - LWIP_SOCKET_OFFSET] = NULL;
+
+        uint64_t signal = 1;
+        write(socket_change_fd, &signal, sizeof(signal));
+        socketpool_socket_poll_resume();
+        return true;
     }
     return false;
 }
 
-STATIC void unregister_open_socket(int fd) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-        if (open_socket_fds[i] == fd) {
-            open_socket_fds[i] = -1;
-            user_socket[i] = false;
-            // Write must be 8 bytes for an eventfd.
-            uint64_t signal = 1;
-            write(socket_change_fd, &signal, sizeof(signal));
-            return;
-        }
-    }
-}
-
 STATIC void mark_user_socket(int fd, socketpool_socket_obj_t *obj) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_fds); i++) {
-        if (open_socket_fds[i] == fd) {
-            user_socket[i] = obj;
-            return;
-        }
-    }
+    socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_OPEN;
+    user_socket[fd - LWIP_SOCKET_OFFSET] = obj;
+    // No need to wakeup select task
 }
 
-bool socketpool_socket(socketpool_socketpool_obj_t *self,
+STATIC bool _socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
     socketpool_socket_obj_t *sock) {
     int addr_family;
@@ -193,9 +189,11 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
     if (family == SOCKETPOOL_AF_INET) {
         addr_family = AF_INET;
         ipproto = IPPROTO_IP;
+    #if LWIP_IPV6
     } else { // INET6
         addr_family = AF_INET6;
         ipproto = IPPROTO_IPV6;
+    #endif
     }
 
     int socket_type;
@@ -218,14 +216,28 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
     if (socknum < 0) {
         return false;
     }
-    // This shouldn't happen since we have room for the same number of sockets as LWIP.
-    if (!register_open_socket(socknum)) {
-        lwip_close(socknum);
-        return false;
-    }
+
     sock->num = socknum;
     // Sockets should be nonblocking in most cases
     lwip_fcntl(socknum, F_SETFL, O_NONBLOCK);
+
+    return true;
+}
+
+// special entry for workflow listener (register system socket)
+bool socketpool_socket(socketpool_socketpool_obj_t *self,
+    socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type,
+    socketpool_socket_obj_t *sock) {
+
+    if (!_socketpool_socket(self, family, type, sock)) {
+        return false;
+    }
+
+    // This shouldn't happen since we have room for the same number of sockets as LWIP.
+    if (!register_open_socket(sock->num)) {
+        lwip_close(sock->num);
+        return false;
+    }
     return true;
 }
 
@@ -238,7 +250,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
     socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
     sock->base.type = &socketpool_socket_type;
 
-    if (!socketpool_socket(self, family, type, sock)) {
+    if (!_socketpool_socket(self, family, type, sock)) {
         mp_raise_RuntimeError(translate("Out of sockets"));
     }
     mark_user_socket(sock->num, sock);
@@ -279,17 +291,16 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
     // We got a socket. New client socket will not be non-blocking by default, so make it non-blocking.
     lwip_fcntl(newsoc, F_SETFL, O_NONBLOCK);
 
-    if (!register_open_socket(newsoc)) {
-        lwip_close(newsoc);
-        return -MP_EBADF;
-    }
-
-
     if (accepted != NULL) {
-        // Close the active socket because we have another we accepted.
-        if (!common_hal_socketpool_socket_get_closed(accepted)) {
-            common_hal_socketpool_socket_close(accepted);
+        // Error if called with open socket object.
+        assert(common_hal_socketpool_socket_get_closed(accepted));
+
+        // Register if system socket
+        if (!register_open_socket(newsoc)) {
+            lwip_close(newsoc);
+            return -MP_EBADF;
         }
+
         // Replace the old accepted socket with the new one.
         accepted->num = newsoc;
         accepted->pool = self->pool;
@@ -353,12 +364,21 @@ void socketpool_socket_close(socketpool_socket_obj_t *self) {
         return;
     }
     self->connected = false;
-    if (self->num >= 0) {
-        lwip_shutdown(self->num, SHUT_RDWR);
-        lwip_close(self->num);
-        unregister_open_socket(self->num);
-        self->num = -1;
+    int fd = self->num;
+    // Ignore bogus/closed sockets
+    if (fd >= LWIP_SOCKET_OFFSET) {
+        if (user_socket[fd - LWIP_SOCKET_OFFSET] == NULL) {
+            socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_CLOSING;
+            lwip_shutdown(fd, SHUT_RDWR);
+            lwip_close(fd);
+        } else {
+            lwip_shutdown(fd, SHUT_RDWR);
+            lwip_close(fd);
+            socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_CLOSED;
+            user_socket[fd - LWIP_SOCKET_OFFSET] = NULL;
+        }
     }
+    self->num = -1;
 }
 
 void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) {
@@ -420,7 +440,7 @@ bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) {
 }
 
 bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) {
-    return lwip_listen(self->num, backlog);
+    return lwip_listen(self->num, backlog) == 0;
 }
 
 mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t *self,
@@ -479,10 +499,9 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self,
             }
             RUN_BACKGROUND_TASKS;
             received = lwip_recv(self->num, (void *)buf, len, 0);
-
             // In non-blocking mode, fail instead of looping
-            if (received == -1 && self->timeout_ms == 0) {
-                if (errno == ENOTCONN) {
+            if (received < 1 && self->timeout_ms == 0) {
+                if ((received == 0) || (errno == ENOTCONN)) {
                     self->connected = false;
                     return -MP_ENOTCONN;
                 }
diff --git a/ports/espressif/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h
index 45e36e58ca..dfd1cbfc11 100644
--- a/ports/espressif/common-hal/socketpool/Socket.h
+++ b/ports/espressif/common-hal/socketpool/Socket.h
@@ -48,3 +48,5 @@ typedef struct {
 } socketpool_socket_obj_t;
 
 void socket_user_reset(void);
+// Unblock workflow socket select thread (platform specific)
+void socketpool_socket_poll_resume(void);
diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.h b/ports/raspberrypi/common-hal/socketpool/Socket.h
index 6e26087674..c2306d201a 100644
--- a/ports/raspberrypi/common-hal/socketpool/Socket.h
+++ b/ports/raspberrypi/common-hal/socketpool/Socket.h
@@ -75,4 +75,7 @@ typedef struct _lwip_socket_obj_t {
     socketpool_socketpool_obj_t *pool;
 } socketpool_socket_obj_t;
 
+// Not required for RPi socket positive callbacks
+#define socketpool_socket_poll_resume(x)
+
 void socket_user_reset(void);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 75ab78bf03..468787269a 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -303,15 +303,12 @@ void supervisor_start_web_workflow(void) {
         return;
     }
 
-    mp_int_t new_port = web_api_port;
     // (leaves new_port unchanged on any failure)
-    (void)common_hal_os_getenv_int("CIRCUITPY_WEB_API_PORT", &new_port);
+    (void)common_hal_os_getenv_int("CIRCUITPY_WEB_API_PORT", &web_api_port);
 
     bool first_start = pool.base.type != &socketpool_socketpool_type;
-    bool port_changed = new_port != web_api_port;
 
     if (first_start) {
-        port_changed = false;
         pool.base.type = &socketpool_socketpool_type;
         common_hal_socketpool_socketpool_construct(&pool, &common_hal_wifi_radio_obj);
 
@@ -320,6 +317,11 @@ void supervisor_start_web_workflow(void) {
 
         websocket_init();
     }
+
+    if (!common_hal_socketpool_socket_get_closed(&active)) {
+        common_hal_socketpool_socket_close(&active);
+    }
+
     #if CIRCUITPY_MDNS
     // Try to start MDNS if the user deinited it.
     if (mdns.base.type != &mdns_server_type ||
@@ -330,24 +332,10 @@ void supervisor_start_web_workflow(void) {
             common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
         }
     }
+    if (!common_hal_mdns_server_deinited(&mdns)) {
+        common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
+    }
     #endif
-    if (port_changed) {
-        common_hal_socketpool_socket_close(&listening);
-    }
-    if (first_start || port_changed) {
-        web_api_port = new_port;
-        #if CIRCUITPY_MDNS
-        if (!common_hal_mdns_server_deinited(&mdns)) {
-            common_hal_mdns_server_advertise_service(&mdns, "_circuitpython", "_tcp", web_api_port);
-        }
-        #endif
-        socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
-        common_hal_socketpool_socket_settimeout(&listening, 0);
-        // Bind to any ip.
-        common_hal_socketpool_socket_bind(&listening, "", 0, web_api_port);
-        common_hal_socketpool_socket_listen(&listening, 1);
-    }
-
 
     const size_t api_password_len = sizeof(_api_password) - 1;
     result = common_hal_os_getenv_str("CIRCUITPY_WEB_API_PASSWORD", _api_password + 1, api_password_len);
@@ -355,6 +343,16 @@ void supervisor_start_web_workflow(void) {
         _api_password[0] = ':';
         _base64_in_place(_api_password, strlen(_api_password), sizeof(_api_password) - 1);
     }
+
+    if (common_hal_socketpool_socket_get_closed(&listening)) {
+        socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, &listening);
+        common_hal_socketpool_socket_settimeout(&listening, 0);
+        // Bind to any ip. (Not checking for failures)
+        common_hal_socketpool_socket_bind(&listening, "", 0, web_api_port);
+        common_hal_socketpool_socket_listen(&listening, 1);
+    }
+    // Wake polling thread (maybe)
+    socketpool_socket_poll_resume();
     #endif
 }
 
@@ -513,7 +511,7 @@ static void _cors_header(socketpool_socket_obj_t *socket, _request *request) {
     _send_strs(socket,
         "Access-Control-Allow-Credentials: true\r\n",
         "Vary: Origin, Accept, Upgrade\r\n",
-        "Access-Control-Allow-Origin: ", request->origin, "\r\n",
+        "Access-Control-Allow-Origin: *\r\n",
         NULL);
 }
 
@@ -1080,6 +1078,10 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         #else
         _reply_missing(socket, request);
         #endif
+
+// For now until CORS is sorted, allow always the origin requester.
+// Note: caller knows who we are better than us. CORS is not security
+//       unless browser cooperates. Do not rely on mDNS or IP.
     } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
         _reply_forbidden(socket, request);
     } else if (strncmp(request->path, "/fs/", 4) == 0) {
@@ -1323,9 +1325,14 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
     uint8_t c;
     // This code assumes header lines are terminated with \r\n
     while (more && !error) {
+
         int len = socketpool_socket_recv_into(socket, &c, 1);
         if (len != 1) {
             more = false;
+            if (len == 0 || len == -MP_ENOTCONN) {
+                // Disconnect - clear 'in-progress'
+                _reset_request(request);
+            }
             break;
         }
         if (!request->in_progress) {
@@ -1452,6 +1459,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
     }
     bool reload = _reply(socket, request);
     _reset_request(request);
+    common_hal_socketpool_socket_close(socket);
     autoreload_resume(AUTORELOAD_SUSPEND_WEB);
     if (reload) {
         autoreload_trigger();
@@ -1459,45 +1467,52 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
 }
 
 
-void supervisor_web_workflow_background(void) {
-    // Track if we have more to do. For example, we should start processing a
-    // request immediately after we accept the socket.
-    bool more_to_do = true;
-    while (more_to_do) {
-        more_to_do = false;
+void supervisor_web_workflow_background(void *data) {
+    while (true) {
         // If we have a request in progress, continue working on it. Do this first
         // so that we can accept another socket after finishing this request.
         if (common_hal_socketpool_socket_get_connected(&active)) {
             _process_request(&active, &active_request);
+            if (active_request.in_progress) {
+                break;
+            }
         } else {
-            // Close the active socket if it is no longer connected.
-            common_hal_socketpool_socket_close(&active);
+            // Close the active socket if necessary
+            if (!common_hal_socketpool_socket_get_closed(&active)) {
+                common_hal_socketpool_socket_close(&active);
+            }
         }
-
         // Otherwise, see if we have another socket to accept.
         if ((!common_hal_socketpool_socket_get_connected(&active) ||
              (!active_request.in_progress && !active_request.new_socket)) &&
             !common_hal_socketpool_socket_get_closed(&listening)) {
             uint32_t ip;
             uint32_t port;
+            if (!common_hal_socketpool_socket_get_closed(&active)) {
+                common_hal_socketpool_socket_close(&active);
+            }
             int newsoc = socketpool_socket_accept(&listening, (uint8_t *)&ip, &port, &active);
             if (newsoc == -EBADF) {
                 common_hal_socketpool_socket_close(&listening);
-                return;
+                break;
             }
             if (newsoc > 0) {
                 common_hal_socketpool_socket_settimeout(&active, 0);
-
                 _reset_request(&active_request);
                 // Mark new sockets, otherwise we may accept another before the first
                 // could start its request.
                 active_request.new_socket = true;
-                more_to_do = true;
+                continue;
             }
+            break;
         }
-
         websocket_background();
+        break;
     }
+    // Resume polling
+    socketpool_socket_poll_resume();
+
+    return;
 }
 
 void supervisor_stop_web_workflow(void) {
diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h
index a76490aba2..85205b04d6 100644
--- a/supervisor/shared/web_workflow/web_workflow.h
+++ b/supervisor/shared/web_workflow/web_workflow.h
@@ -33,7 +33,7 @@
 
 // This background function should be called repeatedly. It cannot be done based
 // on events.
-void supervisor_web_workflow_background(void);
+void supervisor_web_workflow_background(void *data);
 bool supervisor_web_workflow_status_dirty(void);
 void supervisor_web_workflow_status(void);
 void supervisor_start_web_workflow(void);
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
index e55e09b3e7..0b829bb6f8 100644
--- a/supervisor/shared/web_workflow/websocket.c
+++ b/supervisor/shared/web_workflow/websocket.c
@@ -42,7 +42,6 @@ typedef struct {
     uint8_t frame_len;
     uint8_t payload_len_size;
     bool masked;
-    bool closed;
     uint8_t mask[4];
     int frame_index;
     size_t payload_remaining;
@@ -59,17 +58,16 @@ static _websocket cp_serial;
 
 void websocket_init(void) {
     socketpool_socket_reset(&cp_serial.socket);
-    cp_serial.closed = true;
 
     ringbuf_init(&_incoming_ringbuf, _buf, sizeof(_buf) - 1);
 }
 
 void websocket_handoff(socketpool_socket_obj_t *socket) {
-    if (!cp_serial.closed) {
+    if (!common_hal_socketpool_socket_get_closed(&cp_serial.socket)) {
         common_hal_socketpool_socket_close(&cp_serial.socket);
     }
+
     socketpool_socket_move(socket, &cp_serial.socket);
-    cp_serial.closed = false;
     cp_serial.opcode = 0;
     cp_serial.frame_index = 0;
     cp_serial.frame_len = 2;
@@ -81,12 +79,14 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
 }
 
 bool websocket_connected(void) {
-    return _incoming_ringbuf.size > 0 && !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
+    return _incoming_ringbuf.size > 0 &&
+           !common_hal_socketpool_socket_get_closed(&cp_serial.socket) &&
+           common_hal_socketpool_socket_get_connected(&cp_serial.socket);
 }
 
 static bool _read_byte(uint8_t *c) {
     int len = socketpool_socket_recv_into(&cp_serial.socket, c, 1);
-    if (len != 1) {
+    if (len < 1) {
         return false;
     }
     return true;
@@ -160,8 +160,6 @@ static void _read_next_frame_header(void) {
         if (cp_serial.payload_remaining == 0) {
             cp_serial.frame_index = 0;
             if (cp_serial.opcode == 0x8) {
-                cp_serial.closed = true;
-
                 common_hal_socketpool_socket_close(&cp_serial.socket);
             }
         }
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index f3bc99cb5e..64f1021df2 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -46,15 +46,7 @@
 #if CIRCUITPY_WEB_WORKFLOW
 #include "supervisor/shared/web_workflow/web_workflow.h"
 #endif
-static background_callback_t workflow_background_cb;
-
-static bool workflow_started = false;
-
-static void workflow_background(void *data) {
-    #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_web_workflow_background();
-    #endif
-}
+static background_callback_t workflow_background_cb = {NULL, NULL};
 
 // Called during a VM reset. Doesn't actually reset things.
 void supervisor_workflow_reset(void) {
@@ -63,31 +55,18 @@ void supervisor_workflow_reset(void) {
     #endif
 
     #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_start_web_workflow();
+    if (workflow_background_cb.fun) {
+        supervisor_start_web_workflow();
+        supervisor_workflow_request_background();
+    }
     #endif
-
-    workflow_background_cb.fun = workflow_background;
-    workflow_background_cb.data = NULL;
-    supervisor_workflow_request_background();
 }
 
 void supervisor_workflow_request_background(void) {
-    if (!workflow_started) {
-        return;
+    if (workflow_background_cb.fun) {
+        workflow_background_cb.data = NULL;
+        background_callback_add_core(&workflow_background_cb);
     }
-    background_callback_add_core(&workflow_background_cb);
-}
-
-// Return true as soon as USB communication with host has started,
-// even before enumeration is done.
-// Not that some chips don't notice when USB is unplugged after first being plugged in,
-// so this is not perfect, but tud_suspended() check helps.
-bool supervisor_workflow_connecting(void) {
-    #if CIRCUITPY_USB
-    return tud_connected() && !tud_suspended();
-    #else
-    return false;
-    #endif
 }
 
 // Return true if host has completed connection to us (such as USB enumeration).
@@ -120,9 +99,10 @@ void supervisor_workflow_start(void) {
 
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_start_web_workflow();
+    memset(&workflow_background_cb, 0, sizeof(workflow_background_cb));
+    workflow_background_cb.fun = supervisor_web_workflow_background;
     #endif
 
-    workflow_started = true;
 }
 
 FRESULT supervisor_workflow_mkdir_parents(FATFS *fs, char *path) {

From 690168b1ab6bbae0f235dfc5a1eb4f47008bd431 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Wed, 5 Apr 2023 19:53:26 +0200
Subject: [PATCH 2208/2403] add support for Plasma2040W

---
 .../boards/pimoroni_plasma2040w/board.c       |  29 ++
 .../boards/pimoroni_plasma2040w/link.ld       | 294 ++++++++++++++++++
 .../pimoroni_plasma2040w/mpconfigboard.h      |  10 +
 .../pimoroni_plasma2040w/mpconfigboard.mk     |  26 ++
 .../pico-sdk-configboard.h                    |   1 +
 .../boards/pimoroni_plasma2040w/pins.c        |  62 ++++
 6 files changed, 422 insertions(+)
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/board.c
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c

diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/board.c b/ports/raspberrypi/boards/pimoroni_plasma2040w/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld b/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
new file mode 100644
index 0000000000..2777b41720
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
@@ -0,0 +1,294 @@
+/* Based on GCC ARM embedded samples.
+   Defines the following symbols for use by code:
+    __exidx_start
+    __exidx_end
+    __etext
+    __data_start__
+    __preinit_array_start
+    __preinit_array_end
+    __init_array_start
+    __init_array_end
+    __fini_array_start
+    __fini_array_end
+    __data_end__
+    __bss_start__
+    __bss_end__
+    __end__
+    end
+    __HeapLimit
+    __StackLimit
+    __StackTop
+    __stack (== StackTop)
+*/
+
+MEMORY
+{
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
+    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
+    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
+    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
+    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
+}
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
+       and checksummed. It is usually built by the boot_stage2 target
+       in the Pico SDK
+    */
+
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH_FIRMWARE
+
+    .boot2 : {
+        __boot2_start__ = .;
+        KEEP (*(.boot2))
+        __boot2_end__ = .;
+    } > FLASH_FIRMWARE
+
+    ASSERT(__boot2_end__ - __boot2_start__ == 256,
+        "ERROR: Pico second stage bootloader must be 256 bytes in size")
+
+    /* The second stage will always enter the image at the start of .text.
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol if present, otherwise defaults to start of .text.
+       This can be used to transfer control back to the bootrom on debugger
+       launches only, to perform proper flash setup.
+    */
+
+    .text : {
+        __logical_binary_start = .;
+        KEEP (*(.vectors))
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.reset))
+        /* TODO revisit this now memset/memcpy/float in ROM */
+        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
+         * FLASH ... we will include any thing excluded here in .data below by default */
+        *(.init)
+
+        __property_getter_start = .;
+        *(.property_getter)
+        __property_getter_end = .;
+        __property_getset_start = .;
+        *(.property_getset)
+        __property_getset_end = .;
+
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
+        *(.fini)
+        /* Pull all c'tors into .text */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+        /* Followed by destructors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        . = ALIGN(4);
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
+        . = ALIGN(4);
+    } > FLASH_FIRMWARE
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH_FIRMWARE
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH_FIRMWARE
+    __exidx_end = .;
+
+    /* Machine inspectable binary information */
+    . = ALIGN(4);
+    __binary_info_start = .;
+    .binary_info :
+    {
+        KEEP(*(.binary_info.keep.*))
+        *(.binary_info.*)
+    } > FLASH_FIRMWARE
+    __binary_info_end = .;
+    . = ALIGN(4);
+
+    /* End of .text-like segments */
+    __etext = .;
+
+   .ram_vector_table (COPY): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .data : {
+        __data_start__ = .;
+        *(vtable)
+
+        *(.time_critical*)
+
+        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+        *(.text*)
+        . = ALIGN(4);
+        *(.rodata*)
+        . = ALIGN(4);
+
+        *(.data*)
+
+        . = ALIGN(4);
+        *(.after_data.*)
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__mutex_array_start = .);
+        KEEP(*(SORT(.mutex_array.*)))
+        KEEP(*(.mutex_array))
+        PROVIDE_HIDDEN (__mutex_array_end = .);
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(SORT(.preinit_array.*)))
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        *(SORT(.fini_array.*))
+        *(.fini_array)
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+        /* All data end */
+        __data_end__ = .;
+    } > RAM AT> FLASH_FIRMWARE
+
+    .itcm :
+    {
+        . = ALIGN(4);
+        *(.itcm.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_itcm_destination = ADDR(.itcm);
+    _ld_itcm_flash_copy = LOADADDR(.itcm);
+    _ld_itcm_size = SIZEOF(.itcm);
+
+    .dtcm_data :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_data.*)
+
+        . = ALIGN(4);
+    } > RAM AT> FLASH_FIRMWARE
+    _ld_dtcm_data_destination = ADDR(.dtcm_data);
+    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
+    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
+
+    .dtcm_bss :
+    {
+        . = ALIGN(4);
+
+        *(.dtcm_bss.*)
+
+        . = ALIGN(4);
+    } > RAM AT> RAM
+    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
+    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
+
+    .uninitialized_data (COPY): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > RAM
+
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH_FIRMWARE
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        *(.scratch_y.*)
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH_FIRMWARE
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
+    .bss  : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (COPY):
+    {
+        __end__ = .;
+        end = __end__;
+        *(.heap*)
+        __HeapLimit = .;
+    } > RAM
+
+    /* .stack*_dummy section doesn't contains any symbols. It is only
+     * used for linker to calculate size of stack sections, and assign
+     * values to stack symbols later
+     *
+     * stack1 section may be empty/missing if platform_launch_core1 is not used */
+
+    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
+     * stack is not used then all of SCRATCH_X is free.
+     */
+    .stack1_dummy (COPY):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (COPY):
+    {
+        *(.stack*)
+    } > SCRATCH_Y
+
+    .flash_end : {
+        __flash_binary_end = .;
+    } > FLASH_FIRMWARE
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
+    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
+    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
+    PROVIDE(__stack = __StackTop);
+
+    /* Check if data + heap + stack exceeds RAM limit */
+    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
+    /* todo assert on extra code */
+}
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.h
new file mode 100644
index 0000000000..d36f7a8baf
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Pimoroni Plasma 2040W"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
+
+#define MICROPY_HW_LED_STATUS   (&pin_CYW0)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
new file mode 100644
index 0000000000..68fec260ed
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
@@ -0,0 +1,26 @@
+USB_VID = 0x2E8A
+USB_PID = 0x100a
+USB_PRODUCT = "Plasma 2040 W"
+USB_MANUFACTURER = "Pimoroni"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+
+CIRCUITPY_CYW43 = 1
+CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_MBEDTLS = 1
+CIRCUITPY_HASHLIB = 1
+CIRCUITPY_WEB_WORKFLOW = 1
+CIRCUITPY_MDNS = 1
+CIRCUITPY_SOCKETPOOL = 1
+CIRCUITPY_WIFI = 1
+
+CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+# Must be accompanied by a linker script change
+CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_plasma2040w/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c b/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c
new file mode 100644
index 0000000000..691e2c9355
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c
@@ -0,0 +1,62 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_DATA), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From f2e26e8bde8790d98e1b9a42c2ac9444237f74bc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 13:12:13 -0500
Subject: [PATCH 2209/2403] get the cmsis macros the right way

---
 shared-module/audiomixer/Mixer.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
index ce39f88919..397a837133 100644
--- a/shared-module/audiomixer/Mixer.c
+++ b/shared-module/audiomixer/Mixer.c
@@ -33,10 +33,9 @@
 
 #include "py/runtime.h"
 #include "shared-module/audiocore/__init__.h"
-#include "shared-module/audiocore/RawSample.h"
 
-#if (defined(__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))
-#include "periph.h"
+#if defined(__arm__) && __arm__
+#include "cmsis_compiler.h"
 #endif
 
 void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t *self,

From 2ca4875ce599a0b016b6a715bc158ef4e7580788 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Wed, 5 Apr 2023 21:23:19 +0200
Subject: [PATCH 2210/2403] 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/ru.po             | 4 ++++
 locale/sv.po             | 4 ++++
 locale/tr.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 99ed347bf5..7163efb5df 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -196,6 +196,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/cs.po b/locale/cs.po
index 9f2917d396..0e6b8714af 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -197,6 +197,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 30b1c8a6c7..6b68831288 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -206,6 +206,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q muss ein Array vom Typ 'H' sein"
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/el.po b/locale/el.po
index 69d62af435..c1d8350462 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -201,6 +201,10 @@ msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H',
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 0f6abecec5..8f45f3617a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -200,6 +200,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/es.po b/locale/es.po
index 3dd68ca430..0123657e35 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -208,6 +208,10 @@ msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 msgid "%q must be array of type 'H'"
 msgstr "%q debe ser un arreglo de tipo 'H'"
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/fil.po b/locale/fil.po
index 7540377953..2a9127c34c 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -194,6 +194,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/fr.po b/locale/fr.po
index 3076df8d16..a281712f96 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -205,6 +205,10 @@ msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/hi.po b/locale/hi.po
index b0ede40028..1f60a526cd 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -193,6 +193,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index f8037c8954..57a9a3b91f 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -197,6 +197,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/ja.po b/locale/ja.po
index 8931beb108..fbe0d8c902 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -200,6 +200,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/ko.po b/locale/ko.po
index 34d4ffcb5d..339cb42c86 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -194,6 +194,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/nl.po b/locale/nl.po
index 3232cc6f14..a91063c256 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -193,6 +193,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/pl.po b/locale/pl.po
index e1bed87c6c..fbd76182cc 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -195,6 +195,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 85ca810b98..58b7424deb 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -206,6 +206,10 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 msgid "%q must be array of type 'H'"
 msgstr "%q deve ser uma matriz do tipo 'H'"
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/ru.po b/locale/ru.po
index 4d40fe946e..8fe6419b11 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -200,6 +200,10 @@ msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b',
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/sv.po b/locale/sv.po
index 8d3bed02f4..dc806e269e 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -207,6 +207,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q måste vara en array av typen 'H'"
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/tr.po b/locale/tr.po
index 5f3882ca9e..1f8874167b 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -201,6 +201,10 @@ msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı"
 msgid "%q must be array of type 'H'"
 msgstr ""
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index d149942d6a..37d8016fc7 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -209,6 +209,10 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
 
+#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+msgid "%q must be array of type 'h'"
+msgstr ""
+
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"

From 09bc8fbdc07e253602e6b04ff972a2350919476b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 13:02:08 -0500
Subject: [PATCH 2211/2403] add more test vectors for aes

---
 tests/circuitpython/aes.py     | 44 ++++++++++++++++++++++++++++++++++
 tests/circuitpython/aes.py.exp | 14 +++++++++++
 2 files changed, 58 insertions(+)

diff --git a/tests/circuitpython/aes.py b/tests/circuitpython/aes.py
index 40adc020c6..b47c4279d3 100644
--- a/tests/circuitpython/aes.py
+++ b/tests/circuitpython/aes.py
@@ -97,3 +97,47 @@ for i in range(0, len(plaintext), 16):
     cipher.decrypt_into(cyphertext[i : i + 16], output)
     print(str(hexlify(output), ""))
 print()
+
+print("truncated-CTR-1")
+## Truncated CTR test case
+plaintext = unhexlify("6bc1bee22e409f96e93d7e117393172a" "ae2d")
+
+key = unhexlify("2b7e151628aed2a6abf7158809cf4f3c")
+counter = unhexlify("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff")
+cyphertext = bytearray(len(plaintext))
+cipher = aesio.AES(key, aesio.MODE_CTR, IV=counter)
+for i in range(0, len(plaintext), 16):
+    output = memoryview(cyphertext)[i : i + 16]
+    cipher.encrypt_into(plaintext[i : i + 16], output)
+    print(str(hexlify(output), ""))
+print()
+
+plaintext = bytearray(len(plaintext))
+cipher = aesio.AES(key, aesio.MODE_CTR, IV=counter)
+for i in range(0, len(plaintext), 16):
+    output = memoryview(plaintext)[i : i + 16]
+    cipher.decrypt_into(cyphertext[i : i + 16], output)
+    print(str(hexlify(output), ""))
+print()
+
+print("truncated-CTR-2")
+## Truncated CTR test case #2
+plaintext = unhexlify("6bc1bee22e409f96e93d7e117393172a" "ae")
+
+key = unhexlify("2b7e151628aed2a6abf7158809cf4f3c")
+counter = unhexlify("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff")
+cyphertext = bytearray(len(plaintext))
+cipher = aesio.AES(key, aesio.MODE_CTR, IV=counter)
+cipher.encrypt_into(plaintext, cyphertext)
+for i in range(0, len(plaintext), 16):
+    output = memoryview(cyphertext)[i : i + 16]
+    print(str(hexlify(output), ""))
+print()
+
+plaintext = bytearray(len(plaintext))
+cipher = aesio.AES(key, aesio.MODE_CTR, IV=counter)
+cipher.decrypt_into(cyphertext, plaintext)
+for i in range(0, len(plaintext), 16):
+    output = memoryview(plaintext)[i : i + 16]
+    print(str(hexlify(output), ""))
+print()
diff --git a/tests/circuitpython/aes.py.exp b/tests/circuitpython/aes.py.exp
index da0f8c29b1..17a2bfe12a 100644
--- a/tests/circuitpython/aes.py.exp
+++ b/tests/circuitpython/aes.py.exp
@@ -34,3 +34,17 @@ ae2d8a571e03ac9c9eb76fac45af8e51
 30c81c46a35ce411e5fbc1191a0a52ef
 f69f2445df4f9b17ad2b417be66c3710
 
+truncated-CTR-1
+874d6191b620e3261bef6864990db6ce
+9806
+
+6bc1bee22e409f96e93d7e117393172a
+ae2d
+
+truncated-CTR-2
+874d6191b620e3261bef6864990db6ce
+98
+
+6bc1bee22e409f96e93d7e117393172a
+ae
+

From 9993b4b01c9448236546f1908ade6b39e04e80cc Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 16:20:27 -0500
Subject: [PATCH 2212/2403] Prevent playing the same note on 2 channels

---
 shared-module/synthio/__init__.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 7ac8e47746..e41869a113 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -160,6 +160,9 @@ STATIC int find_channel_with_note(const synthio_midi_span_t *span, uint8_t note)
 }
 
 bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note) {
+    if (new_note != SYNTHIO_SILENCE && find_channel_with_note(span, new_note) != -1) {
+        return false; // note already pressed, do nothing
+    }
     int channel = find_channel_with_note(span, old_note);
     if (channel != -1) {
         span->note[channel] = new_note;

From 992457c7f75adc0185d9733810c46adb9c5897ad Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 16:20:35 -0500
Subject: [PATCH 2213/2403] Improve documentation

---
 shared-bindings/synthio/Synthesizer.c | 45 ++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index 2ad5cbcd42..56ad0d76cd 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -36,9 +36,20 @@
 #include "shared-bindings/synthio/__init__.h"
 #include "supervisor/shared/translate/translate.h"
 
-//| class Synth:
+//| class Synthesizer:
 //|     def __init__(self, *, sample_rate: int = 11025, waveform: ReadableBuffer = None) -> None:
-//|         """Create a synthesizer object."""
+//|         """Create a synthesizer object.
+//|
+//|         This API is experimental.
+//|
+//|         At least 2 simultaneous notes are supported.  mimxrt10xx and rp2040 platforms support up to
+//|         12 notes.
+//|
+//|         Notes use MIDI note numbering, with 60 being C4 or Middle C, approximately 262Hz.
+//|
+//|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
+//|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit). It is permitted to modify this buffer during synthesis. This can be used, for instance, to control the overall volume or timbre of the notes.
+//|         """
 STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_sample_rate, ARG_waveform };
     static const mp_arg_t allowed_args[] = {
@@ -69,7 +80,11 @@ STATIC void check_for_deinit(synthio_synthesizer_obj_t *self) {
 }
 
 //|     def press(self, /, press: Sequence[int] = ()) -> None:
-//|         """Turn some notes on. Notes use MIDI numbering, with 60 being middle C."""
+//|         """Turn some notes on. Notes use MIDI numbering, with 60 being middle C, approximately 262Hz.
+//|
+//|         Pressing a note that was already pressed has no effect.
+//|
+//|         :param Sequence[int] press: Any sequence of integer notes."""
 STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) {
     synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -81,7 +96,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesi
 //|     def release_then_press(
 //|         self, release: Sequence[int] = (), press: Sequence[int] = ()
 //|     ) -> None:
-//|         """Turn some notes on and/or off. Notes use MIDI numbering, with 60 being middle C."""
+//|         """Turn some notes on and/or off. Notes use MIDI numbering, with 60 being middle C.
+//|
+//|         It is OK to release note that was not actually turned on.
+//|
+//|         Pressing a note that was already pressed has no effect.
+//|
+//|         Releasing and pressing the note again has little effect, but does reset the phase
+//|         of the note, which may be perceptible as a small glitch.
+//|
+//|         :param Sequence[int] release: Any sequence of integer notes.
+//|         :param Sequence[int] press: Any sequence of integer notes."""
 STATIC mp_obj_t synthio_synthesizer_release_then_press(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_release, ARG_press };
     static const mp_arg_t allowed_args[] = {
@@ -102,7 +127,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_release_then_press_obj, 1,
 
 //
 //|     def release_all_then_press(self, /, press: Sequence[int]) -> None:
-//|         """Turn any currently-playing notes off, then turn on the given notes"""
+//|         """Turn any currently-playing notes off, then turn on the given notes
+//|
+//|         Releasing and pressing the note again has little effect, but does reset the phase
+//|         of the note, which may be perceptible as a small glitch.
+//|
+//|         :param Sequence[int] press: Any sequence of integer notes."""
 STATIC mp_obj_t synthio_synthesizer_release_all_then_press(mp_obj_t self_in, mp_obj_t press) {
     synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -173,6 +203,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_pressed_obj, synthio_synthesiz
 MP_PROPERTY_GETTER(synthio_synthesizer_pressed_obj,
     (mp_obj_t)&synthio_synthesizer_get_pressed_obj);
 
+//|     max_polyphony: int
+//|     """Maximum polyphony of the synthesizer (read-only class property)"""
+//|
+
 STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_press), MP_ROM_PTR(&synthio_synthesizer_press_obj) },
@@ -185,6 +219,7 @@ STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = {
 
     // Properties
     { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&synthio_synthesizer_sample_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_max_polyphony), MP_ROM_INT(CIRCUITPY_SYNTHIO_MAX_CHANNELS) },
     { MP_ROM_QSTR(MP_QSTR_pressed), MP_ROM_PTR(&synthio_synthesizer_pressed_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(synthio_synthesizer_locals_dict, synthio_synthesizer_locals_dict_table);

From 79d093d957a34395f97676dd6115d12322a2bb66 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 5 Apr 2023 17:43:03 -0500
Subject: [PATCH 2214/2403] tweak max envelope calculation vs number of active
 notes

---
 shared-module/synthio/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index e41869a113..11e4c1dcc9 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -66,7 +66,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     const int16_t *waveform = synth->waveform;
     uint32_t waveform_length = synth->waveform_length;
     if (active_channels) {
-        int16_t loudness = 0x3fff / (1 + active_channels);
+        int16_t loudness = 0xffff / (1 + 2 * active_channels);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
             if (synth->span.note[chan] == SYNTHIO_SILENCE) {
                 synth->accum[chan] = 0;

From 5ab3b7d7f389bc009dcbf9f86a5b26b155a59bcf Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Thu, 6 Apr 2023 14:24:09 +0200
Subject: [PATCH 2215/2403] upgraded to version 1.1.0

---
 frozen/circuitpython-pcf85063a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frozen/circuitpython-pcf85063a b/frozen/circuitpython-pcf85063a
index 21baeb6479..85aa931a14 160000
--- a/frozen/circuitpython-pcf85063a
+++ b/frozen/circuitpython-pcf85063a
@@ -1 +1 @@
-Subproject commit 21baeb6479434b950e9356a320a5a4d050a4bf47
+Subproject commit 85aa931a14f46558233ef9bf1122ea68e2192958

From 046397aaff26025df0c34137c1ccd0217340fcf2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Apr 2023 08:54:49 -0500
Subject: [PATCH 2216/2403] sort block of settings

---
 ports/atmel-samd/mpconfigport.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index d4d1ff31a3..ed734ce679 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -100,11 +100,11 @@ endif
 
 
 CIRCUITPY_ALARM ?= 1
-CIRCUITPY_PS2IO ?= 1
-CIRCUITPY_SAMD ?= 1
 CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
+CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
+CIRCUITPY_SAMD ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
 endif # samd51

From 081e9b995e89262e9760997eeb78e90b754e1a84 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Apr 2023 08:55:00 -0500
Subject: [PATCH 2217/2403] samd51 can also handle 12 voices @ 24kHz!

---
 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 ed734ce679..032e49ce36 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -105,6 +105,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
 CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
 CIRCUITPY_SAMD ?= 1
+CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
 CIRCUITPY_WATCHDOG ?= 1
 
 endif # samd51

From 8c8ca3b8100b3687c345549ab177528330e2b983 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 6 Apr 2023 10:21:27 -0500
Subject: [PATCH 2218/2403] endorse new test outputs

---
 tests/circuitpython/miditrack.py.exp   | 4 ++--
 tests/circuitpython/synthesizer.py.exp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
index be5eef1d0b..bfb082bfe7 100644
--- a/tests/circuitpython/miditrack.py.exp
+++ b/tests/circuitpython/miditrack.py.exp
@@ -1,4 +1,4 @@
 (0, 1, 512, 1)
-(1, b'\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\xff\x0f\xff\x0f')
+(1, b'V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*')
 (0, 1, 512, 1)
-(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x01\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\xff\x0f\x00\x00\x00\x00')
+(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00')
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
index 4296662d60..79c88b3248 100644
--- a/tests/circuitpython/synthesizer.py.exp
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -1,8 +1,8 @@
 ()
 (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 (80,)
-(-4095, -4095, -4095, -4095, 4095, 4095, 4095, 4095, 4095, -4095, -4095, -4095)
+(-10922, -10922, -10922, -10922, 10922, 10922, 10922, 10922, 10922, -10922, -10922, -10922)
 (80, 91)
-(0, 0, 5460, 5460, 0, -5460, -5460, 0, 5460, 5460, 0, 0)
+(0, 0, 13106, 13106, 0, -13106, -13106, 0, 13106, 13106, 0, 0)
 (91,)
-(-4095, 4095, 4095, 4095, -4095, -4095, 4095, 4095, 4095, -4095, -4095, 4095)
+(-10922, 10922, 10922, 10922, -10922, -10922, 10922, 10922, 10922, -10922, -10922, 10922)

From ebf3d20b28c28a48d1572b9c04106e6b6c8c598d Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Wed, 5 Apr 2023 19:44:31 +0000
Subject: [PATCH 2219/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/es.po b/locale/es.po
index 0123657e35..3ebfdc7833 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: 2023-03-31 14:39+0000\n"
+"PO-Revision-Date: 2023-04-07 00:49+0000\n"
 "Last-Translator: Jose David M \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -210,7 +210,7 @@ msgstr "%q debe ser un arreglo de tipo 'H'"
 
 #: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
 msgid "%q must be array of type 'h'"
-msgstr ""
+msgstr "%q debe ser una matriz de tipo 'h'"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c

From 8c64d42cefbdfd8b0699a4834116487f3fbef5e6 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Thu, 6 Apr 2023 00:21:26 +0000
Subject: [PATCH 2220/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1000 of 1000 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 58b7424deb..d130fcc464 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: 2023-03-31 14:39+0000\n"
+"PO-Revision-Date: 2023-04-07 00:49+0000\n"
 "Last-Translator: Wellington Terumi Uemura \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -208,7 +208,7 @@ msgstr "%q deve ser uma matriz do tipo 'H'"
 
 #: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
 msgid "%q must be array of type 'h'"
-msgstr ""
+msgstr "%q deve ser uma matriz do tipo 'h'"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c

From b16b9102f66293c48bb8b6692549a5f19929f0c3 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Wed, 5 Apr 2023 19:38:42 +0000
Subject: [PATCH 2221/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (1000 of 1000 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 dc806e269e..8cb79da28e 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: 2023-03-31 14:39+0000\n"
+"PO-Revision-Date: 2023-04-07 00:49+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \n"
 "Language: sv\n"
@@ -209,7 +209,7 @@ msgstr "%q måste vara en array av typen 'H'"
 
 #: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
 msgid "%q must be array of type 'h'"
-msgstr ""
+msgstr "%q måste vara en matris av typen 'h'"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c

From af35337136177d26ddd6c3f7120fdb73b8fc4b19 Mon Sep 17 00:00:00 2001
From: John Sanders 
Date: Wed, 5 Apr 2023 06:00:02 -0700
Subject: [PATCH 2222/2403] Add Waveshare RP2040-LCD-0.96

---
 .../boards/waveshare_rp2040_lcd_0_96/board.c  | 129 ++++++++++++++++++
 .../waveshare_rp2040_lcd_0_96/mpconfigboard.h |  11 ++
 .../mpconfigboard.mk                          |  11 ++
 .../pico-sdk-configboard.h                    |   1 +
 .../boards/waveshare_rp2040_lcd_0_96/pins.c   |  57 ++++++++
 5 files changed, 209 insertions(+)
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c

diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
new file mode 100644
index 0000000000..afe3f87787
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
@@ -0,0 +1,129 @@
+/*
+ * 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 "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+
+#define DELAY 0x80
+
+
+// display init sequence according to Adafruit_CircuitPython_ST7735R
+// https://github.com/adafruit/Adafruit_CircuitPython_ST7735R
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 0x96,
+    // SLPOUT and Delay
+    0x11, 0 | DELAY, 0xFF,
+    0xB1, 0x03, 0x01, 0x2C, 0x2D,      // _FRMCTR1
+    0xB3, 0x06, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,     // _FRMCTR3
+    0xB4, 0x01, 0x07, // _INVCTR line inversion
+    0xC0, 0x03, 0xA2, 0x02, 0x84, // _PWCTR1 GVDD = 4.7V, 1.0uA
+    0xC1, 0x01, 0xC5, // _PWCTR2 VGH=14.7V, VGL=-7.35V
+    0xC2, 0x02, 0x0A, 0x00, // _PWCTR3 Opamp current small, Boost frequency
+    0xC3, 0x02, 0x8A, 0x2A,
+    0xC4, 0x02, 0x8A, 0xEE,
+    0xC5, 0x01, 0x0E, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
+    0x20, 0x00, // _INVOFF
+    0x36, 0x01, 0x18, // _MADCTL bottom to top refresh
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
+    // fix on VTL
+    0x3A, 0x01, 0x05, // COLMOD - 16bit color
+    0xE0, 0x10, 0x02, 0x1C, 0x07, 0x12, 0x37, 0x32, 0x29, 0x2D, 0x29, 0x25, 0x2B, 0x39, 0x00, 0x01, 0x03, 0x10, // _GMCTRP1 Gamma
+    0xE1, 0x10, 0x03, 0x1D, 0x07, 0x06, 0x2E, 0x2C, 0x29, 0x2D, 0x2E, 0x2E, 0x37, 0x3F, 0x00, 0x00, 0x02, 0x10, // _GMCTRN1
+    0x13, 0 | DELAY, 0x0A, // _NORON
+    0x29, 0 | DELAY, 0x64, // _DISPON
+    // 0x36, 0x01, 0xC0,  // _MADCTL Default rotation plus BGR encoding
+    0x36, 0x01, 0xC8,      // _MADCTL Default rotation plus RGB encoding
+    0x21, 0x00,      // _INVON
+};
+
+static void display_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO10,    // CLK
+        &pin_GPIO11,    // MOSI
+        NULL,           // MISO not connected
+        false           // Not half-duplex
+        );
+
+    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_GPIO8,     // DC
+        &pin_GPIO9,     // CS
+        &pin_GPIO12,    // RST
+        40000000,       // 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,
+        160,            // width (after rotation)
+        80,             // height (after rotation)
+        26,             // column start
+        1,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO25,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+}
+
+void board_init(void) {
+    // Display
+    display_init();
+}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.h b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.h
new file mode 100644
index 0000000000..1602656f90
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.h
@@ -0,0 +1,11 @@
+#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-LCD-0.96"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO20}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO19, .miso = &pin_GPIO16}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO0, .rx = &pin_GPIO1}}
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.mk b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.mk
new file mode 100644
index 0000000000..f441957314
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x2E8A
+USB_PID = 0x1021
+USB_PRODUCT = "Waveshare RP2040-LCD-0.96"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pico-sdk-configboard.h b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c
new file mode 100644
index 0000000000..32fa4c4073
--- /dev/null
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c
@@ -0,0 +1,57 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+
+    // ADC
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    // 0.96 inch LCD ST7735s
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_DIN), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_BL), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
+
+    // Power pins
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 42ab93fa4cc083e0647d05674be1b7efd7985021 Mon Sep 17 00:00:00 2001
From: Bill Sideris 
Date: Fri, 7 Apr 2023 18:34:10 +0300
Subject: [PATCH 2223/2403] YD_ESP32_S3

---
 .../boards/yd_esp32_s3_n16r8/board.c          | 39 ++++++++++++
 .../boards/yd_esp32_s3_n16r8/mpconfigboard.h  | 33 ++++++++++
 .../boards/yd_esp32_s3_n16r8/mpconfigboard.mk | 13 ++++
 .../espressif/boards/yd_esp32_s3_n16r8/pins.c | 60 +++++++++++++++++++
 .../boards/yd_esp32_s3_n16r8/sdkconfig        | 16 +++++
 .../espressif/boards/yd_esp32_s3_n8r8/board.c | 39 ++++++++++++
 .../boards/yd_esp32_s3_n8r8/mpconfigboard.h   | 33 ++++++++++
 .../boards/yd_esp32_s3_n8r8/mpconfigboard.mk  | 13 ++++
 .../espressif/boards/yd_esp32_s3_n8r8/pins.c  | 60 +++++++++++++++++++
 .../boards/yd_esp32_s3_n8r8/sdkconfig         | 16 +++++
 tools/ci_check_duplicate_usb_vid_pid.py       |  1 +
 11 files changed, 323 insertions(+)
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n16r8/board.c
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.h
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n16r8/pins.c
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n16r8/sdkconfig
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n8r8/board.c
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.h
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n8r8/pins.c
 create mode 100644 ports/espressif/boards/yd_esp32_s3_n8r8/sdkconfig

diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/board.c b/ports/espressif/boards/yd_esp32_s3_n16r8/board.c
new file mode 100644
index 0000000000..e218345f59
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n16r8/board.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Bill Sideris, independently providing these changes.
+ *
+ * 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 "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.h b/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.h
new file mode 100644
index 0000000000..4a0ea02809
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Bill Sideris, independently providing these changes.
+ *
+ * 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND YD-ESP32-S3 (N16R8)"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.mk b/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.mk
new file mode 100644
index 0000000000..2120ba97cb
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n16r8/mpconfigboard.mk
@@ -0,0 +1,13 @@
+USB_VID = 0x303A
+USB_PID = 0x8166
+USB_PRODUCT = "YD-ESP32-S3"
+USB_MANUFACTURER = "VCC-GND"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c b/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c
new file mode 100644
index 0000000000..46a579fc20
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c
@@ -0,0 +1,60 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // Left header, module facing up.
+    { MP_ROM_QSTR(MP_QSTR_GPIO4),   MP_ROM_PTR(&pin_GPIO4)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO5),   MP_ROM_PTR(&pin_GPIO5)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO6),   MP_ROM_PTR(&pin_GPIO6)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO7),   MP_ROM_PTR(&pin_GPIO7)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO15),   MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO16),   MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO17),   MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO18),   MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO8),   MP_ROM_PTR(&pin_GPIO8)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO3),   MP_ROM_PTR(&pin_GPIO3)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO46),   MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO9),   MP_ROM_PTR(&pin_GPIO9)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO10),   MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO11),   MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO12),   MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO13),   MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO14),   MP_ROM_PTR(&pin_GPIO14) },
+
+
+    // Right header, module facing up.
+    { MP_ROM_QSTR(MP_QSTR_GPIO43),   MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO44),   MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO1),   MP_ROM_PTR(&pin_GPIO1)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO2),   MP_ROM_PTR(&pin_GPIO2)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO14),   MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO42),   MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO41),   MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO40),   MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO39),   MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO38),   MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO37),   MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO36),   MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO35),   MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO0),   MP_ROM_PTR(&pin_GPIO0)  },
+    { MP_ROM_QSTR(MP_QSTR_BOOT),   MP_ROM_PTR(&pin_GPIO0)  },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO45),   MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO48),   MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+    // For the neopixel to work, please bridge the "RGB" pad
+    // or use external neopixels.
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO47),   MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO21),   MP_ROM_PTR(&pin_GPIO21) }
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/sdkconfig b/ports/espressif/boards/yd_esp32_s3_n16r8/sdkconfig
new file mode 100644
index 0000000000..5aff7f49b1
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n16r8/sdkconfig
@@ -0,0 +1,16 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_MEMTEST=y
+
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/board.c b/ports/espressif/boards/yd_esp32_s3_n8r8/board.c
new file mode 100644
index 0000000000..e218345f59
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n8r8/board.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Bill Sideris, independently providing these changes.
+ *
+ * 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 "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.h b/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.h
new file mode 100644
index 0000000000..349931740d
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Bill Sideris, independently providing these changes.
+ *
+ * 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.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND YD-ESP32-S3 (N8R8)"
+#define MICROPY_HW_MCU_NAME         "ESP32S3"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.mk b/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.mk
new file mode 100644
index 0000000000..766e71dc2d
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n8r8/mpconfigboard.mk
@@ -0,0 +1,13 @@
+USB_VID = 0x303A
+USB_PID = 0x8166
+USB_PRODUCT = "YD-ESP32-S3"
+USB_MANUFACTURER = "VCC-GND"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c b/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c
new file mode 100644
index 0000000000..46a579fc20
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c
@@ -0,0 +1,60 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // Left header, module facing up.
+    { MP_ROM_QSTR(MP_QSTR_GPIO4),   MP_ROM_PTR(&pin_GPIO4)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO5),   MP_ROM_PTR(&pin_GPIO5)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO6),   MP_ROM_PTR(&pin_GPIO6)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO7),   MP_ROM_PTR(&pin_GPIO7)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO15),   MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO16),   MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO17),   MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO18),   MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO8),   MP_ROM_PTR(&pin_GPIO8)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO3),   MP_ROM_PTR(&pin_GPIO3)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO46),   MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO9),   MP_ROM_PTR(&pin_GPIO9)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO10),   MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO11),   MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO12),   MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO13),   MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO14),   MP_ROM_PTR(&pin_GPIO14) },
+
+
+    // Right header, module facing up.
+    { MP_ROM_QSTR(MP_QSTR_GPIO43),   MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO44),   MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO1),   MP_ROM_PTR(&pin_GPIO1)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO2),   MP_ROM_PTR(&pin_GPIO2)  },
+    { MP_ROM_QSTR(MP_QSTR_GPIO14),   MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO42),   MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO41),   MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO40),   MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO39),   MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO38),   MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO37),   MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO36),   MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO35),   MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO0),   MP_ROM_PTR(&pin_GPIO0)  },
+    { MP_ROM_QSTR(MP_QSTR_BOOT),   MP_ROM_PTR(&pin_GPIO0)  },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO45),   MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO48),   MP_ROM_PTR(&pin_GPIO48) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
+    // For the neopixel to work, please bridge the "RGB" pad
+    // or use external neopixels.
+
+    { MP_ROM_QSTR(MP_QSTR_GPIO47),   MP_ROM_PTR(&pin_GPIO47) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO21),   MP_ROM_PTR(&pin_GPIO21) }
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/sdkconfig b/ports/espressif/boards/yd_esp32_s3_n8r8/sdkconfig
new file mode 100644
index 0000000000..5aff7f49b1
--- /dev/null
+++ b/ports/espressif/boards/yd_esp32_s3_n8r8/sdkconfig
@@ -0,0 +1,16 @@
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_MEMTEST=y
+
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 4d9a0b162e..f20630e886 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -62,6 +62,7 @@ DEFAULT_CLUSTERLIST = {
         "espressif_esp32s2_devkitc_1_n8r2",
     ],
     "0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],
+    "0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],
 }
 
 cli_parser = argparse.ArgumentParser(

From 097af804cd52152d23af71fab621ec8f27bc6889 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 7 Apr 2023 09:49:51 -0700
Subject: [PATCH 2224/2403] Fix ticks

In #7497 port_background_task was renamed to port_background_tick
but the actual call site wasn't changed. This meant that it was
no longer called!

Rename more functions from task to tick to make it clearer which is
which.
---
 ports/atmel-samd/background.c    |  8 ++++----
 ports/broadcom/background.c      |  4 ++--
 ports/cxd56/background.c         |  4 ++--
 ports/espressif/background.c     |  4 ++--
 ports/litex/background.c         |  4 ++--
 ports/mimxrt10xx/background.c    |  4 ++--
 ports/nrf/background.c           |  4 ++--
 ports/raspberrypi/background.c   |  4 ++--
 ports/stm/background.c           |  4 ++--
 py/circuitpy_mpconfig.h          |  4 ++--
 supervisor/background_callback.h | 11 +++++++++--
 supervisor/port.h                | 11 ++++++-----
 supervisor/shared/tick.c         | 17 ++++++-----------
 supervisor/shared/tick.h         |  9 +--------
 14 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/ports/atmel-samd/background.c b/ports/atmel-samd/background.c
index 6e1dc71d85..2f8357d07b 100644
--- a/ports/atmel-samd/background.c
+++ b/ports/atmel-samd/background.c
@@ -42,18 +42,18 @@
 // PB03 is physical pin "SCL" on the Metro M4 express
 // so you can't use this code AND an i2c peripheral
 // at the same time unless you change this
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
     REG_PORT_DIRSET1 = (1 << 3);
     REG_PORT_OUTSET1 = (1 << 3);
 }
 
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
     REG_PORT_OUTCLR1 = (1 << 3);
 }
 #else
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
 #endif
 
diff --git a/ports/broadcom/background.c b/ports/broadcom/background.c
index 5d92f1b8bf..9074a80400 100644
--- a/ports/broadcom/background.c
+++ b/ports/broadcom/background.c
@@ -28,9 +28,9 @@
 #include "py/runtime.h"
 #include "supervisor/port.h"
 
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
 
 void port_background_tick(void) {
diff --git a/ports/cxd56/background.c b/ports/cxd56/background.c
index da172cf5d7..8425f8cfa2 100644
--- a/ports/cxd56/background.c
+++ b/ports/cxd56/background.c
@@ -34,7 +34,7 @@ void port_background_tick(void) {
 }
 void port_background_task(void) {
 }
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
diff --git a/ports/espressif/background.c b/ports/espressif/background.c
index 3fac768f3f..f9069e98a4 100644
--- a/ports/espressif/background.c
+++ b/ports/espressif/background.c
@@ -51,8 +51,8 @@ void port_background_tick(void) {
 void port_background_task(void) {
 }
 
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
 
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
diff --git a/ports/litex/background.c b/ports/litex/background.c
index 1329d5fd83..e641daf53b 100644
--- a/ports/litex/background.c
+++ b/ports/litex/background.c
@@ -34,7 +34,7 @@ void port_background_task(void) {
 }
 void port_background_tick(void) {
 }
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
diff --git a/ports/mimxrt10xx/background.c b/ports/mimxrt10xx/background.c
index faa2bda3f8..04de4c1c1c 100644
--- a/ports/mimxrt10xx/background.c
+++ b/ports/mimxrt10xx/background.c
@@ -37,8 +37,8 @@ void PLACE_IN_ITCM(port_background_task)(void) {
 void port_background_tick(void) {
 }
 
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
 
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
diff --git a/ports/nrf/background.c b/ports/nrf/background.c
index b8d4df6324..f2df4db0e0 100644
--- a/ports/nrf/background.c
+++ b/ports/nrf/background.c
@@ -44,10 +44,10 @@
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
 
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
 
 void port_background_tick(void) {
diff --git a/ports/raspberrypi/background.c b/ports/raspberrypi/background.c
index 8e5e3fcd91..1024ff7b38 100644
--- a/ports/raspberrypi/background.c
+++ b/ports/raspberrypi/background.c
@@ -28,10 +28,10 @@
 #include "py/runtime.h"
 #include "supervisor/port.h"
 
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
 
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
 
 void port_background_tick(void) {
diff --git a/ports/stm/background.c b/ports/stm/background.c
index 68703a5233..7dc617f49f 100644
--- a/ports/stm/background.c
+++ b/ports/stm/background.c
@@ -37,7 +37,7 @@ void port_background_task(void) {
 }
 void port_background_tick(void) {
 }
-void port_start_background_task(void) {
+void port_start_background_tick(void) {
 }
-void port_finish_background_task(void) {
+void port_finish_background_tick(void) {
 }
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 5f140413bb..cc7886cb37 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -439,8 +439,8 @@ struct _supervisor_allocation_node;
     const char *readline_hist[8]; \
     struct _supervisor_allocation_node *first_embedded_allocation; \
 
-void supervisor_run_background_tasks_if_tick(void);
-#define RUN_BACKGROUND_TASKS (supervisor_run_background_tasks_if_tick())
+void background_callback_run_all(void);
+#define RUN_BACKGROUND_TASKS (background_callback_run_all())
 
 #define MICROPY_VM_HOOK_LOOP RUN_BACKGROUND_TASKS;
 #define MICROPY_VM_HOOK_RETURN RUN_BACKGROUND_TASKS;
diff --git a/supervisor/background_callback.h b/supervisor/background_callback.h
index 651ac020a6..36b0017f0c 100644
--- a/supervisor/background_callback.h
+++ b/supervisor/background_callback.h
@@ -37,8 +37,9 @@
  * To schedule the work, use background_callback_add, with fun as the
  * function to call and data pointing to the object itself.
  *
- * Next time run_background_tasks_if_tick is called, the callback will
- * be run and removed from the linked list.
+ * Next time background_callback_run_all() is called, the callback will
+ * be run and removed from the linked list. Use `RUN_BACKGROUND_TASKS;` instead
+ * of calling background_callback_run_all() directly.
  *
  * Queueing a task that is already queued does nothing.  Unconditionally
  * re-queueing it from its own background task will cause it to run during the
@@ -46,6 +47,12 @@
  * don't do that.
  *
  * background_callback_add can be called from interrupt context.
+ *
+ * If your work isn't triggered by an event, then it may be better implemented
+ * using ticks, which runs tasks every millisecond or so. Ticks are enabled with
+ * supervisor_enable_tick() and disabled with supervisor_disable_tick(). When
+ * enabled, a timer will schedule a callback to supervisor_background_tick(),
+ * which includes port_background_tick(), every millisecond.
  */
 typedef void (*background_callback_fun)(void *data);
 typedef struct background_callback {
diff --git a/supervisor/port.h b/supervisor/port.h
index b50179e4de..7b48a3f13b 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -94,14 +94,15 @@ void port_idle_until_interrupt(void);
 void port_background_tick(void);
 
 // Execute port specific actions during background tasks. This is before the
-// background callback system.
+// background callback system and happens *very* often. Use
+// port_background_tick() when possible.
 void port_background_task(void);
 
-// Take port specific actions at the beginning and end of background tasks.
+// Take port specific actions at the beginning and end of background ticks.
 // This is used e.g., to set a monitoring pin for debug purposes.  "Actual
-// work" should be done in port_background_task() instead.
-void port_start_background_task(void);
-void port_finish_background_task(void);
+// work" should be done in port_background_tick() instead.
+void port_start_background_tick(void);
+void port_finish_background_tick(void);
 
 // Some ports need special handling to wake the main task from another task. The
 // port must implement the necessary code in this function.  A default weak
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index 429ca35d60..b91257c8c8 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -65,8 +65,8 @@ static volatile uint64_t last_finished_tick = 0;
 
 static volatile size_t tick_enable_count = 0;
 
-static void supervisor_background_tasks(void *unused) {
-    port_start_background_task();
+static void supervisor_background_tick(void *unused) {
+    port_start_background_tick();
 
     assert_heap_ok();
 
@@ -80,16 +80,16 @@ static void supervisor_background_tasks(void *unused) {
 
     filesystem_background();
 
-    port_background_task();
+    port_background_tick();
 
     assert_heap_ok();
 
     last_finished_tick = port_get_raw_ticks(NULL);
 
-    port_finish_background_task();
+    port_finish_background_tick();
 }
 
-bool supervisor_background_tasks_ok(void) {
+bool supervisor_background_ticks_ok(void) {
     return port_get_raw_ticks(NULL) - last_finished_tick < 1024;
 }
 
@@ -103,7 +103,7 @@ void supervisor_tick(void) {
     keypad_tick();
     #endif
 
-    background_callback_add(&tick_callback, supervisor_background_tasks, NULL);
+    background_callback_add(&tick_callback, supervisor_background_tick, NULL);
 }
 
 uint64_t supervisor_ticks_ms64() {
@@ -117,11 +117,6 @@ uint32_t supervisor_ticks_ms32() {
     return supervisor_ticks_ms64();
 }
 
-
-void PLACE_IN_ITCM(supervisor_run_background_tasks_if_tick)() {
-    background_callback_run_all();
-}
-
 void mp_hal_delay_ms(mp_uint_t delay_ms) {
     uint64_t start_tick = port_get_raw_ticks(NULL);
     // Adjust the delay to ticks vs ms.
diff --git a/supervisor/shared/tick.h b/supervisor/shared/tick.h
index d805aeb099..5f537ad2ed 100644
--- a/supervisor/shared/tick.h
+++ b/supervisor/shared/tick.h
@@ -54,13 +54,6 @@ extern uint32_t supervisor_ticks_ms32(void);
  */
 extern uint64_t supervisor_ticks_ms64(void);
 
-/** @brief Run background ticks, but only about every millisecond.
- *
- * Normally, this is not called directly.  Instead use the RUN_BACKGROUND_TASKS
- * macro.
- */
-extern void supervisor_run_background_if_tick(void);
-
 extern void supervisor_enable_tick(void);
 extern void supervisor_disable_tick(void);
 
@@ -70,6 +63,6 @@ extern void supervisor_disable_tick(void);
  * Note that when ticks are not enabled, this function can return false; this is
  * intended.
  */
-extern bool supervisor_background_tasks_ok(void);
+extern bool supervisor_background_ticks_ok(void);
 
 #endif

From e38b5491f452df2ff5e09209ea0859f3444d4158 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Fri, 7 Apr 2023 11:45:13 -0700
Subject: [PATCH 2225/2403] Add device name env variable for web workflow

---
 docs/environment.rst                          |  4 ++++
 docs/workflows.md                             |  4 +++-
 supervisor/shared/web_workflow/web_workflow.c | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/environment.rst b/docs/environment.rst
index 58ada402c6..f569d5e6a4 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -74,6 +74,10 @@ CIRCUITPY_WEB_API_PORT
 ~~~~~~~~~~~~~~~~~~~~~~
 TCP port number used for the web HTTP API. Defaults to 80 when omitted.
 
+CIRCUITPY_WEB_INSTANCE_NAME
+~~~~~~~~~~~~~~~~~~~
+Name the board advertises as for the WEB workflow. Defaults to human readable board name if omitted.
+
 CIRCUITPY_WIFI_PASSWORD
 ~~~~~~~~~~~~~~~~~~~~~~~
 Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID.
diff --git a/docs/workflows.md b/docs/workflows.md
index 29229bd00e..453b425491 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -72,7 +72,8 @@ Read-only characteristic that returns the UTF-8 encoded version string.
 The web workflow is depends on adding Wi-Fi credentials into the `settings.toml` file. The keys are
 `CIRCUITPY_WIFI_SSID` and `CIRCUITPY_WIFI_PASSWORD`. Once these are defined, CircuitPython will
 automatically connect to the network and start the webserver used for the workflow. The webserver
-is on port 80 unless overridden by `CIRCUITPY_WEB_API_PORT`. It also enables MDNS.
+is on port 80 unless overridden by `CIRCUITPY_WEB_API_PORT`. It also enables MDNS. The name
+of the board as advertised to the network can be overridden by `CIRCUITPY_WEB_INSTANCE_NAME`.
 
 Here is an example `/settings.toml`:
 
@@ -86,6 +87,7 @@ CIRCUITPY_WIFI_PASSWORD="secretpassword"
 CIRCUITPY_WEB_API_PASSWORD="passw0rd"
 
 CIRCUITPY_WEB_API_PORT=80
+CIRCUITPY_WEB_INSTANCE_NAME=""
 ```
 
 MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a device specific
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 468787269a..b640578e20 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -269,6 +269,7 @@ void supervisor_start_web_workflow(void) {
 
     char ssid[33];
     char password[64];
+    char web_instance_name[50];
 
     os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != GETENV_OK) {
@@ -283,6 +284,11 @@ void supervisor_start_web_workflow(void) {
         return;
     }
 
+    result = common_hal_os_getenv_str("CIRCUITPY_WEB_INSTANCE_NAME", web_instance_name, sizeof(web_instance_name));
+    if (result != GETENV_OK || web_instance_name[0] == '\0') {
+        strcpy(web_instance_name, MICROPY_HW_BOARD_NAME);
+    }
+
     if (!common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) {
         common_hal_wifi_init(false);
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, true);
@@ -329,7 +335,8 @@ void supervisor_start_web_workflow(void) {
         mdns_server_construct(&mdns, true);
         mdns.base.type = &mdns_server_type;
         if (!common_hal_mdns_server_deinited(&mdns)) {
-            common_hal_mdns_server_set_instance_name(&mdns, MICROPY_HW_BOARD_NAME);
+            char *instance_name = strndup(web_instance_name, strlen(web_instance_name));
+            common_hal_mdns_server_set_instance_name(&mdns, instance_name);
         }
     }
     if (!common_hal_mdns_server_deinited(&mdns)) {
@@ -796,9 +803,11 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
     mp_print_t _socket_print = {socket, _print_chunk};
 
     const char *hostname = "";
+    const char *instance_name = "";
     #if CIRCUITPY_MDNS
     if (!common_hal_mdns_server_deinited(&mdns)) {
         hostname = common_hal_mdns_server_get_hostname(&mdns);
+        instance_name = common_hal_mdns_server_get_instance_name(&mdns);
     }
     #endif
     _update_encoded_ip();
@@ -807,13 +816,13 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
         "{\"web_api_version\": 2, "
         "\"version\": \"" MICROPY_GIT_TAG "\", "
         "\"build_date\": \"" MICROPY_BUILD_DATE "\", "
-        "\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "
+        "\"board_name\": \"%s\", "
         "\"mcu_name\": \"" MICROPY_HW_MCU_NAME "\", "
         "\"board_id\": \"" CIRCUITPY_BOARD_ID "\", "
         "\"creator_id\": %u, "
         "\"creation_id\": %u, "
         "\"hostname\": \"%s\", "
-        "\"port\": %d, ", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
+        "\"port\": %d, ", instance_name, CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
     #if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
     uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
     common_hal_mcu_processor_get_uid(raw_id);

From bc30475d093e758b73ea99b30949344ecb541521 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 7 Apr 2023 12:02:54 -0700
Subject: [PATCH 2226/2403] Fix frequencyio

---
 ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
index 6d1a3f7c0e..df26379170 100644
--- a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
+++ b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
@@ -156,7 +156,7 @@ void frequencyin_interrupt_handler(uint8_t index) {
             }
 
             // Check if we've reached the upper limit of detection
-            if (!supervisor_background_tasks_ok() || self->errored_too_fast) {
+            if (!supervisor_background_ticks_ok() || self->errored_too_fast) {
                 self->errored_too_fast = true;
                 frequencyin_emergency_cancel_capture(i);
             }

From 37116e6583cd60cfe66500abb273ec2552b5dc34 Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Fri, 7 Apr 2023 12:09:51 -0700
Subject: [PATCH 2227/2403] Fix documentation format error

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

diff --git a/docs/environment.rst b/docs/environment.rst
index f569d5e6a4..f8144407ef 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -75,7 +75,7 @@ CIRCUITPY_WEB_API_PORT
 TCP port number used for the web HTTP API. Defaults to 80 when omitted.
 
 CIRCUITPY_WEB_INSTANCE_NAME
-~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Name the board advertises as for the WEB workflow. Defaults to human readable board name if omitted.
 
 CIRCUITPY_WIFI_PASSWORD

From c37af65ee16c130a6867e91864e66a6b530c0919 Mon Sep 17 00:00:00 2001
From: George White 
Date: Sat, 8 Apr 2023 16:29:50 -0400
Subject: [PATCH 2228/2403] Update pins to include UART1 RTS and CTS

Previous pins definition stated that the UART1 RTS and CTS were not connected. They are connected and can currently be used via A1 and PWM0 respectively. To make things a little clearer, enabling the RTS1/CTS1.
---
 ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c
index 5a35a60e82..e39272b41e 100644
--- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c
+++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c
@@ -77,8 +77,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // MicroMod UART1 pins
     { MP_ROM_QSTR(MP_QSTR_UART_TX1), MP_ROM_PTR(&pin_PB31) },     // MicroMod UART_TX1 | CircuitPython TX (PB31)
     { MP_ROM_QSTR(MP_QSTR_UART_RX1), MP_ROM_PTR(&pin_PB30) },     // MicroMod UART_RX1 | CircuitPython RX (PB30)
-    // { MP_ROM_QSTR(MP_QSTR_UART_RTS1), MP_ROM_PTR() },          // MicroMod RTS1 (not connected)
-    // { MP_ROM_QSTR(MP_QSTR_UART_CTS1), MP_ROM_PTR() },          // MicroMod CTS1 (not connected)
+    { MP_ROM_QSTR(MP_QSTR_UART_RTS1), MP_ROM_PTR(&pin_PB00) },          // MicroMod RTS1
+    { MP_ROM_QSTR(MP_QSTR_UART_CTS1), MP_ROM_PTR(&pin_PB01) },          // MicroMod CTS1
 
     // CircuitPython default UART pins
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB31) },           // CircuitPython TX | MicroMod UART_TX1 (PB31)

From 60502679d928abebd23a9f8d31af73f4c4108817 Mon Sep 17 00:00:00 2001
From: hexthat 
Date: Sat, 8 Apr 2023 17:17:42 +0000
Subject: [PATCH 2229/2403] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (1000 of 1000 strings)

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

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 37d8016fc7..dffbea185d 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: 2023-03-01 17:39+0000\n"
+"PO-Revision-Date: 2023-04-09 17:51+0000\n"
 "Last-Translator: hexthat \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.16\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -211,7 +211,7 @@ msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
 
 #: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
 msgid "%q must be array of type 'h'"
-msgstr ""
+msgstr "%q bìxū shì lèixíng wéi 'h' de shùzǔ"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
@@ -830,11 +830,11 @@ msgstr "Liánjiē yǐ duàn kāi, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xī
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "zuòbiāo shùzǔ jùyǒu bùtóng de chángdù"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "zuòbiāo shùzǔ lèixíng jùyǒu bùtóng de dàxiǎo"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
@@ -1284,7 +1284,7 @@ msgstr "Wúxiào de BSSID"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "wú xiào CIRCUITPY_PYSTACK_SIZE\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
@@ -1310,7 +1310,7 @@ msgstr "wú xiào data_pins[%d]"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "géshì wúxiào"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
@@ -1985,7 +1985,7 @@ msgstr "bǐ lì chǐ cùn bì xū chú yǐ 3"
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Sǎomiáo yǐ zài jìnxíng zhōng. Shǐyòng stop_scan tíngzhǐ."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2302,7 +2302,7 @@ msgstr "wèi zhī de BLE cuò wù: %d"
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Wèizhī cuòwù dàimǎ %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format

From add8f06b758bca93f513d32df66c72fbde2cf7ee Mon Sep 17 00:00:00 2001
From: applecuckoo <113647417+applecuckoo@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:27:15 +1200
Subject: [PATCH 2230/2403] urandom is supported on nRF boards

---
 shared-bindings/os/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index b2fb8ff095..e9e5f0885f 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -241,7 +241,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
 //|     """Returns a string of *size* random bytes based on a hardware True Random
 //|     Number Generator. When not available, it will raise a NotImplementedError.
 //|
-//|     **Limitations:** Not yet available on nRF. Not available on SAMD21 due to lack of hardware.
+//|     **Limitations:** Not available on SAMD21 due to lack of hardware.
 //|     """
 //|     ...
 //|

From ef78dee4a5980ce8af6ff32724dce632ea14ada1 Mon Sep 17 00:00:00 2001
From: applecuckoo <113647417+applecuckoo@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:33:38 +1200
Subject: [PATCH 2231/2403] Fix up Contributor Covenant homepage link

There was a reference to a Markdown variable that has been deleted from this version, used the original Contributor Covenant as a reference.
---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index be1966ce1e..2c17dcfe16 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -123,7 +123,7 @@ accordingly.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org),
 version 1.4, available at
 ,
 and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).

From 532283d1a56953bd22cde26d56a017003d69c6ab Mon Sep 17 00:00:00 2001
From: Isaac Benitez 
Date: Mon, 10 Apr 2023 20:58:21 -0700
Subject: [PATCH 2232/2403] Replace malloc() with static varible

---
 supervisor/shared/web_workflow/web_workflow.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index b640578e20..d24547dd09 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -125,6 +125,7 @@ static socketpool_socket_obj_t active;
 static _request active_request;
 
 static char _api_password[64];
+static char web_instance_name[50];
 
 // Store the encoded IP so we don't duplicate work.
 static uint32_t _encoded_ip = 0;
@@ -269,7 +270,6 @@ void supervisor_start_web_workflow(void) {
 
     char ssid[33];
     char password[64];
-    char web_instance_name[50];
 
     os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != GETENV_OK) {
@@ -335,8 +335,7 @@ void supervisor_start_web_workflow(void) {
         mdns_server_construct(&mdns, true);
         mdns.base.type = &mdns_server_type;
         if (!common_hal_mdns_server_deinited(&mdns)) {
-            char *instance_name = strndup(web_instance_name, strlen(web_instance_name));
-            common_hal_mdns_server_set_instance_name(&mdns, instance_name);
+            common_hal_mdns_server_set_instance_name(&mdns, web_instance_name);
         }
     }
     if (!common_hal_mdns_server_deinited(&mdns)) {

From 88644613b5d161274fb4c6f77f282bd27ef05cd1 Mon Sep 17 00:00:00 2001
From: CDario 
Date: Tue, 11 Apr 2023 12:29:43 +0000
Subject: [PATCH 2233/2403] Add M5Stack Core2

---
 ports/espressif/boards/m5stack_core2/axp192.h | 286 ++++++++
 ports/espressif/boards/m5stack_core2/board.c  | 632 ++++++++++++++++++
 .../boards/m5stack_core2/mpconfigboard.h      |  44 ++
 .../boards/m5stack_core2/mpconfigboard.mk     |  18 +
 ports/espressif/boards/m5stack_core2/pins.c   |  93 +++
 .../espressif/boards/m5stack_core2/sdkconfig  |  34 +
 6 files changed, 1107 insertions(+)
 create mode 100755 ports/espressif/boards/m5stack_core2/axp192.h
 create mode 100644 ports/espressif/boards/m5stack_core2/board.c
 create mode 100755 ports/espressif/boards/m5stack_core2/mpconfigboard.h
 create mode 100644 ports/espressif/boards/m5stack_core2/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/m5stack_core2/pins.c
 create mode 100644 ports/espressif/boards/m5stack_core2/sdkconfig

diff --git a/ports/espressif/boards/m5stack_core2/axp192.h b/ports/espressif/boards/m5stack_core2/axp192.h
new file mode 100755
index 0000000000..45279ce56f
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/axp192.h
@@ -0,0 +1,286 @@
+/*
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Stephen Oliver
+ * Copyright (c) 2023 CDarius
+ *
+ * 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_AXP192_H
+#define MICROPY_AXP192_H
+
+#define AXP192_I2C_ADDRESS 0x34
+
+#define AXP192_INPUT_POWER_STATE 0x00
+#define AXP192_INPUT_POWER_STATE_ACIN_IS_PRESENT 0b10000000
+#define AXP192_INPUT_POWER_STATE_ACIN_AVAILABLE  0b01000000
+#define AXP192_INPUT_POWER_STATE_VBUS_IS_PRESENT 0b00100000
+#define AXP192_INPUT_POWER_STATE_VBUS_AVAILABLE  0b00010000
+#define AXP192_INPUT_POWER_STATE_VBUS_GREATER_VHOLD_BEFORE_USE  0b00001000
+#define AXP192_INPUT_POWER_STATE_BATT_CURRENT_DIR_IS_CHARGING  0b00000100
+#define AXP192_INPUT_POWER_STATE_ACIN_VBUS_PCB_SHORTED  0b00000010
+#define AXP192_INPUT_POWER_STATE_BOOT_SOURCE_ACIN_OR_VBUS  0b00000001
+
+#define AXP192_EXTEN_DCDC2_CTRL 0x10
+#define AXP192_EXTEN_DCDC2_CTRL_EXTEN 0b00000100
+#define AXP192_EXTEN_DCDC2_CTRL_DCDC2 0b00000001
+
+#define AXP192_DCDC13_LDO23_CTRL 0x12
+#define AXP192_DCDC13_LDO23_CTRL_EXTEN 0b01000000
+#define AXP192_DCDC13_LDO23_CTRL_LDO3 0b00001000
+#define AXP192_DCDC13_LDO23_CTRL_LDO2 0b00000100
+#define AXP192_DCDC13_LDO23_CTRL_DCDC3 0b00000010
+#define AXP192_DCDC13_LDO23_CTRL_DCDC1 0b00000001
+
+#define AXP192_DCDC2_OUT_VOLTAGE 0x25
+
+#define AXP192_DCDC1_OUT_VOLTAGE 0x26
+#define AXP192_DCDC1_OUT_VOLTAGE_3_350V 0b01101010
+
+#define AXP192_DCDC3_OUT_VOLTAGE 0x27
+#define AXP192_DCDC3_OUT_VOLTAGE_3_0V 0b01011100
+
+#define AXP192_LDO23_OUT_VOLTAGE 0x28
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_3_3V 0b11110000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_3_0V 0b11000000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_2_8V 0b10100000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO2_MASK 0b11110000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_3_0V 0b00001100
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_2_8V 0b00001010
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_1_8V 0b00000000
+#define AXP192_LDO23_OUT_VOLTAGE_LDO3_MASK 0b00001111
+
+#define AXP192_VBUS_IPSOUT 0x30
+#define AXP192_VBUS_IPSOUT_IGNORE_VBUSEN 0b10000000
+#define AXP192_VBUS_IPSOUT_VHOLD_LIMIT 0b01000000
+#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_4_4V 0b00100000
+#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_MASK 0b00111000
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT 0b00000010
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_100mA 0b00000001
+#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_500mA 0b00000000
+
+#define AXP192_POWER_OFF_VOLTAGE 0x31
+#define AXP192_POWER_OFF_VOLTAGE_2_6V 0b0000
+#define AXP192_POWER_OFF_VOLTAGE_2_7V 0b0001
+#define AXP192_POWER_OFF_VOLTAGE_2_8V 0b0010
+#define AXP192_POWER_OFF_VOLTAGE_2_9V 0b0011
+#define AXP192_POWER_OFF_VOLTAGE_3_0V 0b0100
+#define AXP192_POWER_OFF_VOLTAGE_3_1V 0b0101
+#define AXP192_POWER_OFF_VOLTAGE_3_2V 0b0110
+#define AXP192_POWER_OFF_VOLTAGE_3_3V 0b0111
+#define AXP192_POWER_OFF_VOLTAGE_MASK 0b0111
+
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL 0x32
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_OFF 0b10000000
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_BATT_MONITOR_ON 0b01000000
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_3_0S 0b00000011
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_2_0S 0b00000010
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_1_0S 0b00000001
+#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_0_5S 0b00000000
+
+#define AXP192_CHARGING_CTRL1 0x33
+#define AXP192_CHARGING_CTRL1_ENABLE 0b10000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_36V 0b01100000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_20V 0b01000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_15V 0b00100000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_4_10V 0b00000000
+#define AXP192_CHARGING_CTRL1_VOLTAGE_MASK 0b01100000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_15PERC 0b00010000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_10PERC 0b00000000
+#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_MASK 0b00010000
+#define AXP192_CHARGING_CTRL1_CURRENT_100mA 0b00000000
+#define AXP192_CHARGING_CTRL1_CURRENT_190mA 0b00000001
+#define AXP192_CHARGING_CTRL1_CURRENT_280mA 0b00000010
+#define AXP192_CHARGING_CTRL1_CURRENT_360mA 0b00000011
+#define AXP192_CHARGING_CTRL1_CURRENT_450mA 0b00000100
+#define AXP192_CHARGING_CTRL1_CURRENT_550mA 0b00000101
+#define AXP192_CHARGING_CTRL1_CURRENT_630mA 0b00000110
+#define AXP192_CHARGING_CTRL1_CURRENT_700mA 0b00000111
+#define AXP192_CHARGING_CTRL1_CURRENT_780mA 0b00001000
+#define AXP192_CHARGING_CTRL1_CURRENT_880mA 0b00001001
+#define AXP192_CHARGING_CTRL1_CURRENT_960mA 0b00001010
+#define AXP192_CHARGING_CTRL1_CURRENT_1000mA 0b00001011
+
+#define AXP192_CHARGING_CTRL1_CURRENT_MASK 0b00001111
+
+#define AXP192_CHARGING_CTRL2 0x34
+
+#define AXP192_BACKUP_BATT 0x35
+#define AXP192_BACKUP_BATT_CHARGING_ENABLE 0b10000000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_2_5V 0b01100000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V 0b00100000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_1V 0b00000000
+#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_MASK 0b01100000
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_400uA 0b00000011
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA 0b00000010
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_100uA 0b00000001
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_50uA 0b00000000
+#define AXP192_BACKUP_BATT_CHARGING_CURRENT_MASK 0b00000011
+
+#define AXP192_PEK 0x36
+#define AXP192_PEK_SHORT_PRESS_1S 0b11000000
+#define AXP192_PEK_SHORT_PRESS_512mS 0b10000000
+#define AXP192_PEK_SHORT_PRESS_256mS 0b01000000
+#define AXP192_PEK_SHORT_PRESS_128mS 0b00000000
+#define AXP192_PEK_SHORT_PRESS_MASK 0b11000000
+#define AXP192_PEK_LONG_PRESS_2_5S 0b00110000
+#define AXP192_PEK_LONG_PRESS_2_0S 0b00100000
+#define AXP192_PEK_LONG_PRESS_1_5S 0b00010000
+#define AXP192_PEK_LONG_PRESS_1_0S 0b00000000
+#define AXP192_PEK_LONG_PRESS_MASK 0b00110000
+#define AXP192_PEK_LONG_PRESS_POWER_OFF 0b00001000
+#define AXP192_PEK_PWROK_DELAY_64mS 0b00000100
+#define AXP192_PEK_PWROK_DELAY_32mS 0b00000000
+#define AXP192_PEK_PWROK_DELAY_MASK 0b00000100
+#define AXP192_PEK_POWER_OFF_TIME_12S 0b00000011
+#define AXP192_PEK_POWER_OFF_TIME_8S 0b00000010
+#define AXP192_PEK_POWER_OFF_TIME_6S 0b00000001
+#define AXP192_PEK_POWER_OFF_TIME_4S 0b00000000
+#define AXP192_PEK_POWER_OFF_TIME_MASK 0b00000011
+
+#define AXP192_BATT_TEMP_LOW_THRESH 0x38
+#define AXP192_BATT_TEMP_HIGH_THRESH 0x39
+#define AXP192_BATT_TEMP_HIGH_THRESH_DEFAULT 0b11111100
+
+#define AXP192_APS_LOW_BATT_LEVEL_1 0x3A
+#define AXP192_APS_LOW_BATT_LEVEL_2 0x3B
+#define AXP192_APS_LOW_BATT_VOLTAGE_3_695V 0b10010100
+#define AXP192_APS_LOW_BATT_VOLTAGE_3_600V 0b10000011
+
+#define AXP192_IRQ_1_ENABLE 0x40
+#define AXP192_IRQ_2_ENABLE 0x41
+#define AXP192_IRQ_3_ENABLE 0x42
+#define AXP192_IRQ_3_PEK_SHORT_PRESS 0b00000010
+#define AXP192_IRQ_3_PEK_LONG_PRESS  0b00000001
+#define AXP192_IRQ_4_ENABLE 0x43
+#define AXP192_IRQ_4_LOW_VOLTAGE_WARNING 0b00000001
+#define AXP192_IRQ_5_ENABLE 0x4a
+
+#define AXP192_IRQ_X_DISABLE_ALL     0b00000000
+
+#define AXP192_IRQ_1_STATUS 0x44
+#define AXP192_IRQ_2_STATUS 0x45
+#define AXP192_IRQ_3_STATUS 0x46
+#define AXP192_IRQ_4_STATUS 0x47
+#define AXP192_IRQ_5_STATUS 0x4d
+
+#define AXP192_IRQ_X_CLEAR_STATUS 0b11111111
+
+#define AXP192_ADC_ACIN_VOLTAGE_H 0x56
+#define AXP192_ADC_ACIN_VOLTAGE_L 0x57
+#define AXP192_ADC_ACIN_CURRENT_H 0x58
+#define AXP192_ADC_ACIN_CURRENT_L 0x59
+#define AXP192_ADC_VBUS_VOLTAGE_H 0x5a
+#define AXP192_ADC_VBUS_VOLTAGE_L 0x5b
+#define AXP192_ADC_VBUS_CURRENT_H 0x5c
+#define AXP192_ADC_VBUS_CURRENT_L 0x5d
+#define AXP192_ADC_INTERNAL_TEMP_H 0x5e
+#define AXP192_ADC_INTERNAL_TEMP_L 0x5f
+
+#define AXP192_ADC_BATT_VOLTAGE_H 0x78
+#define AXP192_ADC_BATT_VOLTAGE_L 0x79
+
+#define AXP192_ADC_BATT_POWER_H 0x70
+#define AXP192_ADC_BATT_POWER_M 0x71
+#define AXP192_ADC_BATT_POWER_L 0x72
+
+#define AXP192_ADC_BATT_CHARGE_CURRENT_H 0x7a
+#define AXP192_ADC_BATT_CHARGE_CURRENT_L 0x7b
+#define AXP192_ADC_BATT_DISCHARGE_CURRENT_H 0x7c
+#define AXP192_ADC_BATT_DISCHARGE_CURRENT_L 0x7d
+#define AXP192_ADC_APS_VOLTAGE_H 0x7e
+#define AXP192_ADC_APS_VOLTAGE_L 0x7f
+
+#define AXP192_ADC_ENABLE_1 0x82
+#define AXP192_ADC_ENABLE_1_BATT_VOL 0b10000000
+#define AXP192_ADC_ENABLE_1_BATT_CUR 0b01000000
+#define AXP192_ADC_ENABLE_1_ACIN_VOL 0b00100000
+#define AXP192_ADC_ENABLE_1_ACIN_CUR 0b00010000
+#define AXP192_ADC_ENABLE_1_VBUS_VOL 0b00001000
+#define AXP192_ADC_ENABLE_1_VBUS_CUR 0b00000100
+#define AXP192_ADC_ENABLE_1_APS_VOL 0b00000010
+#define AXP192_ADC_ENABLE_1_TS_PIN 0b00000001
+
+#define AXP192_ADC_ENABLE_2 0x83
+#define AXP192_ADC_ENABLE_2_TEMP_MON 0b10000000
+#define AXP192_ADC_ENABLE_2_GPIO0 0b00001000
+#define AXP192_ADC_ENABLE_2_GPIO1 0b00000100
+#define AXP192_ADC_ENABLE_2_GPIO2 0b00000010
+#define AXP192_ADC_ENABLE_2_GPIO3 0b00000001
+
+#define AXP192_ADC_TS 0x84
+#define AXP192_ADC_TS_SAMPLE_200HZ 0b11000000
+#define AXP192_ADC_TS_SAMPLE_100HZ 0b10000000
+#define AXP192_ADC_TS_SAMPLE_50HZ 0b01000000
+#define AXP192_ADC_TS_SAMPLE_25HZ 0b00000000
+#define AXP192_ADC_TS_SAMPLE_MASK 0b11000000
+#define AXP192_ADC_TS_OUT_CUR_80uA 0b00110000
+#define AXP192_ADC_TS_OUT_CUR_60uA 0b00100000
+#define AXP192_ADC_TS_OUT_CUR_40uA 0b00010000
+#define AXP192_ADC_TS_OUT_CUR_20uA 0b00000000
+#define AXP192_ADC_TS_OUT_CUR_MASK 0b00110000
+#define AXP192_ADC_TS_PIN_TEMP_MON 0b00000000
+#define AXP192_ADC_TS_PIN_EXTERN_ADC 0b00000100
+#define AXP192_ADC_TS_PIN_OUT_ALWAYS 0b00000011
+#define AXP192_ADC_TS_PIN_OUT_SAVE_ENG 0b00000010
+#define AXP192_ADC_TS_PIN_OUT_CHG 0b00000001
+#define AXP192_ADC_TS_PIN_OUT_DIS 0b00000000
+#define AXP192_ADC_TS_PIN_OUT_MASK 0b00000011
+
+#define AXP192_GPIO0_FUNCTION 0x90
+#define AXP192_GPIO0_FUNCTION_MASK 0b00000111
+#define AXP192_GPIO0_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO0_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO0_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO0_FUNCTION_LDO_OUTPUT 0b00000010
+#define AXP192_GPIO0_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO0_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+#define AXP192_GPIO0_LDO_VOLTAGE 0x91
+#define AXP192_GPIO0_LDO_VOLTAGE_MASK 0b11110000
+#define AXP192_GPIO0_LDO_VOLTAGE_3_3V 0b11110000
+#define AXP192_GPIO0_LDO_VOLTAGE_2_8V 0b10100000
+#define AXP192_GPIO0_LDO_VOLTAGE_1_8V 0b00000000
+
+
+#define AXP192_GPIO1_FUNCTION 0x92
+#define AXP192_GPIO1_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO1_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO1_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO1_FUNCTION_PWM1_OUTPUT 0b00000010
+#define AXP192_GPIO1_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO1_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+
+#define AXP192_GPIO2_FUNCTION 0x93
+#define AXP192_GPIO2_FUNCTION_FLOATING 0b00000111
+#define AXP192_GPIO2_FUNCTION_LOW_OUTPUT 0b00000101
+#define AXP192_GPIO2_FUNCTION_ADC_INPUT 0b00000100
+#define AXP192_GPIO2_FUNCTION_PWM2_OUTPUT 0b00000010
+#define AXP192_GPIO2_FUNCTION_GENERAL_INPUT 0b00000001
+#define AXP192_GPIO2_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
+
+#define AXP192_PWM1_OUTPUT_FREQUECY 0x98
+#define AXP192_PWM1_DUTY_RATIO_Y1 0x99
+#define AXP192_PWM1_DUTY_RATIO_Y2 0x9A
+
+#endif
diff --git a/ports/espressif/boards/m5stack_core2/board.c b/ports/espressif/boards/m5stack_core2/board.c
new file mode 100644
index 0000000000..f0f0d701b3
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/board.c
@@ -0,0 +1,632 @@
+/*
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 CDarius
+ *
+ * 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 "shared-bindings/busio/SPI.h"
+#include "shared-bindings/busio/I2C.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
+
+#include "axp192.h"
+
+displayio_fourwire_obj_t board_display_obj;
+
+#define DELAY 0x80
+#define PMIC_POWER_SOURCE_USB   0
+#define PMIC_POWER_SOURCE_M_BUS 1
+
+// display init sequence according to M5Gfx
+uint8_t display_init_sequence[] = {
+    0x01,DELAY,0x80,            // Software reset then delay 0x80 (128ms)
+    0xC8,0x03,0xFF,0x93,0x42,   // Turn on the external command
+    0xC0,0x02,0x12, 0x12,       // Power Control 1
+    0xC1,0x01,0x03,             // Power Control 2
+    0xC5,0x01,0xF2,             // VCOM Control 1
+    0xB0,0x01,0xE0,             // RGB Interface SYNC Mode
+    0xF6,0x03,0x01, 0x00, 0x00, // Interface control
+    0XE0,0x0F,0x00,0x0C,0x11,0x04,0x11,0x08,0x37,0x89,0x4C,0x06,0x0C,0x0A,0x2E,0x34,0x0F,   // Positive Gamma Correction
+    0xE1,0x0F,0x00,0x0B,0x11,0x05,0x13,0x09,0x33,0x67,0x48,0x07,0x0E,0x0B,0x2E,0x33,0x0F,   // Negative Gamma Correction
+    0xB6,0x04,0x08,0x82,0x1D,0x04,  // Display Function Control
+    0x3A,0x01,0x55,             // COLMOD: Pixel Format Set 16 bit
+    0x21,0x00,                  // Display inversion ON
+    0x36,0x01,0x08,             // Memory Access Control: RGB order
+    0x11,DELAY,0x78,            // Exit Sleep then delay 0x78 (120ms)
+    0x29,DELAY,0x78,            // Display on then delay 0x78 (120ms)
+};
+
+static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c) {
+    int rc;
+    uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    switch (source)
+    {
+        case PMIC_POWER_SOURCE_USB:
+            // Set GPIO to 3.3V (when LDO OUTPUT mode is active)
+            write_buf[0] = AXP192_GPIO0_LDO_VOLTAGE;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_LDO_VOLTAGE_MASK) | AXP192_GPIO0_LDO_VOLTAGE_3_3V;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+            // Set GPIO0 to LDO_OUTPUT to set N_VBUSEN high
+            // When N_VBUSEN is high IPSOUT do not select VBUS as source (BUS_5V)
+            write_buf[0] = AXP192_GPIO0_FUNCTION;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_FUNCTION_MASK) | AXP192_GPIO0_FUNCTION_LDO_OUTPUT;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+
+            #if M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT
+            // Set EXTENT output high to enable 5V power boost
+            write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = read_buf[0] | AXP192_EXTEN_DCDC2_CTRL_EXTEN;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+            #endif
+
+            // Enable VBUS-IPSOUT when N_VBUSEN is high
+            write_buf[0] = AXP192_VBUS_IPSOUT;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = read_buf[0] & ~AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+
+            return true;
+
+        case PMIC_POWER_SOURCE_M_BUS:
+            // Enable VBUS-IPSOUT regardless of f N_VBUSEN
+            write_buf[0] = AXP192_VBUS_IPSOUT;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = read_buf[0] | AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+
+            // Set EXTENT output low to disable 5V power boost
+            write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = read_buf[0] & ~AXP192_EXTEN_DCDC2_CTRL_EXTEN;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+
+            // Set GPIO0 to float and the pull down resistor set N_VBUSEN low
+            // When N_VBUSEN is low IPSOUT select VBUS as source (BUS_5V)
+            write_buf[0] = AXP192_GPIO0_FUNCTION;
+            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            if (rc != 0) {
+                return false;
+            }
+            write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_FUNCTION_MASK) | AXP192_GPIO0_FUNCTION_FLOATING;
+            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            if (rc != 0) {
+                return false;
+            }
+
+            return true;
+
+        default:
+            return false;
+    }
+}
+
+static bool pmic_disable_all_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    // uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    // Reg: 40h
+    // IRQ enable control register 1
+    write_buf[0] = AXP192_IRQ_1_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 41h
+    // IRQ enable control register 2
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 42h
+    // IRQ enable control register 3
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_3_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 43h
+    // IRQ enable control register 4
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_4_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 4Ah
+    // IRQ enable control register 5
+    write_buf[0] = AXP192_IRQ_5_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool pmic_clear_all_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    // uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    // Reg: 44h
+    // IRQ enable control register 1
+    write_buf[0] = AXP192_IRQ_1_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 45h
+    // IRQ enable control register 2
+    write_buf[0] = AXP192_IRQ_2_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 46h
+    // IRQ enable control register 3
+    write_buf[0] = AXP192_IRQ_3_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 47h
+    // IRQ enable control register 4
+    write_buf[0] = AXP192_IRQ_4_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 4Ah
+    // IRQ enable control register 5
+    write_buf[0] = AXP192_IRQ_5_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool pmic_enable_default_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    // uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    // Reg: 42h
+    // IRQ enable control register 3
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_3_PEK_SHORT_PRESS |
+        AXP192_IRQ_3_PEK_LONG_PRESS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 43h
+    // IRQ enable control register 4
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_4_LOW_VOLTAGE_WARNING;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
+    int rc;
+    uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    // Reg: 30h
+    // The VBUS-IPSOUT path can be selected to be opened regardless of the status of N_VBUSEN
+    // VBUS VHOLD pressure limit control disabled
+    // VBUS current limit control enabled
+    write_buf[0] = AXP192_VBUS_IPSOUT;
+    write_buf[1] = AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT |
+        AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_500mA;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 31h
+    // VOFF Shutdown voltage setting ( 3.0V )
+    write_buf[0] = AXP192_POWER_OFF_VOLTAGE;
+    write_buf[1] = AXP192_POWER_OFF_VOLTAGE_3_0V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 32h
+    // Charge function enable control bit, including internal and external channels
+    // Charging target voltage: 4.2V
+    // Charging end current: End charging when charging current is less than 10% setting
+    // Internal path charging current: 100mA
+    write_buf[0] = AXP192_POWER_OFF_BATT_CHGLED_CTRL;
+    write_buf[1] = AXP192_POWER_OFF_BATT_CHGLED_CTRL_BATT_MONITOR_ON |
+        AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_2_0S;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 33h
+    // Charge function enable control bit, including internal and external channels
+    // Charging target voltage: 4.2V
+    // Charging end current: End charging when charging current is less than 10% setting
+    // Internal path charging current: 100mA
+    write_buf[0] = AXP192_CHARGING_CTRL1;
+    write_buf[1] = AXP192_CHARGING_CTRL1_ENABLE |
+        AXP192_CHARGING_CTRL1_VOLTAGE_4_20V |
+        AXP192_CHARGING_CTRL1_CHARGING_THRESH_10PERC |
+        AXP192_CHARGING_CTRL1_CURRENT_360mA;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 35h
+    // Enable RTC battery charge: 3.0V, 200uA
+    write_buf[0] = AXP192_BACKUP_BATT;
+    write_buf[1] = AXP192_BACKUP_BATT_CHARGING_ENABLE |
+        AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V |
+        AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 36h
+    // Power on:  Short press 128ms
+    // Power off: Long press 1s
+    // Power OK delay 64ms
+    // Power off delay 4s
+    write_buf[0] = AXP192_PEK;
+    write_buf[1] = AXP192_PEK_SHORT_PRESS_128mS |
+        AXP192_PEK_LONG_PRESS_1_0S |
+        AXP192_PEK_LONG_PRESS_POWER_OFF |
+        AXP192_PEK_PWROK_DELAY_64mS |
+        AXP192_PEK_POWER_OFF_TIME_4S;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 3Ah
+    // APS Low battery warning level 1: 3.695V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_1;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_695V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 3Bh
+    // APS Low battery warning level 2: 3.600V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_2;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_600V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 82h
+    // ADC all on
+    write_buf[0] = AXP192_ADC_ENABLE_1;
+    write_buf[1] = AXP192_ADC_ENABLE_1_BATT_VOL |
+        AXP192_ADC_ENABLE_1_BATT_CUR |
+        AXP192_ADC_ENABLE_1_ACIN_VOL |
+        AXP192_ADC_ENABLE_1_ACIN_CUR |
+        AXP192_ADC_ENABLE_1_VBUS_VOL |
+        AXP192_ADC_ENABLE_1_VBUS_CUR |
+        AXP192_ADC_ENABLE_1_APS_VOL |
+        AXP192_ADC_ENABLE_1_TS_PIN;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 83h
+    // ADC temperature on
+    write_buf[0] = AXP192_ADC_ENABLE_2;
+    write_buf[1] = AXP192_ADC_ENABLE_2_TEMP_MON;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 84h
+    // ADC 25Hz
+    write_buf[0] = AXP192_ADC_TS;
+    write_buf[1] = AXP192_ADC_TS_SAMPLE_25HZ |
+        AXP192_ADC_TS_OUT_CUR_80uA |
+        AXP192_ADC_TS_PIN_TEMP_MON |
+        AXP192_ADC_TS_PIN_OUT_SAVE_ENG;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 98h
+    // PWM1 frequency
+    write_buf[0] = AXP192_PWM1_OUTPUT_FREQUECY;
+    write_buf[1] = 0x00;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 99h
+    // PWM1 duty cycle Y1
+    write_buf[0] = AXP192_PWM1_DUTY_RATIO_Y1;
+    write_buf[1] = 0xFF;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 9Ah
+    // PWM1 duty cycle Y2
+    write_buf[0] = AXP192_PWM1_DUTY_RATIO_Y2;
+    write_buf[1] = 0xFF;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 93h
+    // Speaker off (GPIO2 output low)
+    write_buf[0] = AXP192_GPIO2_FUNCTION;
+    write_buf[1] = AXP192_GPIO2_FUNCTION_LOW_OUTPUT;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 28h
+    // LDO2 (SD + TFT Logic): 3.3V
+    // LDO3 (Vibration motore): Set to minimum voltage 1.8V
+    write_buf[0] = AXP192_LDO23_OUT_VOLTAGE;
+    write_buf[1] = AXP192_LDO23_OUT_VOLTAGE_LDO2_3_3V |
+        AXP192_LDO23_OUT_VOLTAGE_LDO3_1_8V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 26h
+    // DCDC1 (ESP32 VDD): 3.350V
+    write_buf[0] = AXP192_DCDC1_OUT_VOLTAGE;
+    write_buf[1] = AXP192_DCDC1_OUT_VOLTAGE_3_350V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 27h
+    // DCDC3 (TFT backlight): 3.0V
+    write_buf[0] = AXP192_DCDC3_OUT_VOLTAGE;
+    write_buf[1] = AXP192_DCDC3_OUT_VOLTAGE_3_0V;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 12h
+    // Enable:
+    // DCDC1    ESP32 VDD, touch screen and 3.3V on M-Bus
+    // DCDC3    LCD backlight
+    // LDO2     LCD logic and SD card
+    write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
+    write_buf[1] = AXP192_DCDC13_LDO23_CTRL_LDO2 |
+        AXP192_DCDC13_LDO23_CTRL_DCDC3 |
+        AXP192_DCDC13_LDO23_CTRL_DCDC1;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 92h
+    // Set GPIO1 Sys green LED output as PWM
+    // PWM duty cycle is set to 100% therefore sys led is off
+    write_buf[0] = AXP192_GPIO1_FUNCTION;
+    write_buf[1] = AXP192_GPIO1_FUNCTION_PWM1_OUTPUT;
+    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    /*
+    * Select power source:
+    * If there is voltage on VBUS means that BUS_5V is powered from M-BUS
+    * and it can use VBUS as power source. If no voltage is present on VBUS
+    * disable VBUS and rely on ACIN (USB_5V) as power source.
+    */
+    write_buf[0] = AXP192_INPUT_POWER_STATE;
+    rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+    if (rc != 0) {
+        return false;
+    }
+    uint8_t powersource = (read_buf[0] & AXP192_INPUT_POWER_STATE_VBUS_AVAILABLE) ?
+        PMIC_POWER_SOURCE_M_BUS : PMIC_POWER_SOURCE_USB;
+    if (!pmic_set_power_source(powersource, internal_i2c)) {
+        return false;
+    }
+
+    if (!pmic_disable_all_irq(internal_i2c)) {
+        return false;
+    }
+
+    if (!pmic_clear_all_irq(internal_i2c)) {
+        return false;
+    }
+
+    if (!pmic_enable_default_irq(internal_i2c)) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool display_init(void) {
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+
+    common_hal_displayio_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO15,    // DC
+        &pin_GPIO5,     // CS
+        NULL,           // RST
+        32000000,       // 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
+        0,              // 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
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        NULL,           // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        61,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+
+    return true;
+}
+
+void board_init(void) {
+    busio_i2c_obj_t *internal_i2c = common_hal_board_create_i2c(0);
+
+    if (!pmic_init(internal_i2c)) {
+        mp_printf(&mp_plat_print, "could not initialize axp192 pmic\n");
+        return;
+    }
+
+    if (!display_init()) {
+        mp_printf(&mp_plat_print, "could not initialize the display");
+        return;
+    }
+}
diff --git a/ports/espressif/boards/m5stack_core2/mpconfigboard.h b/ports/espressif/boards/m5stack_core2/mpconfigboard.h
new file mode 100755
index 0000000000..f55f754fa7
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/mpconfigboard.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 CDarius
+ *
+ * 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "M5Stack Core2"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}, \
+                                     {.scl = &pin_GPIO33, .sda = &pin_GPIO32}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO38}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO14, .rx = &pin_GPIO13}}
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
diff --git a/ports/espressif/boards/m5stack_core2/mpconfigboard.mk b/ports/espressif/boards/m5stack_core2/mpconfigboard.mk
new file mode 100644
index 0000000000..28a098a195
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/mpconfigboard.mk
@@ -0,0 +1,18 @@
+CIRCUITPY_CREATOR_ID =  0x10151015
+CIRCUITPY_CREATION_ID = 0x00320008
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT = 1
+
+CFLAGS += -DM5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT=$(M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT)
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
diff --git a/ports/espressif/boards/m5stack_core2/pins.c b/ports/espressif/boards/m5stack_core2/pins.c
new file mode 100644
index 0000000000..465006a6b6
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/pins.c
@@ -0,0 +1,93 @@
+#include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTC_RX), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
+
+    { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A27), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_DATA_SPK), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTB_IN), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_A36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_A25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTB_OUT), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTC_TX), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_WS_SPK), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_CLOCK_MIC), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_DATA_MIC), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_A34), MP_ROM_PTR(&pin_GPIO34) },
+
+    // tft
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO15) },
+    // { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO33) }, AXP_IO4
+    // { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO32) }, AXP_DC3
+
+    // sd card
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),MP_ROM_PTR(&pin_GPIO4) },
+
+    // touch screen
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_SCR_IRQ),MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_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_module_globals_table);
diff --git a/ports/espressif/boards/m5stack_core2/sdkconfig b/ports/espressif/boards/m5stack_core2/sdkconfig
new file mode 100644
index 0000000000..47a0a18a5e
--- /dev/null
+++ b/ports/espressif/boards/m5stack_core2/sdkconfig
@@ -0,0 +1,34 @@
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_ESP32_REV_MIN_3=y
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StaskCore2"
+# end of LWIP
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set

From 33ddf50d388740c32c9b82f7d8ad39c4d1417083 Mon Sep 17 00:00:00 2001
From: flom84 
Date: Tue, 11 Apr 2023 19:11:01 +0200
Subject: [PATCH 2234/2403] Revert "Enable uart over FTDI by default."

This reverts commit 1fe7d2956c73dba39333d2b3248e9cf7f89d5eb2.
---
 ports/stm/boards/nucleo_f446re/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.h b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
index c1d61492e4..f0155f4624 100644
--- a/ports/stm/boards/nucleo_f446re/mpconfigboard.h
+++ b/ports/stm/boards/nucleo_f446re/mpconfigboard.h
@@ -44,8 +44,8 @@
 // #define CIRCUITPY_CONSOLE_UART_RX (&pin_PC11)
 
 // USART2 + ST link
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_PA02)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_PA03)
+// #define CIRCUITPY_CONSOLE_UART_TX (&pin_PA02)
+// #define CIRCUITPY_CONSOLE_UART_RX (&pin_PA03)
 
 // Status LEDs
 #define MICROPY_HW_LED_STATUS (&pin_PA05)

From 3ca0131ddd3026a0edb2e517ed524e51c7c93be6 Mon Sep 17 00:00:00 2001
From: flom84 
Date: Tue, 11 Apr 2023 19:37:01 +0200
Subject: [PATCH 2235/2403] Fix mpy-cross compile error with GCC13.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - GCC13 reports the following error when compiling mpy-cross:

main.c:313:6: error: conflicting types for ‘mp_import_stat’ due to enum/integer mismatch; have ‘uint(const char *)’ {aka ‘unsigned int(const char *)’} [-Werror=enum-int-mismatch]
  313 | uint mp_import_stat(const char *path) {
      |      ^~~~~~~~~~~~~~
In file included from ../py/compile.h:29,
                 from main.c:11:
../py/lexer.h:205:18: note: previous declaration of ‘mp_import_stat’ with type ‘mp_import_stat_t(const char *)’
  205 | mp_import_stat_t mp_import_stat(const char *path);
      |                  ^~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make: *** [../py/mkrules.mk:62: build/main.o] Error 1
---
 mpy-cross/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index c00829be10..077e84f473 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -310,7 +310,7 @@ int main(int argc, char **argv) {
     return main_(argc, argv);
 }
 
-uint mp_import_stat(const char *path) {
+mp_import_stat_t mp_import_stat(const char *path) {
     (void)path;
     return MP_IMPORT_STAT_NO_EXIST;
 }

From ed86f710c2630bc5905f4326ffbc338ed0ba9b73 Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Thu, 13 Apr 2023 13:39:39 +0000
Subject: [PATCH 2236/2403] Refactored AXP192 code and moved under
 ports/espressif

---
 locale/circuitpython.pot                      |  13 +-
 ports/espressif/boards/m5stack_core2/board.c  | 315 +++---------------
 .../boards/m5stack_core2/mpconfigboard.mk     |   2 +
 .../espressif/boards/m5stack_stick_c/axp192.h | 263 ---------------
 .../espressif/boards/m5stack_stick_c/board.c  | 162 ++-------
 .../boards/m5stack_stick_c/mpconfigboard.mk   |   2 +
 ports/espressif/pmic/axp192/axp192.c          | 255 ++++++++++++++
 .../m5stack_core2 => pmic/axp192}/axp192.h    |   8 +
 8 files changed, 335 insertions(+), 685 deletions(-)
 delete mode 100755 ports/espressif/boards/m5stack_stick_c/axp192.h
 create mode 100644 ports/espressif/pmic/axp192/axp192.c
 rename ports/espressif/{boards/m5stack_core2 => pmic/axp192}/axp192.h (97%)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f87fc02975..9df2093107 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -98,6 +98,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -193,7 +196,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1117,10 +1120,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1708,10 +1707,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/ports/espressif/boards/m5stack_core2/board.c b/ports/espressif/boards/m5stack_core2/board.c
index f0f0d701b3..ea0d0a1a7d 100644
--- a/ports/espressif/boards/m5stack_core2/board.c
+++ b/ports/espressif/boards/m5stack_core2/board.c
@@ -38,7 +38,7 @@
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
-#include "axp192.h"
+#include "../../pmic/axp192/axp192.h"
 
 displayio_fourwire_obj_t board_display_obj;
 
@@ -65,7 +65,7 @@ uint8_t display_init_sequence[] = {
     0x29,DELAY,0x78,            // Display on then delay 0x78 (120ms)
 };
 
-static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c) {
+static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *i2c) {
     int rc;
     uint8_t read_buf[1];
     uint8_t write_buf[2];
@@ -75,24 +75,24 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
         case PMIC_POWER_SOURCE_USB:
             // Set GPIO to 3.3V (when LDO OUTPUT mode is active)
             write_buf[0] = AXP192_GPIO0_LDO_VOLTAGE;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_LDO_VOLTAGE_MASK) | AXP192_GPIO0_LDO_VOLTAGE_3_3V;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
             // Set GPIO0 to LDO_OUTPUT to set N_VBUSEN high
             // When N_VBUSEN is high IPSOUT do not select VBUS as source (BUS_5V)
             write_buf[0] = AXP192_GPIO0_FUNCTION;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_FUNCTION_MASK) | AXP192_GPIO0_FUNCTION_LDO_OUTPUT;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
@@ -100,12 +100,12 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
             #if M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT
             // Set EXTENT output high to enable 5V power boost
             write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = read_buf[0] | AXP192_EXTEN_DCDC2_CTRL_EXTEN;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
@@ -113,12 +113,12 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
 
             // Enable VBUS-IPSOUT when N_VBUSEN is high
             write_buf[0] = AXP192_VBUS_IPSOUT;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = read_buf[0] & ~AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
@@ -128,24 +128,24 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
         case PMIC_POWER_SOURCE_M_BUS:
             // Enable VBUS-IPSOUT regardless of f N_VBUSEN
             write_buf[0] = AXP192_VBUS_IPSOUT;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = read_buf[0] | AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
 
             // Set EXTENT output low to disable 5V power boost
             write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = read_buf[0] & ~AXP192_EXTEN_DCDC2_CTRL_EXTEN;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
@@ -153,12 +153,12 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
             // Set GPIO0 to float and the pull down resistor set N_VBUSEN low
             // When N_VBUSEN is low IPSOUT select VBUS as source (BUS_5V)
             write_buf[0] = AXP192_GPIO0_FUNCTION;
-            rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+            rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
             write_buf[1] = (read_buf[0] & ~AXP192_GPIO0_FUNCTION_MASK) | AXP192_GPIO0_FUNCTION_FLOATING;
-            rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+            rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
             }
@@ -170,148 +170,15 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *internal_i2c)
     }
 }
 
-static bool pmic_disable_all_irq(busio_i2c_obj_t *i2c) {
-    int rc;
-    // uint8_t read_buf[1];
-    uint8_t write_buf[2];
-
-    // Reg: 40h
-    // IRQ enable control register 1
-    write_buf[0] = AXP192_IRQ_1_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 41h
-    // IRQ enable control register 2
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 42h
-    // IRQ enable control register 3
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_3_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 43h
-    // IRQ enable control register 4
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_4_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 4Ah
-    // IRQ enable control register 5
-    write_buf[0] = AXP192_IRQ_5_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    return true;
-}
-
-static bool pmic_clear_all_irq(busio_i2c_obj_t *i2c) {
-    int rc;
-    // uint8_t read_buf[1];
-    uint8_t write_buf[2];
-
-    // Reg: 44h
-    // IRQ enable control register 1
-    write_buf[0] = AXP192_IRQ_1_STATUS;
-    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 45h
-    // IRQ enable control register 2
-    write_buf[0] = AXP192_IRQ_2_STATUS;
-    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 46h
-    // IRQ enable control register 3
-    write_buf[0] = AXP192_IRQ_3_STATUS;
-    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 47h
-    // IRQ enable control register 4
-    write_buf[0] = AXP192_IRQ_4_STATUS;
-    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 4Ah
-    // IRQ enable control register 5
-    write_buf[0] = AXP192_IRQ_5_STATUS;
-    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    return true;
-}
-
-static bool pmic_enable_default_irq(busio_i2c_obj_t *i2c) {
-    int rc;
-    // uint8_t read_buf[1];
-    uint8_t write_buf[2];
-
-    // Reg: 42h
-    // IRQ enable control register 3
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_3_PEK_SHORT_PRESS |
-        AXP192_IRQ_3_PEK_LONG_PRESS;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 43h
-    // IRQ enable control register 4
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_4_LOW_VOLTAGE_WARNING;
-    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    return true;
-}
-
-static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
+static bool pmic_init(busio_i2c_obj_t *i2c) {
     int rc;
     uint8_t read_buf[1];
     uint8_t write_buf[2];
 
+    if (!pmic_common_init(i2c)) {
+        return false;
+    }
+
     // Reg: 30h
     // The VBUS-IPSOUT path can be selected to be opened regardless of the status of N_VBUSEN
     // VBUS VHOLD pressure limit control disabled
@@ -319,29 +186,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     write_buf[0] = AXP192_VBUS_IPSOUT;
     write_buf[1] = AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT |
         AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_500mA;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 31h
-    // VOFF Shutdown voltage setting ( 3.0V )
-    write_buf[0] = AXP192_POWER_OFF_VOLTAGE;
-    write_buf[1] = AXP192_POWER_OFF_VOLTAGE_3_0V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 32h
-    // Charge function enable control bit, including internal and external channels
-    // Charging target voltage: 4.2V
-    // Charging end current: End charging when charging current is less than 10% setting
-    // Internal path charging current: 100mA
-    write_buf[0] = AXP192_POWER_OFF_BATT_CHGLED_CTRL;
-    write_buf[1] = AXP192_POWER_OFF_BATT_CHGLED_CTRL_BATT_MONITOR_ON |
-        AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_2_0S;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -356,89 +201,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
         AXP192_CHARGING_CTRL1_VOLTAGE_4_20V |
         AXP192_CHARGING_CTRL1_CHARGING_THRESH_10PERC |
         AXP192_CHARGING_CTRL1_CURRENT_360mA;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 35h
-    // Enable RTC battery charge: 3.0V, 200uA
-    write_buf[0] = AXP192_BACKUP_BATT;
-    write_buf[1] = AXP192_BACKUP_BATT_CHARGING_ENABLE |
-        AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V |
-        AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 36h
-    // Power on:  Short press 128ms
-    // Power off: Long press 1s
-    // Power OK delay 64ms
-    // Power off delay 4s
-    write_buf[0] = AXP192_PEK;
-    write_buf[1] = AXP192_PEK_SHORT_PRESS_128mS |
-        AXP192_PEK_LONG_PRESS_1_0S |
-        AXP192_PEK_LONG_PRESS_POWER_OFF |
-        AXP192_PEK_PWROK_DELAY_64mS |
-        AXP192_PEK_POWER_OFF_TIME_4S;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 3Ah
-    // APS Low battery warning level 1: 3.695V
-    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_1;
-    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_695V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 3Bh
-    // APS Low battery warning level 2: 3.600V
-    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_2;
-    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_600V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 82h
-    // ADC all on
-    write_buf[0] = AXP192_ADC_ENABLE_1;
-    write_buf[1] = AXP192_ADC_ENABLE_1_BATT_VOL |
-        AXP192_ADC_ENABLE_1_BATT_CUR |
-        AXP192_ADC_ENABLE_1_ACIN_VOL |
-        AXP192_ADC_ENABLE_1_ACIN_CUR |
-        AXP192_ADC_ENABLE_1_VBUS_VOL |
-        AXP192_ADC_ENABLE_1_VBUS_CUR |
-        AXP192_ADC_ENABLE_1_APS_VOL |
-        AXP192_ADC_ENABLE_1_TS_PIN;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 83h
-    // ADC temperature on
-    write_buf[0] = AXP192_ADC_ENABLE_2;
-    write_buf[1] = AXP192_ADC_ENABLE_2_TEMP_MON;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 84h
-    // ADC 25Hz
-    write_buf[0] = AXP192_ADC_TS;
-    write_buf[1] = AXP192_ADC_TS_SAMPLE_25HZ |
-        AXP192_ADC_TS_OUT_CUR_80uA |
-        AXP192_ADC_TS_PIN_TEMP_MON |
-        AXP192_ADC_TS_PIN_OUT_SAVE_ENG;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -447,7 +210,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // PWM1 frequency
     write_buf[0] = AXP192_PWM1_OUTPUT_FREQUECY;
     write_buf[1] = 0x00;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -456,7 +219,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // PWM1 duty cycle Y1
     write_buf[0] = AXP192_PWM1_DUTY_RATIO_Y1;
     write_buf[1] = 0xFF;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -465,7 +228,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // PWM1 duty cycle Y2
     write_buf[0] = AXP192_PWM1_DUTY_RATIO_Y2;
     write_buf[1] = 0xFF;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -474,7 +237,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // Speaker off (GPIO2 output low)
     write_buf[0] = AXP192_GPIO2_FUNCTION;
     write_buf[1] = AXP192_GPIO2_FUNCTION_LOW_OUTPUT;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -485,7 +248,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     write_buf[0] = AXP192_LDO23_OUT_VOLTAGE;
     write_buf[1] = AXP192_LDO23_OUT_VOLTAGE_LDO2_3_3V |
         AXP192_LDO23_OUT_VOLTAGE_LDO3_1_8V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -494,7 +257,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // DCDC1 (ESP32 VDD): 3.350V
     write_buf[0] = AXP192_DCDC1_OUT_VOLTAGE;
     write_buf[1] = AXP192_DCDC1_OUT_VOLTAGE_3_350V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -503,7 +266,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // DCDC3 (TFT backlight): 3.0V
     write_buf[0] = AXP192_DCDC3_OUT_VOLTAGE;
     write_buf[1] = AXP192_DCDC3_OUT_VOLTAGE_3_0V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -517,7 +280,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     write_buf[1] = AXP192_DCDC13_LDO23_CTRL_LDO2 |
         AXP192_DCDC13_LDO23_CTRL_DCDC3 |
         AXP192_DCDC13_LDO23_CTRL_DCDC1;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -527,7 +290,7 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     // PWM duty cycle is set to 100% therefore sys led is off
     write_buf[0] = AXP192_GPIO1_FUNCTION;
     write_buf[1] = AXP192_GPIO1_FUNCTION_PWM1_OUTPUT;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -539,25 +302,29 @@ static bool pmic_init(busio_i2c_obj_t *internal_i2c) {
     * disable VBUS and rely on ACIN (USB_5V) as power source.
     */
     write_buf[0] = AXP192_INPUT_POWER_STATE;
-    rc = common_hal_busio_i2c_write_read(internal_i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+    rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
     if (rc != 0) {
         return false;
     }
     uint8_t powersource = (read_buf[0] & AXP192_INPUT_POWER_STATE_VBUS_AVAILABLE) ?
         PMIC_POWER_SOURCE_M_BUS : PMIC_POWER_SOURCE_USB;
-    if (!pmic_set_power_source(powersource, internal_i2c)) {
+    if (!pmic_set_power_source(powersource, i2c)) {
         return false;
     }
 
-    if (!pmic_disable_all_irq(internal_i2c)) {
+    if (!pmic_disable_all_irq(i2c)) {
         return false;
     }
 
-    if (!pmic_clear_all_irq(internal_i2c)) {
+    if (!pmic_clear_all_irq(i2c)) {
         return false;
     }
 
-    if (!pmic_enable_default_irq(internal_i2c)) {
+    if (!pmic_enable_power_key_press_irq(i2c)) {
+        return false;
+    }
+
+    if (!pmic_enable_low_battery_irq(i2c)) {
         return false;
     }
 
diff --git a/ports/espressif/boards/m5stack_core2/mpconfigboard.mk b/ports/espressif/boards/m5stack_core2/mpconfigboard.mk
index 28a098a195..74ed5bcb83 100644
--- a/ports/espressif/boards/m5stack_core2/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core2/mpconfigboard.mk
@@ -11,6 +11,8 @@ M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT = 1
 
 CFLAGS += -DM5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT=$(M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT)
 
+SRC_C += pmic/axp192/axp192.c
+
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
diff --git a/ports/espressif/boards/m5stack_stick_c/axp192.h b/ports/espressif/boards/m5stack_stick_c/axp192.h
deleted file mode 100755
index aa8f6367a7..0000000000
--- a/ports/espressif/boards/m5stack_stick_c/axp192.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2022 Stephen Oliver
- * Copyright (c) 2023 CDarius
- *
- * 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_AXP192_H
-#define MICROPY_AXP192_H
-
-#define AXP192_I2C_ADDRESS 0x34
-
-#define AXP192_EXTEN_DCDC2_CTRL 0x10
-#define AXP192_EXTEN_DCDC2_CTRL_EXTEN 0b00000100
-#define AXP192_EXTEN_DCDC2_CTRL_DCDC2 0b00000001
-
-#define AXP192_DCDC13_LDO23_CTRL 0x12
-#define AXP192_DCDC13_LDO23_CTRL_EXTEN 0b01000000
-#define AXP192_DCDC13_LDO23_CTRL_LDO3 0b00001000
-#define AXP192_DCDC13_LDO23_CTRL_LDO2 0b00000100
-#define AXP192_DCDC13_LDO23_CTRL_DCDC3 0b00000010
-#define AXP192_DCDC13_LDO23_CTRL_DCDC1 0b00000001
-
-#define AXP192_DCDC2_OUT_VOLTAGE 0x25
-
-#define AXP192_DCDC1_OUT_VOLTAGE 0x26
-#define AXP192_DCDC1_OUT_VOLTAGE_3_350V 0b01101010
-
-#define AXP192_DCDC3_OUT_VOLTAGE 0x27
-
-
-#define AXP192_LDO23_OUT_VOLTAGE 0x28
-#define AXP192_LDO23_OUT_VOLTAGE_LDO2_3_0V 0b11000000
-#define AXP192_LDO23_OUT_VOLTAGE_LDO2_2_8V 0b10100000
-#define AXP192_LDO23_OUT_VOLTAGE_LDO2_MASK 0b11110000
-#define AXP192_LDO23_OUT_VOLTAGE_LDO3_3_0V 0b00001100
-#define AXP192_LDO23_OUT_VOLTAGE_LDO3_2_8V 0b00001010
-#define AXP192_LDO23_OUT_VOLTAGE_LDO3_MASK 0b00001111
-
-#define AXP192_VBUS_IPSOUT 0x30
-#define AXP192_VBUS_IPSOUT_IGNORE_VBUSEN 0b10000000
-#define AXP192_VBUS_IPSOUT_VHOLD_LIMIT 0b01000000
-#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_4_4V 0b00100000
-#define AXP192_VBUS_IPSOUT_VHOLD_VOLTAGE_MASK 0b00111000
-#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT 0b00000010
-#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_500mA 0b00000001
-#define AXP192_VBUS_IPSOUT_VBUS_LIMIT_CURRENT_100mA 0b00000000
-
-#define AXP192_POWER_OFF_VOLTAGE 0x31
-#define AXP192_POWER_OFF_VOLTAGE_2_6V 0b0000
-#define AXP192_POWER_OFF_VOLTAGE_2_7V 0b0001
-#define AXP192_POWER_OFF_VOLTAGE_2_8V 0b0010
-#define AXP192_POWER_OFF_VOLTAGE_2_9V 0b0011
-#define AXP192_POWER_OFF_VOLTAGE_3_0V 0b0100
-#define AXP192_POWER_OFF_VOLTAGE_3_1V 0b0101
-#define AXP192_POWER_OFF_VOLTAGE_3_2V 0b0110
-#define AXP192_POWER_OFF_VOLTAGE_3_3V 0b0111
-#define AXP192_POWER_OFF_VOLTAGE_MASK 0b0111
-
-#define AXP192_POWER_OFF_BATT_CHGLED_CTRL 0x32
-#define AXP192_POWER_OFF_BATT_CHGLED_CTRL_OFF 0b10000000
-
-#define AXP192_CHARGING_CTRL1 0x33
-#define AXP192_CHARGING_CTRL1_ENABLE 0b10000000
-#define AXP192_CHARGING_CTRL1_VOLTAGE_4_36V 0b01100000
-#define AXP192_CHARGING_CTRL1_VOLTAGE_4_20V 0b01000000
-#define AXP192_CHARGING_CTRL1_VOLTAGE_4_15V 0b00100000
-#define AXP192_CHARGING_CTRL1_VOLTAGE_4_10V 0b00000000
-#define AXP192_CHARGING_CTRL1_VOLTAGE_MASK 0b01100000
-#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_15PERC 0b00010000
-#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_10PERC 0b00000000
-#define AXP192_CHARGING_CTRL1_CHARGING_THRESH_MASK 0b00010000
-#define AXP192_CHARGING_CTRL1_CURRENT_100mA 0b00000000
-#define AXP192_CHARGING_CTRL1_CURRENT_190mA 0b00000001
-#define AXP192_CHARGING_CTRL1_CURRENT_280mA 0b00000010
-#define AXP192_CHARGING_CTRL1_CURRENT_360mA 0b00000011
-#define AXP192_CHARGING_CTRL1_CURRENT_450mA 0b00000100
-#define AXP192_CHARGING_CTRL1_CURRENT_550mA 0b00000101
-#define AXP192_CHARGING_CTRL1_CURRENT_630mA 0b00000110
-#define AXP192_CHARGING_CTRL1_CURRENT_700mA 0b00000111
-#define AXP192_CHARGING_CTRL1_CURRENT_780mA 0b00001000
-#define AXP192_CHARGING_CTRL1_CURRENT_880mA 0b00001001
-#define AXP192_CHARGING_CTRL1_CURRENT_960mA 0b00001010
-#define AXP192_CHARGING_CTRL1_CURRENT_1000mA 0b00001011
-
-#define AXP192_CHARGING_CTRL1_CURRENT_MASK 0b00001111
-
-#define AXP192_CHARGING_CTRL2 0x34
-
-#define AXP192_BACKUP_BATT 0x35
-#define AXP192_BACKUP_BATT_CHARGING_ENABLE 0b10000000
-#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_2_5V 0b01100000
-#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V 0b00100000
-#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_1V 0b00000000
-#define AXP192_BACKUP_BATT_CHARGING_VOLTAGE_MASK 0b01100000
-#define AXP192_BACKUP_BATT_CHARGING_CURRENT_400uA 0b00000011
-#define AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA 0b00000010
-#define AXP192_BACKUP_BATT_CHARGING_CURRENT_100uA 0b00000001
-#define AXP192_BACKUP_BATT_CHARGING_CURRENT_50uA 0b00000000
-#define AXP192_BACKUP_BATT_CHARGING_CURRENT_MASK 0b00000011
-
-#define AXP192_PEK 0x36
-#define AXP192_PEK_SHORT_PRESS_1S 0b11000000
-#define AXP192_PEK_SHORT_PRESS_512mS 0b10000000
-#define AXP192_PEK_SHORT_PRESS_256mS 0b01000000
-#define AXP192_PEK_SHORT_PRESS_128mS 0b00000000
-#define AXP192_PEK_SHORT_PRESS_MASK 0b11000000
-#define AXP192_PEK_LONG_PRESS_2_5S 0b00110000
-#define AXP192_PEK_LONG_PRESS_2_0S 0b00100000
-#define AXP192_PEK_LONG_PRESS_1_5S 0b00010000
-#define AXP192_PEK_LONG_PRESS_1_0S 0b00000000
-#define AXP192_PEK_LONG_PRESS_MASK 0b00110000
-#define AXP192_PEK_LONG_PRESS_POWER_OFF 0b00001000
-#define AXP192_PEK_PWROK_DELAY_64mS 0b00000100
-#define AXP192_PEK_PWROK_DELAY_32mS 0b00000000
-#define AXP192_PEK_PWROK_DELAY_MASK 0b00000100
-#define AXP192_PEK_POWER_OFF_TIME_12S 0b00000011
-#define AXP192_PEK_POWER_OFF_TIME_8S 0b00000010
-#define AXP192_PEK_POWER_OFF_TIME_6S 0b00000001
-#define AXP192_PEK_POWER_OFF_TIME_4S 0b00000000
-#define AXP192_PEK_POWER_OFF_TIME_MASK 0b00000011
-
-#define AXP192_BATT_TEMP_LOW_THRESH 0x38
-#define AXP192_BATT_TEMP_HIGH_THRESH 0x39
-#define AXP192_BATT_TEMP_HIGH_THRESH_DEFAULT 0b11111100
-
-#define AXP192_APS_LOW_BATT_LEVEL_1 0x3A
-#define AXP192_APS_LOW_BATT_LEVEL_2 0x3B
-#define AXP192_APS_LOW_BATT_VOLTAGE_3_695V 0b10010100
-#define AXP192_APS_LOW_BATT_VOLTAGE_3_600V 0b10000011
-
-#define AXP192_IRQ_1_ENABLE 0x40
-#define AXP192_IRQ_2_ENABLE 0x41
-#define AXP192_IRQ_3_ENABLE 0x42
-#define AXP192_IRQ_3_PEK_SHORT_PRESS 0b00000010
-#define AXP192_IRQ_3_PEK_LONG_PRESS  0b00000001
-#define AXP192_IRQ_4_ENABLE 0x43
-#define AXP192_IRQ_4_LOW_VOLTAGE_WARNING 0b00000001
-#define AXP192_IRQ_5_ENABLE 0x4a
-
-#define AXP192_IRQ_X_DISABLE_ALL     0b00000000
-
-#define AXP192_IRQ_1_STATUS 0x44
-#define AXP192_IRQ_2_STATUS 0x45
-#define AXP192_IRQ_3_STATUS 0x46
-#define AXP192_IRQ_4_STATUS 0x47
-#define AXP192_IRQ_5_STATUS 0x4d
-
-#define AXP192_ADC_ACIN_VOLTAGE_H 0x56
-#define AXP192_ADC_ACIN_VOLTAGE_L 0x57
-#define AXP192_ADC_ACIN_CURRENT_H 0x58
-#define AXP192_ADC_ACIN_CURRENT_L 0x59
-#define AXP192_ADC_VBUS_VOLTAGE_H 0x5a
-#define AXP192_ADC_VBUS_VOLTAGE_L 0x5b
-#define AXP192_ADC_VBUS_CURRENT_H 0x5c
-#define AXP192_ADC_VBUS_CURRENT_L 0x5d
-#define AXP192_ADC_INTERNAL_TEMP_H 0x5e
-#define AXP192_ADC_INTERNAL_TEMP_L 0x5f
-
-#define AXP192_ADC_BATT_VOLTAGE_H 0x78
-#define AXP192_ADC_BATT_VOLTAGE_L 0x79
-
-#define AXP192_ADC_BATT_POWER_H 0x70
-#define AXP192_ADC_BATT_POWER_M 0x71
-#define AXP192_ADC_BATT_POWER_L 0x72
-
-#define AXP192_ADC_BATT_CHARGE_CURRENT_H 0x7a
-#define AXP192_ADC_BATT_CHARGE_CURRENT_L 0x7b
-#define AXP192_ADC_BATT_DISCHARGE_CURRENT_H 0x7c
-#define AXP192_ADC_BATT_DISCHARGE_CURRENT_L 0x7d
-#define AXP192_ADC_APS_VOLTAGE_H 0x7e
-#define AXP192_ADC_APS_VOLTAGE_L 0x7f
-
-#define AXP192_ADC_ENABLE_1 0x82
-#define AXP192_ADC_ENABLE_1_BATT_VOL 0b10000000
-#define AXP192_ADC_ENABLE_1_BATT_CUR 0b01000000
-#define AXP192_ADC_ENABLE_1_ACIN_VOL 0b00100000
-#define AXP192_ADC_ENABLE_1_ACIN_CUR 0b00010000
-#define AXP192_ADC_ENABLE_1_VBUS_VOL 0b00001000
-#define AXP192_ADC_ENABLE_1_VBUS_CUR 0b00000100
-#define AXP192_ADC_ENABLE_1_APS_VOL 0b00000010
-#define AXP192_ADC_ENABLE_1_TS_PIN 0b00000001
-
-#define AXP192_ADC_ENABLE_2 0x83
-#define AXP192_ADC_ENABLE_2_TEMP_MON 0b10000000
-#define AXP192_ADC_ENABLE_2_GPIO0 0b00001000
-#define AXP192_ADC_ENABLE_2_GPIO1 0b00000100
-#define AXP192_ADC_ENABLE_2_GPIO2 0b00000010
-#define AXP192_ADC_ENABLE_2_GPIO3 0b00000001
-
-#define AXP192_ADC_TS 0x84
-#define AXP192_ADC_TS_SAMPLE_200HZ 0b11000000
-#define AXP192_ADC_TS_SAMPLE_100HZ 0b10000000
-#define AXP192_ADC_TS_SAMPLE_50HZ 0b01000000
-#define AXP192_ADC_TS_SAMPLE_25HZ 0b00000000
-#define AXP192_ADC_TS_SAMPLE_MASK 0b11000000
-#define AXP192_ADC_TS_OUT_CUR_80uA 0b00110000
-#define AXP192_ADC_TS_OUT_CUR_60uA 0b00100000
-#define AXP192_ADC_TS_OUT_CUR_40uA 0b00010000
-#define AXP192_ADC_TS_OUT_CUR_20uA 0b00000000
-#define AXP192_ADC_TS_OUT_CUR_MASK 0b00110000
-#define AXP192_ADC_TS_PIN_TEMP_MON 0b00000000
-#define AXP192_ADC_TS_PIN_EXTERN_ADC 0b00000100
-#define AXP192_ADC_TS_PIN_OUT_ALWAYS 0b00000011
-#define AXP192_ADC_TS_PIN_OUT_SAVE_ENG 0b00000010
-#define AXP192_ADC_TS_PIN_OUT_CHG 0b00000001
-#define AXP192_ADC_TS_PIN_OUT_DIS 0b00000000
-#define AXP192_ADC_TS_PIN_OUT_MASK 0b00000011
-
-#define AXP192_GPIO0_FUNCTION 0x90
-#define AXP192_GPIO0_FUNCTION_FLOATING 0b00000111
-#define AXP192_GPIO0_FUNCTION_LOW_OUTPUT 0b00000101
-#define AXP192_GPIO0_FUNCTION_ADC_INPUT 0b00000100
-#define AXP192_GPIO0_FUNCTION_LDO_OUTPUT 0b00000010
-#define AXP192_GPIO0_FUNCTION_GENERAL_INPUT 0b00000001
-#define AXP192_GPIO0_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
-
-#define AXP192_GPIO0_LDO_VOLTAGE 0x91
-#define AXP192_GPIO0_LDO_VOLTAGE_3_3V 0b11110000
-#define AXP192_GPIO0_LDO_VOLTAGE_2_8V 0b10100000
-#define AXP192_GPIO0_LDO_VOLTAGE_1_8V 0b00000000
-
-
-#define AXP192_GPIO1_FUNCTION 0x92
-#define AXP192_GPIO1_FUNCTION_FLOATING 0b00000111
-#define AXP192_GPIO1_FUNCTION_LOW_OUTPUT 0b00000101
-#define AXP192_GPIO1_FUNCTION_ADC_INPUT 0b00000100
-#define AXP192_GPIO1_FUNCTION_PWM1_OUTPUT 0b00000010
-#define AXP192_GPIO1_FUNCTION_GENERAL_INPUT 0b00000001
-#define AXP192_GPIO1_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
-
-
-#define AXP192_GPIO2_FUNCTION 0x93
-#define AXP192_GPIO2_FUNCTION_FLOATING 0b00000111
-#define AXP192_GPIO2_FUNCTION_LOW_OUTPUT 0b00000101
-#define AXP192_GPIO2_FUNCTION_ADC_INPUT 0b00000100
-#define AXP192_GPIO1_FUNCTION_PWM2_OUTPUT 0b00000010
-#define AXP192_GPIO2_FUNCTION_GENERAL_INPUT 0b00000001
-#define AXP192_GPIO2_FUNCTION_OPEN_DRAIN_OUTPUT 0b00000000
-
-#define AXP192_PWM1_DUTY_RATIO 0x9A
-
-#endif
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index 2f993d4a05..d25663895c 100755
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -29,12 +29,15 @@
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/displayio/FourWire.h"
-#include "shared-bindings/microcontroller/Pin.h"
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/board/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
+#include "common-hal/microcontroller/Pin.h"
 
-#include "axp192.h"
+#include "../../pmic/axp192/axp192.h"
 
 // display init sequence according to adafruit_st7735r.py library
 uint8_t display_init_sequence[] = {
@@ -59,12 +62,13 @@ uint8_t display_init_sequence[] = {
     0x29,0x80,0x64              // _DISPON
 };
 
-static bool pmic_init(void) {
+static bool pmic_init(busio_i2c_obj_t *i2c) {
     int rc;
-    // uint8_t read_buf[1];
     uint8_t write_buf[2];
 
-    busio_i2c_obj_t *internal_i2c = common_hal_board_create_i2c(0);
+    if (!pmic_common_init(i2c)) {
+        return false;
+    }
 
     // Reg: 30h
     // The VBUS-IPSOUT path can be selected to be opened regardless of the status of N_VBUSEN
@@ -72,16 +76,7 @@ static bool pmic_init(void) {
     // VBUS current limit control disabled
     write_buf[0] = AXP192_VBUS_IPSOUT;
     write_buf[1] = AXP192_VBUS_IPSOUT_IGNORE_VBUSEN;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 31h
-    // VOFF Shutdown voltage setting ( 3.0V )
-    write_buf[0] = AXP192_POWER_OFF_VOLTAGE;
-    write_buf[1] = AXP192_POWER_OFF_VOLTAGE_3_0V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -95,88 +90,7 @@ static bool pmic_init(void) {
     write_buf[1] = AXP192_CHARGING_CTRL1_ENABLE |
         AXP192_CHARGING_CTRL1_VOLTAGE_4_20V |
         AXP192_CHARGING_CTRL1_CURRENT_100mA;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 35h
-    // Enable RTC battery charge: 3.0V, 200uA
-    write_buf[0] = AXP192_BACKUP_BATT;
-    write_buf[1] = AXP192_BACKUP_BATT_CHARGING_ENABLE |
-        AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V |
-        AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 36h
-    // Power on:  Short press 128ms
-    // Power off: Long press 1s
-    // Power OK delay 64ms
-    // Power off delay 4s
-    write_buf[0] = AXP192_PEK;
-    write_buf[1] = AXP192_PEK_SHORT_PRESS_128mS |
-        AXP192_PEK_LONG_PRESS_1_0S |
-        AXP192_PEK_LONG_PRESS_POWER_OFF |
-        AXP192_PEK_PWROK_DELAY_64mS |
-        AXP192_PEK_POWER_OFF_TIME_4S;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 3Ah
-    // APS Low battery warning level 1: 3.695V
-    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_1;
-    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_695V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 3Bh
-    // APS Low battery warning level 2: 3.600V
-    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_2;
-    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_600V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 82h
-    // ADC all on
-    write_buf[0] = AXP192_ADC_ENABLE_1;
-    write_buf[1] = AXP192_ADC_ENABLE_1_BATT_VOL |
-        AXP192_ADC_ENABLE_1_BATT_CUR |
-        AXP192_ADC_ENABLE_1_ACIN_VOL |
-        AXP192_ADC_ENABLE_1_ACIN_CUR |
-        AXP192_ADC_ENABLE_1_VBUS_VOL |
-        AXP192_ADC_ENABLE_1_VBUS_CUR |
-        AXP192_ADC_ENABLE_1_APS_VOL |
-        AXP192_ADC_ENABLE_1_TS_PIN;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 83h
-    // ADC temperature on
-    write_buf[0] = AXP192_ADC_ENABLE_2;
-    write_buf[1] = AXP192_ADC_ENABLE_2_TEMP_MON;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 84h
-    // ADC 25Hz
-    write_buf[0] = AXP192_ADC_TS;
-    write_buf[1] = AXP192_ADC_TS_SAMPLE_25HZ |
-        AXP192_ADC_TS_OUT_CUR_80uA |
-        AXP192_ADC_TS_PIN_OUT_SAVE_ENG;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -185,7 +99,7 @@ static bool pmic_init(void) {
     // GPIO0(LDOio0) floating
     write_buf[0] = AXP192_GPIO0_FUNCTION;
     write_buf[1] = AXP192_GPIO0_FUNCTION_FLOATING;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -194,7 +108,7 @@ static bool pmic_init(void) {
     // GPIO0(LDOio0) 2.8V
     write_buf[0] = AXP192_GPIO0_LDO_VOLTAGE;
     write_buf[1] = AXP192_GPIO0_LDO_VOLTAGE_2_8V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -205,7 +119,7 @@ static bool pmic_init(void) {
     write_buf[0] = AXP192_LDO23_OUT_VOLTAGE;
     write_buf[1] = AXP192_LDO23_OUT_VOLTAGE_LDO2_2_8V |
         AXP192_LDO23_OUT_VOLTAGE_LDO3_3_0V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -217,7 +131,7 @@ static bool pmic_init(void) {
         AXP192_DCDC13_LDO23_CTRL_LDO3 |
         AXP192_DCDC13_LDO23_CTRL_LDO2 |
         AXP192_DCDC13_LDO23_CTRL_DCDC1;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
@@ -226,56 +140,24 @@ static bool pmic_init(void) {
     // DCDC1 (ESP32 VDD): 3.350V
     write_buf[0] = AXP192_DCDC1_OUT_VOLTAGE;
     write_buf[1] = AXP192_DCDC1_OUT_VOLTAGE_3_350V;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
     if (rc != 0) {
         return false;
     }
 
-    // Reg: 40h
-    // IRQ enable control register 1
-    write_buf[0] = AXP192_IRQ_1_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
+    if (!pmic_disable_all_irq(i2c)) {
         return false;
     }
 
-    // Reg: 41h
-    // IRQ enable control register 2
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
+    if (!pmic_clear_all_irq(i2c)) {
         return false;
     }
 
-    // Reg: 42h
-    // IRQ enable control register 3
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_3_PEK_SHORT_PRESS |
-        AXP192_IRQ_3_PEK_LONG_PRESS;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
+    if (!pmic_enable_power_key_press_irq(i2c)) {
         return false;
     }
 
-    // Reg: 43h
-    // IRQ enable control register 4
-    // Enable power on key short and long press interrupt
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_4_LOW_VOLTAGE_WARNING;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
-        return false;
-    }
-
-    // Reg: 44h
-    // IRQ enable control register 5
-    write_buf[0] = AXP192_IRQ_2_ENABLE;
-    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
-    rc = common_hal_busio_i2c_write(internal_i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
-    if (rc != 0) {
+    if (!pmic_enable_low_battery_irq(i2c)) {
         return false;
     }
 
@@ -339,7 +221,9 @@ static bool display_init(void) {
 }
 
 void board_init(void) {
-    if (!pmic_init()) {
+    busio_i2c_obj_t *internal_i2c = common_hal_board_create_i2c(0);
+
+    if (!pmic_init(internal_i2c)) {
         mp_printf(&mp_plat_print, "could not initialize axp192 pmic\n");
         return;
     }
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
index 5910605915..ce4d23a303 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
@@ -7,3 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESPCAMERA = 0
+
+SRC_C += pmic/axp192/axp192.c
diff --git a/ports/espressif/pmic/axp192/axp192.c b/ports/espressif/pmic/axp192/axp192.c
new file mode 100644
index 0000000000..fe698a0416
--- /dev/null
+++ b/ports/espressif/pmic/axp192/axp192.c
@@ -0,0 +1,255 @@
+#include "axp192.h"
+
+bool pmic_common_init(busio_i2c_obj_t *i2c) {
+    int rc;
+    uint8_t write_buf[2];
+
+    // Reg: 31h
+    // VOFF Shutdown voltage setting ( 3.0V )
+    write_buf[0] = AXP192_POWER_OFF_VOLTAGE;
+    write_buf[1] = AXP192_POWER_OFF_VOLTAGE_3_0V;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 32h
+    // Enable battery monitoring
+    // N_OE shout down delay 2 seconds
+    write_buf[0] = AXP192_POWER_OFF_BATT_CHGLED_CTRL;
+    write_buf[1] = AXP192_POWER_OFF_BATT_CHGLED_CTRL_BATT_MONITOR_ON |
+        AXP192_POWER_OFF_BATT_CHGLED_CTRL_N_OE_SHUTDOWN_DELAY_2_0S;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 35h
+    // Enable RTC battery charge: 3.0V, 200uA
+    write_buf[0] = AXP192_BACKUP_BATT;
+    write_buf[1] = AXP192_BACKUP_BATT_CHARGING_ENABLE |
+        AXP192_BACKUP_BATT_CHARGING_VOLTAGE_3_0V |
+        AXP192_BACKUP_BATT_CHARGING_CURRENT_200uA;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 36h
+    // Power on:  Short press 128ms
+    // Power off: Long press 1s
+    // Power OK delay 64ms
+    // Power off delay 4s
+    write_buf[0] = AXP192_PEK;
+    write_buf[1] = AXP192_PEK_SHORT_PRESS_128mS |
+        AXP192_PEK_LONG_PRESS_1_0S |
+        AXP192_PEK_LONG_PRESS_POWER_OFF |
+        AXP192_PEK_PWROK_DELAY_64mS |
+        AXP192_PEK_POWER_OFF_TIME_4S;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 3Ah
+    // APS Low battery warning level 1: 3.695V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_1;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_695V;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 3Bh
+    // APS Low battery warning level 2: 3.600V
+    write_buf[0] = AXP192_APS_LOW_BATT_LEVEL_2;
+    write_buf[1] = AXP192_APS_LOW_BATT_VOLTAGE_3_600V;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 82h
+    // ADC all on
+    write_buf[0] = AXP192_ADC_ENABLE_1;
+    write_buf[1] = AXP192_ADC_ENABLE_1_BATT_VOL |
+        AXP192_ADC_ENABLE_1_BATT_CUR |
+        AXP192_ADC_ENABLE_1_ACIN_VOL |
+        AXP192_ADC_ENABLE_1_ACIN_CUR |
+        AXP192_ADC_ENABLE_1_VBUS_VOL |
+        AXP192_ADC_ENABLE_1_VBUS_CUR |
+        AXP192_ADC_ENABLE_1_APS_VOL |
+        AXP192_ADC_ENABLE_1_TS_PIN;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 83h
+    // ADC temperature on
+    write_buf[0] = AXP192_ADC_ENABLE_2;
+    write_buf[1] = AXP192_ADC_ENABLE_2_TEMP_MON;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 84h
+    // ADC 25Hz
+    write_buf[0] = AXP192_ADC_TS;
+    write_buf[1] = AXP192_ADC_TS_SAMPLE_25HZ |
+        AXP192_ADC_TS_OUT_CUR_80uA |
+        AXP192_ADC_TS_PIN_TEMP_MON |
+        AXP192_ADC_TS_PIN_OUT_SAVE_ENG;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool pmic_disable_all_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    uint8_t write_buf[2];
+
+    // Reg: 40h
+    // IRQ enable control register 1
+    write_buf[0] = AXP192_IRQ_1_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 41h
+    // IRQ enable control register 2
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 42h
+    // IRQ enable control register 3
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_3_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 43h
+    // IRQ enable control register 4
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_4_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 4Ah
+    // IRQ enable control register 5
+    write_buf[0] = AXP192_IRQ_5_ENABLE;
+    write_buf[1] = AXP192_IRQ_X_DISABLE_ALL;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool pmic_clear_all_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    uint8_t write_buf[2];
+
+    // Reg: 44h
+    // IRQ enable control register 1
+    write_buf[0] = AXP192_IRQ_1_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 45h
+    // IRQ enable control register 2
+    write_buf[0] = AXP192_IRQ_2_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 46h
+    // IRQ enable control register 3
+    write_buf[0] = AXP192_IRQ_3_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 47h
+    // IRQ enable control register 4
+    write_buf[0] = AXP192_IRQ_4_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    // Reg: 4Ah
+    // IRQ enable control register 5
+    write_buf[0] = AXP192_IRQ_5_STATUS;
+    write_buf[1] = AXP192_IRQ_X_CLEAR_STATUS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool pmic_enable_power_key_press_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    uint8_t read_buf[1];
+    uint8_t write_buf[2];
+
+    // Reg: 42h
+    // IRQ enable control register 3
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
+    if (rc != 0) {
+        return false;
+    }
+    write_buf[1] = read_buf[0] | AXP192_IRQ_3_PEK_SHORT_PRESS | AXP192_IRQ_3_PEK_LONG_PRESS;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool pmic_enable_low_battery_irq(busio_i2c_obj_t *i2c) {
+    int rc;
+    uint8_t write_buf[2];
+
+    // Reg: 43h
+    // IRQ enable control register 4
+    // Enable power on key short and long press interrupt
+    write_buf[0] = AXP192_IRQ_2_ENABLE;
+    write_buf[1] = AXP192_IRQ_4_LOW_VOLTAGE_WARNING;
+    rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
+    if (rc != 0) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/ports/espressif/boards/m5stack_core2/axp192.h b/ports/espressif/pmic/axp192/axp192.h
similarity index 97%
rename from ports/espressif/boards/m5stack_core2/axp192.h
rename to ports/espressif/pmic/axp192/axp192.h
index 45279ce56f..e05592ce70 100755
--- a/ports/espressif/boards/m5stack_core2/axp192.h
+++ b/ports/espressif/pmic/axp192/axp192.h
@@ -28,6 +28,8 @@
 #ifndef MICROPY_AXP192_H
 #define MICROPY_AXP192_H
 
+#include "shared-bindings/busio/I2C.h"
+
 #define AXP192_I2C_ADDRESS 0x34
 
 #define AXP192_INPUT_POWER_STATE 0x00
@@ -283,4 +285,10 @@
 #define AXP192_PWM1_DUTY_RATIO_Y1 0x99
 #define AXP192_PWM1_DUTY_RATIO_Y2 0x9A
 
+bool pmic_common_init(busio_i2c_obj_t *i2c);
+bool pmic_disable_all_irq(busio_i2c_obj_t *i2c);
+bool pmic_clear_all_irq(busio_i2c_obj_t *i2c);
+bool pmic_enable_power_key_press_irq(busio_i2c_obj_t *i2c);
+bool pmic_enable_low_battery_irq(busio_i2c_obj_t *i2c);
+
 #endif

From 32ffdcdc7c52f4698b79c71544698e2ba5212d89 Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Fri, 14 Apr 2023 08:02:56 +0000
Subject: [PATCH 2237/2403] Fix I2S pins

---
 ports/espressif/boards/m5stack_core2/pins.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/m5stack_core2/pins.c b/ports/espressif/boards/m5stack_core2/pins.c
index 465006a6b6..865ce61eaf 100644
--- a/ports/espressif/boards/m5stack_core2/pins.c
+++ b/ports/espressif/boards/m5stack_core2/pins.c
@@ -32,7 +32,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_A27), MP_ROM_PTR(&pin_GPIO27) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_DATA_SPK), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_A35), MP_ROM_PTR(&pin_GPIO35) },
@@ -63,14 +63,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_WS_SPK), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_CLOCK_MIC), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_LRC), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_MIC_CLOCK), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_DATA_MIC), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_PDM_MIC_DATA), MP_ROM_PTR(&pin_GPIO34) },
     { MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
     { MP_ROM_QSTR(MP_QSTR_A34), MP_ROM_PTR(&pin_GPIO34) },
 
+    { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO12) },
+
     // tft
     { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO15) },

From 681eb66824ce7224f0abf804ad361abe0e240794 Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Fri, 14 Apr 2023 13:02:51 +0000
Subject: [PATCH 2238/2403] Fixed DCDC2 output voltage register

---
 ports/espressif/pmic/axp192/axp192.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/pmic/axp192/axp192.h b/ports/espressif/pmic/axp192/axp192.h
index e05592ce70..65eb712b1a 100755
--- a/ports/espressif/pmic/axp192/axp192.h
+++ b/ports/espressif/pmic/axp192/axp192.h
@@ -53,7 +53,7 @@
 #define AXP192_DCDC13_LDO23_CTRL_DCDC3 0b00000010
 #define AXP192_DCDC13_LDO23_CTRL_DCDC1 0b00000001
 
-#define AXP192_DCDC2_OUT_VOLTAGE 0x25
+#define AXP192_DCDC2_OUT_VOLTAGE 0x23
 
 #define AXP192_DCDC1_OUT_VOLTAGE 0x26
 #define AXP192_DCDC1_OUT_VOLTAGE_3_350V 0b01101010

From d765efd71ca554fd3976217a99a2d6016e950359 Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Fri, 14 Apr 2023 13:08:52 +0000
Subject: [PATCH 2239/2403] Moved EXTEN and DCDC2 on register 0x12

---
 ports/espressif/boards/m5stack_core2/board.c | 8 ++++----
 ports/espressif/pmic/axp192/axp192.h         | 9 +++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ports/espressif/boards/m5stack_core2/board.c b/ports/espressif/boards/m5stack_core2/board.c
index ea0d0a1a7d..a2565229ce 100644
--- a/ports/espressif/boards/m5stack_core2/board.c
+++ b/ports/espressif/boards/m5stack_core2/board.c
@@ -99,12 +99,12 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *i2c) {
 
             #if M5STACK_CORE2_5V_OUTPUT_ENABLE_DEFAULT
             // Set EXTENT output high to enable 5V power boost
-            write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
+            write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
             rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
-            write_buf[1] = read_buf[0] | AXP192_EXTEN_DCDC2_CTRL_EXTEN;
+            write_buf[1] = read_buf[0] | AXP192_DCDC13_LDO23_CTRL_EXTEN;
             rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
@@ -139,12 +139,12 @@ static bool pmic_set_power_source(uint8_t source, busio_i2c_obj_t *i2c) {
             }
 
             // Set EXTENT output low to disable 5V power boost
-            write_buf[0] = AXP192_EXTEN_DCDC2_CTRL;
+            write_buf[0] = AXP192_DCDC13_LDO23_CTRL;
             rc = common_hal_busio_i2c_write_read(i2c, AXP192_I2C_ADDRESS, write_buf, 1, read_buf, sizeof(read_buf));
             if (rc != 0) {
                 return false;
             }
-            write_buf[1] = read_buf[0] & ~AXP192_EXTEN_DCDC2_CTRL_EXTEN;
+            write_buf[1] = read_buf[0] & ~AXP192_DCDC13_LDO23_CTRL_EXTEN;
             rc = common_hal_busio_i2c_write(i2c, AXP192_I2C_ADDRESS, write_buf, sizeof(write_buf));
             if (rc != 0) {
                 return false;
diff --git a/ports/espressif/pmic/axp192/axp192.h b/ports/espressif/pmic/axp192/axp192.h
index 65eb712b1a..587ce04b0c 100755
--- a/ports/espressif/pmic/axp192/axp192.h
+++ b/ports/espressif/pmic/axp192/axp192.h
@@ -42,14 +42,11 @@
 #define AXP192_INPUT_POWER_STATE_ACIN_VBUS_PCB_SHORTED  0b00000010
 #define AXP192_INPUT_POWER_STATE_BOOT_SOURCE_ACIN_OR_VBUS  0b00000001
 
-#define AXP192_EXTEN_DCDC2_CTRL 0x10
-#define AXP192_EXTEN_DCDC2_CTRL_EXTEN 0b00000100
-#define AXP192_EXTEN_DCDC2_CTRL_DCDC2 0b00000001
-
 #define AXP192_DCDC13_LDO23_CTRL 0x12
 #define AXP192_DCDC13_LDO23_CTRL_EXTEN 0b01000000
-#define AXP192_DCDC13_LDO23_CTRL_LDO3 0b00001000
-#define AXP192_DCDC13_LDO23_CTRL_LDO2 0b00000100
+#define AXP192_DCDC13_LDO23_CTRL_DCDC2 0b00010000
+#define AXP192_DCDC13_LDO23_CTRL_LDO3  0b00001000
+#define AXP192_DCDC13_LDO23_CTRL_LDO2  0b00000100
 #define AXP192_DCDC13_LDO23_CTRL_DCDC3 0b00000010
 #define AXP192_DCDC13_LDO23_CTRL_DCDC1 0b00000001
 

From 5828a9852f22d94cb95460254caa437016ccb060 Mon Sep 17 00:00:00 2001
From: Andi Chandler 
Date: Fri, 14 Apr 2023 10:51:56 +0000
Subject: [PATCH 2240/2403] Translated using Weblate (English (United Kingdom))

Currently translated at 86.4% (864 of 1000 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/en_GB/
---
 locale/en_GB.po | 124 ++++++++++++++++++++++++++----------------------
 1 file changed, 66 insertions(+), 58 deletions(-)

diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8f45f3617a..8b0c8a4b0b 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-05-22 00:18+0000\n"
-"Last-Translator: Dan Halbert \n"
+"PO-Revision-Date: 2023-04-15 11:47+0000\n"
+"Last-Translator: Andi Chandler \n"
 "Language-Team: none\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "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.13-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
 
 #: main.c
 msgid ""
@@ -26,7 +26,6 @@ msgstr ""
 "Code done running.\n"
 
 #: main.c
-#, fuzzy
 msgid ""
 "\n"
 "Code stopped by auto-reload. Reloading soon.\n"
@@ -40,18 +39,25 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Please file an issue with your program at https://github.com/adafruit/"
+"circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "Press reset to exit safe mode.\n"
 msgstr ""
+"\n"
+"Press reset to exit safe mode.\n"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"You are in safe mode because:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -81,7 +87,7 @@ msgstr "%%c requires int or char"
 #: main.c
 #, c-format
 msgid "%02X"
-msgstr ""
+msgstr "%02X"
 
 #: shared-module/os/getenv.c
 #, c-format
@@ -106,7 +112,7 @@ msgstr ""
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
 msgid "%q"
-msgstr ""
+msgstr "%q"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
@@ -114,7 +120,7 @@ msgstr "%q and %q contain duplicate pins"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "%q and %q must be different"
-msgstr ""
+msgstr "%q and %q must be different"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"
@@ -126,7 +132,7 @@ msgstr "%q failure: %d"
 
 #: py/argcheck.c
 msgid "%q in %q must be of type %q, not %q"
-msgstr ""
+msgstr "%q in %q must be of type %q, not %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
@@ -142,19 +148,19 @@ msgstr "%q index out of range"
 
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
-msgstr ""
+msgstr "%q init failed"
 
 #: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q is %q"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "%q is read-only for this board"
-msgstr ""
+msgstr "%q is read-only for this board"
 
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
-msgstr ""
+msgstr "%q length must be %d"
 
 #: py/argcheck.c
 msgid "%q length must be %d-%d"
@@ -162,15 +168,15 @@ msgstr "%q length must be %d-%d"
 
 #: py/argcheck.c
 msgid "%q length must be <= %d"
-msgstr ""
+msgstr "%q length must be <= %d"
 
 #: py/argcheck.c
 msgid "%q length must be >= %d"
-msgstr ""
+msgstr "%q length must be >= %d"
 
 #: py/argcheck.c
 msgid "%q must be %d"
-msgstr ""
+msgstr "%q must be %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
@@ -178,11 +184,11 @@ msgstr "%q must be %d-%d"
 
 #: shared-bindings/displayio/Display.c
 msgid "%q must be 1 when %q is True"
-msgstr ""
+msgstr "%q must be 1 when %q is True"
 
 #: py/argcheck.c shared-bindings/gifio/GifWriter.c
 msgid "%q must be <= %d"
-msgstr ""
+msgstr "%q must be <= %d"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
@@ -190,28 +196,28 @@ msgstr "%q must be >= %d"
 
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
-msgstr ""
+msgstr "%q must be a bytearray or array of type 'H' or 'B'"
 
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 msgid "%q must be array of type 'H'"
-msgstr ""
+msgstr "%q must be array of type 'H'"
 
 #: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
 msgid "%q must be array of type 'h'"
-msgstr ""
+msgstr "%q must be array of type 'h'"
 
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
 msgid "%q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q must be of type %q or %q, not %q"
 
 #: py/argcheck.c py/obj.c py/objstrunicode.c
 msgid "%q must be of type %q, not %q"
-msgstr ""
+msgstr "%q must be of type %q, not %q"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "%q must be power of 2"
@@ -219,7 +225,7 @@ msgstr "%q must be power of 2"
 
 #: shared-bindings/wifi/Monitor.c
 msgid "%q out of bounds"
-msgstr ""
+msgstr "%q out of bounds"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
@@ -232,7 +238,7 @@ msgstr "%q out of range"
 
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
-msgstr ""
+msgstr "%q step cannot be zero"
 
 #: py/bc.c py/objnamedtuple.c
 msgid "%q() takes %d positional arguments but %d were given"
@@ -244,7 +250,7 @@ msgstr "%q, %q, and %q must all be the same length"
 
 #: py/objint.c shared-bindings/storage/__init__.c
 msgid "%q=%q"
-msgstr ""
+msgstr "%q=%q"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 #, c-format
@@ -429,7 +435,7 @@ msgstr "Address must be %d bytes long"
 
 #: ports/espressif/common-hal/memorymap/AddressRange.c
 msgid "Address range not allowed"
-msgstr ""
+msgstr "Address range not allowed"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "All CAN peripherals are in use"
@@ -525,7 +531,7 @@ msgstr "Already scanning for WiFi networks"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "An error occurred while retrieving '%s':\n"
-msgstr ""
+msgstr "An error occurred while retrieving '%s':\n"
 
 #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Another PWMAudioOut is already active"
@@ -597,11 +603,11 @@ msgstr "Bit depth must be multiple of 8."
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Bitmap size and bits per value must match"
-msgstr ""
+msgstr "Bitmap size and bits per value must match"
 
 #: supervisor/shared/safe_mode.c
 msgid "Boot device must be first (interface #0)."
-msgstr ""
+msgstr "Boot device must be first (interface #0)."
 
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
@@ -662,7 +668,7 @@ msgstr "Buffer too short by %d bytes"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "Buffers must be same size"
-msgstr ""
+msgstr "Buffers must be same size"
 
 #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
@@ -682,7 +688,7 @@ msgstr "CBC blocks must be multiples of 16 bytes"
 
 #: supervisor/shared/safe_mode.c
 msgid "CIRCUITPY drive could not be found or created."
-msgstr ""
+msgstr "CIRCUITPY drive could not be found or created."
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "CRC or checksum was invalid"
@@ -694,7 +700,7 @@ msgstr "Call super().__init__() before accessing native object."
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Camera init"
-msgstr ""
+msgstr "Camera init"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Can only alarm on RTC IO from deep sleep."
@@ -759,7 +765,7 @@ msgstr "Cannot remount '/' when visible via USB."
 #: ports/cxd56/common-hal/microcontroller/__init__.c
 #: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
 msgid "Cannot reset into bootloader because no bootloader is present"
-msgstr ""
+msgstr "Cannot reset into bootloader because no bootloader is present"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 msgid "Cannot set socket options"
@@ -780,7 +786,7 @@ msgstr "Cannot subclass slice"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Cannot transfer without MOSI and MISO pins"
-msgstr ""
+msgstr "Cannot transfer without MOSI and MISO pins"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
@@ -788,7 +794,7 @@ msgstr "Cannot vary frequency on a timer that is already in use"
 
 #: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
-msgstr ""
+msgstr "Cannot wake on pin edge, only level"
 
 #: ports/espressif/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
@@ -820,11 +826,11 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays have different lengths"
-msgstr ""
+msgstr "Coordinate arrays have different lengths"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Coordinate arrays types have different sizes"
-msgstr ""
+msgstr "Coordinate arrays types have different sizes"
 
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
@@ -906,7 +912,7 @@ msgstr "Display rotation must be in 90 degree increments"
 
 #: main.c
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Drive mode not used when direction is input."
@@ -914,7 +920,7 @@ msgstr "Drive mode not used when direction is input."
 
 #: py/obj.c
 msgid "During handling of the above exception, another exception occurred:"
-msgstr ""
+msgstr "During handling of the above exception, another exception occurred:"
 
 #: shared-bindings/aesio/aes.c
 msgid "ECB only operates on 16 bytes at a time"
@@ -943,7 +949,7 @@ msgstr "Error in regex"
 
 #: supervisor/shared/safe_mode.c
 msgid "Error in safemode.py."
-msgstr ""
+msgstr "Error in safemode.py."
 
 #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
 msgid "Error: Failure to bind"
@@ -951,7 +957,7 @@ msgstr "Error: Failure to bind"
 
 #: shared-bindings/alarm/__init__.c
 msgid "Expected a kind of %q"
-msgstr ""
+msgstr "Expected a kind of %q"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
@@ -981,7 +987,7 @@ msgstr "Failed to acquire mutex, err 0x%04x"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
-msgstr ""
+msgstr "Failed to allocate %q buffer"
 
 #: ports/espressif/common-hal/wifi/__init__.c
 msgid "Failed to allocate Wifi memory"
@@ -1019,7 +1025,7 @@ msgstr "Failed to write internal flash."
 
 #: supervisor/shared/safe_mode.c
 msgid "Fault detected by hardware."
-msgstr ""
+msgstr "Fault detected by hardware."
 
 #: py/moduerrno.c
 msgid "File exists"
@@ -1027,7 +1033,7 @@ msgstr "File exists"
 
 #: shared-module/os/getenv.c
 msgid "File not found"
-msgstr ""
+msgstr "File not found"
 
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/espressif/common-hal/canio/Listener.c
@@ -1037,23 +1043,23 @@ msgstr "Filters too complex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Firmware is duplicate"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Firmware is invalid"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Firmware is too big"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
-msgstr ""
+msgstr "For L8 colourspace, input bitmap must have 8 bits per pixel"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
-msgstr ""
+msgstr "For RGB colourspaces, input bitmap must have 16 bits per pixel"
 
 #: ports/cxd56/common-hal/camera/Camera.c
 msgid "Format not supported"
@@ -1063,6 +1069,7 @@ msgstr "Format not supported"
 msgid ""
 "Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 msgstr ""
+"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
@@ -1075,7 +1082,7 @@ msgstr "Function requires lock"
 
 #: ports/cxd56/common-hal/gnss/GNSS.c
 msgid "GNSS init"
-msgstr ""
+msgstr "GNSS init"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "Generic Failure"
@@ -1094,7 +1101,7 @@ msgstr "Group already used"
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "Half duplex SPI is not implemented"
-msgstr ""
+msgstr "Half duplex SPI is not implemented"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
 #: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
@@ -1108,12 +1115,13 @@ msgstr "Hardware in use, try alternative pins"
 
 #: supervisor/shared/safe_mode.c
 msgid "Heap allocation when VM not running."
-msgstr ""
+msgstr "Heap allocation when VM not running."
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "Heap was corrupted because the stack was too small. Increase stack size."
 msgstr ""
+"Heap was corrupted because the stack was too small. Increase stack size."
 
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
@@ -1121,7 +1129,7 @@ msgstr "I/O operation on closed file"
 
 #: ports/stm/common-hal/busio/I2C.c
 msgid "I2C init error"
-msgstr ""
+msgstr "I2C init error"
 
 #: ports/raspberrypi/common-hal/busio/I2C.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1207,7 +1215,7 @@ msgstr "Insufficient encryption"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Interface must be started"
-msgstr ""
+msgstr "Interface must be started"
 
 #: ports/atmel-samd/audio_dma.c ports/raspberrypi/audio_dma.c
 msgid "Internal audio buffer too small"
@@ -1220,7 +1228,7 @@ msgstr "Internal define error"
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #: shared-module/os/getenv.c
 msgid "Internal error"
-msgstr ""
+msgstr "Internal error"
 
 #: shared-module/rgbmatrix/RGBMatrix.c
 #, c-format
@@ -1229,11 +1237,11 @@ msgstr "Internal error #%d"
 
 #: supervisor/shared/safe_mode.c
 msgid "Internal watchdog timer expired."
-msgstr ""
+msgstr "Internal watchdog timer expired."
 
 #: supervisor/shared/safe_mode.c
 msgid "Interrupt error."
-msgstr ""
+msgstr "Interrupt error."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c

From 8927e4118090c3c7f03ed43a7f6167955a84afff Mon Sep 17 00:00:00 2001
From: Debian 
Date: Sat, 15 Apr 2023 17:05:12 -0600
Subject: [PATCH 2241/2403] Reset stuck low detection

---
 shared-module/onewireio/OneWire.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared-module/onewireio/OneWire.c b/shared-module/onewireio/OneWire.c
index aeb4dcb00d..ff5caa2bac 100644
--- a/shared-module/onewireio/OneWire.c
+++ b/shared-module/onewireio/OneWire.c
@@ -59,8 +59,10 @@ bool common_hal_onewireio_onewire_reset(onewireio_onewire_obj_t *self) {
     common_hal_mcu_delay_us(70);
     bool value = common_hal_digitalio_digitalinout_get_value(&self->pin);
     common_hal_mcu_delay_us(410);
+    // test if bus returned high (idle) and not stck at low
+    bool idle = common_hal_digitalio_digitalinout_get_value(&self->pin);
     common_hal_mcu_enable_interrupts();
-    return value;
+    return value || !idle;
 }
 
 bool common_hal_onewireio_onewire_read_bit(onewireio_onewire_obj_t *self) {

From ec78a23a566c2942a4e555c414c3f1fdff961c33 Mon Sep 17 00:00:00 2001
From: Richard Ellis 
Date: Sat, 15 Apr 2023 22:54:57 -0400
Subject: [PATCH 2242/2403] Code changes to allow 64 character hex WiFi
 passwords to be used with wifi.radio.connect.

Fixes adafruit/circuitpython#7677.
---
 py/argcheck.c                | 13 +++++++++++++
 py/runtime.h                 |  1 +
 shared-bindings/wifi/Radio.c | 10 ++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index 465a82c97e..73f3ead269 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -268,6 +268,19 @@ mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {
     return an_int;
 }
 
+mp_int_t mp_arg_validate_valid_hex_password(mp_uint_t length, uint8_t *buf) {
+    unsigned int i=0;
+    while (i
Date: Sat, 15 Apr 2023 23:44:30 -0400
Subject: [PATCH 2243/2403] displayio arg validation tweaking

---
 shared-bindings/displayio/Bitmap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 12aee30b19..724c29eb0b 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -62,8 +62,8 @@
 //|         ...
 STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
-    uint32_t width = mp_arg_validate_int_range(mp_obj_get_int(all_args[0]), 1, 32767, MP_QSTR_width);
-    uint32_t height = mp_arg_validate_int_range(mp_obj_get_int(all_args[1]), 1, 32767, MP_QSTR_height);
+    uint32_t width = mp_arg_validate_int_range(mp_obj_get_int(all_args[0]), 0, 32767, MP_QSTR_width);
+    uint32_t height = mp_arg_validate_int_range(mp_obj_get_int(all_args[1]), 0, 32767, MP_QSTR_height);
     uint32_t value_count = mp_arg_validate_int_range(mp_obj_get_int(all_args[2]), 1, 65535, MP_QSTR_value_count);
     uint32_t bits = 1;
 
@@ -220,8 +220,8 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
     check_for_deinit(self);
 
     // Check x,y are within self (target) bitmap boundary
-    int16_t x = mp_arg_validate_int_range(args[ARG_x].u_int, 0, self->width - 1, MP_QSTR_x);
-    int16_t y = mp_arg_validate_int_range(args[ARG_y].u_int, 0, self->height - 1, MP_QSTR_y);
+    int16_t x = mp_arg_validate_int_range(args[ARG_x].u_int, 0, self->width, MP_QSTR_x);
+    int16_t y = mp_arg_validate_int_range(args[ARG_y].u_int, 0, self->height, MP_QSTR_y);
 
     displayio_bitmap_t *source = mp_arg_validate_type(args[ARG_source].u_obj, &displayio_bitmap_type, MP_QSTR_source_bitmap);
 
@@ -232,8 +232,8 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
     }
 
     // Check x1,y1,x2,y2 are within source bitmap boundary
-    int16_t x1 = mp_arg_validate_int_range(args[ARG_x1].u_int, 0, source->width - 1, MP_QSTR_x1);
-    int16_t y1 = mp_arg_validate_int_range(args[ARG_y1].u_int, 0, source->height - 1, MP_QSTR_y1);
+    int16_t x1 = mp_arg_validate_int_range(args[ARG_x1].u_int, 0, source->width, MP_QSTR_x1);
+    int16_t y1 = mp_arg_validate_int_range(args[ARG_y1].u_int, 0, source->height, MP_QSTR_y1);
     int16_t x2, y2;
     // if x2 or y2 is None, then set as the maximum size of the source bitmap
     if (args[ARG_x2].u_obj == mp_const_none) {

From bf548efd85821a329409fda1f0af36fc3d218be4 Mon Sep 17 00:00:00 2001
From: Andi Chandler 
Date: Sat, 15 Apr 2023 13:17:55 +0000
Subject: [PATCH 2244/2403] Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (1000 of 1000 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/en_GB/
---
 locale/en_GB.po | 277 +++++++++++++++++++++++++-----------------------
 1 file changed, 143 insertions(+), 134 deletions(-)

diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8b0c8a4b0b..8b7a1da9fc 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-04-15 11:47+0000\n"
+"PO-Revision-Date: 2023-04-16 13:51+0000\n"
 "Last-Translator: Andi Chandler \n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -1271,11 +1271,11 @@ msgstr "Invalid BSSID"
 
 #: main.c
 msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
-msgstr ""
+msgstr "Invalid CIRCUITPY_PYSTACK_SIZE\n"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
-msgstr ""
+msgstr "Invalid MAC address"
 
 #: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
 msgid "Invalid argument"
@@ -1288,7 +1288,7 @@ msgstr "Invalid bits per value"
 #: shared-module/os/getenv.c
 #, c-format
 msgid "Invalid byte %.*s"
-msgstr ""
+msgstr "Invalid byte %.*s"
 
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
@@ -1297,7 +1297,7 @@ msgstr "Invalid data_pins[%d]"
 
 #: shared-module/msgpack/__init__.c
 msgid "Invalid format"
-msgstr ""
+msgstr "Invalid format"
 
 #: shared-module/audiocore/WaveFile.c
 msgid "Invalid format chunk size"
@@ -1305,7 +1305,7 @@ msgstr "Invalid format chunk size"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
-msgstr ""
+msgstr "Invalid multicast MAC address"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "Invalid size"
@@ -1322,7 +1322,7 @@ msgstr "Invalid state"
 
 #: shared-module/os/getenv.c
 msgid "Invalid unicode escape"
-msgstr ""
+msgstr "Invalid unicode escape"
 
 #: shared-bindings/aesio/aes.c
 msgid "Key must be 16, 24, or 32 bytes long"
@@ -1330,11 +1330,11 @@ msgstr "Key must be 16, 24, or 32 bytes long"
 
 #: shared-module/os/getenv.c
 msgid "Key not found"
-msgstr ""
+msgstr "Key not found"
 
 #: shared-module/is31fl3741/FrameBuffer.c
 msgid "LED mappings must match display size"
-msgstr ""
+msgstr "LED mappings must match display size"
 
 #: py/compile.c
 msgid "LHS of keyword arg must be an id"
@@ -1342,11 +1342,11 @@ msgstr "LHS of keyword arg must be an id"
 
 #: shared-module/displayio/Group.c
 msgid "Layer already in a group"
-msgstr ""
+msgstr "Layer already in a group"
 
 #: shared-module/displayio/Group.c
 msgid "Layer must be a Group or TileGrid subclass"
-msgstr ""
+msgstr "Layer must be a Group or TileGrid subclass"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "MAC address was invalid"
@@ -1354,7 +1354,7 @@ msgstr "MAC address was invalid"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
-msgstr ""
+msgstr "Mapping must be a tuple"
 
 #: shared-module/displayio/Shape.c
 #, c-format
@@ -1368,11 +1368,11 @@ msgstr "Microphone startup delay must be in range 0.0 to 1.0"
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched data size"
-msgstr ""
+msgstr "Mismatched data size"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "Mismatched swap flag"
-msgstr ""
+msgstr "Mismatched swap flag"
 
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI Pin"
@@ -1380,7 +1380,7 @@ msgstr "Missing MISO or MOSI pin"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "Missing MISO or MOSI pin"
-msgstr ""
+msgstr "Missing MISO or MOSI pin"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #, c-format
@@ -1440,7 +1440,7 @@ msgstr "NVS Error"
 
 #: shared-bindings/socketpool/SocketPool.c
 msgid "Name or service not known"
-msgstr ""
+msgstr "Name or service not known"
 
 #: py/qstr.c
 msgid "Name too long"
@@ -1448,11 +1448,11 @@ msgstr "Name too long"
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "New bitmap must be same size as old bitmap"
-msgstr ""
+msgstr "New bitmap must be same size as old bitmap"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 msgid "Nimble out of memory"
-msgstr ""
+msgstr "Nimble out of memory"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 #: ports/nrf/common-hal/_bleio/Characteristic.c
@@ -1478,11 +1478,11 @@ msgstr "No DMA pacing timer found"
 #: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
 #, c-format
 msgid "No I2C device at address: 0x%x"
-msgstr ""
+msgstr "No I2C device at address: 0x%x"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "No IP"
-msgstr ""
+msgstr "No IP"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1491,7 +1491,7 @@ msgstr "No MISO pin"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MISO pin"
-msgstr ""
+msgstr "No MISO pin"
 
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -1500,7 +1500,7 @@ msgstr "No MOSI pin"
 
 #: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
 msgid "No MOSI pin"
-msgstr ""
+msgstr "No MOSI pin"
 
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c
@@ -1522,7 +1522,7 @@ msgstr "No available clocks"
 
 #: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
 msgid "No capture in progress"
-msgstr ""
+msgstr "No capture in progress"
 
 #: shared-bindings/_bleio/PacketBuffer.c
 msgid "No connection: length cannot be determined"
@@ -1577,7 +1577,7 @@ msgstr "No space left on device"
 
 #: py/moduerrno.c
 msgid "No such device"
-msgstr ""
+msgstr "No such device"
 
 #: py/moduerrno.c
 msgid "No such file/directory"
@@ -1609,7 +1609,7 @@ msgstr "Not playing"
 #: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
 #, c-format
 msgid "Number of data_pins must be 8 or 16, not %d"
-msgstr ""
+msgstr "Number of data_pins must be 8 or 16, not %d"
 
 #: shared-bindings/util.c
 msgid ""
@@ -1623,11 +1623,11 @@ msgstr "Odd parity is not supported"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Off"
-msgstr ""
+msgstr "Off"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -1674,22 +1674,22 @@ msgstr ""
 
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Only one %q can be set in deep sleep."
 
 #: ports/espressif/common-hal/espulp/ULPAlarm.c
 msgid "Only one %q can be set."
-msgstr ""
+msgstr "Only one %q can be set."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
 msgid "Only one address is allowed"
-msgstr ""
+msgstr "Only one address is allowed"
 
 #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set"
-msgstr ""
+msgstr "Only one alarm.time alarm can be set"
 
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1702,7 +1702,7 @@ msgstr "Only one colour can be transparent at a time"
 
 #: py/moduerrno.c
 msgid "Operation not permitted"
-msgstr ""
+msgstr "Operation not permitted"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "Operation or feature not supported"
@@ -1714,7 +1714,7 @@ msgstr "Operation timed out"
 
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Out of MDNS service slots"
-msgstr ""
+msgstr "Out of MDNS service slots"
 
 #: ports/espressif/common-hal/espidf/__init__.c
 msgid "Out of memory"
@@ -1745,7 +1745,7 @@ msgstr ""
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "PWM restart"
-msgstr ""
+msgstr "PWM restart"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "PWM slice already in use"
@@ -1805,7 +1805,7 @@ msgstr "Pins must be sequential"
 
 #: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Pins must be sequential GPIO pins"
-msgstr ""
+msgstr "Pins must be sequential GPIO pins"
 
 #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Pins must share PWM slice"
@@ -1845,7 +1845,7 @@ msgstr "Program size invalid"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 msgid "Program too long"
-msgstr ""
+msgstr "Program too long"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -1858,7 +1858,7 @@ msgstr "RAISE mode is not implemented"
 
 #: ports/raspberrypi/common-hal/countio/Counter.c
 msgid "RISE_AND_FALL not available on this chip"
-msgstr ""
+msgstr "RISE_AND_FALL not available on this chip"
 
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
@@ -1871,7 +1871,7 @@ msgstr "RNG init Error"
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
-msgstr ""
+msgstr "RS485"
 
 #: ports/espressif/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
@@ -1902,7 +1902,7 @@ msgstr "Received response was invalid"
 
 #: supervisor/shared/bluetooth/bluetooth.c
 msgid "Reconnecting"
-msgstr ""
+msgstr "Reconnecting"
 
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Refresh too soon"
@@ -1934,7 +1934,7 @@ msgstr "SD card CSD format not supported"
 
 #: ports/cxd56/common-hal/sdioio/SDCard.c
 msgid "SDCard init"
-msgstr ""
+msgstr "SDCard init"
 
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
@@ -1952,7 +1952,7 @@ msgstr "SPI configuration failed"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI init error"
-msgstr ""
+msgstr "SPI init error"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -1960,16 +1960,16 @@ msgstr "SPI peripheral in use"
 
 #: ports/stm/common-hal/busio/SPI.c
 msgid "SPI re-init"
-msgstr ""
+msgstr "SPI re-init"
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "Scale dimensions must divide by 3"
-msgstr ""
+msgstr "Scale dimensions must divide by 3"
 
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Scan already in progress. Stop with stop_scan."
-msgstr ""
+msgstr "Scan already in progress. Stop with stop_scan."
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2011,7 +2011,7 @@ msgstr "Source and destination buffers must be the same length"
 
 #: shared-bindings/paralleldisplay/ParallelBus.c
 msgid "Specify exactly one of data0 or data_pins"
-msgstr ""
+msgstr "Specify exactly one of data0 or data_pins"
 
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
@@ -2027,7 +2027,7 @@ msgstr "Stereo right must be on PWM channel B"
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Stopping AP is not supported."
-msgstr ""
+msgstr "Stopping AP is not supported."
 
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
@@ -2043,11 +2043,11 @@ msgstr "Temperature read timed out"
 
 #: supervisor/shared/safe_mode.c
 msgid "The `microcontroller` module was used to boot into safe mode."
-msgstr ""
+msgstr "The `microcontroller` module was used to boot into safe mode."
 
 #: py/obj.c
 msgid "The above exception was the direct cause of the following exception:"
-msgstr ""
+msgstr "The above exception was the direct cause of the following exception:"
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
@@ -2055,7 +2055,7 @@ msgstr "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 
 #: supervisor/shared/safe_mode.c
 msgid "The power dipped. Make sure you are providing enough power."
-msgstr ""
+msgstr "The power dipped. Make sure you are providing enough power."
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2075,17 +2075,19 @@ msgstr "The sample's signedness does not match the mixer's"
 
 #: supervisor/shared/safe_mode.c
 msgid "Third-party firmware fatal error."
-msgstr ""
+msgstr "Third-party firmware fatal error."
 
 #: shared-module/imagecapture/ParallelImageCapture.c
 msgid "This microcontroller does not support continuous capture."
-msgstr ""
+msgstr "This microcontroller does not support continuous capture."
 
 #: shared-module/paralleldisplay/ParallelBus.c
 msgid ""
 "This microcontroller only supports data0=, not data_pins=, because it "
 "requires contiguous pins."
 msgstr ""
+"This microcontroller only supports data0=, not data_pins=, because it "
+"requires contiguous pins."
 
 #: shared-bindings/displayio/TileGrid.c
 msgid "Tile height must exactly divide bitmap height"
@@ -2111,7 +2113,7 @@ msgstr "Timeout is too long: Maximum timeout length is %d seconds"
 
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
-msgstr ""
+msgstr "Too many channels in sample"
 
 #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
@@ -2146,28 +2148,28 @@ msgstr "Tuple or struct_time argument required"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART de-init"
-msgstr ""
+msgstr "UART de-init"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "UART init"
-msgstr ""
+msgstr "UART init"
 
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
-msgstr ""
+msgstr "UART peripheral in use"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART re-init"
-msgstr ""
+msgstr "UART re-init"
 
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
-msgstr ""
+msgstr "UART write"
 
 #: main.c
 msgid "UID:"
-msgstr ""
+msgstr "UID:"
 
 #: shared-module/usb_hid/Device.c
 msgid "USB busy"
@@ -2206,12 +2208,12 @@ msgstr "Unable to allocate buffers for signed conversion"
 
 #: supervisor/shared/safe_mode.c
 msgid "Unable to allocate the heap."
-msgstr ""
+msgstr "Unable to allocate the heap."
 
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Unable to configure ADC DMA controller, ErrorCode:%d"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "Unable to create lock"
@@ -2234,7 +2236,7 @@ msgstr "Unable to init parser"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Unable to initialise ADC DMA controller, ErrorCode:%d"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Unable to read color palette data"
@@ -2243,16 +2245,16 @@ msgstr "Unable to read colour palette data"
 #: ports/espressif/common-hal/analogbufio/BufferedIn.c
 #, c-format
 msgid "Unable to start ADC DMA controller, ErrorCode:%d"
-msgstr ""
+msgstr "Unable to start ADC DMA controller, ErrorCode:%d"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "Unable to start mDNS query"
-msgstr ""
+msgstr "Unable to start mDNS query"
 
 #: shared-bindings/memorymap/AddressRange.c
 msgid "Unable to write to address."
-msgstr ""
+msgstr "Unable to write to address."
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2274,17 +2276,17 @@ msgstr "Unhandled ESP TLS error %d %d %x %d"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown BLE error at %s:%d: %d"
-msgstr ""
+msgstr "Unknown BLE error at %s:%d: %d"
 
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown BLE error: %d"
-msgstr ""
+msgstr "Unknown BLE error: %d"
 
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
 msgid "Unknown error code %d"
-msgstr ""
+msgstr "Unknown error code %d"
 
 #: shared-bindings/wifi/Radio.c
 #, c-format
@@ -2309,7 +2311,7 @@ msgstr "Unknown security error: 0x%04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error at %s:%d: %d"
-msgstr ""
+msgstr "Unknown system firmware error at %s:%d: %d"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 #, c-format
@@ -2319,7 +2321,7 @@ msgstr "Unknown system firmware error: %04x"
 #: ports/espressif/common-hal/_bleio/__init__.c
 #, c-format
 msgid "Unknown system firmware error: %d"
-msgstr ""
+msgstr "Unknown system firmware error: %d"
 
 #: shared-bindings/adafruit_pixelbuf/PixelBuf.c
 #: shared-module/_pixelmap/PixelMap.c
@@ -2337,7 +2339,7 @@ msgstr ""
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Unsupported colorspace"
-msgstr ""
+msgstr "Unsupported colourspace"
 
 #: shared-module/displayio/display_core.c
 msgid "Unsupported display bus type"
@@ -2349,7 +2351,7 @@ msgstr "Unsupported format"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Unsupported hash algorithm"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2404,22 +2406,27 @@ msgid ""
 "\n"
 "To list built-in modules type `help(\"modules\")`.\n"
 msgstr ""
+"Welcome to Adafruit CircuitPython %s!\n"
+"\n"
+"Visit circuitpython.org for more information.\n"
+"\n"
+"To list built-in modules type `help(\"modules\")`.\n"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "Wi-Fi: "
-msgstr ""
+msgstr "Wi-Fi: "
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in access point mode."
-msgstr ""
+msgstr "Wifi is in access point mode."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is in station mode."
-msgstr ""
+msgstr "Wifi is in station mode."
 
 #: ports/raspberrypi/common-hal/wifi/Radio.c
 msgid "Wifi is not enabled"
-msgstr ""
+msgstr "Wifi is not enabled"
 
 #: main.c
 msgid "Woken up by alarm.\n"
@@ -2435,52 +2442,52 @@ msgstr "Writes not supported on Characteristic"
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
 #: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
 msgid "You pressed both buttons at start up."
-msgstr ""
+msgstr "You pressed both buttons at start up."
 
 #: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
 #: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
 #: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
 msgid "You pressed button A at start up."
-msgstr ""
+msgstr "You pressed button A at start up."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the BOOT button at start up"
-msgstr ""
+msgstr "You pressed the BOOT button at start up"
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
-msgstr ""
+msgstr "You pressed the GPIO0 button at start up."
 
 #: ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.h
 msgid "You pressed the Rec button at start up."
-msgstr ""
+msgstr "You pressed the Rec button at start up."
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "You pressed the SW38 button at start up."
-msgstr ""
+msgstr "You pressed the SW38 button at start up."
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
-msgstr ""
+msgstr "You pressed the VOLUME button at start up."
 
 #: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
 #: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
 msgid "You pressed the central button at start up."
-msgstr ""
+msgstr "You pressed the central button at start up."
 
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "You pressed the left button at start up."
-msgstr ""
+msgstr "You pressed the left button at start up."
 
 #: supervisor/shared/safe_mode.c
 msgid "You pressed the reset button during boot."
-msgstr ""
+msgstr "You pressed the reset button during boot."
 
 #: supervisor/shared/micropython.c
 msgid "[truncated due to length]"
-msgstr ""
+msgstr "[truncated due to length]"
 
 #: py/objtype.c
 msgid "__init__() should return None"
@@ -2549,11 +2556,11 @@ msgstr "array and index length must be equal"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "array has too many dimensions"
 
 #: extmod/ulab/code/ndarray.c
 msgid "array is too big"
-msgstr ""
+msgstr "array is too big"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
@@ -2610,7 +2617,7 @@ msgstr "binary op %q not implemented"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "bitmap sizes must match"
-msgstr ""
+msgstr "bitmap sizes must match"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
@@ -2668,7 +2675,7 @@ msgstr "Calibration is read only"
 #: shared-module/vectorio/Circle.c shared-module/vectorio/Polygon.c
 #: shared-module/vectorio/Rectangle.c
 msgid "can only have one parent"
-msgstr ""
+msgstr "can only have one parent"
 
 #: py/emitinlinethumb.c
 msgid "can only have up to 4 parameters to Thumb assembly"
@@ -2705,7 +2712,7 @@ msgstr "Can't convert '%q' object to %q implicitly"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "can't convert complex to float"
-msgstr ""
+msgstr "can't convert complex to float"
 
 #: py/obj.c
 msgid "can't convert to %q"
@@ -2761,7 +2768,7 @@ msgstr "can't load with '%q' index"
 
 #: py/builtinimport.c
 msgid "can't perform relative import"
-msgstr ""
+msgstr "can't perform relative import"
 
 #: py/objgenerator.c
 msgid "can't send non-None value to a just-started generator"
@@ -2777,7 +2784,7 @@ msgstr "can't set attribute"
 
 #: py/runtime.c shared-bindings/supervisor/Runtime.c
 msgid "can't set attribute '%q'"
-msgstr ""
+msgstr "can't set attribute '%q'"
 
 #: py/emitnative.c
 msgid "can't store '%q'"
@@ -2813,11 +2820,11 @@ msgstr "can't cast output with casting rule"
 
 #: extmod/ulab/code/ndarray.c
 msgid "cannot convert complex to dtype"
-msgstr ""
+msgstr "cannot convert complex to dtype"
 
 #: extmod/ulab/code/ndarray.c
 msgid "cannot convert complex type"
-msgstr ""
+msgstr "cannot convert complex type"
 
 #: py/objtype.c
 msgid "cannot create '%q' instances"
@@ -2841,7 +2848,7 @@ msgstr "casting"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "channel re-init"
-msgstr ""
+msgstr "channel re-init"
 
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
@@ -2913,7 +2920,7 @@ msgstr "convolve arguments must not be empty"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "corrupted file"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2996,7 +3003,7 @@ msgstr "division by zero"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "dtype must be float, or complex"
-msgstr ""
+msgstr "dtype must be float, or complex"
 
 #: py/objdeque.c
 msgid "empty"
@@ -3004,7 +3011,7 @@ msgstr "empty"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "empty file"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3036,6 +3043,8 @@ msgid ""
 "espcamera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
 msgstr ""
+"espcamera.Camera requires reserved PSRAM to be configured. See the "
+"documentation for instructions."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -3166,7 +3175,7 @@ msgstr "function is defined for ndarrays only"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "function is implemented for ndarrays only"
-msgstr ""
+msgstr "function is implemented for ndarrays only"
 
 #: py/argcheck.c
 #, c-format
@@ -3253,7 +3262,7 @@ msgstr "index is out of bounds"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "index must be tuple or int"
-msgstr ""
+msgstr "index must be tuple or int"
 
 #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c
 #: ports/espressif/common-hal/pulseio/PulseIn.c
@@ -3267,7 +3276,7 @@ msgstr "indices must be integers, slices, or Boolean lists"
 
 #: ports/espressif/common-hal/busio/I2C.c
 msgid "init I2C"
-msgstr ""
+msgstr "init I2C"
 
 #: extmod/ulab/code/scipy/optimize/optimize.c
 msgid "initial values must be iterable"
@@ -3303,7 +3312,7 @@ msgstr "input data must be an iterable"
 
 #: extmod/ulab/code/numpy/vector.c
 msgid "input dtype must be float or complex"
-msgstr ""
+msgstr "input dtype must be float or complex"
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
 msgid "input matrix is asymmetric"
@@ -3316,11 +3325,11 @@ msgstr "input matrix is singular"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "input must be 1- or 2-d"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
-msgstr ""
+msgstr "input must be a 1D ndarray"
 
 #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
 msgid "input must be a dense ndarray"
@@ -3332,7 +3341,7 @@ msgstr "input must be an ndarray"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be an ndarray, or a scalar"
-msgstr ""
+msgstr "input must be an ndarray, or a scalar"
 
 #: extmod/ulab/code/scipy/signal/signal.c
 msgid "input must be one-dimensional"
@@ -3412,7 +3421,7 @@ msgstr "invalid micropython decorator"
 
 #: ports/espressif/common-hal/espcamera/Camera.c
 msgid "invalid setting"
-msgstr ""
+msgstr "invalid setting"
 
 #: shared-bindings/random/__init__.c
 msgid "invalid step"
@@ -3498,12 +3507,12 @@ msgstr "loopback + silent mode not supported by peripheral"
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS already initialized"
-msgstr ""
+msgstr "mDNS already initialszed"
 
 #: ports/espressif/common-hal/mdns/Server.c
 #: ports/raspberrypi/common-hal/mdns/Server.c
 msgid "mDNS only works with built-in WiFi"
-msgstr ""
+msgstr "mDNS only works with built-in WiFi"
 
 #: py/parse.c
 msgid "malformed f-string"
@@ -3530,7 +3539,7 @@ msgstr "max_length must be 0-%d when fixed_length is %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "maximum number of dimensions is "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3571,7 +3580,7 @@ msgstr "module not found"
 
 #: ports/espressif/common-hal/wifi/Monitor.c
 msgid "monitor init failed"
-msgstr ""
+msgstr "monitor init failed"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "more degrees of freedom than data points"
@@ -3632,7 +3641,7 @@ msgstr "negative shift count"
 
 #: shared-bindings/_pixelmap/PixelMap.c
 msgid "nested index must be int"
-msgstr ""
+msgstr "nested index must be int"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "no SD card"
@@ -3714,7 +3723,7 @@ msgstr "not enough arguments for format string"
 
 #: extmod/ulab/code/numpy/carray/carray_tools.c
 msgid "not implemented for complex dtype"
-msgstr ""
+msgstr "not implemented for complex dtype"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "number of points must be at least 2"
@@ -3776,7 +3785,7 @@ msgstr "odd-length string"
 
 #: supervisor/shared/web_workflow/web_workflow.c
 msgid "off"
-msgstr ""
+msgstr "off"
 
 #: extmod/ulab/code/utils/utils.c
 msgid "offset is too large"
@@ -3801,15 +3810,15 @@ msgstr "only bit_depth=16 is supported"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only mono is supported"
-msgstr ""
+msgstr "only mono is supported"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "only ndarrays can be concatenated"
-msgstr ""
+msgstr "only ndarrays can be concatenated"
 
 #: ports/stm/common-hal/audiobusio/PDMIn.c
 msgid "only oversample=64 is supported"
-msgstr ""
+msgstr "only oversample=64 is supported"
 
 #: ports/nrf/common-hal/audiobusio/PDMIn.c
 #: ports/stm/common-hal/audiobusio/PDMIn.c
@@ -3903,7 +3912,7 @@ msgstr "pixel_shader must be displayio.Palette or displayio.ColorConverter"
 
 #: extmod/vfs_posix_file.c
 msgid "poll on file not available on win32"
-msgstr ""
+msgstr "poll on file not available on win32"
 
 #: ports/espressif/common-hal/pulseio/PulseIn.c
 msgid "pop from an empty PulseIn"
@@ -3940,7 +3949,7 @@ msgstr "queue overflow"
 
 #: py/parse.c
 msgid "raw f-strings are not supported"
-msgstr ""
+msgstr "raw f-strings are not supported"
 
 #: extmod/ulab/code/numpy/fft/fft_tools.c
 msgid "real and imaginary parts must be of equal length"
@@ -4059,15 +4068,15 @@ msgstr "source palette too large"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 2 or 65536"
-msgstr ""
+msgstr "source_bitmap must have value_count of 2 or 65536"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 65536"
-msgstr ""
+msgstr "source_bitmap must have value_count of 65536"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "source_bitmap must have value_count of 8"
-msgstr ""
+msgstr "source_bitmap must have value_count of 8"
 
 #: py/objstr.c
 msgid "start/end indices"
@@ -4134,7 +4143,7 @@ msgstr "timeout waiting for v2 card"
 
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "timer re-init"
-msgstr ""
+msgstr "timer re-init"
 
 #: shared-bindings/time/__init__.c
 msgid "timestamp out of range for platform time_t"
@@ -4225,7 +4234,7 @@ msgstr "unicode name escapes"
 
 #: py/parse.c
 msgid "unindent doesn't match any outer indent level"
-msgstr ""
+msgstr "unindent doesn't match any outer indent level"
 
 #: py/objstr.c
 #, c-format
@@ -4247,7 +4256,7 @@ msgstr "unknown type '%q'"
 #: py/objstr.c
 #, c-format
 msgid "unmatched '%c' in format"
-msgstr ""
+msgstr "unmatched '%c' in format"
 
 #: py/objtype.c py/runtime.c
 msgid "unreadable attribute"
@@ -4269,11 +4278,11 @@ msgstr "unsupported Xtensa instruction '%s' with %d arguments"
 
 #: shared-module/gifio/GifWriter.c
 msgid "unsupported colorspace for GifWriter"
-msgstr ""
+msgstr "unsupported colourspace for GifWriter"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "unsupported colorspace for dither"
-msgstr ""
+msgstr "unsupported colourspace for dither"
 
 #: py/objstr.c
 #, c-format
@@ -4294,11 +4303,11 @@ msgstr "unsupported types for %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols is too high"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "usecols keyword must be specified"
 
 #: py/objint.c
 #, c-format
@@ -4324,7 +4333,7 @@ msgstr "WiFi is not enabled"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor not available"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
@@ -4340,11 +4349,11 @@ msgstr "wrong axis specified"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "wrong dtype"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
-msgstr ""
+msgstr "wrong index type"
 
 #: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
 #: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
@@ -4354,11 +4363,11 @@ msgstr "wrong input type"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of condition array"
-msgstr ""
+msgstr "wrong length of condition array"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "wrong length of index array"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

From 27a97dec16cd3b62db66ae54fe45849ae4dc86c2 Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Sun, 16 Apr 2023 15:51:11 -0400
Subject: [PATCH 2245/2403] Static web pages:    - Move loading .js scripts
 from  to  for faster rendering    - Enable back-button support
 for file system/editor navigation    - Close WebSocket when navigating away
 from /cp/serial    - Use better looking Blinka icon.

---
 .../shared/web_workflow/static/blinka_16x16.ico  | Bin 318 -> 0 bytes
 .../shared/web_workflow/static/blinka_32x32.ico  | Bin 0 -> 4414 bytes
 .../shared/web_workflow/static/directory.html    |   2 +-
 .../shared/web_workflow/static/directory.js      |  10 ++++++++++
 .../shared/web_workflow/static/serial.html       |   3 ++-
 supervisor/shared/web_workflow/static/serial.js  |  11 +++++++++++
 .../shared/web_workflow/static/welcome.html      |   2 +-
 supervisor/shared/web_workflow/web_workflow.c    |   4 ++--
 8 files changed, 27 insertions(+), 5 deletions(-)
 delete mode 100644 supervisor/shared/web_workflow/static/blinka_16x16.ico
 create mode 100644 supervisor/shared/web_workflow/static/blinka_32x32.ico

diff --git a/supervisor/shared/web_workflow/static/blinka_16x16.ico b/supervisor/shared/web_workflow/static/blinka_16x16.ico
deleted file mode 100644
index ff2937dfee32c98d6a34162b96e5d8b4ee8aafe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmZ{fu}T9$6h-gGfMo^?+sIUlrL$d-4Ve+GC01)2wlI}NB3RjM`m7&dXJ?ZEi)q5*
zhxiG`N<HYMX~zRyXl#7ft3uVT~Gu!kQNqyfCl5U>@S)=YSSD0G17(^w%NaXQTuC
Pb%9L^{7eaRP19`w1vX@(

diff --git a/supervisor/shared/web_workflow/static/blinka_32x32.ico b/supervisor/shared/web_workflow/static/blinka_32x32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5aca98376a1f7e593ebd9cf41a808512c2135635
GIT binary patch
literal 4414
zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en
zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK
zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8
z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3
z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG
zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn
zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^>#
z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt
z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx
zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D
z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$
zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ
z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g
z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4
zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%%
z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH
zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI
zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2
z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y
zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV
zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv)
zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^
zXUM@xoV6yBFKfzvY20V&Lr0yC
     
     
-    
     
     
 
@@ -21,4 +20,5 @@
     
     
    
     +📁 
+    
 
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
index a89d5e5602..2068ca38ea 100644
--- a/supervisor/shared/web_workflow/static/directory.js
+++ b/supervisor/shared/web_workflow/static/directory.js
@@ -267,3 +267,13 @@ new_directory_name.oninput = () => {
 }
 
 window.onhashchange = refresh_list;
+
+window.addEventListener("pageshow", function (event) {
+  var historyTraversal = event.persisted ||
+                         (typeof window.performance != "undefined" &&
+                              window.performance.navigation.type === 2);
+  if (historyTraversal) {
+    // Handle page restore.
+    window.location.reload();
+  }
+});
diff --git a/supervisor/shared/web_workflow/static/serial.html b/supervisor/shared/web_workflow/static/serial.html
index 9193953443..24fb3a3d32 100644
--- a/supervisor/shared/web_workflow/static/serial.html
+++ b/supervisor/shared/web_workflow/static/serial.html
@@ -4,7 +4,6 @@
   Simple client
   
   
-  
   
   
 
@@ -16,11 +15,13 @@
   
    
     
    
       Ctrl
+      
       
       
     
    
     
     
   
    
+  
 
 
diff --git a/supervisor/shared/web_workflow/static/serial.js b/supervisor/shared/web_workflow/static/serial.js
index 5c644795a0..52cde95396 100644
--- a/supervisor/shared/web_workflow/static/serial.js
+++ b/supervisor/shared/web_workflow/static/serial.js
@@ -72,6 +72,17 @@ input.addEventListener("beforeinput", function(e) {
   }
 });
 
+window.addEventListener("unload", function() {
+    if (ws.readyState == WebSocket.OPEN) {
+        ws.close();
+    }
+});
+
+let ctrl_b = document.querySelector("#b");
+ctrl_b.onclick = function() {
+  ws.send("\x02");
+}
+
 let ctrl_c = document.querySelector("#c");
 ctrl_c.onclick = function() {
   ws.send("\x03");
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
index efbb30e312..ffd23b72e9 100644
--- a/supervisor/shared/web_workflow/static/welcome.html
+++ b/supervisor/shared/web_workflow/static/welcome.html
@@ -4,7 +4,6 @@
     CircuitPython
     
     
-    
     
     
 
@@ -30,5 +29,6 @@
     
    Here are other CircuitPython devices on your network:
    
     
      
     
    
+    
 
 
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index d24547dd09..30ff2004a7 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -1002,7 +1002,7 @@ STATIC_FILE(edit_js);
 STATIC_FILE(style_css);
 STATIC_FILE(serial_html);
 STATIC_FILE(serial_js);
-STATIC_FILE(blinka_16x16_ico);
+STATIC_FILE(blinka_32x32_ico);
 
 static void _reply_static(socketpool_socket_obj_t *socket, _request *request, const uint8_t *response, size_t response_len, const char *content_type) {
     uint32_t total_length = response_len;
@@ -1303,7 +1303,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         } else if (strcmp(request->path, "/favicon.ico") == 0) {
             // TODO: Autogenerate this based on the blinka bitmap and change the
             // palette based on MAC address.
-            _REPLY_STATIC(socket, request, blinka_16x16_ico);
+            _REPLY_STATIC(socket, request, blinka_32x32_ico);
         } else {
             _reply_missing(socket, request);
         }

From a4cb73a567e39d9cc97def164b4a3fa70e92ce9f Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sun, 16 Apr 2023 18:42:00 -0400
Subject: [PATCH 2246/2403] Add MAX(0,xxx-1) to prevent potential display wrap

---
 shared-bindings/displayio/Bitmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 724c29eb0b..3513f03554 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -220,8 +220,8 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
     check_for_deinit(self);
 
     // Check x,y are within self (target) bitmap boundary
-    int16_t x = mp_arg_validate_int_range(args[ARG_x].u_int, 0, self->width, MP_QSTR_x);
-    int16_t y = mp_arg_validate_int_range(args[ARG_y].u_int, 0, self->height, MP_QSTR_y);
+    int16_t x = mp_arg_validate_int_range(args[ARG_x].u_int, 0, MAX(0, self->width - 1), MP_QSTR_x);
+    int16_t y = mp_arg_validate_int_range(args[ARG_y].u_int, 0, MAX(0, self->height - 1), MP_QSTR_y);
 
     displayio_bitmap_t *source = mp_arg_validate_type(args[ARG_source].u_obj, &displayio_bitmap_type, MP_QSTR_source_bitmap);
 
@@ -232,8 +232,8 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
     }
 
     // Check x1,y1,x2,y2 are within source bitmap boundary
-    int16_t x1 = mp_arg_validate_int_range(args[ARG_x1].u_int, 0, source->width, MP_QSTR_x1);
-    int16_t y1 = mp_arg_validate_int_range(args[ARG_y1].u_int, 0, source->height, MP_QSTR_y1);
+    int16_t x1 = mp_arg_validate_int_range(args[ARG_x1].u_int, 0, MAX(0, source->width - 1), MP_QSTR_x1);
+    int16_t y1 = mp_arg_validate_int_range(args[ARG_y1].u_int, 0, MAX(0, source->height - 1), MP_QSTR_y1);
     int16_t x2, y2;
     // if x2 or y2 is None, then set as the maximum size of the source bitmap
     if (args[ARG_x2].u_obj == mp_const_none) {

From 2a49567ec6e17eb3246140726c09027d204658b8 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Mon, 17 Apr 2023 19:03:42 +0200
Subject: [PATCH 2247/2403] added Adafruit_CircuitPython_Register to frozen
 libs

---
 ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
index 4ddb0e7d87..f5d0a3a05a 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
@@ -25,3 +25,4 @@ CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_C
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-pcf85063a
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

From 61f868a14e253c02c95bbbc925042004ac8f131f Mon Sep 17 00:00:00 2001
From: CanyonCasa 
Date: Mon, 17 Apr 2023 12:02:45 -0600
Subject: [PATCH 2248/2403] Update shared-module/onewireio/OneWire.c

Co-authored-by: Scott Shawcroft 
---
 shared-module/onewireio/OneWire.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/onewireio/OneWire.c b/shared-module/onewireio/OneWire.c
index ff5caa2bac..f00cf572dd 100644
--- a/shared-module/onewireio/OneWire.c
+++ b/shared-module/onewireio/OneWire.c
@@ -59,7 +59,7 @@ bool common_hal_onewireio_onewire_reset(onewireio_onewire_obj_t *self) {
     common_hal_mcu_delay_us(70);
     bool value = common_hal_digitalio_digitalinout_get_value(&self->pin);
     common_hal_mcu_delay_us(410);
-    // test if bus returned high (idle) and not stck at low
+    // test if bus returned high (idle) and not stuck at low
     bool idle = common_hal_digitalio_digitalinout_get_value(&self->pin);
     common_hal_mcu_enable_interrupts();
     return value || !idle;

From 304134c6a48c10c57a7845f0c7fe3b7de71827af Mon Sep 17 00:00:00 2001
From: Debian 
Date: Mon, 17 Apr 2023 12:54:59 -0600
Subject: [PATCH 2249/2403] Fixed outdated reference link

---
 shared-bindings/onewireio/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/onewireio/__init__.c b/shared-bindings/onewireio/__init__.c
index 81b2d605d7..282192179b 100644
--- a/shared-bindings/onewireio/__init__.c
+++ b/shared-bindings/onewireio/__init__.c
@@ -37,7 +37,7 @@
 
 //| """Low-level bit primitives for Maxim (formerly Dallas Semi) one-wire protocol.
 //|
-//|    Protocol definition is here: https://www.maximintegrated.com/en/app-notes/index.mvp/id/126"""
+//|    Protocol definition is here: https://www.analog.com/en/technical-articles/1wire-communication-through-software.html"""
 
 STATIC const mp_rom_map_elem_t onewireio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_onewireio) },

From d1df7e9cffce17eaadd36b9c9f75ca0322f9a91c Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 17 Apr 2023 19:51:02 -0400
Subject: [PATCH 2250/2403] Add 'sudo apt-get update' before any 'sudo apt-get
 install'

---
 .github/actions/deps/external/action.yml       | 4 +++-
 .github/actions/deps/ports/broadcom/action.yml | 1 +
 .github/workflows/build.yml                    | 1 +
 .github/workflows/pre-commit.yml               | 4 +++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
index 9e32e733a2..a26579b53d 100644
--- a/.github/actions/deps/external/action.yml
+++ b/.github/actions/deps/external/action.yml
@@ -30,7 +30,9 @@ runs:
     # espressif
     - name: Get espressif toolchain
       if: inputs.port == 'espressif'
-      run: sudo apt-get install -y ninja-build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ninja-build
       shell: bash
     - name: Install IDF tools
       if: inputs.port == 'espressif'
diff --git a/.github/actions/deps/ports/broadcom/action.yml b/.github/actions/deps/ports/broadcom/action.yml
index bd76c78262..7ea747999b 100644
--- a/.github/actions/deps/ports/broadcom/action.yml
+++ b/.github/actions/deps/ports/broadcom/action.yml
@@ -7,6 +7,7 @@ runs:
       run: |
         wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
         sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash
     - name: Install mkfs.fat
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e322004515..1b504d34c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -174,6 +174,7 @@ jobs:
       uses: ./.github/actions/deps/submodules
     - name: Install dependencies
       run: |
+        sudo apt-get update
         sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 2a3fcf9439..b3e51a2148 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -30,7 +30,9 @@ jobs:
     - name: Set up external
       uses: ./.github/actions/deps/external
     - name: Install dependencies
-      run: sudo apt-get install -y gettext uncrustify
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gettext uncrustify
     - name: Run pre-commit
       uses: pre-commit/action@v3.0.0
     - name: Make patch

From 7186235fa233ce3df8ce9e4f9d9fc0a7802c5d4a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 18 Apr 2023 13:21:39 +0000
Subject: [PATCH 2251/2403] Translated using Weblate (French)

Currently translated at 97.9% (979 of 1000 strings)

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

diff --git a/locale/fr.po b/locale/fr.po
index a281712f96..22391687cb 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2023-02-26 06:37+0000\n"
-"Last-Translator: Neradoc \n"
+"PO-Revision-Date: 2023-04-18 13:22+0000\n"
+"Last-Translator: Jeff Epler \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "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.16-dev\n"
+"X-Generator: Weblate 4.17\n"
 
 #: main.c
 msgid ""
@@ -40,6 +40,9 @@ msgid ""
 "Please file an issue with your program at https://github.com/adafruit/"
 "circuitpython/issues."
 msgstr ""
+"\n"
+"Veuillez signaler un problème avec votre programme sur https://github.com/"
+"adafruit/circuitpython/issues."
 
 #: supervisor/shared/safe_mode.c
 msgid ""

From 4e25a4f6b3efd64f02d81348b373d534dde9f34e Mon Sep 17 00:00:00 2001
From: silabs-BelaV <104006455+silabs-BelaV@users.noreply.github.com>
Date: Tue, 18 Apr 2023 18:42:16 +0200
Subject: [PATCH 2252/2403] Silabs' new Pull Request for submoduling the
 ports/silabs/tools/slc_cli_linux/ (#7874)

Doing a squash merge to avoid having the `slc_cli_linux` .zip files in the history. They were added in one commit and removed and replaced with a submodule in another.

* Initial commit for xg24

* Fix SLC issue

* Fix SLC extract fail

* Change board's name

* Correct spelling of code

Build immediately after slc generate

* Remove VID and PID

* Change creator and creation id

* Apply new creator_id and creation_id

* Update makefile, error message, mcu_processor function

* Update mpconfigboard.mk

* Update Board extensions, PORT_DEPS

* Update makefile

* Add exclude_patterns

* Show java, jinja2 version

* Show path for debugging CI

* Add requirements-dev for slc

* Add PATH slc_cli

* Update background function

* Add jinja2 PATH

* Show PATH

* Update jinja2 path

* Update jinja2 path

* Update jinja2 path

* Update jinja2 path

* Change slc folder

* Change markupsafe folder

* Add symbolic link for slc

* Update makefile

* Update makefile

* Update MX25R3235F.toml from submodule nvm.toml

* alphabetize the list

* Remove slc_cli_linux folder

* Update slc_cli submodule

---------

Co-authored-by: Chat Nguyen 
Co-authored-by: silabs-ChatNguyen 
Co-authored-by: silabs-ChatNguyen <126220343+silabs-ChatNguyen@users.noreply.github.com>
---
 .gitmodules                                   |   7 +
 conf.py                                       |   1 +
 data/nvm.toml                                 |   2 +-
 docs/shared_bindings_matrix.py                |   1 +
 ports/silabs/Makefile                         | 214 ++++++
 ports/silabs/README.md                        | 132 ++++
 ports/silabs/background.c                     |  50 ++
 ports/silabs/background.h                     |  30 +
 .../boards/devkit_xg24_brd2601b/README.md     |  28 +
 .../boards/devkit_xg24_brd2601b/board.c       |  29 +
 .../custom_brd2601b_cp_support.slcc           |  27 +
 .../devkit_xg24_brd2601b/mpconfigboard.h      |  55 ++
 .../devkit_xg24_brd2601b/mpconfigboard.mk     |  17 +
 .../devkit_xg24_brd2601b/pin_functions.csv    |  35 +
 .../boards/devkit_xg24_brd2601b/pins.csv      |  21 +
 .../boards/devkit_xg24_brd2601b/sensor.c      | 214 ++++++
 .../explorerkit_xg24_brd2703a/README.md       |  28 +
 .../boards/explorerkit_xg24_brd2703a/board.c  |  33 +
 .../custom_brd2703a_cp_support.slcc           |  20 +
 .../explorerkit_xg24_brd2703a/mpconfigboard.h |  52 ++
 .../mpconfigboard.mk                          |  16 +
 .../pin_functions.csv                         |  35 +
 .../boards/explorerkit_xg24_brd2703a/pins.csv |  24 +
 ports/silabs/boards/mp_efr32xg24_gchelper.s   |  28 +
 .../README.md                                 |  28 +
 .../board.c                                   |  29 +
 .../custom_brd2704a_cp_support.slcc           |  18 +
 .../mpconfigboard.h                           |  49 ++
 .../mpconfigboard.mk                          |  17 +
 .../pin_functions.csv                         |  35 +
 .../pins.csv                                  |  24 +
 ports/silabs/circuitpython_efr32.slcp         |  74 ++
 ports/silabs/common-hal/_bleio/Adapter.c      | 650 ++++++++++++++++++
 ports/silabs/common-hal/_bleio/Adapter.h      |  87 +++
 ports/silabs/common-hal/_bleio/Attribute.c    |  27 +
 ports/silabs/common-hal/_bleio/Attribute.h    |  32 +
 .../silabs/common-hal/_bleio/Characteristic.c | 407 +++++++++++
 .../silabs/common-hal/_bleio/Characteristic.h |  68 ++
 .../common-hal/_bleio/CharacteristicBuffer.c  | 164 +++++
 .../common-hal/_bleio/CharacteristicBuffer.h  |  55 ++
 ports/silabs/common-hal/_bleio/Connection.c   | 274 ++++++++
 ports/silabs/common-hal/_bleio/Connection.h   |  96 +++
 ports/silabs/common-hal/_bleio/Descriptor.c   | 114 +++
 ports/silabs/common-hal/_bleio/Descriptor.h   |  53 ++
 ports/silabs/common-hal/_bleio/PacketBuffer.c | 399 +++++++++++
 ports/silabs/common-hal/_bleio/PacketBuffer.h |  64 ++
 ports/silabs/common-hal/_bleio/Service.c      | 242 +++++++
 ports/silabs/common-hal/_bleio/Service.h      |  63 ++
 ports/silabs/common-hal/_bleio/UUID.c         |  83 +++
 ports/silabs/common-hal/_bleio/UUID.h         |  90 +++
 ports/silabs/common-hal/_bleio/__init__.c     | 402 +++++++++++
 ports/silabs/common-hal/_bleio/__init__.h     |  80 +++
 ports/silabs/common-hal/analogio/AnalogIn.c   | 216 ++++++
 ports/silabs/common-hal/analogio/AnalogIn.h   |  39 ++
 ports/silabs/common-hal/analogio/AnalogOut.c  | 167 +++++
 ports/silabs/common-hal/analogio/AnalogOut.h  |  42 ++
 ports/silabs/common-hal/analogio/__init__.c   |   1 +
 ports/silabs/common-hal/board/__init__.c      |   0
 ports/silabs/common-hal/busio/I2C.c           | 212 ++++++
 ports/silabs/common-hal/busio/I2C.h           |  46 ++
 ports/silabs/common-hal/busio/SPI.c           | 252 +++++++
 ports/silabs/common-hal/busio/SPI.h           |  52 ++
 ports/silabs/common-hal/busio/UART.c          | 299 ++++++++
 ports/silabs/common-hal/busio/UART.h          |  52 ++
 ports/silabs/common-hal/busio/__init__.c      |   1 +
 .../common-hal/digitalio/DigitalInOut.c       | 159 +++++
 .../common-hal/digitalio/DigitalInOut.h       |  39 ++
 ports/silabs/common-hal/digitalio/__init__.c  |   1 +
 ports/silabs/common-hal/microcontroller/Pin.c | 115 ++++
 ports/silabs/common-hal/microcontroller/Pin.h |  36 +
 .../common-hal/microcontroller/Processor.c    |  67 ++
 .../common-hal/microcontroller/Processor.h    |  39 ++
 .../common-hal/microcontroller/__init__.c     | 223 ++++++
 ports/silabs/common-hal/nvm/ByteArray.c       |  98 +++
 ports/silabs/common-hal/nvm/ByteArray.h       |  37 +
 ports/silabs/common-hal/nvm/__init__.c        |   1 +
 ports/silabs/common-hal/os/__init__.c         |  66 ++
 ports/silabs/common-hal/pwmio/PWMOut.c        | 181 +++++
 ports/silabs/common-hal/pwmio/PWMOut.h        |  47 ++
 ports/silabs/common-hal/pwmio/__init__.c      |   1 +
 ports/silabs/common-hal/rtc/RTC.c             |  78 +++
 ports/silabs/common-hal/rtc/RTC.h             |  33 +
 ports/silabs/common-hal/rtc/__init__.c        |   0
 ports/silabs/common-hal/rtc/__init__.h        |   0
 ports/silabs/common-hal/supervisor/Runtime.c  |  37 +
 ports/silabs/common-hal/supervisor/Runtime.h  |  37 +
 ports/silabs/common-hal/supervisor/__init__.c |  38 +
 .../silabs/common-hal/watchdog/WatchDogMode.c |  25 +
 .../common-hal/watchdog/WatchDogTimer.c       | 133 ++++
 .../common-hal/watchdog/WatchDogTimer.h       |  43 ++
 ports/silabs/common-hal/watchdog/__init__.c   |   0
 ports/silabs/cp_efr32_extension/cp_efr32.slce |  10 +
 ports/silabs/gecko_sdk                        |   1 +
 ports/silabs/license.md                       |  21 +
 ports/silabs/mpconfigport.h                   |  73 ++
 ports/silabs/mpconfigport.mk                  |  37 +
 ports/silabs/mphalport.c                      |  46 ++
 ports/silabs/mphalport.h                      |  51 ++
 ports/silabs/peripherals/periph.h             |  81 +++
 ports/silabs/peripherals/pins.h               | 171 +++++
 ports/silabs/peripherals/rtc.h                |  33 +
 ports/silabs/peripherals/timers.h             |  29 +
 ports/silabs/qstrdefsport.h                   |   1 +
 ports/silabs/res/Thony.png                    | Bin 0 -> 49362 bytes
 ports/silabs/silabs.pintool                   |  28 +
 ports/silabs/supervisor/internal_flash.c      | 138 ++++
 ports/silabs/supervisor/internal_flash.h      |  38 +
 .../supervisor/internal_flash_root_pointers.h |  32 +
 ports/silabs/supervisor/port.c                | 336 +++++++++
 ports/silabs/supervisor/serial.c              | 156 +++++
 ports/silabs/tools/make_pins.py               | 216 ++++++
 ports/silabs/tools/slc_cli_linux              |   1 +
 requirements-dev.txt                          |   4 +
 tools/ci_fetch_deps.py                        |   1 +
 114 files changed, 9239 insertions(+), 1 deletion(-)
 create mode 100644 ports/silabs/Makefile
 create mode 100644 ports/silabs/README.md
 create mode 100644 ports/silabs/background.c
 create mode 100644 ports/silabs/background.h
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/README.md
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/board.c
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/custom_brd2601b_cp_support.slcc
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.h
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/pin_functions.csv
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/pins.csv
 create mode 100644 ports/silabs/boards/devkit_xg24_brd2601b/sensor.c
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/README.md
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/board.c
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/custom_brd2703a_cp_support.slcc
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.h
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/pin_functions.csv
 create mode 100644 ports/silabs/boards/explorerkit_xg24_brd2703a/pins.csv
 create mode 100644 ports/silabs/boards/mp_efr32xg24_gchelper.s
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/README.md
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/board.c
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/custom_brd2704a_cp_support.slcc
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.h
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pin_functions.csv
 create mode 100644 ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pins.csv
 create mode 100644 ports/silabs/circuitpython_efr32.slcp
 create mode 100644 ports/silabs/common-hal/_bleio/Adapter.c
 create mode 100644 ports/silabs/common-hal/_bleio/Adapter.h
 create mode 100644 ports/silabs/common-hal/_bleio/Attribute.c
 create mode 100644 ports/silabs/common-hal/_bleio/Attribute.h
 create mode 100644 ports/silabs/common-hal/_bleio/Characteristic.c
 create mode 100644 ports/silabs/common-hal/_bleio/Characteristic.h
 create mode 100644 ports/silabs/common-hal/_bleio/CharacteristicBuffer.c
 create mode 100644 ports/silabs/common-hal/_bleio/CharacteristicBuffer.h
 create mode 100644 ports/silabs/common-hal/_bleio/Connection.c
 create mode 100644 ports/silabs/common-hal/_bleio/Connection.h
 create mode 100644 ports/silabs/common-hal/_bleio/Descriptor.c
 create mode 100644 ports/silabs/common-hal/_bleio/Descriptor.h
 create mode 100644 ports/silabs/common-hal/_bleio/PacketBuffer.c
 create mode 100644 ports/silabs/common-hal/_bleio/PacketBuffer.h
 create mode 100644 ports/silabs/common-hal/_bleio/Service.c
 create mode 100644 ports/silabs/common-hal/_bleio/Service.h
 create mode 100644 ports/silabs/common-hal/_bleio/UUID.c
 create mode 100644 ports/silabs/common-hal/_bleio/UUID.h
 create mode 100644 ports/silabs/common-hal/_bleio/__init__.c
 create mode 100644 ports/silabs/common-hal/_bleio/__init__.h
 create mode 100644 ports/silabs/common-hal/analogio/AnalogIn.c
 create mode 100644 ports/silabs/common-hal/analogio/AnalogIn.h
 create mode 100644 ports/silabs/common-hal/analogio/AnalogOut.c
 create mode 100644 ports/silabs/common-hal/analogio/AnalogOut.h
 create mode 100644 ports/silabs/common-hal/analogio/__init__.c
 create mode 100644 ports/silabs/common-hal/board/__init__.c
 create mode 100644 ports/silabs/common-hal/busio/I2C.c
 create mode 100644 ports/silabs/common-hal/busio/I2C.h
 create mode 100644 ports/silabs/common-hal/busio/SPI.c
 create mode 100644 ports/silabs/common-hal/busio/SPI.h
 create mode 100644 ports/silabs/common-hal/busio/UART.c
 create mode 100644 ports/silabs/common-hal/busio/UART.h
 create mode 100644 ports/silabs/common-hal/busio/__init__.c
 create mode 100644 ports/silabs/common-hal/digitalio/DigitalInOut.c
 create mode 100644 ports/silabs/common-hal/digitalio/DigitalInOut.h
 create mode 100644 ports/silabs/common-hal/digitalio/__init__.c
 create mode 100644 ports/silabs/common-hal/microcontroller/Pin.c
 create mode 100644 ports/silabs/common-hal/microcontroller/Pin.h
 create mode 100644 ports/silabs/common-hal/microcontroller/Processor.c
 create mode 100644 ports/silabs/common-hal/microcontroller/Processor.h
 create mode 100644 ports/silabs/common-hal/microcontroller/__init__.c
 create mode 100644 ports/silabs/common-hal/nvm/ByteArray.c
 create mode 100644 ports/silabs/common-hal/nvm/ByteArray.h
 create mode 100644 ports/silabs/common-hal/nvm/__init__.c
 create mode 100644 ports/silabs/common-hal/os/__init__.c
 create mode 100644 ports/silabs/common-hal/pwmio/PWMOut.c
 create mode 100644 ports/silabs/common-hal/pwmio/PWMOut.h
 create mode 100644 ports/silabs/common-hal/pwmio/__init__.c
 create mode 100644 ports/silabs/common-hal/rtc/RTC.c
 create mode 100644 ports/silabs/common-hal/rtc/RTC.h
 create mode 100644 ports/silabs/common-hal/rtc/__init__.c
 create mode 100644 ports/silabs/common-hal/rtc/__init__.h
 create mode 100644 ports/silabs/common-hal/supervisor/Runtime.c
 create mode 100644 ports/silabs/common-hal/supervisor/Runtime.h
 create mode 100644 ports/silabs/common-hal/supervisor/__init__.c
 create mode 100644 ports/silabs/common-hal/watchdog/WatchDogMode.c
 create mode 100644 ports/silabs/common-hal/watchdog/WatchDogTimer.c
 create mode 100644 ports/silabs/common-hal/watchdog/WatchDogTimer.h
 create mode 100644 ports/silabs/common-hal/watchdog/__init__.c
 create mode 100644 ports/silabs/cp_efr32_extension/cp_efr32.slce
 create mode 160000 ports/silabs/gecko_sdk
 create mode 100644 ports/silabs/license.md
 create mode 100644 ports/silabs/mpconfigport.h
 create mode 100644 ports/silabs/mpconfigport.mk
 create mode 100644 ports/silabs/mphalport.c
 create mode 100644 ports/silabs/mphalport.h
 create mode 100644 ports/silabs/peripherals/periph.h
 create mode 100644 ports/silabs/peripherals/pins.h
 create mode 100644 ports/silabs/peripherals/rtc.h
 create mode 100644 ports/silabs/peripherals/timers.h
 create mode 100644 ports/silabs/qstrdefsport.h
 create mode 100755 ports/silabs/res/Thony.png
 create mode 100644 ports/silabs/silabs.pintool
 create mode 100644 ports/silabs/supervisor/internal_flash.c
 create mode 100644 ports/silabs/supervisor/internal_flash.h
 create mode 100644 ports/silabs/supervisor/internal_flash_root_pointers.h
 create mode 100644 ports/silabs/supervisor/port.c
 create mode 100644 ports/silabs/supervisor/serial.c
 create mode 100644 ports/silabs/tools/make_pins.py
 create mode 160000 ports/silabs/tools/slc_cli_linux

diff --git a/.gitmodules b/.gitmodules
index 9c8d3b4b68..a33354bbff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -324,3 +324,10 @@
 	path = ports/broadcom/peripherals
 	url = https://github.com/adafruit/broadcom-peripherals.git
 	branch = main-build
+[submodule "ports/silabs/gecko_sdk"]
+	path = ports/silabs/gecko_sdk
+	url = https://github.com/SiliconLabs/gecko_sdk.git
+	branch = v4.2.1
+[submodule "ports/silabs/tools/slc_cli_linux"]
+	path = ports/silabs/tools/slc_cli_linux
+	url = https://github.com/SiliconLabs/circuitpython_slc_cli_linux
diff --git a/conf.py b/conf.py
index ea5072ae4c..e14c6ace83 100644
--- a/conf.py
+++ b/conf.py
@@ -216,6 +216,7 @@ exclude_patterns = ["**/build*",
                     "ports/nrf/usb",
                     "ports/raspberrypi/sdk",
                     "ports/raspberrypi/lib",
+                    "ports/silabs",
                     "ports/stm/st_driver",
                     "ports/stm/packages",
                     "ports/stm/peripherals",
diff --git a/data/nvm.toml b/data/nvm.toml
index 73fafcbe4c..427cc92397 160000
--- a/data/nvm.toml
+++ b/data/nvm.toml
@@ -1 +1 @@
-Subproject commit 73fafcbe4c66b23df63be31e9227353b695abb08
+Subproject commit 427cc923976229bcb981ca6f218ebe8efd636df6
diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 9705e33585..f7efb47385 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -40,6 +40,7 @@ SUPPORTED_PORTS = [
     "mimxrt10xx",
     "nrf",
     "raspberrypi",
+    "silabs",
     "stm",
 ]
 
diff --git a/ports/silabs/Makefile b/ports/silabs/Makefile
new file mode 100644
index 0000000000..06ddf3a57d
--- /dev/null
+++ b/ports/silabs/Makefile
@@ -0,0 +1,214 @@
+# This file is part of Adafruit for EFR32 project
+#
+# The MIT License (MIT)
+#
+# Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+#
+
+.SUFFIXES:				# ignore builtin rules
+.PHONY: all clean slc-clean slc-generate dependents
+# Values set by the initial generation
+PROJECTNAME = circuitpython_efr32
+# If the build directory is not given, make it reflect the board name.
+SILABS_BUILD = build-$(BOARD)
+# Build dir for CircuitPython
+BUILD ?= $(SILABS_BUILD)
+# Override Build Directories
+OUTPUT_DIR = $(SILABS_BUILD)
+# Python script to generate pins and pins functionalities code
+PY_GEN_PINS_SRC ?= tools/make_pins.py
+# SLC tool path
+SLC_PATH = $(realpath $(CURDIR))/tools/slc_cli_linux
+
+BUILD_VERBOSE ?= 1
+
+CFLAGS = $(INCLUDES) $(C_DEFS) $(C_FLAGS) \
+	-Wno-expansion-to-defined \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-Wno-type-limits
+
+ASMFLAGS = $(INCLUDES) $(ASM_DEFS) $(ASM_FLAGS) $(DEPFLAGS)
+
+include ../../py/circuitpy_mkenv.mk
+
+CROSS_COMPILE = arm-none-eabi-
+
+MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
+MCU_VARIANT_LOWER = $(shell echo $(MCU_VARIANT) | tr '[:upper:]' '[:lower:]')
+
+# Header files folders include
+INC += -I.
+INC += -I../..
+INC += -I$(BUILD)
+INC += -I$(BUILD)/genhdr
+INC += -I$(SILABS_BUILD)/autogen
+INC += -I$(SILABS_BUILD)/config
+INC += -I./boards
+INC += -I./peripherals
+INC += -I../../lib/mp-readline
+
+#Debugging/Optimization
+ifeq ($(DEBUG), 1)
+	CFLAGS += -g3
+	# You may want to enable these flags to make setting breakpoints easier.
+	CFLAGS += -fno-inline -fno-ipa-sra -Og
+else
+	CFLAGS += -DNDEBUG
+	OPTIMIZATION_FLAGS ?= -Os -fno-inline-functions
+	CFLAGS += -g
+endif
+
+# to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
+CFLAGS += $(OPTIMIZATION_FLAGS)
+CFLAGS += $(INC) $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
+CFLAGS += -DEFR32_SERIES_LOWER='"$(MCU_VARIANT)"'
+CFLAGS += -Wno-undef -Wno-shadow -Wno-cast-align -Wno-nested-externs -Wno-strict-prototypes
+
+SRC_C += \
+	background.c \
+	mphalport.c \
+	$(SILABS_BUILD)/pins.c\
+
+ifeq ('$(BOARD)','brd2601b')
+SRC_C += boards/$(BOARD)/sensor.c
+endif
+
+SRC_S = boards/mp_efr32xg24_gchelper.s
+
+SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
+						  $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
+						  $(addprefix common-hal/, $(SRC_COMMON_HAL))
+
+SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
+							 $(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
+							 $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
+
+# There may be duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
+# because a few modules have files both in common-hal/ and shared-module/.
+# Doing a $(sort ...) removes duplicates as part of sorting.
+SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
+
+ifneq ($(FROZEN_MPY_DIR),)
+FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py')
+FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
+endif
+
+OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
+ifeq ($(INTERNAL_LIBM),1)
+OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
+endif
+OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+
+$(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
+$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
+
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)
+# Sources that only hold QSTRs after pre-processing.
+SRC_QSTR_PREPROCESSOR +=
+
+MCU_SECTIONS = $^ $@
+
+# Include sub-makefiles
+-include $(SILABS_BUILD)/$(PROJECTNAME).project.mak
+
+# Default goal
+all: $(OUTPUT_DIR)/firmware.bin
+
+$(OUTPUT_DIR)/firmware.bin: $(SILABS_BUILD)/$(PROJECTNAME).Makefile $(OUTPUT_DIR)/firmware.hex
+	+@$(MAKE) --no-print-directory $(OUTPUT_DIR)/firmware.out
+	@echo 'Done.'
+
+$(SILABS_BUILD)/$(PROJECTNAME).Makefile:
+	+@$(MAKE) --no-print-directory slc-generate
+
+$(OUTPUT_DIR)/firmware.out: $(SILABS_BUILD)/pin_functions.h $(SILABS_BUILD)/pins.c $(OBJ) $(OBJS) $(LIB_FILES)
+	@echo 'Linking $(OUTPUT_DIR)/firmware.out'
+	@echo "$(OBJS) $(OBJ)" > $(OUTPUT_DIR)/linker_objs
+	$(CC) $(LD_FLAGS) @$(OUTPUT_DIR)/linker_objs $(LIBS) -o $(OUTPUT_DIR)/firmware.out
+	$(OBJCOPY) $(OUTPUT_DIR)/firmware.out -O binary $(OUTPUT_DIR)/firmware.bin
+
+$(OUTPUT_DIR)/firmware.hex:
+
+$(SILABS_BUILD)/pin_functions.h:
+	$(STEPECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_GEN_PINS_SRC) -e $@ boards/$(BOARD)/pins.csv boards/$(BOARD)/pin_functions.csv
+	@-$(RM) pins.c
+
+$(SILABS_BUILD)/pins.c:
+	$(STEPECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_GEN_PINS_SRC) -s $@ boards/$(BOARD)/pins.csv boards/$(BOARD)/pin_functions.csv
+	@-$(RM) pin_functions.h
+
+slc-generate:
+ifeq (,$(wildcard $(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/jinja2))
+	-@ln -s $(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/site-packages/jinja2 \
+			$(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/jinja2
+	-@ln -s $(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/site-packages/markupsafe \
+			$(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/markupsafe
+endif
+	@echo 'SLC generates project'
+	@$(SLC_PATH)/slc configuration --sdk gecko_sdk
+	@$(SLC_PATH)/slc signature trust -extpath cp_efr32_extension
+	@$(SLC_PATH)/slc signature trust --sdk gecko_sdk
+	@$(SLC_PATH)/slc generate -name=$(PROJECTNAME) $(PROJECTNAME).slcp --sdk gecko_sdk --with $(BOARD_BRD) -tlcn gcc -d=$(SILABS_BUILD)
+	@sed -i 's/ autogen\// $(SILABS_BUILD)\/autogen\//g' $(SILABS_BUILD)/circuitpython_efr32.project.mak
+	@sed -i 's/-T"autogen\//-T"$(SILABS_BUILD)\/autogen\//g' $(SILABS_BUILD)/circuitpython_efr32.project.mak
+
+#Override ECHO
+$(OBJS): ECHO =
+$(OBJS):
+
+$(OUTPUT_DIR)/%.o: %.c
+	@echo 'Building $<'
+	@$(MKDIR_P) $(@D)
+	$(ECHO)$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OUTPUT_DIR)/%.o: %.cpp
+	@echo 'Building $<'
+	@$(MKDIR_P) $(@D)
+	$(ECHO)$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OUTPUT_DIR)/%.o: %.cc
+	@echo 'Building $<'
+	@$(MKDIR_P) $(@D)
+	$(ECHO)$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OUTPUT_DIR)/%.o: %.s
+	@echo 'Building $<'
+	@$(MKDIR_P) $(@D)
+	$(ECHO)$(CC) $(ASMFLAGS) -c -o $@ $<
+
+$(OUTPUT_DIR)/%.o: %.S
+	@echo 'Building $<'
+	@$(MKDIR_P) $(@D)
+	$(ECHO)$(CC) $(ASMFLAGS) -c -o $@ $<
+
+include $(TOP)/py/mkrules.mk
+
+# Print out the value of a make variable.
+# https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile
+print-%:
+	@echo $* = $($*)
diff --git a/ports/silabs/README.md b/ports/silabs/README.md
new file mode 100644
index 0000000000..626b8e7788
--- /dev/null
+++ b/ports/silabs/README.md
@@ -0,0 +1,132 @@
+# Circuitpython on EFR32 #
+![GitHub](https://img.shields.io/badge/Technology-Bluetooth_BLE-green)
+![GitHub](https://img.shields.io/badge/CircuitPython-8.1.0--beta.0-green)
+![GitHub](https://img.shields.io/badge/GSDK-v4.2.1-green)
+![GitHub](https://img.shields.io/badge/SLC-5.6.3.0-green)
+![GitHub](https://img.shields.io/badge/License-MIT-green)
+![GitHub](https://img.shields.io/badge/GCC_build-passing-green)
+
+This port brings the Silicon Labs EFR32 series of MCUs to Circuitpython.
+
+Refer to **mpconfigport.mk** for a full list of enabled modules sorted by family.
+
+## How this port is organized: ##
+
+- **boards/** contains the configuration files for each development board and breakout available on the port, as well as system files and both shared and SoC-specific linker files. Board configuration includes a pin mapping of the board, oscillator information, board-specific build flags, and setup for some other peripheral where applicable.
+- **common-hal/** contains the port-specific module implementations, used by shared-module and shared-bindings.
+- **peripherals/** contains peripheral setup files and peripheral mapping information, sorted by family and sub-variant. Most files in this directory can be generated with the python scripts in **tools/**.
+- **supervisor/** contains port-specific implementations of internal flash and serial, as well as the **port.c** file, which initializes the port at startup.
+- **tools/** contains Silicon Labs configurator (SLC) tool, python scripts for generating peripheral and pin mapping files in **peripherals/** and **board/**.
+
+At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled modules.
+
+## Prerequisites ##
+Please ensure you set up your build environment appropriately, as per the guide. You will need:
+
+- Linux: https://learn.adafruit.com/building-circuitpython/linux
+- Windows Subsystem for Linux (WSL): https://learn.adafruit.com/building-circuitpython/windows-subsystem-for-linux
+- MacOS: Not supported yet
+
+Install necessary packages
+
+    $ sudo apt install default-jre gcc-arm-none-eabi wget python3 python3-pip git git-lfs gettext uncrustify
+    $ sudo python -m pip install --upgrade pip
+
+## Board supported ##
+
+| Board                       | Code         | Build CMD                                  |
+| --------------------------- | ------------ | ------------------------------------------ |
+| xG24 Dev Kit                | brd2601b     | devkit_xg24_brd2601b                       |
+| xG24 Explorer Kit           | brd2703a     | explorerkit_xg24_brd2703a                  |
+| Sparkfun Thing Plus MGM240P | brd2704a     | sparkfun_thingplus_matter_mgm240p_brd2704a |
+
+## Build instructions ##
+
+Ensure your clone of Circuitpython is ready to build by following the [guide on the Adafruit Website](https://learn.adafruit.com/building-circuitpython/build-circuitpython). This includes installing the toolchain, synchronizing submodules, and running `mpy-cross`.
+
+Clone the source code of CircuitPython from Github:
+
+    $  git clone https://github.com/SiliconLabs/circuitpython.git
+    $  cd circuitpython
+    $  make fetch-submodules
+
+Checkout the branch or tag you want to build. For example:
+
+    $  git checkout main
+
+Following the guideline below to install required packages for SLC tool:
+    https://www.silabs.com/documents/public/user-guides/ug520-software-project-generation-configuration-with-slc-cli.pdf
+
+Once the one-time build tasks are complete, you can build at any time by navigating to the port directory:
+
+    $ make BOARD=explorerkit_xg24_brd2703a
+
+You may also build with certain flags available in the makefile, depending on your board and development goals:
+
+    $ make BOARD=explorerkit_xg24_brd2703a DEBUG=1
+
+Clean project by using:
+
+    $ make BOARD=explorerkit_xg24_brd2703a clean
+
+## Bring-up on the board ##
+
+### Getting a REPL prompt ###
+
+Connect the devkit to the PC via the USB cable. The board uses serial for REPL access and debugging because the EFR32 chips has no USB support.
+
+#### Windows ####
+
+On Windows, we need to install a serial console e.g., PuTTY, MobaXterm. The JLink CDC UART Port can be found in the Device Manager.
+
+#### Linux ####
+
+Open a terminal and issue the following command: 
+
+    $ ls /dev/ttyACM*
+
+Then note down the correct name and substitute com-port-name in the following command with it: 
+
+    $ screen /dev/'com-port-name'
+
+### Using the REPL prompt ###
+
+After flashing the firmware to the board, at your first connecting to the board, you might see a blank screen. Press enter and you should be presented with a Circuitpython prompt, >>>. If not, try to reset the board (see instructions below).
+
+You can now type in simple commands such as: 
+
+```sh
+>>> print("Hello world!") 
+
+Hello world
+```
+
+If something goes wrong with the board, you can reset it. Pressing CTRL+D when the prompt is open performs a soft reset.
+
+### Recommended editors ###
+
+**Thonny** is a simple code editor that works with the Adafruit CircuitPython boards. 
+
+Config serial: Tools > Options > Interpreter > Select MicroPython > Select Port Jlink CDC UART Port
+
+### Running CircuitPython scripts ###
+
+At the boot stage, two scripts will be run (if not booting in safe mode). First, the file  boot.py  will be executed. The file **boot.py** can be used to perform the initial setup. Then, after boot.py has been completed, the file **code.py** will be executed.  
+
+After code.py has finished executing, a REPL prompt will be presented on the serial port. Other files can also be executed by using the **Thonny** editors or using **Ampy** tool.
+
+![Thony](./res/Thony.png)
+
+With the boards which support USB mass storage, we can drag the files to the board file system. However, because the EFR32 boards don’t support USB mass storage, we need to use a tool like **Ampy** to copy the file to the board. You can use the latest version of **Ampy** and its  command to copy the module directories to the board.
+
+Refer to the guideline below for installing the **Ampy** tool: 
+
+https://learn.adafruit.com/micropython-basics-load-files-and-run-code/install-ampy  
+
+## Modules supported ##
+
+| Board                       | Modules Available|
+| --------------------------- | ---------------- |
+| xG24 Dev Kit                |  _asyncio, _bleio, _pixelmap, adafruit_ble, adafruit_bus_device, adafruit_pixelbuf, adafruit_register, aesio,analogio, array, atexit, binascii, bitmaptools, board, builtins, busio, collections, digitalio, displayio,errno, fontio, framebufferio, gc, getpass, gifio, json, math, microcontroller, micropython, msgpack, nvm, onewireio, os, pwmio, rainbowio, random, re, rtc, select, sharpdisplay, storage, struct, supervisor, sys, terminalio, time, traceback, ulab, uselect, vectorio, watchdog, zlib |
+| xG24 Explorer Kit           |  _asyncio, _bleio, _pixelmap, adafruit_ble, adafruit_bus_device, adafruit_pixelbuf, adafruit_register, aesio,analogio, array, atexit, binascii, bitmaptools, board, builtins, busio, collections, digitalio, displayio,errno, fontio, framebufferio, gc, getpass, gifio, json, math, microcontroller, micropython, msgpack, nvm, onewireio, os, pwmio, rainbowio, random, re, rtc, sdcardio, select, sharpdisplay, storage, struct, supervisor, sys, terminalio, time, traceback, ulab, uselect, vectorio, watchdog, zlib |
+| Sparkfun Thing Plus MGM240P | _asyncio, _bleio, _pixelmap, adafruit_ble, adafruit_bus_device, adafruit_pixelbuf, adafruit_register, aesio,analogio, array, atexit, binascii, bitmaptools, board, builtins, busio, collections, digitalio, displayio,errno, fontio, framebufferio, gc, getpass, gifio, json, math, microcontroller, micropython, msgpack, nvm, onewireio, os, pwmio, rainbowio, random, re, rtc, sdcardio, select, sharpdisplay, storage, struct, supervisor, sys, terminalio, time, traceback, ulab, uselect, vectorio, watchdog, zlib |
diff --git a/ports/silabs/background.c b/ports/silabs/background.c
new file mode 100644
index 0000000000..176918adda
--- /dev/null
+++ b/ports/silabs/background.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "supervisor/filesystem.h"
+#include "supervisor/usb.h"
+#include "supervisor/shared/stack.h"
+#include "FreeRTOS.h"
+#include "task.h"
+
+#if CIRCUITPY_DISPLAYIO
+#include "shared-module/displayio/__init__.h"
+#endif
+
+void port_background_tick(void) {
+    // Zero delay in case FreeRTOS wants to switch to something else
+    vTaskDelay(0);
+}
+
+void port_background_task(void) {
+}
+
+void port_start_background_tick(void) {
+}
+
+void port_finish_background_tick(void) {
+}
diff --git a/ports/silabs/background.h b/ports/silabs/background.h
new file mode 100644
index 0000000000..c68865fa5b
--- /dev/null
+++ b/ports/silabs/background.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_BACKGROUND_H
+#define MICROPY_INCLUDED_EFR32_BACKGROUND_H
+
+#endif // MICROPY_INCLUDED_EFR32_BACKGROUND_H
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/README.md b/ports/silabs/boards/devkit_xg24_brd2601b/README.md
new file mode 100644
index 0000000000..438ec42bfc
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/README.md
@@ -0,0 +1,28 @@
+## Gen Pin instructions ##
+
+# Input File
+pins.csv          : contain pin name, port number ,pin number
+pin_functions.csv : contain list of pin support for peripheral
+make_pins.py      : python script to gen pin
+
+
+# Run make_pins.py
+Copy above input file to folder boards/brd2601b/
+Run CMD:
+        $ cd boards/brd2601b/
+        $ python make_pins.py -s pins.c -e pin_functions.h pins.csv pin_functions.csv
+
+        -s: name/directory of output source file
+        -e: name/directory of output header file
+
+# Output
+pins.c          : register pin to board_module_globals_table
+				  generate array contains supported function of pin
+pin_functions.h : define index of functions
+	Example: pin_pa0_functions[FN_EUSART0_RX] == 1 //   Can assign pin pa0 for EUSART0_RX
+             pin_pa0_functions[FN_EUSART0_RX] == 255 // Can't assign pin pa0 for EUSART0_RX
+
+
+# Read pin define on REPL
+import board
+dir(board)
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/board.c b/ports/silabs/boards/devkit_xg24_brd2601b/board.c
new file mode 100644
index 0000000000..100ef47b15
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/custom_brd2601b_cp_support.slcc b/ports/silabs/boards/devkit_xg24_brd2601b/custom_brd2601b_cp_support.slcc
new file mode 100644
index 0000000000..b1731a306f
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/custom_brd2601b_cp_support.slcc
@@ -0,0 +1,27 @@
+id: custom_brd2601b_cp_support
+label: CircuitPython BRD2601B support
+description: >
+  CircuitPython Board support for BRD2601B.
+package: custom
+category: Custom
+quality: production
+root_path: ../boards/devkit_xg24_brd2601b
+include:
+  - path: ''
+    file_list:
+      - path: mpconfigboard.h
+source:
+  - path: board.c
+provides:
+  - name: custom_brd2601b_cp_support
+requires:
+  - name: efr32mg24b310f1536im48
+  - name: sensor_pressure
+  - name: sensor_hall
+  - name: sensor_imu
+  - name: sensor_rht
+  - name: sensor_lux
+recommends:
+  - id: sensor_rht
+  - id: sensor_lux
+  - id: bt_rail_compatibility_fix
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.h b/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.h
new file mode 100644
index 0000000000..5456e1ecd5
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "build-devkit_xg24_brd2601b/pin_functions.h"
+
+// Micropython setup
+#define MICROPY_HW_BOARD_NAME "SiLabs xG24 Dev Kit"
+#define MICROPY_HW_MCU_NAME EFR32_SERIES_LOWER
+
+#define HSE_VALUE ((uint32_t)8000000)
+#define BOARD_HSE_SOURCE (RCC_HSE_BYPASS)
+#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
+
+// On-board flash
+#define SPI_FLASH_MOSI_PIN          (&pin_PC3)
+#define SPI_FLASH_MISO_PIN          (&pin_PC2)
+#define SPI_FLASH_SCK_PIN           (&pin_PC1)
+#define SPI_FLASH_CS_PIN            (&pin_PC0)
+
+#define DEFAULT_I2C_BUS_SDA   (&pin_PC5)
+#define DEFAULT_I2C_BUS_SCL   (&pin_PC4)
+#define DEFAULT_I2C_PERIPHERAL I2C1
+
+#define DEFAULT_SPI_BUS_SCK   (&pin_PC1)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_PC3)
+#define DEFAULT_SPI_BUS_MISO  (&pin_PC2)
+#define DEFAULT_SPI_BUS_SS    (&pin_PA7)
+
+#define NVM_BYTEARRAY_BUFFER_SIZE 512
+#define CIRCUITPY_INTERNAL_NVM_SIZE (512)
+#undef MICROPY_USE_INTERNAL_PRINTF
+#define MICROPY_USE_INTERNAL_PRINTF (0)
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk b/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk
new file mode 100644
index 0000000000..9c40c6fe7c
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk
@@ -0,0 +1,17 @@
+
+BOARD_BRD = brd2601b
+INTERNAL_FLASH_FILESYSTEM = 0
+QSPI_FLASH_FILESYSTEM = 0
+SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICES = MX25R3235F
+
+MCU_SERIES = MG24
+MCU_VARIANT = EFR32MG24B310F1536IM48
+
+CIRCUITPY_USB = 0
+
+CIRCUITPY_CREATOR_ID = 0x19960000
+CIRCUITPY_CREATION_ID = 0x00242601
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/pin_functions.csv b/ports/silabs/boards/devkit_xg24_brd2601b/pin_functions.csv
new file mode 100644
index 0000000000..aad9f34198
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/pin_functions.csv
@@ -0,0 +1,35 @@
+EUSART0_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+EUSART0_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+EUSART0_SCLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+EUSART0_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+EUSART1_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+EUSART1_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+EUSART1_SCLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+EUSART1_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+I2C0_SCL,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+I2C0_SDA,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+I2C1_SCL,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+I2C1_SDA,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER0_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER0_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER0_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER1_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER1_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER1_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER2_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+TIMER2_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+TIMER2_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+TIMER3_CC0,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER3_CC1,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER3_CC2,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+TIMER4_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+TIMER4_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+TIMER4_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,,,,,,,,,,,,,,
+USART0_CLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+USART0_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+USART0_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+USART0_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PC0,PC1,PC2,PC3,PC4,PC5,PC9,PD2,PD3,PD4,PD5,,,
+VDAC0_CH0,,,,,,PB0,,,,,,,,,,,,,,,,,
+VDAC0_CH1,,,,,,,PB1,,,,,,,,,,,,,,,,
+VDAC1_CH0,,,,,,,,PB2,,,,,,,,,,,,,,,
+VDAC1_CH1,,,,,,,,,PB3,,,,,,,,,,,,,,
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/pins.csv b/ports/silabs/boards/devkit_xg24_brd2601b/pins.csv
new file mode 100644
index 0000000000..c1d9a5a252
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/pins.csv
@@ -0,0 +1,21 @@
+mcu_name, board_name,port ,pin
+PA0,,0,0
+PA4,LEDG,0,4
+PA5,TX,0,5
+PA6,RX,0,6
+PA7,CS,0,7
+PB0,LEDB,1,0
+PB1,,1,1
+PB2,BTN0,1,2
+PB3,BTN1,1,3
+PC0,FLASH_CS,2,0
+PC1,SCLK,2,1
+PC2,CIPO,2,2
+PC3,COPI,2,3
+PC4,SCL,2,4
+PC5,SDA,2,5
+PC9,SENSOR_CS,2,9
+PD2,LEDR,3,2
+PD3,,3,3
+PD4,,3,4
+PD5,,3,5
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/sensor.c b/ports/silabs/boards/devkit_xg24_brd2601b/sensor.c
new file mode 100644
index 0000000000..cdffa9f1e5
--- /dev/null
+++ b/ports/silabs/boards/devkit_xg24_brd2601b/sensor.c
@@ -0,0 +1,214 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "common-hal/busio/I2C.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/shared/translate/translate.h"
+#include "em_i2c.h"
+#include "sl_i2cspm.h"
+#include "sl_i2cspm_sensor_config.h"
+#include "sl_sensor_lux.h"
+#include "sl_sensor_rht.h"
+#include "sl_sensor_imu.h"
+#include "sl_sensor_hall.h"
+#include "sl_sensor_pressure.h"
+
+STATIC mp_obj_t sensor_init(busio_i2c_obj_t *i2c) {
+    sl_status_t sc;
+
+    if (!common_hal_mcu_pin_is_free(&pin_PC9)) {
+        mp_raise_ValueError(translate("Pin PC9 is busy "));
+        return mp_const_false;
+    }
+
+    sc = sl_sensor_rht_init();
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    sc = sl_sensor_lux_init();
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    sc = sl_sensor_hall_init();
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    sc = sl_sensor_pressure_init();
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    sl_sensor_imu_init();
+    sc = sl_sensor_imu_enable(true);
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    common_hal_mcu_pin_claim(&pin_PC9);
+    return mp_const_true;
+}
+
+STATIC mp_obj_t sensor_deinit() {
+
+    sl_sensor_hall_deinit();
+    sl_sensor_lux_deinit();
+    sl_sensor_rht_deinit();
+    sl_sensor_pressure_deinit();
+    sl_sensor_imu_enable(false);
+    sl_sensor_imu_deinit();
+    common_hal_reset_pin(&pin_PC9);
+    return mp_const_true;
+}
+
+STATIC mp_obj_t sensor_get_temperature(void) {
+    sl_status_t sc;
+    uint32_t rh;
+    int32_t t;
+    sc = sl_sensor_rht_get(&rh, &t);
+
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    return mp_obj_new_float((float)t / 1000.0f);
+}
+
+STATIC mp_obj_t sensor_get_humidity(void) {
+    sl_status_t sc;
+    uint32_t rh;
+    int32_t t;
+    sc = sl_sensor_rht_get(&rh, &t);
+
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+    return mp_obj_new_float((float)rh / 1000.0f);
+}
+
+STATIC mp_obj_t sensor_get_lux(void) {
+    sl_status_t sc;
+    float lux;
+    sc = sl_sensor_lux_get(&lux);
+
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+    return mp_obj_new_float(lux);
+}
+
+STATIC mp_obj_t sensor_get_hall(void) {
+    sl_status_t sc;
+    float field_strength;
+    bool alert;
+    bool tamper;
+    sc = sl_sensor_hall_get(&field_strength, &alert, &tamper);
+
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+    return mp_obj_new_float(field_strength);
+}
+
+STATIC mp_obj_t sensor_get_pressure(void) {
+    sl_status_t sc;
+    float pressure;
+    sc = sl_sensor_pressure_get(&pressure);
+
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+    return mp_obj_new_float(pressure);
+}
+
+STATIC mp_obj_t sensor_imu_get(void) {
+    sl_status_t sc;
+    int16_t ovec[3];
+    int16_t avec[3];
+    mp_obj_t ovec_obj[3];
+    mp_obj_t avec_obj[3];
+    mp_obj_t ret[2];
+
+    sc = sl_sensor_imu_get(ovec, avec);
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+
+    ovec_obj[0] = mp_obj_new_int(ovec[0]);
+    ovec_obj[1] = mp_obj_new_int(ovec[1]);
+    ovec_obj[2] = mp_obj_new_int(ovec[2]);
+
+    avec_obj[0] = mp_obj_new_int(avec[0]);
+    avec_obj[1] = mp_obj_new_int(avec[1]);
+    avec_obj[2] = mp_obj_new_int(avec[2]);
+    ret[0] = mp_obj_new_list(3,ovec_obj);
+    ret[1] = mp_obj_new_list(3,avec_obj);
+    return mp_obj_new_tuple(2,ret);
+}
+
+STATIC mp_obj_t sensor_imu_calibrate(void) {
+    sl_status_t sc;
+    sc = sl_sensor_imu_calibrate();
+    if (sc != SL_STATUS_OK) {
+        return mp_const_false;
+    }
+    return mp_const_true;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(sensor_init_obj,sensor_init);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_deinit_obj,sensor_deinit);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_get_temperature_obj,sensor_get_temperature);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_get_humidity_obj,sensor_get_humidity);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_get_lux_obj,sensor_get_lux);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_get_hall_obj,sensor_get_hall);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_get_pressure_obj,sensor_get_pressure);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_imu_get_obj,sensor_imu_get);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sensor_imu_calibrate_obj,sensor_imu_calibrate);
+
+
+STATIC const mp_rom_map_elem_t sensor_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_sensor) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&sensor_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&sensor_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_temperature), MP_ROM_PTR(&sensor_get_temperature_obj) },
+    { MP_ROM_QSTR(MP_QSTR_humidity), MP_ROM_PTR(&sensor_get_humidity_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lux), MP_ROM_PTR(&sensor_get_lux_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hall), MP_ROM_PTR(&sensor_get_hall_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressure), MP_ROM_PTR(&sensor_get_pressure_obj) },
+    { MP_ROM_QSTR(MP_QSTR_imu), MP_ROM_PTR(&sensor_imu_get_obj) },
+    { MP_ROM_QSTR(MP_QSTR_imu_calibrate), MP_ROM_PTR(&sensor_imu_calibrate_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(sensor_module_globals, sensor_globals_table);
+
+const mp_obj_module_t sensor_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&sensor_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_sensor, sensor_module,1);
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/README.md b/ports/silabs/boards/explorerkit_xg24_brd2703a/README.md
new file mode 100644
index 0000000000..438ec42bfc
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/README.md
@@ -0,0 +1,28 @@
+## Gen Pin instructions ##
+
+# Input File
+pins.csv          : contain pin name, port number ,pin number
+pin_functions.csv : contain list of pin support for peripheral
+make_pins.py      : python script to gen pin
+
+
+# Run make_pins.py
+Copy above input file to folder boards/brd2601b/
+Run CMD:
+        $ cd boards/brd2601b/
+        $ python make_pins.py -s pins.c -e pin_functions.h pins.csv pin_functions.csv
+
+        -s: name/directory of output source file
+        -e: name/directory of output header file
+
+# Output
+pins.c          : register pin to board_module_globals_table
+				  generate array contains supported function of pin
+pin_functions.h : define index of functions
+	Example: pin_pa0_functions[FN_EUSART0_RX] == 1 //   Can assign pin pa0 for EUSART0_RX
+             pin_pa0_functions[FN_EUSART0_RX] == 255 // Can't assign pin pa0 for EUSART0_RX
+
+
+# Read pin define on REPL
+import board
+dir(board)
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/board.c b/ports/silabs/boards/explorerkit_xg24_brd2703a/board.c
new file mode 100644
index 0000000000..f0fcc3d41f
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/board.c
@@ -0,0 +1,33 @@
+/***************************************************************************//**
+ * @file board.c
+ * @brief
+ *******************************************************************************
+ * # License
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.com
+ *******************************************************************************
+ *
+ * SPDX-License-Identifier: Zlib
+ *
+ * The licensor of this software is Silicon Laboratories Inc.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ ******************************************************************************/
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/custom_brd2703a_cp_support.slcc b/ports/silabs/boards/explorerkit_xg24_brd2703a/custom_brd2703a_cp_support.slcc
new file mode 100644
index 0000000000..b78d83ce51
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/custom_brd2703a_cp_support.slcc
@@ -0,0 +1,20 @@
+id: custom_brd2703a_cp_support
+label: CircuitPython BRD2703A support
+description: >
+  CircuitPython Board support for BRD2703A.
+package: custom
+category: Custom
+quality: production
+root_path: ../boards/explorerkit_xg24_brd2703a
+include:
+  - path: ''
+    file_list:
+      - path: mpconfigboard.h
+source:
+  - path: board.c
+provides:
+  - name: custom_brd2703a_cp_support
+requires:
+  - name: efr32mg24b210f1536im48
+recommends:
+  - id: bt_rail_compatibility_fix
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.h b/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.h
new file mode 100644
index 0000000000..87da017fb7
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.h
@@ -0,0 +1,52 @@
+/***************************************************************************//**
+ * @file mpconfigboard.h
+ * @brief
+ *******************************************************************************
+ * # License
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.com
+ *******************************************************************************
+ *
+ * SPDX-License-Identifier: Zlib
+ *
+ * The licensor of this software is Silicon Laboratories Inc.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ ******************************************************************************/
+#include "build-explorerkit_xg24_brd2703a/pin_functions.h"
+
+// Micropython setup
+#define MICROPY_HW_BOARD_NAME "SiLabs xG24 Explorer Kit"
+#define MICROPY_HW_MCU_NAME EFR32_SERIES_LOWER
+
+#define HSE_VALUE ((uint32_t)8000000)
+#define BOARD_HSE_SOURCE (RCC_HSE_BYPASS)
+#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
+
+#define DEFAULT_I2C_BUS_SDA   (&pin_PB5)
+#define DEFAULT_I2C_BUS_SCL   (&pin_PB4)
+#define DEFAULT_I2C_PERIPHERAL I2C0
+
+#define DEFAULT_SPI_BUS_SCK   (&pin_PC1)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_PC3)
+#define DEFAULT_SPI_BUS_MISO  (&pin_PC2)
+#define DEFAULT_SPI_BUS_SS    (&pin_PC0)
+
+#define NVM_BYTEARRAY_BUFFER_SIZE (512)
+#define CIRCUITPY_INTERNAL_NVM_SIZE (512)
+#undef MICROPY_USE_INTERNAL_PRINTF
+#define MICROPY_USE_INTERNAL_PRINTF (0)
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk b/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk
new file mode 100644
index 0000000000..dd63b4da17
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk
@@ -0,0 +1,16 @@
+BOARD_BRD = brd2703a
+INTERNAL_FLASH_FILESYSTEM = 1
+QSPI_FLASH_FILESYSTEM = 0
+SPI_FLASH_FILESYSTEM = 0
+
+MCU_SERIES = MG24
+MCU_VARIANT = EFR32MG24B210F1536IM48
+
+CIRCUITPY_USB = 0
+
+CIRCUITPY_CREATOR_ID = 0x19960000
+CIRCUITPY_CREATION_ID = 0x00242703
+
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/pin_functions.csv b/ports/silabs/boards/explorerkit_xg24_brd2703a/pin_functions.csv
new file mode 100644
index 0000000000..8d623ce708
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/pin_functions.csv
@@ -0,0 +1,35 @@
+EUSART0_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+EUSART0_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+EUSART0_SCLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+EUSART0_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+EUSART1_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+EUSART1_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+EUSART1_SCLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+EUSART1_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+I2C0_SCL,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PB4,PC0,PC1,PC2,PC3,PC4,PC8,PC9,PD2,PD3,PD4,PD5
+I2C0_SDA,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PB4,PC0,PC1,PC2,PC3,PC4,PC8,PC9,PD2,PD3,PD4,PD5
+I2C1_SCL,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+I2C1_SDA,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER0_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER0_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER0_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER1_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER1_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER1_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER2_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+TIMER2_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+TIMER2_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+TIMER3_CC0,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER3_CC1,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER3_CC2,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+TIMER4_CC0,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+TIMER4_CC1,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+TIMER4_CC2,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,,,,,,,,,,,,
+USART0_CLK,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+USART0_CS,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+USART0_RX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+USART0_TX,PA0,PA4,PA5,PA6,PA7,PB0,PB1,PB2,PB3,PB4,PB5,PC0,PC1,PC2,PC3,PC4,PC5,PC8,PC9,PD2,PD3,PD4,PD5
+VDAC0_CH0,,,,,,PB0,,,,,,,,,,,,,,,,,
+VDAC0_CH1,,,,,,,PB1,,,,,,,,,,,,,,,,
+VDAC1_CH0,,,,,,,,PB2,,,,,,,,,,,,,,,
+VDAC1_CH1,,,,,,,,,PB3,,,,,,,,,,,,,,
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/pins.csv b/ports/silabs/boards/explorerkit_xg24_brd2703a/pins.csv
new file mode 100644
index 0000000000..c321057906
--- /dev/null
+++ b/ports/silabs/boards/explorerkit_xg24_brd2703a/pins.csv
@@ -0,0 +1,24 @@
+mcu_name, board_name,port ,pin
+PA0,MIKROE_PWM,0,0
+PA4,LED0,0,4
+PA5,TX,0,5
+PA6,RX,0,6
+PA7,LED1,0,7
+PB0,MIKROE_AN,1,0
+PB1,MIKROE_INT,1,1
+PB2,BTN0,1,2
+PB3,BNT1,1,3
+PB4,MIKROE_SCL,1,4
+PB5,MIKROE_SDA,1,5
+PC0,MIKROE_CS,2,0
+PC1,MIKROE_SCK,2,1
+PC2,MIKROE_MISO,2,2
+PC3,MIKROE_MOSI,2,3
+PC4,QWIIC_SCL,2,4
+PC5,QWIIC_SDA,2,5
+PC8,MIKROE_RST,2,8
+PC9,,2,9
+PD2,,3,2
+PD3,,3,3
+PD4,MIKROE_TX,3,4
+PD5,MIKROE_RX,3,5
diff --git a/ports/silabs/boards/mp_efr32xg24_gchelper.s b/ports/silabs/boards/mp_efr32xg24_gchelper.s
new file mode 100644
index 0000000000..18fe4a4a3a
--- /dev/null
+++ b/ports/silabs/boards/mp_efr32xg24_gchelper.s
@@ -0,0 +1,28 @@
+	.syntax unified
+	.cpu cortex-m33
+	.thumb
+	.text
+	.align 2
+
+@ uint cpu_get_regs_and_sp(r0=uint regs[10])
+	.global	cpu_get_regs_and_sp
+	.thumb
+	.thumb_func
+	.type 	cpu_get_regs_and_sp, %function
+cpu_get_regs_and_sp:
+@ store registers into given array
+	str     r4, [r0], #4
+	str     r5, [r0], #4
+	str     r6, [r0], #4
+	str     r7, [r0], #4
+	str     r8, [r0], #4
+	str     r9, [r0], #4
+	str     r10, [r0], #4
+	str     r11, [r0], #4
+	str     r12, [r0], #4
+	str     r13, [r0], #4
+@ return the sp
+	@Move stack pointer to return register
+	mov		r0, sp
+	@Branch to link register (return address) and change instruction set if needed
+	bx		lr
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/README.md b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/README.md
new file mode 100644
index 0000000000..438ec42bfc
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/README.md
@@ -0,0 +1,28 @@
+## Gen Pin instructions ##
+
+# Input File
+pins.csv          : contain pin name, port number ,pin number
+pin_functions.csv : contain list of pin support for peripheral
+make_pins.py      : python script to gen pin
+
+
+# Run make_pins.py
+Copy above input file to folder boards/brd2601b/
+Run CMD:
+        $ cd boards/brd2601b/
+        $ python make_pins.py -s pins.c -e pin_functions.h pins.csv pin_functions.csv
+
+        -s: name/directory of output source file
+        -e: name/directory of output header file
+
+# Output
+pins.c          : register pin to board_module_globals_table
+				  generate array contains supported function of pin
+pin_functions.h : define index of functions
+	Example: pin_pa0_functions[FN_EUSART0_RX] == 1 //   Can assign pin pa0 for EUSART0_RX
+             pin_pa0_functions[FN_EUSART0_RX] == 255 // Can't assign pin pa0 for EUSART0_RX
+
+
+# Read pin define on REPL
+import board
+dir(board)
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/board.c b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/board.c
new file mode 100644
index 0000000000..100ef47b15
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/board.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/custom_brd2704a_cp_support.slcc b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/custom_brd2704a_cp_support.slcc
new file mode 100644
index 0000000000..669e19908f
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/custom_brd2704a_cp_support.slcc
@@ -0,0 +1,18 @@
+id: custom_brd2704a_cp_support
+label: CircuitPython BRD2704A support
+description: >
+  CircuitPython Board support for BRD2704A.
+package: custom
+category: Custom
+quality: production
+root_path: ../boards/sparkfun_thingplus_matter_mgm240p_brd2704a
+include:
+  - path: ''
+    file_list:
+      - path: mpconfigboard.h
+source:
+  - path: board.c
+provides:
+  - name: custom_brd2704a_cp_support
+requires:
+  - name: mgm240pb32vna
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.h b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.h
new file mode 100644
index 0000000000..ea43ef27cd
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "build-sparkfun_thingplus_matter_mgm240p_brd2704a/pin_functions.h"
+
+// Micropython setup
+#define MICROPY_HW_BOARD_NAME "Sparkfun Thing Plus MGM240P"
+#define MICROPY_HW_MCU_NAME EFR32_SERIES_LOWER
+
+#define HSE_VALUE ((uint32_t)8000000)
+#define BOARD_HSE_SOURCE (RCC_HSE_BYPASS)
+#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
+
+#define DEFAULT_I2C_BUS_SDA   (&pin_PB4)
+#define DEFAULT_I2C_BUS_SCL   (&pin_PB3)
+#define DEFAULT_I2C_PERIPHERAL I2C0
+
+#define DEFAULT_SPI_BUS_SCK   (&pin_PC2)
+#define DEFAULT_SPI_BUS_MOSI  (&pin_PC3)
+#define DEFAULT_SPI_BUS_MISO  (&pin_PC6)
+#define DEFAULT_SPI_BUS_SS    (&pin_PA7)
+
+#define NVM_BYTEARRAY_BUFFER_SIZE (512)
+#define CIRCUITPY_INTERNAL_NVM_SIZE (512)
+#undef MICROPY_USE_INTERNAL_PRINTF
+#define MICROPY_USE_INTERNAL_PRINTF (0)
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk
new file mode 100644
index 0000000000..dcfc337031
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk
@@ -0,0 +1,17 @@
+
+BOARD_BRD = brd2704a
+INTERNAL_FLASH_FILESYSTEM = 1
+QSPI_FLASH_FILESYSTEM = 0
+SPI_FLASH_FILESYSTEM = 0
+
+MCU_SERIES = MG24
+MCU_VARIANT = MGM240PB32VNA
+
+CIRCUITPY_USB = 0
+CIRCUITPY_SDCARDIO = 1
+
+CIRCUITPY_CREATOR_ID = 0x19960000
+CIRCUITPY_CREATION_ID = 0x00242704
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pin_functions.csv b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pin_functions.csv
new file mode 100644
index 0000000000..a1ff1c3820
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pin_functions.csv
@@ -0,0 +1,35 @@
+EUSART0_CS,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+EUSART0_RX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+EUSART0_SCLK,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+EUSART0_TX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+EUSART1_CS,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+EUSART1_RX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+EUSART1_SCLK,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+EUSART1_TX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+I2C0_SCL,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PD0,PD1,PD2,PD3,,
+I2C0_SDA,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PD0,PD1,PD2,PD3,,
+I2C1_SCL,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+I2C1_SDA,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER0_CC0,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER0_CC1,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER0_CC2,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER1_CC0,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER1_CC1,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER1_CC2,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER2_CC0,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+TIMER2_CC1,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+TIMER2_CC2,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+TIMER3_CC0,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER3_CC1,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER3_CC2,,,,,,,,,,,,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+TIMER4_CC0,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+TIMER4_CC1,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+TIMER4_CC2,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,,,,,,,,,,,,,,
+USART0_CLK,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+USART0_CS,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+USART0_RX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+USART0_TX,PA0,PA4,PA5,PA6,PA7,PA8,PB0,PB1,PB2,PB3,PB4,PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PD0,PD1,PD2,PD3,,
+VDAC0_CH0,,,,,,,PB0,,,,,,,,,,,,,,,,,,
+VDAC0_CH1,,,,,,,,PB1,,,,,,,,,,,,,,,,,
+VDAC1_CH0,,,,,,,,,PB2,,,,,,,,,,,,,,,,
+VDAC1_CH1,,,,,,,,,,PB3,,,,,,,,,,,,,,,
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pins.csv b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pins.csv
new file mode 100644
index 0000000000..7c60920065
--- /dev/null
+++ b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/pins.csv
@@ -0,0 +1,24 @@
+mcu_name, board_name,port ,pin
+PA0,,0,0
+PA4,,0,4
+PA5,TX,0,5
+PA6,RX,0,6
+PA7,SD_CS,0,7
+PA8,LED,0,8
+PB0,,1,0
+PB1,,1,1
+PB2,,1,2
+PB3,SCL,1,3
+PB4,SDA,1,4
+PC0,,2,0
+PC1,,2,1
+PC2,SCK,2,2
+PC3,MOSI,2,3
+PC4,,2,4
+PC5,,2,5
+PC6,MISO,2,6
+PC7,,2,7
+PD0,,3,0
+PD1,,3,1
+PD2,,3,2
+PD3,,3,3
diff --git a/ports/silabs/circuitpython_efr32.slcp b/ports/silabs/circuitpython_efr32.slcp
new file mode 100644
index 0000000000..e7010b08cd
--- /dev/null
+++ b/ports/silabs/circuitpython_efr32.slcp
@@ -0,0 +1,74 @@
+# Silicon Labs Project Configuration Tools: slcp, v0, Component selection file.
+description: |
+  A project structure used as a configuration for CircuitPython + Custom Bluetooth + Standard DMP (Dynamic Multiprotocol) applications. It runs on top of FreeRTOS and multiprotocol RAIL utilizing IEEE 802.15.4 standard protocol.
+filter:
+- name: Capability
+  value: [Multiprotocol]
+- name: Device Type
+  value: [SoC]
+- name: Project Difficulty
+  value: [Advanced]
+- name: Wireless Technology
+  value: [Bluetooth]
+package: Bluetooth
+quality: production
+tag: ['hardware:rf:band:2400', 'hardware:device:ram:64']
+sdk: {id: gecko_sdk, version: 4.2.1}
+toolchain_settings: []
+sdk_extension:
+- id: cp_efr32
+  version: 1.0.0
+component:
+- {id: bluetooth_feature_nvm}
+- {id: bluetooth_feature_gatt_server}
+- {id: bluetooth_feature_sm}
+- {id: mpu}
+- {id: bluetooth_feature_legacy_advertiser}
+- {id: bluetooth_feature_legacy_scanner}
+- {id: gatt_configuration}
+- {id: freertos}
+- {id: bluetooth_stack}
+- {id: bluetooth_feature_gatt}
+- {id: uartdrv_core}
+- {id: i2cspm_core}
+- {id: spidrv_core}
+- {id: pwm_core}
+- {id: emlib_usart}
+- {id: emlib_vdac}
+- {id: emlib_iadc}
+- {id: nvm3_lib}
+- {id: nvm3_default}
+- {id: tempdrv}
+- {id: sleeptimer}
+- {id: emlib_wdog}
+- {id: bluetooth_feature_connection}
+- {id: rail_lib_multiprotocol}
+- {id: bluetooth_feature_dynamic_gattdb}
+- {id: bluetooth_feature_system}
+- {id: bluetooth_feature_scanner}
+- {id: component_catalog}
+- {id: app_assert}
+requires:
+- condition: [brd2601b]
+  name: custom_brd2601b_cp_support
+- condition: [brd2704a]
+  name: custom_brd2704a_cp_support
+- condition: [brd2703a]
+  name: custom_brd2703a_cp_support
+configuration:
+- {name: SL_SLEEPTIMER_WALLCLOCK_CONFIG, value: '1'}
+- {name: NVM3_DEFAULT_MAX_OBJECT_SIZE, value: '512'}
+- {name: SL_STACK_SIZE, value: '2752'}
+- {name: SL_HEAP_SIZE, value: '11000'}
+- name: SL_POWER_MANAGER_LOWEST_EM_ALLOWED
+  value: '1'
+- {name: configTOTAL_HEAP_SIZE, value: '8192'}
+- {name: configTIMER_TASK_PRIORITY, value: '55'}
+- {name: configTIMER_TASK_STACK_DEPTH, value: '160'}
+- condition: [psa_crypto]
+  name: SL_PSA_KEY_USER_SLOT_COUNT
+  value: '0'
+- {name: APP_LOG_PREFIX_ENABLE, value: '0'}
+ui_hints:
+  highlight:
+  - {path: config/btconf/gatt_configuration.btconf}
diff --git a/ports/silabs/common-hal/_bleio/Adapter.c b/ports/silabs/common-hal/_bleio/Adapter.c
new file mode 100644
index 0000000000..cbfdcbce55
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Adapter.c
@@ -0,0 +1,650 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include 
+#include 
+#include 
+#include "py/gc.h"
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared-bindings/_bleio/Address.h"
+#include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/ScanEntry.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/time/__init__.h"
+#include "common-hal/_bleio/Connection.h"
+#include "supervisor/shared/tick.h"
+
+#define PUBLIC_ADDRESS 0
+#define STATIC_ADDRESS 1
+#define BLE_EXT_ADV_MAX_SIZE 32
+
+#define UNIT_0_625_MS (625)
+#define UNIT_1_25_MS (1250)
+#define UNIT_10_MS (10000)
+
+#define SCAN_TIMEOUT_MS_DEFAUT 3000
+#define BLE_GAP_SCAN_BUFFER_EXTENDED_MAX_SUPPORTED 256
+#define BLE_GAP_SCAN_BUFFER_MAX 32
+#define DEVICE_NAME_LEN 15
+
+EventGroupHandle_t xscan_event;
+device_scan_info_t scan_info;
+bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
+
+// Set scan data form sl_bt_on_event
+void set_scan_device_info_on_ble_evt(bd_addr address,
+    uint8_t address_type,
+    int8_t rssi,
+    uint8array *data) {
+    scan_info.address = address;
+    scan_info.address_type = address_type;
+    scan_info.rssi = rssi;
+    memcpy(scan_info.data, data->data, data->len);
+}
+
+// Get state of the BLE adapter.
+bool common_hal_bleio_adapter_get_enabled(bleio_adapter_obj_t *self) {
+    return self->is_enable;
+}
+
+// Set state of the BLE adapter
+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);
+    bd_addr get_address;
+    uint8_t address_type;
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+    sl_status_t sc = SL_STATUS_FAIL;
+    uint8_t device_name[DEVICE_NAME_LEN + 1];
+    memset(device_name, 0, DEVICE_NAME_LEN);
+
+    // Don't enable or disable twice
+    if (is_enabled == enabled) {
+        return;
+    }
+
+    sc = sl_bt_system_get_identity_address(&get_address, &address_type);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Get address fail."));
+    }
+    snprintf((char *)device_name, DEVICE_NAME_LEN + 1,
+        "CIRCUITPY-%X%X", get_address.addr[1], get_address.addr[0]);
+
+    if (enabled) {
+        sl_bt_gatt_server_write_attribute_value(gattdb_device_name,
+            0,
+            DEVICE_NAME_LEN,
+            device_name);
+
+        // Clear all of the internal connection objects.
+        for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+            connection = &bleio_connections[conn_index];
+            // Reset connection.
+            connection->conn_handle = BLEIO_HANDLE_INVALID;
+        }
+    } else {
+        self->is_enable = false;
+    }
+}
+
+// Get mac address of the BLE adapter
+bleio_address_obj_t *common_hal_bleio_adapter_get_address(bleio_adapter_obj_t *self) {
+    bd_addr get_address;
+    uint8_t address_type;
+    sl_status_t sc = SL_STATUS_FAIL;
+    bleio_address_obj_t *address;
+
+    sc = sl_bt_system_get_identity_address(&get_address, &address_type);
+    if (SL_STATUS_OK != sc) {
+        return NULL;
+    }
+
+    address = m_new_obj(bleio_address_obj_t);
+    address->base.type = &bleio_address_type;
+    common_hal_bleio_address_construct(address, get_address.addr,
+        BLEIO_ADDRESS_TYPE_RANDOM_STATIC);
+    return address;
+}
+
+// Set identity address
+bool common_hal_bleio_adapter_set_address(bleio_adapter_obj_t *self,
+    bleio_address_obj_t *address) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    mp_buffer_info_t bufinfo;
+    bd_addr ble_addr;
+
+    if (NULL == address) {
+        return false;
+    }
+    if (!mp_get_buffer(address->bytes, &bufinfo, MP_BUFFER_READ)) {
+        return false;
+    }
+    memcpy(ble_addr.addr, bufinfo.buf, 6);
+    sl_bt_system_set_identity_address(ble_addr, PUBLIC_ADDRESS);
+    return sc == SL_STATUS_OK;
+}
+
+// Get name of the BLE adapter
+mp_obj_str_t *common_hal_bleio_adapter_get_name(bleio_adapter_obj_t *self) {
+    char name[DEVICE_NAME_LEN];
+    size_t value_len = 0;
+    uint8_t sc;
+    memset(name, 0, DEVICE_NAME_LEN);
+    sc = sl_bt_gatt_server_read_attribute_value(gattdb_device_name,
+        0,
+        DEVICE_NAME_LEN,
+        &value_len,
+        (uint8_t *)name);
+    if (SL_STATUS_OK != sc) {
+        return NULL;
+    }
+    return mp_obj_new_str(name, strlen(name));
+}
+
+// Set name of the BLE adapter
+void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self,
+    const char *name) {
+    sl_bt_gatt_server_write_attribute_value(gattdb_device_name,
+        0,
+        DEVICE_NAME_LEN,
+        (const uint8_t *)name);
+}
+
+// starts a BLE scan
+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) {
+
+    sl_status_t sc;
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t current_ticks = start_ticks;
+    uint32_t timeout_ms = timeout * 1000;
+
+    if (timeout_ms == 0) {
+        timeout_ms = SCAN_TIMEOUT_MS_DEFAUT;
+    }
+
+    if (self->scan_results != NULL) {
+        if (!shared_module_bleio_scanresults_get_done(self->scan_results)) {
+            mp_raise_bleio_BluetoothError(
+                translate("Scan already in progress. Stop with stop_scan."));
+        }
+        self->scan_results = NULL;
+    }
+
+    sl_bt_scanner_stop();
+    self->scan_results = shared_module_bleio_new_scanresults(buffer_size,
+        prefixes,
+        prefix_length,
+        minimum_rssi);
+    xscan_event = xEventGroupCreate();
+    if (xscan_event != NULL) {
+        xEventGroupClearBits(xscan_event, 1 << 0);
+    }
+
+    sc = sl_bt_scanner_start(sl_bt_scanner_scan_phy_1m,
+        sl_bt_scanner_discover_generic);
+
+    if (SL_STATUS_OK != sc) {
+        self->scan_results = NULL;
+    }
+
+    // Busy-wait until timeout or until we've read enough chars.
+    while (current_ticks - start_ticks <= timeout_ms) {
+        if (xscan_event != NULL) {
+            xEventGroupWaitBits(xscan_event, 1 << 0, pdTRUE, pdFALSE,
+                    timeout_ms / portTICK_PERIOD_MS);
+        }
+        self->scan_results->prefix_length = 0;
+        scan_info.data_len = 28;
+        shared_module_bleio_scanresults_append(
+            self->scan_results,
+            supervisor_ticks_ms64(),
+            true,
+            true,
+            scan_info.rssi,
+            scan_info.address.addr,
+            scan_info.address_type,
+            scan_info.data,
+            scan_info.data_len);
+        current_ticks = supervisor_ticks_ms64();
+        // Allow user to break out of a timeout with a KeyboardInterrupt.
+        if (mp_hal_is_interrupted()) {
+            break;
+        }
+    }
+
+    shared_module_bleio_scanresults_set_done(self->scan_results, true);
+    vEventGroupDelete(xscan_event);
+    return MP_OBJ_FROM_PTR(self->scan_results);
+}
+
+void common_hal_bleio_adapter_stop_scan(bleio_adapter_obj_t *self) {
+    if (self->scan_results == NULL) {
+        return;
+    }
+    sl_bt_scanner_stop();
+    shared_module_bleio_scanresults_set_done(self->scan_results, true);
+    self->scan_results = NULL;
+}
+
+// Start the  advertising on an advertising set with specified
+// discovery and connection modes
+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) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    int16_t set_power;
+    uint32_t interval_min = 160;
+    uint32_t interval_max = 160;
+    bd_addr address;
+    uint8_t address_type;
+    uint8_t system_id[8];
+    uint8_t enable_connect;
+
+    if (self->user_advertising) {
+        return SL_STATUS_BUSY;
+    }
+
+    sc = sl_bt_advertiser_create_set(&self->advertising_handle);
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Create_set fail."));
+        return sc;
+    }
+    sc = sl_bt_advertiser_set_channel_map(self->advertising_handle, 7);
+    if (SL_STATUS_OK != sc) {
+        return sc;
+    }
+
+    sc = sl_bt_system_get_identity_address(&address, &address_type);
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Get address fail."));
+        return sc;
+    }
+    // Pad and reverse unique ID to get System ID.
+    system_id[0] = address.addr[5];
+    system_id[1] = address.addr[4];
+    system_id[2] = address.addr[3];
+    system_id[3] = 0xFF;
+    system_id[4] = 0xFE;
+    system_id[5] = address.addr[2];
+    system_id[6] = address.addr[1];
+    system_id[7] = address.addr[0];
+
+    sc = sl_bt_gatt_server_write_attribute_value(gattdb_system_id,
+        0,
+        sizeof(system_id),
+        system_id);
+    if (SL_STATUS_OK != sc) {
+        return sc;
+    }
+
+    sc = sl_bt_advertiser_set_tx_power(self->advertising_handle,
+        tx_power,
+        &set_power);
+    if (SL_STATUS_OK != sc) {
+        return sc;
+    }
+
+    // Set advertising interval.
+    sc = sl_bt_advertiser_set_timing(
+        self->advertising_handle,
+        interval_min,  // min. adv. interval (milliseconds * 1.6)
+        interval_max,  // max. adv. interval (milliseconds * 1.6)
+        0,             // adv. duration
+        0);            // max. num. adv. events
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Set_timing fail."));
+        return sc;
+    }
+
+    sc = sl_bt_legacy_advertiser_set_data(
+        self->advertising_handle,
+        sl_bt_advertiser_advertising_data_packet,
+        advertising_data_len,
+        advertising_data);
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Set data fail."));
+        return sc;
+    }
+
+    // Start advertising and enable connections.
+    enable_connect = sl_bt_legacy_advertiser_scannable;
+    if (true == connectable) {
+        enable_connect = sl_bt_advertiser_connectable_scannable;
+    }
+    sc = sl_bt_legacy_advertiser_start(self->advertising_handle,
+        enable_connect);
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Start advertise fail."));
+    } else {
+        self->user_advertising = true;
+    }
+
+    return sc;
+}
+
+// Check size of packet advertising to send
+STATIC void check_data_fit(size_t data_len, bool connectable) {
+    if (data_len > BLE_EXT_ADV_MAX_SIZE ||
+        (connectable && data_len > BLE_EXT_ADV_MAX_SIZE)) {
+        mp_raise_ValueError(
+            translate("Data too large for advertisement packet"));
+    }
+}
+
+// Start advertising
+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) {
+        common_hal_bleio_adapter_stop_advertising(self);
+    }
+    // Interval value has already been validated.
+
+    check_data_fit(advertising_data_bufinfo->len, connectable);
+    check_data_fit(scan_response_data_bufinfo->len, connectable);
+
+    if (advertising_data_bufinfo->len > 31 && scan_response_data_bufinfo->len > 0) {
+        mp_raise_bleio_BluetoothError(
+            translate("Extended advertisements not supported"));
+    }
+
+    if (advertising_data_bufinfo->len > 0 && directed_to != NULL) {
+        mp_raise_bleio_BluetoothError(
+            translate("Data not supported with directed advertising"));
+    }
+
+    if (anonymous) {
+        mp_raise_NotImplementedError(NULL);
+    }
+
+    if (!timeout) {
+        timeout = INT32_MAX;
+    } else if (timeout > INT32_MAX) {
+        mp_raise_bleio_BluetoothError(
+            translate("Maximum timeout length is %d seconds"), INT32_MAX / 1000);
+    }
+
+    _common_hal_bleio_adapter_start_advertising(self, connectable, anonymous,
+        timeout, interval,
+        advertising_data_bufinfo->buf,
+        advertising_data_bufinfo->len,
+        scan_response_data_bufinfo->buf,
+        scan_response_data_bufinfo->len,
+        tx_power,
+        directed_to);
+}
+
+// Stop advertising
+void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {
+    if (!common_hal_bleio_adapter_get_advertising(self)) {
+        return;
+    }
+    sl_bt_advertiser_delete_set(self->advertising_handle);
+    sl_bt_advertiser_stop(0);
+    self->user_advertising = false;
+}
+
+// Get status of advertising
+bool common_hal_bleio_adapter_get_advertising(bleio_adapter_obj_t *self) {
+    return self->user_advertising;
+}
+
+// Convert mac address of remote device to connect
+STATIC void _convert_address(const bleio_address_obj_t *address,
+    bd_addr *sd_address, uint8_t *addr_type) {
+    mp_buffer_info_t address_buf_info;
+    *addr_type = address->type;
+    mp_get_buffer_raise(address->bytes, &address_buf_info, MP_BUFFER_READ);
+    memcpy(sd_address->addr, (uint8_t *)address_buf_info.buf, 6);
+}
+
+// Add new connection into connection list
+void _new_connection(uint16_t conn_handle) {
+    // Find an empty connection. One must always be available because the SD has the same
+    // total connection limit.
+    bleio_connection_internal_t *connection;
+    uint8_t conn_index;
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle == BLEIO_HANDLE_INVALID) {
+            break;
+        }
+    }
+    connection->conn_handle = conn_handle;
+    connection->connection_obj = mp_const_none;
+    connection->pair_status = PAIR_NOT_PAIRED;
+    connection->mtu = 0;
+}
+
+// Attempts a connection to the device with the given address.
+mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self,
+    bleio_address_obj_t *address,
+    mp_float_t timeout) {
+
+    bd_addr addr;
+    uint8_t address_type;
+    sl_status_t error_code;
+    uint8_t conn_handle;
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+
+    if (self->scan_results != NULL) {
+        common_hal_bleio_adapter_stop_scan(self);
+    }
+    conn_handle = common_hal_bleio_adapter_get_connected(self);
+    timeout = MSEC_TO_UNITS(timeout, UNIT_10_MS);
+
+    _convert_address(address, &addr, &address_type);
+
+    error_code = sl_bt_connection_open(addr,
+        address_type,
+        sl_bt_gap_phy_1m,
+        &conn_handle);
+
+    // Negative values are error codes, connection handle otherwise.
+    if (SL_STATUS_OK != error_code) {
+        return mp_const_none;
+    }
+
+    _new_connection(conn_handle);
+
+    // TODO: If we have keys, then try and encrypt the connection.
+
+    // TODO: Negotiate for better PHY and data lengths since we are the central. These are
+    // nice-to-haves so ignore any errors.
+
+    // Make the connection object and return it.
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle == conn_handle) {
+            connection->is_central = true;
+            connection->pair_status = PAIR_PAIRED;
+            return bleio_connection_new_from_internal(connection);
+        }
+    }
+
+    mp_raise_bleio_BluetoothError(
+        translate("Failed to connect: internal error"));
+    return mp_const_none;
+}
+
+// Get connected status
+bool common_hal_bleio_adapter_get_connected(bleio_adapter_obj_t *self) {
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle != BLEIO_HANDLE_INVALID) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Get connection object
+mp_obj_t common_hal_bleio_adapter_get_connections(bleio_adapter_obj_t *self) {
+
+    size_t total_connected = 0;
+    mp_obj_t items[BLEIO_TOTAL_CONNECTION_COUNT];
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+
+    if (self->connection_objs != NULL) {
+        return self->connection_objs;
+    }
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle != BLEIO_HANDLE_INVALID) {
+            if (connection->connection_obj == mp_const_none) {
+                connection->connection_obj =
+                    bleio_connection_new_from_internal(connection);
+            }
+            items[total_connected] = connection->connection_obj;
+            total_connected++;
+        }
+    }
+    self->connection_objs = mp_obj_new_tuple(total_connected, items);
+    return self->connection_objs;
+}
+
+void common_hal_bleio_adapter_remove_connection(uint8_t conn_handle) {
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+    osMutexAcquire(bluetooth_connection_mutex_id, osWaitForever);
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (conn_handle == connection->conn_handle) {
+            connection->connection_obj = NULL;
+            connection->conn_handle = BLEIO_HANDLE_INVALID;
+        }
+    }
+    osMutexRelease(bluetooth_connection_mutex_id);
+}
+
+// Delete all bonding
+void common_hal_bleio_adapter_erase_bonding(bleio_adapter_obj_t *self) {
+    sl_status_t sc;
+    sc = sl_bt_sm_delete_bondings();
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("All bonding deleted fail."));
+    }
+}
+
+// Get status bonding to central
+bool common_hal_bleio_adapter_is_bonded_to_central(bleio_adapter_obj_t *self) {
+    bleio_connection_internal_t *connection;
+    uint8_t conn_index;
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle != BLEIO_HANDLE_INVALID) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter) {
+    // We divide by size_t so that we can scan each 32-bit aligned value to see
+    // if it is a pointer. This allows us to change the structs without worrying
+    // about collecting new pointers.
+    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)));
+}
+
+// Reset the BLE adapter
+void bleio_adapter_reset(bleio_adapter_obj_t *adapter) {
+
+    bool any_connected = false;
+    uint64_t start_ticks;
+    uint8_t conn_index;
+    bleio_connection_internal_t *connection;
+
+    common_hal_bleio_adapter_stop_scan(adapter);
+    if (common_hal_bleio_adapter_get_advertising(adapter)) {
+        common_hal_bleio_adapter_stop_advertising(adapter);
+    }
+
+    adapter->connection_objs = NULL;
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        // Disconnect all connections cleanly.
+        if (connection->conn_handle != BLEIO_HANDLE_INVALID) {
+            common_hal_bleio_connection_disconnect(connection);
+        }
+        connection->connection_obj = mp_const_none;
+    }
+
+    // Wait up to 125 ms (128 ticks) for disconnect to complete. This should be
+    // greater than most connection intervals.
+    start_ticks = supervisor_ticks_ms64();
+    while (any_connected && supervisor_ticks_ms64() - start_ticks < 128) {
+        any_connected = false;
+        for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+            connection = &bleio_connections[conn_index];
+            any_connected |= connection->conn_handle != BLEIO_HANDLE_INVALID;
+        }
+    }
+}
diff --git a/ports/silabs/common-hal/_bleio/Adapter.h b/ports/silabs/common-hal/_bleio/Adapter.h
new file mode 100644
index 0000000000..d7f252df33
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Adapter.h
@@ -0,0 +1,87 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ADAPTER_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ADAPTER_H
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+#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
+
+#define BLEIO_HANDLE_INVALID 0xffff
+#define BLE_GAP_ADDR_LEN 6
+
+extern bleio_connection_internal_t
+    bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
+
+extern EventGroupHandle_t xscan_event;
+
+typedef struct {
+    mp_obj_base_t base;
+    bleio_scanresults_obj_t *scan_results;
+    mp_obj_t name;
+    mp_obj_tuple_t *connection_objs;
+    background_callback_t background_callback;
+    bool user_advertising;
+    bool is_enable;
+    uint8_t advertising_handle;
+} bleio_adapter_obj_t;
+
+typedef struct {
+    uint8_t addr_id_peer : 1;
+    uint8_t addr_type : 7;
+    uint8_t addr[BLE_GAP_ADDR_LEN];
+} ble_gap_addr_t;
+
+typedef struct {
+    // Pointer to the data buffer provided to/from the application.
+    uint8_t *p_data;
+    // Length of the data buffer, in bytes.
+    uint16_t len;
+} ble_data_t;
+
+typedef struct {
+    uint8_t address_type;
+    uint8_t conn_handle;
+    uint8_t data_len;
+    int8_t rssi;
+    bd_addr address;
+    uint8_t data[255];
+} device_scan_info_t;
+
+void set_scan_device_info_on_ble_evt(bd_addr address, uint8_t address_type,
+    int8_t rssi, uint8array *data);
+void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter);
+void bleio_adapter_reset(bleio_adapter_obj_t *adapter);
+void common_hal_bleio_adapter_remove_connection(uint8_t conn_handle);
+
+#endif  // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ADAPTER_H
diff --git a/ports/silabs/common-hal/_bleio/Attribute.c b/ports/silabs/common-hal/_bleio/Attribute.c
new file mode 100644
index 0000000000..2e477a72ba
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Attribute.c
@@ -0,0 +1,27 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/_bleio/Attribute.h"
diff --git a/ports/silabs/common-hal/_bleio/Attribute.h b/ports/silabs/common-hal/_bleio/Attribute.h
new file mode 100644
index 0000000000..b2a635005b
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Attribute.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ATTRIBUTE_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ATTRIBUTE_H
+
+#include "shared-module/_bleio/Attribute.h"
+
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_ATTRIBUTE_H
diff --git a/ports/silabs/common-hal/_bleio/Characteristic.c b/ports/silabs/common-hal/_bleio/Characteristic.c
new file mode 100644
index 0000000000..a39180b19b
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Characteristic.c
@@ -0,0 +1,407 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include 
+#include "py/runtime.h"
+#include "common-hal/_bleio/Adapter.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+#include "shared-bindings/_bleio/Descriptor.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared/runtime/interrupt_char.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/serial.h"
+
+EventGroupHandle_t xcharacteristic_event;
+
+// Set the characteristic data from sl_bt_on_event
+bool set_characteristic_value_on_ble_evt(uint8_t conn_handle,
+    uint16_t char_handle,
+    uint8_t *data,
+    size_t data_len) {
+
+    uint8_t serv_index;
+    uint8_t charc_index;
+    bleio_service_obj_t *service;
+    bleio_characteristic_obj_t *characteristic;
+    bleio_connection_internal_t *connection =
+        bleio_conn_handle_to_connection(conn_handle);
+    if (NULL == connection) {
+        mp_raise_bleio_BluetoothError(translate("Get connection fail."));
+        return false;
+    }
+    for (serv_index = 0; serv_index < connection->remote_service_list->len; serv_index++) {
+        service = connection->remote_service_list->items[serv_index];
+
+        for (charc_index = 0; charc_index < service->characteristic_list->len; charc_index++) {
+            characteristic = service->characteristic_list->items[charc_index];
+
+            if (char_handle == characteristic->handle) {
+                characteristic->current_value = pvPortMalloc(data_len);
+                characteristic->current_value_len = data_len;
+                memcpy(characteristic->current_value, data, data_len);
+
+                if (xcharacteristic_event != NULL) {
+                    xEventGroupSetBits(xcharacteristic_event, 1 << 0);
+                }
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Get the characteristic data object
+STATIC bool get_characteristic_value(uint8_t conn_handle,
+    uint16_t char_handle,
+    uint8_t *data,
+    size_t *data_len) {
+
+    uint8_t serv_index;
+    uint8_t charc_index;
+    bleio_service_obj_t *service;
+    bleio_characteristic_obj_t *characteristic;
+    bleio_connection_internal_t *connection = bleio_conn_handle_to_connection(conn_handle);
+
+    if (NULL == connection) {
+        mp_raise_bleio_BluetoothError(translate("Get connection fail."));
+        return false;
+    }
+    for (serv_index = 0; serv_index < connection->remote_service_list->len; serv_index++) {
+        service = connection->remote_service_list->items[serv_index];
+
+        for (charc_index = 0; charc_index < service->characteristic_list->len; charc_index++) {
+            characteristic = service->characteristic_list->items[charc_index];
+
+            if (char_handle == characteristic->handle) {
+                *data_len = characteristic->current_value_len;
+                memcpy(data, characteristic->current_value, *data_len);
+                vPortFree(characteristic->current_value);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Create new bleio characteristic
+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->handle = BLEIO_HANDLE_INVALID;
+    self->cccd_handle = BLEIO_HANDLE_INVALID;
+    self->sccd_handle = BLEIO_HANDLE_INVALID;
+    self->props = props;
+    self->read_perm = read_perm;
+    self->write_perm = write_perm;
+    self->max_length = max_length > MAX_LENGTH_DATA ? MAX_LENGTH_DATA : max_length;
+    self->max_length = self->max_length ? self->max_length : MAX_LENGTH_DATA;
+    self->fixed_length = fixed_length;
+
+    if (gc_alloc_possible()) {
+        self->descriptor_list = mp_obj_new_list(0, NULL);
+    } else {
+        self->descriptor_list = NULL;
+    }
+
+    if (service->is_remote) {
+        self->handle = handle;
+    } else {
+        common_hal_bleio_service_add_characteristic(self->service,
+            self,
+            initial_value_bufinfo,
+            user_description);
+
+        sl_bt_gatt_server_write_attribute_value(
+            self->handle,
+            0,
+            initial_value_bufinfo->len,
+            (uint8_t *)initial_value_bufinfo->buf);
+    }
+}
+
+// A tuple of Descriptor that describe this characteristic
+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);
+}
+
+// The Service this Characteristic is a part of
+bleio_service_obj_t *common_hal_bleio_characteristic_get_service(
+    bleio_characteristic_obj_t *self) {
+
+    return self->service;
+}
+
+// Get value of characteristic
+size_t common_hal_bleio_characteristic_get_value(
+    bleio_characteristic_obj_t *self,
+    uint8_t *buf,
+    size_t len) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    EventBits_t ux_bits;
+    uint8_t retry = 10;
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t current_ticks = start_ticks;
+
+    if (self->handle == BLEIO_HANDLE_INVALID) {
+        return 0;
+    }
+    uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
+
+    if (common_hal_bleio_service_get_is_remote(self->service)) {
+        // ble client gets characteristic value
+        if (BT_GATT_CHRC_READ & self->props) {
+            sc = sl_bt_gatt_read_characteristic_value(conn_handle,self->handle);
+            while (SL_STATUS_OK != sc && retry > 0) {
+                sc = sl_bt_gatt_read_characteristic_value(conn_handle,self->handle);
+                vTaskDelay(100 / portTICK_PERIOD_MS);
+                retry--;
+            }
+        }
+
+        xcharacteristic_event = xEventGroupCreate();
+        if (xcharacteristic_event != NULL) {
+            xEventGroupClearBits(xcharacteristic_event, 1 << 0);
+        }
+
+        while (current_ticks - start_ticks <= GET_CHARACTERISTIC_TIMEOUT_MS) {
+            if (xcharacteristic_event != NULL) {
+                ux_bits = xEventGroupWaitBits(
+                    xcharacteristic_event, 1 << 0, pdTRUE, pdFALSE,
+                        GET_CHARACTERISTIC_TIMEOUT_MS / portTICK_PERIOD_MS);
+
+                if ((ux_bits & (1 << 0)) == (1 << 0)) {
+                    break;
+                }
+            }
+            current_ticks = supervisor_ticks_ms64();
+            // Allow user to break out of a timeout with a KeyboardInterrupt.
+            if (mp_hal_is_interrupted()) {
+                break;
+            }
+        }
+        get_characteristic_value(conn_handle, self->handle, buf, &len);
+        vEventGroupDelete(xcharacteristic_event);
+        return len;
+
+    } else {
+        sc = sl_bt_gatt_server_read_attribute_value(self->handle,
+            0,
+            self->max_length,
+            &len,
+            (uint8_t *)buf);
+        if (SL_STATUS_OK != sc) {
+            mp_raise_bleio_BluetoothError(
+                translate("Read_attribute_value fail!"));
+        }
+        return len;
+    }
+
+    return 0;
+}
+
+// Get max length of charateristic
+size_t common_hal_bleio_characteristic_get_max_length(
+    bleio_characteristic_obj_t *self) {
+    return self->max_length;
+}
+
+// Set value of this characteristic
+void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self,
+    mp_buffer_info_t *bufinfo) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    uint16_t conn_handle;
+    uint16_t sent_len;
+
+    if (common_hal_bleio_service_get_is_remote(self->service)) {
+
+        conn_handle = bleio_connection_get_conn_handle(self->service->connection);
+        if ((self->props & CHAR_PROP_WRITE_NO_RESPONSE) != 0) {
+            sc = sl_bt_gatt_write_characteristic_value_without_response(
+                conn_handle,
+                self->handle,
+                bufinfo->len,
+                bufinfo->buf,
+                &sent_len);
+        } else {
+            sc = sl_bt_gatt_write_characteristic_value(conn_handle,
+                self->handle,
+                bufinfo->len,
+                bufinfo->buf);
+        }
+    } else {
+        if (self->props & BT_GATT_CHRC_READ) {
+            sc = sl_bt_gatt_server_write_attribute_value(self->handle,
+                0,
+                bufinfo->len,
+                (uint8_t *)bufinfo->buf);
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Write_attribute_value fail!"));
+            }
+        }
+
+        if (self->props & BT_GATT_CHRC_NOTIFY) {
+            sc = sl_bt_gatt_server_send_notification(
+                1,
+                self->handle,
+                bufinfo->len,
+                (uint8_t *)bufinfo->buf);
+        }
+
+        if (self->props & BT_GATT_CHRC_INDICATE) {
+            sc = sl_bt_gatt_server_send_indication(
+                1,
+                self->handle,
+                bufinfo->len,
+                (uint8_t *)bufinfo->buf);
+        }
+    }
+}
+
+// Get UUID of this characteristic
+bleio_uuid_obj_t *common_hal_bleio_characteristic_get_uuid(
+    bleio_characteristic_obj_t *self) {
+    return self->uuid;
+}
+
+// Get properties of this characteristic
+bleio_characteristic_properties_t common_hal_bleio_characteristic_get_properties(
+    bleio_characteristic_obj_t *self) {
+    return self->props;
+}
+
+// Add new descriptor to characteristic
+void common_hal_bleio_characteristic_add_descriptor(
+    bleio_characteristic_obj_t *self,
+    bleio_descriptor_obj_t *descriptor) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    const uint8_t value;
+    uuid_128 bt_uuid_128;
+    sl_bt_uuid_16_t bt_uuid_16;
+    uint16_t gattdb_session;
+
+    sc = sl_bt_gattdb_new_session(&gattdb_session);
+
+    if (SL_STATUS_OK != sc && SL_STATUS_ALREADY_EXISTS != sc) {
+        mp_raise_bleio_BluetoothError(translate("Create new session fail."));
+        return;
+    }
+
+    if (BLE_UUID_TYPE_16 == descriptor->uuid->efr_ble_uuid.uuid.type) {
+        bt_uuid_16.data[0] = descriptor->uuid->efr_ble_uuid.uuid16.value & 0xff;
+        bt_uuid_16.data[1] = descriptor->uuid->efr_ble_uuid.uuid16.value >> 8;
+
+        sl_bt_gattdb_add_uuid16_descriptor(self->session,
+            self->handle,
+            descriptor->handle,
+            0,
+            bt_uuid_16,
+            sl_bt_gattdb_user_managed_value,
+            descriptor->max_length,
+            2,
+            &value,
+            &descriptor->handle);
+    } else {
+        memcpy(bt_uuid_128.data, descriptor->uuid->efr_ble_uuid.uuid128.value, 16);
+        sl_bt_gattdb_add_uuid128_descriptor(self->session,
+            self->handle,
+            descriptor->handle,
+            0,
+            bt_uuid_128,
+            sl_bt_gattdb_user_managed_value,
+            descriptor->max_length,
+            2,
+            &value,
+            &descriptor->handle);
+    }
+
+    sc = sl_bt_gattdb_commit(gattdb_session);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Commit descriptor fail."));
+        return;
+    }
+
+    mp_obj_list_append(MP_OBJ_FROM_PTR(self->descriptor_list),
+        MP_OBJ_FROM_PTR(descriptor));
+}
+
+// Set the remote characteristic’s CCCD to enable or disable notification and indication.
+void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
+    bool notify,bool indicate) {
+
+    sl_status_t sc = SL_STATUS_FAIL;
+
+    const uint16_t conn_handle = bleio_connection_get_conn_handle(
+        self->service->connection);
+    common_hal_bleio_check_connected(conn_handle);
+    notify = 1;
+    indicate = 0;
+    if (notify) {
+        sc = sl_bt_gatt_set_characteristic_notification(conn_handle,
+            self->handle,sl_bt_gatt_notification);
+        if (SL_STATUS_OK != sc) {
+            mp_raise_bleio_BluetoothError(translate("Notify fail"));
+        }
+    }
+
+    if (indicate) {
+        sc = sl_bt_gatt_set_characteristic_notification(conn_handle,
+            self->handle,sl_bt_gatt_indication);
+        if (SL_STATUS_OK != sc) {
+            mp_raise_bleio_BluetoothError(translate("Indicate fail"));
+        }
+    }
+
+    if (0 == notify && 0 == indicate) {
+        sc = sl_bt_gatt_set_characteristic_notification(conn_handle,
+            self->handle,sl_bt_gatt_disable);
+        if (SL_STATUS_OK != sc) {
+            mp_raise_bleio_BluetoothError(translate("Indicate fail"));
+        }
+    }
+}
diff --git a/ports/silabs/common-hal/_bleio/Characteristic.h b/ports/silabs/common-hal/_bleio/Characteristic.h
new file mode 100644
index 0000000000..9605988b68
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Characteristic.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTIC_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTIC_H
+
+#include "shared-bindings/_bleio/Attribute.h"
+#include "common-hal/_bleio/Descriptor.h"
+#include "shared-module/_bleio/Characteristic.h"
+#include "common-hal/_bleio/Service.h"
+#include "common-hal/_bleio/UUID.h"
+
+#define MAX_LENGTH_DATA 512
+#define GET_CHARACTERISTIC_TIMEOUT_MS 1000
+
+typedef struct _bleio_characteristic_obj {
+    mp_obj_base_t base;
+    // Will be MP_OBJ_NULL before being assigned to a Service.
+    bleio_service_obj_t *service;
+    bleio_uuid_obj_t *uuid;
+    uint8_t *current_value;
+    uint16_t current_value_len;
+    // Our internal allocation length. If > 0, then current_value is managed by
+    //  this characteristic.
+    uint16_t current_value_alloc;
+    uint16_t max_length;
+    uint16_t def_handle;
+    uint16_t handle;
+    uint16_t session;
+    bleio_characteristic_properties_t props;
+    bleio_attribute_security_mode_t read_perm;
+    bleio_attribute_security_mode_t write_perm;
+    mp_obj_list_t *descriptor_list;
+    uint16_t user_desc_handle;
+    uint16_t cccd_handle;
+    uint16_t sccd_handle;
+    bool fixed_length;
+} bleio_characteristic_obj_t;
+
+bool set_characteristic_value_on_ble_evt(uint8_t conn_handle,
+    uint16_t char_handle,
+    uint8_t *data,
+    size_t data_len);
+
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTIC_H
diff --git a/ports/silabs/common-hal/_bleio/CharacteristicBuffer.c b/ports/silabs/common-hal/_bleio/CharacteristicBuffer.c
new file mode 100644
index 0000000000..653de697cd
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/CharacteristicBuffer.c
@@ -0,0 +1,164 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include 
+#include "py/ringbuf.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/CharacteristicBuffer.h"
+#include "common-hal/_bleio/CharacteristicBuffer.h"
+#include "shared/runtime/interrupt_char.h"
+#include "supervisor/shared/tick.h"
+
+// Characteristic buffer list of peripheral device
+bleio_characteristic_buffer_obj_list_t bleio_characteristic_buffer_list;
+
+bool characteristic_buffer_on_ble_evt(uint16_t attribute,
+    uint8_t *data,
+    uint16_t len) {
+
+    uint16_t cindex = 0;
+    for (cindex = 0; cindex < bleio_characteristic_buffer_list.len; cindex++) {
+        if (bleio_characteristic_buffer_list.data[cindex] != NULL &&
+            bleio_characteristic_buffer_list.data[cindex]->characteristic->handle == attribute) {
+            taskENTER_CRITICAL();
+            if (bleio_characteristic_buffer_list.data[cindex]->watch_for_interrupt_char) {
+                for (uint16_t i = 0; i < len; i++) {
+                    if (data[i] == mp_interrupt_char) {
+                        mp_sched_keyboard_interrupt();
+                    } else {
+                        ringbuf_put(&bleio_characteristic_buffer_list.data[cindex]->ringbuf, data[i]);
+                    }
+                }
+            } else {
+                ringbuf_put_n(&bleio_characteristic_buffer_list.data[cindex]->ringbuf,data, len);
+            }
+            taskEXIT_CRITICAL();
+
+            return true;
+        }
+    }
+    return false;
+}
+
+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,
+    bool watch_for_interrupt_char) {
+
+    self->characteristic = characteristic;
+    self->timeout_ms = timeout * 1000;
+    self->watch_for_interrupt_char = watch_for_interrupt_char;
+    ringbuf_init(&self->ringbuf, buffer, buffer_size);
+}
+
+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) {
+
+    uint8_t *buffer = m_malloc(buffer_size, true);
+    _common_hal_bleio_characteristic_buffer_construct(self,
+        characteristic,
+        timeout,
+        buffer,
+        buffer_size,
+        NULL,
+        false);
+
+    bleio_characteristic_buffer_list.data[bleio_characteristic_buffer_list.len] = self;
+    bleio_characteristic_buffer_list.len++;
+}
+
+uint32_t common_hal_bleio_characteristic_buffer_read(
+    bleio_characteristic_buffer_obj_t *self,
+    uint8_t *data,
+    size_t len,
+    int *errcode) {
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    // Wait for all bytes received or timeout
+    while ((ringbuf_num_filled(&self->ringbuf) < len) &&
+           (supervisor_ticks_ms64() - start_ticks < self->timeout_ms)) {
+        RUN_BACKGROUND_TASKS;
+        // Allow user to break out of a timeout with a KeyboardInterrupt.
+        if (mp_hal_is_interrupted()) {
+            return 0;
+        }
+    }
+    taskENTER_CRITICAL();
+    uint32_t num_bytes_read = ringbuf_get_n(&self->ringbuf, data, len);
+    taskEXIT_CRITICAL();
+
+    return num_bytes_read;
+}
+
+uint32_t common_hal_bleio_characteristic_buffer_rx_characters_available(
+    bleio_characteristic_buffer_obj_t *self) {
+    return ringbuf_num_filled(&self->ringbuf);
+}
+
+void common_hal_bleio_characteristic_buffer_clear_rx_buffer(
+    bleio_characteristic_buffer_obj_t *self) {
+    taskENTER_CRITICAL();
+    ringbuf_clear(&self->ringbuf);
+    taskEXIT_CRITICAL();
+}
+
+bool common_hal_bleio_characteristic_buffer_deinited(
+    bleio_characteristic_buffer_obj_t *self) {
+    return self->characteristic == NULL;
+}
+
+void common_hal_bleio_characteristic_buffer_deinit(bleio_characteristic_buffer_obj_t *self) {
+    if (!common_hal_bleio_characteristic_buffer_deinited(self)) {
+        self->characteristic = NULL;
+        ringbuf_deinit(&self->ringbuf);
+    }
+}
+
+bool common_hal_bleio_characteristic_buffer_connected(
+    bleio_characteristic_buffer_obj_t *self) {
+    return self->characteristic != NULL &&
+           self->characteristic->service != NULL &&
+           (!self->characteristic->service->is_remote ||
+               (self->characteristic->service->connection != MP_OBJ_NULL &&
+                   common_hal_bleio_connection_get_connected(self->characteristic->service->connection)));
+}
+
+void reset_characteristic_buffer_list() {
+    // Remove characteristic_buffer list
+    memset(bleio_characteristic_buffer_list.data, 0,
+        sizeof(bleio_characteristic_buffer_list.data));
+    bleio_characteristic_buffer_list.len = 0;
+}
diff --git a/ports/silabs/common-hal/_bleio/CharacteristicBuffer.h b/ports/silabs/common-hal/_bleio/CharacteristicBuffer.h
new file mode 100644
index 0000000000..6acb52e790
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/CharacteristicBuffer.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
+
+#include "py/ringbuf.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+
+#define MAX_NUMBER_CHARACTERISTIC_BUFFER 64
+#define GET_CHARACTERISTIC_TIMEOUT_MS 1000
+typedef struct {
+    mp_obj_base_t base;
+    bleio_characteristic_obj_t *characteristic;
+    uint32_t timeout_ms;
+    // Ring buffer storing consecutive incoming values
+    ringbuf_t ringbuf;
+    bool watch_for_interrupt_char;
+} bleio_characteristic_buffer_obj_t;
+
+typedef struct
+{
+    bleio_characteristic_buffer_obj_t *data[MAX_NUMBER_CHARACTERISTIC_BUFFER];
+    uint8_t len;
+} bleio_characteristic_buffer_obj_list_t;
+
+extern bleio_characteristic_buffer_obj_list_t bleio_characteristic_buffer_list;
+extern bool characteristic_buffer_on_ble_evt(uint16_t attribute,
+    uint8_t *data,
+    uint16_t len);
+extern void reset_characteristic_buffer_list();
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CHARACTERISTICBUFFER_H
diff --git a/ports/silabs/common-hal/_bleio/Connection.c b/ports/silabs/common-hal/_bleio/Connection.c
new file mode 100644
index 0000000000..ad3f6db198
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Connection.c
@@ -0,0 +1,274 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include 
+#include "py/gc.h"
+#include "py/objlist.h"
+#include "py/objstr.h"
+#include "py/qstr.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/Adapter.h"
+#include "shared-bindings/_bleio/Attribute.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/UUID.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-module/_bleio/Characteristic.h"
+#include "shared/runtime/interrupt_char.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/serial.h"
+
+// Give 10 seconds for discovery
+#define DISCOVERY_TIMEOUT_MS 10000
+EventGroupHandle_t xdiscovery_event;
+
+// Get the remote peer status
+bool common_hal_bleio_connection_get_paired(bleio_connection_obj_t *self) {
+    if (self->connection == NULL) {
+        return false;
+    }
+
+    return self->connection->pair_status == PAIR_PAIRED;
+}
+
+// Get connected status
+bool common_hal_bleio_connection_get_connected(bleio_connection_obj_t *self) {
+    if (self->connection == NULL) {
+        return false;
+    }
+    return self->connection->conn_handle != BLEIO_HANDLE_INVALID;
+}
+
+// Disconnects from the remote peripheral
+void common_hal_bleio_connection_disconnect(bleio_connection_internal_t *self) {
+    sl_bt_connection_close(self->conn_handle);
+}
+
+// Pair to the peer to improve security
+void common_hal_bleio_connection_pair(bleio_connection_internal_t *self,
+    bool bond) {
+
+    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;
+
+    while (self->pair_status == PAIR_WAITING && !mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+    }
+    if (mp_hal_is_interrupted()) {
+        return;
+    }
+}
+
+// Get time between transmissions in milliseconds
+mp_float_t common_hal_bleio_connection_get_connection_interval(
+    bleio_connection_internal_t *self) {
+    // TODO: Implement this.
+    return 0;
+}
+
+// The maximum number of data bytes that can be sent in a single transmission
+mp_int_t common_hal_bleio_connection_get_max_packet_length(
+    bleio_connection_internal_t *self) {
+
+    sl_status_t sc = sl_bt_gatt_server_get_mtu(self->conn_handle,&self->mtu);
+    if (sc != SL_STATUS_OK) {
+        mp_raise_bleio_BluetoothError(translate("gatt_server_get_mtu fail."));
+    }
+
+    return self->mtu;
+}
+
+// Set time between transmissions in milliseconds
+void common_hal_bleio_connection_set_connection_interval(
+    bleio_connection_internal_t *self,
+    mp_float_t new_interval) {
+    self->conn_params_updating = true;
+    // TODO: Implement this.
+}
+
+// Do BLE discovery for all services
+mp_obj_tuple_t *common_hal_bleio_connection_discover_remote_services(
+    bleio_connection_obj_t *self,
+    mp_obj_t service_uuids_whitelist) {
+
+    EventBits_t ux_bits;
+    mp_obj_iter_buf_t iter_buf;
+    mp_obj_t iterable;
+    mp_obj_t uuid_obj;
+    mp_obj_tuple_t *services_tuple;
+    sl_status_t sc = SL_STATUS_FAIL;
+    bleio_uuid_obj_t *uuid;
+    uint8_t uuid16_value[2];
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t current_ticks = start_ticks;
+
+    xdiscovery_event = xEventGroupCreate();
+    if (xdiscovery_event != NULL) {
+        xEventGroupClearBits(xdiscovery_event,1 << 0);
+    }
+    self->connection->remote_service_list = mp_obj_new_list(0, NULL);
+    bleio_connection_ensure_connected(self);
+    if (NULL == self->connection->remote_service_list) {
+        mp_raise_bleio_BluetoothError(
+            translate("Create new remote service list fail."));
+        return mp_const_none;
+    }
+    vTaskDelay(500 / portTICK_PERIOD_MS);
+
+    if (service_uuids_whitelist == mp_const_none) {
+
+        sc = sl_bt_gatt_discover_primary_services(self->connection->conn_handle);
+        if (SL_STATUS_OK != sc) {
+            mp_raise_bleio_BluetoothError(translate("Discover uuid fail."));
+            return mp_const_none;
+        }
+
+        while (current_ticks - start_ticks <= DISCOVERY_TIMEOUT_MS) {
+
+            if (xdiscovery_event != NULL) {
+                ux_bits = xEventGroupWaitBits(
+                    xdiscovery_event,
+                    1 << 0,
+                        pdTRUE,pdFALSE,
+                        DISCOVERY_TIMEOUT_MS / portTICK_PERIOD_MS);
+
+                if ((ux_bits & (1 << 0)) == (1 << 0)) {
+                    break;
+                }
+            }
+            current_ticks = supervisor_ticks_ms64();
+            // Allow user to break out of a timeout with a KeyboardInterrupt.
+            if (mp_hal_is_interrupted()) {
+                break;
+            }
+        }
+
+    } else {
+
+        iterable = mp_getiter(service_uuids_whitelist, &iter_buf);
+        while ((uuid_obj = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+            if (!mp_obj_is_type(uuid_obj, &bleio_uuid_type)) {
+                mp_raise_TypeError(
+                    translate("non-UUID found in service_uuids_whitelist"));
+            }
+            uuid = MP_OBJ_TO_PTR(uuid_obj);
+
+            if (BLE_UUID_TYPE_16 == uuid->efr_ble_uuid.uuid.type) {
+                uuid16_value[0] = uuid->efr_ble_uuid.uuid16.value & 0xff;
+                uuid16_value[1] = uuid->efr_ble_uuid.uuid16.value >> 8;
+                sc = sl_bt_gatt_discover_primary_services_by_uuid(
+                    self->connection->conn_handle,2,uuid16_value);
+
+            } else if (BLE_UUID_TYPE_128 == uuid->efr_ble_uuid.uuid.type) {
+                sc = sl_bt_gatt_discover_primary_services_by_uuid(
+                    self->connection->conn_handle,
+                    16,
+                    uuid->efr_ble_uuid.uuid128.value);
+            }
+
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(translate("Discover fail."));
+                return mp_const_none;
+            }
+
+            while (current_ticks - start_ticks <= DISCOVERY_TIMEOUT_MS) {
+
+                if (xdiscovery_event != NULL) {
+                    ux_bits = xEventGroupWaitBits(
+                        xdiscovery_event,
+                        1 << 0,
+                            pdTRUE,
+                            pdFALSE,
+                            DISCOVERY_TIMEOUT_MS / portTICK_PERIOD_MS);
+
+                    if ((ux_bits & (1 << 0)) == (1 << 0)) {
+                        break;
+                    }
+                }
+                current_ticks = supervisor_ticks_ms64();
+                if (mp_hal_is_interrupted()) {
+                    break;
+                }
+            }
+        }
+    }
+
+    vEventGroupDelete(xdiscovery_event);
+    services_tuple = mp_obj_new_tuple(self->connection->remote_service_list->len,
+        self->connection->remote_service_list->items);
+
+    if (NULL == services_tuple) {
+        mp_raise_ValueError(translate("Create new service tuple fail."));
+        return mp_const_none;
+    }
+    return services_tuple;
+}
+
+// Get connection handle
+uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self) {
+    if (self == NULL || self->connection == NULL) {
+        return BLEIO_HANDLE_INVALID;
+    }
+    return self->connection->conn_handle;
+}
+
+mp_obj_t bleio_connection_new_from_internal(
+    bleio_connection_internal_t *internal) {
+
+    bleio_connection_obj_t *connection;
+    if (internal->connection_obj != mp_const_none) {
+        return internal->connection_obj;
+    }
+    connection = m_new_obj(bleio_connection_obj_t);
+    connection->base.type = &bleio_connection_type;
+    connection->connection = internal;
+    internal->connection_obj = connection;
+
+    return MP_OBJ_FROM_PTR(connection);
+}
+
+// Get internal connection object by handle connection
+bleio_connection_internal_t *bleio_conn_handle_to_connection(
+    uint16_t conn_handle) {
+    bleio_connection_internal_t *connection;
+    uint8_t conn_index;
+    for (conn_index = 0; conn_index < BLEIO_TOTAL_CONNECTION_COUNT; conn_index++) {
+        connection = &bleio_connections[conn_index];
+        if (connection->conn_handle == conn_handle) {
+            return connection;
+        }
+    }
+    return NULL;
+}
diff --git a/ports/silabs/common-hal/_bleio/Connection.h b/ports/silabs/common-hal/_bleio/Connection.h
new file mode 100644
index 0000000000..56872024c9
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Connection.h
@@ -0,0 +1,96 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CONNECTION_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_CONNECTION_H
+
+#include 
+
+#include "common-hal/_bleio/__init__.h"
+#include "py/obj.h"
+#include "py/objlist.h"
+#include "common-hal/_bleio/Service.h"
+#include "shared-module/_bleio/Address.h"
+#include "FreeRTOS.h"
+#include "event_groups.h"
+
+typedef enum {
+    PAIR_NOT_PAIRED,
+    PAIR_WAITING,
+    PAIR_PAIRED,
+} pair_status_t;
+
+// We split the Connection object into two so that
+// the internal mechanics can live outside of theVM.
+// If it were one object, then we'd risk user code seeing
+// a connection object of theirs be reused.
+typedef struct
+{
+    uint16_t conn_handle;
+    bool is_central;
+    // Remote services discovered when this peripheral is acting as a client.
+    mp_obj_list_t *remote_service_list;
+    // The advertising data and scan response buffers are held by us,
+    // not by the SD, so we must maintain them and not change it.
+    // If we need to change the contents during advertising,
+    // there are tricks to get the SD to notice (see DevZone - TBS).
+    // bonding_keys_t bonding_keys;
+    // EDIV: Encrypted Diversifier: Identifies LTK during legacy pairing.
+    uint16_t ediv;
+    volatile pair_status_t pair_status;
+    uint8_t sec_status;  // Internal security status.
+    mp_obj_t connection_obj;
+    volatile bool conn_params_updating;
+    uint16_t mtu;
+    // Request that CCCD values for this connection be saved,
+    // using sys_attr values.
+    volatile bool do_bond_cccds;
+    // Request that security key info for this connection be saved.
+    volatile bool do_bond_keys;
+    // Time of setting do_bond_ccds: we delay a bit to consolidate
+    // multiple CCCD changes into one write. Time is currently in ticks_ms.
+    uint64_t do_bond_cccds_request_time;
+} bleio_connection_internal_t;
+
+typedef struct
+{
+    mp_obj_base_t base;
+    bleio_connection_internal_t *connection;
+    // The HCI disconnect reason.
+    uint8_t disconnect_reason;
+} bleio_connection_obj_t;
+
+void bleio_connection_clear(bleio_connection_internal_t *self);
+
+uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
+
+mp_obj_t bleio_connection_new_from_internal(
+    bleio_connection_internal_t *connection);
+
+bleio_connection_internal_t *bleio_conn_handle_to_connection(
+    uint16_t conn_handle);
+extern EventGroupHandle_t xdiscovery_event;
+#endif  // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_BLEIO_CONNECTION_H
diff --git a/ports/silabs/common-hal/_bleio/Descriptor.c b/ports/silabs/common-hal/_bleio/Descriptor.c
new file mode 100644
index 0000000000..6a40f1f859
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Descriptor.c
@@ -0,0 +1,114 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Descriptor.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/UUID.h"
+
+void common_hal_bleio_descriptor_construct(
+    bleio_descriptor_obj_t *self,
+    bleio_characteristic_obj_t *characteristic,
+    bleio_uuid_obj_t *uuid,
+    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 mp_int_t max_length_max = BLE_ATT_ATTR_MAX_LEN;
+    self->uuid = uuid;
+    self->handle = BLEIO_HANDLE_INVALID;
+    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);
+
+    if (max_length < 0 || max_length > max_length_max) {
+        mp_raise_ValueError_varg(
+            translate("max_length must be 0-%d when fixed_length is %s"),
+            max_length_max, fixed_length ? "True" : "False");
+    }
+    self->max_length = max_length;
+    self->fixed_length = fixed_length;
+}
+
+//  Get descriptor uuid
+bleio_uuid_obj_t *common_hal_bleio_descriptor_get_uuid(
+    bleio_descriptor_obj_t *self) {
+    return self->uuid;
+}
+
+bleio_characteristic_obj_t *common_hal_bleio_descriptor_get_characteristic(
+    bleio_descriptor_obj_t *self) {
+    return self->characteristic;
+}
+
+size_t common_hal_bleio_descriptor_get_value(bleio_descriptor_obj_t *self,
+    uint8_t *buf, size_t len) {
+
+    uint16_t conn_handle;
+    if (self->handle != BLE_GATT_HANDLE_INVALID) {
+        conn_handle = bleio_connection_get_conn_handle(
+            self->characteristic->service->connection);
+        if (common_hal_bleio_service_get_is_remote(
+            self->characteristic->service)) {
+
+            sl_bt_gatt_read_descriptor_value(conn_handle, self->handle);
+        }
+    }
+
+    return 0;
+}
+
+// Set value to descriptor
+void common_hal_bleio_descriptor_set_value(bleio_descriptor_obj_t *self,
+    mp_buffer_info_t *bufinfo) {
+
+    uint16_t conn_handle;
+    if (self->handle != BLE_GATT_HANDLE_INVALID) {
+        conn_handle = bleio_connection_get_conn_handle(
+            self->characteristic->service->connection);
+        if (common_hal_bleio_service_get_is_remote(
+            self->characteristic->service)) {
+
+            // false means WRITE_REQ, not write-no-response
+            sl_bt_gatt_write_descriptor_value(conn_handle,
+                self->handle,
+                bufinfo->len,
+                bufinfo->buf);
+        } else {
+            // Validate data length for local descriptors only.
+            if (self->fixed_length && bufinfo->len != self->max_length) {
+                mp_raise_ValueError(
+                    translate("Value length != required fixed length"));
+            }
+            if (bufinfo->len > self->max_length) {
+                mp_raise_ValueError(translate("Value length > max_length"));
+            }
+        }
+    }
+}
diff --git a/ports/silabs/common-hal/_bleio/Descriptor.h b/ports/silabs/common-hal/_bleio/Descriptor.h
new file mode 100644
index 0000000000..b71cac2b68
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Descriptor.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_DESCRIPTOR_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_DESCRIPTOR_H
+
+#include "py/obj.h"
+#include "common-hal/_bleio/UUID.h"
+#include "shared-module/_bleio/Attribute.h"
+
+#define BLE_ATT_ATTR_MAX_LEN 50
+
+// Forward declare characteristic because it includes a Descriptor.
+struct _bleio_characteristic_obj;
+
+typedef struct _bleio_descriptor_obj {
+    mp_obj_base_t base;
+    // Will be MP_OBJ_NULL before being assigned to a Characteristic.
+    struct _bleio_characteristic_obj *characteristic;
+    bleio_uuid_obj_t *uuid;
+    mp_obj_t initial_value;
+    uint16_t max_length;
+    bool fixed_length;
+    uint16_t handle;
+    // struct ble_gatt_dsc_def def;
+    bleio_attribute_security_mode_t read_perm;
+    bleio_attribute_security_mode_t write_perm;
+} bleio_descriptor_obj_t;
+
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_DESCRIPTOR_H
diff --git a/ports/silabs/common-hal/_bleio/PacketBuffer.c b/ports/silabs/common-hal/_bleio/PacketBuffer.c
new file mode 100644
index 0000000000..dd74e17099
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/PacketBuffer.c
@@ -0,0 +1,399 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include 
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/PacketBuffer.h"
+#include "shared/runtime/interrupt_char.h"
+#include "common-hal/_bleio/Connection.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/serial.h"
+
+// List packet buffer of peripheral device
+bleio_packet_buffer_obj_list_t bleio_packet_buffer_list;
+
+// Write data to ringbuf of packet buffer
+STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self,
+    uint8_t *data,
+    uint16_t len) {
+
+    uint16_t packet_length;
+    uint16_t packet_index;
+    if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) {
+        // This shouldn't happen but can if our buffer size was much smaller than
+        // the writes the client actually makes.
+        return;
+    }
+
+    taskENTER_CRITICAL();
+    // Push all the data onto the ring buffer.
+    // Make room for the new value by dropping the oldest packets first.
+    while (ringbuf_size(&self->ringbuf) - ringbuf_num_filled(&self->ringbuf) < len + sizeof(uint16_t)) {
+        ringbuf_get_n(&self->ringbuf,
+            (uint8_t *)&packet_length, sizeof(uint16_t));
+
+        for (packet_index = 0; packet_index < packet_length; packet_index++) {
+            ringbuf_get(&self->ringbuf);
+        }
+    }
+    ringbuf_put_n(&self->ringbuf, (uint8_t *)&len, sizeof(uint16_t));
+    ringbuf_put_n(&self->ringbuf, data, len);
+    taskEXIT_CRITICAL();
+}
+
+// Write characteristic or attribute value
+STATIC int queue_next_write(bleio_packet_buffer_obj_t *self) {
+    self->packet_queued = false;
+
+    uint32_t sc = SL_STATUS_OK;
+    if (self->pending_size > 0) {
+        if (self->client) {
+            if (self->write_type & BT_GATT_CHRC_WRITE_WITHOUT_RESP) {
+                uint16_t sent_len;
+                sc = sl_bt_gatt_write_characteristic_value_without_response(
+                    self->conn_handle, self->characteristic->handle,
+                    self->pending_size,
+                    (uint8_t *)self->outgoing[self->pending_index],
+                    &sent_len);
+            } else {
+                sc = sl_bt_gatt_write_characteristic_value(
+                    self->conn_handle, self->characteristic->handle,
+                    self->pending_size,
+                    (uint8_t *)self->outgoing[self->pending_index]);
+            }
+
+        } else {
+            if (self->write_type & BT_GATT_CHRC_READ) {
+                sc = sl_bt_gatt_server_write_attribute_value(self->characteristic->handle,
+                    0,
+                    self->pending_size,
+                    (uint8_t *)self->outgoing[self->pending_index]);
+            }
+
+            if (self->write_type & BT_GATT_CHRC_NOTIFY) {
+                sc = sl_bt_gatt_server_send_notification(
+                    self->conn_handle,
+                    self->characteristic->handle,
+                    self->pending_size,
+                    (uint8_t *)self->outgoing[self->pending_index]);
+            }
+
+            if (self->write_type & BT_GATT_CHRC_INDICATE) {
+                sl_bt_gatt_server_send_indication(
+                    self->conn_handle,
+                    self->characteristic->handle,
+                    self->pending_size,
+                    (uint8_t *)self->outgoing[self->pending_index]);
+            }
+        }
+        self->pending_size = 0;
+        self->pending_index = (self->pending_index + 1) % 2;
+        self->packet_queued = true;
+    }
+    return sc;
+}
+
+
+// This funttion is called in sl_bt_on_event to receive
+bool packet_buffer_on_ble_evt(uint16_t attribute, uint8_t *data, uint16_t len) {
+    uint16_t cindex = 0;
+    for (cindex = 0; cindex < bleio_packet_buffer_list.len; cindex++) {
+        if (bleio_packet_buffer_list.data[cindex]->characteristic->handle == attribute) {
+            taskENTER_CRITICAL();
+            write_to_ringbuf(bleio_packet_buffer_list.data[cindex], data, len);
+            taskEXIT_CRITICAL();
+
+            return true;
+        }
+    }
+    return false;
+}
+
+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 max_packet_size,
+    void *static_handler_entry) {
+
+    bleio_characteristic_properties_t temp_prop;
+    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 & (BT_GATT_CHRC_WRITE_WITHOUT_RESP | BT_GATT_CHRC_WRITE);
+    bleio_characteristic_properties_t outgoing = self->characteristic->props & (BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_INDICATE);
+
+    if (self->client) {
+        // Swap if we're the client.
+        temp_prop = incoming;
+        incoming = outgoing;
+        outgoing = temp_prop;
+        self->conn_handle = bleio_connection_get_conn_handle(
+            MP_OBJ_TO_PTR(self->characteristic->service->connection));
+    } else {
+        self->conn_handle = BLE_CONN_HANDLE_INVALID;
+    }
+
+    if (incoming) {
+        ringbuf_init(&self->ringbuf,
+            (uint8_t *)incoming_buffer,
+            incoming_buffer_size);
+    }
+
+    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) {
+        if (incoming) {
+            if (incoming & BT_GATT_CHRC_NOTIFY) {
+                common_hal_bleio_characteristic_set_cccd(self->characteristic,
+                    true, false);
+            } else {
+                common_hal_bleio_characteristic_set_cccd(self->characteristic,
+                    false, true);
+            }
+        }
+        if (outgoing) {
+            self->write_type = BT_GATT_CHRC_WRITE;
+            if (outgoing & BT_GATT_CHRC_WRITE_WITHOUT_RESP) {
+                self->write_type = BT_GATT_CHRC_WRITE_WITHOUT_RESP;
+            }
+        }
+    } else {
+        self->write_type = outgoing;
+    }
+}
+
+// Init packet buffer
+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) {
+
+    size_t incoming_buffer_size = 0;
+    uint32_t *incoming_buffer = NULL;
+    uint32_t *outgoing1 = NULL;
+    uint32_t *outgoing2 = NULL;
+
+    bleio_characteristic_properties_t temp_properties;
+    // 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 & (BT_GATT_CHRC_WRITE_WITHOUT_RESP | BT_GATT_CHRC_WRITE);
+    bleio_characteristic_properties_t outgoing = characteristic->props & (BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_INDICATE);
+    if (characteristic->service->is_remote) {
+        // Swap if we're the client.
+        temp_properties = incoming;
+        incoming = outgoing;
+        outgoing = temp_properties;
+    }
+
+    if (incoming) {
+        incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size);
+        incoming_buffer = m_malloc(incoming_buffer_size, false);
+    }
+
+    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);
+
+    bleio_packet_buffer_list.data[bleio_packet_buffer_list.len] = self;
+    bleio_packet_buffer_list.len++;
+}
+
+// Reads a single BLE packet into the buffer
+mp_int_t common_hal_bleio_packet_buffer_readinto(
+    bleio_packet_buffer_obj_t *self,
+    uint8_t *data,
+    size_t len) {
+
+    mp_int_t ret;
+    uint16_t packet_length;
+
+    if (ringbuf_num_filled(&self->ringbuf) < 1) {
+        return 0;
+    }
+    taskENTER_CRITICAL();
+    // Get packet length, which is in first two bytes of packet.
+    packet_length = 5;
+    ringbuf_get_n(&self->ringbuf, (uint8_t *)&packet_length, sizeof(uint16_t));
+
+    if (packet_length > len) {
+        // Packet is longer than requested. Return negative of overrun value.
+        ret = len - packet_length;
+        // Discard the packet if it's too large. Don't fill data.
+        while (packet_length--) {
+            (void)ringbuf_get(&self->ringbuf);
+        }
+    } else {
+        // Read as much as possible, but might be shorter than len.
+        ringbuf_get_n(&self->ringbuf, data, packet_length);
+        ret = packet_length;
+    }
+    taskEXIT_CRITICAL();
+    return ret;
+}
+
+// Writes all bytes from data into the same outgoing packet
+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 outgoing_packet_length;
+    mp_int_t total_len;
+    size_t num_bytes_written;
+    uint32_t *pending;
+
+    if (!self->client) {
+        self->conn_handle = bleio_connections[0].conn_handle;
+    }
+    if (self->outgoing[0] == NULL) {
+        mp_raise_bleio_BluetoothError(
+            translate("Writes not supported on Characteristic"));
+    }
+    if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
+        return -1;
+    }
+    outgoing_packet_length =
+        common_hal_bleio_packet_buffer_get_outgoing_packet_length(self);
+
+    if (outgoing_packet_length < 0) {
+        return -1;
+    }
+
+    total_len = len + header_len;
+    if (total_len > outgoing_packet_length) {
+        // Supplied data will not fit in a single BLE packet.
+        mp_raise_ValueError_varg(
+            translate("Total data to write is larger than %q"),
+            MP_QSTR_outgoing_packet_length);
+    }
+    if (total_len > self->max_packet_size) {
+        // Supplied data will not fit in a single BLE packet.
+        mp_raise_ValueError_varg(
+            translate("Total data to write is larger than %q"),
+            MP_QSTR_max_packet_size);
+    }
+    outgoing_packet_length = MIN(outgoing_packet_length, self->max_packet_size);
+
+    if (len + self->pending_size > (size_t)outgoing_packet_length) {
+        // No room to append len bytes to packet. Wait until we get a free buffer
+        // and keep checking that we haven't been disconnected.
+        while (self->pending_size != 0 &&
+               self->conn_handle != BLE_CONN_HANDLE_INVALID &&
+               !mp_hal_is_interrupted()) {
+            RUN_BACKGROUND_TASKS;
+        }
+        if (mp_hal_is_interrupted()) {
+            return -1;
+        }
+    }
+    if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
+        return -1;
+    }
+
+    num_bytes_written = 0;
+    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(((uint8_t *)pending) + self->pending_size, data, len);
+    self->pending_size += len;
+    num_bytes_written += len;
+
+    queue_next_write(self);
+    return num_bytes_written;
+}
+
+// Get length of receiving packet
+mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(
+    bleio_packet_buffer_obj_t *self) {
+
+    if (self->characteristic == NULL) {
+        return -1;
+    }
+    return self->characteristic->max_length;
+}
+
+// Get length of outgoing packet
+mp_int_t common_hal_bleio_packet_buffer_get_outgoing_packet_length(
+    bleio_packet_buffer_obj_t *self) {
+
+    if (self->characteristic == NULL) {
+        return -1;
+    }
+    return MIN(self->max_packet_size, self->characteristic->max_length);
+}
+
+// Flush ring buffer og packer buffer
+void common_hal_bleio_packet_buffer_flush(bleio_packet_buffer_obj_t *self) {
+    while ((self->pending_size != 0 ||
+            self->packet_queued) &&
+           self->conn_handle != BLEIO_HANDLE_INVALID &&
+           !mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+    }
+}
+
+// Check status of packet buffer obj
+bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self) {
+    return self->characteristic == NULL;
+}
+
+// Deinit packet buffer
+void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self) {
+    if (!common_hal_bleio_packet_buffer_deinited(self)) {
+        ringbuf_deinit(&self->ringbuf);
+    }
+}
+
+// Remove packet_buffer list when reload
+void reset_packet_buffer_list() {
+    // Remove packet_buffer list
+    memset(bleio_packet_buffer_list.data, 0,
+        sizeof(bleio_packet_buffer_list.data));
+    bleio_packet_buffer_list.len = 0;
+}
diff --git a/ports/silabs/common-hal/_bleio/PacketBuffer.h b/ports/silabs/common-hal/_bleio/PacketBuffer.h
new file mode 100644
index 0000000000..f79eda6cf3
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/PacketBuffer.h
@@ -0,0 +1,64 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_PACKETBUFFER_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_PACKETBUFFER_H
+
+#include "py/ringbuf.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+
+#define MAX_NUMBER_PACKET_BUFFER 64
+typedef struct {
+    mp_obj_base_t base;
+    bleio_characteristic_obj_t *characteristic;
+    // Ring buffer storing consecutive incoming values.
+    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.
+    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).
+    volatile uint16_t conn_handle;
+    uint16_t max_packet_size;
+    uint8_t pending_index;
+    uint8_t write_type;
+    bool client;
+    bool packet_queued;
+} bleio_packet_buffer_obj_t;
+
+typedef struct {
+    bleio_packet_buffer_obj_t *data[MAX_NUMBER_PACKET_BUFFER];
+    uint8_t len;
+} bleio_packet_buffer_obj_list_t;
+
+extern bool packet_buffer_on_ble_evt(uint16_t attribute,
+    uint8_t *data,
+    uint16_t len);
+extern void reset_packet_buffer_list();
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_PACKETBUFFER_H
diff --git a/ports/silabs/common-hal/_bleio/Service.c b/ports/silabs/common-hal/_bleio/Service.c
new file mode 100644
index 0000000000..5fd06a2111
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Service.c
@@ -0,0 +1,242 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include "py/runtime.h"
+#include "common-hal/_bleio/__init__.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Adapter.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+#include "shared-bindings/_bleio/Descriptor.h"
+#include "shared-bindings/_bleio/Service.h"
+
+// List ble service of central device
+bleio_service_obj_list bleio_service_list;
+
+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) {
+
+    uint8_t service_type;
+    sl_status_t sc = SL_STATUS_FAIL;
+    uint16_t gattdb_session;
+    sl_bt_uuid_16_t bt_uuid;
+
+    self->handle = 0xFFFF;
+    self->uuid = uuid;
+    self->characteristic_list = characteristic_list;
+    self->is_remote = false;
+    self->connection = NULL;
+    self->is_secondary = is_secondary;
+
+    if (self->is_secondary) {
+        service_type = sl_bt_gattdb_secondary_service;
+    } else {
+        service_type = sl_bt_gattdb_primary_service;
+    }
+
+    sc = sl_bt_gattdb_new_session(&gattdb_session);
+    if (SL_STATUS_OK != sc && SL_STATUS_ALREADY_EXISTS != sc) {
+        mp_raise_bleio_BluetoothError(translate("Create new session fail."));
+        return sc;
+    }
+    if (BLE_UUID_TYPE_16 == self->uuid->efr_ble_uuid.uuid.type) {
+
+        bt_uuid.data[0] = self->uuid->efr_ble_uuid.uuid16.value & 0xff;
+        bt_uuid.data[1] = self->uuid->efr_ble_uuid.uuid16.value >> 8;
+        sc = sl_bt_gattdb_add_service(gattdb_session,
+            service_type,
+            0, 2, bt_uuid.data,
+            (uint16_t *)&self->handle);
+    } else if (BLE_UUID_TYPE_128 == self->uuid->efr_ble_uuid.uuid.type) {
+        sc = sl_bt_gattdb_add_service(gattdb_session,
+            service_type, 0, 16,
+            self->uuid->efr_ble_uuid.uuid128.value,
+            (uint16_t *)&self->handle);
+    }
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Create new session fail."));
+        return sc;
+    }
+
+    sc = sl_bt_gattdb_start_service(gattdb_session, self->handle);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Start service fail."));
+    }
+
+    sc = sl_bt_gattdb_commit(gattdb_session);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Commit service fail."));
+    }
+
+    bleio_service_list.data[bleio_service_list.len] = self;
+    bleio_service_list.len++;
+    return sc;
+}
+
+// Create a new Service identified by the specified UUID
+void common_hal_bleio_service_construct(bleio_service_obj_t *self,
+    bleio_uuid_obj_t *uuid,
+    bool is_secondary) {
+    _common_hal_bleio_service_construct(self, uuid,
+        is_secondary,
+        mp_obj_new_list(0, NULL));
+}
+
+// Get service from connection
+void bleio_service_from_connection(bleio_service_obj_t *self,
+    mp_obj_t connection) {
+    self->handle = BLEIO_HANDLE_INVALID;
+    self->uuid = NULL;
+    self->characteristic_list = mp_obj_new_list(0, NULL);
+    self->is_remote = true;
+    self->is_secondary = false;
+    self->connection = connection;
+}
+
+// Get service uuid
+bleio_uuid_obj_t *common_hal_bleio_service_get_uuid(bleio_service_obj_t *self) {
+    return self->uuid;
+}
+
+// Get tuple charateristic of service
+mp_obj_tuple_t *common_hal_bleio_service_get_characteristics(
+    bleio_service_obj_t *self) {
+    return mp_obj_new_tuple(self->characteristic_list->len,
+        self->characteristic_list->items);
+}
+
+// This is a service provided by a remote device or not
+bool common_hal_bleio_service_get_is_remote(bleio_service_obj_t *self) {
+    return self->is_remote;
+}
+
+// If the service is a secondary one
+bool common_hal_bleio_service_get_is_secondary(bleio_service_obj_t *self) {
+    return self->is_secondary;
+}
+
+// Add new dynamic characteristic to service
+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) {
+
+    bool broadcast = (characteristic->props & CHAR_PROP_BROADCAST) ? 1 : 0;
+    bool read = (characteristic->props & CHAR_PROP_READ) ? 1 : 0;
+    bool write_wo_resp =
+        (characteristic->props & CHAR_PROP_WRITE_NO_RESPONSE) ? 1 : 0;
+    bool write =
+        write_wo_resp ? 1 : (characteristic->props & CHAR_PROP_WRITE) ? 1
+                                                                      : 0;
+    bool notify = (characteristic->props & CHAR_PROP_NOTIFY) ? 1 : 0;
+    bool indicate = (characteristic->props & CHAR_PROP_INDICATE) ? 1 : 0;
+
+    sl_status_t sc = SL_STATUS_FAIL;
+    sl_bt_uuid_16_t bt_uuid;
+    uint16_t gattdb_session;
+
+    sc = sl_bt_gattdb_new_session(&gattdb_session);
+
+    if (SL_STATUS_OK != sc && SL_STATUS_ALREADY_EXISTS != sc) {
+        mp_raise_bleio_BluetoothError(translate("Create new session fail."));
+        return;
+    }
+    characteristic->props = (broadcast << 0) | (read << 1) |
+        (write_wo_resp << 2) | (write << 3) | (notify << 4) | (indicate << 5);
+
+    if (BLE_UUID_TYPE_16 == characteristic->uuid->efr_ble_uuid.uuid.type) {
+        bt_uuid.data[0] = characteristic->uuid->efr_ble_uuid.uuid16.value & 0xff;
+        bt_uuid.data[1] = characteristic->uuid->efr_ble_uuid.uuid16.value >> 8;
+
+        sc = sl_bt_gattdb_add_uuid16_characteristic(
+            gattdb_session,
+            self->handle,
+            characteristic->props,
+            0,
+            0,
+            bt_uuid,
+            sl_bt_gattdb_variable_length_value,
+            characteristic->max_length,
+            0,
+            initial_value_bufinfo->buf,
+            &characteristic->handle);
+
+    } else if (BLE_UUID_TYPE_128 ==
+               characteristic->uuid->efr_ble_uuid.uuid.type) {
+        uuid_128 uuid;
+        memcpy(uuid.data, characteristic->uuid->efr_ble_uuid.uuid128.value, 16);
+
+        sc = sl_bt_gattdb_add_uuid128_characteristic(gattdb_session,
+            self->handle,
+            characteristic->props,
+            0,
+            0,
+            uuid,
+            sl_bt_gattdb_variable_length_value,
+            characteristic->max_length,
+            0,
+            initial_value_bufinfo->buf,
+            &characteristic->handle);
+    }
+
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Add charateristic fail."));
+    }
+
+    sc = sl_bt_gattdb_start_characteristic(gattdb_session,
+        characteristic->handle);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Start charateristic fail."));
+        return;
+    }
+
+    sc = sl_bt_gattdb_commit(gattdb_session);
+    if (SL_STATUS_OK != sc) {
+        mp_raise_bleio_BluetoothError(translate("Commit charateristic fail."));
+        return;
+    }
+    mp_obj_list_append(self->characteristic_list,
+        MP_OBJ_FROM_PTR(characteristic));
+}
+
+// Remove dynamic service when reload
+void reset_dynamic_service() {
+
+    uint16_t gattdb_session;
+    uint8_t svc_index;
+    // Remove dynamic service
+    for (svc_index = 0; svc_index < bleio_service_list.len; svc_index++) {
+        sl_bt_gattdb_new_session(&gattdb_session);
+        sl_bt_gattdb_remove_service(gattdb_session,
+            bleio_service_list.data[svc_index]->handle);
+        sl_bt_gattdb_commit(gattdb_session);
+    }
+    bleio_service_list.len = 0;
+}
diff --git a/ports/silabs/common-hal/_bleio/Service.h b/ports/silabs/common-hal/_bleio/Service.h
new file mode 100644
index 0000000000..a389da21b7
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/Service.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_SERVICE_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_SERVICE_H
+
+#include "py/objlist.h"
+#include "common-hal/_bleio/UUID.h"
+
+#define MAX_NUMBER_SERVICE 64
+
+typedef struct bleio_service_obj
+{
+    mp_obj_base_t base;
+    // Handle for the local service.
+    uint32_t handle;
+    // True if created during discovery.
+    bool is_remote;
+    bool is_secondary;
+    bleio_uuid_obj_t *uuid;
+    // The connection object is set only when this is a remote service.
+    // A local service doesn't know the connection.
+    mp_obj_t connection;
+    mp_obj_list_t *characteristic_list;
+    // Range of attribute handles of this remote service.
+    uint16_t start_handle;
+    uint16_t end_handle;
+} bleio_service_obj_t;
+
+typedef struct
+{
+    bleio_service_obj_t *data[MAX_NUMBER_SERVICE];
+    uint8_t len;
+} bleio_service_obj_list;
+
+void bleio_service_from_connection(bleio_service_obj_t *self,
+    mp_obj_t connection);
+uint16_t get_characteristic_handle(bleio_uuid_obj_t *uuid);
+extern void reset_dynamic_service();
+#endif // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_SERVICE_H
diff --git a/ports/silabs/common-hal/_bleio/UUID.c b/ports/silabs/common-hal/_bleio/UUID.c
new file mode 100644
index 0000000000..482a23d8f8
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/UUID.c
@@ -0,0 +1,83 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include "py/runtime.h"
+#include "shared-bindings/_bleio/Adapter.h"
+#include "shared-bindings/_bleio/UUID.h"
+#include "shared-bindings/_bleio/__init__.h"
+#include "common-hal/_bleio/UUID.h"
+
+void common_hal_bleio_uuid_construct(bleio_uuid_obj_t *self,
+    mp_int_t uuid16,
+    const uint8_t uuid128[16]) {
+
+    if (uuid128 == NULL) {
+        self->efr_ble_uuid.uuid16.value = uuid16;
+        self->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_16;
+    } else {
+        memcpy(self->efr_ble_uuid.uuid128.value, uuid128, 16);
+        self->efr_ble_uuid.uuid128.value[12] = uuid16 & 0xff;
+        self->efr_ble_uuid.uuid128.value[13] = (uuid16 >> 8) & 0xff;
+        self->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_128;
+    }
+}
+
+uint32_t common_hal_bleio_uuid_get_size(bleio_uuid_obj_t *self) {
+    return self->efr_ble_uuid.uuid.type == BLE_UUID_TYPE_16 ? 16 : 128;
+}
+
+uint32_t common_hal_bleio_uuid_get_uuid16(bleio_uuid_obj_t *self) {
+    return self->efr_ble_uuid.uuid16.value;
+}
+
+void common_hal_bleio_uuid_get_uuid128(bleio_uuid_obj_t *self,
+    uint8_t uuid128[16]) {
+    memcpy(uuid128, self->efr_ble_uuid.uuid128.value, 16);
+}
+
+void common_hal_bleio_uuid_pack_into(bleio_uuid_obj_t *self, uint8_t *buf) {
+    if (self->efr_ble_uuid.uuid.type == BLE_UUID_TYPE_16) {
+        buf[0] = self->efr_ble_uuid.uuid16.value & 0xff;
+        buf[1] = self->efr_ble_uuid.uuid16.value >> 8;
+    } else {
+        common_hal_bleio_uuid_get_uuid128(self, buf);
+    }
+}
+
+void bleio_uuid_construct_from_efr_ble_uuid(bleio_uuid_obj_t *self,
+    ble_uuid_any_t *efr_ble_uuid) {
+
+    if (self->efr_ble_uuid.uuid.type == BLE_UUID_TYPE_16) {
+        mp_raise_bleio_BluetoothError(translate("Unexpected efr uuid type"));
+    }
+    self->efr_ble_uuid.uuid16.value = efr_ble_uuid->uuid16.value;
+}
+
+void bleio_uuid_convert_to_efr_ble_uuid(bleio_uuid_obj_t *self,
+    ble_uuid_any_t *efr_ble_uuid) {
+    efr_ble_uuid->uuid16.value = self->efr_ble_uuid.uuid16.value;
+}
diff --git a/ports/silabs/common-hal/_bleio/UUID.h b/ports/silabs/common-hal/_bleio/UUID.h
new file mode 100644
index 0000000000..c1b99eb1ff
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/UUID.h
@@ -0,0 +1,90 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_UUID_H
+#define MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_UUID_H
+
+#include "py/obj.h"
+
+#define UUID16_LEN 2
+#define UUID128_LEN 16
+
+// Type of UUID
+typedef enum {
+    // 16-bit UUID (BT SIG assigned)
+    BLE_UUID_TYPE_16 = 16,
+    // 32-bit UUID (BT SIG assigned)
+    BLE_UUID_TYPE_32 = 32,
+    // 128-bit UUID
+    BLE_UUID_TYPE_128 = 128,
+} uuid_type_e;
+
+typedef struct {
+    // Type of the UUID
+    uint8_t type;
+} ble_uuid_t;
+
+// 16-bit UUID
+typedef struct {
+    uint8_t type;
+    uint16_t value;
+} ble_uuid16_t;
+
+// 32-bit UUID
+typedef struct {
+    uint8_t type;
+    uint32_t value;
+} ble_uuid32_t;
+
+// 128-bit UUID
+typedef struct {
+    uint8_t type;
+    uint8_t value[16];
+} ble_uuid128_t;
+
+typedef union {
+    ble_uuid_t uuid;
+    ble_uuid16_t uuid16;
+    ble_uuid32_t uuid32;
+    ble_uuid128_t uuid128;
+} ble_uuid_any_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    // Use the native way of storing UUID's:
+    // - ble_uuid_t.uuid is a 16-bit uuid.
+    // - ble_uuid_t.type is BLE_UUID_TYPE_BLE if it's a 16-bit Bluetooth SIG UUID.
+    //   or is BLE_UUID_TYPE_VENDOR_BEGIN and higher, which indexes into a table of registered
+    //   128-bit UUIDs.
+    ble_uuid_any_t efr_ble_uuid;
+} bleio_uuid_obj_t;
+
+void bleio_uuid_construct_from_efr_ble_uuid(bleio_uuid_obj_t *self,
+    ble_uuid_any_t *efr_ble_uuid);
+void bleio_uuid_convert_to_efr_ble_uuid(bleio_uuid_obj_t *self,
+    ble_uuid_any_t *efr_ble_uuid);
+
+#endif  // MICROPY_INCLUDED_EFR_COMMON_HAL_BLEIO_UUID_H
diff --git a/ports/silabs/common-hal/_bleio/__init__.c b/ports/silabs/common-hal/_bleio/__init__.c
new file mode 100644
index 0000000000..e7323c7793
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/__init__.c
@@ -0,0 +1,402 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include "py/runtime.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/Connection.h"
+#include "shared-bindings/_bleio/Descriptor.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/UUID.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
+#include "common-hal/_bleio/__init__.h"
+
+STATIC conn_state_t conn_state;
+osMutexId_t bluetooth_connection_mutex_id;
+bleio_adapter_obj_t common_hal_bleio_adapter_obj;
+
+__ALIGNED(4) static uint8_t bluetooth_connection_mutex_cb[osMutexCbSize];
+const osMutexAttr_t bluetooth_connection_mutex_attr = {
+    .name = "Bluetooth Mutex",
+    .attr_bits = osMutexRecursive | osMutexPrioInherit,
+    .cb_mem = bluetooth_connection_mutex_cb,
+    .cb_size = osMutexCbSize
+};
+
+void bleio_user_reset() {
+    // Stop any user scanning or advertising.
+    common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
+    common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj);
+
+    // Maybe start advertising the BLE workflow.
+    supervisor_bluetooth_background();
+}
+
+void bleio_reset() {
+    reset_dynamic_service();
+    reset_packet_buffer_list();
+    reset_characteristic_buffer_list();
+    bleio_adapter_reset(&common_hal_bleio_adapter_obj);
+    // 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;
+    }
+
+    supervisor_stop_bluetooth();
+    common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, false);
+    supervisor_start_bluetooth();
+}
+
+void bleio_background(void) {
+
+}
+
+void common_hal_bleio_gc_collect(void) {
+    bleio_adapter_gc_collect(&common_hal_bleio_adapter_obj);
+}
+
+void check_ble_error(int error_code) {
+    if (error_code == SL_STATUS_OK) {
+        return;
+    }
+    switch (error_code) {
+        case SL_STATUS_TIMEOUT:
+            mp_raise_msg(&mp_type_TimeoutError, NULL);
+            return;
+        default:
+            mp_raise_bleio_BluetoothError(
+                translate("Unknown BLE error: %d"), error_code);
+            break;
+    }
+}
+
+void common_hal_bleio_check_connected(uint16_t conn_handle) {
+    if (conn_handle == BLEIO_HANDLE_INVALID) {
+        mp_raise_ConnectionError(translate("Not connected"));
+    }
+}
+
+// Bluetooth stack event handler.
+void sl_bt_on_event(sl_bt_msg_t *evt) {
+    sl_status_t sc = SL_STATUS_OK;
+    bd_addr address;
+    uint8_t address_type = 0;
+    STATIC uint8_t serv_idx = 0;
+    STATIC uint8_t device_name[16];
+
+    bleio_connection_internal_t *connection;
+    bleio_service_obj_t *service;
+    bleio_characteristic_obj_t *characteristic;
+    bleio_uuid_obj_t *uuid;
+    bleio_characteristic_properties_t props;
+
+    switch (SL_BT_MSG_ID(evt->header)) {
+
+        case sl_bt_evt_system_boot_id:
+
+            sc = sl_bt_system_get_identity_address(&address, &address_type);
+
+            snprintf((char *)device_name, 14 + 1,
+                "CIRCUITPY-%X%X",address.addr[1], address.addr[0]);
+            sl_bt_gatt_server_write_attribute_value(gattdb_device_name,
+                0,14,device_name);
+
+            sc = sl_bt_sm_configure(0x00,sl_bt_sm_io_capability_noinputnooutput);
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(translate("Sm configure fail"));
+            }
+
+            sc = sl_bt_sm_set_bondable_mode(1);
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(translate("Set bondable mode fail"));
+            }
+            sl_bt_sm_delete_bondings();
+            break;
+
+        // This event indicates that a new connection was opened.
+        case sl_bt_evt_connection_opened_id:
+            serv_idx = 0;
+            osMutexAcquire(bluetooth_connection_mutex_id, osWaitForever);
+            // Device role is Peripheral
+            if (evt->data.evt_connection_opened.master == 0) {
+                bleio_connections[0].conn_handle =
+                    evt->data.evt_connection_opened.connection;
+                bleio_connections[0].connection_obj = mp_const_none;
+                bleio_connections[0].pair_status = PAIR_PAIRED;
+                bleio_connections[0].is_central = false;
+                bleio_connections[0].mtu = 0;
+            }
+
+            sc = sl_bt_sm_increase_security(
+                evt->data.evt_connection_opened.connection);
+
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Increase security fail."));
+            }
+            osMutexRelease(bluetooth_connection_mutex_id);
+            break;
+
+        case sl_bt_evt_scanner_legacy_advertisement_report_id:
+
+            set_scan_device_info_on_ble_evt(
+                evt->data.evt_scanner_legacy_advertisement_report.address,
+                evt->data.evt_scanner_legacy_advertisement_report.address_type,
+                evt->data.evt_scanner_legacy_advertisement_report.rssi,
+                &evt->data.evt_scanner_legacy_advertisement_report.data);
+
+            if (xscan_event != NULL) {
+                xEventGroupSetBits(xscan_event,1 << 0);
+            }
+            break;
+
+        case sl_bt_evt_connection_closed_id:
+            common_hal_bleio_adapter_remove_connection(
+                evt->data.evt_connection_closed.connection);
+            break;
+
+        case sl_bt_evt_system_external_signal_id:
+            if (evt->data.evt_system_external_signal.extsignals & 1) {
+                sl_bt_external_signal(0);
+            }
+            break;
+
+        case sl_bt_evt_gatt_service_id:
+            osMutexAcquire(bluetooth_connection_mutex_id, osWaitForever);
+            connection = bleio_conn_handle_to_connection(
+                evt->data.evt_gatt_service.connection);
+            service = m_new_obj(bleio_service_obj_t);
+            if (NULL == service) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Create new service obj fail"));
+            }
+            service->base.type = &bleio_service_type;
+            bleio_service_from_connection(service,
+                bleio_connection_new_from_internal(connection));
+            service->is_remote = true;
+            service->handle = evt->data.evt_gatt_service.service;
+            uuid = m_new_obj(bleio_uuid_obj_t);
+            if (NULL == uuid) {
+                osMutexRelease(bluetooth_connection_mutex_id);
+                mp_raise_bleio_BluetoothError(
+                    translate("Create new service uuid obj fail"));
+                break;
+            }
+            uuid->base.type = &bleio_uuid_type;
+
+            if (UUID16_LEN == evt->data.evt_gatt_service.uuid.len) {
+                uuid->efr_ble_uuid.uuid16.value &= 0x0000;
+                uuid->efr_ble_uuid.uuid16.value
+                    |= evt->data.evt_gatt_service.uuid.data[1];
+
+                uuid->efr_ble_uuid.uuid16.value =
+                    (uuid->efr_ble_uuid.uuid16.value << 8)
+                    | evt->data.evt_gatt_service.uuid.data[0];
+                uuid->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_16;
+
+            } else if (UUID128_LEN == evt->data.evt_gatt_service.uuid.len) {
+                memcpy(uuid->efr_ble_uuid.uuid128.value,
+                    evt->data.evt_gatt_service.uuid.data, UUID128_LEN);
+                uuid->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_128;
+            }
+            service->uuid = uuid;
+            mp_obj_list_append(MP_OBJ_FROM_PTR(connection->remote_service_list),
+                MP_OBJ_FROM_PTR(service));
+            conn_state = DISCOVER_SERVICES;
+            osMutexRelease(bluetooth_connection_mutex_id);
+            break;
+
+        case sl_bt_evt_gatt_characteristic_id:
+            osMutexAcquire(bluetooth_connection_mutex_id, osWaitForever);
+            connection = bleio_conn_handle_to_connection(
+                evt->data.evt_gatt_characteristic.connection);
+            service =
+                MP_OBJ_TO_PTR(connection->remote_service_list->items[serv_idx - 1]);
+
+            characteristic = m_new_obj(bleio_characteristic_obj_t);
+            if (characteristic == NULL) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Create new characteristic obj fail."));
+            }
+
+            characteristic->base.type = &bleio_characteristic_type;
+            uuid = m_new_obj(bleio_uuid_obj_t);
+            if (uuid == NULL) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Create new characteristic uuid obj fail."));
+                break;
+            }
+
+            uuid->base.type = &bleio_uuid_type;
+            if (UUID16_LEN == evt->data.evt_gatt_characteristic.uuid.len) {
+                uuid->efr_ble_uuid.uuid16.value &= 0x0000;
+                uuid->efr_ble_uuid.uuid16.value
+                    |= evt->data.evt_gatt_characteristic.uuid.data[1];
+
+                uuid->efr_ble_uuid.uuid16.value =
+                    (uuid->efr_ble_uuid.uuid16.value << 8)
+                    | evt->data.evt_gatt_characteristic.uuid.data[0];
+
+                uuid->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_16;
+            } else if (
+                UUID128_LEN == evt->data.evt_gatt_characteristic.uuid.len) {
+
+                memcpy(uuid->efr_ble_uuid.uuid128.value,
+                    evt->data.evt_gatt_characteristic.uuid.data,
+                    UUID128_LEN);
+                uuid->efr_ble_uuid.uuid.type = BLE_UUID_TYPE_128;
+            }
+
+            props = evt->data.evt_gatt_characteristic.properties;
+            characteristic->handle =
+                evt->data.evt_gatt_characteristic.characteristic;
+            characteristic->props = props;
+
+            common_hal_bleio_characteristic_construct(
+                characteristic, service,
+                evt->data.evt_gatt_characteristic.characteristic, uuid,
+                props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,
+                0, false,
+                mp_const_empty_bytes,
+                NULL);
+
+            mp_obj_list_append(MP_OBJ_FROM_PTR(service->characteristic_list),
+                MP_OBJ_FROM_PTR(characteristic));
+            osMutexRelease(bluetooth_connection_mutex_id);
+            break;
+
+        case sl_bt_evt_gatt_procedure_completed_id:
+
+            if (conn_state == DISCOVER_SERVICES
+                || conn_state == DISCOVER_CHARACTERISTICS) {
+
+                connection = MP_OBJ_TO_PTR(
+                    bleio_conn_handle_to_connection(
+                        evt->data.evt_gatt_procedure_completed.connection));
+
+                if (connection != NULL
+                    && serv_idx < connection->remote_service_list->len) {
+
+                    service = connection->remote_service_list->items[serv_idx];
+                    sc = sl_bt_gatt_discover_characteristics(
+                        evt->data.evt_gatt_procedure_completed.connection,
+                        service->handle);
+
+                    conn_state = DISCOVER_CHARACTERISTICS;
+                    serv_idx++;
+
+                } else {
+                    conn_state = RUNNING;
+                    serv_idx = 0;
+                    if (xdiscovery_event != NULL) {
+                        xEventGroupSetBits(xdiscovery_event,1 << 0);
+                    }
+                }
+            }
+            break;
+
+        case sl_bt_evt_gatt_characteristic_value_id:
+
+            if (characteristic_buffer_on_ble_evt(
+                evt->data.evt_gatt_characteristic_value.characteristic,
+                evt->data.evt_gatt_characteristic_value.value.data,
+                evt->data.evt_gatt_characteristic_value.value.len)) {
+            } else if (packet_buffer_on_ble_evt(
+                evt->data.evt_gatt_characteristic_value.characteristic,
+                evt->data.evt_gatt_characteristic_value.value.data,
+                evt->data.evt_gatt_characteristic_value.value.len)) {
+            } else {
+
+                set_characteristic_value_on_ble_evt(
+                    evt->data.evt_gatt_characteristic_value.connection,
+                    evt->data.evt_gatt_characteristic_value.characteristic,
+                    evt->data.evt_gatt_characteristic_value.value.data,
+                    evt->data.evt_gatt_characteristic_value.value.len);
+            }
+
+            sl_bt_gatt_send_characteristic_confirmation(
+                evt->data.evt_gatt_characteristic_value.connection);
+            break;
+
+        case sl_bt_evt_gatt_server_attribute_value_id:
+            if (characteristic_buffer_on_ble_evt(
+                evt->data.evt_gatt_server_attribute_value.attribute,
+                evt->data.evt_gatt_server_attribute_value.value.data,
+                evt->data.evt_gatt_server_attribute_value.value.len)) {
+            } else {
+                packet_buffer_on_ble_evt(
+                    evt->data.evt_gatt_server_attribute_value.attribute,
+                    evt->data.evt_gatt_server_attribute_value.value.data,
+                    evt->data.evt_gatt_server_attribute_value.value.len);
+            }
+            break;
+
+        case sl_bt_evt_gatt_server_characteristic_status_id:
+            break;
+
+        case sl_bt_evt_sm_passkey_display_id:
+            break;
+
+        case sl_bt_evt_sm_confirm_bonding_id:
+            sc = sl_bt_sm_bonding_confirm(
+                evt->data.evt_sm_confirm_bonding.connection,1);
+            if (SL_STATUS_OK != sc) {
+                mp_raise_bleio_BluetoothError(
+                    translate("Bonding confirm fail"));
+            }
+            break;
+
+        case sl_bt_evt_sm_bonded_id:
+            break;
+
+        case sl_bt_evt_sm_bonding_failed_id:
+            break;
+
+        case sl_bt_evt_connection_parameters_id:
+            switch (evt->data.evt_connection_parameters.security_mode)
+            {
+                case connection_mode1_level1:
+                    break;
+                case connection_mode1_level2:
+                    break;
+                case connection_mode1_level3:
+                    break;
+                case connection_mode1_level4:
+                    break;
+                default:
+                    break;
+            }
+            break;
+
+        default:
+            break;
+    }
+}
diff --git a/ports/silabs/common-hal/_bleio/__init__.h b/ports/silabs/common-hal/_bleio/__init__.h
new file mode 100644
index 0000000000..63eda59d84
--- /dev/null
+++ b/ports/silabs/common-hal/_bleio/__init__.h
@@ -0,0 +1,80 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_INIT_H
+#define MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_INIT_H
+
+#include 
+#include 
+#include "shared-bindings/_bleio/UUID.h"
+
+#include "gatt_db.h"
+#include "sl_status.h"
+#include "sl_bt_api.h"
+#include "sl_bgapi.h"
+#include "sl_bluetooth.h"
+#include "sl_bt_rtos_adaptation.h"
+#include "sl_cmsis_os2_common.h"
+#include 
+
+#include "FreeRTOS.h"
+#include "task.h"
+#include "queue.h"
+#include "semphr.h"
+
+#define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
+#define SEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000000) / (RESOLUTION))
+#define UNITS_TO_SEC(TIME, RESOLUTION) (((TIME)*(RESOLUTION)) / 1000000)
+
+// We assume variable length data. 20 bytes max (23 - 3).
+#define GATT_MAX_DATA_LENGTH (BT_ATT_DEFAULT_LE_MTU - 3)
+
+#define BLE_GATT_HANDLE_INVALID 0x0000
+#define BLE_CONN_HANDLE_INVALID 0xFFFF
+
+// Maximum length for fixed length Attribute Values.
+#define BLE_GATTS_FIX_ATTR_LEN_MAX (510)
+
+// Maximum length for variable length Attribute Values.
+#define BLE_GATTS_VAR_ATTR_LEN_MAX (512)
+
+// Track if the user code modified the BLE state
+// to know if we need to undo it on reload.
+extern bool vm_used_ble;
+
+// UUID shared by all CCCD's.
+extern bleio_uuid_obj_t cccd_uuid;
+extern void bleio_reset();
+
+extern osMutexId_t bluetooth_connection_mutex_id;
+extern const osMutexAttr_t bluetooth_connection_mutex_attr;
+typedef enum {
+    DISCOVER_SERVICES,
+    DISCOVER_CHARACTERISTICS,
+    RUNNING
+} conn_state_t;
+
+#endif // MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_INIT_H
diff --git a/ports/silabs/common-hal/analogio/AnalogIn.c b/ports/silabs/common-hal/analogio/AnalogIn.c
new file mode 100644
index 0000000000..ecf61ca268
--- /dev/null
+++ b/ports/silabs/common-hal/analogio/AnalogIn.c
@@ -0,0 +1,216 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "common-hal/analogio/AnalogIn.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared/runtime/interrupt_char.h"
+#include "supervisor/shared/translate/translate.h"
+#include "em_cmu.h"
+#include "em_iadc.h"
+
+// Set CLK_ADC to 10MHz
+#define CLK_SRC_ADC_FREQ 20000000  // CLK_SRC_ADC
+#define CLK_ADC_FREQ 10000000      // CLK_ADC - 10 MHz max in normal mode
+
+// Number of scan channels
+#define NUM_INPUTS 8
+
+STATIC uint8_t num_current_input = 0;
+STATIC volatile uint16_t scan_result[NUM_INPUTS];
+STATIC volatile uint8_t scan_flag = 0;
+STATIC IADC_ScanTable_t init_scan_table = IADC_SCANTABLE_DEFAULT;  // Scan Table
+
+// Construct analogin pin. This function is called when init AnalogIn
+void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self,
+    const mcu_pin_obj_t *pin) {
+
+    uint8_t adc_index;
+    if (self->pin == NULL) {
+        self->id = NUM_INPUTS + 1;
+        for (adc_index = 0; adc_index < NUM_INPUTS; adc_index++) {
+            if (init_scan_table.entries[adc_index].includeInScan == false) {
+                self->id = adc_index;
+                self->pin = pin;
+                init_scan_table.entries[adc_index].includeInScan = true;
+                init_scan_table.entries[adc_index].negInput = iadcNegInputGnd;
+                init_scan_table.entries[adc_index].posInput
+                    = IADC_portPinToPosInput(self->pin->port, self->pin->number);
+                num_current_input++;
+                break;
+            }
+        }
+    }
+
+    if (self->id == NUM_INPUTS + 1) {
+        mp_raise_ValueError(translate("ADC busy pin"));
+    }
+
+    // Declare init structs
+    IADC_Init_t init = IADC_INIT_DEFAULT;
+    IADC_AllConfigs_t initAllConfigs = IADC_ALLCONFIGS_DEFAULT;
+    IADC_InitScan_t initScan = IADC_INITSCAN_DEFAULT;
+
+    CMU_ClockEnable(cmuClock_IADC0, true);
+
+    // Select clock for IADC
+    CMU_ClockSelectSet(cmuClock_IADCCLK, cmuSelect_FSRCO);
+
+    // Modify init structures and initialize
+    init.warmup = iadcWarmupKeepWarm;
+
+    // Set the HFSCLK prescale value here
+    init.srcClkPrescale = IADC_calcSrcClkPrescale(IADC0, CLK_SRC_ADC_FREQ, 0);
+
+    // Configuration 0 is used by both scan and single conversions by
+    // default.  Use internal bandgap as the reference and specify the
+    // reference voltage in mV.
+    // Resolution is not configurable directly but is based on the
+    // selected oversampling ratio (osrHighSpeed), which defaults to
+    // 2x and generates 12-bit results.
+    initAllConfigs.configs[0].reference = iadcCfgReferenceInt1V2;
+    initAllConfigs.configs[0].vRef = 1210;
+    initAllConfigs.configs[0].osrHighSpeed = iadcCfgOsrHighSpeed2x;
+    initAllConfigs.configs[0].analogGain = iadcCfgAnalogGain0P5x;
+
+    // Divide CLK_SRC_ADC to set the CLK_ADC frequency
+    initAllConfigs.configs[0].adcClkPrescale
+        = IADC_calcAdcClkPrescale(IADC0,
+        CLK_ADC_FREQ,
+        0,
+        iadcCfgModeNormal,
+        init.srcClkPrescale);
+
+
+    // Set the SCANFIFODVL flag when there are 8 entries in the scan
+    // FIFO.  Note that in this example, the interrupt associated with
+    // the SCANFIFODVL flag in the IADC_IF register is not used.
+    // Similarly, the fifoDmaWakeup member of the initScan structure
+    // is left at its default setting of false, so LDMA service is not
+    // requested when the FIFO holds the specified number of samples.
+    initScan.dataValidLevel = _IADC_SCANFIFOCFG_DVL_VALID8;
+
+    // Tag FIFO entry with scan table entry id
+    initScan.showId = true;
+
+    // Initialize IADC
+    IADC_init(IADC0, &init, &initAllConfigs);
+
+    // Initialize scan
+    IADC_initScan(IADC0, &initScan, &init_scan_table);
+
+    if (self->pin->port == gpioPortA) {
+        GPIO->ABUSALLOC |= GPIO_ABUSALLOC_AEVEN0_ADC0;
+        GPIO->ABUSALLOC |= GPIO_ABUSALLOC_AODD0_ADC0;
+    } else if (self->pin->port == gpioPortB) {
+        GPIO->BBUSALLOC |= GPIO_BBUSALLOC_BEVEN0_ADC0;
+        GPIO->BBUSALLOC |= GPIO_BBUSALLOC_BODD0_ADC0;
+    } else {
+        GPIO->CDBUSALLOC |= GPIO_CDBUSALLOC_CDEVEN0_ADC0;
+        GPIO->CDBUSALLOC |= GPIO_CDBUSALLOC_CDODD0_ADC0;
+    }
+
+    // Clear any previous interrupt flags
+    IADC_clearInt(IADC0, _IADC_IF_MASK);
+
+    // Enable Scan interrupts
+    IADC_enableInt(IADC0, IADC_IEN_SCANTABLEDONE);
+
+    // Enable ADC interrupts
+    NVIC_ClearPendingIRQ(IADC_IRQn);
+    NVIC_EnableIRQ(IADC_IRQn);
+
+    common_hal_mcu_pin_claim(pin);
+}
+
+// Check obj is deinited or not
+bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t *self) {
+    return self->pin == NULL;
+}
+
+// Deinit a analogin obj
+void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
+    if (num_current_input > 0) {
+        num_current_input--;
+        if (num_current_input == 0) {
+            IADC_reset(IADC0);
+        }
+    }
+    init_scan_table.entries[self->id].includeInScan = false;
+    init_scan_table.entries[self->id].posInput = iadcPosInputGnd;
+    scan_result[self->id] = 0;
+    common_hal_reset_pin(self->pin);
+    self->pin = NULL;
+}
+
+// IADC Handler to read adc value
+void IADC_IRQHandler(void) {
+    IADC_Result_t result = {0, 0};
+
+    // While the FIFO count is non-zero
+    while (IADC_getScanFifoCnt(IADC0)) {
+        // Pull a scan result from the FIFO
+        result = IADC_pullScanFifoResult(IADC0);
+        scan_result[result.id] = result.data;
+        scan_result[result.id] *= 16;
+    }
+    scan_flag = 1;
+    IADC_clearInt(IADC0, IADC_IF_SCANTABLEDONE);
+}
+
+//  Get adc value, use IADC_IRQHandler
+//  adc value 0 - 65535
+uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
+    // Start scan
+    IADC_command(IADC0, iadcCmdStartScan);
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t current_ticks = start_ticks;
+
+    // Busy-wait until timeout or until we've read enough chars.
+    while (current_ticks - start_ticks <= 1000) {
+        current_ticks = supervisor_ticks_ms64();
+        if (scan_flag == 1) {
+            scan_flag = 0;
+            break;
+        }
+        RUN_BACKGROUND_TASKS;
+        // Allow user to break out of a timeout with a KeyboardInterrupt.
+        if (mp_hal_is_interrupted()) {
+            break;
+        }
+    }
+
+    uint16_t ret = scan_result[self->id];
+    scan_result[self->id] = 0;
+    return ret;
+}
+
+// Get adc ref value
+float common_hal_analogio_analogin_get_reference_voltage
+    (analogio_analogin_obj_t *self) {
+    return 2.42f;
+}
diff --git a/ports/silabs/common-hal/analogio/AnalogIn.h b/ports/silabs/common-hal/analogio/AnalogIn.h
new file mode 100644
index 0000000000..ae67036132
--- /dev/null
+++ b/ports/silabs/common-hal/analogio/AnalogIn.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGIN_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+    uint8_t id;
+} analogio_analogin_obj_t;
+
+#endif // MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/silabs/common-hal/analogio/AnalogOut.c b/ports/silabs/common-hal/analogio/AnalogOut.c
new file mode 100644
index 0000000000..88b2f53f9e
--- /dev/null
+++ b/ports/silabs/common-hal/analogio/AnalogOut.c
@@ -0,0 +1,167 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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/mperrno.h"
+#include "py/runtime.h"
+#include "shared-bindings/analogio/AnalogOut.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/shared/translate/translate.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "em_vdac.h"
+
+// Set the VDAC to max frequency of 1 MHz
+#define CLK_VDAC_FREQ 1000000
+
+// List DAC pin and channel supported
+mcu_dac_pin_obj_t mcu_dac_list[DAC_BANK_ARRAY_LEN] = {
+    DAC(VDAC0, 0, FN_VDAC0_CH0, false, 0, &pin_PB0),
+    DAC(VDAC0, 1, FN_VDAC0_CH1, false, 0, &pin_PB1),
+    DAC(VDAC1, 0, FN_VDAC1_CH0, false, 0, &pin_PB2),
+    DAC(VDAC1, 1, FN_VDAC1_CH1, false, 0, &pin_PB3),
+};
+
+// Construct analogout pin. This function is called when init analogout
+void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
+    const mcu_pin_obj_t *pin) {
+    uint8_t dac_num = DAC_BANK_ARRAY_LEN;
+    mcu_dac_pin_obj_t *p_dac;
+    uint8_t dac_index;
+
+    if (self->dac == NULL) {
+        for (dac_index = 0; dac_index < dac_num; dac_index++) {
+            p_dac = &mcu_dac_list[dac_index];
+
+            if (p_dac->pin == pin) {
+                self->dac = p_dac;
+                self->dac->is_used = true;
+                self->dac->value = 0;
+                break;
+            }
+        }
+    }
+
+    if (self->dac == NULL) {
+        mp_raise_ValueError(translate("DAC Device Init Error"));
+    }
+
+    // Use default settings
+    VDAC_Init_TypeDef init = VDAC_INIT_DEFAULT;
+    VDAC_InitChannel_TypeDef initChannel = VDAC_INITCHANNEL_DEFAULT;
+
+    // Use the HFRCOEM23 to clock the VDAC in order to operate in EM3 mode
+    CMU_ClockSelectSet(self->dac->vdac == VDAC0 ?
+        cmuClock_VDAC0:cmuClock_VDAC1, cmuSelect_HFRCOEM23);
+
+    // Enable the HFRCOEM23 and VDAC clocks
+    CMU_ClockEnable(cmuClock_HFRCOEM23, true);
+    CMU_ClockEnable(self->dac->vdac == VDAC0 ?
+        cmuClock_VDAC0 : cmuClock_VDAC1, true);
+
+    // Calculate the VDAC clock prescaler value resulting in a 1 MHz VDAC clock
+    init.prescaler = VDAC_PrescaleCalc(VDAC0, CLK_VDAC_FREQ);
+
+    init.reference = vdacRef2V5;
+    // Clocking is requested on demand
+    init.onDemandClk = false;
+
+    // Disable High Capacitance Load mode
+    initChannel.highCapLoadEnable = false;
+
+    // Use Low Power mode
+    initChannel.powerMode = vdacPowerModeLowPower;
+
+    // Initialize the VDAC and VDAC channel
+    VDAC_Init(self->dac->vdac, &init);
+
+    VDAC_InitChannel(self->dac->vdac, &initChannel, self->dac->channel);
+
+    // Enable the VDAC
+    VDAC_Enable(self->dac->vdac, self->dac->channel, true);
+
+    for (dac_index = 0; dac_index < dac_num; dac_index++) {
+        p_dac = &mcu_dac_list[dac_index];
+
+        if (p_dac->vdac == self->dac->vdac && p_dac->pin != self->dac->pin
+            && p_dac->is_used == true) {
+            VDAC_InitChannel(p_dac->vdac, &initChannel, p_dac->channel);
+            VDAC_Enable(p_dac->vdac, p_dac->channel, true);
+            VDAC_ChannelOutputSet(p_dac->vdac, p_dac->channel,
+                p_dac->value >> 4);
+            break;
+        }
+    }
+
+    VDAC_ChannelOutputSet(self->dac->vdac, self->dac->channel, 0);
+
+    common_hal_mcu_pin_claim(pin);
+}
+
+// Check obj is deinited or not
+bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
+    return self->dac == NULL;
+}
+
+// Deinit analogout obj
+void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
+    uint8_t dac_num = DAC_BANK_ARRAY_LEN;
+    mcu_dac_pin_obj_t *p_dac;
+    uint8_t dac_index;
+    VDAC_Enable(self->dac->vdac, self->dac->channel, false);
+
+    for (dac_index = 0; dac_index < dac_num; dac_index++) {
+        p_dac = &mcu_dac_list[dac_index];
+        if (p_dac->vdac == self->dac->vdac && p_dac->pin != self->dac->pin
+            && p_dac->is_used == false) {
+            VDAC_Reset(self->dac->vdac);
+        }
+    }
+    common_hal_reset_pin(self->dac->pin);
+
+    self->dac->value = 0;
+    self->dac->is_used = false;
+    self->dac = NULL;
+}
+
+// Set value for dac pin
+// dac value 0 - 65535 (0 - 2.5V)
+void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
+    uint16_t value) {
+    self->dac->value = value;
+    // Write the output value to VDAC DATA register
+    VDAC_ChannelOutputSet(self->dac->vdac, self->dac->channel, value >> 4);
+}
+
+// Function reset dac peripheral
+void analogout_reset(void) {
+    uint8_t dac_index;
+    mcu_dac_pin_obj_t *p_dac;
+    for (dac_index = 0; dac_index < DAC_BANK_ARRAY_LEN; dac_index++) {
+        p_dac = &mcu_dac_list[dac_index];
+        if (p_dac->is_used == true) {
+            VDAC_Reset(p_dac->vdac);
+        }
+    }
+}
diff --git a/ports/silabs/common-hal/analogio/AnalogOut.h b/ports/silabs/common-hal/analogio/AnalogOut.h
new file mode 100644
index 0000000000..a8a8e8f9ae
--- /dev/null
+++ b/ports/silabs/common-hal/analogio/AnalogOut.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "py/obj.h"
+#include "peripherals/periph.h"
+
+typedef struct
+{
+    mp_obj_base_t base;
+    mcu_dac_pin_obj_t *dac;
+} analogio_analogout_obj_t;
+
+void analogout_reset(void);
+
+#endif // MICROPY_INCLUDED_EFR32_COMMON_HAL_ANALOGIO_ANALOGOUT_H
diff --git a/ports/silabs/common-hal/analogio/__init__.c b/ports/silabs/common-hal/analogio/__init__.c
new file mode 100644
index 0000000000..eea58c77d6
--- /dev/null
+++ b/ports/silabs/common-hal/analogio/__init__.c
@@ -0,0 +1 @@
+// No analogio module functions.
diff --git a/ports/silabs/common-hal/board/__init__.c b/ports/silabs/common-hal/board/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/silabs/common-hal/busio/I2C.c b/ports/silabs/common-hal/busio/I2C.c
new file mode 100644
index 0000000000..6d858be85e
--- /dev/null
+++ b/ports/silabs/common-hal/busio/I2C.c
@@ -0,0 +1,212 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/busio/I2C.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "supervisor/shared/translate/translate.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+STATIC I2CSPM_Init_TypeDef i2cspm_init;
+STATIC bool in_used = false;
+STATIC bool never_reset = false;
+
+// Reser I2C peripheral
+void i2c_reset(void) {
+    if ((!never_reset) && in_used) {
+        I2C_Reset(DEFAULT_I2C_PERIPHERAL);
+        in_used = false;
+    }
+}
+
+// Construct I2C protocol, this function init i2c peripheral
+void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
+    const mcu_pin_obj_t *scl,
+    const mcu_pin_obj_t *sda,
+    uint32_t frequency, uint32_t timeout) {
+
+    if ((scl != NULL) && (sda != NULL)) {
+        if (scl->function_list[ DEFAULT_I2C_PERIPHERAL == I2C1?
+                                FN_I2C1_SCL : FN_I2C0_SCL] == 1 &&
+            scl->function_list[DEFAULT_I2C_PERIPHERAL == I2C1?
+                               FN_I2C1_SDA : FN_I2C0_SDA] == 1) {
+            self->scl = scl;
+            self->sda = sda;
+            self->has_lock = false;
+            i2cspm_init.sclPort = self->scl->port;
+            i2cspm_init.sclPin = self->scl->number;
+            i2cspm_init.sdaPort = self->sda->port;
+            i2cspm_init.sdaPin = self->sda->number;
+            i2cspm_init.port = DEFAULT_I2C_PERIPHERAL;
+            i2cspm_init.i2cRefFreq = 0;
+            i2cspm_init.i2cMaxFreq = I2C_FREQ_STANDARD_MAX;
+            i2cspm_init.i2cClhr = i2cClockHLRStandard;
+
+            self->i2cspm = i2cspm_init.port;
+            I2CSPM_Init(&i2cspm_init);
+            common_hal_mcu_pin_claim(scl);
+            common_hal_mcu_pin_claim(sda);
+            in_used = true;
+        } else {
+            mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
+        }
+    } else {
+        raise_ValueError_invalid_pins();
+    }
+}
+
+// Never reset I2C obj when reload
+void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
+    never_reset = true;
+    common_hal_never_reset_pin(self->sda);
+    common_hal_never_reset_pin(self->scl);
+}
+
+// Check I2C status, deinited or not
+bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
+    return self->sda == NULL;
+}
+
+// Deinit i2c obj, reset I2C pin
+void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
+    if (common_hal_busio_i2c_deinited(self)) {
+        return;
+    }
+    I2C_Reset(self->i2cspm);
+    common_hal_reset_pin(self->sda);
+    common_hal_reset_pin(self->scl);
+    self->sda = NULL;
+    self->scl = NULL;
+    self->i2cspm = NULL;
+    in_used = false;
+}
+
+// Probe device in I2C bus
+bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
+    I2C_TransferSeq_TypeDef seq;
+    I2C_TransferReturn_TypeDef ret;
+    uint8_t data = 0;
+
+    seq.addr = addr << 1;
+    seq.flags = I2C_FLAG_READ;
+
+    seq.buf[0].data = &data;
+    seq.buf[0].len = 1;
+
+    ret = I2CSPM_Transfer(self->i2cspm, &seq);
+    if (ret != i2cTransferDone) {
+        return false;
+    }
+    return true;
+}
+
+// Lock I2C bus
+bool common_hal_busio_i2c_try_lock(busio_i2c_obj_t *self) {
+    bool grabbed_lock = false;
+
+    if (!self->has_lock) {
+        grabbed_lock = true;
+        self->has_lock = true;
+    }
+
+    return grabbed_lock;
+}
+
+// Check I2C lock status
+bool common_hal_busio_i2c_has_lock(busio_i2c_obj_t *self) {
+    return self->has_lock;
+}
+
+// Unlock I2C bus
+void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) {
+    self->has_lock = false;
+}
+
+// Write data to the device selected by address
+uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
+    const uint8_t *data, size_t len) {
+
+    I2C_TransferSeq_TypeDef seq;
+    I2C_TransferReturn_TypeDef ret;
+
+    seq.addr = addr << 1;
+    seq.flags = I2C_FLAG_WRITE;
+
+    seq.buf[0].data = (uint8_t *)data;
+    seq.buf[0].len = len;
+
+    ret = I2CSPM_Transfer(self->i2cspm, &seq);
+    if (ret != i2cTransferDone) {
+        return MP_EIO;
+    }
+    return 0;
+}
+
+// Read into buffer from the device selected by address
+uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self,
+    uint16_t addr,
+    uint8_t *data, size_t len) {
+
+    I2C_TransferSeq_TypeDef seq;
+    I2C_TransferReturn_TypeDef ret;
+
+    seq.addr = addr << 1;
+    seq.flags = I2C_FLAG_READ;
+
+    seq.buf[0].data = data;
+    seq.buf[0].len = len;
+
+    ret = I2CSPM_Transfer(self->i2cspm, &seq);
+    if (ret != i2cTransferDone) {
+        return MP_EIO;
+    }
+    return 0;
+}
+
+// Write the bytes from out_data to the device selected by address,
+uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t addr,
+    uint8_t *out_data, size_t out_len,
+    uint8_t *in_data, size_t in_len) {
+
+    I2C_TransferSeq_TypeDef seq;
+    I2C_TransferReturn_TypeDef ret;
+
+    seq.addr = addr << 1;
+    seq.flags = I2C_FLAG_WRITE_READ;
+    // Select command to issue
+    seq.buf[0].data = out_data;
+    seq.buf[0].len = out_len;
+    // Select location/length of data to be read
+    seq.buf[1].data = in_data;
+    seq.buf[1].len = in_len;
+
+    ret = I2CSPM_Transfer(self->i2cspm, &seq);
+    if (ret != i2cTransferDone) {
+        return MP_EIO;
+    }
+    return 0;
+}
diff --git a/ports/silabs/common-hal/busio/I2C.h b/ports/silabs/common-hal/busio/I2C.h
new file mode 100644
index 0000000000..14f879ee44
--- /dev/null
+++ b/ports/silabs/common-hal/busio/I2C.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "peripherals/periph.h"
+#include "py/obj.h"
+#include "em_i2c.h"
+#include "sl_i2cspm.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    I2C_TypeDef *i2cspm;
+    bool has_lock;
+    const mcu_pin_obj_t *scl;
+    const mcu_pin_obj_t *sda;
+} busio_i2c_obj_t;
+
+void i2c_reset(void);
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
diff --git a/ports/silabs/common-hal/busio/SPI.c b/ports/silabs/common-hal/busio/SPI.c
new file mode 100644
index 0000000000..a6f3109a32
--- /dev/null
+++ b/ports/silabs/common-hal/busio/SPI.c
@@ -0,0 +1,252 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/busio/SPI.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "supervisor/board.h"
+#include "supervisor/shared/translate/translate.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+// Note that any bugs introduced in this file can cause crashes
+// at startupfor chips using external SPI flash.
+
+STATIC SPIDRV_HandleData_t spidrv_eusart_handle;
+STATIC SPIDRV_Init_t spidrv_eusart_init = SPIDRV_MASTER_EUSART1;
+STATIC bool in_used = false;
+STATIC bool never_reset = false;
+
+// Reset SPI when reload
+void spi_reset(void) {
+    if (!never_reset && in_used) {
+        SPIDRV_DeInit(&spidrv_eusart_handle);
+        in_used = false;
+    }
+    return;
+}
+
+// Construct SPI protocol, this function init SPI peripheral
+void common_hal_busio_spi_construct(busio_spi_obj_t *self,
+    const mcu_pin_obj_t *sck,
+    const mcu_pin_obj_t *mosi,
+    const mcu_pin_obj_t *miso,
+    bool half_duplex) {
+    Ecode_t sc = ECODE_OK;
+
+    if (half_duplex) {
+        mp_raise_NotImplementedError(
+            translate("Half duplex SPI is not implemented"));
+    }
+
+    if ((sck != NULL) && (mosi != NULL) && (miso != NULL)) {
+        if (sck->function_list[FN_EUSART1_SCLK] == 1
+            && miso->function_list[FN_EUSART1_RX] == 1
+            && mosi->function_list[FN_EUSART1_TX] == 1) {
+
+            self->sck = sck;
+            self->mosi = mosi;
+            self->miso = miso;
+            self->handle = &spidrv_eusart_handle;
+            self->polarity = 0;
+            self->phase = 0;
+            self->bits = 8;
+
+            spidrv_eusart_init.portTx = mosi->port;
+            spidrv_eusart_init.portRx = miso->port;
+            spidrv_eusart_init.portClk = sck->port;
+            spidrv_eusart_init.pinTx = mosi->number;
+            spidrv_eusart_init.pinRx = miso->number;
+            spidrv_eusart_init.pinClk = sck->number;
+            spidrv_eusart_init.bitRate = 1000000;
+            spidrv_eusart_init.frameLength = 8;
+            spidrv_eusart_init.dummyTxValue = 0;
+            spidrv_eusart_init.type = spidrvMaster;
+            spidrv_eusart_init.bitOrder = spidrvBitOrderMsbFirst;
+            spidrv_eusart_init.clockMode = spidrvClockMode0;
+            spidrv_eusart_init.csControl = spidrvCsControlApplication;
+            spidrv_eusart_init.slaveStartMode = spidrvSlaveStartImmediate;
+
+            sc = SPIDRV_Init(self->handle, &spidrv_eusart_init);
+            if (sc != ECODE_EMDRV_SPIDRV_OK) {
+                mp_raise_ValueError(translate("SPI init error"));
+            }
+        } else {
+            mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
+        }
+    } else {
+        raise_ValueError_invalid_pins();
+    }
+
+    in_used = true;
+    common_hal_mcu_pin_claim(sck);
+    common_hal_mcu_pin_claim(mosi);
+    common_hal_mcu_pin_claim(miso);
+}
+
+// Never reset SPI when reload
+void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
+    never_reset = true;
+    common_hal_never_reset_pin(self->mosi);
+    common_hal_never_reset_pin(self->miso);
+    common_hal_never_reset_pin(self->sck);
+}
+
+// Check SPI status, deinited or not
+bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {
+    return self->sck == NULL;
+}
+
+// Deinit SPI obj
+void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
+
+    if (common_hal_busio_spi_deinited(self)) {
+        return;
+    }
+
+    Ecode_t sc = SPIDRV_DeInit(self->handle);
+    if (sc != ECODE_EMDRV_SPIDRV_OK) {
+        mp_raise_RuntimeError(translate("SPI re-init"));
+    }
+
+    in_used = false;
+    self->sck = NULL;
+    self->mosi = NULL;
+    self->miso = NULL;
+    self->handle = NULL;
+    common_hal_reset_pin(self->mosi);
+    common_hal_reset_pin(self->miso);
+    common_hal_reset_pin(self->sck);
+}
+
+// Configures the SPI bus. The SPI object must be locked.
+bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
+    uint32_t baudrate,
+    uint8_t polarity,
+    uint8_t phase,
+    uint8_t bits) {
+    Ecode_t sc;
+    // This resets the SPI, so check before updating it redundantly
+    if (baudrate == self->baudrate && polarity == self->polarity
+        && phase == self->phase && bits == self->bits) {
+        return true;
+    }
+
+    sc = SPIDRV_DeInit(self->handle);
+    if (sc != ECODE_EMDRV_SPIDRV_OK) {
+        mp_raise_RuntimeError(translate("SPI re-init"));
+    }
+    in_used = false;
+    self->baudrate = baudrate;
+    self->phase = phase;
+    self->bits = bits;
+    self->polarity = polarity;
+
+    spidrv_eusart_init.bitRate = baudrate;
+    spidrv_eusart_init.frameLength = 8;
+    if (polarity == 0 && phase == 0) {
+        spidrv_eusart_init.clockMode = spidrvClockMode0;
+    } else if (polarity == 0 && phase == 1) {
+        spidrv_eusart_init.clockMode = spidrvClockMode1;
+    } else if (polarity == 1 && phase == 0) {
+        spidrv_eusart_init.clockMode = spidrvClockMode2;
+    } else if (polarity == 1 && phase == 1) {
+        spidrv_eusart_init.clockMode = spidrvClockMode3;
+    }
+
+    sc = SPIDRV_Init(self->handle, &spidrv_eusart_init);
+    if (sc != ECODE_EMDRV_SPIDRV_OK) {
+        mp_raise_RuntimeError(translate("SPI re-init"));
+    }
+    in_used = true;
+    return true;
+}
+
+// Lock SPI bus
+bool common_hal_busio_spi_try_lock(busio_spi_obj_t *self) {
+    bool grabbed_lock = false;
+    if (!self->has_lock) {
+        grabbed_lock = true;
+        self->has_lock = true;
+    }
+
+    return grabbed_lock;
+}
+
+// Check SPI lock status
+bool common_hal_busio_spi_has_lock(busio_spi_obj_t *self) {
+    return self->has_lock;
+}
+
+// Unlock SPI bus
+void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
+    self->has_lock = false;
+}
+
+// Write the data contained in buffer
+bool common_hal_busio_spi_write(busio_spi_obj_t *self,
+    const uint8_t *data,
+    size_t len) {
+
+    Ecode_t result = SPIDRV_MTransmitB(self->handle, data, len);
+    return result == ECODE_EMDRV_SPIDRV_OK;
+}
+
+// Read data into buffer
+bool common_hal_busio_spi_read(busio_spi_obj_t *self,
+    uint8_t *data, size_t len,
+    uint8_t write_value) {
+
+    self->handle->initData.dummyTxValue = write_value;
+    Ecode_t result = SPIDRV_MReceiveB(self->handle, data, len);
+    return result == ECODE_EMDRV_SPIDRV_OK;
+}
+
+// Write out the data in data_out
+// while simultaneously reading data into data_in
+bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
+    const uint8_t *data_out,
+    uint8_t *data_in,
+    size_t len) {
+
+    Ecode_t result = SPIDRV_MTransferB(self->handle, data_out, data_in, len);
+    return result == ECODE_EMDRV_SPIDRV_OK;
+}
+
+// Get SPI baudrate
+uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t *self) {
+    return self->baudrate;
+}
+
+// Get SPI phase
+uint8_t common_hal_busio_spi_get_phase(busio_spi_obj_t *self) {
+    return self->phase;
+}
+
+// Get SPI polarity
+uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t *self) {
+    return self->polarity;
+}
diff --git a/ports/silabs/common-hal/busio/SPI.h b/ports/silabs/common-hal/busio/SPI.h
new file mode 100644
index 0000000000..f81316cda1
--- /dev/null
+++ b/ports/silabs/common-hal/busio/SPI.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_SPI_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_SPI_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "peripherals/periph.h"
+#include "py/obj.h"
+#include "spidrv.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    SPIDRV_Handle_t handle;
+    bool has_lock;
+    const mcu_pin_obj_t *sck;
+    const mcu_pin_obj_t *mosi;
+    const mcu_pin_obj_t *miso;
+    const mcu_pin_obj_t *nss;
+    uint32_t baudrate;
+    uint16_t prescaler;
+    uint8_t polarity;
+    uint8_t phase;
+    uint8_t bits;
+} busio_spi_obj_t;
+
+void spi_reset(void);
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_SPI_H
diff --git a/ports/silabs/common-hal/busio/UART.c b/ports/silabs/common-hal/busio/UART.c
new file mode 100644
index 0000000000..8b1883d906
--- /dev/null
+++ b/ports/silabs/common-hal/busio/UART.c
@@ -0,0 +1,299 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/busio/UART.h"
+
+#include "mpconfigport.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/interrupt_char.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "supervisor/shared/translate/translate.h"
+
+#define UARTDRV_USART_BUFFER_SIZE 6
+
+// Define RX and TX buffer queues
+DEFINE_BUF_QUEUE(UARTDRV_USART_BUFFER_SIZE, uartdrv_usart_rx_buffer);
+DEFINE_BUF_QUEUE(UARTDRV_USART_BUFFER_SIZE, uartdrv_usart_tx_buffer);
+
+STATIC UARTDRV_HandleData_t uartdrv_usart_handle;
+STATIC UARTDRV_InitUart_t uartdrv_usart_init;
+STATIC bool in_used = false;
+STATIC bool never_reset = false;
+busio_uart_obj_t *context;
+volatile Ecode_t errflag; // Used to restart read halts
+
+// Reset uart peripheral
+void uart_reset(void) {
+    if ((!never_reset) && in_used) {
+        if (UARTDRV_DeInit(&uartdrv_usart_handle) != ECODE_EMDRV_UARTDRV_OK) {
+            mp_raise_ValueError(translate("UART Deinit fail"));
+        }
+        in_used = false;
+    }
+}
+
+// Construct uart obj
+void common_hal_busio_uart_construct(busio_uart_obj_t *self,
+    const mcu_pin_obj_t *tx,
+    const mcu_pin_obj_t *rx,
+    const mcu_pin_obj_t *rts,
+    const mcu_pin_obj_t *cts,
+    const mcu_pin_obj_t *rs485_dir,
+    bool rs485_invert,
+    uint32_t baudrate,
+    uint8_t bits,
+    busio_uart_parity_t parity,
+    uint8_t stop,
+    mp_float_t timeout,
+    uint16_t receiver_buffer_size,
+    byte *receiver_buffer,
+    bool sigint_enabled) {
+
+    if ((rts != NULL) || (cts != NULL) || (rs485_dir != NULL)
+        || (rs485_invert == true)) {
+        mp_raise_NotImplementedError(translate("RS485"));
+    }
+
+    if ((tx != NULL) && (rx != NULL)) {
+        if (tx->function_list[FN_USART0_TX] == 1
+            && tx->function_list[FN_USART0_RX] == 1) {
+
+            self->handle = &uartdrv_usart_handle;
+            self->baudrate = baudrate;
+            self->tx = tx;
+            self->rx = rx;
+            self->sigint_enabled = sigint_enabled;
+            self->timeout_ms = timeout * 1000;
+            uartdrv_usart_init.port = USART0;
+            uartdrv_usart_init.baudRate = baudrate;
+            uartdrv_usart_init.txPort = tx->port;
+            uartdrv_usart_init.rxPort = rx->port;
+            uartdrv_usart_init.txPin = tx->number;
+            uartdrv_usart_init.rxPin = rx->number;
+            uartdrv_usart_init.uartNum = 0;
+            uartdrv_usart_init.stopBits = (stop >= 2) ? usartStopbits2
+                                                       :usartStopbits1;
+            uartdrv_usart_init.parity = (USART_Parity_TypeDef)parity;
+            uartdrv_usart_init.oversampling = usartOVS4;
+            uartdrv_usart_init.mvdis = false;
+            uartdrv_usart_init.fcType = uartdrvFlowControlNone;
+
+            uartdrv_usart_init.rxQueue = (UARTDRV_Buffer_FifoQueue_t *)
+                &uartdrv_usart_rx_buffer;
+            uartdrv_usart_init.txQueue = (UARTDRV_Buffer_FifoQueue_t *)
+                &uartdrv_usart_tx_buffer;
+
+            if (UARTDRV_InitUart(self->handle,&uartdrv_usart_init)
+                != ECODE_EMDRV_UARTDRV_OK) {
+                mp_raise_RuntimeError(translate("UART init"));
+            }
+            common_hal_mcu_pin_claim(tx);
+            common_hal_mcu_pin_claim(rx);
+            in_used = true;
+
+            // Use the provided buffer when given.
+            if (receiver_buffer != NULL) {
+                ringbuf_init(&self->ringbuf, receiver_buffer, receiver_buffer_size);
+            } else {
+                if (!ringbuf_alloc(&self->ringbuf, receiver_buffer_size, true)) {
+                    m_malloc_fail(receiver_buffer_size);
+                }
+            }
+            errflag = ECODE_EMDRV_UARTDRV_OK;
+            context = self;
+
+        } else {
+            mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
+        }
+
+    } else {
+        raise_ValueError_invalid_pins();
+    }
+}
+
+// Never reset UART obj when reload
+void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) {
+    never_reset = true;
+    common_hal_never_reset_pin(self->tx);
+    common_hal_never_reset_pin(self->rx);
+    return;
+}
+
+// Check Uart status, deinited or not
+bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
+    return self->handle == NULL;
+}
+
+// Deinit uart obj
+void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
+    if (common_hal_busio_uart_deinited(self)) {
+        return;
+    }
+
+    if (UARTDRV_DeInit(self->handle) != ECODE_EMDRV_UARTDRV_OK) {
+        mp_raise_RuntimeError(translate("UART de-init"));
+    }
+
+    common_hal_reset_pin(self->rx);
+    common_hal_reset_pin(self->tx);
+    self->tx = NULL;
+    self->rx = NULL;
+    self->handle = NULL;
+    in_used = false;
+}
+
+// Callback function for UARTDRV_Receive
+void UARTDRV_Receive_Callback(UARTDRV_Handle_t *handle,
+    Ecode_t transferStatus,
+    uint8_t *data,
+    UARTDRV_Count_t transferCount) {
+    (void)handle;
+    (void)transferStatus;
+    (void)data;
+    (void)transferCount;
+
+    taskENTER_CRITICAL();
+    ringbuf_put_n(&context->ringbuf, &context->rx_char, 1);
+    taskEXIT_CRITICAL();
+    errflag = UARTDRV_Receive(context->handle,&context->rx_char,1,
+        (UARTDRV_Callback_t)UARTDRV_Receive_Callback);
+    if (context->sigint_enabled) {
+        if (context->rx_char == CHAR_CTRL_C) {
+            common_hal_busio_uart_clear_rx_buffer(context);
+            mp_sched_keyboard_interrupt();
+        }
+    }
+}
+
+// Read bytes. If nbytes is specified then read at most that many bytes.
+// Otherwise, read everything that arrives until the connection times out.
+// Providing the number of bytes expected is highly recommended because it will be faster.
+// If no bytes are read, return None.
+size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data,
+    size_t len, int *errcode) {
+
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    if (len == 0) {
+        // Nothing to read.
+        return 0;
+    }
+    errflag = ECODE_EMDRV_UARTDRV_WAITING;
+    // Wait for all bytes received or timeout, same as nrf
+    while ((ringbuf_num_filled(&self->ringbuf) < len) &&
+           (supervisor_ticks_ms64() - start_ticks < self->timeout_ms)) {
+
+        RUN_BACKGROUND_TASKS;
+        // restart if it failed in the callback
+        if (errflag != ECODE_EMDRV_UARTDRV_OK) {
+            errflag = UARTDRV_Receive(self->handle,&self->rx_char,1,
+                (UARTDRV_Callback_t)UARTDRV_Receive_Callback);
+        }
+        // Allow user to break out of a timeout with a KeyboardInterrupt.
+        if (mp_hal_is_interrupted()) {
+            return 0;
+        }
+    }
+
+    taskENTER_CRITICAL();
+    // Copy as much received data as available, up to len bytes.
+    size_t rx_bytes = ringbuf_get_n(&self->ringbuf, data, len);
+    taskEXIT_CRITICAL();
+
+    if (rx_bytes == 0) {
+        *errcode = EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+    return rx_bytes;
+}
+
+// Write the buffer of bytes to the bus.
+size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
+    const uint8_t *data,
+    size_t len,
+    int *errcode) {
+
+    Ecode_t ret = UARTDRV_TransmitB(self->handle, (uint8_t *)data, len);
+    if (ret != ECODE_EMDRV_UARTDRV_OK) {
+        mp_raise_RuntimeError(translate("UART write"));
+    }
+    return len;
+}
+
+// Get uart baudrate value
+uint32_t common_hal_busio_uart_get_baudrate(busio_uart_obj_t *self) {
+    return self->baudrate;
+}
+
+// Set uart baudrate value
+void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self,
+    uint32_t baudrate) {
+
+    // Don't reset if it's the same value
+    if (baudrate == self->baudrate) {
+        return;
+    }
+    uartdrv_usart_init.baudRate = baudrate;
+    if (UARTDRV_InitUart(self->handle, &uartdrv_usart_init)
+        != ECODE_EMDRV_UARTDRV_OK) {
+        mp_raise_RuntimeError(translate("UART re-init"));
+    }
+}
+
+// Get timeout for receive
+mp_float_t common_hal_busio_uart_get_timeout(busio_uart_obj_t *self) {
+    return (mp_float_t)(self->timeout_ms / 1000.0f);
+}
+
+// Set timeout for receive
+void common_hal_busio_uart_set_timeout(busio_uart_obj_t *self,
+    mp_float_t timeout) {
+    self->timeout_ms = timeout * 1000;
+}
+
+// Query characters available to read
+uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self) {
+    return ringbuf_num_filled(&self->ringbuf);
+}
+
+// Clear rx buffer
+void common_hal_busio_uart_clear_rx_buffer(busio_uart_obj_t *self) {
+    taskENTER_CRITICAL();
+    ringbuf_clear(&self->ringbuf);
+    taskEXIT_CRITICAL();
+    self->handle->rxQueue->head = 0;
+    self->handle->rxQueue->tail = 0;
+    self->handle->rxQueue->used = 0;
+}
+
+// Check uart bus ready to transmit or not
+bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
+    return UARTDRV_GetTransmitDepth(self->handle) == 0;
+}
diff --git a/ports/silabs/common-hal/busio/UART.h b/ports/silabs/common-hal/busio/UART.h
new file mode 100644
index 0000000000..50d43d5cd6
--- /dev/null
+++ b/ports/silabs/common-hal/busio/UART.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_UART_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_UART_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "peripherals/periph.h"
+#include "py/obj.h"
+#include "py/ringbuf.h"
+#include "uartdrv.h"
+#include "FreeRTOS.h"
+#include "task.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    UARTDRV_Handle_t handle;
+    const mcu_pin_obj_t *rx;
+    const mcu_pin_obj_t *tx;
+    ringbuf_t ringbuf;
+    uint8_t rx_char;
+    uint32_t baudrate;
+    uint32_t timeout_ms;
+    bool sigint_enabled;
+} busio_uart_obj_t;
+
+void uart_reset(void);
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_UART_H
diff --git a/ports/silabs/common-hal/busio/__init__.c b/ports/silabs/common-hal/busio/__init__.c
new file mode 100644
index 0000000000..41761b6743
--- /dev/null
+++ b/ports/silabs/common-hal/busio/__init__.c
@@ -0,0 +1 @@
+// No busio module functions.
diff --git a/ports/silabs/common-hal/digitalio/DigitalInOut.c b/ports/silabs/common-hal/digitalio/DigitalInOut.c
new file mode 100644
index 0000000000..0f266bb41e
--- /dev/null
+++ b/ports/silabs/common-hal/digitalio/DigitalInOut.c
@@ -0,0 +1,159 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+#include "supervisor/shared/translate/translate.h"
+
+// Never reset pin when reload
+void common_hal_digitalio_digitalinout_never_reset(
+    digitalio_digitalinout_obj_t *self) {
+    common_hal_never_reset_pin(self->pin);
+}
+
+// Construct Digitalio obj
+digitalinout_result_t common_hal_digitalio_digitalinout_construct(
+    digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) {
+    common_hal_mcu_pin_claim(pin);
+    self->pin = pin;
+    GPIO_PinModeSet(pin->port, pin->number, gpioModeInput, 1);
+    return DIGITALINOUT_OK;
+}
+
+// Check Digitalio status, deinited or not
+bool common_hal_digitalio_digitalinout_deinited(
+    digitalio_digitalinout_obj_t *self) {
+    return self->pin == NULL;
+}
+
+// Deinit Digitalio obj
+void common_hal_digitalio_digitalinout_deinit(
+    digitalio_digitalinout_obj_t *self) {
+    if (common_hal_digitalio_digitalinout_deinited(self)) {
+        return;
+    }
+    common_hal_reset_pin(self->pin);
+    self->pin = NULL;
+}
+
+//  Switch pin to input
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
+    digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+    if (pull == PULL_NONE) {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,gpioModeInput,1);
+    } else if (pull == PULL_UP) {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,gpioModeInputPull,1);
+    } else {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,gpioModeInputPull,0);
+    }
+    return DIGITALINOUT_OK;
+}
+
+// Switch pin to output
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
+    digitalio_digitalinout_obj_t *self, bool value,
+    digitalio_drive_mode_t drive_mode) {
+    if (drive_mode == DRIVE_MODE_OPEN_DRAIN) {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,
+            gpioModeWiredAnd,value);
+    } else {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,
+            gpioModePushPull,value);
+    }
+
+    if (value) {
+        GPIO_PinOutSet(self->pin->port, self->pin->number);
+    } else {
+        GPIO_PinOutClear(self->pin->port, self->pin->number);
+    }
+
+    return DIGITALINOUT_OK;
+}
+
+// Get direction of the pin
+digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
+    digitalio_digitalinout_obj_t *self) {
+    GPIO_Mode_TypeDef mode = GPIO_PinModeGet(self->pin->port,self->pin->number);
+    if (mode >= gpioModePushPull) {
+        return DIRECTION_OUTPUT;
+    }
+    return DIRECTION_INPUT;
+}
+
+// Set digital logic level of the pin
+void common_hal_digitalio_digitalinout_set_value(
+    digitalio_digitalinout_obj_t *self, bool value) {
+    if (value) {
+        GPIO_PinOutSet(self->pin->port, self->pin->number);
+    } else {
+        GPIO_PinOutClear(self->pin->port, self->pin->number);
+    }
+}
+
+//  The digital logic level of the pin
+bool common_hal_digitalio_digitalinout_get_value(
+    digitalio_digitalinout_obj_t *self) {
+    if (common_hal_digitalio_digitalinout_get_direction(self)
+        == DIRECTION_OUTPUT) {
+        return GPIO_PinOutGet(self->pin->port, self->pin->number);
+    }
+    return GPIO_PinInGet(self->pin->port, self->pin->number);
+}
+
+// Set drive mode
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
+    digitalio_digitalinout_obj_t *self,
+    digitalio_drive_mode_t drive_mode) {
+    if (drive_mode == DRIVE_MODE_OPEN_DRAIN) {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,gpioModeWiredAnd,1);
+    } else {
+        GPIO_PinModeSet(self->pin->port,self->pin->number,gpioModePushPull,1);
+    }
+    return DIGITALINOUT_OK;
+}
+
+// Get drive mode
+digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
+    digitalio_digitalinout_obj_t *self) {
+    GPIO_Mode_TypeDef mode = GPIO_PinModeGet(self->pin->port,self->pin->number);
+    if (mode >= gpioModeWiredAnd) {
+        return DRIVE_MODE_OPEN_DRAIN;
+    }
+    return DRIVE_MODE_PUSH_PULL;
+}
+
+// Set pull direction
+digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
+    digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+    return DIGITALINOUT_OK;
+}
+
+// Get pull direction
+digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
+    digitalio_digitalinout_obj_t *self) {
+    return PULL_NONE;
+}
diff --git a/ports/silabs/common-hal/digitalio/DigitalInOut.h b/ports/silabs/common-hal/digitalio/DigitalInOut.h
new file mode 100644
index 0000000000..23a5a23537
--- /dev/null
+++ b/ports/silabs/common-hal/digitalio/DigitalInOut.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "em_gpio.h"
+
+typedef struct
+{
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+} digitalio_digitalinout_obj_t;
+
+#endif // MICROPY_INCLUDED_STM32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/ports/silabs/common-hal/digitalio/__init__.c b/ports/silabs/common-hal/digitalio/__init__.c
new file mode 100644
index 0000000000..20fad45959
--- /dev/null
+++ b/ports/silabs/common-hal/digitalio/__init__.c
@@ -0,0 +1 @@
+// No digitalio module functions.
diff --git a/ports/silabs/common-hal/microcontroller/Pin.c b/ports/silabs/common-hal/microcontroller/Pin.c
new file mode 100644
index 0000000000..24141522df
--- /dev/null
+++ b/ports/silabs/common-hal/microcontroller/Pin.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "py/mphal.h"
+#include "em_gpio.h"
+
+#define GPIO_PORT_COUNT (MP_ARRAY_SIZE(ports))
+
+GPIO_Port_TypeDef ports[] = {gpioPortA, gpioPortB, gpioPortC, gpioPortD};
+STATIC uint16_t claimed_pins[GPIO_PORT_COUNT];
+STATIC uint16_t __ALIGNED(4) never_reset_pins[GPIO_PORT_COUNT];
+
+// Reset all pin except pin in never_reset_pins list
+void reset_all_pins(void) {
+
+    uint8_t pin_num;
+    uint8_t port_num;
+    // Reset claimed pins
+    for (pin_num = 0; pin_num < GPIO_PORT_COUNT; pin_num++) {
+        claimed_pins[pin_num] = never_reset_pins[pin_num];
+    }
+
+    for (port_num = 0; port_num < GPIO_PORT_COUNT; port_num++) {
+        for (pin_num = 0; pin_num < 16; pin_num++) {
+            if (GPIO_PORT_PIN_VALID(ports[port_num],pin_num)
+                && !(never_reset_pins[port_num] >> pin_num & 0x01)) {
+                GPIO_PinModeSet(ports[port_num], pin_num,gpioModeInput,1);
+            }
+        }
+    }
+}
+
+//  Mark pin as free and return it to a quiescent state.
+void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
+    // Clear claimed bit & reset
+    claimed_pins[pin_port] &= ~(1 << pin_number);
+    never_reset_pins[pin_port] &= ~(1 << pin_number);
+    GPIO_PinModeSet(pin_port, pin_number, gpioModeInput, 1);
+}
+
+// Mark pin as never reset
+void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
+    never_reset_pins[pin_port] |= 1 << pin_number;
+    // Make sure never reset pins are also always claimed
+    claimed_pins[pin_port] |= 1 << pin_number;
+}
+
+// Mark pin as never reset
+void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
+    never_reset_pin_number(pin->port, pin->number);
+}
+
+// Reset pin
+void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
+    if (pin == NULL) {
+        return;
+    }
+    reset_pin_number(pin->port, pin->number);
+}
+
+// Mark pin as in used
+void claim_pin(uint8_t pin_port, uint8_t pin_number) {
+    // Set bit in claimed_pins bitmask.
+    claimed_pins[pin_port] |= 1 << pin_number;
+}
+
+// Check pin status free or in used
+bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
+    return !(claimed_pins[pin_port] & (1 << pin_number));
+}
+
+// Check pin status free or in used
+bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
+    return pin_number_is_free(pin->port, pin->number);
+}
+
+// Calculate pin number for a pin obj
+uint8_t common_hal_mcu_pin_number(const mcu_pin_obj_t *pin) {
+    return pin->port * 16 + pin->number;
+}
+
+// Mark pin is in used
+void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) {
+    claim_pin(pin->port, pin->number);
+}
+
+// Reset pin by pin number
+void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
+    reset_pin_number(pin_no / 16, pin_no % 16);
+}
diff --git a/ports/silabs/common-hal/microcontroller/Pin.h b/ports/silabs/common-hal/microcontroller/Pin.h
new file mode 100644
index 0000000000..20bf8a82f2
--- /dev/null
+++ b/ports/silabs/common-hal/microcontroller/Pin.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PIN_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PIN_H
+
+#include "py/mphal.h"
+
+#include "peripherals/pins.h"
+
+void reset_all_pins(void);
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/silabs/common-hal/microcontroller/Processor.c b/ports/silabs/common-hal/microcontroller/Processor.c
new file mode 100644
index 0000000000..1414a28df6
--- /dev/null
+++ b/ports/silabs/common-hal/microcontroller/Processor.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+
+#include "py/runtime.h"
+
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+#include "common-hal/microcontroller/Processor.h"
+#include "shared-bindings/microcontroller/ResetReason.h"
+#include "supervisor/shared/translate/translate.h"
+#include "tempdrv.h"
+#include "em_system.h"
+#include "em_cmu.h"
+
+float common_hal_mcu_processor_get_temperature(void) {
+    TEMPDRV_Init();
+    return (float)TEMPDRV_GetTemp();
+}
+
+float common_hal_mcu_processor_get_voltage(void) {
+    // xG24 does not have built-in direct reading of processor voltage
+    // Have Only 1 of IADC, already used for analogio module
+    return 3.3f;
+}
+
+uint32_t common_hal_mcu_processor_get_frequency(void) {
+    return CMU_ClockFreqGet(cmuClock_HCLK);
+}
+
+void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
+
+    size_t byte_index;
+    uint64_t serial = SYSTEM_GetUnique();
+    for (byte_index = 0; byte_index < sizeof(uint64_t); byte_index++) {
+        raw_id[byte_index] = (serial >> (64 - ((byte_index + 1) * 8))) & 0xff;
+    }
+}
+
+mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) {
+    return RESET_REASON_UNKNOWN;
+}
diff --git a/ports/silabs/common-hal/microcontroller/Processor.h b/ports/silabs/common-hal/microcontroller/Processor.h
new file mode 100644
index 0000000000..7faea68da3
--- /dev/null
+++ b/ports/silabs/common-hal/microcontroller/Processor.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
+
+#define COMMON_HAL_MCU_PROCESSOR_UID_LENGTH 12
+
+#include "py/obj.h"
+
+typedef struct
+{
+    mp_obj_base_t base;
+} mcu_processor_obj_t;
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
diff --git a/ports/silabs/common-hal/microcontroller/__init__.c b/ports/silabs/common-hal/microcontroller/__init__.c
new file mode 100644
index 0000000000..b1472fcf43
--- /dev/null
+++ b/ports/silabs/common-hal/microcontroller/__init__.c
@@ -0,0 +1,223 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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/mphal.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/microcontroller/Processor.h"
+
+#include "shared-bindings/nvm/ByteArray.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/microcontroller/Processor.h"
+
+#include "supervisor/filesystem.h"
+#include "supervisor/shared/safe_mode.h"
+#include "em_chip.h"
+#include "em_core.h"
+#include "sl_udelay.h"
+
+void common_hal_mcu_delay_us(uint32_t delay) {
+    sl_udelay_wait(delay);
+}
+
+void common_hal_mcu_disable_interrupts(void) {
+    CORE_CriticalDisableIrq();
+}
+
+void common_hal_mcu_enable_interrupts(void) {
+    CORE_CriticalEnableIrq();
+}
+
+void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
+    if (runmode == RUNMODE_SAFE_MODE) {
+        safe_mode_on_next_reset(SAFE_MODE_PROGRAMMATIC);
+    }
+}
+
+void common_hal_mcu_reset(void) {
+    filesystem_flush(); // TODO: implement as part of flash improvements
+    CHIP_Reset();
+}
+
+// The singleton microcontroller.Processor object, bound to microcontroller.cpu
+// It currently only has properties, and no state.
+const mcu_processor_obj_t common_hal_mcu_processor_obj = {
+    .base = {
+        .type = &mcu_processor_type,
+    },
+};
+
+#if CIRCUITPY_INTERNAL_NVM_SIZE > 0
+// The singleton nvm.ByteArray object.
+const nvm_bytearray_obj_t common_hal_mcu_nvm_obj = {
+    .base = {
+        .type = &nvm_bytearray_type,
+    },
+    .len = NVM_BYTEARRAY_BUFFER_SIZE
+};
+
+#endif
+
+#if CIRCUITPY_WATCHDOG
+// The singleton watchdog.WatchDogTimer object.
+watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = {
+    .base = {
+        .type = &watchdog_watchdogtimer_type,
+    },
+    .timeout = 0.0f,
+    .mode = WATCHDOGMODE_NONE,
+};
+#endif
+
+// This maps MCU pin names to pin objects.
+const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
+
+    #ifdef GPIO_PA0_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA0), MP_ROM_PTR(&pin_PA0) },
+    #endif
+
+    #ifdef GPIO_PA1_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA1), MP_ROM_PTR(&pin_PA1) },
+    #endif
+
+    #ifdef GPIO_PA2_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA2), MP_ROM_PTR(&pin_PA2) },
+    #endif
+
+    #ifdef GPIO_PA3_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA3), MP_ROM_PTR(&pin_PA3) },
+    #endif
+
+    #ifdef GPIO_PA4_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA4), MP_ROM_PTR(&pin_PA4) },
+    #endif
+
+    #ifdef GPIO_PA5_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA5), MP_ROM_PTR(&pin_PA5) },
+    #endif
+    #ifdef GPIO_PA6_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA6), MP_ROM_PTR(&pin_PA6) },
+    #endif
+
+    #ifdef GPIO_PA7_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA7), MP_ROM_PTR(&pin_PA7) },
+    #endif
+
+    #ifdef GPIO_PA8_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PA8), MP_ROM_PTR(&pin_PA8) },
+    #endif
+
+    #ifdef GPIO_PB0_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB0), MP_ROM_PTR(&pin_PB0) },
+    #endif
+
+    #ifdef GPIO_PB1_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB1), MP_ROM_PTR(&pin_PB1) },
+    #endif
+
+    #ifdef GPIO_PB2_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB2), MP_ROM_PTR(&pin_PB2) },
+    #endif
+
+    #ifdef GPIO_PB3_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB3), MP_ROM_PTR(&pin_PB3) },
+    #endif
+
+    #ifdef GPIO_PB4_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB4), MP_ROM_PTR(&pin_PB4) },
+    #endif
+
+    #ifdef GPIO_PB5_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PB5), MP_ROM_PTR(&pin_PB5) },
+    #endif
+
+    #ifdef GPIO_PC0_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC0), MP_ROM_PTR(&pin_PC0) },
+    #endif
+
+    #ifdef GPIO_PC1_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC1), MP_ROM_PTR(&pin_PC1) },
+    #endif
+
+    #ifdef GPIO_PC2_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC2), MP_ROM_PTR(&pin_PC2) },
+    #endif
+
+    #ifdef GPIO_PC3_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC3), MP_ROM_PTR(&pin_PC3) },
+    #endif
+
+    #ifdef GPIO_PC4_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC4), MP_ROM_PTR(&pin_PC4) },
+    #endif
+
+    #ifdef GPIO_PC5_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC5), MP_ROM_PTR(&pin_PC5) },
+    #endif
+
+    #ifdef GPIO_PC6_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC6), MP_ROM_PTR(&pin_PC6) },
+    #endif
+
+    #ifdef GPIO_PC7_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC7), MP_ROM_PTR(&pin_PC7) },
+    #endif
+    #ifdef GPIO_PC8_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC8), MP_ROM_PTR(&pin_PC8) },
+    #endif
+
+    #ifdef GPIO_PC9_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PC9), MP_ROM_PTR(&pin_PC9) },
+    #endif
+
+    #ifdef GPIO_PD0_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD0), MP_ROM_PTR(&pin_PD0) },
+    #endif
+
+    #ifdef GPIO_PD1_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD1), MP_ROM_PTR(&pin_PD1) },
+    #endif
+
+    #ifdef GPIO_PD2_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD2), MP_ROM_PTR(&pin_PD2) },
+    #endif
+
+    #ifdef GPIO_PD3_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD3), MP_ROM_PTR(&pin_PD3) },
+    #endif
+
+    #ifdef GPIO_PD4_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD4), MP_ROM_PTR(&pin_PD4) },
+    #endif
+
+    #ifdef GPIO_PD5_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_PD5), MP_ROM_PTR(&pin_PD5) }
+    #endif
+};
+MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
diff --git a/ports/silabs/common-hal/nvm/ByteArray.c b/ports/silabs/common-hal/nvm/ByteArray.c
new file mode 100644
index 0000000000..e94ed9198d
--- /dev/null
+++ b/ports/silabs/common-hal/nvm/ByteArray.c
@@ -0,0 +1,98 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "common-hal/nvm/ByteArray.h"
+#include "supervisor/shared/stack.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate/translate.h"
+
+#include "nvm3_default.h"
+#include "nvm3_default_config.h"
+
+uint8_t nvm_array[NVM_BYTEARRAY_BUFFER_SIZE];
+STATIC bool isInitialized = false;
+#define NVM_KEY 98
+
+// Get length of nvm bytearray
+uint32_t common_hal_nvm_bytearray_get_length(nvm_bytearray_obj_t *self) {
+    return self->len;
+}
+
+uint32_t nvm3_read(nvm_bytearray_obj_t *self) {
+    uint32_t type;
+    Ecode_t err;
+    size_t len;
+
+    if (isInitialized == false) {
+        nvm3_initDefault();
+        isInitialized = true;
+    }
+    err = nvm3_getObjectInfo(nvm3_defaultHandle, NVM_KEY, &type, &len);
+    if (err != ECODE_NVM3_OK || type != NVM3_OBJECTTYPE_DATA
+        || len != NVM_BYTEARRAY_BUFFER_SIZE) {
+
+        nvm3_deleteObject(nvm3_defaultHandle, NVM_KEY);
+        nvm3_writeData(nvm3_defaultHandle, NVM_KEY, nvm_array,
+            NVM_BYTEARRAY_BUFFER_SIZE);
+    }
+
+    err = nvm3_readData(nvm3_defaultHandle, NVM_KEY, nvm_array,
+        NVM_BYTEARRAY_BUFFER_SIZE);
+
+    return err;
+}
+
+// Write n bytes to nvm bytearray
+bool common_hal_nvm_bytearray_set_bytes(nvm_bytearray_obj_t *self,
+    uint32_t start_index, uint8_t *values,
+    uint32_t len) {
+    Ecode_t err;
+    err = nvm3_read(self);
+
+    if (err != ECODE_NVM3_OK) {
+        mp_raise_RuntimeError(translate("NVM3 read false"));
+    }
+    // Set bytes in buffer
+    memmove(nvm_array + start_index, values, len);
+
+    err = nvm3_writeData(nvm3_defaultHandle, NVM_KEY, nvm_array,
+        NVM_BYTEARRAY_BUFFER_SIZE);
+
+    if (err != ECODE_NVM3_OK) {
+        mp_raise_RuntimeError(translate("NVM3 write false"));
+    }
+
+    return true;
+}
+
+// Read n bytes from nvm bytearray
+void common_hal_nvm_bytearray_get_bytes(nvm_bytearray_obj_t *self,
+    uint32_t start_index,
+    uint32_t len, uint8_t *values) {
+    nvm3_read(self);
+    memcpy(values, nvm_array + start_index, len);
+}
diff --git a/ports/silabs/common-hal/nvm/ByteArray.h b/ports/silabs/common-hal/nvm/ByteArray.h
new file mode 100644
index 0000000000..ac609e47eb
--- /dev/null
+++ b/ports/silabs/common-hal/nvm/ByteArray.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_NVM_BYTEARRAY_H
+#define MICROPY_INCLUDED_EFR32_COMMON_HAL_NVM_BYTEARRAY_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint32_t len;
+} nvm_bytearray_obj_t;
+
+#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_NVM_BYTEARRAY_H
diff --git a/ports/silabs/common-hal/nvm/__init__.c b/ports/silabs/common-hal/nvm/__init__.c
new file mode 100644
index 0000000000..1b702a1584
--- /dev/null
+++ b/ports/silabs/common-hal/nvm/__init__.c
@@ -0,0 +1 @@
+// No nvm module functions.
diff --git a/ports/silabs/common-hal/os/__init__.c b/ports/silabs/common-hal/os/__init__.c
new file mode 100644
index 0000000000..d4841556de
--- /dev/null
+++ b/ports/silabs/common-hal/os/__init__.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "genhdr/mpversion.h"
+#include "py/mpconfig.h"
+#include "py/objstr.h"
+#include "py/objtuple.h"
+
+#include "py/mperrno.h"
+#include "py/runtime.h"
+
+#include "peripherals/periph.h"
+#define RNG_TIMEOUT 5
+
+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, EFR32_SERIES_LOWER);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, EFR32_SERIES_LOWER);
+
+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);
+
+mp_obj_t common_hal_os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+
+bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
+
+    return false;
+}
diff --git a/ports/silabs/common-hal/pwmio/PWMOut.c b/ports/silabs/common-hal/pwmio/PWMOut.c
new file mode 100644
index 0000000000..b55c821462
--- /dev/null
+++ b/ports/silabs/common-hal/pwmio/PWMOut.c
@@ -0,0 +1,181 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "common-hal/pwmio/PWMOut.h"
+#include "shared-bindings/pwmio/PWMOut.h"
+#include "supervisor/shared/translate/translate.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+STATIC sl_pwm_instance_t pwm_handle[TIM_BANK_ARRAY_LEN];
+STATIC bool never_reset_tim[TIM_BANK_ARRAY_LEN];
+
+mcu_tim_pin_obj_t mcu_tim_list[TIM_BANK_ARRAY_LEN] = {
+    TIM(TIMER0, 0, FN_TIMER0_CC0, NULL),
+    TIM(TIMER1, 0, FN_TIMER1_CC0, NULL),
+    TIM(TIMER2, 0, FN_TIMER2_CC0, NULL),
+    TIM(TIMER3, 0, FN_TIMER3_CC0, NULL),
+    TIM(TIMER4, 0, FN_TIMER4_CC0, NULL),
+};
+
+// Reset all pwm channel
+void pwmout_reset(void) {
+    uint8_t tim_index;
+    for (tim_index = 0; tim_index < TIM_BANK_ARRAY_LEN; tim_index++) {
+        mcu_tim_pin_obj_t *l_tim = &mcu_tim_list[tim_index];
+        if (l_tim->pin != NULL) {
+            sl_pwm_deinit(&pwm_handle[tim_index]);
+        }
+    }
+
+}
+
+// Create a PWM object associated with the given pin
+pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
+    const mcu_pin_obj_t *pin,
+    uint16_t duty,
+    uint32_t frequency,
+    bool variable_frequency) {
+    uint8_t tim_num = TIM_BANK_ARRAY_LEN;
+    uint8_t percent = (duty * 100) / 65535;
+    sl_pwm_config_t pwm_config;
+    pwm_config.frequency = frequency;
+    pwm_config.polarity = PWM_ACTIVE_LOW;
+
+    mcu_tim_pin_obj_t *l_tim;
+    uint8_t tim_index;
+
+    if (self->tim == NULL) {
+        for (tim_index = 0; tim_index < tim_num; tim_index++) {
+            l_tim = &mcu_tim_list[tim_index];
+
+            if ((l_tim->pin == NULL && pin->function_list[l_tim->fn_index] == 1)
+                || l_tim->pin == pin) {
+                l_tim->pin = pin;
+                self->tim = l_tim;
+                self->handle = &pwm_handle[tim_index];
+                break;
+            }
+        }
+    }
+
+    if (self->tim == NULL) {
+        return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
+    }
+
+    self->duty_cycle = duty;
+    self->variable_frequency = variable_frequency;
+    self->frequency = frequency;
+    self->handle->port = pin->port;
+    self->handle->pin = pin->number;
+    self->handle->timer = self->tim->timer;
+    self->handle->channel = self->tim->channel;
+    self->tim->pin = pin;
+
+    if (SL_STATUS_OK != sl_pwm_init(self->handle, &pwm_config)) {
+        return PWMOUT_INITIALIZATION_ERROR;
+    }
+
+    sl_pwm_start(self->handle);
+    sl_pwm_set_duty_cycle(self->handle, percent);
+
+    common_hal_mcu_pin_claim(pin);
+    return PWMOUT_OK;
+}
+
+// Mark pwm obj to never reset after reload
+void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) {
+
+    uint8_t tim_index;
+    for (tim_index = 0; tim_index < TIM_BANK_ARRAY_LEN; tim_index++) {
+        if (&mcu_tim_list[tim_index] == self->tim) {
+            never_reset_tim[tim_index] = true;
+            common_hal_never_reset_pin(self->tim->pin);
+            break;
+        }
+    }
+}
+
+// Pwm will be reset after reloading.
+void common_hal_pwmio_pwmout_reset_ok(pwmio_pwmout_obj_t *self) {
+
+    uint8_t tim_index;
+    for (tim_index = 0; tim_index < TIM_BANK_ARRAY_LEN; tim_index++) {
+        if (&mcu_tim_list[tim_index] == self->tim) {
+            never_reset_tim[tim_index] = false;
+            break;
+        }
+    }
+}
+
+// Check pwm obj status, deinited or not
+bool common_hal_pwmio_pwmout_deinited(pwmio_pwmout_obj_t *self) {
+    return self->tim == NULL;
+}
+
+// Deint pwm obj
+void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t *self) {
+    sl_pwm_deinit(self->handle);
+    common_hal_reset_pin(self->tim->pin);
+    mcu_tim_pin_obj_t *l_tim = self->tim;
+    l_tim->pin = NULL;
+}
+
+// Set pwm duty cycle
+void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self,
+    uint16_t duty) {
+    uint8_t percent = (duty * 100) / 65535;
+    sl_pwm_set_duty_cycle(self->handle, percent);
+    self->duty_cycle = duty;
+}
+
+// Get pwm duty cycle
+uint16_t common_hal_pwmio_pwmout_get_duty_cycle(pwmio_pwmout_obj_t *self) {
+    return self->duty_cycle;
+}
+
+// Set pwm frequency
+void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self,
+    uint32_t frequency) {
+    sl_pwm_config_t pwm_config;
+    pwm_config.frequency = frequency;
+    pwm_config.polarity = PWM_ACTIVE_LOW;
+    sl_pwm_init(self->handle, &pwm_config);
+}
+
+// Get pwm frequency
+uint32_t common_hal_pwmio_pwmout_get_frequency(pwmio_pwmout_obj_t *self) {
+    return self->frequency;
+}
+
+// Check variable frequency
+bool common_hal_pwmio_pwmout_get_variable_frequency(pwmio_pwmout_obj_t *self) {
+    return self->variable_frequency;
+}
+
+// Get pin value in pwmio obj
+const mcu_pin_obj_t *common_hal_pwmio_pwmout_get_pin(pwmio_pwmout_obj_t *self) {
+    return self->tim->pin;
+}
diff --git a/ports/silabs/common-hal/pwmio/PWMOut.h b/ports/silabs/common-hal/pwmio/PWMOut.h
new file mode 100644
index 0000000000..484b1d87b9
--- /dev/null
+++ b/ports/silabs/common-hal/pwmio/PWMOut.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_STM32F4_COMMON_HAL_PWMIO_PWMOUT_H
+#define MICROPY_INCLUDED_STM32F4_COMMON_HAL_PWMIO_PWMOUT_H
+
+#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "py/obj.h"
+#include "peripherals/periph.h"
+#include "sl_pwm.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    sl_pwm_instance_t *handle;
+    mcu_tim_pin_obj_t *tim;
+    bool variable_frequency : 1;
+    uint16_t duty_cycle;
+    uint32_t frequency;
+} pwmio_pwmout_obj_t;
+
+void pwmout_reset(void);
+
+#endif // MICROPY_INCLUDED_STM32F4_COMMON_HAL_PWMIO_PWMOUT_H
diff --git a/ports/silabs/common-hal/pwmio/__init__.c b/ports/silabs/common-hal/pwmio/__init__.c
new file mode 100644
index 0000000000..9e551a1072
--- /dev/null
+++ b/ports/silabs/common-hal/pwmio/__init__.c
@@ -0,0 +1 @@
+// No pwmio module functions.
diff --git a/ports/silabs/common-hal/rtc/RTC.c b/ports/silabs/common-hal/rtc/RTC.c
new file mode 100644
index 0000000000..f3de48894c
--- /dev/null
+++ b/ports/silabs/common-hal/rtc/RTC.c
@@ -0,0 +1,78 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/rtc/__init__.h"
+#include "common-hal/rtc/RTC.h"
+#include "shared-bindings/rtc/RTC.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/translate/translate.h"
+#include "peripherals/rtc.h"
+#include "sl_sleeptimer.h"
+
+// Set rtc time
+void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
+
+    sl_sleeptimer_date_t date = { 0 };
+    date.year = tm->tm_year - 1900;
+    // Month enum begins at
+    date.month = tm->tm_mon - 1;
+    date.month_day = tm->tm_mday;
+    date.day_of_week = tm->tm_wday == 6?0:tm->tm_wday + 1;
+    date.hour = tm->tm_hour;
+    date.min = tm->tm_min;
+    date.sec = tm->tm_sec;
+    date.day_of_year = tm->tm_yday;
+    sl_sleeptimer_set_datetime(&date);
+}
+
+// Get rtc time
+void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
+    sl_sleeptimer_date_t date;
+    sl_sleeptimer_get_datetime(&date);
+
+    tm->tm_year = date.year + 1900;
+    tm->tm_mon = date.month + 1;
+    tm->tm_mday = date.month_day;
+    tm->tm_wday = date.day_of_week == 0?6:date.day_of_week - 1;
+    tm->tm_hour = date.hour;
+    tm->tm_min = date.min;
+    tm->tm_sec = date.sec;
+    tm->tm_yday = date.day_of_year;
+
+}
+
+int common_hal_rtc_get_calibration(void) {
+    return 0;
+}
+
+void common_hal_rtc_set_calibration(int calibration) {
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration);
+}
diff --git a/ports/silabs/common-hal/rtc/RTC.h b/ports/silabs/common-hal/rtc/RTC.h
new file mode 100644
index 0000000000..12683a310a
--- /dev/null
+++ b/ports/silabs/common-hal/rtc/RTC.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
+
+extern void rtc_init(void);
+extern void rtc_reset(void);
+
+#endif  // MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
diff --git a/ports/silabs/common-hal/rtc/__init__.c b/ports/silabs/common-hal/rtc/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/silabs/common-hal/rtc/__init__.h b/ports/silabs/common-hal/rtc/__init__.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/silabs/common-hal/supervisor/Runtime.c b/ports/silabs/common-hal/supervisor/Runtime.c
new file mode 100644
index 0000000000..f2ac082604
--- /dev/null
+++ b/ports/silabs/common-hal/supervisor/Runtime.c
@@ -0,0 +1,37 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include "shared-bindings/supervisor/Runtime.h"
+#include "supervisor/serial.h"
+
+bool common_hal_supervisor_runtime_get_serial_connected(void) {
+    return (bool)serial_connected();
+}
+
+bool common_hal_supervisor_runtime_get_serial_bytes_available(void) {
+    return (bool)serial_bytes_available();
+}
diff --git a/ports/silabs/common-hal/supervisor/Runtime.h b/ports/silabs/common-hal/supervisor/Runtime.h
new file mode 100644
index 0000000000..b71bd9b545
--- /dev/null
+++ b/ports/silabs/common-hal/supervisor/Runtime.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H
+#define MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    // Stores no state currently.
+} super_runtime_obj_t;
+
+#endif  // MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H
diff --git a/ports/silabs/common-hal/supervisor/__init__.c b/ports/silabs/common-hal/supervisor/__init__.c
new file mode 100644
index 0000000000..16dc414b06
--- /dev/null
+++ b/ports/silabs/common-hal/supervisor/__init__.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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/obj.h"
+
+#include "shared-bindings/supervisor/__init__.h"
+#include "shared-bindings/supervisor/Runtime.h"
+
+// The singleton supervisor.Runtime object, bound to supervisor.runtime
+// It currently only has properties, and no state.
+const super_runtime_obj_t common_hal_supervisor_runtime_obj = {
+    .base = {
+        .type = &supervisor_runtime_type,
+    },
+};
diff --git a/ports/silabs/common-hal/watchdog/WatchDogMode.c b/ports/silabs/common-hal/watchdog/WatchDogMode.c
new file mode 100644
index 0000000000..200db64eec
--- /dev/null
+++ b/ports/silabs/common-hal/watchdog/WatchDogMode.c
@@ -0,0 +1,25 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
diff --git a/ports/silabs/common-hal/watchdog/WatchDogTimer.c b/ports/silabs/common-hal/watchdog/WatchDogTimer.c
new file mode 100644
index 0000000000..b6158e1cc6
--- /dev/null
+++ b/ports/silabs/common-hal/watchdog/WatchDogTimer.c
@@ -0,0 +1,133 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "common-hal/watchdog/WatchDogTimer.h"
+
+#include "shared-bindings/watchdog/__init__.h"
+#include "shared-bindings/microcontroller/__init__.h"
+
+#include "em_wdog.h"
+#include "em_cmu.h"
+
+void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {
+    WDOGn_Feed(DEFAULT_WDOG);
+}
+
+void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
+    WDOG_Enable(false);
+}
+
+void watchdog_reset(void) {
+    common_hal_watchdog_deinit(&common_hal_mcu_watchdogtimer_obj);
+}
+
+mp_float_t common_hal_watchdog_get_timeout(watchdog_watchdogtimer_obj_t *self) {
+    return self->timeout;
+}
+
+void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self,
+    mp_float_t new_timeout) {
+
+    // Max timeout is 256000 ms
+    uint64_t timeout = new_timeout * 1000;
+    mp_arg_validate_int_max(timeout, 256000, MP_QSTR_WatchDogTimeout);
+
+    if ((uint32_t)self->timeout != (uint32_t)new_timeout) {
+
+        // Watchdog Initialize settings
+        WDOG_Init_TypeDef wdogInit = WDOG_INIT_DEFAULT;
+
+        switch ((uint32_t)new_timeout)
+        {
+            case 1:
+                wdogInit.perSel = wdogPeriod_1k;
+                break;
+            case 2:
+                wdogInit.perSel = wdogPeriod_2k;
+                break;
+            case 4:
+                wdogInit.perSel = wdogPeriod_4k;
+                break;
+            case 8:
+                wdogInit.perSel = wdogPeriod_8k;
+                break;
+            case 16:
+                wdogInit.perSel = wdogPeriod_16k;
+                break;
+            case 32:
+                wdogInit.perSel = wdogPeriod_32k;
+                break;
+            case 64:
+                wdogInit.perSel = wdogPeriod_64k;
+                break;
+            case 128:
+                wdogInit.perSel = wdogPeriod_128k;
+                break;
+            case 256:
+                wdogInit.perSel = wdogPeriod_256k;
+                break;
+            default:
+                mp_raise_ValueError(
+                    translate("Timeout value supported: 1,2,4,8,16,32,64,128,256"));
+
+        }
+
+        self->timeout = new_timeout;
+        // Enable clock for the WDOG module; has no effect on xG21
+        CMU_ClockEnable(cmuClock_WDOG0, true);
+
+        // ULFRCO as clock source
+        CMU_ClockSelectSet(cmuClock_WDOG0, cmuSelect_ULFRCO);
+
+        wdogInit.em1Run = true;
+        wdogInit.em2Run = true;
+        wdogInit.em3Run = true;
+
+        // Initializing watchdog with chosen settings
+        WDOGn_Init(DEFAULT_WDOG, &wdogInit);
+    }
+}
+
+watchdog_watchdogmode_t common_hal_watchdog_get_mode
+    (watchdog_watchdogtimer_obj_t *self) {
+    return self->mode;
+}
+
+void common_hal_watchdog_set_mode(watchdog_watchdogtimer_obj_t *self,
+    watchdog_watchdogmode_t new_mode) {
+    if (self->mode != new_mode) {
+        if (new_mode == WATCHDOGMODE_RAISE) {
+            mp_raise_NotImplementedError(
+                translate("RAISE mode is not implemented"));
+        } else if (new_mode == WATCHDOGMODE_NONE) {
+            self->mode = WATCHDOGMODE_NONE;
+            common_hal_watchdog_deinit(self);
+        }
+        self->mode = new_mode;
+        common_hal_watchdog_set_timeout(self, self->timeout);
+    }
+}
diff --git a/ports/silabs/common-hal/watchdog/WatchDogTimer.h b/ports/silabs/common-hal/watchdog/WatchDogTimer.h
new file mode 100644
index 0000000000..d1538bd491
--- /dev/null
+++ b/ports/silabs/common-hal/watchdog/WatchDogTimer.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
+#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
+
+#include "py/obj.h"
+#include "shared-bindings/watchdog/WatchDogMode.h"
+#include "shared-bindings/watchdog/WatchDogTimer.h"
+
+struct _watchdog_watchdogtimer_obj_t {
+    mp_obj_base_t base;
+    mp_float_t timeout;
+    watchdog_watchdogmode_t mode;
+};
+
+// This needs to be called in order to disable the watchdog
+void watchdog_reset(void);
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
diff --git a/ports/silabs/common-hal/watchdog/__init__.c b/ports/silabs/common-hal/watchdog/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ports/silabs/cp_efr32_extension/cp_efr32.slce b/ports/silabs/cp_efr32_extension/cp_efr32.slce
new file mode 100644
index 0000000000..90052a887d
--- /dev/null
+++ b/ports/silabs/cp_efr32_extension/cp_efr32.slce
@@ -0,0 +1,10 @@
+id: cp_efr32
+label:  CircuitPython support
+version: 1.0.0
+sdk:
+  id: "gecko_sdk"
+  version: 4.2.1
+component_path:
+  - path: ../boards/devkit_xg24_brd2601b/
+  - path: ../boards/explorerkit_xg24_brd2703a/
+  - path: ../boards/sparkfun_thingplus_matter_mgm240p_brd2704a/
diff --git a/ports/silabs/gecko_sdk b/ports/silabs/gecko_sdk
new file mode 160000
index 0000000000..3fbadf9fb4
--- /dev/null
+++ b/ports/silabs/gecko_sdk
@@ -0,0 +1 @@
+Subproject commit 3fbadf9fb4e904fd8ed087642a41762b833ae0fe
diff --git a/ports/silabs/license.md b/ports/silabs/license.md
new file mode 100644
index 0000000000..5b8797814f
--- /dev/null
+++ b/ports/silabs/license.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013-2022 Damien P. George and others
+
+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/ports/silabs/mpconfigport.h b/ports/silabs/mpconfigport.h
new file mode 100644
index 0000000000..ba498dd763
--- /dev/null
+++ b/ports/silabs/mpconfigport.h
@@ -0,0 +1,73 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef EFR32_MPCONFIGPORT_H__
+#define EFR32_MPCONFIGPORT_H__
+
+#include 
+
+#define MICROPY_PY_FUNCTION_ATTRS (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
+
+// 24kiB stack
+#define CIRCUITPY_DEFAULT_STACK_SIZE 0x6000
+
+// Board flags:
+#ifndef BOARD_OVERWRITE_SWD
+#define BOARD_OVERWRITE_SWD (0)
+#endif
+#ifndef BOARD_VTOR_DEFER
+#define BOARD_VTOR_DEFER (0)
+#endif
+#ifndef BOARD_NO_VBUS_SENSE
+#define BOARD_NO_VBUS_SENSE (0)
+#endif
+#ifndef BOARD_NO_USB_OTG_ID_SENSE
+#define BOARD_NO_USB_OTG_ID_SENSE (0)
+#endif
+
+#if INTERNAL_FLASH_FILESYSTEM
+#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR (0x080E0000UL)
+#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (512 * 1024)
+#else
+#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (0)
+#endif
+
+// Peripheral implementation counts
+#define MAX_UART 1
+#define MAX_I2C 1
+#define MAX_SPI 1
+
+#define asm(str) __asm(str)
+
+#include "py/circuitpy_mpconfig.h"
+
+#define MICROPY_PORT_ROOT_POINTERS    \
+    void *cpy_uart_obj_all[MAX_UART]; \
+    void *cpy_i2c_obj_all[MAX_I2C];   \
+    CIRCUITPY_COMMON_ROOT_POINTERS
+
+#endif  // EFR32_MPCONFIGPORT_H__
diff --git a/ports/silabs/mpconfigport.mk b/ports/silabs/mpconfigport.mk
new file mode 100644
index 0000000000..b3a2d63724
--- /dev/null
+++ b/ports/silabs/mpconfigport.mk
@@ -0,0 +1,37 @@
+LONGINT_IMPL ?= MPZ
+INTERNAL_LIBM ?= 1
+USB_NUM_ENDPOINT_PAIRS ?= 0
+
+CIRCUITPY_ANALOGIO ?= 1
+CIRCUITPY_BLEIO ?= 1
+CIRCUITPY_BUSDEVICE ?= 1
+CIRCUITPY_BUSIO ?= 1
+CIRCUITPY_DIGITALIO ?= 1
+CIRCUITPY_DISPLAYIO ?= 1
+CIRCUITPY_FRAMEBUFFERIO ?= 1
+CIRCUITPY_NVM ?= 1
+CIRCUITPY_PWMIO ?= 1
+CIRCUITPY_RTC ?= 1
+CIRCUITPY_WATCHDOG ?=1
+
+ifeq ($(MCU_SERIES),MG24)
+        # Not yet implemented common-hal modules:
+        CIRCUITPY_AUDIOIO ?= 0
+        CIRCUITPY_AUDIOCORE ?= 0
+        CIRCUITPY_AUDIOPWMIO ?= 0
+        CIRCUITPY_AUDIOBUSIO ?= 0
+        CIRCUITPY_BITBANGIO ?= 0
+        CIRCUITPY_BLEIO_HCI ?= 0
+        CIRCUITPY_COUNTIO ?= 0
+        CIRCUITPY_FREQUENCYIO ?= 0
+        CIRCUITPY_I2CTARGET ?= 0
+        CIRCUITPY_KEYPAD ?= 0
+        CIRCUITPY_NEOPIXEL_WRITE ?= 0
+        CIRCUITPY_PARALLELDISPLAY ?= 0
+        CIRCUITPY_PULSEIO ?= 0
+        CIRCUITPY_ROTARYIO ?= 0
+        CIRCUITPY_TOUCHIO ?= 0
+        CIRCUITPY_USB ?= 0
+endif
+
+CIRCUITPY_BUILD_EXTENSIONS ?= bin
diff --git a/ports/silabs/mphalport.c b/ports/silabs/mphalport.c
new file mode 100644
index 0000000000..715541b968
--- /dev/null
+++ b/ports/silabs/mphalport.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+
+#include "py/mphal.h"
+#include "py/mpstate.h"
+#include "py/gc.h"
+
+#include "shared-bindings/microcontroller/__init__.h"
+#include "supervisor/shared/tick.h"
+
+void mp_hal_delay_us(mp_uint_t delay) {
+    common_hal_mcu_delay_us(delay);
+}
+
+void mp_hal_disable_all_interrupts(void) {
+    common_hal_mcu_disable_interrupts();
+}
+
+void mp_hal_enable_all_interrupts(void) {
+    common_hal_mcu_enable_interrupts();
+}
diff --git a/ports/silabs/mphalport.h b/ports/silabs/mphalport.h
new file mode 100644
index 0000000000..39c817868a
--- /dev/null
+++ b/ports/silabs/mphalport.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_MPHALPORT_H
+#define MICROPY_INCLUDED_EFR32_MPHALPORT_H
+
+#include "py/obj.h"
+
+#include "lib/oofatfs/ff.h"
+
+#include "supervisor/shared/tick.h"
+
+// Global millisecond tick count (driven by SysTick interrupt).
+static inline mp_uint_t mp_hal_ticks_ms(void) {
+    return supervisor_ticks_ms32();
+}
+// Number of bytes in receive buffer
+extern volatile uint8_t usb_rx_count;
+extern volatile bool mp_cdc_enabled;
+
+int receive_usb(void);
+
+void mp_hal_set_interrupt_char(int c);
+
+void mp_hal_disable_all_interrupts(void);
+void mp_hal_enable_all_interrupts(void);
+
+#endif  // MICROPY_INCLUDED_EFR32_MPHALPORT_H
diff --git a/ports/silabs/peripherals/periph.h b/ports/silabs/peripherals/periph.h
new file mode 100644
index 0000000000..e70119a6b5
--- /dev/null
+++ b/ports/silabs/peripherals/periph.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef __MICROPY_INCLUDED_EFR32_PERIPHERALS_PERIPH_H__
+#define __MICROPY_INCLUDED_EFR32_PERIPHERALS_PERIPH_H__
+
+#include 
+#include 
+
+#include "pins.h"
+#include "uartdrv.h"
+#include "sl_pwm.h"
+#include "em_vdac.h"
+#define TIM_BANK_ARRAY_LEN  5
+
+
+// Timer Peripheral
+typedef struct {
+    TIMER_TypeDef *timer;
+    uint8_t channel;
+    uint8_t fn_index;
+    const mcu_pin_obj_t *pin;
+} mcu_tim_pin_obj_t;
+
+#define TIM(timer_index, channel_index, pin_fun, pin_num) \
+    {                                                     \
+        .timer = timer_index,                             \
+        .channel = channel_index,                         \
+        .fn_index = pin_fun,                              \
+        .pin = pin_num                                    \
+    }
+
+extern mcu_tim_pin_obj_t mcu_tim_list[TIM_BANK_ARRAY_LEN];
+
+#define DAC_BANK_ARRAY_LEN 4
+
+typedef struct {
+    VDAC_TypeDef *vdac;
+    uint8_t channel;
+    uint8_t fn_index;
+    bool is_used;
+    uint16_t value;
+    const mcu_pin_obj_t *pin;
+} mcu_dac_pin_obj_t;
+
+#define DAC(vdac_index, channel_index, pin_fun, used, dac_value, pin_num) \
+    {                                                                     \
+        .vdac = vdac_index,                                               \
+        .channel = channel_index,                                         \
+        .fn_index = pin_fun,                                              \
+        .is_used = used,                                                  \
+        .value = dac_value,                                               \
+        .pin = pin_num                                                    \
+    }
+
+extern mcu_dac_pin_obj_t mcu_dac_list[DAC_BANK_ARRAY_LEN];
+
+#endif  // __MICROPY_INCLUDED_EFR32_PERIPHERALS_PERIPH_H__
diff --git a/ports/silabs/peripherals/pins.h b/ports/silabs/peripherals/pins.h
new file mode 100644
index 0000000000..ca02bf4af6
--- /dev/null
+++ b/ports/silabs/peripherals/pins.h
@@ -0,0 +1,171 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef __MICROPY_INCLUDED_EFR32_PERIPHERALS_PINS_H__
+#define __MICROPY_INCLUDED_EFR32_PERIPHERALS_PINS_H__
+
+typedef struct {
+    mp_obj_base_t base;
+    const uint8_t port : 4;
+    const uint8_t number : 4;
+    const uint8_t *const function_list;
+} mcu_pin_obj_t;
+
+extern const mp_obj_type_t mcu_pin_type;
+
+#define PIN(p_port, p_number, p_funtion_list) \
+    {                                         \
+        {&mcu_pin_type},                      \
+        .port = p_port,                   \
+        .number = p_number,               \
+        .function_list = p_funtion_list   \
+    }
+
+#ifdef GPIO_PA0_EXISTS
+extern const mcu_pin_obj_t pin_PA0;
+#endif
+
+#ifdef GPIO_PA1_EXISTS
+extern const mcu_pin_obj_t pin_PA1;
+#endif
+
+#ifdef GPIO_PA2_EXISTS
+extern const mcu_pin_obj_t pin_PA2;
+#endif
+
+#ifdef GPIO_PA3_EXISTS
+extern const mcu_pin_obj_t pin_PA3;
+#endif
+
+#ifdef GPIO_PA4_EXISTS
+extern const mcu_pin_obj_t pin_PA4;
+#endif
+
+#ifdef GPIO_PA5_EXISTS
+extern const mcu_pin_obj_t pin_PA5;
+#endif
+
+#ifdef GPIO_PA6_EXISTS
+extern const mcu_pin_obj_t pin_PA6;
+#endif
+
+#ifdef GPIO_PA7_EXISTS
+extern const mcu_pin_obj_t pin_PA7;
+#endif
+
+#ifdef GPIO_PA8_EXISTS
+extern const mcu_pin_obj_t pin_PA8;
+#endif
+
+#ifdef GPIO_PB0_EXISTS
+extern const mcu_pin_obj_t pin_PB0;
+#endif
+
+#ifdef GPIO_PB1_EXISTS
+extern const mcu_pin_obj_t pin_PB1;
+#endif
+
+#ifdef GPIO_PB2_EXISTS
+extern const mcu_pin_obj_t pin_PB2;
+#endif
+
+#ifdef GPIO_PB3_EXISTS
+extern const mcu_pin_obj_t pin_PB3;
+#endif
+
+#ifdef GPIO_PB4_EXISTS
+extern const mcu_pin_obj_t pin_PB4;
+#endif
+
+#ifdef GPIO_PB5_EXISTS
+extern const mcu_pin_obj_t pin_PB5;
+#endif
+
+#ifdef GPIO_PC0_EXISTS
+extern const mcu_pin_obj_t pin_PC0;
+#endif
+
+#ifdef GPIO_PC1_EXISTS
+extern const mcu_pin_obj_t pin_PC1;
+#endif
+
+#ifdef GPIO_PC2_EXISTS
+extern const mcu_pin_obj_t pin_PC2;
+#endif
+
+#ifdef GPIO_PC3_EXISTS
+extern const mcu_pin_obj_t pin_PC3;
+#endif
+
+#ifdef GPIO_PC4_EXISTS
+extern const mcu_pin_obj_t pin_PC4;
+#endif
+
+#ifdef GPIO_PC5_EXISTS
+extern const mcu_pin_obj_t pin_PC5;
+#endif
+
+#ifdef GPIO_PC6_EXISTS
+extern const mcu_pin_obj_t pin_PC6;
+#endif
+
+#ifdef GPIO_PC7_EXISTS
+extern const mcu_pin_obj_t pin_PC7;
+#endif
+
+#ifdef GPIO_PC8_EXISTS
+extern const mcu_pin_obj_t pin_PC8;
+#endif
+
+#ifdef GPIO_PC9_EXISTS
+extern const mcu_pin_obj_t pin_PC9;
+#endif
+
+#ifdef GPIO_PD0_EXISTS
+extern const mcu_pin_obj_t pin_PD0;
+#endif
+
+#ifdef GPIO_PD1_EXISTS
+extern const mcu_pin_obj_t pin_PD1;
+#endif
+
+#ifdef GPIO_PD2_EXISTS
+extern const mcu_pin_obj_t pin_PD2;
+#endif
+
+#ifdef GPIO_PD3_EXISTS
+extern const mcu_pin_obj_t pin_PD3;
+#endif
+
+#ifdef GPIO_PD4_EXISTS
+extern const mcu_pin_obj_t pin_PD4;
+#endif
+
+#ifdef GPIO_PD5_EXISTS
+extern const mcu_pin_obj_t pin_PD5;
+#endif
+
+#endif // __MICROPY_INCLUDED_EFR32_PERIPHERALS_PINS_H__
diff --git a/ports/silabs/peripherals/rtc.h b/ports/silabs/peripherals/rtc.h
new file mode 100644
index 0000000000..74e3201767
--- /dev/null
+++ b/ports/silabs/peripherals/rtc.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef __MICROPY_INCLUDED_EFR32_PERIPHERALS_RTC_H__
+#define __MICROPY_INCLUDED_EFR32_PERIPHERALS_RTC_H__
+
+#include 
+#include 
+
+#endif  // __MICROPY_INCLUDED_EFR32_PERIPHERALS_RTC_H__
diff --git a/ports/silabs/peripherals/timers.h b/ports/silabs/peripherals/timers.h
new file mode 100644
index 0000000000..6fb7bb2a03
--- /dev/null
+++ b/ports/silabs/peripherals/timers.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 
+#include "py/mphal.h"
+#include "peripherals/periph.h"
diff --git a/ports/silabs/qstrdefsport.h b/ports/silabs/qstrdefsport.h
new file mode 100644
index 0000000000..3ba897069b
--- /dev/null
+++ b/ports/silabs/qstrdefsport.h
@@ -0,0 +1 @@
+// qstrs specific to this port
diff --git a/ports/silabs/res/Thony.png b/ports/silabs/res/Thony.png
new file mode 100755
index 0000000000000000000000000000000000000000..93b3f5dd4b258dd2e1d50860e0c9bebd54735497
GIT binary patch
literal 49362
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
    
         
    TypeSizePathModified
    !>*thjsY=#~
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
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+
diff --git a/ports/silabs/supervisor/internal_flash.c b/ports/silabs/supervisor/internal_flash.c
new file mode 100644
index 0000000000..c260649c63
--- /dev/null
+++ b/ports/silabs/supervisor/internal_flash.c
@@ -0,0 +1,138 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "supervisor/internal_flash.h"
+
+#include 
+#include 
+
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "py/mphal.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "lib/oofatfs/ff.h"
+#include "supervisor/flash.h"
+#include "supervisor/shared/safe_mode.h"
+
+#include "FreeRTOS.h"
+#include "task.h"
+
+#include "em_core.h"
+#include "em_device.h"
+#include "em_cmu.h"
+#include "em_msc.h"
+#include "sl_status.h"
+
+#define NO_CACHE        0xffffffff
+uint8_t _flash_cache[FLASH_PAGE_SIZE] __attribute__((aligned(4)));
+uint32_t _flash_page_addr = NO_CACHE;
+
+STATIC inline uint32_t lba2addr(uint32_t block) {
+    return CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR + block * FILESYSTEM_BLOCK_SIZE;
+}
+
+void supervisor_flash_init(void) {
+    // Enable MSC clock if supported
+    CMU_ClockEnable(cmuClock_MSC, true);
+}
+
+uint32_t supervisor_flash_get_block_size(void) {
+    return FILESYSTEM_BLOCK_SIZE;
+}
+
+uint32_t supervisor_flash_get_block_count(void) {
+    return CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE;
+}
+
+void port_internal_flash_flush(void) {
+    if (_flash_page_addr == NO_CACHE) {
+        return;
+    }
+
+    msc_Return_TypeDef ret = mscReturnOk;
+
+    // Skip if data is the same
+    if (memcmp(_flash_cache, (void *)_flash_page_addr, FLASH_PAGE_SIZE) != 0) {
+
+        MSC_Init();
+        taskENTER_CRITICAL();
+        ret = MSC_ErasePage((uint32_t *)_flash_page_addr);
+        taskEXIT_CRITICAL();
+        if (mscReturnOk != ret) {
+            reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
+        }
+        taskENTER_CRITICAL();
+        ret = MSC_WriteWord((uint32_t *)_flash_page_addr,_flash_cache,FLASH_PAGE_SIZE);
+        taskEXIT_CRITICAL();
+        if (mscReturnOk != ret) {
+            reset_into_safe_mode(SAFE_MODE_FLASH_WRITE_FAIL);
+        }
+        MSC_Deinit();
+    }
+}
+
+mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
+    // Must write out anything in cache before trying to read.
+    supervisor_flash_flush();
+
+    uint32_t src = lba2addr(block);
+    memcpy(dest, (uint8_t *)src, FILESYSTEM_BLOCK_SIZE * num_blocks);
+    return 0; // success
+}
+
+mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32_t num_blocks) {
+    while (num_blocks) {
+        uint32_t const addr = lba2addr(lba);
+        uint32_t const page_addr = addr & ~(FLASH_PAGE_SIZE - 1);
+
+        // Up to page boundary
+        uint32_t count = 8 - (lba % 8);
+        count = MIN(num_blocks, count);
+
+        if (page_addr != _flash_page_addr) {
+            // Write out anything in cache before overwriting it.*/
+            supervisor_flash_flush();
+
+            _flash_page_addr = page_addr;
+
+            // Copy the current contents of the entire page into the cache.
+            memcpy(_flash_cache, (void *)page_addr, FLASH_PAGE_SIZE);
+        }
+
+        // Overwrite part or all of the page cache with the src data.
+        memcpy(_flash_cache + (addr & (FLASH_PAGE_SIZE - 1)), src, count * FILESYSTEM_BLOCK_SIZE);
+
+        // adjust for next run
+        lba += count;
+        src += count * FILESYSTEM_BLOCK_SIZE;
+        num_blocks -= count;
+    }
+    return 0; // success
+}
+
+void supervisor_flash_release_cache(void) {
+}
diff --git a/ports/silabs/supervisor/internal_flash.h b/ports/silabs/supervisor/internal_flash.h
new file mode 100644
index 0000000000..898376e9d6
--- /dev/null
+++ b/ports/silabs/supervisor/internal_flash.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_H
+#define MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_H
+
+#include 
+#include 
+
+#include "py/mpconfig.h"
+
+#define INTERNAL_FLASH_SYSTICK_MASK     (0x1ff) // 512ms
+#define INTERNAL_FLASH_IDLE_TICK(tick)  (((tick) & INTERNAL_FLASH_SYSTICK_MASK) == 2)
+
+#endif  // MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_H
diff --git a/ports/silabs/supervisor/internal_flash_root_pointers.h b/ports/silabs/supervisor/internal_flash_root_pointers.h
new file mode 100644
index 0000000000..16694d5dac
--- /dev/null
+++ b/ports/silabs/supervisor/internal_flash_root_pointers.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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.
+ */
+
+#ifndef MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_ROOT_POINTERS_H
+#define MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_ROOT_POINTERS_H
+
+#define FLASH_ROOT_POINTERS
+
+#endif  // MICROPY_INCLUDED_EFR32_INTERNAL_FLASH_ROOT_POINTERS_H
diff --git a/ports/silabs/supervisor/port.c b/ports/silabs/supervisor/port.c
new file mode 100644
index 0000000000..b5deebf979
--- /dev/null
+++ b/ports/silabs/supervisor/port.c
@@ -0,0 +1,336 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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 "supervisor/background_callback.h"
+#include "supervisor/board.h"
+#include "supervisor/port.h"
+#include "shared/timeutils/timeutils.h"
+
+#include "common-hal/microcontroller/Pin.h"
+#include "shared-bindings/microcontroller/__init__.h"
+
+#if CIRCUITPY_AUDIOPWMIO
+#include "common-hal/audiopwmio/PWMAudioOut.h"
+#endif
+#if CIRCUITPY_BUSIO
+#include "common-hal/busio/I2C.h"
+#include "common-hal/busio/SPI.h"
+#include "common-hal/busio/UART.h"
+#endif
+#if CIRCUITPY_PULSEIO
+#include "common-hal/pulseio/PulseOut.h"
+#include "common-hal/pulseio/PulseIn.h"
+#endif
+#if CIRCUITPY_PWMIO
+#include "common-hal/pwmio/PWMOut.h"
+#endif
+#if CIRCUITPY_PULSEIO || CIRCUITPY_PWMIO
+#include "peripherals/timers.h"
+#endif
+#if CIRCUITPY_SDIOIO
+#include "common-hal/sdioio/SDCard.h"
+#endif
+#if CIRCUITPY_PULSEIO || CIRCUITPY_ALARM
+#include "peripherals/exti.h"
+#endif
+#if CIRCUITPY_ALARM
+#include "common-hal/alarm/__init__.h"
+#endif
+#if CIRCUITPY_RTC
+#include "shared-bindings/rtc/__init__.h"
+#endif
+#if CIRCUITPY_ANALOGIO
+#include "common-hal/analogio/AnalogOut.h"
+#endif
+
+#if CIRCUITPY_BLEIO
+#include "common-hal/_bleio/__init__.h"
+#endif
+
+// Include headers of EFR32
+#include 
+#include "em_chip.h"
+#include "sl_cmsis_os2_common.h"
+#include "sl_component_catalog.h"
+#include "sl_sleeptimer.h"
+#include "sl_system_init.h"
+#include "sl_system_kernel.h"
+
+#if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
+#include "sl_power_manager.h"
+#endif // SL_CATALOG_POWER_MANAGER_PRESENT
+
+#if !defined(SL_CATALOG_KERNEL_PRESENT)
+#error "Error: Requires SL_CATALOG_KERNEL_PRESENT definition"
+#endif
+
+#define SL_CIRCUITPYTHON_TASK_STACK_EXTRA_SIZE (32)
+#define SL_CIRCUITPYTHON_TASK_PRIORITY (40)
+#define HEAP_SIZE (88 * 1024)
+
+extern uint32_t __bss_start__;
+extern uint32_t __bss_end__;
+
+uint32_t _sbss;
+uint32_t _ebss;
+
+uint32_t *heap;
+uint32_t heap_size;
+
+STATIC sl_sleeptimer_timer_handle_t _tick_timer;
+STATIC sl_sleeptimer_timer_handle_t _sleep_timer;
+
+// CircuitPython stack thread
+STATIC void circuitpython_thread(void *p_arg);
+STATIC osThreadId_t tid_thread_circuitpython;
+__ALIGNED(8)
+STATIC uint8_t thread_circuitpython_stk[(CIRCUITPY_DEFAULT_STACK_SIZE +
+    SL_CIRCUITPYTHON_TASK_STACK_EXTRA_SIZE) &
+                                        0xFFFFFFF8u];
+__ALIGNED(4)
+STATIC uint8_t thread_circuitpython_cb[osThreadCbSize];
+
+STATIC const osThreadAttr_t thread_circuitpython_attr = {
+    .name = "CircuitPython stack",
+    .stack_mem = thread_circuitpython_stk,
+    .stack_size = sizeof(thread_circuitpython_stk),
+    .cb_mem = thread_circuitpython_cb,
+    .cb_size = osThreadCbSize,
+    .priority = (osPriority_t)SL_CIRCUITPYTHON_TASK_PRIORITY
+};
+
+STATIC bool isSchedulerStarted = false;
+
+safe_mode_t port_init(void) {
+    #if defined(SL_CATALOG_KERNEL_PRESENT)
+
+    if (!isSchedulerStarted) {
+        _sbss = __bss_start__;
+        _ebss = __bss_end__;
+
+        isSchedulerStarted = true;
+        // Initialize Silicon Labs device, system, service(s) and protocol stack(s).
+        // Note that if the kernel is present, processing task(s) will be created by
+        // this call.
+        sl_system_init();
+        // Create thread for Bluetooth stack
+        if (tid_thread_circuitpython == NULL) {
+            tid_thread_circuitpython = osThreadNew(circuitpython_thread,
+                NULL,
+                &thread_circuitpython_attr);
+        }
+
+        // Create mutex for Bluetooth handle
+        if (bluetooth_connection_mutex_id == NULL) {
+            bluetooth_connection_mutex_id = osMutexNew(&bluetooth_connection_mutex_attr);
+        }
+
+        if (tid_thread_circuitpython == NULL) {
+            for (;;) {
+            }
+        }
+        // Start the kernel. Task(s) created in app_init() will start running.
+        sl_system_kernel_start();
+    }
+
+    #endif // SL_CATALOG_KERNEL_PRESENT
+
+    if (heap == NULL) {
+        heap = malloc(HEAP_SIZE);
+        heap_size = HEAP_SIZE / sizeof(uint32_t);
+    }
+    if (heap == NULL) {
+        return SAFE_MODE_NO_HEAP;
+    }
+    return SAFE_MODE_NONE;
+}
+
+void reset_port(void) {
+    reset_all_pins();
+
+    #if CIRCUITPY_BUSIO
+    i2c_reset();
+    spi_reset();
+    uart_reset();
+    #endif
+
+    #if CIRCUITPY_PWMIO
+    pwmout_reset();
+    #endif
+
+    #if CIRCUITPY_ANALOGIO
+    analogout_reset();
+    #endif
+
+    #if CIRCUITPY_BLEIO
+    bleio_reset();
+    #endif
+}
+
+void reset_to_bootloader(void) {
+    CHIP_Reset();
+    for (;;) {
+    }
+}
+
+void reset_cpu(void) {
+    CHIP_Reset();
+    for (;;) {
+    }
+}
+
+uint32_t *port_heap_get_bottom(void) {
+    return heap;
+}
+
+uint32_t *port_heap_get_top(void) {
+    return heap + heap_size;
+}
+
+bool port_has_fixed_stack(void) {
+    return true;
+}
+
+uint32_t *port_stack_get_limit(void) {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    return (uint32_t *)thread_circuitpython_stk;
+    #pragma GCC diagnostic pop
+}
+
+uint32_t *port_stack_get_top(void) {
+    return port_stack_get_limit() + CIRCUITPY_DEFAULT_STACK_SIZE / sizeof(uint32_t);
+}
+
+uint64_t port_get_raw_ticks(uint8_t *subticks) {
+    uint32_t timer_freq = sl_sleeptimer_get_timer_frequency();
+    uint64_t all_subticks = (uint64_t)(sl_sleeptimer_get_tick_count()) * 1024;
+    if (subticks != NULL) {
+        *subticks = all_subticks % timer_freq;
+    }
+    return all_subticks / timer_freq;
+}
+
+// Periodic tick timer callback
+STATIC void on_tick_timer_timeout(sl_sleeptimer_timer_handle_t *handle,
+    void *data) {
+    (void)&handle;
+    (void)&data;
+    supervisor_tick();
+
+    // CircuitPython's VM is run in a separate FreeRTOS task from timer callbacks.
+    // So, we have to notify the main task every time in case it's waiting for us.
+    osThreadFlagsSet(tid_thread_circuitpython, 0x0001);
+}
+
+// Enable 1/1024 second tick.
+void port_enable_tick(void) {
+    uint32_t timer_freq = sl_sleeptimer_get_timer_frequency();
+
+    // Create timer for waking up the system periodically.
+    sl_sleeptimer_start_periodic_timer(&_tick_timer,
+        timer_freq / 1024,
+        on_tick_timer_timeout, NULL,
+        0,
+        SL_SLEEPTIMER_NO_HIGH_PRECISION_HF_CLOCKS_REQUIRED_FLAG);
+}
+
+// Disable 1/1024 second tick.
+void port_disable_tick(void) {
+    sl_sleeptimer_stop_timer(&_tick_timer);
+}
+
+void port_wake_main_task(void) {
+    osThreadFlagsSet(tid_thread_circuitpython, 0x0001);
+}
+
+STATIC void on_sleep_timer_timeout(sl_sleeptimer_timer_handle_t *handle,
+    void *data) {
+    port_wake_main_task();
+}
+
+void port_interrupt_after_ticks(uint32_t ticks) {
+    uint32_t timer_freq = sl_sleeptimer_get_timer_frequency();
+
+    uint32_t timer_tick = (uint32_t)((((uint64_t)ticks * timer_freq) + 1023) / 1024u);
+
+    // Create one-shot timer for waking up the system.
+    sl_sleeptimer_start_timer(&_sleep_timer,
+        timer_tick,
+        on_sleep_timer_timeout, NULL,
+        0,
+        SL_SLEEPTIMER_NO_HIGH_PRECISION_HF_CLOCKS_REQUIRED_FLAG);
+}
+
+void port_idle_until_interrupt(void) {
+    if (!background_callback_pending()) {
+        osThreadFlagsWait(0x0001, osFlagsWaitAny, osWaitForever);
+    }
+
+}
+
+// Place the word to save just after our BSS section that gets blanked.
+void port_set_saved_word(uint32_t value) {
+    __bss_end__ = value;
+}
+
+uint32_t port_get_saved_word(void) {
+    return __bss_end__;
+}
+
+#if CIRCUITPY_ALARM
+//  Board deinit in case boards/xxx/board.c does not provide board_deinit()
+MP_WEAK void board_deinit(void) {
+}
+#endif
+
+extern void main(void);
+
+void circuitpython_thread(void *p_arg) {
+    (void)p_arg;
+    main();
+}
+
+__attribute__((used)) void BusFault_Handler(void) {
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    while (true) {
+        asm ("nop;");
+    }
+}
+
+__attribute__((used)) void UsageFault_Handler(void) {
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    while (true) {
+        asm ("nop;");
+    }
+}
+
+__attribute__((used)) void HardFault_Handler(void) {
+    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    while (true) {
+        asm ("nop;");
+    }
+}
diff --git a/ports/silabs/supervisor/serial.c b/ports/silabs/supervisor/serial.c
new file mode 100644
index 0000000000..01aaa49835
--- /dev/null
+++ b/ports/silabs/supervisor/serial.c
@@ -0,0 +1,156 @@
+/*
+ * This file is part of Adafruit for EFR32 project
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2023 Silicon Laboratories Inc. www.silabs.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/mphal.h"
+#include "py/ringbuf.h"
+#include "supervisor/port.h"
+#include "supervisor/serial.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+
+#include "em_cmu.h"
+#include "em_core.h"
+#include "em_gpio.h"
+#include "em_eusart.h"
+#include "em_gpio.h"
+#include "em_cmu.h"
+
+#define CONSOLE_RCV_BUFFER_SIZE 4096
+
+#define EUSART_VCOM_TX_PORT gpioPortA
+#define EUSART_VCOM_TX_PIN 5
+
+#define EUSART_VCOM_RX_PORT gpioPortA
+#define EUSART_VCOM_RX_PIN 6
+
+STATIC ringbuf_t con_uart_rx_ringbuf;
+STATIC byte con_uart_rx_buf[CONSOLE_RCV_BUFFER_SIZE];
+STATIC volatile uint8_t received_data;
+
+// USART0 RX interrupt handler , put characters to ring buffer one by one
+void EUSART0_RX_IRQHandler(void) {
+    CORE_DECLARE_IRQ_STATE;
+    CORE_ENTER_ATOMIC();
+
+    received_data = EUSART0->RXDATA;
+    if (1 != ringbuf_put_n(&con_uart_rx_ringbuf, (uint8_t *)&received_data, 1)) {
+        mp_raise_OverflowError_varg(translate("Console UART RX buffer overflow"));
+    }
+
+    CORE_EXIT_ATOMIC();
+    port_wake_main_task();
+
+    if (received_data == CHAR_CTRL_C &&
+        mp_interrupt_char == CHAR_CTRL_C) {
+        ringbuf_clear(&con_uart_rx_ringbuf);
+        mp_sched_keyboard_interrupt();
+    }
+    EUSART_IntClear(EUSART0, EUSART_IF_RXFL);
+}
+
+// Configure EUSART0 for REPL
+void port_serial_early_init(void) {
+
+    // Enable clock to GPIO and EUSART1
+    CMU_ClockEnable(cmuClock_GPIO, true);
+    CMU_ClockEnable(cmuClock_EUSART0, true);
+
+    // Configure the EUSART TX pin to the board controller as an output
+    GPIO_PinModeSet(EUSART_VCOM_TX_PORT, EUSART_VCOM_TX_PIN, gpioModePushPull, 0);
+
+    // Configure the EUSART RX pin to the board controller as an input
+    GPIO_PinModeSet(EUSART_VCOM_RX_PORT, EUSART_VCOM_RX_PIN, gpioModeInput, 0);
+
+    // Route EUSART0 TX and RX to the board controller TX and RX pins
+    GPIO->EUSARTROUTE[0].TXROUTE = (EUSART_VCOM_TX_PORT << _GPIO_EUSART_TXROUTE_PORT_SHIFT)
+        | (EUSART_VCOM_TX_PIN << _GPIO_EUSART_TXROUTE_PIN_SHIFT);
+    GPIO->EUSARTROUTE[0].RXROUTE = (EUSART_VCOM_RX_PORT << _GPIO_EUSART_RXROUTE_PORT_SHIFT)
+        | (EUSART_VCOM_RX_PIN << _GPIO_EUSART_RXROUTE_PIN_SHIFT);
+
+    // Enable RX and TX signals now that they have been routed
+    GPIO->EUSARTROUTE[0].ROUTEEN = GPIO_EUSART_ROUTEEN_RXPEN | GPIO_EUSART_ROUTEEN_TXPEN;
+
+    // Default asynchronous initializer (115.2 Kbps, 8N1, no flow control)
+    EUSART_UartInit_TypeDef init = EUSART_UART_INIT_DEFAULT_HF;
+
+    // Configure and enable EUSART0 for high-frequency (EM0/1) operation
+    EUSART_UartInitHf(EUSART0, &init);
+
+
+    // Claim and never reset UART console pin
+    common_hal_mcu_pin_claim(&pin_PA5);
+    common_hal_mcu_pin_claim(&pin_PA6);
+    common_hal_never_reset_pin(&pin_PA5);
+    common_hal_never_reset_pin(&pin_PA6);
+}
+
+// Enable EUSART0 interrupt, init ring buffer
+void port_serial_init(void) {
+    ringbuf_init(&con_uart_rx_ringbuf,
+        con_uart_rx_buf,
+        CONSOLE_RCV_BUFFER_SIZE);
+
+    received_data = 0;
+    // Enable NVIC USART sources
+    NVIC_ClearPendingIRQ(EUSART0_RX_IRQn);
+    NVIC_EnableIRQ(EUSART0_RX_IRQn);
+    NVIC_SetPriority(EUSART0_RX_IRQn, 3);
+    EUSART_IntEnable(EUSART0, EUSART_IEN_RXFL);
+}
+
+bool port_serial_connected(void) {
+    return true;
+}
+
+// Get a characters from ring buffer
+char port_serial_read(void) {
+    int data;
+
+    CORE_DECLARE_IRQ_STATE;
+    CORE_ENTER_ATOMIC();
+
+    data = ringbuf_get(&con_uart_rx_ringbuf);
+
+    CORE_EXIT_ATOMIC();
+
+    return (char)data;
+}
+
+// Checking ring buffer haves bytes available or not
+bool port_serial_bytes_available(void) {
+    return ringbuf_num_filled(&con_uart_rx_ringbuf) > 0 ? true : false;
+}
+
+// Send n bytes data to serial by EUSART0
+void port_serial_write_substring(const char *text, uint32_t len) {
+    char *p_text = (char *)text;
+    while (len--) {
+        EUSART_Tx(EUSART0, *p_text);
+        p_text++;
+    }
+}
diff --git a/ports/silabs/tools/make_pins.py b/ports/silabs/tools/make_pins.py
new file mode 100644
index 0000000000..bd4973d3e0
--- /dev/null
+++ b/ports/silabs/tools/make_pins.py
@@ -0,0 +1,216 @@
+import csv
+import argparse
+import string
+
+
+def parse_pins(filename):
+    """Parse CSV file given in filename.
+    The CSV file should have the following columns:
+    mcu_name, board_name, port (integer), pin (integer)
+    The CSV file should also have a header row"""
+    pins = {}
+    with open(filename, newline="") as csv_file:
+        reader = csv.reader(csv_file)
+        reader.__next__()
+        for row in reader:
+            entry = (row[0].strip(), row[1].strip(), int(row[2].strip()), int(row[3].strip()))
+            pins[row[0].lower()] = entry
+    return pins
+
+
+def parse_pin_functions(filename):
+    """Parse a CSV file with peripheral pin mappings.
+    The CSV file should have the following columns
+    func_name, LOC0,LOC1,...,LOC31
+    There should not be any header row"""
+    functions = {}
+    with open(filename, newline="") as csv_file:
+        reader = csv.reader(csv_file)
+        for row in reader:
+            entry = row[1:]
+            functions[row[0].strip()] = entry
+    return functions
+
+
+def make_pin_name(pin):
+    """Create pin name"""
+    return "pin_" + pin[0]
+
+
+def make_mcu_dict_entry(pin):
+    """Create a pin mcu dictionary entry"""
+    entry = "{ MP_ROM_QSTR(MP_QSTR_" + pin[0] + "), MP_ROM_PTR(&" + make_pin_name(pin) + ") },"
+    return entry
+
+
+def make_mcu_dict_entry2(pin):
+    """Create a pin mcu dictionary entry"""
+    entry = (
+        "{ MP_ROM_QSTR(MP_QSTR_" + pin[1] + "), \t\t\tMP_ROM_PTR(&" + make_pin_name(pin) + ") },"
+    )
+    return entry
+
+
+def make_mcu_dict(pins):
+    """Create the mcu dictionary"""
+    decl = "\n\nSTATIC const mp_rom_map_elem_t board_module_globals_table[] = {\n"
+    decl += "\tCIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS\n"
+    for pin in pins.values():
+        decl += "\t" + make_mcu_dict_entry(pin) + "\n"
+
+    decl += "\n"
+    for pin in pins.values():
+        if pin[1] != "":
+            decl += "\t" + make_mcu_dict_entry2(pin) + "\n"
+
+    decl += "\t{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },\n"
+    decl += "\t{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },\n"
+    decl += "};\n"
+    decl += "MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);\n"
+    return decl
+
+
+def make_board_dict_entry(pin):
+    """Create a pin board dictionary entry"""
+    entry = "{ MP_OBJ_NEW_QSTR(MP_QSTR_" + pin[1] + "), (mp_obj_t)&" + make_pin_name(pin) + " },"
+    return entry
+
+
+def make_pin_function_list_decl(pin, fcns):
+    """Create a pin function list declaration"""
+    decl = "\nconst uint8_t pin_" + pin + "_functions[] = { \n"
+    if len(fcns) > 0:
+        decl += str(fcns[0])
+        for i in fcns[1:]:
+            decl += ", " + str(i)
+    decl += "\n};\n"
+    return decl
+
+
+def make_pin_declaration(pin):
+    """Create a pin declaration"""
+    decl = (
+        "\nconst mcu_pin_obj_t "
+        + make_pin_name(pin)
+        + " = PIN("
+        + str(pin[2])
+        + ","
+        + str(pin[3])
+        + ","
+        + make_pin_name(pin).lower()
+        + "_functions"
+        ");"
+    )
+    return decl
+
+
+def define_pin_exists(pin):
+    ret = "\n#define GPIO_" + pin[0] + "_EXISTS\t1"
+    return ret
+
+
+def make_pin_function_lists(functions, pins):
+    """Create lists of pin functions from the parsed CSV data"""
+    fcn_list = {}
+    decl = ""
+    i = 0
+    for fcn, fcn_pins in sorted(functions.items()):
+        for j in range(0, len(fcn_pins)):
+            pin = fcn_pins[j].lower()
+            if pin == "":
+                continue
+            if pin not in fcn_list:
+                fcn_list[pin] = [255] * len(functions)
+            fcn_list[pin][i] = 1
+        i += 1
+    for pin in pins.keys():
+        if not pin in fcn_list:
+            fcn_list[pin] = []
+
+        decl += make_pin_function_list_decl(pin, fcn_list[pin])
+
+    return decl
+
+
+def make_source_file(src_file, pins, fcn):
+    """Make pins.c"""
+    with open(src_file, "w") as f:
+        f.write('#include "shared-bindings/board/__init__.h"\n')
+        f.write('#include "pin_functions.h"\n')
+
+        f.write(make_pin_function_lists(fcn, pins))
+
+        for pin in pins.values():
+            f.write(make_pin_declaration(pin))
+        f.write(make_mcu_dict(pins))
+        f.close()
+    return
+
+
+def make_header_file(hdr_file, pins, fcns):
+    """Make pins.h"""
+    hdr_file_name = hdr_file.split("/")[-1]
+    guard_name = "__" + hdr_file_name.replace(".", "_").upper() + "__"
+    with open(hdr_file, "w") as f:
+        f.write("#ifndef " + guard_name + "\n")
+        f.write("#define " + guard_name + "\n\n")
+
+        fcn_names = sorted(fcns.keys())
+        for i in range(len(fcn_names)):
+            f.write("#define " + "FN_" + fcn_names[i] + "\t\t\t(" + str(i) + ")\n")
+
+        for pin in pins.values():
+            f.write(define_pin_exists(pin))
+
+        f.write("\n\n")
+        f.write("\n\n#endif /*" + guard_name + "*/\n")
+        f.close()
+
+    return
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        prog="make_pins",
+        usage="%(prog)s [options]",
+        description="Parse a CSV file with pin data and store as corresponding C source and header files.",
+    )
+    parser.add_argument(
+        "-s",
+        "--source_file",
+        dest="source_file",
+        action="store",
+        help="Name of the output source file",
+        default="pins.c",
+    )
+    parser.add_argument(
+        "-e",
+        "--header_file",
+        dest="header_file",
+        action="store",
+        help="Name of the output header file",
+        default="pin_functions.h",
+    )
+
+    parser.add_argument(
+        "csv_file",
+        action="store",
+        help="Name of the input csv file",
+    )
+    parser.add_argument(
+        "fcn_csv",
+        action="store",
+        help="Name of the csv file with pin functions",
+    )
+    args = parser.parse_args()
+
+    src_file = args.source_file
+    hdr_file = args.header_file
+
+    csv_file = args.csv_file
+    fcn_csv = args.fcn_csv
+
+    pins = parse_pins(csv_file)
+    fcns = parse_pin_functions(fcn_csv)
+    make_source_file(src_file, pins, fcns)
+    make_header_file(hdr_file, pins, fcns)
diff --git a/ports/silabs/tools/slc_cli_linux b/ports/silabs/tools/slc_cli_linux
new file mode 160000
index 0000000000..a2cef44346
--- /dev/null
+++ b/ports/silabs/tools/slc_cli_linux
@@ -0,0 +1 @@
+Subproject commit a2cef4434600379695bef23bfbdcc8e604f7f305
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 5e8fe3d3f6..5efa084652 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -30,3 +30,7 @@ cryptography
 # for web workflow minify
 minify_html
 jsmin
+
+# for Silicon Labs Configurator (SLC)
+websockets
+colorama
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 1b292b9d73..b77bea72f9 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -43,6 +43,7 @@ PORT_DEPS = {
         "lib/tinyusb/",
         "data/nvm.toml/",
     ],
+    "silabs": ["extmod/ulab/", "data/nvm.toml/"],
     "stm": ["extmod/ulab/", "lib/mp3/", "lib/protomatter/", "lib/tinyusb/", "data/nvm.toml/"]
     # omit unix which is part of the "test" target below
 }

From 75670829652aaf1794c27f6b0bbad5937fecd9f0 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 18 Apr 2023 15:52:06 -0400
Subject: [PATCH 2253/2403] Add Adafruit Feather RP2040 Prop-Maker

---
 .../board.c                                   | 29 ++++++++++
 .../mpconfigboard.h                           | 14 +++++
 .../mpconfigboard.mk                          |  9 +++
 .../pico-sdk-configboard.h                    |  4 ++
 .../adafruit_feather_rp2040_prop_maker/pins.c | 57 +++++++++++++++++++
 5 files changed, 113 insertions(+)
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/board.c
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/board.c
new file mode 100644
index 0000000000..331653173e
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/board.c
@@ -0,0 +1,29 @@
+/*
+ * 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.h
new file mode 100644
index 0000000000..c9e83756e3
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 Prop-Maker"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO4)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.mk
new file mode 100644
index 0000000000..06d0c5e2b8
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x239A
+USB_PID = 0x8132
+USB_PRODUCT = "Feather RP2040 Prop-Maker"
+USB_MANUFACTURER = "Adafruit"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c
new file mode 100644
index 0000000000..96e0bc71df
--- /dev/null
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c
@@ -0,0 +1,57 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_WORD_SELECT), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_BUTTON), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_SERVO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXELS), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXELS_POWER), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 403ea89d5799a37d4cda08071d5bf2e5bc86a383 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Tue, 18 Apr 2023 19:44:03 -0500
Subject: [PATCH 2254/2403] Initial paletts for OnDiskGif

---
 shared-bindings/gifio/OnDiskGif.c |  28 ++++++-
 shared-bindings/gifio/OnDiskGif.h |   3 +-
 shared-module/gifio/OnDiskGif.c   | 121 +++++++++++++++++++++---------
 shared-module/gifio/OnDiskGif.h   |   8 +-
 4 files changed, 118 insertions(+), 42 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index f6acccfabf..cfed55d0c8 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -117,9 +117,16 @@
 //|         """
 //|         ...
 STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    mp_obj_t arg = all_args[0];
+    enum { ARG_filename, ARG_use_palette, NUM_ARGS };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_filename, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_use_palette, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+    };
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(allowed_args) == NUM_ARGS);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    mp_obj_t arg = all_args[0];
     if (mp_obj_is_str(arg)) {
         arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
     }
@@ -130,7 +137,7 @@ STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_arg
 
     gifio_ondiskgif_t *self = m_new_obj(gifio_ondiskgif_t);
     self->base.type = &gifio_ondiskgif_type;
-    common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg));
+    common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg), args[ARG_use_palette].u_bool);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -199,6 +206,20 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_bitmap_obj, gifio_ondiskgif_obj_ge
 MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
     (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
 
+//|     palette: displayio.Palette
+//|     """The palette for the current frame."""
+STATIC mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) {
+    gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
+
+    check_for_deinit(self);
+    return common_hal_gifio_ondiskgif_get_palette(self);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_palette_obj, gifio_ondiskgif_obj_get_palette);
+
+MP_PROPERTY_GETTER(gifio_ondiskgif_palette_obj,
+    (mp_obj_t)&gifio_ondiskgif_get_palette_obj);
+
 //|     def next_frame(self) -> float:
 //|         """Loads the next frame. Returns expected delay before the next frame in seconds."""
 STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(mp_obj_t self_in) {
@@ -285,6 +306,7 @@ STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&gifio_ondiskgif___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&gifio_ondiskgif_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&gifio_ondiskgif_bitmap_obj) },
+    { MP_ROM_QSTR(MP_QSTR_palette), MP_ROM_PTR(&gifio_ondiskgif_palette_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&gifio_ondiskgif_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_next_frame), MP_ROM_PTR(&gifio_ondiskgif_next_frame_obj) },
     { MP_ROM_QSTR(MP_QSTR_duration), MP_ROM_PTR(&gifio_ondiskgif_duration_obj) },
diff --git a/shared-bindings/gifio/OnDiskGif.h b/shared-bindings/gifio/OnDiskGif.h
index 6776466e8d..deaa639685 100644
--- a/shared-bindings/gifio/OnDiskGif.h
+++ b/shared-bindings/gifio/OnDiskGif.h
@@ -32,13 +32,14 @@
 
 extern const mp_obj_type_t gifio_ondiskgif_type;
 
-void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file);
+void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file, bool use_palette);
 
 uint32_t common_hal_gifio_ondiskgif_get_pixel(gifio_ondiskgif_t *bitmap,
     int16_t x, int16_t y);
 
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self);
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self);
+mp_obj_t common_hal_gifio_ondiskgif_get_palette(gifio_ondiskgif_t *self);
 uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self);
 uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty);
 int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self);
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index aeb4f7bb74..f6adfa0775 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -26,6 +26,7 @@
 
 #include "shared-bindings/gifio/OnDiskGif.h"
 #include "shared-bindings/displayio/Bitmap.h"
+#include "shared-bindings/displayio/Palette.h"
 
 #include 
 
@@ -34,7 +35,6 @@
 
 
 static int32_t GIFReadFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
-    // mp_printf(&mp_plat_print, "GifReadFile len %d ", iLen);
     uint32_t iBytesRead;
     iBytesRead = iLen;
     pyb_file_obj_t *f = pFile->fHandle;
@@ -50,18 +50,15 @@ static int32_t GIFReadFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) {
         mp_raise_OSError(MP_EIO);
     }
     pFile->iPos = f->fp.fptr;
-    // mp_printf(&mp_plat_print, " now at %d\n", pFile->iPos);
 
     return bytes_read;
 } /* GIFReadFile() */
 
 static int32_t GIFSeekFile(GIFFILE *pFile, int32_t iPosition) {
-    // mp_printf(&mp_plat_print, "GifSeekFile %d ", iPosition);
     pyb_file_obj_t *f = pFile->fHandle;
 
     f_lseek(&f->fp, iPosition);
     pFile->iPos = f->fp.fptr;
-    // mp_printf(&mp_plat_print, " now at %d\n", pFile->iPos);
     return pFile->iPos;
 } /* GIFSeekFile() */
 
@@ -71,10 +68,25 @@ static void GIFDraw(GIFDRAW *pDraw) {
     // The palette is either RGB565 or the original 24-bit RGB values
     // depending on the pixel type selected with gif.begin()
 
-    displayio_bitmap_t *bitmap = (displayio_bitmap_t *)pDraw->pUser;
+    gifio_ondiskgif_displayio_objs_t *displayio_objs = (gifio_ondiskgif_displayio_objs_t *)pDraw->pUser;
+    displayio_bitmap_t *bitmap = displayio_objs->bitmap;
+    displayio_palette_t *palette = displayio_objs->palette;
 
-    uint8_t *s;
-    uint16_t *d;
+    // Update the palette if we have one in RGB888
+    if (palette != NULL) {
+        uint8_t *pPal = pDraw->pPalette24;
+        for (int p = 0; p < 256; p++) {
+            uint8_t r = *pPal++;
+            uint8_t g = *pPal++;
+            uint8_t b = *pPal++;
+            uint32_t color = (r << 16) + (g << 8) + b;
+            common_hal_displayio_palette_set_color(palette, p, color);
+            common_hal_displayio_palette_make_opaque(palette, p); // Transparency can change frame to frame
+        }
+        if (pDraw->ucHasTransparency) {
+            common_hal_displayio_palette_make_transparent(palette, pDraw->ucTransparent);
+        }
+    }
 
     int iWidth = pDraw->iWidth;
     if (iWidth + pDraw->iX > bitmap->width) {
@@ -87,11 +99,6 @@ static void GIFDraw(GIFDRAW *pDraw) {
 
     int32_t row_start = (pDraw->y + pDraw->iY) * bitmap->stride;
     uint32_t *row = bitmap->data + row_start;
-    s = pDraw->pPixels;
-    d = (uint16_t *)row;
-
-    uint16_t *pPal;
-    pPal = (uint16_t *)pDraw->pPalette;
 
     if (pDraw->ucDisposalMethod == 2) { // restore to background color
         // Not supported currently. Need to reset the area the previous frame occupied
@@ -101,31 +108,53 @@ static void GIFDraw(GIFDRAW *pDraw) {
         // To workaround clear the gif.bitmap object yourself as required.
     }
 
-    uint8_t c, ucTransparent = pDraw->ucTransparent;
-    d += pDraw->iX;
-    if (pDraw->ucHasTransparency == 1) {
+    if (palette != NULL) {
+        uint8_t *s = pDraw->pPixels;
+        uint8_t *d = (uint8_t *)row;
+
+        d += pDraw->iX;
         for (int x = 0; x < iWidth; x++)
         {
-            c = *s++;
-            if (c != ucTransparent) {
-                *d = pPal[c];
-            }
-            d++;
+            *d++ = *s++;
         }
     } else {
-        for (int x = 0; x < iWidth; x++)
-        {
-            c = *s++;
-            *d++ = pPal[c];
+        // No palette writing RGB565_SWAPPED right to bitmap buffer
+        uint8_t *s = pDraw->pPixels;
+        ;
+        uint16_t *d = (uint16_t *)row;
+
+        uint16_t *pPal;
+        pPal = (uint16_t *)pDraw->pPalette;
+
+        uint8_t c, ucTransparent = pDraw->ucTransparent;
+        d += pDraw->iX;
+        if (pDraw->ucHasTransparency == 1) {
+            for (int x = 0; x < iWidth; x++)
+            {
+                c = *s++;
+                if (c != ucTransparent) {
+                    *d = pPal[c];
+                }
+                d++;
+            }
+        } else {
+            for (int x = 0; x < iWidth; x++)
+            {
+                c = *s++;
+                *d++ = pPal[c];
+            }
         }
     }
 }
 
-void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file) {
-    // mp_printf(&mp_plat_print, "Begin OnDiskGif\n");
+void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_t *file, bool use_palette) {
     self->file = file;
 
-    GIF_begin(&self->gif, GIF_PALETTE_RGB565_BE);
+    if (use_palette == true) {
+        GIF_begin(&self->gif, GIF_PALETTE_RGB888);
+    } else {
+        GIF_begin(&self->gif, GIF_PALETTE_RGB565_BE);
+    }
 
     self->gif.iError = GIF_SUCCESS;
     self->gif.pfnRead = GIFReadFile;
@@ -143,10 +172,22 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
         mp_arg_error_invalid(MP_QSTR_file);
     }
 
+    int bpp = 16;
+    if (use_palette == true) {
+        mp_printf(&mp_plat_print, "Using palette\n");
+        displayio_palette_t *palette = m_new_obj(displayio_palette_t);
+        palette->base.type = &displayio_palette_type;
+        common_hal_displayio_palette_construct(palette, 256, false);
+        self->displayio_objs.palette = palette;
+        bpp = 8;
+    } else {
+        self->displayio_objs.palette = NULL;
+    }
+
     displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
     bitmap->base.type = &displayio_bitmap_type;
-    common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, 16);
-    self->bitmap = bitmap;
+    common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, bpp);
+    self->displayio_objs.bitmap = bitmap;
 
     GIFINFO info;
     GIF_getInfo(&self->gif, &info);
@@ -158,12 +199,13 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
 
 void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
     self->file = NULL;
-    common_hal_displayio_bitmap_deinit(self->bitmap);
-    self->bitmap = NULL;
+    common_hal_displayio_bitmap_deinit(self->displayio_objs.bitmap);
+    self->displayio_objs.bitmap = NULL;
+    self->displayio_objs.palette = NULL;
 }
 
 bool common_hal_gifio_ondiskgif_deinited(gifio_ondiskgif_t *self) {
-    return self->bitmap == NULL;
+    return self->displayio_objs.bitmap == NULL;
 }
 
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self) {
@@ -175,7 +217,11 @@ uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self) {
 }
 
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self) {
-    return MP_OBJ_FROM_PTR(self->bitmap);
+    return MP_OBJ_FROM_PTR(self->displayio_objs.bitmap);
+}
+
+mp_obj_t common_hal_gifio_ondiskgif_get_palette(gifio_ondiskgif_t *self) {
+    return MP_OBJ_FROM_PTR(self->displayio_objs.palette);
 }
 
 int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self) {
@@ -196,17 +242,18 @@ int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) {
 
 uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) {
     int nextDelay = 0;
-    int result = GIF_playFrame(&self->gif, &nextDelay, self->bitmap);
+    int result = 0;
+    result = GIF_playFrame(&self->gif, &nextDelay, &self->displayio_objs);
 
     if ((result >= 0) && (setDirty)) {
         displayio_area_t dirty_area = {
             .x1 = 0,
             .y1 = 0,
-            .x2 = self->bitmap->width,
-            .y2 = self->bitmap->height,
+            .x2 = self->displayio_objs.bitmap->width,
+            .y2 = self->displayio_objs.bitmap->height,
         };
 
-        displayio_bitmap_set_dirty_area(self->bitmap, &dirty_area);
+        displayio_bitmap_set_dirty_area(self->displayio_objs.bitmap, &dirty_area);
     }
 
     return nextDelay;
diff --git a/shared-module/gifio/OnDiskGif.h b/shared-module/gifio/OnDiskGif.h
index c40781ef1f..70479ac8d9 100644
--- a/shared-module/gifio/OnDiskGif.h
+++ b/shared-module/gifio/OnDiskGif.h
@@ -34,14 +34,20 @@
 
 #include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h"
 #include "shared-module/displayio/Bitmap.h"
+#include "shared-module/displayio/Palette.h"
 
 #include "extmod/vfs_fat.h"
 
+typedef struct {
+    displayio_bitmap_t *bitmap;
+    displayio_palette_t *palette;
+} gifio_ondiskgif_displayio_objs_t;
+
 typedef struct {
     mp_obj_base_t base;
     GIFIMAGE gif;
     pyb_file_obj_t *file;
-    displayio_bitmap_t *bitmap;
+    gifio_ondiskgif_displayio_objs_t displayio_objs;
     int32_t duration;
     int32_t frame_count;
     int32_t min_delay;

From 8980ebfa169059ca993e27f164e92aed51185b1f Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Sun, 16 Apr 2023 12:06:15 -0400
Subject: [PATCH 2255/2403] Simplify CORS checks and don't restrict host names.
 Minor socket cleanup.

---
 .../espressif/common-hal/socketpool/Socket.c  |  1 -
 supervisor/shared/web_workflow/web_workflow.c | 82 ++++++++-----------
 2 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c
index 5af3cdbbc3..ef56480672 100644
--- a/ports/espressif/common-hal/socketpool/Socket.c
+++ b/ports/espressif/common-hal/socketpool/Socket.c
@@ -88,7 +88,6 @@ STATIC void socket_select_task(void *arg) {
         }
 
         assert(num_triggered > 0);
-        assert(!FD_ISSET(socket_change_fd, &excptfds));
 
         // Notice event trigger
         if (FD_ISSET(socket_change_fd, &readfds)) {
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index d24547dd09..faadd52bda 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+// Include strchrnul()
+#define _GNU_SOURCE
+
 #include 
 #include 
 
@@ -85,8 +88,8 @@ typedef struct {
     char destination[256];
     char header_key[64];
     char header_value[256];
-    // We store the origin so we can reply back with it.
-    char origin[64];
+    char origin[64];        // We store the origin so we can reply back with it.
+    char host[64];          // We store the host to check against origin.
     size_t content_length;
     size_t offset;
     uint64_t timestamp_ms;
@@ -454,49 +457,33 @@ static bool _endswith(const char *str, const char *suffix) {
     return strcmp(str + (strlen(str) - strlen(suffix)), suffix) == 0;
 }
 
-const char *ok_hosts[] = {
-    "127.0.0.1",
-    "localhost",
-};
+const char http_scheme[] = "http://";
+#define PREFIX_HTTP_LEN (sizeof(http_scheme) - 1)
 
-static bool _origin_ok(const char *origin) {
-    const char *http = "http://";
-
-    // note: redirected requests send an Origin of "null" and will be caught by this
-    if (strncmp(origin, http, strlen(http)) != 0) {
-        return false;
-    }
-    // These are prefix checks up to : so that any port works.
-    // TODO: Support DHCP hostname in addition to MDNS.
-    const char *end;
-    #if CIRCUITPY_MDNS
-    if (!common_hal_mdns_server_deinited(&mdns)) {
-        const char *local = ".local";
-        const char *hostname = common_hal_mdns_server_get_hostname(&mdns);
-        end = origin + strlen(http) + strlen(hostname) + strlen(local);
-        if (strncmp(origin + strlen(http), hostname, strlen(hostname)) == 0 &&
-            strncmp(origin + strlen(http) + strlen(hostname), local, strlen(local)) == 0 &&
-            (end[0] == '\0' || end[0] == ':')) {
-            return true;
-        }
-    }
-    #endif
-
-    _update_encoded_ip();
-    end = origin + strlen(http) + strlen(_our_ip_encoded);
-    if (strncmp(origin + strlen(http), _our_ip_encoded, strlen(_our_ip_encoded)) == 0 &&
-        (end[0] == '\0' || end[0] == ':')) {
+static bool _origin_ok(_request *request) {
+    // Origin may be 'null'
+    if (request->origin[0] == '\0') {
         return true;
     }
-
-    for (size_t i = 0; i < MP_ARRAY_SIZE(ok_hosts); i++) {
-        // Allows any port
-        end = origin + strlen(http) + strlen(ok_hosts[i]);
-        if (strncmp(origin + strlen(http), ok_hosts[i], strlen(ok_hosts[i])) == 0
-            && (end[0] == '\0' || end[0] == ':')) {
+    // Origin has http prefix?
+    if (strncmp(request->origin, http_scheme, PREFIX_HTTP_LEN) != 0) {
+        // Not HTTP scheme request - ok
+        request->origin[0] = '\0';
+        return true;
+    }
+    // Host given?
+    if (request->host[0] != '\0') {
+        // OK if host and origin match (fqdn + port #)
+        if (strcmp(request->host, &request->origin[PREFIX_HTTP_LEN]) == 0) {
+            return true;
+        }
+        // DEBUG: OK if origin is 'localhost' (ignoring port #)
+        *strchrnul(&request->origin[PREFIX_HTTP_LEN], ':') = '\0';
+        if (strcmp(&request->origin[PREFIX_HTTP_LEN], "localhost") == 0) {
             return true;
         }
     }
+    // Otherwise deny request
     return false;
 }
 
@@ -517,8 +504,8 @@ static void _cors_header(socketpool_socket_obj_t *socket, _request *request) {
     _send_strs(socket,
         "Access-Control-Allow-Credentials: true\r\n",
         "Vary: Origin, Accept, Upgrade\r\n",
-        "Access-Control-Allow-Origin: *\r\n",
-        NULL);
+        "Access-Control-Allow-Origin: ",
+        (request->origin[0] == '\0') ? "*" : request->origin, "\r\n", NULL);
 }
 
 static void _reply_continue(socketpool_socket_obj_t *socket, _request *request) {
@@ -1086,11 +1073,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
         #else
         _reply_missing(socket, request);
         #endif
-
-// For now until CORS is sorted, allow always the origin requester.
-// Note: caller knows who we are better than us. CORS is not security
-//       unless browser cooperates. Do not rely on mDNS or IP.
-    } else if (strlen(request->origin) > 0 && !_origin_ok(request->origin)) {
+    } else if (!_origin_ok(request)) {
         _reply_forbidden(socket, request);
     } else if (strncmp(request->path, "/fs/", 4) == 0) {
         if (strcasecmp(request->method, "OPTIONS") == 0) {
@@ -1314,6 +1297,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
 static void _reset_request(_request *request) {
     request->state = STATE_METHOD;
     request->origin[0] = '\0';
+    request->host[0] = '\0';
     request->content_length = 0;
     request->offset = 0;
     request->timestamp_ms = 0;
@@ -1340,6 +1324,7 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
             if (len == 0 || len == -MP_ENOTCONN) {
                 // Disconnect - clear 'in-progress'
                 _reset_request(request);
+                common_hal_socketpool_socket_close(socket);
             }
             break;
         }
@@ -1421,6 +1406,8 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                         request->redirect = strncmp(request->header_value, cp_local, strlen(cp_local)) == 0 &&
                             (strlen(request->header_value) == strlen(cp_local) ||
                                 request->header_value[strlen(cp_local)] == ':');
+                        strncpy(request->host, request->header_value, sizeof(request->host) - 1);
+                        request->host[sizeof(request->host) - 1] = '\0';
                     } else if (strcasecmp(request->header_key, "Content-Length") == 0) {
                         request->content_length = strtoul(request->header_value, NULL, 10);
                     } else if (strcasecmp(request->header_key, "Expect") == 0) {
@@ -1428,7 +1415,8 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
                     } else if (strcasecmp(request->header_key, "Accept") == 0) {
                         request->json = strcasecmp(request->header_value, "application/json") == 0;
                     } else if (strcasecmp(request->header_key, "Origin") == 0) {
-                        strcpy(request->origin, request->header_value);
+                        strncpy(request->origin, request->header_value, sizeof(request->origin) - 1);
+                        request->origin[sizeof(request->origin) - 1] = '\0';
                     } else if (strcasecmp(request->header_key, "X-Timestamp") == 0) {
                         request->timestamp_ms = strtoull(request->header_value, NULL, 10);
                     } else if (strcasecmp(request->header_key, "Upgrade") == 0) {

From e5a5a348fd9c9e927c1e7e5d82a3957ea5044f81 Mon Sep 17 00:00:00 2001
From: CDarius 
Date: Wed, 19 Apr 2023 08:17:10 +0000
Subject: [PATCH 2256/2403] Fixed wrong GPIO number for touch screen interrupt

---
 ports/espressif/boards/m5stack_core2/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/m5stack_core2/pins.c b/ports/espressif/boards/m5stack_core2/pins.c
index 865ce61eaf..ee8fe21ad9 100644
--- a/ports/espressif/boards/m5stack_core2/pins.c
+++ b/ports/espressif/boards/m5stack_core2/pins.c
@@ -83,7 +83,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SD_CS),MP_ROM_PTR(&pin_GPIO4) },
 
     // touch screen
-    { MP_ROM_QSTR(MP_QSTR_TOUCH_SCR_IRQ),MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_TOUCH_INT),MP_ROM_PTR(&pin_GPIO39) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },

From fd1e9cf8f18d96cb46ee878700040b4b462a8931 Mon Sep 17 00:00:00 2001
From: Milind 
Date: Wed, 19 Apr 2023 21:46:08 +0530
Subject: [PATCH 2257/2403] 1. Changed attenuation from ADC_ATTEN_DB_0 to
 ADC_ATTEN_DB_11 2. Scaling the 12-bit values received from DMA engine to
 16-bit value

---
 ports/espressif/common-hal/analogbufio/BufferedIn.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index f2ee8c19af..3a8d8d0def 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -46,8 +46,9 @@
 #define NUM_SAMPLES_PER_INTERRUPT   256
 #define NUM_ADC_CHANNELS            1
 #define DMA_BUFFER_SIZE             1024
-#define ATTENUATION                 ADC_ATTEN_DB_0
+#define ATTENUATION                 ADC_ATTEN_DB_11
 #define ADC_READ_TIMEOUT_MS         2000
+#define ADC_PIN_MAX_VALUE           0xfff
 
 #if defined(CONFIG_IDF_TARGET_ESP32)
 #define ADC_RESULT_BYTE     2
@@ -239,6 +240,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
     uint32_t captured_bytes = 0;
     esp_err_t ret;
     uint32_t ret_num = 0;
+    uint32_t adc_reading = 0;
     adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2;
     adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
 
@@ -264,11 +266,13 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
                         uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes];
                         if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
                             #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
-                            *pBuffer = pResult->type1.data;
+                            adc_reading = pResult->type1.data;
                             #endif
                         } else {
-                            *pBuffer = pResult->type2.data;
+                            adc_reading = pResult->type2.data;
                         }
+                        adc_reading = adc_reading * ((1 << 16) - 1) / ADC_PIN_MAX_VALUE;
+                        *pBuffer = (uint16_t)adc_reading;
                         captured_bytes += sizeof(uint16_t);
                         captured_samples++;
                     } else {

From 66edcf5d034432519aac18690806adad2cacf2ac Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 7 Apr 2023 11:59:55 -0700
Subject: [PATCH 2258/2403] Add PicoDVI support

PicoDVI in CP support 640x480 and 800x480 on Feather DVI, Pico and
Pico W. 1 and 2 bit grayscale are full resolution. 8 and 16 bit
color are half resolution.

Memory layout is modified to give the top most 4k of ram to the
second core. Its MPU is used to prevent flash access after startup.

The port saved word is moved to a watchdog scratch register so that
it doesn't get overwritten by other things in RAM.

Right align status bar and scroll area. This normally gives a few
pixels of padding on the left hand side and improves the odds it is
readable in a case. Fixes #7562

Fixes c stack checking. The length was correct but the top was being
set to the current stack pointer instead of the correct top.
Fixes #7643

This makes Bitmap subscr raise IndexError instead of ValueError
when the index arguments are wrong.
---
 .gitmodules                                   |   4 +
 locale/circuitpython.pot                      |  24 +-
 main.c                                        |  10 +-
 .../common-hal/videocore/Framebuffer.c        |   1 +
 ports/raspberrypi/Makefile                    |  47 +-
 ports/raspberrypi/audio_dma.c                 |   2 +-
 .../bindings/picodvi/Framebuffer.c            | 265 +++++++++++
 .../bindings/picodvi/Framebuffer.h            |  49 ++
 ports/raspberrypi/bindings/picodvi/__init__.c |  48 ++
 .../adafruit_feather_rp2040_dvi/board.c       |  23 +
 .../mpconfigboard.mk                          |   2 +
 .../boards/adafruit_feather_rp2040_dvi/pins.c |   4 +
 .../boards/raspberry_pi_pico/mpconfigboard.mk |   1 +
 .../boards/raspberry_pi_pico_w/link.ld        | 295 +-----------
 .../raspberry_pi_pico_w/mpconfigboard.mk      |   2 +
 .../common-hal/picodvi/Framebuffer.c          | 419 ++++++++++++++++++
 .../common-hal/picodvi/Framebuffer.h          |  51 +++
 .../common-hal/rp2pio/StateMachine.c          |  18 +-
 .../common-hal/rp2pio/StateMachine.h          |   3 +
 ports/raspberrypi/lib/PicoDVI                 |   1 +
 ports/raspberrypi/link.ld                     |  52 ++-
 ports/raspberrypi/mpconfigport.mk             |   2 +-
 .../sdk_config/pico/config_autogen.h          |   6 +
 ports/raspberrypi/supervisor/port.c           |  29 +-
 py/circuitpy_defns.mk                         |  19 +-
 py/circuitpy_mpconfig.mk                      |   5 +
 shared-bindings/displayio/Bitmap.c            |  24 +-
 shared-module/displayio/ColorConverter.c      |  12 +
 shared-module/displayio/ColorConverter.h      |   1 +
 shared-module/displayio/__init__.c            |  11 +
 shared-module/displayio/__init__.h            |   7 +
 supervisor/shared/display.c                   |  40 +-
 supervisor/shared/memory.c                    |   2 +
 supervisor/shared/usb/usb.c                   |   2 +-
 tools/cortex-m-fault-gdb.py                   |  62 ++-
 35 files changed, 1134 insertions(+), 409 deletions(-)
 create mode 100644 ports/raspberrypi/bindings/picodvi/Framebuffer.c
 create mode 100644 ports/raspberrypi/bindings/picodvi/Framebuffer.h
 create mode 100644 ports/raspberrypi/bindings/picodvi/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 create mode 100644 ports/raspberrypi/common-hal/picodvi/Framebuffer.h
 create mode 160000 ports/raspberrypi/lib/PicoDVI

diff --git a/.gitmodules b/.gitmodules
index a33354bbff..2fcfc07fcc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -331,3 +331,7 @@
 [submodule "ports/silabs/tools/slc_cli_linux"]
 	path = ports/silabs/tools/slc_cli_linux
 	url = https://github.com/SiliconLabs/circuitpython_slc_cli_linux
+[submodule "ports/raspberrypi/lib/PicoDVI"]
+	path = ports/raspberrypi/lib/PicoDVI
+	url = https://github.com/circuitpython/PicoDVI.git
+	branch = circuitpython
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f87fc02975..87c28a21e9 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -98,6 +98,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -123,6 +126,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -161,11 +165,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -465,6 +469,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -473,6 +478,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr ""
@@ -1117,10 +1123,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1223,7 +1225,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
@@ -1708,10 +1712,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/main.c b/main.c
index 6ff6202d6d..9351d90529 100644
--- a/main.c
+++ b/main.c
@@ -153,11 +153,15 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
-    // to recover from limit hit.  (Limit is measured in bytes.)
+    // to recover from limit hit.  (Limit is measured in bytes.) The top of the
+    // stack is set to our current state. Not the actual top.
     mp_stack_ctrl_init();
 
-    if (stack_get_bottom() != NULL) {
-        mp_stack_set_limit(stack_get_length() - 1024);
+    uint32_t *stack_bottom = stack_get_bottom();
+    if (stack_bottom != NULL) {
+        size_t stack_length = stack_get_length();
+        mp_stack_set_top(stack_bottom + (stack_length / sizeof(uint32_t)));
+        mp_stack_set_limit(stack_length - 1024);
     }
 
 
diff --git a/ports/broadcom/common-hal/videocore/Framebuffer.c b/ports/broadcom/common-hal/videocore/Framebuffer.c
index 18b703b8b6..63c55324af 100644
--- a/ports/broadcom/common-hal/videocore/Framebuffer.c
+++ b/ports/broadcom/common-hal/videocore/Framebuffer.c
@@ -42,6 +42,7 @@ void common_hal_videocore_framebuffer_deinit(videocore_framebuffer_obj_t *self)
     if (vcmailbox_release_framebuffer()) {
         self->framebuffer = NULL;
     }
+    self->base.type = &mp_type_NoneType;
 }
 
 bool common_hal_videocore_framebuffer_deinited(videocore_framebuffer_obj_t *self) {
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index fafc817ca2..f23da5a51d 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -33,11 +33,11 @@ INC_CYW43 := \
 	-isystem lib/cyw43-driver/firmware \
 	-isystem lib/cyw43-driver/src \
 	-isystem lib/lwip/src/include \
-        -isystem sdk/src/rp2_common/pico_async_context/include/ \
+	-isystem sdk/src/rp2_common/pico_async_context/include/ \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
 	-isystem sdk/src/rp2_common/pico_cyw43_driver/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
-        -isystem sdk/src/rp2_common/pico_rand/include/ \
+	-isystem sdk/src/rp2_common/pico_rand/include/ \
 
 CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0 -DCYW43_NETUTILS=1
 SRC_SDK_CYW43 := \
@@ -105,6 +105,7 @@ INC += \
         -isystem sdk/src/common/pico_util/include/ \
         -isystem sdk/src/rp2040/hardware_regs/include/ \
         -isystem sdk/src/rp2040/hardware_structs/include/ \
+        -isystem sdk/src/rp2_common/cmsis/ \
         -isystem sdk/src/rp2_common/hardware_adc/include/ \
         -isystem sdk/src/rp2_common/hardware_base/include/ \
         -isystem sdk/src/rp2_common/hardware_claim/include/ \
@@ -113,16 +114,19 @@ INC += \
         -isystem sdk/src/rp2_common/hardware_dma/include/ \
         -isystem sdk/src/rp2_common/hardware_flash/include/ \
         -isystem sdk/src/rp2_common/hardware_gpio/include/ \
+        -isystem sdk/src/rp2_common/hardware_interp/include/ \
         -isystem sdk/src/rp2_common/hardware_irq/include/ \
         -isystem sdk/src/rp2_common/hardware_i2c/include/ \
         -isystem sdk/src/rp2_common/hardware_pio/include/ \
         -isystem sdk/src/rp2_common/hardware_pll/include/ \
+        -isystem sdk/src/rp2_common/hardware_pwm/include/ \
         -isystem sdk/src/rp2_common/hardware_resets/include/ \
         -isystem sdk/src/rp2_common/hardware_rtc/include/ \
         -isystem sdk/src/rp2_common/hardware_spi/include/ \
         -isystem sdk/src/rp2_common/hardware_sync/include/ \
         -isystem sdk/src/rp2_common/hardware_timer/include/ \
         -isystem sdk/src/rp2_common/hardware_uart/include/ \
+        -isystem sdk/src/rp2_common/hardware_vreg/include/ \
         -isystem sdk/src/rp2_common/hardware_watchdog/include/ \
         -isystem sdk/src/rp2_common/hardware_xosc/include/ \
         -isystem sdk/src/rp2_common/pico_multicore/include/ \
@@ -131,7 +135,7 @@ INC += \
         -isystem sdk/src/rp2_common/pico_printf/include/ \
         -isystem sdk/src/rp2_common/pico_float/include/ \
         -isystem sdk/src/rp2_common/pico_platform/include/ \
-        -isystem sdk/src/rp2_common/pico_runtime/printf/include/ \
+        -isystem sdk/src/rp2_common/pico_runtime/include/ \
         -isystem sdk/src/rp2_common/pico_bootrom/include/ \
         -isystem sdk/src/rp2_common/pico_unique_id/include/ \
 	$(INC_CYW43) \
@@ -141,7 +145,7 @@ INC += \
         -I$(BUILD)
 
 # Pico specific configuration
-CFLAGS += -DRASPBERRYPI -DPICO_ON_DEVICE=1 -DPICO_NO_BINARY_INFO=0 -DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=0 -DPICO_DIVIDER_CALL_IDIV0=0 -DPICO_DIVIDER_CALL_LDIV0=0 -DPICO_DIVIDER_HARDWARE=1 -DPICO_DOUBLE_ROM=1 -DPICO_FLOAT_ROM=1 -DPICO_MULTICORE=1 -DPICO_BITS_IN_RAM=0 -DPICO_DIVIDER_IN_RAM=0 -DPICO_DOUBLE_PROPAGATE_NANS=0 -DPICO_DOUBLE_IN_RAM=0 -DPICO_MEM_IN_RAM=0 -DPICO_FLOAT_IN_RAM=0 -DPICO_FLOAT_PROPAGATE_NANS=1 -DPICO_NO_FLASH=0 -DPICO_COPY_TO_RAM=0 -DPICO_DISABLE_SHARED_IRQ_HANDLERS=0 -DPICO_NO_BI_BOOTSEL_VIA_DOUBLE_RESET=0
+CFLAGS += -DRASPBERRYPI -DPICO_ON_DEVICE=1 -DPICO_NO_BINARY_INFO=0 -DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=0 -DPICO_DIVIDER_CALL_IDIV0=0 -DPICO_DIVIDER_CALL_LDIV0=0 -DPICO_DIVIDER_HARDWARE=1 -DPICO_DOUBLE_ROM=1 -DPICO_FLOAT_ROM=1 -DPICO_MULTICORE=1 -DPICO_BITS_IN_RAM=0 -DPICO_DIVIDER_IN_RAM=0 -DPICO_DOUBLE_PROPAGATE_NANS=0 -DPICO_DOUBLE_IN_RAM=0 -DPICO_MEM_IN_RAM=0 -DPICO_FLOAT_IN_RAM=0 -DPICO_FLOAT_PROPAGATE_NANS=1 -DPICO_NO_FLASH=0 -DPICO_COPY_TO_RAM=0 -DPICO_DISABLE_SHARED_IRQ_HANDLERS=0 -DPICO_NO_BI_BOOTSEL_VIA_DOUBLE_RESET=0 -DDVI_1BPP_BIT_REVERSE=0
 OPTIMIZATION_FLAGS ?= -O3
 # TinyUSB defines
 CFLAGS += -DTUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1 -DCFG_TUSB_MCU=OPT_MCU_RP2040 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_CDC_RX_BUFSIZE=256 -DCFG_TUD_MIDI_TX_BUFSIZE=128 -DCFG_TUD_CDC_TX_BUFSIZE=256 -DCFG_TUD_MSC_BUFSIZE=1024
@@ -172,8 +176,8 @@ DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-cast-align
 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
 CFLAGS += \
-  -march=armv6-m \
-  -mthumb \
+	-march=armv6-m \
+	-mthumb \
 	-mabi=aapcs-linux \
 	-mcpu=cortex-m0plus \
 	-msoft-float \
@@ -195,6 +199,7 @@ SRC_SDK := \
 	src/common/pico_time/time.c \
 	src/common/pico_time/timeout_helper.c \
 	src/common/pico_util/pheap.c \
+	src/common/pico_util/queue.c \
 	src/rp2_common/hardware_adc/adc.c \
 	src/rp2_common/hardware_claim/claim.c \
 	src/rp2_common/hardware_clocks/clocks.c \
@@ -202,6 +207,7 @@ SRC_SDK := \
 	src/rp2_common/hardware_flash/flash.c \
 	src/rp2_common/hardware_gpio/gpio.c \
 	src/rp2_common/hardware_i2c/i2c.c \
+	src/rp2_common/hardware_interp/interp.c \
 	src/rp2_common/hardware_irq/irq.c \
 	src/rp2_common/hardware_pio/pio.c \
 	src/rp2_common/hardware_pll/pll.c \
@@ -210,6 +216,7 @@ SRC_SDK := \
 	src/rp2_common/hardware_sync/sync.c \
 	src/rp2_common/hardware_timer/timer.c \
 	src/rp2_common/hardware_uart/uart.c \
+	src/rp2_common/hardware_vreg/vreg.c \
 	src/rp2_common/hardware_watchdog/watchdog.c \
 	src/rp2_common/hardware_xosc/xosc.c \
 	src/rp2_common/pico_bootrom/bootrom.c \
@@ -223,6 +230,7 @@ SRC_SDK := \
 	src/rp2_common/pico_printf/printf.c \
 	src/rp2_common/pico_runtime/runtime.c \
 	src/rp2_common/pico_stdio/stdio.c \
+	src/rp2_common/pico_stdlib/stdlib.c \
 	src/rp2_common/pico_unique_id/unique_id.c \
 	$(SRC_SDK_CYW43) \
 
@@ -240,12 +248,24 @@ SRC_C += \
 	background.c \
 	peripherals/pins.c \
 	lib/crypto-algorithms/sha256.c \
+	lib/PicoDVI/software/libdvi/dvi.c \
+	lib/PicoDVI/software/libdvi/dvi_serialiser.c \
+	lib/PicoDVI/software/libdvi/dvi_timing.c \
+	lib/PicoDVI/software/libdvi/tmds_encode.c \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/dcd_rp2040.c \
 	lib/tinyusb/src/portable/raspberrypi/rp2040/rp2040_usb.c \
 	mphalport.c \
 	$(SRC_CYW43) \
 	$(SRC_LWIP) \
 
+ifeq ($(CIRCUITPY_PICODVI),1)
+SRC_C += \
+  bindings/picodvi/__init__.c \
+  bindings/picodvi/Framebuffer.c \
+  common-hal/picodvi/Framebuffer.c \
+
+endif
+
 ifeq ($(CIRCUITPY_SSL),1)
 CFLAGS += -isystem $(TOP)/mbedtls/include
 SRC_MBEDTLS := $(addprefix lib/mbedtls/library/, \
@@ -359,6 +379,7 @@ SRC_S_UPPER = sdk/src/rp2_common/hardware_divider/divider.S \
               sdk/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S \
               sdk/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S \
               sdk/src/rp2_common/pico_standard_link/crt0.S \
+              lib/PicoDVI/software/libdvi/tmds_encode_asm.S \
 
 OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SDK:.c=.o))
@@ -405,13 +426,19 @@ SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_M
 
 all: $(BUILD)/firmware.uf2
 
-LINK_LD := $(firstword $(wildcard boards/$(BOARD)/link.ld link.ld))
-$(BUILD)/firmware.elf: $(OBJ) $(LINK_LD)
+BOARD_LD := $(wildcard boards/$(BOARD)/link.ld)
+
+ifneq ($(BOARD_LD),)
+	LINKER_SCRIPTS = -Wl,-T,$(BOARD_LD)
+endif
+
+LINKER_SCRIPTS += -Wl,-T,link.ld
+
+$(BUILD)/firmware.elf: $(OBJ) $(BOARD_LD) link.ld
 	$(STEPECHO) "LINK $@"
 	$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
 	$(Q)echo $(PICO_LDFLAGS) > $(BUILD)/firmware.ldflags
-	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,$(LINK_LD) -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs -Wl,-lc
-	$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LINK_LD) $(BUILD)
+	$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags $(LINKER_SCRIPTS) -Wl,--print-memory-usage -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs -Wl,-lc
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c
index 7fef1a52e0..612fbbde4c 100644
--- a/ports/raspberrypi/audio_dma.c
+++ b/ports/raspberrypi/audio_dma.c
@@ -37,7 +37,7 @@
 
 #include "src/rp2_common/hardware_irq/include/hardware/irq.h"
 
-#if CIRCUITPY_AUDIOPWMIO || CIRCUITPY_AUDIOBUSIO
+#if CIRCUITPY_AUDIOCORE
 
 void audio_dma_reset(void) {
     for (size_t channel = 0; channel < NUM_DMA_CHANNELS; channel++) {
diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
new file mode 100644
index 0000000000..51afd0eda7
--- /dev/null
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -0,0 +1,265 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "py/objarray.h"
+
+#include "bindings/picodvi/Framebuffer.h"
+#include "shared-bindings/util.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/framebufferio/__init__.h"
+#include "shared-module/framebufferio/FramebufferDisplay.h"
+
+//| class Framebuffer:
+//|     """A PicoDVI managed frame buffer."""
+//|
+//|     def __init__(
+//|         self,
+//|         width: int,
+//|         height: int,
+//|         *,
+//|         clk_dp: microcontroller.Pin,
+//|         clk_dn: microcontroller.Pin,
+//|         red_dp: microcontroller.Pin,
+//|         red_dn: microcontroller.Pin,
+//|         green_dp: microcontroller.Pin,
+//|         green_dn: microcontroller.Pin,
+//|         blue_dp: microcontroller.Pin,
+//|         blue_dn: microcontroller.Pin,
+//|         color_depth: int = 8,
+//|     ) -> None:
+//|         """Create a Framebuffer object with the given dimensions (640x480 or 800x480). Memory is
+//|            allocated outside of onto the heap and then moved outside on VM
+//|            end.
+//|
+//|         This will change the system clock speed to match the DVI signal.
+//|         Make sure to initialize other objects after this one so they account
+//|         for the changed clock. This also allocates a very large framebuffer
+//|         and is most likely to succeed the earlier it is attempted.
+//|
+//|         Each *_dp and *_dn pair of pins must be neighboring, such as 19 and
+//|         20. They must also be ordered the same way. In other words, dp must
+//|         be less than dn for all pairs or dp must be greater than dn for all
+//|         pairs.
+//|
+//|         The framebuffer pixel format varies depending on color_depth:
+//|         * 1 - Each bit is a pixel. Either white (1) or black (0).
+//|         * 2 - Each 2 bits is a pixels. Grayscale between white (0x3) and black (0x0).
+//|         * 8 - Each byte is a pixels in RGB332 format.
+//|         * 16 - Each two bytes are a pixel in RGB565 format.
+//|
+//|         Monochrome framebuffers (color_depth=1 or 2) will be full resolution.
+//|         Color framebuffers will be half resolution and pixels will be
+//|         duplicated to create a signal with the target dimensions.
+//|
+//|         A Framebuffer is often used in conjunction with a
+//|         `framebufferio.FramebufferDisplay`.
+//|
+//|         :param int width: the width of the target display signal. It will be halved when
+//|           color_depth >= 8 when creating the framebuffer. Only 640 or 800 is currently supported.
+//|         :param int height: the height of the target display signal. It will be halved when
+//|           color_depth >= 8 when creating the framebuffer. Only 480 is currently supported.
+//|         :param ~microcontroller.Pin clk_dp: the positive clock signal pin
+//|         :param ~microcontroller.Pin clk_dn: the negative clock signal pin
+//|         :param ~microcontroller.Pin red_dp: the positive red signal pin
+//|         :param ~microcontroller.Pin red_dn: the negative red signal pin
+//|         :param ~microcontroller.Pin green_dp: the positive green signal pin
+//|         :param ~microcontroller.Pin green_dn: the negative green signal pin
+//|         :param ~microcontroller.Pin blue_dp: the positive blue signal pin
+//|         :param ~microcontroller.Pin blue_dn: the negative blue signal pin
+//|         :param int color_depth: the color depth of the framebuffer in bits. 1, 2 for grayscale
+//|           and 8 or 16 for color
+//|         """
+
+STATIC mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_width, ARG_height, ARG_clk_dp, ARG_clk_dn, ARG_red_dp, ARG_red_dn, ARG_green_dp,
+           ARG_green_dn, ARG_blue_dp, ARG_blue_dn, ARG_color_depth };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_width, MP_ARG_INT | MP_ARG_REQUIRED },
+        { MP_QSTR_height, MP_ARG_INT | MP_ARG_REQUIRED },
+
+        { MP_QSTR_clk_dp, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_clk_dn, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_red_dp, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_red_dn, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_green_dp, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_green_dn, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_blue_dp, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_blue_dn, MP_ARG_KW_ONLY | MP_ARG_OBJ | MP_ARG_REQUIRED },
+
+        { MP_QSTR_color_depth, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    picodvi_framebuffer_obj_t *self = &allocate_display_bus_or_raise()->picodvi;
+    self->base.type = &picodvi_framebuffer_type;
+
+    mp_uint_t width = (mp_uint_t)mp_arg_validate_int_min(args[ARG_width].u_int, 0, MP_QSTR_width);
+    mp_uint_t height = (mp_uint_t)mp_arg_validate_int_min(args[ARG_height].u_int, 0, MP_QSTR_height);
+    mp_uint_t color_depth = args[ARG_color_depth].u_int;
+    if (color_depth != 1 && color_depth != 2 && color_depth != 8 && color_depth != 16) {
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_color_depth);
+    }
+    common_hal_picodvi_framebuffer_construct(self,
+        width, height,
+        validate_obj_is_free_pin(args[ARG_clk_dp].u_obj, MP_QSTR_clk_dp),
+        validate_obj_is_free_pin(args[ARG_clk_dn].u_obj, MP_QSTR_clk_dn),
+        validate_obj_is_free_pin(args[ARG_red_dp].u_obj, MP_QSTR_red_dp),
+        validate_obj_is_free_pin(args[ARG_red_dn].u_obj, MP_QSTR_red_dn),
+        validate_obj_is_free_pin(args[ARG_green_dp].u_obj, MP_QSTR_green_dp),
+        validate_obj_is_free_pin(args[ARG_green_dn].u_obj, MP_QSTR_green_dn),
+        validate_obj_is_free_pin(args[ARG_blue_dp].u_obj, MP_QSTR_blue_dp),
+        validate_obj_is_free_pin(args[ARG_blue_dn].u_obj, MP_QSTR_blue_dn),
+        color_depth);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Free the resources (pins, timers, etc.) associated with this
+//|         rgbmatrix instance.  After deinitialization, no further operations
+//|         may be performed."""
+//|         ...
+STATIC mp_obj_t picodvi_framebuffer_deinit(mp_obj_t self_in) {
+    picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
+    common_hal_picodvi_framebuffer_deinit(self);
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_deinit_obj, picodvi_framebuffer_deinit);
+
+static void check_for_deinit(picodvi_framebuffer_obj_t *self) {
+    if (common_hal_picodvi_framebuffer_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     width: int
+//|     """The width of the framebuffer, in pixels. It may be doubled for output (and half of what
+//|        width was given to __init__.)"""
+STATIC mp_obj_t picodvi_framebuffer_get_width(mp_obj_t self_in) {
+    picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_width(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_width_obj, picodvi_framebuffer_get_width);
+MP_PROPERTY_GETTER(picodvi_framebuffer_width_obj,
+    (mp_obj_t)&picodvi_framebuffer_get_width_obj);
+
+//|     height: int
+//|     """The width of the framebuffer, in pixels. It may be doubled for output (and half of what
+//|        width was given to __init__.)"""
+//|
+STATIC mp_obj_t picodvi_framebuffer_get_height(mp_obj_t self_in) {
+    picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_height(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_height_obj, picodvi_framebuffer_get_height);
+
+MP_PROPERTY_GETTER(picodvi_framebuffer_height_obj,
+    (mp_obj_t)&picodvi_framebuffer_get_height_obj);
+
+STATIC const mp_rom_map_elem_t picodvi_framebuffer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&picodvi_framebuffer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&picodvi_framebuffer_width_obj) },
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&picodvi_framebuffer_height_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(picodvi_framebuffer_locals_dict, picodvi_framebuffer_locals_dict_table);
+
+STATIC void picodvi_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) {
+    common_hal_picodvi_framebuffer_get_buffer(self_in, bufinfo, 0);
+}
+
+// These versions exist so that the prototype matches the protocol,
+// avoiding a type cast that can hide errors
+STATIC void picodvi_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) {
+    (void)dirty_row_bitmap;
+    common_hal_picodvi_framebuffer_refresh(self_in);
+}
+
+STATIC void picodvi_framebuffer_deinit_proto(mp_obj_t self_in) {
+    common_hal_picodvi_framebuffer_deinit(self_in);
+}
+
+STATIC int picodvi_framebuffer_get_width_proto(mp_obj_t self_in) {
+    return common_hal_picodvi_framebuffer_get_width(self_in);
+}
+
+STATIC int picodvi_framebuffer_get_height_proto(mp_obj_t self_in) {
+    return common_hal_picodvi_framebuffer_get_height(self_in);
+}
+
+STATIC int picodvi_framebuffer_get_color_depth_proto(mp_obj_t self_in) {
+    return common_hal_picodvi_framebuffer_get_color_depth(self_in);
+    ;
+}
+
+STATIC int picodvi_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) {
+    return 1;
+}
+
+STATIC int picodvi_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) {
+    return 60;
+}
+
+STATIC bool picodvi_framebuffer_get_pixels_in_byte_share_row_proto(mp_obj_t self_in) {
+    return true;
+}
+
+STATIC int picodvi_framebuffer_get_row_stride_proto(mp_obj_t self_in) {
+    return common_hal_picodvi_framebuffer_get_row_stride(self_in);
+}
+
+STATIC const framebuffer_p_t picodvi_framebuffer_proto = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer)
+    .get_bufinfo = picodvi_framebuffer_get_bufinfo,
+    .get_width = picodvi_framebuffer_get_width_proto,
+    .get_height = picodvi_framebuffer_get_height_proto,
+    .get_color_depth = picodvi_framebuffer_get_color_depth_proto,
+    .get_row_stride = picodvi_framebuffer_get_row_stride_proto,
+    .get_bytes_per_cell = picodvi_framebuffer_get_bytes_per_cell_proto,
+    .get_native_frames_per_second = picodvi_framebuffer_get_native_frames_per_second_proto,
+    .get_pixels_in_byte_share_row = picodvi_framebuffer_get_pixels_in_byte_share_row_proto,
+    .swapbuffers = picodvi_framebuffer_swapbuffers,
+    .deinit = picodvi_framebuffer_deinit_proto,
+};
+
+const mp_obj_type_t picodvi_framebuffer_type = {
+    { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
+    .name = MP_QSTR_Framebuffer,
+    .locals_dict = (mp_obj_dict_t *)&picodvi_framebuffer_locals_dict,
+    .make_new = picodvi_framebuffer_make_new,
+    MP_TYPE_EXTENDED_FIELDS(
+        .buffer_p = { .get_buffer = common_hal_picodvi_framebuffer_get_buffer, },
+        .protocol = &picodvi_framebuffer_proto,
+        ),
+};
diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.h b/ports/raspberrypi/bindings/picodvi/Framebuffer.h
new file mode 100644
index 0000000000..cfcab4af50
--- /dev/null
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "common-hal/picodvi/Framebuffer.h"
+
+#include "shared-bindings/microcontroller/Pin.h"
+
+extern const mp_obj_type_t picodvi_framebuffer_type;
+
+void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
+    mp_uint_t width, mp_uint_t height,
+    const mcu_pin_obj_t *clk_dp, const mcu_pin_obj_t *clk_dn,
+    const mcu_pin_obj_t *red_dp, const mcu_pin_obj_t *red_dn,
+    const mcu_pin_obj_t *green_dp, const mcu_pin_obj_t *green_dn,
+    const mcu_pin_obj_t *blue_dp, const mcu_pin_obj_t *blue_dn,
+    mp_uint_t color_depth);
+void common_hal_picodvi_framebuffer_deinit(picodvi_framebuffer_obj_t *self);
+bool common_hal_picodvi_framebuffer_deinited(picodvi_framebuffer_obj_t *self);
+void common_hal_picodvi_framebuffer_refresh(picodvi_framebuffer_obj_t *self);
+int common_hal_picodvi_framebuffer_get_width(picodvi_framebuffer_obj_t *self);
+int common_hal_picodvi_framebuffer_get_height(picodvi_framebuffer_obj_t *self);
+int common_hal_picodvi_framebuffer_get_row_stride(picodvi_framebuffer_obj_t *self);
+int common_hal_picodvi_framebuffer_get_color_depth(picodvi_framebuffer_obj_t *self);
+mp_int_t common_hal_picodvi_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
diff --git a/ports/raspberrypi/bindings/picodvi/__init__.c b/ports/raspberrypi/bindings/picodvi/__init__.c
new file mode 100644
index 0000000000..edfe7759c8
--- /dev/null
+++ b/ports/raspberrypi/bindings/picodvi/__init__.c
@@ -0,0 +1,48 @@
+/*
+ * 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 
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "bindings/picodvi/Framebuffer.h"
+
+//| """Low-level routines for interacting with PicoDVI Output"""
+
+STATIC const mp_rom_map_elem_t picodvi_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_picodvi) },
+    { MP_ROM_QSTR(MP_QSTR_Framebuffer), MP_ROM_PTR(&picodvi_framebuffer_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(picodvi_module_globals, picodvi_module_globals_table);
+
+const mp_obj_module_t picodvi_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&picodvi_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_picodvi, picodvi_module, CIRCUITPY_PICODVI);
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
index 331653173e..bcbab5e4cd 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
@@ -26,4 +26,27 @@
 
 #include "supervisor/board.h"
 
+#include "bindings/picodvi/Framebuffer.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-bindings/framebufferio/FramebufferDisplay.h"
+
+void board_init(void) {
+    picodvi_framebuffer_obj_t *fb = &allocate_display_bus()->picodvi;
+    fb->base.type = &picodvi_framebuffer_type;
+    common_hal_picodvi_framebuffer_construct(fb, 640, 480,
+        &pin_GPIO17, &pin_GPIO16,
+        &pin_GPIO19, &pin_GPIO18,
+        &pin_GPIO21, &pin_GPIO20,
+        &pin_GPIO23, &pin_GPIO22,
+        8);
+
+    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    display->base.type = &framebufferio_framebufferdisplay_type;
+    common_hal_framebufferio_framebufferdisplay_construct(
+        display,
+        MP_OBJ_FROM_PTR(fb),
+        0,
+        true);
+}
+
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
index a60ff7b9a7..ca8a6fa396 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/mpconfigboard.mk
@@ -7,3 +7,5 @@ CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
+
+CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
index c8b4e3474f..3dd0fe86bb 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c
@@ -1,5 +1,7 @@
 #include "shared-bindings/board/__init__.h"
 
+#include "shared-module/displayio/__init__.h"
+
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -49,6 +51,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D2N), MP_ROM_PTR(&pin_GPIO22) },
     { MP_ROM_QSTR(MP_QSTR_D2P), MP_ROM_PTR(&pin_GPIO23) },
 
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].framebuffer_display)},
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk
index 608ca280df..20607d50e4 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
index 2777b41720..e814bead4c 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/link.ld
@@ -1,294 +1 @@
-/* Based on GCC ARM embedded samples.
-   Defines the following symbols for use by code:
-    __exidx_start
-    __exidx_end
-    __etext
-    __data_start__
-    __preinit_array_start
-    __preinit_array_end
-    __init_array_start
-    __init_array_end
-    __fini_array_start
-    __fini_array_end
-    __data_end__
-    __bss_start__
-    __bss_end__
-    __end__
-    end
-    __HeapLimit
-    __StackLimit
-    __StackTop
-    __stack (== StackTop)
-*/
-
-MEMORY
-{
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
-    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
-    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
-    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
-    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
-}
-
-ENTRY(_entry_point)
-
-SECTIONS
-{
-    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
-       and checksummed. It is usually built by the boot_stage2 target
-       in the Pico SDK
-    */
-
-    .flash_begin : {
-        __flash_binary_start = .;
-    } > FLASH_FIRMWARE
-
-    .boot2 : {
-        __boot2_start__ = .;
-        KEEP (*(.boot2))
-        __boot2_end__ = .;
-    } > FLASH_FIRMWARE
-
-    ASSERT(__boot2_end__ - __boot2_start__ == 256,
-        "ERROR: Pico second stage bootloader must be 256 bytes in size")
-
-    /* The second stage will always enter the image at the start of .text.
-       The debugger will use the ELF entry point, which is the _entry_point
-       symbol if present, otherwise defaults to start of .text.
-       This can be used to transfer control back to the bootrom on debugger
-       launches only, to perform proper flash setup.
-    */
-
-    .text : {
-        __logical_binary_start = .;
-        KEEP (*(.vectors))
-        KEEP (*(.binary_info_header))
-        __binary_info_header_end = .;
-        KEEP (*(.reset))
-        /* TODO revisit this now memset/memcpy/float in ROM */
-        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
-         * FLASH ... we will include any thing excluded here in .data below by default */
-        *(.init)
-
-        __property_getter_start = .;
-        *(.property_getter)
-        __property_getter_end = .;
-        __property_getset_start = .;
-        *(.property_getset)
-        __property_getset_end = .;
-
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
-        *(.fini)
-        /* Pull all c'tors into .text */
-        *crtbegin.o(.ctors)
-        *crtbegin?.o(.ctors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
-        *(SORT(.ctors.*))
-        *(.ctors)
-        /* Followed by destructors */
-        *crtbegin.o(.dtors)
-        *crtbegin?.o(.dtors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
-        *(SORT(.dtors.*))
-        *(.dtors)
-
-        *(.eh_frame*)
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .rodata : {
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
-        . = ALIGN(4);
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .ARM.extab :
-    {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > FLASH_FIRMWARE
-
-    __exidx_start = .;
-    .ARM.exidx :
-    {
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > FLASH_FIRMWARE
-    __exidx_end = .;
-
-    /* Machine inspectable binary information */
-    . = ALIGN(4);
-    __binary_info_start = .;
-    .binary_info :
-    {
-        KEEP(*(.binary_info.keep.*))
-        *(.binary_info.*)
-    } > FLASH_FIRMWARE
-    __binary_info_end = .;
-    . = ALIGN(4);
-
-    /* End of .text-like segments */
-    __etext = .;
-
-   .ram_vector_table (COPY): {
-        *(.ram_vector_table)
-    } > RAM
-
-    .data : {
-        __data_start__ = .;
-        *(vtable)
-
-        *(.time_critical*)
-
-        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
-        *(.text*)
-        . = ALIGN(4);
-        *(.rodata*)
-        . = ALIGN(4);
-
-        *(.data*)
-
-        . = ALIGN(4);
-        *(.after_data.*)
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__mutex_array_start = .);
-        KEEP(*(SORT(.mutex_array.*)))
-        KEEP(*(.mutex_array))
-        PROVIDE_HIDDEN (__mutex_array_end = .);
-
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__preinit_array_start = .);
-        KEEP(*(SORT(.preinit_array.*)))
-        KEEP(*(.preinit_array))
-        PROVIDE_HIDDEN (__preinit_array_end = .);
-
-        . = ALIGN(4);
-        /* init data */
-        PROVIDE_HIDDEN (__init_array_start = .);
-        KEEP(*(SORT(.init_array.*)))
-        KEEP(*(.init_array))
-        PROVIDE_HIDDEN (__init_array_end = .);
-
-        . = ALIGN(4);
-        /* finit data */
-        PROVIDE_HIDDEN (__fini_array_start = .);
-        *(SORT(.fini_array.*))
-        *(.fini_array)
-        PROVIDE_HIDDEN (__fini_array_end = .);
-
-        *(.jcr)
-        . = ALIGN(4);
-        /* All data end */
-        __data_end__ = .;
-    } > RAM AT> FLASH_FIRMWARE
-
-    .itcm :
-    {
-        . = ALIGN(4);
-        *(.itcm.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_itcm_destination = ADDR(.itcm);
-    _ld_itcm_flash_copy = LOADADDR(.itcm);
-    _ld_itcm_size = SIZEOF(.itcm);
-
-    .dtcm_data :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_data.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_dtcm_data_destination = ADDR(.dtcm_data);
-    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
-    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
-
-    .dtcm_bss :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_bss.*)
-
-        . = ALIGN(4);
-    } > RAM AT> RAM
-    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
-    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
-
-    .uninitialized_data (COPY): {
-        . = ALIGN(4);
-        *(.uninitialized_data*)
-    } > RAM
-
-    /* Start and end symbols must be word-aligned */
-    .scratch_x : {
-        __scratch_x_start__ = .;
-        *(.scratch_x.*)
-        . = ALIGN(4);
-        __scratch_x_end__ = .;
-    } > SCRATCH_X AT > FLASH_FIRMWARE
-    __scratch_x_source__ = LOADADDR(.scratch_x);
-
-    .scratch_y : {
-        __scratch_y_start__ = .;
-        *(.scratch_y.*)
-        . = ALIGN(4);
-        __scratch_y_end__ = .;
-    } > SCRATCH_Y AT > FLASH_FIRMWARE
-    __scratch_y_source__ = LOADADDR(.scratch_y);
-
-    .bss  : {
-        . = ALIGN(4);
-        __bss_start__ = .;
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
-        *(COMMON)
-        . = ALIGN(4);
-        __bss_end__ = .;
-    } > RAM
-
-    .heap (COPY):
-    {
-        __end__ = .;
-        end = __end__;
-        *(.heap*)
-        __HeapLimit = .;
-    } > RAM
-
-    /* .stack*_dummy section doesn't contains any symbols. It is only
-     * used for linker to calculate size of stack sections, and assign
-     * values to stack symbols later
-     *
-     * stack1 section may be empty/missing if platform_launch_core1 is not used */
-
-    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
-     * stack is not used then all of SCRATCH_X is free.
-     */
-    .stack1_dummy (COPY):
-    {
-        *(.stack1*)
-    } > SCRATCH_X
-    .stack_dummy (COPY):
-    {
-        *(.stack*)
-    } > SCRATCH_Y
-
-    .flash_end : {
-        __flash_binary_end = .;
-    } > FLASH_FIRMWARE
-
-    /* stack limit is poorly named, but historically is maximum heap ptr */
-    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
-    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
-    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
-    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
-    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
-    PROVIDE(__stack = __StackTop);
-
-    /* Check if data + heap + stack exceeds RAM limit */
-    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
-
-    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
-    /* todo assert on extra code */
-}
+firmware_size = 1532k;
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
index a050391505..f36f98b7c5 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -19,6 +19,8 @@ CIRCUITPY_MDNS = 1
 CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
+CIRCUITPY_PICODVI = 1
+
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
new file mode 100644
index 0000000000..20f447a824
--- /dev/null
+++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
@@ -0,0 +1,419 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "bindings/picodvi/Framebuffer.h"
+
+#include "py/gc.h"
+#include "py/runtime.h"
+#include "shared-bindings/time/__init__.h"
+#include "common-hal/pwmio/PWMOut.h"
+#include "common-hal/rp2pio/StateMachine.h"
+
+#include "src/common/pico_stdlib/include/pico/stdlib.h"
+#include "src/rp2040/hardware_structs/include/hardware/structs/mpu.h"
+#include "src/rp2_common/cmsis/stub/CMSIS/Device/RaspberryPi/RP2040/Include/RP2040.h"
+#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
+#include "src/rp2_common/hardware_vreg/include/hardware/vreg.h"
+#include "src/rp2_common/pico_multicore/include/pico/multicore.h"
+
+#include "lib/PicoDVI/software/libdvi/tmds_encode.h"
+
+picodvi_framebuffer_obj_t *active_picodvi = NULL;
+
+STATIC PIO pio_instances[2] = {pio0, pio1};
+
+static void __not_in_flash_func(core1_main)(void) {
+    // The MPU is reset before this starts.
+
+    picodvi_framebuffer_obj_t *self = active_picodvi;
+    dvi_register_irqs_this_core(&self->dvi, DMA_IRQ_1);
+
+    while (queue_is_empty(&self->dvi.q_colour_valid)) {
+        __wfe();
+    }
+    dvi_start(&self->dvi);
+
+    // Turn off flash access. After this, it will hard fault. Better than messing
+    // up CIRCUITPY.
+    MPU->CTRL = MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_ENABLE_Msk;
+    MPU->RNR = 6; // 7 is used by pico-sdk stack protection.
+    MPU->RBAR = XIP_MAIN_BASE | MPU_RBAR_VALID_Msk;
+    MPU->RASR = MPU_RASR_XN_Msk | // Set execute never and everything else is restricted.
+        MPU_RASR_ENABLE_Msk |
+        (0x1b << MPU_RASR_SIZE_Pos);         // Size is 0x10000000 which masks up to SRAM region.
+    MPU->RNR = 7;
+
+    uint y = 0;
+    while (1) {
+        uint32_t *scanbuf;
+        queue_remove_blocking_u32(&self->dvi.q_colour_valid, &scanbuf);
+
+        uint32_t *tmdsbuf;
+        queue_remove_blocking_u32(&self->dvi.q_tmds_free, &tmdsbuf);
+        // Check to see if the tmds memory has moved and replace this tmdsbuf
+        // the corresponding on at a new location.
+        size_t old_fb = tmdsbuf[self->tmdsbuf_size - 1];
+        if (old_fb != (uint32_t)self->framebuffer) {
+            size_t index = ((uint32_t)(tmdsbuf - old_fb)) / self->tmdsbuf_size;
+            // Check our index and hang if it is out of range. Hang is ok since this is core 1.
+            // Better than writing the wrong memory that is shared with CP.
+            while (index >= DVI_N_TMDS_BUFFERS) {
+            }
+            tmdsbuf = self->framebuffer + self->framebuffer_len + (self->tmdsbuf_size * index);
+            tmdsbuf[self->tmdsbuf_size - 1] = (uint32_t)self->framebuffer;
+        }
+        uint pixwidth = self->dvi.timing->h_active_pixels;
+        uint words_per_channel = pixwidth / DVI_SYMBOLS_PER_WORD;
+        if (self->color_depth == 8) {
+            tmds_encode_data_channel_8bpp(scanbuf, tmdsbuf + 0 * words_per_channel, pixwidth / 2, DVI_8BPP_BLUE_MSB,  DVI_8BPP_BLUE_LSB);
+            tmds_encode_data_channel_8bpp(scanbuf, tmdsbuf + 1 * words_per_channel, pixwidth / 2, DVI_8BPP_GREEN_MSB, DVI_8BPP_GREEN_LSB);
+            tmds_encode_data_channel_8bpp(scanbuf, tmdsbuf + 2 * words_per_channel, pixwidth / 2, DVI_8BPP_RED_MSB,   DVI_8BPP_RED_LSB);
+        } else if (self->color_depth == 16) {
+            tmds_encode_data_channel_16bpp(scanbuf, tmdsbuf + 0 * words_per_channel, pixwidth / 2, DVI_16BPP_BLUE_MSB,  DVI_16BPP_BLUE_LSB);
+            tmds_encode_data_channel_16bpp(scanbuf, tmdsbuf + 1 * words_per_channel, pixwidth / 2, DVI_16BPP_GREEN_MSB, DVI_16BPP_GREEN_LSB);
+            tmds_encode_data_channel_16bpp(scanbuf, tmdsbuf + 2 * words_per_channel, pixwidth / 2, DVI_16BPP_RED_MSB,   DVI_16BPP_RED_LSB);
+        } else if (self->color_depth == 1) {
+            tmds_encode_1bpp(scanbuf, tmdsbuf, pixwidth);
+        } else if (self->color_depth == 2) {
+            tmds_encode_2bpp(scanbuf, tmdsbuf, pixwidth);
+        }
+        queue_add_blocking_u32(&self->dvi.q_tmds_valid, &tmdsbuf);
+
+        queue_add_blocking_u32(&self->dvi.q_colour_free, &scanbuf);
+        ++y;
+        if (y == self->dvi.timing->v_active_lines) {
+            y = 0;
+        }
+    }
+    __builtin_unreachable();
+}
+
+static void __not_in_flash_func(core1_scanline_callback)(void) {
+    picodvi_framebuffer_obj_t *self = active_picodvi;
+    uint32_t *next_scanline_buf;
+    next_scanline_buf = self->framebuffer + (self->pitch * self->next_scanline);
+    queue_add_blocking_u32(&self->dvi.q_colour_valid, &next_scanline_buf);
+
+    // Remove any buffers that were sent back to us.
+    while (queue_try_remove_u32(&self->dvi.q_colour_free, &next_scanline_buf)) {
+    }
+    self->next_scanline += 1;
+    if (self->next_scanline >= self->height) {
+        self->next_scanline = 0;
+        // Update the framebuffer pointer in case it moved.
+        self->framebuffer = self->allocation->ptr;
+    }
+}
+
+extern uint8_t dvi_vertical_repeat;
+extern bool dvi_monochrome_tmds;
+
+void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
+    mp_uint_t width, mp_uint_t height,
+    const mcu_pin_obj_t *clk_dp, const mcu_pin_obj_t *clk_dn,
+    const mcu_pin_obj_t *red_dp, const mcu_pin_obj_t *red_dn,
+    const mcu_pin_obj_t *green_dp, const mcu_pin_obj_t *green_dn,
+    const mcu_pin_obj_t *blue_dp, const mcu_pin_obj_t *blue_dn,
+    mp_uint_t color_depth) {
+
+    const struct dvi_timing *timing = NULL;
+    if (width == 640 && height == 480) {
+        timing = &dvi_timing_640x480p_60hz;
+    } else if (width == 800 && height == 480) {
+        timing = &dvi_timing_800x480p_60hz;
+    } else {
+        if (height == 480) {
+            mp_raise_ValueError_varg(translate("%q must be %d"), MP_QSTR_width, 480);
+        }
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_height);
+    }
+
+    if (active_picodvi != NULL) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, translate("%q in use"), MP_QSTR_picodvi);
+    }
+
+    bool invert_diffpairs = clk_dn->number < clk_dp->number;
+    int8_t other_pins[4];
+    int8_t *a;
+    int8_t *b;
+    if (invert_diffpairs) {
+        a = other_pins;
+        b = self->pin_pair;
+    } else {
+        a = self->pin_pair;
+        b = other_pins;
+    }
+    a[0] = clk_dp->number;
+    a[1] = red_dp->number;
+    a[2] = green_dp->number;
+    a[3] = blue_dp->number;
+    b[0] = clk_dn->number;
+    b[1] = red_dn->number;
+    b[2] = green_dn->number;
+    b[3] = blue_dn->number;
+    qstr pin_names[4] = {MP_QSTR_clk_dp, MP_QSTR_red_dp, MP_QSTR_green_dp, MP_QSTR_blue_dp};
+    for (size_t i = 0; i < 4; i++) {
+        if (other_pins[i] - self->pin_pair[i] != 1) {
+            raise_ValueError_invalid_pin_name(pin_names[i]);
+        }
+    }
+
+    uint8_t slice = pwm_gpio_to_slice_num(self->pin_pair[0]);
+
+
+    pio_program_t program_struct = {
+        .instructions = NULL,
+        .length = 2,
+        .origin = -1
+    };
+    size_t pio_index = NUM_PIOS;
+    int free_state_machines[4]; // We may find all four free. We only use the first three.
+    for (size_t i = 0; i < NUM_PIOS; i++) {
+        PIO pio = pio_instances[i];
+        uint8_t free_count = 0;
+        for (size_t sm = 0; sm < NUM_PIO_STATE_MACHINES; sm++) {
+            if (!pio_sm_is_claimed(pio, sm)) {
+                free_state_machines[free_count] = sm;
+                free_count++;
+            }
+        }
+        if (free_count >= 3 && pio_can_add_program(pio, &program_struct)) {
+            pio_index = i;
+            break;
+        }
+    }
+
+    if (pio_index == NUM_PIOS) {
+        mp_raise_RuntimeError(translate("All state machines in use"));
+    }
+
+    self->width = width;
+    self->height = height;
+
+    size_t tmds_bufs_per_scanline;
+    if (color_depth >= 8) {
+        dvi_vertical_repeat = 2;
+        dvi_monochrome_tmds = false;
+        self->width /= 2;
+        self->height /= 2;
+        tmds_bufs_per_scanline = 3;
+    } else {
+        dvi_vertical_repeat = 1;
+        dvi_monochrome_tmds = true;
+        // One tmds buffer is used for all three color outputs.
+        tmds_bufs_per_scanline = 1;
+    }
+    self->pitch = (self->width * color_depth) / 8;
+    // Align each row to words.
+    if (self->pitch % sizeof(uint32_t) != 0) {
+        self->pitch += sizeof(uint32_t) - (self->pitch % sizeof(uint32_t));
+    }
+    self->pitch /= sizeof(uint32_t);
+    size_t framebuffer_size = self->pitch * self->height;
+    // use width here because it hasn't been downsized for the frame buffer
+    self->tmdsbuf_size = tmds_bufs_per_scanline * width / DVI_SYMBOLS_PER_WORD + 1;
+    size_t total_allocation_size = sizeof(uint32_t) * (framebuffer_size + DVI_N_TMDS_BUFFERS * self->tmdsbuf_size);
+    self->allocation = allocate_memory(total_allocation_size, false, true);
+    if (self->allocation == NULL) {
+        m_malloc_fail(total_allocation_size);
+        return;
+    }
+
+    // Do the pwmio check last because it claims the pwm slice.
+    if (!pwmio_claim_slice_ab_channels(slice)) {
+        mp_raise_ValueError(translate("All timers for this pin are in use"));
+    }
+    self->pwm_slice = slice;
+
+    pwmout_never_reset(self->pwm_slice, 0);
+    pwmout_never_reset(self->pwm_slice, 1);
+
+    for (size_t i = 0; i < 4; i++) {
+        never_reset_pin_number(self->pin_pair[i]);
+        never_reset_pin_number(self->pin_pair[i] + 1);
+    }
+
+    for (size_t i = 0; i < 3; i++) {
+        rp2pio_statemachine_never_reset(pio_instances[pio_index], free_state_machines[i]);
+    }
+
+    // For the output.
+    user_irq_claim(DMA_IRQ_1);
+    self->framebuffer_len = framebuffer_size;
+    self->framebuffer = self->allocation->ptr;
+    self->color_depth = color_depth;
+
+    self->dvi.timing = timing;
+    self->dvi.ser_cfg.pio = pio_instances[pio_index];
+    self->dvi.ser_cfg.sm_tmds[0] = free_state_machines[0];
+    self->dvi.ser_cfg.sm_tmds[1] = free_state_machines[1];
+    self->dvi.ser_cfg.sm_tmds[2] = free_state_machines[2];
+    self->dvi.ser_cfg.pins_clk = self->pin_pair[0];
+    self->dvi.ser_cfg.pins_tmds[0] = self->pin_pair[1];
+    self->dvi.ser_cfg.pins_tmds[1] = self->pin_pair[2];
+    self->dvi.ser_cfg.pins_tmds[2] = self->pin_pair[3];
+    self->dvi.ser_cfg.invert_diffpairs = invert_diffpairs;
+    self->dvi.scanline_callback = core1_scanline_callback;
+
+    vreg_set_voltage(VREG_VOLTAGE_1_20);
+    common_hal_time_delay_ms(10);
+    set_sys_clock_khz(timing->bit_clk_khz, true); // Run at TMDS bit clock
+    self->tmds_lock = next_striped_spin_lock_num();
+    self->colour_lock = next_striped_spin_lock_num();
+    dvi_init(&self->dvi, self->tmds_lock, self->colour_lock);
+
+    // Load up the TMDS buffers.
+    for (int i = 0; i < DVI_N_TMDS_BUFFERS; ++i) {
+        uint32_t *tmdsbuf = self->framebuffer + (self->framebuffer_len + self->tmdsbuf_size * i);
+        // Use the last word in the buffer to track its original root. That way
+        // we can detect when framebuffer is moved.
+        tmdsbuf[self->tmdsbuf_size - 1] = (uint32_t)self->framebuffer;
+        queue_add_blocking_u32(&self->dvi.q_tmds_free, &tmdsbuf);
+    }
+
+    active_picodvi = self;
+
+    // Core 1 will wait until it sees the first colour buffer, then start up the
+    // DVI signalling.
+    multicore_launch_core1(core1_main);
+
+    self->next_scanline = 0;
+    uint32_t *next_scanline_buf = self->framebuffer + (self->pitch * self->next_scanline);
+    queue_add_blocking_u32(&self->dvi.q_colour_valid, &next_scanline_buf);
+    self->next_scanline += 1;
+    next_scanline_buf = self->framebuffer + (self->pitch * self->next_scanline);
+    queue_add_blocking_u32(&self->dvi.q_colour_valid, &next_scanline_buf);
+    self->next_scanline += 1;
+
+    // Wait for the second core to run dvi_start because it is in flash. Once it is done,
+    // it'll pull from this queue. Not waiting may lead to us reading flash when this core
+    // doesn't want us to.
+    while (queue_get_level(&self->dvi.q_colour_valid) == 2) {
+    }
+}
+
+STATIC void _turn_off_dma(uint8_t channel) {
+    dma_channel_config c = dma_channel_get_default_config(channel);
+    channel_config_set_enable(&c, false);
+    dma_channel_set_config(channel, &c, false /* trigger */);
+
+    if (dma_channel_is_busy(channel)) {
+        dma_channel_abort(channel);
+    }
+    dma_channel_set_irq1_enabled(channel, false);
+    dma_channel_unclaim(channel);
+}
+
+void common_hal_picodvi_framebuffer_deinit(picodvi_framebuffer_obj_t *self) {
+    if (common_hal_picodvi_framebuffer_deinited(self)) {
+        return;
+    }
+    // Stop the other core and free resources.
+
+    // Grab the locks before shutting down the other core so we don't leave the
+    // locks locked.
+    spin_lock_t *tmds_lock = spin_lock_instance(self->tmds_lock);
+    spin_lock_t *colour_lock = spin_lock_instance(self->colour_lock);
+    uint32_t tmds_save = spin_lock_blocking(tmds_lock);
+    uint32_t colour_save = spin_lock_blocking(colour_lock);
+    multicore_reset_core1();
+    spin_unlock(colour_lock, colour_save);
+    spin_unlock(tmds_lock, tmds_save);
+
+    for (size_t i = 0; i < 4; i++) {
+        reset_pin_number(self->pin_pair[i]);
+        reset_pin_number(self->pin_pair[i] + 1);
+    }
+
+    for (int i = 0; i < N_TMDS_LANES; ++i) {
+        // Turn off data first because it chains to the ctrl DMA.
+        _turn_off_dma(self->dvi.dma_cfg[i].chan_data);
+        _turn_off_dma(self->dvi.dma_cfg[i].chan_ctrl);
+    }
+
+    pwm_set_enabled(self->pwm_slice, false);
+    pwmout_free(self->pwm_slice, 0);
+    pwmout_free(self->pwm_slice, 1);
+
+    pio_program_t program_struct = {
+        .length = 2
+    };
+    PIO pio = self->dvi.ser_cfg.pio;
+    for (size_t i = 0; i < 3; i++) {
+        int sm = self->dvi.ser_cfg.sm_tmds[i];
+        pio_sm_set_enabled(pio, sm, false);
+        pio_sm_unclaim(pio, sm);
+        rp2pio_statemachine_reset_ok(pio, sm);
+    }
+    pio_remove_program(pio, &program_struct, self->dvi.ser_cfg.prog_offs);
+
+    if (user_irq_is_claimed(DMA_IRQ_1)) {
+        user_irq_unclaim(DMA_IRQ_1);
+    }
+
+    active_picodvi = NULL;
+
+    free_memory(self->allocation);
+    self->framebuffer = NULL;
+
+    self->base.type = &mp_type_NoneType;
+}
+
+bool common_hal_picodvi_framebuffer_deinited(picodvi_framebuffer_obj_t *self) {
+    return self->framebuffer == NULL;
+}
+
+void common_hal_picodvi_framebuffer_refresh(picodvi_framebuffer_obj_t *self) {
+}
+
+int common_hal_picodvi_framebuffer_get_width(picodvi_framebuffer_obj_t *self) {
+    return self->width;
+}
+
+int common_hal_picodvi_framebuffer_get_height(picodvi_framebuffer_obj_t *self) {
+    return self->height;
+}
+
+int common_hal_picodvi_framebuffer_get_color_depth(picodvi_framebuffer_obj_t *self) {
+    return self->color_depth;
+}
+
+mp_int_t common_hal_picodvi_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
+    bufinfo->buf = self->framebuffer;
+    char typecode = 'B';
+    if (self->color_depth == 16) {
+        typecode = 'H';
+    }
+    bufinfo->typecode = typecode;
+    bufinfo->len = self->framebuffer_len * sizeof(uint32_t);
+    return 0;
+}
+
+int common_hal_picodvi_framebuffer_get_row_stride(picodvi_framebuffer_obj_t *self) {
+    // Pitch is in words but row stride is expected as bytes.
+    return self->pitch * sizeof(uint32_t);
+}
diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.h b/ports/raspberrypi/common-hal/picodvi/Framebuffer.h
new file mode 100644
index 0000000000..f5d7df8f9a
--- /dev/null
+++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.h
@@ -0,0 +1,51 @@
+#pragma once
+
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+
+#include "supervisor/memory.h"
+
+#include "lib/PicoDVI/software/libdvi/dvi.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    supervisor_allocation *allocation;
+    uint32_t *framebuffer;
+    size_t framebuffer_len; // in words
+    size_t tmdsbuf_size; // in words
+    struct dvi_inst dvi;
+    mp_uint_t width;
+    mp_uint_t height;
+    uint tmds_lock;
+    uint colour_lock;
+    uint16_t next_scanline;
+    uint16_t pitch; // Number of words between rows. (May be more than a width's worth.)
+    uint8_t color_depth;
+    uint8_t pwm_slice;
+    int8_t pin_pair[4];
+} picodvi_framebuffer_obj_t;
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index e9cb3d34bb..9034b64242 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -218,9 +218,7 @@ bool rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
                 _current_program_len[i][j] == program_len) {
                 program_offset = _current_program_offset[i][j];
             }
-            int temp_claim = pio_claim_unused_sm(pio, false);
-            if (temp_claim >= 0) {
-                pio_sm_unclaim(pio, temp_claim);
+            if (!pio_sm_is_claimed(pio, j)) {
                 free_count++;
             }
         }
@@ -634,6 +632,16 @@ void common_hal_rp2pio_statemachine_set_frequency(rp2pio_statemachine_obj_t *sel
     pio_sm_clkdiv_restart(self->pio, self->state_machine);
 }
 
+void rp2pio_statemachine_reset_ok(PIO pio, int sm) {
+    uint8_t pio_index = pio_get_index(pio);
+    _never_reset[pio_index][sm] = false;
+}
+
+void rp2pio_statemachine_never_reset(PIO pio, int sm) {
+    uint8_t pio_index = pio_get_index(pio);
+    _never_reset[pio_index][sm] = true;
+}
+
 void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins) {
     common_hal_rp2pio_statemachine_stop(self);
     (void)common_hal_rp2pio_statemachine_stop_background_write(self);
@@ -654,9 +662,7 @@ void common_hal_rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self) {
 }
 
 void common_hal_rp2pio_statemachine_never_reset(rp2pio_statemachine_obj_t *self) {
-    uint8_t sm = self->state_machine;
-    uint8_t pio_index = pio_get_index(self->pio);
-    _never_reset[pio_index][sm] = true;
+    rp2pio_statemachine_never_reset(self->pio, self->state_machine);
     // TODO: never reset all the pins
 }
 
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h
index 03dadc53b3..71f85b1f11 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.h
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.h
@@ -95,6 +95,9 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self);
 void rp2pio_statemachine_deinit(rp2pio_statemachine_obj_t *self, bool leave_pins);
 void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel);
 
+void rp2pio_statemachine_reset_ok(PIO pio, int sm);
+void rp2pio_statemachine_never_reset(PIO pio, int sm);
+
 extern const mp_obj_type_t rp2pio_statemachine_type;
 
 #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_RP2PIO_STATEMACHINE_H
diff --git a/ports/raspberrypi/lib/PicoDVI b/ports/raspberrypi/lib/PicoDVI
new file mode 160000
index 0000000000..23a3a3bf18
--- /dev/null
+++ b/ports/raspberrypi/lib/PicoDVI
@@ -0,0 +1 @@
+Subproject commit 23a3a3bf18820f2abd78e8a9c05b45c01b5a3810
diff --git a/ports/raspberrypi/link.ld b/ports/raspberrypi/link.ld
index 982c5e3a0c..1e758f61bf 100644
--- a/ports/raspberrypi/link.ld
+++ b/ports/raspberrypi/link.ld
@@ -21,13 +21,16 @@
     __stack (== StackTop)
 */
 
+firmware_size = DEFINED(firmware_size) ? firmware_size : 1020K ;
+
 MEMORY
 {
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1020k
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = firmware_size
     /* Followed by: 4kB of NVRAM and at least 1024kB of CIRCUITPY */
     RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
-    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
-    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
+    SCRATCH_Y (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
+    /* X is used by core 1 so we put it last. */
+    SCRATCH_X (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
 }
 
 ENTRY(_entry_point)
@@ -77,7 +80,7 @@ SECTIONS
         *(.property_getset)
         __property_getset_end = .;
 
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a: *interp.o *divider.o) .text*)
         *(.fini)
         /* Pull all c'tors into .text */
         *crtbegin.o(.ctors)
@@ -137,7 +140,7 @@ SECTIONS
         __data_start__ = .;
         *(vtable)
 
-        *(.time_critical*)
+        *(EXCLUDE_FILE(*tmds_encode.o) .time_critical*)
 
         /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
         *(.text*)
@@ -222,23 +225,6 @@ SECTIONS
         *(.uninitialized_data*)
     } > RAM
 
-    /* Start and end symbols must be word-aligned */
-    .scratch_x : {
-        __scratch_x_start__ = .;
-        *(.scratch_x.*)
-        . = ALIGN(4);
-        __scratch_x_end__ = .;
-    } > SCRATCH_X AT > FLASH_FIRMWARE
-    __scratch_x_source__ = LOADADDR(.scratch_x);
-
-    .scratch_y : {
-        __scratch_y_start__ = .;
-        *(.scratch_y.*)
-        . = ALIGN(4);
-        __scratch_y_end__ = .;
-    } > SCRATCH_Y AT > FLASH_FIRMWARE
-    __scratch_y_source__ = LOADADDR(.scratch_y);
-
     .bss  : {
         . = ALIGN(4);
         __bss_start__ = .;
@@ -252,10 +238,30 @@ SECTIONS
     {
         __end__ = .;
         end = __end__;
+        _ld_cp_dynamic_mem_start = .;
         *(.heap*)
         __HeapLimit = .;
     } > RAM
 
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        *tmds_encode.o (.time_critical*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH_FIRMWARE
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        /* Don't put anything into scratch y because CircuitPython manages it and uses it for core 0 stack.
+        /* *(.scratch_y.*) */
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH_FIRMWARE
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
     /* .stack*_dummy section doesn't contains any symbols. It is only
      * used for linker to calculate size of stack sections, and assign
      * values to stack symbols later
@@ -269,6 +275,7 @@ SECTIONS
     {
         *(.stack1*)
     } > SCRATCH_X
+
     .stack_dummy (COPY):
     {
         *(.stack*)
@@ -282,6 +289,7 @@ SECTIONS
     __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
     __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
     __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    _ld_cp_dynamic_mem_end = __StackTop;
     __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
     __StackBottom = __StackTop - SIZEOF(.stack_dummy);
     PROVIDE(__stack = __StackTop);
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 671d4669bf..ab60207b0d 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -39,7 +39,7 @@ CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOCORE ?= 1
 CIRCUITPY_AUDIOPWMIO ?= 1
 
-CIRCUITPY_AUDIOMIXER = 1
+CIRCUITPY_AUDIOMIXER ?= 1
 
 INTERNAL_LIBM = 1
 
diff --git a/ports/raspberrypi/sdk_config/pico/config_autogen.h b/ports/raspberrypi/sdk_config/pico/config_autogen.h
index ee99b1c609..85a8cccb6f 100644
--- a/ports/raspberrypi/sdk_config/pico/config_autogen.h
+++ b/ports/raspberrypi/sdk_config/pico/config_autogen.h
@@ -3,6 +3,7 @@
 #include "pico-sdk-configboard.h"
 
 // alphabetized
+#define LIB_CMSIS_CORE      (1)
 #define LIB_PICO_BINARY_INFO (0)
 #define LIB_PICO_PRINTF_NONE (0)
 #define LIB_PICO_PRINTF_PICO (0)
@@ -23,4 +24,9 @@
 #define PICO_STDIO_IGNORE_NESTED_STDOUT (0)
 #define PICO_USE_CRT_PRINTF (0)
 #define PICO_USE_OPTIMISTIC_SBRK (0)
+// Stack guards cause a hard fault when 32 bytes around the stack bottom are
+// accessed. These backtraces aren't always helpful and this conflicts with our
+// own stack checking.
 #define PICO_USE_STACK_GUARDS (0)
+
+#include "include/cmsis/rename_exceptions.h"
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index f3da71cbd7..2ee3a1ee98 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -228,14 +228,14 @@ bool port_has_fixed_stack(void) {
 }
 
 // From the linker script
-extern uint32_t __HeapLimit;
-extern uint32_t __StackTop;
+extern uint32_t _ld_cp_dynamic_mem_start;
+extern uint32_t _ld_cp_dynamic_mem_end;
 uint32_t *port_stack_get_limit(void) {
-    return &__HeapLimit;
+    return &_ld_cp_dynamic_mem_start;
 }
 
 uint32_t *port_stack_get_top(void) {
-    return &__StackTop;
+    return &_ld_cp_dynamic_mem_end;
 }
 
 uint32_t *port_heap_get_bottom(void) {
@@ -246,13 +246,14 @@ uint32_t *port_heap_get_top(void) {
     return port_stack_get_top();
 }
 
-extern uint32_t __scratch_x_start__;
 void port_set_saved_word(uint32_t value) {
-    __scratch_x_start__ = value;
+    // Store in a watchdog scratch register instead of RAM. 4-7 are used by the
+    // sdk. 0 is used by alarm. 1-3 are free.
+    watchdog_hw->scratch[1] = value;
 }
 
 uint32_t port_get_saved_word(void) {
-    return __scratch_x_start__;
+    return watchdog_hw->scratch[1];
 }
 
 static volatile bool ticks_enabled;
@@ -305,14 +306,12 @@ void port_idle_until_interrupt(void) {
  * \brief Default interrupt handler for unused IRQs.
  */
 extern void HardFault_Handler(void); // provide a prototype to avoid a missing-prototypes diagnostic
-__attribute__((used)) void HardFault_Handler(void) {
-    #ifdef ENABLE_MICRO_TRACE_BUFFER
-    // Turn off the micro trace buffer so we don't fill it up in the infinite
-    // loop below.
-    REG_MTB_MASTER = 0x00000000 + 6;
-    #endif
-
-    reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+__attribute__((used)) void __not_in_flash_func(HardFault_Handler)(void) {
+    // Only safe mode from core 0 which is running CircuitPython. Core 1 faulting
+    // should not be fatal to CP. (Fingers crossed.)
+    if (get_core_num() == 0) {
+        reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    }
     while (true) {
         asm ("nop;");
     }
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index fb5d745ebb..d9af56356a 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -278,14 +278,8 @@ endif
 ifeq ($(CIRCUITPY_PIXELMAP),1)
 SRC_PATTERNS += _pixelmap/%
 endif
-ifeq ($(CIRCUITPY_QRIO),1)
-SRC_PATTERNS += qrio/%
-endif
-ifeq ($(CIRCUITPY_RAINBOWIO),1)
-SRC_PATTERNS += rainbowio/%
-endif
-ifeq ($(CIRCUITPY_RGBMATRIX),1)
-SRC_PATTERNS += rgbmatrix/%
+ifeq ($(CIRCUITPY_PICODVI),1)
+SRC_PATTERNS += picodvi/%
 endif
 ifeq ($(CIRCUITPY_PS2IO),1)
 SRC_PATTERNS += ps2io/%
@@ -296,9 +290,18 @@ endif
 ifeq ($(CIRCUITPY_PWMIO),1)
 SRC_PATTERNS += pwmio/%
 endif
+ifeq ($(CIRCUITPY_QRIO),1)
+SRC_PATTERNS += qrio/%
+endif
+ifeq ($(CIRCUITPY_RAINBOWIO),1)
+SRC_PATTERNS += rainbowio/%
+endif
 ifeq ($(CIRCUITPY_RANDOM),1)
 SRC_PATTERNS += random/%
 endif
+ifeq ($(CIRCUITPY_RGBMATRIX),1)
+SRC_PATTERNS += rgbmatrix/%
+endif
 ifeq ($(CIRCUITPY_RP2PIO),1)
 SRC_PATTERNS += rp2pio/%
 endif
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 0aec2ebe74..639fae9bbc 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -339,6 +339,11 @@ CFLAGS += -DCIRCUITPY_OS=$(CIRCUITPY_OS)
 CIRCUITPY_PEW ?= 0
 CFLAGS += -DCIRCUITPY_PEW=$(CIRCUITPY_PEW)
 
+# CIRCUITPY_PICODVI is handled in the raspberrypi tree.
+# Only for RP2 chips. Assume not a raspberrypi build.
+CIRCUITPY_PICODVI ?= 0
+CFLAGS += -DCIRCUITPY_PICODVI=$(CIRCUITPY_PICODVI)
+
 CIRCUITPY_PIXELBUF ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_PIXELBUF=$(CIRCUITPY_PIXELBUF)
 
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 12aee30b19..c4dc345cb8 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -151,15 +151,27 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     uint16_t x = 0;
     uint16_t y = 0;
     if (mp_obj_is_small_int(index_obj)) {
-        mp_int_t i = mp_arg_validate_int_min(MP_OBJ_SMALL_INT_VALUE(index_obj), 0, MP_QSTR_index);
-        uint16_t width = common_hal_displayio_bitmap_get_width(self);
-        x = i % width;
-        y = i / width;
+        mp_int_t i = MP_OBJ_SMALL_INT_VALUE(index_obj);
+        int total_length = self->width * self->height;
+        if (i < 0 || i >= total_length) {
+            mp_raise_IndexError_varg(translate("%q must be %d-%d"), MP_QSTR_index, 0, total_length - 1);
+        }
+
+        x = i % self->width;
+        y = i / self->width;
     } else {
         mp_obj_t *items;
         mp_obj_get_array_fixed_n(index_obj, 2, &items);
-        x = mp_arg_validate_int_range(mp_obj_get_int(items[0]), 0, self->width - 1, MP_QSTR_x);
-        y = mp_arg_validate_int_range(mp_obj_get_int(items[1]), 0, self->height - 1, MP_QSTR_y);
+        mp_int_t x_in = mp_obj_get_int(items[0]);
+        if (x_in < 0 || x_in >= self->width) {
+            mp_raise_IndexError_varg(translate("%q must be %d-%d"), MP_QSTR_x, 0, self->width - 1);
+        }
+        mp_int_t y_in = mp_obj_get_int(items[1]);
+        if (y_in < 0 || y_in >= self->height) {
+            mp_raise_IndexError_varg(translate("%q must be %d-%d"), MP_QSTR_y, 0, self->height - 1);
+        }
+        x = x_in;
+        y = y_in;
     }
 
     if (value_obj == MP_OBJ_SENTINEL) {
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 7064569e2d..112f7f9ad1 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -55,6 +55,13 @@ uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888) {
     return r5 << 11 | g6 << 5 | b5;
 }
 
+uint8_t displayio_colorconverter_compute_rgb332(uint32_t color_rgb888) {
+    uint32_t r3 = (color_rgb888 >> 21);
+    uint32_t g3 = (color_rgb888 >> 13) & 0x7;
+    uint32_t b2 = (color_rgb888 >> 6) & 0x3;
+    return r3 << 5 | g3 << 2 | b2;
+}
+
 uint8_t displayio_colorconverter_compute_rgbd(uint32_t color_rgb888) {
     uint32_t r1 = (color_rgb888 >> 23) & 0x1;
     uint32_t g1 = (color_rgb888 >> 15) & 0x1;
@@ -309,6 +316,11 @@ void displayio_convert_color(const _displayio_colorspace_t *colorspace, bool dit
         output_color->pixel = pixel;
         output_color->opaque = true;
         return;
+    } else if (colorspace->depth == 8 && !colorspace->grayscale) {
+        uint8_t packed = displayio_colorconverter_compute_rgb332(pixel);
+        output_color->pixel = packed;
+        output_color->opaque = true;
+        return;
     } else if (colorspace->depth == 4) {
         uint8_t packed;
         if (colorspace->sevencolor) {
diff --git a/shared-module/displayio/ColorConverter.h b/shared-module/displayio/ColorConverter.h
index c1e46035ca..7ac5062ff3 100644
--- a/shared-module/displayio/ColorConverter.h
+++ b/shared-module/displayio/ColorConverter.h
@@ -57,6 +57,7 @@ uint32_t displayio_colorconverter_dither_noise_2(uint32_t x, uint32_t y);
 void displayio_convert_color(const _displayio_colorspace_t *colorspace, bool dither, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color);
 
 uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888);
+uint8_t displayio_colorconverter_compute_rgb332(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_rgbd(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_luma(uint32_t color_rgb888);
 uint8_t displayio_colorconverter_compute_chroma(uint32_t color_rgb888);
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 87962dfc60..2dd0cff8b8 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -152,6 +152,10 @@ void common_hal_displayio_release_displays(void) {
         } else if (displays[i].bus_base.type == &videocore_framebuffer_type) {
             common_hal_videocore_framebuffer_deinit(&displays[i].videocore);
         #endif
+        #if CIRCUITPY_PICODVI
+        } else if (displays[i].bus_base.type == &picodvi_framebuffer_type) {
+            common_hal_picodvi_framebuffer_deinit(&displays[i].picodvi);
+        #endif
         }
         displays[i].fourwire_bus.base.type = &mp_type_NoneType;
     }
@@ -266,6 +270,13 @@ void reset_displays(void) {
             // The framebuffer is allocated outside of the heap so it doesn't
             // need to be moved.
         #endif
+        #if CIRCUITPY_PICODVI
+        } else if (displays[i].bus_base.type == &picodvi_framebuffer_type) {
+            picodvi_framebuffer_obj_t *vc = &displays[i].picodvi;
+            if (!any_display_uses_this_framebuffer(&vc->base)) {
+                common_hal_picodvi_framebuffer_deinit(vc);
+            }
+        #endif
         } else {
             // Not an active display bus.
             continue;
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h
index c1954b146c..b450cb711d 100644
--- a/shared-module/displayio/__init__.h
+++ b/shared-module/displayio/__init__.h
@@ -47,9 +47,13 @@
 #if CIRCUITPY_SHARPDISPLAY
 #include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
 #endif
+// Port unique frame buffers.
 #if CIRCUITPY_VIDEOCORE
 #include "bindings/videocore/Framebuffer.h"
 #endif
+#if CIRCUITPY_PICODVI
+#include "bindings/picodvi/Framebuffer.h"
+#endif
 
 typedef struct {
     union {
@@ -71,6 +75,9 @@ typedef struct {
         #if CIRCUITPY_VIDEOCORE
         videocore_framebuffer_obj_t videocore;
         #endif
+        #if CIRCUITPY_PICODVI
+        picodvi_framebuffer_obj_t picodvi;
+        #endif
     };
     union {
         mp_obj_base_t display_base;
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 26585c54d5..5ab00d4f8a 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -103,37 +103,43 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     if (reset_tiles) {
         uint8_t *tiles = (uint8_t *)tilegrid_tiles->ptr;
 
+        // Adjust the display dimensions to account for scale of the outer group.
+        width_px /= scale;
+        height_px /= scale;
+
+        // Number of tiles from the left edge to inset the status bar.
+        size_t min_left_padding = 0;
         #if CIRCUITPY_REPL_LOGO
-        status_bar->x = supervisor_blinka_sprite.pixel_width + 1;
+        // Blinka + 1 px padding minimum
+        min_left_padding = supervisor_blinka_sprite.pixel_width + 1;
         // Align the status bar to the bottom of the logo.
         status_bar->y = supervisor_blinka_sprite.pixel_height - status_bar->tile_height;
         #else
-        status_bar->x = 0;
         status_bar->y = 0;
         #endif
-        status_bar->top_left_y = 0;
-        status_bar->width_in_tiles = width_in_tiles;
+        status_bar->width_in_tiles = (width_px - min_left_padding) / status_bar->tile_width;
         status_bar->height_in_tiles = 1;
-        status_bar->pixel_width = width_in_tiles * status_bar->tile_width;
+        status_bar->pixel_width = status_bar->width_in_tiles * status_bar->tile_width;
         status_bar->pixel_height = status_bar->tile_height;
+        // Right align the status bar.
+        status_bar->x = width_px - status_bar->pixel_width;
+        status_bar->top_left_y = 0;
         status_bar->tiles = tiles;
         status_bar->full_change = true;
 
-        scroll_area->x = 0;
-        scroll_area->top_left_y = 0;
         scroll_area->width_in_tiles = width_in_tiles;
-        scroll_area->height_in_tiles = height_in_tiles - 1;
-        scroll_area->pixel_width = width_in_tiles * scroll_area->tile_width;
-        scroll_area->pixel_height = (height_in_tiles - 1) * scroll_area->tile_height;
+        scroll_area->height_in_tiles = height_in_tiles;
         #if CIRCUITPY_REPL_LOGO
-        scroll_area->y = blinka_bitmap.height;
-        #else
-        scroll_area->y = status_bar->tile_height;
+        scroll_area->height_in_tiles -= 1;
         #endif
-        int16_t extra_height = (scroll_area->pixel_height + scroll_area->y) - (height_px / scale);
-        // Subtract extra height so that the bottom line fully shows. The top line will be under the
-        // title bar and Blinka logo.
-        scroll_area->y -= extra_height;
+        scroll_area->pixel_width = scroll_area->width_in_tiles * scroll_area->tile_width;
+        scroll_area->pixel_height = scroll_area->height_in_tiles * scroll_area->tile_height;
+        // Right align the scroll area to give margin to the start of each line.
+        scroll_area->x = width_px - scroll_area->pixel_width;
+        scroll_area->top_left_y = 0;
+        // Align the scroll area to the bottom so that the newest line isn't cutoff. The top line
+        // may be clipped by the status bar and that's ok.
+        scroll_area->y = height_px - scroll_area->pixel_height;
         scroll_area->tiles = tiles + width_in_tiles;
         scroll_area->full_change = true;
 
diff --git a/supervisor/shared/memory.c b/supervisor/shared/memory.c
index a5f3296a28..ec0b27a9a6 100644
--- a/supervisor/shared/memory.c
+++ b/supervisor/shared/memory.c
@@ -77,6 +77,8 @@ enum {
             // Maximum needs of one display: max(4 if RGBMATRIX, 1 if SHARPDISPLAY, 0)
             #if CIRCUITPY_RGBMATRIX
             4
+            #elif CIRCUITPY_PICODVI
+            2
             #elif CIRCUITPY_SHARPDISPLAY
             1
             #else
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 1d600e1158..133a97a99d 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -123,7 +123,7 @@ void usb_set_defaults(void) {
 };
 
 #if CIRCUITPY_USB_IDENTIFICATION
-supervisor_allocation *usb_identification_allocation;
+supervisor_allocation *usb_identification_allocation = NULL;
 #endif
 
 // Some dynamic USB data must be saved after boot.py. How much is needed?
diff --git a/tools/cortex-m-fault-gdb.py b/tools/cortex-m-fault-gdb.py
index 31b76aa1d4..2ed2d13909 100644
--- a/tools/cortex-m-fault-gdb.py
+++ b/tools/cortex-m-fault-gdb.py
@@ -17,7 +17,7 @@ MMFAR = SCB + 0x034  # (R/W)  MemManage Fault Address Register */
 BFAR = SCB + 0x038  # (R/W)  BusFault Address Register */
 AFSR = SCB + 0x03C  # (R/W)  Auxiliary Fault Status Register */
 
-PARTS = {0xC27: "Cortex M7"}
+PARTS = {0xC27: "Cortex M7", 0xC60: "Cortex M0+"}
 
 EXCEPTIONS = {
     0: "Thread mode",
@@ -40,18 +40,35 @@ class CortexMFault(gdb.Command):
         i = gdb.selected_inferior()
         return i.read_memory(address, 4).cast("I")[0]
 
-    def invoke(self, arg, from_tty):
-        cpuid = self._read(CPUID)
-        implementer = cpuid >> 24
-        if implementer != 0x41:
-            raise RuntimeError()
-        variant = (cpuid >> 20) & 0xF
-        constant = (cpuid >> 16) & 0xF
-        if constant != 0xF:
-            raise RuntimeError()
-        revision = cpuid & 0xF
-        part_no = (cpuid >> 4) & 0xFFF
-        print(PARTS[part_no])
+    def _armv6m_fault(self):
+        vtor = self._read(VTOR)
+        print("vtor", hex(vtor))
+
+        icsr = self._read(ICSR)
+        if (icsr & (1 << 23)) != 0:
+            print("No preempted exceptions")
+        else:
+            print("Another exception was preempted")
+        vectactive = icsr & 0x1FF
+        print(hex(icsr), vectactive)
+        if vectactive != 0:
+            if vectactive in EXCEPTIONS:
+                vectactive = EXCEPTIONS[vectactive]
+            else:
+                vectactive -= 16
+
+            print("Active interrupt:", vectactive)
+
+        vectpending = (icsr >> 12) & 0x1FF
+        if vectpending != 0:
+            if vectpending in EXCEPTIONS:
+                vectpending = EXCEPTIONS[vectpending]
+            else:
+                vectpending -= 16
+
+            print("Pending interrupt:", vectpending)
+
+    def _armv7m_fault(self):
         icsr = self._read(ICSR)
         if (icsr & (1 << 11)) != 0:
             print("No preempted exceptions")
@@ -65,6 +82,7 @@ class CortexMFault(gdb.Command):
                 print(vectactive - 16)
 
         vtor = self._read(VTOR)
+        print("vtor", hex(vtor))
         # print(hex(self._read(SHCSR)))
         cfsr = self._read(CFSR)
         ufsr = cfsr >> 16
@@ -102,5 +120,23 @@ class CortexMFault(gdb.Command):
             print("Bus fault when reading vector table")
             print("VTOR", hex(vtor))
 
+    def invoke(self, arg, from_tty):
+        cpuid = self._read(CPUID)
+        implementer = cpuid >> 24
+        if implementer != 0x41:
+            raise RuntimeError()
+        variant = (cpuid >> 20) & 0xF
+        architecture = (cpuid >> 16) & 0xF
+        revision = cpuid & 0xF
+        part_no = (cpuid >> 4) & 0xFFF
+        print(PARTS[part_no])
+
+        if architecture == 0xF:
+            self._armv7m_fault()
+        elif architecture == 0xC:
+            self._armv6m_fault()
+        else:
+            raise RuntimeError(f"Unknown architecture {architecture:x}")
+
 
 CortexMFault()

From 13bb8012117dd297ee558410c32150729630de2d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 19 Apr 2023 15:42:02 -0700
Subject: [PATCH 2259/2403] Fix docs and windows

---
 ports/raspberrypi/bindings/picodvi/Framebuffer.c | 7 +++----
 tools/ci_fetch_deps.py                           | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
index 51afd0eda7..12482c3baa 100644
--- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -62,10 +62,9 @@
 //|         for the changed clock. This also allocates a very large framebuffer
 //|         and is most likely to succeed the earlier it is attempted.
 //|
-//|         Each *_dp and *_dn pair of pins must be neighboring, such as 19 and
-//|         20. They must also be ordered the same way. In other words, dp must
-//|         be less than dn for all pairs or dp must be greater than dn for all
-//|         pairs.
+//|         Each dp and dn pair of pins must be neighboring, such as 19 and 20.
+//|         They must also be ordered the same way. In other words, dp must be
+//|         less than dn for all pairs or dp must be greater than dn for all pairs.
 //|
 //|         The framebuffer pixel format varies depending on color_depth:
 //|         * 1 - Each bit is a pixel. Either white (1) or black (0).
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index b77bea72f9..2069c035c7 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -87,7 +87,10 @@ def main():
         submodules = ["tools/"]  # for huffman
     elif TARGET == "windows":
         # This builds one board from a number of ports so fill out a bunch of submodules
-        submodules = ["extmod/ulab", "lib/", "tools/", "ports/", "data/nvm.toml"]
+        for port in ("atmel-samd", "nrf", "raspberrypi", "stm"):
+            submodules.extend(PORT_DEPS[port])
+        unique_submodules = set(submodules)
+        submodules = list(unique_submodules)
     elif TARGET == "website":
         submodules = ["tools/adabot/"]
         submodules_tags = ["frozen/"]

From f38d59be2cb2af43a0fb2a07d4cbd833d5797082 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 19 Apr 2023 16:02:01 -0700
Subject: [PATCH 2260/2403] Fix windows CI

---
 tools/ci_fetch_deps.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
index 2069c035c7..15ef6a51cd 100644
--- a/tools/ci_fetch_deps.py
+++ b/tools/ci_fetch_deps.py
@@ -88,6 +88,7 @@ def main():
     elif TARGET == "windows":
         # This builds one board from a number of ports so fill out a bunch of submodules
         for port in ("atmel-samd", "nrf", "raspberrypi", "stm"):
+            submodules.append(f"ports/{port}")
             submodules.extend(PORT_DEPS[port])
         unique_submodules = set(submodules)
         submodules = list(unique_submodules)

From e2ab7a4751e867e7981425f60bf2ef54c6bae355 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Wed, 19 Apr 2023 17:04:54 -0700
Subject: [PATCH 2261/2403] Change voltage. Refine docs

---
 .../common-hal/microcontroller/Processor.c    |  1 +
 ports/raspberrypi/Makefile                    |  2 ++
 .../common-hal/microcontroller/Processor.c    | 19 ++++++++++++++++++-
 shared-bindings/microcontroller/Processor.c   |  8 ++++++--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
index 34400e3f41..8df21268ec 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
@@ -59,6 +59,7 @@ void common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
         freq != 720 && freq != 816 && freq != 912 && freq != 960 && freq != 1008) {
         mp_raise_ValueError(translate("Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"));
     }
+    SystemCoreClock = setarmclock(frequency);
 }
 
 
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 395a5553e2..98a5d7d77a 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -129,6 +129,7 @@ INC += \
         -isystem sdk/src/rp2_common/hardware_sync/include/ \
         -isystem sdk/src/rp2_common/hardware_timer/include/ \
         -isystem sdk/src/rp2_common/hardware_uart/include/ \
+        -isystem sdk/src/rp2_common/hardware_vreg/include/ \
         -isystem sdk/src/rp2_common/hardware_watchdog/include/ \
         -isystem sdk/src/rp2_common/hardware_xosc/include/ \
         -isystem sdk/src/rp2_common/pico_multicore/include/ \
@@ -216,6 +217,7 @@ SRC_SDK := \
 	src/rp2_common/hardware_sync/sync.c \
 	src/rp2_common/hardware_timer/timer.c \
 	src/rp2_common/hardware_uart/uart.c \
+	src/rp2_common/hardware_vreg/vreg.c \
 	src/rp2_common/hardware_watchdog/watchdog.c \
 	src/rp2_common/hardware_xosc/xosc.c \
 	src/rp2_common/pico_bootrom/bootrom.c \
diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
index 66083a357d..56f2fd7fb1 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Processor.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -32,10 +32,12 @@
 #include "common-hal/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
+#include "shared-bindings/time/__init__.h"
 
 #include "pico/stdlib.h"
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 #include "src/rp2_common/hardware_clocks/include/hardware/clocks.h"
+#include "src/rp2_common/hardware_vreg/include/hardware/vreg.h"
 
 #include "src/rp2040/hardware_regs/include/hardware/regs/vreg_and_chip_reset.h"
 #include "src/rp2040/hardware_regs/include/hardware/regs/watchdog.h"
@@ -62,9 +64,24 @@ uint32_t common_hal_mcu_processor_get_frequency(void) {
 }
 
 void common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self, uint32_t frequency) {
-    if (!set_sys_clock_khz(frequency / 1000, false)) {
+    uint vco, postdiv1, postdiv2;
+    uint32_t freq_khz = frequency / 1000;
+    if (!check_sys_clock_khz(freq_khz, &vco, &postdiv1, &postdiv2)) {
         mp_arg_error_invalid(MP_QSTR_frequency);
     }
+    // These voltages are approximate based on the PicoDVI examples.
+    enum vreg_voltage voltage = VREG_VOLTAGE_1_10;
+    if (freq_khz >= 400000) {
+        voltage = VREG_VOLTAGE_1_30;
+    } else if (freq_khz >= 300000) {
+        voltage = VREG_VOLTAGE_1_20;
+    } else if (freq_khz > 133000) {
+        voltage = VREG_VOLTAGE_1_20;
+    }
+    vreg_set_voltage(voltage);
+    // Wait for a stable voltage
+    common_hal_time_delay_ms(10);
+    set_sys_clock_khz(freq_khz, false);
 }
 
 void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 6ae0212a6a..e4819047da 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -70,8 +70,12 @@
 //|     **Limitations:** On most boards, ``frequency`` is read-only. Setting
 //|     the ``frequency`` is possible on RP2040 boards and some i.MX boards.
 //|
-//|     .. warning:: On RP2040 boards changing the frequency may cause issues
-//|        with other subsystems, such as USB, PWM, and PIO.
+//|     .. warning:: Overclocking likely voids your warranties and may reduce
+//|       the lifetime of the chip.
+//|
+//|     .. warning:: Changing the frequency may cause issues with other
+//|       subsystems, such as USB, PWM, and PIO. To minimize issues, set the CPU
+//|       frequency before initializing other systems.
 //|     """
 
 #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY

From df41bd9eadc33e35568fbc7031f395324c83e2f6 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 20 Apr 2023 09:47:25 -0400
Subject: [PATCH 2262/2403] change hex radio password validation; add password
 length doc

---
 data/nvm.toml                |  2 +-
 locale/circuitpython.pot     | 17 ++++++++---------
 py/argcheck.c                | 13 -------------
 py/runtime.h                 |  1 -
 shared-bindings/wifi/Radio.c | 23 +++++++++++++++++++----
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/data/nvm.toml b/data/nvm.toml
index 73fafcbe4c..427cc92397 160000
--- a/data/nvm.toml
+++ b/data/nvm.toml
@@ -1 +1 @@
-Subproject commit 73fafcbe4c66b23df63be31e9227353b695abb08
+Subproject commit 427cc923976229bcb981ca6f218ebe8efd636df6
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f87fc02975..16ff1b38cc 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -98,6 +98,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -193,7 +196,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1117,10 +1120,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1282,6 +1281,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1708,10 +1711,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/py/argcheck.c b/py/argcheck.c
index 73f3ead269..465a82c97e 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -268,19 +268,6 @@ mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {
     return an_int;
 }
 
-mp_int_t mp_arg_validate_valid_hex_password(mp_uint_t length, uint8_t *buf) {
-    unsigned int i=0;
-    while (i
 
+#include "py/unicode.h"
 #include "py/runtime.h"
 #include "py/objproperty.h"
 
@@ -70,6 +71,14 @@ STATIC bool hostname_valid(const char *ptr, size_t len) {
     return !(partlen > 63);
 }
 
+STATIC void validate_hex_password(const uint8_t *buf, size_t len) {
+    for (size_t i = 0; i < len; i++) {
+        if (!unichar_isxdigit(buf[i])) {
+            mp_raise_ValueError_varg(translate("Invalid hex password"));
+        }
+    }
+}
+
 
 //| class Radio:
 //|     """Native wifi radio.
@@ -321,6 +330,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 //|         ``OPEN`` will be used when the password is the empty string,
 //|         otherwise ``authmode`` will be ``WPA_WPA2_PSK``.
 //|
+//|         The length of ``password`` must be 8-63 characters if it is ASCII,
+//|         or exactly 64 hexadecimal characters if it is the hex form of the 256-bit key.
+//|
 //|         If ``max_connections`` is given, the access point will allow up to
 //|         that number of stations to connect."""
 //|         ...
@@ -368,8 +380,8 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
 
     if (authmodes != AUTHMODE_OPEN) {
         mp_arg_validate_length_range(password.len, 8, 64, MP_QSTR_password);
-        if (password.len==64) {
-            mp_arg_validate_valid_hex_password(password.len, password.buf);
+        if (password.len == 64) {
+            validate_hex_password(password.buf, password.len);
         }
     }
 
@@ -409,6 +421,9 @@ MP_PROPERTY_GETTER(wifi_radio_ap_active_obj,
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
 //|         automatically once one connection succeeds.
 //|
+//|         The length of ``password`` must be 0 if there is no password, 8-63 characters if it is ASCII,
+//|         or exactly 64 hexadecimal characters if it is the hex form of the 256-bit key.
+//|
 //|         By default, this will scan all channels and connect to the access point (AP) with the
 //|         given ``ssid`` and greatest signal strength (rssi).
 //|
@@ -449,8 +464,8 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
         mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ);
         if (password.len != 0) {
             mp_arg_validate_length_range(password.len, 8, 64, MP_QSTR_password);
-            if (password.len==64) {
-                mp_arg_validate_valid_hex_password(password.len, password.buf);
+            if (password.len == 64) {
+                validate_hex_password(password.buf, password.len);
             }
         }
     }

From 6f71e81c862d42eae77c61a05276a5bf6faf318a Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 20 Apr 2023 16:23:03 +0200
Subject: [PATCH 2263/2403] 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             | 17 ++++++++---------
 locale/cs.po             | 17 ++++++++---------
 locale/de_DE.po          | 23 ++++++++++++++---------
 locale/el.po             | 17 ++++++++---------
 locale/en_GB.po          | 23 ++++++++++++++---------
 locale/es.po             | 23 ++++++++++++++---------
 locale/fil.po            | 17 ++++++++---------
 locale/fr.po             | 23 ++++++++++++++---------
 locale/hi.po             | 17 ++++++++---------
 locale/it_IT.po          | 17 ++++++++---------
 locale/ja.po             | 20 +++++++++++---------
 locale/ko.po             | 17 ++++++++---------
 locale/nl.po             | 20 +++++++++++---------
 locale/pl.po             | 20 +++++++++++---------
 locale/pt_BR.po          | 23 ++++++++++++++---------
 locale/ru.po             | 20 +++++++++++---------
 locale/sv.po             | 23 ++++++++++++++---------
 locale/tr.po             | 20 +++++++++++---------
 locale/zh_Latn_pinyin.po | 23 ++++++++++++++---------
 19 files changed, 209 insertions(+), 171 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 7163efb5df..c37a4f64db 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -101,6 +101,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -196,7 +199,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1127,10 +1130,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1294,6 +1293,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Ukuran potongan format tidak valid"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1725,10 +1728,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "Sampel berlebihan harus kelipatan 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/cs.po b/locale/cs.po
index 0e6b8714af..277287a4af 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -102,6 +102,9 @@ msgstr "%d adresní pin, %d rgb pin a %d dlaždice indikuje výšku %d, ne %d"
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -197,7 +200,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1127,10 +1130,6 @@ msgstr "Chyba inicializace I2C"
 msgid "I2C peripheral in use"
 msgstr "Periférie I2C je používána"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1294,6 +1293,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Neplatná velikost bloku"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Chybná multicastová MAC adresa"
@@ -1721,10 +1724,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6b68831288..9c39023401 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -110,6 +110,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -206,7 +209,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q muss ein Array vom Typ 'H' sein"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1147,10 +1150,6 @@ msgstr "I2C-Initialisierungsfehler"
 msgid "I2C peripheral in use"
 msgstr "I2C Peripherie in Verwendung"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut nicht verfügbar"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "In-Puffer-Elemente müssen <= 4 Bytes lang sein"
@@ -1318,6 +1317,10 @@ msgstr "Ungültiges Format"
 msgid "Invalid format chunk size"
 msgstr "Ungültige format chunk size"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Ungültige Multicast-MAC-Adresse"
@@ -1751,10 +1754,6 @@ msgstr "Out-Buffer-Elemente müssen <= 4 bytes lang sein"
 msgid "Oversample must be multiple of 8."
 msgstr "Oversample muss ein Vielfaches von 8 sein."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn nicht verfügbar"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4464,6 +4463,12 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "I2SOut not available"
+#~ msgstr "I2SOut nicht verfügbar"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn nicht verfügbar"
+
 #~ msgid "out of range of source"
 #~ msgstr "Außerhalb des Bereichs der Quelle"
 
diff --git a/locale/el.po b/locale/el.po
index c1d8350462..ca698c532f 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -106,6 +106,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -201,7 +204,7 @@ msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H',
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1137,10 +1140,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1302,6 +1301,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1728,10 +1731,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8b7a1da9fc..8568718c68 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -111,6 +111,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -206,7 +209,7 @@ msgstr "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
 msgid "%q must be array of type 'H'"
 msgstr "%q must be array of type 'H'"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr "%q must be array of type 'h'"
 
@@ -1136,10 +1139,6 @@ msgstr "I2C init error"
 msgid "I2C peripheral in use"
 msgstr "I2C peripheral in use"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut not available"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "In-buffer elements must be <= 4 bytes long"
@@ -1303,6 +1302,10 @@ msgstr "Invalid format"
 msgid "Invalid format chunk size"
 msgstr "Invalid format chunk size"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Invalid multicast MAC address"
@@ -1733,10 +1736,6 @@ msgstr "Out-buffer elements must be <= 4 bytes long"
 msgid "Oversample must be multiple of 8."
 msgstr "Oversample must be multiple of 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn not available"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4405,6 +4404,12 @@ 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 "I2SOut not available"
+#~ msgstr "I2SOut not available"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn not available"
+
 #~ msgid "out of range of source"
 #~ msgstr "out of range of source"
 
diff --git a/locale/es.po b/locale/es.po
index 3ebfdc7833..ef8ca30c40 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -113,6 +113,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -208,7 +211,7 @@ msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
 msgid "%q must be array of type 'H'"
 msgstr "%q debe ser un arreglo de tipo 'H'"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr "%q debe ser una matriz de tipo 'h'"
 
@@ -1154,10 +1157,6 @@ msgstr "Error en la inicialización I2C"
 msgid "I2C peripheral in use"
 msgstr "Dispositivo I2C en uso"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut no disponible"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1328,6 +1327,10 @@ msgstr "Formato inválido"
 msgid "Invalid format chunk size"
 msgstr "Formato de fragmento de formato no válido"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Dirección MAC de multidifusión inválida"
@@ -1764,10 +1767,6 @@ msgstr "Los elementos del búfer de salida deben ser de una longitud <= 4 bytes"
 msgid "Oversample must be multiple of 8."
 msgstr "El sobremuestreo debe ser un múltiplo de 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn no esta disponible"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4461,6 +4460,12 @@ 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 "I2SOut not available"
+#~ msgstr "I2SOut no disponible"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn no esta disponible"
+
 #~ msgid "out of range of source"
 #~ msgstr "fuera de rango de fuente"
 
diff --git a/locale/fil.po b/locale/fil.po
index 2a9127c34c..e7630e6068 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -99,6 +99,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -194,7 +197,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1127,10 +1130,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1294,6 +1293,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Mali ang format ng chunk size"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1723,10 +1726,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "Oversample ay dapat multiple ng 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/fr.po b/locale/fr.po
index 22391687cb..81f8c8dcd2 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -113,6 +113,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -208,7 +211,7 @@ msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'"
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1160,10 +1163,6 @@ msgstr "Erreur d'initialisation I2C"
 msgid "I2C peripheral in use"
 msgstr "Périphérique I2C utilisé"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut n'est pas disponible"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Éléments dans le tampon doivent être <= à 4 octets"
@@ -1337,6 +1336,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Taille de bloc de formatage invalide"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Adresse MAC multicast invalide"
@@ -1773,10 +1776,6 @@ msgstr "Éléments du tampon de sortie doivent être <= à 4 octets"
 msgid "Oversample must be multiple of 8."
 msgstr "Le sur-échantillonage doit être un multiple de 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn non disponible"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4483,6 +4482,12 @@ 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 "I2SOut not available"
+#~ msgstr "I2SOut n'est pas disponible"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn non disponible"
+
 #~ msgid "out of range of source"
 #~ msgstr "dépassement des bornes de source"
 
diff --git a/locale/hi.po b/locale/hi.po
index 1f60a526cd..56095ed2f7 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -98,6 +98,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -193,7 +196,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1117,10 +1120,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1282,6 +1281,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1708,10 +1711,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 57a9a3b91f..4bedc7d428 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -102,6 +102,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -197,7 +200,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1129,10 +1132,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1296,6 +1295,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1727,10 +1730,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "L'oversampling deve essere multiplo di 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 #, fuzzy
 msgid ""
diff --git a/locale/ja.po b/locale/ja.po
index fbe0d8c902..1045e43dbc 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -104,6 +104,9 @@ msgstr "%dアドレスピン、%dRGBピン、%dタイルは%dの高さを指示
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 #, fuzzy
 msgid "%q"
 msgstr "%q"
@@ -200,7 +203,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1128,10 +1131,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOutが利用できません"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1295,6 +1294,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "フォーマットチャンクのサイズが不正"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1723,10 +1726,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "オーバーサンプルは8の倍数でなければなりません"
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4386,6 +4385,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "I2SOut not available"
+#~ msgstr "I2SOutが利用できません"
+
 #~ msgid "out of range of source"
 #~ msgstr "ソースが範囲外"
 
diff --git a/locale/ko.po b/locale/ko.po
index 339cb42c86..6dccfd143b 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -99,6 +99,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -194,7 +197,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1120,10 +1123,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1285,6 +1284,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "형식 청크 크기가 잘못되었습니다"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1711,10 +1714,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
diff --git a/locale/nl.po b/locale/nl.po
index a91063c256..003953f289 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -98,6 +98,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -193,7 +196,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1123,10 +1126,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut is niet beschikbaar"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1290,6 +1289,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Ongeldig formaat stuk grootte"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1722,10 +1725,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "Oversample moet een meervoud van 8 zijn."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4396,6 +4395,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 "I2SOut not available"
+#~ msgstr "I2SOut is niet beschikbaar"
+
 #~ msgid "out of range of source"
 #~ msgstr "buiten bereik van bron"
 
diff --git a/locale/pl.po b/locale/pl.po
index fbd76182cc..b0f60e0806 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -100,6 +100,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr ""
 
@@ -195,7 +198,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1123,10 +1126,6 @@ msgstr ""
 msgid "I2C peripheral in use"
 msgstr ""
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut niedostępne"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr ""
@@ -1290,6 +1289,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Zła wielkość fragmentu formatu"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
@@ -1716,10 +1719,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr "Nadpróbkowanie musi być wielokrotnością 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4372,6 +4371,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "I2SOut not available"
+#~ msgstr "I2SOut niedostępne"
+
 #~ msgid "pixel value requires too many bits"
 #~ msgstr "wartość piksela wymaga zbyt wielu bitów"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d130fcc464..b428121645 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -111,6 +111,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -206,7 +209,7 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'"
 msgid "%q must be array of type 'H'"
 msgstr "%q deve ser uma matriz do tipo 'H'"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr "%q deve ser uma matriz do tipo 'h'"
 
@@ -1151,10 +1154,6 @@ msgstr "Erro de inicialização do I2C"
 msgid "I2C peripheral in use"
 msgstr "Periférico I2C em uso"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "O I2SOut não está disponível"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Os elementos In-buffer devem ter um comprimento de <= 4 bytes"
@@ -1324,6 +1323,10 @@ msgstr "Formato inválido"
 msgid "Invalid format chunk size"
 msgstr "Tamanho do pedaço de formato inválido"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Endereço MAC multicast inválido"
@@ -1757,10 +1760,6 @@ msgstr "Os elementos Out-buffer devem ter um comprimento de <= 4 bytes"
 msgid "Oversample must be multiple of 8."
 msgstr "A superamostragem deve ser um múltiplo de 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "O PDMIn não está disponível"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4461,6 +4460,12 @@ 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 "I2SOut not available"
+#~ msgstr "O I2SOut não está disponível"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "O PDMIn não está disponível"
+
 #~ msgid "out of range of source"
 #~ msgstr "fora do alcance da fonte"
 
diff --git a/locale/ru.po b/locale/ru.po
index 8fe6419b11..75447bec23 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -105,6 +105,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -200,7 +203,7 @@ msgstr "%q должно быть bytearray или array типа 'h', 'H', 'b',
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1154,10 +1157,6 @@ msgstr "Ошибка инициализации I2C"
 msgid "I2C peripheral in use"
 msgstr "Периферийное устройство I2C уже используется"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut недоступен"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Элементы буфера должны быть длиной <= 4 байта"
@@ -1327,6 +1326,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Неверный размер блока формата"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Неверный MAC-адрес multicast"
@@ -1764,10 +1767,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4425,6 +4424,9 @@ msgstr "zi должно быть типа float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi должен иметь форму (n_section, 2)"
 
+#~ msgid "I2SOut not available"
+#~ msgstr "I2SOut недоступен"
+
 #~ msgid "64 bit types"
 #~ msgstr "64-битные типы"
 
diff --git a/locale/sv.po b/locale/sv.po
index 8cb79da28e..5cc3ecdf9c 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -110,6 +110,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -207,7 +210,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q måste vara en array av typen 'H'"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr "%q måste vara en matris av typen 'h'"
 
@@ -1140,10 +1143,6 @@ msgstr "I2C-initieringsfel"
 msgid "I2C peripheral in use"
 msgstr "I2C-enhet används redan"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut är inte tillgängligt"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Antal element i buffert måste vara <= 4 byte"
@@ -1309,6 +1308,10 @@ msgstr "Ogiltigt format"
 msgid "Invalid format chunk size"
 msgstr "Ogiltig formatsegmentstorlek"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Ogiltig MAC-adress för multicast"
@@ -1741,10 +1744,6 @@ msgstr "Element i utbuffer måste vara <= 4 byte långa"
 msgid "Oversample must be multiple of 8."
 msgstr "Översampling måste vara multipel av 8."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn inte tillgänglig"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4423,6 +4422,12 @@ 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 "I2SOut not available"
+#~ msgstr "I2SOut är inte tillgängligt"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn inte tillgänglig"
+
 #~ msgid "out of range of source"
 #~ msgstr "utanför räckvidd för source"
 
diff --git a/locale/tr.po b/locale/tr.po
index 1f8874167b..3a4b19ea1b 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -106,6 +106,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -201,7 +204,7 @@ msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı"
 msgid "%q must be array of type 'H'"
 msgstr ""
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr ""
 
@@ -1133,10 +1136,6 @@ msgstr "I2C init hatası"
 msgid "I2C peripheral in use"
 msgstr "I2C çevre cihazı kullanımda"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut uygundeğil"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "Buffer öğeleri <=4 bayt uzunluğunda olmalı"
@@ -1301,6 +1300,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr "Geçersiz biçim yığın boyutu"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "Geçersiz multicast MAC adresi"
@@ -1727,10 +1730,6 @@ msgstr ""
 msgid "Oversample must be multiple of 8."
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr ""
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4384,6 +4383,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "I2SOut not available"
+#~ msgstr "I2SOut uygundeğil"
+
 #~ msgid "64 bit types"
 #~ msgstr "64 bit tipler"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index dffbea185d..1ecf35326f 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -113,6 +113,9 @@ msgstr ""
 #: ports/raspberrypi/common-hal/analogio/AnalogOut.c
 #: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
 #: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
+#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q"
 msgstr "%q"
 
@@ -209,7 +212,7 @@ msgstr ""
 msgid "%q must be array of type 'H'"
 msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ"
 
-#: shared-bindings/synthio/MidiTrack.c shared-bindings/synthio/__init__.c
+#: shared-module/synthio/__init__.c
 msgid "%q must be array of type 'h'"
 msgstr "%q bìxū shì lèixíng wéi 'h' de shùzǔ"
 
@@ -1144,10 +1147,6 @@ msgstr "I2C qǐdòng cuòwù"
 msgid "I2C peripheral in use"
 msgstr "I2C wài shè zhèng zài shǐ yòng zhōng"
 
-#: shared-bindings/audiobusio/I2SOut.c
-msgid "I2SOut not available"
-msgstr "I2SOut bù kě yòng"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "In-buffer elements must be <= 4 bytes long"
 msgstr "huǎn chōng nèi yuán sù bì xū <= 4 zì jié cháng"
@@ -1316,6 +1315,10 @@ msgstr "géshì wúxiào"
 msgid "Invalid format chunk size"
 msgstr "Géshì kuài dàxiǎo wúxiào"
 
+#: shared-bindings/wifi/Radio.c
+msgid "Invalid hex password"
+msgstr ""
+
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr "wú xiào de duō bō MAC dì zhǐ"
@@ -1748,10 +1751,6 @@ msgstr "huǎn chōng wài yuán sù bì xū <= 4 zì jié cháng"
 msgid "Oversample must be multiple of 8."
 msgstr "Guò cǎiyàng bìxū shì 8 de bèishù."
 
-#: shared-bindings/audiobusio/PDMIn.c
-msgid "PDMIn not available"
-msgstr "PDMIn bù kě yòng"
-
 #: shared-bindings/pwmio/PWMOut.c
 msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
@@ -4429,6 +4428,12 @@ 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 "I2SOut not available"
+#~ msgstr "I2SOut bù kě yòng"
+
+#~ msgid "PDMIn not available"
+#~ msgstr "PDMIn bù kě yòng"
+
 #~ msgid "out of range of source"
 #~ msgstr "yuán fàn wéi wài"
 

From 8cc44f2b9033df4713ee9a277e66529983a4f013 Mon Sep 17 00:00:00 2001
From: Hosted Weblate 
Date: Thu, 20 Apr 2023 20:50:34 +0200
Subject: [PATCH 2264/2403] 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             | 11 ++++++++---
 locale/cs.po             | 11 ++++++++---
 locale/de_DE.po          | 11 ++++++++---
 locale/el.po             | 11 ++++++++---
 locale/en_GB.po          | 11 ++++++++---
 locale/es.po             | 11 ++++++++---
 locale/fil.po            | 11 ++++++++---
 locale/fr.po             | 11 ++++++++---
 locale/hi.po             | 11 ++++++++---
 locale/it_IT.po          | 11 ++++++++---
 locale/ja.po             | 11 ++++++++---
 locale/ko.po             | 11 ++++++++---
 locale/nl.po             | 11 ++++++++---
 locale/pl.po             | 11 ++++++++---
 locale/pt_BR.po          | 11 ++++++++---
 locale/ru.po             | 11 ++++++++---
 locale/sv.po             | 11 ++++++++---
 locale/tr.po             | 11 ++++++++---
 locale/zh_Latn_pinyin.po | 11 ++++++++---
 19 files changed, 152 insertions(+), 57 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index c37a4f64db..b629eeb48e 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -129,6 +129,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -167,11 +168,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q harus %d-%d"
 
@@ -471,6 +472,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "Semua channel event sedang digunakan"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -479,6 +481,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr "Semua channel event yang disinkronisasi sedang digunakan"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Semua timer untuk pin ini sedang digunakan"
@@ -1234,7 +1237,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/cs.po b/locale/cs.po
index 277287a4af..2b7854a27f 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -130,6 +130,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -168,11 +169,11 @@ msgstr "Délka %q musí být <= %d"
 msgid "%q length must be >= %d"
 msgstr "Délka %q musí být >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q musí být %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q musí být %d-%d"
 
@@ -472,6 +473,7 @@ msgstr "Všechny kanály jsou používány"
 msgid "All event channels in use"
 msgstr "Všechny kanály událostí jsou již používány"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -480,6 +482,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Všechny časovače pro tento pin jsou používány"
@@ -1234,7 +1237,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 9c39023401..21fea5273f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -138,6 +138,7 @@ msgstr "%q in %q muss von Typ %q sein, nicht %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -176,11 +177,11 @@ msgstr "%q länge muss kleiner oder gleich %d sein"
 msgid "%q length must be >= %d"
 msgstr "%q länge muss größer oder gleich %d sein"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q muss %d entsprechen"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q muss %d-%d sein"
 
@@ -482,6 +483,7 @@ msgstr "Alle Kanäle werden verwendet"
 msgid "All event channels in use"
 msgstr "Alle Event-Kanäle werden benutzt"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Alle State-Maschinen in Verwendung"
@@ -490,6 +492,7 @@ msgstr "Alle State-Maschinen in Verwendung"
 msgid "All sync event channels in use"
 msgstr "Alle Sync Event-Kanäle werden benutzt"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Alle Timer für diesen Pin werden bereits benutzt"
@@ -1258,7 +1261,9 @@ msgid "Interrupt error."
 msgstr "Interrupt Fehler."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/el.po b/locale/el.po
index ca698c532f..f7bc0aa360 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -134,6 +134,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -172,11 +173,11 @@ msgstr "%q μήκος πρέπει να είναι <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q μήκος πρέπει να είναι >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q πρέπει να είναι %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q πρέπει να είναι %d-%d"
 
@@ -476,6 +477,7 @@ msgstr "Όλα τα κανάλια είναι σε χρήση"
 msgid "All event channels in use"
 msgstr "Όλα τα κανάλια συμβάντων είναι σε χρήση"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Όλες οι μηχανές κατάστασης είναι σε χρήση"
@@ -484,6 +486,7 @@ msgstr "Όλες οι μηχανές κατάστασης είναι σε χρή
 msgid "All sync event channels in use"
 msgstr "Όλα τα κανάλια συμβάντων συγχρονισμού είναι σε χρήση"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Όλοι οι χρονιστές για αυτό το pin χρησιμοποιούνται ήδη"
@@ -1242,7 +1245,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8568718c68..06ad558ee1 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -139,6 +139,7 @@ msgstr "%q in %q must be of type %q, not %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -177,11 +178,11 @@ msgstr "%q length must be <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q length must be >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q must be %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q must be %d-%d"
 
@@ -481,6 +482,7 @@ msgstr "All channels in use"
 msgid "All event channels in use"
 msgstr "All event channels in use"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "All state machines in use"
@@ -489,6 +491,7 @@ msgstr "All state machines in use"
 msgid "All sync event channels in use"
 msgstr "All sync event channels in use"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "All timers for this pin are in use"
@@ -1243,7 +1246,9 @@ msgid "Interrupt error."
 msgstr "Interrupt error."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/es.po b/locale/es.po
index ef8ca30c40..f0604b74f4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -141,6 +141,7 @@ msgstr "%q en %q debe ser del tipo %q, no %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -179,11 +180,11 @@ msgstr "%q longitud debe ser <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q longitud debe ser >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q debe ser %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q debe ser %d-%d"
 
@@ -483,6 +484,7 @@ msgstr "Todos los canales están en uso"
 msgid "All event channels in use"
 msgstr "Todos los canales de eventos están en uso"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Todas las máquinas de estado están en uso"
@@ -493,6 +495,7 @@ msgstr ""
 "Todos los canales de eventos de sincronización (sync event channels) están "
 "en uso"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Todos los timers para este pin están en uso"
@@ -1268,7 +1271,9 @@ msgid "Interrupt error."
 msgstr "Error de interrupción."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/fil.po b/locale/fil.po
index e7630e6068..c7c0aeb635 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -127,6 +127,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -165,11 +166,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -471,6 +472,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "Lahat ng event channels ginagamit"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -479,6 +481,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr "Lahat ng sync event channels ay ginagamit"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Lahat ng timers para sa pin na ito ay ginagamit"
@@ -1234,7 +1237,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/fr.po b/locale/fr.po
index 81f8c8dcd2..ac83978de1 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -141,6 +141,7 @@ msgstr "%q dans %q doit être de type %q, pas %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -179,11 +180,11 @@ msgstr "La longeur de %q doit être <= %d"
 msgid "%q length must be >= %d"
 msgstr "La longeur de %q doit être >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q doit être %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q doit être %d-%d"
 
@@ -483,6 +484,7 @@ msgstr "Tout les canaux sont utilisés"
 msgid "All event channels in use"
 msgstr "Tous les canaux d'événements sont utilisés"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Tous les automates finis sont utilisés"
@@ -491,6 +493,7 @@ msgstr "Tous les automates finis sont utilisés"
 msgid "All sync event channels in use"
 msgstr "Tout les canaux d'événements sync sont utilisés"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Tous les minuteurs pour cette broche sont utilisés"
@@ -1277,7 +1280,9 @@ msgid "Interrupt error."
 msgstr "Erreur d'interruption."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/hi.po b/locale/hi.po
index 56095ed2f7..e264d5e692 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -126,6 +126,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -164,11 +165,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -468,6 +469,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -476,6 +478,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr ""
@@ -1222,7 +1225,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 4bedc7d428..52fb4b00a3 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -130,6 +130,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -168,11 +169,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -474,6 +475,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "Tutti i canali eventi utilizati"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Tutte le state machines sono in uso"
@@ -482,6 +484,7 @@ msgstr "Tutte le state machines sono in uso"
 msgid "All sync event channels in use"
 msgstr "Tutti i canali di eventi sincronizzati in uso"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Tutti i timer per questo pin sono in uso"
@@ -1236,7 +1239,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/ja.po b/locale/ja.po
index 1045e43dbc..805dc10e8e 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -133,6 +133,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -171,11 +172,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -475,6 +476,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "全てのイベントチャネルが使用中"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -483,6 +485,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr "全ての同期イベントチャネルが使用中"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "このピン用の全てのタイマが使用中"
@@ -1235,7 +1238,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/ko.po b/locale/ko.po
index 6dccfd143b..061c70bdfa 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -127,6 +127,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -165,11 +166,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -469,6 +470,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -477,6 +479,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "핀의 모든 타이머가 사용 중입니다"
@@ -1225,7 +1228,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/nl.po b/locale/nl.po
index 003953f289..3f14b144c6 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -126,6 +126,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -164,11 +165,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -468,6 +469,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "Alle event kanalen zijn in gebruik"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -476,6 +478,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr "Alle sync event kanalen zijn in gebruik"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Alle timers voor deze pin zijn in gebruik"
@@ -1230,7 +1233,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/pl.po b/locale/pl.po
index b0f60e0806..f6c35b87b2 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -128,6 +128,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -166,11 +167,11 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr ""
 
@@ -470,6 +471,7 @@ msgstr ""
 msgid "All event channels in use"
 msgstr "Wszystkie kanały zdarzeń w użyciu"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr ""
@@ -478,6 +480,7 @@ msgstr ""
 msgid "All sync event channels in use"
 msgstr "Wszystkie kanały zdarzeń synchronizacji w użyciu"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Wszystkie timery tej nóżki w użyciu"
@@ -1230,7 +1233,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b428121645..5d02126604 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -139,6 +139,7 @@ msgstr "%q em %q deve ser do tipo %q e não %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -177,11 +178,11 @@ msgstr "o comprimento de %q deve ser <= %d"
 msgid "%q length must be >= %d"
 msgstr "o comprimento de %q deve ser >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q deve ser %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "o %q deve ser %d-%d"
 
@@ -485,6 +486,7 @@ msgstr "Todos os canais estão em uso"
 msgid "All event channels in use"
 msgstr "Todos os canais de eventos em uso"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "O estado de todas as máquinas em uso"
@@ -493,6 +495,7 @@ msgstr "O estado de todas as máquinas em uso"
 msgid "All sync event channels in use"
 msgstr "Todos os canais dos eventos de sincronização em uso"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Todos os temporizadores para este pino estão em uso"
@@ -1264,7 +1267,9 @@ msgid "Interrupt error."
 msgstr "Erro de interrupção."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/ru.po b/locale/ru.po
index 75447bec23..82bf8504f9 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -133,6 +133,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -171,11 +172,11 @@ msgstr "Длинна %q должна быть <= %d"
 msgid "%q length must be >= %d"
 msgstr "Длинна %q должна быть >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q должно быть %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q должно быть %d-%d"
 
@@ -475,6 +476,7 @@ msgstr "Все каналы уже используются"
 msgid "All event channels in use"
 msgstr "Все каналы событий уже используются"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Все машины состояний уже используются"
@@ -483,6 +485,7 @@ msgstr "Все машины состояний уже используются"
 msgid "All sync event channels in use"
 msgstr "Все каналы событий синхронизации уже используются"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Все таймеры для этого пина уже используются"
@@ -1267,7 +1270,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/sv.po b/locale/sv.po
index 5cc3ecdf9c..909c8a624f 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -138,6 +138,7 @@ msgstr "%q i %q måste vara av typen %q, inte %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -176,11 +177,11 @@ msgstr "längden på %q måste vara <= %d"
 msgid "%q length must be >= %d"
 msgstr "längden på %q måste vara >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q måste vara %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q måste vara %d-%d"
 
@@ -482,6 +483,7 @@ msgstr "Alla kanaler används"
 msgid "All event channels in use"
 msgstr "Alla händelsekanaler används"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Alla tillståndsmaskiner används"
@@ -490,6 +492,7 @@ msgstr "Alla tillståndsmaskiner används"
 msgid "All sync event channels in use"
 msgstr "Alla händelsekanaler används"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Alla timers för denna pinne är i bruk"
@@ -1249,7 +1252,9 @@ msgid "Interrupt error."
 msgstr "Interrupt-fel."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/tr.po b/locale/tr.po
index 3a4b19ea1b..1bcf4b9cfb 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -134,6 +134,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -172,11 +173,11 @@ msgstr "%q boyutu <= %d olmalıdır"
 msgid "%q length must be >= %d"
 msgstr "%q boyutu >= %d olmalıdır"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q, %d olmalıdır"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q, %d-%d olmalıdır"
 
@@ -477,6 +478,7 @@ msgstr "Tüm kanallar kullanımda"
 msgid "All event channels in use"
 msgstr "Tüm olay kanalları kullanımda"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "Tüm durum makineleri kullanımda"
@@ -485,6 +487,7 @@ msgstr "Tüm durum makineleri kullanımda"
 msgid "All sync event channels in use"
 msgstr "Tüm asenkron olay kanalları kullanımda"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "Bu pin için tüm zamanlayıcılar kullanımda"
@@ -1240,7 +1243,9 @@ msgid "Interrupt error."
 msgstr ""
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 1ecf35326f..ec33771682 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -141,6 +141,7 @@ msgstr "%q zhōng de %q bì xū shì %q lèi xíng, ér bù shì %q"
 
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/microcontroller/Pin.c
@@ -179,11 +180,11 @@ msgstr "%q chángdù bìxū <= %d"
 msgid "%q length must be >= %d"
 msgstr "%q chángdù bìxū >= %d"
 
-#: py/argcheck.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 msgid "%q must be %d"
 msgstr "%q bìxū %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-bindings/displayio/Bitmap.c
 msgid "%q must be %d-%d"
 msgstr "%q bì xū wéi %d-%d"
 
@@ -484,6 +485,7 @@ msgstr "suǒyǒu píndào dōu zài shǐyòng zhōng"
 msgid "All event channels in use"
 msgstr "suǒyǒu shìjiàn píndào dōu zài shǐyòng zhōng"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "All state machines in use"
 msgstr "suǒyǒu zhuàngtàijī dōu zài shǐyòng zhōng"
@@ -492,6 +494,7 @@ msgstr "suǒyǒu zhuàngtàijī dōu zài shǐyòng zhōng"
 msgid "All sync event channels in use"
 msgstr "suǒyǒu tóngbù shìjiàn píndào dōu zài shǐyòng zhōng"
 
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All timers for this pin are in use"
 msgstr "cǐ yǐnjiǎo de suǒyǒu jìshíqì dōu zài shǐyòng zhōng"
@@ -1256,7 +1259,9 @@ msgid "Interrupt error."
 msgstr "zhōng duàn cuò wù."
 
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
-#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
+#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
+#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
+#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"

From afae39765f958953e6e3f595578d609cc16718c8 Mon Sep 17 00:00:00 2001
From: gamblor21 
Date: Thu, 20 Apr 2023 18:26:04 -0500
Subject: [PATCH 2265/2403] PR review fixups

---
 shared-bindings/gifio/OnDiskGif.c | 12 +++++------
 shared-module/gifio/OnDiskGif.c   | 36 ++++++++++++++++---------------
 shared-module/gifio/OnDiskGif.h   |  8 ++-----
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index cfed55d0c8..be8794f24c 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -126,18 +126,18 @@ STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    mp_obj_t arg = all_args[0];
-    if (mp_obj_is_str(arg)) {
-        arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb));
+    mp_obj_t filename = all_args[0];
+    if (mp_obj_is_str(filename)) {
+        filename = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), filename, MP_ROM_QSTR(MP_QSTR_rb));
     }
 
-    if (!mp_obj_is_type(arg, &mp_type_fileio)) {
+    if (!mp_obj_is_type(filename, &mp_type_fileio)) {
         mp_raise_TypeError(translate("file must be a file opened in byte mode"));
     }
 
     gifio_ondiskgif_t *self = m_new_obj(gifio_ondiskgif_t);
     self->base.type = &gifio_ondiskgif_type;
-    common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg), args[ARG_use_palette].u_bool);
+    common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(filename), args[ARG_use_palette].u_bool);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -207,7 +207,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
     (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
 
 //|     palette: displayio.Palette
-//|     """The palette for the current frame."""
+//|     """The palette for the current frame if it exists."""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c
index f6adfa0775..c1e6d1f2c2 100644
--- a/shared-module/gifio/OnDiskGif.c
+++ b/shared-module/gifio/OnDiskGif.c
@@ -68,9 +68,9 @@ static void GIFDraw(GIFDRAW *pDraw) {
     // The palette is either RGB565 or the original 24-bit RGB values
     // depending on the pixel type selected with gif.begin()
 
-    gifio_ondiskgif_displayio_objs_t *displayio_objs = (gifio_ondiskgif_displayio_objs_t *)pDraw->pUser;
-    displayio_bitmap_t *bitmap = displayio_objs->bitmap;
-    displayio_palette_t *palette = displayio_objs->palette;
+    gifio_ondiskgif_t *ondiskgif = (gifio_ondiskgif_t *)pDraw->pUser;
+    displayio_bitmap_t *bitmap = ondiskgif->bitmap;
+    displayio_palette_t *palette = ondiskgif->palette;
 
     // Update the palette if we have one in RGB888
     if (palette != NULL) {
@@ -174,20 +174,19 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
 
     int bpp = 16;
     if (use_palette == true) {
-        mp_printf(&mp_plat_print, "Using palette\n");
         displayio_palette_t *palette = m_new_obj(displayio_palette_t);
         palette->base.type = &displayio_palette_type;
         common_hal_displayio_palette_construct(palette, 256, false);
-        self->displayio_objs.palette = palette;
+        self->palette = palette;
         bpp = 8;
     } else {
-        self->displayio_objs.palette = NULL;
+        self->palette = NULL;
     }
 
     displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
     bitmap->base.type = &displayio_bitmap_type;
     common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, bpp);
-    self->displayio_objs.bitmap = bitmap;
+    self->bitmap = bitmap;
 
     GIFINFO info;
     GIF_getInfo(&self->gif, &info);
@@ -199,13 +198,13 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_
 
 void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) {
     self->file = NULL;
-    common_hal_displayio_bitmap_deinit(self->displayio_objs.bitmap);
-    self->displayio_objs.bitmap = NULL;
-    self->displayio_objs.palette = NULL;
+    common_hal_displayio_bitmap_deinit(self->bitmap);
+    self->bitmap = NULL;
+    self->palette = NULL;
 }
 
 bool common_hal_gifio_ondiskgif_deinited(gifio_ondiskgif_t *self) {
-    return self->displayio_objs.bitmap == NULL;
+    return self->bitmap == NULL;
 }
 
 uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self) {
@@ -217,11 +216,14 @@ uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self) {
 }
 
 mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self) {
-    return MP_OBJ_FROM_PTR(self->displayio_objs.bitmap);
+    return MP_OBJ_FROM_PTR(self->bitmap);
 }
 
 mp_obj_t common_hal_gifio_ondiskgif_get_palette(gifio_ondiskgif_t *self) {
-    return MP_OBJ_FROM_PTR(self->displayio_objs.palette);
+    if (self->palette == NULL) {
+        return mp_const_none;
+    }
+    return MP_OBJ_FROM_PTR(self->palette);
 }
 
 int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self) {
@@ -243,17 +245,17 @@ int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) {
 uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) {
     int nextDelay = 0;
     int result = 0;
-    result = GIF_playFrame(&self->gif, &nextDelay, &self->displayio_objs);
+    result = GIF_playFrame(&self->gif, &nextDelay, self);
 
     if ((result >= 0) && (setDirty)) {
         displayio_area_t dirty_area = {
             .x1 = 0,
             .y1 = 0,
-            .x2 = self->displayio_objs.bitmap->width,
-            .y2 = self->displayio_objs.bitmap->height,
+            .x2 = self->bitmap->width,
+            .y2 = self->bitmap->height,
         };
 
-        displayio_bitmap_set_dirty_area(self->displayio_objs.bitmap, &dirty_area);
+        displayio_bitmap_set_dirty_area(self->bitmap, &dirty_area);
     }
 
     return nextDelay;
diff --git a/shared-module/gifio/OnDiskGif.h b/shared-module/gifio/OnDiskGif.h
index 70479ac8d9..6138337391 100644
--- a/shared-module/gifio/OnDiskGif.h
+++ b/shared-module/gifio/OnDiskGif.h
@@ -38,16 +38,12 @@
 
 #include "extmod/vfs_fat.h"
 
-typedef struct {
-    displayio_bitmap_t *bitmap;
-    displayio_palette_t *palette;
-} gifio_ondiskgif_displayio_objs_t;
-
 typedef struct {
     mp_obj_base_t base;
     GIFIMAGE gif;
     pyb_file_obj_t *file;
-    gifio_ondiskgif_displayio_objs_t displayio_objs;
+    displayio_bitmap_t *bitmap;
+    displayio_palette_t *palette;
     int32_t duration;
     int32_t frame_count;
     int32_t min_delay;

From b3c8575b81ef78c5df9af265d7270056b00d9459 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Thu, 20 Apr 2023 21:22:39 -0400
Subject: [PATCH 2266/2403] Update for Pimoroni Pico dv pins/connectors

---
 .../boards/pimoroni_pico_dv/board.c           | 52 +++++++++++
 .../boards/pimoroni_pico_dv/mpconfigboard.h   |  7 ++
 .../boards/pimoroni_pico_dv/mpconfigboard.mk  | 12 +++
 .../pimoroni_pico_dv/pico-sdk-configboard.h   |  4 +
 .../boards/pimoroni_pico_dv/pins.c            | 92 +++++++++++++++++++
 5 files changed, 167 insertions(+)
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv/board.c
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv/pins.c

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/board.c b/ports/raspberrypi/boards/pimoroni_pico_dv/board.c
new file mode 100644
index 0000000000..bc5878bf24
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/board.c
@@ -0,0 +1,52 @@
+/*
+ * 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 "supervisor/board.h"
+
+#include "bindings/picodvi/Framebuffer.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-bindings/framebufferio/FramebufferDisplay.h"
+
+void board_init(void) {
+    picodvi_framebuffer_obj_t *fb = &allocate_display_bus()->picodvi;
+    fb->base.type = &picodvi_framebuffer_type;
+    common_hal_picodvi_framebuffer_construct(fb, 640, 480,
+        &pin_GPIO7, &pin_GPIO6,
+        &pin_GPIO9, &pin_GPIO8,
+        &pin_GPIO11, &pin_GPIO10,
+        &pin_GPIO13, &pin_GPIO12,
+        8);
+
+    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    display->base.type = &framebufferio_framebufferdisplay_type;
+    common_hal_framebufferio_framebufferdisplay_construct(
+        display,
+        MP_OBJ_FROM_PTR(fb),
+        0,
+        true);
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h
new file mode 100644
index 0000000000..bf18491e47
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h
@@ -0,0 +1,7 @@
+#define MICROPY_HW_BOARD_NAME "Pimoroni Pico DV"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO25)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
new file mode 100644
index 0000000000..20607d50e4
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
@@ -0,0 +1,12 @@
+USB_VID = 0x239A
+USB_PID = 0x80F4
+USB_PRODUCT = "Pico"
+USB_MANUFACTURER = "Raspberry Pi"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv/pins.c
new file mode 100644
index 0000000000..c331d5cbf9
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/pins.c
@@ -0,0 +1,92 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX),  MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_RX),  MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_C), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    // SD Card
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO5)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO18)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO19)},
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO22)},
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_OUT), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+
+    // DVI VIDEO
+    { MP_ROM_QSTR(MP_QSTR_DV_CEC), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_DV_SCL), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_DV_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D0N), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D0P), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D1N), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D1P), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D2N), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D2P), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_DV_HPD), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].framebuffer_display)},
+
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From ae7303221d687150c506c4c39f0b8f787064d7a3 Mon Sep 17 00:00:00 2001
From: Mark <56205165+gamblor21@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:21:29 -0500
Subject: [PATCH 2267/2403] Update doc that Palette may not always be there

Co-authored-by: Scott Shawcroft 
---
 shared-bindings/gifio/OnDiskGif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c
index be8794f24c..e4335f9e44 100644
--- a/shared-bindings/gifio/OnDiskGif.c
+++ b/shared-bindings/gifio/OnDiskGif.c
@@ -206,7 +206,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_get_bitmap_obj, gifio_ondiskgif_obj_ge
 MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj,
     (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj);
 
-//|     palette: displayio.Palette
+//|     palette: Optional[displayio.Palette]
 //|     """The palette for the current frame if it exists."""
 STATIC mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) {
     gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in);

From 7089ea4d6586821f03c062e21ccdc8c4dfab9422 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 20 Apr 2023 16:15:06 -0700
Subject: [PATCH 2268/2403] Add address_little_endian for displayio

Add address_little_endian for epaper displays with little endian
(low byte first) addresses.

Also clears allocated display and display bus memory so it has a
known state. The acep member wasn't always set so it varied
accidentally.

Fixes #7560. May fix #7778. Fixes #5119.
---
 shared-bindings/displayio/EPaperDisplay.c     |  10 +-
 shared-bindings/displayio/EPaperDisplay.h     |  14 +-
 shared-module/_stage/__init__.c               |   5 +-
 shared-module/board/__init__.c                |   8 +-
 shared-module/displayio/Display.c             |  12 +-
 shared-module/displayio/EPaperDisplay.c       |  26 ++--
 shared-module/displayio/EPaperDisplay.h       |   4 -
 shared-module/displayio/TileGrid.c            |   1 -
 shared-module/displayio/__init__.c            | 139 ++++++++++--------
 shared-module/displayio/__init__.h            |   8 +-
 shared-module/displayio/display_core.c        |  50 +++++--
 shared-module/displayio/display_core.h        |  20 ++-
 .../framebufferio/FramebufferDisplay.c        |   5 +-
 supervisor/shared/display.c                   |   8 +-
 14 files changed, 181 insertions(+), 129 deletions(-)

diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 93d91110a2..42f58ac0c5 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -80,7 +80,8 @@
 //|         grayscale: bool = False,
 //|         advanced_color_epaper: bool = False,
 //|         two_byte_sequence_length: bool = False,
-//|         start_up_time: float = 0
+//|         start_up_time: float = 0,
+//|         address_little_endian: bool = False
 //|     ) -> None:
 //|         """Create a EPaperDisplay object on the given display bus (`displayio.FourWire` or `paralleldisplay.ParallelBus`).
 //|
@@ -122,6 +123,7 @@
 //|         :param bool advanced_color_epaper: When true, the display is a 7-color advanced color epaper (ACeP)
 //|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length
 //|         :param float start_up_time: Time to wait after reset before sending commands
+//|         :param bool address_little_endian: Send the least significant byte (not bit) of multi-byte addresses first. Ignored when ram is addressed with one byte
 //|         """
 //|         ...
 STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -132,7 +134,7 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
            ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color,
            ARG_refresh_display_command,  ARG_refresh_time, ARG_busy_pin, ARG_busy_state,
            ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper,
-           ARG_two_byte_sequence_length, ARG_start_up_time };
+           ARG_two_byte_sequence_length, ARG_start_up_time, ARG_address_little_endian };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_start_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -163,6 +165,7 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
         { MP_QSTR_advanced_color_epaper, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_two_byte_sequence_length, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_start_up_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)} },
+        { MP_QSTR_address_little_endian, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -228,7 +231,8 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
         args[ARG_write_black_ram_command].u_int, args[ARG_black_bits_inverted].u_bool, write_color_ram_command,
         args[ARG_color_bits_inverted].u_bool, highlight_color, refresh_buf, refresh_buf_len, refresh_time,
         busy_pin, args[ARG_busy_state].u_bool, seconds_per_frame,
-        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool, two_byte_sequence_length
+        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool,
+        two_byte_sequence_length, args[ARG_address_little_endian].u_bool
         );
 
     return self;
diff --git a/shared-bindings/displayio/EPaperDisplay.h b/shared-bindings/displayio/EPaperDisplay.h
index 1ef2ed4b4b..bdaad61300 100644
--- a/shared-bindings/displayio/EPaperDisplay.h
+++ b/shared-bindings/displayio/EPaperDisplay.h
@@ -37,12 +37,18 @@ extern const mp_obj_type_t displayio_epaperdisplay_type;
 #define NO_COMMAND 0x100
 
 void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t *self,
-    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, mp_float_t start_up_time, const uint8_t *stop_sequence, uint16_t stop_sequence_len,
-    uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
+    mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, mp_float_t start_up_time,
+    const uint8_t *stop_sequence, uint16_t stop_sequence_len,
+    uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height,
+    int16_t colstart, int16_t rowstart, uint16_t rotation,
     uint16_t set_column_window_command, uint16_t set_row_window_command,
     uint16_t set_current_column_command, uint16_t set_current_row_command,
-    uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
-    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool always_toggle_chip_select, bool grayscale, bool acep, bool two_byte_sequence_length);
+    uint16_t write_black_ram_command, bool black_bits_inverted,
+    uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
+    const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
+    const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
+    bool always_toggle_chip_select, bool grayscale, bool acep, bool two_byte_sequence_length,
+    bool address_little_endian);
 
 bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *self);
 
diff --git a/shared-module/_stage/__init__.c b/shared-module/_stage/__init__.c
index 7ec640bc6e..0a18635562 100644
--- a/shared-module/_stage/__init__.c
+++ b/shared-module/_stage/__init__.c
@@ -46,10 +46,7 @@ void render_stage(
     area.y1 = y0 * scale;
     area.x2 = x1 * scale;
     area.y2 = y1 * scale;
-    displayio_display_core_set_region_to_update(
-        &display->core, display->set_column_command, display->set_row_command,
-        NO_COMMAND, NO_COMMAND, display->data_as_commands, false, &area,
-        display->SH1107_addressing);
+    displayio_display_core_set_region_to_update(&display->core, &area);
 
     while (!displayio_display_core_begin_transaction(&display->core)) {
         RUN_BACKGROUND_TASKS;
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
index 5d08c368b5..2d5a8a07e4 100644
--- a/shared-module/board/__init__.c
+++ b/shared-module/board/__init__.c
@@ -190,7 +190,7 @@ void reset_board_buses(void) {
         bool display_using_i2c = false;
         #if CIRCUITPY_DISPLAYIO
         for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-            if (displays[i].bus_base.type == &displayio_i2cdisplay_type && displays[i].i2cdisplay_bus.bus == &i2c_obj[instance]) {
+            if (display_buses[i].bus_base.type == &displayio_i2cdisplay_type && display_buses[i].i2cdisplay_bus.bus == &i2c_obj[instance]) {
                 display_using_i2c = true;
                 break;
             }
@@ -211,13 +211,13 @@ void reset_board_buses(void) {
         bool display_using_spi = false;
         #if CIRCUITPY_DISPLAYIO
         for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-            mp_const_obj_t bus_type = displays[i].bus_base.type;
-            if (bus_type == &displayio_fourwire_type && displays[i].fourwire_bus.bus == &spi_obj[instance]) {
+            mp_const_obj_t bus_type = display_buses[i].bus_base.type;
+            if (bus_type == &displayio_fourwire_type && display_buses[i].fourwire_bus.bus == &spi_obj[instance]) {
                 display_using_spi = true;
                 break;
             }
             #if CIRCUITPY_SHARPDISPLAY
-            if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type && displays[i].sharpdisplay.bus == &spi_obj[instance]) {
+            if (bus_type == &sharpdisplay_framebuffer_type && display_buses[i].sharpdisplay.bus == &spi_obj[instance]) {
                 display_using_spi = true;
                 break;
             }
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 01d8c544ad..6d4acbe8c0 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -64,16 +64,14 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
         ram_height = 0xff;
     }
     displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation,
-        color_depth, grayscale, pixels_in_byte_share_row, bytes_per_cell, reverse_pixels_in_byte, reverse_bytes_in_word);
+        color_depth, grayscale, pixels_in_byte_share_row, bytes_per_cell, reverse_pixels_in_byte, reverse_bytes_in_word,
+        set_column_command, set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false /* always_toggle_chip_select */,
+        SH1107_addressing && color_depth == 1, false /*address_little_endian */);
 
-    self->set_column_command = set_column_command;
-    self->set_row_command = set_row_command;
     self->write_ram_command = write_ram_command;
     self->brightness_command = brightness_command;
     self->first_manual_refresh = !auto_refresh;
-    self->data_as_commands = data_as_commands;
     self->backlight_on_high = backlight_on_high;
-    self->SH1107_addressing = SH1107_addressing && color_depth == 1;
 
     self->native_frames_per_second = native_frames_per_second;
     self->native_ms_per_frame = 1000 / native_frames_per_second;
@@ -294,9 +292,7 @@ STATIC bool _refresh_area(displayio_display_obj_t *self, const displayio_area_t
         }
         remaining_rows -= rows_per_buffer;
 
-        displayio_display_core_set_region_to_update(&self->core, self->set_column_command,
-            self->set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false,
-            &subrectangle, self->SH1107_addressing);
+        displayio_display_core_set_region_to_update(&self->core, &subrectangle);
 
         uint16_t subrectangle_size_bytes;
         if (self->core.colorspace.depth >= 8) {
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 74f828aea8..2f6c8fa5c9 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -58,28 +58,30 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
     uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
     const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
     const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
-    bool chip_select, bool grayscale, bool acep, bool two_byte_sequence_length) {
+    bool chip_select, bool grayscale, bool acep, bool two_byte_sequence_length, bool address_little_endian) {
     uint16_t color_depth = 1;
     bool core_grayscale = true;
     if (highlight_color != 0x000000) {
         self->core.colorspace.tricolor = true;
         self->core.colorspace.tricolor_hue = displayio_colorconverter_compute_hue(highlight_color);
         self->core.colorspace.tricolor_luma = displayio_colorconverter_compute_luma(highlight_color);
+    } else {
+        self->core.colorspace.tricolor = false;
     }
+    self->acep = acep;
+    self->core.colorspace.sevencolor = acep;
     if (acep) {
-        self->core.colorspace.sevencolor = true;
         color_depth = 4; // bits. 7 colors + clean
-        self->acep = acep;
         grayscale = false;
         core_grayscale = false;
     }
 
-    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation, color_depth, core_grayscale, true, 1, true, true);
+    displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height,
+        colstart, rowstart, rotation, color_depth, core_grayscale, true, 1, true, true,
+        set_column_window_command, set_row_window_command, set_current_column_command, set_current_row_command,
+        false /* data_as_commands */, chip_select,
+        false /* SH1107_addressing */, address_little_endian);
 
-    self->set_column_window_command = set_column_window_command;
-    self->set_row_window_command = set_row_window_command;
-    self->set_current_column_command = set_current_column_command;
-    self->set_current_row_command = set_current_row_command;
     self->write_black_ram_command = write_black_ram_command;
     self->black_bits_inverted = black_bits_inverted;
     self->write_color_ram_command = write_color_ram_command;
@@ -137,7 +139,7 @@ STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(display
     if (self->core.current_group != NULL) {
         first_area = displayio_group_get_refresh_areas(self->core.current_group, NULL);
     }
-    if (first_area != NULL && self->set_row_window_command == NO_COMMAND) {
+    if (first_area != NULL) {
         self->core.area.next = NULL;
         return &self->core.area;
     }
@@ -310,10 +312,8 @@ STATIC bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t *
     for (uint8_t pass = 0; pass < passes; pass++) {
         uint16_t remaining_rows = displayio_area_height(&clipped);
 
-        if (self->set_row_window_command != NO_COMMAND) {
-            displayio_display_core_set_region_to_update(&self->core, self->set_column_window_command,
-                self->set_row_window_command, self->set_current_column_command, self->set_current_row_command,
-                false, self->chip_select, &clipped, false /* SH1107_addressing */);
+        if (self->core.row_command != NO_COMMAND) {
+            displayio_display_core_set_region_to_update(&self->core, &clipped);
         }
 
         uint8_t write_command = self->write_black_ram_command;
diff --git a/shared-module/displayio/EPaperDisplay.h b/shared-module/displayio/EPaperDisplay.h
index f2398398ea..13cf84dbd3 100644
--- a/shared-module/displayio/EPaperDisplay.h
+++ b/shared-module/displayio/EPaperDisplay.h
@@ -46,10 +46,6 @@ typedef struct {
     uint16_t refresh_sequence_len;
     uint16_t start_up_time_ms;
     uint16_t refresh_time;
-    uint16_t set_column_window_command;
-    uint16_t set_row_window_command;
-    uint16_t set_current_column_command;
-    uint16_t set_current_row_command;
     uint16_t write_black_ram_command;
     uint16_t write_color_ram_command;
     uint8_t hue;
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index e5573ac34c..723aa41682 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -543,7 +543,6 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self,
                     ((uint8_t *)buffer)[offset / pixels_per_byte] |= output_pixel.pixel << shift;
                 }
             }
-            (void)input_pixel;
         }
     }
     return full_coverage;
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 2dd0cff8b8..c47b19caea 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -48,6 +48,7 @@
 #include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
 #endif
 
+primary_display_bus_t display_buses[CIRCUITPY_DISPLAY_LIMIT];
 primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
 displayio_buffer_transform_t null_transform = {
@@ -87,19 +88,19 @@ void displayio_background(void) {
         return;
     }
 
-
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        if (displays[i].display.base.type == NULL || displays[i].display.base.type == &mp_type_NoneType) {
+        mp_const_obj_t display_type = displays[i].display.base.type;
+        if (display_type == NULL || display_type == &mp_type_NoneType) {
             // Skip null display.
             continue;
         }
-        if (displays[i].display.base.type == &displayio_display_type) {
+        if (display_type == &displayio_display_type) {
             displayio_display_background(&displays[i].display);
         #if CIRCUITPY_FRAMEBUFFERIO
-        } else if (displays[i].framebuffer_display.base.type == &framebufferio_framebufferdisplay_type) {
+        } else if (display_type == &framebufferio_framebufferdisplay_type) {
             framebufferio_framebufferdisplay_background(&displays[i].framebuffer_display);
         #endif
-        } else if (displays[i].epaper_display.base.type == &displayio_epaperdisplay_type) {
+        } else if (display_type == &displayio_epaperdisplay_type) {
             displayio_epaperdisplay_background(&displays[i].epaper_display);
         }
     }
@@ -110,7 +111,7 @@ void common_hal_displayio_release_displays(void) {
     // Release displays before busses so that they can send any final commands to turn the display
     // off properly.
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        mp_const_obj_t display_type = displays[i].display.base.type;
+        mp_const_obj_t display_type = displays[i].display_base.type;
         if (display_type == NULL || display_type == &mp_type_NoneType) {
             continue;
         } else if (display_type == &displayio_display_type) {
@@ -125,39 +126,39 @@ void common_hal_displayio_release_displays(void) {
         displays[i].display.base.type = &mp_type_NoneType;
     }
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        mp_const_obj_t bus_type = displays[i].fourwire_bus.base.type;
+        mp_const_obj_t bus_type = display_buses[i].bus_base.type;
         if (bus_type == NULL || bus_type == &mp_type_NoneType) {
             continue;
         } else if (bus_type == &displayio_fourwire_type) {
-            common_hal_displayio_fourwire_deinit(&displays[i].fourwire_bus);
+            common_hal_displayio_fourwire_deinit(&display_buses[i].fourwire_bus);
         } else if (bus_type == &displayio_i2cdisplay_type) {
-            common_hal_displayio_i2cdisplay_deinit(&displays[i].i2cdisplay_bus);
+            common_hal_displayio_i2cdisplay_deinit(&display_buses[i].i2cdisplay_bus);
         #if CIRCUITPY_PARALLELDISPLAY
         } else if (bus_type == ¶lleldisplay_parallelbus_type) {
-            common_hal_paralleldisplay_parallelbus_deinit(&displays[i].parallel_bus);
+            common_hal_paralleldisplay_parallelbus_deinit(&display_buses[i].parallel_bus);
         #endif
         #if CIRCUITPY_RGBMATRIX
         } else if (bus_type == &rgbmatrix_RGBMatrix_type) {
-            common_hal_rgbmatrix_rgbmatrix_deinit(&displays[i].rgbmatrix);
+            common_hal_rgbmatrix_rgbmatrix_deinit(&display_buses[i].rgbmatrix);
         #endif
         #if CIRCUITPY_IS31FL3741
         } else if (bus_type == &is31fl3741_FrameBuffer_type) {
-            common_hal_is31fl3741_FrameBuffer_deinit(&displays[i].is31fl3741);
+            common_hal_is31fl3741_FrameBuffer_deinit(&display_buses[i].is31fl3741);
         #endif
         #if CIRCUITPY_SHARPDISPLAY
-        } else if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type) {
-            common_hal_sharpdisplay_framebuffer_deinit(&displays[i].sharpdisplay);
+        } else if (bus_type == &sharpdisplay_framebuffer_type) {
+            common_hal_sharpdisplay_framebuffer_deinit(&display_buses[i].sharpdisplay);
         #endif
         #if CIRCUITPY_VIDEOCORE
-        } else if (displays[i].bus_base.type == &videocore_framebuffer_type) {
-            common_hal_videocore_framebuffer_deinit(&displays[i].videocore);
+        } else if (bus_type == &videocore_framebuffer_type) {
+            common_hal_videocore_framebuffer_deinit(&display_buses[i].videocore);
         #endif
         #if CIRCUITPY_PICODVI
         } else if (displays[i].bus_base.type == &picodvi_framebuffer_type) {
             common_hal_picodvi_framebuffer_deinit(&displays[i].picodvi);
         #endif
         }
-        displays[i].fourwire_bus.base.type = &mp_type_NoneType;
+        display_buses[i].bus_base.type = &mp_type_NoneType;
     }
 
     supervisor_stop_terminal();
@@ -166,10 +167,11 @@ void common_hal_displayio_release_displays(void) {
 void reset_displays(void) {
     // The SPI buses used by FourWires may be allocated on the heap so we need to move them inline.
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        if (displays[i].fourwire_bus.base.type == &displayio_fourwire_type) {
-            displayio_fourwire_obj_t *fourwire = &displays[i].fourwire_bus;
-            if (((size_t)fourwire->bus) < ((size_t)&displays) ||
-                ((size_t)fourwire->bus) > ((size_t)&displays + CIRCUITPY_DISPLAY_LIMIT)) {
+        mp_const_obj_t display_bus_type = display_buses[i].bus_base.type;
+        if (display_bus_type == &displayio_fourwire_type) {
+            displayio_fourwire_obj_t *fourwire = &display_buses[i].fourwire_bus;
+            if (((size_t)fourwire->bus) < ((size_t)&display_buses) ||
+                ((size_t)fourwire->bus) > ((size_t)&display_buses + CIRCUITPY_DISPLAY_LIMIT * sizeof(primary_display_bus_t))) {
                 busio_spi_obj_t *original_spi = fourwire->bus;
                 #if CIRCUITPY_BOARD_SPI
                 // We don't need to move original_spi if it is a board.SPI object because it is
@@ -186,18 +188,19 @@ void reset_displays(void) {
                 #endif
                 memcpy(&fourwire->inline_bus, original_spi, sizeof(busio_spi_obj_t));
                 fourwire->bus = &fourwire->inline_bus;
-                // Check for other displays that use the same spi bus and swap them too.
+                // Check for other display buses that use the same spi bus and swap them too.
                 for (uint8_t j = i + 1; j < CIRCUITPY_DISPLAY_LIMIT; j++) {
-                    if (displays[i].fourwire_bus.base.type == &displayio_fourwire_type &&
-                        displays[i].fourwire_bus.bus == original_spi) {
-                        displays[i].fourwire_bus.bus = &fourwire->inline_bus;
+                    if (display_buses[j].fourwire_bus.base.type == &displayio_fourwire_type &&
+                        display_buses[j].fourwire_bus.bus == original_spi) {
+                        display_buses[j].fourwire_bus.bus = &fourwire->inline_bus;
                     }
                 }
             }
-        } else if (displays[i].i2cdisplay_bus.base.type == &displayio_i2cdisplay_type) {
-            displayio_i2cdisplay_obj_t *i2c = &displays[i].i2cdisplay_bus;
-            if (((size_t)i2c->bus) < ((size_t)&displays) ||
-                ((size_t)i2c->bus) > ((size_t)&displays + CIRCUITPY_DISPLAY_LIMIT)) {
+        } else if (display_bus_type == &displayio_i2cdisplay_type) {
+            displayio_i2cdisplay_obj_t *i2c = &display_buses[i].i2cdisplay_bus;
+            // Check to see if we need to inline the I2C bus.
+            if (((size_t)i2c->bus) < ((size_t)&display_buses) ||
+                ((size_t)i2c->bus) > ((size_t)&display_buses + CIRCUITPY_DISPLAY_LIMIT * sizeof(primary_display_bus_t))) {
                 busio_i2c_obj_t *original_i2c = i2c->bus;
                 #if CIRCUITPY_BOARD_I2C
                 // We don't need to move original_i2c if it is a board.I2C object because it is
@@ -211,15 +214,15 @@ void reset_displays(void) {
                 i2c->bus = &i2c->inline_bus;
                 // Check for other displays that use the same i2c bus and swap them too.
                 for (uint8_t j = i + 1; j < CIRCUITPY_DISPLAY_LIMIT; j++) {
-                    if (displays[i].i2cdisplay_bus.base.type == &displayio_i2cdisplay_type &&
-                        displays[i].i2cdisplay_bus.bus == original_i2c) {
-                        displays[i].i2cdisplay_bus.bus = &i2c->inline_bus;
+                    if (display_buses[j].i2cdisplay_bus.base.type == &displayio_i2cdisplay_type &&
+                        display_buses[j].i2cdisplay_bus.bus == original_i2c) {
+                        display_buses[j].i2cdisplay_bus.bus = &i2c->inline_bus;
                     }
                 }
             }
         #if CIRCUITPY_RGBMATRIX
-        } else if (displays[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
-            rgbmatrix_rgbmatrix_obj_t *pm = &displays[i].rgbmatrix;
+        } else if (display_bus_type == &rgbmatrix_RGBMatrix_type) {
+            rgbmatrix_rgbmatrix_obj_t *pm = &display_buses[i].rgbmatrix;
             if (!any_display_uses_this_framebuffer(&pm->base)) {
                 common_hal_rgbmatrix_rgbmatrix_deinit(pm);
             } else {
@@ -227,11 +230,11 @@ void reset_displays(void) {
             }
         #endif
         #if CIRCUITPY_IS31FL3741
-        } else if (displays[i].is31fl3741.base.type == &is31fl3741_FrameBuffer_type) {
-            is31fl3741_FrameBuffer_obj_t *is31fb = &displays[i].is31fl3741;
+        } else if (display_bus_type == &is31fl3741_FrameBuffer_type) {
+            is31fl3741_FrameBuffer_obj_t *is31fb = &display_buses[i].is31fl3741;
 
-            if (((uint32_t)is31fb->is31fl3741->i2c) < ((uint32_t)&displays) ||
-                ((uint32_t)is31fb->is31fl3741->i2c) > ((uint32_t)&displays + CIRCUITPY_DISPLAY_LIMIT)) {
+            if (((uint32_t)is31fb->is31fl3741->i2c) < ((uint32_t)&display_buses) ||
+                ((uint32_t)is31fb->is31fl3741->i2c) > ((uint32_t)&display_buses + CIRCUITPY_DISPLAY_LIMIT)) {
                 #if CIRCUITPY_BOARD_I2C
                 // We don't need to move original_i2c if it is the board.I2C object because it is
                 // statically allocated already. (Doing so would also make it impossible to reference in
@@ -257,13 +260,13 @@ void reset_displays(void) {
             }
         #endif
         #if CIRCUITPY_SHARPDISPLAY
-        } else if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type) {
-            sharpdisplay_framebuffer_obj_t *sharp = &displays[i].sharpdisplay;
+        } else if (display_bus_type == &sharpdisplay_framebuffer_type) {
+            sharpdisplay_framebuffer_obj_t *sharp = &display_buses[i].sharpdisplay;
             common_hal_sharpdisplay_framebuffer_reset(sharp);
         #endif
         #if CIRCUITPY_VIDEOCORE
-        } else if (displays[i].bus_base.type == &videocore_framebuffer_type) {
-            videocore_framebuffer_obj_t *vc = &displays[i].videocore;
+        } else if (display_bus_type == &videocore_framebuffer_type) {
+            videocore_framebuffer_obj_t *vc = &display_buses[i].videocore;
             if (!any_display_uses_this_framebuffer(&vc->base)) {
                 common_hal_videocore_framebuffer_deinit(vc);
             }
@@ -286,13 +289,14 @@ void reset_displays(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         // Reset the displayed group. Only the first will get the terminal but
         // that's ok.
-        if (displays[i].display.base.type == &displayio_display_type) {
+        mp_const_obj_t display_type = displays[i].display_base.type;
+        if (display_type == &displayio_display_type) {
             reset_display(&displays[i].display);
-        } else if (displays[i].epaper_display.base.type == &displayio_epaperdisplay_type) {
+        } else if (display_type == &displayio_epaperdisplay_type) {
             displayio_epaperdisplay_obj_t *display = &displays[i].epaper_display;
             common_hal_displayio_epaperdisplay_show(display, NULL);
         #if CIRCUITPY_FRAMEBUFFERIO
-        } else if (displays[i].framebuffer_display.base.type == &framebufferio_framebufferdisplay_type) {
+        } else if (display_type == &framebufferio_framebufferdisplay_type) {
             framebufferio_framebufferdisplay_reset(&displays[i].framebuffer_display);
         #endif
         }
@@ -301,35 +305,42 @@ void reset_displays(void) {
 
 void displayio_gc_collect(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        mp_const_obj_t display_bus_type = display_buses[i].bus_base.type;
+        if (display_bus_type == NULL || display_bus_type == &mp_type_NoneType) {
+            continue;
+        }
         #if CIRCUITPY_RGBMATRIX
-        if (displays[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
-            rgbmatrix_rgbmatrix_collect_ptrs(&displays[i].rgbmatrix);
+        if (display_bus_type == &rgbmatrix_RGBMatrix_type) {
+            rgbmatrix_rgbmatrix_collect_ptrs(&display_buses[i].rgbmatrix);
         }
         #endif
         #if CIRCUITPY_IS31FL3741
-        if (displays[i].is31fl3741.base.type == &is31fl3741_FrameBuffer_type) {
-            is31fl3741_FrameBuffer_collect_ptrs(&displays[i].is31fl3741);
+        if (display_bus_type == &is31fl3741_FrameBuffer_type) {
+            is31fl3741_FrameBuffer_collect_ptrs(&display_buses[i].is31fl3741);
         }
         #endif
         #if CIRCUITPY_SHARPDISPLAY
-        if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type) {
-            common_hal_sharpdisplay_framebuffer_collect_ptrs(&displays[i].sharpdisplay);
+        if (display_bus_type == &sharpdisplay_framebuffer_type) {
+            common_hal_sharpdisplay_framebuffer_collect_ptrs(&display_buses[i].sharpdisplay);
         }
         #endif
+    }
 
-        if (displays[i].display.base.type == NULL) {
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        mp_const_obj_t display_type = displays[i].display_base.type;
+        if (display_type == NULL || display_type == &mp_type_NoneType) {
             continue;
         }
 
         // Alternatively, we could use gc_collect_root over the whole object,
         // but this is more precise, and is the only field that needs marking.
-        if (displays[i].display.base.type == &displayio_display_type) {
+        if (display_type == &displayio_display_type) {
             displayio_display_collect_ptrs(&displays[i].display);
         #if CIRCUITPY_FRAMEBUFFERIO
-        } else if (displays[i].framebuffer_display.base.type == &framebufferio_framebufferdisplay_type) {
+        } else if (display_type == &framebufferio_framebufferdisplay_type) {
             framebufferio_framebufferdisplay_collect_ptrs(&displays[i].framebuffer_display);
         #endif
-        } else if (displays[i].epaper_display.base.type == &displayio_epaperdisplay_type) {
+        } else if (display_type == &displayio_epaperdisplay_type) {
             displayio_epaperdisplay_collect_ptrs(&displays[i].epaper_display);
         }
     }
@@ -339,6 +350,10 @@ primary_display_t *allocate_display(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         mp_const_obj_t display_type = displays[i].display.base.type;
         if (display_type == NULL || display_type == &mp_type_NoneType) {
+            // Clear this memory so it is in a known state before init.
+            memset(&displays[i], 0, sizeof(displays[i]));
+            // Default to None so that it works as board.DISPLAY.
+            displays[i].display_base.type = &mp_type_NoneType;
             return &displays[i];
         }
     }
@@ -352,18 +367,22 @@ primary_display_t *allocate_display_or_raise(void) {
     }
     mp_raise_RuntimeError(translate("Too many displays"));
 }
-primary_display_t *allocate_display_bus(void) {
+
+primary_display_bus_t *allocate_display_bus(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        mp_const_obj_t display_bus_type = displays[i].bus_base.type;
+        mp_const_obj_t display_bus_type = display_buses[i].bus_base.type;
         if (display_bus_type == NULL || display_bus_type == &mp_type_NoneType) {
-            return &displays[i];
+            // Clear this memory so it is in a known state before init.
+            memset(&display_buses[i], 0, sizeof(display_buses[i]));
+            display_buses[i].bus_base.type = &mp_type_NoneType;
+            return &display_buses[i];
         }
     }
     return NULL;
 }
 
-primary_display_t *allocate_display_bus_or_raise(void) {
-    primary_display_t *result = allocate_display_bus();
+primary_display_bus_t *allocate_display_bus_or_raise(void) {
+    primary_display_bus_t *result = allocate_display_bus();
     if (result) {
         return result;
     }
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h
index b450cb711d..1add0133b6 100644
--- a/shared-module/displayio/__init__.h
+++ b/shared-module/displayio/__init__.h
@@ -79,6 +79,9 @@ typedef struct {
         picodvi_framebuffer_obj_t picodvi;
         #endif
     };
+} primary_display_bus_t;
+
+typedef struct {
     union {
         mp_obj_base_t display_base;
         displayio_display_obj_t display;
@@ -89,6 +92,7 @@ typedef struct {
     };
 } primary_display_t;
 
+extern primary_display_bus_t display_buses[CIRCUITPY_DISPLAY_LIMIT];
 extern primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
 extern displayio_group_t circuitpython_splash;
@@ -99,7 +103,7 @@ void displayio_gc_collect(void);
 
 primary_display_t *allocate_display(void);
 primary_display_t *allocate_display_or_raise(void);
-primary_display_t *allocate_display_bus(void);
-primary_display_t *allocate_display_bus_or_raise(void);
+primary_display_bus_t *allocate_display_bus(void);
+primary_display_bus_t *allocate_display_bus_or_raise(void);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO___INIT___H
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index c21d87316d..8e6d51084e 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -47,7 +47,9 @@
 
 void displayio_display_core_construct(displayio_display_core_t *self,
     mp_obj_t bus, uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
-    uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word) {
+    uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
+    uint16_t column_command, uint16_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
+    bool data_as_commands, bool always_toggle_chip_select, bool SH1107_addressing, bool address_little_endian) {
     self->colorspace.depth = color_depth;
     self->colorspace.grayscale = grayscale;
     self->colorspace.grayscale_bit = 8 - color_depth;
@@ -61,6 +63,15 @@ void displayio_display_core_construct(displayio_display_core_t *self,
     self->rowstart = rowstart;
     self->last_refresh = 0;
 
+    self->column_command = column_command;
+    self->row_command = row_command;
+    self->set_current_column_command = set_current_column_command;
+    self->set_current_row_command = set_current_row_command;
+    self->data_as_commands = data_as_commands;
+    self->always_toggle_chip_select = always_toggle_chip_select;
+    self->SH1107_addressing = SH1107_addressing;
+    self->address_little_endian = address_little_endian;
+
     // (framebufferdisplay already validated its 'bus' is a buffer-protocol object)
     if (bus) {
         #if CIRCUITPY_PARALLELDISPLAY
@@ -214,10 +225,7 @@ void displayio_display_core_end_transaction(displayio_display_core_t *self) {
     self->end_transaction(self->bus);
 }
 
-void displayio_display_core_set_region_to_update(displayio_display_core_t *self, uint8_t column_command,
-    uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
-    bool data_as_commands, bool always_toggle_chip_select,
-    displayio_area_t *area, bool SH1107_addressing) {
+void displayio_display_core_set_region_to_update(displayio_display_core_t *self, displayio_area_t *area) {
     uint16_t x1 = area->x1 + self->colstart;
     uint16_t x2 = area->x2 + self->colstart;
     uint16_t y1 = area->y1 + self->rowstart;
@@ -239,17 +247,17 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
     y2 -= 1;
 
     display_chip_select_behavior_t chip_select = CHIP_SELECT_UNTOUCHED;
-    if (always_toggle_chip_select || data_as_commands) {
+    if (self->always_toggle_chip_select || self->data_as_commands) {
         chip_select = CHIP_SELECT_TOGGLE_EVERY_BYTE;
     }
 
     // Set column.
     displayio_display_core_begin_transaction(self);
     uint8_t data[5];
-    data[0] = column_command;
+    data[0] = self->column_command;
     uint8_t data_length = 1;
     display_byte_type_t data_type = DISPLAY_DATA;
-    if (!data_as_commands) {
+    if (!self->data_as_commands) {
         self->send(self->bus, DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data, 1);
         data_length = 0;
     } else {
@@ -260,6 +268,10 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
         data[data_length++] = x1;
         data[data_length++] = x2;
     } else {
+        if (self->address_little_endian) {
+            x1 = __builtin_bswap16(x1);
+            x2 = __builtin_bswap16(x2);
+        }
         data[data_length++] = x1 >> 8;
         data[data_length++] = x1 & 0xff;
         data[data_length++] = x2 >> 8;
@@ -268,7 +280,7 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
 
     // Quirk for SH1107 "SH1107_addressing"
     //     Column lower command = 0x00, Column upper command = 0x10
-    if (SH1107_addressing) {
+    if (self->SH1107_addressing) {
         data[0] = ((x1 >> 4) & 0x0F) | 0x10; // 0x10 to 0x17
         data[1] = x1 & 0x0F; // 0x00 to 0x0F
         data_length = 2;
@@ -277,10 +289,11 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
     self->send(self->bus, data_type, chip_select, data, data_length);
     displayio_display_core_end_transaction(self);
 
-    if (set_current_column_command != NO_COMMAND) {
-        uint8_t command = set_current_column_command;
+    if (self->set_current_column_command != NO_COMMAND) {
+        uint8_t command = self->set_current_column_command;
         displayio_display_core_begin_transaction(self);
         self->send(self->bus, DISPLAY_COMMAND, chip_select, &command, 1);
+        // Only send the first half of data because it is the first coordinate.
         self->send(self->bus, DISPLAY_DATA, chip_select, data, data_length / 2);
         displayio_display_core_end_transaction(self);
     }
@@ -288,9 +301,9 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
 
     // Set row.
     displayio_display_core_begin_transaction(self);
-    data[0] = row_command;
+    data[0] = self->row_command;
     data_length = 1;
-    if (!data_as_commands) {
+    if (!self->data_as_commands) {
         self->send(self->bus, DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data, 1);
         data_length = 0;
     }
@@ -299,6 +312,10 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
         data[data_length++] = y1;
         data[data_length++] = y2;
     } else {
+        if (self->address_little_endian) {
+            y1 = __builtin_bswap16(y1);
+            y2 = __builtin_bswap16(y2);
+        }
         data[data_length++] = y1 >> 8;
         data[data_length++] = y1 & 0xff;
         data[data_length++] = y2 >> 8;
@@ -307,7 +324,7 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
 
     // Quirk for SH1107 "SH1107_addressing"
     //     Page address command = 0xB0
-    if (SH1107_addressing) {
+    if (self->SH1107_addressing) {
         // set the page to our y value
         data[0] = 0xB0 | y1;
         data_length = 1;
@@ -316,10 +333,11 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self,
     self->send(self->bus, data_type, chip_select, data, data_length);
     displayio_display_core_end_transaction(self);
 
-    if (set_current_row_command != NO_COMMAND) {
-        uint8_t command = set_current_row_command;
+    if (self->set_current_row_command != NO_COMMAND) {
+        uint8_t command = self->set_current_row_command;
         displayio_display_core_begin_transaction(self);
         self->send(self->bus, DISPLAY_COMMAND, chip_select, &command, 1);
+        // Only send the first half of data because it is the first coordinate.
         self->send(self->bus, DISPLAY_DATA, chip_select, data, data_length / 2);
         displayio_display_core_end_transaction(self);
     }
diff --git a/shared-module/displayio/display_core.h b/shared-module/displayio/display_core.h
index 2167683a0d..07e57fbc6a 100644
--- a/shared-module/displayio/display_core.h
+++ b/shared-module/displayio/display_core.h
@@ -53,13 +53,26 @@ typedef struct {
     _displayio_colorspace_t colorspace;
     int16_t colstart;
     int16_t rowstart;
+
+    // Refresh area related.
+    uint16_t column_command;
+    uint16_t row_command;
+    uint16_t set_current_column_command;
+    uint16_t set_current_row_command;
+    bool data_as_commands;
+    bool always_toggle_chip_select;
+    bool SH1107_addressing;
+    bool address_little_endian;
+
     bool full_refresh; // New group means we need to refresh the whole display.
     bool refresh_in_progress;
 } displayio_display_core_t;
 
 void displayio_display_core_construct(displayio_display_core_t *self,
     mp_obj_t bus, uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
-    uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word);
+    uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
+    uint16_t column_command, uint16_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
+    bool data_as_commands, bool always_toggle_chip_select, bool SH1107_addressing, bool address_little_endian);
 
 bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group);
 
@@ -75,10 +88,7 @@ bool displayio_display_core_bus_free(displayio_display_core_t *self);
 bool displayio_display_core_begin_transaction(displayio_display_core_t *self);
 void displayio_display_core_end_transaction(displayio_display_core_t *self);
 
-void displayio_display_core_set_region_to_update(displayio_display_core_t *self, uint8_t column_command,
-    uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
-    bool data_as_commands, bool always_toggle_chip_select,
-    displayio_area_t *area, bool SH1107_addressing);
+void displayio_display_core_set_region_to_update(displayio_display_core_t *self, displayio_area_t *area);
 
 void release_display_core(displayio_display_core_t *self);
 
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 3d66370c04..6db2c3fec1 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -72,7 +72,10 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
         fb_getter_default(get_pixels_in_byte_share_row, false),
         fb_getter_default(get_bytes_per_cell, 2),
         fb_getter_default(get_reverse_pixels_in_byte, false),
-        fb_getter_default(get_reverse_pixels_in_word, false)
+        fb_getter_default(get_reverse_pixels_in_word, false),
+        // Region update related settings that aren't used by framebuffer display.
+        NO_COMMAND, NO_COMMAND, NO_COMMAND, NO_COMMAND,
+        false, false, false, false
         );
 
     self->first_pixel_offset = fb_getter_default(get_first_pixel_offset, 0);
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 5ab00d4f8a..939a13340d 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -189,14 +189,14 @@ void supervisor_display_move_memory(void) {
     #if CIRCUITPY_DISPLAYIO
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         #if CIRCUITPY_RGBMATRIX
-        if (displays[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
-            rgbmatrix_rgbmatrix_obj_t *pm = &displays[i].rgbmatrix;
+        if (display_buses[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
+            rgbmatrix_rgbmatrix_obj_t *pm = &display_buses[i].rgbmatrix;
             common_hal_rgbmatrix_rgbmatrix_reconstruct(pm, NULL);
         }
         #endif
         #if CIRCUITPY_SHARPDISPLAY
-        if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type) {
-            sharpdisplay_framebuffer_obj_t *sharp = &displays[i].sharpdisplay;
+        if (display_buses[i].bus_base.type == &sharpdisplay_framebuffer_type) {
+            sharpdisplay_framebuffer_obj_t *sharp = &display_buses[i].sharpdisplay;
             common_hal_sharpdisplay_framebuffer_reconstruct(sharp);
         }
         #endif

From d5b747b305597c89430bfd8d7585340d93cfe012 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 21 Apr 2023 13:23:01 -0700
Subject: [PATCH 2269/2403] Fix board inits

---
 ports/atmel-samd/boards/hallowing_m0_express/board.c      | 4 ++--
 ports/atmel-samd/boards/hallowing_m4_express/board.c      | 6 +++---
 ports/atmel-samd/boards/monster_m4sk/board.c              | 6 +++---
 ports/atmel-samd/boards/openbook_m4/board.c               | 6 +++---
 ports/atmel-samd/boards/pewpew_lcd/board.c                | 6 +++---
 ports/atmel-samd/boards/pewpew_m4/board.c                 | 6 +++---
 ports/atmel-samd/boards/pybadge/board.c                   | 6 +++---
 ports/atmel-samd/boards/pygamer/board.c                   | 6 +++---
 ports/atmel-samd/boards/pyportal/board.c                  | 4 ++--
 ports/atmel-samd/boards/pyportal_titano/board.c           | 4 ++--
 ports/atmel-samd/boards/seeeduino_wio_terminal/board.c    | 6 +++---
 ports/atmel-samd/boards/ugame10/board.c                   | 4 ++--
 ports/broadcom/boards/diodes_delight_piunora/board.c      | 2 +-
 ports/broadcom/boards/raspberrypi_cm4/board.c             | 2 +-
 ports/broadcom/boards/raspberrypi_cm4io/board.c           | 2 +-
 ports/broadcom/boards/raspberrypi_pi4b/board.c            | 2 +-
 ports/broadcom/boards/raspberrypi_zero/board.c            | 2 +-
 ports/broadcom/boards/raspberrypi_zero2w/board.c          | 2 +-
 ports/broadcom/boards/raspberrypi_zero_w/board.c          | 2 +-
 ports/espressif/boards/01space_lcd042_esp32c3/board.c     | 6 +++---
 ports/espressif/boards/adafruit_esp32s2_camera/board.c    | 4 ++--
 .../boards/adafruit_feather_esp32s2_reverse_tft/board.c   | 4 ++--
 .../espressif/boards/adafruit_feather_esp32s2_tft/board.c | 4 ++--
 .../boards/adafruit_feather_esp32s3_reverse_tft/board.c   | 4 ++--
 .../espressif/boards/adafruit_feather_esp32s3_tft/board.c | 4 ++--
 ports/espressif/boards/adafruit_funhouse/board.c          | 6 +++---
 .../boards/adafruit_magtag_2.9_grayscale/board.c          | 6 +++---
 ports/espressif/boards/espressif_esp32s3_box/board.c      | 6 +++---
 ports/espressif/boards/espressif_esp32s3_box_lite/board.c | 6 +++---
 ports/espressif/boards/espressif_esp32s3_eye/board.c      | 4 ++--
 .../espressif/boards/espressif_esp32s3_usb_otg_n8/board.c | 6 +++---
 ports/espressif/boards/hardkernel_odroid_go/board.c       | 6 +++---
 ports/espressif/boards/hexky_s2/board.c                   | 4 ++--
 ports/espressif/boards/hiibot_iots2/board.c               | 6 +++---
 ports/espressif/boards/lilygo_tembed_esp32s3/board.c      | 6 +++---
 ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c   | 6 +++---
 .../boards/lilygo_ttgo_tdisplay_esp32_16m/board.c         | 6 +++---
 ports/espressif/boards/lilygo_twatch_2020_v3/board.c      | 6 +++---
 ports/espressif/boards/lolin_s2_pico/board.c              | 4 ++--
 ports/espressif/boards/m5stack_core2/board.c              | 4 ++--
 ports/espressif/boards/m5stack_core_basic/board.c         | 4 ++--
 ports/espressif/boards/m5stack_core_fire/board.c          | 4 ++--
 ports/espressif/boards/m5stack_stick_c/board.c            | 6 +++---
 ports/espressif/boards/morpheans_morphesp-240/board.c     | 6 +++---
 .../espressif/boards/waveshare_esp32_s2_pico_lcd/board.c  | 6 +++---
 ports/nrf/boards/clue_nrf52840_express/board.c            | 6 +++---
 ports/nrf/boards/hiibot_bluefi/board.c                    | 6 +++---
 ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c    | 6 +++---
 ports/nrf/boards/ohs2020_badge/board.c                    | 6 +++---
 .../boards/adafruit_feather_rp2040_dvi/board.c            | 2 +-
 ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c | 6 +++---
 ports/raspberrypi/boards/hack_club_sprig/board.c          | 6 +++---
 ports/raspberrypi/boards/pimoroni_badger2040/board.c      | 8 +++-----
 ports/raspberrypi/boards/pimoroni_picosystem/board.c      | 6 +++---
 .../raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c  | 6 +++---
 ports/stm/boards/meowbit_v121/board.c                     | 4 ++--
 56 files changed, 136 insertions(+), 138 deletions(-)

diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index aeea62d2a2..357cda495c 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -69,7 +69,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     common_hal_busio_spi_never_reset(spi);
@@ -82,7 +82,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c
index 5003c904bc..c070db6e52 100644
--- a/ports/atmel-samd/boards/hallowing_m4_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m4_express/board.c
@@ -47,11 +47,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, false);
     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,
@@ -62,7 +62,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c
index 76c96bba82..c67bc7dab9 100644
--- a/ports/atmel-samd/boards/monster_m4sk/board.c
+++ b/ports/atmel-samd/boards/monster_m4sk/board.c
@@ -48,11 +48,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, false);
     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,
@@ -63,7 +63,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
index ec1ba9f956..59c3bb4978 100644
--- a/ports/atmel-samd/boards/openbook_m4/board.c
+++ b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -57,11 +57,11 @@ uint8_t refresh_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     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,
@@ -72,7 +72,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
     display->base.type = &displayio_epaperdisplay_type;
     common_hal_displayio_epaperdisplay_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c
index f4060571bf..8c058fb6d9 100644
--- a/ports/atmel-samd/boards/pewpew_lcd/board.c
+++ b/ports/atmel-samd/boards/pewpew_lcd/board.c
@@ -46,11 +46,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, false);
     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,
@@ -61,7 +61,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
index c36388f933..381af5ec16 100644
--- a/ports/atmel-samd/boards/pewpew_m4/board.c
+++ b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -97,11 +97,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA15, NULL, false);
     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,
@@ -115,7 +115,7 @@ void board_init(void) {
     uint32_t cfg0 = lookupCfg(CFG_DISPLAY_CFG0, 0x000000);
     uint32_t offX = (cfg0 >> 8) & 0xff;
     uint32_t offY = (cfg0 >> 16) & 0xff;
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index 11db1ba0a8..4b5ac1dc19 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -68,11 +68,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     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,
@@ -83,7 +83,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
index 141365a4a1..84b81a4b4e 100644
--- a/ports/atmel-samd/boards/pygamer/board.c
+++ b/ports/atmel-samd/boards/pygamer/board.c
@@ -70,11 +70,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     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,
@@ -85,7 +85,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index e304f6f24b..49dd831c4d 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -61,7 +61,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
+    paralleldisplay_parallelbus_obj_t *bus = &allocate_display_bus()->parallel_bus;
     bus->base.type = ¶lleldisplay_parallelbus_type;
     common_hal_paralleldisplay_parallelbus_construct(bus,
         &pin_PA16, // Data0
@@ -72,7 +72,7 @@ void board_init(void) {
         &pin_PA00, // Reset
         0); // Frequency
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/pyportal_titano/board.c b/ports/atmel-samd/boards/pyportal_titano/board.c
index 939a2dcc70..f938456599 100644
--- a/ports/atmel-samd/boards/pyportal_titano/board.c
+++ b/ports/atmel-samd/boards/pyportal_titano/board.c
@@ -78,7 +78,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
+    paralleldisplay_parallelbus_obj_t *bus = &allocate_display_bus()->parallel_bus;
     bus->base.type = ¶lleldisplay_parallelbus_type;
     common_hal_paralleldisplay_parallelbus_construct(bus,
         &pin_PA16, // Data0
@@ -89,7 +89,7 @@ void board_init(void) {
         &pin_PA00, // Reset
         0); // Frequency
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
index 2eddb41fd6..6a18d4ea84 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
@@ -65,11 +65,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PB20, &pin_PB19, NULL, false);
     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,
@@ -80,7 +80,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c
index 9953f27d02..6db511d775 100644
--- a/ports/atmel-samd/boards/ugame10/board.c
+++ b/ports/atmel-samd/boards/ugame10/board.c
@@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     common_hal_displayio_fourwire_construct(bus,
@@ -82,7 +82,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/broadcom/boards/diodes_delight_piunora/board.c b/ports/broadcom/boards/diodes_delight_piunora/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/board.c
+++ b/ports/broadcom/boards/diodes_delight_piunora/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_cm4/board.c b/ports/broadcom/boards/raspberrypi_cm4/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_cm4/board.c
+++ b/ports/broadcom/boards/raspberrypi_cm4/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_cm4io/board.c b/ports/broadcom/boards/raspberrypi_cm4io/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_cm4io/board.c
+++ b/ports/broadcom/boards/raspberrypi_cm4io/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_pi4b/board.c b/ports/broadcom/boards/raspberrypi_pi4b/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_pi4b/board.c
+++ b/ports/broadcom/boards/raspberrypi_pi4b/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_zero/board.c b/ports/broadcom/boards/raspberrypi_zero/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_zero/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_zero2w/board.c b/ports/broadcom/boards/raspberrypi_zero2w/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_zero2w/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero2w/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/broadcom/boards/raspberrypi_zero_w/board.c b/ports/broadcom/boards/raspberrypi_zero_w/board.c
index e272a8cc3d..ab9454298c 100644
--- a/ports/broadcom/boards/raspberrypi_zero_w/board.c
+++ b/ports/broadcom/boards/raspberrypi_zero_w/board.c
@@ -36,7 +36,7 @@ void board_init(void) {
     fb->base.type = &videocore_framebuffer_type;
     common_hal_videocore_framebuffer_construct(fb, 640, 480);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/board.c b/ports/espressif/boards/01space_lcd042_esp32c3/board.c
index 56df21ab57..53f6e4a48e 100644
--- a/ports/espressif/boards/01space_lcd042_esp32c3/board.c
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/board.c
@@ -55,11 +55,11 @@ void board_init(void) {
     busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);
 
     // What we would do if it wasn't the shared board I2C: (for reference)
-    // busio_i2c_obj_t *i2c = &displays[0].i2cdisplay_bus.inline_bus;
+    // busio_i2c_obj_t *i2c = &allocate_display_bus()->i2cdisplay_bus.inline_bus;
     // common_hal_busio_i2c_construct(i2c, &pin_GPIO23, &pin_GPIO22, 100000, 0);
     // common_hal_busio_i2c_never_reset(i2c);
 
-    displayio_i2cdisplay_obj_t *bus = &displays[0].i2cdisplay_bus;
+    displayio_i2cdisplay_obj_t *bus = &allocate_display_bus()->i2cdisplay_bus;
     bus->base.type = &displayio_i2cdisplay_type;
     common_hal_displayio_i2cdisplay_construct(bus,
         i2c,
@@ -67,7 +67,7 @@ void board_init(void) {
         NULL
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
index 280f2b14b8..4799a07b79 100644
--- a/ports/espressif/boards/adafruit_esp32s2_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s2_camera/board.c
@@ -52,7 +52,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     common_hal_displayio_fourwire_construct(bus,
         spi,
@@ -63,7 +63,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
         display,
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
index 360c71804c..ef6908d50a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -85,7 +85,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
index c5b47a2f95..ce0aa8d2b9 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -85,7 +85,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
index 360c71804c..ef6908d50a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -85,7 +85,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
index 7e28aafb8e..18f361cc06 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -85,7 +85,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c
index d89a4db268..b1a01b2dcb 100644
--- a/ports/espressif/boards/adafruit_funhouse/board.c
+++ b/ports/espressif/boards/adafruit_funhouse/board.c
@@ -56,11 +56,11 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO38);
     #endif /* DEBUG */
 
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
     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,
@@ -71,7 +71,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
         display,
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
index 681efc1cea..55c61a0912 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -120,11 +120,11 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO44);
     #endif /* DEBUG */
 
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
     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,
@@ -135,7 +135,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
     display->base.type = &displayio_epaperdisplay_type;
     common_hal_displayio_epaperdisplay_construct(
         display,
diff --git a/ports/espressif/boards/espressif_esp32s3_box/board.c b/ports/espressif/boards/espressif_esp32s3_box/board.c
index 75c0ede92d..a91a924d04 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box/board.c
@@ -43,11 +43,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, false);
     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,
@@ -58,7 +58,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
index 23c67d06b6..ddfab49797 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -44,11 +44,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, false);
     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,
@@ -59,7 +59,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/espressif_esp32s3_eye/board.c b/ports/espressif/boards/espressif_esp32s3_eye/board.c
index be129c6a30..49535de902 100644
--- a/ports/espressif/boards/espressif_esp32s3_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_eye/board.c
@@ -71,7 +71,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -84,7 +84,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
index 685e7cf156..afbb5ae8fb 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
@@ -71,11 +71,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO6, &pin_GPIO7, NULL, false);
     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,
@@ -86,7 +86,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
index 609572977e..54ecd27ff3 100644
--- a/ports/espressif/boards/hardkernel_odroid_go/board.c
+++ b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -63,11 +63,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO23, NULL, false);
     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,
@@ -78,7 +78,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/hexky_s2/board.c b/ports/espressif/boards/hexky_s2/board.c
index e4f8f48855..ef99a96e1d 100644
--- a/ports/espressif/boards/hexky_s2/board.c
+++ b/ports/espressif/boards/hexky_s2/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -85,7 +85,7 @@ void board_init(void) {
         0,              // polarity
         0               // phase
         );
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c
index c9cf7afb92..87ee7d0b14 100644
--- a/ports/espressif/boards/hiibot_iots2/board.c
+++ b/ports/espressif/boards/hiibot_iots2/board.c
@@ -65,7 +65,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -76,7 +77,6 @@ static void display_init(void) {
 
     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(
@@ -90,7 +90,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/board.c b/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
index ed49eb504c..03a86a48d4 100644
--- a/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
+++ b/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
@@ -43,11 +43,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO12, &pin_GPIO11, NULL, false);
     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,
@@ -58,7 +58,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
index 6c0a54c99c..7ba109dfce 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
@@ -65,7 +65,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -76,7 +77,6 @@ static void display_init(void) {
 
     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(
@@ -90,7 +90,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
index 630de0b63f..916f1d0a78 100644
--- a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
@@ -45,7 +45,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -56,7 +57,6 @@ static void display_init(void) {
 
     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(
@@ -71,7 +71,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/board.c b/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
index 6a60ada6b0..de2b79b895 100644
--- a/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
+++ b/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
@@ -48,7 +48,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -60,7 +61,6 @@ static void display_init(void) {
 
     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(
@@ -74,7 +74,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/lolin_s2_pico/board.c b/ports/espressif/boards/lolin_s2_pico/board.c
index e2c24bb22a..2f987799ad 100644
--- a/ports/espressif/boards/lolin_s2_pico/board.c
+++ b/ports/espressif/boards/lolin_s2_pico/board.c
@@ -54,7 +54,7 @@ uint8_t display_init_sequence[] = { // SSD1306
 static void display_init(void) {
     busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);
 
-    displayio_i2cdisplay_obj_t *bus = &displays[0].i2cdisplay_bus;
+    displayio_i2cdisplay_obj_t *bus = &allocate_display_bus()->i2cdisplay_bus;
     bus->base.type = &displayio_i2cdisplay_type;
     common_hal_displayio_i2cdisplay_construct(bus,
         i2c,
@@ -62,7 +62,7 @@ static void display_init(void) {
         &pin_GPIO18 // reset
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/espressif/boards/m5stack_core2/board.c b/ports/espressif/boards/m5stack_core2/board.c
index a2565229ce..5080617df4 100644
--- a/ports/espressif/boards/m5stack_core2/board.c
+++ b/ports/espressif/boards/m5stack_core2/board.c
@@ -333,7 +333,7 @@ static bool pmic_init(busio_i2c_obj_t *i2c) {
 
 static bool display_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -347,7 +347,7 @@ static bool display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/m5stack_core_basic/board.c b/ports/espressif/boards/m5stack_core_basic/board.c
index 2736bc758b..68eff30782 100644
--- a/ports/espressif/boards/m5stack_core_basic/board.c
+++ b/ports/espressif/boards/m5stack_core_basic/board.c
@@ -57,7 +57,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -71,7 +71,7 @@ void board_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/m5stack_core_fire/board.c b/ports/espressif/boards/m5stack_core_fire/board.c
index 2736bc758b..68eff30782 100755
--- a/ports/espressif/boards/m5stack_core_fire/board.c
+++ b/ports/espressif/boards/m5stack_core_fire/board.c
@@ -57,7 +57,7 @@ uint8_t display_init_sequence[] = {
 
 void board_init(void) {
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
 
     common_hal_displayio_fourwire_construct(
@@ -71,7 +71,7 @@ void board_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index d25663895c..e6a0125fb4 100755
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -165,11 +165,11 @@ static bool pmic_init(busio_i2c_obj_t *i2c) {
 }
 
 static bool display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, false);
     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(
@@ -183,7 +183,7 @@ static bool display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c
index 30e0a04aad..9491902161 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/board.c
+++ b/ports/espressif/boards/morpheans_morphesp-240/board.c
@@ -147,7 +147,8 @@ void board_init(void) {
 
     // Display
 
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -158,7 +159,6 @@ void board_init(void) {
 
     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(
@@ -172,7 +172,7 @@ void board_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
         display,
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
index 359263df81..2898f675c8 100644
--- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
+++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -64,7 +64,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
 
     common_hal_busio_spi_construct(
         spi,
@@ -75,7 +76,6 @@ static void display_init(void) {
 
     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(
@@ -89,7 +89,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
 
     common_hal_displayio_display_construct(
diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c
index 92ea3fefeb..98ec033dc6 100644
--- a/ports/nrf/boards/clue_nrf52840_express/board.c
+++ b/ports/nrf/boards/clue_nrf52840_express/board.c
@@ -47,11 +47,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_P0_14, &pin_P0_15, NULL, false);
     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,
@@ -62,7 +62,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c
index e5fc4279f8..d2c9e732b2 100644
--- a/ports/nrf/boards/hiibot_bluefi/board.c
+++ b/ports/nrf/boards/hiibot_bluefi/board.c
@@ -47,11 +47,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_P0_07, &pin_P1_08, NULL, false); // SCK, MOSI, MISO, not half-duplex
     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,
@@ -63,7 +63,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
index ce4241c9da..1fea4b2b9f 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
@@ -48,11 +48,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, false);
     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,
@@ -63,7 +63,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c
index 30c066d91e..568357eacb 100644
--- a/ports/nrf/boards/ohs2020_badge/board.c
+++ b/ports/nrf/boards/ohs2020_badge/board.c
@@ -47,11 +47,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, false);
     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,
@@ -62,7 +62,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
index bcbab5e4cd..140a15cc04 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
@@ -40,7 +40,7 @@ void board_init(void) {
         &pin_GPIO23, &pin_GPIO22,
         8);
 
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
     display->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         display,
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
index b5cef1639d..25d8dbe831 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -59,11 +59,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO26, &pin_GPIO27, NULL, false);
     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,
@@ -74,7 +74,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/raspberrypi/boards/hack_club_sprig/board.c b/ports/raspberrypi/boards/hack_club_sprig/board.c
index 775e6ca5df..819d7943dc 100644
--- a/ports/raspberrypi/boards/hack_club_sprig/board.c
+++ b/ports/raspberrypi/boards/hack_club_sprig/board.c
@@ -78,11 +78,11 @@ uint8_t display_init_sequence[] = {
 
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
     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,
@@ -93,7 +93,7 @@ void board_init(void) {
         0,
         0);
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
index 9eea472925..3331ee1e98 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -274,12 +274,12 @@ void board_init(void) {
     common_hal_digitalio_digitalinout_never_reset(&enable_pin_obj);
 
     // Set up the SPI object used to control the display
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
     common_hal_busio_spi_never_reset(spi);
 
     // Set up the DisplayIO pin object
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     common_hal_displayio_fourwire_construct(bus,
         spi,
@@ -291,7 +291,7 @@ void board_init(void) {
         0); // Phase
 
     // Set up the DisplayIO epaper object
-    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
     display->base.type = &displayio_epaperdisplay_type;
     common_hal_displayio_epaperdisplay_construct(
         display,
@@ -329,10 +329,8 @@ void board_init(void) {
 void board_deinit(void) {
     displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
     if (display->base.type == &displayio_epaperdisplay_type) {
-        size_t i = 0;
         while (common_hal_displayio_epaperdisplay_get_busy(display)) {
             RUN_BACKGROUND_TASKS;
-            i++;
         }
     }
     common_hal_displayio_release_displays();
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
index 600089f129..388c3f2417 100644
--- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -64,11 +64,11 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(spi, &pin_GPIO6, &pin_GPIO7, NULL, false);
     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,
@@ -79,7 +79,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
index afe3f87787..2c3ef18805 100644
--- a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
+++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
@@ -63,7 +63,8 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
     common_hal_busio_spi_construct(
         spi,
         &pin_GPIO10,    // CLK
@@ -74,7 +75,6 @@ static void display_init(void) {
 
     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(
@@ -88,7 +88,7 @@ static void display_init(void) {
         0               // phase
         );
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(
         display,
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index 0edf3d40e4..2d67daf806 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     busio_spi_obj_t *internal_spi = &supervisor_flash_spi_bus;
     common_hal_displayio_fourwire_construct(bus,
@@ -82,7 +82,7 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    displayio_display_obj_t *display = &displays[0].display;
+    displayio_display_obj_t *display = &allocate_display()->display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,

From b16037859cfb22ef5c9b308938ac7512696d488a Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 21 Apr 2023 14:36:35 -0700
Subject: [PATCH 2270/2403] Fix native epd boards

---
 ports/atmel-samd/boards/openbook_m4/board.c               | 3 ++-
 .../boards/adafruit_magtag_2.9_grayscale/board.c          | 3 ++-
 ports/raspberrypi/boards/pimoroni_badger2040/board.c      | 3 ++-
 shared-module/displayio/__init__.c                        | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
index 59c3bb4978..5867a279f4 100644
--- a/ports/atmel-samd/boards/openbook_m4/board.c
+++ b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -106,7 +106,8 @@ void board_init(void) {
         false, // chip_select (don't always toggle chip select)
         false, // grayscale
         false, // acep
-        false); // two_byte_sequence_length
+        false, // two_byte_sequence_length
+        false); // address_little_endian
 }
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
index 55c61a0912..da070688ed 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -167,7 +167,8 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         true, // grayscale
         false, // acep
-        false);  // two_byte_sequence_length
+        false,  // two_byte_sequence_length
+        false); // address_little_endian
 }
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
index 3331ee1e98..cd7cd3a194 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -323,7 +323,8 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         false, // acep
-        false);  // two_byte_sequence_length
+        false,  // two_byte_sequence_length
+        false); // address_little_endian
 }
 
 void board_deinit(void) {
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index c47b19caea..e9431dee14 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -154,8 +154,8 @@ void common_hal_displayio_release_displays(void) {
             common_hal_videocore_framebuffer_deinit(&display_buses[i].videocore);
         #endif
         #if CIRCUITPY_PICODVI
-        } else if (displays[i].bus_base.type == &picodvi_framebuffer_type) {
-            common_hal_picodvi_framebuffer_deinit(&displays[i].picodvi);
+        } else if (bus_type == &picodvi_framebuffer_type) {
+            common_hal_picodvi_framebuffer_deinit(&display_buses[i].picodvi);
         #endif
         }
         display_buses[i].bus_base.type = &mp_type_NoneType;
@@ -274,8 +274,8 @@ void reset_displays(void) {
             // need to be moved.
         #endif
         #if CIRCUITPY_PICODVI
-        } else if (displays[i].bus_base.type == &picodvi_framebuffer_type) {
-            picodvi_framebuffer_obj_t *vc = &displays[i].picodvi;
+        } else if (display_bus_type == &picodvi_framebuffer_type) {
+            picodvi_framebuffer_obj_t *vc = &display_buses[i].picodvi;
             if (!any_display_uses_this_framebuffer(&vc->base)) {
                 common_hal_picodvi_framebuffer_deinit(vc);
             }

From 031667ebd0bb3deb944962ea280aa2246b7103a6 Mon Sep 17 00:00:00 2001
From: George White 
Date: Fri, 21 Apr 2023 17:41:52 -0400
Subject: [PATCH 2271/2403] Added notes re the RTL8720D pins

The Wio Terminal includes a RealTek RTL8720D as a companion to the main chip to provide WiFi and Bluetooth capabilities via eRPC over a UART connection. The WIO Terminal schematic labels some pins as the RXD/TXD for the UART, and that was captured in the board definition for CircuitPython. However, these pins may be used for logging in another mode, but they are not the main pins used to communicate with the RTL chip. The correct configuration is RX on PC24/pad 2 and TX on PB24/pad 0 of SERCOM 0. The comments on the pin definitions now reflect this situation, for anyone trying to get the WiFi/BLE to work on the Wio Terminal.
---
 ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
index 0ff0f7b1ba..90daa8df00 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
@@ -95,13 +95,13 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { 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
+    // RTL8720D - follows the schematic, but see comments
     { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_PWR),  MP_ROM_PTR(&pin_PA18) },       // CHIP_PU
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_RXD),  MP_ROM_PTR(&pin_PC22) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_TXD),  MP_ROM_PTR(&pin_PC23) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_MOSI),  MP_ROM_PTR(&pin_PB24) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_RXD),  MP_ROM_PTR(&pin_PC22) },       // *NOT* THE MAIN RX FOR THE RTL CHIP (may be a log UART?)
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_TXD),  MP_ROM_PTR(&pin_PC23) },       // *NOT* THE MAIN TX FOR THE RTL CHIP (may be a log UART?)
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_MOSI),  MP_ROM_PTR(&pin_PB24) },      // used as the UART TX for the RTL chip
     { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_CLK),  MP_ROM_PTR(&pin_PB25) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_MISO),  MP_ROM_PTR(&pin_PC24) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_MISO),  MP_ROM_PTR(&pin_PC24) },      // used as the UART RX for the RTL chip
     { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_CS),  MP_ROM_PTR(&pin_PC25) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_READY),  MP_ROM_PTR(&pin_PC20) },     // IRQ0
     { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_DIR),  MP_ROM_PTR(&pin_PA19) },       // SYNC

From 01197a96d15141b35093daf1f844f685a60b2a4a Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 21 Apr 2023 16:54:46 -0500
Subject: [PATCH 2272/2403] remove abs() from radius

---
 shared-module/vectorio/Circle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/vectorio/Circle.c b/shared-module/vectorio/Circle.c
index ee83ad18b9..4f89e46163 100644
--- a/shared-module/vectorio/Circle.c
+++ b/shared-module/vectorio/Circle.c
@@ -23,7 +23,7 @@ void common_hal_vectorio_circle_set_on_dirty(vectorio_circle_t *self, vectorio_e
 
 uint32_t common_hal_vectorio_circle_get_pixel(void *obj, int16_t x, int16_t y) {
     vectorio_circle_t *self = obj;
-    int16_t radius = abs(self->radius);
+    int16_t radius = self->radius;
     x = abs(x);
     y = abs(y);
     if (x + y <= radius) {

From 56fd7dcf0adf76eb838d2d76d3ba312f1d12e3d3 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Fri, 21 Apr 2023 18:00:16 -0500
Subject: [PATCH 2273/2403] add minimum validation for tilegrid size in
 terminalio.Terminal

---
 shared-bindings/terminalio/Terminal.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 46e171ff7e..164999093a 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -85,6 +85,9 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
 
     fontio_builtinfont_t *font = mp_arg_validate_type(args[ARG_font].u_obj, &fontio_builtinfont_type, MP_QSTR_font);
 
+    mp_arg_validate_int_min(scroll_area->width_in_tiles, 2, MP_QSTR_scroll_area_width);
+    mp_arg_validate_int_min(scroll_area->height_in_tiles, 2, MP_QSTR_scroll_area_height);
+
     terminalio_terminal_obj_t *self = m_new_obj(terminalio_terminal_obj_t);
     self->base.type = &terminalio_terminal_type;
 

From b59f0e17be471c5828287d3f136b8d9b92bdc85c Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 21 Apr 2023 15:59:11 -0700
Subject: [PATCH 2274/2403] Fix RP2040 idle

Don't idle from main if we scheduled an interrupt for 0 ticks in
the future.

Have RP2040 detect wakes that happen between setting the timer and
the idle call.

Fixes #7361
---
 main.c                              | 10 ++++++++--
 ports/raspberrypi/supervisor/port.c |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 9351d90529..ae8c339172 100644
--- a/main.c
+++ b/main.c
@@ -716,9 +716,15 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
             // time_to_next_change is in ms and ticks are slightly shorter so
             // we'll undersleep just a little. It shouldn't matter.
-            port_interrupt_after_ticks(time_to_next_change);
-            #endif
+            if (time_to_next_change > 0) {
+                port_interrupt_after_ticks(time_to_next_change);
+                port_idle_until_interrupt();
+            }
+            #else
+            // No status LED can we sleep until we are interrupted by some
+            // interaction.
             port_idle_until_interrupt();
+            #endif
         }
     }
 
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 2ee3a1ee98..e45fa8837a 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -257,6 +257,7 @@ uint32_t port_get_saved_word(void) {
 }
 
 static volatile bool ticks_enabled;
+static volatile bool _woken_up;
 
 uint64_t port_get_raw_ticks(uint8_t *subticks) {
     uint64_t microseconds = time_us_64();
@@ -268,6 +269,7 @@ STATIC void _tick_callback(uint alarm_num) {
         supervisor_tick();
         hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
     }
+    _woken_up = true;
 }
 
 // Enable 1/1024 second tick.
@@ -291,11 +293,12 @@ void port_interrupt_after_ticks(uint32_t ticks) {
     if (!ticks_enabled) {
         hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), ticks * 977));
     }
+    _woken_up = false;
 }
 
 void port_idle_until_interrupt(void) {
     common_hal_mcu_disable_interrupts();
-    if (!background_callback_pending() && !tud_task_event_ready()) {
+    if (!background_callback_pending() && !tud_task_event_ready() && !_woken_up) {
         __DSB();
         __WFI();
     }

From 73fde93218ddfcb7238c7ea538f05d68a5ddb27a Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura 
Date: Fri, 21 Apr 2023 06:45:05 +0000
Subject: [PATCH 2275/2403] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (999 of 999 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 5d02126604..c31b7e0134 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: 2023-04-07 00:49+0000\n"
+"PO-Revision-Date: 2023-04-22 06:48+0000\n"
 "Last-Translator: Wellington Terumi Uemura \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.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: main.c
 msgid ""
@@ -1330,7 +1330,7 @@ msgstr "Tamanho do pedaço de formato inválido"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid hex password"
-msgstr ""
+msgstr "Senha hexadecimal inválida"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"

From 964a94929a1bec1f25253787bf904406b5936e40 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl 
Date: Thu, 20 Apr 2023 22:11:28 +0000
Subject: [PATCH 2276/2403] Translated using Weblate (Swedish)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/locale/sv.po b/locale/sv.po
index 909c8a624f..c5dece498d 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: 2023-04-07 00:49+0000\n"
+"PO-Revision-Date: 2023-04-22 06:48+0000\n"
 "Last-Translator: Jonny Bergdahl \n"
 "Language-Team: LANGUAGE \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.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: main.c
 msgid ""
@@ -1315,7 +1315,7 @@ msgstr "Ogiltig formatsegmentstorlek"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid hex password"
-msgstr ""
+msgstr "Ogiltigt hex-lösenord"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"

From 14b69d750f7ec60984069a42d92dfe504eac5d48 Mon Sep 17 00:00:00 2001
From: Andi Chandler 
Date: Thu, 20 Apr 2023 20:20:28 +0000
Subject: [PATCH 2277/2403] Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/locale/en_GB.po b/locale/en_GB.po
index 06ad558ee1..4452427b1a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-04-16 13:51+0000\n"
+"PO-Revision-Date: 2023-04-22 06:48+0000\n"
 "Last-Translator: Andi Chandler \n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -15,7 +15,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.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: main.c
 msgid ""
@@ -1309,7 +1309,7 @@ msgstr "Invalid format chunk size"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid hex password"
-msgstr ""
+msgstr "Invalid hex password"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"

From a6545d6341c92201376a973f2e8e74815b76127e Mon Sep 17 00:00:00 2001
From: Jose David M 
Date: Sat, 22 Apr 2023 15:48:28 +0000
Subject: [PATCH 2278/2403] Translated using Weblate (Spanish)

Currently translated at 100.0% (999 of 999 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 f0604b74f4..c9ba32682f 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: 2023-04-07 00:49+0000\n"
+"PO-Revision-Date: 2023-04-22 15:51+0000\n"
 "Last-Translator: Jose David M \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.17-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: main.c
 msgid ""
@@ -1334,7 +1334,7 @@ msgstr "Formato de fragmento de formato no válido"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid hex password"
-msgstr ""
+msgstr "Contraseña hexadecimal no válida"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"

From ccbb6a58fbefbb552098c11b81fd4886290c9975 Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Sat, 22 Apr 2023 13:09:18 -0400
Subject: [PATCH 2279/2403] Fix web-editor debug on non-standard port using
 localhost (CORS)

---
 supervisor/shared/web_workflow/web_workflow.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 94732cf52c..648af72ccb 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -478,8 +478,12 @@ static bool _origin_ok(_request *request) {
             return true;
         }
         // DEBUG: OK if origin is 'localhost' (ignoring port #)
-        *strchrnul(&request->origin[PREFIX_HTTP_LEN], ':') = '\0';
+        char *cptr = strchrnul(&request->origin[PREFIX_HTTP_LEN], ':');
+        char csave = *cptr; // NULL or colon
+        *cptr = '\0';
         if (strcmp(&request->origin[PREFIX_HTTP_LEN], "localhost") == 0) {
+            // Restore removed colon if non-null host terminator
+            *cptr = csave;
             return true;
         }
     }

From b0ea28a031e85d1497793da3bd777933d036a282 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sun, 23 Apr 2023 00:33:14 -0400
Subject: [PATCH 2280/2403] Doc fix for root_group=None behaviour

---
 shared-bindings/displayio/Display.c                | 2 +-
 shared-bindings/displayio/EPaperDisplay.c          | 2 +-
 shared-bindings/framebufferio/FramebufferDisplay.c | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 49194ebd1e..29bca28c3f 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -426,7 +426,7 @@ MP_PROPERTY_GETTER(displayio_display_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the display.
-//|     If the root group is set to ``None``, the default CircuitPython terminal will be shown.
+//|     If the root group is set to ``None``, no output will be shown.
 //|     """
 STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
     displayio_display_obj_t *self = native_display(self_in);
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 93d91110a2..8c753de19b 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -384,7 +384,7 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the epaper display.
-//|     If the root group is set to ``None``, the default CircuitPython terminal will be shown.
+//|     If the root group is set to ``None``, no output will be shown.
 //|     """
 //|
 STATIC mp_obj_t displayio_epaperdisplay_obj_get_root_group(mp_obj_t self_in) {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 030b924c1e..7f27d3851c 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -323,8 +323,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, con
 MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, framebufferio_framebufferdisplay_obj_fill_row);
 
 //|     root_group: displayio.Group
-//|     """The root group on the display."""
-//|
+//|     """The root group on the display.
+//|     If the root group is set to ``None``, no output will be shown.
+//|     """
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return common_hal_framebufferio_framebufferdisplay_get_root_group(self);

From b2b24231bc68d199e36676c3ff77df36604fa296 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sun, 23 Apr 2023 00:45:38 -0400
Subject: [PATCH 2281/2403] local pre-commit changes

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 1 +
 shared-bindings/socketpool/SocketPool.c            | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 7f27d3851c..eb49f311b7 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -326,6 +326,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra
 //|     """The root group on the display.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
+//|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     return common_hal_framebufferio_framebufferdisplay_get_root_group(self);
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 3023721378..f056c741f3 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,7 +52,6 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
-//|
 STATIC mp_obj_t socketpool_socketpool_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);
 

From 0c00220aa633dbc8e38ebedd6b06140c45e10589 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sun, 23 Apr 2023 00:52:48 -0400
Subject: [PATCH 2282/2403] Removing unrelated change by local pre-commit

---
 shared-bindings/socketpool/SocketPool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index f056c741f3..3023721378 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -52,6 +52,7 @@
 //|             returned by :py:attr:`wifi.radio`
 //|         """
 //|         ...
+//|
 STATIC mp_obj_t socketpool_socketpool_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);
 

From 3cf712556b363fc2ce0f316152eaf4ba4400f04f Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sun, 23 Apr 2023 01:03:13 -0400
Subject: [PATCH 2283/2403] Add CIRCUITPYTHON_TERMINAL usage description

---
 shared-bindings/displayio/Display.c                | 1 +
 shared-bindings/displayio/EPaperDisplay.c          | 1 +
 shared-bindings/framebufferio/FramebufferDisplay.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 29bca28c3f..381924e0ab 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -426,6 +426,7 @@ MP_PROPERTY_GETTER(displayio_display_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the display.
+//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 8c753de19b..8df3b31de9 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -384,6 +384,7 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the epaper display.
+//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 //|
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index eb49f311b7..806d9957b4 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -324,6 +324,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra
 
 //|     root_group: displayio.Group
 //|     """The root group on the display.
+//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 //|

From 6aa3e7d8a6881df241240983f19cb06d05b52929 Mon Sep 17 00:00:00 2001
From: David Glaude 
Date: Sun, 23 Apr 2023 10:58:02 +0200
Subject: [PATCH 2284/2403] This is about picodvi not rgbmatrix

There might be another way or other place where the documentation does not match the code.
But this is the most obvious, that's why I found it.
---
 ports/raspberrypi/bindings/picodvi/Framebuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
index 12482c3baa..67d6a286dd 100644
--- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -142,7 +142,7 @@ STATIC mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n
 
 //|     def deinit(self) -> None:
 //|         """Free the resources (pins, timers, etc.) associated with this
-//|         rgbmatrix instance.  After deinitialization, no further operations
+//|         picodvi instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
 STATIC mp_obj_t picodvi_framebuffer_deinit(mp_obj_t self_in) {

From 8e3c28e97dcca5795d9b7834f812841ec9e9a300 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 14 Apr 2023 13:43:24 -0500
Subject: [PATCH 2285/2403] Fix `memoryview.cast` in micropython-coverage

`locals_dict` and `attr` are incompatible, so just use circuitpython-style
properties so that a property and a method are both available.

this makes no difference in circuitpython, where
`MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE` is never enabled
---
 py/objarray.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 763ec15cdb..518c3aba52 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -31,6 +31,7 @@
 
 #include "py/runtime.h"
 #include "py/binary.h"
+#include "py/objproperty.h"
 #include "py/objstr.h"
 #include "py/objarray.h"
 
@@ -270,15 +271,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(memoryview_cast_obj, memoryview_cast);
 #endif
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-STATIC void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    if (dest[0] != MP_OBJ_NULL) {
-        return;
-    }
-    if (attr == MP_QSTR_itemsize) {
-        mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
-        dest[0] = MP_OBJ_NEW_SMALL_INT(mp_binary_get_size('@', self->typecode & TYPECODE_MASK, NULL));
-    }
+STATIC mp_obj_t memoryview_itemsize_get(mp_obj_t self_in) {
+    mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(mp_binary_get_size('@', self->typecode & TYPECODE_MASK, NULL));
 }
+MP_DEFINE_CONST_FUN_OBJ_1(memoryview_itemsize_get_obj, memoryview_itemsize_get);
+
+MP_PROPERTY_GETTER(memoryview_itemsize_obj, (mp_obj_t)&memoryview_itemsize_get_obj);
 #endif
 
 #endif
@@ -785,9 +784,14 @@ const mp_obj_type_t mp_type_bytearray = {
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
 
-#if MICROPY_CPYTHON_COMPAT
+#if MICROPY_CPYTHON_COMPAT || MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
 STATIC const mp_rom_map_elem_t memoryview_locals_dict_table[] = {
+    #if MICROPY_CPYTHON_COMPAT
     { MP_ROM_QSTR(MP_QSTR_cast), MP_ROM_PTR(&memoryview_cast_obj) },
+    #endif
+    #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
+    { MP_ROM_QSTR(MP_QSTR_itemsize), MP_ROM_PTR(&memoryview_itemsize_obj) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(memoryview_locals_dict, memoryview_locals_dict_table);
@@ -798,12 +802,9 @@ const mp_obj_type_t mp_type_memoryview = {
     .flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_memoryview,
     .make_new = memoryview_make_new,
-    #if MICROPY_CPYTHON_COMPAT
+    #if MICROPY_CPYTHON_COMPAT || MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
     .locals_dict = (mp_obj_dict_t *)&memoryview_locals_dict,
     #endif
-    #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-    .attr = memoryview_attr,
-    #endif
     MP_TYPE_EXTENDED_FIELDS(
         .getiter = array_iterator_new,
         .unary_op = array_unary_op,

From 738f626663745fa55c812159ab76f4ffb13d430a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 24 Apr 2023 12:54:37 -0400
Subject: [PATCH 2286/2403] Code formatting in doc

---
 shared-bindings/displayio/Display.c                | 2 +-
 shared-bindings/displayio/EPaperDisplay.c          | 2 +-
 shared-bindings/framebufferio/FramebufferDisplay.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 381924e0ab..451f2c770e 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -426,7 +426,7 @@ MP_PROPERTY_GETTER(displayio_display_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the display.
-//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
+//|     If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 STATIC mp_obj_t displayio_display_obj_get_root_group(mp_obj_t self_in) {
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 8df3b31de9..0df2311b36 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -384,7 +384,7 @@ MP_PROPERTY_GETTER(displayio_epaperdisplay_bus_obj,
 
 //|     root_group: Group
 //|     """The root group on the epaper display.
-//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
+//|     If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 //|
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 806d9957b4..b80b57b435 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -324,7 +324,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra
 
 //|     root_group: displayio.Group
 //|     """The root group on the display.
-//|     If the root group is set to displayio.CIRCUITPYTHON_TERMINAL, the default CircuitPython terminal will be shown.
+//|     If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default CircuitPython terminal will be shown.
 //|     If the root group is set to ``None``, no output will be shown.
 //|     """
 //|

From b9c7cd40281caaf830af3c7ae981a5b37b047f9a Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 24 Apr 2023 12:58:40 -0400
Subject: [PATCH 2287/2403] describe instance more precisely

---
 ports/raspberrypi/bindings/picodvi/Framebuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
index 67d6a286dd..e4584370af 100644
--- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -142,7 +142,7 @@ STATIC mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n
 
 //|     def deinit(self) -> None:
 //|         """Free the resources (pins, timers, etc.) associated with this
-//|         picodvi instance.  After deinitialization, no further operations
+//|         `picodvi.Framebuffer` instance.  After deinitialization, no further operations
 //|         may be performed."""
 //|         ...
 STATIC mp_obj_t picodvi_framebuffer_deinit(mp_obj_t self_in) {

From ac82f8f90b27838b610fe57a4a1295729499e8cd Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Mon, 24 Apr 2023 13:43:09 -0400
Subject: [PATCH 2288/2403] document displayio.CIRCUITPYTHON_TERMINAL

---
 shared-bindings/displayio/__init__.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 77dc8aecee..6b4dc6d895 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -57,6 +57,10 @@
 //| `_.
 //| """
 
+//| CIRCUITPYTHON_TERMINAL: Group
+//| """The `displayio.Group` that is the displayed serial terminal (REPL)."""
+//|
+
 //| import paralleldisplay
 //|
 

From 87fc5eff267e1e29b8b8cafee6cf4dc7076415ea Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 24 Apr 2023 16:24:33 -0700
Subject: [PATCH 2289/2403] Re-enable partial updates when available

---
 shared-module/displayio/EPaperDisplay.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 2f6c8fa5c9..e79c692766 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -139,7 +139,8 @@ STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(display
     if (self->core.current_group != NULL) {
         first_area = displayio_group_get_refresh_areas(self->core.current_group, NULL);
     }
-    if (first_area != NULL) {
+    if (first_area != NULL && self->core.row_command == NO_COMMAND) {
+        // Do a full refresh if the display doesn't support partial updates.
         self->core.area.next = NULL;
         return &self->core.area;
     }

From c4104898cec82bee66ac513322f44b67663e4980 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 23 Apr 2023 09:43:25 -0500
Subject: [PATCH 2290/2403] add additional float validators

---
 py/argcheck.c | 15 +++++++++++++++
 py/runtime.h  |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/py/argcheck.c b/py/argcheck.c
index 465a82c97e..b530d44caa 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -186,6 +186,21 @@ mp_int_t mp_arg_validate_int_range(mp_int_t i, mp_int_t min, mp_int_t max, qstr
     return i;
 }
 
+mp_float_t mp_arg_validate_type_float(mp_obj_t obj, qstr arg_name) {
+    mp_float_t a_float;
+    if (!mp_obj_get_float_maybe(obj, &a_float)) {
+        mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_float, mp_obj_get_type(obj)->name);
+    }
+    return a_float;
+}
+
+void mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name) {
+    const mp_float_t f = mp_arg_validate_type_float(float_in, arg_name);
+    if (f < (mp_float_t)min || f > (mp_float_t)max) {
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), arg_name, min, max);
+    }
+}
+
 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
diff --git a/py/runtime.h b/py/runtime.h
index d154772508..f7b96a27ae 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -103,6 +103,8 @@ 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);
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name);
+void mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name);
+mp_float_t mp_arg_validate_type_float(mp_obj_t obj, qstr arg_name);
 #endif
 mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_name);
 mp_uint_t mp_arg_validate_length_max(mp_uint_t length, mp_uint_t max, qstr arg_name);

From ca6ea83ff5a25422028ebe11c2527af4b7f328d2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 23 Apr 2023 09:28:34 -0500
Subject: [PATCH 2291/2403] Fix `non_negative` validator to allow 0.0

---
 py/argcheck.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index b530d44caa..265b303901 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -204,8 +204,8 @@ void mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t m
 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 <= (mp_float_t)0.0) {
+        : mp_arg_validate_type_float(float_in, arg_name);
+    if (f < (mp_float_t)0.0) {
         mp_raise_ValueError_varg(translate("%q must be >= %d"), arg_name, 0);
     }
     return f;

From 361608119c1ee47e7a055a22096bb0011f3299ac Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 25 Apr 2023 10:33:13 -0400
Subject: [PATCH 2292/2403] Change VID/PID to be Raspberry Pi values

Spotted the Cosmo_pico port on circuitpython.org which is the same class of device as the Pimoroni PICO dv so I'm switching the VID/PID to use the Raspberry Pi owned values rather than the Adafruit values just as the Como device uses.
---
 ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
index 20607d50e4..e4eb325fc1 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
@@ -1,6 +1,6 @@
-USB_VID = 0x239A
-USB_PID = 0x80F4
-USB_PRODUCT = "Pico"
+USB_VID = 0x2E8A
+USB_PID = 0x104C
+USB_PRODUCT = "Pimoroni PICO dv"
 USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = RP2040

From 076cd1fab4279b444f555887718937a902e036da Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Tue, 25 Apr 2023 11:14:48 -0400
Subject: [PATCH 2293/2403] Nope, can't use the COSMO-pico vid/pid pair

Setting back, at least temporarily to the Adafruit pair.
---
 ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
index e4eb325fc1..f78d88add3 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x2E8A
-USB_PID = 0x104C
+USB_VID = 0x239A
+USB_PID = 0x80F4
 USB_PRODUCT = "Pimoroni PICO dv"
 USB_MANUFACTURER = "Raspberry Pi"
 

From 2bee4926f9957f00c33ff8de3447346565ef5669 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 25 Apr 2023 17:22:04 +0200
Subject: [PATCH 2294/2403] Fix Scorpio on-board neopixel pin

---
 .../boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
index 94b6fcee7b..d9cec8d50a 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/mpconfigboard.h
@@ -1,7 +1,7 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 Scorpio"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO16)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO4)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)

From 375a9cd4c500ff7bf04ca426e51a53148477bfea Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 17 Apr 2023 10:59:54 -0500
Subject: [PATCH 2295/2403] add Synthesizer.release

---
 shared-bindings/synthio/Synthesizer.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index 56ad0d76cd..4a4256b5ac 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -92,7 +92,20 @@ STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) {
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesizer_press);
-//
+//|     def release(self, /, release: Sequence[int] = ()) -> None:
+//|         """Turn some notes off. Notes use MIDI numbering, with 60 being middle C, approximately 262Hz.
+//|
+//|         Releasing a note that was already released has no effect.
+//|
+//|         :param Sequence[int] release: Any sequence of integer notes."""
+STATIC mp_obj_t synthio_synthesizer_release(mp_obj_t self_in, mp_obj_t release) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    common_hal_synthio_synthesizer_release(self, release);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthesizer_release);
+
 //|     def release_then_press(
 //|         self, release: Sequence[int] = (), press: Sequence[int] = ()
 //|     ) -> None:
@@ -210,6 +223,7 @@ MP_PROPERTY_GETTER(synthio_synthesizer_pressed_obj,
 STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_press), MP_ROM_PTR(&synthio_synthesizer_press_obj) },
+    { MP_ROM_QSTR(MP_QSTR_release), MP_ROM_PTR(&synthio_synthesizer_release_obj) },
     { MP_ROM_QSTR(MP_QSTR_release_all), MP_ROM_PTR(&synthio_synthesizer_release_all_obj) },
     { MP_ROM_QSTR(MP_QSTR_release_then_press), MP_ROM_PTR(&synthio_synthesizer_release_then_press_obj) },
     { MP_ROM_QSTR(MP_QSTR_release_all_then_press), MP_ROM_PTR(&synthio_synthesizer_release_all_then_press_obj) },

From 12c1a72f03209837e894d081eabaab3e975413eb Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 12 Apr 2023 20:26:46 -0500
Subject: [PATCH 2296/2403] synthio: implement envelope

This works for me (tested playing midi to raw files on host computer, as
well as a variant of the nunchuk instrument on pygamer)

it has to re-factor how/when MIDI reading occurs, because reasons.

endorse new test results

.. and allow `-1` to specify a note with no sustain (plucked)
---
 shared-bindings/audiocore/__init__.c   |  18 ++-
 shared-bindings/synthio/MidiTrack.c    |  11 +-
 shared-bindings/synthio/MidiTrack.h    |   8 +-
 shared-bindings/synthio/Synthesizer.c  |  44 +++++-
 shared-bindings/synthio/Synthesizer.h  |   4 +-
 shared-bindings/synthio/__init__.c     | 111 ++++++++++++-
 shared-bindings/synthio/__init__.h     |   6 +
 shared-module/synthio/MidiTrack.c      | 167 +++++++++----------
 shared-module/synthio/MidiTrack.h      |   7 +-
 shared-module/synthio/Synthesizer.c    |  33 ++--
 shared-module/synthio/__init__.c       | 211 +++++++++++++++++++++----
 shared-module/synthio/__init__.h       |  33 +++-
 tests/circuitpython/miditrack.py       |   6 +-
 tests/circuitpython/miditrack.py.exp   |   4 +-
 tests/circuitpython/synthesizer.py     |  16 +-
 tests/circuitpython/synthesizer.py.exp |  32 +++-
 16 files changed, 535 insertions(+), 176 deletions(-)

diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c
index 6f32979099..3ecd7391b6 100644
--- a/shared-bindings/audiocore/__init__.c
+++ b/shared-bindings/audiocore/__init__.c
@@ -27,6 +27,7 @@
 #include 
 
 #include "py/obj.h"
+#include "py/gc.h"
 #include "py/runtime.h"
 
 #include "shared-bindings/audiocore/__init__.h"
@@ -46,8 +47,23 @@ STATIC mp_obj_t audiocore_get_buffer(mp_obj_t sample_in) {
     mp_obj_t result[2] = {mp_obj_new_int_from_uint(gbr), mp_const_none};
 
     if (gbr != GET_BUFFER_ERROR) {
+        bool single_buffer, samples_signed;
+        uint32_t max_buffer_length;
+        uint8_t spacing;
+
+        uint8_t bits_per_sample = audiosample_bits_per_sample(sample_in);
+        audiosample_get_buffer_structure(sample_in, false, &single_buffer, &samples_signed, &max_buffer_length, &spacing);
         // copies the data because the gc semantics of get_buffer are unclear
-        result[1] = mp_obj_new_bytes(buffer, buffer_length);
+        void *result_buf = gc_alloc(buffer_length, 0, false);
+        memcpy(result_buf, buffer, buffer_length);
+        char typecode =
+            (bits_per_sample == 8 && samples_signed) ? 'b' :
+            (bits_per_sample == 8 && !samples_signed) ? 'B' :
+            (bits_per_sample == 16 && samples_signed) ? 'h' :
+            (bits_per_sample == 16 && !samples_signed) ? 'H' :
+            'b';
+        size_t nitems = buffer_length / (bits_per_sample / 8);
+        result[1] = mp_obj_new_memoryview(typecode, nitems, result_buf);
     }
 
     return mp_obj_new_tuple(2, result);
diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 20a203ce9c..6916a21689 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -44,7 +44,8 @@
 //|         tempo: int,
 //|         *,
 //|         sample_rate: int = 11025,
-//|         waveform: ReadableBuffer = None
+//|         waveform: Optional[ReadableBuffer] = None,
+//|         envelope: Optional[Envelope] = None,
 //|     ) -> None:
 //|         """Create a MidiTrack from the given stream of MIDI events. Only "Note On" and "Note Off" events
 //|         are supported; channel numbers and key velocities are ignored. Up to two notes may be on at the
@@ -54,6 +55,7 @@
 //|         :param int tempo: Tempo of the streamed events, in MIDI ticks per second
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
 //|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
+//|         :param Envelope envelope: An object that defines the loudness of a note over time. The default envelope provides no ramping, voices turn instantly on and off.
 //|
 //|         Simple melody::
 //|
@@ -72,12 +74,13 @@
 //|           print("stopped")"""
 //|         ...
 STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_buffer, ARG_tempo, ARG_sample_rate, ARG_waveform };
+    enum { ARG_buffer, ARG_tempo, ARG_sample_rate, ARG_waveform, ARG_envelope };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_tempo, MP_ARG_INT | MP_ARG_REQUIRED },
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
         { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
+        { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -96,7 +99,9 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
         args[ARG_tempo].u_int,
         args[ARG_sample_rate].u_int,
         bufinfo_waveform.buf,
-        bufinfo_waveform.len / 2);
+        bufinfo_waveform.len / 2,
+        args[ARG_envelope].u_obj
+        );
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/synthio/MidiTrack.h b/shared-bindings/synthio/MidiTrack.h
index 90ddab8728..046163c2de 100644
--- a/shared-bindings/synthio/MidiTrack.h
+++ b/shared-bindings/synthio/MidiTrack.h
@@ -24,20 +24,18 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO_MIDITRACK_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO_MIDITRACK_H
+#pragma once
 
 #include "shared-module/synthio/MidiTrack.h"
 
 extern const mp_obj_type_t synthio_miditrack_type;
 
 void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
-    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len);
+    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len,
+    mp_obj_t envelope);
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self);
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self);
 uint32_t common_hal_synthio_miditrack_get_sample_rate(synthio_miditrack_obj_t *self);
 uint8_t common_hal_synthio_miditrack_get_bits_per_sample(synthio_miditrack_obj_t *self);
 uint8_t common_hal_synthio_miditrack_get_channel_count(synthio_miditrack_obj_t *self);
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_SYNTHIO_MIDITRACK_H
diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index 4a4256b5ac..97941b860b 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -37,24 +37,29 @@
 #include "supervisor/shared/translate/translate.h"
 
 //| class Synthesizer:
-//|     def __init__(self, *, sample_rate: int = 11025, waveform: ReadableBuffer = None) -> None:
+//|     def __init__(
+//|         self,
+//|         *,
+//|         sample_rate: int = 11025,
+//|         waveform: Optional[ReadableBuffer] = None,
+//|         envelope: Optional[Envelope] = None,
+//|     ) -> None:
 //|         """Create a synthesizer object.
 //|
 //|         This API is experimental.
 //|
-//|         At least 2 simultaneous notes are supported.  mimxrt10xx and rp2040 platforms support up to
-//|         12 notes.
-//|
 //|         Notes use MIDI note numbering, with 60 being C4 or Middle C, approximately 262Hz.
 //|
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
-//|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit). It is permitted to modify this buffer during synthesis. This can be used, for instance, to control the overall volume or timbre of the notes.
+//|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
+//|         :param Optional[Envelope] envelope: An object that defines the loudness of a note over time. The default envelope, `None` provides no ramping, voices turn instantly on and off.
 //|         """
 STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_sample_rate, ARG_waveform };
+    enum { ARG_sample_rate, ARG_waveform, ARG_envelope };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
         { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
+        { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -68,7 +73,9 @@ STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n
     common_hal_synthio_synthesizer_construct(self,
         args[ARG_sample_rate].u_int,
         bufinfo_waveform.buf,
-        bufinfo_waveform.len / 2);
+        bufinfo_waveform.len / 2,
+        args[ARG_envelope].u_obj);
+
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -191,6 +198,28 @@ STATIC mp_obj_t synthio_synthesizer_obj___exit__(size_t n_args, const mp_obj_t *
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_synthesizer___exit___obj, 4, 4, synthio_synthesizer_obj___exit__);
+
+//|     envelope: Optional[Envelope]
+//|     """The envelope to apply to all notes. `None`, the default envelope, instantly turns notes on and off. The envelope may be changed dynamically, but it affects all notes (even currently playing notes)"""
+STATIC mp_obj_t synthio_synthesizer_obj_get_envelope(mp_obj_t self_in) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return synthio_synth_envelope_get(&self->synth);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_envelope_obj, synthio_synthesizer_obj_get_envelope);
+
+STATIC mp_obj_t synthio_synthesizer_obj_set_envelope(mp_obj_t self_in, mp_obj_t envelope) {
+    synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    synthio_synth_envelope_set(&self->synth, envelope);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_set_envelope_obj, synthio_synthesizer_obj_set_envelope);
+
+MP_PROPERTY_GETSET(synthio_synthesizer_envelope_obj,
+    (mp_obj_t)&synthio_synthesizer_get_envelope_obj,
+    (mp_obj_t)&synthio_synthesizer_set_envelope_obj);
+
 //|     sample_rate: int
 //|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
 STATIC mp_obj_t synthio_synthesizer_obj_get_sample_rate(mp_obj_t self_in) {
@@ -232,6 +261,7 @@ STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&synthio_synthesizer___exit___obj) },
 
     // Properties
+    { MP_ROM_QSTR(MP_QSTR_envelope), MP_ROM_PTR(&synthio_synthesizer_envelope_obj) },
     { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&synthio_synthesizer_sample_rate_obj) },
     { MP_ROM_QSTR(MP_QSTR_max_polyphony), MP_ROM_INT(CIRCUITPY_SYNTHIO_MAX_CHANNELS) },
     { MP_ROM_QSTR(MP_QSTR_pressed), MP_ROM_PTR(&synthio_synthesizer_pressed_obj) },
diff --git a/shared-bindings/synthio/Synthesizer.h b/shared-bindings/synthio/Synthesizer.h
index 92e75a1c23..ba6c3b99e3 100644
--- a/shared-bindings/synthio/Synthesizer.h
+++ b/shared-bindings/synthio/Synthesizer.h
@@ -32,8 +32,8 @@
 extern const mp_obj_type_t synthio_synthesizer_type;
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len);
-
+    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+    mp_obj_t envelope);
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self);
 bool common_hal_synthio_synthesizer_deinited(synthio_synthesizer_obj_t *self);
 uint32_t common_hal_synthio_synthesizer_get_sample_rate(synthio_synthesizer_obj_t *self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 3c50377ff8..703966defc 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -28,6 +28,7 @@
 
 #include "py/mperrno.h"
 #include "py/obj.h"
+#include "py/objnamedtuple.h"
 #include "py/runtime.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_posix.h"
@@ -36,16 +37,111 @@
 #include "shared-bindings/synthio/MidiTrack.h"
 #include "shared-bindings/synthio/Synthesizer.h"
 
-//| """Support for MIDI synthesis"""
+//| """Support for multi-channel audio synthesis
 //|
-//| def from_file(file: typing.BinaryIO, *, sample_rate: int = 11025) -> MidiTrack:
+//| At least 2 simultaneous notes are supported.  samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
+//|
+//| I'm a little teapot. I'm not on line 11, but I don't know what is.
+//| """
+//|
+//| class Envelope:
+//|     def __init__(
+//|         self,
+//|         attack_time: float,
+//|         decay_time: float,
+//|         release_time: float,
+//|         attack_level: float,
+//|         sustain_level: float,
+//|     ) -> None:
+//|         """Construct an Envelope object
+//|
+//|         The Envelope defines an ADSR (Attack, Decay, Sustain, Release) envelope with linear amplitude ramping. A note starts at 0 volume, then increases to ``attack_level`` over ``attack_time`` seconds; then it decays to ``sustain_level`` over ``decay_time`` seconds. Finally, when the note is released, it decreases to ``0`` volume over ``release_time``.
+//|
+//|         If the ``sustain_level`` of an envelope is 0, then the decay and sustain phases of the note are always omitted. The note is considered to be released as soon as the envelope reaches the end of the attack phase. The ``decay_time`` is ignored. This is similar to how a plucked or struck instrument behaves.
+//|
+//|         If a note is released before it reaches its sustain phase, it decays with the same slope indicated by ``sustain_level/release_time`` (or ``attack_level/release_time`` for plucked envelopes)
+//|
+//|         :param float attack_time: The time in seconds it takes to ramp from 0 volume to attack_volume
+//|         :param float decay_time: The time in seconds it takes to ramp from attack_volume to sustain_volume
+//|         :param float release_time: The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``
+//|         :param float attack_level: The relative level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase
+//|         :param float sustain_level: The relative level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase
+//|         """
+//|     attack_time: float
+//|     """The time in seconds it takes to ramp from 0 volume to attack_volume"""
+//|
+//|     decay_time: float
+//|     """The time in seconds it takes to ramp from attack_volume to sustain_volume"""
+//|
+//|     release_time: float
+//|     """The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``"""
+//|
+//|     attack_level: float
+//|     """The relative level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase"""
+//|
+//|     sustain_level: float
+//|     """The relative level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase"""
+//|
+
+STATIC mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_obj_t new_obj = namedtuple_make_new(type_in, n_args, n_kw, args);
+    mp_obj_t *fields;
+    size_t len;
+    mp_obj_tuple_get(new_obj, &len, &fields);
+
+    mp_arg_validate_obj_float_non_negative(fields[0], 0., MP_QSTR_attack_time);
+    mp_arg_validate_obj_float_non_negative(fields[1], 0., MP_QSTR_decay_time);
+    mp_arg_validate_obj_float_non_negative(fields[2], 0., MP_QSTR_release_time);
+
+    mp_arg_validate_obj_float_range(fields[3], 0, 1, MP_QSTR_attack_level);
+    mp_arg_validate_obj_float_range(fields[4], 0, 1, MP_QSTR_sustain_level);
+
+    return new_obj;
+};
+
+const mp_obj_namedtuple_type_t synthio_envelope_type_obj = {
+    .base = {
+        .base = {
+            .type = &mp_type_type
+        },
+        .flags = MP_TYPE_FLAG_EXTENDED,
+        .name = MP_QSTR_Envelope,
+        .print = namedtuple_print,
+        .parent = &mp_type_tuple,
+        .make_new = synthio_envelope_make_new,
+        .attr = namedtuple_attr,
+        MP_TYPE_EXTENDED_FIELDS(
+            .unary_op = mp_obj_tuple_unary_op,
+            .binary_op = mp_obj_tuple_binary_op,
+            .subscr = mp_obj_tuple_subscr,
+            .getiter = mp_obj_tuple_getiter,
+            ),
+    },
+    .n_fields = 5,
+    .fields = {
+        MP_QSTR_attack_time,
+        MP_QSTR_decay_time,
+        MP_QSTR_release_time,
+        MP_QSTR_attack_level,
+        MP_QSTR_sustain_level,
+    },
+};
+
+
+//| def from_file(
+//|     file: typing.BinaryIO,
+//|     *,
+//|     sample_rate: int = 11025,
+//|     waveform: Optional[ReadableBuffer] = None,
+//|     envelope: Optional[ReadableBuffer] = None,
+//| ) -> MidiTrack:
 //|     """Create an AudioSample from an already opened MIDI file.
 //|     Currently, only single-track MIDI (type 0) is supported.
 //|
 //|     :param typing.BinaryIO file: Already opened MIDI file
 //|     :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
 //|     :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
-//|
+//|     :param Envelope envelope: An object that defines the loudness of a note over time. The default envelope provides no ramping, voices turn instantly on and off.
 //|
 //|     Playing a MIDI file from flash::
 //|
@@ -65,11 +161,12 @@
 //|     ...
 //|
 STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_file, ARG_sample_rate, ARG_waveform };
+    enum { ARG_file, ARG_sample_rate, ARG_waveform, ARG_envelope };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
         { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
+        { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.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);
@@ -121,7 +218,9 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     result->base.type = &synthio_miditrack_type;
 
     common_hal_synthio_miditrack_construct(result, buffer, track_size,
-        tempo, args[ARG_sample_rate].u_int, bufinfo_waveform.buf, bufinfo_waveform.len / 2);
+        tempo, args[ARG_sample_rate].u_int, bufinfo_waveform.buf, bufinfo_waveform.len / 2,
+        args[ARG_envelope].u_obj
+        );
 
     #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
     m_free(buffer, track_size);
@@ -133,12 +232,12 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file);
 
-
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
     { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
     { MP_ROM_QSTR(MP_QSTR_from_file), MP_ROM_PTR(&synthio_from_file_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Envelope), MP_ROM_PTR(&synthio_envelope_type_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(synthio_module_globals, synthio_module_globals_table);
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index 3b7d47db28..6ea323905a 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -26,4 +26,10 @@
 
 #pragma once
 
+#include "py/objnamedtuple.h"
+
+typedef struct synthio_synth synthio_synth_t;
 extern int16_t shared_bindings_synthio_square_wave[];
+extern const mp_obj_namedtuple_type_t synthio_envelope_type_obj;
+void synthio_synth_envelope_set(synthio_synth_t *synth, mp_obj_t envelope_obj);
+mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth);
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index f8b39c29e3..6a021af85c 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -28,118 +28,109 @@
 #include "shared-bindings/synthio/MidiTrack.h"
 
 
-STATIC NORETURN void raise_midi_stream_error(uint32_t pos) {
-    mp_raise_ValueError_varg(translate("Error in MIDI stream at position %d"), pos);
+STATIC void print_midi_stream_error(synthio_miditrack_obj_t *self) {
+    mp_cprintf(&mp_plat_print, translate("Error in MIDI stream at position %d"), self->pos);
+    self->pos = self->track.len;
 }
 
-STATIC uint8_t parse_note(const uint8_t *buffer, uint32_t len, uint32_t *pos) {
-    if (*pos + 1 >= len) {
-        raise_midi_stream_error(*pos);
+STATIC uint8_t parse_note(synthio_miditrack_obj_t *self) {
+    uint8_t *buffer = self->track.buf;
+    size_t len = self->track.len;
+    if (self->pos + 1 >= len) {
+        print_midi_stream_error(self);
     }
-    uint8_t note = buffer[(*pos)++];
-    if (note > 127 || buffer[(*pos)++] > 127) {
-        raise_midi_stream_error(*pos);
+    uint8_t note = buffer[(self->pos)++];
+    if (note > 127 || buffer[(self->pos)++] > 127) {
+        print_midi_stream_error(self);
     }
     return note;
 }
 
-STATIC void terminate_span(synthio_miditrack_obj_t *self, uint16_t *dur) {
-    if (*dur) {
-        self->track[self->total_spans - 1].dur = *dur;
-        *dur = 0;
-    } else {
-        self->total_spans--;
+static int decode_duration(synthio_miditrack_obj_t *self) {
+    uint8_t *buffer = self->track.buf;
+    size_t len = self->track.len;
+    uint8_t c;
+    uint32_t delta = 0;
+    do {
+        c = buffer[self->pos++];
+        delta <<= 7;
+        delta |= c & 0x7f;
+    } while ((c & 0x80) && (self->pos < len));
+
+    // errors cannot be raised from the background task, so simply end the track.
+    if (c & 0x80) {
+        self->pos = self->track.len;
+        print_midi_stream_error(self);
     }
+    return delta * self->synth.sample_rate / self->tempo;
 }
 
-STATIC void add_span(synthio_miditrack_obj_t *self, const synthio_midi_span_t *span) {
-    self->track = m_renew(synthio_midi_span_t, self->track, self->total_spans, self->total_spans + 1);
-    self->track[self->total_spans++] = *span;
-}
-
-STATIC void change_span_note(synthio_miditrack_obj_t *self, uint8_t old_note, uint8_t new_note, uint16_t *dur) {
-    synthio_midi_span_t span = self->track[self->total_spans - 1];
-    if (synthio_span_change_note(&span, old_note, new_note)) {
-        terminate_span(self, dur);
-        add_span(self, &span);
-        *dur = 0;
-    }
-}
-
-void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
-    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate,
-    const int16_t *waveform, uint16_t waveform_length) {
-
-    self->synth.sample_rate = sample_rate;
-    self->track = m_malloc(sizeof(synthio_midi_span_t), false);
-    synthio_span_init(self->track);
-    self->next_span = 0;
-    self->total_spans = 1;
-    self->synth.waveform = waveform;
-    self->synth.waveform_length = waveform_length;
-
-    uint16_t dur = 0;
-    uint32_t pos = 0;
-    while (pos < len) {
-        uint8_t c;
-        uint32_t delta = 0;
-        do {
-            c = buffer[pos++];
-            delta <<= 7;
-            delta |= c & 0x7f;
-        } while ((c & 0x80) && (pos < len));
-
-        if (c & 0x80) {
-            raise_midi_stream_error(pos);
-        }
-
-        // dur is carried over here so that if a note on/off message doesn't actually produce a change, the
-        // underlying "span" is extended. Otherwise, it is zeroed out in the call to `terminate_span`.
-        dur += delta * sample_rate / tempo;
-
-        switch (buffer[pos++] >> 4) {
+// invariant: pointing at a MIDI message
+static void decode_until_pause(synthio_miditrack_obj_t *self) {
+    uint8_t *buffer = self->track.buf;
+    size_t len = self->track.len;
+    do {
+        switch (buffer[self->pos++] >> 4) {
             case 8: { // Note Off
-                uint8_t note = parse_note(buffer, len, &pos);
-                change_span_note(self, note, SYNTHIO_SILENCE, &dur);
+                uint8_t note = parse_note(self);
+                synthio_span_change_note(&self->synth, note, SYNTHIO_SILENCE);
                 break;
             }
             case 9: { // Note On
-                uint8_t note = parse_note(buffer, len, &pos);
-                change_span_note(self, SYNTHIO_SILENCE, note, &dur);
+                uint8_t note = parse_note(self);
+                synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, note);
                 break;
             }
             case 10:
             case 11:
             case 14: // two data bytes to ignore
-                parse_note(buffer, len, &pos);
+                parse_note(self);
                 break;
             case 12:
             case 13: // one data byte to ignore
-                if (pos >= len || buffer[pos++] > 127) {
-                    raise_midi_stream_error(pos);
+                if (self->pos >= len || buffer[self->pos++] > 127) {
+                    print_midi_stream_error(self);
                 }
                 break;
             case 15: // the full syntax is too complicated, just assume it's "End of Track" event
-                pos = len;
+                self->pos = len;
                 break;
             default: // invalid event
-                raise_midi_stream_error(pos);
+                print_midi_stream_error(self);
         }
-    }
-    terminate_span(self, &dur);
+        if (self->pos < len) {
+            self->synth.span.dur = decode_duration(self);
+        }
+    } while (self->pos < len && self->synth.span.dur == 0);
+}
 
-    uint16_t max_dur = 0;
-    for (int i = 0; i < self->total_spans; i++) {
-        max_dur = MAX(self->track[i].dur, max_dur);
+STATIC void start_parse(synthio_miditrack_obj_t *self) {
+    self->pos = 0;
+    self->synth.span.dur = decode_duration(self);
+    if (self->synth.span.dur == 0) {
+        // the usual case: the file starts with some MIDI event, not a delay
+        decode_until_pause(self);
     }
-    synthio_synth_init(&self->synth, max_dur);
+}
+
+void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
+    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate,
+    const int16_t *waveform, uint16_t waveform_length,
+    mp_obj_t envelope) {
+
+    self->tempo = tempo;
+    self->track.buf = (void *)buffer;
+    self->track.len = len;
+
+    synthio_synth_init(&self->synth, sample_rate, waveform, waveform_length, envelope);
+
+    start_parse(self);
 }
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self) {
     synthio_synth_deinit(&self->synth);
-    m_del(synthio_midi_span_t, self->track, self->total_spans + 1);
-    self->track = NULL;
 }
+
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self) {
     return synthio_synth_deinited(&self->synth);
 }
@@ -157,25 +148,21 @@ 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_output, uint8_t channel) {
     synthio_synth_reset_buffer(&self->synth, single_channel_output, channel);
-    self->synth.span.dur = 0;
-    self->next_span = 0;
+    start_parse(self);
 }
 
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
 
-    if (self->synth.span.dur == 0) {
-        if (self->next_span >= self->total_spans) {
-            *buffer_length = 0;
-            return GET_BUFFER_DONE;
-        }
-        self->synth.span = self->track[self->next_span++];
-    }
-
     synthio_synth_synthesize(&self->synth, buffer, buffer_length, single_channel_output ? 0 : channel);
-
-    return (self->synth.span.dur == 0 && self->next_span >= self->total_spans) ?
-           GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
+    if (self->synth.span.dur == 0) {
+        if (self->pos == self->track.len) {
+            return GET_BUFFER_DONE;
+        } else {
+            decode_until_pause(self);
+        }
+    }
+    return GET_BUFFER_MORE_DATA;
 }
 
 void synthio_miditrack_get_buffer_structure(synthio_miditrack_obj_t *self, bool single_channel_output,
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index e301ef355f..549e72fb25 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -34,9 +34,10 @@
 typedef struct {
     mp_obj_base_t base;
     synthio_synth_t synth;
-    uint16_t next_span;
-    uint16_t total_spans;
-    synthio_midi_span_t *track;
+    mp_buffer_info_t track;
+    // invariant: after initial startup, pos always points just after an encoded duration, i.e., at a midi message (or at EOF)
+    size_t pos;
+    uint32_t tempo;
 } synthio_miditrack_obj_t;
 
 
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index 25c91ecbe0..42d0468845 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -30,13 +30,10 @@
 
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length) {
+    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+    mp_obj_t envelope) {
 
-    self->synth.sample_rate = sample_rate;
-    self->synth.waveform = waveform;
-    self->synth.waveform_length = waveform_length;
-    synthio_synth_init(&self->synth, SYNTHIO_MAX_DUR);
-    common_hal_synthio_synthesizer_release_all(self);
+    synthio_synth_init(&self->synth, sample_rate, waveform, waveform_length, envelope);
 }
 
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self) {
@@ -74,14 +71,18 @@ void synthio_synthesizer_get_buffer_structure(synthio_synthesizer_obj_t *self, b
 }
 
 void common_hal_synthio_synthesizer_release_all(synthio_synthesizer_obj_t *self) {
-    synthio_span_init(&self->synth.span);
+    for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (self->synth.span.note[i] != SYNTHIO_SILENCE) {
+            synthio_span_change_note(&self->synth, self->synth.span.note[i], SYNTHIO_SILENCE);
+        }
+    }
 }
 void common_hal_synthio_synthesizer_release(synthio_synthesizer_obj_t *self, mp_obj_t to_release) {
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(to_release, &iter_buf);
     mp_obj_t item;
     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        synthio_span_change_note(&self->synth.span, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note), SYNTHIO_SILENCE);
+        synthio_span_change_note(&self->synth, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note), SYNTHIO_SILENCE);
     }
 }
 
@@ -90,15 +91,21 @@ void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_ob
     mp_obj_t iterable = mp_getiter(to_press, &iter_buf);
     mp_obj_t item;
     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        synthio_span_change_note(&self->synth.span, SYNTHIO_SILENCE, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note));
+        synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note));
     }
 }
 
 mp_obj_t common_hal_synthio_synthesizer_get_pressed_notes(synthio_synthesizer_obj_t *self) {
-    mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(synthio_span_count_active_channels(&self->synth.span), NULL));
-    for (size_t i = 0, j = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (self->synth.span.note[i] != SYNTHIO_SILENCE) {
-            result->items[j++] = MP_OBJ_NEW_SMALL_INT(self->synth.span.note[i]);
+    int count = 0;
+    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        if (self->synth.span.note[chan] != SYNTHIO_SILENCE && self->synth.envelope_state[chan].state != SYNTHIO_ENVELOPE_STATE_RELEASE) {
+            count += 1;
+        }
+    }
+    mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(count, NULL));
+    for (size_t chan = 0, j = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        if (self->synth.span.note[chan] != SYNTHIO_SILENCE && self->synth.envelope_state[chan].state != SYNTHIO_ENVELOPE_STATE_RELEASE) {
+            result->items[j++] = MP_OBJ_NEW_SMALL_INT(self->synth.span.note[chan]);
         }
     }
     return MP_OBJ_FROM_PTR(result);
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 11e4c1dcc9..1385059b99 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -26,18 +26,117 @@
  */
 
 #include "shared-module/synthio/__init__.h"
+#include "shared-bindings/synthio/__init__.h"
 #include "py/runtime.h"
+#include 
+#include 
 
-STATIC const int16_t square_wave[] = {-32768, 32767};
+STATIC const int16_t square_wave[] = {-32768, 0};
 
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
-int synthio_span_count_active_channels(synthio_midi_span_t *span) {
-    int result = 0;
-    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (span->note[i] != SYNTHIO_SILENCE) {
-            result += 1;
+STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int16_t difference) {
+    mp_float_t time = mp_obj_get_float(time_in);
+    int num_samples = (int)MICROPY_FLOAT_C_FUN(round)(time * sample_rate);
+    if (num_samples == 0) {
+        return 0;
+    }
+    int16_t result = MIN(32767, MAX(1, abs(difference * SYNTHIO_MAX_DUR) / num_samples));
+    return (difference < 0) ? -result : result;
+}
+
+STATIC void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp_obj_t obj, uint32_t sample_rate) {
+    if (obj == mp_const_none) {
+        envelope->attack_level = 32767;
+        envelope->sustain_level = 32767;
+        envelope->attack_step = 32767;
+        envelope->decay_step = -32767;
+        envelope->release_step = -32767;
+        return;
+    }
+    mp_arg_validate_type(obj, (mp_obj_type_t *)&synthio_envelope_type_obj, MP_QSTR_envelope);
+
+    size_t len;
+    mp_obj_t *fields;
+    mp_obj_tuple_get(obj, &len, &fields);
+
+    envelope->attack_level = (int)(32767 * mp_obj_get_float(fields[3]));
+    envelope->sustain_level = (int)(32767 * mp_obj_get_float(fields[4]));
+
+    envelope->attack_step = convert_time_to_rate(
+        sample_rate, fields[0], envelope->attack_level);
+
+    envelope->decay_step = -convert_time_to_rate(
+        sample_rate, fields[1], envelope->attack_level - envelope->sustain_level);
+
+    envelope->release_step = -convert_time_to_rate(
+        sample_rate, fields[2],
+        envelope->decay_step
+            ? envelope->sustain_level
+            : envelope->attack_level);
+}
+
+STATIC void synthio_envelope_state_step(synthio_envelope_state_t *state, synthio_envelope_definition_t *def, size_t n_steps) {
+    state->substep += n_steps;
+    while (state->substep >= SYNTHIO_MAX_DUR) {
+        // max n_steps should be SYNTHIO_MAX_DUR so this loop executes at most
+        // once
+        state->substep -= SYNTHIO_MAX_DUR;
+        switch (state->state) {
+            case SYNTHIO_ENVELOPE_STATE_SUSTAIN:
+                break;
+            case SYNTHIO_ENVELOPE_STATE_ATTACK:
+                if (def->attack_step != 0) {
+                    state->level = MIN(state->level + def->attack_step, def->attack_level);
+                    if (state->level == def->attack_level) {
+                        state->state = SYNTHIO_ENVELOPE_STATE_DECAY;
+                    }
+                    break;
+                }
+                state->state = SYNTHIO_ENVELOPE_STATE_DECAY;
+                MP_FALLTHROUGH;
+            case SYNTHIO_ENVELOPE_STATE_DECAY:
+                if (def->decay_step != 0) {
+                    state->level = MAX(state->level + def->decay_step, def->sustain_level);
+                    assert(state->level >= 0);
+                    if (state->level == def->sustain_level) {
+                        state->state = SYNTHIO_ENVELOPE_STATE_SUSTAIN;
+                    }
+                    break;
+                }
+                state->state = SYNTHIO_ENVELOPE_STATE_RELEASE;
+                MP_FALLTHROUGH;
+            case SYNTHIO_ENVELOPE_STATE_RELEASE:
+                if (def->release_step != 0) {
+                    int delta = def->release_step;
+                    state->level = MAX(state->level + delta, 0);
+                } else {
+                    state->level = 0;
+                }
+                break;
+        }
+    }
+}
+
+STATIC void synthio_envelope_state_init(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) {
+    state->level = 0;
+    state->substep = 0;
+    state->state = SYNTHIO_ENVELOPE_STATE_ATTACK;
+
+    synthio_envelope_state_step(state, def, SYNTHIO_MAX_DUR);
+}
+
+STATIC void synthio_envelope_state_release(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) {
+    state->state = SYNTHIO_ENVELOPE_STATE_RELEASE;
+}
+
+
+STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
+    uint32_t result = 0;
+    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        if (synth->span.note[chan] != SYNTHIO_SILENCE) {
+            result += synth->envelope_state[chan].level;
         }
     }
     return result;
@@ -62,16 +161,23 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     memset(out_buffer, 0, synth->buffer_length);
 
     int32_t sample_rate = synth->sample_rate;
-    int active_channels = synthio_span_count_active_channels(&synth->span);
+    uint32_t total_envelope = synthio_synth_sum_envelope(synth);
     const int16_t *waveform = synth->waveform;
     uint32_t waveform_length = synth->waveform_length;
-    if (active_channels) {
-        int16_t loudness = 0xffff / (1 + 2 * active_channels);
+    if (total_envelope > 0) {
+        uint16_t ovl_loudness = 0x7fffffff / MAX(0x8000, total_envelope);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
             if (synth->span.note[chan] == SYNTHIO_SILENCE) {
                 synth->accum[chan] = 0;
                 continue;
             }
+            // adjust loudness by envelope
+            uint16_t loudness = (ovl_loudness * synth->envelope_state[chan].level) >> 16;
+
+            if (synth->envelope_state[chan].level == 0) {
+                // note is truly finished
+                synth->span.note[chan] = SYNTHIO_SILENCE;
+            }
             uint8_t octave = synth->span.note[chan] / 12;
             uint16_t base_freq = notes[synth->span.note[chan] % 12];
             uint32_t accum = synth->accum[chan];
@@ -95,6 +201,11 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
         }
     }
 
+    // advance envelope states
+    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        synthio_envelope_state_step(&synth->envelope_state[chan], &synth->envelope_definition, dur);
+    }
+
     *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
     *bufptr = (uint8_t *)out_buffer;
 }
@@ -117,11 +228,28 @@ void synthio_synth_deinit(synthio_synth_t *synth) {
     synth->buffers[1] = NULL;
 }
 
-void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur) {
-    synth->buffer_length = MIN(SYNTHIO_MAX_DUR, max_dur) * SYNTHIO_BYTES_PER_SAMPLE;
+void synthio_synth_envelope_set(synthio_synth_t *synth, mp_obj_t envelope_obj) {
+    synthio_envelope_definition_set(&synth->envelope_definition, envelope_obj, synth->sample_rate);
+    synth->envelope_obj = envelope_obj;
+}
+
+mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth) {
+    return synth->envelope_obj;
+}
+
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length, mp_obj_t envelope_obj) {
+    synth->buffer_length = SYNTHIO_MAX_DUR * SYNTHIO_BYTES_PER_SAMPLE;
     synth->buffers[0] = m_malloc(synth->buffer_length, false);
     synth->buffers[1] = m_malloc(synth->buffer_length, false);
     synth->other_channel = -1;
+    synth->waveform = waveform;
+    synth->waveform_length = waveform_length;
+    synth->sample_rate = sample_rate;
+    synthio_synth_envelope_set(synth, envelope_obj);
+
+    for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        synth->span.note[i] = SYNTHIO_SILENCE;
+    }
 }
 
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
@@ -132,40 +260,57 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan
     *spacing = 1;
 }
 
+static bool parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what) {
+    if (o != mp_const_none) {
+        mp_get_buffer_raise(o, bufinfo, MP_BUFFER_READ);
+        if (bufinfo->typecode != 'h') {
+            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), what);
+        }
+        mp_arg_validate_length_range(bufinfo->len / 2, 2, 1024, what);
+        return true;
+    }
+    return false;
+}
+
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj) {
     *bufinfo_waveform = ((mp_buffer_info_t) { .buf = (void *)square_wave, .len = 4 });
+    parse_common(bufinfo_waveform, waveform_obj, MP_QSTR_waveform);
+}
 
-    if (waveform_obj != mp_const_none) {
-        mp_get_buffer_raise(waveform_obj, bufinfo_waveform, MP_BUFFER_READ);
-        if (bufinfo_waveform->typecode != 'h') {
-            mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), MP_QSTR_waveform);
+STATIC int find_channel_with_note(synthio_synth_t *synth, uint8_t note) {
+    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+        if (synth->span.note[i] == note) {
+            return i;
         }
     }
-    mp_arg_validate_length_range(bufinfo_waveform->len / 2, 2, 1024, MP_QSTR_waveform);
-}
-
-void synthio_span_init(synthio_midi_span_t *span) {
-    span->dur = 0;
-    for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) { span->note[i] = SYNTHIO_SILENCE;
-    }
-}
-
-STATIC int find_channel_with_note(const synthio_midi_span_t *span, uint8_t note) {
-    for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (span->note[i] == note) {
-            return i;
+    if (note == SYNTHIO_SILENCE) {
+        // we need a victim note that is releasing. simple algorithm: lowest numbered slot
+        for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
+            if (SYNTHIO_VOICE_IS_RELEASING(synth, i)) {
+                return i;
+            }
         }
     }
     return -1;
 }
 
-bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note) {
-    if (new_note != SYNTHIO_SILENCE && find_channel_with_note(span, new_note) != -1) {
-        return false; // note already pressed, do nothing
+bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t new_note) {
+    int channel;
+    if (new_note != SYNTHIO_SILENCE && (channel = find_channel_with_note(synth, new_note)) != -1) {
+        // note already playing, re-strike
+        synthio_envelope_state_init(&synth->envelope_state[channel], &synth->envelope_definition);
+        synth->accum[channel] = 0;
+        return true;
     }
-    int channel = find_channel_with_note(span, old_note);
+    channel = find_channel_with_note(synth, old_note);
     if (channel != -1) {
-        span->note[channel] = new_note;
+        if (new_note == SYNTHIO_SILENCE) {
+            synthio_envelope_state_release(&synth->envelope_state[channel], &synth->envelope_definition);
+        } else {
+            synth->span.note[channel] = new_note;
+            synthio_envelope_state_init(&synth->envelope_state[channel], &synth->envelope_definition);
+            synth->accum[channel] = 0;
+        }
         return true;
     }
     return false;
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index e14e5ead10..56521d3208 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -30,6 +30,7 @@
 #define SYNTHIO_BYTES_PER_SAMPLE (SYNTHIO_BITS_PER_SAMPLE / 8)
 #define SYNTHIO_MAX_DUR (256)
 #define SYNTHIO_SILENCE (0x80)
+#define SYNTHIO_VOICE_IS_RELEASING(synth, i) (synth->envelope_state[i].state == SYNTHIO_ENVELOPE_STATE_RELEASE)
 
 #include "shared-module/audiocore/__init__.h"
 
@@ -39,6 +40,25 @@ typedef struct {
 } synthio_midi_span_t;
 
 typedef struct {
+    // the number of attack or decay steps (signed) per sample
+    // therefore the maximum time is 32767 samples or 0.68s at 48kHz
+    // provided the level is maximum (this should be increased!)
+    int16_t attack_step, decay_step, release_step;
+    uint16_t attack_level, sustain_level;
+} synthio_envelope_definition_t;
+
+typedef enum {
+    SYNTHIO_ENVELOPE_STATE_ATTACK, SYNTHIO_ENVELOPE_STATE_DECAY,
+    SYNTHIO_ENVELOPE_STATE_SUSTAIN, SYNTHIO_ENVELOPE_STATE_RELEASE
+} envelope_state_e;
+
+typedef struct {
+    int16_t level;
+    uint16_t substep;
+    envelope_state_e state;
+} synthio_envelope_state_t;
+
+typedef struct synthio_synth {
     uint32_t sample_rate;
     int16_t *buffers[2];
     const int16_t *waveform;
@@ -46,19 +66,24 @@ typedef struct {
     uint16_t last_buffer_length;
     uint8_t other_channel, buffer_index, other_buffer_index;
     uint16_t waveform_length;
+    synthio_envelope_definition_t envelope_definition;
+    mp_obj_t envelope_obj;
     synthio_midi_span_t span;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+    synthio_envelope_state_t envelope_state[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_synth_t;
 
-void synthio_span_init(synthio_midi_span_t *span);
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length, uint8_t channel);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
-void synthio_synth_init(synthio_synth_t *synth, uint16_t max_dur);
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+    mp_obj_t envelope);
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);
 void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_output, uint8_t channel);
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj);
+void synthio_synth_parse_envelope(uint16_t *envelope_sustain_index, mp_buffer_info_t *bufinfo_envelope, mp_obj_t envelope_obj, mp_obj_t envelope_hold_obj);
 
-bool synthio_span_change_note(synthio_midi_span_t *span, uint8_t old_note, uint8_t new_note);
-int synthio_span_count_active_channels(synthio_midi_span_t *span);
+bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t new_note);
+
+void synthio_envelope_step(synthio_envelope_definition_t *definition, synthio_envelope_state_t *state, int n_samples);
diff --git a/tests/circuitpython/miditrack.py b/tests/circuitpython/miditrack.py
index 53a8ca631d..2eac69b152 100644
--- a/tests/circuitpython/miditrack.py
+++ b/tests/circuitpython/miditrack.py
@@ -11,10 +11,12 @@ SCORE = b"\0\x90@\0\x20\x90b\0\x20\x80@\0\0\x80\b\0"
 
 with MidiTrack(SCORE, sample_rate=8000, tempo=640) as m:
     print(get_structure(m))
-    print(get_buffer(m))
+    p, q = get_buffer(m)
+    print(p, list(q))
 
 with MidiTrack(
     SCORE, sample_rate=8000, tempo=640, waveform=array.array("h", [0, 32767, 0, -32768])
 ) as m:
     print(get_structure(m))
-    print(get_buffer(m))
+    p, q = get_buffer(m)
+    print(p, list(q))
diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
index bfb082bfe7..2d9e2548a0 100644
--- a/tests/circuitpython/miditrack.py.exp
+++ b/tests/circuitpython/miditrack.py.exp
@@ -1,4 +1,4 @@
 (0, 1, 512, 1)
-(1, b'V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\xaa*\xaa*')
+1 [-16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0]
 (0, 1, 512, 1)
-(1, b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00V\xd5V\xd5V\xd5V\xd5V\xd5V\xd5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xaa*\xaa*\xaa*\xaa*\xaa*\xaa*\x00\x00\x00\x00')
+1 [0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0]
diff --git a/tests/circuitpython/synthesizer.py b/tests/circuitpython/synthesizer.py
index bdb273f861..326fef0994 100644
--- a/tests/circuitpython/synthesizer.py
+++ b/tests/circuitpython/synthesizer.py
@@ -1,10 +1,11 @@
 import struct
 import synthio
 import audiocore
+import ulab.numpy as np
 
 
 def dump_samples():
-    print(struct.unpack("12h", audiocore.get_buffer(s)[1][:24]))
+    print([i for i in audiocore.get_buffer(s)[1][:24]])
 
 
 s = synthio.Synthesizer(sample_rate=8000)
@@ -22,3 +23,16 @@ dump_samples()
 s.release_then_press((80,))
 print(s.pressed)
 dump_samples()
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+)
+s = synthio.Synthesizer(sample_rate=8000, envelope=envelope)
+s.press((60,))
+for _ in range(12):
+    buf = audiocore.get_buffer(s)[1]
+    print((min(buf), max(buf)))
+s.release_all()
+for _ in range(12):
+    buf = audiocore.get_buffer(s)[1]
+    print((min(buf), max(buf)))
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
index 79c88b3248..70eb647bab 100644
--- a/tests/circuitpython/synthesizer.py.exp
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -1,8 +1,32 @@
 ()
-(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 (80,)
-(-10922, -10922, -10922, -10922, 10922, 10922, 10922, 10922, 10922, -10922, -10922, -10922)
+[-16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383]
 (80, 91)
-(0, 0, 13106, 13106, 0, -13106, -13106, 0, 13106, 13106, 0, 0)
+[-8191, -8191, 0, 0, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191]
 (91,)
-(-10922, 10922, 10922, 10922, -10922, -10922, 10922, 10922, 10922, -10922, -10922, 10922)
+[-16382, -8191, -8191, 0, -8191, -8191, 0, 0, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191, -8191, -16382, -16382, -16382, 0, 0]
+(-5242, 0)
+(-10484, 0)
+(-15727, 0)
+(-16383, 0)
+(-14286, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-13106, 0)
+(-11009, 0)
+(-8912, 0)
+(-6815, 0)
+(-4718, 0)
+(-2621, 0)
+(-524, 0)
+(0, 0)
+(0, 0)
+(0, 0)
+(0, 0)
+(0, 0)

From b5c33a4c03a7a31cc1bf46a6fa22d79bc82747a4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sun, 23 Apr 2023 09:24:17 -0500
Subject: [PATCH 2297/2403] Add a manual test of synthio

this allows to test how the midi synthesizer is working, without access
to hardware. Run `micropython-coverage midi2wav.py` and it will create
`tune.wav` as an output.
---
 .../synthio/wave/.gitignore                   |   1 +
 .../synthio/wave/README.md                    |   5 +
 .../synthio/wave/audioop.py                   |   7 +
 .../synthio/wave/chunk.py                     | 169 ++++++
 .../synthio/wave/midi2wav.py                  |  59 ++
 .../circuitpython-manual/synthio/wave/wave.py | 546 ++++++++++++++++++
 6 files changed, 787 insertions(+)
 create mode 100644 tests/circuitpython-manual/synthio/wave/.gitignore
 create mode 100644 tests/circuitpython-manual/synthio/wave/README.md
 create mode 100644 tests/circuitpython-manual/synthio/wave/audioop.py
 create mode 100644 tests/circuitpython-manual/synthio/wave/chunk.py
 create mode 100644 tests/circuitpython-manual/synthio/wave/midi2wav.py
 create mode 100644 tests/circuitpython-manual/synthio/wave/wave.py

diff --git a/tests/circuitpython-manual/synthio/wave/.gitignore b/tests/circuitpython-manual/synthio/wave/.gitignore
new file mode 100644
index 0000000000..c212df9c3d
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/.gitignore
@@ -0,0 +1 @@
+tune.wav
diff --git a/tests/circuitpython-manual/synthio/wave/README.md b/tests/circuitpython-manual/synthio/wave/README.md
new file mode 100644
index 0000000000..27868bf9f3
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/README.md
@@ -0,0 +1,5 @@
+# Test synthio without hardware
+
+Build the uninx port then run `....../ports/unix/micropython-coverage midi2wav.py`.
+
+This will create `tune.wav` as output, which you can listen to using any old audio player.
diff --git a/tests/circuitpython-manual/synthio/wave/audioop.py b/tests/circuitpython-manual/synthio/wave/audioop.py
new file mode 100644
index 0000000000..6ec637a3a1
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/audioop.py
@@ -0,0 +1,7 @@
+import struct
+
+
+def byteswap(data, sampwidth):
+    print(data)
+    raise
+    ch = "I" if sampwidth == 16 else "H"
diff --git a/tests/circuitpython-manual/synthio/wave/chunk.py b/tests/circuitpython-manual/synthio/wave/chunk.py
new file mode 100644
index 0000000000..eea83c42d6
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/chunk.py
@@ -0,0 +1,169 @@
+"""Simple class to read IFF chunks.
+
+An IFF chunk (used in formats such as AIFF, TIFF, RMFF (RealMedia File
+Format)) has the following structure:
+
++----------------+
+| ID (4 bytes)   |
++----------------+
+| size (4 bytes) |
++----------------+
+| data           |
+| ...            |
++----------------+
+
+The ID is a 4-byte string which identifies the type of chunk.
+
+The size field (a 32-bit value, encoded using big-endian byte order)
+gives the size of the whole chunk, including the 8-byte header.
+
+Usually an IFF-type file consists of one or more chunks.  The proposed
+usage of the Chunk class defined here is to instantiate an instance at
+the start of each chunk and read from the instance until it reaches
+the end, after which a new instance can be instantiated.  At the end
+of the file, creating a new instance will fail with an EOFError
+exception.
+
+Usage:
+while True:
+    try:
+        chunk = Chunk(file)
+    except EOFError:
+        break
+    chunktype = chunk.getname()
+    while True:
+        data = chunk.read(nbytes)
+        if not data:
+            pass
+        # do something with data
+
+The interface is file-like.  The implemented methods are:
+read, close, seek, tell, isatty.
+Extra methods are: skip() (called by close, skips to the end of the chunk),
+getname() (returns the name (ID) of the chunk)
+
+The __init__ method has one required argument, a file-like object
+(including a chunk instance), and one optional argument, a flag which
+specifies whether or not chunks are aligned on 2-byte boundaries.  The
+default is 1, i.e. aligned.
+"""
+
+
+class Chunk:
+    def __init__(self, file, align=True, bigendian=True, inclheader=False):
+        import struct
+
+        self.closed = False
+        self.align = align  # whether to align to word (2-byte) boundaries
+        if bigendian:
+            strflag = ">"
+        else:
+            strflag = "<"
+        self.file = file
+        self.chunkname = file.read(4)
+        if len(self.chunkname) < 4:
+            raise EOFError
+        try:
+            self.chunksize = struct.unpack_from(strflag + "L", file.read(4))[0]
+        except struct.error:
+            raise EOFError from None
+        if inclheader:
+            self.chunksize = self.chunksize - 8  # subtract header
+        self.size_read = 0
+        try:
+            self.offset = self.file.tell()
+        except (AttributeError, OSError):
+            self.seekable = False
+        else:
+            self.seekable = True
+
+    def getname(self):
+        """Return the name (ID) of the current chunk."""
+        return self.chunkname
+
+    def getsize(self):
+        """Return the size of the current chunk."""
+        return self.chunksize
+
+    def close(self):
+        if not self.closed:
+            try:
+                self.skip()
+            finally:
+                self.closed = True
+
+    def isatty(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file")
+        return False
+
+    def seek(self, pos, whence=0):
+        """Seek to specified position into the chunk.
+        Default position is 0 (start of chunk).
+        If the file is not seekable, this will result in an error.
+        """
+
+        if self.closed:
+            raise ValueError("I/O operation on closed file")
+        if not self.seekable:
+            raise OSError("cannot seek")
+        if whence == 1:
+            pos = pos + self.size_read
+        elif whence == 2:
+            pos = pos + self.chunksize
+        if pos < 0 or pos > self.chunksize:
+            raise RuntimeError
+        self.file.seek(self.offset + pos, 0)
+        self.size_read = pos
+
+    def tell(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file")
+        return self.size_read
+
+    def read(self, size=-1):
+        """Read at most size bytes from the chunk.
+        If size is omitted or negative, read until the end
+        of the chunk.
+        """
+
+        if self.closed:
+            raise ValueError("I/O operation on closed file")
+        if self.size_read >= self.chunksize:
+            return b""
+        if size < 0:
+            size = self.chunksize - self.size_read
+        if size > self.chunksize - self.size_read:
+            size = self.chunksize - self.size_read
+        data = self.file.read(size)
+        self.size_read = self.size_read + len(data)
+        if self.size_read == self.chunksize and self.align and (self.chunksize & 1):
+            dummy = self.file.read(1)
+            self.size_read = self.size_read + len(dummy)
+        return data
+
+    def skip(self):
+        """Skip the rest of the chunk.
+        If you are not interested in the contents of the chunk,
+        this method should be called so that the file points to
+        the start of the next chunk.
+        """
+
+        if self.closed:
+            raise ValueError("I/O operation on closed file")
+        if self.seekable:
+            try:
+                n = self.chunksize - self.size_read
+                # maybe fix alignment
+                if self.align and (self.chunksize & 1):
+                    n = n + 1
+                self.file.seek(n, 1)
+                self.size_read = self.size_read + n
+                return
+            except OSError:
+                pass
+        while self.size_read < self.chunksize:
+            n = min(8192, self.chunksize - self.size_read)
+            dummy = self.read(n)
+            if not dummy:
+                raise EOFError
diff --git a/tests/circuitpython-manual/synthio/wave/midi2wav.py b/tests/circuitpython-manual/synthio/wave/midi2wav.py
new file mode 100644
index 0000000000..daa46a28c0
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/midi2wav.py
@@ -0,0 +1,59 @@
+import audiocore
+import synthio
+from ulab import numpy as np
+import wave
+
+SAMPLE_SIZE = 1024
+VOLUME = 32700
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME,
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+)
+melody = synthio.MidiTrack(
+    b"\0\x90H\0*\x80H\0\6\x90J\0*\x80J\0\6\x90L\0*\x80L\0\6\x90J\0"
+    + b"*\x80J\0\6\x90H\0*\x80H\0\6\x90J\0*\x80J\0\6\x90L\0T\x80L\0"
+    + b"\x0c\x90H\0T\x80H\0\x0c\x90H\0T\x80H\0",
+    tempo=240,
+    sample_rate=48000,
+    waveform=sine,
+    envelope=envelope,
+)
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("tune.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    while True:
+        result, data = audiocore.get_buffer(melody)
+        if data is None:
+            break
+        f.writeframes(data)
+        if result != 1:
+            break
+
+melody = synthio.MidiTrack(
+    b"\0\x90H\0*\x80H\0\6\x90J\0*\x80J\0\6\x90L\0*\x80L\0\6\x90J\0"
+    + b"*\x80J\0\6\x90H\0*\x80H\0\6\x90J\0*\x80J\0\6\x90L\0T\x80L\0"
+    + b"\x0c\x90H\0T\x80H\0\x0c\x90H\0T\x80H\0",
+    tempo=240,
+    sample_rate=48000,
+    waveform=sine,
+)
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("tune-noenv.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    while True:
+        result, data = audiocore.get_buffer(melody)
+        if data is None:
+            break
+        f.writeframes(data)
+        if result != 1:
+            break
diff --git a/tests/circuitpython-manual/synthio/wave/wave.py b/tests/circuitpython-manual/synthio/wave/wave.py
new file mode 100644
index 0000000000..903295a4ba
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/wave/wave.py
@@ -0,0 +1,546 @@
+"""Stuff to parse WAVE files.
+
+Usage.
+
+Reading WAVE files:
+      f = wave.open(file, 'r')
+where file is either the name of a file or an open file pointer.
+The open file pointer must have methods read(), seek(), and close().
+When the setpos() and rewind() methods are not used, the seek()
+method is not  necessary.
+
+This returns an instance of a class with the following public methods:
+      getnchannels()  -- returns number of audio channels (1 for
+                         mono, 2 for stereo)
+      getsampwidth()  -- returns sample width in bytes
+      getframerate()  -- returns sampling frequency
+      getnframes()    -- returns number of audio frames
+      getcomptype()   -- returns compression type ('NONE' for linear samples)
+      getcompname()   -- returns human-readable version of
+                         compression type ('not compressed' linear samples)
+      getparams()     -- returns a namedtuple consisting of all of the
+                         above in the above order
+      getmarkers()    -- returns None (for compatibility with the
+                         aifc module)
+      getmark(id)     -- raises an error since the mark does not
+                         exist (for compatibility with the aifc module)
+      readframes(n)   -- returns at most n frames of audio
+      rewind()        -- rewind to the beginning of the audio stream
+      setpos(pos)     -- seek to the specified position
+      tell()          -- return the current position
+      close()         -- close the instance (make it unusable)
+The position returned by tell() and the position given to setpos()
+are compatible and have nothing to do with the actual position in the
+file.
+The close() method is called automatically when the class instance
+is destroyed.
+
+Writing WAVE files:
+      f = wave.open(file, 'w')
+where file is either the name of a file or an open file pointer.
+The open file pointer must have methods write(), tell(), seek(), and
+close().
+
+This returns an instance of a class with the following public methods:
+      setnchannels(n) -- set the number of channels
+      setsampwidth(n) -- set the sample width
+      setframerate(n) -- set the frame rate
+      setnframes(n)   -- set the number of frames
+      setcomptype(type, name)
+                      -- set the compression type and the
+                         human-readable compression type
+      setparams(tuple)
+                      -- set all parameters at once
+      tell()          -- return current position in output file
+      writeframesraw(data)
+                      -- write audio frames without patching up the
+                         file header
+      writeframes(data)
+                      -- write audio frames and patch up the file header
+      close()         -- patch up the file header and close the
+                         output file
+You should set the parameters before the first writeframesraw or
+writeframes.  The total number of frames does not need to be set,
+but when it is set to the correct value, the header does not have to
+be patched up.
+It is best to first set all parameters, perhaps possibly the
+compression type, and then write audio frames using writeframesraw.
+When all frames have been written, either call writeframes(b'') or
+close() to patch up the sizes in the header.
+The close() method is called automatically when the class instance
+is destroyed.
+"""
+
+from chunk import Chunk
+from collections import namedtuple
+import audioop
+import builtins
+import struct
+import sys
+
+
+__all__ = ["open", "Error", "Wave_read", "Wave_write"]
+
+
+class Error(Exception):
+    pass
+
+
+WAVE_FORMAT_PCM = 0x0001
+
+_array_fmts = None, "b", "h", None, "i"
+
+_wave_params = namedtuple(
+    "_wave_params", "nchannels sampwidth framerate nframes comptype compname"
+)
+
+
+class Wave_read:
+    """Variables used in this class:
+
+    These variables are available to the user though appropriate
+    methods of this class:
+    _file -- the open file with methods read(), close(), and seek()
+              set through the __init__() method
+    _nchannels -- the number of audio channels
+              available through the getnchannels() method
+    _nframes -- the number of audio frames
+              available through the getnframes() method
+    _sampwidth -- the number of bytes per audio sample
+              available through the getsampwidth() method
+    _framerate -- the sampling frequency
+              available through the getframerate() method
+    _comptype -- the AIFF-C compression type ('NONE' if AIFF)
+              available through the getcomptype() method
+    _compname -- the human-readable AIFF-C compression type
+              available through the getcomptype() method
+    _soundpos -- the position in the audio stream
+              available through the tell() method, set through the
+              setpos() method
+
+    These variables are used internally only:
+    _fmt_chunk_read -- 1 iff the FMT chunk has been read
+    _data_seek_needed -- 1 iff positioned correctly in audio
+              file for readframes()
+    _data_chunk -- instantiation of a chunk class for the DATA chunk
+    _framesize -- size of one frame in the file
+    """
+
+    def initfp(self, file):
+        self._convert = None
+        self._soundpos = 0
+        self._file = Chunk(file, bigendian=0)
+        if self._file.getname() != b"RIFF":
+            raise Error("file does not start with RIFF id")
+        if self._file.read(4) != b"WAVE":
+            raise Error("not a WAVE file")
+        self._fmt_chunk_read = 0
+        self._data_chunk = None
+        while 1:
+            self._data_seek_needed = 1
+            try:
+                chunk = Chunk(self._file, bigendian=0)
+            except EOFError:
+                break
+            chunkname = chunk.getname()
+            if chunkname == b"fmt ":
+                self._read_fmt_chunk(chunk)
+                self._fmt_chunk_read = 1
+            elif chunkname == b"data":
+                if not self._fmt_chunk_read:
+                    raise Error("data chunk before fmt chunk")
+                self._data_chunk = chunk
+                self._nframes = chunk.chunksize // self._framesize
+                self._data_seek_needed = 0
+                break
+            chunk.skip()
+        if not self._fmt_chunk_read or not self._data_chunk:
+            raise Error("fmt chunk and/or data chunk missing")
+
+    def __init__(self, f):
+        self._i_opened_the_file = None
+        if isinstance(f, str):
+            f = builtins.open(f, "rb")
+            self._i_opened_the_file = f
+        # else, assume it is an open file object already
+        try:
+            self.initfp(f)
+        except:
+            if self._i_opened_the_file:
+                f.close()
+            raise
+
+    def __del__(self):
+        self.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.close()
+
+    #
+    # User visible methods.
+    #
+    def getfp(self):
+        return self._file
+
+    def rewind(self):
+        self._data_seek_needed = 1
+        self._soundpos = 0
+
+    def close(self):
+        self._file = None
+        file = self._i_opened_the_file
+        if file:
+            self._i_opened_the_file = None
+            file.close()
+
+    def tell(self):
+        return self._soundpos
+
+    def getnchannels(self):
+        return self._nchannels
+
+    def getnframes(self):
+        return self._nframes
+
+    def getsampwidth(self):
+        return self._sampwidth
+
+    def getframerate(self):
+        return self._framerate
+
+    def getcomptype(self):
+        return self._comptype
+
+    def getcompname(self):
+        return self._compname
+
+    def getparams(self):
+        return _wave_params(
+            self.getnchannels(),
+            self.getsampwidth(),
+            self.getframerate(),
+            self.getnframes(),
+            self.getcomptype(),
+            self.getcompname(),
+        )
+
+    def getmarkers(self):
+        return None
+
+    def getmark(self, id):
+        raise Error("no marks")
+
+    def setpos(self, pos):
+        if pos < 0 or pos > self._nframes:
+            raise Error("position not in range")
+        self._soundpos = pos
+        self._data_seek_needed = 1
+
+    def readframes(self, nframes):
+        if self._data_seek_needed:
+            self._data_chunk.seek(0, 0)
+            pos = self._soundpos * self._framesize
+            if pos:
+                self._data_chunk.seek(pos, 0)
+            self._data_seek_needed = 0
+        if nframes == 0:
+            return b""
+        data = self._data_chunk.read(nframes * self._framesize)
+        if self._sampwidth != 1 and sys.byteorder == "big":
+            data = audioop.byteswap(data, self._sampwidth)
+        if self._convert and data:
+            data = self._convert(data)
+        self._soundpos = self._soundpos + len(data) // (self._nchannels * self._sampwidth)
+        return data
+
+    #
+    # Internal methods.
+    #
+
+    def _read_fmt_chunk(self, chunk):
+        try:
+            (
+                wFormatTag,
+                self._nchannels,
+                self._framerate,
+                dwAvgBytesPerSec,
+                wBlockAlign,
+            ) = struct.unpack_from(" 4:
+            raise Error("bad sample width")
+        self._sampwidth = sampwidth
+
+    def getsampwidth(self):
+        if not self._sampwidth:
+            raise Error("sample width not set")
+        return self._sampwidth
+
+    def setframerate(self, framerate):
+        if self._datawritten:
+            raise Error("cannot change parameters after starting to write")
+        if framerate <= 0:
+            raise Error("bad frame rate")
+        self._framerate = int(round(framerate))
+
+    def getframerate(self):
+        if not self._framerate:
+            raise Error("frame rate not set")
+        return self._framerate
+
+    def setnframes(self, nframes):
+        if self._datawritten:
+            raise Error("cannot change parameters after starting to write")
+        self._nframes = nframes
+
+    def getnframes(self):
+        return self._nframeswritten
+
+    def setcomptype(self, comptype, compname):
+        if self._datawritten:
+            raise Error("cannot change parameters after starting to write")
+        if comptype not in ("NONE",):
+            raise Error("unsupported compression type")
+        self._comptype = comptype
+        self._compname = compname
+
+    def getcomptype(self):
+        return self._comptype
+
+    def getcompname(self):
+        return self._compname
+
+    def setparams(self, params):
+        nchannels, sampwidth, framerate, nframes, comptype, compname = params
+        if self._datawritten:
+            raise Error("cannot change parameters after starting to write")
+        self.setnchannels(nchannels)
+        self.setsampwidth(sampwidth)
+        self.setframerate(framerate)
+        self.setnframes(nframes)
+        self.setcomptype(comptype, compname)
+
+    def getparams(self):
+        if not self._nchannels or not self._sampwidth or not self._framerate:
+            raise Error("not all parameters set")
+        return _wave_params(
+            self._nchannels,
+            self._sampwidth,
+            self._framerate,
+            self._nframes,
+            self._comptype,
+            self._compname,
+        )
+
+    def setmark(self, id, pos, name):
+        raise Error("setmark() not supported")
+
+    def getmark(self, id):
+        raise Error("no marks")
+
+    def getmarkers(self):
+        return None
+
+    def tell(self):
+        return self._nframeswritten
+
+    def writeframesraw(self, data):
+        if not isinstance(data, (bytes, bytearray)):
+            data = memoryview(data).cast("B")
+        self._ensure_header_written(len(data))
+        nframes = len(data) // (self._sampwidth * self._nchannels)
+        if self._convert:
+            data = self._convert(data)
+        if self._sampwidth != 1 and sys.byteorder == "big":
+            data = audioop.byteswap(data, self._sampwidth)
+        self._file.write(data)
+        self._datawritten += len(data)
+        self._nframeswritten = self._nframeswritten + nframes
+
+    def writeframes(self, data):
+        self.writeframesraw(data)
+        if self._datalength != self._datawritten:
+            self._patchheader()
+
+    def close(self):
+        try:
+            if self._file:
+                self._ensure_header_written(0)
+                if self._datalength != self._datawritten:
+                    self._patchheader()
+                self._file.flush()
+        finally:
+            self._file = None
+            file = self._i_opened_the_file
+            if file:
+                self._i_opened_the_file = None
+                file.close()
+
+    #
+    # Internal methods.
+    #
+
+    def _ensure_header_written(self, datasize):
+        if not self._headerwritten:
+            if not self._nchannels:
+                raise Error("# channels not specified")
+            if not self._sampwidth:
+                raise Error("sample width not specified")
+            if not self._framerate:
+                raise Error("sampling rate not specified")
+            self._write_header(datasize)
+
+    def _write_header(self, initlength):
+        assert not self._headerwritten
+        self._file.write(b"RIFF")
+        if not self._nframes:
+            self._nframes = initlength // (self._nchannels * self._sampwidth)
+        self._datalength = self._nframes * self._nchannels * self._sampwidth
+        try:
+            self._form_length_pos = self._file.tell()
+        except (AttributeError, OSError):
+            self._form_length_pos = None
+        self._file.write(
+            struct.pack(
+                "
Date: Tue, 25 Apr 2023 08:21:31 -0500
Subject: [PATCH 2298/2403] Disable synthio on two boards where it doesn't fit

---
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 2 +-
 ports/stm/boards/thunderpack_v11/mpconfigboard.mk  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 49be084ddf..e297e96d95 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -48,7 +48,7 @@ CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS = 0
 CIRCUITPY_KEYPAD_KEYMATRIX = 0
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
-CIRCUITPY_SYNTHIO = 1
+CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_ZLIB = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
diff --git a/ports/stm/boards/thunderpack_v11/mpconfigboard.mk b/ports/stm/boards/thunderpack_v11/mpconfigboard.mk
index 0aa8ce6746..376f54ac6d 100644
--- a/ports/stm/boards/thunderpack_v11/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack_v11/mpconfigboard.mk
@@ -19,6 +19,7 @@ LD_FILE = boards/STM32F411_nvm.ld
 CIRCUITPY_AESIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_VECTORIO = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_ZLIB = 0

From 95acec0f55d53213a2475f7c03af95c1fd3e757b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Tue, 25 Apr 2023 13:22:42 -0400
Subject: [PATCH 2299/2403] Improve pin names

---
 .../boards/adafruit_feather_rp2040_prop_maker/pins.c        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c
index 96e0bc71df..20368dd6fd 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c
@@ -42,12 +42,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO16) },
     { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_WORD_SELECT), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_EXTERNAL_BUTTON), MP_ROM_PTR(&pin_GPIO19) },
-    { MP_ROM_QSTR(MP_QSTR_SERVO), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_SERVO), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXELS), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_GPIO22) },
-    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXELS_POWER), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_EXTERNAL_POWER), MP_ROM_PTR(&pin_GPIO23) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

From eab202aa530b17993be4a440cc99b28577fceaa6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 25 Apr 2023 10:36:34 -0700
Subject: [PATCH 2300/2403] Fix SH110x

---
 shared-module/displayio/Display.c | 10 +++++-----
 shared-module/displayio/Display.h |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 6d4acbe8c0..093604214d 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -65,7 +65,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
     }
     displayio_display_core_construct(&self->core, bus, width, height, ram_width, ram_height, colstart, rowstart, rotation,
         color_depth, grayscale, pixels_in_byte_share_row, bytes_per_cell, reverse_pixels_in_byte, reverse_bytes_in_word,
-        set_column_command, set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false /* always_toggle_chip_select */,
+        set_column_command, set_row_command, NO_COMMAND, NO_COMMAND, data_as_commands, false /* always_toggle_chip_select */,
         SH1107_addressing && color_depth == 1, false /*address_little_endian */);
 
     self->write_ram_command = write_ram_command;
@@ -86,7 +86,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
         while (!displayio_display_core_begin_transaction(&self->core)) {
             RUN_BACKGROUND_TASKS;
         }
-        if (self->data_as_commands) {
+        if (self->core.data_as_commands) {
             uint8_t full_command[data_size + 1];
             full_command[0] = cmd[0];
             memcpy(full_command + 1, data, data_size);
@@ -185,7 +185,7 @@ bool common_hal_displayio_display_set_brightness(displayio_display_obj_t *self,
     } else if (self->brightness_command != NO_BRIGHTNESS_COMMAND) {
         ok = displayio_display_core_begin_transaction(&self->core);
         if (ok) {
-            if (self->data_as_commands) {
+            if (self->core.data_as_commands) {
                 uint8_t set_brightness[2] = {self->brightness_command, (uint8_t)(0xff * brightness)};
                 self->core.send(self->core.bus, DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, set_brightness, 2);
             } else {
@@ -226,7 +226,7 @@ STATIC const displayio_area_t *_get_refresh_areas(displayio_display_obj_t *self)
 }
 
 STATIC void _send_pixels(displayio_display_obj_t *self, uint8_t *pixels, uint32_t length) {
-    if (!self->data_as_commands) {
+    if (!self->core.data_as_commands) {
         self->core.send(self->core.bus, DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, &self->write_ram_command, 1);
     }
     self->core.send(self->core.bus, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, pixels, length);
@@ -247,7 +247,7 @@ STATIC bool _refresh_area(displayio_display_obj_t *self, const displayio_area_t
     uint16_t subrectangles = 1;
     // for SH1107 and other boundary constrained controllers
     //      write one single row at a time
-    if (self->SH1107_addressing) {
+    if (self->core.SH1107_addressing) {
         subrectangles = rows_per_buffer / 8;  // page addressing mode writes 8 rows at a time
         rows_per_buffer = 8;
     } else if (displayio_area_size(&clipped) > buffer_size * pixels_per_word) {
diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
index c60adc482f..e56aa87a5f 100644
--- a/shared-module/displayio/Display.h
+++ b/shared-module/displayio/Display.h
@@ -50,15 +50,10 @@ typedef struct {
     uint16_t brightness_command;
     uint16_t native_frames_per_second;
     uint16_t native_ms_per_frame;
-    uint8_t set_column_command;
-    uint8_t set_row_command;
     uint8_t write_ram_command;
     bool auto_refresh;
     bool first_manual_refresh;
-    bool data_as_commands;
     bool backlight_on_high;
-    // new quirk for sh1107
-    bool SH1107_addressing;
 } displayio_display_obj_t;
 
 void displayio_display_background(displayio_display_obj_t *self);

From 75046b3a58b698e61036fed12ae10f22d23a07a2 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Tue, 25 Apr 2023 13:26:48 -0700
Subject: [PATCH 2301/2403] Save space with consolidated errors

---
 shared-bindings/displayio/Display.c              |  2 +-
 .../framebufferio/FramebufferDisplay.c           |  2 +-
 shared-bindings/is31fl3741/FrameBuffer.c         |  2 +-
 shared-bindings/rgbmatrix/RGBMatrix.c            |  2 +-
 shared-module/displayio/Shape.c                  | 16 +++++++++-------
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 49194ebd1e..d6326d6d3b 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -358,7 +358,7 @@ STATIC mp_obj_t displayio_display_obj_set_brightness(mp_obj_t self_in, mp_obj_t
     displayio_display_obj_t *self = native_display(self_in);
     mp_float_t brightness = mp_obj_get_float(brightness_obj);
     if (brightness < 0 || brightness > 1.0) {
-        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), MP_QSTR_brightness, 0, 1);
     }
     bool ok = common_hal_displayio_display_set_brightness(self, brightness);
     if (!ok) {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 030b924c1e..826f69fd83 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -194,7 +194,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t sel
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     mp_float_t brightness = mp_obj_get_float(brightness_obj);
     if (brightness < 0.0f || brightness > 1.0f) {
-        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), MP_QSTR_brightness, 0, 1);
     }
     bool ok = common_hal_framebufferio_framebufferdisplay_set_brightness(self, brightness);
     if (!ok) {
diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c
index f907a1dcd3..02a783fd15 100644
--- a/shared-bindings/is31fl3741/FrameBuffer.c
+++ b/shared-bindings/is31fl3741/FrameBuffer.c
@@ -162,7 +162,7 @@ STATIC mp_obj_t is31fl3741_FrameBuffer_set_brightness(mp_obj_t self_in, mp_obj_t
     check_for_deinit(self);
     mp_float_t brightness = mp_obj_get_float(value_in);
     if (brightness < 0.0f || brightness > 1.0f) {
-        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), MP_QSTR_brightness, 0, 1);
     }
 
     uint8_t current = (uint8_t)(brightness * 0xFF);
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index f2877531bb..129d77e321 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -294,7 +294,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_set_brightness(mp_obj_t self_in, mp_obj_t va
     check_for_deinit(self);
     mp_float_t brightness = mp_obj_get_float(value_in);
     if (brightness < 0.0f || brightness > 1.0f) {
-        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), MP_QSTR_brightness, 0, 1);
     }
     common_hal_rgbmatrix_rgbmatrix_set_paused(self, brightness <= 0);
 
diff --git a/shared-module/displayio/Shape.c b/shared-module/displayio/Shape.c
index 4a32c7a606..1d6db5bd69 100644
--- a/shared-module/displayio/Shape.c
+++ b/shared-module/displayio/Shape.c
@@ -63,15 +63,17 @@ void common_hal_displayio_shape_construct(displayio_shape_t *self, uint32_t widt
 }
 
 void common_hal_displayio_shape_set_boundary(displayio_shape_t *self, uint16_t y, uint16_t start_x, uint16_t end_x) {
-    if (y < 0 || y >= self->height || (self->mirror_y && y >= self->half_height)) {
-        mp_raise_ValueError(translate("y value out of bounds"));
+    uint16_t max_y = self->height - 1;
+    if (self->mirror_y) {
+        max_y = self->half_height - 1;
     }
-    if (start_x < 0 || start_x >= self->width || end_x < 0 || end_x >= self->width) {
-        mp_raise_ValueError(translate("x value out of bounds"));
-    }
-    if (self->mirror_x && (start_x >= self->half_width || end_x >= self->half_width)) {
-        mp_raise_ValueError_varg(translate("Maximum x value when mirrored is %d"), self->half_width);
+    mp_arg_validate_int_range(y, 0, max_y, MP_QSTR_y);
+    uint16_t max_x = self->width - 1;
+    if (self->mirror_x) {
+        max_x = self->half_width - 1;
     }
+    mp_arg_validate_int_range(start_x, 0, max_x, MP_QSTR_start_x);
+    mp_arg_validate_int_range(end_x, 0, max_x, MP_QSTR_end_x);
 
     uint16_t lower_x, upper_x, lower_y, upper_y;
 

From 6c850349528c4da31141ff0d6a6b90b01e4cb901 Mon Sep 17 00:00:00 2001
From: Marco Sirabella 
Date: Tue, 25 Apr 2023 15:16:42 -0600
Subject: [PATCH 2302/2403] Bump recommended shallow-since 1.5 years forward

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

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 6576c3abbb..21ad92f1d8 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -66,7 +66,7 @@ def cannot_determine_version():
 CircuitPython must be built from a git clone with tags.
 If you cloned from a fork, fetch the tags from adafruit/circuitpython as follows:
 
-    git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD"""
+    git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD"""
     )
 
 

From 863042dfd0abebba04be242b33b6f1a4f5d6bab5 Mon Sep 17 00:00:00 2001
From: Marco Sirabella 
Date: Tue, 25 Apr 2023 16:05:20 -0600
Subject: [PATCH 2303/2403] Move git command to update necessary tags to
 submodule

I ran into this one since I did an initial shallow clone due to slow
pycon 2023 wifi.
---
 Makefile             | 4 ++++
 py/makeversionhdr.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d0f1fcb3d0..d611dff49d 100644
--- a/Makefile
+++ b/Makefile
@@ -345,3 +345,7 @@ fetch-submodules:
 remove-submodules:
 	git submodule deinit -f --all
 	rm -rf .git/modules/*
+
+.PHONY: fetch-tags
+fetch-tags:
+	git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 21ad92f1d8..b0d00a694e 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -66,7 +66,7 @@ def cannot_determine_version():
 CircuitPython must be built from a git clone with tags.
 If you cloned from a fork, fetch the tags from adafruit/circuitpython as follows:
 
-    git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD"""
+    make fetch-tags"""
     )
 
 

From 4214f2bb77bd38844223ce4a36bd8ec84c740b28 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 26 Apr 2023 11:01:56 -0400
Subject: [PATCH 2304/2403] Rename ports/raspberrypi/boards/pimoroni_pico_dv to
 ports/raspberrypi/boards/pimoroni_pico_dv_base

---
 .../boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/board.c    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ports/raspberrypi/boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/board.c (100%)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/board.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base/board.c
similarity index 100%
rename from ports/raspberrypi/boards/pimoroni_pico_dv/board.c
rename to ports/raspberrypi/boards/pimoroni_pico_dv_base/board.c

From 9f38304c2054df58a00fe5fb28eac99e46bc57c8 Mon Sep 17 00:00:00 2001
From: Chenxi Xiao <347396430@qq.com>
Date: Wed, 26 Apr 2023 11:45:57 -0600
Subject: [PATCH 2305/2403] Update zh_Latn_pinyin.po

---
 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 ec33771682..133958f5a6 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1322,7 +1322,7 @@ msgstr "Géshì kuài dàxiǎo wúxiào"
 
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid hex password"
-msgstr ""
+msgstr "Shíliù jìn zhì mìmǎ wúxiào"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"

From 6e8031faf846f2f4e5c3b9ca5305c7c1f66a3bb8 Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Wed, 26 Apr 2023 13:53:33 -0500
Subject: [PATCH 2306/2403] Note limitation of next_stack_limit on espressif
 boards

Open to better wording.
---
 shared-bindings/supervisor/Runtime.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index ecdd914a8f..1cc2f0abb1 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -187,8 +187,10 @@ MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
     (mp_obj_t)&supervisor_runtime_set_ble_workflow_obj);
 
 //|     next_stack_limit: int
-//|     """The size of the stack for the next vm run. If its too large, the default will be used."""
+//|     """The size of the stack for the next vm run. If its too large, the default will be used.
 //|
+//|     **Limitations**: Stack size is fixed at startup on ``espressif`` port and this will have no effect.
+//|     """
 STATIC mp_obj_t supervisor_runtime_get_next_stack_limit(mp_obj_t self) {
     return mp_obj_new_int(get_next_stack_size());
 }

From c333e6168179ca3c012f5d2578066825c64c61d7 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Wed, 26 Apr 2023 14:58:45 -0400
Subject: [PATCH 2307/2403] small wording change

---
 shared-bindings/supervisor/Runtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 1cc2f0abb1..792f18637a 100644
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -189,7 +189,7 @@ MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj,
 //|     next_stack_limit: int
 //|     """The size of the stack for the next vm run. If its too large, the default will be used.
 //|
-//|     **Limitations**: Stack size is fixed at startup on ``espressif`` port and this will have no effect.
+//|     **Limitations**: Stack size is fixed at startup on the ``espressif`` port; setting this will have no effect.
 //|     """
 STATIC mp_obj_t supervisor_runtime_get_next_stack_limit(mp_obj_t self) {
     return mp_obj_new_int(get_next_stack_size());

From 5d0c37f19807daf37817795fe5bfb44845c86130 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 26 Apr 2023 17:45:59 -0400
Subject: [PATCH 2308/2403] Rename folders and add VID/PID from Pimoroni

---
 .../mpconfigboard.h                           |  2 +-
 .../mpconfigboard.mk                          |  8 +-
 .../pico-sdk-configboard.h                    |  0
 .../pins.c                                    |  0
 .../boards/pimoroni_pico_dv_base_w/board.c    | 52 +++++++++++
 .../boards/pimoroni_pico_dv_base_w/link.ld    |  1 +
 .../pimoroni_pico_dv_base_w/mpconfigboard.h   | 10 +++
 .../pimoroni_pico_dv_base_w/mpconfigboard.mk  | 26 ++++++
 .../pico-sdk-configboard.h                    |  4 +
 .../boards/pimoroni_pico_dv_base_w/pins.c     | 89 +++++++++++++++++++
 10 files changed, 187 insertions(+), 5 deletions(-)
 rename ports/raspberrypi/boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/mpconfigboard.h (75%)
 rename ports/raspberrypi/boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/mpconfigboard.mk (51%)
 rename ports/raspberrypi/boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/pico-sdk-configboard.h (100%)
 rename ports/raspberrypi/boards/{pimoroni_pico_dv => pimoroni_pico_dv_base}/pins.c (100%)
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.h
similarity index 75%
rename from ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h
rename to ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.h
index bf18491e47..969ccf74d8 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.h
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME "Pimoroni Pico DV"
+#define MICROPY_HW_BOARD_NAME "Pimoroni Pico dv Base"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO25)
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
similarity index 51%
rename from ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
rename to ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
index f78d88add3..8546a32c93 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
@@ -1,7 +1,7 @@
-USB_VID = 0x239A
-USB_PID = 0x80F4
-USB_PRODUCT = "Pimoroni PICO dv"
-USB_MANUFACTURER = "Raspberry Pi"
+USB_VID = 0x2E8A
+USB_PID =  0x1059
+USB_PRODUCT = "Pimoroni Pico DV Demo Base for Pico"
+USB_MANUFACTURER = "Pimoroni"
 
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pico-sdk-configboard.h
similarity index 100%
rename from ports/raspberrypi/boards/pimoroni_pico_dv/pico-sdk-configboard.h
rename to ports/raspberrypi/boards/pimoroni_pico_dv_base/pico-sdk-configboard.h
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
similarity index 100%
rename from ports/raspberrypi/boards/pimoroni_pico_dv/pins.c
rename to ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
new file mode 100644
index 0000000000..bc5878bf24
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
@@ -0,0 +1,52 @@
+/*
+ * 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 "supervisor/board.h"
+
+#include "bindings/picodvi/Framebuffer.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-bindings/framebufferio/FramebufferDisplay.h"
+
+void board_init(void) {
+    picodvi_framebuffer_obj_t *fb = &allocate_display_bus()->picodvi;
+    fb->base.type = &picodvi_framebuffer_type;
+    common_hal_picodvi_framebuffer_construct(fb, 640, 480,
+        &pin_GPIO7, &pin_GPIO6,
+        &pin_GPIO9, &pin_GPIO8,
+        &pin_GPIO11, &pin_GPIO10,
+        &pin_GPIO13, &pin_GPIO12,
+        8);
+
+    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
+    display->base.type = &framebufferio_framebufferdisplay_type;
+    common_hal_framebufferio_framebufferdisplay_construct(
+        display,
+        MP_OBJ_FROM_PTR(fb),
+        0,
+        true);
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
new file mode 100644
index 0000000000..e814bead4c
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
@@ -0,0 +1 @@
+firmware_size = 1532k;
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
new file mode 100644
index 0000000000..df6539734e
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Pimoroni Pico DV Base W"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
+
+#define MICROPY_HW_LED_STATUS   (&pin_CYW0)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
new file mode 100644
index 0000000000..cf37a7e401
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
@@ -0,0 +1,26 @@
+USB_VID = 0x2E8A
+USB_PID = 0x105A
+USB_PRODUCT = "Pimoroni Pico DV Demo Base for Pico W"
+USB_MANUFACTURER = "Pimoroni"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+
+CIRCUITPY_CYW43 = 1
+CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_MBEDTLS = 1
+CIRCUITPY_HASHLIB = 1
+CIRCUITPY_WEB_WORKFLOW = 1
+CIRCUITPY_MDNS = 1
+CIRCUITPY_SOCKETPOOL = 1
+CIRCUITPY_WIFI = 1
+
+CIRCUITPY_PICODVI = 1
+
+CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+# Must be accompanied by a linker script change
+CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
new file mode 100644
index 0000000000..a41131dd22
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
new file mode 100644
index 0000000000..346a2ae44c
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
@@ -0,0 +1,89 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX),  MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_RX),  MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_C), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
+
+    // SD Card
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO5)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO18)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO19)},
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO22)},
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2S_OUT), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
+
+    // DVI VIDEO
+    { MP_ROM_QSTR(MP_QSTR_DV_CEC), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_DV_SCL), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_DV_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D0N), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D0P), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D1N), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D1P), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_D2N), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D2P), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_DV_HPD), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].framebuffer_display)},
+
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From aba4c50e74af1301e2b5fe1ee5198ddea92879fd Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 26 Apr 2023 21:08:28 -0400
Subject: [PATCH 2309/2403] Add adafruit_sdcard as frozen library

---
 .../raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk  | 3 +++
 .../boards/pimoroni_pico_dv_base_w/mpconfigboard.mk            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
index 8546a32c93..d5d90c6b4b 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
@@ -10,3 +10,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_PICODVI = 1
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
\ No newline at end of file
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
index cf37a7e401..83e0764ab4 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
@@ -24,3 +24,6 @@ CIRCUITPY_PICODVI = 1
 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
\ No newline at end of file

From 12f59b494834838db405e1cf8eeb82d2833e509c Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 26 Apr 2023 21:14:57 -0400
Subject: [PATCH 2310/2403] pre-commit formatting

---
 ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk | 2 +-
 .../raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
index d5d90c6b4b..b383ead573 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/mpconfigboard.mk
@@ -12,4 +12,4 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_PICODVI = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
\ No newline at end of file
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
index 83e0764ab4..b7919a1847 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
@@ -26,4 +26,4 @@ CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_C
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
\ No newline at end of file
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD

From ec6fde91adae9a648863686374bccc1badf0587a Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Thu, 27 Apr 2023 18:14:46 +0200
Subject: [PATCH 2311/2403] integrate latest changes from upstream

---
 .../boards/pimoroni_badger2040w/board.c       |  13 +-
 .../boards/pimoroni_badger2040w/link.ld       | 295 +-----------------
 2 files changed, 7 insertions(+), 301 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
index 9eea472925..e54e7edd43 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
@@ -31,6 +31,7 @@
 #include "shared-bindings/displayio/FourWire.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-module/displayio/__init__.h"
+#include "shared-bindings/board/__init__.h"
 #include "supervisor/shared/board.h"
 #include "badger-shared.h"
 
@@ -274,12 +275,11 @@ void board_init(void) {
     common_hal_digitalio_digitalinout_never_reset(&enable_pin_obj);
 
     // Set up the SPI object used to control the display
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     common_hal_busio_spi_never_reset(spi);
 
     // Set up the DisplayIO pin object
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     bus->base.type = &displayio_fourwire_type;
     common_hal_displayio_fourwire_construct(bus,
         spi,
@@ -291,7 +291,7 @@ void board_init(void) {
         0); // Phase
 
     // Set up the DisplayIO epaper object
-    displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
+    displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
     display->base.type = &displayio_epaperdisplay_type;
     common_hal_displayio_epaperdisplay_construct(
         display,
@@ -323,16 +323,15 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         false, // acep
-        false);  // two_byte_sequence_length
+        false,  // two_byte_sequence_length
+        false); // address_little_endian
 }
 
 void board_deinit(void) {
     displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
     if (display->base.type == &displayio_epaperdisplay_type) {
-        size_t i = 0;
         while (common_hal_displayio_epaperdisplay_get_busy(display)) {
             RUN_BACKGROUND_TASKS;
-            i++;
         }
     }
     common_hal_displayio_release_displays();
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld b/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
index 2777b41720..e814bead4c 100644
--- a/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
+++ b/ports/raspberrypi/boards/pimoroni_badger2040w/link.ld
@@ -1,294 +1 @@
-/* Based on GCC ARM embedded samples.
-   Defines the following symbols for use by code:
-    __exidx_start
-    __exidx_end
-    __etext
-    __data_start__
-    __preinit_array_start
-    __preinit_array_end
-    __init_array_start
-    __init_array_end
-    __fini_array_start
-    __fini_array_end
-    __data_end__
-    __bss_start__
-    __bss_end__
-    __end__
-    end
-    __HeapLimit
-    __StackLimit
-    __StackTop
-    __stack (== StackTop)
-*/
-
-MEMORY
-{
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
-    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
-    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
-    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
-    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
-}
-
-ENTRY(_entry_point)
-
-SECTIONS
-{
-    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
-       and checksummed. It is usually built by the boot_stage2 target
-       in the Pico SDK
-    */
-
-    .flash_begin : {
-        __flash_binary_start = .;
-    } > FLASH_FIRMWARE
-
-    .boot2 : {
-        __boot2_start__ = .;
-        KEEP (*(.boot2))
-        __boot2_end__ = .;
-    } > FLASH_FIRMWARE
-
-    ASSERT(__boot2_end__ - __boot2_start__ == 256,
-        "ERROR: Pico second stage bootloader must be 256 bytes in size")
-
-    /* The second stage will always enter the image at the start of .text.
-       The debugger will use the ELF entry point, which is the _entry_point
-       symbol if present, otherwise defaults to start of .text.
-       This can be used to transfer control back to the bootrom on debugger
-       launches only, to perform proper flash setup.
-    */
-
-    .text : {
-        __logical_binary_start = .;
-        KEEP (*(.vectors))
-        KEEP (*(.binary_info_header))
-        __binary_info_header_end = .;
-        KEEP (*(.reset))
-        /* TODO revisit this now memset/memcpy/float in ROM */
-        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
-         * FLASH ... we will include any thing excluded here in .data below by default */
-        *(.init)
-
-        __property_getter_start = .;
-        *(.property_getter)
-        __property_getter_end = .;
-        __property_getset_start = .;
-        *(.property_getset)
-        __property_getset_end = .;
-
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
-        *(.fini)
-        /* Pull all c'tors into .text */
-        *crtbegin.o(.ctors)
-        *crtbegin?.o(.ctors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
-        *(SORT(.ctors.*))
-        *(.ctors)
-        /* Followed by destructors */
-        *crtbegin.o(.dtors)
-        *crtbegin?.o(.dtors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
-        *(SORT(.dtors.*))
-        *(.dtors)
-
-        *(.eh_frame*)
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .rodata : {
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
-        . = ALIGN(4);
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .ARM.extab :
-    {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > FLASH_FIRMWARE
-
-    __exidx_start = .;
-    .ARM.exidx :
-    {
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > FLASH_FIRMWARE
-    __exidx_end = .;
-
-    /* Machine inspectable binary information */
-    . = ALIGN(4);
-    __binary_info_start = .;
-    .binary_info :
-    {
-        KEEP(*(.binary_info.keep.*))
-        *(.binary_info.*)
-    } > FLASH_FIRMWARE
-    __binary_info_end = .;
-    . = ALIGN(4);
-
-    /* End of .text-like segments */
-    __etext = .;
-
-   .ram_vector_table (COPY): {
-        *(.ram_vector_table)
-    } > RAM
-
-    .data : {
-        __data_start__ = .;
-        *(vtable)
-
-        *(.time_critical*)
-
-        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
-        *(.text*)
-        . = ALIGN(4);
-        *(.rodata*)
-        . = ALIGN(4);
-
-        *(.data*)
-
-        . = ALIGN(4);
-        *(.after_data.*)
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__mutex_array_start = .);
-        KEEP(*(SORT(.mutex_array.*)))
-        KEEP(*(.mutex_array))
-        PROVIDE_HIDDEN (__mutex_array_end = .);
-
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__preinit_array_start = .);
-        KEEP(*(SORT(.preinit_array.*)))
-        KEEP(*(.preinit_array))
-        PROVIDE_HIDDEN (__preinit_array_end = .);
-
-        . = ALIGN(4);
-        /* init data */
-        PROVIDE_HIDDEN (__init_array_start = .);
-        KEEP(*(SORT(.init_array.*)))
-        KEEP(*(.init_array))
-        PROVIDE_HIDDEN (__init_array_end = .);
-
-        . = ALIGN(4);
-        /* finit data */
-        PROVIDE_HIDDEN (__fini_array_start = .);
-        *(SORT(.fini_array.*))
-        *(.fini_array)
-        PROVIDE_HIDDEN (__fini_array_end = .);
-
-        *(.jcr)
-        . = ALIGN(4);
-        /* All data end */
-        __data_end__ = .;
-    } > RAM AT> FLASH_FIRMWARE
-
-    .itcm :
-    {
-        . = ALIGN(4);
-        *(.itcm.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_itcm_destination = ADDR(.itcm);
-    _ld_itcm_flash_copy = LOADADDR(.itcm);
-    _ld_itcm_size = SIZEOF(.itcm);
-
-    .dtcm_data :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_data.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_dtcm_data_destination = ADDR(.dtcm_data);
-    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
-    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
-
-    .dtcm_bss :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_bss.*)
-
-        . = ALIGN(4);
-    } > RAM AT> RAM
-    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
-    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
-
-    .uninitialized_data (COPY): {
-        . = ALIGN(4);
-        *(.uninitialized_data*)
-    } > RAM
-
-    /* Start and end symbols must be word-aligned */
-    .scratch_x : {
-        __scratch_x_start__ = .;
-        *(.scratch_x.*)
-        . = ALIGN(4);
-        __scratch_x_end__ = .;
-    } > SCRATCH_X AT > FLASH_FIRMWARE
-    __scratch_x_source__ = LOADADDR(.scratch_x);
-
-    .scratch_y : {
-        __scratch_y_start__ = .;
-        *(.scratch_y.*)
-        . = ALIGN(4);
-        __scratch_y_end__ = .;
-    } > SCRATCH_Y AT > FLASH_FIRMWARE
-    __scratch_y_source__ = LOADADDR(.scratch_y);
-
-    .bss  : {
-        . = ALIGN(4);
-        __bss_start__ = .;
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
-        *(COMMON)
-        . = ALIGN(4);
-        __bss_end__ = .;
-    } > RAM
-
-    .heap (COPY):
-    {
-        __end__ = .;
-        end = __end__;
-        *(.heap*)
-        __HeapLimit = .;
-    } > RAM
-
-    /* .stack*_dummy section doesn't contains any symbols. It is only
-     * used for linker to calculate size of stack sections, and assign
-     * values to stack symbols later
-     *
-     * stack1 section may be empty/missing if platform_launch_core1 is not used */
-
-    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
-     * stack is not used then all of SCRATCH_X is free.
-     */
-    .stack1_dummy (COPY):
-    {
-        *(.stack1*)
-    } > SCRATCH_X
-    .stack_dummy (COPY):
-    {
-        *(.stack*)
-    } > SCRATCH_Y
-
-    .flash_end : {
-        __flash_binary_end = .;
-    } > FLASH_FIRMWARE
-
-    /* stack limit is poorly named, but historically is maximum heap ptr */
-    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
-    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
-    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
-    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
-    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
-    PROVIDE(__stack = __StackTop);
-
-    /* Check if data + heap + stack exceeds RAM limit */
-    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
-
-    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
-    /* todo assert on extra code */
-}
+firmware_size = 1532k;

From 4f8ae14c18e15ffc6bc0a33fd3151fff193c9829 Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Fri, 28 Apr 2023 08:56:52 +0200
Subject: [PATCH 2312/2403] update to upstream version

---
 .../boards/pimoroni_plasma2040w/link.ld       | 295 +-----------------
 1 file changed, 1 insertion(+), 294 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld b/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
index 2777b41720..e814bead4c 100644
--- a/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/link.ld
@@ -1,294 +1 @@
-/* Based on GCC ARM embedded samples.
-   Defines the following symbols for use by code:
-    __exidx_start
-    __exidx_end
-    __etext
-    __data_start__
-    __preinit_array_start
-    __preinit_array_end
-    __init_array_start
-    __init_array_end
-    __fini_array_start
-    __fini_array_end
-    __data_end__
-    __bss_start__
-    __bss_end__
-    __end__
-    end
-    __HeapLimit
-    __StackLimit
-    __StackTop
-    __stack (== StackTop)
-*/
-
-MEMORY
-{
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x10000000, LENGTH = 1532k
-    /* Followed by: 4kB of NVRAM and at least 512kB of CIRCUITPY */
-    RAM (rwx) : ORIGIN =  0x20000000, LENGTH = 256k
-    SCRATCH_X (rwx) : ORIGIN = 0x20040000, LENGTH = 4k
-    SCRATCH_Y (rwx) : ORIGIN = 0x20041000, LENGTH = 4k
-}
-
-ENTRY(_entry_point)
-
-SECTIONS
-{
-    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
-       and checksummed. It is usually built by the boot_stage2 target
-       in the Pico SDK
-    */
-
-    .flash_begin : {
-        __flash_binary_start = .;
-    } > FLASH_FIRMWARE
-
-    .boot2 : {
-        __boot2_start__ = .;
-        KEEP (*(.boot2))
-        __boot2_end__ = .;
-    } > FLASH_FIRMWARE
-
-    ASSERT(__boot2_end__ - __boot2_start__ == 256,
-        "ERROR: Pico second stage bootloader must be 256 bytes in size")
-
-    /* The second stage will always enter the image at the start of .text.
-       The debugger will use the ELF entry point, which is the _entry_point
-       symbol if present, otherwise defaults to start of .text.
-       This can be used to transfer control back to the bootrom on debugger
-       launches only, to perform proper flash setup.
-    */
-
-    .text : {
-        __logical_binary_start = .;
-        KEEP (*(.vectors))
-        KEEP (*(.binary_info_header))
-        __binary_info_header_end = .;
-        KEEP (*(.reset))
-        /* TODO revisit this now memset/memcpy/float in ROM */
-        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
-         * FLASH ... we will include any thing excluded here in .data below by default */
-        *(.init)
-
-        __property_getter_start = .;
-        *(.property_getter)
-        __property_getter_end = .;
-        __property_getset_start = .;
-        *(.property_getset)
-        __property_getset_end = .;
-
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
-        *(.fini)
-        /* Pull all c'tors into .text */
-        *crtbegin.o(.ctors)
-        *crtbegin?.o(.ctors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
-        *(SORT(.ctors.*))
-        *(.ctors)
-        /* Followed by destructors */
-        *crtbegin.o(.dtors)
-        *crtbegin?.o(.dtors)
-        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
-        *(SORT(.dtors.*))
-        *(.dtors)
-
-        *(.eh_frame*)
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .rodata : {
-        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
-        . = ALIGN(4);
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
-        . = ALIGN(4);
-    } > FLASH_FIRMWARE
-
-    .ARM.extab :
-    {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > FLASH_FIRMWARE
-
-    __exidx_start = .;
-    .ARM.exidx :
-    {
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > FLASH_FIRMWARE
-    __exidx_end = .;
-
-    /* Machine inspectable binary information */
-    . = ALIGN(4);
-    __binary_info_start = .;
-    .binary_info :
-    {
-        KEEP(*(.binary_info.keep.*))
-        *(.binary_info.*)
-    } > FLASH_FIRMWARE
-    __binary_info_end = .;
-    . = ALIGN(4);
-
-    /* End of .text-like segments */
-    __etext = .;
-
-   .ram_vector_table (COPY): {
-        *(.ram_vector_table)
-    } > RAM
-
-    .data : {
-        __data_start__ = .;
-        *(vtable)
-
-        *(.time_critical*)
-
-        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
-        *(.text*)
-        . = ALIGN(4);
-        *(.rodata*)
-        . = ALIGN(4);
-
-        *(.data*)
-
-        . = ALIGN(4);
-        *(.after_data.*)
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__mutex_array_start = .);
-        KEEP(*(SORT(.mutex_array.*)))
-        KEEP(*(.mutex_array))
-        PROVIDE_HIDDEN (__mutex_array_end = .);
-
-        . = ALIGN(4);
-        /* preinit data */
-        PROVIDE_HIDDEN (__preinit_array_start = .);
-        KEEP(*(SORT(.preinit_array.*)))
-        KEEP(*(.preinit_array))
-        PROVIDE_HIDDEN (__preinit_array_end = .);
-
-        . = ALIGN(4);
-        /* init data */
-        PROVIDE_HIDDEN (__init_array_start = .);
-        KEEP(*(SORT(.init_array.*)))
-        KEEP(*(.init_array))
-        PROVIDE_HIDDEN (__init_array_end = .);
-
-        . = ALIGN(4);
-        /* finit data */
-        PROVIDE_HIDDEN (__fini_array_start = .);
-        *(SORT(.fini_array.*))
-        *(.fini_array)
-        PROVIDE_HIDDEN (__fini_array_end = .);
-
-        *(.jcr)
-        . = ALIGN(4);
-        /* All data end */
-        __data_end__ = .;
-    } > RAM AT> FLASH_FIRMWARE
-
-    .itcm :
-    {
-        . = ALIGN(4);
-        *(.itcm.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_itcm_destination = ADDR(.itcm);
-    _ld_itcm_flash_copy = LOADADDR(.itcm);
-    _ld_itcm_size = SIZEOF(.itcm);
-
-    .dtcm_data :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_data.*)
-
-        . = ALIGN(4);
-    } > RAM AT> FLASH_FIRMWARE
-    _ld_dtcm_data_destination = ADDR(.dtcm_data);
-    _ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
-    _ld_dtcm_data_size = SIZEOF(.dtcm_data);
-
-    .dtcm_bss :
-    {
-        . = ALIGN(4);
-
-        *(.dtcm_bss.*)
-
-        . = ALIGN(4);
-    } > RAM AT> RAM
-    _ld_dtcm_bss_start = ADDR(.dtcm_bss);
-    _ld_dtcm_bss_size = SIZEOF(.dtcm_bss);
-
-    .uninitialized_data (COPY): {
-        . = ALIGN(4);
-        *(.uninitialized_data*)
-    } > RAM
-
-    /* Start and end symbols must be word-aligned */
-    .scratch_x : {
-        __scratch_x_start__ = .;
-        *(.scratch_x.*)
-        . = ALIGN(4);
-        __scratch_x_end__ = .;
-    } > SCRATCH_X AT > FLASH_FIRMWARE
-    __scratch_x_source__ = LOADADDR(.scratch_x);
-
-    .scratch_y : {
-        __scratch_y_start__ = .;
-        *(.scratch_y.*)
-        . = ALIGN(4);
-        __scratch_y_end__ = .;
-    } > SCRATCH_Y AT > FLASH_FIRMWARE
-    __scratch_y_source__ = LOADADDR(.scratch_y);
-
-    .bss  : {
-        . = ALIGN(4);
-        __bss_start__ = .;
-        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
-        *(COMMON)
-        . = ALIGN(4);
-        __bss_end__ = .;
-    } > RAM
-
-    .heap (COPY):
-    {
-        __end__ = .;
-        end = __end__;
-        *(.heap*)
-        __HeapLimit = .;
-    } > RAM
-
-    /* .stack*_dummy section doesn't contains any symbols. It is only
-     * used for linker to calculate size of stack sections, and assign
-     * values to stack symbols later
-     *
-     * stack1 section may be empty/missing if platform_launch_core1 is not used */
-
-    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
-     * stack is not used then all of SCRATCH_X is free.
-     */
-    .stack1_dummy (COPY):
-    {
-        *(.stack1*)
-    } > SCRATCH_X
-    .stack_dummy (COPY):
-    {
-        *(.stack*)
-    } > SCRATCH_Y
-
-    .flash_end : {
-        __flash_binary_end = .;
-    } > FLASH_FIRMWARE
-
-    /* stack limit is poorly named, but historically is maximum heap ptr */
-    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
-    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
-    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
-    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
-    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
-    PROVIDE(__stack = __StackTop);
-
-    /* Check if data + heap + stack exceeds RAM limit */
-    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
-
-    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
-    /* todo assert on extra code */
-}
+firmware_size = 1532k;

From 14c17224a1a0d4dc82262b8a72cba6b8e1f9999a Mon Sep 17 00:00:00 2001
From: Bernhard Bablok 
Date: Fri, 28 Apr 2023 08:57:22 +0200
Subject: [PATCH 2313/2403] update product-id

---
 ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
index 68fec260ed..4b5faf6efb 100644
--- a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x2E8A
-USB_PID = 0x100a
+USB_PID = 0x1058
 USB_PRODUCT = "Plasma 2040 W"
 USB_MANUFACTURER = "Pimoroni"
 

From a9dc31a88198e5f09d46799870a921b92470b120 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 23 Mar 2023 16:11:00 -0700
Subject: [PATCH 2314/2403] Add additional iMX RT support

This adds a script to generate the peripherals files (except clock).

It adds support for the 1015, 1020, 1040, and 1050 EVKs.

Some work was started on 1176 but it isn't working. So, the board
def is in a separate branch.

Fixes #3521. Fixes #2477.
---
 lib/tinyusb                                   |   2 +-
 ports/mimxrt10xx/Makefile                     |  42 +-
 ports/mimxrt10xx/boards/board.h               |   1 +
 ports/mimxrt10xx/boards/imxrt1010_evk/board.c |   4 +-
 .../boards/imxrt1010_evk/flash_config.c       |   2 +-
 .../boards/imxrt1010_evk/mpconfigboard.h      |   4 +-
 ports/mimxrt10xx/boards/imxrt1015_evk/board.c |  49 ++
 .../boards/imxrt1015_evk/flash_config.c       | 143 ++++
 .../boards/imxrt1015_evk/mpconfigboard.h      |  24 +
 .../boards/imxrt1015_evk/mpconfigboard.mk     |   8 +
 ports/mimxrt10xx/boards/imxrt1015_evk/pins.c  |  76 ++
 ports/mimxrt10xx/boards/imxrt1020_evk/board.c |   4 +-
 .../boards/imxrt1020_evk/flash_config.c       |   2 +-
 ports/mimxrt10xx/boards/imxrt1040_evk/board.c |  53 ++
 .../boards/imxrt1040_evk/flash_config.c       | 144 ++++
 .../boards/imxrt1040_evk/mpconfigboard.h      |  22 +
 .../boards/imxrt1040_evk/mpconfigboard.mk     |   8 +
 ports/mimxrt10xx/boards/imxrt1040_evk/pins.c  | 123 ++++
 .../mimxrt10xx/boards/imxrt1050_evkb/board.c  |  53 ++
 .../boards/imxrt1050_evkb/flash_config.c      | 144 ++++
 .../boards/imxrt1050_evkb/mpconfigboard.h     |  27 +
 .../boards/imxrt1050_evkb/mpconfigboard.mk    |  10 +
 ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c | 142 ++++
 .../boards/metro_m7_1011/flash_config.c       |   6 +-
 .../mimxrt10xx/common-hal/audiobusio/I2SOut.c |   6 +-
 ports/mimxrt10xx/common-hal/busio/I2C.c       |  30 +-
 ports/mimxrt10xx/common-hal/busio/SPI.c       |  58 +-
 ports/mimxrt10xx/common-hal/busio/UART.c      |  30 +-
 .../common-hal/digitalio/DigitalInOut.c       |  10 +-
 .../common-hal/microcontroller/Processor.c    |  10 +
 .../common-hal/microcontroller/__init__.c     | 190 +----
 ports/mimxrt10xx/common-hal/os/__init__.c     |   6 +
 .../linking/chip_family/MIMXRT1011.ld         |   4 +-
 .../linking/chip_family/MIMXRT1015.ld         |   4 +
 .../linking/chip_family/MIMXRT1021.ld         |   4 +-
 .../linking/chip_family/MIMXRT1042.ld         |   4 +
 .../linking/chip_family/MIMXRT1052.ld         |   4 +
 .../linking/chip_family/MIMXRT1062.ld         |   4 +-
 .../linking/chip_family/MIMXRT1176.ld         |   4 +
 ports/mimxrt10xx/linking/common.ld            |  14 +-
 ports/mimxrt10xx/linking/flash/IS25WP128.ld   |   1 +
 ports/mimxrt10xx/mpconfigport.mk              |   6 +-
 .../mimxrt10xx/MIMXRT1011/clocks.c            |   2 +
 .../mimxrt10xx/MIMXRT1011/periph.c            |  98 +--
 .../mimxrt10xx/MIMXRT1011/periph.h            |  29 +-
 .../mimxrt10xx/MIMXRT1011/pin_names.h         |  78 ++
 .../peripherals/mimxrt10xx/MIMXRT1011/pins.c  |  88 +--
 .../peripherals/mimxrt10xx/MIMXRT1011/pins.h  |  59 +-
 .../mimxrt10xx/MIMXRT1015/clocks.c            | 315 ++++++++
 .../mimxrt10xx/MIMXRT1015/periph.c            | 184 +++++
 .../mimxrt10xx/MIMXRT1015/periph.h            |  55 ++
 .../mimxrt10xx/MIMXRT1015/pin_names.h         |  92 +++
 .../peripherals/mimxrt10xx/MIMXRT1015/pins.c  |  91 +++
 .../peripherals/mimxrt10xx/MIMXRT1015/pins.h  |  36 +
 .../mimxrt10xx/MIMXRT1021/clocks.c            |   2 +
 .../mimxrt10xx/MIMXRT1021/periph.c            | 232 +++---
 .../mimxrt10xx/MIMXRT1021/periph.h            |  27 +-
 .../mimxrt10xx/MIMXRT1021/pin_names.h         | 130 ++++
 .../peripherals/mimxrt10xx/MIMXRT1021/pins.c  |  68 +-
 .../peripherals/mimxrt10xx/MIMXRT1021/pins.h  | 111 +--
 .../mimxrt10xx/MIMXRT1042/clocks.c            | 382 ++++++++++
 .../mimxrt10xx/MIMXRT1042/periph.c            | 356 ++++++++++
 .../mimxrt10xx/MIMXRT1042/periph.h            |  55 ++
 .../mimxrt10xx/MIMXRT1042/pin_names.h         | 151 ++++
 .../peripherals/mimxrt10xx/MIMXRT1042/pins.c  | 147 ++++
 .../peripherals/mimxrt10xx/MIMXRT1042/pins.h  |  36 +
 .../mimxrt10xx/MIMXRT1052/clocks.c            | 402 +++++++++++
 .../mimxrt10xx/MIMXRT1052/periph.c            | 377 ++++++++++
 .../mimxrt10xx/MIMXRT1052/periph.h            |  55 ++
 .../mimxrt10xx/MIMXRT1052/pin_names.h         | 165 +++++
 .../peripherals/mimxrt10xx/MIMXRT1052/pins.c  | 161 +++++
 .../peripherals/mimxrt10xx/MIMXRT1052/pins.h  |  36 +
 .../mimxrt10xx/MIMXRT1062/periph.c            | 178 ++---
 .../mimxrt10xx/MIMXRT1062/periph.h            |  29 +-
 .../mimxrt10xx/MIMXRT1062/pin_names.h         | 165 +++++
 .../peripherals/mimxrt10xx/MIMXRT1062/pins.c  |  27 +-
 .../peripherals/mimxrt10xx/MIMXRT1062/pins.h  | 148 +---
 .../mimxrt10xx/MIMXRT1176/clocks.c            | 672 ++++++++++++++++++
 .../mimxrt10xx/MIMXRT1176/periph.c            | 358 ++++++++++
 .../mimxrt10xx/MIMXRT1176/periph.h            |  55 ++
 .../mimxrt10xx/MIMXRT1176/pin_names.h         | 182 +++++
 .../peripherals/mimxrt10xx/MIMXRT1176/pins.c  | 177 +++++
 .../peripherals/mimxrt10xx/MIMXRT1176/pins.h  |  36 +
 .../peripherals/mimxrt10xx/periph.h           |   8 +
 .../peripherals/mimxrt10xx/pin_names.h        |  42 ++
 .../mimxrt10xx/peripherals/mimxrt10xx/pins.h  |   8 +
 ports/mimxrt10xx/sdk                          |   2 +-
 .../supervisor/flexspi_nor_flash_ops.c        |   2 +-
 ports/mimxrt10xx/supervisor/internal_flash.c  |  40 ++
 ports/mimxrt10xx/supervisor/port.c            | 113 ++-
 ports/mimxrt10xx/supervisor/usb.c             |   5 +
 .../mimxrt10xx/tools/gen_peripherals_data.py  | 356 ++++++++++
 py/stackctrl.c                                |   3 +
 supervisor/linker.h                           |   2 +-
 tools/cortex-m-fault-gdb.py                   |   7 +
 95 files changed, 7148 insertions(+), 969 deletions(-)
 create mode 100644 ports/mimxrt10xx/boards/imxrt1015_evk/board.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1015_evk/flash_config.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.h
 create mode 100644 ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
 create mode 100644 ports/mimxrt10xx/boards/imxrt1015_evk/pins.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1040_evk/board.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1040_evk/flash_config.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.h
 create mode 100644 ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
 create mode 100644 ports/mimxrt10xx/boards/imxrt1040_evk/pins.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1050_evkb/flash_config.c
 create mode 100644 ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.h
 create mode 100644 ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
 create mode 100644 ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c
 create mode 100644 ports/mimxrt10xx/linking/chip_family/MIMXRT1015.ld
 create mode 100644 ports/mimxrt10xx/linking/chip_family/MIMXRT1042.ld
 create mode 100644 ports/mimxrt10xx/linking/chip_family/MIMXRT1052.ld
 create mode 100644 ports/mimxrt10xx/linking/chip_family/MIMXRT1176.ld
 create mode 100644 ports/mimxrt10xx/linking/flash/IS25WP128.ld
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pin_names.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
 create mode 100644 ports/mimxrt10xx/peripherals/mimxrt10xx/pin_names.h
 create mode 100644 ports/mimxrt10xx/tools/gen_peripherals_data.py

diff --git a/lib/tinyusb b/lib/tinyusb
index ec9c666107..e3b3229d61 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit ec9c666107c0be0f8dc7c2a15e3bdea8c44a50b4
+Subproject commit e3b3229d61676585879c81d5f2e3393a2a1f1b16
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index 72f4d191ef..b10466bb2d 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -34,10 +34,11 @@ INC += \
 	-I../../lib/tinyusb/src \
 	-I../../supervisor/shared/usb \
 	-I$(BUILD) \
-	-Iboards/ \
+	-Iboards \
 	-Iboards/$(BOARD) \
 	-Iperipherals/ \
 	-Iperipherals/mimxrt10xx/ \
+	-Isdk/CMSIS/Include/ \
 	-Isdk/devices/$(CHIP_FAMILY) \
 	-Isdk/devices/$(CHIP_FAMILY)/drivers \
 	-Isdk/drivers/common
@@ -48,7 +49,7 @@ CFLAGS += -ftree-vrp -DNDEBUG
 
 # TinyUSB defines
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512
-ifeq ($(CHIP_FAMILY), MIMXRT1011)
+ifeq ($(CHIP_FAMILY),$(filter $(CHIP_FAMILY),MIMXRT1011 MIMXRT1015))
 CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=64 -DCFG_TUD_MIDI_TX_BUFSIZE=64 -DCFG_TUD_MSC_BUFSIZE=512
 else
 CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=1024
@@ -75,7 +76,7 @@ CFLAGS += \
 	-mfloat-abi=hard \
 	-mfpu=fpv5-sp-d16 \
 	-DCPU_$(CHIP_VARIANT) \
-	-DIMXRT10XX \
+	-DIMXRT1XXX \
 	-g3 -Wno-unused-parameter \
 	-ffunction-sections -fdata-sections -fstack-usage
 
@@ -100,14 +101,27 @@ ifndef INTERNAL_LIBM
 LIBS += -lm
 endif
 
-LDFLAGS += -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -mthumb -mapcs
+ifndef CHIP_CORE
+CHIP_CORE = $(CHIP_FAMILY)
+endif
+
+# If not empty, then it is 10xx.
+ifneq ($(findstring MIMXRT10, $(CHIP_FAMILY)),)
+CFLAGS += -DIMXRT10XX=1 -DIMXRT11XX=0
+MIMXRT10xx = $(CHIP_FAMILY)
 BOOTLOADER_SIZE := 0x6000C000
+else
+CFLAGS += -DIMXRT11XX=1 -DIMXRT10XX=0
+MIMXRT11xx = $(CHIP_FAMILY)
+BOOTLOADER_SIZE := 0x3000C000
+endif
+
+LDFLAGS += -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -mthumb -mapcs
 
 SRC_SDK := \
 	devices/$(CHIP_FAMILY)/drivers/fsl_clock.c \
-	devices/$(CHIP_FAMILY)/system_$(CHIP_FAMILY).c \
+	devices/$(CHIP_FAMILY)/system_$(CHIP_CORE).c \
 	devices/$(CHIP_FAMILY)/xip/fsl_flexspi_nor_boot.c \
-	drivers/adc_12b1msps_sar/fsl_adc.c \
 	drivers/cache/armv7-m7/fsl_cache.c \
 	drivers/common/fsl_common_arm.c \
 	drivers/common/fsl_common.c \
@@ -121,11 +135,23 @@ SRC_SDK := \
 	drivers/sai/fsl_sai.c \
 	drivers/snvs_hp/fsl_snvs_hp.c \
 	drivers/snvs_lp/fsl_snvs_lp.c \
-	drivers/tempmon/fsl_tempmon.c \
 	drivers/trng/fsl_trng.c \
 
+ifeq ($(CIRCUITPY_ANALOGIO), 1)
+SRC_SDK +=	drivers/adc_12b1msps_sar/fsl_adc.c \
+	drivers/tempmon/fsl_tempmon.c
+endif
+
+ifeq ($(CHIP_FAMILY), MIMXRT1176)
+SRC_SDK += devices/$(CHIP_FAMILY)/drivers/fsl_anatop_ai.c \
+	devices/$(CHIP_FAMILY)/drivers/fsl_dcdc.c \
+	devices/$(CHIP_FAMILY)/drivers/fsl_pmu.c
+endif
+
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
 
+$(addprefix $(BUILD)/, $(SRC_SDK:.c=.o)): CFLAGS += -Wno-array-bounds
+
 SRC_C += \
 	background.c \
 	boards/$(BOARD)/board.c \
@@ -156,7 +182,7 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
                              $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
 
 SRC_S = \
-    sdk/devices/$(CHIP_FAMILY)/gcc/startup_$(CHIP_FAMILY).S \
+    sdk/devices/$(CHIP_FAMILY)/gcc/startup_$(CHIP_CORE).S \
     supervisor/cpu.S
 
 OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/ports/mimxrt10xx/boards/board.h b/ports/mimxrt10xx/boards/board.h
index e6736806ed..f00fea6be9 100644
--- a/ports/mimxrt10xx/boards/board.h
+++ b/ports/mimxrt10xx/boards/board.h
@@ -27,3 +27,4 @@
 #include "mpconfigboard.h"
 
 #define XIP_BOOT_HEADER_ENABLE (1)
+#define XIP_EXTERNAL_FLASH (1)
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
index b839ffa666..c5237c8a8e 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -42,8 +42,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_07,
     &pin_GPIO_SD_06,
     // USB Pins
-    &pin_GPIO_12,
-    &pin_GPIO_13,
+    &pin_USB_OTG1_DN,
+    &pin_USB_OTG1_DP,
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
index f15a3f3459..383a8ba1d1 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
         .deviceModeArg = 0x02,
         .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFLEXSPISerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_133MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
index 192c265f88..2ae3a8b6f1 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
@@ -17,7 +17,7 @@
 #define DEFAULT_UART_BUS_RX (&pin_GPIO_09)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO_10)
 
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_09)
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_10)
+// #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_09)
+// #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_10)
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO_11)
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/board.c b/ports/mimxrt10xx/boards/imxrt1015_evk/board.c
new file mode 100644
index 0000000000..568945a3eb
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/board.c
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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 "supervisor/board.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_B0_00, // SWDIO
+    &pin_GPIO_AD_B0_01, // SWCLK
+    // FLEX flash
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
+    // USB Pins
+    &pin_USB_OTG1_DN,
+    &pin_USB_OTG1_DP,
+    NULL,                       // Must end in NULL.
+};
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1015_evk/flash_config.c
new file mode 100644
index 0000000000..f15a3f3459
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/flash_config.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2017 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "boards/flash_config.h"
+
+#include "xip/fsl_flexspi_nor_boot.h"
+
+// Config for AT25SF128A with QSPI routed.
+__attribute__((section(".boot_hdr.conf")))
+const flexspi_nor_config_t qspiflash_config = {
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
+    .blockSize = 0x00010000,
+    .isUniformBlockSize = false,
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+
+        .busyOffset = 0u,     // Status bit 0 indicates busy.
+        .busyBitPolarity = 0u,     // Busy when the bit is 1.
+
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x02,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
+        .sflashA1Size = FLASH_SIZE,
+        .lookupTable =
+        {
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // The high 16 bits is command 1 and the low are command 0.
+            // Within a command, the top 6 bits are the opcode, the next two are the number
+            // of pads and then last byte is the operand. The operand's meaning changes
+            // per opcode.
+
+            // Indices with ROM should always have the same function because the ROM
+            // bootloader uses it.
+
+            // 0: ROM: Read LUTs
+            // Quad version
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+                RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                    READ_SDR,  FLEXSPI_4PAD, 0x04),
+                // Single fast read version, good for debugging.
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 1: ROM: Read status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+                READ_SDR, FLEXSPI_1PAD, 0x02),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 2: Empty
+            EMPTY_SEQUENCE,
+
+            // 3: ROM: Write Enable
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0x00),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 4: Config: Write Status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x31 /* the command to send */,
+                WRITE_SDR, FLEXSPI_1PAD, 0x01),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 5: ROM: Erase Sector
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 6: Empty
+            EMPTY_SEQUENCE,
+
+            // 7: Empty
+            EMPTY_SEQUENCE,
+
+            // 8: Block Erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 9: ROM: Page program
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                    STOP,      FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 10: Empty
+            EMPTY_SEQUENCE,
+
+            // 11: ROM: Chip erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 12: Empty
+            EMPTY_SEQUENCE,
+
+            // 13: ROM: Read SFDP
+            EMPTY_SEQUENCE,
+
+            // 14: ROM: Restore no cmd
+            EMPTY_SEQUENCE,
+
+            // 15: ROM: Dummy
+            EMPTY_SEQUENCE
+        },
+    },
+};
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.h
new file mode 100644
index 0000000000..ff2fe55319
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.h
@@ -0,0 +1,24 @@
+#define MICROPY_HW_BOARD_NAME "IMXRT1015-EVK"
+#define MICROPY_HW_MCU_NAME "IMXRT1015DAF5A"
+
+// If you change this, then make sure to update the linker scripts as well to
+// make sure you don't overwrite code
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+#define BOARD_FLASH_SIZE (16 * 1024 * 1024)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO_AD_B0_10)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO_AD_B0_12)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO_AD_B0_13)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_AD_B1_15)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_AD_B1_14)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO_EMC_33)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO_EMC_32)
+
+// #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_AD_B0_07)
+// #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_AD_B0_06)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO_SD_B1_00)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
new file mode 100644
index 0000000000..0f446e13bf
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
@@ -0,0 +1,8 @@
+USB_VID = 0x239A
+USB_PID = 0x8078
+USB_PRODUCT = "IMXRT1015-EVK"
+USB_MANUFACTURER = "NXP"
+
+CHIP_VARIANT = MIMXRT1015DAF5A
+CHIP_FAMILY = MIMXRT1015
+FLASH = AT25SF128A
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c
new file mode 100644
index 0000000000..abe2e8e746
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c
@@ -0,0 +1,76 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "supervisor/board.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_EMC_33) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_EMC_33) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_EMC_32) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_EMC_32) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_EMC_20) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_EMC_26) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_EMC_34) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_EMC_27) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_AD_B1_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_AD_B0_15) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_EMC_21) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_EMC_22) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_AD_B0_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_AD_B0_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_AD_B0_13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_AD_B0_13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_AD_B0_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_AD_B0_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B0_14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED1), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED2), MP_ROM_PTR(&pin_GPIO_SD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED3), MP_ROM_PTR(&pin_GPIO_SD_B1_02) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USER_SW), MP_ROM_PTR(&pin_GPIO_EMC_09) },
+
+    // Audio Interface
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_INT), MP_ROM_PTR(&pin_GPIO_EMC_08) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_SYNC), MP_ROM_PTR(&pin_GPIO_EMC_27) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_BCLK), MP_ROM_PTR(&pin_GPIO_EMC_26) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RXD), MP_ROM_PTR(&pin_GPIO_EMC_21) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TXD), MP_ROM_PTR(&pin_GPIO_EMC_25) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_MCLK), MP_ROM_PTR(&pin_GPIO_EMC_20) },
+
+    // SPDIF
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_IN), MP_ROM_PTR(&pin_GPIO_EMC_05) },
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_OUT), MP_ROM_PTR(&pin_GPIO_EMC_04) },
+
+    // J29 UART LPUART4
+    { MP_ROM_QSTR(MP_QSTR_J29_TX), MP_ROM_PTR(&pin_GPIO_EMC_32) },
+    { MP_ROM_QSTR(MP_QSTR_J29_RX), MP_ROM_PTR(&pin_GPIO_EMC_33) },
+
+    // J30 UART LPUART3
+    { MP_ROM_QSTR(MP_QSTR_J30_TX), MP_ROM_PTR(&pin_GPIO_EMC_06) },
+    { MP_ROM_QSTR(MP_QSTR_J30_RX), MP_ROM_PTR(&pin_GPIO_EMC_07) },
+
+    // Freelink UART
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_06) },
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_07) },
+
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
index afbc0c58b5..f814afd956 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -44,8 +44,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    &pin_GPIO_AD_B1_11,
-    &pin_GPIO_AD_B1_12,
+    &pin_USB_OTG1_DN,
+    &pin_USB_OTG1_DP,
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
index 2ae8ae9b76..47293c22b9 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/flash_config.c
@@ -21,7 +21,7 @@ const flexspi_nor_config_t qspiflash_config = {
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromSckPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/board.c b/ports/mimxrt10xx/boards/imxrt1040_evk/board.c
new file mode 100644
index 0000000000..0e97d87b60
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/board.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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 "supervisor/board.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    // SWD Pins
+    &pin_GPIO_AD_B0_06, // SWDIO
+    &pin_GPIO_AD_B0_07, // SWCLK
+
+    // FLEXSPI QSPI
+    &pin_GPIO_SD_B1_05,
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
+
+    &pin_USB_OTG1_DN,
+    &pin_USB_OTG1_DP,
+
+    NULL,                       // Must end in NULL.
+};
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1040_evk/flash_config.c
new file mode 100644
index 0000000000..e68d9f9312
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2017 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "boards/flash_config.h"
+
+#include "xip/fsl_flexspi_nor_boot.h"
+
+// Config for W25Q64JVSSIQ with QSPI routed.
+__attribute__((section(".boot_hdr.conf")))
+const flexspi_nor_config_t qspiflash_config = {
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
+    .blockSize = 0x00010000,
+    .isUniformBlockSize = false,
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromSckPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+
+        .busyOffset = 0u,     // Status bit 0 indicates busy.
+        .busyBitPolarity = 0u,     // Busy when the bit is 1.
+
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x40,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
+        .sflashA1Size = FLASH_SIZE,
+        .lookupTable =
+        {
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // The high 16 bits is command 1 and the low are command 0.
+            // Within a command, the top 6 bits are the opcode, the next two are the number
+            // of pads and then last byte is the operand. The operand's meaning changes
+            // per opcode.
+
+            // Indices with ROM should always have the same function because the ROM
+            // bootloader uses it.
+
+            // 0: ROM: Read LUTs
+            // Quad version
+            SEQUENCE(
+                FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+                    RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                    READ_SDR,  FLEXSPI_4PAD, 0x04),
+                // Single fast read version, good for debugging.
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 1: ROM: Read status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+                READ_SDR, FLEXSPI_1PAD, 0x02),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 2: Empty
+            EMPTY_SEQUENCE,
+
+            // 3: ROM: Write Enable
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0x00),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 4: Config: Write Status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+                WRITE_SDR, FLEXSPI_1PAD, 0x01),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 5: ROM: Erase Sector
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 6: Empty
+            EMPTY_SEQUENCE,
+
+            // 7: Empty
+            EMPTY_SEQUENCE,
+
+            // 8: Block Erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 9: ROM: Page program
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                    STOP,      FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 10: Empty
+            EMPTY_SEQUENCE,
+
+            // 11: ROM: Chip erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 12: Empty
+            EMPTY_SEQUENCE,
+
+            // 13: ROM: Read SFDP
+            EMPTY_SEQUENCE,
+
+            // 14: ROM: Restore no cmd
+            EMPTY_SEQUENCE,
+
+            // 15: ROM: Dummy
+            EMPTY_SEQUENCE
+        },
+    },
+};
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.h
new file mode 100644
index 0000000000..dd1cf9f759
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.h
@@ -0,0 +1,22 @@
+#define MICROPY_HW_BOARD_NAME "iMX RT 1040 EVK"
+#define MICROPY_HW_MCU_NAME "IMXRT1042XJM5B"
+
+// If you change this, then make sure to update the linker scripts as well to
+// make sure you don't overwrite code
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO_AD_B0_08)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_AD_B1_00)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_AD_B1_01)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B1_07)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B1_06)
+
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_AD_B0_12)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_AD_B0_13)
+
+// If you want to connect over SWD, then make sure J80 is open.
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
new file mode 100644
index 0000000000..cf351d906e
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
@@ -0,0 +1,8 @@
+USB_VID = 0x239A
+USB_PID = 0x8084
+USB_PRODUCT = "iMX RT 1040 EVK"
+USB_MANUFACTURER = "NXP"
+
+CHIP_VARIANT = MIMXRT1042XJM5B
+CHIP_FAMILY = MIMXRT1042
+FLASH = W25Q64JV
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c
new file mode 100644
index 0000000000..4cabdddc55
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c
@@ -0,0 +1,123 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "supervisor/board.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_SD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_SD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_SD_B1_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_AD_B0_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_B1_14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_B1_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_SD_B0_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_SD_B0_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_SD_B0_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_SD_B0_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+
+    // i2c sensor is on I2C1_SCL/SDA
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B0_14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B0_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_04) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_05) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_06) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_07) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO_AD_B0_08) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_AD_B0_08) },
+
+    // SD Card / Wifi
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_SW), MP_ROM_PTR(&pin_GPIO_B1_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_D0), MP_ROM_PTR(&pin_GPIO_SD_B0_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_D1), MP_ROM_PTR(&pin_GPIO_SD_B0_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_D2), MP_ROM_PTR(&pin_GPIO_SD_B0_04) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_D3), MP_ROM_PTR(&pin_GPIO_SD_B0_05) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_PWREN), MP_ROM_PTR(&pin_GPIO_AD_B1_04) },
+
+    // LCD Interface
+    { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO_B1_15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_ENABLE), MP_ROM_PTR(&pin_GPIO_B0_01) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_VSYNC), MP_ROM_PTR(&pin_GPIO_B0_03) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_HSYNC), MP_ROM_PTR(&pin_GPIO_B0_02) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO_B0_00) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D0), MP_ROM_PTR(&pin_GPIO_B0_04) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D1), MP_ROM_PTR(&pin_GPIO_B0_05) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D2), MP_ROM_PTR(&pin_GPIO_B0_06) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D3), MP_ROM_PTR(&pin_GPIO_B0_07) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D4), MP_ROM_PTR(&pin_GPIO_B0_08) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D5), MP_ROM_PTR(&pin_GPIO_B0_09) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D6), MP_ROM_PTR(&pin_GPIO_B0_10) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D7), MP_ROM_PTR(&pin_GPIO_B0_11) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D8), MP_ROM_PTR(&pin_GPIO_B0_12) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D9), MP_ROM_PTR(&pin_GPIO_B0_13) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D10), MP_ROM_PTR(&pin_GPIO_B0_14) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D11), MP_ROM_PTR(&pin_GPIO_B0_15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D12), MP_ROM_PTR(&pin_GPIO_B1_00) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D13), MP_ROM_PTR(&pin_GPIO_B1_01) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D14), MP_ROM_PTR(&pin_GPIO_B1_02) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D15), MP_ROM_PTR(&pin_GPIO_B1_03) },
+
+    // Touch Interface
+    { MP_ROM_QSTR(MP_QSTR_LCD_TOUCH_INT), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
+
+    // Audio Interface
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_INT), MP_ROM_PTR(&pin_GPIO_SD_B1_03) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_MCLK), MP_ROM_PTR(&pin_GPIO_B0_13) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RX_SYNC), MP_ROM_PTR(&pin_GPIO_B0_14) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RX_BCLK), MP_ROM_PTR(&pin_GPIO_B0_15) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RXD), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TXD), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TX_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TX_SYNC), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+
+    // SPDIF
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_IN), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_OUT), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+
+    // Ethernet
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_MDIO), MP_ROM_PTR(&pin_GPIO_EMC_41) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_MDC), MP_ROM_PTR(&pin_GPIO_EMC_40) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXD0), MP_ROM_PTR(&pin_GPIO_B1_04) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXD1), MP_ROM_PTR(&pin_GPIO_B1_05) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_CRS_DV), MP_ROM_PTR(&pin_GPIO_B1_06) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXD0), MP_ROM_PTR(&pin_GPIO_B1_07) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXD1), MP_ROM_PTR(&pin_GPIO_B1_08) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXEN), MP_ROM_PTR(&pin_GPIO_B1_09) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_INT), MP_ROM_PTR(&pin_GPIO_SD_B1_04) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RST), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_CLK), MP_ROM_PTR(&pin_GPIO_B1_10) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXER), MP_ROM_PTR(&pin_GPIO_B1_11) },
+
+    // Freelink UART
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_12) },
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_13) },
+
+    // CAN
+    { MP_ROM_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_14) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_15) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_STBY), MP_ROM_PTR(&pin_GPIO_AD_B0_05) },
+
+    // USB
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG1_DP) },
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG1_DN) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c b/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
new file mode 100644
index 0000000000..8a34fc4210
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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 "supervisor/board.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    // SWD Pins
+    &pin_GPIO_AD_B0_06, // SWDIO
+    &pin_GPIO_AD_B0_07, // SWCLK
+
+    // FLEXSPI QSPI
+    &pin_GPIO_SD_B1_05,
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
+
+    // USB Pins
+    &pin_GPIO_AD_B0_01,
+    &pin_GPIO_AD_B0_03,
+    NULL,                       // Must end in NULL.
+};
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/flash_config.c b/ports/mimxrt10xx/boards/imxrt1050_evkb/flash_config.c
new file mode 100644
index 0000000000..110ef465bf
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2017 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "boards/flash_config.h"
+
+#include "xip/fsl_flexspi_nor_boot.h"
+
+// Config for IS25WP064A with QSPI routed.
+__attribute__((section(".boot_hdr.conf")))
+const flexspi_nor_config_t qspiflash_config = {
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
+    .blockSize = 0x00010000,
+    .isUniformBlockSize = false,
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromSckPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+
+        .busyOffset = 0u,     // Status bit 0 indicates busy.
+        .busyBitPolarity = 0u,     // Busy when the bit is 1.
+
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x40,
+        .deviceType = kFLEXSPIDeviceType_SerialNOR,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFLEXSPISerialClk_60MHz,
+        .sflashA1Size = FLASH_SIZE,
+        .lookupTable =
+        {
+            // FSL_ROM_FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
+            // The high 16 bits is command 1 and the low are command 0.
+            // Within a command, the top 6 bits are the opcode, the next two are the number
+            // of pads and then last byte is the operand. The operand's meaning changes
+            // per opcode.
+
+            // Indices with ROM should always have the same function because the ROM
+            // bootloader uses it.
+
+            // 0: ROM: Read LUTs
+            // Quad version
+            SEQUENCE(
+                FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xEB /* the command to send */,
+                    RADDR_SDR, FLEXSPI_4PAD, 24 /* bits to transmit */),
+                FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 6 /* 6 dummy cycles, 2 for M7-0 and 4 dummy */,
+                    READ_SDR,  FLEXSPI_4PAD, 0x04),
+                // Single fast read version, good for debugging.
+                // FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x0B /* the command to send */,
+                //                 RADDR_SDR, FLEXSPI_1PAD, 24  /* bits to transmit */),
+                // FSL_ROM_FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8 /* 8 dummy clocks */,
+                //                 READ_SDR,  FLEXSPI_1PAD, 0x04),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 1: ROM: Read status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,  FLEXSPI_1PAD, 0x05 /* the command to send */,
+                READ_SDR, FLEXSPI_1PAD, 0x02),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 2: Empty
+            EMPTY_SEQUENCE,
+
+            // 3: ROM: Write Enable
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0x00),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 4: Config: Write Status
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x01 /* the command to send */,
+                WRITE_SDR, FLEXSPI_1PAD, 0x01),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 5: ROM: Erase Sector
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x20 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 6: Empty
+            EMPTY_SEQUENCE,
+
+            // 7: Empty
+            EMPTY_SEQUENCE,
+
+            // 8: Block Erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0xD8 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 9: ROM: Page program
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR,   FLEXSPI_1PAD, 0x02 /* the command to send */,
+                RADDR_SDR, FLEXSPI_1PAD, 24 /* bits to transmit */),
+
+                FSL_ROM_FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0x04 /* data out */,
+                    STOP,      FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 10: Empty
+            EMPTY_SEQUENCE,
+
+            // 11: ROM: Chip erase
+            SEQUENCE(FSL_ROM_FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60 /* the command to send */,
+                STOP,    FLEXSPI_1PAD, 0),
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS,
+                TWO_EMPTY_STEPS),
+
+            // 12: Empty
+            EMPTY_SEQUENCE,
+
+            // 13: ROM: Read SFDP
+            EMPTY_SEQUENCE,
+
+            // 14: ROM: Restore no cmd
+            EMPTY_SEQUENCE,
+
+            // 15: ROM: Dummy
+            EMPTY_SEQUENCE
+        },
+    },
+};
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.h b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.h
new file mode 100644
index 0000000000..44e1dfaf12
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.h
@@ -0,0 +1,27 @@
+#define MICROPY_HW_BOARD_NAME "iMX RT 1050 EVKB"
+#define MICROPY_HW_MCU_NAME "IMXRT1052DVL6B"
+
+// If you change this, then make sure to update the linker scripts as well to
+// make sure you don't overwrite code
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+// This uses the QSPI Flash. You'll need to modify the board to access it. See
+// AN12108 for instructions. https://www.nxp.com/docs/en/application-note/AN12108.pdf
+// JLinkGDBServer -if SWD -device "MIMXRT1052xxx6B?BankAddr=0x60000000&Loader=QSPI"
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO_AD_B0_09)
+#define MICROPY_HW_LED_STATUS_INVERTED (1)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_AD_B1_00)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_AD_B1_01)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B1_07)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B1_06)
+
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO_AD_B0_12)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO_AD_B0_13)
+
+// Put host on the second USB so that the device connection powers the board.
+#define CIRCUITPY_USB_DEVICE_INSTANCE 0
+#define CIRCUITPY_USB_HOST_INSTANCE 1
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
new file mode 100644
index 0000000000..6627d46681
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
@@ -0,0 +1,10 @@
+USB_VID = 0x239A
+USB_PID = 0x8084
+USB_PRODUCT = "iMX RT 1050 EVKB"
+USB_MANUFACTURER = "NXP"
+
+CHIP_VARIANT = MIMXRT1052DVL6B
+CHIP_FAMILY = MIMXRT1052
+FLASH = IS25WP064A
+
+CIRCUITPY_USB_HOST = 1
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c b/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c
new file mode 100644
index 0000000000..a162463b28
--- /dev/null
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c
@@ -0,0 +1,142 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "supervisor/board.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B1_07) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_AD_B1_07) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_AD_B1_06) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_AD_B1_06) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_AD_B1_08) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_AD_B0_09) }, // Connected to audio codec
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO_AD_B0_10) }, // Connected to audio codec
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO_AD_B0_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO_AD_B0_02) }, // Connected to audio codec
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO_SD_B0_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO_SD_B0_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_SD_B0_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_SD_B0_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+
+    // i2c sensor is on I2C1_SCL/SDA
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_B1_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_B1_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO_AD_B1_04) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO_AD_B1_05) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
+
+    // Camera Sensor Interface
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_VSYNC), MP_ROM_PTR(&pin_GPIO_AD_B1_06) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_PWDN), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_HSYNC), MP_ROM_PTR(&pin_GPIO_AD_B1_07) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D9), MP_ROM_PTR(&pin_GPIO_AD_B1_08) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_05) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D8), MP_ROM_PTR(&pin_GPIO_AD_B1_09) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D7), MP_ROM_PTR(&pin_GPIO_AD_B1_10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_PIXCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_04) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D6), MP_ROM_PTR(&pin_GPIO_AD_B1_11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D2), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D5), MP_ROM_PTR(&pin_GPIO_AD_B1_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D3), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CSI_D4), MP_ROM_PTR(&pin_GPIO_AD_B1_13) },
+
+    // SD Card
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_CLK), MP_ROM_PTR(&pin_GPIO_SD_B0_01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_SW), MP_ROM_PTR(&pin_GPIO_B1_12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_CMD), MP_ROM_PTR(&pin_GPIO_SD_B0_00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_D0), MP_ROM_PTR(&pin_GPIO_SD_B0_02) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_D1), MP_ROM_PTR(&pin_GPIO_SD_B0_03) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_D2), MP_ROM_PTR(&pin_GPIO_SD_B0_04) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_D3), MP_ROM_PTR(&pin_GPIO_SD_B0_05) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_PWREN), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+
+    // LCD Interface
+    { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO_B1_15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO_AD_B0_02) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_ENABLE), MP_ROM_PTR(&pin_GPIO_B0_01) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_VSYNC), MP_ROM_PTR(&pin_GPIO_B0_03) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_HSYNC), MP_ROM_PTR(&pin_GPIO_B0_02) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO_B0_00) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D0), MP_ROM_PTR(&pin_GPIO_B0_04) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D1), MP_ROM_PTR(&pin_GPIO_B0_05) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D2), MP_ROM_PTR(&pin_GPIO_B0_06) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D3), MP_ROM_PTR(&pin_GPIO_B0_07) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D4), MP_ROM_PTR(&pin_GPIO_B0_08) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D5), MP_ROM_PTR(&pin_GPIO_B0_09) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D6), MP_ROM_PTR(&pin_GPIO_B0_10) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D7), MP_ROM_PTR(&pin_GPIO_B0_11) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D8), MP_ROM_PTR(&pin_GPIO_B0_12) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D9), MP_ROM_PTR(&pin_GPIO_B0_13) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D10), MP_ROM_PTR(&pin_GPIO_B0_14) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D11), MP_ROM_PTR(&pin_GPIO_B0_15) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D12), MP_ROM_PTR(&pin_GPIO_B1_00) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D13), MP_ROM_PTR(&pin_GPIO_B1_01) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D14), MP_ROM_PTR(&pin_GPIO_B1_02) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_D15), MP_ROM_PTR(&pin_GPIO_B1_03) },
+
+    // Touch Interface
+    { MP_ROM_QSTR(MP_QSTR_LCD_TOUCH_INT), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
+
+    // Audio Interface
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_INT), MP_ROM_PTR(&pin_GPIO_AD_B1_08) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_MCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_09) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RX_SYNC), MP_ROM_PTR(&pin_GPIO_AD_B1_10) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RX_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_11) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_RXD), MP_ROM_PTR(&pin_GPIO_AD_B1_12) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TXD), MP_ROM_PTR(&pin_GPIO_AD_B1_13) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TX_BCLK), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
+    { MP_ROM_QSTR(MP_QSTR_AUDIO_TX_SYNC), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
+
+    // SPDIF
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_IN), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
+    { MP_ROM_QSTR(MP_QSTR_SPDIF_OUT), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
+
+    // Ethernet
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_MDIO), MP_ROM_PTR(&pin_GPIO_EMC_41) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_MDC), MP_ROM_PTR(&pin_GPIO_EMC_40) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXD0), MP_ROM_PTR(&pin_GPIO_B1_04) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXD1), MP_ROM_PTR(&pin_GPIO_B1_05) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_CRS_DV), MP_ROM_PTR(&pin_GPIO_B1_06) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXD0), MP_ROM_PTR(&pin_GPIO_B1_07) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXD1), MP_ROM_PTR(&pin_GPIO_B1_08) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_TXEN), MP_ROM_PTR(&pin_GPIO_B1_09) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_INT), MP_ROM_PTR(&pin_GPIO_AD_B0_10) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RST), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_CLK), MP_ROM_PTR(&pin_GPIO_B1_10) },
+    { MP_ROM_QSTR(MP_QSTR_ETHERNET_RXER), MP_ROM_PTR(&pin_GPIO_B1_11) },
+
+    // Freelink UART
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_12) },
+    { MP_ROM_QSTR(MP_QSTR_FREELINK_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_13) },
+
+    // CAN
+    { MP_ROM_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_GPIO_AD_B0_14) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_GPIO_AD_B0_15) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_STBY), MP_ROM_PTR(&pin_GPIO_AD_B0_05) },
+
+    // USB
+    #if CIRCUITPY_USB_HOST_INSTANCE == 0
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG1_DP) },
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG1_DN) },
+    #elif CIRCUITPY_USB_HOST_INSTANCE == 1
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DP), MP_ROM_PTR(&pin_USB_OTG2_DP) },
+    { MP_ROM_QSTR(MP_QSTR_USB_HOST_DM), MP_ROM_PTR(&pin_USB_OTG2_DN) },
+    #endif
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
index e4562c1965..3b47af1d6c 100644
--- a/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
+++ b/ports/mimxrt10xx/boards/metro_m7_1011/flash_config.c
@@ -14,14 +14,14 @@ __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFLEXSPISerialClk_30MHz,
+    .ipcmdSerialClkFreq = kFLEXSPISerialClk_133MHz,
     .blockSize = 0x00010000,
     .isUniformBlockSize = false,
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = kFLEXSPIReadSampleClk_LoopbackFromSckPad,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
 
@@ -43,7 +43,7 @@ const flexspi_nor_config_t qspiflash_config = {
         },
         .deviceType = kFLEXSPIDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFLEXSPISerialClk_60MHz,
+        .serialClkFreq = kFLEXSPISerialClk_133MHz,
         .sflashA1Size = FLASH_SIZE,
         .lookupTable =
         {
diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
index 06765afe02..9ba2762f1c 100644
--- a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
+++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
@@ -77,9 +77,9 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self,
     const mcu_pin_obj_t *data, bool left_justified) {
 
     int instance = -1;
-    const mcu_periph_obj_t *bclk_periph = find_pin_function(mcu_sai_tx_bclk_list, bit_clock, &instance, MP_QSTR_bit_clock);
-    const mcu_periph_obj_t *sync_periph = find_pin_function(mcu_sai_tx_sync_list, word_select, &instance, MP_QSTR_word_select);
-    const mcu_periph_obj_t *data_periph = find_pin_function(mcu_sai_tx_data0_list, data, &instance, MP_QSTR_data);
+    const mcu_periph_obj_t *bclk_periph = find_pin_function(mcu_i2s_tx_bclk_list, bit_clock, &instance, MP_QSTR_bit_clock);
+    const mcu_periph_obj_t *sync_periph = find_pin_function(mcu_i2s_tx_sync_list, word_select, &instance, MP_QSTR_word_select);
+    const mcu_periph_obj_t *data_periph = find_pin_function(mcu_i2s_tx_data0_list, data, &instance, MP_QSTR_data);
 
     sai_transceiver_t config;
     SAI_GetClassicI2SConfig(&config, 16, kSAI_Stereo, 1);
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c
index 6c5bbea416..de1b94e80e 100644
--- a/ports/mimxrt10xx/common-hal/busio/I2C.c
+++ b/ports/mimxrt10xx/common-hal/busio/I2C.c
@@ -37,13 +37,17 @@
 #include "sdk/drivers/lpi2c/fsl_lpi2c.h"
 #include "sdk/drivers/igpio/fsl_gpio.h"
 
+#if IMXRT11XX
+#define I2C_CLOCK_FREQ (24000000)
+#else
 #define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (1 + CLOCK_GetDiv(kCLOCK_Lpi2cDiv)))
+#endif
+
 #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U
 
 // arrays use 0 based numbering: I2C1 is stored at index 0
-#define MAX_I2C 4
-STATIC bool reserved_i2c[MAX_I2C];
-STATIC bool never_reset_i2c[MAX_I2C];
+STATIC bool reserved_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)];
+STATIC bool never_reset_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)];
 
 void i2c_reset(void) {
     for (uint i = 0; i < MP_ARRAY_SIZE(mcu_i2c_banks); i++) {
@@ -63,24 +67,28 @@ static void config_periph_pin(const mcu_periph_obj_t *periph) {
 
     IOMUXC_SetPinConfig(0, 0, 0, 0,
         periph->pin->cfg_reg,
-        IOMUXC_SW_PAD_CTL_PAD_HYS(0)
-        | IOMUXC_SW_PAD_CTL_PAD_PUS(3)
-        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        IOMUXC_SW_PAD_CTL_PAD_PUS(3)
+        #if IMXRT10XX
+        | IOMUXC_SW_PAD_CTL_PAD_HYS(0)
         | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-        | IOMUXC_SW_PAD_CTL_PAD_ODE(1)
         | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        #endif
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(1)
         | IOMUXC_SW_PAD_CTL_PAD_DSE(4)
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
 
 static void i2c_check_pin_config(const mcu_pin_obj_t *pin, uint32_t pull) {
     IOMUXC_SetPinConfig(0, 0, 0, 0, pin->cfg_reg,
-        IOMUXC_SW_PAD_CTL_PAD_HYS(1)
-        | IOMUXC_SW_PAD_CTL_PAD_PUS(0)     // Pulldown
-        | IOMUXC_SW_PAD_CTL_PAD_PUE(pull)     // 0=nopull (keeper), 1=pull
+        IOMUXC_SW_PAD_CTL_PAD_PUS(0)     // Pulldown
+        #if IMXRT10XX
+        | IOMUXC_SW_PAD_CTL_PAD_HYS(1)
         | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        #endif
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(pull)     // 0=nopull (keeper), 1=pull
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_DSE(1)
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c
index d88b71a403..641714bcca 100644
--- a/ports/mimxrt10xx/common-hal/busio/SPI.c
+++ b/ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -36,14 +36,21 @@
 
 #include 
 
+#if IMXRT11XX
+#define LPSPI_MASTER_CLK_FREQ (24000000)
+#else
 #define LPSPI_MASTER_CLK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_GetDiv(kCLOCK_LpspiDiv) + 1))
+#endif
 
 #define MAX_SPI_BUSY_RETRIES 100
 
 // arrays use 0 based numbering: SPI1 is stored at index 0
-#define MAX_SPI 4
-STATIC bool reserved_spi[MAX_SPI];
-STATIC bool never_reset_spi[MAX_SPI];
+STATIC bool reserved_spi[MP_ARRAY_SIZE(mcu_spi_banks)];
+STATIC bool never_reset_spi[MP_ARRAY_SIZE(mcu_spi_banks)];
+
+#if IMXRT11XX
+STATIC const clock_ip_name_t s_lpspiClocks[] = LPSPI_CLOCKS;
+#endif
 
 STATIC void config_periph_pin(const mcu_periph_obj_t *periph) {
     IOMUXC_SetPinMux(
@@ -54,12 +61,14 @@ STATIC void config_periph_pin(const mcu_periph_obj_t *periph) {
 
     IOMUXC_SetPinConfig(0, 0, 0, 0,
         periph->pin->cfg_reg,
-        IOMUXC_SW_PAD_CTL_PAD_HYS(0)
-        | IOMUXC_SW_PAD_CTL_PAD_PUS(0)
-        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        IOMUXC_SW_PAD_CTL_PAD_PUS(0)
+        #if IMXRT10XX
+        | IOMUXC_SW_PAD_CTL_PAD_HYS(0)
         | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        #endif
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_DSE(4)
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
@@ -68,6 +77,13 @@ void spi_reset(void) {
     for (uint i = 0; i < MP_ARRAY_SIZE(mcu_spi_banks); i++) {
         if (!never_reset_spi[i]) {
             reserved_spi[i] = false;
+            #if IMXRT11XX
+            // Skip resetting SPIs that aren't clocked. Doing so generates a bus fault.
+            if ((CCM->LPCG[s_lpspiClocks[i + 1]].STATUS0 & CCM_LPCG_STATUS0_ON_MASK) == ((uint32_t)kCLOCK_Off & CCM_LPCG_STATUS0_ON_MASK)) {
+                continue;
+            }
+            #endif
+
             LPSPI_Deinit(mcu_spi_banks[i]);
         }
     }
@@ -78,8 +94,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     const mcu_pin_obj_t *miso, bool half_duplex) {
 
     const uint32_t sck_count = MP_ARRAY_SIZE(mcu_spi_sck_list);
-    const uint32_t miso_count = MP_ARRAY_SIZE(mcu_spi_miso_list);
-    const uint32_t mosi_count = MP_ARRAY_SIZE(mcu_spi_mosi_list);
+    const uint32_t miso_count = MP_ARRAY_SIZE(mcu_spi_sdi_list);
+    const uint32_t mosi_count = MP_ARRAY_SIZE(mcu_spi_sdo_list);
     bool spi_taken = false;
 
     if (half_duplex) {
@@ -93,13 +109,13 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         // if both MOSI and MISO exist, loop search normally
         if ((mosi != NULL) && (miso != NULL)) {
             for (uint j = 0; j < mosi_count; j++) {
-                if ((mcu_spi_mosi_list[i].pin != mosi)
-                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_mosi_list[j].bank_idx)) {
+                if ((mcu_spi_sdo_list[i].pin != mosi)
+                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_sdo_list[j].bank_idx)) {
                     continue;
                 }
                 for (uint k = 0; k < miso_count; k++) {
-                    if ((mcu_spi_miso_list[k].pin != miso) // everything needs the same index
-                        || (mcu_spi_sck_list[i].bank_idx != mcu_spi_miso_list[k].bank_idx)) {
+                    if ((mcu_spi_sdi_list[k].pin != miso) // everything needs the same index
+                        || (mcu_spi_sck_list[i].bank_idx != mcu_spi_sdi_list[k].bank_idx)) {
                         continue;
                     }
                     // if SPI is taken, break (pins never have >1 periph)
@@ -109,8 +125,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
                     }
                     // store pins if not
                     self->clock = &mcu_spi_sck_list[i];
-                    self->mosi = &mcu_spi_mosi_list[j];
-                    self->miso = &mcu_spi_miso_list[k];
+                    self->mosi = &mcu_spi_sdo_list[j];
+                    self->miso = &mcu_spi_sdi_list[k];
                     break;
                 }
                 if (self->clock != NULL || spi_taken) {
@@ -123,8 +139,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
             // if just MISO, reduce search
         } else if (miso != NULL) {
             for (uint j = 0; j < miso_count; j++) {
-                if ((mcu_spi_miso_list[j].pin != miso) // only SCK and MISO need the same index
-                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_miso_list[j].bank_idx)) {
+                if ((mcu_spi_sdi_list[j].pin != miso) // only SCK and MISO need the same index
+                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_sdi_list[j].bank_idx)) {
                     continue;
                 }
                 if (reserved_spi[mcu_spi_sck_list[i].bank_idx - 1]) {
@@ -132,7 +148,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
                     break;
                 }
                 self->clock = &mcu_spi_sck_list[i];
-                self->miso = &mcu_spi_miso_list[j];
+                self->miso = &mcu_spi_sdi_list[j];
                 break;
             }
             if (self->clock != NULL || spi_taken) {
@@ -141,8 +157,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
             // if just MOSI, reduce search
         } else if (mosi != NULL) {
             for (uint j = 0; j < mosi_count; j++) {
-                if ((mcu_spi_mosi_list[j].pin != mosi) // only SCK and MOSI need the same index
-                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_mosi_list[j].bank_idx)) {
+                if ((mcu_spi_sdo_list[j].pin != mosi) // only SCK and MOSI need the same index
+                    || (mcu_spi_sck_list[i].bank_idx != mcu_spi_sdo_list[j].bank_idx)) {
                     continue;
                 }
                 if (reserved_spi[mcu_spi_sck_list[i].bank_idx - 1]) {
@@ -150,7 +166,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
                     break;
                 }
                 self->clock = &mcu_spi_sck_list[i];
-                self->mosi = &mcu_spi_mosi_list[j];
+                self->mosi = &mcu_spi_sdo_list[j];
                 break;
             }
             if (self->clock != NULL || spi_taken) {
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
index 088b2aefc6..e4d5fda6ae 100644
--- a/ports/mimxrt10xx/common-hal/busio/UART.c
+++ b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -52,11 +52,15 @@
 
 
 // arrays use 0 based numbering: UART1 is stored at index 0
-#define MAX_UART 8
-STATIC bool reserved_uart[MAX_UART];
-STATIC bool never_reset_uart[MAX_UART];
+STATIC bool reserved_uart[MP_ARRAY_SIZE(mcu_uart_banks)];
+STATIC bool never_reset_uart[MP_ARRAY_SIZE(mcu_uart_banks)];
 
+#if IMXRT11XX
+#define UART_CLOCK_FREQ (24000000)
+#else
 #define UART_CLOCK_FREQ (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U)
+#endif
+
 
 static void config_periph_pin(const mcu_periph_obj_t *periph) {
     IOMUXC_SetPinMux(
@@ -67,12 +71,14 @@ static void config_periph_pin(const mcu_periph_obj_t *periph) {
 
     IOMUXC_SetPinConfig(0, 0, 0, 0,
         periph->pin->cfg_reg,
-        IOMUXC_SW_PAD_CTL_PAD_HYS(0)
-        | IOMUXC_SW_PAD_CTL_PAD_PUS(1)
-        | IOMUXC_SW_PAD_CTL_PAD_PUE(1)
+        IOMUXC_SW_PAD_CTL_PAD_PUS(1)
+        #if IMXRT10XX
+        | IOMUXC_SW_PAD_CTL_PAD_HYS(0)
         | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_SPEED(1)
+        #endif
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(1)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
         | IOMUXC_SW_PAD_CTL_PAD_DSE(6)
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
@@ -288,12 +294,14 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         IOMUXC_SetPinMux(rs485_dir->mux_reg, IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5, 0, 0, 0, 0);
         DBGPrintf(&mp_plat_print, "\tAfter IOMUXC_SetPinMux\n");
         IOMUXC_SetPinConfig(0, 0, 0, 0, rs485_dir->cfg_reg,
-            IOMUXC_SW_PAD_CTL_PAD_HYS(1)
-            | IOMUXC_SW_PAD_CTL_PAD_PUS(0)
-            | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+            IOMUXC_SW_PAD_CTL_PAD_PUS(0)
+            #if IMXRT10XX
+            | IOMUXC_SW_PAD_CTL_PAD_HYS(1)
             | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-            | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
             | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+            #endif
+            | IOMUXC_SW_PAD_CTL_PAD_PUE(0)
+            | IOMUXC_SW_PAD_CTL_PAD_ODE(0)
             | IOMUXC_SW_PAD_CTL_PAD_DSE(1)
             | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
         DBGPrintf(&mp_plat_print, "\tAfter IOMUXC_SetPinConfig\n");
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
index 2b4a78948e..31dac38bdc 100644
--- a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
+++ b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -42,12 +42,14 @@
 
 void pin_config(const mcu_pin_obj_t *pin, bool open_drain, digitalio_pull_t pull) {
     IOMUXC_SetPinConfig(0, 0, 0, 0, pin->cfg_reg,
-        IOMUXC_SW_PAD_CTL_PAD_HYS(1)
-        | IOMUXC_SW_PAD_CTL_PAD_PUS((pull == PULL_UP) ? 2 : 0)
-        | IOMUXC_SW_PAD_CTL_PAD_PUE(pull != PULL_NONE)
+        IOMUXC_SW_PAD_CTL_PAD_PUS((pull == PULL_UP) ? 2 : 0)
+        #if IMXRT10XX
+        | IOMUXC_SW_PAD_CTL_PAD_HYS(1)
         | IOMUXC_SW_PAD_CTL_PAD_PKE(1)
-        | IOMUXC_SW_PAD_CTL_PAD_ODE(open_drain)
         | IOMUXC_SW_PAD_CTL_PAD_SPEED(2)
+        #endif
+        | IOMUXC_SW_PAD_CTL_PAD_PUE(pull != PULL_NONE)
+        | IOMUXC_SW_PAD_CTL_PAD_ODE(open_drain)
         | IOMUXC_SW_PAD_CTL_PAD_DSE(1)
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
index 9277f81d47..bd7d77f4fa 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
@@ -33,11 +33,14 @@
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
 
+#if CIRCUITPY_ANALOGIO
 #include "sdk/drivers/tempmon/fsl_tempmon.h"
+#endif
 #include "sdk/drivers/ocotp/fsl_ocotp.h"
 #include "clocks.h"
 
 float common_hal_mcu_processor_get_temperature(void) {
+    #if CIRCUITPY_ANALOGIO
     tempmon_config_t config;
     TEMPMON_GetDefaultConfig(&config);
 
@@ -50,6 +53,9 @@ float common_hal_mcu_processor_get_temperature(void) {
     OCOTP_Deinit(OCOTP);
 
     return temp;
+    #else
+    return 0;
+    #endif
 }
 
 uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
@@ -73,7 +79,11 @@ uint32_t common_hal_mcu_processor_get_frequency(void) {
 }
 
 void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
+    #if IMXRT11XX
+    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_Ocotp));
+    #else
     OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
+    #endif
 
     // Reads shadow registers 0x01 - 0x04 (Configuration and Manufacturing Info)
     // into 8 bit wide destination, avoiding punning.
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index 1b10b4d4ee..de970fa26a 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -40,6 +40,8 @@
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/translate/translate.h"
 
+#include "pins.h"
+
 void common_hal_mcu_delay_us(uint32_t delay) {
     mp_hal_delay_us(delay);
 }
@@ -107,188 +109,10 @@ const nvm_bytearray_obj_t common_hal_mcu_nvm_obj = {
 
 // This maps MCU pin names to pin objects.
 // NOTE: for all i.MX chips, order MUST match _iomuxc_sw_mux_ctl_pad enum
-STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
-    #ifdef MIMXRT1011_SERIES
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_14), MP_ROM_PTR(&pin_GPIO_AD_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_13), MP_ROM_PTR(&pin_GPIO_AD_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_12), MP_ROM_PTR(&pin_GPIO_AD_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_11), MP_ROM_PTR(&pin_GPIO_AD_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_10), MP_ROM_PTR(&pin_GPIO_AD_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_09), MP_ROM_PTR(&pin_GPIO_AD_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_08), MP_ROM_PTR(&pin_GPIO_AD_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_07), MP_ROM_PTR(&pin_GPIO_AD_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_06), MP_ROM_PTR(&pin_GPIO_AD_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_05), MP_ROM_PTR(&pin_GPIO_AD_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_04), MP_ROM_PTR(&pin_GPIO_AD_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_03), MP_ROM_PTR(&pin_GPIO_AD_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_02), MP_ROM_PTR(&pin_GPIO_AD_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_01), MP_ROM_PTR(&pin_GPIO_AD_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_00), MP_ROM_PTR(&pin_GPIO_AD_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_14), MP_ROM_PTR(&pin_GPIO_SD_14) }, // spooky ghost pin
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_13), MP_ROM_PTR(&pin_GPIO_SD_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_12), MP_ROM_PTR(&pin_GPIO_SD_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_11), MP_ROM_PTR(&pin_GPIO_SD_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_10), MP_ROM_PTR(&pin_GPIO_SD_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_09), MP_ROM_PTR(&pin_GPIO_SD_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_08), MP_ROM_PTR(&pin_GPIO_SD_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_07), MP_ROM_PTR(&pin_GPIO_SD_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_06), MP_ROM_PTR(&pin_GPIO_SD_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_05), MP_ROM_PTR(&pin_GPIO_SD_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_04), MP_ROM_PTR(&pin_GPIO_SD_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_03), MP_ROM_PTR(&pin_GPIO_SD_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_02), MP_ROM_PTR(&pin_GPIO_SD_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_01), MP_ROM_PTR(&pin_GPIO_SD_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_00), MP_ROM_PTR(&pin_GPIO_SD_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_13), MP_ROM_PTR(&pin_GPIO_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_12), MP_ROM_PTR(&pin_GPIO_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_11), MP_ROM_PTR(&pin_GPIO_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_10), MP_ROM_PTR(&pin_GPIO_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_09), MP_ROM_PTR(&pin_GPIO_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_08), MP_ROM_PTR(&pin_GPIO_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_07), MP_ROM_PTR(&pin_GPIO_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_06), MP_ROM_PTR(&pin_GPIO_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_05), MP_ROM_PTR(&pin_GPIO_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_04), MP_ROM_PTR(&pin_GPIO_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_03), MP_ROM_PTR(&pin_GPIO_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_02), MP_ROM_PTR(&pin_GPIO_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_01), MP_ROM_PTR(&pin_GPIO_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_00), MP_ROM_PTR(&pin_GPIO_00) },
-    #else
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_00), MP_ROM_PTR(&pin_GPIO_EMC_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_01), MP_ROM_PTR(&pin_GPIO_EMC_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_02), MP_ROM_PTR(&pin_GPIO_EMC_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_03), MP_ROM_PTR(&pin_GPIO_EMC_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_04), MP_ROM_PTR(&pin_GPIO_EMC_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_05), MP_ROM_PTR(&pin_GPIO_EMC_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_06), MP_ROM_PTR(&pin_GPIO_EMC_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_07), MP_ROM_PTR(&pin_GPIO_EMC_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_08), MP_ROM_PTR(&pin_GPIO_EMC_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_09), MP_ROM_PTR(&pin_GPIO_EMC_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_10), MP_ROM_PTR(&pin_GPIO_EMC_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_11), MP_ROM_PTR(&pin_GPIO_EMC_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_12), MP_ROM_PTR(&pin_GPIO_EMC_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_13), MP_ROM_PTR(&pin_GPIO_EMC_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_14), MP_ROM_PTR(&pin_GPIO_EMC_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_15), MP_ROM_PTR(&pin_GPIO_EMC_15) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_16), MP_ROM_PTR(&pin_GPIO_EMC_16) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_17), MP_ROM_PTR(&pin_GPIO_EMC_17) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_18), MP_ROM_PTR(&pin_GPIO_EMC_18) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_19), MP_ROM_PTR(&pin_GPIO_EMC_19) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_20), MP_ROM_PTR(&pin_GPIO_EMC_20) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_21), MP_ROM_PTR(&pin_GPIO_EMC_21) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_22), MP_ROM_PTR(&pin_GPIO_EMC_22) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_23), MP_ROM_PTR(&pin_GPIO_EMC_23) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_24), MP_ROM_PTR(&pin_GPIO_EMC_24) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_25), MP_ROM_PTR(&pin_GPIO_EMC_25) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_26), MP_ROM_PTR(&pin_GPIO_EMC_26) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_27), MP_ROM_PTR(&pin_GPIO_EMC_27) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_28), MP_ROM_PTR(&pin_GPIO_EMC_28) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_29), MP_ROM_PTR(&pin_GPIO_EMC_29) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_30), MP_ROM_PTR(&pin_GPIO_EMC_30) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_31), MP_ROM_PTR(&pin_GPIO_EMC_31) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_32), MP_ROM_PTR(&pin_GPIO_EMC_32) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_33), MP_ROM_PTR(&pin_GPIO_EMC_33) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_34), MP_ROM_PTR(&pin_GPIO_EMC_34) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_35), MP_ROM_PTR(&pin_GPIO_EMC_35) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_36), MP_ROM_PTR(&pin_GPIO_EMC_36) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_37), MP_ROM_PTR(&pin_GPIO_EMC_37) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_38), MP_ROM_PTR(&pin_GPIO_EMC_38) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_39), MP_ROM_PTR(&pin_GPIO_EMC_39) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_40), MP_ROM_PTR(&pin_GPIO_EMC_40) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_EMC_41), MP_ROM_PTR(&pin_GPIO_EMC_41) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_00), MP_ROM_PTR(&pin_GPIO_AD_B0_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_01), MP_ROM_PTR(&pin_GPIO_AD_B0_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_02), MP_ROM_PTR(&pin_GPIO_AD_B0_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_03), MP_ROM_PTR(&pin_GPIO_AD_B0_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_04), MP_ROM_PTR(&pin_GPIO_AD_B0_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_05), MP_ROM_PTR(&pin_GPIO_AD_B0_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_06), MP_ROM_PTR(&pin_GPIO_AD_B0_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_07), MP_ROM_PTR(&pin_GPIO_AD_B0_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_08), MP_ROM_PTR(&pin_GPIO_AD_B0_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_09), MP_ROM_PTR(&pin_GPIO_AD_B0_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_10), MP_ROM_PTR(&pin_GPIO_AD_B0_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_11), MP_ROM_PTR(&pin_GPIO_AD_B0_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_12), MP_ROM_PTR(&pin_GPIO_AD_B0_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_13), MP_ROM_PTR(&pin_GPIO_AD_B0_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_14), MP_ROM_PTR(&pin_GPIO_AD_B0_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B0_15), MP_ROM_PTR(&pin_GPIO_AD_B0_15) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_00), MP_ROM_PTR(&pin_GPIO_AD_B1_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_01), MP_ROM_PTR(&pin_GPIO_AD_B1_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_02), MP_ROM_PTR(&pin_GPIO_AD_B1_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_03), MP_ROM_PTR(&pin_GPIO_AD_B1_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_04), MP_ROM_PTR(&pin_GPIO_AD_B1_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_05), MP_ROM_PTR(&pin_GPIO_AD_B1_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_06), MP_ROM_PTR(&pin_GPIO_AD_B1_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_07), MP_ROM_PTR(&pin_GPIO_AD_B1_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_08), MP_ROM_PTR(&pin_GPIO_AD_B1_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_09), MP_ROM_PTR(&pin_GPIO_AD_B1_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_10), MP_ROM_PTR(&pin_GPIO_AD_B1_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_11), MP_ROM_PTR(&pin_GPIO_AD_B1_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_12), MP_ROM_PTR(&pin_GPIO_AD_B1_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_13), MP_ROM_PTR(&pin_GPIO_AD_B1_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_14), MP_ROM_PTR(&pin_GPIO_AD_B1_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_AD_B1_15), MP_ROM_PTR(&pin_GPIO_AD_B1_15) },
-    #ifdef MIMXRT1062_SERIES
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_00), MP_ROM_PTR(&pin_GPIO_B0_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_01), MP_ROM_PTR(&pin_GPIO_B0_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_02), MP_ROM_PTR(&pin_GPIO_B0_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_03), MP_ROM_PTR(&pin_GPIO_B0_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_04), MP_ROM_PTR(&pin_GPIO_B0_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_05), MP_ROM_PTR(&pin_GPIO_B0_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_06), MP_ROM_PTR(&pin_GPIO_B0_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_07), MP_ROM_PTR(&pin_GPIO_B0_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_08), MP_ROM_PTR(&pin_GPIO_B0_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_09), MP_ROM_PTR(&pin_GPIO_B0_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_10), MP_ROM_PTR(&pin_GPIO_B0_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_11), MP_ROM_PTR(&pin_GPIO_B0_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_12), MP_ROM_PTR(&pin_GPIO_B0_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_13), MP_ROM_PTR(&pin_GPIO_B0_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_14), MP_ROM_PTR(&pin_GPIO_B0_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B0_15), MP_ROM_PTR(&pin_GPIO_B0_15) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_00), MP_ROM_PTR(&pin_GPIO_B1_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_01), MP_ROM_PTR(&pin_GPIO_B1_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_02), MP_ROM_PTR(&pin_GPIO_B1_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_03), MP_ROM_PTR(&pin_GPIO_B1_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_04), MP_ROM_PTR(&pin_GPIO_B1_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_05), MP_ROM_PTR(&pin_GPIO_B1_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_06), MP_ROM_PTR(&pin_GPIO_B1_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_07), MP_ROM_PTR(&pin_GPIO_B1_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_08), MP_ROM_PTR(&pin_GPIO_B1_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_09), MP_ROM_PTR(&pin_GPIO_B1_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_10), MP_ROM_PTR(&pin_GPIO_B1_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_11), MP_ROM_PTR(&pin_GPIO_B1_11) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_12), MP_ROM_PTR(&pin_GPIO_B1_12) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_13), MP_ROM_PTR(&pin_GPIO_B1_13) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_14), MP_ROM_PTR(&pin_GPIO_B1_14) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_B1_15), MP_ROM_PTR(&pin_GPIO_B1_15) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_00), MP_ROM_PTR(&pin_GPIO_SD_B0_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_01), MP_ROM_PTR(&pin_GPIO_SD_B0_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_02), MP_ROM_PTR(&pin_GPIO_SD_B0_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_03), MP_ROM_PTR(&pin_GPIO_SD_B0_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_04), MP_ROM_PTR(&pin_GPIO_SD_B0_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_05), MP_ROM_PTR(&pin_GPIO_SD_B0_05) },
-    #ifdef MIMXRT1021_SERIES
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B0_06), MP_ROM_PTR(&pin_GPIO_SD_B0_06) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_00), MP_ROM_PTR(&pin_GPIO_SD_B1_00) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_01), MP_ROM_PTR(&pin_GPIO_SD_B1_01) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_02), MP_ROM_PTR(&pin_GPIO_SD_B1_02) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_03), MP_ROM_PTR(&pin_GPIO_SD_B1_03) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_04), MP_ROM_PTR(&pin_GPIO_SD_B1_04) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_05), MP_ROM_PTR(&pin_GPIO_SD_B1_05) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_06), MP_ROM_PTR(&pin_GPIO_SD_B1_06) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_07), MP_ROM_PTR(&pin_GPIO_SD_B1_07) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_08), MP_ROM_PTR(&pin_GPIO_SD_B1_08) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_09), MP_ROM_PTR(&pin_GPIO_SD_B1_09) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_10), MP_ROM_PTR(&pin_GPIO_SD_B1_10) },
-    { MP_ROM_QSTR(MP_QSTR_GPIO_SD_B1_11), MP_ROM_PTR(&pin_GPIO_SD_B1_11) },
-    #ifdef MIMXRT1062_SERIES
-    { MP_ROM_QSTR(MP_QSTR_USB_OTG1_DN), MP_ROM_PTR(&pin_USB_OTG1_DN) },
-    { MP_ROM_QSTR(MP_QSTR_USB_OTG1_DP), MP_ROM_PTR(&pin_USB_OTG1_DP) },
-    { MP_ROM_QSTR(MP_QSTR_USB_OTG2_DN), MP_ROM_PTR(&pin_USB_OTG2_DN) },
-    { MP_ROM_QSTR(MP_QSTR_USB_OTG2_DP), MP_ROM_PTR(&pin_USB_OTG2_DP) },
-    #endif
-    #endif
+STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[PIN_COUNT] = {
+
+#define FORMAT_PIN(pin_name) { MP_ROM_QSTR(MP_QSTR_##pin_name), MP_ROM_PTR(&pin_##pin_name) },
+    #include "pin_names.h"
+#undef FORMAT_PIN
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);
diff --git a/ports/mimxrt10xx/common-hal/os/__init__.c b/ports/mimxrt10xx/common-hal/os/__init__.c
index 9219242685..899541bb21 100644
--- a/ports/mimxrt10xx/common-hal/os/__init__.c
+++ b/ports/mimxrt10xx/common-hal/os/__init__.c
@@ -33,7 +33,9 @@
 
 #include "shared-bindings/os/__init__.h"
 
+#if CIRCUITPY_RANDOM
 #include "sdk/drivers/trng/fsl_trng.h"
+#endif
 
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
@@ -61,6 +63,7 @@ mp_obj_t common_hal_os_uname(void) {
 }
 
 bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length) {
+    #if CIRCUITPY_RANDOM
     trng_config_t trngConfig;
 
     TRNG_GetDefaultConfig(&trngConfig);
@@ -71,4 +74,7 @@ bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length) {
     TRNG_Deinit(TRNG);
 
     return true;
+    #else
+    return false;
+    #endif
 }
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1011.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1011.ld
index 0d0beebaae..55f03cb9c1 100644
--- a/ports/mimxrt10xx/linking/chip_family/MIMXRT1011.ld
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1011.ld
@@ -1,2 +1,4 @@
 ram_size = 128K;
-flash_config_location = 0x60000400;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base + 0x400;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1015.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1015.ld
new file mode 100644
index 0000000000..72b2b705b5
--- /dev/null
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1015.ld
@@ -0,0 +1,4 @@
+ram_size = 128K;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1021.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1021.ld
index 21f2ea872c..215e58f9b3 100644
--- a/ports/mimxrt10xx/linking/chip_family/MIMXRT1021.ld
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1021.ld
@@ -1,2 +1,4 @@
 ram_size = 256K;
-flash_config_location = 0x60000000;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1042.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1042.ld
new file mode 100644
index 0000000000..9af9660087
--- /dev/null
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1042.ld
@@ -0,0 +1,4 @@
+ram_size = 512K;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1052.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1052.ld
new file mode 100644
index 0000000000..9af9660087
--- /dev/null
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1052.ld
@@ -0,0 +1,4 @@
+ram_size = 512K;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1062.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1062.ld
index e07c5c2c37..1ae8172200 100644
--- a/ports/mimxrt10xx/linking/chip_family/MIMXRT1062.ld
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1062.ld
@@ -1,2 +1,4 @@
 ram_size = 1M;
-flash_config_location = 0x60000000;
+flash_base = 0x60000000;
+ocram_base = 0x20200000;
+flash_config_location = flash_base;
diff --git a/ports/mimxrt10xx/linking/chip_family/MIMXRT1176.ld b/ports/mimxrt10xx/linking/chip_family/MIMXRT1176.ld
new file mode 100644
index 0000000000..a5d18addb7
--- /dev/null
+++ b/ports/mimxrt10xx/linking/chip_family/MIMXRT1176.ld
@@ -0,0 +1,4 @@
+ram_size = 1M;
+flash_base = 0x30000000;
+ocram_base = 0x20240000;
+flash_config_location = flash_base + 0x400;
diff --git a/ports/mimxrt10xx/linking/common.ld b/ports/mimxrt10xx/linking/common.ld
index 76c11c8d6f..a3ed2dbdbf 100644
--- a/ports/mimxrt10xx/linking/common.ld
+++ b/ports/mimxrt10xx/linking/common.ld
@@ -19,13 +19,13 @@ MEMORY
     /* This is the first block and is read so that the bootrom knows the optimal way to interface with the flash chip. */
     FLASH_CONFIG (rx)     : ORIGIN = flash_config_location, LENGTH = 512
     /* This can't move because the bootrom looks at this address. */
-    FLASH_IVT (rx)        : ORIGIN = 0x60001000, LENGTH = 4K
+    FLASH_IVT (rx)        : ORIGIN = flash_base + 0x1000, LENGTH = 4K
     /* Place the ISRs 48k in to leave room for the bootloader when it is available. */
-    FLASH_FIRMWARE (rx)   : ORIGIN = 0x6000C000, LENGTH = code_size - 48K
-    FLASH_FATFS (r)       : ORIGIN = 0x60000000 + code_size, LENGTH = _ld_flash_size - code_size - _ld_reserved_flash_size
+    FLASH_FIRMWARE (rx)   : ORIGIN = flash_base + 0xC000, LENGTH = code_size - 48K
+    FLASH_FATFS (r)       : ORIGIN = flash_base + code_size, LENGTH = _ld_flash_size - code_size - _ld_reserved_flash_size
     /* Teensy uses the last bit of flash for recovery. */
-    RESERVED_FLASH        : ORIGIN = 0x60000000 + code_size + _ld_flash_size - _ld_reserved_flash_size, LENGTH = _ld_reserved_flash_size
-    OCRAM (rwx)           : ORIGIN = 0x20200000, LENGTH = ram_size - 64K
+    RESERVED_FLASH        : ORIGIN = flash_base + code_size + _ld_flash_size - _ld_reserved_flash_size, LENGTH = _ld_reserved_flash_size
+    OCRAM (rwx)           : ORIGIN = ocram_base, LENGTH = ram_size - 64K
     DTCM (x)              : ORIGIN = 0x20000000, LENGTH = 32K
     ITCM (x)              : ORIGIN = 0x00000000, LENGTH = 32K
 }
@@ -135,7 +135,9 @@ SECTIONS
     _ld_ocram_bss_start = ADDR(.bss);
     _ld_ocram_bss_size = SIZEOF(.bss);
     _ld_heap_start = _ld_ocram_bss_start + _ld_ocram_bss_size;
-    _ld_heap_end = ORIGIN(OCRAM) + LENGTH(OCRAM);
+    _ld_ocram_start = ORIGIN(OCRAM);
+    _ld_ocram_end = ORIGIN(OCRAM) + LENGTH(OCRAM);
+    _ld_heap_end = _ld_ocram_end;
 
 
     .itcm : ALIGN(4)
diff --git a/ports/mimxrt10xx/linking/flash/IS25WP128.ld b/ports/mimxrt10xx/linking/flash/IS25WP128.ld
new file mode 100644
index 0000000000..205d9dd839
--- /dev/null
+++ b/ports/mimxrt10xx/linking/flash/IS25WP128.ld
@@ -0,0 +1 @@
+_ld_flash_size = 16M;
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index ae22cb69f4..b421b583be 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -11,13 +11,13 @@ CIRCUITPY_TUSB_MEM_ALIGN = 32
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_AUDIOBUSIO = 1
+CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN = 0
-CIRCUITPY_AUDIOCORE = 1
+CIRCUITPY_AUDIOCORE ?= 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_AUDIOMP3 = 1
-CIRCUITPY_AUDIOPWMIO = 1
+CIRCUITPY_AUDIOPWMIO ?= 1
 CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_COUNTIO = 0
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c
index e96b55f3e9..69ce673a0e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c
@@ -35,6 +35,8 @@
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"
 
+#include "board.h"
+
 #include "clocks.h"
 
 #define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
index b67f7b1179..fd8ef69f7e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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
@@ -65,7 +66,7 @@ const mcu_periph_obj_t mcu_spi_sck_list[4] = {
     PERIPH_PIN(2, 1, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 1, &pin_GPIO_SD_11),
 };
 
-const mcu_periph_obj_t mcu_spi_mosi_list[4] = {
+const mcu_periph_obj_t mcu_spi_sdo_list[4] = {
     PERIPH_PIN(1, 0, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 0, &pin_GPIO_AD_04),
     PERIPH_PIN(1, 2, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 1, &pin_GPIO_SD_06),
 
@@ -73,7 +74,7 @@ const mcu_periph_obj_t mcu_spi_mosi_list[4] = {
     PERIPH_PIN(2, 1, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 1, &pin_GPIO_SD_10),
 };
 
-const mcu_periph_obj_t mcu_spi_miso_list[4] = {
+const mcu_periph_obj_t mcu_spi_sdi_list[4] = {
     PERIPH_PIN(1, 0, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 0, &pin_GPIO_AD_03),
     PERIPH_PIN(1, 2, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 1, &pin_GPIO_SD_05),
 
@@ -120,7 +121,7 @@ const mcu_periph_obj_t mcu_uart_rts_list[4] = {
 
     PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_13),
 
-    PERIPH_PIN(4, 3, 0, 0, &pin_GPIO_AD_13)
+    PERIPH_PIN(4, 3, 0, 0, &pin_GPIO_AD_13),
 };
 
 const mcu_periph_obj_t mcu_uart_cts_list[4] = {
@@ -133,67 +134,76 @@ const mcu_periph_obj_t mcu_uart_cts_list[4] = {
     PERIPH_PIN(4, 3, 0, 0, &pin_GPIO_AD_14),
 };
 
-const mcu_pwm_obj_t mcu_pwm_list[20] = {
-    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_02_FLEXPWM1_PWM0_A, &pin_GPIO_02),
-    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_SD_02_FLEXPWM1_PWM0_A, &pin_GPIO_SD_02),
+I2S_Type *const mcu_i2s_banks[2] = { SAI1, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_03),
+
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_03),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_02),
+
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_04),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_06),
+
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_01),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_04),
+
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_02),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_07),
+
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_00),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[1] = {
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_01),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[1] = {
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_02),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[20] = {
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_SD_02_FLEXPWM1_PWM0_A, &pin_GPIO_SD_02),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_02_FLEXPWM1_PWM0_A, &pin_GPIO_02),
 
-    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_01_FLEXPWM1_PWM0_B, &pin_GPIO_01),
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_SD_01_FLEXPWM1_PWM0_B, &pin_GPIO_SD_01),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_01_FLEXPWM1_PWM0_B, &pin_GPIO_01),
 
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_12_FLEXPWM1_PWM0_X, &pin_GPIO_AD_12),
 
-    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_04_FLEXPWM1_PWM1_A, &pin_GPIO_04),
     PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_SD_04_FLEXPWM1_PWM1_A, &pin_GPIO_SD_04),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_04_FLEXPWM1_PWM1_A, &pin_GPIO_04),
 
-    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_03_FLEXPWM1_PWM1_B, &pin_GPIO_03),
     PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_SD_03_FLEXPWM1_PWM1_B, &pin_GPIO_SD_03),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_03_FLEXPWM1_PWM1_B, &pin_GPIO_03),
 
     PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_11_FLEXPWM1_PWM1_X, &pin_GPIO_AD_11),
 
-    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_06_FLEXPWM1_PWM2_A, &pin_GPIO_06),
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_04_FLEXPWM1_PWM2_A, &pin_GPIO_AD_04),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_06_FLEXPWM1_PWM2_A, &pin_GPIO_06),
 
-    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_05_FLEXPWM1_PWM2_B, &pin_GPIO_05),
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_03_FLEXPWM1_PWM2_B, &pin_GPIO_AD_03),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_05_FLEXPWM1_PWM2_B, &pin_GPIO_05),
 
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_10_FLEXPWM1_PWM2_X, &pin_GPIO_AD_10),
 
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_08_FLEXPWM1_PWM3_A, &pin_GPIO_08),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_06_FLEXPWM1_PWM3_A, &pin_GPIO_AD_06),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_08_FLEXPWM1_PWM3_A, &pin_GPIO_08),
 
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_07_FLEXPWM1_PWM3_B, &pin_GPIO_07),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_05_FLEXPWM1_PWM3_B, &pin_GPIO_AD_05),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_07_FLEXPWM1_PWM3_B, &pin_GPIO_07),
 
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_09_FLEXPWM1_PWM3_X, &pin_GPIO_AD_09),
 };
-
-const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_08),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_00),
-};
-const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_03),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_03),
-};
-const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_02),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_04),
-};
-const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_06),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_01),
-};
-const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_04),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_02),
-};
-const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
-    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_07),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_SD_00),
-};
-const mcu_periph_obj_t mcu_mqs_left_list[] = {
-    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_01),
-};
-const mcu_periph_obj_t mcu_mqs_right_list[] = {
-    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_02),
-};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
index 045e33ca0e..e03e2c7967 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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,37 +26,30 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
-#define MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
-
+#pragma once
 extern LPI2C_Type *const mcu_i2c_banks[2];
-
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
 
 extern LPSPI_Type *const mcu_spi_banks[2];
-
 extern const mcu_periph_obj_t mcu_spi_sck_list[4];
-extern const mcu_periph_obj_t mcu_spi_mosi_list[4];
-extern const mcu_periph_obj_t mcu_spi_miso_list[4];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[4];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[4];
 
 extern LPUART_Type *const mcu_uart_banks[4];
-
 extern const mcu_periph_obj_t mcu_uart_rx_list[9];
 extern const mcu_periph_obj_t mcu_uart_tx_list[9];
 extern const mcu_periph_obj_t mcu_uart_rts_list[4];
 extern const mcu_periph_obj_t mcu_uart_cts_list[4];
 
-extern const mcu_pwm_obj_t mcu_pwm_list[20];
-
-extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[2];
-extern const mcu_periph_obj_t mcu_sai_rx_data0_list[2];
-extern const mcu_periph_obj_t mcu_sai_rx_sync_list[2];
-extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[2];
-extern const mcu_periph_obj_t mcu_sai_tx_data0_list[2];
-extern const mcu_periph_obj_t mcu_sai_tx_sync_list[2];
+extern I2S_Type *const mcu_i2s_banks[2];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[2];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[2];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[2];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[2];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[2];
 
 extern const mcu_periph_obj_t mcu_mqs_left_list[1];
 extern const mcu_periph_obj_t mcu_mqs_right_list[1];
 
-#endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1011_PERIPHERALS_MIMXRT1011_PERIPH_H
+extern const mcu_pwm_obj_t mcu_pwm_list[20];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pin_names.h
new file mode 100644
index 0000000000..b197256a36
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pin_names.h
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_AD_14)
+FORMAT_PIN(GPIO_AD_13)
+FORMAT_PIN(GPIO_AD_12)
+FORMAT_PIN(GPIO_AD_11)
+FORMAT_PIN(GPIO_AD_10)
+FORMAT_PIN(GPIO_AD_09)
+FORMAT_PIN(GPIO_AD_08)
+FORMAT_PIN(GPIO_AD_07)
+FORMAT_PIN(GPIO_AD_06)
+FORMAT_PIN(GPIO_AD_05)
+FORMAT_PIN(GPIO_AD_04)
+FORMAT_PIN(GPIO_AD_03)
+FORMAT_PIN(GPIO_AD_02)
+FORMAT_PIN(GPIO_AD_01)
+FORMAT_PIN(GPIO_AD_00)
+
+FORMAT_PIN(GPIO_SD_13)
+FORMAT_PIN(GPIO_SD_12)
+FORMAT_PIN(GPIO_SD_11)
+FORMAT_PIN(GPIO_SD_10)
+FORMAT_PIN(GPIO_SD_09)
+FORMAT_PIN(GPIO_SD_08)
+FORMAT_PIN(GPIO_SD_07)
+FORMAT_PIN(GPIO_SD_06)
+FORMAT_PIN(GPIO_SD_05)
+FORMAT_PIN(GPIO_SD_04)
+FORMAT_PIN(GPIO_SD_03)
+FORMAT_PIN(GPIO_SD_02)
+FORMAT_PIN(GPIO_SD_01)
+FORMAT_PIN(GPIO_SD_00)
+
+FORMAT_PIN(GPIO_13)
+FORMAT_PIN(GPIO_12)
+FORMAT_PIN(GPIO_11)
+FORMAT_PIN(GPIO_10)
+FORMAT_PIN(GPIO_09)
+FORMAT_PIN(GPIO_08)
+FORMAT_PIN(GPIO_07)
+FORMAT_PIN(GPIO_06)
+FORMAT_PIN(GPIO_05)
+FORMAT_PIN(GPIO_04)
+FORMAT_PIN(GPIO_03)
+FORMAT_PIN(GPIO_02)
+FORMAT_PIN(GPIO_01)
+FORMAT_PIN(GPIO_00)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
index 492d1c6f08..a2b38a8a67 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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
@@ -29,48 +30,49 @@
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
 
-const mcu_pin_obj_t pin_GPIO_00 = PIN(GPIO1, 0, GPIO_00, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_01 = PIN(GPIO1, 1, GPIO_01, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_02 = PIN(GPIO1, 2, GPIO_02, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_03 = PIN(GPIO1, 3, GPIO_03, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_04 = PIN(GPIO1, 4, GPIO_04, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_05 = PIN(GPIO1, 5, GPIO_05, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_06 = PIN(GPIO1, 6, GPIO_06, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_07 = PIN(GPIO1, 7, GPIO_07, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_08 = PIN(GPIO1, 8, GPIO_08, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_09 = PIN(GPIO1, 9, GPIO_09, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_10 = PIN(GPIO1, 10, GPIO_10, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_11 = PIN(GPIO1, 11, GPIO_11, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_12 = PIN(GPIO1, 12, GPIO_12, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_13 = PIN(GPIO1, 13, GPIO_13, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_00 = PIN(GPIO1, 14, GPIO_AD_00, ADC1, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_01 = PIN(GPIO1, 15, GPIO_AD_01, ADC1, 1, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_02 = PIN(GPIO1, 16, GPIO_AD_02, ADC1, 2, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_03 = PIN(GPIO1, 17, GPIO_AD_03, ADC1, 3, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_04 = PIN(GPIO1, 18, GPIO_AD_04, ADC1, 4, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_05 = PIN(GPIO1, 19, GPIO_AD_05, ADC1, 5, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_06 = PIN(GPIO1, 20, GPIO_AD_06, ADC1, 6, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_07 = PIN(GPIO1, 21, GPIO_AD_07, ADC1, 7, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_AD_08 = PIN(GPIO1, 22, GPIO_AD_08, ADC1, 8, 0x00000007, 0x000070A0);
-const mcu_pin_obj_t pin_GPIO_AD_09 = PIN(GPIO1, 23, GPIO_AD_09, ADC1, 9, 0x00000007, 0x000090B1);
-const mcu_pin_obj_t pin_GPIO_AD_10 = PIN(GPIO1, 24, GPIO_AD_10, ADC1, 10, 0x00000007, 0x000070A0);
-const mcu_pin_obj_t pin_GPIO_AD_11 = PIN(GPIO1, 25, GPIO_AD_11, ADC1, 11, 0x00000007, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_AD_12 = PIN(GPIO1, 26, GPIO_AD_12, ADC1, 12, 0x00000007, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_AD_13 = PIN(GPIO1, 27, GPIO_AD_13, ADC1, 13, 0x00000007, 0x000070A0);
 const mcu_pin_obj_t pin_GPIO_AD_14 = PIN(GPIO1, 28, GPIO_AD_14, ADC1, 14, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_00 = PIN(GPIO2, 0, GPIO_SD_00, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_01 = PIN(GPIO2, 1, GPIO_SD_01, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_02 = PIN(GPIO2, 2, GPIO_SD_02, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_03 = PIN(GPIO2, 3, GPIO_SD_03, NO_ADC, 0, 0x00000006, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_SD_04 = PIN(GPIO2, 4, GPIO_SD_04, NO_ADC, 0, 0x00000006, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_SD_05 = PIN(GPIO2, 5, GPIO_SD_05, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_06 = PIN(GPIO2, 6, GPIO_SD_06, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_07 = PIN(GPIO2, 7, GPIO_SD_07, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_08 = PIN(GPIO2, 8, GPIO_SD_08, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_09 = PIN(GPIO2, 9, GPIO_SD_09, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_10 = PIN(GPIO2, 10, GPIO_SD_10, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_11 = PIN(GPIO2, 11, GPIO_SD_11, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_12 = PIN(GPIO2, 12, GPIO_SD_12, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_13 = PIN(GPIO1, 27, GPIO_AD_13, ADC1, 13, 0x00000007, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_12 = PIN(GPIO1, 26, GPIO_AD_12, ADC1, 12, 0x00000007, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_11 = PIN(GPIO1, 25, GPIO_AD_11, ADC1, 11, 0x00000007, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_10 = PIN(GPIO1, 24, GPIO_AD_10, ADC1, 10, 0x00000007, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_09 = PIN(GPIO1, 23, GPIO_AD_09, ADC1, 9, 0x00000007, 0x000090B1);
+const mcu_pin_obj_t pin_GPIO_AD_08 = PIN(GPIO1, 22, GPIO_AD_08, ADC1, 8, 0x00000007, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_07 = PIN(GPIO1, 21, GPIO_AD_07, ADC1, 7, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_06 = PIN(GPIO1, 20, GPIO_AD_06, ADC1, 6, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_05 = PIN(GPIO1, 19, GPIO_AD_05, ADC1, 5, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_04 = PIN(GPIO1, 18, GPIO_AD_04, ADC1, 4, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_03 = PIN(GPIO1, 17, GPIO_AD_03, ADC1, 3, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_02 = PIN(GPIO1, 16, GPIO_AD_02, ADC1, 2, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_01 = PIN(GPIO1, 15, GPIO_AD_01, ADC1, 1, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_AD_00 = PIN(GPIO1, 14, GPIO_AD_00, ADC1, 0, 0x00000005, 0x000010A0);
 const mcu_pin_obj_t pin_GPIO_SD_13 = PIN(GPIO2, 13, GPIO_SD_13, NO_ADC, 0, 0x00000005, 0x000010A0);
-const mcu_pin_obj_t pin_GPIO_SD_14 = PIN(GPIO2, 14, GPIO_SD_14, NO_ADC, 0, 0x00000000, 0x000010A0);
-// pin_GPIO_SD_14 isn't actually used as a pad but we include it anyway to make resetting easier
+const mcu_pin_obj_t pin_GPIO_SD_12 = PIN(GPIO2, 12, GPIO_SD_12, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_11 = PIN(GPIO2, 11, GPIO_SD_11, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_10 = PIN(GPIO2, 10, GPIO_SD_10, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_09 = PIN(GPIO2, 9, GPIO_SD_09, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_08 = PIN(GPIO2, 8, GPIO_SD_08, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_07 = PIN(GPIO2, 7, GPIO_SD_07, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_06 = PIN(GPIO2, 6, GPIO_SD_06, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_05 = PIN(GPIO2, 5, GPIO_SD_05, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_04 = PIN(GPIO2, 4, GPIO_SD_04, NO_ADC, 0, 0x00000006, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_SD_03 = PIN(GPIO2, 3, GPIO_SD_03, NO_ADC, 0, 0x00000006, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_SD_02 = PIN(GPIO2, 2, GPIO_SD_02, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_01 = PIN(GPIO2, 1, GPIO_SD_01, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_SD_00 = PIN(GPIO2, 0, GPIO_SD_00, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_13 = PIN(GPIO1, 13, GPIO_13, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_12 = PIN(GPIO1, 12, GPIO_12, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_11 = PIN(GPIO1, 11, GPIO_11, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_10 = PIN(GPIO1, 10, GPIO_10, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_09 = PIN(GPIO1, 9, GPIO_09, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_08 = PIN(GPIO1, 8, GPIO_08, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_07 = PIN(GPIO1, 7, GPIO_07, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_06 = PIN(GPIO1, 6, GPIO_06, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_05 = PIN(GPIO1, 5, GPIO_05, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_04 = PIN(GPIO1, 4, GPIO_04, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_03 = PIN(GPIO1, 3, GPIO_03, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_02 = PIN(GPIO1, 2, GPIO_02, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_01 = PIN(GPIO1, 1, GPIO_01, NO_ADC, 0, 0x00000005, 0x000010A0);
+const mcu_pin_obj_t pin_GPIO_00 = PIN(GPIO1, 0, GPIO_00, NO_ADC, 0, 0x00000005, 0x000010A0);
+
+const mcu_pin_obj_t pin_USB_OTG1_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG1_DP = { { &mcu_pin_type }, };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
index 58ef7329e7..118eff9335 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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,56 +26,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PINS_H
-#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PINS_H
+#pragma once
 
-extern const mcu_pin_obj_t pin_GPIO_00;
-extern const mcu_pin_obj_t pin_GPIO_01;
-extern const mcu_pin_obj_t pin_GPIO_02;
-extern const mcu_pin_obj_t pin_GPIO_03;
-extern const mcu_pin_obj_t pin_GPIO_04;
-extern const mcu_pin_obj_t pin_GPIO_05;
-extern const mcu_pin_obj_t pin_GPIO_06;
-extern const mcu_pin_obj_t pin_GPIO_07;
-extern const mcu_pin_obj_t pin_GPIO_08;
-extern const mcu_pin_obj_t pin_GPIO_09;
-extern const mcu_pin_obj_t pin_GPIO_10;
-extern const mcu_pin_obj_t pin_GPIO_11;
-extern const mcu_pin_obj_t pin_GPIO_12;
-extern const mcu_pin_obj_t pin_GPIO_13;
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
 
-extern const mcu_pin_obj_t pin_GPIO_SD_00;
-extern const mcu_pin_obj_t pin_GPIO_SD_01;
-extern const mcu_pin_obj_t pin_GPIO_SD_02;
-extern const mcu_pin_obj_t pin_GPIO_SD_03;
-extern const mcu_pin_obj_t pin_GPIO_SD_04;
-extern const mcu_pin_obj_t pin_GPIO_SD_05;
-extern const mcu_pin_obj_t pin_GPIO_SD_06;
-extern const mcu_pin_obj_t pin_GPIO_SD_07;
-extern const mcu_pin_obj_t pin_GPIO_SD_08;
-extern const mcu_pin_obj_t pin_GPIO_SD_09;
-extern const mcu_pin_obj_t pin_GPIO_SD_10;
-extern const mcu_pin_obj_t pin_GPIO_SD_11;
-extern const mcu_pin_obj_t pin_GPIO_SD_12;
-extern const mcu_pin_obj_t pin_GPIO_SD_13;
-extern const mcu_pin_obj_t pin_GPIO_SD_14;
-
-extern const mcu_pin_obj_t pin_GPIO_AD_00;
-extern const mcu_pin_obj_t pin_GPIO_AD_01;
-extern const mcu_pin_obj_t pin_GPIO_AD_02;
-extern const mcu_pin_obj_t pin_GPIO_AD_03;
-extern const mcu_pin_obj_t pin_GPIO_AD_04;
-extern const mcu_pin_obj_t pin_GPIO_AD_05;
-extern const mcu_pin_obj_t pin_GPIO_AD_06;
-extern const mcu_pin_obj_t pin_GPIO_AD_07;
-extern const mcu_pin_obj_t pin_GPIO_AD_08;
-extern const mcu_pin_obj_t pin_GPIO_AD_09;
-extern const mcu_pin_obj_t pin_GPIO_AD_10;
-extern const mcu_pin_obj_t pin_GPIO_AD_11;
-extern const mcu_pin_obj_t pin_GPIO_AD_12;
-extern const mcu_pin_obj_t pin_GPIO_AD_13;
-extern const mcu_pin_obj_t pin_GPIO_AD_14;
-
-extern const mcu_pin_obj_t mcu_pin_list[IOMUXC_SW_PAD_CTL_PAD_COUNT];
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PINS_H
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c
new file mode 100644
index 0000000000..bef213a7c7
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c
@@ -0,0 +1,315 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ */
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "mpconfigport.h"
+
+#include "fsl_clock.h"
+#include "fsl_iomuxc.h"
+
+#include "supervisor/linker.h"
+
+#include "board.h"
+
+#include "clocks.h"
+
+#define BOARD_XTAL0_CLK_HZ                         24000000U  /*!< Board xtal0 frequency in Hz */
+#define BOARD_XTAL32K_CLK_HZ                          32768U  /*!< Board xtal32k frequency in Hz */
+
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK             500000000U  /*!< Core clock frequency: 500000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT               500000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT         32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK                  0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK                  0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M                     1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M                    24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK          500000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT           30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT           196363636UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ      62500000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ      62500000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT               125000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT             60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT             105600000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK                   63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT            62500000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT            30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT          0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT             117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT              80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK                0UL
+
+
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 1,                             /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 0,                             /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN =
+{
+    .enableClkOutput500M = true,                  /* Enable the PLL providing the ENET 500MHz reference clock */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+
+// Based on the hello_world example in the SDK
+void clocks_init(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.25V. It is necessary to config AHB to 500Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x12);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 0);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 1);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 1);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 3);
+    #endif
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 18);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 18);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 22);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 18);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Enet PLL. */
+    CLOCK_InitEnetPll(&enetPllConfig_BOARD_BootClockRUN);
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(6);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR,kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
new file mode 100644
index 0000000000..9c56c47dc0
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
@@ -0,0 +1,184 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/periph.h"
+
+LPI2C_Type *const mcu_i2c_banks[2] = { LPI2C1, LPI2C2 };
+
+const mcu_periph_obj_t mcu_i2c_sda_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_B1_15),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_18),
+};
+
+const mcu_periph_obj_t mcu_i2c_scl_list[2] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_B1_14),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_19),
+};
+
+LPSPI_Type *const mcu_spi_banks[2] = { LPSPI1, LPSPI2 };
+
+const mcu_periph_obj_t mcu_spi_sck_list[2] = {
+    PERIPH_PIN(1, 1, 0, 0, &pin_GPIO_AD_B0_10),
+
+    PERIPH_PIN(2, 4, 0, 0, &pin_GPIO_SD_B1_07),
+};
+
+const mcu_periph_obj_t mcu_spi_sdo_list[2] = {
+    PERIPH_PIN(1, 1, 0, 0, &pin_GPIO_AD_B0_12),
+
+    PERIPH_PIN(2, 4, 0, 0, &pin_GPIO_SD_B1_08),
+};
+
+const mcu_periph_obj_t mcu_spi_sdi_list[2] = {
+    PERIPH_PIN(1, 1, 0, 0, &pin_GPIO_AD_B0_13),
+
+    PERIPH_PIN(2, 4, 0, 0, &pin_GPIO_SD_B1_09),
+};
+
+LPUART_Type *const mcu_uart_banks[4] = { LPUART1, LPUART2, LPUART3, LPUART4 };
+
+const mcu_periph_obj_t mcu_uart_rx_list[6] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_07),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_23),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_07),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_15),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_AD_B1_11),
+};
+
+const mcu_periph_obj_t mcu_uart_tx_list[6] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_06),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_22),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_14),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_32),
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_AD_B1_10),
+};
+
+const mcu_periph_obj_t mcu_uart_rts_list[3] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_09),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_21),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_13),
+};
+
+const mcu_periph_obj_t mcu_uart_cts_list[3] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_08),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_20),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_12),
+};
+
+I2S_Type *const mcu_i2s_banks[3] = { SAI1, SAI2, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[3] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_21),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_08),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_11),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[3] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_18),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_07),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_10),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[4] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_26),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_04),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_06),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[4] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_25),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_32),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_08),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[4] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_27),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_05),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_07),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[2] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_17),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_07),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[2] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_06),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[12] = {
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_26_FLEXPWM1_PWMA00, &pin_GPIO_EMC_26),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_27_FLEXPWM1_PWMB00, &pin_GPIO_EMC_27),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_24_FLEXPWM1_PWMA01, &pin_GPIO_EMC_24),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_25_FLEXPWM1_PWMB01, &pin_GPIO_EMC_25),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_22_FLEXPWM1_PWMA02, &pin_GPIO_EMC_22),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_B1_10_FLEXPWM1_PWMA02, &pin_GPIO_AD_B1_10),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_23_FLEXPWM1_PWMB02, &pin_GPIO_EMC_23),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_B1_11_FLEXPWM1_PWMB02, &pin_GPIO_AD_B1_11),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_20_FLEXPWM1_PWMA03, &pin_GPIO_EMC_20),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B1_12_FLEXPWM1_PWMA03, &pin_GPIO_AD_B1_12),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_21_FLEXPWM1_PWMB03, &pin_GPIO_EMC_21),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B1_13_FLEXPWM1_PWMB03, &pin_GPIO_AD_B1_13),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
new file mode 100644
index 0000000000..af53706d6f
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+extern LPI2C_Type *const mcu_i2c_banks[2];
+extern const mcu_periph_obj_t mcu_i2c_sda_list[2];
+extern const mcu_periph_obj_t mcu_i2c_scl_list[2];
+
+extern LPSPI_Type *const mcu_spi_banks[2];
+extern const mcu_periph_obj_t mcu_spi_sck_list[2];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[2];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[2];
+
+extern LPUART_Type *const mcu_uart_banks[4];
+extern const mcu_periph_obj_t mcu_uart_rx_list[6];
+extern const mcu_periph_obj_t mcu_uart_tx_list[6];
+extern const mcu_periph_obj_t mcu_uart_rts_list[3];
+extern const mcu_periph_obj_t mcu_uart_cts_list[3];
+
+extern I2S_Type *const mcu_i2s_banks[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[3];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[4];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[4];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[4];
+
+extern const mcu_periph_obj_t mcu_mqs_left_list[2];
+extern const mcu_periph_obj_t mcu_mqs_right_list[2];
+
+extern const mcu_pwm_obj_t mcu_pwm_list[12];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pin_names.h
new file mode 100644
index 0000000000..0416e2ee65
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pin_names.h
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_04)
+FORMAT_PIN(GPIO_EMC_05)
+FORMAT_PIN(GPIO_EMC_06)
+FORMAT_PIN(GPIO_EMC_07)
+FORMAT_PIN(GPIO_EMC_08)
+FORMAT_PIN(GPIO_EMC_09)
+FORMAT_PIN(GPIO_EMC_16)
+FORMAT_PIN(GPIO_EMC_17)
+FORMAT_PIN(GPIO_EMC_18)
+FORMAT_PIN(GPIO_EMC_19)
+FORMAT_PIN(GPIO_EMC_20)
+FORMAT_PIN(GPIO_EMC_21)
+FORMAT_PIN(GPIO_EMC_22)
+FORMAT_PIN(GPIO_EMC_23)
+FORMAT_PIN(GPIO_EMC_24)
+FORMAT_PIN(GPIO_EMC_25)
+FORMAT_PIN(GPIO_EMC_26)
+FORMAT_PIN(GPIO_EMC_27)
+FORMAT_PIN(GPIO_EMC_32)
+FORMAT_PIN(GPIO_EMC_33)
+FORMAT_PIN(GPIO_EMC_34)
+FORMAT_PIN(GPIO_EMC_35)
+
+FORMAT_PIN(GPIO_AD_B0_00)
+FORMAT_PIN(GPIO_AD_B0_01)
+FORMAT_PIN(GPIO_AD_B0_02)
+FORMAT_PIN(GPIO_AD_B0_03)
+FORMAT_PIN(GPIO_AD_B0_04)
+FORMAT_PIN(GPIO_AD_B0_05)
+FORMAT_PIN(GPIO_AD_B0_06)
+FORMAT_PIN(GPIO_AD_B0_07)
+FORMAT_PIN(GPIO_AD_B0_08)
+FORMAT_PIN(GPIO_AD_B0_09)
+FORMAT_PIN(GPIO_AD_B0_10)
+FORMAT_PIN(GPIO_AD_B0_11)
+FORMAT_PIN(GPIO_AD_B0_12)
+FORMAT_PIN(GPIO_AD_B0_13)
+FORMAT_PIN(GPIO_AD_B0_14)
+FORMAT_PIN(GPIO_AD_B0_15)
+
+FORMAT_PIN(GPIO_AD_B1_10)
+FORMAT_PIN(GPIO_AD_B1_11)
+FORMAT_PIN(GPIO_AD_B1_12)
+FORMAT_PIN(GPIO_AD_B1_13)
+FORMAT_PIN(GPIO_AD_B1_14)
+FORMAT_PIN(GPIO_AD_B1_15)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+FORMAT_PIN(GPIO_SD_B1_06)
+FORMAT_PIN(GPIO_SD_B1_07)
+FORMAT_PIN(GPIO_SD_B1_08)
+FORMAT_PIN(GPIO_SD_B1_09)
+FORMAT_PIN(GPIO_SD_B1_10)
+FORMAT_PIN(GPIO_SD_B1_11)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
new file mode 100644
index 0000000000..efa7abcedf
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/pins.h"
+
+const mcu_pin_obj_t pin_GPIO_EMC_04 = PIN(GPIO2, 4, GPIO_EMC_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_05 = PIN(GPIO2, 5, GPIO_EMC_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_06 = PIN(GPIO2, 6, GPIO_EMC_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_07 = PIN(GPIO2, 7, GPIO_EMC_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_08 = PIN(GPIO2, 8, GPIO_EMC_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_09 = PIN(GPIO2, 9, GPIO_EMC_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_16 = PIN(GPIO2, 16, GPIO_EMC_16, NO_ADC, 0, 0x00000006, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_EMC_17 = PIN(GPIO2, 17, GPIO_EMC_17, NO_ADC, 0, 0x00000006, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_EMC_18 = PIN(GPIO2, 18, GPIO_EMC_18, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_19 = PIN(GPIO2, 19, GPIO_EMC_19, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_20 = PIN(GPIO2, 20, GPIO_EMC_20, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_21 = PIN(GPIO2, 21, GPIO_EMC_21, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_22 = PIN(GPIO2, 22, GPIO_EMC_22, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_23 = PIN(GPIO2, 23, GPIO_EMC_23, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_24 = PIN(GPIO2, 24, GPIO_EMC_24, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_25 = PIN(GPIO2, 25, GPIO_EMC_25, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_26 = PIN(GPIO2, 26, GPIO_EMC_26, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_27 = PIN(GPIO2, 27, GPIO_EMC_27, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_32 = PIN(GPIO3, 0, GPIO_EMC_32, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_33 = PIN(GPIO3, 1, GPIO_EMC_33, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_34 = PIN(GPIO3, 2, GPIO_EMC_34, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_35 = PIN(GPIO3, 3, GPIO_EMC_35, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_00 = PIN(GPIO1, 0, GPIO_AD_B0_00, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_01 = PIN(GPIO1, 1, GPIO_AD_B0_01, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_02 = PIN(GPIO1, 2, GPIO_AD_B0_02, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_03 = PIN(GPIO1, 3, GPIO_AD_B0_03, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_04 = PIN(GPIO1, 4, GPIO_AD_B0_04, NO_ADC, 0, 0x00000000, 0x000090B1);
+const mcu_pin_obj_t pin_GPIO_AD_B0_05 = PIN(GPIO1, 5, GPIO_AD_B0_05, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_06 = PIN(GPIO1, 6, GPIO_AD_B0_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_07 = PIN(GPIO1, 7, GPIO_AD_B0_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_08 = PIN(GPIO1, 8, GPIO_AD_B0_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_09 = PIN(GPIO1, 9, GPIO_AD_B0_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_10 = PIN(GPIO1, 10, GPIO_AD_B0_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_11 = PIN(GPIO1, 11, GPIO_AD_B0_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC1, 1, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC1, 2, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC1, 10, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC1, 11, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_12 = PIN(GPIO1, 28, GPIO_AD_B1_12, ADC1, 12, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_13 = PIN(GPIO1, 29, GPIO_AD_B1_13, ADC1, 13, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_14 = PIN(GPIO1, 30, GPIO_AD_B1_14, ADC1, 14, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_15 = PIN(GPIO1, 31, GPIO_AD_B1_15, ADC1, 15, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_00 = PIN(GPIO3, 20, GPIO_SD_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_01 = PIN(GPIO3, 21, GPIO_SD_B1_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_02 = PIN(GPIO3, 22, GPIO_SD_B1_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_03 = PIN(GPIO3, 23, GPIO_SD_B1_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_04 = PIN(GPIO3, 24, GPIO_SD_B1_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_05 = PIN(GPIO3, 25, GPIO_SD_B1_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_06 = PIN(GPIO3, 26, GPIO_SD_B1_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_07 = PIN(GPIO3, 27, GPIO_SD_B1_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_08 = PIN(GPIO3, 28, GPIO_SD_B1_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_09 = PIN(GPIO3, 29, GPIO_SD_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_10 = PIN(GPIO3, 30, GPIO_SD_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_11 = PIN(GPIO3, 31, GPIO_SD_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+
+const mcu_pin_obj_t pin_USB_OTG1_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG1_DP = { { &mcu_pin_type }, };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
new file mode 100644
index 0000000000..118eff9335
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
+
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c
index 198f85110e..eab7f4eacc 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c
@@ -36,6 +36,8 @@
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"
 
+#include "board.h"
+
 #include "clocks.h"
 
 // These values are pulled from the SDK's devices/MIMXRT1021/project_template/clock_config.* files.
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
index 59bd3cc105..8615e6cfc5 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
- * Copyright (c) 2020 Scott Shawcroft
+ * Copyright (c) 2023 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
@@ -70,13 +70,13 @@ const mcu_periph_obj_t mcu_spi_sck_list[8] = {
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 1, &pin_GPIO_EMC_10),
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 2, &pin_GPIO_SD_B1_07),
 
-    PERIPH_PIN(3, 2, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 0, &pin_GPIO_AD_B1_12),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_12),
 
-    PERIPH_PIN(4, 2, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 0, &pin_GPIO_AD_B1_02),
-    PERIPH_PIN(4, 4, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 1, &pin_GPIO_EMC_32),
+    PERIPH_PIN(4, 2, kIOMUXC_LPSPI4_SCK_SELECT_INPUT, 0, &pin_GPIO_AD_B1_02),
+    PERIPH_PIN(4, 4, kIOMUXC_LPSPI4_SCK_SELECT_INPUT, 1, &pin_GPIO_EMC_32),
 };
 
-const mcu_periph_obj_t mcu_spi_mosi_list[8] = {
+const mcu_periph_obj_t mcu_spi_sdo_list[8] = {
     PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 0, &pin_GPIO_SD_B0_04),
     PERIPH_PIN(1, 1, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 1, &pin_GPIO_AD_B0_12),
 
@@ -84,13 +84,13 @@ const mcu_periph_obj_t mcu_spi_mosi_list[8] = {
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 1, &pin_GPIO_EMC_12),
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 2, &pin_GPIO_SD_B1_08),
 
-    PERIPH_PIN(3, 2, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 0, &pin_GPIO_AD_B1_14),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_14),
 
-    PERIPH_PIN(4, 2, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 0, &pin_GPIO_AD_B1_04),
-    PERIPH_PIN(4, 4, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 1, &pin_GPIO_EMC_34),
+    PERIPH_PIN(4, 2, kIOMUXC_LPSPI4_SDO_SELECT_INPUT, 0, &pin_GPIO_AD_B1_04),
+    PERIPH_PIN(4, 4, kIOMUXC_LPSPI4_SDO_SELECT_INPUT, 1, &pin_GPIO_EMC_34),
 };
 
-const mcu_periph_obj_t mcu_spi_miso_list[8] = {
+const mcu_periph_obj_t mcu_spi_sdi_list[8] = {
     PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 0, &pin_GPIO_SD_B0_05),
     PERIPH_PIN(1, 1, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 1, &pin_GPIO_AD_B0_13),
 
@@ -98,10 +98,10 @@ const mcu_periph_obj_t mcu_spi_miso_list[8] = {
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_13),
     PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 2, &pin_GPIO_SD_B1_09),
 
-    PERIPH_PIN(3, 2, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 0, &pin_GPIO_AD_B1_15),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_15),
 
-    PERIPH_PIN(4, 2, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 0, &pin_GPIO_AD_B1_05),
-    PERIPH_PIN(4, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_35),
+    PERIPH_PIN(4, 2, kIOMUXC_LPSPI4_SDI_SELECT_INPUT, 0, &pin_GPIO_AD_B1_05),
+    PERIPH_PIN(4, 4, kIOMUXC_LPSPI4_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_35),
 };
 
 LPUART_Type *const mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
@@ -162,18 +162,18 @@ const mcu_periph_obj_t mcu_uart_rts_list[10] = {
     PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_09),
 
     PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_21),
-    PERIPH_PIN(2, 2, 0, 1, &pin_GPIO_AD_B1_07),
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_07),
 
-    PERIPH_PIN(3, 2, 0, 1, &pin_GPIO_AD_B0_13),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_13),
 
     PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_01),
-    PERIPH_PIN(4, 2, 0, 1, &pin_GPIO_EMC_31),
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_31),
 
     PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_37),
 
     PERIPH_PIN(6, 2, 0, 0, &pin_GPIO_EMC_15),
 
-    PERIPH_PIN(7, 2, 0, 1, &pin_GPIO_SD_B0_03),
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_SD_B0_03),
 
     PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_EMC_25),
 };
@@ -184,10 +184,10 @@ const mcu_periph_obj_t mcu_uart_cts_list[10] = {
     PERIPH_PIN(2, 2, kIOMUXC_LPUART2_CTS_B_SELECT_INPUT, 0, &pin_GPIO_AD_B1_06),
     PERIPH_PIN(2, 2, kIOMUXC_LPUART2_CTS_B_SELECT_INPUT, 1, &pin_GPIO_EMC_20),
 
-    PERIPH_PIN(3, 2, 0, 1, &pin_GPIO_AD_B0_12),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B0_12),
 
     PERIPH_PIN(4, 2, kIOMUXC_LPUART4_CTS_B_SELECT_INPUT, 0, &pin_GPIO_EMC_00),
-    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_CTS_B_SELECT_INPUT, 0, &pin_GPIO_EMC_30),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_CTS_B_SELECT_INPUT, 1, &pin_GPIO_EMC_30),
 
     PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_36),
 
@@ -198,126 +198,142 @@ const mcu_periph_obj_t mcu_uart_cts_list[10] = {
     PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_EMC_24),
 };
 
-const mcu_pwm_obj_t mcu_pwm_list[39] = {
+I2S_Type *const mcu_i2s_banks[3] = { SAI1, SAI2, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B1_05),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 2, &pin_GPIO_EMC_21),
+
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_SD_B0_03),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_EMC_08),
+
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_SD_B1_11),
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_EMC_31),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_AD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_EMC_15),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 2, &pin_GPIO_EMC_18),
+
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B0_01),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_EMC_07),
+
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_10),
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_EMC_30),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_EMC_11),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B1_01),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 2, &pin_GPIO_EMC_26),
+
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_SD_B0_05),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_EMC_04),
+
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_06),
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_EMC_33),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[7] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_12),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_25),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_03),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_04),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_32),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_08),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_10),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B1_02),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 2, &pin_GPIO_EMC_27),
+
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B0_06),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_EMC_05),
+
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_07),
+    PERIPH_PIN(3, 3, kIOMUXC_SAI3_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_EMC_34),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[3] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_17),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_07),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[3] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_37),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_06),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[40] = {
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_26_FLEXPWM1_PWMA00, &pin_GPIO_EMC_26),
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_B1_06_FLEXPWM1_PWMA00, &pin_GPIO_AD_B1_06),
 
-    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_24_FLEXPWM1_PWMA01, &pin_GPIO_EMC_24),
-    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B1_08_FLEXPWM1_PWMA01, &pin_GPIO_AD_B1_08),
-
-    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_22_FLEXPWM1_PWMA02, &pin_GPIO_EMC_22),
-    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_B1_10_FLEXPWM1_PWMA02, &pin_GPIO_AD_B1_10),
-
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_20_FLEXPWM1_PWMA03, &pin_GPIO_EMC_20),
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B1_12_FLEXPWM1_PWMA03, &pin_GPIO_AD_B1_12),
-
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_27_FLEXPWM1_PWMB00, &pin_GPIO_EMC_27),
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_AD_B1_07_FLEXPWM1_PWMB00, &pin_GPIO_AD_B1_07),
 
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_EMC_28_FLEXPWM1_PWMX00, &pin_GPIO_EMC_28),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_24_FLEXPWM1_PWMA01, &pin_GPIO_EMC_24),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B1_08_FLEXPWM1_PWMA01, &pin_GPIO_AD_B1_08),
+
     PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_25_FLEXPWM1_PWMB01, &pin_GPIO_EMC_25),
     PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_AD_B1_09_FLEXPWM1_PWMB01, &pin_GPIO_AD_B1_09),
 
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_EMC_29_FLEXPWM1_PWMX01, &pin_GPIO_EMC_29),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_22_FLEXPWM1_PWMA02, &pin_GPIO_EMC_22),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_B1_10_FLEXPWM1_PWMA02, &pin_GPIO_AD_B1_10),
+
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_23_FLEXPWM1_PWMB02, &pin_GPIO_EMC_23),
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_B1_11_FLEXPWM1_PWMB02, &pin_GPIO_AD_B1_11),
 
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_EMC_30_FLEXPWM1_PWMX02, &pin_GPIO_EMC_30),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_20_FLEXPWM1_PWMA03, &pin_GPIO_EMC_20),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B1_12_FLEXPWM1_PWMA03, &pin_GPIO_AD_B1_12),
+
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_21_FLEXPWM1_PWMB03, &pin_GPIO_EMC_21),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B1_13_FLEXPWM1_PWMB03, &pin_GPIO_AD_B1_13),
 
-    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_EMC_28_FLEXPWM1_PWMX00, &pin_GPIO_EMC_28),
-    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_EMC_29_FLEXPWM1_PWMX01, &pin_GPIO_EMC_29),
-    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_EMC_30_FLEXPWM1_PWMX02, &pin_GPIO_EMC_30),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_EMC_31_FLEXPWM1_PWMX03, &pin_GPIO_EMC_31),
 
     PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_38_FLEXPWM2_PWMA00, &pin_GPIO_EMC_38),
     PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_B0_14_FLEXPWM2_PWMA00, &pin_GPIO_AD_B0_14),
 
-    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_36_FLEXPWM2_PWMA01, &pin_GPIO_EMC_36),
-    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B0_12_FLEXPWM2_PWMA01, &pin_GPIO_AD_B0_12),
-
-    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_30_FLEXPWM2_PWMA02, &pin_GPIO_EMC_30),
-    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM2_PWMA02, &pin_GPIO_AD_B0_10),
-
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_28_FLEXPWM2_PWMA03, &pin_GPIO_EMC_28),
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_06_FLEXPWM2_PWMA03, &pin_GPIO_AD_B0_06),
-
     PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_39_FLEXPWM2_PWMB00, &pin_GPIO_EMC_39),
     PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_AD_B0_15_FLEXPWM2_PWMB00, &pin_GPIO_AD_B0_15),
 
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_EMC_10_FLEXPWM2_PWMX00, &pin_GPIO_EMC_10),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_36_FLEXPWM2_PWMA01, &pin_GPIO_EMC_36),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B0_12_FLEXPWM2_PWMA01, &pin_GPIO_AD_B0_12),
+
     PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_37_FLEXPWM2_PWMB01, &pin_GPIO_EMC_37),
     PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_AD_B0_13_FLEXPWM2_PWMB01, &pin_GPIO_AD_B0_13),
 
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_EMC_11_FLEXPWM2_PWMX01, &pin_GPIO_EMC_11),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_30_FLEXPWM2_PWMA02, &pin_GPIO_EMC_30),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM2_PWMA02, &pin_GPIO_AD_B0_10),
+
     PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_31_FLEXPWM2_PWMB02, &pin_GPIO_EMC_31),
     PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_B0_11_FLEXPWM2_PWMB02, &pin_GPIO_AD_B0_11),
 
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_EMC_12_FLEXPWM2_PWMX02, &pin_GPIO_EMC_12),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_28_FLEXPWM2_PWMA03, &pin_GPIO_EMC_28),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_06_FLEXPWM2_PWMA03, &pin_GPIO_AD_B0_06),
+
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_29_FLEXPWM2_PWMB03, &pin_GPIO_EMC_29),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_07_FLEXPWM2_PWMB03, &pin_GPIO_AD_B0_07),
 
-    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_EMC_10_FLEXPWM2_PWMX00, &pin_GPIO_EMC_10),
-    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_EMC_11_FLEXPWM2_PWMX01, &pin_GPIO_EMC_11),
-    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_EMC_12_FLEXPWM2_PWMX02, &pin_GPIO_EMC_12),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_EMC_13_FLEXPWM2_PWMX03, &pin_GPIO_EMC_13),
 };
-
-const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_14),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_19),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_06),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_09),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_02),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_29),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_09),
-};
-const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_13),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_21),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_05),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_08),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_03),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_30),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_11),
-};
-const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_15),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_28),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_04),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_07),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_01),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_30),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_10),
-};
-const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_11),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_26),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_01),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_04),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_04),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B0_06),
-};
-const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_12),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_25),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_03),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_04),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_32),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_08),
-};
-const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_10),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_EMC_27),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_02),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_05),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_SD_B0_06),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B1_07),
-};
-const mcu_periph_obj_t mcu_mqs_left_list[] = {
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_07),
-    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_17),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
-};
-const mcu_periph_obj_t mcu_mqs_right_list[] = {
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_06),
-    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_37),
-};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
index 51c97b3eef..496e0ab153 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
@@ -3,8 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
- * Copyright (c) 2020 Scott Shawcroft
+ * Copyright (c) 2023 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
@@ -26,33 +27,29 @@
  */
 
 #pragma once
-
 extern LPI2C_Type *const mcu_i2c_banks[4];
-
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
 
 extern LPSPI_Type *const mcu_spi_banks[4];
-
 extern const mcu_periph_obj_t mcu_spi_sck_list[8];
-extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
-extern const mcu_periph_obj_t mcu_spi_miso_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[8];
 
 extern LPUART_Type *const mcu_uart_banks[8];
-
 extern const mcu_periph_obj_t mcu_uart_rx_list[16];
 extern const mcu_periph_obj_t mcu_uart_tx_list[16];
 extern const mcu_periph_obj_t mcu_uart_rts_list[10];
 extern const mcu_periph_obj_t mcu_uart_cts_list[10];
 
-extern const mcu_pwm_obj_t mcu_pwm_list[39];
-
-extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[7];
-extern const mcu_periph_obj_t mcu_sai_rx_data0_list[7];
-extern const mcu_periph_obj_t mcu_sai_rx_sync_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
+extern I2S_Type *const mcu_i2s_banks[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[7];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[7];
 
 extern const mcu_periph_obj_t mcu_mqs_left_list[3];
 extern const mcu_periph_obj_t mcu_mqs_right_list[3];
+
+extern const mcu_pwm_obj_t mcu_pwm_list[40];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pin_names.h
new file mode 100644
index 0000000000..1f159afe53
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pin_names.h
@@ -0,0 +1,130 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_00)
+FORMAT_PIN(GPIO_EMC_01)
+FORMAT_PIN(GPIO_EMC_02)
+FORMAT_PIN(GPIO_EMC_03)
+FORMAT_PIN(GPIO_EMC_04)
+FORMAT_PIN(GPIO_EMC_05)
+FORMAT_PIN(GPIO_EMC_06)
+FORMAT_PIN(GPIO_EMC_07)
+FORMAT_PIN(GPIO_EMC_08)
+FORMAT_PIN(GPIO_EMC_09)
+FORMAT_PIN(GPIO_EMC_10)
+FORMAT_PIN(GPIO_EMC_11)
+FORMAT_PIN(GPIO_EMC_12)
+FORMAT_PIN(GPIO_EMC_13)
+FORMAT_PIN(GPIO_EMC_14)
+FORMAT_PIN(GPIO_EMC_15)
+FORMAT_PIN(GPIO_EMC_16)
+FORMAT_PIN(GPIO_EMC_17)
+FORMAT_PIN(GPIO_EMC_18)
+FORMAT_PIN(GPIO_EMC_19)
+FORMAT_PIN(GPIO_EMC_20)
+FORMAT_PIN(GPIO_EMC_21)
+FORMAT_PIN(GPIO_EMC_22)
+FORMAT_PIN(GPIO_EMC_23)
+FORMAT_PIN(GPIO_EMC_24)
+FORMAT_PIN(GPIO_EMC_25)
+FORMAT_PIN(GPIO_EMC_26)
+FORMAT_PIN(GPIO_EMC_27)
+FORMAT_PIN(GPIO_EMC_28)
+FORMAT_PIN(GPIO_EMC_29)
+FORMAT_PIN(GPIO_EMC_30)
+FORMAT_PIN(GPIO_EMC_31)
+FORMAT_PIN(GPIO_EMC_32)
+FORMAT_PIN(GPIO_EMC_33)
+FORMAT_PIN(GPIO_EMC_34)
+FORMAT_PIN(GPIO_EMC_35)
+FORMAT_PIN(GPIO_EMC_36)
+FORMAT_PIN(GPIO_EMC_37)
+FORMAT_PIN(GPIO_EMC_38)
+FORMAT_PIN(GPIO_EMC_39)
+FORMAT_PIN(GPIO_EMC_40)
+FORMAT_PIN(GPIO_EMC_41)
+
+FORMAT_PIN(GPIO_AD_B0_00)
+FORMAT_PIN(GPIO_AD_B0_01)
+FORMAT_PIN(GPIO_AD_B0_02)
+FORMAT_PIN(GPIO_AD_B0_03)
+FORMAT_PIN(GPIO_AD_B0_04)
+FORMAT_PIN(GPIO_AD_B0_05)
+FORMAT_PIN(GPIO_AD_B0_06)
+FORMAT_PIN(GPIO_AD_B0_07)
+FORMAT_PIN(GPIO_AD_B0_08)
+FORMAT_PIN(GPIO_AD_B0_09)
+FORMAT_PIN(GPIO_AD_B0_10)
+FORMAT_PIN(GPIO_AD_B0_11)
+FORMAT_PIN(GPIO_AD_B0_12)
+FORMAT_PIN(GPIO_AD_B0_13)
+FORMAT_PIN(GPIO_AD_B0_14)
+FORMAT_PIN(GPIO_AD_B0_15)
+
+FORMAT_PIN(GPIO_AD_B1_00)
+FORMAT_PIN(GPIO_AD_B1_01)
+FORMAT_PIN(GPIO_AD_B1_02)
+FORMAT_PIN(GPIO_AD_B1_03)
+FORMAT_PIN(GPIO_AD_B1_04)
+FORMAT_PIN(GPIO_AD_B1_05)
+FORMAT_PIN(GPIO_AD_B1_06)
+FORMAT_PIN(GPIO_AD_B1_07)
+FORMAT_PIN(GPIO_AD_B1_08)
+FORMAT_PIN(GPIO_AD_B1_09)
+FORMAT_PIN(GPIO_AD_B1_10)
+FORMAT_PIN(GPIO_AD_B1_11)
+FORMAT_PIN(GPIO_AD_B1_12)
+FORMAT_PIN(GPIO_AD_B1_13)
+FORMAT_PIN(GPIO_AD_B1_14)
+FORMAT_PIN(GPIO_AD_B1_15)
+
+FORMAT_PIN(GPIO_SD_B0_00)
+FORMAT_PIN(GPIO_SD_B0_01)
+FORMAT_PIN(GPIO_SD_B0_02)
+FORMAT_PIN(GPIO_SD_B0_03)
+FORMAT_PIN(GPIO_SD_B0_04)
+FORMAT_PIN(GPIO_SD_B0_05)
+FORMAT_PIN(GPIO_SD_B0_06)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+FORMAT_PIN(GPIO_SD_B1_06)
+FORMAT_PIN(GPIO_SD_B1_07)
+FORMAT_PIN(GPIO_SD_B1_08)
+FORMAT_PIN(GPIO_SD_B1_09)
+FORMAT_PIN(GPIO_SD_B1_10)
+FORMAT_PIN(GPIO_SD_B1_11)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
index fe39f7e19d..e349f43542 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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
@@ -29,38 +30,6 @@
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
 
-const mcu_pin_obj_t pin_GPIO_AD_B0_00 = PIN(GPIO1, 0, GPIO_AD_B0_00, NO_ADC, 0, 0x00000000, 0x000070A0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_01 = PIN(GPIO1, 1, GPIO_AD_B0_01, NO_ADC, 0, 0x00000000, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_02 = PIN(GPIO1, 2, GPIO_AD_B0_02, NO_ADC, 0, 0x00000000, 0x000030A0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_03 = PIN(GPIO1, 3, GPIO_AD_B0_03, NO_ADC, 0, 0x00000000, 0x000070A0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_04 = PIN(GPIO1, 4, GPIO_AD_B0_04, NO_ADC, 0, 0x00000000, 0x000090B1);
-const mcu_pin_obj_t pin_GPIO_AD_B0_05 = PIN(GPIO1, 5, GPIO_AD_B0_05, NO_ADC, 0, 0x00000000, 0x000070A0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_06 = PIN(GPIO1, 6, GPIO_AD_B0_06, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_07 = PIN(GPIO1, 7, GPIO_AD_B0_07, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_08 = PIN(GPIO1, 8, GPIO_AD_B0_08, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_09 = PIN(GPIO1, 9, GPIO_AD_B0_09, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_10 = PIN(GPIO1, 10, GPIO_AD_B0_10, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_11 = PIN(GPIO1, 11, GPIO_AD_B0_11, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, ADC2, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC2, 1, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC1, 2, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC1, 3, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC2, 3, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC1, 4, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC2, 4, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC2, 5, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC2, 6, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC2, 7, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_08 = PIN(GPIO1, 24, GPIO_AD_B1_08, ADC2, 8, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_09 = PIN(GPIO1, 25, GPIO_AD_B1_09, ADC2, 9, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC2, 10, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC2, 11, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_12 = PIN(GPIO1, 28, GPIO_AD_B1_12, ADC2, 12, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_13 = PIN(GPIO1, 29, GPIO_AD_B1_13, ADC2, 13, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_14 = PIN(GPIO1, 30, GPIO_AD_B1_14, ADC2, 14, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_15 = PIN(GPIO1, 31, GPIO_AD_B1_15, ADC2, 15, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_00 = PIN(GPIO2, 0, GPIO_EMC_00, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_01 = PIN(GPIO2, 1, GPIO_EMC_01, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_02 = PIN(GPIO2, 2, GPIO_EMC_02, NO_ADC, 0, 0x00000005, 0x000010B0);
@@ -103,6 +72,38 @@ const mcu_pin_obj_t pin_GPIO_EMC_38 = PIN(GPIO3, 6, GPIO_EMC_38, NO_ADC, 0, 0x00
 const mcu_pin_obj_t pin_GPIO_EMC_39 = PIN(GPIO3, 7, GPIO_EMC_39, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_40 = PIN(GPIO3, 8, GPIO_EMC_40, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_41 = PIN(GPIO3, 9, GPIO_EMC_41, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_00 = PIN(GPIO1, 0, GPIO_AD_B0_00, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_01 = PIN(GPIO1, 1, GPIO_AD_B0_01, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_02 = PIN(GPIO1, 2, GPIO_AD_B0_02, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_03 = PIN(GPIO1, 3, GPIO_AD_B0_03, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_04 = PIN(GPIO1, 4, GPIO_AD_B0_04, NO_ADC, 0, 0x00000000, 0x000090B1);
+const mcu_pin_obj_t pin_GPIO_AD_B0_05 = PIN(GPIO1, 5, GPIO_AD_B0_05, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_06 = PIN(GPIO1, 6, GPIO_AD_B0_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_07 = PIN(GPIO1, 7, GPIO_AD_B0_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_08 = PIN(GPIO1, 8, GPIO_AD_B0_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_09 = PIN(GPIO1, 9, GPIO_AD_B0_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_10 = PIN(GPIO1, 10, GPIO_AD_B0_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_11 = PIN(GPIO1, 11, GPIO_AD_B0_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, ADC2, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC2, 1, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC2, 2, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC1, 3, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC2, 3, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC1, 4, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC2, 4, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC2, 5, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC2, 6, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC2, 7, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_08 = PIN(GPIO1, 24, GPIO_AD_B1_08, ADC2, 8, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_09 = PIN(GPIO1, 25, GPIO_AD_B1_09, ADC2, 9, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC2, 10, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC2, 11, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_12 = PIN(GPIO1, 28, GPIO_AD_B1_12, ADC2, 12, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_13 = PIN(GPIO1, 29, GPIO_AD_B1_13, ADC2, 13, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_14 = PIN(GPIO1, 30, GPIO_AD_B1_14, ADC2, 14, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_15 = PIN(GPIO1, 31, GPIO_AD_B1_15, ADC2, 15, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_SD_B0_00 = PIN(GPIO3, 13, GPIO_SD_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_SD_B0_01 = PIN(GPIO3, 14, GPIO_SD_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_SD_B0_02 = PIN(GPIO3, 15, GPIO_SD_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
@@ -122,3 +123,6 @@ const mcu_pin_obj_t pin_GPIO_SD_B1_08 = PIN(GPIO3, 28, GPIO_SD_B1_08, NO_ADC, 0,
 const mcu_pin_obj_t pin_GPIO_SD_B1_09 = PIN(GPIO3, 29, GPIO_SD_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_SD_B1_10 = PIN(GPIO3, 30, GPIO_SD_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_SD_B1_11 = PIN(GPIO3, 31, GPIO_SD_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+
+const mcu_pin_obj_t pin_USB_OTG1_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG1_DP = { { &mcu_pin_type }, };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
index 4485b6e152..118eff9335 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
@@ -3,8 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
- * Copyright (c) 2020 Scott Shawcroft
+ * Copyright (c) 2023 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,107 +26,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PINS_H
-#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PINS_H
+#pragma once
 
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_00;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_01;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_02;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_03;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_04;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_05;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_06;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_07;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_08;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_09;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_10;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_11;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_12;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_13;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_14;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_15;
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
 
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_00;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_01;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_02;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_03;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_04;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_05;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_06;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_07;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_08;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_09;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_10;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_11;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_12;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_13;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_14;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_15;
-
-extern const mcu_pin_obj_t pin_GPIO_EMC_00;
-extern const mcu_pin_obj_t pin_GPIO_EMC_01;
-extern const mcu_pin_obj_t pin_GPIO_EMC_02;
-extern const mcu_pin_obj_t pin_GPIO_EMC_03;
-extern const mcu_pin_obj_t pin_GPIO_EMC_04;
-extern const mcu_pin_obj_t pin_GPIO_EMC_05;
-extern const mcu_pin_obj_t pin_GPIO_EMC_06;
-extern const mcu_pin_obj_t pin_GPIO_EMC_07;
-extern const mcu_pin_obj_t pin_GPIO_EMC_08;
-extern const mcu_pin_obj_t pin_GPIO_EMC_09;
-extern const mcu_pin_obj_t pin_GPIO_EMC_10;
-extern const mcu_pin_obj_t pin_GPIO_EMC_11;
-extern const mcu_pin_obj_t pin_GPIO_EMC_12;
-extern const mcu_pin_obj_t pin_GPIO_EMC_13;
-extern const mcu_pin_obj_t pin_GPIO_EMC_14;
-extern const mcu_pin_obj_t pin_GPIO_EMC_15;
-extern const mcu_pin_obj_t pin_GPIO_EMC_16;
-extern const mcu_pin_obj_t pin_GPIO_EMC_17;
-extern const mcu_pin_obj_t pin_GPIO_EMC_18;
-extern const mcu_pin_obj_t pin_GPIO_EMC_19;
-extern const mcu_pin_obj_t pin_GPIO_EMC_20;
-extern const mcu_pin_obj_t pin_GPIO_EMC_21;
-extern const mcu_pin_obj_t pin_GPIO_EMC_22;
-extern const mcu_pin_obj_t pin_GPIO_EMC_23;
-extern const mcu_pin_obj_t pin_GPIO_EMC_24;
-extern const mcu_pin_obj_t pin_GPIO_EMC_25;
-extern const mcu_pin_obj_t pin_GPIO_EMC_26;
-extern const mcu_pin_obj_t pin_GPIO_EMC_27;
-extern const mcu_pin_obj_t pin_GPIO_EMC_28;
-extern const mcu_pin_obj_t pin_GPIO_EMC_29;
-extern const mcu_pin_obj_t pin_GPIO_EMC_30;
-extern const mcu_pin_obj_t pin_GPIO_EMC_31;
-extern const mcu_pin_obj_t pin_GPIO_EMC_32;
-extern const mcu_pin_obj_t pin_GPIO_EMC_33;
-extern const mcu_pin_obj_t pin_GPIO_EMC_34;
-extern const mcu_pin_obj_t pin_GPIO_EMC_35;
-extern const mcu_pin_obj_t pin_GPIO_EMC_36;
-extern const mcu_pin_obj_t pin_GPIO_EMC_37;
-extern const mcu_pin_obj_t pin_GPIO_EMC_38;
-extern const mcu_pin_obj_t pin_GPIO_EMC_39;
-extern const mcu_pin_obj_t pin_GPIO_EMC_40;
-extern const mcu_pin_obj_t pin_GPIO_EMC_41;
-
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_00;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_01;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_02;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_03;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_04;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_05;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_06;
-
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_00;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_01;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_02;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_03;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_04;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_05;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_06;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_07;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_08;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_09;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_10;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_11;
-
-extern const mcu_pin_obj_t mcu_pin_list[IOMUXC_SW_PAD_CTL_PAD_COUNT];
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PINS_H
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c
new file mode 100644
index 0000000000..f62f974bdd
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c
@@ -0,0 +1,382 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ */
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "mpconfigport.h"
+
+#include "fsl_clock.h"
+#include "fsl_iomuxc.h"
+#include "fsl_device_registers.h"
+
+#include "board.h"
+
+#include "clocks.h"
+
+#define BOARD_XTAL0_CLK_HZ                         24000000U  /*!< Board xtal0 frequency in Hz */
+#define BOARD_XTAL32K_CLK_HZ                          32768U  /*!< Board xtal32k frequency in Hz */
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK             528000000U  /*!< Core clock frequency: 528000000Hz */
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 100,                           /* PLL loop divider, Fout = Fin * 50 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 1,                             /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 0,                             /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_video_pll_config_t videoPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 31,                            /* PLL loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .postDivider = 8,                             /* Divider after PLL */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void clocks_init(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    CLOCK_DisableClock(kCLOCK_Xbar3);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 1);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 1);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 3);
+    #endif
+    /* Disable Flexspi2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi2);
+    /* Set FLEXSPI2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexspi2Div, 1);
+    /* Set Flexspi2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexspi2Mux, 1);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 3);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 0);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable LCDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_LcdPixel);
+    /* Set LCDIF_PRED. */
+    CLOCK_SetDiv(kCLOCK_LcdifPreDiv, 1);
+    /* Set LCDIF_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_LcdifDiv, 3);
+    /* Set Lcdif pre clock source. */
+    CLOCK_SetMux(kCLOCK_LcdifPreMux, 5);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Disable Flexio2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio2);
+    /* Set FLEXIO2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio2PreDiv, 1);
+    /* Set FLEXIO2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio2Div, 7);
+    /* Set Flexio2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio2Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init ARM PLL. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    #if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+    #warning "SKIP_SYSCLK_INIT should be defined to keep system pll (selected to be SEMC source clock in SDK projects) unchanged."
+    #endif
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 24);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 16);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 33);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 19);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Video PLL. */
+    uint32_t pllVideo;
+    /* Disable Video PLL output before initial Video PLL. */
+    CCM_ANALOG->PLL_VIDEO &= ~CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* Bypass PLL first */
+    CCM_ANALOG->PLL_VIDEO = (CCM_ANALOG->PLL_VIDEO & (~CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC_MASK)) |
+        CCM_ANALOG_PLL_VIDEO_BYPASS_MASK | CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC(0);
+    CCM_ANALOG->PLL_VIDEO_NUM = CCM_ANALOG_PLL_VIDEO_NUM_A(0);
+    CCM_ANALOG->PLL_VIDEO_DENOM = CCM_ANALOG_PLL_VIDEO_DENOM_B(1);
+    pllVideo = (CCM_ANALOG->PLL_VIDEO & (~(CCM_ANALOG_PLL_VIDEO_DIV_SELECT_MASK | CCM_ANALOG_PLL_VIDEO_POWERDOWN_MASK))) |
+        CCM_ANALOG_PLL_VIDEO_ENABLE_MASK | CCM_ANALOG_PLL_VIDEO_DIV_SELECT(31);
+    pllVideo |= CCM_ANALOG_PLL_VIDEO_POST_DIV_SELECT(1);
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(3);
+    CCM_ANALOG->PLL_VIDEO = pllVideo;
+    while ((CCM_ANALOG->PLL_VIDEO & CCM_ANALOG_PLL_VIDEO_LOCK_MASK) == 0) {
+    }
+    /* Disable bypass for Video PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllVideo, 0);
+    /* DeInit Enet PLL. */
+    CLOCK_DeinitEnetPll();
+    /* Bypass Enet PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllEnet, 1);
+    /* Set Enet output divider. */
+    CCM_ANALOG->PLL_ENET = (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_DIV_SELECT(1);
+    /* Enable Enet output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENABLE_MASK;
+    /* Enable Enet25M output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_MASK;
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 0);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set lvds1 clock source. */
+    CCM_ANALOG->MISC1 = (CCM_ANALOG->MISC1 & (~CCM_ANALOG_MISC1_LVDS1_CLK_SEL_MASK)) | CCM_ANALOG_MISC1_LVDS1_CLK_SEL(0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR,kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Ref clock source. */
+    IOMUXC_GPR->GPR1 &= ~IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK;
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
new file mode 100644
index 0000000000..bbd41e7007
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
@@ -0,0 +1,356 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/periph.h"
+
+LPI2C_Type *const mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
+
+const mcu_periph_obj_t mcu_i2c_sda_list[9] = {
+    PERIPH_PIN(1, 2, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 0, &pin_GPIO_SD_B1_05),
+    PERIPH_PIN(1, 3, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 1, &pin_GPIO_AD_B1_01),
+
+    PERIPH_PIN(2, 3, kIOMUXC_LPI2C2_SDA_SELECT_INPUT, 0, &pin_GPIO_SD_B1_10),
+    PERIPH_PIN(2, 2, kIOMUXC_LPI2C2_SDA_SELECT_INPUT, 1, &pin_GPIO_B0_05),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 0, &pin_GPIO_EMC_21),
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 1, &pin_GPIO_SD_B0_01),
+    PERIPH_PIN(3, 1, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 2, &pin_GPIO_AD_B1_06),
+
+    PERIPH_PIN(4, 2, kIOMUXC_LPI2C4_SDA_SELECT_INPUT, 0, &pin_GPIO_EMC_11),
+    PERIPH_PIN(4, 0, kIOMUXC_LPI2C4_SDA_SELECT_INPUT, 1, &pin_GPIO_AD_B0_13),
+};
+
+const mcu_periph_obj_t mcu_i2c_scl_list[9] = {
+    PERIPH_PIN(1, 2, kIOMUXC_LPI2C1_SCL_SELECT_INPUT, 0, &pin_GPIO_SD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_LPI2C1_SCL_SELECT_INPUT, 1, &pin_GPIO_AD_B1_00),
+
+    PERIPH_PIN(2, 3, kIOMUXC_LPI2C2_SCL_SELECT_INPUT, 0, &pin_GPIO_SD_B1_11),
+    PERIPH_PIN(2, 2, kIOMUXC_LPI2C2_SCL_SELECT_INPUT, 1, &pin_GPIO_B0_04),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 0, &pin_GPIO_EMC_22),
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 1, &pin_GPIO_SD_B0_00),
+    PERIPH_PIN(3, 1, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 2, &pin_GPIO_AD_B1_07),
+
+    PERIPH_PIN(4, 2, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 0, &pin_GPIO_EMC_12),
+    PERIPH_PIN(4, 0, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 1, &pin_GPIO_AD_B0_12),
+};
+
+LPSPI_Type *const mcu_spi_banks[3] = { LPSPI1, LPSPI2, LPSPI3 };
+
+const mcu_periph_obj_t mcu_spi_sck_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 0, &pin_GPIO_EMC_27),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 1, &pin_GPIO_SD_B0_00),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_07),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 1, &pin_GPIO_EMC_00),
+
+    PERIPH_PIN(3, 3, kIOMUXC_LPSPI3_SCK_SELECT_INPUT, 0, &pin_GPIO_B0_03),
+    PERIPH_PIN(3, 1, kIOMUXC_LPSPI3_SCK_SELECT_INPUT, 1, &pin_GPIO_B1_07),
+};
+
+const mcu_periph_obj_t mcu_spi_sdo_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 0, &pin_GPIO_EMC_28),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 1, &pin_GPIO_SD_B0_02),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 1, &pin_GPIO_EMC_02),
+
+    PERIPH_PIN(3, 3, kIOMUXC_LPSPI3_SDO_SELECT_INPUT, 0, &pin_GPIO_B0_02),
+    PERIPH_PIN(3, 1, kIOMUXC_LPSPI3_SDO_SELECT_INPUT, 1, &pin_GPIO_B1_06),
+};
+
+const mcu_periph_obj_t mcu_spi_sdi_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 0, &pin_GPIO_EMC_29),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 1, &pin_GPIO_SD_B0_03),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_03),
+
+    PERIPH_PIN(3, 3, kIOMUXC_LPSPI3_SDI_SELECT_INPUT, 0, &pin_GPIO_B0_01),
+    PERIPH_PIN(3, 1, kIOMUXC_LPSPI3_SDI_SELECT_INPUT, 1, &pin_GPIO_B1_05),
+};
+
+LPUART_Type *const mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
+
+const mcu_periph_obj_t mcu_uart_rx_list[16] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_13),
+
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_10),
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_RX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_03),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_RX_SELECT_INPUT, 0, &pin_GPIO_AD_B1_07),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 3, kIOMUXC_LPUART3_RX_SELECT_INPUT, 2, &pin_GPIO_B0_09),
+
+    PERIPH_PIN(4, 4, kIOMUXC_LPUART4_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_01),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_20),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_RX_SELECT_INPUT, 2, &pin_GPIO_B1_01),
+
+    PERIPH_PIN(5, 2, kIOMUXC_LPUART5_RX_SELECT_INPUT, 0, &pin_GPIO_EMC_24),
+    PERIPH_PIN(5, 1, kIOMUXC_LPUART5_RX_SELECT_INPUT, 1, &pin_GPIO_B1_13),
+
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_RX_SELECT_INPUT, 0, &pin_GPIO_EMC_26),
+
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_32),
+
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B0_05),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_RX_SELECT_INPUT, 2, &pin_GPIO_EMC_39),
+};
+
+const mcu_periph_obj_t mcu_uart_tx_list[16] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_12),
+
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_11),
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_TX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_02),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_TX_SELECT_INPUT, 0, &pin_GPIO_AD_B1_06),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 3, kIOMUXC_LPUART3_TX_SELECT_INPUT, 2, &pin_GPIO_B0_08),
+
+    PERIPH_PIN(4, 4, kIOMUXC_LPUART4_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_00),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_19),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_TX_SELECT_INPUT, 2, &pin_GPIO_B1_00),
+
+    PERIPH_PIN(5, 2, kIOMUXC_LPUART5_TX_SELECT_INPUT, 0, &pin_GPIO_EMC_23),
+    PERIPH_PIN(5, 1, kIOMUXC_LPUART5_TX_SELECT_INPUT, 1, &pin_GPIO_B1_12),
+
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_TX_SELECT_INPUT, 0, &pin_GPIO_EMC_25),
+
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_31),
+
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B0_04),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_TX_SELECT_INPUT, 2, &pin_GPIO_EMC_38),
+};
+
+const mcu_periph_obj_t mcu_uart_rts_list[9] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_15),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_01),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_05),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_18),
+
+    PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_27),
+
+    PERIPH_PIN(6, 2, 0, 0, &pin_GPIO_EMC_29),
+
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_SD_B1_07),
+
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_SD_B0_03),
+};
+
+const mcu_periph_obj_t mcu_uart_cts_list[9] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_14),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_00),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_CTS_B_SELECT_INPUT, 0, &pin_GPIO_EMC_15),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_CTS_B_SELECT_INPUT, 1, &pin_GPIO_AD_B1_04),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_17),
+
+    PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_28),
+
+    PERIPH_PIN(6, 2, 0, 0, &pin_GPIO_EMC_30),
+
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_SD_B1_06),
+
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_SD_B0_02),
+};
+
+I2S_Type *const mcu_i2s_banks[3] = { SAI1, SAI2, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_SD_B1_06),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 2, &pin_GPIO_B1_00),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_EMC_08),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B0_08),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B0_14),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_09),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_07),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_05),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 2, &pin_GPIO_B1_02),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B0_05),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_03),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[6] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_01),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_07),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_09),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_36),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_01),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B1_03),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_05),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_04),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_02),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_05),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_01),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_04),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_00),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[61] = {
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_23_FLEXPWM1_PWMA00, &pin_GPIO_EMC_23),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_SD_B0_00_FLEXPWM1_PWMA00, &pin_GPIO_SD_B0_00),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_24_FLEXPWM1_PWMB00, &pin_GPIO_EMC_24),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_SD_B0_01_FLEXPWM1_PWMB00, &pin_GPIO_SD_B0_01),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_25_FLEXPWM1_PWMA01, &pin_GPIO_EMC_25),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_SD_B0_02_FLEXPWM1_PWMA01, &pin_GPIO_SD_B0_02),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_26_FLEXPWM1_PWMB01, &pin_GPIO_EMC_26),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_SD_B0_03_FLEXPWM1_PWMB01, &pin_GPIO_SD_B0_03),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_27_FLEXPWM1_PWMA02, &pin_GPIO_EMC_27),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_SD_B0_04_FLEXPWM1_PWMA02, &pin_GPIO_SD_B0_04),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_28_FLEXPWM1_PWMB02, &pin_GPIO_EMC_28),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_SD_B0_05_FLEXPWM1_PWMB02, &pin_GPIO_SD_B0_05),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_B0_12_FLEXPWM1_PWMX02, &pin_GPIO_AD_B0_12),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_12_FLEXPWM1_PWMA03, &pin_GPIO_EMC_12),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_38_FLEXPWM1_PWMA03, &pin_GPIO_EMC_38),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM1_PWMA03, &pin_GPIO_AD_B0_10),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_00_FLEXPWM1_PWMA03, &pin_GPIO_B1_00),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_00_FLEXPWM1_PWMA03, &pin_GPIO_SD_B1_00),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_13_FLEXPWM1_PWMB03, &pin_GPIO_EMC_13),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_39_FLEXPWM1_PWMB03, &pin_GPIO_EMC_39),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_11_FLEXPWM1_PWMB03, &pin_GPIO_AD_B0_11),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_01_FLEXPWM1_PWMB03, &pin_GPIO_B1_01),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_01_FLEXPWM1_PWMB03, &pin_GPIO_SD_B1_01),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_B0_13_FLEXPWM1_PWMX03, &pin_GPIO_AD_B0_13),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_06_FLEXPWM2_PWMA00, &pin_GPIO_EMC_06),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_B0_06_FLEXPWM2_PWMA00, &pin_GPIO_B0_06),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_07_FLEXPWM2_PWMB00, &pin_GPIO_EMC_07),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_B0_07_FLEXPWM2_PWMB00, &pin_GPIO_B0_07),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_08_FLEXPWM2_PWMA01, &pin_GPIO_EMC_08),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_B0_08_FLEXPWM2_PWMA01, &pin_GPIO_B0_08),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_09_FLEXPWM2_PWMB01, &pin_GPIO_EMC_09),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_B0_09_FLEXPWM2_PWMB01, &pin_GPIO_B0_09),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_10_FLEXPWM2_PWMA02, &pin_GPIO_EMC_10),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B0_10_FLEXPWM2_PWMA02, &pin_GPIO_B0_10),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_11_FLEXPWM2_PWMB02, &pin_GPIO_EMC_11),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_B0_11_FLEXPWM2_PWMB02, &pin_GPIO_B0_11),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_19_FLEXPWM2_PWMA03, &pin_GPIO_EMC_19),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_09_FLEXPWM2_PWMA03, &pin_GPIO_AD_B0_09),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_02_FLEXPWM2_PWMA03, &pin_GPIO_B1_02),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_02_FLEXPWM2_PWMA03, &pin_GPIO_SD_B1_02),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_20_FLEXPWM2_PWMB03, &pin_GPIO_EMC_20),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_03_FLEXPWM2_PWMB03, &pin_GPIO_B1_03),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_03_FLEXPWM2_PWMB03, &pin_GPIO_SD_B1_03),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_29_FLEXPWM3_PWMA00, &pin_GPIO_EMC_29),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_30_FLEXPWM3_PWMB00, &pin_GPIO_EMC_30),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_31_FLEXPWM3_PWMA01, &pin_GPIO_EMC_31),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_32_FLEXPWM3_PWMB01, &pin_GPIO_EMC_32),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_33_FLEXPWM3_PWMA02, &pin_GPIO_EMC_33),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_34_FLEXPWM3_PWMB02, &pin_GPIO_EMC_34),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_21_FLEXPWM3_PWMA03, &pin_GPIO_EMC_21),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_22_FLEXPWM3_PWMB03, &pin_GPIO_EMC_22),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_00_FLEXPWM4_PWMA00, &pin_GPIO_EMC_00),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_01_FLEXPWM4_PWMB00, &pin_GPIO_EMC_01),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_02_FLEXPWM4_PWMA01, &pin_GPIO_EMC_02),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_03_FLEXPWM4_PWMB01, &pin_GPIO_EMC_03),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_04_FLEXPWM4_PWMA02, &pin_GPIO_EMC_04),
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B1_14_FLEXPWM4_PWMA02, &pin_GPIO_B1_14),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_05_FLEXPWM4_PWMB02, &pin_GPIO_EMC_05),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_17_FLEXPWM4_PWMA03, &pin_GPIO_EMC_17),
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_15_FLEXPWM4_PWMA03, &pin_GPIO_B1_15),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_18_FLEXPWM4_PWMB03, &pin_GPIO_EMC_18),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
new file mode 100644
index 0000000000..69a15dc50c
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+extern LPI2C_Type *const mcu_i2c_banks[4];
+extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
+extern const mcu_periph_obj_t mcu_i2c_scl_list[9];
+
+extern LPSPI_Type *const mcu_spi_banks[3];
+extern const mcu_periph_obj_t mcu_spi_sck_list[6];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[6];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[6];
+
+extern LPUART_Type *const mcu_uart_banks[8];
+extern const mcu_periph_obj_t mcu_uart_rx_list[16];
+extern const mcu_periph_obj_t mcu_uart_tx_list[16];
+extern const mcu_periph_obj_t mcu_uart_rts_list[9];
+extern const mcu_periph_obj_t mcu_uart_cts_list[9];
+
+extern I2S_Type *const mcu_i2s_banks[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[6];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[6];
+
+extern const mcu_periph_obj_t mcu_mqs_left_list[3];
+extern const mcu_periph_obj_t mcu_mqs_right_list[3];
+
+extern const mcu_pwm_obj_t mcu_pwm_list[61];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pin_names.h
new file mode 100644
index 0000000000..05b3110bf3
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pin_names.h
@@ -0,0 +1,151 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_00)
+FORMAT_PIN(GPIO_EMC_01)
+FORMAT_PIN(GPIO_EMC_02)
+FORMAT_PIN(GPIO_EMC_03)
+FORMAT_PIN(GPIO_EMC_04)
+FORMAT_PIN(GPIO_EMC_05)
+FORMAT_PIN(GPIO_EMC_06)
+FORMAT_PIN(GPIO_EMC_07)
+FORMAT_PIN(GPIO_EMC_08)
+FORMAT_PIN(GPIO_EMC_09)
+FORMAT_PIN(GPIO_EMC_10)
+FORMAT_PIN(GPIO_EMC_11)
+FORMAT_PIN(GPIO_EMC_12)
+FORMAT_PIN(GPIO_EMC_13)
+FORMAT_PIN(GPIO_EMC_14)
+FORMAT_PIN(GPIO_EMC_15)
+FORMAT_PIN(GPIO_EMC_16)
+FORMAT_PIN(GPIO_EMC_17)
+FORMAT_PIN(GPIO_EMC_18)
+FORMAT_PIN(GPIO_EMC_19)
+FORMAT_PIN(GPIO_EMC_20)
+FORMAT_PIN(GPIO_EMC_21)
+FORMAT_PIN(GPIO_EMC_22)
+FORMAT_PIN(GPIO_EMC_23)
+FORMAT_PIN(GPIO_EMC_24)
+FORMAT_PIN(GPIO_EMC_25)
+FORMAT_PIN(GPIO_EMC_26)
+FORMAT_PIN(GPIO_EMC_27)
+FORMAT_PIN(GPIO_EMC_28)
+FORMAT_PIN(GPIO_EMC_29)
+FORMAT_PIN(GPIO_EMC_30)
+FORMAT_PIN(GPIO_EMC_31)
+FORMAT_PIN(GPIO_EMC_32)
+FORMAT_PIN(GPIO_EMC_33)
+FORMAT_PIN(GPIO_EMC_34)
+FORMAT_PIN(GPIO_EMC_35)
+FORMAT_PIN(GPIO_EMC_36)
+FORMAT_PIN(GPIO_EMC_37)
+FORMAT_PIN(GPIO_EMC_38)
+FORMAT_PIN(GPIO_EMC_39)
+FORMAT_PIN(GPIO_EMC_40)
+FORMAT_PIN(GPIO_EMC_41)
+
+FORMAT_PIN(GPIO_AD_B0_04)
+FORMAT_PIN(GPIO_AD_B0_05)
+FORMAT_PIN(GPIO_AD_B0_06)
+FORMAT_PIN(GPIO_AD_B0_07)
+FORMAT_PIN(GPIO_AD_B0_08)
+FORMAT_PIN(GPIO_AD_B0_09)
+FORMAT_PIN(GPIO_AD_B0_10)
+FORMAT_PIN(GPIO_AD_B0_11)
+FORMAT_PIN(GPIO_AD_B0_12)
+FORMAT_PIN(GPIO_AD_B0_13)
+FORMAT_PIN(GPIO_AD_B0_14)
+FORMAT_PIN(GPIO_AD_B0_15)
+
+FORMAT_PIN(GPIO_AD_B1_00)
+FORMAT_PIN(GPIO_AD_B1_01)
+FORMAT_PIN(GPIO_AD_B1_02)
+FORMAT_PIN(GPIO_AD_B1_03)
+FORMAT_PIN(GPIO_AD_B1_04)
+FORMAT_PIN(GPIO_AD_B1_05)
+FORMAT_PIN(GPIO_AD_B1_06)
+FORMAT_PIN(GPIO_AD_B1_07)
+
+FORMAT_PIN(GPIO_B0_00)
+FORMAT_PIN(GPIO_B0_01)
+FORMAT_PIN(GPIO_B0_02)
+FORMAT_PIN(GPIO_B0_03)
+FORMAT_PIN(GPIO_B0_04)
+FORMAT_PIN(GPIO_B0_05)
+FORMAT_PIN(GPIO_B0_06)
+FORMAT_PIN(GPIO_B0_07)
+FORMAT_PIN(GPIO_B0_08)
+FORMAT_PIN(GPIO_B0_09)
+FORMAT_PIN(GPIO_B0_10)
+FORMAT_PIN(GPIO_B0_11)
+FORMAT_PIN(GPIO_B0_12)
+FORMAT_PIN(GPIO_B0_13)
+FORMAT_PIN(GPIO_B0_14)
+FORMAT_PIN(GPIO_B0_15)
+
+FORMAT_PIN(GPIO_B1_00)
+FORMAT_PIN(GPIO_B1_01)
+FORMAT_PIN(GPIO_B1_02)
+FORMAT_PIN(GPIO_B1_03)
+FORMAT_PIN(GPIO_B1_04)
+FORMAT_PIN(GPIO_B1_05)
+FORMAT_PIN(GPIO_B1_06)
+FORMAT_PIN(GPIO_B1_07)
+FORMAT_PIN(GPIO_B1_08)
+FORMAT_PIN(GPIO_B1_09)
+FORMAT_PIN(GPIO_B1_10)
+FORMAT_PIN(GPIO_B1_11)
+FORMAT_PIN(GPIO_B1_12)
+FORMAT_PIN(GPIO_B1_13)
+FORMAT_PIN(GPIO_B1_14)
+FORMAT_PIN(GPIO_B1_15)
+
+FORMAT_PIN(GPIO_SD_B0_00)
+FORMAT_PIN(GPIO_SD_B0_01)
+FORMAT_PIN(GPIO_SD_B0_02)
+FORMAT_PIN(GPIO_SD_B0_03)
+FORMAT_PIN(GPIO_SD_B0_04)
+FORMAT_PIN(GPIO_SD_B0_05)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+FORMAT_PIN(GPIO_SD_B1_06)
+FORMAT_PIN(GPIO_SD_B1_07)
+FORMAT_PIN(GPIO_SD_B1_08)
+FORMAT_PIN(GPIO_SD_B1_09)
+FORMAT_PIN(GPIO_SD_B1_10)
+FORMAT_PIN(GPIO_SD_B1_11)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
new file mode 100644
index 0000000000..64d35c2d67
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
@@ -0,0 +1,147 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/pins.h"
+
+const mcu_pin_obj_t pin_GPIO_EMC_00 = PIN(GPIO4, 0, GPIO_EMC_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_01 = PIN(GPIO4, 1, GPIO_EMC_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_02 = PIN(GPIO4, 2, GPIO_EMC_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_03 = PIN(GPIO4, 3, GPIO_EMC_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_04 = PIN(GPIO4, 4, GPIO_EMC_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_05 = PIN(GPIO4, 5, GPIO_EMC_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_06 = PIN(GPIO4, 6, GPIO_EMC_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_07 = PIN(GPIO4, 7, GPIO_EMC_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_08 = PIN(GPIO4, 8, GPIO_EMC_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_09 = PIN(GPIO4, 9, GPIO_EMC_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_10 = PIN(GPIO4, 10, GPIO_EMC_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_11 = PIN(GPIO4, 11, GPIO_EMC_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_12 = PIN(GPIO4, 12, GPIO_EMC_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_13 = PIN(GPIO4, 13, GPIO_EMC_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_14 = PIN(GPIO4, 14, GPIO_EMC_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_15 = PIN(GPIO4, 15, GPIO_EMC_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_16 = PIN(GPIO4, 16, GPIO_EMC_16, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_17 = PIN(GPIO4, 17, GPIO_EMC_17, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_18 = PIN(GPIO4, 18, GPIO_EMC_18, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_19 = PIN(GPIO4, 19, GPIO_EMC_19, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_20 = PIN(GPIO4, 20, GPIO_EMC_20, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_21 = PIN(GPIO4, 21, GPIO_EMC_21, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_22 = PIN(GPIO4, 22, GPIO_EMC_22, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_23 = PIN(GPIO4, 23, GPIO_EMC_23, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_24 = PIN(GPIO4, 24, GPIO_EMC_24, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_25 = PIN(GPIO4, 25, GPIO_EMC_25, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_26 = PIN(GPIO4, 26, GPIO_EMC_26, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_27 = PIN(GPIO4, 27, GPIO_EMC_27, NO_ADC, 0, 0x00000005, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_EMC_28 = PIN(GPIO4, 28, GPIO_EMC_28, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_29 = PIN(GPIO4, 29, GPIO_EMC_29, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_30 = PIN(GPIO4, 30, GPIO_EMC_30, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_31 = PIN(GPIO4, 31, GPIO_EMC_31, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_32 = PIN(GPIO3, 18, GPIO_EMC_32, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_33 = PIN(GPIO3, 19, GPIO_EMC_33, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_34 = PIN(GPIO3, 20, GPIO_EMC_34, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_35 = PIN(GPIO3, 21, GPIO_EMC_35, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_36 = PIN(GPIO3, 22, GPIO_EMC_36, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_37 = PIN(GPIO3, 23, GPIO_EMC_37, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_38 = PIN(GPIO3, 24, GPIO_EMC_38, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_39 = PIN(GPIO3, 25, GPIO_EMC_39, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_40 = PIN(GPIO3, 26, GPIO_EMC_40, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_41 = PIN(GPIO3, 27, GPIO_EMC_41, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_04 = PIN(GPIO1, 4, GPIO_AD_B0_04, NO_ADC, 0, 0x00000000, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_05 = PIN(GPIO1, 5, GPIO_AD_B0_05, NO_ADC, 0, 0x00000000, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_06 = PIN(GPIO1, 6, GPIO_AD_B0_06, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_07 = PIN(GPIO1, 7, GPIO_AD_B0_07, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_08 = PIN(GPIO1, 8, GPIO_AD_B0_08, NO_ADC, 0, 0x00000000, 0x000030A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_09 = PIN(GPIO1, 9, GPIO_AD_B0_09, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_10 = PIN(GPIO1, 10, GPIO_AD_B0_10, NO_ADC, 0, 0x00000000, 0x000090B1);
+const mcu_pin_obj_t pin_GPIO_AD_B0_11 = PIN(GPIO1, 11, GPIO_AD_B0_11, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 1, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, ADC1, 2, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC1, 3, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC1, 4, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, ADC2, 5, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC2, 6, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC2, 7, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC2, 8, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC2, 9, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC2, 10, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC2, 11, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC2, 12, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_00 = PIN(GPIO2, 0, GPIO_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_01 = PIN(GPIO2, 1, GPIO_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_02 = PIN(GPIO2, 2, GPIO_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_03 = PIN(GPIO2, 3, GPIO_B0_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_04 = PIN(GPIO2, 4, GPIO_B0_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_05 = PIN(GPIO2, 5, GPIO_B0_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_06 = PIN(GPIO2, 6, GPIO_B0_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_07 = PIN(GPIO2, 7, GPIO_B0_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_08 = PIN(GPIO2, 8, GPIO_B0_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_09 = PIN(GPIO2, 9, GPIO_B0_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_10 = PIN(GPIO2, 10, GPIO_B0_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_11 = PIN(GPIO2, 11, GPIO_B0_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_12 = PIN(GPIO2, 12, GPIO_B0_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_13 = PIN(GPIO2, 13, GPIO_B0_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_14 = PIN(GPIO2, 14, GPIO_B0_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_15 = PIN(GPIO2, 15, GPIO_B0_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_00 = PIN(GPIO2, 16, GPIO_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_01 = PIN(GPIO2, 17, GPIO_B1_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_02 = PIN(GPIO2, 18, GPIO_B1_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_03 = PIN(GPIO2, 19, GPIO_B1_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_04 = PIN(GPIO2, 20, GPIO_B1_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_05 = PIN(GPIO2, 21, GPIO_B1_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_06 = PIN(GPIO2, 22, GPIO_B1_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_07 = PIN(GPIO2, 23, GPIO_B1_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_08 = PIN(GPIO2, 24, GPIO_B1_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_09 = PIN(GPIO2, 25, GPIO_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_10 = PIN(GPIO2, 26, GPIO_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_11 = PIN(GPIO2, 27, GPIO_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_12 = PIN(GPIO2, 28, GPIO_B1_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_13 = PIN(GPIO2, 29, GPIO_B1_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_14 = PIN(GPIO2, 30, GPIO_B1_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_15 = PIN(GPIO2, 31, GPIO_B1_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_00 = PIN(GPIO3, 12, GPIO_SD_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_01 = PIN(GPIO3, 13, GPIO_SD_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_02 = PIN(GPIO3, 14, GPIO_SD_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_03 = PIN(GPIO3, 15, GPIO_SD_B0_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_04 = PIN(GPIO3, 16, GPIO_SD_B0_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_05 = PIN(GPIO3, 17, GPIO_SD_B0_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_00 = PIN(GPIO3, 0, GPIO_SD_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_01 = PIN(GPIO3, 1, GPIO_SD_B1_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_02 = PIN(GPIO3, 2, GPIO_SD_B1_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_03 = PIN(GPIO3, 3, GPIO_SD_B1_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_04 = PIN(GPIO3, 4, GPIO_SD_B1_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_05 = PIN(GPIO3, 5, GPIO_SD_B1_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_06 = PIN(GPIO3, 6, GPIO_SD_B1_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_07 = PIN(GPIO3, 7, GPIO_SD_B1_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_08 = PIN(GPIO3, 8, GPIO_SD_B1_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_09 = PIN(GPIO3, 9, GPIO_SD_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_10 = PIN(GPIO3, 10, GPIO_SD_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_11 = PIN(GPIO3, 11, GPIO_SD_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+
+const mcu_pin_obj_t pin_USB_OTG1_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG1_DP = { { &mcu_pin_type }, };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
new file mode 100644
index 0000000000..118eff9335
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
+
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c
new file mode 100644
index 0000000000..832ad9afac
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c
@@ -0,0 +1,402 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ */
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "mpconfigport.h"
+
+#include "fsl_clock.h"
+#include "fsl_iomuxc.h"
+#include "fsl_device_registers.h"
+
+#include "board.h"
+
+#include "clocks.h"
+
+#define BOARD_XTAL0_CLK_HZ                         24000000U  /*!< Board xtal0 frequency in Hz */
+#define BOARD_XTAL32K_CLK_HZ                          32768U  /*!< Board xtal32k frequency in Hz */
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK             600000000U  /*!< Core clock frequency: 600000000Hz */
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 100,                           /* PLL loop divider, Fout = Fin * 50 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 1,                             /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 0,                             /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_video_pll_config_t videoPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 31,                            /* PLL loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .postDivider = 8,                             /* Divider after PLL */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void clocks_init(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.275V. It is necessary to config AHB to 600Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x13);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    CLOCK_DisableClock(kCLOCK_Xbar3);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 1);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    #error "whoops"
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 2);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 1);
+    #endif
+    /* Disable CSI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Csi);
+    /* Set CSI_PODF. */
+    CLOCK_SetDiv(kCLOCK_CsiDiv, 1);
+    /* Set Csi clock source. */
+    CLOCK_SetMux(kCLOCK_CsiMux, 0);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    CLOCK_DisableClock(kCLOCK_Lpspi4);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 3);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 0);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable LCDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_LcdPixel);
+    /* Set LCDIF_PRED. */
+    CLOCK_SetDiv(kCLOCK_LcdifPreDiv, 1);
+    /* Set LCDIF_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_LcdifDiv, 3);
+    /* Set Lcdif pre clock source. */
+    CLOCK_SetMux(kCLOCK_LcdifPreMux, 5);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Disable Flexio2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio2);
+    /* Set FLEXIO2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio2PreDiv, 1);
+    /* Set FLEXIO2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio2Div, 7);
+    /* Set Flexio2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio2Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init ARM PLL. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    #if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+    #warning "SKIP_SYSCLK_INIT should be defined to keep system pll (selected to be SEMC source clock in SDK projects) unchanged."
+    #endif
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 24);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 16);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 33);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 19);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Video PLL. */
+    uint32_t pllVideo;
+    /* Disable Video PLL output before initial Video PLL. */
+    CCM_ANALOG->PLL_VIDEO &= ~CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* Bypass PLL first */
+    CCM_ANALOG->PLL_VIDEO = (CCM_ANALOG->PLL_VIDEO & (~CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC_MASK)) |
+        CCM_ANALOG_PLL_VIDEO_BYPASS_MASK | CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC(0);
+    CCM_ANALOG->PLL_VIDEO_NUM = CCM_ANALOG_PLL_VIDEO_NUM_A(0);
+    CCM_ANALOG->PLL_VIDEO_DENOM = CCM_ANALOG_PLL_VIDEO_DENOM_B(1);
+    pllVideo = (CCM_ANALOG->PLL_VIDEO & (~(CCM_ANALOG_PLL_VIDEO_DIV_SELECT_MASK | CCM_ANALOG_PLL_VIDEO_POWERDOWN_MASK))) |
+        CCM_ANALOG_PLL_VIDEO_ENABLE_MASK | CCM_ANALOG_PLL_VIDEO_DIV_SELECT(31);
+    pllVideo |= CCM_ANALOG_PLL_VIDEO_POST_DIV_SELECT(1);
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(3);
+    CCM_ANALOG->PLL_VIDEO = pllVideo;
+    while ((CCM_ANALOG->PLL_VIDEO & CCM_ANALOG_PLL_VIDEO_LOCK_MASK) == 0) {
+    }
+    /* Disable bypass for Video PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllVideo, 0);
+    /* DeInit Enet PLL. */
+    CLOCK_DeinitEnetPll();
+    /* Bypass Enet PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllEnet, 1);
+    /* Set Enet output divider. */
+    CCM_ANALOG->PLL_ENET = (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_DIV_SELECT(1);
+    /* Enable Enet output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENABLE_MASK;
+    /* Enable Enet25M output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_MASK;
+    /* DeInit Usb2 PLL. */
+    CLOCK_DeinitUsb2Pll();
+    /* Bypass Usb2 PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllUsb2, 1);
+    /* Enable Usb2 PLL output. */
+    CCM_ANALOG->PLL_USB2 |= CCM_ANALOG_PLL_USB2_ENABLE_MASK;
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set lvds1 clock source. */
+    CCM_ANALOG->MISC1 = (CCM_ANALOG->MISC1 & (~CCM_ANALOG_MISC1_LVDS1_CLK_SEL_MASK)) | CCM_ANALOG_MISC1_LVDS1_CLK_SEL(0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR,kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Ref clock source. */
+    #if defined(IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK)
+    IOMUXC_GPR->GPR1 &= ~IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK;
+    #elif defined(IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK)
+    /* Backward compatibility for original bitfield name */
+    IOMUXC_GPR->GPR1 &= ~IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK;
+    #else
+    #error "Neither IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK nor IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK is defined."
+    #endif /* defined(IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK) */
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
new file mode 100644
index 0000000000..35b097f675
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
@@ -0,0 +1,377 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/periph.h"
+
+LPI2C_Type *const mcu_i2c_banks[4] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4 };
+
+const mcu_periph_obj_t mcu_i2c_sda_list[9] = {
+    PERIPH_PIN(1, 2, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 0, &pin_GPIO_SD_B1_05),
+    PERIPH_PIN(1, 3, kIOMUXC_LPI2C1_SDA_SELECT_INPUT, 1, &pin_GPIO_AD_B1_01),
+
+    PERIPH_PIN(2, 3, kIOMUXC_LPI2C2_SDA_SELECT_INPUT, 0, &pin_GPIO_SD_B1_10),
+    PERIPH_PIN(2, 2, kIOMUXC_LPI2C2_SDA_SELECT_INPUT, 1, &pin_GPIO_B0_05),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 0, &pin_GPIO_EMC_21),
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 1, &pin_GPIO_SD_B0_01),
+    PERIPH_PIN(3, 1, kIOMUXC_LPI2C3_SDA_SELECT_INPUT, 2, &pin_GPIO_AD_B1_06),
+
+    PERIPH_PIN(4, 2, kIOMUXC_LPI2C4_SDA_SELECT_INPUT, 0, &pin_GPIO_EMC_11),
+    PERIPH_PIN(4, 0, kIOMUXC_LPI2C4_SDA_SELECT_INPUT, 1, &pin_GPIO_AD_B0_13),
+};
+
+const mcu_periph_obj_t mcu_i2c_scl_list[9] = {
+    PERIPH_PIN(1, 2, kIOMUXC_LPI2C1_SCL_SELECT_INPUT, 0, &pin_GPIO_SD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_LPI2C1_SCL_SELECT_INPUT, 1, &pin_GPIO_AD_B1_00),
+
+    PERIPH_PIN(2, 3, kIOMUXC_LPI2C2_SCL_SELECT_INPUT, 0, &pin_GPIO_SD_B1_11),
+    PERIPH_PIN(2, 2, kIOMUXC_LPI2C2_SCL_SELECT_INPUT, 1, &pin_GPIO_B0_04),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 0, &pin_GPIO_EMC_22),
+    PERIPH_PIN(3, 2, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 1, &pin_GPIO_SD_B0_00),
+    PERIPH_PIN(3, 1, kIOMUXC_LPI2C3_SCL_SELECT_INPUT, 2, &pin_GPIO_AD_B1_07),
+
+    PERIPH_PIN(4, 2, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 0, &pin_GPIO_EMC_12),
+    PERIPH_PIN(4, 0, kIOMUXC_LPI2C4_SCL_SELECT_INPUT, 1, &pin_GPIO_AD_B0_12),
+};
+
+LPSPI_Type *const mcu_spi_banks[4] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4 };
+
+const mcu_periph_obj_t mcu_spi_sck_list[8] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 0, &pin_GPIO_EMC_27),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SCK_SELECT_INPUT, 1, &pin_GPIO_SD_B0_00),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_07),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SCK_SELECT_INPUT, 1, &pin_GPIO_EMC_00),
+
+    PERIPH_PIN(3, 7, kIOMUXC_LPSPI3_SCK_SELECT_INPUT, 0, &pin_GPIO_AD_B0_00),
+    PERIPH_PIN(3, 2, kIOMUXC_LPSPI3_SCK_SELECT_INPUT, 1, &pin_GPIO_AD_B1_15),
+
+    PERIPH_PIN(4, 3, kIOMUXC_LPSPI4_SCK_SELECT_INPUT, 0, &pin_GPIO_B0_03),
+    PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SCK_SELECT_INPUT, 1, &pin_GPIO_B1_07),
+};
+
+const mcu_periph_obj_t mcu_spi_sdo_list[8] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 0, &pin_GPIO_EMC_28),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 1, &pin_GPIO_SD_B0_02),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SDO_SELECT_INPUT, 1, &pin_GPIO_EMC_02),
+
+    PERIPH_PIN(3, 7, kIOMUXC_LPSPI3_SDO_SELECT_INPUT, 0, &pin_GPIO_AD_B0_01),
+    PERIPH_PIN(3, 2, kIOMUXC_LPSPI3_SDO_SELECT_INPUT, 1, &pin_GPIO_AD_B1_14),
+
+    PERIPH_PIN(4, 3, kIOMUXC_LPSPI4_SDO_SELECT_INPUT, 0, &pin_GPIO_B0_02),
+    PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SDO_SELECT_INPUT, 1, &pin_GPIO_B1_06),
+};
+
+const mcu_periph_obj_t mcu_spi_sdi_list[8] = {
+    PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 0, &pin_GPIO_EMC_29),
+    PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 1, &pin_GPIO_SD_B0_03),
+
+    PERIPH_PIN(2, 4, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(2, 2, kIOMUXC_LPSPI2_SDI_SELECT_INPUT, 1, &pin_GPIO_EMC_03),
+
+    PERIPH_PIN(3, 7, kIOMUXC_LPSPI3_SDI_SELECT_INPUT, 0, &pin_GPIO_AD_B0_02),
+    PERIPH_PIN(3, 2, kIOMUXC_LPSPI3_SDI_SELECT_INPUT, 1, &pin_GPIO_AD_B1_13),
+
+    PERIPH_PIN(4, 3, kIOMUXC_LPSPI4_SDI_SELECT_INPUT, 0, &pin_GPIO_B0_01),
+    PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SDI_SELECT_INPUT, 1, &pin_GPIO_B1_05),
+};
+
+LPUART_Type *const mcu_uart_banks[8] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8 };
+
+const mcu_periph_obj_t mcu_uart_rx_list[18] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_13),
+
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_10),
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_RX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_03),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_RX_SELECT_INPUT, 0, &pin_GPIO_AD_B1_07),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 3, kIOMUXC_LPUART3_RX_SELECT_INPUT, 2, &pin_GPIO_B0_09),
+
+    PERIPH_PIN(4, 4, kIOMUXC_LPUART4_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_01),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_20),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_RX_SELECT_INPUT, 2, &pin_GPIO_B1_01),
+
+    PERIPH_PIN(5, 2, kIOMUXC_LPUART5_RX_SELECT_INPUT, 0, &pin_GPIO_EMC_24),
+    PERIPH_PIN(5, 1, kIOMUXC_LPUART5_RX_SELECT_INPUT, 1, &pin_GPIO_B1_13),
+
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_RX_SELECT_INPUT, 0, &pin_GPIO_EMC_26),
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_RX_SELECT_INPUT, 1, &pin_GPIO_AD_B0_03),
+
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_RX_SELECT_INPUT, 1, &pin_GPIO_EMC_32),
+
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_RX_SELECT_INPUT, 0, &pin_GPIO_SD_B0_05),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_RX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_11),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_RX_SELECT_INPUT, 2, &pin_GPIO_EMC_39),
+};
+
+const mcu_periph_obj_t mcu_uart_tx_list[18] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_12),
+
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_11),
+    PERIPH_PIN(2, 2, kIOMUXC_LPUART2_TX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_02),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_TX_SELECT_INPUT, 0, &pin_GPIO_AD_B1_06),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 3, kIOMUXC_LPUART3_TX_SELECT_INPUT, 2, &pin_GPIO_B0_08),
+
+    PERIPH_PIN(4, 4, kIOMUXC_LPUART4_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_00),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_19),
+    PERIPH_PIN(4, 2, kIOMUXC_LPUART4_TX_SELECT_INPUT, 2, &pin_GPIO_B1_00),
+
+    PERIPH_PIN(5, 2, kIOMUXC_LPUART5_TX_SELECT_INPUT, 0, &pin_GPIO_EMC_23),
+    PERIPH_PIN(5, 1, kIOMUXC_LPUART5_TX_SELECT_INPUT, 1, &pin_GPIO_B1_12),
+
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_TX_SELECT_INPUT, 0, &pin_GPIO_EMC_25),
+    PERIPH_PIN(6, 2, kIOMUXC_LPUART6_TX_SELECT_INPUT, 1, &pin_GPIO_AD_B0_02),
+
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(7, 2, kIOMUXC_LPUART7_TX_SELECT_INPUT, 1, &pin_GPIO_EMC_31),
+
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_TX_SELECT_INPUT, 0, &pin_GPIO_SD_B0_04),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_TX_SELECT_INPUT, 1, &pin_GPIO_AD_B1_10),
+    PERIPH_PIN(8, 2, kIOMUXC_LPUART8_TX_SELECT_INPUT, 2, &pin_GPIO_EMC_38),
+};
+
+const mcu_periph_obj_t mcu_uart_rts_list[9] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_15),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_01),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_05),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_18),
+
+    PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_27),
+
+    PERIPH_PIN(6, 2, 0, 0, &pin_GPIO_EMC_29),
+
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_SD_B1_07),
+
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_SD_B0_03),
+};
+
+const mcu_periph_obj_t mcu_uart_cts_list[9] = {
+    PERIPH_PIN(1, 2, 0, 0, &pin_GPIO_AD_B0_14),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_00),
+
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_CTS_B_SELECT_INPUT, 0, &pin_GPIO_EMC_15),
+    PERIPH_PIN(3, 2, kIOMUXC_LPUART3_CTS_B_SELECT_INPUT, 1, &pin_GPIO_AD_B1_04),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_17),
+
+    PERIPH_PIN(5, 2, 0, 0, &pin_GPIO_EMC_28),
+
+    PERIPH_PIN(6, 2, 0, 0, &pin_GPIO_EMC_30),
+
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_SD_B1_06),
+
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_SD_B0_02),
+};
+
+I2S_Type *const mcu_i2s_banks[3] = { SAI1, SAI2, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_SD_B1_06),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B1_12),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 2, &pin_GPIO_B1_00),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_EMC_08),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B0_08),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B1_10),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B0_14),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_09),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_07),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B1_14),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 2, &pin_GPIO_B1_02),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B0_05),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[6] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_13),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_01),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_07),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_09),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_36),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[6] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B1_15),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B1_03),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_05),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_04),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_05),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_01),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_04),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_00),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[67] = {
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_23_FLEXPWM1_PWM0_A, &pin_GPIO_EMC_23),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_SD_B0_00_FLEXPWM1_PWM0_A, &pin_GPIO_SD_B0_00),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_24_FLEXPWM1_PWM0_B, &pin_GPIO_EMC_24),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_SD_B0_01_FLEXPWM1_PWM0_B, &pin_GPIO_SD_B0_01),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_B0_02_FLEXPWM1_PWM0_X, &pin_GPIO_AD_B0_02),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_25_FLEXPWM1_PWM1_A, &pin_GPIO_EMC_25),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_SD_B0_02_FLEXPWM1_PWM1_A, &pin_GPIO_SD_B0_02),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_26_FLEXPWM1_PWM1_B, &pin_GPIO_EMC_26),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_SD_B0_03_FLEXPWM1_PWM1_B, &pin_GPIO_SD_B0_03),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_B0_03_FLEXPWM1_PWM1_X, &pin_GPIO_AD_B0_03),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_27_FLEXPWM1_PWM2_A, &pin_GPIO_EMC_27),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_SD_B0_04_FLEXPWM1_PWM2_A, &pin_GPIO_SD_B0_04),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_28_FLEXPWM1_PWM2_B, &pin_GPIO_EMC_28),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_SD_B0_05_FLEXPWM1_PWM2_B, &pin_GPIO_SD_B0_05),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_B0_12_FLEXPWM1_PWM2_X, &pin_GPIO_AD_B0_12),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_12_FLEXPWM1_PWM3_A, &pin_GPIO_EMC_12),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_38_FLEXPWM1_PWM3_A, &pin_GPIO_EMC_38),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM1_PWM3_A, &pin_GPIO_AD_B0_10),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_00_FLEXPWM1_PWM3_A, &pin_GPIO_B1_00),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_00_FLEXPWM1_PWM3_A, &pin_GPIO_SD_B1_00),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_13_FLEXPWM1_PWM3_B, &pin_GPIO_EMC_13),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_39_FLEXPWM1_PWM3_B, &pin_GPIO_EMC_39),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_11_FLEXPWM1_PWM3_B, &pin_GPIO_AD_B0_11),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_01_FLEXPWM1_PWM3_B, &pin_GPIO_B1_01),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_01_FLEXPWM1_PWM3_B, &pin_GPIO_SD_B1_01),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_B0_13_FLEXPWM1_PWM3_X, &pin_GPIO_AD_B0_13),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_06_FLEXPWM2_PWM0_A, &pin_GPIO_EMC_06),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_B0_06_FLEXPWM2_PWM0_A, &pin_GPIO_B0_06),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_07_FLEXPWM2_PWM0_B, &pin_GPIO_EMC_07),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_B0_07_FLEXPWM2_PWM0_B, &pin_GPIO_B0_07),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_08_FLEXPWM2_PWM1_A, &pin_GPIO_EMC_08),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_B0_08_FLEXPWM2_PWM1_A, &pin_GPIO_B0_08),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_09_FLEXPWM2_PWM1_B, &pin_GPIO_EMC_09),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_B0_09_FLEXPWM2_PWM1_B, &pin_GPIO_B0_09),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_10_FLEXPWM2_PWM2_A, &pin_GPIO_EMC_10),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B0_10_FLEXPWM2_PWM2_A, &pin_GPIO_B0_10),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_11_FLEXPWM2_PWM2_B, &pin_GPIO_EMC_11),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_B0_11_FLEXPWM2_PWM2_B, &pin_GPIO_B0_11),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_19_FLEXPWM2_PWM3_A, &pin_GPIO_EMC_19),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_00_FLEXPWM2_PWM3_A, &pin_GPIO_AD_B0_00),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_09_FLEXPWM2_PWM3_A, &pin_GPIO_AD_B0_09),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_02_FLEXPWM2_PWM3_A, &pin_GPIO_B1_02),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_02_FLEXPWM2_PWM3_A, &pin_GPIO_SD_B1_02),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_20_FLEXPWM2_PWM3_B, &pin_GPIO_EMC_20),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_01_FLEXPWM2_PWM3_B, &pin_GPIO_AD_B0_01),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_03_FLEXPWM2_PWM3_B, &pin_GPIO_B1_03),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_03_FLEXPWM2_PWM3_B, &pin_GPIO_SD_B1_03),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_29_FLEXPWM3_PWM0_A, &pin_GPIO_EMC_29),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_30_FLEXPWM3_PWM0_B, &pin_GPIO_EMC_30),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_31_FLEXPWM3_PWM1_A, &pin_GPIO_EMC_31),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_32_FLEXPWM3_PWM1_B, &pin_GPIO_EMC_32),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_33_FLEXPWM3_PWM2_A, &pin_GPIO_EMC_33),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_34_FLEXPWM3_PWM2_B, &pin_GPIO_EMC_34),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_21_FLEXPWM3_PWM3_A, &pin_GPIO_EMC_21),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_22_FLEXPWM3_PWM3_B, &pin_GPIO_EMC_22),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_00_FLEXPWM4_PWM0_A, &pin_GPIO_EMC_00),
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_B1_08_FLEXPWM4_PWM0_A, &pin_GPIO_AD_B1_08),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_01_FLEXPWM4_PWM0_B, &pin_GPIO_EMC_01),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_02_FLEXPWM4_PWM1_A, &pin_GPIO_EMC_02),
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B1_09_FLEXPWM4_PWM1_A, &pin_GPIO_AD_B1_09),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_03_FLEXPWM4_PWM1_B, &pin_GPIO_EMC_03),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_04_FLEXPWM4_PWM2_A, &pin_GPIO_EMC_04),
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B1_14_FLEXPWM4_PWM2_A, &pin_GPIO_B1_14),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_05_FLEXPWM4_PWM2_B, &pin_GPIO_EMC_05),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_17_FLEXPWM4_PWM3_A, &pin_GPIO_EMC_17),
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_15_FLEXPWM4_PWM3_A, &pin_GPIO_B1_15),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_18_FLEXPWM4_PWM3_B, &pin_GPIO_EMC_18),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
new file mode 100644
index 0000000000..ae6566f974
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+extern LPI2C_Type *const mcu_i2c_banks[4];
+extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
+extern const mcu_periph_obj_t mcu_i2c_scl_list[9];
+
+extern LPSPI_Type *const mcu_spi_banks[4];
+extern const mcu_periph_obj_t mcu_spi_sck_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[8];
+
+extern LPUART_Type *const mcu_uart_banks[8];
+extern const mcu_periph_obj_t mcu_uart_rx_list[18];
+extern const mcu_periph_obj_t mcu_uart_tx_list[18];
+extern const mcu_periph_obj_t mcu_uart_rts_list[9];
+extern const mcu_periph_obj_t mcu_uart_cts_list[9];
+
+extern I2S_Type *const mcu_i2s_banks[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[6];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[6];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[6];
+
+extern const mcu_periph_obj_t mcu_mqs_left_list[3];
+extern const mcu_periph_obj_t mcu_mqs_right_list[3];
+
+extern const mcu_pwm_obj_t mcu_pwm_list[67];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pin_names.h
new file mode 100644
index 0000000000..4b9df709cf
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pin_names.h
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_00)
+FORMAT_PIN(GPIO_EMC_01)
+FORMAT_PIN(GPIO_EMC_02)
+FORMAT_PIN(GPIO_EMC_03)
+FORMAT_PIN(GPIO_EMC_04)
+FORMAT_PIN(GPIO_EMC_05)
+FORMAT_PIN(GPIO_EMC_06)
+FORMAT_PIN(GPIO_EMC_07)
+FORMAT_PIN(GPIO_EMC_08)
+FORMAT_PIN(GPIO_EMC_09)
+FORMAT_PIN(GPIO_EMC_10)
+FORMAT_PIN(GPIO_EMC_11)
+FORMAT_PIN(GPIO_EMC_12)
+FORMAT_PIN(GPIO_EMC_13)
+FORMAT_PIN(GPIO_EMC_14)
+FORMAT_PIN(GPIO_EMC_15)
+FORMAT_PIN(GPIO_EMC_16)
+FORMAT_PIN(GPIO_EMC_17)
+FORMAT_PIN(GPIO_EMC_18)
+FORMAT_PIN(GPIO_EMC_19)
+FORMAT_PIN(GPIO_EMC_20)
+FORMAT_PIN(GPIO_EMC_21)
+FORMAT_PIN(GPIO_EMC_22)
+FORMAT_PIN(GPIO_EMC_23)
+FORMAT_PIN(GPIO_EMC_24)
+FORMAT_PIN(GPIO_EMC_25)
+FORMAT_PIN(GPIO_EMC_26)
+FORMAT_PIN(GPIO_EMC_27)
+FORMAT_PIN(GPIO_EMC_28)
+FORMAT_PIN(GPIO_EMC_29)
+FORMAT_PIN(GPIO_EMC_30)
+FORMAT_PIN(GPIO_EMC_31)
+FORMAT_PIN(GPIO_EMC_32)
+FORMAT_PIN(GPIO_EMC_33)
+FORMAT_PIN(GPIO_EMC_34)
+FORMAT_PIN(GPIO_EMC_35)
+FORMAT_PIN(GPIO_EMC_36)
+FORMAT_PIN(GPIO_EMC_37)
+FORMAT_PIN(GPIO_EMC_38)
+FORMAT_PIN(GPIO_EMC_39)
+FORMAT_PIN(GPIO_EMC_40)
+FORMAT_PIN(GPIO_EMC_41)
+
+FORMAT_PIN(GPIO_AD_B0_00)
+FORMAT_PIN(GPIO_AD_B0_01)
+FORMAT_PIN(GPIO_AD_B0_02)
+FORMAT_PIN(GPIO_AD_B0_03)
+FORMAT_PIN(GPIO_AD_B0_04)
+FORMAT_PIN(GPIO_AD_B0_05)
+FORMAT_PIN(GPIO_AD_B0_06)
+FORMAT_PIN(GPIO_AD_B0_07)
+FORMAT_PIN(GPIO_AD_B0_08)
+FORMAT_PIN(GPIO_AD_B0_09)
+FORMAT_PIN(GPIO_AD_B0_10)
+FORMAT_PIN(GPIO_AD_B0_11)
+FORMAT_PIN(GPIO_AD_B0_12)
+FORMAT_PIN(GPIO_AD_B0_13)
+FORMAT_PIN(GPIO_AD_B0_14)
+FORMAT_PIN(GPIO_AD_B0_15)
+
+FORMAT_PIN(GPIO_AD_B1_00)
+FORMAT_PIN(GPIO_AD_B1_01)
+FORMAT_PIN(GPIO_AD_B1_02)
+FORMAT_PIN(GPIO_AD_B1_03)
+FORMAT_PIN(GPIO_AD_B1_04)
+FORMAT_PIN(GPIO_AD_B1_05)
+FORMAT_PIN(GPIO_AD_B1_06)
+FORMAT_PIN(GPIO_AD_B1_07)
+FORMAT_PIN(GPIO_AD_B1_08)
+FORMAT_PIN(GPIO_AD_B1_09)
+FORMAT_PIN(GPIO_AD_B1_10)
+FORMAT_PIN(GPIO_AD_B1_11)
+FORMAT_PIN(GPIO_AD_B1_12)
+FORMAT_PIN(GPIO_AD_B1_13)
+FORMAT_PIN(GPIO_AD_B1_14)
+FORMAT_PIN(GPIO_AD_B1_15)
+
+FORMAT_PIN(GPIO_B0_00)
+FORMAT_PIN(GPIO_B0_01)
+FORMAT_PIN(GPIO_B0_02)
+FORMAT_PIN(GPIO_B0_03)
+FORMAT_PIN(GPIO_B0_04)
+FORMAT_PIN(GPIO_B0_05)
+FORMAT_PIN(GPIO_B0_06)
+FORMAT_PIN(GPIO_B0_07)
+FORMAT_PIN(GPIO_B0_08)
+FORMAT_PIN(GPIO_B0_09)
+FORMAT_PIN(GPIO_B0_10)
+FORMAT_PIN(GPIO_B0_11)
+FORMAT_PIN(GPIO_B0_12)
+FORMAT_PIN(GPIO_B0_13)
+FORMAT_PIN(GPIO_B0_14)
+FORMAT_PIN(GPIO_B0_15)
+
+FORMAT_PIN(GPIO_B1_00)
+FORMAT_PIN(GPIO_B1_01)
+FORMAT_PIN(GPIO_B1_02)
+FORMAT_PIN(GPIO_B1_03)
+FORMAT_PIN(GPIO_B1_04)
+FORMAT_PIN(GPIO_B1_05)
+FORMAT_PIN(GPIO_B1_06)
+FORMAT_PIN(GPIO_B1_07)
+FORMAT_PIN(GPIO_B1_08)
+FORMAT_PIN(GPIO_B1_09)
+FORMAT_PIN(GPIO_B1_10)
+FORMAT_PIN(GPIO_B1_11)
+FORMAT_PIN(GPIO_B1_12)
+FORMAT_PIN(GPIO_B1_13)
+FORMAT_PIN(GPIO_B1_14)
+FORMAT_PIN(GPIO_B1_15)
+
+FORMAT_PIN(GPIO_SD_B0_00)
+FORMAT_PIN(GPIO_SD_B0_01)
+FORMAT_PIN(GPIO_SD_B0_02)
+FORMAT_PIN(GPIO_SD_B0_03)
+FORMAT_PIN(GPIO_SD_B0_04)
+FORMAT_PIN(GPIO_SD_B0_05)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+FORMAT_PIN(GPIO_SD_B1_06)
+FORMAT_PIN(GPIO_SD_B1_07)
+FORMAT_PIN(GPIO_SD_B1_08)
+FORMAT_PIN(GPIO_SD_B1_09)
+FORMAT_PIN(GPIO_SD_B1_10)
+FORMAT_PIN(GPIO_SD_B1_11)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
+FORMAT_PIN(USB_OTG2_DN)
+FORMAT_PIN(USB_OTG2_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
new file mode 100644
index 0000000000..83bbe18e42
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/pins.h"
+
+const mcu_pin_obj_t pin_GPIO_EMC_00 = PIN(GPIO4, 0, GPIO_EMC_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_01 = PIN(GPIO4, 1, GPIO_EMC_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_02 = PIN(GPIO4, 2, GPIO_EMC_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_03 = PIN(GPIO4, 3, GPIO_EMC_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_04 = PIN(GPIO4, 4, GPIO_EMC_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_05 = PIN(GPIO4, 5, GPIO_EMC_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_06 = PIN(GPIO4, 6, GPIO_EMC_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_07 = PIN(GPIO4, 7, GPIO_EMC_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_08 = PIN(GPIO4, 8, GPIO_EMC_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_09 = PIN(GPIO4, 9, GPIO_EMC_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_10 = PIN(GPIO4, 10, GPIO_EMC_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_11 = PIN(GPIO4, 11, GPIO_EMC_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_12 = PIN(GPIO4, 12, GPIO_EMC_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_13 = PIN(GPIO4, 13, GPIO_EMC_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_14 = PIN(GPIO4, 14, GPIO_EMC_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_15 = PIN(GPIO4, 15, GPIO_EMC_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_16 = PIN(GPIO4, 16, GPIO_EMC_16, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_17 = PIN(GPIO4, 17, GPIO_EMC_17, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_18 = PIN(GPIO4, 18, GPIO_EMC_18, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_19 = PIN(GPIO4, 19, GPIO_EMC_19, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_20 = PIN(GPIO4, 20, GPIO_EMC_20, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_21 = PIN(GPIO4, 21, GPIO_EMC_21, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_22 = PIN(GPIO4, 22, GPIO_EMC_22, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_23 = PIN(GPIO4, 23, GPIO_EMC_23, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_24 = PIN(GPIO4, 24, GPIO_EMC_24, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_25 = PIN(GPIO4, 25, GPIO_EMC_25, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_26 = PIN(GPIO4, 26, GPIO_EMC_26, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_27 = PIN(GPIO4, 27, GPIO_EMC_27, NO_ADC, 0, 0x00000005, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_EMC_28 = PIN(GPIO4, 28, GPIO_EMC_28, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_29 = PIN(GPIO4, 29, GPIO_EMC_29, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_30 = PIN(GPIO4, 30, GPIO_EMC_30, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_31 = PIN(GPIO4, 31, GPIO_EMC_31, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_32 = PIN(GPIO3, 18, GPIO_EMC_32, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_33 = PIN(GPIO3, 19, GPIO_EMC_33, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_34 = PIN(GPIO3, 20, GPIO_EMC_34, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_35 = PIN(GPIO3, 21, GPIO_EMC_35, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_36 = PIN(GPIO3, 22, GPIO_EMC_36, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_37 = PIN(GPIO3, 23, GPIO_EMC_37, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_38 = PIN(GPIO3, 24, GPIO_EMC_38, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_39 = PIN(GPIO3, 25, GPIO_EMC_39, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_40 = PIN(GPIO3, 26, GPIO_EMC_40, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_41 = PIN(GPIO3, 27, GPIO_EMC_41, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_00 = PIN(GPIO1, 0, GPIO_AD_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_01 = PIN(GPIO1, 1, GPIO_AD_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_02 = PIN(GPIO1, 2, GPIO_AD_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_03 = PIN(GPIO1, 3, GPIO_AD_B0_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_04 = PIN(GPIO1, 4, GPIO_AD_B0_04, NO_ADC, 0, 0x00000000, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_05 = PIN(GPIO1, 5, GPIO_AD_B0_05, NO_ADC, 0, 0x00000000, 0x000030B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_06 = PIN(GPIO1, 6, GPIO_AD_B0_06, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_07 = PIN(GPIO1, 7, GPIO_AD_B0_07, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_08 = PIN(GPIO1, 8, GPIO_AD_B0_08, NO_ADC, 0, 0x00000000, 0x0000B0A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_09 = PIN(GPIO1, 9, GPIO_AD_B0_09, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_10 = PIN(GPIO1, 10, GPIO_AD_B0_10, NO_ADC, 0, 0x00000000, 0x000090B1);
+const mcu_pin_obj_t pin_GPIO_AD_B0_11 = PIN(GPIO1, 11, GPIO_AD_B0_11, NO_ADC, 0, 0x00000000, 0x000070A0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 1, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, ADC1, 2, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC1, 3, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC1, 4, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, ADC2, 5, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC2, 6, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC2, 7, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC2, 8, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC2, 9, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC2, 10, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC2, 11, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC2, 12, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_08 = PIN(GPIO1, 24, GPIO_AD_B1_08, ADC2, 13, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_09 = PIN(GPIO1, 25, GPIO_AD_B1_09, ADC2, 14, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC2, 15, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC2, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_12 = PIN(GPIO1, 28, GPIO_AD_B1_12, ADC2, 1, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_13 = PIN(GPIO1, 29, GPIO_AD_B1_13, ADC2, 2, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_14 = PIN(GPIO1, 30, GPIO_AD_B1_14, ADC2, 3, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_15 = PIN(GPIO1, 31, GPIO_AD_B1_15, ADC2, 4, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_00 = PIN(GPIO2, 0, GPIO_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_01 = PIN(GPIO2, 1, GPIO_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_02 = PIN(GPIO2, 2, GPIO_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_03 = PIN(GPIO2, 3, GPIO_B0_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_04 = PIN(GPIO2, 4, GPIO_B0_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_05 = PIN(GPIO2, 5, GPIO_B0_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_06 = PIN(GPIO2, 6, GPIO_B0_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_07 = PIN(GPIO2, 7, GPIO_B0_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_08 = PIN(GPIO2, 8, GPIO_B0_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_09 = PIN(GPIO2, 9, GPIO_B0_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_10 = PIN(GPIO2, 10, GPIO_B0_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_11 = PIN(GPIO2, 11, GPIO_B0_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_12 = PIN(GPIO2, 12, GPIO_B0_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_13 = PIN(GPIO2, 13, GPIO_B0_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_14 = PIN(GPIO2, 14, GPIO_B0_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B0_15 = PIN(GPIO2, 15, GPIO_B0_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_00 = PIN(GPIO2, 16, GPIO_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_01 = PIN(GPIO2, 17, GPIO_B1_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_02 = PIN(GPIO2, 18, GPIO_B1_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_03 = PIN(GPIO2, 19, GPIO_B1_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_04 = PIN(GPIO2, 20, GPIO_B1_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_05 = PIN(GPIO2, 21, GPIO_B1_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_06 = PIN(GPIO2, 22, GPIO_B1_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_07 = PIN(GPIO2, 23, GPIO_B1_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_08 = PIN(GPIO2, 24, GPIO_B1_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_09 = PIN(GPIO2, 25, GPIO_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_10 = PIN(GPIO2, 26, GPIO_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_11 = PIN(GPIO2, 27, GPIO_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_12 = PIN(GPIO2, 28, GPIO_B1_12, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_13 = PIN(GPIO2, 29, GPIO_B1_13, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_14 = PIN(GPIO2, 30, GPIO_B1_14, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_B1_15 = PIN(GPIO2, 31, GPIO_B1_15, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_00 = PIN(GPIO3, 12, GPIO_SD_B0_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_01 = PIN(GPIO3, 13, GPIO_SD_B0_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_02 = PIN(GPIO3, 14, GPIO_SD_B0_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_03 = PIN(GPIO3, 15, GPIO_SD_B0_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_04 = PIN(GPIO3, 16, GPIO_SD_B0_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B0_05 = PIN(GPIO3, 17, GPIO_SD_B0_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_00 = PIN(GPIO3, 0, GPIO_SD_B1_00, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_01 = PIN(GPIO3, 1, GPIO_SD_B1_01, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_02 = PIN(GPIO3, 2, GPIO_SD_B1_02, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_03 = PIN(GPIO3, 3, GPIO_SD_B1_03, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_04 = PIN(GPIO3, 4, GPIO_SD_B1_04, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_05 = PIN(GPIO3, 5, GPIO_SD_B1_05, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_06 = PIN(GPIO3, 6, GPIO_SD_B1_06, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_07 = PIN(GPIO3, 7, GPIO_SD_B1_07, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_08 = PIN(GPIO3, 8, GPIO_SD_B1_08, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_09 = PIN(GPIO3, 9, GPIO_SD_B1_09, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_10 = PIN(GPIO3, 10, GPIO_SD_B1_10, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_SD_B1_11 = PIN(GPIO3, 11, GPIO_SD_B1_11, NO_ADC, 0, 0x00000005, 0x000010B0);
+
+const mcu_pin_obj_t pin_USB_OTG1_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG1_DP = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG2_DN = { { &mcu_pin_type }, };
+const mcu_pin_obj_t pin_USB_OTG2_DP = { { &mcu_pin_type }, };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
new file mode 100644
index 0000000000..6e40d30c2b
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
+
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 4)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
index c43f4eb96b..12c9a09621 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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
@@ -19,7 +20,7 @@
  * 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  R COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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.
@@ -77,7 +78,7 @@ const mcu_periph_obj_t mcu_spi_sck_list[8] = {
     PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SCK_SELECT_INPUT, 1, &pin_GPIO_B1_07),
 };
 
-const mcu_periph_obj_t mcu_spi_mosi_list[8] = {
+const mcu_periph_obj_t mcu_spi_sdo_list[8] = {
     PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 0, &pin_GPIO_EMC_28),
     PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDO_SELECT_INPUT, 1, &pin_GPIO_SD_B0_02),
 
@@ -91,7 +92,7 @@ const mcu_periph_obj_t mcu_spi_mosi_list[8] = {
     PERIPH_PIN(4, 1, kIOMUXC_LPSPI4_SDO_SELECT_INPUT, 1, &pin_GPIO_B1_06),
 };
 
-const mcu_periph_obj_t mcu_spi_miso_list[8] = {
+const mcu_periph_obj_t mcu_spi_sdi_list[8] = {
     PERIPH_PIN(1, 3, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 0, &pin_GPIO_EMC_29),
     PERIPH_PIN(1, 4, kIOMUXC_LPSPI1_SDI_SELECT_INPUT, 1, &pin_GPIO_SD_B0_03),
 
@@ -168,8 +169,8 @@ const mcu_periph_obj_t mcu_uart_rts_list[9] = {
 
     PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B1_01),
 
-    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_05),
     PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_16),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_AD_B1_05),
 
     PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_EMC_18),
 
@@ -201,6 +202,80 @@ const mcu_periph_obj_t mcu_uart_cts_list[9] = {
     PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_SD_B0_02),
 };
 
+I2S_Type *const mcu_i2s_banks[3] = { SAI1, SAI2, SAI3 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_SD_B1_06),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B1_12),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_DATA0_SELECT_INPUT, 2, &pin_GPIO_B1_00),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 0, &pin_GPIO_EMC_08),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_DATA0_SELECT_INPUT, 1, &pin_GPIO_AD_B0_08),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_04),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B1_10),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_RX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B0_14),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_09),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_RX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_07),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_05),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_SD_B1_08),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B1_14),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_BCLK_SELECT_INPUT, 2, &pin_GPIO_B1_02),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 0, &pin_GPIO_EMC_06),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_BCLK_SELECT_INPUT, 1, &pin_GPIO_AD_B0_05),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_03),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[7] = {
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_13),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_01),
+    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_07),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_04),
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_09),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_36),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_01),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[7] = {
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_SD_B1_09),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B1_15),
+    PERIPH_PIN(1, 3, kIOMUXC_SAI1_TX_SYNC_SELECT_INPUT, 2, &pin_GPIO_B1_03),
+
+    PERIPH_PIN(2, 2, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 0, &pin_GPIO_EMC_05),
+    PERIPH_PIN(2, 3, kIOMUXC_SAI2_TX_SYNC_SELECT_INPUT, 1, &pin_GPIO_AD_B0_04),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_02),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_14),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_05),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_01),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[3] = {
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_13),
+    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_04),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_00),
+};
+
 const mcu_pwm_obj_t mcu_pwm_list[67] = {
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_23_FLEXPWM1_PWMA00, &pin_GPIO_EMC_23),
     PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_SD_B0_00_FLEXPWM1_PWMA00, &pin_GPIO_SD_B0_00),
@@ -226,17 +301,17 @@ const mcu_pwm_obj_t mcu_pwm_list[67] = {
 
     PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_B0_12_FLEXPWM1_PWMX02, &pin_GPIO_AD_B0_12),
 
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM1_PWMA03, &pin_GPIO_AD_B0_10),
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_38_FLEXPWM1_PWMA03, &pin_GPIO_EMC_38),
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_00_FLEXPWM1_PWMA03, &pin_GPIO_SD_B1_00),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_12_FLEXPWM1_PWMA03, &pin_GPIO_EMC_12),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_38_FLEXPWM1_PWMA03, &pin_GPIO_EMC_38),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_10_FLEXPWM1_PWMA03, &pin_GPIO_AD_B0_10),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_00_FLEXPWM1_PWMA03, &pin_GPIO_B1_00),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_00_FLEXPWM1_PWMA03, &pin_GPIO_SD_B1_00),
 
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_11_FLEXPWM1_PWMB03, &pin_GPIO_AD_B0_11),
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_39_FLEXPWM1_PWMB03, &pin_GPIO_EMC_39),
-    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_01_FLEXPWM1_PWMB03, &pin_GPIO_SD_B1_01),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_13_FLEXPWM1_PWMB03, &pin_GPIO_EMC_13),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_39_FLEXPWM1_PWMB03, &pin_GPIO_EMC_39),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_11_FLEXPWM1_PWMB03, &pin_GPIO_AD_B0_11),
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_01_FLEXPWM1_PWMB03, &pin_GPIO_B1_01),
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_01_FLEXPWM1_PWMB03, &pin_GPIO_SD_B1_01),
 
     PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_B0_13_FLEXPWM1_PWMX03, &pin_GPIO_AD_B0_13),
 
@@ -258,16 +333,16 @@ const mcu_pwm_obj_t mcu_pwm_list[67] = {
     PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_11_FLEXPWM2_PWMB02, &pin_GPIO_EMC_11),
     PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_B0_11_FLEXPWM2_PWMB02, &pin_GPIO_B0_11),
 
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_19_FLEXPWM2_PWMA03, &pin_GPIO_EMC_19),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_00_FLEXPWM2_PWMA03, &pin_GPIO_AD_B0_00),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_AD_B0_09_FLEXPWM2_PWMA03, &pin_GPIO_AD_B0_09),
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_19_FLEXPWM2_PWMA03, &pin_GPIO_EMC_19),
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_02_FLEXPWM2_PWMA03, &pin_GPIO_SD_B1_02),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_02_FLEXPWM2_PWMA03, &pin_GPIO_B1_02),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_SD_B1_02_FLEXPWM2_PWMA03, &pin_GPIO_SD_B1_02),
 
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_01_FLEXPWM2_PWMB03, &pin_GPIO_AD_B0_01),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_20_FLEXPWM2_PWMB03, &pin_GPIO_EMC_20),
-    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_03_FLEXPWM2_PWMB03, &pin_GPIO_SD_B1_03),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_AD_B0_01_FLEXPWM2_PWMB03, &pin_GPIO_AD_B0_01),
     PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_B1_03_FLEXPWM2_PWMB03, &pin_GPIO_B1_03),
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_SD_B1_03_FLEXPWM2_PWMB03, &pin_GPIO_SD_B1_03),
 
     PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_29_FLEXPWM3_PWMA00, &pin_GPIO_EMC_29),
 
@@ -285,90 +360,23 @@ const mcu_pwm_obj_t mcu_pwm_list[67] = {
 
     PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_22_FLEXPWM3_PWMB03, &pin_GPIO_EMC_22),
 
-    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_B1_08_FLEXPWM4_PWMA00, &pin_GPIO_AD_B1_08),
     PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_00_FLEXPWM4_PWMA00, &pin_GPIO_EMC_00),
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_B1_08_FLEXPWM4_PWMA00, &pin_GPIO_AD_B1_08),
 
     PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_01_FLEXPWM4_PWMB00, &pin_GPIO_EMC_01),
 
-    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B1_09_FLEXPWM4_PWMA01, &pin_GPIO_AD_B1_09),
     PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_02_FLEXPWM4_PWMA01, &pin_GPIO_EMC_02),
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_B1_09_FLEXPWM4_PWMA01, &pin_GPIO_AD_B1_09),
 
     PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_03_FLEXPWM4_PWMB01, &pin_GPIO_EMC_03),
 
-    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B1_14_FLEXPWM4_PWMA02, &pin_GPIO_B1_14),
     PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_04_FLEXPWM4_PWMA02, &pin_GPIO_EMC_04),
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_B1_14_FLEXPWM4_PWMA02, &pin_GPIO_B1_14),
 
     PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_05_FLEXPWM4_PWMB02, &pin_GPIO_EMC_05),
 
-    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_15_FLEXPWM4_PWMA03, &pin_GPIO_B1_15),
     PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_17_FLEXPWM4_PWMA03, &pin_GPIO_EMC_17),
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_B1_15_FLEXPWM4_PWMA03, &pin_GPIO_B1_15),
 
     PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_18_FLEXPWM4_PWMB03, &pin_GPIO_EMC_18),
-
-};
-
-const mcu_periph_obj_t mcu_sai_rx_bclk_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_11),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B0_15),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_05),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_10),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_06),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_35),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
-};
-
-const mcu_periph_obj_t mcu_sai_rx_data0_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_00),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_12),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_06),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_08),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_08),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_33),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_00),
-};
-const mcu_periph_obj_t mcu_sai_rx_sync_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_11),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B0_15),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_05),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_09),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_06),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_34),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_05),
-};
-const mcu_periph_obj_t mcu_sai_tx_bclk_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_08),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_02),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_14),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B0_05),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_06),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_38),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_03),
-};
-const mcu_periph_obj_t mcu_sai_tx_data0_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_13),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_01),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_07),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_04),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_AD_B0_09),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_36),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_01),
-};
-const mcu_periph_obj_t mcu_sai_tx_sync_list[] = {
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_AD_B1_15),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_B1_03),
-    PERIPH_PIN(1, 3, 0, 0, &pin_GPIO_SD_B1_09),
-    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_AD_B0_04),
-    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_EMC_05),
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_39),
-    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_SD_B1_02),
-};
-const mcu_periph_obj_t mcu_mqs_left_list[] = {
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_14),
-    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_01),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_05),
-};
-const mcu_periph_obj_t mcu_mqs_right_list[] = {
-    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_13),
-    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_B0_00),
-    PERIPH_PIN(3, 1, 0, 0, &pin_GPIO_AD_B0_04),
 };
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
index 28ea8e3742..7917a2ebdb 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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,37 +26,30 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
-#define MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
-
+#pragma once
 extern LPI2C_Type *const mcu_i2c_banks[4];
-
 extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
 extern const mcu_periph_obj_t mcu_i2c_scl_list[9];
 
 extern LPSPI_Type *const mcu_spi_banks[4];
-
 extern const mcu_periph_obj_t mcu_spi_sck_list[8];
-extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
-extern const mcu_periph_obj_t mcu_spi_miso_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[8];
 
 extern LPUART_Type *const mcu_uart_banks[8];
-
 extern const mcu_periph_obj_t mcu_uart_rx_list[18];
 extern const mcu_periph_obj_t mcu_uart_tx_list[18];
 extern const mcu_periph_obj_t mcu_uart_rts_list[9];
 extern const mcu_periph_obj_t mcu_uart_cts_list[9];
 
-extern const mcu_pwm_obj_t mcu_pwm_list[67];
-
-extern const mcu_periph_obj_t mcu_sai_rx_bclk_list[7];
-extern const mcu_periph_obj_t mcu_sai_rx_data0_list[7];
-extern const mcu_periph_obj_t mcu_sai_rx_sync_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_bclk_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_data0_list[7];
-extern const mcu_periph_obj_t mcu_sai_tx_sync_list[7];
+extern I2S_Type *const mcu_i2s_banks[3];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[7];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[7];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[7];
 
 extern const mcu_periph_obj_t mcu_mqs_left_list[3];
 extern const mcu_periph_obj_t mcu_mqs_right_list[3];
 
-#endif // MICROPY_INCLUDED_MIMXRT10XX_MIMXRT1062_PERIPHERALS_MIMXRT1011_PERIPH_H
+extern const mcu_pwm_obj_t mcu_pwm_list[67];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pin_names.h
new file mode 100644
index 0000000000..4b9df709cf
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pin_names.h
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_00)
+FORMAT_PIN(GPIO_EMC_01)
+FORMAT_PIN(GPIO_EMC_02)
+FORMAT_PIN(GPIO_EMC_03)
+FORMAT_PIN(GPIO_EMC_04)
+FORMAT_PIN(GPIO_EMC_05)
+FORMAT_PIN(GPIO_EMC_06)
+FORMAT_PIN(GPIO_EMC_07)
+FORMAT_PIN(GPIO_EMC_08)
+FORMAT_PIN(GPIO_EMC_09)
+FORMAT_PIN(GPIO_EMC_10)
+FORMAT_PIN(GPIO_EMC_11)
+FORMAT_PIN(GPIO_EMC_12)
+FORMAT_PIN(GPIO_EMC_13)
+FORMAT_PIN(GPIO_EMC_14)
+FORMAT_PIN(GPIO_EMC_15)
+FORMAT_PIN(GPIO_EMC_16)
+FORMAT_PIN(GPIO_EMC_17)
+FORMAT_PIN(GPIO_EMC_18)
+FORMAT_PIN(GPIO_EMC_19)
+FORMAT_PIN(GPIO_EMC_20)
+FORMAT_PIN(GPIO_EMC_21)
+FORMAT_PIN(GPIO_EMC_22)
+FORMAT_PIN(GPIO_EMC_23)
+FORMAT_PIN(GPIO_EMC_24)
+FORMAT_PIN(GPIO_EMC_25)
+FORMAT_PIN(GPIO_EMC_26)
+FORMAT_PIN(GPIO_EMC_27)
+FORMAT_PIN(GPIO_EMC_28)
+FORMAT_PIN(GPIO_EMC_29)
+FORMAT_PIN(GPIO_EMC_30)
+FORMAT_PIN(GPIO_EMC_31)
+FORMAT_PIN(GPIO_EMC_32)
+FORMAT_PIN(GPIO_EMC_33)
+FORMAT_PIN(GPIO_EMC_34)
+FORMAT_PIN(GPIO_EMC_35)
+FORMAT_PIN(GPIO_EMC_36)
+FORMAT_PIN(GPIO_EMC_37)
+FORMAT_PIN(GPIO_EMC_38)
+FORMAT_PIN(GPIO_EMC_39)
+FORMAT_PIN(GPIO_EMC_40)
+FORMAT_PIN(GPIO_EMC_41)
+
+FORMAT_PIN(GPIO_AD_B0_00)
+FORMAT_PIN(GPIO_AD_B0_01)
+FORMAT_PIN(GPIO_AD_B0_02)
+FORMAT_PIN(GPIO_AD_B0_03)
+FORMAT_PIN(GPIO_AD_B0_04)
+FORMAT_PIN(GPIO_AD_B0_05)
+FORMAT_PIN(GPIO_AD_B0_06)
+FORMAT_PIN(GPIO_AD_B0_07)
+FORMAT_PIN(GPIO_AD_B0_08)
+FORMAT_PIN(GPIO_AD_B0_09)
+FORMAT_PIN(GPIO_AD_B0_10)
+FORMAT_PIN(GPIO_AD_B0_11)
+FORMAT_PIN(GPIO_AD_B0_12)
+FORMAT_PIN(GPIO_AD_B0_13)
+FORMAT_PIN(GPIO_AD_B0_14)
+FORMAT_PIN(GPIO_AD_B0_15)
+
+FORMAT_PIN(GPIO_AD_B1_00)
+FORMAT_PIN(GPIO_AD_B1_01)
+FORMAT_PIN(GPIO_AD_B1_02)
+FORMAT_PIN(GPIO_AD_B1_03)
+FORMAT_PIN(GPIO_AD_B1_04)
+FORMAT_PIN(GPIO_AD_B1_05)
+FORMAT_PIN(GPIO_AD_B1_06)
+FORMAT_PIN(GPIO_AD_B1_07)
+FORMAT_PIN(GPIO_AD_B1_08)
+FORMAT_PIN(GPIO_AD_B1_09)
+FORMAT_PIN(GPIO_AD_B1_10)
+FORMAT_PIN(GPIO_AD_B1_11)
+FORMAT_PIN(GPIO_AD_B1_12)
+FORMAT_PIN(GPIO_AD_B1_13)
+FORMAT_PIN(GPIO_AD_B1_14)
+FORMAT_PIN(GPIO_AD_B1_15)
+
+FORMAT_PIN(GPIO_B0_00)
+FORMAT_PIN(GPIO_B0_01)
+FORMAT_PIN(GPIO_B0_02)
+FORMAT_PIN(GPIO_B0_03)
+FORMAT_PIN(GPIO_B0_04)
+FORMAT_PIN(GPIO_B0_05)
+FORMAT_PIN(GPIO_B0_06)
+FORMAT_PIN(GPIO_B0_07)
+FORMAT_PIN(GPIO_B0_08)
+FORMAT_PIN(GPIO_B0_09)
+FORMAT_PIN(GPIO_B0_10)
+FORMAT_PIN(GPIO_B0_11)
+FORMAT_PIN(GPIO_B0_12)
+FORMAT_PIN(GPIO_B0_13)
+FORMAT_PIN(GPIO_B0_14)
+FORMAT_PIN(GPIO_B0_15)
+
+FORMAT_PIN(GPIO_B1_00)
+FORMAT_PIN(GPIO_B1_01)
+FORMAT_PIN(GPIO_B1_02)
+FORMAT_PIN(GPIO_B1_03)
+FORMAT_PIN(GPIO_B1_04)
+FORMAT_PIN(GPIO_B1_05)
+FORMAT_PIN(GPIO_B1_06)
+FORMAT_PIN(GPIO_B1_07)
+FORMAT_PIN(GPIO_B1_08)
+FORMAT_PIN(GPIO_B1_09)
+FORMAT_PIN(GPIO_B1_10)
+FORMAT_PIN(GPIO_B1_11)
+FORMAT_PIN(GPIO_B1_12)
+FORMAT_PIN(GPIO_B1_13)
+FORMAT_PIN(GPIO_B1_14)
+FORMAT_PIN(GPIO_B1_15)
+
+FORMAT_PIN(GPIO_SD_B0_00)
+FORMAT_PIN(GPIO_SD_B0_01)
+FORMAT_PIN(GPIO_SD_B0_02)
+FORMAT_PIN(GPIO_SD_B0_03)
+FORMAT_PIN(GPIO_SD_B0_04)
+FORMAT_PIN(GPIO_SD_B0_05)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+FORMAT_PIN(GPIO_SD_B1_06)
+FORMAT_PIN(GPIO_SD_B1_07)
+FORMAT_PIN(GPIO_SD_B1_08)
+FORMAT_PIN(GPIO_SD_B1_09)
+FORMAT_PIN(GPIO_SD_B1_10)
+FORMAT_PIN(GPIO_SD_B1_11)
+FORMAT_PIN(USB_OTG1_DN)
+FORMAT_PIN(USB_OTG1_DP)
+FORMAT_PIN(USB_OTG2_DN)
+FORMAT_PIN(USB_OTG2_DP)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
index 7fb5e7a9be..472677ff24 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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
@@ -56,7 +57,7 @@ const mcu_pin_obj_t pin_GPIO_EMC_23 = PIN(GPIO4, 23, GPIO_EMC_23, NO_ADC, 0, 0x0
 const mcu_pin_obj_t pin_GPIO_EMC_24 = PIN(GPIO4, 24, GPIO_EMC_24, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_25 = PIN(GPIO4, 25, GPIO_EMC_25, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_26 = PIN(GPIO4, 26, GPIO_EMC_26, NO_ADC, 0, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_EMC_27 = PIN(GPIO4, 27, GPIO_EMC_27, NO_ADC, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_EMC_27 = PIN(GPIO4, 27, GPIO_EMC_27, NO_ADC, 0, 0x00000005, 0x000030B0);
 const mcu_pin_obj_t pin_GPIO_EMC_28 = PIN(GPIO4, 28, GPIO_EMC_28, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_29 = PIN(GPIO4, 29, GPIO_EMC_29, NO_ADC, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_EMC_30 = PIN(GPIO4, 30, GPIO_EMC_30, NO_ADC, 0, 0x00000005, 0x000010B0);
@@ -87,18 +88,18 @@ const mcu_pin_obj_t pin_GPIO_AD_B0_12 = PIN(GPIO1, 12, GPIO_AD_B0_12, ADC1, 1, 0
 const mcu_pin_obj_t pin_GPIO_AD_B0_13 = PIN(GPIO1, 13, GPIO_AD_B0_13, ADC1, 2, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_AD_B0_14 = PIN(GPIO1, 14, GPIO_AD_B0_14, ADC1, 3, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_AD_B0_15 = PIN(GPIO1, 15, GPIO_AD_B0_15, ADC1, 4, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, ADC1, 5, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC1, 6, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC1, 7, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC1, 8, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC1, 9, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC1, 10, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC1, 11, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC1, 12, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_08 = PIN(GPIO1, 24, GPIO_AD_B1_08, ADC1, 13, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_09 = PIN(GPIO1, 25, GPIO_AD_B1_09, ADC1, 14, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC1, 15, 0x00000005, 0x000010B0);
-const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC1, 0, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_00 = PIN(GPIO1, 16, GPIO_AD_B1_00, ADC2, 5, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_01 = PIN(GPIO1, 17, GPIO_AD_B1_01, ADC2, 6, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_02 = PIN(GPIO1, 18, GPIO_AD_B1_02, ADC2, 7, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_03 = PIN(GPIO1, 19, GPIO_AD_B1_03, ADC2, 8, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_04 = PIN(GPIO1, 20, GPIO_AD_B1_04, ADC2, 9, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_05 = PIN(GPIO1, 21, GPIO_AD_B1_05, ADC2, 10, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_06 = PIN(GPIO1, 22, GPIO_AD_B1_06, ADC2, 11, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_07 = PIN(GPIO1, 23, GPIO_AD_B1_07, ADC2, 12, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_08 = PIN(GPIO1, 24, GPIO_AD_B1_08, ADC2, 13, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_09 = PIN(GPIO1, 25, GPIO_AD_B1_09, ADC2, 14, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_10 = PIN(GPIO1, 26, GPIO_AD_B1_10, ADC2, 15, 0x00000005, 0x000010B0);
+const mcu_pin_obj_t pin_GPIO_AD_B1_11 = PIN(GPIO1, 27, GPIO_AD_B1_11, ADC2, 0, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_AD_B1_12 = PIN(GPIO1, 28, GPIO_AD_B1_12, ADC2, 1, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_AD_B1_13 = PIN(GPIO1, 29, GPIO_AD_B1_13, ADC2, 2, 0x00000005, 0x000010B0);
 const mcu_pin_obj_t pin_GPIO_AD_B1_14 = PIN(GPIO1, 30, GPIO_AD_B1_14, ADC2, 3, 0x00000005, 0x000010B0);
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
index 109882df93..6e40d30c2b 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
@@ -3,7 +3,9 @@
  *
  * The MIT License (MIT)
  *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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,145 +26,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1062_PINS_H
-#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1062_PINS_H
+#pragma once
 
-extern const mcu_pin_obj_t pin_GPIO_EMC_00;
-extern const mcu_pin_obj_t pin_GPIO_EMC_01;
-extern const mcu_pin_obj_t pin_GPIO_EMC_02;
-extern const mcu_pin_obj_t pin_GPIO_EMC_03;
-extern const mcu_pin_obj_t pin_GPIO_EMC_04;
-extern const mcu_pin_obj_t pin_GPIO_EMC_05;
-extern const mcu_pin_obj_t pin_GPIO_EMC_06;
-extern const mcu_pin_obj_t pin_GPIO_EMC_07;
-extern const mcu_pin_obj_t pin_GPIO_EMC_08;
-extern const mcu_pin_obj_t pin_GPIO_EMC_09;
-extern const mcu_pin_obj_t pin_GPIO_EMC_10;
-extern const mcu_pin_obj_t pin_GPIO_EMC_11;
-extern const mcu_pin_obj_t pin_GPIO_EMC_12;
-extern const mcu_pin_obj_t pin_GPIO_EMC_13;
-extern const mcu_pin_obj_t pin_GPIO_EMC_14;
-extern const mcu_pin_obj_t pin_GPIO_EMC_15;
-extern const mcu_pin_obj_t pin_GPIO_EMC_16;
-extern const mcu_pin_obj_t pin_GPIO_EMC_17;
-extern const mcu_pin_obj_t pin_GPIO_EMC_18;
-extern const mcu_pin_obj_t pin_GPIO_EMC_19;
-extern const mcu_pin_obj_t pin_GPIO_EMC_20;
-extern const mcu_pin_obj_t pin_GPIO_EMC_21;
-extern const mcu_pin_obj_t pin_GPIO_EMC_22;
-extern const mcu_pin_obj_t pin_GPIO_EMC_23;
-extern const mcu_pin_obj_t pin_GPIO_EMC_24;
-extern const mcu_pin_obj_t pin_GPIO_EMC_25;
-extern const mcu_pin_obj_t pin_GPIO_EMC_26;
-extern const mcu_pin_obj_t pin_GPIO_EMC_27;
-extern const mcu_pin_obj_t pin_GPIO_EMC_28;
-extern const mcu_pin_obj_t pin_GPIO_EMC_29;
-extern const mcu_pin_obj_t pin_GPIO_EMC_30;
-extern const mcu_pin_obj_t pin_GPIO_EMC_31;
-extern const mcu_pin_obj_t pin_GPIO_EMC_32;
-extern const mcu_pin_obj_t pin_GPIO_EMC_33;
-extern const mcu_pin_obj_t pin_GPIO_EMC_34;
-extern const mcu_pin_obj_t pin_GPIO_EMC_35;
-extern const mcu_pin_obj_t pin_GPIO_EMC_36;
-extern const mcu_pin_obj_t pin_GPIO_EMC_37;
-extern const mcu_pin_obj_t pin_GPIO_EMC_38;
-extern const mcu_pin_obj_t pin_GPIO_EMC_39;
-extern const mcu_pin_obj_t pin_GPIO_EMC_40;
-extern const mcu_pin_obj_t pin_GPIO_EMC_41;
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
 
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_00;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_01;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_02;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_03;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_04;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_05;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_06;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_07;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_08;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_09;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_10;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_11;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_12;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_13;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_14;
-extern const mcu_pin_obj_t pin_GPIO_AD_B0_15;
-
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_00;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_01;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_02;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_03;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_04;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_05;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_06;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_07;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_08;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_09;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_10;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_11;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_12;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_13;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_14;
-extern const mcu_pin_obj_t pin_GPIO_AD_B1_15;
-
-extern const mcu_pin_obj_t pin_GPIO_B0_00;
-extern const mcu_pin_obj_t pin_GPIO_B0_01;
-extern const mcu_pin_obj_t pin_GPIO_B0_02;
-extern const mcu_pin_obj_t pin_GPIO_B0_03;
-extern const mcu_pin_obj_t pin_GPIO_B0_04;
-extern const mcu_pin_obj_t pin_GPIO_B0_05;
-extern const mcu_pin_obj_t pin_GPIO_B0_06;
-extern const mcu_pin_obj_t pin_GPIO_B0_07;
-extern const mcu_pin_obj_t pin_GPIO_B0_08;
-extern const mcu_pin_obj_t pin_GPIO_B0_09;
-extern const mcu_pin_obj_t pin_GPIO_B0_10;
-extern const mcu_pin_obj_t pin_GPIO_B0_11;
-extern const mcu_pin_obj_t pin_GPIO_B0_12;
-extern const mcu_pin_obj_t pin_GPIO_B0_13;
-extern const mcu_pin_obj_t pin_GPIO_B0_14;
-extern const mcu_pin_obj_t pin_GPIO_B0_15;
-
-extern const mcu_pin_obj_t pin_GPIO_B1_00;
-extern const mcu_pin_obj_t pin_GPIO_B1_01;
-extern const mcu_pin_obj_t pin_GPIO_B1_02;
-extern const mcu_pin_obj_t pin_GPIO_B1_03;
-extern const mcu_pin_obj_t pin_GPIO_B1_04;
-extern const mcu_pin_obj_t pin_GPIO_B1_05;
-extern const mcu_pin_obj_t pin_GPIO_B1_06;
-extern const mcu_pin_obj_t pin_GPIO_B1_07;
-extern const mcu_pin_obj_t pin_GPIO_B1_08;
-extern const mcu_pin_obj_t pin_GPIO_B1_09;
-extern const mcu_pin_obj_t pin_GPIO_B1_10;
-extern const mcu_pin_obj_t pin_GPIO_B1_11;
-extern const mcu_pin_obj_t pin_GPIO_B1_12;
-extern const mcu_pin_obj_t pin_GPIO_B1_13;
-extern const mcu_pin_obj_t pin_GPIO_B1_14;
-extern const mcu_pin_obj_t pin_GPIO_B1_15;
-
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_00;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_01;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_02;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_03;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_04;
-extern const mcu_pin_obj_t pin_GPIO_SD_B0_05;
-
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_00;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_01;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_02;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_03;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_04;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_05;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_06;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_07;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_08;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_09;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_10;
-extern const mcu_pin_obj_t pin_GPIO_SD_B1_11;
-
-extern const mcu_pin_obj_t pin_USB_OTG1_DN;
-extern const mcu_pin_obj_t pin_USB_OTG1_DP;
-extern const mcu_pin_obj_t pin_USB_OTG2_DN;
-extern const mcu_pin_obj_t pin_USB_OTG2_DP;
-
-extern const mcu_pin_obj_t mcu_pin_list[IOMUXC_SW_PAD_CTL_PAD_COUNT];
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1062_PINS_H
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 4)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c
new file mode 100644
index 0000000000..1252d48135
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c
@@ -0,0 +1,672 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ */
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "mpconfigport.h"
+
+#include "fsl_clock.h"
+#include "fsl_iomuxc.h"
+#include "fsl_dcdc.h"
+#include "fsl_device_registers.h"
+#include "fsl_pmu.h"
+
+#include "clocks.h"
+
+#ifndef SKIP_POWER_ADJUSTMENT
+#if __CORTEX_M == 7
+#define BYPASS_LDO_LPSR 1
+#define SKIP_LDO_ADJUSTMENT 1
+#elif __CORTEX_M == 4
+#define SKIP_DCDC_ADJUSTMENT 1
+#define SKIP_FBB_ENABLE 1
+#endif
+#endif
+
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN =
+{
+    .postDivider = kCLOCK_PllPostDiv2,            /* Post divider, 0 - DIV by 2, 1 - DIV by 4, 2 - DIV by 8, 3 - DIV by 1 */
+    .loopDivider = 166,                           /* PLL Loop divider, Fout = Fin * ( loopDivider / ( 2 * postDivider ) ) */
+};
+
+const clock_sys_pll2_config_t sysPll2Config_BOARD_BootClockRUN =
+{
+    .mfd = 268435455,                             /* Denominator of spread spectrum */
+    .ss = NULL,                                   /* Spread spectrum parameter */
+    .ssEnable = false,                            /* Enable spread spectrum or not */
+};
+
+const clock_video_pll_config_t videoPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 41,                            /* PLL Loop divider, valid range for DIV_SELECT divider value: 27 ~ 54. */
+    .postDivider = 0,                             /* Divider after PLL, should only be 1, 2, 4, 8, 16, 32 */
+    .numerator = 1,                               /* 30 bit numerator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .denominator = 960000,                        /* 30 bit denominator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .ss = NULL,                                   /* Spread spectrum parameter */
+    .ssEnable = false,                            /* Enable spread spectrum or not */
+};
+
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void clocks_init(void) {
+    clock_root_config_t rootCfg = {0};
+
+    /* Set DCDC to DCM mode to improve the efficiency for light loading in run mode and transient performance with a big loading step. */
+    DCDC_BootIntoDCM(DCDC);
+
+    #if !defined(SKIP_DCDC_ADJUSTMENT) || (!SKIP_DCDC_ADJUSTMENT)
+    if ((OCOTP->FUSEN[16].FUSE == 0x57AC5969U) && ((OCOTP->FUSEN[17].FUSE & 0xFFU) == 0x0BU)) {
+        DCDC_SetVDD1P0BuckModeTargetVoltage(DCDC, kDCDC_1P0BuckTarget1P15V);
+    } else {
+        /* Set 1.125V for production samples to align with data sheet requirement */
+        DCDC_SetVDD1P0BuckModeTargetVoltage(DCDC, kDCDC_1P0BuckTarget1P125V);
+    }
+    #endif
+
+    #if !defined(SKIP_FBB_ENABLE) || (!SKIP_FBB_ENABLE)
+    /* Check if FBB need to be enabled in OverDrive(OD) mode */
+    if (((OCOTP->FUSEN[7].FUSE & 0x10U) >> 4U) != 1) {
+        PMU_EnableBodyBias(ANADIG_PMU, kPMU_FBB_CM7, true);
+    } else {
+        PMU_EnableBodyBias(ANADIG_PMU, kPMU_FBB_CM7, false);
+    }
+    #endif
+
+    #if defined(BYPASS_LDO_LPSR) && BYPASS_LDO_LPSR
+    PMU_StaticEnableLpsrAnaLdoBypassMode(ANADIG_LDO_SNVS, true);
+    PMU_StaticEnableLpsrDigLdoBypassMode(ANADIG_LDO_SNVS, true);
+    #endif
+
+    #if !defined(SKIP_LDO_ADJUSTMENT) || (!SKIP_LDO_ADJUSTMENT)
+    pmu_static_lpsr_ana_ldo_config_t lpsrAnaConfig;
+    pmu_static_lpsr_dig_config_t lpsrDigConfig;
+
+    if ((ANADIG_LDO_SNVS->PMU_LDO_LPSR_ANA & ANADIG_LDO_SNVS_PMU_LDO_LPSR_ANA_BYPASS_MODE_EN_MASK) == 0UL) {
+        PMU_StaticGetLpsrAnaLdoDefaultConfig(&lpsrAnaConfig);
+        PMU_StaticLpsrAnaLdoInit(ANADIG_LDO_SNVS, &lpsrAnaConfig);
+    }
+
+    if ((ANADIG_LDO_SNVS->PMU_LDO_LPSR_DIG & ANADIG_LDO_SNVS_PMU_LDO_LPSR_DIG_BYPASS_MODE_MASK) == 0UL) {
+        PMU_StaticGetLpsrDigLdoDefaultConfig(&lpsrDigConfig);
+        lpsrDigConfig.targetVoltage = kPMU_LpsrDigTargetStableVoltage1P117V;
+        PMU_StaticLpsrDigLdoInit(ANADIG_LDO_SNVS, &lpsrDigConfig);
+    }
+    #endif
+
+    /* Config CLK_1M */
+    CLOCK_OSC_Set1MHzOutputBehavior(kCLOCK_1MHzOutEnableFreeRunning1Mhz);
+
+    /* Init OSC RC 16M */
+    ANADIG_OSC->OSC_16M_CTRL |= ANADIG_OSC_OSC_16M_CTRL_EN_IRC4M16M_MASK;
+
+    /* Init OSC RC 400M */
+    CLOCK_OSC_EnableOscRc400M();
+    CLOCK_OSC_GateOscRc400M(true);
+
+    /* Init OSC RC 48M */
+    CLOCK_OSC_EnableOsc48M(true);
+    CLOCK_OSC_EnableOsc48MDiv2(true);
+
+    /* Config OSC 24M */
+    ANADIG_OSC->OSC_24M_CTRL |= ANADIG_OSC_OSC_24M_CTRL_OSC_EN(1) | ANADIG_OSC_OSC_24M_CTRL_BYPASS_EN(0) | ANADIG_OSC_OSC_24M_CTRL_BYPASS_CLK(0) | ANADIG_OSC_OSC_24M_CTRL_LP_EN(1) | ANADIG_OSC_OSC_24M_CTRL_OSC_24M_GATE(0);
+    /* Wait for 24M OSC to be stable. */
+    while (ANADIG_OSC_OSC_24M_CTRL_OSC_24M_STABLE_MASK !=
+           (ANADIG_OSC->OSC_24M_CTRL & ANADIG_OSC_OSC_24M_CTRL_OSC_24M_STABLE_MASK)) {
+    }
+
+    /* Switch both core, M7 Systick and Bus_Lpsr to OscRC48MDiv2 first */
+    #if __CORTEX_M == 7
+    rootCfg.mux = kCLOCK_M7_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M7, &rootCfg);
+
+    rootCfg.mux = kCLOCK_M7_SYSTICK_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M7_Systick, &rootCfg);
+    #endif
+
+    #if __CORTEX_M == 4
+    rootCfg.mux = kCLOCK_M4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M4, &rootCfg);
+
+    rootCfg.mux = kCLOCK_BUS_LPSR_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Bus_Lpsr, &rootCfg);
+    #endif
+
+    /*
+    * if DCD is used, please make sure the clock source of SEMC is not changed in the following PLL/PFD configuration code.
+    */
+    /* Init Arm Pll. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+
+    /* Bypass Sys Pll1. */
+    CLOCK_SetPllBypass(kCLOCK_PllSys1, true);
+
+    /* DeInit Sys Pll1. */
+    CLOCK_DeinitSysPll1();
+
+    /* Init Sys Pll2. */
+    CLOCK_InitSysPll2(&sysPll2Config_BOARD_BootClockRUN);
+
+    /* Init System Pll2 pfd0. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd0, 27);
+
+    /* Init System Pll2 pfd1. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd1, 16);
+
+    /* Init System Pll2 pfd2. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd2, 24);
+
+    /* Init System Pll2 pfd3. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd3, 32);
+
+    /* Init Sys Pll3. */
+    CLOCK_InitSysPll3();
+
+    /* Init System Pll3 pfd0. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd0, 13);
+
+    /* Init System Pll3 pfd1. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd1, 17);
+
+    /* Init System Pll3 pfd2. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd2, 32);
+
+    /* Init System Pll3 pfd3. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd3, 22);
+
+    /* Bypass Audio Pll. */
+    CLOCK_SetPllBypass(kCLOCK_PllAudio, true);
+
+    /* DeInit Audio Pll. */
+    CLOCK_DeinitAudioPll();
+
+    /* Init Video Pll. */
+    CLOCK_InitVideoPll(&videoPllConfig_BOARD_BootClockRUN);
+
+    /* Module clock root configurations. */
+    /* Configure M7 using ARM_PLL_CLK */
+    #if __CORTEX_M == 7
+    rootCfg.mux = kCLOCK_M7_ClockRoot_MuxArmPllOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M7, &rootCfg);
+    #endif
+
+    /* Configure M4 using SYS_PLL3_PFD3_CLK */
+    #if __CORTEX_M == 4
+    rootCfg.mux = kCLOCK_M4_ClockRoot_MuxSysPll3Pfd3;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M4, &rootCfg);
+    #endif
+
+    /* Configure BUS using SYS_PLL3_CLK */
+    rootCfg.mux = kCLOCK_BUS_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Bus, &rootCfg);
+
+    /* Configure BUS_LPSR using SYS_PLL3_CLK */
+    rootCfg.mux = kCLOCK_BUS_LPSR_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 3;
+    CLOCK_SetRootClock(kCLOCK_Root_Bus_Lpsr, &rootCfg);
+
+    /* Configure SEMC using SYS_PLL2_PFD1_CLK */
+    #ifndef SKIP_SEMC_INIT
+    rootCfg.mux = kCLOCK_SEMC_ClockRoot_MuxSysPll2Pfd1;
+    rootCfg.div = 3;
+    CLOCK_SetRootClock(kCLOCK_Root_Semc, &rootCfg);
+    #endif
+
+    #if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+    #if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+    UpdateSemcClock();
+    #endif
+    #endif
+
+    /* Configure CSSYS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSSYS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cssys, &rootCfg);
+
+    /* Configure CSTRACE using SYS_PLL2_CLK */
+    rootCfg.mux = kCLOCK_CSTRACE_ClockRoot_MuxSysPll2Out;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Cstrace, &rootCfg);
+
+    /* Configure M4_SYSTICK using OSC_RC_48M_DIV2 */
+    #if __CORTEX_M == 4
+    rootCfg.mux = kCLOCK_M4_SYSTICK_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M4_Systick, &rootCfg);
+    #endif
+
+    /* Configure M7_SYSTICK using OSC_RC_48M_DIV2 */
+    #if __CORTEX_M == 7
+    rootCfg.mux = kCLOCK_M7_SYSTICK_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 240;
+    CLOCK_SetRootClock(kCLOCK_Root_M7_Systick, &rootCfg);
+    #endif
+
+    /* Configure ADC1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ADC1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Adc1, &rootCfg);
+
+    /* Configure ADC2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ADC2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Adc2, &rootCfg);
+
+    /* Configure ACMP using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Acmp, &rootCfg);
+
+    /* Configure FLEXIO1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXIO1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexio1, &rootCfg);
+
+    /* Configure FLEXIO2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXIO2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexio2, &rootCfg);
+
+    /* Configure GPT1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
+
+    /* Configure GPT2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt2, &rootCfg);
+
+    /* Configure GPT3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt3, &rootCfg);
+
+    /* Configure GPT4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt4, &rootCfg);
+
+    /* Configure GPT5 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT5_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt5, &rootCfg);
+
+    /* Configure GPT6 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_GPT6_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt6, &rootCfg);
+
+    /* Configure FLEXSPI1 using OSC_RC_48M_DIV2 */
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1) || defined(FLEXSPI_IN_USE))
+    rootCfg.mux = kCLOCK_FLEXSPI1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexspi1, &rootCfg);
+    #endif
+
+    /* Configure FLEXSPI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXSPI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexspi2, &rootCfg);
+
+    /* Configure CAN1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can1, &rootCfg);
+
+    /* Configure CAN2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can2, &rootCfg);
+
+    /* Configure CAN3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can3, &rootCfg);
+
+    /* Configure LPUART1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart1, &rootCfg);
+
+    /* Configure LPUART2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart2, &rootCfg);
+
+    /* Configure LPUART3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart3, &rootCfg);
+
+    /* Configure LPUART4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart4, &rootCfg);
+
+    /* Configure LPUART5 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART5_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart5, &rootCfg);
+
+    /* Configure LPUART6 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART6_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart6, &rootCfg);
+
+    /* Configure LPUART7 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART7_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart7, &rootCfg);
+
+    /* Configure LPUART8 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART8_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart8, &rootCfg);
+
+    /* Configure LPUART9 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART9_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart9, &rootCfg);
+
+    /* Configure LPUART10 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART10_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart10, &rootCfg);
+
+    /* Configure LPUART11 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART11_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart11, &rootCfg);
+
+    /* Configure LPUART12 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPUART12_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart12, &rootCfg);
+
+    /* Configure LPI2C1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c1, &rootCfg);
+
+    /* Configure LPI2C2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c2, &rootCfg);
+
+    /* Configure LPI2C3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c3, &rootCfg);
+
+    /* Configure LPI2C4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c4, &rootCfg);
+
+    /* Configure LPI2C5 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C5_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c5, &rootCfg);
+
+    /* Configure LPI2C6 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPI2C6_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c6, &rootCfg);
+
+    /* Configure LPSPI1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi1, &rootCfg);
+
+    /* Configure LPSPI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi2, &rootCfg);
+
+    /* Configure LPSPI3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi3, &rootCfg);
+
+    /* Configure LPSPI4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi4, &rootCfg);
+
+    /* Configure LPSPI5 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI5_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi5, &rootCfg);
+
+    /* Configure LPSPI6 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LPSPI6_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi6, &rootCfg);
+
+    /* Configure EMV1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_EMV1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Emv1, &rootCfg);
+
+    /* Configure EMV2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_EMV2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Emv2, &rootCfg);
+
+    /* Configure ENET1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet1, &rootCfg);
+
+    /* Configure ENET2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet2, &rootCfg);
+
+    /* Configure ENET_QOS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_QOS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Qos, &rootCfg);
+
+    /* Configure ENET_25M using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_25M_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_25m, &rootCfg);
+
+    /* Configure ENET_TIMER1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer1, &rootCfg);
+
+    /* Configure ENET_TIMER2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer2, &rootCfg);
+
+    /* Configure ENET_TIMER3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer3, &rootCfg);
+
+    /* Configure USDHC1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_USDHC1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Usdhc1, &rootCfg);
+
+    /* Configure USDHC2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_USDHC2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Usdhc2, &rootCfg);
+
+    /* Configure ASRC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ASRC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Asrc, &rootCfg);
+
+    /* Configure MQS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MQS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mqs, &rootCfg);
+
+    /* Configure MIC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mic, &rootCfg);
+
+    /* Configure SPDIF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SPDIF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Spdif, &rootCfg);
+
+    /* Configure SAI1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai1, &rootCfg);
+
+    /* Configure SAI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai2, &rootCfg);
+
+    /* Configure SAI3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai3, &rootCfg);
+
+    /* Configure SAI4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai4, &rootCfg);
+
+    /* Configure GC355 using PLL_VIDEO_CLK */
+    rootCfg.mux = kCLOCK_GC355_ClockRoot_MuxVideoPllOut;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Gc355, &rootCfg);
+
+    /* Configure LCDIF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LCDIF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lcdif, &rootCfg);
+
+    /* Configure LCDIFV2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LCDIFV2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lcdifv2, &rootCfg);
+
+    /* Configure MIPI_REF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIPI_REF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mipi_Ref, &rootCfg);
+
+    /* Configure MIPI_ESC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIPI_ESC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mipi_Esc, &rootCfg);
+
+    /* Configure CSI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2, &rootCfg);
+
+    /* Configure CSI2_ESC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_ESC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2_Esc, &rootCfg);
+
+    /* Configure CSI2_UI using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_UI_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2_Ui, &rootCfg);
+
+    /* Configure CSI using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi, &rootCfg);
+
+    /* Configure CKO1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CKO1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cko1, &rootCfg);
+
+    /* Configure CKO2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CKO2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cko2, &rootCfg);
+
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 3);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR,kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Ref clock source. */
+    IOMUXC_GPR->GPR4 &= ~IOMUXC_GPR_GPR4_ENET_REF_CLK_DIR_MASK;
+    /* Set ENET_1G Tx clock source. */
+    IOMUXC_GPR->GPR5 = ((IOMUXC_GPR->GPR5 & ~IOMUXC_GPR_GPR5_ENET1G_TX_CLK_SEL_MASK) | IOMUXC_GPR_GPR5_ENET1G_RGMII_EN_MASK);
+    /* Set ENET_1G Ref clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_ENET1G_REF_CLK_DIR_MASK;
+    /* Set ENET_QOS Tx clock source. */
+    IOMUXC_GPR->GPR6 &= ~IOMUXC_GPR_GPR6_ENET_QOS_RGMII_EN_MASK;
+    /* Set ENET_QOS Ref clock source. */
+    IOMUXC_GPR->GPR6 &= ~IOMUXC_GPR_GPR6_ENET_QOS_REF_CLK_DIR_MASK;
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR22 &= ~IOMUXC_GPR_GPR22_REF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR23 &= ~IOMUXC_GPR_GPR23_REF_1M_CLK_GPT2_MASK;
+    /* Set GPT3 High frequency reference clock source. */
+    IOMUXC_GPR->GPR24 &= ~IOMUXC_GPR_GPR24_REF_1M_CLK_GPT3_MASK;
+    /* Set GPT4 High frequency reference clock source. */
+    IOMUXC_GPR->GPR25 &= ~IOMUXC_GPR_GPR25_REF_1M_CLK_GPT4_MASK;
+    /* Set GPT5 High frequency reference clock source. */
+    IOMUXC_GPR->GPR26 &= ~IOMUXC_GPR_GPR26_REF_1M_CLK_GPT5_MASK;
+    /* Set GPT6 High frequency reference clock source. */
+    IOMUXC_GPR->GPR27 &= ~IOMUXC_GPR_GPR27_REF_1M_CLK_GPT6_MASK;
+
+    #if __CORTEX_M == 7
+    SystemCoreClock = CLOCK_GetRootClockFreq(kCLOCK_Root_M7);
+    #else
+    SystemCoreClock = CLOCK_GetRootClockFreq(kCLOCK_Root_M4);
+    #endif
+}
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
new file mode 100644
index 0000000000..3263bdea09
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
@@ -0,0 +1,358 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/periph.h"
+
+LPI2C_Type *const mcu_i2c_banks[6] = { LPI2C1, LPI2C2, LPI2C3, LPI2C4, LPI2C5, LPI2C6 };
+
+const mcu_periph_obj_t mcu_i2c_sda_list[8] = {
+    PERIPH_PIN(1, 1, 0, 0, &pin_GPIO_AD_09),
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_33),
+
+    PERIPH_PIN(2, 9, 0, 0, &pin_GPIO_EMC_B2_01),
+    PERIPH_PIN(2, 9, 0, 0, &pin_GPIO_AD_19),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_DISP_B1_03),
+    PERIPH_PIN(3, 6, 0, 0, &pin_GPIO_DISP_B2_11),
+
+    PERIPH_PIN(4, 9, 0, 0, &pin_GPIO_AD_25),
+    PERIPH_PIN(4, 6, 0, 0, &pin_GPIO_DISP_B2_13),
+};
+
+const mcu_periph_obj_t mcu_i2c_scl_list[8] = {
+    PERIPH_PIN(1, 1, 0, 0, &pin_GPIO_AD_08),
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_32),
+
+    PERIPH_PIN(2, 9, 0, 0, &pin_GPIO_EMC_B2_00),
+    PERIPH_PIN(2, 9, 0, 0, &pin_GPIO_AD_18),
+
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_DISP_B1_02),
+    PERIPH_PIN(3, 6, 0, 0, &pin_GPIO_DISP_B2_10),
+
+    PERIPH_PIN(4, 9, 0, 0, &pin_GPIO_AD_24),
+    PERIPH_PIN(4, 6, 0, 0, &pin_GPIO_DISP_B2_12),
+};
+
+LPSPI_Type *const mcu_spi_banks[6] = { LPSPI1, LPSPI2, LPSPI3, LPSPI4, LPSPI5, LPSPI6 };
+
+const mcu_periph_obj_t mcu_spi_sck_list[8] = {
+    PERIPH_PIN(1, 8, 0, 0, &pin_GPIO_EMC_B2_00),
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_28),
+
+    PERIPH_PIN(2, 1, 0, 0, &pin_GPIO_AD_24),
+    PERIPH_PIN(2, 6, 0, 0, &pin_GPIO_SD_B2_07),
+
+    PERIPH_PIN(3, 8, 0, 0, &pin_GPIO_EMC_B2_04),
+    PERIPH_PIN(3, 9, 0, 0, &pin_GPIO_DISP_B1_04),
+
+    PERIPH_PIN(4, 4, 0, 0, &pin_GPIO_SD_B2_00),
+    PERIPH_PIN(4, 9, 0, 0, &pin_GPIO_DISP_B2_12),
+};
+
+const mcu_periph_obj_t mcu_spi_sdo_list[0] = {
+};
+
+const mcu_periph_obj_t mcu_spi_sdi_list[0] = {
+};
+
+LPUART_Type *const mcu_uart_banks[12] = { LPUART1, LPUART2, LPUART3, LPUART4, LPUART5, LPUART6, LPUART7, LPUART8, LPUART9, LPUART10, LPUART11, LPUART12 };
+
+const mcu_periph_obj_t mcu_uart_rx_list[15] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_25),
+    PERIPH_PIN(1, 9, 0, 0, &pin_GPIO_DISP_B1_03),
+    PERIPH_PIN(1, 9, 0, 0, &pin_GPIO_DISP_B2_09),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_DISP_B2_11),
+
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_31),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_DISP_B1_04),
+
+    PERIPH_PIN(5, 1, 0, 0, &pin_GPIO_AD_29),
+
+    PERIPH_PIN(6, 3, 0, 0, &pin_GPIO_EMC_B1_41),
+
+    PERIPH_PIN(7, 6, 0, 0, &pin_GPIO_AD_01),
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_DISP_B2_07),
+
+    PERIPH_PIN(8, 6, 0, 0, &pin_GPIO_AD_03),
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_DISP_B2_09),
+
+    PERIPH_PIN(9, 3, 0, 0, &pin_GPIO_SD_B2_01),
+
+    PERIPH_PIN(10, 1, 0, 0, &pin_GPIO_AD_16),
+    PERIPH_PIN(10, 8, 0, 0, &pin_GPIO_AD_33),
+};
+
+const mcu_periph_obj_t mcu_uart_tx_list[15] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_24),
+    PERIPH_PIN(1, 9, 0, 0, &pin_GPIO_DISP_B1_02),
+    PERIPH_PIN(1, 9, 0, 0, &pin_GPIO_DISP_B2_08),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_DISP_B2_10),
+
+    PERIPH_PIN(3, 4, 0, 0, &pin_GPIO_AD_30),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_DISP_B1_06),
+
+    PERIPH_PIN(5, 1, 0, 0, &pin_GPIO_AD_28),
+
+    PERIPH_PIN(6, 3, 0, 0, &pin_GPIO_EMC_B1_40),
+
+    PERIPH_PIN(7, 6, 0, 0, &pin_GPIO_AD_00),
+    PERIPH_PIN(7, 2, 0, 0, &pin_GPIO_DISP_B2_06),
+
+    PERIPH_PIN(8, 6, 0, 0, &pin_GPIO_AD_02),
+    PERIPH_PIN(8, 2, 0, 0, &pin_GPIO_DISP_B2_08),
+
+    PERIPH_PIN(9, 3, 0, 0, &pin_GPIO_SD_B2_00),
+
+    PERIPH_PIN(10, 1, 0, 0, &pin_GPIO_AD_15),
+    PERIPH_PIN(10, 8, 0, 0, &pin_GPIO_AD_32),
+};
+
+const mcu_periph_obj_t mcu_uart_rts_list[10] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_27),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_DISP_B2_13),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B2_08),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_DISP_B1_07),
+
+    PERIPH_PIN(5, 3, 0, 0, &pin_GPIO_SD_B2_10),
+
+    PERIPH_PIN(6, 3, 0, 0, &pin_GPIO_EMC_B2_01),
+
+    PERIPH_PIN(7, 1, 0, 0, &pin_GPIO_AD_03),
+
+    PERIPH_PIN(8, 1, 0, 0, &pin_GPIO_AD_05),
+
+    PERIPH_PIN(9, 3, 0, 0, &pin_GPIO_SD_B2_03),
+
+    PERIPH_PIN(10, 8, 0, 0, &pin_GPIO_AD_35),
+};
+
+const mcu_periph_obj_t mcu_uart_cts_list[10] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_26),
+
+    PERIPH_PIN(2, 3, 0, 0, &pin_GPIO_DISP_B2_12),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_SD_B2_07),
+
+    PERIPH_PIN(4, 2, 0, 0, &pin_GPIO_DISP_B1_05),
+
+    PERIPH_PIN(5, 3, 0, 0, &pin_GPIO_SD_B2_09),
+
+    PERIPH_PIN(6, 3, 0, 0, &pin_GPIO_EMC_B2_00),
+
+    PERIPH_PIN(7, 1, 0, 0, &pin_GPIO_AD_02),
+
+    PERIPH_PIN(8, 1, 0, 0, &pin_GPIO_AD_04),
+
+    PERIPH_PIN(9, 3, 0, 0, &pin_GPIO_SD_B2_02),
+
+    PERIPH_PIN(10, 8, 0, 0, &pin_GPIO_AD_34),
+};
+
+I2S_Type *const mcu_i2s_banks[4] = { SAI1, SAI2, SAI3, SAI4 };
+
+const mcu_periph_obj_t mcu_i2s_rx_data0_list[4] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_20),
+    PERIPH_PIN(1, 4, 0, 0, &pin_GPIO_DISP_B2_06),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_B2_07),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_B2_13),
+};
+
+const mcu_periph_obj_t mcu_i2s_rx_sync_list[4] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_18),
+    PERIPH_PIN(1, 4, 0, 0, &pin_GPIO_DISP_B2_04),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_B2_05),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_B2_11),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_bclk_list[4] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_22),
+    PERIPH_PIN(1, 4, 0, 0, &pin_GPIO_DISP_B2_08),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_B2_09),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_B2_15),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_data0_list[4] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_21),
+    PERIPH_PIN(1, 4, 0, 0, &pin_GPIO_DISP_B2_07),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_B2_08),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_B2_14),
+};
+
+const mcu_periph_obj_t mcu_i2s_tx_sync_list[4] = {
+    PERIPH_PIN(1, 0, 0, 0, &pin_GPIO_AD_23),
+    PERIPH_PIN(1, 4, 0, 0, &pin_GPIO_DISP_B2_09),
+
+    PERIPH_PIN(2, 2, 0, 0, &pin_GPIO_EMC_B2_10),
+
+    PERIPH_PIN(3, 3, 0, 0, &pin_GPIO_EMC_B2_16),
+};
+
+const mcu_periph_obj_t mcu_mqs_left_list[2] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_B1_41),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_DISP_B2_01),
+};
+
+const mcu_periph_obj_t mcu_mqs_right_list[2] = {
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_EMC_B1_40),
+    PERIPH_PIN(3, 2, 0, 0, &pin_GPIO_DISP_B2_00),
+};
+
+const mcu_pwm_obj_t mcu_pwm_list[68] = {
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_23_FLEXPWM1_PWM0_A, &pin_GPIO_EMC_B1_23),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_00_FLEXPWM1_PWM0_A, &pin_GPIO_AD_00),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_24_FLEXPWM1_PWM0_B, &pin_GPIO_EMC_B1_24),
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_AD_01_FLEXPWM1_PWM0_B, &pin_GPIO_AD_01),
+
+    PWM_PIN(PWM1, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_06_FLEXPWM1_PWM0_X, &pin_GPIO_AD_06),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_25_FLEXPWM1_PWM1_A, &pin_GPIO_EMC_B1_25),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_02_FLEXPWM1_PWM1_A, &pin_GPIO_AD_02),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_26_FLEXPWM1_PWM1_B, &pin_GPIO_EMC_B1_26),
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_AD_03_FLEXPWM1_PWM1_B, &pin_GPIO_AD_03),
+
+    PWM_PIN(PWM1, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_07_FLEXPWM1_PWM1_X, &pin_GPIO_AD_07),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_27_FLEXPWM1_PWM2_A, &pin_GPIO_EMC_B1_27),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_04_FLEXPWM1_PWM2_A, &pin_GPIO_AD_04),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_28_FLEXPWM1_PWM2_B, &pin_GPIO_EMC_B1_28),
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_05_FLEXPWM1_PWM2_B, &pin_GPIO_AD_05),
+
+    PWM_PIN(PWM1, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_08_FLEXPWM1_PWM2_X, &pin_GPIO_AD_08),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_38_FLEXPWM1_PWM3_A, &pin_GPIO_EMC_B1_38),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_39_FLEXPWM1_PWM3_B, &pin_GPIO_EMC_B1_39),
+
+    PWM_PIN(PWM1, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_09_FLEXPWM1_PWM3_X, &pin_GPIO_AD_09),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_06_FLEXPWM2_PWM0_A, &pin_GPIO_EMC_B1_06),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_AD_24_FLEXPWM2_PWM0_A, &pin_GPIO_AD_24),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_07_FLEXPWM2_PWM0_B, &pin_GPIO_EMC_B1_07),
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_AD_25_FLEXPWM2_PWM0_B, &pin_GPIO_AD_25),
+
+    PWM_PIN(PWM2, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_10_FLEXPWM2_PWM0_X, &pin_GPIO_AD_10),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_08_FLEXPWM2_PWM1_A, &pin_GPIO_EMC_B1_08),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_AD_26_FLEXPWM2_PWM1_A, &pin_GPIO_AD_26),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_09_FLEXPWM2_PWM1_B, &pin_GPIO_EMC_B1_09),
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_AD_27_FLEXPWM2_PWM1_B, &pin_GPIO_AD_27),
+
+    PWM_PIN(PWM2, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_11_FLEXPWM2_PWM1_X, &pin_GPIO_AD_11),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_10_FLEXPWM2_PWM2_A, &pin_GPIO_EMC_B1_10),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_AD_28_FLEXPWM2_PWM2_A, &pin_GPIO_AD_28),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_11_FLEXPWM2_PWM2_B, &pin_GPIO_EMC_B1_11),
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_AD_29_FLEXPWM2_PWM2_B, &pin_GPIO_AD_29),
+
+    PWM_PIN(PWM2, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_12_FLEXPWM2_PWM2_X, &pin_GPIO_AD_12),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_19_FLEXPWM2_PWM3_A, &pin_GPIO_EMC_B1_19),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_20_FLEXPWM2_PWM3_B, &pin_GPIO_EMC_B1_20),
+
+    PWM_PIN(PWM2, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_13_FLEXPWM2_PWM3_X, &pin_GPIO_AD_13),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_29_FLEXPWM3_PWM0_A, &pin_GPIO_EMC_B1_29),
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_B2_00_FLEXPWM3_PWM0_A, &pin_GPIO_EMC_B2_00),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_30_FLEXPWM3_PWM0_B, &pin_GPIO_EMC_B1_30),
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_B2_01_FLEXPWM3_PWM0_B, &pin_GPIO_EMC_B2_01),
+
+    PWM_PIN(PWM3, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_14_FLEXPWM3_PWM0_X, &pin_GPIO_AD_14),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_31_FLEXPWM3_PWM1_A, &pin_GPIO_EMC_B1_31),
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_B2_02_FLEXPWM3_PWM1_A, &pin_GPIO_EMC_B2_02),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_32_FLEXPWM3_PWM1_B, &pin_GPIO_EMC_B1_32),
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_B2_03_FLEXPWM3_PWM1_B, &pin_GPIO_EMC_B2_03),
+
+    PWM_PIN(PWM3, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_15_FLEXPWM3_PWM1_X, &pin_GPIO_AD_15),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_33_FLEXPWM3_PWM2_A, &pin_GPIO_EMC_B1_33),
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_B2_04_FLEXPWM3_PWM2_A, &pin_GPIO_EMC_B2_04),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_34_FLEXPWM3_PWM2_B, &pin_GPIO_EMC_B1_34),
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_B2_05_FLEXPWM3_PWM2_B, &pin_GPIO_EMC_B2_05),
+
+    PWM_PIN(PWM3, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_16_FLEXPWM3_PWM2_X, &pin_GPIO_AD_16),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_21_FLEXPWM3_PWM3_A, &pin_GPIO_EMC_B1_21),
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_B2_06_FLEXPWM3_PWM3_A, &pin_GPIO_EMC_B2_06),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_22_FLEXPWM3_PWM3_B, &pin_GPIO_EMC_B1_22),
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_B2_07_FLEXPWM3_PWM3_B, &pin_GPIO_EMC_B2_07),
+
+    PWM_PIN(PWM3, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_17_FLEXPWM3_PWM3_X, &pin_GPIO_AD_17),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_00_FLEXPWM4_PWM0_A, &pin_GPIO_EMC_B1_00),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_01_FLEXPWM4_PWM0_B, &pin_GPIO_EMC_B1_01),
+
+    PWM_PIN(PWM4, kPWM_Module_0, kPWM_PwmX, IOMUXC_GPIO_AD_18_FLEXPWM4_PWM0_X, &pin_GPIO_AD_18),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_02_FLEXPWM4_PWM1_A, &pin_GPIO_EMC_B1_02),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_03_FLEXPWM4_PWM1_B, &pin_GPIO_EMC_B1_03),
+
+    PWM_PIN(PWM4, kPWM_Module_1, kPWM_PwmX, IOMUXC_GPIO_AD_19_FLEXPWM4_PWM1_X, &pin_GPIO_AD_19),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_04_FLEXPWM4_PWM2_A, &pin_GPIO_EMC_B1_04),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_05_FLEXPWM4_PWM2_B, &pin_GPIO_EMC_B1_05),
+
+    PWM_PIN(PWM4, kPWM_Module_2, kPWM_PwmX, IOMUXC_GPIO_AD_20_FLEXPWM4_PWM2_X, &pin_GPIO_AD_20),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmA, IOMUXC_GPIO_EMC_B1_17_FLEXPWM4_PWM3_A, &pin_GPIO_EMC_B1_17),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmB, IOMUXC_GPIO_EMC_B1_18_FLEXPWM4_PWM3_B, &pin_GPIO_EMC_B1_18),
+
+    PWM_PIN(PWM4, kPWM_Module_3, kPWM_PwmX, IOMUXC_GPIO_AD_21_FLEXPWM4_PWM3_X, &pin_GPIO_AD_21),
+};
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
new file mode 100644
index 0000000000..41695d655b
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+extern LPI2C_Type *const mcu_i2c_banks[6];
+extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
+extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
+
+extern LPSPI_Type *const mcu_spi_banks[6];
+extern const mcu_periph_obj_t mcu_spi_sck_list[8];
+extern const mcu_periph_obj_t mcu_spi_sdo_list[0];
+extern const mcu_periph_obj_t mcu_spi_sdi_list[0];
+
+extern LPUART_Type *const mcu_uart_banks[12];
+extern const mcu_periph_obj_t mcu_uart_rx_list[15];
+extern const mcu_periph_obj_t mcu_uart_tx_list[15];
+extern const mcu_periph_obj_t mcu_uart_rts_list[10];
+extern const mcu_periph_obj_t mcu_uart_cts_list[10];
+
+extern I2S_Type *const mcu_i2s_banks[4];
+extern const mcu_periph_obj_t mcu_i2s_rx_data0_list[4];
+extern const mcu_periph_obj_t mcu_i2s_rx_sync_list[4];
+extern const mcu_periph_obj_t mcu_i2s_tx_bclk_list[4];
+extern const mcu_periph_obj_t mcu_i2s_tx_data0_list[4];
+extern const mcu_periph_obj_t mcu_i2s_tx_sync_list[4];
+
+extern const mcu_periph_obj_t mcu_mqs_left_list[2];
+extern const mcu_periph_obj_t mcu_mqs_right_list[2];
+
+extern const mcu_pwm_obj_t mcu_pwm_list[68];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pin_names.h
new file mode 100644
index 0000000000..6dcd77a6a2
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pin_names.h
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+
+
+// define FORMAT_PIN(pin_name) and then include this file.
+
+FORMAT_PIN(GPIO_EMC_B1_00)
+FORMAT_PIN(GPIO_EMC_B1_01)
+FORMAT_PIN(GPIO_EMC_B1_02)
+FORMAT_PIN(GPIO_EMC_B1_03)
+FORMAT_PIN(GPIO_EMC_B1_04)
+FORMAT_PIN(GPIO_EMC_B1_05)
+FORMAT_PIN(GPIO_EMC_B1_06)
+FORMAT_PIN(GPIO_EMC_B1_07)
+FORMAT_PIN(GPIO_EMC_B1_08)
+FORMAT_PIN(GPIO_EMC_B1_09)
+FORMAT_PIN(GPIO_EMC_B1_10)
+FORMAT_PIN(GPIO_EMC_B1_11)
+FORMAT_PIN(GPIO_EMC_B1_12)
+FORMAT_PIN(GPIO_EMC_B1_13)
+FORMAT_PIN(GPIO_EMC_B1_14)
+FORMAT_PIN(GPIO_EMC_B1_15)
+FORMAT_PIN(GPIO_EMC_B1_16)
+FORMAT_PIN(GPIO_EMC_B1_17)
+FORMAT_PIN(GPIO_EMC_B1_18)
+FORMAT_PIN(GPIO_EMC_B1_19)
+FORMAT_PIN(GPIO_EMC_B1_20)
+FORMAT_PIN(GPIO_EMC_B1_21)
+FORMAT_PIN(GPIO_EMC_B1_22)
+FORMAT_PIN(GPIO_EMC_B1_23)
+FORMAT_PIN(GPIO_EMC_B1_24)
+FORMAT_PIN(GPIO_EMC_B1_25)
+FORMAT_PIN(GPIO_EMC_B1_26)
+FORMAT_PIN(GPIO_EMC_B1_27)
+FORMAT_PIN(GPIO_EMC_B1_28)
+FORMAT_PIN(GPIO_EMC_B1_29)
+FORMAT_PIN(GPIO_EMC_B1_30)
+FORMAT_PIN(GPIO_EMC_B1_31)
+FORMAT_PIN(GPIO_EMC_B1_32)
+FORMAT_PIN(GPIO_EMC_B1_33)
+FORMAT_PIN(GPIO_EMC_B1_34)
+FORMAT_PIN(GPIO_EMC_B1_35)
+FORMAT_PIN(GPIO_EMC_B1_36)
+FORMAT_PIN(GPIO_EMC_B1_37)
+FORMAT_PIN(GPIO_EMC_B1_38)
+FORMAT_PIN(GPIO_EMC_B1_39)
+FORMAT_PIN(GPIO_EMC_B1_40)
+FORMAT_PIN(GPIO_EMC_B1_41)
+
+FORMAT_PIN(GPIO_EMC_B2_00)
+FORMAT_PIN(GPIO_EMC_B2_01)
+FORMAT_PIN(GPIO_EMC_B2_02)
+FORMAT_PIN(GPIO_EMC_B2_03)
+FORMAT_PIN(GPIO_EMC_B2_04)
+FORMAT_PIN(GPIO_EMC_B2_05)
+FORMAT_PIN(GPIO_EMC_B2_06)
+FORMAT_PIN(GPIO_EMC_B2_07)
+FORMAT_PIN(GPIO_EMC_B2_08)
+FORMAT_PIN(GPIO_EMC_B2_09)
+FORMAT_PIN(GPIO_EMC_B2_10)
+FORMAT_PIN(GPIO_EMC_B2_11)
+FORMAT_PIN(GPIO_EMC_B2_12)
+FORMAT_PIN(GPIO_EMC_B2_13)
+FORMAT_PIN(GPIO_EMC_B2_14)
+FORMAT_PIN(GPIO_EMC_B2_15)
+FORMAT_PIN(GPIO_EMC_B2_16)
+FORMAT_PIN(GPIO_EMC_B2_17)
+FORMAT_PIN(GPIO_EMC_B2_18)
+FORMAT_PIN(GPIO_EMC_B2_19)
+FORMAT_PIN(GPIO_EMC_B2_20)
+
+FORMAT_PIN(GPIO_AD_00)
+FORMAT_PIN(GPIO_AD_01)
+FORMAT_PIN(GPIO_AD_02)
+FORMAT_PIN(GPIO_AD_03)
+FORMAT_PIN(GPIO_AD_04)
+FORMAT_PIN(GPIO_AD_05)
+FORMAT_PIN(GPIO_AD_06)
+FORMAT_PIN(GPIO_AD_07)
+FORMAT_PIN(GPIO_AD_08)
+FORMAT_PIN(GPIO_AD_09)
+FORMAT_PIN(GPIO_AD_10)
+FORMAT_PIN(GPIO_AD_11)
+FORMAT_PIN(GPIO_AD_12)
+FORMAT_PIN(GPIO_AD_13)
+FORMAT_PIN(GPIO_AD_14)
+FORMAT_PIN(GPIO_AD_15)
+FORMAT_PIN(GPIO_AD_16)
+FORMAT_PIN(GPIO_AD_17)
+FORMAT_PIN(GPIO_AD_18)
+FORMAT_PIN(GPIO_AD_19)
+FORMAT_PIN(GPIO_AD_20)
+FORMAT_PIN(GPIO_AD_21)
+FORMAT_PIN(GPIO_AD_22)
+FORMAT_PIN(GPIO_AD_23)
+FORMAT_PIN(GPIO_AD_24)
+FORMAT_PIN(GPIO_AD_25)
+FORMAT_PIN(GPIO_AD_26)
+FORMAT_PIN(GPIO_AD_27)
+FORMAT_PIN(GPIO_AD_28)
+FORMAT_PIN(GPIO_AD_29)
+FORMAT_PIN(GPIO_AD_30)
+FORMAT_PIN(GPIO_AD_31)
+FORMAT_PIN(GPIO_AD_32)
+FORMAT_PIN(GPIO_AD_33)
+FORMAT_PIN(GPIO_AD_34)
+FORMAT_PIN(GPIO_AD_35)
+
+FORMAT_PIN(GPIO_SD_B1_00)
+FORMAT_PIN(GPIO_SD_B1_01)
+FORMAT_PIN(GPIO_SD_B1_02)
+FORMAT_PIN(GPIO_SD_B1_03)
+FORMAT_PIN(GPIO_SD_B1_04)
+FORMAT_PIN(GPIO_SD_B1_05)
+
+FORMAT_PIN(GPIO_SD_B2_00)
+FORMAT_PIN(GPIO_SD_B2_01)
+FORMAT_PIN(GPIO_SD_B2_02)
+FORMAT_PIN(GPIO_SD_B2_03)
+FORMAT_PIN(GPIO_SD_B2_04)
+FORMAT_PIN(GPIO_SD_B2_05)
+FORMAT_PIN(GPIO_SD_B2_06)
+FORMAT_PIN(GPIO_SD_B2_07)
+FORMAT_PIN(GPIO_SD_B2_08)
+FORMAT_PIN(GPIO_SD_B2_09)
+FORMAT_PIN(GPIO_SD_B2_10)
+FORMAT_PIN(GPIO_SD_B2_11)
+
+FORMAT_PIN(GPIO_DISP_B1_00)
+FORMAT_PIN(GPIO_DISP_B1_01)
+FORMAT_PIN(GPIO_DISP_B1_02)
+FORMAT_PIN(GPIO_DISP_B1_03)
+FORMAT_PIN(GPIO_DISP_B1_04)
+FORMAT_PIN(GPIO_DISP_B1_05)
+FORMAT_PIN(GPIO_DISP_B1_06)
+FORMAT_PIN(GPIO_DISP_B1_07)
+FORMAT_PIN(GPIO_DISP_B1_08)
+FORMAT_PIN(GPIO_DISP_B1_09)
+FORMAT_PIN(GPIO_DISP_B1_10)
+FORMAT_PIN(GPIO_DISP_B1_11)
+
+FORMAT_PIN(GPIO_DISP_B2_00)
+FORMAT_PIN(GPIO_DISP_B2_01)
+FORMAT_PIN(GPIO_DISP_B2_02)
+FORMAT_PIN(GPIO_DISP_B2_03)
+FORMAT_PIN(GPIO_DISP_B2_04)
+FORMAT_PIN(GPIO_DISP_B2_05)
+FORMAT_PIN(GPIO_DISP_B2_06)
+FORMAT_PIN(GPIO_DISP_B2_07)
+FORMAT_PIN(GPIO_DISP_B2_08)
+FORMAT_PIN(GPIO_DISP_B2_09)
+FORMAT_PIN(GPIO_DISP_B2_10)
+FORMAT_PIN(GPIO_DISP_B2_11)
+FORMAT_PIN(GPIO_DISP_B2_12)
+FORMAT_PIN(GPIO_DISP_B2_13)
+FORMAT_PIN(GPIO_DISP_B2_14)
+FORMAT_PIN(GPIO_DISP_B2_15)
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
new file mode 100644
index 0000000000..71562462e6
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
@@ -0,0 +1,177 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "mimxrt10xx/pins.h"
+
+const mcu_pin_obj_t pin_GPIO_EMC_B1_00 = PIN(GPIO7, 0, GPIO_EMC_B1_00, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_01 = PIN(GPIO7, 1, GPIO_EMC_B1_01, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_02 = PIN(GPIO7, 2, GPIO_EMC_B1_02, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_03 = PIN(GPIO7, 3, GPIO_EMC_B1_03, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_04 = PIN(GPIO7, 4, GPIO_EMC_B1_04, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_05 = PIN(GPIO7, 5, GPIO_EMC_B1_05, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_06 = PIN(GPIO7, 6, GPIO_EMC_B1_06, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_07 = PIN(GPIO7, 7, GPIO_EMC_B1_07, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_08 = PIN(GPIO7, 8, GPIO_EMC_B1_08, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_09 = PIN(GPIO7, 9, GPIO_EMC_B1_09, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_10 = PIN(GPIO7, 10, GPIO_EMC_B1_10, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_11 = PIN(GPIO7, 11, GPIO_EMC_B1_11, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_12 = PIN(GPIO7, 12, GPIO_EMC_B1_12, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_13 = PIN(GPIO7, 13, GPIO_EMC_B1_13, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_14 = PIN(GPIO7, 14, GPIO_EMC_B1_14, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_15 = PIN(GPIO7, 15, GPIO_EMC_B1_15, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_16 = PIN(GPIO7, 16, GPIO_EMC_B1_16, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_17 = PIN(GPIO7, 17, GPIO_EMC_B1_17, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_18 = PIN(GPIO7, 18, GPIO_EMC_B1_18, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_19 = PIN(GPIO7, 19, GPIO_EMC_B1_19, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_20 = PIN(GPIO7, 20, GPIO_EMC_B1_20, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_21 = PIN(GPIO7, 21, GPIO_EMC_B1_21, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_22 = PIN(GPIO7, 22, GPIO_EMC_B1_22, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_23 = PIN(GPIO7, 23, GPIO_EMC_B1_23, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_24 = PIN(GPIO7, 24, GPIO_EMC_B1_24, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_25 = PIN(GPIO7, 25, GPIO_EMC_B1_25, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_26 = PIN(GPIO7, 26, GPIO_EMC_B1_26, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_27 = PIN(GPIO7, 27, GPIO_EMC_B1_27, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_28 = PIN(GPIO7, 28, GPIO_EMC_B1_28, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_29 = PIN(GPIO7, 29, GPIO_EMC_B1_29, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_30 = PIN(GPIO7, 30, GPIO_EMC_B1_30, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_31 = PIN(GPIO7, 31, GPIO_EMC_B1_31, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_32 = PIN(GPIO8, 0, GPIO_EMC_B1_32, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_33 = PIN(GPIO8, 1, GPIO_EMC_B1_33, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_34 = PIN(GPIO8, 2, GPIO_EMC_B1_34, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_35 = PIN(GPIO8, 3, GPIO_EMC_B1_35, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_36 = PIN(GPIO8, 4, GPIO_EMC_B1_36, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_37 = PIN(GPIO8, 5, GPIO_EMC_B1_37, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_38 = PIN(GPIO8, 6, GPIO_EMC_B1_38, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_39 = PIN(GPIO8, 7, GPIO_EMC_B1_39, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_40 = PIN(GPIO8, 8, GPIO_EMC_B1_40, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B1_41 = PIN(GPIO8, 9, GPIO_EMC_B1_41, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_00 = PIN(GPIO8, 10, GPIO_EMC_B2_00, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_01 = PIN(GPIO8, 11, GPIO_EMC_B2_01, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_02 = PIN(GPIO8, 12, GPIO_EMC_B2_02, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_03 = PIN(GPIO8, 13, GPIO_EMC_B2_03, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_04 = PIN(GPIO8, 14, GPIO_EMC_B2_04, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_05 = PIN(GPIO8, 15, GPIO_EMC_B2_05, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_06 = PIN(GPIO8, 16, GPIO_EMC_B2_06, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_07 = PIN(GPIO8, 17, GPIO_EMC_B2_07, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_08 = PIN(GPIO8, 18, GPIO_EMC_B2_08, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_09 = PIN(GPIO8, 19, GPIO_EMC_B2_09, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_10 = PIN(GPIO8, 20, GPIO_EMC_B2_10, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_11 = PIN(GPIO8, 21, GPIO_EMC_B2_11, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_12 = PIN(GPIO8, 22, GPIO_EMC_B2_12, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_13 = PIN(GPIO8, 23, GPIO_EMC_B2_13, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_14 = PIN(GPIO8, 24, GPIO_EMC_B2_14, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_15 = PIN(GPIO8, 25, GPIO_EMC_B2_15, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_16 = PIN(GPIO8, 26, GPIO_EMC_B2_16, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_17 = PIN(GPIO8, 27, GPIO_EMC_B2_17, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_18 = PIN(GPIO8, 28, GPIO_EMC_B2_18, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_19 = PIN(GPIO8, 29, GPIO_EMC_B2_19, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_EMC_B2_20 = PIN(GPIO8, 30, GPIO_EMC_B2_20, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_AD_00 = PIN(GPIO8, 31, GPIO_AD_00, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_AD_01 = PIN(GPIO9, 0, GPIO_AD_01, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_AD_02 = PIN(GPIO9, 1, GPIO_AD_02, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_03 = PIN(GPIO9, 2, GPIO_AD_03, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_04 = PIN(GPIO9, 3, GPIO_AD_04, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_05 = PIN(GPIO9, 4, GPIO_AD_05, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_06 = PIN(GPIO9, 5, GPIO_AD_06, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_07 = PIN(GPIO9, 6, GPIO_AD_07, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_08 = PIN(GPIO9, 7, GPIO_AD_08, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_09 = PIN(GPIO9, 8, GPIO_AD_09, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_10 = PIN(GPIO9, 9, GPIO_AD_10, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_11 = PIN(GPIO9, 10, GPIO_AD_11, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_12 = PIN(GPIO9, 11, GPIO_AD_12, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_13 = PIN(GPIO9, 12, GPIO_AD_13, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_14 = PIN(GPIO9, 13, GPIO_AD_14, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_15 = PIN(GPIO9, 14, GPIO_AD_15, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_16 = PIN(GPIO9, 15, GPIO_AD_16, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_17 = PIN(GPIO9, 16, GPIO_AD_17, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_18 = PIN(GPIO9, 17, GPIO_AD_18, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_AD_19 = PIN(GPIO9, 18, GPIO_AD_19, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_20 = PIN(GPIO9, 19, GPIO_AD_20, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_21 = PIN(GPIO9, 20, GPIO_AD_21, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_22 = PIN(GPIO9, 21, GPIO_AD_22, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_23 = PIN(GPIO9, 22, GPIO_AD_23, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_24 = PIN(GPIO9, 23, GPIO_AD_24, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_25 = PIN(GPIO9, 24, GPIO_AD_25, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_26 = PIN(GPIO9, 25, GPIO_AD_26, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_AD_27 = PIN(GPIO9, 26, GPIO_AD_27, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_AD_28 = PIN(GPIO9, 27, GPIO_AD_28, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_29 = PIN(GPIO9, 28, GPIO_AD_29, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_30 = PIN(GPIO9, 29, GPIO_AD_30, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_31 = PIN(GPIO9, 30, GPIO_AD_31, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_32 = PIN(GPIO9, 31, GPIO_AD_32, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_33 = PIN(GPIO10, 0, GPIO_AD_33, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_34 = PIN(GPIO10, 1, GPIO_AD_34, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_AD_35 = PIN(GPIO10, 2, GPIO_AD_35, NO_ADC, 0, 0x00000005, 0x0000000E);
+const mcu_pin_obj_t pin_GPIO_SD_B1_00 = PIN(GPIO10, 3, GPIO_SD_B1_00, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B1_01 = PIN(GPIO10, 4, GPIO_SD_B1_01, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B1_02 = PIN(GPIO10, 5, GPIO_SD_B1_02, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B1_03 = PIN(GPIO10, 6, GPIO_SD_B1_03, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B1_04 = PIN(GPIO10, 7, GPIO_SD_B1_04, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B1_05 = PIN(GPIO10, 8, GPIO_SD_B1_05, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_00 = PIN(GPIO10, 9, GPIO_SD_B2_00, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_01 = PIN(GPIO10, 10, GPIO_SD_B2_01, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_02 = PIN(GPIO10, 11, GPIO_SD_B2_02, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_03 = PIN(GPIO10, 12, GPIO_SD_B2_03, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_04 = PIN(GPIO10, 13, GPIO_SD_B2_04, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B2_05 = PIN(GPIO10, 14, GPIO_SD_B2_05, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B2_06 = PIN(GPIO10, 15, GPIO_SD_B2_06, NO_ADC, 0, 0x00000005, 0x00000004);
+const mcu_pin_obj_t pin_GPIO_SD_B2_07 = PIN(GPIO10, 16, GPIO_SD_B2_07, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_08 = PIN(GPIO10, 17, GPIO_SD_B2_08, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_09 = PIN(GPIO10, 18, GPIO_SD_B2_09, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_10 = PIN(GPIO10, 19, GPIO_SD_B2_10, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_SD_B2_11 = PIN(GPIO10, 20, GPIO_SD_B2_11, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_00 = PIN(GPIO10, 21, GPIO_DISP_B1_00, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_01 = PIN(GPIO10, 22, GPIO_DISP_B1_01, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_02 = PIN(GPIO10, 23, GPIO_DISP_B1_02, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_03 = PIN(GPIO10, 24, GPIO_DISP_B1_03, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_04 = PIN(GPIO10, 25, GPIO_DISP_B1_04, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_05 = PIN(GPIO10, 26, GPIO_DISP_B1_05, NO_ADC, 0, 0x00000005, 0x00000008);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_06 = PIN(GPIO10, 27, GPIO_DISP_B1_06, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_07 = PIN(GPIO10, 28, GPIO_DISP_B1_07, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_08 = PIN(GPIO10, 29, GPIO_DISP_B1_08, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_09 = PIN(GPIO10, 30, GPIO_DISP_B1_09, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_10 = PIN(GPIO10, 31, GPIO_DISP_B1_10, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B1_11 = PIN(GPIO11, 0, GPIO_DISP_B1_11, NO_ADC, 0, 0x00000005, 0x0000000C);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_00 = PIN(GPIO11, 1, GPIO_DISP_B2_00, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_01 = PIN(GPIO11, 2, GPIO_DISP_B2_01, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_02 = PIN(GPIO11, 3, GPIO_DISP_B2_02, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_03 = PIN(GPIO11, 4, GPIO_DISP_B2_03, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_04 = PIN(GPIO11, 5, GPIO_DISP_B2_04, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_05 = PIN(GPIO11, 6, GPIO_DISP_B2_05, NO_ADC, 0, 0x00000005, 0x00000002);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_06 = PIN(GPIO11, 7, GPIO_DISP_B2_06, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_07 = PIN(GPIO11, 8, GPIO_DISP_B2_07, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_08 = PIN(GPIO11, 9, GPIO_DISP_B2_08, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_09 = PIN(GPIO11, 10, GPIO_DISP_B2_09, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_10 = PIN(GPIO11, 11, GPIO_DISP_B2_10, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_11 = PIN(GPIO11, 12, GPIO_DISP_B2_11, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_12 = PIN(GPIO11, 13, GPIO_DISP_B2_12, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_13 = PIN(GPIO11, 14, GPIO_DISP_B2_13, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_14 = PIN(GPIO11, 15, GPIO_DISP_B2_14, NO_ADC, 0, 0x00000005, 0x00000006);
+const mcu_pin_obj_t pin_GPIO_DISP_B2_15 = PIN(GPIO11, 16, GPIO_DISP_B2_15, NO_ADC, 0, 0x00000005, 0x0000000E);
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
new file mode 100644
index 0000000000..0d99219c8a
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
+#include "pin_names.h"
+#undef FORMAT_PIN
+
+#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 0)
+extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
index 8184d5b135..ffbd72339e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/periph.h
@@ -78,10 +78,18 @@ extern LPUART_Type *const mcu_uart_banks[];
 
 #ifdef MIMXRT1011_SERIES
 #include "MIMXRT1011/periph.h"
+#elif defined(MIMXRT1015_SERIES)
+#include "MIMXRT1015/periph.h"
 #elif defined(MIMXRT1021_SERIES)
 #include "MIMXRT1021/periph.h"
+#elif defined(MIMXRT1042_SERIES)
+#include "MIMXRT1042/periph.h"
+#elif defined(MIMXRT1052_SERIES)
+#include "MIMXRT1052/periph.h"
 #elif defined(MIMXRT1062_SERIES)
 #include "MIMXRT1062/periph.h"
+#elif defined(MIMXRT1176_cm7_SERIES)
+#include "MIMXRT1176/periph.h"
 #endif
 
 #endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_PERIPH_H
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pin_names.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/pin_names.h
new file mode 100644
index 0000000000..37db5c2261
--- /dev/null
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pin_names.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ */
+
+// OK to include more than once because FORMAT_PIN may be different.
+
+#ifdef MIMXRT1011_SERIES
+#include "MIMXRT1011/pin_names.h"
+#elif defined(MIMXRT1021_SERIES)
+#include "MIMXRT1021/pin_names.h"
+#elif defined(MIMXRT1042_SERIES)
+#include "MIMXRT1042/pin_names.h"
+#elif defined(MIMXRT1052_SERIES)
+#include "MIMXRT1052/pin_names.h"
+#elif defined(MIMXRT1062_SERIES)
+#include "MIMXRT1062/pin_names.h"
+#elif defined(MIMXRT1176_cm7_SERIES)
+#include "MIMXRT1176/pin_names.h"
+#endif
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
index 0457a09a1a..8ffc17ba07 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/pins.h
@@ -78,10 +78,18 @@ void enable_pin_change_interrupt(const mcu_pin_obj_t *pin, gpio_change_interrupt
 
 #ifdef MIMXRT1011_SERIES
 #include "MIMXRT1011/pins.h"
+#elif defined(MIMXRT1015_SERIES)
+#include "MIMXRT1015/pins.h"
 #elif defined(MIMXRT1021_SERIES)
 #include "MIMXRT1021/pins.h"
+#elif defined(MIMXRT1042_SERIES)
+#include "MIMXRT1042/pins.h"
+#elif defined(MIMXRT1052_SERIES)
+#include "MIMXRT1052/pins.h"
 #elif defined(MIMXRT1062_SERIES)
 #include "MIMXRT1062/pins.h"
+#elif defined(MIMXRT1176_cm7_SERIES)
+#include "MIMXRT1176/pins.h"
 #endif
 
 #endif // MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_PINS_H
diff --git a/ports/mimxrt10xx/sdk b/ports/mimxrt10xx/sdk
index 2b9354539e..9990f264f9 160000
--- a/ports/mimxrt10xx/sdk
+++ b/ports/mimxrt10xx/sdk
@@ -1 +1 @@
-Subproject commit 2b9354539e6e4f722749e87b0bdc22966dc080d9
+Subproject commit 9990f264f98430f6d885041ab0f24224d68f4958
diff --git a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
index e32eaf8832..3ccd67096a 100644
--- a/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
+++ b/ports/mimxrt10xx/supervisor/flexspi_nor_flash_ops.c
@@ -137,7 +137,7 @@ status_t PLACE_IN_ITCM(flexspi_nor_flash_page_program)(FLEXSPI_Type * base, uint
     status = flexspi_nor_wait_bus_busy(base);
 
     /* Do software reset. */
-    #if defined(FSL_FEATURE_SOC_OTFAD_COUNT)
+    #if defined(FSL_FEATURE_SOC_OTFAD_COUNT) && FSL_FEATURE_SOC_OTFAD_COUNT == 1
     base->AHBCR |= FLEXSPI_AHBCR_CLRAHBRXBUF_MASK | FLEXSPI_AHBCR_CLRAHBTXBUF_MASK;
     base->AHBCR &= ~(FLEXSPI_AHBCR_CLRAHBRXBUF_MASK | FLEXSPI_AHBCR_CLRAHBTXBUF_MASK);
     #else
diff --git a/ports/mimxrt10xx/supervisor/internal_flash.c b/ports/mimxrt10xx/supervisor/internal_flash.c
index bacb62854a..cd4dd33ba0 100644
--- a/ports/mimxrt10xx/supervisor/internal_flash.c
+++ b/ports/mimxrt10xx/supervisor/internal_flash.c
@@ -52,6 +52,11 @@ extern uint32_t __fatfs_flash_length[];
 uint8_t _flash_cache[SECTOR_SIZE] __attribute__((aligned(4)));
 uint32_t _flash_page_addr = NO_CACHE;
 
+#ifndef FLEXSPI
+#define FLEXSPI FLEXSPI1
+#define FlexSPI_AMBA_BASE FlexSPI1_AMBA_BASE
+#endif
+
 void PLACE_IN_ITCM(supervisor_flash_init)(void) {
     // Update the LUT to make sure all entries are available. Copy the values to
     // memory first so that we don't read from the flash as we update the LUT.
@@ -62,6 +67,41 @@ void PLACE_IN_ITCM(supervisor_flash_init)(void) {
     __DSB();
     __ISB();
     flexspi_nor_init();
+
+    #if IMXRT10XX
+    // Disable interrupts of priority 8+. They likely use code in flash
+    // itself. Higher priority interrupts (<8) should ensure all of their
+    // code is in RAM.
+    __set_BASEPRI(8 << (8 - __NVIC_PRIO_BITS));
+
+    // Increase clock speed to 120 MHz
+    // Wait for bus idle before change flash configuration.
+    while (!FLEXSPI_GetBusIdleStatus(FLEXSPI)) {
+    }
+    FLEXSPI_Enable(FLEXSPI, false);
+
+    // Disable FlexSPI clock
+    CCM->CCGR6 &= ~CCM_CCGR6_CG5_MASK;
+
+    // Changing the clock is OK now.
+
+    // The PFD is 480 * 18 / PFD0_FRAC. We do / 18 which outputs 480 MHz.
+    CCM_ANALOG->PFD_480 = (CCM_ANALOG->PFD_480 & ~CCM_ANALOG_PFD_480_TOG_PFD0_FRAC_MASK) | CCM_ANALOG_PFD_480_TOG_PFD0_FRAC(18);
+
+    // This divides down the 480 Mhz by PODF + 1. So 480 / (3 + 1) = 120 MHz.
+    CCM->CSCMR1 = (CCM->CSCMR1 & ~CCM_CSCMR1_FLEXSPI_PODF_MASK) | CCM_CSCMR1_FLEXSPI_PODF(3);
+
+    // Re-enable FlexSPI
+    CCM->CCGR6 |= CCM_CCGR6_CG5_MASK;
+
+    FLEXSPI_Enable(FLEXSPI, true);
+
+    FLEXSPI_SoftwareReset(FLEXSPI);
+
+    while (!FLEXSPI_GetBusIdleStatus(FLEXSPI)) {
+    }
+    __set_BASEPRI(0U);
+    #endif
 }
 
 static inline uint32_t lba2addr(uint32_t block) {
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index feb8566aad..997a97ba49 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -89,11 +89,13 @@ extern uint32_t _ld_stack_top;
 
 extern uint32_t __isr_vector[];
 
+extern uint32_t _ld_ocram_start;
 extern uint32_t _ld_ocram_bss_start;
 extern uint32_t _ld_ocram_bss_size;
 extern uint32_t _ld_ocram_data_destination;
 extern uint32_t _ld_ocram_data_size;
 extern uint32_t _ld_ocram_data_flash_copy;
+extern uint32_t _ld_ocram_end;
 extern uint32_t _ld_dtcm_bss_start;
 extern uint32_t _ld_dtcm_bss_size;
 extern uint32_t _ld_dtcm_data_destination;
@@ -106,36 +108,6 @@ extern uint32_t _ld_isr_destination;
 extern uint32_t _ld_isr_size;
 extern uint32_t _ld_isr_flash_copy;
 
-// Remove these once the SDK re-includes them.
-// https://github.com/nxp-mcuxpresso/mcux-sdk/issues/110
-/*! @name GPR14 - GPR14 General Purpose Register */
-/*! @{ */
-#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_MASK      (0xF0000U)
-#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_SHIFT     (16U)
-/*! CM7_CFGITCMSZ
- *  0b0000..0 KB (No ITCM)
- *  0b0011..4 KB
- *  0b0100..8 KB
- *  0b0101..16 KB
- *  0b0110..32 KB
- *  0b0111..64 KB
- *  0b1000..128 KB
- */
-#define IOMUXC_GPR_GPR14_CM7_CFGITCMSZ(x)        (((uint32_t)(((uint32_t)(x)) << IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_SHIFT)) & IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_MASK)
-#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK      (0xF00000U)
-#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_SHIFT     (20U)
-/*! CM7_CFGDTCMSZ
- *  0b0000..0 KB (No DTCM)
- *  0b0011..4 KB
- *  0b0100..8 KB
- *  0b0101..16 KB
- *  0b0110..32 KB
- *  0b0111..64 KB
- *  0b1000..128 KB
- */
-#define IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ(x)        (((uint32_t)(((uint32_t)(x)) << IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_SHIFT)) & IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK)
-/*! @} */
-
 extern void main(void);
 
 // This replaces the Reset_Handler in startup_*.S and SystemInit in system_*.c.
@@ -159,18 +131,27 @@ __attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distr
     // then the return will jump to an invalid address.
     // Configure FlexRAM. The e is one block of ITCM (0b11) and DTCM (0b10). The rest is two OCRAM
     // (0b01). We shift in zeroes for all unimplemented banks.
-    IOMUXC_GPR->GPR17 = (0xe5555555) >> (32 - 2 * FSL_FEATURE_FLEXRAM_INTERNAL_RAM_TOTAL_BANK_NUMBERS);
+    uint32_t flexram_config = (0xe5555555) >> (32 - 2 * FSL_FEATURE_FLEXRAM_INTERNAL_RAM_TOTAL_BANK_NUMBERS);
+    // imxrt1176 splits the config across two registers.
+    #ifdef IOMUXC_GPR_GPR17_FLEXRAM_BANK_CFG_LOW_MASK
+    IOMUXC_GPR->GPR17 = flexram_config & IOMUXC_GPR_GPR17_FLEXRAM_BANK_CFG_LOW_MASK;
+    IOMUXC_GPR->GPR18 = (flexram_config >> 16) & IOMUXC_GPR_GPR18_FLEXRAM_BANK_CFG_HIGH_MASK;
+    #else
+    IOMUXC_GPR->GPR17 = flexram_config;
+    #endif
 
     // Switch from FlexRAM fuse config to the IOMUXC values.
     IOMUXC_GPR->GPR16 |= IOMUXC_GPR_GPR16_FLEXRAM_BANK_CFG_SEL(1);
 
     // Let the core know the TCM sizes changed.
+    #ifdef IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK
     uint32_t current_gpr14 = IOMUXC_GPR->GPR14;
     current_gpr14 &= ~IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ_MASK;
     current_gpr14 |= IOMUXC_GPR_GPR14_CM7_CFGDTCMSZ(0x6);
     current_gpr14 &= ~IOMUXC_GPR_GPR14_CM7_CFGITCMSZ_MASK;
     current_gpr14 |= IOMUXC_GPR_GPR14_CM7_CFGITCMSZ(0x6);
     IOMUXC_GPR->GPR14 = current_gpr14;
+    #endif
 
     // Enable FlexRAM interrupts on invalid access.
     FLEXRAM->INT_STAT_EN = FLEXRAM_INT_STAT_EN_ITCM_ERR_STAT_EN(1) |
@@ -182,6 +163,7 @@ __attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distr
     #endif /* ((__FPU_PRESENT == 1) && (__FPU_USED == 1)) */
 
     /* Disable Watchdog Power Down Counter */
+    #if defined(RTWDOG)
     WDOG1->WMCR &= ~WDOG_WMCR_PDE_MASK;
     WDOG2->WMCR &= ~WDOG_WMCR_PDE_MASK;
 
@@ -191,6 +173,32 @@ __attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distr
     RTWDOG->CNT = 0xD928C520U; /* 0xD928C520U is the update key */
     RTWDOG->TOVAL = 0xFFFF;
     RTWDOG->CS = (uint32_t)((RTWDOG->CS) & ~RTWDOG_CS_EN_MASK) | RTWDOG_CS_UPDATE_MASK;
+    #endif
+
+    #if defined(RTWDOG3)
+    if ((WDOG1->WCR & WDOG_WCR_WDE_MASK) != 0U) {
+        WDOG1->WCR &= ~(uint16_t)WDOG_WCR_WDE_MASK;
+    }
+    if ((WDOG2->WCR & WDOG_WCR_WDE_MASK) != 0U) {
+        WDOG2->WCR &= ~(uint16_t)WDOG_WCR_WDE_MASK;
+    }
+    if ((RTWDOG3->CS & RTWDOG_CS_CMD32EN_MASK) != 0U) {
+        RTWDOG3->CNT = 0xD928C520U; /* 0xD928C520U is the update key */
+    } else {
+        RTWDOG3->CNT = 0xC520U;
+        RTWDOG3->CNT = 0xD928U;
+    }
+    RTWDOG3->TOVAL = 0xFFFF;
+    RTWDOG3->CS = (uint32_t)((RTWDOG3->CS) & ~RTWDOG_CS_EN_MASK) | RTWDOG_CS_UPDATE_MASK;
+    if ((RTWDOG4->CS & RTWDOG_CS_CMD32EN_MASK) != 0U) {
+        RTWDOG4->CNT = 0xD928C520U; /* 0xD928C520U is the update key */
+    } else {
+        RTWDOG4->CNT = 0xC520U;
+        RTWDOG4->CNT = 0xD928U;
+    }
+    RTWDOG4->TOVAL = 0xFFFF;
+    RTWDOG4->CS = (uint32_t)((RTWDOG4->CS) & ~RTWDOG_CS_EN_MASK) | RTWDOG_CS_UPDATE_MASK;
+    #endif
 
     /* Disable Systick which might be enabled by bootrom */
     if (SysTick->CTRL & SysTick_CTRL_ENABLE_Msk) {
@@ -227,6 +235,9 @@ __attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distr
     // FlexSPI2 is 0x70000000
 
     // This the first portion (1MB, 2MB or 4MB) of flash is the bootloader and CircuitPython read-only data.
+    #if !defined(FlexSPI_AMBA_BASE)
+    #define FlexSPI_AMBA_BASE FlexSPI1_AMBA_BASE
+    #endif
     MPU->RBAR = ARM_MPU_RBAR(10, FlexSPI_AMBA_BASE);
     uint32_t region_size = ARM_MPU_REGION_SIZE_32B;
     uint32_t code_size = ((uint32_t)&_ld_filesystem_start) - FlexSPI_AMBA_BASE;
@@ -265,13 +276,18 @@ __attribute__((used, naked, no_instrument_function, optimize("no-tree-loop-distr
     // This is OCRAM. We mark it as shareable so that it isn't cached. This makes USB work at the
     // cost of 1/4 speed OCRAM accesses. It will leave more room for caching data from the flash
     // too which might be a net win.
-    MPU->RBAR = ARM_MPU_RBAR(14, 0x20200000U);
+    MPU->RBAR = ARM_MPU_RBAR(14, ((uint32_t)&_ld_ocram_start));
     MPU->RASR = ARM_MPU_RASR(NO_EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, NO_SUBREGIONS, ARM_MPU_REGION_SIZE_512KB);
 
+    #if IMXRT10XX
     // We steal 64k from FlexRAM for ITCM and DTCM so disable those memory regions here.
     // We use 64k from FlexRAM for ITCM and DTCM so disable those memory regions here.
-    MPU->RBAR = ARM_MPU_RBAR(15, 0x20280000U);
+    MPU->RBAR = ARM_MPU_RBAR(15, ((uint32_t)&_ld_ocram_end));
     MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, 0x80, ARM_MPU_REGION_SIZE_512KB);
+    #else
+    // On the iMX RT 11xx OCRAM is not flexram (for now). So no need to mask it off.
+    #endif
+
 
     /* Enable MPU */
     ARM_MPU_Enable(MPU_CTRL_PRIVDEFENA_Msk);
@@ -330,7 +346,9 @@ void __attribute__((no_instrument_function,section(".itcm.profile_exit"),long_ca
 }
 
 safe_mode_t port_init(void) {
+    #if IMXRT10XX
     CLOCK_SetMode(kCLOCK_ModeRun);
+    #endif
 
     clocks_init();
 
@@ -380,6 +398,9 @@ safe_mode_t port_init(void) {
     for (uint16_t i = 0; i < NUMBER_OF_INT_VECTORS; i++) {
         NVIC_SetPriority(i, (1UL << __NVIC_PRIO_BITS) - 1UL);
     }
+    #ifdef MIMXRT1042_SERIES
+    #define USB_OTG1_IRQn USB_OTG_IRQn
+    #endif
     NVIC_SetPriority(USB_OTG1_IRQn, 1);
     #ifdef USBPHY2
     NVIC_SetPriority(USB_OTG2_IRQn, 1);
@@ -398,7 +419,21 @@ safe_mode_t port_init(void) {
 
     // Always enable the SNVS interrupt. The GPC won't wake us up unless at least one interrupt is
     // enabled. It won't occur very often so it'll be low overhead.
+    #if IMXRT11XX
+    NVIC_EnableIRQ(SNVS_HP_NON_TZ_IRQn);
+    #else
     NVIC_EnableIRQ(SNVS_HP_WRAPPER_IRQn);
+    #endif
+
+    #if IMXRT11XX
+    /* Save SRSR to another register so we can read it later. */
+    SRC->GPR[11] = SRC->SRSR;
+    SRC->SRSR = 0xFFFFFFFFU;
+
+    if ((SRC->GPR[11] & SRC_SRSR_M7_LOCKUP_M7_MASK) != 0) {
+        return SAFE_MODE_HARD_FAULT;
+    }
+    #endif
 
     // Note that `reset_port` CANNOT GO HERE, unlike other ports, because `board_init` hasn't been
     // run yet, which uses `never_reset` to protect critical pins from being reset by  `reset_port`.
@@ -411,7 +446,9 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
+    #if CIRCUITPY_BUSIO
     spi_reset();
+    #endif
 
     #if CIRCUITPY_AUDIOIO
     audio_dma_reset();
@@ -497,9 +534,15 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) {
     return ticks / 32;
 }
 
+#if IMXRT10XX
 void SNVS_HP_WRAPPER_IRQHandler(void);
 __attribute__((used))
 void PLACE_IN_ITCM(SNVS_HP_WRAPPER_IRQHandler)(void) {
+#else
+void SNVS_HP_NON_TZ_IRQHandler(void);
+__attribute__((used))
+void PLACE_IN_ITCM(SNVS_HP_NON_TZ_IRQHandler)(void) {
+    #endif
     if ((SNVS->HPSR & SNVS_HPSR_PI_MASK) != 0) {
         supervisor_tick();
         SNVS->HPSR = SNVS_HPSR_PI_MASK;
@@ -552,7 +595,11 @@ void port_idle_until_interrupt(void) {
 
     common_hal_mcu_disable_interrupts();
     if (!background_callback_pending()) {
+        #if IMXRT11XX
+        NVIC_ClearPendingIRQ(SNVS_HP_NON_TZ_IRQn);
+        #else
         NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn);
+        #endif
         __WFI();
     }
     common_hal_mcu_enable_interrupts();
diff --git a/ports/mimxrt10xx/supervisor/usb.c b/ports/mimxrt10xx/supervisor/usb.c
index bc6bc5f0cd..64a2639c16 100644
--- a/ports/mimxrt10xx/supervisor/usb.c
+++ b/ports/mimxrt10xx/supervisor/usb.c
@@ -79,8 +79,13 @@ STATIC void init_usb_instance(mp_int_t instance) {
 
 // Provide the prototypes for the interrupt handlers. The iMX RT SDK doesn't.
 // The SDK only links to them from assembly.
+    #ifdef MIMXRT1042_SERIES
+    void USB_OTG_IRQHandler(void);
+    void PLACE_IN_ITCM(USB_OTG_IRQHandler)(void) {
+    #else
     void USB_OTG1_IRQHandler(void);
     void PLACE_IN_ITCM(USB_OTG1_IRQHandler)(void) {
+        #endif
         usb_irq_handler(0);
     }
 
diff --git a/ports/mimxrt10xx/tools/gen_peripherals_data.py b/ports/mimxrt10xx/tools/gen_peripherals_data.py
new file mode 100644
index 0000000000..0b4f215279
--- /dev/null
+++ b/ports/mimxrt10xx/tools/gen_peripherals_data.py
@@ -0,0 +1,356 @@
+import sys
+import pathlib
+import xml.etree.ElementTree as ET
+
+SIGNALS = {
+    "LPI2C": ["SDA", "SCL"],
+    "LPSPI": ["SCK", "SDO", "SDI"],
+    "LPUART": ["RX", "TX", "RTS", "CTS"],
+    "I2S": ["RX_DATA0", "RX_SYNC", "TX_BCLK", "TX_DATA0", "TX_SYNC"],
+    "MQS": ["LEFT", "RIGHT"],
+}
+
+SIGNAL_RENAME = {
+    "CTS_B": "CTS",
+    "RTS_B": "RTS",
+    "RXD": "RX",
+    "TXD": "TX",
+    "TX_DATA00": "TX_DATA0",
+    "RX_DATA00": "RX_DATA0",
+    "TX_DATA": "TX_DATA0",
+    "RX_DATA": "RX_DATA0",
+}
+
+SKIP_LPSR = True
+
+svd_folder = pathlib.Path(sys.argv[1])
+
+# Download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data
+config_data_folder = pathlib.Path(sys.argv[2])
+devices = sys.argv[3:]
+
+peripherals_dir = pathlib.Path("peripherals/mimxrt10xx")
+
+copyright = """/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2023 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.
+ */
+"""
+
+for device in devices:
+    print(device)
+    svd_fn = svd_folder / device / (device + ".xml")
+    if not svd_fn.exists():
+        svd_fn = svd_folder / device / (device + "_cm7.xml")
+
+    pin_to_analog = {}
+    out_dir = peripherals_dir / device
+    largest_signals = None
+    for signal_file in config_data_folder.glob(
+        f"{device}*ConfigTools_data*/**/signal_configuration.xml"
+    ):
+        if largest_signals is None or signal_file.stat().st_size > largest_signals.stat().st_size:
+            largest_signals = signal_file
+
+    # Use the signal file to find analog connections
+    signal_tree = ET.parse(largest_signals)
+    signal_root = signal_tree.getroot()
+    for connection in signal_root.iter("connections"):
+        if "name_part" not in connection.attrib or not connection.attrib["name_part"].startswith(
+            "ADC"
+        ):
+            continue
+        name_part = connection.attrib["name_part"]
+        try:
+            assign = next(connection.iter("assign"))
+        except StopIteration:
+            continue
+        split_pin = assign.attrib["register"].split("_")
+        pin_name = "_".join(split_pin[split_pin.index("GPIO") :])
+        adc_instance, adc_channel = name_part.split("_")
+
+        try:
+            adc_channel = int(adc_channel[2:])
+        except ValueError:
+            continue
+        pin_to_analog[pin_name] = (adc_instance, adc_channel)
+
+    # Find USB pins
+    usb_pins = []
+    all_pins = set()
+    for pin in signal_root.iter("pin"):
+        pin_name = pin.get("name")
+        if SKIP_LPSR and "LPSR" in pin_name:
+            continue
+        all_pins.add(pin_name)
+        if not pin_name.startswith("USB_OTG"):
+            continue
+        if not pin_name.endswith(("DN", "DP")):
+            continue
+        usb_pins.append(pin_name)
+
+    # Find peripherals
+    all_peripherals = {}
+    for peripheral in signal_root.iter("peripheral"):
+        ptype = peripheral.get("peripheral_type")
+        if ptype not in all_peripherals:
+            all_peripherals[ptype] = []
+        all_peripherals[ptype].append(peripheral.get("id"))
+
+    print(svd_fn)
+    tree = ET.parse(svd_fn)
+    root = tree.getroot()
+    pin_number = 0
+    last_gpio_base = None
+    mux_register_base = None
+
+    pins_h = [
+        copyright,
+        "#pragma once",
+        "",
+        "#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;",
+        '#include "pin_names.h"',
+        "#undef FORMAT_PIN",
+    ]
+    pins_c = [
+        copyright,
+        '#include "py/obj.h"',
+        '#include "py/mphal.h"',
+        '#include "mimxrt10xx/pins.h"',
+        "",
+    ]
+    pin_names_h = [copyright, "", "// define FORMAT_PIN(pin_name) and then include this file."]
+    mux_registers_by_pin = {}
+    peripheral_inputs = {}
+    pwm_outputs = []
+    for register in root.iter("register"):
+        name = register.find("name").text
+        if name.endswith("SELECT_INPUT"):
+            name_split = name.split("_")
+            instance = name_split[0]
+            signal = "_".join(name_split[1:-2])
+            signal = SIGNAL_RENAME.get(signal, signal)
+            if instance not in peripheral_inputs:
+                peripheral_inputs[instance] = {}
+            if signal not in peripheral_inputs[instance]:
+                peripheral_inputs[instance][signal] = {}
+            for evalue in register.iter("enumeratedValue"):
+                ename = evalue.find("name").text.strip("_")
+                if "_ALT" in ename:
+                    pin_name, alt = ename.rsplit("_", maxsplit=1)
+                else:
+                    pin_name = ename
+                    alt = evalue.find("description").text.rsplit(maxsplit=1)[1]
+                if SKIP_LPSR and "LPSR" in pin_name:
+                    continue
+                alt = int(alt[3:])
+                value = int(evalue.find("value").text, 0)
+                peripheral_inputs[instance][signal][pin_name] = [alt, name, value]
+        # Mux registers come before PAD registers.
+        elif name.startswith("SW_MUX_CTL_PAD_GPIO"):
+            address_offset = int(register.find("addressOffset").text, 16)
+            if mux_register_base is None:
+                mux_register_base = address_offset
+
+            split_pin = name.split("_")
+            pin_name = "_".join(split_pin[4:])
+            if pin_name not in all_pins:
+                continue
+            gpio_base = "_".join(split_pin[4:-1])
+
+            mux_registers_by_pin[pin_name] = register
+
+            if last_gpio_base != gpio_base:
+                pin_names_h.append("")
+            last_gpio_base = gpio_base
+
+            pin_number += 1
+
+            pin_names_h.append(f"FORMAT_PIN({pin_name})")
+        elif name.startswith("SW_PAD_CTL_PAD_GPIO"):
+            split_pin = name.split("_")
+            pin_name = "_".join(split_pin[4:])
+            if pin_name not in all_pins:
+                continue
+            mux_register = mux_registers_by_pin[pin_name]
+            mux_reset = int(mux_register.find("resetValue").text, 16)
+
+            pad_reset = int(register.find("resetValue").text, 16)
+
+            # Look through alt modes to find GPIO.
+            mux_field = mux_register.find("fields").find("field")
+            assert mux_field.find("name").text == "MUX_MODE"
+            for alt in mux_field.iter("enumeratedValue"):
+                desc = alt.find("description").text
+                if "FLEXPWM" in desc:
+                    desc_split = desc.split()
+                    alt = desc_split[3]
+                    connection = desc_split[6]
+                    pwm_instance = int(connection[7:8])
+                    if connection.count("_") == 1:
+                        # Form: FLEXPWM#_PWMC##
+                        channel = connection[-3:-2]
+                        module = int(connection[-2:])
+                    else:  # two _
+                        # Form: FLEXPWM#_PWM#_C
+                        channel = connection[-1:]
+                        module = int(connection[-3:-2])
+                    pwm_outputs.append((pwm_instance, module, channel, connection, pin_name))
+                elif "GPIO" in desc:
+                    alt_name = desc.split()[-4]
+                    # The 117x has a GPIO mux between GPIOn and CM7_GPIOn. For now,
+                    # we use the the slow, default GPIOn.
+                    if alt_name.startswith("GPIO_MUX"):
+                        alt_name = alt_name.replace("GPIO_MUX", "GPIO")
+                    gpio_instance, gpio_number = alt_name.split("_")
+                    if gpio_instance == "GPIOMUX":
+                        gpio_instance = "GPIO1"
+                    gpio_number = int(gpio_number[2:])
+                else:
+                    desc_split = desc.split()
+                    alt = desc_split[3]
+                    connection = desc_split[6]
+                    alt = int(alt[3:])
+                    if "_" not in connection:
+                        print("skipping", pin_name, connection)
+                        continue
+                    instance, signal = connection.split("_", maxsplit=1)
+                    signal = SIGNAL_RENAME.get(signal, signal)
+                    if instance not in peripheral_inputs:
+                        peripheral_inputs[instance] = {}
+                    if signal not in peripheral_inputs[instance]:
+                        peripheral_inputs[instance][signal] = {}
+                    peripheral_inputs[instance][signal][pin_name] = [alt, None, 0]
+
+            if pin_name in pin_to_analog:
+                adc_instance, adc_channel = pin_to_analog[pin_name]
+            else:
+                adc_instance = "NO_ADC"
+                adc_channel = 0
+
+            pins_c.append(
+                f"const mcu_pin_obj_t pin_{pin_name} = PIN({gpio_instance}, {gpio_number}, {pin_name}, {adc_instance}, {adc_channel}, 0x{mux_reset:08X}, 0x{pad_reset:08X});"
+            )
+
+    pins_c.append("")
+
+    for pin_name in sorted(usb_pins):
+        pin_names_h.append(f"FORMAT_PIN({pin_name})")
+        pins_c.append(f"const mcu_pin_obj_t pin_{pin_name} = {{ {{ &mcu_pin_type }}, }};")
+
+    pin_names_h.append("")
+    pins_c.append("")
+
+    pins_h.append("")
+    pins_h.append(f"#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + {len(usb_pins)})")
+    pins_h.append(f"extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];")
+    pins_h.append("")
+
+    out_dir.mkdir(exist_ok=True)
+
+    (out_dir / "pin_names.h").write_text("\n".join(pin_names_h))
+    (out_dir / "pins.h").write_text("\n".join(pins_h))
+    (out_dir / "pins.c").write_text("\n".join(pins_c))
+
+    periph_h = [copyright, "#pragma once"]
+    periph_c = [
+        copyright,
+        '#include "py/obj.h"',
+        '#include "py/mphal.h"',
+        '#include "mimxrt10xx/periph.h"',
+        "",
+    ]
+
+    for ptype in SIGNALS:
+        instances = all_peripherals[ptype]
+        short_name = ptype.lower()
+        if short_name.startswith("lp"):
+            short_name = short_name[2:]
+        # Only one MQS exists and it is related to SAI3
+        if ptype != "MQS":
+            periph_h.append(
+                f"extern {ptype}_Type *const mcu_{short_name}_banks[{len(instances)}];"
+            )
+            joined_instances = ", ".join(instances)
+            periph_c.append(
+                f"{ptype}_Type *const mcu_{short_name}_banks[{len(instances)}] = {{ {joined_instances} }};"
+            )
+            periph_c.append("")
+        for signal in SIGNALS[ptype]:
+            pin_count = 0
+            for instance in instances:
+                if instance not in peripheral_inputs or signal not in peripheral_inputs[instance]:
+                    continue
+                pin_count += len(peripheral_inputs[instance][signal])
+            periph_h.append(
+                f"extern const mcu_periph_obj_t mcu_{short_name}_{signal.lower()}_list[{pin_count}];"
+            )
+            periph_c.append(
+                f"const mcu_periph_obj_t mcu_{short_name}_{signal.lower()}_list[{pin_count}] = {{"
+            )
+            for instance in instances:
+                if instance not in peripheral_inputs or signal not in peripheral_inputs[instance]:
+                    continue
+                # MQS is tied to SAI3
+                if instance == "MQS":
+                    instance_number = 3
+                else:
+                    instance_number = int(instance[len(ptype) :])
+                    if instance_number > 1:
+                        periph_c.append("")
+                pins = peripheral_inputs[instance][signal]
+                pin_names = list(pins.keys())
+                pin_names.sort(key=lambda x: pins[x][-1])
+                for pin_name in pin_names:
+                    alt, select_input, input_value = pins[pin_name]
+                    if select_input:
+                        select_input = f"kIOMUXC_{select_input}"
+                    else:
+                        select_input = "0"
+                    periph_c.append(
+                        f"    PERIPH_PIN({instance_number}, {alt}, {select_input}, {input_value}, &pin_{pin_name}),"
+                    )
+            periph_c.append(f"}};")
+            periph_c.append(f"")
+        periph_h.append("")
+
+    pwm_outputs.sort(key=lambda x: x[:3])
+    periph_c.append(f"const mcu_pwm_obj_t mcu_pwm_list[{len(pwm_outputs)}] = {{")
+    periph_h.append(f"extern const mcu_pwm_obj_t mcu_pwm_list[{len(pwm_outputs)}];")
+    last_channel = None
+    for pwm_instance, module, channel, connection, pin_name in pwm_outputs:
+        this_channel = (pwm_instance, module, channel)
+        if last_channel is not None and last_channel != this_channel:
+            periph_c.append("")
+        last_channel = this_channel
+        periph_c.append(
+            f"    PWM_PIN(PWM{pwm_instance}, kPWM_Module_{module}, kPWM_Pwm{channel}, IOMUXC_{pin_name}_{connection}, &pin_{pin_name}),"
+        )
+    periph_c.append(f"}};")
+    periph_c.append("")
+
+    (out_dir / "periph.h").write_text("\n".join(periph_h))
+    (out_dir / "periph.c").write_text("\n".join(periph_c))
diff --git a/py/stackctrl.c b/py/stackctrl.c
index 546987f04d..e534a2f5f9 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -30,8 +30,11 @@
 void mp_stack_ctrl_init(void) {
     // Force routine to not be inlined. Better guarantee than MP_NOINLINE for -flto.
     __asm volatile ("");
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdangling-pointer"
     volatile int stack_dummy;
     MP_STATE_THREAD(stack_top) = (char *)&stack_dummy;
+    #pragma GCC diagnostic pop
 }
 
 void mp_stack_set_top(void *top) {
diff --git a/supervisor/linker.h b/supervisor/linker.h
index 9666c4ca12..2d88812da4 100644
--- a/supervisor/linker.h
+++ b/supervisor/linker.h
@@ -29,7 +29,7 @@
 #ifndef MICROPY_INCLUDED_SUPERVISOR_LINKER_H
 #define MICROPY_INCLUDED_SUPERVISOR_LINKER_H
 
-#if defined(IMXRT10XX) || defined(FOMU) || defined(STM32H7) || defined(RASPBERRYPI)
+#if defined(IMXRT1XXX) || defined(FOMU) || defined(STM32H7) || defined(RASPBERRYPI)
 #define PLACE_IN_DTCM_DATA(name) name __attribute__((section(".dtcm_data." #name)))
 #define PLACE_IN_DTCM_BSS(name) name __attribute__((section(".dtcm_bss." #name)))
 // Don't inline ITCM functions because that may pull them out of ITCM into other sections.
diff --git a/tools/cortex-m-fault-gdb.py b/tools/cortex-m-fault-gdb.py
index 2ed2d13909..54a921e91f 100644
--- a/tools/cortex-m-fault-gdb.py
+++ b/tools/cortex-m-fault-gdb.py
@@ -74,12 +74,19 @@ class CortexMFault(gdb.Command):
             print("No preempted exceptions")
         else:
             print("Another exception was preempted")
+        print("icsr", hex(icsr))
         vectactive = icsr & 0x1FF
         if vectactive != 0:
             if vectactive in EXCEPTIONS:
                 print(EXCEPTIONS[vectactive])
             else:
                 print(vectactive - 16)
+        vectpending = (icsr >> 12) & 0x1FF
+        if vectpending != 0:
+            if vectpending in EXCEPTIONS:
+                print(EXCEPTIONS[vectpending])
+            else:
+                print(vectpending - 16)
 
         vtor = self._read(VTOR)
         print("vtor", hex(vtor))

From f837f2438a93303fb6c814a222cc990347b8f308 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 28 Apr 2023 11:16:45 -0700
Subject: [PATCH 2315/2403] Update USB PIDs

---
 ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk  | 2 +-
 ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk  | 2 +-
 ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
index 0f446e13bf..8d73671c8a 100644
--- a/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8078
+USB_PID = 0x8138
 USB_PRODUCT = "IMXRT1015-EVK"
 USB_MANUFACTURER = "NXP"
 
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
index cf351d906e..9667647c83 100644
--- a/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8084
+USB_PID = 0x8136
 USB_PRODUCT = "iMX RT 1040 EVK"
 USB_MANUFACTURER = "NXP"
 
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
index 6627d46681..22b26b41a5 100644
--- a/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8084
+USB_PID = 0x8134
 USB_PRODUCT = "iMX RT 1050 EVKB"
 USB_MANUFACTURER = "NXP"
 

From 18207cd547e1ffbfbf1ead9f5a32eea69d079ec6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 28 Apr 2023 11:28:48 -0700
Subject: [PATCH 2316/2403] Guard GCC13 pragma

---
 py/stackctrl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/stackctrl.c b/py/stackctrl.c
index e534a2f5f9..fa5f16d662 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -31,7 +31,10 @@ void mp_stack_ctrl_init(void) {
     // Force routine to not be inlined. Better guarantee than MP_NOINLINE for -flto.
     __asm volatile ("");
     #pragma GCC diagnostic push
+    #if __GNUC__ > 12
+    // Introduced in GCC 13
     #pragma GCC diagnostic ignored "-Wdangling-pointer"
+    #endif
     volatile int stack_dummy;
     MP_STATE_THREAD(stack_top) = (char *)&stack_dummy;
     #pragma GCC diagnostic pop

From 1fb6d4d77ed006a95722c203e79158da06b39802 Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Fri, 28 Apr 2023 16:58:39 -0400
Subject: [PATCH 2317/2403] I2S pin names per Dan's suggestions on iMX PR

---
 ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c   | 6 +++---
 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
index c331d5cbf9..d5fe927474 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
@@ -53,17 +53,17 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
     { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_OUT), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
index 346a2ae44c..6ab85f3c34 100644
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
+++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
@@ -50,17 +50,17 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_OUT), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },

From 8104b824e0b304a6edfaf6a9a1d1fd9b925ff22b Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 28 Apr 2023 16:19:43 -0700
Subject: [PATCH 2318/2403] Standardize CPU temp and voltage. Add autogen
 warning

---
 .../common-hal/microcontroller/Processor.c    |  2 +-
 .../common-hal/microcontroller/Processor.c    |  2 +-
 .../common-hal/microcontroller/Processor.c    |  2 +-
 .../mimxrt10xx/MIMXRT1011/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1011/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1011/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1011/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1015/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1015/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1015/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1015/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1021/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1021/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1021/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1021/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1042/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1042/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1042/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1042/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1052/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1052/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1052/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1052/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1062/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1062/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1062/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1062/pins.h  |  8 ++++++++
 .../mimxrt10xx/MIMXRT1176/periph.c            |  8 ++++++++
 .../mimxrt10xx/MIMXRT1176/periph.h            |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1176/pins.c  |  8 ++++++++
 .../peripherals/mimxrt10xx/MIMXRT1176/pins.h  |  8 ++++++++
 .../mimxrt10xx/tools/gen_peripherals_data.py  | 20 +++++++++++++++++--
 .../common-hal/microcontroller/Processor.c    |  2 +-
 .../common-hal/microcontroller/Processor.c    |  2 +-
 .../common-hal/microcontroller/Processor.c    |  4 ++--
 35 files changed, 249 insertions(+), 9 deletions(-)

diff --git a/ports/broadcom/common-hal/microcontroller/Processor.c b/ports/broadcom/common-hal/microcontroller/Processor.c
index 70984dd0e4..d49baaee35 100644
--- a/ports/broadcom/common-hal/microcontroller/Processor.c
+++ b/ports/broadcom/common-hal/microcontroller/Processor.c
@@ -34,7 +34,7 @@ float common_hal_mcu_processor_get_temperature(void) {
 }
 
 float common_hal_mcu_processor_get_voltage(void) {
-    return 1.2f;
+    return NAN;
 }
 
 uint32_t common_hal_mcu_processor_get_frequency(void) {
diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
index c0e72c85b9..5b7463c9ff 100644
--- a/ports/espressif/common-hal/microcontroller/Processor.c
+++ b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -47,7 +47,7 @@
 float common_hal_mcu_processor_get_temperature(void) {
     float tsens_out;
     #if defined(CONFIG_IDF_TARGET_ESP32)
-    mp_raise_NotImplementedError(NULL);
+    return NAN;
     #else
     temp_sensor_config_t temp_sensor = TSENS_CONFIG_DEFAULT(); // DEFAULT: range:-10℃ ~  80℃, error < 1℃.
     temp_sensor_set_config(temp_sensor);
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
index bd7d77f4fa..8d20e10c48 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
@@ -54,7 +54,7 @@ float common_hal_mcu_processor_get_temperature(void) {
 
     return temp;
     #else
-    return 0;
+    return NAN;
     #endif
 }
 
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
index fd8ef69f7e..a1468971dc 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1011` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
index e03e2c7967..f3bee9e464 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1011` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[2];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
index a2b38a8a67..ac45fbb833 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1011` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
index 118eff9335..8e901f0980 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1011` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
index 9c56c47dc0..c6b2c6b872 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1015` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
index af53706d6f..cef33f1ffa 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1015` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[2];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[2];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
index efa7abcedf..ab9d9765b1 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1015` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
index 118eff9335..8655bf872f 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1015` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
index 8615e6cfc5..9129c64272 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1021` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
index 496e0ab153..3dea33fa00 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1021` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[4];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
index e349f43542..f76da7a29e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1021` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
index 118eff9335..b4f991a879 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1021` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
index bbd41e7007..104960b417 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1042` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
index 69a15dc50c..3df1a06d98 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1042` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[4];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
index 64d35c2d67..6033d199e4 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1042` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
index 118eff9335..f666962907 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1042` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
index 35b097f675..3ff474d7f4 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1052` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
index ae6566f974..7d428eae1c 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1052` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[4];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
index 83bbe18e42..48d8a2a3d6 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1052` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
index 6e40d30c2b..4ee8d2ae28 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1052` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
index 12c9a09621..ab8fb2b4d8 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1062` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
index 7917a2ebdb..36a42eba64 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1062` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[4];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
index 472677ff24..7208ac418e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1062` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
index 6e40d30c2b..6f746f3b4c 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1062` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
index 3263bdea09..f53136c94f 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1176` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/periph.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
index 41695d655b..266300df18 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/periph.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1176` to update this file.
+ */
+
 #pragma once
 extern LPI2C_Type *const mcu_i2c_banks[6];
 extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
index 71562462e6..e9241c07c7 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.c
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1176` to update this file.
+ */
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "mimxrt10xx/pins.h"
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
index 0d99219c8a..35be6dd36e 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
@@ -26,6 +26,14 @@
  * THE SOFTWARE.
  */
 
+/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   MIMXRT1176` to update this file.
+ */
+
 #pragma once
 
 #define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;
diff --git a/ports/mimxrt10xx/tools/gen_peripherals_data.py b/ports/mimxrt10xx/tools/gen_peripherals_data.py
index 0b4f215279..4193ae7228 100644
--- a/ports/mimxrt10xx/tools/gen_peripherals_data.py
+++ b/ports/mimxrt10xx/tools/gen_peripherals_data.py
@@ -60,8 +60,18 @@ copyright = """/*
  */
 """
 
+autogen_warning_template = """/*
+ * This file is autogenerated! Do NOT hand edit it. Instead, edit tools/gen_peripherals_data.py and
+ * then rerun the script. You'll need to 1) clone https://github.com/nxp-mcuxpresso/mcux-soc-svd/
+ * and 2) download and extract config tools data from https://mcuxpresso.nxp.com/en/select_config_tools_data.
+ *
+ * Run `python tools/gen_peripherals_data.py   {}` to update this file.
+ */
+"""
+
 for device in devices:
     print(device)
+    autogen_warning = autogen_warning_template.format(device)
     svd_fn = svd_folder / device / (device + ".xml")
     if not svd_fn.exists():
         svd_fn = svd_folder / device / (device + "_cm7.xml")
@@ -129,6 +139,7 @@ for device in devices:
 
     pins_h = [
         copyright,
+        autogen_warning,
         "#pragma once",
         "",
         "#define FORMAT_PIN(pin_name) extern const mcu_pin_obj_t pin_##pin_name;",
@@ -137,6 +148,7 @@ for device in devices:
     ]
     pins_c = [
         copyright,
+        autogen_warning,
         '#include "py/obj.h"',
         '#include "py/mphal.h"',
         '#include "mimxrt10xx/pins.h"',
@@ -255,7 +267,8 @@ for device in devices:
                 f"const mcu_pin_obj_t pin_{pin_name} = PIN({gpio_instance}, {gpio_number}, {pin_name}, {adc_instance}, {adc_channel}, 0x{mux_reset:08X}, 0x{pad_reset:08X});"
             )
 
-    pins_c.append("")
+    if usb_pins:
+        pins_c.append("")
 
     for pin_name in sorted(usb_pins):
         pin_names_h.append(f"FORMAT_PIN({pin_name})")
@@ -275,9 +288,10 @@ for device in devices:
     (out_dir / "pins.h").write_text("\n".join(pins_h))
     (out_dir / "pins.c").write_text("\n".join(pins_c))
 
-    periph_h = [copyright, "#pragma once"]
+    periph_h = [copyright, autogen_warning, "#pragma once"]
     periph_c = [
         copyright,
+        autogen_warning,
         '#include "py/obj.h"',
         '#include "py/mphal.h"',
         '#include "mimxrt10xx/periph.h"',
@@ -352,5 +366,7 @@ for device in devices:
     periph_c.append(f"}};")
     periph_c.append("")
 
+    periph_h.append("")
+
     (out_dir / "periph.h").write_text("\n".join(periph_h))
     (out_dir / "periph.c").write_text("\n".join(periph_c))
diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
index b22d385eec..ace9060c91 100644
--- a/ports/raspberrypi/common-hal/microcontroller/Processor.c
+++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -53,7 +53,7 @@ float common_hal_mcu_processor_get_temperature(void) {
 }
 
 float common_hal_mcu_processor_get_voltage(void) {
-    return 3.3f;
+    return NAN;
 }
 
 uint32_t common_hal_mcu_processor_get_frequency(void) {
diff --git a/ports/silabs/common-hal/microcontroller/Processor.c b/ports/silabs/common-hal/microcontroller/Processor.c
index 1414a28df6..841f3ba35f 100644
--- a/ports/silabs/common-hal/microcontroller/Processor.c
+++ b/ports/silabs/common-hal/microcontroller/Processor.c
@@ -46,7 +46,7 @@ float common_hal_mcu_processor_get_temperature(void) {
 float common_hal_mcu_processor_get_voltage(void) {
     // xG24 does not have built-in direct reading of processor voltage
     // Have Only 1 of IADC, already used for analogio module
-    return 3.3f;
+    return NAN;
 }
 
 uint32_t common_hal_mcu_processor_get_frequency(void) {
diff --git a/ports/stm/common-hal/microcontroller/Processor.c b/ports/stm/common-hal/microcontroller/Processor.c
index 67cf9a73e4..8e21ca8d82 100644
--- a/ports/stm/common-hal/microcontroller/Processor.c
+++ b/ports/stm/common-hal/microcontroller/Processor.c
@@ -96,7 +96,7 @@ float common_hal_mcu_processor_get_temperature(void) {
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0;
     return (((float)value * adc_refcor - *ADC_CAL1) / core_temp_avg_slope) + 30.0f;
     #else
-    return false;
+    return NAN;
     #endif
 }
 
@@ -129,7 +129,7 @@ float common_hal_mcu_processor_get_voltage(void) {
 
     return adc_refcor * 3.3f;
     #else
-    return false;
+    return NAN;
     #endif
 }
 

From b08714bb8fcca13b6765fd2a1c8beaa848b5d758 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Fri, 28 Apr 2023 17:13:17 -0700
Subject: [PATCH 2319/2403] Take in framebuffer resolution, not output res

Fixes #7911
---
 .../bindings/picodvi/Framebuffer.c            | 16 ++++----
 .../adafruit_feather_rp2040_dvi/board.c       |  2 +-
 .../common-hal/picodvi/Framebuffer.c          | 37 ++++++++++---------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
index e4584370af..4e522d0f5f 100644
--- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -53,7 +53,7 @@
 //|         blue_dn: microcontroller.Pin,
 //|         color_depth: int = 8,
 //|     ) -> None:
-//|         """Create a Framebuffer object with the given dimensions (640x480 or 800x480). Memory is
+//|         """Create a Framebuffer object with the given dimensions. Memory is
 //|            allocated outside of onto the heap and then moved outside on VM
 //|            end.
 //|
@@ -67,22 +67,22 @@
 //|         less than dn for all pairs or dp must be greater than dn for all pairs.
 //|
 //|         The framebuffer pixel format varies depending on color_depth:
+//|
 //|         * 1 - Each bit is a pixel. Either white (1) or black (0).
 //|         * 2 - Each 2 bits is a pixels. Grayscale between white (0x3) and black (0x0).
 //|         * 8 - Each byte is a pixels in RGB332 format.
 //|         * 16 - Each two bytes are a pixel in RGB565 format.
 //|
-//|         Monochrome framebuffers (color_depth=1 or 2) will be full resolution.
-//|         Color framebuffers will be half resolution and pixels will be
-//|         duplicated to create a signal with the target dimensions.
+//|         Two output resolutions are currently supported, 640x480 and 800x480.
+//|         Monochrome framebuffers (color_depth=1 or 2) must be full resolution.
+//|         Color framebuffers must be half resolution (320x240 or 400x240) and
+//|         pixels will be duplicated to create the signal.
 //|
 //|         A Framebuffer is often used in conjunction with a
 //|         `framebufferio.FramebufferDisplay`.
 //|
-//|         :param int width: the width of the target display signal. It will be halved when
-//|           color_depth >= 8 when creating the framebuffer. Only 640 or 800 is currently supported.
-//|         :param int height: the height of the target display signal. It will be halved when
-//|           color_depth >= 8 when creating the framebuffer. Only 480 is currently supported.
+//|         :param int width: the width of the target display signal. Only 320, 400, 640 or 800 is currently supported depending on color_depth.
+//|         :param int height: the height of the target display signal. Only 240 or 480 is currently supported depenting on color_depth.
 //|         :param ~microcontroller.Pin clk_dp: the positive clock signal pin
 //|         :param ~microcontroller.Pin clk_dn: the negative clock signal pin
 //|         :param ~microcontroller.Pin red_dp: the positive red signal pin
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
index 140a15cc04..c6112a5555 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/board.c
@@ -33,7 +33,7 @@
 void board_init(void) {
     picodvi_framebuffer_obj_t *fb = &allocate_display_bus()->picodvi;
     fb->base.type = &picodvi_framebuffer_type;
-    common_hal_picodvi_framebuffer_construct(fb, 640, 480,
+    common_hal_picodvi_framebuffer_construct(fb, 320, 240,
         &pin_GPIO17, &pin_GPIO16,
         &pin_GPIO19, &pin_GPIO18,
         &pin_GPIO21, &pin_GPIO20,
diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
index 20f447a824..5629d67d1c 100644
--- a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
@@ -138,23 +138,25 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
     const mcu_pin_obj_t *green_dp, const mcu_pin_obj_t *green_dn,
     const mcu_pin_obj_t *blue_dp, const mcu_pin_obj_t *blue_dn,
     mp_uint_t color_depth) {
-
-    const struct dvi_timing *timing = NULL;
-    if (width == 640 && height == 480) {
-        timing = &dvi_timing_640x480p_60hz;
-    } else if (width == 800 && height == 480) {
-        timing = &dvi_timing_800x480p_60hz;
-    } else {
-        if (height == 480) {
-            mp_raise_ValueError_varg(translate("%q must be %d"), MP_QSTR_width, 480);
-        }
-        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_height);
-    }
-
     if (active_picodvi != NULL) {
         mp_raise_msg_varg(&mp_type_RuntimeError, translate("%q in use"), MP_QSTR_picodvi);
     }
 
+    bool color_framebuffer = color_depth >= 8;
+    const struct dvi_timing *timing = NULL;
+    if ((!color_framebuffer && width == 640 && height == 480) ||
+        (color_framebuffer && width == 320 && height == 240)) {
+        timing = &dvi_timing_640x480p_60hz;
+    } else if ((!color_framebuffer && width == 800 && height == 480) ||
+               (color_framebuffer && width == 400 && height == 240)) {
+        timing = &dvi_timing_800x480p_60hz;
+    } else {
+        if (height != 480 && height != 240) {
+            mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_height);
+        }
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_width);
+    }
+
     bool invert_diffpairs = clk_dn->number < clk_dp->number;
     int8_t other_pins[4];
     int8_t *a;
@@ -214,12 +216,12 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
     self->height = height;
 
     size_t tmds_bufs_per_scanline;
-    if (color_depth >= 8) {
+    size_t scanline_width = width;
+    if (color_framebuffer) {
         dvi_vertical_repeat = 2;
         dvi_monochrome_tmds = false;
-        self->width /= 2;
-        self->height /= 2;
         tmds_bufs_per_scanline = 3;
+        scanline_width *= 2;
     } else {
         dvi_vertical_repeat = 1;
         dvi_monochrome_tmds = true;
@@ -233,8 +235,7 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
     }
     self->pitch /= sizeof(uint32_t);
     size_t framebuffer_size = self->pitch * self->height;
-    // use width here because it hasn't been downsized for the frame buffer
-    self->tmdsbuf_size = tmds_bufs_per_scanline * width / DVI_SYMBOLS_PER_WORD + 1;
+    self->tmdsbuf_size = tmds_bufs_per_scanline * scanline_width / DVI_SYMBOLS_PER_WORD + 1;
     size_t total_allocation_size = sizeof(uint32_t) * (framebuffer_size + DVI_N_TMDS_BUFFERS * self->tmdsbuf_size);
     self->allocation = allocate_memory(total_allocation_size, false, true);
     if (self->allocation == NULL) {

From a7c3955c4163220925d3a28fc90987e6aaba6c40 Mon Sep 17 00:00:00 2001
From: Yutaro Urata 
Date: Fri, 28 Apr 2023 17:01:51 +0000
Subject: [PATCH 2320/2403] Translated using Weblate (Japanese)

Currently translated at 40.8% (408 of 999 strings)

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

diff --git a/locale/ja.po b/locale/ja.po
index 805dc10e8e..effefafb1c 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -8,15 +8,15 @@ 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: 2023-01-05 02:52+0000\n"
-"Last-Translator: Matt Watson \n"
+"PO-Revision-Date: 2023-04-29 17:47+0000\n"
+"Last-Translator: Yutaro Urata \n"
 "Language-Team: none\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.15.1-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: main.c
 msgid ""
@@ -350,11 +350,11 @@ msgstr ""
 
 #: shared-module/struct/__init__.c
 msgid "'S' and 'O' are not supported format types"
-msgstr ""
+msgstr "'S'と'O'はフォーマットタイプではありません"
 
 #: py/compile.c
 msgid "'align' requires 1 argument"
-msgstr ""
+msgstr "'align'は引数が一つ必要です"
 
 #: py/compile.c
 msgid "'await' outside function"

From 0aa71ed6e657c0ba4c118bce1b564688f68b9d91 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 1 May 2023 11:30:04 -0700
Subject: [PATCH 2321/2403] Tweak the picodvi docs and arg checking

---
 .../bindings/picodvi/Framebuffer.c            | 23 ++++++++-----------
 .../common-hal/picodvi/Framebuffer.c          | 14 +++++++----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
index 4e522d0f5f..f6fa7f986a 100644
--- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c
@@ -36,8 +36,6 @@
 #include "shared-module/framebufferio/FramebufferDisplay.h"
 
 //| class Framebuffer:
-//|     """A PicoDVI managed frame buffer."""
-//|
 //|     def __init__(
 //|         self,
 //|         width: int,
@@ -54,13 +52,14 @@
 //|         color_depth: int = 8,
 //|     ) -> None:
 //|         """Create a Framebuffer object with the given dimensions. Memory is
-//|            allocated outside of onto the heap and then moved outside on VM
-//|            end.
+//|         allocated outside of onto the heap and then moved outside on VM end.
 //|
-//|         This will change the system clock speed to match the DVI signal.
-//|         Make sure to initialize other objects after this one so they account
-//|         for the changed clock. This also allocates a very large framebuffer
-//|         and is most likely to succeed the earlier it is attempted.
+//|         .. warning:: This will change the system clock speed to match the DVI signal.
+//|            Make sure to initialize other objects after this one so they account
+//|            for the changed clock.
+//|
+//|         This allocates a very large framebuffer and is most likely to succeed
+//|         the earlier it is attempted.
 //|
 //|         Each dp and dn pair of pins must be neighboring, such as 19 and 20.
 //|         They must also be ordered the same way. In other words, dp must be
@@ -82,7 +81,7 @@
 //|         `framebufferio.FramebufferDisplay`.
 //|
 //|         :param int width: the width of the target display signal. Only 320, 400, 640 or 800 is currently supported depending on color_depth.
-//|         :param int height: the height of the target display signal. Only 240 or 480 is currently supported depenting on color_depth.
+//|         :param int height: the height of the target display signal. Only 240 or 480 is currently supported depending on color_depth.
 //|         :param ~microcontroller.Pin clk_dp: the positive clock signal pin
 //|         :param ~microcontroller.Pin clk_dn: the negative clock signal pin
 //|         :param ~microcontroller.Pin red_dp: the positive red signal pin
@@ -160,8 +159,7 @@ static void check_for_deinit(picodvi_framebuffer_obj_t *self) {
 }
 
 //|     width: int
-//|     """The width of the framebuffer, in pixels. It may be doubled for output (and half of what
-//|        width was given to __init__.)"""
+//|     """The width of the framebuffer, in pixels. It may be doubled for output."""
 STATIC mp_obj_t picodvi_framebuffer_get_width(mp_obj_t self_in) {
     picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
     check_for_deinit(self);
@@ -172,8 +170,7 @@ MP_PROPERTY_GETTER(picodvi_framebuffer_width_obj,
     (mp_obj_t)&picodvi_framebuffer_get_width_obj);
 
 //|     height: int
-//|     """The width of the framebuffer, in pixels. It may be doubled for output (and half of what
-//|        width was given to __init__.)"""
+//|     """The width of the framebuffer, in pixels. It may be doubled for output."""
 //|
 STATIC mp_obj_t picodvi_framebuffer_get_height(mp_obj_t self_in) {
     picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
index 5629d67d1c..6ad824d080 100644
--- a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
+++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c
@@ -144,11 +144,11 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
 
     bool color_framebuffer = color_depth >= 8;
     const struct dvi_timing *timing = NULL;
-    if ((!color_framebuffer && width == 640 && height == 480) ||
-        (color_framebuffer && width == 320 && height == 240)) {
+    if ((width == 640 && height == 480) ||
+        (width == 320 && height == 240)) {
         timing = &dvi_timing_640x480p_60hz;
-    } else if ((!color_framebuffer && width == 800 && height == 480) ||
-               (color_framebuffer && width == 400 && height == 240)) {
+    } else if ((width == 800 && height == 480) ||
+               (width == 400 && height == 240)) {
         timing = &dvi_timing_800x480p_60hz;
     } else {
         if (height != 480 && height != 240) {
@@ -157,6 +157,12 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
         mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_width);
     }
 
+    // If the width is > 400, then it must not be color frame buffer and vice
+    // versa.
+    if ((width > 400) == color_framebuffer) {
+        mp_raise_ValueError_varg(translate("Invalid %q"), MP_QSTR_color_depth);
+    }
+
     bool invert_diffpairs = clk_dn->number < clk_dp->number;
     int8_t other_pins[4];
     int8_t *a;

From 051540f8da54d1dd5ca2344afac93dd296700662 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Mon, 1 May 2023 11:38:13 -0700
Subject: [PATCH 2322/2403] Fix broadcom NAN

---
 ports/broadcom/common-hal/microcontroller/Processor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/broadcom/common-hal/microcontroller/Processor.c b/ports/broadcom/common-hal/microcontroller/Processor.c
index d49baaee35..259ecb6c5f 100644
--- a/ports/broadcom/common-hal/microcontroller/Processor.c
+++ b/ports/broadcom/common-hal/microcontroller/Processor.c
@@ -26,6 +26,8 @@
 
 #include "shared-bindings/microcontroller/Processor.h"
 
+#include 
+
 #include "peripherals/broadcom/vcmailbox.h"
 
 float common_hal_mcu_processor_get_temperature(void) {

From cba7a812fc8cd5ec9adf2673e834427c84d0011c Mon Sep 17 00:00:00 2001
From: Liz 
Date: Tue, 2 May 2023 17:02:59 -0400
Subject: [PATCH 2323/2403] Minor update for Feather RP2040 ThinkInk

hihi - updating board name from EPD to ThinkInk and adding pin def for board.BUTTON
---
 .../boards/adafruit_feather_rp2040_epd/mpconfigboard.h          | 2 +-
 .../boards/adafruit_feather_rp2040_epd/mpconfigboard.mk         | 2 +-
 ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
index 356f0f5b54..e76281e893 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 EPD"
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 ThinkInk"
 #define MICROPY_HW_MCU_NAME "rp2040"
 
 #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO20)
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
index 3b457b93cb..1f71dcb76b 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x812C
-USB_PRODUCT = "Feather RP2040 EPD"
+USB_PRODUCT = "Feather RP2040 ThinkInk"
 USB_MANUFACTURER = "Adafruit"
 
 CHIP_VARIANT = RP2040
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
index 22ae43adad..72793fbd56 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
@@ -21,6 +21,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
+	{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },

From facd3a4e784a8decd5b9eeed16824963c105d1d5 Mon Sep 17 00:00:00 2001
From: Liz 
Date: Tue, 2 May 2023 17:07:49 -0400
Subject: [PATCH 2324/2403] Updating directory name

---
 .../board.c                                                       | 0
 .../mpconfigboard.h                                               | 0
 .../mpconfigboard.mk                                              | 0
 .../pico-sdk-configboard.h                                        | 0
 .../pins.c                                                        | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/board.c (100%)
 rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/mpconfigboard.h (100%)
 rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/mpconfigboard.mk (100%)
 rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/pico-sdk-configboard.h (100%)
 rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/pins.c (100%)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/board.c
similarity index 100%
rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c
rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/board.c
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.h
similarity index 100%
rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h
rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.h
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.mk
similarity index 100%
rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk
rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.mk
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pico-sdk-configboard.h
similarity index 100%
rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h
rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pico-sdk-configboard.h
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c
similarity index 100%
rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c
rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c

From 480c4f10816325ac685150c2f3a261a99113fa14 Mon Sep 17 00:00:00 2001
From: Liz 
Date: Tue, 2 May 2023 17:27:53 -0400
Subject: [PATCH 2325/2403] Update pins.c

---
 .../raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c
index 72793fbd56..919b495abc 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c
@@ -21,7 +21,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) },
-	{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },

From c369527ace24363bc2739c473a8a8d6275b38e46 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 May 2023 19:17:51 -0500
Subject: [PATCH 2326/2403] remove line added while debugging failed doc builds

Co-authored-by: Scott Shawcroft 
---
 shared-bindings/synthio/__init__.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 703966defc..15d4e3f3c7 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -41,7 +41,6 @@
 //|
 //| At least 2 simultaneous notes are supported.  samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
 //|
-//| I'm a little teapot. I'm not on line 11, but I don't know what is.
 //| """
 //|
 //| class Envelope:

From b2f32a5397c14576fe1107ef852e22b2b36cf96b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 May 2023 19:22:10 -0500
Subject: [PATCH 2327/2403] Apply suggestions from code review

Co-authored-by: Scott Shawcroft 
---
 shared-bindings/synthio/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 15d4e3f3c7..95dc097313 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -132,7 +132,7 @@ const mp_obj_namedtuple_type_t synthio_envelope_type_obj = {
 //|     *,
 //|     sample_rate: int = 11025,
 //|     waveform: Optional[ReadableBuffer] = None,
-//|     envelope: Optional[ReadableBuffer] = None,
+//|     envelope: Optional[Envelope] = None,
 //| ) -> MidiTrack:
 //|     """Create an AudioSample from an already opened MIDI file.
 //|     Currently, only single-track MIDI (type 0) is supported.

From d8550f4e7c08509be184bda7f9e0b2aafac5aaf5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 May 2023 15:59:34 -0500
Subject: [PATCH 2328/2403] synthio: fix offset in default square waveform

---
 shared-module/synthio/__init__.c              |  2 +-
 tests/circuitpython-manual/synthio/.gitignore |  1 +
 .../synthio/wave/.gitignore                   |  1 -
 tests/circuitpython/miditrack.py.exp          |  2 +-
 tests/circuitpython/synthesizer.py.exp        | 44 +++++++++----------
 5 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 tests/circuitpython-manual/synthio/.gitignore
 delete mode 100644 tests/circuitpython-manual/synthio/wave/.gitignore

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 1385059b99..c7e1096632 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-STATIC const int16_t square_wave[] = {-32768, 0};
+STATIC const int16_t square_wave[] = {-32768, 32767};
 
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
diff --git a/tests/circuitpython-manual/synthio/.gitignore b/tests/circuitpython-manual/synthio/.gitignore
new file mode 100644
index 0000000000..d8dd7532ab
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/.gitignore
@@ -0,0 +1 @@
+*.wav
diff --git a/tests/circuitpython-manual/synthio/wave/.gitignore b/tests/circuitpython-manual/synthio/wave/.gitignore
deleted file mode 100644
index c212df9c3d..0000000000
--- a/tests/circuitpython-manual/synthio/wave/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tune.wav
diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
index 2d9e2548a0..6de9f947c6 100644
--- a/tests/circuitpython/miditrack.py.exp
+++ b/tests/circuitpython/miditrack.py.exp
@@ -1,4 +1,4 @@
 (0, 1, 512, 1)
-1 [-16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0]
+1 [-16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382]
 (0, 1, 512, 1)
 1 [0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0]
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
index 70eb647bab..826290fe27 100644
--- a/tests/circuitpython/synthesizer.py.exp
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -1,30 +1,30 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 (80,)
-[-16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383]
+[-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
 (80, 91)
-[-8191, -8191, 0, 0, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191]
+[0, 0, 16382, 16382, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0]
 (91,)
-[-16382, -8191, -8191, 0, -8191, -8191, 0, 0, -8191, -16382, -16382, -8191, 0, 0, -8191, -8191, 0, -8191, -8191, -16382, -16382, -16382, 0, 0]
-(-5242, 0)
-(-10484, 0)
-(-15727, 0)
-(-16383, 0)
-(-14286, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-13106, 0)
-(-11009, 0)
-(-8912, 0)
-(-6815, 0)
-(-4718, 0)
-(-2621, 0)
-(-524, 0)
+[-16382, 0, 0, 16382, 0, 0, 16382, 16382, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0, 0, -16382, -16382, -16382, 16382, 16382]
+(-5242, 5241)
+(-10484, 10484)
+(-15727, 15726)
+(-16383, 16382)
+(-14286, 14285)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-11009, 11008)
+(-8912, 8911)
+(-6815, 6814)
+(-4718, 4717)
+(-2621, 2620)
+(-524, 523)
 (0, 0)
 (0, 0)
 (0, 0)

From dd262258e0889cb1e18de0fa4ef4e631feb53b9e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 3 May 2023 08:45:37 -0500
Subject: [PATCH 2329/2403] synthio: Add `MidiTrack.error_location` to record
 errors

.. instead of just printing the unraiseable error on the repl
---
 shared-bindings/synthio/MidiTrack.c | 18 ++++++++++++++++++
 shared-bindings/synthio/MidiTrack.h |  1 +
 shared-module/synthio/MidiTrack.c   |  7 ++++++-
 shared-module/synthio/MidiTrack.h   |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 6916a21689..084bad204c 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -151,6 +151,23 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_sample_rate_obj, synthio_miditra
 MP_PROPERTY_GETTER(synthio_miditrack_sample_rate_obj,
     (mp_obj_t)&synthio_miditrack_get_sample_rate_obj);
 
+//|     error_location: Optional[int]
+//|     """Offset, in bytes within the midi data, of a decoding error"""
+//|
+STATIC mp_obj_t synthio_miditrack_obj_get_error_location(mp_obj_t self_in) {
+    synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    mp_int_t location = common_hal_synthio_miditrack_get_error_location(self);
+    if (location >= 0) {
+        return MP_OBJ_NEW_SMALL_INT(location);
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_error_location_obj, synthio_miditrack_obj_get_error_location);
+
+MP_PROPERTY_GETTER(synthio_miditrack_error_location_obj,
+    (mp_obj_t)&synthio_miditrack_get_error_location_obj);
+
 STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = {
     // Methods
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&synthio_miditrack_deinit_obj) },
@@ -159,6 +176,7 @@ STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = {
 
     // Properties
     { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&synthio_miditrack_sample_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_error_location), MP_ROM_PTR(&synthio_miditrack_error_location_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(synthio_miditrack_locals_dict, synthio_miditrack_locals_dict_table);
 
diff --git a/shared-bindings/synthio/MidiTrack.h b/shared-bindings/synthio/MidiTrack.h
index 046163c2de..1a76ed36f4 100644
--- a/shared-bindings/synthio/MidiTrack.h
+++ b/shared-bindings/synthio/MidiTrack.h
@@ -39,3 +39,4 @@ bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self);
 uint32_t common_hal_synthio_miditrack_get_sample_rate(synthio_miditrack_obj_t *self);
 uint8_t common_hal_synthio_miditrack_get_bits_per_sample(synthio_miditrack_obj_t *self);
 uint8_t common_hal_synthio_miditrack_get_channel_count(synthio_miditrack_obj_t *self);
+mp_int_t common_hal_synthio_miditrack_get_error_location(synthio_miditrack_obj_t *self);
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 6a021af85c..c59fa23bef 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -29,7 +29,7 @@
 
 
 STATIC void print_midi_stream_error(synthio_miditrack_obj_t *self) {
-    mp_cprintf(&mp_plat_print, translate("Error in MIDI stream at position %d"), self->pos);
+    self->error_location = self->pos;
     self->pos = self->track.len;
 }
 
@@ -106,6 +106,7 @@ static void decode_until_pause(synthio_miditrack_obj_t *self) {
 
 STATIC void start_parse(synthio_miditrack_obj_t *self) {
     self->pos = 0;
+    self->error_location = -1;
     self->synth.span.dur = decode_duration(self);
     if (self->synth.span.dur == 0) {
         // the usual case: the file starts with some MIDI event, not a delay
@@ -135,6 +136,10 @@ bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self) {
     return synthio_synth_deinited(&self->synth);
 }
 
+mp_int_t common_hal_synthio_miditrack_get_error_location(synthio_miditrack_obj_t *self) {
+    return self->error_location;
+}
+
 uint32_t common_hal_synthio_miditrack_get_sample_rate(synthio_miditrack_obj_t *self) {
     return self->synth.sample_rate;
 }
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index 549e72fb25..2f843dcc3d 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -37,6 +37,7 @@ typedef struct {
     mp_buffer_info_t track;
     // invariant: after initial startup, pos always points just after an encoded duration, i.e., at a midi message (or at EOF)
     size_t pos;
+    mp_int_t error_location;
     uint32_t tempo;
 } synthio_miditrack_obj_t;
 

From eea9b629784f2ac3a31162b30a41d287d90cce8f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 3 May 2023 08:45:57 -0500
Subject: [PATCH 2330/2403] synthio: MidiTrack: sample_rate is always available

---
 shared-bindings/synthio/MidiTrack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 084bad204c..31d8cbc7f0 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -138,7 +138,7 @@ STATIC mp_obj_t synthio_miditrack_obj___exit__(size_t n_args, const mp_obj_t *ar
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_miditrack___exit___obj, 4, 4, synthio_miditrack_obj___exit__);
 
-//|     sample_rate: Optional[int]
+//|     sample_rate: int
 //|     """32 bit value that tells how quickly samples are played in Hertz (cycles per second)."""
 //|
 STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) {

From 1fafa4dc2496671a4aedbd393d76a0b19cb45d8d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 3 May 2023 09:06:41 -0500
Subject: [PATCH 2331/2403] synthio: improve Envelope constructor

---
 shared-bindings/synthio/__init__.c | 63 ++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 95dc097313..eaf67cc0e7 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -37,6 +37,20 @@
 #include "shared-bindings/synthio/MidiTrack.h"
 #include "shared-bindings/synthio/Synthesizer.h"
 
+#define default_attack_time (MICROPY_FLOAT_CONST(0.1))
+#define default_decay_time (MICROPY_FLOAT_CONST(0.05))
+#define default_release_time (MICROPY_FLOAT_CONST(0.2))
+#define default_attack_level (MICROPY_FLOAT_CONST(1.))
+#define default_sustain_level (MICROPY_FLOAT_CONST(0.8))
+
+static const mp_arg_t envelope_properties[] = {
+    { MP_QSTR_attack_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
+    { MP_QSTR_decay_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
+    { MP_QSTR_release_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
+    { MP_QSTR_attack_level, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
+    { MP_QSTR_sustain_level, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
+};
+
 //| """Support for multi-channel audio synthesis
 //|
 //| At least 2 simultaneous notes are supported.  samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
@@ -46,11 +60,12 @@
 //| class Envelope:
 //|     def __init__(
 //|         self,
-//|         attack_time: float,
-//|         decay_time: float,
-//|         release_time: float,
-//|         attack_level: float,
-//|         sustain_level: float,
+//|         *,
+//|         attack_time: Optional[float] = 0.1,
+//|         decay_time: Optional[float] = 0.05,
+//|         release_time: Optional[float] = 0.2,
+//|         attack_level: Optional[float] = 1.0,
+//|         sustain_level: Optional[float] = 0.8,
 //|     ) -> None:
 //|         """Construct an Envelope object
 //|
@@ -82,20 +97,36 @@
 //|     """The relative level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase"""
 //|
 
-STATIC mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_obj_t new_obj = namedtuple_make_new(type_in, n_args, n_kw, args);
-    mp_obj_t *fields;
-    size_t len;
-    mp_obj_tuple_get(new_obj, &len, &fields);
+STATIC mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_val_t args[MP_ARRAY_SIZE(envelope_properties)];
+    enum { ARG_attack_time, ARG_decay_time, ARG_release_time, ARG_attack_level, ARG_sustain_level };
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(envelope_properties), envelope_properties, args);
 
-    mp_arg_validate_obj_float_non_negative(fields[0], 0., MP_QSTR_attack_time);
-    mp_arg_validate_obj_float_non_negative(fields[1], 0., MP_QSTR_decay_time);
-    mp_arg_validate_obj_float_non_negative(fields[2], 0., MP_QSTR_release_time);
+    if (args[ARG_attack_time].u_obj == MP_OBJ_NULL) {
+        args[ARG_attack_time].u_obj = mp_obj_new_float(default_attack_time);
+    }
+    if (args[ARG_decay_time].u_obj == MP_OBJ_NULL) {
+        args[ARG_decay_time].u_obj = mp_obj_new_float(default_decay_time);
+    }
+    if (args[ARG_release_time].u_obj == MP_OBJ_NULL) {
+        args[ARG_release_time].u_obj = mp_obj_new_float(default_release_time);
+    }
+    if (args[ARG_attack_level].u_obj == MP_OBJ_NULL) {
+        args[ARG_attack_level].u_obj = mp_obj_new_float(default_attack_level);
+    }
+    if (args[ARG_sustain_level].u_obj == MP_OBJ_NULL) {
+        args[ARG_sustain_level].u_obj = mp_obj_new_float(default_sustain_level);
+    }
 
-    mp_arg_validate_obj_float_range(fields[3], 0, 1, MP_QSTR_attack_level);
-    mp_arg_validate_obj_float_range(fields[4], 0, 1, MP_QSTR_sustain_level);
+    mp_arg_validate_obj_float_non_negative(args[ARG_attack_time].u_obj, 0., MP_QSTR_attack_time);
+    mp_arg_validate_obj_float_non_negative(args[ARG_decay_time].u_obj, 0., MP_QSTR_decay_time);
+    mp_arg_validate_obj_float_non_negative(args[ARG_release_time].u_obj, 0., MP_QSTR_release_time);
 
-    return new_obj;
+    mp_arg_validate_obj_float_range(args[ARG_attack_level].u_obj, 0, 1, MP_QSTR_attack_level);
+    mp_arg_validate_obj_float_range(args[ARG_sustain_level].u_obj, 0, 1, MP_QSTR_sustain_level);
+
+    MP_STATIC_ASSERT(sizeof(mp_arg_val_t) == sizeof(mp_obj_t));
+    return namedtuple_make_new(type_in, MP_ARRAY_SIZE(args), 0, &args[0].u_obj);
 };
 
 const mp_obj_namedtuple_type_t synthio_envelope_type_obj = {

From b33c9f6b4b0ae428682560496c8c89015542496e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 3 May 2023 09:32:51 -0500
Subject: [PATCH 2332/2403] synthio: put license notice on copied files

---
 tests/circuitpython-manual/synthio/wave/audioop.py | 4 ++++
 tests/circuitpython-manual/synthio/wave/chunk.py   | 4 ++++
 tests/circuitpython-manual/synthio/wave/wave.py    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/circuitpython-manual/synthio/wave/audioop.py b/tests/circuitpython-manual/synthio/wave/audioop.py
index 6ec637a3a1..cab2fb4a7a 100644
--- a/tests/circuitpython-manual/synthio/wave/audioop.py
+++ b/tests/circuitpython-manual/synthio/wave/audioop.py
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
+#
+# SPDX-License-Identifier: PSF-2.0
+
 import struct
 
 
diff --git a/tests/circuitpython-manual/synthio/wave/chunk.py b/tests/circuitpython-manual/synthio/wave/chunk.py
index eea83c42d6..c1e6364b0f 100644
--- a/tests/circuitpython-manual/synthio/wave/chunk.py
+++ b/tests/circuitpython-manual/synthio/wave/chunk.py
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
+#
+# SPDX-License-Identifier: PSF-2.0
+
 """Simple class to read IFF chunks.
 
 An IFF chunk (used in formats such as AIFF, TIFF, RMFF (RealMedia File
diff --git a/tests/circuitpython-manual/synthio/wave/wave.py b/tests/circuitpython-manual/synthio/wave/wave.py
index 903295a4ba..dc6d5407a7 100644
--- a/tests/circuitpython-manual/synthio/wave/wave.py
+++ b/tests/circuitpython-manual/synthio/wave/wave.py
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
+#
+# SPDX-License-Identifier: PSF-2.0
+
 """Stuff to parse WAVE files.
 
 Usage.

From 4f7d88676b49f22e7656ec0a4fac89a5c3c9fd4d Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Wed, 3 May 2023 17:30:01 -0400
Subject: [PATCH 2333/2403] Remove pico-w version

---
 .../boards/pimoroni_pico_dv_base_w/board.c    | 52 -----------
 .../boards/pimoroni_pico_dv_base_w/link.ld    |  1 -
 .../pimoroni_pico_dv_base_w/mpconfigboard.h   | 10 ---
 .../pimoroni_pico_dv_base_w/mpconfigboard.mk  | 29 ------
 .../pico-sdk-configboard.h                    |  4 -
 .../boards/pimoroni_pico_dv_base_w/pins.c     | 89 -------------------
 6 files changed, 185 deletions(-)
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
 delete mode 100644 ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
deleted file mode 100644
index bc5878bf24..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/board.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 "supervisor/board.h"
-
-#include "bindings/picodvi/Framebuffer.h"
-#include "shared-module/displayio/__init__.h"
-#include "shared-bindings/framebufferio/FramebufferDisplay.h"
-
-void board_init(void) {
-    picodvi_framebuffer_obj_t *fb = &allocate_display_bus()->picodvi;
-    fb->base.type = &picodvi_framebuffer_type;
-    common_hal_picodvi_framebuffer_construct(fb, 640, 480,
-        &pin_GPIO7, &pin_GPIO6,
-        &pin_GPIO9, &pin_GPIO8,
-        &pin_GPIO11, &pin_GPIO10,
-        &pin_GPIO13, &pin_GPIO12,
-        8);
-
-    framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
-    display->base.type = &framebufferio_framebufferdisplay_type;
-    common_hal_framebufferio_framebufferdisplay_construct(
-        display,
-        MP_OBJ_FROM_PTR(fb),
-        0,
-        true);
-}
-
-// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
deleted file mode 100644
index e814bead4c..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/link.ld
+++ /dev/null
@@ -1 +0,0 @@
-firmware_size = 1532k;
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
deleted file mode 100644
index df6539734e..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Pimoroni Pico DV Base W"
-#define MICROPY_HW_MCU_NAME "rp2040"
-
-#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
-#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
-
-#define MICROPY_HW_LED_STATUS   (&pin_CYW0)
-
-#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
deleted file mode 100644
index b7919a1847..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-USB_VID = 0x2E8A
-USB_PID = 0x105A
-USB_PRODUCT = "Pimoroni Pico DV Demo Base for Pico W"
-USB_MANUFACTURER = "Pimoroni"
-
-CHIP_VARIANT = RP2040
-CHIP_FAMILY = rp2
-
-EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
-
-CIRCUITPY__EVE = 1
-
-CIRCUITPY_CYW43 = 1
-CIRCUITPY_SSL = 1
-CIRCUITPY_SSL_MBEDTLS = 1
-CIRCUITPY_HASHLIB = 1
-CIRCUITPY_WEB_WORKFLOW = 1
-CIRCUITPY_MDNS = 1
-CIRCUITPY_SOCKETPOOL = 1
-CIRCUITPY_WIFI = 1
-
-CIRCUITPY_PICODVI = 1
-
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
-# Must be accompanied by a linker script change
-CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
-
-# Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
deleted file mode 100644
index a41131dd22..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pico-sdk-configboard.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Put board-specific pico-sdk definitions here. This file must exist.
-
-// Allow extra time for xosc to start.
-#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
deleted file mode 100644
index 6ab85f3c34..0000000000
--- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-#include "shared-module/displayio/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
-    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
-
-    { MP_ROM_QSTR(MP_QSTR_TX),  MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_RX),  MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
-
-    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
-    { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
-    { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON_C), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
-    { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
-    { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
-
-    // SD Card
-    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO5)},
-    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO18)},
-    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO19)},
-    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO22)},
-
-    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
-
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_CYW0) },
-
-    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO26) },
-    { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
-    { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO27) },
-    { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
-    { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO28) },
-    { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
-    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
-    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
-
-    // DVI VIDEO
-    { MP_ROM_QSTR(MP_QSTR_DV_CEC), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_DV_SCL), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_DV_SDA), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_D0N), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_D0P), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D1N), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_D1P), MP_ROM_PTR(&pin_GPIO11) },
-    { MP_ROM_QSTR(MP_QSTR_D2N), MP_ROM_PTR(&pin_GPIO12) },
-    { MP_ROM_QSTR(MP_QSTR_D2P), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_ROM_QSTR(MP_QSTR_DV_HPD), MP_ROM_PTR(&pin_GPIO17) },
-
-    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].framebuffer_display)},
-
-};
-
-MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From 5514e3065da2cdd4e81670d9f6691269eeff6392 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 25 Apr 2023 16:42:05 -0500
Subject: [PATCH 2334/2403] synthio: add midi_to_hz

to convert notes in the MIDI 1-127 note scale to floating point Hz
---
 shared-bindings/synthio/__init__.c | 7 +++++++
 shared-bindings/synthio/__init__.h | 1 +
 shared-module/synthio/__init__.c   | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index eaf67cc0e7..89929b0563 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -262,12 +262,19 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file);
 
+STATIC mp_obj_t midi_to_hz(mp_obj_t arg) {
+    mp_int_t note = mp_arg_validate_int_range(mp_obj_get_int(arg), 1, 127, MP_QSTR_note);
+    return mp_obj_new_float(common_hal_synthio_midi_to_hz_float(note));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_midi_to_hz_obj, midi_to_hz);
+
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
     { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
     { MP_ROM_QSTR(MP_QSTR_from_file), MP_ROM_PTR(&synthio_from_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_Envelope), MP_ROM_PTR(&synthio_envelope_type_obj) },
+    { MP_ROM_QSTR(MP_QSTR_midi_to_hz), MP_ROM_PTR(&synthio_midi_to_hz_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(synthio_module_globals, synthio_module_globals_table);
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index 6ea323905a..d3ccc1ce04 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -33,3 +33,4 @@ extern int16_t shared_bindings_synthio_square_wave[];
 extern const mp_obj_namedtuple_type_t synthio_envelope_type_obj;
 void synthio_synth_envelope_set(synthio_synth_t *synth, mp_obj_t envelope_obj);
 mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth);
+mp_float_t common_hal_synthio_midi_to_hz_float(mp_int_t note);
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index c7e1096632..8c17dfdeed 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -36,6 +36,12 @@ STATIC const int16_t square_wave[] = {-32768, 32767};
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
+mp_float_t common_hal_synthio_midi_to_hz_float(mp_int_t arg) {
+    uint8_t octave = arg / 12;
+    uint16_t base_freq = notes[arg % 12];
+    return MICROPY_FLOAT_C_FUN(ldexp)(base_freq, octave - 10);
+}
+
 STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int16_t difference) {
     mp_float_t time = mp_obj_get_float(time_in);
     int num_samples = (int)MICROPY_FLOAT_C_FUN(round)(time * sample_rate);

From c22fd2a18e4732b2b7dab6e58e924615adeffb12 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 1 May 2023 09:39:40 -0500
Subject: [PATCH 2335/2403] runtime: Add mp_arg_validate_float_range

---
 py/argcheck.c | 7 ++++++-
 py/runtime.h  | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index 265b303901..8a4419f88f 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -194,11 +194,16 @@ mp_float_t mp_arg_validate_type_float(mp_obj_t obj, qstr arg_name) {
     return a_float;
 }
 
-void mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name) {
+mp_float_t mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name) {
     const mp_float_t f = mp_arg_validate_type_float(float_in, arg_name);
+    return mp_arg_validate_float_range(f, min, max, arg_name);
+}
+
+mp_float_t mp_arg_validate_float_range(mp_float_t f, mp_int_t min, mp_int_t max, qstr arg_name) {
     if (f < (mp_float_t)min || f > (mp_float_t)max) {
         mp_raise_ValueError_varg(translate("%q must be %d-%d"), arg_name, min, max);
     }
+    return f;
 }
 
 mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name) {
diff --git a/py/runtime.h b/py/runtime.h
index f7b96a27ae..196874bff9 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -103,7 +103,8 @@ 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);
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name);
-void mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name);
+mp_float_t mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_int_t max, qstr arg_name);
+mp_float_t mp_arg_validate_float_range(mp_float_t float_in, mp_int_t min, mp_int_t max, qstr arg_name);
 mp_float_t mp_arg_validate_type_float(mp_obj_t obj, qstr arg_name);
 #endif
 mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_name);

From bc03e03b9e62048de4d6d2b12e75301eda4b1652 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 3 May 2023 09:11:17 -0500
Subject: [PATCH 2336/2403] util: Add properties_print_helper

---
 shared-bindings/util.c | 12 ++++++++++++
 shared-bindings/util.h |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/shared-bindings/util.c b/shared-bindings/util.c
index 5c5eafad4a..78960a7552 100644
--- a/shared-bindings/util.c
+++ b/shared-bindings/util.c
@@ -37,5 +37,17 @@ void raise_deinited_error(void) {
     mp_raise_ValueError(translate("Object has been deinitialized and can no longer be used. Create a new object."));
 }
 
+void properties_print_helper(const mp_print_t *print, mp_obj_t self_in, const mp_arg_t *properties, size_t n_properties) {
+    const mp_obj_type_t *type = mp_obj_get_type(self_in);
+    mp_printf(print, "%q(", type->name);
+    for (size_t i = 0; i < n_properties; i++) {
+        if (i > 0) {
+            mp_print_str(print, ", ");
+        }
+        mp_printf(print, "%q=", properties[i].qst);
+        mp_obj_print_helper(print, mp_load_attr(self_in, properties[i].qst), PRINT_REPR);
+    }
+    mp_print_str(print, ")");
+}
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_UTIL_H
diff --git a/shared-bindings/util.h b/shared-bindings/util.h
index 33454f10ef..b35e903d38 100644
--- a/shared-bindings/util.h
+++ b/shared-bindings/util.h
@@ -27,7 +27,11 @@
 #ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_UTIL_H
 #define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_UTIL_H
 
+#include "py/mpprint.h"
+#include "py/runtime.h"
+
 void raise_deinited_error(void);
+void properties_print_helper(const mp_print_t *print, mp_obj_t self_in, const mp_arg_t *properties, size_t n_properties);
 
 
 #endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_UTIL_H

From a7da245ad062078ab7b7a67111446adc8e9afc5e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 1 May 2023 09:41:05 -0500
Subject: [PATCH 2337/2403] synthio: Add synthio.Note

This class allows much more expressive sound synthesis:
 * tremolo & vibrato
 * arbitrary frequency
 * different evelope & waveform per note
 * all properties dynamically settable from Python code
---
 .../unix/variants/coverage/mpconfigvariant.mk |   2 +
 py/circuitpy_defns.mk                         |   1 +
 shared-bindings/synthio/Note.c                | 252 ++++++++++++++++++
 shared-bindings/synthio/Note.h                |  30 +++
 shared-bindings/synthio/Synthesizer.c         |  38 +--
 shared-bindings/synthio/__init__.c            |   3 +-
 shared-module/synthio/MidiTrack.c             |   8 +-
 shared-module/synthio/Note.c                  | 158 +++++++++++
 shared-module/synthio/Note.h                  |  54 ++++
 shared-module/synthio/Synthesizer.c           |  38 ++-
 shared-module/synthio/__init__.c              | 131 +++++++--
 shared-module/synthio/__init__.h              |  27 +-
 .../synthio/note/README.md                    |   5 +
 .../synthio/note/audioop.py                   |   1 +
 .../synthio/note/chunk.py                     |   1 +
 .../circuitpython-manual/synthio/note/code.py | 100 +++++++
 .../circuitpython-manual/synthio/note/wave.py |   1 +
 .../synthio/wave/README.md                    |   2 +-
 tests/circuitpython/synthesizer_note.py       |  41 +++
 tests/circuitpython/synthesizer_note.py.exp   |  32 +++
 20 files changed, 863 insertions(+), 62 deletions(-)
 create mode 100644 shared-bindings/synthio/Note.c
 create mode 100644 shared-bindings/synthio/Note.h
 create mode 100644 shared-module/synthio/Note.c
 create mode 100644 shared-module/synthio/Note.h
 create mode 100644 tests/circuitpython-manual/synthio/note/README.md
 create mode 120000 tests/circuitpython-manual/synthio/note/audioop.py
 create mode 120000 tests/circuitpython-manual/synthio/note/chunk.py
 create mode 100644 tests/circuitpython-manual/synthio/note/code.py
 create mode 120000 tests/circuitpython-manual/synthio/note/wave.py
 create mode 100644 tests/circuitpython/synthesizer_note.py
 create mode 100644 tests/circuitpython/synthesizer_note.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 854d052c6c..41f44df2b4 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -42,6 +42,7 @@ SRC_BITMAP := \
 	shared-bindings/struct/__init__.c \
 	shared-bindings/synthio/__init__.c \
 	shared-bindings/synthio/MidiTrack.c \
+	shared-bindings/synthio/Note.c \
 	shared-bindings/synthio/Synthesizer.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
@@ -64,6 +65,7 @@ SRC_BITMAP := \
 	shared-module/struct/__init__.c \
 	shared-module/synthio/__init__.c \
 	shared-module/synthio/MidiTrack.c \
+	shared-module/synthio/Note.c \
 	shared-module/synthio/Synthesizer.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index d9af56356a..553490d99b 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -651,6 +651,7 @@ SRC_SHARED_MODULE_ALL = \
 	supervisor/__init__.c \
 	supervisor/StatusBar.c \
 	synthio/MidiTrack.c \
+	synthio/Note.c \
 	synthio/Synthesizer.c \
 	synthio/__init__.c \
 	terminalio/Terminal.c \
diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
new file mode 100644
index 0000000000..0e2dad40d6
--- /dev/null
+++ b/shared-bindings/synthio/Note.c
@@ -0,0 +1,252 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Artyom Skrobov
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "shared-bindings/util.h"
+#include "shared-bindings/synthio/Note.h"
+#include "shared-module/synthio/Note.h"
+
+static const mp_arg_t note_properties[] = {
+    { MP_QSTR_frequency, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = NULL } },
+    { MP_QSTR_amplitude, MP_ARG_OBJ, {.u_obj = MP_ROM_INT(1) } },
+    { MP_QSTR_tremolo_rate, MP_ARG_OBJ, {.u_obj = NULL } },
+    { MP_QSTR_tremolo_depth, MP_ARG_OBJ, {.u_obj = NULL } },
+    { MP_QSTR_vibrato_rate, MP_ARG_OBJ, {.u_obj = NULL } },
+    { MP_QSTR_vibrato_depth, MP_ARG_OBJ, {.u_obj = NULL } },
+    { MP_QSTR_waveform, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE } },
+    { MP_QSTR_envelope, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE } },
+};
+//| class Note:
+//|     def __init__(
+//|         self,
+//|         frequency: float,
+//|         amplitude: float = 1.0,
+//|         waveform: Optional[ReadableBuffer] = None,
+//|         envelope: Optional[Envelope] = None,
+//|         tremolo_depth: float = 0.0,
+//|         tremolo_rate: float = 0.0,
+//|         vibrato_depth: float = 0.0,
+//|         vibrato_rate: float = 0.0,
+//|     ) -> None:
+//|         """Construct a Note object, with a frequency in Hz, and optional amplitude (volume), waveform, envelope, tremolo (volume change) and vibrato (frequency change).
+//|
+//|         If waveform or envelope are `None` the synthesizer object's default waveform or envelope are used.
+//|
+//|         If the same Note object is played on multiple Synthesizer objects, the result is undefined.
+//|         """
+STATIC mp_obj_t synthio_note_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_frequency, ARG_amplitude, ARG_waveform, ARG_envelope, ARG_tremolo_rate, ARG_tremolo_depth, ARG_vibrato_rate, ARG_vibrato_depth };
+    mp_arg_val_t args[MP_ARRAY_SIZE(note_properties)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(note_properties), note_properties, args);
+
+    synthio_note_obj_t *self = m_new_obj(synthio_note_obj_t);
+    self->base.type = &synthio_note_type;
+
+    mp_obj_t result = MP_OBJ_FROM_PTR(self);
+    for (size_t i = 0; i < MP_ARRAY_SIZE(note_properties); i++) {
+        if (args[i].u_obj != NULL) {
+            mp_store_attr(result, note_properties[i].qst, args[i].u_obj);
+        }
+    }
+
+    return result;
+};
+
+//|     frequency: float
+//|     """The base frequency of the note, in Hz."""
+STATIC mp_obj_t synthio_note_get_frequency(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_frequency(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_frequency_obj, synthio_note_get_frequency);
+
+STATIC mp_obj_t synthio_note_set_frequency(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_frequency(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_frequency_obj, synthio_note_set_frequency);
+MP_PROPERTY_GETSET(synthio_note_frequency_obj,
+    (mp_obj_t)&synthio_note_get_frequency_obj,
+    (mp_obj_t)&synthio_note_set_frequency_obj);
+
+//|     amplitude: float
+//|     """The base amplitude of the note, from 0 to 1"""
+STATIC mp_obj_t synthio_note_get_amplitude(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_amplitude(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_amplitude_obj, synthio_note_get_amplitude);
+
+STATIC mp_obj_t synthio_note_set_amplitude(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_amplitude(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_amplitude_obj, synthio_note_set_amplitude);
+MP_PROPERTY_GETSET(synthio_note_amplitude_obj,
+    (mp_obj_t)&synthio_note_get_amplitude_obj,
+    (mp_obj_t)&synthio_note_set_amplitude_obj);
+
+
+//|     tremolo_depth: float
+//|     """The tremolo depth of the note, from 0 to 1"""
+STATIC mp_obj_t synthio_note_get_tremolo_depth(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_tremolo_depth(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_tremolo_depth_obj, synthio_note_get_tremolo_depth);
+
+STATIC mp_obj_t synthio_note_set_tremolo_depth(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_tremolo_depth(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_tremolo_depth_obj, synthio_note_set_tremolo_depth);
+MP_PROPERTY_GETSET(synthio_note_tremolo_depth_obj,
+    (mp_obj_t)&synthio_note_get_tremolo_depth_obj,
+    (mp_obj_t)&synthio_note_set_tremolo_depth_obj);
+
+//|     tremolo_rate: float
+//|     """The tremolo rate of the note, in Hz."""
+STATIC mp_obj_t synthio_note_get_tremolo_rate(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_tremolo_rate(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_tremolo_rate_obj, synthio_note_get_tremolo_rate);
+
+STATIC mp_obj_t synthio_note_set_tremolo_rate(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_tremolo_rate(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_tremolo_rate_obj, synthio_note_set_tremolo_rate);
+MP_PROPERTY_GETSET(synthio_note_tremolo_rate_obj,
+    (mp_obj_t)&synthio_note_get_tremolo_rate_obj,
+    (mp_obj_t)&synthio_note_set_tremolo_rate_obj);
+
+//|     vibrato_depth: float
+//|     """The vibrato depth of the note, from 0 to 1"""
+STATIC mp_obj_t synthio_note_get_vibrato_depth(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_vibrato_depth(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_vibrato_depth_obj, synthio_note_get_vibrato_depth);
+
+STATIC mp_obj_t synthio_note_set_vibrato_depth(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_vibrato_depth(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_vibrato_depth_obj, synthio_note_set_vibrato_depth);
+MP_PROPERTY_GETSET(synthio_note_vibrato_depth_obj,
+    (mp_obj_t)&synthio_note_get_vibrato_depth_obj,
+    (mp_obj_t)&synthio_note_set_vibrato_depth_obj);
+
+//|     vibrato_rate: float
+//|     """The vibrato rate of the note, in Hz."""
+STATIC mp_obj_t synthio_note_get_vibrato_rate(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_vibrato_rate(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_vibrato_rate_obj, synthio_note_get_vibrato_rate);
+
+STATIC mp_obj_t synthio_note_set_vibrato_rate(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_vibrato_rate(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_vibrato_rate_obj, synthio_note_set_vibrato_rate);
+MP_PROPERTY_GETSET(synthio_note_vibrato_rate_obj,
+    (mp_obj_t)&synthio_note_get_vibrato_rate_obj,
+    (mp_obj_t)&synthio_note_set_vibrato_rate_obj);
+
+//|     waveform: Optional[ReadableBuffer]
+//|     """The waveform of this note. Setting the waveform to a buffer of a different size resets the note's phase."""
+STATIC mp_obj_t synthio_note_get_waveform(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_synthio_note_get_waveform_obj(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_waveform_obj, synthio_note_get_waveform);
+
+STATIC mp_obj_t synthio_note_set_waveform(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_waveform(self, arg);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_waveform_obj, synthio_note_set_waveform);
+MP_PROPERTY_GETSET(synthio_note_waveform_obj,
+    (mp_obj_t)&synthio_note_get_waveform_obj,
+    (mp_obj_t)&synthio_note_set_waveform_obj);
+
+
+//|     envelope: Envelope
+//|     """The envelope of this note"""
+//|
+STATIC mp_obj_t synthio_note_get_envelope(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_synthio_note_get_envelope_obj(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_envelope_obj, synthio_note_get_envelope);
+
+STATIC mp_obj_t synthio_note_set_envelope(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_envelope(self, arg);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_envelope_obj, synthio_note_set_envelope);
+MP_PROPERTY_GETSET(synthio_note_envelope_obj,
+    (mp_obj_t)&synthio_note_get_envelope_obj,
+    (mp_obj_t)&synthio_note_set_envelope_obj);
+
+static void note_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    (void)kind;
+    properties_print_helper(print, self_in, note_properties, MP_ARRAY_SIZE(note_properties));
+}
+
+STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&synthio_note_frequency_obj) },
+    { MP_ROM_QSTR(MP_QSTR_amplitude), MP_ROM_PTR(&synthio_note_amplitude_obj) },
+    { MP_ROM_QSTR(MP_QSTR_waveform), MP_ROM_PTR(&synthio_note_waveform_obj) },
+    { MP_ROM_QSTR(MP_QSTR_envelope), MP_ROM_PTR(&synthio_note_envelope_obj) },
+    { MP_ROM_QSTR(MP_QSTR_tremolo_depth), MP_ROM_PTR(&synthio_note_tremolo_depth_obj) },
+    { MP_ROM_QSTR(MP_QSTR_tremolo_rate), MP_ROM_PTR(&synthio_note_tremolo_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_vibrato_depth), MP_ROM_PTR(&synthio_note_vibrato_depth_obj) },
+    { MP_ROM_QSTR(MP_QSTR_vibrato_rate), MP_ROM_PTR(&synthio_note_vibrato_rate_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(synthio_note_locals_dict, synthio_note_locals_dict_table);
+
+const mp_obj_type_t synthio_note_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Note,
+    .make_new = synthio_note_make_new,
+    .locals_dict = (mp_obj_dict_t *)&synthio_note_locals_dict,
+    .print = note_print,
+};
diff --git a/shared-bindings/synthio/Note.h b/shared-bindings/synthio/Note.h
new file mode 100644
index 0000000000..ab9d925f03
--- /dev/null
+++ b/shared-bindings/synthio/Note.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "py/obj.h"
+
+typedef struct synthio_note_obj synthio_note_obj_t;
+extern const mp_obj_type_t synthio_note_type;
+
+mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_amplitude(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_amplitude(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_tremolo_rate(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_tremolo_depth(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_tremolo_depth(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_vibrato_rate(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_vibrato_rate(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_vibrato_depth(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_vibrato_depth(synthio_note_obj_t *self, mp_float_t value);
+
+mp_obj_t common_hal_synthio_note_get_waveform_obj(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_waveform(synthio_note_obj_t *self, mp_obj_t value);
+
+mp_obj_t common_hal_synthio_note_get_envelope_obj(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_envelope(synthio_note_obj_t *self, mp_obj_t value);
diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index 97941b860b..5d9be09f70 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -36,6 +36,9 @@
 #include "shared-bindings/synthio/__init__.h"
 #include "supervisor/shared/translate/translate.h"
 
+//| NoteSequence = Sequence[Union[int, Note]]
+//| """A sequence of notes, which can each be integer MIDI notes or `Note` objects"""
+//|
 //| class Synthesizer:
 //|     def __init__(
 //|         self,
@@ -48,7 +51,9 @@
 //|
 //|         This API is experimental.
 //|
-//|         Notes use MIDI note numbering, with 60 being C4 or Middle C, approximately 262Hz.
+//|         Integer notes use MIDI note numbering, with 60 being C4 or Middle C,
+//|         approximately 262Hz. Integer notes use the given waveform & envelope,
+//|         and do not support advanced features like tremolo or vibrato.
 //|
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
 //|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
@@ -76,7 +81,6 @@ STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n
         bufinfo_waveform.len / 2,
         args[ARG_envelope].u_obj);
 
-
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -86,12 +90,12 @@ STATIC void check_for_deinit(synthio_synthesizer_obj_t *self) {
     }
 }
 
-//|     def press(self, /, press: Sequence[int] = ()) -> None:
-//|         """Turn some notes on. Notes use MIDI numbering, with 60 being middle C, approximately 262Hz.
+//|     def press(self, /, press: NoteSequence = ()) -> None:
+//|         """Turn some notes on.
 //|
 //|         Pressing a note that was already pressed has no effect.
 //|
-//|         :param Sequence[int] press: Any sequence of integer notes."""
+//|         :param NoteSequence press: Any sequence of notes."""
 STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) {
     synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -99,12 +103,12 @@ STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) {
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesizer_press);
-//|     def release(self, /, release: Sequence[int] = ()) -> None:
-//|         """Turn some notes off. Notes use MIDI numbering, with 60 being middle C, approximately 262Hz.
+//|     def release(self, /, release: NoteSequence = ()) -> None:
+//|         """Turn some notes off.
 //|
 //|         Releasing a note that was already released has no effect.
 //|
-//|         :param Sequence[int] release: Any sequence of integer notes."""
+//|         :param NoteSequence release: Any sequence of notes."""
 STATIC mp_obj_t synthio_synthesizer_release(mp_obj_t self_in, mp_obj_t release) {
     synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -113,10 +117,8 @@ STATIC mp_obj_t synthio_synthesizer_release(mp_obj_t self_in, mp_obj_t release)
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthesizer_release);
 
-//|     def release_then_press(
-//|         self, release: Sequence[int] = (), press: Sequence[int] = ()
-//|     ) -> None:
-//|         """Turn some notes on and/or off. Notes use MIDI numbering, with 60 being middle C.
+//|     def release_then_press(self, release: NoteSequence = (), press: NoteSequence = ()) -> None:
+//|         """Turn some notes on and/or off.
 //|
 //|         It is OK to release note that was not actually turned on.
 //|
@@ -125,8 +127,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthe
 //|         Releasing and pressing the note again has little effect, but does reset the phase
 //|         of the note, which may be perceptible as a small glitch.
 //|
-//|         :param Sequence[int] release: Any sequence of integer notes.
-//|         :param Sequence[int] press: Any sequence of integer notes."""
+//|         :param NoteSequence release: Any sequence of notes.
+//|         :param NoteSequence press: Any sequence of notes."""
 STATIC mp_obj_t synthio_synthesizer_release_then_press(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_release, ARG_press };
     static const mp_arg_t allowed_args[] = {
@@ -146,13 +148,13 @@ STATIC mp_obj_t synthio_synthesizer_release_then_press(mp_uint_t n_args, const m
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_release_then_press_obj, 1, synthio_synthesizer_release_then_press);
 
 //
-//|     def release_all_then_press(self, /, press: Sequence[int]) -> None:
+//|     def release_all_then_press(self, /, press: NoteSequence) -> None:
 //|         """Turn any currently-playing notes off, then turn on the given notes
 //|
 //|         Releasing and pressing the note again has little effect, but does reset the phase
 //|         of the note, which may be perceptible as a small glitch.
 //|
-//|         :param Sequence[int] press: Any sequence of integer notes."""
+//|         :param NoteSequence press: Any sequence of notes."""
 STATIC mp_obj_t synthio_synthesizer_release_all_then_press(mp_obj_t self_in, mp_obj_t press) {
     synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
@@ -183,7 +185,7 @@ STATIC mp_obj_t synthio_synthesizer_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_deinit_obj, synthio_synthesizer_deinit);
 
-//|     def __enter__(self) -> MidiTrack:
+//|     def __enter__(self) -> Synthesizer:
 //|         """No-op used by Context Managers."""
 //|         ...
 //  Provided by context manager helper.
@@ -232,7 +234,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_sample_rate_obj, synthio_synth
 MP_PROPERTY_GETTER(synthio_synthesizer_sample_rate_obj,
     (mp_obj_t)&synthio_synthesizer_get_sample_rate_obj);
 
-//|     pressed: Tuple[int]
+//|     pressed: NoteSequence
 //|     """A sequence of the currently pressed notes (read-only property)"""
 //|
 STATIC mp_obj_t synthio_synthesizer_obj_get_pressed(mp_obj_t self_in) {
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 89929b0563..7478925dcc 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -35,6 +35,7 @@
 
 #include "shared-bindings/synthio/__init__.h"
 #include "shared-bindings/synthio/MidiTrack.h"
+#include "shared-bindings/synthio/Note.h"
 #include "shared-bindings/synthio/Synthesizer.h"
 
 #define default_attack_time (MICROPY_FLOAT_CONST(0.1))
@@ -157,7 +158,6 @@ const mp_obj_namedtuple_type_t synthio_envelope_type_obj = {
     },
 };
 
-
 //| def from_file(
 //|     file: typing.BinaryIO,
 //|     *,
@@ -271,6 +271,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_midi_to_hz_obj, midi_to_hz);
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
+    { MP_ROM_QSTR(MP_QSTR_Note), MP_ROM_PTR(&synthio_note_type) },
     { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
     { MP_ROM_QSTR(MP_QSTR_from_file), MP_ROM_PTR(&synthio_from_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_Envelope), MP_ROM_PTR(&synthio_envelope_type_obj) },
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index c59fa23bef..343a107db2 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -33,7 +33,7 @@ STATIC void print_midi_stream_error(synthio_miditrack_obj_t *self) {
     self->pos = self->track.len;
 }
 
-STATIC uint8_t parse_note(synthio_miditrack_obj_t *self) {
+STATIC mp_obj_t parse_note(synthio_miditrack_obj_t *self) {
     uint8_t *buffer = self->track.buf;
     size_t len = self->track.len;
     if (self->pos + 1 >= len) {
@@ -43,7 +43,7 @@ STATIC uint8_t parse_note(synthio_miditrack_obj_t *self) {
     if (note > 127 || buffer[(self->pos)++] > 127) {
         print_midi_stream_error(self);
     }
-    return note;
+    return MP_OBJ_NEW_SMALL_INT(note);
 }
 
 static int decode_duration(synthio_miditrack_obj_t *self) {
@@ -72,12 +72,12 @@ static void decode_until_pause(synthio_miditrack_obj_t *self) {
     do {
         switch (buffer[self->pos++] >> 4) {
             case 8: { // Note Off
-                uint8_t note = parse_note(self);
+                mp_obj_t note = parse_note(self);
                 synthio_span_change_note(&self->synth, note, SYNTHIO_SILENCE);
                 break;
             }
             case 9: { // Note On
-                uint8_t note = parse_note(self);
+                mp_obj_t note = parse_note(self);
                 synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, note);
                 break;
             }
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
new file mode 100644
index 0000000000..d31acb31f0
--- /dev/null
+++ b/shared-module/synthio/Note.c
@@ -0,0 +1,158 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include 
+#include "py/runtime.h"
+#include "shared-module/synthio/Note.h"
+#include "shared-bindings/synthio/Note.h"
+#include "shared-bindings/synthio/__init__.h"
+
+static int32_t round_float_to_int(mp_float_t f) {
+    return (int32_t)(f + MICROPY_FLOAT_CONST(0.5));
+}
+
+mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self) {
+    return self->frequency;
+}
+
+void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 32767, MP_QSTR_frequency);
+    self->frequency = val;
+    self->frequency_scaled = synthio_frequency_convert_float_to_scaled(val);
+}
+
+mp_float_t common_hal_synthio_note_get_amplitude(synthio_note_obj_t *self) {
+    return self->amplitude;
+}
+
+void common_hal_synthio_note_set_amplitude(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_amplitude);
+    self->amplitude = val;
+    self->amplitude_scaled = round_float_to_int(val * 32767);
+}
+
+mp_float_t common_hal_synthio_note_get_tremolo_depth(synthio_note_obj_t *self) {
+    return self->tremolo_descr.amplitude;
+}
+
+void common_hal_synthio_note_set_tremolo_depth(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_tremolo_depth);
+    self->tremolo_descr.amplitude = val;
+    self->tremolo_state.amplitude_scaled = round_float_to_int(val * 32767);
+}
+
+mp_float_t common_hal_synthio_note_get_tremolo_rate(synthio_note_obj_t *self) {
+    return self->tremolo_descr.frequency;
+}
+
+void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_tremolo_rate);
+    self->tremolo_descr.frequency = val;
+    if (self->sample_rate != 0) {
+        self->tremolo_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
+    }
+}
+
+mp_float_t common_hal_synthio_note_get_vibrato_depth(synthio_note_obj_t *self) {
+    return self->vibrato_descr.amplitude;
+}
+
+void common_hal_synthio_note_set_vibrato_depth(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_vibrato_depth);
+    self->vibrato_descr.amplitude = val;
+    self->vibrato_state.amplitude_scaled = round_float_to_int(val * 32767);
+}
+
+mp_float_t common_hal_synthio_note_get_vibrato_rate(synthio_note_obj_t *self) {
+    return self->vibrato_descr.frequency;
+}
+
+void common_hal_synthio_note_set_vibrato_rate(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_vibrato_rate);
+    self->vibrato_descr.frequency = val;
+    if (self->sample_rate != 0) {
+        self->vibrato_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
+    }
+}
+
+mp_obj_t common_hal_synthio_note_get_envelope_obj(synthio_note_obj_t *self) {
+    return self->envelope_obj;
+}
+
+void common_hal_synthio_note_set_envelope(synthio_note_obj_t *self, mp_obj_t envelope_in) {
+    if (envelope_in != mp_const_none) {
+        mp_arg_validate_type(envelope_in, (mp_obj_type_t *)&synthio_envelope_type_obj, MP_QSTR_envelope);
+    }
+    self->envelope_obj = envelope_in;
+}
+
+mp_obj_t common_hal_synthio_note_get_waveform_obj(synthio_note_obj_t *self) {
+    return self->waveform_obj;
+}
+
+void common_hal_synthio_note_set_waveform(synthio_note_obj_t *self, mp_obj_t waveform_in) {
+    if (waveform_in == mp_const_none) {
+        memset(&self->waveform_buf, 0, sizeof(self->waveform_buf));
+    } else {
+        mp_buffer_info_t bufinfo_waveform;
+        synthio_synth_parse_waveform(&bufinfo_waveform, waveform_in);
+        self->waveform_buf = bufinfo_waveform;
+    }
+    self->waveform_obj = waveform_in;
+}
+
+void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
+    if (sample_rate == self->sample_rate) {
+        return;
+    }
+    self->sample_rate = sample_rate;
+
+    if (self->envelope_obj != mp_const_none) {
+        synthio_envelope_definition_set(&self->envelope_def, self->envelope_obj, sample_rate);
+    }
+
+    synthio_lfo_set(&self->tremolo_state, &self->tremolo_descr, sample_rate);
+    self->tremolo_state.offset_scaled = 32768 - self->tremolo_state.amplitude_scaled;
+    synthio_lfo_set(&self->vibrato_state, &self->vibrato_descr, sample_rate);
+    self->vibrato_state.offset_scaled = 32768;
+}
+
+void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {
+    synthio_note_recalculate(self, sample_rate);
+    self->phase = 0;
+}
+
+uint32_t synthio_note_envelope(synthio_note_obj_t *self) {
+    return self->amplitude_scaled;
+}
+
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness) {
+    int tremolo_value = synthio_lfo_step(&self->tremolo_state, dur);
+    int vibrato_value = synthio_lfo_step(&self->vibrato_state, dur);
+    *loudness = (*loudness * tremolo_value) >> 15;
+    uint32_t frequency_scaled = ((uint64_t)self->frequency_scaled * vibrato_value) >> 15;
+    return frequency_scaled;
+}
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
new file mode 100644
index 0000000000..4b66997996
--- /dev/null
+++ b/shared-module/synthio/Note.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "shared-module/synthio/__init__.h"
+
+typedef struct synthio_note_obj {
+    mp_obj_base_t base;
+
+    mp_float_t frequency;
+    mp_float_t amplitude;
+    mp_obj_t waveform_obj, envelope_obj;
+
+    int32_t sample_rate;
+
+    int32_t phase;
+    int32_t frequency_scaled;
+    int32_t amplitude_scaled;
+    synthio_lfo_descr_t tremolo_descr, vibrato_descr;
+    synthio_lfo_state_t tremolo_state, vibrato_state;
+
+    mp_buffer_info_t waveform_buf;
+    synthio_envelope_definition_t envelope_def;
+} synthio_note_obj_t;
+
+void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate);
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness);
+void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate);
+bool synthio_note_playing(synthio_note_obj_t *self);
+uint32_t synthio_note_envelope(synthio_note_obj_t *self);
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index 42d0468845..02d98a521e 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -26,6 +26,8 @@
 
 #include "py/runtime.h"
 #include "shared-bindings/synthio/Synthesizer.h"
+#include "shared-bindings/synthio/Note.h"
+#include "shared-module/synthio/Note.h"
 
 
 
@@ -72,40 +74,58 @@ void synthio_synthesizer_get_buffer_structure(synthio_synthesizer_obj_t *self, b
 
 void common_hal_synthio_synthesizer_release_all(synthio_synthesizer_obj_t *self) {
     for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (self->synth.span.note[i] != SYNTHIO_SILENCE) {
-            synthio_span_change_note(&self->synth, self->synth.span.note[i], SYNTHIO_SILENCE);
+        if (self->synth.span.note_obj[i] != SYNTHIO_SILENCE) {
+            synthio_span_change_note(&self->synth, self->synth.span.note_obj[i], SYNTHIO_SILENCE);
         }
     }
 }
+
+STATIC mp_obj_t validate_note(mp_obj_t note_in) {
+    if (mp_obj_is_small_int(note_in)) {
+        mp_arg_validate_int_range(mp_obj_get_int(note_in), 0, 127, MP_QSTR_note);
+    } else {
+        const mp_obj_type_t *note_type = mp_obj_get_type(note_in);
+        if (note_type != &synthio_note_type) {
+            mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), MP_QSTR_note, MP_QSTR_int, MP_QSTR_Note, note_type->name);
+        }
+    }
+    return note_in;
+}
+
 void common_hal_synthio_synthesizer_release(synthio_synthesizer_obj_t *self, mp_obj_t to_release) {
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(to_release, &iter_buf);
     mp_obj_t item;
     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        synthio_span_change_note(&self->synth, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note), SYNTHIO_SILENCE);
+        synthio_span_change_note(&self->synth, validate_note(item), SYNTHIO_SILENCE);
     }
 }
 
 void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_obj_t to_press) {
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(to_press, &iter_buf);
-    mp_obj_t item;
-    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, mp_arg_validate_int_range(mp_obj_get_int(item), 0, 127, MP_QSTR_note));
+    mp_obj_t note_obj;
+    while ((note_obj = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+        if (synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, validate_note(note_obj))) {
+            if (!mp_obj_is_small_int(note_obj)) {
+                synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+                synthio_note_start(note, self->synth.sample_rate);
+            }
+        }
     }
 }
 
 mp_obj_t common_hal_synthio_synthesizer_get_pressed_notes(synthio_synthesizer_obj_t *self) {
     int count = 0;
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        if (self->synth.span.note[chan] != SYNTHIO_SILENCE && self->synth.envelope_state[chan].state != SYNTHIO_ENVELOPE_STATE_RELEASE) {
+        if (self->synth.span.note_obj[chan] != SYNTHIO_SILENCE && SYNTHIO_NOTE_IS_PLAYING(&self->synth, chan)) {
             count += 1;
         }
     }
     mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(count, NULL));
     for (size_t chan = 0, j = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        if (self->synth.span.note[chan] != SYNTHIO_SILENCE && self->synth.envelope_state[chan].state != SYNTHIO_ENVELOPE_STATE_RELEASE) {
-            result->items[j++] = MP_OBJ_NEW_SMALL_INT(self->synth.span.note[chan]);
+        if (self->synth.span.note_obj[chan] != SYNTHIO_SILENCE && SYNTHIO_NOTE_IS_PLAYING(&self->synth, chan)) {
+            result->items[j++] = self->synth.span.note_obj[chan];
         }
     }
     return MP_OBJ_FROM_PTR(result);
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 8c17dfdeed..857f483780 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -27,6 +27,7 @@
 
 #include "shared-module/synthio/__init__.h"
 #include "shared-bindings/synthio/__init__.h"
+#include "shared-module/synthio/Note.h"
 #include "py/runtime.h"
 #include 
 #include 
@@ -36,6 +37,14 @@ STATIC const int16_t square_wave[] = {-32768, 32767};
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
+static int32_t round_float_to_int(mp_float_t f) {
+    return (int32_t)(f + MICROPY_FLOAT_CONST(0.5));
+}
+
+static int64_t round_float_to_int64(mp_float_t f) {
+    return (int64_t)(f + MICROPY_FLOAT_CONST(0.5));
+}
+
 mp_float_t common_hal_synthio_midi_to_hz_float(mp_int_t arg) {
     uint8_t octave = arg / 12;
     uint16_t base_freq = notes[arg % 12];
@@ -52,7 +61,7 @@ STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int1
     return (difference < 0) ? -result : result;
 }
 
-STATIC void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp_obj_t obj, uint32_t sample_rate) {
+void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp_obj_t obj, uint32_t sample_rate) {
     if (obj == mp_const_none) {
         envelope->attack_level = 32767;
         envelope->sustain_level = 32767;
@@ -141,7 +150,7 @@ STATIC void synthio_envelope_state_release(synthio_envelope_state_t *state, synt
 STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
     uint32_t result = 0;
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        if (synth->span.note[chan] != SYNTHIO_SILENCE) {
+        if (synth->span.note_obj[chan] != SYNTHIO_SILENCE) {
             result += synth->envelope_state[chan].level;
         }
     }
@@ -168,12 +177,10 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
     int32_t sample_rate = synth->sample_rate;
     uint32_t total_envelope = synthio_synth_sum_envelope(synth);
-    const int16_t *waveform = synth->waveform;
-    uint32_t waveform_length = synth->waveform_length;
     if (total_envelope > 0) {
         uint16_t ovl_loudness = 0x7fffffff / MAX(0x8000, total_envelope);
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-            if (synth->span.note[chan] == SYNTHIO_SILENCE) {
+            if (synth->span.note_obj[chan] == SYNTHIO_SILENCE) {
                 synth->accum[chan] = 0;
                 continue;
             }
@@ -182,25 +189,52 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
             if (synth->envelope_state[chan].level == 0) {
                 // note is truly finished
-                synth->span.note[chan] = SYNTHIO_SILENCE;
+                synth->span.note_obj[chan] = SYNTHIO_SILENCE;
             }
-            uint8_t octave = synth->span.note[chan] / 12;
-            uint16_t base_freq = notes[synth->span.note[chan] % 12];
+
+            uint32_t dds_rate;
+            const int16_t *waveform = synth->waveform;
+            uint32_t waveform_length = synth->waveform_length;
+            mp_obj_t note_obj = synth->span.note_obj[chan];
+            if (mp_obj_is_small_int(note_obj)) {
+                uint8_t note = mp_obj_get_int(note_obj);
+                uint8_t octave = note / 12;
+                uint16_t base_freq = notes[note % 12];
+                // rate = base_freq * waveform_length
+                // den = sample_rate * 2 ^ (10 - octave)
+                // den = sample_rate * 2 ^ 10 / 2^octave
+                // dds_rate = 2^SHIFT * rate / den
+                // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
+                dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
+            } else {
+                synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+                int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, &loudness);
+                if (note->waveform_buf.buf) {
+                    waveform = note->waveform_buf.buf;
+                    waveform_length = note->waveform_buf.len / 2;
+                }
+                dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
+            }
+
             uint32_t accum = synth->accum[chan];
-#define SHIFT (16)
-            // rate = base_freq * waveform_length
-            // den = sample_rate * 2 ^ (10 - octave)
-            // den = sample_rate * 2 ^ 10 / 2^octave
-            // dds_rate = 2^SHIFT * rate / den
-            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
-            uint32_t dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SHIFT - 10 + octave))) / sample_rate;
+            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+            if (dds_rate > lim / 2) {
+                // beyond nyquist, can't play note
+                continue;
+            }
+
+            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+            if (accum > lim) {
+                accum %= lim;
+            }
 
             for (uint16_t i = 0; i < dur; i++) {
                 accum += dds_rate;
-                if (accum > waveform_length << SHIFT) {
-                    accum -= waveform_length << SHIFT;
+                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+                if (accum > lim) {
+                    accum -= lim;
                 }
-                int16_t idx = accum >> SHIFT;
+                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
                 out_buffer[i] += (waveform[idx] * loudness) / 65536;
             }
             synth->accum[chan] = accum;
@@ -209,7 +243,18 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
     // advance envelope states
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        synthio_envelope_state_step(&synth->envelope_state[chan], &synth->envelope_definition, dur);
+        mp_obj_t note_obj = synth->span.note_obj[chan];
+        if (note_obj == SYNTHIO_SILENCE) {
+            continue;
+        }
+        synthio_envelope_definition_t *def = &synth->envelope_definition;
+        if (!mp_obj_is_small_int(note_obj)) {
+            synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+            if (note->envelope_obj != mp_const_none) {
+                def = ¬e->envelope_def;
+            }
+        }
+        synthio_envelope_state_step(&synth->envelope_state[chan], def, dur);
     }
 
     *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
@@ -254,7 +299,7 @@ void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, const int1
     synthio_synth_envelope_set(synth, envelope_obj);
 
     for (size_t i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        synth->span.note[i] = SYNTHIO_SILENCE;
+        synth->span.note_obj[i] = SYNTHIO_SILENCE;
     }
 }
 
@@ -283,16 +328,16 @@ void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t w
     parse_common(bufinfo_waveform, waveform_obj, MP_QSTR_waveform);
 }
 
-STATIC int find_channel_with_note(synthio_synth_t *synth, uint8_t note) {
+STATIC int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) {
     for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-        if (synth->span.note[i] == note) {
+        if (synth->span.note_obj[i] == note) {
             return i;
         }
     }
     if (note == SYNTHIO_SILENCE) {
         // we need a victim note that is releasing. simple algorithm: lowest numbered slot
         for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-            if (SYNTHIO_VOICE_IS_RELEASING(synth, i)) {
+            if (!SYNTHIO_NOTE_IS_PLAYING(synth, i)) {
                 return i;
             }
         }
@@ -300,7 +345,7 @@ STATIC int find_channel_with_note(synthio_synth_t *synth, uint8_t note) {
     return -1;
 }
 
-bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t new_note) {
+bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_t new_note) {
     int channel;
     if (new_note != SYNTHIO_SILENCE && (channel = find_channel_with_note(synth, new_note)) != -1) {
         // note already playing, re-strike
@@ -313,7 +358,7 @@ bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t
         if (new_note == SYNTHIO_SILENCE) {
             synthio_envelope_state_release(&synth->envelope_state[channel], &synth->envelope_definition);
         } else {
-            synth->span.note[channel] = new_note;
+            synth->span.note_obj[channel] = new_note;
             synthio_envelope_state_init(&synth->envelope_state[channel], &synth->envelope_definition);
             synth->accum[channel] = 0;
         }
@@ -321,3 +366,39 @@ bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t
     }
     return false;
 }
+
+uint64_t synthio_frequency_convert_float_to_scaled(mp_float_t val) {
+    return round_float_to_int64(val * (1 << SYNTHIO_FREQUENCY_SHIFT));
+}
+
+uint32_t synthio_frequency_convert_float_to_dds(mp_float_t frequency_hz, int32_t sample_rate) {
+    return synthio_frequency_convert_scaled_to_dds(synthio_frequency_convert_float_to_scaled(frequency_hz), sample_rate);
+}
+
+uint32_t synthio_frequency_convert_scaled_to_dds(uint64_t frequency_scaled, int32_t sample_rate) {
+    return (sample_rate / 2 + frequency_scaled) / sample_rate;
+}
+
+void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *descr, uint32_t sample_rate) {
+    state->amplitude_scaled = round_float_to_int(descr->amplitude * 32768);
+    state->dds = synthio_frequency_convert_float_to_dds(descr->frequency * 65536, sample_rate);
+}
+
+int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur) {
+    uint32_t phase = state->phase;
+    uint16_t whole_phase = phase >> 16;
+
+    // advance the phase accumulator
+    state->phase = phase + state->dds * dur;
+
+    // create a triangle wave, it's quick and easy
+    int v;
+    if (whole_phase < 16384) { // ramp from 0 to amplitude
+        v = (state->amplitude_scaled * whole_phase);
+    } else if (whole_phase < 49152) { // ramp from +amplitude to -amplitude
+        v = (state->amplitude_scaled * (32768 - whole_phase));
+    } else { // from -amplitude to 0
+        v = (state->amplitude_scaled * (whole_phase - 65536));
+    }
+    return v / 16384 + state->offset_scaled;
+}
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 56521d3208..42e4ee79d4 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -29,14 +29,16 @@
 #define SYNTHIO_BITS_PER_SAMPLE (16)
 #define SYNTHIO_BYTES_PER_SAMPLE (SYNTHIO_BITS_PER_SAMPLE / 8)
 #define SYNTHIO_MAX_DUR (256)
-#define SYNTHIO_SILENCE (0x80)
-#define SYNTHIO_VOICE_IS_RELEASING(synth, i) (synth->envelope_state[i].state == SYNTHIO_ENVELOPE_STATE_RELEASE)
+#define SYNTHIO_SILENCE (mp_const_none)
+#define SYNTHIO_NOTE_IS_SIMPLE(note) (mp_obj_is_small_int(note))
+#define SYNTHIO_NOTE_IS_PLAYING(synth, i) ((synth)->envelope_state[(i)].state != SYNTHIO_ENVELOPE_STATE_RELEASE)
+#define SYNTHIO_FREQUENCY_SHIFT (16)
 
 #include "shared-module/audiocore/__init__.h"
 
 typedef struct {
     uint16_t dur;
-    uint8_t note[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+    mp_obj_t note_obj[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_midi_span_t;
 
 typedef struct {
@@ -73,6 +75,15 @@ typedef struct synthio_synth {
     synthio_envelope_state_t envelope_state[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_synth_t;
 
+typedef struct {
+    mp_float_t amplitude, frequency;
+} synthio_lfo_descr_t;
+
+typedef struct {
+    uint32_t amplitude_scaled, offset_scaled, dds, phase;
+} synthio_lfo_state_t;
+
+
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length, uint8_t channel);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
@@ -84,6 +95,14 @@ void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_outp
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj);
 void synthio_synth_parse_envelope(uint16_t *envelope_sustain_index, mp_buffer_info_t *bufinfo_envelope, mp_obj_t envelope_obj, mp_obj_t envelope_hold_obj);
 
-bool synthio_span_change_note(synthio_synth_t *synth, uint8_t old_note, uint8_t new_note);
+bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_t new_note);
 
 void synthio_envelope_step(synthio_envelope_definition_t *definition, synthio_envelope_state_t *state, int n_samples);
+void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp_obj_t obj, uint32_t sample_rate);
+
+uint64_t synthio_frequency_convert_float_to_scaled(mp_float_t frequency_hz);
+uint32_t synthio_frequency_convert_float_to_dds(mp_float_t frequency_hz, int32_t sample_rate);
+uint32_t synthio_frequency_convert_scaled_to_dds(uint64_t frequency_scaled, int32_t sample_rate);
+
+void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *descr, uint32_t sample_rate);
+int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur);
diff --git a/tests/circuitpython-manual/synthio/note/README.md b/tests/circuitpython-manual/synthio/note/README.md
new file mode 100644
index 0000000000..84ac1cbd6f
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/README.md
@@ -0,0 +1,5 @@
+# Test synthio without hardware
+
+Build the unix port then run `....../ports/unix/micropython-coverage code.py`.
+
+This will create `tune.wav` as output, which you can listen to using any old audio player.
diff --git a/tests/circuitpython-manual/synthio/note/audioop.py b/tests/circuitpython-manual/synthio/note/audioop.py
new file mode 120000
index 0000000000..31896fe265
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/audioop.py
@@ -0,0 +1 @@
+../wave/audioop.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/note/chunk.py b/tests/circuitpython-manual/synthio/note/chunk.py
new file mode 120000
index 0000000000..00983c1f72
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/chunk.py
@@ -0,0 +1 @@
+../wave/chunk.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/note/code.py b/tests/circuitpython-manual/synthio/note/code.py
new file mode 100644
index 0000000000..72783d1b55
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/code.py
@@ -0,0 +1,100 @@
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import wave
+
+SAMPLE_SIZE = 1024
+VOLUME = 14700
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME,
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+)
+
+synth = synthio.Synthesizer(sample_rate=48000)
+
+
+def synthesize(synth):
+    random.seed(3)
+    target_notes = [synthio.midi_to_hz(n + o) for n in (60, 64, 67, 70) for o in (-12, 12, 0)]
+    print(target_notes)
+    notes = [
+        synthio.Note(frequency=random.randint(60, 20000), waveform=sine, envelope=envelope)
+        for note in target_notes
+    ]
+    synth.press(notes)
+    target = synthio.midi_to_hz(72)
+    factor = 0.98
+    for i in range(600):
+        yield 1
+        for ni, ti in zip(notes, target_notes):
+            print(ni.frequency, ti)
+            break
+        for ni, ti in zip(notes, target_notes):
+            ni.frequency = (ni.frequency * factor) + (ti * (1 - factor))
+    synth.release_all()
+    yield 36
+
+
+def synthesize2(synth):
+    n = synthio.Note(
+        frequency=synthio.midi_to_hz(60),
+        tremolo_depth=0.2,
+        tremolo_rate=2,
+        waveform=sine,
+        envelope=envelope,
+    )
+    synth.press((n,))
+    yield 360
+    synth.release_all()
+    yield 36
+
+
+def synthesize3(synth):
+    n = synthio.Note(
+        frequency=synthio.midi_to_hz(60),
+        vibrato_depth=0.1,
+        vibrato_rate=8,
+        waveform=sine,
+        envelope=envelope,
+    )
+    synth.press((n,))
+    yield 360
+    synth.release_all()
+    yield 36
+
+
+def synthesize4(synth):
+    n = synthio.Note(
+        frequency=synthio.midi_to_hz(60),
+        tremolo_depth=0.1,
+        tremolo_rate=1.5,
+        vibrato_depth=0.1,
+        vibrato_rate=3,
+        waveform=sine,
+        envelope=envelope,
+    )
+    synth.press((n,))
+    yield 720
+    synth.release_all()
+    yield 36
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("tune-noenv.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize2(synth), synthesize3(synth), synthesize4(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)
diff --git a/tests/circuitpython-manual/synthio/note/wave.py b/tests/circuitpython-manual/synthio/note/wave.py
new file mode 120000
index 0000000000..45884bd29a
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/wave.py
@@ -0,0 +1 @@
+../wave/wave.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/wave/README.md b/tests/circuitpython-manual/synthio/wave/README.md
index 27868bf9f3..83639b374d 100644
--- a/tests/circuitpython-manual/synthio/wave/README.md
+++ b/tests/circuitpython-manual/synthio/wave/README.md
@@ -1,5 +1,5 @@
 # Test synthio without hardware
 
-Build the uninx port then run `....../ports/unix/micropython-coverage midi2wav.py`.
+Build the unix port then run `....../ports/unix/micropython-coverage midi2wav.py`.
 
 This will create `tune.wav` as output, which you can listen to using any old audio player.
diff --git a/tests/circuitpython/synthesizer_note.py b/tests/circuitpython/synthesizer_note.py
new file mode 100644
index 0000000000..77420e66f6
--- /dev/null
+++ b/tests/circuitpython/synthesizer_note.py
@@ -0,0 +1,41 @@
+import struct
+import synthio
+import audiocore
+
+
+def dump_samples():
+    print([i for i in audiocore.get_buffer(s)[1][:24]])
+
+
+n80 = synthio.Note(synthio.midi_to_hz(80))
+n91 = synthio.Note(synthio.midi_to_hz(80))
+
+s = synthio.Synthesizer(sample_rate=8000)
+print(s.pressed)
+dump_samples()
+
+s.press((n80,))
+print(s.pressed)
+dump_samples()
+
+s.press((n91,))
+print(s.pressed)
+dump_samples()
+
+s.release_then_press((n80,))
+print(s.pressed)
+dump_samples()
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+)
+n60 = synthio.Note(synthio.midi_to_hz(60), envelope=envelope)
+s = synthio.Synthesizer(sample_rate=8000, envelope=envelope)
+s.press((n60,))
+for _ in range(12):
+    buf = audiocore.get_buffer(s)[1]
+    print((min(buf), max(buf)))
+s.release_all()
+for _ in range(12):
+    buf = audiocore.get_buffer(s)[1]
+    print((min(buf), max(buf)))
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
new file mode 100644
index 0000000000..82ae685c07
--- /dev/null
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -0,0 +1,32 @@
+()
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+[-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
+(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None), Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None))
+[0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382]
+(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+[0, 0, 0, 16382, 0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0]
+(-5242, 5241)
+(-10484, 10484)
+(-15727, 15726)
+(-16383, 16382)
+(-14286, 14285)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-13106, 13105)
+(-11009, 11008)
+(-8912, 8911)
+(-6815, 6814)
+(-4718, 4717)
+(-2621, 2620)
+(-524, 523)
+(0, 0)
+(0, 0)
+(0, 0)
+(0, 0)
+(0, 0)

From 4f56b7646e9c7107a4a0e9d1addf58d6df4d5a5d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 May 2023 14:14:50 -0500
Subject: [PATCH 2338/2403] synthio: slow ramp overall envelope back up

.. and account releasing notes at their sustain level until they're
done.

this ameliorates the effect where multiple releasing notes
don't seem to actually be releasing, but stay at a constant volume.
---
 shared-module/synthio/__init__.c | 30 ++++++++++++++++++++++++------
 shared-module/synthio/__init__.h |  1 +
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 857f483780..19e9990b17 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -151,7 +151,12 @@ STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
     uint32_t result = 0;
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
         if (synth->span.note_obj[chan] != SYNTHIO_SILENCE) {
-            result += synth->envelope_state[chan].level;
+            synthio_envelope_state_t *state = &synth->envelope_state[chan];
+            if (state->state == SYNTHIO_ENVELOPE_STATE_RELEASE) {
+                result += synth->envelope_definition.sustain_level;
+            } else {
+                result += state->level;
+            }
         }
     }
     return result;
@@ -177,25 +182,38 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
     int32_t sample_rate = synth->sample_rate;
     uint32_t total_envelope = synthio_synth_sum_envelope(synth);
+    if (total_envelope < synth->total_envelope) {
+        // total envelope is decreasing. Slowly let remaining notes get louder
+        // the time constant is arbitrary, on the order of 1s at 48kHz
+        total_envelope = synth->total_envelope = (
+            total_envelope + synth->total_envelope * 255) / 256;
+    } else {
+        // total envelope is steady or increasing, so just store this as
+        // the high water mark
+        synth->total_envelope = total_envelope;
+    }
     if (total_envelope > 0) {
         uint16_t ovl_loudness = 0x7fffffff / MAX(0x8000, total_envelope);
+
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-            if (synth->span.note_obj[chan] == SYNTHIO_SILENCE) {
+            mp_obj_t note_obj = synth->span.note_obj[chan];
+            if (note_obj == SYNTHIO_SILENCE) {
                 synth->accum[chan] = 0;
                 continue;
             }
-            // adjust loudness by envelope
-            uint16_t loudness = (ovl_loudness * synth->envelope_state[chan].level) >> 16;
 
             if (synth->envelope_state[chan].level == 0) {
-                // note is truly finished
+                // note is truly finished, but we only just noticed
                 synth->span.note_obj[chan] = SYNTHIO_SILENCE;
+                continue;
             }
 
+            // adjust loudness by envelope
+            uint16_t loudness = (ovl_loudness * synth->envelope_state[chan].level) >> 16;
+
             uint32_t dds_rate;
             const int16_t *waveform = synth->waveform;
             uint32_t waveform_length = synth->waveform_length;
-            mp_obj_t note_obj = synth->span.note_obj[chan];
             if (mp_obj_is_small_int(note_obj)) {
                 uint8_t note = mp_obj_get_int(note_obj);
                 uint8_t octave = note / 12;
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 42e4ee79d4..29520dfb5b 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -62,6 +62,7 @@ typedef struct {
 
 typedef struct synthio_synth {
     uint32_t sample_rate;
+    uint32_t total_envelope;
     int16_t *buffers[2];
     const int16_t *waveform;
     uint16_t buffer_length;

From c06597c07aaacf7ae0125467d905e7b169d23fc2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 2 May 2023 14:00:31 -0500
Subject: [PATCH 2339/2403] synthio: replace the quietest releasing note when
 over-writing

---
 shared-module/synthio/__init__.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 19e9990b17..4b32ec3e91 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -352,15 +352,21 @@ STATIC int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) {
             return i;
         }
     }
+    int result = -1;
     if (note == SYNTHIO_SILENCE) {
-        // we need a victim note that is releasing. simple algorithm: lowest numbered slot
-        for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) {
-            if (!SYNTHIO_NOTE_IS_PLAYING(synth, i)) {
-                return i;
+        // replace the releasing note with lowest volume level
+        int level = 32768;
+        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+            if (!SYNTHIO_NOTE_IS_PLAYING(synth, chan)) {
+                synthio_envelope_state_t *state = &synth->envelope_state[chan];
+                if (state->level < level) {
+                    result = chan;
+                    level = state->level;
+                }
             }
         }
     }
-    return -1;
+    return result;
 }
 
 bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_t new_note) {

From 1701552decff4fa50e1f92240d2833f03118339b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 07:22:02 -0500
Subject: [PATCH 2340/2403] synthio: make sustain level relative to attack
 level

and re-vamp overall envelope calculation again.

Now, if you set a low overall attack level like 0.2 this avoids the
"diminishing volume" effect when many notes sound at once. You need
simply choose a maximum attack level that is appropriate for the max
number of voices that will actually be played.
---
 shared-bindings/synthio/__init__.c | 8 ++++----
 shared-module/synthio/__init__.c   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 7478925dcc..5af352b404 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -79,8 +79,8 @@ static const mp_arg_t envelope_properties[] = {
 //|         :param float attack_time: The time in seconds it takes to ramp from 0 volume to attack_volume
 //|         :param float decay_time: The time in seconds it takes to ramp from attack_volume to sustain_volume
 //|         :param float release_time: The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``
-//|         :param float attack_level: The relative level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase
-//|         :param float sustain_level: The relative level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase
+//|         :param float attack_level: The level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase
+//|         :param float sustain_level: The level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase relative to the attack level
 //|         """
 //|     attack_time: float
 //|     """The time in seconds it takes to ramp from 0 volume to attack_volume"""
@@ -92,10 +92,10 @@ static const mp_arg_t envelope_properties[] = {
 //|     """The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``"""
 //|
 //|     attack_level: float
-//|     """The relative level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase"""
+//|     """The level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase"""
 //|
 //|     sustain_level: float
-//|     """The relative level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase"""
+//|     """The level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase relative to the attack level"""
 //|
 
 STATIC mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 4b32ec3e91..fc9d31f029 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -77,7 +77,7 @@ void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp
     mp_obj_tuple_get(obj, &len, &fields);
 
     envelope->attack_level = (int)(32767 * mp_obj_get_float(fields[3]));
-    envelope->sustain_level = (int)(32767 * mp_obj_get_float(fields[4]));
+    envelope->sustain_level = (int)(32767 * mp_obj_get_float(fields[4]) * mp_obj_get_float(fields[3]));
 
     envelope->attack_step = convert_time_to_rate(
         sample_rate, fields[0], envelope->attack_level);
@@ -152,10 +152,10 @@ STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
         if (synth->span.note_obj[chan] != SYNTHIO_SILENCE) {
             synthio_envelope_state_t *state = &synth->envelope_state[chan];
-            if (state->state == SYNTHIO_ENVELOPE_STATE_RELEASE) {
-                result += synth->envelope_definition.sustain_level;
-            } else {
+            if (state->state == SYNTHIO_ENVELOPE_STATE_ATTACK) {
                 result += state->level;
+            } else {
+                result += synth->envelope_definition.attack_level;
             }
         }
     }

From 021aaa4599718901bd45c06c440c736a892126d0 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 07:22:20 -0500
Subject: [PATCH 2341/2403] synthio: remove unused 'phase' from Note objects

---
 shared-module/synthio/Note.c | 1 -
 shared-module/synthio/Note.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index d31acb31f0..b6357559ee 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -142,7 +142,6 @@ void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
 
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {
     synthio_note_recalculate(self, sample_rate);
-    self->phase = 0;
 }
 
 uint32_t synthio_note_envelope(synthio_note_obj_t *self) {
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
index 4b66997996..4efb197c07 100644
--- a/shared-module/synthio/Note.h
+++ b/shared-module/synthio/Note.h
@@ -37,7 +37,6 @@ typedef struct synthio_note_obj {
 
     int32_t sample_rate;
 
-    int32_t phase;
     int32_t frequency_scaled;
     int32_t amplitude_scaled;
     synthio_lfo_descr_t tremolo_descr, vibrato_descr;

From 2b0231e9d313a4657a95b4a4a5c364f94c582859 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 07:23:17 -0500
Subject: [PATCH 2342/2403] synthio: re-striking a note should re-enter attack

.. without changing the current note amplitude
---
 shared-module/synthio/__init__.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index fc9d31f029..6a9911aa9f 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -372,9 +372,8 @@ STATIC int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) {
 bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_t new_note) {
     int channel;
     if (new_note != SYNTHIO_SILENCE && (channel = find_channel_with_note(synth, new_note)) != -1) {
-        // note already playing, re-strike
-        synthio_envelope_state_init(&synth->envelope_state[channel], &synth->envelope_definition);
-        synth->accum[channel] = 0;
+        // note already playing, re-enter attack phase
+        synth->envelope_state[channel].state = SYNTHIO_ENVELOPE_STATE_ATTACK;
         return true;
     }
     channel = find_channel_with_note(synth, old_note);

From e23e7d3b3f7779f2157bbef2e0f447e7706cbdc4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 07:45:45 -0500
Subject: [PATCH 2343/2403] synthio: get_buffer: return error if object
 deinited

this may fix a weird crash during shutdown
---
 shared-module/synthio/MidiTrack.c   | 4 ++++
 shared-module/synthio/Synthesizer.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 343a107db2..66f28409d9 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -158,6 +158,10 @@ void synthio_miditrack_reset_buffer(synthio_miditrack_obj_t *self,
 
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
+    if (common_hal_synthio_miditrack_deinited(self)) {
+        *buffer_length = 0;
+        return GET_BUFFER_ERROR;
+    }
 
     synthio_synth_synthesize(&self->synth, buffer, buffer_length, single_channel_output ? 0 : channel);
     if (self->synth.span.dur == 0) {
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index 02d98a521e..e7fb324d25 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -62,6 +62,10 @@ void synthio_synthesizer_reset_buffer(synthio_synthesizer_obj_t *self,
 
 audioio_get_buffer_result_t synthio_synthesizer_get_buffer(synthio_synthesizer_obj_t *self,
     bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
+    if (common_hal_synthio_synthesizer_deinited(self)) {
+        *buffer_length = 0;
+        return GET_BUFFER_ERROR;
+    }
     self->synth.span.dur = SYNTHIO_MAX_DUR;
     synthio_synth_synthesize(&self->synth, buffer, buffer_length, single_channel_output ? channel : 0);
     return GET_BUFFER_MORE_DATA;

From a388a59543550359226d40fbe6b7dc9652f70048 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 08:41:23 -0500
Subject: [PATCH 2344/2403] rp2040: fix audio glitch at soft-reload

The internal flash cache wasn't being properly used, because
`write_blocks` unconditionally performed the flash write.

Fixing this so that the write's not done until `internal_flash_flush`
fixes the problem in my test program with i2sout & synthio.

as a future optimization, `flash_read_blocks` could learn to read out
of the cache, but that's probably not super important.
---
 ports/raspberrypi/supervisor/internal_flash.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c
index 010528559d..9216f1ebe2 100644
--- a/ports/raspberrypi/supervisor/internal_flash.c
+++ b/ports/raspberrypi/supervisor/internal_flash.c
@@ -95,14 +95,16 @@ void port_internal_flash_flush(void) {
     if (_cache_lba == NO_CACHE) {
         return;
     }
+    // Make sure we don't have an interrupt while we do flash operations.
     common_hal_mcu_disable_interrupts();
     flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, SECTOR_SIZE);
     flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, _cache, SECTOR_SIZE);
-    common_hal_mcu_enable_interrupts();
     _cache_lba = NO_CACHE;
+    common_hal_mcu_enable_interrupts();
 }
 
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
+    port_internal_flash_flush(); // we never read out of the cache, so we have to write it if dirty
     memcpy(dest,
         (void *)(XIP_BASE + CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + block * FILESYSTEM_BLOCK_SIZE),
         num_blocks * FILESYSTEM_BLOCK_SIZE);
@@ -118,6 +120,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
         uint8_t block_offset = block_address % blocks_per_sector;
 
         if (_cache_lba != block_address) {
+            port_internal_flash_flush();
             memcpy(_cache,
                 (void *)(XIP_BASE + CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset),
                 SECTOR_SIZE);
@@ -133,11 +136,6 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
                 FILESYSTEM_BLOCK_SIZE);
             block++;
         }
-        // Make sure we don't have an interrupt while we do flash operations.
-        common_hal_mcu_disable_interrupts();
-        flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset, SECTOR_SIZE);
-        flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + sector_offset, _cache, SECTOR_SIZE);
-        common_hal_mcu_enable_interrupts();
     }
 
     return 0; // success

From c839888e28c7064fb7bd6698488f1d66c3481434 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 08:45:31 -0500
Subject: [PATCH 2345/2403] synthio: rename function that records error
 position

---
 shared-module/synthio/MidiTrack.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 66f28409d9..e22753cb26 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -28,7 +28,7 @@
 #include "shared-bindings/synthio/MidiTrack.h"
 
 
-STATIC void print_midi_stream_error(synthio_miditrack_obj_t *self) {
+STATIC void record_midi_stream_error(synthio_miditrack_obj_t *self) {
     self->error_location = self->pos;
     self->pos = self->track.len;
 }
@@ -37,11 +37,11 @@ STATIC mp_obj_t parse_note(synthio_miditrack_obj_t *self) {
     uint8_t *buffer = self->track.buf;
     size_t len = self->track.len;
     if (self->pos + 1 >= len) {
-        print_midi_stream_error(self);
+        record_midi_stream_error(self);
     }
     uint8_t note = buffer[(self->pos)++];
     if (note > 127 || buffer[(self->pos)++] > 127) {
-        print_midi_stream_error(self);
+        record_midi_stream_error(self);
     }
     return MP_OBJ_NEW_SMALL_INT(note);
 }
@@ -60,7 +60,7 @@ static int decode_duration(synthio_miditrack_obj_t *self) {
     // errors cannot be raised from the background task, so simply end the track.
     if (c & 0x80) {
         self->pos = self->track.len;
-        print_midi_stream_error(self);
+        record_midi_stream_error(self);
     }
     return delta * self->synth.sample_rate / self->tempo;
 }
@@ -89,14 +89,14 @@ static void decode_until_pause(synthio_miditrack_obj_t *self) {
             case 12:
             case 13: // one data byte to ignore
                 if (self->pos >= len || buffer[self->pos++] > 127) {
-                    print_midi_stream_error(self);
+                    record_midi_stream_error(self);
                 }
                 break;
             case 15: // the full syntax is too complicated, just assume it's "End of Track" event
                 self->pos = len;
                 break;
             default: // invalid event
-                print_midi_stream_error(self);
+                record_midi_stream_error(self);
         }
         if (self->pos < len) {
             self->synth.span.dur = decode_duration(self);

From a94031d094a44fa157a480351225c3da9af428c3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 10:16:19 -0500
Subject: [PATCH 2346/2403] synthio: make most Note constructor args kw-only

for similar reasons as Envelope. The mandatory frequency argument can
still be given as a positional argument.
---
 shared-bindings/synthio/Note.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index 0e2dad40d6..427f65097b 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -35,17 +35,18 @@
 
 static const mp_arg_t note_properties[] = {
     { MP_QSTR_frequency, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = NULL } },
-    { MP_QSTR_amplitude, MP_ARG_OBJ, {.u_obj = MP_ROM_INT(1) } },
-    { MP_QSTR_tremolo_rate, MP_ARG_OBJ, {.u_obj = NULL } },
-    { MP_QSTR_tremolo_depth, MP_ARG_OBJ, {.u_obj = NULL } },
-    { MP_QSTR_vibrato_rate, MP_ARG_OBJ, {.u_obj = NULL } },
-    { MP_QSTR_vibrato_depth, MP_ARG_OBJ, {.u_obj = NULL } },
-    { MP_QSTR_waveform, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE } },
-    { MP_QSTR_envelope, MP_ARG_OBJ, {.u_obj = MP_ROM_NONE } },
+    { MP_QSTR_amplitude, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(1) } },
+    { MP_QSTR_tremolo_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_tremolo_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_vibrato_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_vibrato_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
+    { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
 };
 //| class Note:
 //|     def __init__(
 //|         self,
+//|         *,
 //|         frequency: float,
 //|         amplitude: float = 1.0,
 //|         waveform: Optional[ReadableBuffer] = None,

From eebd4a7f521541d850a6d5aaaed9fd3c1cb04a0d Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 10:16:58 -0500
Subject: [PATCH 2347/2403] synthio: no longer fits on feather m4 can

---
 ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
index 1c337d6256..8c9779e5f9 100644
--- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
@@ -12,5 +12,6 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_CANIO = 1
+CIRCUITPY_SYNTHIO = 0
 
 CIRCUITPY_LTO_PARTITION = one

From d2aca7eba072710a91d27be95aef1801b58ccf67 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 4 May 2023 12:23:45 -0500
Subject: [PATCH 2348/2403] synthio: fix per-note envelope & envelope
 modification

.. and simplify the envelope advance logic by handling
'instant' values more intelligently.
---
 shared-module/synthio/Note.c        |  3 ++
 shared-module/synthio/Synthesizer.c |  9 ++--
 shared-module/synthio/__init__.c    | 77 +++++++++++++----------------
 shared-module/synthio/__init__.h    |  2 +-
 4 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index b6357559ee..e86253cdd1 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -105,6 +105,9 @@ mp_obj_t common_hal_synthio_note_get_envelope_obj(synthio_note_obj_t *self) {
 void common_hal_synthio_note_set_envelope(synthio_note_obj_t *self, mp_obj_t envelope_in) {
     if (envelope_in != mp_const_none) {
         mp_arg_validate_type(envelope_in, (mp_obj_type_t *)&synthio_envelope_type_obj, MP_QSTR_envelope);
+        if (self->sample_rate != 0) {
+            synthio_envelope_definition_set(&self->envelope_def, envelope_in, self->sample_rate);
+        }
     }
     self->envelope_obj = envelope_in;
 }
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index e7fb324d25..ad37cccce5 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -110,12 +110,11 @@ void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_ob
     mp_obj_t iterable = mp_getiter(to_press, &iter_buf);
     mp_obj_t note_obj;
     while ((note_obj = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        if (synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, validate_note(note_obj))) {
-            if (!mp_obj_is_small_int(note_obj)) {
-                synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
-                synthio_note_start(note, self->synth.sample_rate);
-            }
+        if (!mp_obj_is_small_int(note_obj)) {
+            synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+            synthio_note_start(note, self->synth.sample_rate);
         }
+        synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, validate_note(note_obj));
     }
 }
 
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 6a9911aa9f..d5efb0f842 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -37,11 +37,11 @@ STATIC const int16_t square_wave[] = {-32768, 32767};
 STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
-static int32_t round_float_to_int(mp_float_t f) {
+STATIC int32_t round_float_to_int(mp_float_t f) {
     return (int32_t)(f + MICROPY_FLOAT_CONST(0.5));
 }
 
-static int64_t round_float_to_int64(mp_float_t f) {
+STATIC int64_t round_float_to_int64(mp_float_t f) {
     return (int64_t)(f + MICROPY_FLOAT_CONST(0.5));
 }
 
@@ -55,7 +55,7 @@ STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int1
     mp_float_t time = mp_obj_get_float(time_in);
     int num_samples = (int)MICROPY_FLOAT_C_FUN(round)(time * sample_rate);
     if (num_samples == 0) {
-        return 0;
+        return 32767;
     }
     int16_t result = MIN(32767, MAX(1, abs(difference * SYNTHIO_MAX_DUR) / num_samples));
     return (difference < 0) ? -result : result;
@@ -102,34 +102,19 @@ STATIC void synthio_envelope_state_step(synthio_envelope_state_t *state, synthio
             case SYNTHIO_ENVELOPE_STATE_SUSTAIN:
                 break;
             case SYNTHIO_ENVELOPE_STATE_ATTACK:
-                if (def->attack_step != 0) {
-                    state->level = MIN(state->level + def->attack_step, def->attack_level);
-                    if (state->level == def->attack_level) {
-                        state->state = SYNTHIO_ENVELOPE_STATE_DECAY;
-                    }
-                    break;
-                }
-                state->state = SYNTHIO_ENVELOPE_STATE_DECAY;
-                MP_FALLTHROUGH;
-            case SYNTHIO_ENVELOPE_STATE_DECAY:
-                if (def->decay_step != 0) {
-                    state->level = MAX(state->level + def->decay_step, def->sustain_level);
-                    assert(state->level >= 0);
-                    if (state->level == def->sustain_level) {
-                        state->state = SYNTHIO_ENVELOPE_STATE_SUSTAIN;
-                    }
-                    break;
-                }
-                state->state = SYNTHIO_ENVELOPE_STATE_RELEASE;
-                MP_FALLTHROUGH;
-            case SYNTHIO_ENVELOPE_STATE_RELEASE:
-                if (def->release_step != 0) {
-                    int delta = def->release_step;
-                    state->level = MAX(state->level + delta, 0);
-                } else {
-                    state->level = 0;
+                state->level = MIN(state->level + def->attack_step, def->attack_level);
+                if (state->level == def->attack_level) {
+                    state->state = SYNTHIO_ENVELOPE_STATE_DECAY;
                 }
                 break;
+            case SYNTHIO_ENVELOPE_STATE_DECAY:
+                state->level = MAX(state->level + def->decay_step, def->sustain_level);
+                if (state->level == def->sustain_level) {
+                    state->state = SYNTHIO_ENVELOPE_STATE_SUSTAIN;
+                }
+                break;
+            case SYNTHIO_ENVELOPE_STATE_RELEASE:
+                state->level = MAX(state->level + def->release_step, 0);
         }
     }
 }
@@ -146,23 +131,34 @@ STATIC void synthio_envelope_state_release(synthio_envelope_state_t *state, synt
     state->state = SYNTHIO_ENVELOPE_STATE_RELEASE;
 }
 
+STATIC synthio_envelope_definition_t *synthio_synth_get_note_envelope(synthio_synth_t *synth, mp_obj_t note_obj) {
+    synthio_envelope_definition_t *def = &synth->global_envelope_definition;
+    if (!mp_obj_is_small_int(note_obj)) {
+        synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+        if (note->envelope_obj != mp_const_none) {
+            def = ¬e->envelope_def;
+        }
+    }
+    return def;
+}
+
 
 STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
     uint32_t result = 0;
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        if (synth->span.note_obj[chan] != SYNTHIO_SILENCE) {
+        mp_obj_t note_obj = synth->span.note_obj[chan];
+        if (note_obj != SYNTHIO_SILENCE) {
             synthio_envelope_state_t *state = &synth->envelope_state[chan];
             if (state->state == SYNTHIO_ENVELOPE_STATE_ATTACK) {
                 result += state->level;
             } else {
-                result += synth->envelope_definition.attack_level;
+                result += synthio_synth_get_note_envelope(synth, note_obj)->attack_level;
             }
         }
     }
     return result;
 }
 
-
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t *buffer_length, uint8_t channel) {
 
     if (channel == synth->other_channel) {
@@ -265,14 +261,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
         if (note_obj == SYNTHIO_SILENCE) {
             continue;
         }
-        synthio_envelope_definition_t *def = &synth->envelope_definition;
-        if (!mp_obj_is_small_int(note_obj)) {
-            synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
-            if (note->envelope_obj != mp_const_none) {
-                def = ¬e->envelope_def;
-            }
-        }
-        synthio_envelope_state_step(&synth->envelope_state[chan], def, dur);
+        synthio_envelope_state_step(&synth->envelope_state[chan], synthio_synth_get_note_envelope(synth, note_obj), dur);
     }
 
     *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
@@ -298,7 +287,7 @@ void synthio_synth_deinit(synthio_synth_t *synth) {
 }
 
 void synthio_synth_envelope_set(synthio_synth_t *synth, mp_obj_t envelope_obj) {
-    synthio_envelope_definition_set(&synth->envelope_definition, envelope_obj, synth->sample_rate);
+    synthio_envelope_definition_set(&synth->global_envelope_definition, envelope_obj, synth->sample_rate);
     synth->envelope_obj = envelope_obj;
 }
 
@@ -329,7 +318,7 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan
     *spacing = 1;
 }
 
-static bool parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what) {
+STATIC bool parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what) {
     if (o != mp_const_none) {
         mp_get_buffer_raise(o, bufinfo, MP_BUFFER_READ);
         if (bufinfo->typecode != 'h') {
@@ -379,10 +368,10 @@ bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_
     channel = find_channel_with_note(synth, old_note);
     if (channel != -1) {
         if (new_note == SYNTHIO_SILENCE) {
-            synthio_envelope_state_release(&synth->envelope_state[channel], &synth->envelope_definition);
+            synthio_envelope_state_release(&synth->envelope_state[channel], synthio_synth_get_note_envelope(synth, old_note));
         } else {
             synth->span.note_obj[channel] = new_note;
-            synthio_envelope_state_init(&synth->envelope_state[channel], &synth->envelope_definition);
+            synthio_envelope_state_init(&synth->envelope_state[channel], synthio_synth_get_note_envelope(synth, new_note));
             synth->accum[channel] = 0;
         }
         return true;
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 29520dfb5b..4ea04a09e3 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -69,7 +69,7 @@ typedef struct synthio_synth {
     uint16_t last_buffer_length;
     uint8_t other_channel, buffer_index, other_buffer_index;
     uint16_t waveform_length;
-    synthio_envelope_definition_t envelope_definition;
+    synthio_envelope_definition_t global_envelope_definition;
     mp_obj_t envelope_obj;
     synthio_midi_span_t span;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];

From 298bd16529235a7b478818e4feb45c667071c8ad Mon Sep 17 00:00:00 2001
From: Alec Delaney <89490472+tekktrik@users.noreply.github.com>
Date: Thu, 4 May 2023 15:55:33 -0400
Subject: [PATCH 2349/2403] Fix creating virtual environment for stub creation

---
 tools/test-stubs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-stubs.sh b/tools/test-stubs.sh
index c977ad26d9..6c6c991015 100755
--- a/tools/test-stubs.sh
+++ b/tools/test-stubs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 rm -rf test-stubs
-python3 -mvenv test-stubs
+python3 -m venv test-stubs
 . test-stubs/bin/activate
 pip install mypy isort black adafruit-circuitpython-typing wheel
 rm -rf circuitpython-stubs .mypy_cache

From 66411fdd38b95e3b0d3ae6fad7dbe35c873569a4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 5 May 2023 17:09:20 -0500
Subject: [PATCH 2350/2403] espressif: check return value from
 esp_ping_new_session
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

esp_ping_new_session can fail, particularly if ping is called quickly
many times in succession.

This is because `esp_ping_new_session` has to do a bunch of stuff
including creating a task and a socket. Calling `esp_ping_delete_session`
doesn't clean up these resources immediately. Instead, it signals the
task to clean up resources and exit 'soon', but 'soon' is defined as 1
second.

When the calls are frequent, the in-use sockets and tasks fill up
available slots—I didn't actually check which resource gets used
up first.

With this change, the ping call will raise an exception instead of
continuing with a call to esp_ping_start that crashes.

Closes #5980 based on my testing on an ESP32S3-N8R2.
---
 ports/espressif/common-hal/wifi/Radio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 0ce535899a..851e1bea25 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -29,6 +29,7 @@
 
 #include 
 
+#include "bindings/espidf/__init__.h"
 #include "common-hal/wifi/__init__.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"
@@ -497,7 +498,7 @@ mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address,
     size_t timeout_ms = timeout * 1000;
 
     esp_ping_handle_t ping;
-    esp_ping_new_session(&ping_config, NULL, &ping);
+    CHECK_ESP_RESULT(esp_ping_new_session(&ping_config, NULL, &ping));
     esp_ping_start(ping);
 
     uint32_t received = 0;

From a52d0c742e073b1eebefaaba5b94d41332c9cdcf Mon Sep 17 00:00:00 2001
From: RetiredWizard 
Date: Sat, 6 May 2023 03:16:38 -0400
Subject: [PATCH 2351/2403] Add call to rtc_reset

---
 ports/silabs/supervisor/port.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/silabs/supervisor/port.c b/ports/silabs/supervisor/port.c
index b5deebf979..8247c813a7 100644
--- a/ports/silabs/supervisor/port.c
+++ b/ports/silabs/supervisor/port.c
@@ -188,6 +188,10 @@ void reset_port(void) {
     #if CIRCUITPY_BLEIO
     bleio_reset();
     #endif
+
+    #if CIRCUITPY_RTC
+    rtc_reset();
+    #endif
 }
 
 void reset_to_bootloader(void) {

From a854e554f4f2492aaa881da659c601afdeef047e Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 5 May 2023 18:25:51 -0500
Subject: [PATCH 2352/2403] synthio: add midi_to_hz to docs

---
 shared-bindings/synthio/__init__.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 5af352b404..b48e279028 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -262,6 +262,10 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file);
 
+//| def midi_to_hz(midi_note: int) -> float:
+//|     """Converts the given midi note (60 = middle C, 69 = concert A) to Hz"""
+//|
+/
 STATIC mp_obj_t midi_to_hz(mp_obj_t arg) {
     mp_int_t note = mp_arg_validate_int_range(mp_obj_get_int(arg), 1, 127, MP_QSTR_note);
     return mp_obj_new_float(common_hal_synthio_midi_to_hz_float(note));

From a53c0ed0663ce0b15e7ea7089b9b7c54c62d7b7f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 6 May 2023 08:35:48 -0500
Subject: [PATCH 2353/2403] synthio: add onevo_to_hz, implement midi_to_hz in
 terms of it

this has the side effect of making some notes more accurate, the new
frequency= value in the test is closer to the true midi frequency of
830.609...Hz.
---
 shared-bindings/synthio/__init__.c          | 20 +++++++++++++++++---
 shared-bindings/synthio/__init__.h          |  3 ++-
 shared-module/synthio/__init__.c            | 10 ++++++----
 tests/circuitpython/synthesizer_note.py.exp |  6 +++---
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index b48e279028..2e4fd7b8a4 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -262,16 +262,29 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file);
 
-//| def midi_to_hz(midi_note: int) -> float:
+//| def midi_to_hz(midi_note: float) -> float:
 //|     """Converts the given midi note (60 = middle C, 69 = concert A) to Hz"""
 //|
-/
+
 STATIC mp_obj_t midi_to_hz(mp_obj_t arg) {
-    mp_int_t note = mp_arg_validate_int_range(mp_obj_get_int(arg), 1, 127, MP_QSTR_note);
+    mp_float_t note = mp_arg_validate_obj_float_range(arg, 1, 127, MP_QSTR_note);
     return mp_obj_new_float(common_hal_synthio_midi_to_hz_float(note));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(synthio_midi_to_hz_obj, midi_to_hz);
 
+//| def onevo_to_hz(ctrl: float) -> float:
+//|     """Converts a 1v/octave signal to Hz.
+//|
+//|     60/12 (5.0) corresponds to middle C, 69/12 is concert A."""
+//|
+
+STATIC mp_obj_t onevo_to_hz(mp_obj_t arg) {
+    mp_float_t note = mp_arg_validate_obj_float_range(arg, 0, 11, MP_QSTR_ctrl);
+    return mp_obj_new_float(common_hal_synthio_onevo_to_hz_float(note));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_onevo_to_hz_obj, onevo_to_hz);
+
+
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
@@ -280,6 +293,7 @@ STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_from_file), MP_ROM_PTR(&synthio_from_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_Envelope), MP_ROM_PTR(&synthio_envelope_type_obj) },
     { MP_ROM_QSTR(MP_QSTR_midi_to_hz), MP_ROM_PTR(&synthio_midi_to_hz_obj) },
+    { MP_ROM_QSTR(MP_QSTR_onevo_to_hz), MP_ROM_PTR(&synthio_midi_to_hz_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(synthio_module_globals, synthio_module_globals_table);
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index d3ccc1ce04..37a5c77b34 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -33,4 +33,5 @@ extern int16_t shared_bindings_synthio_square_wave[];
 extern const mp_obj_namedtuple_type_t synthio_envelope_type_obj;
 void synthio_synth_envelope_set(synthio_synth_t *synth, mp_obj_t envelope_obj);
 mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth);
-mp_float_t common_hal_synthio_midi_to_hz_float(mp_int_t note);
+mp_float_t common_hal_synthio_midi_to_hz_float(mp_float_t note);
+mp_float_t common_hal_synthio_onevo_to_hz_float(mp_float_t note);
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index d5efb0f842..596f3fb184 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -45,10 +45,12 @@ STATIC int64_t round_float_to_int64(mp_float_t f) {
     return (int64_t)(f + MICROPY_FLOAT_CONST(0.5));
 }
 
-mp_float_t common_hal_synthio_midi_to_hz_float(mp_int_t arg) {
-    uint8_t octave = arg / 12;
-    uint16_t base_freq = notes[arg % 12];
-    return MICROPY_FLOAT_C_FUN(ldexp)(base_freq, octave - 10);
+mp_float_t common_hal_synthio_midi_to_hz_float(mp_float_t arg) {
+    return common_hal_synthio_onevo_to_hz_float(arg / 12.);
+}
+
+mp_float_t common_hal_synthio_onevo_to_hz_float(mp_float_t octave) {
+    return notes[0] * MICROPY_FLOAT_C_FUN(pow)(2., octave - 10);
 }
 
 STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int16_t difference) {
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index 82ae685c07..e51cea1755 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
 [-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None), Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None))
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None), Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None))
 [0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382]
-(Note(frequency=830.625, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
 [0, 0, 0, 16382, 0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0]
 (-5242, 5241)
 (-10484, 10484)

From 9a9f3229fa4559865bdaa9b44995bf3ea5abaac3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Sat, 6 May 2023 21:34:48 -0500
Subject: [PATCH 2354/2403] synthio: Perform vibrato in pitch, not as frequency
 ratio

Now the vibrato 'units' are 1.0 = one octave, 1/12 = one semitone,
1/1200 = one cent. Before, the units were somewhat arbitrary and were not
perceptually "symmetrical" around the base frequency.

For vibrato_depth = 1/12 and base frequency of 440,

before: pitch from 403.33 to 476.67Hz, not corresponding to any notes
after: pitch from 415.30 to 466.16Hz, corresponding to G# and A#
---
 shared-bindings/synthio/Note.c | 14 ++++++++++++--
 shared-module/synthio/Note.c   | 27 ++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index 427f65097b..4cd0abe0d4 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -118,7 +118,12 @@ MP_PROPERTY_GETSET(synthio_note_amplitude_obj,
 
 
 //|     tremolo_depth: float
-//|     """The tremolo depth of the note, from 0 to 1"""
+//|     """The tremolo depth of the note, from 0 to 1
+//|
+//|     A depth of 0 disables tremolo. A nonzero value enables tremolo,
+//|     with the maximum decrease in amplitude being equal to the tremolo
+//|     depth. A note with a tremolo depth of 1 will fade out to nothing, while
+//|     a tremolo depth of 0.1 will give a minimum amplitude of 0.9."""
 STATIC mp_obj_t synthio_note_get_tremolo_depth(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_synthio_note_get_tremolo_depth(self));
@@ -154,7 +159,12 @@ MP_PROPERTY_GETSET(synthio_note_tremolo_rate_obj,
     (mp_obj_t)&synthio_note_set_tremolo_rate_obj);
 
 //|     vibrato_depth: float
-//|     """The vibrato depth of the note, from 0 to 1"""
+//|     """The vibrato depth of the note, from 0 to 1
+//|
+//|     A depth of 0 disables vibrato. A depth of 1 corresponds to a vibrato of ±1
+//|     octave.  A depth of (1/12) = 0.833 corresponds to a vibrato of ±1 semitone,
+//|     and a depth of .00833 corresponds to one musical cent.
+//|     """
 STATIC mp_obj_t synthio_note_get_vibrato_depth(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_synthio_note_get_vibrato_depth(self));
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index e86253cdd1..84949163a7 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -151,10 +151,35 @@ uint32_t synthio_note_envelope(synthio_note_obj_t *self) {
     return self->amplitude_scaled;
 }
 
+// Perform a pitch bend operation
+//
+// bend_value is in the range [0, 65535]. "no change" is 32768. The bend unit is 32768/octave.
+//
+// compare to (frequency_scaled * pow(2, (bend_value-32768)/32768))
+// a 13-entry pitch table
+#define BEND_SCALE (32768)
+#define BEND_OFFSET (BEND_SCALE)
+
+STATIC uint16_t pitch_bend_table[] = { 0, 1948, 4013, 6200, 8517, 10972, 13573, 16329, 19248, 22341, 25618, 29090, 32768 };
+
+STATIC uint32_t pitch_bend(uint32_t frequency_scaled, uint16_t bend_value) {
+    bool down = (bend_value < 32768);
+    if (!down) {
+        bend_value -= 32768;
+    }
+    uint32_t bend_value_semitone = (uint32_t)bend_value * 24; // 65536/semitone
+    uint32_t semitone = bend_value_semitone >> 16;
+    uint32_t fractone = bend_value_semitone & 0xffff;
+    uint32_t f_lo = pitch_bend_table[semitone];
+    uint32_t f_hi = pitch_bend_table[semitone + 1]; // table has 13 entries, indexing with semitone=12 is OK
+    uint32_t f = ((f_lo * (65535 - fractone) + f_hi * fractone) >> 16) + BEND_OFFSET;
+    return (frequency_scaled * (uint64_t)f) >> (15 + down);
+}
+
 uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness) {
     int tremolo_value = synthio_lfo_step(&self->tremolo_state, dur);
     int vibrato_value = synthio_lfo_step(&self->vibrato_state, dur);
     *loudness = (*loudness * tremolo_value) >> 15;
-    uint32_t frequency_scaled = ((uint64_t)self->frequency_scaled * vibrato_value) >> 15;
+    uint32_t frequency_scaled = pitch_bend(self->frequency_scaled, vibrato_value);
     return frequency_scaled;
 }

From 3abcc6a2c3365cba5bb54c3c005bc24dfcbe324a Mon Sep 17 00:00:00 2001
From: Phil Underwood 
Date: Sun, 7 May 2023 15:58:25 +0100
Subject: [PATCH 2355/2403] Add memorymap support for the nRF processors.

This gives very permissive access to the internals of the microprocessor.
It needs the user to be **very** careful that they do not break things
---
 ports/nrf/common-hal/memorymap/AddressRange.c | 136 ++++++++++++++++++
 ports/nrf/common-hal/memorymap/AddressRange.h |  38 +++++
 ports/nrf/common-hal/memorymap/__init__.c     |   1 +
 ports/nrf/mpconfigport.mk                     |   3 +
 4 files changed, 178 insertions(+)
 create mode 100644 ports/nrf/common-hal/memorymap/AddressRange.c
 create mode 100644 ports/nrf/common-hal/memorymap/AddressRange.h
 create mode 100644 ports/nrf/common-hal/memorymap/__init__.c

diff --git a/ports/nrf/common-hal/memorymap/AddressRange.c b/ports/nrf/common-hal/memorymap/AddressRange.c
new file mode 100644
index 0000000000..eaef202d0d
--- /dev/null
+++ b/ports/nrf/common-hal/memorymap/AddressRange.c
@@ -0,0 +1,136 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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
+ * 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 
+#include "nrf.h"
+
+#include "shared-bindings/memorymap/AddressRange.h"
+
+#include "py/runtime.h"
+
+
+#ifdef NRF51_SERIES
+size_t allow_ranges[][2] = {
+    // FLASH
+    {0x00000000, 0x00040000},
+    // FICR & UICR ranges
+    {0x10000000, 0x10002000},
+    // RAM
+    {0x20000000, 0x20010000},
+    // PERIPHERALS
+    {0x40000000, 0x60000000}
+};
+#elif defined NRF52_SERIES
+size_t allow_ranges[][2] = {
+    // FLASH
+    {0x00000000, 0x00100000},
+    // FICR & UICR ranges
+    {0x10000000, 0x10002000},
+    // RAM
+    {0x20000000, 0x20040000},
+    // PERIPHERALS
+    {0x40000000, 0x60000000}
+};
+#elif defined NRF53_SERIES
+size_t allow_ranges[][2] = {
+    // FLASH
+    {0x00000000, 0x00100000},
+    // FICR & UICR ranges
+    {0x00FF0000, 0x01000000},
+    // RAM
+    {0x20000000, 0x20080000},
+    // PERIPHERALS
+    {0x40000000, 0x60000000},
+    {0xE0000000, 0xE0100000}
+};
+#else
+#error "Unsupported nRF variant"
+#endif
+
+void common_hal_memorymap_addressrange_construct(memorymap_addressrange_obj_t *self, uint8_t *start_address, size_t length) {
+    bool allowed = false;
+    for (size_t i = 0; i < MP_ARRAY_SIZE(allow_ranges); i++) {
+        uint8_t *allowed_start = (uint8_t *)allow_ranges[i][0];
+        uint8_t *allowed_end = (uint8_t *)allow_ranges[i][1];
+        if (allowed_start <= start_address &&
+            (start_address + length) <= allowed_end) {
+            allowed = true;
+            break;
+        }
+    }
+
+    if (!allowed) {
+        mp_raise_ValueError(translate("Address range not allowed"));
+    }
+
+    self->start_address = start_address;
+    self->len = length;
+}
+
+uint32_t common_hal_memorymap_addressrange_get_length(const memorymap_addressrange_obj_t *self) {
+    return self->len;
+}
+
+
+bool common_hal_memorymap_addressrange_set_bytes(const memorymap_addressrange_obj_t *self,
+    uint32_t start_index, uint8_t *values, uint32_t len) {
+    uint8_t *address = self->start_address + start_index;
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    if (len == 1) {
+        *((uint8_t *)address) = values[0];
+    } else if (len == sizeof(uint16_t) && (((size_t)address) % sizeof(uint16_t)) == 0) {
+        *((uint16_t *)address) = ((uint16_t *)values)[0];
+    } else if (len == sizeof(uint32_t) && (((size_t)address) % sizeof(uint32_t)) == 0) {
+        *((uint32_t *)address) = ((uint32_t *)values)[0];
+    } else if (len == sizeof(uint64_t) && (((size_t)address) % sizeof(uint64_t)) == 0) {
+        *((uint64_t *)address) = ((uint64_t *)values)[0];
+    } else {
+        memcpy(address, values, len);
+    }
+    #pragma GCC diagnostic pop
+
+    return true;
+}
+
+void common_hal_memorymap_addressrange_get_bytes(const memorymap_addressrange_obj_t *self,
+    uint32_t start_index, uint32_t len, uint8_t *values) {
+    uint8_t *address = self->start_address + start_index;
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
+    if (len == 1) {
+        values[0] = *((uint8_t *)address);
+    } else if (len == sizeof(uint16_t) && (((size_t)address) % sizeof(uint16_t)) == 0) {
+        ((uint16_t *)values)[0] = *((uint16_t *)address);
+    } else if (len == sizeof(uint32_t) && (((size_t)address) % sizeof(uint32_t)) == 0) {
+        ((uint32_t *)values)[0] = *((uint32_t *)address);
+    } else if (len == sizeof(uint64_t) && (((size_t)address) % sizeof(uint64_t)) == 0) {
+        ((uint64_t *)values)[0] = *((uint64_t *)address);
+    } else {
+        memcpy(values, address, len);
+    }
+    #pragma GCC diagnostic pop
+}
diff --git a/ports/nrf/common-hal/memorymap/AddressRange.h b/ports/nrf/common-hal/memorymap/AddressRange.h
new file mode 100644
index 0000000000..20f59f3c73
--- /dev/null
+++ b/ports/nrf/common-hal/memorymap/AddressRange.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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
+ * 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_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t *start_address;
+    size_t len;
+} memorymap_addressrange_obj_t;
+
+#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_MEMORYMAP_ADDRESSRANGE_H
diff --git a/ports/nrf/common-hal/memorymap/__init__.c b/ports/nrf/common-hal/memorymap/__init__.c
new file mode 100644
index 0000000000..c15b17f451
--- /dev/null
+++ b/ports/nrf/common-hal/memorymap/__init__.c
@@ -0,0 +1 @@
+// No memorymap module functions.
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index 04c4f3bce6..91929749ca 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -46,6 +46,8 @@ CIRCUITPY_BLE_FILE_SERVICE ?= 1
 CIRCUITPY_SERIAL_BLE ?= 1
 
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
+CIRCUITPY_MEMORYMAP ?= 1
+
 
 # nRF52840-specific
 
@@ -69,6 +71,7 @@ SOFTDEV_VERSION ?= 6.1.0
 BOOT_SETTING_ADDR = 0xFF000
 NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
 
+
 # CircuitPython doesn't yet support NFC so force the NFC antenna pins to be GPIO.
 # See https://github.com/adafruit/circuitpython/issues/1300
 # Defined here because system_nrf52840.c doesn't #include any of our own include files.

From fe90cc759a91a4d5e665c39838ce3be10f1e02d8 Mon Sep 17 00:00:00 2001
From: Phil Underwood 
Date: Sun, 7 May 2023 16:08:56 +0100
Subject: [PATCH 2356/2403] remove excess line

---
 ports/nrf/mpconfigport.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index 91929749ca..7937b83ddc 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -71,7 +71,6 @@ SOFTDEV_VERSION ?= 6.1.0
 BOOT_SETTING_ADDR = 0xFF000
 NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
 
-
 # CircuitPython doesn't yet support NFC so force the NFC antenna pins to be GPIO.
 # See https://github.com/adafruit/circuitpython/issues/1300
 # Defined here because system_nrf52840.c doesn't #include any of our own include files.

From bcd9d6bacc368728f53c649b700af18a16a22463 Mon Sep 17 00:00:00 2001
From: Phil Underwood 
Date: Sun, 7 May 2023 18:21:22 +0100
Subject: [PATCH 2357/2403] Add memorymap to nrf52840 devices only

---
 ports/nrf/mpconfigport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index 7937b83ddc..7973453c2f 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -46,7 +46,6 @@ CIRCUITPY_BLE_FILE_SERVICE ?= 1
 CIRCUITPY_SERIAL_BLE ?= 1
 
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
-CIRCUITPY_MEMORYMAP ?= 1
 
 
 # nRF52840-specific
@@ -58,6 +57,7 @@ MCU_SUB_VARIANT = nrf52840
 
 # Fits on nrf52840 but space is tight on nrf52833.
 CIRCUITPY_AESIO ?= 1
+CIRCUITPY_MEMORYMAP ?= 1
 
 CIRCUITPY_RGBMATRIX ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1

From c031bda5dd78294ba6498d56cfa4ab8c511bdbb3 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Mon, 8 May 2023 09:20:46 -0500
Subject: [PATCH 2358/2403] synthio: implement a range compressor with hard
 knee

This really improves the loudness of the output with multiple notes
while being a nice simple algorithm to implement.
---
 shared-module/synthio/__init__.c              | 184 +++++++++---------
 .../circuitpython-manual/synthio/note/code.py |  21 +-
 tests/circuitpython/miditrack.py.exp          |   4 +-
 tests/circuitpython/synthesizer.py.exp        |  44 ++---
 tests/circuitpython/synthesizer_note.py.exp   |  44 ++---
 5 files changed, 160 insertions(+), 137 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 596f3fb184..5ee72aeb79 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -145,20 +145,30 @@ STATIC synthio_envelope_definition_t *synthio_synth_get_note_envelope(synthio_sy
 }
 
 
-STATIC uint32_t synthio_synth_sum_envelope(synthio_synth_t *synth) {
-    uint32_t result = 0;
-    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        mp_obj_t note_obj = synth->span.note_obj[chan];
-        if (note_obj != SYNTHIO_SILENCE) {
-            synthio_envelope_state_t *state = &synth->envelope_state[chan];
-            if (state->state == SYNTHIO_ENVELOPE_STATE_ATTACK) {
-                result += state->level;
-            } else {
-                result += synthio_synth_get_note_envelope(synth, note_obj)->attack_level;
-            }
-        }
+#define RANGE_LOW (-28000)
+#define RANGE_HIGH (28000)
+#define RANGE_SHIFT (16)
+#define RANGE_SCALE (0xfffffff / (32768 * CIRCUITPY_SYNTHIO_MAX_CHANNELS - RANGE_HIGH))
+
+// dynamic range compression via a downward compressor with hard knee
+//
+// When the output value is within the range +-28000 (about 85% of full scale),
+// it is unchanged. Otherwise, it undergoes a gain reduction so that the
+// largest possible values, (+32768,-32767) * CIRCUITPY_SYNTHIO_MAX_CHANNELS,
+// still fit within the output range
+//
+// This produces a much louder overall volume with multiple voices, without
+// much additional processing.
+//
+// https://en.wikipedia.org/wiki/Dynamic_range_compression
+STATIC
+int16_t mix_down_sample(int32_t sample) {
+    if (sample < RANGE_LOW) {
+        sample = (((sample - RANGE_LOW) * RANGE_SCALE) >> RANGE_SHIFT) + RANGE_LOW;
+    } else if (sample > RANGE_HIGH) {
+        sample = (((sample - RANGE_HIGH) * RANGE_SCALE) >> RANGE_SHIFT) + RANGE_HIGH;
     }
-    return result;
+    return sample;
 }
 
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t *buffer_length, uint8_t channel) {
@@ -172,89 +182,83 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     synth->buffer_index = !synth->buffer_index;
     synth->other_channel = 1 - channel;
     synth->other_buffer_index = synth->buffer_index;
-    int16_t *out_buffer = (int16_t *)(void *)synth->buffers[synth->buffer_index];
 
     uint16_t dur = MIN(SYNTHIO_MAX_DUR, synth->span.dur);
     synth->span.dur -= dur;
-    memset(out_buffer, 0, synth->buffer_length);
 
     int32_t sample_rate = synth->sample_rate;
-    uint32_t total_envelope = synthio_synth_sum_envelope(synth);
-    if (total_envelope < synth->total_envelope) {
-        // total envelope is decreasing. Slowly let remaining notes get louder
-        // the time constant is arbitrary, on the order of 1s at 48kHz
-        total_envelope = synth->total_envelope = (
-            total_envelope + synth->total_envelope * 255) / 256;
-    } else {
-        // total envelope is steady or increasing, so just store this as
-        // the high water mark
-        synth->total_envelope = total_envelope;
-    }
-    if (total_envelope > 0) {
-        uint16_t ovl_loudness = 0x7fffffff / MAX(0x8000, total_envelope);
+    int32_t out_buffer32[dur];
 
-        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-            mp_obj_t note_obj = synth->span.note_obj[chan];
-            if (note_obj == SYNTHIO_SILENCE) {
-                synth->accum[chan] = 0;
-                continue;
-            }
-
-            if (synth->envelope_state[chan].level == 0) {
-                // note is truly finished, but we only just noticed
-                synth->span.note_obj[chan] = SYNTHIO_SILENCE;
-                continue;
-            }
-
-            // adjust loudness by envelope
-            uint16_t loudness = (ovl_loudness * synth->envelope_state[chan].level) >> 16;
-
-            uint32_t dds_rate;
-            const int16_t *waveform = synth->waveform;
-            uint32_t waveform_length = synth->waveform_length;
-            if (mp_obj_is_small_int(note_obj)) {
-                uint8_t note = mp_obj_get_int(note_obj);
-                uint8_t octave = note / 12;
-                uint16_t base_freq = notes[note % 12];
-                // rate = base_freq * waveform_length
-                // den = sample_rate * 2 ^ (10 - octave)
-                // den = sample_rate * 2 ^ 10 / 2^octave
-                // dds_rate = 2^SHIFT * rate / den
-                // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
-                dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
-            } else {
-                synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
-                int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, &loudness);
-                if (note->waveform_buf.buf) {
-                    waveform = note->waveform_buf.buf;
-                    waveform_length = note->waveform_buf.len / 2;
-                }
-                dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
-            }
-
-            uint32_t accum = synth->accum[chan];
-            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-            if (dds_rate > lim / 2) {
-                // beyond nyquist, can't play note
-                continue;
-            }
-
-            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
-            if (accum > lim) {
-                accum %= lim;
-            }
-
-            for (uint16_t i = 0; i < dur; i++) {
-                accum += dds_rate;
-                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
-                if (accum > lim) {
-                    accum -= lim;
-                }
-                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-                out_buffer[i] += (waveform[idx] * loudness) / 65536;
-            }
-            synth->accum[chan] = accum;
+    memset(out_buffer32, 0, sizeof(out_buffer32));
+    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        mp_obj_t note_obj = synth->span.note_obj[chan];
+        if (note_obj == SYNTHIO_SILENCE) {
+            synth->accum[chan] = 0;
+            continue;
         }
+
+        if (synth->envelope_state[chan].level == 0) {
+            // note is truly finished, but we only just noticed
+            synth->span.note_obj[chan] = SYNTHIO_SILENCE;
+            continue;
+        }
+
+        // adjust loudness by envelope
+        uint16_t loudness = synth->envelope_state[chan].level;
+
+        uint32_t dds_rate;
+        const int16_t *waveform = synth->waveform;
+        uint32_t waveform_length = synth->waveform_length;
+        if (mp_obj_is_small_int(note_obj)) {
+            uint8_t note = mp_obj_get_int(note_obj);
+            uint8_t octave = note / 12;
+            uint16_t base_freq = notes[note % 12];
+            // rate = base_freq * waveform_length
+            // den = sample_rate * 2 ^ (10 - octave)
+            // den = sample_rate * 2 ^ 10 / 2^octave
+            // dds_rate = 2^SHIFT * rate / den
+            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
+            dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
+        } else {
+            synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+            int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, &loudness);
+            if (note->waveform_buf.buf) {
+                waveform = note->waveform_buf.buf;
+                waveform_length = note->waveform_buf.len / 2;
+            }
+            dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
+        }
+
+        uint32_t accum = synth->accum[chan];
+        uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+        if (dds_rate > lim / 2) {
+            // beyond nyquist, can't play note
+            continue;
+        }
+
+        // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+        if (accum > lim) {
+            accum %= lim;
+        }
+
+        for (uint16_t i = 0; i < dur; i++) {
+            accum += dds_rate;
+            // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+            if (accum > lim) {
+                accum -= lim;
+            }
+            int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+            out_buffer32[i] += (waveform[idx] * loudness) / 65536;
+        }
+        synth->accum[chan] = accum;
+    }
+
+    int16_t *out_buffer16 = (int16_t *)(void *)synth->buffers[synth->buffer_index];
+
+    // mix down audio
+    for (size_t i = 0; i < dur; i++) {
+        int32_t sample = out_buffer32[i];
+        out_buffer16[i] = mix_down_sample(sample);
     }
 
     // advance envelope states
@@ -267,7 +271,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     }
 
     *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
-    *bufptr = (uint8_t *)out_buffer;
+    *bufptr = (uint8_t *)out_buffer16;
 }
 
 void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_output, uint8_t channel) {
diff --git a/tests/circuitpython-manual/synthio/note/code.py b/tests/circuitpython-manual/synthio/note/code.py
index 72783d1b55..3814c57279 100644
--- a/tests/circuitpython-manual/synthio/note/code.py
+++ b/tests/circuitpython-manual/synthio/note/code.py
@@ -84,6 +84,25 @@ def synthesize4(synth):
     yield 36
 
 
+def synthesize5(synth):
+    notes = [
+        synthio.Note(
+            frequency=synthio.midi_to_hz(60 + i + o),
+            waveform=sine,
+            envelope=envelope,
+        )
+        for i in [0, 4, 7]
+        for o in [0, -12, 12]
+    ]
+
+    for n in notes:
+        print(n)
+        synth.press((n,))
+        yield 120
+    synth.release_all()
+    yield 36
+
+
 def chain(*args):
     for a in args:
         yield from a
@@ -94,7 +113,7 @@ with wave.open("tune-noenv.wav", "w") as f:
     f.setnchannels(1)
     f.setsampwidth(2)
     f.setframerate(48000)
-    for n in chain(synthesize2(synth), synthesize3(synth), synthesize4(synth)):
+    for n in chain(synthesize5(synth)):
         for i in range(n):
             result, data = audiocore.get_buffer(synth)
             f.writeframes(data)
diff --git a/tests/circuitpython/miditrack.py.exp b/tests/circuitpython/miditrack.py.exp
index 6de9f947c6..22a78e5445 100644
--- a/tests/circuitpython/miditrack.py.exp
+++ b/tests/circuitpython/miditrack.py.exp
@@ -1,4 +1,4 @@
 (0, 1, 512, 1)
-1 [-16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16382, 16382]
+1 [-16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383]
 (0, 1, 512, 1)
-1 [0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16382, 16382, 16382, 16382, 16382, 16382, 0, 0]
+1 [0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0, 0, 0, 0, 0, -16383, -16383, -16383, -16383, -16383, -16383, 0, 0, 0, 0, 0, 0, 16383, 16383, 16383, 16383, 16383, 16383, 0, 0]
diff --git a/tests/circuitpython/synthesizer.py.exp b/tests/circuitpython/synthesizer.py.exp
index 826290fe27..98f45f8bf8 100644
--- a/tests/circuitpython/synthesizer.py.exp
+++ b/tests/circuitpython/synthesizer.py.exp
@@ -1,30 +1,30 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 (80,)
-[-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
+[-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
 (80, 91)
-[0, 0, 16382, 16382, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0]
+[0, 0, 28045, 28045, 0, -28046, -28046, 0, 28045, 28045, 0, 0, 28045, 0, 0, -28046, -28046, 0, 28045, 28045, 0, 0, 28045, 0]
 (91,)
-[-16382, 0, 0, 16382, 0, 0, 16382, 16382, 0, -16382, -16382, 0, 16382, 16382, 0, 0, 16382, 0, 0, -16382, -16382, -16382, 16382, 16382]
-(-5242, 5241)
-(-10484, 10484)
-(-15727, 15726)
-(-16383, 16382)
-(-14286, 14285)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-11009, 11008)
-(-8912, 8911)
-(-6815, 6814)
-(-4718, 4717)
-(-2621, 2620)
-(-524, 523)
+[-28046, 0, 0, 28045, 0, 0, 28045, 28045, 0, -28046, -28046, 0, 28045, 28045, 0, 0, 28045, 0, 0, -28046, -28046, -28046, 28045, 28045]
+(-5242, 5242)
+(-10485, 10484)
+(-15727, 15727)
+(-16383, 16383)
+(-14286, 14286)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-11009, 11009)
+(-8912, 8912)
+(-6815, 6815)
+(-4718, 4718)
+(-2621, 2621)
+(-524, 524)
 (0, 0)
 (0, 0)
 (0, 0)
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index e51cea1755..787243e2a5 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,30 +1,30 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 (Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
-[-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
+[-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
 (Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None), Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None))
-[0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382]
+[0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046]
 (Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
-[0, 0, 0, 16382, 0, 0, 0, 0, 0, 0, 0, 0, 16382, 0, 0, 0, 0, -16382, 0, 0, 0, 0, 16382, 0]
-(-5242, 5241)
-(-10484, 10484)
-(-15727, 15726)
-(-16383, 16382)
-(-14286, 14285)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-13106, 13105)
-(-11009, 11008)
-(-8912, 8911)
-(-6815, 6814)
-(-4718, 4717)
-(-2621, 2620)
-(-524, 523)
+[0, 0, 0, 28045, 0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0]
+(-5242, 5242)
+(-10485, 10484)
+(-15727, 15727)
+(-16383, 16383)
+(-14286, 14286)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-13106, 13106)
+(-11009, 11009)
+(-8912, 8912)
+(-6815, 6815)
+(-4718, 4718)
+(-2621, 2621)
+(-524, 524)
 (0, 0)
 (0, 0)
 (0, 0)

From 2f2a9e7e28cca84d1abe42d67ff633dbfac0938e Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Mon, 8 May 2023 13:25:52 -0500
Subject: [PATCH 2359/2403] Allow Access Point static IPv4 on the espressif
 port.

---
 ports/espressif/common-hal/wifi/Radio.c |  23 +++++-
 shared-bindings/wifi/Radio.c            | 103 +++++++++++++++++-------
 shared-bindings/wifi/Radio.h            |   3 +
 3 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
index 851e1bea25..d0592b718f 100644
--- a/ports/espressif/common-hal/wifi/Radio.c
+++ b/ports/espressif/common-hal/wifi/Radio.c
@@ -475,8 +475,16 @@ void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {
     esp_netif_dhcpc_stop(self->netif);
 }
 
+void common_hal_wifi_radio_start_dhcp_server(wifi_radio_obj_t *self) {
+    esp_netif_dhcps_start(self->ap_netif);
+}
+
+void common_hal_wifi_radio_stop_dhcp_server(wifi_radio_obj_t *self) {
+    esp_netif_dhcps_stop(self->ap_netif);
+}
+
 void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) {
-    common_hal_wifi_radio_stop_dhcp_client(self); // Must stop DHCP to set a manual address
+    common_hal_wifi_radio_stop_dhcp_client(self); // Must stop station DHCP to set a manual address
 
     esp_netif_ip_info_t ip_info;
     ipaddress_ipaddress_to_esp_idf_ip4(ipv4, &ip_info.ip);
@@ -490,6 +498,19 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv
     }
 }
 
+void common_hal_wifi_radio_set_ipv4_address_ap(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway) {
+    common_hal_wifi_radio_stop_dhcp_server(self); // Must stop access point DHCP to set a manual address
+
+    esp_netif_ip_info_t ip_info;
+    ipaddress_ipaddress_to_esp_idf_ip4(ipv4, &ip_info.ip);
+    ipaddress_ipaddress_to_esp_idf_ip4(netmask, &ip_info.netmask);
+    ipaddress_ipaddress_to_esp_idf_ip4(gateway, &ip_info.gw);
+
+    esp_netif_set_ip_info(self->ap_netif, &ip_info);
+
+    common_hal_wifi_radio_start_dhcp_server(self); // restart access point DHCP
+}
+
 mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
     esp_ping_config_t ping_config = ESP_PING_DEFAULT_CONFIG();
     ipaddress_ipaddress_to_esp_idf(ip_address, &ping_config.target_addr);
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 7c6175590b..7af8d6264f 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -545,34 +545,60 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4
 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj);
 
-//|     def set_ipv4_address(
-//|         self,
-//|         *,
-//|         ipv4: ipaddress.IPv4Address,
-//|         netmask: ipaddress.IPv4Address,
-//|         gateway: ipaddress.IPv4Address,
-//|         ipv4_dns: Optional[ipaddress.IPv4Address]
-//|     ) -> None:
-//|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
-//|         Setting the address manually will stop the DHCP client."""
-//|         ...
-STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-        { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-        { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-        { MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL} },
-    };
+    //|     def set_ipv4_address(
+    //|         self,
+    //|         *,
+    //|         ipv4: ipaddress.IPv4Address,
+    //|         netmask: ipaddress.IPv4Address,
+    //|         gateway: ipaddress.IPv4Address,
+    //|         ipv4_dns: Optional[ipaddress.IPv4Address]
+    //|     ) -> None:
+    //|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
+    //|         Setting the address manually will stop the DHCP client."""
+    //|         ...
+    STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+        enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
+        static const mp_arg_t allowed_args[] = {
+            { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+            { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+            { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+            { MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL} },
+        };
 
-    wifi_radio_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);
+        wifi_radio_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);
 
-    common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address);
+        common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj);
+        return mp_const_none;
+    }
+    STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address);
+
+    //|     def set_ipv4_address_ap(
+    //|         self,
+    //|         *,
+    //|         ipv4: ipaddress.IPv4Address,
+    //|         netmask: ipaddress.IPv4Address,
+    //|         gateway: ipaddress.IPv4Address,
+    //|     ) -> None:
+    //|         """Sets the IP v4 address of the access point. Must include the netmask and gateway."""
+    //|         ...
+    STATIC mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+        enum { ARG_ipv4, ARG_netmask, ARG_gateway };
+        static const mp_arg_t allowed_args[] = {
+            { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+            { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+            { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        };
+
+        wifi_radio_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);
+
+        common_hal_wifi_radio_set_ipv4_address_ap(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj);
+        return mp_const_none;
+    }
+    STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_ap_obj, 1, wifi_radio_set_ipv4_address_ap);
 
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station when connected to an access point. None otherwise. (read-only)"""
@@ -620,7 +646,7 @@ STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info);
 
 //|     def start_dhcp(self) -> None:
-//|         """Starts the DHCP client."""
+//|         """Starts the station DHCP client."""
 //|         ...
 STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) {
     common_hal_wifi_radio_start_dhcp_client(self);
@@ -629,7 +655,7 @@ STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) {
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhcp_client);
 
 //|     def stop_dhcp(self) -> None:
-//|         """Stops the DHCP client. Needed to assign a static IP address."""
+//|         """Stops the station DHCP client. Needed to assign a static IP address."""
 //|         ...
 STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) {
     common_hal_wifi_radio_stop_dhcp_client(self);
@@ -637,6 +663,24 @@ STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_client_obj, wifi_radio_stop_dhcp_client);
 
+//|     def start_dhcp_ap(self) -> None:
+//|         """Starts the access point DHCP client."""
+//|         ...
+STATIC mp_obj_t wifi_radio_start_dhcp_server(mp_obj_t self) {
+    common_hal_wifi_radio_start_dhcp_server(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_server_obj, wifi_radio_start_dhcp_server);
+
+//|     def stop_dhcp_ap(self) -> None:
+//|         """Stops the access point DHCP client. Needed to assign a static IP address."""
+//|         ...
+STATIC mp_obj_t wifi_radio_stop_dhcp_server(mp_obj_t self) {
+    common_hal_wifi_radio_stop_dhcp_server(self);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_server_obj, wifi_radio_stop_dhcp_server);
+
 MP_PROPERTY_GETTER(wifi_radio_ap_info_obj,
     (mp_obj_t)&wifi_radio_get_ap_info_obj);
 
@@ -693,6 +737,8 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_start_dhcp),    MP_ROM_PTR(&wifi_radio_start_dhcp_client_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop_dhcp),    MP_ROM_PTR(&wifi_radio_stop_dhcp_client_obj) },
+    { MP_ROM_QSTR(MP_QSTR_start_dhcp_ap),    MP_ROM_PTR(&wifi_radio_start_dhcp_server_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stop_dhcp_ap),    MP_ROM_PTR(&wifi_radio_stop_dhcp_server_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
@@ -708,6 +754,7 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ipv4_address_ap),    MP_ROM_PTR(&wifi_radio_ipv4_address_ap_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_set_ipv4_address),    MP_ROM_PTR(&wifi_radio_set_ipv4_address_obj) },
+    { MP_ROM_QSTR(MP_QSTR_set_ipv4_address_ap),    MP_ROM_PTR(&wifi_radio_set_ipv4_address_ap_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ping), MP_ROM_PTR(&wifi_radio_ping_obj) },
 };
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 1fb70ef818..5a8b48a172 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -99,6 +99,8 @@ extern bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self);
+extern void common_hal_wifi_radio_start_dhcp_server(wifi_radio_obj_t *self);
+extern void common_hal_wifi_radio_stop_dhcp_server(wifi_radio_obj_t *self);
 
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len);
 extern bool common_hal_wifi_radio_get_connected(wifi_radio_obj_t *self);
@@ -115,6 +117,7 @@ extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_address_ap(wifi_radio_obj_t *self);
 
 extern void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns_addr);
+extern void common_hal_wifi_radio_set_ipv4_address_ap(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway);
 
 extern mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout);
 

From 7581d3d0b0e1cbcffae51d38d3041346d78ba97c Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Mon, 8 May 2023 13:30:32 -0500
Subject: [PATCH 2360/2403] Fix docstring

---
 shared-bindings/wifi/Radio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 7af8d6264f..2bd227a1bb 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -664,7 +664,7 @@ STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) {
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_client_obj, wifi_radio_stop_dhcp_client);
 
 //|     def start_dhcp_ap(self) -> None:
-//|         """Starts the access point DHCP client."""
+//|         """Starts the access point DHCP server."""
 //|         ...
 STATIC mp_obj_t wifi_radio_start_dhcp_server(mp_obj_t self) {
     common_hal_wifi_radio_start_dhcp_server(self);
@@ -673,7 +673,7 @@ STATIC mp_obj_t wifi_radio_start_dhcp_server(mp_obj_t self) {
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_server_obj, wifi_radio_start_dhcp_server);
 
 //|     def stop_dhcp_ap(self) -> None:
-//|         """Stops the access point DHCP client. Needed to assign a static IP address."""
+//|         """Stops the access point DHCP server. Needed to assign a static IP address."""
 //|         ...
 STATIC mp_obj_t wifi_radio_stop_dhcp_server(mp_obj_t self) {
     common_hal_wifi_radio_stop_dhcp_server(self);

From d78e5bd64c7a67669cc22913afdf5fe5a1a5c1ad Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Mon, 8 May 2023 14:18:06 -0500
Subject: [PATCH 2361/2403] fix accidental indent

---
 shared-bindings/wifi/Radio.c | 98 ++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 2bd227a1bb..29ea084b14 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -545,60 +545,60 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4
 MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj,
     (mp_obj_t)&wifi_radio_get_ipv4_subnet_ap_obj);
 
-    //|     def set_ipv4_address(
-    //|         self,
-    //|         *,
-    //|         ipv4: ipaddress.IPv4Address,
-    //|         netmask: ipaddress.IPv4Address,
-    //|         gateway: ipaddress.IPv4Address,
-    //|         ipv4_dns: Optional[ipaddress.IPv4Address]
-    //|     ) -> None:
-    //|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
-    //|         Setting the address manually will stop the DHCP client."""
-    //|         ...
-    STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-        enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
-        static const mp_arg_t allowed_args[] = {
-            { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-            { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-            { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-            { MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL} },
-        };
+//|     def set_ipv4_address(
+//|         self,
+//|         *,
+//|         ipv4: ipaddress.IPv4Address,
+//|         netmask: ipaddress.IPv4Address,
+//|         gateway: ipaddress.IPv4Address,
+//|         ipv4_dns: Optional[ipaddress.IPv4Address]
+//|     ) -> None:
+//|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
+//|         Setting the address manually will stop the DHCP client."""
+//|         ...
+STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        { MP_QSTR_ipv4_dns, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL} },
+    };
 
-        wifi_radio_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);
+    wifi_radio_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);
 
-        common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj);
-        return mp_const_none;
-    }
-    STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address);
+    common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address);
 
-    //|     def set_ipv4_address_ap(
-    //|         self,
-    //|         *,
-    //|         ipv4: ipaddress.IPv4Address,
-    //|         netmask: ipaddress.IPv4Address,
-    //|         gateway: ipaddress.IPv4Address,
-    //|     ) -> None:
-    //|         """Sets the IP v4 address of the access point. Must include the netmask and gateway."""
-    //|         ...
-    STATIC mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-        enum { ARG_ipv4, ARG_netmask, ARG_gateway };
-        static const mp_arg_t allowed_args[] = {
-            { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-            { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-            { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
-        };
+//|     def set_ipv4_address_ap(
+//|         self,
+//|         *,
+//|         ipv4: ipaddress.IPv4Address,
+//|         netmask: ipaddress.IPv4Address,
+//|         gateway: ipaddress.IPv4Address,
+//|     ) -> None:
+//|         """Sets the IP v4 address of the access point. Must include the netmask and gateway."""
+//|         ...
+STATIC mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_ipv4, ARG_netmask, ARG_gateway };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        { MP_QSTR_netmask, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+        { MP_QSTR_gateway, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, },
+    };
 
-        wifi_radio_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);
+    wifi_radio_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);
 
-        common_hal_wifi_radio_set_ipv4_address_ap(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj);
-        return mp_const_none;
-    }
-    STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_ap_obj, 1, wifi_radio_set_ipv4_address_ap);
+    common_hal_wifi_radio_set_ipv4_address_ap(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_ap_obj, 1, wifi_radio_set_ipv4_address_ap);
 
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station when connected to an access point. None otherwise. (read-only)"""

From 82c173e8cf9269522606b4ce8c0b88dee71ba378 Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Mon, 8 May 2023 14:26:01 -0500
Subject: [PATCH 2362/2403] assuming the answer to that is 'yes'

---
 shared-bindings/wifi/Radio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 29ea084b14..0c632a68b2 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -317,7 +317,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
 //|         *,
 //|         channel: int = 1,
 //|         authmode: Optional[AuthMode] = None,
-//|         max_connections: Optional[int] = 4
+//|         max_connections: Optional[int] = 4,
 //|     ) -> None:
 //|         """Starts running an access point with the specified ssid and password.
 //|
@@ -416,7 +416,7 @@ MP_PROPERTY_GETTER(wifi_radio_ap_active_obj,
 //|         *,
 //|         channel: int = 0,
 //|         bssid: Optional[Union[str | ReadableBuffer]] = None,
-//|         timeout: Optional[float] = None
+//|         timeout: Optional[float] = None,
 //|     ) -> None:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
 //|         automatically once one connection succeeds.
@@ -551,7 +551,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj,
 //|         ipv4: ipaddress.IPv4Address,
 //|         netmask: ipaddress.IPv4Address,
 //|         gateway: ipaddress.IPv4Address,
-//|         ipv4_dns: Optional[ipaddress.IPv4Address]
+//|         ipv4_dns: Optional[ipaddress.IPv4Address],
 //|     ) -> None:
 //|         """Sets the IP v4 address of the station. Must include the netmask and gateway. DNS address is optional.
 //|         Setting the address manually will stop the DHCP client."""

From 56d9798b1d52edf2b3c999e36b1eb1793b9955b9 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 8 May 2023 15:39:19 -0500
Subject: [PATCH 2363/2403] validate point type is tuple in vectorio Polygon

---
 shared-module/vectorio/Polygon.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
index 5d1e0d3e58..d35d489c61 100644
--- a/shared-module/vectorio/Polygon.c
+++ b/shared-module/vectorio/Polygon.c
@@ -36,6 +36,7 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
     for (uint16_t i = 0; i < len; ++i) {
         size_t tuple_len = 0;
         mp_obj_t *tuple_items;
+        mp_arg_validate_type(items[i], &mp_type_tuple, MP_QSTR_point);
         mp_obj_tuple_get(items[i], &tuple_len, &tuple_items);
 
         mp_arg_validate_length(tuple_len, 2, MP_QSTR_point);

From 7c685477babd6f87c5751b49bca3fc9303daef0c Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Mon, 8 May 2023 16:41:57 -0500
Subject: [PATCH 2364/2403] adding __contains__ stub to displayio.Group

---
 shared-bindings/displayio/Group.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 24064a74c1..48bbd50801 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -249,6 +249,10 @@ STATIC mp_obj_t displayio_group_obj_remove(mp_obj_t self_in, mp_obj_t layer) {
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_remove_obj, displayio_group_obj_remove);
 
 //|     def __bool__(self) -> bool: ...
+//|     def __contains__(
+//|         self,
+//|         item: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
+//|     ) -> bool: ...
 //|     def __len__(self) -> int:
 //|         """Returns the number of layers in a Group"""
 //|         ...

From 29bf64decb8e895b823f3dcc14a83d3e03c92c87 Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Mon, 8 May 2023 22:41:33 -0500
Subject: [PATCH 2365/2403] raspberrypi common-hal f(x)s Not Implemented

---
 ports/raspberrypi/common-hal/wifi/Radio.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 0ef4f8bb76..12674a499b 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -358,6 +358,14 @@ void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {
     dhcp_stop(NETIF_STA);
 }
 
+void common_hal_wifi_radio_start_dhcp_server(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+void common_hal_wifi_radio_stop_dhcp_server(wifi_radio_obj_t *self) {
+    mp_raise_NotImplementedError(NULL);
+}
+
 void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) {
     common_hal_wifi_radio_stop_dhcp_client(self);
 
@@ -371,6 +379,10 @@ void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv
     }
 }
 
+void common_hal_wifi_radio_set_ipv4_address_ap(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway) {
+    mp_raise_NotImplementedError(NULL);
+}
+
 volatile bool ping_received;
 uint32_t ping_time;
 

From bb2af51d25f671175f9fb7b2fb39bbc6e0a0ff29 Mon Sep 17 00:00:00 2001
From: Neradoc 
Date: Tue, 9 May 2023 05:39:39 +0200
Subject: [PATCH 2366/2403] document CIRCUITPY_PYSTACK_SIZE

---
 docs/environment.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/environment.rst b/docs/environment.rst
index f8144407ef..bb6f8d2821 100644
--- a/docs/environment.rst
+++ b/docs/environment.rst
@@ -60,6 +60,12 @@ CIRCUITPY_BLE_NAME
 ~~~~~~~~~~~~~~~~~~
 Default BLE name the board advertises as, including for the BLE workflow.
 
+CIRCUITPY_PYSTACK_SIZE
+~~~~~~~~~~~~~~~~~~~~~~
+Sets the size of the python stack. Must be a multiple of 4. The default value is currently 1536.
+Increasing the stack reduces the size of the heap available to python code.
+Used to avoid "Pystack exhausted" errors when the code can't be reworked to avoid it.
+
 CIRCUITPY_RESERVED_PSRAM
 ~~~~~~~~~~~~~~~~~~~~~~~~
 On boards with Espressif microcontrollers with PSRAM (also called SPIRAM), permanently reserve a portion of PSRAM for use by esp-idf.

From 6f8670a2841e6074cbba8bc0142db3683f3482ef Mon Sep 17 00:00:00 2001
From: Tekktrik 
Date: Tue, 9 May 2023 22:01:24 -0400
Subject: [PATCH 2367/2403] Updated how stubs are built

---
 .github/workflows/build.yml | 2 +-
 Makefile                    | 2 +-
 requirements-doc.txt        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b504d34c7..730f03a15d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -209,7 +209,7 @@ jobs:
         TWINE_USERNAME: ${{ secrets.pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pypi_password }}
       run: |
-        # setup.py sdist was run by 'make stubs'
+        # python -m build was run by 'make stubs'
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
diff --git a/Makefile b/Makefile
index d611dff49d..05d3618658 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,7 @@ stubs:
 	@cp setup.py-stubs circuitpython-stubs/setup.py
 	@cp README.rst-stubs circuitpython-stubs/README.rst
 	@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
-	@(cd circuitpython-stubs && $(PYTHON) setup.py -q sdist)
+	@$(PYTHON) -m build circuitpython-stubs
 
 .PHONY: check-stubs
 check-stubs: stubs
diff --git a/requirements-doc.txt b/requirements-doc.txt
index 0489dc0b9f..15df3b1378 100644
--- a/requirements-doc.txt
+++ b/requirements-doc.txt
@@ -3,6 +3,7 @@ mypy
 black
 isort
 twine
+build
 wheel
 astroid
 setuptools>=45

From 57cd45124535692414ac54a8a7330dc2f07ccb18 Mon Sep 17 00:00:00 2001
From: Tekktrik 
Date: Tue, 9 May 2023 22:31:24 -0400
Subject: [PATCH 2368/2403] Add build to pio install command

---
 tools/test-stubs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-stubs.sh b/tools/test-stubs.sh
index 6c6c991015..f4169f5de9 100755
--- a/tools/test-stubs.sh
+++ b/tools/test-stubs.sh
@@ -2,7 +2,7 @@
 rm -rf test-stubs
 python3 -m venv test-stubs
 . test-stubs/bin/activate
-pip install mypy isort black adafruit-circuitpython-typing wheel
+pip install mypy isort black adafruit-circuitpython-typing wheel build
 rm -rf circuitpython-stubs .mypy_cache
 make stubs
 pip install --force-reinstall circuitpython-stubs/dist/circuitpython-stubs-*.tar.gz

From 55d8f0db4eb8eaf572cc36ee942c48577b5528da Mon Sep 17 00:00:00 2001
From: Alex Sirota <67526318+ajs256@users.noreply.github.com>
Date: Wed, 10 May 2023 11:19:47 -0700
Subject: [PATCH 2369/2403] Add board.DISPLAY to hack_club_sprig

---
 ports/raspberrypi/boards/hack_club_sprig/pins.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/raspberrypi/boards/hack_club_sprig/pins.c b/ports/raspberrypi/boards/hack_club_sprig/pins.c
index f82b8fafc5..f0a38cbc07 100644
--- a/ports/raspberrypi/boards/hack_club_sprig/pins.c
+++ b/ports/raspberrypi/boards/hack_club_sprig/pins.c
@@ -1,5 +1,8 @@
 #include "shared-bindings/board/__init__.h"
 
+#include "supervisor/board.h"
+#include "shared-module/displayio/__init__.h"
+
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -81,5 +84,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_WHITE_LED), MP_ROM_PTR(&pin_GPIO28) },
 
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
+
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From c9bb53b48afeb8009d83d98266ff9ff69cb2f3b7 Mon Sep 17 00:00:00 2001
From: foamyguy 
Date: Thu, 11 May 2023 07:52:03 -0500
Subject: [PATCH 2370/2403] adding __iter__ stub to displayio.Group

---
 shared-bindings/displayio/Group.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 48bbd50801..279e1f161b 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -253,6 +253,11 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_remove_obj, displayio_group_obj_remove
 //|         self,
 //|         item: Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid],
 //|     ) -> bool: ...
+//|     def __iter__(
+//|         self,
+//|     ) -> Iterator[
+//|         Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]
+//|     ]: ...
 //|     def __len__(self) -> int:
 //|         """Returns the number of layers in a Group"""
 //|         ...

From 91978522c533e65d5e9c7d0fcd85942b6c0b3e68 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 May 2023 07:11:26 -0500
Subject: [PATCH 2371/2403] synthio: Add adafruit_wave and use it in the manual
 test

---
 .gitmodules                                   |   3 +
 frozen/Adafruit_CircuitPython_Wave            |   1 +
 .../synthio/note/audioop.py                   |   1 -
 .../synthio/note/chunk.py                     |   1 -
 .../circuitpython-manual/synthio/note/code.py |   8 +-
 .../circuitpython-manual/synthio/note/wave.py |   1 -
 .../synthio/wave/audioop.py                   |  11 -
 .../synthio/wave/chunk.py                     | 173 ------
 .../synthio/wave/midi2wav.py                  |   8 +-
 .../circuitpython-manual/synthio/wave/wave.py | 550 ------------------
 10 files changed, 18 insertions(+), 739 deletions(-)
 create mode 160000 frozen/Adafruit_CircuitPython_Wave
 delete mode 120000 tests/circuitpython-manual/synthio/note/audioop.py
 delete mode 120000 tests/circuitpython-manual/synthio/note/chunk.py
 delete mode 120000 tests/circuitpython-manual/synthio/note/wave.py
 delete mode 100644 tests/circuitpython-manual/synthio/wave/audioop.py
 delete mode 100644 tests/circuitpython-manual/synthio/wave/chunk.py
 delete mode 100644 tests/circuitpython-manual/synthio/wave/wave.py

diff --git a/.gitmodules b/.gitmodules
index c690e714e8..91afffe6a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -338,3 +338,6 @@
 [submodule "frozen/circuitpython-pcf85063a"]
 	path = frozen/circuitpython-pcf85063a
 	url = https://github.com/bablokb/circuitpython-pcf85063a
+[submodule "frozen/Adafruit_CircuitPython_Wave"]
+	path = frozen/Adafruit_CircuitPython_Wave
+	url = http://github.com/adafruit/Adafruit_CircuitPython_Wave.git
diff --git a/frozen/Adafruit_CircuitPython_Wave b/frozen/Adafruit_CircuitPython_Wave
new file mode 160000
index 0000000000..02b748f2e6
--- /dev/null
+++ b/frozen/Adafruit_CircuitPython_Wave
@@ -0,0 +1 @@
+Subproject commit 02b748f2e6826dc442c842885e58b07ad10d9287
diff --git a/tests/circuitpython-manual/synthio/note/audioop.py b/tests/circuitpython-manual/synthio/note/audioop.py
deleted file mode 120000
index 31896fe265..0000000000
--- a/tests/circuitpython-manual/synthio/note/audioop.py
+++ /dev/null
@@ -1 +0,0 @@
-../wave/audioop.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/note/chunk.py b/tests/circuitpython-manual/synthio/note/chunk.py
deleted file mode 120000
index 00983c1f72..0000000000
--- a/tests/circuitpython-manual/synthio/note/chunk.py
+++ /dev/null
@@ -1 +0,0 @@
-../wave/chunk.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/note/code.py b/tests/circuitpython-manual/synthio/note/code.py
index 3814c57279..d088ede50e 100644
--- a/tests/circuitpython-manual/synthio/note/code.py
+++ b/tests/circuitpython-manual/synthio/note/code.py
@@ -1,8 +1,14 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
 import random
 import audiocore
 import synthio
 from ulab import numpy as np
-import wave
+import adafruit_wave as wave
 
 SAMPLE_SIZE = 1024
 VOLUME = 14700
diff --git a/tests/circuitpython-manual/synthio/note/wave.py b/tests/circuitpython-manual/synthio/note/wave.py
deleted file mode 120000
index 45884bd29a..0000000000
--- a/tests/circuitpython-manual/synthio/note/wave.py
+++ /dev/null
@@ -1 +0,0 @@
-../wave/wave.py
\ No newline at end of file
diff --git a/tests/circuitpython-manual/synthio/wave/audioop.py b/tests/circuitpython-manual/synthio/wave/audioop.py
deleted file mode 100644
index cab2fb4a7a..0000000000
--- a/tests/circuitpython-manual/synthio/wave/audioop.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
-#
-# SPDX-License-Identifier: PSF-2.0
-
-import struct
-
-
-def byteswap(data, sampwidth):
-    print(data)
-    raise
-    ch = "I" if sampwidth == 16 else "H"
diff --git a/tests/circuitpython-manual/synthio/wave/chunk.py b/tests/circuitpython-manual/synthio/wave/chunk.py
deleted file mode 100644
index c1e6364b0f..0000000000
--- a/tests/circuitpython-manual/synthio/wave/chunk.py
+++ /dev/null
@@ -1,173 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
-#
-# SPDX-License-Identifier: PSF-2.0
-
-"""Simple class to read IFF chunks.
-
-An IFF chunk (used in formats such as AIFF, TIFF, RMFF (RealMedia File
-Format)) has the following structure:
-
-+----------------+
-| ID (4 bytes)   |
-+----------------+
-| size (4 bytes) |
-+----------------+
-| data           |
-| ...            |
-+----------------+
-
-The ID is a 4-byte string which identifies the type of chunk.
-
-The size field (a 32-bit value, encoded using big-endian byte order)
-gives the size of the whole chunk, including the 8-byte header.
-
-Usually an IFF-type file consists of one or more chunks.  The proposed
-usage of the Chunk class defined here is to instantiate an instance at
-the start of each chunk and read from the instance until it reaches
-the end, after which a new instance can be instantiated.  At the end
-of the file, creating a new instance will fail with an EOFError
-exception.
-
-Usage:
-while True:
-    try:
-        chunk = Chunk(file)
-    except EOFError:
-        break
-    chunktype = chunk.getname()
-    while True:
-        data = chunk.read(nbytes)
-        if not data:
-            pass
-        # do something with data
-
-The interface is file-like.  The implemented methods are:
-read, close, seek, tell, isatty.
-Extra methods are: skip() (called by close, skips to the end of the chunk),
-getname() (returns the name (ID) of the chunk)
-
-The __init__ method has one required argument, a file-like object
-(including a chunk instance), and one optional argument, a flag which
-specifies whether or not chunks are aligned on 2-byte boundaries.  The
-default is 1, i.e. aligned.
-"""
-
-
-class Chunk:
-    def __init__(self, file, align=True, bigendian=True, inclheader=False):
-        import struct
-
-        self.closed = False
-        self.align = align  # whether to align to word (2-byte) boundaries
-        if bigendian:
-            strflag = ">"
-        else:
-            strflag = "<"
-        self.file = file
-        self.chunkname = file.read(4)
-        if len(self.chunkname) < 4:
-            raise EOFError
-        try:
-            self.chunksize = struct.unpack_from(strflag + "L", file.read(4))[0]
-        except struct.error:
-            raise EOFError from None
-        if inclheader:
-            self.chunksize = self.chunksize - 8  # subtract header
-        self.size_read = 0
-        try:
-            self.offset = self.file.tell()
-        except (AttributeError, OSError):
-            self.seekable = False
-        else:
-            self.seekable = True
-
-    def getname(self):
-        """Return the name (ID) of the current chunk."""
-        return self.chunkname
-
-    def getsize(self):
-        """Return the size of the current chunk."""
-        return self.chunksize
-
-    def close(self):
-        if not self.closed:
-            try:
-                self.skip()
-            finally:
-                self.closed = True
-
-    def isatty(self):
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        return False
-
-    def seek(self, pos, whence=0):
-        """Seek to specified position into the chunk.
-        Default position is 0 (start of chunk).
-        If the file is not seekable, this will result in an error.
-        """
-
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        if not self.seekable:
-            raise OSError("cannot seek")
-        if whence == 1:
-            pos = pos + self.size_read
-        elif whence == 2:
-            pos = pos + self.chunksize
-        if pos < 0 or pos > self.chunksize:
-            raise RuntimeError
-        self.file.seek(self.offset + pos, 0)
-        self.size_read = pos
-
-    def tell(self):
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        return self.size_read
-
-    def read(self, size=-1):
-        """Read at most size bytes from the chunk.
-        If size is omitted or negative, read until the end
-        of the chunk.
-        """
-
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        if self.size_read >= self.chunksize:
-            return b""
-        if size < 0:
-            size = self.chunksize - self.size_read
-        if size > self.chunksize - self.size_read:
-            size = self.chunksize - self.size_read
-        data = self.file.read(size)
-        self.size_read = self.size_read + len(data)
-        if self.size_read == self.chunksize and self.align and (self.chunksize & 1):
-            dummy = self.file.read(1)
-            self.size_read = self.size_read + len(dummy)
-        return data
-
-    def skip(self):
-        """Skip the rest of the chunk.
-        If you are not interested in the contents of the chunk,
-        this method should be called so that the file points to
-        the start of the next chunk.
-        """
-
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        if self.seekable:
-            try:
-                n = self.chunksize - self.size_read
-                # maybe fix alignment
-                if self.align and (self.chunksize & 1):
-                    n = n + 1
-                self.file.seek(n, 1)
-                self.size_read = self.size_read + n
-                return
-            except OSError:
-                pass
-        while self.size_read < self.chunksize:
-            n = min(8192, self.chunksize - self.size_read)
-            dummy = self.read(n)
-            if not dummy:
-                raise EOFError
diff --git a/tests/circuitpython-manual/synthio/wave/midi2wav.py b/tests/circuitpython-manual/synthio/wave/midi2wav.py
index daa46a28c0..5d626e7baa 100644
--- a/tests/circuitpython-manual/synthio/wave/midi2wav.py
+++ b/tests/circuitpython-manual/synthio/wave/midi2wav.py
@@ -1,7 +1,13 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
 import audiocore
 import synthio
 from ulab import numpy as np
-import wave
+import adafruit_wave as wave
 
 SAMPLE_SIZE = 1024
 VOLUME = 32700
diff --git a/tests/circuitpython-manual/synthio/wave/wave.py b/tests/circuitpython-manual/synthio/wave/wave.py
deleted file mode 100644
index dc6d5407a7..0000000000
--- a/tests/circuitpython-manual/synthio/wave/wave.py
+++ /dev/null
@@ -1,550 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Guido van Rossum  and others.
-#
-# SPDX-License-Identifier: PSF-2.0
-
-"""Stuff to parse WAVE files.
-
-Usage.
-
-Reading WAVE files:
-      f = wave.open(file, 'r')
-where file is either the name of a file or an open file pointer.
-The open file pointer must have methods read(), seek(), and close().
-When the setpos() and rewind() methods are not used, the seek()
-method is not  necessary.
-
-This returns an instance of a class with the following public methods:
-      getnchannels()  -- returns number of audio channels (1 for
-                         mono, 2 for stereo)
-      getsampwidth()  -- returns sample width in bytes
-      getframerate()  -- returns sampling frequency
-      getnframes()    -- returns number of audio frames
-      getcomptype()   -- returns compression type ('NONE' for linear samples)
-      getcompname()   -- returns human-readable version of
-                         compression type ('not compressed' linear samples)
-      getparams()     -- returns a namedtuple consisting of all of the
-                         above in the above order
-      getmarkers()    -- returns None (for compatibility with the
-                         aifc module)
-      getmark(id)     -- raises an error since the mark does not
-                         exist (for compatibility with the aifc module)
-      readframes(n)   -- returns at most n frames of audio
-      rewind()        -- rewind to the beginning of the audio stream
-      setpos(pos)     -- seek to the specified position
-      tell()          -- return the current position
-      close()         -- close the instance (make it unusable)
-The position returned by tell() and the position given to setpos()
-are compatible and have nothing to do with the actual position in the
-file.
-The close() method is called automatically when the class instance
-is destroyed.
-
-Writing WAVE files:
-      f = wave.open(file, 'w')
-where file is either the name of a file or an open file pointer.
-The open file pointer must have methods write(), tell(), seek(), and
-close().
-
-This returns an instance of a class with the following public methods:
-      setnchannels(n) -- set the number of channels
-      setsampwidth(n) -- set the sample width
-      setframerate(n) -- set the frame rate
-      setnframes(n)   -- set the number of frames
-      setcomptype(type, name)
-                      -- set the compression type and the
-                         human-readable compression type
-      setparams(tuple)
-                      -- set all parameters at once
-      tell()          -- return current position in output file
-      writeframesraw(data)
-                      -- write audio frames without patching up the
-                         file header
-      writeframes(data)
-                      -- write audio frames and patch up the file header
-      close()         -- patch up the file header and close the
-                         output file
-You should set the parameters before the first writeframesraw or
-writeframes.  The total number of frames does not need to be set,
-but when it is set to the correct value, the header does not have to
-be patched up.
-It is best to first set all parameters, perhaps possibly the
-compression type, and then write audio frames using writeframesraw.
-When all frames have been written, either call writeframes(b'') or
-close() to patch up the sizes in the header.
-The close() method is called automatically when the class instance
-is destroyed.
-"""
-
-from chunk import Chunk
-from collections import namedtuple
-import audioop
-import builtins
-import struct
-import sys
-
-
-__all__ = ["open", "Error", "Wave_read", "Wave_write"]
-
-
-class Error(Exception):
-    pass
-
-
-WAVE_FORMAT_PCM = 0x0001
-
-_array_fmts = None, "b", "h", None, "i"
-
-_wave_params = namedtuple(
-    "_wave_params", "nchannels sampwidth framerate nframes comptype compname"
-)
-
-
-class Wave_read:
-    """Variables used in this class:
-
-    These variables are available to the user though appropriate
-    methods of this class:
-    _file -- the open file with methods read(), close(), and seek()
-              set through the __init__() method
-    _nchannels -- the number of audio channels
-              available through the getnchannels() method
-    _nframes -- the number of audio frames
-              available through the getnframes() method
-    _sampwidth -- the number of bytes per audio sample
-              available through the getsampwidth() method
-    _framerate -- the sampling frequency
-              available through the getframerate() method
-    _comptype -- the AIFF-C compression type ('NONE' if AIFF)
-              available through the getcomptype() method
-    _compname -- the human-readable AIFF-C compression type
-              available through the getcomptype() method
-    _soundpos -- the position in the audio stream
-              available through the tell() method, set through the
-              setpos() method
-
-    These variables are used internally only:
-    _fmt_chunk_read -- 1 iff the FMT chunk has been read
-    _data_seek_needed -- 1 iff positioned correctly in audio
-              file for readframes()
-    _data_chunk -- instantiation of a chunk class for the DATA chunk
-    _framesize -- size of one frame in the file
-    """
-
-    def initfp(self, file):
-        self._convert = None
-        self._soundpos = 0
-        self._file = Chunk(file, bigendian=0)
-        if self._file.getname() != b"RIFF":
-            raise Error("file does not start with RIFF id")
-        if self._file.read(4) != b"WAVE":
-            raise Error("not a WAVE file")
-        self._fmt_chunk_read = 0
-        self._data_chunk = None
-        while 1:
-            self._data_seek_needed = 1
-            try:
-                chunk = Chunk(self._file, bigendian=0)
-            except EOFError:
-                break
-            chunkname = chunk.getname()
-            if chunkname == b"fmt ":
-                self._read_fmt_chunk(chunk)
-                self._fmt_chunk_read = 1
-            elif chunkname == b"data":
-                if not self._fmt_chunk_read:
-                    raise Error("data chunk before fmt chunk")
-                self._data_chunk = chunk
-                self._nframes = chunk.chunksize // self._framesize
-                self._data_seek_needed = 0
-                break
-            chunk.skip()
-        if not self._fmt_chunk_read or not self._data_chunk:
-            raise Error("fmt chunk and/or data chunk missing")
-
-    def __init__(self, f):
-        self._i_opened_the_file = None
-        if isinstance(f, str):
-            f = builtins.open(f, "rb")
-            self._i_opened_the_file = f
-        # else, assume it is an open file object already
-        try:
-            self.initfp(f)
-        except:
-            if self._i_opened_the_file:
-                f.close()
-            raise
-
-    def __del__(self):
-        self.close()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        self.close()
-
-    #
-    # User visible methods.
-    #
-    def getfp(self):
-        return self._file
-
-    def rewind(self):
-        self._data_seek_needed = 1
-        self._soundpos = 0
-
-    def close(self):
-        self._file = None
-        file = self._i_opened_the_file
-        if file:
-            self._i_opened_the_file = None
-            file.close()
-
-    def tell(self):
-        return self._soundpos
-
-    def getnchannels(self):
-        return self._nchannels
-
-    def getnframes(self):
-        return self._nframes
-
-    def getsampwidth(self):
-        return self._sampwidth
-
-    def getframerate(self):
-        return self._framerate
-
-    def getcomptype(self):
-        return self._comptype
-
-    def getcompname(self):
-        return self._compname
-
-    def getparams(self):
-        return _wave_params(
-            self.getnchannels(),
-            self.getsampwidth(),
-            self.getframerate(),
-            self.getnframes(),
-            self.getcomptype(),
-            self.getcompname(),
-        )
-
-    def getmarkers(self):
-        return None
-
-    def getmark(self, id):
-        raise Error("no marks")
-
-    def setpos(self, pos):
-        if pos < 0 or pos > self._nframes:
-            raise Error("position not in range")
-        self._soundpos = pos
-        self._data_seek_needed = 1
-
-    def readframes(self, nframes):
-        if self._data_seek_needed:
-            self._data_chunk.seek(0, 0)
-            pos = self._soundpos * self._framesize
-            if pos:
-                self._data_chunk.seek(pos, 0)
-            self._data_seek_needed = 0
-        if nframes == 0:
-            return b""
-        data = self._data_chunk.read(nframes * self._framesize)
-        if self._sampwidth != 1 and sys.byteorder == "big":
-            data = audioop.byteswap(data, self._sampwidth)
-        if self._convert and data:
-            data = self._convert(data)
-        self._soundpos = self._soundpos + len(data) // (self._nchannels * self._sampwidth)
-        return data
-
-    #
-    # Internal methods.
-    #
-
-    def _read_fmt_chunk(self, chunk):
-        try:
-            (
-                wFormatTag,
-                self._nchannels,
-                self._framerate,
-                dwAvgBytesPerSec,
-                wBlockAlign,
-            ) = struct.unpack_from(" 4:
-            raise Error("bad sample width")
-        self._sampwidth = sampwidth
-
-    def getsampwidth(self):
-        if not self._sampwidth:
-            raise Error("sample width not set")
-        return self._sampwidth
-
-    def setframerate(self, framerate):
-        if self._datawritten:
-            raise Error("cannot change parameters after starting to write")
-        if framerate <= 0:
-            raise Error("bad frame rate")
-        self._framerate = int(round(framerate))
-
-    def getframerate(self):
-        if not self._framerate:
-            raise Error("frame rate not set")
-        return self._framerate
-
-    def setnframes(self, nframes):
-        if self._datawritten:
-            raise Error("cannot change parameters after starting to write")
-        self._nframes = nframes
-
-    def getnframes(self):
-        return self._nframeswritten
-
-    def setcomptype(self, comptype, compname):
-        if self._datawritten:
-            raise Error("cannot change parameters after starting to write")
-        if comptype not in ("NONE",):
-            raise Error("unsupported compression type")
-        self._comptype = comptype
-        self._compname = compname
-
-    def getcomptype(self):
-        return self._comptype
-
-    def getcompname(self):
-        return self._compname
-
-    def setparams(self, params):
-        nchannels, sampwidth, framerate, nframes, comptype, compname = params
-        if self._datawritten:
-            raise Error("cannot change parameters after starting to write")
-        self.setnchannels(nchannels)
-        self.setsampwidth(sampwidth)
-        self.setframerate(framerate)
-        self.setnframes(nframes)
-        self.setcomptype(comptype, compname)
-
-    def getparams(self):
-        if not self._nchannels or not self._sampwidth or not self._framerate:
-            raise Error("not all parameters set")
-        return _wave_params(
-            self._nchannels,
-            self._sampwidth,
-            self._framerate,
-            self._nframes,
-            self._comptype,
-            self._compname,
-        )
-
-    def setmark(self, id, pos, name):
-        raise Error("setmark() not supported")
-
-    def getmark(self, id):
-        raise Error("no marks")
-
-    def getmarkers(self):
-        return None
-
-    def tell(self):
-        return self._nframeswritten
-
-    def writeframesraw(self, data):
-        if not isinstance(data, (bytes, bytearray)):
-            data = memoryview(data).cast("B")
-        self._ensure_header_written(len(data))
-        nframes = len(data) // (self._sampwidth * self._nchannels)
-        if self._convert:
-            data = self._convert(data)
-        if self._sampwidth != 1 and sys.byteorder == "big":
-            data = audioop.byteswap(data, self._sampwidth)
-        self._file.write(data)
-        self._datawritten += len(data)
-        self._nframeswritten = self._nframeswritten + nframes
-
-    def writeframes(self, data):
-        self.writeframesraw(data)
-        if self._datalength != self._datawritten:
-            self._patchheader()
-
-    def close(self):
-        try:
-            if self._file:
-                self._ensure_header_written(0)
-                if self._datalength != self._datawritten:
-                    self._patchheader()
-                self._file.flush()
-        finally:
-            self._file = None
-            file = self._i_opened_the_file
-            if file:
-                self._i_opened_the_file = None
-                file.close()
-
-    #
-    # Internal methods.
-    #
-
-    def _ensure_header_written(self, datasize):
-        if not self._headerwritten:
-            if not self._nchannels:
-                raise Error("# channels not specified")
-            if not self._sampwidth:
-                raise Error("sample width not specified")
-            if not self._framerate:
-                raise Error("sampling rate not specified")
-            self._write_header(datasize)
-
-    def _write_header(self, initlength):
-        assert not self._headerwritten
-        self._file.write(b"RIFF")
-        if not self._nframes:
-            self._nframes = initlength // (self._nchannels * self._sampwidth)
-        self._datalength = self._nframes * self._nchannels * self._sampwidth
-        try:
-            self._form_length_pos = self._file.tell()
-        except (AttributeError, OSError):
-            self._form_length_pos = None
-        self._file.write(
-            struct.pack(
-                "
Date: Wed, 10 May 2023 07:31:25 -0500
Subject: [PATCH 2372/2403] synthio: Add `synthio.BendType`

---
 shared-bindings/synthio/__init__.c | 32 ++++++++++++++++++++++++++++++
 shared-bindings/synthio/__init__.h |  5 +++++
 2 files changed, 37 insertions(+)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 2e4fd7b8a4..61c4e9a8be 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -26,6 +26,7 @@
 
 #include 
 
+#include "py/enum.h"
 #include "py/mperrno.h"
 #include "py/obj.h"
 #include "py/objnamedtuple.h"
@@ -52,6 +53,7 @@ static const mp_arg_t envelope_properties[] = {
     { MP_QSTR_sustain_level, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
 };
 
+//|
 //| """Support for multi-channel audio synthesis
 //|
 //| At least 2 simultaneous notes are supported.  samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
@@ -284,9 +286,39 @@ STATIC mp_obj_t onevo_to_hz(mp_obj_t arg) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(synthio_onevo_to_hz_obj, onevo_to_hz);
 
+MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, STATIC, SYNTHIO_BEND_MODE_STATIC);
+MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, TREMOLO, SYNTHIO_BEND_MODE_TREMOLO);
+MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP, SYNTHIO_BEND_MODE_SWEEP);
+
+//|
+//| class BendType:
+//|     """Controls the way the ``Note.pitch_bend_depth`` and ``Note.pitch_bend_rate`` properties are interpreted."""
+//|
+//|     STATIC: object
+//|     """The Note's pitch is modified by its ``pitch_bend_depth``. ``pitch_bend_rate`` is ignored."""
+//|
+//|     TREMOLO: object
+//|     """The Note's pitch varies by ``±pitch_bend_depth` at a rate of ``pitch_bend_rate``Hz."""
+//|
+//|     SWEEP: object
+//|     """The Note's pitch starts at ``Note.frequency`` then sweeps up or down by ``pitch_bend_depth`` over ``1/pitch_bend_rate`` seconds."""
+//|
+MAKE_ENUM_MAP(synthio_bend_mode) {
+    MAKE_ENUM_MAP_ENTRY(bend_mode, STATIC),
+    MAKE_ENUM_MAP_ENTRY(bend_mode, TREMOLO),
+    MAKE_ENUM_MAP_ENTRY(bend_mode, SWEEP),
+};
+
+STATIC MP_DEFINE_CONST_DICT(synthio_bend_mode_locals_dict, synthio_bend_mode_locals_table);
+
+MAKE_PRINTER(synthio, synthio_bend_mode);
+
+MAKE_ENUM_TYPE(synthio, BendType, synthio_bend_mode);
+
 
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
+    { MP_ROM_QSTR(MP_QSTR_BendType), MP_ROM_PTR(&synthio_bend_mode_type) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
     { MP_ROM_QSTR(MP_QSTR_Note), MP_ROM_PTR(&synthio_note_type) },
     { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index 37a5c77b34..e6be579c58 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -28,6 +28,11 @@
 
 #include "py/objnamedtuple.h"
 
+typedef enum {
+    SYNTHIO_BEND_MODE_STATIC, SYNTHIO_BEND_MODE_TREMOLO, SYNTHIO_BEND_MODE_SWEEP
+} synthio_bend_mode_t;
+
+extern const mp_obj_type_t synthio_bend_mode_type;
 typedef struct synthio_synth synthio_synth_t;
 extern int16_t shared_bindings_synthio_square_wave[];
 extern const mp_obj_namedtuple_type_t synthio_envelope_type_obj;

From 1d1907b98bca84aa784846d24a408db1fde12d33 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 May 2023 08:40:09 -0500
Subject: [PATCH 2373/2403] synthio: Generalize vibrato into bend

bend can be static, sweep, or vibrato
---
 shared-bindings/synthio/Note.c                | 87 ++++++++++++-------
 shared-bindings/synthio/Note.h                | 12 ++-
 shared-bindings/synthio/__init__.c            |  6 +-
 shared-bindings/synthio/__init__.h            |  6 +-
 shared-module/synthio/Note.c                  | 54 ++++++++----
 shared-module/synthio/Note.h                  |  6 +-
 shared-module/synthio/__init__.c              | 12 +++
 shared-module/synthio/__init__.h              |  4 +-
 .../circuitpython-manual/synthio/note/code.py | 29 +++++--
 tests/circuitpython/synthesizer_note.py.exp   |  6 +-
 10 files changed, 153 insertions(+), 69 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index 4cd0abe0d4..905243b4bf 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -30,6 +30,7 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/util.h"
+#include "shared-bindings/synthio/__init__.h"
 #include "shared-bindings/synthio/Note.h"
 #include "shared-module/synthio/Note.h"
 
@@ -38,8 +39,9 @@ static const mp_arg_t note_properties[] = {
     { MP_QSTR_amplitude, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(1) } },
     { MP_QSTR_tremolo_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
     { MP_QSTR_tremolo_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
-    { MP_QSTR_vibrato_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
-    { MP_QSTR_vibrato_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_bend_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_bend_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
+    { MP_QSTR_bend_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = (mp_obj_t)MP_ROM_PTR(&bend_mode_VIBRATO_obj) } },
     { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
     { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
 };
@@ -53,17 +55,16 @@ static const mp_arg_t note_properties[] = {
 //|         envelope: Optional[Envelope] = None,
 //|         tremolo_depth: float = 0.0,
 //|         tremolo_rate: float = 0.0,
-//|         vibrato_depth: float = 0.0,
-//|         vibrato_rate: float = 0.0,
+//|         bend_depth: float = 0.0,
+//|         bend_rate: float = 0.0,
 //|     ) -> None:
-//|         """Construct a Note object, with a frequency in Hz, and optional amplitude (volume), waveform, envelope, tremolo (volume change) and vibrato (frequency change).
+//|         """Construct a Note object, with a frequency in Hz, and optional amplitude (volume), waveform, envelope, tremolo (volume change) and bend (frequency change).
 //|
 //|         If waveform or envelope are `None` the synthesizer object's default waveform or envelope are used.
 //|
 //|         If the same Note object is played on multiple Synthesizer objects, the result is undefined.
 //|         """
 STATIC mp_obj_t synthio_note_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_frequency, ARG_amplitude, ARG_waveform, ARG_envelope, ARG_tremolo_rate, ARG_tremolo_depth, ARG_vibrato_rate, ARG_vibrato_depth };
     mp_arg_val_t args[MP_ARRAY_SIZE(note_properties)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(note_properties), note_properties, args);
 
@@ -158,46 +159,67 @@ MP_PROPERTY_GETSET(synthio_note_tremolo_rate_obj,
     (mp_obj_t)&synthio_note_get_tremolo_rate_obj,
     (mp_obj_t)&synthio_note_set_tremolo_rate_obj);
 
-//|     vibrato_depth: float
-//|     """The vibrato depth of the note, from 0 to 1
 //|
-//|     A depth of 0 disables vibrato. A depth of 1 corresponds to a vibrato of ±1
-//|     octave.  A depth of (1/12) = 0.833 corresponds to a vibrato of ±1 semitone,
+//|     bend_mode: BendMode
+//|     """The type of bend operation"""
+STATIC mp_obj_t synthio_note_get_bend_mode(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return cp_enum_find(&synthio_bend_mode_type, common_hal_synthio_note_get_bend_mode(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_bend_mode_obj, synthio_note_get_bend_mode);
+
+STATIC mp_obj_t synthio_note_set_bend_mode(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_bend_mode(self, cp_enum_value(&synthio_bend_mode_type, arg, MP_QSTR_bend_mode));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_bend_mode_obj, synthio_note_set_bend_mode);
+MP_PROPERTY_GETSET(synthio_note_bend_mode_obj,
+    (mp_obj_t)&synthio_note_get_bend_mode_obj,
+    (mp_obj_t)&synthio_note_set_bend_mode_obj);
+
+//
+//|
+//|     bend_depth: float
+//|     """The bend depth of the note, from -1 to +1
+//|
+//|     A depth of 0 disables bend. A depth of 1 corresponds to a bend of 1
+//|     octave.  A depth of (1/12) = 0.833 corresponds to a bend of 1 semitone,
 //|     and a depth of .00833 corresponds to one musical cent.
 //|     """
-STATIC mp_obj_t synthio_note_get_vibrato_depth(mp_obj_t self_in) {
+STATIC mp_obj_t synthio_note_get_bend_depth(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_float(common_hal_synthio_note_get_vibrato_depth(self));
+    return mp_obj_new_float(common_hal_synthio_note_get_bend_depth(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_vibrato_depth_obj, synthio_note_get_vibrato_depth);
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_bend_depth_obj, synthio_note_get_bend_depth);
 
-STATIC mp_obj_t synthio_note_set_vibrato_depth(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t synthio_note_set_bend_depth(mp_obj_t self_in, mp_obj_t arg) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_synthio_note_set_vibrato_depth(self, mp_obj_get_float(arg));
+    common_hal_synthio_note_set_bend_depth(self, mp_obj_get_float(arg));
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_vibrato_depth_obj, synthio_note_set_vibrato_depth);
-MP_PROPERTY_GETSET(synthio_note_vibrato_depth_obj,
-    (mp_obj_t)&synthio_note_get_vibrato_depth_obj,
-    (mp_obj_t)&synthio_note_set_vibrato_depth_obj);
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_bend_depth_obj, synthio_note_set_bend_depth);
+MP_PROPERTY_GETSET(synthio_note_bend_depth_obj,
+    (mp_obj_t)&synthio_note_get_bend_depth_obj,
+    (mp_obj_t)&synthio_note_set_bend_depth_obj);
 
-//|     vibrato_rate: float
-//|     """The vibrato rate of the note, in Hz."""
-STATIC mp_obj_t synthio_note_get_vibrato_rate(mp_obj_t self_in) {
+//|     bend_rate: float
+//|     """The bend rate of the note, in Hz."""
+STATIC mp_obj_t synthio_note_get_bend_rate(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_float(common_hal_synthio_note_get_vibrato_rate(self));
+    return mp_obj_new_float(common_hal_synthio_note_get_bend_rate(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_vibrato_rate_obj, synthio_note_get_vibrato_rate);
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_bend_rate_obj, synthio_note_get_bend_rate);
 
-STATIC mp_obj_t synthio_note_set_vibrato_rate(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t synthio_note_set_bend_rate(mp_obj_t self_in, mp_obj_t arg) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_synthio_note_set_vibrato_rate(self, mp_obj_get_float(arg));
+    common_hal_synthio_note_set_bend_rate(self, mp_obj_get_float(arg));
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_vibrato_rate_obj, synthio_note_set_vibrato_rate);
-MP_PROPERTY_GETSET(synthio_note_vibrato_rate_obj,
-    (mp_obj_t)&synthio_note_get_vibrato_rate_obj,
-    (mp_obj_t)&synthio_note_set_vibrato_rate_obj);
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_bend_rate_obj, synthio_note_set_bend_rate);
+MP_PROPERTY_GETSET(synthio_note_bend_rate_obj,
+    (mp_obj_t)&synthio_note_get_bend_rate_obj,
+    (mp_obj_t)&synthio_note_set_bend_rate_obj);
 
 //|     waveform: Optional[ReadableBuffer]
 //|     """The waveform of this note. Setting the waveform to a buffer of a different size resets the note's phase."""
@@ -249,8 +271,9 @@ STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_envelope), MP_ROM_PTR(&synthio_note_envelope_obj) },
     { MP_ROM_QSTR(MP_QSTR_tremolo_depth), MP_ROM_PTR(&synthio_note_tremolo_depth_obj) },
     { MP_ROM_QSTR(MP_QSTR_tremolo_rate), MP_ROM_PTR(&synthio_note_tremolo_rate_obj) },
-    { MP_ROM_QSTR(MP_QSTR_vibrato_depth), MP_ROM_PTR(&synthio_note_vibrato_depth_obj) },
-    { MP_ROM_QSTR(MP_QSTR_vibrato_rate), MP_ROM_PTR(&synthio_note_vibrato_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bend_depth), MP_ROM_PTR(&synthio_note_bend_depth_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bend_rate), MP_ROM_PTR(&synthio_note_bend_rate_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bend_mode), MP_ROM_PTR(&synthio_note_bend_mode_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(synthio_note_locals_dict, synthio_note_locals_dict_table);
 
diff --git a/shared-bindings/synthio/Note.h b/shared-bindings/synthio/Note.h
index ab9d925f03..90d933fd3f 100644
--- a/shared-bindings/synthio/Note.h
+++ b/shared-bindings/synthio/Note.h
@@ -4,6 +4,7 @@
 
 typedef struct synthio_note_obj synthio_note_obj_t;
 extern const mp_obj_type_t synthio_note_type;
+typedef enum synthio_bend_mode_e synthio_bend_mode_t;
 
 mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value);
@@ -17,11 +18,14 @@ void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float
 mp_float_t common_hal_synthio_note_get_tremolo_depth(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_tremolo_depth(synthio_note_obj_t *self, mp_float_t value);
 
-mp_float_t common_hal_synthio_note_get_vibrato_rate(synthio_note_obj_t *self);
-void common_hal_synthio_note_set_vibrato_rate(synthio_note_obj_t *self, mp_float_t value);
+synthio_bend_mode_t common_hal_synthio_note_get_bend_mode(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_bend_mode(synthio_note_obj_t *self, synthio_bend_mode_t value);
 
-mp_float_t common_hal_synthio_note_get_vibrato_depth(synthio_note_obj_t *self);
-void common_hal_synthio_note_set_vibrato_depth(synthio_note_obj_t *self, mp_float_t value);
+mp_float_t common_hal_synthio_note_get_bend_rate(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_bend_rate(synthio_note_obj_t *self, mp_float_t value);
+
+mp_float_t common_hal_synthio_note_get_bend_depth(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_bend_depth(synthio_note_obj_t *self, mp_float_t value);
 
 mp_obj_t common_hal_synthio_note_get_waveform_obj(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_waveform(synthio_note_obj_t *self, mp_obj_t value);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 61c4e9a8be..2739d81e88 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -287,7 +287,7 @@ STATIC mp_obj_t onevo_to_hz(mp_obj_t arg) {
 MP_DEFINE_CONST_FUN_OBJ_1(synthio_onevo_to_hz_obj, onevo_to_hz);
 
 MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, STATIC, SYNTHIO_BEND_MODE_STATIC);
-MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, TREMOLO, SYNTHIO_BEND_MODE_TREMOLO);
+MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, VIBRATO, SYNTHIO_BEND_MODE_VIBRATO);
 MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP, SYNTHIO_BEND_MODE_SWEEP);
 
 //|
@@ -297,7 +297,7 @@ MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP, SYNTHIO_BEND_MODE_SWEE
 //|     STATIC: object
 //|     """The Note's pitch is modified by its ``pitch_bend_depth``. ``pitch_bend_rate`` is ignored."""
 //|
-//|     TREMOLO: object
+//|     VIBRATO: object
 //|     """The Note's pitch varies by ``±pitch_bend_depth` at a rate of ``pitch_bend_rate``Hz."""
 //|
 //|     SWEEP: object
@@ -305,7 +305,7 @@ MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP, SYNTHIO_BEND_MODE_SWEE
 //|
 MAKE_ENUM_MAP(synthio_bend_mode) {
     MAKE_ENUM_MAP_ENTRY(bend_mode, STATIC),
-    MAKE_ENUM_MAP_ENTRY(bend_mode, TREMOLO),
+    MAKE_ENUM_MAP_ENTRY(bend_mode, VIBRATO),
     MAKE_ENUM_MAP_ENTRY(bend_mode, SWEEP),
 };
 
diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index e6be579c58..d09fab815e 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -27,11 +27,13 @@
 #pragma once
 
 #include "py/objnamedtuple.h"
+#include "py/enum.h"
 
-typedef enum {
-    SYNTHIO_BEND_MODE_STATIC, SYNTHIO_BEND_MODE_TREMOLO, SYNTHIO_BEND_MODE_SWEEP
+typedef enum synthio_bend_mode_e {
+    SYNTHIO_BEND_MODE_STATIC, SYNTHIO_BEND_MODE_VIBRATO, SYNTHIO_BEND_MODE_SWEEP
 } synthio_bend_mode_t;
 
+extern const cp_enum_obj_t bend_mode_VIBRATO_obj;
 extern const mp_obj_type_t synthio_bend_mode_type;
 typedef struct synthio_synth synthio_synth_t;
 extern int16_t shared_bindings_synthio_square_wave[];
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 84949163a7..65c20024a7 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -76,25 +76,34 @@ void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float
     }
 }
 
-mp_float_t common_hal_synthio_note_get_vibrato_depth(synthio_note_obj_t *self) {
-    return self->vibrato_descr.amplitude;
+mp_float_t common_hal_synthio_note_get_bend_depth(synthio_note_obj_t *self) {
+    return self->bend_descr.amplitude;
 }
 
-void common_hal_synthio_note_set_vibrato_depth(synthio_note_obj_t *self, mp_float_t value_in) {
-    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_vibrato_depth);
-    self->vibrato_descr.amplitude = val;
-    self->vibrato_state.amplitude_scaled = round_float_to_int(val * 32767);
+void common_hal_synthio_note_set_bend_depth(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, -1, 1, MP_QSTR_bend_depth);
+    self->bend_descr.amplitude = val;
+    self->bend_state.amplitude_scaled = round_float_to_int(val * 32767);
 }
 
-mp_float_t common_hal_synthio_note_get_vibrato_rate(synthio_note_obj_t *self) {
-    return self->vibrato_descr.frequency;
+mp_float_t common_hal_synthio_note_get_bend_rate(synthio_note_obj_t *self) {
+    return self->bend_descr.frequency;
 }
 
-void common_hal_synthio_note_set_vibrato_rate(synthio_note_obj_t *self, mp_float_t value_in) {
-    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_vibrato_rate);
-    self->vibrato_descr.frequency = val;
+synthio_bend_mode_t common_hal_synthio_note_get_bend_mode(synthio_note_obj_t *self) {
+    return self->bend_mode;
+}
+
+void common_hal_synthio_note_set_bend_mode(synthio_note_obj_t *self, synthio_bend_mode_t value) {
+    self->bend_mode = value;
+}
+
+
+void common_hal_synthio_note_set_bend_rate(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_bend_rate);
+    self->bend_descr.frequency = val;
     if (self->sample_rate != 0) {
-        self->vibrato_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
+        self->bend_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
     }
 }
 
@@ -139,8 +148,8 @@ void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
 
     synthio_lfo_set(&self->tremolo_state, &self->tremolo_descr, sample_rate);
     self->tremolo_state.offset_scaled = 32768 - self->tremolo_state.amplitude_scaled;
-    synthio_lfo_set(&self->vibrato_state, &self->vibrato_descr, sample_rate);
-    self->vibrato_state.offset_scaled = 32768;
+    synthio_lfo_set(&self->bend_state, &self->bend_descr, sample_rate);
+    self->bend_state.offset_scaled = 32768;
 }
 
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {
@@ -176,10 +185,23 @@ STATIC uint32_t pitch_bend(uint32_t frequency_scaled, uint16_t bend_value) {
     return (frequency_scaled * (uint64_t)f) >> (15 + down);
 }
 
+STATIC int synthio_bend_value(synthio_note_obj_t *self, int16_t dur) {
+    switch (self->bend_mode) {
+        case SYNTHIO_BEND_MODE_STATIC:
+            return self->bend_state.amplitude_scaled + self->bend_state.offset_scaled;
+        case SYNTHIO_BEND_MODE_VIBRATO:
+            return synthio_lfo_step(&self->bend_state, dur);
+        case SYNTHIO_BEND_MODE_SWEEP:
+            return synthio_sweep_step(&self->bend_state, dur);
+        default:
+            return 32768;
+    }
+}
+
 uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness) {
     int tremolo_value = synthio_lfo_step(&self->tremolo_state, dur);
-    int vibrato_value = synthio_lfo_step(&self->vibrato_state, dur);
     *loudness = (*loudness * tremolo_value) >> 15;
-    uint32_t frequency_scaled = pitch_bend(self->frequency_scaled, vibrato_value);
+    int bend_value = synthio_bend_value(self, dur);
+    uint32_t frequency_scaled = pitch_bend(self->frequency_scaled, bend_value);
     return frequency_scaled;
 }
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
index 4efb197c07..ffaf7295fa 100644
--- a/shared-module/synthio/Note.h
+++ b/shared-module/synthio/Note.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include "shared-module/synthio/__init__.h"
+#include "shared-bindings/synthio/__init__.h"
 
 typedef struct synthio_note_obj {
     mp_obj_base_t base;
@@ -39,8 +40,9 @@ typedef struct synthio_note_obj {
 
     int32_t frequency_scaled;
     int32_t amplitude_scaled;
-    synthio_lfo_descr_t tremolo_descr, vibrato_descr;
-    synthio_lfo_state_t tremolo_state, vibrato_state;
+    synthio_bend_mode_t bend_mode;
+    synthio_lfo_descr_t tremolo_descr, bend_descr;
+    synthio_lfo_state_t tremolo_state, bend_state;
 
     mp_buffer_info_t waveform_buf;
     synthio_envelope_definition_t envelope_def;
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 5ee72aeb79..0bd02a3436 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -402,6 +402,18 @@ void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *desc
     state->dds = synthio_frequency_convert_float_to_dds(descr->frequency * 65536, sample_rate);
 }
 
+int synthio_sweep_step(synthio_lfo_state_t *state, uint16_t dur) {
+    uint32_t phase = state->phase;
+    uint16_t whole_phase = phase >> 16;
+
+    // advance the phase accumulator
+    state->phase = phase + state->dds * dur;
+    if (state->phase < phase) {
+        state->phase = 0xffffffff;
+    }
+    return (state->amplitude_scaled * whole_phase) / 65536 + state->offset_scaled;
+}
+
 int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur) {
     uint32_t phase = state->phase;
     uint16_t whole_phase = phase >> 16;
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 4ea04a09e3..53706f0e6c 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -81,7 +81,8 @@ typedef struct {
 } synthio_lfo_descr_t;
 
 typedef struct {
-    uint32_t amplitude_scaled, offset_scaled, dds, phase;
+    int32_t amplitude_scaled;
+    uint32_t offset_scaled, dds, phase;
 } synthio_lfo_state_t;
 
 
@@ -107,3 +108,4 @@ uint32_t synthio_frequency_convert_scaled_to_dds(uint64_t frequency_scaled, int3
 
 void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *descr, uint32_t sample_rate);
 int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur);
+int synthio_sweep_step(synthio_lfo_state_t *state, uint16_t dur);
diff --git a/tests/circuitpython-manual/synthio/note/code.py b/tests/circuitpython-manual/synthio/note/code.py
index d088ede50e..6a6a9556dc 100644
--- a/tests/circuitpython-manual/synthio/note/code.py
+++ b/tests/circuitpython-manual/synthio/note/code.py
@@ -18,7 +18,7 @@ sine = np.array(
 )
 
 envelope = synthio.Envelope(
-    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=0.8, sustain_level=0.8
 )
 
 synth = synthio.Synthesizer(sample_rate=48000)
@@ -63,8 +63,8 @@ def synthesize2(synth):
 def synthesize3(synth):
     n = synthio.Note(
         frequency=synthio.midi_to_hz(60),
-        vibrato_depth=0.1,
-        vibrato_rate=8,
+        bend_depth=0.1,
+        bend_rate=8,
         waveform=sine,
         envelope=envelope,
     )
@@ -79,8 +79,8 @@ def synthesize4(synth):
         frequency=synthio.midi_to_hz(60),
         tremolo_depth=0.1,
         tremolo_rate=1.5,
-        vibrato_depth=0.1,
-        vibrato_rate=3,
+        bend_depth=0.1,
+        bend_rate=3,
         waveform=sine,
         envelope=envelope,
     )
@@ -109,6 +109,23 @@ def synthesize5(synth):
     yield 36
 
 
+def synthesize6(synth):
+    n = synthio.Note(
+        frequency=synthio.midi_to_hz(60),
+        tremolo_depth=0.1,
+        tremolo_rate=1.5,
+        bend_depth=-5 / 12,
+        bend_rate=1 / 2,
+        bend_mode=synthio.BendType.SWEEP,
+        waveform=sine,
+        envelope=envelope,
+    )
+    synth.press((n,))
+    yield 720
+    synth.release_all()
+    yield 36
+
+
 def chain(*args):
     for a in args:
         yield from a
@@ -119,7 +136,7 @@ with wave.open("tune-noenv.wav", "w") as f:
     f.setnchannels(1)
     f.setsampwidth(2)
     f.setframerate(48000)
-    for n in chain(synthesize5(synth)):
+    for n in chain(synthesize6(synth)):
         for i in range(n):
             result, data = audiocore.get_buffer(synth)
             f.writeframes(data)
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index 787243e2a5..bb34c0a6c3 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None),)
 [-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None), Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None))
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None), Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None))
 [0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, vibrato_rate=0.0, vibrato_depth=0.0, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None),)
 [0, 0, 0, 28045, 0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0]
 (-5242, 5242)
 (-10485, 10484)

From 2062b2bfb766709935c0c9b7b383802bf1bf67a7 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 May 2023 09:27:47 -0500
Subject: [PATCH 2374/2403] synthio: add a noise program to the manual tests

---
 .../synthio/note/noise.py                     | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 tests/circuitpython-manual/synthio/note/noise.py

diff --git a/tests/circuitpython-manual/synthio/note/noise.py b/tests/circuitpython-manual/synthio/note/noise.py
new file mode 100644
index 0000000000..53257966cb
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/noise.py
@@ -0,0 +1,71 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+random.seed(9)
+SAMPLE_SIZE = 1024
+VOLUME = 14700
+noise = np.array(
+    [random.randint(-32768, 32767) for i in range(SAMPLE_SIZE)],
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0,
+    decay_time=0.2,
+    sustain_level=0,
+)
+
+synth = synthio.Synthesizer(sample_rate=48000)
+
+
+def randf(lo, hi):
+    return random.random() * (hi - lo) + lo
+
+
+def synthesize(synth):
+    notes = [
+        synthio.Note(
+            frequency=synthio.midi_to_hz(1 + i),
+            waveform=noise,
+            envelope=envelope,
+            bend_mode=synthio.BendType.SWEEP,
+            bend_depth=random.choice((-1, 1)),
+            bend_rate=randf(4, 12),
+        )
+        for i in range(12)
+    ]
+
+    random.seed(9)
+    for _ in range(16):
+        n = random.choice(notes)
+        d = random.randint(30, 60)
+        print(n, d)
+        synth.press((n,))
+        yield d
+    synth.release_all()
+    yield 36
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("noise.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)

From e87e7ee54f667e114058ccfba109a425eaf990ae Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 May 2023 11:16:22 -0500
Subject: [PATCH 2375/2403] synthio: add stereo & Note.panning

A note can be placed in the center (panning=0) or moved to just the left
(panning=1) or right (panning=-1) channels. Fractional panning values
place it partially in both channels.
---
 shared-bindings/synthio/Note.c        | 36 ++++++++++++++++-----------
 shared-bindings/synthio/Note.h        |  4 +--
 shared-bindings/synthio/Synthesizer.c |  6 ++++-
 shared-bindings/synthio/Synthesizer.h |  2 +-
 shared-module/synthio/MidiTrack.c     |  2 +-
 shared-module/synthio/Note.c          | 21 ++++++++++------
 shared-module/synthio/Note.h          |  5 ++--
 shared-module/synthio/Synthesizer.c   |  6 ++---
 shared-module/synthio/__init__.c      | 31 +++++++++++++++--------
 shared-module/synthio/__init__.h      |  3 ++-
 10 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index 905243b4bf..5912ab30c9 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -36,7 +36,7 @@
 
 static const mp_arg_t note_properties[] = {
     { MP_QSTR_frequency, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = NULL } },
-    { MP_QSTR_amplitude, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(1) } },
+    { MP_QSTR_panning, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(0) } },
     { MP_QSTR_tremolo_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
     { MP_QSTR_tremolo_depth, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
     { MP_QSTR_bend_rate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = NULL } },
@@ -50,15 +50,16 @@ static const mp_arg_t note_properties[] = {
 //|         self,
 //|         *,
 //|         frequency: float,
-//|         amplitude: float = 1.0,
+//|         panning: float = 0.0,
 //|         waveform: Optional[ReadableBuffer] = None,
 //|         envelope: Optional[Envelope] = None,
 //|         tremolo_depth: float = 0.0,
 //|         tremolo_rate: float = 0.0,
 //|         bend_depth: float = 0.0,
 //|         bend_rate: float = 0.0,
+//|         bend_mode: BendMode = BendMode.VIBRATO,
 //|     ) -> None:
-//|         """Construct a Note object, with a frequency in Hz, and optional amplitude (volume), waveform, envelope, tremolo (volume change) and bend (frequency change).
+//|         """Construct a Note object, with a frequency in Hz, and optional panning, waveform, envelope, tremolo (volume change) and bend (frequency change).
 //|
 //|         If waveform or envelope are `None` the synthesizer object's default waveform or envelope are used.
 //|
@@ -99,23 +100,28 @@ MP_PROPERTY_GETSET(synthio_note_frequency_obj,
     (mp_obj_t)&synthio_note_get_frequency_obj,
     (mp_obj_t)&synthio_note_set_frequency_obj);
 
-//|     amplitude: float
-//|     """The base amplitude of the note, from 0 to 1"""
-STATIC mp_obj_t synthio_note_get_amplitude(mp_obj_t self_in) {
+//|     panning: float
+//|     """Defines the channel(s) in which the note appears.
+//|
+//|     -1 is left channel only, 0 is both channels, and 1 is right channel.
+//|     For fractional values, the note plays at full amplitude in one channel
+//|     and partial amplitude in the other channel. For instance -.5 plays at full
+//|     amplitude in the left channel and 1/2 amplitude in the right channel."""
+STATIC mp_obj_t synthio_note_get_panning(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_float(common_hal_synthio_note_get_amplitude(self));
+    return mp_obj_new_float(common_hal_synthio_note_get_panning(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_amplitude_obj, synthio_note_get_amplitude);
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_panning_obj, synthio_note_get_panning);
 
-STATIC mp_obj_t synthio_note_set_amplitude(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t synthio_note_set_panning(mp_obj_t self_in, mp_obj_t arg) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_synthio_note_set_amplitude(self, mp_obj_get_float(arg));
+    common_hal_synthio_note_set_panning(self, mp_obj_get_float(arg));
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_amplitude_obj, synthio_note_set_amplitude);
-MP_PROPERTY_GETSET(synthio_note_amplitude_obj,
-    (mp_obj_t)&synthio_note_get_amplitude_obj,
-    (mp_obj_t)&synthio_note_set_amplitude_obj);
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_panning_obj, synthio_note_set_panning);
+MP_PROPERTY_GETSET(synthio_note_panning_obj,
+    (mp_obj_t)&synthio_note_get_panning_obj,
+    (mp_obj_t)&synthio_note_set_panning_obj);
 
 
 //|     tremolo_depth: float
@@ -266,7 +272,7 @@ static void note_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
 
 STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&synthio_note_frequency_obj) },
-    { MP_ROM_QSTR(MP_QSTR_amplitude), MP_ROM_PTR(&synthio_note_amplitude_obj) },
+    { MP_ROM_QSTR(MP_QSTR_panning), MP_ROM_PTR(&synthio_note_panning_obj) },
     { MP_ROM_QSTR(MP_QSTR_waveform), MP_ROM_PTR(&synthio_note_waveform_obj) },
     { MP_ROM_QSTR(MP_QSTR_envelope), MP_ROM_PTR(&synthio_note_envelope_obj) },
     { MP_ROM_QSTR(MP_QSTR_tremolo_depth), MP_ROM_PTR(&synthio_note_tremolo_depth_obj) },
diff --git a/shared-bindings/synthio/Note.h b/shared-bindings/synthio/Note.h
index 90d933fd3f..f441c9ae43 100644
--- a/shared-bindings/synthio/Note.h
+++ b/shared-bindings/synthio/Note.h
@@ -9,8 +9,8 @@ typedef enum synthio_bend_mode_e synthio_bend_mode_t;
 mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value);
 
-mp_float_t common_hal_synthio_note_get_amplitude(synthio_note_obj_t *self);
-void common_hal_synthio_note_set_amplitude(synthio_note_obj_t *self, mp_float_t value);
+mp_float_t common_hal_synthio_note_get_panning(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_panning(synthio_note_obj_t *self, mp_float_t value);
 
 mp_float_t common_hal_synthio_note_get_tremolo_rate(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float_t value);
diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index 5d9be09f70..e7e442d90f 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -44,6 +44,7 @@
 //|         self,
 //|         *,
 //|         sample_rate: int = 11025,
+//|         channel_count: int = 1,
 //|         waveform: Optional[ReadableBuffer] = None,
 //|         envelope: Optional[Envelope] = None,
 //|     ) -> None:
@@ -56,13 +57,15 @@
 //|         and do not support advanced features like tremolo or vibrato.
 //|
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
+//|         :param int channel_count: The number of output channels (1=mono, 2=stereo)
 //|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
 //|         :param Optional[Envelope] envelope: An object that defines the loudness of a note over time. The default envelope, `None` provides no ramping, voices turn instantly on and off.
 //|         """
 STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_sample_rate, ARG_waveform, ARG_envelope };
+    enum { ARG_sample_rate, ARG_channel_count, ARG_waveform, ARG_envelope };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
+        { MP_QSTR_channel_count, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
         { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
         { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
     };
@@ -77,6 +80,7 @@ STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n
 
     common_hal_synthio_synthesizer_construct(self,
         args[ARG_sample_rate].u_int,
+        args[ARG_channel_count].u_int,
         bufinfo_waveform.buf,
         bufinfo_waveform.len / 2,
         args[ARG_envelope].u_obj);
diff --git a/shared-bindings/synthio/Synthesizer.h b/shared-bindings/synthio/Synthesizer.h
index ba6c3b99e3..4568dafdaf 100644
--- a/shared-bindings/synthio/Synthesizer.h
+++ b/shared-bindings/synthio/Synthesizer.h
@@ -32,7 +32,7 @@
 extern const mp_obj_type_t synthio_synthesizer_type;
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+    uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
     mp_obj_t envelope);
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self);
 bool common_hal_synthio_synthesizer_deinited(synthio_synthesizer_obj_t *self);
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index e22753cb26..a24071800b 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -123,7 +123,7 @@ void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     self->track.buf = (void *)buffer;
     self->track.len = len;
 
-    synthio_synth_init(&self->synth, sample_rate, waveform, waveform_length, envelope);
+    synthio_synth_init(&self->synth, sample_rate, 1, waveform, waveform_length, envelope);
 
     start_parse(self);
 }
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 65c20024a7..bbd84c729f 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -44,14 +44,20 @@ void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t
     self->frequency_scaled = synthio_frequency_convert_float_to_scaled(val);
 }
 
-mp_float_t common_hal_synthio_note_get_amplitude(synthio_note_obj_t *self) {
-    return self->amplitude;
+mp_float_t common_hal_synthio_note_get_panning(synthio_note_obj_t *self) {
+    return self->panning;
 }
 
-void common_hal_synthio_note_set_amplitude(synthio_note_obj_t *self, mp_float_t value_in) {
-    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_amplitude);
-    self->amplitude = val;
-    self->amplitude_scaled = round_float_to_int(val * 32767);
+void common_hal_synthio_note_set_panning(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, -1, 1, MP_QSTR_panning);
+    self->panning = val;
+    if (val >= 0) {
+        self->left_panning_scaled = 32768;
+        self->right_panning_scaled = 32768 - round_float_to_int(val * 32768);
+    } else {
+        self->right_panning_scaled = 32768;
+        self->left_panning_scaled = 32768 + round_float_to_int(val * 32768);
+    }
 }
 
 mp_float_t common_hal_synthio_note_get_tremolo_depth(synthio_note_obj_t *self) {
@@ -200,7 +206,8 @@ STATIC int synthio_bend_value(synthio_note_obj_t *self, int16_t dur) {
 
 uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness) {
     int tremolo_value = synthio_lfo_step(&self->tremolo_state, dur);
-    *loudness = (*loudness * tremolo_value) >> 15;
+    loudness[0] = (((loudness[0] * tremolo_value) >> 15) * self->left_panning_scaled) >> 15;
+    loudness[1] = (((loudness[1] * tremolo_value) >> 15) * self->right_panning_scaled) >> 15;
     int bend_value = synthio_bend_value(self, dur);
     uint32_t frequency_scaled = pitch_bend(self->frequency_scaled, bend_value);
     return frequency_scaled;
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
index ffaf7295fa..ec1f262dc5 100644
--- a/shared-module/synthio/Note.h
+++ b/shared-module/synthio/Note.h
@@ -33,13 +33,14 @@ typedef struct synthio_note_obj {
     mp_obj_base_t base;
 
     mp_float_t frequency;
-    mp_float_t amplitude;
+    mp_float_t panning;
     mp_obj_t waveform_obj, envelope_obj;
 
     int32_t sample_rate;
 
     int32_t frequency_scaled;
     int32_t amplitude_scaled;
+    int32_t left_panning_scaled, right_panning_scaled;
     synthio_bend_mode_t bend_mode;
     synthio_lfo_descr_t tremolo_descr, bend_descr;
     synthio_lfo_state_t tremolo_state, bend_state;
@@ -49,7 +50,7 @@ typedef struct synthio_note_obj {
 } synthio_note_obj_t;
 
 void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate);
-uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness);
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t loudness[2]);
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate);
 bool synthio_note_playing(synthio_note_obj_t *self);
 uint32_t synthio_note_envelope(synthio_note_obj_t *self);
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index ad37cccce5..42e234fef1 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -32,10 +32,10 @@
 
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+    uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
     mp_obj_t envelope) {
 
-    synthio_synth_init(&self->synth, sample_rate, waveform, waveform_length, envelope);
+    synthio_synth_init(&self->synth, sample_rate, channel_count, waveform, waveform_length, envelope);
 }
 
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self) {
@@ -52,7 +52,7 @@ uint8_t common_hal_synthio_synthesizer_get_bits_per_sample(synthio_synthesizer_o
     return SYNTHIO_BITS_PER_SAMPLE;
 }
 uint8_t common_hal_synthio_synthesizer_get_channel_count(synthio_synthesizer_obj_t *self) {
-    return 1;
+    return self->synth.channel_count;
 }
 
 void synthio_synthesizer_reset_buffer(synthio_synthesizer_obj_t *self,
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 0bd02a3436..051fb522f7 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -187,7 +187,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     synth->span.dur -= dur;
 
     int32_t sample_rate = synth->sample_rate;
-    int32_t out_buffer32[dur];
+    int32_t out_buffer32[dur * synth->channel_count];
 
     memset(out_buffer32, 0, sizeof(out_buffer32));
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
@@ -204,7 +204,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
         }
 
         // adjust loudness by envelope
-        uint16_t loudness = synth->envelope_state[chan].level;
+        uint16_t loudness[2] = {synth->envelope_state[chan].level,synth->envelope_state[chan].level};
 
         uint32_t dds_rate;
         const int16_t *waveform = synth->waveform;
@@ -221,7 +221,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
             dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
         } else {
             synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
-            int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, &loudness);
+            int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, loudness);
             if (note->waveform_buf.buf) {
                 waveform = note->waveform_buf.buf;
                 waveform_length = note->waveform_buf.len / 2;
@@ -241,14 +241,19 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
             accum %= lim;
         }
 
-        for (uint16_t i = 0; i < dur; i++) {
+        int synth_chan = synth->channel_count;
+        for (uint16_t i = 0, j = 0; i < dur; i++) {
             accum += dds_rate;
             // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
             if (accum > lim) {
                 accum -= lim;
             }
             int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-            out_buffer32[i] += (waveform[idx] * loudness) / 65536;
+            int16_t wi = waveform[idx];
+            for (int c = 0; c < synth_chan; c++) {
+                out_buffer32[j] += (wi * loudness[c]) / 65536;
+                j++;
+            }
         }
         synth->accum[chan] = accum;
     }
@@ -256,7 +261,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     int16_t *out_buffer16 = (int16_t *)(void *)synth->buffers[synth->buffer_index];
 
     // mix down audio
-    for (size_t i = 0; i < dur; i++) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(out_buffer32); i++) {
         int32_t sample = out_buffer32[i];
         out_buffer16[i] = mix_down_sample(sample);
     }
@@ -270,7 +275,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
         synthio_envelope_state_step(&synth->envelope_state[chan], synthio_synth_get_note_envelope(synth, note_obj), dur);
     }
 
-    *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE;
+    *buffer_length = synth->last_buffer_length = dur * SYNTHIO_BYTES_PER_SAMPLE * synth->channel_count;
     *bufptr = (uint8_t *)out_buffer16;
 }
 
@@ -301,10 +306,12 @@ mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth) {
     return synth->envelope_obj;
 }
 
-void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length, mp_obj_t envelope_obj) {
-    synth->buffer_length = SYNTHIO_MAX_DUR * SYNTHIO_BYTES_PER_SAMPLE;
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length, mp_obj_t envelope_obj) {
+    mp_arg_validate_int_range(channel_count, 1, 2, MP_QSTR_channel_count);
+    synth->buffer_length = SYNTHIO_MAX_DUR * SYNTHIO_BYTES_PER_SAMPLE * channel_count;
     synth->buffers[0] = m_malloc(synth->buffer_length, false);
     synth->buffers[1] = m_malloc(synth->buffer_length, false);
+    synth->channel_count = channel_count;
     synth->other_channel = -1;
     synth->waveform = waveform;
     synth->waveform_length = waveform_length;
@@ -321,7 +328,11 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan
     *single_buffer = false;
     *samples_signed = true;
     *max_buffer_length = synth->buffer_length;
-    *spacing = 1;
+    if (single_channel_output) {
+        *spacing = synth->channel_count;
+    } else {
+        *spacing = 1;
+    }
 }
 
 STATIC bool parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what) {
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 53706f0e6c..f4b90a9cac 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -65,6 +65,7 @@ typedef struct synthio_synth {
     uint32_t total_envelope;
     int16_t *buffers[2];
     const int16_t *waveform;
+    uint8_t channel_count;
     uint16_t buffer_length;
     uint16_t last_buffer_length;
     uint8_t other_channel, buffer_index, other_buffer_index;
@@ -89,7 +90,7 @@ typedef struct {
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length, uint8_t channel);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
-void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_length,
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
     mp_obj_t envelope);
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);

From 095e0208095a5d26d3b884d9e34a930b8a98536a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Wed, 10 May 2023 12:07:01 -0500
Subject: [PATCH 2376/2403] synthio: Add ring modulation

---
 shared-bindings/synthio/Note.c   |  47 +++++++++++++
 shared-bindings/synthio/Note.h   |   6 ++
 shared-module/synthio/Note.c     |  25 +++++++
 shared-module/synthio/Note.h     |   6 +-
 shared-module/synthio/__init__.c | 111 +++++++++++++++++++++++++------
 shared-module/synthio/__init__.h |   1 +
 6 files changed, 172 insertions(+), 24 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index 5912ab30c9..b12e015378 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -44,6 +44,8 @@ static const mp_arg_t note_properties[] = {
     { MP_QSTR_bend_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = (mp_obj_t)MP_ROM_PTR(&bend_mode_VIBRATO_obj) } },
     { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
     { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
+    { MP_QSTR_ring_frequency, MP_ARG_OBJ, {.u_obj = NULL } },
+    { MP_QSTR_ring_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
 };
 //| class Note:
 //|     def __init__(
@@ -265,6 +267,49 @@ MP_PROPERTY_GETSET(synthio_note_envelope_obj,
     (mp_obj_t)&synthio_note_get_envelope_obj,
     (mp_obj_t)&synthio_note_set_envelope_obj);
 
+//|     ring_frequency: float
+//|     """The ring frequency of the note, in Hz. Zero disables.
+//|
+//|     For ring to take effect, both ring_frequency and ring_wavefor must be set."""
+STATIC mp_obj_t synthio_note_get_ring_frequency(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_float(common_hal_synthio_note_get_ring_frequency(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_frequency_obj, synthio_note_get_ring_frequency);
+
+STATIC mp_obj_t synthio_note_set_ring_frequency(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_ring_frequency(self, mp_obj_get_float(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_ring_frequency_obj, synthio_note_set_ring_frequency);
+MP_PROPERTY_GETSET(synthio_note_ring_frequency_obj,
+    (mp_obj_t)&synthio_note_get_ring_frequency_obj,
+    (mp_obj_t)&synthio_note_set_ring_frequency_obj);
+
+//|     ring_waveform: Optional[ReadableBuffer]
+//|     """The ring waveform of this note. Setting the ring_waveform to a buffer of a different size resets the note's phase.
+//|
+//|     For ring to take effect, both ring_frequency and ring_wavefor must be set."""
+//|
+STATIC mp_obj_t synthio_note_get_ring_waveform(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_synthio_note_get_ring_waveform_obj(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_waveform_obj, synthio_note_get_ring_waveform);
+
+STATIC mp_obj_t synthio_note_set_ring_waveform(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_ring_waveform(self, arg);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_ring_waveform_obj, synthio_note_set_ring_waveform);
+MP_PROPERTY_GETSET(synthio_note_ring_waveform_obj,
+    (mp_obj_t)&synthio_note_get_ring_waveform_obj,
+    (mp_obj_t)&synthio_note_set_ring_waveform_obj);
+
+
+
 static void note_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     properties_print_helper(print, self_in, note_properties, MP_ARRAY_SIZE(note_properties));
@@ -280,6 +325,8 @@ STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bend_depth), MP_ROM_PTR(&synthio_note_bend_depth_obj) },
     { MP_ROM_QSTR(MP_QSTR_bend_rate), MP_ROM_PTR(&synthio_note_bend_rate_obj) },
     { MP_ROM_QSTR(MP_QSTR_bend_mode), MP_ROM_PTR(&synthio_note_bend_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ring_frequency), MP_ROM_PTR(&synthio_note_ring_frequency_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ring_waveform), MP_ROM_PTR(&synthio_note_ring_waveform_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(synthio_note_locals_dict, synthio_note_locals_dict_table);
 
diff --git a/shared-bindings/synthio/Note.h b/shared-bindings/synthio/Note.h
index f441c9ae43..e548f9b5a7 100644
--- a/shared-bindings/synthio/Note.h
+++ b/shared-bindings/synthio/Note.h
@@ -9,6 +9,9 @@ typedef enum synthio_bend_mode_e synthio_bend_mode_t;
 mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value);
 
+mp_float_t common_hal_synthio_note_get_ring_frequency(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_ring_frequency(synthio_note_obj_t *self, mp_float_t value);
+
 mp_float_t common_hal_synthio_note_get_panning(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_panning(synthio_note_obj_t *self, mp_float_t value);
 
@@ -30,5 +33,8 @@ void common_hal_synthio_note_set_bend_depth(synthio_note_obj_t *self, mp_float_t
 mp_obj_t common_hal_synthio_note_get_waveform_obj(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_waveform(synthio_note_obj_t *self, mp_obj_t value);
 
+mp_obj_t common_hal_synthio_note_get_ring_waveform_obj(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_ring_waveform(synthio_note_obj_t *self, mp_obj_t value);
+
 mp_obj_t common_hal_synthio_note_get_envelope_obj(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_envelope(synthio_note_obj_t *self, mp_obj_t value);
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index bbd84c729f..87d32da031 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -44,6 +44,16 @@ void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t
     self->frequency_scaled = synthio_frequency_convert_float_to_scaled(val);
 }
 
+mp_float_t common_hal_synthio_note_get_ring_frequency(synthio_note_obj_t *self) {
+    return self->ring_frequency;
+}
+
+void common_hal_synthio_note_set_ring_frequency(synthio_note_obj_t *self, mp_float_t value_in) {
+    mp_float_t val = mp_arg_validate_float_range(value_in, 0, 32767, MP_QSTR_ring_frequency);
+    self->ring_frequency = val;
+    self->ring_frequency_scaled = synthio_frequency_convert_float_to_scaled(val);
+}
+
 mp_float_t common_hal_synthio_note_get_panning(synthio_note_obj_t *self) {
     return self->panning;
 }
@@ -142,6 +152,21 @@ void common_hal_synthio_note_set_waveform(synthio_note_obj_t *self, mp_obj_t wav
     self->waveform_obj = waveform_in;
 }
 
+mp_obj_t common_hal_synthio_note_get_ring_waveform_obj(synthio_note_obj_t *self) {
+    return self->ring_waveform_obj;
+}
+
+void common_hal_synthio_note_set_ring_waveform(synthio_note_obj_t *self, mp_obj_t ring_waveform_in) {
+    if (ring_waveform_in == mp_const_none) {
+        memset(&self->ring_waveform_buf, 0, sizeof(self->ring_waveform_buf));
+    } else {
+        mp_buffer_info_t bufinfo_ring_waveform;
+        synthio_synth_parse_waveform(&bufinfo_ring_waveform, ring_waveform_in);
+        self->ring_waveform_buf = bufinfo_ring_waveform;
+    }
+    self->ring_waveform_obj = ring_waveform_in;
+}
+
 void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
     if (sample_rate == self->sample_rate) {
         return;
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
index ec1f262dc5..db3495f8b3 100644
--- a/shared-module/synthio/Note.h
+++ b/shared-module/synthio/Note.h
@@ -32,13 +32,14 @@
 typedef struct synthio_note_obj {
     mp_obj_base_t base;
 
-    mp_float_t frequency;
+    mp_float_t frequency, ring_frequency;
     mp_float_t panning;
-    mp_obj_t waveform_obj, envelope_obj;
+    mp_obj_t waveform_obj, envelope_obj, ring_waveform_obj;
 
     int32_t sample_rate;
 
     int32_t frequency_scaled;
+    int32_t ring_frequency_scaled;
     int32_t amplitude_scaled;
     int32_t left_panning_scaled, right_panning_scaled;
     synthio_bend_mode_t bend_mode;
@@ -46,6 +47,7 @@ typedef struct synthio_note_obj {
     synthio_lfo_state_t tremolo_state, bend_state;
 
     mp_buffer_info_t waveform_buf;
+    mp_buffer_info_t ring_waveform_buf;
     synthio_envelope_definition_t envelope_def;
 } synthio_note_obj_t;
 
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 051fb522f7..a7b2e0c25c 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -209,6 +209,11 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
         uint32_t dds_rate;
         const int16_t *waveform = synth->waveform;
         uint32_t waveform_length = synth->waveform_length;
+
+        uint32_t ring_dds_rate = 0;
+        const int16_t *ring_waveform = NULL;
+        uint32_t ring_waveform_length = 0;
+
         if (mp_obj_is_small_int(note_obj)) {
             uint8_t note = mp_obj_get_int(note_obj);
             uint8_t octave = note / 12;
@@ -227,35 +232,97 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
                 waveform_length = note->waveform_buf.len / 2;
             }
             dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
-        }
-
-        uint32_t accum = synth->accum[chan];
-        uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-        if (dds_rate > lim / 2) {
-            // beyond nyquist, can't play note
-            continue;
-        }
-
-        // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
-        if (accum > lim) {
-            accum %= lim;
+            if (note->ring_frequency_scaled != 0 && note->ring_waveform_buf.buf) {
+                ring_waveform = note->ring_waveform_buf.buf;
+                ring_waveform_length = note->ring_waveform_buf.len / 2;
+                ring_dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)note->ring_frequency_scaled * ring_waveform_length, sample_rate);
+                uint32_t lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+                if (ring_dds_rate > lim / 2) {
+                    ring_dds_rate = 0; // can't ring at that frequency
+                }
+            }
         }
 
         int synth_chan = synth->channel_count;
-        for (uint16_t i = 0, j = 0; i < dur; i++) {
-            accum += dds_rate;
-            // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+        if (ring_dds_rate) {
+            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+            uint32_t accum = synth->accum[chan];
+
+            if (dds_rate > lim / 2) {
+                // beyond nyquist, can't play note
+                continue;
+            }
+
+            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
             if (accum > lim) {
-                accum -= lim;
+                accum %= lim;
             }
-            int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-            int16_t wi = waveform[idx];
-            for (int c = 0; c < synth_chan; c++) {
-                out_buffer32[j] += (wi * loudness[c]) / 65536;
-                j++;
+
+            int32_t ring_buffer[dur];
+            // first, fill with waveform
+            for (uint16_t i = 0; i < dur; i++) {
+                accum += dds_rate;
+                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+                if (accum > lim) {
+                    accum -= lim;
+                }
+                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+                ring_buffer[i] = waveform[idx];
             }
+            synth->accum[chan] = accum;
+
+            // now modulate by ring and accumulate
+            accum = synth->ring_accum[chan];
+            lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+
+            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+            if (accum > lim) {
+                accum %= lim;
+            }
+
+            for (uint16_t i = 0, j = 0; i < dur; i++) {
+                accum += ring_dds_rate;
+                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+                if (accum > lim) {
+                    accum -= lim;
+                }
+                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+                int16_t wi = (ring_waveform[idx] * ring_buffer[i]) / 32768;
+                for (int c = 0; c < synth_chan; c++) {
+                    out_buffer32[j] += (wi * loudness[c]) / 32768;
+                    j++;
+                }
+            }
+            synth->ring_accum[chan] = accum;
+        } else {
+            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+            uint32_t accum = synth->accum[chan];
+
+            if (dds_rate > lim / 2) {
+                // beyond nyquist, can't play note
+                continue;
+            }
+
+            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+            if (accum > lim) {
+                accum %= lim;
+            }
+
+            for (uint16_t i = 0, j = 0; i < dur; i++) {
+                accum += dds_rate;
+                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+                if (accum > lim) {
+                    accum -= lim;
+                }
+                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+                int16_t wi = waveform[idx];
+                for (int c = 0; c < synth_chan; c++) {
+                    out_buffer32[j] += (wi * loudness[c]) / 65536;
+                    j++;
+                }
+            }
+            synth->accum[chan] = accum;
         }
-        synth->accum[chan] = accum;
     }
 
     int16_t *out_buffer16 = (int16_t *)(void *)synth->buffers[synth->buffer_index];
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index f4b90a9cac..895b0cae5b 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -74,6 +74,7 @@ typedef struct synthio_synth {
     mp_obj_t envelope_obj;
     synthio_midi_span_t span;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
+    uint32_t ring_accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
     synthio_envelope_state_t envelope_state[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
 } synthio_synth_t;
 

From 89080564b4c47296fba4fd33471da2fe5d768b3a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 10:19:48 -0500
Subject: [PATCH 2377/2403] synthio: Fix release time of zero-sustain envelopes

When there's no sustain, the release step needs to be calculated from
the attack level, not the sustain level. Otherwise, contrary to intent,
this leads to the actual release taking a loooonnngg time.
---
 shared-bindings/synthio/__init__.c | 2 +-
 shared-module/synthio/__init__.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 2739d81e88..de1366717c 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -80,7 +80,7 @@ static const mp_arg_t envelope_properties[] = {
 //|
 //|         :param float attack_time: The time in seconds it takes to ramp from 0 volume to attack_volume
 //|         :param float decay_time: The time in seconds it takes to ramp from attack_volume to sustain_volume
-//|         :param float release_time: The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``
+//|         :param float release_time: The time in seconds it takes to ramp from sustain_volume to release_volume. When a note is released before it has reached the sustain phase, the release is done with the same slope indicated by ``release_time`` and ``sustain_level``. If the ``sustain_level`` is ``0.0`` then the release slope calculations use the ``attack_level`` instead.
 //|         :param float attack_level: The level, in the range ``0.0`` to ``1.0`` of the peak volume of the attack phase
 //|         :param float sustain_level: The level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase relative to the attack level
 //|         """
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index a7b2e0c25c..2bca3db439 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -89,7 +89,7 @@ void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp
 
     envelope->release_step = -convert_time_to_rate(
         sample_rate, fields[2],
-        envelope->decay_step
+        envelope->sustain_level
             ? envelope->sustain_level
             : envelope->attack_level);
 }

From ec3096373109ad556ab4885c77fcbaa377a2e760 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 10:21:56 -0500
Subject: [PATCH 2378/2403] synthio: fix a -Warray-parameter diagnostic

---
 shared-module/synthio/Note.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 87d32da031..9b72129834 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -229,7 +229,7 @@ STATIC int synthio_bend_value(synthio_note_obj_t *self, int16_t dur) {
     }
 }
 
-uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t *loudness) {
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t loudness[2]) {
     int tremolo_value = synthio_lfo_step(&self->tremolo_state, dur);
     loudness[0] = (((loudness[0] * tremolo_value) >> 15) * self->left_panning_scaled) >> 15;
     loudness[1] = (((loudness[1] * tremolo_value) >> 15) * self->right_panning_scaled) >> 15;

From cbd02b74df786d60dd5e7d2e1f2a59a176c3bcba Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 10:22:51 -0500
Subject: [PATCH 2379/2403] synthio: endorse updated test result

---
 tests/circuitpython/synthesizer_note.py.exp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index bb34c0a6c3..e8a1f1e020 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
 [-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None), Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None))
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None))
 [0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046]
-(Note(frequency=830.6076004423605, amplitude=1.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
 [0, 0, 0, 28045, 0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0]
 (-5242, 5242)
 (-10485, 10484)

From cbfb2d0f55a59d025c186cb6bdfea8ce5a8afb6c Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 May 2023 12:12:34 -0700
Subject: [PATCH 2380/2403] Add Pimoroni Inky Frame 5.7

Tweak DTCM and ITCM loading and prevent epd refresh while waiting
for autoreload.
---
 main.c                                        |   4 +-
 .../boards/pimoroni_inky_frame_5_7/board.c    | 114 ++++++++++++++++++
 .../boards/pimoroni_inky_frame_5_7/link.ld    |   1 +
 .../pimoroni_inky_frame_5_7/mpconfigboard.h   |  17 +++
 .../pimoroni_inky_frame_5_7/mpconfigboard.mk  |  26 ++++
 .../pico-sdk-configboard.h                    |   1 +
 .../boards/pimoroni_inky_frame_5_7/pins.c     |  52 ++++++++
 ports/raspberrypi/supervisor/port.c           |  17 +--
 tools/cortex-m-fault-gdb.py                   |   6 +-
 9 files changed, 224 insertions(+), 14 deletions(-)
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/link.ld
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c

diff --git a/main.c b/main.c
index ae8c339172..122f079129 100644
--- a/main.c
+++ b/main.c
@@ -666,8 +666,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
         #endif
         {
             // Refresh the ePaper display if we have one. That way it'll show an error message.
+            // Skip if we're about to autoreload. Otherwise we may delay when user code can update
+            // the display.
             #if CIRCUITPY_DISPLAYIO
-            if (time_to_epaper_refresh > 0) {
+            if (time_to_epaper_refresh > 0 && !autoreload_pending()) {
                 time_to_epaper_refresh = maybe_refresh_epaperdisplay();
             }
 
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
new file mode 100644
index 0000000000..53fd01b75a
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
@@ -0,0 +1,114 @@
+/*
+ * 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 "supervisor/board.h"
+
+#include "mpconfigboard.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-bindings/board/__init__.h"
+#include "supervisor/shared/board.h"
+
+#define DELAY 0x80
+
+// This is an SPD1656 control chip. The display is a 5.7" ACeP EInk.
+
+const uint8_t display_start_sequence[] = {
+    0x01, 4, 0x37, 0x00, 0x23, 0x23, // power setting
+    0x00, 2, 0xef, 0x08, // panel setting (PSR)
+    0x03, 1, 0x00, // PFS
+    0x06, 3, 0xc7, 0xc7, 0x1d, // booster
+    0x30, 1, 0x3c, // PLL setting
+    0x41, 1, 0x00, // TSE
+    0x50, 1, 0x37, // vcom and data interval setting
+    0x60, 1, 0x22, // tcon setting
+    0x61, 4, 0x02, 0x58, 0x01, 0xc0, // tres
+    0xe3, 1, 0xaa, // PWS
+    0x04, DELAY | 0, 0xc8, // VCM DC and delay 200ms
+};
+
+const uint8_t display_stop_sequence[] = {
+    0x02, 1, 0x00, // power off
+    0x07, 1, 0xa5 // deep sleep
+};
+
+const uint8_t refresh_sequence[] = {
+    0x12, 0x00
+};
+
+void board_init(void) {
+    displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+
+    bus->base.type = &displayio_fourwire_type;
+    common_hal_displayio_fourwire_construct(bus,
+        spi,
+        &pin_GPIO28, // EPD_DC Command or data
+        &pin_GPIO17, // EPD_CS Chip select
+        &pin_GPIO27, // EPD_RST Reset
+        1000000, // Baudrate
+        0, // Polarity
+        0); // Phase
+
+    displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
+    display->base.type = &displayio_epaperdisplay_type;
+    common_hal_displayio_epaperdisplay_construct(
+        display,
+        bus,
+        display_start_sequence, sizeof(display_start_sequence),
+        1.0, // start up time
+        display_stop_sequence, sizeof(display_stop_sequence),
+        600,  // width
+        448,  // height
+        640,  // ram_width
+        480,  // ram_height
+        0,  // colstart
+        0,  // rowstart
+        180,  // rotation
+        NO_COMMAND,  // set_column_window_command
+        NO_COMMAND,  // set_row_window_command
+        NO_COMMAND,  // set_current_column_command
+        NO_COMMAND,  // set_current_row_command
+        0x10,  // write_black_ram_command
+        false,  // black_bits_inverted
+        NO_COMMAND,  // write_color_ram_command
+        false,  // color_bits_inverted
+        0x000000,  // highlight_color
+        refresh_sequence, sizeof(refresh_sequence),
+        28.0,  // refresh_time
+        NULL,  // busy_pin
+        false,  // busy_state
+        30.0, // seconds_per_frame
+        false,  // always_toggle_chip_select
+        false, // grayscale
+        true, // acep
+        false,  // two_byte_sequence_length
+        false); // address_little_endian
+}
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/link.ld b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/link.ld
new file mode 100644
index 0000000000..e814bead4c
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/link.ld
@@ -0,0 +1 @@
+firmware_size = 1532k;
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h
new file mode 100644
index 0000000000..0817a6c594
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h
@@ -0,0 +1,17 @@
+#define MICROPY_HW_BOARD_NAME "Pimoroni Inky Frame 5.7"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_PULL (1)
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (1)
+
+#define MICROPY_HW_LED_STATUS   (&pin_GPIO6)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
+
+#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
+#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16)
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk
new file mode 100644
index 0000000000..40583e1b96
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk
@@ -0,0 +1,26 @@
+USB_VID = 0x2E8A
+USB_PID = 0x1018
+USB_PRODUCT = "Inky Frame 5.7"
+USB_MANUFACTURER = "Pimoroni"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
+
+CIRCUITPY__EVE = 1
+
+CIRCUITPY_CYW43 = 1
+CIRCUITPY_SSL = 1
+CIRCUITPY_SSL_MBEDTLS = 1
+CIRCUITPY_HASHLIB = 1
+CIRCUITPY_WEB_WORKFLOW = 1
+CIRCUITPY_MDNS = 1
+CIRCUITPY_SOCKETPOOL = 1
+CIRCUITPY_WIFI = 1
+
+CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+# Must be accompanied by a linker script change
+CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pico-sdk-configboard.h b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pico-sdk-configboard.h
new file mode 100644
index 0000000000..36da55d457
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pico-sdk-configboard.h
@@ -0,0 +1 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c
new file mode 100644
index 0000000000..4496790c6c
--- /dev/null
+++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c
@@ -0,0 +1,52 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "supervisor/board.h"
+#include "shared-module/displayio/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_HOLD_SYS_EN), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_I2C_INT), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED_ACT), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_LED_CONN), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_SWITCH_CLK), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SWITCH_LATCH), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SWITCH_OUT), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LED_A), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_LED_B), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_LED_C), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED_D), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_LED_E), MP_ROM_PTR(&pin_GPIO15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_INKY_CS), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_SCLK), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_SD_DAT1), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_SD_DAT2), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO22) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
+
+    { MP_ROM_QSTR(MP_QSTR_INKY_RES), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_INKY_DC), MP_ROM_PTR(&pin_GPIO28) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) },
+    { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_STEMMA_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].epaper_display)},
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index e45fa8837a..08a9d96c2e 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -104,22 +104,23 @@ safe_mode_t port_init(void) {
     _binary_info();
     // Set brown out.
 
+    // Load from the XIP memory space that doesn't cache. That way we don't
+    // evict anything else. The code we're loading is linked to the RAM address
+    // anyway.
+    size_t nocache = 0x03000000;
+
     // Copy all of the "tightly coupled memory" code and data to run from RAM.
     // This lets us use the 16k cache for dynamically used data and code.
     // We must do this before we try and call any of its code or load the data.
+    uint32_t *itcm_flash_copy = (uint32_t *)(((size_t)&_ld_itcm_flash_copy) | nocache);
     for (uint32_t i = 0; i < ((size_t)&_ld_itcm_size) / 4; i++) {
-        (&_ld_itcm_destination)[i] = (&_ld_itcm_flash_copy)[i];
-        // Now zero it out to evict the line from the XIP cache. Without this,
-        // it'll stay in the XIP cache anyway.
-        (&_ld_itcm_flash_copy)[i] = 0x0;
+        (&_ld_itcm_destination)[i] = itcm_flash_copy[i];
     }
 
     // Copy all of the data to run from DTCM.
+    uint32_t *dtcm_flash_copy = (uint32_t *)(((size_t)&_ld_dtcm_data_flash_copy) | nocache);
     for (uint32_t i = 0; i < ((size_t)&_ld_dtcm_data_size) / 4; i++) {
-        (&_ld_dtcm_data_destination)[i] = (&_ld_dtcm_data_flash_copy)[i];
-        // Now zero it out to evict the line from the XIP cache. Without this,
-        // it'll stay in the XIP cache anyway.
-        (&_ld_dtcm_data_flash_copy)[i] = 0x0;
+        (&_ld_dtcm_data_destination)[i] = dtcm_flash_copy[i];
     }
 
     // Clear DTCM bss.
diff --git a/tools/cortex-m-fault-gdb.py b/tools/cortex-m-fault-gdb.py
index 54a921e91f..898630ab4e 100644
--- a/tools/cortex-m-fault-gdb.py
+++ b/tools/cortex-m-fault-gdb.py
@@ -45,12 +45,8 @@ class CortexMFault(gdb.Command):
         print("vtor", hex(vtor))
 
         icsr = self._read(ICSR)
-        if (icsr & (1 << 23)) != 0:
-            print("No preempted exceptions")
-        else:
-            print("Another exception was preempted")
         vectactive = icsr & 0x1FF
-        print(hex(icsr), vectactive)
+        print("icsr", hex(icsr), vectactive)
         if vectactive != 0:
             if vectactive in EXCEPTIONS:
                 vectactive = EXCEPTIONS[vectactive]

From 23baf02399f02f9d4a9fecab2ec9cdc974aacee5 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 15:22:48 -0500
Subject: [PATCH 2381/2403] synthio: disable on a few boards where it doesn't
 fit

---
 ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk    | 1 +
 ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk | 1 +
 ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
index 2606572d8c..9a5008be85 100644
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
index 1e63476596..ed1cd2455c 100644
--- a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
index 553bf14f2e..50780cff07 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_SYNTHIO = 0

From 17df23814579c1557f4c00b58923d2fe2d906b2b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 15:23:54 -0500
Subject: [PATCH 2382/2403] synthio: doc fixes, rename BendType to BendMode

---
 shared-bindings/synthio/Note.c                   |  6 +++---
 shared-bindings/synthio/__init__.c               | 13 +++++++++----
 tests/circuitpython-manual/synthio/note/code.py  |  2 +-
 tests/circuitpython-manual/synthio/note/noise.py |  2 +-
 tests/circuitpython/synthesizer_note.py.exp      |  6 +++---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index b12e015378..dbf0f44495 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -59,7 +59,7 @@ static const mp_arg_t note_properties[] = {
 //|         tremolo_rate: float = 0.0,
 //|         bend_depth: float = 0.0,
 //|         bend_rate: float = 0.0,
-//|         bend_mode: BendMode = BendMode.VIBRATO,
+//|         bend_mode: "BendMode" = BendMode.VIBRATO,
 //|     ) -> None:
 //|         """Construct a Note object, with a frequency in Hz, and optional panning, waveform, envelope, tremolo (volume change) and bend (frequency change).
 //|
@@ -270,7 +270,7 @@ MP_PROPERTY_GETSET(synthio_note_envelope_obj,
 //|     ring_frequency: float
 //|     """The ring frequency of the note, in Hz. Zero disables.
 //|
-//|     For ring to take effect, both ring_frequency and ring_wavefor must be set."""
+//|     For ring to take effect, both ``ring_frequency`` and ``ring_waveform`` must be set."""
 STATIC mp_obj_t synthio_note_get_ring_frequency(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_float(common_hal_synthio_note_get_ring_frequency(self));
@@ -290,7 +290,7 @@ MP_PROPERTY_GETSET(synthio_note_ring_frequency_obj,
 //|     ring_waveform: Optional[ReadableBuffer]
 //|     """The ring waveform of this note. Setting the ring_waveform to a buffer of a different size resets the note's phase.
 //|
-//|     For ring to take effect, both ring_frequency and ring_wavefor must be set."""
+//|     For ring to take effect, both ``ring_frequency`` and ``ring_waveform`` must be set."""
 //|
 STATIC mp_obj_t synthio_note_get_ring_waveform(mp_obj_t self_in) {
     synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index de1366717c..87591c564e 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -289,36 +289,41 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_onevo_to_hz_obj, onevo_to_hz);
 MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, STATIC, SYNTHIO_BEND_MODE_STATIC);
 MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, VIBRATO, SYNTHIO_BEND_MODE_VIBRATO);
 MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP, SYNTHIO_BEND_MODE_SWEEP);
+MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP_IN, SYNTHIO_BEND_MODE_SWEEP_IN);
 
 //|
-//| class BendType:
+//| class BendMode:
 //|     """Controls the way the ``Note.pitch_bend_depth`` and ``Note.pitch_bend_rate`` properties are interpreted."""
 //|
 //|     STATIC: object
 //|     """The Note's pitch is modified by its ``pitch_bend_depth``. ``pitch_bend_rate`` is ignored."""
 //|
 //|     VIBRATO: object
-//|     """The Note's pitch varies by ``±pitch_bend_depth` at a rate of ``pitch_bend_rate``Hz."""
+//|     """The Note's pitch varies by ``±pitch_bend_depth`` at a rate of ``pitch_bend_rate`` Hz."""
 //|
 //|     SWEEP: object
 //|     """The Note's pitch starts at ``Note.frequency`` then sweeps up or down by ``pitch_bend_depth`` over ``1/pitch_bend_rate`` seconds."""
 //|
+//|     SWEEP_IN: object
+//|     """The Note's pitch sweep is the reverse of ``SWEEP`` mode, starting at the bent pitch and arriving at the tuned pitch."""
+//|
 MAKE_ENUM_MAP(synthio_bend_mode) {
     MAKE_ENUM_MAP_ENTRY(bend_mode, STATIC),
     MAKE_ENUM_MAP_ENTRY(bend_mode, VIBRATO),
     MAKE_ENUM_MAP_ENTRY(bend_mode, SWEEP),
+    MAKE_ENUM_MAP_ENTRY(bend_mode, SWEEP_IN),
 };
 
 STATIC MP_DEFINE_CONST_DICT(synthio_bend_mode_locals_dict, synthio_bend_mode_locals_table);
 
 MAKE_PRINTER(synthio, synthio_bend_mode);
 
-MAKE_ENUM_TYPE(synthio, BendType, synthio_bend_mode);
+MAKE_ENUM_TYPE(synthio, BendMode, synthio_bend_mode);
 
 
 STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) },
-    { MP_ROM_QSTR(MP_QSTR_BendType), MP_ROM_PTR(&synthio_bend_mode_type) },
+    { MP_ROM_QSTR(MP_QSTR_BendMode), MP_ROM_PTR(&synthio_bend_mode_type) },
     { MP_ROM_QSTR(MP_QSTR_MidiTrack), MP_ROM_PTR(&synthio_miditrack_type) },
     { MP_ROM_QSTR(MP_QSTR_Note), MP_ROM_PTR(&synthio_note_type) },
     { MP_ROM_QSTR(MP_QSTR_Synthesizer), MP_ROM_PTR(&synthio_synthesizer_type) },
diff --git a/tests/circuitpython-manual/synthio/note/code.py b/tests/circuitpython-manual/synthio/note/code.py
index 6a6a9556dc..43f5dfb8a5 100644
--- a/tests/circuitpython-manual/synthio/note/code.py
+++ b/tests/circuitpython-manual/synthio/note/code.py
@@ -116,7 +116,7 @@ def synthesize6(synth):
         tremolo_rate=1.5,
         bend_depth=-5 / 12,
         bend_rate=1 / 2,
-        bend_mode=synthio.BendType.SWEEP,
+        bend_mode=synthio.BendMode.SWEEP,
         waveform=sine,
         envelope=envelope,
     )
diff --git a/tests/circuitpython-manual/synthio/note/noise.py b/tests/circuitpython-manual/synthio/note/noise.py
index 53257966cb..b31658b818 100644
--- a/tests/circuitpython-manual/synthio/note/noise.py
+++ b/tests/circuitpython-manual/synthio/note/noise.py
@@ -37,7 +37,7 @@ def synthesize(synth):
             frequency=synthio.midi_to_hz(1 + i),
             waveform=noise,
             envelope=envelope,
-            bend_mode=synthio.BendType.SWEEP,
+            bend_mode=synthio.BendMode.SWEEP,
             bend_depth=random.choice((-1, 1)),
             bend_rate=randf(4, 12),
         )
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index e8a1f1e020..8c224982a2 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
 [-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None))
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None))
 [0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendType.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
 [0, 0, 0, 28045, 0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0]
 (-5242, 5242)
 (-10485, 10484)

From d99b0634f77d2747190475b780ce315d02d04adb Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Thu, 11 May 2023 16:57:07 -0400
Subject: [PATCH 2383/2403] Report SPI frequency accurately on Espressif

---
 ports/espressif/common-hal/busio/SPI.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
index da9170a5b0..5218fdbf9d 100644
--- a/ports/espressif/common-hal/busio/SPI.c
+++ b/ports/espressif/common-hal/busio/SPI.c
@@ -56,8 +56,10 @@ void spi_reset(void) {
 
 static void set_spi_config(busio_spi_obj_t *self,
     uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
+    // 128 is a 50% duty cycle.
+    const int closest_clock = spi_get_actual_clock(APB_CLK_FREQ, baudrate, 128);
     const spi_device_interface_config_t device_config = {
-        .clock_speed_hz = baudrate,
+        .clock_speed_hz = closest_clock,
         .mode = phase | (polarity << 1),
         .spics_io_num = -1, // No CS pin
         .queue_size = MAX_SPI_TRANSACTIONS,
@@ -67,7 +69,7 @@ static void set_spi_config(busio_spi_obj_t *self,
     if (result != ESP_OK) {
         mp_raise_RuntimeError(translate("SPI configuration failed"));
     }
-    self->baudrate = baudrate;
+    self->baudrate = closest_clock;
     self->polarity = polarity;
     self->phase = phase;
     self->bits = bits;

From 9c45551880ed2333f033c7cef8184d7c572e612b Mon Sep 17 00:00:00 2001
From: Ted Hess 
Date: Thu, 11 May 2023 12:33:01 -0400
Subject: [PATCH 2384/2403] Do not enable web_workflow background callbacks if
 wifi is not enabled/connected

---
 supervisor/shared/web_workflow/web_workflow.c | 11 +++++-----
 supervisor/shared/web_workflow/web_workflow.h |  2 +-
 supervisor/shared/workflow.c                  | 21 +++++++++++++------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
index 648af72ccb..3e61eee360 100644
--- a/supervisor/shared/web_workflow/web_workflow.c
+++ b/supervisor/shared/web_workflow/web_workflow.c
@@ -258,7 +258,7 @@ void supervisor_web_workflow_status(void) {
 }
 #endif
 
-void supervisor_start_web_workflow(void) {
+bool supervisor_start_web_workflow(void) {
     #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_OS_GETENV
 
     // Skip starting the workflow if we're not starting from power on or reset.
@@ -268,7 +268,7 @@ void supervisor_start_web_workflow(void) {
         reset_reason != RESET_REASON_DEEP_SLEEP_ALARM &&
         reset_reason != RESET_REASON_UNKNOWN &&
         reset_reason != RESET_REASON_SOFTWARE) {
-        return;
+        return false;
     }
 
     char ssid[33];
@@ -276,7 +276,7 @@ void supervisor_start_web_workflow(void) {
 
     os_getenv_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
     if (result != GETENV_OK) {
-        return;
+        return false;
     }
 
     result = common_hal_os_getenv_str("CIRCUITPY_WIFI_PASSWORD", password, sizeof(password));
@@ -284,7 +284,7 @@ void supervisor_start_web_workflow(void) {
         // if password is unspecified, assume an open network
         password[0] = '\0';
     } else if (result != GETENV_OK) {
-        return;
+        return false;
     }
 
     result = common_hal_os_getenv_str("CIRCUITPY_WEB_INSTANCE_NAME", web_instance_name, sizeof(web_instance_name));
@@ -309,7 +309,7 @@ void supervisor_start_web_workflow(void) {
 
     if (_wifi_status != WIFI_RADIO_ERROR_NONE) {
         common_hal_wifi_radio_set_enabled(&common_hal_wifi_radio_obj, false);
-        return;
+        return false;
     }
 
     // (leaves new_port unchanged on any failure)
@@ -363,6 +363,7 @@ void supervisor_start_web_workflow(void) {
     // Wake polling thread (maybe)
     socketpool_socket_poll_resume();
     #endif
+    return true;
 }
 
 void web_workflow_send_raw(socketpool_socket_obj_t *socket, const uint8_t *buf, int len) {
diff --git a/supervisor/shared/web_workflow/web_workflow.h b/supervisor/shared/web_workflow/web_workflow.h
index 85205b04d6..c325c0ff5d 100644
--- a/supervisor/shared/web_workflow/web_workflow.h
+++ b/supervisor/shared/web_workflow/web_workflow.h
@@ -36,7 +36,7 @@
 void supervisor_web_workflow_background(void *data);
 bool supervisor_web_workflow_status_dirty(void);
 void supervisor_web_workflow_status(void);
-void supervisor_start_web_workflow(void);
+bool supervisor_start_web_workflow(void);
 void supervisor_stop_web_workflow(void);
 
 // Share the MDNS object with user code.
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
index 64f1021df2..aebdcc821a 100644
--- a/supervisor/shared/workflow.c
+++ b/supervisor/shared/workflow.c
@@ -45,8 +45,9 @@
 
 #if CIRCUITPY_WEB_WORKFLOW
 #include "supervisor/shared/web_workflow/web_workflow.h"
-#endif
 static background_callback_t workflow_background_cb = {NULL, NULL};
+#endif
+
 
 // Called during a VM reset. Doesn't actually reset things.
 void supervisor_workflow_reset(void) {
@@ -56,17 +57,23 @@ void supervisor_workflow_reset(void) {
 
     #if CIRCUITPY_WEB_WORKFLOW
     if (workflow_background_cb.fun) {
-        supervisor_start_web_workflow();
-        supervisor_workflow_request_background();
+        if (supervisor_start_web_workflow()) {
+            supervisor_workflow_request_background();
+        }
     }
     #endif
 }
 
 void supervisor_workflow_request_background(void) {
+    #if CIRCUITPY_WEB_WORKFLOW
     if (workflow_background_cb.fun) {
         workflow_background_cb.data = NULL;
         background_callback_add_core(&workflow_background_cb);
+    } else {
+        // Unblock polling thread if necessary
+        socketpool_socket_poll_resume();
     }
+    #endif
 }
 
 // Return true if host has completed connection to us (such as USB enumeration).
@@ -98,9 +105,11 @@ void supervisor_workflow_start(void) {
     #endif
 
     #if CIRCUITPY_WEB_WORKFLOW
-    supervisor_start_web_workflow();
-    memset(&workflow_background_cb, 0, sizeof(workflow_background_cb));
-    workflow_background_cb.fun = supervisor_web_workflow_background;
+    if (supervisor_start_web_workflow()) {
+        // Enable background callbacks if web_workflow startup successful
+        memset(&workflow_background_cb, 0, sizeof(workflow_background_cb));
+        workflow_background_cb.fun = supervisor_web_workflow_background;
+    }
     #endif
 
 }

From 53e13f15a3f4a0466be84dbffabdf82bd1ee37ac Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 16:53:40 -0500
Subject: [PATCH 2385/2403] synthio: Finish ading SWEEP_IN

---
 shared-bindings/synthio/__init__.h |  2 +-
 shared-module/synthio/Note.c       |  2 ++
 shared-module/synthio/__init__.c   | 26 ++++++++++++++++++--------
 shared-module/synthio/__init__.h   |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/shared-bindings/synthio/__init__.h b/shared-bindings/synthio/__init__.h
index d09fab815e..6f3aed0124 100644
--- a/shared-bindings/synthio/__init__.h
+++ b/shared-bindings/synthio/__init__.h
@@ -30,7 +30,7 @@
 #include "py/enum.h"
 
 typedef enum synthio_bend_mode_e {
-    SYNTHIO_BEND_MODE_STATIC, SYNTHIO_BEND_MODE_VIBRATO, SYNTHIO_BEND_MODE_SWEEP
+    SYNTHIO_BEND_MODE_STATIC, SYNTHIO_BEND_MODE_VIBRATO, SYNTHIO_BEND_MODE_SWEEP, SYNTHIO_BEND_MODE_SWEEP_IN
 } synthio_bend_mode_t;
 
 extern const cp_enum_obj_t bend_mode_VIBRATO_obj;
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 9b72129834..89de8bce16 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -224,6 +224,8 @@ STATIC int synthio_bend_value(synthio_note_obj_t *self, int16_t dur) {
             return synthio_lfo_step(&self->bend_state, dur);
         case SYNTHIO_BEND_MODE_SWEEP:
             return synthio_sweep_step(&self->bend_state, dur);
+        case SYNTHIO_BEND_MODE_SWEEP_IN:
+            return synthio_sweep_in_step(&self->bend_state, dur);
         default:
             return 32768;
     }
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 2bca3db439..36ca709541 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -480,25 +480,35 @@ void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *desc
     state->dds = synthio_frequency_convert_float_to_dds(descr->frequency * 65536, sample_rate);
 }
 
-int synthio_sweep_step(synthio_lfo_state_t *state, uint16_t dur) {
+STATIC int synthio_lfo_step_common(synthio_lfo_state_t *state, uint16_t dur) {
     uint32_t phase = state->phase;
     uint16_t whole_phase = phase >> 16;
 
     // advance the phase accumulator
     state->phase = phase + state->dds * dur;
-    if (state->phase < phase) {
+
+    return whole_phase;
+}
+STATIC int synthio_lfo_sweep_common(synthio_lfo_state_t *state, uint16_t dur) {
+    uint16_t whole_phase = synthio_lfo_step_common(state, dur);
+    if (state->phase < state->dds) {
         state->phase = 0xffffffff;
     }
+    return whole_phase;
+}
+
+int synthio_sweep_step(synthio_lfo_state_t *state, uint16_t dur) {
+    uint16_t whole_phase = synthio_lfo_sweep_common(state, dur);
+    return (state->amplitude_scaled * whole_phase) / 65536 + state->offset_scaled;
+}
+
+int synthio_sweep_in_step(synthio_lfo_state_t *state, uint16_t dur) {
+    uint16_t whole_phase = 65535 - synthio_lfo_sweep_common(state, dur);
     return (state->amplitude_scaled * whole_phase) / 65536 + state->offset_scaled;
 }
 
 int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur) {
-    uint32_t phase = state->phase;
-    uint16_t whole_phase = phase >> 16;
-
-    // advance the phase accumulator
-    state->phase = phase + state->dds * dur;
-
+    uint16_t whole_phase = synthio_lfo_step_common(state, dur);
     // create a triangle wave, it's quick and easy
     int v;
     if (whole_phase < 16384) { // ramp from 0 to amplitude
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 895b0cae5b..c68fb00f97 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -111,3 +111,4 @@ uint32_t synthio_frequency_convert_scaled_to_dds(uint64_t frequency_scaled, int3
 void synthio_lfo_set(synthio_lfo_state_t *state, const synthio_lfo_descr_t *descr, uint32_t sample_rate);
 int synthio_lfo_step(synthio_lfo_state_t *state, uint16_t dur);
 int synthio_sweep_step(synthio_lfo_state_t *state, uint16_t dur);
+int synthio_sweep_in_step(synthio_lfo_state_t *state, uint16_t dur);

From a56174dc101236f6c869c43df24a06cd00a24fa8 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft 
Date: Thu, 11 May 2023 15:02:56 -0700
Subject: [PATCH 2386/2403] Correct pad count.

This prevents running into the pins that cannot be reset. On 1011
it was off by one pin that isn't attached to the package. So,
having the USB pins forbidden prevented resetting to a NULL address.

Fixes #7952
---
 ports/mimxrt10xx/boards/imxrt1010_evk/board.c       |  3 ---
 ports/mimxrt10xx/boards/imxrt1015_evk/board.c       |  3 ---
 ports/mimxrt10xx/boards/imxrt1020_evk/board.c       |  4 ----
 ports/mimxrt10xx/boards/imxrt1040_evk/board.c       |  3 ---
 ports/mimxrt10xx/boards/imxrt1050_evkb/board.c      |  4 ++--
 ports/mimxrt10xx/boards/imxrt1060_evk/board.c       |  4 ++--
 ports/mimxrt10xx/common-hal/microcontroller/Pin.c   | 13 +++++++++----
 .../peripherals/mimxrt10xx/MIMXRT1011/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1015/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1021/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1042/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1052/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1062/pins.h        |  4 +++-
 .../peripherals/mimxrt10xx/MIMXRT1176/pins.h        |  4 +++-
 ports/mimxrt10xx/tools/gen_peripherals_data.py      |  6 +++++-
 15 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
index c5237c8a8e..9c7f4a256f 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -41,9 +41,6 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_08,
     &pin_GPIO_SD_07,
     &pin_GPIO_SD_06,
-    // USB Pins
-    &pin_USB_OTG1_DN,
-    &pin_USB_OTG1_DP,
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/board.c b/ports/mimxrt10xx/boards/imxrt1015_evk/board.c
index 568945a3eb..06b3dd22d5 100644
--- a/ports/mimxrt10xx/boards/imxrt1015_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1015_evk/board.c
@@ -40,9 +40,6 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_09,
     &pin_GPIO_SD_B1_10,
     &pin_GPIO_SD_B1_11,
-    // USB Pins
-    &pin_USB_OTG1_DN,
-    &pin_USB_OTG1_DP,
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
index f814afd956..540e416525 100644
--- a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -42,10 +42,6 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_09,
     &pin_GPIO_SD_B1_10,
     &pin_GPIO_SD_B1_11,
-
-    // USB Pins
-    &pin_USB_OTG1_DN,
-    &pin_USB_OTG1_DP,
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/board.c b/ports/mimxrt10xx/boards/imxrt1040_evk/board.c
index 0e97d87b60..6ab54be8a6 100644
--- a/ports/mimxrt10xx/boards/imxrt1040_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1040_evk/board.c
@@ -44,9 +44,6 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_10,
     &pin_GPIO_SD_B1_11,
 
-    &pin_USB_OTG1_DN,
-    &pin_USB_OTG1_DP,
-
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c b/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
index 8a34fc4210..6e31888c53 100644
--- a/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/board.c
@@ -45,8 +45,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    &pin_GPIO_AD_B0_01,
-    &pin_GPIO_AD_B0_03,
+    &pin_GPIO_AD_B0_01, // ID Pin
+    &pin_GPIO_AD_B0_03, // OC/Fault Pin
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
index f27f549c64..4a2e6e0913 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
@@ -50,8 +50,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    &pin_GPIO_AD_B0_01,
-    &pin_GPIO_AD_B0_03,
+    &pin_GPIO_AD_B0_01, // ID Pin
+    &pin_GPIO_AD_B0_03, // OC/Fault Pin
     NULL,                       // Must end in NULL.
 };
 
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
index 9f9e306dd9..2cd53e9560 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -31,8 +31,8 @@
 
 #include "py/gc.h"
 
-STATIC bool claimed_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
-STATIC bool never_reset_pins[IOMUXC_SW_PAD_CTL_PAD_COUNT];
+STATIC bool claimed_pins[PAD_COUNT];
+STATIC bool never_reset_pins[PAD_COUNT];
 
 // Default is that no pins are forbidden to reset.
 MP_WEAK const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
@@ -55,10 +55,10 @@ STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) {
 // and GPIO port and number, used to store claimed and reset tagging. The two number
 // systems are not related and one cannot determine the other without a pin object
 void reset_all_pins(void) {
-    for (uint8_t i = 0; i < IOMUXC_SW_PAD_CTL_PAD_COUNT; i++) {
+    for (uint8_t i = 0; i < PAD_COUNT; i++) {
         claimed_pins[i] = never_reset_pins[i];
     }
-    for (uint8_t i = 0; i < IOMUXC_SW_PAD_CTL_PAD_COUNT; i++) {
+    for (uint8_t i = 0; i < PAD_COUNT; i++) {
         mcu_pin_obj_t *pin = mcu_pin_globals.map.table[i].value;
         if (never_reset_pins[pin->mux_idx]) {
             continue;
@@ -90,6 +90,11 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
     disable_pin_change_interrupt(pin);
     never_reset_pins[pin->mux_idx] = false;
     claimed_pins[pin->mux_idx] = false;
+
+    // This should never be true, but protect against it anyway.
+    if (pin->mux_reg == 0) {
+        return;
+    }
     *(uint32_t *)pin->mux_reg = pin->mux_reset;
     *(uint32_t *)pin->cfg_reg = pin->pad_reset;
 }
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
index 8e901f0980..2b63b84ecb 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (43)
+#define PIN_COUNT (PAD_COUNT + 2)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
index 8655bf872f..9c66fc82f3 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (56)
+#define PIN_COUNT (PAD_COUNT + 2)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
index b4f991a879..5d4f992e89 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (93)
+#define PIN_COUNT (PAD_COUNT + 2)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
index f666962907..c62c0ecaa0 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 2)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (112)
+#define PIN_COUNT (PAD_COUNT + 2)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
index 4ee8d2ae28..e02f1208bd 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 4)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (124)
+#define PIN_COUNT (PAD_COUNT + 4)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
index 6f746f3b4c..135d9f9565 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 4)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (124)
+#define PIN_COUNT (PAD_COUNT + 4)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
index 35be6dd36e..786b0a248c 100644
--- a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
+++ b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/pins.h
@@ -40,5 +40,7 @@
 #include "pin_names.h"
 #undef FORMAT_PIN
 
-#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + 0)
+// Pads can be reset. Other pins like USB cannot be.
+#define PAD_COUNT (145)
+#define PIN_COUNT (PAD_COUNT + 0)
 extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];
diff --git a/ports/mimxrt10xx/tools/gen_peripherals_data.py b/ports/mimxrt10xx/tools/gen_peripherals_data.py
index 4193ae7228..d87e9022b2 100644
--- a/ports/mimxrt10xx/tools/gen_peripherals_data.py
+++ b/ports/mimxrt10xx/tools/gen_peripherals_data.py
@@ -190,6 +190,7 @@ for device in devices:
             split_pin = name.split("_")
             pin_name = "_".join(split_pin[4:])
             if pin_name not in all_pins:
+                print("skip", pin_name)
                 continue
             gpio_base = "_".join(split_pin[4:-1])
 
@@ -278,7 +279,10 @@ for device in devices:
     pins_c.append("")
 
     pins_h.append("")
-    pins_h.append(f"#define PIN_COUNT (IOMUXC_SW_PAD_CTL_PAD_COUNT + {len(usb_pins)})")
+
+    pins_h.append("// Pads can be reset. Other pins like USB cannot be.")
+    pins_h.append(f"#define PAD_COUNT ({pin_number})")
+    pins_h.append(f"#define PIN_COUNT (PAD_COUNT + {len(usb_pins)})")
     pins_h.append(f"extern const mcu_pin_obj_t mcu_pin_list[PIN_COUNT];")
     pins_h.append("")
 

From d3eda0ad5299c4f26beafd2c683cba13f1e34d1a Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 17:32:42 -0500
Subject: [PATCH 2387/2403] synthio: fix a typing error

---
 shared-bindings/synthio/__init__.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index 87591c564e..f776dab251 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -295,16 +295,16 @@ MAKE_ENUM_VALUE(synthio_bend_mode_type, bend_mode, SWEEP_IN, SYNTHIO_BEND_MODE_S
 //| class BendMode:
 //|     """Controls the way the ``Note.pitch_bend_depth`` and ``Note.pitch_bend_rate`` properties are interpreted."""
 //|
-//|     STATIC: object
+//|     STATIC: "BendMode"
 //|     """The Note's pitch is modified by its ``pitch_bend_depth``. ``pitch_bend_rate`` is ignored."""
 //|
-//|     VIBRATO: object
+//|     VIBRATO: "BendMode"
 //|     """The Note's pitch varies by ``±pitch_bend_depth`` at a rate of ``pitch_bend_rate`` Hz."""
 //|
-//|     SWEEP: object
+//|     SWEEP: "BendMode"
 //|     """The Note's pitch starts at ``Note.frequency`` then sweeps up or down by ``pitch_bend_depth`` over ``1/pitch_bend_rate`` seconds."""
 //|
-//|     SWEEP_IN: object
+//|     SWEEP_IN: "BendMode"
 //|     """The Note's pitch sweep is the reverse of ``SWEEP`` mode, starting at the bent pitch and arriving at the tuned pitch."""
 //|
 MAKE_ENUM_MAP(synthio_bend_mode) {

From 33fb771b76bfbc2897fb0677d3c6271446329d64 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 17:56:11 -0500
Subject: [PATCH 2388/2403] synthio: Add `filter` argument to Synthesizer
 constructor

as step 1/n of adding FIR filtering
---
 shared-bindings/synthio/MidiTrack.c   |  7 ++-----
 shared-bindings/synthio/MidiTrack.h   |  5 ++---
 shared-bindings/synthio/Synthesizer.c | 11 +++++------
 shared-bindings/synthio/Synthesizer.h |  4 ++--
 shared-bindings/synthio/__init__.c    |  7 ++-----
 shared-module/synthio/MidiTrack.c     |  5 ++---
 shared-module/synthio/Synthesizer.c   |  6 +++---
 shared-module/synthio/__init__.c      | 20 ++++++++++++--------
 shared-module/synthio/__init__.h      |  7 ++++---
 9 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c
index 31d8cbc7f0..2d0d2ab69f 100644
--- a/shared-bindings/synthio/MidiTrack.c
+++ b/shared-bindings/synthio/MidiTrack.c
@@ -88,9 +88,6 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
 
-    mp_buffer_info_t bufinfo_waveform;
-    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
-
     synthio_miditrack_obj_t *self = m_new_obj(synthio_miditrack_obj_t);
     self->base.type = &synthio_miditrack_type;
 
@@ -98,8 +95,8 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a
         (uint8_t *)bufinfo.buf, bufinfo.len,
         args[ARG_tempo].u_int,
         args[ARG_sample_rate].u_int,
-        bufinfo_waveform.buf,
-        bufinfo_waveform.len / 2,
+        args[ARG_waveform].u_obj,
+        mp_const_none,
         args[ARG_envelope].u_obj
         );
 
diff --git a/shared-bindings/synthio/MidiTrack.h b/shared-bindings/synthio/MidiTrack.h
index 1a76ed36f4..5c6bce46cd 100644
--- a/shared-bindings/synthio/MidiTrack.h
+++ b/shared-bindings/synthio/MidiTrack.h
@@ -27,12 +27,11 @@
 #pragma once
 
 #include "shared-module/synthio/MidiTrack.h"
+#include "py/obj.h"
 
 extern const mp_obj_type_t synthio_miditrack_type;
 
-void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
-    const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate, const int16_t *waveform, uint16_t waveform_len,
-    mp_obj_t envelope);
+void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self, const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate, mp_obj_t waveform_obj, mp_obj_t filter_obj, mp_obj_t envelope_obj);
 
 void common_hal_synthio_miditrack_deinit(synthio_miditrack_obj_t *self);
 bool common_hal_synthio_miditrack_deinited(synthio_miditrack_obj_t *self);
diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c
index e7e442d90f..67707a763d 100644
--- a/shared-bindings/synthio/Synthesizer.c
+++ b/shared-bindings/synthio/Synthesizer.c
@@ -59,30 +59,29 @@
 //|         :param int sample_rate: The desired playback sample rate; higher sample rate requires more memory
 //|         :param int channel_count: The number of output channels (1=mono, 2=stereo)
 //|         :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
+//|         :param ReadableBuffer filter: Coefficients of an FIR filter to apply to notes with ``filter=True``. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit)
 //|         :param Optional[Envelope] envelope: An object that defines the loudness of a note over time. The default envelope, `None` provides no ramping, voices turn instantly on and off.
 //|         """
 STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_sample_rate, ARG_channel_count, ARG_waveform, ARG_envelope };
+    enum { ARG_sample_rate, ARG_channel_count, ARG_waveform, ARG_envelope, ARG_filter };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} },
         { MP_QSTR_channel_count, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
         { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
         { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
+        { MP_QSTR_filter, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    mp_buffer_info_t bufinfo_waveform;
-    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
-
     synthio_synthesizer_obj_t *self = m_new_obj(synthio_synthesizer_obj_t);
     self->base.type = &synthio_synthesizer_type;
 
     common_hal_synthio_synthesizer_construct(self,
         args[ARG_sample_rate].u_int,
         args[ARG_channel_count].u_int,
-        bufinfo_waveform.buf,
-        bufinfo_waveform.len / 2,
+        args[ARG_waveform].u_obj,
+        args[ARG_filter].u_obj,
         args[ARG_envelope].u_obj);
 
     return MP_OBJ_FROM_PTR(self);
diff --git a/shared-bindings/synthio/Synthesizer.h b/shared-bindings/synthio/Synthesizer.h
index 4568dafdaf..d8000681b8 100644
--- a/shared-bindings/synthio/Synthesizer.h
+++ b/shared-bindings/synthio/Synthesizer.h
@@ -32,8 +32,8 @@
 extern const mp_obj_type_t synthio_synthesizer_type;
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
-    mp_obj_t envelope);
+    uint32_t sample_rate, int channel_count, mp_obj_t waveform_obj, mp_obj_t filter_obj,
+    mp_obj_t envelope_obj);
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self);
 bool common_hal_synthio_synthesizer_deinited(synthio_synthesizer_obj_t *self);
 uint32_t common_hal_synthio_synthesizer_get_sample_rate(synthio_synthesizer_obj_t *self);
diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c
index f776dab251..132b254942 100644
--- a/shared-bindings/synthio/__init__.c
+++ b/shared-bindings/synthio/__init__.c
@@ -207,10 +207,6 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     }
     pyb_file_obj_t *file = MP_OBJ_TO_PTR(args[ARG_file].u_obj);
 
-
-    mp_buffer_info_t bufinfo_waveform;
-    synthio_synth_parse_waveform(&bufinfo_waveform, args[ARG_waveform].u_obj);
-
     uint8_t chunk_header[14];
     f_rewind(&file->fp);
     UINT bytes_read;
@@ -250,7 +246,8 @@ STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_ma
     result->base.type = &synthio_miditrack_type;
 
     common_hal_synthio_miditrack_construct(result, buffer, track_size,
-        tempo, args[ARG_sample_rate].u_int, bufinfo_waveform.buf, bufinfo_waveform.len / 2,
+        tempo, args[ARG_sample_rate].u_int, args[ARG_waveform].u_obj,
+        mp_const_none,
         args[ARG_envelope].u_obj
         );
 
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index a24071800b..50c7151811 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -116,14 +116,13 @@ STATIC void start_parse(synthio_miditrack_obj_t *self) {
 
 void common_hal_synthio_miditrack_construct(synthio_miditrack_obj_t *self,
     const uint8_t *buffer, uint32_t len, uint32_t tempo, uint32_t sample_rate,
-    const int16_t *waveform, uint16_t waveform_length,
-    mp_obj_t envelope) {
+    mp_obj_t waveform_obj, mp_obj_t filter_obj, mp_obj_t envelope_obj) {
 
     self->tempo = tempo;
     self->track.buf = (void *)buffer;
     self->track.len = len;
 
-    synthio_synth_init(&self->synth, sample_rate, 1, waveform, waveform_length, envelope);
+    synthio_synth_init(&self->synth, sample_rate, 1, waveform_obj, mp_const_none, envelope_obj);
 
     start_parse(self);
 }
diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index 42e234fef1..c18c067976 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -32,10 +32,10 @@
 
 
 void common_hal_synthio_synthesizer_construct(synthio_synthesizer_obj_t *self,
-    uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
-    mp_obj_t envelope) {
+    uint32_t sample_rate, int channel_count, mp_obj_t waveform_obj, mp_obj_t filter_obj,
+    mp_obj_t envelope_obj) {
 
-    synthio_synth_init(&self->synth, sample_rate, channel_count, waveform, waveform_length, envelope);
+    synthio_synth_init(&self->synth, sample_rate, channel_count, waveform_obj, filter_obj, envelope_obj);
 }
 
 void common_hal_synthio_synthesizer_deinit(synthio_synthesizer_obj_t *self) {
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 36ca709541..71b8250034 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -373,15 +373,16 @@ mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth) {
     return synth->envelope_obj;
 }
 
-void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length, mp_obj_t envelope_obj) {
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, mp_obj_t waveform_obj, mp_obj_t filter_obj, mp_obj_t envelope_obj) {
     mp_arg_validate_int_range(channel_count, 1, 2, MP_QSTR_channel_count);
     synth->buffer_length = SYNTHIO_MAX_DUR * SYNTHIO_BYTES_PER_SAMPLE * channel_count;
     synth->buffers[0] = m_malloc(synth->buffer_length, false);
     synth->buffers[1] = m_malloc(synth->buffer_length, false);
     synth->channel_count = channel_count;
     synth->other_channel = -1;
-    synth->waveform = waveform;
-    synth->waveform_length = waveform_length;
+    synth->waveform_obj = waveform_obj;
+    synthio_synth_parse_waveform(&synth->waveform_bufinfo, waveform_obj);
+    synthio_synth_parse_filter(&synth->filter_bufinfo, filter_obj);
     synth->sample_rate = sample_rate;
     synthio_synth_envelope_set(synth, envelope_obj);
 
@@ -402,21 +403,24 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan
     }
 }
 
-STATIC bool parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what) {
+STATIC void parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what, mp_int_t max_len) {
     if (o != mp_const_none) {
         mp_get_buffer_raise(o, bufinfo, MP_BUFFER_READ);
         if (bufinfo->typecode != 'h') {
             mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), what);
         }
-        mp_arg_validate_length_range(bufinfo->len / 2, 2, 1024, what);
-        return true;
+        mp_arg_validate_length_range(bufinfo->len / 2, 2, max_len, what);
     }
-    return false;
 }
 
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj) {
     *bufinfo_waveform = ((mp_buffer_info_t) { .buf = (void *)square_wave, .len = 4 });
-    parse_common(bufinfo_waveform, waveform_obj, MP_QSTR_waveform);
+    parse_common(bufinfo_waveform, waveform_obj, MP_QSTR_waveform, 16384);
+}
+
+void synthio_synth_parse_filter(mp_buffer_info_t *bufinfo_filter, mp_obj_t filter_obj) {
+    *bufinfo_filter = ((mp_buffer_info_t) { .buf = NULL, .len = 0 });
+    parse_common(bufinfo_filter, filter_obj, MP_QSTR_filter, 128);
 }
 
 STATIC int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) {
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index c68fb00f97..6241771d33 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -70,8 +70,9 @@ typedef struct synthio_synth {
     uint16_t last_buffer_length;
     uint8_t other_channel, buffer_index, other_buffer_index;
     uint16_t waveform_length;
+    mp_buffer_info_t waveform_bufinfo, filter_bufinfo;
     synthio_envelope_definition_t global_envelope_definition;
-    mp_obj_t envelope_obj;
+    mp_obj_t waveform_obj, filter_obj, envelope_obj;
     synthio_midi_span_t span;
     uint32_t accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
     uint32_t ring_accum[CIRCUITPY_SYNTHIO_MAX_CHANNELS];
@@ -91,12 +92,12 @@ typedef struct {
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **buffer, uint32_t *buffer_length, uint8_t channel);
 void synthio_synth_deinit(synthio_synth_t *synth);
 bool synthio_synth_deinited(synthio_synth_t *synth);
-void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, const int16_t *waveform, uint16_t waveform_length,
-    mp_obj_t envelope);
+void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, mp_obj_t waveform_obj, mp_obj_t filter_obj, mp_obj_t envelope);
 void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing);
 void synthio_synth_reset_buffer(synthio_synth_t *synth, bool single_channel_output, uint8_t channel);
 void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t waveform_obj);
+void synthio_synth_parse_filter(mp_buffer_info_t *bufinfo_filter, mp_obj_t filter_obj);
 void synthio_synth_parse_envelope(uint16_t *envelope_sustain_index, mp_buffer_info_t *bufinfo_envelope, mp_obj_t envelope_obj, mp_obj_t envelope_hold_obj);
 
 bool synthio_span_change_note(synthio_synth_t *synth, mp_obj_t old_note, mp_obj_t new_note);

From 7845a1b13b21b0e2f0f8b61df48ddccfa7f3b9d8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 17:58:09 -0500
Subject: [PATCH 2389/2403] synthio: Add `filter` boolean property to Note
 objects

---
 shared-bindings/synthio/Note.c | 20 ++++++++++++++++++++
 shared-bindings/synthio/Note.h |  3 +++
 shared-module/synthio/Note.c   |  8 ++++++++
 shared-module/synthio/Note.h   |  1 +
 4 files changed, 32 insertions(+)

diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c
index dbf0f44495..f058b16d2e 100644
--- a/shared-bindings/synthio/Note.c
+++ b/shared-bindings/synthio/Note.c
@@ -44,6 +44,7 @@ static const mp_arg_t note_properties[] = {
     { MP_QSTR_bend_mode, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = (mp_obj_t)MP_ROM_PTR(&bend_mode_VIBRATO_obj) } },
     { MP_QSTR_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
     { MP_QSTR_envelope, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
+    { MP_QSTR_filter, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(1) } },
     { MP_QSTR_ring_frequency, MP_ARG_OBJ, {.u_obj = NULL } },
     { MP_QSTR_ring_waveform, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_NONE } },
 };
@@ -102,6 +103,24 @@ MP_PROPERTY_GETSET(synthio_note_frequency_obj,
     (mp_obj_t)&synthio_note_get_frequency_obj,
     (mp_obj_t)&synthio_note_set_frequency_obj);
 
+//|     filter: bool
+//|     """True if the note should be processed via the synthesizer's FIR filter."""
+STATIC mp_obj_t synthio_note_get_filter(mp_obj_t self_in) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(common_hal_synthio_note_get_filter(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_filter_obj, synthio_note_get_filter);
+
+STATIC mp_obj_t synthio_note_set_filter(mp_obj_t self_in, mp_obj_t arg) {
+    synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_synthio_note_set_filter(self, mp_obj_is_true(arg));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(synthio_note_set_filter_obj, synthio_note_set_filter);
+MP_PROPERTY_GETSET(synthio_note_filter_obj,
+    (mp_obj_t)&synthio_note_get_filter_obj,
+    (mp_obj_t)&synthio_note_set_filter_obj);
+
 //|     panning: float
 //|     """Defines the channel(s) in which the note appears.
 //|
@@ -317,6 +336,7 @@ static void note_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
 
 STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&synthio_note_frequency_obj) },
+    { MP_ROM_QSTR(MP_QSTR_filter), MP_ROM_PTR(&synthio_note_filter_obj) },
     { MP_ROM_QSTR(MP_QSTR_panning), MP_ROM_PTR(&synthio_note_panning_obj) },
     { MP_ROM_QSTR(MP_QSTR_waveform), MP_ROM_PTR(&synthio_note_waveform_obj) },
     { MP_ROM_QSTR(MP_QSTR_envelope), MP_ROM_PTR(&synthio_note_envelope_obj) },
diff --git a/shared-bindings/synthio/Note.h b/shared-bindings/synthio/Note.h
index e548f9b5a7..b87310576a 100644
--- a/shared-bindings/synthio/Note.h
+++ b/shared-bindings/synthio/Note.h
@@ -9,6 +9,9 @@ typedef enum synthio_bend_mode_e synthio_bend_mode_t;
 mp_float_t common_hal_synthio_note_get_frequency(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t value);
 
+bool common_hal_synthio_note_get_filter(synthio_note_obj_t *self);
+void common_hal_synthio_note_set_filter(synthio_note_obj_t *self, bool value);
+
 mp_float_t common_hal_synthio_note_get_ring_frequency(synthio_note_obj_t *self);
 void common_hal_synthio_note_set_ring_frequency(synthio_note_obj_t *self, mp_float_t value);
 
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 89de8bce16..e6269eaf2e 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -44,6 +44,14 @@ void common_hal_synthio_note_set_frequency(synthio_note_obj_t *self, mp_float_t
     self->frequency_scaled = synthio_frequency_convert_float_to_scaled(val);
 }
 
+bool common_hal_synthio_note_get_filter(synthio_note_obj_t *self) {
+    return self->filter;
+}
+
+void common_hal_synthio_note_set_filter(synthio_note_obj_t *self, bool value_in) {
+    self->filter = value_in;
+}
+
 mp_float_t common_hal_synthio_note_get_ring_frequency(synthio_note_obj_t *self) {
     return self->ring_frequency;
 }
diff --git a/shared-module/synthio/Note.h b/shared-module/synthio/Note.h
index db3495f8b3..d7b9a6f67f 100644
--- a/shared-module/synthio/Note.h
+++ b/shared-module/synthio/Note.h
@@ -42,6 +42,7 @@ typedef struct synthio_note_obj {
     int32_t ring_frequency_scaled;
     int32_t amplitude_scaled;
     int32_t left_panning_scaled, right_panning_scaled;
+    bool filter;
     synthio_bend_mode_t bend_mode;
     synthio_lfo_descr_t tremolo_descr, bend_descr;
     synthio_lfo_state_t tremolo_state, bend_state;

From 9d8dcf7d33b39a00156a675f3cb246b6b26e2ac2 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 18:11:52 -0500
Subject: [PATCH 2390/2403] synthio: endorse new test result

---
 tests/circuitpython/synthesizer_note.py.exp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
index 8c224982a2..801f97131e 100644
--- a/tests/circuitpython/synthesizer_note.py.exp
+++ b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_waveform=None),)
 [-16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383, 16383, 16383, 16383, 16383, 16383, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None))
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_waveform=None))
 [0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046]
-(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, ring_frequency=0.0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, tremolo_rate=0.0, tremolo_depth=0.0, bend_rate=0.0, bend_depth=0.0, bend_mode=synthio.BendMode.VIBRATO, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_waveform=None),)
 [0, 0, 0, 28045, 0, 0, 0, 0, 0, 0, 0, 0, 28045, 0, 0, 0, 0, -28046, 0, 0, 0, 0, 28045, 0]
 (-5242, 5242)
 (-10485, 10484)

From 62e6de8ed5fe836b0d7be4ffee8cb4fd7b081dd8 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 18:13:20 -0500
Subject: [PATCH 2391/2403] synthio: Factor out `synth_note_into_buffer`, start
 adding filter buffer

---
 shared-module/synthio/__init__.c | 284 ++++++++++++++++---------------
 shared-module/synthio/__init__.h |   5 +-
 2 files changed, 149 insertions(+), 140 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 71b8250034..ac7f6edde7 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -171,6 +171,144 @@ int16_t mix_down_sample(int32_t sample) {
     return sample;
 }
 
+static void synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *out_buffer32, int16_t dur) {
+    mp_obj_t note_obj = synth->span.note_obj[chan];
+
+    if (note_obj == SYNTHIO_SILENCE) {
+        synth->accum[chan] = 0;
+        return;
+    }
+
+    if (synth->envelope_state[chan].level == 0) {
+        // note is truly finished, but we only just noticed
+        synth->span.note_obj[chan] = SYNTHIO_SILENCE;
+        return;
+    }
+
+    int32_t sample_rate = synth->sample_rate;
+
+    // adjust loudness by envelope
+    uint16_t loudness[2] = {synth->envelope_state[chan].level,synth->envelope_state[chan].level};
+
+    uint32_t dds_rate;
+    const int16_t *waveform = synth->waveform_bufinfo.buf;
+    uint32_t waveform_length = synth->waveform_bufinfo.len / 2;
+
+    uint32_t ring_dds_rate = 0;
+    const int16_t *ring_waveform = NULL;
+    uint32_t ring_waveform_length = 0;
+
+    if (mp_obj_is_small_int(note_obj)) {
+        uint8_t note = mp_obj_get_int(note_obj);
+        uint8_t octave = note / 12;
+        uint16_t base_freq = notes[note % 12];
+        // rate = base_freq * waveform_length
+        // den = sample_rate * 2 ^ (10 - octave)
+        // den = sample_rate * 2 ^ 10 / 2^octave
+        // dds_rate = 2^SHIFT * rate / den
+        // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
+        dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
+    } else {
+        synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+        int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, loudness);
+        if (note->waveform_buf.buf) {
+            waveform = note->waveform_buf.buf;
+            waveform_length = note->waveform_buf.len / 2;
+        }
+        dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
+        if (note->ring_frequency_scaled != 0 && note->ring_waveform_buf.buf) {
+            ring_waveform = note->ring_waveform_buf.buf;
+            ring_waveform_length = note->ring_waveform_buf.len / 2;
+            ring_dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)note->ring_frequency_scaled * ring_waveform_length, sample_rate);
+            uint32_t lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+            if (ring_dds_rate > lim / 2) {
+                ring_dds_rate = 0; // can't ring at that frequency
+            }
+        }
+    }
+
+    int synth_chan = synth->channel_count;
+    if (ring_dds_rate) {
+        uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+        uint32_t accum = synth->accum[chan];
+
+        if (dds_rate > lim / 2) {
+            // beyond nyquist, can't play note
+            return;
+        }
+
+        // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+        if (accum > lim) {
+            accum %= lim;
+        }
+
+        int32_t ring_buffer[dur];
+        // first, fill with waveform
+        for (uint16_t i = 0; i < dur; i++) {
+            accum += dds_rate;
+            // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+            if (accum > lim) {
+                accum -= lim;
+            }
+            int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+            ring_buffer[i] = waveform[idx];
+        }
+        synth->accum[chan] = accum;
+
+        // now modulate by ring and accumulate
+        accum = synth->ring_accum[chan];
+        lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+
+        // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+        if (accum > lim) {
+            accum %= lim;
+        }
+
+        for (uint16_t i = 0, j = 0; i < dur; i++) {
+            accum += ring_dds_rate;
+            // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+            if (accum > lim) {
+                accum -= lim;
+            }
+            int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+            int16_t wi = (ring_waveform[idx] * ring_buffer[i]) / 32768;
+            for (int c = 0; c < synth_chan; c++) {
+                out_buffer32[j] += (wi * loudness[c]) / 32768;
+                j++;
+            }
+        }
+        synth->ring_accum[chan] = accum;
+    } else {
+        uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
+        uint32_t accum = synth->accum[chan];
+
+        if (dds_rate > lim / 2) {
+            // beyond nyquist, can't play note
+            return;
+        }
+
+        // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
+        if (accum > lim) {
+            accum %= lim;
+        }
+
+        for (uint16_t i = 0, j = 0; i < dur; i++) {
+            accum += dds_rate;
+            // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
+            if (accum > lim) {
+                accum -= lim;
+            }
+            int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
+            int16_t wi = waveform[idx];
+            for (int c = 0; c < synth_chan; c++) {
+                out_buffer32[j] += (wi * loudness[c]) / 65536;
+                j++;
+            }
+        }
+        synth->accum[chan] = accum;
+    }
+}
+
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t *buffer_length, uint8_t channel) {
 
     if (channel == synth->other_channel) {
@@ -186,145 +324,14 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
     uint16_t dur = MIN(SYNTHIO_MAX_DUR, synth->span.dur);
     synth->span.dur -= dur;
 
-    int32_t sample_rate = synth->sample_rate;
     int32_t out_buffer32[dur * synth->channel_count];
 
     memset(out_buffer32, 0, sizeof(out_buffer32));
     for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        mp_obj_t note_obj = synth->span.note_obj[chan];
-        if (note_obj == SYNTHIO_SILENCE) {
-            synth->accum[chan] = 0;
-            continue;
-        }
-
-        if (synth->envelope_state[chan].level == 0) {
-            // note is truly finished, but we only just noticed
-            synth->span.note_obj[chan] = SYNTHIO_SILENCE;
-            continue;
-        }
-
-        // adjust loudness by envelope
-        uint16_t loudness[2] = {synth->envelope_state[chan].level,synth->envelope_state[chan].level};
-
-        uint32_t dds_rate;
-        const int16_t *waveform = synth->waveform;
-        uint32_t waveform_length = synth->waveform_length;
-
-        uint32_t ring_dds_rate = 0;
-        const int16_t *ring_waveform = NULL;
-        uint32_t ring_waveform_length = 0;
-
-        if (mp_obj_is_small_int(note_obj)) {
-            uint8_t note = mp_obj_get_int(note_obj);
-            uint8_t octave = note / 12;
-            uint16_t base_freq = notes[note % 12];
-            // rate = base_freq * waveform_length
-            // den = sample_rate * 2 ^ (10 - octave)
-            // den = sample_rate * 2 ^ 10 / 2^octave
-            // dds_rate = 2^SHIFT * rate / den
-            // dds_rate = 2^(SHIFT-10+octave) * base_freq * waveform_length / sample_rate
-            dds_rate = (sample_rate / 2 + ((uint64_t)(base_freq * waveform_length) << (SYNTHIO_FREQUENCY_SHIFT - 10 + octave))) / sample_rate;
-        } else {
-            synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
-            int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, loudness);
-            if (note->waveform_buf.buf) {
-                waveform = note->waveform_buf.buf;
-                waveform_length = note->waveform_buf.len / 2;
-            }
-            dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
-            if (note->ring_frequency_scaled != 0 && note->ring_waveform_buf.buf) {
-                ring_waveform = note->ring_waveform_buf.buf;
-                ring_waveform_length = note->ring_waveform_buf.len / 2;
-                ring_dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)note->ring_frequency_scaled * ring_waveform_length, sample_rate);
-                uint32_t lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-                if (ring_dds_rate > lim / 2) {
-                    ring_dds_rate = 0; // can't ring at that frequency
-                }
-            }
-        }
-
-        int synth_chan = synth->channel_count;
-        if (ring_dds_rate) {
-            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-            uint32_t accum = synth->accum[chan];
-
-            if (dds_rate > lim / 2) {
-                // beyond nyquist, can't play note
-                continue;
-            }
-
-            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
-            if (accum > lim) {
-                accum %= lim;
-            }
-
-            int32_t ring_buffer[dur];
-            // first, fill with waveform
-            for (uint16_t i = 0; i < dur; i++) {
-                accum += dds_rate;
-                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
-                if (accum > lim) {
-                    accum -= lim;
-                }
-                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-                ring_buffer[i] = waveform[idx];
-            }
-            synth->accum[chan] = accum;
-
-            // now modulate by ring and accumulate
-            accum = synth->ring_accum[chan];
-            lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-
-            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
-            if (accum > lim) {
-                accum %= lim;
-            }
-
-            for (uint16_t i = 0, j = 0; i < dur; i++) {
-                accum += ring_dds_rate;
-                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
-                if (accum > lim) {
-                    accum -= lim;
-                }
-                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-                int16_t wi = (ring_waveform[idx] * ring_buffer[i]) / 32768;
-                for (int c = 0; c < synth_chan; c++) {
-                    out_buffer32[j] += (wi * loudness[c]) / 32768;
-                    j++;
-                }
-            }
-            synth->ring_accum[chan] = accum;
-        } else {
-            uint32_t lim = waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-            uint32_t accum = synth->accum[chan];
-
-            if (dds_rate > lim / 2) {
-                // beyond nyquist, can't play note
-                continue;
-            }
-
-            // can happen if note waveform gets set mid-note, but the expensive modulo is usually avoided
-            if (accum > lim) {
-                accum %= lim;
-            }
-
-            for (uint16_t i = 0, j = 0; i < dur; i++) {
-                accum += dds_rate;
-                // because dds_rate is low enough, the subtraction is guaranteed to go back into range, no expensive modulo needed
-                if (accum > lim) {
-                    accum -= lim;
-                }
-                int16_t idx = accum >> SYNTHIO_FREQUENCY_SHIFT;
-                int16_t wi = waveform[idx];
-                for (int c = 0; c < synth_chan; c++) {
-                    out_buffer32[j] += (wi * loudness[c]) / 65536;
-                    j++;
-                }
-            }
-            synth->accum[chan] = accum;
-        }
+        synth_note_into_buffer(synth, chan, out_buffer32, dur);
     }
 
+
     int16_t *out_buffer16 = (int16_t *)(void *)synth->buffers[synth->buffer_index];
 
     // mix down audio
@@ -358,8 +365,7 @@ bool synthio_synth_deinited(synthio_synth_t *synth) {
 }
 
 void synthio_synth_deinit(synthio_synth_t *synth) {
-    m_del(uint8_t, synth->buffers[0], synth->buffer_length);
-    m_del(uint8_t, synth->buffers[1], synth->buffer_length);
+    synth->filter_buffer = NULL;
     synth->buffers[0] = NULL;
     synth->buffers[1] = NULL;
 }
@@ -374,15 +380,19 @@ mp_obj_t synthio_synth_envelope_get(synthio_synth_t *synth) {
 }
 
 void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channel_count, mp_obj_t waveform_obj, mp_obj_t filter_obj, mp_obj_t envelope_obj) {
+    synthio_synth_parse_waveform(&synth->waveform_bufinfo, waveform_obj);
+    synthio_synth_parse_filter(&synth->filter_bufinfo, filter_obj);
     mp_arg_validate_int_range(channel_count, 1, 2, MP_QSTR_channel_count);
     synth->buffer_length = SYNTHIO_MAX_DUR * SYNTHIO_BYTES_PER_SAMPLE * channel_count;
     synth->buffers[0] = m_malloc(synth->buffer_length, false);
     synth->buffers[1] = m_malloc(synth->buffer_length, false);
+    if (synth->filter_bufinfo.len) {
+        synth->filter_buffer_length = (synth->filter_bufinfo.len + SYNTHIO_MAX_DUR) * channel_count * sizeof(int32_t);
+        synth->filter_buffer = m_malloc(synth->filter_buffer_length, false);
+    }
     synth->channel_count = channel_count;
     synth->other_channel = -1;
     synth->waveform_obj = waveform_obj;
-    synthio_synth_parse_waveform(&synth->waveform_bufinfo, waveform_obj);
-    synthio_synth_parse_filter(&synth->filter_bufinfo, filter_obj);
     synth->sample_rate = sample_rate;
     synthio_synth_envelope_set(synth, envelope_obj);
 
diff --git a/shared-module/synthio/__init__.h b/shared-module/synthio/__init__.h
index 6241771d33..a3d0ca57fd 100644
--- a/shared-module/synthio/__init__.h
+++ b/shared-module/synthio/__init__.h
@@ -64,12 +64,11 @@ typedef struct synthio_synth {
     uint32_t sample_rate;
     uint32_t total_envelope;
     int16_t *buffers[2];
-    const int16_t *waveform;
+    int32_t *filter_buffer;
     uint8_t channel_count;
-    uint16_t buffer_length;
+    uint16_t buffer_length, filter_buffer_length;
     uint16_t last_buffer_length;
     uint8_t other_channel, buffer_index, other_buffer_index;
-    uint16_t waveform_length;
     mp_buffer_info_t waveform_bufinfo, filter_bufinfo;
     synthio_envelope_definition_t global_envelope_definition;
     mp_obj_t waveform_obj, filter_obj, envelope_obj;

From f52bb65da6e81299de2e3618e50dde01b906e061 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 18:41:52 -0500
Subject: [PATCH 2392/2403] synthio: add some new manual tests

---
 .../synthio/note/envelope.py                  |  58 ++++++++++
 .../circuitpython-manual/synthio/note/fir.py  | 104 ++++++++++++++++++
 .../synthio/note/panning.py                   |  57 ++++++++++
 .../circuitpython-manual/synthio/note/ring.py |  60 ++++++++++
 4 files changed, 279 insertions(+)
 create mode 100644 tests/circuitpython-manual/synthio/note/envelope.py
 create mode 100644 tests/circuitpython-manual/synthio/note/fir.py
 create mode 100644 tests/circuitpython-manual/synthio/note/panning.py
 create mode 100644 tests/circuitpython-manual/synthio/note/ring.py

diff --git a/tests/circuitpython-manual/synthio/note/envelope.py b/tests/circuitpython-manual/synthio/note/envelope.py
new file mode 100644
index 0000000000..9421cf8c1c
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/envelope.py
@@ -0,0 +1,58 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+SAMPLE_SIZE = 1024
+VOLUME = 32767
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME,
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(attack_time=0.05, decay_time=8, release_time=0.25, sustain_level=0)
+fast_decay_envelope = synthio.Envelope(
+    attack_time=0.05, decay_time=0.25, release_time=0.25, sustain_level=0
+)
+
+synth = synthio.Synthesizer(sample_rate=48000)
+
+
+def synthesize(synth):
+    notes = (synthio.Note(frequency=440, waveform=sine, envelope=envelope),)
+    synth.press(notes)
+    yield 360
+    notes[0].envelope = fast_decay_envelope
+    yield 180
+    synth.release_all()
+
+
+def synthesize2(synth):
+    notes = (synthio.Note(frequency=440, waveform=sine, envelope=envelope),)
+    synth.press(notes)
+    yield 360
+    synth.release_all()
+    yield 180
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("envelope.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize(synth), synthesize2(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)
diff --git a/tests/circuitpython-manual/synthio/note/fir.py b/tests/circuitpython-manual/synthio/note/fir.py
new file mode 100644
index 0000000000..9d40b584be
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/fir.py
@@ -0,0 +1,104 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+random.seed(9)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=0.8, sustain_level=0.8
+)
+
+h = np.array(
+    [
+        -0.001229734800309099,
+        -0.008235561806605458,
+        -0.015082497016061390,
+        -0.020940136918319988,
+        -0.024981800822463429,
+        -0.026464233332370746,
+        -0.024803890156806906,
+        -0.019642276775473012,
+        -0.010893620860173042,
+        0.001230341899766145,
+        0.016221637398855598,
+        0.033304135659230648,
+        0.051486665261155681,
+        0.069636961761409016,
+        0.086570197432542767,
+        0.101144354207918147,
+        0.112353938422488253,
+        0.119413577288191297,
+        0.121823886314051028,
+        0.119413577288191297,
+        0.112353938422488253,
+        0.101144354207918147,
+        0.086570197432542767,
+        0.069636961761409016,
+        0.051486665261155681,
+        0.033304135659230648,
+        0.016221637398855598,
+        0.001230341899766145,
+        -0.010893620860173042,
+        -0.019642276775473012,
+        -0.024803890156806906,
+        -0.026464233332370746,
+        -0.024981800822463429,
+        -0.020940136918319988,
+        -0.015082497016061390,
+        -0.008235561806605458,
+        -0.001229734800309099,
+    ]
+)
+
+filter_coeffs = np.array(h[::-1] * 32768, dtype=np.int16)
+
+synth = synthio.Synthesizer(sample_rate=48000, filter=filter_coeffs)
+
+
+def synthesize(synth):
+    n = synthio.Note(
+        frequency=120,
+        envelope=envelope,
+        filter=False,
+    )
+
+    print(synth, n)
+    synth.press((n,))
+    for _ in range(20):
+        n.frequency *= 1.0595
+        yield 36
+    synth.release_all()
+    yield 36
+
+    n.filter = True
+    n.frequency = 120
+    synth.press((n,))
+    for _ in range(20):
+        n.frequency *= 1.0595
+        yield 36
+    synth.release_all()
+    yield 36
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("fir.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)
diff --git a/tests/circuitpython-manual/synthio/note/panning.py b/tests/circuitpython-manual/synthio/note/panning.py
new file mode 100644
index 0000000000..0b7fb1e2a6
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/panning.py
@@ -0,0 +1,57 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+random.seed(9)
+SAMPLE_SIZE = 1024
+VOLUME = 14700
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME,
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=0.8, sustain_level=0.8
+)
+
+synth = synthio.Synthesizer(sample_rate=48000, channel_count=2)
+
+
+def synthesize(synth):
+    n = synthio.Note(
+        frequency=440,
+        waveform=sine,
+        envelope=envelope,
+    )
+
+    print(synth, n)
+    synth.press((n,))
+    for p in range(-10, 11, 1):
+        n.panning = p / 10
+        yield 36
+    synth.release_all()
+    yield 36
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("panning.wav", "w") as f:
+    f.setnchannels(2)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)
diff --git a/tests/circuitpython-manual/synthio/note/ring.py b/tests/circuitpython-manual/synthio/note/ring.py
new file mode 100644
index 0000000000..7a418da3af
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/ring.py
@@ -0,0 +1,60 @@
+import sys
+
+sys.path.insert(
+    0, f"{__file__.rpartition('/')[0] or '.'}/../../../../frozen/Adafruit_CircuitPython_Wave"
+)
+
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+random.seed(9)
+SAMPLE_SIZE = 1024
+VOLUME = 32767
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME,
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=0.8, sustain_level=0.8
+)
+
+synth = synthio.Synthesizer(sample_rate=48000)
+
+
+def synthesize(synth):
+    n = synthio.Note(
+        frequency=120,
+        waveform=sine,
+        ring_waveform=sine,
+        ring_frequency=769,
+        envelope=envelope,
+        bend_mode=synthio.BendType.VIBRATO,
+        bend_depth=50 / 1200,
+        bend_rate=7,
+    )
+
+    print(synth, n)
+    synth.press((n,))
+    yield 720
+    synth.release_all()
+    yield 36
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("ring.wav", "w") as f:
+    f.setnchannels(1)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    for n in chain(synthesize(synth)):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)

From bc7feb30a512fef8927061a724fc0caa46c88a58 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 18:42:18 -0500
Subject: [PATCH 2393/2403] synthio: implement FIR filtering

A 37-tap filter worked fine on RP2040 (prop maker) at 48kHz, so
you can probably pretty much go nuts on M7.
---
 shared-module/synthio/__init__.c | 68 +++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index ac7f6edde7..0175629c18 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -192,7 +192,7 @@ static void synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *ou
 
     uint32_t dds_rate;
     const int16_t *waveform = synth->waveform_bufinfo.buf;
-    uint32_t waveform_length = synth->waveform_bufinfo.len / 2;
+    uint32_t waveform_length = synth->waveform_bufinfo.len / sizeof(int16_t);
 
     uint32_t ring_dds_rate = 0;
     const int16_t *ring_waveform = NULL;
@@ -213,15 +213,15 @@ static void synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *ou
         int32_t frequency_scaled = synthio_note_step(note, sample_rate, dur, loudness);
         if (note->waveform_buf.buf) {
             waveform = note->waveform_buf.buf;
-            waveform_length = note->waveform_buf.len / 2;
+            waveform_length = note->waveform_buf.len / sizeof(int16_t);
         }
         dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)frequency_scaled * waveform_length, sample_rate);
         if (note->ring_frequency_scaled != 0 && note->ring_waveform_buf.buf) {
             ring_waveform = note->ring_waveform_buf.buf;
-            ring_waveform_length = note->ring_waveform_buf.len / 2;
+            ring_waveform_length = note->ring_waveform_buf.len / sizeof(int16_t);
             ring_dds_rate = synthio_frequency_convert_scaled_to_dds((uint64_t)note->ring_frequency_scaled * ring_waveform_length, sample_rate);
             uint32_t lim = ring_waveform_length << SYNTHIO_FREQUENCY_SHIFT;
-            if (ring_dds_rate > lim / 2) {
+            if (ring_dds_rate > lim / sizeof(int16_t)) {
                 ring_dds_rate = 0; // can't ring at that frequency
             }
         }
@@ -309,6 +309,37 @@ static void synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *ou
     }
 }
 
+STATIC void run_fir(synthio_synth_t *synth, int32_t *out_buffer32, uint16_t dur) {
+    int16_t *coeff = (int16_t *)synth->filter_bufinfo.buf;
+    size_t fir_len = synth->filter_bufinfo.len / sizeof(int16_t);
+    int32_t *in_buf = synth->filter_buffer;
+
+    // FIR and copy values to output buffer
+    for (int16_t i = 0; i < dur; i++) {
+        int32_t acc = 0;
+        for (size_t j = 0; j < fir_len; j++) {
+            // shift 5 here is good for up to 32 filtered voices, else might wrap
+            acc = acc + (in_buf[j] * (coeff[j] >> 5));
+        }
+        *out_buffer32++ = acc >> 10;
+        in_buf++;
+    }
+
+    // Move values down so that they get filtered next time
+    memmove(synth->filter_buffer, &synth->filter_buffer[dur], fir_len * sizeof(int32_t));
+}
+
+STATIC bool synthio_synth_get_note_filtered(mp_obj_t note_obj) {
+    if (note_obj == mp_const_none) {
+        return false;
+    }
+    if (!mp_obj_is_small_int(note_obj)) {
+        synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
+        return note->filter;
+    }
+    return true;
+}
+
 void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t *buffer_length, uint8_t channel) {
 
     if (channel == synth->other_channel) {
@@ -326,11 +357,30 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
     int32_t out_buffer32[dur * synth->channel_count];
 
-    memset(out_buffer32, 0, sizeof(out_buffer32));
-    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
-        synth_note_into_buffer(synth, chan, out_buffer32, dur);
+    if (synth->filter_buffer) {
+        int32_t *filter_start = &synth->filter_buffer[synth->filter_bufinfo.len * synth->channel_count / sizeof(int16_t)];
+        memset(filter_start, 0, dur * sizeof(int32_t));
+
+        for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+            mp_obj_t note_obj = synth->span.note_obj[chan];
+            if (!synthio_synth_get_note_filtered(note_obj)) {
+                continue;
+            }
+            synth_note_into_buffer(synth, chan, filter_start, dur);
+        }
+
+        run_fir(synth, out_buffer32, dur);
+    } else {
+        memset(out_buffer32, 0, sizeof(out_buffer32));
     }
 
+    for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
+        mp_obj_t note_obj = synth->span.note_obj[chan];
+        if (synth->filter_buffer && synthio_synth_get_note_filtered(note_obj)) {
+            continue;
+        }
+        synth_note_into_buffer(synth, chan, out_buffer32, dur);
+    }
 
     int16_t *out_buffer16 = (int16_t *)(void *)synth->buffers[synth->buffer_index];
 
@@ -387,7 +437,7 @@ void synthio_synth_init(synthio_synth_t *synth, uint32_t sample_rate, int channe
     synth->buffers[0] = m_malloc(synth->buffer_length, false);
     synth->buffers[1] = m_malloc(synth->buffer_length, false);
     if (synth->filter_bufinfo.len) {
-        synth->filter_buffer_length = (synth->filter_bufinfo.len + SYNTHIO_MAX_DUR) * channel_count * sizeof(int32_t);
+        synth->filter_buffer_length = (synth->filter_bufinfo.len / 2 + SYNTHIO_MAX_DUR) * channel_count * sizeof(int32_t);
         synth->filter_buffer = m_malloc(synth->filter_buffer_length, false);
     }
     synth->channel_count = channel_count;
@@ -419,7 +469,7 @@ STATIC void parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what, mp
         if (bufinfo->typecode != 'h') {
             mp_raise_ValueError_varg(translate("%q must be array of type 'h'"), what);
         }
-        mp_arg_validate_length_range(bufinfo->len / 2, 2, max_len, what);
+        mp_arg_validate_length_range(bufinfo->len / sizeof(int16_t), 2, max_len, what);
     }
 }
 

From 585b1c23b5b2b9b0eb94b2c8834fbfe7760be45b Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Thu, 11 May 2023 19:13:11 -0500
Subject: [PATCH 2394/2403] synthio: Fix sweep-type pitch bends

The accumulator saturate logic was wrong, and the sweep was never restarted
either
---
 shared-module/synthio/Note.c     | 3 +++
 shared-module/synthio/__init__.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index e6269eaf2e..16727b2152 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -193,6 +193,9 @@ void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
 
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {
     synthio_note_recalculate(self, sample_rate);
+    if (self->bend_mode != SYNTHIO_BEND_MODE_VIBRATO) {
+        self->bend_state.phase = 0;
+    }
 }
 
 uint32_t synthio_note_envelope(synthio_note_obj_t *self) {
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 0175629c18..2fed9a5122 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -554,8 +554,9 @@ STATIC int synthio_lfo_step_common(synthio_lfo_state_t *state, uint16_t dur) {
     return whole_phase;
 }
 STATIC int synthio_lfo_sweep_common(synthio_lfo_state_t *state, uint16_t dur) {
+    uint32_t old_phase = state->phase;
     uint16_t whole_phase = synthio_lfo_step_common(state, dur);
-    if (state->phase < state->dds) {
+    if (state->phase < old_phase) {
         state->phase = 0xffffffff;
     }
     return whole_phase;

From 5a5474b5dc168143875ef3b23fb1653cb67f2a0c Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Tue, 9 May 2023 07:37:47 -0500
Subject: [PATCH 2395/2403] mimxrt: 101x: MIDI_RX_BUFSIZE must be 512

It's not clear why this is required, but otherwise it stops
midi_intest1 from ever receiving any MIDI events.

Closes: #7944
---
 ports/mimxrt10xx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index b10466bb2d..bbee67bebe 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -50,7 +50,7 @@ CFLAGS += -ftree-vrp -DNDEBUG
 # TinyUSB defines
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512
 ifeq ($(CHIP_FAMILY),$(filter $(CHIP_FAMILY),MIMXRT1011 MIMXRT1015))
-CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=64 -DCFG_TUD_MIDI_TX_BUFSIZE=64 -DCFG_TUD_MSC_BUFSIZE=512
+CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=64 -DCFG_TUD_MSC_BUFSIZE=512
 else
 CFLAGS += -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=1024
 endif

From 0b2f8575423177d5c336c5d64dc85befa11ad878 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 12 May 2023 00:28:37 -0400
Subject: [PATCH 2396/2403] STM: monotonic time even when RTC is changed

---
 ports/stm/peripherals/rtc.c | 100 +++++++++++++++++++++---------------
 ports/stm/peripherals/rtc.h |   2 +-
 ports/stm/supervisor/port.c |   2 +-
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c
index 15f82ba78d..c6cccfc93b 100644
--- a/ports/stm/peripherals/rtc.c
+++ b/ports/stm/peripherals/rtc.c
@@ -47,6 +47,11 @@ volatile uint32_t cached_date = 0;
 volatile uint32_t seconds_to_minute = 0;
 volatile uint32_t cached_hours_minutes = 0;
 
+// The RTC starts at 2000-01-01 when it comes up.
+// If the RTC is set to a later time, the ticks the RTC returns will be offset by the new time.
+// Remember that offset so it can be removed when returning a monotonic tick count.
+static int64_t rtc_ticks_offset;
+
 volatile bool alarmed_already[2];
 
 bool peripherals_wkup_on = false;
@@ -59,6 +64,8 @@ uint32_t stm32_peripherals_get_rtc_freq(void) {
 }
 
 void stm32_peripherals_rtc_init(void) {
+    rtc_ticks_offset = 0;
+
     // RTC oscillator selection is handled in peripherals///clocks.c
     __HAL_RCC_RTC_ENABLE();
     hrtc.Instance = RTC;
@@ -74,49 +81,9 @@ void stm32_peripherals_rtc_init(void) {
     HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
 }
 
-#if CIRCUITPY_RTC
-void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm) {
-    RTC_DateTypeDef date = {0};
-    RTC_TimeTypeDef time = {0};
-
-    int code;
-    if ((code = HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN)) == HAL_OK &&
-        (code = HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN)) == HAL_OK) {
-        tm->tm_hour = time.Hours;
-        tm->tm_min = time.Minutes;
-        tm->tm_sec = time.Seconds;
-        tm->tm_wday = date.WeekDay - 1;
-        tm->tm_mday = date.Date;
-        tm->tm_mon = date.Month;
-        tm->tm_year = date.Year + 2000;
-        tm->tm_yday = -1;
-    }
-}
-
-void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) {
-    RTC_DateTypeDef date = {0};
-    RTC_TimeTypeDef time = {0};
-
-    time.Hours = tm->tm_hour;
-    time.Minutes = tm->tm_min;
-    time.Seconds = tm->tm_sec;
-    date.WeekDay = tm->tm_wday + 1;
-    date.Date = tm->tm_mday;
-    date.Month = tm->tm_mon;
-    date.Year = tm->tm_year - 2000;
-    time.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
-    time.StoreOperation = RTC_STOREOPERATION_RESET;
-
-    if (HAL_RTC_SetTime(&hrtc, &time, RTC_FORMAT_BIN) != HAL_OK ||
-        HAL_RTC_SetDate(&hrtc, &date, RTC_FORMAT_BIN) != HAL_OK) {
-        // todo - throw an exception
-    }
-}
-#endif
-
 // This function is called often for timing so we cache the seconds elapsed computation based on the
 // register value. The STM HAL always does shifts and conversion if we use it directly.
-uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
+STATIC uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
     // Disable IRQs to ensure we read all of the RTC registers as close in time as possible. Read
     // SSR twice to make sure we didn't read across a tick.
     __disable_irq();
@@ -164,6 +131,57 @@ uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
     return raw_ticks;
 }
 
+// This function returns monotonically increasing ticks by adjusting away the RTC tick offset
+// from the last time the date was set.
+uint64_t stm32_peripherals_rtc_monotonic_ticks(uint8_t *subticks) {
+    return stm32_peripherals_rtc_raw_ticks(subticks) - rtc_ticks_offset;
+}
+
+#if CIRCUITPY_RTC
+void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm) {
+    RTC_DateTypeDef date = {0};
+    RTC_TimeTypeDef time = {0};
+
+    int code;
+    if ((code = HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN)) == HAL_OK &&
+        (code = HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN)) == HAL_OK) {
+        tm->tm_hour = time.Hours;
+        tm->tm_min = time.Minutes;
+        tm->tm_sec = time.Seconds;
+        tm->tm_wday = date.WeekDay - 1;
+        tm->tm_mday = date.Date;
+        tm->tm_mon = date.Month;
+        tm->tm_year = date.Year + 2000;
+        tm->tm_yday = -1;
+    }
+}
+
+void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) {
+    RTC_DateTypeDef date = {0};
+    RTC_TimeTypeDef time = {0};
+
+    uint64_t current_monotonic_ticks = stm32_peripherals_rtc_monotonic_ticks(NULL);
+
+    time.Hours = tm->tm_hour;
+    time.Minutes = tm->tm_min;
+    time.Seconds = tm->tm_sec;
+    date.WeekDay = tm->tm_wday + 1;
+    date.Date = tm->tm_mday;
+    date.Month = tm->tm_mon;
+    date.Year = tm->tm_year - 2000;
+    time.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
+    time.StoreOperation = RTC_STOREOPERATION_RESET;
+
+    if (HAL_RTC_SetTime(&hrtc, &time, RTC_FORMAT_BIN) != HAL_OK ||
+        HAL_RTC_SetDate(&hrtc, &date, RTC_FORMAT_BIN) != HAL_OK) {
+        // todo - throw an exception
+    }
+
+    rtc_ticks_offset = stm32_peripherals_rtc_raw_ticks(NULL) - current_monotonic_ticks;
+    ;
+}
+#endif
+
 void stm32_peripherals_rtc_assign_wkup_callback(void (*callback)(void)) {
     wkup_callback = callback;
 }
diff --git a/ports/stm/peripherals/rtc.h b/ports/stm/peripherals/rtc.h
index 474cba1881..93febbb5cc 100644
--- a/ports/stm/peripherals/rtc.h
+++ b/ports/stm/peripherals/rtc.h
@@ -36,7 +36,7 @@
 
 uint32_t stm32_peripherals_get_rtc_freq(void);
 void stm32_peripherals_rtc_init(void);
-uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks);
+uint64_t stm32_peripherals_rtc_monotonic_ticks(uint8_t *subticks);
 
 void stm32_peripherals_rtc_assign_wkup_callback(void (*callback)(void));
 void stm32_peripherals_rtc_set_wakeup_mode_seconds(uint32_t seconds);
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 1fb3f36377..0a8d9a5b19 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -385,7 +385,7 @@ __attribute__((used)) void HardFault_Handler(void) {
 }
 
 uint64_t port_get_raw_ticks(uint8_t *subticks) {
-    return stm32_peripherals_rtc_raw_ticks(subticks);
+    return stm32_peripherals_rtc_monotonic_ticks(subticks);
 }
 
 // Enable 1/1024 second tick.

From 74624e7c228cad8a08c5b79e0d2fd5330a465f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bojan=20Poto=C4=8Dnik?= 
Date: Fri, 12 May 2023 09:10:26 +0200
Subject: [PATCH 2397/2403] Add missing ESP32-S3 pins to microcontroller module

ESP32-S3 defines two additional general use pins in
ports/espressif/peripherals/esp32s3/pins.h, for which
support is missing in the microcontroller module HAL.
---
 ports/espressif/common-hal/microcontroller/__init__.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c
index 23c7c153e9..7ec9b215f1 100644
--- a/ports/espressif/common-hal/microcontroller/__init__.c
+++ b/ports/espressif/common-hal/microcontroller/__init__.c
@@ -304,5 +304,11 @@ STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
     #ifdef GPIO46_EXISTS
     { MP_ROM_QSTR(MP_QSTR_GPIO46), MP_ROM_PTR(&pin_GPIO46) },
     #endif
+    #ifdef GPIO47_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_GPIO47), MP_ROM_PTR(&pin_GPIO47) },
+    #endif
+    #ifdef GPIO48_EXISTS
+    { MP_ROM_QSTR(MP_QSTR_GPIO48), MP_ROM_PTR(&pin_GPIO48) },
+    #endif
 };
 MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_global_dict_table);

From e8067851f5958c72ec828b14186affc22b8a5d60 Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 12 May 2023 14:39:57 -0400
Subject: [PATCH 2398/2403] fix subticks handling

---
 ports/stm/peripherals/rtc.c   | 47 +++++++++++++++++++++++++++--------
 shared-module/time/__init__.c |  2 ++
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c
index c6cccfc93b..7c8cb65e17 100644
--- a/ports/stm/peripherals/rtc.c
+++ b/ports/stm/peripherals/rtc.c
@@ -32,7 +32,9 @@
 #include "shared/timeutils/timeutils.h"
 
 // Default period for ticks is 1/1024 second
-#define TICK_DIVISOR 1024
+#define TICKS_PER_SECOND 1024
+// Based on a 32768 kHz clock
+#define SUBTICKS_PER_TICK 32
 
 STATIC RTC_HandleTypeDef hrtc;
 
@@ -51,6 +53,8 @@ volatile uint32_t cached_hours_minutes = 0;
 // If the RTC is set to a later time, the ticks the RTC returns will be offset by the new time.
 // Remember that offset so it can be removed when returning a monotonic tick count.
 static int64_t rtc_ticks_offset;
+// Normalized to be 0-31 inclusive, so always positive.
+static uint8_t rtc_subticks_offset;
 
 volatile bool alarmed_already[2];
 
@@ -65,6 +69,7 @@ uint32_t stm32_peripherals_get_rtc_freq(void) {
 
 void stm32_peripherals_rtc_init(void) {
     rtc_ticks_offset = 0;
+    rtc_subticks_offset = 0;
 
     // RTC oscillator selection is handled in peripherals///clocks.c
     __HAL_RCC_RTC_ENABLE();
@@ -124,17 +129,27 @@ STATIC uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
     uint8_t seconds = (uint8_t)(time & (RTC_TR_ST | RTC_TR_SU));
     seconds = (uint8_t)RTC_Bcd2ToByte(seconds);
     if (subticks != NULL) {
-        *subticks = subseconds % 32;
+        *subticks = subseconds % SUBTICKS_PER_TICK;
     }
 
-    uint64_t raw_ticks = ((uint64_t)TICK_DIVISOR) * (seconds_to_date + seconds_to_minute + seconds) + subseconds / 32;
+    uint64_t raw_ticks = ((uint64_t)TICKS_PER_SECOND) * (seconds_to_date + seconds_to_minute + seconds) + subseconds / SUBTICKS_PER_TICK;
     return raw_ticks;
 }
 
 // This function returns monotonically increasing ticks by adjusting away the RTC tick offset
 // from the last time the date was set.
 uint64_t stm32_peripherals_rtc_monotonic_ticks(uint8_t *subticks) {
-    return stm32_peripherals_rtc_raw_ticks(subticks) - rtc_ticks_offset;
+    uint8_t raw_subticks;
+    uint64_t monotonic_ticks = stm32_peripherals_rtc_raw_ticks(&raw_subticks) - rtc_ticks_offset;
+    int8_t monotonic_subticks = raw_subticks - rtc_subticks_offset;
+    // Difference might be negative. Normalize to 0-31.
+    // `while` not really necessary; should only loop 0 or 1 times.
+    while (monotonic_subticks < 0) {
+        monotonic_ticks--;
+        monotonic_subticks += SUBTICKS_PER_TICK;
+    }
+    *subticks = (uint8_t)monotonic_subticks;
+    return monotonic_ticks;
 }
 
 #if CIRCUITPY_RTC
@@ -160,8 +175,10 @@ void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) {
     RTC_DateTypeDef date = {0};
     RTC_TimeTypeDef time = {0};
 
-    uint64_t current_monotonic_ticks = stm32_peripherals_rtc_monotonic_ticks(NULL);
+    uint8_t current_monotonic_subticks;
+    uint64_t current_monotonic_ticks = stm32_peripherals_rtc_monotonic_ticks(¤t_monotonic_subticks);
 
+    // SubSeconds will always be set to zero.
     time.Hours = tm->tm_hour;
     time.Minutes = tm->tm_min;
     time.Seconds = tm->tm_sec;
@@ -177,8 +194,16 @@ void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) {
         // todo - throw an exception
     }
 
-    rtc_ticks_offset = stm32_peripherals_rtc_raw_ticks(NULL) - current_monotonic_ticks;
-    ;
+    uint8_t raw_subticks;
+    rtc_ticks_offset = stm32_peripherals_rtc_raw_ticks(&raw_subticks) - current_monotonic_ticks;
+    int8_t rtc_subticks_offset_signed = raw_subticks - current_monotonic_subticks;
+    // Difference might be negative. Normalize subticks to 0-31.
+    // `while` not really necessary; should only loop 0 or 1 times.
+    while (rtc_subticks_offset_signed < 0) {
+        rtc_ticks_offset--;
+        rtc_subticks_offset_signed += SUBTICKS_PER_TICK;
+    }
+    rtc_subticks_offset = (uint8_t)rtc_subticks_offset_signed;
 }
 #endif
 
@@ -195,7 +220,7 @@ void stm32_peripherals_rtc_set_wakeup_mode_seconds(uint32_t seconds) {
 }
 
 void stm32_peripherals_rtc_set_wakeup_mode_tick(void) {
-    HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, (rtc_clock_frequency / 16) / TICK_DIVISOR, RTC_WAKEUPCLOCK_RTCCLK_DIV2);
+    HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, (rtc_clock_frequency / 16) / TICKS_PER_SECOND, RTC_WAKEUPCLOCK_RTCCLK_DIV2);
 }
 
 void stm32_peripherals_rtc_enable_wakeup_timer(void) {
@@ -223,9 +248,9 @@ void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks) {
     uint64_t raw_ticks = stm32_peripherals_rtc_raw_ticks(NULL) + ticks;
 
     RTC_AlarmTypeDef alarm;
-    if (ticks > TICK_DIVISOR) {
+    if (ticks > TICKS_PER_SECOND) {
         timeutils_struct_time_t tm;
-        timeutils_seconds_since_2000_to_struct_time(raw_ticks / TICK_DIVISOR, &tm);
+        timeutils_seconds_since_2000_to_struct_time(raw_ticks / TICKS_PER_SECOND, &tm);
         alarm.AlarmTime.Hours = tm.tm_hour;
         alarm.AlarmTime.Minutes = tm.tm_min;
         alarm.AlarmTime.Seconds = tm.tm_sec;
@@ -239,7 +264,7 @@ void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks) {
     }
 
     alarm.AlarmTime.SubSeconds = rtc_clock_frequency - 1 -
-        ((raw_ticks % TICK_DIVISOR) * 32);
+        ((raw_ticks % TICKS_PER_SECOND) * SUBTICKS_PER_TICK);
     if (alarm.AlarmTime.SubSeconds > rtc_clock_frequency) {
         alarm.AlarmTime.SubSeconds = alarm.AlarmTime.SubSeconds +
             rtc_clock_frequency;
diff --git a/shared-module/time/__init__.c b/shared-module/time/__init__.c
index b4575b18a2..7d4f585ea1 100644
--- a/shared-module/time/__init__.c
+++ b/shared-module/time/__init__.c
@@ -38,6 +38,8 @@ uint64_t common_hal_time_monotonic_ns(void) {
     uint64_t ticks = port_get_raw_ticks(&subticks);
     // A tick is 976562.5 nanoseconds so multiply it by the base and add half instead of doing float
     // math.
+    // A subtick is 1/32 of a tick.
+    // 30518 is 1e9 / 32768
     return 976562 * ticks + ticks / 2 + 30518 * subticks;
 }
 

From 522c5a9a114c616d1daf6a9c495039b3c8e99bb4 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 May 2023 11:49:08 -0500
Subject: [PATCH 2399/2403] synthio: fix crash on synthesizer.press((float,))

---
 shared-module/synthio/Synthesizer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c
index c18c067976..54bc283148 100644
--- a/shared-module/synthio/Synthesizer.c
+++ b/shared-module/synthio/Synthesizer.c
@@ -110,11 +110,12 @@ void common_hal_synthio_synthesizer_press(synthio_synthesizer_obj_t *self, mp_ob
     mp_obj_t iterable = mp_getiter(to_press, &iter_buf);
     mp_obj_t note_obj;
     while ((note_obj = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+        note_obj = validate_note(note_obj);
         if (!mp_obj_is_small_int(note_obj)) {
             synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj);
             synthio_note_start(note, self->synth.sample_rate);
         }
-        synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, validate_note(note_obj));
+        synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, note_obj);
     }
 }
 

From 03abc623efc34910d4e430e4bbd995cf30a93b25 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 May 2023 13:44:27 -0500
Subject: [PATCH 2400/2403] synthio: note: fix assigning bend & tremolo
 coefficients dynamically

---
 shared-module/synthio/Note.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
index 16727b2152..680c1c1a1d 100644
--- a/shared-module/synthio/Note.c
+++ b/shared-module/synthio/Note.c
@@ -85,7 +85,7 @@ mp_float_t common_hal_synthio_note_get_tremolo_depth(synthio_note_obj_t *self) {
 void common_hal_synthio_note_set_tremolo_depth(synthio_note_obj_t *self, mp_float_t value_in) {
     mp_float_t val = mp_arg_validate_float_range(value_in, 0, 1, MP_QSTR_tremolo_depth);
     self->tremolo_descr.amplitude = val;
-    self->tremolo_state.amplitude_scaled = round_float_to_int(val * 32767);
+    self->tremolo_state.amplitude_scaled = round_float_to_int(val * 32768);
 }
 
 mp_float_t common_hal_synthio_note_get_tremolo_rate(synthio_note_obj_t *self) {
@@ -96,7 +96,7 @@ void common_hal_synthio_note_set_tremolo_rate(synthio_note_obj_t *self, mp_float
     mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_tremolo_rate);
     self->tremolo_descr.frequency = val;
     if (self->sample_rate != 0) {
-        self->tremolo_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
+        self->tremolo_state.dds = synthio_frequency_convert_float_to_dds(val * 65536, self->sample_rate);
     }
 }
 
@@ -107,7 +107,7 @@ mp_float_t common_hal_synthio_note_get_bend_depth(synthio_note_obj_t *self) {
 void common_hal_synthio_note_set_bend_depth(synthio_note_obj_t *self, mp_float_t value_in) {
     mp_float_t val = mp_arg_validate_float_range(value_in, -1, 1, MP_QSTR_bend_depth);
     self->bend_descr.amplitude = val;
-    self->bend_state.amplitude_scaled = round_float_to_int(val * 32767);
+    self->bend_state.amplitude_scaled = round_float_to_int(val * 32768);
 }
 
 mp_float_t common_hal_synthio_note_get_bend_rate(synthio_note_obj_t *self) {
@@ -127,7 +127,7 @@ void common_hal_synthio_note_set_bend_rate(synthio_note_obj_t *self, mp_float_t
     mp_float_t val = mp_arg_validate_float_range(value_in, 0, 60, MP_QSTR_bend_rate);
     self->bend_descr.frequency = val;
     if (self->sample_rate != 0) {
-        self->bend_state.dds = synthio_frequency_convert_float_to_dds(val, self->sample_rate);
+        self->bend_state.dds = synthio_frequency_convert_float_to_dds(val * 65536, self->sample_rate);
     }
 }
 

From f68ab9c5c2d81fd91af163fc868c53acdd99b907 Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 May 2023 13:44:49 -0500
Subject: [PATCH 2401/2403] synthio: Fix FIR filtering when audio is stereo

---
 shared-module/synthio/__init__.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
index 2fed9a5122..6b6a45f446 100644
--- a/shared-module/synthio/__init__.c
+++ b/shared-module/synthio/__init__.c
@@ -314,19 +314,21 @@ STATIC void run_fir(synthio_synth_t *synth, int32_t *out_buffer32, uint16_t dur)
     size_t fir_len = synth->filter_bufinfo.len / sizeof(int16_t);
     int32_t *in_buf = synth->filter_buffer;
 
+
+    int synth_chan = synth->channel_count;
     // FIR and copy values to output buffer
-    for (int16_t i = 0; i < dur; i++) {
+    for (int16_t i = 0; i < dur * synth_chan; i++) {
         int32_t acc = 0;
         for (size_t j = 0; j < fir_len; j++) {
             // shift 5 here is good for up to 32 filtered voices, else might wrap
-            acc = acc + (in_buf[j] * (coeff[j] >> 5));
+            acc = acc + (in_buf[j * synth_chan] * (coeff[j] >> 5));
         }
         *out_buffer32++ = acc >> 10;
         in_buf++;
     }
 
     // Move values down so that they get filtered next time
-    memmove(synth->filter_buffer, &synth->filter_buffer[dur], fir_len * sizeof(int32_t));
+    memmove(synth->filter_buffer, &synth->filter_buffer[dur * synth_chan], fir_len * sizeof(int32_t) * synth_chan);
 }
 
 STATIC bool synthio_synth_get_note_filtered(mp_obj_t note_obj) {
@@ -359,7 +361,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
 
     if (synth->filter_buffer) {
         int32_t *filter_start = &synth->filter_buffer[synth->filter_bufinfo.len * synth->channel_count / sizeof(int16_t)];
-        memset(filter_start, 0, dur * sizeof(int32_t));
+        memset(filter_start, 0, dur * synth->channel_count * sizeof(int32_t));
 
         for (int chan = 0; chan < CIRCUITPY_SYNTHIO_MAX_CHANNELS; chan++) {
             mp_obj_t note_obj = synth->span.note_obj[chan];

From 91a51039108e4f8f3c390ed39b5d90f7d3ef6e0f Mon Sep 17 00:00:00 2001
From: Jeff Epler 
Date: Fri, 12 May 2023 13:57:33 -0500
Subject: [PATCH 2402/2403] synthio: add a host demo of all major features

---
 .../circuitpython-manual/synthio/note/demo.py | 282 ++++++++++++++++++
 1 file changed, 282 insertions(+)
 create mode 100644 tests/circuitpython-manual/synthio/note/demo.py

diff --git a/tests/circuitpython-manual/synthio/note/demo.py b/tests/circuitpython-manual/synthio/note/demo.py
new file mode 100644
index 0000000000..49a811fd43
--- /dev/null
+++ b/tests/circuitpython-manual/synthio/note/demo.py
@@ -0,0 +1,282 @@
+import random
+import audiocore
+import synthio
+from ulab import numpy as np
+import adafruit_wave as wave
+
+h = np.array(
+    [
+        -0.001229734800309099,
+        -0.008235561806605458,
+        -0.015082497016061390,
+        -0.020940136918319988,
+        -0.024981800822463429,
+        -0.026464233332370746,
+        -0.024803890156806906,
+        -0.019642276775473012,
+        -0.010893620860173042,
+        0.001230341899766145,
+        0.016221637398855598,
+        0.033304135659230648,
+        0.051486665261155681,
+        0.069636961761409016,
+        0.086570197432542767,
+        0.101144354207918147,
+        0.112353938422488253,
+        0.119413577288191297,
+        0.121823886314051028,
+        0.119413577288191297,
+        0.112353938422488253,
+        0.101144354207918147,
+        0.086570197432542767,
+        0.069636961761409016,
+        0.051486665261155681,
+        0.033304135659230648,
+        0.016221637398855598,
+        0.001230341899766145,
+        -0.010893620860173042,
+        -0.019642276775473012,
+        -0.024803890156806906,
+        -0.026464233332370746,
+        -0.024981800822463429,
+        -0.020940136918319988,
+        -0.015082497016061390,
+        -0.008235561806605458,
+        -0.001229734800309099,
+    ]
+)
+
+filter_coeffs = np.array(h[::-1] * 32768, dtype=np.int16)
+
+
+def randf(lo, hi):
+    return random.random() * (hi - lo) + lo
+
+
+SAMPLE_SIZE = 1024
+VOLUME = 14700
+sine = np.array(
+    np.sin(np.linspace(0, 2 * np.pi, SAMPLE_SIZE, endpoint=False)) * VOLUME, dtype=np.int16
+)
+square = np.array([24000] * (SAMPLE_SIZE // 2) + [-24000] * (SAMPLE_SIZE // 2), dtype=np.int16)
+
+noise = np.array(
+    [random.randint(-32768, 32767) for i in range(SAMPLE_SIZE)],
+    dtype=np.int16,
+)
+
+envelope = synthio.Envelope(
+    attack_time=0.1, decay_time=0.05, release_time=0.2, attack_level=1, sustain_level=0.8
+)
+
+instant = synthio.Envelope(
+    attack_time=0, decay_time=0, release_time=0, attack_level=1, sustain_level=1
+)
+synth = synthio.Synthesizer(
+    sample_rate=48000, envelope=None, filter=filter_coeffs, channel_count=2
+)
+
+
+def synthesize(synth):
+    print(
+        """you can use arbitrary waveforms, including ones calculated on the fly or read from wave files (up to 1024 points)"""
+    )
+
+    waveform = np.zeros(SAMPLE_SIZE, dtype=np.int16)
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=waveform, envelope=envelope)
+        for n in (60, 64, 67, 70)
+    ]
+    synth.press(chord)
+
+    for i in range(256):
+        ctrl = i / 255
+        waveform[:] = np.array(square * (1 - ctrl) + sine * ctrl, dtype=np.int16)
+        yield 4
+
+
+def synthesize2(synth):
+    print("""Envelope controls how notes fade in or out""")
+
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=sine, envelope=instant)
+        for n in (60, 64, 67, 70)
+    ]
+
+    for i in range(4):
+        for c in chord:
+            synth.release_all_then_press((c,))
+            yield 24
+    synth.release_all()
+
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=sine, envelope=envelope)
+        for n in (60, 64, 67, 70)
+    ]
+
+    for i in range(4):
+        for c in chord:
+            old = (c,)
+            synth.release_all_then_press((c,))
+            yield 24
+
+
+def synthesize3(synth):
+    print("""A noise waveform creates percussive sounds""")
+
+    env = synthio.Envelope(
+        attack_time=0,
+        decay_time=0.2,
+        sustain_level=0,
+    )
+
+    notes = [
+        synthio.Note(
+            frequency=synthio.midi_to_hz(1 + i),
+            waveform=noise,
+            envelope=env,
+        )
+        for i in range(12)
+    ]
+
+    random.seed(9)
+    for _ in range(16):
+        n = random.choice(notes)
+        d = random.randint(30, 60)
+        synth.press((n,))
+        yield d
+
+
+def synthesize4(synth):
+    print("""Tremolo varies the note volume within a range at a low frequency""")
+
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=sine, envelope=None) for n in (60, 64, 67, 70)
+    ]
+
+    synth.press(chord)
+    for i in range(16):
+        for c in chord:
+            c.tremolo_depth = i / 50
+            c.tremolo_rate = (i + 1) / 4
+        yield 48
+    yield 36
+
+
+def synthesize5(synth):
+    print("""You can add vibrato or frequency sweep to notes""")
+
+    chord = [synthio.Note(synthio.midi_to_hz(n), waveform=sine) for n in (60, 64, 67, 70)]
+
+    synth.press(chord)
+    for i in range(16):
+        for c in chord:
+            c.bend_depth = 1 / 24
+            c.bend_rate = (i + 1) / 2
+        yield 24
+    synth.release_all()
+    yield 100
+
+    for c in chord:
+        synth.release_all()
+        c.bend_mode = synthio.BendMode.SWEEP_IN
+        c.bend_depth = randf(-1, 1)
+        c.bend_rate = 1 / 2
+    synth.press(chord)
+    yield 320
+
+
+def synthesize6(synth):
+    print("""Ring modulation multiplies two waveforms together to create rich sounds""")
+
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=square, ring_waveform=sine, envelope=envelope)
+        for n in (60,)
+    ]
+
+    synth.press(chord)
+    yield 200
+
+    random.seed(75)
+
+    for _ in range(3):
+        synth.release_all()
+        yield 36
+        for note in chord:
+            note.ring_frequency = note.frequency * (random.random() * 35 / 1200 + 8)
+        synth.press(chord)
+        yield 200
+
+
+def synthesize7(synth):
+    print("""FIR filtering can reproduce low, high, notch and band filters""")
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=square, filter=False)
+        for n in (60, 64, 67, 70)
+    ]
+
+    for i in range(4):
+        for c in chord:
+            synth.release_all_then_press((c,))
+            yield 24
+    synth.release_all()
+
+    for note in chord:
+        note.filter = True
+
+    for i in range(4):
+        for c in chord:
+            synth.release_all_then_press((c,))
+            yield 24
+
+
+def synthesize8(synth):
+    print("""Notes can be panned between channels""")
+    chord = [
+        synthio.Note(synthio.midi_to_hz(n), waveform=square, envelope=envelope)
+        for n in (60, 64, 67, 70)
+    ]
+    synth.press(chord)
+    for p in range(-10, 11, 1):
+        for note in chord:
+            note.panning = p / 10
+        yield 36
+
+
+def delay(synth):
+    synth.release_all()
+    yield 200
+
+
+def chain(*args):
+    for a in args:
+        yield from a
+
+
+# sox -r 48000 -e signed -b 16 -c 1 tune.raw tune.wav
+with wave.open("demo.wav", "w") as f:
+    f.setnchannels(2)
+    f.setsampwidth(2)
+    f.setframerate(48000)
+    import array
+
+    for n in chain(
+        synthesize(synth),
+        delay(synth),
+        synthesize2(synth),
+        delay(synth),
+        synthesize3(synth),
+        delay(synth),
+        synthesize4(synth),
+        delay(synth),
+        synthesize5(synth),
+        delay(synth),
+        synthesize6(synth),
+        delay(synth),
+        synthesize7(synth),
+        delay(synth),
+        synthesize8(synth),
+    ):
+        for i in range(n):
+            result, data = audiocore.get_buffer(synth)
+            f.writeframes(data)

From fe386e7c738ad01bc106e00a675928ba9b4b6a4b Mon Sep 17 00:00:00 2001
From: Dan Halbert 
Date: Fri, 12 May 2023 15:29:59 -0400
Subject: [PATCH 2403/2403] adafruit_bus_device SPIDevice can have None for
 chip select

---
 .../adafruit_bus_device/spi_device/SPIDevice.c         | 10 +++++-----
 .../adafruit_bus_device/spi_device/SPIDevice.c         |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index 6108247aa1..13b57477e4 100644
--- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -44,7 +44,7 @@
 //|     def __init__(
 //|         self,
 //|         spi: busio.SPI,
-//|         chip_select: digitalio.DigitalInOut,
+//|         chip_select: Optional[digitalio.DigitalInOut] = None,
 //|         *,
 //|         baudrate: int = 100000,
 //|         polarity: int = 0,
@@ -55,7 +55,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 ~digitalio.DigitalInOut chip_select: The chip select pin object that implements the DigitalInOut API. ``None`` if a chip select pin is not being used.
 //|         :param bool cs_active_value: Set to true if your device requires CS to be active high. Defaults to false.
 //|         :param int extra_clocks: The minimum number of clock cycles to cycle the bus after CS is high. (Used for SD cards.)
 //|
@@ -84,7 +84,7 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
     enum { ARG_spi, ARG_chip_select, ARG_cs_active_value, ARG_baudrate, ARG_polarity, ARG_phase, ARG_extra_clocks };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_spi, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_chip_select, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_chip_select, MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_cs_active_value, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 100000} },
         { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -96,12 +96,12 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type
 
     busio_spi_obj_t *spi = args[ARG_spi].u_obj;
 
-    mp_arg_validate_type(args[ARG_chip_select].u_obj, &digitalio_digitalinout_type, MP_QSTR_chip_select);
+    mp_arg_validate_type_or_none(args[ARG_chip_select].u_obj, &digitalio_digitalinout_type, MP_QSTR_chip_select);
 
     common_hal_adafruit_bus_device_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_cs_active_value].u_bool, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
         args[ARG_phase].u_int, args[ARG_extra_clocks].u_int);
 
-    if (args[ARG_chip_select].u_obj != MP_OBJ_NULL) {
+    if (args[ARG_chip_select].u_obj != mp_const_none) {
         digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(MP_OBJ_TO_PTR(args[ARG_chip_select].u_obj),
             true, DRIVE_MODE_PUSH_PULL);
         #if CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY
diff --git a/shared-module/adafruit_bus_device/spi_device/SPIDevice.c b/shared-module/adafruit_bus_device/spi_device/SPIDevice.c
index 2f4ab4dddf..9c5d62cbe5 100644
--- a/shared-module/adafruit_bus_device/spi_device/SPIDevice.c
+++ b/shared-module/adafruit_bus_device/spi_device/SPIDevice.c
@@ -38,6 +38,7 @@ void common_hal_adafruit_bus_device_spidevice_construct(adafruit_bus_device_spid
     self->polarity = polarity;
     self->phase = phase;
     self->extra_clocks = extra_clocks;
+    // May be mp_const_none if CS not used.
     self->chip_select = cs;
     self->cs_active_value = cs_active_value;
 }
@@ -66,14 +67,14 @@ mp_obj_t common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spid
         mp_call_method_n_kw(0, 4, dest);
     }
 
-    if (self->chip_select != MP_OBJ_NULL) {
+    if (self->chip_select != mp_const_none) {
         common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), self->cs_active_value);
     }
     return self->spi;
 }
 
 void common_hal_adafruit_bus_device_spidevice_exit(adafruit_bus_device_spidevice_obj_t *self) {
-    if (self->chip_select != MP_OBJ_NULL) {
+    if (self->chip_select != mp_const_none) {
         common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), !(self->cs_active_value));
     }
 

     
    GWirVM@kja199Kbt6(of&|glaNp25!DJyv%c1gN
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
    wUWW}(n2MU{LNakYFGagCgYc#-@J@nZ44Oa2|{
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
z
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